diff --git a/.ci/es-snapshots/Jenkinsfile_build_es b/.ci/es-snapshots/Jenkinsfile_build_es
new file mode 100644
index 0000000000000..ad0ad54275e12
--- /dev/null
+++ b/.ci/es-snapshots/Jenkinsfile_build_es
@@ -0,0 +1,162 @@
+#!/bin/groovy
+
+// This job effectively has two SCM configurations:
+// one for kibana, used to check out this Jenkinsfile (which means it's the job's main SCM configuration), as well as kick-off the downstream verification job
+// one for elasticsearch, used to check out the elasticsearch source before building it
+
+// There are two parameters that drive which branch is checked out for each of these, but they will typically be the same
+// 'branch_specifier' is for kibana / the job itself
+// ES_BRANCH is for elasticsearch
+
+library 'kibana-pipeline-library'
+kibanaLibrary.load()
+
+def ES_BRANCH = params.ES_BRANCH
+
+if (!ES_BRANCH) {
+  error "Parameter 'ES_BRANCH' must be specified."
+}
+
+currentBuild.displayName += " - ${ES_BRANCH}"
+currentBuild.description = "ES: ${ES_BRANCH}<br />Kibana: ${params.branch_specifier}"
+
+def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
+
+timeout(time: 120, unit: 'MINUTES') {
+  timestamps {
+    ansiColor('xterm') {
+      node('linux && immutable') {
+        catchError {
+          def VERSION
+          def SNAPSHOT_ID
+          def DESTINATION
+
+          def scmVars = checkoutEs(ES_BRANCH)
+          def GIT_COMMIT = scmVars.GIT_COMMIT
+          def GIT_COMMIT_SHORT = sh(script: "git rev-parse --short ${GIT_COMMIT}", returnStdout: true).trim()
+
+          buildArchives('to-archive')
+
+          dir('to-archive') {
+            def now = new Date()
+            def date = now.format("yyyyMMdd-HHmmss")
+
+            def filesRaw = sh(script: "ls -1", returnStdout: true).trim()
+            def files = filesRaw
+              .split("\n")
+              .collect { filename ->
+                // Filename examples
+                // elasticsearch-oss-8.0.0-SNAPSHOT-linux-x86_64.tar.gz
+                // elasticsearch-8.0.0-SNAPSHOT-linux-x86_64.tar.gz
+                def parts = filename.replace("elasticsearch-oss", "oss").split("-")
+
+                VERSION = VERSION ?: parts[1]
+                SNAPSHOT_ID = SNAPSHOT_ID ?: "${date}_${GIT_COMMIT_SHORT}"
+                DESTINATION = DESTINATION ?: "${VERSION}/archives/${SNAPSHOT_ID}"
+
+                return [
+                  filename: filename,
+                  checksum: filename + '.sha512',
+                  url: "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${DESTINATION}/${filename}".toString(),
+                  version: parts[1],
+                  platform: parts[3],
+                  architecture: parts[4].split('\\.')[0],
+                  license: parts[0] == 'oss' ? 'oss' : 'default',
+                ]
+              }
+
+            sh 'find * -exec bash -c "shasum -a 512 {} > {}.sha512" \\;'
+
+            def manifest = [
+              bucket: "kibana-ci-es-snapshots-daily/${DESTINATION}".toString(),
+              branch: ES_BRANCH,
+              sha: GIT_COMMIT,
+              sha_short: GIT_COMMIT_SHORT,
+              version: VERSION,
+              generated: now.format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("UTC")),
+              archives: files,
+            ]
+            def manifestJson = toJSON(manifest).toString()
+            writeFile file: 'manifest.json', text: manifestJson
+
+            upload(DESTINATION, '*.*')
+
+            sh "cp manifest.json manifest-latest.json"
+            upload(VERSION, 'manifest-latest.json')
+          }
+
+          if (PROMOTE_WITHOUT_VERIFY) {
+            esSnapshots.promote(VERSION, SNAPSHOT_ID)
+
+            emailext(
+              to: 'build-kibana@elastic.co',
+              subject: "ES snapshot promoted without verification: ${params.ES_BRANCH}",
+              body: '${SCRIPT,template="groovy-html.template"}',
+              mimeType: 'text/html',
+            )
+          } else {
+            build(
+              propagate: false,
+              wait: false,
+              job: 'elasticsearch+snapshots+verify',
+              parameters: [
+                string(name: 'branch_specifier', value: branch_specifier),
+                string(name: 'SNAPSHOT_VERSION', value: VERSION),
+                string(name: 'SNAPSHOT_ID', value: SNAPSHOT_ID),
+              ]
+            )
+          }
+        }
+
+        kibanaPipeline.sendMail()
+      }
+    }
+  }
+}
+
+def checkoutEs(branch) {
+  retryWithDelay(8, 15) {
+    return checkout([
+      $class: 'GitSCM',
+      branches: [[name: branch]],
+      doGenerateSubmoduleConfigurations: false,
+      extensions: [],
+      submoduleCfg: [],
+      userRemoteConfigs: [[
+        credentialsId: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba',
+        url: 'git@github.com:elastic/elasticsearch',
+      ]],
+    ])
+  }
+}
+
+def upload(destination, pattern) {
+  return googleStorageUpload(
+    credentialsId: 'kibana-ci-gcs-plugin',
+    bucket: "gs://kibana-ci-es-snapshots-daily/${destination}",
+    pattern: pattern,
+    sharedPublicly: false,
+    showInline: false,
+  )
+}
+
+def buildArchives(destination) {
+  def props = readProperties file: '.ci/java-versions.properties'
+  withEnv([
+    // Select the correct JDK for this branch
+    "PATH=/var/lib/jenkins/.java/${props.ES_BUILD_JAVA}/bin:${env.PATH}",
+
+    // These Jenkins env vars trigger some automation in the elasticsearch repo that we don't want
+    "BUILD_NUMBER=",
+    "JENKINS_URL=",
+    "BUILD_URL=",
+    "JOB_NAME=",
+    "NODE_NAME=",
+  ]) {
+    sh """
+      ./gradlew -p distribution/archives assemble --parallel
+      mkdir -p ${destination}
+      find distribution/archives -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -exec cp {} ${destination} \\;
+    """
+  }
+}
diff --git a/.ci/es-snapshots/Jenkinsfile_trigger_build_es b/.ci/es-snapshots/Jenkinsfile_trigger_build_es
new file mode 100644
index 0000000000000..186917e967824
--- /dev/null
+++ b/.ci/es-snapshots/Jenkinsfile_trigger_build_es
@@ -0,0 +1,19 @@
+#!/bin/groovy
+
+if (!params.branches_yaml) {
+  error "'branches_yaml' parameter must be specified"
+}
+
+def branches = readYaml text: params.branches_yaml
+
+branches.each { branch ->
+  build(
+    propagate: false,
+    wait: false,
+    job: 'elasticsearch+snapshots+build',
+    parameters: [
+      string(name: 'branch_specifier', value: branch),
+      string(name: 'ES_BRANCH', value: branch),
+    ]
+  )
+}
diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
new file mode 100644
index 0000000000000..3d5ec75fa0e72
--- /dev/null
+++ b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -0,0 +1,72 @@
+#!/bin/groovy
+
+library 'kibana-pipeline-library'
+kibanaLibrary.load()
+
+def SNAPSHOT_VERSION = params.SNAPSHOT_VERSION
+def SNAPSHOT_ID = params.SNAPSHOT_ID
+
+if (!SNAPSHOT_VERSION) {
+  error "Parameter SNAPSHOT_VERSION must be specified"
+}
+
+if (!SNAPSHOT_ID) {
+  error "Parameter SNAPSHOT_ID must be specified"
+}
+
+currentBuild.displayName += " - ${SNAPSHOT_VERSION}"
+currentBuild.description = "ES: ${SNAPSHOT_VERSION}<br />Kibana: ${params.branch_specifier}"
+
+def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${SNAPSHOT_VERSION}/archives/${SNAPSHOT_ID}/manifest.json"
+
+timeout(time: 120, unit: 'MINUTES') {
+  timestamps {
+    ansiColor('xterm') {
+      catchError {
+        withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
+          parallel([
+            // TODO we just need to run integration tests from intake?
+            '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),
+            ]),
+            '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),
+            ]),
+          ])
+        }
+
+        promoteSnapshot(SNAPSHOT_VERSION, SNAPSHOT_ID)
+      }
+
+      kibanaPipeline.sendMail()
+    }
+  }
+}
+
+def promoteSnapshot(snapshotVersion, snapshotId) {
+  node('linux && immutable') {
+    esSnapshots.promote(snapshotVersion, snapshotId)
+  }
+}
diff --git a/.eslintrc.js b/.eslintrc.js
index 7dd0860aac04e..8a9d4da6178e9 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -177,25 +177,12 @@ module.exports = {
         '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/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 that require Apache 2.0 headers, settings
@@ -736,15 +723,13 @@ module.exports = {
         'no-unreachable': 'error',
         'no-unsafe-finally': 'error',
         'no-useless-call': 'error',
-        // This will be turned on after bug fixes are mostly complete
-        // 'no-useless-catch': 'warn',
+        'no-useless-catch': 'error',
         'no-useless-concat': 'error',
         'no-useless-computed-key': 'error',
         // This will be turned on after bug fixes are mostly complete
         // 'no-useless-escape': 'warn',
         'no-useless-rename': 'error',
-        // This will be turned on after bug fixes are mostly complete
-        // 'no-useless-return': 'warn',
+        'no-useless-return': 'error',
         // This will be turned on after bug fixers are mostly complete
         // 'no-void': 'warn',
         'one-var-declaration-per-line': 'error',
@@ -752,14 +737,13 @@ module.exports = {
         'prefer-promise-reject-errors': 'error',
         'prefer-rest-params': 'error',
         'prefer-spread': 'error',
-        // This style will be turned on after most bugs are fixed
-        // 'prefer-template': 'warn',
+        'prefer-template': 'error',
         'react/boolean-prop-naming': 'error',
         'react/button-has-type': 'error',
+        'react/display-name': 'error',
         'react/forbid-dom-props': 'error',
         'react/no-access-state-in-setstate': 'error',
-        // This style will be turned on after most bugs are fixed
-        // 'react/no-children-prop': 'warn',
+        'react/no-children-prop': 'error',
         'react/no-danger-with-children': 'error',
         'react/no-deprecated': 'error',
         'react/no-did-mount-set-state': 'error',
@@ -821,21 +805,6 @@ module.exports = {
       },
     },
 
-    /**
-     * Monitoring overrides
-     */
-    {
-      files: ['x-pack/legacy/plugins/monitoring/**/*.js'],
-      rules: {
-        'no-unused-vars': ['error', { args: 'all', argsIgnorePattern: '^_' }],
-        'no-else-return': 'error',
-      },
-    },
-    {
-      files: ['x-pack/legacy/plugins/monitoring/public/**/*.js'],
-      env: { browser: true },
-    },
-
     /**
      * Canvas overrides
      */
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3142e0ff97749..18d60bce4b95e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,6 +8,16 @@
 /src/plugins/share/ @elastic/kibana-app
 /src/legacy/server/url_shortening/ @elastic/kibana-app
 /src/legacy/server/sample_data/ @elastic/kibana-app
+/src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
+/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
+/src/legacy/core_plugins/kibana/public/visualize/ @elastic/kibana-app
+/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
+/src/legacy/core_plugins/kibana/public/home/ @elastic/kibana-app
+/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
+/src/plugins/home/ @elastic/kibana-app
+/src/plugins/kibana_legacy/ @elastic/kibana-app
+/src/plugins/timelion/ @elastic/kibana-app
+/src/plugins/dev_tools/ @elastic/kibana-app
 
 # App Architecture
 /src/plugins/data/ @elastic/kibana-app-arch
@@ -20,6 +30,7 @@
 /src/plugins/visualizations/ @elastic/kibana-app-arch
 /x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
 /src/legacy/core_plugins/data/ @elastic/kibana-app-arch
+/src/legacy/core_plugins/elasticsearch/lib/create_proxy.js @elastic/kibana-app-arch
 /src/legacy/core_plugins/embeddable_api/ @elastic/kibana-app-arch
 /src/legacy/core_plugins/interpreter/ @elastic/kibana-app-arch
 /src/legacy/core_plugins/kibana_react/ @elastic/kibana-app-arch
@@ -57,6 +68,13 @@
 /x-pack/test/functional/services/transform_ui/ @elastic/ml-ui
 /x-pack/test/functional/services/transform.ts @elastic/ml-ui
 
+# Maps
+/x-pack/legacy/plugins/maps/ @elastic/kibana-gis
+/x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
+/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
+/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
+/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
+
 # Operations
 /src/dev/ @elastic/kibana-operations
 /src/setup_node_env/ @elastic/kibana-operations
@@ -109,6 +127,9 @@
 /x-pack/legacy/plugins/alerting @elastic/kibana-alerting-services
 /x-pack/legacy/plugins/actions @elastic/kibana-alerting-services
 /x-pack/legacy/plugins/task_manager @elastic/kibana-alerting-services
+/x-pack/test/alerting_api_integration @elastic/kibana-alerting-services
+/x-pack/test/plugin_api_integration/plugins/task_manager @elastic/kibana-alerting-services
+/x-pack/test/plugin_api_integration/test_suites/task_manager @elastic/kibana-alerting-services
 
 # Design
 **/*.scss  @elastic/kibana-design
diff --git a/.github/workflows/pr-project-assigner.yml b/.github/workflows/pr-project-assigner.yml
index aea8a9cad6b1f..59123731dce66 100644
--- a/.github/workflows/pr-project-assigner.yml
+++ b/.github/workflows/pr-project-assigner.yml
@@ -11,5 +11,11 @@ jobs:
         uses: elastic/github-actions/project-assigner@v1.0.0
         id: project_assigner
         with:
-          issue-mappings: '[{"label": "Team:AppAch", "projectName": "kibana-app-arch", "columnId": 6173897}]'
-          ghToken: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          issue-mappings: |
+            [
+              { "label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173897 },
+              { "label": "Feature:Lens", "projectName": "Lens", "columnId": 6219362 },
+              { "label": "Team:Platform", "projectName": "kibana-platform", "columnId": 5514360 },
+              {"label": "Team:Canvas", "projectName": "canvas", "columnId": 6187580}
+            ]
+          ghToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/project-assigner.yml b/.github/workflows/project-assigner.yml
index c7f17993249eb..aec3bf88f0ee2 100644
--- a/.github/workflows/project-assigner.yml
+++ b/.github/workflows/project-assigner.yml
@@ -11,7 +11,7 @@ jobs:
         uses: elastic/github-actions/project-assigner@v1.0.0
         id: project_assigner
         with:
-          issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}]'
+          issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219363}, {"label": "Team:Canvas", "projectName": "canvas", "columnId": 6187593}]'
           ghToken: ${{ secrets.GITHUB_TOKEN }}
-      
+
 
diff --git a/.gitignore b/.gitignore
index e7391a5c292d0..02b20da297fc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ disabledPlugins
 webpackstats.json
 /config/*
 !/config/kibana.yml
-!/config/apm.js
 coverage
 selenium
 .babel_register_cache.json
diff --git a/.i18nrc.json b/.i18nrc.json
index 9a37ce1310a32..4bc0f773ee8b5 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -9,7 +9,9 @@
       "src/plugins/data"
     ],
     "embeddableApi": "src/plugins/embeddable",
+    "embeddableExamples": "examples/embeddable_examples",
     "share": "src/plugins/share",
+    "home": "src/plugins/home",
     "esUi": "src/plugins/es_ui_shared",
     "devTools": "src/plugins/dev_tools",
     "expressions": "src/plugins/expressions",
@@ -20,7 +22,7 @@
     "kbn": "src/legacy/core_plugins/kibana",
     "kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
     "kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
-    "management": "src/legacy/core_plugins/management",
+    "management": ["src/legacy/core_plugins/management", "src/plugins/management"],
     "kibana_react": "src/legacy/core_plugins/kibana_react",
     "kibana-react": "src/plugins/kibana_react",
     "kibana_utils": "src/plugins/kibana_utils",
diff --git a/.node-version b/.node-version
index 95abd2ac49910..06c9b9d306348 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-10.15.2
+10.18.0
diff --git a/.nvmrc b/.nvmrc
index 95abd2ac49910..06c9b9d306348 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-10.15.2
+10.18.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 06e08c85dafec..6ae3db559b61b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -190,6 +190,19 @@ These snapshots are built on a nightly basis which expire after a couple weeks.
 yarn es snapshot
 ```
 
+##### Keeping data between snapshots
+
+If you want to keep the data inside your Elasticsearch between usages of this command,
+you should use the following command, to keep your data folder outside the downloaded snapshot 
+folder:
+
+```bash
+yarn es snapshot -E path.data=../data
+```
+
+The same parameter can be used with the source and archive command shown in the following
+paragraphs.
+
 #### Source
 
 By default, it will reference an [elasticsearch](https://github.com/elastic/elasticsearch) checkout which is a sibling to the Kibana directory named `elasticsearch`. If you wish to use a checkout in another location you can provide that by supplying `--source-path`
diff --git a/NOTICE.txt b/NOTICE.txt
index 230e511746022..955c3127fa955 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Kibana source code with Kibana X-Pack source code
-Copyright 2012-2019 Elasticsearch B.V.
+Copyright 2012-2020 Elasticsearch B.V.
 
 ---
 Pretty handling of logarithmic axes.
diff --git a/config/apm.js b/config/apm.js
deleted file mode 100644
index 0cfcd759f163b..0000000000000
--- a/config/apm.js
+++ /dev/null
@@ -1,87 +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.
- */
-
-/**
- * DO NOT EDIT THIS FILE!
- *
- * This file contains the configuration for the Elastic APM instrumentaion of
- * Kibana itself and is only intented to be used during development of Kibana.
- *
- * Instrumentation is turned off by default. Once activated it will send APM
- * data to an Elasticsearch cluster accessible by Elastic employees.
- *
- * To modify the configuration, either use environment variables, or create a
- * file named `config/apm.dev.js`, which exports a config object as described
- * in the docs.
- *
- * For an overview over the available configuration files, see:
- * https://www.elastic.co/guide/en/apm/agent/nodejs/current/configuration.html
- *
- * For general information about Elastic APM, see:
- * https://www.elastic.co/guide/en/apm/get-started/current/index.html
- */
-
-const { readFileSync } = require('fs');
-const { join } = require('path');
-const { execSync } = require('child_process');
-const merge = require('lodash.merge');
-
-module.exports = merge(
-  {
-    active: false,
-    serverUrl: 'https://f1542b814f674090afd914960583265f.apm.us-central1.gcp.cloud.es.io:443',
-    // The secretToken below is intended to be hardcoded in this file even though
-    // it makes it public. This is not a security/privacy issue. Normally we'd
-    // instead disable the need for a secretToken in the APM Server config where
-    // the data is transmitted to, but due to how it's being hosted, it's easier,
-    // for now, to simply leave it in.
-    secretToken: 'R0Gjg46pE9K9wGestd',
-    globalLabels: {},
-    centralConfig: false,
-    logUncaughtExceptions: true,
-  },
-  devConfig()
-);
-
-const rev = gitRev();
-if (rev !== null) module.exports.globalLabels.git_rev = rev;
-
-try {
-  const filename = join(__dirname, '..', 'data', 'uuid');
-  module.exports.globalLabels.kibana_uuid = readFileSync(filename, 'utf-8');
-} catch (e) {} // eslint-disable-line no-empty
-
-function gitRev() {
-  try {
-    return execSync('git rev-parse --short HEAD', {
-      encoding: 'utf-8',
-      stdio: ['ignore', 'pipe', 'ignore'],
-    }).trim();
-  } catch (e) {
-    return null;
-  }
-}
-
-function devConfig() {
-  try {
-    return require('./apm.dev'); // eslint-disable-line import/no-unresolved
-  } catch (e) {
-    return {};
-  }
-}
diff --git a/docs/api/spaces-management/post.asciidoc b/docs/api/spaces-management/post.asciidoc
index d8c194d8dc2b5..4d4627e98899e 100644
--- a/docs/api/spaces-management/post.asciidoc
+++ b/docs/api/spaces-management/post.asciidoc
@@ -16,28 +16,28 @@ experimental["The underlying Spaces concepts are stable, but the APIs for managi
 [[spaces-api-post-request-body]]
 ==== Request body
 
-`id`:: 
+`id`::
   (Required, string) The space ID that is part of the Kibana URL when inside the space. You are unable to change the ID with the update operation.
 
-`name`:: 
+`name`::
   (Required, string) The display name for the space.
 
-`description`:: 
+`description`::
   (Optional, string) The description for the space.
 
-`disabledFeatures`:: 
+`disabledFeatures`::
   (Optional, string array) The list of disabled features for the space. To get a list of available feature IDs, use the <<features-api-get, Features API>>.
 
-`initials`:: 
+`initials`::
   (Optional, string) Specifies the initials shown in the space avatar. By default, the initials are automatically generated from the space name. Initials must be 1 or 2 characters.
 
-`color`:: 
+`color`::
   (Optional, string) Specifies the hexadecimal color code used in the space avatar. By default, the color is automatically generated from the space name.
 
-`imageUrl`:: 
+`imageUrl`::
   (Optional, string) Specifies the data-url encoded image to display in the space avatar. If specified, `initials` will not be displayed, and the `color` will be visible as the background color for transparent images.
   For best results, your image should be 64x64. Images will not be optimized by this API call, so care should be taken when using custom images.
-  
+
 [[spaces-api-post-response-codes]]
 ==== Response codes
 
diff --git a/docs/api/using-api.asciidoc b/docs/api/using-api.asciidoc
index 82071af463636..37c5315025dc4 100644
--- a/docs/api/using-api.asciidoc
+++ b/docs/api/using-api.asciidoc
@@ -1,7 +1,7 @@
 [[using-api]]
 == Using the APIs
 
-Interact with the {kib} APIs through the `curl` command and HTTP and HTTPs protocols. 
+Interact with the {kib} APIs through the `curl` command and HTTP and HTTPs protocols.
 
 It is recommended that you use HTTPs on port 5601 because it is more secure.
 
@@ -34,13 +34,37 @@ For example, the following `curl` command exports a dashboard:
 curl -X POST -u $USER:$PASSWORD "localhost:5601/api/kibana/dashboards/export?dashboard=942dcef0-b2cd-11e8-ad8e-85441f0c2e5c"
 --
 
-The following {kib} APIs are available:
+[float]
+[[api-request-headers]]
+=== Request headers
+
+For all APIs, you must use a request header. The {kib} APIs support the `kbn-xsrf` and `Content-Type` headers.
+
+`kbn-xsrf: true`::
+  By default, you must use `kbn-xsrf` for all API calls, except in the following scenarios:
+
+* The API endpoint uses the `GET` or `HEAD` methods
+
+* The path is whitelisted using the <<settings, `server.xsrf.whitelist`>> setting
+
+* XSRF protections are disabled using the `server.xsrf.disableProtection` setting
 
-* <<features-api-get, Get features API>>
-* <<spaces-api, Kibana spaces API>>
-* <<role-management-api, Kibana role management APIs>>
-* <<saved-objects-api, Saved objects APIs>>
-* <<dashboard-api, Import and export dashboards APIs>>
-* <<logstash-configuration-management-api, Logstash configuration mangaement APIs>>
-* <<url-shortening-api, Shorten URL API>>
-* <<upgrade-assistant-api, Upgrade assistant APIs>>
+`Content-Type: application/json`::
+  Applicable only when you send a payload in the API request. {kib} API requests and responses use JSON. Typically, if you include the `kbn-xsrf` header, you must also include the `Content-Type` header. 
+
+Request header example:
+
+[source,sh]
+--
+curl -X POST \
+  http://localhost:5601/api/spaces/space \
+  -H 'Content-Type: application/json' \
+  -H 'kbn-xsrf: true' \
+  -d '{
+	"id": "sales",
+	"name": "Sales",
+	"description": "This is your Sales Space!",
+	"disabledFeatures": []
+}
+'
+--
diff --git a/docs/apm/advanced-queries.asciidoc b/docs/apm/advanced-queries.asciidoc
index 1f064c1cad3fd..942882f8c4dfb 100644
--- a/docs/apm/advanced-queries.asciidoc
+++ b/docs/apm/advanced-queries.asciidoc
@@ -1,9 +1,7 @@
 [[advanced-queries]]
 === Advanced queries
 
-When querying, you're simply searching and selecting data from fields in Elasticsearch documents.
-It may be helpful to view some of your documents in {kibana-ref}/discover.html[Discover] to better understand how APM data is stored in Elasticsearch. 
-
+When querying in the APM app, you're simply searching and selecting data from fields in Elasticsearch documents.
 Queries entered into the query bar are also added as parameters to the URL,
 so it's easy to share a specific query or view with others.
 
@@ -13,11 +11,48 @@ In the screenshot below, you can begin to see some of the transaction fields ava
 image::apm/images/apm-query-bar.png[Example of the Kibana Query bar in APM app in Kibana]
 
 [float]
-==== Example queries
+==== Example APM app queries
 
 * Exclude response times slower than 2000 ms: `transaction.duration.us > 2000000`
 * Filter by response status code: `context.response.status_code >= 400`
 * Filter by single user ID: `context.user.id : 12`
-* View _all_ transactions for an endpoint, instead of just a sample - `processor.event: "transaction" AND transaction.name: "<TRANSACTION_NAME_HERE>"`
 
 TIP: Read the {kibana-ref}/kuery-query.html[Kibana Query Language Enhancements] documentation to learn more about the capabilities of the {kib} query language.
+
+[float]
+[[discover-advanced-queries]]
+=== Querying in the Discover app
+
+It may also be helpful to view your APM data in the {kibana-ref}/discover.html[Discover app].
+Querying documents in Discover works the same way as querying in the APM app,
+and all of the example queries listed above can also be used in the Discover app.
+
+[float]
+==== Example Discover app query
+
+One example where you may want to make use of the Discover app,
+is for viewing  _all_ transactions for an endpoint, instead of just a sample.
+
+TIP: Starting in v7.6, you can view 10 samples per bucket in the APM app, instead of just one.
+
+Use the APM app to find a transaction name and time bucket that you're interested in learning more about.
+Then, switch to the Discover app and make a search:
+
+["source","sh"]
+-----
+processor.event: "transaction" AND transaction.name: "<TRANSACTION_NAME_HERE>" and transaction.duration.us > 13000 and transaction.duration.us < 14000`
+-----
+
+In this example, we're interested in viewing all of the `APIRestController#customers` transactions
+that took between 13 and 14 milliseconds. Here's what Discover returns:
+
+[role="screenshot"]
+image::apm/images/advanced-discover.png[View all transactions in bucket]
+
+You can now explore the data until you find a specific transaction that you're interested in.
+Copy that transaction's `transaction.id`, and paste it into the APM app to view the data in the context of the APM app:
+
+[role="screenshot"]
+image::apm/images/specific-transaction-search.png[View specific transaction in apm app]
+[role="screenshot"]
+image::apm/images/specific-transaction.png[View specific transaction in apm app]
diff --git a/docs/apm/images/advanced-discover.png b/docs/apm/images/advanced-discover.png
new file mode 100644
index 0000000000000..56ba58b2c1d41
Binary files /dev/null and b/docs/apm/images/advanced-discover.png differ
diff --git a/docs/apm/images/specific-transaction-search.png b/docs/apm/images/specific-transaction-search.png
new file mode 100644
index 0000000000000..4ed548f015713
Binary files /dev/null and b/docs/apm/images/specific-transaction-search.png differ
diff --git a/docs/apm/images/specific-transaction.png b/docs/apm/images/specific-transaction.png
new file mode 100644
index 0000000000000..9911dbd879f41
Binary files /dev/null and b/docs/apm/images/specific-transaction.png differ
diff --git a/docs/apm/settings.asciidoc b/docs/apm/settings.asciidoc
new file mode 100644
index 0000000000000..2fc8748f13b09
--- /dev/null
+++ b/docs/apm/settings.asciidoc
@@ -0,0 +1,10 @@
+// Do not link directly to this page.
+// Link to the anchor in `/docs/settings/apm-settings.asciidoc` instead.
+[[apm-settings-in-kibana]]
+=== APM settings in Kibana
+
+You do not need to configure any settings to use APM. It is enabled 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.
+
+include::./../settings/apm-settings.asciidoc[tag=general-apm-settings]
diff --git a/docs/apm/using-the-apm-ui.asciidoc b/docs/apm/using-the-apm-ui.asciidoc
index 818e4429d25af..95ec41cf8a403 100644
--- a/docs/apm/using-the-apm-ui.asciidoc
+++ b/docs/apm/using-the-apm-ui.asciidoc
@@ -8,15 +8,18 @@ Not to worry, we've created this guide to help you get the most out of Elastic A
 
 APM is available via the navigation sidebar in {Kib}.
 
-* <<filters,Filters>>
-* <<services,Services overview>>
-* <<traces,Traces overview>>
-* <<transactions,Transaction overview>>
-* <<spans,Span timeline visualization>>
-* <<errors,Debug errors>>
-* <<metrics,Metrics overview>>
-* <<machine-learning-integration,Machine learning integration>>
-* <<query-bar,Advanced queries>>
+* <<filters>>
+* <<services>>
+* <<traces>>
+* <<transactions>>
+* <<spans>>
+* <<errors>>
+* <<metrics>>
+* <<machine-learning-integration>>
+* <<agent-configuration>>
+* <<advanced-queries>>
+* <<apm-settings-in-kibana>>
+* <<troubleshooting>>
 
 include::filters.asciidoc[]
 
@@ -36,4 +39,6 @@ include::agent-configuration.asciidoc[]
 
 include::advanced-queries.asciidoc[]
 
+include::settings.asciidoc[]
+
 include::troubleshooting.asciidoc[]
diff --git a/docs/canvas/canvas-elements.asciidoc b/docs/canvas/canvas-elements.asciidoc
index c5c6f116ee34e..dc605a47de383 100644
--- a/docs/canvas/canvas-elements.asciidoc
+++ b/docs/canvas/canvas-elements.asciidoc
@@ -20,24 +20,24 @@ When you add elements to your workpad, you can:
 [[add-canvas-element]]
 === Add elements to your workpad
 
-Choose the elements to display on your workpad, then familiarize yourself with the element using the preconfigured demo data.
+Choose the elements to display on your workpad, then familiarize yourself with the element using the preconfigured demo data. By default, every element you add to a workpad uses demo data until you change the data source. The demo data includes a small sample data set that you can use to experiment with your element.
 
 . Click *Add element*.
 
-. In the *Elements* window, select the element you want to use. 
+. In the *Elements* window, select the element you want to use.
 +
 [role="screenshot"]
 image::images/canvas-element-select.gif[Canvas elements]
 
-. Play around with the default settings and see what the element can do. 
+. Play around with the default settings and see what the element can do.
 
-TIP: Want to use a different element? You can delete the element by selecting it, clicking the *Element options* icon in the top right corner, then selecting *Delete*.
+TIP: Want to use a different element? You can delete the element by selecting it, clicking the *Element options* icon in the top right, then selecting *Delete*.
 
 [float]
 [[connect-element-data]]
 === Connect the element to your data
 
-When you are ready to move on from the demo data, connect the element to your own data.
+When you have finished using the demo data, connect the element to a data source.
 
 . Make sure that the element is selected, then select *Data*.
 
@@ -45,55 +45,51 @@ When you are ready to move on from the demo data, connect the element to your ow
 
 [float]
 [[elasticsearch-sql-data-source]]
-==== Connect to Elasticsearch SQL
+==== Connect to {es} SQL
 
-Access your data in Elasticsearch using the Elasticsearch SQL syntax.
+Access your data in {es} using SQL syntax. For information about SQL syntax, refer to {ref}/sql-spec.html[SQL language].
 
-Unfamiliar with writing Elasticsearch SQL queries? For more information, refer to {ref}/sql-spec.html[SQL language].
+. Click *{es} SQL*.
 
-. Click *Elasticsearch SQL*.
+. In the *{es} SQL query* box, enter your query, then *Preview* it.
 
-. In the *Elasticearch SQL query* box, enter your query, then *Preview* it.
-
-. If everything looks correct, *Save* it. 
+. If everything looks correct, *Save* it.
 
 [float]
 [[elasticsearch-raw-doc-data-source]]
-==== Connect to Elasticsearch raw data
+==== Connect to {es} raw data
 
-Use the Lucene query syntax to use your raw data in Elasticsearch.
+Access your raw data in {es} without the use of aggregations. Use {es} raw data when you have low volume datasets, or to plot exact, non-aggregated values.
 
-For for more information about the Lucene query string sytax, refer to <<lucene-query,Lucene Query Syntax>>.
+To use targeted queries, you can enter a query using the <<lucene-query,Lucene Query Syntax>>.
 
-. Click *Elasticsearch raw documents*.
+. Click *{es} raw documents*.
 
-. In the *Index* field, enter the index pattern that you want to display. 
+. In the *Index* field, enter the index pattern that you want to display.
 
 . From the *Fields* dropdown, select the associated fields you want to display.
 
 . To sort the data, select an option from the *Sort Field* and *Sort Order* dropdowns.
 
-. For more targeted queries, enter a *Query* using the Lucene query string syntax. 
+. For more targeted queries, enter a *Query* using the Lucene query string syntax.
 
-. *Preview* the query. 
+. *Preview* the query.
 
-. If your query looks correct, *Save* it. 
+. If your query looks correct, *Save* it.
 
 [float]
 [[timelion-data-source]]
 ==== Connect to Timelion
 
-Use <<timelion,Timelion>> queries to use your time series data. 
+Access your time series data using <<timelion,Timelion>> queries. To use Timelion queries, you can enter a query using the <<lucene-query,Lucene Query Syntax>>.
 
 . Click *Timelion*.
 
-. Enter a *Query* using the Lucene query string syntax. 
-+
-For for more information about the Lucene query string syntax, refer to <<lucene-query,Lucene Query Syntax>>.
+. Enter a *Query* using the Lucene query string syntax.
 
 . Enter the *Interval*, then *Preview* the query.
 
-. If your query looks correct, *Save* it. 
+. If your query looks correct, *Save* it.
 
 [float]
 [[configure-display-options]]
@@ -109,7 +105,7 @@ When you connect your element to a data source, the element often appears as a w
 
 . Click *Display*
 
-. Change the display options for the element. 
+. Change the display options for the element.
 
 [float]
 [[element-display-container]]
@@ -122,7 +118,7 @@ Further define the appearance of the element container and border.
 . Expand *Container style*.
 
 . Change the *Appearance* and *Border* options.
- 
+
 [float]
 [[apply-element-styles]]
 ==== Apply a set of styles
@@ -155,7 +151,7 @@ Increase or decrease how often your data refreshes on your workpad.
 [role="screenshot"]
 image::images/canvas-refresh-interval.png[Element data refresh interval]
 
-TIP: To manually refresh the data, click the *Refresh data* icon. 
+TIP: To manually refresh the data, click the *Refresh data* icon.
 
 [float]
 [[organize-element]]
@@ -223,7 +219,7 @@ Change the order of how the elements are displayed on your workpad.
 
 . Select an element.
 
-. In the top right corder, click the *Element options* icon. 
+. In the top right corder, click the *Element options* icon.
 
 . Select *Order*, then select the order that you want the element to appear.
 
@@ -262,7 +258,7 @@ When you have run out of room on your workpad page, add more pages.
 
 . Click *Page 1*, then click *+*.
 
-. On the *Page* editor panel on the right, select the page transition from the *Transition* dropdown. 
+. On the *Page* editor panel on the right, select the page transition from the *Transition* dropdown.
 +
 [role="screenshot"]
 image::images/canvas-add-pages.gif[Add pages]
diff --git a/docs/canvas/canvas-expression-lifecycle.asciidoc b/docs/canvas/canvas-expression-lifecycle.asciidoc
new file mode 100644
index 0000000000000..895c1382c4d36
--- /dev/null
+++ b/docs/canvas/canvas-expression-lifecycle.asciidoc
@@ -0,0 +1,261 @@
+[role="xpack"]
+[[canvas-expression-lifecycle]]
+== Canvas expression lifecycle
+
+Elements in Canvas are all created using an *expression language* that defines how to retrieve, manipulate, and ultimately visualize data. The goal is to allow you to do most of what you need without understanding the *expression language*, but learning how it works unlocks a lot of Canvas's power.
+
+
+[[canvas-expressions-always-start-with-a-function]]
+=== Expressions always start with a function
+
+Expressions simply execute <<canvas-function-reference, functions>> in a specific order, which produce some output value. That output can then be inserted into another function, and another after that, until it produces the output you need. 
+
+To use demo dataset available in Canvas to produce a table, run the following expression:
+
+[source,text]
+----
+filters
+| demodata
+| table
+| render
+----
+
+This expression starts out with the <<filters_fn, filters>> function, which provides the value of any time filters or dropdown filters in the workpad. This is then inserted into <<demodata_fn, demodata>>, a function that returns exactly what you expect, demo data. Because the <<demodata_fn, demodata>> function receives the filter information from the <<filters_fn, filters>> function before it, it applies those filters to reduce the set of data it returns. We call the output from the previous function _context_.
+
+The filtered <<demodata_fn, demo data>> becomes the _context_ of the next function, <<table_fn, table>>, which creates a table visualization from this data set. The <<table_fn, table>> function isn’t strictly required, but by being explicit, you have the option of providing arguments to control things like the font used in the table. The output of the <<table_fn, table>> function becomes the _context_ of the <<render_fn, render>> function. Like the <<table_fn, table>>, the <<render_fn, render>> function isn’t required either, but it allows access to other arguments, such as styling the border of the element or injecting custom CSS.
+
+
+[[canvas-function-arguments]]
+=== Function arguments
+
+Let’s look at another expression, which uses the same <<demodata_fn, demodata>> function, but instead produces a pie chart.
+
+image::images/canvas-functions-can-take-arguments-pie-chart.png[Pie Chart, height=400]
+[source,text]
+----
+filters
+| demodata
+| pointseries color="state" size="max(price)"
+| pie
+| render
+----
+
+To produce a filtered set of random data, the expression uses the <<filters_fn, filters>> and <<demodata_fn, demodata>> functions. This time, however, the output becomes the context for the <<pointseries_fn, pointseries>> function, which is a way to aggregate your data, similar to how Elasticsearch works, but more generalized. In this case, the data is split up using the `color` and `size` dimensions, using arguments on the <<pointseries_fn, pointseries>> function. Each unique value in the state column will have an associated size value, which in this case, will be the maximum value of the price column.
+
+If the expression stopped there, it would produce a `pointseries` data type as the output of this expression. But instead of looking at the raw values, the result is inserted into the <<pie_fn, pie>> function, which will produce an output that will render a pie visualization. And just like before, this is inserted into the <<render_fn, render>> function, which is useful for its arguments.
+
+The end result is a simple pie chart that uses the default color palette, but the <<pie_fn, pie>> function can take additional arguments that control how it gets rendered. For example, you can provide a `hole` argument to turn your pie chart into a donut chart by changing the expression to:
+
+
+image::images/canvas-functions-can-take-arguments-donut-chart.png[Donut Chart, height=400]
+[source,text]
+----
+filters
+| demodata
+| pointseries color="state" size="max(price)"
+| pie hole=50
+| render
+----
+
+
+[[canvas-aliases-and-unnamed-arguments]]
+=== Aliases and unnamed arguments
+
+Argument definitions have one canonical name, which is always provided in the underlying code. When argument definitions are used in an expression, they often include aliases that make them easier or faster to type.
+
+For example, the <<mapColumn_fn, mapColumn>> function has 2 arguments:
+
+* `expression` - Produces a calculated value.
+* `name` - The name of column.
+
+The `expression` argument includes some aliases, namely `exp`, `fn`, and `function`. That means that you can use any of those four options to provide that argument’s value. 
+
+So `mapColumn name=newColumn fn={string example}` is equal to `mapColumn name=newColumn expression={string example}`.
+
+There’s also a special type of alias which allows you to leave off the argument’s name entirely. The alias for this is an underscore, which indicates that the argument is an _unnamed_ argument and can be provided without explicitly naming it in the expression. The `name` argument here uses the _unnamed_ alias, which means that you can further simplify our example to `mapColumn newColumn fn={string example}`.
+
+NOTE: There can only be one _unnamed_ argument for each function.
+
+
+[[canvas-change-your-expression-change-your-output]]
+=== Change your expression, change your output
+You can substitute one function for another to change the output. For example, you could change the visualization by swapping out the <<pie_fn, pie>> function for another renderer, a function that returns a `render` data type. 
+
+Let’s change that last pie chart into a bubble chart by replacing the <<pie_fn, pie>> function with the <<plot_fn, plot>> function. This is possible because both functions can accept a `pointseries` data type as their _context_. Switching the functions will work, but it won’t produce a useful visualization on its own since you don’t have the x-axis and y-axis defined. You will also need to modify the <<pointseries_fn, pointseries>> function to change its output. In this case, you can change the `size` argument to `y`, so the maximum price values are plotted on the y-axis, and add an `x` argument using the `@timestamp` field in the data to plot those values over time. This leaves you with the following expression and produces a bubble chart showing the max price of each state over time:
+
+image::images/canvas-change-your-expression-chart.png[Bubble Chart, height=400]
+[source,text]
+----
+filters
+| demodata
+| pointseries color="state" y="max(price)" x="@timestamp"
+| plot
+| render
+----
+
+Similar to the <<pie_fn, pie>> function, the <<plot_fn, plot>> function takes arguments that control the design elements of the visualization. As one example, passing a `legend` argument with a value of `false` to the function will hide the legend on the chart.
+
+image::images/canvas-change-your-expression-chart-no-legend.png[Bubble Chart Without Legend, height=400]
+[source,text,subs=+quotes]
+----
+filters
+| demodata
+| pointseries color="state" y="max(price)" x="@timestamp"
+| plot *legend=false*
+| render
+----
+
+
+[[canvas-fetch-and-manipulate-data]]
+=== Fetch and manipulate data
+So far, you have only seen expressions as a way to produce visualizations, but that’s not really what’s happening. Expressions only produce data, which is then used to create something, which in the case of Canvas, means rendering an element. An element can be a visualization, driven by data, but it can also be something much simpler, like a static image. Either way, an expression is used to produce an output that is used to render the desired result. For example, here’s an expression that shows an image:
+
+[source,text]
+----
+image dataurl=https://placekitten.com/160/160 mode="cover"
+----
+
+But as mentioned, this doesn’t actually _render that image_, but instead it _produces some output that can be used to render that image_. That’s an important distinction, and you can see the actual output by adding in the render function and telling it to produce debug output. For example:
+
+[source,text]
+----
+image dataurl=https://placekitten.com/160/160 mode="cover"
+| render as=debug
+----
+
+The follow appears as JSON output:
+
+[source,JSON]
+----
+{
+  "type": "image",
+  "mode": "cover",
+  "dataurl": "https://placekitten.com/160/160"
+}
+----
+
+NOTE: You may need to expand the element’s size to see the whole output.
+
+Canvas uses this output’s data type to map to a specific renderer and passes the entire output into it. It’s up to the image render function to produce an image on the workpad’s page. In this case, the expression produces some JSON output, but expressions can also produce other, simpler data, like a string or a number. Typically, useful results use JSON.
+
+Canvas uses the output to render an element, but other applications can use expressions to do pretty much anything. As stated previously, expressions simply execute functions, and the functions are all written in Javascript. That means if you can do something in Javascript, you can do it with an expression. 
+
+This can include:
+
+* Sending emails
+* Sending notifications
+* Reading from a file
+* Writing to a file
+* Controlling devices with WebUSB or Web Bluetooth
+* Consuming external APIs
+
+If your Javascript works in the environment where the code will run, such as in Node.js or in a browser, you can do it with an expression.
+
+[[canvas-expressions-compose-functions-with-subexpressions]]
+=== Compose functions with sub-expressions
+
+You may have noticed another syntax in examples from other sections, namely expressions inside of curly brackets. These are called sub-expressions, and they can be used to provide a calculated value to another expression, instead of just a static one.
+
+A simple example of this is when you upload your own images to a Canvas workpad. That upload becomes an asset, and that asset can be retrieved using the `asset` function. Usually you’ll just do this from the UI, adding an image element to the page and uploading your image from the control in the sidebar, or picking an existing asset from there as well. In both cases, the system will consume that asset via the `asset` function, and you’ll end up with an expression similar to this:
+
+[source,text]
+----
+image dataurl={asset 3cb3ec3a-84d7-48fa-8709-274ad5cc9e0b}
+----
+
+Sub-expressions are executed before the function that uses them is executed. In this case, `asset` will be run first, it will produce a value, the base64-encoded value of the image and that value will be used as the value for the `dataurl` argument in the <<image_fn, image>> function. After the asset function executes, you will get the following output:
+
+[source,text]
+----
+image dataurl="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0"
+----
+
+Since all of the sub-expressions are now resolved into actual values, the <<image_fn, image>> function can be executed to produce its JSON output, just as it’s explained previously. In the case of images, the ability to nest sub-expressions is particularly useful to show one of several images conditionally. For example, you could swap between two images based on some calculated value by mixing in the <<if_fn, if>> function, like in this example expression:
+
+[source,text]
+----
+demodata
+| image dataurl={
+  if condition={getCell price | gte 100} 
+    then={asset 3cb3ec3a-84d7-48fa-8709-274ad5cc9e0b} 
+    else={asset cbc11a1f-8f25-4163-94b4-2c3a060192e7}
+}
+----
+
+NOTE: The examples in this section can’t be copy and pasted directly, since the values used throughout will not exist in your workpad.
+
+Here, the expression to use for the value of the `condition` argument, `getCell price | gte 100`, runs first since it is nested deeper.
+
+The expression does the following:
+
+* Retrieves the value from the *price* column in the first row of the `demodata` data table
+* Inputs the value to the `gte` function
+* Compares the value to `100`
+* Returns `true` if the value is 100 or greater, and `false` if the value is 100 or less
+
+That boolean value becomes the value for the `condition` argument. The output from the `then` expression is used as the output when `condition` is `true`. The output from the `else` expression is used when `condition` is false. In both cases, a base64-encoded image will be returned, and one of the two images will be displayed.
+
+You might be wondering how the <<getCell_fn, getCell>> function in the sub-expression accessed the data from the <<demodata_fn, demoData>> function, even though <<demodata_fn, demoData>> was not being directly inserted into <<getCell_fn, getCell>>. The answer is simple, but important to understand. When nested sub-expressions are executed, they automatically receive the same _context_, or output of the previous function that its parent function receives. In this specific expression, demodata’s data table is automatically provided to the nested expression’s `getCell` function, which allows that expression to pull out a value and compare it to another value. 
+
+The passing of the _context_ is automatic, and it happens no matter how deeply you nest your sub-expressions. To demonstrate this, let’s modify the expression slightly to compare the value of the price against multiple conditions using the <<all_fn, all>> function. 
+
+[source,text]
+----
+demodata
+| image dataurl={
+  if condition={getCell price | all {gte 100} {neq 105}} 
+    then={asset 3cb3ec3a-84d7-48fa-8709-274ad5cc9e0b} 
+    else={asset cbc11a1f-8f25-4163-94b4-2c3a060192e7}
+}
+----
+
+This time, `getCell price` is run, and the result is passed into the next function as the context.  Then, each sub-expression of the <<all_fn, all>> function is run, with the context given to their parent, which in this case is the result of `getCell price`. If `all` of these sub-expressions evaluate to `true`, then the `if` condition argument will be true. 
+
+Sub-expressions can seem a little foreign, especially if you aren’t a developer, but they’re worth getting familiar with, since they provide a ton of power and flexibility. Since you can nest any expression you want, you can also use this behavior to mix data from multiple indices, or even data from multiple sources. As an example, you could query an API for a value to use as part of the query provided to <<essql_fn, essql>>. 
+
+This whole section is really just scratching the surface, but hopefully after reading it, you at least understand how to read expressions and make sense of what they are doing. With a little practice, you’ll get the hang of mixing _context_ and sub-expressions together to turn any input into your desired output.
+
+[[canvas-handling-context-and-argument-types]]
+=== Handling context and argument types
+If you look through the <<canvas-function-reference,function docs>>, you may notice that all of them define what a function accepts and what it returns. Additionally, every argument includes a type property that specifies the kind of data that can be used. These two types of values are actually the same, and can be used as a guide for how to deal with piping to other functions and using subexpressions for argument values. 
+
+To explain how this works, consider the following expression from the previous section:
+
+[source,text]
+----
+image dataurl={asset 3cb3ec3a-84d7-48fa-8709-274ad5cc9e0b}
+----
+
+If you <<image_fn,look at the docs>> for the `image` function, you’ll see that it accepts the `null` data type and returns an `image` data type. Accepting `null` effectively means that it does not use context at all, so if you insert anything to `image`, the value that was produced previously will be ignored. When the function executes, it will produce an `image` output, which is simply an object of type `image` that contains the information required to render an image. 
+
+NOTE: The function does not render an image itself.
+
+As explained in the "<<canvas-fetch-and-manipulate-data, Fetch and manipulate data>>" section, the output of an expression is just data. So the `image` type here is just a specific shape of data, not an actual image.
+
+Next, let’s take a look at the `asset` function. Like `image`, it accepts `null`, but it returns something different, a `string` in this case. Because `asset` will produce a string, its output can be used as the input for any function or argument that accepts a string. 
+
+<<asset_fn,Looking at the docs>> for the `dataurl` argument, its type is `string`, meaning it will accept any kind of string. There are some rules about the value of the string that the function itself enforces, but as far as the interpreter is concerned, that expression is valid because the argument accepts a string and the output of `asset` is a string. 
+
+The interpreter also attempts to cast some input types into others, which allows you to use a string input even when the function or argument calls for a number. Keep in mind that it’s not able to convert any string value, but if the string is a number, it can easily be cast into a `number` type. Take the following expression for example:
+
+[source,text]
+----
+string "0.4"
+| revealImage image={asset asset-06511b39-ec44-408a-a5f3-abe2da44a426}
+----
+
+If you <<revealImage_fn,check the docs>> for the `revealImage` function, you’ll see that it accepts a `number` but the `string` function returns a `string` type. In this case, because the string value is a number, it can be converted into a `number` type and used without you having to do anything else. 
+
+Most `primitive` types can be converted automatically, as you might expect. You just saw that a `string` can be cast into a `number`, but you can also pretty easily cast things into `boolean` too, and you can cast anything to `null`. 
+
+There are other useful type casting options available. For example, something of type `datatable` can be cast to a type `pointseries` simply by only preserving specific columns from the data (namely x, y, size, color, and text). This allows you to treat your source data, which is generally of type `datatable`, like a `pointseries` type simply by convention. 
+
+You can fetch data from Elasticsearch using `essql`, which allows you to aggregate the data, provide a custom name for the value, and insert that data directly to another function that only accepts `pointseries` even though `essql` will output a `datatable` type. This makes the following example expression valid:
+
+[source,text]
+----
+essql "SELECT user AS x, sum(cost) AS y FROM index GROUP BY user"
+| plot
+----
+
+In the docs you can see that `essql` returns a `datatable` type, but `plot` expects a `pointseries` context. This works because the `datatable` output will have the columns `x` and `y` as a result of using `AS` in the sql statement to name them. Because the data follows the convention of the `pointseries` data type, casting it into `pointseries` is possible, and it can be passed directly to `plot` as a result. 
diff --git a/docs/developer/plugin/development-uiexports.asciidoc b/docs/developer/plugin/development-uiexports.asciidoc
index 6368446f7fb43..18d326cbfb9c0 100644
--- a/docs/developer/plugin/development-uiexports.asciidoc
+++ b/docs/developer/plugin/development-uiexports.asciidoc
@@ -9,8 +9,8 @@ An aggregate list of available UiExport types:
 | hacks | Any module that should be included in every application
 | visTypes | Modules that register providers with the `ui/registry/vis_types` registry.
 | inspectorViews | Modules that register custom inspector views via the `viewRegistry` in `ui/inspector`.
-| chromeNavControls | Modules that register providers with the `ui/registry/chrome_nav_controls` registry.
-| navbarExtensions | Modules that register providers with the `ui/registry/navbar_extensions` registry.
-| docViews | Modules that register providers with the `ui/registry/doc_views` registry.
+| chromeNavControls | Modules that register providers with the `ui/registry/chrome_header_nav_controls` registry.
+| navbarExtensions | Modules that register providers with the setup contract of the `navigation` plugin.
+| docViews | Modules that register providers with the setup contract method `addDocView` of the `discover` plugin.
 | app | Adds an application to the system. This uiExport type is defined as an object of metadata rather than just a module id.
 |=======================================================================
diff --git a/docs/development/core/public/kibana-plugin-public.app.approute.md b/docs/development/core/public/kibana-plugin-public.app.approute.md
new file mode 100644
index 0000000000000..7f35f4346b6b3
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.app.approute.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; [App](./kibana-plugin-public.app.md) &gt; [appRoute](./kibana-plugin-public.app.approute.md)
+
+## App.appRoute property
+
+Override the application's routing path from `/app/${id}`<!-- -->. Must be unique across registered applications. Should not include the base path from HTTP.
+
+<b>Signature:</b>
+
+```typescript
+appRoute?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.app.md b/docs/development/core/public/kibana-plugin-public.app.md
index edab4f88497f6..acf07cbf62e91 100644
--- a/docs/development/core/public/kibana-plugin-public.app.md
+++ b/docs/development/core/public/kibana-plugin-public.app.md
@@ -16,6 +16,7 @@ export interface App extends AppBase
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [appRoute](./kibana-plugin-public.app.approute.md) | <code>string</code> | Override the application's routing path from <code>/app/${id}</code>. Must be unique across registered applications. Should not include the base path from HTTP. |
 |  [chromeless](./kibana-plugin-public.app.chromeless.md) | <code>boolean</code> | Hide the UI chrome when the application is mounted. Defaults to <code>false</code>. Takes precedence over chrome service visibility settings. |
 |  [mount](./kibana-plugin-public.app.mount.md) | <code>AppMount &#124; AppMountDeprecated</code> | A mount function called when the user navigates to this app's route. May have signature of [AppMount](./kibana-plugin-public.appmount.md) or [AppMountDeprecated](./kibana-plugin-public.appmountdeprecated.md)<!-- -->. |
 
diff --git a/docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md b/docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md
index a1544373ee698..7cd709d615729 100644
--- a/docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md
+++ b/docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md
@@ -4,7 +4,7 @@
 
 ## AppMountParameters.appBasePath property
 
-The base path for configuring the application's router.
+The route path for configuring navigation to the application. This string should not include the base path from HTTP.
 
 <b>Signature:</b>
 
@@ -22,6 +22,7 @@ export class MyPlugin implements Plugin {
   setup({ application }) {
     application.register({
      id: 'my-app',
+     appRoute: '/my-app',
      async mount(params) {
        const { renderApp } = await import('./application');
        return renderApp(params);
diff --git a/docs/development/core/public/kibana-plugin-public.appmountparameters.md b/docs/development/core/public/kibana-plugin-public.appmountparameters.md
index 8733f9cd4915d..aa5ca93ed8ff0 100644
--- a/docs/development/core/public/kibana-plugin-public.appmountparameters.md
+++ b/docs/development/core/public/kibana-plugin-public.appmountparameters.md
@@ -15,6 +15,6 @@ export interface AppMountParameters
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [appBasePath](./kibana-plugin-public.appmountparameters.appbasepath.md) | <code>string</code> | The base path for configuring the application's router. |
+|  [appBasePath](./kibana-plugin-public.appmountparameters.appbasepath.md) | <code>string</code> | The route path for configuring navigation to the application. This string should not include the base path from HTTP. |
 |  [element](./kibana-plugin-public.appmountparameters.element.md) | <code>HTMLElement</code> | The container element to render the application into. |
 
diff --git a/docs/development/core/public/kibana-plugin-public.chromedoctitle.md b/docs/development/core/public/kibana-plugin-public.chromedoctitle.md
index 3c6cfab486288..feb3b3ab966ef 100644
--- a/docs/development/core/public/kibana-plugin-public.chromedoctitle.md
+++ b/docs/development/core/public/kibana-plugin-public.chromedoctitle.md
@@ -12,13 +12,6 @@ APIs for accessing and updating the document title.
 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
@@ -37,3 +30,10 @@ chrome.docTitle.reset()
 
 ```
 
+## 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.) |
+
diff --git a/docs/development/core/public/kibana-plugin-public.chromenavcontrols.md b/docs/development/core/public/kibana-plugin-public.chromenavcontrols.md
index a34db9bb33d9d..30b9a6869d1ff 100644
--- a/docs/development/core/public/kibana-plugin-public.chromenavcontrols.md
+++ b/docs/development/core/public/kibana-plugin-public.chromenavcontrols.md
@@ -12,13 +12,6 @@
 export interface ChromeNavControls 
 ```
 
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [registerLeft(navControl)](./kibana-plugin-public.chromenavcontrols.registerleft.md) | Register a nav control to be presented on the left side of the chrome header. |
-|  [registerRight(navControl)](./kibana-plugin-public.chromenavcontrols.registerright.md) | Register a nav control to be presented on the right side of the chrome header. |
-
 ## Example
 
 Register a left-side nav control rendered with React.
@@ -33,3 +26,10 @@ chrome.navControls.registerLeft({
 
 ```
 
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [registerLeft(navControl)](./kibana-plugin-public.chromenavcontrols.registerleft.md) | Register a nav control to be presented on the left side of the chrome header. |
+|  [registerRight(navControl)](./kibana-plugin-public.chromenavcontrols.registerright.md) | Register a nav control to be presented on the right side of the chrome header. |
+
diff --git a/docs/development/core/public/kibana-plugin-public.chromestart.md b/docs/development/core/public/kibana-plugin-public.chromestart.md
index d5d99f3d5be65..4e44e5bf05074 100644
--- a/docs/development/core/public/kibana-plugin-public.chromestart.md
+++ b/docs/development/core/public/kibana-plugin-public.chromestart.md
@@ -12,6 +12,31 @@ ChromeStart allows plugins to customize the global chrome header UI and enrich t
 export interface ChromeStart 
 ```
 
+## Remarks
+
+While ChromeStart exposes many APIs, they should be used sparingly and the developer should understand how they affect other plugins and applications.
+
+## Example 1
+
+How to add a recently accessed item to the sidebar:
+
+```ts
+core.chrome.recentlyAccessed.add('/app/map/1234', 'Map 1234', '1234');
+
+```
+
+## Example 2
+
+How to set the help dropdown extension:
+
+```tsx
+core.chrome.setHelpExtension(elem => {
+  ReactDOM.render(<MyHelpComponent />, elem);
+  return () => ReactDOM.unmountComponentAtNode(elem);
+});
+
+```
+
 ## Properties
 
 |  Property | Type | Description |
@@ -43,28 +68,3 @@ export interface ChromeStart
 |  [setIsCollapsed(isCollapsed)](./kibana-plugin-public.chromestart.setiscollapsed.md) | Set the collapsed state of the chrome navigation. |
 |  [setIsVisible(isVisible)](./kibana-plugin-public.chromestart.setisvisible.md) | Set the temporary visibility for the chrome. This does nothing if the chrome is hidden by default and should be used to hide the chrome for things like full-screen modes with an exit button. |
 
-## Remarks
-
-While ChromeStart exposes many APIs, they should be used sparingly and the developer should understand how they affect other plugins and applications.
-
-## Example 1
-
-How to add a recently accessed item to the sidebar:
-
-```ts
-core.chrome.recentlyAccessed.add('/app/map/1234', 'Map 1234', '1234');
-
-```
-
-## Example 2
-
-How to set the help dropdown extension:
-
-```tsx
-core.chrome.setHelpExtension(elem => {
-  ReactDOM.render(<MyHelpComponent />, elem);
-  return () => ReactDOM.unmountComponentAtNode(elem);
-});
-
-```
-
diff --git a/docs/development/core/public/kibana-plugin-public.contextsetup.md b/docs/development/core/public/kibana-plugin-public.contextsetup.md
index a006fa7205ca6..d4399b6ba70c4 100644
--- a/docs/development/core/public/kibana-plugin-public.contextsetup.md
+++ b/docs/development/core/public/kibana-plugin-public.contextsetup.md
@@ -12,12 +12,6 @@ An object that handles registration of context providers and configuring handler
 export interface ContextSetup 
 ```
 
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [createContextContainer()](./kibana-plugin-public.contextsetup.createcontextcontainer.md) | Creates a new [IContextContainer](./kibana-plugin-public.icontextcontainer.md) for a service owner. |
-
 ## Remarks
 
 A [IContextContainer](./kibana-plugin-public.icontextcontainer.md) can be used by any Core service or plugin (known as the "service owner") which wishes to expose APIs in a handler function. The container object will manage registering context providers and configuring a handler with all of the contexts that should be exposed to the handler's plugin. This is dependent on the dependencies that the handler's plugin declares.
@@ -136,3 +130,9 @@ class VizRenderingPlugin {
 
 ```
 
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [createContextContainer()](./kibana-plugin-public.contextsetup.createcontextcontainer.md) | Creates a new [IContextContainer](./kibana-plugin-public.icontextcontainer.md) for a service owner. |
+
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.addloadingcount.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.addloadingcount.md
deleted file mode 100644
index e984fea48625d..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.addloadingcount.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- 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; [addLoadingCount](./kibana-plugin-public.httpservicebase.addloadingcount.md)
-
-## HttpServiceBase.addLoadingCount() method
-
-Adds a new source of loading counts. Used to show the global loading indicator when sum of all observed counts are more than 0.
-
-<b>Signature:</b>
-
-```typescript
-addLoadingCount(countSource$: Observable<number>): void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  countSource$ | <code>Observable&lt;number&gt;</code> |  |
-
-<b>Returns:</b>
-
-`void`
-
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.anonymouspaths.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.anonymouspaths.md
deleted file mode 100644
index e94757c5eb031..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.anonymouspaths.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-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.basepath.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.basepath.md
deleted file mode 100644
index 6c5f690a5c607..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.basepath.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-public](./kibana-plugin-public.md) &gt; [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) &gt; [basePath](./kibana-plugin-public.httpservicebase.basepath.md)
-
-## HttpServiceBase.basePath property
-
-APIs for manipulating the basePath on URL segments.
-
-<b>Signature:</b>
-
-```typescript
-basePath: IBasePath;
-```
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.delete.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.delete.md
deleted file mode 100644
index 73022ef4f2946..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.delete.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-public](./kibana-plugin-public.md) &gt; [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) &gt; [delete](./kibana-plugin-public.httpservicebase.delete.md)
-
-## HttpServiceBase.delete property
-
-Makes an HTTP request with the DELETE method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
-
-<b>Signature:</b>
-
-```typescript
-delete: HttpHandler;
-```
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.fetch.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.fetch.md
deleted file mode 100644
index 3a1ae4892a3dd..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.fetch.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-public](./kibana-plugin-public.md) &gt; [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) &gt; [fetch](./kibana-plugin-public.httpservicebase.fetch.md)
-
-## HttpServiceBase.fetch property
-
-Makes an HTTP request. Defaults to a GET request unless overriden. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
-
-<b>Signature:</b>
-
-```typescript
-fetch: HttpHandler;
-```
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.get.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.get.md
deleted file mode 100644
index a61b3dd140e50..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.get.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-public](./kibana-plugin-public.md) &gt; [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) &gt; [get](./kibana-plugin-public.httpservicebase.get.md)
-
-## HttpServiceBase.get property
-
-Makes an HTTP request with the GET method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
-
-<b>Signature:</b>
-
-```typescript
-get: HttpHandler;
-```
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.getloadingcount_.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.getloadingcount_.md
deleted file mode 100644
index 0b2129330cd01..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.getloadingcount_.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 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; [getLoadingCount$](./kibana-plugin-public.httpservicebase.getloadingcount_.md)
-
-## HttpServiceBase.getLoadingCount$() method
-
-Get the sum of all loading count sources as a single Observable.
-
-<b>Signature:</b>
-
-```typescript
-getLoadingCount$(): Observable<number>;
-```
-<b>Returns:</b>
-
-`Observable<number>`
-
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.head.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.head.md
deleted file mode 100644
index 4624d95f03bf3..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.head.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-public](./kibana-plugin-public.md) &gt; [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) &gt; [head](./kibana-plugin-public.httpservicebase.head.md)
-
-## HttpServiceBase.head property
-
-Makes an HTTP request with the HEAD method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
-
-<b>Signature:</b>
-
-```typescript
-head: HttpHandler;
-```
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.intercept.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.intercept.md
deleted file mode 100644
index 8cf5bf813df09..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.intercept.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- 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; [intercept](./kibana-plugin-public.httpservicebase.intercept.md)
-
-## HttpServiceBase.intercept() method
-
-Adds a new [HttpInterceptor](./kibana-plugin-public.httpinterceptor.md) to the global HTTP client.
-
-<b>Signature:</b>
-
-```typescript
-intercept(interceptor: HttpInterceptor): () => void;
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  interceptor | <code>HttpInterceptor</code> |  |
-
-<b>Returns:</b>
-
-`() => void`
-
-a function for removing the attached interceptor.
-
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.md
deleted file mode 100644
index 9ea77c95b343e..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.md
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- 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)
-
-## HttpServiceBase interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface HttpServiceBase 
-```
-
-## Properties
-
-|  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. |
-|  [get](./kibana-plugin-public.httpservicebase.get.md) | <code>HttpHandler</code> | Makes an HTTP request with the GET method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
-|  [head](./kibana-plugin-public.httpservicebase.head.md) | <code>HttpHandler</code> | Makes an HTTP request with the HEAD method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
-|  [options](./kibana-plugin-public.httpservicebase.options.md) | <code>HttpHandler</code> | Makes an HTTP request with the OPTIONS method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
-|  [patch](./kibana-plugin-public.httpservicebase.patch.md) | <code>HttpHandler</code> | Makes an HTTP request with the PATCH method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
-|  [post](./kibana-plugin-public.httpservicebase.post.md) | <code>HttpHandler</code> | Makes an HTTP request with the POST method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
-|  [put](./kibana-plugin-public.httpservicebase.put.md) | <code>HttpHandler</code> | Makes an HTTP request with the PUT method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
-
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [addLoadingCount(countSource$)](./kibana-plugin-public.httpservicebase.addloadingcount.md) | Adds a new source of loading counts. Used to show the global loading indicator when sum of all observed counts are more than 0. |
-|  [getLoadingCount$()](./kibana-plugin-public.httpservicebase.getloadingcount_.md) | Get the sum of all loading count sources as a single Observable. |
-|  [intercept(interceptor)](./kibana-plugin-public.httpservicebase.intercept.md) | Adds a new [HttpInterceptor](./kibana-plugin-public.httpinterceptor.md) to the global HTTP client. |
-|  [removeAllInterceptors()](./kibana-plugin-public.httpservicebase.removeallinterceptors.md) | Removes all configured interceptors. |
-
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.options.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.options.md
deleted file mode 100644
index 0820beb2752f2..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.options.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-public](./kibana-plugin-public.md) &gt; [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) &gt; [options](./kibana-plugin-public.httpservicebase.options.md)
-
-## HttpServiceBase.options property
-
-Makes an HTTP request with the OPTIONS method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
-
-<b>Signature:</b>
-
-```typescript
-options: HttpHandler;
-```
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.patch.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.patch.md
deleted file mode 100644
index 00e1ffc0e16bf..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.patch.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-public](./kibana-plugin-public.md) &gt; [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) &gt; [patch](./kibana-plugin-public.httpservicebase.patch.md)
-
-## HttpServiceBase.patch property
-
-Makes an HTTP request with the PATCH method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
-
-<b>Signature:</b>
-
-```typescript
-patch: HttpHandler;
-```
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.post.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.post.md
deleted file mode 100644
index 3771a7c910895..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.post.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-public](./kibana-plugin-public.md) &gt; [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) &gt; [post](./kibana-plugin-public.httpservicebase.post.md)
-
-## HttpServiceBase.post property
-
-Makes an HTTP request with the POST method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
-
-<b>Signature:</b>
-
-```typescript
-post: HttpHandler;
-```
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.put.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.put.md
deleted file mode 100644
index 6e43aafa916bc..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.put.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-public](./kibana-plugin-public.md) &gt; [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) &gt; [put](./kibana-plugin-public.httpservicebase.put.md)
-
-## HttpServiceBase.put property
-
-Makes an HTTP request with the PUT method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
-
-<b>Signature:</b>
-
-```typescript
-put: HttpHandler;
-```
diff --git a/docs/development/core/public/kibana-plugin-public.httpservicebase.removeallinterceptors.md b/docs/development/core/public/kibana-plugin-public.httpservicebase.removeallinterceptors.md
deleted file mode 100644
index 0432ec29a22b6..0000000000000
--- a/docs/development/core/public/kibana-plugin-public.httpservicebase.removeallinterceptors.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 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; [removeAllInterceptors](./kibana-plugin-public.httpservicebase.removeallinterceptors.md)
-
-## HttpServiceBase.removeAllInterceptors() method
-
-Removes all configured interceptors.
-
-<b>Signature:</b>
-
-```typescript
-removeAllInterceptors(): void;
-```
-<b>Returns:</b>
-
-`void`
-
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.addloadingcountsource.md b/docs/development/core/public/kibana-plugin-public.httpsetup.addloadingcountsource.md
new file mode 100644
index 0000000000000..a2fe66bb55c77
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.addloadingcountsource.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [addLoadingCountSource](./kibana-plugin-public.httpsetup.addloadingcountsource.md)
+
+## HttpSetup.addLoadingCountSource() method
+
+Adds a new source of loading counts. Used to show the global loading indicator when sum of all observed counts are more than 0.
+
+<b>Signature:</b>
+
+```typescript
+addLoadingCountSource(countSource$: Observable<number>): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  countSource$ | <code>Observable&lt;number&gt;</code> |  |
+
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.anonymouspaths.md b/docs/development/core/public/kibana-plugin-public.httpsetup.anonymouspaths.md
new file mode 100644
index 0000000000000..a9268ca1d8ed6
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [anonymousPaths](./kibana-plugin-public.httpsetup.anonymouspaths.md)
+
+## HttpSetup.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.httpsetup.basepath.md b/docs/development/core/public/kibana-plugin-public.httpsetup.basepath.md
new file mode 100644
index 0000000000000..6b0726dc8ef2b
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.basepath.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [basePath](./kibana-plugin-public.httpsetup.basepath.md)
+
+## HttpSetup.basePath property
+
+APIs for manipulating the basePath on URL segments.
+
+<b>Signature:</b>
+
+```typescript
+basePath: IBasePath;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.delete.md b/docs/development/core/public/kibana-plugin-public.httpsetup.delete.md
new file mode 100644
index 0000000000000..565f0eb336d4f
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.delete.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [delete](./kibana-plugin-public.httpsetup.delete.md)
+
+## HttpSetup.delete property
+
+Makes an HTTP request with the DELETE method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
+
+<b>Signature:</b>
+
+```typescript
+delete: HttpHandler;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.fetch.md b/docs/development/core/public/kibana-plugin-public.httpsetup.fetch.md
new file mode 100644
index 0000000000000..2d6447363fa9b
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.fetch.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [fetch](./kibana-plugin-public.httpsetup.fetch.md)
+
+## HttpSetup.fetch property
+
+Makes an HTTP request. Defaults to a GET request unless overriden. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
+
+<b>Signature:</b>
+
+```typescript
+fetch: HttpHandler;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.get.md b/docs/development/core/public/kibana-plugin-public.httpsetup.get.md
new file mode 100644
index 0000000000000..0c484e33e9b58
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.get.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [get](./kibana-plugin-public.httpsetup.get.md)
+
+## HttpSetup.get property
+
+Makes an HTTP request with the GET method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
+
+<b>Signature:</b>
+
+```typescript
+get: HttpHandler;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.getloadingcount_.md b/docs/development/core/public/kibana-plugin-public.httpsetup.getloadingcount_.md
new file mode 100644
index 0000000000000..628b62b2ffc27
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.getloadingcount_.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [getLoadingCount$](./kibana-plugin-public.httpsetup.getloadingcount_.md)
+
+## HttpSetup.getLoadingCount$() method
+
+Get the sum of all loading count sources as a single Observable.
+
+<b>Signature:</b>
+
+```typescript
+getLoadingCount$(): Observable<number>;
+```
+<b>Returns:</b>
+
+`Observable<number>`
+
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.head.md b/docs/development/core/public/kibana-plugin-public.httpsetup.head.md
new file mode 100644
index 0000000000000..e4d49c843e572
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.head.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [head](./kibana-plugin-public.httpsetup.head.md)
+
+## HttpSetup.head property
+
+Makes an HTTP request with the HEAD method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
+
+<b>Signature:</b>
+
+```typescript
+head: HttpHandler;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.intercept.md b/docs/development/core/public/kibana-plugin-public.httpsetup.intercept.md
new file mode 100644
index 0000000000000..1bda0c6166e65
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.intercept.md
@@ -0,0 +1,26 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [intercept](./kibana-plugin-public.httpsetup.intercept.md)
+
+## HttpSetup.intercept() method
+
+Adds a new [HttpInterceptor](./kibana-plugin-public.httpinterceptor.md) to the global HTTP client.
+
+<b>Signature:</b>
+
+```typescript
+intercept(interceptor: HttpInterceptor): () => void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  interceptor | <code>HttpInterceptor</code> |  |
+
+<b>Returns:</b>
+
+`() => void`
+
+a function for removing the attached interceptor.
+
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.md b/docs/development/core/public/kibana-plugin-public.httpsetup.md
index 7ef037ea7abd1..8a14d26c57ca3 100644
--- a/docs/development/core/public/kibana-plugin-public.httpsetup.md
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.md
@@ -2,12 +2,35 @@
 
 [Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [HttpSetup](./kibana-plugin-public.httpsetup.md)
 
-## HttpSetup type
+## HttpSetup interface
 
-See [HttpServiceBase](./kibana-plugin-public.httpservicebase.md)
 
 <b>Signature:</b>
 
 ```typescript
-export declare type HttpSetup = HttpServiceBase;
+export interface HttpSetup 
 ```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [anonymousPaths](./kibana-plugin-public.httpsetup.anonymouspaths.md) | <code>IAnonymousPaths</code> | APIs for denoting certain paths for not requiring authentication |
+|  [basePath](./kibana-plugin-public.httpsetup.basepath.md) | <code>IBasePath</code> | APIs for manipulating the basePath on URL segments. |
+|  [delete](./kibana-plugin-public.httpsetup.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.httpsetup.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. |
+|  [get](./kibana-plugin-public.httpsetup.get.md) | <code>HttpHandler</code> | Makes an HTTP request with the GET method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
+|  [head](./kibana-plugin-public.httpsetup.head.md) | <code>HttpHandler</code> | Makes an HTTP request with the HEAD method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
+|  [options](./kibana-plugin-public.httpsetup.options.md) | <code>HttpHandler</code> | Makes an HTTP request with the OPTIONS method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
+|  [patch](./kibana-plugin-public.httpsetup.patch.md) | <code>HttpHandler</code> | Makes an HTTP request with the PATCH method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
+|  [post](./kibana-plugin-public.httpsetup.post.md) | <code>HttpHandler</code> | Makes an HTTP request with the POST method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
+|  [put](./kibana-plugin-public.httpsetup.put.md) | <code>HttpHandler</code> | Makes an HTTP request with the PUT method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options. |
+
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [addLoadingCountSource(countSource$)](./kibana-plugin-public.httpsetup.addloadingcountsource.md) | Adds a new source of loading counts. Used to show the global loading indicator when sum of all observed counts are more than 0. |
+|  [getLoadingCount$()](./kibana-plugin-public.httpsetup.getloadingcount_.md) | Get the sum of all loading count sources as a single Observable. |
+|  [intercept(interceptor)](./kibana-plugin-public.httpsetup.intercept.md) | Adds a new [HttpInterceptor](./kibana-plugin-public.httpinterceptor.md) to the global HTTP client. |
+
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.options.md b/docs/development/core/public/kibana-plugin-public.httpsetup.options.md
new file mode 100644
index 0000000000000..4ea5be8826bff
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.options.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [options](./kibana-plugin-public.httpsetup.options.md)
+
+## HttpSetup.options property
+
+Makes an HTTP request with the OPTIONS method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
+
+<b>Signature:</b>
+
+```typescript
+options: HttpHandler;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.patch.md b/docs/development/core/public/kibana-plugin-public.httpsetup.patch.md
new file mode 100644
index 0000000000000..ef1d50005b012
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.patch.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [patch](./kibana-plugin-public.httpsetup.patch.md)
+
+## HttpSetup.patch property
+
+Makes an HTTP request with the PATCH method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
+
+<b>Signature:</b>
+
+```typescript
+patch: HttpHandler;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.post.md b/docs/development/core/public/kibana-plugin-public.httpsetup.post.md
new file mode 100644
index 0000000000000..1c19c35ac3038
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.post.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [post](./kibana-plugin-public.httpsetup.post.md)
+
+## HttpSetup.post property
+
+Makes an HTTP request with the POST method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
+
+<b>Signature:</b>
+
+```typescript
+post: HttpHandler;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.httpsetup.put.md b/docs/development/core/public/kibana-plugin-public.httpsetup.put.md
new file mode 100644
index 0000000000000..e5243d8c80dae
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.httpsetup.put.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; [HttpSetup](./kibana-plugin-public.httpsetup.md) &gt; [put](./kibana-plugin-public.httpsetup.put.md)
+
+## HttpSetup.put property
+
+Makes an HTTP request with the PUT method. See [HttpHandler](./kibana-plugin-public.httphandler.md) for options.
+
+<b>Signature:</b>
+
+```typescript
+put: HttpHandler;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.httpstart.md b/docs/development/core/public/kibana-plugin-public.httpstart.md
index bb9247c63897a..9abf319acf00d 100644
--- a/docs/development/core/public/kibana-plugin-public.httpstart.md
+++ b/docs/development/core/public/kibana-plugin-public.httpstart.md
@@ -4,10 +4,10 @@
 
 ## HttpStart type
 
-See [HttpServiceBase](./kibana-plugin-public.httpservicebase.md)
+See [HttpSetup](./kibana-plugin-public.httpsetup.md)
 
 <b>Signature:</b>
 
 ```typescript
-export declare type HttpStart = HttpServiceBase;
+export declare type HttpStart = HttpSetup;
 ```
diff --git a/docs/development/core/public/kibana-plugin-public.icontextcontainer.md b/docs/development/core/public/kibana-plugin-public.icontextcontainer.md
index f16c07b3d7906..7a21df6b93bb5 100644
--- a/docs/development/core/public/kibana-plugin-public.icontextcontainer.md
+++ b/docs/development/core/public/kibana-plugin-public.icontextcontainer.md
@@ -12,13 +12,6 @@ An object that handles registration of context providers and configuring handler
 export interface IContextContainer<THandler extends HandlerFunction<any>> 
 ```
 
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [createHandler(pluginOpaqueId, handler)](./kibana-plugin-public.icontextcontainer.createhandler.md) | Create a new handler function pre-wired to context for the plugin. |
-|  [registerContext(pluginOpaqueId, contextName, provider)](./kibana-plugin-public.icontextcontainer.registercontext.md) | Register a new context provider. |
-
 ## Remarks
 
 A [IContextContainer](./kibana-plugin-public.icontextcontainer.md) can be used by any Core service or plugin (known as the "service owner") which wishes to expose APIs in a handler function. The container object will manage registering context providers and configuring a handler with all of the contexts that should be exposed to the handler's plugin. This is dependent on the dependencies that the handler's plugin declares.
@@ -78,3 +71,10 @@ class MyPlugin {
 
 ```
 
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [createHandler(pluginOpaqueId, handler)](./kibana-plugin-public.icontextcontainer.createhandler.md) | Create a new handler function pre-wired to context for the plugin. |
+|  [registerContext(pluginOpaqueId, contextName, provider)](./kibana-plugin-public.icontextcontainer.registercontext.md) | Register a new context provider. |
+
diff --git a/docs/development/core/public/kibana-plugin-public.legacycoresetup.md b/docs/development/core/public/kibana-plugin-public.legacycoresetup.md
index a753300437c1c..803c96cd0b22c 100644
--- a/docs/development/core/public/kibana-plugin-public.legacycoresetup.md
+++ b/docs/development/core/public/kibana-plugin-public.legacycoresetup.md
@@ -16,13 +16,13 @@ Setup interface exposed to the legacy platform via the `ui/new_platform` module.
 export interface LegacyCoreSetup extends CoreSetup<any> 
 ```
 
+## Remarks
+
+Some methods are not supported in the legacy platform and while present to make this type compatibile with [CoreSetup](./kibana-plugin-public.coresetup.md)<!-- -->, unsupported methods will throw exceptions when called.
+
 ## Properties
 
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [injectedMetadata](./kibana-plugin-public.legacycoresetup.injectedmetadata.md) | <code>InjectedMetadataSetup</code> |  |
 
-## Remarks
-
-Some methods are not supported in the legacy platform and while present to make this type compatibile with [CoreSetup](./kibana-plugin-public.coresetup.md)<!-- -->, unsupported methods will throw exceptions when called.
-
diff --git a/docs/development/core/public/kibana-plugin-public.legacycorestart.md b/docs/development/core/public/kibana-plugin-public.legacycorestart.md
index 775c3fb1ffe3d..438a3d6110776 100644
--- a/docs/development/core/public/kibana-plugin-public.legacycorestart.md
+++ b/docs/development/core/public/kibana-plugin-public.legacycorestart.md
@@ -16,13 +16,13 @@ Start interface exposed to the legacy platform via the `ui/new_platform` module.
 export interface LegacyCoreStart extends CoreStart 
 ```
 
+## Remarks
+
+Some methods are not supported in the legacy platform and while present to make this type compatibile with [CoreStart](./kibana-plugin-public.corestart.md)<!-- -->, unsupported methods will throw exceptions when called.
+
 ## Properties
 
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [injectedMetadata](./kibana-plugin-public.legacycorestart.injectedmetadata.md) | <code>InjectedMetadataStart</code> |  |
 
-## Remarks
-
-Some methods are not supported in the legacy platform and while present to make this type compatibile with [CoreStart](./kibana-plugin-public.corestart.md)<!-- -->, unsupported methods will throw exceptions when called.
-
diff --git a/docs/development/core/public/kibana-plugin-public.md b/docs/development/core/public/kibana-plugin-public.md
index 2c43f36ede09e..e2c2866b57b6b 100644
--- a/docs/development/core/public/kibana-plugin-public.md
+++ b/docs/development/core/public/kibana-plugin-public.md
@@ -56,7 +56,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [HttpHeadersInit](./kibana-plugin-public.httpheadersinit.md) |  |
 |  [HttpInterceptor](./kibana-plugin-public.httpinterceptor.md) | An object that may define global interceptor functions for different parts of the request and response lifecycle. See [IHttpInterceptController](./kibana-plugin-public.ihttpinterceptcontroller.md)<!-- -->. |
 |  [HttpRequestInit](./kibana-plugin-public.httprequestinit.md) | Fetch API options available to [HttpHandler](./kibana-plugin-public.httphandler.md)<!-- -->s. |
-|  [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) |  |
+|  [HttpSetup](./kibana-plugin-public.httpsetup.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. |
@@ -118,8 +118,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [HandlerContextType](./kibana-plugin-public.handlercontexttype.md) | Extracts the type of the first argument of a [HandlerFunction](./kibana-plugin-public.handlerfunction.md) to represent the type of the context. |
 |  [HandlerFunction](./kibana-plugin-public.handlerfunction.md) | A function that accepts a context object and an optional number of additional arguments. Used for the generic types in [IContextContainer](./kibana-plugin-public.icontextcontainer.md) |
 |  [HandlerParameters](./kibana-plugin-public.handlerparameters.md) | Extracts the types of the additional arguments of a [HandlerFunction](./kibana-plugin-public.handlerfunction.md)<!-- -->, excluding the [HandlerContextType](./kibana-plugin-public.handlercontexttype.md)<!-- -->. |
-|  [HttpSetup](./kibana-plugin-public.httpsetup.md) | See [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) |
-|  [HttpStart](./kibana-plugin-public.httpstart.md) | See [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) |
+|  [HttpStart](./kibana-plugin-public.httpstart.md) | See [HttpSetup](./kibana-plugin-public.httpsetup.md) |
 |  [IContextProvider](./kibana-plugin-public.icontextprovider.md) | A function that returns a context value for a specific key of given context type. |
 |  [IToasts](./kibana-plugin-public.itoasts.md) | Methods for adding and removing global toast messages. See [ToastsApi](./kibana-plugin-public.toastsapi.md)<!-- -->. |
 |  [MountPoint](./kibana-plugin-public.mountpoint.md) | A function that should mount DOM content inside the provided container element and return a handler to unmount it. |
diff --git a/docs/development/core/public/kibana-plugin-public.savedobjectsclient.md b/docs/development/core/public/kibana-plugin-public.savedobjectsclient.md
index 3c4e33db4af91..88485aa71f7c5 100644
--- a/docs/development/core/public/kibana-plugin-public.savedobjectsclient.md
+++ b/docs/development/core/public/kibana-plugin-public.savedobjectsclient.md
@@ -12,6 +12,10 @@ Saved Objects is Kibana's data persisentence mechanism allowing plugins to use E
 export declare class SavedObjectsClient 
 ```
 
+## Remarks
+
+The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `SavedObjectsClient` class.
+
 ## Properties
 
 |  Property | Modifiers | Type | Description |
@@ -30,7 +34,3 @@ export declare class SavedObjectsClient
 |  [bulkUpdate(objects)](./kibana-plugin-public.savedobjectsclient.bulkupdate.md) |  | Update multiple documents at once |
 |  [update(type, id, attributes, { version, migrationVersion, references })](./kibana-plugin-public.savedobjectsclient.update.md) |  | Updates an object |
 
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `SavedObjectsClient` class.
-
diff --git a/docs/development/core/server/kibana-plugin-server.basepath.md b/docs/development/core/server/kibana-plugin-server.basepath.md
index 77f50abc60369..50a30f7c43fe6 100644
--- a/docs/development/core/server/kibana-plugin-server.basepath.md
+++ b/docs/development/core/server/kibana-plugin-server.basepath.md
@@ -12,6 +12,10 @@ Access or manipulate the Kibana base path
 export declare class BasePath 
 ```
 
+## Remarks
+
+The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `BasePath` class.
+
 ## Properties
 
 |  Property | Modifiers | Type | Description |
@@ -22,7 +26,3 @@ export declare class BasePath
 |  [serverBasePath](./kibana-plugin-server.basepath.serverbasepath.md) |  | <code>string</code> | returns the server's basePath<!-- -->See [BasePath.get](./kibana-plugin-server.basepath.get.md) for getting the basePath value for a specific request |
 |  [set](./kibana-plugin-server.basepath.set.md) |  | <code>(request: KibanaRequest&lt;unknown, unknown, unknown, any&gt; &#124; LegacyRequest, requestSpecificBasePath: string) =&gt; void</code> | sets <code>basePath</code> value, specific for an incoming request. |
 
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `BasePath` class.
-
diff --git a/docs/development/core/server/kibana-plugin-server.clusterclient.asscoped.md b/docs/development/core/server/kibana-plugin-server.clusterclient.asscoped.md
index ed7d028a1ec8a..bb1f481c9ef4f 100644
--- a/docs/development/core/server/kibana-plugin-server.clusterclient.asscoped.md
+++ b/docs/development/core/server/kibana-plugin-server.clusterclient.asscoped.md
@@ -9,14 +9,14 @@ Creates an instance of [IScopedClusterClient](./kibana-plugin-server.iscopedclus
 <b>Signature:</b>
 
 ```typescript
-asScoped(request?: KibanaRequest | LegacyRequest | FakeRequest): IScopedClusterClient;
+asScoped(request?: ScopeableRequest): IScopedClusterClient;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  request | <code>KibanaRequest &#124; LegacyRequest &#124; FakeRequest</code> | Request the <code>IScopedClusterClient</code> instance will be scoped to. Supports request optionality, Legacy.Request &amp; FakeRequest for BWC with LegacyPlatform |
+|  request | <code>ScopeableRequest</code> | Request the <code>IScopedClusterClient</code> instance will be scoped to. Supports request optionality, Legacy.Request &amp; FakeRequest for BWC with LegacyPlatform |
 
 <b>Returns:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-server.clusterclient.md b/docs/development/core/server/kibana-plugin-server.clusterclient.md
index 5fdda7ef3e499..d547b846e65b7 100644
--- a/docs/development/core/server/kibana-plugin-server.clusterclient.md
+++ b/docs/development/core/server/kibana-plugin-server.clusterclient.md
@@ -4,7 +4,7 @@
 
 ## ClusterClient class
 
-Represents an Elasticsearch cluster API client and allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
+Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
 
 See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->.
 
diff --git a/docs/development/core/server/kibana-plugin-server.configdeprecationfactory.md b/docs/development/core/server/kibana-plugin-server.configdeprecationfactory.md
index f022d6c1d064a..0302797147cff 100644
--- a/docs/development/core/server/kibana-plugin-server.configdeprecationfactory.md
+++ b/docs/development/core/server/kibana-plugin-server.configdeprecationfactory.md
@@ -14,15 +14,6 @@ See methods documentation for more detailed examples.
 export interface ConfigDeprecationFactory 
 ```
 
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [rename(oldKey, newKey)](./kibana-plugin-server.configdeprecationfactory.rename.md) | Rename a configuration property from inside a plugin's configuration path. Will log a deprecation warning if the oldKey was found and deprecation applied. |
-|  [renameFromRoot(oldKey, newKey)](./kibana-plugin-server.configdeprecationfactory.renamefromroot.md) | Rename a configuration property from the root configuration. Will log a deprecation warning if the oldKey was found and deprecation applied.<!-- -->This should be only used when renaming properties from different configuration's path. To rename properties from inside a plugin's configuration, use 'rename' instead. |
-|  [unused(unusedKey)](./kibana-plugin-server.configdeprecationfactory.unused.md) | Remove a configuration property from inside a plugin's configuration path. Will log a deprecation warning if the unused key was found and deprecation applied. |
-|  [unusedFromRoot(unusedKey)](./kibana-plugin-server.configdeprecationfactory.unusedfromroot.md) | Remove a configuration property from the root configuration. Will log a deprecation warning if the unused key was found and deprecation applied.<!-- -->This should be only used when removing properties from outside of a plugin's configuration. To remove properties from inside a plugin's configuration, use 'unused' instead. |
-
 ## Example
 
 
@@ -34,3 +25,12 @@ const provider: ConfigDeprecationProvider = ({ rename, unused }) => [
 
 ```
 
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [rename(oldKey, newKey)](./kibana-plugin-server.configdeprecationfactory.rename.md) | Rename a configuration property from inside a plugin's configuration path. Will log a deprecation warning if the oldKey was found and deprecation applied. |
+|  [renameFromRoot(oldKey, newKey)](./kibana-plugin-server.configdeprecationfactory.renamefromroot.md) | Rename a configuration property from the root configuration. Will log a deprecation warning if the oldKey was found and deprecation applied.<!-- -->This should be only used when renaming properties from different configuration's path. To rename properties from inside a plugin's configuration, use 'rename' instead. |
+|  [unused(unusedKey)](./kibana-plugin-server.configdeprecationfactory.unused.md) | Remove a configuration property from inside a plugin's configuration path. Will log a deprecation warning if the unused key was found and deprecation applied. |
+|  [unusedFromRoot(unusedKey)](./kibana-plugin-server.configdeprecationfactory.unusedfromroot.md) | Remove a configuration property from the root configuration. Will log a deprecation warning if the unused key was found and deprecation applied.<!-- -->This should be only used when removing properties from outside of a plugin's configuration. To remove properties from inside a plugin's configuration, use 'unused' instead. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.contextsetup.md b/docs/development/core/server/kibana-plugin-server.contextsetup.md
index 1f285efe92b68..1b2a1e2f1b621 100644
--- a/docs/development/core/server/kibana-plugin-server.contextsetup.md
+++ b/docs/development/core/server/kibana-plugin-server.contextsetup.md
@@ -12,12 +12,6 @@ An object that handles registration of context providers and configuring handler
 export interface ContextSetup 
 ```
 
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [createContextContainer()](./kibana-plugin-server.contextsetup.createcontextcontainer.md) | Creates a new [IContextContainer](./kibana-plugin-server.icontextcontainer.md) for a service owner. |
-
 ## Remarks
 
 A [IContextContainer](./kibana-plugin-server.icontextcontainer.md) can be used by any Core service or plugin (known as the "service owner") which wishes to expose APIs in a handler function. The container object will manage registering context providers and configuring a handler with all of the contexts that should be exposed to the handler's plugin. This is dependent on the dependencies that the handler's plugin declares.
@@ -136,3 +130,9 @@ class VizRenderingPlugin {
 
 ```
 
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [createContextContainer()](./kibana-plugin-server.contextsetup.createcontextcontainer.md) | Creates a new [IContextContainer](./kibana-plugin-server.icontextcontainer.md) for a service owner. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.coresetup.md b/docs/development/core/server/kibana-plugin-server.coresetup.md
index 3886b6e05e657..3f7f5b727ee80 100644
--- a/docs/development/core/server/kibana-plugin-server.coresetup.md
+++ b/docs/development/core/server/kibana-plugin-server.coresetup.md
@@ -22,4 +22,5 @@ export interface CoreSetup
 |  [http](./kibana-plugin-server.coresetup.http.md) | <code>HttpServiceSetup</code> | [HttpServiceSetup](./kibana-plugin-server.httpservicesetup.md) |
 |  [savedObjects](./kibana-plugin-server.coresetup.savedobjects.md) | <code>SavedObjectsServiceSetup</code> | [SavedObjectsServiceSetup](./kibana-plugin-server.savedobjectsservicesetup.md) |
 |  [uiSettings](./kibana-plugin-server.coresetup.uisettings.md) | <code>UiSettingsServiceSetup</code> | [UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md) |
+|  [uuid](./kibana-plugin-server.coresetup.uuid.md) | <code>UuidServiceSetup</code> | [UuidServiceSetup](./kibana-plugin-server.uuidservicesetup.md) |
 
diff --git a/docs/development/core/server/kibana-plugin-server.coresetup.uuid.md b/docs/development/core/server/kibana-plugin-server.coresetup.uuid.md
new file mode 100644
index 0000000000000..2b9077735d8e3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.coresetup.uuid.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; [uuid](./kibana-plugin-server.coresetup.uuid.md)
+
+## CoreSetup.uuid property
+
+[UuidServiceSetup](./kibana-plugin-server.uuidservicesetup.md)
+
+<b>Signature:</b>
+
+```typescript
+uuid: UuidServiceSetup;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.corestart.md b/docs/development/core/server/kibana-plugin-server.corestart.md
index e523717a37ac8..167c69d5fe329 100644
--- a/docs/development/core/server/kibana-plugin-server.corestart.md
+++ b/docs/development/core/server/kibana-plugin-server.corestart.md
@@ -18,4 +18,5 @@ export interface CoreStart
 |  --- | --- | --- |
 |  [capabilities](./kibana-plugin-server.corestart.capabilities.md) | <code>CapabilitiesStart</code> | [CapabilitiesStart](./kibana-plugin-server.capabilitiesstart.md) |
 |  [savedObjects](./kibana-plugin-server.corestart.savedobjects.md) | <code>SavedObjectsServiceStart</code> | [SavedObjectsServiceStart](./kibana-plugin-server.savedobjectsservicestart.md) |
+|  [uiSettings](./kibana-plugin-server.corestart.uisettings.md) | <code>UiSettingsServiceStart</code> | [UiSettingsServiceStart](./kibana-plugin-server.uisettingsservicestart.md) |
 
diff --git a/docs/development/core/server/kibana-plugin-server.corestart.uisettings.md b/docs/development/core/server/kibana-plugin-server.corestart.uisettings.md
new file mode 100644
index 0000000000000..323e929f2918e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.corestart.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; [CoreStart](./kibana-plugin-server.corestart.md) &gt; [uiSettings](./kibana-plugin-server.corestart.uisettings.md)
+
+## CoreStart.uiSettings property
+
+[UiSettingsServiceStart](./kibana-plugin-server.uisettingsservicestart.md)
+
+<b>Signature:</b>
+
+```typescript
+uiSettings: UiSettingsServiceStart;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.cspconfig.md b/docs/development/core/server/kibana-plugin-server.cspconfig.md
index e5276991be404..7e491cb0df912 100644
--- a/docs/development/core/server/kibana-plugin-server.cspconfig.md
+++ b/docs/development/core/server/kibana-plugin-server.cspconfig.md
@@ -12,6 +12,10 @@ CSP configuration for use in Kibana.
 export declare class CspConfig implements ICspConfig 
 ```
 
+## Remarks
+
+The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `CspConfig` class.
+
 ## Properties
 
 |  Property | Modifiers | Type | Description |
@@ -22,7 +26,3 @@ export declare class CspConfig implements ICspConfig
 |  [strict](./kibana-plugin-server.cspconfig.strict.md) |  | <code>boolean</code> |  |
 |  [warnLegacyBrowsers](./kibana-plugin-server.cspconfig.warnlegacybrowsers.md) |  | <code>boolean</code> |  |
 
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `CspConfig` class.
-
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearcherrorhelpers.md b/docs/development/core/server/kibana-plugin-server.elasticsearcherrorhelpers.md
index c823da392042a..2e615acfeac6b 100644
--- a/docs/development/core/server/kibana-plugin-server.elasticsearcherrorhelpers.md
+++ b/docs/development/core/server/kibana-plugin-server.elasticsearcherrorhelpers.md
@@ -12,13 +12,6 @@ Helpers for working with errors returned from the Elasticsearch service.Since th
 export declare class ElasticsearchErrorHelpers 
 ```
 
-## Methods
-
-|  Method | Modifiers | Description |
-|  --- | --- | --- |
-|  [decorateNotAuthorizedError(error, reason)](./kibana-plugin-server.elasticsearcherrorhelpers.decoratenotauthorizederror.md) | <code>static</code> |  |
-|  [isNotAuthorizedError(error)](./kibana-plugin-server.elasticsearcherrorhelpers.isnotauthorizederror.md) | <code>static</code> |  |
-
 ## Example
 
 Handle errors
@@ -33,3 +26,10 @@ try {
 
 ```
 
+## Methods
+
+|  Method | Modifiers | Description |
+|  --- | --- | --- |
+|  [decorateNotAuthorizedError(error, reason)](./kibana-plugin-server.elasticsearcherrorhelpers.decoratenotauthorizederror.md) | <code>static</code> |  |
+|  [isNotAuthorizedError(error)](./kibana-plugin-server.elasticsearcherrorhelpers.isnotauthorizederror.md) | <code>static</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient.md
new file mode 100644
index 0000000000000..415423f555266
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) &gt; [adminClient](./kibana-plugin-server.elasticsearchservicesetup.adminclient.md)
+
+## ElasticsearchServiceSetup.adminClient property
+
+A client for the `admin` cluster. All Elasticsearch config value changes are processed under the hood. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+readonly adminClient: IClusterClient;
+```
+
+## Example
+
+
+```js
+const client = core.elasticsearch.adminClient;
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient_.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient_.md
deleted file mode 100644
index b5bfc68d3ca0c..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.adminclient_.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) &gt; [adminClient$](./kibana-plugin-server.elasticsearchservicesetup.adminclient_.md)
-
-## ElasticsearchServiceSetup.adminClient$ property
-
-Observable of clients for the `admin` cluster. Observable emits when Elasticsearch config changes on the Kibana server. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
-
-
-```js
-const client = await elasticsearch.adminClient$.pipe(take(1)).toPromise();
-
-```
-
-<b>Signature:</b>
-
-```typescript
-readonly adminClient$: Observable<IClusterClient>;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.createclient.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.createclient.md
index 3d26f2d4cec88..797f402cc2580 100644
--- a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.createclient.md
+++ b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.createclient.md
@@ -9,7 +9,7 @@ Create application specific Elasticsearch cluster API client with customized con
 <b>Signature:</b>
 
 ```typescript
-readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => IClusterClient;
+readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ICustomClusterClient;
 ```
 
 ## Example
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient.md
new file mode 100644
index 0000000000000..e9845dce6915d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) &gt; [dataClient](./kibana-plugin-server.elasticsearchservicesetup.dataclient.md)
+
+## ElasticsearchServiceSetup.dataClient property
+
+A client for the `data` cluster. All Elasticsearch config value changes are processed under the hood. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+readonly dataClient: IClusterClient;
+```
+
+## Example
+
+
+```js
+const client = core.elasticsearch.dataClient;
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient_.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient_.md
deleted file mode 100644
index 9411f2f6b8694..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.dataclient_.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) &gt; [dataClient$](./kibana-plugin-server.elasticsearchservicesetup.dataclient_.md)
-
-## ElasticsearchServiceSetup.dataClient$ property
-
-Observable of clients for the `data` cluster. Observable emits when Elasticsearch config changes on the Kibana server. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
-
-
-```js
-const client = await elasticsearch.dataClient$.pipe(take(1)).toPromise();
-
-```
-
-<b>Signature:</b>
-
-```typescript
-readonly dataClient$: Observable<IClusterClient>;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.md b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.md
index e3d151cdc0d8b..2de3f6e6d1bbc 100644
--- a/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.md
+++ b/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.md
@@ -15,17 +15,7 @@ export interface ElasticsearchServiceSetup
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [adminClient$](./kibana-plugin-server.elasticsearchservicesetup.adminclient_.md) | <code>Observable&lt;IClusterClient&gt;</code> | Observable of clients for the <code>admin</code> cluster. Observable emits when Elasticsearch config changes on the Kibana server. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
-```js
-const client = await elasticsearch.adminClient$.pipe(take(1)).toPromise();
-
-```
- |
-|  [createClient](./kibana-plugin-server.elasticsearchservicesetup.createclient.md) | <code>(type: string, clientConfig?: Partial&lt;ElasticsearchClientConfig&gt;) =&gt; IClusterClient</code> | Create application specific Elasticsearch cluster API client with customized config. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->. |
-|  [dataClient$](./kibana-plugin-server.elasticsearchservicesetup.dataclient_.md) | <code>Observable&lt;IClusterClient&gt;</code> | Observable of clients for the <code>data</code> cluster. Observable emits when Elasticsearch config changes on the Kibana server. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->.
-```js
-const client = await elasticsearch.dataClient$.pipe(take(1)).toPromise();
-
-```
- |
+|  [adminClient](./kibana-plugin-server.elasticsearchservicesetup.adminclient.md) | <code>IClusterClient</code> | A client for the <code>admin</code> cluster. All Elasticsearch config value changes are processed under the hood. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->. |
+|  [createClient](./kibana-plugin-server.elasticsearchservicesetup.createclient.md) | <code>(type: string, clientConfig?: Partial&lt;ElasticsearchClientConfig&gt;) =&gt; ICustomClusterClient</code> | Create application specific Elasticsearch cluster API client with customized config. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->. |
+|  [dataClient](./kibana-plugin-server.elasticsearchservicesetup.dataclient.md) | <code>IClusterClient</code> | A client for the <code>data</code> cluster. All Elasticsearch config value changes are processed under the hood. See [IClusterClient](./kibana-plugin-server.iclusterclient.md)<!-- -->. |
 
diff --git a/docs/development/core/server/kibana-plugin-server.httpservicesetup.md b/docs/development/core/server/kibana-plugin-server.httpservicesetup.md
index 99d4caf40c0d3..3b1993841339d 100644
--- a/docs/development/core/server/kibana-plugin-server.httpservicesetup.md
+++ b/docs/development/core/server/kibana-plugin-server.httpservicesetup.md
@@ -12,21 +12,6 @@ Kibana HTTP Service provides own abstraction for work with HTTP stack. Plugins d
 export interface HttpServiceSetup 
 ```
 
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [basePath](./kibana-plugin-server.httpservicesetup.basepath.md) | <code>IBasePath</code> | Access or manipulate the Kibana base path See [IBasePath](./kibana-plugin-server.ibasepath.md)<!-- -->. |
-|  [createCookieSessionStorageFactory](./kibana-plugin-server.httpservicesetup.createcookiesessionstoragefactory.md) | <code>&lt;T&gt;(cookieOptions: SessionStorageCookieOptions&lt;T&gt;) =&gt; Promise&lt;SessionStorageFactory&lt;T&gt;&gt;</code> | Creates cookie based session storage factory [SessionStorageFactory](./kibana-plugin-server.sessionstoragefactory.md) |
-|  [createRouter](./kibana-plugin-server.httpservicesetup.createrouter.md) | <code>() =&gt; IRouter</code> | Provides ability to declare a handler function for a particular path and HTTP request method. |
-|  [csp](./kibana-plugin-server.httpservicesetup.csp.md) | <code>ICspConfig</code> | The CSP config used for Kibana. |
-|  [isTlsEnabled](./kibana-plugin-server.httpservicesetup.istlsenabled.md) | <code>boolean</code> | Flag showing whether a server was configured to use TLS connection. |
-|  [registerAuth](./kibana-plugin-server.httpservicesetup.registerauth.md) | <code>(handler: AuthenticationHandler) =&gt; void</code> | To define custom authentication and/or authorization mechanism for incoming requests. |
-|  [registerOnPostAuth](./kibana-plugin-server.httpservicesetup.registeronpostauth.md) | <code>(handler: OnPostAuthHandler) =&gt; void</code> | To define custom logic to perform for incoming requests. |
-|  [registerOnPreAuth](./kibana-plugin-server.httpservicesetup.registeronpreauth.md) | <code>(handler: OnPreAuthHandler) =&gt; void</code> | To define custom logic to perform for incoming requests. |
-|  [registerOnPreResponse](./kibana-plugin-server.httpservicesetup.registeronpreresponse.md) | <code>(handler: OnPreResponseHandler) =&gt; void</code> | To define custom logic to perform for the server response. |
-|  [registerRouteHandlerContext](./kibana-plugin-server.httpservicesetup.registerroutehandlercontext.md) | <code>&lt;T extends keyof RequestHandlerContext&gt;(contextName: T, provider: RequestHandlerContextProvider&lt;T&gt;) =&gt; RequestHandlerContextContainer</code> | Register a context provider for a route handler. |
-
 ## Example
 
 To handle an incoming request in your plugin you should: - Create a `Router` instance.
@@ -92,3 +77,18 @@ async (context, request, response) => {
 
 ```
 
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [basePath](./kibana-plugin-server.httpservicesetup.basepath.md) | <code>IBasePath</code> | Access or manipulate the Kibana base path See [IBasePath](./kibana-plugin-server.ibasepath.md)<!-- -->. |
+|  [createCookieSessionStorageFactory](./kibana-plugin-server.httpservicesetup.createcookiesessionstoragefactory.md) | <code>&lt;T&gt;(cookieOptions: SessionStorageCookieOptions&lt;T&gt;) =&gt; Promise&lt;SessionStorageFactory&lt;T&gt;&gt;</code> | Creates cookie based session storage factory [SessionStorageFactory](./kibana-plugin-server.sessionstoragefactory.md) |
+|  [createRouter](./kibana-plugin-server.httpservicesetup.createrouter.md) | <code>() =&gt; IRouter</code> | Provides ability to declare a handler function for a particular path and HTTP request method. |
+|  [csp](./kibana-plugin-server.httpservicesetup.csp.md) | <code>ICspConfig</code> | The CSP config used for Kibana. |
+|  [isTlsEnabled](./kibana-plugin-server.httpservicesetup.istlsenabled.md) | <code>boolean</code> | Flag showing whether a server was configured to use TLS connection. |
+|  [registerAuth](./kibana-plugin-server.httpservicesetup.registerauth.md) | <code>(handler: AuthenticationHandler) =&gt; void</code> | To define custom authentication and/or authorization mechanism for incoming requests. |
+|  [registerOnPostAuth](./kibana-plugin-server.httpservicesetup.registeronpostauth.md) | <code>(handler: OnPostAuthHandler) =&gt; void</code> | To define custom logic to perform for incoming requests. |
+|  [registerOnPreAuth](./kibana-plugin-server.httpservicesetup.registeronpreauth.md) | <code>(handler: OnPreAuthHandler) =&gt; void</code> | To define custom logic to perform for incoming requests. |
+|  [registerOnPreResponse](./kibana-plugin-server.httpservicesetup.registeronpreresponse.md) | <code>(handler: OnPreResponseHandler) =&gt; void</code> | To define custom logic to perform for the server response. |
+|  [registerRouteHandlerContext](./kibana-plugin-server.httpservicesetup.registerroutehandlercontext.md) | <code>&lt;T extends keyof RequestHandlerContext&gt;(contextName: T, provider: RequestHandlerContextProvider&lt;T&gt;) =&gt; RequestHandlerContextContainer</code> | Register a context provider for a route handler. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.iclusterclient.md b/docs/development/core/server/kibana-plugin-server.iclusterclient.md
index 834afa6db5157..e7435a9d91a74 100644
--- a/docs/development/core/server/kibana-plugin-server.iclusterclient.md
+++ b/docs/development/core/server/kibana-plugin-server.iclusterclient.md
@@ -4,12 +4,12 @@
 
 ## IClusterClient type
 
-Represents an Elasticsearch cluster API client and allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
+Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
 
 See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->.
 
 <b>Signature:</b>
 
 ```typescript
-export declare type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+export declare type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.icontextcontainer.md b/docs/development/core/server/kibana-plugin-server.icontextcontainer.md
index 114da31442ff9..8235c40131536 100644
--- a/docs/development/core/server/kibana-plugin-server.icontextcontainer.md
+++ b/docs/development/core/server/kibana-plugin-server.icontextcontainer.md
@@ -12,13 +12,6 @@ An object that handles registration of context providers and configuring handler
 export interface IContextContainer<THandler extends HandlerFunction<any>> 
 ```
 
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [createHandler(pluginOpaqueId, handler)](./kibana-plugin-server.icontextcontainer.createhandler.md) | Create a new handler function pre-wired to context for the plugin. |
-|  [registerContext(pluginOpaqueId, contextName, provider)](./kibana-plugin-server.icontextcontainer.registercontext.md) | Register a new context provider. |
-
 ## Remarks
 
 A [IContextContainer](./kibana-plugin-server.icontextcontainer.md) can be used by any Core service or plugin (known as the "service owner") which wishes to expose APIs in a handler function. The container object will manage registering context providers and configuring a handler with all of the contexts that should be exposed to the handler's plugin. This is dependent on the dependencies that the handler's plugin declares.
@@ -78,3 +71,10 @@ class MyPlugin {
 
 ```
 
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [createHandler(pluginOpaqueId, handler)](./kibana-plugin-server.icontextcontainer.createhandler.md) | Create a new handler function pre-wired to context for the plugin. |
+|  [registerContext(pluginOpaqueId, contextName, provider)](./kibana-plugin-server.icontextcontainer.registercontext.md) | Register a new context provider. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.icustomclusterclient.md b/docs/development/core/server/kibana-plugin-server.icustomclusterclient.md
new file mode 100644
index 0000000000000..bc9ea71bc2389
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.icustomclusterclient.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ICustomClusterClient](./kibana-plugin-server.icustomclusterclient.md)
+
+## ICustomClusterClient type
+
+Represents an Elasticsearch cluster API client created by a plugin.. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via `asScoped(...)`<!-- -->).
+
+See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+export declare type ICustomClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.irenderoptions.includeusersettings.md b/docs/development/core/server/kibana-plugin-server.irenderoptions.includeusersettings.md
new file mode 100644
index 0000000000000..cedf3d27d0887
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.irenderoptions.includeusersettings.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; [IRenderOptions](./kibana-plugin-server.irenderoptions.md) &gt; [includeUserSettings](./kibana-plugin-server.irenderoptions.includeusersettings.md)
+
+## IRenderOptions.includeUserSettings property
+
+Set whether to output user settings in the page metadata. `true` by default.
+
+<b>Signature:</b>
+
+```typescript
+includeUserSettings?: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.irenderoptions.md b/docs/development/core/server/kibana-plugin-server.irenderoptions.md
new file mode 100644
index 0000000000000..34bed8b5e078c
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.irenderoptions.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; [IRenderOptions](./kibana-plugin-server.irenderoptions.md)
+
+## IRenderOptions interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface IRenderOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [includeUserSettings](./kibana-plugin-server.irenderoptions.includeusersettings.md) | <code>boolean</code> | Set whether to output user settings in the page metadata. <code>true</code> by default. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md b/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md
index 2367420068064..ff71f13466cf8 100644
--- a/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md
+++ b/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md
@@ -9,5 +9,5 @@ Wrap a router handler to catch and converts legacy boom errors to proper custom
 <b>Signature:</b>
 
 ```typescript
-handleLegacyErrors: <P extends ObjectType, Q extends ObjectType, B extends ObjectType>(handler: RequestHandler<P, Q, B>) => RequestHandler<P, Q, B>;
+handleLegacyErrors: <P, Q, B>(handler: RequestHandler<P, Q, B>) => RequestHandler<P, Q, B>;
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.irouter.md b/docs/development/core/server/kibana-plugin-server.irouter.md
index 73e96191e02e7..a6536d2ed6763 100644
--- a/docs/development/core/server/kibana-plugin-server.irouter.md
+++ b/docs/development/core/server/kibana-plugin-server.irouter.md
@@ -18,7 +18,7 @@ export interface IRouter
 |  --- | --- | --- |
 |  [delete](./kibana-plugin-server.irouter.delete.md) | <code>RouteRegistrar&lt;'delete'&gt;</code> | Register a route handler for <code>DELETE</code> request. |
 |  [get](./kibana-plugin-server.irouter.get.md) | <code>RouteRegistrar&lt;'get'&gt;</code> | Register a route handler for <code>GET</code> request. |
-|  [handleLegacyErrors](./kibana-plugin-server.irouter.handlelegacyerrors.md) | <code>&lt;P extends ObjectType, Q extends ObjectType, B extends ObjectType&gt;(handler: RequestHandler&lt;P, Q, B&gt;) =&gt; RequestHandler&lt;P, Q, B&gt;</code> | Wrap a router handler to catch and converts legacy boom errors to proper custom errors. |
+|  [handleLegacyErrors](./kibana-plugin-server.irouter.handlelegacyerrors.md) | <code>&lt;P, Q, B&gt;(handler: RequestHandler&lt;P, Q, B&gt;) =&gt; RequestHandler&lt;P, Q, B&gt;</code> | Wrap a router handler to catch and converts legacy boom errors to proper custom errors. |
 |  [patch](./kibana-plugin-server.irouter.patch.md) | <code>RouteRegistrar&lt;'patch'&gt;</code> | Register a route handler for <code>PATCH</code> request. |
 |  [post](./kibana-plugin-server.irouter.post.md) | <code>RouteRegistrar&lt;'post'&gt;</code> | Register a route handler for <code>POST</code> request. |
 |  [put](./kibana-plugin-server.irouter.put.md) | <code>RouteRegistrar&lt;'put'&gt;</code> | Register a route handler for <code>PUT</code> request. |
diff --git a/docs/development/core/server/kibana-plugin-server.iscopedrenderingclient.md b/docs/development/core/server/kibana-plugin-server.iscopedrenderingclient.md
new file mode 100644
index 0000000000000..2e6daa58db25f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.iscopedrenderingclient.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; [IScopedRenderingClient](./kibana-plugin-server.iscopedrenderingclient.md)
+
+## IScopedRenderingClient interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface IScopedRenderingClient 
+```
+
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [render(options)](./kibana-plugin-server.iscopedrenderingclient.render.md) | Generate a <code>KibanaResponse</code> which renders an HTML page bootstrapped with the <code>core</code> bundle. Intended as a response body for HTTP route handlers. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.iscopedrenderingclient.render.md b/docs/development/core/server/kibana-plugin-server.iscopedrenderingclient.render.md
new file mode 100644
index 0000000000000..1bc78dd84571d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.iscopedrenderingclient.render.md
@@ -0,0 +1,41 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [IScopedRenderingClient](./kibana-plugin-server.iscopedrenderingclient.md) &gt; [render](./kibana-plugin-server.iscopedrenderingclient.render.md)
+
+## IScopedRenderingClient.render() method
+
+Generate a `KibanaResponse` which renders an HTML page bootstrapped with the `core` bundle. Intended as a response body for HTTP route handlers.
+
+<b>Signature:</b>
+
+```typescript
+render(options?: IRenderOptions): Promise<string>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  options | <code>IRenderOptions</code> |  |
+
+<b>Returns:</b>
+
+`Promise<string>`
+
+## Example
+
+
+```ts
+router.get(
+  { path: '/', validate: false },
+  (context, request, response) =>
+    response.ok({
+      body: await context.core.rendering.render(),
+      headers: {
+        'content-security-policy': context.core.http.csp.header,
+      },
+    })
+);
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.legacyservicesetupdeps.core.md b/docs/development/core/server/kibana-plugin-server.legacyservicesetupdeps.core.md
index 09ebf1170715b..c4c043a903d06 100644
--- a/docs/development/core/server/kibana-plugin-server.legacyservicesetupdeps.core.md
+++ b/docs/development/core/server/kibana-plugin-server.legacyservicesetupdeps.core.md
@@ -7,7 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-core: InternalCoreSetup & {
-        plugins: PluginsServiceSetup;
-    };
+core: LegacyCoreSetup;
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.legacyservicesetupdeps.md b/docs/development/core/server/kibana-plugin-server.legacyservicesetupdeps.md
index 4475318522dfa..7961cedd2c054 100644
--- a/docs/development/core/server/kibana-plugin-server.legacyservicesetupdeps.md
+++ b/docs/development/core/server/kibana-plugin-server.legacyservicesetupdeps.md
@@ -18,6 +18,6 @@ export interface LegacyServiceSetupDeps
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [core](./kibana-plugin-server.legacyservicesetupdeps.core.md) | <code>InternalCoreSetup &amp; {</code><br/><code>        plugins: PluginsServiceSetup;</code><br/><code>    }</code> |  |
+|  [core](./kibana-plugin-server.legacyservicesetupdeps.core.md) | <code>LegacyCoreSetup</code> |  |
 |  [plugins](./kibana-plugin-server.legacyservicesetupdeps.plugins.md) | <code>Record&lt;string, unknown&gt;</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-server.legacyservicestartdeps.core.md b/docs/development/core/server/kibana-plugin-server.legacyservicestartdeps.core.md
index c5cf473aaa01a..47018f4594967 100644
--- a/docs/development/core/server/kibana-plugin-server.legacyservicestartdeps.core.md
+++ b/docs/development/core/server/kibana-plugin-server.legacyservicestartdeps.core.md
@@ -7,7 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-core: InternalCoreStart & {
-        plugins: PluginsServiceStart;
-    };
+core: LegacyCoreStart;
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.legacyservicestartdeps.md b/docs/development/core/server/kibana-plugin-server.legacyservicestartdeps.md
index 801138b64e46a..602fe5356d525 100644
--- a/docs/development/core/server/kibana-plugin-server.legacyservicestartdeps.md
+++ b/docs/development/core/server/kibana-plugin-server.legacyservicestartdeps.md
@@ -18,6 +18,6 @@ export interface LegacyServiceStartDeps
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [core](./kibana-plugin-server.legacyservicestartdeps.core.md) | <code>InternalCoreStart &amp; {</code><br/><code>        plugins: PluginsServiceStart;</code><br/><code>    }</code> |  |
+|  [core](./kibana-plugin-server.legacyservicestartdeps.core.md) | <code>LegacyCoreStart</code> |  |
 |  [plugins](./kibana-plugin-server.legacyservicestartdeps.plugins.md) | <code>Record&lt;string, unknown&gt;</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-server.logger.get.md b/docs/development/core/server/kibana-plugin-server.logger.get.md
new file mode 100644
index 0000000000000..b4a2d8a124260
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.logger.get.md
@@ -0,0 +1,33 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [Logger](./kibana-plugin-server.logger.md) &gt; [get](./kibana-plugin-server.logger.get.md)
+
+## Logger.get() method
+
+Returns a new [Logger](./kibana-plugin-server.logger.md) instance extending the current logger context.
+
+<b>Signature:</b>
+
+```typescript
+get(...childContextPaths: string[]): Logger;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  childContextPaths | <code>string[]</code> |  |
+
+<b>Returns:</b>
+
+`Logger`
+
+## Example
+
+
+```typescript
+const logger = loggerFactory.get('plugin', 'service'); // 'plugin.service' context
+const subLogger = logger.get('feature'); // 'plugin.service.feature' context
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.md b/docs/development/core/server/kibana-plugin-server.md
index e97ecbcfaf739..3f01048846fe1 100644
--- a/docs/development/core/server/kibana-plugin-server.md
+++ b/docs/development/core/server/kibana-plugin-server.md
@@ -17,10 +17,11 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  Class | Description |
 |  --- | --- |
 |  [BasePath](./kibana-plugin-server.basepath.md) | Access or manipulate the Kibana base path |
-|  [ClusterClient](./kibana-plugin-server.clusterclient.md) | Represents an Elasticsearch cluster API client and allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>).<!-- -->See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->. |
+|  [ClusterClient](./kibana-plugin-server.clusterclient.md) | Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>).<!-- -->See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->. |
 |  [CspConfig](./kibana-plugin-server.cspconfig.md) | CSP configuration for use in Kibana. |
 |  [ElasticsearchErrorHelpers](./kibana-plugin-server.elasticsearcherrorhelpers.md) | Helpers for working with errors returned from the Elasticsearch service.Since the internal data of errors are subject to change, consumers of the Elasticsearch service should always use these helpers to classify errors instead of checking error internals such as <code>body.error.header[WWW-Authenticate]</code> |
 |  [KibanaRequest](./kibana-plugin-server.kibanarequest.md) | Kibana specific abstraction for an incoming request. |
+|  [RouteValidationError](./kibana-plugin-server.routevalidationerror.md) | Error to return when the validation is not successful. |
 |  [SavedObjectsClient](./kibana-plugin-server.savedobjectsclient.md) |  |
 |  [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md) |  |
 |  [SavedObjectsRepository](./kibana-plugin-server.savedobjectsrepository.md) |  |
@@ -69,7 +70,9 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [IKibanaResponse](./kibana-plugin-server.ikibanaresponse.md) | A response data object, expected to returned as a result of [RequestHandler](./kibana-plugin-server.requesthandler.md) execution |
 |  [IKibanaSocket](./kibana-plugin-server.ikibanasocket.md) | A tiny abstraction for TCP socket. |
 |  [IndexSettingsDeprecationInfo](./kibana-plugin-server.indexsettingsdeprecationinfo.md) |  |
+|  [IRenderOptions](./kibana-plugin-server.irenderoptions.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. |
+|  [IScopedRenderingClient](./kibana-plugin-server.iscopedrenderingclient.md) |  |
 |  [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) |  |
@@ -90,11 +93,13 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [PluginManifest](./kibana-plugin-server.pluginmanifest.md) | Describes the set of required and optional properties plugin can define in its mandatory JSON manifest file. |
 |  [PluginsServiceSetup](./kibana-plugin-server.pluginsservicesetup.md) |  |
 |  [PluginsServiceStart](./kibana-plugin-server.pluginsservicestart.md) |  |
-|  [RequestHandlerContext](./kibana-plugin-server.requesthandlercontext.md) | Plugin specific context passed to a route handler.<!-- -->Provides the following clients: - [savedObjects.client](./kibana-plugin-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [elasticsearch.dataClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.adminClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch admin client which uses the credentials of the incoming request |
+|  [RequestHandlerContext](./kibana-plugin-server.requesthandlercontext.md) | Plugin specific context passed to a route handler.<!-- -->Provides the following clients: - [rendering](./kibana-plugin-server.iscopedrenderingclient.md) - Rendering client which uses the data of the incoming request - [savedObjects.client](./kibana-plugin-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [elasticsearch.dataClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.adminClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch admin client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request |
 |  [RouteConfig](./kibana-plugin-server.routeconfig.md) | Route specific configuration. |
 |  [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md) | Additional route options. |
 |  [RouteConfigOptionsBody](./kibana-plugin-server.routeconfigoptionsbody.md) | Additional body options for a route |
-|  [RouteSchemas](./kibana-plugin-server.routeschemas.md) | RouteSchemas contains the schemas for validating the different parts of a request. |
+|  [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md) | Validation result factory to be used in the custom validation function to return the valid data or validation errors<!-- -->See [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md)<!-- -->. |
+|  [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) | The configuration object to the RouteValidator class. Set <code>params</code>, <code>query</code> and/or <code>body</code> to specify the validation logic to follow for that property. |
+|  [RouteValidatorOptions](./kibana-plugin-server.routevalidatoroptions.md) | Additional options for the RouteValidator class to modify its default behaviour. |
 |  [SavedObject](./kibana-plugin-server.savedobject.md) |  |
 |  [SavedObjectAttributes](./kibana-plugin-server.savedobjectattributes.md) | The data for a Saved Object is stored as an object in the <code>attributes</code> property. |
 |  [SavedObjectReference](./kibana-plugin-server.savedobjectreference.md) | A reference to another saved object. |
@@ -137,7 +142,9 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [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) |  |
+|  [UiSettingsServiceStart](./kibana-plugin-server.uisettingsservicestart.md) |  |
 |  [UserProvidedValues](./kibana-plugin-server.userprovidedvalues.md) | Describes the values explicitly set by user. |
+|  [UuidServiceSetup](./kibana-plugin-server.uuidservicesetup.md) | APIs to access the application's instance uuid. |
 
 ## Variables
 
@@ -168,8 +175,9 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [Headers](./kibana-plugin-server.headers.md) | Http request headers to read. |
 |  [HttpResponsePayload](./kibana-plugin-server.httpresponsepayload.md) | Data send to the client as a response payload. |
 |  [IBasePath](./kibana-plugin-server.ibasepath.md) | Access or manipulate the Kibana base path[BasePath](./kibana-plugin-server.basepath.md) |
-|  [IClusterClient](./kibana-plugin-server.iclusterclient.md) | Represents an Elasticsearch cluster API client and allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>).<!-- -->See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->. |
+|  [IClusterClient](./kibana-plugin-server.iclusterclient.md) | Represents an Elasticsearch cluster API client created by the platform. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>).<!-- -->See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->. |
 |  [IContextProvider](./kibana-plugin-server.icontextprovider.md) | A function that returns a context value for a specific key of given context type. |
+|  [ICustomClusterClient](./kibana-plugin-server.icustomclusterclient.md) | Represents an Elasticsearch cluster API client created by a plugin.. It allows to call API on behalf of the internal Kibana user and the actual user that is derived from the request headers (via <code>asScoped(...)</code>).<!-- -->See [ClusterClient](./kibana-plugin-server.clusterclient.md)<!-- -->. |
 |  [IsAuthenticated](./kibana-plugin-server.isauthenticated.md) | Return authentication status for a request. |
 |  [ISavedObjectsRepository](./kibana-plugin-server.isavedobjectsrepository.md) | See [SavedObjectsRepository](./kibana-plugin-server.savedobjectsrepository.md) |
 |  [IScopedClusterClient](./kibana-plugin-server.iscopedclusterclient.md) | Serves the same purpose as "normal" <code>ClusterClient</code> but exposes additional <code>callAsCurrentUser</code> method that doesn't use credentials of the Kibana internal user (as <code>callAsInternalUser</code> does) to request Elasticsearch API, but rather passes HTTP headers extracted from the current user request to the API.<!-- -->See [ScopedClusterClient](./kibana-plugin-server.scopedclusterclient.md)<!-- -->. |
@@ -198,11 +206,15 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [RouteContentType](./kibana-plugin-server.routecontenttype.md) | The set of supported parseable Content-Types |
 |  [RouteMethod](./kibana-plugin-server.routemethod.md) | The set of common HTTP methods supported by Kibana routing. |
 |  [RouteRegistrar](./kibana-plugin-server.routeregistrar.md) | Route handler common definition |
+|  [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md) | The custom validation function if @<!-- -->kbn/config-schema is not a valid solution for your specific plugin requirements. |
+|  [RouteValidationSpec](./kibana-plugin-server.routevalidationspec.md) | Allowed property validation options: either @<!-- -->kbn/config-schema validations or custom validation functions<!-- -->See [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md) for custom validation. |
+|  [RouteValidatorFullConfig](./kibana-plugin-server.routevalidatorfullconfig.md) | Route validations config and options merged into one object |
 |  [SavedObjectAttribute](./kibana-plugin-server.savedobjectattribute.md) | Type definition for a Saved Object attribute value |
 |  [SavedObjectAttributeSingle](./kibana-plugin-server.savedobjectattributesingle.md) | Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-server.savedobjectattribute.md) |
 |  [SavedObjectsClientContract](./kibana-plugin-server.savedobjectsclientcontract.md) | Saved Objects is Kibana's data persisentence mechanism allowing plugins to use Elasticsearch for storing plugin state.<!-- -->\#\# SavedObjectsClient errors<!-- -->Since the SavedObjectsClient has its hands in everything we are a little paranoid about the way we present errors back to to application code. Ideally, all errors will be either:<!-- -->1. Caused by bad implementation (ie. undefined is not a function) and as such unpredictable 2. An error that has been classified and decorated appropriately by the decorators in [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md)<!-- -->Type 1 errors are inevitable, but since all expected/handle-able errors should be Type 2 the <code>isXYZError()</code> helpers exposed at <code>SavedObjectsErrorHelpers</code> should be used to understand and manage error responses from the <code>SavedObjectsClient</code>.<!-- -->Type 2 errors are decorated versions of the source error, so if the elasticsearch client threw an error it will be decorated based on its type. That means that rather than looking for <code>error.body.error.type</code> or doing substring checks on <code>error.body.error.reason</code>, just use the helpers to understand the meaning of the error:<!-- -->\`\`\`<!-- -->js if (SavedObjectsErrorHelpers.isNotFoundError(error)) { // handle 404 }<!-- -->if (SavedObjectsErrorHelpers.isNotAuthorizedError(error)) { // 401 handling should be automatic, but in case you wanted to know }<!-- -->// always rethrow the error unless you handle it throw error; \`\`\`<!-- -->\#\#\# 404s from missing index<!-- -->From the perspective of application code and APIs the SavedObjectsClient is a black box that persists objects. One of the internal details that users have no control over is that we use an elasticsearch index for persistance and that index might be missing.<!-- -->At the time of writing we are in the process of transitioning away from the operating assumption that the SavedObjects index is always available. Part of this transition is handling errors resulting from an index missing. These used to trigger a 500 error in most cases, and in others cause 404s with different error messages.<!-- -->From my (Spencer) perspective, a 404 from the SavedObjectsApi is a 404; The object the request/call was targeting could not be found. This is why \#14141 takes special care to ensure that 404 errors are generic and don't distinguish between index missing or document missing.<!-- -->\#\#\# 503s from missing index<!-- -->Unlike all other methods, create requests are supposed to succeed even when the Kibana index does not exist because it will be automatically created by elasticsearch. When that is not the case it is because Elasticsearch's <code>action.auto_create_index</code> setting prevents it from being created automatically so we throw a special 503 with the intention of informing the user that their Elasticsearch settings need to be updated.<!-- -->See [SavedObjectsClient](./kibana-plugin-server.savedobjectsclient.md) See [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md) |
 |  [SavedObjectsClientFactory](./kibana-plugin-server.savedobjectsclientfactory.md) | Describes the factory used to create instances of the Saved Objects Client. |
 |  [SavedObjectsClientWrapperFactory](./kibana-plugin-server.savedobjectsclientwrapperfactory.md) | Describes the factory used to create instances of Saved Objects Client Wrappers. |
+|  [ScopeableRequest](./kibana-plugin-server.scopeablerequest.md) | A user credentials container. It accommodates the necessary auth credentials to impersonate the current user.<!-- -->See [KibanaRequest](./kibana-plugin-server.kibanarequest.md)<!-- -->. |
 |  [SharedGlobalConfig](./kibana-plugin-server.sharedglobalconfig.md) |  |
 |  [UiSettingsType](./kibana-plugin-server.uisettingstype.md) | UI element type to represent the settings. |
 
diff --git a/docs/development/core/server/kibana-plugin-server.pluginconfigdescriptor.md b/docs/development/core/server/kibana-plugin-server.pluginconfigdescriptor.md
index 671298a67381a..3d661ac66d2b7 100644
--- a/docs/development/core/server/kibana-plugin-server.pluginconfigdescriptor.md
+++ b/docs/development/core/server/kibana-plugin-server.pluginconfigdescriptor.md
@@ -12,14 +12,6 @@ Describes a plugin configuration properties.
 export interface PluginConfigDescriptor<T = any> 
 ```
 
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [deprecations](./kibana-plugin-server.pluginconfigdescriptor.deprecations.md) | <code>ConfigDeprecationProvider</code> | Provider for the [ConfigDeprecation](./kibana-plugin-server.configdeprecation.md) to apply to the plugin configuration. |
-|  [exposeToBrowser](./kibana-plugin-server.pluginconfigdescriptor.exposetobrowser.md) | <code>{</code><br/><code>        [P in keyof T]?: boolean;</code><br/><code>    }</code> | List of configuration properties that will be available on the client-side plugin. |
-|  [schema](./kibana-plugin-server.pluginconfigdescriptor.schema.md) | <code>PluginConfigSchema&lt;T&gt;</code> | Schema to use to validate the plugin configuration.[PluginConfigSchema](./kibana-plugin-server.pluginconfigschema.md) |
-
 ## Example
 
 
@@ -48,3 +40,11 @@ export const config: PluginConfigDescriptor<ConfigType> = {
 
 ```
 
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [deprecations](./kibana-plugin-server.pluginconfigdescriptor.deprecations.md) | <code>ConfigDeprecationProvider</code> | Provider for the [ConfigDeprecation](./kibana-plugin-server.configdeprecation.md) to apply to the plugin configuration. |
+|  [exposeToBrowser](./kibana-plugin-server.pluginconfigdescriptor.exposetobrowser.md) | <code>{</code><br/><code>        [P in keyof T]?: boolean;</code><br/><code>    }</code> | List of configuration properties that will be available on the client-side plugin. |
+|  [schema](./kibana-plugin-server.pluginconfigdescriptor.schema.md) | <code>PluginConfigSchema&lt;T&gt;</code> | Schema to use to validate the plugin configuration.[PluginConfigSchema](./kibana-plugin-server.pluginconfigschema.md) |
+
diff --git a/docs/development/core/server/kibana-plugin-server.pluginmanifest.md b/docs/development/core/server/kibana-plugin-server.pluginmanifest.md
index 4a9498f0e9fab..9bb208a809b22 100644
--- a/docs/development/core/server/kibana-plugin-server.pluginmanifest.md
+++ b/docs/development/core/server/kibana-plugin-server.pluginmanifest.md
@@ -12,6 +12,10 @@ Describes the set of required and optional properties plugin can define in its m
 export interface PluginManifest 
 ```
 
+## Remarks
+
+Should never be used in code outside of Core but is exported for documentation purposes.
+
 ## Properties
 
 |  Property | Type | Description |
@@ -25,7 +29,3 @@ export interface PluginManifest
 |  [ui](./kibana-plugin-server.pluginmanifest.ui.md) | <code>boolean</code> | Specifies whether plugin includes some client/browser specific functionality that should be included into client bundle via <code>public/ui_plugin.js</code> file. |
 |  [version](./kibana-plugin-server.pluginmanifest.version.md) | <code>string</code> | Version of the plugin. |
 
-## Remarks
-
-Should never be used in code outside of Core but is exported for documentation purposes.
-
diff --git a/docs/development/core/server/kibana-plugin-server.requesthandler.md b/docs/development/core/server/kibana-plugin-server.requesthandler.md
index 79abfd4293e9f..9fc183ffc334b 100644
--- a/docs/development/core/server/kibana-plugin-server.requesthandler.md
+++ b/docs/development/core/server/kibana-plugin-server.requesthandler.md
@@ -9,7 +9,7 @@ A function executed when route path matched requested resource path. Request han
 <b>Signature:</b>
 
 ```typescript
-export declare type RequestHandler<P extends ObjectType, Q extends ObjectType, B extends ObjectType | Type<Buffer> | Type<Stream>, Method extends RouteMethod = any> = (context: RequestHandlerContext, request: KibanaRequest<TypeOf<P>, TypeOf<Q>, TypeOf<B>, Method>, response: KibanaResponseFactory) => IKibanaResponse<any> | Promise<IKibanaResponse<any>>;
+export declare type RequestHandler<P = unknown, Q = unknown, B = unknown, Method extends RouteMethod = any> = (context: RequestHandlerContext, request: KibanaRequest<P, Q, B, Method>, response: KibanaResponseFactory) => IKibanaResponse<any> | Promise<IKibanaResponse<any>>;
 ```
 
 ## Example
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 2d8b27ecb6c67..d1760dafd5bb6 100644
--- a/docs/development/core/server/kibana-plugin-server.requesthandlercontext.core.md
+++ b/docs/development/core/server/kibana-plugin-server.requesthandlercontext.core.md
@@ -8,6 +8,7 @@
 
 ```typescript
 core: {
+        rendering: IScopedRenderingClient;
         savedObjects: {
             client: SavedObjectsClientContract;
         };
diff --git a/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md b/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md
index c9fc80596efa9..7c8625a5824ee 100644
--- a/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md
+++ b/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md
@@ -6,7 +6,7 @@
 
 Plugin specific context passed to a route handler.
 
-Provides the following clients: - [savedObjects.client](./kibana-plugin-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [elasticsearch.dataClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.adminClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch admin client which uses the credentials of the incoming request
+Provides the following clients: - [rendering](./kibana-plugin-server.iscopedrenderingclient.md) - Rendering client which uses the data of the incoming request - [savedObjects.client](./kibana-plugin-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [elasticsearch.dataClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.adminClient](./kibana-plugin-server.scopedclusterclient.md) - Elasticsearch admin client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request
 
 <b>Signature:</b>
 
@@ -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>        uiSettings: {</code><br/><code>            client: IUiSettingsClient;</code><br/><code>        };</code><br/><code>    }</code> |  |
+|  [core](./kibana-plugin-server.requesthandlercontext.core.md) | <code>{</code><br/><code>        rendering: IScopedRenderingClient;</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.routeconfig.md b/docs/development/core/server/kibana-plugin-server.routeconfig.md
index 1970b23c7ec09..4beb12f0d056e 100644
--- a/docs/development/core/server/kibana-plugin-server.routeconfig.md
+++ b/docs/development/core/server/kibana-plugin-server.routeconfig.md
@@ -9,7 +9,7 @@ Route specific configuration.
 <b>Signature:</b>
 
 ```typescript
-export interface RouteConfig<P extends ObjectType, Q extends ObjectType, B extends ObjectType | Type<Buffer> | Type<Stream>, Method extends RouteMethod> 
+export interface RouteConfig<P, Q, B, Method extends RouteMethod> 
 ```
 
 ## Properties
@@ -18,5 +18,5 @@ export interface RouteConfig<P extends ObjectType, Q extends ObjectType, B exten
 |  --- | --- | --- |
 |  [options](./kibana-plugin-server.routeconfig.options.md) | <code>RouteConfigOptions&lt;Method&gt;</code> | Additional route options [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md)<!-- -->. |
 |  [path](./kibana-plugin-server.routeconfig.path.md) | <code>string</code> | The endpoint \_within\_ the router path to register the route. |
-|  [validate](./kibana-plugin-server.routeconfig.validate.md) | <code>RouteSchemas&lt;P, Q, B&gt; &#124; false</code> | A schema created with <code>@kbn/config-schema</code> that every request will be validated against. |
+|  [validate](./kibana-plugin-server.routeconfig.validate.md) | <code>RouteValidatorFullConfig&lt;P, Q, B&gt; &#124; false</code> | A schema created with <code>@kbn/config-schema</code> that every request will be validated against. |
 
diff --git a/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md b/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md
index e1ec743ae71cc..23a72fc3c68b3 100644
--- a/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md
+++ b/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md
@@ -9,7 +9,7 @@ A schema created with `@kbn/config-schema` that every request will be validated
 <b>Signature:</b>
 
 ```typescript
-validate: RouteSchemas<P, Q, B> | false;
+validate: RouteValidatorFullConfig<P, Q, B> | false;
 ```
 
 ## Remarks
diff --git a/docs/development/core/server/kibana-plugin-server.routeregistrar.md b/docs/development/core/server/kibana-plugin-server.routeregistrar.md
index 0f5f49636fdd5..901d260fee21d 100644
--- a/docs/development/core/server/kibana-plugin-server.routeregistrar.md
+++ b/docs/development/core/server/kibana-plugin-server.routeregistrar.md
@@ -9,5 +9,5 @@ Route handler common definition
 <b>Signature:</b>
 
 ```typescript
-export declare type RouteRegistrar<Method extends RouteMethod> = <P extends ObjectType, Q extends ObjectType, B extends ObjectType | Type<Buffer> | Type<Stream>>(route: RouteConfig<P, Q, B, Method>, handler: RequestHandler<P, Q, B, Method>) => void;
+export declare type RouteRegistrar<Method extends RouteMethod> = <P, Q, B>(route: RouteConfig<P, Q, B, Method>, handler: RequestHandler<P, Q, B, Method>) => void;
 ```
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.body.md b/docs/development/core/server/kibana-plugin-server.routeschemas.body.md
deleted file mode 100644
index 78a9d25c25d9d..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.body.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteSchemas](./kibana-plugin-server.routeschemas.md) &gt; [body](./kibana-plugin-server.routeschemas.body.md)
-
-## RouteSchemas.body property
-
-<b>Signature:</b>
-
-```typescript
-body?: B;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.md b/docs/development/core/server/kibana-plugin-server.routeschemas.md
deleted file mode 100644
index 77b980551a8ff..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.md
+++ /dev/null
@@ -1,22 +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; [RouteSchemas](./kibana-plugin-server.routeschemas.md)
-
-## RouteSchemas interface
-
-RouteSchemas contains the schemas for validating the different parts of a request.
-
-<b>Signature:</b>
-
-```typescript
-export interface RouteSchemas<P extends ObjectType, Q extends ObjectType, B extends ObjectType | Type<Buffer> | Type<Stream>> 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [body](./kibana-plugin-server.routeschemas.body.md) | <code>B</code> |  |
-|  [params](./kibana-plugin-server.routeschemas.params.md) | <code>P</code> |  |
-|  [query](./kibana-plugin-server.routeschemas.query.md) | <code>Q</code> |  |
-
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.params.md b/docs/development/core/server/kibana-plugin-server.routeschemas.params.md
deleted file mode 100644
index 3dbf9fed94dc0..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.params.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteSchemas](./kibana-plugin-server.routeschemas.md) &gt; [params](./kibana-plugin-server.routeschemas.params.md)
-
-## RouteSchemas.params property
-
-<b>Signature:</b>
-
-```typescript
-params?: P;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.query.md b/docs/development/core/server/kibana-plugin-server.routeschemas.query.md
deleted file mode 100644
index 5be5830cb4bc8..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.query.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteSchemas](./kibana-plugin-server.routeschemas.md) &gt; [query](./kibana-plugin-server.routeschemas.query.md)
-
-## RouteSchemas.query property
-
-<b>Signature:</b>
-
-```typescript
-query?: Q;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationerror._constructor_.md b/docs/development/core/server/kibana-plugin-server.routevalidationerror._constructor_.md
new file mode 100644
index 0000000000000..551e13faaf154
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationerror._constructor_.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; [RouteValidationError](./kibana-plugin-server.routevalidationerror.md) &gt; [(constructor)](./kibana-plugin-server.routevalidationerror._constructor_.md)
+
+## RouteValidationError.(constructor)
+
+Constructs a new instance of the `RouteValidationError` class
+
+<b>Signature:</b>
+
+```typescript
+constructor(error: Error | string, path?: string[]);
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  error | <code>Error &#124; string</code> |  |
+|  path | <code>string[]</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationerror.md b/docs/development/core/server/kibana-plugin-server.routevalidationerror.md
new file mode 100644
index 0000000000000..71bd72dca2eab
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationerror.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteValidationError](./kibana-plugin-server.routevalidationerror.md)
+
+## RouteValidationError class
+
+Error to return when the validation is not successful.
+
+<b>Signature:</b>
+
+```typescript
+export declare class RouteValidationError extends SchemaTypeError 
+```
+
+## Constructors
+
+|  Constructor | Modifiers | Description |
+|  --- | --- | --- |
+|  [(constructor)(error, path)](./kibana-plugin-server.routevalidationerror._constructor_.md) |  | Constructs a new instance of the <code>RouteValidationError</code> class |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationfunction.md b/docs/development/core/server/kibana-plugin-server.routevalidationfunction.md
new file mode 100644
index 0000000000000..34fa096aaae78
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationfunction.md
@@ -0,0 +1,42 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md)
+
+## RouteValidationFunction type
+
+The custom validation function if @<!-- -->kbn/config-schema is not a valid solution for your specific plugin requirements.
+
+<b>Signature:</b>
+
+```typescript
+export declare type RouteValidationFunction<T> = (data: any, validationResult: RouteValidationResultFactory) => {
+    value: T;
+    error?: never;
+} | {
+    value?: never;
+    error: RouteValidationError;
+};
+```
+
+## Example
+
+The validation should look something like:
+
+```typescript
+interface MyExpectedBody {
+  bar: string;
+  baz: number;
+}
+
+const myBodyValidation: RouteValidationFunction<MyExpectedBody> = (data, validationResult) => {
+  const { ok, badRequest } = validationResult;
+  const { bar, baz } = data || {};
+  if (typeof bar === 'string' && typeof baz === 'number') {
+    return ok({ bar, baz });
+  } else {
+    return badRequest('Wrong payload', ['body']);
+  }
+}
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.badrequest.md b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.badrequest.md
new file mode 100644
index 0000000000000..36ea6103fb352
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.badrequest.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; [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md) &gt; [badRequest](./kibana-plugin-server.routevalidationresultfactory.badrequest.md)
+
+## RouteValidationResultFactory.badRequest property
+
+<b>Signature:</b>
+
+```typescript
+badRequest: (error: Error | string, path?: string[]) => {
+        error: RouteValidationError;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.md b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.md
new file mode 100644
index 0000000000000..5f44b490e9a17
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.md
@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md)
+
+## RouteValidationResultFactory interface
+
+Validation result factory to be used in the custom validation function to return the valid data or validation errors
+
+See [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+export interface RouteValidationResultFactory 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [badRequest](./kibana-plugin-server.routevalidationresultfactory.badrequest.md) | <code>(error: Error &#124; string, path?: string[]) =&gt; {</code><br/><code>        error: RouteValidationError;</code><br/><code>    }</code> |  |
+|  [ok](./kibana-plugin-server.routevalidationresultfactory.ok.md) | <code>&lt;T&gt;(value: T) =&gt; {</code><br/><code>        value: T;</code><br/><code>    }</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.ok.md b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.ok.md
new file mode 100644
index 0000000000000..eca6a31bd547f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.ok.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; [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md) &gt; [ok](./kibana-plugin-server.routevalidationresultfactory.ok.md)
+
+## RouteValidationResultFactory.ok property
+
+<b>Signature:</b>
+
+```typescript
+ok: <T>(value: T) => {
+        value: T;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationspec.md b/docs/development/core/server/kibana-plugin-server.routevalidationspec.md
new file mode 100644
index 0000000000000..f5fc06544043f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationspec.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteValidationSpec](./kibana-plugin-server.routevalidationspec.md)
+
+## RouteValidationSpec type
+
+Allowed property validation options: either @<!-- -->kbn/config-schema validations or custom validation functions
+
+See [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md) for custom validation.
+
+<b>Signature:</b>
+
+```typescript
+export declare type RouteValidationSpec<T> = ObjectType | Type<T> | RouteValidationFunction<T>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.body.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.body.md
new file mode 100644
index 0000000000000..8b5d2c0413087
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.body.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; [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) &gt; [body](./kibana-plugin-server.routevalidatorconfig.body.md)
+
+## RouteValidatorConfig.body property
+
+Validation logic for the body payload
+
+<b>Signature:</b>
+
+```typescript
+body?: RouteValidationSpec<B>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.md
new file mode 100644
index 0000000000000..4637da7741d80
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md)
+
+## RouteValidatorConfig interface
+
+The configuration object to the RouteValidator class. Set `params`<!-- -->, `query` and/or `body` to specify the validation logic to follow for that property.
+
+<b>Signature:</b>
+
+```typescript
+export interface RouteValidatorConfig<P, Q, B> 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [body](./kibana-plugin-server.routevalidatorconfig.body.md) | <code>RouteValidationSpec&lt;B&gt;</code> | Validation logic for the body payload |
+|  [params](./kibana-plugin-server.routevalidatorconfig.params.md) | <code>RouteValidationSpec&lt;P&gt;</code> | Validation logic for the URL params |
+|  [query](./kibana-plugin-server.routevalidatorconfig.query.md) | <code>RouteValidationSpec&lt;Q&gt;</code> | Validation logic for the Query params |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.params.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.params.md
new file mode 100644
index 0000000000000..11de25ff3b19f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.params.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; [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) &gt; [params](./kibana-plugin-server.routevalidatorconfig.params.md)
+
+## RouteValidatorConfig.params property
+
+Validation logic for the URL params
+
+<b>Signature:</b>
+
+```typescript
+params?: RouteValidationSpec<P>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.query.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.query.md
new file mode 100644
index 0000000000000..510325c2dfff7
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.query.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; [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) &gt; [query](./kibana-plugin-server.routevalidatorconfig.query.md)
+
+## RouteValidatorConfig.query property
+
+Validation logic for the Query params
+
+<b>Signature:</b>
+
+```typescript
+query?: RouteValidationSpec<Q>;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorfullconfig.md b/docs/development/core/server/kibana-plugin-server.routevalidatorfullconfig.md
new file mode 100644
index 0000000000000..0f3785b954a3a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorfullconfig.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; [RouteValidatorFullConfig](./kibana-plugin-server.routevalidatorfullconfig.md)
+
+## RouteValidatorFullConfig type
+
+Route validations config and options merged into one object
+
+<b>Signature:</b>
+
+```typescript
+export declare type RouteValidatorFullConfig<P, Q, B> = RouteValidatorConfig<P, Q, B> & RouteValidatorOptions;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.md b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.md
new file mode 100644
index 0000000000000..00b029d9928e3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteValidatorOptions](./kibana-plugin-server.routevalidatoroptions.md)
+
+## RouteValidatorOptions interface
+
+Additional options for the RouteValidator class to modify its default behaviour.
+
+<b>Signature:</b>
+
+```typescript
+export interface RouteValidatorOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [unsafe](./kibana-plugin-server.routevalidatoroptions.unsafe.md) | <code>{</code><br/><code>        params?: boolean;</code><br/><code>        query?: boolean;</code><br/><code>        body?: boolean;</code><br/><code>    }</code> | Set the <code>unsafe</code> config to avoid running some additional internal \*safe\* validations on top of your custom validation |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.unsafe.md b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.unsafe.md
new file mode 100644
index 0000000000000..0406a372c4e9d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.unsafe.md
@@ -0,0 +1,17 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [RouteValidatorOptions](./kibana-plugin-server.routevalidatoroptions.md) &gt; [unsafe](./kibana-plugin-server.routevalidatoroptions.unsafe.md)
+
+## RouteValidatorOptions.unsafe property
+
+Set the `unsafe` config to avoid running some additional internal \*safe\* validations on top of your custom validation
+
+<b>Signature:</b>
+
+```typescript
+unsafe?: {
+        params?: boolean;
+        query?: boolean;
+        body?: boolean;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.md b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.md
index 17d29bb912c83..e68486ecff874 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsclient.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsclient.md
@@ -10,6 +10,10 @@
 export declare class SavedObjectsClient 
 ```
 
+## Remarks
+
+The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `SavedObjectsClient` class.
+
 ## Properties
 
 |  Property | Modifiers | Type | Description |
@@ -30,7 +34,3 @@ export declare class SavedObjectsClient
 |  [get(type, id, options)](./kibana-plugin-server.savedobjectsclient.get.md) |  | Retrieves a single object |
 |  [update(type, id, attributes, options)](./kibana-plugin-server.savedobjectsclient.update.md) |  | Updates an SavedObject |
 
-## Remarks
-
-The constructor for this class is marked as internal. Third-party code should not call the constructor directly or create subclasses that extend the `SavedObjectsClient` class.
-
diff --git a/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.md b/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.md
index dd97b45f590e2..95bd817a43da6 100644
--- a/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.md
+++ b/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.md
@@ -12,15 +12,6 @@ Saved Objects is Kibana's data persisentence mechanism allowing plugins to use E
 export interface SavedObjectsServiceSetup 
 ```
 
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [addClientWrapper](./kibana-plugin-server.savedobjectsservicesetup.addclientwrapper.md) | <code>(priority: number, id: string, factory: SavedObjectsClientWrapperFactory&lt;KibanaRequest&gt;) =&gt; void</code> | Add a client wrapper with the given priority. |
-|  [createInternalRepository](./kibana-plugin-server.savedobjectsservicesetup.createinternalrepository.md) | <code>(extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-server.isavedobjectsrepository.md) that uses the internal Kibana user for authenticating with Elasticsearch. |
-|  [createScopedRepository](./kibana-plugin-server.savedobjectsservicesetup.createscopedrepository.md) | <code>(req: KibanaRequest, extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-server.isavedobjectsrepository.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. |
-|  [setClientFactory](./kibana-plugin-server.savedobjectsservicesetup.setclientfactory.md) | <code>(customClientFactory: SavedObjectsClientFactory&lt;KibanaRequest&gt;) =&gt; void</code> | Set a default factory for creating Saved Objects clients. Only one client factory can be set, subsequent calls to this method will fail. |
-
 ## Remarks
 
 Note: The Saved Object setup API's should only be used for creating and registering client wrappers. Constructing a Saved Objects client or repository for use within your own plugin won't have any of the registered wrappers applied and is considered an anti-pattern. Use the Saved Objects client from the [SavedObjectsServiceStart\#getScopedClient](./kibana-plugin-server.savedobjectsservicestart.md) method or the [route handler context](./kibana-plugin-server.requesthandlercontext.md) instead.
@@ -33,3 +24,12 @@ import {<!-- -->SavedObjectsClient, CoreSetup<!-- -->} from 'src/core/server';
 
 export class Plugin() { setup: (core: CoreSetup) =<!-- -->&gt; { core.savedObjects.setClientFactory((<!-- -->{<!-- -->request: KibanaRequest<!-- -->}<!-- -->) =<!-- -->&gt; { return new SavedObjectsClient(core.savedObjects.scopedRepository(request)); }<!-- -->) } }
 
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [addClientWrapper](./kibana-plugin-server.savedobjectsservicesetup.addclientwrapper.md) | <code>(priority: number, id: string, factory: SavedObjectsClientWrapperFactory&lt;KibanaRequest&gt;) =&gt; void</code> | Add a client wrapper with the given priority. |
+|  [createInternalRepository](./kibana-plugin-server.savedobjectsservicesetup.createinternalrepository.md) | <code>(extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-server.isavedobjectsrepository.md) that uses the internal Kibana user for authenticating with Elasticsearch. |
+|  [createScopedRepository](./kibana-plugin-server.savedobjectsservicesetup.createscopedrepository.md) | <code>(req: KibanaRequest, extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-server.isavedobjectsrepository.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. |
+|  [setClientFactory](./kibana-plugin-server.savedobjectsservicesetup.setclientfactory.md) | <code>(customClientFactory: SavedObjectsClientFactory&lt;KibanaRequest&gt;) =&gt; void</code> | Set a default factory for creating Saved Objects clients. Only one client factory can be set, subsequent calls to this method will fail. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.scopeablerequest.md b/docs/development/core/server/kibana-plugin-server.scopeablerequest.md
new file mode 100644
index 0000000000000..5a9443376996d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.scopeablerequest.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ScopeableRequest](./kibana-plugin-server.scopeablerequest.md)
+
+## ScopeableRequest type
+
+A user credentials container. It accommodates the necessary auth credentials to impersonate the current user.
+
+See [KibanaRequest](./kibana-plugin-server.kibanarequest.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+export declare type ScopeableRequest = KibanaRequest | LegacyRequest | FakeRequest;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.register.md b/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.register.md
index 8091a7cec44aa..0047b5275408e 100644
--- a/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.register.md
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.register.md
@@ -24,5 +24,17 @@ register(settings: Record<string, UiSettingsParams>): void;
 
 ## Example
 
-setup(core: CoreSetup)<!-- -->{ core.uiSettings.register(\[{ foo: { name: i18n.translate('my foo settings'), value: true, description: 'add some awesomeness', }<!-- -->, }<!-- -->\]); }
+
+```ts
+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.uisettingsservicestart.asscopedtoclient.md b/docs/development/core/server/kibana-plugin-server.uisettingsservicestart.asscopedtoclient.md
new file mode 100644
index 0000000000000..072dd39faa084
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsservicestart.asscopedtoclient.md
@@ -0,0 +1,37 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UiSettingsServiceStart](./kibana-plugin-server.uisettingsservicestart.md) &gt; [asScopedToClient](./kibana-plugin-server.uisettingsservicestart.asscopedtoclient.md)
+
+## UiSettingsServiceStart.asScopedToClient() method
+
+Creates a [IUiSettingsClient](./kibana-plugin-server.iuisettingsclient.md) with provided \*scoped\* saved objects client.
+
+This should only be used in the specific case where the client needs to be accessed from outside of the scope of a [RequestHandler](./kibana-plugin-server.requesthandler.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+asScopedToClient(savedObjectsClient: SavedObjectsClientContract): IUiSettingsClient;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  savedObjectsClient | <code>SavedObjectsClientContract</code> |  |
+
+<b>Returns:</b>
+
+`IUiSettingsClient`
+
+## Example
+
+
+```ts
+start(core: CoreStart) {
+ const soClient = core.savedObjects.getScopedClient(arbitraryRequest);
+ const uiSettingsClient = core.uiSettings.asScopedToClient(soClient);
+}
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.uisettingsservicestart.md b/docs/development/core/server/kibana-plugin-server.uisettingsservicestart.md
new file mode 100644
index 0000000000000..ee3563552275a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.uisettingsservicestart.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; [UiSettingsServiceStart](./kibana-plugin-server.uisettingsservicestart.md)
+
+## UiSettingsServiceStart interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface UiSettingsServiceStart 
+```
+
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [asScopedToClient(savedObjectsClient)](./kibana-plugin-server.uisettingsservicestart.asscopedtoclient.md) | Creates a [IUiSettingsClient](./kibana-plugin-server.iuisettingsclient.md) with provided \*scoped\* saved objects client.<!-- -->This should only be used in the specific case where the client needs to be accessed from outside of the scope of a [RequestHandler](./kibana-plugin-server.requesthandler.md)<!-- -->. |
+
diff --git a/docs/development/core/server/kibana-plugin-server.uuidservicesetup.getinstanceuuid.md b/docs/development/core/server/kibana-plugin-server.uuidservicesetup.getinstanceuuid.md
new file mode 100644
index 0000000000000..e0b7012bea4aa
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.uuidservicesetup.getinstanceuuid.md
@@ -0,0 +1,17 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UuidServiceSetup](./kibana-plugin-server.uuidservicesetup.md) &gt; [getInstanceUuid](./kibana-plugin-server.uuidservicesetup.getinstanceuuid.md)
+
+## UuidServiceSetup.getInstanceUuid() method
+
+Retrieve the Kibana instance uuid.
+
+<b>Signature:</b>
+
+```typescript
+getInstanceUuid(): string;
+```
+<b>Returns:</b>
+
+`string`
+
diff --git a/docs/development/core/server/kibana-plugin-server.uuidservicesetup.md b/docs/development/core/server/kibana-plugin-server.uuidservicesetup.md
new file mode 100644
index 0000000000000..f2a6cfdeac704
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.uuidservicesetup.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UuidServiceSetup](./kibana-plugin-server.uuidservicesetup.md)
+
+## UuidServiceSetup interface
+
+APIs to access the application's instance uuid.
+
+<b>Signature:</b>
+
+```typescript
+export interface UuidServiceSetup 
+```
+
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [getInstanceUuid()](./kibana-plugin-server.uuidservicesetup.getinstanceuuid.md) | Retrieve the Kibana instance uuid. |
+
diff --git a/docs/discover/context.asciidoc b/docs/discover/context.asciidoc
index 9049109d6124d..c402a734a16fa 100644
--- a/docs/discover/context.asciidoc
+++ b/docs/discover/context.asciidoc
@@ -1,90 +1,66 @@
 [[document-context]]
-== Viewing Document Context
+== Viewing a document in context
 
-For certain applications it can be useful to inspect a window of documents
-surrounding a specific event. The context view enables you to do just that for
-<<index-patterns, index patterns>> that are configured to contain time-based events.
+Once you've narrowed your search to a specific event,
+you might want to inspect the documents that occurred
+immediately before and after the event. With the Context view,
+you can do just that for index patterns that contain time-based events.
 
-To show the context surrounding an anchor document, click the *Expand* button
-image:images/ExpandButton.jpg[Expand Button] to the left of the document's
-table entry and then click the *View surrounding documents* link.
+To open the Context view, click the expand icon (<) in the document table, and then click
+*View surrounding documents.*
 
-image::images/Expanded-Document.png[Expanded Document]
-{nbsp}
+The documents are sorted
+by the time field specified in the index pattern and displayed using the
+same set of columns as the *Discover* view from which the context was opened.
+The anchor document is highlighted in blue.
 
-The context view displays a number of documents before and after the anchor
-document. The anchor document itself is highlighted in blue. The view is sorted
-by the time field specified in the index pattern configuration and uses the
-same set of columns as the Discover view the context was opened from. If there
-are multiple documents with the same time field value, the internal document
-order is used as a secondary sorting criterion by default.
-
-[NOTE]
---
-The field used for tiebreaking in case of equal time field values can be
-configured using the advanced setting `context:tieBreakerFields` in
-<<advanced-options, *Management > Advanced Settings*>>, which defaults to the
-`_doc` field. The value of this setting can be a comma-separated list of field
-names, which will be checked in sequence for suitability when a context is
-about to be displayed. The first suitable field is then used as the tiebreaking
-field. A field is suitable if the field exists and is sortable in the index
-pattern the context is based on.
-
-While not required, it is recommended to only
-use fields which have {ref}/doc-values.html[doc values] enabled to achieve
-good performance and avoid unnecessary {ref}/modules-fielddata.html[field
-data] usage. Common examples for suitable fields include log line numbers,
-monotonically increasing counters and high-precision timestamps.
---
 
+[role="screenshot"]
 image::images/Discover-ContextView.png[Context View]
 
-NOTE: The number of documents displayed by default can be configured
-via the `context:defaultSize` setting in <<advanced-options, *Management >
-Advanced Settings*>>.
-
 [float]
-[[change-context-size]]
-=== Changing the Context Size
-
-You can change the number documents displayed before and after the anchor
-document independently.
-
-To increase the number of displayed documents that are newer than the anchor
-document, click the *Load 5 more* button above the document list or enter the
-desired number into the input box right of the button.
-
-image::images/Discover-ContextView-SizePicker-Newer.png[]
-{nbsp}
-
-To increase the number of displayed documents that are older than the anchor
-document, click the *Load 5 more* button below the document list or enter the
-desired number into the input box right of the button.
+[[filter-context]]
+=== Filter the context
 
-image::images/Discover-ContextView-SizePicker-Older.png[]
-{nbsp}
+The
+filters you applied in *Discover* are carried over to the Context view. Pinned filters remain active, while normal
+filters are copied in a disabled state. You can re-enable these filters to
+refine your context view.
 
-NOTE: The default number of documents loaded with each button click can be
-configured via the `context:step` setting in <<advanced-options, *Management >
-Advanced Settings*>>.
+If the Context view contains a large number of documents not related to the event under
+investigation, you can use filters to restrict the documents to
+display.
 
 [float]
-[[filter-context]]
-=== Filtering the Context
-
-Depending on how the documents are partitioned into index patterns, the context
-view might contain a large number of documents not related to the event under
-investigation. In order to adapt the focus of the context view to the task at
-hand, you can use filters to restrict the documents considered by Kibana for
-display in the context view.
-
-When switching from the discover view to the context view, the previously
-applied filters are carried over. Pinned filters remain active while normal
-filters are copied in a disabled state. You can selectively re-enabled them to
-refine your context view.
+[[change-context-size]]
+=== Change the number of surrounding documents
 
-New filters can be added via the *Add a filter* link in the filter bar, by
-clicking the filter icons appearing when hovering a field, or by expanding
-documents and clicking the filter icons in the table.
+By default, the five newest and oldest
+documents are listed. To increase the number of documents that surround the anchor document,
+click *Load*.  Five documents are added with each click.
 
-image::images/Discover-ContextView-FilterMontage.png[]
+[float]
+[[configure-context-ContextView]]
+=== Configure the context view
+
+To configure the Context view, use these settings in <<advanced-options,
+Advanced Settings>>.
+
+[horizontal]
+`context:defaultSize`:: The number of documents to display by default.
+`context:step`:: The default number of documents to load with each button click.
+`context:tieBreakerFields`:: The field to use for tiebreaking in case of equal time field values.
+The default is the
+`_doc` field.
++
+You can enter a comma-separated list of field
+names, which is checked in sequence for suitability when a context is
+displayed. The first suitable field is used as the tiebreaking
+field. A field is suitable if the field exists and is sortable in the index
+pattern the context is based on.
++
+Although not required, it is recommended to only
+use fields that have {ref}/doc-values.html[doc values] enabled to achieve
+good performance and avoid unnecessary {ref}/modules-fielddata.html[field
+data] usage. Common examples for suitable fields include log line numbers,
+monotonically increasing counters and high-precision timestamps.
diff --git a/docs/discover/document-data.asciidoc b/docs/discover/document-data.asciidoc
index dc6a45dc5ad7e..b45a31065aa9a 100644
--- a/docs/discover/document-data.asciidoc
+++ b/docs/discover/document-data.asciidoc
@@ -1,69 +1,55 @@
 [[document-data]]
-== Viewing Document Data
+== Viewing document data
 
-When you submit a search query, the 500 most recent documents that match the query
-are listed in the Documents table. You can configure the number of documents shown
-in the table by setting the `discover:sampleSize` property in <<advanced-options,
-Advanced Settings>>. By default, the table shows the localized version of the time
-field configured for the selected <<index-patterns, index pattern>> and the document `_source`. You can
-<<adding-columns, add fields to the Documents table>> from the Fields list.
-You can <<sorting, sort the listed documents>> by any indexed field that's included
-in the table.
-
-To view a document's field data, click the *Expand* button 
-image:images/ExpandButton.jpg[Expand Button] to the left of the document's table
-entry. 
-
-image::images/Expanded-Document.png[]
-
-To view the original JSON document (pretty-printed), click the *JSON* tab.
-
-To view the document data as a separate page, click the *View single document* 
-link. You can bookmark and share this link to provide direct access to a 
-particular document.
-
-To display or hide a field's column in the Documents table, click the
-image:images/add-column-button.png[Add Column] *Toggle column in table* button.
-
-To collapse the document details, click the *Collapse* button 
-image:images/CollapseButton.jpg[Collapse Button].
+When you submit a search query in *Discover*, the most recent documents that match the query
+are listed in the documents table.
+By default, the table includes columns for
+the time field and the document `_source`, which shows all fields and values in the document.
 
 [float]
 [[sorting]]
-=== Sorting the Document List
-You can sort the documents in the Documents table by the values in any indexed
-field. If a time field is configured for the current index pattern, the 
-documents are sorted in reverse chronological order by default.
-
-To change the sort order, hover over the name of the field you want to sort by
-and click the sort button. Click again to reverse the sort order.
+=== Modify the document table
+
+Use the following commands to
+tailor the documents table to suit your needs.
+
+[horizontal]
+Add a field column::
+Hover over the list of *Available fields* and then click *add* next to each field you want include as a column in the table.
+The first field you add replaces the `_source` column.
+Change sort order:: By default, columns are sorted by the values in the field.
+If a time field is configured for the current index pattern,
+the documents are sorted in reverse chronological order.
++
+To change the sort order, hover over the column
+and click image:images/sort-icon.png[].
+The first click sorts by ascending order, the second click sorts by descending order, and the third
+click removes the field from the sorted fields.
+
+Move a field column:: Hover over the column header and click the move left (<<) or move right icon (>>).
+Remove&nbsp;a&nbsp;field&nbsp;column&nbsp;:: Hover over the list of *Specified fields*
+and then click *remove*.
+Or, use the (x) control in the column header.
 
 [float]
-[[adding-columns]]
-=== Adding Field Columns to the Documents Table
-By default, the Documents table shows the localized version of the time field
-that's configured for the selected index pattern and the document `_source`. 
-You can add fields to the table from the Fields list or from a document's
-field data.
-
-To add a field column from the Fields list, hover over the field and click its
-*add* button.
+=== Drill down into field-level details
+To view the document data in either table or JSON format, click the expand icon (>).
+The expanded view provides these options for viewing your document:
 
-To add a field column from a document's field data, expand the document
-and click the field's
-image:images/add-column-button.png[Add Column] *Toggle column in table* button.
+* View the events that surround your document.
+For example, you might want to see the 10 documents that occurred
+immediately before and after your event.
 
-Added field columns replace the `_source` column in the Documents table. The added
-fields are also added to the *Selected Fields* list.
+* View the document data as a separate page. You can bookmark and
+share the link for direct access to a particular document.
 
-To rearrange the field columns, hover over the header of the column you want to move
-and click the *Move left* or *Move right* button.
+[role="screenshot"]
+image::images/Expanded-Document.png[]
 
-image:images/Discover-MoveColumn.jpg[Move Column]
 
 [float]
-[[removing-columns]]
-=== Removing Field Columns from the Documents Table
-To remove a field column from the Documents table, hover over the header of the 
-column you want to remove and click the *Remove* button 
-image:images/RemoveFieldButton.jpg[Remove Field Button].
\ No newline at end of file
+=== Configure the number of documents to show
+
+By default, the documents table includes the 500 most recent documents that
+match the query. To change this number, set the `discover:sampleSize` property in <<advanced-options,
+Advanced Settings>>.
diff --git a/docs/discover/field-filter.asciidoc b/docs/discover/field-filter.asciidoc
index 5646fe079401e..49bb6078cdc58 100644
--- a/docs/discover/field-filter.asciidoc
+++ b/docs/discover/field-filter.asciidoc
@@ -1,127 +1,132 @@
 [[field-filter]]
-== Filtering by Field
-You can filter the search results to display only those documents that contain
-a particular value in a field. You can also create negative filters that
-exclude documents that contain the specified field value.
+== Filtering by field
 
-You add field filters from the Fields list, the Documents table, or by manually
-adding a filter. In addition to creating positive and negative filters, the
-Documents table enables you to filter on whether or not a field is present. The
-applied filters are shown below the Query bar. Negative filters are shown in red.
+*Discover* offers
+various types of filters, so you can restrict your documents to the exact data you want.
+For example, you might look at the results for a
+particular period of time. Or, you might include&mdash;or exclude&mdash;
+all HTTP redirects that come from a specific IP and port.
 
-To add a filter from the Fields list:
+[float]
+=== Add a filter
+
+A quick way to add a filter is from the fields list.
 
-. Click the name of the field you want to filter on. This displays the top
-five values for that field.
+. Click the field to filter on.
++
+You'll see the number of documents that contain
+the field, the top 5 values for the field, and the percentage of documents
+that contain each value.
 +
 [role="screenshot"]
 image::images/filter-field.png[height=317]
-. To add a positive filter, click the *Positive Filter* button
-image:images/PositiveFilter.jpg[Positive Filter].
-This includes only those documents that contain that value in the field.
-. To add a negative filter, click the *Negative Filter* button
-image:images/NegativeFilter.jpg[Negative Filter].
-This excludes documents that contain that value in the field.
-
-To add a filter from the Documents table:
-
-. Expand a document in the Documents table by clicking the *Expand* button
-image:images/ExpandButton.jpg[Expand Button] to the left of the document's
-table entry.
+
+. Use the image:images/PositiveFilter.jpg[Positive Filter] icon to
+show only documents that contain that value,
+or image:images/NegativeFilter.jpg[Negative Filter] to exclude all documents with that value.
 +
-image::images/Expanded-Document.png[]
-. To add a positive filter, click the *Positive Filter* button
-image:images/PositiveFilter.jpg[Positive Filter Button] to the right of the
-field name. This includes only those documents that contain that value in the
-field.
-. To add a negative filter, click the *Negative Filter* button
-image:images/NegativeFilter.jpg[Negative Filter Button] to the right of the
-field name. This excludes documents that contain that value in the field.
-. To filter on whether or not documents contain the field, click the
-*Exists* button image:images/ExistsButton.jpg[Exists Button] to the right of the
-field name. This includes only those documents that contain the field.
-
-To manually add a filter:
-
-. Click *Add Filter*. A popup will be displayed for you to create the filter.
-
-. Choose a field to filter by. This list of fields will include fields from the
-index pattern you are currently querying against.
+If there is no data to display, you might need to set a <<set-time-filter, date time filter>>.
+You can choose a time from the quick filter or choose your
+own using absolute or relative times.
+
+. Try also these filtering options:
++
+*  To limit the field
+list to a particular data type, click *Filter by type*.
+You can also filter for whether that type is
+aggregatable or searchable.
 +
-image::images/add_filter_field.png[]
-. Choose an operation for your filter.
+* To filter for whether a field is present, expand the document in
+the document table, hover over the field, and click the *Filter for field present* icon.
+
+[float]
+=== Filter by condition
+
+You can filter using advanced criteria,
+such as if a value is equal to or in between certain values.
+
+. Click *Add Filter*.
+
+. Select a field.
+
+. Select an operation for your filter:
 +
-image::images/add_filter_operator.png[]
-The following operators can be selected:
 [horizontal]
-`is`:: Filter where the value for the field matches the given value.
-`is not`:: Filter where the value for the field does not match the given value.
-`is one of`:: Filter where the value for the field matches one of the specified values.
-`is not one of`:: Filter where the value for the field does not match any of the specified values.
-`is between`:: Filter where the value for the field is in the given range.
-`is not between`:: Filter where the value for the field is not in the given range.
-`exists`:: Filter where any value is present for the field.
-`does not exist`:: Filter where no value is present for the field.
-. Choose the value(s) for your filter. Values from your indices may be suggested
-as selections if you are filtering against an aggregatable field.
+`is`:: The value for the field matches the given value.
+`is not`:: The value for the field does not match the given value.
+`is one of`:: The field matches one of the specified values.
+`is not one of`:: The value for the field does not match any of the specified values.
+`is between`:: The value for the field is in the given range.
+`is not between`:: The value for the field is not in the given range.
+`exists`:: Any value is present for the field.
+`does not exist`:: No value is present for the field.
+. Choose values for your filter.
 +
-image::images/add_filter_value.png[]
-. (Optional) Specify a label for the filter. If you specify a label, it will be
-displayed below the query bar instead of the filter definition.
-. Click *Save*. The filter will be applied to your search and be displayed below
-the query bar.
+Values from your indices may be suggested
+as selections if you are filtering against an aggregatable field.
 
+. (Optional) Specify a label for the filter.
+
+. Click *Save* to apply the filter to your search.
++
 NOTE: If you are experiencing long-running queries as a result of the value suggestions, you can
-turn off the suggestions by setting the advanced setting, `filterEditor:suggestValues`, to `false`.
+turn off the suggestions by setting `filterEditor:suggestValues` to `false`
+in <<advanced-options,
+Advanced Settings>>.
 
 [float]
 [[filter-pinning]]
-=== Managing Filters
+=== Edit, disable, and delete filters
+
+To modify a filter, click its tag, and then select one of the following actions.
+
+*Pin across all apps*::
+Persist the filter
+when you switch contexts in Kibana. For example, you can pin a filter
+in *Discover* and it remains in place when you switch to *Visualize*.
+A filter is based on a particular index field&mdash;if the indices being
+searched do not contain the field in a pinned filter, it has no effect.
 
-To modify a filter, click on it and click one of the action buttons.
+*Edit filter*::
+Edit the
+filter definition and label.
 
-image::images/filter-allbuttons.png[]
+*Exclude results*::
+Switch from a positive
+filter to a negative filter, and vice versa.
 
-&nbsp;
+*Temporarily disable*::
+Disable the filter without
+removing it. Click again to reenable the filter.
+
+*Delete*::
+Delete the filter.
+
+To apply an action to all filters,
+click the *Actions* icon, and then select the action.
 
-Pin across all apps :: Pinned filters
-persist when you switch contexts in Kibana. For example, you can pin a filter
-in Discover and it remains in place when you switch to Visualize.
-Note that a filter is based on a particular index field--if the indices being
-searched don't contain the field in a pinned filter, it has no effect.
-Edit Filter :: <<filter-edit, Edit the
-filter>> definition.  Enables you to manually update the filter and
-specify a label for the filter.
-Exclude results :: Switch from a positive
-filter to a negative filter and vice-versa.
-Temporarily disable :: Disable the filter without
-removing it. Click again to reenable the filter. Diagonal stripes indicate
-that a filter is disabled.
-Remove Filter :: Remove the filter.
 
-To apply a filter action to all of the applied filters,
-click *Actions* and select the action.
 
 [float]
 [[filter-edit]]
-=== Editing a Filter
-You can edit a filter by changing the field, operator, or value associated
-with the filter (see the Add Filter section above), or by directly modifying
-the filter query that is performed to filter your search results. This
-enables you to create more complex filters that are based on multiple fields.
-
-. To edit the filter query, first click the edit button for the filter, then
-click *Edit Query DSL*.
-+
-image::images/edit_filter_query.png[]
-. You can then edit the query for the filter.
-+
-image::images/edit_filter_query_json.png[]
+=== Modify the filter query
 
-For example, you could use a
-{ref}/query-dsl-bool-query.html[bool query] to create a filter for the
-sample log data that displays the hits that originated from Canada or China that resulted in a 404 error:
+You can directly modify
+the query that filters your search results.  This enables you
+to create more complex filters using multiple fields.
 
+. Click the filter tag, and then select *Edit > Edit Query DSL*.
+
+. Edit the query for the filter.
++
+////
+image::images/edit_filter_query_json.png[]
++
+////
+For example, if you are using the sample log data, you can use the
+{ref}/query-dsl-bool-query.html[bool query] to create a filter
+that displays the hits that originated from Canada or China that resulted in a 404 error:
++
 ==========
 [source,json]
 {
diff --git a/docs/discover/images/move-icon.png b/docs/discover/images/move-icon.png
new file mode 100644
index 0000000000000..3fa1f9e2f1a59
Binary files /dev/null and b/docs/discover/images/move-icon.png differ
diff --git a/docs/discover/images/sort-icon.png b/docs/discover/images/sort-icon.png
new file mode 100644
index 0000000000000..7dd3719ec361b
Binary files /dev/null and b/docs/discover/images/sort-icon.png differ
diff --git a/docs/discover/viewing-field-stats.asciidoc b/docs/discover/viewing-field-stats.asciidoc
index 96a26c78596e2..3631aba73fb20 100644
--- a/docs/discover/viewing-field-stats.asciidoc
+++ b/docs/discover/viewing-field-stats.asciidoc
@@ -1,14 +1,14 @@
 [[viewing-field-stats]]
 == Viewing Field Data Statistics
 
-From the Fields list, you can see how many of the documents in the Documents
+From the fields list, you can see how many of the documents in the documents
 table contain a particular field, what the top 5 values are, and what
 percentage of documents contain each value.
 
-Data can be visualized in various ways. The quick visualize can only be 
-applied to aggregatable fields. The keyword fields can be visualized and 
-they are available in the side bar if we uncheck "Hide missing fields".
+You can visualize data in various ways. You can only apply the quick visualize
+to aggregatable fields. You can visualize the keyword fields, and
+they are available in the side bar if you uncheck "Hide missing fields".
 
-To view field data statistics, click the name of a field in the Fields list.
+To view field data statistics, click the name of a field in the fields list.
 
-image:images/filter-field.png[Field Statistics,height=317]
\ No newline at end of file
+image:images/filter-field.png[Field Statistics,height=317]
diff --git a/docs/images/Discover-ContextView-SizePicker-Newer.png b/docs/images/Discover-ContextView-SizePicker-Newer.png
deleted file mode 100644
index 852cb22c1f27c..0000000000000
Binary files a/docs/images/Discover-ContextView-SizePicker-Newer.png and /dev/null differ
diff --git a/docs/images/Discover-ContextView-SizePicker-Older.png b/docs/images/Discover-ContextView-SizePicker-Older.png
deleted file mode 100644
index 38cd9acd1bee0..0000000000000
Binary files a/docs/images/Discover-ContextView-SizePicker-Older.png and /dev/null differ
diff --git a/docs/images/Discover-ContextView.png b/docs/images/Discover-ContextView.png
index 11d4a59c26e55..5c2de602f6b41 100644
Binary files a/docs/images/Discover-ContextView.png and b/docs/images/Discover-ContextView.png differ
diff --git a/docs/images/Discover-Start.png b/docs/images/Discover-Start.png
index 680aa3767bdf0..27e7a2c728597 100644
Binary files a/docs/images/Discover-Start.png and b/docs/images/Discover-Start.png differ
diff --git a/docs/images/Expanded-Document.png b/docs/images/Expanded-Document.png
index ad2f0db1a7ff9..4fa255e79a8ad 100644
Binary files a/docs/images/Expanded-Document.png and b/docs/images/Expanded-Document.png differ
diff --git a/docs/images/canvas-add-pages.gif b/docs/images/canvas-add-pages.gif
index 5f977c6afb10f..a1fa228645836 100644
Binary files a/docs/images/canvas-add-pages.gif and b/docs/images/canvas-add-pages.gif differ
diff --git a/docs/images/canvas-align-elements.gif b/docs/images/canvas-align-elements.gif
index d2e2cda475757..0081308d68795 100644
Binary files a/docs/images/canvas-align-elements.gif and b/docs/images/canvas-align-elements.gif differ
diff --git a/docs/images/canvas-background-color-picker-min.gif b/docs/images/canvas-background-color-picker-min.gif
deleted file mode 100644
index bd22941b35f5d..0000000000000
Binary files a/docs/images/canvas-background-color-picker-min.gif and /dev/null differ
diff --git a/docs/images/canvas-background-color-picker.gif b/docs/images/canvas-background-color-picker.gif
index 37d43d987f5c4..bd22941b35f5d 100644
Binary files a/docs/images/canvas-background-color-picker.gif and b/docs/images/canvas-background-color-picker.gif differ
diff --git a/docs/images/canvas-change-your-expression-chart-no-legend.png b/docs/images/canvas-change-your-expression-chart-no-legend.png
new file mode 100644
index 0000000000000..f54437c1eba3c
Binary files /dev/null and b/docs/images/canvas-change-your-expression-chart-no-legend.png differ
diff --git a/docs/images/canvas-change-your-expression-chart.png b/docs/images/canvas-change-your-expression-chart.png
new file mode 100755
index 0000000000000..4400ce4dfb2c3
Binary files /dev/null and b/docs/images/canvas-change-your-expression-chart.png differ
diff --git a/docs/images/canvas-create-URL-min.gif b/docs/images/canvas-create-URL-min.gif
deleted file mode 100644
index 0c9fbf7201d80..0000000000000
Binary files a/docs/images/canvas-create-URL-min.gif and /dev/null differ
diff --git a/docs/images/canvas-create-URL.gif b/docs/images/canvas-create-URL.gif
index c7dfab28c681e..0c9fbf7201d80 100644
Binary files a/docs/images/canvas-create-URL.gif and b/docs/images/canvas-create-URL.gif differ
diff --git a/docs/images/canvas-distribute-elements.gif b/docs/images/canvas-distribute-elements.gif
index 2d7eca338d275..685d76ba22e40 100644
Binary files a/docs/images/canvas-distribute-elements.gif and b/docs/images/canvas-distribute-elements.gif differ
diff --git a/docs/images/canvas-element-select.gif b/docs/images/canvas-element-select.gif
index 9ead1c3243ee1..bd0e49377262e 100644
Binary files a/docs/images/canvas-element-select.gif and b/docs/images/canvas-element-select.gif differ
diff --git a/docs/images/canvas-embed_workpad-min.gif b/docs/images/canvas-embed_workpad-min.gif
deleted file mode 100644
index 293792c7fbcf2..0000000000000
Binary files a/docs/images/canvas-embed_workpad-min.gif and /dev/null differ
diff --git a/docs/images/canvas-embed_workpad.gif b/docs/images/canvas-embed_workpad.gif
index 0ffbdeab2862d..97a79d775fe36 100644
Binary files a/docs/images/canvas-embed_workpad.gif and b/docs/images/canvas-embed_workpad.gif differ
diff --git a/docs/images/canvas-functions-can-take-arguments-donut-chart.png b/docs/images/canvas-functions-can-take-arguments-donut-chart.png
new file mode 100644
index 0000000000000..d126830c4fdc9
Binary files /dev/null and b/docs/images/canvas-functions-can-take-arguments-donut-chart.png differ
diff --git a/docs/images/canvas-functions-can-take-arguments-pie-chart.png b/docs/images/canvas-functions-can-take-arguments-pie-chart.png
new file mode 100644
index 0000000000000..be923675bea80
Binary files /dev/null and b/docs/images/canvas-functions-can-take-arguments-pie-chart.png differ
diff --git a/docs/images/canvas-generate-pdf-min.gif b/docs/images/canvas-generate-pdf-min.gif
deleted file mode 100644
index 9ef16dc1e5017..0000000000000
Binary files a/docs/images/canvas-generate-pdf-min.gif and /dev/null differ
diff --git a/docs/images/canvas-generate-pdf.gif b/docs/images/canvas-generate-pdf.gif
index a51e04cb623a6..9ef16dc1e5017 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-min.gif b/docs/images/canvas_share_autoplay_480-min.gif
deleted file mode 100644
index 84a108e58d3dc..0000000000000
Binary files a/docs/images/canvas_share_autoplay_480-min.gif and /dev/null differ
diff --git a/docs/images/canvas_share_autoplay_480.gif b/docs/images/canvas_share_autoplay_480.gif
index da6d8c74dd5ca..84a108e58d3dc 100644
Binary files a/docs/images/canvas_share_autoplay_480.gif and b/docs/images/canvas_share_autoplay_480.gif differ
diff --git a/docs/images/canvas_share_hidetoolbar_480-min.gif b/docs/images/canvas_share_hidetoolbar_480-min.gif
deleted file mode 100644
index 4706db48967b5..0000000000000
Binary files a/docs/images/canvas_share_hidetoolbar_480-min.gif and /dev/null differ
diff --git a/docs/images/canvas_share_hidetoolbar_480.gif b/docs/images/canvas_share_hidetoolbar_480.gif
index 6206714aa2804..282783057776a 100644
Binary files a/docs/images/canvas_share_hidetoolbar_480.gif and b/docs/images/canvas_share_hidetoolbar_480.gif differ
diff --git a/docs/images/lens_data_info-min.gif b/docs/images/lens_data_info-min.gif
deleted file mode 100644
index 39f9f668df4cd..0000000000000
Binary files a/docs/images/lens_data_info-min.gif and /dev/null differ
diff --git a/docs/images/lens_data_info.gif b/docs/images/lens_data_info.gif
deleted file mode 100644
index e2c565de9f6a7..0000000000000
Binary files a/docs/images/lens_data_info.gif and /dev/null differ
diff --git a/docs/images/lens_data_info.png b/docs/images/lens_data_info.png
new file mode 100644
index 0000000000000..3ceb7e5e990f7
Binary files /dev/null and b/docs/images/lens_data_info.png differ
diff --git a/docs/images/lens_drag_drop-min.gif b/docs/images/lens_drag_drop-min.gif
deleted file mode 100644
index 7219742114190..0000000000000
Binary files a/docs/images/lens_drag_drop-min.gif and /dev/null differ
diff --git a/docs/images/lens_drag_drop.gif b/docs/images/lens_drag_drop.gif
index 39cde64fb97eb..2a759abf03020 100644
Binary files a/docs/images/lens_drag_drop.gif and b/docs/images/lens_drag_drop.gif differ
diff --git a/docs/images/lens_suggestions-min.gif b/docs/images/lens_suggestions-min.gif
deleted file mode 100644
index de1d5b7096864..0000000000000
Binary files a/docs/images/lens_suggestions-min.gif and /dev/null differ
diff --git a/docs/images/lens_suggestions.gif b/docs/images/lens_suggestions.gif
index 0452207b86456..ad93a9d87d548 100644
Binary files a/docs/images/lens_suggestions.gif and b/docs/images/lens_suggestions.gif differ
diff --git a/docs/images/time_range_per_panel-min.gif b/docs/images/time_range_per_panel-min.gif
deleted file mode 100644
index 04d2e2f17b4f4..0000000000000
Binary files a/docs/images/time_range_per_panel-min.gif and /dev/null differ
diff --git a/docs/images/time_range_per_panel.gif b/docs/images/time_range_per_panel.gif
index aab8f68a0b50f..04d2e2f17b4f4 100644
Binary files a/docs/images/time_range_per_panel.gif and b/docs/images/time_range_per_panel.gif differ
diff --git a/docs/limitations.asciidoc b/docs/limitations.asciidoc
index 0b26a3cdcf71a..818cc766bf6a9 100644
--- a/docs/limitations.asciidoc
+++ b/docs/limitations.asciidoc
@@ -12,11 +12,11 @@
 These {stack} features also have limitations that affect {kib}:
 
 * {ref}/watcher-limitations.html[Alerting]
-* {stack-ov}/ml-limitations.html[Machine learning]
+* {ml-docs}/ml-limitations.html[Machine learning]
 * {ref}/security-limitations.html[Security]
 
 --
 
 include::limitations/nested-objects.asciidoc[]
 
-include::limitations/export-data.asciidoc[]
+include::limitations/export-data.asciidoc[]
\ No newline at end of file
diff --git a/docs/management/index-patterns.asciidoc b/docs/management/index-patterns.asciidoc
index 8d9ef515108ed..8e687f641c92b 100644
--- a/docs/management/index-patterns.asciidoc
+++ b/docs/management/index-patterns.asciidoc
@@ -1,17 +1,22 @@
 [[index-patterns]]
-== Index patterns
+== Creating an index pattern
 
-To visualize and explore data in {kib}, you must create an index pattern. 
-An index pattern tells {kib} which {es} indices contain the data that you want to work with. 
-An index pattern can match a single index, multiple indices, and a rollup index. 
+To explore and visualize data in {kib}, you must create an index pattern.
+An index pattern tells {kib} which {es} indices contain the data that
+you want to work with.
+Once you create an index pattern, you're ready to:
+
+* Interactively explore your data in <<discover, Discover>>.
+* Analyze your data in charts, tables, gauges, tag clouds, and more in <<visualize, Visualize>>.
+* Show off your data in a <<canvas, Canvas>> workpad.
+* If your data includes geo data, visualize it with <<maps, Maps>>.
 
 [float]
 [[index-patterns-read-only-access]]
 === [xpack]#Read-only access#
-If you have insufficient privileges to create or save index patterns, a read-only 
+If you have insufficient privileges to create or save index patterns, a read-only
 indicator appears in Kibana. The buttons to create new index patterns or save
-existing index patterns are not visible. For more information on granting access to
-Kibana see <<xpack-security-authorization>>.
+existing index patterns are not visible. For more information, see <<xpack-security-authorization>>.
 
 [role="screenshot"]
 image::images/management-index-read-only-badge.png[Example of Index Pattern Management's read only access indicator in Kibana's header]
@@ -20,12 +25,9 @@ image::images/management-index-read-only-badge.png[Example of Index Pattern Mana
 [[settings-create-pattern]]
 === Create an index pattern
 
-To get started, go to *Management > Kibana > Index Patterns*.  You begin with
-an overview of your index patterns, including any that were added when you 
-downloaded sample data sets. 
-
-You can create a standard index pattern, and if a rollup index is detected in the 
-cluster, a rollup index pattern.
+If you are in an app that requires an index pattern, and you don't have one yet,
+{kib} prompts you to create one.  Or, you can go directly to
+*Management > Kibana > Index Patterns*.
 
 [role="screenshot"]
 image:management/index-patterns/images/rollup-index-pattern.png["Menu with rollup index pattern"]
@@ -33,83 +35,93 @@ image:management/index-patterns/images/rollup-index-pattern.png["Menu with rollu
 [float]
 ==== Standard index pattern
 
-{kib} makes it easy for you to create an index pattern by walking you through 
-the process. Just start typing in the *Index pattern* field, and {kib} looks for 
-the names of {es} indices that match your input. Make sure that the name of the 
+Just start typing in the *Index pattern* field, and {kib} looks for
+the names of {es} indices that match your input. Make sure that the name of the
 index pattern is unique.
-
-If you want to include system indices in your search, toggle the switch in the 
-upper right.
+To include system indices in your search, toggle the switch in the upper right.
 
 [role="screenshot"]
 image:management/index-patterns/images/create-index-pattern.png["Create index pattern"]
 
-Your index pattern can match multiple {es} indices.  
-Use a comma to separate the names, with no space after the comma. The notation for 
-wildcards (`*`) and the ability to "exclude" (`-`) also apply 
+Your index pattern can match multiple {es} indices.
+Use a comma to separate the names, with no space after the comma. The notation for
+wildcards (`*`) and the ability to "exclude" (`-`) also apply
 (for example, `test*,-test3`).
 
-When {kib} detects an index with a timestamp, you’re asked to choose a field to 
-filter your data by time. If you don’t specify a field, you won’t be able 
+If {kib} detects an index with a timestamp, you’re asked to choose a field to
+filter your data by time. If you don’t specify a field, you won’t be able
 to use the time filter.
 
-Once you’ve created your index pattern, you can start working with 
-your {es} data in {kib}.  Here are some things to try:
 
-* Interactively explore your data in <<discover, Discover>>.
-* Present your data in charts, tables, gauges, tag clouds, and more in <<visualize, Visualize>>.
-* Show off your data in a <<canvas, Canvas>> presentation.
-* If your data includes geo data, visualize it using <<maps, Maps>>.
-
-For a walkthrough of creating an index pattern and visualizing the data, 
-see <<getting-started, Getting Started>>. 
 
 [float]
 ==== Rollup index pattern
 
-If a rollup index is detected in the cluster, clicking *Create index pattern* 
-includes an item for creating a rollup index pattern. You create an 
-index pattern for rolled up data the same way you do for any data.  
+If a rollup index is detected in the cluster, clicking *Create index pattern*
+includes an item for creating a rollup index pattern.
+You can match an index pattern to only rolled up data, or mix both rolled
+up and raw data to explore and visualize all data together.
+An index pattern can match
+only one rollup index.
+
+[float]
+[[management-cross-cluster-search]]
+==== {ccs-cap} index pattern
+
+If your {es} clusters are configured for {ref}/modules-cross-cluster-search.html[{ccs}], you can create
+index patterns to search across the clusters of your choosing. Using the
+same syntax that you'd use in a raw {ccs} request in {es}, create your
+index pattern with the convention `<cluster-names>:<pattern>`.
+
+For example, to query {ls} indices across two {es} clusters
+that you set up for {ccs}, which are named `cluster_one` and `cluster_two`,
+you would use `cluster_one:logstash-*,cluster_two:logstash-*` as your index pattern.
+
+You can use wildcards in your cluster names
+to match any number of clusters, so if you want to search {ls} indices across
+clusters named `cluster_foo`, `cluster_bar`, and so on, you would use `cluster_*:logstash-*`
+as your index pattern.
 
-You can match an index pattern to only rolled up data, or mix both rolled 
-up and raw data to visualize all data together. An index pattern can match 
-only one rollup index, not multiple. There is no restriction on the 
-number of standard indices that an index pattern can match.
+To query across all {es} clusters that have been configured for {ccs},
+use a standalone wildcard for your cluster name in your index
+pattern: `*:logstash-*`.
 
-See <<visualize-rollup-data, Creating a visualization using rolled up data>> 
-for more detailed information.
+Once an index pattern is configured using the {ccs} syntax, all searches and
+aggregations using that index pattern in {kib} take advantage of {ccs}.
 
 [float]
 === Manage your index pattern
 
-Once you’ve created an index pattern, you’re presented a table of all fields 
-and associated data types in the index. 
+Once you create an index pattern, manually or with a sample data set,
+you can look at its fields and associated data types.
+You can also perform housekeeping tasks, such as making the
+index pattern the default or deleting it when you longer need it.
+To drill down into the details of an index pattern, click its name in
+the *Index patterns* overview.
 
 [role="screenshot"]
 image:management/index-patterns/images/new-index-pattern.png["Index files and data types"]
 
-You can perform the following actions:
+From the detailed view, you can perform the following actions:
 
-* *Manage the index fields.* Click a column header to sort the table by that column. 
-Use the field dropdown menu to limit to display to a specific field. 
-See <<managing-fields, Managing fields>> for more detailed information. 
+* *Manage the index fields.* You can add formatters to format values and create
+scripted fields.
+See <<managing-fields, Managing fields>> for more information.
 
-* [[set-default-pattern]]*Set the default index pattern.* {kib} uses a badge to make users 
-aware of which index pattern is the default. The first pattern 
-you create is automatically designated as the default pattern. The default 
-index pattern is loaded when you view the Discover tab.  
+* [[set-default-pattern]]*Set the default index pattern.* {kib} uses a badge to make users
+aware of which index pattern is the default. The first pattern
+you create is automatically designated as the default pattern. The default
+index pattern is loaded when you open *Discover*.
 
-* [[reload-fields]]*Reload the index fields list.* You can reload the index fields list to 
-pick up any newly-added fields. Doing so also resets Kibana’s popularity counters 
-for the fields. The popularity counters keep track of the fields 
-you’ve used most often in {kib} and are used to sort fields in lists.
+* [[reload-fields]]*Refresh the index fields list.* You can refresh the index fields list to
+pick up any newly-added fields. Doing so also resets Kibana’s popularity counters
+for the fields. The popularity counters are used in *Discover* to sort fields in lists.
 
-* [[delete-pattern]]*Delete the index pattern.* This action removes the pattern from the list of 
-Saved Objects in {kib}. You will not be able to recover field formatters, 
+* [[delete-pattern]]*Delete the index pattern.* This action removes the pattern from the list of
+Saved Objects in {kib}. You will not be able to recover field formatters,
 scripted fields, source filters, and field popularity data associated with the index pattern.
-+
-Deleting an index pattern breaks all visualizations, saved searches, and 
-other saved objects that reference the pattern. Deleting an index pattern does 
+Deleting an index pattern does
 not remove any indices or data documents from {es}.
-
-include::index-patterns/management-cross-cluster-search.asciidoc[]
++
+WARNING: Deleting an index pattern breaks all visualizations, saved searches, and
+other saved objects that reference the pattern.
diff --git a/docs/management/index-patterns/management-cross-cluster-search.asciidoc b/docs/management/index-patterns/management-cross-cluster-search.asciidoc
deleted file mode 100644
index 9fd8deb7f34be..0000000000000
--- a/docs/management/index-patterns/management-cross-cluster-search.asciidoc
+++ /dev/null
@@ -1,30 +0,0 @@
-[[management-cross-cluster-search]]
-=== {ccs-cap}
-
-{es} supports the ability to run search and aggregation requests across multiple
-clusters using a module called _{ccs}_.
-
-In order to take advantage of {ccs}, you must configure your {es}
-clusters accordingly. Review the corresponding {es}
-{ref}/modules-cross-cluster-search.html[documentation] before attempting to use {ccs} in {kib}.
-
-Once your {es} clusters are configured for {ccs}, you can create
-specific index patterns in {kib} to search across the clusters of your choosing. Using the
-same syntax that you'd use in a raw {ccs} request in {es}, create your
-index pattern in {kib} with the convention `<cluster-names>:<pattern>`.
-
-For example, if you want to query {ls} indices across two of the {es} clusters
-that you set up for {ccs}, which were named `cluster_one` and `cluster_two`,
-you would use `cluster_one:logstash-*,cluster_two:logstash-*` as your index pattern in {kib}.
-
-Just like in raw search requests in {es}, you can use wildcards in your cluster names
-to match any number of clusters, so if you wanted to search {ls} indices across any
-clusters named `cluster_foo`, `cluster_bar`, and so on, you would use `cluster_*:logstash-*`
-as your index pattern in {kib}.
-
-If you want to query across all {es} clusters that have been configured for {ccs}, 
-then use a standalone wildcard for your cluster name in your {kib} index
-pattern: `*:logstash-*`.
-
-Once an index pattern is configured using the {ccs} syntax, all searches and
-aggregations using that index pattern in {kib} take advantage of {ccs}.
diff --git a/docs/maps/maps-aggregations.asciidoc b/docs/maps/maps-aggregations.asciidoc
index 98aa21f6a07a3..627fd49dafa51 100644
--- a/docs/maps/maps-aggregations.asciidoc
+++ b/docs/maps/maps-aggregations.asciidoc
@@ -47,6 +47,7 @@ To enable top hits:
 . Set *Entity* to the field that identifies entities in your documents.
 This field will be used in the terms aggregation to group your documents into entity buckets.
 . Set *Documents per entity* to configure the maximum number of documents accumulated per entity.
+This setting is limited to the `index.max_inner_result_window` index setting, which defaults to 100.
 
 [role="screenshot"]
 image::maps/images/top_hits.png[]
diff --git a/docs/maps/vector-layer.asciidoc b/docs/maps/vector-layer.asciidoc
index 1b9d0e6556f54..1d4ba9912529a 100644
--- a/docs/maps/vector-layer.asciidoc
+++ b/docs/maps/vector-layer.asciidoc
@@ -15,7 +15,7 @@ See map.regionmap.* in <<settings>> for details.
 *Documents*:: Vector data from a Kibana index pattern.
 The index must contain at least one field mapped as {ref}/geo-point.html[geo_point] or {ref}/geo-shape.html[geo_shape].
 
-NOTE: Document results are limited to the first 10000 matching documents.
+NOTE: Document results are limited to the `index.max_result_window` index setting, which defaults to 10000.
 Use <<maps-aggregations, aggregations>> to plot large data sets.
 
 *Grid aggregation*:: Geospatial data grouped in grids with metrics for each gridded cell.
diff --git a/docs/maps/vector-style-properties.asciidoc b/docs/maps/vector-style-properties.asciidoc
index f51632218add1..5656a7f04d0e3 100644
--- a/docs/maps/vector-style-properties.asciidoc
+++ b/docs/maps/vector-style-properties.asciidoc
@@ -8,32 +8,52 @@ Point, polygon, and line features support different styling properties.
 [[point-style-properties]]
 ==== Point style properties
 
+You can add text labels to your Point features by configuring label style properties.
+
+[cols="2*"]
+|===
+|*Label*
+|Specifies label content.
+|*Label color*
+|The text color.
+|*Label size*
+|The size of the text font, in pixels.
+|===
+
 You can symbolize Point features as *Circle markers* or *Icons*.
 
 Use *Circle marker* to symbolize Points as circles.
 
-*Fill color*:: The fill color of the point features.
-
-*Border color*:: The border color of the point features.
-
-*Border width*:: The border width of the point features.
-
-*Symbol size*:: The radius of the symbol size, in pixels.
+[cols="2*"]
+|===
+|*Border color*
+|The border color of the point features.
+|*Border width*
+|The border width of the point features.
+|*Fill color*
+|The fill color of the point features.
+|*Symbol size*
+|The radius of the symbol size, in pixels.
+|===
 
 Use *Icon* to symbolize Points as icons.
 
-*Fill color*:: The fill color of the point features.
-
-*Border color*:: The border color of the point features.
-
-*Border width*:: The border width of the point features.
+[cols="2*"]
+|===
+|*Border color*
+|The border color of the point features.
+|*Border width*
+|The border width of the point features.
+|*Fill color*
+|The fill color of the point features.
+|*Symbol orientation*
+|The symbol orientation rotating the icon clockwise.
+|*Symbol size*
+|The radius of the symbol size, in pixels.
+|===
 
-*Symbol orientation*:: The symbol orientation rotating the icon clockwise.
-
-*Symbol size*:: The radius of the symbol size, in pixels.
-+
 Available icons
-+
+
 [role="screenshot"]
 image::maps/images/maki-icons.png[]
 
@@ -42,17 +62,25 @@ image::maps/images/maki-icons.png[]
 [[polygon-style-properties]]
 ==== Polygon style properties
 
-*Fill color*:: The fill color of the polygon features.
-
-*Border color*:: The border color of the polygon features.
-
-*Border width*:: The border width of the polygon features.
+[cols="2*"]
+|===
+|*Border color*
+|The border color of the polygon features.
+|*Border width*
+|The border width of the polygon features.
+|*Fill color*
+|The fill color of the polygon features.
+|===
 
 
 [float]
 [[line-style-properties]]
 ==== Line style properties
 
-*Border color*:: The color of the line features.
-
-*Border width*:: The width of the line features.
+[cols="2*"]
+|===
+|*Border color*
+|The color of the line features.
+|*Border width*
+|The width of the line features.
+|===
diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
index 8cbbcdcbca3ef..8d28b55a6502f 100644
--- a/docs/settings/apm-settings.asciidoc
+++ b/docs/settings/apm-settings.asciidoc
@@ -13,6 +13,10 @@ copy and paste the relevant settings below into your `kibana.yml` configuration
 [[general-apm-settings-kb]]
 ==== General APM settings
 
+// This content is reused in the APM app documentation.
+// Any changes made in this file will be seen there as well.
+// tag::general-apm-settings[]
+
 xpack.apm.enabled:: Set to `false` to disabled the APM plugin {kib}. Defaults to
 `true`.
 
@@ -37,3 +41,4 @@ apm_oss.metricsIndices:: Matcher for indices containing metric documents. Defaul
 
 apm_oss.sourcemapIndices:: Matcher for indices containing sourcemap documents. Defaults to `apm-*`.
 
+// end::general-apm-settings[]
diff --git a/docs/setup/docker.asciidoc b/docs/setup/docker.asciidoc
index f3e7273adedee..8fd7b0490e194 100644
--- a/docs/setup/docker.asciidoc
+++ b/docs/setup/docker.asciidoc
@@ -5,7 +5,7 @@ base image is https://hub.docker.com/_/centos/[centos:7].
 
 A list of all published Docker images and tags is available at
 https://www.docker.elastic.co[www.docker.elastic.co]. The source code is in
-https://github.com/elastic/kibana-docker/tree/{branch}[GitHub].
+https://github.com/elastic/dockerfiles/tree/{branch}/kibana[GitHub].
 
 These images are free to use under the Elastic license. They contain open source 
 and free commercial features and access to paid commercial features.  
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index 414d4ef34db55..01e6bd51ea50b 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -164,7 +164,7 @@ that feature would not take any effect.
 
 `logging.rotate.everyBytes:`:: [experimental] *Default: 10485760* The maximum size of a log file (that is `not an exact` limit). After the
 limit is reached, a new log file is generated. The default size limit is 10485760 (10 MB) and
-this option should be at least greater than 1024.
+this option should be in the range of 102400 (100KB) to 1073741824 (1GB).
 
 `logging.rotate.keepFiles:`:: [experimental] *Default: 7* The number of most recent rotated log files to keep
 on disk. Older files are deleted during log rotation. The default value is 7. The `logging.rotate.keepFiles`
@@ -352,6 +352,18 @@ all http requests to https over the port configured as `server.port`.
 `server.ssl.supportedProtocols:`:: *Default: TLSv1.1, TLSv1.2*  An array of
 supported protocols with versions. Valid protocols: `TLSv1`, `TLSv1.1`, `TLSv1.2`
 
+`server.xsrf.whitelist:`:: It is not recommended to disable protections for
+arbitrary API endpoints. Instead, supply the `kbn-xsrf` header. There are some
+scenarios where whitelisting is required, however, such as
+<<kibana-authentication, SAML and OpenID Connect Single Sign-On setups>>.
+The `server.xsrf.whitelist` setting requires the following format:
+
+[source,text]
+
+----
+*Default: [ ]* An array of API endpoints which should be exempt from Cross-Site Request Forgery ("XSRF") protections.
+----
+
 `status.allowAnonymous:`:: *Default: false* If authentication is enabled,
 setting this to `true` enables unauthenticated users to access the Kibana
 server status API and status page.
@@ -378,6 +390,15 @@ Rollup user interface.
 
 `i18n.locale`:: *Default: en* Set this value to change the Kibana interface language. Valid locales are: `en`, `zh-CN`, `ja-JP`.
 
+`xpack.actions.enabledActionTypes:`:: *Default: +[ {asterisk} ]+* Set this value
+to an array of action types that are enabled.  An element of `*` indicates all
+action types registered are enabled.  The action types provided by Kibana are:
+`.server-log`, `.slack`, `.email`, `.index`, `.pagerduty`, `.webhook`.
+
+`xpack.actions.whitelistedHosts:`:: *Default: +[ {asterisk} ]+* Set this value
+to an array of host names which actions such as email, slack, pagerduty, and
+webhook can connect to.  An element of `*` indicates any host can be connected
+to.  An empty array indicates no hosts can be connected to.
 
 include::{docdir}/settings/apm-settings.asciidoc[]
 include::{docdir}/settings/dev-settings.asciidoc[]
diff --git a/docs/user/canvas.asciidoc b/docs/user/canvas.asciidoc
index c58635ba97769..5c5f5c2f80bf9 100644
--- a/docs/user/canvas.asciidoc
+++ b/docs/user/canvas.asciidoc
@@ -37,6 +37,8 @@ include::{kib-repo-dir}/canvas/canvas-present-workpad.asciidoc[]
 
 include::{kib-repo-dir}/canvas/canvas-share-workpad.asciidoc[]
 
+include::{kib-repo-dir}/canvas/canvas-expression-lifecycle.asciidoc[]
+
 include::{kib-repo-dir}/canvas/canvas-function-reference.asciidoc[]
 
-include::{kib-repo-dir}/canvas/canvas-tinymath-functions.asciidoc[]
+include::{kib-repo-dir}/canvas/canvas-tinymath-functions.asciidoc[]
\ No newline at end of file
diff --git a/docs/user/discover.asciidoc b/docs/user/discover.asciidoc
index fa583918703f3..7de7d73bf1664 100644
--- a/docs/user/discover.asciidoc
+++ b/docs/user/discover.asciidoc
@@ -3,17 +3,105 @@
 
 [partintro]
 --
-*Discover* enables you to explore your data with {kib}'s data discovery functions. 
-You have access to every document in every index that matches the selected <<index-patterns, index pattern>>.
-You can submit search queries, filter the search results, and view document data.
-You can also see the number of documents that match the search query and get field value statistics. 
-If a time field is configured for the selected index pattern, the distribution of 
-documents over time is displayed in a histogram at the top of the page.
+
+When you know what your data includes, you can create visualizations
+that best display that data and build better dashboards.
+*Discover* enables you to explore your data, find
+hidden insights and relationships, and get answers to your questions.
+
+With *Discover*, you can:
+
+* Access every document in every index that matches your selected index pattern
+* Search your data and filter the search results
+* Get field-level details about the documents that match your search
+* View the events that occurred just before and after a document
 
 [role="screenshot"]
 image::images/Discover-Start.png[Discover]
+
+
+[float]
+=== Set up your index pattern
+
+The first thing to do in *Discover* is to select an <<index-patterns, index pattern>>, which
+defines the data you want to explore and visualize. The current index pattern is in the upper left.
+If you haven't yet created an index pattern, you can add a <<add-sample-data, sample data set>>,
+which has a pre-built index pattern.
+
+[float]
+=== Set a time filter
+
+By default, *Discover* shows data for the last 15 minutes.
+If you have a time-based index, and no data displays,
+you might need to increase the time range. Using the <<set-time-filter, time filter>> in the upper right,
+you can specify a common or recently-used time range, a relative time
+from now, or an absolute time range.
+
+[float]
+=== Search your data
+
+Now that you have your data and set the time span, you can start asking your questions.
+You can search your data using the <<kuery-query, Kibana Query language>>,
+which offers a simplified query syntax.
+For example, if
+you search for `day_of_week : Friday`, you'll get a list of all documents
+in which `day_of_week` is set to `Friday`. If you prefer
+<<lucene-query, Lucene query syntax>>, you can access it from the KQL menu.
+
+[float]
+=== Filter your search results
+
+Next, you'll want narrow your search results to a more manageable data set.
+When you click on a name in the field list, you'll see
+the top five values for the field, the number of documents that contain the field,
+and the percentage of documents that contain each value. From this view, you can
+use the (+) magnifier icon to quickly find all
+documents that have that value, or (-) to exclude all
+documents with that value. For more filter options, see <<field-filter, filtering by field>>.
+
+[role="screenshot"]
+image::images/filter-field.png[height=317]
+
+
+[float]
+=== Add and remove fields
+
+The sortable documents table
+lists the documents that match your search.
+By default, the table includes columns for the time field and the document `_source`.
+To zero in on a specific field, click *add* next to the field name in the left sidebar.
+For example, if you add the `currency`, `customer_last_name`, and `day_of_week` fields,
+the document table includes columns for those three fields.
+
+[float]
+=== Examine document contents
+
+From the documents table, you can expand a document to
+examine its field data in either table or JSON format.
+The table view provides yet another filtering option&mdash;filtering for whether the field
+is present.  See <<document-data, Viewing document data>> for details.
+
+[float]
+=== View a document in context
+
+Suppose you're troubleshooting your data, and you've narrowed down your results to a single document.
+Now you want to to see the events that occurred just before and after the
+document that you are looking at. You can do that by expanding the document and
+clicking <<document-context, View surrounding documents>>.
+
+[float]
+=== Save and share your search
+
+Finally, its time to save and share your data.  You can export your data as a CSV file
+or create a direct link to share.  The *Save* and *Share* actions are in the menu bar.
+
+
+
+
 --
 
+include::{kib-repo-dir}/management/index-patterns.asciidoc[]
+
 include::{kib-repo-dir}/discover/set-time-filter.asciidoc[]
 
 include::{kib-repo-dir}/discover/search.asciidoc[]
diff --git a/docs/user/management.asciidoc b/docs/user/management.asciidoc
index d1acb915f1973..2c41d0072fe5b 100644
--- a/docs/user/management.asciidoc
+++ b/docs/user/management.asciidoc
@@ -13,8 +13,6 @@ visualizations, and dashboards.
 
 include::{kib-repo-dir}/management/managing-licenses.asciidoc[]
 
-include::{kib-repo-dir}/management/index-patterns.asciidoc[]
-
 include::{kib-repo-dir}/management/rollups/create_and_manage_rollups.asciidoc[]
 
 include::{kib-repo-dir}/management/index-lifecycle-policies/intro-to-lifecycle-policies.asciidoc[]
@@ -40,5 +38,3 @@ include::{kib-repo-dir}/management/managing-beats.asciidoc[]
 include::{kib-repo-dir}/management/managing-remote-clusters.asciidoc[]
 
 include::{kib-repo-dir}/management/snapshot-restore/index.asciidoc[]
-
-
diff --git a/docs/user/ml/index.asciidoc b/docs/user/ml/index.asciidoc
index a2c23aad98d5b..cca0dc5e4530f 100644
--- a/docs/user/ml/index.asciidoc
+++ b/docs/user/ml/index.asciidoc
@@ -50,8 +50,8 @@ pane:
 image::user/ml/images/ml-job-management.jpg[Job Management]
 
 You can use the *Settings* pane to create and edit 
-{stack-ov}/ml-calendars.html[calendars] and the filters that are used in 
-{stack-ov}/ml-rules.html[custom rules]:
+{ml-docs}/ml-calendars.html[calendars] and the filters that are used in 
+{ml-docs}/ml-rules.html[custom rules]:
 
 [role="screenshot"]
 image::user/ml/images/ml-settings.jpg[Calendar Management]
@@ -73,7 +73,7 @@ image::user/ml/images/ml-annotations-list.jpg[Single Metric Viewer with annotati
 In some circumstances, annotations are also added automatically. For example, if
 the {anomaly-job} detects that there is missing data, it annotates the affected 
 time period. For more information, see 
-{stack-ov}/ml-delayed-data-detection.html[Handling delayed data]. The 
+{ml-docs}/ml-delayed-data-detection.html[Handling delayed data]. The 
 *Job Management* pane shows the full list of annotations for each job.
 
 NOTE: The {kib} {ml-features} use pop-ups. You must configure your web 
@@ -82,7 +82,7 @@ browser so that it does not block pop-up windows or create an exception for your
 
 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}].
+and {ml-docs}/xpack-ml.html[{ml-cap} {anomaly-detect}].
 
 [[xpack-ml-dfanalytics]]
 == {dfanalytics-cap}
@@ -99,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}].
\ No newline at end of file
+{ml-docs}/ml-dfanalytics.html[{ml-cap} {dfanalytics}].
\ No newline at end of file
diff --git a/docs/user/reporting/images/shareable-container.png b/docs/user/reporting/images/shareable-container.png
new file mode 100644
index 0000000000000..db5a41dcff471
Binary files /dev/null and b/docs/user/reporting/images/shareable-container.png differ
diff --git a/docs/user/reporting/index.asciidoc b/docs/user/reporting/index.asciidoc
index 06af9e6038445..fde88130a26b4 100644
--- a/docs/user/reporting/index.asciidoc
+++ b/docs/user/reporting/index.asciidoc
@@ -6,11 +6,11 @@
 
 --
 
-You can generate a report that contains a {kib} dashboard, visualization, 
-saved search, or Canvas workpad. Depending on the object type, you can export the data as 
+You can generate a report that contains a {kib} dashboard, visualization,
+saved search, or Canvas workpad. Depending on the object type, you can export the data as
 a PDF, PNG, or CSV document, which you can keep for yourself, or share with others.
 
-Reporting is available from the *Share* menu 
+Reporting is available from the *Share* menu
 in *Discover*, *Visualize*, *Dashboard*, and *Canvas*.
 
 [role="screenshot"]
@@ -40,9 +40,9 @@ for an example.
 [[manually-generate-reports]]
 == Generate a report manually
 
-. Open the dashboard, visualization, Canvas workpad, or saved search that you want to include in the report. 
+. Open the dashboard, visualization, Canvas workpad, or saved search that you want to include in the report.
 
-. In the {kib} toolbar, click *Share*.  If you are working in Canvas, 
+. In the {kib} toolbar, click *Share*.  If you are working in Canvas,
 click the share icon image:user/reporting/images/canvas-share-button.png["Canvas Share button"].
 
 . Select the option appropriate for your object. You can export:
@@ -55,14 +55,36 @@ click the share icon image:user/reporting/images/canvas-share-button.png["Canvas
 +
 A notification appears when the report is complete.
 
+[float]
+[[reporting-layout-sizing]]
+== Layout and sizing
+The layout and size of the PDF or PNG image depends on the {kib} app
+with which the Reporting plugin is integrated. For Canvas, the
+worksheet dimensions determine the size for Reporting. In other apps,
+the dimensions are taken on the fly by looking at
+the size of the visualization elements or panels on the page.
+
+The size dimensions are part of the reporting job parameters. Therefore, to
+make the report output larger or smaller, you can change the size of the browser.
+This resizes the shareable container before generating the
+report, so the desired dimensions are passed in the job parameters.
+
+In the following {kib} dashboard, the shareable container is highlighted.
+The shareable container is captured when you click the
+*Generate* or *Copy POST URL* button. It might take some trial and error
+before you're satisfied with the layout and dimensions in the resulting
+PNG or PDF image.
+
+[role="screenshot"]
+image::user/reporting/images/shareable-container.png["Shareable Container"]
+
+
+
 [float]
 [[optimize-pdf]]
 == Optimize PDF for print&mdash;dashboard only
 
-By default, {kib} creates a PDF  
-using the existing layout and size of the dashboard. To create a 
-printer-friendly PDF with multiple A4 portrait pages and two visualizations 
-per page, turn on *Optimize for printing*.
+To create a printer-friendly PDF with multiple A4 portrait pages and two visualizations per page, turn on *Optimize for printing*.
 
 [role="screenshot"]
 image::user/reporting/images/preserve-layout-switch.png["Share"]
@@ -72,8 +94,8 @@ image::user/reporting/images/preserve-layout-switch.png["Share"]
 [[manage-report-history]]
 == View and manage report history
 
-For a list of your reports, go to *Management > Reporting*.  
-From this view, you can monitor the generation of a report and 
+For a list of your reports, go to *Management > Reporting*.
+From this view, you can monitor the generation of a report and
 download reports that you previously generated.
 
 [float]
diff --git a/docs/user/reporting/reporting-troubleshooting.asciidoc b/docs/user/reporting/reporting-troubleshooting.asciidoc
index 92464c24b45ea..dc4ffdfebdae9 100644
--- a/docs/user/reporting/reporting-troubleshooting.asciidoc
+++ b/docs/user/reporting/reporting-troubleshooting.asciidoc
@@ -7,16 +7,25 @@
 
 Having trouble? Here are solutions to common problems you might encounter while using Reporting.
 
+* <<reporting-troubleshooting-system-dependencies>>
+* <<reporting-troubleshooting-text-incorrect>>
+* <<reporting-troubleshooting-missing-data>>
+* <<reporting-troubleshooting-file-permissions>>
+* <<reporting-troubleshooting-error-messages>>
+* <<reporting-troubleshooting-puppeteer-debug-logs>>
+* <<reporting-troubleshooting-system-requirements>>
+
 [float]
 [[reporting-troubleshooting-system-dependencies]]
 === System dependencies
 Reporting launches a "headless" web browser called Chromium on the Kibana server. It is a custom build made by Elastic of an open source
 project, and it is intended to have minimal dependencies on OS libraries. However, the Kibana server OS might still require additional
-dependencies for Chromium.
+dependencies to run the Chromium executable.
 
 Make sure Kibana server OS has the appropriate packages installed for the distribution.
 
 If you are using CentOS/RHEL systems, install the following packages:
+
 * `ipa-gothic-fonts`
 * `xorg-x11-fonts-100dpi`
 * `xorg-x11-fonts-75dpi`
@@ -28,22 +37,34 @@ If you are using CentOS/RHEL systems, install the following packages:
 * `freetype`
 
 If you are using Ubuntu/Debian systems, install the following packages:
+
 * `fonts-liberation`
 * `libfontconfig1`
 
+If the system is missing dependencies, then Reporting will fail in a non-deterministic way. {kib} runs a self-test at server startup, and
+if it encounters errors, logs them in the Console. Unfortunately, the error message does not include
+information about why Chromium failed to run. The most common error message is `Error: connect ECONNREFUSED`, which indicates
+that {kib} could not connect to the Chromium process.
+
+To troubleshoot the problem, start the {kib} server with environment variables that tell Chromium to print verbose logs. See the
+<<reporting-troubleshooting-puppeteer-debug-logs, Puppeteer debug method>> for more information.
+
 [float]
-=== Text is rendered incorrectly in generated reports
+[[reporting-troubleshooting-text-incorrect]]
+=== Text rendered incorrectly in generated reports
 
 If a report label is rendered as an empty rectangle, no system fonts are available. Install at least one font package on the system.
 
 If the report is missing certain Chinese, Japanese or Korean characters, ensure that a system font with those characters is installed.
 
 [float]
+[[reporting-troubleshooting-missing-data]]
 === Missing data in PDF report of data table visualization
 There is currently a known limitation with the Data Table visualization that only the first page of data rows, which are the only data
 visible on the screen, are shown in PDF reports.
 
 [float]
+[[reporting-troubleshooting-file-permissions]]
 === File permissions
 Ensure that the `headless_shell` binary located in your Kibana data directory is owned by the user who is running Kibana, that the
 user has the execute permission, and if applicable, that the filesystem is mounted with the `exec` option.
@@ -61,25 +82,25 @@ Whenever possible, a Reporting error message tries to be as self-explanatory as
 along with the solution.
 
 [float]
-==== "Max attempts reached"
+==== Max attempts reached
 There are two primary causes of this error:
 
-. You're creating a PDF of a visualization or dashboard that spans a large amount of data and Kibana is hitting the `xpack.reporting.queue.timeout`
+* You're creating a PDF of a visualization or dashboard that spans a large amount of data and Kibana is hitting the `xpack.reporting.queue.timeout`
 
-. Kibana is hosted behind a reverse-proxy, and the <<reporting-kibana-server-settings, Kibana server settings>> are not configured correctly
+* Kibana is hosted behind a reverse-proxy, and the <<reporting-kibana-server-settings, Kibana server settings>> are not configured correctly
 
 Create a Markdown visualization and then create a PDF report. If this succeeds, increase the `xpack.reporting.queue.timeout` setting. If the
 PDF report fails with "Max attempts reached," check your <<reporting-kibana-server-settings, Kibana server settings>>.
 
 [float]
 [[reporting-troubleshooting-nss-dependency]]
-==== "You must install nss for Reporting to work"
+==== You must install nss for Reporting to work
 Reporting using the Chromium browser relies on the Network Security Service libraries (NSS). Install the appropriate nss package for your
 distribution.
 
 [float]
 [[reporting-troubleshooting-sandbox-dependency]]
-==== "Unable to use Chromium sandbox"
+==== Unable to use Chromium sandbox
 Chromium uses sandboxing techniques that are built on top of operating system primitives. The Linux sandbox depends on user namespaces,
 which were introduced with the 3.8 Linux kernel. However, many distributions don't have user namespaces enabled by default, or they require
 the CAP_SYS_ADMIN capability.
@@ -88,6 +109,7 @@ Elastic recommends that you research the feasibility of enabling unprivileged us
 is if you are running Kibana in Docker because the container runs in a user namespace with the built-in seccomp/bpf filters.
 
 [float]
+[[reporting-troubleshooting-verbose-logs]]
 === Verbose logs
 {kib} server logs have a lot of useful information for troubleshooting and understanding how things work. If you're having any issues at
 all, the full logs from Reporting will be the first place to look. In `kibana.yml`:
@@ -99,15 +121,29 @@ logging.verbose: true
 
 For more information about logging, see <<logging-verbose,Kibana configuration settings>>.
 
+[float]
+[[reporting-troubleshooting-puppeteer-debug-logs]]
 === Puppeteer debug logs
 The Chromium browser that {kib} launches on the server is driven by a NodeJS library for Chromium called Puppeteer. The Puppeteer library
 has its own command-line method to generate its own debug logs, which can sometimes be helpful, particularly to figure out if a problem is
-caused by Kibana or Chromium. See more at https://github.com/GoogleChrome/puppeteer/blob/v1.19.0/README.md#debugging-tips
+caused by Kibana or Chromium. See more at https://github.com/GoogleChrome/puppeteer/blob/v1.19.0/README.md#debugging-tips[debugging tips].
 
 Using Puppeteer's debug method when launching Kibana would look like:
-> Enable verbose logging - internal DevTools protocol traffic will be logged via the debug module under the puppeteer namespace.
->     ```
->     env DEBUG="puppeteer:*" ./bin/kibana
->     ```
+```
+env DEBUG="puppeteer:*" ./bin/kibana
+```
+The internal DevTools protocol traffic will be logged via the `debug` module under the `puppeteer` namespace.
+
 
 The Puppeteer logs are very verbose and could possibly contain sensitive information. Handle the generated output with care.
+
+[float]
+[[reporting-troubleshooting-system-requirements]]
+=== System requirements
+In Elastic Cloud, the {kib} instances that most configurations provide by default is for 1GB of RAM for the instance. That is enough for
+{kib} Reporting when the visualization or dashboard is relatively simple, such as a single pie chart or a dashboard with
+a few visualizations. However, certain visualization types incur more load than others. For example, a TSVB panel has a lot of network
+requests to render.
+
+If the {kib} instance doesn't have enough memory to run the report, the report fails with an error such as `Error: Page crashed!`
+In this case, try increasing the memory for the {kib} instance to 2GB.
diff --git a/docs/user/reporting/watch-example.asciidoc b/docs/user/reporting/watch-example.asciidoc
index 4c769c85975c4..627e31017230c 100644
--- a/docs/user/reporting/watch-example.asciidoc
+++ b/docs/user/reporting/watch-example.asciidoc
@@ -56,7 +56,16 @@ report from the Kibana UI.
 //For more information, see <<secure-reporting>>.
 //<<reporting-app-users, Setting up a Reporting Role>>.
 
-NOTE: Reporting is integrated with Watcher only as an email attachment type.
+[NOTE]
+====
+Reporting is integrated with Watcher only as an email attachment type.
+
+The report Generation URL might contain date-math expressions
+that cause the watch to fail with a `parse_exception`.
+Remove curly braces `{`  `}` from date-math expressions and
+URL-encode characters to avoid this.
+For example: `...(range:(%27@timestamp%27:(gte:now-15m%2Fd,lte:now%2Fd))))...`
 
 For more information about configuring watches, see
 {ref}/how-watcher-works.html[How Watcher works].
+====
diff --git a/docs/user/security/reporting.asciidoc b/docs/user/security/reporting.asciidoc
index 86599be9af375..c2ed295e83ce9 100644
--- a/docs/user/security/reporting.asciidoc
+++ b/docs/user/security/reporting.asciidoc
@@ -57,6 +57,30 @@ that provides read and write privileges in
 Go to *Management > Users*, add a new user, and assign the user the built-in
 `reporting_user` role and your new custom role, `custom_reporting_user`.
 
+[float]
+==== With a custom index
+
+If you are using Reporting with a custom index,
+the `xpack.reporting.index` setting should begin 
+with `.reporting-*`. The default {kib} system user has
+`all` privileges against the `.reporting-*` pattern of indices.
+
+[source,js]
+xpack.reporting.index: '.reporting-custom-index'
+
+If you use a different pattern for the `xpack.reporting.index` setting,
+you must create a custom role with appropriate access to the index, similar
+to the following:
+
+. Go to *Management > Roles*, and click *Create role*.
+. Name the role `custom-reporting-user`.
+. Specify the custom index and assign it the `all` index privilege.
+. Go to *Management > Users* and create a new user with
+the `kibana_system` role and the `custom-reporting-user` role.
+. Configure {kib} to use the new account:
+[source,js]
+elasticsearch.username: 'custom_kibana_system'
+
 [float]
 [[reporting-roles-user-api]]
 ==== With the user API
diff --git a/docs/visualize/lens.asciidoc b/docs/visualize/lens.asciidoc
index 086f88c636c81..e61895a29891b 100644
--- a/docs/visualize/lens.asciidoc
+++ b/docs/visualize/lens.asciidoc
@@ -60,7 +60,7 @@ The summary shows the distribution of values in the time range.
 To view the data information, navigate to a data field, then click *i*.
 
 [role="screenshot"]
-image::images/lens_data_info.gif[]
+image::images/lens_data_info.png[]
 
 [float]
 [[change-the-visualization-type]]
diff --git a/examples/demo_search/package.json b/examples/demo_search/package.json
index 404002a50e710..d29ad55b32db2 100644
--- a/examples/demo_search/package.json
+++ b/examples/demo_search/package.json
@@ -1,7 +1,7 @@
 {
   "name": "demo_data_search",
   "version": "1.0.0",
-  "main": "target/test/plugin_functional/plugins/demo_data_search",
+  "main": "target/examples/demo_data_search",
   "kibana": {
     "version": "kibana",
     "templateVersion": "1.0.0"
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.5.3"
+    "typescript": "3.7.2"
   }
 }
diff --git a/examples/embeddable_examples/kibana.json b/examples/embeddable_examples/kibana.json
new file mode 100644
index 0000000000000..c70bc7009ff51
--- /dev/null
+++ b/examples/embeddable_examples/kibana.json
@@ -0,0 +1,10 @@
+{
+  "id": "embeddableExamples",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "configPath": ["embeddable_examples"],
+  "server": false,
+  "ui": true,
+  "requiredPlugins": ["embeddable"],
+  "optionalPlugins": []
+}
diff --git a/examples/embeddable_examples/package.json b/examples/embeddable_examples/package.json
new file mode 100644
index 0000000000000..055ee6d731512
--- /dev/null
+++ b/examples/embeddable_examples/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "embeddable_examples",
+  "version": "1.0.0",
+  "main": "target/examples/embeddable_examples",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "Apache-2.0",
+  "scripts": {
+    "kbn": "node ../../scripts/kbn.js",
+    "build": "rm -rf './target' && tsc"
+  },
+  "devDependencies": {
+    "typescript": "3.7.2"
+  }
+}
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world/hello_world_embeddable.tsx b/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
similarity index 92%
rename from src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world/hello_world_embeddable.tsx
rename to examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
index dc41eb037caf1..f2839f1bc984b 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world/hello_world_embeddable.tsx
+++ b/examples/embeddable_examples/public/hello_world/hello_world_embeddable.tsx
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Embeddable, EmbeddableInput, IContainer } from '../../..';
+import { Embeddable, EmbeddableInput, IContainer } from '../../../../src/plugins/embeddable/public';
 
-export const HELLO_WORLD_EMBEDDABLE_TYPE = 'HELLO_WORLD_EMBEDDABLE_TYPE';
+export const HELLO_WORLD_EMBEDDABLE = 'HELLO_WORLD_EMBEDDABLE';
 
 export class HelloWorldEmbeddable extends Embeddable {
   // The type of this embeddable. This will be used to find the appropriate factory
   // to instantiate this kind of embeddable.
-  public readonly type = HELLO_WORLD_EMBEDDABLE_TYPE;
+  public readonly type = HELLO_WORLD_EMBEDDABLE;
 
   constructor(initialInput: EmbeddableInput, parent?: IContainer) {
     super(
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world/hello_world_embeddable_factory.ts b/examples/embeddable_examples/public/hello_world/hello_world_embeddable_factory.ts
similarity index 80%
rename from src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world/hello_world_embeddable_factory.ts
rename to examples/embeddable_examples/public/hello_world/hello_world_embeddable_factory.ts
index 6007d5a0aca62..de5a3d9380def 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world/hello_world_embeddable_factory.ts
+++ b/examples/embeddable_examples/public/hello_world/hello_world_embeddable_factory.ts
@@ -18,11 +18,15 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IContainer, EmbeddableInput, EmbeddableFactory } from '../../..';
-import { HelloWorldEmbeddable, HELLO_WORLD_EMBEDDABLE_TYPE } from './hello_world_embeddable';
+import {
+  IContainer,
+  EmbeddableInput,
+  EmbeddableFactory,
+} from '../../../../src/plugins/embeddable/public';
+import { HelloWorldEmbeddable, HELLO_WORLD_EMBEDDABLE } from './hello_world_embeddable';
 
 export class HelloWorldEmbeddableFactory extends EmbeddableFactory {
-  public readonly type = HELLO_WORLD_EMBEDDABLE_TYPE;
+  public readonly type = HELLO_WORLD_EMBEDDABLE;
 
   /**
    * In our simple example, we let everyone have permissions to edit this. Most
@@ -38,7 +42,7 @@ export class HelloWorldEmbeddableFactory extends EmbeddableFactory {
   }
 
   public getDisplayName() {
-    return i18n.translate('embeddableApi.samples.helloworld.displayName', {
+    return i18n.translate('embeddableExamples.helloworld.displayName', {
       defaultMessage: 'hello world',
     });
   }
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world/index.ts b/examples/embeddable_examples/public/hello_world/index.ts
similarity index 100%
rename from src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world/index.ts
rename to examples/embeddable_examples/public/hello_world/index.ts
diff --git a/examples/embeddable_examples/public/index.ts b/examples/embeddable_examples/public/index.ts
new file mode 100644
index 0000000000000..1c2c3911d1006
--- /dev/null
+++ b/examples/embeddable_examples/public/index.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 { PluginInitializer } from 'kibana/public';
+export {
+  HELLO_WORLD_EMBEDDABLE,
+  HelloWorldEmbeddable,
+  HelloWorldEmbeddableFactory,
+} from './hello_world';
+export { ListContainer, LIST_CONTAINER } from './list_container';
+export { TODO_EMBEDDABLE } from './todo';
+
+import { EmbeddableExamplesPlugin } from './plugin';
+
+export { SearchableListContainer, SEARCHABLE_LIST_CONTAINER } from './searchable_list_container';
+export { MULTI_TASK_TODO_EMBEDDABLE } from './multi_task_todo';
+
+export const plugin: PluginInitializer<void, void> = () => new EmbeddableExamplesPlugin();
diff --git a/examples/embeddable_examples/public/list_container/embeddable_list_item.tsx b/examples/embeddable_examples/public/list_container/embeddable_list_item.tsx
new file mode 100644
index 0000000000000..2c80cef8a6364
--- /dev/null
+++ b/examples/embeddable_examples/public/list_container/embeddable_list_item.tsx
@@ -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 React from 'react';
+import { EuiPanel, EuiLoadingSpinner, EuiFlexItem } from '@elastic/eui';
+import { IEmbeddable } from '../../../../src/plugins/embeddable/public';
+
+interface Props {
+  embeddable: IEmbeddable;
+}
+
+export class EmbeddableListItem extends React.Component<Props> {
+  private embeddableRoot: React.RefObject<HTMLDivElement>;
+  private rendered = false;
+
+  constructor(props: Props) {
+    super(props);
+    this.embeddableRoot = React.createRef();
+  }
+
+  public componentDidMount() {
+    if (this.embeddableRoot.current && this.props.embeddable) {
+      this.props.embeddable.render(this.embeddableRoot.current);
+      this.rendered = true;
+    }
+  }
+
+  public componentDidUpdate() {
+    if (this.embeddableRoot.current && this.props.embeddable && !this.rendered) {
+      this.props.embeddable.render(this.embeddableRoot.current);
+      this.rendered = true;
+    }
+  }
+
+  public render() {
+    return (
+      <EuiFlexItem>
+        <EuiPanel>
+          {this.props.embeddable ? (
+            <div ref={this.embeddableRoot} />
+          ) : (
+            <EuiLoadingSpinner size="s" />
+          )}
+        </EuiPanel>
+      </EuiFlexItem>
+    );
+  }
+}
diff --git a/examples/embeddable_examples/public/list_container/index.ts b/examples/embeddable_examples/public/list_container/index.ts
new file mode 100644
index 0000000000000..581739f6b5458
--- /dev/null
+++ b/examples/embeddable_examples/public/list_container/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 { ListContainer, LIST_CONTAINER } from './list_container';
+export { ListContainerFactory } from './list_container_factory';
diff --git a/examples/embeddable_examples/public/list_container/list_container.tsx b/examples/embeddable_examples/public/list_container/list_container.tsx
new file mode 100644
index 0000000000000..35a674a03573a
--- /dev/null
+++ b/examples/embeddable_examples/public/list_container/list_container.tsx
@@ -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 React from 'react';
+import ReactDOM from 'react-dom';
+import {
+  Container,
+  ContainerInput,
+  GetEmbeddableFactory,
+} from '../../../../src/plugins/embeddable/public';
+import { ListContainerComponent } from './list_container_component';
+
+export const LIST_CONTAINER = 'LIST_CONTAINER';
+
+export class ListContainer extends Container<{}, ContainerInput> {
+  public readonly type = LIST_CONTAINER;
+  private node?: HTMLElement;
+
+  constructor(input: ContainerInput, getEmbeddableFactory: GetEmbeddableFactory) {
+    super(input, { embeddableLoaded: {} }, getEmbeddableFactory);
+  }
+
+  // This container has no input itself.
+  getInheritedInput(id: string) {
+    return {};
+  }
+
+  public render(node: HTMLElement) {
+    this.node = node;
+    if (this.node) {
+      ReactDOM.unmountComponentAtNode(this.node);
+    }
+    ReactDOM.render(<ListContainerComponent embeddable={this} />, node);
+  }
+
+  public destroy() {
+    super.destroy();
+    if (this.node) {
+      ReactDOM.unmountComponentAtNode(this.node);
+    }
+  }
+}
diff --git a/examples/embeddable_examples/public/list_container/list_container_component.tsx b/examples/embeddable_examples/public/list_container/list_container_component.tsx
new file mode 100644
index 0000000000000..f6e04933ee897
--- /dev/null
+++ b/examples/embeddable_examples/public/list_container/list_container_component.tsx
@@ -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 React from 'react';
+
+import { EuiFlexGroup, EuiSpacer, EuiFlexItem, EuiText, EuiPanel } from '@elastic/eui';
+import {
+  IContainer,
+  withEmbeddableSubscription,
+  ContainerInput,
+  ContainerOutput,
+} from '../../../../src/plugins/embeddable/public';
+import { EmbeddableListItem } from './embeddable_list_item';
+
+interface Props {
+  embeddable: IContainer;
+  input: ContainerInput;
+  output: ContainerOutput;
+}
+
+function renderList(embeddable: IContainer, panels: ContainerInput['panels']) {
+  let number = 0;
+  const list = Object.values(panels).map(panel => {
+    const child = embeddable.getChild(panel.explicitInput.id);
+    number++;
+    return (
+      <EuiPanel key={number.toString()}>
+        <EuiFlexGroup>
+          <EuiFlexItem grow={false}>
+            <EuiText>
+              <h3>{number}</h3>
+            </EuiText>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EmbeddableListItem embeddable={child} />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiPanel>
+    );
+  });
+  return list;
+}
+
+export function ListContainerComponentInner(props: Props) {
+  return (
+    <div>
+      <h2 data-test-subj="listContainerTitle">{props.embeddable.getTitle()}</h2>
+      <EuiSpacer size="l" />
+      {renderList(props.embeddable, props.input.panels)}
+    </div>
+  );
+}
+
+// You don't have to use this helper wrapper, but it handles a lot of the React boilerplate for
+// embeddables, like setting up the subscriptions to cause the component to refresh whenever
+// anything on input or output state changes.  If you don't want that to happen (for example
+// if you expect something on input or output state to change frequently that your react
+// component does not care about, then you should probably hook this up manually).
+export const ListContainerComponent = withEmbeddableSubscription(ListContainerComponentInner);
diff --git a/examples/embeddable_examples/public/list_container/list_container_factory.ts b/examples/embeddable_examples/public/list_container/list_container_factory.ts
new file mode 100644
index 0000000000000..de6b7d5f5e503
--- /dev/null
+++ b/examples/embeddable_examples/public/list_container/list_container_factory.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 { i18n } from '@kbn/i18n';
+import {
+  EmbeddableFactory,
+  GetEmbeddableFactory,
+  ContainerInput,
+} from '../../../../src/plugins/embeddable/public';
+import { LIST_CONTAINER, ListContainer } from './list_container';
+
+export class ListContainerFactory extends EmbeddableFactory {
+  public readonly type = LIST_CONTAINER;
+  public readonly isContainerType = true;
+
+  constructor(private getEmbeddableFactory: GetEmbeddableFactory) {
+    super();
+  }
+
+  public isEditable() {
+    return true;
+  }
+
+  public async create(initialInput: ContainerInput) {
+    return new ListContainer(initialInput, this.getEmbeddableFactory);
+  }
+
+  public getDisplayName() {
+    return i18n.translate('embeddableExamples.searchableListContainer.displayName', {
+      defaultMessage: 'List container',
+    });
+  }
+}
diff --git a/examples/embeddable_examples/public/multi_task_todo/index.ts b/examples/embeddable_examples/public/multi_task_todo/index.ts
new file mode 100644
index 0000000000000..2063bf2c06223
--- /dev/null
+++ b/examples/embeddable_examples/public/multi_task_todo/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 './multi_task_todo_embeddable';
+export * from './multi_task_todo_embeddable_factory';
diff --git a/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_component.tsx b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_component.tsx
new file mode 100644
index 0000000000000..e33dfab0eaf4a
--- /dev/null
+++ b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_component.tsx
@@ -0,0 +1,94 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
+
+import {
+  EuiText,
+  EuiAvatar,
+  EuiIcon,
+  EuiFlexGrid,
+  EuiListGroup,
+  EuiListGroupItem,
+} from '@elastic/eui';
+import { withEmbeddableSubscription } from '../../../../src/plugins/embeddable/public';
+import {
+  MultiTaskTodoEmbeddable,
+  MultiTaskTodoOutput,
+  MultiTaskTodoInput,
+} from './multi_task_todo_embeddable';
+
+interface Props {
+  embeddable: MultiTaskTodoEmbeddable;
+  input: MultiTaskTodoInput;
+  output: MultiTaskTodoOutput;
+}
+
+function wrapSearchTerms(task: string, search?: string) {
+  if (!search) return task;
+  const parts = task.split(new RegExp(`(${search})`, 'g'));
+  return parts.map((part, i) =>
+    part === search ? (
+      <span key={i} style={{ backgroundColor: 'yellow' }}>
+        {part}
+      </span>
+    ) : (
+      part
+    )
+  );
+}
+
+function renderTasks(tasks: MultiTaskTodoOutput['tasks'], search?: string) {
+  return tasks.map(task => (
+    <EuiListGroupItem
+      key={task}
+      data-test-subj="multiTaskTodoTask"
+      label={wrapSearchTerms(task, search)}
+    />
+  ));
+}
+
+export function MultiTaskTodoEmbeddableComponentInner({
+  input: { title, icon, search },
+  output: { tasks },
+}: Props) {
+  return (
+    <EuiFlexGroup>
+      <EuiFlexItem grow={false}>
+        {icon ? <EuiIcon type={icon} size="l" /> : <EuiAvatar name={title} size="l" />}
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <EuiFlexGrid columns={1}>
+          <EuiFlexItem>
+            <EuiText data-test-subj="multiTaskTodoTitle">
+              <h3>{wrapSearchTerms(title, search)}</h3>
+            </EuiText>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiListGroup bordered={true}>{renderTasks(tasks, search)}</EuiListGroup>
+          </EuiFlexItem>
+        </EuiFlexGrid>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
+
+export const MultiTaskTodoEmbeddableComponent = withEmbeddableSubscription(
+  MultiTaskTodoEmbeddableComponentInner
+);
diff --git a/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable.tsx b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable.tsx
new file mode 100644
index 0000000000000..a2197c9c06fe9
--- /dev/null
+++ b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable.tsx
@@ -0,0 +1,99 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 ReactDOM from 'react-dom';
+import { Subscription } from 'rxjs';
+import {
+  Embeddable,
+  EmbeddableInput,
+  IContainer,
+  EmbeddableOutput,
+} from '../../../../src/plugins/embeddable/public';
+import { MultiTaskTodoEmbeddableComponent } from './multi_task_todo_component';
+
+export const MULTI_TASK_TODO_EMBEDDABLE = 'MULTI_TASK_TODO_EMBEDDABLE';
+
+export interface MultiTaskTodoInput extends EmbeddableInput {
+  tasks: string[];
+  icon?: string;
+  search?: string;
+  title: string;
+}
+
+// This embeddable has output! It's the tasks list that is filtered.
+// Output state is something only the embeddable itself can update. It
+// can be something completely internal, or it can be state that is
+// derived from input state and updates when input does.
+export interface MultiTaskTodoOutput extends EmbeddableOutput {
+  tasks: string[];
+}
+
+function getFilteredTasks(tasks: string[], search?: string) {
+  const filteredTasks: string[] = [];
+  if (search === undefined) return tasks;
+
+  tasks.forEach(task => {
+    if (task.match(search)) {
+      filteredTasks.push(task);
+    }
+  });
+
+  return filteredTasks;
+}
+
+function getOutput(input: MultiTaskTodoInput) {
+  const tasks = getFilteredTasks(input.tasks, input.search);
+  return { tasks, hasMatch: tasks.length > 0 || (input.search && input.title.match(input.search)) };
+}
+
+export class MultiTaskTodoEmbeddable extends Embeddable<MultiTaskTodoInput, MultiTaskTodoOutput> {
+  public readonly type = MULTI_TASK_TODO_EMBEDDABLE;
+  private subscription: Subscription;
+  private node?: HTMLElement;
+
+  constructor(initialInput: MultiTaskTodoInput, parent?: IContainer) {
+    super(initialInput, getOutput(initialInput), parent);
+
+    // If you have any output state that changes as a result of input state changes, you
+    // should use an subcription.  Here, any time input tasks list, or the input filter
+    // changes, we want to update the output tasks list as well as whether a match has
+    // been found.
+    this.subscription = this.getInput$().subscribe(() => {
+      this.updateOutput(getOutput(this.input));
+    });
+  }
+
+  public render(node: HTMLElement) {
+    if (this.node) {
+      ReactDOM.unmountComponentAtNode(this.node);
+    }
+    this.node = node;
+    ReactDOM.render(<MultiTaskTodoEmbeddableComponent embeddable={this} />, node);
+  }
+
+  public reload() {}
+
+  public destroy() {
+    super.destroy();
+    this.subscription.unsubscribe();
+    if (this.node) {
+      ReactDOM.unmountComponentAtNode(this.node);
+    }
+  }
+}
diff --git a/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable_factory.ts b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable_factory.ts
new file mode 100644
index 0000000000000..37ac63e380f96
--- /dev/null
+++ b/examples/embeddable_examples/public/multi_task_todo/multi_task_todo_embeddable_factory.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 { i18n } from '@kbn/i18n';
+import { IContainer, EmbeddableFactory } from '../../../../src/plugins/embeddable/public';
+import {
+  MultiTaskTodoEmbeddable,
+  MULTI_TASK_TODO_EMBEDDABLE,
+  MultiTaskTodoInput,
+} from './multi_task_todo_embeddable';
+
+export class MultiTaskTodoEmbeddableFactory extends EmbeddableFactory {
+  public readonly type = MULTI_TASK_TODO_EMBEDDABLE;
+
+  public isEditable() {
+    return true;
+  }
+
+  public async create(initialInput: MultiTaskTodoInput, parent?: IContainer) {
+    return new MultiTaskTodoEmbeddable(initialInput, parent);
+  }
+
+  public getDisplayName() {
+    return i18n.translate('embeddableExamples.multiTaskTodo.displayName', {
+      defaultMessage: 'Multi-task todo item',
+    });
+  }
+}
diff --git a/examples/embeddable_examples/public/plugin.ts b/examples/embeddable_examples/public/plugin.ts
new file mode 100644
index 0000000000000..e75165bfbef18
--- /dev/null
+++ b/examples/embeddable_examples/public/plugin.ts
@@ -0,0 +1,72 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { IEmbeddableSetup, IEmbeddableStart } from '../../../src/plugins/embeddable/public';
+import { Plugin, CoreSetup, CoreStart } from '../../../src/core/public';
+import { HelloWorldEmbeddableFactory, HELLO_WORLD_EMBEDDABLE } from './hello_world';
+import { TODO_EMBEDDABLE, TodoEmbeddableFactory } from './todo';
+import { MULTI_TASK_TODO_EMBEDDABLE, MultiTaskTodoEmbeddableFactory } from './multi_task_todo';
+import {
+  SEARCHABLE_LIST_CONTAINER,
+  SearchableListContainerFactory,
+} from './searchable_list_container';
+import { LIST_CONTAINER, ListContainerFactory } from './list_container';
+
+interface EmbeddableExamplesSetupDependencies {
+  embeddable: IEmbeddableSetup;
+}
+
+interface EmbeddableExamplesStartDependencies {
+  embeddable: IEmbeddableStart;
+}
+
+export class EmbeddableExamplesPlugin
+  implements
+    Plugin<void, void, EmbeddableExamplesSetupDependencies, EmbeddableExamplesStartDependencies> {
+  public setup(core: CoreSetup, deps: EmbeddableExamplesSetupDependencies) {
+    deps.embeddable.registerEmbeddableFactory(
+      HELLO_WORLD_EMBEDDABLE,
+      new HelloWorldEmbeddableFactory()
+    );
+
+    deps.embeddable.registerEmbeddableFactory(TODO_EMBEDDABLE, new TodoEmbeddableFactory());
+
+    deps.embeddable.registerEmbeddableFactory(
+      MULTI_TASK_TODO_EMBEDDABLE,
+      new MultiTaskTodoEmbeddableFactory()
+    );
+  }
+
+  public start(core: CoreStart, deps: EmbeddableExamplesStartDependencies) {
+    // These are registered in the start method because `getEmbeddableFactory `
+    // is only available in start. We could reconsider this I think and make it
+    // available in both.
+    deps.embeddable.registerEmbeddableFactory(
+      SEARCHABLE_LIST_CONTAINER,
+      new SearchableListContainerFactory(deps.embeddable.getEmbeddableFactory)
+    );
+
+    deps.embeddable.registerEmbeddableFactory(
+      LIST_CONTAINER,
+      new ListContainerFactory(deps.embeddable.getEmbeddableFactory)
+    );
+  }
+
+  public stop() {}
+}
diff --git a/examples/embeddable_examples/public/searchable_list_container/index.ts b/examples/embeddable_examples/public/searchable_list_container/index.ts
new file mode 100644
index 0000000000000..c422fdba5835d
--- /dev/null
+++ b/examples/embeddable_examples/public/searchable_list_container/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 { SearchableListContainer, SEARCHABLE_LIST_CONTAINER } from './searchable_list_container';
+export { SearchableListContainerFactory } from './searchable_list_container_factory';
diff --git a/examples/embeddable_examples/public/searchable_list_container/searchable_list_container.tsx b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container.tsx
new file mode 100644
index 0000000000000..3079abb867c38
--- /dev/null
+++ b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container.tsx
@@ -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 React from 'react';
+import ReactDOM from 'react-dom';
+import {
+  Container,
+  ContainerInput,
+  GetEmbeddableFactory,
+  EmbeddableInput,
+} from '../../../../src/plugins/embeddable/public';
+import { SearchableListContainerComponent } from './searchable_list_container_component';
+
+export const SEARCHABLE_LIST_CONTAINER = 'SEARCHABLE_LIST_CONTAINER';
+
+export interface SearchableContainerInput extends ContainerInput {
+  search?: string;
+}
+
+interface ChildInput extends EmbeddableInput {
+  search?: string;
+}
+
+export class SearchableListContainer extends Container<ChildInput, SearchableContainerInput> {
+  public readonly type = SEARCHABLE_LIST_CONTAINER;
+  private node?: HTMLElement;
+
+  constructor(input: SearchableContainerInput, getEmbeddableFactory: GetEmbeddableFactory) {
+    super(input, { embeddableLoaded: {} }, getEmbeddableFactory);
+  }
+
+  // TODO: add a more advanced example here where inherited child input is derived from container
+  // input and not just an exact pass through.
+  getInheritedInput(id: string) {
+    return {
+      id,
+      search: this.getInput().search,
+    };
+  }
+
+  public render(node: HTMLElement) {
+    if (this.node) {
+      ReactDOM.unmountComponentAtNode(this.node);
+    }
+    this.node = node;
+    ReactDOM.render(<SearchableListContainerComponent embeddable={this} />, node);
+  }
+
+  public destroy() {
+    super.destroy();
+    if (this.node) {
+      ReactDOM.unmountComponentAtNode(this.node);
+    }
+  }
+}
diff --git a/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_component.tsx b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_component.tsx
new file mode 100644
index 0000000000000..b79f86e2a0192
--- /dev/null
+++ b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_component.tsx
@@ -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 React, { Component } from 'react';
+
+import {
+  EuiLoadingSpinner,
+  EuiButton,
+  EuiFormRow,
+  EuiFlexGroup,
+  EuiSpacer,
+  EuiFlexItem,
+  EuiFieldText,
+  EuiPanel,
+  EuiCheckbox,
+} from '@elastic/eui';
+import * as Rx from 'rxjs';
+import {
+  withEmbeddableSubscription,
+  ContainerOutput,
+  EmbeddableOutput,
+} from '../../../../src/plugins/embeddable/public';
+import { EmbeddableListItem } from '../list_container/embeddable_list_item';
+import { SearchableListContainer, SearchableContainerInput } from './searchable_list_container';
+
+interface Props {
+  embeddable: SearchableListContainer;
+  input: SearchableContainerInput;
+  output: ContainerOutput;
+}
+
+interface State {
+  checked: { [key: string]: boolean };
+  hasMatch: { [key: string]: boolean };
+}
+
+interface HasMatchOutput {
+  hasMatch: boolean;
+}
+
+function hasHasMatchOutput(output: EmbeddableOutput | HasMatchOutput): output is HasMatchOutput {
+  return (output as HasMatchOutput).hasMatch !== undefined;
+}
+
+export class SearchableListContainerComponentInner extends Component<Props, State> {
+  private subscriptions: { [id: string]: Rx.Subscription } = {};
+  constructor(props: Props) {
+    super(props);
+
+    const checked: { [id: string]: boolean } = {};
+    const hasMatch: { [id: string]: boolean } = {};
+    props.embeddable.getChildIds().forEach(id => {
+      checked[id] = false;
+      const output = props.embeddable.getChild(id).getOutput();
+      hasMatch[id] = hasHasMatchOutput(output) && output.hasMatch;
+    });
+    props.embeddable.getChildIds().forEach(id => (checked[id] = false));
+    this.state = {
+      checked,
+      hasMatch,
+    };
+  }
+
+  componentDidMount() {
+    this.props.embeddable.getChildIds().forEach(id => {
+      this.subscriptions[id] = this.props.embeddable
+        .getChild(id)
+        .getOutput$()
+        .subscribe(output => {
+          if (hasHasMatchOutput(output)) {
+            this.setState(prevState => ({
+              hasMatch: {
+                ...prevState.hasMatch,
+                [id]: output.hasMatch,
+              },
+            }));
+          }
+        });
+    });
+  }
+
+  componentWillUnmount() {
+    Object.values(this.subscriptions).forEach(sub => sub.unsubscribe());
+  }
+
+  private updateSearch = (search: string) => {
+    this.props.embeddable.updateInput({ search });
+  };
+
+  private deleteChecked = () => {
+    Object.values(this.props.input.panels).map(panel => {
+      if (this.state.checked[panel.explicitInput.id]) {
+        this.props.embeddable.removeEmbeddable(panel.explicitInput.id);
+        this.subscriptions[panel.explicitInput.id].unsubscribe();
+      }
+    });
+  };
+
+  private toggleCheck = (isChecked: boolean, id: string) => {
+    this.setState(prevState => ({ checked: { ...prevState.checked, [id]: isChecked } }));
+  };
+
+  public renderControls() {
+    return (
+      <EuiFlexGroup>
+        <EuiFlexItem grow={false}>
+          <EuiFormRow hasEmptyLabelSpace>
+            <EuiButton data-test-subj="deleteCheckedTodos" onClick={() => this.deleteChecked()}>
+              Delete checked
+            </EuiButton>
+          </EuiFormRow>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiFormRow label="Filter">
+            <EuiFieldText
+              data-test-subj="filterTodos"
+              value={this.props.input.search || ''}
+              onChange={ev => this.updateSearch(ev.target.value)}
+            />
+          </EuiFormRow>
+        </EuiFlexItem>
+        <EuiFlexItem />
+      </EuiFlexGroup>
+    );
+  }
+
+  public render() {
+    const { embeddable } = this.props;
+    return (
+      <div>
+        <h2 data-test-subj="searchableListContainerTitle">{embeddable.getTitle()}</h2>
+        <EuiSpacer size="l" />
+        {this.renderControls()}
+        <EuiSpacer size="l" />
+        {this.renderList()}
+      </div>
+    );
+  }
+
+  private renderList() {
+    let id = 0;
+    const list = Object.values(this.props.input.panels).map(panel => {
+      const embeddable = this.props.embeddable.getChild(panel.explicitInput.id);
+      if (this.props.input.search && !this.state.hasMatch[panel.explicitInput.id]) return;
+      id++;
+      return embeddable ? (
+        <EuiPanel key={embeddable.id}>
+          <EuiFlexGroup>
+            <EuiFlexItem grow={false}>
+              <EuiCheckbox
+                data-test-subj={`todoCheckBox-${embeddable.id}`}
+                disabled={!embeddable}
+                id={embeddable ? embeddable.id : ''}
+                checked={this.state.checked[embeddable.id]}
+                onChange={e => this.toggleCheck(e.target.checked, embeddable.id)}
+              />
+            </EuiFlexItem>
+            <EuiFlexItem>
+              <EmbeddableListItem embeddable={embeddable} />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiPanel>
+      ) : (
+        <EuiLoadingSpinner size="l" key={id} />
+      );
+    });
+    return list;
+  }
+}
+
+export const SearchableListContainerComponent = withEmbeddableSubscription(
+  SearchableListContainerComponentInner
+);
diff --git a/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_factory.ts b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_factory.ts
new file mode 100644
index 0000000000000..359878857eebb
--- /dev/null
+++ b/examples/embeddable_examples/public/searchable_list_container/searchable_list_container_factory.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 { i18n } from '@kbn/i18n';
+import { EmbeddableFactory, GetEmbeddableFactory } from '../../../../src/plugins/embeddable/public';
+import {
+  SEARCHABLE_LIST_CONTAINER,
+  SearchableListContainer,
+  SearchableContainerInput,
+} from './searchable_list_container';
+
+export class SearchableListContainerFactory extends EmbeddableFactory {
+  public readonly type = SEARCHABLE_LIST_CONTAINER;
+  public readonly isContainerType = true;
+
+  constructor(private getEmbeddableFactory: GetEmbeddableFactory) {
+    super();
+  }
+
+  public isEditable() {
+    return true;
+  }
+
+  public async create(initialInput: SearchableContainerInput) {
+    return new SearchableListContainer(initialInput, this.getEmbeddableFactory);
+  }
+
+  public getDisplayName() {
+    return i18n.translate('embeddableExamples.searchableListContainer.displayName', {
+      defaultMessage: 'Searchable list container',
+    });
+  }
+}
diff --git a/examples/embeddable_examples/public/todo/index.ts b/examples/embeddable_examples/public/todo/index.ts
new file mode 100644
index 0000000000000..cac0b85b40d5c
--- /dev/null
+++ b/examples/embeddable_examples/public/todo/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 './todo_embeddable';
+export * from './todo_embeddable_factory';
diff --git a/examples/embeddable_examples/public/todo/todo_component.tsx b/examples/embeddable_examples/public/todo/todo_component.tsx
new file mode 100644
index 0000000000000..fbebfc98627b5
--- /dev/null
+++ b/examples/embeddable_examples/public/todo/todo_component.tsx
@@ -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 React from 'react';
+import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
+
+import { EuiText } from '@elastic/eui';
+import { EuiAvatar } from '@elastic/eui';
+import { EuiIcon } from '@elastic/eui';
+import { EuiFlexGrid } from '@elastic/eui';
+import {
+  withEmbeddableSubscription,
+  EmbeddableOutput,
+} from '../../../../src/plugins/embeddable/public';
+import { TodoEmbeddable, TodoInput } from './todo_embeddable';
+
+interface Props {
+  embeddable: TodoEmbeddable;
+  input: TodoInput;
+  output: EmbeddableOutput;
+}
+
+function wrapSearchTerms(task: string, search?: string) {
+  if (!search) return task;
+  const parts = task.split(new RegExp(`(${search})`, 'g'));
+  return parts.map((part, i) =>
+    part === search ? (
+      <span key={i} style={{ backgroundColor: 'yellow' }}>
+        {part}
+      </span>
+    ) : (
+      part
+    )
+  );
+}
+
+export function TodoEmbeddableComponentInner({ input: { icon, title, task, search } }: Props) {
+  return (
+    <EuiFlexGroup>
+      <EuiFlexItem grow={false}>
+        {icon ? <EuiIcon type={icon} size="l" /> : <EuiAvatar name={title || task} size="l" />}
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <EuiFlexGrid columns={1}>
+          <EuiFlexItem>
+            <EuiText data-test-subj="todoEmbeddableTitle">
+              <h3>{wrapSearchTerms(title || '', search)}</h3>
+            </EuiText>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiText data-test-subj="todoEmbeddableTask">{wrapSearchTerms(task, search)}</EuiText>
+          </EuiFlexItem>
+        </EuiFlexGrid>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
+
+export const TodoEmbeddableComponent = withEmbeddableSubscription(TodoEmbeddableComponentInner);
diff --git a/examples/embeddable_examples/public/todo/todo_embeddable.tsx b/examples/embeddable_examples/public/todo/todo_embeddable.tsx
new file mode 100644
index 0000000000000..b081253d86341
--- /dev/null
+++ b/examples/embeddable_examples/public/todo/todo_embeddable.tsx
@@ -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 React from 'react';
+import ReactDOM from 'react-dom';
+import { Subscription } from 'rxjs';
+import {
+  Embeddable,
+  EmbeddableInput,
+  IContainer,
+  EmbeddableOutput,
+} from '../../../../src/plugins/embeddable/public';
+import { TodoEmbeddableComponent } from './todo_component';
+
+export const TODO_EMBEDDABLE = 'TODO_EMBEDDABLE';
+
+export interface TodoInput extends EmbeddableInput {
+  task: string;
+  icon?: string;
+  search?: string;
+}
+
+export interface TodoOutput extends EmbeddableOutput {
+  hasMatch: boolean;
+}
+
+function getOutput(input: TodoInput): TodoOutput {
+  return {
+    hasMatch: input.search
+      ? Boolean(input.task.match(input.search) || (input.title && input.title.match(input.search)))
+      : true,
+  };
+}
+
+export class TodoEmbeddable extends Embeddable<TodoInput, TodoOutput> {
+  // The type of this embeddable. This will be used to find the appropriate factory
+  // to instantiate this kind of embeddable.
+  public readonly type = TODO_EMBEDDABLE;
+  private subscription: Subscription;
+  private node?: HTMLElement;
+
+  constructor(initialInput: TodoInput, parent?: IContainer) {
+    super(initialInput, getOutput(initialInput), parent);
+
+    // If you have any output state that changes as a result of input state changes, you
+    // should use an subcription.  Here, we use output to indicate whether this task
+    // matches the search string.
+    this.subscription = this.getInput$().subscribe(() => {
+      this.updateOutput(getOutput(this.input));
+    });
+  }
+
+  public render(node: HTMLElement) {
+    this.node = node;
+    if (this.node) {
+      ReactDOM.unmountComponentAtNode(this.node);
+    }
+    ReactDOM.render(<TodoEmbeddableComponent embeddable={this} />, node);
+  }
+
+  /**
+   * Not relevant.
+   */
+  public reload() {}
+
+  public destroy() {
+    super.destroy();
+    this.subscription.unsubscribe();
+    if (this.node) {
+      ReactDOM.unmountComponentAtNode(this.node);
+    }
+  }
+}
diff --git a/examples/embeddable_examples/public/todo/todo_embeddable_factory.ts b/examples/embeddable_examples/public/todo/todo_embeddable_factory.ts
new file mode 100644
index 0000000000000..386b3f296d998
--- /dev/null
+++ b/examples/embeddable_examples/public/todo/todo_embeddable_factory.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';
+import { IContainer, EmbeddableFactory } from '../../../../src/plugins/embeddable/public';
+import { TodoEmbeddable, TODO_EMBEDDABLE, TodoInput } from './todo_embeddable';
+
+export class TodoEmbeddableFactory extends EmbeddableFactory {
+  public readonly type = TODO_EMBEDDABLE;
+
+  public isEditable() {
+    return true;
+  }
+
+  public async create(initialInput: TodoInput, parent?: IContainer) {
+    return new TodoEmbeddable(initialInput, parent);
+  }
+
+  public getDisplayName() {
+    return i18n.translate('embeddableExamples.todo.displayName', {
+      defaultMessage: 'Todo item',
+    });
+  }
+}
diff --git a/examples/embeddable_examples/tsconfig.json b/examples/embeddable_examples/tsconfig.json
new file mode 100644
index 0000000000000..091130487791b
--- /dev/null
+++ b/examples/embeddable_examples/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/examples/embeddable_explorer/kibana.json b/examples/embeddable_explorer/kibana.json
new file mode 100644
index 0000000000000..4ca63e1a36242
--- /dev/null
+++ b/examples/embeddable_explorer/kibana.json
@@ -0,0 +1,10 @@
+{
+  "id": "embeddableExplorer",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "configPath": ["embeddable_explorer"],
+  "server": false,
+  "ui": true,
+  "requiredPlugins": ["embeddable", "embeddableExamples"],
+  "optionalPlugins": []
+}
diff --git a/examples/embeddable_explorer/package.json b/examples/embeddable_explorer/package.json
new file mode 100644
index 0000000000000..771c5c9be9c06
--- /dev/null
+++ b/examples/embeddable_explorer/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "embeddable_explorer",
+  "version": "1.0.0",
+  "main": "target/examples/embeddable_explorer",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "Apache-2.0",
+  "scripts": {
+    "kbn": "node ../../scripts/kbn.js",
+    "build": "rm -rf './target' && tsc"
+  },
+  "devDependencies": {
+    "typescript": "3.7.2"
+  }
+}
diff --git a/examples/embeddable_explorer/public/app.tsx b/examples/embeddable_explorer/public/app.tsx
new file mode 100644
index 0000000000000..be27fd04556ea
--- /dev/null
+++ b/examples/embeddable_explorer/public/app.tsx
@@ -0,0 +1,126 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 ReactDOM from 'react-dom';
+import { BrowserRouter as Router, Route, withRouter, RouteComponentProps } from 'react-router-dom';
+
+import { EuiPage, EuiPageSideBar, EuiSideNav } from '@elastic/eui';
+
+import { IEmbeddableStart } from 'src/plugins/embeddable/public';
+import { AppMountContext, AppMountParameters, CoreStart } from '../../../src/core/public';
+import { HelloWorldEmbeddableExample } from './hello_world_embeddable_example';
+import { TodoEmbeddableExample } from './todo_embeddable_example';
+import { ListContainerExample } from './list_container_example';
+
+interface PageDef {
+  title: string;
+  id: string;
+  component: React.ReactNode;
+}
+
+type NavProps = RouteComponentProps & {
+  navigateToApp: AppMountContext['core']['application']['navigateToApp'];
+  pages: PageDef[];
+};
+
+const Nav = withRouter(({ history, navigateToApp, pages }: NavProps) => {
+  const navItems = pages.map(page => ({
+    id: page.id,
+    name: page.title,
+    onClick: () => history.push(`/${page.id}`),
+    'data-test-subj': page.id,
+  }));
+
+  return (
+    <EuiSideNav
+      items={[
+        {
+          name: 'Embeddable explorer',
+          id: 'home',
+          items: [...navItems],
+        },
+      ]}
+    />
+  );
+});
+
+const EmbeddableExplorerApp = ({
+  basename,
+  navigateToApp,
+  embeddableApi,
+}: {
+  basename: string;
+  navigateToApp: CoreStart['application']['navigateToApp'];
+  embeddableApi: IEmbeddableStart;
+}) => {
+  const pages: PageDef[] = [
+    {
+      title: 'Hello world embeddable',
+      id: 'helloWorldEmbeddableSection',
+      component: (
+        <HelloWorldEmbeddableExample getEmbeddableFactory={embeddableApi.getEmbeddableFactory} />
+      ),
+    },
+    {
+      title: 'Todo embeddable',
+      id: 'todoEmbeddableSection',
+      component: (
+        <TodoEmbeddableExample getEmbeddableFactory={embeddableApi.getEmbeddableFactory} />
+      ),
+    },
+    {
+      title: 'List container embeddable',
+      id: 'listContainerSection',
+      component: <ListContainerExample getEmbeddableFactory={embeddableApi.getEmbeddableFactory} />,
+    },
+  ];
+
+  const routes = pages.map((page, i) => (
+    <Route key={i} path={`/${page.id}`} render={props => page.component} />
+  ));
+
+  return (
+    <Router basename={basename}>
+      <EuiPage>
+        <EuiPageSideBar>
+          <Nav navigateToApp={navigateToApp} pages={pages} />
+        </EuiPageSideBar>
+        {routes}
+      </EuiPage>
+    </Router>
+  );
+};
+
+export const renderApp = (
+  core: CoreStart,
+  embeddableApi: IEmbeddableStart,
+  { appBasePath, element }: AppMountParameters
+) => {
+  ReactDOM.render(
+    <EmbeddableExplorerApp
+      basename={appBasePath}
+      navigateToApp={core.application.navigateToApp}
+      embeddableApi={embeddableApi}
+    />,
+    element
+  );
+
+  return () => ReactDOM.unmountComponentAtNode(element);
+};
diff --git a/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx b/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx
new file mode 100644
index 0000000000000..74a6766a1b5ee
--- /dev/null
+++ b/examples/embeddable_explorer/public/hello_world_embeddable_example.tsx
@@ -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 React from 'react';
+import {
+  EuiPanel,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPageContentBody,
+  EuiPageHeader,
+  EuiPageHeaderSection,
+  EuiTitle,
+  EuiText,
+} from '@elastic/eui';
+import {
+  GetEmbeddableFactory,
+  EmbeddableFactoryRenderer,
+  EmbeddableRoot,
+} from '../../../src/plugins/embeddable/public';
+import { HelloWorldEmbeddable, HELLO_WORLD_EMBEDDABLE } from '../../embeddable_examples/public';
+
+interface Props {
+  getEmbeddableFactory: GetEmbeddableFactory;
+}
+
+export function HelloWorldEmbeddableExample({ getEmbeddableFactory }: Props) {
+  return (
+    <EuiPageBody>
+      <EuiPageHeader>
+        <EuiPageHeaderSection>
+          <EuiTitle size="l">
+            <h1>Hello world example</h1>
+          </EuiTitle>
+        </EuiPageHeaderSection>
+      </EuiPageHeader>
+      <EuiPageContent>
+        <EuiPageContentBody>
+          <EuiText>
+            Here the embeddable is rendered without the factory. A developer may use this method if
+            they want to statically embed a single embeddable into their application or page.
+          </EuiText>
+          <EuiPanel data-test-subj="helloWorldEmbeddablePanel" paddingSize="none" role="figure">
+            <EmbeddableRoot embeddable={new HelloWorldEmbeddable({ id: 'hello' })} />
+          </EuiPanel>
+
+          <EuiText>
+            Here the embeddable is rendered using the factory.create method. This method is used
+            programatically when a container embeddable attempts to initialize it&#39;s children
+            embeddables. This method can be used when you only have a string representing the type
+            of embeddable, and input data.
+          </EuiText>
+          <EuiPanel
+            data-test-subj="helloWorldEmbeddableFromFactory"
+            paddingSize="none"
+            role="figure"
+          >
+            <EmbeddableFactoryRenderer
+              getEmbeddableFactory={getEmbeddableFactory}
+              type={HELLO_WORLD_EMBEDDABLE}
+              input={{ id: '1234' }}
+            />
+          </EuiPanel>
+        </EuiPageContentBody>
+      </EuiPageContent>
+    </EuiPageBody>
+  );
+}
diff --git a/examples/embeddable_explorer/public/index.ts b/examples/embeddable_explorer/public/index.ts
new file mode 100644
index 0000000000000..94e2af52ab320
--- /dev/null
+++ b/examples/embeddable_explorer/public/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { EmbeddableExplorerPlugin } from './plugin';
+
+export const plugin = () => new EmbeddableExplorerPlugin();
diff --git a/examples/embeddable_explorer/public/list_container_example.tsx b/examples/embeddable_explorer/public/list_container_example.tsx
new file mode 100644
index 0000000000000..49cfae0d4e455
--- /dev/null
+++ b/examples/embeddable_explorer/public/list_container_example.tsx
@@ -0,0 +1,182 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 {
+  EuiPanel,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPageContentBody,
+  EuiPageHeader,
+  EuiPageHeaderSection,
+  EuiTitle,
+  EuiText,
+} from '@elastic/eui';
+import { EuiSpacer } from '@elastic/eui';
+import {
+  GetEmbeddableFactory,
+  EmbeddableFactoryRenderer,
+} from '../../../src/plugins/embeddable/public';
+import {
+  HELLO_WORLD_EMBEDDABLE,
+  TODO_EMBEDDABLE,
+  MULTI_TASK_TODO_EMBEDDABLE,
+  SEARCHABLE_LIST_CONTAINER,
+  LIST_CONTAINER,
+} from '../../embeddable_examples/public';
+
+interface Props {
+  getEmbeddableFactory: GetEmbeddableFactory;
+}
+
+export function ListContainerExample({ getEmbeddableFactory }: Props) {
+  const listInput = {
+    id: 'hello',
+    title: 'My todo list',
+    panels: {
+      '1': {
+        type: HELLO_WORLD_EMBEDDABLE,
+        explicitInput: {
+          id: '1',
+        },
+      },
+      '2': {
+        type: TODO_EMBEDDABLE,
+        explicitInput: {
+          id: '2',
+          task: 'Goes out on Wenesdays!',
+          icon: 'broom',
+          title: 'Take out the trash',
+        },
+      },
+      '3': {
+        type: TODO_EMBEDDABLE,
+        explicitInput: {
+          id: '3',
+          icon: 'broom',
+          title: 'Vaccum the floor',
+        },
+      },
+    },
+  };
+
+  const searchableInput = {
+    id: '1',
+    title: 'My searchable todo list',
+    panels: {
+      '1': {
+        type: HELLO_WORLD_EMBEDDABLE,
+        explicitInput: {
+          id: '1',
+          title: 'Hello',
+        },
+      },
+      '2': {
+        type: TODO_EMBEDDABLE,
+        explicitInput: {
+          id: '2',
+          task: 'Goes out on Wenesdays!',
+          icon: 'broom',
+          title: 'Take out the trash',
+        },
+      },
+      '3': {
+        type: MULTI_TASK_TODO_EMBEDDABLE,
+        explicitInput: {
+          id: '3',
+          icon: 'searchProfilerApp',
+          title: 'Learn more',
+          tasks: ['Go to school', 'Watch planet earth', 'Read the encylopedia'],
+        },
+      },
+    },
+  };
+
+  return (
+    <EuiPageBody>
+      <EuiPageHeader>
+        <EuiPageHeaderSection>
+          <EuiTitle size="l">
+            <h1>List container example</h1>
+          </EuiTitle>
+        </EuiPageHeaderSection>
+      </EuiPageHeader>
+      <EuiPageContent>
+        <EuiPageContentBody>
+          <EuiText>
+            Here is a container embeddable that contains other embeddables and displays them in a
+            list.
+          </EuiText>
+          <EuiPanel data-test-subj="listContainerEmbeddablePanel" paddingSize="none" role="figure">
+            <EmbeddableFactoryRenderer
+              getEmbeddableFactory={getEmbeddableFactory}
+              type={LIST_CONTAINER}
+              input={listInput}
+            />
+          </EuiPanel>
+
+          <EuiSpacer />
+          <EuiText>
+            <p>
+              The reason to use a container embeddable instead of just a custom react component is
+              because it comes with helpful methods to store the state of all its children
+              embeddables, listeners to clean up the input state when an embeddable is added or
+              removed, and a way to pass down the container embeddable&#39;s own input to its
+              children. In the above example, the container did not take any input. Let&#39;s modify
+              it so it does.
+            </p>
+            <p>
+              In this Searchable List Container, the container takes in a search string as input and
+              passes that down to all its children. It also listens to its children that output
+              `hasMatch`, and removes them from the list when there is a search string and the child
+              doesn&#39;t match.
+            </p>
+            <p>
+              The first HelloWorldEmbeddable does not emit the hasMatch output variable, so the
+              container chooses to hide it.
+            </p>
+          </EuiText>
+
+          <EuiSpacer />
+          <EuiPanel
+            data-test-subj="searchableListContainerEmbeddablePanel"
+            paddingSize="none"
+            role="figure"
+          >
+            <EmbeddableFactoryRenderer
+              getEmbeddableFactory={getEmbeddableFactory}
+              type={SEARCHABLE_LIST_CONTAINER}
+              input={searchableInput}
+            />{' '}
+          </EuiPanel>
+          <EuiSpacer />
+          <EuiText>
+            <p>
+              There currently is no formal way to limit what children can be added to a container.
+              If the use case arose, it wouldn&#39;t be difficult. In the mean time, it&#39;s good
+              to understand that chilren may ignore input they don&#39;t care about. Likewise the
+              container will have to choose what to do when it encounters children that are missing
+              certain output variables.
+            </p>
+          </EuiText>
+        </EuiPageContentBody>
+      </EuiPageContent>
+    </EuiPageBody>
+  );
+}
diff --git a/examples/embeddable_explorer/public/plugin.tsx b/examples/embeddable_explorer/public/plugin.tsx
new file mode 100644
index 0000000000000..2576dea0cadbc
--- /dev/null
+++ b/examples/embeddable_explorer/public/plugin.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 { Plugin, CoreSetup, AppMountParameters } from 'kibana/public';
+import { IEmbeddableStart } from '../../../src/plugins/embeddable/public';
+
+export class EmbeddableExplorerPlugin implements Plugin {
+  public setup(core: CoreSetup<{ embeddable: IEmbeddableStart }>) {
+    core.application.register({
+      id: 'embeddableExplorer',
+      title: 'Embeddable explorer',
+      async mount(params: AppMountParameters) {
+        const [coreStart, depsStart] = await core.getStartServices();
+        const { renderApp } = await import('./app');
+        return renderApp(coreStart, depsStart.embeddable, params);
+      },
+    });
+  }
+
+  public start() {}
+  public stop() {}
+}
diff --git a/examples/embeddable_explorer/public/todo_embeddable_example.tsx b/examples/embeddable_explorer/public/todo_embeddable_example.tsx
new file mode 100644
index 0000000000000..b1c93087faf83
--- /dev/null
+++ b/examples/embeddable_explorer/public/todo_embeddable_example.tsx
@@ -0,0 +1,172 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 {
+  EuiFormRow,
+  EuiFieldText,
+  EuiPanel,
+  EuiTextArea,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPageContentBody,
+  EuiPageHeader,
+  EuiPageHeaderSection,
+  EuiTitle,
+  EuiText,
+  EuiButton,
+  EuiFlexGroup,
+  EuiFlexItem,
+} from '@elastic/eui';
+import {
+  TodoEmbeddable,
+  TODO_EMBEDDABLE,
+  TodoEmbeddableFactory,
+} from '../../../examples/embeddable_examples/public/todo';
+import { GetEmbeddableFactory, EmbeddableRoot } from '../../../src/plugins/embeddable/public';
+
+interface Props {
+  getEmbeddableFactory: GetEmbeddableFactory;
+}
+
+interface State {
+  task?: string;
+  title?: string;
+  icon?: string;
+  loading: boolean;
+}
+
+export class TodoEmbeddableExample extends React.Component<Props, State> {
+  private embeddable?: TodoEmbeddable;
+
+  constructor(props: Props) {
+    super(props);
+
+    this.state = { loading: true };
+  }
+
+  public componentDidMount() {
+    const factory = this.props.getEmbeddableFactory(TODO_EMBEDDABLE) as TodoEmbeddableFactory;
+
+    if (factory === undefined) {
+      throw new Error('Embeddable factory is undefined!');
+    }
+
+    factory
+      .create({
+        id: '1',
+        task: 'Take out the trash',
+        icon: 'broom',
+        title: 'Trash',
+      })
+      .then(embeddable => {
+        this.embeddable = embeddable;
+        this.setState({ loading: false });
+      });
+  }
+
+  public componentWillUnmount() {
+    if (this.embeddable) {
+      this.embeddable.destroy();
+    }
+  }
+
+  private onUpdateEmbeddableInput = () => {
+    if (this.embeddable) {
+      const { task, title, icon } = this.state;
+      this.embeddable.updateInput({ task, title, icon });
+    }
+  };
+
+  public render() {
+    return (
+      <EuiPageBody>
+        <EuiPageHeader>
+          <EuiPageHeaderSection>
+            <EuiTitle size="l">
+              <h1>Todo example</h1>
+            </EuiTitle>
+          </EuiPageHeaderSection>
+        </EuiPageHeader>
+        <EuiPageContent>
+          <EuiPageContentBody>
+            <EuiText>
+              This embeddable takes input parameters, task, title and icon. You can update them
+              using this form. In the code, pressing update will call
+              <pre>
+                <code>
+                  const &#123; task, title, icon &#125; = this.state;
+                  <br />
+                  this.embeddable.updateInput(&#123; task, title, icon &#125;);
+                </code>
+              </pre>
+              <p>
+                You may also notice this example uses `EmbeddableRoot` instead of the
+                `EmbeddableFactoryRenderer` helper component. This is because it needs a reference
+                to the embeddable to update it, and `EmbeddableFactoryRenderer` creates and holds
+                the embeddable instance internally.
+              </p>
+            </EuiText>
+            <EuiFlexGroup>
+              <EuiFlexItem grow={true}>
+                <EuiFormRow label="Title">
+                  <EuiFieldText
+                    data-test-subj="titleTodo"
+                    onChange={ev => this.setState({ title: ev.target.value })}
+                  />
+                </EuiFormRow>
+              </EuiFlexItem>
+              <EuiFlexItem grow={true}>
+                <EuiFormRow label="Icon">
+                  <EuiFieldText
+                    data-test-subj="iconTodo"
+                    onChange={ev => this.setState({ icon: ev.target.value })}
+                  />
+                </EuiFormRow>
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <EuiFormRow label="Task">
+                  <EuiTextArea
+                    fullWidth
+                    resize="horizontal"
+                    data-test-subj="taskTodo"
+                    onChange={ev => this.setState({ task: ev.target.value })}
+                  />
+                </EuiFormRow>
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <EuiFormRow hasEmptyLabelSpace>
+                  <EuiButton
+                    data-test-subj="updateTodoButton"
+                    onClick={this.onUpdateEmbeddableInput}
+                  >
+                    Update
+                  </EuiButton>
+                </EuiFormRow>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+            <EuiPanel data-test-subj="todoEmbeddable" paddingSize="none" role="figure">
+              <EmbeddableRoot embeddable={this.embeddable} loading={this.state.loading} />
+            </EuiPanel>
+          </EuiPageContentBody>
+        </EuiPageContent>
+      </EuiPageBody>
+    );
+  }
+}
diff --git a/examples/embeddable_explorer/tsconfig.json b/examples/embeddable_explorer/tsconfig.json
new file mode 100644
index 0000000000000..d508076b33199
--- /dev/null
+++ b/examples/embeddable_explorer/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/examples/search_explorer/package.json b/examples/search_explorer/package.json
index 62d0127c30cc6..cae20a6664f8a 100644
--- a/examples/search_explorer/package.json
+++ b/examples/search_explorer/package.json
@@ -1,7 +1,7 @@
 {
   "name": "search_explorer",
   "version": "1.0.0",
-  "main": "target/test/plugin_functional/plugins/search_explorer",
+  "main": "target/examples/search_explorer",
   "kibana": {
     "version": "kibana",
     "templateVersion": "1.0.0"
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.5.3"
+    "typescript": "3.7.2"
   }
 }
diff --git a/package.json b/package.json
index 183dad6dda0eb..db5764e6e91ba 100644
--- a/package.json
+++ b/package.json
@@ -88,6 +88,7 @@
     "**/isomorphic-git/**/base64-js": "^1.2.1",
     "**/image-diff/gm/debug": "^2.6.9",
     "**/react-dom": "^16.12.0",
+    "**/react": "^16.12.0",
     "**/react-test-renderer": "^16.12.0",
     "**/deepmerge": "^4.2.2",
     "**/serialize-javascript": "^2.1.1"
@@ -110,12 +111,13 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.7.5",
-    "@babel/register": "^7.7.4",
-    "@elastic/charts": "^14.0.0",
+    "@babel/core": "^7.5.5",
+    "@babel/register": "^7.7.0",
+    "@elastic/apm-rum": "^4.6.0",
+    "@elastic/charts": "^16.0.2",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "1.0.5",
-    "@elastic/eui": "17.0.0",
+    "@elastic/eui": "17.3.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.3",
@@ -156,7 +158,7 @@
     "color": "1.0.3",
     "commander": "3.0.2",
     "compare-versions": "3.5.1",
-    "core-js": "^3.5.0",
+    "core-js": "^3.2.1",
     "css-loader": "2.1.1",
     "custom-event-polyfill": "^0.3.0",
     "d3": "3.5.17",
@@ -172,7 +174,8 @@
     "fast-deep-equal": "^3.1.1",
     "file-loader": "4.2.0",
     "font-awesome": "4.7.0",
-    "getos": "^3.1.1",
+    "fp-ts": "^2.3.1",
+    "getos": "^3.1.0",
     "glob": "^7.1.2",
     "glob-all": "^3.1.0",
     "globby": "^8.0.1",
@@ -182,10 +185,11 @@
     "hapi": "^17.5.3",
     "hapi-auth-cookie": "^9.0.0",
     "history": "^4.9.0",
-    "hjson": "3.2.0",
+    "hjson": "3.2.1",
     "hoek": "^5.0.4",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.2",
+    "immer": "^1.5.0",
     "inert": "^5.1.0",
     "inline-style": "^2.0.0",
     "joi": "^13.5.2",
@@ -233,10 +237,10 @@
     "react-resize-detector": "^4.2.0",
     "react-router-dom": "^5.1.2",
     "react-sizeme": "^2.3.6",
-    "react-use": "^13.10.2",
+    "react-use": "^13.13.0",
     "reactcss": "1.2.3",
     "redux": "4.0.0",
-    "redux-actions": "2.2.1",
+    "redux-actions": "2.6.5",
     "redux-thunk": "2.3.0",
     "regenerator-runtime": "^0.13.3",
     "regression": "2.0.1",
@@ -275,9 +279,9 @@
     "yauzl": "2.10.0"
   },
   "devDependencies": {
-    "@babel/parser": "^7.7.5",
-    "@babel/plugin-syntax-dynamic-import": "^7.7.4",
-    "@babel/types": "^7.7.4",
+    "@babel/parser": "^7.5.5",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/types": "^7.5.5",
     "@elastic/elasticsearch": "^7.4.0",
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",
@@ -291,14 +295,14 @@
     "@kbn/plugin-generator": "1.0.0",
     "@kbn/test": "1.0.0",
     "@kbn/utility-types": "1.0.0",
-    "@microsoft/api-documenter": "7.4.3",
-    "@microsoft/api-extractor": "7.4.2",
+    "@microsoft/api-documenter": "7.7.2",
+    "@microsoft/api-extractor": "7.7.0",
     "@percy/agent": "^0.11.0",
     "@testing-library/react": "^9.3.2",
     "@testing-library/react-hooks": "^3.2.1",
     "@types/angular": "^1.6.56",
     "@types/angular-mocks": "^1.7.0",
-    "@types/babel__core": "^7.1.3",
+    "@types/babel__core": "^7.1.2",
     "@types/bluebird": "^3.1.1",
     "@types/boom": "^7.2.0",
     "@types/chance": "^1.0.0",
@@ -349,7 +353,7 @@
     "@types/react-router-dom": "^5.1.3",
     "@types/react-virtualized": "^9.18.7",
     "@types/redux": "^3.6.31",
-    "@types/redux-actions": "^2.2.1",
+    "@types/redux-actions": "^2.6.1",
     "@types/request": "^2.48.2",
     "@types/selenium-webdriver": "^4.0.5",
     "@types/semver": "^5.5.0",
@@ -364,8 +368,8 @@
     "@types/uuid": "^3.4.4",
     "@types/vinyl-fs": "^2.4.11",
     "@types/zen-observable": "^0.8.0",
-    "@typescript-eslint/eslint-plugin": "^2.10.0",
-    "@typescript-eslint/parser": "^2.10.0",
+    "@typescript-eslint/eslint-plugin": "^2.15.0",
+    "@typescript-eslint/parser": "^2.15.0",
     "angular-mocks": "^1.7.8",
     "archiver": "^3.1.1",
     "axe-core": "^3.3.2",
@@ -385,25 +389,25 @@
     "enzyme-adapter-react-16": "^1.15.1",
     "enzyme-adapter-utils": "^1.12.1",
     "enzyme-to-json": "^3.4.3",
-    "eslint": "^6.7.2",
-    "eslint-config-prettier": "^6.7.0",
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.9.0",
     "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-ban": "^1.3.0",
-    "eslint-plugin-cypress": "^2.8.0",
+    "eslint-plugin-ban": "^1.4.0",
+    "eslint-plugin-cypress": "^2.8.1",
     "eslint-plugin-import": "^2.19.1",
-    "eslint-plugin-jest": "^22.19.0",
+    "eslint-plugin-jest": "^23.3.0",
     "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-mocha": "^6.2.0",
+    "eslint-plugin-mocha": "^6.2.2",
     "eslint-plugin-no-unsanitized": "^3.0.2",
-    "eslint-plugin-node": "^10.0.0",
+    "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
     "eslint-plugin-prettier": "^3.1.2",
-    "eslint-plugin-react": "^7.16.0",
-    "eslint-plugin-react-hooks": "^2.1.2",
+    "eslint-plugin-react": "^7.17.0",
+    "eslint-plugin-react-hooks": "^2.3.0",
     "exit-hook": "^2.2.0",
     "faker": "1.1.0",
     "fetch-mock": "^7.3.9",
-    "geckodriver": "^1.19.1",
+    "geckodriver": "^1.19.0",
     "getopts": "^2.2.4",
     "grunt": "1.0.4",
     "grunt-available-tasks": "^0.6.3",
@@ -422,7 +426,7 @@
     "jest": "^24.9.0",
     "jest-cli": "^24.9.0",
     "jest-raw-loader": "^1.0.1",
-    "jimp": "0.9.3",
+    "jimp": "0.8.4",
     "json5": "^1.0.1",
     "karma": "3.1.4",
     "karma-chrome-launcher": "2.2.0",
@@ -453,7 +457,7 @@
     "regenerate": "^1.4.0",
     "sass-lint": "^1.12.1",
     "selenium-webdriver": "^4.0.0-alpha.5",
-    "simple-git": "1.129.0",
+    "simple-git": "1.116.0",
     "sinon": "^7.4.2",
     "strip-ansi": "^3.0.1",
     "supertest": "^3.1.0",
@@ -467,7 +471,7 @@
     "zlib": "^1.0.5"
   },
   "engines": {
-    "node": "10.15.2",
+    "node": "10.18.0",
     "yarn": "^1.21.1"
   }
 }
diff --git a/packages/elastic-datemath/package.json b/packages/elastic-datemath/package.json
index e41744311e3be..57873d28d372d 100644
--- a/packages/elastic-datemath/package.json
+++ b/packages/elastic-datemath/package.json
@@ -11,8 +11,8 @@
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.5",
-    "@babel/preset-env": "^7.7.6",
+    "@babel/cli": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
     "babel-plugin-add-module-exports": "^1.0.2",
     "moment": "^2.24.0"
   },
diff --git a/packages/eslint-config-kibana/package.json b/packages/eslint-config-kibana/package.json
index 2e72066fcbc68..34b1b0fec376f 100644
--- a/packages/eslint-config-kibana/package.json
+++ b/packages/eslint-config-kibana/package.json
@@ -15,19 +15,19 @@
   },
   "homepage": "https://github.com/elastic/eslint-config-kibana#readme",
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "^2.10.0",
-    "@typescript-eslint/parser": "^2.10.0",
+    "@typescript-eslint/eslint-plugin": "^2.15.0",
+    "@typescript-eslint/parser": "^2.15.0",
     "babel-eslint": "^10.0.3",
-    "eslint": "^6.7.2",
+    "eslint": "^6.8.0",
     "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-ban": "^1.3.0",
+    "eslint-plugin-ban": "^1.4.0",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-import": "^2.19.1",
-    "eslint-plugin-jest": "^22.19.0",
-    "eslint-plugin-mocha": "^6.2.0",
+    "eslint-plugin-jest": "^23.3.0",
+    "eslint-plugin-mocha": "^6.2.2",
     "eslint-plugin-no-unsanitized": "^3.0.2",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
-    "eslint-plugin-react": "^7.16.0",
-    "eslint-plugin-react-hooks": "^2.1.2"
+    "eslint-plugin-react": "^7.17.0",
+    "eslint-plugin-react-hooks": "^2.3.0"
   }
 }
diff --git a/packages/kbn-analytics/package.json b/packages/kbn-analytics/package.json
index 73f19690d4c7b..9eefa16aaca01 100644
--- a/packages/kbn-analytics/package.json
+++ b/packages/kbn-analytics/package.json
@@ -14,7 +14,7 @@
     "kbn:watch": "node scripts/build --source-maps --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.5",
+    "@babel/cli": "^7.5.5",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/babel-preset": "1.0.0",
     "typescript": "3.7.2"
diff --git a/packages/kbn-analytics/scripts/build.js b/packages/kbn-analytics/scripts/build.js
index b7fbe629246ec..bb28c1460c9c2 100644
--- a/packages/kbn-analytics/scripts/build.js
+++ b/packages/kbn-analytics/scripts/build.js
@@ -55,7 +55,9 @@ run(
               '--extensions',
               '.ts,.js,.tsx',
               ...(flags.watch ? ['--watch'] : ['--quiet']),
-              ...(flags['source-maps'] ? ['--source-maps', 'inline'] : []),
+              ...(!flags['source-maps'] || !!process.env.CODE_COVERAGE
+                ? []
+                : ['--source-maps', 'inline']),
             ],
             wait: true,
             env: {
diff --git a/packages/kbn-analytics/src/report.ts b/packages/kbn-analytics/src/report.ts
index 1c0b37966355f..16c0a3069e5fd 100644
--- a/packages/kbn-analytics/src/report.ts
+++ b/packages/kbn-analytics/src/report.ts
@@ -78,6 +78,7 @@ export class ReportManager {
   }
   assignReports(newMetrics: Metric | Metric[]) {
     wrapArray(newMetrics).forEach(newMetric => this.assignReport(this.report, newMetric));
+    return { report: this.report };
   }
   static createMetricKey(metric: Metric): string {
     switch (metric.type) {
@@ -101,7 +102,7 @@ export class ReportManager {
       case METRIC_TYPE.USER_AGENT: {
         const { appName, type, userAgent } = metric;
         if (userAgent) {
-          this.report.userAgent = {
+          report.userAgent = {
             [key]: {
               key,
               appName,
@@ -110,23 +111,22 @@ export class ReportManager {
             },
           };
         }
+
         return;
       }
       case METRIC_TYPE.CLICK:
       case METRIC_TYPE.LOADED:
       case METRIC_TYPE.COUNT: {
         const { appName, type, eventName, count } = metric;
-        if (report.uiStatsMetrics) {
-          const existingStats = (report.uiStatsMetrics[key] || {}).stats;
-          this.report.uiStatsMetrics = this.report.uiStatsMetrics || {};
-          this.report.uiStatsMetrics[key] = {
-            key,
-            appName,
-            eventName,
-            type,
-            stats: this.incrementStats(count, existingStats),
-          };
-        }
+        report.uiStatsMetrics = report.uiStatsMetrics || {};
+        const existingStats = (report.uiStatsMetrics[key] || {}).stats;
+        report.uiStatsMetrics[key] = {
+          key,
+          appName,
+          eventName,
+          type,
+          stats: this.incrementStats(count, existingStats),
+        };
         return;
       }
       default:
diff --git a/packages/kbn-babel-code-parser/package.json b/packages/kbn-babel-code-parser/package.json
index 8c7d51da791a5..a9d373d33ab38 100755
--- a/packages/kbn-babel-code-parser/package.json
+++ b/packages/kbn-babel-code-parser/package.json
@@ -15,12 +15,12 @@
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.5"
+    "@babel/cli": "^7.5.5"
   },
   "dependencies": {
     "@kbn/babel-preset": "1.0.0",
-    "@babel/parser": "^7.7.5",
-    "@babel/traverse": "^7.7.4",
+    "@babel/parser": "^7.5.5",
+    "@babel/traverse": "^7.5.5",
     "lodash": "^4.17.15"
   }
 }
diff --git a/packages/kbn-babel-preset/common_preset.js b/packages/kbn-babel-preset/common_preset.js
index 0de9318ea0c27..ea099aeda7408 100644
--- a/packages/kbn-babel-preset/common_preset.js
+++ b/packages/kbn-babel-preset/common_preset.js
@@ -37,20 +37,9 @@ const plugins = [
 ];
 
 module.exports = {
-  presets: [require.resolve('@babel/preset-typescript'), require.resolve('@babel/preset-react')],
-  plugins,
-  overrides: [
-    {
-      // Babel 7 don't support the namespace feature on typescript code.
-      // With namespaces only used for type declarations, we can securely
-      // strip them off for babel on x-pack infra/siem plugins
-      //
-      // See https://github.com/babel/babel/issues/8244#issuecomment-466548733
-      test: [
-        /x-pack[\/\\]legacy[\/\\]plugins[\/\\]infra[\/\\].*[\/\\]graphql/,
-        /x-pack[\/\\]legacy[\/\\]plugins[\/\\]siem[\/\\].*[\/\\]graphql/,
-      ],
-      plugins: [[require.resolve('babel-plugin-typescript-strip-namespaces')]],
-    },
+  presets: [
+    [require.resolve('@babel/preset-typescript'), { allowNamespaces: true }],
+    require.resolve('@babel/preset-react'),
   ],
+  plugins,
 };
diff --git a/packages/kbn-babel-preset/package.json b/packages/kbn-babel-preset/package.json
index 7c461fa146e8a..0acafbae59afd 100644
--- a/packages/kbn-babel-preset/package.json
+++ b/packages/kbn-babel-preset/package.json
@@ -4,18 +4,17 @@
   "version": "1.0.0",
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.7.4",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4",
-    "@babel/plugin-proposal-optional-chaining": "^7.7.5",
-    "@babel/plugin-syntax-dynamic-import": "^7.7.4",
-    "@babel/plugin-transform-modules-commonjs": "^7.7.5",
-    "@babel/preset-env": "^7.7.6",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/preset-typescript": "^7.3.3",
+    "@babel/plugin-proposal-class-properties": "^7.5.1",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
+    "@babel/plugin-proposal-optional-chaining": "^7.6.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.5.0",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/preset-react": "^7.7.4",
+    "@babel/preset-typescript": "^7.7.4",
     "babel-plugin-add-module-exports": "^1.0.2",
-    "babel-plugin-filter-imports": "^4.0.0",
+    "babel-plugin-filter-imports": "^3.0.0",
     "babel-plugin-styled-components": "^1.10.6",
-    "babel-plugin-transform-define": "^2.0.0",
-    "babel-plugin-typescript-strip-namespaces": "^1.1.1"
+    "babel-plugin-transform-define": "^1.3.1"
   }
 }
diff --git a/packages/kbn-config-schema/src/index.ts b/packages/kbn-config-schema/src/index.ts
index 56b3096433c24..fc3e3c541846a 100644
--- a/packages/kbn-config-schema/src/index.ts
+++ b/packages/kbn-config-schema/src/index.ts
@@ -59,6 +59,7 @@ import {
 
 export { ObjectType, TypeOf, Type };
 export { ByteSizeValue } from './byte_size_value';
+export { SchemaTypeError, ValidationError } from './errors';
 
 function any(options?: TypeOptions<any>) {
   return new AnyType(options);
diff --git a/packages/kbn-dev-utils/package.json b/packages/kbn-dev-utils/package.json
index 09753afeb120f..cef29f33962cd 100644
--- a/packages/kbn-dev-utils/package.json
+++ b/packages/kbn-dev-utils/package.json
@@ -15,6 +15,7 @@
     "execa": "^3.2.0",
     "exit-hook": "^2.2.0",
     "getopts": "^2.2.5",
+    "load-json-file": "^6.2.0",
     "moment": "^2.24.0",
     "rxjs": "^6.5.3",
     "tree-kill": "^1.2.1",
diff --git a/packages/kbn-dev-utils/src/index.ts b/packages/kbn-dev-utils/src/index.ts
index 7bd22d73df8d5..dc12613cf2a9e 100644
--- a/packages/kbn-dev-utils/src/index.ts
+++ b/packages/kbn-dev-utils/src/index.ts
@@ -27,6 +27,6 @@ export {
 export { createAbsolutePathSerializer } from './serializers';
 export { CA_CERT_PATH, ES_KEY_PATH, ES_CERT_PATH } from './certs';
 export { run, createFailError, createFlagError, combineErrors, isFailError, Flags } from './run';
-export { REPO_ROOT } from './constants';
+export { REPO_ROOT } from './repo_root';
 export { KbnClient } from './kbn_client';
 export * from './axios';
diff --git a/packages/kbn-dev-utils/src/repo_root.ts b/packages/kbn-dev-utils/src/repo_root.ts
new file mode 100644
index 0000000000000..b33b28d8d6e2f
--- /dev/null
+++ b/packages/kbn-dev-utils/src/repo_root.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 Path from 'path';
+import Fs from 'fs';
+
+import loadJsonFile from 'load-json-file';
+
+const isKibanaDir = (dir: string) => {
+  try {
+    const path = Path.resolve(dir, 'package.json');
+    const json = loadJsonFile.sync(path);
+    if (json && typeof json === 'object' && 'name' in json && json.name === 'kibana') {
+      return true;
+    }
+  } catch (error) {
+    if (error && error.code === 'ENOENT') {
+      return false;
+    }
+
+    throw error;
+  }
+};
+
+// search for the kibana directory, since this file is moved around it might
+// not be where we think but should always be a relatively close parent
+// of this directory
+const startDir = Fs.realpathSync(__dirname);
+const { root: rootDir } = Path.parse(startDir);
+let cursor = startDir;
+while (true) {
+  if (isKibanaDir(cursor)) {
+    break;
+  }
+
+  const parent = Path.dirname(cursor);
+  if (parent === rootDir) {
+    throw new Error(`unable to find kibana directory from ${startDir}`);
+  }
+  cursor = parent;
+}
+
+export const REPO_ROOT = cursor;
diff --git a/packages/kbn-dev-utils/src/run/README.md b/packages/kbn-dev-utils/src/run/README.md
index 913b601058f87..99893a6237668 100644
--- a/packages/kbn-dev-utils/src/run/README.md
+++ b/packages/kbn-dev-utils/src/run/README.md
@@ -117,7 +117,7 @@ $ node scripts/my_task
 
     - *`flags.allowUnexpected: boolean`*
 
-      By default, any flag that is passed but not mentioned in `flags.string`, `flags.boolean`, `flags.alias` or `flags.default` will trigger an error, preventing the run function from calling its first argument. If you have a reason to disable this behavior set this option to `true`.
+      By default, any flag that is passed but not mentioned in `flags.string`, `flags.boolean`, `flags.alias` or `flags.default` will trigger an error, preventing the run function from calling its first argument. If you have a reason to disable this behavior set this option to `true`. Unexpected flags will be collected from argv into `flags.unexpected`. To parse these flags and guess at their types, you can additionally pass `flags.guessTypesForUnexpectedFlags` but that's not recommended.
 
 
 - ***`createFailError(reason: string, options: { exitCode: number, showHelp: boolean }): FailError`***
diff --git a/packages/kbn-dev-utils/src/run/flags.test.ts b/packages/kbn-dev-utils/src/run/flags.test.ts
new file mode 100644
index 0000000000000..c730067a84f46
--- /dev/null
+++ b/packages/kbn-dev-utils/src/run/flags.test.ts
@@ -0,0 +1,94 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { getFlags } from './flags';
+
+it('gets flags correctly', () => {
+  expect(
+    getFlags(['-a', '--abc=bcd', '--foo=bar', '--no-bar', '--foo=baz', '--box', 'yes', '-zxy'], {
+      flags: {
+        boolean: ['x'],
+        string: ['abc'],
+        alias: {
+          x: 'extra',
+        },
+        allowUnexpected: true,
+      },
+    })
+  ).toMatchInlineSnapshot(`
+    Object {
+      "_": Array [],
+      "abc": "bcd",
+      "debug": false,
+      "extra": true,
+      "help": false,
+      "quiet": false,
+      "silent": false,
+      "unexpected": Array [
+        "-a",
+        "--foo=bar",
+        "--foo=baz",
+        "--no-bar",
+        "--box",
+        "yes",
+        "-z",
+        "-y",
+      ],
+      "v": false,
+      "verbose": false,
+      "x": true,
+    }
+  `);
+});
+
+it('guesses types for unexpected flags', () => {
+  expect(
+    getFlags(['-abc', '--abc=bcd', '--no-foo', '--bar'], {
+      flags: {
+        allowUnexpected: true,
+        guessTypesForUnexpectedFlags: true,
+      },
+    })
+  ).toMatchInlineSnapshot(`
+    Object {
+      "_": Array [],
+      "a": true,
+      "abc": "bcd",
+      "b": true,
+      "bar": true,
+      "c": true,
+      "debug": false,
+      "foo": false,
+      "help": false,
+      "quiet": false,
+      "silent": false,
+      "unexpected": Array [
+        "-a",
+        "-b",
+        "-c",
+        "-abc",
+        "--abc=bcd",
+        "--no-foo",
+        "--bar",
+      ],
+      "v": false,
+      "verbose": false,
+    }
+  `);
+});
diff --git a/packages/kbn-dev-utils/src/run/flags.ts b/packages/kbn-dev-utils/src/run/flags.ts
index 6a2966359ece1..c809a40d8512b 100644
--- a/packages/kbn-dev-utils/src/run/flags.ts
+++ b/packages/kbn-dev-utils/src/run/flags.ts
@@ -37,7 +37,7 @@ export interface Flags {
 }
 
 export function getFlags(argv: string[], options: Options): Flags {
-  const unexpected: string[] = [];
+  const unexpectedNames = new Set<string>();
   const flagOpts = options.flags || {};
 
   const { verbose, quiet, silent, debug, help, _, ...others } = getopts(argv, {
@@ -49,15 +49,64 @@ export function getFlags(argv: string[], options: Options): Flags {
     },
     default: flagOpts.default,
     unknown: (name: string) => {
-      unexpected.push(name);
+      unexpectedNames.add(name);
+      return flagOpts.guessTypesForUnexpectedFlags;
+    },
+  } as any);
+
+  const unexpected: string[] = [];
+  for (const unexpectedName of unexpectedNames) {
+    const matchingArgv: string[] = [];
+
+    iterArgv: for (const [i, v] of argv.entries()) {
+      for (const prefix of ['--', '-']) {
+        if (v.startsWith(prefix)) {
+          // -/--name=value
+          if (v.startsWith(`${prefix}${unexpectedName}=`)) {
+            matchingArgv.push(v);
+            continue iterArgv;
+          }
+
+          // -/--name (value possibly follows)
+          if (v === `${prefix}${unexpectedName}`) {
+            matchingArgv.push(v);
 
-      if (options.flags && options.flags.allowUnexpected) {
-        return true;
+            // value follows -/--name
+            if (argv.length > i + 1 && !argv[i + 1].startsWith('-')) {
+              matchingArgv.push(argv[i + 1]);
+            }
+
+            continue iterArgv;
+          }
+        }
       }
 
-      return false;
-    },
-  } as any);
+      // special case for `--no-{flag}` disabling of boolean flags
+      if (v === `--no-${unexpectedName}`) {
+        matchingArgv.push(v);
+        continue iterArgv;
+      }
+
+      // special case for shortcut flags formatted as `-abc` where `a`, `b`,
+      // and `c` will be three separate unexpected flags
+      if (
+        unexpectedName.length === 1 &&
+        v[0] === '-' &&
+        v[1] !== '-' &&
+        !v.includes('=') &&
+        v.includes(unexpectedName)
+      ) {
+        matchingArgv.push(`-${unexpectedName}`);
+        continue iterArgv;
+      }
+    }
+
+    if (matchingArgv.length) {
+      unexpected.push(...matchingArgv);
+    } else {
+      throw new Error(`unable to find unexpected flag named "${unexpectedName}"`);
+    }
+  }
 
   return {
     verbose,
@@ -75,7 +124,7 @@ export function getHelp(options: Options) {
   const usage = options.usage || `node ${relative(process.cwd(), process.argv[1])}`;
 
   const optionHelp = (
-    dedent((options.flags && options.flags.help) || '') +
+    dedent(options?.flags?.help || '') +
     '\n' +
     dedent`
       --verbose, -v      Log verbosely
diff --git a/packages/kbn-dev-utils/src/run/run.ts b/packages/kbn-dev-utils/src/run/run.ts
index 06746c663b917..1d28d43575729 100644
--- a/packages/kbn-dev-utils/src/run/run.ts
+++ b/packages/kbn-dev-utils/src/run/run.ts
@@ -36,6 +36,7 @@ export interface Options {
   description?: string;
   flags?: {
     allowUnexpected?: boolean;
+    guessTypesForUnexpectedFlags?: boolean;
     help?: string;
     alias?: { [key: string]: string | string[] };
     boolean?: string[];
@@ -46,7 +47,6 @@ export interface Options {
 
 export async function run(fn: RunFn, options: Options = {}) {
   const flags = getFlags(process.argv.slice(2), options);
-  const allowUnexpected = options.flags ? options.flags.allowUnexpected : false;
 
   if (flags.help) {
     process.stderr.write(getHelp(options));
@@ -97,7 +97,7 @@ export async function run(fn: RunFn, options: Options = {}) {
   const cleanupTasks: CleanupTask[] = [unhookExit];
 
   try {
-    if (!allowUnexpected && flags.unexpected.length) {
+    if (!options.flags?.allowUnexpected && flags.unexpected.length) {
       throw createFlagError(`Unknown flag(s) "${flags.unexpected.join('", "')}"`);
     }
 
diff --git a/packages/kbn-dev-utils/tsconfig.json b/packages/kbn-dev-utils/tsconfig.json
index 4c519a609d86f..0ec058eeb8a28 100644
--- a/packages/kbn-dev-utils/tsconfig.json
+++ b/packages/kbn-dev-utils/tsconfig.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "target",
     "target": "ES2019",
-    "declaration": true
+    "declaration": true,
+    "declarationMap": true
   },
   "include": [
     "src/**/*"
diff --git a/packages/kbn-es/package.json b/packages/kbn-es/package.json
index ccc396b5522e2..cb501dab3ddb7 100644
--- a/packages/kbn-es/package.json
+++ b/packages/kbn-es/package.json
@@ -15,7 +15,7 @@
     "getopts": "^2.2.4",
     "glob": "^7.1.2",
     "node-fetch": "^2.6.0",
-    "simple-git": "^1.129.0",
+    "simple-git": "^1.91.0",
     "tar-fs": "^1.16.3",
     "tree-kill": "^1.2.1",
     "yauzl": "^2.10.0"
diff --git a/packages/kbn-es/src/artifact.js b/packages/kbn-es/src/artifact.js
index 19d95e82fe480..9ea78386269d9 100644
--- a/packages/kbn-es/src/artifact.js
+++ b/packages/kbn-es/src/artifact.js
@@ -27,16 +27,14 @@ const { createHash } = require('crypto');
 const path = require('path');
 
 const asyncPipeline = promisify(pipeline);
-const V1_VERSIONS_API = 'https://artifacts-api.elastic.co/v1/versions';
+const DAILY_SNAPSHOTS_BASE_URL = 'https://storage.googleapis.com/kibana-ci-es-snapshots-daily';
+const PERMANENT_SNAPSHOTS_BASE_URL =
+  'https://storage.googleapis.com/kibana-ci-es-snapshots-permanent';
 
 const { cache } = require('./utils');
 const { resolveCustomSnapshotUrl } = require('./custom_snapshots');
 const { createCliError, isCliError } = require('./errors');
 
-const TEST_ES_SNAPSHOT_VERSION = process.env.TEST_ES_SNAPSHOT_VERSION
-  ? process.env.TEST_ES_SNAPSHOT_VERSION
-  : 'latest';
-
 function getChecksumType(checksumUrl) {
   if (checksumUrl.endsWith('.sha512')) {
     return 'sha512';
@@ -45,20 +43,6 @@ function getChecksumType(checksumUrl) {
   throw new Error(`unable to determine checksum type: ${checksumUrl}`);
 }
 
-function getPlatform(key) {
-  if (key.includes('-linux-')) {
-    return 'linux';
-  }
-
-  if (key.includes('-windows-')) {
-    return 'win32';
-  }
-
-  if (key.includes('-darwin-')) {
-    return 'darwin';
-  }
-}
-
 function headersToString(headers, indent = '') {
   return [...headers.entries()].reduce(
     (acc, [key, value]) => `${acc}\n${indent}${key}: ${value}`,
@@ -85,6 +69,75 @@ async function retry(log, fn) {
   return await doAttempt(1);
 }
 
+// Setting this flag provides an easy way to run the latest un-promoted snapshot without having to look it up
+function shouldUseUnverifiedSnapshot() {
+  return !!process.env.KBN_ES_SNAPSHOT_USE_UNVERIFIED;
+}
+
+async function fetchSnapshotManifest(url, log) {
+  log.info('Downloading snapshot manifest from %s', chalk.bold(url));
+
+  const abc = new AbortController();
+  const resp = await retry(log, async () => await fetch(url, { signal: abc.signal }));
+  const json = await resp.text();
+
+  return { abc, resp, json };
+}
+
+async function getArtifactSpecForSnapshot(urlVersion, license, log) {
+  const desiredVersion = urlVersion.replace('-SNAPSHOT', '');
+  const desiredLicense = license === 'oss' ? 'oss' : 'default';
+
+  const customManifestUrl = process.env.ES_SNAPSHOT_MANIFEST;
+  const primaryManifestUrl = `${DAILY_SNAPSHOTS_BASE_URL}/${desiredVersion}/manifest-latest${
+    shouldUseUnverifiedSnapshot() ? '' : '-verified'
+  }.json`;
+  const secondaryManifestUrl = `${PERMANENT_SNAPSHOTS_BASE_URL}/${desiredVersion}/manifest.json`;
+
+  let { abc, resp, json } = await fetchSnapshotManifest(
+    customManifestUrl || primaryManifestUrl,
+    log
+  );
+
+  if (!customManifestUrl && !shouldUseUnverifiedSnapshot() && resp.status === 404) {
+    log.info('Daily snapshot manifest not found, falling back to permanent manifest');
+    ({ abc, resp, json } = await fetchSnapshotManifest(secondaryManifestUrl, log));
+  }
+
+  if (resp.status === 404) {
+    abc.abort();
+    throw createCliError(`Snapshots for ${desiredVersion} are not available`);
+  }
+
+  if (!resp.ok) {
+    abc.abort();
+    throw new Error(`Unable to read snapshot manifest: ${resp.statusText}\n  ${json}`);
+  }
+
+  const manifest = JSON.parse(json);
+
+  const platform = process.platform === 'win32' ? 'windows' : process.platform;
+  const archive = manifest.archives.find(
+    archive =>
+      archive.version === desiredVersion &&
+      archive.platform === platform &&
+      archive.license === desiredLicense
+  );
+
+  if (!archive) {
+    throw createCliError(
+      `Snapshots for ${desiredVersion} are available, but couldn't find an artifact in the manifest for [${desiredVersion}, ${desiredLicense}, ${platform}]`
+    );
+  }
+
+  return {
+    url: archive.url,
+    checksumUrl: archive.url + '.sha512',
+    checksumType: 'sha512',
+    filename: archive.filename,
+  };
+}
+
 exports.Artifact = class Artifact {
   /**
    * Fetch an Artifact from the Artifact API for a license level and version
@@ -100,71 +153,7 @@ exports.Artifact = class Artifact {
       return new Artifact(customSnapshotArtifactSpec, log);
     }
 
-    const urlBuild = encodeURIComponent(TEST_ES_SNAPSHOT_VERSION);
-    const url = `${V1_VERSIONS_API}/${urlVersion}/builds/${urlBuild}/projects/elasticsearch`;
-
-    const json = await retry(log, async () => {
-      log.info('downloading artifact info from %s', chalk.bold(url));
-
-      const abc = new AbortController();
-      const resp = await fetch(url, { signal: abc.signal });
-      const json = await resp.text();
-
-      if (resp.status === 404) {
-        abc.abort();
-        throw createCliError(
-          `Snapshots for ${version}/${TEST_ES_SNAPSHOT_VERSION} are not available`
-        );
-      }
-
-      if (!resp.ok) {
-        abc.abort();
-        throw new Error(`Unable to read artifact info from ${url}: ${resp.statusText}\n  ${json}`);
-      }
-
-      return json;
-    });
-
-    // parse the api response into an array of Artifact objects
-    const {
-      project: { packages: artifactInfoMap },
-    } = JSON.parse(json);
-    const filenames = Object.keys(artifactInfoMap);
-    const hasNoJdkVersions = filenames.some(filename => filename.includes('-no-jdk-'));
-    const artifactSpecs = filenames.map(filename => ({
-      filename,
-      url: artifactInfoMap[filename].url,
-      checksumUrl: artifactInfoMap[filename].sha_url,
-      checksumType: getChecksumType(artifactInfoMap[filename].sha_url),
-      type: artifactInfoMap[filename].type,
-      isOss: filename.includes('-oss-'),
-      platform: getPlatform(filename),
-      jdkRequired: hasNoJdkVersions ? filename.includes('-no-jdk-') : true,
-    }));
-
-    // pick the artifact we are going to use for this license/version combo
-    const reqOss = license === 'oss';
-    const reqPlatform = artifactSpecs.some(a => a.platform !== undefined)
-      ? process.platform
-      : undefined;
-    const reqJdkRequired = hasNoJdkVersions ? false : true;
-    const reqType = process.platform === 'win32' ? 'zip' : 'tar';
-
-    const artifactSpec = artifactSpecs.find(
-      spec =>
-        spec.isOss === reqOss &&
-        spec.type === reqType &&
-        spec.platform === reqPlatform &&
-        spec.jdkRequired === reqJdkRequired
-    );
-
-    if (!artifactSpec) {
-      throw new Error(
-        `Unable to determine artifact for license [${license}] and version [${version}]\n` +
-          `  options: ${filenames.join(',')}`
-      );
-    }
-
+    const artifactSpec = await getArtifactSpecForSnapshot(urlVersion, license, log);
     return new Artifact(artifactSpec, log);
   }
 
diff --git a/packages/kbn-es/src/artifact.test.js b/packages/kbn-es/src/artifact.test.js
new file mode 100644
index 0000000000000..985b65c747563
--- /dev/null
+++ b/packages/kbn-es/src/artifact.test.js
@@ -0,0 +1,191 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ToolingLog } from '@kbn/dev-utils';
+jest.mock('node-fetch');
+import fetch from 'node-fetch';
+const { Response } = jest.requireActual('node-fetch');
+
+import { Artifact } from './artifact';
+
+const log = new ToolingLog();
+let MOCKS;
+
+const PLATFORM = process.platform === 'win32' ? 'windows' : process.platform;
+const MOCK_VERSION = 'test-version';
+const MOCK_URL = 'http://127.0.0.1:12345';
+const MOCK_FILENAME = 'test-filename';
+
+const DAILY_SNAPSHOT_BASE_URL = 'https://storage.googleapis.com/kibana-ci-es-snapshots-daily';
+const PERMANENT_SNAPSHOT_BASE_URL =
+  'https://storage.googleapis.com/kibana-ci-es-snapshots-permanent';
+
+const createArchive = (params = {}) => {
+  const license = params.license || 'default';
+
+  return {
+    license: 'default',
+    version: MOCK_VERSION,
+    url: MOCK_URL + `/${license}`,
+    platform: PLATFORM,
+    filename: MOCK_FILENAME + `.${license}`,
+    ...params,
+  };
+};
+
+const mockFetch = mock =>
+  fetch.mockReturnValue(Promise.resolve(new Response(JSON.stringify(mock))));
+
+let previousSnapshotManifestValue = null;
+
+beforeAll(() => {
+  if ('ES_SNAPSHOT_MANIFEST' in process.env) {
+    previousSnapshotManifestValue = process.env.ES_SNAPSHOT_MANIFEST;
+    delete process.env.ES_SNAPSHOT_MANIFEST;
+  }
+});
+
+afterAll(() => {
+  if (previousSnapshotManifestValue !== null) {
+    process.env.ES_SNAPSHOT_MANIFEST = previousSnapshotManifestValue;
+  } else {
+    delete process.env.ES_SNAPSHOT_MANIFEST;
+  }
+});
+
+beforeEach(() => {
+  jest.resetAllMocks();
+
+  MOCKS = {
+    valid: {
+      archives: [createArchive({ license: 'oss' }), createArchive({ license: 'default' })],
+    },
+  };
+});
+
+const artifactTest = (requestedLicense, expectedLicense, fetchTimesCalled = 1) => {
+  return async () => {
+    const artifact = await Artifact.getSnapshot(requestedLicense, MOCK_VERSION, log);
+    expect(fetch).toHaveBeenCalledTimes(fetchTimesCalled);
+    expect(fetch.mock.calls[0][0]).toEqual(
+      `${DAILY_SNAPSHOT_BASE_URL}/${MOCK_VERSION}/manifest-latest-verified.json`
+    );
+    if (fetchTimesCalled === 2) {
+      expect(fetch.mock.calls[1][0]).toEqual(
+        `${PERMANENT_SNAPSHOT_BASE_URL}/${MOCK_VERSION}/manifest.json`
+      );
+    }
+    expect(artifact.getUrl()).toEqual(MOCK_URL + `/${expectedLicense}`);
+    expect(artifact.getChecksumUrl()).toEqual(MOCK_URL + `/${expectedLicense}.sha512`);
+    expect(artifact.getChecksumType()).toEqual('sha512');
+    expect(artifact.getFilename()).toEqual(MOCK_FILENAME + `.${expectedLicense}`);
+  };
+};
+
+describe('Artifact', () => {
+  describe('getSnapshot()', () => {
+    describe('with default snapshot', () => {
+      beforeEach(() => {
+        mockFetch(MOCKS.valid);
+      });
+
+      it('should return artifact metadata for a daily oss artifact', artifactTest('oss', 'oss'));
+
+      it(
+        'should return artifact metadata for a daily default artifact',
+        artifactTest('default', 'default')
+      );
+
+      it(
+        'should default to default license with anything other than "oss"',
+        artifactTest('INVALID_LICENSE', 'default')
+      );
+
+      it('should throw when an artifact cannot be found in the manifest for the specified parameters', async () => {
+        await expect(Artifact.getSnapshot('default', 'INVALID_VERSION', log)).rejects.toThrow(
+          "couldn't find an artifact"
+        );
+      });
+    });
+
+    describe('with missing default snapshot', () => {
+      beforeEach(() => {
+        fetch.mockReturnValueOnce(Promise.resolve(new Response('', { status: 404 })));
+        mockFetch(MOCKS.valid);
+      });
+
+      it(
+        'should return artifact metadata for a permanent oss artifact',
+        artifactTest('oss', 'oss', 2)
+      );
+
+      it(
+        'should return artifact metadata for a permanent default artifact',
+        artifactTest('default', 'default', 2)
+      );
+
+      it(
+        'should default to default license with anything other than "oss"',
+        artifactTest('INVALID_LICENSE', 'default', 2)
+      );
+
+      it('should throw when an artifact cannot be found in the manifest for the specified parameters', async () => {
+        await expect(Artifact.getSnapshot('default', 'INVALID_VERSION', log)).rejects.toThrow(
+          "couldn't find an artifact"
+        );
+      });
+    });
+
+    describe('with custom snapshot manifest URL', () => {
+      const CUSTOM_URL = 'http://www.creedthoughts.gov.www/creedthoughts';
+
+      beforeEach(() => {
+        process.env.ES_SNAPSHOT_MANIFEST = CUSTOM_URL;
+        mockFetch(MOCKS.valid);
+      });
+
+      it('should use the custom URL when looking for a snapshot', async () => {
+        await Artifact.getSnapshot('oss', MOCK_VERSION, log);
+        expect(fetch.mock.calls[0][0]).toEqual(CUSTOM_URL);
+      });
+
+      afterEach(() => {
+        delete process.env.ES_SNAPSHOT_MANIFEST;
+      });
+    });
+
+    describe('with latest unverified snapshot', () => {
+      beforeEach(() => {
+        process.env.KBN_ES_SNAPSHOT_USE_UNVERIFIED = 1;
+        mockFetch(MOCKS.valid);
+      });
+
+      it('should use the daily unverified URL when looking for a snapshot', async () => {
+        await Artifact.getSnapshot('oss', MOCK_VERSION, log);
+        expect(fetch.mock.calls[0][0]).toEqual(
+          `${DAILY_SNAPSHOT_BASE_URL}/${MOCK_VERSION}/manifest-latest.json`
+        );
+      });
+
+      afterEach(() => {
+        delete process.env.KBN_ES_SNAPSHOT_USE_UNVERIFIED;
+      });
+    });
+  });
+});
diff --git a/packages/kbn-es/src/custom_snapshots.js b/packages/kbn-es/src/custom_snapshots.js
index 74de3c2c792fd..c6b00f77f0a88 100644
--- a/packages/kbn-es/src/custom_snapshots.js
+++ b/packages/kbn-es/src/custom_snapshots.js
@@ -25,8 +25,13 @@ function isVersionFlag(a) {
 
 function getCustomSnapshotUrl() {
   // force use of manually created snapshots until ReindexPutMappings fix
-  if (!process.env.KBN_ES_SNAPSHOT_URL && !process.argv.some(isVersionFlag)) {
-    return 'https://storage.googleapis.com/kibana-ci-tmp-artifacts/{name}-{version}-{os}-x86_64.{ext}';
+  if (
+    !process.env.ES_SNAPSHOT_MANIFEST &&
+    !process.env.KBN_ES_SNAPSHOT_URL &&
+    !process.argv.some(isVersionFlag)
+  ) {
+    // return 'https://storage.googleapis.com/kibana-ci-tmp-artifacts/{name}-{version}-{os}-x86_64.{ext}';
+    return;
   }
 
   if (process.env.KBN_ES_SNAPSHOT_URL && process.env.KBN_ES_SNAPSHOT_URL !== 'false') {
diff --git a/packages/kbn-eslint-plugin-eslint/package.json b/packages/kbn-eslint-plugin-eslint/package.json
index 70d6b0f017470..026938213ac83 100644
--- a/packages/kbn-eslint-plugin-eslint/package.json
+++ b/packages/kbn-eslint-plugin-eslint/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "license": "Apache-2.0",
   "peerDependencies": {
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "babel-eslint": "^10.0.3"
   },
   "dependencies": {
diff --git a/packages/kbn-i18n/package.json b/packages/kbn-i18n/package.json
index a3f5009f30dba..bbc5126da1dce 100644
--- a/packages/kbn-i18n/package.json
+++ b/packages/kbn-i18n/package.json
@@ -12,8 +12,8 @@
     "kbn:watch": "node scripts/build --watch --source-maps"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.5",
-    "@babel/core": "^7.7.5",
+    "@babel/cli": "^7.5.5",
+    "@babel/core": "^7.5.5",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@types/intl-relativeformat": "^2.1.0",
diff --git a/packages/kbn-i18n/scripts/build.js b/packages/kbn-i18n/scripts/build.js
index ccdddc87dbc18..0764451c74575 100644
--- a/packages/kbn-i18n/scripts/build.js
+++ b/packages/kbn-i18n/scripts/build.js
@@ -55,7 +55,9 @@ run(
               '--extensions',
               '.ts,.js,.tsx',
               ...(flags.watch ? ['--watch'] : ['--quiet']),
-              ...(flags['source-maps'] ? ['--source-maps', 'inline'] : []),
+              ...(!flags['source-maps'] || !!process.env.CODE_COVERAGE
+                ? []
+                : ['--source-maps', 'inline']),
             ],
             wait: true,
             env: {
diff --git a/packages/kbn-interpreter/package.json b/packages/kbn-interpreter/package.json
index 2e80276f59f91..27ef70d871856 100644
--- a/packages/kbn-interpreter/package.json
+++ b/packages/kbn-interpreter/package.json
@@ -9,16 +9,16 @@
     "kbn:watch": "node scripts/build --dev --watch"
   },
   "dependencies": {
-    "@babel/runtime": "^7.7.6",
+    "@babel/runtime": "^7.5.5",
     "@kbn/i18n": "1.0.0",
     "lodash": "npm:@elastic/lodash@3.10.1-kibana3",
     "lodash.clone": "^4.5.0",
     "uuid": "3.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.5",
-    "@babel/core": "^7.7.5",
-    "@babel/plugin-transform-runtime": "^7.7.6",
+    "@babel/cli": "^7.5.5",
+    "@babel/core": "^7.5.5",
+    "@babel/plugin-transform-runtime": "^7.5.5",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "babel-loader": "^8.0.6",
diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json
index 00f784bc2e18b..68af0aa791c8e 100644
--- a/packages/kbn-plugin-helpers/package.json
+++ b/packages/kbn-plugin-helpers/package.json
@@ -13,7 +13,7 @@
     "@kbn/babel-preset": "1.0.0"
   },
   "dependencies": {
-    "@babel/core": "^7.7.5",
+    "@babel/core": "^7.5.5",
     "argv-split": "^2.0.1",
     "commander": "^3.0.0",
     "del": "^5.1.0",
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index 91a0159d73660..c3f3f2f477fdd 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -94,21 +94,21 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _cli__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "run", function() { return _cli__WEBPACK_IMPORTED_MODULE_0__["run"]; });
 
-/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(484);
+/* harmony import */ var _production__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(703);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["buildProductionProjects"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return _production__WEBPACK_IMPORTED_MODULE_1__["prepareExternalProjectDependencies"]; });
 
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(36);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(501);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getProjects", function() { return _utils_projects__WEBPACK_IMPORTED_MODULE_2__["getProjects"]; });
 
-/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(54);
+/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(516);
 /* 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__(171);
+/* harmony import */ var _utils_workspaces__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(579);
 /* 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__(172);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(580);
 /* 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__(475);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(689);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(34);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
@@ -198,6 +198,7 @@ function help() {
        -i, --include          Include only specified projects. If left unspecified, it defaults to including all projects.
        --oss                  Do not include the x-pack when running command.
        --skip-kibana-plugins  Filter all plugins in ./plugins and ../kibana-extra when running command.
+       --no-cache             Disable the bootstrap cache
   `);
 }
 
@@ -216,7 +217,10 @@ async function run(argv) {
       h: 'help',
       i: 'include'
     },
-    boolean: ['prefer-offline', 'frozen-lockfile']
+    default: {
+      cache: true
+    },
+    boolean: ['prefer-offline', 'frozen-lockfile', 'cache']
   });
   const args = options._;
 
@@ -2502,9 +2506,9 @@ module.exports = require("path");
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "commands", function() { return commands; });
 /* harmony import */ var _bootstrap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
-/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(173);
-/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(272);
-/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(273);
+/* harmony import */ var _clean__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(587);
+/* harmony import */ var _run__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(686);
+/* harmony import */ var _watch__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(687);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -2545,8 +2549,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _utils_link_project_executables__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19);
 /* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34);
-/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(35);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(36);
+/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(500);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(501);
+/* harmony import */ var _utils_project_checksums__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(581);
+/* harmony import */ var _utils_bootstrap_cache_file__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(586);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -2570,12 +2576,15 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
 const BootstrapCommand = {
   description: 'Install dependencies and crosslink projects',
   name: 'bootstrap',
 
   async run(projects, projectGraph, {
-    options
+    options,
+    kbn
   }) {
     const batchedProjectsByWorkspace = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_4__["topologicallyBatchProjects"])(projects, projectGraph, {
       batchByWorkspace: true
@@ -2609,9 +2618,18 @@ const BootstrapCommand = {
      */
 
     _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold('\nLinking executables completed, running `kbn:bootstrap` scripts\n'));
-    await Object(_utils_parallelize__WEBPACK_IMPORTED_MODULE_3__["parallelizeBatches"])(batchedProjects, async pkg => {
-      if (pkg.hasScript('kbn:bootstrap')) {
-        await pkg.runScriptStreaming('kbn:bootstrap');
+    const checksums = options.cache ? await Object(_utils_project_checksums__WEBPACK_IMPORTED_MODULE_5__["getAllChecksums"])(kbn, _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"]) : false;
+    await Object(_utils_parallelize__WEBPACK_IMPORTED_MODULE_3__["parallelizeBatches"])(batchedProjects, async project => {
+      if (project.hasScript('kbn:bootstrap')) {
+        const cacheFile = new _utils_bootstrap_cache_file__WEBPACK_IMPORTED_MODULE_6__["BootstrapCacheFile"](kbn, project, checksums);
+
+        if (cacheFile.isValid()) {
+          _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].success(`[${project.name}] cache up to date`);
+        } else {
+          cacheFile.delete();
+          await project.runScriptStreaming('kbn:bootstrap');
+          cacheFile.write();
+        }
       }
     });
     _utils_log__WEBPACK_IMPORTED_MODULE_2__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green.bold('\nBootstrapping completed!\n'));
@@ -3084,11 +3102,25 @@ function times(n, ok, cb) {
 
 var fs = __webpack_require__(23)
 var polyfills = __webpack_require__(24)
-var legacy = __webpack_require__(27)
-var queue = []
+var legacy = __webpack_require__(26)
+var clone = __webpack_require__(28)
 
 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 noop () {}
 
 var debug = noop
@@ -3101,48 +3133,71 @@ else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || ''))
     console.error(m)
   }
 
-if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
-  process.on('exit', function() {
-    debug(queue)
-    __webpack_require__(30).equal(queue.length, 0)
+// 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
+    }
   })
-}
 
-module.exports = patch(__webpack_require__(25))
-if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH) {
-  module.exports = patch(fs)
-}
+  // 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()
+        }
 
-// Always patch fs.close/closeSync, because we want 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.
-module.exports.close =
-fs.close = (function (fs$close) { return function (fd, cb) {
-  return fs$close.call(fs, fd, function (err) {
-    if (!err)
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+      })
+    }
+
+    Object.defineProperty(close, previousSymbol, {
+      value: fs$close
+    })
+    return close
+  })(fs.close)
+
+  fs.closeSync = (function (fs$closeSync) {
+    function closeSync (fd) {
+      // This function uses the graceful-fs shared queue
+      fs$closeSync.apply(fs, arguments)
       retry()
+    }
 
-    if (typeof cb === 'function')
-      cb.apply(this, arguments)
-  })
-}})(fs.close)
+    Object.defineProperty(closeSync, previousSymbol, {
+      value: fs$closeSync
+    })
+    return closeSync
+  })(fs.closeSync)
 
-module.exports.closeSync =
-fs.closeSync = (function (fs$closeSync) { return function (fd) {
-  // Note that graceful-fs also retries when fs.closeSync() fails.
-  // Looks like a bug to me, although it's probably a harmless one.
-  var rval = fs$closeSync.apply(fs, arguments)
-  retry()
-  return rval
-}})(fs.closeSync)
+  if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
+    process.on('exit', function() {
+      debug(global[gracefulQueue])
+      __webpack_require__(30).equal(global[gracefulQueue].length, 0)
+    })
+  }
+}
+
+module.exports = patch(clone(fs))
+if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
+    module.exports = patch(fs)
+    fs.__patched = true;
+}
 
 function patch (fs) {
   // Everything that references the open() function needs to be in here
   polyfills(fs)
   fs.gracefulify = patch
-  fs.FileReadStream = ReadStream;  // Legacy name.
-  fs.FileWriteStream = WriteStream;  // Legacy name.
+
   fs.createReadStream = createReadStream
   fs.createWriteStream = createWriteStream
   var fs$readFile = fs.readFile
@@ -3228,6 +3283,7 @@ function patch (fs) {
 
       if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
         enqueue([go$readdir, [args]])
+
       else {
         if (typeof cb === 'function')
           cb.apply(this, arguments)
@@ -3247,15 +3303,61 @@ function patch (fs) {
   }
 
   var fs$ReadStream = fs.ReadStream
-  ReadStream.prototype = Object.create(fs$ReadStream.prototype)
-  ReadStream.prototype.open = ReadStream$open
+  if (fs$ReadStream) {
+    ReadStream.prototype = Object.create(fs$ReadStream.prototype)
+    ReadStream.prototype.open = ReadStream$open
+  }
 
   var fs$WriteStream = fs.WriteStream
-  WriteStream.prototype = Object.create(fs$WriteStream.prototype)
-  WriteStream.prototype.open = WriteStream$open
+  if (fs$WriteStream) {
+    WriteStream.prototype = Object.create(fs$WriteStream.prototype)
+    WriteStream.prototype.open = WriteStream$open
+  }
 
-  fs.ReadStream = ReadStream
-  fs.WriteStream = WriteStream
+  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
+  })
+
+  // legacy names
+  var FileReadStream = ReadStream
+  Object.defineProperty(fs, 'FileReadStream', {
+    get: function () {
+      return FileReadStream
+    },
+    set: function (val) {
+      FileReadStream = val
+    },
+    enumerable: true,
+    configurable: true
+  })
+  var FileWriteStream = WriteStream
+  Object.defineProperty(fs, 'FileWriteStream', {
+    get: function () {
+      return FileWriteStream
+    },
+    set: function (val) {
+      FileWriteStream = val
+    },
+    enumerable: true,
+    configurable: true
+  })
 
   function ReadStream (path, options) {
     if (this instanceof ReadStream)
@@ -3301,11 +3403,11 @@ function patch (fs) {
   }
 
   function createReadStream (path, options) {
-    return new ReadStream(path, options)
+    return new fs.ReadStream(path, options)
   }
 
   function createWriteStream (path, options) {
-    return new WriteStream(path, options)
+    return new fs.WriteStream(path, options)
   }
 
   var fs$open = fs.open
@@ -3334,11 +3436,11 @@ function patch (fs) {
 
 function enqueue (elem) {
   debug('ENQUEUE', elem[0].name, elem[1])
-  queue.push(elem)
+  global[gracefulQueue].push(elem)
 }
 
 function retry () {
-  var elem = queue.shift()
+  var elem = global[gracefulQueue].shift()
   if (elem) {
     debug('RETRY', elem[0].name, elem[1])
     elem[0].apply(null, elem[1])
@@ -3356,8 +3458,7 @@ module.exports = require("fs");
 /* 24 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(25)
-var constants = __webpack_require__(26)
+var constants = __webpack_require__(25)
 
 var origCwd = process.cwd
 var cwd = null
@@ -3474,20 +3575,26 @@ function patch (fs) {
   }
 
   // if read() returns EAGAIN, then just try it again.
-  fs.read = (function (fs$read) { return function (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)
+  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)
         }
-        callback_.apply(this, arguments)
       }
+      return fs$read.call(fs, fd, buffer, offset, length, position, callback)
     }
-    return fs$read.call(fs, fd, buffer, offset, length, position, callback)
-  }})(fs.read)
+
+    // This ensures `util.promisify` works as it does for native `fs.read`.
+    read.__proto__ = fs$read
+    return read
+  })(fs.read)
 
   fs.readSync = (function (fs$readSync) { return function (fd, buffer, offset, length, position) {
     var eagCounter = 0
@@ -3503,73 +3610,36 @@ function patch (fs) {
       }
     }
   }})(fs.readSync)
-}
-
-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)
 
-    // 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 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)
+  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
         }
-        fs.futimes(fd, at, mt, function (er) {
-          fs.close(fd, function (er2) {
-            if (cb) cb(er || er2)
+        // 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.lutimesSync = function (path, at, mt) {
-      var fd = fs.openSync(path, constants.O_SYMLINK)
-      var ret
+    fs.lchmodSync = function (path, mode) {
+      var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
+
+      // 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.futimesSync(fd, at, mt)
+        ret = fs.fchmodSync(fd, mode)
         threw = false
       } finally {
         if (threw) {
@@ -3582,151 +3652,167 @@ function patchLutimes (fs) {
       }
       return ret
     }
+  }
 
-  } else {
-    fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
-    fs.lutimesSync = function () {}
+  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)
+            })
+          })
+        })
+      }
+
+      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
+      }
+
+    } else {
+      fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
+      fs.lutimesSync = function () {}
+    }
   }
-}
 
-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)
-    })
+  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)
+      })
+    }
   }
-}
 
-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
+  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
+      }
     }
   }
-}
 
 
-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)
-    })
+  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)
+      })
+    }
   }
-}
 
-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
+  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
+      }
     }
   }
-}
 
+  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)
+    }
+  }
 
-function statFix (orig) {
-  if (!orig) return orig
-  // Older versions of Node erroneously returned signed integers for
-  // uid + gid.
-  return function (target, cb) {
-    return orig.call(fs, target, function (er, stats) {
-      if (!stats) return cb.apply(this, arguments)
+  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
-      if (cb) cb.apply(this, arguments)
-    })
+      return stats;
+    }
   }
-}
 
-function statFixSync (orig) {
-  if (!orig) return orig
-  // Older versions of Node erroneously returned signed integers for
-  // uid + gid.
-  return function (target) {
-    var stats = orig.call(fs, target)
-    if (stats.uid < 0) stats.uid += 0x100000000
-    if (stats.gid < 0) stats.gid += 0x100000000
-    return stats;
-  }
-}
+  // 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
 
-// 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 (er.code === "ENOSYS")
+      return true
 
-  if (er.code === "ENOSYS")
-    return true
+    var nonroot = !process.getuid || process.getuid() !== 0
+    if (nonroot) {
+      if (er.code === "EINVAL" || er.code === "EPERM")
+        return true
+    }
 
-  var nonroot = !process.getuid || process.getuid() !== 0
-  if (nonroot) {
-    if (er.code === "EINVAL" || er.code === "EPERM")
-      return true
+    return false
   }
-
-  return false
 }
 
 
 /***/ }),
 /* 25 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-var fs = __webpack_require__(23)
-
-module.exports = clone(fs)
-
-function clone (obj) {
-  if (obj === null || typeof obj !== 'object')
-    return obj
-
-  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
-}
-
-
-/***/ }),
-/* 26 */
 /***/ (function(module, exports) {
 
 module.exports = require("constants");
 
 /***/ }),
-/* 27 */
+/* 26 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var Stream = __webpack_require__(28).Stream
+var Stream = __webpack_require__(27).Stream
 
 module.exports = legacy
 
@@ -3847,11 +3933,37 @@ function legacy (fs) {
 
 
 /***/ }),
-/* 28 */
+/* 27 */
 /***/ (function(module, exports) {
 
 module.exports = require("stream");
 
+/***/ }),
+/* 28 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = clone
+
+function clone (obj) {
+  if (obj === null || typeof obj !== 'object')
+    return obj
+
+  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
+}
+
+
 /***/ }),
 /* 29 */
 /***/ (function(module, exports) {
@@ -4300,6 +4412,10 @@ function ncp (source, dest, options, callback) {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "log", function() { return log; });
+/* harmony import */ var _kbn_dev_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(35);
+/* harmony import */ var _kbn_dev_utils__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_kbn_dev_utils__WEBPACK_IMPORTED_MODULE_0__);
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -4318,27 +4434,304 @@ __webpack_require__.r(__webpack_exports__);
  * specific language governing permissions and limitations
  * under the License.
  */
-const log = {
+
+
+class Log extends _kbn_dev_utils__WEBPACK_IMPORTED_MODULE_0__["ToolingLog"] {
+  constructor() {
+    super({
+      level: 'info',
+      writeTo: process.stdout
+    });
+
+    _defineProperty(this, "testWriter", void 0);
+  }
   /**
    * Log something to the console. Ideally we would use a real logger in
    * kbn-pm, but that's a pretty big change for now.
    * @param  ...args
    */
+
+
   write(...args) {
     // eslint-disable-next-line no-console
     console.log(...args);
   }
 
-};
+}
+
+const log = new Log();
 
 /***/ }),
 /* 35 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+var proc_runner_1 = __webpack_require__(37);
+exports.withProcRunner = proc_runner_1.withProcRunner;
+var tooling_log_1 = __webpack_require__(415);
+exports.ToolingLog = tooling_log_1.ToolingLog;
+exports.ToolingLogTextWriter = tooling_log_1.ToolingLogTextWriter;
+exports.pickLevelFromFlags = tooling_log_1.pickLevelFromFlags;
+exports.ToolingLogCollectingWriter = tooling_log_1.ToolingLogCollectingWriter;
+var serializers_1 = __webpack_require__(420);
+exports.createAbsolutePathSerializer = serializers_1.createAbsolutePathSerializer;
+var certs_1 = __webpack_require__(422);
+exports.CA_CERT_PATH = certs_1.CA_CERT_PATH;
+exports.ES_KEY_PATH = certs_1.ES_KEY_PATH;
+exports.ES_CERT_PATH = certs_1.ES_CERT_PATH;
+var run_1 = __webpack_require__(423);
+exports.run = run_1.run;
+exports.createFailError = run_1.createFailError;
+exports.createFlagError = run_1.createFlagError;
+exports.combineErrors = run_1.combineErrors;
+exports.isFailError = run_1.isFailError;
+var repo_root_1 = __webpack_require__(428);
+exports.REPO_ROOT = repo_root_1.REPO_ROOT;
+var kbn_client_1 = __webpack_require__(451);
+exports.KbnClient = kbn_client_1.KbnClient;
+tslib_1.__exportStar(__webpack_require__(493), exports);
+
+
+/***/ }),
+/* 36 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parallelizeBatches", function() { return parallelizeBatches; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parallelize", function() { return parallelize; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__extends", function() { return __extends; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__assign", function() { return __assign; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__rest", function() { return __rest; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__decorate", function() { return __decorate; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__param", function() { return __param; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__metadata", function() { return __metadata; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__awaiter", function() { return __awaiter; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__generator", function() { return __generator; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__exportStar", function() { return __exportStar; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncValues", function() { return __asyncValues; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__makeTemplateObject", function() { return __makeTemplateObject; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__importStar", function() { return __importStar; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__importDefault", function() { return __importDefault; });
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+/* global Reflect, Promise */
+
+var extendStatics = function(d, b) {
+    extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return extendStatics(d, b);
+};
+
+function __extends(d, b) {
+    extendStatics(d, b);
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+}
+
+var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    }
+    return __assign.apply(this, arguments);
+}
+
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+}
+
+function __decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+
+function __param(paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+}
+
+function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+}
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+function __generator(thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+}
+
+function __exportStar(m, exports) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+
+function __values(o) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+    if (m) return m.call(o);
+    return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+}
+
+function __read(o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+}
+
+function __spread() {
+    for (var ar = [], i = 0; i < arguments.length; i++)
+        ar = ar.concat(__read(arguments[i]));
+    return ar;
+}
+
+function __await(v) {
+    return this instanceof __await ? (this.v = v, this) : new __await(v);
+}
+
+function __asyncGenerator(thisArg, _arguments, generator) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var g = generator.apply(thisArg, _arguments || []), i, q = [];
+    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+    function fulfill(value) { resume("next", value); }
+    function reject(value) { resume("throw", value); }
+    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+}
+
+function __asyncDelegator(o) {
+    var i, p;
+    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+}
+
+function __asyncValues(o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+}
+
+function __makeTemplateObject(cooked, raw) {
+    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+    return cooked;
+};
+
+function __importStar(mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result.default = mod;
+    return result;
+}
+
+function __importDefault(mod) {
+    return (mod && mod.__esModule) ? mod : { default: mod };
+}
+
+
+/***/ }),
+/* 37 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -4357,65 +4750,64 @@ __webpack_require__.r(__webpack_exports__);
  * specific language governing permissions and limitations
  * under the License.
  */
-async function parallelizeBatches(batches, fn) {
-  for (const batch of batches) {
-    // We need to make sure the entire batch has completed before we can move on
-    // to the next batch
-    await parallelize(batch, fn);
-  }
-}
-async function parallelize(items, fn, concurrency = 4) {
-  if (items.length === 0) {
-    return;
-  }
+Object.defineProperty(exports, "__esModule", { value: true });
+var with_proc_runner_1 = __webpack_require__(38);
+exports.withProcRunner = with_proc_runner_1.withProcRunner;
 
-  return new Promise((resolve, reject) => {
-    let activePromises = 0;
-    const values = items.slice(0);
 
-    async function scheduleItem(item) {
-      activePromises++;
+/***/ }),
+/* 38 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      try {
-        await fn(item);
-        activePromises--;
+"use strict";
 
-        if (values.length > 0) {
-          // We have more work to do, so we schedule the next promise
-          scheduleItem(values.shift());
-        } else if (activePromises === 0) {
-          // We have no more values left, and all items have completed, so we've
-          // completed all the work.
-          resolve();
-        }
-      } catch (error) {
-        reject(error);
-      }
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const proc_runner_1 = __webpack_require__(39);
+/**
+ *  Create a ProcRunner and pass it to an async function. When
+ *  the async function finishes the ProcRunner is torn-down
+ *  automatically
+ *
+ *  @param  {ToolingLog} log
+ *  @param  {async Function} fn
+ *  @return {Promise<undefined>}
+ */
+async function withProcRunner(log, fn) {
+    const procs = new proc_runner_1.ProcRunner(log);
+    try {
+        await fn(procs);
+    }
+    finally {
+        await procs.teardown();
     }
-
-    values.splice(0, concurrency).map(scheduleItem);
-  });
 }
+exports.withProcRunner = withProcRunner;
+
 
 /***/ }),
-/* 36 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 39 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getProjects", function() { return getProjects; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProjectGraph", function() { return buildProjectGraph; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "topologicallyBatchProjects", function() { return topologicallyBatchProjects; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "includeTransitiveProjects", function() { return includeTransitiveProjects; });
-/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(37);
-/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(glob__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(16);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(53);
-/* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(54);
-/* 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
@@ -4434,17150 +4826,51817 @@ __webpack_require__.r(__webpack_exports__);
  * specific language governing permissions and limitations
  * under the License.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+const moment_1 = tslib_1.__importDefault(__webpack_require__(40));
+const operators_1 = __webpack_require__(169);
+const exit_hook_1 = tslib_1.__importDefault(__webpack_require__(348));
+const errors_1 = __webpack_require__(349);
+const proc_1 = __webpack_require__(350);
+const noop = () => { };
+/**
+ *  Helper for starting and managing processes. In many ways it resembles the
+ *  API from `grunt_run`, processes are named and can be started, waited for,
+ *  backgrounded once they log something matching a RegExp...
+ *
+ *  @class ProcRunner
+ */
+class ProcRunner {
+    constructor(log) {
+        this.log = log;
+        this.closing = false;
+        this.procs = [];
+        this.signalUnsubscribe = exit_hook_1.default(() => {
+            this.teardown().catch(error => {
+                log.error(`ProcRunner teardown error: ${error.stack}`);
+            });
+        });
+    }
+    /**
+     *  Start a process, tracking it by `name`
+     *  @param  {String}  name
+     *  @param  {Object}  options
+     *  @property {String} options.cmd executable to run
+     *  @property {Array<String>?} options.args arguments to provide the executable
+     *  @property {String?} options.cwd current working directory for the process
+     *  @property {RegExp|Boolean} options.wait Should start() wait for some time? Use
+     *                                          `true` will wait until the proc exits,
+     *                                          a `RegExp` will wait until that log line
+     *                                          is found
+     *  @return {Promise<undefined>}
+     */
+    async run(name, options) {
+        const { cmd, args = [], cwd = process.cwd(), stdin = undefined, wait = false, env = process.env, } = options;
+        if (this.closing) {
+            throw new Error('ProcRunner is closing');
+        }
+        if (wait && !(wait instanceof RegExp) && wait !== true) {
+            throw new TypeError('wait param should either be a RegExp or `true`');
+        }
+        if (!!this.getProc(name)) {
+            throw new Error(`Process with name "${name}" already running`);
+        }
+        const proc = this.startProc(name, {
+            cmd,
+            args,
+            cwd,
+            env,
+            stdin,
+        });
+        try {
+            if (wait instanceof RegExp) {
+                // wait for process to log matching line
+                await proc.lines$
+                    .pipe(operators_1.filter(line => wait.test(line)), operators_1.first(), operators_1.catchError(err => {
+                    if (err.name !== 'EmptyError') {
+                        throw errors_1.createCliError(`[${name}] exited without matching pattern: ${wait}`);
+                    }
+                    else {
+                        throw err;
+                    }
+                }))
+                    .toPromise();
+            }
+            if (wait === true) {
+                // wait for process to complete
+                await proc.outcomePromise;
+            }
+        }
+        finally {
+            // while the procRunner closes promises will resolve/reject because
+            // processes and stopping, but consumers of run() shouldn't have to
+            // prepare for that, so just return a never-resolving promise
+            if (this.closing) {
+                await new Promise(noop);
+            }
+        }
+    }
+    /**
+     *  Stop a named proc
+     */
+    async stop(name, signal = 'SIGTERM') {
+        const proc = this.getProc(name);
+        if (proc) {
+            await proc.stop(signal);
+        }
+        else {
+            this.log.warning('[%s] already stopped', name);
+        }
+    }
+    /**
+     *  Wait for all running processes to stop naturally
+     *  @return {Promise<undefined>}
+     */
+    async waitForAllToStop() {
+        await Promise.all(this.procs.map(proc => proc.outcomePromise));
+    }
+    /**
+     *  Close the ProcRunner and stop all running
+     *  processes with `signal`
+     *
+     *  @param  {String} [signal=undefined]
+     *  @return {Promise}
+     */
+    async teardown(signal = 'exit') {
+        if (this.closing) {
+            return;
+        }
+        this.closing = true;
+        this.signalUnsubscribe();
+        if (!signal && this.procs.length > 0) {
+            this.log.warning('%d processes left running, stop them with procs.stop(name):', this.procs.length, this.procs.map(proc => proc.name));
+        }
+        await Promise.all(this.procs.map(async (proc) => {
+            await proc.stop(signal === 'exit' ? 'SIGKILL' : signal);
+        }));
+    }
+    getProc(name) {
+        return this.procs.find(proc => {
+            return proc.name === name;
+        });
+    }
+    startProc(name, options) {
+        const startMs = Date.now();
+        const proc = proc_1.startProc(name, options, this.log);
+        this.procs.push(proc);
+        const remove = () => {
+            this.procs.splice(this.procs.indexOf(proc), 1);
+        };
+        // tie into proc outcome$, remove from _procs on compete
+        proc.outcome$.subscribe({
+            next: code => {
+                const duration = moment_1.default.duration(Date.now() - startMs);
+                this.log.info('[%s] exited with %s after %s', name, code, duration.humanize());
+            },
+            complete: () => {
+                remove();
+            },
+            error: error => {
+                if (this.closing) {
+                    this.log.error(error);
+                }
+                remove();
+            },
+        });
+        return proc;
+    }
+}
+exports.ProcRunner = ProcRunner;
 
 
+/***/ }),
+/* 40 */
+/***/ (function(module, exports, __webpack_require__) {
 
+/* WEBPACK VAR INJECTION */(function(module) {var require;//! moment.js
 
+;(function (global, factory) {
+     true ? module.exports = factory() :
+    undefined
+}(this, (function () { 'use strict';
 
+    var hookCallback;
 
-const glob = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(glob__WEBPACK_IMPORTED_MODULE_0___default.a);
-async function getProjects(rootPath, projectsPathsPatterns, {
-  include = [],
-  exclude = []
-} = {}) {
-  const projects = new Map();
-  const workspaceProjectsPaths = await Object(_workspaces__WEBPACK_IMPORTED_MODULE_5__["workspacePackagePaths"])(rootPath);
+    function hooks () {
+        return hookCallback.apply(null, arguments);
+    }
 
-  for (const pattern of projectsPathsPatterns) {
-    const pathsToProcess = await packagesFromGlobPattern({
-      pattern,
-      rootPath
-    });
+    // This is done to register the method called with moment()
+    // without creating circular dependencies.
+    function setHookCallback (callback) {
+        hookCallback = callback;
+    }
 
-    for (const filePath of pathsToProcess) {
-      const projectConfigPath = normalize(filePath);
-      const projectDir = path__WEBPACK_IMPORTED_MODULE_1___default.a.dirname(projectConfigPath);
-      const project = await _project__WEBPACK_IMPORTED_MODULE_4__["Project"].fromPath(projectDir);
+    function isArray(input) {
+        return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';
+    }
 
-      if (workspaceProjectsPaths.indexOf(filePath) >= 0) {
-        project.isWorkspaceProject = true;
-      }
+    function isObject(input) {
+        // IE8 will treat undefined and null as object if it wasn't for
+        // input != null
+        return input != null && Object.prototype.toString.call(input) === '[object Object]';
+    }
 
-      const excludeProject = exclude.includes(project.name) || include.length > 0 && !include.includes(project.name);
+    function isObjectEmpty(obj) {
+        if (Object.getOwnPropertyNames) {
+            return (Object.getOwnPropertyNames(obj).length === 0);
+        } else {
+            var k;
+            for (k in obj) {
+                if (obj.hasOwnProperty(k)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
 
-      if (excludeProject) {
-        continue;
-      }
+    function isUndefined(input) {
+        return input === void 0;
+    }
 
-      if (projects.has(project.name)) {
-        throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](`There are multiple projects with the same name [${project.name}]`, {
-          name: project.name,
-          paths: [project.path, projects.get(project.name).path]
-        });
-      }
+    function isNumber(input) {
+        return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]';
+    }
 
-      projects.set(project.name, project);
+    function isDate(input) {
+        return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
     }
-  }
 
-  return projects;
-}
+    function map(arr, fn) {
+        var res = [], i;
+        for (i = 0; i < arr.length; ++i) {
+            res.push(fn(arr[i], i));
+        }
+        return res;
+    }
 
-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);
-} // https://github.com/isaacs/node-glob/blob/master/common.js#L104
-// glob always returns "\\" as "/" in windows, so everyone
-// gets normalized because we can't have nice things.
+    function hasOwnProp(a, b) {
+        return Object.prototype.hasOwnProperty.call(a, b);
+    }
 
+    function extend(a, b) {
+        for (var i in b) {
+            if (hasOwnProp(b, i)) {
+                a[i] = b[i];
+            }
+        }
 
-function normalize(dir) {
-  return path__WEBPACK_IMPORTED_MODULE_1___default.a.normalize(dir);
-}
+        if (hasOwnProp(b, 'toString')) {
+            a.toString = b.toString;
+        }
 
-function buildProjectGraph(projects) {
-  const projectGraph = new Map();
+        if (hasOwnProp(b, 'valueOf')) {
+            a.valueOf = b.valueOf;
+        }
 
-  for (const project of projects.values()) {
-    const projectDeps = [];
-    const dependencies = project.allDependencies;
+        return a;
+    }
 
-    for (const depName of Object.keys(dependencies)) {
-      if (projects.has(depName)) {
-        const dep = projects.get(depName);
-        const dependentProjectIsInWorkspace = project.isWorkspaceProject || project.json.name === 'kibana';
-        project.ensureValidProjectDependency(dep, dependentProjectIsInWorkspace);
-        projectDeps.push(dep);
-      }
+    function createUTC (input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, true).utc();
     }
 
-    projectGraph.set(project.name, projectDeps);
-  }
+    function defaultParsingFlags() {
+        // We need to deep clone this object.
+        return {
+            empty           : false,
+            unusedTokens    : [],
+            unusedInput     : [],
+            overflow        : -2,
+            charsLeftOver   : 0,
+            nullInput       : false,
+            invalidMonth    : null,
+            invalidFormat   : false,
+            userInvalidated : false,
+            iso             : false,
+            parsedDateParts : [],
+            meridiem        : null,
+            rfc2822         : false,
+            weekdayMismatch : false
+        };
+    }
 
-  return projectGraph;
-}
-function topologicallyBatchProjects(projectsToBatch, projectGraph, {
-  batchByWorkspace = false
-} = {}) {
-  // We're going to be chopping stuff out of this list, so copy it.
-  const projectsLeftToBatch = new Set(projectsToBatch.keys());
-  const batches = [];
+    function getParsingFlags(m) {
+        if (m._pf == null) {
+            m._pf = defaultParsingFlags();
+        }
+        return m._pf;
+    }
 
-  if (batchByWorkspace) {
-    const workspaceRootProject = Array.from(projectsToBatch.values()).find(p => p.isWorkspaceRoot);
+    var some;
+    if (Array.prototype.some) {
+        some = Array.prototype.some;
+    } else {
+        some = function (fun) {
+            var t = Object(this);
+            var len = t.length >>> 0;
 
-    if (!workspaceRootProject) {
-      throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](`There was no yarn workspace root found.`);
-    } // Push in the workspace root first.
+            for (var i = 0; i < len; i++) {
+                if (i in t && fun.call(this, t[i], i, t)) {
+                    return true;
+                }
+            }
 
+            return false;
+        };
+    }
 
-    batches.push([workspaceRootProject]);
-    projectsLeftToBatch.delete(workspaceRootProject.name); // In the next batch, push in all workspace projects.
+    function isValid(m) {
+        if (m._isValid == null) {
+            var flags = getParsingFlags(m);
+            var parsedParts = some.call(flags.parsedDateParts, function (i) {
+                return i != null;
+            });
+            var isNowValid = !isNaN(m._d.getTime()) &&
+                flags.overflow < 0 &&
+                !flags.empty &&
+                !flags.invalidMonth &&
+                !flags.invalidWeekday &&
+                !flags.weekdayMismatch &&
+                !flags.nullInput &&
+                !flags.invalidFormat &&
+                !flags.userInvalidated &&
+                (!flags.meridiem || (flags.meridiem && parsedParts));
+
+            if (m._strict) {
+                isNowValid = isNowValid &&
+                    flags.charsLeftOver === 0 &&
+                    flags.unusedTokens.length === 0 &&
+                    flags.bigHour === undefined;
+            }
 
-    const workspaceBatch = [];
+            if (Object.isFrozen == null || !Object.isFrozen(m)) {
+                m._isValid = isNowValid;
+            }
+            else {
+                return isNowValid;
+            }
+        }
+        return m._isValid;
+    }
 
-    for (const projectName of projectsLeftToBatch) {
-      const project = projectsToBatch.get(projectName);
+    function createInvalid (flags) {
+        var m = createUTC(NaN);
+        if (flags != null) {
+            extend(getParsingFlags(m), flags);
+        }
+        else {
+            getParsingFlags(m).userInvalidated = true;
+        }
 
-      if (project.isWorkspaceProject) {
-        workspaceBatch.push(project);
-        projectsLeftToBatch.delete(projectName);
-      }
+        return m;
     }
 
-    batches.push(workspaceBatch);
-  }
+    // Plugins that add properties should also add the key here (null value),
+    // so we can properly clone ourselves.
+    var momentProperties = hooks.momentProperties = [];
 
-  while (projectsLeftToBatch.size > 0) {
-    // Get all projects that have no remaining dependencies within the repo
-    // that haven't yet been picked.
-    const batch = [];
+    function copyConfig(to, from) {
+        var i, prop, val;
 
-    for (const projectName of projectsLeftToBatch) {
-      const projectDeps = projectGraph.get(projectName);
-      const needsDependenciesBatched = projectDeps.some(dep => projectsLeftToBatch.has(dep.name));
+        if (!isUndefined(from._isAMomentObject)) {
+            to._isAMomentObject = from._isAMomentObject;
+        }
+        if (!isUndefined(from._i)) {
+            to._i = from._i;
+        }
+        if (!isUndefined(from._f)) {
+            to._f = from._f;
+        }
+        if (!isUndefined(from._l)) {
+            to._l = from._l;
+        }
+        if (!isUndefined(from._strict)) {
+            to._strict = from._strict;
+        }
+        if (!isUndefined(from._tzm)) {
+            to._tzm = from._tzm;
+        }
+        if (!isUndefined(from._isUTC)) {
+            to._isUTC = from._isUTC;
+        }
+        if (!isUndefined(from._offset)) {
+            to._offset = from._offset;
+        }
+        if (!isUndefined(from._pf)) {
+            to._pf = getParsingFlags(from);
+        }
+        if (!isUndefined(from._locale)) {
+            to._locale = from._locale;
+        }
 
-      if (!needsDependenciesBatched) {
-        batch.push(projectsToBatch.get(projectName));
-      }
-    } // If we weren't able to find a project with no remaining dependencies,
-    // then we've encountered a cycle in the dependency graph.
+        if (momentProperties.length > 0) {
+            for (i = 0; i < momentProperties.length; i++) {
+                prop = momentProperties[i];
+                val = from[prop];
+                if (!isUndefined(val)) {
+                    to[prop] = val;
+                }
+            }
+        }
 
+        return to;
+    }
 
-    const hasCycles = batch.length === 0;
+    var updateInProgress = false;
 
-    if (hasCycles) {
-      const cycleProjectNames = [...projectsLeftToBatch];
-      const message = 'Encountered a cycle in the dependency graph. Projects in cycle are:\n' + cycleProjectNames.join(', ');
-      throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](message);
+    // Moment prototype object
+    function Moment(config) {
+        copyConfig(this, config);
+        this._d = new Date(config._d != null ? config._d.getTime() : NaN);
+        if (!this.isValid()) {
+            this._d = new Date(NaN);
+        }
+        // Prevent infinite loop in case updateOffset creates new moment
+        // objects.
+        if (updateInProgress === false) {
+            updateInProgress = true;
+            hooks.updateOffset(this);
+            updateInProgress = false;
+        }
     }
 
-    batches.push(batch);
-    batch.forEach(project => projectsLeftToBatch.delete(project.name));
-  }
+    function isMoment (obj) {
+        return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
+    }
 
-  return batches;
-}
-function includeTransitiveProjects(subsetOfProjects, allProjects, {
-  onlyProductionDependencies = false
-} = {}) {
-  const dependentProjects = new Map(); // the current list of packages we are expanding using breadth-first-search
+    function absFloor (number) {
+        if (number < 0) {
+            // -0 -> 0
+            return Math.ceil(number) || 0;
+        } else {
+            return Math.floor(number);
+        }
+    }
 
-  const toProcess = [...subsetOfProjects];
+    function toInt(argumentForCoercion) {
+        var coercedNumber = +argumentForCoercion,
+            value = 0;
 
-  while (toProcess.length > 0) {
-    const project = toProcess.shift();
-    const dependencies = onlyProductionDependencies ? project.productionDependencies : project.allDependencies;
-    Object.keys(dependencies).forEach(dep => {
-      if (allProjects.has(dep)) {
-        toProcess.push(allProjects.get(dep));
-      }
-    });
-    dependentProjects.set(project.name, project);
-  }
+        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
+            value = absFloor(coercedNumber);
+        }
 
-  return dependentProjects;
-}
+        return value;
+    }
 
-/***/ }),
-/* 37 */
-/***/ (function(module, exports, __webpack_require__) {
+    // compare two arrays, return the number of differences
+    function compareArrays(array1, array2, dontConvert) {
+        var len = Math.min(array1.length, array2.length),
+            lengthDiff = Math.abs(array1.length - array2.length),
+            diffs = 0,
+            i;
+        for (i = 0; i < len; i++) {
+            if ((dontConvert && array1[i] !== array2[i]) ||
+                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
+                diffs++;
+            }
+        }
+        return diffs + lengthDiff;
+    }
 
-// Approach:
-//
-// 1. Get the minimatch set
-// 2. For each pattern in the set, PROCESS(pattern, false)
-// 3. Store matches per-set, then uniq them
-//
-// PROCESS(pattern, inGlobStar)
-// Get the first [n] items from pattern that are all strings
-// Join these together.  This is PREFIX.
-//   If there is no more remaining, then stat(PREFIX) and
-//   add to matches if it succeeds.  END.
-//
-// If inGlobStar and PREFIX is symlink and points to dir
-//   set ENTRIES = []
-// else readdir(PREFIX) as ENTRIES
-//   If fail, END
-//
-// with ENTRIES
-//   If pattern[n] is GLOBSTAR
-//     // handle the case where the globstar match is empty
-//     // by pruning it out, and testing the resulting pattern
-//     PROCESS(pattern[0..n] + pattern[n+1 .. $], false)
-//     // handle other cases.
-//     for ENTRY in ENTRIES (not dotfiles)
-//       // attach globstar + tail onto the entry
-//       // Mark that this entry is a globstar match
-//       PROCESS(pattern[0..n] + ENTRY + pattern[n .. $], true)
-//
-//   else // not globstar
-//     for ENTRY in ENTRIES (not dotfiles, unless pattern[n] is dot)
-//       Test ENTRY against pattern[n]
-//       If fails, continue
-//       If passes, PROCESS(pattern[0..n] + item + pattern[n+1 .. $])
-//
-// Caveat:
-//   Cache all stats and readdirs results to minimize syscall.  Since all
-//   we ever care about is existence and directory-ness, we can just keep
-//   `true` for files, and [children,...] for directories, or `false` for
-//   things that don't exist.
+    function warn(msg) {
+        if (hooks.suppressDeprecationWarnings === false &&
+                (typeof console !==  'undefined') && console.warn) {
+            console.warn('Deprecation warning: ' + msg);
+        }
+    }
 
-module.exports = glob
+    function deprecate(msg, fn) {
+        var firstTime = true;
 
-var fs = __webpack_require__(23)
-var rp = __webpack_require__(38)
-var minimatch = __webpack_require__(40)
-var Minimatch = minimatch.Minimatch
-var inherits = __webpack_require__(44)
-var EE = __webpack_require__(46).EventEmitter
-var path = __webpack_require__(16)
-var assert = __webpack_require__(30)
-var isAbsolute = __webpack_require__(47)
-var globSync = __webpack_require__(48)
-var common = __webpack_require__(49)
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
-var setopts = common.setopts
-var ownProp = common.ownProp
-var inflight = __webpack_require__(50)
-var util = __webpack_require__(29)
-var childrenIgnored = common.childrenIgnored
-var isIgnored = common.isIgnored
+        return extend(function () {
+            if (hooks.deprecationHandler != null) {
+                hooks.deprecationHandler(null, msg);
+            }
+            if (firstTime) {
+                var args = [];
+                var arg;
+                for (var i = 0; i < arguments.length; i++) {
+                    arg = '';
+                    if (typeof arguments[i] === 'object') {
+                        arg += '\n[' + i + '] ';
+                        for (var key in arguments[0]) {
+                            arg += key + ': ' + arguments[0][key] + ', ';
+                        }
+                        arg = arg.slice(0, -2); // Remove trailing comma and space
+                    } else {
+                        arg = arguments[i];
+                    }
+                    args.push(arg);
+                }
+                warn(msg + '\nArguments: ' + Array.prototype.slice.call(args).join('') + '\n' + (new Error()).stack);
+                firstTime = false;
+            }
+            return fn.apply(this, arguments);
+        }, fn);
+    }
 
-var once = __webpack_require__(52)
+    var deprecations = {};
 
-function glob (pattern, options, cb) {
-  if (typeof options === 'function') cb = options, options = {}
-  if (!options) options = {}
+    function deprecateSimple(name, msg) {
+        if (hooks.deprecationHandler != null) {
+            hooks.deprecationHandler(name, msg);
+        }
+        if (!deprecations[name]) {
+            warn(msg);
+            deprecations[name] = true;
+        }
+    }
 
-  if (options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return globSync(pattern, options)
-  }
+    hooks.suppressDeprecationWarnings = false;
+    hooks.deprecationHandler = null;
 
-  return new Glob(pattern, options, cb)
-}
+    function isFunction(input) {
+        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
+    }
 
-glob.sync = globSync
-var GlobSync = glob.GlobSync = globSync.GlobSync
+    function set (config) {
+        var prop, i;
+        for (i in config) {
+            prop = config[i];
+            if (isFunction(prop)) {
+                this[i] = prop;
+            } else {
+                this['_' + i] = prop;
+            }
+        }
+        this._config = config;
+        // Lenient ordinal parsing accepts just a number in addition to
+        // number + (possibly) stuff coming from _dayOfMonthOrdinalParse.
+        // TODO: Remove "ordinalParse" fallback in next major release.
+        this._dayOfMonthOrdinalParseLenient = new RegExp(
+            (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) +
+                '|' + (/\d{1,2}/).source);
+    }
+
+    function mergeConfigs(parentConfig, childConfig) {
+        var res = extend({}, parentConfig), prop;
+        for (prop in childConfig) {
+            if (hasOwnProp(childConfig, prop)) {
+                if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {
+                    res[prop] = {};
+                    extend(res[prop], parentConfig[prop]);
+                    extend(res[prop], childConfig[prop]);
+                } else if (childConfig[prop] != null) {
+                    res[prop] = childConfig[prop];
+                } else {
+                    delete res[prop];
+                }
+            }
+        }
+        for (prop in parentConfig) {
+            if (hasOwnProp(parentConfig, prop) &&
+                    !hasOwnProp(childConfig, prop) &&
+                    isObject(parentConfig[prop])) {
+                // make sure changes to properties don't modify parent config
+                res[prop] = extend({}, res[prop]);
+            }
+        }
+        return res;
+    }
 
-// old api surface
-glob.glob = glob
+    function Locale(config) {
+        if (config != null) {
+            this.set(config);
+        }
+    }
 
-function extend (origin, add) {
-  if (add === null || typeof add !== 'object') {
-    return origin
-  }
+    var keys;
 
-  var keys = Object.keys(add)
-  var i = keys.length
-  while (i--) {
-    origin[keys[i]] = add[keys[i]]
-  }
-  return origin
-}
+    if (Object.keys) {
+        keys = Object.keys;
+    } else {
+        keys = function (obj) {
+            var i, res = [];
+            for (i in obj) {
+                if (hasOwnProp(obj, i)) {
+                    res.push(i);
+                }
+            }
+            return res;
+        };
+    }
 
-glob.hasMagic = function (pattern, options_) {
-  var options = extend({}, options_)
-  options.noprocess = true
+    var defaultCalendar = {
+        sameDay : '[Today at] LT',
+        nextDay : '[Tomorrow at] LT',
+        nextWeek : 'dddd [at] LT',
+        lastDay : '[Yesterday at] LT',
+        lastWeek : '[Last] dddd [at] LT',
+        sameElse : 'L'
+    };
 
-  var g = new Glob(pattern, options)
-  var set = g.minimatch.set
+    function calendar (key, mom, now) {
+        var output = this._calendar[key] || this._calendar['sameElse'];
+        return isFunction(output) ? output.call(mom, now) : output;
+    }
 
-  if (!pattern)
-    return false
+    var defaultLongDateFormat = {
+        LTS  : 'h:mm:ss A',
+        LT   : 'h:mm A',
+        L    : 'MM/DD/YYYY',
+        LL   : 'MMMM D, YYYY',
+        LLL  : 'MMMM D, YYYY h:mm A',
+        LLLL : 'dddd, MMMM D, YYYY h:mm A'
+    };
 
-  if (set.length > 1)
-    return true
+    function longDateFormat (key) {
+        var format = this._longDateFormat[key],
+            formatUpper = this._longDateFormat[key.toUpperCase()];
 
-  for (var j = 0; j < set[0].length; j++) {
-    if (typeof set[0][j] !== 'string')
-      return true
-  }
+        if (format || !formatUpper) {
+            return format;
+        }
 
-  return false
-}
+        this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) {
+            return val.slice(1);
+        });
 
-glob.Glob = Glob
-inherits(Glob, EE)
-function Glob (pattern, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = null
-  }
+        return this._longDateFormat[key];
+    }
 
-  if (options && options.sync) {
-    if (cb)
-      throw new TypeError('callback provided to sync glob')
-    return new GlobSync(pattern, options)
-  }
+    var defaultInvalidDate = 'Invalid date';
 
-  if (!(this instanceof Glob))
-    return new Glob(pattern, options, cb)
+    function invalidDate () {
+        return this._invalidDate;
+    }
 
-  setopts(this, pattern, options)
-  this._didRealPath = false
+    var defaultOrdinal = '%d';
+    var defaultDayOfMonthOrdinalParse = /\d{1,2}/;
 
-  // process each pattern in the minimatch set
-  var n = this.minimatch.set.length
+    function ordinal (number) {
+        return this._ordinal.replace('%d', number);
+    }
 
-  // The matches are stored as {<filename>: true,...} so that
-  // duplicates are automagically pruned.
-  // Later, we do an Object.keys() on these.
-  // Keep them as a list so we can fill in when nonull is set.
-  this.matches = new Array(n)
+    var defaultRelativeTime = {
+        future : 'in %s',
+        past   : '%s ago',
+        s  : 'a few seconds',
+        ss : '%d seconds',
+        m  : 'a minute',
+        mm : '%d minutes',
+        h  : 'an hour',
+        hh : '%d hours',
+        d  : 'a day',
+        dd : '%d days',
+        M  : 'a month',
+        MM : '%d months',
+        y  : 'a year',
+        yy : '%d years'
+    };
 
-  if (typeof cb === 'function') {
-    cb = once(cb)
-    this.on('error', cb)
-    this.on('end', function (matches) {
-      cb(null, matches)
-    })
-  }
+    function relativeTime (number, withoutSuffix, string, isFuture) {
+        var output = this._relativeTime[string];
+        return (isFunction(output)) ?
+            output(number, withoutSuffix, string, isFuture) :
+            output.replace(/%d/i, number);
+    }
 
-  var self = this
-  this._processing = 0
+    function pastFuture (diff, output) {
+        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
+        return isFunction(format) ? format(output) : format.replace(/%s/i, output);
+    }
 
-  this._emitQueue = []
-  this._processQueue = []
-  this.paused = false
+    var aliases = {};
 
-  if (this.noprocess)
-    return this
+    function addUnitAlias (unit, shorthand) {
+        var lowerCase = unit.toLowerCase();
+        aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
+    }
 
-  if (n === 0)
-    return done()
+    function normalizeUnits(units) {
+        return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
+    }
 
-  var sync = true
-  for (var i = 0; i < n; i ++) {
-    this._process(this.minimatch.set[i], i, false, done)
-  }
-  sync = false
+    function normalizeObjectUnits(inputObject) {
+        var normalizedInput = {},
+            normalizedProp,
+            prop;
 
-  function done () {
-    --self._processing
-    if (self._processing <= 0) {
-      if (sync) {
-        process.nextTick(function () {
-          self._finish()
-        })
-      } else {
-        self._finish()
-      }
+        for (prop in inputObject) {
+            if (hasOwnProp(inputObject, prop)) {
+                normalizedProp = normalizeUnits(prop);
+                if (normalizedProp) {
+                    normalizedInput[normalizedProp] = inputObject[prop];
+                }
+            }
+        }
+
+        return normalizedInput;
     }
-  }
-}
 
-Glob.prototype._finish = function () {
-  assert(this instanceof Glob)
-  if (this.aborted)
-    return
+    var priorities = {};
 
-  if (this.realpath && !this._didRealpath)
-    return this._realpath()
+    function addUnitPriority(unit, priority) {
+        priorities[unit] = priority;
+    }
 
-  common.finish(this)
-  this.emit('end', this.found)
-}
+    function getPrioritizedUnits(unitsObj) {
+        var units = [];
+        for (var u in unitsObj) {
+            units.push({unit: u, priority: priorities[u]});
+        }
+        units.sort(function (a, b) {
+            return a.priority - b.priority;
+        });
+        return units;
+    }
 
-Glob.prototype._realpath = function () {
-  if (this._didRealpath)
-    return
+    function zeroFill(number, targetLength, forceSign) {
+        var absNumber = '' + Math.abs(number),
+            zerosToFill = targetLength - absNumber.length,
+            sign = number >= 0;
+        return (sign ? (forceSign ? '+' : '') : '-') +
+            Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;
+    }
 
-  this._didRealpath = true
+    var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
 
-  var n = this.matches.length
-  if (n === 0)
-    return this._finish()
+    var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
 
-  var self = this
-  for (var i = 0; i < this.matches.length; i++)
-    this._realpathSet(i, next)
+    var formatFunctions = {};
 
-  function next () {
-    if (--n === 0)
-      self._finish()
-  }
-}
+    var formatTokenFunctions = {};
 
-Glob.prototype._realpathSet = function (index, cb) {
-  var matchset = this.matches[index]
-  if (!matchset)
-    return cb()
+    // token:    'M'
+    // padded:   ['MM', 2]
+    // ordinal:  'Mo'
+    // callback: function () { this.month() + 1 }
+    function addFormatToken (token, padded, ordinal, callback) {
+        var func = callback;
+        if (typeof callback === 'string') {
+            func = function () {
+                return this[callback]();
+            };
+        }
+        if (token) {
+            formatTokenFunctions[token] = func;
+        }
+        if (padded) {
+            formatTokenFunctions[padded[0]] = function () {
+                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
+            };
+        }
+        if (ordinal) {
+            formatTokenFunctions[ordinal] = function () {
+                return this.localeData().ordinal(func.apply(this, arguments), token);
+            };
+        }
+    }
 
-  var found = Object.keys(matchset)
-  var self = this
-  var n = found.length
+    function removeFormattingTokens(input) {
+        if (input.match(/\[[\s\S]/)) {
+            return input.replace(/^\[|\]$/g, '');
+        }
+        return input.replace(/\\/g, '');
+    }
 
-  if (n === 0)
-    return cb()
+    function makeFormatFunction(format) {
+        var array = format.match(formattingTokens), i, length;
 
-  var set = this.matches[index] = Object.create(null)
-  found.forEach(function (p, i) {
-    // If there's a problem with the stat, then it means that
-    // one or more of the links in the realpath couldn't be
-    // resolved.  just return the abs value in that case.
-    p = self._makeAbs(p)
-    rp.realpath(p, self.realpathCache, function (er, real) {
-      if (!er)
-        set[real] = true
-      else if (er.syscall === 'stat')
-        set[p] = true
-      else
-        self.emit('error', er) // srsly wtf right here
+        for (i = 0, length = array.length; i < length; i++) {
+            if (formatTokenFunctions[array[i]]) {
+                array[i] = formatTokenFunctions[array[i]];
+            } else {
+                array[i] = removeFormattingTokens(array[i]);
+            }
+        }
 
-      if (--n === 0) {
-        self.matches[index] = set
-        cb()
-      }
-    })
-  })
-}
+        return function (mom) {
+            var output = '', i;
+            for (i = 0; i < length; i++) {
+                output += isFunction(array[i]) ? array[i].call(mom, format) : array[i];
+            }
+            return output;
+        };
+    }
 
-Glob.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
+    // format date using native date object
+    function formatMoment(m, format) {
+        if (!m.isValid()) {
+            return m.localeData().invalidDate();
+        }
 
-Glob.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
-}
+        format = expandFormat(format, m.localeData());
+        formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);
 
-Glob.prototype.abort = function () {
-  this.aborted = true
-  this.emit('abort')
-}
+        return formatFunctions[format](m);
+    }
 
-Glob.prototype.pause = function () {
-  if (!this.paused) {
-    this.paused = true
-    this.emit('pause')
-  }
-}
+    function expandFormat(format, locale) {
+        var i = 5;
 
-Glob.prototype.resume = function () {
-  if (this.paused) {
-    this.emit('resume')
-    this.paused = false
-    if (this._emitQueue.length) {
-      var eq = this._emitQueue.slice(0)
-      this._emitQueue.length = 0
-      for (var i = 0; i < eq.length; i ++) {
-        var e = eq[i]
-        this._emitMatch(e[0], e[1])
-      }
+        function replaceLongDateFormatTokens(input) {
+            return locale.longDateFormat(input) || input;
+        }
+
+        localFormattingTokens.lastIndex = 0;
+        while (i >= 0 && localFormattingTokens.test(format)) {
+            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
+            localFormattingTokens.lastIndex = 0;
+            i -= 1;
+        }
+
+        return format;
     }
-    if (this._processQueue.length) {
-      var pq = this._processQueue.slice(0)
-      this._processQueue.length = 0
-      for (var i = 0; i < pq.length; i ++) {
-        var p = pq[i]
-        this._processing--
-        this._process(p[0], p[1], p[2], p[3])
-      }
+
+    var match1         = /\d/;            //       0 - 9
+    var match2         = /\d\d/;          //      00 - 99
+    var match3         = /\d{3}/;         //     000 - 999
+    var match4         = /\d{4}/;         //    0000 - 9999
+    var match6         = /[+-]?\d{6}/;    // -999999 - 999999
+    var match1to2      = /\d\d?/;         //       0 - 99
+    var match3to4      = /\d\d\d\d?/;     //     999 - 9999
+    var match5to6      = /\d\d\d\d\d\d?/; //   99999 - 999999
+    var match1to3      = /\d{1,3}/;       //       0 - 999
+    var match1to4      = /\d{1,4}/;       //       0 - 9999
+    var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
+
+    var matchUnsigned  = /\d+/;           //       0 - inf
+    var matchSigned    = /[+-]?\d+/;      //    -inf - inf
+
+    var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
+    var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z
+
+    var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
+
+    // any word (or two) characters or numbers including two/three word month in arabic.
+    // includes scottish gaelic two word and hyphenated months
+    var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;
+
+    var regexes = {};
+
+    function addRegexToken (token, regex, strictRegex) {
+        regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) {
+            return (isStrict && strictRegex) ? strictRegex : regex;
+        };
     }
-  }
-}
 
-Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
-  assert(this instanceof Glob)
-  assert(typeof cb === 'function')
+    function getParseRegexForToken (token, config) {
+        if (!hasOwnProp(regexes, token)) {
+            return new RegExp(unescapeFormat(token));
+        }
 
-  if (this.aborted)
-    return
+        return regexes[token](config._strict, config._locale);
+    }
 
-  this._processing++
-  if (this.paused) {
-    this._processQueue.push([pattern, index, inGlobStar, cb])
-    return
-  }
+    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
+    function unescapeFormat(s) {
+        return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
+            return p1 || p2 || p3 || p4;
+        }));
+    }
 
-  //console.error('PROCESS %d', this._processing, pattern)
+    function regexEscape(s) {
+        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+    }
 
-  // Get the first [n] parts of pattern that are all strings.
-  var n = 0
-  while (typeof pattern[n] === 'string') {
-    n ++
-  }
-  // now n is the index of the first one that is *not* a string.
+    var tokens = {};
 
-  // see if there's anything else
-  var prefix
-  switch (n) {
-    // if not, then this is rather simple
-    case pattern.length:
-      this._processSimple(pattern.join('/'), index, cb)
-      return
+    function addParseToken (token, callback) {
+        var i, func = callback;
+        if (typeof token === 'string') {
+            token = [token];
+        }
+        if (isNumber(callback)) {
+            func = function (input, array) {
+                array[callback] = toInt(input);
+            };
+        }
+        for (i = 0; i < token.length; i++) {
+            tokens[token[i]] = func;
+        }
+    }
 
-    case 0:
-      // pattern *starts* with some non-trivial item.
-      // going to readdir(cwd), but not include the prefix in matches.
-      prefix = null
-      break
+    function addWeekParseToken (token, callback) {
+        addParseToken(token, function (input, array, config, token) {
+            config._w = config._w || {};
+            callback(input, config._w, config, token);
+        });
+    }
 
-    default:
-      // pattern has some string bits in the front.
-      // whatever it starts with, whether that's 'absolute' like /foo/bar,
-      // or 'relative' like '../baz'
-      prefix = pattern.slice(0, n).join('/')
-      break
-  }
+    function addTimeToArrayFromToken(token, input, config) {
+        if (input != null && hasOwnProp(tokens, token)) {
+            tokens[token](input, config._a, config, token);
+        }
+    }
 
-  var remain = pattern.slice(n)
+    var YEAR = 0;
+    var MONTH = 1;
+    var DATE = 2;
+    var HOUR = 3;
+    var MINUTE = 4;
+    var SECOND = 5;
+    var MILLISECOND = 6;
+    var WEEK = 7;
+    var WEEKDAY = 8;
 
-  // get the list of entries.
-  var read
-  if (prefix === null)
-    read = '.'
-  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
-    if (!prefix || !isAbsolute(prefix))
-      prefix = '/' + prefix
-    read = prefix
-  } else
-    read = prefix
+    // FORMATTING
 
-  var abs = this._makeAbs(read)
+    addFormatToken('Y', 0, 0, function () {
+        var y = this.year();
+        return y <= 9999 ? '' + y : '+' + y;
+    });
 
-  //if ignored, skip _processing
-  if (childrenIgnored(this, read))
-    return cb()
+    addFormatToken(0, ['YY', 2], 0, function () {
+        return this.year() % 100;
+    });
 
-  var isGlobStar = remain[0] === minimatch.GLOBSTAR
-  if (isGlobStar)
-    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar, cb)
-  else
-    this._processReaddir(prefix, read, abs, remain, index, inGlobStar, cb)
-}
+    addFormatToken(0, ['YYYY',   4],       0, 'year');
+    addFormatToken(0, ['YYYYY',  5],       0, 'year');
+    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
 
-Glob.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar, cb) {
-  var self = this
-  this._readdir(abs, inGlobStar, function (er, entries) {
-    return self._processReaddir2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
-  })
-}
+    // ALIASES
 
-Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+    addUnitAlias('year', 'y');
 
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return cb()
+    // PRIORITIES
 
-  // It will only match dot entries if it starts with a dot, or if
-  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
-  var pn = remain[0]
-  var negate = !!this.minimatch.negate
-  var rawGlob = pn._glob
-  var dotOk = this.dot || rawGlob.charAt(0) === '.'
+    addUnitPriority('year', 1);
 
-  var matchedEntries = []
-  for (var i = 0; i < entries.length; i++) {
-    var e = entries[i]
-    if (e.charAt(0) !== '.' || dotOk) {
-      var m
-      if (negate && !prefix) {
-        m = !e.match(pn)
-      } else {
-        m = e.match(pn)
-      }
-      if (m)
-        matchedEntries.push(e)
+    // PARSING
+
+    addRegexToken('Y',      matchSigned);
+    addRegexToken('YY',     match1to2, match2);
+    addRegexToken('YYYY',   match1to4, match4);
+    addRegexToken('YYYYY',  match1to6, match6);
+    addRegexToken('YYYYYY', match1to6, match6);
+
+    addParseToken(['YYYYY', 'YYYYYY'], YEAR);
+    addParseToken('YYYY', function (input, array) {
+        array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input);
+    });
+    addParseToken('YY', function (input, array) {
+        array[YEAR] = hooks.parseTwoDigitYear(input);
+    });
+    addParseToken('Y', function (input, array) {
+        array[YEAR] = parseInt(input, 10);
+    });
+
+    // HELPERS
+
+    function daysInYear(year) {
+        return isLeapYear(year) ? 366 : 365;
     }
-  }
 
-  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
+    function isLeapYear(year) {
+        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+    }
 
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    return cb()
+    // HOOKS
 
-  // if this is the last remaining pattern bit, then no need for
-  // an additional stat *unless* the user has specified mark or
-  // stat explicitly.  We know they exist, since readdir returned
-  // them.
+    hooks.parseTwoDigitYear = function (input) {
+        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
+    };
 
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
+    // MOMENTS
 
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
+    var getSetYear = makeGetSet('FullYear', true);
 
-      if (e.charAt(0) === '/' && !this.nomount) {
-        e = path.join(this.root, e)
-      }
-      this._emitMatch(index, e)
+    function getIsLeapYear () {
+        return isLeapYear(this.year());
     }
-    // This was the last one, and no stats were needed
-    return cb()
-  }
 
-  // now test all matched entries as stand-ins for that part
-  // of the pattern.
-  remain.shift()
-  for (var i = 0; i < len; i ++) {
-    var e = matchedEntries[i]
-    var newPattern
-    if (prefix) {
-      if (prefix !== '/')
-        e = prefix + '/' + e
-      else
-        e = prefix + e
+    function makeGetSet (unit, keepTime) {
+        return function (value) {
+            if (value != null) {
+                set$1(this, unit, value);
+                hooks.updateOffset(this, keepTime);
+                return this;
+            } else {
+                return get(this, unit);
+            }
+        };
     }
-    this._process([e].concat(remain), index, inGlobStar, cb)
-  }
-  cb()
-}
 
-Glob.prototype._emitMatch = function (index, e) {
-  if (this.aborted)
-    return
+    function get (mom, unit) {
+        return mom.isValid() ?
+            mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN;
+    }
 
-  if (isIgnored(this, e))
-    return
+    function set$1 (mom, unit, value) {
+        if (mom.isValid() && !isNaN(value)) {
+            if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) {
+                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month()));
+            }
+            else {
+                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
+            }
+        }
+    }
 
-  if (this.paused) {
-    this._emitQueue.push([index, e])
-    return
-  }
+    // MOMENTS
 
-  var abs = isAbsolute(e) ? e : this._makeAbs(e)
+    function stringGet (units) {
+        units = normalizeUnits(units);
+        if (isFunction(this[units])) {
+            return this[units]();
+        }
+        return this;
+    }
 
-  if (this.mark)
-    e = this._mark(e)
 
-  if (this.absolute)
-    e = abs
+    function stringSet (units, value) {
+        if (typeof units === 'object') {
+            units = normalizeObjectUnits(units);
+            var prioritized = getPrioritizedUnits(units);
+            for (var i = 0; i < prioritized.length; i++) {
+                this[prioritized[i].unit](units[prioritized[i].unit]);
+            }
+        } else {
+            units = normalizeUnits(units);
+            if (isFunction(this[units])) {
+                return this[units](value);
+            }
+        }
+        return this;
+    }
 
-  if (this.matches[index][e])
-    return
+    function mod(n, x) {
+        return ((n % x) + x) % x;
+    }
 
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
-  }
+    var indexOf;
 
-  this.matches[index][e] = true
+    if (Array.prototype.indexOf) {
+        indexOf = Array.prototype.indexOf;
+    } else {
+        indexOf = function (o) {
+            // I know
+            var i;
+            for (i = 0; i < this.length; ++i) {
+                if (this[i] === o) {
+                    return i;
+                }
+            }
+            return -1;
+        };
+    }
 
-  var st = this.statCache[abs]
-  if (st)
-    this.emit('stat', e, st)
+    function daysInMonth(year, month) {
+        if (isNaN(year) || isNaN(month)) {
+            return NaN;
+        }
+        var modMonth = mod(month, 12);
+        year += (month - modMonth) / 12;
+        return modMonth === 1 ? (isLeapYear(year) ? 29 : 28) : (31 - modMonth % 7 % 2);
+    }
 
-  this.emit('match', e)
-}
+    // FORMATTING
 
-Glob.prototype._readdirInGlobStar = function (abs, cb) {
-  if (this.aborted)
-    return
+    addFormatToken('M', ['MM', 2], 'Mo', function () {
+        return this.month() + 1;
+    });
 
-  // follow all symlinked directories forever
-  // just proceed as if this is a non-globstar situation
-  if (this.follow)
-    return this._readdir(abs, false, cb)
+    addFormatToken('MMM', 0, 0, function (format) {
+        return this.localeData().monthsShort(this, format);
+    });
 
-  var lstatkey = 'lstat\0' + abs
-  var self = this
-  var lstatcb = inflight(lstatkey, lstatcb_)
+    addFormatToken('MMMM', 0, 0, function (format) {
+        return this.localeData().months(this, format);
+    });
 
-  if (lstatcb)
-    fs.lstat(abs, lstatcb)
+    // ALIASES
 
-  function lstatcb_ (er, lstat) {
-    if (er && er.code === 'ENOENT')
-      return cb()
+    addUnitAlias('month', 'M');
 
-    var isSym = lstat && lstat.isSymbolicLink()
-    self.symlinks[abs] = isSym
+    // PRIORITY
 
-    // If it's not a symlink or a dir, then it's definitely a regular file.
-    // don't bother doing a readdir in that case.
-    if (!isSym && lstat && !lstat.isDirectory()) {
-      self.cache[abs] = 'FILE'
-      cb()
-    } else
-      self._readdir(abs, false, cb)
-  }
-}
+    addUnitPriority('month', 8);
 
-Glob.prototype._readdir = function (abs, inGlobStar, cb) {
-  if (this.aborted)
-    return
+    // PARSING
 
-  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
-  if (!cb)
-    return
+    addRegexToken('M',    match1to2);
+    addRegexToken('MM',   match1to2, match2);
+    addRegexToken('MMM',  function (isStrict, locale) {
+        return locale.monthsShortRegex(isStrict);
+    });
+    addRegexToken('MMMM', function (isStrict, locale) {
+        return locale.monthsRegex(isStrict);
+    });
 
-  //console.error('RD %j %j', +inGlobStar, abs)
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs, cb)
+    addParseToken(['M', 'MM'], function (input, array) {
+        array[MONTH] = toInt(input) - 1;
+    });
 
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return cb()
+    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
+        var month = config._locale.monthsParse(input, token, config._strict);
+        // if we didn't find a month name, mark the date as invalid.
+        if (month != null) {
+            array[MONTH] = month;
+        } else {
+            getParsingFlags(config).invalidMonth = input;
+        }
+    });
 
-    if (Array.isArray(c))
-      return cb(null, c)
-  }
+    // LOCALES
 
-  var self = this
-  fs.readdir(abs, readdirCb(this, abs, cb))
-}
+    var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/;
+    var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
+    function localeMonths (m, format) {
+        if (!m) {
+            return isArray(this._months) ? this._months :
+                this._months['standalone'];
+        }
+        return isArray(this._months) ? this._months[m.month()] :
+            this._months[(this._months.isFormat || MONTHS_IN_FORMAT).test(format) ? 'format' : 'standalone'][m.month()];
+    }
 
-function readdirCb (self, abs, cb) {
-  return function (er, entries) {
-    if (er)
-      self._readdirError(abs, er, cb)
-    else
-      self._readdirEntries(abs, entries, cb)
-  }
-}
+    var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
+    function localeMonthsShort (m, format) {
+        if (!m) {
+            return isArray(this._monthsShort) ? this._monthsShort :
+                this._monthsShort['standalone'];
+        }
+        return isArray(this._monthsShort) ? this._monthsShort[m.month()] :
+            this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
+    }
 
-Glob.prototype._readdirEntries = function (abs, entries, cb) {
-  if (this.aborted)
-    return
+    function handleStrictParse(monthName, format, strict) {
+        var i, ii, mom, llc = monthName.toLocaleLowerCase();
+        if (!this._monthsParse) {
+            // this is not used
+            this._monthsParse = [];
+            this._longMonthsParse = [];
+            this._shortMonthsParse = [];
+            for (i = 0; i < 12; ++i) {
+                mom = createUTC([2000, i]);
+                this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase();
+                this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase();
+            }
+        }
 
-  // if we haven't asked to stat everything, then just
-  // assume that everything in there exists, so we can avoid
-  // having to stat it a second time.
-  if (!this.mark && !this.stat) {
-    for (var i = 0; i < entries.length; i ++) {
-      var e = entries[i]
-      if (abs === '/')
-        e = abs + e
-      else
-        e = abs + '/' + e
-      this.cache[e] = true
+        if (strict) {
+            if (format === 'MMM') {
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._longMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        } else {
+            if (format === 'MMM') {
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._longMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._longMonthsParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        }
     }
-  }
 
-  this.cache[abs] = entries
-  return cb(null, entries)
-}
+    function localeMonthsParse (monthName, format, strict) {
+        var i, mom, regex;
 
-Glob.prototype._readdirError = function (f, er, cb) {
-  if (this.aborted)
-    return
+        if (this._monthsParseExact) {
+            return handleStrictParse.call(this, monthName, format, strict);
+        }
 
-  // handle errors, and cache the information
-  switch (er.code) {
-    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
-    case 'ENOTDIR': // totally normal. means it *does* exist.
-      var abs = this._makeAbs(f)
-      this.cache[abs] = 'FILE'
-      if (abs === this.cwdAbs) {
-        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
-        error.path = this.cwd
-        error.code = er.code
-        this.emit('error', error)
-        this.abort()
-      }
-      break
+        if (!this._monthsParse) {
+            this._monthsParse = [];
+            this._longMonthsParse = [];
+            this._shortMonthsParse = [];
+        }
 
-    case 'ENOENT': // not terribly unusual
-    case 'ELOOP':
-    case 'ENAMETOOLONG':
-    case 'UNKNOWN':
-      this.cache[this._makeAbs(f)] = false
-      break
+        // TODO: add sorting
+        // Sorting makes sure if one month (or abbr) is a prefix of another
+        // see sorting in computeMonthsParse
+        for (i = 0; i < 12; i++) {
+            // make the regex if we don't have it already
+            mom = createUTC([2000, i]);
+            if (strict && !this._longMonthsParse[i]) {
+                this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
+                this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
+            }
+            if (!strict && !this._monthsParse[i]) {
+                regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
+                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
+                return i;
+            } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
+                return i;
+            } else if (!strict && this._monthsParse[i].test(monthName)) {
+                return i;
+            }
+        }
+    }
 
-    default: // some unusual error.  Treat as failure.
-      this.cache[this._makeAbs(f)] = false
-      if (this.strict) {
-        this.emit('error', er)
-        // If the error is handled, then we abort
-        // if not, we threw out of here
-        this.abort()
-      }
-      if (!this.silent)
-        console.error('glob error', er)
-      break
-  }
+    // MOMENTS
 
-  return cb()
-}
+    function setMonth (mom, value) {
+        var dayOfMonth;
 
-Glob.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar, cb) {
-  var self = this
-  this._readdir(abs, inGlobStar, function (er, entries) {
-    self._processGlobStar2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
-  })
-}
+        if (!mom.isValid()) {
+            // No op
+            return mom;
+        }
 
+        if (typeof value === 'string') {
+            if (/^\d+$/.test(value)) {
+                value = toInt(value);
+            } else {
+                value = mom.localeData().monthsParse(value);
+                // TODO: Another silent failure?
+                if (!isNumber(value)) {
+                    return mom;
+                }
+            }
+        }
 
-Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
-  //console.error('pgs2', prefix, remain[0], entries)
+        dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
+        mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
+        return mom;
+    }
 
-  // no entries means not a dir, so it can never have matches
-  // foo.txt/** doesn't match foo.txt
-  if (!entries)
-    return cb()
+    function getSetMonth (value) {
+        if (value != null) {
+            setMonth(this, value);
+            hooks.updateOffset(this, true);
+            return this;
+        } else {
+            return get(this, 'Month');
+        }
+    }
 
-  // test without the globstar, and with every child both below
-  // and replacing the globstar.
-  var remainWithoutGlobStar = remain.slice(1)
-  var gspref = prefix ? [ prefix ] : []
-  var noGlobStar = gspref.concat(remainWithoutGlobStar)
+    function getDaysInMonth () {
+        return daysInMonth(this.year(), this.month());
+    }
 
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false, cb)
+    var defaultMonthsShortRegex = matchWord;
+    function monthsShortRegex (isStrict) {
+        if (this._monthsParseExact) {
+            if (!hasOwnProp(this, '_monthsRegex')) {
+                computeMonthsParse.call(this);
+            }
+            if (isStrict) {
+                return this._monthsShortStrictRegex;
+            } else {
+                return this._monthsShortRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_monthsShortRegex')) {
+                this._monthsShortRegex = defaultMonthsShortRegex;
+            }
+            return this._monthsShortStrictRegex && isStrict ?
+                this._monthsShortStrictRegex : this._monthsShortRegex;
+        }
+    }
 
-  var isSym = this.symlinks[abs]
-  var len = entries.length
+    var defaultMonthsRegex = matchWord;
+    function monthsRegex (isStrict) {
+        if (this._monthsParseExact) {
+            if (!hasOwnProp(this, '_monthsRegex')) {
+                computeMonthsParse.call(this);
+            }
+            if (isStrict) {
+                return this._monthsStrictRegex;
+            } else {
+                return this._monthsRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_monthsRegex')) {
+                this._monthsRegex = defaultMonthsRegex;
+            }
+            return this._monthsStrictRegex && isStrict ?
+                this._monthsStrictRegex : this._monthsRegex;
+        }
+    }
+
+    function computeMonthsParse () {
+        function cmpLenRev(a, b) {
+            return b.length - a.length;
+        }
+
+        var shortPieces = [], longPieces = [], mixedPieces = [],
+            i, mom;
+        for (i = 0; i < 12; i++) {
+            // make the regex if we don't have it already
+            mom = createUTC([2000, i]);
+            shortPieces.push(this.monthsShort(mom, ''));
+            longPieces.push(this.months(mom, ''));
+            mixedPieces.push(this.months(mom, ''));
+            mixedPieces.push(this.monthsShort(mom, ''));
+        }
+        // Sorting makes sure if one month (or abbr) is a prefix of another it
+        // will match the longer piece.
+        shortPieces.sort(cmpLenRev);
+        longPieces.sort(cmpLenRev);
+        mixedPieces.sort(cmpLenRev);
+        for (i = 0; i < 12; i++) {
+            shortPieces[i] = regexEscape(shortPieces[i]);
+            longPieces[i] = regexEscape(longPieces[i]);
+        }
+        for (i = 0; i < 24; i++) {
+            mixedPieces[i] = regexEscape(mixedPieces[i]);
+        }
+
+        this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
+        this._monthsShortRegex = this._monthsRegex;
+        this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
+        this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
+    }
+
+    function createDate (y, m, d, h, M, s, ms) {
+        // can't just apply() to create a date:
+        // https://stackoverflow.com/q/181348
+        var date;
+        // the date constructor remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0) {
+            // preserve leap years using a full 400 year cycle, then reset
+            date = new Date(y + 400, m, d, h, M, s, ms);
+            if (isFinite(date.getFullYear())) {
+                date.setFullYear(y);
+            }
+        } else {
+            date = new Date(y, m, d, h, M, s, ms);
+        }
 
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
-    return cb()
+        return date;
+    }
 
-  for (var i = 0; i < len; i++) {
-    var e = entries[i]
-    if (e.charAt(0) === '.' && !this.dot)
-      continue
+    function createUTCDate (y) {
+        var date;
+        // the Date.UTC function remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0) {
+            var args = Array.prototype.slice.call(arguments);
+            // preserve leap years using a full 400 year cycle, then reset
+            args[0] = y + 400;
+            date = new Date(Date.UTC.apply(null, args));
+            if (isFinite(date.getUTCFullYear())) {
+                date.setUTCFullYear(y);
+            }
+        } else {
+            date = new Date(Date.UTC.apply(null, arguments));
+        }
 
-    // these two cases enter the inGlobStar state
-    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
-    this._process(instead, index, true, cb)
+        return date;
+    }
 
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true, cb)
-  }
+    // start-of-first-week - start-of-year
+    function firstWeekOffset(year, dow, doy) {
+        var // first-week day -- which january is always in the first week (4 for iso, 1 for other)
+            fwd = 7 + dow - doy,
+            // first-week day local weekday -- which local weekday is fwd
+            fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
 
-  cb()
-}
+        return -fwdlw + fwd - 1;
+    }
 
-Glob.prototype._processSimple = function (prefix, index, cb) {
-  // XXX review this.  Shouldn't it be doing the mounting etc
-  // before doing stat?  kinda weird?
-  var self = this
-  this._stat(prefix, function (er, exists) {
-    self._processSimple2(prefix, index, er, exists, cb)
-  })
-}
-Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) {
+    // https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
+    function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
+        var localWeekday = (7 + weekday - dow) % 7,
+            weekOffset = firstWeekOffset(year, dow, doy),
+            dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,
+            resYear, resDayOfYear;
 
-  //console.error('ps2', prefix, exists)
+        if (dayOfYear <= 0) {
+            resYear = year - 1;
+            resDayOfYear = daysInYear(resYear) + dayOfYear;
+        } else if (dayOfYear > daysInYear(year)) {
+            resYear = year + 1;
+            resDayOfYear = dayOfYear - daysInYear(year);
+        } else {
+            resYear = year;
+            resDayOfYear = dayOfYear;
+        }
 
-  if (!this.matches[index])
-    this.matches[index] = Object.create(null)
+        return {
+            year: resYear,
+            dayOfYear: resDayOfYear
+        };
+    }
 
-  // If it doesn't exist, then just mark the lack of results
-  if (!exists)
-    return cb()
+    function weekOfYear(mom, dow, doy) {
+        var weekOffset = firstWeekOffset(mom.year(), dow, doy),
+            week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,
+            resWeek, resYear;
 
-  if (prefix && isAbsolute(prefix) && !this.nomount) {
-    var trail = /[\/\\]$/.test(prefix)
-    if (prefix.charAt(0) === '/') {
-      prefix = path.join(this.root, prefix)
-    } else {
-      prefix = path.resolve(this.root, prefix)
-      if (trail)
-        prefix += '/'
+        if (week < 1) {
+            resYear = mom.year() - 1;
+            resWeek = week + weeksInYear(resYear, dow, doy);
+        } else if (week > weeksInYear(mom.year(), dow, doy)) {
+            resWeek = week - weeksInYear(mom.year(), dow, doy);
+            resYear = mom.year() + 1;
+        } else {
+            resYear = mom.year();
+            resWeek = week;
+        }
+
+        return {
+            week: resWeek,
+            year: resYear
+        };
     }
-  }
 
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
+    function weeksInYear(year, dow, doy) {
+        var weekOffset = firstWeekOffset(year, dow, doy),
+            weekOffsetNext = firstWeekOffset(year + 1, dow, doy);
+        return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;
+    }
 
-  // Mark this as a match
-  this._emitMatch(index, prefix)
-  cb()
-}
+    // FORMATTING
 
-// Returns either 'DIR', 'FILE', or false
-Glob.prototype._stat = function (f, cb) {
-  var abs = this._makeAbs(f)
-  var needDir = f.slice(-1) === '/'
+    addFormatToken('w', ['ww', 2], 'wo', 'week');
+    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
 
-  if (f.length > this.maxLength)
-    return cb()
+    // ALIASES
 
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
+    addUnitAlias('week', 'w');
+    addUnitAlias('isoWeek', 'W');
 
-    if (Array.isArray(c))
-      c = 'DIR'
+    // PRIORITIES
 
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return cb(null, c)
+    addUnitPriority('week', 5);
+    addUnitPriority('isoWeek', 5);
 
-    if (needDir && c === 'FILE')
-      return cb()
+    // PARSING
 
-    // otherwise we have to stat, because maybe c=true
-    // if we know it exists, but not what it is.
-  }
+    addRegexToken('w',  match1to2);
+    addRegexToken('ww', match1to2, match2);
+    addRegexToken('W',  match1to2);
+    addRegexToken('WW', match1to2, match2);
 
-  var exists
-  var stat = this.statCache[abs]
-  if (stat !== undefined) {
-    if (stat === false)
-      return cb(null, stat)
-    else {
-      var type = stat.isDirectory() ? 'DIR' : 'FILE'
-      if (needDir && type === 'FILE')
-        return cb()
-      else
-        return cb(null, type, stat)
+    addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
+        week[token.substr(0, 1)] = toInt(input);
+    });
+
+    // HELPERS
+
+    // LOCALES
+
+    function localeWeek (mom) {
+        return weekOfYear(mom, this._week.dow, this._week.doy).week;
     }
-  }
 
-  var self = this
-  var statcb = inflight('stat\0' + abs, lstatcb_)
-  if (statcb)
-    fs.lstat(abs, statcb)
+    var defaultLocaleWeek = {
+        dow : 0, // Sunday is the first day of the week.
+        doy : 6  // The week that contains Jan 6th is the first week of the year.
+    };
 
-  function lstatcb_ (er, lstat) {
-    if (lstat && lstat.isSymbolicLink()) {
-      // If it's a symlink, then treat it as the target, unless
-      // the target does not exist, then treat it as a file.
-      return fs.stat(abs, function (er, stat) {
-        if (er)
-          self._stat2(f, abs, null, lstat, cb)
-        else
-          self._stat2(f, abs, er, stat, cb)
-      })
-    } else {
-      self._stat2(f, abs, er, lstat, cb)
+    function localeFirstDayOfWeek () {
+        return this._week.dow;
     }
-  }
-}
 
-Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
-  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
-    this.statCache[abs] = false
-    return cb()
-  }
+    function localeFirstDayOfYear () {
+        return this._week.doy;
+    }
 
-  var needDir = f.slice(-1) === '/'
-  this.statCache[abs] = stat
+    // MOMENTS
 
-  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
-    return cb(null, false, stat)
+    function getSetWeek (input) {
+        var week = this.localeData().week(this);
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
 
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
-  this.cache[abs] = this.cache[abs] || c
+    function getSetISOWeek (input) {
+        var week = weekOfYear(this, 1, 4).week;
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
 
-  if (needDir && c === 'FILE')
-    return cb()
+    // FORMATTING
 
-  return cb(null, c, stat)
-}
+    addFormatToken('d', 0, 'do', 'day');
 
+    addFormatToken('dd', 0, 0, function (format) {
+        return this.localeData().weekdaysMin(this, format);
+    });
 
-/***/ }),
-/* 38 */
-/***/ (function(module, exports, __webpack_require__) {
+    addFormatToken('ddd', 0, 0, function (format) {
+        return this.localeData().weekdaysShort(this, format);
+    });
 
-module.exports = realpath
-realpath.realpath = realpath
-realpath.sync = realpathSync
-realpath.realpathSync = realpathSync
-realpath.monkeypatch = monkeypatch
-realpath.unmonkeypatch = unmonkeypatch
+    addFormatToken('dddd', 0, 0, function (format) {
+        return this.localeData().weekdays(this, format);
+    });
 
-var fs = __webpack_require__(23)
-var origRealpath = fs.realpath
-var origRealpathSync = fs.realpathSync
+    addFormatToken('e', 0, 0, 'weekday');
+    addFormatToken('E', 0, 0, 'isoWeekday');
 
-var version = process.version
-var ok = /^v[0-5]\./.test(version)
-var old = __webpack_require__(39)
+    // ALIASES
 
-function newError (er) {
-  return er && er.syscall === 'realpath' && (
-    er.code === 'ELOOP' ||
-    er.code === 'ENOMEM' ||
-    er.code === 'ENAMETOOLONG'
-  )
-}
+    addUnitAlias('day', 'd');
+    addUnitAlias('weekday', 'e');
+    addUnitAlias('isoWeekday', 'E');
 
-function realpath (p, cache, cb) {
-  if (ok) {
-    return origRealpath(p, cache, cb)
-  }
+    // PRIORITY
+    addUnitPriority('day', 11);
+    addUnitPriority('weekday', 11);
+    addUnitPriority('isoWeekday', 11);
 
-  if (typeof cache === 'function') {
-    cb = cache
-    cache = null
-  }
-  origRealpath(p, cache, function (er, result) {
-    if (newError(er)) {
-      old.realpath(p, cache, cb)
-    } else {
-      cb(er, result)
-    }
-  })
-}
+    // PARSING
 
-function realpathSync (p, cache) {
-  if (ok) {
-    return origRealpathSync(p, cache)
-  }
+    addRegexToken('d',    match1to2);
+    addRegexToken('e',    match1to2);
+    addRegexToken('E',    match1to2);
+    addRegexToken('dd',   function (isStrict, locale) {
+        return locale.weekdaysMinRegex(isStrict);
+    });
+    addRegexToken('ddd',   function (isStrict, locale) {
+        return locale.weekdaysShortRegex(isStrict);
+    });
+    addRegexToken('dddd',   function (isStrict, locale) {
+        return locale.weekdaysRegex(isStrict);
+    });
 
-  try {
-    return origRealpathSync(p, cache)
-  } catch (er) {
-    if (newError(er)) {
-      return old.realpathSync(p, cache)
-    } else {
-      throw er
-    }
-  }
-}
+    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
+        var weekday = config._locale.weekdaysParse(input, token, config._strict);
+        // if we didn't get a weekday name, mark the date as invalid
+        if (weekday != null) {
+            week.d = weekday;
+        } else {
+            getParsingFlags(config).invalidWeekday = input;
+        }
+    });
 
-function monkeypatch () {
-  fs.realpath = realpath
-  fs.realpathSync = realpathSync
-}
+    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
+        week[token] = toInt(input);
+    });
 
-function unmonkeypatch () {
-  fs.realpath = origRealpath
-  fs.realpathSync = origRealpathSync
-}
+    // HELPERS
 
+    function parseWeekday(input, locale) {
+        if (typeof input !== 'string') {
+            return input;
+        }
 
-/***/ }),
-/* 39 */
-/***/ (function(module, exports, __webpack_require__) {
+        if (!isNaN(input)) {
+            return parseInt(input, 10);
+        }
 
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-var pathModule = __webpack_require__(16);
-var isWindows = process.platform === 'win32';
-var fs = __webpack_require__(23);
+        input = locale.weekdaysParse(input);
+        if (typeof input === 'number') {
+            return input;
+        }
 
-// JavaScript implementation of realpath, ported from node pre-v6
+        return null;
+    }
 
-var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
+    function parseIsoWeekday(input, locale) {
+        if (typeof input === 'string') {
+            return locale.weekdaysParse(input) % 7 || 7;
+        }
+        return isNaN(input) ? null : input;
+    }
 
-function rethrow() {
-  // Only enable in debug mode. A backtrace uses ~1000 bytes of heap space and
-  // is fairly slow to generate.
-  var callback;
-  if (DEBUG) {
-    var backtrace = new Error;
-    callback = debugCallback;
-  } else
-    callback = missingCallback;
+    // LOCALES
+    function shiftWeekdays (ws, n) {
+        return ws.slice(n, 7).concat(ws.slice(0, n));
+    }
 
-  return callback;
+    var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
+    function localeWeekdays (m, format) {
+        var weekdays = isArray(this._weekdays) ? this._weekdays :
+            this._weekdays[(m && m !== true && this._weekdays.isFormat.test(format)) ? 'format' : 'standalone'];
+        return (m === true) ? shiftWeekdays(weekdays, this._week.dow)
+            : (m) ? weekdays[m.day()] : weekdays;
+    }
 
-  function debugCallback(err) {
-    if (err) {
-      backtrace.message = err.message;
-      err = backtrace;
-      missingCallback(err);
+    var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
+    function localeWeekdaysShort (m) {
+        return (m === true) ? shiftWeekdays(this._weekdaysShort, this._week.dow)
+            : (m) ? this._weekdaysShort[m.day()] : this._weekdaysShort;
     }
-  }
 
-  function missingCallback(err) {
-    if (err) {
-      if (process.throwDeprecation)
-        throw err;  // Forgot a callback but don't know where? Use NODE_DEBUG=fs
-      else if (!process.noDeprecation) {
-        var msg = 'fs: missing callback ' + (err.stack || err.message);
-        if (process.traceDeprecation)
-          console.trace(msg);
-        else
-          console.error(msg);
-      }
+    var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
+    function localeWeekdaysMin (m) {
+        return (m === true) ? shiftWeekdays(this._weekdaysMin, this._week.dow)
+            : (m) ? this._weekdaysMin[m.day()] : this._weekdaysMin;
     }
-  }
-}
 
-function maybeCallback(cb) {
-  return typeof cb === 'function' ? cb : rethrow();
-}
+    function handleStrictParse$1(weekdayName, format, strict) {
+        var i, ii, mom, llc = weekdayName.toLocaleLowerCase();
+        if (!this._weekdaysParse) {
+            this._weekdaysParse = [];
+            this._shortWeekdaysParse = [];
+            this._minWeekdaysParse = [];
 
-var normalize = pathModule.normalize;
+            for (i = 0; i < 7; ++i) {
+                mom = createUTC([2000, 1]).day(i);
+                this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase();
+                this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase();
+                this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase();
+            }
+        }
 
-// Regexp that finds the next partion of a (partial) path
-// result is [base_with_slash, base], e.g. ['somedir/', 'somedir']
-if (isWindows) {
-  var nextPartRe = /(.*?)(?:[\/\\]+|$)/g;
-} else {
-  var nextPartRe = /(.*?)(?:[\/]+|$)/g;
-}
+        if (strict) {
+            if (format === 'dddd') {
+                ii = indexOf.call(this._weekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else if (format === 'ddd') {
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        } else {
+            if (format === 'dddd') {
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else if (format === 'ddd') {
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        }
+    }
 
-// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
-if (isWindows) {
-  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
-} else {
-  var splitRootRe = /^[\/]*/;
-}
+    function localeWeekdaysParse (weekdayName, format, strict) {
+        var i, mom, regex;
 
-exports.realpathSync = function realpathSync(p, cache) {
-  // make p is absolute
-  p = pathModule.resolve(p);
+        if (this._weekdaysParseExact) {
+            return handleStrictParse$1.call(this, weekdayName, format, strict);
+        }
 
-  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-    return cache[p];
-  }
+        if (!this._weekdaysParse) {
+            this._weekdaysParse = [];
+            this._minWeekdaysParse = [];
+            this._shortWeekdaysParse = [];
+            this._fullWeekdaysParse = [];
+        }
 
-  var original = p,
-      seenLinks = {},
-      knownHard = {};
+        for (i = 0; i < 7; i++) {
+            // make the regex if we don't have it already
 
-  // current character position in p
-  var pos;
-  // the partial path so far, including a trailing slash if any
-  var current;
-  // the partial path without a trailing slash (except when pointing at a root)
-  var base;
-  // the partial path scanned in the previous round, with slash
-  var previous;
+            mom = createUTC([2000, 1]).day(i);
+            if (strict && !this._fullWeekdaysParse[i]) {
+                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\\.?') + '$', 'i');
+                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\\.?') + '$', 'i');
+                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\\.?') + '$', 'i');
+            }
+            if (!this._weekdaysParse[i]) {
+                regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
+                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) {
+                return i;
+            } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) {
+                return i;
+            } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) {
+                return i;
+            } else if (!strict && this._weekdaysParse[i].test(weekdayName)) {
+                return i;
+            }
+        }
+    }
 
-  start();
+    // MOMENTS
 
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
+    function getSetDayOfWeek (input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
+        if (input != null) {
+            input = parseWeekday(input, this.localeData());
+            return this.add(input - day, 'd');
+        } else {
+            return day;
+        }
+    }
 
-    // On windows, check that the root exists. On unix there is no need.
-    if (isWindows && !knownHard[base]) {
-      fs.lstatSync(base);
-      knownHard[base] = true;
+    function getSetLocaleDayOfWeek (input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
+        return input == null ? weekday : this.add(input - weekday, 'd');
     }
-  }
 
-  // walk down the path, swapping out linked pathparts for their real
-  // values
-  // NB: p.length changes.
-  while (pos < p.length) {
-    // find the next part
-    nextPartRe.lastIndex = pos;
-    var result = nextPartRe.exec(p);
-    previous = current;
-    current += result[0];
-    base = previous + result[1];
-    pos = nextPartRe.lastIndex;
+    function getSetISODayOfWeek (input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
 
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      continue;
+        // behaves the same as moment#day except
+        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
+        // as a setter, sunday should belong to the previous week.
+
+        if (input != null) {
+            var weekday = parseIsoWeekday(input, this.localeData());
+            return this.day(this.day() % 7 ? weekday : weekday - 7);
+        } else {
+            return this.day() || 7;
+        }
     }
 
-    var resolvedLink;
-    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-      // some known symbolic link.  no need to stat again.
-      resolvedLink = cache[base];
-    } else {
-      var stat = fs.lstatSync(base);
-      if (!stat.isSymbolicLink()) {
-        knownHard[base] = true;
-        if (cache) cache[base] = base;
-        continue;
-      }
+    var defaultWeekdaysRegex = matchWord;
+    function weekdaysRegex (isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysStrictRegex;
+            } else {
+                return this._weekdaysRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                this._weekdaysRegex = defaultWeekdaysRegex;
+            }
+            return this._weekdaysStrictRegex && isStrict ?
+                this._weekdaysStrictRegex : this._weekdaysRegex;
+        }
+    }
 
-      // read the link if it wasn't read before
-      // dev/ino always return 0 on windows, so skip the check.
-      var linkTarget = null;
-      if (!isWindows) {
-        var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
-        if (seenLinks.hasOwnProperty(id)) {
-          linkTarget = seenLinks[id];
+    var defaultWeekdaysShortRegex = matchWord;
+    function weekdaysShortRegex (isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysShortStrictRegex;
+            } else {
+                return this._weekdaysShortRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_weekdaysShortRegex')) {
+                this._weekdaysShortRegex = defaultWeekdaysShortRegex;
+            }
+            return this._weekdaysShortStrictRegex && isStrict ?
+                this._weekdaysShortStrictRegex : this._weekdaysShortRegex;
         }
-      }
-      if (linkTarget === null) {
-        fs.statSync(base);
-        linkTarget = fs.readlinkSync(base);
-      }
-      resolvedLink = pathModule.resolve(previous, linkTarget);
-      // track this, if given a cache.
-      if (cache) cache[base] = resolvedLink;
-      if (!isWindows) seenLinks[id] = linkTarget;
     }
 
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
-  }
+    var defaultWeekdaysMinRegex = matchWord;
+    function weekdaysMinRegex (isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysMinStrictRegex;
+            } else {
+                return this._weekdaysMinRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_weekdaysMinRegex')) {
+                this._weekdaysMinRegex = defaultWeekdaysMinRegex;
+            }
+            return this._weekdaysMinStrictRegex && isStrict ?
+                this._weekdaysMinStrictRegex : this._weekdaysMinRegex;
+        }
+    }
 
-  if (cache) cache[original] = p;
 
-  return p;
-};
+    function computeWeekdaysParse () {
+        function cmpLenRev(a, b) {
+            return b.length - a.length;
+        }
 
+        var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [],
+            i, mom, minp, shortp, longp;
+        for (i = 0; i < 7; i++) {
+            // make the regex if we don't have it already
+            mom = createUTC([2000, 1]).day(i);
+            minp = this.weekdaysMin(mom, '');
+            shortp = this.weekdaysShort(mom, '');
+            longp = this.weekdays(mom, '');
+            minPieces.push(minp);
+            shortPieces.push(shortp);
+            longPieces.push(longp);
+            mixedPieces.push(minp);
+            mixedPieces.push(shortp);
+            mixedPieces.push(longp);
+        }
+        // Sorting makes sure if one weekday (or abbr) is a prefix of another it
+        // will match the longer piece.
+        minPieces.sort(cmpLenRev);
+        shortPieces.sort(cmpLenRev);
+        longPieces.sort(cmpLenRev);
+        mixedPieces.sort(cmpLenRev);
+        for (i = 0; i < 7; i++) {
+            shortPieces[i] = regexEscape(shortPieces[i]);
+            longPieces[i] = regexEscape(longPieces[i]);
+            mixedPieces[i] = regexEscape(mixedPieces[i]);
+        }
 
-exports.realpath = function realpath(p, cache, cb) {
-  if (typeof cb !== 'function') {
-    cb = maybeCallback(cache);
-    cache = null;
-  }
+        this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
+        this._weekdaysShortRegex = this._weekdaysRegex;
+        this._weekdaysMinRegex = this._weekdaysRegex;
 
-  // make p is absolute
-  p = pathModule.resolve(p);
+        this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
+        this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
+        this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i');
+    }
 
-  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-    return process.nextTick(cb.bind(null, null, cache[p]));
-  }
+    // FORMATTING
 
-  var original = p,
-      seenLinks = {},
-      knownHard = {};
+    function hFormat() {
+        return this.hours() % 12 || 12;
+    }
 
-  // current character position in p
-  var pos;
-  // the partial path so far, including a trailing slash if any
-  var current;
-  // the partial path without a trailing slash (except when pointing at a root)
-  var base;
-  // the partial path scanned in the previous round, with slash
-  var previous;
+    function kFormat() {
+        return this.hours() || 24;
+    }
 
-  start();
+    addFormatToken('H', ['HH', 2], 0, 'hour');
+    addFormatToken('h', ['hh', 2], 0, hFormat);
+    addFormatToken('k', ['kk', 2], 0, kFormat);
 
-  function start() {
-    // Skip over roots
-    var m = splitRootRe.exec(p);
-    pos = m[0].length;
-    current = m[0];
-    base = m[0];
-    previous = '';
+    addFormatToken('hmm', 0, 0, function () {
+        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
+    });
 
-    // On windows, check that the root exists. On unix there is no need.
-    if (isWindows && !knownHard[base]) {
-      fs.lstat(base, function(err) {
-        if (err) return cb(err);
-        knownHard[base] = true;
-        LOOP();
-      });
-    } else {
-      process.nextTick(LOOP);
-    }
-  }
+    addFormatToken('hmmss', 0, 0, function () {
+        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) +
+            zeroFill(this.seconds(), 2);
+    });
 
-  // walk down the path, swapping out linked pathparts for their real
-  // values
-  function LOOP() {
-    // stop if scanned past end of path
-    if (pos >= p.length) {
-      if (cache) cache[original] = p;
-      return cb(null, p);
-    }
+    addFormatToken('Hmm', 0, 0, function () {
+        return '' + this.hours() + zeroFill(this.minutes(), 2);
+    });
 
-    // find the next part
-    nextPartRe.lastIndex = pos;
-    var result = nextPartRe.exec(p);
-    previous = current;
-    current += result[0];
-    base = previous + result[1];
-    pos = nextPartRe.lastIndex;
+    addFormatToken('Hmmss', 0, 0, function () {
+        return '' + this.hours() + zeroFill(this.minutes(), 2) +
+            zeroFill(this.seconds(), 2);
+    });
 
-    // continue if not a symlink
-    if (knownHard[base] || (cache && cache[base] === base)) {
-      return process.nextTick(LOOP);
+    function meridiem (token, lowercase) {
+        addFormatToken(token, 0, 0, function () {
+            return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
+        });
     }
 
-    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-      // known symbolic link.  no need to stat again.
-      return gotResolvedLink(cache[base]);
+    meridiem('a', true);
+    meridiem('A', false);
+
+    // ALIASES
+
+    addUnitAlias('hour', 'h');
+
+    // PRIORITY
+    addUnitPriority('hour', 13);
+
+    // PARSING
+
+    function matchMeridiem (isStrict, locale) {
+        return locale._meridiemParse;
     }
 
-    return fs.lstat(base, gotStat);
-  }
+    addRegexToken('a',  matchMeridiem);
+    addRegexToken('A',  matchMeridiem);
+    addRegexToken('H',  match1to2);
+    addRegexToken('h',  match1to2);
+    addRegexToken('k',  match1to2);
+    addRegexToken('HH', match1to2, match2);
+    addRegexToken('hh', match1to2, match2);
+    addRegexToken('kk', match1to2, match2);
 
-  function gotStat(err, stat) {
-    if (err) return cb(err);
+    addRegexToken('hmm', match3to4);
+    addRegexToken('hmmss', match5to6);
+    addRegexToken('Hmm', match3to4);
+    addRegexToken('Hmmss', match5to6);
 
-    // if not a symlink, skip to the next path part
-    if (!stat.isSymbolicLink()) {
-      knownHard[base] = true;
-      if (cache) cache[base] = base;
-      return process.nextTick(LOOP);
+    addParseToken(['H', 'HH'], HOUR);
+    addParseToken(['k', 'kk'], function (input, array, config) {
+        var kInput = toInt(input);
+        array[HOUR] = kInput === 24 ? 0 : kInput;
+    });
+    addParseToken(['a', 'A'], function (input, array, config) {
+        config._isPm = config._locale.isPM(input);
+        config._meridiem = input;
+    });
+    addParseToken(['h', 'hh'], function (input, array, config) {
+        array[HOUR] = toInt(input);
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('hmm', function (input, array, config) {
+        var pos = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos));
+        array[MINUTE] = toInt(input.substr(pos));
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('hmmss', function (input, array, config) {
+        var pos1 = input.length - 4;
+        var pos2 = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos1));
+        array[MINUTE] = toInt(input.substr(pos1, 2));
+        array[SECOND] = toInt(input.substr(pos2));
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('Hmm', function (input, array, config) {
+        var pos = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos));
+        array[MINUTE] = toInt(input.substr(pos));
+    });
+    addParseToken('Hmmss', function (input, array, config) {
+        var pos1 = input.length - 4;
+        var pos2 = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos1));
+        array[MINUTE] = toInt(input.substr(pos1, 2));
+        array[SECOND] = toInt(input.substr(pos2));
+    });
+
+    // LOCALES
+
+    function localeIsPM (input) {
+        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
+        // Using charAt should be more compatible.
+        return ((input + '').toLowerCase().charAt(0) === 'p');
     }
 
-    // stat & read the link if not read before
-    // call gotTarget as soon as the link target is known
-    // dev/ino always return 0 on windows, so skip the check.
-    if (!isWindows) {
-      var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
-      if (seenLinks.hasOwnProperty(id)) {
-        return gotTarget(null, seenLinks[id], base);
-      }
+    var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
+    function localeMeridiem (hours, minutes, isLower) {
+        if (hours > 11) {
+            return isLower ? 'pm' : 'PM';
+        } else {
+            return isLower ? 'am' : 'AM';
+        }
     }
-    fs.stat(base, function(err) {
-      if (err) return cb(err);
 
-      fs.readlink(base, function(err, target) {
-        if (!isWindows) seenLinks[id] = target;
-        gotTarget(err, target);
-      });
-    });
-  }
 
-  function gotTarget(err, target, base) {
-    if (err) return cb(err);
+    // MOMENTS
 
-    var resolvedLink = pathModule.resolve(previous, target);
-    if (cache) cache[base] = resolvedLink;
-    gotResolvedLink(resolvedLink);
-  }
+    // Setting the hour should keep the time, because the user explicitly
+    // specified which hour they want. So trying to maintain the same hour (in
+    // a new timezone) makes sense. Adding/subtracting hours does not follow
+    // this rule.
+    var getSetHour = makeGetSet('Hours', true);
 
-  function gotResolvedLink(resolvedLink) {
-    // resolve the link, then start over
-    p = pathModule.resolve(resolvedLink, p.slice(pos));
-    start();
-  }
-};
+    var baseConfig = {
+        calendar: defaultCalendar,
+        longDateFormat: defaultLongDateFormat,
+        invalidDate: defaultInvalidDate,
+        ordinal: defaultOrdinal,
+        dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse,
+        relativeTime: defaultRelativeTime,
 
+        months: defaultLocaleMonths,
+        monthsShort: defaultLocaleMonthsShort,
 
-/***/ }),
-/* 40 */
-/***/ (function(module, exports, __webpack_require__) {
+        week: defaultLocaleWeek,
 
-module.exports = minimatch
-minimatch.Minimatch = Minimatch
+        weekdays: defaultLocaleWeekdays,
+        weekdaysMin: defaultLocaleWeekdaysMin,
+        weekdaysShort: defaultLocaleWeekdaysShort,
 
-var path = { sep: '/' }
-try {
-  path = __webpack_require__(16)
-} catch (er) {}
+        meridiemParse: defaultLocaleMeridiemParse
+    };
 
-var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
-var expand = __webpack_require__(41)
+    // internal storage for locale config files
+    var locales = {};
+    var localeFamilies = {};
+    var globalLocale;
 
-var plTypes = {
-  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
-  '?': { open: '(?:', close: ')?' },
-  '+': { open: '(?:', close: ')+' },
-  '*': { open: '(?:', close: ')*' },
-  '@': { open: '(?:', close: ')' }
-}
+    function normalizeLocale(key) {
+        return key ? key.toLowerCase().replace('_', '-') : key;
+    }
 
-// any single thing other than /
-// don't need to escape / when using new RegExp()
-var qmark = '[^/]'
+    // pick the locale from the array
+    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
+    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
+    function chooseLocale(names) {
+        var i = 0, j, next, locale, split;
 
-// * => any number of characters
-var star = qmark + '*?'
+        while (i < names.length) {
+            split = normalizeLocale(names[i]).split('-');
+            j = split.length;
+            next = normalizeLocale(names[i + 1]);
+            next = next ? next.split('-') : null;
+            while (j > 0) {
+                locale = loadLocale(split.slice(0, j).join('-'));
+                if (locale) {
+                    return locale;
+                }
+                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
+                    //the next array item is better than a shallower substring of this one
+                    break;
+                }
+                j--;
+            }
+            i++;
+        }
+        return globalLocale;
+    }
 
-// ** when dots are allowed.  Anything goes, except .. and .
-// not (^ or / followed by one or two dots followed by $ or /),
-// followed by anything, any number of times.
-var twoStarDot = '(?:(?!(?:\\\/|^)(?:\\.{1,2})($|\\\/)).)*?'
+    function loadLocale(name) {
+        var oldLocale = null;
+        // TODO: Find a better way to register and load all the locales in Node
+        if (!locales[name] && (typeof module !== 'undefined') &&
+                module && module.exports) {
+            try {
+                oldLocale = globalLocale._abbr;
+                var aliasedRequire = require;
+                __webpack_require__(41)("./" + name);
+                getSetGlobalLocale(oldLocale);
+            } catch (e) {}
+        }
+        return locales[name];
+    }
 
-// not a ^ or / followed by a dot,
-// followed by anything, any number of times.
-var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
+    // This function will load locale and then set the global locale.  If
+    // no arguments are passed in, it will simply return the current global
+    // locale key.
+    function getSetGlobalLocale (key, values) {
+        var data;
+        if (key) {
+            if (isUndefined(values)) {
+                data = getLocale(key);
+            }
+            else {
+                data = defineLocale(key, values);
+            }
 
-// characters that need to be escaped in RegExp.
-var reSpecials = charSet('().*{}+?[]^$\\!')
+            if (data) {
+                // moment.duration._locale = moment._locale = data;
+                globalLocale = data;
+            }
+            else {
+                if ((typeof console !==  'undefined') && console.warn) {
+                    //warn user if arguments are passed but the locale could not be set
+                    console.warn('Locale ' + key +  ' not found. Did you forget to load it?');
+                }
+            }
+        }
 
-// "abc" -> { a:true, b:true, c:true }
-function charSet (s) {
-  return s.split('').reduce(function (set, c) {
-    set[c] = true
-    return set
-  }, {})
-}
+        return globalLocale._abbr;
+    }
 
-// normalizes slashes.
-var slashSplit = /\/+/
+    function defineLocale (name, config) {
+        if (config !== null) {
+            var locale, parentConfig = baseConfig;
+            config.abbr = name;
+            if (locales[name] != null) {
+                deprecateSimple('defineLocaleOverride',
+                        'use moment.updateLocale(localeName, config) to change ' +
+                        'an existing locale. moment.defineLocale(localeName, ' +
+                        'config) should only be used for creating a new locale ' +
+                        'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.');
+                parentConfig = locales[name]._config;
+            } else if (config.parentLocale != null) {
+                if (locales[config.parentLocale] != null) {
+                    parentConfig = locales[config.parentLocale]._config;
+                } else {
+                    locale = loadLocale(config.parentLocale);
+                    if (locale != null) {
+                        parentConfig = locale._config;
+                    } else {
+                        if (!localeFamilies[config.parentLocale]) {
+                            localeFamilies[config.parentLocale] = [];
+                        }
+                        localeFamilies[config.parentLocale].push({
+                            name: name,
+                            config: config
+                        });
+                        return null;
+                    }
+                }
+            }
+            locales[name] = new Locale(mergeConfigs(parentConfig, config));
 
-minimatch.filter = filter
-function filter (pattern, options) {
-  options = options || {}
-  return function (p, i, list) {
-    return minimatch(p, pattern, options)
-  }
-}
+            if (localeFamilies[name]) {
+                localeFamilies[name].forEach(function (x) {
+                    defineLocale(x.name, x.config);
+                });
+            }
 
-function ext (a, b) {
-  a = a || {}
-  b = b || {}
-  var t = {}
-  Object.keys(b).forEach(function (k) {
-    t[k] = b[k]
-  })
-  Object.keys(a).forEach(function (k) {
-    t[k] = a[k]
-  })
-  return t
-}
+            // backwards compat for now: also set the locale
+            // make sure we set the locale AFTER all child locales have been
+            // created, so we won't end up with the child locale set.
+            getSetGlobalLocale(name);
 
-minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return minimatch
 
-  var orig = minimatch
+            return locales[name];
+        } else {
+            // useful for testing
+            delete locales[name];
+            return null;
+        }
+    }
 
-  var m = function minimatch (p, pattern, options) {
-    return orig.minimatch(p, pattern, ext(def, options))
-  }
+    function updateLocale(name, config) {
+        if (config != null) {
+            var locale, tmpLocale, parentConfig = baseConfig;
+            // MERGE
+            tmpLocale = loadLocale(name);
+            if (tmpLocale != null) {
+                parentConfig = tmpLocale._config;
+            }
+            config = mergeConfigs(parentConfig, config);
+            locale = new Locale(config);
+            locale.parentLocale = locales[name];
+            locales[name] = locale;
 
-  m.Minimatch = function Minimatch (pattern, options) {
-    return new orig.Minimatch(pattern, ext(def, options))
-  }
+            // backwards compat for now: also set the locale
+            getSetGlobalLocale(name);
+        } else {
+            // pass null for config to unupdate, useful for tests
+            if (locales[name] != null) {
+                if (locales[name].parentLocale != null) {
+                    locales[name] = locales[name].parentLocale;
+                } else if (locales[name] != null) {
+                    delete locales[name];
+                }
+            }
+        }
+        return locales[name];
+    }
 
-  return m
-}
+    // returns locale data
+    function getLocale (key) {
+        var locale;
 
-Minimatch.defaults = function (def) {
-  if (!def || !Object.keys(def).length) return Minimatch
-  return minimatch.defaults(def).Minimatch
-}
+        if (key && key._locale && key._locale._abbr) {
+            key = key._locale._abbr;
+        }
 
-function minimatch (p, pattern, options) {
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required')
-  }
+        if (!key) {
+            return globalLocale;
+        }
 
-  if (!options) options = {}
+        if (!isArray(key)) {
+            //short-circuit everything else
+            locale = loadLocale(key);
+            if (locale) {
+                return locale;
+            }
+            key = [key];
+        }
 
-  // shortcut: comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    return false
-  }
+        return chooseLocale(key);
+    }
 
-  // "" only matches ""
-  if (pattern.trim() === '') return p === ''
+    function listLocales() {
+        return keys(locales);
+    }
 
-  return new Minimatch(pattern, options).match(p)
-}
+    function checkOverflow (m) {
+        var overflow;
+        var a = m._a;
 
-function Minimatch (pattern, options) {
-  if (!(this instanceof Minimatch)) {
-    return new Minimatch(pattern, options)
-  }
+        if (a && getParsingFlags(m).overflow === -2) {
+            overflow =
+                a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
+                a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
+                a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
+                a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
+                a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
+                a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
+                -1;
 
-  if (typeof pattern !== 'string') {
-    throw new TypeError('glob pattern string required')
-  }
+            if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
+                overflow = DATE;
+            }
+            if (getParsingFlags(m)._overflowWeeks && overflow === -1) {
+                overflow = WEEK;
+            }
+            if (getParsingFlags(m)._overflowWeekday && overflow === -1) {
+                overflow = WEEKDAY;
+            }
 
-  if (!options) options = {}
-  pattern = pattern.trim()
+            getParsingFlags(m).overflow = overflow;
+        }
 
-  // windows support: need to use /, not \
-  if (path.sep !== '/') {
-    pattern = pattern.split(path.sep).join('/')
-  }
+        return m;
+    }
 
-  this.options = options
-  this.set = []
-  this.pattern = pattern
-  this.regexp = null
-  this.negate = false
-  this.comment = false
-  this.empty = false
+    // Pick the first defined of two or three arguments.
+    function defaults(a, b, c) {
+        if (a != null) {
+            return a;
+        }
+        if (b != null) {
+            return b;
+        }
+        return c;
+    }
 
-  // make the set of regexps etc.
-  this.make()
-}
+    function currentDateArray(config) {
+        // hooks is actually the exported moment object
+        var nowValue = new Date(hooks.now());
+        if (config._useUTC) {
+            return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()];
+        }
+        return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];
+    }
 
-Minimatch.prototype.debug = function () {}
+    // convert an array to a date.
+    // the array should mirror the parameters below
+    // note: all values past the year are optional and will default to the lowest possible value.
+    // [year, month, day , hour, minute, second, millisecond]
+    function configFromArray (config) {
+        var i, date, input = [], currentDate, expectedWeekday, yearToUse;
 
-Minimatch.prototype.make = make
-function make () {
-  // don't do it more than once.
-  if (this._made) return
+        if (config._d) {
+            return;
+        }
 
-  var pattern = this.pattern
-  var options = this.options
+        currentDate = currentDateArray(config);
 
-  // empty patterns and comments match nothing.
-  if (!options.nocomment && pattern.charAt(0) === '#') {
-    this.comment = true
-    return
-  }
-  if (!pattern) {
-    this.empty = true
-    return
-  }
+        //compute day of the year from weeks and weekdays
+        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
+            dayOfYearFromWeekInfo(config);
+        }
 
-  // step 1: figure out negation, etc.
-  this.parseNegate()
+        //if the day of the year is set, figure out what it is
+        if (config._dayOfYear != null) {
+            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
 
-  // step 2: expand braces
-  var set = this.globSet = this.braceExpand()
+            if (config._dayOfYear > daysInYear(yearToUse) || config._dayOfYear === 0) {
+                getParsingFlags(config)._overflowDayOfYear = true;
+            }
 
-  if (options.debug) this.debug = console.error
+            date = createUTCDate(yearToUse, 0, config._dayOfYear);
+            config._a[MONTH] = date.getUTCMonth();
+            config._a[DATE] = date.getUTCDate();
+        }
 
-  this.debug(this.pattern, set)
+        // Default to current date.
+        // * if no year, month, day of month are given, default to today
+        // * if day of month is given, default month and year
+        // * if month is given, default only year
+        // * if year is given, don't default anything
+        for (i = 0; i < 3 && config._a[i] == null; ++i) {
+            config._a[i] = input[i] = currentDate[i];
+        }
 
-  // step 3: now we have a set, so turn each one into a series of path-portion
-  // matching patterns.
-  // These will be regexps, except in the case of "**", which is
-  // set to the GLOBSTAR object for globstar behavior,
-  // and will not contain any / characters
-  set = this.globParts = set.map(function (s) {
-    return s.split(slashSplit)
-  })
+        // Zero out whatever was not defaulted, including time
+        for (; i < 7; i++) {
+            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
+        }
 
-  this.debug(this.pattern, set)
+        // Check for 24:00:00.000
+        if (config._a[HOUR] === 24 &&
+                config._a[MINUTE] === 0 &&
+                config._a[SECOND] === 0 &&
+                config._a[MILLISECOND] === 0) {
+            config._nextDay = true;
+            config._a[HOUR] = 0;
+        }
 
-  // glob --> regexps
-  set = set.map(function (s, si, set) {
-    return s.map(this.parse, this)
-  }, this)
+        config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
+        expectedWeekday = config._useUTC ? config._d.getUTCDay() : config._d.getDay();
 
-  this.debug(this.pattern, set)
+        // Apply timezone offset from input. The actual utcOffset can be changed
+        // with parseZone.
+        if (config._tzm != null) {
+            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
+        }
 
-  // filter out everything that didn't compile properly.
-  set = set.filter(function (s) {
-    return s.indexOf(false) === -1
-  })
+        if (config._nextDay) {
+            config._a[HOUR] = 24;
+        }
 
-  this.debug(this.pattern, set)
+        // check for mismatching day of week
+        if (config._w && typeof config._w.d !== 'undefined' && config._w.d !== expectedWeekday) {
+            getParsingFlags(config).weekdayMismatch = true;
+        }
+    }
 
-  this.set = set
-}
+    function dayOfYearFromWeekInfo(config) {
+        var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow;
 
-Minimatch.prototype.parseNegate = parseNegate
-function parseNegate () {
-  var pattern = this.pattern
-  var negate = false
-  var options = this.options
-  var negateOffset = 0
+        w = config._w;
+        if (w.GG != null || w.W != null || w.E != null) {
+            dow = 1;
+            doy = 4;
 
-  if (options.nonegate) return
+            // TODO: We need to take the current isoWeekYear, but that depends on
+            // how we interpret now (local, utc, fixed offset). So create
+            // a now version of current config (take local/utc/offset flags, and
+            // create now).
+            weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year);
+            week = defaults(w.W, 1);
+            weekday = defaults(w.E, 1);
+            if (weekday < 1 || weekday > 7) {
+                weekdayOverflow = true;
+            }
+        } else {
+            dow = config._locale._week.dow;
+            doy = config._locale._week.doy;
 
-  for (var i = 0, l = pattern.length
-    ; i < l && pattern.charAt(i) === '!'
-    ; i++) {
-    negate = !negate
-    negateOffset++
-  }
+            var curWeek = weekOfYear(createLocal(), dow, doy);
 
-  if (negateOffset) this.pattern = pattern.substr(negateOffset)
-  this.negate = negate
-}
+            weekYear = defaults(w.gg, config._a[YEAR], curWeek.year);
 
-// Brace expansion:
-// a{b,c}d -> abd acd
-// a{b,}c -> abc ac
-// a{0..3}d -> a0d a1d a2d a3d
-// a{b,c{d,e}f}g -> abg acdfg acefg
-// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg
-//
-// Invalid sets are not expanded.
-// a{2..}b -> a{2..}b
-// a{b}c -> a{b}c
-minimatch.braceExpand = function (pattern, options) {
-  return braceExpand(pattern, options)
-}
+            // Default to current week.
+            week = defaults(w.w, curWeek.week);
 
-Minimatch.prototype.braceExpand = braceExpand
+            if (w.d != null) {
+                // weekday -- low day numbers are considered next week
+                weekday = w.d;
+                if (weekday < 0 || weekday > 6) {
+                    weekdayOverflow = true;
+                }
+            } else if (w.e != null) {
+                // local weekday -- counting starts from beginning of week
+                weekday = w.e + dow;
+                if (w.e < 0 || w.e > 6) {
+                    weekdayOverflow = true;
+                }
+            } else {
+                // default to beginning of week
+                weekday = dow;
+            }
+        }
+        if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {
+            getParsingFlags(config)._overflowWeeks = true;
+        } else if (weekdayOverflow != null) {
+            getParsingFlags(config)._overflowWeekday = true;
+        } else {
+            temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);
+            config._a[YEAR] = temp.year;
+            config._dayOfYear = temp.dayOfYear;
+        }
+    }
+
+    // iso 8601 regex
+    // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
+    var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
+    var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
+
+    var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/;
+
+    var isoDates = [
+        ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
+        ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/],
+        ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/],
+        ['GGGG-[W]WW', /\d{4}-W\d\d/, false],
+        ['YYYY-DDD', /\d{4}-\d{3}/],
+        ['YYYY-MM', /\d{4}-\d\d/, false],
+        ['YYYYYYMMDD', /[+-]\d{10}/],
+        ['YYYYMMDD', /\d{8}/],
+        // YYYYMM is NOT allowed by the standard
+        ['GGGG[W]WWE', /\d{4}W\d{3}/],
+        ['GGGG[W]WW', /\d{4}W\d{2}/, false],
+        ['YYYYDDD', /\d{7}/]
+    ];
 
-function braceExpand (pattern, options) {
-  if (!options) {
-    if (this instanceof Minimatch) {
-      options = this.options
-    } else {
-      options = {}
-    }
-  }
+    // iso time formats and regexes
+    var isoTimes = [
+        ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/],
+        ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/],
+        ['HH:mm:ss', /\d\d:\d\d:\d\d/],
+        ['HH:mm', /\d\d:\d\d/],
+        ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/],
+        ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/],
+        ['HHmmss', /\d\d\d\d\d\d/],
+        ['HHmm', /\d\d\d\d/],
+        ['HH', /\d\d/]
+    ];
 
-  pattern = typeof pattern === 'undefined'
-    ? this.pattern : pattern
+    var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
 
-  if (typeof pattern === 'undefined') {
-    throw new TypeError('undefined pattern')
-  }
+    // date from iso format
+    function configFromISO(config) {
+        var i, l,
+            string = config._i,
+            match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
+            allowTime, dateFormat, timeFormat, tzFormat;
 
-  if (options.nobrace ||
-    !pattern.match(/\{.*\}/)) {
-    // shortcut. no need to expand.
-    return [pattern]
-  }
+        if (match) {
+            getParsingFlags(config).iso = true;
 
-  return expand(pattern)
-}
+            for (i = 0, l = isoDates.length; i < l; i++) {
+                if (isoDates[i][1].exec(match[1])) {
+                    dateFormat = isoDates[i][0];
+                    allowTime = isoDates[i][2] !== false;
+                    break;
+                }
+            }
+            if (dateFormat == null) {
+                config._isValid = false;
+                return;
+            }
+            if (match[3]) {
+                for (i = 0, l = isoTimes.length; i < l; i++) {
+                    if (isoTimes[i][1].exec(match[3])) {
+                        // match[2] should be 'T' or space
+                        timeFormat = (match[2] || ' ') + isoTimes[i][0];
+                        break;
+                    }
+                }
+                if (timeFormat == null) {
+                    config._isValid = false;
+                    return;
+                }
+            }
+            if (!allowTime && timeFormat != null) {
+                config._isValid = false;
+                return;
+            }
+            if (match[4]) {
+                if (tzRegex.exec(match[4])) {
+                    tzFormat = 'Z';
+                } else {
+                    config._isValid = false;
+                    return;
+                }
+            }
+            config._f = dateFormat + (timeFormat || '') + (tzFormat || '');
+            configFromStringAndFormat(config);
+        } else {
+            config._isValid = false;
+        }
+    }
 
-// parse a component of the expanded set.
-// At this point, no pattern may contain "/" in it
-// so we're going to return a 2d array, where each entry is the full
-// pattern, split on '/', and then turned into a regular expression.
-// A regexp is made at the end which joins each array with an
-// escaped /, and another full one which joins each regexp with |.
-//
-// Following the lead of Bash 4.1, note that "**" only has special meaning
-// when it is the *only* thing in a path portion.  Otherwise, any series
-// of * is equivalent to a single *.  Globstar behavior is enabled by
-// default, and can be disabled by setting options.noglobstar.
-Minimatch.prototype.parse = parse
-var SUBPARSE = {}
-function parse (pattern, isSub) {
-  if (pattern.length > 1024 * 64) {
-    throw new TypeError('pattern is too long')
-  }
+    // RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3
+    var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;
 
-  var options = this.options
+    function extractFromRFC2822Strings(yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) {
+        var result = [
+            untruncateYear(yearStr),
+            defaultLocaleMonthsShort.indexOf(monthStr),
+            parseInt(dayStr, 10),
+            parseInt(hourStr, 10),
+            parseInt(minuteStr, 10)
+        ];
 
-  // shortcuts
-  if (!options.noglobstar && pattern === '**') return GLOBSTAR
-  if (pattern === '') return ''
+        if (secondStr) {
+            result.push(parseInt(secondStr, 10));
+        }
 
-  var re = ''
-  var hasMagic = !!options.nocase
-  var escaping = false
-  // ? => one single character
-  var patternListStack = []
-  var negativeLists = []
-  var stateChar
-  var inClass = false
-  var reClassStart = -1
-  var classStart = -1
-  // . and .. never match anything that doesn't start with .,
-  // even when options.dot is set.
-  var patternStart = pattern.charAt(0) === '.' ? '' // anything
-  // not (start or / followed by . or .. followed by / or end)
-  : options.dot ? '(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))'
-  : '(?!\\.)'
-  var self = this
+        return result;
+    }
 
-  function clearStateChar () {
-    if (stateChar) {
-      // we had some state-tracking character
-      // that wasn't consumed by this pass.
-      switch (stateChar) {
-        case '*':
-          re += star
-          hasMagic = true
-        break
-        case '?':
-          re += qmark
-          hasMagic = true
-        break
-        default:
-          re += '\\' + stateChar
-        break
-      }
-      self.debug('clearStateChar %j %j', stateChar, re)
-      stateChar = false
+    function untruncateYear(yearStr) {
+        var year = parseInt(yearStr, 10);
+        if (year <= 49) {
+            return 2000 + year;
+        } else if (year <= 999) {
+            return 1900 + year;
+        }
+        return year;
     }
-  }
 
-  for (var i = 0, len = pattern.length, c
-    ; (i < len) && (c = pattern.charAt(i))
-    ; i++) {
-    this.debug('%s\t%s %s %j', pattern, i, re, c)
+    function preprocessRFC2822(s) {
+        // Remove comments and folding whitespace and replace multiple-spaces with a single space
+        return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+    }
 
-    // skip over any that are escaped.
-    if (escaping && reSpecials[c]) {
-      re += '\\' + c
-      escaping = false
-      continue
+    function checkWeekday(weekdayStr, parsedInput, config) {
+        if (weekdayStr) {
+            // TODO: Replace the vanilla JS Date object with an indepentent day-of-week check.
+            var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr),
+                weekdayActual = new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay();
+            if (weekdayProvided !== weekdayActual) {
+                getParsingFlags(config).weekdayMismatch = true;
+                config._isValid = false;
+                return false;
+            }
+        }
+        return true;
     }
 
-    switch (c) {
-      case '/':
-        // completely not allowed, even escaped.
-        // Should already be path-split by now.
-        return false
+    var obsOffsets = {
+        UT: 0,
+        GMT: 0,
+        EDT: -4 * 60,
+        EST: -5 * 60,
+        CDT: -5 * 60,
+        CST: -6 * 60,
+        MDT: -6 * 60,
+        MST: -7 * 60,
+        PDT: -7 * 60,
+        PST: -8 * 60
+    };
+
+    function calculateOffset(obsOffset, militaryOffset, numOffset) {
+        if (obsOffset) {
+            return obsOffsets[obsOffset];
+        } else if (militaryOffset) {
+            // the only allowed military tz is Z
+            return 0;
+        } else {
+            var hm = parseInt(numOffset, 10);
+            var m = hm % 100, h = (hm - m) / 100;
+            return h * 60 + m;
+        }
+    }
 
-      case '\\':
-        clearStateChar()
-        escaping = true
-      continue
+    // date and time from ref 2822 format
+    function configFromRFC2822(config) {
+        var match = rfc2822.exec(preprocessRFC2822(config._i));
+        if (match) {
+            var parsedArray = extractFromRFC2822Strings(match[4], match[3], match[2], match[5], match[6], match[7]);
+            if (!checkWeekday(match[1], parsedArray, config)) {
+                return;
+            }
 
-      // the various stateChar values
-      // for the "extglob" stuff.
-      case '?':
-      case '*':
-      case '+':
-      case '@':
-      case '!':
-        this.debug('%s\t%s %s %j <-- stateChar', pattern, i, re, c)
+            config._a = parsedArray;
+            config._tzm = calculateOffset(match[8], match[9], match[10]);
 
-        // all of those are literals inside a class, except that
-        // the glob [!a] means [^a] in regexp
-        if (inClass) {
-          this.debug('  in class')
-          if (c === '!' && i === classStart + 1) c = '^'
-          re += c
-          continue
+            config._d = createUTCDate.apply(null, config._a);
+            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
+
+            getParsingFlags(config).rfc2822 = true;
+        } else {
+            config._isValid = false;
         }
+    }
 
-        // if we already have a stateChar, then it means
-        // that there was something like ** or +? in there.
-        // Handle the stateChar, then proceed with this one.
-        self.debug('call clearStateChar %j', stateChar)
-        clearStateChar()
-        stateChar = c
-        // if extglob is disabled, then +(asdf|foo) isn't a thing.
-        // just clear the statechar *now*, rather than even diving into
-        // the patternList stuff.
-        if (options.noext) clearStateChar()
-      continue
+    // date from iso format or fallback
+    function configFromString(config) {
+        var matched = aspNetJsonRegex.exec(config._i);
 
-      case '(':
-        if (inClass) {
-          re += '('
-          continue
+        if (matched !== null) {
+            config._d = new Date(+matched[1]);
+            return;
         }
 
-        if (!stateChar) {
-          re += '\\('
-          continue
+        configFromISO(config);
+        if (config._isValid === false) {
+            delete config._isValid;
+        } else {
+            return;
         }
 
-        patternListStack.push({
-          type: stateChar,
-          start: i - 1,
-          reStart: re.length,
-          open: plTypes[stateChar].open,
-          close: plTypes[stateChar].close
-        })
-        // negation is (?:(?!js)[^/]*)
-        re += stateChar === '!' ? '(?:(?!(?:' : '(?:'
-        this.debug('plType %j %j', stateChar, re)
-        stateChar = false
-      continue
-
-      case ')':
-        if (inClass || !patternListStack.length) {
-          re += '\\)'
-          continue
+        configFromRFC2822(config);
+        if (config._isValid === false) {
+            delete config._isValid;
+        } else {
+            return;
         }
 
-        clearStateChar()
-        hasMagic = true
-        var pl = patternListStack.pop()
-        // negation is (?:(?!js)[^/]*)
-        // The others are (?:<pattern>)<type>
-        re += pl.close
-        if (pl.type === '!') {
-          negativeLists.push(pl)
-        }
-        pl.reEnd = re.length
-      continue
+        // Final attempt, use Input Fallback
+        hooks.createFromInputFallback(config);
+    }
 
-      case '|':
-        if (inClass || !patternListStack.length || escaping) {
-          re += '\\|'
-          escaping = false
-          continue
+    hooks.createFromInputFallback = deprecate(
+        'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' +
+        'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' +
+        'discouraged and will be removed in an upcoming major release. Please refer to ' +
+        'http://momentjs.com/guides/#/warnings/js-date/ for more info.',
+        function (config) {
+            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
         }
+    );
 
-        clearStateChar()
-        re += '|'
-      continue
+    // constant that refers to the ISO standard
+    hooks.ISO_8601 = function () {};
 
-      // these are mostly the same in regexp and glob
-      case '[':
-        // swallow any state-tracking char before the [
-        clearStateChar()
+    // constant that refers to the RFC 2822 form
+    hooks.RFC_2822 = function () {};
 
-        if (inClass) {
-          re += '\\' + c
-          continue
+    // date from string and format string
+    function configFromStringAndFormat(config) {
+        // TODO: Move this to another part of the creation flow to prevent circular deps
+        if (config._f === hooks.ISO_8601) {
+            configFromISO(config);
+            return;
+        }
+        if (config._f === hooks.RFC_2822) {
+            configFromRFC2822(config);
+            return;
+        }
+        config._a = [];
+        getParsingFlags(config).empty = true;
+
+        // This array is used to make a Date, either with `new Date` or `Date.UTC`
+        var string = '' + config._i,
+            i, parsedInput, tokens, token, skipped,
+            stringLength = string.length,
+            totalParsedInputLength = 0;
+
+        tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
+
+        for (i = 0; i < tokens.length; i++) {
+            token = tokens[i];
+            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
+            // console.log('token', token, 'parsedInput', parsedInput,
+            //         'regex', getParseRegexForToken(token, config));
+            if (parsedInput) {
+                skipped = string.substr(0, string.indexOf(parsedInput));
+                if (skipped.length > 0) {
+                    getParsingFlags(config).unusedInput.push(skipped);
+                }
+                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
+                totalParsedInputLength += parsedInput.length;
+            }
+            // don't parse if it's not a known token
+            if (formatTokenFunctions[token]) {
+                if (parsedInput) {
+                    getParsingFlags(config).empty = false;
+                }
+                else {
+                    getParsingFlags(config).unusedTokens.push(token);
+                }
+                addTimeToArrayFromToken(token, parsedInput, config);
+            }
+            else if (config._strict && !parsedInput) {
+                getParsingFlags(config).unusedTokens.push(token);
+            }
         }
 
-        inClass = true
-        classStart = i
-        reClassStart = re.length
-        re += c
-      continue
-
-      case ']':
-        //  a right bracket shall lose its special
-        //  meaning and represent itself in
-        //  a bracket expression if it occurs
-        //  first in the list.  -- POSIX.2 2.8.3.2
-        if (i === classStart + 1 || !inClass) {
-          re += '\\' + c
-          escaping = false
-          continue
+        // add remaining unparsed input length to the string
+        getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
+        if (string.length > 0) {
+            getParsingFlags(config).unusedInput.push(string);
         }
 
-        // handle the case where we left a class open.
-        // "[z-a]" is valid, equivalent to "\[z-a\]"
-        if (inClass) {
-          // split where the last [ was, make sure we don't have
-          // an invalid re. if so, re-walk the contents of the
-          // would-be class to re-translate any characters that
-          // were passed through as-is
-          // TODO: It would probably be faster to determine this
-          // without a try/catch and a new RegExp, but it's tricky
-          // to do safely.  For now, this is safe and works.
-          var cs = pattern.substring(classStart + 1, i)
-          try {
-            RegExp('[' + cs + ']')
-          } catch (er) {
-            // not a valid class!
-            var sp = this.parse(cs, SUBPARSE)
-            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
-            hasMagic = hasMagic || sp[1]
-            inClass = false
-            continue
-          }
+        // clear _12h flag if hour is <= 12
+        if (config._a[HOUR] <= 12 &&
+            getParsingFlags(config).bigHour === true &&
+            config._a[HOUR] > 0) {
+            getParsingFlags(config).bigHour = undefined;
         }
 
-        // finish up the class.
-        hasMagic = true
-        inClass = false
-        re += c
-      continue
+        getParsingFlags(config).parsedDateParts = config._a.slice(0);
+        getParsingFlags(config).meridiem = config._meridiem;
+        // handle meridiem
+        config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
 
-      default:
-        // swallow any state char that wasn't consumed
-        clearStateChar()
+        configFromArray(config);
+        checkOverflow(config);
+    }
 
-        if (escaping) {
-          // no need
-          escaping = false
-        } else if (reSpecials[c]
-          && !(c === '^' && inClass)) {
-          re += '\\'
+
+    function meridiemFixWrap (locale, hour, meridiem) {
+        var isPm;
+
+        if (meridiem == null) {
+            // nothing to do
+            return hour;
+        }
+        if (locale.meridiemHour != null) {
+            return locale.meridiemHour(hour, meridiem);
+        } else if (locale.isPM != null) {
+            // Fallback
+            isPm = locale.isPM(meridiem);
+            if (isPm && hour < 12) {
+                hour += 12;
+            }
+            if (!isPm && hour === 12) {
+                hour = 0;
+            }
+            return hour;
+        } else {
+            // this is not supposed to happen
+            return hour;
         }
+    }
 
-        re += c
+    // date from string and array of format strings
+    function configFromStringAndArray(config) {
+        var tempConfig,
+            bestMoment,
 
-    } // switch
-  } // for
+            scoreToBeat,
+            i,
+            currentScore;
 
-  // handle the case where we left a class open.
-  // "[abc" is valid, equivalent to "\[abc"
-  if (inClass) {
-    // split where the last [ was, and escape it
-    // this is a huge pita.  We now have to re-walk
-    // the contents of the would-be class to re-translate
-    // any characters that were passed through as-is
-    cs = pattern.substr(classStart + 1)
-    sp = this.parse(cs, SUBPARSE)
-    re = re.substr(0, reClassStart) + '\\[' + sp[0]
-    hasMagic = hasMagic || sp[1]
-  }
+        if (config._f.length === 0) {
+            getParsingFlags(config).invalidFormat = true;
+            config._d = new Date(NaN);
+            return;
+        }
 
-  // handle the case where we had a +( thing at the *end*
-  // of the pattern.
-  // each pattern list stack adds 3 chars, and we need to go through
-  // and escape any | chars that were passed through as-is for the regexp.
-  // Go through and escape them, taking care not to double-escape any
-  // | chars that were already escaped.
-  for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
-    var tail = re.slice(pl.reStart + pl.open.length)
-    this.debug('setting tail', re, pl)
-    // maybe some even number of \, then maybe 1 \, followed by a |
-    tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) {
-      if (!$2) {
-        // the | isn't already escaped, so escape it.
-        $2 = '\\'
-      }
+        for (i = 0; i < config._f.length; i++) {
+            currentScore = 0;
+            tempConfig = copyConfig({}, config);
+            if (config._useUTC != null) {
+                tempConfig._useUTC = config._useUTC;
+            }
+            tempConfig._f = config._f[i];
+            configFromStringAndFormat(tempConfig);
 
-      // need to escape all those slashes *again*, without escaping the
-      // one that we need for escaping the | character.  As it works out,
-      // escaping an even number of slashes can be done by simply repeating
-      // it exactly after itself.  That's why this trick works.
-      //
-      // I am sorry that you have to see this.
-      return $1 + $1 + $2 + '|'
-    })
+            if (!isValid(tempConfig)) {
+                continue;
+            }
 
-    this.debug('tail=%j\n   %s', tail, tail, pl, re)
-    var t = pl.type === '*' ? star
-      : pl.type === '?' ? qmark
-      : '\\' + pl.type
+            // if there is any input that was not parsed add a penalty for that format
+            currentScore += getParsingFlags(tempConfig).charsLeftOver;
 
-    hasMagic = true
-    re = re.slice(0, pl.reStart) + t + '\\(' + tail
-  }
+            //or tokens
+            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
 
-  // handle trailing things that only matter at the very end.
-  clearStateChar()
-  if (escaping) {
-    // trailing \\
-    re += '\\\\'
-  }
+            getParsingFlags(tempConfig).score = currentScore;
 
-  // only need to apply the nodot start if the re starts with
-  // something that could conceivably capture a dot
-  var addPatternStart = false
-  switch (re.charAt(0)) {
-    case '.':
-    case '[':
-    case '(': addPatternStart = true
-  }
+            if (scoreToBeat == null || currentScore < scoreToBeat) {
+                scoreToBeat = currentScore;
+                bestMoment = tempConfig;
+            }
+        }
 
-  // Hack to work around lack of negative lookbehind in JS
-  // A pattern like: *.!(x).!(y|z) needs to ensure that a name
-  // like 'a.xyz.yz' doesn't match.  So, the first negative
-  // lookahead, has to look ALL the way ahead, to the end of
-  // the pattern.
-  for (var n = negativeLists.length - 1; n > -1; n--) {
-    var nl = negativeLists[n]
+        extend(config, bestMoment || tempConfig);
+    }
 
-    var nlBefore = re.slice(0, nl.reStart)
-    var nlFirst = re.slice(nl.reStart, nl.reEnd - 8)
-    var nlLast = re.slice(nl.reEnd - 8, nl.reEnd)
-    var nlAfter = re.slice(nl.reEnd)
+    function configFromObject(config) {
+        if (config._d) {
+            return;
+        }
 
-    nlLast += nlAfter
+        var i = normalizeObjectUnits(config._i);
+        config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) {
+            return obj && parseInt(obj, 10);
+        });
 
-    // Handle nested stuff like *(*.js|!(*.json)), where open parens
-    // mean that we should *not* include the ) in the bit that is considered
-    // "after" the negated section.
-    var openParensBefore = nlBefore.split('(').length - 1
-    var cleanAfter = nlAfter
-    for (i = 0; i < openParensBefore; i++) {
-      cleanAfter = cleanAfter.replace(/\)[+*?]?/, '')
+        configFromArray(config);
     }
-    nlAfter = cleanAfter
 
-    var dollar = ''
-    if (nlAfter === '' && isSub !== SUBPARSE) {
-      dollar = '$'
+    function createFromConfig (config) {
+        var res = new Moment(checkOverflow(prepareConfig(config)));
+        if (res._nextDay) {
+            // Adding is smart enough around DST
+            res.add(1, 'd');
+            res._nextDay = undefined;
+        }
+
+        return res;
     }
-    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
-    re = newRe
-  }
 
-  // if the re is not "" at this point, then we need to make sure
-  // it doesn't match against an empty path part.
-  // Otherwise a/* will match a/, which it should not.
-  if (re !== '' && hasMagic) {
-    re = '(?=.)' + re
-  }
+    function prepareConfig (config) {
+        var input = config._i,
+            format = config._f;
 
-  if (addPatternStart) {
-    re = patternStart + re
-  }
+        config._locale = config._locale || getLocale(config._l);
 
-  // parsing just a piece of a larger pattern.
-  if (isSub === SUBPARSE) {
-    return [re, hasMagic]
-  }
+        if (input === null || (format === undefined && input === '')) {
+            return createInvalid({nullInput: true});
+        }
 
-  // skip the regexp for non-magical patterns
-  // unescape anything in it, though, so that it'll be
-  // an exact match against a file etc.
-  if (!hasMagic) {
-    return globUnescape(pattern)
-  }
+        if (typeof input === 'string') {
+            config._i = input = config._locale.preparse(input);
+        }
 
-  var flags = options.nocase ? 'i' : ''
-  try {
-    var regExp = new RegExp('^' + re + '$', flags)
-  } catch (er) {
-    // If it was an invalid regular expression, then it can't match
-    // anything.  This trick looks for a character after the end of
-    // the string, which is of course impossible, except in multi-line
-    // mode, but it's not a /m regex.
-    return new RegExp('$.')
-  }
+        if (isMoment(input)) {
+            return new Moment(checkOverflow(input));
+        } else if (isDate(input)) {
+            config._d = input;
+        } else if (isArray(format)) {
+            configFromStringAndArray(config);
+        } else if (format) {
+            configFromStringAndFormat(config);
+        }  else {
+            configFromInput(config);
+        }
 
-  regExp._glob = pattern
-  regExp._src = re
+        if (!isValid(config)) {
+            config._d = null;
+        }
 
-  return regExp
-}
+        return config;
+    }
 
-minimatch.makeRe = function (pattern, options) {
-  return new Minimatch(pattern, options || {}).makeRe()
-}
+    function configFromInput(config) {
+        var input = config._i;
+        if (isUndefined(input)) {
+            config._d = new Date(hooks.now());
+        } else if (isDate(input)) {
+            config._d = new Date(input.valueOf());
+        } else if (typeof input === 'string') {
+            configFromString(config);
+        } else if (isArray(input)) {
+            config._a = map(input.slice(0), function (obj) {
+                return parseInt(obj, 10);
+            });
+            configFromArray(config);
+        } else if (isObject(input)) {
+            configFromObject(config);
+        } else if (isNumber(input)) {
+            // from milliseconds
+            config._d = new Date(input);
+        } else {
+            hooks.createFromInputFallback(config);
+        }
+    }
 
-Minimatch.prototype.makeRe = makeRe
-function makeRe () {
-  if (this.regexp || this.regexp === false) return this.regexp
-
-  // at this point, this.set is a 2d array of partial
-  // pattern strings, or "**".
-  //
-  // It's better to use .match().  This function shouldn't
-  // be used, really, but it's pretty convenient sometimes,
-  // when you just want to work with a regex.
-  var set = this.set
+    function createLocalOrUTC (input, format, locale, strict, isUTC) {
+        var c = {};
 
-  if (!set.length) {
-    this.regexp = false
-    return this.regexp
-  }
-  var options = this.options
+        if (locale === true || locale === false) {
+            strict = locale;
+            locale = undefined;
+        }
 
-  var twoStar = options.noglobstar ? star
-    : options.dot ? twoStarDot
-    : twoStarNoDot
-  var flags = options.nocase ? 'i' : ''
+        if ((isObject(input) && isObjectEmpty(input)) ||
+                (isArray(input) && input.length === 0)) {
+            input = undefined;
+        }
+        // object construction must be done this way.
+        // https://github.com/moment/moment/issues/1423
+        c._isAMomentObject = true;
+        c._useUTC = c._isUTC = isUTC;
+        c._l = locale;
+        c._i = input;
+        c._f = format;
+        c._strict = strict;
 
-  var re = set.map(function (pattern) {
-    return pattern.map(function (p) {
-      return (p === GLOBSTAR) ? twoStar
-      : (typeof p === 'string') ? regExpEscape(p)
-      : p._src
-    }).join('\\\/')
-  }).join('|')
+        return createFromConfig(c);
+    }
 
-  // must match entire pattern
-  // ending in a * or ** will make it less strict.
-  re = '^(?:' + re + ')$'
+    function createLocal (input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, false);
+    }
 
-  // can match anything, as long as it's not this.
-  if (this.negate) re = '^(?!' + re + ').*$'
+    var prototypeMin = deprecate(
+        'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/',
+        function () {
+            var other = createLocal.apply(null, arguments);
+            if (this.isValid() && other.isValid()) {
+                return other < this ? this : other;
+            } else {
+                return createInvalid();
+            }
+        }
+    );
 
-  try {
-    this.regexp = new RegExp(re, flags)
-  } catch (ex) {
-    this.regexp = false
-  }
-  return this.regexp
-}
+    var prototypeMax = deprecate(
+        'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/',
+        function () {
+            var other = createLocal.apply(null, arguments);
+            if (this.isValid() && other.isValid()) {
+                return other > this ? this : other;
+            } else {
+                return createInvalid();
+            }
+        }
+    );
 
-minimatch.match = function (list, pattern, options) {
-  options = options || {}
-  var mm = new Minimatch(pattern, options)
-  list = list.filter(function (f) {
-    return mm.match(f)
-  })
-  if (mm.options.nonull && !list.length) {
-    list.push(pattern)
-  }
-  return list
-}
+    // Pick a moment m from moments so that m[fn](other) is true for all
+    // other. This relies on the function fn to be transitive.
+    //
+    // moments should either be an array of moment objects or an array, whose
+    // first element is an array of moment objects.
+    function pickBy(fn, moments) {
+        var res, i;
+        if (moments.length === 1 && isArray(moments[0])) {
+            moments = moments[0];
+        }
+        if (!moments.length) {
+            return createLocal();
+        }
+        res = moments[0];
+        for (i = 1; i < moments.length; ++i) {
+            if (!moments[i].isValid() || moments[i][fn](res)) {
+                res = moments[i];
+            }
+        }
+        return res;
+    }
 
-Minimatch.prototype.match = match
-function match (f, partial) {
-  this.debug('match', f, this.pattern)
-  // short-circuit in the case of busted things.
-  // comments, etc.
-  if (this.comment) return false
-  if (this.empty) return f === ''
+    // TODO: Use [].sort instead?
+    function min () {
+        var args = [].slice.call(arguments, 0);
 
-  if (f === '/' && partial) return true
+        return pickBy('isBefore', args);
+    }
 
-  var options = this.options
+    function max () {
+        var args = [].slice.call(arguments, 0);
 
-  // windows: need to use /, not \
-  if (path.sep !== '/') {
-    f = f.split(path.sep).join('/')
-  }
+        return pickBy('isAfter', args);
+    }
 
-  // treat the test path as a set of pathparts.
-  f = f.split(slashSplit)
-  this.debug(this.pattern, 'split', f)
+    var now = function () {
+        return Date.now ? Date.now() : +(new Date());
+    };
 
-  // just ONE of the pattern sets in this.set needs to match
-  // in order for it to be valid.  If negating, then just one
-  // match means that we have failed.
-  // Either way, return on the first hit.
+    var ordering = ['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond'];
 
-  var set = this.set
-  this.debug(this.pattern, 'set', set)
+    function isDurationValid(m) {
+        for (var key in m) {
+            if (!(indexOf.call(ordering, key) !== -1 && (m[key] == null || !isNaN(m[key])))) {
+                return false;
+            }
+        }
 
-  // Find the basename of the path by looking for the last non-empty segment
-  var filename
-  var i
-  for (i = f.length - 1; i >= 0; i--) {
-    filename = f[i]
-    if (filename) break
-  }
+        var unitHasDecimal = false;
+        for (var i = 0; i < ordering.length; ++i) {
+            if (m[ordering[i]]) {
+                if (unitHasDecimal) {
+                    return false; // only allow non-integers for smallest unit
+                }
+                if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) {
+                    unitHasDecimal = true;
+                }
+            }
+        }
 
-  for (i = 0; i < set.length; i++) {
-    var pattern = set[i]
-    var file = f
-    if (options.matchBase && pattern.length === 1) {
-      file = [filename]
+        return true;
     }
-    var hit = this.matchOne(file, pattern, partial)
-    if (hit) {
-      if (options.flipNegate) return true
-      return !this.negate
+
+    function isValid$1() {
+        return this._isValid;
     }
-  }
 
-  // didn't get any hits.  this is success if it's a negative
-  // pattern, failure otherwise.
-  if (options.flipNegate) return false
-  return this.negate
-}
+    function createInvalid$1() {
+        return createDuration(NaN);
+    }
 
-// set partial to true to test if, for example,
-// "/a/b" matches the start of "/*/b/*/d"
-// Partial means, if you run out of file before you run
-// out of pattern, then that's fine, as long as all
-// the parts match.
-Minimatch.prototype.matchOne = function (file, pattern, partial) {
-  var options = this.options
+    function Duration (duration) {
+        var normalizedInput = normalizeObjectUnits(duration),
+            years = normalizedInput.year || 0,
+            quarters = normalizedInput.quarter || 0,
+            months = normalizedInput.month || 0,
+            weeks = normalizedInput.week || normalizedInput.isoWeek || 0,
+            days = normalizedInput.day || 0,
+            hours = normalizedInput.hour || 0,
+            minutes = normalizedInput.minute || 0,
+            seconds = normalizedInput.second || 0,
+            milliseconds = normalizedInput.millisecond || 0;
 
-  this.debug('matchOne',
-    { 'this': this, file: file, pattern: pattern })
+        this._isValid = isDurationValid(normalizedInput);
 
-  this.debug('matchOne', file.length, pattern.length)
+        // representation for dateAddRemove
+        this._milliseconds = +milliseconds +
+            seconds * 1e3 + // 1000
+            minutes * 6e4 + // 1000 * 60
+            hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978
+        // Because of dateAddRemove treats 24 hours as different from a
+        // day when working around DST, we need to store them separately
+        this._days = +days +
+            weeks * 7;
+        // It is impossible to translate months into days without knowing
+        // which months you are are talking about, so we have to store
+        // it separately.
+        this._months = +months +
+            quarters * 3 +
+            years * 12;
 
-  for (var fi = 0,
-      pi = 0,
-      fl = file.length,
-      pl = pattern.length
-      ; (fi < fl) && (pi < pl)
-      ; fi++, pi++) {
-    this.debug('matchOne loop')
-    var p = pattern[pi]
-    var f = file[fi]
+        this._data = {};
 
-    this.debug(pattern, p, f)
+        this._locale = getLocale();
 
-    // should be impossible.
-    // some invalid regexp stuff in the set.
-    if (p === false) return false
+        this._bubble();
+    }
 
-    if (p === GLOBSTAR) {
-      this.debug('GLOBSTAR', [pattern, p, f])
+    function isDuration (obj) {
+        return obj instanceof Duration;
+    }
 
-      // "**"
-      // a/**/b/**/c would match the following:
-      // a/b/x/y/z/c
-      // a/x/y/z/b/c
-      // a/b/x/b/x/c
-      // a/b/c
-      // To do this, take the rest of the pattern after
-      // the **, and see if it would match the file remainder.
-      // If so, return success.
-      // If not, the ** "swallows" a segment, and try again.
-      // This is recursively awful.
-      //
-      // a/**/b/**/c matching a/b/x/y/z/c
-      // - a matches a
-      // - doublestar
-      //   - matchOne(b/x/y/z/c, b/**/c)
-      //     - b matches b
-      //     - doublestar
-      //       - matchOne(x/y/z/c, c) -> no
-      //       - matchOne(y/z/c, c) -> no
-      //       - matchOne(z/c, c) -> no
-      //       - matchOne(c, c) yes, hit
-      var fr = fi
-      var pr = pi + 1
-      if (pr === pl) {
-        this.debug('** at the end')
-        // a ** at the end will just swallow the rest.
-        // We have found a match.
-        // however, it will not swallow /.x, unless
-        // options.dot is set.
-        // . and .. are *never* matched by **, for explosively
-        // exponential reasons.
-        for (; fi < fl; fi++) {
-          if (file[fi] === '.' || file[fi] === '..' ||
-            (!options.dot && file[fi].charAt(0) === '.')) return false
+    function absRound (number) {
+        if (number < 0) {
+            return Math.round(-1 * number) * -1;
+        } else {
+            return Math.round(number);
         }
-        return true
-      }
+    }
 
-      // ok, let's see if we can swallow whatever we can.
-      while (fr < fl) {
-        var swallowee = file[fr]
+    // FORMATTING
 
-        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
+    function offset (token, separator) {
+        addFormatToken(token, 0, 0, function () {
+            var offset = this.utcOffset();
+            var sign = '+';
+            if (offset < 0) {
+                offset = -offset;
+                sign = '-';
+            }
+            return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
+        });
+    }
 
-        // XXX remove this slice.  Just pass the start index.
-        if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
-          this.debug('globstar found match!', fr, fl, swallowee)
-          // found a match.
-          return true
-        } else {
-          // can't swallow "." or ".." ever.
-          // can only swallow ".foo" when explicitly asked.
-          if (swallowee === '.' || swallowee === '..' ||
-            (!options.dot && swallowee.charAt(0) === '.')) {
-            this.debug('dot detected!', file, fr, pattern, pr)
-            break
-          }
+    offset('Z', ':');
+    offset('ZZ', '');
 
-          // ** swallows a segment, and continue.
-          this.debug('globstar swallow a segment, and continue')
-          fr++
+    // PARSING
+
+    addRegexToken('Z',  matchShortOffset);
+    addRegexToken('ZZ', matchShortOffset);
+    addParseToken(['Z', 'ZZ'], function (input, array, config) {
+        config._useUTC = true;
+        config._tzm = offsetFromString(matchShortOffset, input);
+    });
+
+    // HELPERS
+
+    // timezone chunker
+    // '+10:00' > ['10',  '00']
+    // '-1530'  > ['-15', '30']
+    var chunkOffset = /([\+\-]|\d\d)/gi;
+
+    function offsetFromString(matcher, string) {
+        var matches = (string || '').match(matcher);
+
+        if (matches === null) {
+            return null;
         }
-      }
 
-      // no match was found.
-      // However, in partial mode, we can't say this is necessarily over.
-      // If there's more *pattern* left, then
-      if (partial) {
-        // ran out of file
-        this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
-        if (fr === fl) return true
-      }
-      return false
+        var chunk   = matches[matches.length - 1] || [];
+        var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
+        var minutes = +(parts[1] * 60) + toInt(parts[2]);
+
+        return minutes === 0 ?
+          0 :
+          parts[0] === '+' ? minutes : -minutes;
     }
 
-    // something other than **
-    // non-magic patterns just have to match exactly
-    // patterns with magic have been turned into regexps.
-    var hit
-    if (typeof p === 'string') {
-      if (options.nocase) {
-        hit = f.toLowerCase() === p.toLowerCase()
-      } else {
-        hit = f === p
-      }
-      this.debug('string match', p, f, hit)
-    } else {
-      hit = f.match(p)
-      this.debug('pattern match', p, f, hit)
+    // Return a moment from input, that is local/utc/zone equivalent to model.
+    function cloneWithOffset(input, model) {
+        var res, diff;
+        if (model._isUTC) {
+            res = model.clone();
+            diff = (isMoment(input) || isDate(input) ? input.valueOf() : createLocal(input).valueOf()) - res.valueOf();
+            // Use low-level api, because this fn is low-level api.
+            res._d.setTime(res._d.valueOf() + diff);
+            hooks.updateOffset(res, false);
+            return res;
+        } else {
+            return createLocal(input).local();
+        }
     }
 
-    if (!hit) return false
-  }
+    function getDateOffset (m) {
+        // On Firefox.24 Date#getTimezoneOffset returns a floating point.
+        // https://github.com/moment/moment/pull/1871
+        return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
+    }
 
-  // Note: ending in / means that we'll get a final ""
-  // at the end of the pattern.  This can only match a
-  // corresponding "" at the end of the file.
-  // If the file ends in /, then it can only match a
-  // a pattern that ends in /, unless the pattern just
-  // doesn't have any more for it. But, a/b/ should *not*
-  // match "a/b/*", even though "" matches against the
-  // [^/]*? pattern, except in partial mode, where it might
-  // simply not be reached yet.
-  // However, a/b/ should still satisfy a/*
+    // HOOKS
 
-  // now either we fell off the end of the pattern, or we're done.
-  if (fi === fl && pi === pl) {
-    // ran out of pattern and filename at the same time.
-    // an exact hit!
-    return true
-  } else if (fi === fl) {
-    // ran out of file, but still had pattern left.
-    // this is ok if we're doing the match as part of
-    // a glob fs traversal.
-    return partial
-  } else if (pi === pl) {
-    // ran out of pattern, still have file left.
-    // this is only acceptable if we're on the very last
-    // empty segment of a file with a trailing slash.
-    // a/* should match a/b/
-    var emptyFileEnd = (fi === fl - 1) && (file[fi] === '')
-    return emptyFileEnd
-  }
+    // This function will be called whenever a moment is mutated.
+    // It is intended to keep the offset in sync with the timezone.
+    hooks.updateOffset = function () {};
 
-  // should be unreachable.
-  throw new Error('wtf?')
-}
+    // MOMENTS
 
-// replace stuff like \* with *
-function globUnescape (s) {
-  return s.replace(/\\(.)/g, '$1')
-}
+    // keepLocalTime = true means only change the timezone, without
+    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
+    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
+    // +0200, so we adjust the time as needed, to be valid.
+    //
+    // Keeping the time actually adds/subtracts (one hour)
+    // from the actual represented time. That is why we call updateOffset
+    // a second time. In case it wants us to change the offset again
+    // _changeInProgress == true case, then we have to adjust, because
+    // there is no such time in the given timezone.
+    function getSetOffset (input, keepLocalTime, keepMinutes) {
+        var offset = this._offset || 0,
+            localAdjust;
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        if (input != null) {
+            if (typeof input === 'string') {
+                input = offsetFromString(matchShortOffset, input);
+                if (input === null) {
+                    return this;
+                }
+            } else if (Math.abs(input) < 16 && !keepMinutes) {
+                input = input * 60;
+            }
+            if (!this._isUTC && keepLocalTime) {
+                localAdjust = getDateOffset(this);
+            }
+            this._offset = input;
+            this._isUTC = true;
+            if (localAdjust != null) {
+                this.add(localAdjust, 'm');
+            }
+            if (offset !== input) {
+                if (!keepLocalTime || this._changeInProgress) {
+                    addSubtract(this, createDuration(input - offset, 'm'), 1, false);
+                } else if (!this._changeInProgress) {
+                    this._changeInProgress = true;
+                    hooks.updateOffset(this, true);
+                    this._changeInProgress = null;
+                }
+            }
+            return this;
+        } else {
+            return this._isUTC ? offset : getDateOffset(this);
+        }
+    }
 
-function regExpEscape (s) {
-  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
-}
+    function getSetZone (input, keepLocalTime) {
+        if (input != null) {
+            if (typeof input !== 'string') {
+                input = -input;
+            }
 
+            this.utcOffset(input, keepLocalTime);
 
-/***/ }),
-/* 41 */
-/***/ (function(module, exports, __webpack_require__) {
+            return this;
+        } else {
+            return -this.utcOffset();
+        }
+    }
 
-var concatMap = __webpack_require__(42);
-var balanced = __webpack_require__(43);
+    function setOffsetToUTC (keepLocalTime) {
+        return this.utcOffset(0, keepLocalTime);
+    }
 
-module.exports = expandTop;
+    function setOffsetToLocal (keepLocalTime) {
+        if (this._isUTC) {
+            this.utcOffset(0, keepLocalTime);
+            this._isUTC = false;
 
-var escSlash = '\0SLASH'+Math.random()+'\0';
-var escOpen = '\0OPEN'+Math.random()+'\0';
-var escClose = '\0CLOSE'+Math.random()+'\0';
-var escComma = '\0COMMA'+Math.random()+'\0';
-var escPeriod = '\0PERIOD'+Math.random()+'\0';
+            if (keepLocalTime) {
+                this.subtract(getDateOffset(this), 'm');
+            }
+        }
+        return this;
+    }
 
-function numeric(str) {
-  return parseInt(str, 10) == str
-    ? parseInt(str, 10)
-    : str.charCodeAt(0);
-}
+    function setOffsetToParsedOffset () {
+        if (this._tzm != null) {
+            this.utcOffset(this._tzm, false, true);
+        } else if (typeof this._i === 'string') {
+            var tZone = offsetFromString(matchOffset, this._i);
+            if (tZone != null) {
+                this.utcOffset(tZone);
+            }
+            else {
+                this.utcOffset(0, true);
+            }
+        }
+        return this;
+    }
 
-function escapeBraces(str) {
-  return str.split('\\\\').join(escSlash)
-            .split('\\{').join(escOpen)
-            .split('\\}').join(escClose)
-            .split('\\,').join(escComma)
-            .split('\\.').join(escPeriod);
-}
+    function hasAlignedHourOffset (input) {
+        if (!this.isValid()) {
+            return false;
+        }
+        input = input ? createLocal(input).utcOffset() : 0;
 
-function unescapeBraces(str) {
-  return str.split(escSlash).join('\\')
-            .split(escOpen).join('{')
-            .split(escClose).join('}')
-            .split(escComma).join(',')
-            .split(escPeriod).join('.');
-}
+        return (this.utcOffset() - input) % 60 === 0;
+    }
 
+    function isDaylightSavingTime () {
+        return (
+            this.utcOffset() > this.clone().month(0).utcOffset() ||
+            this.utcOffset() > this.clone().month(5).utcOffset()
+        );
+    }
 
-// Basically just str.split(","), but handling cases
-// where we have nested braced sections, which should be
-// treated as individual members, like {a,{b,c},d}
-function parseCommaParts(str) {
-  if (!str)
-    return [''];
+    function isDaylightSavingTimeShifted () {
+        if (!isUndefined(this._isDSTShifted)) {
+            return this._isDSTShifted;
+        }
 
-  var parts = [];
-  var m = balanced('{', '}', str);
+        var c = {};
 
-  if (!m)
-    return str.split(',');
+        copyConfig(c, this);
+        c = prepareConfig(c);
 
-  var pre = m.pre;
-  var body = m.body;
-  var post = m.post;
-  var p = pre.split(',');
+        if (c._a) {
+            var other = c._isUTC ? createUTC(c._a) : createLocal(c._a);
+            this._isDSTShifted = this.isValid() &&
+                compareArrays(c._a, other.toArray()) > 0;
+        } else {
+            this._isDSTShifted = false;
+        }
 
-  p[p.length-1] += '{' + body + '}';
-  var postParts = parseCommaParts(post);
-  if (post.length) {
-    p[p.length-1] += postParts.shift();
-    p.push.apply(p, postParts);
-  }
+        return this._isDSTShifted;
+    }
 
-  parts.push.apply(parts, p);
+    function isLocal () {
+        return this.isValid() ? !this._isUTC : false;
+    }
 
-  return parts;
-}
+    function isUtcOffset () {
+        return this.isValid() ? this._isUTC : false;
+    }
 
-function expandTop(str) {
-  if (!str)
-    return [];
+    function isUtc () {
+        return this.isValid() ? this._isUTC && this._offset === 0 : false;
+    }
 
-  // I don't know why Bash 4.3 does this, but it does.
-  // Anything starting with {} will have the first two bytes preserved
-  // but *only* at the top level, so {},a}b will not expand to anything,
-  // but a{},b}c will be expanded to [a}c,abc].
-  // One could argue that this is a bug in Bash, but since the goal of
-  // this module is to match Bash's rules, we escape a leading {}
-  if (str.substr(0, 2) === '{}') {
-    str = '\\{\\}' + str.substr(2);
-  }
+    // ASP.NET json date format regex
+    var aspNetRegex = /^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/;
 
-  return expand(escapeBraces(str), true).map(unescapeBraces);
-}
+    // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
+    // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
+    // and further modified to allow for strings containing both week and day
+    var isoRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
 
-function identity(e) {
-  return e;
-}
+    function createDuration (input, key) {
+        var duration = input,
+            // matching against regexp is expensive, do it on demand
+            match = null,
+            sign,
+            ret,
+            diffRes;
 
-function embrace(str) {
-  return '{' + str + '}';
-}
-function isPadded(el) {
-  return /^-?0\d/.test(el);
-}
+        if (isDuration(input)) {
+            duration = {
+                ms : input._milliseconds,
+                d  : input._days,
+                M  : input._months
+            };
+        } else if (isNumber(input)) {
+            duration = {};
+            if (key) {
+                duration[key] = input;
+            } else {
+                duration.milliseconds = input;
+            }
+        } else if (!!(match = aspNetRegex.exec(input))) {
+            sign = (match[1] === '-') ? -1 : 1;
+            duration = {
+                y  : 0,
+                d  : toInt(match[DATE])                         * sign,
+                h  : toInt(match[HOUR])                         * sign,
+                m  : toInt(match[MINUTE])                       * sign,
+                s  : toInt(match[SECOND])                       * sign,
+                ms : toInt(absRound(match[MILLISECOND] * 1000)) * sign // the millisecond decimal point is included in the match
+            };
+        } else if (!!(match = isoRegex.exec(input))) {
+            sign = (match[1] === '-') ? -1 : 1;
+            duration = {
+                y : parseIso(match[2], sign),
+                M : parseIso(match[3], sign),
+                w : parseIso(match[4], sign),
+                d : parseIso(match[5], sign),
+                h : parseIso(match[6], sign),
+                m : parseIso(match[7], sign),
+                s : parseIso(match[8], sign)
+            };
+        } else if (duration == null) {// checks for null or undefined
+            duration = {};
+        } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
+            diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to));
 
-function lte(i, y) {
-  return i <= y;
-}
-function gte(i, y) {
-  return i >= y;
-}
+            duration = {};
+            duration.ms = diffRes.milliseconds;
+            duration.M = diffRes.months;
+        }
 
-function expand(str, isTop) {
-  var expansions = [];
+        ret = new Duration(duration);
 
-  var m = balanced('{', '}', str);
-  if (!m || /\$$/.test(m.pre)) return [str];
+        if (isDuration(input) && hasOwnProp(input, '_locale')) {
+            ret._locale = input._locale;
+        }
 
-  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
-  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
-  var isSequence = isNumericSequence || isAlphaSequence;
-  var isOptions = m.body.indexOf(',') >= 0;
-  if (!isSequence && !isOptions) {
-    // {a},b}
-    if (m.post.match(/,.*\}/)) {
-      str = m.pre + '{' + m.body + escClose + m.post;
-      return expand(str);
+        return ret;
     }
-    return [str];
-  }
 
-  var n;
-  if (isSequence) {
-    n = m.body.split(/\.\./);
-  } else {
-    n = parseCommaParts(m.body);
-    if (n.length === 1) {
-      // x{{a,b}}y ==> x{a}y x{b}y
-      n = expand(n[0], false).map(embrace);
-      if (n.length === 1) {
-        var post = m.post.length
-          ? expand(m.post, false)
-          : [''];
-        return post.map(function(p) {
-          return m.pre + n[0] + p;
-        });
-      }
+    createDuration.fn = Duration.prototype;
+    createDuration.invalid = createInvalid$1;
+
+    function parseIso (inp, sign) {
+        // We'd normally use ~~inp for this, but unfortunately it also
+        // converts floats to ints.
+        // inp may be undefined, so careful calling replace on it.
+        var res = inp && parseFloat(inp.replace(',', '.'));
+        // apply sign while we're at it
+        return (isNaN(res) ? 0 : res) * sign;
     }
-  }
 
-  // at this point, n is the parts, and we know it's not a comma set
-  // with a single entry.
+    function positiveMomentsDifference(base, other) {
+        var res = {};
 
-  // no need to expand pre, since it is guaranteed to be free of brace-sets
-  var pre = m.pre;
-  var post = m.post.length
-    ? expand(m.post, false)
-    : [''];
+        res.months = other.month() - base.month() +
+            (other.year() - base.year()) * 12;
+        if (base.clone().add(res.months, 'M').isAfter(other)) {
+            --res.months;
+        }
 
-  var N;
+        res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
 
-  if (isSequence) {
-    var x = numeric(n[0]);
-    var y = numeric(n[1]);
-    var width = Math.max(n[0].length, n[1].length)
-    var incr = n.length == 3
-      ? Math.abs(numeric(n[2]))
-      : 1;
-    var test = lte;
-    var reverse = y < x;
-    if (reverse) {
-      incr *= -1;
-      test = gte;
+        return res;
     }
-    var pad = n.some(isPadded);
 
-    N = [];
+    function momentsDifference(base, other) {
+        var res;
+        if (!(base.isValid() && other.isValid())) {
+            return {milliseconds: 0, months: 0};
+        }
 
-    for (var i = x; test(i, y); i += incr) {
-      var c;
-      if (isAlphaSequence) {
-        c = String.fromCharCode(i);
-        if (c === '\\')
-          c = '';
-      } else {
-        c = String(i);
-        if (pad) {
-          var need = width - c.length;
-          if (need > 0) {
-            var z = new Array(need + 1).join('0');
-            if (i < 0)
-              c = '-' + z + c.slice(1);
-            else
-              c = z + c;
-          }
+        other = cloneWithOffset(other, base);
+        if (base.isBefore(other)) {
+            res = positiveMomentsDifference(base, other);
+        } else {
+            res = positiveMomentsDifference(other, base);
+            res.milliseconds = -res.milliseconds;
+            res.months = -res.months;
         }
-      }
-      N.push(c);
-    }
-  } else {
-    N = concatMap(n, function(el) { return expand(el, false) });
-  }
 
-  for (var j = 0; j < N.length; j++) {
-    for (var k = 0; k < post.length; k++) {
-      var expansion = pre + N[j] + post[k];
-      if (!isTop || isSequence || expansion)
-        expansions.push(expansion);
+        return res;
     }
-  }
 
-  return expansions;
-}
+    // TODO: remove 'name' arg after deprecation is removed
+    function createAdder(direction, name) {
+        return function (val, period) {
+            var dur, tmp;
+            //invert the arguments, but complain about it
+            if (period !== null && !isNaN(+period)) {
+                deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period). ' +
+                'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.');
+                tmp = val; val = period; period = tmp;
+            }
 
+            val = typeof val === 'string' ? +val : val;
+            dur = createDuration(val, period);
+            addSubtract(this, dur, direction);
+            return this;
+        };
+    }
 
+    function addSubtract (mom, duration, isAdding, updateOffset) {
+        var milliseconds = duration._milliseconds,
+            days = absRound(duration._days),
+            months = absRound(duration._months);
 
-/***/ }),
-/* 42 */
-/***/ (function(module, exports) {
+        if (!mom.isValid()) {
+            // No op
+            return;
+        }
 
-module.exports = function (xs, fn) {
-    var res = [];
-    for (var i = 0; i < xs.length; i++) {
-        var x = fn(xs[i], i);
-        if (isArray(x)) res.push.apply(res, x);
-        else res.push(x);
-    }
-    return res;
-};
-
-var isArray = Array.isArray || function (xs) {
-    return Object.prototype.toString.call(xs) === '[object Array]';
-};
+        updateOffset = updateOffset == null ? true : updateOffset;
 
+        if (months) {
+            setMonth(mom, get(mom, 'Month') + months * isAdding);
+        }
+        if (days) {
+            set$1(mom, 'Date', get(mom, 'Date') + days * isAdding);
+        }
+        if (milliseconds) {
+            mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding);
+        }
+        if (updateOffset) {
+            hooks.updateOffset(mom, days || months);
+        }
+    }
 
-/***/ }),
-/* 43 */
-/***/ (function(module, exports, __webpack_require__) {
+    var add      = createAdder(1, 'add');
+    var subtract = createAdder(-1, 'subtract');
 
-"use strict";
+    function getCalendarFormat(myMoment, now) {
+        var diff = myMoment.diff(now, 'days', true);
+        return diff < -6 ? 'sameElse' :
+                diff < -1 ? 'lastWeek' :
+                diff < 0 ? 'lastDay' :
+                diff < 1 ? 'sameDay' :
+                diff < 2 ? 'nextDay' :
+                diff < 7 ? 'nextWeek' : 'sameElse';
+    }
 
-module.exports = balanced;
-function balanced(a, b, str) {
-  if (a instanceof RegExp) a = maybeMatch(a, str);
-  if (b instanceof RegExp) b = maybeMatch(b, str);
+    function calendar$1 (time, formats) {
+        // We want to compare the start of today, vs this.
+        // Getting start-of-today depends on whether we're local/utc/offset or not.
+        var now = time || createLocal(),
+            sod = cloneWithOffset(now, this).startOf('day'),
+            format = hooks.calendarFormat(this, sod) || 'sameElse';
 
-  var r = range(a, b, str);
+        var output = formats && (isFunction(formats[format]) ? formats[format].call(this, now) : formats[format]);
 
-  return r && {
-    start: r[0],
-    end: r[1],
-    pre: str.slice(0, r[0]),
-    body: str.slice(r[0] + a.length, r[1]),
-    post: str.slice(r[1] + b.length)
-  };
-}
+        return this.format(output || this.localeData().calendar(format, this, createLocal(now)));
+    }
 
-function maybeMatch(reg, str) {
-  var m = str.match(reg);
-  return m ? m[0] : null;
-}
+    function clone () {
+        return new Moment(this);
+    }
 
-balanced.range = range;
-function range(a, b, str) {
-  var begs, beg, left, right, result;
-  var ai = str.indexOf(a);
-  var bi = str.indexOf(b, ai + 1);
-  var i = ai;
+    function isAfter (input, units) {
+        var localInput = isMoment(input) ? input : createLocal(input);
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(units) || 'millisecond';
+        if (units === 'millisecond') {
+            return this.valueOf() > localInput.valueOf();
+        } else {
+            return localInput.valueOf() < this.clone().startOf(units).valueOf();
+        }
+    }
 
-  if (ai >= 0 && bi > 0) {
-    begs = [];
-    left = str.length;
+    function isBefore (input, units) {
+        var localInput = isMoment(input) ? input : createLocal(input);
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(units) || 'millisecond';
+        if (units === 'millisecond') {
+            return this.valueOf() < localInput.valueOf();
+        } else {
+            return this.clone().endOf(units).valueOf() < localInput.valueOf();
+        }
+    }
 
-    while (i >= 0 && !result) {
-      if (i == ai) {
-        begs.push(i);
-        ai = str.indexOf(a, i + 1);
-      } else if (begs.length == 1) {
-        result = [ begs.pop(), bi ];
-      } else {
-        beg = begs.pop();
-        if (beg < left) {
-          left = beg;
-          right = bi;
+    function isBetween (from, to, units, inclusivity) {
+        var localFrom = isMoment(from) ? from : createLocal(from),
+            localTo = isMoment(to) ? to : createLocal(to);
+        if (!(this.isValid() && localFrom.isValid() && localTo.isValid())) {
+            return false;
         }
+        inclusivity = inclusivity || '()';
+        return (inclusivity[0] === '(' ? this.isAfter(localFrom, units) : !this.isBefore(localFrom, units)) &&
+            (inclusivity[1] === ')' ? this.isBefore(localTo, units) : !this.isAfter(localTo, units));
+    }
 
-        bi = str.indexOf(b, i + 1);
-      }
+    function isSame (input, units) {
+        var localInput = isMoment(input) ? input : createLocal(input),
+            inputMs;
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(units) || 'millisecond';
+        if (units === 'millisecond') {
+            return this.valueOf() === localInput.valueOf();
+        } else {
+            inputMs = localInput.valueOf();
+            return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf();
+        }
+    }
 
-      i = ai < bi && ai >= 0 ? ai : bi;
+    function isSameOrAfter (input, units) {
+        return this.isSame(input, units) || this.isAfter(input, units);
     }
 
-    if (begs.length) {
-      result = [ left, right ];
+    function isSameOrBefore (input, units) {
+        return this.isSame(input, units) || this.isBefore(input, units);
     }
-  }
 
-  return result;
-}
+    function diff (input, units, asFloat) {
+        var that,
+            zoneDelta,
+            output;
 
+        if (!this.isValid()) {
+            return NaN;
+        }
 
-/***/ }),
-/* 44 */
-/***/ (function(module, exports, __webpack_require__) {
+        that = cloneWithOffset(input, this);
 
-try {
-  var util = __webpack_require__(29);
-  if (typeof util.inherits !== 'function') throw '';
-  module.exports = util.inherits;
-} catch (e) {
-  module.exports = __webpack_require__(45);
-}
+        if (!that.isValid()) {
+            return NaN;
+        }
 
+        zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;
 
-/***/ }),
-/* 45 */
-/***/ (function(module, exports) {
+        units = normalizeUnits(units);
 
-if (typeof Object.create === 'function') {
-  // implementation from standard node.js 'util' module
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    ctor.prototype = Object.create(superCtor.prototype, {
-      constructor: {
-        value: ctor,
-        enumerable: false,
-        writable: true,
-        configurable: true
-      }
-    });
-  };
-} else {
-  // old school shim for old browsers
-  module.exports = function inherits(ctor, superCtor) {
-    ctor.super_ = superCtor
-    var TempCtor = function () {}
-    TempCtor.prototype = superCtor.prototype
-    ctor.prototype = new TempCtor()
-    ctor.prototype.constructor = ctor
-  }
-}
+        switch (units) {
+            case 'year': output = monthDiff(this, that) / 12; break;
+            case 'month': output = monthDiff(this, that); break;
+            case 'quarter': output = monthDiff(this, that) / 3; break;
+            case 'second': output = (this - that) / 1e3; break; // 1000
+            case 'minute': output = (this - that) / 6e4; break; // 1000 * 60
+            case 'hour': output = (this - that) / 36e5; break; // 1000 * 60 * 60
+            case 'day': output = (this - that - zoneDelta) / 864e5; break; // 1000 * 60 * 60 * 24, negate dst
+            case 'week': output = (this - that - zoneDelta) / 6048e5; break; // 1000 * 60 * 60 * 24 * 7, negate dst
+            default: output = this - that;
+        }
 
+        return asFloat ? output : absFloor(output);
+    }
 
-/***/ }),
-/* 46 */
-/***/ (function(module, exports) {
+    function monthDiff (a, b) {
+        // difference in months
+        var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
+            // b is in (anchor - 1 month, anchor + 1 month)
+            anchor = a.clone().add(wholeMonthDiff, 'months'),
+            anchor2, adjust;
 
-module.exports = require("events");
+        if (b - anchor < 0) {
+            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor - anchor2);
+        } else {
+            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor2 - anchor);
+        }
 
-/***/ }),
-/* 47 */
-/***/ (function(module, exports, __webpack_require__) {
+        //check for negative zero, return zero if negative zero
+        return -(wholeMonthDiff + adjust) || 0;
+    }
 
-"use strict";
+    hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
+    hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]';
 
+    function toString () {
+        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
+    }
 
-function posix(path) {
-	return path.charAt(0) === '/';
-}
+    function toISOString(keepOffset) {
+        if (!this.isValid()) {
+            return null;
+        }
+        var utc = keepOffset !== true;
+        var m = utc ? this.clone().utc() : this;
+        if (m.year() < 0 || m.year() > 9999) {
+            return formatMoment(m, utc ? 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYYYY-MM-DD[T]HH:mm:ss.SSSZ');
+        }
+        if (isFunction(Date.prototype.toISOString)) {
+            // native implementation is ~50x faster, use it when we can
+            if (utc) {
+                return this.toDate().toISOString();
+            } else {
+                return new Date(this.valueOf() + this.utcOffset() * 60 * 1000).toISOString().replace('Z', formatMoment(m, 'Z'));
+            }
+        }
+        return formatMoment(m, utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ');
+    }
 
-function win32(path) {
-	// https://github.com/nodejs/node/blob/b3fcc245fb25539909ef1d5eaa01dbf92e168633/lib/path.js#L56
-	var splitDeviceRe = /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
-	var result = splitDeviceRe.exec(path);
-	var device = result[1] || '';
-	var isUnc = Boolean(device && device.charAt(1) !== ':');
+    /**
+     * Return a human readable representation of a moment that can
+     * also be evaluated to get a new moment which is the same
+     *
+     * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects
+     */
+    function inspect () {
+        if (!this.isValid()) {
+            return 'moment.invalid(/* ' + this._i + ' */)';
+        }
+        var func = 'moment';
+        var zone = '';
+        if (!this.isLocal()) {
+            func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone';
+            zone = 'Z';
+        }
+        var prefix = '[' + func + '("]';
+        var year = (0 <= this.year() && this.year() <= 9999) ? 'YYYY' : 'YYYYYY';
+        var datetime = '-MM-DD[T]HH:mm:ss.SSS';
+        var suffix = zone + '[")]';
 
-	// UNC paths are always absolute
-	return Boolean(result[2] || isUnc);
-}
+        return this.format(prefix + year + datetime + suffix);
+    }
 
-module.exports = process.platform === 'win32' ? win32 : posix;
-module.exports.posix = posix;
-module.exports.win32 = win32;
+    function format (inputString) {
+        if (!inputString) {
+            inputString = this.isUtc() ? hooks.defaultFormatUtc : hooks.defaultFormat;
+        }
+        var output = formatMoment(this, inputString);
+        return this.localeData().postformat(output);
+    }
 
+    function from (time, withoutSuffix) {
+        if (this.isValid() &&
+                ((isMoment(time) && time.isValid()) ||
+                 createLocal(time).isValid())) {
+            return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
+        } else {
+            return this.localeData().invalidDate();
+        }
+    }
 
-/***/ }),
-/* 48 */
-/***/ (function(module, exports, __webpack_require__) {
+    function fromNow (withoutSuffix) {
+        return this.from(createLocal(), withoutSuffix);
+    }
 
-module.exports = globSync
-globSync.GlobSync = GlobSync
+    function to (time, withoutSuffix) {
+        if (this.isValid() &&
+                ((isMoment(time) && time.isValid()) ||
+                 createLocal(time).isValid())) {
+            return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
+        } else {
+            return this.localeData().invalidDate();
+        }
+    }
 
-var fs = __webpack_require__(23)
-var rp = __webpack_require__(38)
-var minimatch = __webpack_require__(40)
-var Minimatch = minimatch.Minimatch
-var Glob = __webpack_require__(37).Glob
-var util = __webpack_require__(29)
-var path = __webpack_require__(16)
-var assert = __webpack_require__(30)
-var isAbsolute = __webpack_require__(47)
-var common = __webpack_require__(49)
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
-var setopts = common.setopts
-var ownProp = common.ownProp
-var childrenIgnored = common.childrenIgnored
-var isIgnored = common.isIgnored
+    function toNow (withoutSuffix) {
+        return this.to(createLocal(), withoutSuffix);
+    }
 
-function globSync (pattern, options) {
-  if (typeof options === 'function' || arguments.length === 3)
-    throw new TypeError('callback provided to sync glob\n'+
-                        'See: https://github.com/isaacs/node-glob/issues/167')
+    // If passed a locale key, it will set the locale for this
+    // instance.  Otherwise, it will return the locale configuration
+    // variables for this instance.
+    function locale (key) {
+        var newLocaleData;
 
-  return new GlobSync(pattern, options).found
-}
+        if (key === undefined) {
+            return this._locale._abbr;
+        } else {
+            newLocaleData = getLocale(key);
+            if (newLocaleData != null) {
+                this._locale = newLocaleData;
+            }
+            return this;
+        }
+    }
 
-function GlobSync (pattern, options) {
-  if (!pattern)
-    throw new Error('must provide pattern')
+    var lang = deprecate(
+        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
+        function (key) {
+            if (key === undefined) {
+                return this.localeData();
+            } else {
+                return this.locale(key);
+            }
+        }
+    );
 
-  if (typeof options === 'function' || arguments.length === 3)
-    throw new TypeError('callback provided to sync glob\n'+
-                        'See: https://github.com/isaacs/node-glob/issues/167')
+    function localeData () {
+        return this._locale;
+    }
 
-  if (!(this instanceof GlobSync))
-    return new GlobSync(pattern, options)
+    var MS_PER_SECOND = 1000;
+    var MS_PER_MINUTE = 60 * MS_PER_SECOND;
+    var MS_PER_HOUR = 60 * MS_PER_MINUTE;
+    var MS_PER_400_YEARS = (365 * 400 + 97) * 24 * MS_PER_HOUR;
 
-  setopts(this, pattern, options)
+    // actual modulo - handles negative numbers (for dates before 1970):
+    function mod$1(dividend, divisor) {
+        return (dividend % divisor + divisor) % divisor;
+    }
 
-  if (this.noprocess)
-    return this
+    function localStartOfDate(y, m, d) {
+        // the date constructor remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0) {
+            // preserve leap years using a full 400 year cycle, then reset
+            return new Date(y + 400, m, d) - MS_PER_400_YEARS;
+        } else {
+            return new Date(y, m, d).valueOf();
+        }
+    }
 
-  var n = this.minimatch.set.length
-  this.matches = new Array(n)
-  for (var i = 0; i < n; i ++) {
-    this._process(this.minimatch.set[i], i, false)
-  }
-  this._finish()
-}
+    function utcStartOfDate(y, m, d) {
+        // Date.UTC remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0) {
+            // preserve leap years using a full 400 year cycle, then reset
+            return Date.UTC(y + 400, m, d) - MS_PER_400_YEARS;
+        } else {
+            return Date.UTC(y, m, d);
+        }
+    }
 
-GlobSync.prototype._finish = function () {
-  assert(this instanceof GlobSync)
-  if (this.realpath) {
-    var self = this
-    this.matches.forEach(function (matchset, index) {
-      var set = self.matches[index] = Object.create(null)
-      for (var p in matchset) {
-        try {
-          p = self._makeAbs(p)
-          var real = rp.realpathSync(p, self.realpathCache)
-          set[real] = true
-        } catch (er) {
-          if (er.syscall === 'stat')
-            set[self._makeAbs(p)] = true
-          else
-            throw er
+    function startOf (units) {
+        var time;
+        units = normalizeUnits(units);
+        if (units === undefined || units === 'millisecond' || !this.isValid()) {
+            return this;
         }
-      }
-    })
-  }
-  common.finish(this)
-}
 
+        var startOfDate = this._isUTC ? utcStartOfDate : localStartOfDate;
 
-GlobSync.prototype._process = function (pattern, index, inGlobStar) {
-  assert(this instanceof GlobSync)
+        switch (units) {
+            case 'year':
+                time = startOfDate(this.year(), 0, 1);
+                break;
+            case 'quarter':
+                time = startOfDate(this.year(), this.month() - this.month() % 3, 1);
+                break;
+            case 'month':
+                time = startOfDate(this.year(), this.month(), 1);
+                break;
+            case 'week':
+                time = startOfDate(this.year(), this.month(), this.date() - this.weekday());
+                break;
+            case 'isoWeek':
+                time = startOfDate(this.year(), this.month(), this.date() - (this.isoWeekday() - 1));
+                break;
+            case 'day':
+            case 'date':
+                time = startOfDate(this.year(), this.month(), this.date());
+                break;
+            case 'hour':
+                time = this._d.valueOf();
+                time -= mod$1(time + (this._isUTC ? 0 : this.utcOffset() * MS_PER_MINUTE), MS_PER_HOUR);
+                break;
+            case 'minute':
+                time = this._d.valueOf();
+                time -= mod$1(time, MS_PER_MINUTE);
+                break;
+            case 'second':
+                time = this._d.valueOf();
+                time -= mod$1(time, MS_PER_SECOND);
+                break;
+        }
 
-  // Get the first [n] parts of pattern that are all strings.
-  var n = 0
-  while (typeof pattern[n] === 'string') {
-    n ++
-  }
-  // now n is the index of the first one that is *not* a string.
+        this._d.setTime(time);
+        hooks.updateOffset(this, true);
+        return this;
+    }
 
-  // See if there's anything else
-  var prefix
-  switch (n) {
-    // if not, then this is rather simple
-    case pattern.length:
-      this._processSimple(pattern.join('/'), index)
-      return
+    function endOf (units) {
+        var time;
+        units = normalizeUnits(units);
+        if (units === undefined || units === 'millisecond' || !this.isValid()) {
+            return this;
+        }
 
-    case 0:
-      // pattern *starts* with some non-trivial item.
-      // going to readdir(cwd), but not include the prefix in matches.
-      prefix = null
-      break
+        var startOfDate = this._isUTC ? utcStartOfDate : localStartOfDate;
 
-    default:
-      // pattern has some string bits in the front.
-      // whatever it starts with, whether that's 'absolute' like /foo/bar,
-      // or 'relative' like '../baz'
-      prefix = pattern.slice(0, n).join('/')
-      break
-  }
+        switch (units) {
+            case 'year':
+                time = startOfDate(this.year() + 1, 0, 1) - 1;
+                break;
+            case 'quarter':
+                time = startOfDate(this.year(), this.month() - this.month() % 3 + 3, 1) - 1;
+                break;
+            case 'month':
+                time = startOfDate(this.year(), this.month() + 1, 1) - 1;
+                break;
+            case 'week':
+                time = startOfDate(this.year(), this.month(), this.date() - this.weekday() + 7) - 1;
+                break;
+            case 'isoWeek':
+                time = startOfDate(this.year(), this.month(), this.date() - (this.isoWeekday() - 1) + 7) - 1;
+                break;
+            case 'day':
+            case 'date':
+                time = startOfDate(this.year(), this.month(), this.date() + 1) - 1;
+                break;
+            case 'hour':
+                time = this._d.valueOf();
+                time += MS_PER_HOUR - mod$1(time + (this._isUTC ? 0 : this.utcOffset() * MS_PER_MINUTE), MS_PER_HOUR) - 1;
+                break;
+            case 'minute':
+                time = this._d.valueOf();
+                time += MS_PER_MINUTE - mod$1(time, MS_PER_MINUTE) - 1;
+                break;
+            case 'second':
+                time = this._d.valueOf();
+                time += MS_PER_SECOND - mod$1(time, MS_PER_SECOND) - 1;
+                break;
+        }
 
-  var remain = pattern.slice(n)
+        this._d.setTime(time);
+        hooks.updateOffset(this, true);
+        return this;
+    }
 
-  // get the list of entries.
-  var read
-  if (prefix === null)
-    read = '.'
-  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
-    if (!prefix || !isAbsolute(prefix))
-      prefix = '/' + prefix
-    read = prefix
-  } else
-    read = prefix
+    function valueOf () {
+        return this._d.valueOf() - ((this._offset || 0) * 60000);
+    }
 
-  var abs = this._makeAbs(read)
+    function unix () {
+        return Math.floor(this.valueOf() / 1000);
+    }
 
-  //if ignored, skip processing
-  if (childrenIgnored(this, read))
-    return
+    function toDate () {
+        return new Date(this.valueOf());
+    }
 
-  var isGlobStar = remain[0] === minimatch.GLOBSTAR
-  if (isGlobStar)
-    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar)
-  else
-    this._processReaddir(prefix, read, abs, remain, index, inGlobStar)
-}
+    function toArray () {
+        var m = this;
+        return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
+    }
 
+    function toObject () {
+        var m = this;
+        return {
+            years: m.year(),
+            months: m.month(),
+            date: m.date(),
+            hours: m.hours(),
+            minutes: m.minutes(),
+            seconds: m.seconds(),
+            milliseconds: m.milliseconds()
+        };
+    }
 
-GlobSync.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar) {
-  var entries = this._readdir(abs, inGlobStar)
+    function toJSON () {
+        // new Date(NaN).toJSON() === null
+        return this.isValid() ? this.toISOString() : null;
+    }
 
-  // if the abs isn't a dir, then nothing can match!
-  if (!entries)
-    return
+    function isValid$2 () {
+        return isValid(this);
+    }
 
-  // It will only match dot entries if it starts with a dot, or if
-  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
-  var pn = remain[0]
-  var negate = !!this.minimatch.negate
-  var rawGlob = pn._glob
-  var dotOk = this.dot || rawGlob.charAt(0) === '.'
+    function parsingFlags () {
+        return extend({}, getParsingFlags(this));
+    }
 
-  var matchedEntries = []
-  for (var i = 0; i < entries.length; i++) {
-    var e = entries[i]
-    if (e.charAt(0) !== '.' || dotOk) {
-      var m
-      if (negate && !prefix) {
-        m = !e.match(pn)
-      } else {
-        m = e.match(pn)
-      }
-      if (m)
-        matchedEntries.push(e)
+    function invalidAt () {
+        return getParsingFlags(this).overflow;
     }
-  }
 
-  var len = matchedEntries.length
-  // If there are no matched entries, then nothing matches.
-  if (len === 0)
-    return
+    function creationData() {
+        return {
+            input: this._i,
+            format: this._f,
+            locale: this._locale,
+            isUTC: this._isUTC,
+            strict: this._strict
+        };
+    }
 
-  // if this is the last remaining pattern bit, then no need for
-  // an additional stat *unless* the user has specified mark or
-  // stat explicitly.  We know they exist, since readdir returned
-  // them.
+    // FORMATTING
 
-  if (remain.length === 1 && !this.mark && !this.stat) {
-    if (!this.matches[index])
-      this.matches[index] = Object.create(null)
+    addFormatToken(0, ['gg', 2], 0, function () {
+        return this.weekYear() % 100;
+    });
 
-    for (var i = 0; i < len; i ++) {
-      var e = matchedEntries[i]
-      if (prefix) {
-        if (prefix.slice(-1) !== '/')
-          e = prefix + '/' + e
-        else
-          e = prefix + e
-      }
+    addFormatToken(0, ['GG', 2], 0, function () {
+        return this.isoWeekYear() % 100;
+    });
 
-      if (e.charAt(0) === '/' && !this.nomount) {
-        e = path.join(this.root, e)
-      }
-      this._emitMatch(index, e)
+    function addWeekYearFormatToken (token, getter) {
+        addFormatToken(0, [token, token.length], 0, getter);
     }
-    // This was the last one, and no stats were needed
-    return
-  }
 
-  // now test all matched entries as stand-ins for that part
-  // of the pattern.
-  remain.shift()
-  for (var i = 0; i < len; i ++) {
-    var e = matchedEntries[i]
-    var newPattern
-    if (prefix)
-      newPattern = [prefix, e]
-    else
-      newPattern = [e]
-    this._process(newPattern.concat(remain), index, inGlobStar)
-  }
-}
+    addWeekYearFormatToken('gggg',     'weekYear');
+    addWeekYearFormatToken('ggggg',    'weekYear');
+    addWeekYearFormatToken('GGGG',  'isoWeekYear');
+    addWeekYearFormatToken('GGGGG', 'isoWeekYear');
 
+    // ALIASES
 
-GlobSync.prototype._emitMatch = function (index, e) {
-  if (isIgnored(this, e))
-    return
+    addUnitAlias('weekYear', 'gg');
+    addUnitAlias('isoWeekYear', 'GG');
 
-  var abs = this._makeAbs(e)
+    // PRIORITY
 
-  if (this.mark)
-    e = this._mark(e)
+    addUnitPriority('weekYear', 1);
+    addUnitPriority('isoWeekYear', 1);
 
-  if (this.absolute) {
-    e = abs
-  }
 
-  if (this.matches[index][e])
-    return
+    // PARSING
 
-  if (this.nodir) {
-    var c = this.cache[abs]
-    if (c === 'DIR' || Array.isArray(c))
-      return
-  }
+    addRegexToken('G',      matchSigned);
+    addRegexToken('g',      matchSigned);
+    addRegexToken('GG',     match1to2, match2);
+    addRegexToken('gg',     match1to2, match2);
+    addRegexToken('GGGG',   match1to4, match4);
+    addRegexToken('gggg',   match1to4, match4);
+    addRegexToken('GGGGG',  match1to6, match6);
+    addRegexToken('ggggg',  match1to6, match6);
 
-  this.matches[index][e] = true
+    addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
+        week[token.substr(0, 2)] = toInt(input);
+    });
 
-  if (this.stat)
-    this._stat(e)
-}
+    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
+        week[token] = hooks.parseTwoDigitYear(input);
+    });
 
+    // MOMENTS
 
-GlobSync.prototype._readdirInGlobStar = function (abs) {
-  // follow all symlinked directories forever
-  // just proceed as if this is a non-globstar situation
-  if (this.follow)
-    return this._readdir(abs, false)
+    function getSetWeekYear (input) {
+        return getSetWeekYearHelper.call(this,
+                input,
+                this.week(),
+                this.weekday(),
+                this.localeData()._week.dow,
+                this.localeData()._week.doy);
+    }
 
-  var entries
-  var lstat
-  var stat
-  try {
-    lstat = fs.lstatSync(abs)
-  } catch (er) {
-    if (er.code === 'ENOENT') {
-      // lstat failed, doesn't exist
-      return null
+    function getSetISOWeekYear (input) {
+        return getSetWeekYearHelper.call(this,
+                input, this.isoWeek(), this.isoWeekday(), 1, 4);
     }
-  }
 
-  var isSym = lstat && lstat.isSymbolicLink()
-  this.symlinks[abs] = isSym
+    function getISOWeeksInYear () {
+        return weeksInYear(this.year(), 1, 4);
+    }
 
-  // If it's not a symlink or a dir, then it's definitely a regular file.
-  // don't bother doing a readdir in that case.
-  if (!isSym && lstat && !lstat.isDirectory())
-    this.cache[abs] = 'FILE'
-  else
-    entries = this._readdir(abs, false)
+    function getWeeksInYear () {
+        var weekInfo = this.localeData()._week;
+        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
+    }
 
-  return entries
-}
+    function getSetWeekYearHelper(input, week, weekday, dow, doy) {
+        var weeksTarget;
+        if (input == null) {
+            return weekOfYear(this, dow, doy).year;
+        } else {
+            weeksTarget = weeksInYear(input, dow, doy);
+            if (week > weeksTarget) {
+                week = weeksTarget;
+            }
+            return setWeekAll.call(this, input, week, weekday, dow, doy);
+        }
+    }
 
-GlobSync.prototype._readdir = function (abs, inGlobStar) {
-  var entries
+    function setWeekAll(weekYear, week, weekday, dow, doy) {
+        var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),
+            date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);
 
-  if (inGlobStar && !ownProp(this.symlinks, abs))
-    return this._readdirInGlobStar(abs)
+        this.year(date.getUTCFullYear());
+        this.month(date.getUTCMonth());
+        this.date(date.getUTCDate());
+        return this;
+    }
 
-  if (ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
-    if (!c || c === 'FILE')
-      return null
+    // FORMATTING
 
-    if (Array.isArray(c))
-      return c
-  }
+    addFormatToken('Q', 0, 'Qo', 'quarter');
 
-  try {
-    return this._readdirEntries(abs, fs.readdirSync(abs))
-  } catch (er) {
-    this._readdirError(abs, er)
-    return null
-  }
-}
+    // ALIASES
 
-GlobSync.prototype._readdirEntries = function (abs, entries) {
-  // if we haven't asked to stat everything, then just
-  // assume that everything in there exists, so we can avoid
-  // having to stat it a second time.
-  if (!this.mark && !this.stat) {
-    for (var i = 0; i < entries.length; i ++) {
-      var e = entries[i]
-      if (abs === '/')
-        e = abs + e
-      else
-        e = abs + '/' + e
-      this.cache[e] = true
-    }
-  }
+    addUnitAlias('quarter', 'Q');
 
-  this.cache[abs] = entries
+    // PRIORITY
 
-  // mark and cache dir-ness
-  return entries
-}
+    addUnitPriority('quarter', 7);
 
-GlobSync.prototype._readdirError = function (f, er) {
-  // handle errors, and cache the information
-  switch (er.code) {
-    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
-    case 'ENOTDIR': // totally normal. means it *does* exist.
-      var abs = this._makeAbs(f)
-      this.cache[abs] = 'FILE'
-      if (abs === this.cwdAbs) {
-        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
-        error.path = this.cwd
-        error.code = er.code
-        throw error
-      }
-      break
+    // PARSING
 
-    case 'ENOENT': // not terribly unusual
-    case 'ELOOP':
-    case 'ENAMETOOLONG':
-    case 'UNKNOWN':
-      this.cache[this._makeAbs(f)] = false
-      break
-
-    default: // some unusual error.  Treat as failure.
-      this.cache[this._makeAbs(f)] = false
-      if (this.strict)
-        throw er
-      if (!this.silent)
-        console.error('glob error', er)
-      break
-  }
-}
-
-GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
-
-  var entries = this._readdir(abs, inGlobStar)
+    addRegexToken('Q', match1);
+    addParseToken('Q', function (input, array) {
+        array[MONTH] = (toInt(input) - 1) * 3;
+    });
 
-  // no entries means not a dir, so it can never have matches
-  // foo.txt/** doesn't match foo.txt
-  if (!entries)
-    return
+    // MOMENTS
 
-  // test without the globstar, and with every child both below
-  // and replacing the globstar.
-  var remainWithoutGlobStar = remain.slice(1)
-  var gspref = prefix ? [ prefix ] : []
-  var noGlobStar = gspref.concat(remainWithoutGlobStar)
+    function getSetQuarter (input) {
+        return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
+    }
 
-  // the noGlobStar pattern exits the inGlobStar state
-  this._process(noGlobStar, index, false)
+    // FORMATTING
 
-  var len = entries.length
-  var isSym = this.symlinks[abs]
+    addFormatToken('D', ['DD', 2], 'Do', 'date');
 
-  // If it's a symlink, and we're in a globstar, then stop
-  if (isSym && inGlobStar)
-    return
+    // ALIASES
 
-  for (var i = 0; i < len; i++) {
-    var e = entries[i]
-    if (e.charAt(0) === '.' && !this.dot)
-      continue
+    addUnitAlias('date', 'D');
 
-    // these two cases enter the inGlobStar state
-    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
-    this._process(instead, index, true)
+    // PRIORITY
+    addUnitPriority('date', 9);
 
-    var below = gspref.concat(entries[i], remain)
-    this._process(below, index, true)
-  }
-}
+    // PARSING
 
-GlobSync.prototype._processSimple = function (prefix, index) {
-  // XXX review this.  Shouldn't it be doing the mounting etc
-  // before doing stat?  kinda weird?
-  var exists = this._stat(prefix)
+    addRegexToken('D',  match1to2);
+    addRegexToken('DD', match1to2, match2);
+    addRegexToken('Do', function (isStrict, locale) {
+        // TODO: Remove "ordinalParse" fallback in next major release.
+        return isStrict ?
+          (locale._dayOfMonthOrdinalParse || locale._ordinalParse) :
+          locale._dayOfMonthOrdinalParseLenient;
+    });
 
-  if (!this.matches[index])
-    this.matches[index] = Object.create(null)
+    addParseToken(['D', 'DD'], DATE);
+    addParseToken('Do', function (input, array) {
+        array[DATE] = toInt(input.match(match1to2)[0]);
+    });
 
-  // If it doesn't exist, then just mark the lack of results
-  if (!exists)
-    return
+    // MOMENTS
 
-  if (prefix && isAbsolute(prefix) && !this.nomount) {
-    var trail = /[\/\\]$/.test(prefix)
-    if (prefix.charAt(0) === '/') {
-      prefix = path.join(this.root, prefix)
-    } else {
-      prefix = path.resolve(this.root, prefix)
-      if (trail)
-        prefix += '/'
-    }
-  }
+    var getSetDayOfMonth = makeGetSet('Date', true);
 
-  if (process.platform === 'win32')
-    prefix = prefix.replace(/\\/g, '/')
+    // FORMATTING
 
-  // Mark this as a match
-  this._emitMatch(index, prefix)
-}
+    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
 
-// Returns either 'DIR', 'FILE', or false
-GlobSync.prototype._stat = function (f) {
-  var abs = this._makeAbs(f)
-  var needDir = f.slice(-1) === '/'
+    // ALIASES
 
-  if (f.length > this.maxLength)
-    return false
+    addUnitAlias('dayOfYear', 'DDD');
 
-  if (!this.stat && ownProp(this.cache, abs)) {
-    var c = this.cache[abs]
+    // PRIORITY
+    addUnitPriority('dayOfYear', 4);
 
-    if (Array.isArray(c))
-      c = 'DIR'
+    // PARSING
 
-    // It exists, but maybe not how we need it
-    if (!needDir || c === 'DIR')
-      return c
+    addRegexToken('DDD',  match1to3);
+    addRegexToken('DDDD', match3);
+    addParseToken(['DDD', 'DDDD'], function (input, array, config) {
+        config._dayOfYear = toInt(input);
+    });
 
-    if (needDir && c === 'FILE')
-      return false
+    // HELPERS
 
-    // otherwise we have to stat, because maybe c=true
-    // if we know it exists, but not what it is.
-  }
+    // MOMENTS
 
-  var exists
-  var stat = this.statCache[abs]
-  if (!stat) {
-    var lstat
-    try {
-      lstat = fs.lstatSync(abs)
-    } catch (er) {
-      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
-        this.statCache[abs] = false
-        return false
-      }
+    function getSetDayOfYear (input) {
+        var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
+        return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
     }
 
-    if (lstat && lstat.isSymbolicLink()) {
-      try {
-        stat = fs.statSync(abs)
-      } catch (er) {
-        stat = lstat
-      }
-    } else {
-      stat = lstat
-    }
-  }
+    // FORMATTING
 
-  this.statCache[abs] = stat
+    addFormatToken('m', ['mm', 2], 0, 'minute');
 
-  var c = true
-  if (stat)
-    c = stat.isDirectory() ? 'DIR' : 'FILE'
+    // ALIASES
 
-  this.cache[abs] = this.cache[abs] || c
+    addUnitAlias('minute', 'm');
 
-  if (needDir && c === 'FILE')
-    return false
+    // PRIORITY
 
-  return c
-}
+    addUnitPriority('minute', 14);
 
-GlobSync.prototype._mark = function (p) {
-  return common.mark(this, p)
-}
+    // PARSING
 
-GlobSync.prototype._makeAbs = function (f) {
-  return common.makeAbs(this, f)
-}
+    addRegexToken('m',  match1to2);
+    addRegexToken('mm', match1to2, match2);
+    addParseToken(['m', 'mm'], MINUTE);
 
+    // MOMENTS
 
-/***/ }),
-/* 49 */
-/***/ (function(module, exports, __webpack_require__) {
+    var getSetMinute = makeGetSet('Minutes', false);
 
-exports.alphasort = alphasort
-exports.alphasorti = alphasorti
-exports.setopts = setopts
-exports.ownProp = ownProp
-exports.makeAbs = makeAbs
-exports.finish = finish
-exports.mark = mark
-exports.isIgnored = isIgnored
-exports.childrenIgnored = childrenIgnored
+    // FORMATTING
 
-function ownProp (obj, field) {
-  return Object.prototype.hasOwnProperty.call(obj, field)
-}
+    addFormatToken('s', ['ss', 2], 0, 'second');
 
-var path = __webpack_require__(16)
-var minimatch = __webpack_require__(40)
-var isAbsolute = __webpack_require__(47)
-var Minimatch = minimatch.Minimatch
+    // ALIASES
 
-function alphasorti (a, b) {
-  return a.toLowerCase().localeCompare(b.toLowerCase())
-}
+    addUnitAlias('second', 's');
 
-function alphasort (a, b) {
-  return a.localeCompare(b)
-}
+    // PRIORITY
 
-function setupIgnores (self, options) {
-  self.ignore = options.ignore || []
+    addUnitPriority('second', 15);
 
-  if (!Array.isArray(self.ignore))
-    self.ignore = [self.ignore]
+    // PARSING
 
-  if (self.ignore.length) {
-    self.ignore = self.ignore.map(ignoreMap)
-  }
-}
+    addRegexToken('s',  match1to2);
+    addRegexToken('ss', match1to2, match2);
+    addParseToken(['s', 'ss'], SECOND);
 
-// ignore patterns are always in dot:true mode.
-function ignoreMap (pattern) {
-  var gmatcher = null
-  if (pattern.slice(-3) === '/**') {
-    var gpattern = pattern.replace(/(\/\*\*)+$/, '')
-    gmatcher = new Minimatch(gpattern, { dot: true })
-  }
+    // MOMENTS
 
-  return {
-    matcher: new Minimatch(pattern, { dot: true }),
-    gmatcher: gmatcher
-  }
-}
+    var getSetSecond = makeGetSet('Seconds', false);
 
-function setopts (self, pattern, options) {
-  if (!options)
-    options = {}
+    // FORMATTING
 
-  // base-matching: just use globstar for that.
-  if (options.matchBase && -1 === pattern.indexOf("/")) {
-    if (options.noglobstar) {
-      throw new Error("base matching requires globstar")
-    }
-    pattern = "**/" + pattern
-  }
+    addFormatToken('S', 0, 0, function () {
+        return ~~(this.millisecond() / 100);
+    });
 
-  self.silent = !!options.silent
-  self.pattern = pattern
-  self.strict = options.strict !== false
-  self.realpath = !!options.realpath
-  self.realpathCache = options.realpathCache || Object.create(null)
-  self.follow = !!options.follow
-  self.dot = !!options.dot
-  self.mark = !!options.mark
-  self.nodir = !!options.nodir
-  if (self.nodir)
-    self.mark = true
-  self.sync = !!options.sync
-  self.nounique = !!options.nounique
-  self.nonull = !!options.nonull
-  self.nosort = !!options.nosort
-  self.nocase = !!options.nocase
-  self.stat = !!options.stat
-  self.noprocess = !!options.noprocess
-  self.absolute = !!options.absolute
+    addFormatToken(0, ['SS', 2], 0, function () {
+        return ~~(this.millisecond() / 10);
+    });
 
-  self.maxLength = options.maxLength || Infinity
-  self.cache = options.cache || Object.create(null)
-  self.statCache = options.statCache || Object.create(null)
-  self.symlinks = options.symlinks || Object.create(null)
+    addFormatToken(0, ['SSS', 3], 0, 'millisecond');
+    addFormatToken(0, ['SSSS', 4], 0, function () {
+        return this.millisecond() * 10;
+    });
+    addFormatToken(0, ['SSSSS', 5], 0, function () {
+        return this.millisecond() * 100;
+    });
+    addFormatToken(0, ['SSSSSS', 6], 0, function () {
+        return this.millisecond() * 1000;
+    });
+    addFormatToken(0, ['SSSSSSS', 7], 0, function () {
+        return this.millisecond() * 10000;
+    });
+    addFormatToken(0, ['SSSSSSSS', 8], 0, function () {
+        return this.millisecond() * 100000;
+    });
+    addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
+        return this.millisecond() * 1000000;
+    });
 
-  setupIgnores(self, options)
 
-  self.changedCwd = false
-  var cwd = process.cwd()
-  if (!ownProp(options, "cwd"))
-    self.cwd = cwd
-  else {
-    self.cwd = path.resolve(options.cwd)
-    self.changedCwd = self.cwd !== cwd
-  }
+    // ALIASES
+
+    addUnitAlias('millisecond', 'ms');
+
+    // PRIORITY
+
+    addUnitPriority('millisecond', 16);
+
+    // PARSING
+
+    addRegexToken('S',    match1to3, match1);
+    addRegexToken('SS',   match1to3, match2);
+    addRegexToken('SSS',  match1to3, match3);
+
+    var token;
+    for (token = 'SSSS'; token.length <= 9; token += 'S') {
+        addRegexToken(token, matchUnsigned);
+    }
+
+    function parseMs(input, array) {
+        array[MILLISECOND] = toInt(('0.' + input) * 1000);
+    }
+
+    for (token = 'S'; token.length <= 9; token += 'S') {
+        addParseToken(token, parseMs);
+    }
+    // MOMENTS
+
+    var getSetMillisecond = makeGetSet('Milliseconds', false);
+
+    // FORMATTING
+
+    addFormatToken('z',  0, 0, 'zoneAbbr');
+    addFormatToken('zz', 0, 0, 'zoneName');
+
+    // MOMENTS
+
+    function getZoneAbbr () {
+        return this._isUTC ? 'UTC' : '';
+    }
+
+    function getZoneName () {
+        return this._isUTC ? 'Coordinated Universal Time' : '';
+    }
+
+    var proto = Moment.prototype;
+
+    proto.add               = add;
+    proto.calendar          = calendar$1;
+    proto.clone             = clone;
+    proto.diff              = diff;
+    proto.endOf             = endOf;
+    proto.format            = format;
+    proto.from              = from;
+    proto.fromNow           = fromNow;
+    proto.to                = to;
+    proto.toNow             = toNow;
+    proto.get               = stringGet;
+    proto.invalidAt         = invalidAt;
+    proto.isAfter           = isAfter;
+    proto.isBefore          = isBefore;
+    proto.isBetween         = isBetween;
+    proto.isSame            = isSame;
+    proto.isSameOrAfter     = isSameOrAfter;
+    proto.isSameOrBefore    = isSameOrBefore;
+    proto.isValid           = isValid$2;
+    proto.lang              = lang;
+    proto.locale            = locale;
+    proto.localeData        = localeData;
+    proto.max               = prototypeMax;
+    proto.min               = prototypeMin;
+    proto.parsingFlags      = parsingFlags;
+    proto.set               = stringSet;
+    proto.startOf           = startOf;
+    proto.subtract          = subtract;
+    proto.toArray           = toArray;
+    proto.toObject          = toObject;
+    proto.toDate            = toDate;
+    proto.toISOString       = toISOString;
+    proto.inspect           = inspect;
+    proto.toJSON            = toJSON;
+    proto.toString          = toString;
+    proto.unix              = unix;
+    proto.valueOf           = valueOf;
+    proto.creationData      = creationData;
+    proto.year       = getSetYear;
+    proto.isLeapYear = getIsLeapYear;
+    proto.weekYear    = getSetWeekYear;
+    proto.isoWeekYear = getSetISOWeekYear;
+    proto.quarter = proto.quarters = getSetQuarter;
+    proto.month       = getSetMonth;
+    proto.daysInMonth = getDaysInMonth;
+    proto.week           = proto.weeks        = getSetWeek;
+    proto.isoWeek        = proto.isoWeeks     = getSetISOWeek;
+    proto.weeksInYear    = getWeeksInYear;
+    proto.isoWeeksInYear = getISOWeeksInYear;
+    proto.date       = getSetDayOfMonth;
+    proto.day        = proto.days             = getSetDayOfWeek;
+    proto.weekday    = getSetLocaleDayOfWeek;
+    proto.isoWeekday = getSetISODayOfWeek;
+    proto.dayOfYear  = getSetDayOfYear;
+    proto.hour = proto.hours = getSetHour;
+    proto.minute = proto.minutes = getSetMinute;
+    proto.second = proto.seconds = getSetSecond;
+    proto.millisecond = proto.milliseconds = getSetMillisecond;
+    proto.utcOffset            = getSetOffset;
+    proto.utc                  = setOffsetToUTC;
+    proto.local                = setOffsetToLocal;
+    proto.parseZone            = setOffsetToParsedOffset;
+    proto.hasAlignedHourOffset = hasAlignedHourOffset;
+    proto.isDST                = isDaylightSavingTime;
+    proto.isLocal              = isLocal;
+    proto.isUtcOffset          = isUtcOffset;
+    proto.isUtc                = isUtc;
+    proto.isUTC                = isUtc;
+    proto.zoneAbbr = getZoneAbbr;
+    proto.zoneName = getZoneName;
+    proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
+    proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
+    proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
+    proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/', getSetZone);
+    proto.isDSTShifted = deprecate('isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information', isDaylightSavingTimeShifted);
+
+    function createUnix (input) {
+        return createLocal(input * 1000);
+    }
+
+    function createInZone () {
+        return createLocal.apply(null, arguments).parseZone();
+    }
+
+    function preParsePostFormat (string) {
+        return string;
+    }
+
+    var proto$1 = Locale.prototype;
+
+    proto$1.calendar        = calendar;
+    proto$1.longDateFormat  = longDateFormat;
+    proto$1.invalidDate     = invalidDate;
+    proto$1.ordinal         = ordinal;
+    proto$1.preparse        = preParsePostFormat;
+    proto$1.postformat      = preParsePostFormat;
+    proto$1.relativeTime    = relativeTime;
+    proto$1.pastFuture      = pastFuture;
+    proto$1.set             = set;
+
+    proto$1.months            =        localeMonths;
+    proto$1.monthsShort       =        localeMonthsShort;
+    proto$1.monthsParse       =        localeMonthsParse;
+    proto$1.monthsRegex       = monthsRegex;
+    proto$1.monthsShortRegex  = monthsShortRegex;
+    proto$1.week = localeWeek;
+    proto$1.firstDayOfYear = localeFirstDayOfYear;
+    proto$1.firstDayOfWeek = localeFirstDayOfWeek;
+
+    proto$1.weekdays       =        localeWeekdays;
+    proto$1.weekdaysMin    =        localeWeekdaysMin;
+    proto$1.weekdaysShort  =        localeWeekdaysShort;
+    proto$1.weekdaysParse  =        localeWeekdaysParse;
+
+    proto$1.weekdaysRegex       =        weekdaysRegex;
+    proto$1.weekdaysShortRegex  =        weekdaysShortRegex;
+    proto$1.weekdaysMinRegex    =        weekdaysMinRegex;
+
+    proto$1.isPM = localeIsPM;
+    proto$1.meridiem = localeMeridiem;
+
+    function get$1 (format, index, field, setter) {
+        var locale = getLocale();
+        var utc = createUTC().set(setter, index);
+        return locale[field](utc, format);
+    }
+
+    function listMonthsImpl (format, index, field) {
+        if (isNumber(format)) {
+            index = format;
+            format = undefined;
+        }
+
+        format = format || '';
+
+        if (index != null) {
+            return get$1(format, index, field, 'month');
+        }
+
+        var i;
+        var out = [];
+        for (i = 0; i < 12; i++) {
+            out[i] = get$1(format, i, field, 'month');
+        }
+        return out;
+    }
+
+    // ()
+    // (5)
+    // (fmt, 5)
+    // (fmt)
+    // (true)
+    // (true, 5)
+    // (true, fmt, 5)
+    // (true, fmt)
+    function listWeekdaysImpl (localeSorted, format, index, field) {
+        if (typeof localeSorted === 'boolean') {
+            if (isNumber(format)) {
+                index = format;
+                format = undefined;
+            }
 
-  self.root = options.root || path.resolve(self.cwd, "/")
-  self.root = path.resolve(self.root)
-  if (process.platform === "win32")
-    self.root = self.root.replace(/\\/g, "/")
+            format = format || '';
+        } else {
+            format = localeSorted;
+            index = format;
+            localeSorted = false;
 
-  // TODO: is an absolute `cwd` supposed to be resolved against `root`?
-  // e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test')
-  self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd)
-  if (process.platform === "win32")
-    self.cwdAbs = self.cwdAbs.replace(/\\/g, "/")
-  self.nomount = !!options.nomount
+            if (isNumber(format)) {
+                index = format;
+                format = undefined;
+            }
 
-  // disable comments and negation in Minimatch.
-  // Note that they are not supported in Glob itself anyway.
-  options.nonegate = true
-  options.nocomment = true
+            format = format || '';
+        }
 
-  self.minimatch = new Minimatch(pattern, options)
-  self.options = self.minimatch.options
-}
+        var locale = getLocale(),
+            shift = localeSorted ? locale._week.dow : 0;
 
-function finish (self) {
-  var nou = self.nounique
-  var all = nou ? [] : Object.create(null)
+        if (index != null) {
+            return get$1(format, (index + shift) % 7, field, 'day');
+        }
 
-  for (var i = 0, l = self.matches.length; i < l; i ++) {
-    var matches = self.matches[i]
-    if (!matches || Object.keys(matches).length === 0) {
-      if (self.nonull) {
-        // do like the shell, and spit out the literal glob
-        var literal = self.minimatch.globSet[i]
-        if (nou)
-          all.push(literal)
-        else
-          all[literal] = true
-      }
-    } else {
-      // had matches
-      var m = Object.keys(matches)
-      if (nou)
-        all.push.apply(all, m)
-      else
-        m.forEach(function (m) {
-          all[m] = true
-        })
+        var i;
+        var out = [];
+        for (i = 0; i < 7; i++) {
+            out[i] = get$1(format, (i + shift) % 7, field, 'day');
+        }
+        return out;
     }
-  }
 
-  if (!nou)
-    all = Object.keys(all)
+    function listMonths (format, index) {
+        return listMonthsImpl(format, index, 'months');
+    }
 
-  if (!self.nosort)
-    all = all.sort(self.nocase ? alphasorti : alphasort)
+    function listMonthsShort (format, index) {
+        return listMonthsImpl(format, index, 'monthsShort');
+    }
 
-  // at *some* point we statted all of these
-  if (self.mark) {
-    for (var i = 0; i < all.length; i++) {
-      all[i] = self._mark(all[i])
+    function listWeekdays (localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdays');
     }
-    if (self.nodir) {
-      all = all.filter(function (e) {
-        var notDir = !(/\/$/.test(e))
-        var c = self.cache[e] || self.cache[makeAbs(self, e)]
-        if (notDir && c)
-          notDir = c !== 'DIR' && !Array.isArray(c)
-        return notDir
-      })
+
+    function listWeekdaysShort (localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort');
     }
-  }
 
-  if (self.ignore.length)
-    all = all.filter(function(m) {
-      return !isIgnored(self, m)
-    })
+    function listWeekdaysMin (localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin');
+    }
 
-  self.found = all
-}
+    getSetGlobalLocale('en', {
+        dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (toInt(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
 
-function mark (self, p) {
-  var abs = makeAbs(self, p)
-  var c = self.cache[abs]
-  var m = p
-  if (c) {
-    var isDir = c === 'DIR' || Array.isArray(c)
-    var slash = p.slice(-1) === '/'
+    // Side effect imports
 
-    if (isDir && !slash)
-      m += '/'
-    else if (!isDir && slash)
-      m = m.slice(0, -1)
+    hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale);
+    hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale);
 
-    if (m !== p) {
-      var mabs = makeAbs(self, m)
-      self.statCache[mabs] = self.statCache[abs]
-      self.cache[mabs] = self.cache[abs]
+    var mathAbs = Math.abs;
+
+    function abs () {
+        var data           = this._data;
+
+        this._milliseconds = mathAbs(this._milliseconds);
+        this._days         = mathAbs(this._days);
+        this._months       = mathAbs(this._months);
+
+        data.milliseconds  = mathAbs(data.milliseconds);
+        data.seconds       = mathAbs(data.seconds);
+        data.minutes       = mathAbs(data.minutes);
+        data.hours         = mathAbs(data.hours);
+        data.months        = mathAbs(data.months);
+        data.years         = mathAbs(data.years);
+
+        return this;
     }
-  }
 
-  return m
-}
+    function addSubtract$1 (duration, input, value, direction) {
+        var other = createDuration(input, value);
 
-// lotta situps...
-function makeAbs (self, f) {
-  var abs = f
-  if (f.charAt(0) === '/') {
-    abs = path.join(self.root, f)
-  } else if (isAbsolute(f) || f === '') {
-    abs = f
-  } else if (self.changedCwd) {
-    abs = path.resolve(self.cwd, f)
-  } else {
-    abs = path.resolve(f)
-  }
+        duration._milliseconds += direction * other._milliseconds;
+        duration._days         += direction * other._days;
+        duration._months       += direction * other._months;
 
-  if (process.platform === 'win32')
-    abs = abs.replace(/\\/g, '/')
+        return duration._bubble();
+    }
 
-  return abs
-}
+    // supports only 2.0-style add(1, 's') or add(duration)
+    function add$1 (input, value) {
+        return addSubtract$1(this, input, value, 1);
+    }
 
+    // supports only 2.0-style subtract(1, 's') or subtract(duration)
+    function subtract$1 (input, value) {
+        return addSubtract$1(this, input, value, -1);
+    }
 
-// Return true, if pattern ends with globstar '**', for the accompanying parent directory.
-// Ex:- If node_modules/** is the pattern, add 'node_modules' to ignore list along with it's contents
-function isIgnored (self, path) {
-  if (!self.ignore.length)
-    return false
+    function absCeil (number) {
+        if (number < 0) {
+            return Math.floor(number);
+        } else {
+            return Math.ceil(number);
+        }
+    }
 
-  return self.ignore.some(function(item) {
-    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
-  })
-}
+    function bubble () {
+        var milliseconds = this._milliseconds;
+        var days         = this._days;
+        var months       = this._months;
+        var data         = this._data;
+        var seconds, minutes, hours, years, monthsFromDays;
 
-function childrenIgnored (self, path) {
-  if (!self.ignore.length)
-    return false
+        // if we have a mix of positive and negative values, bubble down first
+        // check: https://github.com/moment/moment/issues/2166
+        if (!((milliseconds >= 0 && days >= 0 && months >= 0) ||
+                (milliseconds <= 0 && days <= 0 && months <= 0))) {
+            milliseconds += absCeil(monthsToDays(months) + days) * 864e5;
+            days = 0;
+            months = 0;
+        }
 
-  return self.ignore.some(function(item) {
-    return !!(item.gmatcher && item.gmatcher.match(path))
-  })
-}
+        // The following code bubbles up values, see the tests for
+        // examples of what that means.
+        data.milliseconds = milliseconds % 1000;
 
+        seconds           = absFloor(milliseconds / 1000);
+        data.seconds      = seconds % 60;
 
-/***/ }),
-/* 50 */
-/***/ (function(module, exports, __webpack_require__) {
+        minutes           = absFloor(seconds / 60);
+        data.minutes      = minutes % 60;
 
-var wrappy = __webpack_require__(51)
-var reqs = Object.create(null)
-var once = __webpack_require__(52)
+        hours             = absFloor(minutes / 60);
+        data.hours        = hours % 24;
 
-module.exports = wrappy(inflight)
+        days += absFloor(hours / 24);
 
-function inflight (key, cb) {
-  if (reqs[key]) {
-    reqs[key].push(cb)
-    return null
-  } else {
-    reqs[key] = [cb]
-    return makeres(key)
-  }
-}
+        // convert days to months
+        monthsFromDays = absFloor(daysToMonths(days));
+        months += monthsFromDays;
+        days -= absCeil(monthsToDays(monthsFromDays));
 
-function makeres (key) {
-  return once(function RES () {
-    var cbs = reqs[key]
-    var len = cbs.length
-    var args = slice(arguments)
+        // 12 months -> 1 year
+        years = absFloor(months / 12);
+        months %= 12;
 
-    // XXX It's somewhat ambiguous whether a new callback added in this
-    // pass should be queued for later execution if something in the
-    // list of callbacks throws, or if it should just be discarded.
-    // However, it's such an edge case that it hardly matters, and either
-    // choice is likely as surprising as the other.
-    // As it happens, we do go ahead and schedule it for later execution.
-    try {
-      for (var i = 0; i < len; i++) {
-        cbs[i].apply(null, args)
-      }
-    } finally {
-      if (cbs.length > len) {
-        // added more in the interim.
-        // de-zalgo, just in case, but don't call again.
-        cbs.splice(0, len)
-        process.nextTick(function () {
-          RES.apply(null, args)
-        })
-      } else {
-        delete reqs[key]
-      }
+        data.days   = days;
+        data.months = months;
+        data.years  = years;
+
+        return this;
     }
-  })
-}
 
-function slice (args) {
-  var length = args.length
-  var array = []
+    function daysToMonths (days) {
+        // 400 years have 146097 days (taking into account leap year rules)
+        // 400 years have 12 months === 4800
+        return days * 4800 / 146097;
+    }
 
-  for (var i = 0; i < length; i++) array[i] = args[i]
-  return array
-}
+    function monthsToDays (months) {
+        // the reverse of daysToMonths
+        return months * 146097 / 4800;
+    }
 
+    function as (units) {
+        if (!this.isValid()) {
+            return NaN;
+        }
+        var days;
+        var months;
+        var milliseconds = this._milliseconds;
 
-/***/ }),
-/* 51 */
-/***/ (function(module, exports) {
+        units = normalizeUnits(units);
 
-// Returns a wrapper function that returns a wrapped callback
-// The wrapper function should do some stuff, and return a
-// presumably different callback function.
-// This makes sure that own properties are retained, so that
-// decorations and such are not lost along the way.
-module.exports = wrappy
-function wrappy (fn, cb) {
-  if (fn && cb) return wrappy(fn)(cb)
+        if (units === 'month' || units === 'quarter' || units === 'year') {
+            days = this._days + milliseconds / 864e5;
+            months = this._months + daysToMonths(days);
+            switch (units) {
+                case 'month':   return months;
+                case 'quarter': return months / 3;
+                case 'year':    return months / 12;
+            }
+        } else {
+            // handle milliseconds separately because of floating point math errors (issue #1867)
+            days = this._days + Math.round(monthsToDays(this._months));
+            switch (units) {
+                case 'week'   : return days / 7     + milliseconds / 6048e5;
+                case 'day'    : return days         + milliseconds / 864e5;
+                case 'hour'   : return days * 24    + milliseconds / 36e5;
+                case 'minute' : return days * 1440  + milliseconds / 6e4;
+                case 'second' : return days * 86400 + milliseconds / 1000;
+                // Math.floor prevents floating point math errors here
+                case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
+                default: throw new Error('Unknown unit ' + units);
+            }
+        }
+    }
 
-  if (typeof fn !== 'function')
-    throw new TypeError('need wrapper function')
+    // TODO: Use this.as('ms')?
+    function valueOf$1 () {
+        if (!this.isValid()) {
+            return NaN;
+        }
+        return (
+            this._milliseconds +
+            this._days * 864e5 +
+            (this._months % 12) * 2592e6 +
+            toInt(this._months / 12) * 31536e6
+        );
+    }
 
-  Object.keys(fn).forEach(function (k) {
-    wrapper[k] = fn[k]
-  })
+    function makeAs (alias) {
+        return function () {
+            return this.as(alias);
+        };
+    }
 
-  return wrapper
+    var asMilliseconds = makeAs('ms');
+    var asSeconds      = makeAs('s');
+    var asMinutes      = makeAs('m');
+    var asHours        = makeAs('h');
+    var asDays         = makeAs('d');
+    var asWeeks        = makeAs('w');
+    var asMonths       = makeAs('M');
+    var asQuarters     = makeAs('Q');
+    var asYears        = makeAs('y');
 
-  function wrapper() {
-    var args = new Array(arguments.length)
-    for (var i = 0; i < args.length; i++) {
-      args[i] = arguments[i]
+    function clone$1 () {
+        return createDuration(this);
     }
-    var ret = fn.apply(this, args)
-    var cb = args[args.length-1]
-    if (typeof ret === 'function' && ret !== cb) {
-      Object.keys(cb).forEach(function (k) {
-        ret[k] = cb[k]
-      })
+
+    function get$2 (units) {
+        units = normalizeUnits(units);
+        return this.isValid() ? this[units + 's']() : NaN;
+    }
+
+    function makeGetter(name) {
+        return function () {
+            return this.isValid() ? this._data[name] : NaN;
+        };
+    }
+
+    var milliseconds = makeGetter('milliseconds');
+    var seconds      = makeGetter('seconds');
+    var minutes      = makeGetter('minutes');
+    var hours        = makeGetter('hours');
+    var days         = makeGetter('days');
+    var months       = makeGetter('months');
+    var years        = makeGetter('years');
+
+    function weeks () {
+        return absFloor(this.days() / 7);
+    }
+
+    var round = Math.round;
+    var thresholds = {
+        ss: 44,         // a few seconds to seconds
+        s : 45,         // seconds to minute
+        m : 45,         // minutes to hour
+        h : 22,         // hours to day
+        d : 26,         // days to month
+        M : 11          // months to year
+    };
+
+    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
+    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
+        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
+    }
+
+    function relativeTime$1 (posNegDuration, withoutSuffix, locale) {
+        var duration = createDuration(posNegDuration).abs();
+        var seconds  = round(duration.as('s'));
+        var minutes  = round(duration.as('m'));
+        var hours    = round(duration.as('h'));
+        var days     = round(duration.as('d'));
+        var months   = round(duration.as('M'));
+        var years    = round(duration.as('y'));
+
+        var a = seconds <= thresholds.ss && ['s', seconds]  ||
+                seconds < thresholds.s   && ['ss', seconds] ||
+                minutes <= 1             && ['m']           ||
+                minutes < thresholds.m   && ['mm', minutes] ||
+                hours   <= 1             && ['h']           ||
+                hours   < thresholds.h   && ['hh', hours]   ||
+                days    <= 1             && ['d']           ||
+                days    < thresholds.d   && ['dd', days]    ||
+                months  <= 1             && ['M']           ||
+                months  < thresholds.M   && ['MM', months]  ||
+                years   <= 1             && ['y']           || ['yy', years];
+
+        a[2] = withoutSuffix;
+        a[3] = +posNegDuration > 0;
+        a[4] = locale;
+        return substituteTimeAgo.apply(null, a);
+    }
+
+    // This function allows you to set the rounding function for relative time strings
+    function getSetRelativeTimeRounding (roundingFunction) {
+        if (roundingFunction === undefined) {
+            return round;
+        }
+        if (typeof(roundingFunction) === 'function') {
+            round = roundingFunction;
+            return true;
+        }
+        return false;
     }
-    return ret
-  }
-}
 
+    // This function allows you to set a threshold for relative time strings
+    function getSetRelativeTimeThreshold (threshold, limit) {
+        if (thresholds[threshold] === undefined) {
+            return false;
+        }
+        if (limit === undefined) {
+            return thresholds[threshold];
+        }
+        thresholds[threshold] = limit;
+        if (threshold === 's') {
+            thresholds.ss = limit - 1;
+        }
+        return true;
+    }
+
+    function humanize (withSuffix) {
+        if (!this.isValid()) {
+            return this.localeData().invalidDate();
+        }
+
+        var locale = this.localeData();
+        var output = relativeTime$1(this, !withSuffix, locale);
+
+        if (withSuffix) {
+            output = locale.pastFuture(+this, output);
+        }
+
+        return locale.postformat(output);
+    }
+
+    var abs$1 = Math.abs;
+
+    function sign(x) {
+        return ((x > 0) - (x < 0)) || +x;
+    }
+
+    function toISOString$1() {
+        // for ISO strings we do not use the normal bubbling rules:
+        //  * milliseconds bubble up until they become hours
+        //  * days do not bubble at all
+        //  * months bubble up until they become years
+        // This is because there is no context-free conversion between hours and days
+        // (think of clock changes)
+        // and also not between days and months (28-31 days per month)
+        if (!this.isValid()) {
+            return this.localeData().invalidDate();
+        }
+
+        var seconds = abs$1(this._milliseconds) / 1000;
+        var days         = abs$1(this._days);
+        var months       = abs$1(this._months);
+        var minutes, hours, years;
+
+        // 3600 seconds -> 60 minutes -> 1 hour
+        minutes           = absFloor(seconds / 60);
+        hours             = absFloor(minutes / 60);
+        seconds %= 60;
+        minutes %= 60;
+
+        // 12 months -> 1 year
+        years  = absFloor(months / 12);
+        months %= 12;
+
+
+        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
+        var Y = years;
+        var M = months;
+        var D = days;
+        var h = hours;
+        var m = minutes;
+        var s = seconds ? seconds.toFixed(3).replace(/\.?0+$/, '') : '';
+        var total = this.asSeconds();
+
+        if (!total) {
+            // this is the same as C#'s (Noda) and python (isodate)...
+            // but not other JS (goog.date)
+            return 'P0D';
+        }
+
+        var totalSign = total < 0 ? '-' : '';
+        var ymSign = sign(this._months) !== sign(total) ? '-' : '';
+        var daysSign = sign(this._days) !== sign(total) ? '-' : '';
+        var hmsSign = sign(this._milliseconds) !== sign(total) ? '-' : '';
+
+        return totalSign + 'P' +
+            (Y ? ymSign + Y + 'Y' : '') +
+            (M ? ymSign + M + 'M' : '') +
+            (D ? daysSign + D + 'D' : '') +
+            ((h || m || s) ? 'T' : '') +
+            (h ? hmsSign + h + 'H' : '') +
+            (m ? hmsSign + m + 'M' : '') +
+            (s ? hmsSign + s + 'S' : '');
+    }
+
+    var proto$2 = Duration.prototype;
+
+    proto$2.isValid        = isValid$1;
+    proto$2.abs            = abs;
+    proto$2.add            = add$1;
+    proto$2.subtract       = subtract$1;
+    proto$2.as             = as;
+    proto$2.asMilliseconds = asMilliseconds;
+    proto$2.asSeconds      = asSeconds;
+    proto$2.asMinutes      = asMinutes;
+    proto$2.asHours        = asHours;
+    proto$2.asDays         = asDays;
+    proto$2.asWeeks        = asWeeks;
+    proto$2.asMonths       = asMonths;
+    proto$2.asQuarters     = asQuarters;
+    proto$2.asYears        = asYears;
+    proto$2.valueOf        = valueOf$1;
+    proto$2._bubble        = bubble;
+    proto$2.clone          = clone$1;
+    proto$2.get            = get$2;
+    proto$2.milliseconds   = milliseconds;
+    proto$2.seconds        = seconds;
+    proto$2.minutes        = minutes;
+    proto$2.hours          = hours;
+    proto$2.days           = days;
+    proto$2.weeks          = weeks;
+    proto$2.months         = months;
+    proto$2.years          = years;
+    proto$2.humanize       = humanize;
+    proto$2.toISOString    = toISOString$1;
+    proto$2.toString       = toISOString$1;
+    proto$2.toJSON         = toISOString$1;
+    proto$2.locale         = locale;
+    proto$2.localeData     = localeData;
+
+    proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1);
+    proto$2.lang = lang;
+
+    // Side effect imports
+
+    // FORMATTING
+
+    addFormatToken('X', 0, 0, 'unix');
+    addFormatToken('x', 0, 0, 'valueOf');
+
+    // PARSING
+
+    addRegexToken('x', matchSigned);
+    addRegexToken('X', matchTimestamp);
+    addParseToken('X', function (input, array, config) {
+        config._d = new Date(parseFloat(input, 10) * 1000);
+    });
+    addParseToken('x', function (input, array, config) {
+        config._d = new Date(toInt(input));
+    });
+
+    // Side effect imports
+
+
+    hooks.version = '2.24.0';
+
+    setHookCallback(createLocal);
+
+    hooks.fn                    = proto;
+    hooks.min                   = min;
+    hooks.max                   = max;
+    hooks.now                   = now;
+    hooks.utc                   = createUTC;
+    hooks.unix                  = createUnix;
+    hooks.months                = listMonths;
+    hooks.isDate                = isDate;
+    hooks.locale                = getSetGlobalLocale;
+    hooks.invalid               = createInvalid;
+    hooks.duration              = createDuration;
+    hooks.isMoment              = isMoment;
+    hooks.weekdays              = listWeekdays;
+    hooks.parseZone             = createInZone;
+    hooks.localeData            = getLocale;
+    hooks.isDuration            = isDuration;
+    hooks.monthsShort           = listMonthsShort;
+    hooks.weekdaysMin           = listWeekdaysMin;
+    hooks.defineLocale          = defineLocale;
+    hooks.updateLocale          = updateLocale;
+    hooks.locales               = listLocales;
+    hooks.weekdaysShort         = listWeekdaysShort;
+    hooks.normalizeUnits        = normalizeUnits;
+    hooks.relativeTimeRounding  = getSetRelativeTimeRounding;
+    hooks.relativeTimeThreshold = getSetRelativeTimeThreshold;
+    hooks.calendarFormat        = getCalendarFormat;
+    hooks.prototype             = proto;
+
+    // currently HTML5 input type only supports 24-hour formats
+    hooks.HTML5_FMT = {
+        DATETIME_LOCAL: 'YYYY-MM-DDTHH:mm',             // <input type="datetime-local" />
+        DATETIME_LOCAL_SECONDS: 'YYYY-MM-DDTHH:mm:ss',  // <input type="datetime-local" step="1" />
+        DATETIME_LOCAL_MS: 'YYYY-MM-DDTHH:mm:ss.SSS',   // <input type="datetime-local" step="0.001" />
+        DATE: 'YYYY-MM-DD',                             // <input type="date" />
+        TIME: 'HH:mm',                                  // <input type="time" />
+        TIME_SECONDS: 'HH:mm:ss',                       // <input type="time" step="1" />
+        TIME_MS: 'HH:mm:ss.SSS',                        // <input type="time" step="0.001" />
+        WEEK: 'GGGG-[W]WW',                             // <input type="week" />
+        MONTH: 'YYYY-MM'                                // <input type="month" />
+    };
+
+    return hooks;
+
+})));
+
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 52 */
+/* 41 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var wrappy = __webpack_require__(51)
-module.exports = wrappy(once)
-module.exports.strict = wrappy(onceStrict)
+var map = {
+	"./af": 42,
+	"./af.js": 42,
+	"./ar": 43,
+	"./ar-dz": 44,
+	"./ar-dz.js": 44,
+	"./ar-kw": 45,
+	"./ar-kw.js": 45,
+	"./ar-ly": 46,
+	"./ar-ly.js": 46,
+	"./ar-ma": 47,
+	"./ar-ma.js": 47,
+	"./ar-sa": 48,
+	"./ar-sa.js": 48,
+	"./ar-tn": 49,
+	"./ar-tn.js": 49,
+	"./ar.js": 43,
+	"./az": 50,
+	"./az.js": 50,
+	"./be": 51,
+	"./be.js": 51,
+	"./bg": 52,
+	"./bg.js": 52,
+	"./bm": 53,
+	"./bm.js": 53,
+	"./bn": 54,
+	"./bn.js": 54,
+	"./bo": 55,
+	"./bo.js": 55,
+	"./br": 56,
+	"./br.js": 56,
+	"./bs": 57,
+	"./bs.js": 57,
+	"./ca": 58,
+	"./ca.js": 58,
+	"./cs": 59,
+	"./cs.js": 59,
+	"./cv": 60,
+	"./cv.js": 60,
+	"./cy": 61,
+	"./cy.js": 61,
+	"./da": 62,
+	"./da.js": 62,
+	"./de": 63,
+	"./de-at": 64,
+	"./de-at.js": 64,
+	"./de-ch": 65,
+	"./de-ch.js": 65,
+	"./de.js": 63,
+	"./dv": 66,
+	"./dv.js": 66,
+	"./el": 67,
+	"./el.js": 67,
+	"./en-SG": 68,
+	"./en-SG.js": 68,
+	"./en-au": 69,
+	"./en-au.js": 69,
+	"./en-ca": 70,
+	"./en-ca.js": 70,
+	"./en-gb": 71,
+	"./en-gb.js": 71,
+	"./en-ie": 72,
+	"./en-ie.js": 72,
+	"./en-il": 73,
+	"./en-il.js": 73,
+	"./en-nz": 74,
+	"./en-nz.js": 74,
+	"./eo": 75,
+	"./eo.js": 75,
+	"./es": 76,
+	"./es-do": 77,
+	"./es-do.js": 77,
+	"./es-us": 78,
+	"./es-us.js": 78,
+	"./es.js": 76,
+	"./et": 79,
+	"./et.js": 79,
+	"./eu": 80,
+	"./eu.js": 80,
+	"./fa": 81,
+	"./fa.js": 81,
+	"./fi": 82,
+	"./fi.js": 82,
+	"./fo": 83,
+	"./fo.js": 83,
+	"./fr": 84,
+	"./fr-ca": 85,
+	"./fr-ca.js": 85,
+	"./fr-ch": 86,
+	"./fr-ch.js": 86,
+	"./fr.js": 84,
+	"./fy": 87,
+	"./fy.js": 87,
+	"./ga": 88,
+	"./ga.js": 88,
+	"./gd": 89,
+	"./gd.js": 89,
+	"./gl": 90,
+	"./gl.js": 90,
+	"./gom-latn": 91,
+	"./gom-latn.js": 91,
+	"./gu": 92,
+	"./gu.js": 92,
+	"./he": 93,
+	"./he.js": 93,
+	"./hi": 94,
+	"./hi.js": 94,
+	"./hr": 95,
+	"./hr.js": 95,
+	"./hu": 96,
+	"./hu.js": 96,
+	"./hy-am": 97,
+	"./hy-am.js": 97,
+	"./id": 98,
+	"./id.js": 98,
+	"./is": 99,
+	"./is.js": 99,
+	"./it": 100,
+	"./it-ch": 101,
+	"./it-ch.js": 101,
+	"./it.js": 100,
+	"./ja": 102,
+	"./ja.js": 102,
+	"./jv": 103,
+	"./jv.js": 103,
+	"./ka": 104,
+	"./ka.js": 104,
+	"./kk": 105,
+	"./kk.js": 105,
+	"./km": 106,
+	"./km.js": 106,
+	"./kn": 107,
+	"./kn.js": 107,
+	"./ko": 108,
+	"./ko.js": 108,
+	"./ku": 109,
+	"./ku.js": 109,
+	"./ky": 110,
+	"./ky.js": 110,
+	"./lb": 111,
+	"./lb.js": 111,
+	"./lo": 112,
+	"./lo.js": 112,
+	"./lt": 113,
+	"./lt.js": 113,
+	"./lv": 114,
+	"./lv.js": 114,
+	"./me": 115,
+	"./me.js": 115,
+	"./mi": 116,
+	"./mi.js": 116,
+	"./mk": 117,
+	"./mk.js": 117,
+	"./ml": 118,
+	"./ml.js": 118,
+	"./mn": 119,
+	"./mn.js": 119,
+	"./mr": 120,
+	"./mr.js": 120,
+	"./ms": 121,
+	"./ms-my": 122,
+	"./ms-my.js": 122,
+	"./ms.js": 121,
+	"./mt": 123,
+	"./mt.js": 123,
+	"./my": 124,
+	"./my.js": 124,
+	"./nb": 125,
+	"./nb.js": 125,
+	"./ne": 126,
+	"./ne.js": 126,
+	"./nl": 127,
+	"./nl-be": 128,
+	"./nl-be.js": 128,
+	"./nl.js": 127,
+	"./nn": 129,
+	"./nn.js": 129,
+	"./pa-in": 130,
+	"./pa-in.js": 130,
+	"./pl": 131,
+	"./pl.js": 131,
+	"./pt": 132,
+	"./pt-br": 133,
+	"./pt-br.js": 133,
+	"./pt.js": 132,
+	"./ro": 134,
+	"./ro.js": 134,
+	"./ru": 135,
+	"./ru.js": 135,
+	"./sd": 136,
+	"./sd.js": 136,
+	"./se": 137,
+	"./se.js": 137,
+	"./si": 138,
+	"./si.js": 138,
+	"./sk": 139,
+	"./sk.js": 139,
+	"./sl": 140,
+	"./sl.js": 140,
+	"./sq": 141,
+	"./sq.js": 141,
+	"./sr": 142,
+	"./sr-cyrl": 143,
+	"./sr-cyrl.js": 143,
+	"./sr.js": 142,
+	"./ss": 144,
+	"./ss.js": 144,
+	"./sv": 145,
+	"./sv.js": 145,
+	"./sw": 146,
+	"./sw.js": 146,
+	"./ta": 147,
+	"./ta.js": 147,
+	"./te": 148,
+	"./te.js": 148,
+	"./tet": 149,
+	"./tet.js": 149,
+	"./tg": 150,
+	"./tg.js": 150,
+	"./th": 151,
+	"./th.js": 151,
+	"./tl-ph": 152,
+	"./tl-ph.js": 152,
+	"./tlh": 153,
+	"./tlh.js": 153,
+	"./tr": 154,
+	"./tr.js": 154,
+	"./tzl": 155,
+	"./tzl.js": 155,
+	"./tzm": 156,
+	"./tzm-latn": 157,
+	"./tzm-latn.js": 157,
+	"./tzm.js": 156,
+	"./ug-cn": 158,
+	"./ug-cn.js": 158,
+	"./uk": 159,
+	"./uk.js": 159,
+	"./ur": 160,
+	"./ur.js": 160,
+	"./uz": 161,
+	"./uz-latn": 162,
+	"./uz-latn.js": 162,
+	"./uz.js": 161,
+	"./vi": 163,
+	"./vi.js": 163,
+	"./x-pseudo": 164,
+	"./x-pseudo.js": 164,
+	"./yo": 165,
+	"./yo.js": 165,
+	"./zh-cn": 166,
+	"./zh-cn.js": 166,
+	"./zh-hk": 167,
+	"./zh-hk.js": 167,
+	"./zh-tw": 168,
+	"./zh-tw.js": 168
+};
+
+
+function webpackContext(req) {
+	var id = webpackContextResolve(req);
+	return __webpack_require__(id);
+}
+function webpackContextResolve(req) {
+	if(!__webpack_require__.o(map, req)) {
+		var e = new Error("Cannot find module '" + req + "'");
+		e.code = 'MODULE_NOT_FOUND';
+		throw e;
+	}
+	return map[req];
+}
+webpackContext.keys = function webpackContextKeys() {
+	return Object.keys(map);
+};
+webpackContext.resolve = webpackContextResolve;
+module.exports = webpackContext;
+webpackContext.id = 41;
 
-once.proto = once(function () {
-  Object.defineProperty(Function.prototype, 'once', {
-    value: function () {
-      return once(this)
-    },
-    configurable: true
-  })
+/***/ }),
+/* 42 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  Object.defineProperty(Function.prototype, 'onceStrict', {
-    value: function () {
-      return onceStrict(this)
-    },
-    configurable: true
-  })
-})
+//! moment.js locale configuration
 
-function once (fn) {
-  var f = function () {
-    if (f.called) return f.value
-    f.called = true
-    return f.value = fn.apply(this, arguments)
-  }
-  f.called = false
-  return f
-}
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-function onceStrict (fn) {
-  var f = function () {
-    if (f.called)
-      throw new Error(f.onceError)
-    f.called = true
-    return f.value = fn.apply(this, arguments)
-  }
-  var name = fn.name || 'Function wrapped with `once`'
-  f.onceError = name + " shouldn't be called more than once"
-  f.called = false
-  return f
-}
 
+    var af = moment.defineLocale('af', {
+        months : 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'),
+        weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'),
+        weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'),
+        meridiemParse: /vm|nm/i,
+        isPM : function (input) {
+            return /^nm$/i.test(input);
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower ? 'vm' : 'VM';
+            } else {
+                return isLower ? 'nm' : 'NM';
+            }
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Vandag om] LT',
+            nextDay : '[Môre om] LT',
+            nextWeek : 'dddd [om] LT',
+            lastDay : '[Gister om] LT',
+            lastWeek : '[Laas] dddd [om] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'oor %s',
+            past : '%s gelede',
+            s : '\'n paar sekondes',
+            ss : '%d sekondes',
+            m : '\'n minuut',
+            mm : '%d minute',
+            h : '\'n uur',
+            hh : '%d ure',
+            d : '\'n dag',
+            dd : '%d dae',
+            M : '\'n maand',
+            MM : '%d maande',
+            y : '\'n jaar',
+            yy : '%d jaar'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter
+        },
+        week : {
+            dow : 1, // Maandag is die eerste dag van die week.
+            doy : 4  // Die week wat die 4de Januarie bevat is die eerste week van die jaar.
+        }
+    });
 
-/***/ }),
-/* 53 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    return af;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CliError", function() { return CliError; });
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-class CliError extends Error {
-  constructor(message, meta = {}) {
-    super(message);
-    this.meta = meta;
-  }
+})));
 
-}
 
 /***/ }),
-/* 54 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 43 */
+/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return Project; });
-/* 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 fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(23);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__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 util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29);
-/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(53);
-/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34);
-/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(55);
-/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(120);
-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; }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '١',
+        '2': '٢',
+        '3': '٣',
+        '4': '٤',
+        '5': '٥',
+        '6': '٦',
+        '7': '٧',
+        '8': '٨',
+        '9': '٩',
+        '0': '٠'
+    }, numberMap = {
+        '١': '1',
+        '٢': '2',
+        '٣': '3',
+        '٤': '4',
+        '٥': '5',
+        '٦': '6',
+        '٧': '7',
+        '٨': '8',
+        '٩': '9',
+        '٠': '0'
+    }, pluralForm = function (n) {
+        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
+    }, plurals = {
+        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
+        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
+        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
+        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
+        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
+        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
+    }, pluralize = function (u) {
+        return function (number, withoutSuffix, string, isFuture) {
+            var f = pluralForm(number),
+                str = plurals[u][pluralForm(number)];
+            if (f === 2) {
+                str = str[withoutSuffix ? 0 : 1];
+            }
+            return str.replace(/%d/i, number);
+        };
+    }, months = [
+        'يناير',
+        'فبراير',
+        'مارس',
+        'أبريل',
+        'مايو',
+        'يونيو',
+        'يوليو',
+        'أغسطس',
+        'سبتمبر',
+        'أكتوبر',
+        'نوفمبر',
+        'ديسمبر'
+    ];
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+    var ar = moment.defineLocale('ar', {
+        months : months,
+        monthsShort : months,
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'D/\u200FM/\u200FYYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم عند الساعة] LT',
+            nextDay: '[غدًا عند الساعة] LT',
+            nextWeek: 'dddd [عند الساعة] LT',
+            lastDay: '[أمس عند الساعة] LT',
+            lastWeek: 'dddd [عند الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'بعد %s',
+            past : 'منذ %s',
+            s : pluralize('s'),
+            ss : pluralize('s'),
+            m : pluralize('m'),
+            mm : pluralize('m'),
+            h : pluralize('h'),
+            hh : pluralize('h'),
+            d : pluralize('d'),
+            dd : pluralize('d'),
+            M : pluralize('M'),
+            MM : pluralize('M'),
+            y : pluralize('y'),
+            yy : pluralize('y')
+        },
+        preparse: function (string) {
+            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+                return numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 12th is the first week of the year.
+        }
+    });
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+    return ar;
 
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+})));
 
 
+/***/ }),
+/* 44 */
+/***/ (function(module, exports, __webpack_require__) {
 
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var arDz = moment.defineLocale('ar-dz', {
+        months : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'أح_إث_ثلا_أر_خم_جم_سب'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            ss : '%d ثانية',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
+    return arDz;
 
+})));
 
 
+/***/ }),
+/* 45 */
+/***/ (function(module, exports, __webpack_require__) {
 
-class Project {
-  static async fromPath(path) {
-    const pkgJson = await Object(_package_json__WEBPACK_IMPORTED_MODULE_6__["readPackageJson"])(path);
-    return new Project(pkgJson, path);
-  }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var arKw = moment.defineLocale('ar-kw', {
+        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            ss : '%d ثانية',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 12  // The week that contains Jan 12th is the first week of the year.
+        }
+    });
 
-  constructor(packageJson, projectPath) {
-    _defineProperty(this, "json", void 0);
+    return arKw;
 
-    _defineProperty(this, "packageJsonLocation", void 0);
+})));
 
-    _defineProperty(this, "nodeModulesLocation", void 0);
 
-    _defineProperty(this, "targetLocation", void 0);
+/***/ }),
+/* 46 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    _defineProperty(this, "path", void 0);
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '1',
+        '2': '2',
+        '3': '3',
+        '4': '4',
+        '5': '5',
+        '6': '6',
+        '7': '7',
+        '8': '8',
+        '9': '9',
+        '0': '0'
+    }, pluralForm = function (n) {
+        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
+    }, plurals = {
+        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
+        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
+        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
+        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
+        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
+        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
+    }, pluralize = function (u) {
+        return function (number, withoutSuffix, string, isFuture) {
+            var f = pluralForm(number),
+                str = plurals[u][pluralForm(number)];
+            if (f === 2) {
+                str = str[withoutSuffix ? 0 : 1];
+            }
+            return str.replace(/%d/i, number);
+        };
+    }, months = [
+        'يناير',
+        'فبراير',
+        'مارس',
+        'أبريل',
+        'مايو',
+        'يونيو',
+        'يوليو',
+        'أغسطس',
+        'سبتمبر',
+        'أكتوبر',
+        'نوفمبر',
+        'ديسمبر'
+    ];
 
-    _defineProperty(this, "allDependencies", void 0);
+    var arLy = moment.defineLocale('ar-ly', {
+        months : months,
+        monthsShort : months,
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'D/\u200FM/\u200FYYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم عند الساعة] LT',
+            nextDay: '[غدًا عند الساعة] LT',
+            nextWeek: 'dddd [عند الساعة] LT',
+            lastDay: '[أمس عند الساعة] LT',
+            lastWeek: 'dddd [عند الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'بعد %s',
+            past : 'منذ %s',
+            s : pluralize('s'),
+            ss : pluralize('s'),
+            m : pluralize('m'),
+            mm : pluralize('m'),
+            h : pluralize('h'),
+            hh : pluralize('h'),
+            d : pluralize('d'),
+            dd : pluralize('d'),
+            M : pluralize('M'),
+            MM : pluralize('M'),
+            y : pluralize('y'),
+            yy : pluralize('y')
+        },
+        preparse: function (string) {
+            return string.replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 12th is the first week of the year.
+        }
+    });
 
-    _defineProperty(this, "productionDependencies", void 0);
+    return arLy;
 
-    _defineProperty(this, "devDependencies", void 0);
+})));
 
-    _defineProperty(this, "scripts", void 0);
 
-    _defineProperty(this, "isWorkspaceRoot", false);
+/***/ }),
+/* 47 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    _defineProperty(this, "isWorkspaceProject", false);
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var arMa = moment.defineLocale('ar-ma', {
+        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            ss : '%d ثانية',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 12th is the first week of the year.
+        }
+    });
 
-    this.json = Object.freeze(packageJson);
-    this.path = projectPath;
-    this.packageJsonLocation = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(this.path, 'package.json');
-    this.nodeModulesLocation = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(this.path, 'node_modules');
-    this.targetLocation = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(this.path, 'target');
-    this.productionDependencies = this.json.dependencies || {};
-    this.devDependencies = this.json.devDependencies || {};
-    this.allDependencies = _objectSpread({}, this.devDependencies, {}, this.productionDependencies);
-    this.isWorkspaceRoot = this.json.hasOwnProperty('workspaces');
-    this.scripts = this.json.scripts || {};
-  }
+    return arMa;
 
-  get name() {
-    return this.json.name;
-  }
+})));
 
-  ensureValidProjectDependency(project, dependentProjectIsInWorkspace) {
-    const versionInPackageJson = this.allDependencies[project.name];
-    let expectedVersionInPackageJson;
 
-    if (dependentProjectIsInWorkspace) {
-      expectedVersionInPackageJson = project.json.version;
-    } else {
-      const relativePathToProject = normalizePath(Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(this.path, project.path));
-      expectedVersionInPackageJson = `link:${relativePathToProject}`;
-    } // No issues!
+/***/ }),
+/* 48 */
+/***/ (function(module, exports, __webpack_require__) {
 
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '١',
+        '2': '٢',
+        '3': '٣',
+        '4': '٤',
+        '5': '٥',
+        '6': '٦',
+        '7': '٧',
+        '8': '٨',
+        '9': '٩',
+        '0': '٠'
+    }, numberMap = {
+        '١': '1',
+        '٢': '2',
+        '٣': '3',
+        '٤': '4',
+        '٥': '5',
+        '٦': '6',
+        '٧': '7',
+        '٨': '8',
+        '٩': '9',
+        '٠': '0'
+    };
+
+    var arSa = moment.defineLocale('ar-sa', {
+        months : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            ss : '%d ثانية',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        preparse: function (string) {
+            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+                return numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 6th is the first week of the year.
+        }
+    });
 
-    if (versionInPackageJson === expectedVersionInPackageJson) {
-      return;
-    }
+    return arSa;
 
-    let problemMsg;
+})));
 
-    if (Object(_package_json__WEBPACK_IMPORTED_MODULE_6__["isLinkDependency"])(versionInPackageJson) && dependentProjectIsInWorkspace) {
-      problemMsg = `but should be using a workspace`;
-    } else if (Object(_package_json__WEBPACK_IMPORTED_MODULE_6__["isLinkDependency"])(versionInPackageJson)) {
-      problemMsg = `using 'link:', but the path is wrong`;
-    } else {
-      problemMsg = `but it's not using the local package`;
-    }
 
-    throw new _errors__WEBPACK_IMPORTED_MODULE_4__["CliError"](`[${this.name}] depends on [${project.name}] ${problemMsg}. Update its package.json to the expected value below.`, {
-      actual: `"${project.name}": "${versionInPackageJson}"`,
-      expected: `"${project.name}": "${expectedVersionInPackageJson}"`,
-      package: `${this.name} (${this.packageJsonLocation})`
+/***/ }),
+/* 49 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var arTn = moment.defineLocale('ar-tn', {
+        months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY HH:mm',
+            LLLL: 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar: {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'في %s',
+            past: 'منذ %s',
+            s: 'ثوان',
+            ss : '%d ثانية',
+            m: 'دقيقة',
+            mm: '%d دقائق',
+            h: 'ساعة',
+            hh: '%d ساعات',
+            d: 'يوم',
+            dd: '%d أيام',
+            M: 'شهر',
+            MM: '%d أشهر',
+            y: 'سنة',
+            yy: '%d سنوات'
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 4th is the first week of the year.
+        }
     });
-  }
 
-  getBuildConfig() {
-    return this.json.kibana && this.json.kibana.build || {};
-  }
-  /**
-   * Returns the directory that should be copied into the Kibana build artifact.
-   * This config can be specified to only include the project's build artifacts
-   * instead of everything located in the project directory.
-   */
+    return arTn;
 
+})));
 
-  getIntermediateBuildDirectory() {
-    return Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(this.path, this.getBuildConfig().intermediateBuildDirectory || '.');
-  }
 
-  getCleanConfig() {
-    return this.json.kibana && this.json.kibana.clean || {};
-  }
+/***/ }),
+/* 50 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  hasScript(name) {
-    return name in this.scripts;
-  }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var suffixes = {
+        1: '-inci',
+        5: '-inci',
+        8: '-inci',
+        70: '-inci',
+        80: '-inci',
+        2: '-nci',
+        7: '-nci',
+        20: '-nci',
+        50: '-nci',
+        3: '-üncü',
+        4: '-üncü',
+        100: '-üncü',
+        6: '-ncı',
+        9: '-uncu',
+        10: '-uncu',
+        30: '-uncu',
+        60: '-ıncı',
+        90: '-ıncı'
+    };
+
+    var az = moment.defineLocale('az', {
+        months : 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'),
+        monthsShort : 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'),
+        weekdays : 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'),
+        weekdaysShort : 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'),
+        weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[bugün saat] LT',
+            nextDay : '[sabah saat] LT',
+            nextWeek : '[gələn həftə] dddd [saat] LT',
+            lastDay : '[dünən] LT',
+            lastWeek : '[keçən həftə] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s sonra',
+            past : '%s əvvəl',
+            s : 'birneçə saniyə',
+            ss : '%d saniyə',
+            m : 'bir dəqiqə',
+            mm : '%d dəqiqə',
+            h : 'bir saat',
+            hh : '%d saat',
+            d : 'bir gün',
+            dd : '%d gün',
+            M : 'bir ay',
+            MM : '%d ay',
+            y : 'bir il',
+            yy : '%d il'
+        },
+        meridiemParse: /gecə|səhər|gündüz|axşam/,
+        isPM : function (input) {
+            return /^(gündüz|axşam)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'gecə';
+            } else if (hour < 12) {
+                return 'səhər';
+            } else if (hour < 17) {
+                return 'gündüz';
+            } else {
+                return 'axşam';
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,
+        ordinal : function (number) {
+            if (number === 0) {  // special case for zero
+                return number + '-ıncı';
+            }
+            var a = number % 10,
+                b = number % 100 - a,
+                c = number >= 100 ? 100 : null;
+            return number + (suffixes[a] || suffixes[b] || suffixes[c]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-  getExecutables() {
-    const raw = this.json.bin;
+    return az;
 
-    if (!raw) {
-      return {};
-    }
+})));
 
-    if (typeof raw === 'string') {
-      return {
-        [this.name]: Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(this.path, raw)
-      };
-    }
 
-    if (typeof raw === 'object') {
-      const binsConfig = {};
+/***/ }),
+/* 51 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      for (const binName of Object.keys(raw)) {
-        binsConfig[binName] = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(this.path, raw[binName]);
-      }
+//! moment.js locale configuration
 
-      return binsConfig;
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    function plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+    }
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд',
+            'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін',
+            'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін',
+            'dd': 'дзень_дні_дзён',
+            'MM': 'месяц_месяцы_месяцаў',
+            'yy': 'год_гады_гадоў'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'хвіліна' : 'хвіліну';
+        }
+        else if (key === 'h') {
+            return withoutSuffix ? 'гадзіна' : 'гадзіну';
+        }
+        else {
+            return number + ' ' + plural(format[key], +number);
+        }
     }
 
-    throw new _errors__WEBPACK_IMPORTED_MODULE_4__["CliError"](`[${this.name}] has an invalid "bin" field in its package.json, ` + `expected an object or a string`, {
-      binConfig: Object(util__WEBPACK_IMPORTED_MODULE_3__["inspect"])(raw),
-      package: `${this.name} (${this.packageJsonLocation})`
+    var be = moment.defineLocale('be', {
+        months : {
+            format: 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_'),
+            standalone: 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_')
+        },
+        monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'),
+        weekdays : {
+            format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'),
+            standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
+            isFormat: /\[ ?[Ууў] ?(?:мінулую|наступную)? ?\] ?dddd/
+        },
+        weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+        weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY г.',
+            LLL : 'D MMMM YYYY г., HH:mm',
+            LLLL : 'dddd, D MMMM YYYY г., HH:mm'
+        },
+        calendar : {
+            sameDay: '[Сёння ў] LT',
+            nextDay: '[Заўтра ў] LT',
+            lastDay: '[Учора ў] LT',
+            nextWeek: function () {
+                return '[У] dddd [ў] LT';
+            },
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                    case 5:
+                    case 6:
+                        return '[У мінулую] dddd [ў] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                        return '[У мінулы] dddd [ў] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'праз %s',
+            past : '%s таму',
+            s : 'некалькі секунд',
+            m : relativeTimeWithPlural,
+            mm : relativeTimeWithPlural,
+            h : relativeTimeWithPlural,
+            hh : relativeTimeWithPlural,
+            d : 'дзень',
+            dd : relativeTimeWithPlural,
+            M : 'месяц',
+            MM : relativeTimeWithPlural,
+            y : 'год',
+            yy : relativeTimeWithPlural
+        },
+        meridiemParse: /ночы|раніцы|дня|вечара/,
+        isPM : function (input) {
+            return /^(дня|вечара)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночы';
+            } else if (hour < 12) {
+                return 'раніцы';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечара';
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(і|ы|га)/,
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'M':
+                case 'd':
+                case 'DDD':
+                case 'w':
+                case 'W':
+                    return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы';
+                case 'D':
+                    return number + '-га';
+                default:
+                    return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
     });
-  }
 
-  async runScript(scriptName, args = []) {
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`\n\nRunning script [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(scriptName)}] in [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(this.name)}]:\n`));
-    return Object(_scripts__WEBPACK_IMPORTED_MODULE_7__["runScriptInPackage"])(scriptName, args, this);
-  }
+    return be;
 
-  runScriptStreaming(scriptName, args = []) {
-    return Object(_scripts__WEBPACK_IMPORTED_MODULE_7__["runScriptInPackageStreaming"])(scriptName, args, this);
-  }
+})));
 
-  hasDependencies() {
-    return Object.keys(this.allDependencies).length > 0;
-  }
 
-  async installDependencies({
-    extraArgs
-  }) {
-    _log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`\n\nInstalling dependencies in [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(this.name)}]:\n`));
-    await Object(_scripts__WEBPACK_IMPORTED_MODULE_7__["installInDir"])(this.path, extraArgs);
-    await this.removeExtraneousNodeModules();
-  }
-  /**
-   * Yarn workspaces symlinks workspace projects to the root node_modules, even
-   * when there is no depenency on the project. This results in unnecicary, and
-   * often duplicated code in the build archives.
-   */
+/***/ }),
+/* 52 */
+/***/ (function(module, exports, __webpack_require__) {
 
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var bg = moment.defineLocale('bg', {
+        months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'),
+        monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'),
+        weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'),
+        weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'),
+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'D.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY H:mm',
+            LLLL : 'dddd, D MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay : '[Днес в] LT',
+            nextDay : '[Утре в] LT',
+            nextWeek : 'dddd [в] LT',
+            lastDay : '[Вчера в] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                    case 6:
+                        return '[В изминалата] dddd [в] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[В изминалия] dddd [в] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'след %s',
+            past : 'преди %s',
+            s : 'няколко секунди',
+            ss : '%d секунди',
+            m : 'минута',
+            mm : '%d минути',
+            h : 'час',
+            hh : '%d часа',
+            d : 'ден',
+            dd : '%d дни',
+            M : 'месец',
+            MM : '%d месеца',
+            y : 'година',
+            yy : '%d години'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+        ordinal : function (number) {
+            var lastDigit = number % 10,
+                last2Digits = number % 100;
+            if (number === 0) {
+                return number + '-ев';
+            } else if (last2Digits === 0) {
+                return number + '-ен';
+            } else if (last2Digits > 10 && last2Digits < 20) {
+                return number + '-ти';
+            } else if (lastDigit === 1) {
+                return number + '-ви';
+            } else if (lastDigit === 2) {
+                return number + '-ри';
+            } else if (lastDigit === 7 || lastDigit === 8) {
+                return number + '-ми';
+            } else {
+                return number + '-ти';
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-  async removeExtraneousNodeModules() {
-    // this is only relevant for the root workspace
-    if (!this.isWorkspaceRoot) {
-      return;
-    }
+    return bg;
 
-    const workspacesInfo = await Object(_scripts__WEBPACK_IMPORTED_MODULE_7__["yarnWorkspacesInfo"])(this.path);
-    const unusedWorkspaces = new Set(Object.keys(workspacesInfo)); // check for any cross-project dependency
+})));
 
-    for (const name of Object.keys(workspacesInfo)) {
-      const workspace = workspacesInfo[name];
-      workspace.workspaceDependencies.forEach(w => unusedWorkspaces.delete(w));
-    }
 
-    unusedWorkspaces.forEach(name => {
-      const {
-        dependencies,
-        devDependencies
-      } = this.json;
-      const nodeModulesPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(this.nodeModulesLocation, name);
-      const isDependency = dependencies && dependencies.hasOwnProperty(name);
-      const isDevDependency = devDependencies && devDependencies.hasOwnProperty(name);
+/***/ }),
+/* 53 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (!isDependency && !isDevDependency && fs__WEBPACK_IMPORTED_MODULE_1___default.a.existsSync(nodeModulesPath)) {
-        _log__WEBPACK_IMPORTED_MODULE_5__["log"].write(`No dependency on ${name}, removing link in node_modules`);
-        fs__WEBPACK_IMPORTED_MODULE_1___default.a.unlinkSync(nodeModulesPath);
-      }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var bm = moment.defineLocale('bm', {
+        months : 'Zanwuyekalo_Fewuruyekalo_Marisikalo_Awirilikalo_Mɛkalo_Zuwɛnkalo_Zuluyekalo_Utikalo_Sɛtanburukalo_ɔkutɔburukalo_Nowanburukalo_Desanburukalo'.split('_'),
+        monthsShort : 'Zan_Few_Mar_Awi_Mɛ_Zuw_Zul_Uti_Sɛt_ɔku_Now_Des'.split('_'),
+        weekdays : 'Kari_Ntɛnɛn_Tarata_Araba_Alamisa_Juma_Sibiri'.split('_'),
+        weekdaysShort : 'Kar_Ntɛ_Tar_Ara_Ala_Jum_Sib'.split('_'),
+        weekdaysMin : 'Ka_Nt_Ta_Ar_Al_Ju_Si'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'MMMM [tile] D [san] YYYY',
+            LLL : 'MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm',
+            LLLL : 'dddd MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm'
+        },
+        calendar : {
+            sameDay : '[Bi lɛrɛ] LT',
+            nextDay : '[Sini lɛrɛ] LT',
+            nextWeek : 'dddd [don lɛrɛ] LT',
+            lastDay : '[Kunu lɛrɛ] LT',
+            lastWeek : 'dddd [tɛmɛnen lɛrɛ] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s kɔnɔ',
+            past : 'a bɛ %s bɔ',
+            s : 'sanga dama dama',
+            ss : 'sekondi %d',
+            m : 'miniti kelen',
+            mm : 'miniti %d',
+            h : 'lɛrɛ kelen',
+            hh : 'lɛrɛ %d',
+            d : 'tile kelen',
+            dd : 'tile %d',
+            M : 'kalo kelen',
+            MM : 'kalo %d',
+            y : 'san kelen',
+            yy : 'san %d'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
     });
-  }
 
-} // We normalize all path separators to `/` in generated files
+    return bm;
+
+})));
 
-function normalizePath(path) {
-  return path.replace(/[\\\/]+/g, '/');
-}
 
 /***/ }),
-/* 55 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 54 */
+/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readPackageJson", function() { return readPackageJson; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "writePackageJson", function() { return writePackageJson; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isLinkDependency", function() { return isLinkDependency; });
-/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56);
-/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(read_pkg__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(98);
-/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(write_pkg__WEBPACK_IMPORTED_MODULE_1__);
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '১',
+        '2': '২',
+        '3': '৩',
+        '4': '৪',
+        '5': '৫',
+        '6': '৬',
+        '7': '৭',
+        '8': '৮',
+        '9': '৯',
+        '0': '০'
+    },
+    numberMap = {
+        '১': '1',
+        '২': '2',
+        '৩': '3',
+        '৪': '4',
+        '৫': '5',
+        '৬': '6',
+        '৭': '7',
+        '৮': '8',
+        '৯': '9',
+        '০': '0'
+    };
+
+    var bn = moment.defineLocale('bn', {
+        months : 'জানুয়ারী_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),
+        monthsShort : 'জানু_ফেব_মার্চ_এপ্র_মে_জুন_জুল_আগ_সেপ্ট_অক্টো_নভে_ডিসে'.split('_'),
+        weekdays : 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার'.split('_'),
+        weekdaysShort : 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি'.split('_'),
+        weekdaysMin : 'রবি_সোম_মঙ্গ_বুধ_বৃহঃ_শুক্র_শনি'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm সময়',
+            LTS : 'A h:mm:ss সময়',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm সময়',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm সময়'
+        },
+        calendar : {
+            sameDay : '[আজ] LT',
+            nextDay : '[আগামীকাল] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[গতকাল] LT',
+            lastWeek : '[গত] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s পরে',
+            past : '%s আগে',
+            s : 'কয়েক সেকেন্ড',
+            ss : '%d সেকেন্ড',
+            m : 'এক মিনিট',
+            mm : '%d মিনিট',
+            h : 'এক ঘন্টা',
+            hh : '%d ঘন্টা',
+            d : 'এক দিন',
+            dd : '%d দিন',
+            M : 'এক মাস',
+            MM : '%d মাস',
+            y : 'এক বছর',
+            yy : '%d বছর'
+        },
+        preparse: function (string) {
+            return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /রাত|সকাল|দুপুর|বিকাল|রাত/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if ((meridiem === 'রাত' && hour >= 4) ||
+                    (meridiem === 'দুপুর' && hour < 5) ||
+                    meridiem === 'বিকাল') {
+                return hour + 12;
+            } else {
+                return hour;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'রাত';
+            } else if (hour < 10) {
+                return 'সকাল';
+            } else if (hour < 17) {
+                return 'দুপুর';
+            } else if (hour < 20) {
+                return 'বিকাল';
+            } else {
+                return 'রাত';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 6th is the first week of the year.
+        }
+    });
 
+    return bn;
+
+})));
 
-function readPackageJson(cwd) {
-  return read_pkg__WEBPACK_IMPORTED_MODULE_0___default()({
-    cwd,
-    normalize: false
-  });
-}
-function writePackageJson(path, json) {
-  return write_pkg__WEBPACK_IMPORTED_MODULE_1___default()(path, json);
-}
-const isLinkDependency = depVersion => depVersion.startsWith('link:');
 
 /***/ }),
-/* 56 */
+/* 55 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '༡',
+        '2': '༢',
+        '3': '༣',
+        '4': '༤',
+        '5': '༥',
+        '6': '༦',
+        '7': '༧',
+        '8': '༨',
+        '9': '༩',
+        '0': '༠'
+    },
+    numberMap = {
+        '༡': '1',
+        '༢': '2',
+        '༣': '3',
+        '༤': '4',
+        '༥': '5',
+        '༦': '6',
+        '༧': '7',
+        '༨': '8',
+        '༩': '9',
+        '༠': '0'
+    };
+
+    var bo = moment.defineLocale('bo', {
+        months : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+        monthsShort : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+        weekdays : 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'),
+        weekdaysShort : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+        weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm',
+            LTS : 'A h:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm'
+        },
+        calendar : {
+            sameDay : '[དི་རིང] LT',
+            nextDay : '[སང་ཉིན] LT',
+            nextWeek : '[བདུན་ཕྲག་རྗེས་མ], LT',
+            lastDay : '[ཁ་སང] LT',
+            lastWeek : '[བདུན་ཕྲག་མཐའ་མ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ལ་',
+            past : '%s སྔན་ལ',
+            s : 'ལམ་སང',
+            ss : '%d སྐར་ཆ།',
+            m : 'སྐར་མ་གཅིག',
+            mm : '%d སྐར་མ',
+            h : 'ཆུ་ཚོད་གཅིག',
+            hh : '%d ཆུ་ཚོད',
+            d : 'ཉིན་གཅིག',
+            dd : '%d ཉིན་',
+            M : 'ཟླ་བ་གཅིག',
+            MM : '%d ཟླ་བ',
+            y : 'ལོ་གཅིག',
+            yy : '%d ལོ'
+        },
+        preparse: function (string) {
+            return string.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if ((meridiem === 'མཚན་མོ' && hour >= 4) ||
+                    (meridiem === 'ཉིན་གུང' && hour < 5) ||
+                    meridiem === 'དགོང་དག') {
+                return hour + 12;
+            } else {
+                return hour;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'མཚན་མོ';
+            } else if (hour < 10) {
+                return 'ཞོགས་ཀས';
+            } else if (hour < 17) {
+                return 'ཉིན་གུང';
+            } else if (hour < 20) {
+                return 'དགོང་དག';
+            } else {
+                return 'མཚན་མོ';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 6th is the first week of the year.
+        }
+    });
 
-const {promisify} = __webpack_require__(29);
-const fs = __webpack_require__(23);
-const path = __webpack_require__(16);
-const parseJson = __webpack_require__(57);
+    return bo;
 
-const readFileAsync = promisify(fs.readFile);
+})));
 
-module.exports = async options => {
-	options = {
-		cwd: process.cwd(),
-		normalize: true,
-		...options
-	};
 
-	const filePath = path.resolve(options.cwd, 'package.json');
-	const json = parseJson(await readFileAsync(filePath, 'utf8'));
+/***/ }),
+/* 56 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (options.normalize) {
-		__webpack_require__(73)(json);
-	}
+//! moment.js locale configuration
 
-	return json;
-};
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-module.exports.sync = options => {
-	options = {
-		cwd: process.cwd(),
-		normalize: true,
-		...options
-	};
 
-	const filePath = path.resolve(options.cwd, 'package.json');
-	const json = parseJson(fs.readFileSync(filePath, 'utf8'));
+    function relativeTimeWithMutation(number, withoutSuffix, key) {
+        var format = {
+            'mm': 'munutenn',
+            'MM': 'miz',
+            'dd': 'devezh'
+        };
+        return number + ' ' + mutation(format[key], number);
+    }
+    function specialMutationForYears(number) {
+        switch (lastNumber(number)) {
+            case 1:
+            case 3:
+            case 4:
+            case 5:
+            case 9:
+                return number + ' bloaz';
+            default:
+                return number + ' vloaz';
+        }
+    }
+    function lastNumber(number) {
+        if (number > 9) {
+            return lastNumber(number % 10);
+        }
+        return number;
+    }
+    function mutation(text, number) {
+        if (number === 2) {
+            return softMutation(text);
+        }
+        return text;
+    }
+    function softMutation(text) {
+        var mutationTable = {
+            'm': 'v',
+            'b': 'v',
+            'd': 'z'
+        };
+        if (mutationTable[text.charAt(0)] === undefined) {
+            return text;
+        }
+        return mutationTable[text.charAt(0)] + text.substring(1);
+    }
+
+    var br = moment.defineLocale('br', {
+        months : 'Genver_C\'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'),
+        monthsShort : 'Gen_C\'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'),
+        weekdays : 'Sul_Lun_Meurzh_Merc\'her_Yaou_Gwener_Sadorn'.split('_'),
+        weekdaysShort : 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'),
+        weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'h[e]mm A',
+            LTS : 'h[e]mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D [a viz] MMMM YYYY',
+            LLL : 'D [a viz] MMMM YYYY h[e]mm A',
+            LLLL : 'dddd, D [a viz] MMMM YYYY h[e]mm A'
+        },
+        calendar : {
+            sameDay : '[Hiziv da] LT',
+            nextDay : '[Warc\'hoazh da] LT',
+            nextWeek : 'dddd [da] LT',
+            lastDay : '[Dec\'h da] LT',
+            lastWeek : 'dddd [paset da] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'a-benn %s',
+            past : '%s \'zo',
+            s : 'un nebeud segondennoù',
+            ss : '%d eilenn',
+            m : 'ur vunutenn',
+            mm : relativeTimeWithMutation,
+            h : 'un eur',
+            hh : '%d eur',
+            d : 'un devezh',
+            dd : relativeTimeWithMutation,
+            M : 'ur miz',
+            MM : relativeTimeWithMutation,
+            y : 'ur bloaz',
+            yy : specialMutationForYears
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(añ|vet)/,
+        ordinal : function (number) {
+            var output = (number === 1) ? 'añ' : 'vet';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-	if (options.normalize) {
-		__webpack_require__(73)(json);
-	}
+    return br;
 
-	return json;
-};
+})));
 
 
 /***/ }),
 /* 57 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-const errorEx = __webpack_require__(58);
-const fallback = __webpack_require__(60);
-const {default: LinesAndColumns} = __webpack_require__(61);
-const {codeFrameColumns} = __webpack_require__(62);
-
-const JSONError = errorEx('JSONError', {
-	fileName: errorEx.append('in %s'),
-	codeFrame: errorEx.append('\n\n%s\n')
-});
-
-module.exports = (string, reviver, filename) => {
-	if (typeof reviver === 'string') {
-		filename = reviver;
-		reviver = null;
-	}
+//! moment.js locale configuration
 
-	try {
-		try {
-			return JSON.parse(string, reviver);
-		} catch (error) {
-			fallback(string, reviver);
-			throw error;
-		}
-	} catch (error) {
-		error.message = error.message.replace(/\n/g, '');
-		const indexMatch = error.message.match(/in JSON at position (\d+) while parsing near/);
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-		const jsonError = new JSONError(error);
-		if (filename) {
-			jsonError.fileName = filename;
-		}
 
-		if (indexMatch && indexMatch.length > 0) {
-			const lines = new LinesAndColumns(string);
-			const index = Number(indexMatch[1]);
-			const location = lines.locationForIndex(index);
-
-			const codeFrame = codeFrameColumns(
-				string,
-				{start: {line: location.line + 1, column: location.column + 1}},
-				{highlightCode: true}
-			);
+    function translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+            case 'ss':
+                if (number === 1) {
+                    result += 'sekunda';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'sekunde';
+                } else {
+                    result += 'sekundi';
+                }
+                return result;
+            case 'm':
+                return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+            case 'mm':
+                if (number === 1) {
+                    result += 'minuta';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'minute';
+                } else {
+                    result += 'minuta';
+                }
+                return result;
+            case 'h':
+                return withoutSuffix ? 'jedan sat' : 'jednog sata';
+            case 'hh':
+                if (number === 1) {
+                    result += 'sat';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'sata';
+                } else {
+                    result += 'sati';
+                }
+                return result;
+            case 'dd':
+                if (number === 1) {
+                    result += 'dan';
+                } else {
+                    result += 'dana';
+                }
+                return result;
+            case 'MM':
+                if (number === 1) {
+                    result += 'mjesec';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'mjeseca';
+                } else {
+                    result += 'mjeseci';
+                }
+                return result;
+            case 'yy':
+                if (number === 1) {
+                    result += 'godina';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'godine';
+                } else {
+                    result += 'godina';
+                }
+                return result;
+        }
+    }
+
+    var bs = moment.defineLocale('bs', {
+        months : 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'),
+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay  : '[danas u] LT',
+            nextDay  : '[sutra u] LT',
+            nextWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[u] [nedjelju] [u] LT';
+                    case 3:
+                        return '[u] [srijedu] [u] LT';
+                    case 6:
+                        return '[u] [subotu] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[jučer u] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                        return '[prošlu] dddd [u] LT';
+                    case 6:
+                        return '[prošle] [subote] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[prošli] dddd [u] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'par sekundi',
+            ss     : translate,
+            m      : translate,
+            mm     : translate,
+            h      : translate,
+            hh     : translate,
+            d      : 'dan',
+            dd     : translate,
+            M      : 'mjesec',
+            MM     : translate,
+            y      : 'godinu',
+            yy     : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-			jsonError.codeFrame = codeFrame;
-		}
+    return bs;
 
-		throw jsonError;
-	}
-};
+})));
 
 
 /***/ }),
 /* 58 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+//! moment.js locale configuration
 
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-var util = __webpack_require__(29);
-var isArrayish = __webpack_require__(59);
 
-var errorEx = function errorEx(name, properties) {
-	if (!name || name.constructor !== String) {
-		properties = name || {};
-		name = Error.name;
-	}
+    var ca = moment.defineLocale('ca', {
+        months : {
+            standalone: 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'),
+            format: 'de gener_de febrer_de març_d\'abril_de maig_de juny_de juliol_d\'agost_de setembre_d\'octubre_de novembre_de desembre'.split('_'),
+            isFormat: /D[oD]?(\s)+MMMM/
+        },
+        monthsShort : 'gen._febr._març_abr._maig_juny_jul._ag._set._oct._nov._des.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'),
+        weekdaysShort : 'dg._dl._dt._dc._dj._dv._ds.'.split('_'),
+        weekdaysMin : 'dg_dl_dt_dc_dj_dv_ds'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM [de] YYYY',
+            ll : 'D MMM YYYY',
+            LLL : 'D MMMM [de] YYYY [a les] H:mm',
+            lll : 'D MMM YYYY, H:mm',
+            LLLL : 'dddd D MMMM [de] YYYY [a les] H:mm',
+            llll : 'ddd D MMM YYYY, H:mm'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            nextDay : function () {
+                return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            lastDay : function () {
+                return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'd\'aquí %s',
+            past : 'fa %s',
+            s : 'uns segons',
+            ss : '%d segons',
+            m : 'un minut',
+            mm : '%d minuts',
+            h : 'una hora',
+            hh : '%d hores',
+            d : 'un dia',
+            dd : '%d dies',
+            M : 'un mes',
+            MM : '%d mesos',
+            y : 'un any',
+            yy : '%d anys'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(r|n|t|è|a)/,
+        ordinal : function (number, period) {
+            var output = (number === 1) ? 'r' :
+                (number === 2) ? 'n' :
+                (number === 3) ? 'r' :
+                (number === 4) ? 't' : 'è';
+            if (period === 'w' || period === 'W') {
+                output = 'a';
+            }
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-	var errorExError = function ErrorEXError(message) {
-		if (!this) {
-			return new ErrorEXError(message);
-		}
+    return ca;
 
-		message = message instanceof Error
-			? message.message
-			: (message || this.message);
+})));
 
-		Error.call(this, message);
-		Error.captureStackTrace(this, errorExError);
 
-		this.name = name;
+/***/ }),
+/* 59 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		Object.defineProperty(this, 'message', {
-			configurable: true,
-			enumerable: false,
-			get: function () {
-				var newMessage = message.split(/\r?\n/g);
+//! moment.js locale configuration
 
-				for (var key in properties) {
-					if (!properties.hasOwnProperty(key)) {
-						continue;
-					}
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-					var modifier = properties[key];
 
-					if ('message' in modifier) {
-						newMessage = modifier.message(this[key], newMessage) || newMessage;
-						if (!isArrayish(newMessage)) {
-							newMessage = [newMessage];
-						}
-					}
-				}
+    var months = 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_'),
+        monthsShort = 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_');
 
-				return newMessage.join('\n');
-			},
-			set: function (v) {
-				message = v;
-			}
-		});
+    var monthsParse = [/^led/i, /^úno/i, /^bře/i, /^dub/i, /^kvě/i, /^(čvn|červen$|června)/i, /^(čvc|červenec|července)/i, /^srp/i, /^zář/i, /^říj/i, /^lis/i, /^pro/i];
+    // NOTE: 'červen' is substring of 'červenec'; therefore 'červenec' must precede 'červen' in the regex to be fully matched.
+    // Otherwise parser matches '1. červenec' as '1. červen' + 'ec'.
+    var monthsRegex = /^(leden|únor|březen|duben|květen|červenec|července|červen|června|srpen|září|říjen|listopad|prosinec|led|úno|bře|dub|kvě|čvn|čvc|srp|zář|říj|lis|pro)/i;
 
-		var stackDescriptor = Object.getOwnPropertyDescriptor(this, 'stack');
-		var stackGetter = stackDescriptor.get;
-		var stackValue = stackDescriptor.value;
-		delete stackDescriptor.value;
-		delete stackDescriptor.writable;
+    function plural(n) {
+        return (n > 1) && (n < 5) && (~~(n / 10) !== 1);
+    }
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+            case 's':  // a few seconds / in a few seconds / a few seconds ago
+                return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami';
+            case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'sekundy' : 'sekund');
+                } else {
+                    return result + 'sekundami';
+                }
+                break;
+            case 'm':  // a minute / in a minute / a minute ago
+                return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou');
+            case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'minuty' : 'minut');
+                } else {
+                    return result + 'minutami';
+                }
+                break;
+            case 'h':  // an hour / in an hour / an hour ago
+                return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+            case 'hh': // 9 hours / in 9 hours / 9 hours ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'hodiny' : 'hodin');
+                } else {
+                    return result + 'hodinami';
+                }
+                break;
+            case 'd':  // a day / in a day / a day ago
+                return (withoutSuffix || isFuture) ? 'den' : 'dnem';
+            case 'dd': // 9 days / in 9 days / 9 days ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'dny' : 'dní');
+                } else {
+                    return result + 'dny';
+                }
+                break;
+            case 'M':  // a month / in a month / a month ago
+                return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem';
+            case 'MM': // 9 months / in 9 months / 9 months ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'měsíce' : 'měsíců');
+                } else {
+                    return result + 'měsíci';
+                }
+                break;
+            case 'y':  // a year / in a year / a year ago
+                return (withoutSuffix || isFuture) ? 'rok' : 'rokem';
+            case 'yy': // 9 years / in 9 years / 9 years ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'roky' : 'let');
+                } else {
+                    return result + 'lety';
+                }
+                break;
+        }
+    }
 
-		stackDescriptor.get = function () {
-			var stack = (stackGetter)
-				? stackGetter.call(this).split(/\r?\n+/g)
-				: stackValue.split(/\r?\n+/g);
+    var cs = moment.defineLocale('cs', {
+        months : months,
+        monthsShort : monthsShort,
+        monthsRegex : monthsRegex,
+        monthsShortRegex : monthsRegex,
+        // NOTE: 'červen' is substring of 'červenec'; therefore 'červenec' must precede 'červen' in the regex to be fully matched.
+        // Otherwise parser matches '1. červenec' as '1. červen' + 'ec'.
+        monthsStrictRegex : /^(leden|ledna|února|únor|březen|března|duben|dubna|květen|května|červenec|července|červen|června|srpen|srpna|září|říjen|října|listopadu|listopad|prosinec|prosince)/i,
+        monthsShortStrictRegex : /^(led|úno|bře|dub|kvě|čvn|čvc|srp|zář|říj|lis|pro)/i,
+        monthsParse : monthsParse,
+        longMonthsParse : monthsParse,
+        shortMonthsParse : monthsParse,
+        weekdays : 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),
+        weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),
+        weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),
+        longDateFormat : {
+            LT: 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd D. MMMM YYYY H:mm',
+            l : 'D. M. YYYY'
+        },
+        calendar : {
+            sameDay: '[dnes v] LT',
+            nextDay: '[zítra v] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[v neděli v] LT';
+                    case 1:
+                    case 2:
+                        return '[v] dddd [v] LT';
+                    case 3:
+                        return '[ve středu v] LT';
+                    case 4:
+                        return '[ve čtvrtek v] LT';
+                    case 5:
+                        return '[v pátek v] LT';
+                    case 6:
+                        return '[v sobotu v] LT';
+                }
+            },
+            lastDay: '[včera v] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[minulou neděli v] LT';
+                    case 1:
+                    case 2:
+                        return '[minulé] dddd [v] LT';
+                    case 3:
+                        return '[minulou středu v] LT';
+                    case 4:
+                    case 5:
+                        return '[minulý] dddd [v] LT';
+                    case 6:
+                        return '[minulou sobotu v] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : 'před %s',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-			// starting in Node 7, the stack builder caches the message.
-			// just replace it.
-			stack[0] = this.name + ': ' + this.message;
+    return cs;
 
-			var lineCount = 1;
-			for (var key in properties) {
-				if (!properties.hasOwnProperty(key)) {
-					continue;
-				}
+})));
 
-				var modifier = properties[key];
 
-				if ('line' in modifier) {
-					var line = modifier.line(this[key]);
-					if (line) {
-						stack.splice(lineCount++, 0, '    ' + line);
-					}
-				}
+/***/ }),
+/* 60 */
+/***/ (function(module, exports, __webpack_require__) {
 
-				if ('stack' in modifier) {
-					modifier.stack(this[key], stack);
-				}
-			}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var cv = moment.defineLocale('cv', {
+        months : 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'),
+        monthsShort : 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'),
+        weekdays : 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'),
+        weekdaysShort : 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'),
+        weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]',
+            LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm',
+            LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm'
+        },
+        calendar : {
+            sameDay: '[Паян] LT [сехетре]',
+            nextDay: '[Ыран] LT [сехетре]',
+            lastDay: '[Ӗнер] LT [сехетре]',
+            nextWeek: '[Ҫитес] dddd LT [сехетре]',
+            lastWeek: '[Иртнӗ] dddd LT [сехетре]',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : function (output) {
+                var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) ? 'тан' : 'ран';
+                return output + affix;
+            },
+            past : '%s каялла',
+            s : 'пӗр-ик ҫеккунт',
+            ss : '%d ҫеккунт',
+            m : 'пӗр минут',
+            mm : '%d минут',
+            h : 'пӗр сехет',
+            hh : '%d сехет',
+            d : 'пӗр кун',
+            dd : '%d кун',
+            M : 'пӗр уйӑх',
+            MM : '%d уйӑх',
+            y : 'пӗр ҫул',
+            yy : '%d ҫул'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-мӗш/,
+        ordinal : '%d-мӗш',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-			return stack.join('\n');
-		};
+    return cv;
 
-		Object.defineProperty(this, 'stack', stackDescriptor);
-	};
+})));
 
-	if (Object.setPrototypeOf) {
-		Object.setPrototypeOf(errorExError.prototype, Error.prototype);
-		Object.setPrototypeOf(errorExError, Error);
-	} else {
-		util.inherits(errorExError, Error);
-	}
 
-	return errorExError;
-};
+/***/ }),
+/* 61 */
+/***/ (function(module, exports, __webpack_require__) {
 
-errorEx.append = function (str, def) {
-	return {
-		message: function (v, message) {
-			v = v || def;
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var cy = moment.defineLocale('cy', {
+        months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'),
+        monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'),
+        weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'),
+        weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'),
+        weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'),
+        weekdaysParseExact : true,
+        // time formats are the same as en-gb
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY HH:mm',
+            LLLL: 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar: {
+            sameDay: '[Heddiw am] LT',
+            nextDay: '[Yfory am] LT',
+            nextWeek: 'dddd [am] LT',
+            lastDay: '[Ddoe am] LT',
+            lastWeek: 'dddd [diwethaf am] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'mewn %s',
+            past: '%s yn ôl',
+            s: 'ychydig eiliadau',
+            ss: '%d eiliad',
+            m: 'munud',
+            mm: '%d munud',
+            h: 'awr',
+            hh: '%d awr',
+            d: 'diwrnod',
+            dd: '%d diwrnod',
+            M: 'mis',
+            MM: '%d mis',
+            y: 'blwyddyn',
+            yy: '%d flynedd'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,
+        // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh
+        ordinal: function (number) {
+            var b = number,
+                output = '',
+                lookup = [
+                    '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed
+                    'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed
+                ];
+            if (b > 20) {
+                if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) {
+                    output = 'fed'; // not 30ain, 70ain or 90ain
+                } else {
+                    output = 'ain';
+                }
+            } else if (b > 0) {
+                output = lookup[b];
+            }
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-			if (v) {
-				message[0] += ' ' + str.replace('%s', v.toString());
-			}
+    return cy;
 
-			return message;
-		}
-	};
-};
+})));
 
-errorEx.line = function (str, def) {
-	return {
-		line: function (v) {
-			v = v || def;
 
-			if (v) {
-				return str.replace('%s', v.toString());
-			}
+/***/ }),
+/* 62 */
+/***/ (function(module, exports, __webpack_require__) {
 
-			return null;
-		}
-	};
-};
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var da = moment.defineLocale('da', {
+        months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY HH:mm',
+            LLLL : 'dddd [d.] D. MMMM YYYY [kl.] HH:mm'
+        },
+        calendar : {
+            sameDay : '[i dag kl.] LT',
+            nextDay : '[i morgen kl.] LT',
+            nextWeek : 'på dddd [kl.] LT',
+            lastDay : '[i går kl.] LT',
+            lastWeek : '[i] dddd[s kl.] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : '%s siden',
+            s : 'få sekunder',
+            ss : '%d sekunder',
+            m : 'et minut',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dage',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'et år',
+            yy : '%d år'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-module.exports = errorEx;
+    return da;
+
+})));
 
 
 /***/ }),
-/* 59 */
+/* 63 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+//! moment.js locale configuration
 
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-module.exports = function isArrayish(obj) {
-	if (!obj) {
-		return false;
-	}
 
-	return obj instanceof Array || Array.isArray(obj) ||
-		(obj.length >= 0 && obj.splice instanceof Function);
-};
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+
+    var de = moment.defineLocale('de', {
+        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY HH:mm',
+            LLLL : 'dddd, D. MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            ss : '%d Sekunden',
+            m : processRelativeTime,
+            mm : '%d Minuten',
+            h : processRelativeTime,
+            hh : '%d Stunden',
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return de;
+
+})));
 
 
 /***/ }),
-/* 60 */
+/* 64 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+//! moment.js locale configuration
 
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-module.exports = parseJson
-function parseJson (txt, reviver, context) {
-  context = context || 20
-  try {
-    return JSON.parse(txt, reviver)
-  } catch (e) {
-    const syntaxErr = e.message.match(/^Unexpected token.*position\s+(\d+)/i)
-    const errIdx = syntaxErr
-    ? +syntaxErr[1]
-    : e.message.match(/^Unexpected end of JSON.*/i)
-    ? txt.length - 1
-    : null
-    if (errIdx != null) {
-      const start = errIdx <= context
-      ? 0
-      : errIdx - context
-      const end = errIdx + context >= txt.length
-      ? txt.length
-      : errIdx + context
-      e.message += ` while parsing near '${
-        start === 0 ? '' : '...'
-      }${txt.slice(start, end)}${
-        end === txt.length ? '' : '...'
-      }'`
-    } else {
-      e.message += ` while parsing '${txt.slice(0, context * 2)}'`
-    }
-    throw e
-  }
-}
 
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+
+    var deAt = moment.defineLocale('de-at', {
+        months : 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jän._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY HH:mm',
+            LLLL : 'dddd, D. MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            ss : '%d Sekunden',
+            m : processRelativeTime,
+            mm : '%d Minuten',
+            h : processRelativeTime,
+            hh : '%d Stunden',
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-/***/ }),
-/* 61 */
-/***/ (function(__webpack_module__, __webpack_exports__, __webpack_require__) {
+    return deAt;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-var LF = '\n';
-var CR = '\r';
-var LinesAndColumns = (function () {
-    function LinesAndColumns(string) {
-        this.string = string;
-        var offsets = [0];
-        for (var offset = 0; offset < string.length;) {
-            switch (string[offset]) {
-                case LF:
-                    offset += LF.length;
-                    offsets.push(offset);
-                    break;
-                case CR:
-                    offset += CR.length;
-                    if (string[offset] === LF) {
-                        offset += LF.length;
-                    }
-                    offsets.push(offset);
-                    break;
-                default:
-                    offset++;
-                    break;
-            }
-        }
-        this.offsets = offsets;
-    }
-    LinesAndColumns.prototype.locationForIndex = function (index) {
-        if (index < 0 || index > this.string.length) {
-            return null;
-        }
-        var line = 0;
-        var offsets = this.offsets;
-        while (offsets[line + 1] <= index) {
-            line++;
-        }
-        var column = index - offsets[line];
-        return { line: line, column: column };
-    };
-    LinesAndColumns.prototype.indexForLocation = function (location) {
-        var line = location.line, column = location.column;
-        if (line < 0 || line >= this.offsets.length) {
-            return null;
-        }
-        if (column < 0 || column > this.lengthOfLine(line)) {
-            return null;
-        }
-        return this.offsets[line] + column;
-    };
-    LinesAndColumns.prototype.lengthOfLine = function (line) {
-        var offset = this.offsets[line];
-        var nextOffset = line === this.offsets.length - 1 ? this.string.length : this.offsets[line + 1];
-        return nextOffset - offset;
-    };
-    return LinesAndColumns;
-}());
-/* harmony default export */ __webpack_exports__["default"] = (LinesAndColumns);
+})));
 
 
 /***/ }),
-/* 62 */
+/* 65 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+//! moment.js locale configuration
 
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.codeFrameColumns = codeFrameColumns;
-exports.default = _default;
 
-function _highlight() {
-  const data = _interopRequireWildcard(__webpack_require__(63));
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+
+    var deCh = moment.defineLocale('de-ch', {
+        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY HH:mm',
+            LLLL : 'dddd, D. MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            ss : '%d Sekunden',
+            m : processRelativeTime,
+            mm : '%d Minuten',
+            h : processRelativeTime,
+            hh : '%d Stunden',
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-  _highlight = function () {
-    return data;
-  };
+    return deCh;
 
-  return data;
-}
+})));
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
 
-let deprecationWarningShown = false;
+/***/ }),
+/* 66 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function getDefs(chalk) {
-  return {
-    gutter: chalk.grey,
-    marker: chalk.red.bold,
-    message: chalk.red.bold
-  };
-}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var months = [
+        'ޖެނުއަރީ',
+        'ފެބްރުއަރީ',
+        'މާރިޗު',
+        'އޭޕްރީލު',
+        'މޭ',
+        'ޖޫން',
+        'ޖުލައި',
+        'އޯގަސްޓު',
+        'ސެޕްޓެމްބަރު',
+        'އޮކްޓޯބަރު',
+        'ނޮވެމްބަރު',
+        'ޑިސެމްބަރު'
+    ], weekdays = [
+        'އާދިއްތަ',
+        'ހޯމަ',
+        'އަންގާރަ',
+        'ބުދަ',
+        'ބުރާސްފަތި',
+        'ހުކުރު',
+        'ހޮނިހިރު'
+    ];
 
-const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
+    var dv = moment.defineLocale('dv', {
+        months : months,
+        monthsShort : months,
+        weekdays : weekdays,
+        weekdaysShort : weekdays,
+        weekdaysMin : 'އާދި_ހޯމަ_އަން_ބުދަ_ބުރާ_ހުކު_ހޮނި'.split('_'),
+        longDateFormat : {
+
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'D/M/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /މކ|މފ/,
+        isPM : function (input) {
+            return 'މފ' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'މކ';
+            } else {
+                return 'މފ';
+            }
+        },
+        calendar : {
+            sameDay : '[މިއަދު] LT',
+            nextDay : '[މާދަމާ] LT',
+            nextWeek : 'dddd LT',
+            lastDay : '[އިއްޔެ] LT',
+            lastWeek : '[ފާއިތުވި] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'ތެރޭގައި %s',
+            past : 'ކުރިން %s',
+            s : 'ސިކުންތުކޮޅެއް',
+            ss : 'd% ސިކުންތު',
+            m : 'މިނިޓެއް',
+            mm : 'މިނިޓު %d',
+            h : 'ގަޑިއިރެއް',
+            hh : 'ގަޑިއިރު %d',
+            d : 'ދުވަހެއް',
+            dd : 'ދުވަސް %d',
+            M : 'މަހެއް',
+            MM : 'މަސް %d',
+            y : 'އަހަރެއް',
+            yy : 'އަހަރު %d'
+        },
+        preparse: function (string) {
+            return string.replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/,/g, '،');
+        },
+        week : {
+            dow : 7,  // Sunday is the first day of the week.
+            doy : 12  // The week that contains Jan 12th is the first week of the year.
+        }
+    });
 
-function getMarkerLines(loc, source, opts) {
-  const startLoc = Object.assign({
-    column: 0,
-    line: -1
-  }, loc.start);
-  const endLoc = Object.assign({}, startLoc, loc.end);
-  const {
-    linesAbove = 2,
-    linesBelow = 3
-  } = opts || {};
-  const startLine = startLoc.line;
-  const startColumn = startLoc.column;
-  const endLine = endLoc.line;
-  const endColumn = endLoc.column;
-  let start = Math.max(startLine - (linesAbove + 1), 0);
-  let end = Math.min(source.length, endLine + linesBelow);
+    return dv;
 
-  if (startLine === -1) {
-    start = 0;
-  }
+})));
 
-  if (endLine === -1) {
-    end = source.length;
-  }
 
-  const lineDiff = endLine - startLine;
-  const markerLines = {};
+/***/ }),
+/* 67 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (lineDiff) {
-    for (let i = 0; i <= lineDiff; i++) {
-      const lineNumber = i + startLine;
+//! moment.js locale configuration
 
-      if (!startColumn) {
-        markerLines[lineNumber] = true;
-      } else if (i === 0) {
-        const sourceLength = source[lineNumber - 1].length;
-        markerLines[lineNumber] = [startColumn, sourceLength - startColumn + 1];
-      } else if (i === lineDiff) {
-        markerLines[lineNumber] = [0, endColumn];
-      } else {
-        const sourceLength = source[lineNumber - i].length;
-        markerLines[lineNumber] = [0, sourceLength];
-      }
-    }
-  } else {
-    if (startColumn === endColumn) {
-      if (startColumn) {
-        markerLines[startLine] = [startColumn, 0];
-      } else {
-        markerLines[startLine] = true;
-      }
-    } else {
-      markerLines[startLine] = [startColumn, endColumn - startColumn];
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+    function isFunction(input) {
+        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
     }
-  }
 
-  return {
-    start,
-    end,
-    markerLines
-  };
-}
 
-function codeFrameColumns(rawLines, loc, opts = {}) {
-  const highlighted = (opts.highlightCode || opts.forceColor) && (0, _highlight().shouldHighlight)(opts);
-  const chalk = (0, _highlight().getChalk)(opts);
-  const defs = getDefs(chalk);
+    var el = moment.defineLocale('el', {
+        monthsNominativeEl : 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'),
+        monthsGenitiveEl : 'Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου'.split('_'),
+        months : function (momentToFormat, format) {
+            if (!momentToFormat) {
+                return this._monthsNominativeEl;
+            } else if (typeof format === 'string' && /D/.test(format.substring(0, format.indexOf('MMMM')))) { // if there is a day number before 'MMMM'
+                return this._monthsGenitiveEl[momentToFormat.month()];
+            } else {
+                return this._monthsNominativeEl[momentToFormat.month()];
+            }
+        },
+        monthsShort : 'Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ'.split('_'),
+        weekdays : 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'),
+        weekdaysShort : 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'),
+        weekdaysMin : 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'),
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'μμ' : 'ΜΜ';
+            } else {
+                return isLower ? 'πμ' : 'ΠΜ';
+            }
+        },
+        isPM : function (input) {
+            return ((input + '').toLowerCase()[0] === 'μ');
+        },
+        meridiemParse : /[ΠΜ]\.?Μ?\.?/i,
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendarEl : {
+            sameDay : '[Σήμερα {}] LT',
+            nextDay : '[Αύριο {}] LT',
+            nextWeek : 'dddd [{}] LT',
+            lastDay : '[Χθες {}] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 6:
+                        return '[το προηγούμενο] dddd [{}] LT';
+                    default:
+                        return '[την προηγούμενη] dddd [{}] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        calendar : function (key, mom) {
+            var output = this._calendarEl[key],
+                hours = mom && mom.hours();
+            if (isFunction(output)) {
+                output = output.apply(mom);
+            }
+            return output.replace('{}', (hours % 12 === 1 ? 'στη' : 'στις'));
+        },
+        relativeTime : {
+            future : 'σε %s',
+            past : '%s πριν',
+            s : 'λίγα δευτερόλεπτα',
+            ss : '%d δευτερόλεπτα',
+            m : 'ένα λεπτό',
+            mm : '%d λεπτά',
+            h : 'μία ώρα',
+            hh : '%d ώρες',
+            d : 'μία μέρα',
+            dd : '%d μέρες',
+            M : 'ένας μήνας',
+            MM : '%d μήνες',
+            y : 'ένας χρόνος',
+            yy : '%d χρόνια'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}η/,
+        ordinal: '%dη',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4st is the first week of the year.
+        }
+    });
 
-  const maybeHighlight = (chalkFn, string) => {
-    return highlighted ? chalkFn(string) : string;
-  };
+    return el;
 
-  const lines = rawLines.split(NEWLINE);
-  const {
-    start,
-    end,
-    markerLines
-  } = getMarkerLines(loc, lines, opts);
-  const hasColumns = loc.start && typeof loc.start.column === "number";
-  const numberMaxWidth = String(end).length;
-  const highlightedLines = highlighted ? (0, _highlight().default)(rawLines, opts) : rawLines;
-  let frame = highlightedLines.split(NEWLINE).slice(start, end).map((line, index) => {
-    const number = start + 1 + index;
-    const paddedNumber = ` ${number}`.slice(-numberMaxWidth);
-    const gutter = ` ${paddedNumber} | `;
-    const hasMarker = markerLines[number];
-    const lastMarkerLine = !markerLines[number + 1];
+})));
 
-    if (hasMarker) {
-      let markerLine = "";
 
-      if (Array.isArray(hasMarker)) {
-        const markerSpacing = line.slice(0, Math.max(hasMarker[0] - 1, 0)).replace(/[^\t]/g, " ");
-        const numberOfMarkers = hasMarker[1] || 1;
-        markerLine = ["\n ", maybeHighlight(defs.gutter, gutter.replace(/\d/g, " ")), markerSpacing, maybeHighlight(defs.marker, "^").repeat(numberOfMarkers)].join("");
+/***/ }),
+/* 68 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        if (lastMarkerLine && opts.message) {
-          markerLine += " " + maybeHighlight(defs.message, opts.message);
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var enSG = moment.defineLocale('en-SG', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            ss : '%d seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-      }
-
-      return [maybeHighlight(defs.marker, ">"), maybeHighlight(defs.gutter, gutter), line, markerLine].join("");
-    } else {
-      return ` ${maybeHighlight(defs.gutter, gutter)}${line}`;
-    }
-  }).join("\n");
+    });
 
-  if (opts.message && !hasColumns) {
-    frame = `${" ".repeat(numberMaxWidth + 1)}${opts.message}\n${frame}`;
-  }
+    return enSG;
 
-  if (highlighted) {
-    return chalk.reset(frame);
-  } else {
-    return frame;
-  }
-}
+})));
 
-function _default(rawLines, lineNumber, colNumber, opts = {}) {
-  if (!deprecationWarningShown) {
-    deprecationWarningShown = true;
-    const message = "Passing lineNumber and colNumber is deprecated to @babel/code-frame. Please use `codeFrameColumns`.";
-
-    if (process.emitWarning) {
-      process.emitWarning(message, "DeprecationWarning");
-    } else {
-      const deprecationError = new Error(message);
-      deprecationError.name = "DeprecationWarning";
-      console.warn(new Error(message));
-    }
-  }
-
-  colNumber = Math.max(colNumber, 0);
-  const location = {
-    start: {
-      column: colNumber,
-      line: lineNumber
-    }
-  };
-  return codeFrameColumns(rawLines, location, opts);
-}
 
 /***/ }),
-/* 63 */
+/* 69 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.shouldHighlight = shouldHighlight;
-exports.getChalk = getChalk;
-exports.default = highlight;
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var enAu = moment.defineLocale('en-au', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            ss : '%d seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-function _jsTokens() {
-  const data = _interopRequireWildcard(__webpack_require__(64));
+    return enAu;
 
-  _jsTokens = function () {
-    return data;
-  };
+})));
 
-  return data;
-}
 
-function _esutils() {
-  const data = _interopRequireDefault(__webpack_require__(65));
+/***/ }),
+/* 70 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  _esutils = function () {
-    return data;
-  };
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var enCa = moment.defineLocale('en-ca', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'YYYY-MM-DD',
+            LL : 'MMMM D, YYYY',
+            LLL : 'MMMM D, YYYY h:mm A',
+            LLLL : 'dddd, MMMM D, YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            ss : '%d seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
 
-  return data;
-}
+    return enCa;
 
-function _chalk() {
-  const data = _interopRequireDefault(__webpack_require__(69));
+})));
 
-  _chalk = function () {
-    return data;
-  };
 
-  return data;
-}
+/***/ }),
+/* 71 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var enGb = moment.defineLocale('en-gb', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            ss : '%d seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+    return enGb;
 
-function getDefs(chalk) {
-  return {
-    keyword: chalk.cyan,
-    capitalized: chalk.yellow,
-    jsx_tag: chalk.yellow,
-    punctuator: chalk.yellow,
-    number: chalk.magenta,
-    string: chalk.green,
-    regex: chalk.magenta,
-    comment: chalk.grey,
-    invalid: chalk.white.bgRed.bold
-  };
-}
+})));
 
-const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
-const JSX_TAG = /^[a-z][\w-]*$/i;
-const BRACKET = /^[()[\]{}]$/;
 
-function getTokenType(match) {
-  const [offset, text] = match.slice(-2);
-  const token = (0, _jsTokens().matchToToken)(match);
+/***/ }),
+/* 72 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (token.type === "name") {
-    if (_esutils().default.keyword.isReservedWordES6(token.value)) {
-      return "keyword";
-    }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var enIe = moment.defineLocale('en-ie', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            ss : '%d seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-    if (JSX_TAG.test(token.value) && (text[offset - 1] === "<" || text.substr(offset - 2, 2) == "</")) {
-      return "jsx_tag";
-    }
+    return enIe;
 
-    if (token.value[0] !== token.value[0].toLowerCase()) {
-      return "capitalized";
-    }
-  }
+})));
 
-  if (token.type === "punctuator" && BRACKET.test(token.value)) {
-    return "bracket";
-  }
 
-  if (token.type === "invalid" && (token.value === "@" || token.value === "#")) {
-    return "punctuator";
-  }
+/***/ }),
+/* 73 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return token.type;
-}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var enIl = moment.defineLocale('en-il', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
 
-function highlightTokens(defs, text) {
-  return text.replace(_jsTokens().default, function (...args) {
-    const type = getTokenType(args);
-    const colorize = defs[type];
+    return enIl;
 
-    if (colorize) {
-      return args[0].split(NEWLINE).map(str => colorize(str)).join("\n");
-    } else {
-      return args[0];
-    }
-  });
-}
+})));
 
-function shouldHighlight(options) {
-  return _chalk().default.supportsColor || options.forceColor;
-}
 
-function getChalk(options) {
-  let chalk = _chalk().default;
+/***/ }),
+/* 74 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (options.forceColor) {
-    chalk = new (_chalk().default.constructor)({
-      enabled: true,
-      level: 1
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var enNz = moment.defineLocale('en-nz', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            ss : '%d seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
     });
-  }
 
-  return chalk;
-}
+    return enNz;
 
-function highlight(code, options = {}) {
-  if (shouldHighlight(options)) {
-    const chalk = getChalk(options);
-    const defs = getDefs(chalk);
-    return highlightTokens(defs, code);
-  } else {
-    return code;
-  }
-}
+})));
 
-/***/ }),
-/* 64 */
-/***/ (function(module, exports) {
 
-// Copyright 2014, 2015, 2016, 2017, 2018 Simon Lydell
-// License: MIT. (See LICENSE.)
+/***/ }),
+/* 75 */
+/***/ (function(module, exports, __webpack_require__) {
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-})
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var eo = moment.defineLocale('eo', {
+        months : 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'),
+        weekdays : 'dimanĉo_lundo_mardo_merkredo_ĵaŭdo_vendredo_sabato'.split('_'),
+        weekdaysShort : 'dim_lun_mard_merk_ĵaŭ_ven_sab'.split('_'),
+        weekdaysMin : 'di_lu_ma_me_ĵa_ve_sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D[-a de] MMMM, YYYY',
+            LLL : 'D[-a de] MMMM, YYYY HH:mm',
+            LLLL : 'dddd, [la] D[-a de] MMMM, YYYY HH:mm'
+        },
+        meridiemParse: /[ap]\.t\.m/i,
+        isPM: function (input) {
+            return input.charAt(0).toLowerCase() === 'p';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'p.t.m.' : 'P.T.M.';
+            } else {
+                return isLower ? 'a.t.m.' : 'A.T.M.';
+            }
+        },
+        calendar : {
+            sameDay : '[Hodiaŭ je] LT',
+            nextDay : '[Morgaŭ je] LT',
+            nextWeek : 'dddd [je] LT',
+            lastDay : '[Hieraŭ je] LT',
+            lastWeek : '[pasinta] dddd [je] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'post %s',
+            past : 'antaŭ %s',
+            s : 'sekundoj',
+            ss : '%d sekundoj',
+            m : 'minuto',
+            mm : '%d minutoj',
+            h : 'horo',
+            hh : '%d horoj',
+            d : 'tago',//ne 'diurno', ĉar estas uzita por proksimumo
+            dd : '%d tagoj',
+            M : 'monato',
+            MM : '%d monatoj',
+            y : 'jaro',
+            yy : '%d jaroj'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}a/,
+        ordinal : '%da',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-// This regex comes from regex.coffee, and is inserted here by generate-index.js
-// (run `npm run build`).
-exports.default = /((['"])(?:(?!\2|\\).|\\(?:\r\n|[\s\S]))*(\2)?|`(?:[^`\\$]|\\[\s\S]|\$(?!\{)|\$\{(?:[^{}]|\{[^}]*\}?)*\}?)*(`)?)|(\/\/.*)|(\/\*(?:[^*]|\*(?!\/))*(\*\/)?)|(\/(?!\*)(?:\[(?:(?![\]\\]).|\\.)*\]|(?![\/\]\\]).|\\.)+\/(?:(?!\s*(?:\b|[\u0080-\uFFFF$\\'"~({]|[+\-!](?!=)|\.?\d))|[gmiyus]{1,6}\b(?![\u0080-\uFFFF$\\]|\s*(?:[+\-*%&|^<>!=?({]|\/(?![\/*])))))|(0[xX][\da-fA-F]+|0[oO][0-7]+|0[bB][01]+|(?:\d*\.\d+|\d+\.?)(?:[eE][+-]?\d+)?)|((?!\d)(?:(?!\s)[$\w\u0080-\uFFFF]|\\u[\da-fA-F]{4}|\\u\{[\da-fA-F]+\})+)|(--|\+\+|&&|\|\||=>|\.{3}|(?:[+\-\/%&|^]|\*{1,2}|<{1,2}|>{1,3}|!=?|={1,2})=?|[?~.,:;[\](){}])|(\s+)|(^$|[\s\S])/g
+    return eo;
 
-exports.matchToToken = function(match) {
-  var token = {type: "invalid", value: match[0], closed: undefined}
-       if (match[ 1]) token.type = "string" , token.closed = !!(match[3] || match[4])
-  else if (match[ 5]) token.type = "comment"
-  else if (match[ 6]) token.type = "comment", token.closed = !!match[7]
-  else if (match[ 8]) token.type = "regex"
-  else if (match[ 9]) token.type = "number"
-  else if (match[10]) token.type = "name"
-  else if (match[11]) token.type = "punctuator"
-  else if (match[12]) token.type = "whitespace"
-  return token
-}
+})));
 
 
 /***/ }),
-/* 65 */
+/* 76 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/*
-  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
+//! moment.js locale configuration
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
+        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
 
+    var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];
+    var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;
 
-(function () {
-    'use strict';
+    var es = moment.defineLocale('es', {
+        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortDot;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShort[m.month()];
+            } else {
+                return monthsShortDot[m.month()];
+            }
+        },
+        monthsRegex : monthsRegex,
+        monthsShortRegex : monthsRegex,
+        monthsStrictRegex : /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
+        monthsShortStrictRegex : /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+        monthsParse : monthsParse,
+        longMonthsParse : monthsParse,
+        shortMonthsParse : monthsParse,
+        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY H:mm',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastDay : function () {
+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'hace %s',
+            s : 'unos segundos',
+            ss : '%d segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'una hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un año',
+            yy : '%d años'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-    exports.ast = __webpack_require__(66);
-    exports.code = __webpack_require__(67);
-    exports.keyword = __webpack_require__(68);
-}());
-/* vim: set sw=4 ts=4 et tw=80 : */
+    return es;
+
+})));
 
 
 /***/ }),
-/* 66 */
-/***/ (function(module, exports) {
+/* 77 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/*
-  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
+//! moment.js locale configuration
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
+        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
 
-(function () {
-    'use strict';
+    var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];
+    var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;
 
-    function isExpression(node) {
-        if (node == null) { return false; }
-        switch (node.type) {
-            case 'ArrayExpression':
-            case 'AssignmentExpression':
-            case 'BinaryExpression':
-            case 'CallExpression':
-            case 'ConditionalExpression':
-            case 'FunctionExpression':
-            case 'Identifier':
-            case 'Literal':
-            case 'LogicalExpression':
-            case 'MemberExpression':
-            case 'NewExpression':
-            case 'ObjectExpression':
-            case 'SequenceExpression':
-            case 'ThisExpression':
-            case 'UnaryExpression':
-            case 'UpdateExpression':
-                return true;
+    var esDo = moment.defineLocale('es-do', {
+        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortDot;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShort[m.month()];
+            } else {
+                return monthsShortDot[m.month()];
+            }
+        },
+        monthsRegex: monthsRegex,
+        monthsShortRegex: monthsRegex,
+        monthsStrictRegex: /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
+        monthsShortStrictRegex: /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+        monthsParse: monthsParse,
+        longMonthsParse: monthsParse,
+        shortMonthsParse: monthsParse,
+        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY h:mm A',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastDay : function () {
+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'hace %s',
+            s : 'unos segundos',
+            ss : '%d segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'una hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un año',
+            yy : '%d años'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-        return false;
-    }
+    });
 
-    function isIterationStatement(node) {
-        if (node == null) { return false; }
-        switch (node.type) {
-            case 'DoWhileStatement':
-            case 'ForInStatement':
-            case 'ForStatement':
-            case 'WhileStatement':
-                return true;
-        }
-        return false;
-    }
+    return esDo;
 
-    function isStatement(node) {
-        if (node == null) { return false; }
-        switch (node.type) {
-            case 'BlockStatement':
-            case 'BreakStatement':
-            case 'ContinueStatement':
-            case 'DebuggerStatement':
-            case 'DoWhileStatement':
-            case 'EmptyStatement':
-            case 'ExpressionStatement':
-            case 'ForInStatement':
-            case 'ForStatement':
-            case 'IfStatement':
-            case 'LabeledStatement':
-            case 'ReturnStatement':
-            case 'SwitchStatement':
-            case 'ThrowStatement':
-            case 'TryStatement':
-            case 'VariableDeclaration':
-            case 'WhileStatement':
-            case 'WithStatement':
-                return true;
-        }
-        return false;
-    }
+})));
 
-    function isSourceElement(node) {
-      return isStatement(node) || node != null && node.type === 'FunctionDeclaration';
-    }
 
-    function trailingStatement(node) {
-        switch (node.type) {
-        case 'IfStatement':
-            if (node.alternate != null) {
-                return node.alternate;
-            }
-            return node.consequent;
+/***/ }),
+/* 78 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        case 'LabeledStatement':
-        case 'ForStatement':
-        case 'ForInStatement':
-        case 'WhileStatement':
-        case 'WithStatement':
-            return node.body;
-        }
-        return null;
-    }
+//! moment.js locale configuration
 
-    function isProblematicIfStatement(node) {
-        var current;
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-        if (node.type !== 'IfStatement') {
-            return false;
-        }
-        if (node.alternate == null) {
-            return false;
-        }
-        current = node.consequent;
-        do {
-            if (current.type === 'IfStatement') {
-                if (current.alternate == null)  {
-                    return true;
-                }
-            }
-            current = trailingStatement(current);
-        } while (current);
 
-        return false;
-    }
+    var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'),
+        monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
 
-    module.exports = {
-        isExpression: isExpression,
-        isStatement: isStatement,
-        isIterationStatement: isIterationStatement,
-        isSourceElement: isSourceElement,
-        isProblematicIfStatement: isProblematicIfStatement,
+    var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i];
+    var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;
 
-        trailingStatement: trailingStatement
-    };
-}());
-/* vim: set sw=4 ts=4 et tw=80 : */
+    var esUs = moment.defineLocale('es-us', {
+        months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortDot;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShort[m.month()];
+            } else {
+                return monthsShortDot[m.month()];
+            }
+        },
+        monthsRegex: monthsRegex,
+        monthsShortRegex: monthsRegex,
+        monthsStrictRegex: /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,
+        monthsShortStrictRegex: /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,
+        monthsParse: monthsParse,
+        longMonthsParse: monthsParse,
+        shortMonthsParse: monthsParse,
+        weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
+        weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
+        weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'MM/DD/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY h:mm A',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastDay : function () {
+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'hace %s',
+            s : 'unos segundos',
+            ss : '%d segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'una hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un año',
+            yy : '%d años'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 6th is the first week of the year.
+        }
+    });
+
+    return esUs;
+
+})));
 
 
 /***/ }),
-/* 67 */
-/***/ (function(module, exports) {
+/* 79 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/*
-  Copyright (C) 2013-2014 Yusuke Suzuki <utatane.tea@gmail.com>
-  Copyright (C) 2014 Ivan Nikulin <ifaaan@gmail.com>
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            's' : ['mõne sekundi', 'mõni sekund', 'paar sekundit'],
+            'ss': [number + 'sekundi', number + 'sekundit'],
+            'm' : ['ühe minuti', 'üks minut'],
+            'mm': [number + ' minuti', number + ' minutit'],
+            'h' : ['ühe tunni', 'tund aega', 'üks tund'],
+            'hh': [number + ' tunni', number + ' tundi'],
+            'd' : ['ühe päeva', 'üks päev'],
+            'M' : ['kuu aja', 'kuu aega', 'üks kuu'],
+            'MM': [number + ' kuu', number + ' kuud'],
+            'y' : ['ühe aasta', 'aasta', 'üks aasta'],
+            'yy': [number + ' aasta', number + ' aastat']
+        };
+        if (withoutSuffix) {
+            return format[key][2] ? format[key][2] : format[key][1];
+        }
+        return isFuture ? format[key][0] : format[key][1];
+    }
+
+    var et = moment.defineLocale('et', {
+        months        : 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'),
+        monthsShort   : 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'),
+        weekdays      : 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'),
+        weekdaysShort : 'P_E_T_K_N_R_L'.split('_'),
+        weekdaysMin   : 'P_E_T_K_N_R_L'.split('_'),
+        longDateFormat : {
+            LT   : 'H:mm',
+            LTS : 'H:mm:ss',
+            L    : 'DD.MM.YYYY',
+            LL   : 'D. MMMM YYYY',
+            LLL  : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay  : '[Täna,] LT',
+            nextDay  : '[Homme,] LT',
+            nextWeek : '[Järgmine] dddd LT',
+            lastDay  : '[Eile,] LT',
+            lastWeek : '[Eelmine] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s pärast',
+            past   : '%s tagasi',
+            s      : processRelativeTime,
+            ss     : processRelativeTime,
+            m      : processRelativeTime,
+            mm     : processRelativeTime,
+            h      : processRelativeTime,
+            hh     : processRelativeTime,
+            d      : processRelativeTime,
+            dd     : '%d päeva',
+            M      : processRelativeTime,
+            MM     : processRelativeTime,
+            y      : processRelativeTime,
+            yy     : processRelativeTime
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
+    return et;
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
+})));
 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
 
-(function () {
-    'use strict';
+/***/ }),
+/* 80 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    var ES6Regex, ES5Regex, NON_ASCII_WHITESPACES, IDENTIFIER_START, IDENTIFIER_PART, ch;
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var eu = moment.defineLocale('eu', {
+        months : 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'),
+        monthsShort : 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'),
+        weekdaysShort : 'ig._al._ar._az._og._ol._lr.'.split('_'),
+        weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY[ko] MMMM[ren] D[a]',
+            LLL : 'YYYY[ko] MMMM[ren] D[a] HH:mm',
+            LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] HH:mm',
+            l : 'YYYY-M-D',
+            ll : 'YYYY[ko] MMM D[a]',
+            lll : 'YYYY[ko] MMM D[a] HH:mm',
+            llll : 'ddd, YYYY[ko] MMM D[a] HH:mm'
+        },
+        calendar : {
+            sameDay : '[gaur] LT[etan]',
+            nextDay : '[bihar] LT[etan]',
+            nextWeek : 'dddd LT[etan]',
+            lastDay : '[atzo] LT[etan]',
+            lastWeek : '[aurreko] dddd LT[etan]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s barru',
+            past : 'duela %s',
+            s : 'segundo batzuk',
+            ss : '%d segundo',
+            m : 'minutu bat',
+            mm : '%d minutu',
+            h : 'ordu bat',
+            hh : '%d ordu',
+            d : 'egun bat',
+            dd : '%d egun',
+            M : 'hilabete bat',
+            MM : '%d hilabete',
+            y : 'urte bat',
+            yy : '%d urte'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-    // See `tools/generate-identifier-regex.js`.
-    ES5Regex = {
-        // ECMAScript 5.1/Unicode v7.0.0 NonAsciiIdentifierStart:
-        NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B2\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/,
-        // ECMAScript 5.1/Unicode v7.0.0 NonAsciiIdentifierPart:
-        NonAsciiIdentifierPart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/
-    };
+    return eu;
 
-    ES6Regex = {
-        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierStart:
-        NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B2\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDE00-\uDE11\uDE13-\uDE2B\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDE00-\uDE2F\uDE44\uDE80-\uDEAA]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF98]|\uD809[\uDC00-\uDC6E]|[\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D]|\uD87E[\uDC00-\uDE1D]/,
-        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierPart:
-        NonAsciiIdentifierPart: /[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDD0-\uDDDA\uDE00-\uDE11\uDE13-\uDE37\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF01-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF98]|\uD809[\uDC00-\uDC6E]|[\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/
-    };
+})));
 
-    function isDecimalDigit(ch) {
-        return 0x30 <= ch && ch <= 0x39;  // 0..9
-    }
 
-    function isHexDigit(ch) {
-        return 0x30 <= ch && ch <= 0x39 ||  // 0..9
-            0x61 <= ch && ch <= 0x66 ||     // a..f
-            0x41 <= ch && ch <= 0x46;       // A..F
-    }
+/***/ }),
+/* 81 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    function isOctalDigit(ch) {
-        return ch >= 0x30 && ch <= 0x37;  // 0..7
-    }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '۱',
+        '2': '۲',
+        '3': '۳',
+        '4': '۴',
+        '5': '۵',
+        '6': '۶',
+        '7': '۷',
+        '8': '۸',
+        '9': '۹',
+        '0': '۰'
+    }, numberMap = {
+        '۱': '1',
+        '۲': '2',
+        '۳': '3',
+        '۴': '4',
+        '۵': '5',
+        '۶': '6',
+        '۷': '7',
+        '۸': '8',
+        '۹': '9',
+        '۰': '0'
+    };
+
+    var fa = moment.defineLocale('fa', {
+        months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+        monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+        weekdays : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+        weekdaysShort : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+        weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /قبل از ظهر|بعد از ظهر/,
+        isPM: function (input) {
+            return /بعد از ظهر/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'قبل از ظهر';
+            } else {
+                return 'بعد از ظهر';
+            }
+        },
+        calendar : {
+            sameDay : '[امروز ساعت] LT',
+            nextDay : '[فردا ساعت] LT',
+            nextWeek : 'dddd [ساعت] LT',
+            lastDay : '[دیروز ساعت] LT',
+            lastWeek : 'dddd [پیش] [ساعت] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'در %s',
+            past : '%s پیش',
+            s : 'چند ثانیه',
+            ss : 'ثانیه d%',
+            m : 'یک دقیقه',
+            mm : '%d دقیقه',
+            h : 'یک ساعت',
+            hh : '%d ساعت',
+            d : 'یک روز',
+            dd : '%d روز',
+            M : 'یک ماه',
+            MM : '%d ماه',
+            y : 'یک سال',
+            yy : '%d سال'
+        },
+        preparse: function (string) {
+            return string.replace(/[۰-۹]/g, function (match) {
+                return numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}م/,
+        ordinal : '%dم',
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12 // The week that contains Jan 12th is the first week of the year.
+        }
+    });
 
-    // 7.2 White Space
+    return fa;
 
-    NON_ASCII_WHITESPACES = [
-        0x1680, 0x180E,
-        0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A,
-        0x202F, 0x205F,
-        0x3000,
-        0xFEFF
-    ];
+})));
 
-    function isWhiteSpace(ch) {
-        return ch === 0x20 || ch === 0x09 || ch === 0x0B || ch === 0x0C || ch === 0xA0 ||
-            ch >= 0x1680 && NON_ASCII_WHITESPACES.indexOf(ch) >= 0;
-    }
 
-    // 7.3 Line Terminators
+/***/ }),
+/* 82 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    function isLineTerminator(ch) {
-        return ch === 0x0A || ch === 0x0D || ch === 0x2028 || ch === 0x2029;
-    }
+//! moment.js locale configuration
 
-    // 7.6 Identifier Names and Identifiers
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-    function fromCodePoint(cp) {
-        if (cp <= 0xFFFF) { return String.fromCharCode(cp); }
-        var cu1 = String.fromCharCode(Math.floor((cp - 0x10000) / 0x400) + 0xD800);
-        var cu2 = String.fromCharCode(((cp - 0x10000) % 0x400) + 0xDC00);
-        return cu1 + cu2;
-    }
 
-    IDENTIFIER_START = new Array(0x80);
-    for(ch = 0; ch < 0x80; ++ch) {
-        IDENTIFIER_START[ch] =
-            ch >= 0x61 && ch <= 0x7A ||  // a..z
-            ch >= 0x41 && ch <= 0x5A ||  // A..Z
-            ch === 0x24 || ch === 0x5F;  // $ (dollar) and _ (underscore)
+    var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
+        numbersFuture = [
+            'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
+            numbersPast[7], numbersPast[8], numbersPast[9]
+        ];
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = '';
+        switch (key) {
+            case 's':
+                return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
+            case 'ss':
+                return isFuture ? 'sekunnin' : 'sekuntia';
+            case 'm':
+                return isFuture ? 'minuutin' : 'minuutti';
+            case 'mm':
+                result = isFuture ? 'minuutin' : 'minuuttia';
+                break;
+            case 'h':
+                return isFuture ? 'tunnin' : 'tunti';
+            case 'hh':
+                result = isFuture ? 'tunnin' : 'tuntia';
+                break;
+            case 'd':
+                return isFuture ? 'päivän' : 'päivä';
+            case 'dd':
+                result = isFuture ? 'päivän' : 'päivää';
+                break;
+            case 'M':
+                return isFuture ? 'kuukauden' : 'kuukausi';
+            case 'MM':
+                result = isFuture ? 'kuukauden' : 'kuukautta';
+                break;
+            case 'y':
+                return isFuture ? 'vuoden' : 'vuosi';
+            case 'yy':
+                result = isFuture ? 'vuoden' : 'vuotta';
+                break;
+        }
+        result = verbalNumber(number, isFuture) + ' ' + result;
+        return result;
     }
+    function verbalNumber(number, isFuture) {
+        return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
+    }
+
+    var fi = moment.defineLocale('fi', {
+        months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
+        monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
+        weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
+        weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'Do MMMM[ta] YYYY',
+            LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm',
+            LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm',
+            l : 'D.M.YYYY',
+            ll : 'Do MMM YYYY',
+            lll : 'Do MMM YYYY, [klo] HH.mm',
+            llll : 'ddd, Do MMM YYYY, [klo] HH.mm'
+        },
+        calendar : {
+            sameDay : '[tänään] [klo] LT',
+            nextDay : '[huomenna] [klo] LT',
+            nextWeek : 'dddd [klo] LT',
+            lastDay : '[eilen] [klo] LT',
+            lastWeek : '[viime] dddd[na] [klo] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s päästä',
+            past : '%s sitten',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-    IDENTIFIER_PART = new Array(0x80);
-    for(ch = 0; ch < 0x80; ++ch) {
-        IDENTIFIER_PART[ch] =
-            ch >= 0x61 && ch <= 0x7A ||  // a..z
-            ch >= 0x41 && ch <= 0x5A ||  // A..Z
-            ch >= 0x30 && ch <= 0x39 ||  // 0..9
-            ch === 0x24 || ch === 0x5F;  // $ (dollar) and _ (underscore)
-    }
+    return fi;
 
-    function isIdentifierStartES5(ch) {
-        return ch < 0x80 ? IDENTIFIER_START[ch] : ES5Regex.NonAsciiIdentifierStart.test(fromCodePoint(ch));
-    }
+})));
 
-    function isIdentifierPartES5(ch) {
-        return ch < 0x80 ? IDENTIFIER_PART[ch] : ES5Regex.NonAsciiIdentifierPart.test(fromCodePoint(ch));
-    }
 
-    function isIdentifierStartES6(ch) {
-        return ch < 0x80 ? IDENTIFIER_START[ch] : ES6Regex.NonAsciiIdentifierStart.test(fromCodePoint(ch));
-    }
+/***/ }),
+/* 83 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    function isIdentifierPartES6(ch) {
-        return ch < 0x80 ? IDENTIFIER_PART[ch] : ES6Regex.NonAsciiIdentifierPart.test(fromCodePoint(ch));
-    }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var fo = moment.defineLocale('fo', {
+        months : 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),
+        weekdaysShort : 'sun_mán_týs_mik_hós_frí_ley'.split('_'),
+        weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D. MMMM, YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Í dag kl.] LT',
+            nextDay : '[Í morgin kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[Í gjár kl.] LT',
+            lastWeek : '[síðstu] dddd [kl] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'um %s',
+            past : '%s síðani',
+            s : 'fá sekund',
+            ss : '%d sekundir',
+            m : 'ein minuttur',
+            mm : '%d minuttir',
+            h : 'ein tími',
+            hh : '%d tímar',
+            d : 'ein dagur',
+            dd : '%d dagar',
+            M : 'ein mánaður',
+            MM : '%d mánaðir',
+            y : 'eitt ár',
+            yy : '%d ár'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-    module.exports = {
-        isDecimalDigit: isDecimalDigit,
-        isHexDigit: isHexDigit,
-        isOctalDigit: isOctalDigit,
-        isWhiteSpace: isWhiteSpace,
-        isLineTerminator: isLineTerminator,
-        isIdentifierStartES5: isIdentifierStartES5,
-        isIdentifierPartES5: isIdentifierPartES5,
-        isIdentifierStartES6: isIdentifierStartES6,
-        isIdentifierPartES6: isIdentifierPartES6
-    };
-}());
-/* vim: set sw=4 ts=4 et tw=80 : */
+    return fo;
+
+})));
 
 
 /***/ }),
-/* 68 */
+/* 84 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/*
-  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var fr = moment.defineLocale('fr', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Aujourd’hui à] LT',
+            nextDay : '[Demain à] LT',
+            nextWeek : 'dddd [à] LT',
+            lastDay : '[Hier à] LT',
+            lastWeek : 'dddd [dernier à] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            ss : '%d secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(er|)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                // TODO: Return 'e' when day of month > 1. Move this case inside
+                // block for masculine words below.
+                // See https://github.com/moment/moment/issues/3375
+                case 'D':
+                    return number + (number === 1 ? 'er' : '');
+
+                // Words with masculine grammatical gender: mois, trimestre, jour
+                default:
+                case 'M':
+                case 'Q':
+                case 'DDD':
+                case 'd':
+                    return number + (number === 1 ? 'er' : 'e');
+
+                // Words with feminine grammatical gender: semaine
+                case 'w':
+                case 'W':
+                    return number + (number === 1 ? 're' : 'e');
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
+    return fr;
 
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+})));
 
-(function () {
-    'use strict';
 
-    var code = __webpack_require__(67);
+/***/ }),
+/* 85 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    function isStrictModeReservedWordES6(id) {
-        switch (id) {
-        case 'implements':
-        case 'interface':
-        case 'package':
-        case 'private':
-        case 'protected':
-        case 'public':
-        case 'static':
-        case 'let':
-            return true;
-        default:
-            return false;
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var frCa = moment.defineLocale('fr-ca', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Aujourd’hui à] LT',
+            nextDay : '[Demain à] LT',
+            nextWeek : 'dddd [à] LT',
+            lastDay : '[Hier à] LT',
+            lastWeek : 'dddd [dernier à] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            ss : '%d secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                // Words with masculine grammatical gender: mois, trimestre, jour
+                default:
+                case 'M':
+                case 'Q':
+                case 'D':
+                case 'DDD':
+                case 'd':
+                    return number + (number === 1 ? 'er' : 'e');
+
+                // Words with feminine grammatical gender: semaine
+                case 'w':
+                case 'W':
+                    return number + (number === 1 ? 're' : 'e');
+            }
         }
-    }
+    });
 
-    function isKeywordES5(id, strict) {
-        // yield should not be treated as keyword under non-strict mode.
-        if (!strict && id === 'yield') {
-            return false;
-        }
-        return isKeywordES6(id, strict);
-    }
+    return frCa;
 
-    function isKeywordES6(id, strict) {
-        if (strict && isStrictModeReservedWordES6(id)) {
-            return true;
-        }
+})));
 
-        switch (id.length) {
-        case 2:
-            return (id === 'if') || (id === 'in') || (id === 'do');
-        case 3:
-            return (id === 'var') || (id === 'for') || (id === 'new') || (id === 'try');
-        case 4:
-            return (id === 'this') || (id === 'else') || (id === 'case') ||
-                (id === 'void') || (id === 'with') || (id === 'enum');
-        case 5:
-            return (id === 'while') || (id === 'break') || (id === 'catch') ||
-                (id === 'throw') || (id === 'const') || (id === 'yield') ||
-                (id === 'class') || (id === 'super');
-        case 6:
-            return (id === 'return') || (id === 'typeof') || (id === 'delete') ||
-                (id === 'switch') || (id === 'export') || (id === 'import');
-        case 7:
-            return (id === 'default') || (id === 'finally') || (id === 'extends');
-        case 8:
-            return (id === 'function') || (id === 'continue') || (id === 'debugger');
-        case 10:
-            return (id === 'instanceof');
-        default:
-            return false;
-        }
-    }
 
-    function isReservedWordES5(id, strict) {
-        return id === 'null' || id === 'true' || id === 'false' || isKeywordES5(id, strict);
-    }
+/***/ }),
+/* 86 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    function isReservedWordES6(id, strict) {
-        return id === 'null' || id === 'true' || id === 'false' || isKeywordES6(id, strict);
-    }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var frCh = moment.defineLocale('fr-ch', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Aujourd’hui à] LT',
+            nextDay : '[Demain à] LT',
+            nextWeek : 'dddd [à] LT',
+            lastDay : '[Hier à] LT',
+            lastWeek : 'dddd [dernier à] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            ss : '%d secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(er|e)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                // Words with masculine grammatical gender: mois, trimestre, jour
+                default:
+                case 'M':
+                case 'Q':
+                case 'D':
+                case 'DDD':
+                case 'd':
+                    return number + (number === 1 ? 'er' : 'e');
+
+                // Words with feminine grammatical gender: semaine
+                case 'w':
+                case 'W':
+                    return number + (number === 1 ? 're' : 'e');
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-    function isRestrictedWord(id) {
-        return id === 'eval' || id === 'arguments';
-    }
+    return frCh;
 
-    function isIdentifierNameES5(id) {
-        var i, iz, ch;
+})));
 
-        if (id.length === 0) { return false; }
 
-        ch = id.charCodeAt(0);
-        if (!code.isIdentifierStartES5(ch)) {
-            return false;
-        }
+/***/ }),
+/* 87 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        for (i = 1, iz = id.length; i < iz; ++i) {
-            ch = id.charCodeAt(i);
-            if (!code.isIdentifierPartES5(ch)) {
-                return false;
-            }
-        }
-        return true;
-    }
+//! moment.js locale configuration
 
-    function decodeUtf16(lead, trail) {
-        return (lead - 0xD800) * 0x400 + (trail - 0xDC00) + 0x10000;
-    }
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-    function isIdentifierNameES6(id) {
-        var i, iz, ch, lowCh, check;
 
-        if (id.length === 0) { return false; }
+    var monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'),
+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_');
 
-        check = code.isIdentifierStartES6;
-        for (i = 0, iz = id.length; i < iz; ++i) {
-            ch = id.charCodeAt(i);
-            if (0xD800 <= ch && ch <= 0xDBFF) {
-                ++i;
-                if (i >= iz) { return false; }
-                lowCh = id.charCodeAt(i);
-                if (!(0xDC00 <= lowCh && lowCh <= 0xDFFF)) {
-                    return false;
-                }
-                ch = decodeUtf16(ch, lowCh);
-            }
-            if (!check(ch)) {
-                return false;
+    var fy = moment.defineLocale('fy', {
+        months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortWithDots;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShortWithoutDots[m.month()];
+            } else {
+                return monthsShortWithDots[m.month()];
             }
-            check = code.isIdentifierPartES6;
+        },
+        monthsParseExact : true,
+        weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'),
+        weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'),
+        weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[hjoed om] LT',
+            nextDay: '[moarn om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[juster om] LT',
+            lastWeek: '[ôfrûne] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'oer %s',
+            past : '%s lyn',
+            s : 'in pear sekonden',
+            ss : '%d sekonden',
+            m : 'ien minút',
+            mm : '%d minuten',
+            h : 'ien oere',
+            hh : '%d oeren',
+            d : 'ien dei',
+            dd : '%d dagen',
+            M : 'ien moanne',
+            MM : '%d moannen',
+            y : 'ien jier',
+            yy : '%d jierren'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-        return true;
-    }
-
-    function isIdentifierES5(id, strict) {
-        return isIdentifierNameES5(id) && !isReservedWordES5(id, strict);
-    }
+    });
 
-    function isIdentifierES6(id, strict) {
-        return isIdentifierNameES6(id) && !isReservedWordES6(id, strict);
-    }
+    return fy;
 
-    module.exports = {
-        isKeywordES5: isKeywordES5,
-        isKeywordES6: isKeywordES6,
-        isReservedWordES5: isReservedWordES5,
-        isReservedWordES6: isReservedWordES6,
-        isRestrictedWord: isRestrictedWord,
-        isIdentifierNameES5: isIdentifierNameES5,
-        isIdentifierNameES6: isIdentifierNameES6,
-        isIdentifierES5: isIdentifierES5,
-        isIdentifierES6: isIdentifierES6
-    };
-}());
-/* vim: set sw=4 ts=4 et tw=80 : */
+})));
 
 
 /***/ }),
-/* 69 */
+/* 88 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-const escapeStringRegexp = __webpack_require__(3);
-const ansiStyles = __webpack_require__(70);
-const stdoutColor = __webpack_require__(71).stdout;
+//! moment.js locale configuration
 
-const template = __webpack_require__(72);
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
 
-// `color-convert` models to exclude from the Chalk API due to conflicts and such
-const skipModels = new Set(['gray']);
+    var months = [
+        'Eanáir', 'Feabhra', 'Márta', 'Aibreán', 'Bealtaine', 'Méitheamh', 'Iúil', 'Lúnasa', 'Meán Fómhair', 'Deaireadh Fómhair', 'Samhain', 'Nollaig'
+    ];
 
-const styles = Object.create(null);
+    var monthsShort = ['Eaná', 'Feab', 'Márt', 'Aibr', 'Beal', 'Méit', 'Iúil', 'Lúna', 'Meán', 'Deai', 'Samh', 'Noll'];
 
-function applyOptions(obj, options) {
-	options = options || {};
+    var weekdays = ['Dé Domhnaigh', 'Dé Luain', 'Dé Máirt', 'Dé Céadaoin', 'Déardaoin', 'Dé hAoine', 'Dé Satharn'];
 
-	// Detect level if not set manually
-	const scLevel = stdoutColor ? stdoutColor.level : 0;
-	obj.level = options.level === undefined ? scLevel : options.level;
-	obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0;
-}
+    var weekdaysShort = ['Dom', 'Lua', 'Mái', 'Céa', 'Déa', 'hAo', 'Sat'];
 
-function Chalk(options) {
-	// We check for this.template here since calling `chalk.constructor()`
-	// by itself will have a `this` of a previously constructed chalk object
-	if (!this || !(this instanceof Chalk) || this.template) {
-		const chalk = {};
-		applyOptions(chalk, options);
+    var weekdaysMin = ['Do', 'Lu', 'Má', 'Ce', 'Dé', 'hA', 'Sa'];
 
-		chalk.template = function () {
-			const args = [].slice.call(arguments);
-			return chalkTag.apply(null, [chalk.template].concat(args));
-		};
+    var ga = moment.defineLocale('ga', {
+        months: months,
+        monthsShort: monthsShort,
+        monthsParseExact: true,
+        weekdays: weekdays,
+        weekdaysShort: weekdaysShort,
+        weekdaysMin: weekdaysMin,
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY HH:mm',
+            LLLL: 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar: {
+            sameDay: '[Inniu ag] LT',
+            nextDay: '[Amárach ag] LT',
+            nextWeek: 'dddd [ag] LT',
+            lastDay: '[Inné aig] LT',
+            lastWeek: 'dddd [seo caite] [ag] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'i %s',
+            past: '%s ó shin',
+            s: 'cúpla soicind',
+            ss: '%d soicind',
+            m: 'nóiméad',
+            mm: '%d nóiméad',
+            h: 'uair an chloig',
+            hh: '%d uair an chloig',
+            d: 'lá',
+            dd: '%d lá',
+            M: 'mí',
+            MM: '%d mí',
+            y: 'bliain',
+            yy: '%d bliain'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(d|na|mh)/,
+        ordinal: function (number) {
+            var output = number === 1 ? 'd' : number % 10 === 2 ? 'na' : 'mh';
+            return number + output;
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-		Object.setPrototypeOf(chalk, Chalk.prototype);
-		Object.setPrototypeOf(chalk.template, chalk);
+    return ga;
 
-		chalk.template.constructor = Chalk;
+})));
 
-		return chalk.template;
-	}
 
-	applyOptions(this, options);
-}
+/***/ }),
+/* 89 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// Use bright blue on Windows as the normal blue color is illegible
-if (isSimpleWindowsTerm) {
-	ansiStyles.blue.open = '\u001B[94m';
-}
+//! moment.js locale configuration
 
-for (const key of Object.keys(ansiStyles)) {
-	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-	styles[key] = {
-		get() {
-			const codes = ansiStyles[key];
-			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
-		}
-	};
-}
 
-styles.visible = {
-	get() {
-		return build.call(this, this._styles || [], true, 'visible');
-	}
-};
+    var months = [
+        'Am Faoilleach', 'An Gearran', 'Am Màrt', 'An Giblean', 'An Cèitean', 'An t-Ògmhios', 'An t-Iuchar', 'An Lùnastal', 'An t-Sultain', 'An Dàmhair', 'An t-Samhain', 'An Dùbhlachd'
+    ];
 
-ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
-for (const model of Object.keys(ansiStyles.color.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
+    var monthsShort = ['Faoi', 'Gear', 'Màrt', 'Gibl', 'Cèit', 'Ògmh', 'Iuch', 'Lùn', 'Sult', 'Dàmh', 'Samh', 'Dùbh'];
 
-	styles[model] = {
-		get() {
-			const level = this.level;
-			return function () {
-				const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments);
-				const codes = {
-					open,
-					close: ansiStyles.color.close,
-					closeRe: ansiStyles.color.closeRe
-				};
-				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
-			};
-		}
-	};
-}
+    var weekdays = ['Didòmhnaich', 'Diluain', 'Dimàirt', 'Diciadain', 'Diardaoin', 'Dihaoine', 'Disathairne'];
 
-ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
-for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
+    var weekdaysShort = ['Did', 'Dil', 'Dim', 'Dic', 'Dia', 'Dih', 'Dis'];
 
-	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
-	styles[bgModel] = {
-		get() {
-			const level = this.level;
-			return function () {
-				const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments);
-				const codes = {
-					open,
-					close: ansiStyles.bgColor.close,
-					closeRe: ansiStyles.bgColor.closeRe
-				};
-				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
-			};
-		}
-	};
-}
+    var weekdaysMin = ['Dò', 'Lu', 'Mà', 'Ci', 'Ar', 'Ha', 'Sa'];
 
-const proto = Object.defineProperties(() => {}, styles);
+    var gd = moment.defineLocale('gd', {
+        months : months,
+        monthsShort : monthsShort,
+        monthsParseExact : true,
+        weekdays : weekdays,
+        weekdaysShort : weekdaysShort,
+        weekdaysMin : weekdaysMin,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[An-diugh aig] LT',
+            nextDay : '[A-màireach aig] LT',
+            nextWeek : 'dddd [aig] LT',
+            lastDay : '[An-dè aig] LT',
+            lastWeek : 'dddd [seo chaidh] [aig] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'ann an %s',
+            past : 'bho chionn %s',
+            s : 'beagan diogan',
+            ss : '%d diogan',
+            m : 'mionaid',
+            mm : '%d mionaidean',
+            h : 'uair',
+            hh : '%d uairean',
+            d : 'latha',
+            dd : '%d latha',
+            M : 'mìos',
+            MM : '%d mìosan',
+            y : 'bliadhna',
+            yy : '%d bliadhna'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}(d|na|mh)/,
+        ordinal : function (number) {
+            var output = number === 1 ? 'd' : number % 10 === 2 ? 'na' : 'mh';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-function build(_styles, _empty, key) {
-	const builder = function () {
-		return applyStyle.apply(builder, arguments);
-	};
+    return gd;
 
-	builder._styles = _styles;
-	builder._empty = _empty;
+})));
 
-	const self = this;
 
-	Object.defineProperty(builder, 'level', {
-		enumerable: true,
-		get() {
-			return self.level;
-		},
-		set(level) {
-			self.level = level;
-		}
-	});
+/***/ }),
+/* 90 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	Object.defineProperty(builder, 'enabled', {
-		enumerable: true,
-		get() {
-			return self.enabled;
-		},
-		set(enabled) {
-			self.enabled = enabled;
-		}
-	});
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var gl = moment.defineLocale('gl', {
+        months : 'xaneiro_febreiro_marzo_abril_maio_xuño_xullo_agosto_setembro_outubro_novembro_decembro'.split('_'),
+        monthsShort : 'xan._feb._mar._abr._mai._xuñ._xul._ago._set._out._nov._dec.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'domingo_luns_martes_mércores_xoves_venres_sábado'.split('_'),
+        weekdaysShort : 'dom._lun._mar._mér._xov._ven._sáb.'.split('_'),
+        weekdaysMin : 'do_lu_ma_mé_xo_ve_sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY H:mm',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+            },
+            lastDay : function () {
+                return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT';
+            },
+            lastWeek : function () {
+                return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : function (str) {
+                if (str.indexOf('un') === 0) {
+                    return 'n' + str;
+                }
+                return 'en ' + str;
+            },
+            past : 'hai %s',
+            s : 'uns segundos',
+            ss : '%d segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'unha hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un ano',
+            yy : '%d anos'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-	// See below for fix regarding invisible grey/dim combination on Windows
-	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
+    return gl;
 
-	// `__proto__` is used because we must return a function, but there is
-	// no way to create a function with a different prototype
-	builder.__proto__ = proto; // eslint-disable-line no-proto
+})));
 
-	return builder;
-}
 
-function applyStyle() {
-	// Support varags, but simply cast to string in case there's only one arg
-	const args = arguments;
-	const argsLen = args.length;
-	let str = String(arguments[0]);
+/***/ }),
+/* 91 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (argsLen === 0) {
-		return '';
-	}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            's': ['thodde secondanim', 'thodde second'],
+            'ss': [number + ' secondanim', number + ' second'],
+            'm': ['eka mintan', 'ek minute'],
+            'mm': [number + ' mintanim', number + ' mintam'],
+            'h': ['eka voran', 'ek vor'],
+            'hh': [number + ' voranim', number + ' voram'],
+            'd': ['eka disan', 'ek dis'],
+            'dd': [number + ' disanim', number + ' dis'],
+            'M': ['eka mhoinean', 'ek mhoino'],
+            'MM': [number + ' mhoineanim', number + ' mhoine'],
+            'y': ['eka vorsan', 'ek voros'],
+            'yy': [number + ' vorsanim', number + ' vorsam']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+
+    var gomLatn = moment.defineLocale('gom-latn', {
+        months : 'Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr'.split('_'),
+        monthsShort : 'Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'Aitar_Somar_Mongllar_Budvar_Brestar_Sukrar_Son\'var'.split('_'),
+        weekdaysShort : 'Ait._Som._Mon._Bud._Bre._Suk._Son.'.split('_'),
+        weekdaysMin : 'Ai_Sm_Mo_Bu_Br_Su_Sn'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'A h:mm [vazta]',
+            LTS : 'A h:mm:ss [vazta]',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY A h:mm [vazta]',
+            LLLL : 'dddd, MMMM[achea] Do, YYYY, A h:mm [vazta]',
+            llll: 'ddd, D MMM YYYY, A h:mm [vazta]'
+        },
+        calendar : {
+            sameDay: '[Aiz] LT',
+            nextDay: '[Faleam] LT',
+            nextWeek: '[Ieta to] dddd[,] LT',
+            lastDay: '[Kal] LT',
+            lastWeek: '[Fatlo] dddd[,] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s',
+            past : '%s adim',
+            s : processRelativeTime,
+            ss : processRelativeTime,
+            m : processRelativeTime,
+            mm : processRelativeTime,
+            h : processRelativeTime,
+            hh : processRelativeTime,
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}(er)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                // the ordinal 'er' only applies to day of the month
+                case 'D':
+                    return number + 'er';
+                default:
+                case 'M':
+                case 'Q':
+                case 'DDD':
+                case 'd':
+                case 'w':
+                case 'W':
+                    return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        },
+        meridiemParse: /rati|sokalli|donparam|sanje/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'rati') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'sokalli') {
+                return hour;
+            } else if (meridiem === 'donparam') {
+                return hour > 12 ? hour : hour + 12;
+            } else if (meridiem === 'sanje') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'rati';
+            } else if (hour < 12) {
+                return 'sokalli';
+            } else if (hour < 16) {
+                return 'donparam';
+            } else if (hour < 20) {
+                return 'sanje';
+            } else {
+                return 'rati';
+            }
+        }
+    });
 
-	if (argsLen > 1) {
-		// Don't slice `arguments`, it prevents V8 optimizations
-		for (let a = 1; a < argsLen; a++) {
-			str += ' ' + args[a];
-		}
-	}
+    return gomLatn;
 
-	if (!this.enabled || this.level <= 0 || !str) {
-		return this._empty ? '' : str;
-	}
+})));
 
-	// Turns out that on Windows dimmed gray text becomes invisible in cmd.exe,
-	// see https://github.com/chalk/chalk/issues/58
-	// If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop.
-	const originalDim = ansiStyles.dim.open;
-	if (isSimpleWindowsTerm && this.hasGrey) {
-		ansiStyles.dim.open = '';
-	}
 
-	for (const code of this._styles.slice().reverse()) {
-		// Replace any instances already present with a re-opening code
-		// otherwise only the part of the string until said closing code
-		// will be colored, and the rest will simply be 'plain'.
-		str = code.open + str.replace(code.closeRe, code.open) + code.close;
+/***/ }),
+/* 92 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		// Close the styling before a linebreak and reopen
-		// after next line to fix a bleed issue on macOS
-		// https://github.com/chalk/chalk/pull/92
-		str = str.replace(/\r?\n/g, `${code.close}$&${code.open}`);
-	}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+            '1': '૧',
+            '2': '૨',
+            '3': '૩',
+            '4': '૪',
+            '5': '૫',
+            '6': '૬',
+            '7': '૭',
+            '8': '૮',
+            '9': '૯',
+            '0': '૦'
+        },
+        numberMap = {
+            '૧': '1',
+            '૨': '2',
+            '૩': '3',
+            '૪': '4',
+            '૫': '5',
+            '૬': '6',
+            '૭': '7',
+            '૮': '8',
+            '૯': '9',
+            '૦': '0'
+        };
 
-	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
-	ansiStyles.dim.open = originalDim;
+    var gu = moment.defineLocale('gu', {
+        months: 'જાન્યુઆરી_ફેબ્રુઆરી_માર્ચ_એપ્રિલ_મે_જૂન_જુલાઈ_ઑગસ્ટ_સપ્ટેમ્બર_ઑક્ટ્બર_નવેમ્બર_ડિસેમ્બર'.split('_'),
+        monthsShort: 'જાન્યુ._ફેબ્રુ._માર્ચ_એપ્રિ._મે_જૂન_જુલા._ઑગ._સપ્ટે._ઑક્ટ્._નવે._ડિસે.'.split('_'),
+        monthsParseExact: true,
+        weekdays: 'રવિવાર_સોમવાર_મંગળવાર_બુધ્વાર_ગુરુવાર_શુક્રવાર_શનિવાર'.split('_'),
+        weekdaysShort: 'રવિ_સોમ_મંગળ_બુધ્_ગુરુ_શુક્ર_શનિ'.split('_'),
+        weekdaysMin: 'ર_સો_મં_બુ_ગુ_શુ_શ'.split('_'),
+        longDateFormat: {
+            LT: 'A h:mm વાગ્યે',
+            LTS: 'A h:mm:ss વાગ્યે',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY, A h:mm વાગ્યે',
+            LLLL: 'dddd, D MMMM YYYY, A h:mm વાગ્યે'
+        },
+        calendar: {
+            sameDay: '[આજ] LT',
+            nextDay: '[કાલે] LT',
+            nextWeek: 'dddd, LT',
+            lastDay: '[ગઇકાલે] LT',
+            lastWeek: '[પાછલા] dddd, LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: '%s મા',
+            past: '%s પેહલા',
+            s: 'અમુક પળો',
+            ss: '%d સેકંડ',
+            m: 'એક મિનિટ',
+            mm: '%d મિનિટ',
+            h: 'એક કલાક',
+            hh: '%d કલાક',
+            d: 'એક દિવસ',
+            dd: '%d દિવસ',
+            M: 'એક મહિનો',
+            MM: '%d મહિનો',
+            y: 'એક વર્ષ',
+            yy: '%d વર્ષ'
+        },
+        preparse: function (string) {
+            return string.replace(/[૧૨૩૪૫૬૭૮૯૦]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        // Gujarati notation for meridiems are quite fuzzy in practice. While there exists
+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Gujarati.
+        meridiemParse: /રાત|બપોર|સવાર|સાંજ/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'રાત') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'સવાર') {
+                return hour;
+            } else if (meridiem === 'બપોર') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'સાંજ') {
+                return hour + 12;
+            }
+        },
+        meridiem: function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'રાત';
+            } else if (hour < 10) {
+                return 'સવાર';
+            } else if (hour < 17) {
+                return 'બપોર';
+            } else if (hour < 20) {
+                return 'સાંજ';
+            } else {
+                return 'રાત';
+            }
+        },
+        week: {
+            dow: 0, // Sunday is the first day of the week.
+            doy: 6 // The week that contains Jan 6th is the first week of the year.
+        }
+    });
 
-	return str;
-}
+    return gu;
 
-function chalkTag(chalk, strings) {
-	if (!Array.isArray(strings)) {
-		// If chalk() was called by itself or with a string,
-		// return the string itself as a string.
-		return [].slice.call(arguments, 1).join(' ');
-	}
+})));
 
-	const args = [].slice.call(arguments, 2);
-	const parts = [strings.raw[0]];
 
-	for (let i = 1; i < strings.length; i++) {
-		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
-		parts.push(String(strings.raw[i]));
-	}
+/***/ }),
+/* 93 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return template(chalk, parts.join(''));
-}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var he = moment.defineLocale('he', {
+        months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
+        monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),
+        weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
+        weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
+        weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [ב]MMMM YYYY',
+            LLL : 'D [ב]MMMM YYYY HH:mm',
+            LLLL : 'dddd, D [ב]MMMM YYYY HH:mm',
+            l : 'D/M/YYYY',
+            ll : 'D MMM YYYY',
+            lll : 'D MMM YYYY HH:mm',
+            llll : 'ddd, D MMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[היום ב־]LT',
+            nextDay : '[מחר ב־]LT',
+            nextWeek : 'dddd [בשעה] LT',
+            lastDay : '[אתמול ב־]LT',
+            lastWeek : '[ביום] dddd [האחרון בשעה] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'בעוד %s',
+            past : 'לפני %s',
+            s : 'מספר שניות',
+            ss : '%d שניות',
+            m : 'דקה',
+            mm : '%d דקות',
+            h : 'שעה',
+            hh : function (number) {
+                if (number === 2) {
+                    return 'שעתיים';
+                }
+                return number + ' שעות';
+            },
+            d : 'יום',
+            dd : function (number) {
+                if (number === 2) {
+                    return 'יומיים';
+                }
+                return number + ' ימים';
+            },
+            M : 'חודש',
+            MM : function (number) {
+                if (number === 2) {
+                    return 'חודשיים';
+                }
+                return number + ' חודשים';
+            },
+            y : 'שנה',
+            yy : function (number) {
+                if (number === 2) {
+                    return 'שנתיים';
+                } else if (number % 10 === 0 && number !== 10) {
+                    return number + ' שנה';
+                }
+                return number + ' שנים';
+            }
+        },
+        meridiemParse: /אחה"צ|לפנה"צ|אחרי הצהריים|לפני הצהריים|לפנות בוקר|בבוקר|בערב/i,
+        isPM : function (input) {
+            return /^(אחה"צ|אחרי הצהריים|בערב)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 5) {
+                return 'לפנות בוקר';
+            } else if (hour < 10) {
+                return 'בבוקר';
+            } else if (hour < 12) {
+                return isLower ? 'לפנה"צ' : 'לפני הצהריים';
+            } else if (hour < 18) {
+                return isLower ? 'אחה"צ' : 'אחרי הצהריים';
+            } else {
+                return 'בערב';
+            }
+        }
+    });
 
-Object.defineProperties(Chalk.prototype, styles);
+    return he;
 
-module.exports = Chalk(); // eslint-disable-line new-cap
-module.exports.supportsColor = stdoutColor;
-module.exports.default = module.exports; // For TypeScript
+})));
 
 
 /***/ }),
-/* 70 */
+/* 94 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
-const colorConvert = __webpack_require__(6);
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    var hi = moment.defineLocale('hi', {
+        months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'),
+        monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+        weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'),
+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm बजे',
+            LTS : 'A h:mm:ss बजे',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm बजे',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm बजे'
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[कल] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[कल] LT',
+            lastWeek : '[पिछले] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s में',
+            past : '%s पहले',
+            s : 'कुछ ही क्षण',
+            ss : '%d सेकंड',
+            m : 'एक मिनट',
+            mm : '%d मिनट',
+            h : 'एक घंटा',
+            hh : '%d घंटे',
+            d : 'एक दिन',
+            dd : '%d दिन',
+            M : 'एक महीने',
+            MM : '%d महीने',
+            y : 'एक वर्ष',
+            yy : '%d वर्ष'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        // Hindi notation for meridiems are quite fuzzy in practice. While there exists
+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi.
+        meridiemParse: /रात|सुबह|दोपहर|शाम/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'रात') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'सुबह') {
+                return hour;
+            } else if (meridiem === 'दोपहर') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'शाम') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'रात';
+            } else if (hour < 10) {
+                return 'सुबह';
+            } else if (hour < 17) {
+                return 'दोपहर';
+            } else if (hour < 20) {
+                return 'शाम';
+            } else {
+                return 'रात';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 6th is the first week of the year.
+        }
+    });
 
-const wrapAnsi16 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${code + offset}m`;
-};
+    return hi;
 
-const wrapAnsi256 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};5;${code}m`;
-};
+})));
 
-const wrapAnsi16m = (fn, offset) => function () {
-	const rgb = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
-};
 
-function assembleStyles() {
-	const codes = new Map();
-	const styles = {
-		modifier: {
-			reset: [0, 0],
-			// 21 isn't widely supported and 22 does the same thing
-			bold: [1, 22],
-			dim: [2, 22],
-			italic: [3, 23],
-			underline: [4, 24],
-			inverse: [7, 27],
-			hidden: [8, 28],
-			strikethrough: [9, 29]
-		},
-		color: {
-			black: [30, 39],
-			red: [31, 39],
-			green: [32, 39],
-			yellow: [33, 39],
-			blue: [34, 39],
-			magenta: [35, 39],
-			cyan: [36, 39],
-			white: [37, 39],
-			gray: [90, 39],
+/***/ }),
+/* 95 */
+/***/ (function(module, exports, __webpack_require__) {
 
-			// Bright color
-			redBright: [91, 39],
-			greenBright: [92, 39],
-			yellowBright: [93, 39],
-			blueBright: [94, 39],
-			magentaBright: [95, 39],
-			cyanBright: [96, 39],
-			whiteBright: [97, 39]
-		},
-		bgColor: {
-			bgBlack: [40, 49],
-			bgRed: [41, 49],
-			bgGreen: [42, 49],
-			bgYellow: [43, 49],
-			bgBlue: [44, 49],
-			bgMagenta: [45, 49],
-			bgCyan: [46, 49],
-			bgWhite: [47, 49],
+//! moment.js locale configuration
 
-			// Bright color
-			bgBlackBright: [100, 49],
-			bgRedBright: [101, 49],
-			bgGreenBright: [102, 49],
-			bgYellowBright: [103, 49],
-			bgBlueBright: [104, 49],
-			bgMagentaBright: [105, 49],
-			bgCyanBright: [106, 49],
-			bgWhiteBright: [107, 49]
-		}
-	};
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-	// Fix humans
-	styles.color.grey = styles.color.gray;
 
-	for (const groupName of Object.keys(styles)) {
-		const group = styles[groupName];
+    function translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+            case 'ss':
+                if (number === 1) {
+                    result += 'sekunda';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'sekunde';
+                } else {
+                    result += 'sekundi';
+                }
+                return result;
+            case 'm':
+                return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+            case 'mm':
+                if (number === 1) {
+                    result += 'minuta';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'minute';
+                } else {
+                    result += 'minuta';
+                }
+                return result;
+            case 'h':
+                return withoutSuffix ? 'jedan sat' : 'jednog sata';
+            case 'hh':
+                if (number === 1) {
+                    result += 'sat';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'sata';
+                } else {
+                    result += 'sati';
+                }
+                return result;
+            case 'dd':
+                if (number === 1) {
+                    result += 'dan';
+                } else {
+                    result += 'dana';
+                }
+                return result;
+            case 'MM':
+                if (number === 1) {
+                    result += 'mjesec';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'mjeseca';
+                } else {
+                    result += 'mjeseci';
+                }
+                return result;
+            case 'yy':
+                if (number === 1) {
+                    result += 'godina';
+                } else if (number === 2 || number === 3 || number === 4) {
+                    result += 'godine';
+                } else {
+                    result += 'godina';
+                }
+                return result;
+        }
+    }
 
-		for (const styleName of Object.keys(group)) {
-			const style = group[styleName];
+    var hr = moment.defineLocale('hr', {
+        months : {
+            format: 'siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca'.split('_'),
+            standalone: 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_')
+        },
+        monthsShort : 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay  : '[danas u] LT',
+            nextDay  : '[sutra u] LT',
+            nextWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[u] [nedjelju] [u] LT';
+                    case 3:
+                        return '[u] [srijedu] [u] LT';
+                    case 6:
+                        return '[u] [subotu] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[jučer u] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                        return '[prošlu] dddd [u] LT';
+                    case 6:
+                        return '[prošle] [subote] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[prošli] dddd [u] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'par sekundi',
+            ss     : translate,
+            m      : translate,
+            mm     : translate,
+            h      : translate,
+            hh     : translate,
+            d      : 'dan',
+            dd     : translate,
+            M      : 'mjesec',
+            MM     : translate,
+            y      : 'godinu',
+            yy     : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-			styles[styleName] = {
-				open: `\u001B[${style[0]}m`,
-				close: `\u001B[${style[1]}m`
-			};
+    return hr;
 
-			group[styleName] = styles[styleName];
+})));
 
-			codes.set(style[0], style[1]);
-		}
 
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false
-		});
+/***/ }),
+/* 96 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		Object.defineProperty(styles, 'codes', {
-			value: codes,
-			enumerable: false
-		});
-	}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
+    function translate(number, withoutSuffix, key, isFuture) {
+        var num = number;
+        switch (key) {
+            case 's':
+                return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
+            case 'ss':
+                return num + (isFuture || withoutSuffix) ? ' másodperc' : ' másodperce';
+            case 'm':
+                return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce');
+            case 'mm':
+                return num + (isFuture || withoutSuffix ? ' perc' : ' perce');
+            case 'h':
+                return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája');
+            case 'hh':
+                return num + (isFuture || withoutSuffix ? ' óra' : ' órája');
+            case 'd':
+                return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja');
+            case 'dd':
+                return num + (isFuture || withoutSuffix ? ' nap' : ' napja');
+            case 'M':
+                return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+            case 'MM':
+                return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+            case 'y':
+                return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve');
+            case 'yy':
+                return num + (isFuture || withoutSuffix ? ' év' : ' éve');
+        }
+        return '';
+    }
+    function week(isFuture) {
+        return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]';
+    }
+
+    var hu = moment.defineLocale('hu', {
+        months : 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'),
+        monthsShort : 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'),
+        weekdays : 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'),
+        weekdaysShort : 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'),
+        weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'YYYY.MM.DD.',
+            LL : 'YYYY. MMMM D.',
+            LLL : 'YYYY. MMMM D. H:mm',
+            LLLL : 'YYYY. MMMM D., dddd H:mm'
+        },
+        meridiemParse: /de|du/i,
+        isPM: function (input) {
+            return input.charAt(1).toLowerCase() === 'u';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower === true ? 'de' : 'DE';
+            } else {
+                return isLower === true ? 'du' : 'DU';
+            }
+        },
+        calendar : {
+            sameDay : '[ma] LT[-kor]',
+            nextDay : '[holnap] LT[-kor]',
+            nextWeek : function () {
+                return week.call(this, true);
+            },
+            lastDay : '[tegnap] LT[-kor]',
+            lastWeek : function () {
+                return week.call(this, false);
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s múlva',
+            past : '%s',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-	const ansi2ansi = n => n;
-	const rgb2rgb = (r, g, b) => [r, g, b];
+    return hu;
 
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
+})));
 
-	styles.color.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 0)
-	};
-	styles.color.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 0)
-	};
-	styles.color.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 0)
-	};
 
-	styles.bgColor.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 10)
-	};
+/***/ }),
+/* 97 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	for (let key of Object.keys(colorConvert)) {
-		if (typeof colorConvert[key] !== 'object') {
-			continue;
-		}
+//! moment.js locale configuration
 
-		const suite = colorConvert[key];
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-		if (key === 'ansi16') {
-			key = 'ansi';
-		}
 
-		if ('ansi16' in suite) {
-			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
-			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
-		}
+    var hyAm = moment.defineLocale('hy-am', {
+        months : {
+            format: 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_'),
+            standalone: 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_')
+        },
+        monthsShort : 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'),
+        weekdays : 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_'),
+        weekdaysShort : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+        weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY թ.',
+            LLL : 'D MMMM YYYY թ., HH:mm',
+            LLLL : 'dddd, D MMMM YYYY թ., HH:mm'
+        },
+        calendar : {
+            sameDay: '[այսօր] LT',
+            nextDay: '[վաղը] LT',
+            lastDay: '[երեկ] LT',
+            nextWeek: function () {
+                return 'dddd [օրը ժամը] LT';
+            },
+            lastWeek: function () {
+                return '[անցած] dddd [օրը ժամը] LT';
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s հետո',
+            past : '%s առաջ',
+            s : 'մի քանի վայրկյան',
+            ss : '%d վայրկյան',
+            m : 'րոպե',
+            mm : '%d րոպե',
+            h : 'ժամ',
+            hh : '%d ժամ',
+            d : 'օր',
+            dd : '%d օր',
+            M : 'ամիս',
+            MM : '%d ամիս',
+            y : 'տարի',
+            yy : '%d տարի'
+        },
+        meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,
+        isPM: function (input) {
+            return /^(ցերեկվա|երեկոյան)$/.test(input);
+        },
+        meridiem : function (hour) {
+            if (hour < 4) {
+                return 'գիշերվա';
+            } else if (hour < 12) {
+                return 'առավոտվա';
+            } else if (hour < 17) {
+                return 'ցերեկվա';
+            } else {
+                return 'երեկոյան';
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}|\d{1,2}-(ին|րդ)/,
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'DDD':
+                case 'w':
+                case 'W':
+                case 'DDDo':
+                    if (number === 1) {
+                        return number + '-ին';
+                    }
+                    return number + '-րդ';
+                default:
+                    return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-		if ('ansi256' in suite) {
-			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
-			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
-		}
+    return hyAm;
 
-		if ('rgb' in suite) {
-			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
-			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
-		}
-	}
+})));
 
-	return styles;
-}
 
-// Make the export immutable
-Object.defineProperty(module, 'exports', {
-	enumerable: true,
-	get: assembleStyles
-});
+/***/ }),
+/* 98 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var id = moment.defineLocale('id', {
+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Agt_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'),
+        weekdaysShort : 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'),
+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] HH.mm',
+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
+        },
+        meridiemParse: /pagi|siang|sore|malam/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'siang') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'sore' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'siang';
+            } else if (hours < 19) {
+                return 'sore';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Besok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kemarin pukul] LT',
+            lastWeek : 'dddd [lalu pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lalu',
+            s : 'beberapa detik',
+            ss : '%d detik',
+            m : 'semenit',
+            mm : '%d menit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
+
+    return id;
+
+})));
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 71 */
+/* 99 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+//! moment.js locale configuration
 
-const os = __webpack_require__(11);
-const hasFlag = __webpack_require__(12);
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-const env = process.env;
 
-let forceColor;
-if (hasFlag('no-color') ||
-	hasFlag('no-colors') ||
-	hasFlag('color=false')) {
-	forceColor = false;
-} else if (hasFlag('color') ||
-	hasFlag('colors') ||
-	hasFlag('color=true') ||
-	hasFlag('color=always')) {
-	forceColor = true;
-}
-if ('FORCE_COLOR' in env) {
-	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
-}
+    function plural(n) {
+        if (n % 100 === 11) {
+            return true;
+        } else if (n % 10 === 1) {
+            return false;
+        }
+        return true;
+    }
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+            case 's':
+                return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum';
+            case 'ss':
+                if (plural(number)) {
+                    return result + (withoutSuffix || isFuture ? 'sekúndur' : 'sekúndum');
+                }
+                return result + 'sekúnda';
+            case 'm':
+                return withoutSuffix ? 'mínúta' : 'mínútu';
+            case 'mm':
+                if (plural(number)) {
+                    return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum');
+                } else if (withoutSuffix) {
+                    return result + 'mínúta';
+                }
+                return result + 'mínútu';
+            case 'hh':
+                if (plural(number)) {
+                    return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum');
+                }
+                return result + 'klukkustund';
+            case 'd':
+                if (withoutSuffix) {
+                    return 'dagur';
+                }
+                return isFuture ? 'dag' : 'degi';
+            case 'dd':
+                if (plural(number)) {
+                    if (withoutSuffix) {
+                        return result + 'dagar';
+                    }
+                    return result + (isFuture ? 'daga' : 'dögum');
+                } else if (withoutSuffix) {
+                    return result + 'dagur';
+                }
+                return result + (isFuture ? 'dag' : 'degi');
+            case 'M':
+                if (withoutSuffix) {
+                    return 'mánuður';
+                }
+                return isFuture ? 'mánuð' : 'mánuði';
+            case 'MM':
+                if (plural(number)) {
+                    if (withoutSuffix) {
+                        return result + 'mánuðir';
+                    }
+                    return result + (isFuture ? 'mánuði' : 'mánuðum');
+                } else if (withoutSuffix) {
+                    return result + 'mánuður';
+                }
+                return result + (isFuture ? 'mánuð' : 'mánuði');
+            case 'y':
+                return withoutSuffix || isFuture ? 'ár' : 'ári';
+            case 'yy':
+                if (plural(number)) {
+                    return result + (withoutSuffix || isFuture ? 'ár' : 'árum');
+                }
+                return result + (withoutSuffix || isFuture ? 'ár' : 'ári');
+        }
+    }
+
+    var is = moment.defineLocale('is', {
+        months : 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'),
+        weekdays : 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'),
+        weekdaysShort : 'sun_mán_þri_mið_fim_fös_lau'.split('_'),
+        weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] H:mm',
+            LLLL : 'dddd, D. MMMM YYYY [kl.] H:mm'
+        },
+        calendar : {
+            sameDay : '[í dag kl.] LT',
+            nextDay : '[á morgun kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[í gær kl.] LT',
+            lastWeek : '[síðasta] dddd [kl.] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'eftir %s',
+            past : 'fyrir %s síðan',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : 'klukkustund',
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-function translateLevel(level) {
-	if (level === 0) {
-		return false;
-	}
+    return is;
 
-	return {
-		level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
-}
+})));
 
-function supportsColor(stream) {
-	if (forceColor === false) {
-		return 0;
-	}
 
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
+/***/ }),
+/* 100 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if (hasFlag('color=256')) {
-		return 2;
-	}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var it = moment.defineLocale('it', {
+        months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
+        monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
+        weekdays : 'domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato'.split('_'),
+        weekdaysShort : 'dom_lun_mar_mer_gio_ven_sab'.split('_'),
+        weekdaysMin : 'do_lu_ma_me_gi_ve_sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Oggi alle] LT',
+            nextDay: '[Domani alle] LT',
+            nextWeek: 'dddd [alle] LT',
+            lastDay: '[Ieri alle] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[la scorsa] dddd [alle] LT';
+                    default:
+                        return '[lo scorso] dddd [alle] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : function (s) {
+                return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;
+            },
+            past : '%s fa',
+            s : 'alcuni secondi',
+            ss : '%d secondi',
+            m : 'un minuto',
+            mm : '%d minuti',
+            h : 'un\'ora',
+            hh : '%d ore',
+            d : 'un giorno',
+            dd : '%d giorni',
+            M : 'un mese',
+            MM : '%d mesi',
+            y : 'un anno',
+            yy : '%d anni'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal: '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-	if (stream && !stream.isTTY && forceColor !== true) {
-		// VS code debugger doesn't have isTTY set
-		if (env.VSCODE_PID) {
-			return 1;
-		}
-		return 0;
-	}
+    return it;
 
-	const min = forceColor ? 1 : 0;
+})));
 
-	if (process.platform === 'win32') {
-		// Node.js 7.5.0 is the first version of Node.js to include a patch to
-		// libuv that enables 256 color output on Windows. Anything earlier and it
-		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
-		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
-		// release that supports 256 colors. Windows 10 build 14931 is the first release
-		// that supports 16m/TrueColor.
-		const osRelease = os.release().split('.');
-		if (
-			Number(process.versions.node.split('.')[0]) >= 8 &&
-			Number(osRelease[0]) >= 10 &&
-			Number(osRelease[2]) >= 10586
-		) {
-			return Number(osRelease[2]) >= 14931 ? 3 : 2;
-		}
 
-		return 1;
-	}
+/***/ }),
+/* 101 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	if ('CI' in env) {
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
-			return 1;
-		}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var itCh = moment.defineLocale('it-ch', {
+        months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
+        monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
+        weekdays : 'domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato'.split('_'),
+        weekdaysShort : 'dom_lun_mar_mer_gio_ven_sab'.split('_'),
+        weekdaysMin : 'do_lu_ma_me_gi_ve_sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Oggi alle] LT',
+            nextDay: '[Domani alle] LT',
+            nextWeek: 'dddd [alle] LT',
+            lastDay: '[Ieri alle] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[la scorsa] dddd [alle] LT';
+                    default:
+                        return '[lo scorso] dddd [alle] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : function (s) {
+                return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;
+            },
+            past : '%s fa',
+            s : 'alcuni secondi',
+            ss : '%d secondi',
+            m : 'un minuto',
+            mm : '%d minuti',
+            h : 'un\'ora',
+            hh : '%d ore',
+            d : 'un giorno',
+            dd : '%d giorni',
+            M : 'un mese',
+            MM : '%d mesi',
+            y : 'un anno',
+            yy : '%d anni'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal: '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-		return min;
-	}
+    return itCh;
 
-	if ('TEAMCITY_VERSION' in env) {
-		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-	}
+})));
 
-	if (env.COLORTERM === 'truecolor') {
-		return 3;
-	}
 
-	if ('TERM_PROGRAM' in env) {
-		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+/***/ }),
+/* 102 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		switch (env.TERM_PROGRAM) {
-			case 'iTerm.app':
-				return version >= 3 ? 3 : 2;
-			case 'Apple_Terminal':
-				return 2;
-			// No default
-		}
-	}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var ja = moment.defineLocale('ja', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'),
+        weekdaysShort : '日_月_火_水_木_金_土'.split('_'),
+        weekdaysMin : '日_月_火_水_木_金_土'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY年M月D日',
+            LLL : 'YYYY年M月D日 HH:mm',
+            LLLL : 'YYYY年M月D日 dddd HH:mm',
+            l : 'YYYY/MM/DD',
+            ll : 'YYYY年M月D日',
+            lll : 'YYYY年M月D日 HH:mm',
+            llll : 'YYYY年M月D日(ddd) HH:mm'
+        },
+        meridiemParse: /午前|午後/i,
+        isPM : function (input) {
+            return input === '午後';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return '午前';
+            } else {
+                return '午後';
+            }
+        },
+        calendar : {
+            sameDay : '[今日] LT',
+            nextDay : '[明日] LT',
+            nextWeek : function (now) {
+                if (now.week() < this.week()) {
+                    return '[来週]dddd LT';
+                } else {
+                    return 'dddd LT';
+                }
+            },
+            lastDay : '[昨日] LT',
+            lastWeek : function (now) {
+                if (this.week() < now.week()) {
+                    return '[先週]dddd LT';
+                } else {
+                    return 'dddd LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}日/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'DDD':
+                    return number + '日';
+                default:
+                    return number;
+            }
+        },
+        relativeTime : {
+            future : '%s後',
+            past : '%s前',
+            s : '数秒',
+            ss : '%d秒',
+            m : '1分',
+            mm : '%d分',
+            h : '1時間',
+            hh : '%d時間',
+            d : '1日',
+            dd : '%d日',
+            M : '1ヶ月',
+            MM : '%dヶ月',
+            y : '1年',
+            yy : '%d年'
+        }
+    });
 
-	if (/-256(color)?$/i.test(env.TERM)) {
-		return 2;
-	}
+    return ja;
 
-	if (/^screen|^xterm|^vt100|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-		return 1;
-	}
+})));
 
-	if ('COLORTERM' in env) {
-		return 1;
-	}
 
-	if (env.TERM === 'dumb') {
-		return min;
-	}
+/***/ }),
+/* 103 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return min;
-}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var jv = moment.defineLocale('jv', {
+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'),
+        weekdays : 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'),
+        weekdaysShort : 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'),
+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] HH.mm',
+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
+        },
+        meridiemParse: /enjing|siyang|sonten|ndalu/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'enjing') {
+                return hour;
+            } else if (meridiem === 'siyang') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'sonten' || meridiem === 'ndalu') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'enjing';
+            } else if (hours < 15) {
+                return 'siyang';
+            } else if (hours < 19) {
+                return 'sonten';
+            } else {
+                return 'ndalu';
+            }
+        },
+        calendar : {
+            sameDay : '[Dinten puniko pukul] LT',
+            nextDay : '[Mbenjang pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kala wingi pukul] LT',
+            lastWeek : 'dddd [kepengker pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'wonten ing %s',
+            past : '%s ingkang kepengker',
+            s : 'sawetawis detik',
+            ss : '%d detik',
+            m : 'setunggal menit',
+            mm : '%d menit',
+            h : 'setunggal jam',
+            hh : '%d jam',
+            d : 'sedinten',
+            dd : '%d dinten',
+            M : 'sewulan',
+            MM : '%d wulan',
+            y : 'setaun',
+            yy : '%d taun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-function getSupportLevel(stream) {
-	const level = supportsColor(stream);
-	return translateLevel(level);
-}
+    return jv;
 
-module.exports = {
-	supportsColor: getSupportLevel,
-	stdout: getSupportLevel(process.stdout),
-	stderr: getSupportLevel(process.stderr)
-};
+})));
 
 
 /***/ }),
-/* 72 */
+/* 104 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+//! moment.js locale configuration
 
-const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
-const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
-const STRING_REGEX = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/;
-const ESCAPE_REGEX = /\\(u[a-f\d]{4}|x[a-f\d]{2}|.)|([^\\])/gi;
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-const ESCAPES = new Map([
-	['n', '\n'],
-	['r', '\r'],
-	['t', '\t'],
-	['b', '\b'],
-	['f', '\f'],
-	['v', '\v'],
-	['0', '\0'],
-	['\\', '\\'],
-	['e', '\u001B'],
-	['a', '\u0007']
-]);
 
-function unescape(c) {
-	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
-	}
+    var ka = moment.defineLocale('ka', {
+        months : {
+            standalone: 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'),
+            format: 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_')
+        },
+        monthsShort : 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'),
+        weekdays : {
+            standalone: 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'),
+            format: 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_'),
+            isFormat: /(წინა|შემდეგ)/
+        },
+        weekdaysShort : 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'),
+        weekdaysMin : 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[დღეს] LT[-ზე]',
+            nextDay : '[ხვალ] LT[-ზე]',
+            lastDay : '[გუშინ] LT[-ზე]',
+            nextWeek : '[შემდეგ] dddd LT[-ზე]',
+            lastWeek : '[წინა] dddd LT-ზე',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : function (s) {
+                return (/(წამი|წუთი|საათი|წელი)/).test(s) ?
+                    s.replace(/ი$/, 'ში') :
+                    s + 'ში';
+            },
+            past : function (s) {
+                if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) {
+                    return s.replace(/(ი|ე)$/, 'ის წინ');
+                }
+                if ((/წელი/).test(s)) {
+                    return s.replace(/წელი$/, 'წლის წინ');
+                }
+            },
+            s : 'რამდენიმე წამი',
+            ss : '%d წამი',
+            m : 'წუთი',
+            mm : '%d წუთი',
+            h : 'საათი',
+            hh : '%d საათი',
+            d : 'დღე',
+            dd : '%d დღე',
+            M : 'თვე',
+            MM : '%d თვე',
+            y : 'წელი',
+            yy : '%d წელი'
+        },
+        dayOfMonthOrdinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,
+        ordinal : function (number) {
+            if (number === 0) {
+                return number;
+            }
+            if (number === 1) {
+                return number + '-ლი';
+            }
+            if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) {
+                return 'მე-' + number;
+            }
+            return number + '-ე';
+        },
+        week : {
+            dow : 1,
+            doy : 7
+        }
+    });
 
-	return ESCAPES.get(c) || c;
-}
+    return ka;
 
-function parseArguments(name, args) {
-	const results = [];
-	const chunks = args.trim().split(/\s*,\s*/g);
-	let matches;
+})));
 
-	for (const chunk of chunks) {
-		if (!isNaN(chunk)) {
-			results.push(Number(chunk));
-		} else if ((matches = chunk.match(STRING_REGEX))) {
-			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, chr) => escape ? unescape(escape) : chr));
-		} else {
-			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
-		}
-	}
 
-	return results;
-}
+/***/ }),
+/* 105 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function parseStyle(style) {
-	STYLE_REGEX.lastIndex = 0;
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var suffixes = {
+        0: '-ші',
+        1: '-ші',
+        2: '-ші',
+        3: '-ші',
+        4: '-ші',
+        5: '-ші',
+        6: '-шы',
+        7: '-ші',
+        8: '-ші',
+        9: '-шы',
+        10: '-шы',
+        20: '-шы',
+        30: '-шы',
+        40: '-шы',
+        50: '-ші',
+        60: '-шы',
+        70: '-ші',
+        80: '-ші',
+        90: '-шы',
+        100: '-ші'
+    };
+
+    var kk = moment.defineLocale('kk', {
+        months : 'қаңтар_ақпан_наурыз_сәуір_мамыр_маусым_шілде_тамыз_қыркүйек_қазан_қараша_желтоқсан'.split('_'),
+        monthsShort : 'қаң_ақп_нау_сәу_мам_мау_шіл_там_қыр_қаз_қар_жел'.split('_'),
+        weekdays : 'жексенбі_дүйсенбі_сейсенбі_сәрсенбі_бейсенбі_жұма_сенбі'.split('_'),
+        weekdaysShort : 'жек_дүй_сей_сәр_бей_жұм_сен'.split('_'),
+        weekdaysMin : 'жк_дй_сй_ср_бй_жм_сн'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Бүгін сағат] LT',
+            nextDay : '[Ертең сағат] LT',
+            nextWeek : 'dddd [сағат] LT',
+            lastDay : '[Кеше сағат] LT',
+            lastWeek : '[Өткен аптаның] dddd [сағат] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ішінде',
+            past : '%s бұрын',
+            s : 'бірнеше секунд',
+            ss : '%d секунд',
+            m : 'бір минут',
+            mm : '%d минут',
+            h : 'бір сағат',
+            hh : '%d сағат',
+            d : 'бір күн',
+            dd : '%d күн',
+            M : 'бір ай',
+            MM : '%d ай',
+            y : 'бір жыл',
+            yy : '%d жыл'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(ші|шы)/,
+        ordinal : function (number) {
+            var a = number % 10,
+                b = number >= 100 ? 100 : null;
+            return number + (suffixes[number] || suffixes[a] || suffixes[b]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-	const results = [];
-	let matches;
+    return kk;
 
-	while ((matches = STYLE_REGEX.exec(style)) !== null) {
-		const name = matches[1];
+})));
 
-		if (matches[2]) {
-			const args = parseArguments(name, matches[2]);
-			results.push([name].concat(args));
-		} else {
-			results.push([name]);
-		}
-	}
 
-	return results;
-}
+/***/ }),
+/* 106 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function buildStyle(chalk, styles) {
-	const enabled = {};
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '១',
+        '2': '២',
+        '3': '៣',
+        '4': '៤',
+        '5': '៥',
+        '6': '៦',
+        '7': '៧',
+        '8': '៨',
+        '9': '៩',
+        '0': '០'
+    }, numberMap = {
+        '១': '1',
+        '២': '2',
+        '៣': '3',
+        '៤': '4',
+        '៥': '5',
+        '៦': '6',
+        '៧': '7',
+        '៨': '8',
+        '៩': '9',
+        '០': '0'
+    };
+
+    var km = moment.defineLocale('km', {
+        months: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split(
+            '_'
+        ),
+        monthsShort: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split(
+            '_'
+        ),
+        weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+        weekdaysShort: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),
+        weekdaysMin: 'អា_ច_អ_ព_ព្រ_សុ_ស'.split('_'),
+        weekdaysParseExact: true,
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY HH:mm',
+            LLLL: 'dddd, D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /ព្រឹក|ល្ងាច/,
+        isPM: function (input) {
+            return input === 'ល្ងាច';
+        },
+        meridiem: function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ព្រឹក';
+            } else {
+                return 'ល្ងាច';
+            }
+        },
+        calendar: {
+            sameDay: '[ថ្ងៃនេះ ម៉ោង] LT',
+            nextDay: '[ស្អែក ម៉ោង] LT',
+            nextWeek: 'dddd [ម៉ោង] LT',
+            lastDay: '[ម្សិលមិញ ម៉ោង] LT',
+            lastWeek: 'dddd [សប្តាហ៍មុន] [ម៉ោង] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: '%sទៀត',
+            past: '%sមុន',
+            s: 'ប៉ុន្មានវិនាទី',
+            ss: '%d វិនាទី',
+            m: 'មួយនាទី',
+            mm: '%d នាទី',
+            h: 'មួយម៉ោង',
+            hh: '%d ម៉ោង',
+            d: 'មួយថ្ងៃ',
+            dd: '%d ថ្ងៃ',
+            M: 'មួយខែ',
+            MM: '%d ខែ',
+            y: 'មួយឆ្នាំ',
+            yy: '%d ឆ្នាំ'
+        },
+        dayOfMonthOrdinalParse : /ទី\d{1,2}/,
+        ordinal : 'ទី%d',
+        preparse: function (string) {
+            return string.replace(/[១២៣៤៥៦៧៨៩០]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-	for (const layer of styles) {
-		for (const style of layer.styles) {
-			enabled[style[0]] = layer.inverse ? null : style.slice(1);
-		}
-	}
+    return km;
 
-	let current = chalk;
-	for (const styleName of Object.keys(enabled)) {
-		if (Array.isArray(enabled[styleName])) {
-			if (!(styleName in current)) {
-				throw new Error(`Unknown Chalk style: ${styleName}`);
-			}
+})));
 
-			if (enabled[styleName].length > 0) {
-				current = current[styleName].apply(current, enabled[styleName]);
-			} else {
-				current = current[styleName];
-			}
-		}
-	}
 
-	return current;
-}
+/***/ }),
+/* 107 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = (chalk, tmp) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '೧',
+        '2': '೨',
+        '3': '೩',
+        '4': '೪',
+        '5': '೫',
+        '6': '೬',
+        '7': '೭',
+        '8': '೮',
+        '9': '೯',
+        '0': '೦'
+    },
+    numberMap = {
+        '೧': '1',
+        '೨': '2',
+        '೩': '3',
+        '೪': '4',
+        '೫': '5',
+        '೬': '6',
+        '೭': '7',
+        '೮': '8',
+        '೯': '9',
+        '೦': '0'
+    };
+
+    var kn = moment.defineLocale('kn', {
+        months : 'ಜನವರಿ_ಫೆಬ್ರವರಿ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬರ್_ಅಕ್ಟೋಬರ್_ನವೆಂಬರ್_ಡಿಸೆಂಬರ್'.split('_'),
+        monthsShort : 'ಜನ_ಫೆಬ್ರ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂ_ಅಕ್ಟೋ_ನವೆಂ_ಡಿಸೆಂ'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'ಭಾನುವಾರ_ಸೋಮವಾರ_ಮಂಗಳವಾರ_ಬುಧವಾರ_ಗುರುವಾರ_ಶುಕ್ರವಾರ_ಶನಿವಾರ'.split('_'),
+        weekdaysShort : 'ಭಾನು_ಸೋಮ_ಮಂಗಳ_ಬುಧ_ಗುರು_ಶುಕ್ರ_ಶನಿ'.split('_'),
+        weekdaysMin : 'ಭಾ_ಸೋ_ಮಂ_ಬು_ಗು_ಶು_ಶ'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm',
+            LTS : 'A h:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm'
+        },
+        calendar : {
+            sameDay : '[ಇಂದು] LT',
+            nextDay : '[ನಾಳೆ] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[ನಿನ್ನೆ] LT',
+            lastWeek : '[ಕೊನೆಯ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ನಂತರ',
+            past : '%s ಹಿಂದೆ',
+            s : 'ಕೆಲವು ಕ್ಷಣಗಳು',
+            ss : '%d ಸೆಕೆಂಡುಗಳು',
+            m : 'ಒಂದು ನಿಮಿಷ',
+            mm : '%d ನಿಮಿಷ',
+            h : 'ಒಂದು ಗಂಟೆ',
+            hh : '%d ಗಂಟೆ',
+            d : 'ಒಂದು ದಿನ',
+            dd : '%d ದಿನ',
+            M : 'ಒಂದು ತಿಂಗಳು',
+            MM : '%d ತಿಂಗಳು',
+            y : 'ಒಂದು ವರ್ಷ',
+            yy : '%d ವರ್ಷ'
+        },
+        preparse: function (string) {
+            return string.replace(/[೧೨೩೪೫೬೭೮೯೦]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /ರಾತ್ರಿ|ಬೆಳಿಗ್ಗೆ|ಮಧ್ಯಾಹ್ನ|ಸಂಜೆ/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'ರಾತ್ರಿ') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'ಬೆಳಿಗ್ಗೆ') {
+                return hour;
+            } else if (meridiem === 'ಮಧ್ಯಾಹ್ನ') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'ಸಂಜೆ') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ರಾತ್ರಿ';
+            } else if (hour < 10) {
+                return 'ಬೆಳಿಗ್ಗೆ';
+            } else if (hour < 17) {
+                return 'ಮಧ್ಯಾಹ್ನ';
+            } else if (hour < 20) {
+                return 'ಸಂಜೆ';
+            } else {
+                return 'ರಾತ್ರಿ';
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(ನೇ)/,
+        ordinal : function (number) {
+            return number + 'ನೇ';
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 6th is the first week of the year.
+        }
+    });
 
-	// eslint-disable-next-line max-params
-	tmp.replace(TEMPLATE_REGEX, (m, escapeChar, inverse, style, close, chr) => {
-		if (escapeChar) {
-			chunk.push(unescape(escapeChar));
-		} else if (style) {
-			const str = chunk.join('');
-			chunk = [];
-			chunks.push(styles.length === 0 ? str : buildStyle(chalk, styles)(str));
-			styles.push({inverse, styles: parseStyle(style)});
-		} else if (close) {
-			if (styles.length === 0) {
-				throw new Error('Found extraneous } in Chalk template literal');
-			}
+    return kn;
 
-			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
-			chunk = [];
-			styles.pop();
-		} else {
-			chunk.push(chr);
-		}
-	});
+})));
 
-	chunks.push(chunk.join(''));
 
-	if (styles.length > 0) {
-		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
-		throw new Error(errMsg);
-	}
+/***/ }),
+/* 108 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return chunks.join('');
-};
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var ko = moment.defineLocale('ko', {
+        months : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+        monthsShort : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+        weekdays : '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'),
+        weekdaysShort : '일_월_화_수_목_금_토'.split('_'),
+        weekdaysMin : '일_월_화_수_목_금_토'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm',
+            LTS : 'A h:mm:ss',
+            L : 'YYYY.MM.DD.',
+            LL : 'YYYY년 MMMM D일',
+            LLL : 'YYYY년 MMMM D일 A h:mm',
+            LLLL : 'YYYY년 MMMM D일 dddd A h:mm',
+            l : 'YYYY.MM.DD.',
+            ll : 'YYYY년 MMMM D일',
+            lll : 'YYYY년 MMMM D일 A h:mm',
+            llll : 'YYYY년 MMMM D일 dddd A h:mm'
+        },
+        calendar : {
+            sameDay : '오늘 LT',
+            nextDay : '내일 LT',
+            nextWeek : 'dddd LT',
+            lastDay : '어제 LT',
+            lastWeek : '지난주 dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s 후',
+            past : '%s 전',
+            s : '몇 초',
+            ss : '%d초',
+            m : '1분',
+            mm : '%d분',
+            h : '한 시간',
+            hh : '%d시간',
+            d : '하루',
+            dd : '%d일',
+            M : '한 달',
+            MM : '%d달',
+            y : '일 년',
+            yy : '%d년'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}(일|월|주)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'DDD':
+                    return number + '일';
+                case 'M':
+                    return number + '월';
+                case 'w':
+                case 'W':
+                    return number + '주';
+                default:
+                    return number;
+            }
+        },
+        meridiemParse : /오전|오후/,
+        isPM : function (token) {
+            return token === '오후';
+        },
+        meridiem : function (hour, minute, isUpper) {
+            return hour < 12 ? '오전' : '오후';
+        }
+    });
+
+    return ko;
+
+})));
 
 
 /***/ }),
-/* 73 */
+/* 109 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = normalize
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '١',
+        '2': '٢',
+        '3': '٣',
+        '4': '٤',
+        '5': '٥',
+        '6': '٦',
+        '7': '٧',
+        '8': '٨',
+        '9': '٩',
+        '0': '٠'
+    }, numberMap = {
+        '١': '1',
+        '٢': '2',
+        '٣': '3',
+        '٤': '4',
+        '٥': '5',
+        '٦': '6',
+        '٧': '7',
+        '٨': '8',
+        '٩': '9',
+        '٠': '0'
+    },
+    months = [
+        'کانونی دووەم',
+        'شوبات',
+        'ئازار',
+        'نیسان',
+        'ئایار',
+        'حوزەیران',
+        'تەمموز',
+        'ئاب',
+        'ئەیلوول',
+        'تشرینی یەكەم',
+        'تشرینی دووەم',
+        'كانونی یەکەم'
+    ];
 
-var fixer = __webpack_require__(74)
-normalize.fixer = fixer
 
-var makeWarning = __webpack_require__(96)
+    var ku = moment.defineLocale('ku', {
+        months : months,
+        monthsShort : months,
+        weekdays : 'یه‌كشه‌ممه‌_دووشه‌ممه‌_سێشه‌ممه‌_چوارشه‌ممه‌_پێنجشه‌ممه‌_هه‌ینی_شه‌ممه‌'.split('_'),
+        weekdaysShort : 'یه‌كشه‌م_دووشه‌م_سێشه‌م_چوارشه‌م_پێنجشه‌م_هه‌ینی_شه‌ممه‌'.split('_'),
+        weekdaysMin : 'ی_د_س_چ_پ_ه_ش'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /ئێواره‌|به‌یانی/,
+        isPM: function (input) {
+            return /ئێواره‌/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'به‌یانی';
+            } else {
+                return 'ئێواره‌';
+            }
+        },
+        calendar : {
+            sameDay : '[ئه‌مرۆ كاتژمێر] LT',
+            nextDay : '[به‌یانی كاتژمێر] LT',
+            nextWeek : 'dddd [كاتژمێر] LT',
+            lastDay : '[دوێنێ كاتژمێر] LT',
+            lastWeek : 'dddd [كاتژمێر] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'له‌ %s',
+            past : '%s',
+            s : 'چه‌ند چركه‌یه‌ك',
+            ss : 'چركه‌ %d',
+            m : 'یه‌ك خوله‌ك',
+            mm : '%d خوله‌ك',
+            h : 'یه‌ك كاتژمێر',
+            hh : '%d كاتژمێر',
+            d : 'یه‌ك ڕۆژ',
+            dd : '%d ڕۆژ',
+            M : 'یه‌ك مانگ',
+            MM : '%d مانگ',
+            y : 'یه‌ك ساڵ',
+            yy : '%d ساڵ'
+        },
+        preparse: function (string) {
+            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+                return numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12 // The week that contains Jan 12th is the first week of the year.
+        }
+    });
 
-var fieldsToFix = ['name','version','description','repository','modules','scripts'
-                  ,'files','bin','man','bugs','keywords','readme','homepage','license']
-var otherThingsToFix = ['dependencies','people', 'typos']
+    return ku;
 
-var thingsToFix = fieldsToFix.map(function(fieldName) {
-  return ucFirst(fieldName) + "Field"
-})
-// two ways to do this in CoffeeScript on only one line, sub-70 chars:
-// thingsToFix = fieldsToFix.map (name) -> ucFirst(name) + "Field"
-// thingsToFix = (ucFirst(name) + "Field" for name in fieldsToFix)
-thingsToFix = thingsToFix.concat(otherThingsToFix)
+})));
 
-function normalize (data, warn, strict) {
-  if(warn === true) warn = null, strict = true
-  if(!strict) strict = false
-  if(!warn || data.private) warn = function(msg) { /* noop */ }
 
-  if (data.scripts &&
-      data.scripts.install === "node-gyp rebuild" &&
-      !data.scripts.preinstall) {
-    data.gypfile = true
-  }
-  fixer.warn = function() { warn(makeWarning.apply(null, arguments)) }
-  thingsToFix.forEach(function(thingName) {
-    fixer["fix" + ucFirst(thingName)](data, strict)
-  })
-  data._id = data.name + "@" + data.version
-}
+/***/ }),
+/* 110 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function ucFirst (string) {
-  return string.charAt(0).toUpperCase() + string.slice(1);
-}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var suffixes = {
+        0: '-чү',
+        1: '-чи',
+        2: '-чи',
+        3: '-чү',
+        4: '-чү',
+        5: '-чи',
+        6: '-чы',
+        7: '-чи',
+        8: '-чи',
+        9: '-чу',
+        10: '-чу',
+        20: '-чы',
+        30: '-чу',
+        40: '-чы',
+        50: '-чү',
+        60: '-чы',
+        70: '-чи',
+        80: '-чи',
+        90: '-чу',
+        100: '-чү'
+    };
+
+    var ky = moment.defineLocale('ky', {
+        months : 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+        monthsShort : 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
+        weekdays : 'Жекшемби_Дүйшөмбү_Шейшемби_Шаршемби_Бейшемби_Жума_Ишемби'.split('_'),
+        weekdaysShort : 'Жек_Дүй_Шей_Шар_Бей_Жум_Ише'.split('_'),
+        weekdaysMin : 'Жк_Дй_Шй_Шр_Бй_Жм_Иш'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Бүгүн саат] LT',
+            nextDay : '[Эртең саат] LT',
+            nextWeek : 'dddd [саат] LT',
+            lastDay : '[Кечээ саат] LT',
+            lastWeek : '[Өткөн аптанын] dddd [күнү] [саат] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ичинде',
+            past : '%s мурун',
+            s : 'бирнече секунд',
+            ss : '%d секунд',
+            m : 'бир мүнөт',
+            mm : '%d мүнөт',
+            h : 'бир саат',
+            hh : '%d саат',
+            d : 'бир күн',
+            dd : '%d күн',
+            M : 'бир ай',
+            MM : '%d ай',
+            y : 'бир жыл',
+            yy : '%d жыл'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(чи|чы|чү|чу)/,
+        ordinal : function (number) {
+            var a = number % 10,
+                b = number >= 100 ? 100 : null;
+            return number + (suffixes[number] || suffixes[a] || suffixes[b]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
+
+    return ky;
+
+})));
 
 
 /***/ }),
-/* 74 */
+/* 111 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var semver = __webpack_require__(75)
-var validateLicense = __webpack_require__(76);
-var hostedGitInfo = __webpack_require__(81)
-var isBuiltinModule = __webpack_require__(85).isCore
-var depTypes = ["dependencies","devDependencies","optionalDependencies"]
-var extractDescription = __webpack_require__(94)
-var url = __webpack_require__(82)
-var typos = __webpack_require__(95)
+//! moment.js locale configuration
 
-var fixer = module.exports = {
-  // default warning function
-  warn: function() {},
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-  fixRepositoryField: function(data) {
-    if (data.repositories) {
-      this.warn("repositories");
-      data.repository = data.repositories[0]
+
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eng Minutt', 'enger Minutt'],
+            'h': ['eng Stonn', 'enger Stonn'],
+            'd': ['een Dag', 'engem Dag'],
+            'M': ['ee Mount', 'engem Mount'],
+            'y': ['ee Joer', 'engem Joer']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
     }
-    if (!data.repository) return this.warn("missingRepository")
-    if (typeof data.repository === "string") {
-      data.repository = {
-        type: "git",
-        url: data.repository
-      }
+    function processFutureTime(string) {
+        var number = string.substr(0, string.indexOf(' '));
+        if (eifelerRegelAppliesToNumber(number)) {
+            return 'a ' + string;
+        }
+        return 'an ' + string;
     }
-    var r = data.repository.url || ""
-    if (r) {
-      var hosted = hostedGitInfo.fromUrl(r)
-      if (hosted) {
-        r = data.repository.url
-          = hosted.getDefaultRepresentation() == "shortcut" ? hosted.https() : hosted.toString()
-      }
+    function processPastTime(string) {
+        var number = string.substr(0, string.indexOf(' '));
+        if (eifelerRegelAppliesToNumber(number)) {
+            return 'viru ' + string;
+        }
+        return 'virun ' + string;
     }
+    /**
+     * Returns true if the word before the given number loses the '-n' ending.
+     * e.g. 'an 10 Deeg' but 'a 5 Deeg'
+     *
+     * @param number {integer}
+     * @returns {boolean}
+     */
+    function eifelerRegelAppliesToNumber(number) {
+        number = parseInt(number, 10);
+        if (isNaN(number)) {
+            return false;
+        }
+        if (number < 0) {
+            // Negative Number --> always true
+            return true;
+        } else if (number < 10) {
+            // Only 1 digit
+            if (4 <= number && number <= 7) {
+                return true;
+            }
+            return false;
+        } else if (number < 100) {
+            // 2 digits
+            var lastDigit = number % 10, firstDigit = number / 10;
+            if (lastDigit === 0) {
+                return eifelerRegelAppliesToNumber(firstDigit);
+            }
+            return eifelerRegelAppliesToNumber(lastDigit);
+        } else if (number < 10000) {
+            // 3 or 4 digits --> recursively check first digit
+            while (number >= 10) {
+                number = number / 10;
+            }
+            return eifelerRegelAppliesToNumber(number);
+        } else {
+            // Anything larger than 4 digits: recursively check first n-3 digits
+            number = number / 1000;
+            return eifelerRegelAppliesToNumber(number);
+        }
+    }
+
+    var lb = moment.defineLocale('lb', {
+        months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        monthsParseExact : true,
+        weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'),
+        weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'),
+        weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat: {
+            LT: 'H:mm [Auer]',
+            LTS: 'H:mm:ss [Auer]',
+            L: 'DD.MM.YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY H:mm [Auer]',
+            LLLL: 'dddd, D. MMMM YYYY H:mm [Auer]'
+        },
+        calendar: {
+            sameDay: '[Haut um] LT',
+            sameElse: 'L',
+            nextDay: '[Muer um] LT',
+            nextWeek: 'dddd [um] LT',
+            lastDay: '[Gëschter um] LT',
+            lastWeek: function () {
+                // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday) due to phonological rule
+                switch (this.day()) {
+                    case 2:
+                    case 4:
+                        return '[Leschten] dddd [um] LT';
+                    default:
+                        return '[Leschte] dddd [um] LT';
+                }
+            }
+        },
+        relativeTime : {
+            future : processFutureTime,
+            past : processPastTime,
+            s : 'e puer Sekonnen',
+            ss : '%d Sekonnen',
+            m : processRelativeTime,
+            mm : '%d Minutten',
+            h : processRelativeTime,
+            hh : '%d Stonnen',
+            d : processRelativeTime,
+            dd : '%d Deeg',
+            M : processRelativeTime,
+            MM : '%d Méint',
+            y : processRelativeTime,
+            yy : '%d Joer'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal: '%d.',
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-    if (r.match(/github.com\/[^\/]+\/[^\/]+\.git\.git$/)) {
-      this.warn("brokenGitUrl", r)
-    }
-  }
+    return lb;
 
-, fixTypos: function(data) {
-    Object.keys(typos.topLevel).forEach(function (d) {
-      if (data.hasOwnProperty(d)) {
-        this.warn("typo", d, typos.topLevel[d])
-      }
-    }, this)
-  }
+})));
 
-, fixScriptsField: function(data) {
-    if (!data.scripts) return
-    if (typeof data.scripts !== "object") {
-      this.warn("nonObjectScripts")
-      delete data.scripts
-      return
-    }
-    Object.keys(data.scripts).forEach(function (k) {
-      if (typeof data.scripts[k] !== "string") {
-        this.warn("nonStringScript")
-        delete data.scripts[k]
-      } else if (typos.script[k] && !data.scripts[typos.script[k]]) {
-        this.warn("typo", k, typos.script[k], "scripts")
-      }
-    }, this)
-  }
 
-, fixFilesField: function(data) {
-    var files = data.files
-    if (files && !Array.isArray(files)) {
-      this.warn("nonArrayFiles")
-      delete data.files
-    } else if (data.files) {
-      data.files = data.files.filter(function(file) {
-        if (!file || typeof file !== "string") {
-          this.warn("invalidFilename", file)
-          return false
+/***/ }),
+/* 112 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var lo = moment.defineLocale('lo', {
+        months : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
+        monthsShort : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'),
+        weekdays : 'ອາທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
+        weekdaysShort : 'ທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'),
+        weekdaysMin : 'ທ_ຈ_ອຄ_ພ_ພຫ_ສກ_ສ'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'ວັນdddd D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /ຕອນເຊົ້າ|ຕອນແລງ/,
+        isPM: function (input) {
+            return input === 'ຕອນແລງ';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ຕອນເຊົ້າ';
+            } else {
+                return 'ຕອນແລງ';
+            }
+        },
+        calendar : {
+            sameDay : '[ມື້ນີ້ເວລາ] LT',
+            nextDay : '[ມື້ອື່ນເວລາ] LT',
+            nextWeek : '[ວັນ]dddd[ໜ້າເວລາ] LT',
+            lastDay : '[ມື້ວານນີ້ເວລາ] LT',
+            lastWeek : '[ວັນ]dddd[ແລ້ວນີ້ເວລາ] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'ອີກ %s',
+            past : '%sຜ່ານມາ',
+            s : 'ບໍ່ເທົ່າໃດວິນາທີ',
+            ss : '%d ວິນາທີ' ,
+            m : '1 ນາທີ',
+            mm : '%d ນາທີ',
+            h : '1 ຊົ່ວໂມງ',
+            hh : '%d ຊົ່ວໂມງ',
+            d : '1 ມື້',
+            dd : '%d ມື້',
+            M : '1 ເດືອນ',
+            MM : '%d ເດືອນ',
+            y : '1 ປີ',
+            yy : '%d ປີ'
+        },
+        dayOfMonthOrdinalParse: /(ທີ່)\d{1,2}/,
+        ordinal : function (number) {
+            return 'ທີ່' + number;
+        }
+    });
+
+    return lo;
+
+})));
+
+
+/***/ }),
+/* 113 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var units = {
+        'ss' : 'sekundė_sekundžių_sekundes',
+        'm' : 'minutė_minutės_minutę',
+        'mm': 'minutės_minučių_minutes',
+        'h' : 'valanda_valandos_valandą',
+        'hh': 'valandos_valandų_valandas',
+        'd' : 'diena_dienos_dieną',
+        'dd': 'dienos_dienų_dienas',
+        'M' : 'mėnuo_mėnesio_mėnesį',
+        'MM': 'mėnesiai_mėnesių_mėnesius',
+        'y' : 'metai_metų_metus',
+        'yy': 'metai_metų_metus'
+    };
+    function translateSeconds(number, withoutSuffix, key, isFuture) {
+        if (withoutSuffix) {
+            return 'kelios sekundės';
         } else {
-          return true
+            return isFuture ? 'kelių sekundžių' : 'kelias sekundes';
         }
-      }, this)
     }
-  }
-
-, fixBinField: function(data) {
-    if (!data.bin) return;
-    if (typeof data.bin === "string") {
-      var b = {}
-      var match
-      if (match = data.name.match(/^@[^/]+[/](.*)$/)) {
-        b[match[1]] = data.bin
-      } else {
-        b[data.name] = data.bin
-      }
-      data.bin = b
+    function translateSingular(number, withoutSuffix, key, isFuture) {
+        return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]);
     }
-  }
-
-, fixManField: function(data) {
-    if (!data.man) return;
-    if (typeof data.man === "string") {
-      data.man = [ data.man ]
+    function special(number) {
+        return number % 10 === 0 || (number > 10 && number < 20);
     }
-  }
-, fixBundleDependenciesField: function(data) {
-    var bdd = "bundledDependencies"
-    var bd = "bundleDependencies"
-    if (data[bdd] && !data[bd]) {
-      data[bd] = data[bdd]
-      delete data[bdd]
+    function forms(key) {
+        return units[key].split('_');
     }
-    if (data[bd] && !Array.isArray(data[bd])) {
-      this.warn("nonArrayBundleDependencies")
-      delete data[bd]
-    } else if (data[bd]) {
-      data[bd] = data[bd].filter(function(bd) {
-        if (!bd || typeof bd !== 'string') {
-          this.warn("nonStringBundleDependency", bd)
-          return false
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        if (number === 1) {
+            return result + translateSingular(number, withoutSuffix, key[0], isFuture);
+        } else if (withoutSuffix) {
+            return result + (special(number) ? forms(key)[1] : forms(key)[0]);
         } else {
-          if (!data.dependencies) {
-            data.dependencies = {}
-          }
-          if (!data.dependencies.hasOwnProperty(bd)) {
-            this.warn("nonDependencyBundleDependency", bd)
-            data.dependencies[bd] = "*"
-          }
-          return true
+            if (isFuture) {
+                return result + forms(key)[1];
+            } else {
+                return result + (special(number) ? forms(key)[1] : forms(key)[2]);
+            }
         }
-      }, this)
     }
-  }
+    var lt = moment.defineLocale('lt', {
+        months : {
+            format: 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'),
+            standalone: 'sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis'.split('_'),
+            isFormat: /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?|MMMM?(\[[^\[\]]*\]|\s)+D[oD]?/
+        },
+        monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'),
+        weekdays : {
+            format: 'sekmadienį_pirmadienį_antradienį_trečiadienį_ketvirtadienį_penktadienį_šeštadienį'.split('_'),
+            standalone: 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_'),
+            isFormat: /dddd HH:mm/
+        },
+        weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'),
+        weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY [m.] MMMM D [d.]',
+            LLL : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
+            LLLL : 'YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]',
+            l : 'YYYY-MM-DD',
+            ll : 'YYYY [m.] MMMM D [d.]',
+            lll : 'YYYY [m.] MMMM D [d.], HH:mm [val.]',
+            llll : 'YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]'
+        },
+        calendar : {
+            sameDay : '[Šiandien] LT',
+            nextDay : '[Rytoj] LT',
+            nextWeek : 'dddd LT',
+            lastDay : '[Vakar] LT',
+            lastWeek : '[Praėjusį] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'po %s',
+            past : 'prieš %s',
+            s : translateSeconds,
+            ss : translate,
+            m : translateSingular,
+            mm : translate,
+            h : translateSingular,
+            hh : translate,
+            d : translateSingular,
+            dd : translate,
+            M : translateSingular,
+            MM : translate,
+            y : translateSingular,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-oji/,
+        ordinal : function (number) {
+            return number + '-oji';
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-, fixDependencies: function(data, strict) {
-    var loose = !strict
-    objectifyDeps(data, this.warn)
-    addOptionalDepsToDeps(data, this.warn)
-    this.fixBundleDependenciesField(data)
+    return lt;
 
-    ;['dependencies','devDependencies'].forEach(function(deps) {
-      if (!(deps in data)) return
-      if (!data[deps] || typeof data[deps] !== "object") {
-        this.warn("nonObjectDependencies", deps)
-        delete data[deps]
-        return
-      }
-      Object.keys(data[deps]).forEach(function (d) {
-        var r = data[deps][d]
-        if (typeof r !== 'string') {
-          this.warn("nonStringDependency", d, JSON.stringify(r))
-          delete data[deps][d]
-        }
-        var hosted = hostedGitInfo.fromUrl(data[deps][d])
-        if (hosted) data[deps][d] = hosted.toString()
-      }, this)
-    }, this)
-  }
+})));
 
-, fixModulesField: function (data) {
-    if (data.modules) {
-      this.warn("deprecatedModules")
-      delete data.modules
-    }
-  }
 
-, fixKeywordsField: function (data) {
-    if (typeof data.keywords === "string") {
-      data.keywords = data.keywords.split(/,\s+/)
-    }
-    if (data.keywords && !Array.isArray(data.keywords)) {
-      delete data.keywords
-      this.warn("nonArrayKeywords")
-    } else if (data.keywords) {
-      data.keywords = data.keywords.filter(function(kw) {
-        if (typeof kw !== "string" || !kw) {
-          this.warn("nonStringKeyword");
-          return false
+/***/ }),
+/* 114 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var units = {
+        'ss': 'sekundes_sekundēm_sekunde_sekundes'.split('_'),
+        'm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+        'mm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+        'h': 'stundas_stundām_stunda_stundas'.split('_'),
+        'hh': 'stundas_stundām_stunda_stundas'.split('_'),
+        'd': 'dienas_dienām_diena_dienas'.split('_'),
+        'dd': 'dienas_dienām_diena_dienas'.split('_'),
+        'M': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+        'MM': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+        'y': 'gada_gadiem_gads_gadi'.split('_'),
+        'yy': 'gada_gadiem_gads_gadi'.split('_')
+    };
+    /**
+     * @param withoutSuffix boolean true = a length of time; false = before/after a period of time.
+     */
+    function format(forms, number, withoutSuffix) {
+        if (withoutSuffix) {
+            // E.g. "21 minūte", "3 minūtes".
+            return number % 10 === 1 && number % 100 !== 11 ? forms[2] : forms[3];
         } else {
-          return true
+            // E.g. "21 minūtes" as in "pēc 21 minūtes".
+            // E.g. "3 minūtēm" as in "pēc 3 minūtēm".
+            return number % 10 === 1 && number % 100 !== 11 ? forms[0] : forms[1];
+        }
+    }
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        return number + ' ' + format(units[key], number, withoutSuffix);
+    }
+    function relativeTimeWithSingular(number, withoutSuffix, key) {
+        return format(units[key], number, withoutSuffix);
+    }
+    function relativeSeconds(number, withoutSuffix) {
+        return withoutSuffix ? 'dažas sekundes' : 'dažām sekundēm';
+    }
+
+    var lv = moment.defineLocale('lv', {
+        months : 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'),
+        weekdaysShort : 'Sv_P_O_T_C_Pk_S'.split('_'),
+        weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY.',
+            LL : 'YYYY. [gada] D. MMMM',
+            LLL : 'YYYY. [gada] D. MMMM, HH:mm',
+            LLLL : 'YYYY. [gada] D. MMMM, dddd, HH:mm'
+        },
+        calendar : {
+            sameDay : '[Šodien pulksten] LT',
+            nextDay : '[Rīt pulksten] LT',
+            nextWeek : 'dddd [pulksten] LT',
+            lastDay : '[Vakar pulksten] LT',
+            lastWeek : '[Pagājušā] dddd [pulksten] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'pēc %s',
+            past : 'pirms %s',
+            s : relativeSeconds,
+            ss : relativeTimeWithPlural,
+            m : relativeTimeWithSingular,
+            mm : relativeTimeWithPlural,
+            h : relativeTimeWithSingular,
+            hh : relativeTimeWithPlural,
+            d : relativeTimeWithSingular,
+            dd : relativeTimeWithPlural,
+            M : relativeTimeWithSingular,
+            MM : relativeTimeWithPlural,
+            y : relativeTimeWithSingular,
+            yy : relativeTimeWithPlural
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-      }, this)
-    }
-  }
+    });
 
-, fixVersionField: function(data, strict) {
-    // allow "loose" semver 1.0 versions in non-strict mode
-    // enforce strict semver 2.0 compliance in strict mode
-    var loose = !strict
-    if (!data.version) {
-      data.version = ""
-      return true
-    }
-    if (!semver.valid(data.version, loose)) {
-      throw new Error('Invalid version: "'+ data.version + '"')
-    }
-    data.version = semver.clean(data.version, loose)
-    return true
-  }
+    return lv;
 
-, fixPeople: function(data) {
-    modifyPeople(data, unParsePerson)
-    modifyPeople(data, parsePerson)
-  }
+})));
 
-, fixNameField: function(data, options) {
-    if (typeof options === "boolean") options = {strict: options}
-    else if (typeof options === "undefined") options = {}
-    var strict = options.strict
-    if (!data.name && !strict) {
-      data.name = ""
-      return
-    }
-    if (typeof data.name !== "string") {
-      throw new Error("name field must be a string.")
-    }
-    if (!strict)
-      data.name = data.name.trim()
-    ensureValidName(data.name, strict, options.allowLegacyCase)
-    if (isBuiltinModule(data.name))
-      this.warn("conflictingName", data.name)
-  }
 
+/***/ }),
+/* 115 */
+/***/ (function(module, exports, __webpack_require__) {
 
-, fixDescriptionField: function (data) {
-    if (data.description && typeof data.description !== 'string') {
-      this.warn("nonStringDescription")
-      delete data.description
-    }
-    if (data.readme && !data.description)
-      data.description = extractDescription(data.readme)
-      if(data.description === undefined) delete data.description;
-    if (!data.description) this.warn("missingDescription")
-  }
+//! moment.js locale configuration
 
-, fixReadmeField: function (data) {
-    if (!data.readme) {
-      this.warn("missingReadme")
-      data.readme = "ERROR: No README data found!"
-    }
-  }
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-, fixBugsField: function(data) {
-    if (!data.bugs && data.repository && data.repository.url) {
-      var hosted = hostedGitInfo.fromUrl(data.repository.url)
-      if(hosted && hosted.bugs()) {
-        data.bugs = {url: hosted.bugs()}
-      }
-    }
-    else if(data.bugs) {
-      var emailRe = /^.+@.*\..+$/
-      if(typeof data.bugs == "string") {
-        if(emailRe.test(data.bugs))
-          data.bugs = {email:data.bugs}
-        else if(url.parse(data.bugs).protocol)
-          data.bugs = {url: data.bugs}
-        else
-          this.warn("nonEmailUrlBugsString")
-      }
-      else {
-        bugsTypos(data.bugs, this.warn)
-        var oldBugs = data.bugs
-        data.bugs = {}
-        if(oldBugs.url) {
-          if(typeof(oldBugs.url) == "string" && url.parse(oldBugs.url).protocol)
-            data.bugs.url = oldBugs.url
-          else
-            this.warn("nonUrlBugsUrlField")
+
+    var translator = {
+        words: { //Different grammatical cases
+            ss: ['sekund', 'sekunda', 'sekundi'],
+            m: ['jedan minut', 'jednog minuta'],
+            mm: ['minut', 'minuta', 'minuta'],
+            h: ['jedan sat', 'jednog sata'],
+            hh: ['sat', 'sata', 'sati'],
+            dd: ['dan', 'dana', 'dana'],
+            MM: ['mjesec', 'mjeseca', 'mjeseci'],
+            yy: ['godina', 'godine', 'godina']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
+            }
         }
-        if(oldBugs.email) {
-          if(typeof(oldBugs.email) == "string" && emailRe.test(oldBugs.email))
-            data.bugs.email = oldBugs.email
-          else
-            this.warn("nonEmailBugsEmailField")
+    };
+
+    var me = moment.defineLocale('me', {
+        months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
+        monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
+        monthsParseExact : true,
+        weekdays: 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort: 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'H:mm:ss',
+            L: 'DD.MM.YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY H:mm',
+            LLLL: 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar: {
+            sameDay: '[danas u] LT',
+            nextDay: '[sjutra u] LT',
+
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[u] [nedjelju] [u] LT';
+                    case 3:
+                        return '[u] [srijedu] [u] LT';
+                    case 6:
+                        return '[u] [subotu] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[juče u] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[prošle] [nedjelje] [u] LT',
+                    '[prošlog] [ponedjeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srijede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'nekoliko sekundi',
+            ss     : translator.translate,
+            m      : translator.translate,
+            mm     : translator.translate,
+            h      : translator.translate,
+            hh     : translator.translate,
+            d      : 'dan',
+            dd     : translator.translate,
+            M      : 'mjesec',
+            MM     : translator.translate,
+            y      : 'godinu',
+            yy     : translator.translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
         }
-      }
-      if(!data.bugs.email && !data.bugs.url) {
-        delete data.bugs
-        this.warn("emptyNormalizedBugs")
-      }
-    }
-  }
+    });
 
-, fixHomepageField: function(data) {
-    if (!data.homepage && data.repository && data.repository.url) {
-      var hosted = hostedGitInfo.fromUrl(data.repository.url)
-      if (hosted && hosted.docs()) data.homepage = hosted.docs()
-    }
-    if (!data.homepage) return
+    return me;
 
-    if(typeof data.homepage !== "string") {
-      this.warn("nonUrlHomepage")
-      return delete data.homepage
-    }
-    if(!url.parse(data.homepage).protocol) {
-      data.homepage = "http://" + data.homepage
-    }
-  }
+})));
 
-, fixLicenseField: function(data) {
-    if (!data.license) {
-      return this.warn("missingLicense")
-    } else{
-      if (
-        typeof(data.license) !== 'string' ||
-        data.license.length < 1 ||
-        data.license.trim() === ''
-      ) {
-        this.warn("invalidLicense")
-      } else {
-        if (!validateLicense(data.license).validForNewPackages)
-          this.warn("invalidLicense")
-      }
-    }
-  }
-}
 
-function isValidScopedPackageName(spec) {
-  if (spec.charAt(0) !== '@') return false
+/***/ }),
+/* 116 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  var rest = spec.slice(1).split('/')
-  if (rest.length !== 2) return false
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var mi = moment.defineLocale('mi', {
+        months: 'Kohi-tāte_Hui-tanguru_Poutū-te-rangi_Paenga-whāwhā_Haratua_Pipiri_Hōngoingoi_Here-turi-kōkā_Mahuru_Whiringa-ā-nuku_Whiringa-ā-rangi_Hakihea'.split('_'),
+        monthsShort: 'Kohi_Hui_Pou_Pae_Hara_Pipi_Hōngoi_Here_Mahu_Whi-nu_Whi-ra_Haki'.split('_'),
+        monthsRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
+        monthsStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
+        monthsShortRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,
+        monthsShortStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,2}/i,
+        weekdays: 'Rātapu_Mane_Tūrei_Wenerei_Tāite_Paraire_Hātarei'.split('_'),
+        weekdaysShort: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
+        weekdaysMin: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'),
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY [i] HH:mm',
+            LLLL: 'dddd, D MMMM YYYY [i] HH:mm'
+        },
+        calendar: {
+            sameDay: '[i teie mahana, i] LT',
+            nextDay: '[apopo i] LT',
+            nextWeek: 'dddd [i] LT',
+            lastDay: '[inanahi i] LT',
+            lastWeek: 'dddd [whakamutunga i] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'i roto i %s',
+            past: '%s i mua',
+            s: 'te hēkona ruarua',
+            ss: '%d hēkona',
+            m: 'he meneti',
+            mm: '%d meneti',
+            h: 'te haora',
+            hh: '%d haora',
+            d: 'he ra',
+            dd: '%d ra',
+            M: 'he marama',
+            MM: '%d marama',
+            y: 'he tau',
+            yy: '%d tau'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}º/,
+        ordinal: '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-  return rest[0] && rest[1] &&
-    rest[0] === encodeURIComponent(rest[0]) &&
-    rest[1] === encodeURIComponent(rest[1])
-}
+    return mi;
 
-function isCorrectlyEncodedName(spec) {
-  return !spec.match(/[\/@\s\+%:]/) &&
-    spec === encodeURIComponent(spec)
-}
+})));
 
-function ensureValidName (name, strict, allowLegacyCase) {
-  if (name.charAt(0) === "." ||
-      !(isValidScopedPackageName(name) || isCorrectlyEncodedName(name)) ||
-      (strict && (!allowLegacyCase) && name !== name.toLowerCase()) ||
-      name.toLowerCase() === "node_modules" ||
-      name.toLowerCase() === "favicon.ico") {
-        throw new Error("Invalid name: " + JSON.stringify(name))
-  }
-}
 
-function modifyPeople (data, fn) {
-  if (data.author) data.author = fn(data.author)
-  ;["maintainers", "contributors"].forEach(function (set) {
-    if (!Array.isArray(data[set])) return;
-    data[set] = data[set].map(fn)
-  })
-  return data
-}
+/***/ }),
+/* 117 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function unParsePerson (person) {
-  if (typeof person === "string") return person
-  var name = person.name || ""
-  var u = person.url || person.web
-  var url = u ? (" ("+u+")") : ""
-  var e = person.email || person.mail
-  var email = e ? (" <"+e+">") : ""
-  return name+email+url
-}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var mk = moment.defineLocale('mk', {
+        months : 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'),
+        monthsShort : 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'),
+        weekdays : 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'),
+        weekdaysShort : 'нед_пон_вто_сре_чет_пет_саб'.split('_'),
+        weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'D.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY H:mm',
+            LLLL : 'dddd, D MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay : '[Денес во] LT',
+            nextDay : '[Утре во] LT',
+            nextWeek : '[Во] dddd [во] LT',
+            lastDay : '[Вчера во] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                    case 6:
+                        return '[Изминатата] dddd [во] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[Изминатиот] dddd [во] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'после %s',
+            past : 'пред %s',
+            s : 'неколку секунди',
+            ss : '%d секунди',
+            m : 'минута',
+            mm : '%d минути',
+            h : 'час',
+            hh : '%d часа',
+            d : 'ден',
+            dd : '%d дена',
+            M : 'месец',
+            MM : '%d месеци',
+            y : 'година',
+            yy : '%d години'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+        ordinal : function (number) {
+            var lastDigit = number % 10,
+                last2Digits = number % 100;
+            if (number === 0) {
+                return number + '-ев';
+            } else if (last2Digits === 0) {
+                return number + '-ен';
+            } else if (last2Digits > 10 && last2Digits < 20) {
+                return number + '-ти';
+            } else if (lastDigit === 1) {
+                return number + '-ви';
+            } else if (lastDigit === 2) {
+                return number + '-ри';
+            } else if (lastDigit === 7 || lastDigit === 8) {
+                return number + '-ми';
+            } else {
+                return number + '-ти';
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-function parsePerson (person) {
-  if (typeof person !== "string") return person
-  var name = person.match(/^([^\(<]+)/)
-  var url = person.match(/\(([^\)]+)\)/)
-  var email = person.match(/<([^>]+)>/)
-  var obj = {}
-  if (name && name[0].trim()) obj.name = name[0].trim()
-  if (email) obj.email = email[1];
-  if (url) obj.url = url[1];
-  return obj
-}
+    return mk;
 
-function addOptionalDepsToDeps (data, warn) {
-  var o = data.optionalDependencies
-  if (!o) return;
-  var d = data.dependencies || {}
-  Object.keys(o).forEach(function (k) {
-    d[k] = o[k]
-  })
-  data.dependencies = d
-}
+})));
 
-function depObjectify (deps, type, warn) {
-  if (!deps) return {}
-  if (typeof deps === "string") {
-    deps = deps.trim().split(/[\n\r\s\t ,]+/)
-  }
-  if (!Array.isArray(deps)) return deps
-  warn("deprecatedArrayDependencies", type)
-  var o = {}
-  deps.filter(function (d) {
-    return typeof d === "string"
-  }).forEach(function(d) {
-    d = d.trim().split(/(:?[@\s><=])/)
-    var dn = d.shift()
-    var dv = d.join("")
-    dv = dv.trim()
-    dv = dv.replace(/^@/, "")
-    o[dn] = dv
-  })
-  return o
-}
 
-function objectifyDeps (data, warn) {
-  depTypes.forEach(function (type) {
-    if (!data[type]) return;
-    data[type] = depObjectify(data[type], type, warn)
-  })
-}
+/***/ }),
+/* 118 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function bugsTypos(bugs, warn) {
-  if (!bugs) return
-  Object.keys(bugs).forEach(function (k) {
-    if (typos.bugs[k]) {
-      warn("typo", k, typos.bugs[k], "bugs")
-      bugs[typos.bugs[k]] = bugs[k]
-      delete bugs[k]
-    }
-  })
-}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var ml = moment.defineLocale('ml', {
+        months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'),
+        monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'),
+        weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'),
+        weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm -നു',
+            LTS : 'A h:mm:ss -നു',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm -നു',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm -നു'
+        },
+        calendar : {
+            sameDay : '[ഇന്ന്] LT',
+            nextDay : '[നാളെ] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[ഇന്നലെ] LT',
+            lastWeek : '[കഴിഞ്ഞ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s കഴിഞ്ഞ്',
+            past : '%s മുൻപ്',
+            s : 'അൽപ നിമിഷങ്ങൾ',
+            ss : '%d സെക്കൻഡ്',
+            m : 'ഒരു മിനിറ്റ്',
+            mm : '%d മിനിറ്റ്',
+            h : 'ഒരു മണിക്കൂർ',
+            hh : '%d മണിക്കൂർ',
+            d : 'ഒരു ദിവസം',
+            dd : '%d ദിവസം',
+            M : 'ഒരു മാസം',
+            MM : '%d മാസം',
+            y : 'ഒരു വർഷം',
+            yy : '%d വർഷം'
+        },
+        meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if ((meridiem === 'രാത്രി' && hour >= 4) ||
+                    meridiem === 'ഉച്ച കഴിഞ്ഞ്' ||
+                    meridiem === 'വൈകുന്നേരം') {
+                return hour + 12;
+            } else {
+                return hour;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'രാത്രി';
+            } else if (hour < 12) {
+                return 'രാവിലെ';
+            } else if (hour < 17) {
+                return 'ഉച്ച കഴിഞ്ഞ്';
+            } else if (hour < 20) {
+                return 'വൈകുന്നേരം';
+            } else {
+                return 'രാത്രി';
+            }
+        }
+    });
 
+    return ml;
 
-/***/ }),
-/* 75 */
-/***/ (function(module, exports) {
+})));
 
-exports = module.exports = SemVer;
 
-// 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() {};
+/***/ }),
+/* 119 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// 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';
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    function translate(number, withoutSuffix, key, isFuture) {
+        switch (key) {
+            case 's':
+                return withoutSuffix ? 'хэдхэн секунд' : 'хэдхэн секундын';
+            case 'ss':
+                return number + (withoutSuffix ? ' секунд' : ' секундын');
+            case 'm':
+            case 'mm':
+                return number + (withoutSuffix ? ' минут' : ' минутын');
+            case 'h':
+            case 'hh':
+                return number + (withoutSuffix ? ' цаг' : ' цагийн');
+            case 'd':
+            case 'dd':
+                return number + (withoutSuffix ? ' өдөр' : ' өдрийн');
+            case 'M':
+            case 'MM':
+                return number + (withoutSuffix ? ' сар' : ' сарын');
+            case 'y':
+            case 'yy':
+                return number + (withoutSuffix ? ' жил' : ' жилийн');
+            default:
+                return number;
+        }
+    }
+
+    var mn = moment.defineLocale('mn', {
+        months : 'Нэгдүгээр сар_Хоёрдугаар сар_Гуравдугаар сар_Дөрөвдүгээр сар_Тавдугаар сар_Зургадугаар сар_Долдугаар сар_Наймдугаар сар_Есдүгээр сар_Аравдугаар сар_Арван нэгдүгээр сар_Арван хоёрдугаар сар'.split('_'),
+        monthsShort : '1 сар_2 сар_3 сар_4 сар_5 сар_6 сар_7 сар_8 сар_9 сар_10 сар_11 сар_12 сар'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'Ням_Даваа_Мягмар_Лхагва_Пүрэв_Баасан_Бямба'.split('_'),
+        weekdaysShort : 'Ням_Дав_Мяг_Лха_Пүр_Баа_Бям'.split('_'),
+        weekdaysMin : 'Ня_Да_Мя_Лх_Пү_Ба_Бя'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY оны MMMMын D',
+            LLL : 'YYYY оны MMMMын D HH:mm',
+            LLLL : 'dddd, YYYY оны MMMMын D HH:mm'
+        },
+        meridiemParse: /ҮӨ|ҮХ/i,
+        isPM : function (input) {
+            return input === 'ҮХ';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ҮӨ';
+            } else {
+                return 'ҮХ';
+            }
+        },
+        calendar : {
+            sameDay : '[Өнөөдөр] LT',
+            nextDay : '[Маргааш] LT',
+            nextWeek : '[Ирэх] dddd LT',
+            lastDay : '[Өчигдөр] LT',
+            lastWeek : '[Өнгөрсөн] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s дараа',
+            past : '%s өмнө',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2} өдөр/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'DDD':
+                    return number + ' өдөр';
+                default:
+                    return number;
+            }
+        }
+    });
 
-var MAX_LENGTH = 256;
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
+    return mn;
 
-// The actual regexps go on exports.re
-var re = exports.re = [];
-var src = exports.src = [];
-var R = 0;
+})));
 
-// The following Regular Expressions can be used for tokenizing,
-// validating, and parsing SemVer version strings.
 
-// ## Numeric Identifier
-// A single `0`, or a non-zero digit followed by zero or more digits.
+/***/ }),
+/* 120 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var NUMERICIDENTIFIER = R++;
-src[NUMERICIDENTIFIER] = '0|[1-9]\\d*';
-var NUMERICIDENTIFIERLOOSE = R++;
-src[NUMERICIDENTIFIERLOOSE] = '[0-9]+';
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    function relativeTimeMr(number, withoutSuffix, string, isFuture)
+    {
+        var output = '';
+        if (withoutSuffix) {
+            switch (string) {
+                case 's': output = 'काही सेकंद'; break;
+                case 'ss': output = '%d सेकंद'; break;
+                case 'm': output = 'एक मिनिट'; break;
+                case 'mm': output = '%d मिनिटे'; break;
+                case 'h': output = 'एक तास'; break;
+                case 'hh': output = '%d तास'; break;
+                case 'd': output = 'एक दिवस'; break;
+                case 'dd': output = '%d दिवस'; break;
+                case 'M': output = 'एक महिना'; break;
+                case 'MM': output = '%d महिने'; break;
+                case 'y': output = 'एक वर्ष'; break;
+                case 'yy': output = '%d वर्षे'; break;
+            }
+        }
+        else {
+            switch (string) {
+                case 's': output = 'काही सेकंदां'; break;
+                case 'ss': output = '%d सेकंदां'; break;
+                case 'm': output = 'एका मिनिटा'; break;
+                case 'mm': output = '%d मिनिटां'; break;
+                case 'h': output = 'एका तासा'; break;
+                case 'hh': output = '%d तासां'; break;
+                case 'd': output = 'एका दिवसा'; break;
+                case 'dd': output = '%d दिवसां'; break;
+                case 'M': output = 'एका महिन्या'; break;
+                case 'MM': output = '%d महिन्यां'; break;
+                case 'y': output = 'एका वर्षा'; break;
+                case 'yy': output = '%d वर्षां'; break;
+            }
+        }
+        return output.replace(/%d/i, number);
+    }
+
+    var mr = moment.defineLocale('mr', {
+        months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),
+        monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+        weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'),
+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm वाजता',
+            LTS : 'A h:mm:ss वाजता',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm वाजता',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm वाजता'
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[उद्या] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[काल] LT',
+            lastWeek: '[मागील] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future: '%sमध्ये',
+            past: '%sपूर्वी',
+            s: relativeTimeMr,
+            ss: relativeTimeMr,
+            m: relativeTimeMr,
+            mm: relativeTimeMr,
+            h: relativeTimeMr,
+            hh: relativeTimeMr,
+            d: relativeTimeMr,
+            dd: relativeTimeMr,
+            M: relativeTimeMr,
+            MM: relativeTimeMr,
+            y: relativeTimeMr,
+            yy: relativeTimeMr
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'रात्री') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'सकाळी') {
+                return hour;
+            } else if (meridiem === 'दुपारी') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'सायंकाळी') {
+                return hour + 12;
+            }
+        },
+        meridiem: function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'रात्री';
+            } else if (hour < 10) {
+                return 'सकाळी';
+            } else if (hour < 17) {
+                return 'दुपारी';
+            } else if (hour < 20) {
+                return 'सायंकाळी';
+            } else {
+                return 'रात्री';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 6th is the first week of the year.
+        }
+    });
 
+    return mr;
 
-// ## Non-numeric Identifier
-// Zero or more digits, followed by a letter or hyphen, and then zero or
-// more letters, digits, or hyphens.
+})));
 
-var NONNUMERICIDENTIFIER = R++;
-src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*';
 
+/***/ }),
+/* 121 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// ## Main Version
-// Three dot-separated numeric identifiers.
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var ms = moment.defineLocale('ms', {
+        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
+        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
+        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
+        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] HH.mm',
+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
+        },
+        meridiemParse: /pagi|tengahari|petang|malam/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'tengahari') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'petang' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'tengahari';
+            } else if (hours < 19) {
+                return 'petang';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Esok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kelmarin pukul] LT',
+            lastWeek : 'dddd [lepas pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lepas',
+            s : 'beberapa saat',
+            ss : '%d saat',
+            m : 'seminit',
+            mm : '%d minit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-var MAINVERSION = R++;
-src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')';
+    return ms;
 
-var MAINVERSIONLOOSE = R++;
-src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')';
+})));
 
-// ## Pre-release Version Identifier
-// A numeric identifier, or a non-numeric identifier.
 
-var PRERELEASEIDENTIFIER = R++;
-src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
-                            '|' + src[NONNUMERICIDENTIFIER] + ')';
+/***/ }),
+/* 122 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var PRERELEASEIDENTIFIERLOOSE = R++;
-src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
-                                 '|' + src[NONNUMERICIDENTIFIER] + ')';
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var msMy = moment.defineLocale('ms-my', {
+        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
+        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
+        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
+        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] HH.mm',
+            LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm'
+        },
+        meridiemParse: /pagi|tengahari|petang|malam/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'tengahari') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'petang' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'tengahari';
+            } else if (hours < 19) {
+                return 'petang';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Esok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kelmarin pukul] LT',
+            lastWeek : 'dddd [lepas pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lepas',
+            s : 'beberapa saat',
+            ss : '%d saat',
+            m : 'seminit',
+            mm : '%d minit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
+    return msMy;
 
-// ## Pre-release Version
-// Hyphen, followed by one or more dot-separated pre-release version
-// identifiers.
+})));
 
-var PRERELEASE = R++;
-src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
-                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))';
 
-var PRERELEASELOOSE = R++;
-src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
-                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))';
+/***/ }),
+/* 123 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// ## Build Metadata Identifier
-// Any combination of digits, letters, or hyphens.
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var mt = moment.defineLocale('mt', {
+        months : 'Jannar_Frar_Marzu_April_Mejju_Ġunju_Lulju_Awwissu_Settembru_Ottubru_Novembru_Diċembru'.split('_'),
+        monthsShort : 'Jan_Fra_Mar_Apr_Mej_Ġun_Lul_Aww_Set_Ott_Nov_Diċ'.split('_'),
+        weekdays : 'Il-Ħadd_It-Tnejn_It-Tlieta_L-Erbgħa_Il-Ħamis_Il-Ġimgħa_Is-Sibt'.split('_'),
+        weekdaysShort : 'Ħad_Tne_Tli_Erb_Ħam_Ġim_Sib'.split('_'),
+        weekdaysMin : 'Ħa_Tn_Tl_Er_Ħa_Ġi_Si'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Illum fil-]LT',
+            nextDay : '[Għada fil-]LT',
+            nextWeek : 'dddd [fil-]LT',
+            lastDay : '[Il-bieraħ fil-]LT',
+            lastWeek : 'dddd [li għadda] [fil-]LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'f’ %s',
+            past : '%s ilu',
+            s : 'ftit sekondi',
+            ss : '%d sekondi',
+            m : 'minuta',
+            mm : '%d minuti',
+            h : 'siegħa',
+            hh : '%d siegħat',
+            d : 'ġurnata',
+            dd : '%d ġranet',
+            M : 'xahar',
+            MM : '%d xhur',
+            y : 'sena',
+            yy : '%d sni'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}º/,
+        ordinal: '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-var BUILDIDENTIFIER = R++;
-src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+';
+    return mt;
 
-// ## Build Metadata
-// Plus sign, followed by one or more period-separated build metadata
-// identifiers.
+})));
 
-var BUILD = R++;
-src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
-             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))';
 
+/***/ }),
+/* 124 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// ## Full Version String
-// A main version, followed optionally by a pre-release version and
-// build metadata.
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '၁',
+        '2': '၂',
+        '3': '၃',
+        '4': '၄',
+        '5': '၅',
+        '6': '၆',
+        '7': '၇',
+        '8': '၈',
+        '9': '၉',
+        '0': '၀'
+    }, numberMap = {
+        '၁': '1',
+        '၂': '2',
+        '၃': '3',
+        '၄': '4',
+        '၅': '5',
+        '၆': '6',
+        '၇': '7',
+        '၈': '8',
+        '၉': '9',
+        '၀': '0'
+    };
+
+    var my = moment.defineLocale('my', {
+        months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'),
+        monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'),
+        weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'),
+        weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+        weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY HH:mm',
+            LLLL: 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar: {
+            sameDay: '[ယနေ.] LT [မှာ]',
+            nextDay: '[မနက်ဖြန်] LT [မှာ]',
+            nextWeek: 'dddd LT [မှာ]',
+            lastDay: '[မနေ.က] LT [မှာ]',
+            lastWeek: '[ပြီးခဲ့သော] dddd LT [မှာ]',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'လာမည့် %s မှာ',
+            past: 'လွန်ခဲ့သော %s က',
+            s: 'စက္ကန်.အနည်းငယ်',
+            ss : '%d စက္ကန့်',
+            m: 'တစ်မိနစ်',
+            mm: '%d မိနစ်',
+            h: 'တစ်နာရီ',
+            hh: '%d နာရီ',
+            d: 'တစ်ရက်',
+            dd: '%d ရက်',
+            M: 'တစ်လ',
+            MM: '%d လ',
+            y: 'တစ်နှစ်',
+            yy: '%d နှစ်'
+        },
+        preparse: function (string) {
+            return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-// 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.
+    return my;
 
-var FULL = R++;
-var FULLPLAIN = 'v?' + src[MAINVERSION] +
-                src[PRERELEASE] + '?' +
-                src[BUILD] + '?';
+})));
 
-src[FULL] = '^' + FULLPLAIN + '$';
 
-// 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] + '?';
+/***/ }),
+/* 125 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var LOOSE = R++;
-src[LOOSE] = '^' + LOOSEPLAIN + '$';
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var nb = moment.defineLocale('nb', {
+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'sø._ma._ti._on._to._fr._lø.'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] HH:mm',
+            LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
+        },
+        calendar : {
+            sameDay: '[i dag kl.] LT',
+            nextDay: '[i morgen kl.] LT',
+            nextWeek: 'dddd [kl.] LT',
+            lastDay: '[i går kl.] LT',
+            lastWeek: '[forrige] dddd [kl.] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : '%s siden',
+            s : 'noen sekunder',
+            ss : '%d sekunder',
+            m : 'ett minutt',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dager',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-var GTLT = R++;
-src[GTLT] = '((?:<|>)?=?)';
+    return nb;
 
-// 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|\\*';
+})));
 
-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] + '?' +
-                        ')?)?';
+/***/ }),
+/* 126 */
+/***/ (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] + '$';
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    var ne = moment.defineLocale('ne', {
+        months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'),
+        monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'),
+        weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'),
+        weekdaysMin : 'आ._सो._मं._बु._बि._शु._श.'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'Aको h:mm बजे',
+            LTS : 'Aको h:mm:ss बजे',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, Aको h:mm बजे',
+            LLLL : 'dddd, D MMMM YYYY, Aको h:mm बजे'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /राति|बिहान|दिउँसो|साँझ/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'राति') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'बिहान') {
+                return hour;
+            } else if (meridiem === 'दिउँसो') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'साँझ') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 3) {
+                return 'राति';
+            } else if (hour < 12) {
+                return 'बिहान';
+            } else if (hour < 16) {
+                return 'दिउँसो';
+            } else if (hour < 20) {
+                return 'साँझ';
+            } else {
+                return 'राति';
+            }
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[भोलि] LT',
+            nextWeek : '[आउँदो] dddd[,] LT',
+            lastDay : '[हिजो] LT',
+            lastWeek : '[गएको] dddd[,] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%sमा',
+            past : '%s अगाडि',
+            s : 'केही क्षण',
+            ss : '%d सेकेण्ड',
+            m : 'एक मिनेट',
+            mm : '%d मिनेट',
+            h : 'एक घण्टा',
+            hh : '%d घण्टा',
+            d : 'एक दिन',
+            dd : '%d दिन',
+            M : 'एक महिना',
+            MM : '%d महिना',
+            y : 'एक बर्ष',
+            yy : '%d बर्ष'
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 6th is the first week of the year.
+        }
+    });
 
-// Tilde ranges.
-// Meaning is "reasonably at or greater than"
-var LONETILDE = R++;
-src[LONETILDE] = '(?:~>?)';
+    return ne;
 
-var TILDETRIM = R++;
-src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+';
-re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g');
-var tildeTrimReplace = '$1~';
+})));
 
-var TILDE = R++;
-src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$';
-var TILDELOOSE = R++;
-src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$';
 
-// Caret ranges.
-// Meaning is "at least and backwards compatible with"
-var LONECARET = R++;
-src[LONECARET] = '(?:\\^)';
+/***/ }),
+/* 127 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var CARETTRIM = R++;
-src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+';
-re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g');
-var caretTrimReplace = '$1^';
+//! moment.js locale configuration
 
-var CARET = R++;
-src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$';
-var CARETLOOSE = R++;
-src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$';
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-// 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 + ')$|^$';
 
+    var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
 
-// 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] + ')';
+    var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
+    var monthsRegex = /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
 
-// this one has to use the /g flag
-re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g');
-var comparatorTrimReplace = '$1$2$3';
+    var nl = moment.defineLocale('nl', {
+        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortWithDots;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShortWithoutDots[m.month()];
+            } else {
+                return monthsShortWithDots[m.month()];
+            }
+        },
 
+        monthsRegex: monthsRegex,
+        monthsShortRegex: monthsRegex,
+        monthsStrictRegex: /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december)/i,
+        monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
+
+        monthsParse : monthsParse,
+        longMonthsParse : monthsParse,
+        shortMonthsParse : monthsParse,
+
+        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
+        weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[vandaag om] LT',
+            nextDay: '[morgen om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[gisteren om] LT',
+            lastWeek: '[afgelopen] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'over %s',
+            past : '%s geleden',
+            s : 'een paar seconden',
+            ss : '%d seconden',
+            m : 'één minuut',
+            mm : '%d minuten',
+            h : 'één uur',
+            hh : '%d uur',
+            d : 'één dag',
+            dd : '%d dagen',
+            M : 'één maand',
+            MM : '%d maanden',
+            y : 'één jaar',
+            yy : '%d jaar'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-// 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*$';
+    return nl;
 
-var HYPHENRANGELOOSE = R++;
-src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s+-\\s+' +
-                        '(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s*$';
+})));
 
-// 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]);
-}
+/***/ }),
+/* 128 */
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.parse = parse;
-function parse(version, loose) {
-  if (version instanceof SemVer)
-    return version;
+//! moment.js locale configuration
 
-  if (typeof version !== 'string')
-    return null;
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-  if (version.length > MAX_LENGTH)
-    return null;
 
-  var r = loose ? re[LOOSE] : re[FULL];
-  if (!r.test(version))
-    return null;
+    var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
 
-  try {
-    return new SemVer(version, loose);
-  } catch (er) {
-    return null;
-  }
-}
+    var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
+    var monthsRegex = /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
 
-exports.valid = valid;
-function valid(version, loose) {
-  var v = parse(version, loose);
-  return v ? v.version : null;
-}
+    var nlBe = moment.defineLocale('nl-be', {
+        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+        monthsShort : function (m, format) {
+            if (!m) {
+                return monthsShortWithDots;
+            } else if (/-MMM-/.test(format)) {
+                return monthsShortWithoutDots[m.month()];
+            } else {
+                return monthsShortWithDots[m.month()];
+            }
+        },
 
+        monthsRegex: monthsRegex,
+        monthsShortRegex: monthsRegex,
+        monthsStrictRegex: /^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december)/i,
+        monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
+
+        monthsParse : monthsParse,
+        longMonthsParse : monthsParse,
+        shortMonthsParse : monthsParse,
+
+        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
+        weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[vandaag om] LT',
+            nextDay: '[morgen om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[gisteren om] LT',
+            lastWeek: '[afgelopen] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'over %s',
+            past : '%s geleden',
+            s : 'een paar seconden',
+            ss : '%d seconden',
+            m : 'één minuut',
+            mm : '%d minuten',
+            h : 'één uur',
+            hh : '%d uur',
+            d : 'één dag',
+            dd : '%d dagen',
+            M : 'één maand',
+            MM : '%d maanden',
+            y : 'één jaar',
+            yy : '%d jaar'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-exports.clean = clean;
-function clean(version, loose) {
-  var s = parse(version.trim().replace(/^[=v]+/, ''), loose);
-  return s ? s.version : null;
-}
+    return nlBe;
 
-exports.SemVer = SemVer;
+})));
 
-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);
-  }
 
-  if (version.length > MAX_LENGTH)
-    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+/***/ }),
+/* 129 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (!(this instanceof SemVer))
-    return new SemVer(version, loose);
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var nn = moment.defineLocale('nn', {
+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'),
+        weekdaysShort : 'sun_mån_tys_ons_tor_fre_lau'.split('_'),
+        weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] H:mm',
+            LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
+        },
+        calendar : {
+            sameDay: '[I dag klokka] LT',
+            nextDay: '[I morgon klokka] LT',
+            nextWeek: 'dddd [klokka] LT',
+            lastDay: '[I går klokka] LT',
+            lastWeek: '[Føregåande] dddd [klokka] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : '%s sidan',
+            s : 'nokre sekund',
+            ss : '%d sekund',
+            m : 'eit minutt',
+            mm : '%d minutt',
+            h : 'ein time',
+            hh : '%d timar',
+            d : 'ein dag',
+            dd : '%d dagar',
+            M : 'ein månad',
+            MM : '%d månader',
+            y : 'eit år',
+            yy : '%d år'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-  debug('SemVer', version, loose);
-  this.loose = loose;
-  var m = version.trim().match(loose ? re[LOOSE] : re[FULL]);
+    return nn;
 
-  if (!m)
-    throw new TypeError('Invalid Version: ' + version);
+})));
 
-  this.raw = version;
 
-  // these are actually numbers
-  this.major = +m[1];
-  this.minor = +m[2];
-  this.patch = +m[3];
+/***/ }),
+/* 130 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (this.major > MAX_SAFE_INTEGER || this.major < 0)
-    throw new TypeError('Invalid major version')
-
-  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0)
-    throw new TypeError('Invalid minor version')
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '੧',
+        '2': '੨',
+        '3': '੩',
+        '4': '੪',
+        '5': '੫',
+        '6': '੬',
+        '7': '੭',
+        '8': '੮',
+        '9': '੯',
+        '0': '੦'
+    },
+    numberMap = {
+        '੧': '1',
+        '੨': '2',
+        '੩': '3',
+        '੪': '4',
+        '੫': '5',
+        '੬': '6',
+        '੭': '7',
+        '੮': '8',
+        '੯': '9',
+        '੦': '0'
+    };
+
+    var paIn = moment.defineLocale('pa-in', {
+        // There are months name as per Nanakshahi Calendar but they are not used as rigidly in modern Punjabi.
+        months : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
+        monthsShort : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'),
+        weekdays : 'ਐਤਵਾਰ_ਸੋਮਵਾਰ_ਮੰਗਲਵਾਰ_ਬੁਧਵਾਰ_ਵੀਰਵਾਰ_ਸ਼ੁੱਕਰਵਾਰ_ਸ਼ਨੀਚਰਵਾਰ'.split('_'),
+        weekdaysShort : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
+        weekdaysMin : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm ਵਜੇ',
+            LTS : 'A h:mm:ss ਵਜੇ',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm ਵਜੇ',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm ਵਜੇ'
+        },
+        calendar : {
+            sameDay : '[ਅਜ] LT',
+            nextDay : '[ਕਲ] LT',
+            nextWeek : '[ਅਗਲਾ] dddd, LT',
+            lastDay : '[ਕਲ] LT',
+            lastWeek : '[ਪਿਛਲੇ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ਵਿੱਚ',
+            past : '%s ਪਿਛਲੇ',
+            s : 'ਕੁਝ ਸਕਿੰਟ',
+            ss : '%d ਸਕਿੰਟ',
+            m : 'ਇਕ ਮਿੰਟ',
+            mm : '%d ਮਿੰਟ',
+            h : 'ਇੱਕ ਘੰਟਾ',
+            hh : '%d ਘੰਟੇ',
+            d : 'ਇੱਕ ਦਿਨ',
+            dd : '%d ਦਿਨ',
+            M : 'ਇੱਕ ਮਹੀਨਾ',
+            MM : '%d ਮਹੀਨੇ',
+            y : 'ਇੱਕ ਸਾਲ',
+            yy : '%d ਸਾਲ'
+        },
+        preparse: function (string) {
+            return string.replace(/[੧੨੩੪੫੬੭੮੯੦]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        // Punjabi notation for meridiems are quite fuzzy in practice. While there exists
+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Punjabi.
+        meridiemParse: /ਰਾਤ|ਸਵੇਰ|ਦੁਪਹਿਰ|ਸ਼ਾਮ/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'ਰਾਤ') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'ਸਵੇਰ') {
+                return hour;
+            } else if (meridiem === 'ਦੁਪਹਿਰ') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'ਸ਼ਾਮ') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ਰਾਤ';
+            } else if (hour < 10) {
+                return 'ਸਵੇਰ';
+            } else if (hour < 17) {
+                return 'ਦੁਪਹਿਰ';
+            } else if (hour < 20) {
+                return 'ਸ਼ਾਮ';
+            } else {
+                return 'ਰਾਤ';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 6th is the first week of the year.
+        }
+    });
 
-  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0)
-    throw new TypeError('Invalid patch version')
+    return paIn;
 
-  // 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;
-    });
+})));
 
-  this.build = m[5] ? m[5].split('.') : [];
-  this.format();
-}
 
-SemVer.prototype.format = function() {
-  this.version = this.major + '.' + this.minor + '.' + this.patch;
-  if (this.prerelease.length)
-    this.version += '-' + this.prerelease.join('.');
-  return this.version;
-};
+/***/ }),
+/* 131 */
+/***/ (function(module, exports, __webpack_require__) {
 
-SemVer.prototype.toString = function() {
-  return this.version;
-};
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'),
+        monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
+    function plural(n) {
+        return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
+    }
+    function translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+            case 'ss':
+                return result + (plural(number) ? 'sekundy' : 'sekund');
+            case 'm':
+                return withoutSuffix ? 'minuta' : 'minutę';
+            case 'mm':
+                return result + (plural(number) ? 'minuty' : 'minut');
+            case 'h':
+                return withoutSuffix  ? 'godzina'  : 'godzinę';
+            case 'hh':
+                return result + (plural(number) ? 'godziny' : 'godzin');
+            case 'MM':
+                return result + (plural(number) ? 'miesiące' : 'miesięcy');
+            case 'yy':
+                return result + (plural(number) ? 'lata' : 'lat');
+        }
+    }
+
+    var pl = moment.defineLocale('pl', {
+        months : function (momentToFormat, format) {
+            if (!momentToFormat) {
+                return monthsNominative;
+            } else if (format === '') {
+                // Hack: if format empty we know this is used to generate
+                // RegExp by moment. Give then back both valid forms of months
+                // in RegExp ready format.
+                return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
+            } else if (/D MMMM/.test(format)) {
+                return monthsSubjective[momentToFormat.month()];
+            } else {
+                return monthsNominative[momentToFormat.month()];
+            }
+        },
+        monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
+        weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
+        weekdaysShort : 'ndz_pon_wt_śr_czw_pt_sob'.split('_'),
+        weekdaysMin : 'Nd_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Dziś o] LT',
+            nextDay: '[Jutro o] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[W niedzielę o] LT';
 
-SemVer.prototype.compare = function(other) {
-  debug('SemVer.compare', this.version, this.loose, other);
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
+                    case 2:
+                        return '[We wtorek o] LT';
 
-  return this.compareMain(other) || this.comparePre(other);
-};
+                    case 3:
+                        return '[W środę o] LT';
 
-SemVer.prototype.compareMain = function(other) {
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
+                    case 6:
+                        return '[W sobotę o] LT';
 
-  return compareIdentifiers(this.major, other.major) ||
-         compareIdentifiers(this.minor, other.minor) ||
-         compareIdentifiers(this.patch, other.patch);
-};
+                    default:
+                        return '[W] dddd [o] LT';
+                }
+            },
+            lastDay: '[Wczoraj o] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[W zeszłą niedzielę o] LT';
+                    case 3:
+                        return '[W zeszłą środę o] LT';
+                    case 6:
+                        return '[W zeszłą sobotę o] LT';
+                    default:
+                        return '[W zeszły] dddd [o] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : '%s temu',
+            s : 'kilka sekund',
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : '1 dzień',
+            dd : '%d dni',
+            M : 'miesiąc',
+            MM : translate,
+            y : 'rok',
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-SemVer.prototype.comparePre = function(other) {
-  if (!(other instanceof SemVer))
-    other = new SemVer(other, this.loose);
+    return pl;
 
-  // 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;
+/***/ }),
+/* 132 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    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;
-          }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var pt = moment.defineLocale('pt', {
+        months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+        weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+        weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY HH:mm',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Hoje às] LT',
+            nextDay: '[Amanhã às] LT',
+            nextWeek: 'dddd [às] LT',
+            lastDay: '[Ontem às] LT',
+            lastWeek: function () {
+                return (this.day() === 0 || this.day() === 6) ?
+                    '[Último] dddd [às] LT' : // Saturday + Sunday
+                    '[Última] dddd [às] LT'; // Monday - Friday
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'em %s',
+            past : 'há %s',
+            s : 'segundos',
+            ss : '%d segundos',
+            m : 'um minuto',
+            mm : '%d minutos',
+            h : 'uma hora',
+            hh : '%d horas',
+            d : 'um dia',
+            dd : '%d dias',
+            M : 'um mês',
+            MM : '%d meses',
+            y : 'um ano',
+            yy : '%d anos'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-        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;
+    });
 
-    default:
-      throw new Error('invalid increment argument: ' + release);
-  }
-  this.format();
-  this.raw = this.version;
-  return this;
-};
+    return pt;
 
-exports.inc = inc;
-function inc(version, release, loose, identifier) {
-  if (typeof(loose) === 'string') {
-    identifier = loose;
-    loose = undefined;
-  }
+})));
 
-  try {
-    return new SemVer(version, loose).inc(release, identifier).version;
-  } catch (er) {
-    return null;
-  }
-}
 
-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;
-        }
-      }
-    }
-  }
-}
+/***/ }),
+/* 133 */
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.compareIdentifiers = compareIdentifiers;
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var ptBr = moment.defineLocale('pt-br', {
+        months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+        weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+        weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY [às] HH:mm',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'
+        },
+        calendar : {
+            sameDay: '[Hoje às] LT',
+            nextDay: '[Amanhã às] LT',
+            nextWeek: 'dddd [às] LT',
+            lastDay: '[Ontem às] LT',
+            lastWeek: function () {
+                return (this.day() === 0 || this.day() === 6) ?
+                    '[Último] dddd [às] LT' : // Saturday + Sunday
+                    '[Última] dddd [às] LT'; // Monday - Friday
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'em %s',
+            past : 'há %s',
+            s : 'poucos segundos',
+            ss : '%d segundos',
+            m : 'um minuto',
+            mm : '%d minutos',
+            h : 'uma hora',
+            hh : '%d horas',
+            d : 'um dia',
+            dd : '%d dias',
+            M : 'um mês',
+            MM : '%d meses',
+            y : 'um ano',
+            yy : '%d anos'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}º/,
+        ordinal : '%dº'
+    });
 
-var numeric = /^[0-9]+$/;
-function compareIdentifiers(a, b) {
-  var anum = numeric.test(a);
-  var bnum = numeric.test(b);
+    return ptBr;
 
-  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);
-}
+/***/ }),
+/* 134 */
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.major = major;
-function major(a, loose) {
-  return new SemVer(a, loose).major;
-}
+//! moment.js locale configuration
 
-exports.minor = minor;
-function minor(a, loose) {
-  return new SemVer(a, loose).minor;
-}
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-exports.patch = patch;
-function patch(a, loose) {
-  return new SemVer(a, loose).patch;
-}
 
-exports.compare = compare;
-function compare(a, b, loose) {
-  return new SemVer(a, loose).compare(new SemVer(b, loose));
-}
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+                'ss': 'secunde',
+                'mm': 'minute',
+                'hh': 'ore',
+                'dd': 'zile',
+                'MM': 'luni',
+                'yy': 'ani'
+            },
+            separator = ' ';
+        if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
+            separator = ' de ';
+        }
+        return number + separator + format[key];
+    }
+
+    var ro = moment.defineLocale('ro', {
+        months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
+        monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
+        weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
+        weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY H:mm',
+            LLLL : 'dddd, D MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay: '[azi la] LT',
+            nextDay: '[mâine la] LT',
+            nextWeek: 'dddd [la] LT',
+            lastDay: '[ieri la] LT',
+            lastWeek: '[fosta] dddd [la] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'peste %s',
+            past : '%s în urmă',
+            s : 'câteva secunde',
+            ss : relativeTimeWithPlural,
+            m : 'un minut',
+            mm : relativeTimeWithPlural,
+            h : 'o oră',
+            hh : relativeTimeWithPlural,
+            d : 'o zi',
+            dd : relativeTimeWithPlural,
+            M : 'o lună',
+            MM : relativeTimeWithPlural,
+            y : 'un an',
+            yy : relativeTimeWithPlural
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-exports.compareLoose = compareLoose;
-function compareLoose(a, b) {
-  return compare(a, b, true);
-}
+    return ro;
 
-exports.rcompare = rcompare;
-function rcompare(a, b, loose) {
-  return compare(b, a, loose);
-}
+})));
 
-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);
-  });
-}
+/***/ }),
+/* 135 */
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.gt = gt;
-function gt(a, b, loose) {
-  return compare(a, b, loose) > 0;
-}
+//! moment.js locale configuration
 
-exports.lt = lt;
-function lt(a, b, loose) {
-  return compare(a, b, loose) < 0;
-}
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-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;
-}
+    function plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+    }
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд',
+            'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
+            'hh': 'час_часа_часов',
+            'dd': 'день_дня_дней',
+            'MM': 'месяц_месяца_месяцев',
+            'yy': 'год_года_лет'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'минута' : 'минуту';
+        }
+        else {
+            return number + ' ' + plural(format[key], +number);
+        }
+    }
+    var monthsParse = [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[йя]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i];
 
-exports.gte = gte;
-function gte(a, b, loose) {
-  return compare(a, b, loose) >= 0;
-}
+    // http://new.gramota.ru/spravka/rules/139-prop : § 103
+    // Сокращения месяцев: http://new.gramota.ru/spravka/buro/search-answer?s=242637
+    // CLDR data:          http://www.unicode.org/cldr/charts/28/summary/ru.html#1753
+    var ru = moment.defineLocale('ru', {
+        months : {
+            format: 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_'),
+            standalone: 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_')
+        },
+        monthsShort : {
+            // по CLDR именно "июл." и "июн.", но какой смысл менять букву на точку ?
+            format: 'янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.'.split('_'),
+            standalone: 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_')
+        },
+        weekdays : {
+            standalone: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
+            format: 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_'),
+            isFormat: /\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/
+        },
+        weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        monthsParse : monthsParse,
+        longMonthsParse : monthsParse,
+        shortMonthsParse : monthsParse,
+
+        // полные названия с падежами, по три буквы, для некоторых, по 4 буквы, сокращения с точкой и без точки
+        monthsRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
+
+        // копия предыдущего
+        monthsShortRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
+
+        // полные названия с падежами
+        monthsStrictRegex: /^(январ[яь]|феврал[яь]|марта?|апрел[яь]|ма[яй]|июн[яь]|июл[яь]|августа?|сентябр[яь]|октябр[яь]|ноябр[яь]|декабр[яь])/i,
+
+        // Выражение, которое соотвествует только сокращённым формам
+        monthsShortStrictRegex: /^(янв\.|февр?\.|мар[т.]|апр\.|ма[яй]|июн[ья.]|июл[ья.]|авг\.|сент?\.|окт\.|нояб?\.|дек\.)/i,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY г.',
+            LLL : 'D MMMM YYYY г., H:mm',
+            LLLL : 'dddd, D MMMM YYYY г., H:mm'
+        },
+        calendar : {
+            sameDay: '[Сегодня, в] LT',
+            nextDay: '[Завтра, в] LT',
+            lastDay: '[Вчера, в] LT',
+            nextWeek: function (now) {
+                if (now.week() !== this.week()) {
+                    switch (this.day()) {
+                        case 0:
+                            return '[В следующее] dddd, [в] LT';
+                        case 1:
+                        case 2:
+                        case 4:
+                            return '[В следующий] dddd, [в] LT';
+                        case 3:
+                        case 5:
+                        case 6:
+                            return '[В следующую] dddd, [в] LT';
+                    }
+                } else {
+                    if (this.day() === 2) {
+                        return '[Во] dddd, [в] LT';
+                    } else {
+                        return '[В] dddd, [в] LT';
+                    }
+                }
+            },
+            lastWeek: function (now) {
+                if (now.week() !== this.week()) {
+                    switch (this.day()) {
+                        case 0:
+                            return '[В прошлое] dddd, [в] LT';
+                        case 1:
+                        case 2:
+                        case 4:
+                            return '[В прошлый] dddd, [в] LT';
+                        case 3:
+                        case 5:
+                        case 6:
+                            return '[В прошлую] dddd, [в] LT';
+                    }
+                } else {
+                    if (this.day() === 2) {
+                        return '[Во] dddd, [в] LT';
+                    } else {
+                        return '[В] dddd, [в] LT';
+                    }
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'через %s',
+            past : '%s назад',
+            s : 'несколько секунд',
+            ss : relativeTimeWithPlural,
+            m : relativeTimeWithPlural,
+            mm : relativeTimeWithPlural,
+            h : 'час',
+            hh : relativeTimeWithPlural,
+            d : 'день',
+            dd : relativeTimeWithPlural,
+            M : 'месяц',
+            MM : relativeTimeWithPlural,
+            y : 'год',
+            yy : relativeTimeWithPlural
+        },
+        meridiemParse: /ночи|утра|дня|вечера/i,
+        isPM : function (input) {
+            return /^(дня|вечера)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночи';
+            } else if (hour < 12) {
+                return 'утра';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечера';
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(й|го|я)/,
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'M':
+                case 'd':
+                case 'DDD':
+                    return number + '-й';
+                case 'D':
+                    return number + '-го';
+                case 'w':
+                case 'W':
+                    return number + '-я';
+                default:
+                    return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-exports.lte = lte;
-function lte(a, b, loose) {
-  return compare(a, b, loose) <= 0;
-}
+    return ru;
 
-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;
-  }
 
-  if (!(this instanceof Comparator))
-    return new Comparator(comp, loose);
+/***/ }),
+/* 136 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  debug('comparator', comp, loose);
-  this.loose = loose;
-  this.parse(comp);
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var months = [
+        'جنوري',
+        'فيبروري',
+        'مارچ',
+        'اپريل',
+        'مئي',
+        'جون',
+        'جولاءِ',
+        'آگسٽ',
+        'سيپٽمبر',
+        'آڪٽوبر',
+        'نومبر',
+        'ڊسمبر'
+    ];
+    var days = [
+        'آچر',
+        'سومر',
+        'اڱارو',
+        'اربع',
+        'خميس',
+        'جمع',
+        'ڇنڇر'
+    ];
 
-  if (this.semver === ANY)
-    this.value = '';
-  else
-    this.value = this.operator + this.semver.version;
+    var sd = moment.defineLocale('sd', {
+        months : months,
+        monthsShort : months,
+        weekdays : days,
+        weekdaysShort : days,
+        weekdaysMin : days,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd، D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /صبح|شام/,
+        isPM : function (input) {
+            return 'شام' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'صبح';
+            }
+            return 'شام';
+        },
+        calendar : {
+            sameDay : '[اڄ] LT',
+            nextDay : '[سڀاڻي] LT',
+            nextWeek : 'dddd [اڳين هفتي تي] LT',
+            lastDay : '[ڪالهه] LT',
+            lastWeek : '[گزريل هفتي] dddd [تي] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s پوء',
+            past : '%s اڳ',
+            s : 'چند سيڪنڊ',
+            ss : '%d سيڪنڊ',
+            m : 'هڪ منٽ',
+            mm : '%d منٽ',
+            h : 'هڪ ڪلاڪ',
+            hh : '%d ڪلاڪ',
+            d : 'هڪ ڏينهن',
+            dd : '%d ڏينهن',
+            M : 'هڪ مهينو',
+            MM : '%d مهينا',
+            y : 'هڪ سال',
+            yy : '%d سال'
+        },
+        preparse: function (string) {
+            return string.replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/,/g, '،');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-  debug('comp', this);
-}
+    return sd;
 
-var ANY = {};
-Comparator.prototype.parse = function(comp) {
-  var r = this.loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
-  var m = comp.match(r);
+})));
 
-  if (!m)
-    throw new TypeError('Invalid comparator: ' + comp);
 
-  this.operator = m[1];
-  if (this.operator === '=')
-    this.operator = '';
+/***/ }),
+/* 137 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // if it literally is just '>' or '' then allow anything.
-  if (!m[2])
-    this.semver = ANY;
-  else
-    this.semver = new SemVer(m[2], this.loose);
-};
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var se = moment.defineLocale('se', {
+        months : 'ođđajagemánnu_guovvamánnu_njukčamánnu_cuoŋománnu_miessemánnu_geassemánnu_suoidnemánnu_borgemánnu_čakčamánnu_golggotmánnu_skábmamánnu_juovlamánnu'.split('_'),
+        monthsShort : 'ođđj_guov_njuk_cuo_mies_geas_suoi_borg_čakč_golg_skáb_juov'.split('_'),
+        weekdays : 'sotnabeaivi_vuossárga_maŋŋebárga_gaskavahkku_duorastat_bearjadat_lávvardat'.split('_'),
+        weekdaysShort : 'sotn_vuos_maŋ_gask_duor_bear_láv'.split('_'),
+        weekdaysMin : 's_v_m_g_d_b_L'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'MMMM D. [b.] YYYY',
+            LLL : 'MMMM D. [b.] YYYY [ti.] HH:mm',
+            LLLL : 'dddd, MMMM D. [b.] YYYY [ti.] HH:mm'
+        },
+        calendar : {
+            sameDay: '[otne ti] LT',
+            nextDay: '[ihttin ti] LT',
+            nextWeek: 'dddd [ti] LT',
+            lastDay: '[ikte ti] LT',
+            lastWeek: '[ovddit] dddd [ti] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s geažes',
+            past : 'maŋit %s',
+            s : 'moadde sekunddat',
+            ss: '%d sekunddat',
+            m : 'okta minuhta',
+            mm : '%d minuhtat',
+            h : 'okta diimmu',
+            hh : '%d diimmut',
+            d : 'okta beaivi',
+            dd : '%d beaivvit',
+            M : 'okta mánnu',
+            MM : '%d mánut',
+            y : 'okta jahki',
+            yy : '%d jagit'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-Comparator.prototype.toString = function() {
-  return this.value;
-};
+    return se;
 
-Comparator.prototype.test = function(version) {
-  debug('Comparator.test', version, this.loose);
+})));
 
-  if (this.semver === ANY)
-    return true;
 
-  if (typeof version === 'string')
-    version = new SemVer(version, this.loose);
+/***/ }),
+/* 138 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return cmp(version, this.operator, this.semver, this.loose);
-};
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    /*jshint -W100*/
+    var si = moment.defineLocale('si', {
+        months : 'ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්'.split('_'),
+        monthsShort : 'ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ'.split('_'),
+        weekdays : 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'),
+        weekdaysShort : 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'),
+        weekdaysMin : 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'a h:mm',
+            LTS : 'a h:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY MMMM D',
+            LLL : 'YYYY MMMM D, a h:mm',
+            LLLL : 'YYYY MMMM D [වැනි] dddd, a h:mm:ss'
+        },
+        calendar : {
+            sameDay : '[අද] LT[ට]',
+            nextDay : '[හෙට] LT[ට]',
+            nextWeek : 'dddd LT[ට]',
+            lastDay : '[ඊයේ] LT[ට]',
+            lastWeek : '[පසුගිය] dddd LT[ට]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%sකින්',
+            past : '%sකට පෙර',
+            s : 'තත්පර කිහිපය',
+            ss : 'තත්පර %d',
+            m : 'මිනිත්තුව',
+            mm : 'මිනිත්තු %d',
+            h : 'පැය',
+            hh : 'පැය %d',
+            d : 'දිනය',
+            dd : 'දින %d',
+            M : 'මාසය',
+            MM : 'මාස %d',
+            y : 'වසර',
+            yy : 'වසර %d'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2} වැනි/,
+        ordinal : function (number) {
+            return number + ' වැනි';
+        },
+        meridiemParse : /පෙර වරු|පස් වරු|පෙ.ව|ප.ව./,
+        isPM : function (input) {
+            return input === 'ප.ව.' || input === 'පස් වරු';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'ප.ව.' : 'පස් වරු';
+            } else {
+                return isLower ? 'පෙ.ව.' : 'පෙර වරු';
+            }
+        }
+    });
 
-Comparator.prototype.intersects = function(comp, loose) {
-  if (!(comp instanceof Comparator)) {
-    throw new TypeError('a Comparator is required');
-  }
+    return si;
 
-  var rangeTmp;
+})));
 
-  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);
-  }
 
-  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 === '>'));
+/***/ }),
+/* 139 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return sameDirectionIncreasing || sameDirectionDecreasing ||
-    (sameSemVer && differentDirectionsInclusive) ||
-    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan;
-};
+//! moment.js locale configuration
 
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-exports.Range = Range;
-function Range(range, loose) {
-  if (range instanceof Range) {
-    if (range.loose === loose) {
-      return range;
-    } else {
-      return new Range(range.raw, loose);
+
+    var months = 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_'),
+        monthsShort = 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_');
+    function plural(n) {
+        return (n > 1) && (n < 5);
+    }
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+            case 's':  // a few seconds / in a few seconds / a few seconds ago
+                return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami';
+            case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'sekundy' : 'sekúnd');
+                } else {
+                    return result + 'sekundami';
+                }
+                break;
+            case 'm':  // a minute / in a minute / a minute ago
+                return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou');
+            case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'minúty' : 'minút');
+                } else {
+                    return result + 'minútami';
+                }
+                break;
+            case 'h':  // an hour / in an hour / an hour ago
+                return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+            case 'hh': // 9 hours / in 9 hours / 9 hours ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'hodiny' : 'hodín');
+                } else {
+                    return result + 'hodinami';
+                }
+                break;
+            case 'd':  // a day / in a day / a day ago
+                return (withoutSuffix || isFuture) ? 'deň' : 'dňom';
+            case 'dd': // 9 days / in 9 days / 9 days ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'dni' : 'dní');
+                } else {
+                    return result + 'dňami';
+                }
+                break;
+            case 'M':  // a month / in a month / a month ago
+                return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom';
+            case 'MM': // 9 months / in 9 months / 9 months ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'mesiace' : 'mesiacov');
+                } else {
+                    return result + 'mesiacmi';
+                }
+                break;
+            case 'y':  // a year / in a year / a year ago
+                return (withoutSuffix || isFuture) ? 'rok' : 'rokom';
+            case 'yy': // 9 years / in 9 years / 9 years ago
+                if (withoutSuffix || isFuture) {
+                    return result + (plural(number) ? 'roky' : 'rokov');
+                } else {
+                    return result + 'rokmi';
+                }
+                break;
+        }
     }
-  }
 
-  if (range instanceof Comparator) {
-    return new Range(range.value, loose);
-  }
+    var sk = moment.defineLocale('sk', {
+        months : months,
+        monthsShort : monthsShort,
+        weekdays : 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'),
+        weekdaysShort : 'ne_po_ut_st_št_pi_so'.split('_'),
+        weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'),
+        longDateFormat : {
+            LT: 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd D. MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay: '[dnes o] LT',
+            nextDay: '[zajtra o] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[v nedeľu o] LT';
+                    case 1:
+                    case 2:
+                        return '[v] dddd [o] LT';
+                    case 3:
+                        return '[v stredu o] LT';
+                    case 4:
+                        return '[vo štvrtok o] LT';
+                    case 5:
+                        return '[v piatok o] LT';
+                    case 6:
+                        return '[v sobotu o] LT';
+                }
+            },
+            lastDay: '[včera o] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[minulú nedeľu o] LT';
+                    case 1:
+                    case 2:
+                        return '[minulý] dddd [o] LT';
+                    case 3:
+                        return '[minulú stredu o] LT';
+                    case 4:
+                    case 5:
+                        return '[minulý] dddd [o] LT';
+                    case 6:
+                        return '[minulú sobotu o] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : 'pred %s',
+            s : translate,
+            ss : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-  if (!(this instanceof Range))
-    return new Range(range, loose);
+    return sk;
 
-  this.loose = loose;
+})));
 
-  // 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;
-  });
 
-  if (!this.set.length) {
-    throw new TypeError('Invalid SemVer Range: ' + range);
-  }
+/***/ }),
+/* 140 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  this.format();
-}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+            case 's':
+                return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';
+            case 'ss':
+                if (number === 1) {
+                    result += withoutSuffix ? 'sekundo' : 'sekundi';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'sekundi' : 'sekundah';
+                } else if (number < 5) {
+                    result += withoutSuffix || isFuture ? 'sekunde' : 'sekundah';
+                } else {
+                    result += 'sekund';
+                }
+                return result;
+            case 'm':
+                return withoutSuffix ? 'ena minuta' : 'eno minuto';
+            case 'mm':
+                if (number === 1) {
+                    result += withoutSuffix ? 'minuta' : 'minuto';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'minuti' : 'minutama';
+                } else if (number < 5) {
+                    result += withoutSuffix || isFuture ? 'minute' : 'minutami';
+                } else {
+                    result += withoutSuffix || isFuture ? 'minut' : 'minutami';
+                }
+                return result;
+            case 'h':
+                return withoutSuffix ? 'ena ura' : 'eno uro';
+            case 'hh':
+                if (number === 1) {
+                    result += withoutSuffix ? 'ura' : 'uro';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'uri' : 'urama';
+                } else if (number < 5) {
+                    result += withoutSuffix || isFuture ? 'ure' : 'urami';
+                } else {
+                    result += withoutSuffix || isFuture ? 'ur' : 'urami';
+                }
+                return result;
+            case 'd':
+                return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';
+            case 'dd':
+                if (number === 1) {
+                    result += withoutSuffix || isFuture ? 'dan' : 'dnem';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'dni' : 'dnevoma';
+                } else {
+                    result += withoutSuffix || isFuture ? 'dni' : 'dnevi';
+                }
+                return result;
+            case 'M':
+                return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';
+            case 'MM':
+                if (number === 1) {
+                    result += withoutSuffix || isFuture ? 'mesec' : 'mesecem';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'meseca' : 'mesecema';
+                } else if (number < 5) {
+                    result += withoutSuffix || isFuture ? 'mesece' : 'meseci';
+                } else {
+                    result += withoutSuffix || isFuture ? 'mesecev' : 'meseci';
+                }
+                return result;
+            case 'y':
+                return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';
+            case 'yy':
+                if (number === 1) {
+                    result += withoutSuffix || isFuture ? 'leto' : 'letom';
+                } else if (number === 2) {
+                    result += withoutSuffix || isFuture ? 'leti' : 'letoma';
+                } else if (number < 5) {
+                    result += withoutSuffix || isFuture ? 'leta' : 'leti';
+                } else {
+                    result += withoutSuffix || isFuture ? 'let' : 'leti';
+                }
+                return result;
+        }
+    }
+
+    var sl = moment.defineLocale('sl', {
+        months : 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),
+        weekdaysShort : 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),
+        weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY H:mm',
+            LLLL : 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay  : '[danes ob] LT',
+            nextDay  : '[jutri ob] LT',
+
+            nextWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[v] [nedeljo] [ob] LT';
+                    case 3:
+                        return '[v] [sredo] [ob] LT';
+                    case 6:
+                        return '[v] [soboto] [ob] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[v] dddd [ob] LT';
+                }
+            },
+            lastDay  : '[včeraj ob] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[prejšnjo] [nedeljo] [ob] LT';
+                    case 3:
+                        return '[prejšnjo] [sredo] [ob] LT';
+                    case 6:
+                        return '[prejšnjo] [soboto] [ob] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[prejšnji] dddd [ob] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'čez %s',
+            past   : 'pred %s',
+            s      : processRelativeTime,
+            ss     : processRelativeTime,
+            m      : processRelativeTime,
+            mm     : processRelativeTime,
+            h      : processRelativeTime,
+            hh     : processRelativeTime,
+            d      : processRelativeTime,
+            dd     : processRelativeTime,
+            M      : processRelativeTime,
+            MM     : processRelativeTime,
+            y      : processRelativeTime,
+            yy     : processRelativeTime
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-Range.prototype.format = function() {
-  this.range = this.set.map(function(comps) {
-    return comps.join(' ').trim();
-  }).join('||').trim();
-  return this.range;
-};
+    return sl;
 
-Range.prototype.toString = function() {
-  return this.range;
-};
+})));
 
-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]);
 
-  // `~ 1.2.3` => `~1.2.3`
-  range = range.replace(re[TILDETRIM], tildeTrimReplace);
+/***/ }),
+/* 141 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // `^ 1.2.3` => `^1.2.3`
-  range = range.replace(re[CARETTRIM], caretTrimReplace);
+//! moment.js locale configuration
 
-  // normalize spaces
-  range = range.split(/\s+/).join(' ');
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-  // At this point, the range is completely trimmed and
-  // ready to be split into comparators.
 
-  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);
+    var sq = moment.defineLocale('sq', {
+        months : 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'),
+        monthsShort : 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'),
+        weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'),
+        weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'),
+        weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'),
+        weekdaysParseExact : true,
+        meridiemParse: /PD|MD/,
+        isPM: function (input) {
+            return input.charAt(0) === 'M';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            return hours < 12 ? 'PD' : 'MD';
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Sot në] LT',
+            nextDay : '[Nesër në] LT',
+            nextWeek : 'dddd [në] LT',
+            lastDay : '[Dje në] LT',
+            lastWeek : 'dddd [e kaluar në] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'në %s',
+            past : '%s më parë',
+            s : 'disa sekonda',
+            ss : '%d sekonda',
+            m : 'një minutë',
+            mm : '%d minuta',
+            h : 'një orë',
+            hh : '%d orë',
+            d : 'një ditë',
+            dd : '%d ditë',
+            M : 'një muaj',
+            MM : '%d muaj',
+            y : 'një vit',
+            yy : '%d vite'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
     });
-  }
-  set = set.map(function(comp) {
-    return new Comparator(comp, loose);
-  });
-
-  return set;
-};
 
-Range.prototype.intersects = function(range, loose) {
-  if (!(range instanceof Range)) {
-    throw new TypeError('a Range is required');
-  }
+    return sq;
 
-  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);
-        });
-      });
-    });
-  });
-};
+})));
 
-// 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(' ');
-  });
-}
 
-// 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;
-}
+/***/ }),
+/* 142 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function isX(id) {
-  return !id || id.toLowerCase() === 'x' || id === '*';
-}
+//! moment.js locale configuration
 
-// ~, ~> --> * (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(' ');
-}
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-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';
+    var translator = {
+        words: { //Different grammatical cases
+            ss: ['sekunda', 'sekunde', 'sekundi'],
+            m: ['jedan minut', 'jedne minute'],
+            mm: ['minut', 'minute', 'minuta'],
+            h: ['jedan sat', 'jednog sata'],
+            hh: ['sat', 'sata', 'sati'],
+            dd: ['dan', 'dana', 'dana'],
+            MM: ['mesec', 'meseca', 'meseci'],
+            yy: ['godina', 'godine', 'godina']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
+            }
+        }
+    };
 
-    debug('tilde return', ret);
-    return ret;
-  });
-}
+    var sr = moment.defineLocale('sr', {
+        months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
+        monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
+        monthsParseExact: true,
+        weekdays: 'nedelja_ponedeljak_utorak_sreda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort: 'ned._pon._uto._sre._čet._pet._sub.'.split('_'),
+        weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'H:mm:ss',
+            L: 'DD.MM.YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY H:mm',
+            LLLL: 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar: {
+            sameDay: '[danas u] LT',
+            nextDay: '[sutra u] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[u] [nedelju] [u] LT';
+                    case 3:
+                        return '[u] [sredu] [u] LT';
+                    case 6:
+                        return '[u] [subotu] [u] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[juče u] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[prošle] [nedelje] [u] LT',
+                    '[prošlog] [ponedeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'pre %s',
+            s      : 'nekoliko sekundi',
+            ss     : translator.translate,
+            m      : translator.translate,
+            mm     : translator.translate,
+            h      : translator.translate,
+            hh     : translator.translate,
+            d      : 'dan',
+            dd     : translator.translate,
+            M      : 'mesec',
+            MM     : translator.translate,
+            y      : 'godinu',
+            yy     : translator.translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-// ^ --> * (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(' ');
-}
+    return sr;
 
-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;
+})));
 
-    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';
-    }
 
-    debug('caret return', ret);
-    return ret;
-  });
-}
+/***/ }),
+/* 143 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function replaceXRanges(comp, loose) {
-  debug('replaceXRanges', comp, loose);
-  return comp.split(/\s+/).map(function(comp) {
-    return replaceXRange(comp, loose);
-  }).join(' ');
-}
+//! moment.js locale configuration
 
-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;
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
 
-    if (gtlt === '=' && anyX)
-      gtlt = '';
 
-    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;
+    var translator = {
+        words: { //Different grammatical cases
+            ss: ['секунда', 'секунде', 'секунди'],
+            m: ['један минут', 'једне минуте'],
+            mm: ['минут', 'минуте', 'минута'],
+            h: ['један сат', 'једног сата'],
+            hh: ['сат', 'сата', 'сати'],
+            dd: ['дан', 'дана', 'дана'],
+            MM: ['месец', 'месеца', 'месеци'],
+            yy: ['година', 'године', 'година']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
+            }
+        }
+    };
 
-      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;
+    var srCyrl = moment.defineLocale('sr-cyrl', {
+        months: 'јануар_фебруар_март_април_мај_јун_јул_август_септембар_октобар_новембар_децембар'.split('_'),
+        monthsShort: 'јан._феб._мар._апр._мај_јун_јул_авг._сеп._окт._нов._дец.'.split('_'),
+        monthsParseExact: true,
+        weekdays: 'недеља_понедељак_уторак_среда_четвртак_петак_субота'.split('_'),
+        weekdaysShort: 'нед._пон._уто._сре._чет._пет._суб.'.split('_'),
+        weekdaysMin: 'не_по_ут_ср_че_пе_су'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'H:mm:ss',
+            L: 'DD.MM.YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY H:mm',
+            LLLL: 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar: {
+            sameDay: '[данас у] LT',
+            nextDay: '[сутра у] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[у] [недељу] [у] LT';
+                    case 3:
+                        return '[у] [среду] [у] LT';
+                    case 6:
+                        return '[у] [суботу] [у] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                    case 5:
+                        return '[у] dddd [у] LT';
+                }
+            },
+            lastDay  : '[јуче у] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[прошле] [недеље] [у] LT',
+                    '[прошлог] [понедељка] [у] LT',
+                    '[прошлог] [уторка] [у] LT',
+                    '[прошле] [среде] [у] LT',
+                    '[прошлог] [четвртка] [у] LT',
+                    '[прошлог] [петка] [у] LT',
+                    '[прошле] [суботе] [у] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'за %s',
+            past   : 'пре %s',
+            s      : 'неколико секунди',
+            ss     : translator.translate,
+            m      : translator.translate,
+            mm     : translator.translate,
+            h      : translator.translate,
+            hh     : translator.translate,
+            d      : 'дан',
+            dd     : translator.translate,
+            M      : 'месец',
+            MM     : translator.translate,
+            y      : 'годину',
+            yy     : translator.translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
         }
-      } 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;
-      }
+    });
 
-      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';
-    }
+    return srCyrl;
 
-    debug('xRange return', ret);
+})));
 
-    return ret;
-  });
-}
 
-// 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], '');
-}
+/***/ }),
+/* 144 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// 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) {
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var ss = moment.defineLocale('ss', {
+        months : "Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni".split('_'),
+        monthsShort : 'Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo'.split('_'),
+        weekdays : 'Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo'.split('_'),
+        weekdaysShort : 'Lis_Umb_Lsb_Les_Lsi_Lsh_Umg'.split('_'),
+        weekdaysMin : 'Li_Us_Lb_Lt_Ls_Lh_Ug'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[Namuhla nga] LT',
+            nextDay : '[Kusasa nga] LT',
+            nextWeek : 'dddd [nga] LT',
+            lastDay : '[Itolo nga] LT',
+            lastWeek : 'dddd [leliphelile] [nga] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'nga %s',
+            past : 'wenteka nga %s',
+            s : 'emizuzwana lomcane',
+            ss : '%d mzuzwana',
+            m : 'umzuzu',
+            mm : '%d emizuzu',
+            h : 'lihora',
+            hh : '%d emahora',
+            d : 'lilanga',
+            dd : '%d emalanga',
+            M : 'inyanga',
+            MM : '%d tinyanga',
+            y : 'umnyaka',
+            yy : '%d iminyaka'
+        },
+        meridiemParse: /ekuseni|emini|entsambama|ebusuku/,
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'ekuseni';
+            } else if (hours < 15) {
+                return 'emini';
+            } else if (hours < 19) {
+                return 'entsambama';
+            } else {
+                return 'ebusuku';
+            }
+        },
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'ekuseni') {
+                return hour;
+            } else if (meridiem === 'emini') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'entsambama' || meridiem === 'ebusuku') {
+                if (hour === 0) {
+                    return 0;
+                }
+                return hour + 12;
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}/,
+        ordinal : '%d',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-  if (isX(fM))
-    from = '';
-  else if (isX(fm))
-    from = '>=' + fM + '.0.0';
-  else if (isX(fp))
-    from = '>=' + fM + '.' + fm + '.0';
-  else
-    from = '>=' + from;
+    return ss;
 
-  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;
+})));
 
-  return (from + ' ' + to).trim();
-}
 
+/***/ }),
+/* 145 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// if ANY of the sets match ALL of its comparators, then pass
-Range.prototype.test = function(version) {
-  if (!version)
-    return false;
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var sv = moment.defineLocale('sv', {
+        months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
+        weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
+        weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [kl.] HH:mm',
+            LLLL : 'dddd D MMMM YYYY [kl.] HH:mm',
+            lll : 'D MMM YYYY HH:mm',
+            llll : 'ddd D MMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Idag] LT',
+            nextDay: '[Imorgon] LT',
+            lastDay: '[Igår] LT',
+            nextWeek: '[På] dddd LT',
+            lastWeek: '[I] dddd[s] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'för %s sedan',
+            s : 'några sekunder',
+            ss : '%d sekunder',
+            m : 'en minut',
+            mm : '%d minuter',
+            h : 'en timme',
+            hh : '%d timmar',
+            d : 'en dag',
+            dd : '%d dagar',
+            M : 'en månad',
+            MM : '%d månader',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(e|a)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'e' :
+                (b === 1) ? 'a' :
+                (b === 2) ? 'a' :
+                (b === 3) ? 'e' : 'e';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-  if (typeof version === 'string')
-    version = new SemVer(version, this.loose);
+    return sv;
 
-  for (var i = 0; i < this.set.length; i++) {
-    if (testSet(this.set[i], version))
-      return true;
-  }
-  return false;
-};
+})));
 
-function testSet(set, version) {
-  for (var i = 0; i < set.length; i++) {
-    if (!set[i].test(version))
-      return false;
-  }
 
-  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;
+/***/ }),
+/* 146 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      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;
-      }
-    }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var sw = moment.defineLocale('sw', {
+        months : 'Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba'.split('_'),
+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi'.split('_'),
+        weekdaysShort : 'Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos'.split('_'),
+        weekdaysMin : 'J2_J3_J4_J5_Al_Ij_J1'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[leo saa] LT',
+            nextDay : '[kesho saa] LT',
+            nextWeek : '[wiki ijayo] dddd [saat] LT',
+            lastDay : '[jana] LT',
+            lastWeek : '[wiki iliyopita] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s baadaye',
+            past : 'tokea %s',
+            s : 'hivi punde',
+            ss : 'sekunde %d',
+            m : 'dakika moja',
+            mm : 'dakika %d',
+            h : 'saa limoja',
+            hh : 'masaa %d',
+            d : 'siku moja',
+            dd : 'masiku %d',
+            M : 'mwezi mmoja',
+            MM : 'miezi %d',
+            y : 'mwaka mmoja',
+            yy : 'miaka %d'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-    // Version has a -pre, but it's not one of the ones we like.
-    return false;
-  }
+    return sw;
 
-  return true;
-}
+})));
 
-exports.satisfies = satisfies;
-function satisfies(version, range, loose) {
-  try {
-    range = new Range(range, loose);
-  } catch (er) {
-    return false;
-  }
-  return range.test(version);
-}
 
-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;
-}
+/***/ }),
+/* 147 */
+/***/ (function(module, exports, __webpack_require__) {
 
-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;
-}
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '௧',
+        '2': '௨',
+        '3': '௩',
+        '4': '௪',
+        '5': '௫',
+        '6': '௬',
+        '7': '௭',
+        '8': '௮',
+        '9': '௯',
+        '0': '௦'
+    }, numberMap = {
+        '௧': '1',
+        '௨': '2',
+        '௩': '3',
+        '௪': '4',
+        '௫': '5',
+        '௬': '6',
+        '௭': '7',
+        '௮': '8',
+        '௯': '9',
+        '௦': '0'
+    };
+
+    var ta = moment.defineLocale('ta', {
+        months : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+        monthsShort : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+        weekdays : 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'),
+        weekdaysShort : 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'),
+        weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, HH:mm',
+            LLLL : 'dddd, D MMMM YYYY, HH:mm'
+        },
+        calendar : {
+            sameDay : '[இன்று] LT',
+            nextDay : '[நாளை] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[நேற்று] LT',
+            lastWeek : '[கடந்த வாரம்] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s இல்',
+            past : '%s முன்',
+            s : 'ஒரு சில விநாடிகள்',
+            ss : '%d விநாடிகள்',
+            m : 'ஒரு நிமிடம்',
+            mm : '%d நிமிடங்கள்',
+            h : 'ஒரு மணி நேரம்',
+            hh : '%d மணி நேரம்',
+            d : 'ஒரு நாள்',
+            dd : '%d நாட்கள்',
+            M : 'ஒரு மாதம்',
+            MM : '%d மாதங்கள்',
+            y : 'ஒரு வருடம்',
+            yy : '%d ஆண்டுகள்'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}வது/,
+        ordinal : function (number) {
+            return number + 'வது';
+        },
+        preparse: function (string) {
+            return string.replace(/[௧௨௩௪௫௬௭௮௯௦]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        // refer http://ta.wikipedia.org/s/1er1
+        meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 2) {
+                return ' யாமம்';
+            } else if (hour < 6) {
+                return ' வைகறை';  // வைகறை
+            } else if (hour < 10) {
+                return ' காலை'; // காலை
+            } else if (hour < 14) {
+                return ' நண்பகல்'; // நண்பகல்
+            } else if (hour < 18) {
+                return ' எற்பாடு'; // எற்பாடு
+            } else if (hour < 22) {
+                return ' மாலை'; // மாலை
+            } else {
+                return ' யாமம்';
+            }
+        },
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'யாமம்') {
+                return hour < 2 ? hour : hour + 12;
+            } else if (meridiem === 'வைகறை' || meridiem === 'காலை') {
+                return hour;
+            } else if (meridiem === 'நண்பகல்') {
+                return hour >= 10 ? hour : hour + 12;
+            } else {
+                return hour + 12;
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 6th is the first week of the year.
+        }
+    });
 
-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;
-  }
-}
+    return ta;
 
-// 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);
-}
+})));
 
-// 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);
-}
 
-exports.outside = outside;
-function outside(version, range, hilo, loose) {
-  version = new SemVer(version, loose);
-  range = new Range(range, loose);
+/***/ }),
+/* 148 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  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 ">"');
-  }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var te = moment.defineLocale('te', {
+        months : 'జనవరి_ఫిబ్రవరి_మార్చి_ఏప్రిల్_మే_జూన్_జులై_ఆగస్టు_సెప్టెంబర్_అక్టోబర్_నవంబర్_డిసెంబర్'.split('_'),
+        monthsShort : 'జన._ఫిబ్ర._మార్చి_ఏప్రి._మే_జూన్_జులై_ఆగ._సెప్._అక్టో._నవ._డిసె.'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'ఆదివారం_సోమవారం_మంగళవారం_బుధవారం_గురువారం_శుక్రవారం_శనివారం'.split('_'),
+        weekdaysShort : 'ఆది_సోమ_మంగళ_బుధ_గురు_శుక్ర_శని'.split('_'),
+        weekdaysMin : 'ఆ_సో_మం_బు_గు_శు_శ'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm',
+            LTS : 'A h:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, A h:mm',
+            LLLL : 'dddd, D MMMM YYYY, A h:mm'
+        },
+        calendar : {
+            sameDay : '[నేడు] LT',
+            nextDay : '[రేపు] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[నిన్న] LT',
+            lastWeek : '[గత] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s లో',
+            past : '%s క్రితం',
+            s : 'కొన్ని క్షణాలు',
+            ss : '%d సెకన్లు',
+            m : 'ఒక నిమిషం',
+            mm : '%d నిమిషాలు',
+            h : 'ఒక గంట',
+            hh : '%d గంటలు',
+            d : 'ఒక రోజు',
+            dd : '%d రోజులు',
+            M : 'ఒక నెల',
+            MM : '%d నెలలు',
+            y : 'ఒక సంవత్సరం',
+            yy : '%d సంవత్సరాలు'
+        },
+        dayOfMonthOrdinalParse : /\d{1,2}వ/,
+        ordinal : '%dవ',
+        meridiemParse: /రాత్రి|ఉదయం|మధ్యాహ్నం|సాయంత్రం/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'రాత్రి') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'ఉదయం') {
+                return hour;
+            } else if (meridiem === 'మధ్యాహ్నం') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'సాయంత్రం') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'రాత్రి';
+            } else if (hour < 10) {
+                return 'ఉదయం';
+            } else if (hour < 17) {
+                return 'మధ్యాహ్నం';
+            } else if (hour < 20) {
+                return 'సాయంత్రం';
+            } else {
+                return 'రాత్రి';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 6th is the first week of the year.
+        }
+    });
 
-  // If it satisifes the range it is not outside
-  if (satisfies(version, range, loose)) {
-    return false;
-  }
+    return te;
 
-  // From now on, variable terms are as if we're in "gtr" mode.
-  // but note that everything is flipped for the "ltr" function.
+})));
 
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i];
 
-    var high = null;
-    var low = null;
+/***/ }),
+/* 149 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    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;
-      }
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var tet = moment.defineLocale('tet', {
+        months : 'Janeiru_Fevereiru_Marsu_Abril_Maiu_Juñu_Jullu_Agustu_Setembru_Outubru_Novembru_Dezembru'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+        weekdays : 'Domingu_Segunda_Tersa_Kuarta_Kinta_Sesta_Sabadu'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ters_Kua_Kint_Sest_Sab'.split('_'),
+        weekdaysMin : 'Do_Seg_Te_Ku_Ki_Ses_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Ohin iha] LT',
+            nextDay: '[Aban iha] LT',
+            nextWeek: 'dddd [iha] LT',
+            lastDay: '[Horiseik iha] LT',
+            lastWeek: 'dddd [semana kotuk] [iha] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'iha %s',
+            past : '%s liuba',
+            s : 'minutu balun',
+            ss : 'minutu %d',
+            m : 'minutu ida',
+            mm : 'minutu %d',
+            h : 'oras ida',
+            hh : 'oras %d',
+            d : 'loron ida',
+            dd : 'loron %d',
+            M : 'fulan ida',
+            MM : 'fulan %d',
+            y : 'tinan ida',
+            yy : 'tinan %d'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
     });
 
-    // If the edge version comparator has a operator then our version
-    // isn't outside it
-    if (high.operator === comp || high.operator === ecomp) {
-      return false;
-    }
+    return tet;
 
-    // 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)
-}
+/***/ }),
+/* 150 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var suffixes = {
+        0: '-ум',
+        1: '-ум',
+        2: '-юм',
+        3: '-юм',
+        4: '-ум',
+        5: '-ум',
+        6: '-ум',
+        7: '-ум',
+        8: '-ум',
+        9: '-ум',
+        10: '-ум',
+        12: '-ум',
+        13: '-ум',
+        20: '-ум',
+        30: '-юм',
+        40: '-ум',
+        50: '-ум',
+        60: '-ум',
+        70: '-ум',
+        80: '-ум',
+        90: '-ум',
+        100: '-ум'
+    };
+
+    var tg = moment.defineLocale('tg', {
+        months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),
+        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
+        weekdays : 'якшанбе_душанбе_сешанбе_чоршанбе_панҷшанбе_ҷумъа_шанбе'.split('_'),
+        weekdaysShort : 'яшб_дшб_сшб_чшб_пшб_ҷум_шнб'.split('_'),
+        weekdaysMin : 'яш_дш_сш_чш_пш_ҷм_шб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[Имрӯз соати] LT',
+            nextDay : '[Пагоҳ соати] LT',
+            lastDay : '[Дирӯз соати] LT',
+            nextWeek : 'dddd[и] [ҳафтаи оянда соати] LT',
+            lastWeek : 'dddd[и] [ҳафтаи гузашта соати] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'баъди %s',
+            past : '%s пеш',
+            s : 'якчанд сония',
+            m : 'як дақиқа',
+            mm : '%d дақиқа',
+            h : 'як соат',
+            hh : '%d соат',
+            d : 'як рӯз',
+            dd : '%d рӯз',
+            M : 'як моҳ',
+            MM : '%d моҳ',
+            y : 'як сол',
+            yy : '%d сол'
+        },
+        meridiemParse: /шаб|субҳ|рӯз|бегоҳ/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'шаб') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'субҳ') {
+                return hour;
+            } else if (meridiem === 'рӯз') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'бегоҳ') {
+                return hour + 12;
+            }
+        },
+        meridiem: function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'шаб';
+            } else if (hour < 11) {
+                return 'субҳ';
+            } else if (hour < 16) {
+                return 'рӯз';
+            } else if (hour < 19) {
+                return 'бегоҳ';
+            } else {
+                return 'шаб';
+            }
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(ум|юм)/,
+        ordinal: function (number) {
+            var a = number % 10,
+                b = number >= 100 ? 100 : null;
+            return number + (suffixes[number] || suffixes[a] || suffixes[b]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1th is the first week of the year.
+        }
+    });
+
+    return tg;
+
+})));
 
 
 /***/ }),
-/* 76 */
+/* 151 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var parse = __webpack_require__(77);
-var correct = __webpack_require__(79);
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var th = moment.defineLocale('th', {
+        months : 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'),
+        monthsShort : 'ม.ค._ก.พ._มี.ค._เม.ย._พ.ค._มิ.ย._ก.ค._ส.ค._ก.ย._ต.ค._พ.ย._ธ.ค.'.split('_'),
+        monthsParseExact: true,
+        weekdays : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'),
+        weekdaysShort : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'), // yes, three characters difference
+        weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY เวลา H:mm',
+            LLLL : 'วันddddที่ D MMMM YYYY เวลา H:mm'
+        },
+        meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,
+        isPM: function (input) {
+            return input === 'หลังเที่ยง';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ก่อนเที่ยง';
+            } else {
+                return 'หลังเที่ยง';
+            }
+        },
+        calendar : {
+            sameDay : '[วันนี้ เวลา] LT',
+            nextDay : '[พรุ่งนี้ เวลา] LT',
+            nextWeek : 'dddd[หน้า เวลา] LT',
+            lastDay : '[เมื่อวานนี้ เวลา] LT',
+            lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'อีก %s',
+            past : '%sที่แล้ว',
+            s : 'ไม่กี่วินาที',
+            ss : '%d วินาที',
+            m : '1 นาที',
+            mm : '%d นาที',
+            h : '1 ชั่วโมง',
+            hh : '%d ชั่วโมง',
+            d : '1 วัน',
+            dd : '%d วัน',
+            M : '1 เดือน',
+            MM : '%d เดือน',
+            y : '1 ปี',
+            yy : '%d ปี'
+        }
+    });
 
-var genericWarning = (
-  'license should be ' +
-  'a valid SPDX license expression (without "LicenseRef"), ' +
-  '"UNLICENSED", or ' +
-  '"SEE LICENSE IN <filename>"'
-);
+    return th;
 
-var fileReferenceRE = /^SEE LICEN[CS]E IN (.+)$/;
+})));
 
-function startsWith(prefix, string) {
-  return string.slice(0, prefix.length) === prefix;
-}
 
-function usesLicenseRef(ast) {
-  if (ast.hasOwnProperty('license')) {
-    var license = ast.license;
-    return (
-      startsWith('LicenseRef', license) ||
-      startsWith('DocumentRef', license)
-    );
-  } else {
-    return (
-      usesLicenseRef(ast.left) ||
-      usesLicenseRef(ast.right)
-    );
-  }
-}
+/***/ }),
+/* 152 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = function(argument) {
-  var ast;
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var tlPh = moment.defineLocale('tl-ph', {
+        months : 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'),
+        monthsShort : 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'),
+        weekdays : 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'),
+        weekdaysShort : 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'),
+        weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'MM/D/YYYY',
+            LL : 'MMMM D, YYYY',
+            LLL : 'MMMM D, YYYY HH:mm',
+            LLLL : 'dddd, MMMM DD, YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: 'LT [ngayong araw]',
+            nextDay: '[Bukas ng] LT',
+            nextWeek: 'LT [sa susunod na] dddd',
+            lastDay: 'LT [kahapon]',
+            lastWeek: 'LT [noong nakaraang] dddd',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'sa loob ng %s',
+            past : '%s ang nakalipas',
+            s : 'ilang segundo',
+            ss : '%d segundo',
+            m : 'isang minuto',
+            mm : '%d minuto',
+            h : 'isang oras',
+            hh : '%d oras',
+            d : 'isang araw',
+            dd : '%d araw',
+            M : 'isang buwan',
+            MM : '%d buwan',
+            y : 'isang taon',
+            yy : '%d taon'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}/,
+        ordinal : function (number) {
+            return number;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-  try {
-    ast = parse(argument);
-  } catch (e) {
-    var match
-    if (
-      argument === 'UNLICENSED' ||
-      argument === 'UNLICENCED'
-    ) {
-      return {
-        validForOldPackages: true,
-        validForNewPackages: true,
-        unlicensed: true
-      };
-    } else if (match = fileReferenceRE.exec(argument)) {
-      return {
-        validForOldPackages: true,
-        validForNewPackages: true,
-        inFile: match[1]
-      };
-    } else {
-      var result = {
-        validForOldPackages: false,
-        validForNewPackages: false,
-        warnings: [genericWarning]
-      };
-      var corrected = correct(argument);
-      if (corrected) {
-        result.warnings.push(
-          'license is similar to the valid expression "' + corrected + '"'
-        );
-      }
-      return result;
-    }
-  }
+    return tlPh;
 
-  if (usesLicenseRef(ast)) {
-    return {
-      validForNewPackages: false,
-      validForOldPackages: false,
-      spdx: true,
-      warnings: [genericWarning]
-    };
-  } else {
-    return {
-      validForNewPackages: true,
-      validForOldPackages: true,
-      spdx: true
-    };
-  }
-};
+})));
 
 
 /***/ }),
-/* 77 */
+/* 153 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var parser = __webpack_require__(78).parser
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var numbersNouns = 'pagh_wa’_cha’_wej_loS_vagh_jav_Soch_chorgh_Hut'.split('_');
+
+    function translateFuture(output) {
+        var time = output;
+        time = (output.indexOf('jaj') !== -1) ?
+        time.slice(0, -3) + 'leS' :
+        (output.indexOf('jar') !== -1) ?
+        time.slice(0, -3) + 'waQ' :
+        (output.indexOf('DIS') !== -1) ?
+        time.slice(0, -3) + 'nem' :
+        time + ' pIq';
+        return time;
+    }
+
+    function translatePast(output) {
+        var time = output;
+        time = (output.indexOf('jaj') !== -1) ?
+        time.slice(0, -3) + 'Hu’' :
+        (output.indexOf('jar') !== -1) ?
+        time.slice(0, -3) + 'wen' :
+        (output.indexOf('DIS') !== -1) ?
+        time.slice(0, -3) + 'ben' :
+        time + ' ret';
+        return time;
+    }
+
+    function translate(number, withoutSuffix, string, isFuture) {
+        var numberNoun = numberAsNoun(number);
+        switch (string) {
+            case 'ss':
+                return numberNoun + ' lup';
+            case 'mm':
+                return numberNoun + ' tup';
+            case 'hh':
+                return numberNoun + ' rep';
+            case 'dd':
+                return numberNoun + ' jaj';
+            case 'MM':
+                return numberNoun + ' jar';
+            case 'yy':
+                return numberNoun + ' DIS';
+        }
+    }
+
+    function numberAsNoun(number) {
+        var hundred = Math.floor((number % 1000) / 100),
+        ten = Math.floor((number % 100) / 10),
+        one = number % 10,
+        word = '';
+        if (hundred > 0) {
+            word += numbersNouns[hundred] + 'vatlh';
+        }
+        if (ten > 0) {
+            word += ((word !== '') ? ' ' : '') + numbersNouns[ten] + 'maH';
+        }
+        if (one > 0) {
+            word += ((word !== '') ? ' ' : '') + numbersNouns[one];
+        }
+        return (word === '') ? 'pagh' : word;
+    }
+
+    var tlh = moment.defineLocale('tlh', {
+        months : 'tera’ jar wa’_tera’ jar cha’_tera’ jar wej_tera’ jar loS_tera’ jar vagh_tera’ jar jav_tera’ jar Soch_tera’ jar chorgh_tera’ jar Hut_tera’ jar wa’maH_tera’ jar wa’maH wa’_tera’ jar wa’maH cha’'.split('_'),
+        monthsShort : 'jar wa’_jar cha’_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa’maH_jar wa’maH wa’_jar wa’maH cha’'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
+        weekdaysShort : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
+        weekdaysMin : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[DaHjaj] LT',
+            nextDay: '[wa’leS] LT',
+            nextWeek: 'LLL',
+            lastDay: '[wa’Hu’] LT',
+            lastWeek: 'LLL',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : translateFuture,
+            past : translatePast,
+            s : 'puS lup',
+            ss : translate,
+            m : 'wa’ tup',
+            mm : translate,
+            h : 'wa’ rep',
+            hh : translate,
+            d : 'wa’ jaj',
+            dd : translate,
+            M : 'wa’ jar',
+            MM : translate,
+            y : 'wa’ DIS',
+            yy : translate
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-module.exports = function (argument) {
-  return parser.parse(argument)
-}
+    return tlh;
+
+})));
 
 
 /***/ }),
-/* 78 */
+/* 154 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/* WEBPACK VAR INJECTION */(function(module) {/* parser generated by jison 0.4.17 */
-/*
-  Returns a Parser object of the following structure:
 
-  Parser: {
-    yy: {}
-  }
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+    var suffixes = {
+        1: '\'inci',
+        5: '\'inci',
+        8: '\'inci',
+        70: '\'inci',
+        80: '\'inci',
+        2: '\'nci',
+        7: '\'nci',
+        20: '\'nci',
+        50: '\'nci',
+        3: '\'üncü',
+        4: '\'üncü',
+        100: '\'üncü',
+        6: '\'ncı',
+        9: '\'uncu',
+        10: '\'uncu',
+        30: '\'uncu',
+        60: '\'ıncı',
+        90: '\'ıncı'
+    };
+
+    var tr = moment.defineLocale('tr', {
+        months : 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'),
+        monthsShort : 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'),
+        weekdays : 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'),
+        weekdaysShort : 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),
+        weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[bugün saat] LT',
+            nextDay : '[yarın saat] LT',
+            nextWeek : '[gelecek] dddd [saat] LT',
+            lastDay : '[dün] LT',
+            lastWeek : '[geçen] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s sonra',
+            past : '%s önce',
+            s : 'birkaç saniye',
+            ss : '%d saniye',
+            m : 'bir dakika',
+            mm : '%d dakika',
+            h : 'bir saat',
+            hh : '%d saat',
+            d : 'bir gün',
+            dd : '%d gün',
+            M : 'bir ay',
+            MM : '%d ay',
+            y : 'bir yıl',
+            yy : '%d yıl'
+        },
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'Do':
+                case 'DD':
+                    return number;
+                default:
+                    if (number === 0) {  // special case for zero
+                        return number + '\'ıncı';
+                    }
+                    var a = number % 10,
+                        b = number % 100 - a,
+                        c = number >= 100 ? 100 : null;
+                    return number + (suffixes[a] || suffixes[b] || suffixes[c]);
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
+        }
+    });
 
-  Parser.prototype: {
-    yy: {},
-    trace: function(),
-    symbols_: {associative list: name ==> number},
-    terminals_: {associative list: number ==> name},
-    productions_: [...],
-    performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate, $$, _$),
-    table: [...],
-    defaultActions: {...},
-    parseError: function(str, hash),
-    parse: function(input),
+    return tr;
 
-    lexer: {
-        EOF: 1,
-        parseError: function(str, hash),
-        setInput: function(input),
-        input: function(),
-        unput: function(str),
-        more: function(),
-        less: function(n),
-        pastInput: function(),
-        upcomingInput: function(),
-        showPosition: function(),
-        test_match: function(regex_match_array, rule_index),
-        next: function(),
-        lex: function(),
-        begin: function(condition),
-        popState: function(),
-        _currentRules: function(),
-        topState: function(),
-        pushState: function(condition),
+})));
 
-        options: {
-            ranges: boolean           (optional: true ==> token location info will include a .range[] member)
-            flex: boolean             (optional: true ==> flex-like lexing behaviour where the rules are tested exhaustively to find the longest match)
-            backtrack_lexer: boolean  (optional: true ==> lexer regexes are tested in order and for each matching regex the action code is invoked; the lexer terminates the scan when a token is returned by the action code)
+
+/***/ }),
+/* 155 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    // After the year there should be a slash and the amount of years since December 26, 1979 in Roman numerals.
+    // This is currently too difficult (maybe even impossible) to add.
+    var tzl = moment.defineLocale('tzl', {
+        months : 'Januar_Fevraglh_Març_Avrïu_Mai_Gün_Julia_Guscht_Setemvar_Listopäts_Noemvar_Zecemvar'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Avr_Mai_Gün_Jul_Gus_Set_Lis_Noe_Zec'.split('_'),
+        weekdays : 'Súladi_Lúneçi_Maitzi_Márcuri_Xhúadi_Viénerçi_Sáturi'.split('_'),
+        weekdaysShort : 'Súl_Lún_Mai_Már_Xhú_Vié_Sát'.split('_'),
+        weekdaysMin : 'Sú_Lú_Ma_Má_Xh_Vi_Sá'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM [dallas] YYYY',
+            LLL : 'D. MMMM [dallas] YYYY HH.mm',
+            LLLL : 'dddd, [li] D. MMMM [dallas] YYYY HH.mm'
+        },
+        meridiemParse: /d\'o|d\'a/i,
+        isPM : function (input) {
+            return 'd\'o' === input.toLowerCase();
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'd\'o' : 'D\'O';
+            } else {
+                return isLower ? 'd\'a' : 'D\'A';
+            }
+        },
+        calendar : {
+            sameDay : '[oxhi à] LT',
+            nextDay : '[demà à] LT',
+            nextWeek : 'dddd [à] LT',
+            lastDay : '[ieiri à] LT',
+            lastWeek : '[sür el] dddd [lasteu à] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'osprei %s',
+            past : 'ja%s',
+            s : processRelativeTime,
+            ss : processRelativeTime,
+            m : processRelativeTime,
+            mm : processRelativeTime,
+            h : processRelativeTime,
+            hh : processRelativeTime,
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
         },
+        dayOfMonthOrdinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-        performAction: function(yy, yy_, $avoiding_name_collisions, YY_START),
-        rules: [...],
-        conditions: {associative list: name ==> set},
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            's': ['viensas secunds', '\'iensas secunds'],
+            'ss': [number + ' secunds', '' + number + ' secunds'],
+            'm': ['\'n míut', '\'iens míut'],
+            'mm': [number + ' míuts', '' + number + ' míuts'],
+            'h': ['\'n þora', '\'iensa þora'],
+            'hh': [number + ' þoras', '' + number + ' þoras'],
+            'd': ['\'n ziua', '\'iensa ziua'],
+            'dd': [number + ' ziuas', '' + number + ' ziuas'],
+            'M': ['\'n mes', '\'iens mes'],
+            'MM': [number + ' mesen', '' + number + ' mesen'],
+            'y': ['\'n ar', '\'iens ar'],
+            'yy': [number + ' ars', '' + number + ' ars']
+        };
+        return isFuture ? format[key][0] : (withoutSuffix ? format[key][0] : format[key][1]);
     }
-  }
 
+    return tzl;
 
-  token location info (@$, _$, etc.): {
-    first_line: n,
-    last_line: n,
-    first_column: n,
-    last_column: n,
-    range: [start_number, end_number]       (where the numbers are indexes into the input string, regular zero-based)
-  }
+})));
 
 
-  the parseError function receives a 'hash' object with these members for lexer and parser errors: {
-    text:        (matched text)
-    token:       (the produced terminal token, if any)
-    line:        (yylineno)
-  }
-  while parser (grammar) errors will also provide these members, i.e. parser errors deliver a superset of attributes: {
-    loc:         (yylloc)
-    expected:    (string describing the set of expected tokens)
-    recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error)
-  }
-*/
-var spdxparse = (function(){
-var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,5],$V1=[1,6],$V2=[1,7],$V3=[1,4],$V4=[1,9],$V5=[1,10],$V6=[5,14,15,17],$V7=[5,12,14,15,17];
-var parser = {trace: function trace() { },
-yy: {},
-symbols_: {"error":2,"start":3,"expression":4,"EOS":5,"simpleExpression":6,"LICENSE":7,"PLUS":8,"LICENSEREF":9,"DOCUMENTREF":10,"COLON":11,"WITH":12,"EXCEPTION":13,"AND":14,"OR":15,"OPEN":16,"CLOSE":17,"$accept":0,"$end":1},
-terminals_: {2:"error",5:"EOS",7:"LICENSE",8:"PLUS",9:"LICENSEREF",10:"DOCUMENTREF",11:"COLON",12:"WITH",13:"EXCEPTION",14:"AND",15:"OR",16:"OPEN",17:"CLOSE"},
-productions_: [0,[3,2],[6,1],[6,2],[6,1],[6,3],[4,1],[4,3],[4,3],[4,3],[4,3]],
-performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
-/* this == yyval */
+/***/ }),
+/* 156 */
+/***/ (function(module, exports, __webpack_require__) {
 
-var $0 = $$.length - 1;
-switch (yystate) {
-case 1:
-return this.$ = $$[$0-1]
-break;
-case 2: case 4: case 5:
-this.$ = {license: yytext}
-break;
-case 3:
-this.$ = {license: $$[$0-1], plus: true}
-break;
-case 6:
-this.$ = $$[$0]
-break;
-case 7:
-this.$ = {exception: $$[$0]}
-this.$.license = $$[$0-2].license
-if ($$[$0-2].hasOwnProperty('plus')) {
-  this.$.plus = $$[$0-2].plus
-}
-break;
-case 8:
-this.$ = {conjunction: 'and', left: $$[$0-2], right: $$[$0]}
-break;
-case 9:
-this.$ = {conjunction: 'or', left: $$[$0-2], right: $$[$0]}
-break;
-case 10:
-this.$ = $$[$0-1]
-break;
-}
-},
-table: [{3:1,4:2,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{1:[3]},{5:[1,8],14:$V4,15:$V5},o($V6,[2,6],{12:[1,11]}),{4:12,6:3,7:$V0,9:$V1,10:$V2,16:$V3},o($V7,[2,2],{8:[1,13]}),o($V7,[2,4]),{11:[1,14]},{1:[2,1]},{4:15,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{4:16,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{13:[1,17]},{14:$V4,15:$V5,17:[1,18]},o($V7,[2,3]),{9:[1,19]},o($V6,[2,8]),o([5,15,17],[2,9],{14:$V4}),o($V6,[2,7]),o($V6,[2,10]),o($V7,[2,5])],
-defaultActions: {8:[2,1]},
-parseError: function parseError(str, hash) {
-    if (hash.recoverable) {
-        this.trace(str);
-    } else {
-        function _parseError (msg, hash) {
-            this.message = msg;
-            this.hash = hash;
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var tzm = moment.defineLocale('tzm', {
+        months : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+        monthsShort : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+        weekdays : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        weekdaysShort : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[ⴰⵙⴷⵅ ⴴ] LT',
+            nextDay: '[ⴰⵙⴽⴰ ⴴ] LT',
+            nextWeek: 'dddd [ⴴ] LT',
+            lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT',
+            lastWeek: 'dddd [ⴴ] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s',
+            past : 'ⵢⴰⵏ %s',
+            s : 'ⵉⵎⵉⴽ',
+            ss : '%d ⵉⵎⵉⴽ',
+            m : 'ⵎⵉⵏⵓⴺ',
+            mm : '%d ⵎⵉⵏⵓⴺ',
+            h : 'ⵙⴰⵄⴰ',
+            hh : '%d ⵜⴰⵙⵙⴰⵄⵉⵏ',
+            d : 'ⴰⵙⵙ',
+            dd : '%d oⵙⵙⴰⵏ',
+            M : 'ⴰⵢoⵓⵔ',
+            MM : '%d ⵉⵢⵢⵉⵔⵏ',
+            y : 'ⴰⵙⴳⴰⵙ',
+            yy : '%d ⵉⵙⴳⴰⵙⵏ'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 12th is the first week of the year.
         }
-        _parseError.prototype = Error;
+    });
 
-        throw new _parseError(str, hash);
-    }
-},
-parse: function parse(input) {
-    var self = this, stack = [0], tstack = [], vstack = [null], lstack = [], table = this.table, yytext = '', yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
-    var args = lstack.slice.call(arguments, 1);
-    var lexer = Object.create(this.lexer);
-    var sharedState = { yy: {} };
-    for (var k in this.yy) {
-        if (Object.prototype.hasOwnProperty.call(this.yy, k)) {
-            sharedState.yy[k] = this.yy[k];
+    return tzm;
+
+})));
+
+
+/***/ }),
+/* 157 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var tzmLatn = moment.defineLocale('tzm-latn', {
+        months : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+        monthsShort : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+        weekdays : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        weekdaysShort : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[asdkh g] LT',
+            nextDay: '[aska g] LT',
+            nextWeek: 'dddd [g] LT',
+            lastDay: '[assant g] LT',
+            lastWeek: 'dddd [g] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dadkh s yan %s',
+            past : 'yan %s',
+            s : 'imik',
+            ss : '%d imik',
+            m : 'minuḍ',
+            mm : '%d minuḍ',
+            h : 'saɛa',
+            hh : '%d tassaɛin',
+            d : 'ass',
+            dd : '%d ossan',
+            M : 'ayowr',
+            MM : '%d iyyirn',
+            y : 'asgas',
+            yy : '%d isgasn'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 12th is the first week of the year.
         }
+    });
+
+    return tzmLatn;
+
+})));
+
+
+/***/ }),
+/* 158 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js language configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var ugCn = moment.defineLocale('ug-cn', {
+        months: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split(
+            '_'
+        ),
+        monthsShort: 'يانۋار_فېۋرال_مارت_ئاپرېل_ماي_ئىيۇن_ئىيۇل_ئاۋغۇست_سېنتەبىر_ئۆكتەبىر_نويابىر_دېكابىر'.split(
+            '_'
+        ),
+        weekdays: 'يەكشەنبە_دۈشەنبە_سەيشەنبە_چارشەنبە_پەيشەنبە_جۈمە_شەنبە'.split(
+            '_'
+        ),
+        weekdaysShort: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),
+        weekdaysMin: 'يە_دۈ_سە_چا_پە_جۈ_شە'.split('_'),
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'YYYY-MM-DD',
+            LL: 'YYYY-يىلىM-ئاينىڭD-كۈنى',
+            LLL: 'YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm',
+            LLLL: 'dddd، YYYY-يىلىM-ئاينىڭD-كۈنى، HH:mm'
+        },
+        meridiemParse: /يېرىم كېچە|سەھەر|چۈشتىن بۇرۇن|چۈش|چۈشتىن كېيىن|كەچ/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (
+                meridiem === 'يېرىم كېچە' ||
+                meridiem === 'سەھەر' ||
+                meridiem === 'چۈشتىن بۇرۇن'
+            ) {
+                return hour;
+            } else if (meridiem === 'چۈشتىن كېيىن' || meridiem === 'كەچ') {
+                return hour + 12;
+            } else {
+                return hour >= 11 ? hour : hour + 12;
+            }
+        },
+        meridiem: function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return 'يېرىم كېچە';
+            } else if (hm < 900) {
+                return 'سەھەر';
+            } else if (hm < 1130) {
+                return 'چۈشتىن بۇرۇن';
+            } else if (hm < 1230) {
+                return 'چۈش';
+            } else if (hm < 1800) {
+                return 'چۈشتىن كېيىن';
+            } else {
+                return 'كەچ';
+            }
+        },
+        calendar: {
+            sameDay: '[بۈگۈن سائەت] LT',
+            nextDay: '[ئەتە سائەت] LT',
+            nextWeek: '[كېلەركى] dddd [سائەت] LT',
+            lastDay: '[تۆنۈگۈن] LT',
+            lastWeek: '[ئالدىنقى] dddd [سائەت] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: '%s كېيىن',
+            past: '%s بۇرۇن',
+            s: 'نەچچە سېكونت',
+            ss: '%d سېكونت',
+            m: 'بىر مىنۇت',
+            mm: '%d مىنۇت',
+            h: 'بىر سائەت',
+            hh: '%d سائەت',
+            d: 'بىر كۈن',
+            dd: '%d كۈن',
+            M: 'بىر ئاي',
+            MM: '%d ئاي',
+            y: 'بىر يىل',
+            yy: '%d يىل'
+        },
+
+        dayOfMonthOrdinalParse: /\d{1,2}(-كۈنى|-ئاي|-ھەپتە)/,
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'DDD':
+                    return number + '-كۈنى';
+                case 'w':
+                case 'W':
+                    return number + '-ھەپتە';
+                default:
+                    return number;
+            }
+        },
+        preparse: function (string) {
+            return string.replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/,/g, '،');
+        },
+        week: {
+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+            dow: 1, // Monday is the first day of the week.
+            doy: 7 // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return ugCn;
+
+})));
+
+
+/***/ }),
+/* 159 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    function plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
     }
-    lexer.setInput(input, sharedState.yy);
-    sharedState.yy.lexer = lexer;
-    sharedState.yy.parser = this;
-    if (typeof lexer.yylloc == 'undefined') {
-        lexer.yylloc = {};
-    }
-    var yyloc = lexer.yylloc;
-    lstack.push(yyloc);
-    var ranges = lexer.options && lexer.options.ranges;
-    if (typeof sharedState.yy.parseError === 'function') {
-        this.parseError = sharedState.yy.parseError;
-    } else {
-        this.parseError = Object.getPrototypeOf(this).parseError;
-    }
-    function popStack(n) {
-        stack.length = stack.length - 2 * n;
-        vstack.length = vstack.length - n;
-        lstack.length = lstack.length - n;
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'ss': withoutSuffix ? 'секунда_секунди_секунд' : 'секунду_секунди_секунд',
+            'mm': withoutSuffix ? 'хвилина_хвилини_хвилин' : 'хвилину_хвилини_хвилин',
+            'hh': withoutSuffix ? 'година_години_годин' : 'годину_години_годин',
+            'dd': 'день_дні_днів',
+            'MM': 'місяць_місяці_місяців',
+            'yy': 'рік_роки_років'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'хвилина' : 'хвилину';
+        }
+        else if (key === 'h') {
+            return withoutSuffix ? 'година' : 'годину';
+        }
+        else {
+            return number + ' ' + plural(format[key], +number);
+        }
     }
-    _token_stack:
-        var lex = function () {
-            var token;
-            token = lexer.lex() || EOF;
-            if (typeof token !== 'number') {
-                token = self.symbols_[token] || token;
-            }
-            return token;
+    function weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'),
+            'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'),
+            'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_')
         };
-    var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
-    while (true) {
-        state = stack[stack.length - 1];
-        if (this.defaultActions[state]) {
-            action = this.defaultActions[state];
-        } else {
-            if (symbol === null || typeof symbol == 'undefined') {
-                symbol = lex();
-            }
-            action = table[state] && table[state][symbol];
+
+        if (m === true) {
+            return weekdays['nominative'].slice(1, 7).concat(weekdays['nominative'].slice(0, 1));
         }
-                    if (typeof action === 'undefined' || !action.length || !action[0]) {
-                var errStr = '';
-                expected = [];
-                for (p in table[state]) {
-                    if (this.terminals_[p] && p > TERROR) {
-                        expected.push('\'' + this.terminals_[p] + '\'');
-                    }
-                }
-                if (lexer.showPosition) {
-                    errStr = 'Parse error on line ' + (yylineno + 1) + ':\n' + lexer.showPosition() + '\nExpecting ' + expected.join(', ') + ', got \'' + (this.terminals_[symbol] || symbol) + '\'';
-                } else {
-                    errStr = 'Parse error on line ' + (yylineno + 1) + ': Unexpected ' + (symbol == EOF ? 'end of input' : '\'' + (this.terminals_[symbol] || symbol) + '\'');
-                }
-                this.parseError(errStr, {
-                    text: lexer.match,
-                    token: this.terminals_[symbol] || symbol,
-                    line: lexer.yylineno,
-                    loc: yyloc,
-                    expected: expected
-                });
-            }
-        if (action[0] instanceof Array && action.length > 1) {
-            throw new Error('Parse Error: multiple actions possible at state: ' + state + ', token: ' + symbol);
+        if (!m) {
+            return weekdays['nominative'];
         }
-        switch (action[0]) {
-        case 1:
-            stack.push(symbol);
-            vstack.push(lexer.yytext);
-            lstack.push(lexer.yylloc);
-            stack.push(action[1]);
-            symbol = null;
-            if (!preErrorSymbol) {
-                yyleng = lexer.yyleng;
-                yytext = lexer.yytext;
-                yylineno = lexer.yylineno;
-                yyloc = lexer.yylloc;
-                if (recovering > 0) {
-                    recovering--;
+
+        var nounCase = (/(\[[ВвУу]\]) ?dddd/).test(format) ?
+            'accusative' :
+            ((/\[?(?:минулої|наступної)? ?\] ?dddd/).test(format) ?
+                'genitive' :
+                'nominative');
+        return weekdays[nounCase][m.day()];
+    }
+    function processHoursFunction(str) {
+        return function () {
+            return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT';
+        };
+    }
+
+    var uk = moment.defineLocale('uk', {
+        months : {
+            'format': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_'),
+            'standalone': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_')
+        },
+        monthsShort : 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'),
+        weekdays : weekdaysCaseReplace,
+        weekdaysShort : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY р.',
+            LLL : 'D MMMM YYYY р., HH:mm',
+            LLLL : 'dddd, D MMMM YYYY р., HH:mm'
+        },
+        calendar : {
+            sameDay: processHoursFunction('[Сьогодні '),
+            nextDay: processHoursFunction('[Завтра '),
+            lastDay: processHoursFunction('[Вчора '),
+            nextWeek: processHoursFunction('[У] dddd ['),
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                    case 3:
+                    case 5:
+                    case 6:
+                        return processHoursFunction('[Минулої] dddd [').call(this);
+                    case 1:
+                    case 2:
+                    case 4:
+                        return processHoursFunction('[Минулого] dddd [').call(this);
                 }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'за %s',
+            past : '%s тому',
+            s : 'декілька секунд',
+            ss : relativeTimeWithPlural,
+            m : relativeTimeWithPlural,
+            mm : relativeTimeWithPlural,
+            h : 'годину',
+            hh : relativeTimeWithPlural,
+            d : 'день',
+            dd : relativeTimeWithPlural,
+            M : 'місяць',
+            MM : relativeTimeWithPlural,
+            y : 'рік',
+            yy : relativeTimeWithPlural
+        },
+        // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason
+        meridiemParse: /ночі|ранку|дня|вечора/,
+        isPM: function (input) {
+            return /^(дня|вечора)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночі';
+            } else if (hour < 12) {
+                return 'ранку';
+            } else if (hour < 17) {
+                return 'дня';
             } else {
-                symbol = preErrorSymbol;
-                preErrorSymbol = null;
-            }
-            break;
-        case 2:
-            len = this.productions_[action[1]][1];
-            yyval.$ = vstack[vstack.length - len];
-            yyval._$ = {
-                first_line: lstack[lstack.length - (len || 1)].first_line,
-                last_line: lstack[lstack.length - 1].last_line,
-                first_column: lstack[lstack.length - (len || 1)].first_column,
-                last_column: lstack[lstack.length - 1].last_column
-            };
-            if (ranges) {
-                yyval._$.range = [
-                    lstack[lstack.length - (len || 1)].range[0],
-                    lstack[lstack.length - 1].range[1]
-                ];
-            }
-            r = this.performAction.apply(yyval, [
-                yytext,
-                yyleng,
-                yylineno,
-                sharedState.yy,
-                action[1],
-                vstack,
-                lstack
-            ].concat(args));
-            if (typeof r !== 'undefined') {
-                return r;
+                return 'вечора';
             }
-            if (len) {
-                stack = stack.slice(0, -1 * len * 2);
-                vstack = vstack.slice(0, -1 * len);
-                lstack = lstack.slice(0, -1 * len);
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}-(й|го)/,
+        ordinal: function (number, period) {
+            switch (period) {
+                case 'M':
+                case 'd':
+                case 'DDD':
+                case 'w':
+                case 'W':
+                    return number + '-й';
+                case 'D':
+                    return number + '-го';
+                default:
+                    return number;
             }
-            stack.push(this.productions_[action[1]][0]);
-            vstack.push(yyval.$);
-            lstack.push(yyval._$);
-            newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
-            stack.push(newState);
-            break;
-        case 3:
-            return true;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
         }
-    }
-    return true;
-}};
-/* generated by jison-lex 0.3.4 */
-var lexer = (function(){
-var lexer = ({
+    });
 
-EOF:1,
+    return uk;
 
-parseError:function parseError(str, hash) {
-        if (this.yy.parser) {
-            this.yy.parser.parseError(str, hash);
-        } else {
-            throw new Error(str);
-        }
-    },
+})));
 
-// resets the lexer, sets new input
-setInput:function (input, yy) {
-        this.yy = yy || this.yy || {};
-        this._input = input;
-        this._more = this._backtrack = this.done = false;
-        this.yylineno = this.yyleng = 0;
-        this.yytext = this.matched = this.match = '';
-        this.conditionStack = ['INITIAL'];
-        this.yylloc = {
-            first_line: 1,
-            first_column: 0,
-            last_line: 1,
-            last_column: 0
-        };
-        if (this.options.ranges) {
-            this.yylloc.range = [0,0];
-        }
-        this.offset = 0;
-        return this;
-    },
 
-// consumes and returns one char from the input
-input:function () {
-        var ch = this._input[0];
-        this.yytext += ch;
-        this.yyleng++;
-        this.offset++;
-        this.match += ch;
-        this.matched += ch;
-        var lines = ch.match(/(?:\r\n?|\n).*/g);
-        if (lines) {
-            this.yylineno++;
-            this.yylloc.last_line++;
-        } else {
-            this.yylloc.last_column++;
+/***/ }),
+/* 160 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var months = [
+        'جنوری',
+        'فروری',
+        'مارچ',
+        'اپریل',
+        'مئی',
+        'جون',
+        'جولائی',
+        'اگست',
+        'ستمبر',
+        'اکتوبر',
+        'نومبر',
+        'دسمبر'
+    ];
+    var days = [
+        'اتوار',
+        'پیر',
+        'منگل',
+        'بدھ',
+        'جمعرات',
+        'جمعہ',
+        'ہفتہ'
+    ];
+
+    var ur = moment.defineLocale('ur', {
+        months : months,
+        monthsShort : months,
+        weekdays : days,
+        weekdaysShort : days,
+        weekdaysMin : days,
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd، D MMMM YYYY HH:mm'
+        },
+        meridiemParse: /صبح|شام/,
+        isPM : function (input) {
+            return 'شام' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'صبح';
+            }
+            return 'شام';
+        },
+        calendar : {
+            sameDay : '[آج بوقت] LT',
+            nextDay : '[کل بوقت] LT',
+            nextWeek : 'dddd [بوقت] LT',
+            lastDay : '[گذشتہ روز بوقت] LT',
+            lastWeek : '[گذشتہ] dddd [بوقت] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s بعد',
+            past : '%s قبل',
+            s : 'چند سیکنڈ',
+            ss : '%d سیکنڈ',
+            m : 'ایک منٹ',
+            mm : '%d منٹ',
+            h : 'ایک گھنٹہ',
+            hh : '%d گھنٹے',
+            d : 'ایک دن',
+            dd : '%d دن',
+            M : 'ایک ماہ',
+            MM : '%d ماہ',
+            y : 'ایک سال',
+            yy : '%d سال'
+        },
+        preparse: function (string) {
+            return string.replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/,/g, '،');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-        if (this.options.ranges) {
-            this.yylloc.range[1]++;
+    });
+
+    return ur;
+
+})));
+
+
+/***/ }),
+/* 161 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var uz = moment.defineLocale('uz', {
+        months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'),
+        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
+        weekdays : 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'),
+        weekdaysShort : 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'),
+        weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'D MMMM YYYY, dddd HH:mm'
+        },
+        calendar : {
+            sameDay : '[Бугун соат] LT [да]',
+            nextDay : '[Эртага] LT [да]',
+            nextWeek : 'dddd [куни соат] LT [да]',
+            lastDay : '[Кеча соат] LT [да]',
+            lastWeek : '[Утган] dddd [куни соат] LT [да]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'Якин %s ичида',
+            past : 'Бир неча %s олдин',
+            s : 'фурсат',
+            ss : '%d фурсат',
+            m : 'бир дакика',
+            mm : '%d дакика',
+            h : 'бир соат',
+            hh : '%d соат',
+            d : 'бир кун',
+            dd : '%d кун',
+            M : 'бир ой',
+            MM : '%d ой',
+            y : 'бир йил',
+            yy : '%d йил'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 4th is the first week of the year.
         }
+    });
 
-        this._input = this._input.slice(1);
-        return ch;
-    },
+    return uz;
 
-// unshifts one char (or a string) into the input
-unput:function (ch) {
-        var len = ch.length;
-        var lines = ch.split(/(?:\r\n?|\n)/g);
+})));
 
-        this._input = ch + this._input;
-        this.yytext = this.yytext.substr(0, this.yytext.length - len);
-        //this.yyleng -= len;
-        this.offset -= len;
-        var oldLines = this.match.split(/(?:\r\n?|\n)/g);
-        this.match = this.match.substr(0, this.match.length - 1);
-        this.matched = this.matched.substr(0, this.matched.length - 1);
 
-        if (lines.length - 1) {
-            this.yylineno -= lines.length - 1;
+/***/ }),
+/* 162 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var uzLatn = moment.defineLocale('uz-latn', {
+        months : 'Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr'.split('_'),
+        monthsShort : 'Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek'.split('_'),
+        weekdays : 'Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba'.split('_'),
+        weekdaysShort : 'Yak_Dush_Sesh_Chor_Pay_Jum_Shan'.split('_'),
+        weekdaysMin : 'Ya_Du_Se_Cho_Pa_Ju_Sha'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'D MMMM YYYY, dddd HH:mm'
+        },
+        calendar : {
+            sameDay : '[Bugun soat] LT [da]',
+            nextDay : '[Ertaga] LT [da]',
+            nextWeek : 'dddd [kuni soat] LT [da]',
+            lastDay : '[Kecha soat] LT [da]',
+            lastWeek : '[O\'tgan] dddd [kuni soat] LT [da]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'Yaqin %s ichida',
+            past : 'Bir necha %s oldin',
+            s : 'soniya',
+            ss : '%d soniya',
+            m : 'bir daqiqa',
+            mm : '%d daqiqa',
+            h : 'bir soat',
+            hh : '%d soat',
+            d : 'bir kun',
+            dd : '%d kun',
+            M : 'bir oy',
+            MM : '%d oy',
+            y : 'bir yil',
+            yy : '%d yil'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 7th is the first week of the year.
         }
-        var r = this.yylloc.range;
+    });
 
-        this.yylloc = {
-            first_line: this.yylloc.first_line,
-            last_line: this.yylineno + 1,
-            first_column: this.yylloc.first_column,
-            last_column: lines ?
-                (lines.length === oldLines.length ? this.yylloc.first_column : 0)
-                 + oldLines[oldLines.length - lines.length].length - lines[0].length :
-              this.yylloc.first_column - len
-        };
+    return uzLatn;
 
-        if (this.options.ranges) {
-            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
+})));
+
+
+/***/ }),
+/* 163 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var vi = moment.defineLocale('vi', {
+        months : 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'),
+        monthsShort : 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'),
+        weekdaysShort : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+        weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+        weekdaysParseExact : true,
+        meridiemParse: /sa|ch/i,
+        isPM : function (input) {
+            return /^ch$/i.test(input);
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower ? 'sa' : 'SA';
+            } else {
+                return isLower ? 'ch' : 'CH';
+            }
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM [năm] YYYY',
+            LLL : 'D MMMM [năm] YYYY HH:mm',
+            LLLL : 'dddd, D MMMM [năm] YYYY HH:mm',
+            l : 'DD/M/YYYY',
+            ll : 'D MMM YYYY',
+            lll : 'D MMM YYYY HH:mm',
+            llll : 'ddd, D MMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Hôm nay lúc] LT',
+            nextDay: '[Ngày mai lúc] LT',
+            nextWeek: 'dddd [tuần tới lúc] LT',
+            lastDay: '[Hôm qua lúc] LT',
+            lastWeek: 'dddd [tuần rồi lúc] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s tới',
+            past : '%s trước',
+            s : 'vài giây',
+            ss : '%d giây' ,
+            m : 'một phút',
+            mm : '%d phút',
+            h : 'một giờ',
+            hh : '%d giờ',
+            d : 'một ngày',
+            dd : '%d ngày',
+            M : 'một tháng',
+            MM : '%d tháng',
+            y : 'một năm',
+            yy : '%d năm'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}/,
+        ordinal : function (number) {
+            return number;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-        this.yyleng = this.yytext.length;
-        return this;
-    },
+    });
 
-// When called from action, caches matched text and appends it on next action
-more:function () {
-        this._more = true;
-        return this;
-    },
+    return vi;
 
-// When called from action, signals the lexer that this rule fails to match the input, so the next matching rule (regex) should be tested instead.
-reject:function () {
-        if (this.options.backtrack_lexer) {
-            this._backtrack = true;
-        } else {
-            return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true).\n' + this.showPosition(), {
-                text: "",
-                token: null,
-                line: this.yylineno
-            });
+})));
+
+
+/***/ }),
+/* 164 */
+/***/ (function(module, exports, __webpack_require__) {
 
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var xPseudo = moment.defineLocale('x-pseudo', {
+        months : 'J~áñúá~rý_F~ébrú~árý_~Márc~h_Áp~ríl_~Máý_~Júñé~_Júl~ý_Áú~gúst~_Sép~témb~ér_Ó~ctób~ér_Ñ~óvém~bér_~Décé~mbér'.split('_'),
+        monthsShort : 'J~áñ_~Féb_~Már_~Ápr_~Máý_~Júñ_~Júl_~Áúg_~Sép_~Óct_~Ñóv_~Déc'.split('_'),
+        monthsParseExact : true,
+        weekdays : 'S~úñdá~ý_Mó~ñdáý~_Túé~sdáý~_Wéd~ñésd~áý_T~húrs~dáý_~Fríd~áý_S~átúr~dáý'.split('_'),
+        weekdaysShort : 'S~úñ_~Móñ_~Túé_~Wéd_~Thú_~Frí_~Sát'.split('_'),
+        weekdaysMin : 'S~ú_Mó~_Tú_~Wé_T~h_Fr~_Sá'.split('_'),
+        weekdaysParseExact : true,
+        longDateFormat : {
+            LT : 'HH:mm',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[T~ódá~ý át] LT',
+            nextDay : '[T~ómó~rró~w át] LT',
+            nextWeek : 'dddd [át] LT',
+            lastDay : '[Ý~ést~érdá~ý át] LT',
+            lastWeek : '[L~ást] dddd [át] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'í~ñ %s',
+            past : '%s á~gó',
+            s : 'á ~féw ~sécó~ñds',
+            ss : '%d s~écóñ~ds',
+            m : 'á ~míñ~úté',
+            mm : '%d m~íñú~tés',
+            h : 'á~ñ hó~úr',
+            hh : '%d h~óúrs',
+            d : 'á ~dáý',
+            dd : '%d d~áýs',
+            M : 'á ~móñ~th',
+            MM : '%d m~óñt~hs',
+            y : 'á ~ýéár',
+            yy : '%d ý~éárs'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-        return this;
-    },
+    });
 
-// retain first n characters of the match
-less:function (n) {
-        this.unput(this.match.slice(n));
-    },
+    return xPseudo;
 
-// displays already matched input, i.e. for error messages
-pastInput:function () {
-        var past = this.matched.substr(0, this.matched.length - this.match.length);
-        return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
-    },
+})));
 
-// displays upcoming input, i.e. for error messages
-upcomingInput:function () {
-        var next = this.match;
-        if (next.length < 20) {
-            next += this._input.substr(0, 20-next.length);
+
+/***/ }),
+/* 165 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var yo = moment.defineLocale('yo', {
+        months : 'Sẹ́rẹ́_Èrèlè_Ẹrẹ̀nà_Ìgbé_Èbibi_Òkùdu_Agẹmo_Ògún_Owewe_Ọ̀wàrà_Bélú_Ọ̀pẹ̀̀'.split('_'),
+        monthsShort : 'Sẹ́r_Èrl_Ẹrn_Ìgb_Èbi_Òkù_Agẹ_Ògú_Owe_Ọ̀wà_Bél_Ọ̀pẹ̀̀'.split('_'),
+        weekdays : 'Àìkú_Ajé_Ìsẹ́gun_Ọjọ́rú_Ọjọ́bọ_Ẹtì_Àbámẹ́ta'.split('_'),
+        weekdaysShort : 'Àìk_Ajé_Ìsẹ́_Ọjr_Ọjb_Ẹtì_Àbá'.split('_'),
+        weekdaysMin : 'Àì_Aj_Ìs_Ọr_Ọb_Ẹt_Àb'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY h:mm A',
+            LLLL : 'dddd, D MMMM YYYY h:mm A'
+        },
+        calendar : {
+            sameDay : '[Ònì ni] LT',
+            nextDay : '[Ọ̀la ni] LT',
+            nextWeek : 'dddd [Ọsẹ̀ tón\'bọ] [ni] LT',
+            lastDay : '[Àna ni] LT',
+            lastWeek : 'dddd [Ọsẹ̀ tólọ́] [ni] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'ní %s',
+            past : '%s kọjá',
+            s : 'ìsẹjú aayá die',
+            ss :'aayá %d',
+            m : 'ìsẹjú kan',
+            mm : 'ìsẹjú %d',
+            h : 'wákati kan',
+            hh : 'wákati %d',
+            d : 'ọjọ́ kan',
+            dd : 'ọjọ́ %d',
+            M : 'osù kan',
+            MM : 'osù %d',
+            y : 'ọdún kan',
+            yy : 'ọdún %d'
+        },
+        dayOfMonthOrdinalParse : /ọjọ́\s\d{1,2}/,
+        ordinal : 'ọjọ́ %d',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4 // The week that contains Jan 4th is the first week of the year.
         }
-        return (next.substr(0,20) + (next.length > 20 ? '...' : '')).replace(/\n/g, "");
-    },
+    });
 
-// displays the character position where the lexing error occurred, i.e. for error messages
-showPosition:function () {
-        var pre = this.pastInput();
-        var c = new Array(pre.length + 1).join("-");
-        return pre + this.upcomingInput() + "\n" + c + "^";
-    },
+    return yo;
 
-// test the lexed token: return FALSE when not a match, otherwise return token
-test_match:function (match, indexed_rule) {
-        var token,
-            lines,
-            backup;
+})));
 
-        if (this.options.backtrack_lexer) {
-            // save context
-            backup = {
-                yylineno: this.yylineno,
-                yylloc: {
-                    first_line: this.yylloc.first_line,
-                    last_line: this.last_line,
-                    first_column: this.yylloc.first_column,
-                    last_column: this.yylloc.last_column
-                },
-                yytext: this.yytext,
-                match: this.match,
-                matches: this.matches,
-                matched: this.matched,
-                yyleng: this.yyleng,
-                offset: this.offset,
-                _more: this._more,
-                _input: this._input,
-                yy: this.yy,
-                conditionStack: this.conditionStack.slice(0),
-                done: this.done
-            };
-            if (this.options.ranges) {
-                backup.yylloc.range = this.yylloc.range.slice(0);
+
+/***/ }),
+/* 166 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var zhCn = moment.defineLocale('zh-cn', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY年M月D日',
+            LLL : 'YYYY年M月D日Ah点mm分',
+            LLLL : 'YYYY年M月D日ddddAh点mm分',
+            l : 'YYYY/M/D',
+            ll : 'YYYY年M月D日',
+            lll : 'YYYY年M月D日 HH:mm',
+            llll : 'YYYY年M月D日dddd HH:mm'
+        },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
             }
+            if (meridiem === '凌晨' || meridiem === '早上' ||
+                    meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            } else {
+                // '中午'
+                return hour >= 11 ? hour : hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return '凌晨';
+            } else if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : '[今天]LT',
+            nextDay : '[明天]LT',
+            nextWeek : '[下]ddddLT',
+            lastDay : '[昨天]LT',
+            lastWeek : '[上]ddddLT',
+            sameElse : 'L'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(日|月|周)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd':
+                case 'D':
+                case 'DDD':
+                    return number + '日';
+                case 'M':
+                    return number + '月';
+                case 'w':
+                case 'W':
+                    return number + '周';
+                default:
+                    return number;
+            }
+        },
+        relativeTime : {
+            future : '%s内',
+            past : '%s前',
+            s : '几秒',
+            ss : '%d 秒',
+            m : '1 分钟',
+            mm : '%d 分钟',
+            h : '1 小时',
+            hh : '%d 小时',
+            d : '1 天',
+            dd : '%d 天',
+            M : '1 个月',
+            MM : '%d 个月',
+            y : '1 年',
+            yy : '%d 年'
+        },
+        week : {
+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
+    });
 
-        lines = match[0].match(/(?:\r\n?|\n).*/g);
-        if (lines) {
-            this.yylineno += lines.length;
-        }
-        this.yylloc = {
-            first_line: this.yylloc.last_line,
-            last_line: this.yylineno + 1,
-            first_column: this.yylloc.last_column,
-            last_column: lines ?
-                         lines[lines.length - 1].length - lines[lines.length - 1].match(/\r?\n?/)[0].length :
-                         this.yylloc.last_column + match[0].length
-        };
-        this.yytext += match[0];
-        this.match += match[0];
-        this.matches = match;
-        this.yyleng = this.yytext.length;
-        if (this.options.ranges) {
-            this.yylloc.range = [this.offset, this.offset += this.yyleng];
-        }
-        this._more = false;
-        this._backtrack = false;
-        this._input = this._input.slice(match[0].length);
-        this.matched += match[0];
-        token = this.performAction.call(this, this.yy, this, indexed_rule, this.conditionStack[this.conditionStack.length - 1]);
-        if (this.done && this._input) {
-            this.done = false;
-        }
-        if (token) {
-            return token;
-        } else if (this._backtrack) {
-            // recover context
-            for (var k in backup) {
-                this[k] = backup[k];
+    return zhCn;
+
+})));
+
+
+/***/ }),
+/* 167 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var zhHk = moment.defineLocale('zh-hk', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY年M月D日',
+            LLL : 'YYYY年M月D日 HH:mm',
+            LLLL : 'YYYY年M月D日dddd HH:mm',
+            l : 'YYYY/M/D',
+            ll : 'YYYY年M月D日',
+            lll : 'YYYY年M月D日 HH:mm',
+            llll : 'YYYY年M月D日dddd HH:mm'
+        },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
             }
-            return false; // rule action called reject() implying the next rule should be tested instead.
+            if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '中午') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return '凌晨';
+            } else if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : '[今天]LT',
+            nextDay : '[明天]LT',
+            nextWeek : '[下]ddddLT',
+            lastDay : '[昨天]LT',
+            lastWeek : '[上]ddddLT',
+            sameElse : 'L'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd' :
+                case 'D' :
+                case 'DDD' :
+                    return number + '日';
+                case 'M' :
+                    return number + '月';
+                case 'w' :
+                case 'W' :
+                    return number + '週';
+                default :
+                    return number;
+            }
+        },
+        relativeTime : {
+            future : '%s內',
+            past : '%s前',
+            s : '幾秒',
+            ss : '%d 秒',
+            m : '1 分鐘',
+            mm : '%d 分鐘',
+            h : '1 小時',
+            hh : '%d 小時',
+            d : '1 天',
+            dd : '%d 天',
+            M : '1 個月',
+            MM : '%d 個月',
+            y : '1 年',
+            yy : '%d 年'
         }
-        return false;
-    },
+    });
 
-// return next match in input
-next:function () {
-        if (this.done) {
-            return this.EOF;
-        }
-        if (!this._input) {
-            this.done = true;
-        }
+    return zhHk;
 
-        var token,
-            match,
-            tempMatch,
-            index;
-        if (!this._more) {
-            this.yytext = '';
-            this.match = '';
-        }
-        var rules = this._currentRules();
-        for (var i = 0; i < rules.length; i++) {
-            tempMatch = this._input.match(this.rules[rules[i]]);
-            if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
-                match = tempMatch;
-                index = i;
-                if (this.options.backtrack_lexer) {
-                    token = this.test_match(tempMatch, rules[i]);
-                    if (token !== false) {
-                        return token;
-                    } else if (this._backtrack) {
-                        match = false;
-                        continue; // rule action called reject() implying a rule MISmatch.
-                    } else {
-                        // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
-                        return false;
-                    }
-                } else if (!this.options.flex) {
-                    break;
-                }
+})));
+
+
+/***/ }),
+/* 168 */
+/***/ (function(module, exports, __webpack_require__) {
+
+//! moment.js locale configuration
+
+;(function (global, factory) {
+    true ? factory(__webpack_require__(40)) :
+   undefined
+}(this, (function (moment) { 'use strict';
+
+
+    var zhTw = moment.defineLocale('zh-tw', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY年M月D日',
+            LLL : 'YYYY年M月D日 HH:mm',
+            LLLL : 'YYYY年M月D日dddd HH:mm',
+            l : 'YYYY/M/D',
+            ll : 'YYYY年M月D日',
+            lll : 'YYYY年M月D日 HH:mm',
+            llll : 'YYYY年M月D日dddd HH:mm'
+        },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
             }
-        }
-        if (match) {
-            token = this.test_match(match, rules[index]);
-            if (token !== false) {
-                return token;
+            if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '中午') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
             }
-            // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
-            return false;
-        }
-        if (this._input === "") {
-            return this.EOF;
-        } else {
-            return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. Unrecognized text.\n' + this.showPosition(), {
-                text: "",
-                token: null,
-                line: this.yylineno
-            });
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return '凌晨';
+            } else if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : '[今天] LT',
+            nextDay : '[明天] LT',
+            nextWeek : '[下]dddd LT',
+            lastDay : '[昨天] LT',
+            lastWeek : '[上]dddd LT',
+            sameElse : 'L'
+        },
+        dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/,
+        ordinal : function (number, period) {
+            switch (period) {
+                case 'd' :
+                case 'D' :
+                case 'DDD' :
+                    return number + '日';
+                case 'M' :
+                    return number + '月';
+                case 'w' :
+                case 'W' :
+                    return number + '週';
+                default :
+                    return number;
+            }
+        },
+        relativeTime : {
+            future : '%s內',
+            past : '%s前',
+            s : '幾秒',
+            ss : '%d 秒',
+            m : '1 分鐘',
+            mm : '%d 分鐘',
+            h : '1 小時',
+            hh : '%d 小時',
+            d : '1 天',
+            dd : '%d 天',
+            M : '1 個月',
+            MM : '%d 個月',
+            y : '1 年',
+            yy : '%d 年'
         }
-    },
+    });
 
-// return next match that has a token
-lex:function lex() {
-        var r = this.next();
-        if (r) {
-            return r;
-        } else {
-            return this.lex();
-        }
-    },
+    return zhTw;
 
-// activates a new lexer condition state (pushes the new lexer condition state onto the condition stack)
-begin:function begin(condition) {
-        this.conditionStack.push(condition);
-    },
+})));
 
-// pop the previously active lexer condition state off the condition stack
-popState:function popState() {
-        var n = this.conditionStack.length - 1;
-        if (n > 0) {
-            return this.conditionStack.pop();
-        } else {
-            return this.conditionStack[0];
-        }
-    },
 
-// produce the lexer rule set which is active for the currently active lexer condition state
-_currentRules:function _currentRules() {
-        if (this.conditionStack.length && this.conditionStack[this.conditionStack.length - 1]) {
-            return this.conditions[this.conditionStack[this.conditionStack.length - 1]].rules;
-        } else {
-            return this.conditions["INITIAL"].rules;
-        }
-    },
+/***/ }),
+/* 169 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-// return the currently active lexer condition state; when an index argument is provided it produces the N-th previous condition state, if available
-topState:function topState(n) {
-        n = this.conditionStack.length - 1 - Math.abs(n || 0);
-        if (n >= 0) {
-            return this.conditionStack[n];
-        } else {
-            return "INITIAL";
-        }
-    },
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__["audit"]; });
 
-// alias for begin(condition)
-pushState:function pushState(condition) {
-        this.begin(condition);
-    },
+/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__["auditTime"]; });
 
-// return the number of states currently on the stack
-stateStackSize:function stateStackSize() {
-        return this.conditionStack.length;
-    },
-options: {},
-performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
-var YYSTATE=YY_START;
-switch($avoiding_name_collisions) {
-case 0:return 5
-break;
-case 1:/* skip whitespace */
-break;
-case 2:return 8
-break;
-case 3:return 16
-break;
-case 4:return 17
-break;
-case 5:return 11
-break;
-case 6:return 10
-break;
-case 7:return 9
-break;
-case 8:return 14
-break;
-case 9:return 15
-break;
-case 10:return 12
-break;
-case 11:return 7
-break;
-case 12:return 7
-break;
-case 13:return 7
-break;
-case 14:return 7
-break;
-case 15:return 7
-break;
-case 16:return 7
-break;
-case 17:return 7
-break;
-case 18:return 7
-break;
-case 19:return 7
-break;
-case 20:return 7
-break;
-case 21:return 7
-break;
-case 22:return 7
-break;
-case 23:return 7
-break;
-case 24:return 13
-break;
-case 25:return 13
-break;
-case 26:return 13
-break;
-case 27:return 13
-break;
-case 28:return 13
-break;
-case 29:return 13
-break;
-case 30:return 13
-break;
-case 31:return 13
-break;
-case 32:return 7
-break;
-case 33:return 13
-break;
-case 34:return 7
-break;
-case 35:return 13
-break;
-case 36:return 7
-break;
-case 37:return 13
-break;
-case 38:return 13
-break;
-case 39:return 7
-break;
-case 40:return 13
-break;
-case 41:return 13
-break;
-case 42:return 13
-break;
-case 43:return 13
-break;
-case 44:return 13
-break;
-case 45:return 7
-break;
-case 46:return 13
-break;
-case 47:return 7
-break;
-case 48:return 7
-break;
-case 49:return 7
-break;
-case 50:return 7
-break;
-case 51:return 7
-break;
-case 52:return 7
-break;
-case 53:return 7
-break;
-case 54:return 7
-break;
-case 55:return 7
-break;
-case 56:return 7
-break;
-case 57:return 7
-break;
-case 58:return 7
-break;
-case 59:return 7
-break;
-case 60:return 7
-break;
-case 61:return 7
-break;
-case 62:return 7
-break;
-case 63:return 13
-break;
-case 64:return 7
-break;
-case 65:return 7
-break;
-case 66:return 13
-break;
-case 67:return 7
-break;
-case 68:return 7
-break;
-case 69:return 7
-break;
-case 70:return 7
-break;
-case 71:return 7
-break;
-case 72:return 7
-break;
-case 73:return 13
-break;
-case 74:return 7
-break;
-case 75:return 13
-break;
-case 76:return 7
-break;
-case 77:return 7
-break;
-case 78:return 7
-break;
-case 79:return 7
-break;
-case 80:return 7
-break;
-case 81:return 7
-break;
-case 82:return 7
-break;
-case 83:return 7
-break;
-case 84:return 7
-break;
-case 85:return 7
-break;
-case 86:return 7
-break;
-case 87:return 7
-break;
-case 88:return 7
-break;
-case 89:return 7
-break;
-case 90:return 7
-break;
-case 91:return 7
-break;
-case 92:return 7
-break;
-case 93:return 7
-break;
-case 94:return 7
-break;
-case 95:return 7
-break;
-case 96:return 7
-break;
-case 97:return 7
-break;
-case 98:return 7
-break;
-case 99:return 7
-break;
-case 100:return 7
-break;
-case 101:return 7
-break;
-case 102:return 7
-break;
-case 103:return 7
-break;
-case 104:return 7
-break;
-case 105:return 7
-break;
-case 106:return 7
-break;
-case 107:return 7
-break;
-case 108:return 7
-break;
-case 109:return 7
-break;
-case 110:return 7
-break;
-case 111:return 7
-break;
-case 112:return 7
-break;
-case 113:return 7
-break;
-case 114:return 7
-break;
-case 115:return 7
-break;
-case 116:return 7
-break;
-case 117:return 7
-break;
-case 118:return 7
-break;
-case 119:return 7
-break;
-case 120:return 7
-break;
-case 121:return 7
-break;
-case 122:return 7
-break;
-case 123:return 7
-break;
-case 124:return 7
-break;
-case 125:return 7
-break;
-case 126:return 7
-break;
-case 127:return 7
-break;
-case 128:return 7
-break;
-case 129:return 7
-break;
-case 130:return 7
-break;
-case 131:return 7
-break;
-case 132:return 7
-break;
-case 133:return 7
-break;
-case 134:return 7
-break;
-case 135:return 7
-break;
-case 136:return 7
-break;
-case 137:return 7
-break;
-case 138:return 7
-break;
-case 139:return 7
-break;
-case 140:return 7
-break;
-case 141:return 7
-break;
-case 142:return 7
-break;
-case 143:return 7
-break;
-case 144:return 7
-break;
-case 145:return 7
-break;
-case 146:return 7
-break;
-case 147:return 7
-break;
-case 148:return 7
-break;
-case 149:return 7
-break;
-case 150:return 7
-break;
-case 151:return 7
-break;
-case 152:return 7
-break;
-case 153:return 7
-break;
-case 154:return 7
-break;
-case 155:return 7
-break;
-case 156:return 7
-break;
-case 157:return 7
-break;
-case 158:return 7
-break;
-case 159:return 7
-break;
-case 160:return 7
-break;
-case 161:return 7
-break;
-case 162:return 7
-break;
-case 163:return 7
-break;
-case 164:return 7
-break;
-case 165:return 7
-break;
-case 166:return 7
-break;
-case 167:return 7
-break;
-case 168:return 7
-break;
-case 169:return 7
-break;
-case 170:return 7
-break;
-case 171:return 7
-break;
-case 172:return 7
-break;
-case 173:return 7
-break;
-case 174:return 7
-break;
-case 175:return 7
-break;
-case 176:return 7
-break;
-case 177:return 7
-break;
-case 178:return 7
-break;
-case 179:return 7
-break;
-case 180:return 7
-break;
-case 181:return 7
-break;
-case 182:return 7
-break;
-case 183:return 7
-break;
-case 184:return 7
-break;
-case 185:return 7
-break;
-case 186:return 7
-break;
-case 187:return 7
-break;
-case 188:return 7
-break;
-case 189:return 7
-break;
-case 190:return 7
-break;
-case 191:return 7
-break;
-case 192:return 7
-break;
-case 193:return 7
-break;
-case 194:return 7
-break;
-case 195:return 7
-break;
-case 196:return 7
-break;
-case 197:return 7
-break;
-case 198:return 7
-break;
-case 199:return 7
-break;
-case 200:return 7
-break;
-case 201:return 7
-break;
-case 202:return 7
-break;
-case 203:return 7
-break;
-case 204:return 7
-break;
-case 205:return 7
-break;
-case 206:return 7
-break;
-case 207:return 7
-break;
-case 208:return 7
-break;
-case 209:return 7
-break;
-case 210:return 7
-break;
-case 211:return 7
-break;
-case 212:return 7
-break;
-case 213:return 7
-break;
-case 214:return 7
-break;
-case 215:return 7
-break;
-case 216:return 7
-break;
-case 217:return 7
-break;
-case 218:return 7
-break;
-case 219:return 7
-break;
-case 220:return 7
-break;
-case 221:return 7
-break;
-case 222:return 7
-break;
-case 223:return 7
-break;
-case 224:return 7
-break;
-case 225:return 7
-break;
-case 226:return 7
-break;
-case 227:return 7
-break;
-case 228:return 7
-break;
-case 229:return 7
-break;
-case 230:return 7
-break;
-case 231:return 7
-break;
-case 232:return 7
-break;
-case 233:return 7
-break;
-case 234:return 7
-break;
-case 235:return 7
-break;
-case 236:return 7
-break;
-case 237:return 7
-break;
-case 238:return 7
-break;
-case 239:return 7
-break;
-case 240:return 7
-break;
-case 241:return 7
-break;
-case 242:return 7
-break;
-case 243:return 7
-break;
-case 244:return 7
-break;
-case 245:return 7
-break;
-case 246:return 7
-break;
-case 247:return 7
-break;
-case 248:return 7
-break;
-case 249:return 7
-break;
-case 250:return 7
-break;
-case 251:return 7
-break;
-case 252:return 7
-break;
-case 253:return 7
-break;
-case 254:return 7
-break;
-case 255:return 7
-break;
-case 256:return 7
-break;
-case 257:return 7
-break;
-case 258:return 7
-break;
-case 259:return 7
-break;
-case 260:return 7
-break;
-case 261:return 7
-break;
-case 262:return 7
-break;
-case 263:return 7
-break;
-case 264:return 7
-break;
-case 265:return 7
-break;
-case 266:return 7
-break;
-case 267:return 7
-break;
-case 268:return 7
-break;
-case 269:return 7
-break;
-case 270:return 7
-break;
-case 271:return 7
-break;
-case 272:return 7
-break;
-case 273:return 7
-break;
-case 274:return 7
-break;
-case 275:return 7
-break;
-case 276:return 7
-break;
-case 277:return 7
-break;
-case 278:return 7
-break;
-case 279:return 7
-break;
-case 280:return 7
-break;
-case 281:return 7
-break;
-case 282:return 7
-break;
-case 283:return 7
-break;
-case 284:return 7
-break;
-case 285:return 7
-break;
-case 286:return 7
-break;
-case 287:return 7
-break;
-case 288:return 7
-break;
-case 289:return 7
-break;
-case 290:return 7
-break;
-case 291:return 7
-break;
-case 292:return 7
-break;
-case 293:return 7
-break;
-case 294:return 7
-break;
-case 295:return 7
-break;
-case 296:return 7
-break;
-case 297:return 7
-break;
-case 298:return 7
-break;
-case 299:return 7
-break;
-case 300:return 7
-break;
-case 301:return 7
-break;
-case 302:return 7
-break;
-case 303:return 7
-break;
-case 304:return 7
-break;
-case 305:return 7
-break;
-case 306:return 7
-break;
-case 307:return 7
-break;
-case 308:return 7
-break;
-case 309:return 7
-break;
-case 310:return 7
-break;
-case 311:return 7
-break;
-case 312:return 7
-break;
-case 313:return 7
-break;
-case 314:return 7
-break;
-case 315:return 7
-break;
-case 316:return 7
-break;
-case 317:return 7
-break;
-case 318:return 7
-break;
-case 319:return 7
-break;
-case 320:return 7
-break;
-case 321:return 7
-break;
-case 322:return 7
-break;
-case 323:return 7
-break;
-case 324:return 7
-break;
-case 325:return 7
-break;
-case 326:return 7
-break;
-case 327:return 7
-break;
-case 328:return 7
-break;
-case 329:return 7
-break;
-case 330:return 7
-break;
-case 331:return 7
-break;
-case 332:return 7
-break;
-case 333:return 7
-break;
-case 334:return 7
-break;
-case 335:return 7
-break;
-case 336:return 7
-break;
-case 337:return 7
-break;
-case 338:return 7
-break;
-case 339:return 7
-break;
-case 340:return 7
-break;
-case 341:return 7
-break;
-case 342:return 7
-break;
-case 343:return 7
-break;
-case 344:return 7
-break;
-case 345:return 7
-break;
-case 346:return 7
-break;
-case 347:return 7
-break;
-case 348:return 7
-break;
-case 349:return 7
-break;
-case 350:return 7
-break;
-case 351:return 7
-break;
-case 352:return 7
-break;
-case 353:return 7
-break;
-case 354:return 7
-break;
-case 355:return 7
-break;
-case 356:return 7
-break;
-case 357:return 7
-break;
-case 358:return 7
-break;
-case 359:return 7
-break;
-case 360:return 7
-break;
-case 361:return 7
-break;
-case 362:return 7
-break;
-case 363:return 7
-break;
-case 364:return 7
-break;
+/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(207);
+/* 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__(208);
+/* 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__(209);
+/* 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__(210);
+/* 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__(211);
+/* 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__(212);
+/* 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__(213);
+/* 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__(217);
+/* 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__(225);
+/* 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__(228);
+/* 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__(233);
+/* 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__(234);
+/* 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__(235);
+/* 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__(236);
+/* 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__(237);
+/* 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__(238);
+/* 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__(239);
+/* 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__(244);
+/* 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__(245);
+/* 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__(246);
+/* 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__(247);
+/* 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__(248);
+/* 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__(249);
+/* 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__(255);
+/* 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__(256);
+/* 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__(257);
+/* 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__(258);
+/* 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__(259);
+/* 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__(251);
+/* 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__(260);
+/* 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__(261);
+/* 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__(262);
+/* 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__(263);
+/* 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__(264);
+/* 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__(268);
+/* 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__(269);
+/* 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__(270);
+/* 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__(231);
+/* 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__(272);
+/* 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__(273);
+/* 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__(274);
+/* 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__(277);
+/* 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__(229);
+/* 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__(230);
+/* 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__(279);
+/* 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__(280);
+/* 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__(281);
+/* 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__(282);
+/* 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__(285);
+/* 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__(286);
+/* 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__(287);
+/* 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__(288);
+/* 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__(290);
+/* 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__(291);
+/* 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__(292);
+/* 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__(294);
+/* 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__(296);
+/* 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__(301);
+/* 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__(275);
+/* 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__(303);
+/* 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__(304);
+/* 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__(305);
+/* 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__(306);
+/* 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__(284);
+/* 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__(307);
+/* 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__(308);
+/* 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__(276);
+/* 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__(309);
+/* 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__(310);
+/* 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__(311);
+/* 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__(312);
+/* 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__(313);
+/* 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__(314);
+/* 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__(315);
+/* 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__(316);
+/* 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__(317);
+/* 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__(318);
+/* 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__(324);
+/* 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__(325);
+/* 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__(326);
+/* 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__(254);
+/* 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__(271);
+/* 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__(327);
+/* 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__(328);
+/* 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__(329);
+/* 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__(330);
+/* 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__(331);
+/* 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__(252);
+/* 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__(332);
+/* 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__(334);
+/* 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__(336);
+/* 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__(337);
+/* 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__(338);
+/* 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__(339);
+/* 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__(340);
+/* 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__(341);
+/* 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__(342);
+/* 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__(343);
+/* 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__(344);
+/* 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__(345);
+/* 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__(347);
+/* 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 */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+/* 170 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function audit(durationSelector) {
+    return function auditOperatorFunction(source) {
+        return source.lift(new AuditOperator(durationSelector));
+    };
+}
+var AuditOperator = /*@__PURE__*/ (function () {
+    function AuditOperator(durationSelector) {
+        this.durationSelector = durationSelector;
+    }
+    AuditOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new AuditSubscriber(subscriber, this.durationSelector));
+    };
+    return AuditOperator;
+}());
+var AuditSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AuditSubscriber, _super);
+    function AuditSubscriber(destination, durationSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.durationSelector = durationSelector;
+        _this.hasValue = false;
+        return _this;
+    }
+    AuditSubscriber.prototype._next = function (value) {
+        this.value = value;
+        this.hasValue = true;
+        if (!this.throttled) {
+            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 {
+                this.add(this.throttled = innerSubscription);
+            }
+        }
+    };
+    AuditSubscriber.prototype.clearThrottle = function () {
+        var _a = this, value = _a.value, hasValue = _a.hasValue, throttled = _a.throttled;
+        if (throttled) {
+            this.remove(throttled);
+            this.throttled = null;
+            throttled.unsubscribe();
+        }
+        if (hasValue) {
+            this.value = null;
+            this.hasValue = false;
+            this.destination.next(value);
+        }
+    };
+    AuditSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex) {
+        this.clearThrottle();
+    };
+    AuditSubscriber.prototype.notifyComplete = function () {
+        this.clearThrottle();
+    };
+    return AuditSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=audit.js.map
+
+
+/***/ }),
+/* 171 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+var OuterSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](OuterSubscriber, _super);
+    function OuterSubscriber() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    OuterSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.destination.next(innerValue);
+    };
+    OuterSubscriber.prototype.notifyError = function (error, innerSub) {
+        this.destination.error(error);
+    };
+    OuterSubscriber.prototype.notifyComplete = function (innerSub) {
+        this.destination.complete();
+    };
+    return OuterSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+
+//# sourceMappingURL=OuterSubscriber.js.map
+
+
+/***/ }),
+/* 172 */
+/***/ (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 export (binding) */ __webpack_require__.d(__webpack_exports__, "SafeSubscriber", function() { return SafeSubscriber; });
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36);
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(173);
+/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(174);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(177);
+/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(181);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(175);
+/* harmony import */ var _util_hostReportError__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(176);
+/** PURE_IMPORTS_START tslib,_util_isFunction,_Observer,_Subscription,_internal_symbol_rxSubscriber,_config,_util_hostReportError PURE_IMPORTS_END */
+
+
+
+
+
+
+
+var Subscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Subscriber, _super);
+    function Subscriber(destinationOrNext, error, complete) {
+        var _this = _super.call(this) || this;
+        _this.syncErrorValue = null;
+        _this.syncErrorThrown = false;
+        _this.syncErrorThrowable = false;
+        _this.isStopped = false;
+        switch (arguments.length) {
+            case 0:
+                _this.destination = _Observer__WEBPACK_IMPORTED_MODULE_2__["empty"];
+                break;
+            case 1:
+                if (!destinationOrNext) {
+                    _this.destination = _Observer__WEBPACK_IMPORTED_MODULE_2__["empty"];
+                    break;
+                }
+                if (typeof destinationOrNext === 'object') {
+                    if (destinationOrNext instanceof Subscriber) {
+                        _this.syncErrorThrowable = destinationOrNext.syncErrorThrowable;
+                        _this.destination = destinationOrNext;
+                        destinationOrNext.add(_this);
+                    }
+                    else {
+                        _this.syncErrorThrowable = true;
+                        _this.destination = new SafeSubscriber(_this, destinationOrNext);
+                    }
+                    break;
+                }
+            default:
+                _this.syncErrorThrowable = true;
+                _this.destination = new SafeSubscriber(_this, destinationOrNext, error, complete);
+                break;
+        }
+        return _this;
+    }
+    Subscriber.prototype[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__["rxSubscriber"]] = function () { return this; };
+    Subscriber.create = function (next, error, complete) {
+        var subscriber = new Subscriber(next, error, complete);
+        subscriber.syncErrorThrowable = false;
+        return subscriber;
+    };
+    Subscriber.prototype.next = function (value) {
+        if (!this.isStopped) {
+            this._next(value);
+        }
+    };
+    Subscriber.prototype.error = function (err) {
+        if (!this.isStopped) {
+            this.isStopped = true;
+            this._error(err);
+        }
+    };
+    Subscriber.prototype.complete = function () {
+        if (!this.isStopped) {
+            this.isStopped = true;
+            this._complete();
+        }
+    };
+    Subscriber.prototype.unsubscribe = function () {
+        if (this.closed) {
+            return;
+        }
+        this.isStopped = true;
+        _super.prototype.unsubscribe.call(this);
+    };
+    Subscriber.prototype._next = function (value) {
+        this.destination.next(value);
+    };
+    Subscriber.prototype._error = function (err) {
+        this.destination.error(err);
+        this.unsubscribe();
+    };
+    Subscriber.prototype._complete = function () {
+        this.destination.complete();
+        this.unsubscribe();
+    };
+    Subscriber.prototype._unsubscribeAndRecycle = function () {
+        var _parentOrParents = this._parentOrParents;
+        this._parentOrParents = null;
+        this.unsubscribe();
+        this.closed = false;
+        this.isStopped = false;
+        this._parentOrParents = _parentOrParents;
+        return this;
+    };
+    return Subscriber;
+}(_Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"]));
+
+var SafeSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SafeSubscriber, _super);
+    function SafeSubscriber(_parentSubscriber, observerOrNext, error, complete) {
+        var _this = _super.call(this) || this;
+        _this._parentSubscriber = _parentSubscriber;
+        var next;
+        var context = _this;
+        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(observerOrNext)) {
+            next = observerOrNext;
+        }
+        else if (observerOrNext) {
+            next = observerOrNext.next;
+            error = observerOrNext.error;
+            complete = observerOrNext.complete;
+            if (observerOrNext !== _Observer__WEBPACK_IMPORTED_MODULE_2__["empty"]) {
+                context = Object.create(observerOrNext);
+                if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(context.unsubscribe)) {
+                    _this.add(context.unsubscribe.bind(context));
+                }
+                context.unsubscribe = _this.unsubscribe.bind(_this);
+            }
+        }
+        _this._context = context;
+        _this._next = next;
+        _this._error = error;
+        _this._complete = complete;
+        return _this;
+    }
+    SafeSubscriber.prototype.next = function (value) {
+        if (!this.isStopped && this._next) {
+            var _parentSubscriber = this._parentSubscriber;
+            if (!_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
+                this.__tryOrUnsub(this._next, value);
+            }
+            else if (this.__tryOrSetError(_parentSubscriber, this._next, value)) {
+                this.unsubscribe();
+            }
+        }
+    };
+    SafeSubscriber.prototype.error = function (err) {
+        if (!this.isStopped) {
+            var _parentSubscriber = this._parentSubscriber;
+            var useDeprecatedSynchronousErrorHandling = _config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling;
+            if (this._error) {
+                if (!useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
+                    this.__tryOrUnsub(this._error, err);
+                    this.unsubscribe();
+                }
+                else {
+                    this.__tryOrSetError(_parentSubscriber, this._error, err);
+                    this.unsubscribe();
+                }
+            }
+            else if (!_parentSubscriber.syncErrorThrowable) {
+                this.unsubscribe();
+                if (useDeprecatedSynchronousErrorHandling) {
+                    throw err;
+                }
+                Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
+            }
+            else {
+                if (useDeprecatedSynchronousErrorHandling) {
+                    _parentSubscriber.syncErrorValue = err;
+                    _parentSubscriber.syncErrorThrown = true;
+                }
+                else {
+                    Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
+                }
+                this.unsubscribe();
+            }
+        }
+    };
+    SafeSubscriber.prototype.complete = function () {
+        var _this = this;
+        if (!this.isStopped) {
+            var _parentSubscriber = this._parentSubscriber;
+            if (this._complete) {
+                var wrappedComplete = function () { return _this._complete.call(_this._context); };
+                if (!_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
+                    this.__tryOrUnsub(wrappedComplete);
+                    this.unsubscribe();
+                }
+                else {
+                    this.__tryOrSetError(_parentSubscriber, wrappedComplete);
+                    this.unsubscribe();
+                }
+            }
+            else {
+                this.unsubscribe();
+            }
+        }
+    };
+    SafeSubscriber.prototype.__tryOrUnsub = function (fn, value) {
+        try {
+            fn.call(this._context, value);
+        }
+        catch (err) {
+            this.unsubscribe();
+            if (_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling) {
+                throw err;
+            }
+            else {
+                Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
+            }
+        }
+    };
+    SafeSubscriber.prototype.__tryOrSetError = function (parent, fn, value) {
+        if (!_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling) {
+            throw new Error('bad call');
+        }
+        try {
+            fn.call(this._context, value);
+        }
+        catch (err) {
+            if (_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling) {
+                parent.syncErrorValue = err;
+                parent.syncErrorThrown = true;
+                return true;
+            }
+            else {
+                Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
+                return true;
+            }
+        }
+        return false;
+    };
+    SafeSubscriber.prototype._unsubscribe = function () {
+        var _parentSubscriber = this._parentSubscriber;
+        this._context = null;
+        this._parentSubscriber = null;
+        _parentSubscriber.unsubscribe();
+    };
+    return SafeSubscriber;
+}(Subscriber));
+
+//# sourceMappingURL=Subscriber.js.map
+
+
+/***/ }),
+/* 173 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isFunction", function() { return isFunction; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function isFunction(x) {
+    return typeof x === 'function';
+}
+//# sourceMappingURL=isFunction.js.map
+
+
+/***/ }),
+/* 174 */
+/***/ (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__(175);
+/* harmony import */ var _util_hostReportError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(176);
+/** PURE_IMPORTS_START _config,_util_hostReportError PURE_IMPORTS_END */
+
+
+var empty = {
+    closed: true,
+    next: function (value) { },
+    error: function (err) {
+        if (_config__WEBPACK_IMPORTED_MODULE_0__["config"].useDeprecatedSynchronousErrorHandling) {
+            throw err;
+        }
+        else {
+            Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_1__["hostReportError"])(err);
+        }
+    },
+    complete: function () { }
+};
+//# sourceMappingURL=Observer.js.map
+
+
+/***/ }),
+/* 175 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "config", function() { return config; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var _enable_super_gross_mode_that_will_cause_bad_things = false;
+var config = {
+    Promise: undefined,
+    set useDeprecatedSynchronousErrorHandling(value) {
+        if (value) {
+            var error = /*@__PURE__*/ new Error();
+            /*@__PURE__*/ console.warn('DEPRECATED! RxJS was set to use deprecated synchronous error handling behavior by code at: \n' + error.stack);
+        }
+        else if (_enable_super_gross_mode_that_will_cause_bad_things) {
+            /*@__PURE__*/ console.log('RxJS: Back to a better error behavior. Thank you. <3');
+        }
+        _enable_super_gross_mode_that_will_cause_bad_things = value;
+    },
+    get useDeprecatedSynchronousErrorHandling() {
+        return _enable_super_gross_mode_that_will_cause_bad_things;
+    },
+};
+//# sourceMappingURL=config.js.map
+
+
+/***/ }),
+/* 176 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__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; }, 0);
+}
+//# sourceMappingURL=hostReportError.js.map
+
+
+/***/ }),
+/* 177 */
+/***/ (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__(178);
+/* harmony import */ var _util_isObject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(179);
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(173);
+/* harmony import */ var _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(180);
+/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_UnsubscriptionError PURE_IMPORTS_END */
+
+
+
+
+var Subscription = /*@__PURE__*/ (function () {
+    function Subscription(unsubscribe) {
+        this.closed = false;
+        this._parentOrParents = null;
+        this._subscriptions = null;
+        if (unsubscribe) {
+            this._unsubscribe = unsubscribe;
+        }
+    }
+    Subscription.prototype.unsubscribe = function () {
+        var errors;
+        if (this.closed) {
+            return;
+        }
+        var _a = this, _parentOrParents = _a._parentOrParents, _unsubscribe = _a._unsubscribe, _subscriptions = _a._subscriptions;
+        this.closed = true;
+        this._parentOrParents = null;
+        this._subscriptions = 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)) {
+            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)) {
+            var index = -1;
+            var len = _subscriptions.length;
+            while (++index < len) {
+                var sub = _subscriptions[index];
+                if (Object(_util_isObject__WEBPACK_IMPORTED_MODULE_1__["isObject"])(sub)) {
+                    try {
+                        sub.unsubscribe();
+                    }
+                    catch (e) {
+                        errors = errors || [];
+                        if (e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"]) {
+                            errors = errors.concat(flattenUnsubscriptionErrors(e.errors));
+                        }
+                        else {
+                            errors.push(e);
+                        }
+                    }
+                }
+            }
+        }
+        if (errors) {
+            throw new _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"](errors);
+        }
+    };
+    Subscription.prototype.add = function (teardown) {
+        var subscription = teardown;
+        if (!teardown) {
+            return Subscription.EMPTY;
+        }
+        switch (typeof teardown) {
+            case 'function':
+                subscription = new Subscription(teardown);
+            case 'object':
+                if (subscription === this || subscription.closed || typeof subscription.unsubscribe !== 'function') {
+                    return subscription;
+                }
+                else if (this.closed) {
+                    subscription.unsubscribe();
+                    return subscription;
+                }
+                else if (!(subscription instanceof Subscription)) {
+                    var tmp = subscription;
+                    subscription = new Subscription();
+                    subscription._subscriptions = [tmp];
+                }
+                break;
+            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);
+        }
+        return subscription;
+    };
+    Subscription.prototype.remove = function (subscription) {
+        var subscriptions = this._subscriptions;
+        if (subscriptions) {
+            var subscriptionIndex = subscriptions.indexOf(subscription);
+            if (subscriptionIndex !== -1) {
+                subscriptions.splice(subscriptionIndex, 1);
+            }
+        }
+    };
+    Subscription.EMPTY = (function (empty) {
+        empty.closed = true;
+        return empty;
+    }(new Subscription()));
+    return Subscription;
+}());
+
+function flattenUnsubscriptionErrors(errors) {
+    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
+
+
+/***/ }),
+/* 178 */
+/***/ (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 = /*@__PURE__*/ (function () { return Array.isArray || (function (x) { return x && typeof x.length === 'number'; }); })();
+//# sourceMappingURL=isArray.js.map
+
+
+/***/ }),
+/* 179 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__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';
+}
+//# sourceMappingURL=isObject.js.map
+
+
+/***/ }),
+/* 180 */
+/***/ (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; });
+/** 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;
+    }
+    UnsubscriptionErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+    return UnsubscriptionErrorImpl;
+})();
+var UnsubscriptionError = UnsubscriptionErrorImpl;
+//# sourceMappingURL=UnsubscriptionError.js.map
+
+
+/***/ }),
+/* 181 */
+/***/ (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 = /*@__PURE__*/ (function () {
+    return typeof Symbol === 'function'
+        ? /*@__PURE__*/ Symbol('rxSubscriber')
+        : '@@rxSubscriber_' + /*@__PURE__*/ Math.random();
+})();
+var $$rxSubscriber = rxSubscriber;
+//# sourceMappingURL=rxSubscriber.js.map
+
+
+/***/ }),
+/* 182 */
+/***/ (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__(183);
+/* harmony import */ var _subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(184);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(193);
+/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo,_Observable PURE_IMPORTS_END */
+
+
+
+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
+
+
+/***/ }),
+/* 183 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+var InnerSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](InnerSubscriber, _super);
+    function InnerSubscriber(parent, outerValue, outerIndex) {
+        var _this = _super.call(this) || this;
+        _this.parent = parent;
+        _this.outerValue = outerValue;
+        _this.outerIndex = outerIndex;
+        _this.index = 0;
+        return _this;
+    }
+    InnerSubscriber.prototype._next = function (value) {
+        this.parent.notifyNext(this.outerValue, value, this.outerIndex, this.index++, this);
+    };
+    InnerSubscriber.prototype._error = function (error) {
+        this.parent.notifyError(error, this);
+        this.unsubscribe();
+    };
+    InnerSubscriber.prototype._complete = function () {
+        this.parent.notifyComplete(this);
+        this.unsubscribe();
+    };
+    return InnerSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+
+//# sourceMappingURL=InnerSubscriber.js.map
+
+
+/***/ }),
+/* 184 */
+/***/ (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 _subscribeToArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(185);
+/* harmony import */ var _subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(186);
+/* harmony import */ var _subscribeToIterable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(187);
+/* harmony import */ var _subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(189);
+/* harmony import */ var _isArrayLike__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(191);
+/* harmony import */ var _isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(192);
+/* harmony import */ var _isObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(179);
+/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(188);
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(190);
+/** PURE_IMPORTS_START _subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */
+
+
+
+
+
+
+
+
+
+var subscribeTo = function (result) {
+    if (!!result && typeof result[_symbol_observable__WEBPACK_IMPORTED_MODULE_8__["observable"]] === 'function') {
+        return Object(_subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__["subscribeToObservable"])(result);
+    }
+    else if (Object(_isArrayLike__WEBPACK_IMPORTED_MODULE_4__["isArrayLike"])(result)) {
+        return Object(_subscribeToArray__WEBPACK_IMPORTED_MODULE_0__["subscribeToArray"])(result);
+    }
+    else if (Object(_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(result)) {
+        return Object(_subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__["subscribeToPromise"])(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_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);
+    }
+};
+//# sourceMappingURL=subscribeTo.js.map
+
+
+/***/ }),
+/* 185 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToArray", function() { return subscribeToArray; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var subscribeToArray = function (array) {
+    return function (subscriber) {
+        for (var i = 0, len = array.length; i < len && !subscriber.closed; i++) {
+            subscriber.next(array[i]);
+        }
+        subscriber.complete();
+    };
+};
+//# sourceMappingURL=subscribeToArray.js.map
+
+
+/***/ }),
+/* 186 */
+/***/ (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__(176);
+/** PURE_IMPORTS_START _hostReportError PURE_IMPORTS_END */
+
+var subscribeToPromise = function (promise) {
+    return function (subscriber) {
+        promise.then(function (value) {
+            if (!subscriber.closed) {
+                subscriber.next(value);
+                subscriber.complete();
+            }
+        }, function (err) { return subscriber.error(err); })
+            .then(null, _hostReportError__WEBPACK_IMPORTED_MODULE_0__["hostReportError"]);
+        return subscriber;
+    };
+};
+//# sourceMappingURL=subscribeToPromise.js.map
+
+
+/***/ }),
+/* 187 */
+/***/ (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__(188);
+/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */
+
+var subscribeToIterable = function (iterable) {
+    return function (subscriber) {
+        var iterator = iterable[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]]();
+        do {
+            var item = iterator.next();
+            if (item.done) {
+                subscriber.complete();
+                break;
+            }
+            subscriber.next(item.value);
+            if (subscriber.closed) {
+                break;
+            }
+        } while (true);
+        if (typeof iterator.return === 'function') {
+            subscriber.add(function () {
+                if (iterator.return) {
+                    iterator.return();
+                }
+            });
+        }
+        return subscriber;
+    };
+};
+//# sourceMappingURL=subscribeToIterable.js.map
+
+
+/***/ }),
+/* 188 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSymbolIterator", function() { return getSymbolIterator; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "iterator", function() { return iterator; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "$$iterator", function() { return $$iterator; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function getSymbolIterator() {
+    if (typeof Symbol !== 'function' || !Symbol.iterator) {
+        return '@@iterator';
+    }
+    return Symbol.iterator;
+}
+var iterator = /*@__PURE__*/ getSymbolIterator();
+var $$iterator = iterator;
+//# sourceMappingURL=iterator.js.map
+
+
+/***/ }),
+/* 189 */
+/***/ (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__(190);
+/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
+
+var subscribeToObservable = function (obj) {
+    return function (subscriber) {
+        var obs = obj[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]]();
+        if (typeof obs.subscribe !== 'function') {
+            throw new TypeError('Provided object does not correctly implement Symbol.observable');
+        }
+        else {
+            return obs.subscribe(subscriber);
+        }
+    };
+};
+//# sourceMappingURL=subscribeToObservable.js.map
+
+
+/***/ }),
+/* 190 */
+/***/ (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 = /*@__PURE__*/ (function () { return typeof Symbol === 'function' && Symbol.observable || '@@observable'; })();
+//# sourceMappingURL=observable.js.map
+
+
+/***/ }),
+/* 191 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isArrayLike", function() { return isArrayLike; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var isArrayLike = (function (x) { return x && typeof x.length === 'number' && typeof x !== 'function'; });
+//# sourceMappingURL=isArrayLike.js.map
+
+
+/***/ }),
+/* 192 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__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';
+}
+//# sourceMappingURL=isPromise.js.map
+
+
+/***/ }),
+/* 193 */
+/***/ (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_canReportError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(194);
+/* harmony import */ var _util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(195);
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(190);
+/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(196);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(175);
+/** PURE_IMPORTS_START _util_canReportError,_util_toSubscriber,_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */
+
+
+
+
+
+var Observable = /*@__PURE__*/ (function () {
+    function Observable(subscribe) {
+        this._isScalar = false;
+        if (subscribe) {
+            this._subscribe = subscribe;
+        }
+    }
+    Observable.prototype.lift = function (operator) {
+        var observable = new Observable();
+        observable.source = this;
+        observable.operator = operator;
+        return observable;
+    };
+    Observable.prototype.subscribe = function (observerOrNext, error, complete) {
+        var operator = this.operator;
+        var sink = Object(_util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__["toSubscriber"])(observerOrNext, error, complete);
+        if (operator) {
+            sink.add(operator.call(sink, this.source));
+        }
+        else {
+            sink.add(this.source || (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ?
+                this._subscribe(sink) :
+                this._trySubscribe(sink));
+        }
+        if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) {
+            if (sink.syncErrorThrowable) {
+                sink.syncErrorThrowable = false;
+                if (sink.syncErrorThrown) {
+                    throw sink.syncErrorValue;
+                }
+            }
+        }
+        return sink;
+    };
+    Observable.prototype._trySubscribe = function (sink) {
+        try {
+            return this._subscribe(sink);
+        }
+        catch (err) {
+            if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) {
+                sink.syncErrorThrown = true;
+                sink.syncErrorValue = err;
+            }
+            if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_0__["canReportError"])(sink)) {
+                sink.error(err);
+            }
+            else {
+                console.warn(err);
+            }
+        }
+    };
+    Observable.prototype.forEach = function (next, promiseCtor) {
+        var _this = this;
+        promiseCtor = getPromiseCtor(promiseCtor);
+        return new promiseCtor(function (resolve, reject) {
+            var subscription;
+            subscription = _this.subscribe(function (value) {
+                try {
+                    next(value);
+                }
+                catch (err) {
+                    reject(err);
+                    if (subscription) {
+                        subscription.unsubscribe();
+                    }
+                }
+            }, reject, resolve);
+        });
+    };
+    Observable.prototype._subscribe = function (subscriber) {
+        var source = this.source;
+        return source && source.subscribe(subscriber);
+    };
+    Observable.prototype[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]] = function () {
+        return this;
+    };
+    Observable.prototype.pipe = function () {
+        var operations = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            operations[_i] = arguments[_i];
+        }
+        if (operations.length === 0) {
+            return this;
+        }
+        return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipeFromArray"])(operations)(this);
+    };
+    Observable.prototype.toPromise = function (promiseCtor) {
+        var _this = this;
+        promiseCtor = getPromiseCtor(promiseCtor);
+        return new promiseCtor(function (resolve, reject) {
+            var value;
+            _this.subscribe(function (x) { return value = x; }, function (err) { return reject(err); }, function () { return resolve(value); });
+        });
+    };
+    Observable.create = function (subscribe) {
+        return new Observable(subscribe);
+    };
+    return Observable;
+}());
+
+function getPromiseCtor(promiseCtor) {
+    if (!promiseCtor) {
+        promiseCtor = _config__WEBPACK_IMPORTED_MODULE_4__["config"].Promise || Promise;
+    }
+    if (!promiseCtor) {
+        throw new Error('no Promise impl found');
+    }
+    return promiseCtor;
+}
+//# sourceMappingURL=Observable.js.map
+
+
+/***/ }),
+/* 194 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canReportError", function() { return canReportError; });
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(172);
+/** 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;
+        }
+        else if (destination && destination instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) {
+            observer = destination;
+        }
+        else {
+            observer = null;
+        }
+    }
+    return true;
+}
+//# sourceMappingURL=canReportError.js.map
+
+
+/***/ }),
+/* 195 */
+/***/ (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__(172);
+/* harmony import */ var _symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(181);
+/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(174);
+/** 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;
+        }
+        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
+
+
+/***/ }),
+/* 196 */
+/***/ (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__(197);
+/** PURE_IMPORTS_START _noop PURE_IMPORTS_END */
+
+function pipe() {
+    var fns = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        fns[_i] = arguments[_i];
+    }
+    return pipeFromArray(fns);
+}
+function pipeFromArray(fns) {
+    if (!fns) {
+        return _noop__WEBPACK_IMPORTED_MODULE_0__["noop"];
+    }
+    if (fns.length === 1) {
+        return fns[0];
+    }
+    return function piped(input) {
+        return fns.reduce(function (prev, fn) { return fn(prev); }, input);
+    };
+}
+//# sourceMappingURL=pipe.js.map
+
+
+/***/ }),
+/* 197 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return noop; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function noop() { }
+//# sourceMappingURL=noop.js.map
+
+
+/***/ }),
+/* 198 */
+/***/ (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__(199);
+/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(170);
+/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(204);
+/** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */
+
+
+
+function auditTime(duration, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
+    }
+    return Object(_audit__WEBPACK_IMPORTED_MODULE_1__["audit"])(function () { return Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__["timer"])(duration, scheduler); });
+}
+//# sourceMappingURL=auditTime.js.map
+
+
+/***/ }),
+/* 199 */
+/***/ (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__(200);
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(202);
+/** PURE_IMPORTS_START _AsyncAction,_AsyncScheduler PURE_IMPORTS_END */
+
+
+var async = /*@__PURE__*/ new _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"](_AsyncAction__WEBPACK_IMPORTED_MODULE_0__["AsyncAction"]);
+//# sourceMappingURL=async.js.map
+
+
+/***/ }),
+/* 200 */
+/***/ (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__(36);
+/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(201);
+/** PURE_IMPORTS_START tslib,_Action PURE_IMPORTS_END */
+
+
+var AsyncAction = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncAction, _super);
+    function AsyncAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        _this.pending = false;
+        return _this;
+    }
+    AsyncAction.prototype.schedule = function (state, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (this.closed) {
+            return this;
+        }
+        this.state = state;
+        var id = this.id;
+        var scheduler = this.scheduler;
+        if (id != null) {
+            this.id = this.recycleAsyncId(scheduler, id, delay);
+        }
+        this.pending = true;
+        this.delay = delay;
+        this.id = this.id || this.requestAsyncId(scheduler, this.id, delay);
+        return this;
+    };
+    AsyncAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        return setInterval(scheduler.flush.bind(scheduler, this), delay);
+    };
+    AsyncAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (delay !== null && this.delay === delay && this.pending === false) {
+            return id;
+        }
+        clearInterval(id);
+        return undefined;
+    };
+    AsyncAction.prototype.execute = function (state, delay) {
+        if (this.closed) {
+            return new Error('executing a cancelled action');
+        }
+        this.pending = false;
+        var error = this._execute(state, delay);
+        if (error) {
+            return error;
+        }
+        else if (this.pending === false && this.id != null) {
+            this.id = this.recycleAsyncId(this.scheduler, this.id, null);
+        }
+    };
+    AsyncAction.prototype._execute = function (state, delay) {
+        var errored = false;
+        var errorValue = undefined;
+        try {
+            this.work(state);
+        }
+        catch (e) {
+            errored = true;
+            errorValue = !!e && e || new Error(e);
+        }
+        if (errored) {
+            this.unsubscribe();
+            return errorValue;
+        }
+    };
+    AsyncAction.prototype._unsubscribe = function () {
+        var id = this.id;
+        var scheduler = this.scheduler;
+        var actions = scheduler.actions;
+        var index = actions.indexOf(this);
+        this.work = null;
+        this.state = null;
+        this.pending = false;
+        this.scheduler = null;
+        if (index !== -1) {
+            actions.splice(index, 1);
+        }
+        if (id != null) {
+            this.id = this.recycleAsyncId(scheduler, id, null);
+        }
+        this.delay = null;
+    };
+    return AsyncAction;
+}(_Action__WEBPACK_IMPORTED_MODULE_1__["Action"]));
+
+//# sourceMappingURL=AsyncAction.js.map
+
+
+/***/ }),
+/* 201 */
+/***/ (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__(36);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177);
+/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
+
+
+var Action = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Action, _super);
+    function Action(scheduler, work) {
+        return _super.call(this) || this;
+    }
+    Action.prototype.schedule = function (state, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        return this;
+    };
+    return Action;
+}(_Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]));
+
+//# sourceMappingURL=Action.js.map
+
+
+/***/ }),
+/* 202 */
+/***/ (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__(36);
+/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(203);
+/** PURE_IMPORTS_START tslib,_Scheduler PURE_IMPORTS_END */
+
+
+var AsyncScheduler = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncScheduler, _super);
+    function AsyncScheduler(SchedulerAction, now) {
+        if (now === void 0) {
+            now = _Scheduler__WEBPACK_IMPORTED_MODULE_1__["Scheduler"].now;
+        }
+        var _this = _super.call(this, SchedulerAction, function () {
+            if (AsyncScheduler.delegate && AsyncScheduler.delegate !== _this) {
+                return AsyncScheduler.delegate.now();
+            }
+            else {
+                return now();
+            }
+        }) || this;
+        _this.actions = [];
+        _this.active = false;
+        _this.scheduled = undefined;
+        return _this;
+    }
+    AsyncScheduler.prototype.schedule = function (work, delay, state) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (AsyncScheduler.delegate && AsyncScheduler.delegate !== this) {
+            return AsyncScheduler.delegate.schedule(work, delay, state);
+        }
+        else {
+            return _super.prototype.schedule.call(this, work, delay, state);
+        }
+    };
+    AsyncScheduler.prototype.flush = function (action) {
+        var actions = this.actions;
+        if (this.active) {
+            actions.push(action);
+            return;
+        }
+        var error;
+        this.active = true;
+        do {
+            if (error = action.execute(action.state, action.delay)) {
+                break;
+            }
+        } while (action = actions.shift());
+        this.active = false;
+        if (error) {
+            while (action = actions.shift()) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    return AsyncScheduler;
+}(_Scheduler__WEBPACK_IMPORTED_MODULE_1__["Scheduler"]));
+
+//# sourceMappingURL=AsyncScheduler.js.map
+
+
+/***/ }),
+/* 203 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return Scheduler; });
+var Scheduler = /*@__PURE__*/ (function () {
+    function Scheduler(SchedulerAction, now) {
+        if (now === void 0) {
+            now = Scheduler.now;
+        }
+        this.SchedulerAction = SchedulerAction;
+        this.now = now;
+    }
+    Scheduler.prototype.schedule = function (work, delay, state) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        return new this.SchedulerAction(this, work).schedule(state, delay);
+    };
+    Scheduler.now = function () { return Date.now(); };
+    return Scheduler;
+}());
+
+//# sourceMappingURL=Scheduler.js.map
+
+
+/***/ }),
+/* 204 */
+/***/ (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__(193);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199);
+/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(205);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(206);
+/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+
+function timer(dueTime, periodOrScheduler, scheduler) {
+    if (dueTime === void 0) {
+        dueTime = 0;
+    }
+    var period = -1;
+    if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(periodOrScheduler)) {
+        period = Number(periodOrScheduler) < 1 && 1 || Number(periodOrScheduler);
+    }
+    else if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(periodOrScheduler)) {
+        scheduler = periodOrScheduler;
+    }
+    if (!Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(scheduler)) {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        var due = Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(dueTime)
+            ? dueTime
+            : (+dueTime - scheduler.now());
+        return scheduler.schedule(dispatch, due, {
+            index: 0, period: period, subscriber: subscriber
+        });
+    });
+}
+function dispatch(state) {
+    var index = state.index, period = state.period, subscriber = state.subscriber;
+    subscriber.next(index);
+    if (subscriber.closed) {
+        return;
+    }
+    else if (period === -1) {
+        return subscriber.complete();
+    }
+    state.index = index + 1;
+    this.schedule(state, period);
+}
+//# sourceMappingURL=timer.js.map
+
+
+/***/ }),
+/* 205 */
+/***/ (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__(178);
+/** PURE_IMPORTS_START _isArray PURE_IMPORTS_END */
+
+function isNumeric(val) {
+    return !Object(_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(val) && (val - parseFloat(val) + 1) >= 0;
+}
+//# sourceMappingURL=isNumeric.js.map
+
+
+/***/ }),
+/* 206 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isScheduler", function() { return isScheduler; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function isScheduler(value) {
+    return value && typeof value.schedule === 'function';
+}
+//# sourceMappingURL=isScheduler.js.map
+
+
+/***/ }),
+/* 207 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function buffer(closingNotifier) {
+    return function bufferOperatorFunction(source) {
+        return source.lift(new BufferOperator(closingNotifier));
+    };
+}
+var BufferOperator = /*@__PURE__*/ (function () {
+    function BufferOperator(closingNotifier) {
+        this.closingNotifier = closingNotifier;
+    }
+    BufferOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new BufferSubscriber(subscriber, this.closingNotifier));
+    };
+    return BufferOperator;
+}());
+var BufferSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferSubscriber, _super);
+    function BufferSubscriber(destination, closingNotifier) {
+        var _this = _super.call(this, destination) || this;
+        _this.buffer = [];
+        _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, closingNotifier));
+        return _this;
+    }
+    BufferSubscriber.prototype._next = function (value) {
+        this.buffer.push(value);
+    };
+    BufferSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        var buffer = this.buffer;
+        this.buffer = [];
+        this.destination.next(buffer);
+    };
+    return BufferSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=buffer.js.map
+
+
+/***/ }),
+/* 208 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function bufferCount(bufferSize, startBufferEvery) {
+    if (startBufferEvery === void 0) {
+        startBufferEvery = null;
+    }
+    return function bufferCountOperatorFunction(source) {
+        return source.lift(new BufferCountOperator(bufferSize, startBufferEvery));
+    };
+}
+var BufferCountOperator = /*@__PURE__*/ (function () {
+    function BufferCountOperator(bufferSize, startBufferEvery) {
+        this.bufferSize = bufferSize;
+        this.startBufferEvery = startBufferEvery;
+        if (!startBufferEvery || bufferSize === startBufferEvery) {
+            this.subscriberClass = BufferCountSubscriber;
+        }
+        else {
+            this.subscriberClass = BufferSkipCountSubscriber;
+        }
+    }
+    BufferCountOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new this.subscriberClass(subscriber, this.bufferSize, this.startBufferEvery));
+    };
+    return BufferCountOperator;
+}());
+var BufferCountSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferCountSubscriber, _super);
+    function BufferCountSubscriber(destination, bufferSize) {
+        var _this = _super.call(this, destination) || this;
+        _this.bufferSize = bufferSize;
+        _this.buffer = [];
+        return _this;
+    }
+    BufferCountSubscriber.prototype._next = function (value) {
+        var buffer = this.buffer;
+        buffer.push(value);
+        if (buffer.length == this.bufferSize) {
+            this.destination.next(buffer);
+            this.buffer = [];
+        }
+    };
+    BufferCountSubscriber.prototype._complete = function () {
+        var buffer = this.buffer;
+        if (buffer.length > 0) {
+            this.destination.next(buffer);
+        }
+        _super.prototype._complete.call(this);
+    };
+    return BufferCountSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferSkipCountSubscriber, _super);
+    function BufferSkipCountSubscriber(destination, bufferSize, startBufferEvery) {
+        var _this = _super.call(this, destination) || this;
+        _this.bufferSize = bufferSize;
+        _this.startBufferEvery = startBufferEvery;
+        _this.buffers = [];
+        _this.count = 0;
+        return _this;
+    }
+    BufferSkipCountSubscriber.prototype._next = function (value) {
+        var _a = this, bufferSize = _a.bufferSize, startBufferEvery = _a.startBufferEvery, buffers = _a.buffers, count = _a.count;
+        this.count++;
+        if (count % startBufferEvery === 0) {
+            buffers.push([]);
+        }
+        for (var i = buffers.length; i--;) {
+            var buffer = buffers[i];
+            buffer.push(value);
+            if (buffer.length === bufferSize) {
+                buffers.splice(i, 1);
+                this.destination.next(buffer);
+            }
+        }
+    };
+    BufferSkipCountSubscriber.prototype._complete = function () {
+        var _a = this, buffers = _a.buffers, destination = _a.destination;
+        while (buffers.length > 0) {
+            var buffer = buffers.shift();
+            if (buffer.length > 0) {
+                destination.next(buffer);
+            }
+        }
+        _super.prototype._complete.call(this);
+    };
+    return BufferSkipCountSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=bufferCount.js.map
+
+
+/***/ }),
+/* 209 */
+/***/ (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__(36);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(172);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(206);
+/** PURE_IMPORTS_START tslib,_scheduler_async,_Subscriber,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+
+function bufferTime(bufferTimeSpan) {
+    var length = arguments.length;
+    var scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
+    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(arguments[arguments.length - 1])) {
+        scheduler = arguments[arguments.length - 1];
+        length--;
+    }
+    var bufferCreationInterval = null;
+    if (length >= 2) {
+        bufferCreationInterval = arguments[1];
+    }
+    var maxBufferSize = Number.POSITIVE_INFINITY;
+    if (length >= 3) {
+        maxBufferSize = arguments[2];
+    }
+    return function bufferTimeOperatorFunction(source) {
+        return source.lift(new BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler));
+    };
+}
+var BufferTimeOperator = /*@__PURE__*/ (function () {
+    function BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) {
+        this.bufferTimeSpan = bufferTimeSpan;
+        this.bufferCreationInterval = bufferCreationInterval;
+        this.maxBufferSize = maxBufferSize;
+        this.scheduler = scheduler;
+    }
+    BufferTimeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new BufferTimeSubscriber(subscriber, this.bufferTimeSpan, this.bufferCreationInterval, this.maxBufferSize, this.scheduler));
+    };
+    return BufferTimeOperator;
+}());
+var Context = /*@__PURE__*/ (function () {
+    function Context() {
+        this.buffer = [];
+    }
+    return Context;
+}());
+var BufferTimeSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferTimeSubscriber, _super);
+    function BufferTimeSubscriber(destination, bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.bufferTimeSpan = bufferTimeSpan;
+        _this.bufferCreationInterval = bufferCreationInterval;
+        _this.maxBufferSize = maxBufferSize;
+        _this.scheduler = scheduler;
+        _this.contexts = [];
+        var context = _this.openContext();
+        _this.timespanOnly = bufferCreationInterval == null || bufferCreationInterval < 0;
+        if (_this.timespanOnly) {
+            var timeSpanOnlyState = { subscriber: _this, context: context, bufferTimeSpan: bufferTimeSpan };
+            _this.add(context.closeAction = scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState));
+        }
+        else {
+            var closeState = { subscriber: _this, context: context };
+            var creationState = { bufferTimeSpan: bufferTimeSpan, bufferCreationInterval: bufferCreationInterval, subscriber: _this, scheduler: scheduler };
+            _this.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, closeState));
+            _this.add(scheduler.schedule(dispatchBufferCreation, bufferCreationInterval, creationState));
+        }
+        return _this;
+    }
+    BufferTimeSubscriber.prototype._next = function (value) {
+        var contexts = this.contexts;
+        var len = contexts.length;
+        var filledBufferContext;
+        for (var i = 0; i < len; i++) {
+            var context_1 = contexts[i];
+            var buffer = context_1.buffer;
+            buffer.push(value);
+            if (buffer.length == this.maxBufferSize) {
+                filledBufferContext = context_1;
+            }
+        }
+        if (filledBufferContext) {
+            this.onBufferFull(filledBufferContext);
+        }
+    };
+    BufferTimeSubscriber.prototype._error = function (err) {
+        this.contexts.length = 0;
+        _super.prototype._error.call(this, err);
+    };
+    BufferTimeSubscriber.prototype._complete = function () {
+        var _a = this, contexts = _a.contexts, destination = _a.destination;
+        while (contexts.length > 0) {
+            var context_2 = contexts.shift();
+            destination.next(context_2.buffer);
+        }
+        _super.prototype._complete.call(this);
+    };
+    BufferTimeSubscriber.prototype._unsubscribe = function () {
+        this.contexts = null;
+    };
+    BufferTimeSubscriber.prototype.onBufferFull = function (context) {
+        this.closeContext(context);
+        var closeAction = context.closeAction;
+        closeAction.unsubscribe();
+        this.remove(closeAction);
+        if (!this.closed && this.timespanOnly) {
+            context = this.openContext();
+            var bufferTimeSpan = this.bufferTimeSpan;
+            var timeSpanOnlyState = { subscriber: this, context: context, bufferTimeSpan: bufferTimeSpan };
+            this.add(context.closeAction = this.scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState));
+        }
+    };
+    BufferTimeSubscriber.prototype.openContext = function () {
+        var context = new Context();
+        this.contexts.push(context);
+        return context;
+    };
+    BufferTimeSubscriber.prototype.closeContext = function (context) {
+        this.destination.next(context.buffer);
+        var contexts = this.contexts;
+        var spliceIndex = contexts ? contexts.indexOf(context) : -1;
+        if (spliceIndex >= 0) {
+            contexts.splice(contexts.indexOf(context), 1);
+        }
+    };
+    return BufferTimeSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"]));
+function dispatchBufferTimeSpanOnly(state) {
+    var subscriber = state.subscriber;
+    var prevContext = state.context;
+    if (prevContext) {
+        subscriber.closeContext(prevContext);
+    }
+    if (!subscriber.closed) {
+        state.context = subscriber.openContext();
+        state.context.closeAction = this.schedule(state, state.bufferTimeSpan);
+    }
+}
+function dispatchBufferCreation(state) {
+    var bufferCreationInterval = state.bufferCreationInterval, bufferTimeSpan = state.bufferTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler;
+    var context = subscriber.openContext();
+    var action = this;
+    if (!subscriber.closed) {
+        subscriber.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, { subscriber: subscriber, context: context }));
+        action.schedule(state, bufferCreationInterval);
+    }
+}
+function dispatchBufferClose(arg) {
+    var subscriber = arg.subscriber, context = arg.context;
+    subscriber.closeContext(context);
+}
+//# sourceMappingURL=bufferTime.js.map
+
+
+/***/ }),
+/* 210 */
+/***/ (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__(36);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171);
+/** PURE_IMPORTS_START tslib,_Subscription,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */
+
+
+
+
+function bufferToggle(openings, closingSelector) {
+    return function bufferToggleOperatorFunction(source) {
+        return source.lift(new BufferToggleOperator(openings, closingSelector));
+    };
+}
+var BufferToggleOperator = /*@__PURE__*/ (function () {
+    function BufferToggleOperator(openings, closingSelector) {
+        this.openings = openings;
+        this.closingSelector = closingSelector;
+    }
+    BufferToggleOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new BufferToggleSubscriber(subscriber, this.openings, this.closingSelector));
+    };
+    return BufferToggleOperator;
+}());
+var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferToggleSubscriber, _super);
+    function BufferToggleSubscriber(destination, openings, closingSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.openings = openings;
+        _this.closingSelector = closingSelector;
+        _this.contexts = [];
+        _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, openings));
+        return _this;
+    }
+    BufferToggleSubscriber.prototype._next = function (value) {
+        var contexts = this.contexts;
+        var len = contexts.length;
+        for (var i = 0; i < len; i++) {
+            contexts[i].buffer.push(value);
+        }
+    };
+    BufferToggleSubscriber.prototype._error = function (err) {
+        var contexts = this.contexts;
+        while (contexts.length > 0) {
+            var context_1 = contexts.shift();
+            context_1.subscription.unsubscribe();
+            context_1.buffer = null;
+            context_1.subscription = null;
+        }
+        this.contexts = null;
+        _super.prototype._error.call(this, err);
+    };
+    BufferToggleSubscriber.prototype._complete = function () {
+        var contexts = this.contexts;
+        while (contexts.length > 0) {
+            var context_2 = contexts.shift();
+            this.destination.next(context_2.buffer);
+            context_2.subscription.unsubscribe();
+            context_2.buffer = null;
+            context_2.subscription = null;
+        }
+        this.contexts = null;
+        _super.prototype._complete.call(this);
+    };
+    BufferToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        outerValue ? this.closeBuffer(outerValue) : this.openBuffer(innerValue);
+    };
+    BufferToggleSubscriber.prototype.notifyComplete = function (innerSub) {
+        this.closeBuffer(innerSub.context);
+    };
+    BufferToggleSubscriber.prototype.openBuffer = function (value) {
+        try {
+            var closingSelector = this.closingSelector;
+            var closingNotifier = closingSelector.call(this, value);
+            if (closingNotifier) {
+                this.trySubscribe(closingNotifier);
+            }
+        }
+        catch (err) {
+            this._error(err);
+        }
+    };
+    BufferToggleSubscriber.prototype.closeBuffer = function (context) {
+        var contexts = this.contexts;
+        if (contexts && context) {
+            var buffer = context.buffer, subscription = context.subscription;
+            this.destination.next(buffer);
+            contexts.splice(contexts.indexOf(context), 1);
+            this.remove(subscription);
+            subscription.unsubscribe();
+        }
+    };
+    BufferToggleSubscriber.prototype.trySubscribe = function (closingNotifier) {
+        var contexts = this.contexts;
+        var buffer = [];
+        var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
+        var context = { buffer: buffer, subscription: subscription };
+        contexts.push(context);
+        var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, closingNotifier, context);
+        if (!innerSubscription || innerSubscription.closed) {
+            this.closeBuffer(context);
+        }
+        else {
+            innerSubscription.context = context;
+            this.add(innerSubscription);
+            subscription.add(innerSubscription);
+        }
+    };
+    return BufferToggleSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+//# sourceMappingURL=bufferToggle.js.map
+
+
+/***/ }),
+/* 211 */
+/***/ (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__(36);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_Subscription,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+function bufferWhen(closingSelector) {
+    return function (source) {
+        return source.lift(new BufferWhenOperator(closingSelector));
+    };
+}
+var BufferWhenOperator = /*@__PURE__*/ (function () {
+    function BufferWhenOperator(closingSelector) {
+        this.closingSelector = closingSelector;
+    }
+    BufferWhenOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new BufferWhenSubscriber(subscriber, this.closingSelector));
+    };
+    return BufferWhenOperator;
+}());
+var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferWhenSubscriber, _super);
+    function BufferWhenSubscriber(destination, closingSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.closingSelector = closingSelector;
+        _this.subscribing = false;
+        _this.openBuffer();
+        return _this;
+    }
+    BufferWhenSubscriber.prototype._next = function (value) {
+        this.buffer.push(value);
+    };
+    BufferWhenSubscriber.prototype._complete = function () {
+        var buffer = this.buffer;
+        if (buffer) {
+            this.destination.next(buffer);
+        }
+        _super.prototype._complete.call(this);
+    };
+    BufferWhenSubscriber.prototype._unsubscribe = function () {
+        this.buffer = null;
+        this.subscribing = false;
+    };
+    BufferWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.openBuffer();
+    };
+    BufferWhenSubscriber.prototype.notifyComplete = function () {
+        if (this.subscribing) {
+            this.complete();
+        }
+        else {
+            this.openBuffer();
+        }
+    };
+    BufferWhenSubscriber.prototype.openBuffer = function () {
+        var closingSubscription = this.closingSubscription;
+        if (closingSubscription) {
+            this.remove(closingSubscription);
+            closingSubscription.unsubscribe();
+        }
+        var buffer = this.buffer;
+        if (this.buffer) {
+            this.destination.next(buffer);
+        }
+        this.buffer = [];
+        var closingNotifier;
+        try {
+            var closingSelector = this.closingSelector;
+            closingNotifier = closingSelector();
+        }
+        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_2__["OuterSubscriber"]));
+//# sourceMappingURL=bufferWhen.js.map
+
+
+/***/ }),
+/* 212 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(183);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+function catchError(selector) {
+    return function catchErrorOperatorFunction(source) {
+        var operator = new CatchOperator(selector);
+        var caught = source.lift(operator);
+        return (operator.caught = caught);
+    };
+}
+var CatchOperator = /*@__PURE__*/ (function () {
+    function CatchOperator(selector) {
+        this.selector = selector;
+    }
+    CatchOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new CatchSubscriber(subscriber, this.selector, this.caught));
+    };
+    return CatchOperator;
+}());
+var CatchSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CatchSubscriber, _super);
+    function CatchSubscriber(destination, selector, caught) {
+        var _this = _super.call(this, destination) || this;
+        _this.selector = selector;
+        _this.caught = caught;
+        return _this;
+    }
+    CatchSubscriber.prototype.error = function (err) {
+        if (!this.isStopped) {
+            var result = void 0;
+            try {
+                result = this.selector(err, this.caught);
+            }
+            catch (err2) {
+                _super.prototype.error.call(this, err2);
+                return;
+            }
+            this._unsubscribeAndRecycle();
+            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;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=catchError.js.map
+
+
+/***/ }),
+/* 213 */
+/***/ (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__(214);
+/** PURE_IMPORTS_START _observable_combineLatest PURE_IMPORTS_END */
+
+function combineAll(project) {
+    return function (source) { return source.lift(new _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__["CombineLatestOperator"](project)); };
+}
+//# sourceMappingURL=combineAll.js.map
+
+
+/***/ }),
+/* 214 */
+/***/ (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 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__(36);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(206);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(182);
+/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(215);
+/** PURE_IMPORTS_START tslib,_util_isScheduler,_util_isArray,_OuterSubscriber,_util_subscribeToResult,_fromArray PURE_IMPORTS_END */
+
+
+
+
+
+
+var NONE = {};
+function combineLatest() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    var resultSelector = null;
+    var scheduler = null;
+    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(observables[observables.length - 1])) {
+        scheduler = observables.pop();
+    }
+    if (typeof observables[observables.length - 1] === 'function') {
+        resultSelector = observables.pop();
+    }
+    if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(observables[0])) {
+        observables = observables[0];
+    }
+    return Object(_fromArray__WEBPACK_IMPORTED_MODULE_5__["fromArray"])(observables, scheduler).lift(new CombineLatestOperator(resultSelector));
+}
+var CombineLatestOperator = /*@__PURE__*/ (function () {
+    function CombineLatestOperator(resultSelector) {
+        this.resultSelector = resultSelector;
+    }
+    CombineLatestOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new CombineLatestSubscriber(subscriber, this.resultSelector));
+    };
+    return CombineLatestOperator;
+}());
+
+var CombineLatestSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CombineLatestSubscriber, _super);
+    function CombineLatestSubscriber(destination, resultSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.resultSelector = resultSelector;
+        _this.active = 0;
+        _this.values = [];
+        _this.observables = [];
+        return _this;
+    }
+    CombineLatestSubscriber.prototype._next = function (observable) {
+        this.values.push(NONE);
+        this.observables.push(observable);
+    };
+    CombineLatestSubscriber.prototype._complete = function () {
+        var observables = this.observables;
+        var len = observables.length;
+        if (len === 0) {
+            this.destination.complete();
+        }
+        else {
+            this.active = len;
+            this.toRespond = len;
+            for (var i = 0; i < len; i++) {
+                var observable = observables[i];
+                this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, observable, observable, i));
+            }
+        }
+    };
+    CombineLatestSubscriber.prototype.notifyComplete = function (unused) {
+        if ((this.active -= 1) === 0) {
+            this.destination.complete();
+        }
+    };
+    CombineLatestSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        var values = this.values;
+        var oldVal = values[outerIndex];
+        var toRespond = !this.toRespond
+            ? 0
+            : oldVal === NONE ? --this.toRespond : this.toRespond;
+        values[outerIndex] = innerValue;
+        if (toRespond === 0) {
+            if (this.resultSelector) {
+                this._tryResultSelector(values);
+            }
+            else {
+                this.destination.next(values.slice());
+            }
+        }
+    };
+    CombineLatestSubscriber.prototype._tryResultSelector = function (values) {
+        var result;
+        try {
+            result = this.resultSelector.apply(this, values);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.next(result);
+    };
+    return CombineLatestSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+
+//# sourceMappingURL=combineLatest.js.map
+
+
+/***/ }),
+/* 215 */
+/***/ (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__(193);
+/* harmony import */ var _util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(185);
+/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(216);
+/** 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_1__["subscribeToArray"])(input));
+    }
+    else {
+        return Object(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler);
+    }
+}
+//# sourceMappingURL=fromArray.js.map
+
+
+/***/ }),
+/* 216 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleArray", function() { return scheduleArray; });
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177);
+/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
+
+
+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;
+    });
+}
+//# sourceMappingURL=scheduleArray.js.map
+
+
+/***/ }),
+/* 217 */
+/***/ (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__(178);
+/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(214);
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(218);
+/** PURE_IMPORTS_START _util_isArray,_observable_combineLatest,_observable_from PURE_IMPORTS_END */
+
+
+
+var none = {};
+function combineLatest() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    var project = null;
+    if (typeof observables[observables.length - 1] === 'function') {
+        project = observables.pop();
+    }
+    if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(observables[0])) {
+        observables = observables[0].slice();
+    }
+    return function (source) { return source.lift.call(Object(_observable_from__WEBPACK_IMPORTED_MODULE_2__["from"])([source].concat(observables)), new _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__["CombineLatestOperator"](project)); };
+}
+//# sourceMappingURL=combineLatest.js.map
+
+
+/***/ }),
+/* 218 */
+/***/ (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__(193);
+/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(184);
+/* harmony import */ var _scheduled_scheduled__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(219);
+/** 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
+
+
+/***/ }),
+/* 219 */
+/***/ (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__(220);
+/* harmony import */ var _schedulePromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(221);
+/* harmony import */ var _scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(216);
+/* harmony import */ var _scheduleIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(222);
+/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(223);
+/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(192);
+/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(191);
+/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(224);
+/** 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
+
+
+/***/ }),
+/* 220 */
+/***/ (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__(193);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177);
+/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(190);
+/** 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
+
+
+/***/ }),
+/* 221 */
+/***/ (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__(193);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177);
+/** 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
+
+
+/***/ }),
+/* 222 */
+/***/ (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__(193);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177);
+/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(188);
+/** 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
+
+
+/***/ }),
+/* 223 */
+/***/ (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__(190);
+/** 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
+
+
+/***/ }),
+/* 224 */
+/***/ (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__(188);
+/** 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
+
+
+/***/ }),
+/* 225 */
+/***/ (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__(226);
+/** PURE_IMPORTS_START _observable_concat PURE_IMPORTS_END */
+
+function concat() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    return function (source) { return source.lift.call(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"].apply(void 0, [source].concat(observables))); };
+}
+//# sourceMappingURL=concat.js.map
+
+
+/***/ }),
+/* 226 */
+/***/ (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 _of__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(227);
+/* harmony import */ var _operators_concatAll__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(228);
+/** PURE_IMPORTS_START _of,_operators_concatAll PURE_IMPORTS_END */
+
+
+function concat() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_1__["concatAll"])()(_of__WEBPACK_IMPORTED_MODULE_0__["of"].apply(void 0, observables));
+}
+//# sourceMappingURL=concat.js.map
+
+
+/***/ }),
+/* 227 */
+/***/ (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__(206);
+/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
+/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(216);
+/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_scheduled_scheduleArray PURE_IMPORTS_END */
+
+
+
+function of() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    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 {
+        return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(args);
+    }
+}
+//# sourceMappingURL=of.js.map
+
+
+/***/ }),
+/* 228 */
+/***/ (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__(229);
+/** PURE_IMPORTS_START _mergeAll PURE_IMPORTS_END */
+
+function concatAll() {
+    return Object(_mergeAll__WEBPACK_IMPORTED_MODULE_0__["mergeAll"])(1);
+}
+//# sourceMappingURL=concatAll.js.map
+
+
+/***/ }),
+/* 229 */
+/***/ (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__(230);
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232);
+/** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */
+
+
+function mergeAll(concurrent) {
+    if (concurrent === void 0) {
+        concurrent = Number.POSITIVE_INFINITY;
+    }
+    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"], concurrent);
+}
+//# sourceMappingURL=mergeAll.js.map
+
+
+/***/ }),
+/* 230 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__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__(36);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(182);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(183);
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(231);
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(218);
+/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber,_map,_observable_from PURE_IMPORTS_END */
+
+
+
+
+
+
+function mergeMap(project, resultSelector, concurrent) {
+    if (concurrent === void 0) {
+        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_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;
+    }
+    return function (source) { return source.lift(new MergeMapOperator(project, concurrent)); };
+}
+var MergeMapOperator = /*@__PURE__*/ (function () {
+    function MergeMapOperator(project, concurrent) {
+        if (concurrent === void 0) {
+            concurrent = Number.POSITIVE_INFINITY;
+        }
+        this.project = project;
+        this.concurrent = concurrent;
+    }
+    MergeMapOperator.prototype.call = function (observer, source) {
+        return source.subscribe(new MergeMapSubscriber(observer, this.project, this.concurrent));
+    };
+    return MergeMapOperator;
+}());
+
+var MergeMapSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MergeMapSubscriber, _super);
+    function MergeMapSubscriber(destination, project, concurrent) {
+        if (concurrent === void 0) {
+            concurrent = Number.POSITIVE_INFINITY;
+        }
+        var _this = _super.call(this, destination) || this;
+        _this.project = project;
+        _this.concurrent = concurrent;
+        _this.hasCompleted = false;
+        _this.buffer = [];
+        _this.active = 0;
+        _this.index = 0;
+        return _this;
+    }
+    MergeMapSubscriber.prototype._next = function (value) {
+        if (this.active < this.concurrent) {
+            this._tryNext(value);
+        }
+        else {
+            this.buffer.push(value);
+        }
+    };
+    MergeMapSubscriber.prototype._tryNext = function (value) {
+        var result;
+        var index = this.index++;
+        try {
+            result = this.project(value, index);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.active++;
+        this._innerSub(result, value, index);
+    };
+    MergeMapSubscriber.prototype._innerSub = function (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);
+    };
+    MergeMapSubscriber.prototype.notifyComplete = function (innerSub) {
+        var buffer = this.buffer;
+        this.remove(innerSub);
+        this.active--;
+        if (buffer.length > 0) {
+            this._next(buffer.shift());
+        }
+        else if (this.active === 0 && this.hasCompleted) {
+            this.destination.complete();
+        }
+    };
+    return MergeMapSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
+
+//# sourceMappingURL=mergeMap.js.map
+
+
+/***/ }),
+/* 231 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function map(project, thisArg) {
+    return function mapOperation(source) {
+        if (typeof project !== 'function') {
+            throw new TypeError('argument is not a function. Are you looking for `mapTo()`?');
+        }
+        return source.lift(new MapOperator(project, thisArg));
+    };
+}
+var MapOperator = /*@__PURE__*/ (function () {
+    function MapOperator(project, thisArg) {
+        this.project = project;
+        this.thisArg = thisArg;
+    }
+    MapOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new MapSubscriber(subscriber, this.project, this.thisArg));
+    };
+    return MapOperator;
+}());
+
+var MapSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MapSubscriber, _super);
+    function MapSubscriber(destination, project, thisArg) {
+        var _this = _super.call(this, destination) || this;
+        _this.project = project;
+        _this.count = 0;
+        _this.thisArg = thisArg || _this;
+        return _this;
+    }
+    MapSubscriber.prototype._next = function (value) {
+        var result;
+        try {
+            result = this.project.call(this.thisArg, value, this.count++);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.next(result);
+    };
+    return MapSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=map.js.map
+
+
+/***/ }),
+/* 232 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return identity; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function identity(x) {
+    return x;
+}
+//# sourceMappingURL=identity.js.map
+
+
+/***/ }),
+/* 233 */
+/***/ (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__(230);
+/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
+
+function concatMap(project, resultSelector) {
+    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(project, resultSelector, 1);
+}
+//# sourceMappingURL=concatMap.js.map
+
+
+/***/ }),
+/* 234 */
+/***/ (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__(233);
+/** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */
+
+function concatMapTo(innerObservable, resultSelector) {
+    return Object(_concatMap__WEBPACK_IMPORTED_MODULE_0__["concatMap"])(function () { return innerObservable; }, resultSelector);
+}
+//# sourceMappingURL=concatMapTo.js.map
+
+
+/***/ }),
+/* 235 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function count(predicate) {
+    return function (source) { return source.lift(new CountOperator(predicate, source)); };
+}
+var CountOperator = /*@__PURE__*/ (function () {
+    function CountOperator(predicate, source) {
+        this.predicate = predicate;
+        this.source = source;
+    }
+    CountOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new CountSubscriber(subscriber, this.predicate, this.source));
+    };
+    return CountOperator;
+}());
+var CountSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CountSubscriber, _super);
+    function CountSubscriber(destination, predicate, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.source = source;
+        _this.count = 0;
+        _this.index = 0;
+        return _this;
+    }
+    CountSubscriber.prototype._next = function (value) {
+        if (this.predicate) {
+            this._tryPredicate(value);
+        }
+        else {
+            this.count++;
+        }
+    };
+    CountSubscriber.prototype._tryPredicate = function (value) {
+        var result;
+        try {
+            result = this.predicate(value, this.index++, this.source);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        if (result) {
+            this.count++;
+        }
+    };
+    CountSubscriber.prototype._complete = function () {
+        this.destination.next(this.count);
+        this.destination.complete();
+    };
+    return CountSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=count.js.map
+
+
+/***/ }),
+/* 236 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function debounce(durationSelector) {
+    return function (source) { return source.lift(new DebounceOperator(durationSelector)); };
+}
+var DebounceOperator = /*@__PURE__*/ (function () {
+    function DebounceOperator(durationSelector) {
+        this.durationSelector = durationSelector;
+    }
+    DebounceOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DebounceSubscriber(subscriber, this.durationSelector));
+    };
+    return DebounceOperator;
+}());
+var DebounceSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DebounceSubscriber, _super);
+    function DebounceSubscriber(destination, durationSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.durationSelector = durationSelector;
+        _this.hasValue = false;
+        _this.durationSubscription = null;
+        return _this;
+    }
+    DebounceSubscriber.prototype._next = function (value) {
+        try {
+            var result = this.durationSelector.call(this, value);
+            if (result) {
+                this._tryNext(value, result);
+            }
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+    };
+    DebounceSubscriber.prototype._complete = function () {
+        this.emitValue();
+        this.destination.complete();
+    };
+    DebounceSubscriber.prototype._tryNext = function (value, duration) {
+        var subscription = this.durationSubscription;
+        this.value = value;
+        this.hasValue = true;
+        if (subscription) {
+            subscription.unsubscribe();
+            this.remove(subscription);
+        }
+        subscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration);
+        if (subscription && !subscription.closed) {
+            this.add(this.durationSubscription = subscription);
+        }
+    };
+    DebounceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.emitValue();
+    };
+    DebounceSubscriber.prototype.notifyComplete = function () {
+        this.emitValue();
+    };
+    DebounceSubscriber.prototype.emitValue = function () {
+        if (this.hasValue) {
+            var value = this.value;
+            var subscription = this.durationSubscription;
+            if (subscription) {
+                this.durationSubscription = null;
+                subscription.unsubscribe();
+                this.remove(subscription);
+            }
+            this.value = null;
+            this.hasValue = false;
+            _super.prototype._next.call(this, value);
+        }
+    };
+    return DebounceSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=debounce.js.map
+
+
+/***/ }),
+/* 237 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(199);
+/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */
+
+
+
+function debounceTime(dueTime, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
+    }
+    return function (source) { return source.lift(new DebounceTimeOperator(dueTime, scheduler)); };
+}
+var DebounceTimeOperator = /*@__PURE__*/ (function () {
+    function DebounceTimeOperator(dueTime, scheduler) {
+        this.dueTime = dueTime;
+        this.scheduler = scheduler;
+    }
+    DebounceTimeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DebounceTimeSubscriber(subscriber, this.dueTime, this.scheduler));
+    };
+    return DebounceTimeOperator;
+}());
+var DebounceTimeSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DebounceTimeSubscriber, _super);
+    function DebounceTimeSubscriber(destination, dueTime, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.dueTime = dueTime;
+        _this.scheduler = scheduler;
+        _this.debouncedSubscription = null;
+        _this.lastValue = null;
+        _this.hasValue = false;
+        return _this;
+    }
+    DebounceTimeSubscriber.prototype._next = function (value) {
+        this.clearDebounce();
+        this.lastValue = value;
+        this.hasValue = true;
+        this.add(this.debouncedSubscription = this.scheduler.schedule(dispatchNext, this.dueTime, this));
+    };
+    DebounceTimeSubscriber.prototype._complete = function () {
+        this.debouncedNext();
+        this.destination.complete();
+    };
+    DebounceTimeSubscriber.prototype.debouncedNext = function () {
+        this.clearDebounce();
+        if (this.hasValue) {
+            var lastValue = this.lastValue;
+            this.lastValue = null;
+            this.hasValue = false;
+            this.destination.next(lastValue);
+        }
+    };
+    DebounceTimeSubscriber.prototype.clearDebounce = function () {
+        var debouncedSubscription = this.debouncedSubscription;
+        if (debouncedSubscription !== null) {
+            this.remove(debouncedSubscription);
+            debouncedSubscription.unsubscribe();
+            this.debouncedSubscription = null;
+        }
+    };
+    return DebounceTimeSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+function dispatchNext(subscriber) {
+    subscriber.debouncedNext();
+}
+//# sourceMappingURL=debounceTime.js.map
+
+
+/***/ }),
+/* 238 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function defaultIfEmpty(defaultValue) {
+    if (defaultValue === void 0) {
+        defaultValue = null;
+    }
+    return function (source) { return source.lift(new DefaultIfEmptyOperator(defaultValue)); };
+}
+var DefaultIfEmptyOperator = /*@__PURE__*/ (function () {
+    function DefaultIfEmptyOperator(defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+    DefaultIfEmptyOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DefaultIfEmptySubscriber(subscriber, this.defaultValue));
+    };
+    return DefaultIfEmptyOperator;
+}());
+var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DefaultIfEmptySubscriber, _super);
+    function DefaultIfEmptySubscriber(destination, defaultValue) {
+        var _this = _super.call(this, destination) || this;
+        _this.defaultValue = defaultValue;
+        _this.isEmpty = true;
+        return _this;
+    }
+    DefaultIfEmptySubscriber.prototype._next = function (value) {
+        this.isEmpty = false;
+        this.destination.next(value);
+    };
+    DefaultIfEmptySubscriber.prototype._complete = function () {
+        if (this.isEmpty) {
+            this.destination.next(this.defaultValue);
+        }
+        this.destination.complete();
+    };
+    return DefaultIfEmptySubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=defaultIfEmpty.js.map
+
+
+/***/ }),
+/* 239 */
+/***/ (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__(36);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199);
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(240);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172);
+/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(241);
+/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */
+
+
+
+
+
+function delay(delay, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
+    }
+    var absoluteDelay = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_2__["isDate"])(delay);
+    var delayFor = absoluteDelay ? (+delay - scheduler.now()) : Math.abs(delay);
+    return function (source) { return source.lift(new DelayOperator(delayFor, scheduler)); };
+}
+var DelayOperator = /*@__PURE__*/ (function () {
+    function DelayOperator(delay, scheduler) {
+        this.delay = delay;
+        this.scheduler = scheduler;
+    }
+    DelayOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DelaySubscriber(subscriber, this.delay, this.scheduler));
+    };
+    return DelayOperator;
+}());
+var DelaySubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DelaySubscriber, _super);
+    function DelaySubscriber(destination, delay, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.delay = delay;
+        _this.scheduler = scheduler;
+        _this.queue = [];
+        _this.active = false;
+        _this.errored = false;
+        return _this;
+    }
+    DelaySubscriber.dispatch = function (state) {
+        var source = state.source;
+        var queue = source.queue;
+        var scheduler = state.scheduler;
+        var destination = state.destination;
+        while (queue.length > 0 && (queue[0].time - scheduler.now()) <= 0) {
+            queue.shift().notification.observe(destination);
+        }
+        if (queue.length > 0) {
+            var delay_1 = Math.max(0, queue[0].time - scheduler.now());
+            this.schedule(state, delay_1);
+        }
+        else {
+            this.unsubscribe();
+            source.active = false;
+        }
+    };
+    DelaySubscriber.prototype._schedule = function (scheduler) {
+        this.active = true;
+        var destination = this.destination;
+        destination.add(scheduler.schedule(DelaySubscriber.dispatch, this.delay, {
+            source: this, destination: this.destination, scheduler: scheduler
+        }));
+    };
+    DelaySubscriber.prototype.scheduleNotification = function (notification) {
+        if (this.errored === true) {
+            return;
+        }
+        var scheduler = this.scheduler;
+        var message = new DelayMessage(scheduler.now() + this.delay, notification);
+        this.queue.push(message);
+        if (this.active === false) {
+            this._schedule(scheduler);
+        }
+    };
+    DelaySubscriber.prototype._next = function (value) {
+        this.scheduleNotification(_Notification__WEBPACK_IMPORTED_MODULE_4__["Notification"].createNext(value));
+    };
+    DelaySubscriber.prototype._error = function (err) {
+        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"]));
+var DelayMessage = /*@__PURE__*/ (function () {
+    function DelayMessage(time, notification) {
+        this.time = time;
+        this.notification = notification;
+    }
+    return DelayMessage;
+}());
+//# sourceMappingURL=delay.js.map
+
+
+/***/ }),
+/* 240 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isDate", function() { return isDate; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+function isDate(value) {
+    return value instanceof Date && !isNaN(+value);
+}
+//# sourceMappingURL=isDate.js.map
+
+
+/***/ }),
+/* 241 */
+/***/ (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__(242);
+/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(227);
+/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(243);
+/** 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;
+        this.value = value;
+        this.error = error;
+        this.hasValue = kind === 'N';
+    }
+    Notification.prototype.observe = function (observer) {
+        switch (this.kind) {
+            case 'N':
+                return observer.next && observer.next(this.value);
+            case 'E':
+                return observer.error && observer.error(this.error);
+            case 'C':
+                return observer.complete && observer.complete();
+        }
+    };
+    Notification.prototype.do = function (next, error, complete) {
+        var kind = this.kind;
+        switch (kind) {
+            case 'N':
+                return next && next(this.value);
+            case 'E':
+                return error && error(this.error);
+            case 'C':
+                return complete && complete();
+        }
+    };
+    Notification.prototype.accept = function (nextOrObserver, error, complete) {
+        if (nextOrObserver && typeof nextOrObserver.next === 'function') {
+            return this.observe(nextOrObserver);
+        }
+        else {
+            return this.do(nextOrObserver, error, complete);
+        }
+    };
+    Notification.prototype.toObservable = function () {
+        var kind = this.kind;
+        switch (kind) {
+            case 'N':
+                return Object(_observable_of__WEBPACK_IMPORTED_MODULE_1__["of"])(this.value);
+            case 'E':
+                return Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_2__["throwError"])(this.error);
+            case 'C':
+                return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_0__["empty"])();
+        }
+        throw new Error('unexpected notification kind value');
+    };
+    Notification.createNext = function (value) {
+        if (typeof value !== 'undefined') {
+            return new Notification('N', value);
+        }
+        return Notification.undefinedValueNotification;
+    };
+    Notification.createError = function (err) {
+        return new Notification('E', undefined, err);
+    };
+    Notification.createComplete = function () {
+        return Notification.completeNotification;
+    };
+    Notification.completeNotification = new Notification('C');
+    Notification.undefinedValueNotification = new Notification('N', undefined);
+    return Notification;
+}());
+
+//# sourceMappingURL=Notification.js.map
+
+
+/***/ }),
+/* 242 */
+/***/ (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 import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193);
+/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+
+var EMPTY = /*@__PURE__*/ new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscriber.complete(); });
+function empty(scheduler) {
+    return scheduler ? emptyScheduled(scheduler) : EMPTY;
+}
+function emptyScheduled(scheduler) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return scheduler.schedule(function () { return subscriber.complete(); }); });
+}
+//# sourceMappingURL=empty.js.map
+
+
+/***/ }),
+/* 243 */
+/***/ (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__(193);
+/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+
+function throwError(error, scheduler) {
+    if (!scheduler) {
+        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscriber.error(error); });
+    }
+    else {
+        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return scheduler.schedule(dispatch, 0, { error: error, subscriber: subscriber }); });
+    }
+}
+function dispatch(_a) {
+    var error = _a.error, subscriber = _a.subscriber;
+    subscriber.error(error);
+}
+//# sourceMappingURL=throwError.js.map
+
+
+/***/ }),
+/* 244 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(193);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Observable,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+function delayWhen(delayDurationSelector, subscriptionDelay) {
+    if (subscriptionDelay) {
+        return function (source) {
+            return new SubscriptionDelayObservable(source, subscriptionDelay)
+                .lift(new DelayWhenOperator(delayDurationSelector));
+        };
+    }
+    return function (source) { return source.lift(new DelayWhenOperator(delayDurationSelector)); };
+}
+var DelayWhenOperator = /*@__PURE__*/ (function () {
+    function DelayWhenOperator(delayDurationSelector) {
+        this.delayDurationSelector = delayDurationSelector;
+    }
+    DelayWhenOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DelayWhenSubscriber(subscriber, this.delayDurationSelector));
+    };
+    return DelayWhenOperator;
+}());
+var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DelayWhenSubscriber, _super);
+    function DelayWhenSubscriber(destination, delayDurationSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.delayDurationSelector = delayDurationSelector;
+        _this.completed = false;
+        _this.delayNotifierSubscriptions = [];
+        _this.index = 0;
+        return _this;
+    }
+    DelayWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.destination.next(outerValue);
+        this.removeSubscription(innerSub);
+        this.tryComplete();
+    };
+    DelayWhenSubscriber.prototype.notifyError = function (error, innerSub) {
+        this._error(error);
+    };
+    DelayWhenSubscriber.prototype.notifyComplete = function (innerSub) {
+        var value = this.removeSubscription(innerSub);
+        if (value) {
+            this.destination.next(value);
+        }
+        this.tryComplete();
+    };
+    DelayWhenSubscriber.prototype._next = function (value) {
+        var index = this.index++;
+        try {
+            var delayNotifier = this.delayDurationSelector(value, index);
+            if (delayNotifier) {
+                this.tryDelay(delayNotifier, value);
+            }
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+    };
+    DelayWhenSubscriber.prototype._complete = function () {
+        this.completed = true;
+        this.tryComplete();
+        this.unsubscribe();
+    };
+    DelayWhenSubscriber.prototype.removeSubscription = function (subscription) {
+        subscription.unsubscribe();
+        var subscriptionIdx = this.delayNotifierSubscriptions.indexOf(subscription);
+        if (subscriptionIdx !== -1) {
+            this.delayNotifierSubscriptions.splice(subscriptionIdx, 1);
+        }
+        return subscription.outerValue;
+    };
+    DelayWhenSubscriber.prototype.tryDelay = function (delayNotifier, value) {
+        var notifierSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, delayNotifier, value);
+        if (notifierSubscription && !notifierSubscription.closed) {
+            var destination = this.destination;
+            destination.add(notifierSubscription);
+            this.delayNotifierSubscriptions.push(notifierSubscription);
+        }
+    };
+    DelayWhenSubscriber.prototype.tryComplete = function () {
+        if (this.completed && this.delayNotifierSubscriptions.length === 0) {
+            this.destination.complete();
+        }
+    };
+    return DelayWhenSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+var SubscriptionDelayObservable = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscriptionDelayObservable, _super);
+    function SubscriptionDelayObservable(source, subscriptionDelay) {
+        var _this = _super.call(this) || this;
+        _this.source = source;
+        _this.subscriptionDelay = subscriptionDelay;
+        return _this;
+    }
+    SubscriptionDelayObservable.prototype._subscribe = function (subscriber) {
+        this.subscriptionDelay.subscribe(new SubscriptionDelaySubscriber(subscriber, this.source));
+    };
+    return SubscriptionDelayObservable;
+}(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]));
+var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscriptionDelaySubscriber, _super);
+    function SubscriptionDelaySubscriber(parent, source) {
+        var _this = _super.call(this) || this;
+        _this.parent = parent;
+        _this.source = source;
+        _this.sourceSubscribed = false;
+        return _this;
+    }
+    SubscriptionDelaySubscriber.prototype._next = function (unused) {
+        this.subscribeToSource();
+    };
+    SubscriptionDelaySubscriber.prototype._error = function (err) {
+        this.unsubscribe();
+        this.parent.error(err);
+    };
+    SubscriptionDelaySubscriber.prototype._complete = function () {
+        this.unsubscribe();
+        this.subscribeToSource();
+    };
+    SubscriptionDelaySubscriber.prototype.subscribeToSource = function () {
+        if (!this.sourceSubscribed) {
+            this.sourceSubscribed = true;
+            this.unsubscribe();
+            this.source.subscribe(this.parent);
+        }
+    };
+    return SubscriptionDelaySubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=delayWhen.js.map
+
+
+/***/ }),
+/* 245 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function dematerialize() {
+    return function dematerializeOperatorFunction(source) {
+        return source.lift(new DeMaterializeOperator());
+    };
+}
+var DeMaterializeOperator = /*@__PURE__*/ (function () {
+    function DeMaterializeOperator() {
+    }
+    DeMaterializeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DeMaterializeSubscriber(subscriber));
+    };
+    return DeMaterializeOperator;
+}());
+var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DeMaterializeSubscriber, _super);
+    function DeMaterializeSubscriber(destination) {
+        return _super.call(this, destination) || this;
+    }
+    DeMaterializeSubscriber.prototype._next = function (value) {
+        value.observe(this.destination);
+    };
+    return DeMaterializeSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=dematerialize.js.map
+
+
+/***/ }),
+/* 246 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function distinct(keySelector, flushes) {
+    return function (source) { return source.lift(new DistinctOperator(keySelector, flushes)); };
+}
+var DistinctOperator = /*@__PURE__*/ (function () {
+    function DistinctOperator(keySelector, flushes) {
+        this.keySelector = keySelector;
+        this.flushes = flushes;
+    }
+    DistinctOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DistinctSubscriber(subscriber, this.keySelector, this.flushes));
+    };
+    return DistinctOperator;
+}());
+var DistinctSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DistinctSubscriber, _super);
+    function DistinctSubscriber(destination, keySelector, flushes) {
+        var _this = _super.call(this, destination) || this;
+        _this.keySelector = keySelector;
+        _this.values = new Set();
+        if (flushes) {
+            _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, flushes));
+        }
+        return _this;
+    }
+    DistinctSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.values.clear();
+    };
+    DistinctSubscriber.prototype.notifyError = function (error, innerSub) {
+        this._error(error);
+    };
+    DistinctSubscriber.prototype._next = function (value) {
+        if (this.keySelector) {
+            this._useKeySelector(value);
+        }
+        else {
+            this._finalizeNext(value, value);
+        }
+    };
+    DistinctSubscriber.prototype._useKeySelector = function (value) {
+        var key;
+        var destination = this.destination;
+        try {
+            key = this.keySelector(value);
+        }
+        catch (err) {
+            destination.error(err);
+            return;
+        }
+        this._finalizeNext(key, value);
+    };
+    DistinctSubscriber.prototype._finalizeNext = function (key, value) {
+        var values = this.values;
+        if (!values.has(key)) {
+            values.add(key);
+            this.destination.next(value);
+        }
+    };
+    return DistinctSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+
+//# sourceMappingURL=distinct.js.map
+
+
+/***/ }),
+/* 247 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function distinctUntilChanged(compare, keySelector) {
+    return function (source) { return source.lift(new DistinctUntilChangedOperator(compare, keySelector)); };
+}
+var DistinctUntilChangedOperator = /*@__PURE__*/ (function () {
+    function DistinctUntilChangedOperator(compare, keySelector) {
+        this.compare = compare;
+        this.keySelector = keySelector;
+    }
+    DistinctUntilChangedOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new DistinctUntilChangedSubscriber(subscriber, this.compare, this.keySelector));
+    };
+    return DistinctUntilChangedOperator;
+}());
+var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DistinctUntilChangedSubscriber, _super);
+    function DistinctUntilChangedSubscriber(destination, compare, keySelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.keySelector = keySelector;
+        _this.hasKey = false;
+        if (typeof compare === 'function') {
+            _this.compare = compare;
+        }
+        return _this;
+    }
+    DistinctUntilChangedSubscriber.prototype.compare = function (x, y) {
+        return x === y;
+    };
+    DistinctUntilChangedSubscriber.prototype._next = function (value) {
+        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) {
+            try {
+                var compare = this.compare;
+                result = compare(this.key, key);
+            }
+            catch (err) {
+                return this.destination.error(err);
+            }
+        }
+        else {
+            this.hasKey = true;
+        }
+        if (!result) {
+            this.key = key;
+            this.destination.next(value);
+        }
+    };
+    return DistinctUntilChangedSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=distinctUntilChanged.js.map
+
+
+/***/ }),
+/* 248 */
+/***/ (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__(247);
+/** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */
+
+function distinctUntilKeyChanged(key, compare) {
+    return Object(_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__["distinctUntilChanged"])(function (x, y) { return compare ? compare(x[key], y[key]) : x[key] === y[key]; });
+}
+//# sourceMappingURL=distinctUntilKeyChanged.js.map
+
+
+/***/ }),
+/* 249 */
+/***/ (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__(251);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(252);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(238);
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(254);
+/** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */
+
+
+
+
+
+function elementAt(index, defaultValue) {
+    if (index < 0) {
+        throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__["ArgumentOutOfRangeError"]();
+    }
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) {
+        return source.pipe(Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return i === index; }), Object(_take__WEBPACK_IMPORTED_MODULE_4__["take"])(1), hasDefaultValue
+            ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__["defaultIfEmpty"])(defaultValue)
+            : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__["throwIfEmpty"])(function () { return new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__["ArgumentOutOfRangeError"](); }));
+    };
+}
+//# sourceMappingURL=elementAt.js.map
+
+
+/***/ }),
+/* 250 */
+/***/ (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; });
+/** 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;
+    }
+    ArgumentOutOfRangeErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+    return ArgumentOutOfRangeErrorImpl;
+})();
+var ArgumentOutOfRangeError = ArgumentOutOfRangeErrorImpl;
+//# sourceMappingURL=ArgumentOutOfRangeError.js.map
+
+
+/***/ }),
+/* 251 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** 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
+
+
+/***/ }),
+/* 252 */
+/***/ (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 tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36);
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(253);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_util_EmptyError,_Subscriber PURE_IMPORTS_END */
+
+
+
+function throwIfEmpty(errorFactory) {
+    if (errorFactory === void 0) {
+        errorFactory = defaultErrorFactory;
+    }
+    return function (source) {
+        return source.lift(new ThrowIfEmptyOperator(errorFactory));
+    };
+}
+var ThrowIfEmptyOperator = /*@__PURE__*/ (function () {
+    function ThrowIfEmptyOperator(errorFactory) {
+        this.errorFactory = errorFactory;
+    }
+    ThrowIfEmptyOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ThrowIfEmptySubscriber(subscriber, this.errorFactory));
+    };
+    return ThrowIfEmptyOperator;
+}());
+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.errorFactory = errorFactory;
+        _this.hasValue = false;
+        return _this;
+    }
+    ThrowIfEmptySubscriber.prototype._next = function (value) {
+        this.hasValue = true;
+        this.destination.next(value);
+    };
+    ThrowIfEmptySubscriber.prototype._complete = function () {
+        if (!this.hasValue) {
+            var err = void 0;
+            try {
+                err = this.errorFactory();
+            }
+            catch (e) {
+                err = e;
+            }
+            this.destination.error(err);
+        }
+        else {
+            return this.destination.complete();
+        }
+    };
+    return ThrowIfEmptySubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"]));
+function defaultErrorFactory() {
+    return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__["EmptyError"]();
+}
+//# sourceMappingURL=throwIfEmpty.js.map
+
+
+/***/ }),
+/* 253 */
+/***/ (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; });
+/** 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;
+    }
+    EmptyErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+    return EmptyErrorImpl;
+})();
+var EmptyError = EmptyErrorImpl;
+//# sourceMappingURL=EmptyError.js.map
+
+
+/***/ }),
+/* 254 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(250);
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(242);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */
+
+
+
+
+function take(count) {
+    return function (source) {
+        if (count === 0) {
+            return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_3__["empty"])();
+        }
+        else {
+            return source.lift(new TakeOperator(count));
+        }
+    };
+}
+var TakeOperator = /*@__PURE__*/ (function () {
+    function TakeOperator(total) {
+        this.total = total;
+        if (this.total < 0) {
+            throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"];
+        }
+    }
+    TakeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new TakeSubscriber(subscriber, this.total));
+    };
+    return TakeOperator;
+}());
+var TakeSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeSubscriber, _super);
+    function TakeSubscriber(destination, total) {
+        var _this = _super.call(this, destination) || this;
+        _this.total = total;
+        _this.count = 0;
+        return _this;
+    }
+    TakeSubscriber.prototype._next = function (value) {
+        var total = this.total;
+        var count = ++this.count;
+        if (count <= total) {
+            this.destination.next(value);
+            if (count === total) {
+                this.destination.complete();
+                this.unsubscribe();
+            }
+        }
+    };
+    return TakeSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=take.js.map
+
+
+/***/ }),
+/* 255 */
+/***/ (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_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(226);
+/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(227);
+/** PURE_IMPORTS_START _observable_concat,_observable_of PURE_IMPORTS_END */
+
+
+function endWith() {
+    var array = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        array[_i] = arguments[_i];
+    }
+    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
+
+
+/***/ }),
+/* 256 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function every(predicate, thisArg) {
+    return function (source) { return source.lift(new EveryOperator(predicate, thisArg, source)); };
+}
+var EveryOperator = /*@__PURE__*/ (function () {
+    function EveryOperator(predicate, thisArg, source) {
+        this.predicate = predicate;
+        this.thisArg = thisArg;
+        this.source = source;
+    }
+    EveryOperator.prototype.call = function (observer, source) {
+        return source.subscribe(new EverySubscriber(observer, this.predicate, this.thisArg, this.source));
+    };
+    return EveryOperator;
+}());
+var EverySubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](EverySubscriber, _super);
+    function EverySubscriber(destination, predicate, thisArg, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.thisArg = thisArg;
+        _this.source = source;
+        _this.index = 0;
+        _this.thisArg = thisArg || _this;
+        return _this;
+    }
+    EverySubscriber.prototype.notifyComplete = function (everyValueMatch) {
+        this.destination.next(everyValueMatch);
+        this.destination.complete();
+    };
+    EverySubscriber.prototype._next = function (value) {
+        var result = false;
+        try {
+            result = this.predicate.call(this.thisArg, value, this.index++, this.source);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        if (!result) {
+            this.notifyComplete(false);
+        }
+    };
+    EverySubscriber.prototype._complete = function () {
+        this.notifyComplete(true);
+    };
+    return EverySubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=every.js.map
+
+
+/***/ }),
+/* 257 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function exhaust() {
+    return function (source) { return source.lift(new SwitchFirstOperator()); };
+}
+var SwitchFirstOperator = /*@__PURE__*/ (function () {
+    function SwitchFirstOperator() {
+    }
+    SwitchFirstOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SwitchFirstSubscriber(subscriber));
+    };
+    return SwitchFirstOperator;
+}());
+var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SwitchFirstSubscriber, _super);
+    function SwitchFirstSubscriber(destination) {
+        var _this = _super.call(this, destination) || this;
+        _this.hasCompleted = false;
+        _this.hasSubscription = false;
+        return _this;
+    }
+    SwitchFirstSubscriber.prototype._next = function (value) {
+        if (!this.hasSubscription) {
+            this.hasSubscription = true;
+            this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, value));
+        }
+    };
+    SwitchFirstSubscriber.prototype._complete = function () {
+        this.hasCompleted = true;
+        if (!this.hasSubscription) {
+            this.destination.complete();
+        }
+    };
+    SwitchFirstSubscriber.prototype.notifyComplete = function (innerSub) {
+        this.remove(innerSub);
+        this.hasSubscription = false;
+        if (this.hasCompleted) {
+            this.destination.complete();
+        }
+    };
+    return SwitchFirstSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=exhaust.js.map
+
+
+/***/ }),
+/* 258 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(183);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182);
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(231);
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(218);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
+
+
+
+
+
+
+function exhaustMap(project, resultSelector) {
+    if (resultSelector) {
+        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 ExhaustMapOperator(project));
+    };
+}
+var ExhaustMapOperator = /*@__PURE__*/ (function () {
+    function ExhaustMapOperator(project) {
+        this.project = project;
+    }
+    ExhaustMapOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ExhaustMapSubscriber(subscriber, this.project));
+    };
+    return ExhaustMapOperator;
+}());
+var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExhaustMapSubscriber, _super);
+    function ExhaustMapSubscriber(destination, project) {
+        var _this = _super.call(this, destination) || this;
+        _this.project = project;
+        _this.hasSubscription = false;
+        _this.hasCompleted = false;
+        _this.index = 0;
+        return _this;
+    }
+    ExhaustMapSubscriber.prototype._next = function (value) {
+        if (!this.hasSubscription) {
+            this.tryNext(value);
+        }
+    };
+    ExhaustMapSubscriber.prototype.tryNext = function (value) {
+        var result;
+        var index = this.index++;
+        try {
+            result = this.project(value, index);
+        }
+        catch (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);
+    };
+    ExhaustMapSubscriber.prototype.notifyError = function (err) {
+        this.destination.error(err);
+    };
+    ExhaustMapSubscriber.prototype.notifyComplete = function (innerSub) {
+        var destination = this.destination;
+        destination.remove(innerSub);
+        this.hasSubscription = false;
+        if (this.hasCompleted) {
+            this.destination.complete();
+        }
+    };
+    return ExhaustMapSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=exhaustMap.js.map
+
+
+/***/ }),
+/* 259 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function expand(project, concurrent, scheduler) {
+    if (concurrent === void 0) {
+        concurrent = Number.POSITIVE_INFINITY;
+    }
+    if (scheduler === void 0) {
+        scheduler = undefined;
+    }
+    concurrent = (concurrent || 0) < 1 ? Number.POSITIVE_INFINITY : concurrent;
+    return function (source) { return source.lift(new ExpandOperator(project, concurrent, scheduler)); };
+}
+var ExpandOperator = /*@__PURE__*/ (function () {
+    function ExpandOperator(project, concurrent, scheduler) {
+        this.project = project;
+        this.concurrent = concurrent;
+        this.scheduler = scheduler;
+    }
+    ExpandOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ExpandSubscriber(subscriber, this.project, this.concurrent, this.scheduler));
+    };
+    return ExpandOperator;
+}());
+
+var ExpandSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExpandSubscriber, _super);
+    function ExpandSubscriber(destination, project, concurrent, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.project = project;
+        _this.concurrent = concurrent;
+        _this.scheduler = scheduler;
+        _this.index = 0;
+        _this.active = 0;
+        _this.hasCompleted = false;
+        if (concurrent < Number.POSITIVE_INFINITY) {
+            _this.buffer = [];
+        }
+        return _this;
+    }
+    ExpandSubscriber.dispatch = function (arg) {
+        var subscriber = arg.subscriber, result = arg.result, value = arg.value, index = arg.index;
+        subscriber.subscribeToProjection(result, value, index);
+    };
+    ExpandSubscriber.prototype._next = function (value) {
+        var destination = this.destination;
+        if (destination.closed) {
+            this._complete();
+            return;
+        }
+        var index = this.index++;
+        if (this.active < this.concurrent) {
+            destination.next(value);
+            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));
+                }
+            }
+            catch (e) {
+                destination.error(e);
+            }
+        }
+        else {
+            this.buffer.push(value);
+        }
+    };
+    ExpandSubscriber.prototype.subscribeToProjection = function (result, value, index) {
+        this.active++;
+        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;
+        var destination = this.destination;
+        destination.remove(innerSub);
+        this.active--;
+        if (buffer && buffer.length > 0) {
+            this._next(buffer.shift());
+        }
+        if (this.hasCompleted && this.active === 0) {
+            this.destination.complete();
+        }
+    };
+    return ExpandSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+
+//# sourceMappingURL=expand.js.map
+
+
+/***/ }),
+/* 260 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription PURE_IMPORTS_END */
+
+
+
+function finalize(callback) {
+    return function (source) { return source.lift(new FinallyOperator(callback)); };
+}
+var FinallyOperator = /*@__PURE__*/ (function () {
+    function FinallyOperator(callback) {
+        this.callback = callback;
+    }
+    FinallyOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new FinallySubscriber(subscriber, this.callback));
+    };
+    return FinallyOperator;
+}());
+var FinallySubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FinallySubscriber, _super);
+    function FinallySubscriber(destination, callback) {
+        var _this = _super.call(this, destination) || this;
+        _this.add(new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](callback));
+        return _this;
+    }
+    return FinallySubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=finalize.js.map
+
+
+/***/ }),
+/* 261 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function find(predicate, thisArg) {
+    if (typeof predicate !== 'function') {
+        throw new TypeError('predicate is not a function');
+    }
+    return function (source) { return source.lift(new FindValueOperator(predicate, source, false, thisArg)); };
+}
+var FindValueOperator = /*@__PURE__*/ (function () {
+    function FindValueOperator(predicate, source, yieldIndex, thisArg) {
+        this.predicate = predicate;
+        this.source = source;
+        this.yieldIndex = yieldIndex;
+        this.thisArg = thisArg;
+    }
+    FindValueOperator.prototype.call = function (observer, source) {
+        return source.subscribe(new FindValueSubscriber(observer, this.predicate, this.source, this.yieldIndex, this.thisArg));
+    };
+    return FindValueOperator;
+}());
+
+var FindValueSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FindValueSubscriber, _super);
+    function FindValueSubscriber(destination, predicate, source, yieldIndex, thisArg) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.source = source;
+        _this.yieldIndex = yieldIndex;
+        _this.thisArg = thisArg;
+        _this.index = 0;
+        return _this;
+    }
+    FindValueSubscriber.prototype.notifyComplete = function (value) {
+        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;
+        var index = this.index++;
+        try {
+            var result = predicate.call(thisArg || this, value, index, this.source);
+            if (result) {
+                this.notifyComplete(this.yieldIndex ? index : value);
+            }
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+    };
+    FindValueSubscriber.prototype._complete = function () {
+        this.notifyComplete(this.yieldIndex ? -1 : undefined);
+    };
+    return FindValueSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+
+//# sourceMappingURL=find.js.map
+
+
+/***/ }),
+/* 262 */
+/***/ (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__(261);
+/** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */
+
+function findIndex(predicate, thisArg) {
+    return function (source) { return source.lift(new _operators_find__WEBPACK_IMPORTED_MODULE_0__["FindValueOperator"](predicate, source, true, thisArg)); };
+}
+//# sourceMappingURL=findIndex.js.map
+
+
+/***/ }),
+/* 263 */
+/***/ (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__(253);
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(251);
+/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(254);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(238);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(252);
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(232);
+/** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */
+
+
+
+
+
+
+function first(predicate, defaultValue) {
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) { return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__["identity"], Object(_take__WEBPACK_IMPORTED_MODULE_2__["take"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__["defaultIfEmpty"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__["throwIfEmpty"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"](); })); };
+}
+//# sourceMappingURL=first.js.map
+
+
+/***/ }),
+/* 264 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(193);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(265);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription,_Observable,_Subject PURE_IMPORTS_END */
+
+
+
+
+
+function groupBy(keySelector, elementSelector, durationSelector, subjectSelector) {
+    return function (source) {
+        return source.lift(new GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector));
+    };
+}
+var GroupByOperator = /*@__PURE__*/ (function () {
+    function GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector) {
+        this.keySelector = keySelector;
+        this.elementSelector = elementSelector;
+        this.durationSelector = durationSelector;
+        this.subjectSelector = subjectSelector;
+    }
+    GroupByOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new GroupBySubscriber(subscriber, this.keySelector, this.elementSelector, this.durationSelector, this.subjectSelector));
+    };
+    return GroupByOperator;
+}());
+var GroupBySubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupBySubscriber, _super);
+    function GroupBySubscriber(destination, keySelector, elementSelector, durationSelector, subjectSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.keySelector = keySelector;
+        _this.elementSelector = elementSelector;
+        _this.durationSelector = durationSelector;
+        _this.subjectSelector = subjectSelector;
+        _this.groups = null;
+        _this.attemptedToUnsubscribe = false;
+        _this.count = 0;
+        return _this;
+    }
+    GroupBySubscriber.prototype._next = function (value) {
+        var key;
+        try {
+            key = this.keySelector(value);
+        }
+        catch (err) {
+            this.error(err);
+            return;
+        }
+        this._group(value, key);
+    };
+    GroupBySubscriber.prototype._group = function (value, key) {
+        var groups = this.groups;
+        if (!groups) {
+            groups = this.groups = new Map();
+        }
+        var group = groups.get(key);
+        var element;
+        if (this.elementSelector) {
+            try {
+                element = this.elementSelector(value);
+            }
+            catch (err) {
+                this.error(err);
+            }
+        }
+        else {
+            element = value;
+        }
+        if (!group) {
+            group = (this.subjectSelector ? this.subjectSelector() : new _Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]());
+            groups.set(key, group);
+            var groupedObservable = new GroupedObservable(key, group, this);
+            this.destination.next(groupedObservable);
+            if (this.durationSelector) {
+                var duration = void 0;
+                try {
+                    duration = this.durationSelector(new GroupedObservable(key, group));
+                }
+                catch (err) {
+                    this.error(err);
+                    return;
+                }
+                this.add(duration.subscribe(new GroupDurationSubscriber(key, group, this)));
+            }
+        }
+        if (!group.closed) {
+            group.next(element);
+        }
+    };
+    GroupBySubscriber.prototype._error = function (err) {
+        var groups = this.groups;
+        if (groups) {
+            groups.forEach(function (group, key) {
+                group.error(err);
+            });
+            groups.clear();
+        }
+        this.destination.error(err);
+    };
+    GroupBySubscriber.prototype._complete = function () {
+        var groups = this.groups;
+        if (groups) {
+            groups.forEach(function (group, key) {
+                group.complete();
+            });
+            groups.clear();
+        }
+        this.destination.complete();
+    };
+    GroupBySubscriber.prototype.removeGroup = function (key) {
+        this.groups.delete(key);
+    };
+    GroupBySubscriber.prototype.unsubscribe = function () {
+        if (!this.closed) {
+            this.attemptedToUnsubscribe = true;
+            if (this.count === 0) {
+                _super.prototype.unsubscribe.call(this);
+            }
+        }
+    };
+    return GroupBySubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+var GroupDurationSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupDurationSubscriber, _super);
+    function GroupDurationSubscriber(key, group, parent) {
+        var _this = _super.call(this, group) || this;
+        _this.key = key;
+        _this.group = group;
+        _this.parent = parent;
+        return _this;
+    }
+    GroupDurationSubscriber.prototype._next = function (value) {
+        this.complete();
+    };
+    GroupDurationSubscriber.prototype._unsubscribe = function () {
+        var _a = this, parent = _a.parent, key = _a.key;
+        this.key = this.parent = null;
+        if (parent) {
+            parent.removeGroup(key);
+        }
+    };
+    return GroupDurationSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+var GroupedObservable = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupedObservable, _super);
+    function GroupedObservable(key, groupSubject, refCountSubscription) {
+        var _this = _super.call(this) || this;
+        _this.key = key;
+        _this.groupSubject = groupSubject;
+        _this.refCountSubscription = refCountSubscription;
+        return _this;
+    }
+    GroupedObservable.prototype._subscribe = function (subscriber) {
+        var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]();
+        var _a = this, refCountSubscription = _a.refCountSubscription, groupSubject = _a.groupSubject;
+        if (refCountSubscription && !refCountSubscription.closed) {
+            subscription.add(new InnerRefCountSubscription(refCountSubscription));
+        }
+        subscription.add(groupSubject.subscribe(subscriber));
+        return subscription;
+    };
+    return GroupedObservable;
+}(_Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"]));
+
+var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](InnerRefCountSubscription, _super);
+    function InnerRefCountSubscription(parent) {
+        var _this = _super.call(this) || this;
+        _this.parent = parent;
+        parent.count++;
+        return _this;
+    }
+    InnerRefCountSubscription.prototype.unsubscribe = function () {
+        var parent = this.parent;
+        if (!parent.closed && !this.closed) {
+            _super.prototype.unsubscribe.call(this);
+            parent.count -= 1;
+            if (parent.count === 0 && parent.attemptedToUnsubscribe) {
+                parent.unsubscribe();
+            }
+        }
+    };
+    return InnerRefCountSubscription;
+}(_Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]));
+//# sourceMappingURL=groupBy.js.map
+
+
+/***/ }),
+/* 265 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__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__(36);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(193);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(172);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(177);
+/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(266);
+/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(267);
+/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(181);
+/** PURE_IMPORTS_START tslib,_Observable,_Subscriber,_Subscription,_util_ObjectUnsubscribedError,_SubjectSubscription,_internal_symbol_rxSubscriber PURE_IMPORTS_END */
+
+
+
+
+
+
+
+var SubjectSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubjectSubscriber, _super);
+    function SubjectSubscriber(destination) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        return _this;
+    }
+    return SubjectSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"]));
+
+var Subject = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Subject, _super);
+    function Subject() {
+        var _this = _super.call(this) || this;
+        _this.observers = [];
+        _this.closed = false;
+        _this.isStopped = false;
+        _this.hasError = false;
+        _this.thrownError = null;
+        return _this;
+    }
+    Subject.prototype[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__["rxSubscriber"]] = function () {
+        return new SubjectSubscriber(this);
+    };
+    Subject.prototype.lift = function (operator) {
+        var subject = new AnonymousSubject(this, this);
+        subject.operator = operator;
+        return subject;
+    };
+    Subject.prototype.next = function (value) {
+        if (this.closed) {
+            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
+        }
+        if (!this.isStopped) {
+            var observers = this.observers;
+            var len = observers.length;
+            var copy = observers.slice();
+            for (var i = 0; i < len; i++) {
+                copy[i].next(value);
+            }
+        }
+    };
+    Subject.prototype.error = function (err) {
+        if (this.closed) {
+            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
+        }
+        this.hasError = true;
+        this.thrownError = err;
+        this.isStopped = true;
+        var observers = this.observers;
+        var len = observers.length;
+        var copy = observers.slice();
+        for (var i = 0; i < len; i++) {
+            copy[i].error(err);
+        }
+        this.observers.length = 0;
+    };
+    Subject.prototype.complete = function () {
+        if (this.closed) {
+            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
+        }
+        this.isStopped = true;
+        var observers = this.observers;
+        var len = observers.length;
+        var copy = observers.slice();
+        for (var i = 0; i < len; i++) {
+            copy[i].complete();
+        }
+        this.observers.length = 0;
+    };
+    Subject.prototype.unsubscribe = function () {
+        this.isStopped = true;
+        this.closed = true;
+        this.observers = null;
+    };
+    Subject.prototype._trySubscribe = function (subscriber) {
+        if (this.closed) {
+            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
+        }
+        else {
+            return _super.prototype._trySubscribe.call(this, subscriber);
+        }
+    };
+    Subject.prototype._subscribe = function (subscriber) {
+        if (this.closed) {
+            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
+        }
+        else if (this.hasError) {
+            subscriber.error(this.thrownError);
+            return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
+        }
+        else if (this.isStopped) {
+            subscriber.complete();
+            return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
+        }
+        else {
+            this.observers.push(subscriber);
+            return new _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__["SubjectSubscription"](this, subscriber);
+        }
+    };
+    Subject.prototype.asObservable = function () {
+        var observable = new _Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"]();
+        observable.source = this;
+        return observable;
+    };
+    Subject.create = function (destination, source) {
+        return new AnonymousSubject(destination, source);
+    };
+    return Subject;
+}(_Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"]));
+
+var AnonymousSubject = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnonymousSubject, _super);
+    function AnonymousSubject(destination, source) {
+        var _this = _super.call(this) || this;
+        _this.destination = destination;
+        _this.source = source;
+        return _this;
+    }
+    AnonymousSubject.prototype.next = function (value) {
+        var destination = this.destination;
+        if (destination && destination.next) {
+            destination.next(value);
+        }
+    };
+    AnonymousSubject.prototype.error = function (err) {
+        var destination = this.destination;
+        if (destination && destination.error) {
+            this.destination.error(err);
+        }
+    };
+    AnonymousSubject.prototype.complete = function () {
+        var destination = this.destination;
+        if (destination && destination.complete) {
+            this.destination.complete();
+        }
+    };
+    AnonymousSubject.prototype._subscribe = function (subscriber) {
+        var source = this.source;
+        if (source) {
+            return this.source.subscribe(subscriber);
+        }
+        else {
+            return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
+        }
+    };
+    return AnonymousSubject;
+}(Subject));
+
+//# sourceMappingURL=Subject.js.map
+
+
+/***/ }),
+/* 266 */
+/***/ (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; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var ObjectUnsubscribedErrorImpl = /*@__PURE__*/ (function () {
+    function ObjectUnsubscribedErrorImpl() {
+        Error.call(this);
+        this.message = 'object unsubscribed';
+        this.name = 'ObjectUnsubscribedError';
+        return this;
+    }
+    ObjectUnsubscribedErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+    return ObjectUnsubscribedErrorImpl;
+})();
+var ObjectUnsubscribedError = ObjectUnsubscribedErrorImpl;
+//# sourceMappingURL=ObjectUnsubscribedError.js.map
+
+
+/***/ }),
+/* 267 */
+/***/ (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__(36);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177);
+/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
+
+
+var SubjectSubscription = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubjectSubscription, _super);
+    function SubjectSubscription(subject, subscriber) {
+        var _this = _super.call(this) || this;
+        _this.subject = subject;
+        _this.subscriber = subscriber;
+        _this.closed = false;
+        return _this;
+    }
+    SubjectSubscription.prototype.unsubscribe = function () {
+        if (this.closed) {
+            return;
+        }
+        this.closed = true;
+        var subject = this.subject;
+        var observers = subject.observers;
+        this.subject = null;
+        if (!observers || observers.length === 0 || subject.isStopped || subject.closed) {
+            return;
+        }
+        var subscriberIndex = observers.indexOf(this.subscriber);
+        if (subscriberIndex !== -1) {
+            observers.splice(subscriberIndex, 1);
+        }
+    };
+    return SubjectSubscription;
+}(_Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]));
+
+//# sourceMappingURL=SubjectSubscription.js.map
+
+
+/***/ }),
+/* 268 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function ignoreElements() {
+    return function ignoreElementsOperatorFunction(source) {
+        return source.lift(new IgnoreElementsOperator());
+    };
+}
+var IgnoreElementsOperator = /*@__PURE__*/ (function () {
+    function IgnoreElementsOperator() {
+    }
+    IgnoreElementsOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new IgnoreElementsSubscriber(subscriber));
+    };
+    return IgnoreElementsOperator;
+}());
+var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](IgnoreElementsSubscriber, _super);
+    function IgnoreElementsSubscriber() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    IgnoreElementsSubscriber.prototype._next = function (unused) {
+    };
+    return IgnoreElementsSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=ignoreElements.js.map
+
+
+/***/ }),
+/* 269 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function isEmpty() {
+    return function (source) { return source.lift(new IsEmptyOperator()); };
+}
+var IsEmptyOperator = /*@__PURE__*/ (function () {
+    function IsEmptyOperator() {
+    }
+    IsEmptyOperator.prototype.call = function (observer, source) {
+        return source.subscribe(new IsEmptySubscriber(observer));
+    };
+    return IsEmptyOperator;
+}());
+var IsEmptySubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](IsEmptySubscriber, _super);
+    function IsEmptySubscriber(destination) {
+        return _super.call(this, destination) || this;
+    }
+    IsEmptySubscriber.prototype.notifyComplete = function (isEmpty) {
+        var destination = this.destination;
+        destination.next(isEmpty);
+        destination.complete();
+    };
+    IsEmptySubscriber.prototype._next = function (value) {
+        this.notifyComplete(false);
+    };
+    IsEmptySubscriber.prototype._complete = function () {
+        this.notifyComplete(true);
+    };
+    return IsEmptySubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=isEmpty.js.map
+
+
+/***/ }),
+/* 270 */
+/***/ (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__(253);
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(251);
+/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(271);
+/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(252);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(238);
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(232);
+/** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */
+
+
+
+
+
+
+function last(predicate, defaultValue) {
+    var hasDefaultValue = arguments.length >= 2;
+    return function (source) { return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__["identity"], Object(_takeLast__WEBPACK_IMPORTED_MODULE_2__["takeLast"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__["defaultIfEmpty"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__["throwIfEmpty"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"](); })); };
+}
+//# sourceMappingURL=last.js.map
+
+
+/***/ }),
+/* 271 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(250);
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(242);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */
+
+
+
+
+function takeLast(count) {
+    return function takeLastOperatorFunction(source) {
+        if (count === 0) {
+            return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_3__["empty"])();
+        }
+        else {
+            return source.lift(new TakeLastOperator(count));
+        }
+    };
+}
+var TakeLastOperator = /*@__PURE__*/ (function () {
+    function TakeLastOperator(total) {
+        this.total = total;
+        if (this.total < 0) {
+            throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"];
+        }
+    }
+    TakeLastOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new TakeLastSubscriber(subscriber, this.total));
+    };
+    return TakeLastOperator;
+}());
+var TakeLastSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeLastSubscriber, _super);
+    function TakeLastSubscriber(destination, total) {
+        var _this = _super.call(this, destination) || this;
+        _this.total = total;
+        _this.ring = new Array();
+        _this.count = 0;
+        return _this;
+    }
+    TakeLastSubscriber.prototype._next = function (value) {
+        var ring = this.ring;
+        var total = this.total;
+        var count = this.count++;
+        if (ring.length < total) {
+            ring.push(value);
+        }
+        else {
+            var index = count % total;
+            ring[index] = value;
+        }
+    };
+    TakeLastSubscriber.prototype._complete = function () {
+        var destination = this.destination;
+        var count = this.count;
+        if (count > 0) {
+            var total = this.count >= this.total ? this.total : this.count;
+            var ring = this.ring;
+            for (var i = 0; i < total; i++) {
+                var idx = (count++) % total;
+                destination.next(ring[idx]);
+            }
+        }
+        destination.complete();
+    };
+    return TakeLastSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=takeLast.js.map
+
+
+/***/ }),
+/* 272 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function mapTo(value) {
+    return function (source) { return source.lift(new MapToOperator(value)); };
+}
+var MapToOperator = /*@__PURE__*/ (function () {
+    function MapToOperator(value) {
+        this.value = value;
+    }
+    MapToOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new MapToSubscriber(subscriber, this.value));
+    };
+    return MapToOperator;
+}());
+var MapToSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MapToSubscriber, _super);
+    function MapToSubscriber(destination, value) {
+        var _this = _super.call(this, destination) || this;
+        _this.value = value;
+        return _this;
+    }
+    MapToSubscriber.prototype._next = function (x) {
+        this.destination.next(this.value);
+    };
+    return MapToSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=mapTo.js.map
+
+
+/***/ }),
+/* 273 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(241);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
+
+
+
+function materialize() {
+    return function materializeOperatorFunction(source) {
+        return source.lift(new MaterializeOperator());
+    };
+}
+var MaterializeOperator = /*@__PURE__*/ (function () {
+    function MaterializeOperator() {
+    }
+    MaterializeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new MaterializeSubscriber(subscriber));
+    };
+    return MaterializeOperator;
+}());
+var MaterializeSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MaterializeSubscriber, _super);
+    function MaterializeSubscriber(destination) {
+        return _super.call(this, destination) || this;
+    }
+    MaterializeSubscriber.prototype._next = function (value) {
+        this.destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createNext(value));
+    };
+    MaterializeSubscriber.prototype._error = function (err) {
+        var destination = this.destination;
+        destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createError(err));
+        destination.complete();
+    };
+    MaterializeSubscriber.prototype._complete = function () {
+        var destination = this.destination;
+        destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createComplete());
+        destination.complete();
+    };
+    return MaterializeSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=materialize.js.map
+
+
+/***/ }),
+/* 274 */
+/***/ (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__(275);
+/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
+
+function max(comparer) {
+    var max = (typeof comparer === 'function')
+        ? function (x, y) { return comparer(x, y) > 0 ? x : y; }
+        : function (x, y) { return x > y ? x : y; };
+    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(max);
+}
+//# sourceMappingURL=max.js.map
+
+
+/***/ }),
+/* 275 */
+/***/ (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__(276);
+/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(271);
+/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(238);
+/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(196);
+/** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */
+
+
+
+
+function reduce(accumulator, seed) {
+    if (arguments.length >= 2) {
+        return function reduceOperatorFunctionWithSeed(source) {
+            return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(accumulator, seed), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1), Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__["defaultIfEmpty"])(seed))(source);
+        };
+    }
+    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);
+    };
+}
+//# sourceMappingURL=reduce.js.map
+
+
+/***/ }),
+/* 276 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function scan(accumulator, seed) {
+    var hasSeed = false;
+    if (arguments.length >= 2) {
+        hasSeed = true;
+    }
+    return function scanOperatorFunction(source) {
+        return source.lift(new ScanOperator(accumulator, seed, hasSeed));
+    };
+}
+var ScanOperator = /*@__PURE__*/ (function () {
+    function ScanOperator(accumulator, seed, hasSeed) {
+        if (hasSeed === void 0) {
+            hasSeed = false;
+        }
+        this.accumulator = accumulator;
+        this.seed = seed;
+        this.hasSeed = hasSeed;
+    }
+    ScanOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ScanSubscriber(subscriber, this.accumulator, this.seed, this.hasSeed));
+    };
+    return ScanOperator;
+}());
+var ScanSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ScanSubscriber, _super);
+    function ScanSubscriber(destination, accumulator, _seed, hasSeed) {
+        var _this = _super.call(this, destination) || this;
+        _this.accumulator = accumulator;
+        _this._seed = _seed;
+        _this.hasSeed = hasSeed;
+        _this.index = 0;
+        return _this;
+    }
+    Object.defineProperty(ScanSubscriber.prototype, "seed", {
+        get: function () {
+            return this._seed;
+        },
+        set: function (value) {
+            this.hasSeed = true;
+            this._seed = value;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    ScanSubscriber.prototype._next = function (value) {
+        if (!this.hasSeed) {
+            this.seed = value;
+            this.destination.next(value);
+        }
+        else {
+            return this._tryNext(value);
+        }
+    };
+    ScanSubscriber.prototype._tryNext = function (value) {
+        var index = this.index++;
+        var result;
+        try {
+            result = this.accumulator(this.seed, value, index);
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+        this.seed = result;
+        this.destination.next(result);
+    };
+    return ScanSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=scan.js.map
+
+
+/***/ }),
+/* 277 */
+/***/ (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__(278);
+/** PURE_IMPORTS_START _observable_merge PURE_IMPORTS_END */
+
+function merge() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    return function (source) { return source.lift.call(_observable_merge__WEBPACK_IMPORTED_MODULE_0__["merge"].apply(void 0, [source].concat(observables))); };
+}
+//# sourceMappingURL=merge.js.map
+
+
+/***/ }),
+/* 278 */
+/***/ (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__(193);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(206);
+/* harmony import */ var _operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(229);
+/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(215);
+/** PURE_IMPORTS_START _Observable,_util_isScheduler,_operators_mergeAll,_fromArray PURE_IMPORTS_END */
+
+
+
+
+function merge() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    var concurrent = Number.POSITIVE_INFINITY;
+    var scheduler = null;
+    var last = observables[observables.length - 1];
+    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(last)) {
+        scheduler = observables.pop();
+        if (observables.length > 1 && typeof observables[observables.length - 1] === 'number') {
+            concurrent = observables.pop();
+        }
+    }
+    else if (typeof last === 'number') {
+        concurrent = observables.pop();
+    }
+    if (scheduler === null && observables.length === 1 && observables[0] instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) {
+        return observables[0];
+    }
+    return Object(_operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__["mergeAll"])(concurrent)(Object(_fromArray__WEBPACK_IMPORTED_MODULE_3__["fromArray"])(observables, scheduler));
+}
+//# sourceMappingURL=merge.js.map
+
+
+/***/ }),
+/* 279 */
+/***/ (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__(230);
+/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
+
+function mergeMapTo(innerObservable, resultSelector, concurrent) {
+    if (concurrent === void 0) {
+        concurrent = Number.POSITIVE_INFINITY;
+    }
+    if (typeof resultSelector === 'function') {
+        return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(function () { return innerObservable; }, resultSelector, concurrent);
+    }
+    if (typeof resultSelector === 'number') {
+        concurrent = resultSelector;
+    }
+    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(function () { return innerObservable; }, concurrent);
+}
+//# sourceMappingURL=mergeMapTo.js.map
+
+
+/***/ }),
+/* 280 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__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__(36);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(182);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(183);
+/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber PURE_IMPORTS_END */
+
+
+
+
+function mergeScan(accumulator, seed, concurrent) {
+    if (concurrent === void 0) {
+        concurrent = Number.POSITIVE_INFINITY;
+    }
+    return function (source) { return source.lift(new MergeScanOperator(accumulator, seed, concurrent)); };
+}
+var MergeScanOperator = /*@__PURE__*/ (function () {
+    function MergeScanOperator(accumulator, seed, concurrent) {
+        this.accumulator = accumulator;
+        this.seed = seed;
+        this.concurrent = concurrent;
+    }
+    MergeScanOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new MergeScanSubscriber(subscriber, this.accumulator, this.seed, this.concurrent));
+    };
+    return MergeScanOperator;
+}());
+
+var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MergeScanSubscriber, _super);
+    function MergeScanSubscriber(destination, accumulator, acc, concurrent) {
+        var _this = _super.call(this, destination) || this;
+        _this.accumulator = accumulator;
+        _this.acc = acc;
+        _this.concurrent = concurrent;
+        _this.hasValue = false;
+        _this.hasCompleted = false;
+        _this.buffer = [];
+        _this.active = 0;
+        _this.index = 0;
+        return _this;
+    }
+    MergeScanSubscriber.prototype._next = function (value) {
+        if (this.active < this.concurrent) {
+            var index = this.index++;
+            var destination = this.destination;
+            var ish = void 0;
+            try {
+                var accumulator = this.accumulator;
+                ish = accumulator(this.acc, 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) {
+        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;
+        if (this.active === 0 && this.buffer.length === 0) {
+            if (this.hasValue === false) {
+                this.destination.next(this.acc);
+            }
+            this.destination.complete();
+        }
+        this.unsubscribe();
+    };
+    MergeScanSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        var destination = this.destination;
+        this.acc = innerValue;
+        this.hasValue = true;
+        destination.next(innerValue);
+    };
+    MergeScanSubscriber.prototype.notifyComplete = function (innerSub) {
+        var buffer = this.buffer;
+        var destination = this.destination;
+        destination.remove(innerSub);
+        this.active--;
+        if (buffer.length > 0) {
+            this._next(buffer.shift());
+        }
+        else if (this.active === 0 && this.hasCompleted) {
+            if (this.hasValue === false) {
+                this.destination.next(this.acc);
+            }
+            this.destination.complete();
+        }
+    };
+    return MergeScanSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
+
+//# sourceMappingURL=mergeScan.js.map
+
+
+/***/ }),
+/* 281 */
+/***/ (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__(275);
+/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
+
+function min(comparer) {
+    var min = (typeof comparer === 'function')
+        ? function (x, y) { return comparer(x, y) < 0 ? x : y; }
+        : function (x, y) { return x < y ? x : y; };
+    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(min);
+}
+//# sourceMappingURL=min.js.map
+
+
+/***/ }),
+/* 282 */
+/***/ (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__(283);
+/** PURE_IMPORTS_START _observable_ConnectableObservable PURE_IMPORTS_END */
+
+function multicast(subjectOrSubjectFactory, selector) {
+    return function multicastOperatorFunction(source) {
+        var subjectFactory;
+        if (typeof subjectOrSubjectFactory === 'function') {
+            subjectFactory = subjectOrSubjectFactory;
+        }
+        else {
+            subjectFactory = function subjectFactory() {
+                return subjectOrSubjectFactory;
+            };
+        }
+        if (typeof selector === 'function') {
+            return source.lift(new MulticastOperator(subjectFactory, selector));
+        }
+        var connectable = Object.create(source, _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__["connectableObservableDescriptor"]);
+        connectable.source = source;
+        connectable.subjectFactory = subjectFactory;
+        return connectable;
+    };
+}
+var MulticastOperator = /*@__PURE__*/ (function () {
+    function MulticastOperator(subjectFactory, selector) {
+        this.subjectFactory = subjectFactory;
+        this.selector = selector;
+    }
+    MulticastOperator.prototype.call = function (subscriber, source) {
+        var selector = this.selector;
+        var subject = this.subjectFactory();
+        var subscription = selector(subject).subscribe(subscriber);
+        subscription.add(source.subscribe(subject));
+        return subscription;
+    };
+    return MulticastOperator;
+}());
+
+//# sourceMappingURL=multicast.js.map
+
+
+/***/ }),
+/* 283 */
+/***/ (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__(36);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(193);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(177);
+/* harmony import */ var _operators_refCount__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(284);
+/** PURE_IMPORTS_START tslib,_Subject,_Observable,_Subscriber,_Subscription,_operators_refCount PURE_IMPORTS_END */
+
+
+
+
+
+
+var ConnectableObservable = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ConnectableObservable, _super);
+    function ConnectableObservable(source, subjectFactory) {
+        var _this = _super.call(this) || this;
+        _this.source = source;
+        _this.subjectFactory = subjectFactory;
+        _this._refCount = 0;
+        _this._isComplete = false;
+        return _this;
+    }
+    ConnectableObservable.prototype._subscribe = function (subscriber) {
+        return this.getSubject().subscribe(subscriber);
+    };
+    ConnectableObservable.prototype.getSubject = function () {
+        var subject = this._subject;
+        if (!subject || subject.isStopped) {
+            this._subject = this.subjectFactory();
+        }
+        return this._subject;
+    };
+    ConnectableObservable.prototype.connect = function () {
+        var connection = this._connection;
+        if (!connection) {
+            this._isComplete = false;
+            connection = this._connection = new _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"]();
+            connection.add(this.source
+                .subscribe(new ConnectableSubscriber(this.getSubject(), this)));
+            if (connection.closed) {
+                this._connection = null;
+                connection = _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"].EMPTY;
+            }
+        }
+        return connection;
+    };
+    ConnectableObservable.prototype.refCount = function () {
+        return Object(_operators_refCount__WEBPACK_IMPORTED_MODULE_5__["refCount"])()(this);
+    };
+    return ConnectableObservable;
+}(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]));
+
+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) {
+        var _this = _super.call(this, destination) || this;
+        _this.connectable = connectable;
+        return _this;
+    }
+    ConnectableSubscriber.prototype._error = function (err) {
+        this._unsubscribe();
+        _super.prototype._error.call(this, err);
+    };
+    ConnectableSubscriber.prototype._complete = function () {
+        this.connectable._isComplete = true;
+        this._unsubscribe();
+        _super.prototype._complete.call(this);
+    };
+    ConnectableSubscriber.prototype._unsubscribe = function () {
+        var connectable = this.connectable;
+        if (connectable) {
+            this.connectable = null;
+            var connection = connectable._connection;
+            connectable._refCount = 0;
+            connectable._subject = null;
+            connectable._connection = null;
+            if (connection) {
+                connection.unsubscribe();
+            }
+        }
+    };
+    return ConnectableSubscriber;
+}(_Subject__WEBPACK_IMPORTED_MODULE_1__["SubjectSubscriber"]));
+var RefCountOperator = /*@__PURE__*/ (function () {
+    function RefCountOperator(connectable) {
+        this.connectable = connectable;
+    }
+    RefCountOperator.prototype.call = function (subscriber, source) {
+        var connectable = this.connectable;
+        connectable._refCount++;
+        var refCounter = new RefCountSubscriber(subscriber, connectable);
+        var subscription = source.subscribe(refCounter);
+        if (!refCounter.closed) {
+            refCounter.connection = connectable.connect();
+        }
+        return subscription;
+    };
+    return RefCountOperator;
+}());
+var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RefCountSubscriber, _super);
+    function RefCountSubscriber(destination, connectable) {
+        var _this = _super.call(this, destination) || this;
+        _this.connectable = connectable;
+        return _this;
+    }
+    RefCountSubscriber.prototype._unsubscribe = function () {
+        var connectable = this.connectable;
+        if (!connectable) {
+            this.connection = null;
+            return;
+        }
+        this.connectable = null;
+        var refCount = connectable._refCount;
+        if (refCount <= 0) {
+            this.connection = null;
+            return;
+        }
+        connectable._refCount = refCount - 1;
+        if (refCount > 1) {
+            this.connection = null;
+            return;
+        }
+        var connection = this.connection;
+        var sharedConnection = connectable._connection;
+        this.connection = null;
+        if (sharedConnection && (!connection || sharedConnection === connection)) {
+            sharedConnection.unsubscribe();
+        }
+    };
+    return RefCountSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"]));
+//# sourceMappingURL=ConnectableObservable.js.map
+
+
+/***/ }),
+/* 284 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function refCount() {
+    return function refCountOperatorFunction(source) {
+        return source.lift(new RefCountOperator(source));
+    };
+}
+var RefCountOperator = /*@__PURE__*/ (function () {
+    function RefCountOperator(connectable) {
+        this.connectable = connectable;
+    }
+    RefCountOperator.prototype.call = function (subscriber, source) {
+        var connectable = this.connectable;
+        connectable._refCount++;
+        var refCounter = new RefCountSubscriber(subscriber, connectable);
+        var subscription = source.subscribe(refCounter);
+        if (!refCounter.closed) {
+            refCounter.connection = connectable.connect();
+        }
+        return subscription;
+    };
+    return RefCountOperator;
+}());
+var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RefCountSubscriber, _super);
+    function RefCountSubscriber(destination, connectable) {
+        var _this = _super.call(this, destination) || this;
+        _this.connectable = connectable;
+        return _this;
+    }
+    RefCountSubscriber.prototype._unsubscribe = function () {
+        var connectable = this.connectable;
+        if (!connectable) {
+            this.connection = null;
+            return;
+        }
+        this.connectable = null;
+        var refCount = connectable._refCount;
+        if (refCount <= 0) {
+            this.connection = null;
+            return;
+        }
+        connectable._refCount = refCount - 1;
+        if (refCount > 1) {
+            this.connection = null;
+            return;
+        }
+        var connection = this.connection;
+        var sharedConnection = connectable._connection;
+        this.connection = null;
+        if (sharedConnection && (!connection || sharedConnection === connection)) {
+            sharedConnection.unsubscribe();
+        }
+    };
+    return RefCountSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=refCount.js.map
+
+
+/***/ }),
+/* 285 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return observeOn; });
+/* 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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(241);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */
+
+
+
+function observeOn(scheduler, delay) {
+    if (delay === void 0) {
+        delay = 0;
+    }
+    return function observeOnOperatorFunction(source) {
+        return source.lift(new ObserveOnOperator(scheduler, delay));
+    };
+}
+var ObserveOnOperator = /*@__PURE__*/ (function () {
+    function ObserveOnOperator(scheduler, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        this.scheduler = scheduler;
+        this.delay = delay;
+    }
+    ObserveOnOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ObserveOnSubscriber(subscriber, this.scheduler, this.delay));
+    };
+    return ObserveOnOperator;
+}());
+
+var ObserveOnSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ObserveOnSubscriber, _super);
+    function ObserveOnSubscriber(destination, scheduler, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        var _this = _super.call(this, destination) || this;
+        _this.scheduler = scheduler;
+        _this.delay = delay;
+        return _this;
+    }
+    ObserveOnSubscriber.dispatch = function (arg) {
+        var notification = arg.notification, destination = arg.destination;
+        notification.observe(destination);
+        this.unsubscribe();
+    };
+    ObserveOnSubscriber.prototype.scheduleMessage = function (notification) {
+        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"]));
+
+var ObserveOnMessage = /*@__PURE__*/ (function () {
+    function ObserveOnMessage(notification, destination) {
+        this.notification = notification;
+        this.destination = destination;
+    }
+    return ObserveOnMessage;
+}());
+
+//# sourceMappingURL=observeOn.js.map
+
+
+/***/ }),
+/* 286 */
+/***/ (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__(36);
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(218);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(183);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_observable_from,_util_isArray,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+
+function onErrorResumeNext() {
+    var nextSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        nextSources[_i] = arguments[_i];
+    }
+    if (nextSources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(nextSources[0])) {
+        nextSources = nextSources[0];
+    }
+    return function (source) { return source.lift(new OnErrorResumeNextOperator(nextSources)); };
+}
+function onErrorResumeNextStatic() {
+    var nextSources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        nextSources[_i] = arguments[_i];
+    }
+    var source = null;
+    if (nextSources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(nextSources[0])) {
+        nextSources = nextSources[0];
+    }
+    source = nextSources.shift();
+    return Object(_observable_from__WEBPACK_IMPORTED_MODULE_1__["from"])(source, null).lift(new OnErrorResumeNextOperator(nextSources));
+}
+var OnErrorResumeNextOperator = /*@__PURE__*/ (function () {
+    function OnErrorResumeNextOperator(nextSources) {
+        this.nextSources = nextSources;
+    }
+    OnErrorResumeNextOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new OnErrorResumeNextSubscriber(subscriber, this.nextSources));
+    };
+    return OnErrorResumeNextOperator;
+}());
+var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](OnErrorResumeNextSubscriber, _super);
+    function OnErrorResumeNextSubscriber(destination, nextSources) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        _this.nextSources = nextSources;
+        return _this;
+    }
+    OnErrorResumeNextSubscriber.prototype.notifyError = function (error, innerSub) {
+        this.subscribeToNextSource();
+    };
+    OnErrorResumeNextSubscriber.prototype.notifyComplete = function (innerSub) {
+        this.subscribeToNextSource();
+    };
+    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) {
+            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();
+        }
+    };
+    return OnErrorResumeNextSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+//# sourceMappingURL=onErrorResumeNext.js.map
+
+
+/***/ }),
+/* 287 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function pairwise() {
+    return function (source) { return source.lift(new PairwiseOperator()); };
+}
+var PairwiseOperator = /*@__PURE__*/ (function () {
+    function PairwiseOperator() {
+    }
+    PairwiseOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new PairwiseSubscriber(subscriber));
+    };
+    return PairwiseOperator;
+}());
+var PairwiseSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](PairwiseSubscriber, _super);
+    function PairwiseSubscriber(destination) {
+        var _this = _super.call(this, destination) || this;
+        _this.hasPrev = false;
+        return _this;
+    }
+    PairwiseSubscriber.prototype._next = function (value) {
+        var pair;
+        if (this.hasPrev) {
+            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"]));
+//# sourceMappingURL=pairwise.js.map
+
+
+/***/ }),
+/* 288 */
+/***/ (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__(289);
+/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(251);
+/** PURE_IMPORTS_START _util_not,_filter PURE_IMPORTS_END */
+
+
+function partition(predicate, thisArg) {
+    return function (source) {
+        return [
+            Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(predicate, thisArg)(source),
+            Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__["not"])(predicate, thisArg))(source)
+        ];
+    };
+}
+//# sourceMappingURL=partition.js.map
+
+
+/***/ }),
+/* 289 */
+/***/ (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
+
+
+/***/ }),
+/* 290 */
+/***/ (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__(231);
+/** PURE_IMPORTS_START _map PURE_IMPORTS_END */
+
+function pluck() {
+    var properties = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        properties[_i] = arguments[_i];
+    }
+    var length = properties.length;
+    if (length === 0) {
+        throw new Error('list of properties cannot be empty.');
+    }
+    return function (source) { return Object(_map__WEBPACK_IMPORTED_MODULE_0__["map"])(plucker(properties, length))(source); };
+}
+function plucker(props, length) {
+    var mapper = function (x) {
+        var currentProp = x;
+        for (var i = 0; i < length; i++) {
+            var p = currentProp[props[i]];
+            if (typeof p !== 'undefined') {
+                currentProp = p;
+            }
+            else {
+                return undefined;
+            }
+        }
+        return currentProp;
+    };
+    return mapper;
+}
+//# sourceMappingURL=pluck.js.map
+
+
+/***/ }),
+/* 291 */
+/***/ (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__(265);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(282);
+/** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */
+
+
+function publish(selector) {
+    return selector ?
+        Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(function () { return new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"](); }, selector) :
+        Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]());
+}
+//# sourceMappingURL=publish.js.map
+
+
+/***/ }),
+/* 292 */
+/***/ (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__(293);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(282);
+/** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */
+
+
+function publishBehavior(value) {
+    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__["BehaviorSubject"](value))(source); };
+}
+//# sourceMappingURL=publishBehavior.js.map
+
+
+/***/ }),
+/* 293 */
+/***/ (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__(36);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265);
+/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(266);
+/** PURE_IMPORTS_START tslib,_Subject,_util_ObjectUnsubscribedError PURE_IMPORTS_END */
+
+
+
+var BehaviorSubject = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BehaviorSubject, _super);
+    function BehaviorSubject(_value) {
+        var _this = _super.call(this) || this;
+        _this._value = _value;
+        return _this;
+    }
+    Object.defineProperty(BehaviorSubject.prototype, "value", {
+        get: function () {
+            return this.getValue();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    BehaviorSubject.prototype._subscribe = function (subscriber) {
+        var subscription = _super.prototype._subscribe.call(this, subscriber);
+        if (subscription && !subscription.closed) {
+            subscriber.next(this._value);
+        }
+        return subscription;
+    };
+    BehaviorSubject.prototype.getValue = function () {
+        if (this.hasError) {
+            throw this.thrownError;
+        }
+        else if (this.closed) {
+            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__["ObjectUnsubscribedError"]();
+        }
+        else {
+            return this._value;
+        }
+    };
+    BehaviorSubject.prototype.next = function (value) {
+        _super.prototype.next.call(this, this._value = value);
+    };
+    return BehaviorSubject;
+}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
+
+//# sourceMappingURL=BehaviorSubject.js.map
+
+
+/***/ }),
+/* 294 */
+/***/ (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__(295);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(282);
+/** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */
+
+
+function publishLast() {
+    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__["AsyncSubject"]())(source); };
+}
+//# sourceMappingURL=publishLast.js.map
+
+
+/***/ }),
+/* 295 */
+/***/ (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__(36);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177);
+/** PURE_IMPORTS_START tslib,_Subject,_Subscription PURE_IMPORTS_END */
+
+
+
+var AsyncSubject = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncSubject, _super);
+    function AsyncSubject() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.value = null;
+        _this.hasNext = false;
+        _this.hasCompleted = false;
+        return _this;
+    }
+    AsyncSubject.prototype._subscribe = function (subscriber) {
+        if (this.hasError) {
+            subscriber.error(this.thrownError);
+            return _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY;
+        }
+        else if (this.hasCompleted && this.hasNext) {
+            subscriber.next(this.value);
+            subscriber.complete();
+            return _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY;
+        }
+        return _super.prototype._subscribe.call(this, subscriber);
+    };
+    AsyncSubject.prototype.next = function (value) {
+        if (!this.hasCompleted) {
+            this.value = value;
+            this.hasNext = true;
+        }
+    };
+    AsyncSubject.prototype.error = function (error) {
+        if (!this.hasCompleted) {
+            _super.prototype.error.call(this, error);
+        }
+    };
+    AsyncSubject.prototype.complete = function () {
+        this.hasCompleted = true;
+        if (this.hasNext) {
+            _super.prototype.next.call(this, this.value);
+        }
+        _super.prototype.complete.call(this);
+    };
+    return AsyncSubject;
+}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
+
+//# sourceMappingURL=AsyncSubject.js.map
+
+
+/***/ }),
+/* 296 */
+/***/ (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__(297);
+/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(282);
+/** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */
+
+
+function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) {
+    if (selectorOrScheduler && typeof selectorOrScheduler !== 'function') {
+        scheduler = selectorOrScheduler;
+    }
+    var selector = typeof selectorOrScheduler === 'function' ? selectorOrScheduler : undefined;
+    var subject = new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, scheduler);
+    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(function () { return subject; }, selector)(source); };
+}
+//# sourceMappingURL=publishReplay.js.map
+
+
+/***/ }),
+/* 297 */
+/***/ (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__(36);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265);
+/* harmony import */ var _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(298);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(177);
+/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(285);
+/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(266);
+/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(267);
+/** PURE_IMPORTS_START tslib,_Subject,_scheduler_queue,_Subscription,_operators_observeOn,_util_ObjectUnsubscribedError,_SubjectSubscription PURE_IMPORTS_END */
+
+
+
+
+
+
+
+var ReplaySubject = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ReplaySubject, _super);
+    function ReplaySubject(bufferSize, windowTime, scheduler) {
+        if (bufferSize === void 0) {
+            bufferSize = Number.POSITIVE_INFINITY;
+        }
+        if (windowTime === void 0) {
+            windowTime = Number.POSITIVE_INFINITY;
+        }
+        var _this = _super.call(this) || this;
+        _this.scheduler = scheduler;
+        _this._events = [];
+        _this._infiniteTimeWindow = false;
+        _this._bufferSize = bufferSize < 1 ? 1 : bufferSize;
+        _this._windowTime = windowTime < 1 ? 1 : windowTime;
+        if (windowTime === Number.POSITIVE_INFINITY) {
+            _this._infiniteTimeWindow = true;
+            _this.next = _this.nextInfiniteTimeWindow;
+        }
+        else {
+            _this.next = _this.nextTimeWindow;
+        }
+        return _this;
+    }
+    ReplaySubject.prototype.nextInfiniteTimeWindow = function (value) {
+        var _events = this._events;
+        _events.push(value);
+        if (_events.length > this._bufferSize) {
+            _events.shift();
+        }
+        _super.prototype.next.call(this, value);
+    };
+    ReplaySubject.prototype.nextTimeWindow = function (value) {
+        this._events.push(new ReplayEvent(this._getNow(), value));
+        this._trimBufferThenGetEvents();
+        _super.prototype.next.call(this, value);
+    };
+    ReplaySubject.prototype._subscribe = function (subscriber) {
+        var _infiniteTimeWindow = this._infiniteTimeWindow;
+        var _events = _infiniteTimeWindow ? this._events : this._trimBufferThenGetEvents();
+        var scheduler = this.scheduler;
+        var len = _events.length;
+        var subscription;
+        if (this.closed) {
+            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__["ObjectUnsubscribedError"]();
+        }
+        else if (this.isStopped || this.hasError) {
+            subscription = _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
+        }
+        else {
+            this.observers.push(subscriber);
+            subscription = new _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__["SubjectSubscription"](this, subscriber);
+        }
+        if (scheduler) {
+            subscriber.add(subscriber = new _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__["ObserveOnSubscriber"](subscriber, scheduler));
+        }
+        if (_infiniteTimeWindow) {
+            for (var i = 0; i < len && !subscriber.closed; i++) {
+                subscriber.next(_events[i]);
+            }
+        }
+        else {
+            for (var i = 0; i < len && !subscriber.closed; i++) {
+                subscriber.next(_events[i].value);
+            }
+        }
+        if (this.hasError) {
+            subscriber.error(this.thrownError);
+        }
+        else if (this.isStopped) {
+            subscriber.complete();
+        }
+        return subscription;
+    };
+    ReplaySubject.prototype._getNow = function () {
+        return (this.scheduler || _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__["queue"]).now();
+    };
+    ReplaySubject.prototype._trimBufferThenGetEvents = function () {
+        var now = this._getNow();
+        var _bufferSize = this._bufferSize;
+        var _windowTime = this._windowTime;
+        var _events = this._events;
+        var eventsCount = _events.length;
+        var spliceCount = 0;
+        while (spliceCount < eventsCount) {
+            if ((now - _events[spliceCount].time) < _windowTime) {
+                break;
+            }
+            spliceCount++;
+        }
+        if (eventsCount > _bufferSize) {
+            spliceCount = Math.max(spliceCount, eventsCount - _bufferSize);
+        }
+        if (spliceCount > 0) {
+            _events.splice(0, spliceCount);
+        }
+        return _events;
+    };
+    return ReplaySubject;
+}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
+
+var ReplayEvent = /*@__PURE__*/ (function () {
+    function ReplayEvent(time, value) {
+        this.time = time;
+        this.value = value;
+    }
+    return ReplayEvent;
+}());
+//# sourceMappingURL=ReplaySubject.js.map
+
+
+/***/ }),
+/* 298 */
+/***/ (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__(299);
+/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(300);
+/** PURE_IMPORTS_START _QueueAction,_QueueScheduler PURE_IMPORTS_END */
+
+
+var queue = /*@__PURE__*/ new _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__["QueueScheduler"](_QueueAction__WEBPACK_IMPORTED_MODULE_0__["QueueAction"]);
+//# sourceMappingURL=queue.js.map
+
+
+/***/ }),
+/* 299 */
+/***/ (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__(36);
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(200);
+/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
+
+
+var QueueAction = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](QueueAction, _super);
+    function QueueAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        return _this;
+    }
+    QueueAction.prototype.schedule = function (state, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (delay > 0) {
+            return _super.prototype.schedule.call(this, state, delay);
+        }
+        this.delay = delay;
+        this.state = state;
+        this.scheduler.flush(this);
+        return this;
+    };
+    QueueAction.prototype.execute = function (state, delay) {
+        return (delay > 0 || this.closed) ?
+            _super.prototype.execute.call(this, state, delay) :
+            this._execute(state, delay);
+    };
+    QueueAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
+            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
+        }
+        return scheduler.flush(this);
+    };
+    return QueueAction;
+}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
+
+//# sourceMappingURL=QueueAction.js.map
+
+
+/***/ }),
+/* 300 */
+/***/ (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__(36);
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(202);
+/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
+
+
+var QueueScheduler = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](QueueScheduler, _super);
+    function QueueScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return QueueScheduler;
+}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"]));
+
+//# sourceMappingURL=QueueScheduler.js.map
+
+
+/***/ }),
+/* 301 */
+/***/ (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__(178);
+/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(302);
+/** PURE_IMPORTS_START _util_isArray,_observable_race PURE_IMPORTS_END */
+
+
+function race() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    return function raceOperatorFunction(source) {
+        if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(observables[0])) {
+            observables = observables[0];
+        }
+        return source.lift.call(_observable_race__WEBPACK_IMPORTED_MODULE_1__["race"].apply(void 0, [source].concat(observables)));
+    };
+}
+//# sourceMappingURL=race.js.map
+
+
+/***/ }),
+/* 302 */
+/***/ (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 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__(36);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178);
+/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(215);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_util_isArray,_fromArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+function race() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    if (observables.length === 1) {
+        if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(observables[0])) {
+            observables = observables[0];
+        }
+        else {
+            return observables[0];
+        }
+    }
+    return Object(_fromArray__WEBPACK_IMPORTED_MODULE_2__["fromArray"])(observables, undefined).lift(new RaceOperator());
+}
+var RaceOperator = /*@__PURE__*/ (function () {
+    function RaceOperator() {
+    }
+    RaceOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new RaceSubscriber(subscriber));
+    };
+    return RaceOperator;
+}());
+
+var RaceSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RaceSubscriber, _super);
+    function RaceSubscriber(destination) {
+        var _this = _super.call(this, destination) || this;
+        _this.hasFirst = false;
+        _this.observables = [];
+        _this.subscriptions = [];
+        return _this;
+    }
+    RaceSubscriber.prototype._next = function (observable) {
+        this.observables.push(observable);
+    };
+    RaceSubscriber.prototype._complete = function () {
+        var observables = this.observables;
+        var len = observables.length;
+        if (len === 0) {
+            this.destination.complete();
+        }
+        else {
+            for (var i = 0; i < len && !this.hasFirst; i++) {
+                var observable = observables[i];
+                var subscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, observable, observable, i);
+                if (this.subscriptions) {
+                    this.subscriptions.push(subscription);
+                }
+                this.add(subscription);
+            }
+            this.observables = null;
+        }
+    };
+    RaceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        if (!this.hasFirst) {
+            this.hasFirst = true;
+            for (var i = 0; i < this.subscriptions.length; i++) {
+                if (i !== outerIndex) {
+                    var subscription = this.subscriptions[i];
+                    subscription.unsubscribe();
+                    this.remove(subscription);
+                }
+            }
+            this.subscriptions = null;
+        }
+        this.destination.next(innerValue);
+    };
+    return RaceSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+
+//# sourceMappingURL=race.js.map
+
+
+/***/ }),
+/* 303 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(242);
+/** PURE_IMPORTS_START tslib,_Subscriber,_observable_empty PURE_IMPORTS_END */
+
+
+
+function repeat(count) {
+    if (count === void 0) {
+        count = -1;
+    }
+    return function (source) {
+        if (count === 0) {
+            return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])();
+        }
+        else if (count < 0) {
+            return source.lift(new RepeatOperator(-1, source));
+        }
+        else {
+            return source.lift(new RepeatOperator(count - 1, source));
+        }
+    };
+}
+var RepeatOperator = /*@__PURE__*/ (function () {
+    function RepeatOperator(count, source) {
+        this.count = count;
+        this.source = source;
+    }
+    RepeatOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new RepeatSubscriber(subscriber, this.count, this.source));
+    };
+    return RepeatOperator;
+}());
+var RepeatSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RepeatSubscriber, _super);
+    function RepeatSubscriber(destination, count, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.count = count;
+        _this.source = source;
+        return _this;
+    }
+    RepeatSubscriber.prototype.complete = function () {
+        if (!this.isStopped) {
+            var _a = this, source = _a.source, count = _a.count;
+            if (count === 0) {
+                return _super.prototype.complete.call(this);
+            }
+            else if (count > -1) {
+                this.count = count - 1;
+            }
+            source.subscribe(this._unsubscribeAndRecycle());
+        }
+    };
+    return RepeatSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=repeat.js.map
+
+
+/***/ }),
+/* 304 */
+/***/ (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__(36);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+function repeatWhen(notifier) {
+    return function (source) { return source.lift(new RepeatWhenOperator(notifier)); };
+}
+var RepeatWhenOperator = /*@__PURE__*/ (function () {
+    function RepeatWhenOperator(notifier) {
+        this.notifier = notifier;
+    }
+    RepeatWhenOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new RepeatWhenSubscriber(subscriber, this.notifier, source));
+    };
+    return RepeatWhenOperator;
+}());
+var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RepeatWhenSubscriber, _super);
+    function RepeatWhenSubscriber(destination, notifier, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.notifier = notifier;
+        _this.source = source;
+        _this.sourceIsBeingSubscribedTo = true;
+        return _this;
+    }
+    RepeatWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.sourceIsBeingSubscribedTo = true;
+        this.source.subscribe(this);
+    };
+    RepeatWhenSubscriber.prototype.notifyComplete = function (innerSub) {
+        if (this.sourceIsBeingSubscribedTo === false) {
+            return _super.prototype.complete.call(this);
+        }
+    };
+    RepeatWhenSubscriber.prototype.complete = function () {
+        this.sourceIsBeingSubscribedTo = false;
+        if (!this.isStopped) {
+            if (!this.retries) {
+                this.subscribeToRetries();
+            }
+            if (!this.retriesSubscription || this.retriesSubscription.closed) {
+                return _super.prototype.complete.call(this);
+            }
+            this._unsubscribeAndRecycle();
+            this.notifications.next();
+        }
+    };
+    RepeatWhenSubscriber.prototype._unsubscribe = function () {
+        var _a = this, notifications = _a.notifications, retriesSubscription = _a.retriesSubscription;
+        if (notifications) {
+            notifications.unsubscribe();
+            this.notifications = null;
+        }
+        if (retriesSubscription) {
+            retriesSubscription.unsubscribe();
+            this.retriesSubscription = null;
+        }
+        this.retries = null;
+    };
+    RepeatWhenSubscriber.prototype._unsubscribeAndRecycle = function () {
+        var _unsubscribe = this._unsubscribe;
+        this._unsubscribe = null;
+        _super.prototype._unsubscribeAndRecycle.call(this);
+        this._unsubscribe = _unsubscribe;
+        return this;
+    };
+    RepeatWhenSubscriber.prototype.subscribeToRetries = function () {
+        this.notifications = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
+        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_3__["subscribeToResult"])(this, retries);
+    };
+    return RepeatWhenSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
+//# sourceMappingURL=repeatWhen.js.map
+
+
+/***/ }),
+/* 305 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function retry(count) {
+    if (count === void 0) {
+        count = -1;
+    }
+    return function (source) { return source.lift(new RetryOperator(count, source)); };
+}
+var RetryOperator = /*@__PURE__*/ (function () {
+    function RetryOperator(count, source) {
+        this.count = count;
+        this.source = source;
+    }
+    RetryOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new RetrySubscriber(subscriber, this.count, this.source));
+    };
+    return RetryOperator;
+}());
+var RetrySubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RetrySubscriber, _super);
+    function RetrySubscriber(destination, count, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.count = count;
+        _this.source = source;
+        return _this;
+    }
+    RetrySubscriber.prototype.error = function (err) {
+        if (!this.isStopped) {
+            var _a = this, source = _a.source, count = _a.count;
+            if (count === 0) {
+                return _super.prototype.error.call(this, err);
+            }
+            else if (count > -1) {
+                this.count = count - 1;
+            }
+            source.subscribe(this._unsubscribeAndRecycle());
+        }
+    };
+    return RetrySubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=retry.js.map
+
+
+/***/ }),
+/* 306 */
+/***/ (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__(36);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+function retryWhen(notifier) {
+    return function (source) { return source.lift(new RetryWhenOperator(notifier, source)); };
+}
+var RetryWhenOperator = /*@__PURE__*/ (function () {
+    function RetryWhenOperator(notifier, source) {
+        this.notifier = notifier;
+        this.source = source;
+    }
+    RetryWhenOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new RetryWhenSubscriber(subscriber, this.notifier, this.source));
+    };
+    return RetryWhenOperator;
+}());
+var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RetryWhenSubscriber, _super);
+    function RetryWhenSubscriber(destination, notifier, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.notifier = notifier;
+        _this.source = source;
+        return _this;
+    }
+    RetryWhenSubscriber.prototype.error = function (err) {
+        if (!this.isStopped) {
+            var errors = this.errors;
+            var retries = this.retries;
+            var retriesSubscription = this.retriesSubscription;
+            if (!retries) {
+                errors = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
+                try {
+                    var notifier = this.notifier;
+                    retries = notifier(errors);
+                }
+                catch (e) {
+                    return _super.prototype.error.call(this, e);
+                }
+                retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, retries);
+            }
+            else {
+                this.errors = null;
+                this.retriesSubscription = null;
+            }
+            this._unsubscribeAndRecycle();
+            this.errors = errors;
+            this.retries = retries;
+            this.retriesSubscription = retriesSubscription;
+            errors.next(err);
+        }
+    };
+    RetryWhenSubscriber.prototype._unsubscribe = function () {
+        var _a = this, errors = _a.errors, retriesSubscription = _a.retriesSubscription;
+        if (errors) {
+            errors.unsubscribe();
+            this.errors = null;
+        }
+        if (retriesSubscription) {
+            retriesSubscription.unsubscribe();
+            this.retriesSubscription = null;
+        }
+        this.retries = null;
+    };
+    RetryWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        var _unsubscribe = this._unsubscribe;
+        this._unsubscribe = null;
+        this._unsubscribeAndRecycle();
+        this._unsubscribe = _unsubscribe;
+        this.source.subscribe(this);
+    };
+    return RetryWhenSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
+//# sourceMappingURL=retryWhen.js.map
+
+
+/***/ }),
+/* 307 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function sample(notifier) {
+    return function (source) { return source.lift(new SampleOperator(notifier)); };
+}
+var SampleOperator = /*@__PURE__*/ (function () {
+    function SampleOperator(notifier) {
+        this.notifier = notifier;
+    }
+    SampleOperator.prototype.call = function (subscriber, source) {
+        var sampleSubscriber = new SampleSubscriber(subscriber);
+        var subscription = source.subscribe(sampleSubscriber);
+        subscription.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(sampleSubscriber, this.notifier));
+        return subscription;
+    };
+    return SampleOperator;
+}());
+var SampleSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SampleSubscriber, _super);
+    function SampleSubscriber() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.hasValue = false;
+        return _this;
+    }
+    SampleSubscriber.prototype._next = function (value) {
+        this.value = value;
+        this.hasValue = true;
+    };
+    SampleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.emitValue();
+    };
+    SampleSubscriber.prototype.notifyComplete = function () {
+        this.emitValue();
+    };
+    SampleSubscriber.prototype.emitValue = function () {
+        if (this.hasValue) {
+            this.hasValue = false;
+            this.destination.next(this.value);
+        }
+    };
+    return SampleSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=sample.js.map
+
+
+/***/ }),
+/* 308 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(199);
+/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */
+
+
+
+function sampleTime(period, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
+    }
+    return function (source) { return source.lift(new SampleTimeOperator(period, scheduler)); };
+}
+var SampleTimeOperator = /*@__PURE__*/ (function () {
+    function SampleTimeOperator(period, scheduler) {
+        this.period = period;
+        this.scheduler = scheduler;
+    }
+    SampleTimeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SampleTimeSubscriber(subscriber, this.period, this.scheduler));
+    };
+    return SampleTimeOperator;
+}());
+var SampleTimeSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SampleTimeSubscriber, _super);
+    function SampleTimeSubscriber(destination, period, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.period = period;
+        _this.scheduler = scheduler;
+        _this.hasValue = false;
+        _this.add(scheduler.schedule(dispatchNotification, period, { subscriber: _this, period: period }));
+        return _this;
+    }
+    SampleTimeSubscriber.prototype._next = function (value) {
+        this.lastValue = value;
+        this.hasValue = true;
+    };
+    SampleTimeSubscriber.prototype.notifyNext = function () {
+        if (this.hasValue) {
+            this.hasValue = false;
+            this.destination.next(this.lastValue);
+        }
+    };
+    return SampleTimeSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+function dispatchNotification(state) {
+    var subscriber = state.subscriber, period = state.period;
+    subscriber.notifyNext();
+    this.schedule(state, period);
+}
+//# sourceMappingURL=sampleTime.js.map
+
+
+/***/ }),
+/* 309 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function sequenceEqual(compareTo, comparator) {
+    return function (source) { return source.lift(new SequenceEqualOperator(compareTo, comparator)); };
+}
+var SequenceEqualOperator = /*@__PURE__*/ (function () {
+    function SequenceEqualOperator(compareTo, comparator) {
+        this.compareTo = compareTo;
+        this.comparator = comparator;
+    }
+    SequenceEqualOperator.prototype.call = function (subscriber, source) {
+        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, comparator) {
+        var _this = _super.call(this, destination) || this;
+        _this.compareTo = compareTo;
+        _this.comparator = comparator;
+        _this._a = [];
+        _this._b = [];
+        _this._oneComplete = false;
+        _this.destination.add(compareTo.subscribe(new SequenceEqualCompareToSubscriber(destination, _this)));
+        return _this;
+    }
+    SequenceEqualSubscriber.prototype._next = function (value) {
+        if (this._oneComplete && this._b.length === 0) {
+            this.emit(false);
+        }
+        else {
+            this._a.push(value);
+            this.checkValues();
+        }
+    };
+    SequenceEqualSubscriber.prototype._complete = function () {
+        if (this._oneComplete) {
+            this.emit(this._a.length === 0 && this._b.length === 0);
+        }
+        else {
+            this._oneComplete = true;
+        }
+        this.unsubscribe();
+    };
+    SequenceEqualSubscriber.prototype.checkValues = function () {
+        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;
+            try {
+                areEqual = comparator ? comparator(a, b) : a === b;
+            }
+            catch (e) {
+                this.destination.error(e);
+            }
+            if (!areEqual) {
+                this.emit(false);
+            }
+        }
+    };
+    SequenceEqualSubscriber.prototype.emit = function (value) {
+        var destination = this.destination;
+        destination.next(value);
+        destination.complete();
+    };
+    SequenceEqualSubscriber.prototype.nextB = function (value) {
+        if (this._oneComplete && this._a.length === 0) {
+            this.emit(false);
+        }
+        else {
+            this._b.push(value);
+            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"]));
+
+var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SequenceEqualCompareToSubscriber, _super);
+    function SequenceEqualCompareToSubscriber(destination, parent) {
+        var _this = _super.call(this, destination) || this;
+        _this.parent = parent;
+        return _this;
+    }
+    SequenceEqualCompareToSubscriber.prototype._next = function (value) {
+        this.parent.nextB(value);
+    };
+    SequenceEqualCompareToSubscriber.prototype._error = function (err) {
+        this.parent.error(err);
+        this.unsubscribe();
+    };
+    SequenceEqualCompareToSubscriber.prototype._complete = function () {
+        this.parent.completeB();
+        this.unsubscribe();
+    };
+    return SequenceEqualCompareToSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=sequenceEqual.js.map
+
+
+/***/ }),
+/* 310 */
+/***/ (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__(282);
+/* harmony import */ var _refCount__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(265);
+/** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */
+
+
+
+function shareSubjectFactory() {
+    return new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]();
+}
+function share() {
+    return function (source) { return Object(_refCount__WEBPACK_IMPORTED_MODULE_1__["refCount"])()(Object(_multicast__WEBPACK_IMPORTED_MODULE_0__["multicast"])(shareSubjectFactory)(source)); };
+}
+//# sourceMappingURL=share.js.map
+
+
+/***/ }),
+/* 311 */
+/***/ (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__(297);
+/** PURE_IMPORTS_START _ReplaySubject PURE_IMPORTS_END */
+
+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(_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;
+    var hasError = false;
+    var isComplete = false;
+    return function shareReplayOperation(source) {
+        refCount++;
+        if (!subject || hasError) {
+            hasError = false;
+            subject = new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, scheduler);
+            subscription = source.subscribe({
+                next: function (value) { subject.next(value); },
+                error: function (err) {
+                    hasError = true;
+                    subject.error(err);
+                },
+                complete: function () {
+                    isComplete = true;
+                    subject.complete();
+                },
+            });
+        }
+        var innerSub = subject.subscribe(this);
+        this.add(function () {
+            refCount--;
+            innerSub.unsubscribe();
+            if (subscription && !isComplete && useRefCount && refCount === 0) {
+                subscription.unsubscribe();
+                subscription = undefined;
+                subject = undefined;
+            }
+        });
+    };
+}
+//# sourceMappingURL=shareReplay.js.map
+
+
+/***/ }),
+/* 312 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(253);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_EmptyError PURE_IMPORTS_END */
+
+
+
+function single(predicate) {
+    return function (source) { return source.lift(new SingleOperator(predicate, source)); };
+}
+var SingleOperator = /*@__PURE__*/ (function () {
+    function SingleOperator(predicate, source) {
+        this.predicate = predicate;
+        this.source = source;
+    }
+    SingleOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SingleSubscriber(subscriber, this.predicate, this.source));
+    };
+    return SingleOperator;
+}());
+var SingleSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SingleSubscriber, _super);
+    function SingleSubscriber(destination, predicate, source) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.source = source;
+        _this.seenValue = false;
+        _this.index = 0;
+        return _this;
+    }
+    SingleSubscriber.prototype.applySingleValue = function (value) {
+        if (this.seenValue) {
+            this.destination.error('Sequence contains more than one element');
+        }
+        else {
+            this.seenValue = true;
+            this.singleValue = value;
+        }
+    };
+    SingleSubscriber.prototype._next = function (value) {
+        var index = this.index++;
+        if (this.predicate) {
+            this.tryNext(value, index);
+        }
+        else {
+            this.applySingleValue(value);
+        }
+    };
+    SingleSubscriber.prototype.tryNext = function (value, index) {
+        try {
+            if (this.predicate(value, index, this.source)) {
+                this.applySingleValue(value);
+            }
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+    };
+    SingleSubscriber.prototype._complete = function () {
+        var destination = this.destination;
+        if (this.index > 0) {
+            destination.next(this.seenValue ? this.singleValue : undefined);
+            destination.complete();
+        }
+        else {
+            destination.error(new _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__["EmptyError"]);
+        }
+    };
+    return SingleSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=single.js.map
+
+
+/***/ }),
+/* 313 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function skip(count) {
+    return function (source) { return source.lift(new SkipOperator(count)); };
+}
+var SkipOperator = /*@__PURE__*/ (function () {
+    function SkipOperator(total) {
+        this.total = total;
+    }
+    SkipOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SkipSubscriber(subscriber, this.total));
+    };
+    return SkipOperator;
+}());
+var SkipSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipSubscriber, _super);
+    function SkipSubscriber(destination, total) {
+        var _this = _super.call(this, destination) || this;
+        _this.total = total;
+        _this.count = 0;
+        return _this;
+    }
+    SkipSubscriber.prototype._next = function (x) {
+        if (++this.count > this.total) {
+            this.destination.next(x);
+        }
+    };
+    return SkipSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=skip.js.map
+
+
+/***/ }),
+/* 314 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(250);
+/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError PURE_IMPORTS_END */
+
+
+
+function skipLast(count) {
+    return function (source) { return source.lift(new SkipLastOperator(count)); };
+}
+var SkipLastOperator = /*@__PURE__*/ (function () {
+    function SkipLastOperator(_skipCount) {
+        this._skipCount = _skipCount;
+        if (this._skipCount < 0) {
+            throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"];
+        }
+    }
+    SkipLastOperator.prototype.call = function (subscriber, source) {
+        if (this._skipCount === 0) {
+            return source.subscribe(new _Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"](subscriber));
+        }
+        else {
+            return source.subscribe(new SkipLastSubscriber(subscriber, this._skipCount));
+        }
+    };
+    return SkipLastOperator;
+}());
+var SkipLastSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipLastSubscriber, _super);
+    function SkipLastSubscriber(destination, _skipCount) {
+        var _this = _super.call(this, destination) || this;
+        _this._skipCount = _skipCount;
+        _this._count = 0;
+        _this._ring = new Array(_skipCount);
+        return _this;
+    }
+    SkipLastSubscriber.prototype._next = function (value) {
+        var skipCount = this._skipCount;
+        var count = this._count++;
+        if (count < skipCount) {
+            this._ring[count] = value;
+        }
+        else {
+            var currentIndex = count % skipCount;
+            var ring = this._ring;
+            var oldValue = ring[currentIndex];
+            ring[currentIndex] = value;
+            this.destination.next(oldValue);
+        }
+    };
+    return SkipLastSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=skipLast.js.map
+
+
+/***/ }),
+/* 315 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(183);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+function skipUntil(notifier) {
+    return function (source) { return source.lift(new SkipUntilOperator(notifier)); };
+}
+var SkipUntilOperator = /*@__PURE__*/ (function () {
+    function SkipUntilOperator(notifier) {
+        this.notifier = notifier;
+    }
+    SkipUntilOperator.prototype.call = function (destination, source) {
+        return source.subscribe(new SkipUntilSubscriber(destination, this.notifier));
+    };
+    return SkipUntilOperator;
+}());
+var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipUntilSubscriber, _super);
+    function SkipUntilSubscriber(destination, notifier) {
+        var _this = _super.call(this, destination) || this;
+        _this.hasValue = false;
+        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) {
+        if (this.hasValue) {
+            _super.prototype._next.call(this, value);
+        }
+    };
+    SkipUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.hasValue = true;
+        if (this.innerSubscription) {
+            this.innerSubscription.unsubscribe();
+        }
+    };
+    SkipUntilSubscriber.prototype.notifyComplete = function () {
+    };
+    return SkipUntilSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=skipUntil.js.map
+
+
+/***/ }),
+/* 316 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+function skipWhile(predicate) {
+    return function (source) { return source.lift(new SkipWhileOperator(predicate)); };
+}
+var SkipWhileOperator = /*@__PURE__*/ (function () {
+    function SkipWhileOperator(predicate) {
+        this.predicate = predicate;
+    }
+    SkipWhileOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SkipWhileSubscriber(subscriber, this.predicate));
+    };
+    return SkipWhileOperator;
+}());
+var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipWhileSubscriber, _super);
+    function SkipWhileSubscriber(destination, predicate) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.skipping = true;
+        _this.index = 0;
+        return _this;
+    }
+    SkipWhileSubscriber.prototype._next = function (value) {
+        var destination = this.destination;
+        if (this.skipping) {
+            this.tryCallPredicate(value);
+        }
+        if (!this.skipping) {
+            destination.next(value);
+        }
+    };
+    SkipWhileSubscriber.prototype.tryCallPredicate = function (value) {
+        try {
+            var result = this.predicate(value, this.index++);
+            this.skipping = Boolean(result);
+        }
+        catch (err) {
+            this.destination.error(err);
+        }
+    };
+    return SkipWhileSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=skipWhile.js.map
+
+
+/***/ }),
+/* 317 */
+/***/ (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_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(226);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(206);
+/** PURE_IMPORTS_START _observable_concat,_util_isScheduler PURE_IMPORTS_END */
+
+
+function startWith() {
+    var array = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        array[_i] = arguments[_i];
+    }
+    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
+
+
+/***/ }),
+/* 318 */
+/***/ (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__(319);
+/** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */
+
+function subscribeOn(scheduler, delay) {
+    if (delay === void 0) {
+        delay = 0;
+    }
+    return function subscribeOnOperatorFunction(source) {
+        return source.lift(new SubscribeOnOperator(scheduler, delay));
+    };
+}
+var SubscribeOnOperator = /*@__PURE__*/ (function () {
+    function SubscribeOnOperator(scheduler, delay) {
+        this.scheduler = scheduler;
+        this.delay = delay;
+    }
+    SubscribeOnOperator.prototype.call = function (subscriber, source) {
+        return new _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__["SubscribeOnObservable"](source, this.delay, this.scheduler).subscribe(subscriber);
+    };
+    return SubscribeOnOperator;
+}());
+//# sourceMappingURL=subscribeOn.js.map
+
+
+/***/ }),
+/* 319 */
+/***/ (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__(36);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(193);
+/* harmony import */ var _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(320);
+/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(205);
+/** PURE_IMPORTS_START tslib,_Observable,_scheduler_asap,_util_isNumeric PURE_IMPORTS_END */
+
+
+
+
+var SubscribeOnObservable = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscribeOnObservable, _super);
+    function SubscribeOnObservable(source, delayTime, scheduler) {
+        if (delayTime === void 0) {
+            delayTime = 0;
+        }
+        if (scheduler === void 0) {
+            scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"];
+        }
+        var _this = _super.call(this) || this;
+        _this.source = source;
+        _this.delayTime = delayTime;
+        _this.scheduler = scheduler;
+        if (!Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_3__["isNumeric"])(delayTime) || delayTime < 0) {
+            _this.delayTime = 0;
+        }
+        if (!scheduler || typeof scheduler.schedule !== 'function') {
+            _this.scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"];
+        }
+        return _this;
+    }
+    SubscribeOnObservable.create = function (source, delay, scheduler) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (scheduler === void 0) {
+            scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"];
+        }
+        return new SubscribeOnObservable(source, delay, scheduler);
+    };
+    SubscribeOnObservable.dispatch = function (arg) {
+        var source = arg.source, subscriber = arg.subscriber;
+        return this.add(source.subscribe(subscriber));
+    };
+    SubscribeOnObservable.prototype._subscribe = function (subscriber) {
+        var delay = this.delayTime;
+        var source = this.source;
+        var scheduler = this.scheduler;
+        return scheduler.schedule(SubscribeOnObservable.dispatch, delay, {
+            source: source, subscriber: subscriber
+        });
+    };
+    return SubscribeOnObservable;
+}(_Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"]));
+
+//# sourceMappingURL=SubscribeOnObservable.js.map
+
+
+/***/ }),
+/* 320 */
+/***/ (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__(321);
+/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(323);
+/** PURE_IMPORTS_START _AsapAction,_AsapScheduler PURE_IMPORTS_END */
+
+
+var asap = /*@__PURE__*/ new _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__["AsapScheduler"](_AsapAction__WEBPACK_IMPORTED_MODULE_0__["AsapAction"]);
+//# sourceMappingURL=asap.js.map
+
+
+/***/ }),
+/* 321 */
+/***/ (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__(36);
+/* harmony import */ var _util_Immediate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322);
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(200);
+/** PURE_IMPORTS_START tslib,_util_Immediate,_AsyncAction PURE_IMPORTS_END */
+
+
+
+var AsapAction = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsapAction, _super);
+    function AsapAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        return _this;
+    }
+    AsapAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (delay !== null && delay > 0) {
+            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
+        }
+        scheduler.actions.push(this);
+        return scheduler.scheduled || (scheduler.scheduled = _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].setImmediate(scheduler.flush.bind(scheduler, null)));
+    };
+    AsapAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
+            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
+        }
+        if (scheduler.actions.length === 0) {
+            _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].clearImmediate(id);
+            scheduler.scheduled = undefined;
+        }
+        return undefined;
+    };
+    return AsapAction;
+}(_AsyncAction__WEBPACK_IMPORTED_MODULE_2__["AsyncAction"]));
+
+//# sourceMappingURL=AsapAction.js.map
+
+
+/***/ }),
+/* 322 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Immediate", function() { return Immediate; });
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+var nextHandle = 1;
+var tasksByHandle = {};
+function runIfPresent(handle) {
+    var cb = tasksByHandle[handle];
+    if (cb) {
+        cb();
+    }
+}
+var Immediate = {
+    setImmediate: function (cb) {
+        var handle = nextHandle++;
+        tasksByHandle[handle] = cb;
+        Promise.resolve().then(function () { return runIfPresent(handle); });
+        return handle;
+    },
+    clearImmediate: function (handle) {
+        delete tasksByHandle[handle];
+    },
+};
+//# sourceMappingURL=Immediate.js.map
+
+
+/***/ }),
+/* 323 */
+/***/ (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__(36);
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(202);
+/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
+
+
+var AsapScheduler = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsapScheduler, _super);
+    function AsapScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    AsapScheduler.prototype.flush = function (action) {
+        this.active = true;
+        this.scheduled = undefined;
+        var actions = this.actions;
+        var error;
+        var index = -1;
+        var count = actions.length;
+        action = action || actions.shift();
+        do {
+            if (error = action.execute(action.state, action.delay)) {
+                break;
+            }
+        } while (++index < count && (action = actions.shift()));
+        this.active = false;
+        if (error) {
+            while (++index < count && (action = actions.shift())) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    return AsapScheduler;
+}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"]));
+
+//# sourceMappingURL=AsapScheduler.js.map
+
+
+/***/ }),
+/* 324 */
+/***/ (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__(325);
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232);
+/** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */
+
+
+function switchAll() {
+    return Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"]);
+}
+//# sourceMappingURL=switchAll.js.map
+
+
+/***/ }),
+/* 325 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(183);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182);
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(231);
+/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(218);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */
+
+
+
+
+
+
+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_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)); };
+}
+var SwitchMapOperator = /*@__PURE__*/ (function () {
+    function SwitchMapOperator(project) {
+        this.project = project;
+    }
+    SwitchMapOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new SwitchMapSubscriber(subscriber, this.project));
+    };
+    return SwitchMapOperator;
+}());
+var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SwitchMapSubscriber, _super);
+    function SwitchMapSubscriber(destination, project) {
+        var _this = _super.call(this, destination) || this;
+        _this.project = project;
+        _this.index = 0;
+        return _this;
+    }
+    SwitchMapSubscriber.prototype._next = function (value) {
+        var result;
+        var index = this.index++;
+        try {
+            result = this.project(value, index);
+        }
+        catch (error) {
+            this.destination.error(error);
+            return;
+        }
+        this._innerSub(result, value, index);
+    };
+    SwitchMapSubscriber.prototype._innerSub = function (result, value, index) {
+        var innerSubscription = this.innerSubscription;
+        if (innerSubscription) {
+            innerSubscription.unsubscribe();
+        }
+        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) {
+        var destination = this.destination;
+        destination.remove(innerSub);
+        this.innerSubscription = null;
+        if (this.isStopped) {
+            _super.prototype._complete.call(this);
+        }
+    };
+    SwitchMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.destination.next(innerValue);
+    };
+    return SwitchMapSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=switchMap.js.map
+
+
+/***/ }),
+/* 326 */
+/***/ (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__(325);
+/** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */
+
+function switchMapTo(innerObservable, resultSelector) {
+    return resultSelector ? Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; }, resultSelector) : Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; });
+}
+//# sourceMappingURL=switchMapTo.js.map
+
+
+/***/ }),
+/* 327 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function takeUntil(notifier) {
+    return function (source) { return source.lift(new TakeUntilOperator(notifier)); };
+}
+var TakeUntilOperator = /*@__PURE__*/ (function () {
+    function TakeUntilOperator(notifier) {
+        this.notifier = notifier;
+    }
+    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 && !takeUntilSubscriber.seenValue) {
+            takeUntilSubscriber.add(notifierSubscription);
+            return source.subscribe(takeUntilSubscriber);
+        }
+        return takeUntilSubscriber;
+    };
+    return TakeUntilOperator;
+}());
+var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeUntilSubscriber, _super);
+    function TakeUntilSubscriber(destination) {
+        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 () {
+    };
+    return TakeUntilSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=takeUntil.js.map
+
+
+/***/ }),
+/* 328 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+
+
+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, inclusive) {
+        this.predicate = predicate;
+        this.inclusive = inclusive;
+    }
+    TakeWhileOperator.prototype.call = function (subscriber, source) {
+        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, inclusive) {
+        var _this = _super.call(this, destination) || this;
+        _this.predicate = predicate;
+        _this.inclusive = inclusive;
+        _this.index = 0;
+        return _this;
+    }
+    TakeWhileSubscriber.prototype._next = function (value) {
+        var destination = this.destination;
+        var result;
+        try {
+            result = this.predicate(value, this.index++);
+        }
+        catch (err) {
+            destination.error(err);
+            return;
+        }
+        this.nextOrComplete(value, result);
+    };
+    TakeWhileSubscriber.prototype.nextOrComplete = function (value, predicateResult) {
+        var destination = this.destination;
+        if (Boolean(predicateResult)) {
+            destination.next(value);
+        }
+        else {
+            if (this.inclusive) {
+                destination.next(value);
+            }
+            destination.complete();
+        }
+    };
+    return TakeWhileSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=takeWhile.js.map
+
+
+/***/ }),
+/* 329 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(197);
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(173);
+/** 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
+
+
+/***/ }),
+/* 330 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+var defaultThrottleConfig = {
+    leading: true,
+    trailing: false
+};
+function throttle(durationSelector, config) {
+    if (config === void 0) {
+        config = defaultThrottleConfig;
+    }
+    return function (source) { return source.lift(new ThrottleOperator(durationSelector, config.leading, config.trailing)); };
+}
+var ThrottleOperator = /*@__PURE__*/ (function () {
+    function ThrottleOperator(durationSelector, leading, trailing) {
+        this.durationSelector = durationSelector;
+        this.leading = leading;
+        this.trailing = trailing;
+    }
+    ThrottleOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ThrottleSubscriber(subscriber, this.durationSelector, this.leading, this.trailing));
+    };
+    return ThrottleOperator;
+}());
+var ThrottleSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrottleSubscriber, _super);
+    function ThrottleSubscriber(destination, durationSelector, _leading, _trailing) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        _this.durationSelector = durationSelector;
+        _this._leading = _leading;
+        _this._trailing = _trailing;
+        _this._hasValue = false;
+        return _this;
+    }
+    ThrottleSubscriber.prototype._next = function (value) {
+        this._hasValue = true;
+        this._sendValue = value;
+        if (!this._throttled) {
+            if (this._leading) {
+                this.send();
+            }
+            else {
+                this.throttle(value);
+            }
+        }
+    };
+    ThrottleSubscriber.prototype.send = function () {
+        var _a = this, _hasValue = _a._hasValue, _sendValue = _a._sendValue;
+        if (_hasValue) {
+            this.destination.next(_sendValue);
+            this.throttle(_sendValue);
+        }
+        this._hasValue = false;
+        this._sendValue = null;
+    };
+    ThrottleSubscriber.prototype.throttle = function (value) {
+        var duration = this.tryDurationSelector(value);
+        if (!!duration) {
+            this.add(this._throttled = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration));
+        }
+    };
+    ThrottleSubscriber.prototype.tryDurationSelector = function (value) {
+        try {
+            return this.durationSelector(value);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return null;
+        }
+    };
+    ThrottleSubscriber.prototype.throttlingDone = function () {
+        var _a = this, _throttled = _a._throttled, _trailing = _a._trailing;
+        if (_throttled) {
+            _throttled.unsubscribe();
+        }
+        this._throttled = null;
+        if (_trailing) {
+            this.send();
+        }
+    };
+    ThrottleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.throttlingDone();
+    };
+    ThrottleSubscriber.prototype.notifyComplete = function () {
+        this.throttlingDone();
+    };
+    return ThrottleSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=throttle.js.map
+
+
+/***/ }),
+/* 331 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(199);
+/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(330);
+/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */
+
+
+
+
+function throttleTime(duration, scheduler, config) {
+    if (scheduler === void 0) {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
+    }
+    if (config === void 0) {
+        config = _throttle__WEBPACK_IMPORTED_MODULE_3__["defaultThrottleConfig"];
+    }
+    return function (source) { return source.lift(new ThrottleTimeOperator(duration, scheduler, config.leading, config.trailing)); };
+}
+var ThrottleTimeOperator = /*@__PURE__*/ (function () {
+    function ThrottleTimeOperator(duration, scheduler, leading, trailing) {
+        this.duration = duration;
+        this.scheduler = scheduler;
+        this.leading = leading;
+        this.trailing = trailing;
+    }
+    ThrottleTimeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ThrottleTimeSubscriber(subscriber, this.duration, this.scheduler, this.leading, this.trailing));
+    };
+    return ThrottleTimeOperator;
+}());
+var ThrottleTimeSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrottleTimeSubscriber, _super);
+    function ThrottleTimeSubscriber(destination, duration, scheduler, leading, trailing) {
+        var _this = _super.call(this, destination) || this;
+        _this.duration = duration;
+        _this.scheduler = scheduler;
+        _this.leading = leading;
+        _this.trailing = trailing;
+        _this._hasTrailingValue = false;
+        _this._trailingValue = null;
+        return _this;
+    }
+    ThrottleTimeSubscriber.prototype._next = function (value) {
+        if (this.throttled) {
+            if (this.trailing) {
+                this._trailingValue = value;
+                this._hasTrailingValue = true;
+            }
+        }
+        else {
+            this.add(this.throttled = this.scheduler.schedule(dispatchNext, this.duration, { subscriber: this }));
+            if (this.leading) {
+                this.destination.next(value);
+            }
+            else if (this.trailing) {
+                this._trailingValue = value;
+                this._hasTrailingValue = true;
+            }
+        }
+    };
+    ThrottleTimeSubscriber.prototype._complete = function () {
+        if (this._hasTrailingValue) {
+            this.destination.next(this._trailingValue);
+            this.destination.complete();
+        }
+        else {
+            this.destination.complete();
+        }
+    };
+    ThrottleTimeSubscriber.prototype.clearThrottle = function () {
+        var throttled = this.throttled;
+        if (throttled) {
+            if (this.trailing && this._hasTrailingValue) {
+                this.destination.next(this._trailingValue);
+                this._trailingValue = null;
+                this._hasTrailingValue = false;
+            }
+            throttled.unsubscribe();
+            this.remove(throttled);
+            this.throttled = null;
+        }
+    };
+    return ThrottleTimeSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+function dispatchNext(arg) {
+    var subscriber = arg.subscriber;
+    subscriber.clearThrottle();
+}
+//# sourceMappingURL=throttleTime.js.map
+
+
+/***/ }),
+/* 332 */
+/***/ (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__(199);
+/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(276);
+/* harmony import */ var _observable_defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(333);
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231);
+/** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */
+
+
+
+
+function timeInterval(scheduler) {
+    if (scheduler === void 0) {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
+    }
+    return function (source) {
+        return Object(_observable_defer__WEBPACK_IMPORTED_MODULE_2__["defer"])(function () {
+            return source.pipe(Object(_scan__WEBPACK_IMPORTED_MODULE_1__["scan"])(function (_a, value) {
+                var current = _a.current;
+                return ({ value: value, current: scheduler.now(), last: current });
+            }, { current: scheduler.now(), value: undefined, last: undefined }), Object(_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (_a) {
+                var current = _a.current, last = _a.last, value = _a.value;
+                return new TimeInterval(value, current - last);
+            }));
+        });
+    };
+}
+var TimeInterval = /*@__PURE__*/ (function () {
+    function TimeInterval(value, interval) {
+        this.value = value;
+        this.interval = interval;
+    }
+    return TimeInterval;
+}());
+
+//# sourceMappingURL=timeInterval.js.map
+
+
+/***/ }),
+/* 333 */
+/***/ (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__(193);
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(218);
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(242);
+/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */
+
+
+
+function defer(observableFactory) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        var input;
+        try {
+            input = observableFactory();
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+        var source = input ? Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(input) : Object(_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])();
+        return source.subscribe(subscriber);
+    });
+}
+//# sourceMappingURL=defer.js.map
+
+
+/***/ }),
+/* 334 */
+/***/ (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__(199);
+/* harmony import */ var _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(335);
+/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336);
+/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(243);
+/** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */
+
+
+
+
+function timeout(due, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
+    }
+    return Object(_timeoutWith__WEBPACK_IMPORTED_MODULE_2__["timeoutWith"])(due, Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_3__["throwError"])(new _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__["TimeoutError"]()), scheduler);
+}
+//# sourceMappingURL=timeout.js.map
+
+
+/***/ }),
+/* 335 */
+/***/ (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; });
+/** 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;
+    }
+    TimeoutErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
+    return TimeoutErrorImpl;
+})();
+var TimeoutError = TimeoutErrorImpl;
+//# sourceMappingURL=TimeoutError.js.map
+
+
+/***/ }),
+/* 336 */
+/***/ (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__(36);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199);
+/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(240);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+function timeoutWith(due, withObservable, scheduler) {
+    if (scheduler === void 0) {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
+    }
+    return function (source) {
+        var absoluteTimeout = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_2__["isDate"])(due);
+        var waitFor = absoluteTimeout ? (+due - scheduler.now()) : Math.abs(due);
+        return source.lift(new TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler));
+    };
+}
+var TimeoutWithOperator = /*@__PURE__*/ (function () {
+    function TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler) {
+        this.waitFor = waitFor;
+        this.absoluteTimeout = absoluteTimeout;
+        this.withObservable = withObservable;
+        this.scheduler = scheduler;
+    }
+    TimeoutWithOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new TimeoutWithSubscriber(subscriber, this.absoluteTimeout, this.waitFor, this.withObservable, this.scheduler));
+    };
+    return TimeoutWithOperator;
+}());
+var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TimeoutWithSubscriber, _super);
+    function TimeoutWithSubscriber(destination, absoluteTimeout, waitFor, withObservable, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.absoluteTimeout = absoluteTimeout;
+        _this.waitFor = waitFor;
+        _this.withObservable = withObservable;
+        _this.scheduler = scheduler;
+        _this.action = null;
+        _this.scheduleTimeout();
+        return _this;
+    }
+    TimeoutWithSubscriber.dispatchTimeout = function (subscriber) {
+        var withObservable = subscriber.withObservable;
+        subscriber._unsubscribeAndRecycle();
+        subscriber.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(subscriber, withObservable));
+    };
+    TimeoutWithSubscriber.prototype.scheduleTimeout = function () {
+        var action = this.action;
+        if (action) {
+            this.action = action.schedule(this, this.waitFor);
+        }
+        else {
+            this.add(this.action = this.scheduler.schedule(TimeoutWithSubscriber.dispatchTimeout, this.waitFor, this));
+        }
+    };
+    TimeoutWithSubscriber.prototype._next = function (value) {
+        if (!this.absoluteTimeout) {
+            this.scheduleTimeout();
+        }
+        _super.prototype._next.call(this, value);
+    };
+    TimeoutWithSubscriber.prototype._unsubscribe = function () {
+        this.action = null;
+        this.scheduler = null;
+        this.withObservable = null;
+    };
+    return TimeoutWithSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+//# sourceMappingURL=timeoutWith.js.map
+
+
+/***/ }),
+/* 337 */
+/***/ (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__(199);
+/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(231);
+/** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */
+
+
+function timestamp(scheduler) {
+    if (scheduler === void 0) {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
+    }
+    return Object(_map__WEBPACK_IMPORTED_MODULE_1__["map"])(function (value) { return new Timestamp(value, scheduler.now()); });
+}
+var Timestamp = /*@__PURE__*/ (function () {
+    function Timestamp(value, timestamp) {
+        this.value = value;
+        this.timestamp = timestamp;
+    }
+    return Timestamp;
+}());
+
+//# sourceMappingURL=timestamp.js.map
+
+
+/***/ }),
+/* 338 */
+/***/ (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__(275);
+/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
+
+function toArrayReducer(arr, item, index) {
+    if (index === 0) {
+        return [item];
+    }
+    arr.push(item);
+    return arr;
+}
+function toArray() {
+    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(toArrayReducer, []);
+}
+//# sourceMappingURL=toArray.js.map
+
+
+/***/ }),
+/* 339 */
+/***/ (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__(36);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+function window(windowBoundaries) {
+    return function windowOperatorFunction(source) {
+        return source.lift(new WindowOperator(windowBoundaries));
+    };
+}
+var WindowOperator = /*@__PURE__*/ (function () {
+    function WindowOperator(windowBoundaries) {
+        this.windowBoundaries = windowBoundaries;
+    }
+    WindowOperator.prototype.call = function (subscriber, source) {
+        var windowSubscriber = new WindowSubscriber(subscriber);
+        var sourceSubscription = source.subscribe(windowSubscriber);
+        if (!sourceSubscription.closed) {
+            windowSubscriber.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(windowSubscriber, this.windowBoundaries));
+        }
+        return sourceSubscription;
+    };
+    return WindowOperator;
+}());
+var WindowSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowSubscriber, _super);
+    function WindowSubscriber(destination) {
+        var _this = _super.call(this, destination) || this;
+        _this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
+        destination.next(_this.window);
+        return _this;
+    }
+    WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.openWindow();
+    };
+    WindowSubscriber.prototype.notifyError = function (error, innerSub) {
+        this._error(error);
+    };
+    WindowSubscriber.prototype.notifyComplete = function (innerSub) {
+        this._complete();
+    };
+    WindowSubscriber.prototype._next = function (value) {
+        this.window.next(value);
+    };
+    WindowSubscriber.prototype._error = function (err) {
+        this.window.error(err);
+        this.destination.error(err);
+    };
+    WindowSubscriber.prototype._complete = function () {
+        this.window.complete();
+        this.destination.complete();
+    };
+    WindowSubscriber.prototype._unsubscribe = function () {
+        this.window = null;
+    };
+    WindowSubscriber.prototype.openWindow = function () {
+        var prevWindow = this.window;
+        if (prevWindow) {
+            prevWindow.complete();
+        }
+        var destination = this.destination;
+        var newWindow = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
+        destination.next(newWindow);
+    };
+    return WindowSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
+//# sourceMappingURL=window.js.map
+
+
+/***/ }),
+/* 340 */
+/***/ (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__(36);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(265);
+/** PURE_IMPORTS_START tslib,_Subscriber,_Subject PURE_IMPORTS_END */
+
+
+
+function windowCount(windowSize, startWindowEvery) {
+    if (startWindowEvery === void 0) {
+        startWindowEvery = 0;
+    }
+    return function windowCountOperatorFunction(source) {
+        return source.lift(new WindowCountOperator(windowSize, startWindowEvery));
+    };
+}
+var WindowCountOperator = /*@__PURE__*/ (function () {
+    function WindowCountOperator(windowSize, startWindowEvery) {
+        this.windowSize = windowSize;
+        this.startWindowEvery = startWindowEvery;
+    }
+    WindowCountOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new WindowCountSubscriber(subscriber, this.windowSize, this.startWindowEvery));
+    };
+    return WindowCountOperator;
+}());
+var WindowCountSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowCountSubscriber, _super);
+    function WindowCountSubscriber(destination, windowSize, startWindowEvery) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        _this.windowSize = windowSize;
+        _this.startWindowEvery = startWindowEvery;
+        _this.windows = [new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]()];
+        _this.count = 0;
+        destination.next(_this.windows[0]);
+        return _this;
+    }
+    WindowCountSubscriber.prototype._next = function (value) {
+        var startWindowEvery = (this.startWindowEvery > 0) ? this.startWindowEvery : this.windowSize;
+        var destination = this.destination;
+        var windowSize = this.windowSize;
+        var windows = this.windows;
+        var len = windows.length;
+        for (var i = 0; i < len && !this.closed; i++) {
+            windows[i].next(value);
+        }
+        var c = this.count - windowSize + 1;
+        if (c >= 0 && c % startWindowEvery === 0 && !this.closed) {
+            windows.shift().complete();
+        }
+        if (++this.count % startWindowEvery === 0 && !this.closed) {
+            var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]();
+            windows.push(window_1);
+            destination.next(window_1);
+        }
+    };
+    WindowCountSubscriber.prototype._error = function (err) {
+        var windows = this.windows;
+        if (windows) {
+            while (windows.length > 0 && !this.closed) {
+                windows.shift().error(err);
+            }
+        }
+        this.destination.error(err);
+    };
+    WindowCountSubscriber.prototype._complete = function () {
+        var windows = this.windows;
+        if (windows) {
+            while (windows.length > 0 && !this.closed) {
+                windows.shift().complete();
+            }
+        }
+        this.destination.complete();
+    };
+    WindowCountSubscriber.prototype._unsubscribe = function () {
+        this.count = 0;
+        this.windows = null;
+    };
+    return WindowCountSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+//# sourceMappingURL=windowCount.js.map
+
+
+/***/ }),
+/* 341 */
+/***/ (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__(36);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(199);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172);
+/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(205);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(206);
+/** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+
+
+
+function windowTime(windowTimeSpan) {
+    var scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
+    var windowCreationInterval = null;
+    var maxWindowSize = Number.POSITIVE_INFINITY;
+    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[3])) {
+        scheduler = arguments[3];
+    }
+    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[2])) {
+        scheduler = arguments[2];
+    }
+    else if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_4__["isNumeric"])(arguments[2])) {
+        maxWindowSize = arguments[2];
+    }
+    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[1])) {
+        scheduler = arguments[1];
+    }
+    else if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_4__["isNumeric"])(arguments[1])) {
+        windowCreationInterval = arguments[1];
+    }
+    return function windowTimeOperatorFunction(source) {
+        return source.lift(new WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler));
+    };
+}
+var WindowTimeOperator = /*@__PURE__*/ (function () {
+    function WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) {
+        this.windowTimeSpan = windowTimeSpan;
+        this.windowCreationInterval = windowCreationInterval;
+        this.maxWindowSize = maxWindowSize;
+        this.scheduler = scheduler;
+    }
+    WindowTimeOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new WindowTimeSubscriber(subscriber, this.windowTimeSpan, this.windowCreationInterval, this.maxWindowSize, this.scheduler));
+    };
+    return WindowTimeOperator;
+}());
+var CountedSubject = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CountedSubject, _super);
+    function CountedSubject() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this._numberOfNextedValues = 0;
+        return _this;
+    }
+    CountedSubject.prototype.next = function (value) {
+        this._numberOfNextedValues++;
+        _super.prototype.next.call(this, value);
+    };
+    Object.defineProperty(CountedSubject.prototype, "numberOfNextedValues", {
+        get: function () {
+            return this._numberOfNextedValues;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return CountedSubject;
+}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
+var WindowTimeSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowTimeSubscriber, _super);
+    function WindowTimeSubscriber(destination, windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        _this.windowTimeSpan = windowTimeSpan;
+        _this.windowCreationInterval = windowCreationInterval;
+        _this.maxWindowSize = maxWindowSize;
+        _this.scheduler = scheduler;
+        _this.windows = [];
+        var window = _this.openWindow();
+        if (windowCreationInterval !== null && windowCreationInterval >= 0) {
+            var closeState = { subscriber: _this, window: window, context: null };
+            var creationState = { windowTimeSpan: windowTimeSpan, windowCreationInterval: windowCreationInterval, subscriber: _this, scheduler: scheduler };
+            _this.add(scheduler.schedule(dispatchWindowClose, windowTimeSpan, closeState));
+            _this.add(scheduler.schedule(dispatchWindowCreation, windowCreationInterval, creationState));
+        }
+        else {
+            var timeSpanOnlyState = { subscriber: _this, window: window, windowTimeSpan: windowTimeSpan };
+            _this.add(scheduler.schedule(dispatchWindowTimeSpanOnly, windowTimeSpan, timeSpanOnlyState));
+        }
+        return _this;
+    }
+    WindowTimeSubscriber.prototype._next = function (value) {
+        var windows = this.windows;
+        var len = windows.length;
+        for (var i = 0; i < len; i++) {
+            var window_1 = windows[i];
+            if (!window_1.closed) {
+                window_1.next(value);
+                if (window_1.numberOfNextedValues >= this.maxWindowSize) {
+                    this.closeWindow(window_1);
+                }
+            }
+        }
+    };
+    WindowTimeSubscriber.prototype._error = function (err) {
+        var windows = this.windows;
+        while (windows.length > 0) {
+            windows.shift().error(err);
+        }
+        this.destination.error(err);
+    };
+    WindowTimeSubscriber.prototype._complete = function () {
+        var windows = this.windows;
+        while (windows.length > 0) {
+            var window_2 = windows.shift();
+            if (!window_2.closed) {
+                window_2.complete();
+            }
+        }
+        this.destination.complete();
+    };
+    WindowTimeSubscriber.prototype.openWindow = function () {
+        var window = new CountedSubject();
+        this.windows.push(window);
+        var destination = this.destination;
+        destination.next(window);
+        return window;
+    };
+    WindowTimeSubscriber.prototype.closeWindow = function (window) {
+        window.complete();
+        var windows = this.windows;
+        windows.splice(windows.indexOf(window), 1);
+    };
+    return WindowTimeSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"]));
+function dispatchWindowTimeSpanOnly(state) {
+    var subscriber = state.subscriber, windowTimeSpan = state.windowTimeSpan, window = state.window;
+    if (window) {
+        subscriber.closeWindow(window);
+    }
+    state.window = subscriber.openWindow();
+    this.schedule(state, windowTimeSpan);
+}
+function dispatchWindowCreation(state) {
+    var windowTimeSpan = state.windowTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler, windowCreationInterval = state.windowCreationInterval;
+    var window = subscriber.openWindow();
+    var action = this;
+    var context = { action: action, subscription: null };
+    var timeSpanState = { subscriber: subscriber, window: window, context: context };
+    context.subscription = scheduler.schedule(dispatchWindowClose, windowTimeSpan, timeSpanState);
+    action.add(context.subscription);
+    action.schedule(state, windowCreationInterval);
+}
+function dispatchWindowClose(state) {
+    var subscriber = state.subscriber, window = state.window, context = state.context;
+    if (context && context.action && context.subscription) {
+        context.action.remove(context.subscription);
+    }
+    subscriber.closeWindow(window);
+}
+//# sourceMappingURL=windowTime.js.map
+
+
+/***/ }),
+/* 342 */
+/***/ (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__(36);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+
+function windowToggle(openings, closingSelector) {
+    return function (source) { return source.lift(new WindowToggleOperator(openings, closingSelector)); };
+}
+var WindowToggleOperator = /*@__PURE__*/ (function () {
+    function WindowToggleOperator(openings, closingSelector) {
+        this.openings = openings;
+        this.closingSelector = closingSelector;
+    }
+    WindowToggleOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new WindowToggleSubscriber(subscriber, this.openings, this.closingSelector));
+    };
+    return WindowToggleOperator;
+}());
+var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowToggleSubscriber, _super);
+    function WindowToggleSubscriber(destination, openings, closingSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.openings = openings;
+        _this.closingSelector = closingSelector;
+        _this.contexts = [];
+        _this.add(_this.openSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(_this, openings, openings));
+        return _this;
+    }
+    WindowToggleSubscriber.prototype._next = function (value) {
+        var contexts = this.contexts;
+        if (contexts) {
+            var len = contexts.length;
+            for (var i = 0; i < len; i++) {
+                contexts[i].window.next(value);
+            }
+        }
+    };
+    WindowToggleSubscriber.prototype._error = function (err) {
+        var contexts = this.contexts;
+        this.contexts = null;
+        if (contexts) {
+            var len = contexts.length;
+            var index = -1;
+            while (++index < len) {
+                var context_1 = contexts[index];
+                context_1.window.error(err);
+                context_1.subscription.unsubscribe();
+            }
+        }
+        _super.prototype._error.call(this, err);
+    };
+    WindowToggleSubscriber.prototype._complete = function () {
+        var contexts = this.contexts;
+        this.contexts = null;
+        if (contexts) {
+            var len = contexts.length;
+            var index = -1;
+            while (++index < len) {
+                var context_2 = contexts[index];
+                context_2.window.complete();
+                context_2.subscription.unsubscribe();
+            }
+        }
+        _super.prototype._complete.call(this);
+    };
+    WindowToggleSubscriber.prototype._unsubscribe = function () {
+        var contexts = this.contexts;
+        this.contexts = null;
+        if (contexts) {
+            var len = contexts.length;
+            var index = -1;
+            while (++index < len) {
+                var context_3 = contexts[index];
+                context_3.window.unsubscribe();
+                context_3.subscription.unsubscribe();
+            }
+        }
+    };
+    WindowToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        if (outerValue === this.openings) {
+            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 {
+                innerSubscription.context = context_4;
+                subscription.add(innerSubscription);
+            }
+            this.destination.next(window_1);
+        }
+        else {
+            this.closeWindow(this.contexts.indexOf(outerValue));
+        }
+    };
+    WindowToggleSubscriber.prototype.notifyError = function (err) {
+        this.error(err);
+    };
+    WindowToggleSubscriber.prototype.notifyComplete = function (inner) {
+        if (inner !== this.openSubscription) {
+            this.closeWindow(this.contexts.indexOf(inner.context));
+        }
+    };
+    WindowToggleSubscriber.prototype.closeWindow = function (index) {
+        if (index === -1) {
+            return;
+        }
+        var contexts = this.contexts;
+        var context = contexts[index];
+        var window = context.window, subscription = context.subscription;
+        contexts.splice(index, 1);
+        window.complete();
+        subscription.unsubscribe();
+    };
+    return WindowToggleSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+//# sourceMappingURL=windowToggle.js.map
+
+
+/***/ }),
+/* 343 */
+/***/ (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__(36);
+/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+
+function windowWhen(closingSelector) {
+    return function windowWhenOperatorFunction(source) {
+        return source.lift(new WindowOperator(closingSelector));
+    };
+}
+var WindowOperator = /*@__PURE__*/ (function () {
+    function WindowOperator(closingSelector) {
+        this.closingSelector = closingSelector;
+    }
+    WindowOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new WindowSubscriber(subscriber, this.closingSelector));
+    };
+    return WindowOperator;
+}());
+var WindowSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowSubscriber, _super);
+    function WindowSubscriber(destination, closingSelector) {
+        var _this = _super.call(this, destination) || this;
+        _this.destination = destination;
+        _this.closingSelector = closingSelector;
+        _this.openWindow();
+        return _this;
+    }
+    WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.openWindow(innerSub);
+    };
+    WindowSubscriber.prototype.notifyError = function (error, innerSub) {
+        this._error(error);
+    };
+    WindowSubscriber.prototype.notifyComplete = function (innerSub) {
+        this.openWindow(innerSub);
+    };
+    WindowSubscriber.prototype._next = function (value) {
+        this.window.next(value);
+    };
+    WindowSubscriber.prototype._error = function (err) {
+        this.window.error(err);
+        this.destination.error(err);
+        this.unsubscribeClosingNotification();
+    };
+    WindowSubscriber.prototype._complete = function () {
+        this.window.complete();
+        this.destination.complete();
+        this.unsubscribeClosingNotification();
+    };
+    WindowSubscriber.prototype.unsubscribeClosingNotification = function () {
+        if (this.closingNotification) {
+            this.closingNotification.unsubscribe();
+        }
+    };
+    WindowSubscriber.prototype.openWindow = function (innerSub) {
+        if (innerSub === void 0) {
+            innerSub = null;
+        }
+        if (innerSub) {
+            this.remove(innerSub);
+            innerSub.unsubscribe();
+        }
+        var prevWindow = this.window;
+        if (prevWindow) {
+            prevWindow.complete();
+        }
+        var window = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
+        this.destination.next(window);
+        var closingNotifier;
+        try {
+            var closingSelector = this.closingSelector;
+            closingNotifier = closingSelector();
+        }
+        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_2__["OuterSubscriber"]));
+//# sourceMappingURL=windowWhen.js.map
+
+
+/***/ }),
+/* 344 */
+/***/ (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__(36);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182);
+/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */
+
+
+
+function withLatestFrom() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    return function (source) {
+        var project;
+        if (typeof args[args.length - 1] === 'function') {
+            project = args.pop();
+        }
+        var observables = args;
+        return source.lift(new WithLatestFromOperator(observables, project));
+    };
+}
+var WithLatestFromOperator = /*@__PURE__*/ (function () {
+    function WithLatestFromOperator(observables, project) {
+        this.observables = observables;
+        this.project = project;
+    }
+    WithLatestFromOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new WithLatestFromSubscriber(subscriber, this.observables, this.project));
+    };
+    return WithLatestFromOperator;
+}());
+var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WithLatestFromSubscriber, _super);
+    function WithLatestFromSubscriber(destination, observables, project) {
+        var _this = _super.call(this, destination) || this;
+        _this.observables = observables;
+        _this.project = project;
+        _this.toRespond = [];
+        var len = observables.length;
+        _this.values = new Array(len);
+        for (var i = 0; i < len; i++) {
+            _this.toRespond.push(i);
+        }
+        for (var i = 0; i < len; i++) {
+            var observable = observables[i];
+            _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, observable, observable, i));
+        }
+        return _this;
+    }
+    WithLatestFromSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.values[outerIndex] = innerValue;
+        var toRespond = this.toRespond;
+        if (toRespond.length > 0) {
+            var found = toRespond.indexOf(outerIndex);
+            if (found !== -1) {
+                toRespond.splice(found, 1);
+            }
+        }
+    };
+    WithLatestFromSubscriber.prototype.notifyComplete = function () {
+    };
+    WithLatestFromSubscriber.prototype._next = function (value) {
+        if (this.toRespond.length === 0) {
+            var args = [value].concat(this.values);
+            if (this.project) {
+                this._tryProject(args);
+            }
+            else {
+                this.destination.next(args);
+            }
+        }
+    };
+    WithLatestFromSubscriber.prototype._tryProject = function (args) {
+        var result;
+        try {
+            result = this.project.apply(this, args);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.next(result);
+    };
+    return WithLatestFromSubscriber;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+//# sourceMappingURL=withLatestFrom.js.map
+
+
+/***/ }),
+/* 345 */
+/***/ (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__(346);
+/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
+
+function zip() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    return function zipOperatorFunction(source) {
+        return source.lift.call(_observable_zip__WEBPACK_IMPORTED_MODULE_0__["zip"].apply(void 0, [source].concat(observables)));
+    };
+}
+//# sourceMappingURL=zip.js.map
+
+
+/***/ }),
+/* 346 */
+/***/ (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 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__(36);
+/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178);
+/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172);
+/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(171);
+/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(182);
+/* harmony import */ var _internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(188);
+/** PURE_IMPORTS_START tslib,_fromArray,_util_isArray,_Subscriber,_OuterSubscriber,_util_subscribeToResult,_.._internal_symbol_iterator PURE_IMPORTS_END */
+
+
+
+
+
+
+
+function zip() {
+    var observables = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        observables[_i] = arguments[_i];
+    }
+    var resultSelector = observables[observables.length - 1];
+    if (typeof resultSelector === 'function') {
+        observables.pop();
+    }
+    return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(observables, undefined).lift(new ZipOperator(resultSelector));
+}
+var ZipOperator = /*@__PURE__*/ (function () {
+    function ZipOperator(resultSelector) {
+        this.resultSelector = resultSelector;
+    }
+    ZipOperator.prototype.call = function (subscriber, source) {
+        return source.subscribe(new ZipSubscriber(subscriber, this.resultSelector));
+    };
+    return ZipOperator;
+}());
+
+var ZipSubscriber = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ZipSubscriber, _super);
+    function ZipSubscriber(destination, resultSelector, values) {
+        if (values === void 0) {
+            values = Object.create(null);
+        }
+        var _this = _super.call(this, destination) || this;
+        _this.iterators = [];
+        _this.active = 0;
+        _this.resultSelector = (typeof resultSelector === 'function') ? resultSelector : null;
+        _this.values = values;
+        return _this;
+    }
+    ZipSubscriber.prototype._next = function (value) {
+        var iterators = this.iterators;
+        if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(value)) {
+            iterators.push(new StaticArrayIterator(value));
+        }
+        else if (typeof value[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] === 'function') {
+            iterators.push(new StaticIterator(value[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]]()));
+        }
+        else {
+            iterators.push(new ZipBufferIterator(this.destination, this, value));
+        }
+    };
+    ZipSubscriber.prototype._complete = function () {
+        var iterators = this.iterators;
+        var len = iterators.length;
+        this.unsubscribe();
+        if (len === 0) {
+            this.destination.complete();
+            return;
+        }
+        this.active = len;
+        for (var i = 0; i < len; i++) {
+            var iterator = iterators[i];
+            if (iterator.stillUnsubscribed) {
+                var destination = this.destination;
+                destination.add(iterator.subscribe(iterator, i));
+            }
+            else {
+                this.active--;
+            }
+        }
+    };
+    ZipSubscriber.prototype.notifyInactive = function () {
+        this.active--;
+        if (this.active === 0) {
+            this.destination.complete();
+        }
+    };
+    ZipSubscriber.prototype.checkIterators = function () {
+        var iterators = this.iterators;
+        var len = iterators.length;
+        var destination = this.destination;
+        for (var i = 0; i < len; i++) {
+            var iterator = iterators[i];
+            if (typeof iterator.hasValue === 'function' && !iterator.hasValue()) {
+                return;
+            }
+        }
+        var shouldComplete = false;
+        var args = [];
+        for (var i = 0; i < len; i++) {
+            var iterator = iterators[i];
+            var result = iterator.next();
+            if (iterator.hasCompleted()) {
+                shouldComplete = true;
+            }
+            if (result.done) {
+                destination.complete();
+                return;
+            }
+            args.push(result.value);
+        }
+        if (this.resultSelector) {
+            this._tryresultSelector(args);
+        }
+        else {
+            destination.next(args);
+        }
+        if (shouldComplete) {
+            destination.complete();
+        }
+    };
+    ZipSubscriber.prototype._tryresultSelector = function (args) {
+        var result;
+        try {
+            result = this.resultSelector.apply(this, args);
+        }
+        catch (err) {
+            this.destination.error(err);
+            return;
+        }
+        this.destination.next(result);
+    };
+    return ZipSubscriber;
+}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"]));
+
+var StaticIterator = /*@__PURE__*/ (function () {
+    function StaticIterator(iterator) {
+        this.iterator = iterator;
+        this.nextResult = iterator.next();
+    }
+    StaticIterator.prototype.hasValue = function () {
+        return true;
+    };
+    StaticIterator.prototype.next = function () {
+        var result = this.nextResult;
+        this.nextResult = this.iterator.next();
+        return result;
+    };
+    StaticIterator.prototype.hasCompleted = function () {
+        var nextResult = this.nextResult;
+        return nextResult && nextResult.done;
+    };
+    return StaticIterator;
+}());
+var StaticArrayIterator = /*@__PURE__*/ (function () {
+    function StaticArrayIterator(array) {
+        this.array = array;
+        this.index = 0;
+        this.length = 0;
+        this.length = array.length;
+    }
+    StaticArrayIterator.prototype[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] = function () {
+        return this;
+    };
+    StaticArrayIterator.prototype.next = function (value) {
+        var i = this.index++;
+        var array = this.array;
+        return i < this.length ? { value: array[i], done: false } : { value: null, done: true };
+    };
+    StaticArrayIterator.prototype.hasValue = function () {
+        return this.array.length > this.index;
+    };
+    StaticArrayIterator.prototype.hasCompleted = function () {
+        return this.array.length === this.index;
+    };
+    return StaticArrayIterator;
+}());
+var ZipBufferIterator = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ZipBufferIterator, _super);
+    function ZipBufferIterator(destination, parent, observable) {
+        var _this = _super.call(this, destination) || this;
+        _this.parent = parent;
+        _this.observable = observable;
+        _this.stillUnsubscribed = true;
+        _this.buffer = [];
+        _this.isComplete = false;
+        return _this;
+    }
+    ZipBufferIterator.prototype[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] = function () {
+        return this;
+    };
+    ZipBufferIterator.prototype.next = function () {
+        var buffer = this.buffer;
+        if (buffer.length === 0 && this.isComplete) {
+            return { value: null, done: true };
+        }
+        else {
+            return { value: buffer.shift(), done: false };
+        }
+    };
+    ZipBufferIterator.prototype.hasValue = function () {
+        return this.buffer.length > 0;
+    };
+    ZipBufferIterator.prototype.hasCompleted = function () {
+        return this.buffer.length === 0 && this.isComplete;
+    };
+    ZipBufferIterator.prototype.notifyComplete = function () {
+        if (this.buffer.length > 0) {
+            this.isComplete = true;
+            this.parent.notifyInactive();
+        }
+        else {
+            this.destination.complete();
+        }
+    };
+    ZipBufferIterator.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
+        this.buffer.push(innerValue);
+        this.parent.checkIterators();
+    };
+    ZipBufferIterator.prototype.subscribe = function (value, index) {
+        return Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, this.observable, this, index);
+    };
+    return ZipBufferIterator;
+}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"]));
+//# sourceMappingURL=zip.js.map
+
+
+/***/ }),
+/* 347 */
+/***/ (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__(346);
+/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
+
+function zipAll(project) {
+    return function (source) { return source.lift(new _observable_zip__WEBPACK_IMPORTED_MODULE_0__["ZipOperator"](project)); };
+}
+//# sourceMappingURL=zipAll.js.map
+
+
+/***/ }),
+/* 348 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const callbacks = new Set();
+let called = false;
+
+function exit(exit, signal) {
+	if (called) {
+		return;
+	}
+
+	called = true;
+
+	for (const callback of callbacks) {
+		callback();
+	}
+
+	if (exit === true) {
+		process.exit(128 + signal); // eslint-disable-line unicorn/no-process-exit
+	}
+}
+
+module.exports = callback => {
+	callbacks.add(callback);
+
+	if (callbacks.size === 1) {
+		process.once('exit', exit);
+		process.once('SIGINT', exit.bind(null, true, 2));
+		process.once('SIGTERM', exit.bind(null, true, 15));
+
+		// PM2 Cluster shutdown message. Caught to support async handlers with pm2, needed because
+		// explicitly calling process.exit() doesn't trigger the beforeExit event, and the exit
+		// event cannot support async handlers, since the event loop is never called after it.
+		process.on('message', message => {
+			if (message === 'shutdown') {
+				exit(true, -128);
+			}
+		});
+	}
+
+	return () => {
+		callbacks.delete(callback);
+	};
+};
+
+
+/***/ }),
+/* 349 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const $isCliError = Symbol('isCliError');
+function createCliError(message) {
+    const error = new Error(message);
+    error[$isCliError] = true;
+    return error;
+}
+exports.createCliError = createCliError;
+function isCliError(error) {
+    return error && !!error[$isCliError];
+}
+exports.isCliError = isCliError;
+
+
+/***/ }),
+/* 350 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+const execa_1 = tslib_1.__importDefault(__webpack_require__(351));
+const fs_1 = __webpack_require__(23);
+const Rx = tslib_1.__importStar(__webpack_require__(392));
+const operators_1 = __webpack_require__(169);
+const chalk_1 = tslib_1.__importDefault(__webpack_require__(2));
+const tree_kill_1 = tslib_1.__importDefault(__webpack_require__(412));
+const util_1 = __webpack_require__(29);
+const treeKillAsync = util_1.promisify((...args) => tree_kill_1.default(...args));
+const observe_lines_1 = __webpack_require__(413);
+const errors_1 = __webpack_require__(349);
+const SECOND = 1000;
+const STOP_TIMEOUT = 30 * SECOND;
+async function withTimeout(attempt, ms, onTimeout) {
+    const TIMEOUT = Symbol('timeout');
+    try {
+        await Promise.race([
+            attempt(),
+            new Promise((_, reject) => setTimeout(() => reject(TIMEOUT), ms)),
+        ]);
+    }
+    catch (error) {
+        if (error === TIMEOUT) {
+            await onTimeout();
+        }
+        else {
+            throw error;
+        }
+    }
+}
+function startProc(name, options, log) {
+    const { cmd, args, cwd, env, stdin } = options;
+    log.info('[%s] > %s', name, cmd, args.join(' '));
+    // spawn fails with ENOENT when either the
+    // cmd or cwd don't exist, so we check for the cwd
+    // ahead of time so that the error is less ambiguous
+    try {
+        if (!fs_1.statSync(cwd).isDirectory()) {
+            throw new Error(`cwd "${cwd}" exists but is not a directory`);
+        }
+    }
+    catch (err) {
+        if (err.code === 'ENOENT') {
+            throw new Error(`cwd "${cwd}" does not exist`);
+        }
+    }
+    const childProcess = execa_1.default(cmd, args, {
+        cwd,
+        env,
+        stdio: ['pipe', 'pipe', 'pipe'],
+        preferLocal: true,
+    });
+    if (stdin) {
+        childProcess.stdin.end(stdin, 'utf8');
+    }
+    else {
+        childProcess.stdin.end();
+    }
+    let stopCalled = false;
+    const outcome$ = Rx.race(
+    // observe first exit event
+    Rx.fromEvent(childProcess, 'exit').pipe(operators_1.take(1), operators_1.map(([code]) => {
+        if (stopCalled) {
+            return null;
+        }
+        // JVM exits with 143 on SIGTERM and 130 on SIGINT, dont' treat then as errors
+        if (code > 0 && !(code === 143 || code === 130)) {
+            throw errors_1.createCliError(`[${name}] exited with code ${code}`);
+        }
+        return code;
+    })), 
+    // observe first error event
+    Rx.fromEvent(childProcess, 'error').pipe(operators_1.take(1), operators_1.mergeMap(err => Rx.throwError(err)))).pipe(operators_1.share());
+    const lines$ = Rx.merge(observe_lines_1.observeLines(childProcess.stdout), observe_lines_1.observeLines(childProcess.stderr)).pipe(operators_1.tap(line => log.write(` ${chalk_1.default.gray('proc')} [${chalk_1.default.gray(name)}] ${line}`)), operators_1.share());
+    const outcomePromise = Rx.merge(lines$.pipe(operators_1.ignoreElements()), outcome$).toPromise();
+    async function stop(signal) {
+        if (stopCalled) {
+            return;
+        }
+        stopCalled = true;
+        await withTimeout(async () => {
+            log.debug(`Sending "${signal}" to proc "${name}"`);
+            await treeKillAsync(childProcess.pid, signal);
+            await outcomePromise;
+        }, STOP_TIMEOUT, async () => {
+            log.warning(`Proc "${name}" was sent "${signal}" didn't emit the "exit" or "error" events after ${STOP_TIMEOUT} ms, sending SIGKILL`);
+            await treeKillAsync(childProcess.pid, 'SIGKILL');
+        });
+        await withTimeout(async () => {
+            try {
+                await outcomePromise;
+            }
+            catch (error) {
+                // ignore
+            }
+        }, STOP_TIMEOUT, async () => {
+            throw new Error(`Proc "${name}" was stopped but never emitted either the "exit" or "error" event after ${STOP_TIMEOUT} ms`);
+        });
+    }
+    return {
+        name,
+        lines$,
+        outcome$,
+        outcomePromise,
+        stop,
+    };
+}
+exports.startProc = startProc;
+
+
+/***/ }),
+/* 351 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const path = __webpack_require__(16);
+const childProcess = __webpack_require__(352);
+const crossSpawn = __webpack_require__(353);
+const stripFinalNewline = __webpack_require__(366);
+const npmRunPath = __webpack_require__(367);
+const onetime = __webpack_require__(368);
+const makeError = __webpack_require__(370);
+const normalizeStdio = __webpack_require__(375);
+const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__(376);
+const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__(381);
+const {mergePromise, getSpawnedPromise} = __webpack_require__(390);
+const {joinCommand, parseCommand} = __webpack_require__(391);
+
+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});
+	}
+
+	return env;
+};
+
+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,
+		stripFinalNewline: true,
+		extendEnv: true,
+		preferLocal: false,
+		localDir: options.cwd || process.cwd(),
+		execPath: process.execPath,
+		encoding: 'utf8',
+		reject: true,
+		cleanup: true,
+		all: false,
+		...options,
+		windowsHide: true
+	};
+
+	options.env = getEnv(options);
+
+	options.stdio = normalizeStdio(options);
+
+	if (process.platform === 'win32' && path.basename(file, '.exe') === 'cmd') {
+		// #116
+		args.unshift('/q');
+	}
+
+	return {file, args, options, parsed};
+};
+
+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 : '';
+	}
+
+	if (options.stripFinalNewline) {
+		return stripFinalNewline(value);
+	}
+
+	return value;
+};
+
+const execa = (file, args, options) => {
+	const parsed = handleArgs(file, args, options);
+	const command = joinCommand(file, args);
+
+	let spawned;
+	try {
+		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 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,
+				isCanceled: context.isCanceled,
+				killed: spawned.killed
+			});
+
+			if (!parsed.options.reject) {
+				return returnedError;
+			}
+
+			throw returnedError;
+		}
+
+		return {
+			command,
+			exitCode: 0,
+			stdout,
+			stderr,
+			all,
+			failed: false,
+			timedOut: false,
+			isCanceled: false,
+			killed: false
+		};
+	};
+
+	const handlePromiseOnce = onetime(handlePromise);
+
+	crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed);
+
+	handleInput(spawned, parsed.options.input);
+
+	spawned.all = makeAllStream(spawned, parsed.options);
+
+	return mergePromise(spawned, handlePromiseOnce);
+};
+
+module.exports = execa;
+
+module.exports.sync = (file, args, options) => {
+	const parsed = handleArgs(file, args, options);
+	const command = joinCommand(file, args);
+
+	validateInputSync(parsed.options);
+
+	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 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 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.options.reject) {
+			return error;
+		}
+
+		throw error;
+	}
+
+	return {
+		command,
+		exitCode: 0,
+		stdout,
+		stderr,
+		failed: false,
+		timedOut: false,
+		isCanceled: false,
+		killed: false
+	};
+};
+
+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
+		}
+	);
+};
+
+
+/***/ }),
+/* 352 */
+/***/ (function(module, exports) {
+
+module.exports = require("child_process");
+
+/***/ }),
+/* 353 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const cp = __webpack_require__(352);
+const parse = __webpack_require__(354);
+const enoent = __webpack_require__(365);
+
+function spawn(command, args, options) {
+    // Parse the arguments
+    const parsed = parse(command, args, options);
+
+    // Spawn the child process
+    const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
+
+    // Hook into child process "exit" event to emit an error if the command
+    // does not exists, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16
+    enoent.hookChildProcess(spawned, parsed);
+
+    return spawned;
+}
+
+function spawnSync(command, args, options) {
+    // Parse the arguments
+    const parsed = parse(command, args, options);
+
+    // Spawn the child process
+    const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
+
+    // Analyze if the command does not exist, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16
+    result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
+
+    return result;
+}
+
+module.exports = spawn;
+module.exports.spawn = spawn;
+module.exports.sync = spawnSync;
+
+module.exports._parse = parse;
+module.exports._enoent = enoent;
+
+
+/***/ }),
+/* 354 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const path = __webpack_require__(16);
+const resolveCommand = __webpack_require__(355);
+const escape = __webpack_require__(361);
+const readShebang = __webpack_require__(362);
+
+const isWin = process.platform === 'win32';
+const isExecutableRegExp = /\.(?:com|exe)$/i;
+const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
+
+function detectShebang(parsed) {
+    parsed.file = resolveCommand(parsed);
+
+    const shebang = parsed.file && readShebang(parsed.file);
+
+    if (shebang) {
+        parsed.args.unshift(parsed.file);
+        parsed.command = shebang;
+
+        return resolveCommand(parsed);
+    }
+
+    return parsed.file;
+}
+
+function parseNonShell(parsed) {
+    if (!isWin) {
+        return parsed;
+    }
+
+    // Detect & add support for shebangs
+    const commandFile = detectShebang(parsed);
+
+    // We don't need a shell if the command filename is an executable
+    const needsShell = !isExecutableRegExp.test(commandFile);
+
+    // If a shell is required, use cmd.exe and take care of escaping everything correctly
+    // Note that `forceShell` is an hidden option used only in tests
+    if (parsed.options.forceShell || needsShell) {
+        // Need to double escape meta chars if the command is a cmd-shim located in `node_modules/.bin/`
+        // The cmd-shim simply calls execute the package bin file with NodeJS, proxying any argument
+        // Because the escape of metachars with ^ gets interpreted when the cmd.exe is first called,
+        // we need to double escape them
+        const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
+
+        // Normalize posix paths into OS compatible paths (e.g.: foo/bar -> foo\bar)
+        // This is necessary otherwise it will always fail with ENOENT in those cases
+        parsed.command = path.normalize(parsed.command);
+
+        // Escape command & arguments
+        parsed.command = escape.command(parsed.command);
+        parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
+
+        const shellCommand = [parsed.command].concat(parsed.args).join(' ');
+
+        parsed.args = ['/d', '/s', '/c', `"${shellCommand}"`];
+        parsed.command = process.env.comspec || 'cmd.exe';
+        parsed.options.windowsVerbatimArguments = true; // Tell node's spawn that the arguments are already escaped
+    }
+
+    return parsed;
+}
+
+function parse(command, args, options) {
+    // Normalize arguments, similar to nodejs
+    if (args && !Array.isArray(args)) {
+        options = args;
+        args = null;
+    }
+
+    args = args ? args.slice(0) : []; // Clone array to avoid changing the original
+    options = Object.assign({}, options); // Clone object to avoid changing the original
+
+    // Build our parsed object
+    const parsed = {
+        command,
+        args,
+        options,
+        file: undefined,
+        original: {
+            command,
+            args,
+        },
+    };
+
+    // Delegate further parsing to shell or non-shell
+    return options.shell ? parsed : parseNonShell(parsed);
+}
+
+module.exports = parse;
+
+
+/***/ }),
+/* 355 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const path = __webpack_require__(16);
+const which = __webpack_require__(356);
+const pathKey = __webpack_require__(360)();
+
+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 (shouldSwitchCwd) {
+        try {
+            process.chdir(parsed.options.cwd);
+        } catch (err) {
+            /* Empty */
+        }
+    }
+
+    let resolved;
+
+    try {
+        resolved = which.sync(parsed.command, {
+            path: (parsed.options.env || process.env)[pathKey],
+            pathExt: withoutPathExt ? path.delimiter : undefined,
+        });
+    } catch (e) {
+        /* Empty */
+    } finally {
+        if (shouldSwitchCwd) {
+            process.chdir(cwd);
+        }
+    }
+
+    // If we successfully resolved, ensure that an absolute path is returned
+    // Note that when a custom `cwd` was used, we need to resolve to an absolute path based on it
+    if (resolved) {
+        resolved = path.resolve(hasCustomCwd ? parsed.options.cwd : '', resolved);
+    }
+
+    return resolved;
+}
+
+function resolveCommand(parsed) {
+    return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
+}
+
+module.exports = resolveCommand;
+
+
+/***/ }),
+/* 356 */
+/***/ (function(module, exports, __webpack_require__) {
+
+const isWindows = process.platform === 'win32' ||
+    process.env.OSTYPE === 'cygwin' ||
+    process.env.OSTYPE === 'msys'
+
+const path = __webpack_require__(16)
+const COLON = isWindows ? ';' : ':'
+const isexe = __webpack_require__(357)
+
+const getNotFoundError = (cmd) =>
+  Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' })
+
+const getPathInfo = (cmd, opt) => {
+  const colon = opt.colon || 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) : ['']
+
+  if (isWindows) {
+    if (cmd.indexOf('.') !== -1 && pathExt[0] !== '')
+      pathExt.unshift('')
+  }
+
+  return {
+    pathEnv,
+    pathExt,
+    pathExtExe,
+  }
+}
+
+const which = (cmd, opt, cb) => {
+  if (typeof opt === 'function') {
+    cb = opt
+    opt = {}
+  }
+  if (!opt)
+    opt = {}
+
+  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
+  const found = []
+
+  const step = i => new Promise((resolve, reject) => {
+    if (i === pathEnv.length)
+      return opt.all && found.length ? resolve(found)
+        : reject(getNotFoundError(cmd))
+
+    const ppRaw = pathEnv[i]
+    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+
+    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)
+}
+
+const whichSync = (cmd, opt) => {
+  opt = opt || {}
+
+  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
+  const found = []
+
+  for (let i = 0; i < pathEnv.length; i ++) {
+    const ppRaw = pathEnv[i]
+    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+
+    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 {
+        const is = isexe.sync(cur, { pathExt: pathExtExe })
+        if (is) {
+          if (opt.all)
+            found.push(cur)
+          else
+            return cur
+        }
+      } catch (ex) {}
+    }
+  }
+
+  if (opt.all && found.length)
+    return found
+
+  if (opt.nothrow)
+    return null
+
+  throw getNotFoundError(cmd)
+}
+
+module.exports = which
+which.sync = whichSync
+
+
+/***/ }),
+/* 357 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var fs = __webpack_require__(23)
+var core
+if (process.platform === 'win32' || global.TESTING_WINDOWS) {
+  core = __webpack_require__(358)
+} else {
+  core = __webpack_require__(359)
+}
+
+module.exports = isexe
+isexe.sync = sync
+
+function isexe (path, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
+
+  if (!cb) {
+    if (typeof Promise !== 'function') {
+      throw new TypeError('callback not provided')
+    }
+
+    return new Promise(function (resolve, reject) {
+      isexe(path, options || {}, function (er, is) {
+        if (er) {
+          reject(er)
+        } else {
+          resolve(is)
+        }
+      })
+    })
+  }
+
+  core(path, options || {}, function (er, is) {
+    // ignore EACCES because that just means we aren't allowed to run it
+    if (er) {
+      if (er.code === 'EACCES' || options && options.ignoreErrors) {
+        er = null
+        is = false
+      }
+    }
+    cb(er, is)
+  })
+}
+
+function sync (path, options) {
+  // my kingdom for a filtered catch
+  try {
+    return core.sync(path, options || {})
+  } catch (er) {
+    if (options && options.ignoreErrors || er.code === 'EACCES') {
+      return false
+    } else {
+      throw er
+    }
+  }
+}
+
+
+/***/ }),
+/* 358 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = isexe
+isexe.sync = sync
+
+var fs = __webpack_require__(23)
+
+function checkPathExt (path, options) {
+  var pathext = options.pathExt !== undefined ?
+    options.pathExt : process.env.PATHEXT
+
+  if (!pathext) {
+    return true
+  }
+
+  pathext = pathext.split(';')
+  if (pathext.indexOf('') !== -1) {
+    return true
+  }
+  for (var i = 0; i < pathext.length; i++) {
+    var p = pathext[i].toLowerCase()
+    if (p && path.substr(-p.length).toLowerCase() === p) {
+      return true
+    }
+  }
+  return false
+}
+
+function checkStat (stat, path, options) {
+  if (!stat.isSymbolicLink() && !stat.isFile()) {
+    return false
+  }
+  return checkPathExt(path, options)
+}
+
+function isexe (path, options, cb) {
+  fs.stat(path, function (er, stat) {
+    cb(er, er ? false : checkStat(stat, path, options))
+  })
+}
+
+function sync (path, options) {
+  return checkStat(fs.statSync(path), path, options)
+}
+
+
+/***/ }),
+/* 359 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = isexe
+isexe.sync = sync
+
+var fs = __webpack_require__(23)
+
+function isexe (path, options, cb) {
+  fs.stat(path, function (er, stat) {
+    cb(er, er ? false : checkStat(stat, options))
+  })
+}
+
+function sync (path, options) {
+  return checkStat(fs.statSync(path), options)
+}
+
+function checkStat (stat, options) {
+  return stat.isFile() && checkMode(stat, options)
+}
+
+function checkMode (stat, options) {
+  var mod = stat.mode
+  var uid = stat.uid
+  var gid = stat.gid
+
+  var myUid = options.uid !== undefined ?
+    options.uid : process.getuid && process.getuid()
+  var myGid = options.gid !== undefined ?
+    options.gid : process.getgid && process.getgid()
+
+  var u = parseInt('100', 8)
+  var g = parseInt('010', 8)
+  var o = parseInt('001', 8)
+  var ug = u | g
+
+  var ret = (mod & o) ||
+    (mod & g) && gid === myGid ||
+    (mod & u) && uid === myUid ||
+    (mod & ug) && myUid === 0
+
+  return ret
+}
+
+
+/***/ }),
+/* 360 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const pathKey = (options = {}) => {
+	const environment = options.env || process.env;
+	const platform = options.platform || process.platform;
+
+	if (platform !== 'win32') {
+		return '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;
+
+
+/***/ }),
+/* 361 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+// See http://www.robvanderwoude.com/escapechars.php
+const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
+
+function escapeCommand(arg) {
+    // Escape meta chars
+    arg = arg.replace(metaCharsRegExp, '^$1');
+
+    return arg;
+}
+
+function escapeArgument(arg, doubleEscapeMetaChars) {
+    // Convert to string
+    arg = `${arg}`;
+
+    // Algorithm below is based on https://qntm.org/cmd
+
+    // Sequence of backslashes followed by a double quote:
+    // double up all the backslashes and escape the double quote
+    arg = arg.replace(/(\\*)"/g, '$1$1\\"');
+
+    // Sequence of backslashes followed by the end of the string
+    // (which will become a double quote later):
+    // double up all the backslashes
+    arg = arg.replace(/(\\*)$/, '$1$1');
+
+    // All other backslashes occur literally
+
+    // Quote the whole thing:
+    arg = `"${arg}"`;
+
+    // Escape meta chars
+    arg = arg.replace(metaCharsRegExp, '^$1');
+
+    // Double escape meta chars if necessary
+    if (doubleEscapeMetaChars) {
+        arg = arg.replace(metaCharsRegExp, '^$1');
+    }
+
+    return arg;
+}
+
+module.exports.command = escapeCommand;
+module.exports.argument = escapeArgument;
+
+
+/***/ }),
+/* 362 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const fs = __webpack_require__(23);
+const shebangCommand = __webpack_require__(363);
+
+function readShebang(command) {
+    // Read the first 150 bytes from the file
+    const size = 150;
+    const buffer = Buffer.alloc(size);
+
+    let fd;
+
+    try {
+        fd = fs.openSync(command, 'r');
+        fs.readSync(fd, buffer, 0, size, 0);
+        fs.closeSync(fd);
+    } catch (e) { /* Empty */ }
+
+    // Attempt to extract shebang (null is returned if not a shebang)
+    return shebangCommand(buffer.toString());
+}
+
+module.exports = readShebang;
+
+
+/***/ }),
+/* 363 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const shebangRegex = __webpack_require__(364);
+
+module.exports = (string = '') => {
+	const match = string.match(shebangRegex);
+
+	if (!match) {
+		return null;
+	}
+
+	const [path, argument] = match[0].replace(/#! ?/, '').split(' ');
+	const binary = path.split('/').pop();
+
+	if (binary === 'env') {
+		return argument;
+	}
+
+	return argument ? `${binary} ${argument}` : binary;
+};
+
+
+/***/ }),
+/* 364 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = /^#!(.*)/;
+
+
+/***/ }),
+/* 365 */
+/***/ (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,
+};
+
+
+/***/ }),
+/* 366 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+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);
+	}
+
+	if (input[input.length - 1] === CR) {
+		input = input.slice(0, input.length - 1);
+	}
+
+	return input;
+};
+
+
+/***/ }),
+/* 367 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const path = __webpack_require__(16);
+const pathKey = __webpack_require__(360);
+
+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 = [];
+
+	while (previous !== cwdPath) {
+		result.push(path.join(cwdPath, 'node_modules/.bin'));
+		previous = cwdPath;
+		cwdPath = path.resolve(cwdPath, '..');
+	}
+
+	// Ensure the running `node` binary is used
+	const execPathDir = path.resolve(options.cwd, options.execPath, '..');
+	result.unshift(execPathDir);
+
+	return result.concat(options.path).join(path.delimiter);
+};
+
+module.exports = npmRunPath;
+// TODO: Remove this for the next major release
+module.exports.default = npmRunPath;
+
+module.exports.env = options => {
+	options = {
+		env: process.env,
+		...options
+	};
+
+	const env = {...options.env};
+	const path = pathKey({env});
+
+	options.path = env[path];
+	env[path] = module.exports(options);
+
+	return env;
+};
+
+
+/***/ }),
+/* 368 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const mimicFn = __webpack_require__(369);
+
+const calledFunctions = new WeakMap();
+
+const oneTime = (fn, options = {}) => {
+	if (typeof fn !== 'function') {
+		throw new TypeError('Expected a function');
+	}
+
+	let ret;
+	let isCalled = false;
+	let callCount = 0;
+	const functionName = fn.displayName || fn.name || '<anonymous>';
+
+	const onetime = function (...args) {
+		calledFunctions.set(onetime, ++callCount);
+
+		if (isCalled) {
+			if (options.throw === true) {
+				throw new Error(`Function \`${functionName}\` can only be called once`);
+			}
+
+			return ret;
+		}
+
+		isCalled = true;
+		ret = fn.apply(this, args);
+		fn = null;
+
+		return ret;
+	};
+
+	mimicFn(onetime, fn);
+	calledFunctions.set(onetime, callCount);
+
+	return onetime;
+};
+
+module.exports = oneTime;
+// TODO: Remove this for the next major release
+module.exports.default = oneTime;
+
+module.exports.callCount = fn => {
+	if (!calledFunctions.has(fn)) {
+		throw new Error(`The given function \`${fn.name}\` is not wrapped by the \`onetime\` package`);
+	}
+
+	return calledFunctions.get(fn);
+};
+
+
+/***/ }),
+/* 369 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const mimicFn = (to, from) => {
+	for (const prop of Reflect.ownKeys(from)) {
+		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
+	}
+
+	return to;
+};
+
+module.exports = mimicFn;
+// TODO: Remove this for the next major release
+module.exports.default = mimicFn;
+
+
+/***/ }),
+/* 370 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const {signalsByName} = __webpack_require__(371);
+
+const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => {
+	if (timedOut) {
+		return `timed out after ${timeout} milliseconds`;
+	}
+
+	if (isCanceled) {
+		return 'was canceled';
+	}
+
+	if (errorCode !== undefined) {
+		return `failed with ${errorCode}`;
+	}
+
+	if (signal !== undefined) {
+		return `was killed with ${signal} (${signalDescription})`;
+	}
+
+	if (exitCode !== undefined) {
+		return `failed with exit code ${exitCode}`;
+	}
+
+	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);
+	}
+
+	error.command = command;
+	error.exitCode = exitCode;
+	error.signal = signal;
+	error.signalDescription = signalDescription;
+	error.stdout = stdout;
+	error.stderr = stderr;
+
+	if (all !== undefined) {
+		error.all = all;
+	}
+
+	if ('bufferedData' in error) {
+		delete error.bufferedData;
+	}
+
+	error.failed = true;
+	error.timedOut = Boolean(timedOut);
+	error.isCanceled = isCanceled;
+	error.killed = killed && !timedOut;
+
+	return error;
+};
+
+module.exports = makeError;
+
+
+/***/ }),
+/* 371 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__(11);
+
+var _signals=__webpack_require__(372);
+var _realtime=__webpack_require__(374);
+
+
+
+const getSignalsByName=function(){
+const signals=(0,_signals.getSignals)();
+return signals.reduce(getSignalByName,{});
+};
+
+const getSignalByName=function(
+signalByNameMemo,
+{name,number,description,supported,action,forced,standard})
+{
+return{
+...signalByNameMemo,
+[name]:{name,number,description,supported,action,forced,standard}};
+
+};
+
+const signalsByName=getSignalsByName();exports.signalsByName=signalsByName;
+
+
+
+
+const getSignalsByNumber=function(){
+const signals=(0,_signals.getSignals)();
+const length=_realtime.SIGRTMAX+1;
+const signalsA=Array.from({length},(value,number)=>
+getSignalByNumber(number,signals));
+
+return Object.assign({},...signalsA);
+};
+
+const getSignalByNumber=function(number,signals){
+const signal=findSignalByNumber(number,signals);
+
+if(signal===undefined){
+return{};
+}
+
+const{name,description,supported,action,forced,standard}=signal;
+return{
+[number]:{
+name,
+number,
+description,
+supported,
+action,
+forced,
+standard}};
+
+
+};
+
+
+
+const findSignalByNumber=function(number,signals){
+const signal=signals.find(({name})=>_os.constants.signals[name]===number);
+
+if(signal!==undefined){
+return signal;
+}
+
+return signals.find(signalA=>signalA.number===number);
+};
+
+const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumber;
+//# sourceMappingURL=main.js.map
+
+/***/ }),
+/* 372 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__(11);
+
+var _core=__webpack_require__(373);
+var _realtime=__webpack_require__(374);
+
+
+
+const getSignals=function(){
+const realtimeSignals=(0,_realtime.getRealtimeSignals)();
+const signals=[..._core.SIGNALS,...realtimeSignals].map(normalizeSignal);
+return signals;
+};exports.getSignals=getSignals;
+
+
+
+
+
+
+
+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
+
+/***/ }),
+/* 373 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"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
+
+/***/ }),
+/* 374 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"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;
+
+const getRealtimeSignal=function(value,index){
+return{
+name:`SIGRT${index+1}`,
+number:SIGRTMIN+index,
+action:"terminate",
+description:"Application-specific signal (realtime)",
+standard:"posix"};
+
+};
+
+const SIGRTMIN=34;
+const SIGRTMAX=64;exports.SIGRTMAX=SIGRTMAX;
+//# sourceMappingURL=realtime.js.map
+
+/***/ }),
+/* 375 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const aliases = ['stdin', 'stdout', 'stderr'];
+
+const hasAlias = opts => aliases.some(alias => opts[alias] !== undefined);
+
+const normalizeStdio = opts => {
+	if (!opts) {
+		return;
+	}
+
+	const {stdio} = opts;
+
+	if (stdio === undefined) {
+		return aliases.map(alias => opts[alias]);
+	}
+
+	if (hasAlias(opts)) {
+		throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${aliases.map(alias => `\`${alias}\``).join(', ')}`);
+	}
+
+	if (typeof stdio === 'string') {
+		return stdio;
+	}
+
+	if (!Array.isArray(stdio)) {
+		throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``);
+	}
+
+	const length = Math.max(stdio.length, aliases.length);
+	return Array.from({length}, (value, index) => stdio[index]);
+};
+
+module.exports = normalizeStdio;
+
+// `ipc` is pushed unless it is already present
+module.exports.node = opts => {
+	const stdio = normalizeStdio(opts);
+
+	if (stdio === 'ipc') {
+		return 'ipc';
+	}
+
+	if (stdio === undefined || typeof stdio === 'string') {
+		return [stdio, stdio, stdio, 'ipc'];
+	}
+
+	if (stdio.includes('ipc')) {
+		return stdio;
+	}
+
+	return [...stdio, 'ipc'];
+};
+
+
+/***/ }),
+/* 376 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const os = __webpack_require__(11);
+const onExit = __webpack_require__(377);
+const pFinally = __webpack_require__(380);
+
+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;
+};
+
+const setKillTimeout = (kill, signal, options, killResult) => {
+	if (!shouldForceKill(signal, options, killResult)) {
+		return;
+	}
+
+	const timeout = getForceKillAfterTimeout(options);
+	setTimeout(() => {
+		kill('SIGKILL');
+	}, timeout).unref();
+};
+
+const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => {
+	return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
+};
+
+const isSigterm = signal => {
+	return signal === os.constants.signals.SIGTERM ||
+		(typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM');
+};
+
+const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => {
+	if (forceKillAfterTimeout === true) {
+		return DEFAULT_FORCE_KILL_TIMEOUT;
+	}
+
+	if (!Number.isInteger(forceKillAfterTimeout) || forceKillAfterTimeout < 0) {
+		throw new TypeError(`Expected the \`forceKillAfterTimeout\` option to be a non-negative integer, got \`${forceKillAfterTimeout}\` (${typeof forceKillAfterTimeout})`);
+	}
+
+	return forceKillAfterTimeout;
+};
+
+// `childProcess.cancel()`
+const spawnedCancel = (spawned, context) => {
+	const killResult = spawned.kill();
+
+	if (killResult) {
+		context.isCanceled = true;
+	}
+};
+
+const timeoutKill = (spawned, signal, reject) => {
+	spawned.kill(signal);
+	reject(Object.assign(new Error('Timed out'), {timedOut: true, signal}));
+};
+
+// `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]);
+};
+
+// `cleanup` option handling
+const setExitHandler = (spawned, {cleanup, detached}, timedPromise) => {
+	if (!cleanup || detached) {
+		return timedPromise;
+	}
+
+	const removeExitHandler = onExit(() => {
+		spawned.kill();
+	});
+
+	// TODO: Use native "finally" syntax when targeting Node.js 10
+	return pFinally(timedPromise, removeExitHandler);
+};
+
+module.exports = {
+	spawnedKill,
+	spawnedCancel,
+	setupTimeout,
+	setExitHandler
+};
+
+
+/***/ }),
+/* 377 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Note: since nyc uses this module to output coverage, any lines
+// that are in the direct sync flow of nyc's outputCoverage are
+// ignored, since we can never get coverage for them.
+var assert = __webpack_require__(30)
+var signals = __webpack_require__(378)
+
+var EE = __webpack_require__(379)
+/* istanbul ignore if */
+if (typeof EE !== 'function') {
+  EE = EE.EventEmitter
+}
+
+var emitter
+if (process.__signal_exit_emitter__) {
+  emitter = process.__signal_exit_emitter__
+} else {
+  emitter = process.__signal_exit_emitter__ = new EE()
+  emitter.count = 0
+  emitter.emitted = {}
+}
+
+// Because this emitter is a global, we have to check to see if a
+// previous version of this library failed to enable infinite listeners.
+// I know what you're about to say.  But literally everything about
+// signal-exit is a compromise with evil.  Get used to it.
+if (!emitter.infinite) {
+  emitter.setMaxListeners(Infinity)
+  emitter.infinite = true
+}
+
+module.exports = function (cb, opts) {
+  assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
+
+  if (loaded === false) {
+    load()
+  }
+
+  var ev = 'exit'
+  if (opts && opts.alwaysLast) {
+    ev = 'afterexit'
+  }
+
+  var remove = function () {
+    emitter.removeListener(ev, cb)
+    if (emitter.listeners('exit').length === 0 &&
+        emitter.listeners('afterexit').length === 0) {
+      unload()
+    }
+  }
+  emitter.on(ev, cb)
+
+  return remove
+}
+
+module.exports.unload = unload
+function unload () {
+  if (!loaded) {
+    return
+  }
+  loaded = false
+
+  signals.forEach(function (sig) {
+    try {
+      process.removeListener(sig, sigListeners[sig])
+    } catch (er) {}
+  })
+  process.emit = originalProcessEmit
+  process.reallyExit = originalProcessReallyExit
+  emitter.count -= 1
+}
+
+function emit (event, code, signal) {
+  if (emitter.emitted[event]) {
+    return
+  }
+  emitter.emitted[event] = true
+  emitter.emit(event, code, signal)
+}
+
+// { <signal>: <listener fn>, ... }
+var sigListeners = {}
+signals.forEach(function (sig) {
+  sigListeners[sig] = function listener () {
+    // If there are no other listeners, an exit is coming!
+    // Simplest way: remove us and then re-send the signal.
+    // We know that this will kill the process, so we can
+    // safely emit now.
+    var listeners = process.listeners(sig)
+    if (listeners.length === emitter.count) {
+      unload()
+      emit('exit', null, sig)
+      /* istanbul ignore next */
+      emit('afterexit', null, sig)
+      /* istanbul ignore next */
+      process.kill(process.pid, sig)
+    }
+  }
+})
+
+module.exports.signals = function () {
+  return signals
+}
+
+module.exports.load = load
+
+var loaded = false
+
+function load () {
+  if (loaded) {
+    return
+  }
+  loaded = true
+
+  // This is the number of onSignalExit's that are in play.
+  // It's important so that we can count the correct number of
+  // listeners on signals, and don't wait for the other one to
+  // handle it instead of us.
+  emitter.count += 1
+
+  signals = signals.filter(function (sig) {
+    try {
+      process.on(sig, sigListeners[sig])
+      return true
+    } catch (er) {
+      return false
+    }
+  })
+
+  process.emit = processEmit
+  process.reallyExit = processReallyExit
+}
+
+var originalProcessReallyExit = process.reallyExit
+function processReallyExit (code) {
+  process.exitCode = code || 0
+  emit('exit', process.exitCode, null)
+  /* istanbul ignore next */
+  emit('afterexit', process.exitCode, null)
+  /* istanbul ignore next */
+  originalProcessReallyExit.call(process, process.exitCode)
+}
+
+var originalProcessEmit = process.emit
+function processEmit (ev, arg) {
+  if (ev === 'exit') {
+    if (arg !== undefined) {
+      process.exitCode = arg
+    }
+    var ret = originalProcessEmit.apply(this, arguments)
+    emit('exit', process.exitCode, null)
+    /* istanbul ignore next */
+    emit('afterexit', process.exitCode, null)
+    return ret
+  } else {
+    return originalProcessEmit.apply(this, arguments)
+  }
+}
+
+
+/***/ }),
+/* 378 */
+/***/ (function(module, exports) {
+
+// This is not the set of all possible signals.
+//
+// It IS, however, the set of all signals that trigger
+// an exit on either Linux or BSD systems.  Linux is a
+// superset of the signal names supported on BSD, and
+// the unknown signals just fail to register, so we can
+// catch that easily enough.
+//
+// Don't bother with SIGKILL.  It's uncatchable, which
+// means that we can't fire any callbacks anyway.
+//
+// If a user does happen to register a handler on a non-
+// fatal signal like SIGWINCH or something, and then
+// exit, it'll end up firing `process.emit('exit')`, so
+// the handler will be fired anyway.
+//
+// SIGBUS, SIGFPE, SIGSEGV and SIGILL, when not raised
+// artificially, inherently leave the process in a
+// state from which it is not safe to try and enter JS
+// listeners.
+module.exports = [
+  'SIGABRT',
+  'SIGALRM',
+  'SIGHUP',
+  'SIGINT',
+  'SIGTERM'
+]
+
+if (process.platform !== 'win32') {
+  module.exports.push(
+    'SIGVTALRM',
+    'SIGXCPU',
+    'SIGXFSZ',
+    'SIGUSR2',
+    'SIGTRAP',
+    'SIGSYS',
+    'SIGQUIT',
+    'SIGIOT'
+    // should detect profiler and enable/disable accordingly.
+    // see #21
+    // 'SIGPROF'
+  )
+}
+
+if (process.platform === 'linux') {
+  module.exports.push(
+    'SIGIO',
+    'SIGPOLL',
+    'SIGPWR',
+    'SIGSTKFLT',
+    'SIGUNUSED'
+  )
+}
+
+
+/***/ }),
+/* 379 */
+/***/ (function(module, exports) {
+
+module.exports = require("events");
+
+/***/ }),
+/* 380 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = async (
+	promise,
+	onFinally = (() => {})
+) => {
+	let value;
+	try {
+		value = await promise;
+	} catch (error) {
+		await onFinally();
+		throw error;
+	}
+
+	await onFinally();
+	return value;
+};
+
+
+/***/ }),
+/* 381 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const isStream = __webpack_require__(382);
+const getStream = __webpack_require__(383);
+const mergeStream = __webpack_require__(389);
+
+// `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 (isStream(input)) {
+		input.pipe(spawned.stdin);
+	} else {
+		spawned.stdin.end(input);
+	}
+};
+
+// `all` interleaves `stdout` and `stderr`
+const makeAllStream = (spawned, {all}) => {
+	if (!all || (!spawned.stdout && !spawned.stderr)) {
+		return;
+	}
+
+	const mixed = mergeStream();
+
+	if (spawned.stdout) {
+		mixed.add(spawned.stdout);
+	}
+
+	if (spawned.stderr) {
+		mixed.add(spawned.stderr);
+	}
+
+	return mixed;
+};
+
+// On failure, `result.stdout|stderr|all` should contain the currently buffered stream
+const getBufferedData = async (stream, streamPromise) => {
+	if (!stream) {
+		return;
+	}
+
+	stream.destroy();
+
+	try {
+		return await streamPromise;
+	} catch (error) {
+		return error.bufferedData;
+	}
+};
+
+const getStreamPromise = (stream, {encoding, buffer, maxBuffer}) => {
+	if (!stream || !buffer) {
+		return;
+	}
+
+	if (encoding) {
+		return getStream(stream, {encoding, maxBuffer});
+	}
+
+	return getStream.buffer(stream, {maxBuffer});
+};
+
+// 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)
+		]);
+	}
+};
+
+const validateInputSync = ({input}) => {
+	if (isStream(input)) {
+		throw new TypeError('The `input` option cannot be a stream in sync mode');
+	}
+};
+
+module.exports = {
+	handleInput,
+	makeAllStream,
+	getSpawnedResult,
+	validateInputSync
+};
+
+
+
+/***/ }),
+/* 382 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const isStream = stream =>
+	stream !== null &&
+	typeof stream === 'object' &&
+	typeof stream.pipe === 'function';
+
+isStream.writable = stream =>
+	isStream(stream) &&
+	stream.writable !== false &&
+	typeof stream._write === 'function' &&
+	typeof stream._writableState === 'object';
+
+isStream.readable = stream =>
+	isStream(stream) &&
+	stream.readable !== false &&
+	typeof stream._read === 'function' &&
+	typeof stream._readableState === 'object';
+
+isStream.duplex = stream =>
+	isStream.writable(stream) &&
+	isStream.readable(stream);
+
+isStream.transform = stream =>
+	isStream.duplex(stream) &&
+	typeof stream._transform === 'function' &&
+	typeof stream._transformState === 'object';
+
+module.exports = isStream;
+
+
+/***/ }),
+/* 383 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const pump = __webpack_require__(384);
+const bufferStream = __webpack_require__(388);
+
+class MaxBufferError extends Error {
+	constructor() {
+		super('maxBuffer exceeded');
+		this.name = 'MaxBufferError';
+	}
+}
+
+async function getStream(inputStream, options) {
+	if (!inputStream) {
+		return Promise.reject(new Error('Expected a stream'));
+	}
+
+	options = {
+		maxBuffer: Infinity,
+		...options
+	};
+
+	const {maxBuffer} = options;
+
+	let stream;
+	await new Promise((resolve, reject) => {
+		const rejectPromise = error => {
+			if (error) { // A null check
+				error.bufferedData = stream.getBufferedValue();
+			}
+
+			reject(error);
+		};
+
+		stream = pump(inputStream, bufferStream(options), error => {
+			if (error) {
+				rejectPromise(error);
+				return;
+			}
+
+			resolve();
+		});
+
+		stream.on('data', () => {
+			if (stream.getBufferedLength() > maxBuffer) {
+				rejectPromise(new MaxBufferError());
+			}
+		});
+	});
+
+	return stream.getBufferedValue();
+}
+
+module.exports = getStream;
+// 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;
+
+
+/***/ }),
+/* 384 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var once = __webpack_require__(385)
+var eos = __webpack_require__(387)
+var fs = __webpack_require__(23) // we only need fs to get the ReadStream and WriteStream prototypes
+
+var noop = function () {}
+var ancient = /^v?\.0/.test(process.version)
+
+var isFn = function (fn) {
+  return typeof fn === 'function'
+}
+
+var isFS = function (stream) {
+  if (!ancient) return false // newer node version do not need to care about fs is a special way
+  if (!fs) return false // browser
+  return (stream instanceof (fs.ReadStream || noop) || stream instanceof (fs.WriteStream || noop)) && isFn(stream.close)
+}
+
+var isRequest = function (stream) {
+  return stream.setHeader && isFn(stream.abort)
+}
+
+var destroyer = function (stream, reading, writing, callback) {
+  callback = once(callback)
+
+  var closed = false
+  stream.on('close', function () {
+    closed = true
+  })
+
+  eos(stream, {readable: reading, writable: writing}, function (err) {
+    if (err) return callback(err)
+    closed = true
+    callback()
+  })
+
+  var destroyed = false
+  return function (err) {
+    if (closed) return
+    if (destroyed) return
+    destroyed = true
+
+    if (isFS(stream)) return stream.close(noop) // use close for fs streams to avoid fd leaks
+    if (isRequest(stream)) return stream.abort() // request.destroy just do .end - .abort is what we want
+
+    if (isFn(stream.destroy)) return stream.destroy()
+
+    callback(err || new Error('stream was destroyed'))
+  }
+}
+
+var call = function (fn) {
+  fn()
+}
+
+var pipe = function (from, to) {
+  return from.pipe(to)
+}
+
+var pump = function () {
+  var streams = Array.prototype.slice.call(arguments)
+  var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop
+
+  if (Array.isArray(streams[0])) streams = streams[0]
+  if (streams.length < 2) throw new Error('pump requires two streams per minimum')
+
+  var error
+  var destroys = streams.map(function (stream, i) {
+    var reading = i < streams.length - 1
+    var writing = i > 0
+    return destroyer(stream, reading, writing, function (err) {
+      if (!error) error = err
+      if (err) destroys.forEach(call)
+      if (reading) return
+      destroys.forEach(call)
+      callback(error)
+    })
+  })
+
+  return streams.reduce(pipe)
+}
+
+module.exports = pump
+
+
+/***/ }),
+/* 385 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var wrappy = __webpack_require__(386)
+module.exports = wrappy(once)
+module.exports.strict = wrappy(onceStrict)
+
+once.proto = once(function () {
+  Object.defineProperty(Function.prototype, 'once', {
+    value: function () {
+      return once(this)
+    },
+    configurable: true
+  })
+
+  Object.defineProperty(Function.prototype, 'onceStrict', {
+    value: function () {
+      return onceStrict(this)
+    },
+    configurable: true
+  })
+})
+
+function once (fn) {
+  var f = function () {
+    if (f.called) return f.value
+    f.called = true
+    return f.value = fn.apply(this, arguments)
+  }
+  f.called = false
+  return f
+}
+
+function onceStrict (fn) {
+  var f = function () {
+    if (f.called)
+      throw new Error(f.onceError)
+    f.called = true
+    return f.value = fn.apply(this, arguments)
+  }
+  var name = fn.name || 'Function wrapped with `once`'
+  f.onceError = name + " shouldn't be called more than once"
+  f.called = false
+  return f
+}
+
+
+/***/ }),
+/* 386 */
+/***/ (function(module, exports) {
+
+// Returns a wrapper function that returns a wrapped callback
+// The wrapper function should do some stuff, and return a
+// presumably different callback function.
+// This makes sure that own properties are retained, so that
+// decorations and such are not lost along the way.
+module.exports = wrappy
+function wrappy (fn, cb) {
+  if (fn && cb) return wrappy(fn)(cb)
+
+  if (typeof fn !== 'function')
+    throw new TypeError('need wrapper function')
+
+  Object.keys(fn).forEach(function (k) {
+    wrapper[k] = fn[k]
+  })
+
+  return wrapper
+
+  function wrapper() {
+    var args = new Array(arguments.length)
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i]
+    }
+    var ret = fn.apply(this, args)
+    var cb = args[args.length-1]
+    if (typeof ret === 'function' && ret !== cb) {
+      Object.keys(cb).forEach(function (k) {
+        ret[k] = cb[k]
+      })
+    }
+    return ret
+  }
+}
+
+
+/***/ }),
+/* 387 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var once = __webpack_require__(385);
+
+var noop = function() {};
+
+var isRequest = function(stream) {
+	return stream.setHeader && typeof stream.abort === 'function';
+};
+
+var isChildProcess = function(stream) {
+	return stream.stdio && Array.isArray(stream.stdio) && stream.stdio.length === 3
+};
+
+var eos = function(stream, opts, callback) {
+	if (typeof opts === 'function') return eos(stream, null, opts);
+	if (!opts) opts = {};
+
+	callback = once(callback || noop);
+
+	var ws = stream._writableState;
+	var rs = stream._readableState;
+	var readable = opts.readable || (opts.readable !== false && stream.readable);
+	var writable = opts.writable || (opts.writable !== false && stream.writable);
+
+	var onlegacyfinish = function() {
+		if (!stream.writable) onfinish();
+	};
+
+	var onfinish = function() {
+		writable = false;
+		if (!readable) callback.call(stream);
+	};
+
+	var onend = function() {
+		readable = false;
+		if (!writable) callback.call(stream);
+	};
+
+	var onexit = function(exitCode) {
+		callback.call(stream, exitCode ? new Error('exited with error code: ' + exitCode) : null);
+	};
+
+	var onerror = function(err) {
+		callback.call(stream, err);
+	};
+
+	var onclose = function() {
+		if (readable && !(rs && rs.ended)) return callback.call(stream, new Error('premature close'));
+		if (writable && !(ws && ws.ended)) return callback.call(stream, new Error('premature close'));
+	};
+
+	var onrequest = function() {
+		stream.req.on('finish', onfinish);
+	};
+
+	if (isRequest(stream)) {
+		stream.on('complete', onfinish);
+		stream.on('abort', onclose);
+		if (stream.req) onrequest();
+		else stream.on('request', onrequest);
+	} else if (writable && !ws) { // legacy streams
+		stream.on('end', onlegacyfinish);
+		stream.on('close', onlegacyfinish);
+	}
+
+	if (isChildProcess(stream)) stream.on('exit', onexit);
+
+	stream.on('end', onend);
+	stream.on('finish', onfinish);
+	if (opts.error !== false) stream.on('error', onerror);
+	stream.on('close', onclose);
+
+	return function() {
+		stream.removeListener('complete', onfinish);
+		stream.removeListener('abort', onclose);
+		stream.removeListener('request', onrequest);
+		if (stream.req) stream.req.removeListener('finish', onfinish);
+		stream.removeListener('end', onlegacyfinish);
+		stream.removeListener('close', onlegacyfinish);
+		stream.removeListener('finish', onfinish);
+		stream.removeListener('exit', onexit);
+		stream.removeListener('end', onend);
+		stream.removeListener('error', onerror);
+		stream.removeListener('close', onclose);
+	};
+};
+
+module.exports = eos;
+
+
+/***/ }),
+/* 388 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const {PassThrough: PassThroughStream} = __webpack_require__(27);
+
+module.exports = options => {
+	options = {...options};
+
+	const {array} = options;
+	let {encoding} = options;
+	const isBuffer = encoding === 'buffer';
+	let objectMode = false;
+
+	if (array) {
+		objectMode = !(encoding || isBuffer);
+	} else {
+		encoding = encoding || 'utf8';
+	}
+
+	if (isBuffer) {
+		encoding = null;
+	}
+
+	const stream = new PassThroughStream({objectMode});
+
+	if (encoding) {
+		stream.setEncoding(encoding);
+	}
+
+	let length = 0;
+	const chunks = [];
+
+	stream.on('data', chunk => {
+		chunks.push(chunk);
+
+		if (objectMode) {
+			length = chunks.length;
+		} else {
+			length += chunk.length;
+		}
+	});
+
+	stream.getBufferedValue = () => {
+		if (array) {
+			return chunks;
+		}
+
+		return isBuffer ? Buffer.concat(chunks, length) : chunks.join('');
+	};
+
+	stream.getBufferedLength = () => length;
+
+	return stream;
+};
+
+
+/***/ }),
+/* 389 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const { PassThrough } = __webpack_require__(27);
+
+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() }
+  }
+}
+
+
+/***/ }),
+/* 390 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+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
+	});
+};
+
+// The return value is a mixin of `childProcess` and `Promise`
+const mergePromise = (spawned, promise) => {
+	mergePromiseProperty(spawned, promise, 'then');
+	mergePromiseProperty(spawned, promise, 'catch');
+
+	// TODO: Remove the `if`-guard when targeting Node.js 10
+	if (Promise.prototype.finally) {
+		mergePromiseProperty(spawned, promise, 'finally');
+	}
+
+	return spawned;
+};
+
+// Use promises instead of `child_process` events
+const getSpawnedPromise = spawned => {
+	return new Promise((resolve, reject) => {
+		spawned.on('exit', (exitCode, signal) => {
+			resolve({exitCode, signal});
+		});
+
+		spawned.on('error', error => {
+			reject(error);
+		});
+
+		if (spawned.stdin) {
+			spawned.stdin.on('error', error => {
+				reject(error);
+			});
+		}
+	});
+};
+
+module.exports = {
+	mergePromise,
+	getSpawnedPromise
+};
+
+
+
+/***/ }),
+/* 391 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const SPACES_REGEXP = / +/g;
+
+const joinCommand = (file, args = []) => {
+	if (!Array.isArray(args)) {
+		return file;
+	}
+
+	return [file, ...args].join(' ');
+};
+
+// 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 previousToken = tokens[tokens.length - 1];
+
+	if (previousToken.endsWith('\\')) {
+		return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`];
+	}
+
+	return [...tokens, token];
+};
+
+// Handle `execa.command()`
+const parseCommand = command => {
+	return command
+		.trim()
+		.split(SPACES_REGEXP)
+		.reduce(handleEscaping, []);
+};
+
+module.exports = {
+	joinCommand,
+	parseCommand
+};
+
+
+/***/ }),
+/* 392 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _internal_Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193);
+/* 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__(283);
+/* 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__(264);
+/* 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__(190);
+/* 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__(265);
+/* 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__(293);
+/* 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__(297);
+/* 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__(295);
+/* 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__(320);
+/* 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__(199);
+/* 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__(298);
+/* 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__(393);
+/* 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__(396);
+/* 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__(203);
+/* 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__(177);
+/* 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__(172);
+/* 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__(241);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["Notification"]; });
+
+/* 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__(196);
+/* 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__(197);
+/* 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__(232);
+/* 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__(397);
+/* 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 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__(253);
+/* 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__(266);
+/* 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__(180);
+/* 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__(335);
+/* 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__(398);
+/* 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__(399);
+/* 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__(214);
+/* 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__(226);
+/* 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__(333);
+/* 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__(242);
+/* 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__(400);
+/* 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__(218);
+/* 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__(401);
+/* 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__(402);
+/* 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__(403);
+/* 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__(404);
+/* 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__(405);
+/* 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__(278);
+/* 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__(406);
+/* 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__(227);
+/* 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__(407);
+/* 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__(408);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__["pairs"]; });
+
+/* harmony import */ var _internal_observable_partition__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(409);
+/* 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__(302);
+/* 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__(410);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "range", function() { return _internal_observable_range__WEBPACK_IMPORTED_MODULE_46__["range"]; });
+
+/* harmony import */ var _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(243);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__["throwError"]; });
+
+/* harmony import */ var _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(204);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__["timer"]; });
+
+/* harmony import */ var _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(411);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "using", function() { return _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__["using"]; });
+
+/* harmony import */ var _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(346);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__["zip"]; });
+
+/* harmony import */ var _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(219);
+/* 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_52__ = __webpack_require__(175);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "config", function() { return _internal_config__WEBPACK_IMPORTED_MODULE_52__["config"]; });
+
+/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+/* 393 */
+/***/ (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__(394);
+/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(395);
+/** PURE_IMPORTS_START _AnimationFrameAction,_AnimationFrameScheduler PURE_IMPORTS_END */
+
+
+var animationFrame = /*@__PURE__*/ new _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__["AnimationFrameScheduler"](_AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__["AnimationFrameAction"]);
+//# sourceMappingURL=animationFrame.js.map
+
+
+/***/ }),
+/* 394 */
+/***/ (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__(36);
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(200);
+/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
+
+
+var AnimationFrameAction = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnimationFrameAction, _super);
+    function AnimationFrameAction(scheduler, work) {
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        return _this;
+    }
+    AnimationFrameAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (delay !== null && delay > 0) {
+            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
+        }
+        scheduler.actions.push(this);
+        return scheduler.scheduled || (scheduler.scheduled = requestAnimationFrame(function () { return scheduler.flush(null); }));
+    };
+    AnimationFrameAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
+            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
+        }
+        if (scheduler.actions.length === 0) {
+            cancelAnimationFrame(id);
+            scheduler.scheduled = undefined;
+        }
+        return undefined;
+    };
+    return AnimationFrameAction;
+}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
+
+//# sourceMappingURL=AnimationFrameAction.js.map
+
+
+/***/ }),
+/* 395 */
+/***/ (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__(36);
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(202);
+/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
+
+
+var AnimationFrameScheduler = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnimationFrameScheduler, _super);
+    function AnimationFrameScheduler() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    AnimationFrameScheduler.prototype.flush = function (action) {
+        this.active = true;
+        this.scheduled = undefined;
+        var actions = this.actions;
+        var error;
+        var index = -1;
+        var count = actions.length;
+        action = action || actions.shift();
+        do {
+            if (error = action.execute(action.state, action.delay)) {
+                break;
+            }
+        } while (++index < count && (action = actions.shift()));
+        this.active = false;
+        if (error) {
+            while (++index < count && (action = actions.shift())) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    return AnimationFrameScheduler;
+}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"]));
+
+//# sourceMappingURL=AnimationFrameScheduler.js.map
+
+
+/***/ }),
+/* 396 */
+/***/ (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__(36);
+/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(200);
+/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(202);
+/** PURE_IMPORTS_START tslib,_AsyncAction,_AsyncScheduler PURE_IMPORTS_END */
+
+
+
+var VirtualTimeScheduler = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](VirtualTimeScheduler, _super);
+    function VirtualTimeScheduler(SchedulerAction, maxFrames) {
+        if (SchedulerAction === void 0) {
+            SchedulerAction = VirtualAction;
+        }
+        if (maxFrames === void 0) {
+            maxFrames = Number.POSITIVE_INFINITY;
+        }
+        var _this = _super.call(this, SchedulerAction, function () { return _this.frame; }) || this;
+        _this.maxFrames = maxFrames;
+        _this.frame = 0;
+        _this.index = -1;
+        return _this;
+    }
+    VirtualTimeScheduler.prototype.flush = function () {
+        var _a = this, actions = _a.actions, maxFrames = _a.maxFrames;
+        var error, action;
+        while ((action = actions[0]) && action.delay <= maxFrames) {
+            actions.shift();
+            this.frame = action.delay;
+            if (error = action.execute(action.state, action.delay)) {
+                break;
+            }
+        }
+        if (error) {
+            while (action = actions.shift()) {
+                action.unsubscribe();
+            }
+            throw error;
+        }
+    };
+    VirtualTimeScheduler.frameTimeFactor = 10;
+    return VirtualTimeScheduler;
+}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__["AsyncScheduler"]));
+
+var VirtualAction = /*@__PURE__*/ (function (_super) {
+    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](VirtualAction, _super);
+    function VirtualAction(scheduler, work, index) {
+        if (index === void 0) {
+            index = scheduler.index += 1;
+        }
+        var _this = _super.call(this, scheduler, work) || this;
+        _this.scheduler = scheduler;
+        _this.work = work;
+        _this.index = index;
+        _this.active = true;
+        _this.index = scheduler.index = index;
+        return _this;
+    }
+    VirtualAction.prototype.schedule = function (state, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        if (!this.id) {
+            return _super.prototype.schedule.call(this, state, delay);
+        }
+        this.active = false;
+        var action = new VirtualAction(this.scheduler, this.work);
+        this.add(action);
+        return action.schedule(state, delay);
+    };
+    VirtualAction.prototype.requestAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        this.delay = scheduler.frame + delay;
+        var actions = scheduler.actions;
+        actions.push(this);
+        actions.sort(VirtualAction.sortActions);
+        return true;
+    };
+    VirtualAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
+        if (delay === void 0) {
+            delay = 0;
+        }
+        return undefined;
+    };
+    VirtualAction.prototype._execute = function (state, delay) {
+        if (this.active === true) {
+            return _super.prototype._execute.call(this, state, delay);
+        }
+    };
+    VirtualAction.sortActions = function (a, b) {
+        if (a.delay === b.delay) {
+            if (a.index === b.index) {
+                return 0;
+            }
+            else if (a.index > b.index) {
+                return 1;
+            }
+            else {
+                return -1;
+            }
+        }
+        else if (a.delay > b.delay) {
+            return 1;
+        }
+        else {
+            return -1;
+        }
+    };
+    return VirtualAction;
+}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
+
+//# sourceMappingURL=VirtualTimeScheduler.js.map
+
+
+/***/ }),
+/* 397 */
+/***/ (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__(193);
+/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+
+function isObservable(obj) {
+    return !!obj && (obj instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"] || (typeof obj.lift === 'function' && typeof obj.subscribe === 'function'));
+}
+//# sourceMappingURL=isObservable.js.map
+
+
+/***/ }),
+/* 398 */
+/***/ (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__(193);
+/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295);
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231);
+/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(194);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(178);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(206);
+/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isArray,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+
+
+
+function bindCallback(callbackFunc, resultSelector, scheduler) {
+    if (resultSelector) {
+        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(resultSelector)) {
+            scheduler = resultSelector;
+        }
+        else {
+            return function () {
+                var args = [];
+                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_4__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
+            };
+        }
+    }
+    return function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var context = this;
+        var subject;
+        var params = {
+            context: context,
+            subject: subject,
+            callbackFunc: callbackFunc,
+            scheduler: scheduler,
+        };
+        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+            if (!scheduler) {
+                if (!subject) {
+                    subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
+                    var handler = function () {
+                        var innerArgs = [];
+                        for (var _i = 0; _i < arguments.length; _i++) {
+                            innerArgs[_i] = arguments[_i];
+                        }
+                        subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
+                        subject.complete();
+                    };
+                    try {
+                        callbackFunc.apply(context, args.concat([handler]));
+                    }
+                    catch (err) {
+                        if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) {
+                            subject.error(err);
+                        }
+                        else {
+                            console.warn(err);
+                        }
+                    }
+                }
+                return subject.subscribe(subscriber);
+            }
+            else {
+                var state = {
+                    args: args, subscriber: subscriber, params: params,
+                };
+                return scheduler.schedule(dispatch, 0, state);
+            }
+        });
+    };
+}
+function dispatch(state) {
+    var _this = this;
+    var self = this;
+    var args = state.args, subscriber = state.subscriber, params = state.params;
+    var callbackFunc = params.callbackFunc, context = params.context, scheduler = params.scheduler;
+    var subject = params.subject;
+    if (!subject) {
+        subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
+        var handler = function () {
+            var innerArgs = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                innerArgs[_i] = arguments[_i];
+            }
+            var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
+            _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject }));
+        };
+        try {
+            callbackFunc.apply(context, args.concat([handler]));
+        }
+        catch (err) {
+            subject.error(err);
+        }
+    }
+    this.add(subject.subscribe(subscriber));
+}
+function dispatchNext(state) {
+    var value = state.value, subject = state.subject;
+    subject.next(value);
+    subject.complete();
+}
+function dispatchError(state) {
+    var err = state.err, subject = state.subject;
+    subject.error(err);
+}
+//# sourceMappingURL=bindCallback.js.map
+
+
+/***/ }),
+/* 399 */
+/***/ (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__(193);
+/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295);
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231);
+/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(194);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(206);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(178);
+/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isScheduler,_util_isArray PURE_IMPORTS_END */
+
+
+
+
+
+
+function bindNodeCallback(callbackFunc, resultSelector, scheduler) {
+    if (resultSelector) {
+        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(resultSelector)) {
+            scheduler = resultSelector;
+        }
+        else {
+            return function () {
+                var args = [];
+                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_5__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
+            };
+        }
+    }
+    return function () {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        var params = {
+            subject: undefined,
+            args: args,
+            callbackFunc: callbackFunc,
+            scheduler: scheduler,
+            context: this,
+        };
+        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+            var context = params.context;
+            var subject = params.subject;
+            if (!scheduler) {
+                if (!subject) {
+                    subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
+                    var handler = function () {
+                        var innerArgs = [];
+                        for (var _i = 0; _i < arguments.length; _i++) {
+                            innerArgs[_i] = arguments[_i];
+                        }
+                        var err = innerArgs.shift();
+                        if (err) {
+                            subject.error(err);
+                            return;
+                        }
+                        subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
+                        subject.complete();
+                    };
+                    try {
+                        callbackFunc.apply(context, args.concat([handler]));
+                    }
+                    catch (err) {
+                        if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) {
+                            subject.error(err);
+                        }
+                        else {
+                            console.warn(err);
+                        }
+                    }
+                }
+                return subject.subscribe(subscriber);
+            }
+            else {
+                return scheduler.schedule(dispatch, 0, { params: params, subscriber: subscriber, context: context });
+            }
+        });
+    };
+}
+function dispatch(state) {
+    var _this = this;
+    var params = state.params, subscriber = state.subscriber, context = state.context;
+    var callbackFunc = params.callbackFunc, args = params.args, scheduler = params.scheduler;
+    var subject = params.subject;
+    if (!subject) {
+        subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
+        var handler = function () {
+            var innerArgs = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                innerArgs[_i] = arguments[_i];
+            }
+            var err = innerArgs.shift();
+            if (err) {
+                _this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject }));
+            }
+            else {
+                var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
+                _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject }));
+            }
+        };
+        try {
+            callbackFunc.apply(context, args.concat([handler]));
+        }
+        catch (err) {
+            this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject }));
+        }
+    }
+    this.add(subject.subscribe(subscriber));
+}
+function dispatchNext(arg) {
+    var value = arg.value, subject = arg.subject;
+    subject.next(value);
+    subject.complete();
+}
+function dispatchError(arg) {
+    var err = arg.err, subject = arg.subject;
+    subject.error(err);
+}
+//# sourceMappingURL=bindNodeCallback.js.map
+
+
+/***/ }),
+/* 400 */
+/***/ (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 _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178);
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231);
+/* harmony import */ var _util_isObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(179);
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(218);
+/** PURE_IMPORTS_START _Observable,_util_isArray,_operators_map,_util_isObject,_from PURE_IMPORTS_END */
+
+
+
+
+
+function forkJoin() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
+    }
+    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 (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 forkJoinInternal(sources, null);
+}
+function forkJoinInternal(sources, keys) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        var len = sources.length;
+        if (len === 0) {
+            subscriber.complete();
+            return;
+        }
+        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);
+        }
+    });
+}
+//# sourceMappingURL=forkJoin.js.map
+
+
+/***/ }),
+/* 401 */
+/***/ (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__(193);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178);
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(173);
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231);
+/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
+
+
+
+
+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;
+        options = undefined;
+    }
+    if (resultSelector) {
+        return fromEvent(target, eventName, options).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        function handler(e) {
+            if (arguments.length > 1) {
+                subscriber.next(Array.prototype.slice.call(arguments));
+            }
+            else {
+                subscriber.next(e);
+            }
+        }
+        setupSubscription(target, eventName, handler, subscriber, options);
+    });
+}
+function setupSubscription(sourceObj, eventName, handler, subscriber, options) {
+    var unsubscribe;
+    if (isEventTarget(sourceObj)) {
+        var source_1 = sourceObj;
+        sourceObj.addEventListener(eventName, handler, options);
+        unsubscribe = function () { return source_1.removeEventListener(eventName, handler, options); };
+    }
+    else if (isJQueryStyleEventEmitter(sourceObj)) {
+        var source_2 = sourceObj;
+        sourceObj.on(eventName, handler);
+        unsubscribe = function () { return source_2.off(eventName, handler); };
+    }
+    else if (isNodeStyleEventEmitter(sourceObj)) {
+        var source_3 = sourceObj;
+        sourceObj.addListener(eventName, handler);
+        unsubscribe = function () { return source_3.removeListener(eventName, handler); };
+    }
+    else if (sourceObj && sourceObj.length) {
+        for (var i = 0, len = sourceObj.length; i < len; i++) {
+            setupSubscription(sourceObj[i], eventName, handler, subscriber, options);
+        }
+    }
+    else {
+        throw new TypeError('Invalid event target');
+    }
+    subscriber.add(unsubscribe);
+}
+function isNodeStyleEventEmitter(sourceObj) {
+    return sourceObj && typeof sourceObj.addListener === 'function' && typeof sourceObj.removeListener === 'function';
+}
+function isJQueryStyleEventEmitter(sourceObj) {
+    return sourceObj && typeof sourceObj.on === 'function' && typeof sourceObj.off === 'function';
+}
+function isEventTarget(sourceObj) {
+    return sourceObj && typeof sourceObj.addEventListener === 'function' && typeof sourceObj.removeEventListener === 'function';
+}
+//# sourceMappingURL=fromEvent.js.map
+
+
+/***/ }),
+/* 402 */
+/***/ (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__(193);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178);
+/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(173);
+/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231);
+/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */
+
+
+
+
+function fromEventPattern(addHandler, removeHandler, resultSelector) {
+    if (resultSelector) {
+        return fromEventPattern(addHandler, removeHandler).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        var handler = function () {
+            var e = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                e[_i] = arguments[_i];
+            }
+            return subscriber.next(e.length === 1 ? e[0] : e);
+        };
+        var retValue;
+        try {
+            retValue = addHandler(handler);
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+        if (!Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(removeHandler)) {
+            return undefined;
+        }
+        return function () { return removeHandler(handler, retValue); };
+    });
+}
+//# sourceMappingURL=fromEventPattern.js.map
+
+
+/***/ }),
+/* 403 */
+/***/ (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__(193);
+/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232);
+/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(206);
+/** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */
+
+
+
+function generate(initialStateOrOptions, condition, iterate, resultSelectorOrObservable, scheduler) {
+    var resultSelector;
+    var initialState;
+    if (arguments.length == 1) {
+        var options = initialStateOrOptions;
+        initialState = options.initialState;
+        condition = options.condition;
+        iterate = options.iterate;
+        resultSelector = options.resultSelector || _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"];
+        scheduler = options.scheduler;
+    }
+    else if (resultSelectorOrObservable === undefined || Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_2__["isScheduler"])(resultSelectorOrObservable)) {
+        initialState = initialStateOrOptions;
+        resultSelector = _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"];
+        scheduler = resultSelectorOrObservable;
+    }
+    else {
+        initialState = initialStateOrOptions;
+        resultSelector = resultSelectorOrObservable;
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        var state = initialState;
+        if (scheduler) {
+            return scheduler.schedule(dispatch, 0, {
+                subscriber: subscriber,
+                iterate: iterate,
+                condition: condition,
+                resultSelector: resultSelector,
+                state: state
+            });
+        }
+        do {
+            if (condition) {
+                var conditionResult = void 0;
+                try {
+                    conditionResult = condition(state);
+                }
+                catch (err) {
+                    subscriber.error(err);
+                    return undefined;
+                }
+                if (!conditionResult) {
+                    subscriber.complete();
+                    break;
+                }
+            }
+            var value = void 0;
+            try {
+                value = resultSelector(state);
+            }
+            catch (err) {
+                subscriber.error(err);
+                return undefined;
+            }
+            subscriber.next(value);
+            if (subscriber.closed) {
+                break;
+            }
+            try {
+                state = iterate(state);
+            }
+            catch (err) {
+                subscriber.error(err);
+                return undefined;
+            }
+        } while (true);
+        return undefined;
+    });
+}
+function dispatch(state) {
+    var subscriber = state.subscriber, condition = state.condition;
+    if (subscriber.closed) {
+        return undefined;
+    }
+    if (state.needIterate) {
+        try {
+            state.state = state.iterate(state.state);
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+    }
+    else {
+        state.needIterate = true;
+    }
+    if (condition) {
+        var conditionResult = void 0;
+        try {
+            conditionResult = condition(state.state);
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+        if (!conditionResult) {
+            subscriber.complete();
+            return undefined;
+        }
+        if (subscriber.closed) {
+            return undefined;
+        }
+    }
+    var value;
+    try {
+        value = state.resultSelector(state.state);
+    }
+    catch (err) {
+        subscriber.error(err);
+        return undefined;
+    }
+    if (subscriber.closed) {
+        return undefined;
+    }
+    subscriber.next(value);
+    if (subscriber.closed) {
+        return undefined;
+    }
+    return this.schedule(state);
+}
+//# sourceMappingURL=generate.js.map
+
+
+/***/ }),
+/* 404 */
+/***/ (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__(333);
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(242);
+/** PURE_IMPORTS_START _defer,_empty PURE_IMPORTS_END */
+
+
+function iif(condition, trueResult, falseResult) {
+    if (trueResult === void 0) {
+        trueResult = _empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"];
+    }
+    if (falseResult === void 0) {
+        falseResult = _empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"];
+    }
+    return Object(_defer__WEBPACK_IMPORTED_MODULE_0__["defer"])(function () { return condition() ? trueResult : falseResult; });
+}
+//# sourceMappingURL=iif.js.map
+
+
+/***/ }),
+/* 405 */
+/***/ (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__(193);
+/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199);
+/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(205);
+/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric PURE_IMPORTS_END */
+
+
+
+function interval(period, scheduler) {
+    if (period === void 0) {
+        period = 0;
+    }
+    if (scheduler === void 0) {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
+    }
+    if (!Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(period) || period < 0) {
+        period = 0;
+    }
+    if (!scheduler || typeof scheduler.schedule !== 'function') {
+        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        subscriber.add(scheduler.schedule(dispatch, period, { subscriber: subscriber, counter: 0, period: period }));
+        return subscriber;
+    });
+}
+function dispatch(state) {
+    var subscriber = state.subscriber, counter = state.counter, period = state.period;
+    subscriber.next(counter);
+    this.schedule({ subscriber: subscriber, counter: counter + 1, period: period }, period);
+}
+//# sourceMappingURL=interval.js.map
+
+
+/***/ }),
+/* 406 */
+/***/ (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__(193);
+/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(197);
+/** PURE_IMPORTS_START _Observable,_util_noop PURE_IMPORTS_END */
+
+
+var NEVER = /*@__PURE__*/ new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](_util_noop__WEBPACK_IMPORTED_MODULE_1__["noop"]);
+function never() {
+    return NEVER;
+}
+//# sourceMappingURL=never.js.map
+
+
+/***/ }),
+/* 407 */
+/***/ (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__(193);
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(218);
+/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178);
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(242);
+/** PURE_IMPORTS_START _Observable,_from,_util_isArray,_empty PURE_IMPORTS_END */
+
+
+
+
+function onErrorResumeNext() {
+    var sources = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sources[_i] = arguments[_i];
+    }
+    if (sources.length === 0) {
+        return _empty__WEBPACK_IMPORTED_MODULE_3__["EMPTY"];
+    }
+    var first = sources[0], remainder = sources.slice(1);
+    if (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(first)) {
+        return onErrorResumeNext.apply(void 0, first);
+    }
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        var subNext = function () { return subscriber.add(onErrorResumeNext.apply(void 0, remainder).subscribe(subscriber)); };
+        return Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(first).subscribe({
+            next: function (value) { subscriber.next(value); },
+            error: subNext,
+            complete: subNext,
+        });
+    });
+}
+//# sourceMappingURL=onErrorResumeNext.js.map
+
+
+/***/ }),
+/* 408 */
+/***/ (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__(193);
+/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177);
+/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
+
+
+function pairs(obj, scheduler) {
+    if (!scheduler) {
+        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+            var keys = Object.keys(obj);
+            for (var i = 0; i < keys.length && !subscriber.closed; i++) {
+                var key = keys[i];
+                if (obj.hasOwnProperty(key)) {
+                    subscriber.next([key, obj[key]]);
+                }
+            }
+            subscriber.complete();
+        });
+    }
+    else {
+        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+            var keys = Object.keys(obj);
+            var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
+            subscription.add(scheduler.schedule(dispatch, 0, { keys: keys, index: 0, subscriber: subscriber, subscription: subscription, obj: obj }));
+            return subscription;
+        });
+    }
+}
+function dispatch(state) {
+    var keys = state.keys, index = state.index, subscriber = state.subscriber, subscription = state.subscription, obj = state.obj;
+    if (!subscriber.closed) {
+        if (index < keys.length) {
+            var key = keys[index];
+            subscriber.next([key, obj[key]]);
+            subscription.add(this.schedule({ keys: keys, index: index + 1, subscriber: subscriber, subscription: subscription, obj: obj }));
+        }
+        else {
+            subscriber.complete();
+        }
+    }
+}
+//# sourceMappingURL=pairs.js.map
+
+
+/***/ }),
+/* 409 */
+/***/ (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__(289);
+/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(184);
+/* harmony import */ var _operators_filter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(251);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(193);
+/** 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
+
+
+/***/ }),
+/* 410 */
+/***/ (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__(193);
+/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+
+function range(start, count, scheduler) {
+    if (start === void 0) {
+        start = 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) {
+            return scheduler.schedule(dispatch, 0, {
+                index: index, count: count, start: start, subscriber: subscriber
+            });
+        }
+        else {
+            do {
+                if (index++ >= count) {
+                    subscriber.complete();
+                    break;
+                }
+                subscriber.next(current++);
+                if (subscriber.closed) {
+                    break;
+                }
+            } while (true);
+        }
+        return undefined;
+    });
+}
+function dispatch(state) {
+    var start = state.start, index = state.index, count = state.count, subscriber = state.subscriber;
+    if (index >= count) {
+        subscriber.complete();
+        return;
+    }
+    subscriber.next(start);
+    if (subscriber.closed) {
+        return;
+    }
+    state.index = index + 1;
+    state.start = start + 1;
+    this.schedule(state);
+}
+//# sourceMappingURL=range.js.map
+
+
+/***/ }),
+/* 411 */
+/***/ (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__(193);
+/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(218);
+/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(242);
+/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */
+
+
+
+function using(resourceFactory, observableFactory) {
+    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
+        var resource;
+        try {
+            resource = resourceFactory();
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+        var result;
+        try {
+            result = observableFactory(resource);
+        }
+        catch (err) {
+            subscriber.error(err);
+            return undefined;
+        }
+        var source = result ? Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(result) : _empty__WEBPACK_IMPORTED_MODULE_2__["EMPTY"];
+        var subscription = source.subscribe(subscriber);
+        return function () {
+            subscription.unsubscribe();
+            if (resource) {
+                resource.unsubscribe();
+            }
+        };
+    });
+}
+//# sourceMappingURL=using.js.map
+
+
+/***/ }),
+/* 412 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var childProcess = __webpack_require__(352);
+var spawn = childProcess.spawn;
+var exec = childProcess.exec;
+
+module.exports = function (pid, signal, callback) {
+    var tree = {};
+    var pidsToProcess = {};
+    tree[pid] = [];
+    pidsToProcess[pid] = 1;
+    
+    if (typeof signal === 'function' && callback === undefined) {
+      callback = signal;
+      signal = undefined;
+    }
+
+    switch (process.platform) {
+    case 'win32':
+        exec('taskkill /pid ' + pid + ' /T /F', callback);
+        break;
+    case 'darwin':
+        buildProcessTree(pid, tree, pidsToProcess, function (parentPid) {
+          return spawn('pgrep', ['-P', parentPid]);
+        }, function () {
+            killAll(tree, signal, callback);
+        });
+        break;
+    // case 'sunos':
+    //     buildProcessTreeSunOS(pid, tree, pidsToProcess, function () {
+    //         killAll(tree, signal, callback);
+    //     });
+    //     break;
+    default: // Linux
+        buildProcessTree(pid, tree, pidsToProcess, function (parentPid) {
+          return spawn('ps', ['-o', 'pid', '--no-headers', '--ppid', parentPid]);
+        }, function () {
+            killAll(tree, signal, callback);
+        });
+        break;
+    }
+};
+
+function killAll (tree, signal, callback) {
+    var killed = {};
+    try {
+        Object.keys(tree).forEach(function (pid) {
+            tree[pid].forEach(function (pidpid) {
+                if (!killed[pidpid]) {
+                    killPid(pidpid, signal);
+                    killed[pidpid] = 1;
+                }
+            });
+            if (!killed[pid]) {
+                killPid(pid, signal);
+                killed[pid] = 1;
+            }
+        });
+    } catch (err) {
+        if (callback) {
+            return callback(err);
+        } else {
+            throw err;
+        }
+    }
+    if (callback) {
+        return callback();
+    }
+}
+
+function killPid(pid, signal) {
+    try {
+        process.kill(parseInt(pid, 10), signal);
+    }
+    catch (err) {
+        if (err.code !== 'ESRCH') throw err;
+    }
+}
+
+function buildProcessTree (parentPid, tree, pidsToProcess, spawnChildProcessesList, cb) {
+    var ps = spawnChildProcessesList(parentPid);
+    var allData = '';
+    ps.stdout.on('data', function (data) {
+        var data = data.toString('ascii');
+        allData += data;
+    });
+
+    var onClose = function (code) {
+        delete pidsToProcess[parentPid];
+
+        if (code != 0) {
+            // no more parent processes
+            if (Object.keys(pidsToProcess).length == 0) {
+                cb();
+            }
+            return;
+        }
+
+        allData.match(/\d+/g).forEach(function (pid) {
+          pid = parseInt(pid, 10);
+          tree[parentPid].push(pid);
+          tree[pid] = [];
+          pidsToProcess[pid] = 1;
+          buildProcessTree(pid, tree, pidsToProcess, spawnChildProcessesList, cb);
+        });
+    };
+
+    ps.on('close', onClose);
+}
+
+
+/***/ }),
+/* 413 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+const Rx = tslib_1.__importStar(__webpack_require__(392));
+const operators_1 = __webpack_require__(169);
+const SEP = /\r?\n/;
+const observe_readable_1 = __webpack_require__(414);
+/**
+ *  Creates an Observable from a Readable Stream that:
+ *   - splits data from `readable` into lines
+ *   - completes when `readable` emits "end"
+ *   - fails if `readable` emits "errors"
+ *
+ *  @param  {ReadableStream} readable
+ *  @return {Rx.Observable}
+ */
+function observeLines(readable) {
+    const done$ = observe_readable_1.observeReadable(readable).pipe(operators_1.share());
+    const scan$ = Rx.fromEvent(readable, 'data').pipe(operators_1.scan(({ buffer }, chunk) => {
+        buffer += chunk;
+        const lines = [];
+        while (true) {
+            const match = buffer.match(SEP);
+            if (!match || match.index === undefined) {
+                break;
+            }
+            lines.push(buffer.slice(0, match.index));
+            buffer = buffer.slice(match.index + match[0].length);
+        }
+        return { buffer, lines };
+    }, { buffer: '' }), 
+    // stop if done completes or errors
+    operators_1.takeUntil(done$.pipe(operators_1.materialize())), operators_1.share());
+    return Rx.merge(
+    // use done$ to provide completion/errors
+    done$, 
+    // merge in the "lines" from each step
+    scan$.pipe(operators_1.mergeMap(({ lines }) => lines || [])), 
+    // inject the "unsplit" data at the end
+    scan$.pipe(operators_1.last(), operators_1.mergeMap(({ buffer }) => (buffer ? [buffer] : [])), 
+    // if there were no lines, last() will error, so catch and complete
+    operators_1.catchError(() => Rx.empty())));
+}
+exports.observeLines = observeLines;
+
+
+/***/ }),
+/* 414 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+const Rx = tslib_1.__importStar(__webpack_require__(392));
+const operators_1 = __webpack_require__(169);
+/**
+ *  Produces an Observable from a ReadableSteam that:
+ *   - completes on the first "end" event
+ *   - fails on the first "error" event
+ */
+function observeReadable(readable) {
+    return Rx.race(Rx.fromEvent(readable, 'end').pipe(operators_1.first(), operators_1.ignoreElements()), Rx.fromEvent(readable, 'error').pipe(operators_1.first(), operators_1.mergeMap(err => Rx.throwError(err))));
+}
+exports.observeReadable = observeReadable;
+
+
+/***/ }),
+/* 415 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+var tooling_log_1 = __webpack_require__(416);
+exports.ToolingLog = tooling_log_1.ToolingLog;
+var tooling_log_text_writer_1 = __webpack_require__(417);
+exports.ToolingLogTextWriter = tooling_log_text_writer_1.ToolingLogTextWriter;
+var log_levels_1 = __webpack_require__(418);
+exports.pickLevelFromFlags = log_levels_1.pickLevelFromFlags;
+var tooling_log_collecting_writer_1 = __webpack_require__(419);
+exports.ToolingLogCollectingWriter = tooling_log_collecting_writer_1.ToolingLogCollectingWriter;
+
+
+/***/ }),
+/* 416 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+const Rx = tslib_1.__importStar(__webpack_require__(392));
+const tooling_log_text_writer_1 = __webpack_require__(417);
+class ToolingLog {
+    constructor(writerConfig) {
+        this.identWidth = 0;
+        this.writers = writerConfig ? [new tooling_log_text_writer_1.ToolingLogTextWriter(writerConfig)] : [];
+        this.written$ = new Rx.Subject();
+    }
+    indent(delta = 0) {
+        this.identWidth = Math.max(this.identWidth + delta, 0);
+        return this.identWidth;
+    }
+    verbose(...args) {
+        this.sendToWriters('verbose', args);
+    }
+    debug(...args) {
+        this.sendToWriters('debug', args);
+    }
+    info(...args) {
+        this.sendToWriters('info', args);
+    }
+    success(...args) {
+        this.sendToWriters('success', args);
+    }
+    warning(...args) {
+        this.sendToWriters('warning', args);
+    }
+    error(error) {
+        this.sendToWriters('error', [error]);
+    }
+    write(...args) {
+        this.sendToWriters('write', args);
+    }
+    getWriters() {
+        return this.writers.slice(0);
+    }
+    setWriters(writers) {
+        this.writers = [...writers];
+    }
+    getWritten$() {
+        return this.written$.asObservable();
+    }
+    sendToWriters(type, args) {
+        const msg = {
+            type,
+            indent: this.identWidth,
+            args,
+        };
+        let written = false;
+        for (const writer of this.writers) {
+            if (writer.write(msg)) {
+                written = true;
+            }
+        }
+        if (written) {
+            this.written$.next(msg);
+        }
+    }
+}
+exports.ToolingLog = ToolingLog;
+
+
+/***/ }),
+/* 417 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+const util_1 = __webpack_require__(29);
+const chalk_1 = tslib_1.__importDefault(__webpack_require__(2));
+const log_levels_1 = __webpack_require__(418);
+const { magentaBright, yellow, red, blue, green, dim } = chalk_1.default;
+const PREFIX_INDENT = ' '.repeat(6);
+const MSG_PREFIXES = {
+    verbose: ` ${magentaBright('sill')} `,
+    debug: ` ${dim('debg')} `,
+    info: ` ${blue('info')} `,
+    success: ` ${green('succ')} `,
+    warning: ` ${yellow('warn')} `,
+    error: `${red('ERROR')} `,
+};
+const has = (obj, key) => obj.hasOwnProperty(key);
+function shouldWriteType(level, type) {
+    if (type === 'write') {
+        return true;
+    }
+    return Boolean(level.flags[type === 'success' ? 'info' : type]);
+}
+function stringifyError(error) {
+    if (typeof error !== 'string' && !(error instanceof Error)) {
+        error = new Error(`"${error}" thrown`);
+    }
+    if (typeof error === 'string') {
+        return error;
+    }
+    return error.stack || error.message || error;
+}
+class ToolingLogTextWriter {
+    constructor(config) {
+        this.level = log_levels_1.parseLogLevel(config.level);
+        this.writeTo = config.writeTo;
+        if (!this.writeTo || typeof this.writeTo.write !== 'function') {
+            throw new Error('ToolingLogTextWriter requires the `writeTo` option be set to a stream (like process.stdout)');
+        }
+    }
+    write({ type, indent, args }) {
+        if (!shouldWriteType(this.level, type)) {
+            return false;
+        }
+        const txt = type === 'error' ? stringifyError(args[0]) : util_1.format(args[0], ...args.slice(1));
+        const prefix = has(MSG_PREFIXES, type) ? MSG_PREFIXES[type] : '';
+        (prefix + txt).split('\n').forEach((line, i) => {
+            let lineIndent = '';
+            if (indent > 0) {
+                // if we are indenting write some spaces followed by a symbol
+                lineIndent += ' '.repeat(indent - 1);
+                lineIndent += line.startsWith('-') ? '└' : '│';
+            }
+            if (line && prefix && i > 0) {
+                // apply additional indentation to lines after
+                // the first if this message gets a prefix
+                lineIndent += PREFIX_INDENT;
+            }
+            this.writeTo.write(`${lineIndent}${line}\n`);
+        });
+        return true;
+    }
+}
+exports.ToolingLogTextWriter = ToolingLogTextWriter;
+
+
+/***/ }),
+/* 418 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const LEVELS = ['silent', 'error', 'warning', 'info', 'debug', 'verbose'];
+function pickLevelFromFlags(flags, options = {}) {
+    if (flags.verbose)
+        return 'verbose';
+    if (flags.debug)
+        return 'debug';
+    if (flags.quiet)
+        return 'error';
+    if (flags.silent)
+        return 'silent';
+    return options.default || 'info';
+}
+exports.pickLevelFromFlags = pickLevelFromFlags;
+function parseLogLevel(name) {
+    const i = LEVELS.indexOf(name);
+    if (i === -1) {
+        const msg = `Invalid log level "${name}" ` + `(expected one of ${LEVELS.join(',')})`;
+        throw new Error(msg);
+    }
+    const flags = {};
+    LEVELS.forEach((level, levelI) => {
+        flags[level] = levelI <= i;
+    });
+    return {
+        name,
+        flags: flags,
+    };
+}
+exports.parseLogLevel = parseLogLevel;
+
+
+/***/ }),
+/* 419 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tooling_log_text_writer_1 = __webpack_require__(417);
+class ToolingLogCollectingWriter extends tooling_log_text_writer_1.ToolingLogTextWriter {
+    constructor() {
+        super({
+            level: 'verbose',
+            writeTo: {
+                write: msg => {
+                    // trim trailing new line
+                    this.messages.push(msg.slice(0, -1));
+                },
+            },
+        });
+        this.messages = [];
+    }
+}
+exports.ToolingLogCollectingWriter = ToolingLogCollectingWriter;
+
+
+/***/ }),
+/* 420 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+var absolute_path_serializer_1 = __webpack_require__(421);
+exports.createAbsolutePathSerializer = absolute_path_serializer_1.createAbsolutePathSerializer;
+
+
+/***/ }),
+/* 421 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+function createAbsolutePathSerializer(rootPath) {
+    return {
+        print: (value) => value.replace(rootPath, '<absolute path>').replace(/\\/g, '/'),
+        test: (value) => typeof value === 'string' && value.startsWith(rootPath),
+    };
+}
+exports.createAbsolutePathSerializer = createAbsolutePathSerializer;
+
+
+/***/ }),
+/* 422 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __webpack_require__(16);
+exports.CA_CERT_PATH = path_1.resolve(__dirname, '../certs/ca.crt');
+exports.ES_KEY_PATH = path_1.resolve(__dirname, '../certs/elasticsearch.key');
+exports.ES_CERT_PATH = path_1.resolve(__dirname, '../certs/elasticsearch.crt');
+
+
+/***/ }),
+/* 423 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+var run_1 = __webpack_require__(424);
+exports.run = run_1.run;
+var fail_1 = __webpack_require__(425);
+exports.createFailError = fail_1.createFailError;
+exports.createFlagError = fail_1.createFlagError;
+exports.combineErrors = fail_1.combineErrors;
+exports.isFailError = fail_1.isFailError;
+
+
+/***/ }),
+/* 424 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+// @ts-ignore @types are outdated and module is super simple
+const exit_hook_1 = tslib_1.__importDefault(__webpack_require__(348));
+const tooling_log_1 = __webpack_require__(415);
+const fail_1 = __webpack_require__(425);
+const flags_1 = __webpack_require__(426);
+async function run(fn, options = {}) {
+    var _a;
+    const flags = flags_1.getFlags(process.argv.slice(2), options);
+    if (flags.help) {
+        process.stderr.write(flags_1.getHelp(options));
+        process.exit(1);
+    }
+    const log = new tooling_log_1.ToolingLog({
+        level: tooling_log_1.pickLevelFromFlags(flags),
+        writeTo: process.stdout,
+    });
+    process.on('unhandledRejection', error => {
+        log.error('UNHANDLED PROMISE REJECTION');
+        log.error(error);
+        process.exit(1);
+    });
+    const handleErrorWithoutExit = (error) => {
+        if (fail_1.isFailError(error)) {
+            log.error(error.message);
+            if (error.showHelp) {
+                log.write(flags_1.getHelp(options));
+            }
+            process.exitCode = error.exitCode;
+        }
+        else {
+            log.error('UNHANDLED ERROR');
+            log.error(error);
+            process.exitCode = 1;
+        }
+    };
+    const doCleanup = () => {
+        const tasks = cleanupTasks.slice(0);
+        cleanupTasks.length = 0;
+        for (const task of tasks) {
+            try {
+                task();
+            }
+            catch (error) {
+                handleErrorWithoutExit(error);
+            }
+        }
+    };
+    const unhookExit = exit_hook_1.default(doCleanup);
+    const cleanupTasks = [unhookExit];
+    try {
+        if (!((_a = options.flags) === null || _a === void 0 ? void 0 : _a.allowUnexpected) && flags.unexpected.length) {
+            throw fail_1.createFlagError(`Unknown flag(s) "${flags.unexpected.join('", "')}"`);
+        }
+        try {
+            await fn({
+                log,
+                flags,
+                addCleanupTask: (task) => cleanupTasks.push(task),
+            });
+        }
+        finally {
+            doCleanup();
+        }
+    }
+    catch (error) {
+        handleErrorWithoutExit(error);
+        process.exit();
+    }
+}
+exports.run = run;
+
+
+/***/ }),
+/* 425 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const util_1 = __webpack_require__(29);
+const FAIL_TAG = Symbol('fail error');
+function createFailError(reason, options = {}) {
+    const { exitCode = 1, showHelp = false } = options;
+    return Object.assign(new Error(reason), {
+        exitCode,
+        showHelp,
+        [FAIL_TAG]: true,
+    });
+}
+exports.createFailError = createFailError;
+function createFlagError(reason) {
+    return createFailError(reason, {
+        showHelp: true,
+    });
+}
+exports.createFlagError = createFlagError;
+function isFailError(error) {
+    return Boolean(error && error[FAIL_TAG]);
+}
+exports.isFailError = isFailError;
+function combineErrors(errors) {
+    if (errors.length === 1) {
+        return errors[0];
+    }
+    const exitCode = errors
+        .filter(isFailError)
+        .reduce((acc, error) => Math.max(acc, error.exitCode), 1);
+    const showHelp = errors.some(error => isFailError(error) && error.showHelp);
+    const message = errors.reduce((acc, error) => {
+        if (isFailError(error)) {
+            return acc + '\n' + error.message;
+        }
+        return acc + `\nUNHANDLED ERROR\n${util_1.inspect(error)}`;
+    }, '');
+    return createFailError(`${errors.length} errors:\n${message}`, {
+        exitCode,
+        showHelp,
+    });
+}
+exports.combineErrors = combineErrors;
+
+
+/***/ }),
+/* 426 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+const path_1 = __webpack_require__(16);
+const dedent_1 = tslib_1.__importDefault(__webpack_require__(14));
+const getopts_1 = tslib_1.__importDefault(__webpack_require__(427));
+function getFlags(argv, options) {
+    const unexpectedNames = new Set();
+    const flagOpts = options.flags || {};
+    const { verbose, quiet, silent, debug, help, _, ...others } = getopts_1.default(argv, {
+        string: flagOpts.string,
+        boolean: [...(flagOpts.boolean || []), 'verbose', 'quiet', 'silent', 'debug', 'help'],
+        alias: {
+            ...(flagOpts.alias || {}),
+            v: 'verbose',
+        },
+        default: flagOpts.default,
+        unknown: (name) => {
+            unexpectedNames.add(name);
+            return flagOpts.guessTypesForUnexpectedFlags;
+        },
+    });
+    const unexpected = [];
+    for (const unexpectedName of unexpectedNames) {
+        const matchingArgv = [];
+        iterArgv: for (const [i, v] of argv.entries()) {
+            for (const prefix of ['--', '-']) {
+                if (v.startsWith(prefix)) {
+                    // -/--name=value
+                    if (v.startsWith(`${prefix}${unexpectedName}=`)) {
+                        matchingArgv.push(v);
+                        continue iterArgv;
+                    }
+                    // -/--name (value possibly follows)
+                    if (v === `${prefix}${unexpectedName}`) {
+                        matchingArgv.push(v);
+                        // value follows -/--name
+                        if (argv.length > i + 1 && !argv[i + 1].startsWith('-')) {
+                            matchingArgv.push(argv[i + 1]);
+                        }
+                        continue iterArgv;
+                    }
+                }
+            }
+            // special case for `--no-{flag}` disabling of boolean flags
+            if (v === `--no-${unexpectedName}`) {
+                matchingArgv.push(v);
+                continue iterArgv;
+            }
+            // special case for shortcut flags formatted as `-abc` where `a`, `b`,
+            // and `c` will be three separate unexpected flags
+            if (unexpectedName.length === 1 &&
+                v[0] === '-' &&
+                v[1] !== '-' &&
+                !v.includes('=') &&
+                v.includes(unexpectedName)) {
+                matchingArgv.push(`-${unexpectedName}`);
+                continue iterArgv;
+            }
+        }
+        if (matchingArgv.length) {
+            unexpected.push(...matchingArgv);
+        }
+        else {
+            throw new Error(`unable to find unexpected flag named "${unexpectedName}"`);
+        }
+    }
+    return {
+        verbose,
+        quiet,
+        silent,
+        debug,
+        help,
+        _,
+        unexpected,
+        ...others,
+    };
+}
+exports.getFlags = getFlags;
+function getHelp(options) {
+    var _a, _b;
+    const usage = options.usage || `node ${path_1.relative(process.cwd(), process.argv[1])}`;
+    const optionHelp = (dedent_1.default(((_b = (_a = options) === null || _a === void 0 ? void 0 : _a.flags) === null || _b === void 0 ? void 0 : _b.help) || '') +
+        '\n' +
+        dedent_1.default `
+      --verbose, -v      Log verbosely
+      --debug            Log debug messages (less than verbose)
+      --quiet            Only log errors
+      --silent           Don't log anything
+      --help             Show this message
+    `)
+        .split('\n')
+        .filter(Boolean)
+        .join('\n    ');
+    return `
+  ${usage}
+
+  ${dedent_1.default(options.description || 'Runs a dev task')
+        .split('\n')
+        .join('\n  ')}
+
+  Options:
+    ${optionHelp + '\n\n'}`;
+}
+exports.getHelp = getHelp;
+
+
+/***/ }),
+/* 427 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const EMPTYARR = []
+const SHORTSPLIT = /$|[!-@[-`{-~][\s\S]*/g
+const isArray = Array.isArray
+
+const parseValue = function(any) {
+  if (any === "") return ""
+  if (any === "false") return false
+  const maybe = Number(any)
+  return maybe * 0 === 0 ? maybe : any
+}
+
+const parseAlias = function(aliases) {
+  let out = {},
+    key,
+    alias,
+    prev,
+    len,
+    any,
+    i,
+    k
+
+  for (key in aliases) {
+    any = aliases[key]
+    alias = out[key] = isArray(any) ? any : [any]
+
+    for (i = 0, len = alias.length; i < len; i++) {
+      prev = out[alias[i]] = [key]
+
+      for (k = 0; k < len; k++) {
+        if (i !== k) prev.push(alias[k])
+      }
+    }
+  }
+
+  return out
+}
+
+const parseDefault = function(aliases, defaults) {
+  let out = {},
+    key,
+    alias,
+    value,
+    len,
+    i
+
+  for (key in defaults) {
+    value = defaults[key]
+    alias = aliases[key]
+
+    out[key] = value
+
+    if (alias === undefined) {
+      aliases[key] = EMPTYARR
+    } else {
+      for (i = 0, len = alias.length; i < len; i++) {
+        out[alias[i]] = value
+      }
+    }
+  }
+
+  return out
+}
+
+const parseOptions = function(aliases, options, value) {
+  let out = {},
+    key,
+    alias,
+    len,
+    end,
+    i,
+    k
+
+  if (options !== undefined) {
+    for (i = 0, len = options.length; i < len; i++) {
+      key = options[i]
+      alias = aliases[key]
+
+      out[key] = value
+
+      if (alias === undefined) {
+        aliases[key] = EMPTYARR
+      } else {
+        for (k = 0, end = alias.length; k < end; k++) {
+          out[alias[k]] = value
+        }
+      }
+    }
+  }
+
+  return out
+}
+
+const write = function(out, key, value, aliases, unknown) {
+  let i,
+    prev,
+    alias = aliases[key],
+    len = alias === undefined ? -1 : alias.length
+
+  if (len >= 0 || unknown === undefined || unknown(key)) {
+    prev = out[key]
+
+    if (prev === undefined) {
+      out[key] = value
+    } else {
+      if (isArray(prev)) {
+        prev.push(value)
+      } else {
+        out[key] = [prev, value]
+      }
+    }
+
+    for (i = 0; i < len; i++) {
+      out[alias[i]] = out[key]
+    }
+  }
+}
+
+const getopts = function(argv, opts) {
+  let unknown = (opts = opts || {}).unknown,
+    aliases = parseAlias(opts.alias),
+    strings = parseOptions(aliases, opts.string, ""),
+    values = parseDefault(aliases, opts.default),
+    bools = parseOptions(aliases, opts.boolean, false),
+    stopEarly = opts.stopEarly,
+    _ = [],
+    out = { _ },
+    i = 0,
+    k = 0,
+    len = argv.length,
+    key,
+    arg,
+    end,
+    match,
+    value
+
+  for (; i < len; i++) {
+    arg = argv[i]
+
+    if (arg[0] !== "-" || arg === "-") {
+      if (stopEarly) while (i < len) _.push(argv[i++])
+      else _.push(arg)
+    } else if (arg === "--") {
+      while (++i < len) _.push(argv[i])
+    } else if (arg[1] === "-") {
+      end = arg.indexOf("=", 2)
+      if (arg[2] === "n" && arg[3] === "o" && arg[4] === "-") {
+        key = arg.slice(5, end >= 0 ? end : undefined)
+        value = false
+      } else if (end >= 0) {
+        key = arg.slice(2, end)
+        value =
+          bools[key] !== undefined ||
+          (strings[key] === undefined
+            ? parseValue(arg.slice(end + 1))
+            : arg.slice(end + 1))
+      } else {
+        key = arg.slice(2)
+        value =
+          bools[key] !== undefined ||
+          (len === i + 1 || argv[i + 1][0] === "-"
+            ? strings[key] === undefined
+              ? true
+              : ""
+            : strings[key] === undefined
+            ? parseValue(argv[++i])
+            : argv[++i])
+      }
+      write(out, key, value, aliases, unknown)
+    } else {
+      SHORTSPLIT.lastIndex = 2
+      match = SHORTSPLIT.exec(arg)
+      end = match.index
+      value = match[0]
+
+      for (k = 1; k < end; k++) {
+        write(
+          out,
+          (key = arg[k]),
+          k + 1 < end
+            ? strings[key] === undefined ||
+                arg.substring(k + 1, (k = end)) + value
+            : value === ""
+            ? len === i + 1 || argv[i + 1][0] === "-"
+              ? strings[key] === undefined || ""
+              : bools[key] !== undefined ||
+                (strings[key] === undefined ? parseValue(argv[++i]) : argv[++i])
+            : bools[key] !== undefined ||
+              (strings[key] === undefined ? parseValue(value) : value),
+          aliases,
+          unknown
+        )
+      }
+    }
+  }
+
+  for (key in values) if (out[key] === undefined) out[key] = values[key]
+  for (key in bools) if (out[key] === undefined) out[key] = false
+  for (key in strings) if (out[key] === undefined) out[key] = ""
+
+  return out
+}
+
+module.exports = getopts
+
+
+/***/ }),
+/* 428 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+const path_1 = tslib_1.__importDefault(__webpack_require__(16));
+const fs_1 = tslib_1.__importDefault(__webpack_require__(23));
+const load_json_file_1 = tslib_1.__importDefault(__webpack_require__(429));
+const isKibanaDir = (dir) => {
+    try {
+        const path = path_1.default.resolve(dir, 'package.json');
+        const json = load_json_file_1.default.sync(path);
+        if (json && typeof json === 'object' && 'name' in json && json.name === 'kibana') {
+            return true;
+        }
+    }
+    catch (error) {
+        if (error && error.code === 'ENOENT') {
+            return false;
+        }
+        throw error;
+    }
+};
+// search for the kibana directory, since this file is moved around it might
+// not be where we think but should always be a relatively close parent
+// of this directory
+const startDir = fs_1.default.realpathSync(__dirname);
+const { root: rootDir } = path_1.default.parse(startDir);
+let cursor = startDir;
+while (true) {
+    if (isKibanaDir(cursor)) {
+        break;
+    }
+    const parent = path_1.default.dirname(cursor);
+    if (parent === rootDir) {
+        throw new Error(`unable to find kibana directory from ${startDir}`);
+    }
+    cursor = parent;
+}
+exports.REPO_ROOT = cursor;
+
+
+/***/ }),
+/* 429 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const path = __webpack_require__(16);
+const {promisify} = __webpack_require__(29);
+const fs = __webpack_require__(430);
+const stripBom = __webpack_require__(434);
+const parseJson = __webpack_require__(435);
+
+const parse = (data, filePath, options = {}) => {
+	data = stripBom(data);
+
+	if (typeof options.beforeParse === 'function') {
+		data = options.beforeParse(data);
+	}
+
+	return parseJson(data, options.reviver, path.relative(process.cwd(), filePath));
+};
+
+module.exports = async (filePath, options) => parse(await promisify(fs.readFile)(filePath, 'utf8'), filePath, options);
+module.exports.sync = (filePath, options) => parse(fs.readFileSync(filePath, 'utf8'), filePath, options);
+
+
+/***/ }),
+/* 430 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var fs = __webpack_require__(23)
+var polyfills = __webpack_require__(431)
+var legacy = __webpack_require__(432)
+var clone = __webpack_require__(433)
+
+var queue = []
+
+var util = __webpack_require__(29)
+
+function noop () {}
+
+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 (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
+  process.on('exit', function() {
+    debug(queue)
+    __webpack_require__(30).equal(queue.length, 0)
+  })
+}
+
+module.exports = patch(clone(fs))
+if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
+    module.exports = patch(fs)
+    fs.__patched = true;
+}
+
+// Always patch fs.close/closeSync, because we want 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.
+module.exports.close = (function (fs$close) { return function (fd, cb) {
+  return fs$close.call(fs, fd, function (err) {
+    if (!err)
+      retry()
+
+    if (typeof cb === 'function')
+      cb.apply(this, arguments)
+  })
+}})(fs.close)
+
+module.exports.closeSync = (function (fs$closeSync) { return function (fd) {
+  // Note that graceful-fs also retries when fs.closeSync() fails.
+  // Looks like a bug to me, although it's probably a harmless one.
+  var rval = fs$closeSync.apply(fs, arguments)
+  retry()
+  return rval
+}})(fs.closeSync)
+
+// Only patch fs once, otherwise we'll run into a memory leak if
+// graceful-fs is loaded multiple times, such as in test environments that
+// reset the loaded modules between tests.
+// We look for the string `graceful-fs` from the comment above. This
+// way we are not adding any extra properties and it will detect if older
+// versions of graceful-fs are installed.
+if (!/\bgraceful-fs\b/.test(fs.closeSync.toString())) {
+  fs.closeSync = module.exports.closeSync;
+  fs.close = module.exports.close;
+}
+
+function patch (fs) {
+  // Everything that references the open() function needs to be in here
+  polyfills(fs)
+  fs.gracefulify = patch
+  fs.FileReadStream = ReadStream;  // Legacy name.
+  fs.FileWriteStream = WriteStream;  // Legacy name.
+  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)
+
+    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()
+        }
+      })
+    }
+  }
+
+  var fs$writeFile = fs.writeFile
+  fs.writeFile = writeFile
+  function writeFile (path, data, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
+
+    return go$writeFile(path, data, options, cb)
+
+    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()
+        }
+      })
+    }
+  }
+
+  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
+
+    return go$appendFile(path, data, options, cb)
+
+    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()
+        }
+      })
+    }
+  }
+
+  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)
+
+    return go$readdir(args)
+
+    function go$readdir$cb (err, files) {
+      if (files && files.sort)
+        files.sort()
+
+      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+        enqueue([go$readdir, [args]])
+
+      else {
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+        retry()
+      }
+    }
+  }
+
+  function go$readdir (args) {
+    return fs$readdir.apply(fs, args)
+  }
+
+  if (process.version.substr(0, 4) === 'v0.8') {
+    var legStreams = legacy(fs)
+    ReadStream = legStreams.ReadStream
+    WriteStream = legStreams.WriteStream
+  }
+
+  var fs$ReadStream = fs.ReadStream
+  if (fs$ReadStream) {
+    ReadStream.prototype = Object.create(fs$ReadStream.prototype)
+    ReadStream.prototype.open = ReadStream$open
+  }
+
+  var fs$WriteStream = fs.WriteStream
+  if (fs$WriteStream) {
+    WriteStream.prototype = Object.create(fs$WriteStream.prototype)
+    WriteStream.prototype.open = WriteStream$open
+  }
+
+  fs.ReadStream = ReadStream
+  fs.WriteStream = WriteStream
+
+  function ReadStream (path, options) {
+    if (this instanceof ReadStream)
+      return fs$ReadStream.apply(this, arguments), this
+    else
+      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
+  }
+
+  function ReadStream$open () {
+    var that = this
+    open(that.path, that.flags, that.mode, function (err, fd) {
+      if (err) {
+        if (that.autoClose)
+          that.destroy()
+
+        that.emit('error', err)
+      } else {
+        that.fd = fd
+        that.emit('open', fd)
+        that.read()
+      }
+    })
+  }
+
+  function WriteStream (path, options) {
+    if (this instanceof WriteStream)
+      return fs$WriteStream.apply(this, arguments), this
+    else
+      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
+  }
+
+  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)
+      }
+    })
+  }
+
+  function createReadStream (path, options) {
+    return new ReadStream(path, options)
+  }
+
+  function createWriteStream (path, options) {
+    return new WriteStream(path, options)
+  }
+
+  var fs$open = fs.open
+  fs.open = open
+  function open (path, flags, mode, cb) {
+    if (typeof mode === 'function')
+      cb = mode, mode = null
+
+    return go$open(path, flags, mode, cb)
+
+    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 fs
+}
+
+function enqueue (elem) {
+  debug('ENQUEUE', elem[0].name, elem[1])
+  queue.push(elem)
+}
+
+function retry () {
+  var elem = queue.shift()
+  if (elem) {
+    debug('RETRY', elem[0].name, elem[1])
+    elem[0].apply(null, elem[1])
+  }
+}
+
+
+/***/ }),
+/* 431 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var constants = __webpack_require__(25)
+
+var origCwd = process.cwd
+var cwd = null
+
+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) {}
+
+var chdir = process.chdir
+process.chdir = function(d) {
+  cwd = null
+  chdir.call(process, d)
+}
+
+module.exports = patch
+
+function patch (fs) {
+  // (re-)implement some things that are known busted or missing.
+
+  // 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)
+  }
+
+  // lutimes implementation, or no-op
+  if (!fs.lutimes) {
+    patchLutimes(fs)
+  }
+
+  // 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.
+
+  fs.chown = chownFix(fs.chown)
+  fs.fchown = chownFix(fs.fchown)
+  fs.lchown = chownFix(fs.lchown)
+
+  fs.chmod = chmodFix(fs.chmod)
+  fs.fchmod = chmodFix(fs.fchmod)
+  fs.lchmod = chmodFix(fs.lchmod)
+
+  fs.chownSync = chownFixSync(fs.chownSync)
+  fs.fchownSync = chownFixSync(fs.fchownSync)
+  fs.lchownSync = chownFixSync(fs.lchownSync)
+
+  fs.chmodSync = chmodFixSync(fs.chmodSync)
+  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
+  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
+
+  fs.stat = statFix(fs.stat)
+  fs.fstat = statFix(fs.fstat)
+  fs.lstat = statFix(fs.lstat)
+
+  fs.statSync = statFixSync(fs.statSync)
+  fs.fstatSync = statFixSync(fs.fstatSync)
+  fs.lstatSync = statFixSync(fs.lstatSync)
+
+  // 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 () {}
+  }
+
+  // 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.
+
+  // 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 read() returns EAGAIN, then just try it again.
+  fs.read = (function (fs$read) { return function (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)
+  }})(fs.read)
+
+  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)
+
+  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)
+
+      // 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 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)
+            })
+          })
+        })
+      }
+
+      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
+      }
+
+    } else {
+      fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
+      fs.lutimesSync = function () {}
+    }
+  }
+
+  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)
+      })
+    }
+  }
+
+  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
+      }
+    }
+  }
+
+
+  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)
+      })
+    }
+  }
+
+  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
+      }
+    }
+  }
+
+
+  function statFix (orig) {
+    if (!orig) return orig
+    // Older versions of Node erroneously returned signed integers for
+    // uid + gid.
+    return function (target, cb) {
+      return orig.call(fs, target, function (er, stats) {
+        if (!stats) return cb.apply(this, arguments)
+        if (stats.uid < 0) stats.uid += 0x100000000
+        if (stats.gid < 0) stats.gid += 0x100000000
+        if (cb) cb.apply(this, arguments)
+      })
+    }
+  }
+
+  function statFixSync (orig) {
+    if (!orig) return orig
+    // Older versions of Node erroneously returned signed integers for
+    // uid + gid.
+    return function (target) {
+      var stats = orig.call(fs, target)
+      if (stats.uid < 0) stats.uid += 0x100000000
+      if (stats.gid < 0) stats.gid += 0x100000000
+      return stats;
+    }
+  }
+
+  // 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 (er.code === "ENOSYS")
+      return true
+
+    var nonroot = !process.getuid || process.getuid() !== 0
+    if (nonroot) {
+      if (er.code === "EINVAL" || er.code === "EPERM")
+        return true
+    }
+
+    return false
+  }
+}
+
+
+/***/ }),
+/* 432 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var Stream = __webpack_require__(27).Stream
+
+module.exports = legacy
+
+function legacy (fs) {
+  return {
+    ReadStream: ReadStream,
+    WriteStream: WriteStream
+  }
+
+  function ReadStream (path, options) {
+    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
+
+    Stream.call(this);
+
+    var self = this;
+
+    this.path = path;
+    this.fd = null;
+    this.readable = true;
+    this.paused = false;
+
+    this.flags = 'r';
+    this.mode = 438; /*=0666*/
+    this.bufferSize = 64 * 1024;
+
+    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];
+    }
+
+    if (this.encoding) this.setEncoding(this.encoding);
+
+    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');
+      }
+
+      if (this.start > this.end) {
+        throw new Error('start must be <= end');
+      }
+
+      this.pos = this.start;
+    }
+
+    if (this.fd !== null) {
+      process.nextTick(function() {
+        self._read();
+      });
+      return;
+    }
+
+    fs.open(this.path, this.flags, this.mode, function (err, fd) {
+      if (err) {
+        self.emit('error', err);
+        self.readable = false;
+        return;
+      }
+
+      self.fd = fd;
+      self.emit('open', fd);
+      self._read();
+    })
+  }
+
+  function WriteStream (path, options) {
+    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
+
+    Stream.call(this);
+
+    this.path = path;
+    this.fd = null;
+    this.writable = true;
+
+    this.flags = 'w';
+    this.encoding = 'binary';
+    this.mode = 438; /*=0666*/
+    this.bytesWritten = 0;
+
+    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];
+    }
+
+    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');
+      }
+
+      this.pos = this.start;
+    }
+
+    this.busy = false;
+    this._queue = [];
+
+    if (this.fd === null) {
+      this._open = fs.open;
+      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
+      this.flush();
+    }
+  }
+}
+
+
+/***/ }),
+/* 433 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = clone
+
+function clone (obj) {
+  if (obj === null || typeof obj !== 'object')
+    return obj
+
+  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
+}
+
+
+/***/ }),
+/* 434 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = string => {
+	if (typeof string !== 'string') {
+		throw new TypeError(`Expected a string, got ${typeof string}`);
+	}
+
+	// Catches EFBBBF (UTF-8 BOM) because the buffer-to-string
+	// conversion translates it to FEFF (UTF-16 BOM)
+	if (string.charCodeAt(0) === 0xFEFF) {
+		return string.slice(1);
+	}
+
+	return string;
+};
+
+
+/***/ }),
+/* 435 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const errorEx = __webpack_require__(436);
+const fallback = __webpack_require__(438);
+const {default: LinesAndColumns} = __webpack_require__(439);
+const {codeFrameColumns} = __webpack_require__(440);
+
+const JSONError = errorEx('JSONError', {
+	fileName: errorEx.append('in %s'),
+	codeFrame: errorEx.append('\n\n%s\n')
+});
+
+module.exports = (string, reviver, filename) => {
+	if (typeof reviver === 'string') {
+		filename = reviver;
+		reviver = null;
+	}
+
+	try {
+		try {
+			return JSON.parse(string, reviver);
+		} catch (error) {
+			fallback(string, reviver);
+			throw error;
+		}
+	} catch (error) {
+		error.message = error.message.replace(/\n/g, '');
+		const indexMatch = error.message.match(/in JSON at position (\d+) while parsing near/);
+
+		const jsonError = new JSONError(error);
+		if (filename) {
+			jsonError.fileName = filename;
+		}
+
+		if (indexMatch && indexMatch.length > 0) {
+			const lines = new LinesAndColumns(string);
+			const index = Number(indexMatch[1]);
+			const location = lines.locationForIndex(index);
+
+			const codeFrame = codeFrameColumns(
+				string,
+				{start: {line: location.line + 1, column: location.column + 1}},
+				{highlightCode: true}
+			);
+
+			jsonError.codeFrame = codeFrame;
+		}
+
+		throw jsonError;
+	}
+};
+
+
+/***/ }),
+/* 436 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var util = __webpack_require__(29);
+var isArrayish = __webpack_require__(437);
+
+var errorEx = function errorEx(name, properties) {
+	if (!name || name.constructor !== String) {
+		properties = name || {};
+		name = Error.name;
+	}
+
+	var errorExError = function ErrorEXError(message) {
+		if (!this) {
+			return new ErrorEXError(message);
+		}
+
+		message = message instanceof Error
+			? message.message
+			: (message || this.message);
+
+		Error.call(this, message);
+		Error.captureStackTrace(this, errorExError);
+
+		this.name = name;
+
+		Object.defineProperty(this, 'message', {
+			configurable: true,
+			enumerable: false,
+			get: function () {
+				var newMessage = message.split(/\r?\n/g);
+
+				for (var key in properties) {
+					if (!properties.hasOwnProperty(key)) {
+						continue;
+					}
+
+					var modifier = properties[key];
+
+					if ('message' in modifier) {
+						newMessage = modifier.message(this[key], newMessage) || newMessage;
+						if (!isArrayish(newMessage)) {
+							newMessage = [newMessage];
+						}
+					}
+				}
+
+				return newMessage.join('\n');
+			},
+			set: function (v) {
+				message = v;
+			}
+		});
+
+		var stackDescriptor = Object.getOwnPropertyDescriptor(this, 'stack');
+		var stackGetter = stackDescriptor.get;
+		var stackValue = stackDescriptor.value;
+		delete stackDescriptor.value;
+		delete stackDescriptor.writable;
+
+		stackDescriptor.get = function () {
+			var stack = (stackGetter)
+				? stackGetter.call(this).split(/\r?\n+/g)
+				: stackValue.split(/\r?\n+/g);
+
+			// starting in Node 7, the stack builder caches the message.
+			// just replace it.
+			stack[0] = this.name + ': ' + this.message;
+
+			var lineCount = 1;
+			for (var key in properties) {
+				if (!properties.hasOwnProperty(key)) {
+					continue;
+				}
+
+				var modifier = properties[key];
+
+				if ('line' in modifier) {
+					var line = modifier.line(this[key]);
+					if (line) {
+						stack.splice(lineCount++, 0, '    ' + line);
+					}
+				}
+
+				if ('stack' in modifier) {
+					modifier.stack(this[key], stack);
+				}
+			}
+
+			return stack.join('\n');
+		};
+
+		Object.defineProperty(this, 'stack', stackDescriptor);
+	};
+
+	if (Object.setPrototypeOf) {
+		Object.setPrototypeOf(errorExError.prototype, Error.prototype);
+		Object.setPrototypeOf(errorExError, Error);
+	} else {
+		util.inherits(errorExError, Error);
+	}
+
+	return errorExError;
+};
+
+errorEx.append = function (str, def) {
+	return {
+		message: function (v, message) {
+			v = v || def;
+
+			if (v) {
+				message[0] += ' ' + str.replace('%s', v.toString());
+			}
+
+			return message;
+		}
+	};
+};
+
+errorEx.line = function (str, def) {
+	return {
+		line: function (v) {
+			v = v || def;
+
+			if (v) {
+				return str.replace('%s', v.toString());
+			}
+
+			return null;
+		}
+	};
+};
+
+module.exports = errorEx;
+
+
+/***/ }),
+/* 437 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = function isArrayish(obj) {
+	if (!obj) {
+		return false;
+	}
+
+	return obj instanceof Array || Array.isArray(obj) ||
+		(obj.length >= 0 && obj.splice instanceof Function);
+};
+
+
+/***/ }),
+/* 438 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = parseJson
+function parseJson (txt, reviver, context) {
+  context = context || 20
+  try {
+    return JSON.parse(txt, reviver)
+  } catch (e) {
+    const syntaxErr = e.message.match(/^Unexpected token.*position\s+(\d+)/i)
+    const errIdx = syntaxErr
+    ? +syntaxErr[1]
+    : e.message.match(/^Unexpected end of JSON.*/i)
+    ? txt.length - 1
+    : null
+    if (errIdx != null) {
+      const start = errIdx <= context
+      ? 0
+      : errIdx - context
+      const end = errIdx + context >= txt.length
+      ? txt.length
+      : errIdx + context
+      e.message += ` while parsing near '${
+        start === 0 ? '' : '...'
+      }${txt.slice(start, end)}${
+        end === txt.length ? '' : '...'
+      }'`
+    } else {
+      e.message += ` while parsing '${txt.slice(0, context * 2)}'`
+    }
+    throw e
+  }
+}
+
+
+/***/ }),
+/* 439 */
+/***/ (function(__webpack_module__, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+var LF = '\n';
+var CR = '\r';
+var LinesAndColumns = (function () {
+    function LinesAndColumns(string) {
+        this.string = string;
+        var offsets = [0];
+        for (var offset = 0; offset < string.length;) {
+            switch (string[offset]) {
+                case LF:
+                    offset += LF.length;
+                    offsets.push(offset);
+                    break;
+                case CR:
+                    offset += CR.length;
+                    if (string[offset] === LF) {
+                        offset += LF.length;
+                    }
+                    offsets.push(offset);
+                    break;
+                default:
+                    offset++;
+                    break;
+            }
+        }
+        this.offsets = offsets;
+    }
+    LinesAndColumns.prototype.locationForIndex = function (index) {
+        if (index < 0 || index > this.string.length) {
+            return null;
+        }
+        var line = 0;
+        var offsets = this.offsets;
+        while (offsets[line + 1] <= index) {
+            line++;
+        }
+        var column = index - offsets[line];
+        return { line: line, column: column };
+    };
+    LinesAndColumns.prototype.indexForLocation = function (location) {
+        var line = location.line, column = location.column;
+        if (line < 0 || line >= this.offsets.length) {
+            return null;
+        }
+        if (column < 0 || column > this.lengthOfLine(line)) {
+            return null;
+        }
+        return this.offsets[line] + column;
+    };
+    LinesAndColumns.prototype.lengthOfLine = function (line) {
+        var offset = this.offsets[line];
+        var nextOffset = line === this.offsets.length - 1 ? this.string.length : this.offsets[line + 1];
+        return nextOffset - offset;
+    };
+    return LinesAndColumns;
+}());
+/* harmony default export */ __webpack_exports__["default"] = (LinesAndColumns);
+
+
+/***/ }),
+/* 440 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.codeFrameColumns = codeFrameColumns;
+exports.default = _default;
+
+function _highlight() {
+  const data = _interopRequireWildcard(__webpack_require__(441));
+
+  _highlight = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+
+let deprecationWarningShown = false;
+
+function getDefs(chalk) {
+  return {
+    gutter: chalk.grey,
+    marker: chalk.red.bold,
+    message: chalk.red.bold
+  };
+}
+
+const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
+
+function getMarkerLines(loc, source, opts) {
+  const startLoc = Object.assign({
+    column: 0,
+    line: -1
+  }, loc.start);
+  const endLoc = Object.assign({}, startLoc, loc.end);
+  const {
+    linesAbove = 2,
+    linesBelow = 3
+  } = opts || {};
+  const startLine = startLoc.line;
+  const startColumn = startLoc.column;
+  const endLine = endLoc.line;
+  const endColumn = endLoc.column;
+  let start = Math.max(startLine - (linesAbove + 1), 0);
+  let end = Math.min(source.length, endLine + linesBelow);
+
+  if (startLine === -1) {
+    start = 0;
+  }
+
+  if (endLine === -1) {
+    end = source.length;
+  }
+
+  const lineDiff = endLine - startLine;
+  const markerLines = {};
+
+  if (lineDiff) {
+    for (let i = 0; i <= lineDiff; i++) {
+      const lineNumber = i + startLine;
+
+      if (!startColumn) {
+        markerLines[lineNumber] = true;
+      } else if (i === 0) {
+        const sourceLength = source[lineNumber - 1].length;
+        markerLines[lineNumber] = [startColumn, sourceLength - startColumn + 1];
+      } else if (i === lineDiff) {
+        markerLines[lineNumber] = [0, endColumn];
+      } else {
+        const sourceLength = source[lineNumber - i].length;
+        markerLines[lineNumber] = [0, sourceLength];
+      }
+    }
+  } else {
+    if (startColumn === endColumn) {
+      if (startColumn) {
+        markerLines[startLine] = [startColumn, 0];
+      } else {
+        markerLines[startLine] = true;
+      }
+    } else {
+      markerLines[startLine] = [startColumn, endColumn - startColumn];
+    }
+  }
+
+  return {
+    start,
+    end,
+    markerLines
+  };
+}
+
+function codeFrameColumns(rawLines, loc, opts = {}) {
+  const highlighted = (opts.highlightCode || opts.forceColor) && (0, _highlight().shouldHighlight)(opts);
+  const chalk = (0, _highlight().getChalk)(opts);
+  const defs = getDefs(chalk);
+
+  const maybeHighlight = (chalkFn, string) => {
+    return highlighted ? chalkFn(string) : string;
+  };
+
+  const lines = rawLines.split(NEWLINE);
+  const {
+    start,
+    end,
+    markerLines
+  } = getMarkerLines(loc, lines, opts);
+  const hasColumns = loc.start && typeof loc.start.column === "number";
+  const numberMaxWidth = String(end).length;
+  const highlightedLines = highlighted ? (0, _highlight().default)(rawLines, opts) : rawLines;
+  let frame = highlightedLines.split(NEWLINE).slice(start, end).map((line, index) => {
+    const number = start + 1 + index;
+    const paddedNumber = ` ${number}`.slice(-numberMaxWidth);
+    const gutter = ` ${paddedNumber} | `;
+    const hasMarker = markerLines[number];
+    const lastMarkerLine = !markerLines[number + 1];
+
+    if (hasMarker) {
+      let markerLine = "";
+
+      if (Array.isArray(hasMarker)) {
+        const markerSpacing = line.slice(0, Math.max(hasMarker[0] - 1, 0)).replace(/[^\t]/g, " ");
+        const numberOfMarkers = hasMarker[1] || 1;
+        markerLine = ["\n ", maybeHighlight(defs.gutter, gutter.replace(/\d/g, " ")), markerSpacing, maybeHighlight(defs.marker, "^").repeat(numberOfMarkers)].join("");
+
+        if (lastMarkerLine && opts.message) {
+          markerLine += " " + maybeHighlight(defs.message, opts.message);
+        }
+      }
+
+      return [maybeHighlight(defs.marker, ">"), maybeHighlight(defs.gutter, gutter), line, markerLine].join("");
+    } else {
+      return ` ${maybeHighlight(defs.gutter, gutter)}${line}`;
+    }
+  }).join("\n");
+
+  if (opts.message && !hasColumns) {
+    frame = `${" ".repeat(numberMaxWidth + 1)}${opts.message}\n${frame}`;
+  }
+
+  if (highlighted) {
+    return chalk.reset(frame);
+  } else {
+    return frame;
+  }
+}
+
+function _default(rawLines, lineNumber, colNumber, opts = {}) {
+  if (!deprecationWarningShown) {
+    deprecationWarningShown = true;
+    const message = "Passing lineNumber and colNumber is deprecated to @babel/code-frame. Please use `codeFrameColumns`.";
+
+    if (process.emitWarning) {
+      process.emitWarning(message, "DeprecationWarning");
+    } else {
+      const deprecationError = new Error(message);
+      deprecationError.name = "DeprecationWarning";
+      console.warn(new Error(message));
+    }
+  }
+
+  colNumber = Math.max(colNumber, 0);
+  const location = {
+    start: {
+      column: colNumber,
+      line: lineNumber
+    }
+  };
+  return codeFrameColumns(rawLines, location, opts);
+}
+
+/***/ }),
+/* 441 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldHighlight = shouldHighlight;
+exports.getChalk = getChalk;
+exports.default = highlight;
+
+function _jsTokens() {
+  const data = _interopRequireWildcard(__webpack_require__(442));
+
+  _jsTokens = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _esutils() {
+  const data = _interopRequireDefault(__webpack_require__(443));
+
+  _esutils = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _chalk() {
+  const data = _interopRequireDefault(__webpack_require__(447));
+
+  _chalk = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+
+function getDefs(chalk) {
+  return {
+    keyword: chalk.cyan,
+    capitalized: chalk.yellow,
+    jsx_tag: chalk.yellow,
+    punctuator: chalk.yellow,
+    number: chalk.magenta,
+    string: chalk.green,
+    regex: chalk.magenta,
+    comment: chalk.grey,
+    invalid: chalk.white.bgRed.bold
+  };
+}
+
+const NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
+const JSX_TAG = /^[a-z][\w-]*$/i;
+const BRACKET = /^[()[\]{}]$/;
+
+function getTokenType(match) {
+  const [offset, text] = match.slice(-2);
+  const token = (0, _jsTokens().matchToToken)(match);
+
+  if (token.type === "name") {
+    if (_esutils().default.keyword.isReservedWordES6(token.value)) {
+      return "keyword";
+    }
+
+    if (JSX_TAG.test(token.value) && (text[offset - 1] === "<" || text.substr(offset - 2, 2) == "</")) {
+      return "jsx_tag";
+    }
+
+    if (token.value[0] !== token.value[0].toLowerCase()) {
+      return "capitalized";
+    }
+  }
+
+  if (token.type === "punctuator" && BRACKET.test(token.value)) {
+    return "bracket";
+  }
+
+  if (token.type === "invalid" && (token.value === "@" || token.value === "#")) {
+    return "punctuator";
+  }
+
+  return token.type;
+}
+
+function highlightTokens(defs, text) {
+  return text.replace(_jsTokens().default, function (...args) {
+    const type = getTokenType(args);
+    const colorize = defs[type];
+
+    if (colorize) {
+      return args[0].split(NEWLINE).map(str => colorize(str)).join("\n");
+    } else {
+      return args[0];
+    }
+  });
+}
+
+function shouldHighlight(options) {
+  return _chalk().default.supportsColor || options.forceColor;
+}
+
+function getChalk(options) {
+  let chalk = _chalk().default;
+
+  if (options.forceColor) {
+    chalk = new (_chalk().default.constructor)({
+      enabled: true,
+      level: 1
+    });
+  }
+
+  return chalk;
+}
+
+function highlight(code, options = {}) {
+  if (shouldHighlight(options)) {
+    const chalk = getChalk(options);
+    const defs = getDefs(chalk);
+    return highlightTokens(defs, code);
+  } else {
+    return code;
+  }
+}
+
+/***/ }),
+/* 442 */
+/***/ (function(module, exports) {
+
+// Copyright 2014, 2015, 2016, 2017, 2018 Simon Lydell
+// License: MIT. (See LICENSE.)
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+})
+
+// This regex comes from regex.coffee, and is inserted here by generate-index.js
+// (run `npm run build`).
+exports.default = /((['"])(?:(?!\2|\\).|\\(?:\r\n|[\s\S]))*(\2)?|`(?:[^`\\$]|\\[\s\S]|\$(?!\{)|\$\{(?:[^{}]|\{[^}]*\}?)*\}?)*(`)?)|(\/\/.*)|(\/\*(?:[^*]|\*(?!\/))*(\*\/)?)|(\/(?!\*)(?:\[(?:(?![\]\\]).|\\.)*\]|(?![\/\]\\]).|\\.)+\/(?:(?!\s*(?:\b|[\u0080-\uFFFF$\\'"~({]|[+\-!](?!=)|\.?\d))|[gmiyus]{1,6}\b(?![\u0080-\uFFFF$\\]|\s*(?:[+\-*%&|^<>!=?({]|\/(?![\/*])))))|(0[xX][\da-fA-F]+|0[oO][0-7]+|0[bB][01]+|(?:\d*\.\d+|\d+\.?)(?:[eE][+-]?\d+)?)|((?!\d)(?:(?!\s)[$\w\u0080-\uFFFF]|\\u[\da-fA-F]{4}|\\u\{[\da-fA-F]+\})+)|(--|\+\+|&&|\|\||=>|\.{3}|(?:[+\-\/%&|^]|\*{1,2}|<{1,2}|>{1,3}|!=?|={1,2})=?|[?~.,:;[\](){}])|(\s+)|(^$|[\s\S])/g
+
+exports.matchToToken = function(match) {
+  var token = {type: "invalid", value: match[0], closed: undefined}
+       if (match[ 1]) token.type = "string" , token.closed = !!(match[3] || match[4])
+  else if (match[ 5]) token.type = "comment"
+  else if (match[ 6]) token.type = "comment", token.closed = !!match[7]
+  else if (match[ 8]) token.type = "regex"
+  else if (match[ 9]) token.type = "number"
+  else if (match[10]) token.type = "name"
+  else if (match[11]) token.type = "punctuator"
+  else if (match[12]) token.type = "whitespace"
+  return token
+}
+
+
+/***/ }),
+/* 443 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*
+  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+(function () {
+    'use strict';
+
+    exports.ast = __webpack_require__(444);
+    exports.code = __webpack_require__(445);
+    exports.keyword = __webpack_require__(446);
+}());
+/* vim: set sw=4 ts=4 et tw=80 : */
+
+
+/***/ }),
+/* 444 */
+/***/ (function(module, exports) {
+
+/*
+  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+(function () {
+    'use strict';
+
+    function isExpression(node) {
+        if (node == null) { return false; }
+        switch (node.type) {
+            case 'ArrayExpression':
+            case 'AssignmentExpression':
+            case 'BinaryExpression':
+            case 'CallExpression':
+            case 'ConditionalExpression':
+            case 'FunctionExpression':
+            case 'Identifier':
+            case 'Literal':
+            case 'LogicalExpression':
+            case 'MemberExpression':
+            case 'NewExpression':
+            case 'ObjectExpression':
+            case 'SequenceExpression':
+            case 'ThisExpression':
+            case 'UnaryExpression':
+            case 'UpdateExpression':
+                return true;
+        }
+        return false;
+    }
+
+    function isIterationStatement(node) {
+        if (node == null) { return false; }
+        switch (node.type) {
+            case 'DoWhileStatement':
+            case 'ForInStatement':
+            case 'ForStatement':
+            case 'WhileStatement':
+                return true;
+        }
+        return false;
+    }
+
+    function isStatement(node) {
+        if (node == null) { return false; }
+        switch (node.type) {
+            case 'BlockStatement':
+            case 'BreakStatement':
+            case 'ContinueStatement':
+            case 'DebuggerStatement':
+            case 'DoWhileStatement':
+            case 'EmptyStatement':
+            case 'ExpressionStatement':
+            case 'ForInStatement':
+            case 'ForStatement':
+            case 'IfStatement':
+            case 'LabeledStatement':
+            case 'ReturnStatement':
+            case 'SwitchStatement':
+            case 'ThrowStatement':
+            case 'TryStatement':
+            case 'VariableDeclaration':
+            case 'WhileStatement':
+            case 'WithStatement':
+                return true;
+        }
+        return false;
+    }
+
+    function isSourceElement(node) {
+      return isStatement(node) || node != null && node.type === 'FunctionDeclaration';
+    }
+
+    function trailingStatement(node) {
+        switch (node.type) {
+        case 'IfStatement':
+            if (node.alternate != null) {
+                return node.alternate;
+            }
+            return node.consequent;
+
+        case 'LabeledStatement':
+        case 'ForStatement':
+        case 'ForInStatement':
+        case 'WhileStatement':
+        case 'WithStatement':
+            return node.body;
+        }
+        return null;
+    }
+
+    function isProblematicIfStatement(node) {
+        var current;
+
+        if (node.type !== 'IfStatement') {
+            return false;
+        }
+        if (node.alternate == null) {
+            return false;
+        }
+        current = node.consequent;
+        do {
+            if (current.type === 'IfStatement') {
+                if (current.alternate == null)  {
+                    return true;
+                }
+            }
+            current = trailingStatement(current);
+        } while (current);
+
+        return false;
+    }
+
+    module.exports = {
+        isExpression: isExpression,
+        isStatement: isStatement,
+        isIterationStatement: isIterationStatement,
+        isSourceElement: isSourceElement,
+        isProblematicIfStatement: isProblematicIfStatement,
+
+        trailingStatement: trailingStatement
+    };
+}());
+/* vim: set sw=4 ts=4 et tw=80 : */
+
+
+/***/ }),
+/* 445 */
+/***/ (function(module, exports) {
+
+/*
+  Copyright (C) 2013-2014 Yusuke Suzuki <utatane.tea@gmail.com>
+  Copyright (C) 2014 Ivan Nikulin <ifaaan@gmail.com>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+(function () {
+    'use strict';
+
+    var ES6Regex, ES5Regex, NON_ASCII_WHITESPACES, IDENTIFIER_START, IDENTIFIER_PART, ch;
+
+    // See `tools/generate-identifier-regex.js`.
+    ES5Regex = {
+        // ECMAScript 5.1/Unicode v7.0.0 NonAsciiIdentifierStart:
+        NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B2\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/,
+        // ECMAScript 5.1/Unicode v7.0.0 NonAsciiIdentifierPart:
+        NonAsciiIdentifierPart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/
+    };
+
+    ES6Regex = {
+        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierStart:
+        NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B2\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDE00-\uDE11\uDE13-\uDE2B\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDE00-\uDE2F\uDE44\uDE80-\uDEAA]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF98]|\uD809[\uDC00-\uDC6E]|[\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D]|\uD87E[\uDC00-\uDE1D]/,
+        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierPart:
+        NonAsciiIdentifierPart: /[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDD0-\uDDDA\uDE00-\uDE11\uDE13-\uDE37\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF01-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF98]|\uD809[\uDC00-\uDC6E]|[\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/
+    };
+
+    function isDecimalDigit(ch) {
+        return 0x30 <= ch && ch <= 0x39;  // 0..9
+    }
+
+    function isHexDigit(ch) {
+        return 0x30 <= ch && ch <= 0x39 ||  // 0..9
+            0x61 <= ch && ch <= 0x66 ||     // a..f
+            0x41 <= ch && ch <= 0x46;       // A..F
+    }
+
+    function isOctalDigit(ch) {
+        return ch >= 0x30 && ch <= 0x37;  // 0..7
+    }
+
+    // 7.2 White Space
+
+    NON_ASCII_WHITESPACES = [
+        0x1680, 0x180E,
+        0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A,
+        0x202F, 0x205F,
+        0x3000,
+        0xFEFF
+    ];
+
+    function isWhiteSpace(ch) {
+        return ch === 0x20 || ch === 0x09 || ch === 0x0B || ch === 0x0C || ch === 0xA0 ||
+            ch >= 0x1680 && NON_ASCII_WHITESPACES.indexOf(ch) >= 0;
+    }
+
+    // 7.3 Line Terminators
+
+    function isLineTerminator(ch) {
+        return ch === 0x0A || ch === 0x0D || ch === 0x2028 || ch === 0x2029;
+    }
+
+    // 7.6 Identifier Names and Identifiers
+
+    function fromCodePoint(cp) {
+        if (cp <= 0xFFFF) { return String.fromCharCode(cp); }
+        var cu1 = String.fromCharCode(Math.floor((cp - 0x10000) / 0x400) + 0xD800);
+        var cu2 = String.fromCharCode(((cp - 0x10000) % 0x400) + 0xDC00);
+        return cu1 + cu2;
+    }
+
+    IDENTIFIER_START = new Array(0x80);
+    for(ch = 0; ch < 0x80; ++ch) {
+        IDENTIFIER_START[ch] =
+            ch >= 0x61 && ch <= 0x7A ||  // a..z
+            ch >= 0x41 && ch <= 0x5A ||  // A..Z
+            ch === 0x24 || ch === 0x5F;  // $ (dollar) and _ (underscore)
+    }
+
+    IDENTIFIER_PART = new Array(0x80);
+    for(ch = 0; ch < 0x80; ++ch) {
+        IDENTIFIER_PART[ch] =
+            ch >= 0x61 && ch <= 0x7A ||  // a..z
+            ch >= 0x41 && ch <= 0x5A ||  // A..Z
+            ch >= 0x30 && ch <= 0x39 ||  // 0..9
+            ch === 0x24 || ch === 0x5F;  // $ (dollar) and _ (underscore)
+    }
+
+    function isIdentifierStartES5(ch) {
+        return ch < 0x80 ? IDENTIFIER_START[ch] : ES5Regex.NonAsciiIdentifierStart.test(fromCodePoint(ch));
+    }
+
+    function isIdentifierPartES5(ch) {
+        return ch < 0x80 ? IDENTIFIER_PART[ch] : ES5Regex.NonAsciiIdentifierPart.test(fromCodePoint(ch));
+    }
+
+    function isIdentifierStartES6(ch) {
+        return ch < 0x80 ? IDENTIFIER_START[ch] : ES6Regex.NonAsciiIdentifierStart.test(fromCodePoint(ch));
+    }
+
+    function isIdentifierPartES6(ch) {
+        return ch < 0x80 ? IDENTIFIER_PART[ch] : ES6Regex.NonAsciiIdentifierPart.test(fromCodePoint(ch));
+    }
+
+    module.exports = {
+        isDecimalDigit: isDecimalDigit,
+        isHexDigit: isHexDigit,
+        isOctalDigit: isOctalDigit,
+        isWhiteSpace: isWhiteSpace,
+        isLineTerminator: isLineTerminator,
+        isIdentifierStartES5: isIdentifierStartES5,
+        isIdentifierPartES5: isIdentifierPartES5,
+        isIdentifierStartES6: isIdentifierStartES6,
+        isIdentifierPartES6: isIdentifierPartES6
+    };
+}());
+/* vim: set sw=4 ts=4 et tw=80 : */
+
+
+/***/ }),
+/* 446 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*
+  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+(function () {
+    'use strict';
+
+    var code = __webpack_require__(445);
+
+    function isStrictModeReservedWordES6(id) {
+        switch (id) {
+        case 'implements':
+        case 'interface':
+        case 'package':
+        case 'private':
+        case 'protected':
+        case 'public':
+        case 'static':
+        case 'let':
+            return true;
+        default:
+            return false;
+        }
+    }
+
+    function isKeywordES5(id, strict) {
+        // yield should not be treated as keyword under non-strict mode.
+        if (!strict && id === 'yield') {
+            return false;
+        }
+        return isKeywordES6(id, strict);
+    }
+
+    function isKeywordES6(id, strict) {
+        if (strict && isStrictModeReservedWordES6(id)) {
+            return true;
+        }
+
+        switch (id.length) {
+        case 2:
+            return (id === 'if') || (id === 'in') || (id === 'do');
+        case 3:
+            return (id === 'var') || (id === 'for') || (id === 'new') || (id === 'try');
+        case 4:
+            return (id === 'this') || (id === 'else') || (id === 'case') ||
+                (id === 'void') || (id === 'with') || (id === 'enum');
+        case 5:
+            return (id === 'while') || (id === 'break') || (id === 'catch') ||
+                (id === 'throw') || (id === 'const') || (id === 'yield') ||
+                (id === 'class') || (id === 'super');
+        case 6:
+            return (id === 'return') || (id === 'typeof') || (id === 'delete') ||
+                (id === 'switch') || (id === 'export') || (id === 'import');
+        case 7:
+            return (id === 'default') || (id === 'finally') || (id === 'extends');
+        case 8:
+            return (id === 'function') || (id === 'continue') || (id === 'debugger');
+        case 10:
+            return (id === 'instanceof');
+        default:
+            return false;
+        }
+    }
+
+    function isReservedWordES5(id, strict) {
+        return id === 'null' || id === 'true' || id === 'false' || isKeywordES5(id, strict);
+    }
+
+    function isReservedWordES6(id, strict) {
+        return id === 'null' || id === 'true' || id === 'false' || isKeywordES6(id, strict);
+    }
+
+    function isRestrictedWord(id) {
+        return id === 'eval' || id === 'arguments';
+    }
+
+    function isIdentifierNameES5(id) {
+        var i, iz, ch;
+
+        if (id.length === 0) { return false; }
+
+        ch = id.charCodeAt(0);
+        if (!code.isIdentifierStartES5(ch)) {
+            return false;
+        }
+
+        for (i = 1, iz = id.length; i < iz; ++i) {
+            ch = id.charCodeAt(i);
+            if (!code.isIdentifierPartES5(ch)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    function decodeUtf16(lead, trail) {
+        return (lead - 0xD800) * 0x400 + (trail - 0xDC00) + 0x10000;
+    }
+
+    function isIdentifierNameES6(id) {
+        var i, iz, ch, lowCh, check;
+
+        if (id.length === 0) { return false; }
+
+        check = code.isIdentifierStartES6;
+        for (i = 0, iz = id.length; i < iz; ++i) {
+            ch = id.charCodeAt(i);
+            if (0xD800 <= ch && ch <= 0xDBFF) {
+                ++i;
+                if (i >= iz) { return false; }
+                lowCh = id.charCodeAt(i);
+                if (!(0xDC00 <= lowCh && lowCh <= 0xDFFF)) {
+                    return false;
+                }
+                ch = decodeUtf16(ch, lowCh);
+            }
+            if (!check(ch)) {
+                return false;
+            }
+            check = code.isIdentifierPartES6;
+        }
+        return true;
+    }
+
+    function isIdentifierES5(id, strict) {
+        return isIdentifierNameES5(id) && !isReservedWordES5(id, strict);
+    }
+
+    function isIdentifierES6(id, strict) {
+        return isIdentifierNameES6(id) && !isReservedWordES6(id, strict);
+    }
+
+    module.exports = {
+        isKeywordES5: isKeywordES5,
+        isKeywordES6: isKeywordES6,
+        isReservedWordES5: isReservedWordES5,
+        isReservedWordES6: isReservedWordES6,
+        isRestrictedWord: isRestrictedWord,
+        isIdentifierNameES5: isIdentifierNameES5,
+        isIdentifierNameES6: isIdentifierNameES6,
+        isIdentifierES5: isIdentifierES5,
+        isIdentifierES6: isIdentifierES6
+    };
+}());
+/* vim: set sw=4 ts=4 et tw=80 : */
+
+
+/***/ }),
+/* 447 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const escapeStringRegexp = __webpack_require__(3);
+const ansiStyles = __webpack_require__(448);
+const stdoutColor = __webpack_require__(449).stdout;
+
+const template = __webpack_require__(450);
+
+const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
+
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
+
+// `color-convert` models to exclude from the Chalk API due to conflicts and such
+const skipModels = new Set(['gray']);
+
+const styles = Object.create(null);
+
+function applyOptions(obj, options) {
+	options = options || {};
+
+	// Detect level if not set manually
+	const scLevel = stdoutColor ? stdoutColor.level : 0;
+	obj.level = options.level === undefined ? scLevel : options.level;
+	obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0;
+}
+
+function Chalk(options) {
+	// We check for this.template here since calling `chalk.constructor()`
+	// by itself will have a `this` of a previously constructed chalk object
+	if (!this || !(this instanceof Chalk) || this.template) {
+		const chalk = {};
+		applyOptions(chalk, options);
+
+		chalk.template = function () {
+			const args = [].slice.call(arguments);
+			return chalkTag.apply(null, [chalk.template].concat(args));
+		};
+
+		Object.setPrototypeOf(chalk, Chalk.prototype);
+		Object.setPrototypeOf(chalk.template, chalk);
+
+		chalk.template.constructor = Chalk;
+
+		return chalk.template;
+	}
+
+	applyOptions(this, options);
+}
+
+// Use bright blue on Windows as the normal blue color is illegible
+if (isSimpleWindowsTerm) {
+	ansiStyles.blue.open = '\u001B[94m';
+}
+
+for (const key of Object.keys(ansiStyles)) {
+	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
+
+	styles[key] = {
+		get() {
+			const codes = ansiStyles[key];
+			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
+		}
+	};
+}
+
+styles.visible = {
+	get() {
+		return build.call(this, this._styles || [], true, 'visible');
+	}
+};
+
+ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
+for (const model of Object.keys(ansiStyles.color.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
+
+	styles[model] = {
+		get() {
+			const level = this.level;
+			return function () {
+				const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments);
+				const codes = {
+					open,
+					close: ansiStyles.color.close,
+					closeRe: ansiStyles.color.closeRe
+				};
+				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
+			};
+		}
+	};
+}
+
+ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
+for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
+
+	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
+	styles[bgModel] = {
+		get() {
+			const level = this.level;
+			return function () {
+				const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments);
+				const codes = {
+					open,
+					close: ansiStyles.bgColor.close,
+					closeRe: ansiStyles.bgColor.closeRe
+				};
+				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
+			};
+		}
+	};
+}
+
+const proto = Object.defineProperties(() => {}, styles);
+
+function build(_styles, _empty, key) {
+	const builder = function () {
+		return applyStyle.apply(builder, arguments);
+	};
+
+	builder._styles = _styles;
+	builder._empty = _empty;
+
+	const self = this;
+
+	Object.defineProperty(builder, 'level', {
+		enumerable: true,
+		get() {
+			return self.level;
+		},
+		set(level) {
+			self.level = level;
+		}
+	});
+
+	Object.defineProperty(builder, 'enabled', {
+		enumerable: true,
+		get() {
+			return self.enabled;
+		},
+		set(enabled) {
+			self.enabled = enabled;
+		}
+	});
+
+	// See below for fix regarding invisible grey/dim combination on Windows
+	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
+
+	// `__proto__` is used because we must return a function, but there is
+	// no way to create a function with a different prototype
+	builder.__proto__ = proto; // eslint-disable-line no-proto
+
+	return builder;
+}
+
+function applyStyle() {
+	// Support varags, but simply cast to string in case there's only one arg
+	const args = arguments;
+	const argsLen = args.length;
+	let str = String(arguments[0]);
+
+	if (argsLen === 0) {
+		return '';
+	}
+
+	if (argsLen > 1) {
+		// Don't slice `arguments`, it prevents V8 optimizations
+		for (let a = 1; a < argsLen; a++) {
+			str += ' ' + args[a];
+		}
+	}
+
+	if (!this.enabled || this.level <= 0 || !str) {
+		return this._empty ? '' : str;
+	}
+
+	// Turns out that on Windows dimmed gray text becomes invisible in cmd.exe,
+	// see https://github.com/chalk/chalk/issues/58
+	// If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop.
+	const originalDim = ansiStyles.dim.open;
+	if (isSimpleWindowsTerm && this.hasGrey) {
+		ansiStyles.dim.open = '';
+	}
+
+	for (const code of this._styles.slice().reverse()) {
+		// Replace any instances already present with a re-opening code
+		// otherwise only the part of the string until said closing code
+		// will be colored, and the rest will simply be 'plain'.
+		str = code.open + str.replace(code.closeRe, code.open) + code.close;
+
+		// Close the styling before a linebreak and reopen
+		// after next line to fix a bleed issue on macOS
+		// https://github.com/chalk/chalk/pull/92
+		str = str.replace(/\r?\n/g, `${code.close}$&${code.open}`);
+	}
+
+	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
+	ansiStyles.dim.open = originalDim;
+
+	return str;
+}
+
+function chalkTag(chalk, strings) {
+	if (!Array.isArray(strings)) {
+		// If chalk() was called by itself or with a string,
+		// return the string itself as a string.
+		return [].slice.call(arguments, 1).join(' ');
+	}
+
+	const args = [].slice.call(arguments, 2);
+	const parts = [strings.raw[0]];
+
+	for (let i = 1; i < strings.length; i++) {
+		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
+		parts.push(String(strings.raw[i]));
+	}
+
+	return template(chalk, parts.join(''));
+}
+
+Object.defineProperties(Chalk.prototype, styles);
+
+module.exports = Chalk(); // eslint-disable-line new-cap
+module.exports.supportsColor = stdoutColor;
+module.exports.default = module.exports; // For TypeScript
+
+
+/***/ }),
+/* 448 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
+const colorConvert = __webpack_require__(6);
+
+const wrapAnsi16 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${code + offset}m`;
+};
+
+const wrapAnsi256 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${38 + offset};5;${code}m`;
+};
+
+const wrapAnsi16m = (fn, offset) => function () {
+	const rgb = fn.apply(colorConvert, arguments);
+	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
+};
+
+function assembleStyles() {
+	const codes = new Map();
+	const styles = {
+		modifier: {
+			reset: [0, 0],
+			// 21 isn't widely supported and 22 does the same thing
+			bold: [1, 22],
+			dim: [2, 22],
+			italic: [3, 23],
+			underline: [4, 24],
+			inverse: [7, 27],
+			hidden: [8, 28],
+			strikethrough: [9, 29]
+		},
+		color: {
+			black: [30, 39],
+			red: [31, 39],
+			green: [32, 39],
+			yellow: [33, 39],
+			blue: [34, 39],
+			magenta: [35, 39],
+			cyan: [36, 39],
+			white: [37, 39],
+			gray: [90, 39],
+
+			// Bright color
+			redBright: [91, 39],
+			greenBright: [92, 39],
+			yellowBright: [93, 39],
+			blueBright: [94, 39],
+			magentaBright: [95, 39],
+			cyanBright: [96, 39],
+			whiteBright: [97, 39]
+		},
+		bgColor: {
+			bgBlack: [40, 49],
+			bgRed: [41, 49],
+			bgGreen: [42, 49],
+			bgYellow: [43, 49],
+			bgBlue: [44, 49],
+			bgMagenta: [45, 49],
+			bgCyan: [46, 49],
+			bgWhite: [47, 49],
+
+			// Bright color
+			bgBlackBright: [100, 49],
+			bgRedBright: [101, 49],
+			bgGreenBright: [102, 49],
+			bgYellowBright: [103, 49],
+			bgBlueBright: [104, 49],
+			bgMagentaBright: [105, 49],
+			bgCyanBright: [106, 49],
+			bgWhiteBright: [107, 49]
+		}
+	};
+
+	// Fix humans
+	styles.color.grey = styles.color.gray;
+
+	for (const groupName of Object.keys(styles)) {
+		const group = styles[groupName];
+
+		for (const styleName of Object.keys(group)) {
+			const style = group[styleName];
+
+			styles[styleName] = {
+				open: `\u001B[${style[0]}m`,
+				close: `\u001B[${style[1]}m`
+			};
+
+			group[styleName] = styles[styleName];
+
+			codes.set(style[0], style[1]);
+		}
+
+		Object.defineProperty(styles, groupName, {
+			value: group,
+			enumerable: false
+		});
+
+		Object.defineProperty(styles, 'codes', {
+			value: codes,
+			enumerable: false
+		});
+	}
+
+	const ansi2ansi = n => n;
+	const rgb2rgb = (r, g, b) => [r, g, b];
+
+	styles.color.close = '\u001B[39m';
+	styles.bgColor.close = '\u001B[49m';
+
+	styles.color.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 0)
+	};
+	styles.color.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 0)
+	};
+	styles.color.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 0)
+	};
+
+	styles.bgColor.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 10)
+	};
+
+	for (let key of Object.keys(colorConvert)) {
+		if (typeof colorConvert[key] !== 'object') {
+			continue;
+		}
+
+		const suite = colorConvert[key];
+
+		if (key === 'ansi16') {
+			key = 'ansi';
+		}
+
+		if ('ansi16' in suite) {
+			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
+			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
+		}
+
+		if ('ansi256' in suite) {
+			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
+			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
+		}
+
+		if ('rgb' in suite) {
+			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
+			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
+		}
+	}
+
+	return styles;
+}
+
+// Make the export immutable
+Object.defineProperty(module, 'exports', {
+	enumerable: true,
+	get: assembleStyles
+});
+
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
+
+/***/ }),
+/* 449 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const os = __webpack_require__(11);
+const hasFlag = __webpack_require__(12);
+
+const env = process.env;
+
+let forceColor;
+if (hasFlag('no-color') ||
+	hasFlag('no-colors') ||
+	hasFlag('color=false')) {
+	forceColor = false;
+} else if (hasFlag('color') ||
+	hasFlag('colors') ||
+	hasFlag('color=true') ||
+	hasFlag('color=always')) {
+	forceColor = true;
+}
+if ('FORCE_COLOR' in env) {
+	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+}
+
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
+
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+}
+
+function supportsColor(stream) {
+	if (forceColor === false) {
+		return 0;
+	}
+
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
+
+	if (hasFlag('color=256')) {
+		return 2;
+	}
+
+	if (stream && !stream.isTTY && forceColor !== true) {
+		// VS code debugger doesn't have isTTY set
+		if (env.VSCODE_PID) {
+			return 1;
+		}
+		return 0;
+	}
+
+	const min = forceColor ? 1 : 0;
+
+	if (process.platform === 'win32') {
+		// Node.js 7.5.0 is the first version of Node.js to include a patch to
+		// libuv that enables 256 color output on Windows. Anything earlier and it
+		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
+		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
+		// release that supports 256 colors. Windows 10 build 14931 is the first release
+		// that supports 16m/TrueColor.
+		const osRelease = os.release().split('.');
+		if (
+			Number(process.versions.node.split('.')[0]) >= 8 &&
+			Number(osRelease[0]) >= 10 &&
+			Number(osRelease[2]) >= 10586
+		) {
+			return Number(osRelease[2]) >= 14931 ? 3 : 2;
+		}
+
+		return 1;
+	}
+
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
+
+		return min;
+	}
+
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
+
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
+
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+
+		switch (env.TERM_PROGRAM) {
+			case 'iTerm.app':
+				return version >= 3 ? 3 : 2;
+			case 'Apple_Terminal':
+				return 2;
+			// No default
+		}
+	}
+
+	if (/-256(color)?$/i.test(env.TERM)) {
+		return 2;
+	}
+
+	if (/^screen|^xterm|^vt100|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
+
+	if ('COLORTERM' in env) {
+		return 1;
+	}
+
+	if (env.TERM === 'dumb') {
+		return min;
+	}
+
+	return min;
+}
+
+function getSupportLevel(stream) {
+	const level = supportsColor(stream);
+	return translateLevel(level);
+}
+
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
+};
+
+
+/***/ }),
+/* 450 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
+const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
+const STRING_REGEX = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/;
+const ESCAPE_REGEX = /\\(u[a-f\d]{4}|x[a-f\d]{2}|.)|([^\\])/gi;
+
+const ESCAPES = new Map([
+	['n', '\n'],
+	['r', '\r'],
+	['t', '\t'],
+	['b', '\b'],
+	['f', '\f'],
+	['v', '\v'],
+	['0', '\0'],
+	['\\', '\\'],
+	['e', '\u001B'],
+	['a', '\u0007']
+]);
+
+function unescape(c) {
+	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
+		return String.fromCharCode(parseInt(c.slice(1), 16));
+	}
+
+	return ESCAPES.get(c) || c;
+}
+
+function parseArguments(name, args) {
+	const results = [];
+	const chunks = args.trim().split(/\s*,\s*/g);
+	let matches;
+
+	for (const chunk of chunks) {
+		if (!isNaN(chunk)) {
+			results.push(Number(chunk));
+		} else if ((matches = chunk.match(STRING_REGEX))) {
+			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, chr) => escape ? unescape(escape) : chr));
+		} else {
+			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
+		}
+	}
+
+	return results;
+}
+
+function parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
+
+	const results = [];
+	let matches;
+
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
+
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
+
+	return results;
+}
+
+function buildStyle(chalk, styles) {
+	const enabled = {};
+
+	for (const layer of styles) {
+		for (const style of layer.styles) {
+			enabled[style[0]] = layer.inverse ? null : style.slice(1);
+		}
+	}
+
+	let current = chalk;
+	for (const styleName of Object.keys(enabled)) {
+		if (Array.isArray(enabled[styleName])) {
+			if (!(styleName in current)) {
+				throw new Error(`Unknown Chalk style: ${styleName}`);
+			}
+
+			if (enabled[styleName].length > 0) {
+				current = current[styleName].apply(current, enabled[styleName]);
+			} else {
+				current = current[styleName];
+			}
+		}
+	}
+
+	return current;
+}
+
+module.exports = (chalk, tmp) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
+
+	// eslint-disable-next-line max-params
+	tmp.replace(TEMPLATE_REGEX, (m, escapeChar, inverse, style, close, chr) => {
+		if (escapeChar) {
+			chunk.push(unescape(escapeChar));
+		} else if (style) {
+			const str = chunk.join('');
+			chunk = [];
+			chunks.push(styles.length === 0 ? str : buildStyle(chalk, styles)(str));
+			styles.push({inverse, styles: parseStyle(style)});
+		} else if (close) {
+			if (styles.length === 0) {
+				throw new Error('Found extraneous } in Chalk template literal');
+			}
+
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
+		} else {
+			chunk.push(chr);
+		}
+	});
+
+	chunks.push(chunk.join(''));
+
+	if (styles.length > 0) {
+		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMsg);
+	}
+
+	return chunks.join('');
+};
+
+
+/***/ }),
+/* 451 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+var kbn_client_1 = __webpack_require__(452);
+exports.KbnClient = kbn_client_1.KbnClient;
+var kbn_client_requester_1 = __webpack_require__(453);
+exports.uriencode = kbn_client_requester_1.uriencode;
+
+
+/***/ }),
+/* 452 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const kbn_client_requester_1 = __webpack_require__(453);
+const kbn_client_status_1 = __webpack_require__(495);
+const kbn_client_plugins_1 = __webpack_require__(496);
+const kbn_client_version_1 = __webpack_require__(497);
+const kbn_client_saved_objects_1 = __webpack_require__(498);
+const kbn_client_ui_settings_1 = __webpack_require__(499);
+class KbnClient {
+    /**
+     * Basic Kibana server client that implements common behaviors for talking
+     * to the Kibana server from dev tooling.
+     *
+     * @param log ToolingLog
+     * @param kibanaUrls Array of kibana server urls to send requests to
+     * @param uiSettingDefaults Map of uiSetting values that will be merged with all uiSetting resets
+     */
+    constructor(log, kibanaUrls, uiSettingDefaults) {
+        this.log = log;
+        this.kibanaUrls = kibanaUrls;
+        this.uiSettingDefaults = uiSettingDefaults;
+        this.requester = new kbn_client_requester_1.KbnClientRequester(this.log, this.kibanaUrls);
+        this.status = new kbn_client_status_1.KbnClientStatus(this.requester);
+        this.plugins = new kbn_client_plugins_1.KbnClientPlugins(this.status);
+        this.version = new kbn_client_version_1.KbnClientVersion(this.status);
+        this.savedObjects = new kbn_client_saved_objects_1.KbnClientSavedObjects(this.log, this.requester);
+        this.uiSettings = new kbn_client_ui_settings_1.KbnClientUiSettings(this.log, this.requester, this.uiSettingDefaults);
+        if (!kibanaUrls.length) {
+            throw new Error('missing Kibana urls');
+        }
+    }
+    /**
+     * Make a direct request to the Kibana server
+     */
+    async request(options) {
+        return await this.requester.request(options);
+    }
+    resolveUrl(relativeUrl) {
+        return this.requester.resolveUrl(relativeUrl);
+    }
+}
+exports.KbnClient = KbnClient;
+
+
+/***/ }),
+/* 453 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+const url_1 = tslib_1.__importDefault(__webpack_require__(454));
+const axios_1 = tslib_1.__importDefault(__webpack_require__(455));
+const axios_2 = __webpack_require__(493);
+const isConcliftOnGetError = (error) => {
+    return (axios_2.isAxiosResponseError(error) && error.config.method === 'GET' && error.response.status === 409);
+};
+exports.uriencode = (strings, ...values) => {
+    const queue = strings.slice();
+    if (queue.length === 0) {
+        throw new Error('how could strings passed to `uriencode` template tag be empty?');
+    }
+    if (queue.length !== values.length + 1) {
+        throw new Error('strings and values passed to `uriencode` template tag are unbalanced');
+    }
+    // pull the first string off the queue, there is one less item in `values`
+    // since the values are always wrapped in strings, so we shift the extra string
+    // off the queue to balance the queue and values array.
+    const leadingString = queue.shift();
+    return queue.reduce((acc, string, i) => `${acc}${encodeURIComponent(values[i])}${string}`, leadingString);
+};
+const DEFAULT_MAX_ATTEMPTS = 5;
+const delay = (ms) => new Promise(resolve => {
+    setTimeout(resolve, ms);
+});
+class KbnClientRequester {
+    constructor(log, kibanaUrls) {
+        this.log = log;
+        this.kibanaUrls = kibanaUrls;
+    }
+    pickUrl() {
+        const url = this.kibanaUrls.shift();
+        this.kibanaUrls.push(url);
+        return url;
+    }
+    resolveUrl(relativeUrl = '/') {
+        return url_1.default.resolve(this.pickUrl(), relativeUrl);
+    }
+    async request(options) {
+        var _a;
+        const url = url_1.default.resolve(this.pickUrl(), options.path);
+        const description = options.description || `${options.method} ${url}`;
+        let attempt = 0;
+        const maxAttempts = (_a = options.retries, (_a !== null && _a !== void 0 ? _a : DEFAULT_MAX_ATTEMPTS));
+        while (true) {
+            attempt += 1;
+            try {
+                const response = await axios_1.default.request({
+                    method: options.method,
+                    url,
+                    data: options.body,
+                    params: options.query,
+                    headers: {
+                        'kbn-xsrf': 'kbn-client',
+                    },
+                });
+                return response.data;
+            }
+            catch (error) {
+                const conflictOnGet = isConcliftOnGetError(error);
+                const requestedRetries = options.retries !== undefined;
+                const failedToGetResponse = axios_2.isAxiosRequestError(error);
+                let errorMessage;
+                if (conflictOnGet) {
+                    errorMessage = `Conflict on GET (path=${options.path}, attempt=${attempt}/${maxAttempts})`;
+                    this.log.error(errorMessage);
+                }
+                else if (requestedRetries || failedToGetResponse) {
+                    errorMessage = `[${description}] request failed (attempt=${attempt}/${maxAttempts})`;
+                    this.log.error(errorMessage);
+                }
+                else {
+                    throw error;
+                }
+                if (attempt < maxAttempts) {
+                    await delay(1000 * attempt);
+                    continue;
+                }
+                throw new Error(`${errorMessage} -- and ran out of retries`);
+            }
+        }
+    }
+}
+exports.KbnClientRequester = KbnClientRequester;
+
+
+/***/ }),
+/* 454 */
+/***/ (function(module, exports) {
+
+module.exports = require("url");
+
+/***/ }),
+/* 455 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(456);
+
+/***/ }),
+/* 456 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+var bind = __webpack_require__(458);
+var Axios = __webpack_require__(460);
+var defaults = __webpack_require__(461);
+
+/**
+ * Create an instance of Axios
+ *
+ * @param {Object} defaultConfig The default config for the instance
+ * @return {Axios} A new instance of Axios
+ */
+function createInstance(defaultConfig) {
+  var context = new Axios(defaultConfig);
+  var instance = bind(Axios.prototype.request, context);
+
+  // Copy axios.prototype to instance
+  utils.extend(instance, Axios.prototype, context);
+
+  // Copy context to instance
+  utils.extend(instance, context);
+
+  return instance;
+}
+
+// Create the default instance to be exported
+var axios = createInstance(defaults);
+
+// Expose Axios class to allow class inheritance
+axios.Axios = Axios;
+
+// Factory for creating new instances
+axios.create = function create(instanceConfig) {
+  return createInstance(utils.merge(defaults, instanceConfig));
+};
+
+// Expose Cancel & CancelToken
+axios.Cancel = __webpack_require__(490);
+axios.CancelToken = __webpack_require__(491);
+axios.isCancel = __webpack_require__(487);
+
+// Expose all/spread
+axios.all = function all(promises) {
+  return Promise.all(promises);
+};
+axios.spread = __webpack_require__(492);
+
+module.exports = axios;
+
+// Allow use of default import syntax in TypeScript
+module.exports.default = axios;
+
+
+/***/ }),
+/* 457 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var bind = __webpack_require__(458);
+var isBuffer = __webpack_require__(459);
+
+/*global toString:true*/
+
+// utils is a library of generic helper functions non-specific to axios
+
+var toString = Object.prototype.toString;
+
+/**
+ * Determine if a value is an Array
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Array, otherwise false
+ */
+function isArray(val) {
+  return toString.call(val) === '[object Array]';
+}
+
+/**
+ * Determine if a value is an ArrayBuffer
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an ArrayBuffer, otherwise false
+ */
+function isArrayBuffer(val) {
+  return toString.call(val) === '[object ArrayBuffer]';
+}
+
+/**
+ * Determine if a value is a FormData
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an FormData, otherwise false
+ */
+function isFormData(val) {
+  return (typeof FormData !== 'undefined') && (val instanceof FormData);
+}
+
+/**
+ * Determine if a value is a view on an ArrayBuffer
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a view on an ArrayBuffer, otherwise false
+ */
+function isArrayBufferView(val) {
+  var result;
+  if ((typeof ArrayBuffer !== 'undefined') && (ArrayBuffer.isView)) {
+    result = ArrayBuffer.isView(val);
+  } else {
+    result = (val) && (val.buffer) && (val.buffer instanceof ArrayBuffer);
+  }
+  return result;
+}
+
+/**
+ * Determine if a value is a String
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a String, otherwise false
+ */
+function isString(val) {
+  return typeof val === 'string';
+}
+
+/**
+ * Determine if a value is a Number
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Number, otherwise false
+ */
+function isNumber(val) {
+  return typeof val === 'number';
+}
+
+/**
+ * Determine if a value is undefined
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if the value is undefined, otherwise false
+ */
+function isUndefined(val) {
+  return typeof val === 'undefined';
+}
+
+/**
+ * Determine if a value is an Object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Object, otherwise false
+ */
+function isObject(val) {
+  return val !== null && typeof val === 'object';
+}
+
+/**
+ * Determine if a value is a Date
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Date, otherwise false
+ */
+function isDate(val) {
+  return toString.call(val) === '[object Date]';
+}
+
+/**
+ * Determine if a value is a File
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a File, otherwise false
+ */
+function isFile(val) {
+  return toString.call(val) === '[object File]';
+}
+
+/**
+ * Determine if a value is a Blob
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Blob, otherwise false
+ */
+function isBlob(val) {
+  return toString.call(val) === '[object Blob]';
+}
+
+/**
+ * Determine if a value is a Function
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Function, otherwise false
+ */
+function isFunction(val) {
+  return toString.call(val) === '[object Function]';
+}
+
+/**
+ * Determine if a value is a Stream
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Stream, otherwise false
+ */
+function isStream(val) {
+  return isObject(val) && isFunction(val.pipe);
+}
+
+/**
+ * Determine if a value is a URLSearchParams object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a URLSearchParams object, otherwise false
+ */
+function isURLSearchParams(val) {
+  return typeof URLSearchParams !== 'undefined' && val instanceof URLSearchParams;
+}
+
+/**
+ * Trim excess whitespace off the beginning and end of a string
+ *
+ * @param {String} str The String to trim
+ * @returns {String} The String freed of excess whitespace
+ */
+function trim(str) {
+  return str.replace(/^\s*/, '').replace(/\s*$/, '');
+}
+
+/**
+ * Determine if we're running in a standard browser environment
+ *
+ * This allows axios to run in a web worker, and react-native.
+ * Both environments support XMLHttpRequest, but not fully standard globals.
+ *
+ * web workers:
+ *  typeof window -> undefined
+ *  typeof document -> undefined
+ *
+ * react-native:
+ *  navigator.product -> 'ReactNative'
+ */
+function isStandardBrowserEnv() {
+  if (typeof navigator !== 'undefined' && navigator.product === 'ReactNative') {
+    return false;
+  }
+  return (
+    typeof window !== 'undefined' &&
+    typeof document !== 'undefined'
+  );
+}
+
+/**
+ * Iterate over an Array or an Object invoking a function for each item.
+ *
+ * If `obj` is an Array callback will be called passing
+ * the value, index, and complete array for each item.
+ *
+ * If 'obj' is an Object callback will be called passing
+ * the value, key, and complete object for each property.
+ *
+ * @param {Object|Array} obj The object to iterate
+ * @param {Function} fn The callback to invoke for each item
+ */
+function forEach(obj, fn) {
+  // Don't bother if no value provided
+  if (obj === null || typeof obj === 'undefined') {
+    return;
+  }
+
+  // Force an array if not already something iterable
+  if (typeof obj !== 'object') {
+    /*eslint no-param-reassign:0*/
+    obj = [obj];
+  }
+
+  if (isArray(obj)) {
+    // Iterate over array values
+    for (var i = 0, l = obj.length; i < l; i++) {
+      fn.call(null, obj[i], i, obj);
+    }
+  } else {
+    // Iterate over object keys
+    for (var key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+        fn.call(null, obj[key], key, obj);
+      }
+    }
+  }
+}
+
+/**
+ * Accepts varargs expecting each argument to be an object, then
+ * immutably merges the properties of each object and returns result.
+ *
+ * When multiple objects contain the same key the later object in
+ * the arguments list will take precedence.
+ *
+ * Example:
+ *
+ * ```js
+ * var result = merge({foo: 123}, {foo: 456});
+ * console.log(result.foo); // outputs 456
+ * ```
+ *
+ * @param {Object} obj1 Object to merge
+ * @returns {Object} Result of all merge properties
+ */
+function merge(/* obj1, obj2, obj3, ... */) {
+  var result = {};
+  function assignValue(val, key) {
+    if (typeof result[key] === 'object' && typeof val === 'object') {
+      result[key] = merge(result[key], val);
+    } else {
+      result[key] = val;
+    }
+  }
+
+  for (var i = 0, l = arguments.length; i < l; i++) {
+    forEach(arguments[i], assignValue);
+  }
+  return result;
+}
+
+/**
+ * Extends object a by mutably adding to it the properties of object b.
+ *
+ * @param {Object} a The object to be extended
+ * @param {Object} b The object to copy properties from
+ * @param {Object} thisArg The object to bind function to
+ * @return {Object} The resulting value of object a
+ */
+function extend(a, b, thisArg) {
+  forEach(b, function assignValue(val, key) {
+    if (thisArg && typeof val === 'function') {
+      a[key] = bind(val, thisArg);
+    } else {
+      a[key] = val;
+    }
+  });
+  return a;
+}
+
+module.exports = {
+  isArray: isArray,
+  isArrayBuffer: isArrayBuffer,
+  isBuffer: isBuffer,
+  isFormData: isFormData,
+  isArrayBufferView: isArrayBufferView,
+  isString: isString,
+  isNumber: isNumber,
+  isObject: isObject,
+  isUndefined: isUndefined,
+  isDate: isDate,
+  isFile: isFile,
+  isBlob: isBlob,
+  isFunction: isFunction,
+  isStream: isStream,
+  isURLSearchParams: isURLSearchParams,
+  isStandardBrowserEnv: isStandardBrowserEnv,
+  forEach: forEach,
+  merge: merge,
+  extend: extend,
+  trim: trim
+};
+
+
+/***/ }),
+/* 458 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = function bind(fn, thisArg) {
+  return function wrap() {
+    var args = new Array(arguments.length);
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i];
+    }
+    return fn.apply(thisArg, args);
+  };
+};
+
+
+/***/ }),
+/* 459 */
+/***/ (function(module, exports) {
+
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+module.exports = function isBuffer (obj) {
+  return obj != null && obj.constructor != null &&
+    typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj)
+}
+
+
+/***/ }),
+/* 460 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var defaults = __webpack_require__(461);
+var utils = __webpack_require__(457);
+var InterceptorManager = __webpack_require__(484);
+var dispatchRequest = __webpack_require__(485);
+
+/**
+ * Create a new instance of Axios
+ *
+ * @param {Object} instanceConfig The default config for the instance
+ */
+function Axios(instanceConfig) {
+  this.defaults = instanceConfig;
+  this.interceptors = {
+    request: new InterceptorManager(),
+    response: new InterceptorManager()
+  };
+}
+
+/**
+ * Dispatch a request
+ *
+ * @param {Object} config The config specific for this request (merged with this.defaults)
+ */
+Axios.prototype.request = function request(config) {
+  /*eslint no-param-reassign:0*/
+  // Allow for axios('example/url'[, config]) a la fetch API
+  if (typeof config === 'string') {
+    config = utils.merge({
+      url: arguments[0]
+    }, arguments[1]);
+  }
+
+  config = utils.merge(defaults, {method: 'get'}, this.defaults, config);
+  config.method = config.method.toLowerCase();
+
+  // Hook up interceptors middleware
+  var chain = [dispatchRequest, undefined];
+  var promise = Promise.resolve(config);
+
+  this.interceptors.request.forEach(function unshiftRequestInterceptors(interceptor) {
+    chain.unshift(interceptor.fulfilled, interceptor.rejected);
+  });
+
+  this.interceptors.response.forEach(function pushResponseInterceptors(interceptor) {
+    chain.push(interceptor.fulfilled, interceptor.rejected);
+  });
+
+  while (chain.length) {
+    promise = promise.then(chain.shift(), chain.shift());
+  }
+
+  return promise;
+};
+
+// Provide aliases for supported request methods
+utils.forEach(['delete', 'get', 'head', 'options'], function forEachMethodNoData(method) {
+  /*eslint func-names:0*/
+  Axios.prototype[method] = function(url, config) {
+    return this.request(utils.merge(config || {}, {
+      method: method,
+      url: url
+    }));
+  };
+});
+
+utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
+  /*eslint func-names:0*/
+  Axios.prototype[method] = function(url, data, config) {
+    return this.request(utils.merge(config || {}, {
+      method: method,
+      url: url,
+      data: data
+    }));
+  };
+});
+
+module.exports = Axios;
+
+
+/***/ }),
+/* 461 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+var normalizeHeaderName = __webpack_require__(462);
+
+var DEFAULT_CONTENT_TYPE = {
+  'Content-Type': 'application/x-www-form-urlencoded'
+};
+
+function setContentTypeIfUnset(headers, value) {
+  if (!utils.isUndefined(headers) && utils.isUndefined(headers['Content-Type'])) {
+    headers['Content-Type'] = value;
+  }
+}
+
+function getDefaultAdapter() {
+  var adapter;
+  if (typeof XMLHttpRequest !== 'undefined') {
+    // For browsers use XHR adapter
+    adapter = __webpack_require__(463);
+  } else if (typeof process !== 'undefined') {
+    // For node use HTTP adapter
+    adapter = __webpack_require__(471);
+  }
+  return adapter;
+}
+
+var defaults = {
+  adapter: getDefaultAdapter(),
+
+  transformRequest: [function transformRequest(data, headers) {
+    normalizeHeaderName(headers, 'Content-Type');
+    if (utils.isFormData(data) ||
+      utils.isArrayBuffer(data) ||
+      utils.isBuffer(data) ||
+      utils.isStream(data) ||
+      utils.isFile(data) ||
+      utils.isBlob(data)
+    ) {
+      return data;
+    }
+    if (utils.isArrayBufferView(data)) {
+      return data.buffer;
+    }
+    if (utils.isURLSearchParams(data)) {
+      setContentTypeIfUnset(headers, 'application/x-www-form-urlencoded;charset=utf-8');
+      return data.toString();
+    }
+    if (utils.isObject(data)) {
+      setContentTypeIfUnset(headers, 'application/json;charset=utf-8');
+      return JSON.stringify(data);
+    }
+    return data;
+  }],
+
+  transformResponse: [function transformResponse(data) {
+    /*eslint no-param-reassign:0*/
+    if (typeof data === 'string') {
+      try {
+        data = JSON.parse(data);
+      } catch (e) { /* Ignore */ }
+    }
+    return data;
+  }],
+
+  /**
+   * A timeout in milliseconds to abort a request. If set to 0 (default) a
+   * timeout is not created.
+   */
+  timeout: 0,
+
+  xsrfCookieName: 'XSRF-TOKEN',
+  xsrfHeaderName: 'X-XSRF-TOKEN',
+
+  maxContentLength: -1,
+
+  validateStatus: function validateStatus(status) {
+    return status >= 200 && status < 300;
+  }
+};
+
+defaults.headers = {
+  common: {
+    'Accept': 'application/json, text/plain, */*'
+  }
+};
+
+utils.forEach(['delete', 'get', 'head'], function forEachMethodNoData(method) {
+  defaults.headers[method] = {};
+});
+
+utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
+  defaults.headers[method] = utils.merge(DEFAULT_CONTENT_TYPE);
+});
+
+module.exports = defaults;
+
+
+/***/ }),
+/* 462 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+
+module.exports = function normalizeHeaderName(headers, normalizedName) {
+  utils.forEach(headers, function processHeader(value, name) {
+    if (name !== normalizedName && name.toUpperCase() === normalizedName.toUpperCase()) {
+      headers[normalizedName] = value;
+      delete headers[name];
+    }
+  });
+};
+
+
+/***/ }),
+/* 463 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+var settle = __webpack_require__(464);
+var buildURL = __webpack_require__(467);
+var parseHeaders = __webpack_require__(468);
+var isURLSameOrigin = __webpack_require__(469);
+var createError = __webpack_require__(465);
+
+module.exports = function xhrAdapter(config) {
+  return new Promise(function dispatchXhrRequest(resolve, reject) {
+    var requestData = config.data;
+    var requestHeaders = config.headers;
+
+    if (utils.isFormData(requestData)) {
+      delete requestHeaders['Content-Type']; // Let the browser set it
+    }
+
+    var request = new XMLHttpRequest();
+
+    // HTTP basic authentication
+    if (config.auth) {
+      var username = config.auth.username || '';
+      var password = config.auth.password || '';
+      requestHeaders.Authorization = 'Basic ' + btoa(username + ':' + password);
+    }
+
+    request.open(config.method.toUpperCase(), buildURL(config.url, config.params, config.paramsSerializer), true);
+
+    // Set the request timeout in MS
+    request.timeout = config.timeout;
+
+    // Listen for ready state
+    request.onreadystatechange = function handleLoad() {
+      if (!request || request.readyState !== 4) {
+        return;
+      }
+
+      // The request errored out and we didn't get a response, this will be
+      // handled by onerror instead
+      // With one exception: request that using file: protocol, most browsers
+      // will return status as 0 even though it's a successful request
+      if (request.status === 0 && !(request.responseURL && request.responseURL.indexOf('file:') === 0)) {
+        return;
+      }
+
+      // Prepare the response
+      var responseHeaders = 'getAllResponseHeaders' in request ? parseHeaders(request.getAllResponseHeaders()) : null;
+      var responseData = !config.responseType || config.responseType === 'text' ? request.responseText : request.response;
+      var response = {
+        data: responseData,
+        status: request.status,
+        statusText: request.statusText,
+        headers: responseHeaders,
+        config: config,
+        request: request
+      };
+
+      settle(resolve, reject, response);
+
+      // Clean up request
+      request = null;
+    };
+
+    // Handle low level network errors
+    request.onerror = function handleError() {
+      // Real errors are hidden from us by the browser
+      // onerror should only fire if it's a network error
+      reject(createError('Network Error', config, null, request));
+
+      // Clean up request
+      request = null;
+    };
+
+    // Handle timeout
+    request.ontimeout = function handleTimeout() {
+      reject(createError('timeout of ' + config.timeout + 'ms exceeded', config, 'ECONNABORTED',
+        request));
+
+      // Clean up request
+      request = null;
+    };
+
+    // Add xsrf header
+    // This is only done if running in a standard browser environment.
+    // Specifically not if we're in a web worker, or react-native.
+    if (utils.isStandardBrowserEnv()) {
+      var cookies = __webpack_require__(470);
+
+      // Add xsrf header
+      var xsrfValue = (config.withCredentials || isURLSameOrigin(config.url)) && config.xsrfCookieName ?
+          cookies.read(config.xsrfCookieName) :
+          undefined;
+
+      if (xsrfValue) {
+        requestHeaders[config.xsrfHeaderName] = xsrfValue;
+      }
+    }
+
+    // Add headers to the request
+    if ('setRequestHeader' in request) {
+      utils.forEach(requestHeaders, function setRequestHeader(val, key) {
+        if (typeof requestData === 'undefined' && key.toLowerCase() === 'content-type') {
+          // Remove Content-Type if data is undefined
+          delete requestHeaders[key];
+        } else {
+          // Otherwise add header to the request
+          request.setRequestHeader(key, val);
+        }
+      });
+    }
+
+    // Add withCredentials to request if needed
+    if (config.withCredentials) {
+      request.withCredentials = true;
+    }
+
+    // Add responseType to request if needed
+    if (config.responseType) {
+      try {
+        request.responseType = config.responseType;
+      } catch (e) {
+        // Expected DOMException thrown by browsers not compatible XMLHttpRequest Level 2.
+        // But, this can be suppressed for 'json' type as it can be parsed by default 'transformResponse' function.
+        if (config.responseType !== 'json') {
+          throw e;
+        }
+      }
+    }
+
+    // Handle progress if needed
+    if (typeof config.onDownloadProgress === 'function') {
+      request.addEventListener('progress', config.onDownloadProgress);
+    }
+
+    // Not all browsers support upload events
+    if (typeof config.onUploadProgress === 'function' && request.upload) {
+      request.upload.addEventListener('progress', config.onUploadProgress);
+    }
+
+    if (config.cancelToken) {
+      // Handle cancellation
+      config.cancelToken.promise.then(function onCanceled(cancel) {
+        if (!request) {
+          return;
+        }
+
+        request.abort();
+        reject(cancel);
+        // Clean up request
+        request = null;
+      });
+    }
+
+    if (requestData === undefined) {
+      requestData = null;
+    }
+
+    // Send the request
+    request.send(requestData);
+  });
+};
+
+
+/***/ }),
+/* 464 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var createError = __webpack_require__(465);
+
+/**
+ * Resolve or reject a Promise based on response status.
+ *
+ * @param {Function} resolve A function that resolves the promise.
+ * @param {Function} reject A function that rejects the promise.
+ * @param {object} response The response.
+ */
+module.exports = function settle(resolve, reject, response) {
+  var validateStatus = response.config.validateStatus;
+  // Note: status is not exposed by XDomainRequest
+  if (!response.status || !validateStatus || validateStatus(response.status)) {
+    resolve(response);
+  } else {
+    reject(createError(
+      'Request failed with status code ' + response.status,
+      response.config,
+      null,
+      response.request,
+      response
+    ));
+  }
+};
+
+
+/***/ }),
+/* 465 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var enhanceError = __webpack_require__(466);
+
+/**
+ * Create an Error with the specified message, config, error code, request and response.
+ *
+ * @param {string} message The error message.
+ * @param {Object} config The config.
+ * @param {string} [code] The error code (for example, 'ECONNABORTED').
+ * @param {Object} [request] The request.
+ * @param {Object} [response] The response.
+ * @returns {Error} The created error.
+ */
+module.exports = function createError(message, config, code, request, response) {
+  var error = new Error(message);
+  return enhanceError(error, config, code, request, response);
+};
+
+
+/***/ }),
+/* 466 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/**
+ * Update an Error with the specified config, error code, and response.
+ *
+ * @param {Error} error The error to update.
+ * @param {Object} config The config.
+ * @param {string} [code] The error code (for example, 'ECONNABORTED').
+ * @param {Object} [request] The request.
+ * @param {Object} [response] The response.
+ * @returns {Error} The error.
+ */
+module.exports = function enhanceError(error, config, code, request, response) {
+  error.config = config;
+  if (code) {
+    error.code = code;
+  }
+  error.request = request;
+  error.response = response;
+  return error;
+};
+
+
+/***/ }),
+/* 467 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+
+function encode(val) {
+  return encodeURIComponent(val).
+    replace(/%40/gi, '@').
+    replace(/%3A/gi, ':').
+    replace(/%24/g, '$').
+    replace(/%2C/gi, ',').
+    replace(/%20/g, '+').
+    replace(/%5B/gi, '[').
+    replace(/%5D/gi, ']');
+}
+
+/**
+ * Build a URL by appending params to the end
+ *
+ * @param {string} url The base of the url (e.g., http://www.google.com)
+ * @param {object} [params] The params to be appended
+ * @returns {string} The formatted url
+ */
+module.exports = function buildURL(url, params, paramsSerializer) {
+  /*eslint no-param-reassign:0*/
+  if (!params) {
+    return url;
+  }
+
+  var serializedParams;
+  if (paramsSerializer) {
+    serializedParams = paramsSerializer(params);
+  } else if (utils.isURLSearchParams(params)) {
+    serializedParams = params.toString();
+  } else {
+    var parts = [];
+
+    utils.forEach(params, function serialize(val, key) {
+      if (val === null || typeof val === 'undefined') {
+        return;
+      }
+
+      if (utils.isArray(val)) {
+        key = key + '[]';
+      } else {
+        val = [val];
+      }
+
+      utils.forEach(val, function parseValue(v) {
+        if (utils.isDate(v)) {
+          v = v.toISOString();
+        } else if (utils.isObject(v)) {
+          v = JSON.stringify(v);
+        }
+        parts.push(encode(key) + '=' + encode(v));
+      });
+    });
+
+    serializedParams = parts.join('&');
+  }
+
+  if (serializedParams) {
+    url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams;
+  }
+
+  return url;
+};
+
+
+/***/ }),
+/* 468 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+
+// Headers whose duplicates are ignored by node
+// c.f. https://nodejs.org/api/http.html#http_message_headers
+var ignoreDuplicateOf = [
+  'age', 'authorization', 'content-length', 'content-type', 'etag',
+  'expires', 'from', 'host', 'if-modified-since', 'if-unmodified-since',
+  'last-modified', 'location', 'max-forwards', 'proxy-authorization',
+  'referer', 'retry-after', 'user-agent'
+];
+
+/**
+ * Parse headers into an object
+ *
+ * ```
+ * Date: Wed, 27 Aug 2014 08:58:49 GMT
+ * Content-Type: application/json
+ * Connection: keep-alive
+ * Transfer-Encoding: chunked
+ * ```
+ *
+ * @param {String} headers Headers needing to be parsed
+ * @returns {Object} Headers parsed into an object
+ */
+module.exports = function parseHeaders(headers) {
+  var parsed = {};
+  var key;
+  var val;
+  var i;
+
+  if (!headers) { return parsed; }
+
+  utils.forEach(headers.split('\n'), function parser(line) {
+    i = line.indexOf(':');
+    key = utils.trim(line.substr(0, i)).toLowerCase();
+    val = utils.trim(line.substr(i + 1));
+
+    if (key) {
+      if (parsed[key] && ignoreDuplicateOf.indexOf(key) >= 0) {
+        return;
+      }
+      if (key === 'set-cookie') {
+        parsed[key] = (parsed[key] ? parsed[key] : []).concat([val]);
+      } else {
+        parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+      }
+    }
+  });
+
+  return parsed;
+};
+
+
+/***/ }),
+/* 469 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+
+module.exports = (
+  utils.isStandardBrowserEnv() ?
+
+  // Standard browser envs have full support of the APIs needed to test
+  // whether the request URL is of the same origin as current location.
+  (function standardBrowserEnv() {
+    var msie = /(msie|trident)/i.test(navigator.userAgent);
+    var urlParsingNode = document.createElement('a');
+    var originURL;
+
+    /**
+    * Parse a URL to discover it's components
+    *
+    * @param {String} url The URL to be parsed
+    * @returns {Object}
+    */
+    function resolveURL(url) {
+      var href = url;
+
+      if (msie) {
+        // IE needs attribute set twice to normalize properties
+        urlParsingNode.setAttribute('href', href);
+        href = urlParsingNode.href;
+      }
+
+      urlParsingNode.setAttribute('href', href);
+
+      // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
+      return {
+        href: urlParsingNode.href,
+        protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
+        host: urlParsingNode.host,
+        search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
+        hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
+        hostname: urlParsingNode.hostname,
+        port: urlParsingNode.port,
+        pathname: (urlParsingNode.pathname.charAt(0) === '/') ?
+                  urlParsingNode.pathname :
+                  '/' + urlParsingNode.pathname
+      };
+    }
+
+    originURL = resolveURL(window.location.href);
+
+    /**
+    * Determine if a URL shares the same origin as the current location
+    *
+    * @param {String} requestURL The URL to test
+    * @returns {boolean} True if URL shares the same origin, otherwise false
+    */
+    return function isURLSameOrigin(requestURL) {
+      var parsed = (utils.isString(requestURL)) ? resolveURL(requestURL) : requestURL;
+      return (parsed.protocol === originURL.protocol &&
+            parsed.host === originURL.host);
+    };
+  })() :
+
+  // Non standard browser envs (web workers, react-native) lack needed support.
+  (function nonStandardBrowserEnv() {
+    return function isURLSameOrigin() {
+      return true;
+    };
+  })()
+);
+
+
+/***/ }),
+/* 470 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+
+module.exports = (
+  utils.isStandardBrowserEnv() ?
+
+  // Standard browser envs support document.cookie
+  (function standardBrowserEnv() {
+    return {
+      write: function write(name, value, expires, path, domain, secure) {
+        var cookie = [];
+        cookie.push(name + '=' + encodeURIComponent(value));
+
+        if (utils.isNumber(expires)) {
+          cookie.push('expires=' + new Date(expires).toGMTString());
+        }
+
+        if (utils.isString(path)) {
+          cookie.push('path=' + path);
+        }
+
+        if (utils.isString(domain)) {
+          cookie.push('domain=' + domain);
+        }
+
+        if (secure === true) {
+          cookie.push('secure');
+        }
+
+        document.cookie = cookie.join('; ');
+      },
+
+      read: function read(name) {
+        var match = document.cookie.match(new RegExp('(^|;\\s*)(' + name + ')=([^;]*)'));
+        return (match ? decodeURIComponent(match[3]) : null);
+      },
+
+      remove: function remove(name) {
+        this.write(name, '', Date.now() - 86400000);
+      }
+    };
+  })() :
+
+  // Non standard browser env (web workers, react-native) lack needed support.
+  (function nonStandardBrowserEnv() {
+    return {
+      write: function write() {},
+      read: function read() { return null; },
+      remove: function remove() {}
+    };
+  })()
+);
+
+
+/***/ }),
+/* 471 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+var settle = __webpack_require__(464);
+var buildURL = __webpack_require__(467);
+var http = __webpack_require__(472);
+var https = __webpack_require__(473);
+var httpFollow = __webpack_require__(474).http;
+var httpsFollow = __webpack_require__(474).https;
+var url = __webpack_require__(454);
+var zlib = __webpack_require__(482);
+var pkg = __webpack_require__(483);
+var createError = __webpack_require__(465);
+var enhanceError = __webpack_require__(466);
+
+/*eslint consistent-return:0*/
+module.exports = function httpAdapter(config) {
+  return new Promise(function dispatchHttpRequest(resolve, reject) {
+    var data = config.data;
+    var headers = config.headers;
+    var timer;
+
+    // Set User-Agent (required by some servers)
+    // Only set header if it hasn't been set in config
+    // See https://github.com/axios/axios/issues/69
+    if (!headers['User-Agent'] && !headers['user-agent']) {
+      headers['User-Agent'] = 'axios/' + pkg.version;
+    }
+
+    if (data && !utils.isStream(data)) {
+      if (Buffer.isBuffer(data)) {
+        // Nothing to do...
+      } else if (utils.isArrayBuffer(data)) {
+        data = new Buffer(new Uint8Array(data));
+      } else if (utils.isString(data)) {
+        data = new Buffer(data, 'utf-8');
+      } else {
+        return reject(createError(
+          'Data after transformation must be a string, an ArrayBuffer, a Buffer, or a Stream',
+          config
+        ));
+      }
+
+      // Add Content-Length header if data exists
+      headers['Content-Length'] = data.length;
+    }
+
+    // HTTP basic authentication
+    var auth = undefined;
+    if (config.auth) {
+      var username = config.auth.username || '';
+      var password = config.auth.password || '';
+      auth = username + ':' + password;
+    }
+
+    // Parse url
+    var parsed = url.parse(config.url);
+    var protocol = parsed.protocol || 'http:';
+
+    if (!auth && parsed.auth) {
+      var urlAuth = parsed.auth.split(':');
+      var urlUsername = urlAuth[0] || '';
+      var urlPassword = urlAuth[1] || '';
+      auth = urlUsername + ':' + urlPassword;
+    }
+
+    if (auth) {
+      delete headers.Authorization;
+    }
+
+    var isHttps = protocol === 'https:';
+    var agent = isHttps ? config.httpsAgent : config.httpAgent;
+
+    var options = {
+      path: buildURL(parsed.path, config.params, config.paramsSerializer).replace(/^\?/, ''),
+      method: config.method,
+      headers: headers,
+      agent: agent,
+      auth: auth
+    };
+
+    if (config.socketPath) {
+      options.socketPath = config.socketPath;
+    } else {
+      options.hostname = parsed.hostname;
+      options.port = parsed.port;
+    }
+
+    var proxy = config.proxy;
+    if (!proxy && proxy !== false) {
+      var proxyEnv = protocol.slice(0, -1) + '_proxy';
+      var proxyUrl = process.env[proxyEnv] || process.env[proxyEnv.toUpperCase()];
+      if (proxyUrl) {
+        var parsedProxyUrl = url.parse(proxyUrl);
+        proxy = {
+          host: parsedProxyUrl.hostname,
+          port: parsedProxyUrl.port
+        };
+
+        if (parsedProxyUrl.auth) {
+          var proxyUrlAuth = parsedProxyUrl.auth.split(':');
+          proxy.auth = {
+            username: proxyUrlAuth[0],
+            password: proxyUrlAuth[1]
+          };
+        }
+      }
+    }
+
+    if (proxy) {
+      options.hostname = proxy.host;
+      options.host = proxy.host;
+      options.headers.host = parsed.hostname + (parsed.port ? ':' + parsed.port : '');
+      options.port = proxy.port;
+      options.path = protocol + '//' + parsed.hostname + (parsed.port ? ':' + parsed.port : '') + options.path;
+
+      // Basic proxy authorization
+      if (proxy.auth) {
+        var base64 = new Buffer(proxy.auth.username + ':' + proxy.auth.password, 'utf8').toString('base64');
+        options.headers['Proxy-Authorization'] = 'Basic ' + base64;
+      }
+    }
+
+    var transport;
+    if (config.transport) {
+      transport = config.transport;
+    } else if (config.maxRedirects === 0) {
+      transport = isHttps ? https : http;
+    } else {
+      if (config.maxRedirects) {
+        options.maxRedirects = config.maxRedirects;
+      }
+      transport = isHttps ? httpsFollow : httpFollow;
+    }
+
+    if (config.maxContentLength && config.maxContentLength > -1) {
+      options.maxBodyLength = config.maxContentLength;
+    }
+
+    // Create the request
+    var req = transport.request(options, function handleResponse(res) {
+      if (req.aborted) return;
+
+      // Response has been received so kill timer that handles request timeout
+      clearTimeout(timer);
+      timer = null;
+
+      // uncompress the response body transparently if required
+      var stream = res;
+      switch (res.headers['content-encoding']) {
+      /*eslint default-case:0*/
+      case 'gzip':
+      case 'compress':
+      case 'deflate':
+        // add the unzipper to the body stream processing pipeline
+        stream = stream.pipe(zlib.createUnzip());
+
+        // remove the content-encoding in order to not confuse downstream operations
+        delete res.headers['content-encoding'];
+        break;
+      }
+
+      // return the last request in case of redirects
+      var lastRequest = res.req || req;
+
+      var response = {
+        status: res.statusCode,
+        statusText: res.statusMessage,
+        headers: res.headers,
+        config: config,
+        request: lastRequest
+      };
+
+      if (config.responseType === 'stream') {
+        response.data = stream;
+        settle(resolve, reject, response);
+      } else {
+        var responseBuffer = [];
+        stream.on('data', function handleStreamData(chunk) {
+          responseBuffer.push(chunk);
+
+          // make sure the content length is not over the maxContentLength if specified
+          if (config.maxContentLength > -1 && Buffer.concat(responseBuffer).length > config.maxContentLength) {
+            stream.destroy();
+            reject(createError('maxContentLength size of ' + config.maxContentLength + ' exceeded',
+              config, null, lastRequest));
+          }
+        });
+
+        stream.on('error', function handleStreamError(err) {
+          if (req.aborted) return;
+          reject(enhanceError(err, config, null, lastRequest));
+        });
+
+        stream.on('end', function handleStreamEnd() {
+          var responseData = Buffer.concat(responseBuffer);
+          if (config.responseType !== 'arraybuffer') {
+            responseData = responseData.toString('utf8');
+          }
+
+          response.data = responseData;
+          settle(resolve, reject, response);
+        });
+      }
+    });
+
+    // Handle errors
+    req.on('error', function handleRequestError(err) {
+      if (req.aborted) return;
+      reject(enhanceError(err, config, null, req));
+    });
+
+    // Handle request timeout
+    if (config.timeout && !timer) {
+      timer = setTimeout(function handleRequestTimeout() {
+        req.abort();
+        reject(createError('timeout of ' + config.timeout + 'ms exceeded', config, 'ECONNABORTED', req));
+      }, config.timeout);
+    }
+
+    if (config.cancelToken) {
+      // Handle cancellation
+      config.cancelToken.promise.then(function onCanceled(cancel) {
+        if (req.aborted) return;
+
+        req.abort();
+        reject(cancel);
+      });
+    }
+
+    // Send the request
+    if (utils.isStream(data)) {
+      data.pipe(req);
+    } else {
+      req.end(data);
+    }
+  });
+};
+
+
+/***/ }),
+/* 472 */
+/***/ (function(module, exports) {
+
+module.exports = require("http");
+
+/***/ }),
+/* 473 */
+/***/ (function(module, exports) {
+
+module.exports = require("https");
+
+/***/ }),
+/* 474 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var url = __webpack_require__(454);
+var http = __webpack_require__(472);
+var https = __webpack_require__(473);
+var assert = __webpack_require__(30);
+var Writable = __webpack_require__(27).Writable;
+var debug = __webpack_require__(475)("follow-redirects");
+
+// RFC7231§4.2.1: Of the request methods defined by this specification,
+// the GET, HEAD, OPTIONS, and TRACE methods are defined to be safe.
+var SAFE_METHODS = { GET: true, HEAD: true, OPTIONS: true, TRACE: true };
+
+// Create handlers that pass events from native requests
+var eventHandlers = Object.create(null);
+["abort", "aborted", "error", "socket", "timeout"].forEach(function (event) {
+  eventHandlers[event] = function (arg) {
+    this._redirectable.emit(event, arg);
+  };
+});
+
+// An HTTP(S) request that can be redirected
+function RedirectableRequest(options, responseCallback) {
+  // Initialize the request
+  Writable.call(this);
+  options.headers = options.headers || {};
+  this._options = options;
+  this._redirectCount = 0;
+  this._redirects = [];
+  this._requestBodyLength = 0;
+  this._requestBodyBuffers = [];
+
+  // Since http.request treats host as an alias of hostname,
+  // but the url module interprets host as hostname plus port,
+  // eliminate the host property to avoid confusion.
+  if (options.host) {
+    // Use hostname if set, because it has precedence
+    if (!options.hostname) {
+      options.hostname = options.host;
+    }
+    delete options.host;
+  }
+
+  // Attach a callback if passed
+  if (responseCallback) {
+    this.on("response", responseCallback);
+  }
+
+  // React to responses of native requests
+  var self = this;
+  this._onNativeResponse = function (response) {
+    self._processResponse(response);
+  };
+
+  // Complete the URL object when necessary
+  if (!options.pathname && options.path) {
+    var searchPos = options.path.indexOf("?");
+    if (searchPos < 0) {
+      options.pathname = options.path;
+    }
+    else {
+      options.pathname = options.path.substring(0, searchPos);
+      options.search = options.path.substring(searchPos);
+    }
+  }
+
+  // Perform the first request
+  this._performRequest();
+}
+RedirectableRequest.prototype = Object.create(Writable.prototype);
+
+// Writes buffered data to the current native request
+RedirectableRequest.prototype.write = function (data, encoding, callback) {
+  // Validate input and shift parameters if necessary
+  if (!(typeof data === "string" || typeof data === "object" && ("length" in data))) {
+    throw new Error("data should be a string, Buffer or Uint8Array");
+  }
+  if (typeof encoding === "function") {
+    callback = encoding;
+    encoding = null;
+  }
+
+  // Ignore empty buffers, since writing them doesn't invoke the callback
+  // https://github.com/nodejs/node/issues/22066
+  if (data.length === 0) {
+    if (callback) {
+      callback();
+    }
+    return;
+  }
+  // Only write when we don't exceed the maximum body length
+  if (this._requestBodyLength + data.length <= this._options.maxBodyLength) {
+    this._requestBodyLength += data.length;
+    this._requestBodyBuffers.push({ data: data, encoding: encoding });
+    this._currentRequest.write(data, encoding, callback);
+  }
+  // Error when we exceed the maximum body length
+  else {
+    this.emit("error", new Error("Request body larger than maxBodyLength limit"));
+    this.abort();
+  }
+};
+
+// Ends the current native request
+RedirectableRequest.prototype.end = function (data, encoding, callback) {
+  // Shift parameters if necessary
+  if (typeof data === "function") {
+    callback = data;
+    data = encoding = null;
+  }
+  else if (typeof encoding === "function") {
+    callback = encoding;
+    encoding = null;
+  }
+
+  // Write data and end
+  var currentRequest = this._currentRequest;
+  this.write(data || "", encoding, function () {
+    currentRequest.end(null, null, callback);
+  });
+};
+
+// Sets a header value on the current native request
+RedirectableRequest.prototype.setHeader = function (name, value) {
+  this._options.headers[name] = value;
+  this._currentRequest.setHeader(name, value);
+};
+
+// Clears a header value on the current native request
+RedirectableRequest.prototype.removeHeader = function (name) {
+  delete this._options.headers[name];
+  this._currentRequest.removeHeader(name);
+};
+
+// Proxy all other public ClientRequest methods
+[
+  "abort", "flushHeaders", "getHeader",
+  "setNoDelay", "setSocketKeepAlive", "setTimeout",
+].forEach(function (method) {
+  RedirectableRequest.prototype[method] = function (a, b) {
+    return this._currentRequest[method](a, b);
+  };
+});
+
+// Proxy all public ClientRequest properties
+["aborted", "connection", "socket"].forEach(function (property) {
+  Object.defineProperty(RedirectableRequest.prototype, property, {
+    get: function () { return this._currentRequest[property]; },
+  });
+});
+
+// Executes the next native request (initial or redirect)
+RedirectableRequest.prototype._performRequest = function () {
+  // Load the native protocol
+  var protocol = this._options.protocol;
+  var nativeProtocol = this._options.nativeProtocols[protocol];
+  if (!nativeProtocol) {
+    this.emit("error", new Error("Unsupported protocol " + protocol));
+    return;
+  }
+
+  // If specified, use the agent corresponding to the protocol
+  // (HTTP and HTTPS use different types of agents)
+  if (this._options.agents) {
+    var scheme = protocol.substr(0, protocol.length - 1);
+    this._options.agent = this._options.agents[scheme];
+  }
+
+  // Create the native request
+  var request = this._currentRequest =
+        nativeProtocol.request(this._options, this._onNativeResponse);
+  this._currentUrl = url.format(this._options);
+
+  // Set up event handlers
+  request._redirectable = this;
+  for (var event in eventHandlers) {
+    /* istanbul ignore else */
+    if (event) {
+      request.on(event, eventHandlers[event]);
+    }
+  }
+
+  // End a redirected request
+  // (The first request must be ended explicitly with RedirectableRequest#end)
+  if (this._isRedirect) {
+    // Write the request entity and end.
+    var i = 0;
+    var buffers = this._requestBodyBuffers;
+    (function writeNext() {
+      if (i < buffers.length) {
+        var buffer = buffers[i++];
+        request.write(buffer.data, buffer.encoding, writeNext);
+      }
+      else {
+        request.end();
+      }
+    }());
+  }
+};
+
+// Processes a response from the current native request
+RedirectableRequest.prototype._processResponse = function (response) {
+  // Store the redirected response
+  if (this._options.trackRedirects) {
+    this._redirects.push({
+      url: this._currentUrl,
+      headers: response.headers,
+      statusCode: response.statusCode,
+    });
+  }
+
+  // RFC7231§6.4: The 3xx (Redirection) class of status code indicates
+  // that further action needs to be taken by the user agent in order to
+  // fulfill the request. If a Location header field is provided,
+  // the user agent MAY automatically redirect its request to the URI
+  // referenced by the Location field value,
+  // even if the specific status code is not understood.
+  var location = response.headers.location;
+  if (location && this._options.followRedirects !== false &&
+      response.statusCode >= 300 && response.statusCode < 400) {
+    // RFC7231§6.4: A client SHOULD detect and intervene
+    // in cyclical redirections (i.e., "infinite" redirection loops).
+    if (++this._redirectCount > this._options.maxRedirects) {
+      this.emit("error", new Error("Max redirects exceeded."));
+      return;
+    }
+
+    // RFC7231§6.4: Automatic redirection needs to done with
+    // care for methods not known to be safe […],
+    // since the user might not wish to redirect an unsafe request.
+    // RFC7231§6.4.7: The 307 (Temporary Redirect) status code indicates
+    // that the target resource resides temporarily under a different URI
+    // and the user agent MUST NOT change the request method
+    // if it performs an automatic redirection to that URI.
+    var header;
+    var headers = this._options.headers;
+    if (response.statusCode !== 307 && !(this._options.method in SAFE_METHODS)) {
+      this._options.method = "GET";
+      // Drop a possible entity and headers related to it
+      this._requestBodyBuffers = [];
+      for (header in headers) {
+        if (/^content-/i.test(header)) {
+          delete headers[header];
+        }
+      }
+    }
+
+    // Drop the Host header, as the redirect might lead to a different host
+    if (!this._isRedirect) {
+      for (header in headers) {
+        if (/^host$/i.test(header)) {
+          delete headers[header];
+        }
+      }
+    }
+
+    // Perform the redirected request
+    var redirectUrl = url.resolve(this._currentUrl, location);
+    debug("redirecting to", redirectUrl);
+    Object.assign(this._options, url.parse(redirectUrl));
+    this._isRedirect = true;
+    this._performRequest();
+
+    // Discard the remainder of the response to avoid waiting for data
+    response.destroy();
+  }
+  else {
+    // The response is not a redirect; return it as-is
+    response.responseUrl = this._currentUrl;
+    response.redirects = this._redirects;
+    this.emit("response", response);
+
+    // Clean up
+    this._requestBodyBuffers = [];
+  }
+};
+
+// Wraps the key/value object of protocols with redirect functionality
+function wrap(protocols) {
+  // Default settings
+  var exports = {
+    maxRedirects: 21,
+    maxBodyLength: 10 * 1024 * 1024,
+  };
+
+  // Wrap each protocol
+  var nativeProtocols = {};
+  Object.keys(protocols).forEach(function (scheme) {
+    var protocol = scheme + ":";
+    var nativeProtocol = nativeProtocols[protocol] = protocols[scheme];
+    var wrappedProtocol = exports[scheme] = Object.create(nativeProtocol);
+
+    // Executes a request, following redirects
+    wrappedProtocol.request = function (options, callback) {
+      if (typeof options === "string") {
+        options = url.parse(options);
+        options.maxRedirects = exports.maxRedirects;
+      }
+      else {
+        options = Object.assign({
+          protocol: protocol,
+          maxRedirects: exports.maxRedirects,
+          maxBodyLength: exports.maxBodyLength,
+        }, options);
+      }
+      options.nativeProtocols = nativeProtocols;
+      assert.equal(options.protocol, protocol, "protocol mismatch");
+      debug("options", options);
+      return new RedirectableRequest(options, callback);
+    };
+
+    // Executes a GET request, following redirects
+    wrappedProtocol.get = function (options, callback) {
+      var request = wrappedProtocol.request(options, callback);
+      request.end();
+      return request;
+    };
+  });
+  return exports;
+}
+
+// Exports
+module.exports = wrap({ http: http, https: https });
+module.exports.wrap = wrap;
+
+
+/***/ }),
+/* 475 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/**
+ * Detect Electron renderer process, which is node, but we should
+ * treat as a browser.
+ */
+
+if (typeof process === 'undefined' || process.type === 'renderer') {
+  module.exports = __webpack_require__(476);
+} else {
+  module.exports = __webpack_require__(479);
+}
+
+
+/***/ }),
+/* 476 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/**
+ * This is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = __webpack_require__(477);
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+exports.storage = 'undefined' != typeof chrome
+               && 'undefined' != typeof chrome.storage
+                  ? chrome.storage.local
+                  : localstorage();
+
+/**
+ * Colors.
+ */
+
+exports.colors = [
+  '#0000CC', '#0000FF', '#0033CC', '#0033FF', '#0066CC', '#0066FF', '#0099CC',
+  '#0099FF', '#00CC00', '#00CC33', '#00CC66', '#00CC99', '#00CCCC', '#00CCFF',
+  '#3300CC', '#3300FF', '#3333CC', '#3333FF', '#3366CC', '#3366FF', '#3399CC',
+  '#3399FF', '#33CC00', '#33CC33', '#33CC66', '#33CC99', '#33CCCC', '#33CCFF',
+  '#6600CC', '#6600FF', '#6633CC', '#6633FF', '#66CC00', '#66CC33', '#9900CC',
+  '#9900FF', '#9933CC', '#9933FF', '#99CC00', '#99CC33', '#CC0000', '#CC0033',
+  '#CC0066', '#CC0099', '#CC00CC', '#CC00FF', '#CC3300', '#CC3333', '#CC3366',
+  '#CC3399', '#CC33CC', '#CC33FF', '#CC6600', '#CC6633', '#CC9900', '#CC9933',
+  '#CCCC00', '#CCCC33', '#FF0000', '#FF0033', '#FF0066', '#FF0099', '#FF00CC',
+  '#FF00FF', '#FF3300', '#FF3333', '#FF3366', '#FF3399', '#FF33CC', '#FF33FF',
+  '#FF6600', '#FF6633', '#FF9900', '#FF9933', '#FFCC00', '#FFCC33'
+];
+
+/**
+ * Currently only WebKit-based Web Inspectors, Firefox >= v31,
+ * and the Firebug extension (any Firefox version) are known
+ * to support "%c" CSS customizations.
+ *
+ * TODO: add a `localStorage` variable to explicitly enable/disable colors
+ */
+
+function useColors() {
+  // NB: In an Electron preload script, document will be defined but not fully
+  // initialized. Since we know we're in Chrome, we'll just detect this case
+  // explicitly
+  if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
+    return true;
+  }
+
+  // Internet Explorer and Edge do not support colors.
+  if (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
+    return false;
+  }
+
+  // is webkit? http://stackoverflow.com/a/16459606/376773
+  // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
+  return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
+    // is firebug? http://stackoverflow.com/a/398120/376773
+    (typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
+    // is firefox >= v31?
+    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
+    // double check webkit in userAgent just in case we are in a worker
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
+}
+
+/**
+ * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ */
+
+exports.formatters.j = function(v) {
+  try {
+    return JSON.stringify(v);
+  } catch (err) {
+    return '[UnexpectedJSONParseError]: ' + err.message;
+  }
+};
+
+
+/**
+ * Colorize log arguments if enabled.
+ *
+ * @api public
+ */
+
+function formatArgs(args) {
+  var useColors = this.useColors;
+
+  args[0] = (useColors ? '%c' : '')
+    + this.namespace
+    + (useColors ? ' %c' : ' ')
+    + args[0]
+    + (useColors ? '%c ' : ' ')
+    + '+' + exports.humanize(this.diff);
+
+  if (!useColors) return;
+
+  var c = 'color: ' + this.color;
+  args.splice(1, 0, c, 'color: inherit')
+
+  // the final "%c" is somewhat tricky, because there could be other
+  // arguments passed either before or after the %c, so we need to
+  // figure out the correct index to insert the CSS into
+  var index = 0;
+  var lastC = 0;
+  args[0].replace(/%[a-zA-Z%]/g, function(match) {
+    if ('%%' === match) return;
+    index++;
+    if ('%c' === match) {
+      // we only are interested in the *last* %c
+      // (the user may have provided their own)
+      lastC = index;
+    }
+  });
+
+  args.splice(lastC, 0, c);
+}
+
+/**
+ * Invokes `console.log()` when available.
+ * No-op when `console.log` is not a "function".
+ *
+ * @api public
+ */
+
+function log() {
+  // this hackery is required for IE8/9, where
+  // the `console.log` function doesn't have 'apply'
+  return 'object' === typeof console
+    && console.log
+    && Function.prototype.apply.call(console.log, console, arguments);
+}
+
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
+
+function save(namespaces) {
+  try {
+    if (null == namespaces) {
+      exports.storage.removeItem('debug');
+    } else {
+      exports.storage.debug = namespaces;
+    }
+  } catch(e) {}
+}
+
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
+
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
+
+  // If debug isn't set in LS, and we're in Electron, try to load $DEBUG
+  if (!r && typeof process !== 'undefined' && 'env' in process) {
+    r = process.env.DEBUG;
+  }
+
+  return r;
+}
+
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
+
+exports.enable(load());
+
+/**
+ * Localstorage attempts to return the localstorage.
+ *
+ * This is necessary because safari throws
+ * when a user disables cookies/localstorage
+ * and you attempt to access it.
+ *
+ * @return {LocalStorage}
+ * @api private
+ */
+
+function localstorage() {
+  try {
+    return window.localStorage;
+  } catch (e) {}
+}
+
+
+/***/ }),
+/* 477 */
+/***/ (function(module, exports, __webpack_require__) {
+
+
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
+exports.coerce = coerce;
+exports.disable = disable;
+exports.enable = enable;
+exports.enabled = enabled;
+exports.humanize = __webpack_require__(478);
+
+/**
+ * Active `debug` instances.
+ */
+exports.instances = [];
+
+/**
+ * The currently active debug mode names, and names to skip.
+ */
+
+exports.names = [];
+exports.skips = [];
+
+/**
+ * Map of special "%n" handling functions, for the debug "format" argument.
+ *
+ * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
+ */
+
+exports.formatters = {};
+
+/**
+ * Select a color.
+ * @param {String} namespace
+ * @return {Number}
+ * @api private
+ */
+
+function selectColor(namespace) {
+  var hash = 0, i;
+
+  for (i in namespace) {
+    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
+    hash |= 0; // Convert to 32bit integer
+  }
+
+  return exports.colors[Math.abs(hash) % exports.colors.length];
+}
+
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
+
+function createDebug(namespace) {
+
+  var prevTime;
+
+  function debug() {
+    // disabled?
+    if (!debug.enabled) return;
+
+    var self = debug;
+
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
+
+    // turn the `arguments` into a proper Array
+    var args = new Array(arguments.length);
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i];
+    }
+
+    args[0] = exports.coerce(args[0]);
+
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %O
+      args.unshift('%O');
+    }
+
+    // apply any `formatters` transformations
+    var index = 0;
+    args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) {
+      // if we encounter an escaped % then don't increase the array index
+      if (match === '%%') return match;
+      index++;
+      var formatter = exports.formatters[format];
+      if ('function' === typeof formatter) {
+        var val = args[index];
+        match = formatter.call(self, val);
+
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
+      }
+      return match;
+    });
+
+    // apply env-specific formatting (colors, etc.)
+    exports.formatArgs.call(self, args);
+
+    var logFn = debug.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
+  }
+
+  debug.namespace = namespace;
+  debug.enabled = exports.enabled(namespace);
+  debug.useColors = exports.useColors();
+  debug.color = selectColor(namespace);
+  debug.destroy = destroy;
+
+  // env-specific initialization logic for debug instances
+  if ('function' === typeof exports.init) {
+    exports.init(debug);
+  }
+
+  exports.instances.push(debug);
+
+  return debug;
+}
+
+function destroy () {
+  var index = exports.instances.indexOf(this);
+  if (index !== -1) {
+    exports.instances.splice(index, 1);
+    return true;
+  } else {
+    return false;
+  }
+}
+
+/**
+ * Enables a debug mode by namespaces. This can include modes
+ * separated by a colon and wildcards.
+ *
+ * @param {String} namespaces
+ * @api public
+ */
+
+function enable(namespaces) {
+  exports.save(namespaces);
+
+  exports.names = [];
+  exports.skips = [];
+
+  var i;
+  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
+  var len = split.length;
+
+  for (i = 0; i < len; i++) {
+    if (!split[i]) continue; // ignore empty strings
+    namespaces = split[i].replace(/\*/g, '.*?');
+    if (namespaces[0] === '-') {
+      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
+    } else {
+      exports.names.push(new RegExp('^' + namespaces + '$'));
+    }
+  }
+
+  for (i = 0; i < exports.instances.length; i++) {
+    var instance = exports.instances[i];
+    instance.enabled = exports.enabled(instance.namespace);
+  }
+}
+
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
+
+function disable() {
+  exports.enable('');
+}
+
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
+
+function enabled(name) {
+  if (name[name.length - 1] === '*') {
+    return true;
+  }
+  var i, len;
+  for (i = 0, len = exports.skips.length; i < len; i++) {
+    if (exports.skips[i].test(name)) {
+      return false;
+    }
+  }
+  for (i = 0, len = exports.names.length; i < len; i++) {
+    if (exports.names[i].test(name)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
+
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
+
+
+/***/ }),
+/* 478 */
+/***/ (function(module, exports) {
+
+/**
+ * Helpers.
+ */
+
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
+
+/**
+ * Parse or format the given `val`.
+ *
+ * Options:
+ *
+ *  - `long` verbose formatting [false]
+ *
+ * @param {String|Number} val
+ * @param {Object} [options]
+ * @throws {Error} throw an error if val is not a non-empty string or a number
+ * @return {String|Number}
+ * @api public
+ */
+
+module.exports = function(val, options) {
+  options = options || {};
+  var type = typeof val;
+  if (type === 'string' && val.length > 0) {
+    return parse(val);
+  } else if (type === 'number' && isNaN(val) === false) {
+    return options.long ? fmtLong(val) : fmtShort(val);
+  }
+  throw new Error(
+    'val is not a non-empty string or a valid number. val=' +
+      JSON.stringify(val)
+  );
+};
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function parse(str) {
+  str = String(str);
+  if (str.length > 100) {
+    return;
+  }
+  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(
+    str
+  );
+  if (!match) {
+    return;
+  }
+  var n = parseFloat(match[1]);
+  var type = (match[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'yrs':
+    case 'yr':
+    case 'y':
+      return n * y;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * d;
+    case 'hours':
+    case 'hour':
+    case 'hrs':
+    case 'hr':
+    case 'h':
+      return n * h;
+    case 'minutes':
+    case 'minute':
+    case 'mins':
+    case 'min':
+    case 'm':
+      return n * m;
+    case 'seconds':
+    case 'second':
+    case 'secs':
+    case 'sec':
+    case 's':
+      return n * s;
+    case 'milliseconds':
+    case 'millisecond':
+    case 'msecs':
+    case 'msec':
+    case 'ms':
+      return n;
+    default:
+      return undefined;
+  }
+}
+
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function fmtShort(ms) {
+  if (ms >= d) {
+    return Math.round(ms / d) + 'd';
+  }
+  if (ms >= h) {
+    return Math.round(ms / h) + 'h';
+  }
+  if (ms >= m) {
+    return Math.round(ms / m) + 'm';
+  }
+  if (ms >= s) {
+    return Math.round(ms / s) + 's';
+  }
+  return ms + 'ms';
+}
+
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function fmtLong(ms) {
+  return plural(ms, d, 'day') ||
+    plural(ms, h, 'hour') ||
+    plural(ms, m, 'minute') ||
+    plural(ms, s, 'second') ||
+    ms + ' ms';
+}
+
+/**
+ * Pluralization helper.
+ */
+
+function plural(ms, n, name) {
+  if (ms < n) {
+    return;
+  }
+  if (ms < n * 1.5) {
+    return Math.floor(ms / n) + ' ' + name;
+  }
+  return Math.ceil(ms / n) + ' ' + name + 's';
+}
+
+
+/***/ }),
+/* 479 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/**
+ * Module dependencies.
+ */
+
+var tty = __webpack_require__(480);
+var util = __webpack_require__(29);
+
+/**
+ * This is the Node.js implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
+
+exports = module.exports = __webpack_require__(477);
+exports.init = init;
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+
+/**
+ * Colors.
+ */
+
+exports.colors = [ 6, 2, 3, 4, 5, 1 ];
+
+try {
+  var supportsColor = __webpack_require__(481);
+  if (supportsColor && supportsColor.level >= 2) {
+    exports.colors = [
+      20, 21, 26, 27, 32, 33, 38, 39, 40, 41, 42, 43, 44, 45, 56, 57, 62, 63, 68,
+      69, 74, 75, 76, 77, 78, 79, 80, 81, 92, 93, 98, 99, 112, 113, 128, 129, 134,
+      135, 148, 149, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+      172, 173, 178, 179, 184, 185, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+      205, 206, 207, 208, 209, 214, 215, 220, 221
+    ];
+  }
+} catch (err) {
+  // swallow - we only care if `supports-color` is available; it doesn't have to be.
+}
+
+/**
+ * Build up the default `inspectOpts` object from the environment variables.
+ *
+ *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
+ */
+
+exports.inspectOpts = Object.keys(process.env).filter(function (key) {
+  return /^debug_/i.test(key);
+}).reduce(function (obj, key) {
+  // camel-case
+  var prop = key
+    .substring(6)
+    .toLowerCase()
+    .replace(/_([a-z])/g, function (_, k) { return k.toUpperCase() });
+
+  // coerce string value into JS value
+  var val = process.env[key];
+  if (/^(yes|on|true|enabled)$/i.test(val)) val = true;
+  else if (/^(no|off|false|disabled)$/i.test(val)) val = false;
+  else if (val === 'null') val = null;
+  else val = Number(val);
+
+  obj[prop] = val;
+  return obj;
+}, {});
+
+/**
+ * Is stdout a TTY? Colored output is enabled when `true`.
+ */
+
+function useColors() {
+  return 'colors' in exports.inspectOpts
+    ? Boolean(exports.inspectOpts.colors)
+    : tty.isatty(process.stderr.fd);
+}
+
+/**
+ * Map %o to `util.inspect()`, all on a single line.
+ */
+
+exports.formatters.o = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts)
+    .split('\n').map(function(str) {
+      return str.trim()
+    }).join(' ');
+};
+
+/**
+ * Map %o to `util.inspect()`, allowing multiple lines if needed.
+ */
+
+exports.formatters.O = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts);
+};
+
+/**
+ * Adds ANSI color escape codes if enabled.
+ *
+ * @api public
+ */
+
+function formatArgs(args) {
+  var name = this.namespace;
+  var useColors = this.useColors;
+
+  if (useColors) {
+    var c = this.color;
+    var colorCode = '\u001b[3' + (c < 8 ? c : '8;5;' + c);
+    var prefix = '  ' + colorCode + ';1m' + name + ' ' + '\u001b[0m';
+
+    args[0] = prefix + args[0].split('\n').join('\n' + prefix);
+    args.push(colorCode + 'm+' + exports.humanize(this.diff) + '\u001b[0m');
+  } else {
+    args[0] = getDate() + name + ' ' + args[0];
+  }
+}
+
+function getDate() {
+  if (exports.inspectOpts.hideDate) {
+    return '';
+  } else {
+    return new Date().toISOString() + ' ';
+  }
+}
+
+/**
+ * Invokes `util.format()` with the specified arguments and writes to stderr.
+ */
+
+function log() {
+  return process.stderr.write(util.format.apply(util, arguments) + '\n');
+}
+
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
+
+function save(namespaces) {
+  if (null == namespaces) {
+    // If you set a process.env field to null or undefined, it gets cast to the
+    // string 'null' or 'undefined'. Just delete instead.
+    delete process.env.DEBUG;
+  } else {
+    process.env.DEBUG = namespaces;
+  }
+}
+
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
+
+function load() {
+  return process.env.DEBUG;
+}
+
+/**
+ * Init logic for `debug` instances.
+ *
+ * Create a new `inspectOpts` object in case `useColors` is set
+ * differently for a particular `debug` instance.
+ */
+
+function init (debug) {
+  debug.inspectOpts = {};
+
+  var keys = Object.keys(exports.inspectOpts);
+  for (var i = 0; i < keys.length; i++) {
+    debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
+  }
+}
+
+/**
+ * Enable namespaces listed in `process.env.DEBUG` initially.
+ */
+
+exports.enable(load());
+
+
+/***/ }),
+/* 480 */
+/***/ (function(module, exports) {
+
+module.exports = require("tty");
+
+/***/ }),
+/* 481 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const os = __webpack_require__(11);
+const hasFlag = __webpack_require__(12);
+
+const {env} = process;
+
+let forceColor;
+if (hasFlag('no-color') ||
+	hasFlag('no-colors') ||
+	hasFlag('color=false') ||
+	hasFlag('color=never')) {
+	forceColor = 0;
+} else if (hasFlag('color') ||
+	hasFlag('colors') ||
+	hasFlag('color=true') ||
+	hasFlag('color=always')) {
+	forceColor = 1;
+}
+if ('FORCE_COLOR' in env) {
+	if (env.FORCE_COLOR === true || env.FORCE_COLOR === 'true') {
+		forceColor = 1;
+	} else if (env.FORCE_COLOR === false || env.FORCE_COLOR === 'false') {
+		forceColor = 0;
+	} else {
+		forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
+	}
+}
+
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
+
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+}
+
+function supportsColor(stream) {
+	if (forceColor === 0) {
+		return 0;
+	}
+
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
+
+	if (hasFlag('color=256')) {
+		return 2;
+	}
+
+	if (stream && !stream.isTTY && forceColor === undefined) {
+		return 0;
+	}
+
+	const min = forceColor || 0;
+
+	if (env.TERM === 'dumb') {
+		return min;
+	}
+
+	if (process.platform === 'win32') {
+		// Node.js 7.5.0 is the first version of Node.js to include a patch to
+		// libuv that enables 256 color output on Windows. Anything earlier and it
+		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
+		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
+		// release that supports 256 colors. Windows 10 build 14931 is the first release
+		// that supports 16m/TrueColor.
+		const osRelease = os.release().split('.');
+		if (
+			Number(process.versions.node.split('.')[0]) >= 8 &&
+			Number(osRelease[0]) >= 10 &&
+			Number(osRelease[2]) >= 10586
+		) {
+			return Number(osRelease[2]) >= 14931 ? 3 : 2;
+		}
+
+		return 1;
+	}
+
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
+
+		return min;
+	}
+
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
+
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
+
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+
+		switch (env.TERM_PROGRAM) {
+			case 'iTerm.app':
+				return version >= 3 ? 3 : 2;
+			case 'Apple_Terminal':
+				return 2;
+			// No default
+		}
+	}
+
+	if (/-256(color)?$/i.test(env.TERM)) {
+		return 2;
+	}
+
+	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
+
+	if ('COLORTERM' in env) {
+		return 1;
+	}
+
+	return min;
+}
+
+function getSupportLevel(stream) {
+	const level = supportsColor(stream);
+	return translateLevel(level);
+}
+
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
+};
+
+
+/***/ }),
+/* 482 */
+/***/ (function(module, exports) {
+
+module.exports = require("zlib");
+
+/***/ }),
+/* 483 */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"name\":\"axios\",\"version\":\"0.18.1\",\"description\":\"Promise based HTTP client for the browser and node.js\",\"main\":\"index.js\",\"scripts\":{\"test\":\"grunt test && bundlesize\",\"start\":\"node ./sandbox/server.js\",\"build\":\"NODE_ENV=production grunt build\",\"preversion\":\"npm test\",\"version\":\"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json\",\"postversion\":\"git push && git push --tags\",\"examples\":\"node ./examples/server.js\",\"coveralls\":\"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js\"},\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/axios/axios.git\"},\"keywords\":[\"xhr\",\"http\",\"ajax\",\"promise\",\"node\"],\"author\":\"Matt Zabriskie\",\"license\":\"MIT\",\"bugs\":{\"url\":\"https://github.com/axios/axios/issues\"},\"homepage\":\"https://github.com/axios/axios\",\"devDependencies\":{\"bundlesize\":\"^0.5.7\",\"coveralls\":\"^2.11.9\",\"es6-promise\":\"^4.0.5\",\"grunt\":\"^1.0.1\",\"grunt-banner\":\"^0.6.0\",\"grunt-cli\":\"^1.2.0\",\"grunt-contrib-clean\":\"^1.0.0\",\"grunt-contrib-nodeunit\":\"^1.0.0\",\"grunt-contrib-watch\":\"^1.0.0\",\"grunt-eslint\":\"^19.0.0\",\"grunt-karma\":\"^2.0.0\",\"grunt-ts\":\"^6.0.0-beta.3\",\"grunt-webpack\":\"^1.0.18\",\"istanbul-instrumenter-loader\":\"^1.0.0\",\"jasmine-core\":\"^2.4.1\",\"karma\":\"^1.3.0\",\"karma-chrome-launcher\":\"^2.0.0\",\"karma-coverage\":\"^1.0.0\",\"karma-firefox-launcher\":\"^1.0.0\",\"karma-jasmine\":\"^1.0.2\",\"karma-jasmine-ajax\":\"^0.1.13\",\"karma-opera-launcher\":\"^1.0.0\",\"karma-safari-launcher\":\"^1.0.0\",\"karma-sauce-launcher\":\"^1.1.0\",\"karma-sinon\":\"^1.0.5\",\"karma-sourcemap-loader\":\"^0.3.7\",\"karma-webpack\":\"^1.7.0\",\"load-grunt-tasks\":\"^3.5.2\",\"minimist\":\"^1.2.0\",\"sinon\":\"^1.17.4\",\"webpack\":\"^1.13.1\",\"webpack-dev-server\":\"^1.14.1\",\"url-search-params\":\"^0.6.1\",\"typescript\":\"^2.0.3\"},\"browser\":{\"./lib/adapters/http.js\":\"./lib/adapters/xhr.js\"},\"typings\":\"./index.d.ts\",\"dependencies\":{\"follow-redirects\":\"1.5.10\",\"is-buffer\":\"^2.0.2\"},\"bundlesize\":[{\"path\":\"./dist/axios.min.js\",\"threshold\":\"5kB\"}]}");
+
+/***/ }),
+/* 484 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+
+function InterceptorManager() {
+  this.handlers = [];
+}
+
+/**
+ * Add a new interceptor to the stack
+ *
+ * @param {Function} fulfilled The function to handle `then` for a `Promise`
+ * @param {Function} rejected The function to handle `reject` for a `Promise`
+ *
+ * @return {Number} An ID used to remove interceptor later
+ */
+InterceptorManager.prototype.use = function use(fulfilled, rejected) {
+  this.handlers.push({
+    fulfilled: fulfilled,
+    rejected: rejected
+  });
+  return this.handlers.length - 1;
+};
+
+/**
+ * Remove an interceptor from the stack
+ *
+ * @param {Number} id The ID that was returned by `use`
+ */
+InterceptorManager.prototype.eject = function eject(id) {
+  if (this.handlers[id]) {
+    this.handlers[id] = null;
+  }
+};
+
+/**
+ * Iterate over all the registered interceptors
+ *
+ * This method is particularly useful for skipping over any
+ * interceptors that may have become `null` calling `eject`.
+ *
+ * @param {Function} fn The function to call for each interceptor
+ */
+InterceptorManager.prototype.forEach = function forEach(fn) {
+  utils.forEach(this.handlers, function forEachHandler(h) {
+    if (h !== null) {
+      fn(h);
+    }
+  });
+};
+
+module.exports = InterceptorManager;
+
+
+/***/ }),
+/* 485 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+var transformData = __webpack_require__(486);
+var isCancel = __webpack_require__(487);
+var defaults = __webpack_require__(461);
+var isAbsoluteURL = __webpack_require__(488);
+var combineURLs = __webpack_require__(489);
+
+/**
+ * Throws a `Cancel` if cancellation has been requested.
+ */
+function throwIfCancellationRequested(config) {
+  if (config.cancelToken) {
+    config.cancelToken.throwIfRequested();
+  }
+}
+
+/**
+ * Dispatch a request to the server using the configured adapter.
+ *
+ * @param {object} config The config that is to be used for the request
+ * @returns {Promise} The Promise to be fulfilled
+ */
+module.exports = function dispatchRequest(config) {
+  throwIfCancellationRequested(config);
+
+  // Support baseURL config
+  if (config.baseURL && !isAbsoluteURL(config.url)) {
+    config.url = combineURLs(config.baseURL, config.url);
+  }
+
+  // Ensure headers exist
+  config.headers = config.headers || {};
+
+  // Transform request data
+  config.data = transformData(
+    config.data,
+    config.headers,
+    config.transformRequest
+  );
+
+  // Flatten headers
+  config.headers = utils.merge(
+    config.headers.common || {},
+    config.headers[config.method] || {},
+    config.headers || {}
+  );
+
+  utils.forEach(
+    ['delete', 'get', 'head', 'post', 'put', 'patch', 'common'],
+    function cleanHeaderConfig(method) {
+      delete config.headers[method];
+    }
+  );
+
+  var adapter = config.adapter || defaults.adapter;
+
+  return adapter(config).then(function onAdapterResolution(response) {
+    throwIfCancellationRequested(config);
+
+    // Transform response data
+    response.data = transformData(
+      response.data,
+      response.headers,
+      config.transformResponse
+    );
+
+    return response;
+  }, function onAdapterRejection(reason) {
+    if (!isCancel(reason)) {
+      throwIfCancellationRequested(config);
+
+      // Transform response data
+      if (reason && reason.response) {
+        reason.response.data = transformData(
+          reason.response.data,
+          reason.response.headers,
+          config.transformResponse
+        );
+      }
+    }
+
+    return Promise.reject(reason);
+  });
+};
+
+
+/***/ }),
+/* 486 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(457);
+
+/**
+ * Transform the data for a request or a response
+ *
+ * @param {Object|String} data The data to be transformed
+ * @param {Array} headers The headers for the request or response
+ * @param {Array|Function} fns A single function or Array of functions
+ * @returns {*} The resulting transformed data
+ */
+module.exports = function transformData(data, headers, fns) {
+  /*eslint no-param-reassign:0*/
+  utils.forEach(fns, function transform(fn) {
+    data = fn(data, headers);
+  });
+
+  return data;
+};
+
+
+/***/ }),
+/* 487 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = function isCancel(value) {
+  return !!(value && value.__CANCEL__);
+};
+
+
+/***/ }),
+/* 488 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/**
+ * Determines whether the specified URL is absolute
+ *
+ * @param {string} url The URL to test
+ * @returns {boolean} True if the specified URL is absolute, otherwise false
+ */
+module.exports = function isAbsoluteURL(url) {
+  // A URL is considered absolute if it begins with "<scheme>://" or "//" (protocol-relative URL).
+  // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed
+  // by any combination of letters, digits, plus, period, or hyphen.
+  return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+};
+
+
+/***/ }),
+/* 489 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/**
+ * Creates a new URL by combining the specified URLs
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} relativeURL The relative URL
+ * @returns {string} The combined URL
+ */
+module.exports = function combineURLs(baseURL, relativeURL) {
+  return relativeURL
+    ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
+    : baseURL;
+};
+
+
+/***/ }),
+/* 490 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/**
+ * A `Cancel` is an object that is thrown when an operation is canceled.
+ *
+ * @class
+ * @param {string=} message The message.
+ */
+function Cancel(message) {
+  this.message = message;
+}
+
+Cancel.prototype.toString = function toString() {
+  return 'Cancel' + (this.message ? ': ' + this.message : '');
+};
+
+Cancel.prototype.__CANCEL__ = true;
+
+module.exports = Cancel;
+
+
+/***/ }),
+/* 491 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Cancel = __webpack_require__(490);
+
+/**
+ * A `CancelToken` is an object that can be used to request cancellation of an operation.
+ *
+ * @class
+ * @param {Function} executor The executor function.
+ */
+function CancelToken(executor) {
+  if (typeof executor !== 'function') {
+    throw new TypeError('executor must be a function.');
+  }
+
+  var resolvePromise;
+  this.promise = new Promise(function promiseExecutor(resolve) {
+    resolvePromise = resolve;
+  });
+
+  var token = this;
+  executor(function cancel(message) {
+    if (token.reason) {
+      // Cancellation has already been requested
+      return;
+    }
+
+    token.reason = new Cancel(message);
+    resolvePromise(token.reason);
+  });
+}
+
+/**
+ * Throws a `Cancel` if cancellation has been requested.
+ */
+CancelToken.prototype.throwIfRequested = function throwIfRequested() {
+  if (this.reason) {
+    throw this.reason;
+  }
+};
+
+/**
+ * Returns an object that contains a new `CancelToken` and a function that, when called,
+ * cancels the `CancelToken`.
+ */
+CancelToken.source = function source() {
+  var cancel;
+  var token = new CancelToken(function executor(c) {
+    cancel = c;
+  });
+  return {
+    token: token,
+    cancel: cancel
+  };
+};
+
+module.exports = CancelToken;
+
+
+/***/ }),
+/* 492 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+/**
+ * Syntactic sugar for invoking a function and expanding an array for arguments.
+ *
+ * Common use case would be to use `Function.prototype.apply`.
+ *
+ *  ```js
+ *  function f(x, y, z) {}
+ *  var args = [1, 2, 3];
+ *  f.apply(null, args);
+ *  ```
+ *
+ * With `spread` this example can be re-written.
+ *
+ *  ```js
+ *  spread(function(x, y, z) {})([1, 2, 3]);
+ *  ```
+ *
+ * @param {Function} callback
+ * @returns {Function}
+ */
+module.exports = function spread(callback) {
+  return function wrap(arr) {
+    return callback.apply(null, arr);
+  };
+};
+
+
+/***/ }),
+/* 493 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = __webpack_require__(36);
+tslib_1.__exportStar(__webpack_require__(494), exports);
+
+
+/***/ }),
+/* 494 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAxiosRequestError = (error) => {
+    return error && error.config && error.response === undefined;
+};
+exports.isAxiosResponseError = (error) => {
+    return error && error.response && error.response.status !== undefined;
+};
+
+
+/***/ }),
+/* 495 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+class KbnClientStatus {
+    constructor(requester) {
+        this.requester = requester;
+    }
+    /**
+     * Get the full server status
+     */
+    async get() {
+        return await this.requester.request({
+            method: 'GET',
+            path: 'api/status',
+        });
+    }
+    /**
+     * Get the overall/merged state
+     */
+    async getOverallState() {
+        const status = await this.get();
+        return status.status.overall.state;
+    }
+}
+exports.KbnClientStatus = KbnClientStatus;
+
+
+/***/ }),
+/* 496 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const PLUGIN_STATUS_ID = /^plugin:(.+?)@/;
+class KbnClientPlugins {
+    constructor(status) {
+        this.status = status;
+    }
+    /**
+     * Get a list of plugin ids that are enabled on the server
+     */
+    async getEnabledIds() {
+        const pluginIds = [];
+        const apiResp = await this.status.get();
+        for (const status of apiResp.status.statuses) {
+            if (status.id) {
+                const match = status.id.match(PLUGIN_STATUS_ID);
+                if (match) {
+                    pluginIds.push(match[1]);
+                }
+            }
+        }
+        return pluginIds;
+    }
+}
+exports.KbnClientPlugins = KbnClientPlugins;
+
+
+/***/ }),
+/* 497 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+class KbnClientVersion {
+    constructor(status) {
+        this.status = status;
+    }
+    async get() {
+        if (this.versionCache !== undefined) {
+            return this.versionCache;
+        }
+        const status = await this.status.get();
+        this.versionCache = status.version.number + (status.version.build_snapshot ? '-SNAPSHOT' : '');
+        return this.versionCache;
+    }
+}
+exports.KbnClientVersion = KbnClientVersion;
+
+
+/***/ }),
+/* 498 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const kbn_client_requester_1 = __webpack_require__(453);
+class KbnClientSavedObjects {
+    constructor(log, requester) {
+        this.log = log;
+        this.requester = requester;
+    }
+    /**
+     * Get an object
+     */
+    async get(options) {
+        this.log.debug('Gettings saved object: %j', options);
+        return await this.requester.request({
+            description: 'get saved object',
+            path: kbn_client_requester_1.uriencode `/api/saved_objects/${options.type}/${options.id}`,
+            method: 'GET',
+        });
+    }
+    /**
+     * Create a saved object
+     */
+    async create(options) {
+        this.log.debug('Creating saved object: %j', options);
+        return await this.requester.request({
+            description: 'update saved object',
+            path: options.id
+                ? kbn_client_requester_1.uriencode `/api/saved_objects/${options.type}/${options.id}`
+                : kbn_client_requester_1.uriencode `/api/saved_objects/${options.type}`,
+            query: {
+                overwrite: options.overwrite,
+            },
+            method: 'POST',
+            body: {
+                attributes: options.attributes,
+                migrationVersion: options.migrationVersion,
+                references: options.references,
+            },
+        });
+    }
+    /**
+     * Update a saved object
+     */
+    async update(options) {
+        this.log.debug('Updating saved object: %j', options);
+        return await this.requester.request({
+            description: 'update saved object',
+            path: kbn_client_requester_1.uriencode `/api/saved_objects/${options.type}/${options.id}`,
+            query: {
+                overwrite: options.overwrite,
+            },
+            method: 'PUT',
+            body: {
+                attributes: options.attributes,
+                migrationVersion: options.migrationVersion,
+                references: options.references,
+            },
+        });
+    }
+    /**
+     * Delete an object
+     */
+    async delete(options) {
+        this.log.debug('Deleting saved object %s/%s', options);
+        return await this.requester.request({
+            description: 'delete saved object',
+            path: kbn_client_requester_1.uriencode `/api/saved_objects/${options.type}/${options.id}`,
+            method: 'DELETE',
+        });
+    }
+}
+exports.KbnClientSavedObjects = KbnClientSavedObjects;
+
+
+/***/ }),
+/* 499 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const kbn_client_requester_1 = __webpack_require__(453);
+class KbnClientUiSettings {
+    constructor(log, requester, defaults) {
+        this.log = log;
+        this.requester = requester;
+        this.defaults = defaults;
+    }
+    async get(setting) {
+        var _a;
+        const all = await this.getAll();
+        const value = (_a = all[setting]) === null || _a === void 0 ? void 0 : _a.userValue;
+        this.log.verbose('uiSettings.value: %j', value);
+        return value;
+    }
+    /**
+     * Gets defaultIndex from the config doc.
+     */
+    async getDefaultIndex() {
+        return await this.get('defaultIndex');
+    }
+    /**
+     * Unset a uiSetting
+     */
+    async unset(setting) {
+        return await this.requester.request({
+            path: kbn_client_requester_1.uriencode `/api/kibana/settings/${setting}`,
+            method: 'DELETE',
+        });
+    }
+    /**
+     * Replace all uiSettings with the `doc` values, `doc` is merged
+     * with some defaults
+     */
+    async replace(doc) {
+        this.log.debug('replacing kibana config doc: %j', doc);
+        const changes = {
+            ...this.defaults,
+            ...doc,
+        };
+        for (const [name, { isOverridden }] of Object.entries(await this.getAll())) {
+            if (!isOverridden && !changes.hasOwnProperty(name)) {
+                changes[name] = null;
+            }
+        }
+        await this.requester.request({
+            method: 'POST',
+            path: '/api/kibana/settings',
+            body: { changes },
+            retries: 5,
+        });
+    }
+    /**
+     * Add fields to the config doc (like setting timezone and defaultIndex)
+     */
+    async update(updates) {
+        this.log.debug('applying update to kibana config: %j', updates);
+        await this.requester.request({
+            path: '/api/kibana/settings',
+            method: 'POST',
+            body: {
+                changes: updates,
+            },
+        });
+    }
+    async getAll() {
+        const resp = await this.requester.request({
+            path: '/api/kibana/settings',
+            method: 'GET',
+        });
+        return resp.settings;
+    }
+}
+exports.KbnClientUiSettings = KbnClientUiSettings;
+
+
+/***/ }),
+/* 500 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parallelizeBatches", function() { return parallelizeBatches; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parallelize", function() { return parallelize; });
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+async function parallelizeBatches(batches, fn) {
+  for (const batch of batches) {
+    // We need to make sure the entire batch has completed before we can move on
+    // to the next batch
+    await parallelize(batch, fn);
+  }
+}
+async function parallelize(items, fn, concurrency = 4) {
+  if (items.length === 0) {
+    return;
+  }
+
+  return new Promise((resolve, reject) => {
+    let activePromises = 0;
+    const values = items.slice(0);
+
+    async function scheduleItem(item) {
+      activePromises++;
+
+      try {
+        await fn(item);
+        activePromises--;
+
+        if (values.length > 0) {
+          // We have more work to do, so we schedule the next promise
+          scheduleItem(values.shift());
+        } else if (activePromises === 0) {
+          // We have no more values left, and all items have completed, so we've
+          // completed all the work.
+          resolve();
+        }
+      } catch (error) {
+        reject(error);
+      }
+    }
+
+    values.splice(0, concurrency).map(scheduleItem);
+  });
+}
+
+/***/ }),
+/* 501 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getProjects", function() { return getProjects; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProjectGraph", function() { return buildProjectGraph; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "topologicallyBatchProjects", function() { return topologicallyBatchProjects; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "includeTransitiveProjects", function() { return includeTransitiveProjects; });
+/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(502);
+/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(glob__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(16);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(515);
+/* harmony import */ var _project__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(516);
+/* harmony import */ var _workspaces__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(579);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 glob = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(glob__WEBPACK_IMPORTED_MODULE_0___default.a);
+/** a Map of project names to Project instances */
+
+async function getProjects(rootPath, projectsPathsPatterns, {
+  include = [],
+  exclude = []
+} = {}) {
+  const projects = new Map();
+  const workspaceProjectsPaths = await Object(_workspaces__WEBPACK_IMPORTED_MODULE_5__["workspacePackagePaths"])(rootPath);
+
+  for (const pattern of projectsPathsPatterns) {
+    const pathsToProcess = await packagesFromGlobPattern({
+      pattern,
+      rootPath
+    });
+
+    for (const filePath of pathsToProcess) {
+      const projectConfigPath = normalize(filePath);
+      const projectDir = path__WEBPACK_IMPORTED_MODULE_1___default.a.dirname(projectConfigPath);
+      const project = await _project__WEBPACK_IMPORTED_MODULE_4__["Project"].fromPath(projectDir);
+
+      if (workspaceProjectsPaths.indexOf(filePath) >= 0) {
+        project.isWorkspaceProject = true;
+      }
+
+      const excludeProject = exclude.includes(project.name) || include.length > 0 && !include.includes(project.name);
+
+      if (excludeProject) {
+        continue;
+      }
+
+      if (projects.has(project.name)) {
+        throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](`There are multiple projects with the same name [${project.name}]`, {
+          name: project.name,
+          paths: [project.path, projects.get(project.name).path]
+        });
+      }
+
+      projects.set(project.name, project);
+    }
+  }
+
+  return projects;
+}
+
+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);
+} // https://github.com/isaacs/node-glob/blob/master/common.js#L104
+// glob always returns "\\" as "/" in windows, so everyone
+// gets normalized because we can't have nice things.
+
+
+function normalize(dir) {
+  return path__WEBPACK_IMPORTED_MODULE_1___default.a.normalize(dir);
+}
+
+function buildProjectGraph(projects) {
+  const projectGraph = new Map();
+
+  for (const project of projects.values()) {
+    const projectDeps = [];
+    const dependencies = project.allDependencies;
+
+    for (const depName of Object.keys(dependencies)) {
+      if (projects.has(depName)) {
+        const dep = projects.get(depName);
+        const dependentProjectIsInWorkspace = project.isWorkspaceProject || project.json.name === 'kibana';
+        project.ensureValidProjectDependency(dep, dependentProjectIsInWorkspace);
+        projectDeps.push(dep);
+      }
+    }
+
+    projectGraph.set(project.name, projectDeps);
+  }
+
+  return projectGraph;
+}
+function topologicallyBatchProjects(projectsToBatch, projectGraph, {
+  batchByWorkspace = false
+} = {}) {
+  // We're going to be chopping stuff out of this list, so copy it.
+  const projectsLeftToBatch = new Set(projectsToBatch.keys());
+  const batches = [];
+
+  if (batchByWorkspace) {
+    const workspaceRootProject = Array.from(projectsToBatch.values()).find(p => p.isWorkspaceRoot);
+
+    if (!workspaceRootProject) {
+      throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](`There was no yarn workspace root found.`);
+    } // Push in the workspace root first.
+
+
+    batches.push([workspaceRootProject]);
+    projectsLeftToBatch.delete(workspaceRootProject.name); // In the next batch, push in all workspace projects.
+
+    const workspaceBatch = [];
+
+    for (const projectName of projectsLeftToBatch) {
+      const project = projectsToBatch.get(projectName);
+
+      if (project.isWorkspaceProject) {
+        workspaceBatch.push(project);
+        projectsLeftToBatch.delete(projectName);
+      }
+    }
+
+    batches.push(workspaceBatch);
+  }
+
+  while (projectsLeftToBatch.size > 0) {
+    // Get all projects that have no remaining dependencies within the repo
+    // that haven't yet been picked.
+    const batch = [];
+
+    for (const projectName of projectsLeftToBatch) {
+      const projectDeps = projectGraph.get(projectName);
+      const needsDependenciesBatched = projectDeps.some(dep => projectsLeftToBatch.has(dep.name));
+
+      if (!needsDependenciesBatched) {
+        batch.push(projectsToBatch.get(projectName));
+      }
+    } // If we weren't able to find a project with no remaining dependencies,
+    // then we've encountered a cycle in the dependency graph.
+
+
+    const hasCycles = batch.length === 0;
+
+    if (hasCycles) {
+      const cycleProjectNames = [...projectsLeftToBatch];
+      const message = 'Encountered a cycle in the dependency graph. Projects in cycle are:\n' + cycleProjectNames.join(', ');
+      throw new _errors__WEBPACK_IMPORTED_MODULE_3__["CliError"](message);
+    }
+
+    batches.push(batch);
+    batch.forEach(project => projectsLeftToBatch.delete(project.name));
+  }
+
+  return batches;
+}
+function includeTransitiveProjects(subsetOfProjects, allProjects, {
+  onlyProductionDependencies = false
+} = {}) {
+  const projectsWithDependents = new Map(); // the current list of packages we are expanding using breadth-first-search
+
+  const toProcess = [...subsetOfProjects];
+
+  while (toProcess.length > 0) {
+    const project = toProcess.shift();
+    const dependencies = onlyProductionDependencies ? project.productionDependencies : project.allDependencies;
+    Object.keys(dependencies).forEach(dep => {
+      if (allProjects.has(dep)) {
+        toProcess.push(allProjects.get(dep));
+      }
+    });
+    projectsWithDependents.set(project.name, project);
+  }
+
+  return projectsWithDependents;
+}
+
+/***/ }),
+/* 502 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Approach:
+//
+// 1. Get the minimatch set
+// 2. For each pattern in the set, PROCESS(pattern, false)
+// 3. Store matches per-set, then uniq them
+//
+// PROCESS(pattern, inGlobStar)
+// Get the first [n] items from pattern that are all strings
+// Join these together.  This is PREFIX.
+//   If there is no more remaining, then stat(PREFIX) and
+//   add to matches if it succeeds.  END.
+//
+// If inGlobStar and PREFIX is symlink and points to dir
+//   set ENTRIES = []
+// else readdir(PREFIX) as ENTRIES
+//   If fail, END
+//
+// with ENTRIES
+//   If pattern[n] is GLOBSTAR
+//     // handle the case where the globstar match is empty
+//     // by pruning it out, and testing the resulting pattern
+//     PROCESS(pattern[0..n] + pattern[n+1 .. $], false)
+//     // handle other cases.
+//     for ENTRY in ENTRIES (not dotfiles)
+//       // attach globstar + tail onto the entry
+//       // Mark that this entry is a globstar match
+//       PROCESS(pattern[0..n] + ENTRY + pattern[n .. $], true)
+//
+//   else // not globstar
+//     for ENTRY in ENTRIES (not dotfiles, unless pattern[n] is dot)
+//       Test ENTRY against pattern[n]
+//       If fails, continue
+//       If passes, PROCESS(pattern[0..n] + item + pattern[n+1 .. $])
+//
+// Caveat:
+//   Cache all stats and readdirs results to minimize syscall.  Since all
+//   we ever care about is existence and directory-ness, we can just keep
+//   `true` for files, and [children,...] for directories, or `false` for
+//   things that don't exist.
+
+module.exports = glob
+
+var fs = __webpack_require__(23)
+var rp = __webpack_require__(503)
+var minimatch = __webpack_require__(505)
+var Minimatch = minimatch.Minimatch
+var inherits = __webpack_require__(509)
+var EE = __webpack_require__(379).EventEmitter
+var path = __webpack_require__(16)
+var assert = __webpack_require__(30)
+var isAbsolute = __webpack_require__(511)
+var globSync = __webpack_require__(512)
+var common = __webpack_require__(513)
+var alphasort = common.alphasort
+var alphasorti = common.alphasorti
+var setopts = common.setopts
+var ownProp = common.ownProp
+var inflight = __webpack_require__(514)
+var util = __webpack_require__(29)
+var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
+
+var once = __webpack_require__(385)
+
+function glob (pattern, options, cb) {
+  if (typeof options === 'function') cb = options, options = {}
+  if (!options) options = {}
+
+  if (options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return globSync(pattern, options)
+  }
+
+  return new Glob(pattern, options, cb)
+}
+
+glob.sync = globSync
+var GlobSync = glob.GlobSync = globSync.GlobSync
+
+// old api surface
+glob.glob = glob
+
+function extend (origin, add) {
+  if (add === null || typeof add !== 'object') {
+    return origin
+  }
+
+  var keys = Object.keys(add)
+  var i = keys.length
+  while (i--) {
+    origin[keys[i]] = add[keys[i]]
+  }
+  return origin
+}
+
+glob.hasMagic = function (pattern, options_) {
+  var options = extend({}, options_)
+  options.noprocess = true
+
+  var g = new Glob(pattern, options)
+  var set = g.minimatch.set
+
+  if (!pattern)
+    return false
+
+  if (set.length > 1)
+    return true
+
+  for (var j = 0; j < set[0].length; j++) {
+    if (typeof set[0][j] !== 'string')
+      return true
+  }
+
+  return false
+}
+
+glob.Glob = Glob
+inherits(Glob, EE)
+function Glob (pattern, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = null
+  }
+
+  if (options && options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return new GlobSync(pattern, options)
+  }
+
+  if (!(this instanceof Glob))
+    return new Glob(pattern, options, cb)
+
+  setopts(this, pattern, options)
+  this._didRealPath = false
+
+  // process each pattern in the minimatch set
+  var n = this.minimatch.set.length
+
+  // The matches are stored as {<filename>: true,...} so that
+  // duplicates are automagically pruned.
+  // Later, we do an Object.keys() on these.
+  // Keep them as a list so we can fill in when nonull is set.
+  this.matches = new Array(n)
+
+  if (typeof cb === 'function') {
+    cb = once(cb)
+    this.on('error', cb)
+    this.on('end', function (matches) {
+      cb(null, matches)
+    })
+  }
+
+  var self = this
+  this._processing = 0
+
+  this._emitQueue = []
+  this._processQueue = []
+  this.paused = false
+
+  if (this.noprocess)
+    return this
+
+  if (n === 0)
+    return done()
+
+  var sync = true
+  for (var i = 0; i < n; i ++) {
+    this._process(this.minimatch.set[i], i, false, done)
+  }
+  sync = false
+
+  function done () {
+    --self._processing
+    if (self._processing <= 0) {
+      if (sync) {
+        process.nextTick(function () {
+          self._finish()
+        })
+      } else {
+        self._finish()
+      }
+    }
+  }
+}
+
+Glob.prototype._finish = function () {
+  assert(this instanceof Glob)
+  if (this.aborted)
+    return
+
+  if (this.realpath && !this._didRealpath)
+    return this._realpath()
+
+  common.finish(this)
+  this.emit('end', this.found)
+}
+
+Glob.prototype._realpath = function () {
+  if (this._didRealpath)
+    return
+
+  this._didRealpath = true
+
+  var n = this.matches.length
+  if (n === 0)
+    return this._finish()
+
+  var self = this
+  for (var i = 0; i < this.matches.length; i++)
+    this._realpathSet(i, next)
+
+  function next () {
+    if (--n === 0)
+      self._finish()
+  }
+}
+
+Glob.prototype._realpathSet = function (index, cb) {
+  var matchset = this.matches[index]
+  if (!matchset)
+    return cb()
+
+  var found = Object.keys(matchset)
+  var self = this
+  var n = found.length
+
+  if (n === 0)
+    return cb()
+
+  var set = this.matches[index] = Object.create(null)
+  found.forEach(function (p, i) {
+    // If there's a problem with the stat, then it means that
+    // one or more of the links in the realpath couldn't be
+    // resolved.  just return the abs value in that case.
+    p = self._makeAbs(p)
+    rp.realpath(p, self.realpathCache, function (er, real) {
+      if (!er)
+        set[real] = true
+      else if (er.syscall === 'stat')
+        set[p] = true
+      else
+        self.emit('error', er) // srsly wtf right here
+
+      if (--n === 0) {
+        self.matches[index] = set
+        cb()
+      }
+    })
+  })
+}
+
+Glob.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
+
+Glob.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
+
+Glob.prototype.abort = function () {
+  this.aborted = true
+  this.emit('abort')
+}
+
+Glob.prototype.pause = function () {
+  if (!this.paused) {
+    this.paused = true
+    this.emit('pause')
+  }
+}
+
+Glob.prototype.resume = function () {
+  if (this.paused) {
+    this.emit('resume')
+    this.paused = false
+    if (this._emitQueue.length) {
+      var eq = this._emitQueue.slice(0)
+      this._emitQueue.length = 0
+      for (var i = 0; i < eq.length; i ++) {
+        var e = eq[i]
+        this._emitMatch(e[0], e[1])
+      }
+    }
+    if (this._processQueue.length) {
+      var pq = this._processQueue.slice(0)
+      this._processQueue.length = 0
+      for (var i = 0; i < pq.length; i ++) {
+        var p = pq[i]
+        this._processing--
+        this._process(p[0], p[1], p[2], p[3])
+      }
+    }
+  }
+}
+
+Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
+  assert(this instanceof Glob)
+  assert(typeof cb === 'function')
+
+  if (this.aborted)
+    return
+
+  this._processing++
+  if (this.paused) {
+    this._processQueue.push([pattern, index, inGlobStar, cb])
+    return
+  }
+
+  //console.error('PROCESS %d', this._processing, pattern)
+
+  // Get the first [n] parts of pattern that are all strings.
+  var n = 0
+  while (typeof pattern[n] === 'string') {
+    n ++
+  }
+  // now n is the index of the first one that is *not* a string.
+
+  // see if there's anything else
+  var prefix
+  switch (n) {
+    // if not, then this is rather simple
+    case pattern.length:
+      this._processSimple(pattern.join('/'), index, cb)
+      return
+
+    case 0:
+      // pattern *starts* with some non-trivial item.
+      // going to readdir(cwd), but not include the prefix in matches.
+      prefix = null
+      break
+
+    default:
+      // pattern has some string bits in the front.
+      // whatever it starts with, whether that's 'absolute' like /foo/bar,
+      // or 'relative' like '../baz'
+      prefix = pattern.slice(0, n).join('/')
+      break
+  }
+
+  var remain = pattern.slice(n)
+
+  // get the list of entries.
+  var read
+  if (prefix === null)
+    read = '.'
+  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+    if (!prefix || !isAbsolute(prefix))
+      prefix = '/' + prefix
+    read = prefix
+  } else
+    read = prefix
+
+  var abs = this._makeAbs(read)
+
+  //if ignored, skip _processing
+  if (childrenIgnored(this, read))
+    return cb()
+
+  var isGlobStar = remain[0] === minimatch.GLOBSTAR
+  if (isGlobStar)
+    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar, cb)
+  else
+    this._processReaddir(prefix, read, abs, remain, index, inGlobStar, cb)
+}
+
+Glob.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar, cb) {
+  var self = this
+  this._readdir(abs, inGlobStar, function (er, entries) {
+    return self._processReaddir2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
+  })
+}
+
+Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return cb()
+
+  // It will only match dot entries if it starts with a dot, or if
+  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
+  var pn = remain[0]
+  var negate = !!this.minimatch.negate
+  var rawGlob = pn._glob
+  var dotOk = this.dot || rawGlob.charAt(0) === '.'
+
+  var matchedEntries = []
+  for (var i = 0; i < entries.length; i++) {
+    var e = entries[i]
+    if (e.charAt(0) !== '.' || dotOk) {
+      var m
+      if (negate && !prefix) {
+        m = !e.match(pn)
+      } else {
+        m = e.match(pn)
+      }
+      if (m)
+        matchedEntries.push(e)
+    }
+  }
+
+  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
+
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return cb()
+
+  // if this is the last remaining pattern bit, then no need for
+  // an additional stat *unless* the user has specified mark or
+  // stat explicitly.  We know they exist, since readdir returned
+  // them.
+
+  if (remain.length === 1 && !this.mark && !this.stat) {
+    if (!this.matches[index])
+      this.matches[index] = Object.create(null)
+
+    for (var i = 0; i < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
+      }
+
+      if (e.charAt(0) === '/' && !this.nomount) {
+        e = path.join(this.root, e)
+      }
+      this._emitMatch(index, e)
+    }
+    // This was the last one, and no stats were needed
+    return cb()
+  }
+
+  // now test all matched entries as stand-ins for that part
+  // of the pattern.
+  remain.shift()
+  for (var i = 0; i < len; i ++) {
+    var e = matchedEntries[i]
+    var newPattern
+    if (prefix) {
+      if (prefix !== '/')
+        e = prefix + '/' + e
+      else
+        e = prefix + e
+    }
+    this._process([e].concat(remain), index, inGlobStar, cb)
+  }
+  cb()
+}
+
+Glob.prototype._emitMatch = function (index, e) {
+  if (this.aborted)
+    return
+
+  if (isIgnored(this, e))
+    return
+
+  if (this.paused) {
+    this._emitQueue.push([index, e])
+    return
+  }
+
+  var abs = isAbsolute(e) ? e : this._makeAbs(e)
+
+  if (this.mark)
+    e = this._mark(e)
+
+  if (this.absolute)
+    e = abs
+
+  if (this.matches[index][e])
+    return
+
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
+
+  this.matches[index][e] = true
+
+  var st = this.statCache[abs]
+  if (st)
+    this.emit('stat', e, st)
+
+  this.emit('match', e)
+}
+
+Glob.prototype._readdirInGlobStar = function (abs, cb) {
+  if (this.aborted)
+    return
+
+  // follow all symlinked directories forever
+  // just proceed as if this is a non-globstar situation
+  if (this.follow)
+    return this._readdir(abs, false, cb)
+
+  var lstatkey = 'lstat\0' + abs
+  var self = this
+  var lstatcb = inflight(lstatkey, lstatcb_)
+
+  if (lstatcb)
+    fs.lstat(abs, lstatcb)
+
+  function lstatcb_ (er, lstat) {
+    if (er && er.code === 'ENOENT')
+      return cb()
+
+    var isSym = lstat && lstat.isSymbolicLink()
+    self.symlinks[abs] = isSym
+
+    // If it's not a symlink or a dir, then it's definitely a regular file.
+    // don't bother doing a readdir in that case.
+    if (!isSym && lstat && !lstat.isDirectory()) {
+      self.cache[abs] = 'FILE'
+      cb()
+    } else
+      self._readdir(abs, false, cb)
+  }
+}
+
+Glob.prototype._readdir = function (abs, inGlobStar, cb) {
+  if (this.aborted)
+    return
+
+  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
+  if (!cb)
+    return
+
+  //console.error('RD %j %j', +inGlobStar, abs)
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs, cb)
+
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return cb()
+
+    if (Array.isArray(c))
+      return cb(null, c)
+  }
+
+  var self = this
+  fs.readdir(abs, readdirCb(this, abs, cb))
+}
+
+function readdirCb (self, abs, cb) {
+  return function (er, entries) {
+    if (er)
+      self._readdirError(abs, er, cb)
+    else
+      self._readdirEntries(abs, entries, cb)
+  }
+}
+
+Glob.prototype._readdirEntries = function (abs, entries, cb) {
+  if (this.aborted)
+    return
+
+  // if we haven't asked to stat everything, then just
+  // assume that everything in there exists, so we can avoid
+  // having to stat it a second time.
+  if (!this.mark && !this.stat) {
+    for (var i = 0; i < entries.length; i ++) {
+      var e = entries[i]
+      if (abs === '/')
+        e = abs + e
+      else
+        e = abs + '/' + e
+      this.cache[e] = true
+    }
+  }
+
+  this.cache[abs] = entries
+  return cb(null, entries)
+}
+
+Glob.prototype._readdirError = function (f, er, cb) {
+  if (this.aborted)
+    return
+
+  // handle errors, and cache the information
+  switch (er.code) {
+    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
+    case 'ENOTDIR': // totally normal. means it *does* exist.
+      var abs = this._makeAbs(f)
+      this.cache[abs] = 'FILE'
+      if (abs === this.cwdAbs) {
+        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
+        error.path = this.cwd
+        error.code = er.code
+        this.emit('error', error)
+        this.abort()
+      }
+      break
+
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
+
+    default: // some unusual error.  Treat as failure.
+      this.cache[this._makeAbs(f)] = false
+      if (this.strict) {
+        this.emit('error', er)
+        // If the error is handled, then we abort
+        // if not, we threw out of here
+        this.abort()
+      }
+      if (!this.silent)
+        console.error('glob error', er)
+      break
+  }
+
+  return cb()
+}
+
+Glob.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar, cb) {
+  var self = this
+  this._readdir(abs, inGlobStar, function (er, entries) {
+    self._processGlobStar2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
+  })
+}
+
+
+Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+  //console.error('pgs2', prefix, remain[0], entries)
+
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return cb()
+
+  // test without the globstar, and with every child both below
+  // and replacing the globstar.
+  var remainWithoutGlobStar = remain.slice(1)
+  var gspref = prefix ? [ prefix ] : []
+  var noGlobStar = gspref.concat(remainWithoutGlobStar)
+
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false, cb)
+
+  var isSym = this.symlinks[abs]
+  var len = entries.length
+
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return cb()
+
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
+
+    // these two cases enter the inGlobStar state
+    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
+    this._process(instead, index, true, cb)
+
+    var below = gspref.concat(entries[i], remain)
+    this._process(below, index, true, cb)
+  }
+
+  cb()
+}
+
+Glob.prototype._processSimple = function (prefix, index, cb) {
+  // XXX review this.  Shouldn't it be doing the mounting etc
+  // before doing stat?  kinda weird?
+  var self = this
+  this._stat(prefix, function (er, exists) {
+    self._processSimple2(prefix, index, er, exists, cb)
+  })
+}
+Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) {
+
+  //console.error('ps2', prefix, exists)
+
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
+
+  // If it doesn't exist, then just mark the lack of results
+  if (!exists)
+    return cb()
+
+  if (prefix && isAbsolute(prefix) && !this.nomount) {
+    var trail = /[\/\\]$/.test(prefix)
+    if (prefix.charAt(0) === '/') {
+      prefix = path.join(this.root, prefix)
+    } else {
+      prefix = path.resolve(this.root, prefix)
+      if (trail)
+        prefix += '/'
+    }
+  }
+
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
+
+  // Mark this as a match
+  this._emitMatch(index, prefix)
+  cb()
+}
+
+// Returns either 'DIR', 'FILE', or false
+Glob.prototype._stat = function (f, cb) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
+
+  if (f.length > this.maxLength)
+    return cb()
+
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+
+    if (Array.isArray(c))
+      c = 'DIR'
+
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return cb(null, c)
+
+    if (needDir && c === 'FILE')
+      return cb()
+
+    // otherwise we have to stat, because maybe c=true
+    // if we know it exists, but not what it is.
+  }
+
+  var exists
+  var stat = this.statCache[abs]
+  if (stat !== undefined) {
+    if (stat === false)
+      return cb(null, stat)
+    else {
+      var type = stat.isDirectory() ? 'DIR' : 'FILE'
+      if (needDir && type === 'FILE')
+        return cb()
+      else
+        return cb(null, type, stat)
+    }
+  }
+
+  var self = this
+  var statcb = inflight('stat\0' + abs, lstatcb_)
+  if (statcb)
+    fs.lstat(abs, statcb)
+
+  function lstatcb_ (er, lstat) {
+    if (lstat && lstat.isSymbolicLink()) {
+      // If it's a symlink, then treat it as the target, unless
+      // the target does not exist, then treat it as a file.
+      return fs.stat(abs, function (er, stat) {
+        if (er)
+          self._stat2(f, abs, null, lstat, cb)
+        else
+          self._stat2(f, abs, er, stat, cb)
+      })
+    } else {
+      self._stat2(f, abs, er, lstat, cb)
+    }
+  }
+}
+
+Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
+  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+    this.statCache[abs] = false
+    return cb()
+  }
+
+  var needDir = f.slice(-1) === '/'
+  this.statCache[abs] = stat
+
+  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
+    return cb(null, false, stat)
+
+  var c = true
+  if (stat)
+    c = stat.isDirectory() ? 'DIR' : 'FILE'
+  this.cache[abs] = this.cache[abs] || c
+
+  if (needDir && c === 'FILE')
+    return cb()
+
+  return cb(null, c, stat)
+}
+
+
+/***/ }),
+/* 503 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = realpath
+realpath.realpath = realpath
+realpath.sync = realpathSync
+realpath.realpathSync = realpathSync
+realpath.monkeypatch = monkeypatch
+realpath.unmonkeypatch = unmonkeypatch
+
+var fs = __webpack_require__(23)
+var origRealpath = fs.realpath
+var origRealpathSync = fs.realpathSync
+
+var version = process.version
+var ok = /^v[0-5]\./.test(version)
+var old = __webpack_require__(504)
+
+function newError (er) {
+  return er && er.syscall === 'realpath' && (
+    er.code === 'ELOOP' ||
+    er.code === 'ENOMEM' ||
+    er.code === 'ENAMETOOLONG'
+  )
+}
+
+function realpath (p, cache, cb) {
+  if (ok) {
+    return origRealpath(p, cache, cb)
+  }
+
+  if (typeof cache === 'function') {
+    cb = cache
+    cache = null
+  }
+  origRealpath(p, cache, function (er, result) {
+    if (newError(er)) {
+      old.realpath(p, cache, cb)
+    } else {
+      cb(er, result)
+    }
+  })
+}
+
+function realpathSync (p, cache) {
+  if (ok) {
+    return origRealpathSync(p, cache)
+  }
+
+  try {
+    return origRealpathSync(p, cache)
+  } catch (er) {
+    if (newError(er)) {
+      return old.realpathSync(p, cache)
+    } else {
+      throw er
+    }
+  }
+}
+
+function monkeypatch () {
+  fs.realpath = realpath
+  fs.realpathSync = realpathSync
+}
+
+function unmonkeypatch () {
+  fs.realpath = origRealpath
+  fs.realpathSync = origRealpathSync
+}
+
+
+/***/ }),
+/* 504 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var pathModule = __webpack_require__(16);
+var isWindows = process.platform === 'win32';
+var fs = __webpack_require__(23);
+
+// JavaScript implementation of realpath, ported from node pre-v6
+
+var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
+
+function rethrow() {
+  // Only enable in debug mode. A backtrace uses ~1000 bytes of heap space and
+  // is fairly slow to generate.
+  var callback;
+  if (DEBUG) {
+    var backtrace = new Error;
+    callback = debugCallback;
+  } else
+    callback = missingCallback;
+
+  return callback;
+
+  function debugCallback(err) {
+    if (err) {
+      backtrace.message = err.message;
+      err = backtrace;
+      missingCallback(err);
+    }
+  }
+
+  function missingCallback(err) {
+    if (err) {
+      if (process.throwDeprecation)
+        throw err;  // Forgot a callback but don't know where? Use NODE_DEBUG=fs
+      else if (!process.noDeprecation) {
+        var msg = 'fs: missing callback ' + (err.stack || err.message);
+        if (process.traceDeprecation)
+          console.trace(msg);
+        else
+          console.error(msg);
+      }
+    }
+  }
+}
+
+function maybeCallback(cb) {
+  return typeof cb === 'function' ? cb : rethrow();
+}
+
+var normalize = pathModule.normalize;
+
+// Regexp that finds the next partion of a (partial) path
+// result is [base_with_slash, base], e.g. ['somedir/', 'somedir']
+if (isWindows) {
+  var nextPartRe = /(.*?)(?:[\/\\]+|$)/g;
+} else {
+  var nextPartRe = /(.*?)(?:[\/]+|$)/g;
+}
+
+// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
+if (isWindows) {
+  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
+} else {
+  var splitRootRe = /^[\/]*/;
+}
+
+exports.realpathSync = function realpathSync(p, cache) {
+  // make p is absolute
+  p = pathModule.resolve(p);
+
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return cache[p];
+  }
+
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
+
+  // current character position in p
+  var pos;
+  // the partial path so far, including a trailing slash if any
+  var current;
+  // the partial path without a trailing slash (except when pointing at a root)
+  var base;
+  // the partial path scanned in the previous round, with slash
+  var previous;
+
+  start();
+
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
+
+    // On windows, check that the root exists. On unix there is no need.
+    if (isWindows && !knownHard[base]) {
+      fs.lstatSync(base);
+      knownHard[base] = true;
+    }
+  }
+
+  // walk down the path, swapping out linked pathparts for their real
+  // values
+  // NB: p.length changes.
+  while (pos < p.length) {
+    // find the next part
+    nextPartRe.lastIndex = pos;
+    var result = nextPartRe.exec(p);
+    previous = current;
+    current += result[0];
+    base = previous + result[1];
+    pos = nextPartRe.lastIndex;
+
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      continue;
+    }
+
+    var resolvedLink;
+    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
+      // some known symbolic link.  no need to stat again.
+      resolvedLink = cache[base];
+    } else {
+      var stat = fs.lstatSync(base);
+      if (!stat.isSymbolicLink()) {
+        knownHard[base] = true;
+        if (cache) cache[base] = base;
+        continue;
+      }
+
+      // read the link if it wasn't read before
+      // dev/ino always return 0 on windows, so skip the check.
+      var linkTarget = null;
+      if (!isWindows) {
+        var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
+        if (seenLinks.hasOwnProperty(id)) {
+          linkTarget = seenLinks[id];
+        }
+      }
+      if (linkTarget === null) {
+        fs.statSync(base);
+        linkTarget = fs.readlinkSync(base);
+      }
+      resolvedLink = pathModule.resolve(previous, linkTarget);
+      // track this, if given a cache.
+      if (cache) cache[base] = resolvedLink;
+      if (!isWindows) seenLinks[id] = linkTarget;
+    }
+
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
+
+  if (cache) cache[original] = p;
+
+  return p;
+};
+
+
+exports.realpath = function realpath(p, cache, cb) {
+  if (typeof cb !== 'function') {
+    cb = maybeCallback(cache);
+    cache = null;
+  }
+
+  // make p is absolute
+  p = pathModule.resolve(p);
+
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return process.nextTick(cb.bind(null, null, cache[p]));
+  }
+
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
+
+  // current character position in p
+  var pos;
+  // the partial path so far, including a trailing slash if any
+  var current;
+  // the partial path without a trailing slash (except when pointing at a root)
+  var base;
+  // the partial path scanned in the previous round, with slash
+  var previous;
+
+  start();
+
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
+
+    // On windows, check that the root exists. On unix there is no need.
+    if (isWindows && !knownHard[base]) {
+      fs.lstat(base, function(err) {
+        if (err) return cb(err);
+        knownHard[base] = true;
+        LOOP();
+      });
+    } else {
+      process.nextTick(LOOP);
+    }
+  }
+
+  // walk down the path, swapping out linked pathparts for their real
+  // values
+  function LOOP() {
+    // stop if scanned past end of path
+    if (pos >= p.length) {
+      if (cache) cache[original] = p;
+      return cb(null, p);
+    }
+
+    // find the next part
+    nextPartRe.lastIndex = pos;
+    var result = nextPartRe.exec(p);
+    previous = current;
+    current += result[0];
+    base = previous + result[1];
+    pos = nextPartRe.lastIndex;
+
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      return process.nextTick(LOOP);
+    }
+
+    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
+      // known symbolic link.  no need to stat again.
+      return gotResolvedLink(cache[base]);
+    }
+
+    return fs.lstat(base, gotStat);
+  }
+
+  function gotStat(err, stat) {
+    if (err) return cb(err);
+
+    // if not a symlink, skip to the next path part
+    if (!stat.isSymbolicLink()) {
+      knownHard[base] = true;
+      if (cache) cache[base] = base;
+      return process.nextTick(LOOP);
+    }
+
+    // stat & read the link if not read before
+    // call gotTarget as soon as the link target is known
+    // dev/ino always return 0 on windows, so skip the check.
+    if (!isWindows) {
+      var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
+      if (seenLinks.hasOwnProperty(id)) {
+        return gotTarget(null, seenLinks[id], base);
+      }
+    }
+    fs.stat(base, function(err) {
+      if (err) return cb(err);
+
+      fs.readlink(base, function(err, target) {
+        if (!isWindows) seenLinks[id] = target;
+        gotTarget(err, target);
+      });
+    });
+  }
+
+  function gotTarget(err, target, base) {
+    if (err) return cb(err);
+
+    var resolvedLink = pathModule.resolve(previous, target);
+    if (cache) cache[base] = resolvedLink;
+    gotResolvedLink(resolvedLink);
+  }
+
+  function gotResolvedLink(resolvedLink) {
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
+};
+
+
+/***/ }),
+/* 505 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = minimatch
+minimatch.Minimatch = Minimatch
+
+var path = { sep: '/' }
+try {
+  path = __webpack_require__(16)
+} catch (er) {}
+
+var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
+var expand = __webpack_require__(506)
+
+var plTypes = {
+  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
+  '?': { open: '(?:', close: ')?' },
+  '+': { open: '(?:', close: ')+' },
+  '*': { open: '(?:', close: ')*' },
+  '@': { open: '(?:', close: ')' }
+}
+
+// any single thing other than /
+// don't need to escape / when using new RegExp()
+var qmark = '[^/]'
+
+// * => any number of characters
+var star = qmark + '*?'
+
+// ** when dots are allowed.  Anything goes, except .. and .
+// not (^ or / followed by one or two dots followed by $ or /),
+// followed by anything, any number of times.
+var twoStarDot = '(?:(?!(?:\\\/|^)(?:\\.{1,2})($|\\\/)).)*?'
+
+// not a ^ or / followed by a dot,
+// followed by anything, any number of times.
+var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
+
+// characters that need to be escaped in RegExp.
+var reSpecials = charSet('().*{}+?[]^$\\!')
+
+// "abc" -> { a:true, b:true, c:true }
+function charSet (s) {
+  return s.split('').reduce(function (set, c) {
+    set[c] = true
+    return set
+  }, {})
+}
+
+// normalizes slashes.
+var slashSplit = /\/+/
+
+minimatch.filter = filter
+function filter (pattern, options) {
+  options = options || {}
+  return function (p, i, list) {
+    return minimatch(p, pattern, options)
+  }
+}
+
+function ext (a, b) {
+  a = a || {}
+  b = b || {}
+  var t = {}
+  Object.keys(b).forEach(function (k) {
+    t[k] = b[k]
+  })
+  Object.keys(a).forEach(function (k) {
+    t[k] = a[k]
+  })
+  return t
+}
+
+minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return minimatch
+
+  var orig = minimatch
+
+  var m = function minimatch (p, pattern, options) {
+    return orig.minimatch(p, pattern, ext(def, options))
+  }
+
+  m.Minimatch = function Minimatch (pattern, options) {
+    return new orig.Minimatch(pattern, ext(def, options))
+  }
+
+  return m
+}
+
+Minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return Minimatch
+  return minimatch.defaults(def).Minimatch
+}
+
+function minimatch (p, pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
+
+  if (!options) options = {}
+
+  // shortcut: comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    return false
+  }
+
+  // "" only matches ""
+  if (pattern.trim() === '') return p === ''
+
+  return new Minimatch(pattern, options).match(p)
+}
+
+function Minimatch (pattern, options) {
+  if (!(this instanceof Minimatch)) {
+    return new Minimatch(pattern, options)
+  }
+
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
+
+  if (!options) options = {}
+  pattern = pattern.trim()
+
+  // windows support: need to use /, not \
+  if (path.sep !== '/') {
+    pattern = pattern.split(path.sep).join('/')
+  }
+
+  this.options = options
+  this.set = []
+  this.pattern = pattern
+  this.regexp = null
+  this.negate = false
+  this.comment = false
+  this.empty = false
+
+  // make the set of regexps etc.
+  this.make()
+}
+
+Minimatch.prototype.debug = function () {}
+
+Minimatch.prototype.make = make
+function make () {
+  // don't do it more than once.
+  if (this._made) return
+
+  var pattern = this.pattern
+  var options = this.options
+
+  // empty patterns and comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    this.comment = true
+    return
+  }
+  if (!pattern) {
+    this.empty = true
+    return
+  }
+
+  // step 1: figure out negation, etc.
+  this.parseNegate()
+
+  // step 2: expand braces
+  var set = this.globSet = this.braceExpand()
+
+  if (options.debug) this.debug = console.error
+
+  this.debug(this.pattern, set)
+
+  // step 3: now we have a set, so turn each one into a series of path-portion
+  // matching patterns.
+  // These will be regexps, except in the case of "**", which is
+  // set to the GLOBSTAR object for globstar behavior,
+  // and will not contain any / characters
+  set = this.globParts = set.map(function (s) {
+    return s.split(slashSplit)
+  })
+
+  this.debug(this.pattern, set)
+
+  // glob --> regexps
+  set = set.map(function (s, si, set) {
+    return s.map(this.parse, this)
+  }, this)
+
+  this.debug(this.pattern, set)
+
+  // filter out everything that didn't compile properly.
+  set = set.filter(function (s) {
+    return s.indexOf(false) === -1
+  })
+
+  this.debug(this.pattern, set)
+
+  this.set = set
+}
+
+Minimatch.prototype.parseNegate = parseNegate
+function parseNegate () {
+  var pattern = this.pattern
+  var negate = false
+  var options = this.options
+  var negateOffset = 0
+
+  if (options.nonegate) return
+
+  for (var i = 0, l = pattern.length
+    ; i < l && pattern.charAt(i) === '!'
+    ; i++) {
+    negate = !negate
+    negateOffset++
+  }
+
+  if (negateOffset) this.pattern = pattern.substr(negateOffset)
+  this.negate = negate
+}
+
+// Brace expansion:
+// a{b,c}d -> abd acd
+// a{b,}c -> abc ac
+// a{0..3}d -> a0d a1d a2d a3d
+// a{b,c{d,e}f}g -> abg acdfg acefg
+// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg
+//
+// Invalid sets are not expanded.
+// a{2..}b -> a{2..}b
+// a{b}c -> a{b}c
+minimatch.braceExpand = function (pattern, options) {
+  return braceExpand(pattern, options)
+}
+
+Minimatch.prototype.braceExpand = braceExpand
+
+function braceExpand (pattern, options) {
+  if (!options) {
+    if (this instanceof Minimatch) {
+      options = this.options
+    } else {
+      options = {}
+    }
+  }
+
+  pattern = typeof pattern === 'undefined'
+    ? this.pattern : pattern
+
+  if (typeof pattern === 'undefined') {
+    throw new TypeError('undefined pattern')
+  }
+
+  if (options.nobrace ||
+    !pattern.match(/\{.*\}/)) {
+    // shortcut. no need to expand.
+    return [pattern]
+  }
+
+  return expand(pattern)
 }
-},
-rules: [/^(?:$)/,/^(?:\s+)/,/^(?:\+)/,/^(?:\()/,/^(?:\))/,/^(?::)/,/^(?:DocumentRef-([0-9A-Za-z-+.]+))/,/^(?:LicenseRef-([0-9A-Za-z-+.]+))/,/^(?:AND)/,/^(?:OR)/,/^(?:WITH)/,/^(?:BSD-3-Clause-No-Nuclear-License-2014)/,/^(?:BSD-3-Clause-No-Nuclear-Warranty)/,/^(?:GPL-2\.0-with-classpath-exception)/,/^(?:GPL-3\.0-with-autoconf-exception)/,/^(?:GPL-2\.0-with-autoconf-exception)/,/^(?:BSD-3-Clause-No-Nuclear-License)/,/^(?:MPL-2\.0-no-copyleft-exception)/,/^(?:GPL-2\.0-with-bison-exception)/,/^(?:GPL-2\.0-with-font-exception)/,/^(?:GPL-2\.0-with-GCC-exception)/,/^(?:CNRI-Python-GPL-Compatible)/,/^(?:GPL-3\.0-with-GCC-exception)/,/^(?:BSD-3-Clause-Attribution)/,/^(?:Classpath-exception-2\.0)/,/^(?:WxWindows-exception-3\.1)/,/^(?:freertos-exception-2\.0)/,/^(?:Autoconf-exception-3\.0)/,/^(?:i2p-gpl-java-exception)/,/^(?:gnu-javamail-exception)/,/^(?:Nokia-Qt-exception-1\.1)/,/^(?:Autoconf-exception-2\.0)/,/^(?:BSD-2-Clause-FreeBSD)/,/^(?:u-boot-exception-2\.0)/,/^(?:zlib-acknowledgement)/,/^(?:Bison-exception-2\.2)/,/^(?:BSD-2-Clause-NetBSD)/,/^(?:CLISP-exception-2\.0)/,/^(?:eCos-exception-2\.0)/,/^(?:BSD-3-Clause-Clear)/,/^(?:Font-exception-2\.0)/,/^(?:FLTK-exception-2\.0)/,/^(?:GCC-exception-2\.0)/,/^(?:Qwt-exception-1\.0)/,/^(?:Libtool-exception)/,/^(?:BSD-3-Clause-LBNL)/,/^(?:GCC-exception-3\.1)/,/^(?:Artistic-1\.0-Perl)/,/^(?:Artistic-1\.0-cl8)/,/^(?:CC-BY-NC-SA-2\.5)/,/^(?:MIT-advertising)/,/^(?:BSD-Source-Code)/,/^(?:CC-BY-NC-SA-4\.0)/,/^(?:LiLiQ-Rplus-1\.1)/,/^(?:CC-BY-NC-SA-3\.0)/,/^(?:BSD-4-Clause-UC)/,/^(?:CC-BY-NC-SA-2\.0)/,/^(?:CC-BY-NC-SA-1\.0)/,/^(?:CC-BY-NC-ND-4\.0)/,/^(?:CC-BY-NC-ND-3\.0)/,/^(?:CC-BY-NC-ND-2\.5)/,/^(?:CC-BY-NC-ND-2\.0)/,/^(?:CC-BY-NC-ND-1\.0)/,/^(?:LZMA-exception)/,/^(?:BitTorrent-1\.1)/,/^(?:CrystalStacker)/,/^(?:FLTK-exception)/,/^(?:SugarCRM-1\.1\.3)/,/^(?:BSD-Protection)/,/^(?:BitTorrent-1\.0)/,/^(?:HaskellReport)/,/^(?:Interbase-1\.0)/,/^(?:StandardML-NJ)/,/^(?:mif-exception)/,/^(?:Frameworx-1\.0)/,/^(?:389-exception)/,/^(?:CC-BY-NC-2\.0)/,/^(?:CC-BY-NC-2\.5)/,/^(?:CC-BY-NC-3\.0)/,/^(?:CC-BY-NC-4\.0)/,/^(?:W3C-19980720)/,/^(?:CC-BY-SA-1\.0)/,/^(?:CC-BY-SA-2\.0)/,/^(?:CC-BY-SA-2\.5)/,/^(?:CC-BY-ND-2\.0)/,/^(?:CC-BY-SA-4\.0)/,/^(?:CC-BY-SA-3\.0)/,/^(?:Artistic-1\.0)/,/^(?:Artistic-2\.0)/,/^(?:CC-BY-ND-2\.5)/,/^(?:CC-BY-ND-3\.0)/,/^(?:CC-BY-ND-4\.0)/,/^(?:CC-BY-ND-1\.0)/,/^(?:BSD-4-Clause)/,/^(?:BSD-3-Clause)/,/^(?:BSD-2-Clause)/,/^(?:CC-BY-NC-1\.0)/,/^(?:bzip2-1\.0\.6)/,/^(?:Unicode-TOU)/,/^(?:CNRI-Jython)/,/^(?:ImageMagick)/,/^(?:Adobe-Glyph)/,/^(?:CUA-OPL-1\.0)/,/^(?:OLDAP-2\.2\.2)/,/^(?:LiLiQ-R-1\.1)/,/^(?:bzip2-1\.0\.5)/,/^(?:LiLiQ-P-1\.1)/,/^(?:OLDAP-2\.0\.1)/,/^(?:OLDAP-2\.2\.1)/,/^(?:CNRI-Python)/,/^(?:XFree86-1\.1)/,/^(?:OSET-PL-2\.1)/,/^(?:Apache-2\.0)/,/^(?:Watcom-1\.0)/,/^(?:PostgreSQL)/,/^(?:Python-2\.0)/,/^(?:RHeCos-1\.1)/,/^(?:EUDatagrid)/,/^(?:Spencer-99)/,/^(?:Intel-ACPI)/,/^(?:CECILL-1\.0)/,/^(?:CECILL-1\.1)/,/^(?:JasPer-2\.0)/,/^(?:CECILL-2\.0)/,/^(?:CECILL-2\.1)/,/^(?:gSOAP-1\.3b)/,/^(?:Spencer-94)/,/^(?:Apache-1\.1)/,/^(?:Spencer-86)/,/^(?:Apache-1\.0)/,/^(?:ClArtistic)/,/^(?:TORQUE-1\.1)/,/^(?:CATOSL-1\.1)/,/^(?:Adobe-2006)/,/^(?:Zimbra-1\.4)/,/^(?:Zimbra-1\.3)/,/^(?:Condor-1\.1)/,/^(?:CC-BY-3\.0)/,/^(?:CC-BY-2\.5)/,/^(?:OLDAP-2\.4)/,/^(?:SGI-B-1\.1)/,/^(?:SISSL-1\.2)/,/^(?:SGI-B-1\.0)/,/^(?:OLDAP-2\.3)/,/^(?:CC-BY-4\.0)/,/^(?:Crossword)/,/^(?:SimPL-2\.0)/,/^(?:OLDAP-2\.2)/,/^(?:OLDAP-2\.1)/,/^(?:ErlPL-1\.1)/,/^(?:LPPL-1\.3a)/,/^(?:LPPL-1\.3c)/,/^(?:OLDAP-2\.0)/,/^(?:Leptonica)/,/^(?:CPOL-1\.02)/,/^(?:OLDAP-1\.4)/,/^(?:OLDAP-1\.3)/,/^(?:CC-BY-2\.0)/,/^(?:Unlicense)/,/^(?:OLDAP-2\.8)/,/^(?:OLDAP-1\.2)/,/^(?:MakeIndex)/,/^(?:OLDAP-2\.7)/,/^(?:OLDAP-1\.1)/,/^(?:Sleepycat)/,/^(?:D-FSL-1\.0)/,/^(?:CC-BY-1\.0)/,/^(?:OLDAP-2\.6)/,/^(?:WXwindows)/,/^(?:NPOSL-3\.0)/,/^(?:FreeImage)/,/^(?:SGI-B-2\.0)/,/^(?:OLDAP-2\.5)/,/^(?:Beerware)/,/^(?:Newsletr)/,/^(?:NBPL-1\.0)/,/^(?:NASA-1\.3)/,/^(?:NLOD-1\.0)/,/^(?:AGPL-1\.0)/,/^(?:OCLC-2\.0)/,/^(?:ODbL-1\.0)/,/^(?:PDDL-1\.0)/,/^(?:Motosoto)/,/^(?:Afmparse)/,/^(?:ANTLR-PD)/,/^(?:LPL-1\.02)/,/^(?:Abstyles)/,/^(?:eCos-2\.0)/,/^(?:APSL-1\.0)/,/^(?:LPPL-1\.2)/,/^(?:LPPL-1\.1)/,/^(?:LPPL-1\.0)/,/^(?:APSL-1\.1)/,/^(?:APSL-2\.0)/,/^(?:Info-ZIP)/,/^(?:Zend-2\.0)/,/^(?:IBM-pibs)/,/^(?:LGPL-2\.0)/,/^(?:LGPL-3\.0)/,/^(?:LGPL-2\.1)/,/^(?:GFDL-1\.3)/,/^(?:PHP-3\.01)/,/^(?:GFDL-1\.2)/,/^(?:GFDL-1\.1)/,/^(?:AGPL-3\.0)/,/^(?:Giftware)/,/^(?:EUPL-1\.1)/,/^(?:RPSL-1\.0)/,/^(?:EUPL-1\.0)/,/^(?:MIT-enna)/,/^(?:CECILL-B)/,/^(?:diffmark)/,/^(?:CECILL-C)/,/^(?:CDDL-1\.0)/,/^(?:Sendmail)/,/^(?:CDDL-1\.1)/,/^(?:CPAL-1\.0)/,/^(?:APSL-1\.2)/,/^(?:NPL-1\.1)/,/^(?:AFL-1\.2)/,/^(?:Caldera)/,/^(?:AFL-2\.0)/,/^(?:FSFULLR)/,/^(?:AFL-2\.1)/,/^(?:VSL-1\.0)/,/^(?:VOSTROM)/,/^(?:UPL-1\.0)/,/^(?:Dotseqn)/,/^(?:CPL-1\.0)/,/^(?:dvipdfm)/,/^(?:EPL-1\.0)/,/^(?:OCCT-PL)/,/^(?:ECL-1\.0)/,/^(?:Latex2e)/,/^(?:ECL-2\.0)/,/^(?:GPL-1\.0)/,/^(?:GPL-2\.0)/,/^(?:GPL-3\.0)/,/^(?:AFL-3\.0)/,/^(?:LAL-1\.2)/,/^(?:LAL-1\.3)/,/^(?:EFL-1\.0)/,/^(?:EFL-2\.0)/,/^(?:gnuplot)/,/^(?:Aladdin)/,/^(?:LPL-1\.0)/,/^(?:libtiff)/,/^(?:Entessa)/,/^(?:AMDPLPA)/,/^(?:IPL-1\.0)/,/^(?:OPL-1\.0)/,/^(?:OSL-1\.0)/,/^(?:OSL-1\.1)/,/^(?:OSL-2\.0)/,/^(?:OSL-2\.1)/,/^(?:OSL-3\.0)/,/^(?:OpenSSL)/,/^(?:ZPL-2\.1)/,/^(?:PHP-3\.0)/,/^(?:ZPL-2\.0)/,/^(?:ZPL-1\.1)/,/^(?:CC0-1\.0)/,/^(?:SPL-1\.0)/,/^(?:psutils)/,/^(?:MPL-1\.0)/,/^(?:QPL-1\.0)/,/^(?:MPL-1\.1)/,/^(?:MPL-2\.0)/,/^(?:APL-1\.0)/,/^(?:RPL-1\.1)/,/^(?:RPL-1\.5)/,/^(?:MIT-CMU)/,/^(?:Multics)/,/^(?:Eurosym)/,/^(?:BSL-1\.0)/,/^(?:MIT-feh)/,/^(?:Saxpath)/,/^(?:Borceux)/,/^(?:OFL-1\.1)/,/^(?:OFL-1\.0)/,/^(?:AFL-1\.1)/,/^(?:YPL-1\.1)/,/^(?:YPL-1\.0)/,/^(?:NPL-1\.0)/,/^(?:iMatix)/,/^(?:mpich2)/,/^(?:APAFML)/,/^(?:Bahyph)/,/^(?:RSA-MD)/,/^(?:psfrag)/,/^(?:Plexus)/,/^(?:eGenix)/,/^(?:Glulxe)/,/^(?:SAX-PD)/,/^(?:Imlib2)/,/^(?:Wsuipa)/,/^(?:LGPLLR)/,/^(?:Libpng)/,/^(?:xinetd)/,/^(?:MITNFA)/,/^(?:NetCDF)/,/^(?:Naumen)/,/^(?:SMPPL)/,/^(?:Nunit)/,/^(?:FSFUL)/,/^(?:GL2PS)/,/^(?:SMLNJ)/,/^(?:Rdisc)/,/^(?:Noweb)/,/^(?:Nokia)/,/^(?:SISSL)/,/^(?:Qhull)/,/^(?:Intel)/,/^(?:Glide)/,/^(?:Xerox)/,/^(?:AMPAS)/,/^(?:WTFPL)/,/^(?:MS-PL)/,/^(?:XSkat)/,/^(?:MS-RL)/,/^(?:MirOS)/,/^(?:RSCPL)/,/^(?:TMate)/,/^(?:OGTSL)/,/^(?:FSFAP)/,/^(?:NCSA)/,/^(?:Zlib)/,/^(?:SCEA)/,/^(?:SNIA)/,/^(?:NGPL)/,/^(?:NOSL)/,/^(?:ADSL)/,/^(?:MTLL)/,/^(?:NLPL)/,/^(?:Ruby)/,/^(?:JSON)/,/^(?:Barr)/,/^(?:0BSD)/,/^(?:Xnet)/,/^(?:Cube)/,/^(?:curl)/,/^(?:DSDP)/,/^(?:Fair)/,/^(?:HPND)/,/^(?:TOSL)/,/^(?:IJG)/,/^(?:SWL)/,/^(?:Vim)/,/^(?:FTL)/,/^(?:ICU)/,/^(?:OML)/,/^(?:NRL)/,/^(?:DOC)/,/^(?:TCL)/,/^(?:W3C)/,/^(?:NTP)/,/^(?:IPA)/,/^(?:ISC)/,/^(?:X11)/,/^(?:AAL)/,/^(?:AML)/,/^(?:xpp)/,/^(?:Zed)/,/^(?:MIT)/,/^(?:Mup)/],
-conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364],"inclusive":true}}
-});
-return lexer;
-})();
-parser.lexer = lexer;
-function Parser () {
-  this.yy = {};
+
+// parse a component of the expanded set.
+// At this point, no pattern may contain "/" in it
+// so we're going to return a 2d array, where each entry is the full
+// pattern, split on '/', and then turned into a regular expression.
+// A regexp is made at the end which joins each array with an
+// escaped /, and another full one which joins each regexp with |.
+//
+// Following the lead of Bash 4.1, note that "**" only has special meaning
+// when it is the *only* thing in a path portion.  Otherwise, any series
+// of * is equivalent to a single *.  Globstar behavior is enabled by
+// default, and can be disabled by setting options.noglobstar.
+Minimatch.prototype.parse = parse
+var SUBPARSE = {}
+function parse (pattern, isSub) {
+  if (pattern.length > 1024 * 64) {
+    throw new TypeError('pattern is too long')
+  }
+
+  var options = this.options
+
+  // shortcuts
+  if (!options.noglobstar && pattern === '**') return GLOBSTAR
+  if (pattern === '') return ''
+
+  var re = ''
+  var hasMagic = !!options.nocase
+  var escaping = false
+  // ? => one single character
+  var patternListStack = []
+  var negativeLists = []
+  var stateChar
+  var inClass = false
+  var reClassStart = -1
+  var classStart = -1
+  // . and .. never match anything that doesn't start with .,
+  // even when options.dot is set.
+  var patternStart = pattern.charAt(0) === '.' ? '' // anything
+  // not (start or / followed by . or .. followed by / or end)
+  : options.dot ? '(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))'
+  : '(?!\\.)'
+  var self = this
+
+  function clearStateChar () {
+    if (stateChar) {
+      // we had some state-tracking character
+      // that wasn't consumed by this pass.
+      switch (stateChar) {
+        case '*':
+          re += star
+          hasMagic = true
+        break
+        case '?':
+          re += qmark
+          hasMagic = true
+        break
+        default:
+          re += '\\' + stateChar
+        break
+      }
+      self.debug('clearStateChar %j %j', stateChar, re)
+      stateChar = false
+    }
+  }
+
+  for (var i = 0, len = pattern.length, c
+    ; (i < len) && (c = pattern.charAt(i))
+    ; i++) {
+    this.debug('%s\t%s %s %j', pattern, i, re, c)
+
+    // skip over any that are escaped.
+    if (escaping && reSpecials[c]) {
+      re += '\\' + c
+      escaping = false
+      continue
+    }
+
+    switch (c) {
+      case '/':
+        // completely not allowed, even escaped.
+        // Should already be path-split by now.
+        return false
+
+      case '\\':
+        clearStateChar()
+        escaping = true
+      continue
+
+      // the various stateChar values
+      // for the "extglob" stuff.
+      case '?':
+      case '*':
+      case '+':
+      case '@':
+      case '!':
+        this.debug('%s\t%s %s %j <-- stateChar', pattern, i, re, c)
+
+        // all of those are literals inside a class, except that
+        // the glob [!a] means [^a] in regexp
+        if (inClass) {
+          this.debug('  in class')
+          if (c === '!' && i === classStart + 1) c = '^'
+          re += c
+          continue
+        }
+
+        // if we already have a stateChar, then it means
+        // that there was something like ** or +? in there.
+        // Handle the stateChar, then proceed with this one.
+        self.debug('call clearStateChar %j', stateChar)
+        clearStateChar()
+        stateChar = c
+        // if extglob is disabled, then +(asdf|foo) isn't a thing.
+        // just clear the statechar *now*, rather than even diving into
+        // the patternList stuff.
+        if (options.noext) clearStateChar()
+      continue
+
+      case '(':
+        if (inClass) {
+          re += '('
+          continue
+        }
+
+        if (!stateChar) {
+          re += '\\('
+          continue
+        }
+
+        patternListStack.push({
+          type: stateChar,
+          start: i - 1,
+          reStart: re.length,
+          open: plTypes[stateChar].open,
+          close: plTypes[stateChar].close
+        })
+        // negation is (?:(?!js)[^/]*)
+        re += stateChar === '!' ? '(?:(?!(?:' : '(?:'
+        this.debug('plType %j %j', stateChar, re)
+        stateChar = false
+      continue
+
+      case ')':
+        if (inClass || !patternListStack.length) {
+          re += '\\)'
+          continue
+        }
+
+        clearStateChar()
+        hasMagic = true
+        var pl = patternListStack.pop()
+        // negation is (?:(?!js)[^/]*)
+        // The others are (?:<pattern>)<type>
+        re += pl.close
+        if (pl.type === '!') {
+          negativeLists.push(pl)
+        }
+        pl.reEnd = re.length
+      continue
+
+      case '|':
+        if (inClass || !patternListStack.length || escaping) {
+          re += '\\|'
+          escaping = false
+          continue
+        }
+
+        clearStateChar()
+        re += '|'
+      continue
+
+      // these are mostly the same in regexp and glob
+      case '[':
+        // swallow any state-tracking char before the [
+        clearStateChar()
+
+        if (inClass) {
+          re += '\\' + c
+          continue
+        }
+
+        inClass = true
+        classStart = i
+        reClassStart = re.length
+        re += c
+      continue
+
+      case ']':
+        //  a right bracket shall lose its special
+        //  meaning and represent itself in
+        //  a bracket expression if it occurs
+        //  first in the list.  -- POSIX.2 2.8.3.2
+        if (i === classStart + 1 || !inClass) {
+          re += '\\' + c
+          escaping = false
+          continue
+        }
+
+        // handle the case where we left a class open.
+        // "[z-a]" is valid, equivalent to "\[z-a\]"
+        if (inClass) {
+          // split where the last [ was, make sure we don't have
+          // an invalid re. if so, re-walk the contents of the
+          // would-be class to re-translate any characters that
+          // were passed through as-is
+          // TODO: It would probably be faster to determine this
+          // without a try/catch and a new RegExp, but it's tricky
+          // to do safely.  For now, this is safe and works.
+          var cs = pattern.substring(classStart + 1, i)
+          try {
+            RegExp('[' + cs + ']')
+          } catch (er) {
+            // not a valid class!
+            var sp = this.parse(cs, SUBPARSE)
+            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
+            hasMagic = hasMagic || sp[1]
+            inClass = false
+            continue
+          }
+        }
+
+        // finish up the class.
+        hasMagic = true
+        inClass = false
+        re += c
+      continue
+
+      default:
+        // swallow any state char that wasn't consumed
+        clearStateChar()
+
+        if (escaping) {
+          // no need
+          escaping = false
+        } else if (reSpecials[c]
+          && !(c === '^' && inClass)) {
+          re += '\\'
+        }
+
+        re += c
+
+    } // switch
+  } // for
+
+  // handle the case where we left a class open.
+  // "[abc" is valid, equivalent to "\[abc"
+  if (inClass) {
+    // split where the last [ was, and escape it
+    // this is a huge pita.  We now have to re-walk
+    // the contents of the would-be class to re-translate
+    // any characters that were passed through as-is
+    cs = pattern.substr(classStart + 1)
+    sp = this.parse(cs, SUBPARSE)
+    re = re.substr(0, reClassStart) + '\\[' + sp[0]
+    hasMagic = hasMagic || sp[1]
+  }
+
+  // handle the case where we had a +( thing at the *end*
+  // of the pattern.
+  // each pattern list stack adds 3 chars, and we need to go through
+  // and escape any | chars that were passed through as-is for the regexp.
+  // Go through and escape them, taking care not to double-escape any
+  // | chars that were already escaped.
+  for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
+    var tail = re.slice(pl.reStart + pl.open.length)
+    this.debug('setting tail', re, pl)
+    // maybe some even number of \, then maybe 1 \, followed by a |
+    tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) {
+      if (!$2) {
+        // the | isn't already escaped, so escape it.
+        $2 = '\\'
+      }
+
+      // need to escape all those slashes *again*, without escaping the
+      // one that we need for escaping the | character.  As it works out,
+      // escaping an even number of slashes can be done by simply repeating
+      // it exactly after itself.  That's why this trick works.
+      //
+      // I am sorry that you have to see this.
+      return $1 + $1 + $2 + '|'
+    })
+
+    this.debug('tail=%j\n   %s', tail, tail, pl, re)
+    var t = pl.type === '*' ? star
+      : pl.type === '?' ? qmark
+      : '\\' + pl.type
+
+    hasMagic = true
+    re = re.slice(0, pl.reStart) + t + '\\(' + tail
+  }
+
+  // handle trailing things that only matter at the very end.
+  clearStateChar()
+  if (escaping) {
+    // trailing \\
+    re += '\\\\'
+  }
+
+  // only need to apply the nodot start if the re starts with
+  // something that could conceivably capture a dot
+  var addPatternStart = false
+  switch (re.charAt(0)) {
+    case '.':
+    case '[':
+    case '(': addPatternStart = true
+  }
+
+  // Hack to work around lack of negative lookbehind in JS
+  // A pattern like: *.!(x).!(y|z) needs to ensure that a name
+  // like 'a.xyz.yz' doesn't match.  So, the first negative
+  // lookahead, has to look ALL the way ahead, to the end of
+  // the pattern.
+  for (var n = negativeLists.length - 1; n > -1; n--) {
+    var nl = negativeLists[n]
+
+    var nlBefore = re.slice(0, nl.reStart)
+    var nlFirst = re.slice(nl.reStart, nl.reEnd - 8)
+    var nlLast = re.slice(nl.reEnd - 8, nl.reEnd)
+    var nlAfter = re.slice(nl.reEnd)
+
+    nlLast += nlAfter
+
+    // Handle nested stuff like *(*.js|!(*.json)), where open parens
+    // mean that we should *not* include the ) in the bit that is considered
+    // "after" the negated section.
+    var openParensBefore = nlBefore.split('(').length - 1
+    var cleanAfter = nlAfter
+    for (i = 0; i < openParensBefore; i++) {
+      cleanAfter = cleanAfter.replace(/\)[+*?]?/, '')
+    }
+    nlAfter = cleanAfter
+
+    var dollar = ''
+    if (nlAfter === '' && isSub !== SUBPARSE) {
+      dollar = '$'
+    }
+    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
+    re = newRe
+  }
+
+  // if the re is not "" at this point, then we need to make sure
+  // it doesn't match against an empty path part.
+  // Otherwise a/* will match a/, which it should not.
+  if (re !== '' && hasMagic) {
+    re = '(?=.)' + re
+  }
+
+  if (addPatternStart) {
+    re = patternStart + re
+  }
+
+  // parsing just a piece of a larger pattern.
+  if (isSub === SUBPARSE) {
+    return [re, hasMagic]
+  }
+
+  // skip the regexp for non-magical patterns
+  // unescape anything in it, though, so that it'll be
+  // an exact match against a file etc.
+  if (!hasMagic) {
+    return globUnescape(pattern)
+  }
+
+  var flags = options.nocase ? 'i' : ''
+  try {
+    var regExp = new RegExp('^' + re + '$', flags)
+  } catch (er) {
+    // If it was an invalid regular expression, then it can't match
+    // anything.  This trick looks for a character after the end of
+    // the string, which is of course impossible, except in multi-line
+    // mode, but it's not a /m regex.
+    return new RegExp('$.')
+  }
+
+  regExp._glob = pattern
+  regExp._src = re
+
+  return regExp
+}
+
+minimatch.makeRe = function (pattern, options) {
+  return new Minimatch(pattern, options || {}).makeRe()
+}
+
+Minimatch.prototype.makeRe = makeRe
+function makeRe () {
+  if (this.regexp || this.regexp === false) return this.regexp
+
+  // at this point, this.set is a 2d array of partial
+  // pattern strings, or "**".
+  //
+  // It's better to use .match().  This function shouldn't
+  // be used, really, but it's pretty convenient sometimes,
+  // when you just want to work with a regex.
+  var set = this.set
+
+  if (!set.length) {
+    this.regexp = false
+    return this.regexp
+  }
+  var options = this.options
+
+  var twoStar = options.noglobstar ? star
+    : options.dot ? twoStarDot
+    : twoStarNoDot
+  var flags = options.nocase ? 'i' : ''
+
+  var re = set.map(function (pattern) {
+    return pattern.map(function (p) {
+      return (p === GLOBSTAR) ? twoStar
+      : (typeof p === 'string') ? regExpEscape(p)
+      : p._src
+    }).join('\\\/')
+  }).join('|')
+
+  // must match entire pattern
+  // ending in a * or ** will make it less strict.
+  re = '^(?:' + re + ')$'
+
+  // can match anything, as long as it's not this.
+  if (this.negate) re = '^(?!' + re + ').*$'
+
+  try {
+    this.regexp = new RegExp(re, flags)
+  } catch (ex) {
+    this.regexp = false
+  }
+  return this.regexp
+}
+
+minimatch.match = function (list, pattern, options) {
+  options = options || {}
+  var mm = new Minimatch(pattern, options)
+  list = list.filter(function (f) {
+    return mm.match(f)
+  })
+  if (mm.options.nonull && !list.length) {
+    list.push(pattern)
+  }
+  return list
+}
+
+Minimatch.prototype.match = match
+function match (f, partial) {
+  this.debug('match', f, this.pattern)
+  // short-circuit in the case of busted things.
+  // comments, etc.
+  if (this.comment) return false
+  if (this.empty) return f === ''
+
+  if (f === '/' && partial) return true
+
+  var options = this.options
+
+  // windows: need to use /, not \
+  if (path.sep !== '/') {
+    f = f.split(path.sep).join('/')
+  }
+
+  // treat the test path as a set of pathparts.
+  f = f.split(slashSplit)
+  this.debug(this.pattern, 'split', f)
+
+  // just ONE of the pattern sets in this.set needs to match
+  // in order for it to be valid.  If negating, then just one
+  // match means that we have failed.
+  // Either way, return on the first hit.
+
+  var set = this.set
+  this.debug(this.pattern, 'set', set)
+
+  // Find the basename of the path by looking for the last non-empty segment
+  var filename
+  var i
+  for (i = f.length - 1; i >= 0; i--) {
+    filename = f[i]
+    if (filename) break
+  }
+
+  for (i = 0; i < set.length; i++) {
+    var pattern = set[i]
+    var file = f
+    if (options.matchBase && pattern.length === 1) {
+      file = [filename]
+    }
+    var hit = this.matchOne(file, pattern, partial)
+    if (hit) {
+      if (options.flipNegate) return true
+      return !this.negate
+    }
+  }
+
+  // didn't get any hits.  this is success if it's a negative
+  // pattern, failure otherwise.
+  if (options.flipNegate) return false
+  return this.negate
 }
-Parser.prototype = parser;parser.Parser = Parser;
-return new Parser;
-})();
 
+// set partial to true to test if, for example,
+// "/a/b" matches the start of "/*/b/*/d"
+// Partial means, if you run out of file before you run
+// out of pattern, then that's fine, as long as all
+// the parts match.
+Minimatch.prototype.matchOne = function (file, pattern, partial) {
+  var options = this.options
+
+  this.debug('matchOne',
+    { 'this': this, file: file, pattern: pattern })
 
-if (true) {
-exports.parser = spdxparse;
-exports.Parser = spdxparse.Parser;
-exports.parse = function () { return spdxparse.parse.apply(spdxparse, arguments); };
-exports.main = function commonjsMain(args) {
-    if (!args[1]) {
-        console.log('Usage: '+args[0]+' FILE');
-        process.exit(1);
+  this.debug('matchOne', file.length, pattern.length)
+
+  for (var fi = 0,
+      pi = 0,
+      fl = file.length,
+      pl = pattern.length
+      ; (fi < fl) && (pi < pl)
+      ; fi++, pi++) {
+    this.debug('matchOne loop')
+    var p = pattern[pi]
+    var f = file[fi]
+
+    this.debug(pattern, p, f)
+
+    // should be impossible.
+    // some invalid regexp stuff in the set.
+    if (p === false) return false
+
+    if (p === GLOBSTAR) {
+      this.debug('GLOBSTAR', [pattern, p, f])
+
+      // "**"
+      // a/**/b/**/c would match the following:
+      // a/b/x/y/z/c
+      // a/x/y/z/b/c
+      // a/b/x/b/x/c
+      // a/b/c
+      // To do this, take the rest of the pattern after
+      // the **, and see if it would match the file remainder.
+      // If so, return success.
+      // If not, the ** "swallows" a segment, and try again.
+      // This is recursively awful.
+      //
+      // a/**/b/**/c matching a/b/x/y/z/c
+      // - a matches a
+      // - doublestar
+      //   - matchOne(b/x/y/z/c, b/**/c)
+      //     - b matches b
+      //     - doublestar
+      //       - matchOne(x/y/z/c, c) -> no
+      //       - matchOne(y/z/c, c) -> no
+      //       - matchOne(z/c, c) -> no
+      //       - matchOne(c, c) yes, hit
+      var fr = fi
+      var pr = pi + 1
+      if (pr === pl) {
+        this.debug('** at the end')
+        // a ** at the end will just swallow the rest.
+        // We have found a match.
+        // however, it will not swallow /.x, unless
+        // options.dot is set.
+        // . and .. are *never* matched by **, for explosively
+        // exponential reasons.
+        for (; fi < fl; fi++) {
+          if (file[fi] === '.' || file[fi] === '..' ||
+            (!options.dot && file[fi].charAt(0) === '.')) return false
+        }
+        return true
+      }
+
+      // ok, let's see if we can swallow whatever we can.
+      while (fr < fl) {
+        var swallowee = file[fr]
+
+        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
+
+        // XXX remove this slice.  Just pass the start index.
+        if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
+          this.debug('globstar found match!', fr, fl, swallowee)
+          // found a match.
+          return true
+        } else {
+          // can't swallow "." or ".." ever.
+          // can only swallow ".foo" when explicitly asked.
+          if (swallowee === '.' || swallowee === '..' ||
+            (!options.dot && swallowee.charAt(0) === '.')) {
+            this.debug('dot detected!', file, fr, pattern, pr)
+            break
+          }
+
+          // ** swallows a segment, and continue.
+          this.debug('globstar swallow a segment, and continue')
+          fr++
+        }
+      }
+
+      // no match was found.
+      // However, in partial mode, we can't say this is necessarily over.
+      // If there's more *pattern* left, then
+      if (partial) {
+        // ran out of file
+        this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
+        if (fr === fl) return true
+      }
+      return false
     }
-    var source = __webpack_require__(23).readFileSync(__webpack_require__(16).normalize(args[1]), "utf8");
-    return exports.parser.parse(source);
-};
-if ( true && __webpack_require__.c[__webpack_require__.s] === module) {
-  exports.main(process.argv.slice(1));
+
+    // something other than **
+    // non-magic patterns just have to match exactly
+    // patterns with magic have been turned into regexps.
+    var hit
+    if (typeof p === 'string') {
+      if (options.nocase) {
+        hit = f.toLowerCase() === p.toLowerCase()
+      } else {
+        hit = f === p
+      }
+      this.debug('string match', p, f, hit)
+    } else {
+      hit = f.match(p)
+      this.debug('pattern match', p, f, hit)
+    }
+
+    if (!hit) return false
+  }
+
+  // Note: ending in / means that we'll get a final ""
+  // at the end of the pattern.  This can only match a
+  // corresponding "" at the end of the file.
+  // If the file ends in /, then it can only match a
+  // a pattern that ends in /, unless the pattern just
+  // doesn't have any more for it. But, a/b/ should *not*
+  // match "a/b/*", even though "" matches against the
+  // [^/]*? pattern, except in partial mode, where it might
+  // simply not be reached yet.
+  // However, a/b/ should still satisfy a/*
+
+  // now either we fell off the end of the pattern, or we're done.
+  if (fi === fl && pi === pl) {
+    // ran out of pattern and filename at the same time.
+    // an exact hit!
+    return true
+  } else if (fi === fl) {
+    // ran out of file, but still had pattern left.
+    // this is ok if we're doing the match as part of
+    // a glob fs traversal.
+    return partial
+  } else if (pi === pl) {
+    // ran out of pattern, still have file left.
+    // this is only acceptable if we're on the very last
+    // empty segment of a file with a trailing slash.
+    // a/* should match a/b/
+    var emptyFileEnd = (fi === fl - 1) && (file[fi] === '')
+    return emptyFileEnd
+  }
+
+  // should be unreachable.
+  throw new Error('wtf?')
+}
+
+// replace stuff like \* with *
+function globUnescape (s) {
+  return s.replace(/\\(.)/g, '$1')
 }
+
+function regExpEscape (s) {
+  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
 }
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 79 */
+/* 506 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var licenseIDs = __webpack_require__(80);
+var concatMap = __webpack_require__(507);
+var balanced = __webpack_require__(508);
 
-function valid(string) {
-  return licenseIDs.indexOf(string) > -1;
+module.exports = expandTop;
+
+var escSlash = '\0SLASH'+Math.random()+'\0';
+var escOpen = '\0OPEN'+Math.random()+'\0';
+var escClose = '\0CLOSE'+Math.random()+'\0';
+var escComma = '\0COMMA'+Math.random()+'\0';
+var escPeriod = '\0PERIOD'+Math.random()+'\0';
+
+function numeric(str) {
+  return parseInt(str, 10) == str
+    ? parseInt(str, 10)
+    : str.charCodeAt(0);
 }
 
-// Common transpositions of license identifier acronyms
-var transpositions = [
-  ['APGL', 'AGPL'],
-  ['Gpl', 'GPL'],
-  ['GLP', 'GPL'],
-  ['APL', 'Apache'],
-  ['ISD', 'ISC'],
-  ['GLP', 'GPL'],
-  ['IST', 'ISC'],
-  ['Claude', 'Clause'],
-  [' or later', '+'],
-  [' International', ''],
-  ['GNU', 'GPL'],
-  ['GUN', 'GPL'],
-  ['+', ''],
-  ['GNU GPL', 'GPL'],
-  ['GNU/GPL', 'GPL'],
-  ['GNU GLP', 'GPL'],
-  ['GNU General Public License', 'GPL'],
-  ['Gnu public license', 'GPL'],
-  ['GNU Public License', 'GPL'],
-  ['GNU GENERAL PUBLIC LICENSE', 'GPL'],
-  ['MTI', 'MIT'],
-  ['Mozilla Public License', 'MPL'],
-  ['WTH', 'WTF'],
-  ['-License', '']
-];
+function escapeBraces(str) {
+  return str.split('\\\\').join(escSlash)
+            .split('\\{').join(escOpen)
+            .split('\\}').join(escClose)
+            .split('\\,').join(escComma)
+            .split('\\.').join(escPeriod);
+}
 
-var TRANSPOSED = 0;
-var CORRECT = 1;
+function unescapeBraces(str) {
+  return str.split(escSlash).join('\\')
+            .split(escOpen).join('{')
+            .split(escClose).join('}')
+            .split(escComma).join(',')
+            .split(escPeriod).join('.');
+}
 
-// Simple corrections to nearly valid identifiers.
-var transforms = [
-  // e.g. 'mit'
-  function(argument) {
-    return argument.toUpperCase();
-  },
-  // e.g. 'MIT '
-  function(argument) {
-    return argument.trim();
-  },
-  // e.g. 'M.I.T.'
-  function(argument) {
-    return argument.replace(/\./g, '');
-  },
-  // e.g. 'Apache- 2.0'
-  function(argument) {
-    return argument.replace(/\s+/g, '');
-  },
-  // e.g. 'CC BY 4.0''
-  function(argument) {
-    return argument.replace(/\s+/g, '-');
-  },
-  // e.g. 'LGPLv2.1'
-  function(argument) {
-    return argument.replace('v', '-');
-  },
-  // e.g. 'Apache 2.0'
-  function(argument) {
-    return argument.replace(/,?\s*(\d)/, '-$1');
-  },
-  // e.g. 'GPL 2'
-  function(argument) {
-    return argument.replace(/,?\s*(\d)/, '-$1.0');
-  },
-  // e.g. 'Apache Version 2.0'
-  function(argument) {
-    return argument.replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2');
-  },
-  // e.g. 'Apache Version 2'
-  function(argument) {
-    return argument.replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2.0');
-  },
-  // e.g. 'ZLIB'
-  function(argument) {
-    return argument[0].toUpperCase() + argument.slice(1);
-  },
-  // e.g. 'MPL/2.0'
-  function(argument) {
-    return argument.replace('/', '-');
-  },
-  // e.g. 'Apache 2'
-  function(argument) {
-    return argument
-      .replace(/\s*V\s*(\d)/, '-$1')
-      .replace(/(\d)$/, '$1.0');
-  },
-  // e.g. 'GPL-2.0-'
-  function(argument) {
-    return argument.slice(0, argument.length - 1);
-  },
-  // e.g. 'GPL2'
-  function(argument) {
-    return argument.replace(/(\d)$/, '-$1.0');
-  },
-  // e.g. 'BSD 3'
-  function(argument) {
-    return argument.replace(/(-| )?(\d)$/, '-$2-Clause');
-  },
-  // e.g. 'BSD clause 3'
-  function(argument) {
-    return argument.replace(/(-| )clause(-| )(\d)/, '-$3-Clause');
-  },
-  // e.g. 'BY-NC-4.0'
-  function(argument) {
-    return 'CC-' + argument;
-  },
-  // e.g. 'BY-NC'
-  function(argument) {
-    return 'CC-' + argument + '-4.0';
-  },
-  // e.g. 'Attribution-NonCommercial'
-  function(argument) {
-    return argument
-      .replace('Attribution', 'BY')
-      .replace('NonCommercial', 'NC')
-      .replace('NoDerivatives', 'ND')
-      .replace(/ (\d)/, '-$1')
-      .replace(/ ?International/, '');
-  },
-  // e.g. 'Attribution-NonCommercial'
-  function(argument) {
-    return 'CC-' +
-      argument
-      .replace('Attribution', 'BY')
-      .replace('NonCommercial', 'NC')
-      .replace('NoDerivatives', 'ND')
-      .replace(/ (\d)/, '-$1')
-      .replace(/ ?International/, '') +
-      '-4.0';
+
+// Basically just str.split(","), but handling cases
+// where we have nested braced sections, which should be
+// treated as individual members, like {a,{b,c},d}
+function parseCommaParts(str) {
+  if (!str)
+    return [''];
+
+  var parts = [];
+  var m = balanced('{', '}', str);
+
+  if (!m)
+    return str.split(',');
+
+  var pre = m.pre;
+  var body = m.body;
+  var post = m.post;
+  var p = pre.split(',');
+
+  p[p.length-1] += '{' + body + '}';
+  var postParts = parseCommaParts(post);
+  if (post.length) {
+    p[p.length-1] += postParts.shift();
+    p.push.apply(p, postParts);
+  }
+
+  parts.push.apply(parts, p);
+
+  return parts;
+}
+
+function expandTop(str) {
+  if (!str)
+    return [];
+
+  // I don't know why Bash 4.3 does this, but it does.
+  // Anything starting with {} will have the first two bytes preserved
+  // but *only* at the top level, so {},a}b will not expand to anything,
+  // but a{},b}c will be expanded to [a}c,abc].
+  // One could argue that this is a bug in Bash, but since the goal of
+  // this module is to match Bash's rules, we escape a leading {}
+  if (str.substr(0, 2) === '{}') {
+    str = '\\{\\}' + str.substr(2);
+  }
+
+  return expand(escapeBraces(str), true).map(unescapeBraces);
+}
+
+function identity(e) {
+  return e;
+}
+
+function embrace(str) {
+  return '{' + str + '}';
+}
+function isPadded(el) {
+  return /^-?0\d/.test(el);
+}
+
+function lte(i, y) {
+  return i <= y;
+}
+function gte(i, y) {
+  return i >= y;
+}
+
+function expand(str, isTop) {
+  var expansions = [];
+
+  var m = balanced('{', '}', str);
+  if (!m || /\$$/.test(m.pre)) return [str];
+
+  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+  var isSequence = isNumericSequence || isAlphaSequence;
+  var isOptions = m.body.indexOf(',') >= 0;
+  if (!isSequence && !isOptions) {
+    // {a},b}
+    if (m.post.match(/,.*\}/)) {
+      str = m.pre + '{' + m.body + escClose + m.post;
+      return expand(str);
+    }
+    return [str];
+  }
+
+  var n;
+  if (isSequence) {
+    n = m.body.split(/\.\./);
+  } else {
+    n = parseCommaParts(m.body);
+    if (n.length === 1) {
+      // x{{a,b}}y ==> x{a}y x{b}y
+      n = expand(n[0], false).map(embrace);
+      if (n.length === 1) {
+        var post = m.post.length
+          ? expand(m.post, false)
+          : [''];
+        return post.map(function(p) {
+          return m.pre + n[0] + p;
+        });
+      }
+    }
+  }
+
+  // at this point, n is the parts, and we know it's not a comma set
+  // with a single entry.
+
+  // no need to expand pre, since it is guaranteed to be free of brace-sets
+  var pre = m.pre;
+  var post = m.post.length
+    ? expand(m.post, false)
+    : [''];
+
+  var N;
+
+  if (isSequence) {
+    var x = numeric(n[0]);
+    var y = numeric(n[1]);
+    var width = Math.max(n[0].length, n[1].length)
+    var incr = n.length == 3
+      ? Math.abs(numeric(n[2]))
+      : 1;
+    var test = lte;
+    var reverse = y < x;
+    if (reverse) {
+      incr *= -1;
+      test = gte;
+    }
+    var pad = n.some(isPadded);
+
+    N = [];
+
+    for (var i = x; test(i, y); i += incr) {
+      var c;
+      if (isAlphaSequence) {
+        c = String.fromCharCode(i);
+        if (c === '\\')
+          c = '';
+      } else {
+        c = String(i);
+        if (pad) {
+          var need = width - c.length;
+          if (need > 0) {
+            var z = new Array(need + 1).join('0');
+            if (i < 0)
+              c = '-' + z + c.slice(1);
+            else
+              c = z + c;
+          }
+        }
+      }
+      N.push(c);
+    }
+  } else {
+    N = concatMap(n, function(el) { return expand(el, false) });
+  }
+
+  for (var j = 0; j < N.length; j++) {
+    for (var k = 0; k < post.length; k++) {
+      var expansion = pre + N[j] + post[k];
+      if (!isTop || isSequence || expansion)
+        expansions.push(expansion);
+    }
   }
-];
 
-// If all else fails, guess that strings containing certain substrings
-// meant to identify certain licenses.
-var lastResorts = [
-  ['UNLI', 'Unlicense'],
-  ['WTF', 'WTFPL'],
-  ['2 CLAUSE', 'BSD-2-Clause'],
-  ['2-CLAUSE', 'BSD-2-Clause'],
-  ['3 CLAUSE', 'BSD-3-Clause'],
-  ['3-CLAUSE', 'BSD-3-Clause'],
-  ['AFFERO', 'AGPL-3.0'],
-  ['AGPL', 'AGPL-3.0'],
-  ['APACHE', 'Apache-2.0'],
-  ['ARTISTIC', 'Artistic-2.0'],
-  ['Affero', 'AGPL-3.0'],
-  ['BEER', 'Beerware'],
-  ['BOOST', 'BSL-1.0'],
-  ['BSD', 'BSD-2-Clause'],
-  ['ECLIPSE', 'EPL-1.0'],
-  ['FUCK', 'WTFPL'],
-  ['GNU', 'GPL-3.0'],
-  ['LGPL', 'LGPL-3.0'],
-  ['GPL', 'GPL-3.0'],
-  ['MIT', 'MIT'],
-  ['MPL', 'MPL-2.0'],
-  ['X11', 'X11'],
-  ['ZLIB', 'Zlib']
-];
+  return expansions;
+}
 
-var SUBSTRING = 0;
-var IDENTIFIER = 1;
 
-var validTransformation = function(identifier) {
-  for (var i = 0; i < transforms.length; i++) {
-    var transformed = transforms[i](identifier);
-    if (transformed !== identifier && valid(transformed)) {
-      return transformed;
+
+/***/ }),
+/* 507 */
+/***/ (function(module, exports) {
+
+module.exports = function (xs, fn) {
+    var res = [];
+    for (var i = 0; i < xs.length; i++) {
+        var x = fn(xs[i], i);
+        if (isArray(x)) res.push.apply(res, x);
+        else res.push(x);
     }
-  }
-  return null;
+    return res;
 };
 
-var validLastResort = function(identifier) {
-  var upperCased = identifier.toUpperCase();
-  for (var i = 0; i < lastResorts.length; i++) {
-    var lastResort = lastResorts[i];
-    if (upperCased.indexOf(lastResort[SUBSTRING]) > -1) {
-      return lastResort[IDENTIFIER];
-    }
-  }
-  return null;
+var isArray = Array.isArray || function (xs) {
+    return Object.prototype.toString.call(xs) === '[object Array]';
 };
 
-var anyCorrection = function(identifier, check) {
-  for (var i = 0; i < transpositions.length; i++) {
-    var transposition = transpositions[i];
-    var transposed = transposition[TRANSPOSED];
-    if (identifier.indexOf(transposed) > -1) {
-      var corrected = identifier.replace(
-        transposed,
-        transposition[CORRECT]
-      );
-      var checked = check(corrected);
-      if (checked !== null) {
-        return checked;
+
+/***/ }),
+/* 508 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+module.exports = balanced;
+function balanced(a, b, str) {
+  if (a instanceof RegExp) a = maybeMatch(a, str);
+  if (b instanceof RegExp) b = maybeMatch(b, str);
+
+  var r = range(a, b, str);
+
+  return r && {
+    start: r[0],
+    end: r[1],
+    pre: str.slice(0, r[0]),
+    body: str.slice(r[0] + a.length, r[1]),
+    post: str.slice(r[1] + b.length)
+  };
+}
+
+function maybeMatch(reg, str) {
+  var m = str.match(reg);
+  return m ? m[0] : null;
+}
+
+balanced.range = range;
+function range(a, b, str) {
+  var begs, beg, left, right, result;
+  var ai = str.indexOf(a);
+  var bi = str.indexOf(b, ai + 1);
+  var i = ai;
+
+  if (ai >= 0 && bi > 0) {
+    begs = [];
+    left = str.length;
+
+    while (i >= 0 && !result) {
+      if (i == ai) {
+        begs.push(i);
+        ai = str.indexOf(a, i + 1);
+      } else if (begs.length == 1) {
+        result = [ begs.pop(), bi ];
+      } else {
+        beg = begs.pop();
+        if (beg < left) {
+          left = beg;
+          right = bi;
+        }
+
+        bi = str.indexOf(b, i + 1);
       }
+
+      i = ai < bi && ai >= 0 ? ai : bi;
     }
-  }
-  return null;
-};
 
-module.exports = function(identifier) {
-  identifier = identifier.replace(/\+$/, '');
-  if (valid(identifier)) {
-    return identifier;
-  }
-  var transformed = validTransformation(identifier);
-  if (transformed !== null) {
-    return transformed;
-  }
-  transformed = anyCorrection(identifier, function(argument) {
-    if (valid(argument)) {
-      return argument;
+    if (begs.length) {
+      result = [ left, right ];
     }
-    return validTransformation(argument);
-  });
-  if (transformed !== null) {
-    return transformed;
-  }
-  transformed = validLastResort(identifier);
-  if (transformed !== null) {
-    return transformed;
-  }
-  transformed = anyCorrection(identifier, validLastResort);
-  if (transformed !== null) {
-    return transformed;
   }
-  return null;
-};
+
+  return result;
+}
 
 
 /***/ }),
-/* 80 */
-/***/ (function(module) {
+/* 509 */
+/***/ (function(module, exports, __webpack_require__) {
+
+try {
+  var util = __webpack_require__(29);
+  if (typeof util.inherits !== 'function') throw '';
+  module.exports = util.inherits;
+} catch (e) {
+  module.exports = __webpack_require__(510);
+}
 
-module.exports = JSON.parse("[\"Glide\",\"Abstyles\",\"AFL-1.1\",\"AFL-1.2\",\"AFL-2.0\",\"AFL-2.1\",\"AFL-3.0\",\"AMPAS\",\"APL-1.0\",\"Adobe-Glyph\",\"APAFML\",\"Adobe-2006\",\"AGPL-1.0\",\"Afmparse\",\"Aladdin\",\"ADSL\",\"AMDPLPA\",\"ANTLR-PD\",\"Apache-1.0\",\"Apache-1.1\",\"Apache-2.0\",\"AML\",\"APSL-1.0\",\"APSL-1.1\",\"APSL-1.2\",\"APSL-2.0\",\"Artistic-1.0\",\"Artistic-1.0-Perl\",\"Artistic-1.0-cl8\",\"Artistic-2.0\",\"AAL\",\"Bahyph\",\"Barr\",\"Beerware\",\"BitTorrent-1.0\",\"BitTorrent-1.1\",\"BSL-1.0\",\"Borceux\",\"BSD-2-Clause\",\"BSD-2-Clause-FreeBSD\",\"BSD-2-Clause-NetBSD\",\"BSD-3-Clause\",\"BSD-3-Clause-Clear\",\"BSD-4-Clause\",\"BSD-Protection\",\"BSD-Source-Code\",\"BSD-3-Clause-Attribution\",\"0BSD\",\"BSD-4-Clause-UC\",\"bzip2-1.0.5\",\"bzip2-1.0.6\",\"Caldera\",\"CECILL-1.0\",\"CECILL-1.1\",\"CECILL-2.0\",\"CECILL-2.1\",\"CECILL-B\",\"CECILL-C\",\"ClArtistic\",\"MIT-CMU\",\"CNRI-Jython\",\"CNRI-Python\",\"CNRI-Python-GPL-Compatible\",\"CPOL-1.02\",\"CDDL-1.0\",\"CDDL-1.1\",\"CPAL-1.0\",\"CPL-1.0\",\"CATOSL-1.1\",\"Condor-1.1\",\"CC-BY-1.0\",\"CC-BY-2.0\",\"CC-BY-2.5\",\"CC-BY-3.0\",\"CC-BY-4.0\",\"CC-BY-ND-1.0\",\"CC-BY-ND-2.0\",\"CC-BY-ND-2.5\",\"CC-BY-ND-3.0\",\"CC-BY-ND-4.0\",\"CC-BY-NC-1.0\",\"CC-BY-NC-2.0\",\"CC-BY-NC-2.5\",\"CC-BY-NC-3.0\",\"CC-BY-NC-4.0\",\"CC-BY-NC-ND-1.0\",\"CC-BY-NC-ND-2.0\",\"CC-BY-NC-ND-2.5\",\"CC-BY-NC-ND-3.0\",\"CC-BY-NC-ND-4.0\",\"CC-BY-NC-SA-1.0\",\"CC-BY-NC-SA-2.0\",\"CC-BY-NC-SA-2.5\",\"CC-BY-NC-SA-3.0\",\"CC-BY-NC-SA-4.0\",\"CC-BY-SA-1.0\",\"CC-BY-SA-2.0\",\"CC-BY-SA-2.5\",\"CC-BY-SA-3.0\",\"CC-BY-SA-4.0\",\"CC0-1.0\",\"Crossword\",\"CrystalStacker\",\"CUA-OPL-1.0\",\"Cube\",\"curl\",\"D-FSL-1.0\",\"diffmark\",\"WTFPL\",\"DOC\",\"Dotseqn\",\"DSDP\",\"dvipdfm\",\"EPL-1.0\",\"ECL-1.0\",\"ECL-2.0\",\"eGenix\",\"EFL-1.0\",\"EFL-2.0\",\"MIT-advertising\",\"MIT-enna\",\"Entessa\",\"ErlPL-1.1\",\"EUDatagrid\",\"EUPL-1.0\",\"EUPL-1.1\",\"Eurosym\",\"Fair\",\"MIT-feh\",\"Frameworx-1.0\",\"FreeImage\",\"FTL\",\"FSFAP\",\"FSFUL\",\"FSFULLR\",\"Giftware\",\"GL2PS\",\"Glulxe\",\"AGPL-3.0\",\"GFDL-1.1\",\"GFDL-1.2\",\"GFDL-1.3\",\"GPL-1.0\",\"GPL-2.0\",\"GPL-3.0\",\"LGPL-2.1\",\"LGPL-3.0\",\"LGPL-2.0\",\"gnuplot\",\"gSOAP-1.3b\",\"HaskellReport\",\"HPND\",\"IBM-pibs\",\"IPL-1.0\",\"ICU\",\"ImageMagick\",\"iMatix\",\"Imlib2\",\"IJG\",\"Info-ZIP\",\"Intel-ACPI\",\"Intel\",\"Interbase-1.0\",\"IPA\",\"ISC\",\"JasPer-2.0\",\"JSON\",\"LPPL-1.0\",\"LPPL-1.1\",\"LPPL-1.2\",\"LPPL-1.3a\",\"LPPL-1.3c\",\"Latex2e\",\"BSD-3-Clause-LBNL\",\"Leptonica\",\"LGPLLR\",\"Libpng\",\"libtiff\",\"LAL-1.2\",\"LAL-1.3\",\"LiLiQ-P-1.1\",\"LiLiQ-Rplus-1.1\",\"LiLiQ-R-1.1\",\"LPL-1.02\",\"LPL-1.0\",\"MakeIndex\",\"MTLL\",\"MS-PL\",\"MS-RL\",\"MirOS\",\"MITNFA\",\"MIT\",\"Motosoto\",\"MPL-1.0\",\"MPL-1.1\",\"MPL-2.0\",\"MPL-2.0-no-copyleft-exception\",\"mpich2\",\"Multics\",\"Mup\",\"NASA-1.3\",\"Naumen\",\"NBPL-1.0\",\"NetCDF\",\"NGPL\",\"NOSL\",\"NPL-1.0\",\"NPL-1.1\",\"Newsletr\",\"NLPL\",\"Nokia\",\"NPOSL-3.0\",\"NLOD-1.0\",\"Noweb\",\"NRL\",\"NTP\",\"Nunit\",\"OCLC-2.0\",\"ODbL-1.0\",\"PDDL-1.0\",\"OCCT-PL\",\"OGTSL\",\"OLDAP-2.2.2\",\"OLDAP-1.1\",\"OLDAP-1.2\",\"OLDAP-1.3\",\"OLDAP-1.4\",\"OLDAP-2.0\",\"OLDAP-2.0.1\",\"OLDAP-2.1\",\"OLDAP-2.2\",\"OLDAP-2.2.1\",\"OLDAP-2.3\",\"OLDAP-2.4\",\"OLDAP-2.5\",\"OLDAP-2.6\",\"OLDAP-2.7\",\"OLDAP-2.8\",\"OML\",\"OPL-1.0\",\"OSL-1.0\",\"OSL-1.1\",\"OSL-2.0\",\"OSL-2.1\",\"OSL-3.0\",\"OpenSSL\",\"OSET-PL-2.1\",\"PHP-3.0\",\"PHP-3.01\",\"Plexus\",\"PostgreSQL\",\"psfrag\",\"psutils\",\"Python-2.0\",\"QPL-1.0\",\"Qhull\",\"Rdisc\",\"RPSL-1.0\",\"RPL-1.1\",\"RPL-1.5\",\"RHeCos-1.1\",\"RSCPL\",\"RSA-MD\",\"Ruby\",\"SAX-PD\",\"Saxpath\",\"SCEA\",\"SWL\",\"SMPPL\",\"Sendmail\",\"SGI-B-1.0\",\"SGI-B-1.1\",\"SGI-B-2.0\",\"OFL-1.0\",\"OFL-1.1\",\"SimPL-2.0\",\"Sleepycat\",\"SNIA\",\"Spencer-86\",\"Spencer-94\",\"Spencer-99\",\"SMLNJ\",\"SugarCRM-1.1.3\",\"SISSL\",\"SISSL-1.2\",\"SPL-1.0\",\"Watcom-1.0\",\"TCL\",\"Unlicense\",\"TMate\",\"TORQUE-1.1\",\"TOSL\",\"Unicode-TOU\",\"UPL-1.0\",\"NCSA\",\"Vim\",\"VOSTROM\",\"VSL-1.0\",\"W3C-19980720\",\"W3C\",\"Wsuipa\",\"Xnet\",\"X11\",\"Xerox\",\"XFree86-1.1\",\"xinetd\",\"xpp\",\"XSkat\",\"YPL-1.0\",\"YPL-1.1\",\"Zed\",\"Zend-2.0\",\"Zimbra-1.3\",\"Zimbra-1.4\",\"Zlib\",\"zlib-acknowledgement\",\"ZPL-1.1\",\"ZPL-2.0\",\"ZPL-2.1\",\"BSD-3-Clause-No-Nuclear-License\",\"BSD-3-Clause-No-Nuclear-Warranty\",\"BSD-3-Clause-No-Nuclear-License-2014\",\"eCos-2.0\",\"GPL-2.0-with-autoconf-exception\",\"GPL-2.0-with-bison-exception\",\"GPL-2.0-with-classpath-exception\",\"GPL-2.0-with-font-exception\",\"GPL-2.0-with-GCC-exception\",\"GPL-3.0-with-autoconf-exception\",\"GPL-3.0-with-GCC-exception\",\"StandardML-NJ\",\"WXwindows\"]");
 
 /***/ }),
-/* 81 */
+/* 510 */
+/***/ (function(module, exports) {
+
+if (typeof Object.create === 'function') {
+  // implementation from standard node.js 'util' module
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    ctor.prototype = Object.create(superCtor.prototype, {
+      constructor: {
+        value: ctor,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+  };
+} else {
+  // old school shim for old browsers
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    var TempCtor = function () {}
+    TempCtor.prototype = superCtor.prototype
+    ctor.prototype = new TempCtor()
+    ctor.prototype.constructor = ctor
+  }
+}
+
+
+/***/ }),
+/* 511 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var url = __webpack_require__(82)
-var gitHosts = __webpack_require__(83)
-var GitHost = module.exports = __webpack_require__(84)
 
-var protocolToRepresentationMap = {
-  'git+ssh': 'sshurl',
-  'git+https': 'https',
-  'ssh': 'sshurl',
-  'git': 'git'
+function posix(path) {
+	return path.charAt(0) === '/';
 }
 
-function protocolToRepresentation (protocol) {
-  if (protocol.substr(-1) === ':') protocol = protocol.slice(0, -1)
-  return protocolToRepresentationMap[protocol] || protocol
+function win32(path) {
+	// https://github.com/nodejs/node/blob/b3fcc245fb25539909ef1d5eaa01dbf92e168633/lib/path.js#L56
+	var splitDeviceRe = /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
+	var result = splitDeviceRe.exec(path);
+	var device = result[1] || '';
+	var isUnc = Boolean(device && device.charAt(1) !== ':');
+
+	// UNC paths are always absolute
+	return Boolean(result[2] || isUnc);
 }
 
-var authProtocols = {
-  'git:': true,
-  'https:': true,
-  'git+https:': true,
-  'http:': true,
-  'git+http:': true
+module.exports = process.platform === 'win32' ? win32 : posix;
+module.exports.posix = posix;
+module.exports.win32 = win32;
+
+
+/***/ }),
+/* 512 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = globSync
+globSync.GlobSync = GlobSync
+
+var fs = __webpack_require__(23)
+var rp = __webpack_require__(503)
+var minimatch = __webpack_require__(505)
+var Minimatch = minimatch.Minimatch
+var Glob = __webpack_require__(502).Glob
+var util = __webpack_require__(29)
+var path = __webpack_require__(16)
+var assert = __webpack_require__(30)
+var isAbsolute = __webpack_require__(511)
+var common = __webpack_require__(513)
+var alphasort = common.alphasort
+var alphasorti = common.alphasorti
+var setopts = common.setopts
+var ownProp = common.ownProp
+var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
+
+function globSync (pattern, options) {
+  if (typeof options === 'function' || arguments.length === 3)
+    throw new TypeError('callback provided to sync glob\n'+
+                        'See: https://github.com/isaacs/node-glob/issues/167')
+
+  return new GlobSync(pattern, options).found
 }
 
-var cache = {}
+function GlobSync (pattern, options) {
+  if (!pattern)
+    throw new Error('must provide pattern')
 
-module.exports.fromUrl = function (giturl, opts) {
-  var key = giturl + JSON.stringify(opts || {})
+  if (typeof options === 'function' || arguments.length === 3)
+    throw new TypeError('callback provided to sync glob\n'+
+                        'See: https://github.com/isaacs/node-glob/issues/167')
 
-  if (!(key in cache)) {
-    cache[key] = fromUrl(giturl, opts)
-  }
+  if (!(this instanceof GlobSync))
+    return new GlobSync(pattern, options)
 
-  return cache[key]
+  setopts(this, pattern, options)
+
+  if (this.noprocess)
+    return this
+
+  var n = this.minimatch.set.length
+  this.matches = new Array(n)
+  for (var i = 0; i < n; i ++) {
+    this._process(this.minimatch.set[i], i, false)
+  }
+  this._finish()
 }
 
-function fromUrl (giturl, opts) {
-  if (giturl == null || giturl === '') return
-  var url = fixupUnqualifiedGist(
-    isGitHubShorthand(giturl) ? 'github:' + giturl : giturl
-  )
-  var parsed = parseGitUrl(url)
-  var shortcutMatch = url.match(new RegExp('^([^:]+):(?:(?:[^@:]+(?:[^@]+)?@)?([^/]*))[/](.+?)(?:[.]git)?($|#)'))
-  var matches = Object.keys(gitHosts).map(function (gitHostName) {
-    try {
-      var gitHostInfo = gitHosts[gitHostName]
-      var auth = null
-      if (parsed.auth && authProtocols[parsed.protocol]) {
-        auth = decodeURIComponent(parsed.auth)
+GlobSync.prototype._finish = function () {
+  assert(this instanceof GlobSync)
+  if (this.realpath) {
+    var self = this
+    this.matches.forEach(function (matchset, index) {
+      var set = self.matches[index] = Object.create(null)
+      for (var p in matchset) {
+        try {
+          p = self._makeAbs(p)
+          var real = rp.realpathSync(p, self.realpathCache)
+          set[real] = true
+        } catch (er) {
+          if (er.syscall === 'stat')
+            set[self._makeAbs(p)] = true
+          else
+            throw er
+        }
       }
-      var committish = parsed.hash ? decodeURIComponent(parsed.hash.substr(1)) : null
-      var user = null
-      var project = null
-      var defaultRepresentation = null
-      if (shortcutMatch && shortcutMatch[1] === gitHostName) {
-        user = shortcutMatch[2] && decodeURIComponent(shortcutMatch[2])
-        project = decodeURIComponent(shortcutMatch[3])
-        defaultRepresentation = 'shortcut'
+    })
+  }
+  common.finish(this)
+}
+
+
+GlobSync.prototype._process = function (pattern, index, inGlobStar) {
+  assert(this instanceof GlobSync)
+
+  // Get the first [n] parts of pattern that are all strings.
+  var n = 0
+  while (typeof pattern[n] === 'string') {
+    n ++
+  }
+  // now n is the index of the first one that is *not* a string.
+
+  // See if there's anything else
+  var prefix
+  switch (n) {
+    // if not, then this is rather simple
+    case pattern.length:
+      this._processSimple(pattern.join('/'), index)
+      return
+
+    case 0:
+      // pattern *starts* with some non-trivial item.
+      // going to readdir(cwd), but not include the prefix in matches.
+      prefix = null
+      break
+
+    default:
+      // pattern has some string bits in the front.
+      // whatever it starts with, whether that's 'absolute' like /foo/bar,
+      // or 'relative' like '../baz'
+      prefix = pattern.slice(0, n).join('/')
+      break
+  }
+
+  var remain = pattern.slice(n)
+
+  // get the list of entries.
+  var read
+  if (prefix === null)
+    read = '.'
+  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+    if (!prefix || !isAbsolute(prefix))
+      prefix = '/' + prefix
+    read = prefix
+  } else
+    read = prefix
+
+  var abs = this._makeAbs(read)
+
+  //if ignored, skip processing
+  if (childrenIgnored(this, read))
+    return
+
+  var isGlobStar = remain[0] === minimatch.GLOBSTAR
+  if (isGlobStar)
+    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar)
+  else
+    this._processReaddir(prefix, read, abs, remain, index, inGlobStar)
+}
+
+
+GlobSync.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar) {
+  var entries = this._readdir(abs, inGlobStar)
+
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return
+
+  // It will only match dot entries if it starts with a dot, or if
+  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
+  var pn = remain[0]
+  var negate = !!this.minimatch.negate
+  var rawGlob = pn._glob
+  var dotOk = this.dot || rawGlob.charAt(0) === '.'
+
+  var matchedEntries = []
+  for (var i = 0; i < entries.length; i++) {
+    var e = entries[i]
+    if (e.charAt(0) !== '.' || dotOk) {
+      var m
+      if (negate && !prefix) {
+        m = !e.match(pn)
       } else {
-        if (parsed.host !== gitHostInfo.domain) return
-        if (!gitHostInfo.protocols_re.test(parsed.protocol)) return
-        if (!parsed.path) return
-        var pathmatch = gitHostInfo.pathmatch
-        var matched = parsed.path.match(pathmatch)
-        if (!matched) return
-        if (matched[1] != null) user = decodeURIComponent(matched[1].replace(/^:/, ''))
-        if (matched[2] != null) project = decodeURIComponent(matched[2])
-        defaultRepresentation = protocolToRepresentation(parsed.protocol)
+        m = e.match(pn)
       }
-      return new GitHost(gitHostName, user, auth, project, committish, defaultRepresentation, opts)
-    } catch (ex) {
-      if (!(ex instanceof URIError)) throw ex
+      if (m)
+        matchedEntries.push(e)
     }
-  }).filter(function (gitHostInfo) { return gitHostInfo })
-  if (matches.length !== 1) return
-  return matches[0]
-}
+  }
 
-function isGitHubShorthand (arg) {
-  // Note: This does not fully test the git ref format.
-  // See https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
-  //
-  // The only way to do this properly would be to shell out to
-  // git-check-ref-format, and as this is a fast sync function,
-  // we don't want to do that.  Just let git fail if it turns
-  // out that the commit-ish is invalid.
-  // GH usernames cannot start with . or -
-  return /^[^:@%/\s.-][^:@%/\s]*[/][^:@\s/%]+(?:#.*)?$/.test(arg)
-}
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return
 
-function fixupUnqualifiedGist (giturl) {
-  // necessary for round-tripping gists
-  var parsed = url.parse(giturl)
-  if (parsed.protocol === 'gist:' && parsed.host && !parsed.path) {
-    return parsed.protocol + '/' + parsed.host
-  } else {
-    return giturl
+  // if this is the last remaining pattern bit, then no need for
+  // an additional stat *unless* the user has specified mark or
+  // stat explicitly.  We know they exist, since readdir returned
+  // them.
+
+  if (remain.length === 1 && !this.mark && !this.stat) {
+    if (!this.matches[index])
+      this.matches[index] = Object.create(null)
+
+    for (var i = 0; i < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix.slice(-1) !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
+      }
+
+      if (e.charAt(0) === '/' && !this.nomount) {
+        e = path.join(this.root, e)
+      }
+      this._emitMatch(index, e)
+    }
+    // This was the last one, and no stats were needed
+    return
   }
-}
 
-function parseGitUrl (giturl) {
-  if (typeof giturl !== 'string') giturl = '' + giturl
-  var matched = giturl.match(/^([^@]+)@([^:/]+):[/]?((?:[^/]+[/])?[^/]+?)(?:[.]git)?(#.*)?$/)
-  if (!matched) return url.parse(giturl)
-  return {
-    protocol: 'git+ssh:',
-    slashes: true,
-    auth: matched[1],
-    host: matched[2],
-    port: null,
-    hostname: matched[2],
-    hash: matched[4],
-    search: null,
-    query: null,
-    pathname: '/' + matched[3],
-    path: '/' + matched[3],
-    href: 'git+ssh://' + matched[1] + '@' + matched[2] +
-          '/' + matched[3] + (matched[4] || '')
+  // now test all matched entries as stand-ins for that part
+  // of the pattern.
+  remain.shift()
+  for (var i = 0; i < len; i ++) {
+    var e = matchedEntries[i]
+    var newPattern
+    if (prefix)
+      newPattern = [prefix, e]
+    else
+      newPattern = [e]
+    this._process(newPattern.concat(remain), index, inGlobStar)
   }
 }
 
 
-/***/ }),
-/* 82 */
-/***/ (function(module, exports) {
+GlobSync.prototype._emitMatch = function (index, e) {
+  if (isIgnored(this, e))
+    return
 
-module.exports = require("url");
+  var abs = this._makeAbs(e)
 
-/***/ }),
-/* 83 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (this.mark)
+    e = this._mark(e)
 
-"use strict";
+  if (this.absolute) {
+    e = abs
+  }
 
+  if (this.matches[index][e])
+    return
 
-var gitHosts = module.exports = {
-  github: {
-    // First two are insecure and generally shouldn't be used any more, but
-    // they are still supported.
-    'protocols': [ 'git', 'http', 'git+ssh', 'git+https', 'ssh', 'https' ],
-    'domain': 'github.com',
-    'treepath': 'tree',
-    'filetemplate': 'https://{auth@}raw.githubusercontent.com/{user}/{project}/{committish}/{path}',
-    'bugstemplate': 'https://{domain}/{user}/{project}/issues',
-    'gittemplate': 'git://{auth@}{domain}/{user}/{project}.git{#committish}',
-    'tarballtemplate': 'https://{domain}/{user}/{project}/archive/{committish}.tar.gz'
-  },
-  bitbucket: {
-    'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ],
-    'domain': 'bitbucket.org',
-    'treepath': 'src',
-    'tarballtemplate': 'https://{domain}/{user}/{project}/get/{committish}.tar.gz'
-  },
-  gitlab: {
-    'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ],
-    'domain': 'gitlab.com',
-    'treepath': 'tree',
-    'docstemplate': 'https://{domain}/{user}/{project}{/tree/committish}#README',
-    'bugstemplate': 'https://{domain}/{user}/{project}/issues',
-    'tarballtemplate': 'https://{domain}/{user}/{project}/repository/archive.tar.gz?ref={committish}'
-  },
-  gist: {
-    'protocols': [ 'git', 'git+ssh', 'git+https', 'ssh', 'https' ],
-    'domain': 'gist.github.com',
-    'pathmatch': /^[/](?:([^/]+)[/])?([a-z0-9]+)(?:[.]git)?$/,
-    'filetemplate': 'https://gist.githubusercontent.com/{user}/{project}/raw{/committish}/{path}',
-    'bugstemplate': 'https://{domain}/{project}',
-    'gittemplate': 'git://{domain}/{project}.git{#committish}',
-    'sshtemplate': 'git@{domain}:/{project}.git{#committish}',
-    'sshurltemplate': 'git+ssh://git@{domain}/{project}.git{#committish}',
-    'browsetemplate': 'https://{domain}/{project}{/committish}',
-    'docstemplate': 'https://{domain}/{project}{/committish}',
-    'httpstemplate': 'git+https://{domain}/{project}.git{#committish}',
-    'shortcuttemplate': '{type}:{project}{#committish}',
-    'pathtemplate': '{project}{#committish}',
-    'tarballtemplate': 'https://{domain}/{user}/{project}/archive/{committish}.tar.gz'
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
   }
-}
 
-var gitHostDefaults = {
-  'sshtemplate': 'git@{domain}:{user}/{project}.git{#committish}',
-  'sshurltemplate': 'git+ssh://git@{domain}/{user}/{project}.git{#committish}',
-  'browsetemplate': 'https://{domain}/{user}/{project}{/tree/committish}',
-  'docstemplate': 'https://{domain}/{user}/{project}{/tree/committish}#readme',
-  'httpstemplate': 'git+https://{auth@}{domain}/{user}/{project}.git{#committish}',
-  'filetemplate': 'https://{domain}/{user}/{project}/raw/{committish}/{path}',
-  'shortcuttemplate': '{type}:{user}/{project}{#committish}',
-  'pathtemplate': '{user}/{project}{#committish}',
-  'pathmatch': /^[/]([^/]+)[/]([^/]+?)(?:[.]git|[/])?$/
+  this.matches[index][e] = true
+
+  if (this.stat)
+    this._stat(e)
 }
 
-Object.keys(gitHosts).forEach(function (name) {
-  Object.keys(gitHostDefaults).forEach(function (key) {
-    if (gitHosts[name][key]) return
-    gitHosts[name][key] = gitHostDefaults[key]
-  })
-  gitHosts[name].protocols_re = RegExp('^(' +
-    gitHosts[name].protocols.map(function (protocol) {
-      return protocol.replace(/([\\+*{}()[\]$^|])/g, '\\$1')
-    }).join('|') + '):$')
-})
 
+GlobSync.prototype._readdirInGlobStar = function (abs) {
+  // follow all symlinked directories forever
+  // just proceed as if this is a non-globstar situation
+  if (this.follow)
+    return this._readdir(abs, false)
 
-/***/ }),
-/* 84 */
-/***/ (function(module, exports, __webpack_require__) {
+  var entries
+  var lstat
+  var stat
+  try {
+    lstat = fs.lstatSync(abs)
+  } catch (er) {
+    if (er.code === 'ENOENT') {
+      // lstat failed, doesn't exist
+      return null
+    }
+  }
 
-"use strict";
+  var isSym = lstat && lstat.isSymbolicLink()
+  this.symlinks[abs] = isSym
 
-var gitHosts = __webpack_require__(83)
-var extend = Object.assign || __webpack_require__(29)._extend
+  // If it's not a symlink or a dir, then it's definitely a regular file.
+  // don't bother doing a readdir in that case.
+  if (!isSym && lstat && !lstat.isDirectory())
+    this.cache[abs] = 'FILE'
+  else
+    entries = this._readdir(abs, false)
 
-var GitHost = module.exports = function (type, user, auth, project, committish, defaultRepresentation, opts) {
-  var gitHostInfo = this
-  gitHostInfo.type = type
-  Object.keys(gitHosts[type]).forEach(function (key) {
-    gitHostInfo[key] = gitHosts[type][key]
-  })
-  gitHostInfo.user = user
-  gitHostInfo.auth = auth
-  gitHostInfo.project = project
-  gitHostInfo.committish = committish
-  gitHostInfo.default = defaultRepresentation
-  gitHostInfo.opts = opts || {}
+  return entries
 }
-GitHost.prototype = {}
 
-GitHost.prototype.hash = function () {
-  return this.committish ? '#' + this.committish : ''
-}
+GlobSync.prototype._readdir = function (abs, inGlobStar) {
+  var entries
 
-GitHost.prototype._fill = function (template, opts) {
-  if (!template) return
-  var vars = extend({}, opts)
-  opts = extend(extend({}, this.opts), opts)
-  var self = this
-  Object.keys(this).forEach(function (key) {
-    if (self[key] != null && vars[key] == null) vars[key] = self[key]
-  })
-  var rawAuth = vars.auth
-  var rawComittish = vars.committish
-  Object.keys(vars).forEach(function (key) {
-    vars[key] = encodeURIComponent(vars[key])
-  })
-  vars['auth@'] = rawAuth ? rawAuth + '@' : ''
-  if (opts.noCommittish) {
-    vars['#committish'] = ''
-    vars['/tree/committish'] = ''
-    vars['/comittish'] = ''
-    vars.comittish = ''
-  } else {
-    vars['#committish'] = rawComittish ? '#' + rawComittish : ''
-    vars['/tree/committish'] = vars.committish
-                            ? '/' + vars.treepath + '/' + vars.committish
-                            : ''
-    vars['/committish'] = vars.committish ? '/' + vars.committish : ''
-    vars.committish = vars.committish || 'master'
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs)
+
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return null
+
+    if (Array.isArray(c))
+      return c
   }
-  var res = template
-  Object.keys(vars).forEach(function (key) {
-    res = res.replace(new RegExp('[{]' + key + '[}]', 'g'), vars[key])
-  })
-  if (opts.noGitPlus) {
-    return res.replace(/^git[+]/, '')
-  } else {
-    return res
+
+  try {
+    return this._readdirEntries(abs, fs.readdirSync(abs))
+  } catch (er) {
+    this._readdirError(abs, er)
+    return null
   }
 }
 
-GitHost.prototype.ssh = function (opts) {
-  return this._fill(this.sshtemplate, opts)
-}
+GlobSync.prototype._readdirEntries = function (abs, entries) {
+  // if we haven't asked to stat everything, then just
+  // assume that everything in there exists, so we can avoid
+  // having to stat it a second time.
+  if (!this.mark && !this.stat) {
+    for (var i = 0; i < entries.length; i ++) {
+      var e = entries[i]
+      if (abs === '/')
+        e = abs + e
+      else
+        e = abs + '/' + e
+      this.cache[e] = true
+    }
+  }
 
-GitHost.prototype.sshurl = function (opts) {
-  return this._fill(this.sshurltemplate, opts)
-}
+  this.cache[abs] = entries
 
-GitHost.prototype.browse = function (opts) {
-  return this._fill(this.browsetemplate, opts)
+  // mark and cache dir-ness
+  return entries
 }
 
-GitHost.prototype.docs = function (opts) {
-  return this._fill(this.docstemplate, opts)
-}
+GlobSync.prototype._readdirError = function (f, er) {
+  // handle errors, and cache the information
+  switch (er.code) {
+    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
+    case 'ENOTDIR': // totally normal. means it *does* exist.
+      var abs = this._makeAbs(f)
+      this.cache[abs] = 'FILE'
+      if (abs === this.cwdAbs) {
+        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
+        error.path = this.cwd
+        error.code = er.code
+        throw error
+      }
+      break
 
-GitHost.prototype.bugs = function (opts) {
-  return this._fill(this.bugstemplate, opts)
-}
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
 
-GitHost.prototype.https = function (opts) {
-  return this._fill(this.httpstemplate, opts)
+    default: // some unusual error.  Treat as failure.
+      this.cache[this._makeAbs(f)] = false
+      if (this.strict)
+        throw er
+      if (!this.silent)
+        console.error('glob error', er)
+      break
+  }
 }
 
-GitHost.prototype.git = function (opts) {
-  return this._fill(this.gittemplate, opts)
-}
+GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
 
-GitHost.prototype.shortcut = function (opts) {
-  return this._fill(this.shortcuttemplate, opts)
-}
+  var entries = this._readdir(abs, inGlobStar)
 
-GitHost.prototype.path = function (opts) {
-  return this._fill(this.pathtemplate, opts)
-}
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return
 
-GitHost.prototype.tarball = function (opts) {
-  return this._fill(this.tarballtemplate, opts)
-}
+  // test without the globstar, and with every child both below
+  // and replacing the globstar.
+  var remainWithoutGlobStar = remain.slice(1)
+  var gspref = prefix ? [ prefix ] : []
+  var noGlobStar = gspref.concat(remainWithoutGlobStar)
 
-GitHost.prototype.file = function (P, opts) {
-  return this._fill(this.filetemplate, extend({
-    path: P.replace(/^[/]+/g, '')
-  }, opts))
-}
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false)
 
-GitHost.prototype.getDefaultRepresentation = function () {
-  return this.default
+  var len = entries.length
+  var isSym = this.symlinks[abs]
+
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return
+
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
+
+    // these two cases enter the inGlobStar state
+    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
+    this._process(instead, index, true)
+
+    var below = gspref.concat(entries[i], remain)
+    this._process(below, index, true)
+  }
 }
 
-GitHost.prototype.toString = function (opts) {
-  return (this[this.default] || this.sshurl).call(this, opts)
+GlobSync.prototype._processSimple = function (prefix, index) {
+  // XXX review this.  Shouldn't it be doing the mounting etc
+  // before doing stat?  kinda weird?
+  var exists = this._stat(prefix)
+
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
+
+  // If it doesn't exist, then just mark the lack of results
+  if (!exists)
+    return
+
+  if (prefix && isAbsolute(prefix) && !this.nomount) {
+    var trail = /[\/\\]$/.test(prefix)
+    if (prefix.charAt(0) === '/') {
+      prefix = path.join(this.root, prefix)
+    } else {
+      prefix = path.resolve(this.root, prefix)
+      if (trail)
+        prefix += '/'
+    }
+  }
+
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
+
+  // Mark this as a match
+  this._emitMatch(index, prefix)
 }
 
+// Returns either 'DIR', 'FILE', or false
+GlobSync.prototype._stat = function (f) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
 
-/***/ }),
-/* 85 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (f.length > this.maxLength)
+    return false
 
-var core = __webpack_require__(86);
-var async = __webpack_require__(88);
-async.core = core;
-async.isCore = function isCore(x) { return core[x]; };
-async.sync = __webpack_require__(93);
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
 
-exports = async;
-module.exports = async;
+    if (Array.isArray(c))
+      c = 'DIR'
 
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return c
 
-/***/ }),
-/* 86 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (needDir && c === 'FILE')
+      return false
 
-var current = (process.versions && process.versions.node && process.versions.node.split('.')) || [];
+    // otherwise we have to stat, because maybe c=true
+    // if we know it exists, but not what it is.
+  }
 
-function specifierIncluded(specifier) {
-    var parts = specifier.split(' ');
-    var op = parts.length > 1 ? parts[0] : '=';
-    var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
+  var exists
+  var stat = this.statCache[abs]
+  if (!stat) {
+    var lstat
+    try {
+      lstat = fs.lstatSync(abs)
+    } catch (er) {
+      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+        this.statCache[abs] = false
+        return false
+      }
+    }
 
-    for (var i = 0; i < 3; ++i) {
-        var cur = Number(current[i] || 0);
-        var ver = Number(versionParts[i] || 0);
-        if (cur === ver) {
-            continue; // eslint-disable-line no-restricted-syntax, no-continue
-        }
-        if (op === '<') {
-            return cur < ver;
-        } else if (op === '>=') {
-            return cur >= ver;
-        } else {
-            return false;
-        }
+    if (lstat && lstat.isSymbolicLink()) {
+      try {
+        stat = fs.statSync(abs)
+      } catch (er) {
+        stat = lstat
+      }
+    } else {
+      stat = lstat
     }
-    return op === '>=';
+  }
+
+  this.statCache[abs] = stat
+
+  var c = true
+  if (stat)
+    c = stat.isDirectory() ? 'DIR' : 'FILE'
+
+  this.cache[abs] = this.cache[abs] || c
+
+  if (needDir && c === 'FILE')
+    return false
+
+  return c
 }
 
-function matchesRange(range) {
-    var specifiers = range.split(/ ?&& ?/);
-    if (specifiers.length === 0) { return false; }
-    for (var i = 0; i < specifiers.length; ++i) {
-        if (!specifierIncluded(specifiers[i])) { return false; }
-    }
-    return true;
+GlobSync.prototype._mark = function (p) {
+  return common.mark(this, p)
 }
 
-function versionIncluded(specifierValue) {
-    if (typeof specifierValue === 'boolean') { return specifierValue; }
-    if (specifierValue && typeof specifierValue === 'object') {
-        for (var i = 0; i < specifierValue.length; ++i) {
-            if (matchesRange(specifierValue[i])) { return true; }
-        }
-        return false;
-    }
-    return matchesRange(specifierValue);
+GlobSync.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
 }
 
-var data = __webpack_require__(87);
 
-var core = {};
-for (var mod in data) { // eslint-disable-line no-restricted-syntax
-    if (Object.prototype.hasOwnProperty.call(data, mod)) {
-        core[mod] = versionIncluded(data[mod]);
-    }
+/***/ }),
+/* 513 */
+/***/ (function(module, exports, __webpack_require__) {
+
+exports.alphasort = alphasort
+exports.alphasorti = alphasorti
+exports.setopts = setopts
+exports.ownProp = ownProp
+exports.makeAbs = makeAbs
+exports.finish = finish
+exports.mark = mark
+exports.isIgnored = isIgnored
+exports.childrenIgnored = childrenIgnored
+
+function ownProp (obj, field) {
+  return Object.prototype.hasOwnProperty.call(obj, field)
 }
-module.exports = core;
 
+var path = __webpack_require__(16)
+var minimatch = __webpack_require__(505)
+var isAbsolute = __webpack_require__(511)
+var Minimatch = minimatch.Minimatch
 
-/***/ }),
-/* 87 */
-/***/ (function(module) {
+function alphasorti (a, b) {
+  return a.toLowerCase().localeCompare(b.toLowerCase())
+}
 
-module.exports = JSON.parse("{\"assert\":true,\"async_hooks\":\">= 8\",\"buffer_ieee754\":\"< 0.9.7\",\"buffer\":true,\"child_process\":true,\"cluster\":true,\"console\":true,\"constants\":true,\"crypto\":true,\"_debugger\":\"< 8\",\"dgram\":true,\"dns\":true,\"domain\":true,\"events\":true,\"freelist\":\"< 6\",\"fs\":true,\"fs/promises\":\">= 10 && < 10.1\",\"_http_agent\":\">= 0.11.1\",\"_http_client\":\">= 0.11.1\",\"_http_common\":\">= 0.11.1\",\"_http_incoming\":\">= 0.11.1\",\"_http_outgoing\":\">= 0.11.1\",\"_http_server\":\">= 0.11.1\",\"http\":true,\"http2\":\">= 8.8\",\"https\":true,\"inspector\":\">= 8.0.0\",\"_linklist\":\"< 8\",\"module\":true,\"net\":true,\"node-inspect/lib/_inspect\":\">= 7.6.0\",\"node-inspect/lib/internal/inspect_client\":\">= 7.6.0\",\"node-inspect/lib/internal/inspect_repl\":\">= 7.6.0\",\"os\":true,\"path\":true,\"perf_hooks\":\">= 8.5\",\"process\":\">= 1\",\"punycode\":true,\"querystring\":true,\"readline\":true,\"repl\":true,\"smalloc\":\">= 0.11.5 && < 3\",\"_stream_duplex\":\">= 0.9.4\",\"_stream_transform\":\">= 0.9.4\",\"_stream_wrap\":\">= 1.4.1\",\"_stream_passthrough\":\">= 0.9.4\",\"_stream_readable\":\">= 0.9.4\",\"_stream_writable\":\">= 0.9.4\",\"stream\":true,\"string_decoder\":true,\"sys\":true,\"timers\":true,\"_tls_common\":\">= 0.11.13\",\"_tls_legacy\":\">= 0.11.3 && < 10\",\"_tls_wrap\":\">= 0.11.3\",\"tls\":true,\"trace_events\":\">= 10\",\"tty\":true,\"url\":true,\"util\":true,\"v8/tools/arguments\":\">= 10\",\"v8/tools/codemap\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/consarray\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/csvparser\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/logreader\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/profile_view\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/splaytree\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8\":\">= 1\",\"vm\":true,\"worker_threads\":\">= 11.7\",\"zlib\":true}");
+function alphasort (a, b) {
+  return a.localeCompare(b)
+}
 
-/***/ }),
-/* 88 */
-/***/ (function(module, exports, __webpack_require__) {
+function setupIgnores (self, options) {
+  self.ignore = options.ignore || []
 
-var core = __webpack_require__(86);
-var fs = __webpack_require__(23);
-var path = __webpack_require__(16);
-var caller = __webpack_require__(89);
-var nodeModulesPaths = __webpack_require__(90);
-var normalizeOptions = __webpack_require__(92);
+  if (!Array.isArray(self.ignore))
+    self.ignore = [self.ignore]
 
-var defaultIsFile = function isFile(file, cb) {
-    fs.stat(file, function (err, stat) {
-        if (!err) {
-            return cb(null, stat.isFile() || stat.isFIFO());
-        }
-        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
-        return cb(err);
-    });
-};
+  if (self.ignore.length) {
+    self.ignore = self.ignore.map(ignoreMap)
+  }
+}
 
-module.exports = function resolve(x, options, callback) {
-    var cb = callback;
-    var opts = options;
-    if (typeof options === 'function') {
-        cb = opts;
-        opts = {};
-    }
-    if (typeof x !== 'string') {
-        var err = new TypeError('Path must be a string.');
-        return process.nextTick(function () {
-            cb(err);
-        });
-    }
+// ignore patterns are always in dot:true mode.
+function ignoreMap (pattern) {
+  var gmatcher = null
+  if (pattern.slice(-3) === '/**') {
+    var gpattern = pattern.replace(/(\/\*\*)+$/, '')
+    gmatcher = new Minimatch(gpattern, { dot: true })
+  }
 
-    opts = normalizeOptions(x, opts);
+  return {
+    matcher: new Minimatch(pattern, { dot: true }),
+    gmatcher: gmatcher
+  }
+}
 
-    var isFile = opts.isFile || defaultIsFile;
-    var readFile = opts.readFile || fs.readFile;
+function setopts (self, pattern, options) {
+  if (!options)
+    options = {}
 
-    var extensions = opts.extensions || ['.js'];
-    var basedir = opts.basedir || path.dirname(caller());
-    var parent = opts.filename || basedir;
+  // base-matching: just use globstar for that.
+  if (options.matchBase && -1 === pattern.indexOf("/")) {
+    if (options.noglobstar) {
+      throw new Error("base matching requires globstar")
+    }
+    pattern = "**/" + pattern
+  }
 
-    opts.paths = opts.paths || [];
+  self.silent = !!options.silent
+  self.pattern = pattern
+  self.strict = options.strict !== false
+  self.realpath = !!options.realpath
+  self.realpathCache = options.realpathCache || Object.create(null)
+  self.follow = !!options.follow
+  self.dot = !!options.dot
+  self.mark = !!options.mark
+  self.nodir = !!options.nodir
+  if (self.nodir)
+    self.mark = true
+  self.sync = !!options.sync
+  self.nounique = !!options.nounique
+  self.nonull = !!options.nonull
+  self.nosort = !!options.nosort
+  self.nocase = !!options.nocase
+  self.stat = !!options.stat
+  self.noprocess = !!options.noprocess
+  self.absolute = !!options.absolute
 
-    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
-    var absoluteStart = path.resolve(basedir);
+  self.maxLength = options.maxLength || Infinity
+  self.cache = options.cache || Object.create(null)
+  self.statCache = options.statCache || Object.create(null)
+  self.symlinks = options.symlinks || Object.create(null)
 
-    if (opts.preserveSymlinks === false) {
-        fs.realpath(absoluteStart, function (realPathErr, realStart) {
-            if (realPathErr && realPathErr.code !== 'ENOENT') cb(err);
-            else init(realPathErr ? absoluteStart : realStart);
-        });
-    } else {
-        init(absoluteStart);
-    }
+  setupIgnores(self, options)
 
-    var res;
-    function init(basedir) {
-        if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
-            res = path.resolve(basedir, x);
-            if (x === '..' || x.slice(-1) === '/') res += '/';
-            if ((/\/$/).test(x) && res === basedir) {
-                loadAsDirectory(res, opts.package, onfile);
-            } else loadAsFile(res, opts.package, onfile);
-        } else loadNodeModules(x, basedir, function (err, n, pkg) {
-            if (err) cb(err);
-            else if (n) cb(null, n, pkg);
-            else if (core[x]) return cb(null, x);
-            else {
-                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-                moduleError.code = 'MODULE_NOT_FOUND';
-                cb(moduleError);
-            }
-        });
-    }
+  self.changedCwd = false
+  var cwd = process.cwd()
+  if (!ownProp(options, "cwd"))
+    self.cwd = cwd
+  else {
+    self.cwd = path.resolve(options.cwd)
+    self.changedCwd = self.cwd !== cwd
+  }
 
-    function onfile(err, m, pkg) {
-        if (err) cb(err);
-        else if (m) cb(null, m, pkg);
-        else loadAsDirectory(res, function (err, d, pkg) {
-            if (err) cb(err);
-            else if (d) cb(null, d, pkg);
-            else {
-                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-                moduleError.code = 'MODULE_NOT_FOUND';
-                cb(moduleError);
-            }
-        });
-    }
+  self.root = options.root || path.resolve(self.cwd, "/")
+  self.root = path.resolve(self.root)
+  if (process.platform === "win32")
+    self.root = self.root.replace(/\\/g, "/")
 
-    function loadAsFile(x, thePackage, callback) {
-        var loadAsFilePackage = thePackage;
-        var cb = callback;
-        if (typeof loadAsFilePackage === 'function') {
-            cb = loadAsFilePackage;
-            loadAsFilePackage = undefined;
-        }
+  // TODO: is an absolute `cwd` supposed to be resolved against `root`?
+  // e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test')
+  self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd)
+  if (process.platform === "win32")
+    self.cwdAbs = self.cwdAbs.replace(/\\/g, "/")
+  self.nomount = !!options.nomount
 
-        var exts = [''].concat(extensions);
-        load(exts, x, loadAsFilePackage);
+  // disable comments and negation in Minimatch.
+  // Note that they are not supported in Glob itself anyway.
+  options.nonegate = true
+  options.nocomment = true
 
-        function load(exts, x, loadPackage) {
-            if (exts.length === 0) return cb(null, undefined, loadPackage);
-            var file = x + exts[0];
+  self.minimatch = new Minimatch(pattern, options)
+  self.options = self.minimatch.options
+}
 
-            var pkg = loadPackage;
-            if (pkg) onpkg(null, pkg);
-            else loadpkg(path.dirname(file), onpkg);
+function finish (self) {
+  var nou = self.nounique
+  var all = nou ? [] : Object.create(null)
 
-            function onpkg(err, pkg_, dir) {
-                pkg = pkg_;
-                if (err) return cb(err);
-                if (dir && pkg && opts.pathFilter) {
-                    var rfile = path.relative(dir, file);
-                    var rel = rfile.slice(0, rfile.length - exts[0].length);
-                    var r = opts.pathFilter(pkg, x, rel);
-                    if (r) return load(
-                        [''].concat(extensions.slice()),
-                        path.resolve(dir, r),
-                        pkg
-                    );
-                }
-                isFile(file, onex);
-            }
-            function onex(err, ex) {
-                if (err) return cb(err);
-                if (ex) return cb(null, file, pkg);
-                load(exts.slice(1), x, pkg);
-            }
-        }
+  for (var i = 0, l = self.matches.length; i < l; i ++) {
+    var matches = self.matches[i]
+    if (!matches || Object.keys(matches).length === 0) {
+      if (self.nonull) {
+        // do like the shell, and spit out the literal glob
+        var literal = self.minimatch.globSet[i]
+        if (nou)
+          all.push(literal)
+        else
+          all[literal] = true
+      }
+    } else {
+      // had matches
+      var m = Object.keys(matches)
+      if (nou)
+        all.push.apply(all, m)
+      else
+        m.forEach(function (m) {
+          all[m] = true
+        })
     }
+  }
 
-    function loadpkg(dir, cb) {
-        if (dir === '' || dir === '/') return cb(null);
-        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
-            return cb(null);
-        }
-        if ((/[/\\]node_modules[/\\]*$/).test(dir)) return cb(null);
-
-        var pkgfile = path.join(dir, 'package.json');
-        isFile(pkgfile, function (err, ex) {
-            // on err, ex is false
-            if (!ex) return loadpkg(path.dirname(dir), cb);
+  if (!nou)
+    all = Object.keys(all)
 
-            readFile(pkgfile, function (err, body) {
-                if (err) cb(err);
-                try { var pkg = JSON.parse(body); } catch (jsonErr) {}
+  if (!self.nosort)
+    all = all.sort(self.nocase ? alphasorti : alphasort)
 
-                if (pkg && opts.packageFilter) {
-                    pkg = opts.packageFilter(pkg, pkgfile);
-                }
-                cb(null, pkg, dir);
-            });
-        });
+  // at *some* point we statted all of these
+  if (self.mark) {
+    for (var i = 0; i < all.length; i++) {
+      all[i] = self._mark(all[i])
     }
+    if (self.nodir) {
+      all = all.filter(function (e) {
+        var notDir = !(/\/$/.test(e))
+        var c = self.cache[e] || self.cache[makeAbs(self, e)]
+        if (notDir && c)
+          notDir = c !== 'DIR' && !Array.isArray(c)
+        return notDir
+      })
+    }
+  }
 
-    function loadAsDirectory(x, loadAsDirectoryPackage, callback) {
-        var cb = callback;
-        var fpkg = loadAsDirectoryPackage;
-        if (typeof fpkg === 'function') {
-            cb = fpkg;
-            fpkg = opts.package;
-        }
+  if (self.ignore.length)
+    all = all.filter(function(m) {
+      return !isIgnored(self, m)
+    })
 
-        var pkgfile = path.join(x, 'package.json');
-        isFile(pkgfile, function (err, ex) {
-            if (err) return cb(err);
-            if (!ex) return loadAsFile(path.join(x, 'index'), fpkg, cb);
+  self.found = all
+}
 
-            readFile(pkgfile, function (err, body) {
-                if (err) return cb(err);
-                try {
-                    var pkg = JSON.parse(body);
-                } catch (jsonErr) {}
+function mark (self, p) {
+  var abs = makeAbs(self, p)
+  var c = self.cache[abs]
+  var m = p
+  if (c) {
+    var isDir = c === 'DIR' || Array.isArray(c)
+    var slash = p.slice(-1) === '/'
 
-                if (opts.packageFilter) {
-                    pkg = opts.packageFilter(pkg, pkgfile);
-                }
+    if (isDir && !slash)
+      m += '/'
+    else if (!isDir && slash)
+      m = m.slice(0, -1)
 
-                if (pkg.main) {
-                    if (typeof pkg.main !== 'string') {
-                        var mainError = new TypeError('package “' + pkg.name + '” `main` must be a string');
-                        mainError.code = 'INVALID_PACKAGE_MAIN';
-                        return cb(mainError);
-                    }
-                    if (pkg.main === '.' || pkg.main === './') {
-                        pkg.main = 'index';
-                    }
-                    loadAsFile(path.resolve(x, pkg.main), pkg, function (err, m, pkg) {
-                        if (err) return cb(err);
-                        if (m) return cb(null, m, pkg);
-                        if (!pkg) return loadAsFile(path.join(x, 'index'), pkg, cb);
+    if (m !== p) {
+      var mabs = makeAbs(self, m)
+      self.statCache[mabs] = self.statCache[abs]
+      self.cache[mabs] = self.cache[abs]
+    }
+  }
 
-                        var dir = path.resolve(x, pkg.main);
-                        loadAsDirectory(dir, pkg, function (err, n, pkg) {
-                            if (err) return cb(err);
-                            if (n) return cb(null, n, pkg);
-                            loadAsFile(path.join(x, 'index'), pkg, cb);
-                        });
-                    });
-                    return;
-                }
+  return m
+}
 
-                loadAsFile(path.join(x, '/index'), pkg, cb);
-            });
-        });
-    }
+// lotta situps...
+function makeAbs (self, f) {
+  var abs = f
+  if (f.charAt(0) === '/') {
+    abs = path.join(self.root, f)
+  } else if (isAbsolute(f) || f === '') {
+    abs = f
+  } else if (self.changedCwd) {
+    abs = path.resolve(self.cwd, f)
+  } else {
+    abs = path.resolve(f)
+  }
 
-    function processDirs(cb, dirs) {
-        if (dirs.length === 0) return cb(null, undefined);
-        var dir = dirs[0];
+  if (process.platform === 'win32')
+    abs = abs.replace(/\\/g, '/')
 
-        var file = path.join(dir, x);
-        loadAsFile(file, opts.package, onfile);
+  return abs
+}
 
-        function onfile(err, m, pkg) {
-            if (err) return cb(err);
-            if (m) return cb(null, m, pkg);
-            loadAsDirectory(path.join(dir, x), opts.package, ondir);
-        }
 
-        function ondir(err, n, pkg) {
-            if (err) return cb(err);
-            if (n) return cb(null, n, pkg);
-            processDirs(cb, dirs.slice(1));
-        }
-    }
-    function loadNodeModules(x, start, cb) {
-        processDirs(cb, nodeModulesPaths(start, opts, x));
-    }
-};
+// Return true, if pattern ends with globstar '**', for the accompanying parent directory.
+// Ex:- If node_modules/** is the pattern, add 'node_modules' to ignore list along with it's contents
+function isIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
 
+  return self.ignore.some(function(item) {
+    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
 
-/***/ }),
-/* 89 */
-/***/ (function(module, exports) {
+function childrenIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
 
-module.exports = function () {
-    // see https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
-    var origPrepareStackTrace = Error.prepareStackTrace;
-    Error.prepareStackTrace = function (_, stack) { return stack; };
-    var stack = (new Error()).stack;
-    Error.prepareStackTrace = origPrepareStackTrace;
-    return stack[2].getFileName();
-};
+  return self.ignore.some(function(item) {
+    return !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
 
 
 /***/ }),
-/* 90 */
+/* 514 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var path = __webpack_require__(16);
-var parse = path.parse || __webpack_require__(91);
-
-var getNodeModulesDirs = function getNodeModulesDirs(absoluteStart, modules) {
-    var prefix = '/';
-    if ((/^([A-Za-z]:)/).test(absoluteStart)) {
-        prefix = '';
-    } else if ((/^\\\\/).test(absoluteStart)) {
-        prefix = '\\\\';
-    }
+var wrappy = __webpack_require__(386)
+var reqs = Object.create(null)
+var once = __webpack_require__(385)
 
-    var paths = [absoluteStart];
-    var parsed = parse(absoluteStart);
-    while (parsed.dir !== paths[paths.length - 1]) {
-        paths.push(parsed.dir);
-        parsed = parse(parsed.dir);
-    }
+module.exports = wrappy(inflight)
 
-    return paths.reduce(function (dirs, aPath) {
-        return dirs.concat(modules.map(function (moduleDir) {
-            return path.join(prefix, aPath, moduleDir);
-        }));
-    }, []);
-};
+function inflight (key, cb) {
+  if (reqs[key]) {
+    reqs[key].push(cb)
+    return null
+  } else {
+    reqs[key] = [cb]
+    return makeres(key)
+  }
+}
 
-module.exports = function nodeModulesPaths(start, opts, request) {
-    var modules = opts && opts.moduleDirectory
-        ? [].concat(opts.moduleDirectory)
-        : ['node_modules'];
+function makeres (key) {
+  return once(function RES () {
+    var cbs = reqs[key]
+    var len = cbs.length
+    var args = slice(arguments)
 
-    if (opts && typeof opts.paths === 'function') {
-        return opts.paths(
-            request,
-            start,
-            function () { return getNodeModulesDirs(start, modules); },
-            opts
-        );
+    // XXX It's somewhat ambiguous whether a new callback added in this
+    // pass should be queued for later execution if something in the
+    // list of callbacks throws, or if it should just be discarded.
+    // However, it's such an edge case that it hardly matters, and either
+    // choice is likely as surprising as the other.
+    // As it happens, we do go ahead and schedule it for later execution.
+    try {
+      for (var i = 0; i < len; i++) {
+        cbs[i].apply(null, args)
+      }
+    } finally {
+      if (cbs.length > len) {
+        // added more in the interim.
+        // de-zalgo, just in case, but don't call again.
+        cbs.splice(0, len)
+        process.nextTick(function () {
+          RES.apply(null, args)
+        })
+      } else {
+        delete reqs[key]
+      }
     }
+  })
+}
 
-    var dirs = getNodeModulesDirs(start, modules);
-    return opts && opts.paths ? dirs.concat(opts.paths) : dirs;
-};
+function slice (args) {
+  var length = args.length
+  var array = []
+
+  for (var i = 0; i < length; i++) array[i] = args[i]
+  return array
+}
 
 
 /***/ }),
-/* 91 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 515 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CliError", function() { return CliError; });
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+class CliError extends Error {
+  constructor(message, meta = {}) {
+    super(message);
+    this.meta = meta;
+  }
 
+}
 
-var isWindows = process.platform === 'win32';
-
-// Regex to split a windows path into three parts: [*, device, slash,
-// tail] windows-only
-var splitDeviceRe =
-    /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
+/***/ }),
+/* 516 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-// Regex to split the tail part of the above into [*, dir, basename, ext]
-var splitTailRe =
-    /^([\s\S]*?)((?:\.{1,2}|[^\\\/]+?|)(\.[^.\/\\]*|))(?:[\\\/]*)$/;
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Project", function() { return Project; });
+/* 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 fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(23);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__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 util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(515);
+/* harmony import */ var _log__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(34);
+/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(517);
+/* harmony import */ var _scripts__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(564);
+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; }
 
-var win32 = {};
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-// Function to split a filename into [root, dir, basename, ext]
-function win32SplitPath(filename) {
-  // Separate device+slash from tail
-  var result = splitDeviceRe.exec(filename),
-      device = (result[1] || '') + (result[2] || ''),
-      tail = result[3] || '';
-  // Split the tail into dir, basename and extension
-  var result2 = splitTailRe.exec(tail),
-      dir = result2[1],
-      basename = result2[2],
-      ext = result2[3];
-  return [device, dir, basename, ext];
-}
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-win32.parse = function(pathString) {
-  if (typeof pathString !== 'string') {
-    throw new TypeError(
-        "Parameter 'pathString' must be a string, not " + typeof pathString
-    );
-  }
-  var allParts = win32SplitPath(pathString);
-  if (!allParts || allParts.length !== 4) {
-    throw new TypeError("Invalid path '" + pathString + "'");
-  }
-  return {
-    root: allParts[0],
-    dir: allParts[0] + allParts[1].slice(0, -1),
-    base: allParts[2],
-    ext: allParts[3],
-    name: allParts[2].slice(0, allParts[2].length - allParts[3].length)
-  };
-};
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 
 
-// Split a filename into [root, dir, basename, ext], unix version
-// 'root' is just a slash, or nothing.
-var splitPathRe =
-    /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;
-var posix = {};
 
 
-function posixSplitPath(filename) {
-  return splitPathRe.exec(filename).slice(1);
-}
 
 
-posix.parse = function(pathString) {
-  if (typeof pathString !== 'string') {
-    throw new TypeError(
-        "Parameter 'pathString' must be a string, not " + typeof pathString
-    );
-  }
-  var allParts = posixSplitPath(pathString);
-  if (!allParts || allParts.length !== 4) {
-    throw new TypeError("Invalid path '" + pathString + "'");
+
+class Project {
+  static async fromPath(path) {
+    const pkgJson = await Object(_package_json__WEBPACK_IMPORTED_MODULE_6__["readPackageJson"])(path);
+    return new Project(pkgJson, path);
   }
-  allParts[1] = allParts[1] || '';
-  allParts[2] = allParts[2] || '';
-  allParts[3] = allParts[3] || '';
+  /** parsed package.json */
 
-  return {
-    root: allParts[0],
-    dir: allParts[0] + allParts[1].slice(0, -1),
-    base: allParts[2],
-    ext: allParts[3],
-    name: allParts[2].slice(0, allParts[2].length - allParts[3].length)
-  };
-};
 
+  constructor(packageJson, projectPath) {
+    _defineProperty(this, "json", void 0);
 
-if (isWindows)
-  module.exports = win32.parse;
-else /* posix */
-  module.exports = posix.parse;
+    _defineProperty(this, "packageJsonLocation", void 0);
 
-module.exports.posix = posix.parse;
-module.exports.win32 = win32.parse;
+    _defineProperty(this, "nodeModulesLocation", void 0);
 
+    _defineProperty(this, "targetLocation", void 0);
 
-/***/ }),
-/* 92 */
-/***/ (function(module, exports) {
+    _defineProperty(this, "path", void 0);
 
-module.exports = function (x, opts) {
-    /**
-     * This file is purposefully a passthrough. It's expected that third-party
-     * environments will override it at runtime in order to inject special logic
-     * into `resolve` (by manipulating the options). One such example is the PnP
-     * code path in Yarn.
-     */
+    _defineProperty(this, "version", void 0);
 
-    return opts || {};
-};
+    _defineProperty(this, "allDependencies", void 0);
 
+    _defineProperty(this, "productionDependencies", void 0);
 
-/***/ }),
-/* 93 */
-/***/ (function(module, exports, __webpack_require__) {
+    _defineProperty(this, "devDependencies", void 0);
 
-var core = __webpack_require__(86);
-var fs = __webpack_require__(23);
-var path = __webpack_require__(16);
-var caller = __webpack_require__(89);
-var nodeModulesPaths = __webpack_require__(90);
-var normalizeOptions = __webpack_require__(92);
+    _defineProperty(this, "scripts", void 0);
 
-var defaultIsFile = function isFile(file) {
-    try {
-        var stat = fs.statSync(file);
-    } catch (e) {
-        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
-        throw e;
-    }
-    return stat.isFile() || stat.isFIFO();
-};
+    _defineProperty(this, "isWorkspaceRoot", false);
 
-module.exports = function (x, options) {
-    if (typeof x !== 'string') {
-        throw new TypeError('Path must be a string.');
-    }
-    var opts = normalizeOptions(x, options);
+    _defineProperty(this, "isWorkspaceProject", false);
 
-    var isFile = opts.isFile || defaultIsFile;
-    var readFileSync = opts.readFileSync || fs.readFileSync;
+    this.json = Object.freeze(packageJson);
+    this.path = projectPath;
+    this.packageJsonLocation = path__WEBPACK_IMPORTED_MODULE_2___default.a.resolve(this.path, 'package.json');
+    this.nodeModulesLocation = path__WEBPACK_IMPORTED_MODULE_2___default.a.resolve(this.path, 'node_modules');
+    this.targetLocation = path__WEBPACK_IMPORTED_MODULE_2___default.a.resolve(this.path, 'target');
+    this.version = this.json.version;
+    this.productionDependencies = this.json.dependencies || {};
+    this.devDependencies = this.json.devDependencies || {};
+    this.allDependencies = _objectSpread({}, this.devDependencies, {}, this.productionDependencies);
+    this.isWorkspaceRoot = this.json.hasOwnProperty('workspaces');
+    this.scripts = this.json.scripts || {};
+  }
 
-    var extensions = opts.extensions || ['.js'];
-    var basedir = opts.basedir || path.dirname(caller());
-    var parent = opts.filename || basedir;
+  get name() {
+    return this.json.name;
+  }
 
-    opts.paths = opts.paths || [];
+  ensureValidProjectDependency(project, dependentProjectIsInWorkspace) {
+    const versionInPackageJson = this.allDependencies[project.name];
+    let expectedVersionInPackageJson;
 
-    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
-    var absoluteStart = path.resolve(basedir);
+    if (dependentProjectIsInWorkspace) {
+      expectedVersionInPackageJson = project.json.version;
+    } else {
+      const relativePathToProject = normalizePath(path__WEBPACK_IMPORTED_MODULE_2___default.a.relative(this.path, project.path));
+      expectedVersionInPackageJson = `link:${relativePathToProject}`;
+    } // No issues!
 
-    if (opts.preserveSymlinks === false) {
-        try {
-            absoluteStart = fs.realpathSync(absoluteStart);
-        } catch (realPathErr) {
-            if (realPathErr.code !== 'ENOENT') {
-                throw realPathErr;
-            }
-        }
+
+    if (versionInPackageJson === expectedVersionInPackageJson) {
+      return;
     }
 
-    if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
-        var res = path.resolve(absoluteStart, x);
-        if (x === '..' || x.slice(-1) === '/') res += '/';
-        var m = loadAsFileSync(res) || loadAsDirectorySync(res);
-        if (m) return m;
+    let problemMsg;
+
+    if (Object(_package_json__WEBPACK_IMPORTED_MODULE_6__["isLinkDependency"])(versionInPackageJson) && dependentProjectIsInWorkspace) {
+      problemMsg = `but should be using a workspace`;
+    } else if (Object(_package_json__WEBPACK_IMPORTED_MODULE_6__["isLinkDependency"])(versionInPackageJson)) {
+      problemMsg = `using 'link:', but the path is wrong`;
     } else {
-        var n = loadNodeModulesSync(x, absoluteStart);
-        if (n) return n;
+      problemMsg = `but it's not using the local package`;
     }
 
-    if (core[x]) return x;
+    throw new _errors__WEBPACK_IMPORTED_MODULE_4__["CliError"](`[${this.name}] depends on [${project.name}] ${problemMsg}. Update its package.json to the expected value below.`, {
+      actual: `"${project.name}": "${versionInPackageJson}"`,
+      expected: `"${project.name}": "${expectedVersionInPackageJson}"`,
+      package: `${this.name} (${this.packageJsonLocation})`
+    });
+  }
 
-    var err = new Error("Cannot find module '" + x + "' from '" + parent + "'");
-    err.code = 'MODULE_NOT_FOUND';
-    throw err;
+  getBuildConfig() {
+    return this.json.kibana && this.json.kibana.build || {};
+  }
+  /**
+   * Returns the directory that should be copied into the Kibana build artifact.
+   * This config can be specified to only include the project's build artifacts
+   * instead of everything located in the project directory.
+   */
 
-    function loadAsFileSync(x) {
-        var pkg = loadpkg(path.dirname(x));
 
-        if (pkg && pkg.dir && pkg.pkg && opts.pathFilter) {
-            var rfile = path.relative(pkg.dir, x);
-            var r = opts.pathFilter(pkg.pkg, x, rfile);
-            if (r) {
-                x = path.resolve(pkg.dir, r); // eslint-disable-line no-param-reassign
-            }
-        }
+  getIntermediateBuildDirectory() {
+    return path__WEBPACK_IMPORTED_MODULE_2___default.a.resolve(this.path, this.getBuildConfig().intermediateBuildDirectory || '.');
+  }
 
-        if (isFile(x)) {
-            return x;
-        }
+  getCleanConfig() {
+    return this.json.kibana && this.json.kibana.clean || {};
+  }
 
-        for (var i = 0; i < extensions.length; i++) {
-            var file = x + extensions[i];
-            if (isFile(file)) {
-                return file;
-            }
-        }
+  hasScript(name) {
+    return name in this.scripts;
+  }
+
+  getExecutables() {
+    const raw = this.json.bin;
+
+    if (!raw) {
+      return {};
     }
 
-    function loadpkg(dir) {
-        if (dir === '' || dir === '/') return;
-        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
-            return;
-        }
-        if ((/[/\\]node_modules[/\\]*$/).test(dir)) return;
+    if (typeof raw === 'string') {
+      return {
+        [this.name]: path__WEBPACK_IMPORTED_MODULE_2___default.a.resolve(this.path, raw)
+      };
+    }
 
-        var pkgfile = path.join(dir, 'package.json');
+    if (typeof raw === 'object') {
+      const binsConfig = {};
 
-        if (!isFile(pkgfile)) {
-            return loadpkg(path.dirname(dir));
-        }
+      for (const binName of Object.keys(raw)) {
+        binsConfig[binName] = path__WEBPACK_IMPORTED_MODULE_2___default.a.resolve(this.path, raw[binName]);
+      }
 
-        var body = readFileSync(pkgfile);
+      return binsConfig;
+    }
 
-        try {
-            var pkg = JSON.parse(body);
-        } catch (jsonErr) {}
+    throw new _errors__WEBPACK_IMPORTED_MODULE_4__["CliError"](`[${this.name}] has an invalid "bin" field in its package.json, ` + `expected an object or a string`, {
+      binConfig: Object(util__WEBPACK_IMPORTED_MODULE_3__["inspect"])(raw),
+      package: `${this.name} (${this.packageJsonLocation})`
+    });
+  }
 
-        if (pkg && opts.packageFilter) {
-            pkg = opts.packageFilter(pkg, dir);
-        }
+  async runScript(scriptName, args = []) {
+    _log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`\n\nRunning script [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(scriptName)}] in [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(this.name)}]:\n`));
+    return Object(_scripts__WEBPACK_IMPORTED_MODULE_7__["runScriptInPackage"])(scriptName, args, this);
+  }
 
-        return { pkg: pkg, dir: dir };
-    }
+  runScriptStreaming(scriptName, args = []) {
+    return Object(_scripts__WEBPACK_IMPORTED_MODULE_7__["runScriptInPackageStreaming"])(scriptName, args, this);
+  }
 
-    function loadAsDirectorySync(x) {
-        var pkgfile = path.join(x, '/package.json');
-        if (isFile(pkgfile)) {
-            try {
-                var body = readFileSync(pkgfile, 'UTF8');
-                var pkg = JSON.parse(body);
-            } catch (e) {}
+  hasDependencies() {
+    return Object.keys(this.allDependencies).length > 0;
+  }
 
-            if (opts.packageFilter) {
-                pkg = opts.packageFilter(pkg, x);
-            }
+  async installDependencies({
+    extraArgs
+  }) {
+    _log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`\n\nInstalling dependencies in [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(this.name)}]:\n`));
+    await Object(_scripts__WEBPACK_IMPORTED_MODULE_7__["installInDir"])(this.path, extraArgs);
+    await this.removeExtraneousNodeModules();
+  }
+  /**
+   * Yarn workspaces symlinks workspace projects to the root node_modules, even
+   * when there is no depenency on the project. This results in unnecicary, and
+   * often duplicated code in the build archives.
+   */
 
-            if (pkg.main) {
-                if (typeof pkg.main !== 'string') {
-                    var mainError = new TypeError('package “' + pkg.name + '” `main` must be a string');
-                    mainError.code = 'INVALID_PACKAGE_MAIN';
-                    throw mainError;
-                }
-                if (pkg.main === '.' || pkg.main === './') {
-                    pkg.main = 'index';
-                }
-                try {
-                    var m = loadAsFileSync(path.resolve(x, pkg.main));
-                    if (m) return m;
-                    var n = loadAsDirectorySync(path.resolve(x, pkg.main));
-                    if (n) return n;
-                } catch (e) {}
-            }
-        }
 
-        return loadAsFileSync(path.join(x, '/index'));
+  async removeExtraneousNodeModules() {
+    // this is only relevant for the root workspace
+    if (!this.isWorkspaceRoot) {
+      return;
     }
 
-    function loadNodeModulesSync(x, start) {
-        var dirs = nodeModulesPaths(start, opts, x);
-        for (var i = 0; i < dirs.length; i++) {
-            var dir = dirs[i];
-            var m = loadAsFileSync(path.join(dir, '/', x));
-            if (m) return m;
-            var n = loadAsDirectorySync(path.join(dir, '/', x));
-            if (n) return n;
-        }
+    const workspacesInfo = await Object(_scripts__WEBPACK_IMPORTED_MODULE_7__["yarnWorkspacesInfo"])(this.path);
+    const unusedWorkspaces = new Set(Object.keys(workspacesInfo)); // check for any cross-project dependency
+
+    for (const name of Object.keys(workspacesInfo)) {
+      const workspace = workspacesInfo[name];
+      workspace.workspaceDependencies.forEach(w => unusedWorkspaces.delete(w));
     }
-};
 
+    unusedWorkspaces.forEach(name => {
+      const {
+        dependencies,
+        devDependencies
+      } = this.json;
+      const nodeModulesPath = path__WEBPACK_IMPORTED_MODULE_2___default.a.resolve(this.nodeModulesLocation, name);
+      const isDependency = dependencies && dependencies.hasOwnProperty(name);
+      const isDevDependency = devDependencies && devDependencies.hasOwnProperty(name);
 
-/***/ }),
-/* 94 */
-/***/ (function(module, exports) {
+      if (!isDependency && !isDevDependency && fs__WEBPACK_IMPORTED_MODULE_1___default.a.existsSync(nodeModulesPath)) {
+        _log__WEBPACK_IMPORTED_MODULE_5__["log"].write(`No dependency on ${name}, removing link in node_modules`);
+        fs__WEBPACK_IMPORTED_MODULE_1___default.a.unlinkSync(nodeModulesPath);
+      }
+    });
+  }
 
-module.exports = extractDescription
+} // We normalize all path separators to `/` in generated files
 
-// Extracts description from contents of a readme file in markdown format
-function extractDescription (d) {
-  if (!d) return;
-  if (d === "ERROR: No README data found!") return;
-  // the first block of text before the first heading
-  // that isn't the first line heading
-  d = d.trim().split('\n')
-  for (var s = 0; d[s] && d[s].trim().match(/^(#|$)/); s ++);
-  var l = d.length
-  for (var e = s + 1; e < l && d[e].trim(); e ++);
-  return d.slice(s, e).join(' ').trim()
+function normalizePath(path) {
+  return path.replace(/[\\\/]+/g, '/');
 }
 
-
 /***/ }),
-/* 95 */
-/***/ (function(module) {
-
-module.exports = JSON.parse("{\"topLevel\":{\"dependancies\":\"dependencies\",\"dependecies\":\"dependencies\",\"depdenencies\":\"dependencies\",\"devEependencies\":\"devDependencies\",\"depends\":\"dependencies\",\"dev-dependencies\":\"devDependencies\",\"devDependences\":\"devDependencies\",\"devDepenencies\":\"devDependencies\",\"devdependencies\":\"devDependencies\",\"repostitory\":\"repository\",\"repo\":\"repository\",\"prefereGlobal\":\"preferGlobal\",\"hompage\":\"homepage\",\"hampage\":\"homepage\",\"autohr\":\"author\",\"autor\":\"author\",\"contributers\":\"contributors\",\"publicationConfig\":\"publishConfig\",\"script\":\"scripts\"},\"bugs\":{\"web\":\"url\",\"name\":\"url\"},\"script\":{\"server\":\"start\",\"tests\":\"test\"}}");
+/* 517 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/***/ }),
-/* 96 */
-/***/ (function(module, exports, __webpack_require__) {
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readPackageJson", function() { return readPackageJson; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "writePackageJson", function() { return writePackageJson; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isLinkDependency", function() { return isLinkDependency; });
+/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(518);
+/* harmony import */ var read_pkg__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(read_pkg__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(544);
+/* harmony import */ var write_pkg__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(write_pkg__WEBPACK_IMPORTED_MODULE_1__);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
-var util = __webpack_require__(29)
-var messages = __webpack_require__(97)
 
-module.exports = function() {
-  var args = Array.prototype.slice.call(arguments, 0)
-  var warningName = args.shift()
-  if (warningName == "typo") {
-    return makeTypoWarning.apply(null,args)
-  }
-  else {
-    var msgTemplate = messages[warningName] ? messages[warningName] : warningName + ": '%s'"
-    args.unshift(msgTemplate)
-    return util.format.apply(null, args)
-  }
+function readPackageJson(cwd) {
+  return read_pkg__WEBPACK_IMPORTED_MODULE_0___default()({
+    cwd,
+    normalize: false
+  });
 }
-
-function makeTypoWarning (providedName, probableName, field) {
-  if (field) {
-    providedName = field + "['" + providedName + "']"
-    probableName = field + "['" + probableName + "']"
-  }
-  return util.format(messages.typo, providedName, probableName)
+function writePackageJson(path, json) {
+  return write_pkg__WEBPACK_IMPORTED_MODULE_1___default()(path, json);
 }
-
-
-/***/ }),
-/* 97 */
-/***/ (function(module) {
-
-module.exports = JSON.parse("{\"repositories\":\"'repositories' (plural) Not supported. Please pick one as the 'repository' field\",\"missingRepository\":\"No repository field.\",\"brokenGitUrl\":\"Probably broken git url: %s\",\"nonObjectScripts\":\"scripts must be an object\",\"nonStringScript\":\"script values must be string commands\",\"nonArrayFiles\":\"Invalid 'files' member\",\"invalidFilename\":\"Invalid filename in 'files' list: %s\",\"nonArrayBundleDependencies\":\"Invalid 'bundleDependencies' list. Must be array of package names\",\"nonStringBundleDependency\":\"Invalid bundleDependencies member: %s\",\"nonDependencyBundleDependency\":\"Non-dependency in bundleDependencies: %s\",\"nonObjectDependencies\":\"%s field must be an object\",\"nonStringDependency\":\"Invalid dependency: %s %s\",\"deprecatedArrayDependencies\":\"specifying %s as array is deprecated\",\"deprecatedModules\":\"modules field is deprecated\",\"nonArrayKeywords\":\"keywords should be an array of strings\",\"nonStringKeyword\":\"keywords should be an array of strings\",\"conflictingName\":\"%s is also the name of a node core module.\",\"nonStringDescription\":\"'description' field should be a string\",\"missingDescription\":\"No description\",\"missingReadme\":\"No README data\",\"missingLicense\":\"No license field.\",\"nonEmailUrlBugsString\":\"Bug string field must be url, email, or {email,url}\",\"nonUrlBugsUrlField\":\"bugs.url field must be a string url. Deleted.\",\"nonEmailBugsEmailField\":\"bugs.email field must be a string email. Deleted.\",\"emptyNormalizedBugs\":\"Normalized value of bugs field is an empty object. Deleted.\",\"nonUrlHomepage\":\"homepage field must be a string url. Deleted.\",\"invalidLicense\":\"license should be a valid SPDX license expression\",\"typo\":\"%s should probably be %s.\"}");
+const isLinkDependency = depVersion => depVersion.startsWith('link:');
 
 /***/ }),
-/* 98 */
+/* 518 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const {promisify} = __webpack_require__(29);
+const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
-const writeJsonFile = __webpack_require__(99);
-const sortKeys = __webpack_require__(113);
-
-const dependencyKeys = new Set([
-	'dependencies',
-	'devDependencies',
-	'optionalDependencies',
-	'peerDependencies'
-]);
-
-function normalize(packageJson) {
-	const result = {};
-
-	for (const key of Object.keys(packageJson)) {
-		if (!dependencyKeys.has(key)) {
-			result[key] = packageJson[key];
-		} else if (Object.keys(packageJson[key]).length !== 0) {
-			result[key] = sortKeys(packageJson[key]);
-		}
-	}
-
-	return result;
-}
+const parseJson = __webpack_require__(519);
 
-module.exports = async (filePath, data, options) => {
-	if (typeof filePath !== 'string') {
-		options = data;
-		data = filePath;
-		filePath = '.';
-	}
+const readFileAsync = promisify(fs.readFile);
 
+module.exports = async options => {
 	options = {
+		cwd: process.cwd(),
 		normalize: true,
-		...options,
-		detectIndent: true
+		...options
 	};
 
-	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
+	const filePath = path.resolve(options.cwd, 'package.json');
+	const json = parseJson(await readFileAsync(filePath, 'utf8'));
 
-	data = options.normalize ? normalize(data) : data;
+	if (options.normalize) {
+		__webpack_require__(520)(json);
+	}
 
-	return writeJsonFile(filePath, data, options);
+	return json;
 };
 
-module.exports.sync = (filePath, data, options) => {
-	if (typeof filePath !== 'string') {
-		options = data;
-		data = filePath;
-		filePath = '.';
-	}
-
+module.exports.sync = options => {
 	options = {
+		cwd: process.cwd(),
 		normalize: true,
-		...options,
-		detectIndent: true
+		...options
 	};
 
-	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
+	const filePath = path.resolve(options.cwd, 'package.json');
+	const json = parseJson(fs.readFileSync(filePath, 'utf8'));
 
-	data = options.normalize ? normalize(data) : data;
+	if (options.normalize) {
+		__webpack_require__(520)(json);
+	}
 
-	writeJsonFile.sync(filePath, data, options);
+	return json;
 };
 
 
 /***/ }),
-/* 99 */
+/* 519 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const path = __webpack_require__(16);
-const fs = __webpack_require__(100);
-const writeFileAtomic = __webpack_require__(104);
-const sortKeys = __webpack_require__(113);
-const makeDir = __webpack_require__(115);
-const pify = __webpack_require__(118);
-const detectIndent = __webpack_require__(119);
-
-const init = (fn, filePath, data, options) => {
-	if (!filePath) {
-		throw new TypeError('Expected a filepath');
-	}
-
-	if (data === undefined) {
-		throw new TypeError('Expected data to stringify');
-	}
-
-	options = Object.assign({
-		indent: '\t',
-		sortKeys: false
-	}, options);
-
-	if (options.sortKeys) {
-		data = sortKeys(data, {
-			deep: true,
-			compare: typeof options.sortKeys === 'function' ? options.sortKeys : undefined
-		});
-	}
-
-	return fn(filePath, data, options);
-};
-
-const readFile = filePath => pify(fs.readFile)(filePath, 'utf8').catch(() => {});
-
-const main = (filePath, data, options) => {
-	return (options.detectIndent ? readFile(filePath) : Promise.resolve())
-		.then(string => {
-			const indent = string ? detectIndent(string).indent : options.indent;
-			const json = JSON.stringify(data, options.replacer, indent);
+const errorEx = __webpack_require__(436);
+const fallback = __webpack_require__(438);
+const {default: LinesAndColumns} = __webpack_require__(439);
+const {codeFrameColumns} = __webpack_require__(440);
 
-			return pify(writeFileAtomic)(filePath, `${json}\n`, {mode: options.mode});
-		});
-};
+const JSONError = errorEx('JSONError', {
+	fileName: errorEx.append('in %s'),
+	codeFrame: errorEx.append('\n\n%s\n')
+});
 
-const mainSync = (filePath, data, options) => {
-	let {indent} = options;
+module.exports = (string, reviver, filename) => {
+	if (typeof reviver === 'string') {
+		filename = reviver;
+		reviver = null;
+	}
 
-	if (options.detectIndent) {
+	try {
 		try {
-			const file = fs.readFileSync(filePath, 'utf8');
-			indent = detectIndent(file).indent;
+			return JSON.parse(string, reviver);
 		} catch (error) {
-			if (error.code !== 'ENOENT') {
-				throw error;
-			}
+			fallback(string, reviver);
+			throw error;
 		}
-	}
+	} catch (error) {
+		error.message = error.message.replace(/\n/g, '');
+		const indexMatch = error.message.match(/in JSON at position (\d+) while parsing near/);
 
-	const json = JSON.stringify(data, options.replacer, indent);
+		const jsonError = new JSONError(error);
+		if (filename) {
+			jsonError.fileName = filename;
+		}
 
-	return writeFileAtomic.sync(filePath, `${json}\n`, {mode: options.mode});
-};
+		if (indexMatch && indexMatch.length > 0) {
+			const lines = new LinesAndColumns(string);
+			const index = Number(indexMatch[1]);
+			const location = lines.locationForIndex(index);
 
-const writeJsonFile = (filePath, data, options) => {
-	return makeDir(path.dirname(filePath), {fs})
-		.then(() => init(main, filePath, data, options));
-};
+			const codeFrame = codeFrameColumns(
+				string,
+				{start: {line: location.line + 1, column: location.column + 1}},
+				{highlightCode: true}
+			);
 
-module.exports = writeJsonFile;
-// TODO: Remove this for the next major release
-module.exports.default = writeJsonFile;
-module.exports.sync = (filePath, data, options) => {
-	makeDir.sync(path.dirname(filePath), {fs});
-	init(mainSync, filePath, data, options);
+			jsonError.codeFrame = codeFrame;
+		}
+
+		throw jsonError;
+	}
 };
 
 
 /***/ }),
-/* 100 */
+/* 520 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(23)
-var polyfills = __webpack_require__(101)
-var legacy = __webpack_require__(102)
-var clone = __webpack_require__(103)
+module.exports = normalize
 
-var queue = []
+var fixer = __webpack_require__(521)
+normalize.fixer = fixer
 
-var util = __webpack_require__(29)
+var makeWarning = __webpack_require__(542)
 
-function noop () {}
+var fieldsToFix = ['name','version','description','repository','modules','scripts'
+                  ,'files','bin','man','bugs','keywords','readme','homepage','license']
+var otherThingsToFix = ['dependencies','people', 'typos']
 
-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)
-  }
+var thingsToFix = fieldsToFix.map(function(fieldName) {
+  return ucFirst(fieldName) + "Field"
+})
+// two ways to do this in CoffeeScript on only one line, sub-70 chars:
+// thingsToFix = fieldsToFix.map (name) -> ucFirst(name) + "Field"
+// thingsToFix = (ucFirst(name) + "Field" for name in fieldsToFix)
+thingsToFix = thingsToFix.concat(otherThingsToFix)
 
-if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
-  process.on('exit', function() {
-    debug(queue)
-    __webpack_require__(30).equal(queue.length, 0)
+function normalize (data, warn, strict) {
+  if(warn === true) warn = null, strict = true
+  if(!strict) strict = false
+  if(!warn || data.private) warn = function(msg) { /* noop */ }
+
+  if (data.scripts &&
+      data.scripts.install === "node-gyp rebuild" &&
+      !data.scripts.preinstall) {
+    data.gypfile = true
+  }
+  fixer.warn = function() { warn(makeWarning.apply(null, arguments)) }
+  thingsToFix.forEach(function(thingName) {
+    fixer["fix" + ucFirst(thingName)](data, strict)
   })
+  data._id = data.name + "@" + data.version
 }
 
-module.exports = patch(clone(fs))
-if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
-    module.exports = patch(fs)
-    fs.__patched = true;
+function ucFirst (string) {
+  return string.charAt(0).toUpperCase() + string.slice(1);
 }
 
-// Always patch fs.close/closeSync, because we want 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.
-module.exports.close = (function (fs$close) { return function (fd, cb) {
-  return fs$close.call(fs, fd, function (err) {
-    if (!err)
-      retry()
-
-    if (typeof cb === 'function')
-      cb.apply(this, arguments)
-  })
-}})(fs.close)
 
-module.exports.closeSync = (function (fs$closeSync) { return function (fd) {
-  // Note that graceful-fs also retries when fs.closeSync() fails.
-  // Looks like a bug to me, although it's probably a harmless one.
-  var rval = fs$closeSync.apply(fs, arguments)
-  retry()
-  return rval
-}})(fs.closeSync)
+/***/ }),
+/* 521 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// Only patch fs once, otherwise we'll run into a memory leak if
-// graceful-fs is loaded multiple times, such as in test environments that
-// reset the loaded modules between tests.
-// We look for the string `graceful-fs` from the comment above. This
-// way we are not adding any extra properties and it will detect if older
-// versions of graceful-fs are installed.
-if (!/\bgraceful-fs\b/.test(fs.closeSync.toString())) {
-  fs.closeSync = module.exports.closeSync;
-  fs.close = module.exports.close;
-}
+var semver = __webpack_require__(522)
+var validateLicense = __webpack_require__(523);
+var hostedGitInfo = __webpack_require__(528)
+var isBuiltinModule = __webpack_require__(531).isCore
+var depTypes = ["dependencies","devDependencies","optionalDependencies"]
+var extractDescription = __webpack_require__(540)
+var url = __webpack_require__(454)
+var typos = __webpack_require__(541)
 
-function patch (fs) {
-  // Everything that references the open() function needs to be in here
-  polyfills(fs)
-  fs.gracefulify = patch
-  fs.FileReadStream = ReadStream;  // Legacy name.
-  fs.FileWriteStream = WriteStream;  // Legacy name.
-  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
+var fixer = module.exports = {
+  // default warning function
+  warn: function() {},
 
-    return go$readFile(path, options, cb)
+  fixRepositoryField: function(data) {
+    if (data.repositories) {
+      this.warn("repositories");
+      data.repository = data.repositories[0]
+    }
+    if (!data.repository) return this.warn("missingRepository")
+    if (typeof data.repository === "string") {
+      data.repository = {
+        type: "git",
+        url: data.repository
+      }
+    }
+    var r = data.repository.url || ""
+    if (r) {
+      var hosted = hostedGitInfo.fromUrl(r)
+      if (hosted) {
+        r = data.repository.url
+          = hosted.getDefaultRepresentation() == "shortcut" ? hosted.https() : hosted.toString()
+      }
+    }
 
-    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()
-        }
-      })
+    if (r.match(/github.com\/[^\/]+\/[^\/]+\.git\.git$/)) {
+      this.warn("brokenGitUrl", r)
     }
   }
 
-  var fs$writeFile = fs.writeFile
-  fs.writeFile = writeFile
-  function writeFile (path, data, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
-
-    return go$writeFile(path, data, options, cb)
+, fixTypos: function(data) {
+    Object.keys(typos.topLevel).forEach(function (d) {
+      if (data.hasOwnProperty(d)) {
+        this.warn("typo", d, typos.topLevel[d])
+      }
+    }, this)
+  }
 
-    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()
-        }
-      })
+, fixScriptsField: function(data) {
+    if (!data.scripts) return
+    if (typeof data.scripts !== "object") {
+      this.warn("nonObjectScripts")
+      delete data.scripts
+      return
     }
+    Object.keys(data.scripts).forEach(function (k) {
+      if (typeof data.scripts[k] !== "string") {
+        this.warn("nonStringScript")
+        delete data.scripts[k]
+      } else if (typos.script[k] && !data.scripts[typos.script[k]]) {
+        this.warn("typo", k, typos.script[k], "scripts")
+      }
+    }, this)
   }
 
-  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
-
-    return go$appendFile(path, data, options, cb)
-
-    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()
+, fixFilesField: function(data) {
+    var files = data.files
+    if (files && !Array.isArray(files)) {
+      this.warn("nonArrayFiles")
+      delete data.files
+    } else if (data.files) {
+      data.files = data.files.filter(function(file) {
+        if (!file || typeof file !== "string") {
+          this.warn("invalidFilename", file)
+          return false
+        } else {
+          return true
         }
-      })
+      }, this)
     }
   }
 
-  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)
-
-    return go$readdir(args)
-
-    function go$readdir$cb (err, files) {
-      if (files && files.sort)
-        files.sort()
-
-      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-        enqueue([go$readdir, [args]])
-
-      else {
-        if (typeof cb === 'function')
-          cb.apply(this, arguments)
-        retry()
+, fixBinField: function(data) {
+    if (!data.bin) return;
+    if (typeof data.bin === "string") {
+      var b = {}
+      var match
+      if (match = data.name.match(/^@[^/]+[/](.*)$/)) {
+        b[match[1]] = data.bin
+      } else {
+        b[data.name] = data.bin
       }
+      data.bin = b
     }
   }
 
-  function go$readdir (args) {
-    return fs$readdir.apply(fs, args)
+, fixManField: function(data) {
+    if (!data.man) return;
+    if (typeof data.man === "string") {
+      data.man = [ data.man ]
+    }
   }
-
-  if (process.version.substr(0, 4) === 'v0.8') {
-    var legStreams = legacy(fs)
-    ReadStream = legStreams.ReadStream
-    WriteStream = legStreams.WriteStream
+, fixBundleDependenciesField: function(data) {
+    var bdd = "bundledDependencies"
+    var bd = "bundleDependencies"
+    if (data[bdd] && !data[bd]) {
+      data[bd] = data[bdd]
+      delete data[bdd]
+    }
+    if (data[bd] && !Array.isArray(data[bd])) {
+      this.warn("nonArrayBundleDependencies")
+      delete data[bd]
+    } else if (data[bd]) {
+      data[bd] = data[bd].filter(function(bd) {
+        if (!bd || typeof bd !== 'string') {
+          this.warn("nonStringBundleDependency", bd)
+          return false
+        } else {
+          if (!data.dependencies) {
+            data.dependencies = {}
+          }
+          if (!data.dependencies.hasOwnProperty(bd)) {
+            this.warn("nonDependencyBundleDependency", bd)
+            data.dependencies[bd] = "*"
+          }
+          return true
+        }
+      }, this)
+    }
   }
 
-  var fs$ReadStream = fs.ReadStream
-  if (fs$ReadStream) {
-    ReadStream.prototype = Object.create(fs$ReadStream.prototype)
-    ReadStream.prototype.open = ReadStream$open
-  }
+, fixDependencies: function(data, strict) {
+    var loose = !strict
+    objectifyDeps(data, this.warn)
+    addOptionalDepsToDeps(data, this.warn)
+    this.fixBundleDependenciesField(data)
 
-  var fs$WriteStream = fs.WriteStream
-  if (fs$WriteStream) {
-    WriteStream.prototype = Object.create(fs$WriteStream.prototype)
-    WriteStream.prototype.open = WriteStream$open
+    ;['dependencies','devDependencies'].forEach(function(deps) {
+      if (!(deps in data)) return
+      if (!data[deps] || typeof data[deps] !== "object") {
+        this.warn("nonObjectDependencies", deps)
+        delete data[deps]
+        return
+      }
+      Object.keys(data[deps]).forEach(function (d) {
+        var r = data[deps][d]
+        if (typeof r !== 'string') {
+          this.warn("nonStringDependency", d, JSON.stringify(r))
+          delete data[deps][d]
+        }
+        var hosted = hostedGitInfo.fromUrl(data[deps][d])
+        if (hosted) data[deps][d] = hosted.toString()
+      }, this)
+    }, this)
   }
 
-  fs.ReadStream = ReadStream
-  fs.WriteStream = WriteStream
-
-  function ReadStream (path, options) {
-    if (this instanceof ReadStream)
-      return fs$ReadStream.apply(this, arguments), this
-    else
-      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
+, fixModulesField: function (data) {
+    if (data.modules) {
+      this.warn("deprecatedModules")
+      delete data.modules
+    }
   }
 
-  function ReadStream$open () {
-    var that = this
-    open(that.path, that.flags, that.mode, function (err, fd) {
-      if (err) {
-        if (that.autoClose)
-          that.destroy()
-
-        that.emit('error', err)
-      } else {
-        that.fd = fd
-        that.emit('open', fd)
-        that.read()
-      }
-    })
+, fixKeywordsField: function (data) {
+    if (typeof data.keywords === "string") {
+      data.keywords = data.keywords.split(/,\s+/)
+    }
+    if (data.keywords && !Array.isArray(data.keywords)) {
+      delete data.keywords
+      this.warn("nonArrayKeywords")
+    } else if (data.keywords) {
+      data.keywords = data.keywords.filter(function(kw) {
+        if (typeof kw !== "string" || !kw) {
+          this.warn("nonStringKeyword");
+          return false
+        } else {
+          return true
+        }
+      }, this)
+    }
   }
 
-  function WriteStream (path, options) {
-    if (this instanceof WriteStream)
-      return fs$WriteStream.apply(this, arguments), this
-    else
-      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
+, fixVersionField: function(data, strict) {
+    // allow "loose" semver 1.0 versions in non-strict mode
+    // enforce strict semver 2.0 compliance in strict mode
+    var loose = !strict
+    if (!data.version) {
+      data.version = ""
+      return true
+    }
+    if (!semver.valid(data.version, loose)) {
+      throw new Error('Invalid version: "'+ data.version + '"')
+    }
+    data.version = semver.clean(data.version, loose)
+    return true
   }
 
-  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)
-      }
-    })
+, fixPeople: function(data) {
+    modifyPeople(data, unParsePerson)
+    modifyPeople(data, parsePerson)
   }
 
-  function createReadStream (path, options) {
-    return new ReadStream(path, options)
+, fixNameField: function(data, options) {
+    if (typeof options === "boolean") options = {strict: options}
+    else if (typeof options === "undefined") options = {}
+    var strict = options.strict
+    if (!data.name && !strict) {
+      data.name = ""
+      return
+    }
+    if (typeof data.name !== "string") {
+      throw new Error("name field must be a string.")
+    }
+    if (!strict)
+      data.name = data.name.trim()
+    ensureValidName(data.name, strict, options.allowLegacyCase)
+    if (isBuiltinModule(data.name))
+      this.warn("conflictingName", data.name)
   }
 
-  function createWriteStream (path, options) {
-    return new WriteStream(path, options)
-  }
 
-  var fs$open = fs.open
-  fs.open = open
-  function open (path, flags, mode, cb) {
-    if (typeof mode === 'function')
-      cb = mode, mode = null
+, fixDescriptionField: function (data) {
+    if (data.description && typeof data.description !== 'string') {
+      this.warn("nonStringDescription")
+      delete data.description
+    }
+    if (data.readme && !data.description)
+      data.description = extractDescription(data.readme)
+      if(data.description === undefined) delete data.description;
+    if (!data.description) this.warn("missingDescription")
+  }
 
-    return go$open(path, flags, mode, cb)
+, fixReadmeField: function (data) {
+    if (!data.readme) {
+      this.warn("missingReadme")
+      data.readme = "ERROR: No README data found!"
+    }
+  }
 
-    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()
+, fixBugsField: function(data) {
+    if (!data.bugs && data.repository && data.repository.url) {
+      var hosted = hostedGitInfo.fromUrl(data.repository.url)
+      if(hosted && hosted.bugs()) {
+        data.bugs = {url: hosted.bugs()}
+      }
+    }
+    else if(data.bugs) {
+      var emailRe = /^.+@.*\..+$/
+      if(typeof data.bugs == "string") {
+        if(emailRe.test(data.bugs))
+          data.bugs = {email:data.bugs}
+        else if(url.parse(data.bugs).protocol)
+          data.bugs = {url: data.bugs}
+        else
+          this.warn("nonEmailUrlBugsString")
+      }
+      else {
+        bugsTypos(data.bugs, this.warn)
+        var oldBugs = data.bugs
+        data.bugs = {}
+        if(oldBugs.url) {
+          if(typeof(oldBugs.url) == "string" && url.parse(oldBugs.url).protocol)
+            data.bugs.url = oldBugs.url
+          else
+            this.warn("nonUrlBugsUrlField")
+        }
+        if(oldBugs.email) {
+          if(typeof(oldBugs.email) == "string" && emailRe.test(oldBugs.email))
+            data.bugs.email = oldBugs.email
+          else
+            this.warn("nonEmailBugsEmailField")
         }
-      })
+      }
+      if(!data.bugs.email && !data.bugs.url) {
+        delete data.bugs
+        this.warn("emptyNormalizedBugs")
+      }
     }
   }
 
-  return fs
-}
+, fixHomepageField: function(data) {
+    if (!data.homepage && data.repository && data.repository.url) {
+      var hosted = hostedGitInfo.fromUrl(data.repository.url)
+      if (hosted && hosted.docs()) data.homepage = hosted.docs()
+    }
+    if (!data.homepage) return
 
-function enqueue (elem) {
-  debug('ENQUEUE', elem[0].name, elem[1])
-  queue.push(elem)
-}
+    if(typeof data.homepage !== "string") {
+      this.warn("nonUrlHomepage")
+      return delete data.homepage
+    }
+    if(!url.parse(data.homepage).protocol) {
+      data.homepage = "http://" + data.homepage
+    }
+  }
 
-function retry () {
-  var elem = queue.shift()
-  if (elem) {
-    debug('RETRY', elem[0].name, elem[1])
-    elem[0].apply(null, elem[1])
+, fixLicenseField: function(data) {
+    if (!data.license) {
+      return this.warn("missingLicense")
+    } else{
+      if (
+        typeof(data.license) !== 'string' ||
+        data.license.length < 1 ||
+        data.license.trim() === ''
+      ) {
+        this.warn("invalidLicense")
+      } else {
+        if (!validateLicense(data.license).validForNewPackages)
+          this.warn("invalidLicense")
+      }
+    }
   }
 }
 
+function isValidScopedPackageName(spec) {
+  if (spec.charAt(0) !== '@') return false
 
-/***/ }),
-/* 101 */
-/***/ (function(module, exports, __webpack_require__) {
+  var rest = spec.slice(1).split('/')
+  if (rest.length !== 2) return false
 
-var constants = __webpack_require__(26)
+  return rest[0] && rest[1] &&
+    rest[0] === encodeURIComponent(rest[0]) &&
+    rest[1] === encodeURIComponent(rest[1])
+}
 
-var origCwd = process.cwd
-var cwd = null
+function isCorrectlyEncodedName(spec) {
+  return !spec.match(/[\/@\s\+%:]/) &&
+    spec === encodeURIComponent(spec)
+}
 
-var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
+function ensureValidName (name, strict, allowLegacyCase) {
+  if (name.charAt(0) === "." ||
+      !(isValidScopedPackageName(name) || isCorrectlyEncodedName(name)) ||
+      (strict && (!allowLegacyCase) && name !== name.toLowerCase()) ||
+      name.toLowerCase() === "node_modules" ||
+      name.toLowerCase() === "favicon.ico") {
+        throw new Error("Invalid name: " + JSON.stringify(name))
+  }
+}
 
-process.cwd = function() {
-  if (!cwd)
-    cwd = origCwd.call(process)
-  return cwd
+function modifyPeople (data, fn) {
+  if (data.author) data.author = fn(data.author)
+  ;["maintainers", "contributors"].forEach(function (set) {
+    if (!Array.isArray(data[set])) return;
+    data[set] = data[set].map(fn)
+  })
+  return data
 }
-try {
-  process.cwd()
-} catch (er) {}
 
-var chdir = process.chdir
-process.chdir = function(d) {
-  cwd = null
-  chdir.call(process, d)
+function unParsePerson (person) {
+  if (typeof person === "string") return person
+  var name = person.name || ""
+  var u = person.url || person.web
+  var url = u ? (" ("+u+")") : ""
+  var e = person.email || person.mail
+  var email = e ? (" <"+e+">") : ""
+  return name+email+url
 }
 
-module.exports = patch
+function parsePerson (person) {
+  if (typeof person !== "string") return person
+  var name = person.match(/^([^\(<]+)/)
+  var url = person.match(/\(([^\)]+)\)/)
+  var email = person.match(/<([^>]+)>/)
+  var obj = {}
+  if (name && name[0].trim()) obj.name = name[0].trim()
+  if (email) obj.email = email[1];
+  if (url) obj.url = url[1];
+  return obj
+}
 
-function patch (fs) {
-  // (re-)implement some things that are known busted or missing.
+function addOptionalDepsToDeps (data, warn) {
+  var o = data.optionalDependencies
+  if (!o) return;
+  var d = data.dependencies || {}
+  Object.keys(o).forEach(function (k) {
+    d[k] = o[k]
+  })
+  data.dependencies = d
+}
 
-  // 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)
+function depObjectify (deps, type, warn) {
+  if (!deps) return {}
+  if (typeof deps === "string") {
+    deps = deps.trim().split(/[\n\r\s\t ,]+/)
   }
+  if (!Array.isArray(deps)) return deps
+  warn("deprecatedArrayDependencies", type)
+  var o = {}
+  deps.filter(function (d) {
+    return typeof d === "string"
+  }).forEach(function(d) {
+    d = d.trim().split(/(:?[@\s><=])/)
+    var dn = d.shift()
+    var dv = d.join("")
+    dv = dv.trim()
+    dv = dv.replace(/^@/, "")
+    o[dn] = dv
+  })
+  return o
+}
 
-  // lutimes implementation, or no-op
-  if (!fs.lutimes) {
-    patchLutimes(fs)
-  }
+function objectifyDeps (data, warn) {
+  depTypes.forEach(function (type) {
+    if (!data[type]) return;
+    data[type] = depObjectify(data[type], type, warn)
+  })
+}
 
-  // 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.
+function bugsTypos(bugs, warn) {
+  if (!bugs) return
+  Object.keys(bugs).forEach(function (k) {
+    if (typos.bugs[k]) {
+      warn("typo", k, typos.bugs[k], "bugs")
+      bugs[typos.bugs[k]] = bugs[k]
+      delete bugs[k]
+    }
+  })
+}
 
-  fs.chown = chownFix(fs.chown)
-  fs.fchown = chownFix(fs.fchown)
-  fs.lchown = chownFix(fs.lchown)
 
-  fs.chmod = chmodFix(fs.chmod)
-  fs.fchmod = chmodFix(fs.fchmod)
-  fs.lchmod = chmodFix(fs.lchmod)
+/***/ }),
+/* 522 */
+/***/ (function(module, exports) {
 
-  fs.chownSync = chownFixSync(fs.chownSync)
-  fs.fchownSync = chownFixSync(fs.fchownSync)
-  fs.lchownSync = chownFixSync(fs.lchownSync)
+exports = module.exports = SemVer;
 
-  fs.chmodSync = chmodFixSync(fs.chmodSync)
-  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
-  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
+// 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() {};
 
-  fs.stat = statFix(fs.stat)
-  fs.fstat = statFix(fs.fstat)
-  fs.lstat = statFix(fs.lstat)
+// 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';
 
-  fs.statSync = statFixSync(fs.statSync)
-  fs.fstatSync = statFixSync(fs.fstatSync)
-  fs.lstatSync = statFixSync(fs.lstatSync)
+var MAX_LENGTH = 256;
+var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
 
-  // 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 () {}
-  }
+// The actual regexps go on exports.re
+var re = exports.re = [];
+var src = exports.src = [];
+var R = 0;
 
-  // 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.
+// The following Regular Expressions can be used for tokenizing,
+// validating, and parsing SemVer version strings.
 
-  // 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)
-  }
+// ## Numeric Identifier
+// A single `0`, or a non-zero digit followed by zero or more digits.
 
-  // if read() returns EAGAIN, then just try it again.
-  fs.read = (function (fs$read) { return function (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)
-  }})(fs.read)
+var NUMERICIDENTIFIER = R++;
+src[NUMERICIDENTIFIER] = '0|[1-9]\\d*';
+var NUMERICIDENTIFIERLOOSE = R++;
+src[NUMERICIDENTIFIERLOOSE] = '[0-9]+';
 
-  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)
 
-  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)
-          })
-        })
-      })
-    }
+// ## Non-numeric Identifier
+// Zero or more digits, followed by a letter or hyphen, and then zero or
+// more letters, digits, or hyphens.
 
-    fs.lchmodSync = function (path, mode) {
-      var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
+var NONNUMERICIDENTIFIER = R++;
+src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*';
 
-      // 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 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)
-            })
-          })
-        })
-      }
+// ## Main Version
+// Three dot-separated numeric identifiers.
 
-      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
-      }
+var MAINVERSION = R++;
+src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')';
 
-    } else {
-      fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
-      fs.lutimesSync = function () {}
-    }
-  }
+var MAINVERSIONLOOSE = R++;
+src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')';
 
-  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)
-      })
-    }
-  }
+// ## Pre-release Version Identifier
+// A numeric identifier, or a non-numeric identifier.
 
-  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
-      }
-    }
-  }
+var PRERELEASEIDENTIFIER = R++;
+src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
+                            '|' + src[NONNUMERICIDENTIFIER] + ')';
 
+var PRERELEASEIDENTIFIERLOOSE = R++;
+src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
+                                 '|' + src[NONNUMERICIDENTIFIER] + ')';
 
-  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)
-      })
-    }
-  }
 
-  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
-      }
-    }
-  }
+// ## Pre-release Version
+// Hyphen, followed by one or more dot-separated pre-release version
+// identifiers.
 
+var PRERELEASE = R++;
+src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
+                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))';
 
-  function statFix (orig) {
-    if (!orig) return orig
-    // Older versions of Node erroneously returned signed integers for
-    // uid + gid.
-    return function (target, cb) {
-      return orig.call(fs, target, function (er, stats) {
-        if (!stats) return cb.apply(this, arguments)
-        if (stats.uid < 0) stats.uid += 0x100000000
-        if (stats.gid < 0) stats.gid += 0x100000000
-        if (cb) cb.apply(this, arguments)
-      })
-    }
-  }
+var PRERELEASELOOSE = R++;
+src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
+                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))';
 
-  function statFixSync (orig) {
-    if (!orig) return orig
-    // Older versions of Node erroneously returned signed integers for
-    // uid + gid.
-    return function (target) {
-      var stats = orig.call(fs, target)
-      if (stats.uid < 0) stats.uid += 0x100000000
-      if (stats.gid < 0) stats.gid += 0x100000000
-      return stats;
-    }
-  }
+// ## Build Metadata Identifier
+// Any combination of digits, letters, or hyphens.
 
-  // 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
+var BUILDIDENTIFIER = R++;
+src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+';
 
-    if (er.code === "ENOSYS")
-      return true
+// ## Build Metadata
+// Plus sign, followed by one or more period-separated build metadata
+// identifiers.
 
-    var nonroot = !process.getuid || process.getuid() !== 0
-    if (nonroot) {
-      if (er.code === "EINVAL" || er.code === "EPERM")
-        return true
-    }
+var BUILD = R++;
+src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
+             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))';
 
-    return false
-  }
-}
 
+// ## Full Version String
+// A main version, followed optionally by a pre-release version and
+// build metadata.
+
+// 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.
+
+var FULL = R++;
+var FULLPLAIN = 'v?' + src[MAINVERSION] +
+                src[PRERELEASE] + '?' +
+                src[BUILD] + '?';
 
-/***/ }),
-/* 102 */
-/***/ (function(module, exports, __webpack_require__) {
+src[FULL] = '^' + FULLPLAIN + '$';
 
-var Stream = __webpack_require__(28).Stream
+// 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 = legacy
+var LOOSE = R++;
+src[LOOSE] = '^' + LOOSEPLAIN + '$';
 
-function legacy (fs) {
-  return {
-    ReadStream: ReadStream,
-    WriteStream: WriteStream
-  }
+var GTLT = R++;
+src[GTLT] = '((?:<|>)?=?)';
 
-  function ReadStream (path, options) {
-    if (!(this instanceof ReadStream)) return new ReadStream(path, 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|\\*';
 
-    Stream.call(this);
+var XRANGEPLAIN = R++;
+src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:' + src[PRERELEASE] + ')?' +
+                   src[BUILD] + '?' +
+                   ')?)?';
 
-    var self = this;
+var XRANGEPLAINLOOSE = R++;
+src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:' + src[PRERELEASELOOSE] + ')?' +
+                        src[BUILD] + '?' +
+                        ')?)?';
 
-    this.path = path;
-    this.fd = null;
-    this.readable = true;
-    this.paused = false;
+var XRANGE = R++;
+src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$';
+var XRANGELOOSE = R++;
+src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$';
 
-    this.flags = 'r';
-    this.mode = 438; /*=0666*/
-    this.bufferSize = 64 * 1024;
+// Tilde ranges.
+// Meaning is "reasonably at or greater than"
+var LONETILDE = R++;
+src[LONETILDE] = '(?:~>?)';
 
-    options = options || {};
+var TILDETRIM = R++;
+src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+';
+re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g');
+var tildeTrimReplace = '$1~';
 
-    // 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];
-    }
+var TILDE = R++;
+src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$';
+var TILDELOOSE = R++;
+src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$';
 
-    if (this.encoding) this.setEncoding(this.encoding);
+// Caret ranges.
+// Meaning is "at least and backwards compatible with"
+var LONECARET = R++;
+src[LONECARET] = '(?:\\^)';
 
-    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');
-      }
+var CARETTRIM = R++;
+src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+';
+re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g');
+var caretTrimReplace = '$1^';
 
-      if (this.start > this.end) {
-        throw new Error('start must be <= end');
-      }
+var CARET = R++;
+src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$';
+var CARETLOOSE = R++;
+src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$';
 
-      this.pos = this.start;
-    }
+// 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 + ')$|^$';
 
-    if (this.fd !== null) {
-      process.nextTick(function() {
-        self._read();
-      });
-      return;
-    }
 
-    fs.open(this.path, this.flags, this.mode, function (err, fd) {
-      if (err) {
-        self.emit('error', err);
-        self.readable = false;
-        return;
-      }
+// 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] + ')';
 
-      self.fd = fd;
-      self.emit('open', fd);
-      self._read();
-    })
-  }
+// this one has to use the /g flag
+re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g');
+var comparatorTrimReplace = '$1$2$3';
 
-  function WriteStream (path, options) {
-    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
 
-    Stream.call(this);
+// 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*$';
 
-    this.path = path;
-    this.fd = null;
-    this.writable = true;
+var HYPHENRANGELOOSE = R++;
+src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s+-\\s+' +
+                        '(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s*$';
 
-    this.flags = 'w';
-    this.encoding = 'binary';
-    this.mode = 438; /*=0666*/
-    this.bytesWritten = 0;
+// Star ranges basically just allow anything at all.
+var STAR = R++;
+src[STAR] = '(<|>)?=?\\s*\\*';
 
-    options = options || {};
+// 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]);
+}
 
-    // 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];
-    }
+exports.parse = parse;
+function parse(version, loose) {
+  if (version instanceof SemVer)
+    return version;
 
-    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');
-      }
+  if (typeof version !== 'string')
+    return null;
 
-      this.pos = this.start;
-    }
+  if (version.length > MAX_LENGTH)
+    return null;
 
-    this.busy = false;
-    this._queue = [];
+  var r = loose ? re[LOOSE] : re[FULL];
+  if (!r.test(version))
+    return null;
 
-    if (this.fd === null) {
-      this._open = fs.open;
-      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
-      this.flush();
-    }
+  try {
+    return new SemVer(version, loose);
+  } catch (er) {
+    return null;
   }
 }
 
+exports.valid = valid;
+function valid(version, loose) {
+  var v = parse(version, loose);
+  return v ? v.version : null;
+}
 
-/***/ }),
-/* 103 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
 
+exports.clean = clean;
+function clean(version, loose) {
+  var s = parse(version.trim().replace(/^[=v]+/, ''), loose);
+  return s ? s.version : null;
+}
 
-module.exports = clone
+exports.SemVer = SemVer;
 
-function clone (obj) {
-  if (obj === null || typeof obj !== 'object')
-    return obj
+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);
+  }
 
-  if (obj instanceof Object)
-    var copy = { __proto__: obj.__proto__ }
-  else
-    var copy = Object.create(null)
+  if (version.length > MAX_LENGTH)
+    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
 
-  Object.getOwnPropertyNames(obj).forEach(function (key) {
-    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
-  })
+  if (!(this instanceof SemVer))
+    return new SemVer(version, loose);
 
-  return copy
-}
+  debug('SemVer', version, loose);
+  this.loose = loose;
+  var m = version.trim().match(loose ? re[LOOSE] : re[FULL]);
 
+  if (!m)
+    throw new TypeError('Invalid Version: ' + version);
 
-/***/ }),
-/* 104 */
-/***/ (function(module, exports, __webpack_require__) {
+  this.raw = version;
 
-"use strict";
+  // these are actually numbers
+  this.major = +m[1];
+  this.minor = +m[2];
+  this.patch = +m[3];
 
-module.exports = writeFile
-module.exports.sync = writeFileSync
-module.exports._getTmpname = getTmpname // for testing
-module.exports._cleanupOnExit = cleanupOnExit
+  if (this.major > MAX_SAFE_INTEGER || this.major < 0)
+    throw new TypeError('Invalid major version')
 
-var fs = __webpack_require__(105)
-var MurmurHash3 = __webpack_require__(109)
-var onExit = __webpack_require__(110)
-var path = __webpack_require__(16)
-var activeFiles = {}
+  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0)
+    throw new TypeError('Invalid minor version')
 
-// if we run inside of a worker_thread, `process.pid` is not unique
-/* istanbul ignore next */
-var threadId = (function getId () {
-  try {
-    var workerThreads = __webpack_require__(112)
+  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0)
+    throw new TypeError('Invalid patch version')
 
-    /// if we are in main thread, this is set to `0`
-    return workerThreads.threadId
-  } catch (e) {
-    // worker_threads are not available, fallback to 0
-    return 0
-  }
-})()
+  // 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;
+    });
 
-var invocations = 0
-function getTmpname (filename) {
-  return filename + '.' +
-    MurmurHash3(__filename)
-      .hash(String(process.pid))
-      .hash(String(threadId))
-      .hash(String(++invocations))
-      .result()
+  this.build = m[5] ? m[5].split('.') : [];
+  this.format();
 }
 
-function cleanupOnExit (tmpfile) {
-  return function () {
-    try {
-      fs.unlinkSync(typeof tmpfile === 'function' ? tmpfile() : tmpfile)
-    } catch (_) {}
-  }
-}
+SemVer.prototype.format = function() {
+  this.version = this.major + '.' + this.minor + '.' + this.patch;
+  if (this.prerelease.length)
+    this.version += '-' + this.prerelease.join('.');
+  return this.version;
+};
 
-function writeFile (filename, data, options, callback) {
-  if (options) {
-    if (options instanceof Function) {
-      callback = options
-      options = {}
-    } else if (typeof options === 'string') {
-      options = { encoding: options }
-    }
-  } else {
-    options = {}
-  }
+SemVer.prototype.toString = function() {
+  return this.version;
+};
 
-  var Promise = options.Promise || global.Promise
-  var truename
-  var fd
-  var tmpfile
-  /* istanbul ignore next -- The closure only gets called when onExit triggers */
-  var removeOnExitHandler = onExit(cleanupOnExit(() => tmpfile))
-  var absoluteName = path.resolve(filename)
+SemVer.prototype.compare = function(other) {
+  debug('SemVer.compare', this.version, this.loose, other);
+  if (!(other instanceof SemVer))
+    other = new SemVer(other, this.loose);
 
-  new Promise(function serializeSameFile (resolve) {
-    // make a queue if it doesn't already exist
-    if (!activeFiles[absoluteName]) activeFiles[absoluteName] = []
+  return this.compareMain(other) || this.comparePre(other);
+};
 
-    activeFiles[absoluteName].push(resolve) // add this job to the queue
-    if (activeFiles[absoluteName].length === 1) resolve() // kick off the first one
-  }).then(function getRealPath () {
-    return new Promise(function (resolve) {
-      fs.realpath(filename, function (_, realname) {
-        truename = realname || filename
-        tmpfile = getTmpname(truename)
-        resolve()
-      })
-    })
-  }).then(function stat () {
-    return new Promise(function stat (resolve) {
-      if (options.mode && options.chown) resolve()
-      else {
-        // Either mode or chown is not explicitly set
-        // Default behavior is to copy it from original file
-        fs.stat(truename, function (err, stats) {
-          if (err || !stats) resolve()
-          else {
-            options = Object.assign({}, options)
+SemVer.prototype.compareMain = function(other) {
+  if (!(other instanceof SemVer))
+    other = new SemVer(other, this.loose);
 
-            if (options.mode == null) {
-              options.mode = stats.mode
-            }
-            if (options.chown == null && process.getuid) {
-              options.chown = { uid: stats.uid, gid: stats.gid }
-            }
-            resolve()
-          }
-        })
-      }
-    })
-  }).then(function thenWriteFile () {
-    return new Promise(function (resolve, reject) {
-      fs.open(tmpfile, 'w', options.mode, function (err, _fd) {
-        fd = _fd
-        if (err) reject(err)
-        else resolve()
-      })
-    })
-  }).then(function write () {
-    return new Promise(function (resolve, reject) {
-      if (Buffer.isBuffer(data)) {
-        fs.write(fd, data, 0, data.length, 0, function (err) {
-          if (err) reject(err)
-          else resolve()
-        })
-      } else if (data != null) {
-        fs.write(fd, String(data), 0, String(options.encoding || 'utf8'), function (err) {
-          if (err) reject(err)
-          else resolve()
-        })
-      } else resolve()
-    })
-  }).then(function syncAndClose () {
-    return new Promise(function (resolve, reject) {
-      if (options.fsync !== false) {
-        fs.fsync(fd, function (err) {
-          if (err) fs.close(fd, () => reject(err))
-          else fs.close(fd, resolve)
-        })
-      } else {
-        fs.close(fd, resolve)
+  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);
+
+  // 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);
       }
-    })
-  }).then(function chown () {
-    fd = null
-    if (options.chown) {
-      return new Promise(function (resolve, reject) {
-        fs.chown(tmpfile, options.chown.uid, options.chown.gid, function (err) {
-          if (err) reject(err)
-          else resolve()
-        })
-      })
-    }
-  }).then(function chmod () {
-    if (options.mode) {
-      return new Promise(function (resolve, reject) {
-        fs.chmod(tmpfile, options.mode, function (err) {
-          if (err) reject(err)
-          else resolve()
-        })
-      })
-    }
-  }).then(function rename () {
-    return new Promise(function (resolve, reject) {
-      fs.rename(tmpfile, truename, function (err) {
-        if (err) reject(err)
-        else resolve()
-      })
-    })
-  }).then(function success () {
-    removeOnExitHandler()
-    callback()
-  }, function fail (err) {
-    return new Promise(resolve => {
-      return fd ? fs.close(fd, resolve) : resolve()
-    }).then(() => {
-      removeOnExitHandler()
-      fs.unlink(tmpfile, function () {
-        callback(err)
-      })
-    })
-  }).then(function checkQueue () {
-    activeFiles[absoluteName].shift() // remove the element added by serializeSameFile
-    if (activeFiles[absoluteName].length > 0) {
-      activeFiles[absoluteName][0]() // start next job if one is pending
-    } else delete activeFiles[absoluteName]
-  })
-}
+      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;
+
+    default:
+      throw new Error('invalid increment argument: ' + release);
+  }
+  this.format();
+  this.raw = this.version;
+  return this;
+};
+
+exports.inc = inc;
+function inc(version, release, loose, identifier) {
+  if (typeof(loose) === 'string') {
+    identifier = loose;
+    loose = undefined;
+  }
 
-function writeFileSync (filename, data, options) {
-  if (typeof options === 'string') options = { encoding: options }
-  else if (!options) options = {}
   try {
-    filename = fs.realpathSync(filename)
-  } catch (ex) {
-    // it's ok, it'll happen on a not yet existing file
+    return new SemVer(version, loose).inc(release, identifier).version;
+  } catch (er) {
+    return null;
   }
-  var tmpfile = getTmpname(filename)
+}
 
-  if (!options.mode || !options.chown) {
-    // Either mode or chown is not explicitly set
-    // Default behavior is to copy it from original file
-    try {
-      var stats = fs.statSync(filename)
-      options = Object.assign({}, options)
-      if (!options.mode) {
-        options.mode = stats.mode
+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;
+          }
+        }
       }
-      if (!options.chown && process.getuid) {
-        options.chown = { uid: stats.uid, gid: stats.gid }
+      return 'prerelease';
+    }
+    for (var key in v1) {
+      if (key === 'major' || key === 'minor' || key === 'patch') {
+        if (v1[key] !== v2[key]) {
+          return key;
+        }
       }
-    } catch (ex) {
-      // ignore stat errors
     }
   }
+}
 
-  var fd
-  var cleanup = cleanupOnExit(tmpfile)
-  var removeOnExitHandler = onExit(cleanup)
+exports.compareIdentifiers = compareIdentifiers;
 
-  try {
-    fd = fs.openSync(tmpfile, 'w', options.mode)
-    if (Buffer.isBuffer(data)) {
-      fs.writeSync(fd, data, 0, data.length, 0)
-    } else if (data != null) {
-      fs.writeSync(fd, String(data), 0, String(options.encoding || 'utf8'))
-    }
-    if (options.fsync !== false) {
-      fs.fsyncSync(fd)
-    }
-    fs.closeSync(fd)
-    if (options.chown) fs.chownSync(tmpfile, options.chown.uid, options.chown.gid)
-    if (options.mode) fs.chmodSync(tmpfile, options.mode)
-    fs.renameSync(tmpfile, filename)
-    removeOnExitHandler()
-  } catch (err) {
-    if (fd) {
-      try {
-        fs.closeSync(fd)
-      } catch (ex) {
-        // ignore close errors at this stage, error may have closed fd already.
-      }
-    }
-    removeOnExitHandler()
-    cleanup()
-    throw err
+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);
+}
 
-/***/ }),
-/* 105 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.major = major;
+function major(a, loose) {
+  return new SemVer(a, loose).major;
+}
 
-var fs = __webpack_require__(23)
-var polyfills = __webpack_require__(106)
-var legacy = __webpack_require__(108)
-var queue = []
+exports.minor = minor;
+function minor(a, loose) {
+  return new SemVer(a, loose).minor;
+}
 
-var util = __webpack_require__(29)
+exports.patch = patch;
+function patch(a, loose) {
+  return new SemVer(a, loose).patch;
+}
 
-function noop () {}
+exports.compare = compare;
+function compare(a, b, loose) {
+  return new SemVer(a, loose).compare(new SemVer(b, loose));
+}
 
-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)
-  }
+exports.compareLoose = compareLoose;
+function compareLoose(a, b) {
+  return compare(a, b, true);
+}
 
-if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
-  process.on('exit', function() {
-    debug(queue)
-    __webpack_require__(30).equal(queue.length, 0)
-  })
+exports.rcompare = rcompare;
+function rcompare(a, b, loose) {
+  return compare(b, a, loose);
 }
 
-module.exports = patch(__webpack_require__(107))
-if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH) {
-  module.exports = patch(fs)
+exports.sort = sort;
+function sort(list, loose) {
+  return list.sort(function(a, b) {
+    return exports.compare(a, b, loose);
+  });
 }
 
-// Always patch fs.close/closeSync, because we want 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.
-module.exports.close =
-fs.close = (function (fs$close) { return function (fd, cb) {
-  return fs$close.call(fs, fd, function (err) {
-    if (!err)
-      retry()
+exports.rsort = rsort;
+function rsort(list, loose) {
+  return list.sort(function(a, b) {
+    return exports.rcompare(a, b, loose);
+  });
+}
 
-    if (typeof cb === 'function')
-      cb.apply(this, arguments)
-  })
-}})(fs.close)
+exports.gt = gt;
+function gt(a, b, loose) {
+  return compare(a, b, loose) > 0;
+}
 
-module.exports.closeSync =
-fs.closeSync = (function (fs$closeSync) { return function (fd) {
-  // Note that graceful-fs also retries when fs.closeSync() fails.
-  // Looks like a bug to me, although it's probably a harmless one.
-  var rval = fs$closeSync.apply(fs, arguments)
-  retry()
-  return rval
-}})(fs.closeSync)
+exports.lt = lt;
+function lt(a, b, loose) {
+  return compare(a, b, loose) < 0;
+}
 
-function patch (fs) {
-  // Everything that references the open() function needs to be in here
-  polyfills(fs)
-  fs.gracefulify = patch
-  fs.FileReadStream = ReadStream;  // Legacy name.
-  fs.FileWriteStream = WriteStream;  // Legacy name.
-  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
+exports.eq = eq;
+function eq(a, b, loose) {
+  return compare(a, b, loose) === 0;
+}
 
-    return go$readFile(path, options, cb)
+exports.neq = neq;
+function neq(a, b, loose) {
+  return compare(a, b, loose) !== 0;
+}
 
-    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()
-        }
-      })
-    }
-  }
+exports.gte = gte;
+function gte(a, b, loose) {
+  return compare(a, b, loose) >= 0;
+}
 
-  var fs$writeFile = fs.writeFile
-  fs.writeFile = writeFile
-  function writeFile (path, data, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
+exports.lte = lte;
+function lte(a, b, loose) {
+  return compare(a, b, loose) <= 0;
+}
 
-    return go$writeFile(path, data, options, cb)
+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;
+}
 
-    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()
-        }
-      })
-    }
+exports.Comparator = Comparator;
+function Comparator(comp, loose) {
+  if (comp instanceof Comparator) {
+    if (comp.loose === loose)
+      return comp;
+    else
+      comp = comp.value;
   }
 
-  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
+  if (!(this instanceof Comparator))
+    return new Comparator(comp, loose);
 
-    return go$appendFile(path, data, options, cb)
+  debug('comparator', comp, loose);
+  this.loose = loose;
+  this.parse(comp);
 
-    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()
-        }
-      })
-    }
+  if (this.semver === ANY)
+    this.value = '';
+  else
+    this.value = this.operator + this.semver.version;
+
+  debug('comp', this);
+}
+
+var ANY = {};
+Comparator.prototype.parse = function(comp) {
+  var r = this.loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
+  var m = comp.match(r);
+
+  if (!m)
+    throw new TypeError('Invalid comparator: ' + comp);
+
+  this.operator = m[1];
+  if (this.operator === '=')
+    this.operator = '';
+
+  // if it literally is just '>' or '' then allow anything.
+  if (!m[2])
+    this.semver = ANY;
+  else
+    this.semver = new SemVer(m[2], this.loose);
+};
+
+Comparator.prototype.toString = function() {
+  return this.value;
+};
+
+Comparator.prototype.test = function(version) {
+  debug('Comparator.test', version, this.loose);
+
+  if (this.semver === ANY)
+    return true;
+
+  if (typeof version === 'string')
+    version = new SemVer(version, this.loose);
+
+  return cmp(version, this.operator, this.semver, this.loose);
+};
+
+Comparator.prototype.intersects = function(comp, loose) {
+  if (!(comp instanceof Comparator)) {
+    throw new TypeError('a Comparator is required');
   }
 
-  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)
+  var rangeTmp;
 
-    return go$readdir(args)
+  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);
+  }
 
-    function go$readdir$cb (err, files) {
-      if (files && files.sort)
-        files.sort()
+  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 (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-        enqueue([go$readdir, [args]])
-      else {
-        if (typeof cb === 'function')
-          cb.apply(this, arguments)
-        retry()
-      }
+  return sameDirectionIncreasing || sameDirectionDecreasing ||
+    (sameSemVer && differentDirectionsInclusive) ||
+    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan;
+};
+
+
+exports.Range = Range;
+function Range(range, loose) {
+  if (range instanceof Range) {
+    if (range.loose === loose) {
+      return range;
+    } else {
+      return new Range(range.raw, loose);
     }
   }
 
-  function go$readdir (args) {
-    return fs$readdir.apply(fs, args)
+  if (range instanceof Comparator) {
+    return new Range(range.value, loose);
   }
 
-  if (process.version.substr(0, 4) === 'v0.8') {
-    var legStreams = legacy(fs)
-    ReadStream = legStreams.ReadStream
-    WriteStream = legStreams.WriteStream
+  if (!(this instanceof Range))
+    return new Range(range, loose);
+
+  this.loose = loose;
+
+  // 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;
+  });
+
+  if (!this.set.length) {
+    throw new TypeError('Invalid SemVer Range: ' + range);
   }
 
-  var fs$ReadStream = fs.ReadStream
-  ReadStream.prototype = Object.create(fs$ReadStream.prototype)
-  ReadStream.prototype.open = ReadStream$open
+  this.format();
+}
 
-  var fs$WriteStream = fs.WriteStream
-  WriteStream.prototype = Object.create(fs$WriteStream.prototype)
-  WriteStream.prototype.open = WriteStream$open
+Range.prototype.format = function() {
+  this.range = this.set.map(function(comps) {
+    return comps.join(' ').trim();
+  }).join('||').trim();
+  return this.range;
+};
 
-  fs.ReadStream = ReadStream
-  fs.WriteStream = WriteStream
+Range.prototype.toString = function() {
+  return this.range;
+};
 
-  function ReadStream (path, options) {
-    if (this instanceof ReadStream)
-      return fs$ReadStream.apply(this, arguments), this
-    else
-      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
-  }
+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]);
 
-  function ReadStream$open () {
-    var that = this
-    open(that.path, that.flags, that.mode, function (err, fd) {
-      if (err) {
-        if (that.autoClose)
-          that.destroy()
+  // `~ 1.2.3` => `~1.2.3`
+  range = range.replace(re[TILDETRIM], tildeTrimReplace);
 
-        that.emit('error', err)
-      } else {
-        that.fd = fd
-        that.emit('open', fd)
-        that.read()
-      }
-    })
-  }
+  // `^ 1.2.3` => `^1.2.3`
+  range = range.replace(re[CARETTRIM], caretTrimReplace);
 
-  function WriteStream (path, options) {
-    if (this instanceof WriteStream)
-      return fs$WriteStream.apply(this, arguments), this
-    else
-      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
-  }
+  // normalize spaces
+  range = range.split(/\s+/).join(' ');
 
-  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)
-      }
-    })
-  }
+  // At this point, the range is completely trimmed and
+  // ready to be split into comparators.
 
-  function createReadStream (path, options) {
-    return new ReadStream(path, options)
+  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);
+  });
 
-  function createWriteStream (path, options) {
-    return new WriteStream(path, options)
-  }
+  return set;
+};
 
-  var fs$open = fs.open
-  fs.open = open
-  function open (path, flags, mode, cb) {
-    if (typeof mode === 'function')
-      cb = mode, mode = null
+Range.prototype.intersects = function(range, loose) {
+  if (!(range instanceof Range)) {
+    throw new TypeError('a Range is required');
+  }
 
-    return go$open(path, flags, mode, cb)
+  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);
+        });
+      });
+    });
+  });
+};
 
-    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()
-        }
-      })
-    }
-  }
+// 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(' ');
+  });
+}
 
-  return fs
+// 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;
 }
 
-function enqueue (elem) {
-  debug('ENQUEUE', elem[0].name, elem[1])
-  queue.push(elem)
+function isX(id) {
+  return !id || id.toLowerCase() === 'x' || id === '*';
 }
 
-function retry () {
-  var elem = queue.shift()
-  if (elem) {
-    debug('RETRY', elem[0].name, elem[1])
-    elem[0].apply(null, elem[1])
-  }
+// ~, ~> --> * (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(' ');
 }
 
+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;
 
-/***/ }),
-/* 106 */
-/***/ (function(module, exports, __webpack_require__) {
+    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';
 
-var fs = __webpack_require__(107)
-var constants = __webpack_require__(26)
+    debug('tilde return', ret);
+    return ret;
+  });
+}
 
-var origCwd = process.cwd
-var cwd = null
+// ^ --> * (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(' ');
+}
 
-var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
+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;
 
-process.cwd = function() {
-  if (!cwd)
-    cwd = origCwd.call(process)
-  return cwd
-}
-try {
-  process.cwd()
-} catch (er) {}
+    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';
+    }
 
-var chdir = process.chdir
-process.chdir = function(d) {
-  cwd = null
-  chdir.call(process, d)
+    debug('caret return', ret);
+    return ret;
+  });
 }
 
-module.exports = patch
+function replaceXRanges(comp, loose) {
+  debug('replaceXRanges', comp, loose);
+  return comp.split(/\s+/).map(function(comp) {
+    return replaceXRange(comp, loose);
+  }).join(' ');
+}
 
-function patch (fs) {
-  // (re-)implement some things that are known busted or missing.
+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;
 
-  // 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)
-  }
+    if (gtlt === '=' && anyX)
+      gtlt = '';
 
-  // lutimes implementation, or no-op
-  if (!fs.lutimes) {
-    patchLutimes(fs)
-  }
+    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;
 
-  // 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.
+      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;
+      }
 
-  fs.chown = chownFix(fs.chown)
-  fs.fchown = chownFix(fs.fchown)
-  fs.lchown = chownFix(fs.lchown)
+      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';
+    }
 
-  fs.chmod = chmodFix(fs.chmod)
-  fs.fchmod = chmodFix(fs.fchmod)
-  fs.lchmod = chmodFix(fs.lchmod)
+    debug('xRange return', ret);
 
-  fs.chownSync = chownFixSync(fs.chownSync)
-  fs.fchownSync = chownFixSync(fs.fchownSync)
-  fs.lchownSync = chownFixSync(fs.lchownSync)
+    return ret;
+  });
+}
 
-  fs.chmodSync = chmodFixSync(fs.chmodSync)
-  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
-  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
+// 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], '');
+}
 
-  fs.stat = statFix(fs.stat)
-  fs.fstat = statFix(fs.fstat)
-  fs.lstat = statFix(fs.lstat)
+// 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) {
 
-  fs.statSync = statFixSync(fs.statSync)
-  fs.fstatSync = statFixSync(fs.fstatSync)
-  fs.lstatSync = statFixSync(fs.lstatSync)
+  if (isX(fM))
+    from = '';
+  else if (isX(fm))
+    from = '>=' + fM + '.0.0';
+  else if (isX(fp))
+    from = '>=' + fM + '.' + fm + '.0';
+  else
+    from = '>=' + from;
 
-  // 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 () {}
-  }
+  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;
 
-  // 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 (from + ' ' + to).trim();
+}
 
-  // 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 read() returns EAGAIN, then just try it again.
-  fs.read = (function (fs$read) { return function (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)
-  }})(fs.read)
+// if ANY of the sets match ALL of its comparators, then pass
+Range.prototype.test = function(version) {
+  if (!version)
+    return false;
 
-  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)
-}
+  if (typeof version === 'string')
+    version = new SemVer(version, this.loose);
 
-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)
-        })
-      })
-    })
+  for (var i = 0; i < this.set.length; i++) {
+    if (testSet(this.set[i], version))
+      return true;
   }
+  return false;
+};
 
-  fs.lchmodSync = function (path, mode) {
-    var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
-
-    // 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 testSet(set, version) {
+  for (var i = 0; i < set.length; i++) {
+    if (!set[i].test(version))
+      return false;
   }
-}
 
-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)
-          })
-        })
-      })
-    }
+  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;
 
-    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)
-        }
+      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;
       }
-      return ret
     }
 
-  } else {
-    fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
-    fs.lutimesSync = function () {}
+    // Version has a -pre, but it's not one of the ones we like.
+    return false;
   }
-}
 
-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)
-    })
-  }
+  return true;
 }
 
-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
-    }
+exports.satisfies = satisfies;
+function satisfies(version, range, loose) {
+  try {
+    range = new Range(range, loose);
+  } catch (er) {
+    return false;
   }
+  return range.test(version);
 }
 
-
-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)
-    })
+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;
 }
 
-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
-    }
+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;
 }
 
-
-function statFix (orig) {
-  if (!orig) return orig
-  // Older versions of Node erroneously returned signed integers for
-  // uid + gid.
-  return function (target, cb) {
-    return orig.call(fs, target, function (er, stats) {
-      if (!stats) return cb.apply(this, arguments)
-      if (stats.uid < 0) stats.uid += 0x100000000
-      if (stats.gid < 0) stats.gid += 0x100000000
-      if (cb) cb.apply(this, arguments)
-    })
+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;
   }
 }
 
-function statFixSync (orig) {
-  if (!orig) return orig
-  // Older versions of Node erroneously returned signed integers for
-  // uid + gid.
-  return function (target) {
-    var stats = orig.call(fs, target)
-    if (stats.uid < 0) stats.uid += 0x100000000
-    if (stats.gid < 0) stats.gid += 0x100000000
-    return stats;
-  }
+// 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);
 }
 
-// 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
+// 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);
+}
 
-  if (er.code === "ENOSYS")
-    return true
+exports.outside = outside;
+function outside(version, range, hilo, loose) {
+  version = new SemVer(version, loose);
+  range = new Range(range, loose);
 
-  var nonroot = !process.getuid || process.getuid() !== 0
-  if (nonroot) {
-    if (er.code === "EINVAL" || er.code === "EPERM")
-      return true
+  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 ">"');
   }
 
-  return false
-}
-
-
-/***/ }),
-/* 107 */
-/***/ (function(module, exports, __webpack_require__) {
+  // If it satisifes the range it is not outside
+  if (satisfies(version, range, loose)) {
+    return false;
+  }
 
-"use strict";
+  // From now on, variable terms are as if we're in "gtr" mode.
+  // but note that everything is flipped for the "ltr" function.
 
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i];
 
-var fs = __webpack_require__(23)
+    var high = null;
+    var low = null;
 
-module.exports = clone(fs)
+    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;
+      }
+    });
 
-function clone (obj) {
-  if (obj === null || typeof obj !== 'object')
-    return obj
+    // 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 (obj instanceof Object)
-    var copy = { __proto__: obj.__proto__ }
-  else
-    var copy = Object.create(null)
+    // 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;
+}
 
-  Object.getOwnPropertyNames(obj).forEach(function (key) {
-    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
-  })
+exports.prerelease = prerelease;
+function prerelease(version, loose) {
+  var parsed = parse(version, loose);
+  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null;
+}
 
-  return copy
+exports.intersects = intersects;
+function intersects(r1, r2, loose) {
+  r1 = new Range(r1, loose)
+  r2 = new Range(r2, loose)
+  return r1.intersects(r2)
 }
 
 
 /***/ }),
-/* 108 */
+/* 523 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var Stream = __webpack_require__(28).Stream
-
-module.exports = legacy
-
-function legacy (fs) {
-  return {
-    ReadStream: ReadStream,
-    WriteStream: WriteStream
-  }
-
-  function ReadStream (path, options) {
-    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
-
-    Stream.call(this);
-
-    var self = this;
-
-    this.path = path;
-    this.fd = null;
-    this.readable = true;
-    this.paused = false;
+var parse = __webpack_require__(524);
+var correct = __webpack_require__(526);
 
-    this.flags = 'r';
-    this.mode = 438; /*=0666*/
-    this.bufferSize = 64 * 1024;
+var genericWarning = (
+  'license should be ' +
+  'a valid SPDX license expression (without "LicenseRef"), ' +
+  '"UNLICENSED", or ' +
+  '"SEE LICENSE IN <filename>"'
+);
 
-    options = options || {};
+var fileReferenceRE = /^SEE LICEN[CS]E IN (.+)$/;
 
-    // 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];
-    }
+function startsWith(prefix, string) {
+  return string.slice(0, prefix.length) === prefix;
+}
 
-    if (this.encoding) this.setEncoding(this.encoding);
+function usesLicenseRef(ast) {
+  if (ast.hasOwnProperty('license')) {
+    var license = ast.license;
+    return (
+      startsWith('LicenseRef', license) ||
+      startsWith('DocumentRef', license)
+    );
+  } else {
+    return (
+      usesLicenseRef(ast.left) ||
+      usesLicenseRef(ast.right)
+    );
+  }
+}
 
-    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');
-      }
+module.exports = function(argument) {
+  var ast;
 
-      if (this.start > this.end) {
-        throw new Error('start must be <= end');
+  try {
+    ast = parse(argument);
+  } catch (e) {
+    var match
+    if (
+      argument === 'UNLICENSED' ||
+      argument === 'UNLICENCED'
+    ) {
+      return {
+        validForOldPackages: true,
+        validForNewPackages: true,
+        unlicensed: true
+      };
+    } else if (match = fileReferenceRE.exec(argument)) {
+      return {
+        validForOldPackages: true,
+        validForNewPackages: true,
+        inFile: match[1]
+      };
+    } else {
+      var result = {
+        validForOldPackages: false,
+        validForNewPackages: false,
+        warnings: [genericWarning]
+      };
+      var corrected = correct(argument);
+      if (corrected) {
+        result.warnings.push(
+          'license is similar to the valid expression "' + corrected + '"'
+        );
       }
-
-      this.pos = this.start;
+      return result;
     }
+  }
 
-    if (this.fd !== null) {
-      process.nextTick(function() {
-        self._read();
-      });
-      return;
-    }
+  if (usesLicenseRef(ast)) {
+    return {
+      validForNewPackages: false,
+      validForOldPackages: false,
+      spdx: true,
+      warnings: [genericWarning]
+    };
+  } else {
+    return {
+      validForNewPackages: true,
+      validForOldPackages: true,
+      spdx: true
+    };
+  }
+};
 
-    fs.open(this.path, this.flags, this.mode, function (err, fd) {
-      if (err) {
-        self.emit('error', err);
-        self.readable = false;
-        return;
-      }
 
-      self.fd = fd;
-      self.emit('open', fd);
-      self._read();
-    })
-  }
+/***/ }),
+/* 524 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  function WriteStream (path, options) {
-    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
+var parser = __webpack_require__(525).parser
 
-    Stream.call(this);
+module.exports = function (argument) {
+  return parser.parse(argument)
+}
 
-    this.path = path;
-    this.fd = null;
-    this.writable = true;
 
-    this.flags = 'w';
-    this.encoding = 'binary';
-    this.mode = 438; /*=0666*/
-    this.bytesWritten = 0;
+/***/ }),
+/* 525 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    options = options || {};
+/* WEBPACK VAR INJECTION */(function(module) {/* parser generated by jison 0.4.17 */
+/*
+  Returns a Parser object of the following structure:
 
-    // 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];
-    }
+  Parser: {
+    yy: {}
+  }
 
-    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');
-      }
+  Parser.prototype: {
+    yy: {},
+    trace: function(),
+    symbols_: {associative list: name ==> number},
+    terminals_: {associative list: number ==> name},
+    productions_: [...],
+    performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate, $$, _$),
+    table: [...],
+    defaultActions: {...},
+    parseError: function(str, hash),
+    parse: function(input),
 
-      this.pos = this.start;
-    }
+    lexer: {
+        EOF: 1,
+        parseError: function(str, hash),
+        setInput: function(input),
+        input: function(),
+        unput: function(str),
+        more: function(),
+        less: function(n),
+        pastInput: function(),
+        upcomingInput: function(),
+        showPosition: function(),
+        test_match: function(regex_match_array, rule_index),
+        next: function(),
+        lex: function(),
+        begin: function(condition),
+        popState: function(),
+        _currentRules: function(),
+        topState: function(),
+        pushState: function(condition),
 
-    this.busy = false;
-    this._queue = [];
+        options: {
+            ranges: boolean           (optional: true ==> token location info will include a .range[] member)
+            flex: boolean             (optional: true ==> flex-like lexing behaviour where the rules are tested exhaustively to find the longest match)
+            backtrack_lexer: boolean  (optional: true ==> lexer regexes are tested in order and for each matching regex the action code is invoked; the lexer terminates the scan when a token is returned by the action code)
+        },
 
-    if (this.fd === null) {
-      this._open = fs.open;
-      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
-      this.flush();
+        performAction: function(yy, yy_, $avoiding_name_collisions, YY_START),
+        rules: [...],
+        conditions: {associative list: name ==> set},
     }
   }
-}
 
 
-/***/ }),
-/* 109 */
-/***/ (function(module, exports, __webpack_require__) {
+  token location info (@$, _$, etc.): {
+    first_line: n,
+    last_line: n,
+    first_column: n,
+    last_column: n,
+    range: [start_number, end_number]       (where the numbers are indexes into the input string, regular zero-based)
+  }
 
-/**
- * @preserve
- * JS Implementation of incremental MurmurHash3 (r150) (as of May 10, 2013)
- *
- * @author <a href="mailto:jensyt@gmail.com">Jens Taylor</a>
- * @see http://github.com/homebrewing/brauhaus-diff
- * @author <a href="mailto:gary.court@gmail.com">Gary Court</a>
- * @see http://github.com/garycourt/murmurhash-js
- * @author <a href="mailto:aappleby@gmail.com">Austin Appleby</a>
- * @see http://sites.google.com/site/murmurhash/
- */
-(function(){
-    var cache;
 
-    // Call this function without `new` to use the cached object (good for
-    // single-threaded environments), or with `new` to create a new object.
-    //
-    // @param {string} key A UTF-16 or ASCII string
-    // @param {number} seed An optional positive integer
-    // @return {object} A MurmurHash3 object for incremental hashing
-    function MurmurHash3(key, seed) {
-        var m = this instanceof MurmurHash3 ? this : cache;
-        m.reset(seed)
-        if (typeof key === 'string' && key.length > 0) {
-            m.hash(key);
-        }
+  the parseError function receives a 'hash' object with these members for lexer and parser errors: {
+    text:        (matched text)
+    token:       (the produced terminal token, if any)
+    line:        (yylineno)
+  }
+  while parser (grammar) errors will also provide these members, i.e. parser errors deliver a superset of attributes: {
+    loc:         (yylloc)
+    expected:    (string describing the set of expected tokens)
+    recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error)
+  }
+*/
+var spdxparse = (function(){
+var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,5],$V1=[1,6],$V2=[1,7],$V3=[1,4],$V4=[1,9],$V5=[1,10],$V6=[5,14,15,17],$V7=[5,12,14,15,17];
+var parser = {trace: function trace() { },
+yy: {},
+symbols_: {"error":2,"start":3,"expression":4,"EOS":5,"simpleExpression":6,"LICENSE":7,"PLUS":8,"LICENSEREF":9,"DOCUMENTREF":10,"COLON":11,"WITH":12,"EXCEPTION":13,"AND":14,"OR":15,"OPEN":16,"CLOSE":17,"$accept":0,"$end":1},
+terminals_: {2:"error",5:"EOS",7:"LICENSE",8:"PLUS",9:"LICENSEREF",10:"DOCUMENTREF",11:"COLON",12:"WITH",13:"EXCEPTION",14:"AND",15:"OR",16:"OPEN",17:"CLOSE"},
+productions_: [0,[3,2],[6,1],[6,2],[6,1],[6,3],[4,1],[4,3],[4,3],[4,3],[4,3]],
+performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
+/* this == yyval */
 
-        if (m !== this) {
-            return m;
+var $0 = $$.length - 1;
+switch (yystate) {
+case 1:
+return this.$ = $$[$0-1]
+break;
+case 2: case 4: case 5:
+this.$ = {license: yytext}
+break;
+case 3:
+this.$ = {license: $$[$0-1], plus: true}
+break;
+case 6:
+this.$ = $$[$0]
+break;
+case 7:
+this.$ = {exception: $$[$0]}
+this.$.license = $$[$0-2].license
+if ($$[$0-2].hasOwnProperty('plus')) {
+  this.$.plus = $$[$0-2].plus
+}
+break;
+case 8:
+this.$ = {conjunction: 'and', left: $$[$0-2], right: $$[$0]}
+break;
+case 9:
+this.$ = {conjunction: 'or', left: $$[$0-2], right: $$[$0]}
+break;
+case 10:
+this.$ = $$[$0-1]
+break;
+}
+},
+table: [{3:1,4:2,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{1:[3]},{5:[1,8],14:$V4,15:$V5},o($V6,[2,6],{12:[1,11]}),{4:12,6:3,7:$V0,9:$V1,10:$V2,16:$V3},o($V7,[2,2],{8:[1,13]}),o($V7,[2,4]),{11:[1,14]},{1:[2,1]},{4:15,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{4:16,6:3,7:$V0,9:$V1,10:$V2,16:$V3},{13:[1,17]},{14:$V4,15:$V5,17:[1,18]},o($V7,[2,3]),{9:[1,19]},o($V6,[2,8]),o([5,15,17],[2,9],{14:$V4}),o($V6,[2,7]),o($V6,[2,10]),o($V7,[2,5])],
+defaultActions: {8:[2,1]},
+parseError: function parseError(str, hash) {
+    if (hash.recoverable) {
+        this.trace(str);
+    } else {
+        function _parseError (msg, hash) {
+            this.message = msg;
+            this.hash = hash;
         }
-    };
-
-    // Incrementally add a string to this hash
-    //
-    // @param {string} key A UTF-16 or ASCII string
-    // @return {object} this
-    MurmurHash3.prototype.hash = function(key) {
-        var h1, k1, i, top, len;
-
-        len = key.length;
-        this.len += len;
+        _parseError.prototype = Error;
 
-        k1 = this.k1;
-        i = 0;
-        switch (this.rem) {
-            case 0: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) : 0;
-            case 1: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) << 8 : 0;
-            case 2: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) << 16 : 0;
-            case 3:
-                k1 ^= len > i ? (key.charCodeAt(i) & 0xff) << 24 : 0;
-                k1 ^= len > i ? (key.charCodeAt(i++) & 0xff00) >> 8 : 0;
+        throw new _parseError(str, hash);
+    }
+},
+parse: function parse(input) {
+    var self = this, stack = [0], tstack = [], vstack = [null], lstack = [], table = this.table, yytext = '', yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
+    var args = lstack.slice.call(arguments, 1);
+    var lexer = Object.create(this.lexer);
+    var sharedState = { yy: {} };
+    for (var k in this.yy) {
+        if (Object.prototype.hasOwnProperty.call(this.yy, k)) {
+            sharedState.yy[k] = this.yy[k];
         }
-
-        this.rem = (len + this.rem) & 3; // & 3 is same as % 4
-        len -= this.rem;
-        if (len > 0) {
-            h1 = this.h1;
-            while (1) {
-                k1 = (k1 * 0x2d51 + (k1 & 0xffff) * 0xcc9e0000) & 0xffffffff;
-                k1 = (k1 << 15) | (k1 >>> 17);
-                k1 = (k1 * 0x3593 + (k1 & 0xffff) * 0x1b870000) & 0xffffffff;
-
-                h1 ^= k1;
-                h1 = (h1 << 13) | (h1 >>> 19);
-                h1 = (h1 * 5 + 0xe6546b64) & 0xffffffff;
-
-                if (i >= len) {
-                    break;
+    }
+    lexer.setInput(input, sharedState.yy);
+    sharedState.yy.lexer = lexer;
+    sharedState.yy.parser = this;
+    if (typeof lexer.yylloc == 'undefined') {
+        lexer.yylloc = {};
+    }
+    var yyloc = lexer.yylloc;
+    lstack.push(yyloc);
+    var ranges = lexer.options && lexer.options.ranges;
+    if (typeof sharedState.yy.parseError === 'function') {
+        this.parseError = sharedState.yy.parseError;
+    } else {
+        this.parseError = Object.getPrototypeOf(this).parseError;
+    }
+    function popStack(n) {
+        stack.length = stack.length - 2 * n;
+        vstack.length = vstack.length - n;
+        lstack.length = lstack.length - n;
+    }
+    _token_stack:
+        var lex = function () {
+            var token;
+            token = lexer.lex() || EOF;
+            if (typeof token !== 'number') {
+                token = self.symbols_[token] || token;
+            }
+            return token;
+        };
+    var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
+    while (true) {
+        state = stack[stack.length - 1];
+        if (this.defaultActions[state]) {
+            action = this.defaultActions[state];
+        } else {
+            if (symbol === null || typeof symbol == 'undefined') {
+                symbol = lex();
+            }
+            action = table[state] && table[state][symbol];
+        }
+                    if (typeof action === 'undefined' || !action.length || !action[0]) {
+                var errStr = '';
+                expected = [];
+                for (p in table[state]) {
+                    if (this.terminals_[p] && p > TERROR) {
+                        expected.push('\'' + this.terminals_[p] + '\'');
+                    }
                 }
-
-                k1 = ((key.charCodeAt(i++) & 0xffff)) ^
-                     ((key.charCodeAt(i++) & 0xffff) << 8) ^
-                     ((key.charCodeAt(i++) & 0xffff) << 16);
-                top = key.charCodeAt(i++);
-                k1 ^= ((top & 0xff) << 24) ^
-                      ((top & 0xff00) >> 8);
+                if (lexer.showPosition) {
+                    errStr = 'Parse error on line ' + (yylineno + 1) + ':\n' + lexer.showPosition() + '\nExpecting ' + expected.join(', ') + ', got \'' + (this.terminals_[symbol] || symbol) + '\'';
+                } else {
+                    errStr = 'Parse error on line ' + (yylineno + 1) + ': Unexpected ' + (symbol == EOF ? 'end of input' : '\'' + (this.terminals_[symbol] || symbol) + '\'');
+                }
+                this.parseError(errStr, {
+                    text: lexer.match,
+                    token: this.terminals_[symbol] || symbol,
+                    line: lexer.yylineno,
+                    loc: yyloc,
+                    expected: expected
+                });
             }
-
-            k1 = 0;
-            switch (this.rem) {
-                case 3: k1 ^= (key.charCodeAt(i + 2) & 0xffff) << 16;
-                case 2: k1 ^= (key.charCodeAt(i + 1) & 0xffff) << 8;
-                case 1: k1 ^= (key.charCodeAt(i) & 0xffff);
+        if (action[0] instanceof Array && action.length > 1) {
+            throw new Error('Parse Error: multiple actions possible at state: ' + state + ', token: ' + symbol);
+        }
+        switch (action[0]) {
+        case 1:
+            stack.push(symbol);
+            vstack.push(lexer.yytext);
+            lstack.push(lexer.yylloc);
+            stack.push(action[1]);
+            symbol = null;
+            if (!preErrorSymbol) {
+                yyleng = lexer.yyleng;
+                yytext = lexer.yytext;
+                yylineno = lexer.yylineno;
+                yyloc = lexer.yylloc;
+                if (recovering > 0) {
+                    recovering--;
+                }
+            } else {
+                symbol = preErrorSymbol;
+                preErrorSymbol = null;
             }
-
-            this.h1 = h1;
+            break;
+        case 2:
+            len = this.productions_[action[1]][1];
+            yyval.$ = vstack[vstack.length - len];
+            yyval._$ = {
+                first_line: lstack[lstack.length - (len || 1)].first_line,
+                last_line: lstack[lstack.length - 1].last_line,
+                first_column: lstack[lstack.length - (len || 1)].first_column,
+                last_column: lstack[lstack.length - 1].last_column
+            };
+            if (ranges) {
+                yyval._$.range = [
+                    lstack[lstack.length - (len || 1)].range[0],
+                    lstack[lstack.length - 1].range[1]
+                ];
+            }
+            r = this.performAction.apply(yyval, [
+                yytext,
+                yyleng,
+                yylineno,
+                sharedState.yy,
+                action[1],
+                vstack,
+                lstack
+            ].concat(args));
+            if (typeof r !== 'undefined') {
+                return r;
+            }
+            if (len) {
+                stack = stack.slice(0, -1 * len * 2);
+                vstack = vstack.slice(0, -1 * len);
+                lstack = lstack.slice(0, -1 * len);
+            }
+            stack.push(this.productions_[action[1]][0]);
+            vstack.push(yyval.$);
+            lstack.push(yyval._$);
+            newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
+            stack.push(newState);
+            break;
+        case 3:
+            return true;
         }
+    }
+    return true;
+}};
+/* generated by jison-lex 0.3.4 */
+var lexer = (function(){
+var lexer = ({
 
-        this.k1 = k1;
-        return this;
-    };
-
-    // Get the result of this hash
-    //
-    // @return {number} The 32-bit hash
-    MurmurHash3.prototype.result = function() {
-        var k1, h1;
-        
-        k1 = this.k1;
-        h1 = this.h1;
+EOF:1,
 
-        if (k1 > 0) {
-            k1 = (k1 * 0x2d51 + (k1 & 0xffff) * 0xcc9e0000) & 0xffffffff;
-            k1 = (k1 << 15) | (k1 >>> 17);
-            k1 = (k1 * 0x3593 + (k1 & 0xffff) * 0x1b870000) & 0xffffffff;
-            h1 ^= k1;
+parseError:function parseError(str, hash) {
+        if (this.yy.parser) {
+            this.yy.parser.parseError(str, hash);
+        } else {
+            throw new Error(str);
         }
+    },
 
-        h1 ^= this.len;
-
-        h1 ^= h1 >>> 16;
-        h1 = (h1 * 0xca6b + (h1 & 0xffff) * 0x85eb0000) & 0xffffffff;
-        h1 ^= h1 >>> 13;
-        h1 = (h1 * 0xae35 + (h1 & 0xffff) * 0xc2b20000) & 0xffffffff;
-        h1 ^= h1 >>> 16;
-
-        return h1 >>> 0;
-    };
-
-    // Reset the hash object for reuse
-    //
-    // @param {number} seed An optional positive integer
-    MurmurHash3.prototype.reset = function(seed) {
-        this.h1 = typeof seed === 'number' ? seed : 0;
-        this.rem = this.k1 = this.len = 0;
+// resets the lexer, sets new input
+setInput:function (input, yy) {
+        this.yy = yy || this.yy || {};
+        this._input = input;
+        this._more = this._backtrack = this.done = false;
+        this.yylineno = this.yyleng = 0;
+        this.yytext = this.matched = this.match = '';
+        this.conditionStack = ['INITIAL'];
+        this.yylloc = {
+            first_line: 1,
+            first_column: 0,
+            last_line: 1,
+            last_column: 0
+        };
+        if (this.options.ranges) {
+            this.yylloc.range = [0,0];
+        }
+        this.offset = 0;
         return this;
-    };
-
-    // A cached object to use. This can be safely used if you're in a single-
-    // threaded environment, otherwise you need to create new hashes to use.
-    cache = new MurmurHash3();
-
-    if (true) {
-        module.exports = MurmurHash3;
-    } else {}
-}());
-
-
-/***/ }),
-/* 110 */
-/***/ (function(module, exports, __webpack_require__) {
+    },
 
-// Note: since nyc uses this module to output coverage, any lines
-// that are in the direct sync flow of nyc's outputCoverage are
-// ignored, since we can never get coverage for them.
-var assert = __webpack_require__(30)
-var signals = __webpack_require__(111)
+// consumes and returns one char from the input
+input:function () {
+        var ch = this._input[0];
+        this.yytext += ch;
+        this.yyleng++;
+        this.offset++;
+        this.match += ch;
+        this.matched += ch;
+        var lines = ch.match(/(?:\r\n?|\n).*/g);
+        if (lines) {
+            this.yylineno++;
+            this.yylloc.last_line++;
+        } else {
+            this.yylloc.last_column++;
+        }
+        if (this.options.ranges) {
+            this.yylloc.range[1]++;
+        }
 
-var EE = __webpack_require__(46)
-/* istanbul ignore if */
-if (typeof EE !== 'function') {
-  EE = EE.EventEmitter
-}
+        this._input = this._input.slice(1);
+        return ch;
+    },
 
-var emitter
-if (process.__signal_exit_emitter__) {
-  emitter = process.__signal_exit_emitter__
-} else {
-  emitter = process.__signal_exit_emitter__ = new EE()
-  emitter.count = 0
-  emitter.emitted = {}
-}
+// unshifts one char (or a string) into the input
+unput:function (ch) {
+        var len = ch.length;
+        var lines = ch.split(/(?:\r\n?|\n)/g);
 
-// Because this emitter is a global, we have to check to see if a
-// previous version of this library failed to enable infinite listeners.
-// I know what you're about to say.  But literally everything about
-// signal-exit is a compromise with evil.  Get used to it.
-if (!emitter.infinite) {
-  emitter.setMaxListeners(Infinity)
-  emitter.infinite = true
-}
+        this._input = ch + this._input;
+        this.yytext = this.yytext.substr(0, this.yytext.length - len);
+        //this.yyleng -= len;
+        this.offset -= len;
+        var oldLines = this.match.split(/(?:\r\n?|\n)/g);
+        this.match = this.match.substr(0, this.match.length - 1);
+        this.matched = this.matched.substr(0, this.matched.length - 1);
 
-module.exports = function (cb, opts) {
-  assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler')
+        if (lines.length - 1) {
+            this.yylineno -= lines.length - 1;
+        }
+        var r = this.yylloc.range;
 
-  if (loaded === false) {
-    load()
-  }
+        this.yylloc = {
+            first_line: this.yylloc.first_line,
+            last_line: this.yylineno + 1,
+            first_column: this.yylloc.first_column,
+            last_column: lines ?
+                (lines.length === oldLines.length ? this.yylloc.first_column : 0)
+                 + oldLines[oldLines.length - lines.length].length - lines[0].length :
+              this.yylloc.first_column - len
+        };
 
-  var ev = 'exit'
-  if (opts && opts.alwaysLast) {
-    ev = 'afterexit'
-  }
+        if (this.options.ranges) {
+            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
+        }
+        this.yyleng = this.yytext.length;
+        return this;
+    },
 
-  var remove = function () {
-    emitter.removeListener(ev, cb)
-    if (emitter.listeners('exit').length === 0 &&
-        emitter.listeners('afterexit').length === 0) {
-      unload()
-    }
-  }
-  emitter.on(ev, cb)
+// When called from action, caches matched text and appends it on next action
+more:function () {
+        this._more = true;
+        return this;
+    },
 
-  return remove
-}
+// When called from action, signals the lexer that this rule fails to match the input, so the next matching rule (regex) should be tested instead.
+reject:function () {
+        if (this.options.backtrack_lexer) {
+            this._backtrack = true;
+        } else {
+            return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. You can only invoke reject() in the lexer when the lexer is of the backtracking persuasion (options.backtrack_lexer = true).\n' + this.showPosition(), {
+                text: "",
+                token: null,
+                line: this.yylineno
+            });
 
-module.exports.unload = unload
-function unload () {
-  if (!loaded) {
-    return
-  }
-  loaded = false
+        }
+        return this;
+    },
 
-  signals.forEach(function (sig) {
-    try {
-      process.removeListener(sig, sigListeners[sig])
-    } catch (er) {}
-  })
-  process.emit = originalProcessEmit
-  process.reallyExit = originalProcessReallyExit
-  emitter.count -= 1
-}
+// retain first n characters of the match
+less:function (n) {
+        this.unput(this.match.slice(n));
+    },
 
-function emit (event, code, signal) {
-  if (emitter.emitted[event]) {
-    return
-  }
-  emitter.emitted[event] = true
-  emitter.emit(event, code, signal)
-}
+// displays already matched input, i.e. for error messages
+pastInput:function () {
+        var past = this.matched.substr(0, this.matched.length - this.match.length);
+        return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
+    },
 
-// { <signal>: <listener fn>, ... }
-var sigListeners = {}
-signals.forEach(function (sig) {
-  sigListeners[sig] = function listener () {
-    // If there are no other listeners, an exit is coming!
-    // Simplest way: remove us and then re-send the signal.
-    // We know that this will kill the process, so we can
-    // safely emit now.
-    var listeners = process.listeners(sig)
-    if (listeners.length === emitter.count) {
-      unload()
-      emit('exit', null, sig)
-      /* istanbul ignore next */
-      emit('afterexit', null, sig)
-      /* istanbul ignore next */
-      process.kill(process.pid, sig)
-    }
-  }
-})
+// displays upcoming input, i.e. for error messages
+upcomingInput:function () {
+        var next = this.match;
+        if (next.length < 20) {
+            next += this._input.substr(0, 20-next.length);
+        }
+        return (next.substr(0,20) + (next.length > 20 ? '...' : '')).replace(/\n/g, "");
+    },
 
-module.exports.signals = function () {
-  return signals
-}
+// displays the character position where the lexing error occurred, i.e. for error messages
+showPosition:function () {
+        var pre = this.pastInput();
+        var c = new Array(pre.length + 1).join("-");
+        return pre + this.upcomingInput() + "\n" + c + "^";
+    },
 
-module.exports.load = load
+// test the lexed token: return FALSE when not a match, otherwise return token
+test_match:function (match, indexed_rule) {
+        var token,
+            lines,
+            backup;
 
-var loaded = false
+        if (this.options.backtrack_lexer) {
+            // save context
+            backup = {
+                yylineno: this.yylineno,
+                yylloc: {
+                    first_line: this.yylloc.first_line,
+                    last_line: this.last_line,
+                    first_column: this.yylloc.first_column,
+                    last_column: this.yylloc.last_column
+                },
+                yytext: this.yytext,
+                match: this.match,
+                matches: this.matches,
+                matched: this.matched,
+                yyleng: this.yyleng,
+                offset: this.offset,
+                _more: this._more,
+                _input: this._input,
+                yy: this.yy,
+                conditionStack: this.conditionStack.slice(0),
+                done: this.done
+            };
+            if (this.options.ranges) {
+                backup.yylloc.range = this.yylloc.range.slice(0);
+            }
+        }
 
-function load () {
-  if (loaded) {
-    return
-  }
-  loaded = true
+        lines = match[0].match(/(?:\r\n?|\n).*/g);
+        if (lines) {
+            this.yylineno += lines.length;
+        }
+        this.yylloc = {
+            first_line: this.yylloc.last_line,
+            last_line: this.yylineno + 1,
+            first_column: this.yylloc.last_column,
+            last_column: lines ?
+                         lines[lines.length - 1].length - lines[lines.length - 1].match(/\r?\n?/)[0].length :
+                         this.yylloc.last_column + match[0].length
+        };
+        this.yytext += match[0];
+        this.match += match[0];
+        this.matches = match;
+        this.yyleng = this.yytext.length;
+        if (this.options.ranges) {
+            this.yylloc.range = [this.offset, this.offset += this.yyleng];
+        }
+        this._more = false;
+        this._backtrack = false;
+        this._input = this._input.slice(match[0].length);
+        this.matched += match[0];
+        token = this.performAction.call(this, this.yy, this, indexed_rule, this.conditionStack[this.conditionStack.length - 1]);
+        if (this.done && this._input) {
+            this.done = false;
+        }
+        if (token) {
+            return token;
+        } else if (this._backtrack) {
+            // recover context
+            for (var k in backup) {
+                this[k] = backup[k];
+            }
+            return false; // rule action called reject() implying the next rule should be tested instead.
+        }
+        return false;
+    },
 
-  // This is the number of onSignalExit's that are in play.
-  // It's important so that we can count the correct number of
-  // listeners on signals, and don't wait for the other one to
-  // handle it instead of us.
-  emitter.count += 1
+// return next match in input
+next:function () {
+        if (this.done) {
+            return this.EOF;
+        }
+        if (!this._input) {
+            this.done = true;
+        }
 
-  signals = signals.filter(function (sig) {
-    try {
-      process.on(sig, sigListeners[sig])
-      return true
-    } catch (er) {
-      return false
-    }
-  })
+        var token,
+            match,
+            tempMatch,
+            index;
+        if (!this._more) {
+            this.yytext = '';
+            this.match = '';
+        }
+        var rules = this._currentRules();
+        for (var i = 0; i < rules.length; i++) {
+            tempMatch = this._input.match(this.rules[rules[i]]);
+            if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
+                match = tempMatch;
+                index = i;
+                if (this.options.backtrack_lexer) {
+                    token = this.test_match(tempMatch, rules[i]);
+                    if (token !== false) {
+                        return token;
+                    } else if (this._backtrack) {
+                        match = false;
+                        continue; // rule action called reject() implying a rule MISmatch.
+                    } else {
+                        // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
+                        return false;
+                    }
+                } else if (!this.options.flex) {
+                    break;
+                }
+            }
+        }
+        if (match) {
+            token = this.test_match(match, rules[index]);
+            if (token !== false) {
+                return token;
+            }
+            // else: this is a lexer rule which consumes input without producing a token (e.g. whitespace)
+            return false;
+        }
+        if (this._input === "") {
+            return this.EOF;
+        } else {
+            return this.parseError('Lexical error on line ' + (this.yylineno + 1) + '. Unrecognized text.\n' + this.showPosition(), {
+                text: "",
+                token: null,
+                line: this.yylineno
+            });
+        }
+    },
 
-  process.emit = processEmit
-  process.reallyExit = processReallyExit
-}
+// return next match that has a token
+lex:function lex() {
+        var r = this.next();
+        if (r) {
+            return r;
+        } else {
+            return this.lex();
+        }
+    },
 
-var originalProcessReallyExit = process.reallyExit
-function processReallyExit (code) {
-  process.exitCode = code || 0
-  emit('exit', process.exitCode, null)
-  /* istanbul ignore next */
-  emit('afterexit', process.exitCode, null)
-  /* istanbul ignore next */
-  originalProcessReallyExit.call(process, process.exitCode)
-}
+// activates a new lexer condition state (pushes the new lexer condition state onto the condition stack)
+begin:function begin(condition) {
+        this.conditionStack.push(condition);
+    },
 
-var originalProcessEmit = process.emit
-function processEmit (ev, arg) {
-  if (ev === 'exit') {
-    if (arg !== undefined) {
-      process.exitCode = arg
-    }
-    var ret = originalProcessEmit.apply(this, arguments)
-    emit('exit', process.exitCode, null)
-    /* istanbul ignore next */
-    emit('afterexit', process.exitCode, null)
-    return ret
-  } else {
-    return originalProcessEmit.apply(this, arguments)
-  }
-}
+// pop the previously active lexer condition state off the condition stack
+popState:function popState() {
+        var n = this.conditionStack.length - 1;
+        if (n > 0) {
+            return this.conditionStack.pop();
+        } else {
+            return this.conditionStack[0];
+        }
+    },
 
+// produce the lexer rule set which is active for the currently active lexer condition state
+_currentRules:function _currentRules() {
+        if (this.conditionStack.length && this.conditionStack[this.conditionStack.length - 1]) {
+            return this.conditions[this.conditionStack[this.conditionStack.length - 1]].rules;
+        } else {
+            return this.conditions["INITIAL"].rules;
+        }
+    },
 
-/***/ }),
-/* 111 */
-/***/ (function(module, exports) {
+// return the currently active lexer condition state; when an index argument is provided it produces the N-th previous condition state, if available
+topState:function topState(n) {
+        n = this.conditionStack.length - 1 - Math.abs(n || 0);
+        if (n >= 0) {
+            return this.conditionStack[n];
+        } else {
+            return "INITIAL";
+        }
+    },
 
-// This is not the set of all possible signals.
-//
-// It IS, however, the set of all signals that trigger
-// an exit on either Linux or BSD systems.  Linux is a
-// superset of the signal names supported on BSD, and
-// the unknown signals just fail to register, so we can
-// catch that easily enough.
-//
-// Don't bother with SIGKILL.  It's uncatchable, which
-// means that we can't fire any callbacks anyway.
-//
-// If a user does happen to register a handler on a non-
-// fatal signal like SIGWINCH or something, and then
-// exit, it'll end up firing `process.emit('exit')`, so
-// the handler will be fired anyway.
-//
-// SIGBUS, SIGFPE, SIGSEGV and SIGILL, when not raised
-// artificially, inherently leave the process in a
-// state from which it is not safe to try and enter JS
-// listeners.
-module.exports = [
-  'SIGABRT',
-  'SIGALRM',
-  'SIGHUP',
-  'SIGINT',
-  'SIGTERM'
-]
+// alias for begin(condition)
+pushState:function pushState(condition) {
+        this.begin(condition);
+    },
 
-if (process.platform !== 'win32') {
-  module.exports.push(
-    'SIGVTALRM',
-    'SIGXCPU',
-    'SIGXFSZ',
-    'SIGUSR2',
-    'SIGTRAP',
-    'SIGSYS',
-    'SIGQUIT',
-    'SIGIOT'
-    // should detect profiler and enable/disable accordingly.
-    // see #21
-    // 'SIGPROF'
-  )
+// return the number of states currently on the stack
+stateStackSize:function stateStackSize() {
+        return this.conditionStack.length;
+    },
+options: {},
+performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
+var YYSTATE=YY_START;
+switch($avoiding_name_collisions) {
+case 0:return 5
+break;
+case 1:/* skip whitespace */
+break;
+case 2:return 8
+break;
+case 3:return 16
+break;
+case 4:return 17
+break;
+case 5:return 11
+break;
+case 6:return 10
+break;
+case 7:return 9
+break;
+case 8:return 14
+break;
+case 9:return 15
+break;
+case 10:return 12
+break;
+case 11:return 7
+break;
+case 12:return 7
+break;
+case 13:return 7
+break;
+case 14:return 7
+break;
+case 15:return 7
+break;
+case 16:return 7
+break;
+case 17:return 7
+break;
+case 18:return 7
+break;
+case 19:return 7
+break;
+case 20:return 7
+break;
+case 21:return 7
+break;
+case 22:return 7
+break;
+case 23:return 7
+break;
+case 24:return 13
+break;
+case 25:return 13
+break;
+case 26:return 13
+break;
+case 27:return 13
+break;
+case 28:return 13
+break;
+case 29:return 13
+break;
+case 30:return 13
+break;
+case 31:return 13
+break;
+case 32:return 7
+break;
+case 33:return 13
+break;
+case 34:return 7
+break;
+case 35:return 13
+break;
+case 36:return 7
+break;
+case 37:return 13
+break;
+case 38:return 13
+break;
+case 39:return 7
+break;
+case 40:return 13
+break;
+case 41:return 13
+break;
+case 42:return 13
+break;
+case 43:return 13
+break;
+case 44:return 13
+break;
+case 45:return 7
+break;
+case 46:return 13
+break;
+case 47:return 7
+break;
+case 48:return 7
+break;
+case 49:return 7
+break;
+case 50:return 7
+break;
+case 51:return 7
+break;
+case 52:return 7
+break;
+case 53:return 7
+break;
+case 54:return 7
+break;
+case 55:return 7
+break;
+case 56:return 7
+break;
+case 57:return 7
+break;
+case 58:return 7
+break;
+case 59:return 7
+break;
+case 60:return 7
+break;
+case 61:return 7
+break;
+case 62:return 7
+break;
+case 63:return 13
+break;
+case 64:return 7
+break;
+case 65:return 7
+break;
+case 66:return 13
+break;
+case 67:return 7
+break;
+case 68:return 7
+break;
+case 69:return 7
+break;
+case 70:return 7
+break;
+case 71:return 7
+break;
+case 72:return 7
+break;
+case 73:return 13
+break;
+case 74:return 7
+break;
+case 75:return 13
+break;
+case 76:return 7
+break;
+case 77:return 7
+break;
+case 78:return 7
+break;
+case 79:return 7
+break;
+case 80:return 7
+break;
+case 81:return 7
+break;
+case 82:return 7
+break;
+case 83:return 7
+break;
+case 84:return 7
+break;
+case 85:return 7
+break;
+case 86:return 7
+break;
+case 87:return 7
+break;
+case 88:return 7
+break;
+case 89:return 7
+break;
+case 90:return 7
+break;
+case 91:return 7
+break;
+case 92:return 7
+break;
+case 93:return 7
+break;
+case 94:return 7
+break;
+case 95:return 7
+break;
+case 96:return 7
+break;
+case 97:return 7
+break;
+case 98:return 7
+break;
+case 99:return 7
+break;
+case 100:return 7
+break;
+case 101:return 7
+break;
+case 102:return 7
+break;
+case 103:return 7
+break;
+case 104:return 7
+break;
+case 105:return 7
+break;
+case 106:return 7
+break;
+case 107:return 7
+break;
+case 108:return 7
+break;
+case 109:return 7
+break;
+case 110:return 7
+break;
+case 111:return 7
+break;
+case 112:return 7
+break;
+case 113:return 7
+break;
+case 114:return 7
+break;
+case 115:return 7
+break;
+case 116:return 7
+break;
+case 117:return 7
+break;
+case 118:return 7
+break;
+case 119:return 7
+break;
+case 120:return 7
+break;
+case 121:return 7
+break;
+case 122:return 7
+break;
+case 123:return 7
+break;
+case 124:return 7
+break;
+case 125:return 7
+break;
+case 126:return 7
+break;
+case 127:return 7
+break;
+case 128:return 7
+break;
+case 129:return 7
+break;
+case 130:return 7
+break;
+case 131:return 7
+break;
+case 132:return 7
+break;
+case 133:return 7
+break;
+case 134:return 7
+break;
+case 135:return 7
+break;
+case 136:return 7
+break;
+case 137:return 7
+break;
+case 138:return 7
+break;
+case 139:return 7
+break;
+case 140:return 7
+break;
+case 141:return 7
+break;
+case 142:return 7
+break;
+case 143:return 7
+break;
+case 144:return 7
+break;
+case 145:return 7
+break;
+case 146:return 7
+break;
+case 147:return 7
+break;
+case 148:return 7
+break;
+case 149:return 7
+break;
+case 150:return 7
+break;
+case 151:return 7
+break;
+case 152:return 7
+break;
+case 153:return 7
+break;
+case 154:return 7
+break;
+case 155:return 7
+break;
+case 156:return 7
+break;
+case 157:return 7
+break;
+case 158:return 7
+break;
+case 159:return 7
+break;
+case 160:return 7
+break;
+case 161:return 7
+break;
+case 162:return 7
+break;
+case 163:return 7
+break;
+case 164:return 7
+break;
+case 165:return 7
+break;
+case 166:return 7
+break;
+case 167:return 7
+break;
+case 168:return 7
+break;
+case 169:return 7
+break;
+case 170:return 7
+break;
+case 171:return 7
+break;
+case 172:return 7
+break;
+case 173:return 7
+break;
+case 174:return 7
+break;
+case 175:return 7
+break;
+case 176:return 7
+break;
+case 177:return 7
+break;
+case 178:return 7
+break;
+case 179:return 7
+break;
+case 180:return 7
+break;
+case 181:return 7
+break;
+case 182:return 7
+break;
+case 183:return 7
+break;
+case 184:return 7
+break;
+case 185:return 7
+break;
+case 186:return 7
+break;
+case 187:return 7
+break;
+case 188:return 7
+break;
+case 189:return 7
+break;
+case 190:return 7
+break;
+case 191:return 7
+break;
+case 192:return 7
+break;
+case 193:return 7
+break;
+case 194:return 7
+break;
+case 195:return 7
+break;
+case 196:return 7
+break;
+case 197:return 7
+break;
+case 198:return 7
+break;
+case 199:return 7
+break;
+case 200:return 7
+break;
+case 201:return 7
+break;
+case 202:return 7
+break;
+case 203:return 7
+break;
+case 204:return 7
+break;
+case 205:return 7
+break;
+case 206:return 7
+break;
+case 207:return 7
+break;
+case 208:return 7
+break;
+case 209:return 7
+break;
+case 210:return 7
+break;
+case 211:return 7
+break;
+case 212:return 7
+break;
+case 213:return 7
+break;
+case 214:return 7
+break;
+case 215:return 7
+break;
+case 216:return 7
+break;
+case 217:return 7
+break;
+case 218:return 7
+break;
+case 219:return 7
+break;
+case 220:return 7
+break;
+case 221:return 7
+break;
+case 222:return 7
+break;
+case 223:return 7
+break;
+case 224:return 7
+break;
+case 225:return 7
+break;
+case 226:return 7
+break;
+case 227:return 7
+break;
+case 228:return 7
+break;
+case 229:return 7
+break;
+case 230:return 7
+break;
+case 231:return 7
+break;
+case 232:return 7
+break;
+case 233:return 7
+break;
+case 234:return 7
+break;
+case 235:return 7
+break;
+case 236:return 7
+break;
+case 237:return 7
+break;
+case 238:return 7
+break;
+case 239:return 7
+break;
+case 240:return 7
+break;
+case 241:return 7
+break;
+case 242:return 7
+break;
+case 243:return 7
+break;
+case 244:return 7
+break;
+case 245:return 7
+break;
+case 246:return 7
+break;
+case 247:return 7
+break;
+case 248:return 7
+break;
+case 249:return 7
+break;
+case 250:return 7
+break;
+case 251:return 7
+break;
+case 252:return 7
+break;
+case 253:return 7
+break;
+case 254:return 7
+break;
+case 255:return 7
+break;
+case 256:return 7
+break;
+case 257:return 7
+break;
+case 258:return 7
+break;
+case 259:return 7
+break;
+case 260:return 7
+break;
+case 261:return 7
+break;
+case 262:return 7
+break;
+case 263:return 7
+break;
+case 264:return 7
+break;
+case 265:return 7
+break;
+case 266:return 7
+break;
+case 267:return 7
+break;
+case 268:return 7
+break;
+case 269:return 7
+break;
+case 270:return 7
+break;
+case 271:return 7
+break;
+case 272:return 7
+break;
+case 273:return 7
+break;
+case 274:return 7
+break;
+case 275:return 7
+break;
+case 276:return 7
+break;
+case 277:return 7
+break;
+case 278:return 7
+break;
+case 279:return 7
+break;
+case 280:return 7
+break;
+case 281:return 7
+break;
+case 282:return 7
+break;
+case 283:return 7
+break;
+case 284:return 7
+break;
+case 285:return 7
+break;
+case 286:return 7
+break;
+case 287:return 7
+break;
+case 288:return 7
+break;
+case 289:return 7
+break;
+case 290:return 7
+break;
+case 291:return 7
+break;
+case 292:return 7
+break;
+case 293:return 7
+break;
+case 294:return 7
+break;
+case 295:return 7
+break;
+case 296:return 7
+break;
+case 297:return 7
+break;
+case 298:return 7
+break;
+case 299:return 7
+break;
+case 300:return 7
+break;
+case 301:return 7
+break;
+case 302:return 7
+break;
+case 303:return 7
+break;
+case 304:return 7
+break;
+case 305:return 7
+break;
+case 306:return 7
+break;
+case 307:return 7
+break;
+case 308:return 7
+break;
+case 309:return 7
+break;
+case 310:return 7
+break;
+case 311:return 7
+break;
+case 312:return 7
+break;
+case 313:return 7
+break;
+case 314:return 7
+break;
+case 315:return 7
+break;
+case 316:return 7
+break;
+case 317:return 7
+break;
+case 318:return 7
+break;
+case 319:return 7
+break;
+case 320:return 7
+break;
+case 321:return 7
+break;
+case 322:return 7
+break;
+case 323:return 7
+break;
+case 324:return 7
+break;
+case 325:return 7
+break;
+case 326:return 7
+break;
+case 327:return 7
+break;
+case 328:return 7
+break;
+case 329:return 7
+break;
+case 330:return 7
+break;
+case 331:return 7
+break;
+case 332:return 7
+break;
+case 333:return 7
+break;
+case 334:return 7
+break;
+case 335:return 7
+break;
+case 336:return 7
+break;
+case 337:return 7
+break;
+case 338:return 7
+break;
+case 339:return 7
+break;
+case 340:return 7
+break;
+case 341:return 7
+break;
+case 342:return 7
+break;
+case 343:return 7
+break;
+case 344:return 7
+break;
+case 345:return 7
+break;
+case 346:return 7
+break;
+case 347:return 7
+break;
+case 348:return 7
+break;
+case 349:return 7
+break;
+case 350:return 7
+break;
+case 351:return 7
+break;
+case 352:return 7
+break;
+case 353:return 7
+break;
+case 354:return 7
+break;
+case 355:return 7
+break;
+case 356:return 7
+break;
+case 357:return 7
+break;
+case 358:return 7
+break;
+case 359:return 7
+break;
+case 360:return 7
+break;
+case 361:return 7
+break;
+case 362:return 7
+break;
+case 363:return 7
+break;
+case 364:return 7
+break;
 }
-
-if (process.platform === 'linux') {
-  module.exports.push(
-    'SIGIO',
-    'SIGPOLL',
-    'SIGPWR',
-    'SIGSTKFLT',
-    'SIGUNUSED'
-  )
+},
+rules: [/^(?:$)/,/^(?:\s+)/,/^(?:\+)/,/^(?:\()/,/^(?:\))/,/^(?::)/,/^(?:DocumentRef-([0-9A-Za-z-+.]+))/,/^(?:LicenseRef-([0-9A-Za-z-+.]+))/,/^(?:AND)/,/^(?:OR)/,/^(?:WITH)/,/^(?:BSD-3-Clause-No-Nuclear-License-2014)/,/^(?:BSD-3-Clause-No-Nuclear-Warranty)/,/^(?:GPL-2\.0-with-classpath-exception)/,/^(?:GPL-3\.0-with-autoconf-exception)/,/^(?:GPL-2\.0-with-autoconf-exception)/,/^(?:BSD-3-Clause-No-Nuclear-License)/,/^(?:MPL-2\.0-no-copyleft-exception)/,/^(?:GPL-2\.0-with-bison-exception)/,/^(?:GPL-2\.0-with-font-exception)/,/^(?:GPL-2\.0-with-GCC-exception)/,/^(?:CNRI-Python-GPL-Compatible)/,/^(?:GPL-3\.0-with-GCC-exception)/,/^(?:BSD-3-Clause-Attribution)/,/^(?:Classpath-exception-2\.0)/,/^(?:WxWindows-exception-3\.1)/,/^(?:freertos-exception-2\.0)/,/^(?:Autoconf-exception-3\.0)/,/^(?:i2p-gpl-java-exception)/,/^(?:gnu-javamail-exception)/,/^(?:Nokia-Qt-exception-1\.1)/,/^(?:Autoconf-exception-2\.0)/,/^(?:BSD-2-Clause-FreeBSD)/,/^(?:u-boot-exception-2\.0)/,/^(?:zlib-acknowledgement)/,/^(?:Bison-exception-2\.2)/,/^(?:BSD-2-Clause-NetBSD)/,/^(?:CLISP-exception-2\.0)/,/^(?:eCos-exception-2\.0)/,/^(?:BSD-3-Clause-Clear)/,/^(?:Font-exception-2\.0)/,/^(?:FLTK-exception-2\.0)/,/^(?:GCC-exception-2\.0)/,/^(?:Qwt-exception-1\.0)/,/^(?:Libtool-exception)/,/^(?:BSD-3-Clause-LBNL)/,/^(?:GCC-exception-3\.1)/,/^(?:Artistic-1\.0-Perl)/,/^(?:Artistic-1\.0-cl8)/,/^(?:CC-BY-NC-SA-2\.5)/,/^(?:MIT-advertising)/,/^(?:BSD-Source-Code)/,/^(?:CC-BY-NC-SA-4\.0)/,/^(?:LiLiQ-Rplus-1\.1)/,/^(?:CC-BY-NC-SA-3\.0)/,/^(?:BSD-4-Clause-UC)/,/^(?:CC-BY-NC-SA-2\.0)/,/^(?:CC-BY-NC-SA-1\.0)/,/^(?:CC-BY-NC-ND-4\.0)/,/^(?:CC-BY-NC-ND-3\.0)/,/^(?:CC-BY-NC-ND-2\.5)/,/^(?:CC-BY-NC-ND-2\.0)/,/^(?:CC-BY-NC-ND-1\.0)/,/^(?:LZMA-exception)/,/^(?:BitTorrent-1\.1)/,/^(?:CrystalStacker)/,/^(?:FLTK-exception)/,/^(?:SugarCRM-1\.1\.3)/,/^(?:BSD-Protection)/,/^(?:BitTorrent-1\.0)/,/^(?:HaskellReport)/,/^(?:Interbase-1\.0)/,/^(?:StandardML-NJ)/,/^(?:mif-exception)/,/^(?:Frameworx-1\.0)/,/^(?:389-exception)/,/^(?:CC-BY-NC-2\.0)/,/^(?:CC-BY-NC-2\.5)/,/^(?:CC-BY-NC-3\.0)/,/^(?:CC-BY-NC-4\.0)/,/^(?:W3C-19980720)/,/^(?:CC-BY-SA-1\.0)/,/^(?:CC-BY-SA-2\.0)/,/^(?:CC-BY-SA-2\.5)/,/^(?:CC-BY-ND-2\.0)/,/^(?:CC-BY-SA-4\.0)/,/^(?:CC-BY-SA-3\.0)/,/^(?:Artistic-1\.0)/,/^(?:Artistic-2\.0)/,/^(?:CC-BY-ND-2\.5)/,/^(?:CC-BY-ND-3\.0)/,/^(?:CC-BY-ND-4\.0)/,/^(?:CC-BY-ND-1\.0)/,/^(?:BSD-4-Clause)/,/^(?:BSD-3-Clause)/,/^(?:BSD-2-Clause)/,/^(?:CC-BY-NC-1\.0)/,/^(?:bzip2-1\.0\.6)/,/^(?:Unicode-TOU)/,/^(?:CNRI-Jython)/,/^(?:ImageMagick)/,/^(?:Adobe-Glyph)/,/^(?:CUA-OPL-1\.0)/,/^(?:OLDAP-2\.2\.2)/,/^(?:LiLiQ-R-1\.1)/,/^(?:bzip2-1\.0\.5)/,/^(?:LiLiQ-P-1\.1)/,/^(?:OLDAP-2\.0\.1)/,/^(?:OLDAP-2\.2\.1)/,/^(?:CNRI-Python)/,/^(?:XFree86-1\.1)/,/^(?:OSET-PL-2\.1)/,/^(?:Apache-2\.0)/,/^(?:Watcom-1\.0)/,/^(?:PostgreSQL)/,/^(?:Python-2\.0)/,/^(?:RHeCos-1\.1)/,/^(?:EUDatagrid)/,/^(?:Spencer-99)/,/^(?:Intel-ACPI)/,/^(?:CECILL-1\.0)/,/^(?:CECILL-1\.1)/,/^(?:JasPer-2\.0)/,/^(?:CECILL-2\.0)/,/^(?:CECILL-2\.1)/,/^(?:gSOAP-1\.3b)/,/^(?:Spencer-94)/,/^(?:Apache-1\.1)/,/^(?:Spencer-86)/,/^(?:Apache-1\.0)/,/^(?:ClArtistic)/,/^(?:TORQUE-1\.1)/,/^(?:CATOSL-1\.1)/,/^(?:Adobe-2006)/,/^(?:Zimbra-1\.4)/,/^(?:Zimbra-1\.3)/,/^(?:Condor-1\.1)/,/^(?:CC-BY-3\.0)/,/^(?:CC-BY-2\.5)/,/^(?:OLDAP-2\.4)/,/^(?:SGI-B-1\.1)/,/^(?:SISSL-1\.2)/,/^(?:SGI-B-1\.0)/,/^(?:OLDAP-2\.3)/,/^(?:CC-BY-4\.0)/,/^(?:Crossword)/,/^(?:SimPL-2\.0)/,/^(?:OLDAP-2\.2)/,/^(?:OLDAP-2\.1)/,/^(?:ErlPL-1\.1)/,/^(?:LPPL-1\.3a)/,/^(?:LPPL-1\.3c)/,/^(?:OLDAP-2\.0)/,/^(?:Leptonica)/,/^(?:CPOL-1\.02)/,/^(?:OLDAP-1\.4)/,/^(?:OLDAP-1\.3)/,/^(?:CC-BY-2\.0)/,/^(?:Unlicense)/,/^(?:OLDAP-2\.8)/,/^(?:OLDAP-1\.2)/,/^(?:MakeIndex)/,/^(?:OLDAP-2\.7)/,/^(?:OLDAP-1\.1)/,/^(?:Sleepycat)/,/^(?:D-FSL-1\.0)/,/^(?:CC-BY-1\.0)/,/^(?:OLDAP-2\.6)/,/^(?:WXwindows)/,/^(?:NPOSL-3\.0)/,/^(?:FreeImage)/,/^(?:SGI-B-2\.0)/,/^(?:OLDAP-2\.5)/,/^(?:Beerware)/,/^(?:Newsletr)/,/^(?:NBPL-1\.0)/,/^(?:NASA-1\.3)/,/^(?:NLOD-1\.0)/,/^(?:AGPL-1\.0)/,/^(?:OCLC-2\.0)/,/^(?:ODbL-1\.0)/,/^(?:PDDL-1\.0)/,/^(?:Motosoto)/,/^(?:Afmparse)/,/^(?:ANTLR-PD)/,/^(?:LPL-1\.02)/,/^(?:Abstyles)/,/^(?:eCos-2\.0)/,/^(?:APSL-1\.0)/,/^(?:LPPL-1\.2)/,/^(?:LPPL-1\.1)/,/^(?:LPPL-1\.0)/,/^(?:APSL-1\.1)/,/^(?:APSL-2\.0)/,/^(?:Info-ZIP)/,/^(?:Zend-2\.0)/,/^(?:IBM-pibs)/,/^(?:LGPL-2\.0)/,/^(?:LGPL-3\.0)/,/^(?:LGPL-2\.1)/,/^(?:GFDL-1\.3)/,/^(?:PHP-3\.01)/,/^(?:GFDL-1\.2)/,/^(?:GFDL-1\.1)/,/^(?:AGPL-3\.0)/,/^(?:Giftware)/,/^(?:EUPL-1\.1)/,/^(?:RPSL-1\.0)/,/^(?:EUPL-1\.0)/,/^(?:MIT-enna)/,/^(?:CECILL-B)/,/^(?:diffmark)/,/^(?:CECILL-C)/,/^(?:CDDL-1\.0)/,/^(?:Sendmail)/,/^(?:CDDL-1\.1)/,/^(?:CPAL-1\.0)/,/^(?:APSL-1\.2)/,/^(?:NPL-1\.1)/,/^(?:AFL-1\.2)/,/^(?:Caldera)/,/^(?:AFL-2\.0)/,/^(?:FSFULLR)/,/^(?:AFL-2\.1)/,/^(?:VSL-1\.0)/,/^(?:VOSTROM)/,/^(?:UPL-1\.0)/,/^(?:Dotseqn)/,/^(?:CPL-1\.0)/,/^(?:dvipdfm)/,/^(?:EPL-1\.0)/,/^(?:OCCT-PL)/,/^(?:ECL-1\.0)/,/^(?:Latex2e)/,/^(?:ECL-2\.0)/,/^(?:GPL-1\.0)/,/^(?:GPL-2\.0)/,/^(?:GPL-3\.0)/,/^(?:AFL-3\.0)/,/^(?:LAL-1\.2)/,/^(?:LAL-1\.3)/,/^(?:EFL-1\.0)/,/^(?:EFL-2\.0)/,/^(?:gnuplot)/,/^(?:Aladdin)/,/^(?:LPL-1\.0)/,/^(?:libtiff)/,/^(?:Entessa)/,/^(?:AMDPLPA)/,/^(?:IPL-1\.0)/,/^(?:OPL-1\.0)/,/^(?:OSL-1\.0)/,/^(?:OSL-1\.1)/,/^(?:OSL-2\.0)/,/^(?:OSL-2\.1)/,/^(?:OSL-3\.0)/,/^(?:OpenSSL)/,/^(?:ZPL-2\.1)/,/^(?:PHP-3\.0)/,/^(?:ZPL-2\.0)/,/^(?:ZPL-1\.1)/,/^(?:CC0-1\.0)/,/^(?:SPL-1\.0)/,/^(?:psutils)/,/^(?:MPL-1\.0)/,/^(?:QPL-1\.0)/,/^(?:MPL-1\.1)/,/^(?:MPL-2\.0)/,/^(?:APL-1\.0)/,/^(?:RPL-1\.1)/,/^(?:RPL-1\.5)/,/^(?:MIT-CMU)/,/^(?:Multics)/,/^(?:Eurosym)/,/^(?:BSL-1\.0)/,/^(?:MIT-feh)/,/^(?:Saxpath)/,/^(?:Borceux)/,/^(?:OFL-1\.1)/,/^(?:OFL-1\.0)/,/^(?:AFL-1\.1)/,/^(?:YPL-1\.1)/,/^(?:YPL-1\.0)/,/^(?:NPL-1\.0)/,/^(?:iMatix)/,/^(?:mpich2)/,/^(?:APAFML)/,/^(?:Bahyph)/,/^(?:RSA-MD)/,/^(?:psfrag)/,/^(?:Plexus)/,/^(?:eGenix)/,/^(?:Glulxe)/,/^(?:SAX-PD)/,/^(?:Imlib2)/,/^(?:Wsuipa)/,/^(?:LGPLLR)/,/^(?:Libpng)/,/^(?:xinetd)/,/^(?:MITNFA)/,/^(?:NetCDF)/,/^(?:Naumen)/,/^(?:SMPPL)/,/^(?:Nunit)/,/^(?:FSFUL)/,/^(?:GL2PS)/,/^(?:SMLNJ)/,/^(?:Rdisc)/,/^(?:Noweb)/,/^(?:Nokia)/,/^(?:SISSL)/,/^(?:Qhull)/,/^(?:Intel)/,/^(?:Glide)/,/^(?:Xerox)/,/^(?:AMPAS)/,/^(?:WTFPL)/,/^(?:MS-PL)/,/^(?:XSkat)/,/^(?:MS-RL)/,/^(?:MirOS)/,/^(?:RSCPL)/,/^(?:TMate)/,/^(?:OGTSL)/,/^(?:FSFAP)/,/^(?:NCSA)/,/^(?:Zlib)/,/^(?:SCEA)/,/^(?:SNIA)/,/^(?:NGPL)/,/^(?:NOSL)/,/^(?:ADSL)/,/^(?:MTLL)/,/^(?:NLPL)/,/^(?:Ruby)/,/^(?:JSON)/,/^(?:Barr)/,/^(?:0BSD)/,/^(?:Xnet)/,/^(?:Cube)/,/^(?:curl)/,/^(?:DSDP)/,/^(?:Fair)/,/^(?:HPND)/,/^(?:TOSL)/,/^(?:IJG)/,/^(?:SWL)/,/^(?:Vim)/,/^(?:FTL)/,/^(?:ICU)/,/^(?:OML)/,/^(?:NRL)/,/^(?:DOC)/,/^(?:TCL)/,/^(?:W3C)/,/^(?:NTP)/,/^(?:IPA)/,/^(?:ISC)/,/^(?:X11)/,/^(?:AAL)/,/^(?:AML)/,/^(?:xpp)/,/^(?:Zed)/,/^(?:MIT)/,/^(?:Mup)/],
+conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364],"inclusive":true}}
+});
+return lexer;
+})();
+parser.lexer = lexer;
+function Parser () {
+  this.yy = {};
 }
+Parser.prototype = parser;parser.Parser = Parser;
+return new Parser;
+})();
 
 
-/***/ }),
-/* 112 */
-/***/ (function(module, exports) {
-
-module.exports = require(undefined);
-
-/***/ }),
-/* 113 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const isPlainObj = __webpack_require__(114);
-
-module.exports = (obj, opts) => {
-	if (!isPlainObj(obj)) {
-		throw new TypeError('Expected a plain object');
-	}
-
-	opts = opts || {};
-
-	// DEPRECATED
-	if (typeof opts === 'function') {
-		throw new TypeError('Specify the compare function as an option instead');
-	}
-
-	const deep = opts.deep;
-	const seenInput = [];
-	const seenOutput = [];
-
-	const sortKeys = x => {
-		const seenIndex = seenInput.indexOf(x);
-
-		if (seenIndex !== -1) {
-			return seenOutput[seenIndex];
-		}
-
-		const ret = {};
-		const keys = Object.keys(x).sort(opts.compare);
-
-		seenInput.push(x);
-		seenOutput.push(ret);
-
-		for (let i = 0; i < keys.length; i++) {
-			const key = keys[i];
-			const val = x[key];
-
-			if (deep && Array.isArray(val)) {
-				const retArr = [];
-
-				for (let j = 0; j < val.length; j++) {
-					retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j];
-				}
-
-				ret[key] = retArr;
-				continue;
-			}
-
-			ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val;
-		}
-
-		return ret;
-	};
-
-	return sortKeys(obj);
-};
-
-
-/***/ }),
-/* 114 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var toString = Object.prototype.toString;
-
-module.exports = function (x) {
-	var prototype;
-	return toString.call(x) === '[object Object]' && (prototype = Object.getPrototypeOf(x), prototype === null || prototype === Object.getPrototypeOf({}));
+if (true) {
+exports.parser = spdxparse;
+exports.Parser = spdxparse.Parser;
+exports.parse = function () { return spdxparse.parse.apply(spdxparse, arguments); };
+exports.main = function commonjsMain(args) {
+    if (!args[1]) {
+        console.log('Usage: '+args[0]+' FILE');
+        process.exit(1);
+    }
+    var source = __webpack_require__(23).readFileSync(__webpack_require__(16).normalize(args[1]), "utf8");
+    return exports.parser.parse(source);
 };
+if ( true && __webpack_require__.c[__webpack_require__.s] === module) {
+  exports.main(process.argv.slice(1));
+}
+}
 
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 115 */
+/* 526 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-const fs = __webpack_require__(23);
-const path = __webpack_require__(16);
-const pify = __webpack_require__(116);
-const semver = __webpack_require__(117);
-
-const defaults = {
-	mode: 0o777 & (~process.umask()),
-	fs
-};
-
-const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
-
-// https://github.com/nodejs/node/issues/8987
-// https://github.com/libuv/libuv/pull/1088
-const checkPath = pth => {
-	if (process.platform === 'win32') {
-		const pathHasInvalidWinCharacters = /[<>:"|?*]/.test(pth.replace(path.parse(pth).root, ''));
-
-		if (pathHasInvalidWinCharacters) {
-			const error = new Error(`Path contains invalid characters: ${pth}`);
-			error.code = 'EINVAL';
-			throw error;
-		}
-	}
-};
-
-const permissionError = pth => {
-	// This replicates the exception of `fs.mkdir` with native the
-	// `recusive` option when run on an invalid drive under Windows.
-	const error = new Error(`operation not permitted, mkdir '${pth}'`);
-	error.code = 'EPERM';
-	error.errno = -4048;
-	error.path = pth;
-	error.syscall = 'mkdir';
-	return error;
-};
-
-const makeDir = (input, options) => Promise.resolve().then(() => {
-	checkPath(input);
-	options = Object.assign({}, defaults, options);
-
-	// TODO: Use util.promisify when targeting Node.js 8
-	const mkdir = pify(options.fs.mkdir);
-	const stat = pify(options.fs.stat);
-
-	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
-		const pth = path.resolve(input);
-
-		return mkdir(pth, {
-			mode: options.mode,
-			recursive: true
-		}).then(() => pth);
-	}
-
-	const make = pth => {
-		return mkdir(pth, options.mode)
-			.then(() => pth)
-			.catch(error => {
-				if (error.code === 'EPERM') {
-					throw error;
-				}
-
-				if (error.code === 'ENOENT') {
-					if (path.dirname(pth) === pth) {
-						throw permissionError(pth);
-					}
-
-					if (error.message.includes('null bytes')) {
-						throw error;
-					}
-
-					return make(path.dirname(pth)).then(() => make(pth));
-				}
-
-				return stat(pth)
-					.then(stats => stats.isDirectory() ? pth : Promise.reject())
-					.catch(() => {
-						throw error;
-					});
-			});
-	};
-
-	return make(path.resolve(input));
-});
-
-module.exports = makeDir;
-module.exports.default = makeDir;
-
-module.exports.sync = (input, options) => {
-	checkPath(input);
-	options = Object.assign({}, defaults, options);
-
-	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
-		const pth = path.resolve(input);
+var licenseIDs = __webpack_require__(527);
 
-		fs.mkdirSync(pth, {
-			mode: options.mode,
-			recursive: true
-		});
-
-		return pth;
-	}
-
-	const make = pth => {
-		try {
-			options.fs.mkdirSync(pth, options.mode);
-		} catch (error) {
-			if (error.code === 'EPERM') {
-				throw error;
-			}
+function valid(string) {
+  return licenseIDs.indexOf(string) > -1;
+}
 
-			if (error.code === 'ENOENT') {
-				if (path.dirname(pth) === pth) {
-					throw permissionError(pth);
-				}
+// Common transpositions of license identifier acronyms
+var transpositions = [
+  ['APGL', 'AGPL'],
+  ['Gpl', 'GPL'],
+  ['GLP', 'GPL'],
+  ['APL', 'Apache'],
+  ['ISD', 'ISC'],
+  ['GLP', 'GPL'],
+  ['IST', 'ISC'],
+  ['Claude', 'Clause'],
+  [' or later', '+'],
+  [' International', ''],
+  ['GNU', 'GPL'],
+  ['GUN', 'GPL'],
+  ['+', ''],
+  ['GNU GPL', 'GPL'],
+  ['GNU/GPL', 'GPL'],
+  ['GNU GLP', 'GPL'],
+  ['GNU General Public License', 'GPL'],
+  ['Gnu public license', 'GPL'],
+  ['GNU Public License', 'GPL'],
+  ['GNU GENERAL PUBLIC LICENSE', 'GPL'],
+  ['MTI', 'MIT'],
+  ['Mozilla Public License', 'MPL'],
+  ['WTH', 'WTF'],
+  ['-License', '']
+];
 
-				if (error.message.includes('null bytes')) {
-					throw error;
-				}
+var TRANSPOSED = 0;
+var CORRECT = 1;
 
-				make(path.dirname(pth));
-				return make(pth);
-			}
+// Simple corrections to nearly valid identifiers.
+var transforms = [
+  // e.g. 'mit'
+  function(argument) {
+    return argument.toUpperCase();
+  },
+  // e.g. 'MIT '
+  function(argument) {
+    return argument.trim();
+  },
+  // e.g. 'M.I.T.'
+  function(argument) {
+    return argument.replace(/\./g, '');
+  },
+  // e.g. 'Apache- 2.0'
+  function(argument) {
+    return argument.replace(/\s+/g, '');
+  },
+  // e.g. 'CC BY 4.0''
+  function(argument) {
+    return argument.replace(/\s+/g, '-');
+  },
+  // e.g. 'LGPLv2.1'
+  function(argument) {
+    return argument.replace('v', '-');
+  },
+  // e.g. 'Apache 2.0'
+  function(argument) {
+    return argument.replace(/,?\s*(\d)/, '-$1');
+  },
+  // e.g. 'GPL 2'
+  function(argument) {
+    return argument.replace(/,?\s*(\d)/, '-$1.0');
+  },
+  // e.g. 'Apache Version 2.0'
+  function(argument) {
+    return argument.replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2');
+  },
+  // e.g. 'Apache Version 2'
+  function(argument) {
+    return argument.replace(/,?\s*(V\.|v\.|V|v|Version|version)\s*(\d)/, '-$2.0');
+  },
+  // e.g. 'ZLIB'
+  function(argument) {
+    return argument[0].toUpperCase() + argument.slice(1);
+  },
+  // e.g. 'MPL/2.0'
+  function(argument) {
+    return argument.replace('/', '-');
+  },
+  // e.g. 'Apache 2'
+  function(argument) {
+    return argument
+      .replace(/\s*V\s*(\d)/, '-$1')
+      .replace(/(\d)$/, '$1.0');
+  },
+  // e.g. 'GPL-2.0-'
+  function(argument) {
+    return argument.slice(0, argument.length - 1);
+  },
+  // e.g. 'GPL2'
+  function(argument) {
+    return argument.replace(/(\d)$/, '-$1.0');
+  },
+  // e.g. 'BSD 3'
+  function(argument) {
+    return argument.replace(/(-| )?(\d)$/, '-$2-Clause');
+  },
+  // e.g. 'BSD clause 3'
+  function(argument) {
+    return argument.replace(/(-| )clause(-| )(\d)/, '-$3-Clause');
+  },
+  // e.g. 'BY-NC-4.0'
+  function(argument) {
+    return 'CC-' + argument;
+  },
+  // e.g. 'BY-NC'
+  function(argument) {
+    return 'CC-' + argument + '-4.0';
+  },
+  // e.g. 'Attribution-NonCommercial'
+  function(argument) {
+    return argument
+      .replace('Attribution', 'BY')
+      .replace('NonCommercial', 'NC')
+      .replace('NoDerivatives', 'ND')
+      .replace(/ (\d)/, '-$1')
+      .replace(/ ?International/, '');
+  },
+  // e.g. 'Attribution-NonCommercial'
+  function(argument) {
+    return 'CC-' +
+      argument
+      .replace('Attribution', 'BY')
+      .replace('NonCommercial', 'NC')
+      .replace('NoDerivatives', 'ND')
+      .replace(/ (\d)/, '-$1')
+      .replace(/ ?International/, '') +
+      '-4.0';
+  }
+];
 
-			try {
-				if (!options.fs.statSync(pth).isDirectory()) {
-					throw new Error('The path is not a directory');
-				}
-			} catch (_) {
-				throw error;
-			}
-		}
+// If all else fails, guess that strings containing certain substrings
+// meant to identify certain licenses.
+var lastResorts = [
+  ['UNLI', 'Unlicense'],
+  ['WTF', 'WTFPL'],
+  ['2 CLAUSE', 'BSD-2-Clause'],
+  ['2-CLAUSE', 'BSD-2-Clause'],
+  ['3 CLAUSE', 'BSD-3-Clause'],
+  ['3-CLAUSE', 'BSD-3-Clause'],
+  ['AFFERO', 'AGPL-3.0'],
+  ['AGPL', 'AGPL-3.0'],
+  ['APACHE', 'Apache-2.0'],
+  ['ARTISTIC', 'Artistic-2.0'],
+  ['Affero', 'AGPL-3.0'],
+  ['BEER', 'Beerware'],
+  ['BOOST', 'BSL-1.0'],
+  ['BSD', 'BSD-2-Clause'],
+  ['ECLIPSE', 'EPL-1.0'],
+  ['FUCK', 'WTFPL'],
+  ['GNU', 'GPL-3.0'],
+  ['LGPL', 'LGPL-3.0'],
+  ['GPL', 'GPL-3.0'],
+  ['MIT', 'MIT'],
+  ['MPL', 'MPL-2.0'],
+  ['X11', 'X11'],
+  ['ZLIB', 'Zlib']
+];
 
-		return pth;
-	};
+var SUBSTRING = 0;
+var IDENTIFIER = 1;
 
-	return make(path.resolve(input));
+var validTransformation = function(identifier) {
+  for (var i = 0; i < transforms.length; i++) {
+    var transformed = transforms[i](identifier);
+    if (transformed !== identifier && valid(transformed)) {
+      return transformed;
+    }
+  }
+  return null;
 };
 
-
-/***/ }),
-/* 116 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-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);
-	});
+var validLastResort = function(identifier) {
+  var upperCased = identifier.toUpperCase();
+  for (var i = 0; i < lastResorts.length; i++) {
+    var lastResort = lastResorts[i];
+    if (upperCased.indexOf(lastResort[SUBSTRING]) > -1) {
+      return lastResort[IDENTIFIER];
+    }
+  }
+  return null;
 };
 
-module.exports = (input, options) => {
-	options = Object.assign({
-		exclude: [/.+(Sync|Stream)$/],
-		errorFirst: true,
-		promiseModule: Promise
-	}, options);
-
-	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}\``);
-	}
-
-	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));
-	}
-
-	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;
-	}
+var anyCorrection = function(identifier, check) {
+  for (var i = 0; i < transpositions.length; i++) {
+    var transposition = transpositions[i];
+    var transposed = transposition[TRANSPOSED];
+    if (identifier.indexOf(transposed) > -1) {
+      var corrected = identifier.replace(
+        transposed,
+        transposition[CORRECT]
+      );
+      var checked = check(corrected);
+      if (checked !== null) {
+        return checked;
+      }
+    }
+  }
+  return null;
+};
 
-	return ret;
+module.exports = function(identifier) {
+  identifier = identifier.replace(/\+$/, '');
+  if (valid(identifier)) {
+    return identifier;
+  }
+  var transformed = validTransformation(identifier);
+  if (transformed !== null) {
+    return transformed;
+  }
+  transformed = anyCorrection(identifier, function(argument) {
+    if (valid(argument)) {
+      return argument;
+    }
+    return validTransformation(argument);
+  });
+  if (transformed !== null) {
+    return transformed;
+  }
+  transformed = validLastResort(identifier);
+  if (transformed !== null) {
+    return transformed;
+  }
+  transformed = anyCorrection(identifier, validLastResort);
+  if (transformed !== null) {
+    return transformed;
+  }
+  return null;
 };
 
 
 /***/ }),
-/* 117 */
-/***/ (function(module, exports) {
-
-exports = module.exports = SemVer
-
-var debug
-/* istanbul ignore next */
-if (typeof process === 'object' &&
-    process.env &&
-    process.env.NODE_DEBUG &&
-    /\bsemver\b/i.test(process.env.NODE_DEBUG)) {
-  debug = function () {
-    var args = Array.prototype.slice.call(arguments, 0)
-    args.unshift('SEMVER')
-    console.log.apply(console, args)
-  }
-} else {
-  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'
+/* 527 */
+/***/ (function(module) {
 
-var MAX_LENGTH = 256
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
-  /* istanbul ignore next */ 9007199254740991
+module.exports = JSON.parse("[\"Glide\",\"Abstyles\",\"AFL-1.1\",\"AFL-1.2\",\"AFL-2.0\",\"AFL-2.1\",\"AFL-3.0\",\"AMPAS\",\"APL-1.0\",\"Adobe-Glyph\",\"APAFML\",\"Adobe-2006\",\"AGPL-1.0\",\"Afmparse\",\"Aladdin\",\"ADSL\",\"AMDPLPA\",\"ANTLR-PD\",\"Apache-1.0\",\"Apache-1.1\",\"Apache-2.0\",\"AML\",\"APSL-1.0\",\"APSL-1.1\",\"APSL-1.2\",\"APSL-2.0\",\"Artistic-1.0\",\"Artistic-1.0-Perl\",\"Artistic-1.0-cl8\",\"Artistic-2.0\",\"AAL\",\"Bahyph\",\"Barr\",\"Beerware\",\"BitTorrent-1.0\",\"BitTorrent-1.1\",\"BSL-1.0\",\"Borceux\",\"BSD-2-Clause\",\"BSD-2-Clause-FreeBSD\",\"BSD-2-Clause-NetBSD\",\"BSD-3-Clause\",\"BSD-3-Clause-Clear\",\"BSD-4-Clause\",\"BSD-Protection\",\"BSD-Source-Code\",\"BSD-3-Clause-Attribution\",\"0BSD\",\"BSD-4-Clause-UC\",\"bzip2-1.0.5\",\"bzip2-1.0.6\",\"Caldera\",\"CECILL-1.0\",\"CECILL-1.1\",\"CECILL-2.0\",\"CECILL-2.1\",\"CECILL-B\",\"CECILL-C\",\"ClArtistic\",\"MIT-CMU\",\"CNRI-Jython\",\"CNRI-Python\",\"CNRI-Python-GPL-Compatible\",\"CPOL-1.02\",\"CDDL-1.0\",\"CDDL-1.1\",\"CPAL-1.0\",\"CPL-1.0\",\"CATOSL-1.1\",\"Condor-1.1\",\"CC-BY-1.0\",\"CC-BY-2.0\",\"CC-BY-2.5\",\"CC-BY-3.0\",\"CC-BY-4.0\",\"CC-BY-ND-1.0\",\"CC-BY-ND-2.0\",\"CC-BY-ND-2.5\",\"CC-BY-ND-3.0\",\"CC-BY-ND-4.0\",\"CC-BY-NC-1.0\",\"CC-BY-NC-2.0\",\"CC-BY-NC-2.5\",\"CC-BY-NC-3.0\",\"CC-BY-NC-4.0\",\"CC-BY-NC-ND-1.0\",\"CC-BY-NC-ND-2.0\",\"CC-BY-NC-ND-2.5\",\"CC-BY-NC-ND-3.0\",\"CC-BY-NC-ND-4.0\",\"CC-BY-NC-SA-1.0\",\"CC-BY-NC-SA-2.0\",\"CC-BY-NC-SA-2.5\",\"CC-BY-NC-SA-3.0\",\"CC-BY-NC-SA-4.0\",\"CC-BY-SA-1.0\",\"CC-BY-SA-2.0\",\"CC-BY-SA-2.5\",\"CC-BY-SA-3.0\",\"CC-BY-SA-4.0\",\"CC0-1.0\",\"Crossword\",\"CrystalStacker\",\"CUA-OPL-1.0\",\"Cube\",\"curl\",\"D-FSL-1.0\",\"diffmark\",\"WTFPL\",\"DOC\",\"Dotseqn\",\"DSDP\",\"dvipdfm\",\"EPL-1.0\",\"ECL-1.0\",\"ECL-2.0\",\"eGenix\",\"EFL-1.0\",\"EFL-2.0\",\"MIT-advertising\",\"MIT-enna\",\"Entessa\",\"ErlPL-1.1\",\"EUDatagrid\",\"EUPL-1.0\",\"EUPL-1.1\",\"Eurosym\",\"Fair\",\"MIT-feh\",\"Frameworx-1.0\",\"FreeImage\",\"FTL\",\"FSFAP\",\"FSFUL\",\"FSFULLR\",\"Giftware\",\"GL2PS\",\"Glulxe\",\"AGPL-3.0\",\"GFDL-1.1\",\"GFDL-1.2\",\"GFDL-1.3\",\"GPL-1.0\",\"GPL-2.0\",\"GPL-3.0\",\"LGPL-2.1\",\"LGPL-3.0\",\"LGPL-2.0\",\"gnuplot\",\"gSOAP-1.3b\",\"HaskellReport\",\"HPND\",\"IBM-pibs\",\"IPL-1.0\",\"ICU\",\"ImageMagick\",\"iMatix\",\"Imlib2\",\"IJG\",\"Info-ZIP\",\"Intel-ACPI\",\"Intel\",\"Interbase-1.0\",\"IPA\",\"ISC\",\"JasPer-2.0\",\"JSON\",\"LPPL-1.0\",\"LPPL-1.1\",\"LPPL-1.2\",\"LPPL-1.3a\",\"LPPL-1.3c\",\"Latex2e\",\"BSD-3-Clause-LBNL\",\"Leptonica\",\"LGPLLR\",\"Libpng\",\"libtiff\",\"LAL-1.2\",\"LAL-1.3\",\"LiLiQ-P-1.1\",\"LiLiQ-Rplus-1.1\",\"LiLiQ-R-1.1\",\"LPL-1.02\",\"LPL-1.0\",\"MakeIndex\",\"MTLL\",\"MS-PL\",\"MS-RL\",\"MirOS\",\"MITNFA\",\"MIT\",\"Motosoto\",\"MPL-1.0\",\"MPL-1.1\",\"MPL-2.0\",\"MPL-2.0-no-copyleft-exception\",\"mpich2\",\"Multics\",\"Mup\",\"NASA-1.3\",\"Naumen\",\"NBPL-1.0\",\"NetCDF\",\"NGPL\",\"NOSL\",\"NPL-1.0\",\"NPL-1.1\",\"Newsletr\",\"NLPL\",\"Nokia\",\"NPOSL-3.0\",\"NLOD-1.0\",\"Noweb\",\"NRL\",\"NTP\",\"Nunit\",\"OCLC-2.0\",\"ODbL-1.0\",\"PDDL-1.0\",\"OCCT-PL\",\"OGTSL\",\"OLDAP-2.2.2\",\"OLDAP-1.1\",\"OLDAP-1.2\",\"OLDAP-1.3\",\"OLDAP-1.4\",\"OLDAP-2.0\",\"OLDAP-2.0.1\",\"OLDAP-2.1\",\"OLDAP-2.2\",\"OLDAP-2.2.1\",\"OLDAP-2.3\",\"OLDAP-2.4\",\"OLDAP-2.5\",\"OLDAP-2.6\",\"OLDAP-2.7\",\"OLDAP-2.8\",\"OML\",\"OPL-1.0\",\"OSL-1.0\",\"OSL-1.1\",\"OSL-2.0\",\"OSL-2.1\",\"OSL-3.0\",\"OpenSSL\",\"OSET-PL-2.1\",\"PHP-3.0\",\"PHP-3.01\",\"Plexus\",\"PostgreSQL\",\"psfrag\",\"psutils\",\"Python-2.0\",\"QPL-1.0\",\"Qhull\",\"Rdisc\",\"RPSL-1.0\",\"RPL-1.1\",\"RPL-1.5\",\"RHeCos-1.1\",\"RSCPL\",\"RSA-MD\",\"Ruby\",\"SAX-PD\",\"Saxpath\",\"SCEA\",\"SWL\",\"SMPPL\",\"Sendmail\",\"SGI-B-1.0\",\"SGI-B-1.1\",\"SGI-B-2.0\",\"OFL-1.0\",\"OFL-1.1\",\"SimPL-2.0\",\"Sleepycat\",\"SNIA\",\"Spencer-86\",\"Spencer-94\",\"Spencer-99\",\"SMLNJ\",\"SugarCRM-1.1.3\",\"SISSL\",\"SISSL-1.2\",\"SPL-1.0\",\"Watcom-1.0\",\"TCL\",\"Unlicense\",\"TMate\",\"TORQUE-1.1\",\"TOSL\",\"Unicode-TOU\",\"UPL-1.0\",\"NCSA\",\"Vim\",\"VOSTROM\",\"VSL-1.0\",\"W3C-19980720\",\"W3C\",\"Wsuipa\",\"Xnet\",\"X11\",\"Xerox\",\"XFree86-1.1\",\"xinetd\",\"xpp\",\"XSkat\",\"YPL-1.0\",\"YPL-1.1\",\"Zed\",\"Zend-2.0\",\"Zimbra-1.3\",\"Zimbra-1.4\",\"Zlib\",\"zlib-acknowledgement\",\"ZPL-1.1\",\"ZPL-2.0\",\"ZPL-2.1\",\"BSD-3-Clause-No-Nuclear-License\",\"BSD-3-Clause-No-Nuclear-Warranty\",\"BSD-3-Clause-No-Nuclear-License-2014\",\"eCos-2.0\",\"GPL-2.0-with-autoconf-exception\",\"GPL-2.0-with-bison-exception\",\"GPL-2.0-with-classpath-exception\",\"GPL-2.0-with-font-exception\",\"GPL-2.0-with-GCC-exception\",\"GPL-3.0-with-autoconf-exception\",\"GPL-3.0-with-GCC-exception\",\"StandardML-NJ\",\"WXwindows\"]");
 
-// Max safe segment length for coercion.
-var MAX_SAFE_COMPONENT_LENGTH = 16
+/***/ }),
+/* 528 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// The actual regexps go on exports.re
-var re = exports.re = []
-var src = exports.src = []
-var R = 0
+"use strict";
 
-// The following Regular Expressions can be used for tokenizing,
-// validating, and parsing SemVer version strings.
+var url = __webpack_require__(454)
+var gitHosts = __webpack_require__(529)
+var GitHost = module.exports = __webpack_require__(530)
 
-// ## Numeric Identifier
-// A single `0`, or a non-zero digit followed by zero or more digits.
+var protocolToRepresentationMap = {
+  'git+ssh': 'sshurl',
+  'git+https': 'https',
+  'ssh': 'sshurl',
+  'git': 'git'
+}
 
-var NUMERICIDENTIFIER = R++
-src[NUMERICIDENTIFIER] = '0|[1-9]\\d*'
-var NUMERICIDENTIFIERLOOSE = R++
-src[NUMERICIDENTIFIERLOOSE] = '[0-9]+'
+function protocolToRepresentation (protocol) {
+  if (protocol.substr(-1) === ':') protocol = protocol.slice(0, -1)
+  return protocolToRepresentationMap[protocol] || protocol
+}
 
-// ## Non-numeric Identifier
-// Zero or more digits, followed by a letter or hyphen, and then zero or
-// more letters, digits, or hyphens.
+var authProtocols = {
+  'git:': true,
+  'https:': true,
+  'git+https:': true,
+  'http:': true,
+  'git+http:': true
+}
 
-var NONNUMERICIDENTIFIER = R++
-src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
+var cache = {}
 
-// ## Main Version
-// Three dot-separated numeric identifiers.
+module.exports.fromUrl = function (giturl, opts) {
+  var key = giturl + JSON.stringify(opts || {})
 
-var MAINVERSION = R++
-src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
-                   '(' + src[NUMERICIDENTIFIER] + ')'
+  if (!(key in cache)) {
+    cache[key] = fromUrl(giturl, opts)
+  }
 
-var MAINVERSIONLOOSE = R++
-src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
-                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')'
+  return cache[key]
+}
 
-// ## Pre-release Version Identifier
-// A numeric identifier, or a non-numeric identifier.
+function fromUrl (giturl, opts) {
+  if (giturl == null || giturl === '') return
+  var url = fixupUnqualifiedGist(
+    isGitHubShorthand(giturl) ? 'github:' + giturl : giturl
+  )
+  var parsed = parseGitUrl(url)
+  var shortcutMatch = url.match(new RegExp('^([^:]+):(?:(?:[^@:]+(?:[^@]+)?@)?([^/]*))[/](.+?)(?:[.]git)?($|#)'))
+  var matches = Object.keys(gitHosts).map(function (gitHostName) {
+    try {
+      var gitHostInfo = gitHosts[gitHostName]
+      var auth = null
+      if (parsed.auth && authProtocols[parsed.protocol]) {
+        auth = decodeURIComponent(parsed.auth)
+      }
+      var committish = parsed.hash ? decodeURIComponent(parsed.hash.substr(1)) : null
+      var user = null
+      var project = null
+      var defaultRepresentation = null
+      if (shortcutMatch && shortcutMatch[1] === gitHostName) {
+        user = shortcutMatch[2] && decodeURIComponent(shortcutMatch[2])
+        project = decodeURIComponent(shortcutMatch[3])
+        defaultRepresentation = 'shortcut'
+      } else {
+        if (parsed.host !== gitHostInfo.domain) return
+        if (!gitHostInfo.protocols_re.test(parsed.protocol)) return
+        if (!parsed.path) return
+        var pathmatch = gitHostInfo.pathmatch
+        var matched = parsed.path.match(pathmatch)
+        if (!matched) return
+        if (matched[1] != null) user = decodeURIComponent(matched[1].replace(/^:/, ''))
+        if (matched[2] != null) project = decodeURIComponent(matched[2])
+        defaultRepresentation = protocolToRepresentation(parsed.protocol)
+      }
+      return new GitHost(gitHostName, user, auth, project, committish, defaultRepresentation, opts)
+    } catch (ex) {
+      if (!(ex instanceof URIError)) throw ex
+    }
+  }).filter(function (gitHostInfo) { return gitHostInfo })
+  if (matches.length !== 1) return
+  return matches[0]
+}
 
-var PRERELEASEIDENTIFIER = R++
-src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
-                            '|' + src[NONNUMERICIDENTIFIER] + ')'
+function isGitHubShorthand (arg) {
+  // Note: This does not fully test the git ref format.
+  // See https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
+  //
+  // The only way to do this properly would be to shell out to
+  // git-check-ref-format, and as this is a fast sync function,
+  // we don't want to do that.  Just let git fail if it turns
+  // out that the commit-ish is invalid.
+  // GH usernames cannot start with . or -
+  return /^[^:@%/\s.-][^:@%/\s]*[/][^:@\s/%]+(?:#.*)?$/.test(arg)
+}
 
-var PRERELEASEIDENTIFIERLOOSE = R++
-src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
-                                 '|' + src[NONNUMERICIDENTIFIER] + ')'
+function fixupUnqualifiedGist (giturl) {
+  // necessary for round-tripping gists
+  var parsed = url.parse(giturl)
+  if (parsed.protocol === 'gist:' && parsed.host && !parsed.path) {
+    return parsed.protocol + '/' + parsed.host
+  } else {
+    return giturl
+  }
+}
 
-// ## Pre-release Version
-// Hyphen, followed by one or more dot-separated pre-release version
-// identifiers.
+function parseGitUrl (giturl) {
+  if (typeof giturl !== 'string') giturl = '' + giturl
+  var matched = giturl.match(/^([^@]+)@([^:/]+):[/]?((?:[^/]+[/])?[^/]+?)(?:[.]git)?(#.*)?$/)
+  if (!matched) return url.parse(giturl)
+  return {
+    protocol: 'git+ssh:',
+    slashes: true,
+    auth: matched[1],
+    host: matched[2],
+    port: null,
+    hostname: matched[2],
+    hash: matched[4],
+    search: null,
+    query: null,
+    pathname: '/' + matched[3],
+    path: '/' + matched[3],
+    href: 'git+ssh://' + matched[1] + '@' + matched[2] +
+          '/' + matched[3] + (matched[4] || '')
+  }
+}
 
-var PRERELEASE = R++
-src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
-                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))'
 
-var PRERELEASELOOSE = R++
-src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
-                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))'
+/***/ }),
+/* 529 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// ## Build Metadata Identifier
-// Any combination of digits, letters, or hyphens.
+"use strict";
 
-var BUILDIDENTIFIER = R++
-src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
 
-// ## Build Metadata
-// Plus sign, followed by one or more period-separated build metadata
-// identifiers.
+var gitHosts = module.exports = {
+  github: {
+    // First two are insecure and generally shouldn't be used any more, but
+    // they are still supported.
+    'protocols': [ 'git', 'http', 'git+ssh', 'git+https', 'ssh', 'https' ],
+    'domain': 'github.com',
+    'treepath': 'tree',
+    'filetemplate': 'https://{auth@}raw.githubusercontent.com/{user}/{project}/{committish}/{path}',
+    'bugstemplate': 'https://{domain}/{user}/{project}/issues',
+    'gittemplate': 'git://{auth@}{domain}/{user}/{project}.git{#committish}',
+    'tarballtemplate': 'https://{domain}/{user}/{project}/archive/{committish}.tar.gz'
+  },
+  bitbucket: {
+    'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ],
+    'domain': 'bitbucket.org',
+    'treepath': 'src',
+    'tarballtemplate': 'https://{domain}/{user}/{project}/get/{committish}.tar.gz'
+  },
+  gitlab: {
+    'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ],
+    'domain': 'gitlab.com',
+    'treepath': 'tree',
+    'docstemplate': 'https://{domain}/{user}/{project}{/tree/committish}#README',
+    'bugstemplate': 'https://{domain}/{user}/{project}/issues',
+    'tarballtemplate': 'https://{domain}/{user}/{project}/repository/archive.tar.gz?ref={committish}'
+  },
+  gist: {
+    'protocols': [ 'git', 'git+ssh', 'git+https', 'ssh', 'https' ],
+    'domain': 'gist.github.com',
+    'pathmatch': /^[/](?:([^/]+)[/])?([a-z0-9]+)(?:[.]git)?$/,
+    'filetemplate': 'https://gist.githubusercontent.com/{user}/{project}/raw{/committish}/{path}',
+    'bugstemplate': 'https://{domain}/{project}',
+    'gittemplate': 'git://{domain}/{project}.git{#committish}',
+    'sshtemplate': 'git@{domain}:/{project}.git{#committish}',
+    'sshurltemplate': 'git+ssh://git@{domain}/{project}.git{#committish}',
+    'browsetemplate': 'https://{domain}/{project}{/committish}',
+    'docstemplate': 'https://{domain}/{project}{/committish}',
+    'httpstemplate': 'git+https://{domain}/{project}.git{#committish}',
+    'shortcuttemplate': '{type}:{project}{#committish}',
+    'pathtemplate': '{project}{#committish}',
+    'tarballtemplate': 'https://{domain}/{user}/{project}/archive/{committish}.tar.gz'
+  }
+}
 
-var BUILD = R++
-src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
-             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))'
+var gitHostDefaults = {
+  'sshtemplate': 'git@{domain}:{user}/{project}.git{#committish}',
+  'sshurltemplate': 'git+ssh://git@{domain}/{user}/{project}.git{#committish}',
+  'browsetemplate': 'https://{domain}/{user}/{project}{/tree/committish}',
+  'docstemplate': 'https://{domain}/{user}/{project}{/tree/committish}#readme',
+  'httpstemplate': 'git+https://{auth@}{domain}/{user}/{project}.git{#committish}',
+  'filetemplate': 'https://{domain}/{user}/{project}/raw/{committish}/{path}',
+  'shortcuttemplate': '{type}:{user}/{project}{#committish}',
+  'pathtemplate': '{user}/{project}{#committish}',
+  'pathmatch': /^[/]([^/]+)[/]([^/]+?)(?:[.]git|[/])?$/
+}
 
-// ## Full Version String
-// A main version, followed optionally by a pre-release version and
-// build metadata.
+Object.keys(gitHosts).forEach(function (name) {
+  Object.keys(gitHostDefaults).forEach(function (key) {
+    if (gitHosts[name][key]) return
+    gitHosts[name][key] = gitHostDefaults[key]
+  })
+  gitHosts[name].protocols_re = RegExp('^(' +
+    gitHosts[name].protocols.map(function (protocol) {
+      return protocol.replace(/([\\+*{}()[\]$^|])/g, '\\$1')
+    }).join('|') + '):$')
+})
 
-// 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.
 
-var FULL = R++
-var FULLPLAIN = 'v?' + src[MAINVERSION] +
-                src[PRERELEASE] + '?' +
-                src[BUILD] + '?'
+/***/ }),
+/* 530 */
+/***/ (function(module, exports, __webpack_require__) {
 
-src[FULL] = '^' + FULLPLAIN + '$'
+"use strict";
 
-// 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] + '?'
+var gitHosts = __webpack_require__(529)
+var extend = Object.assign || __webpack_require__(29)._extend
 
-var LOOSE = R++
-src[LOOSE] = '^' + LOOSEPLAIN + '$'
+var GitHost = module.exports = function (type, user, auth, project, committish, defaultRepresentation, opts) {
+  var gitHostInfo = this
+  gitHostInfo.type = type
+  Object.keys(gitHosts[type]).forEach(function (key) {
+    gitHostInfo[key] = gitHosts[type][key]
+  })
+  gitHostInfo.user = user
+  gitHostInfo.auth = auth
+  gitHostInfo.project = project
+  gitHostInfo.committish = committish
+  gitHostInfo.default = defaultRepresentation
+  gitHostInfo.opts = opts || {}
+}
+GitHost.prototype = {}
 
-var GTLT = R++
-src[GTLT] = '((?:<|>)?=?)'
+GitHost.prototype.hash = function () {
+  return this.committish ? '#' + this.committish : ''
+}
 
-// 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|\\*'
+GitHost.prototype._fill = function (template, opts) {
+  if (!template) return
+  var vars = extend({}, opts)
+  opts = extend(extend({}, this.opts), opts)
+  var self = this
+  Object.keys(this).forEach(function (key) {
+    if (self[key] != null && vars[key] == null) vars[key] = self[key]
+  })
+  var rawAuth = vars.auth
+  var rawComittish = vars.committish
+  Object.keys(vars).forEach(function (key) {
+    vars[key] = encodeURIComponent(vars[key])
+  })
+  vars['auth@'] = rawAuth ? rawAuth + '@' : ''
+  if (opts.noCommittish) {
+    vars['#committish'] = ''
+    vars['/tree/committish'] = ''
+    vars['/comittish'] = ''
+    vars.comittish = ''
+  } else {
+    vars['#committish'] = rawComittish ? '#' + rawComittish : ''
+    vars['/tree/committish'] = vars.committish
+                            ? '/' + vars.treepath + '/' + vars.committish
+                            : ''
+    vars['/committish'] = vars.committish ? '/' + vars.committish : ''
+    vars.committish = vars.committish || 'master'
+  }
+  var res = template
+  Object.keys(vars).forEach(function (key) {
+    res = res.replace(new RegExp('[{]' + key + '[}]', 'g'), vars[key])
+  })
+  if (opts.noGitPlus) {
+    return res.replace(/^git[+]/, '')
+  } else {
+    return res
+  }
+}
 
-var XRANGEPLAIN = R++
-src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
-                   '(?:' + src[PRERELEASE] + ')?' +
-                   src[BUILD] + '?' +
-                   ')?)?'
+GitHost.prototype.ssh = function (opts) {
+  return this._fill(this.sshtemplate, opts)
+}
 
-var XRANGEPLAINLOOSE = R++
-src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
-                        '(?:' + src[PRERELEASELOOSE] + ')?' +
-                        src[BUILD] + '?' +
-                        ')?)?'
+GitHost.prototype.sshurl = function (opts) {
+  return this._fill(this.sshurltemplate, opts)
+}
 
-var XRANGE = R++
-src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$'
-var XRANGELOOSE = R++
-src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$'
+GitHost.prototype.browse = function (opts) {
+  return this._fill(this.browsetemplate, opts)
+}
 
-// 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])'
+GitHost.prototype.docs = function (opts) {
+  return this._fill(this.docstemplate, opts)
+}
 
-// Tilde ranges.
-// Meaning is "reasonably at or greater than"
-var LONETILDE = R++
-src[LONETILDE] = '(?:~>?)'
+GitHost.prototype.bugs = function (opts) {
+  return this._fill(this.bugstemplate, opts)
+}
 
-var TILDETRIM = R++
-src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+'
-re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g')
-var tildeTrimReplace = '$1~'
+GitHost.prototype.https = function (opts) {
+  return this._fill(this.httpstemplate, opts)
+}
 
-var TILDE = R++
-src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$'
-var TILDELOOSE = R++
-src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$'
+GitHost.prototype.git = function (opts) {
+  return this._fill(this.gittemplate, opts)
+}
 
-// Caret ranges.
-// Meaning is "at least and backwards compatible with"
-var LONECARET = R++
-src[LONECARET] = '(?:\\^)'
+GitHost.prototype.shortcut = function (opts) {
+  return this._fill(this.shortcuttemplate, opts)
+}
 
-var CARETTRIM = R++
-src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+'
-re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g')
-var caretTrimReplace = '$1^'
+GitHost.prototype.path = function (opts) {
+  return this._fill(this.pathtemplate, opts)
+}
 
-var CARET = R++
-src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$'
-var CARETLOOSE = R++
-src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$'
+GitHost.prototype.tarball = function (opts) {
+  return this._fill(this.tarballtemplate, opts)
+}
 
-// 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 + ')$|^$'
+GitHost.prototype.file = function (P, opts) {
+  return this._fill(this.filetemplate, extend({
+    path: P.replace(/^[/]+/g, '')
+  }, opts))
+}
 
-// 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] + ')'
+GitHost.prototype.getDefaultRepresentation = function () {
+  return this.default
+}
 
-// this one has to use the /g flag
-re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g')
-var comparatorTrimReplace = '$1$2$3'
+GitHost.prototype.toString = function (opts) {
+  return (this[this.default] || this.sshurl).call(this, opts)
+}
 
-// 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*$'
 
-var HYPHENRANGELOOSE = R++
-src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s+-\\s+' +
-                        '(' + src[XRANGEPLAINLOOSE] + ')' +
-                        '\\s*$'
+/***/ }),
+/* 531 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// Star ranges basically just allow anything at all.
-var STAR = R++
-src[STAR] = '(<|>)?=?\\s*\\*'
+var core = __webpack_require__(532);
+var async = __webpack_require__(534);
+async.core = core;
+async.isCore = function isCore(x) { return core[x]; };
+async.sync = __webpack_require__(539);
 
-// 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])
-  }
-}
+exports = async;
+module.exports = async;
 
-exports.parse = parse
-function parse (version, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
 
-  if (version instanceof SemVer) {
-    return version
-  }
+/***/ }),
+/* 532 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (typeof version !== 'string') {
-    return null
-  }
+var current = (process.versions && process.versions.node && process.versions.node.split('.')) || [];
 
-  if (version.length > MAX_LENGTH) {
-    return null
-  }
+function specifierIncluded(specifier) {
+    var parts = specifier.split(' ');
+    var op = parts.length > 1 ? parts[0] : '=';
+    var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
 
-  var r = options.loose ? re[LOOSE] : re[FULL]
-  if (!r.test(version)) {
-    return null
-  }
+    for (var i = 0; i < 3; ++i) {
+        var cur = Number(current[i] || 0);
+        var ver = Number(versionParts[i] || 0);
+        if (cur === ver) {
+            continue; // eslint-disable-line no-restricted-syntax, no-continue
+        }
+        if (op === '<') {
+            return cur < ver;
+        } else if (op === '>=') {
+            return cur >= ver;
+        } else {
+            return false;
+        }
+    }
+    return op === '>=';
+}
 
-  try {
-    return new SemVer(version, options)
-  } catch (er) {
-    return null
-  }
+function matchesRange(range) {
+    var specifiers = range.split(/ ?&& ?/);
+    if (specifiers.length === 0) { return false; }
+    for (var i = 0; i < specifiers.length; ++i) {
+        if (!specifierIncluded(specifiers[i])) { return false; }
+    }
+    return true;
 }
 
-exports.valid = valid
-function valid (version, options) {
-  var v = parse(version, options)
-  return v ? v.version : null
+function versionIncluded(specifierValue) {
+    if (typeof specifierValue === 'boolean') { return specifierValue; }
+    if (specifierValue && typeof specifierValue === 'object') {
+        for (var i = 0; i < specifierValue.length; ++i) {
+            if (matchesRange(specifierValue[i])) { return true; }
+        }
+        return false;
+    }
+    return matchesRange(specifierValue);
 }
 
-exports.clean = clean
-function clean (version, options) {
-  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
-  return s ? s.version : null
+var data = __webpack_require__(533);
+
+var core = {};
+for (var mod in data) { // eslint-disable-line no-restricted-syntax
+    if (Object.prototype.hasOwnProperty.call(data, mod)) {
+        core[mod] = versionIncluded(data[mod]);
+    }
 }
+module.exports = core;
 
-exports.SemVer = SemVer
 
-function SemVer (version, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
+/***/ }),
+/* 533 */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"assert\":true,\"async_hooks\":\">= 8\",\"buffer_ieee754\":\"< 0.9.7\",\"buffer\":true,\"child_process\":true,\"cluster\":true,\"console\":true,\"constants\":true,\"crypto\":true,\"_debugger\":\"< 8\",\"dgram\":true,\"dns\":true,\"domain\":true,\"events\":true,\"freelist\":\"< 6\",\"fs\":true,\"fs/promises\":\">= 10 && < 10.1\",\"_http_agent\":\">= 0.11.1\",\"_http_client\":\">= 0.11.1\",\"_http_common\":\">= 0.11.1\",\"_http_incoming\":\">= 0.11.1\",\"_http_outgoing\":\">= 0.11.1\",\"_http_server\":\">= 0.11.1\",\"http\":true,\"http2\":\">= 8.8\",\"https\":true,\"inspector\":\">= 8.0.0\",\"_linklist\":\"< 8\",\"module\":true,\"net\":true,\"node-inspect/lib/_inspect\":\">= 7.6.0\",\"node-inspect/lib/internal/inspect_client\":\">= 7.6.0\",\"node-inspect/lib/internal/inspect_repl\":\">= 7.6.0\",\"os\":true,\"path\":true,\"perf_hooks\":\">= 8.5\",\"process\":\">= 1\",\"punycode\":true,\"querystring\":true,\"readline\":true,\"repl\":true,\"smalloc\":\">= 0.11.5 && < 3\",\"_stream_duplex\":\">= 0.9.4\",\"_stream_transform\":\">= 0.9.4\",\"_stream_wrap\":\">= 1.4.1\",\"_stream_passthrough\":\">= 0.9.4\",\"_stream_readable\":\">= 0.9.4\",\"_stream_writable\":\">= 0.9.4\",\"stream\":true,\"string_decoder\":true,\"sys\":true,\"timers\":true,\"_tls_common\":\">= 0.11.13\",\"_tls_legacy\":\">= 0.11.3 && < 10\",\"_tls_wrap\":\">= 0.11.3\",\"tls\":true,\"trace_events\":\">= 10\",\"tty\":true,\"url\":true,\"util\":true,\"v8/tools/arguments\":\">= 10\",\"v8/tools/codemap\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/consarray\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/csvparser\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/logreader\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/profile_view\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8/tools/splaytree\":[\">= 4.4.0 && < 5\",\">= 5.2.0\"],\"v8\":\">= 1\",\"vm\":true,\"worker_threads\":\">= 11.7\",\"zlib\":true}");
+
+/***/ }),
+/* 534 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var core = __webpack_require__(532);
+var fs = __webpack_require__(23);
+var path = __webpack_require__(16);
+var caller = __webpack_require__(535);
+var nodeModulesPaths = __webpack_require__(536);
+var normalizeOptions = __webpack_require__(538);
+
+var defaultIsFile = function isFile(file, cb) {
+    fs.stat(file, function (err, stat) {
+        if (!err) {
+            return cb(null, stat.isFile() || stat.isFIFO());
+        }
+        if (err.code === 'ENOENT' || err.code === 'ENOTDIR') return cb(null, false);
+        return cb(err);
+    });
+};
+
+module.exports = function resolve(x, options, callback) {
+    var cb = callback;
+    var opts = options;
+    if (typeof options === 'function') {
+        cb = opts;
+        opts = {};
     }
-  }
-  if (version instanceof SemVer) {
-    if (version.loose === options.loose) {
-      return version
-    } else {
-      version = version.version
+    if (typeof x !== 'string') {
+        var err = new TypeError('Path must be a string.');
+        return process.nextTick(function () {
+            cb(err);
+        });
     }
-  } else if (typeof version !== 'string') {
-    throw new TypeError('Invalid Version: ' + version)
-  }
 
-  if (version.length > MAX_LENGTH) {
-    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
-  }
+    opts = normalizeOptions(x, opts);
 
-  if (!(this instanceof SemVer)) {
-    return new SemVer(version, options)
-  }
+    var isFile = opts.isFile || defaultIsFile;
+    var readFile = opts.readFile || fs.readFile;
 
-  debug('SemVer', version, options)
-  this.options = options
-  this.loose = !!options.loose
+    var extensions = opts.extensions || ['.js'];
+    var basedir = opts.basedir || path.dirname(caller());
+    var parent = opts.filename || basedir;
 
-  var m = version.trim().match(options.loose ? re[LOOSE] : re[FULL])
+    opts.paths = opts.paths || [];
 
-  if (!m) {
-    throw new TypeError('Invalid Version: ' + version)
-  }
+    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
+    var absoluteStart = path.resolve(basedir);
 
-  this.raw = version
+    if (opts.preserveSymlinks === false) {
+        fs.realpath(absoluteStart, function (realPathErr, realStart) {
+            if (realPathErr && realPathErr.code !== 'ENOENT') cb(err);
+            else init(realPathErr ? absoluteStart : realStart);
+        });
+    } else {
+        init(absoluteStart);
+    }
 
-  // these are actually numbers
-  this.major = +m[1]
-  this.minor = +m[2]
-  this.patch = +m[3]
+    var res;
+    function init(basedir) {
+        if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
+            res = path.resolve(basedir, x);
+            if (x === '..' || x.slice(-1) === '/') res += '/';
+            if ((/\/$/).test(x) && res === basedir) {
+                loadAsDirectory(res, opts.package, onfile);
+            } else loadAsFile(res, opts.package, onfile);
+        } else loadNodeModules(x, basedir, function (err, n, pkg) {
+            if (err) cb(err);
+            else if (n) cb(null, n, pkg);
+            else if (core[x]) return cb(null, x);
+            else {
+                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+                moduleError.code = 'MODULE_NOT_FOUND';
+                cb(moduleError);
+            }
+        });
+    }
 
-  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
-    throw new TypeError('Invalid major version')
-  }
+    function onfile(err, m, pkg) {
+        if (err) cb(err);
+        else if (m) cb(null, m, pkg);
+        else loadAsDirectory(res, function (err, d, pkg) {
+            if (err) cb(err);
+            else if (d) cb(null, d, pkg);
+            else {
+                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+                moduleError.code = 'MODULE_NOT_FOUND';
+                cb(moduleError);
+            }
+        });
+    }
 
-  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
-    throw new TypeError('Invalid minor version')
-  }
+    function loadAsFile(x, thePackage, callback) {
+        var loadAsFilePackage = thePackage;
+        var cb = callback;
+        if (typeof loadAsFilePackage === 'function') {
+            cb = loadAsFilePackage;
+            loadAsFilePackage = undefined;
+        }
 
-  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
-    throw new TypeError('Invalid patch version')
-  }
+        var exts = [''].concat(extensions);
+        load(exts, x, loadAsFilePackage);
 
-  // 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
+        function load(exts, x, loadPackage) {
+            if (exts.length === 0) return cb(null, undefined, loadPackage);
+            var file = x + exts[0];
+
+            var pkg = loadPackage;
+            if (pkg) onpkg(null, pkg);
+            else loadpkg(path.dirname(file), onpkg);
+
+            function onpkg(err, pkg_, dir) {
+                pkg = pkg_;
+                if (err) return cb(err);
+                if (dir && pkg && opts.pathFilter) {
+                    var rfile = path.relative(dir, file);
+                    var rel = rfile.slice(0, rfile.length - exts[0].length);
+                    var r = opts.pathFilter(pkg, x, rel);
+                    if (r) return load(
+                        [''].concat(extensions.slice()),
+                        path.resolve(dir, r),
+                        pkg
+                    );
+                }
+                isFile(file, onex);
+            }
+            function onex(err, ex) {
+                if (err) return cb(err);
+                if (ex) return cb(null, file, pkg);
+                load(exts.slice(1), x, pkg);
+            }
         }
-      }
-      return id
-    })
-  }
+    }
 
-  this.build = m[5] ? m[5].split('.') : []
-  this.format()
-}
+    function loadpkg(dir, cb) {
+        if (dir === '' || dir === '/') return cb(null);
+        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
+            return cb(null);
+        }
+        if ((/[/\\]node_modules[/\\]*$/).test(dir)) return cb(null);
 
-SemVer.prototype.format = function () {
-  this.version = this.major + '.' + this.minor + '.' + this.patch
-  if (this.prerelease.length) {
-    this.version += '-' + this.prerelease.join('.')
-  }
-  return this.version
-}
+        var pkgfile = path.join(dir, 'package.json');
+        isFile(pkgfile, function (err, ex) {
+            // on err, ex is false
+            if (!ex) return loadpkg(path.dirname(dir), cb);
 
-SemVer.prototype.toString = function () {
-  return this.version
-}
+            readFile(pkgfile, function (err, body) {
+                if (err) cb(err);
+                try { var pkg = JSON.parse(body); } catch (jsonErr) {}
 
-SemVer.prototype.compare = function (other) {
-  debug('SemVer.compare', this.version, this.options, other)
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+                if (pkg && opts.packageFilter) {
+                    pkg = opts.packageFilter(pkg, pkgfile);
+                }
+                cb(null, pkg, dir);
+            });
+        });
+    }
 
-  return this.compareMain(other) || this.comparePre(other)
-}
+    function loadAsDirectory(x, loadAsDirectoryPackage, callback) {
+        var cb = callback;
+        var fpkg = loadAsDirectoryPackage;
+        if (typeof fpkg === 'function') {
+            cb = fpkg;
+            fpkg = opts.package;
+        }
 
-SemVer.prototype.compareMain = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+        var pkgfile = path.join(x, 'package.json');
+        isFile(pkgfile, function (err, ex) {
+            if (err) return cb(err);
+            if (!ex) return loadAsFile(path.join(x, 'index'), fpkg, cb);
 
-  return compareIdentifiers(this.major, other.major) ||
-         compareIdentifiers(this.minor, other.minor) ||
-         compareIdentifiers(this.patch, other.patch)
-}
+            readFile(pkgfile, function (err, body) {
+                if (err) return cb(err);
+                try {
+                    var pkg = JSON.parse(body);
+                } catch (jsonErr) {}
 
-SemVer.prototype.comparePre = function (other) {
-  if (!(other instanceof SemVer)) {
-    other = new SemVer(other, this.options)
-  }
+                if (opts.packageFilter) {
+                    pkg = opts.packageFilter(pkg, pkgfile);
+                }
 
-  // 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
-  }
+                if (pkg.main) {
+                    if (typeof pkg.main !== 'string') {
+                        var mainError = new TypeError('package “' + pkg.name + '” `main` must be a string');
+                        mainError.code = 'INVALID_PACKAGE_MAIN';
+                        return cb(mainError);
+                    }
+                    if (pkg.main === '.' || pkg.main === './') {
+                        pkg.main = 'index';
+                    }
+                    loadAsFile(path.resolve(x, pkg.main), pkg, function (err, m, pkg) {
+                        if (err) return cb(err);
+                        if (m) return cb(null, m, pkg);
+                        if (!pkg) return loadAsFile(path.join(x, 'index'), pkg, cb);
 
-  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)
+                        var dir = path.resolve(x, pkg.main);
+                        loadAsDirectory(dir, pkg, function (err, n, pkg) {
+                            if (err) return cb(err);
+                            if (n) return cb(null, n, pkg);
+                            loadAsFile(path.join(x, 'index'), pkg, cb);
+                        });
+                    });
+                    return;
+                }
+
+                loadAsFile(path.join(x, '/index'), pkg, cb);
+            });
+        });
     }
-  } 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
+    function processDirs(cb, dirs) {
+        if (dirs.length === 0) return cb(null, undefined);
+        var dir = dirs[0];
 
-    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)
+        var file = path.join(dir, x);
+        loadAsFile(file, opts.package, onfile);
+
+        function onfile(err, m, pkg) {
+            if (err) return cb(err);
+            if (m) return cb(null, m, pkg);
+            loadAsDirectory(path.join(dir, x), opts.package, ondir);
         }
-      }
-      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]
+
+        function ondir(err, n, pkg) {
+            if (err) return cb(err);
+            if (n) return cb(null, n, pkg);
+            processDirs(cb, dirs.slice(1));
         }
-      }
-      break
+    }
+    function loadNodeModules(x, start, cb) {
+        processDirs(cb, nodeModulesPaths(start, opts, x));
+    }
+};
+
 
-    default:
-      throw new Error('invalid increment argument: ' + release)
-  }
-  this.format()
-  this.raw = this.version
-  return this
-}
+/***/ }),
+/* 535 */
+/***/ (function(module, exports) {
 
-exports.inc = inc
-function inc (version, release, loose, identifier) {
-  if (typeof (loose) === 'string') {
-    identifier = loose
-    loose = undefined
-  }
+module.exports = function () {
+    // see https://code.google.com/p/v8/wiki/JavaScriptStackTraceApi
+    var origPrepareStackTrace = Error.prepareStackTrace;
+    Error.prepareStackTrace = function (_, stack) { return stack; };
+    var stack = (new Error()).stack;
+    Error.prepareStackTrace = origPrepareStackTrace;
+    return stack[2].getFileName();
+};
 
-  try {
-    return new SemVer(version, loose).inc(release, identifier).version
-  } catch (er) {
-    return null
-  }
-}
 
-exports.diff = diff
-function diff (version1, version2) {
-  if (eq(version1, version2)) {
-    return null
-  } else {
-    var v1 = parse(version1)
-    var v2 = parse(version2)
-    var prefix = ''
-    if (v1.prerelease.length || v2.prerelease.length) {
-      prefix = 'pre'
-      var defaultResult = 'prerelease'
+/***/ }),
+/* 536 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var path = __webpack_require__(16);
+var parse = path.parse || __webpack_require__(537);
+
+var getNodeModulesDirs = function getNodeModulesDirs(absoluteStart, modules) {
+    var prefix = '/';
+    if ((/^([A-Za-z]:)/).test(absoluteStart)) {
+        prefix = '';
+    } else if ((/^\\\\/).test(absoluteStart)) {
+        prefix = '\\\\';
     }
-    for (var key in v1) {
-      if (key === 'major' || key === 'minor' || key === 'patch') {
-        if (v1[key] !== v2[key]) {
-          return prefix + key
-        }
-      }
+
+    var paths = [absoluteStart];
+    var parsed = parse(absoluteStart);
+    while (parsed.dir !== paths[paths.length - 1]) {
+        paths.push(parsed.dir);
+        parsed = parse(parsed.dir);
     }
-    return defaultResult // may be undefined
-  }
-}
 
-exports.compareIdentifiers = compareIdentifiers
+    return paths.reduce(function (dirs, aPath) {
+        return dirs.concat(modules.map(function (moduleDir) {
+            return path.join(prefix, aPath, moduleDir);
+        }));
+    }, []);
+};
 
-var numeric = /^[0-9]+$/
-function compareIdentifiers (a, b) {
-  var anum = numeric.test(a)
-  var bnum = numeric.test(b)
+module.exports = function nodeModulesPaths(start, opts, request) {
+    var modules = opts && opts.moduleDirectory
+        ? [].concat(opts.moduleDirectory)
+        : ['node_modules'];
 
-  if (anum && bnum) {
-    a = +a
-    b = +b
-  }
+    if (opts && typeof opts.paths === 'function') {
+        return opts.paths(
+            request,
+            start,
+            function () { return getNodeModulesDirs(start, modules); },
+            opts
+        );
+    }
 
-  return a === b ? 0
-    : (anum && !bnum) ? -1
-    : (bnum && !anum) ? 1
-    : a < b ? -1
-    : 1
-}
+    var dirs = getNodeModulesDirs(start, modules);
+    return opts && opts.paths ? dirs.concat(opts.paths) : dirs;
+};
 
-exports.rcompareIdentifiers = rcompareIdentifiers
-function rcompareIdentifiers (a, b) {
-  return compareIdentifiers(b, a)
-}
 
-exports.major = major
-function major (a, loose) {
-  return new SemVer(a, loose).major
-}
+/***/ }),
+/* 537 */
+/***/ (function(module, exports, __webpack_require__) {
 
-exports.minor = minor
-function minor (a, loose) {
-  return new SemVer(a, loose).minor
-}
+"use strict";
 
-exports.patch = patch
-function patch (a, loose) {
-  return new SemVer(a, loose).patch
-}
 
-exports.compare = compare
-function compare (a, b, loose) {
-  return new SemVer(a, loose).compare(new SemVer(b, loose))
-}
+var isWindows = process.platform === 'win32';
 
-exports.compareLoose = compareLoose
-function compareLoose (a, b) {
-  return compare(a, b, true)
-}
+// Regex to split a windows path into three parts: [*, device, slash,
+// tail] windows-only
+var splitDeviceRe =
+    /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
 
-exports.rcompare = rcompare
-function rcompare (a, b, loose) {
-  return compare(b, a, loose)
-}
+// Regex to split the tail part of the above into [*, dir, basename, ext]
+var splitTailRe =
+    /^([\s\S]*?)((?:\.{1,2}|[^\\\/]+?|)(\.[^.\/\\]*|))(?:[\\\/]*)$/;
 
-exports.sort = sort
-function sort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.compare(a, b, loose)
-  })
-}
+var win32 = {};
 
-exports.rsort = rsort
-function rsort (list, loose) {
-  return list.sort(function (a, b) {
-    return exports.rcompare(a, b, loose)
-  })
+// Function to split a filename into [root, dir, basename, ext]
+function win32SplitPath(filename) {
+  // Separate device+slash from tail
+  var result = splitDeviceRe.exec(filename),
+      device = (result[1] || '') + (result[2] || ''),
+      tail = result[3] || '';
+  // Split the tail into dir, basename and extension
+  var result2 = splitTailRe.exec(tail),
+      dir = result2[1],
+      basename = result2[2],
+      ext = result2[3];
+  return [device, dir, basename, ext];
 }
 
-exports.gt = gt
-function gt (a, b, loose) {
-  return compare(a, b, loose) > 0
-}
+win32.parse = function(pathString) {
+  if (typeof pathString !== 'string') {
+    throw new TypeError(
+        "Parameter 'pathString' must be a string, not " + typeof pathString
+    );
+  }
+  var allParts = win32SplitPath(pathString);
+  if (!allParts || allParts.length !== 4) {
+    throw new TypeError("Invalid path '" + pathString + "'");
+  }
+  return {
+    root: allParts[0],
+    dir: allParts[0] + allParts[1].slice(0, -1),
+    base: allParts[2],
+    ext: allParts[3],
+    name: allParts[2].slice(0, allParts[2].length - allParts[3].length)
+  };
+};
 
-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
-}
+// Split a filename into [root, dir, basename, ext], unix version
+// 'root' is just a slash, or nothing.
+var splitPathRe =
+    /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;
+var posix = {};
 
-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
+function posixSplitPath(filename) {
+  return splitPathRe.exec(filename).slice(1);
 }
 
-exports.cmp = cmp
-function cmp (a, op, b, loose) {
-  switch (op) {
-    case '===':
-      if (typeof a === 'object')
-        a = a.version
-      if (typeof b === 'object')
-        b = b.version
-      return a === b
 
-    case '!==':
-      if (typeof a === 'object')
-        a = a.version
-      if (typeof b === 'object')
-        b = b.version
-      return a !== b
+posix.parse = function(pathString) {
+  if (typeof pathString !== 'string') {
+    throw new TypeError(
+        "Parameter 'pathString' must be a string, not " + typeof pathString
+    );
+  }
+  var allParts = posixSplitPath(pathString);
+  if (!allParts || allParts.length !== 4) {
+    throw new TypeError("Invalid path '" + pathString + "'");
+  }
+  allParts[1] = allParts[1] || '';
+  allParts[2] = allParts[2] || '';
+  allParts[3] = allParts[3] || '';
 
-    case '':
-    case '=':
-    case '==':
-      return eq(a, b, loose)
+  return {
+    root: allParts[0],
+    dir: allParts[0] + allParts[1].slice(0, -1),
+    base: allParts[2],
+    ext: allParts[3],
+    name: allParts[2].slice(0, allParts[2].length - allParts[3].length)
+  };
+};
 
-    case '!=':
-      return neq(a, b, loose)
 
-    case '>':
-      return gt(a, b, loose)
+if (isWindows)
+  module.exports = win32.parse;
+else /* posix */
+  module.exports = posix.parse;
 
-    case '>=':
-      return gte(a, b, loose)
+module.exports.posix = posix.parse;
+module.exports.win32 = win32.parse;
 
-    case '<':
-      return lt(a, b, loose)
 
-    case '<=':
-      return lte(a, b, loose)
+/***/ }),
+/* 538 */
+/***/ (function(module, exports) {
 
-    default:
-      throw new TypeError('Invalid operator: ' + op)
-  }
-}
+module.exports = function (x, opts) {
+    /**
+     * This file is purposefully a passthrough. It's expected that third-party
+     * environments will override it at runtime in order to inject special logic
+     * into `resolve` (by manipulating the options). One such example is the PnP
+     * code path in Yarn.
+     */
 
-exports.Comparator = Comparator
-function Comparator (comp, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+    return opts || {};
+};
 
-  if (comp instanceof Comparator) {
-    if (comp.loose === !!options.loose) {
-      return comp
-    } else {
-      comp = comp.value
-    }
-  }
 
-  if (!(this instanceof Comparator)) {
-    return new Comparator(comp, options)
-  }
+/***/ }),
+/* 539 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  debug('comparator', comp, options)
-  this.options = options
-  this.loose = !!options.loose
-  this.parse(comp)
+var core = __webpack_require__(532);
+var fs = __webpack_require__(23);
+var path = __webpack_require__(16);
+var caller = __webpack_require__(535);
+var nodeModulesPaths = __webpack_require__(536);
+var normalizeOptions = __webpack_require__(538);
 
-  if (this.semver === ANY) {
-    this.value = ''
-  } else {
-    this.value = this.operator + this.semver.version
-  }
+var defaultIsFile = function isFile(file) {
+    try {
+        var stat = fs.statSync(file);
+    } catch (e) {
+        if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) return false;
+        throw e;
+    }
+    return stat.isFile() || stat.isFIFO();
+};
 
-  debug('comp', this)
-}
+module.exports = function (x, options) {
+    if (typeof x !== 'string') {
+        throw new TypeError('Path must be a string.');
+    }
+    var opts = normalizeOptions(x, options);
 
-var ANY = {}
-Comparator.prototype.parse = function (comp) {
-  var r = this.options.loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
-  var m = comp.match(r)
+    var isFile = opts.isFile || defaultIsFile;
+    var readFileSync = opts.readFileSync || fs.readFileSync;
 
-  if (!m) {
-    throw new TypeError('Invalid comparator: ' + comp)
-  }
+    var extensions = opts.extensions || ['.js'];
+    var basedir = opts.basedir || path.dirname(caller());
+    var parent = opts.filename || basedir;
 
-  this.operator = m[1]
-  if (this.operator === '=') {
-    this.operator = ''
-  }
+    opts.paths = opts.paths || [];
 
-  // if it literally is just '>' or '' then allow anything.
-  if (!m[2]) {
-    this.semver = ANY
-  } else {
-    this.semver = new SemVer(m[2], this.options.loose)
-  }
-}
+    // ensure that `basedir` is an absolute path at this point, resolving against the process' current working directory
+    var absoluteStart = path.resolve(basedir);
 
-Comparator.prototype.toString = function () {
-  return this.value
-}
+    if (opts.preserveSymlinks === false) {
+        try {
+            absoluteStart = fs.realpathSync(absoluteStart);
+        } catch (realPathErr) {
+            if (realPathErr.code !== 'ENOENT') {
+                throw realPathErr;
+            }
+        }
+    }
 
-Comparator.prototype.test = function (version) {
-  debug('Comparator.test', version, this.options.loose)
+    if ((/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/).test(x)) {
+        var res = path.resolve(absoluteStart, x);
+        if (x === '..' || x.slice(-1) === '/') res += '/';
+        var m = loadAsFileSync(res) || loadAsDirectorySync(res);
+        if (m) return m;
+    } else {
+        var n = loadNodeModulesSync(x, absoluteStart);
+        if (n) return n;
+    }
 
-  if (this.semver === ANY) {
-    return true
-  }
+    if (core[x]) return x;
 
-  if (typeof version === 'string') {
-    version = new SemVer(version, this.options)
-  }
+    var err = new Error("Cannot find module '" + x + "' from '" + parent + "'");
+    err.code = 'MODULE_NOT_FOUND';
+    throw err;
 
-  return cmp(version, this.operator, this.semver, this.options)
-}
+    function loadAsFileSync(x) {
+        var pkg = loadpkg(path.dirname(x));
 
-Comparator.prototype.intersects = function (comp, options) {
-  if (!(comp instanceof Comparator)) {
-    throw new TypeError('a Comparator is required')
-  }
+        if (pkg && pkg.dir && pkg.pkg && opts.pathFilter) {
+            var rfile = path.relative(pkg.dir, x);
+            var r = opts.pathFilter(pkg.pkg, x, rfile);
+            if (r) {
+                x = path.resolve(pkg.dir, r); // eslint-disable-line no-param-reassign
+            }
+        }
 
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
+        if (isFile(x)) {
+            return x;
+        }
+
+        for (var i = 0; i < extensions.length; i++) {
+            var file = x + extensions[i];
+            if (isFile(file)) {
+                return file;
+            }
+        }
     }
-  }
 
-  var rangeTmp
+    function loadpkg(dir) {
+        if (dir === '' || dir === '/') return;
+        if (process.platform === 'win32' && (/^\w:[/\\]*$/).test(dir)) {
+            return;
+        }
+        if ((/[/\\]node_modules[/\\]*$/).test(dir)) return;
 
-  if (this.operator === '') {
-    rangeTmp = new Range(comp.value, options)
-    return satisfies(this.value, rangeTmp, options)
-  } else if (comp.operator === '') {
-    rangeTmp = new Range(this.value, options)
-    return satisfies(comp.semver, rangeTmp, options)
-  }
+        var pkgfile = path.join(dir, 'package.json');
 
-  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, options) &&
-    ((this.operator === '>=' || this.operator === '>') &&
-    (comp.operator === '<=' || comp.operator === '<'))
-  var oppositeDirectionsGreaterThan =
-    cmp(this.semver, '>', comp.semver, options) &&
-    ((this.operator === '<=' || this.operator === '<') &&
-    (comp.operator === '>=' || comp.operator === '>'))
+        if (!isFile(pkgfile)) {
+            return loadpkg(path.dirname(dir));
+        }
 
-  return sameDirectionIncreasing || sameDirectionDecreasing ||
-    (sameSemVer && differentDirectionsInclusive) ||
-    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
-}
+        var body = readFileSync(pkgfile);
 
-exports.Range = Range
-function Range (range, options) {
-  if (!options || typeof options !== 'object') {
-    options = {
-      loose: !!options,
-      includePrerelease: false
-    }
-  }
+        try {
+            var pkg = JSON.parse(body);
+        } catch (jsonErr) {}
 
-  if (range instanceof Range) {
-    if (range.loose === !!options.loose &&
-        range.includePrerelease === !!options.includePrerelease) {
-      return range
-    } else {
-      return new Range(range.raw, options)
+        if (pkg && opts.packageFilter) {
+            pkg = opts.packageFilter(pkg, dir);
+        }
+
+        return { pkg: pkg, dir: dir };
     }
-  }
 
-  if (range instanceof Comparator) {
-    return new Range(range.value, options)
-  }
+    function loadAsDirectorySync(x) {
+        var pkgfile = path.join(x, '/package.json');
+        if (isFile(pkgfile)) {
+            try {
+                var body = readFileSync(pkgfile, 'UTF8');
+                var pkg = JSON.parse(body);
+            } catch (e) {}
 
-  if (!(this instanceof Range)) {
-    return new Range(range, options)
-  }
+            if (opts.packageFilter) {
+                pkg = opts.packageFilter(pkg, x);
+            }
+
+            if (pkg.main) {
+                if (typeof pkg.main !== 'string') {
+                    var mainError = new TypeError('package “' + pkg.name + '” `main` must be a string');
+                    mainError.code = 'INVALID_PACKAGE_MAIN';
+                    throw mainError;
+                }
+                if (pkg.main === '.' || pkg.main === './') {
+                    pkg.main = 'index';
+                }
+                try {
+                    var m = loadAsFileSync(path.resolve(x, pkg.main));
+                    if (m) return m;
+                    var n = loadAsDirectorySync(path.resolve(x, pkg.main));
+                    if (n) return n;
+                } catch (e) {}
+            }
+        }
 
-  this.options = options
-  this.loose = !!options.loose
-  this.includePrerelease = !!options.includePrerelease
+        return loadAsFileSync(path.join(x, '/index'));
+    }
 
-  // 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
-  })
+    function loadNodeModulesSync(x, start) {
+        var dirs = nodeModulesPaths(start, opts, x);
+        for (var i = 0; i < dirs.length; i++) {
+            var dir = dirs[i];
+            var m = loadAsFileSync(path.join(dir, '/', x));
+            if (m) return m;
+            var n = loadAsDirectorySync(path.join(dir, '/', x));
+            if (n) return n;
+        }
+    }
+};
 
-  if (!this.set.length) {
-    throw new TypeError('Invalid SemVer Range: ' + range)
-  }
 
-  this.format()
-}
+/***/ }),
+/* 540 */
+/***/ (function(module, exports) {
 
-Range.prototype.format = function () {
-  this.range = this.set.map(function (comps) {
-    return comps.join(' ').trim()
-  }).join('||').trim()
-  return this.range
-}
+module.exports = extractDescription
 
-Range.prototype.toString = function () {
-  return this.range
+// Extracts description from contents of a readme file in markdown format
+function extractDescription (d) {
+  if (!d) return;
+  if (d === "ERROR: No README data found!") return;
+  // the first block of text before the first heading
+  // that isn't the first line heading
+  d = d.trim().split('\n')
+  for (var s = 0; d[s] && d[s].trim().match(/^(#|$)/); s ++);
+  var l = d.length
+  for (var e = s + 1; e < l && d[e].trim(); e ++);
+  return d.slice(s, e).join(' ').trim()
 }
 
-Range.prototype.parseRange = function (range) {
-  var loose = this.options.loose
-  range = range.trim()
-  // `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])
 
-  // `~ 1.2.3` => `~1.2.3`
-  range = range.replace(re[TILDETRIM], tildeTrimReplace)
+/***/ }),
+/* 541 */
+/***/ (function(module) {
 
-  // `^ 1.2.3` => `^1.2.3`
-  range = range.replace(re[CARETTRIM], caretTrimReplace)
+module.exports = JSON.parse("{\"topLevel\":{\"dependancies\":\"dependencies\",\"dependecies\":\"dependencies\",\"depdenencies\":\"dependencies\",\"devEependencies\":\"devDependencies\",\"depends\":\"dependencies\",\"dev-dependencies\":\"devDependencies\",\"devDependences\":\"devDependencies\",\"devDepenencies\":\"devDependencies\",\"devdependencies\":\"devDependencies\",\"repostitory\":\"repository\",\"repo\":\"repository\",\"prefereGlobal\":\"preferGlobal\",\"hompage\":\"homepage\",\"hampage\":\"homepage\",\"autohr\":\"author\",\"autor\":\"author\",\"contributers\":\"contributors\",\"publicationConfig\":\"publishConfig\",\"script\":\"scripts\"},\"bugs\":{\"web\":\"url\",\"name\":\"url\"},\"script\":{\"server\":\"start\",\"tests\":\"test\"}}");
 
-  // normalize spaces
-  range = range.split(/\s+/).join(' ')
+/***/ }),
+/* 542 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // At this point, the range is completely trimmed and
-  // ready to be split into comparators.
+var util = __webpack_require__(29)
+var messages = __webpack_require__(543)
 
-  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
-  var set = range.split(' ').map(function (comp) {
-    return parseComparator(comp, this.options)
-  }, this).join(' ').split(/\s+/)
-  if (this.options.loose) {
-    // in loose mode, throw out any that are not valid comparators
-    set = set.filter(function (comp) {
-      return !!comp.match(compRe)
-    })
+module.exports = function() {
+  var args = Array.prototype.slice.call(arguments, 0)
+  var warningName = args.shift()
+  if (warningName == "typo") {
+    return makeTypoWarning.apply(null,args)
+  }
+  else {
+    var msgTemplate = messages[warningName] ? messages[warningName] : warningName + ": '%s'"
+    args.unshift(msgTemplate)
+    return util.format.apply(null, args)
   }
-  set = set.map(function (comp) {
-    return new Comparator(comp, this.options)
-  }, this)
-
-  return set
 }
 
-Range.prototype.intersects = function (range, options) {
-  if (!(range instanceof Range)) {
-    throw new TypeError('a Range is required')
+function makeTypoWarning (providedName, probableName, field) {
+  if (field) {
+    providedName = field + "['" + providedName + "']"
+    probableName = field + "['" + probableName + "']"
   }
-
-  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, options)
-        })
-      })
-    })
-  })
+  return util.format(messages.typo, providedName, probableName)
 }
 
-// Mostly just for testing and legacy API reasons
-exports.toComparators = toComparators
-function toComparators (range, options) {
-  return new Range(range, options).set.map(function (comp) {
-    return comp.map(function (c) {
-      return c.value
-    }).join(' ').trim().split(' ')
-  })
-}
 
-// 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, options) {
-  debug('comp', comp, options)
-  comp = replaceCarets(comp, options)
-  debug('caret', comp)
-  comp = replaceTildes(comp, options)
-  debug('tildes', comp)
-  comp = replaceXRanges(comp, options)
-  debug('xrange', comp)
-  comp = replaceStars(comp, options)
-  debug('stars', comp)
-  return comp
-}
+/***/ }),
+/* 543 */
+/***/ (function(module) {
 
-function isX (id) {
-  return !id || id.toLowerCase() === 'x' || id === '*'
-}
+module.exports = JSON.parse("{\"repositories\":\"'repositories' (plural) Not supported. Please pick one as the 'repository' field\",\"missingRepository\":\"No repository field.\",\"brokenGitUrl\":\"Probably broken git url: %s\",\"nonObjectScripts\":\"scripts must be an object\",\"nonStringScript\":\"script values must be string commands\",\"nonArrayFiles\":\"Invalid 'files' member\",\"invalidFilename\":\"Invalid filename in 'files' list: %s\",\"nonArrayBundleDependencies\":\"Invalid 'bundleDependencies' list. Must be array of package names\",\"nonStringBundleDependency\":\"Invalid bundleDependencies member: %s\",\"nonDependencyBundleDependency\":\"Non-dependency in bundleDependencies: %s\",\"nonObjectDependencies\":\"%s field must be an object\",\"nonStringDependency\":\"Invalid dependency: %s %s\",\"deprecatedArrayDependencies\":\"specifying %s as array is deprecated\",\"deprecatedModules\":\"modules field is deprecated\",\"nonArrayKeywords\":\"keywords should be an array of strings\",\"nonStringKeyword\":\"keywords should be an array of strings\",\"conflictingName\":\"%s is also the name of a node core module.\",\"nonStringDescription\":\"'description' field should be a string\",\"missingDescription\":\"No description\",\"missingReadme\":\"No README data\",\"missingLicense\":\"No license field.\",\"nonEmailUrlBugsString\":\"Bug string field must be url, email, or {email,url}\",\"nonUrlBugsUrlField\":\"bugs.url field must be a string url. Deleted.\",\"nonEmailBugsEmailField\":\"bugs.email field must be a string email. Deleted.\",\"emptyNormalizedBugs\":\"Normalized value of bugs field is an empty object. Deleted.\",\"nonUrlHomepage\":\"homepage field must be a string url. Deleted.\",\"invalidLicense\":\"license should be a valid SPDX license expression\",\"typo\":\"%s should probably be %s.\"}");
 
-// ~, ~> --> * (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, options) {
-  return comp.trim().split(/\s+/).map(function (comp) {
-    return replaceTilde(comp, options)
-  }).join(' ')
-}
+/***/ }),
+/* 544 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function replaceTilde (comp, options) {
-  var r = options.loose ? re[TILDELOOSE] : re[TILDE]
-  return comp.replace(r, function (_, M, m, p, pr) {
-    debug('tilde', comp, _, M, m, p, pr)
-    var ret
+"use strict";
 
-    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)
-      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'
-    }
+const path = __webpack_require__(16);
+const writeJsonFile = __webpack_require__(545);
+const sortKeys = __webpack_require__(557);
 
-    debug('tilde return', ret)
-    return ret
-  })
-}
+const dependencyKeys = new Set([
+	'dependencies',
+	'devDependencies',
+	'optionalDependencies',
+	'peerDependencies'
+]);
 
-// ^ --> * (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, options) {
-  return comp.trim().split(/\s+/).map(function (comp) {
-    return replaceCaret(comp, options)
-  }).join(' ')
+function normalize(packageJson) {
+	const result = {};
+
+	for (const key of Object.keys(packageJson)) {
+		if (!dependencyKeys.has(key)) {
+			result[key] = packageJson[key];
+		} else if (Object.keys(packageJson[key]).length !== 0) {
+			result[key] = sortKeys(packageJson[key]);
+		}
+	}
+
+	return result;
 }
 
-function replaceCaret (comp, options) {
-  debug('caret', comp, options)
-  var r = options.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 (filePath, data, options) => {
+	if (typeof filePath !== 'string') {
+		options = data;
+		data = filePath;
+		filePath = '.';
+	}
 
-    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 (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'
-      }
-    }
+	options = {
+		normalize: true,
+		...options,
+		detectIndent: true
+	};
 
-    debug('caret return', ret)
-    return ret
-  })
-}
+	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
 
-function replaceXRanges (comp, options) {
-  debug('replaceXRanges', comp, options)
-  return comp.split(/\s+/).map(function (comp) {
-    return replaceXRange(comp, options)
-  }).join(' ')
-}
+	data = options.normalize ? normalize(data) : data;
 
-function replaceXRange (comp, options) {
-  comp = comp.trim()
-  var r = options.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
+	return writeJsonFile(filePath, data, options);
+};
 
-    if (gtlt === '=' && anyX) {
-      gtlt = ''
-    }
+module.exports.sync = (filePath, data, options) => {
+	if (typeof filePath !== 'string') {
+		options = data;
+		data = filePath;
+		filePath = '.';
+	}
 
-    if (xM) {
-      if (gtlt === '>' || gtlt === '<') {
-        // nothing is allowed
-        ret = '<0.0.0'
-      } else {
-        // nothing is forbidden
-        ret = '*'
-      }
-    } else if (gtlt && anyX) {
-      // we know patch is an x, because we have any x at all.
-      // replace X with 0
-      if (xm) {
-        m = 0
-      }
-      p = 0
+	options = {
+		normalize: true,
+		...options,
+		detectIndent: true
+	};
 
-      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 {
-          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
-        }
-      }
+	filePath = path.basename(filePath) === 'package.json' ? filePath : path.join(filePath, 'package.json');
 
-      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'
-    }
+	data = options.normalize ? normalize(data) : data;
 
-    debug('xRange return', ret)
+	writeJsonFile.sync(filePath, data, options);
+};
 
-    return ret
-  })
-}
 
-// Because * is AND-ed with everything else in the comparator,
-// and '' means "any version", just remove the *s entirely.
-function replaceStars (comp, options) {
-  debug('replaceStars', comp, options)
-  // Looseness is ignored here.  star is always as loose as it gets!
-  return comp.trim().replace(re[STAR], '')
-}
+/***/ }),
+/* 545 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// 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) {
-  if (isX(fM)) {
-    from = ''
-  } else if (isX(fm)) {
-    from = '>=' + fM + '.0.0'
-  } else if (isX(fp)) {
-    from = '>=' + fM + '.' + fm + '.0'
-  } else {
-    from = '>=' + from
-  }
+"use strict";
 
-  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
-  }
+const path = __webpack_require__(16);
+const fs = __webpack_require__(546);
+const writeFileAtomic = __webpack_require__(550);
+const sortKeys = __webpack_require__(557);
+const makeDir = __webpack_require__(559);
+const pify = __webpack_require__(562);
+const detectIndent = __webpack_require__(563);
 
-  return (from + ' ' + to).trim()
-}
+const init = (fn, filePath, data, options) => {
+	if (!filePath) {
+		throw new TypeError('Expected a filepath');
+	}
 
-// if ANY of the sets match ALL of its comparators, then pass
-Range.prototype.test = function (version) {
-  if (!version) {
-    return false
-  }
+	if (data === undefined) {
+		throw new TypeError('Expected data to stringify');
+	}
 
-  if (typeof version === 'string') {
-    version = new SemVer(version, this.options)
-  }
+	options = Object.assign({
+		indent: '\t',
+		sortKeys: false
+	}, options);
 
-  for (var i = 0; i < this.set.length; i++) {
-    if (testSet(this.set[i], version, this.options)) {
-      return true
-    }
-  }
-  return false
-}
+	if (options.sortKeys) {
+		data = sortKeys(data, {
+			deep: true,
+			compare: typeof options.sortKeys === 'function' ? options.sortKeys : undefined
+		});
+	}
 
-function testSet (set, version, options) {
-  for (var i = 0; i < set.length; i++) {
-    if (!set[i].test(version)) {
-      return false
-    }
-  }
+	return fn(filePath, data, options);
+};
 
-  if (version.prerelease.length && !options.includePrerelease) {
-    // 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 (i = 0; i < set.length; i++) {
-      debug(set[i].semver)
-      if (set[i].semver === ANY) {
-        continue
-      }
+const readFile = filePath => pify(fs.readFile)(filePath, 'utf8').catch(() => {});
 
-      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
-        }
-      }
-    }
+const main = (filePath, data, options) => {
+	return (options.detectIndent ? readFile(filePath) : Promise.resolve())
+		.then(string => {
+			const indent = string ? detectIndent(string).indent : options.indent;
+			const json = JSON.stringify(data, options.replacer, indent);
 
-    // Version has a -pre, but it's not one of the ones we like.
-    return false
-  }
+			return pify(writeFileAtomic)(filePath, `${json}\n`, {mode: options.mode});
+		});
+};
 
-  return true
-}
+const mainSync = (filePath, data, options) => {
+	let {indent} = options;
 
-exports.satisfies = satisfies
-function satisfies (version, range, options) {
-  try {
-    range = new Range(range, options)
-  } catch (er) {
-    return false
-  }
-  return range.test(version)
-}
+	if (options.detectIndent) {
+		try {
+			const file = fs.readFileSync(filePath, 'utf8');
+			indent = detectIndent(file).indent;
+		} catch (error) {
+			if (error.code !== 'ENOENT') {
+				throw error;
+			}
+		}
+	}
 
-exports.maxSatisfying = maxSatisfying
-function maxSatisfying (versions, range, options) {
-  var max = null
-  var maxSV = null
-  try {
-    var rangeObj = new Range(range, options)
-  } catch (er) {
-    return null
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) {
-      // satisfies(v, range, options)
-      if (!max || maxSV.compare(v) === -1) {
-        // compare(max, v, true)
-        max = v
-        maxSV = new SemVer(max, options)
-      }
-    }
-  })
-  return max
-}
+	const json = JSON.stringify(data, options.replacer, indent);
 
-exports.minSatisfying = minSatisfying
-function minSatisfying (versions, range, options) {
-  var min = null
-  var minSV = null
-  try {
-    var rangeObj = new Range(range, options)
-  } catch (er) {
-    return null
-  }
-  versions.forEach(function (v) {
-    if (rangeObj.test(v)) {
-      // satisfies(v, range, options)
-      if (!min || minSV.compare(v) === 1) {
-        // compare(min, v, true)
-        min = v
-        minSV = new SemVer(min, options)
-      }
-    }
-  })
-  return min
-}
+	return writeFileAtomic.sync(filePath, `${json}\n`, {mode: options.mode});
+};
 
-exports.minVersion = minVersion
-function minVersion (range, loose) {
-  range = new Range(range, loose)
+const writeJsonFile = (filePath, data, options) => {
+	return makeDir(path.dirname(filePath), {fs})
+		.then(() => init(main, filePath, data, options));
+};
 
-  var minver = new SemVer('0.0.0')
-  if (range.test(minver)) {
-    return minver
-  }
+module.exports = writeJsonFile;
+// TODO: Remove this for the next major release
+module.exports.default = writeJsonFile;
+module.exports.sync = (filePath, data, options) => {
+	makeDir.sync(path.dirname(filePath), {fs});
+	init(mainSync, filePath, data, options);
+};
 
-  minver = new SemVer('0.0.0-0')
-  if (range.test(minver)) {
-    return minver
-  }
 
-  minver = null
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
+/***/ }),
+/* 546 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    comparators.forEach(function (comparator) {
-      // Clone to avoid manipulating the comparator's semver object.
-      var compver = new SemVer(comparator.semver.version)
-      switch (comparator.operator) {
-        case '>':
-          if (compver.prerelease.length === 0) {
-            compver.patch++
-          } else {
-            compver.prerelease.push(0)
-          }
-          compver.raw = compver.format()
-          /* fallthrough */
-        case '':
-        case '>=':
-          if (!minver || gt(minver, compver)) {
-            minver = compver
-          }
-          break
-        case '<':
-        case '<=':
-          /* Ignore maximum versions */
-          break
-        /* istanbul ignore next */
-        default:
-          throw new Error('Unexpected operation: ' + comparator.operator)
-      }
-    })
-  }
+var fs = __webpack_require__(23)
+var polyfills = __webpack_require__(547)
+var legacy = __webpack_require__(548)
+var clone = __webpack_require__(549)
 
-  if (minver && range.test(minver)) {
-    return minver
-  }
+var queue = []
 
-  return null
-}
+var util = __webpack_require__(29)
 
-exports.validRange = validRange
-function validRange (range, options) {
-  try {
-    // Return '*' instead of '' so that truthiness works.
-    // This will throw if it's invalid anyway
-    return new Range(range, options).range || '*'
-  } catch (er) {
-    return null
+function noop () {}
+
+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)
   }
-}
 
-// Determine if version is less than all the versions possible in the range
-exports.ltr = ltr
-function ltr (version, range, options) {
-  return outside(version, range, '<', options)
+if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
+  process.on('exit', function() {
+    debug(queue)
+    __webpack_require__(30).equal(queue.length, 0)
+  })
 }
 
-// Determine if version is greater than all the versions possible in the range.
-exports.gtr = gtr
-function gtr (version, range, options) {
-  return outside(version, range, '>', options)
+module.exports = patch(clone(fs))
+if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
+    module.exports = patch(fs)
+    fs.__patched = true;
 }
 
-exports.outside = outside
-function outside (version, range, hilo, options) {
-  version = new SemVer(version, options)
-  range = new Range(range, options)
-
-  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 ">"')
-  }
+// Always patch fs.close/closeSync, because we want 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.
+module.exports.close = (function (fs$close) { return function (fd, cb) {
+  return fs$close.call(fs, fd, function (err) {
+    if (!err)
+      retry()
 
-  // If it satisifes the range it is not outside
-  if (satisfies(version, range, options)) {
-    return false
-  }
+    if (typeof cb === 'function')
+      cb.apply(this, arguments)
+  })
+}})(fs.close)
 
-  // From now on, variable terms are as if we're in "gtr" mode.
-  // but note that everything is flipped for the "ltr" function.
+module.exports.closeSync = (function (fs$closeSync) { return function (fd) {
+  // Note that graceful-fs also retries when fs.closeSync() fails.
+  // Looks like a bug to me, although it's probably a harmless one.
+  var rval = fs$closeSync.apply(fs, arguments)
+  retry()
+  return rval
+}})(fs.closeSync)
 
-  for (var i = 0; i < range.set.length; ++i) {
-    var comparators = range.set[i]
+// Only patch fs once, otherwise we'll run into a memory leak if
+// graceful-fs is loaded multiple times, such as in test environments that
+// reset the loaded modules between tests.
+// We look for the string `graceful-fs` from the comment above. This
+// way we are not adding any extra properties and it will detect if older
+// versions of graceful-fs are installed.
+if (!/\bgraceful-fs\b/.test(fs.closeSync.toString())) {
+  fs.closeSync = module.exports.closeSync;
+  fs.close = module.exports.close;
+}
 
-    var high = null
-    var low = null
+function patch (fs) {
+  // Everything that references the open() function needs to be in here
+  polyfills(fs)
+  fs.gracefulify = patch
+  fs.FileReadStream = ReadStream;  // Legacy name.
+  fs.FileWriteStream = WriteStream;  // Legacy name.
+  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
 
-    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, options)) {
-        high = comparator
-      } else if (ltfn(comparator.semver, low.semver, options)) {
-        low = comparator
-      }
-    })
+    return go$readFile(path, options, cb)
 
-    // If the edge version comparator has a operator then our version
-    // isn't outside it
-    if (high.operator === comp || high.operator === ecomp) {
-      return false
+    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()
+        }
+      })
     }
+  }
 
-    // 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
+  var fs$writeFile = fs.writeFile
+  fs.writeFile = writeFile
+  function writeFile (path, data, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
+
+    return go$writeFile(path, data, options, cb)
+
+    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()
+        }
+      })
     }
   }
-  return true
-}
 
-exports.prerelease = prerelease
-function prerelease (version, options) {
-  var parsed = parse(version, options)
-  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
-}
+  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
 
-exports.intersects = intersects
-function intersects (r1, r2, options) {
-  r1 = new Range(r1, options)
-  r2 = new Range(r2, options)
-  return r1.intersects(r2)
-}
+    return go$appendFile(path, data, options, cb)
 
-exports.coerce = coerce
-function coerce (version) {
-  if (version instanceof SemVer) {
-    return version
+    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()
+        }
+      })
+    }
   }
 
-  if (typeof version !== 'string') {
-    return null
-  }
+  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)
 
-  var match = version.match(re[COERCE])
+    return go$readdir(args)
 
-  if (match == null) {
-    return null
-  }
+    function go$readdir$cb (err, files) {
+      if (files && files.sort)
+        files.sort()
 
-  return parse(match[1] +
-    '.' + (match[2] || '0') +
-    '.' + (match[3] || '0'))
-}
+      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+        enqueue([go$readdir, [args]])
 
+      else {
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+        retry()
+      }
+    }
+  }
 
-/***/ }),
-/* 118 */
-/***/ (function(module, exports, __webpack_require__) {
+  function go$readdir (args) {
+    return fs$readdir.apply(fs, args)
+  }
 
-"use strict";
+  if (process.version.substr(0, 4) === 'v0.8') {
+    var legStreams = legacy(fs)
+    ReadStream = legStreams.ReadStream
+    WriteStream = legStreams.WriteStream
+  }
 
+  var fs$ReadStream = fs.ReadStream
+  if (fs$ReadStream) {
+    ReadStream.prototype = Object.create(fs$ReadStream.prototype)
+    ReadStream.prototype.open = ReadStream$open
+  }
 
-const processFn = (fn, options) => function (...args) {
-	const P = options.promiseModule;
+  var fs$WriteStream = fs.WriteStream
+  if (fs$WriteStream) {
+    WriteStream.prototype = Object.create(fs$WriteStream.prototype)
+    WriteStream.prototype.open = WriteStream$open
+  }
 
-	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);
-		}
+  fs.ReadStream = ReadStream
+  fs.WriteStream = WriteStream
 
-		fn.apply(this, args);
-	});
-};
+  function ReadStream (path, options) {
+    if (this instanceof ReadStream)
+      return fs$ReadStream.apply(this, arguments), this
+    else
+      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
+  }
 
-module.exports = (input, options) => {
-	options = Object.assign({
-		exclude: [/.+(Sync|Stream)$/],
-		errorFirst: true,
-		promiseModule: Promise
-	}, options);
+  function ReadStream$open () {
+    var that = this
+    open(that.path, that.flags, that.mode, function (err, fd) {
+      if (err) {
+        if (that.autoClose)
+          that.destroy()
 
-	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}\``);
-	}
+        that.emit('error', err)
+      } else {
+        that.fd = fd
+        that.emit('open', fd)
+        that.read()
+      }
+    })
+  }
 
-	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);
-	};
+  function WriteStream (path, options) {
+    if (this instanceof WriteStream)
+      return fs$WriteStream.apply(this, arguments), this
+    else
+      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
+  }
 
-	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));
-	}
+  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)
+      }
+    })
+  }
 
-	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;
-	}
+  function createReadStream (path, options) {
+    return new ReadStream(path, options)
+  }
 
-	return ret;
-};
+  function createWriteStream (path, options) {
+    return new WriteStream(path, options)
+  }
 
+  var fs$open = fs.open
+  fs.open = open
+  function open (path, flags, mode, cb) {
+    if (typeof mode === 'function')
+      cb = mode, mode = null
 
-/***/ }),
-/* 119 */
-/***/ (function(module, exports, __webpack_require__) {
+    return go$open(path, flags, mode, cb)
 
-"use strict";
+    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 fs
+}
 
-// detect either spaces or tabs but not both to properly handle tabs
-// for indentation and spaces for alignment
-const INDENT_RE = /^(?:( )+|\t+)/;
+function enqueue (elem) {
+  debug('ENQUEUE', elem[0].name, elem[1])
+  queue.push(elem)
+}
 
-function getMostUsed(indents) {
-	let result = 0;
-	let maxUsed = 0;
-	let maxWeight = 0;
+function retry () {
+  var elem = queue.shift()
+  if (elem) {
+    debug('RETRY', elem[0].name, elem[1])
+    elem[0].apply(null, elem[1])
+  }
+}
 
-	for (const entry of indents) {
-		// TODO: use destructuring when targeting Node.js 6
-		const key = entry[0];
-		const val = entry[1];
 
-		const u = val[0];
-		const w = val[1];
+/***/ }),
+/* 547 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		if (u > maxUsed || (u === maxUsed && w > maxWeight)) {
-			maxUsed = u;
-			maxWeight = w;
-			result = Number(key);
-		}
-	}
+var constants = __webpack_require__(25)
 
-	return result;
-}
+var origCwd = process.cwd
+var cwd = null
 
-module.exports = str => {
-	if (typeof str !== 'string') {
-		throw new TypeError('Expected a string');
-	}
+var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
 
-	// used to see if tabs or spaces are the most used
-	let tabs = 0;
-	let spaces = 0;
+process.cwd = function() {
+  if (!cwd)
+    cwd = origCwd.call(process)
+  return cwd
+}
+try {
+  process.cwd()
+} catch (er) {}
 
-	// remember the size of previous line's indentation
-	let prev = 0;
+var chdir = process.chdir
+process.chdir = function(d) {
+  cwd = null
+  chdir.call(process, d)
+}
 
-	// remember how many indents/unindents as occurred for a given size
-	// and how much lines follow a given indentation
-	//
-	// indents = {
-	//    3: [1, 0],
-	//    4: [1, 5],
-	//    5: [1, 0],
-	//   12: [1, 0],
-	// }
-	const indents = new Map();
+module.exports = patch
 
-	// pointer to the array of last used indent
-	let current;
+function patch (fs) {
+  // (re-)implement some things that are known busted or missing.
 
-	// whether the last action was an indent (opposed to an unindent)
-	let isIndent;
+  // 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)
+  }
 
-	for (const line of str.split(/\n/g)) {
-		if (!line) {
-			// ignore empty lines
-			continue;
-		}
+  // lutimes implementation, or no-op
+  if (!fs.lutimes) {
+    patchLutimes(fs)
+  }
 
-		let indent;
-		const matches = line.match(INDENT_RE);
+  // 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.
 
-		if (matches) {
-			indent = matches[0].length;
+  fs.chown = chownFix(fs.chown)
+  fs.fchown = chownFix(fs.fchown)
+  fs.lchown = chownFix(fs.lchown)
 
-			if (matches[1]) {
-				spaces++;
-			} else {
-				tabs++;
-			}
-		} else {
-			indent = 0;
-		}
+  fs.chmod = chmodFix(fs.chmod)
+  fs.fchmod = chmodFix(fs.fchmod)
+  fs.lchmod = chmodFix(fs.lchmod)
 
-		const diff = indent - prev;
-		prev = indent;
+  fs.chownSync = chownFixSync(fs.chownSync)
+  fs.fchownSync = chownFixSync(fs.fchownSync)
+  fs.lchownSync = chownFixSync(fs.lchownSync)
 
-		if (diff) {
-			// an indent or unindent has been detected
+  fs.chmodSync = chmodFixSync(fs.chmodSync)
+  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
+  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
 
-			isIndent = diff > 0;
+  fs.stat = statFix(fs.stat)
+  fs.fstat = statFix(fs.fstat)
+  fs.lstat = statFix(fs.lstat)
 
-			current = indents.get(isIndent ? diff : -diff);
+  fs.statSync = statFixSync(fs.statSync)
+  fs.fstatSync = statFixSync(fs.fstatSync)
+  fs.lstatSync = statFixSync(fs.lstatSync)
 
-			if (current) {
-				current[0]++;
-			} else {
-				current = [1, 0];
-				indents.set(diff, current);
-			}
-		} else if (current) {
-			// if the last action was an indent, increment the weight
-			current[1] += Number(isIndent);
-		}
-	}
+  // 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 () {}
+  }
 
-	const amount = getMostUsed(indents);
+  // 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.
 
-	let type;
-	let indent;
-	if (!amount) {
-		type = null;
-		indent = '';
-	} else if (spaces >= tabs) {
-		type = 'space';
-		indent = ' '.repeat(amount);
-	} else {
-		type = 'tab';
-		indent = '\t'.repeat(amount);
-	}
+  // 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)
+  }
 
-	return {
-		amount,
-		type,
-		indent
-	};
-};
+  // if read() returns EAGAIN, then just try it again.
+  fs.read = (function (fs$read) { return function (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)
+  }})(fs.read)
 
+  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)
 
-/***/ }),
-/* 120 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  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)
+          })
+        })
+      })
+    }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "installInDir", function() { return installInDir; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackage", function() { return runScriptInPackage; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackageStreaming", function() { return runScriptInPackageStreaming; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yarnWorkspacesInfo", function() { return yarnWorkspacesInfo; });
-/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(121);
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+    fs.lchmodSync = function (path, mode) {
+      var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
 
+      // 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
+    }
+  }
 
-/**
- * Install all dependencies in the given directory
- */
-async function installInDir(directory, extraArgs = []) {
-  const options = ['install', '--non-interactive', ...extraArgs]; // We pass the mutex flag to ensure only one instance of yarn runs at any
-  // given time (e.g. to avoid conflicts).
+  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)
+            })
+          })
+        })
+      }
 
-  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])('yarn', options, {
-    cwd: directory
-  });
-}
-/**
- * Run script in the given directory
- */
+      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
+      }
 
-async function runScriptInPackage(script, args, pkg) {
-  const execOpts = {
-    cwd: pkg.path
-  };
-  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])('yarn', ['run', script, ...args], execOpts);
-}
-/**
- * Run script in the given directory
- */
+    } else {
+      fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
+      fs.lutimesSync = function () {}
+    }
+  }
 
-function runScriptInPackageStreaming(script, args, pkg) {
-  const execOpts = {
-    cwd: pkg.path
-  };
-  return Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawnStreaming"])('yarn', ['run', script, ...args], execOpts, {
-    prefix: pkg.name
-  });
-}
-async function yarnWorkspacesInfo(directory) {
-  const workspacesInfo = await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])('yarn', ['workspaces', 'info', '--json'], {
-    cwd: directory,
-    stdio: 'pipe'
-  });
-  const stdout = JSON.parse(workspacesInfo.stdout);
-  return JSON.parse(stdout.data);
-}
+  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)
+      })
+    }
+  }
 
-/***/ }),
-/* 121 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  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
+      }
+    }
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "spawn", function() { return spawn; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "spawnStreaming", function() { return spawnStreaming; });
-/* 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 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__(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__(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; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+  function 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)
+      })
+    }
+  }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+  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
+      }
+    }
+  }
 
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
 
+  function statFix (orig) {
+    if (!orig) return orig
+    // Older versions of Node erroneously returned signed integers for
+    // uid + gid.
+    return function (target, cb) {
+      return orig.call(fs, target, function (er, stats) {
+        if (!stats) return cb.apply(this, arguments)
+        if (stats.uid < 0) stats.uid += 0x100000000
+        if (stats.gid < 0) stats.gid += 0x100000000
+        if (cb) cb.apply(this, arguments)
+      })
+    }
+  }
+
+  function statFixSync (orig) {
+    if (!orig) return orig
+    // Older versions of Node erroneously returned signed integers for
+    // uid + gid.
+    return function (target) {
+      var stats = orig.call(fs, target)
+      if (stats.uid < 0) stats.uid += 0x100000000
+      if (stats.gid < 0) stats.gid += 0x100000000
+      return stats;
+    }
+  }
 
+  // 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 (er.code === "ENOSYS")
+      return true
 
+    var nonroot = !process.getuid || process.getuid() !== 0
+    if (nonroot) {
+      if (er.code === "EINVAL" || er.code === "EPERM")
+        return true
+    }
 
-function generateColors() {
-  const colorWheel = [chalk__WEBPACK_IMPORTED_MODULE_0___default.a.cyan, chalk__WEBPACK_IMPORTED_MODULE_0___default.a.magenta, chalk__WEBPACK_IMPORTED_MODULE_0___default.a.blue, chalk__WEBPACK_IMPORTED_MODULE_0___default.a.yellow, chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green];
-  const count = colorWheel.length;
-  let children = 0;
-  return () => colorWheel[children++ % count];
+    return false
+  }
 }
 
-function spawn(command, args, opts) {
-  return execa__WEBPACK_IMPORTED_MODULE_1___default()(command, args, _objectSpread({
-    stdio: 'inherit',
-    preferLocal: true
-  }, opts));
-}
-const nextColor = generateColors();
-function spawnStreaming(command, args, opts, {
-  prefix
-}) {
-  const spawned = execa__WEBPACK_IMPORTED_MODULE_1___default()(command, args, _objectSpread({
-    stdio: ['ignore', 'pipe', 'pipe'],
-    preferLocal: true
-  }, opts));
-  const color = nextColor();
-  const prefixedStdout = strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default()({
-    tag: `${color.bold(prefix)}:`
-  });
-  const prefixedStderr = strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default()({
-    mergeMultiline: true,
-    tag: `${log_symbols__WEBPACK_IMPORTED_MODULE_2___default.a.error} ${color.bold(prefix)}:`
-  });
-  spawned.stdout.pipe(prefixedStdout).pipe(process.stdout);
-  spawned.stderr.pipe(prefixedStderr).pipe(process.stderr);
-  return spawned;
-}
 
 /***/ }),
-/* 122 */
+/* 548 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var Stream = __webpack_require__(27).Stream
 
-const path = __webpack_require__(16);
-const childProcess = __webpack_require__(123);
-const crossSpawn = __webpack_require__(124);
-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);
+module.exports = legacy
 
-const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100;
+function legacy (fs) {
+  return {
+    ReadStream: ReadStream,
+    WriteStream: WriteStream
+  }
 
-const getEnv = ({env: envOption, extendEnv, preferLocal, localDir, execPath}) => {
-	const env = extendEnv ? {...process.env, ...envOption} : envOption;
+  function ReadStream (path, options) {
+    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
 
-	if (preferLocal) {
-		return npmRunPath.env({env, cwd: localDir, execPath});
-	}
+    Stream.call(this);
 
-	return env;
-};
+    var self = this;
 
-const handleArgs = (file, args, options = {}) => {
-	const parsed = crossSpawn._parse(file, args, options);
-	file = parsed.command;
-	args = parsed.args;
-	options = parsed.options;
+    this.path = path;
+    this.fd = null;
+    this.readable = true;
+    this.paused = false;
 
-	options = {
-		maxBuffer: DEFAULT_MAX_BUFFER,
-		buffer: true,
-		stripFinalNewline: true,
-		extendEnv: true,
-		preferLocal: false,
-		localDir: options.cwd || process.cwd(),
-		execPath: process.execPath,
-		encoding: 'utf8',
-		reject: true,
-		cleanup: true,
-		all: false,
-		...options,
-		windowsHide: true
-	};
+    this.flags = 'r';
+    this.mode = 438; /*=0666*/
+    this.bufferSize = 64 * 1024;
 
-	options.env = getEnv(options);
+    options = options || {};
 
-	options.stdio = normalizeStdio(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];
+    }
 
-	if (process.platform === 'win32' && path.basename(file, '.exe') === 'cmd') {
-		// #116
-		args.unshift('/q');
-	}
+    if (this.encoding) this.setEncoding(this.encoding);
 
-	return {file, args, options, parsed};
-};
+    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');
+      }
 
-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 : '';
-	}
+      if (this.start > this.end) {
+        throw new Error('start must be <= end');
+      }
 
-	if (options.stripFinalNewline) {
-		return stripFinalNewline(value);
-	}
+      this.pos = this.start;
+    }
 
-	return value;
-};
+    if (this.fd !== null) {
+      process.nextTick(function() {
+        self._read();
+      });
+      return;
+    }
 
-const execa = (file, args, options) => {
-	const parsed = handleArgs(file, args, options);
-	const command = joinCommand(file, args);
+    fs.open(this.path, this.flags, this.mode, function (err, fd) {
+      if (err) {
+        self.emit('error', err);
+        self.readable = false;
+        return;
+      }
 
-	let spawned;
-	try {
-		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);
-	}
+      self.fd = fd;
+      self.emit('open', fd);
+      self._read();
+    })
+  }
 
-	const spawnedPromise = getSpawnedPromise(spawned);
-	const timedPromise = setupTimeout(spawned, parsed.options, spawnedPromise);
-	const processDone = setExitHandler(spawned, parsed.options, timedPromise);
+  function WriteStream (path, options) {
+    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
 
-	const context = {isCanceled: false};
+    Stream.call(this);
 
-	spawned.kill = spawnedKill.bind(null, spawned.kill.bind(spawned));
-	spawned.cancel = spawnedCancel.bind(null, spawned, context);
+    this.path = path;
+    this.fd = null;
+    this.writable = true;
 
-	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);
+    this.flags = 'w';
+    this.encoding = 'binary';
+    this.mode = 438; /*=0666*/
+    this.bytesWritten = 0;
 
-		if (error || exitCode !== 0 || signal !== null) {
-			const returnedError = makeError({
-				error,
-				exitCode,
-				signal,
-				stdout,
-				stderr,
-				all,
-				command,
-				parsed,
-				timedOut,
-				isCanceled: context.isCanceled,
-				killed: spawned.killed
-			});
+    options = options || {};
 
-			if (!parsed.options.reject) {
-				return returnedError;
-			}
+    // 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];
+    }
 
-			throw returnedError;
-		}
+    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');
+      }
 
-		return {
-			command,
-			exitCode: 0,
-			stdout,
-			stderr,
-			all,
-			failed: false,
-			timedOut: false,
-			isCanceled: false,
-			killed: false
-		};
-	};
+      this.pos = this.start;
+    }
 
-	const handlePromiseOnce = onetime(handlePromise);
+    this.busy = false;
+    this._queue = [];
 
-	crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed);
+    if (this.fd === null) {
+      this._open = fs.open;
+      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
+      this.flush();
+    }
+  }
+}
 
-	handleInput(spawned, parsed.options.input);
 
-	spawned.all = makeAllStream(spawned, parsed.options);
+/***/ }),
+/* 549 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return mergePromise(spawned, handlePromiseOnce);
-};
+"use strict";
 
-module.exports = execa;
 
-module.exports.sync = (file, args, options) => {
-	const parsed = handleArgs(file, args, options);
-	const command = joinCommand(file, args);
+module.exports = clone
 
-	validateInputSync(parsed.options);
+function clone (obj) {
+  if (obj === null || typeof obj !== 'object')
+    return obj
 
-	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
-		});
-	}
+  if (obj instanceof Object)
+    var copy = { __proto__: obj.__proto__ }
+  else
+    var copy = Object.create(null)
 
-	const stdout = handleOutput(parsed.options, result.stdout, result.error);
-	const stderr = handleOutput(parsed.options, result.stderr, result.error);
+  Object.getOwnPropertyNames(obj).forEach(function (key) {
+    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
+  })
 
-	if (result.error || result.status !== 0 || result.signal !== null) {
-		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
-		});
+  return copy
+}
 
-		if (!parsed.options.reject) {
-			return error;
-		}
 
-		throw error;
-	}
+/***/ }),
+/* 550 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return {
-		command,
-		exitCode: 0,
-		stdout,
-		stderr,
-		failed: false,
-		timedOut: false,
-		isCanceled: false,
-		killed: false
-	};
-};
+"use strict";
 
-module.exports.command = (command, options) => {
-	const [file, ...args] = parseCommand(command);
-	return execa(file, args, options);
-};
+module.exports = writeFile
+module.exports.sync = writeFileSync
+module.exports._getTmpname = getTmpname // for testing
+module.exports._cleanupOnExit = cleanupOnExit
 
-module.exports.commandSync = (command, options) => {
-	const [file, ...args] = parseCommand(command);
-	return execa.sync(file, args, options);
-};
+var fs = __webpack_require__(551)
+var MurmurHash3 = __webpack_require__(555)
+var onExit = __webpack_require__(377)
+var path = __webpack_require__(16)
+var activeFiles = {}
 
-module.exports.node = (scriptPath, args, options = {}) => {
-	if (args && !Array.isArray(args) && typeof args === 'object') {
-		options = args;
-		args = [];
-	}
+// if we run inside of a worker_thread, `process.pid` is not unique
+/* istanbul ignore next */
+var threadId = (function getId () {
+  try {
+    var workerThreads = __webpack_require__(556)
 
-	const stdio = normalizeStdio.node(options);
+    /// if we are in main thread, this is set to `0`
+    return workerThreads.threadId
+  } catch (e) {
+    // worker_threads are not available, fallback to 0
+    return 0
+  }
+})()
 
-	const {nodePath = process.execPath, nodeOptions = process.execArgv} = options;
+var invocations = 0
+function getTmpname (filename) {
+  return filename + '.' +
+    MurmurHash3(__filename)
+      .hash(String(process.pid))
+      .hash(String(threadId))
+      .hash(String(++invocations))
+      .result()
+}
 
-	return execa(
-		nodePath,
-		[
-			...nodeOptions,
-			scriptPath,
-			...(Array.isArray(args) ? args : [])
-		],
-		{
-			...options,
-			stdin: undefined,
-			stdout: undefined,
-			stderr: undefined,
-			stdio,
-			shell: false
-		}
-	);
-};
+function cleanupOnExit (tmpfile) {
+  return function () {
+    try {
+      fs.unlinkSync(typeof tmpfile === 'function' ? tmpfile() : tmpfile)
+    } catch (_) {}
+  }
+}
+
+function writeFile (filename, data, options, callback) {
+  if (options) {
+    if (options instanceof Function) {
+      callback = options
+      options = {}
+    } else if (typeof options === 'string') {
+      options = { encoding: options }
+    }
+  } else {
+    options = {}
+  }
+
+  var Promise = options.Promise || global.Promise
+  var truename
+  var fd
+  var tmpfile
+  /* istanbul ignore next -- The closure only gets called when onExit triggers */
+  var removeOnExitHandler = onExit(cleanupOnExit(() => tmpfile))
+  var absoluteName = path.resolve(filename)
+
+  new Promise(function serializeSameFile (resolve) {
+    // make a queue if it doesn't already exist
+    if (!activeFiles[absoluteName]) activeFiles[absoluteName] = []
+
+    activeFiles[absoluteName].push(resolve) // add this job to the queue
+    if (activeFiles[absoluteName].length === 1) resolve() // kick off the first one
+  }).then(function getRealPath () {
+    return new Promise(function (resolve) {
+      fs.realpath(filename, function (_, realname) {
+        truename = realname || filename
+        tmpfile = getTmpname(truename)
+        resolve()
+      })
+    })
+  }).then(function stat () {
+    return new Promise(function stat (resolve) {
+      if (options.mode && options.chown) resolve()
+      else {
+        // Either mode or chown is not explicitly set
+        // Default behavior is to copy it from original file
+        fs.stat(truename, function (err, stats) {
+          if (err || !stats) resolve()
+          else {
+            options = Object.assign({}, options)
+
+            if (options.mode == null) {
+              options.mode = stats.mode
+            }
+            if (options.chown == null && process.getuid) {
+              options.chown = { uid: stats.uid, gid: stats.gid }
+            }
+            resolve()
+          }
+        })
+      }
+    })
+  }).then(function thenWriteFile () {
+    return new Promise(function (resolve, reject) {
+      fs.open(tmpfile, 'w', options.mode, function (err, _fd) {
+        fd = _fd
+        if (err) reject(err)
+        else resolve()
+      })
+    })
+  }).then(function write () {
+    return new Promise(function (resolve, reject) {
+      if (Buffer.isBuffer(data)) {
+        fs.write(fd, data, 0, data.length, 0, function (err) {
+          if (err) reject(err)
+          else resolve()
+        })
+      } else if (data != null) {
+        fs.write(fd, String(data), 0, String(options.encoding || 'utf8'), function (err) {
+          if (err) reject(err)
+          else resolve()
+        })
+      } else resolve()
+    })
+  }).then(function syncAndClose () {
+    return new Promise(function (resolve, reject) {
+      if (options.fsync !== false) {
+        fs.fsync(fd, function (err) {
+          if (err) fs.close(fd, () => reject(err))
+          else fs.close(fd, resolve)
+        })
+      } else {
+        fs.close(fd, resolve)
+      }
+    })
+  }).then(function chown () {
+    fd = null
+    if (options.chown) {
+      return new Promise(function (resolve, reject) {
+        fs.chown(tmpfile, options.chown.uid, options.chown.gid, function (err) {
+          if (err) reject(err)
+          else resolve()
+        })
+      })
+    }
+  }).then(function chmod () {
+    if (options.mode) {
+      return new Promise(function (resolve, reject) {
+        fs.chmod(tmpfile, options.mode, function (err) {
+          if (err) reject(err)
+          else resolve()
+        })
+      })
+    }
+  }).then(function rename () {
+    return new Promise(function (resolve, reject) {
+      fs.rename(tmpfile, truename, function (err) {
+        if (err) reject(err)
+        else resolve()
+      })
+    })
+  }).then(function success () {
+    removeOnExitHandler()
+    callback()
+  }, function fail (err) {
+    return new Promise(resolve => {
+      return fd ? fs.close(fd, resolve) : resolve()
+    }).then(() => {
+      removeOnExitHandler()
+      fs.unlink(tmpfile, function () {
+        callback(err)
+      })
+    })
+  }).then(function checkQueue () {
+    activeFiles[absoluteName].shift() // remove the element added by serializeSameFile
+    if (activeFiles[absoluteName].length > 0) {
+      activeFiles[absoluteName][0]() // start next job if one is pending
+    } else delete activeFiles[absoluteName]
+  })
+}
+
+function writeFileSync (filename, data, options) {
+  if (typeof options === 'string') options = { encoding: options }
+  else if (!options) options = {}
+  try {
+    filename = fs.realpathSync(filename)
+  } catch (ex) {
+    // it's ok, it'll happen on a not yet existing file
+  }
+  var tmpfile = getTmpname(filename)
+
+  if (!options.mode || !options.chown) {
+    // Either mode or chown is not explicitly set
+    // Default behavior is to copy it from original file
+    try {
+      var stats = fs.statSync(filename)
+      options = Object.assign({}, options)
+      if (!options.mode) {
+        options.mode = stats.mode
+      }
+      if (!options.chown && process.getuid) {
+        options.chown = { uid: stats.uid, gid: stats.gid }
+      }
+    } catch (ex) {
+      // ignore stat errors
+    }
+  }
 
+  var fd
+  var cleanup = cleanupOnExit(tmpfile)
+  var removeOnExitHandler = onExit(cleanup)
 
-/***/ }),
-/* 123 */
-/***/ (function(module, exports) {
+  try {
+    fd = fs.openSync(tmpfile, 'w', options.mode)
+    if (Buffer.isBuffer(data)) {
+      fs.writeSync(fd, data, 0, data.length, 0)
+    } else if (data != null) {
+      fs.writeSync(fd, String(data), 0, String(options.encoding || 'utf8'))
+    }
+    if (options.fsync !== false) {
+      fs.fsyncSync(fd)
+    }
+    fs.closeSync(fd)
+    if (options.chown) fs.chownSync(tmpfile, options.chown.uid, options.chown.gid)
+    if (options.mode) fs.chmodSync(tmpfile, options.mode)
+    fs.renameSync(tmpfile, filename)
+    removeOnExitHandler()
+  } catch (err) {
+    if (fd) {
+      try {
+        fs.closeSync(fd)
+      } catch (ex) {
+        // ignore close errors at this stage, error may have closed fd already.
+      }
+    }
+    removeOnExitHandler()
+    cleanup()
+    throw err
+  }
+}
 
-module.exports = require("child_process");
 
 /***/ }),
-/* 124 */
+/* 551 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-
-const cp = __webpack_require__(123);
-const parse = __webpack_require__(125);
-const enoent = __webpack_require__(136);
+var fs = __webpack_require__(23)
+var polyfills = __webpack_require__(552)
+var legacy = __webpack_require__(554)
+var queue = []
 
-function spawn(command, args, options) {
-    // Parse the arguments
-    const parsed = parse(command, args, options);
+var util = __webpack_require__(29)
 
-    // Spawn the child process
-    const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
+function noop () {}
 
-    // Hook into child process "exit" event to emit an error if the command
-    // does not exists, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16
-    enoent.hookChildProcess(spawned, parsed);
+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)
+  }
 
-    return spawned;
+if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
+  process.on('exit', function() {
+    debug(queue)
+    __webpack_require__(30).equal(queue.length, 0)
+  })
 }
 
-function spawnSync(command, args, options) {
-    // Parse the arguments
-    const parsed = parse(command, args, options);
-
-    // Spawn the child process
-    const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
-
-    // Analyze if the command does not exist, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16
-    result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
-
-    return result;
+module.exports = patch(__webpack_require__(553))
+if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH) {
+  module.exports = patch(fs)
 }
 
-module.exports = spawn;
-module.exports.spawn = spawn;
-module.exports.sync = spawnSync;
+// Always patch fs.close/closeSync, because we want 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.
+module.exports.close =
+fs.close = (function (fs$close) { return function (fd, cb) {
+  return fs$close.call(fs, fd, function (err) {
+    if (!err)
+      retry()
 
-module.exports._parse = parse;
-module.exports._enoent = enoent;
+    if (typeof cb === 'function')
+      cb.apply(this, arguments)
+  })
+}})(fs.close)
 
+module.exports.closeSync =
+fs.closeSync = (function (fs$closeSync) { return function (fd) {
+  // Note that graceful-fs also retries when fs.closeSync() fails.
+  // Looks like a bug to me, although it's probably a harmless one.
+  var rval = fs$closeSync.apply(fs, arguments)
+  retry()
+  return rval
+}})(fs.closeSync)
 
-/***/ }),
-/* 125 */
-/***/ (function(module, exports, __webpack_require__) {
+function patch (fs) {
+  // Everything that references the open() function needs to be in here
+  polyfills(fs)
+  fs.gracefulify = patch
+  fs.FileReadStream = ReadStream;  // Legacy name.
+  fs.FileWriteStream = WriteStream;  // Legacy name.
+  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
 
-"use strict";
+    return go$readFile(path, options, cb)
 
+    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()
+        }
+      })
+    }
+  }
 
-const path = __webpack_require__(16);
-const resolveCommand = __webpack_require__(126);
-const escape = __webpack_require__(132);
-const readShebang = __webpack_require__(133);
+  var fs$writeFile = fs.writeFile
+  fs.writeFile = writeFile
+  function writeFile (path, data, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
 
-const isWin = process.platform === 'win32';
-const isExecutableRegExp = /\.(?:com|exe)$/i;
-const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i;
+    return go$writeFile(path, data, options, cb)
 
-function detectShebang(parsed) {
-    parsed.file = resolveCommand(parsed);
+    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()
+        }
+      })
+    }
+  }
 
-    const shebang = parsed.file && readShebang(parsed.file);
+  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
 
-    if (shebang) {
-        parsed.args.unshift(parsed.file);
-        parsed.command = shebang;
+    return go$appendFile(path, data, options, cb)
 
-        return resolveCommand(parsed);
+    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()
+        }
+      })
     }
+  }
 
-    return parsed.file;
-}
-
-function parseNonShell(parsed) {
-    if (!isWin) {
-        return parsed;
+  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)
 
-    // Detect & add support for shebangs
-    const commandFile = detectShebang(parsed);
-
-    // We don't need a shell if the command filename is an executable
-    const needsShell = !isExecutableRegExp.test(commandFile);
-
-    // If a shell is required, use cmd.exe and take care of escaping everything correctly
-    // Note that `forceShell` is an hidden option used only in tests
-    if (parsed.options.forceShell || needsShell) {
-        // Need to double escape meta chars if the command is a cmd-shim located in `node_modules/.bin/`
-        // The cmd-shim simply calls execute the package bin file with NodeJS, proxying any argument
-        // Because the escape of metachars with ^ gets interpreted when the cmd.exe is first called,
-        // we need to double escape them
-        const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-
-        // Normalize posix paths into OS compatible paths (e.g.: foo/bar -> foo\bar)
-        // This is necessary otherwise it will always fail with ENOENT in those cases
-        parsed.command = path.normalize(parsed.command);
-
-        // Escape command & arguments
-        parsed.command = escape.command(parsed.command);
-        parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
+    return go$readdir(args)
 
-        const shellCommand = [parsed.command].concat(parsed.args).join(' ');
+    function go$readdir$cb (err, files) {
+      if (files && files.sort)
+        files.sort()
 
-        parsed.args = ['/d', '/s', '/c', `"${shellCommand}"`];
-        parsed.command = process.env.comspec || 'cmd.exe';
-        parsed.options.windowsVerbatimArguments = true; // Tell node's spawn that the arguments are already escaped
+      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+        enqueue([go$readdir, [args]])
+      else {
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+        retry()
+      }
     }
+  }
 
-    return parsed;
-}
+  function go$readdir (args) {
+    return fs$readdir.apply(fs, args)
+  }
 
-function parse(command, args, options) {
-    // Normalize arguments, similar to nodejs
-    if (args && !Array.isArray(args)) {
-        options = args;
-        args = null;
-    }
+  if (process.version.substr(0, 4) === 'v0.8') {
+    var legStreams = legacy(fs)
+    ReadStream = legStreams.ReadStream
+    WriteStream = legStreams.WriteStream
+  }
 
-    args = args ? args.slice(0) : []; // Clone array to avoid changing the original
-    options = Object.assign({}, options); // Clone object to avoid changing the original
+  var fs$ReadStream = fs.ReadStream
+  ReadStream.prototype = Object.create(fs$ReadStream.prototype)
+  ReadStream.prototype.open = ReadStream$open
 
-    // Build our parsed object
-    const parsed = {
-        command,
-        args,
-        options,
-        file: undefined,
-        original: {
-            command,
-            args,
-        },
-    };
+  var fs$WriteStream = fs.WriteStream
+  WriteStream.prototype = Object.create(fs$WriteStream.prototype)
+  WriteStream.prototype.open = WriteStream$open
 
-    // Delegate further parsing to shell or non-shell
-    return options.shell ? parsed : parseNonShell(parsed);
-}
+  fs.ReadStream = ReadStream
+  fs.WriteStream = WriteStream
 
-module.exports = parse;
+  function ReadStream (path, options) {
+    if (this instanceof ReadStream)
+      return fs$ReadStream.apply(this, arguments), this
+    else
+      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
+  }
 
+  function ReadStream$open () {
+    var that = this
+    open(that.path, that.flags, that.mode, function (err, fd) {
+      if (err) {
+        if (that.autoClose)
+          that.destroy()
 
-/***/ }),
-/* 126 */
-/***/ (function(module, exports, __webpack_require__) {
+        that.emit('error', err)
+      } else {
+        that.fd = fd
+        that.emit('open', fd)
+        that.read()
+      }
+    })
+  }
 
-"use strict";
+  function WriteStream (path, options) {
+    if (this instanceof WriteStream)
+      return fs$WriteStream.apply(this, arguments), this
+    else
+      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
+  }
 
+  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)
+      }
+    })
+  }
 
-const path = __webpack_require__(16);
-const which = __webpack_require__(127);
-const pathKey = __webpack_require__(131)();
+  function createReadStream (path, options) {
+    return new ReadStream(path, options)
+  }
 
-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;
+  function createWriteStream (path, options) {
+    return new WriteStream(path, options)
+  }
 
-    // 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 (shouldSwitchCwd) {
-        try {
-            process.chdir(parsed.options.cwd);
-        } catch (err) {
-            /* Empty */
-        }
-    }
+  var fs$open = fs.open
+  fs.open = open
+  function open (path, flags, mode, cb) {
+    if (typeof mode === 'function')
+      cb = mode, mode = null
 
-    let resolved;
+    return go$open(path, flags, mode, cb)
 
-    try {
-        resolved = which.sync(parsed.command, {
-            path: (parsed.options.env || process.env)[pathKey],
-            pathExt: withoutPathExt ? path.delimiter : undefined,
-        });
-    } catch (e) {
-        /* Empty */
-    } finally {
-        if (shouldSwitchCwd) {
-            process.chdir(cwd);
+    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()
         }
+      })
     }
+  }
 
-    // If we successfully resolved, ensure that an absolute path is returned
-    // Note that when a custom `cwd` was used, we need to resolve to an absolute path based on it
-    if (resolved) {
-        resolved = path.resolve(hasCustomCwd ? parsed.options.cwd : '', resolved);
-    }
-
-    return resolved;
+  return fs
 }
 
-function resolveCommand(parsed) {
-    return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
+function enqueue (elem) {
+  debug('ENQUEUE', elem[0].name, elem[1])
+  queue.push(elem)
 }
 
-module.exports = resolveCommand;
+function retry () {
+  var elem = queue.shift()
+  if (elem) {
+    debug('RETRY', elem[0].name, elem[1])
+    elem[0].apply(null, elem[1])
+  }
+}
 
 
 /***/ }),
-/* 127 */
+/* 552 */
 /***/ (function(module, exports, __webpack_require__) {
 
-const isWindows = process.platform === 'win32' ||
-    process.env.OSTYPE === 'cygwin' ||
-    process.env.OSTYPE === 'msys'
-
-const path = __webpack_require__(16)
-const COLON = isWindows ? ';' : ':'
-const isexe = __webpack_require__(128)
-
-const getNotFoundError = (cmd) =>
-  Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' })
-
-const getPathInfo = (cmd, opt) => {
-  const colon = opt.colon || COLON
+var fs = __webpack_require__(553)
+var constants = __webpack_require__(25)
 
-  // 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 origCwd = process.cwd
+var cwd = null
 
-  if (isWindows) {
-    if (cmd.indexOf('.') !== -1 && pathExt[0] !== '')
-      pathExt.unshift('')
-  }
+var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
 
-  return {
-    pathEnv,
-    pathExt,
-    pathExtExe,
-  }
+process.cwd = function() {
+  if (!cwd)
+    cwd = origCwd.call(process)
+  return cwd
 }
+try {
+  process.cwd()
+} catch (er) {}
 
-const which = (cmd, opt, cb) => {
-  if (typeof opt === 'function') {
-    cb = opt
-    opt = {}
-  }
-  if (!opt)
-    opt = {}
-
-  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
-  const found = []
-
-  const step = i => new Promise((resolve, reject) => {
-    if (i === pathEnv.length)
-      return opt.all && found.length ? resolve(found)
-        : reject(getNotFoundError(cmd))
-
-    const ppRaw = pathEnv[i]
-    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
-
-    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)
+var chdir = process.chdir
+process.chdir = function(d) {
+  cwd = null
+  chdir.call(process, d)
 }
 
-const whichSync = (cmd, opt) => {
-  opt = opt || {}
-
-  const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt)
-  const found = []
+module.exports = patch
 
-  for (let i = 0; i < pathEnv.length; i ++) {
-    const ppRaw = pathEnv[i]
-    const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw
+function patch (fs) {
+  // (re-)implement some things that are known busted or missing.
 
-    const pCmd = path.join(pathPart, cmd)
-    const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd
-      : pCmd
+  // 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)
+  }
 
-    for (let j = 0; j < pathExt.length; j ++) {
-      const cur = p + pathExt[j]
-      try {
-        const is = isexe.sync(cur, { pathExt: pathExtExe })
-        if (is) {
-          if (opt.all)
-            found.push(cur)
-          else
-            return cur
-        }
-      } catch (ex) {}
-    }
+  // lutimes implementation, or no-op
+  if (!fs.lutimes) {
+    patchLutimes(fs)
   }
 
-  if (opt.all && found.length)
-    return found
+  // 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.
 
-  if (opt.nothrow)
-    return null
+  fs.chown = chownFix(fs.chown)
+  fs.fchown = chownFix(fs.fchown)
+  fs.lchown = chownFix(fs.lchown)
 
-  throw getNotFoundError(cmd)
-}
+  fs.chmod = chmodFix(fs.chmod)
+  fs.fchmod = chmodFix(fs.fchmod)
+  fs.lchmod = chmodFix(fs.lchmod)
 
-module.exports = which
-which.sync = whichSync
+  fs.chownSync = chownFixSync(fs.chownSync)
+  fs.fchownSync = chownFixSync(fs.fchownSync)
+  fs.lchownSync = chownFixSync(fs.lchownSync)
 
+  fs.chmodSync = chmodFixSync(fs.chmodSync)
+  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
+  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
 
-/***/ }),
-/* 128 */
-/***/ (function(module, exports, __webpack_require__) {
+  fs.stat = statFix(fs.stat)
+  fs.fstat = statFix(fs.fstat)
+  fs.lstat = statFix(fs.lstat)
 
-var fs = __webpack_require__(23)
-var core
-if (process.platform === 'win32' || global.TESTING_WINDOWS) {
-  core = __webpack_require__(129)
-} else {
-  core = __webpack_require__(130)
-}
+  fs.statSync = statFixSync(fs.statSync)
+  fs.fstatSync = statFixSync(fs.fstatSync)
+  fs.lstatSync = statFixSync(fs.lstatSync)
 
-module.exports = isexe
-isexe.sync = sync
+  // 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 () {}
+  }
 
-function isexe (path, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
+  // 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.
+
+  // 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 (!cb) {
-    if (typeof Promise !== 'function') {
-      throw new TypeError('callback not provided')
+  // if read() returns EAGAIN, then just try it again.
+  fs.read = (function (fs$read) { return function (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)
+  }})(fs.read)
 
-    return new Promise(function (resolve, reject) {
-      isexe(path, options || {}, function (er, is) {
-        if (er) {
-          reject(er)
-        } else {
-          resolve(is)
+  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)
+}
+
+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)
+        })
       })
     })
   }
 
-  core(path, options || {}, function (er, is) {
-    // ignore EACCES because that just means we aren't allowed to run it
-    if (er) {
-      if (er.code === 'EACCES' || options && options.ignoreErrors) {
-        er = null
-        is = false
+  fs.lchmodSync = function (path, mode) {
+    var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
+
+    // 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)
       }
     }
-    cb(er, is)
-  })
+    return ret
+  }
 }
 
-function sync (path, options) {
-  // my kingdom for a filtered catch
-  try {
-    return core.sync(path, options || {})
-  } catch (er) {
-    if (options && options.ignoreErrors || er.code === 'EACCES') {
-      return false
-    } else {
-      throw er
+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)
+          })
+        })
+      })
     }
-  }
-}
 
+    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
+    }
 
-/***/ }),
-/* 129 */
-/***/ (function(module, exports, __webpack_require__) {
+  } else {
+    fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
+    fs.lutimesSync = function () {}
+  }
+}
 
-module.exports = isexe
-isexe.sync = sync
+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)
+    })
+  }
+}
 
-var fs = __webpack_require__(23)
+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
+    }
+  }
+}
 
-function checkPathExt (path, options) {
-  var pathext = options.pathExt !== undefined ?
-    options.pathExt : process.env.PATHEXT
 
-  if (!pathext) {
-    return true
+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)
+    })
   }
+}
 
-  pathext = pathext.split(';')
-  if (pathext.indexOf('') !== -1) {
-    return true
-  }
-  for (var i = 0; i < pathext.length; i++) {
-    var p = pathext[i].toLowerCase()
-    if (p && path.substr(-p.length).toLowerCase() === p) {
-      return true
+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
     }
   }
-  return false
 }
 
-function checkStat (stat, path, options) {
-  if (!stat.isSymbolicLink() && !stat.isFile()) {
-    return false
+
+function statFix (orig) {
+  if (!orig) return orig
+  // Older versions of Node erroneously returned signed integers for
+  // uid + gid.
+  return function (target, cb) {
+    return orig.call(fs, target, function (er, stats) {
+      if (!stats) return cb.apply(this, arguments)
+      if (stats.uid < 0) stats.uid += 0x100000000
+      if (stats.gid < 0) stats.gid += 0x100000000
+      if (cb) cb.apply(this, arguments)
+    })
   }
-  return checkPathExt(path, options)
 }
 
-function isexe (path, options, cb) {
-  fs.stat(path, function (er, stat) {
-    cb(er, er ? false : checkStat(stat, path, options))
-  })
+function statFixSync (orig) {
+  if (!orig) return orig
+  // Older versions of Node erroneously returned signed integers for
+  // uid + gid.
+  return function (target) {
+    var stats = orig.call(fs, target)
+    if (stats.uid < 0) stats.uid += 0x100000000
+    if (stats.gid < 0) stats.gid += 0x100000000
+    return stats;
+  }
 }
 
-function sync (path, options) {
-  return checkStat(fs.statSync(path), path, options)
+// 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 (er.code === "ENOSYS")
+    return true
+
+  var nonroot = !process.getuid || process.getuid() !== 0
+  if (nonroot) {
+    if (er.code === "EINVAL" || er.code === "EPERM")
+      return true
+  }
+
+  return false
 }
 
 
 /***/ }),
-/* 130 */
+/* 553 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = isexe
-isexe.sync = sync
-
-var fs = __webpack_require__(23)
-
-function isexe (path, options, cb) {
-  fs.stat(path, function (er, stat) {
-    cb(er, er ? false : checkStat(stat, options))
-  })
-}
+"use strict";
 
-function sync (path, options) {
-  return checkStat(fs.statSync(path), options)
-}
 
-function checkStat (stat, options) {
-  return stat.isFile() && checkMode(stat, options)
-}
+var fs = __webpack_require__(23)
 
-function checkMode (stat, options) {
-  var mod = stat.mode
-  var uid = stat.uid
-  var gid = stat.gid
+module.exports = clone(fs)
 
-  var myUid = options.uid !== undefined ?
-    options.uid : process.getuid && process.getuid()
-  var myGid = options.gid !== undefined ?
-    options.gid : process.getgid && process.getgid()
+function clone (obj) {
+  if (obj === null || typeof obj !== 'object')
+    return obj
 
-  var u = parseInt('100', 8)
-  var g = parseInt('010', 8)
-  var o = parseInt('001', 8)
-  var ug = u | g
+  if (obj instanceof Object)
+    var copy = { __proto__: obj.__proto__ }
+  else
+    var copy = Object.create(null)
 
-  var ret = (mod & o) ||
-    (mod & g) && gid === myGid ||
-    (mod & u) && uid === myUid ||
-    (mod & ug) && myUid === 0
+  Object.getOwnPropertyNames(obj).forEach(function (key) {
+    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
+  })
 
-  return ret
+  return copy
 }
 
 
 /***/ }),
-/* 131 */
+/* 554 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var Stream = __webpack_require__(27).Stream
 
+module.exports = legacy
 
-const pathKey = (options = {}) => {
-	const environment = options.env || process.env;
-	const platform = options.platform || process.platform;
+function legacy (fs) {
+  return {
+    ReadStream: ReadStream,
+    WriteStream: WriteStream
+  }
 
-	if (platform !== 'win32') {
-		return 'PATH';
-	}
+  function ReadStream (path, options) {
+    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
 
-	return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path';
-};
+    Stream.call(this);
 
-module.exports = pathKey;
-// TODO: Remove this for the next major release
-module.exports.default = pathKey;
+    var self = this;
 
+    this.path = path;
+    this.fd = null;
+    this.readable = true;
+    this.paused = false;
 
-/***/ }),
-/* 132 */
-/***/ (function(module, exports, __webpack_require__) {
+    this.flags = 'r';
+    this.mode = 438; /*=0666*/
+    this.bufferSize = 64 * 1024;
 
-"use strict";
+    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];
+    }
 
-// See http://www.robvanderwoude.com/escapechars.php
-const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
+    if (this.encoding) this.setEncoding(this.encoding);
 
-function escapeCommand(arg) {
-    // Escape meta chars
-    arg = arg.replace(metaCharsRegExp, '^$1');
+    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 arg;
-}
+      if (this.start > this.end) {
+        throw new Error('start must be <= end');
+      }
 
-function escapeArgument(arg, doubleEscapeMetaChars) {
-    // Convert to string
-    arg = `${arg}`;
+      this.pos = this.start;
+    }
 
-    // Algorithm below is based on https://qntm.org/cmd
+    if (this.fd !== null) {
+      process.nextTick(function() {
+        self._read();
+      });
+      return;
+    }
 
-    // Sequence of backslashes followed by a double quote:
-    // double up all the backslashes and escape the double quote
-    arg = arg.replace(/(\\*)"/g, '$1$1\\"');
+    fs.open(this.path, this.flags, this.mode, function (err, fd) {
+      if (err) {
+        self.emit('error', err);
+        self.readable = false;
+        return;
+      }
 
-    // Sequence of backslashes followed by the end of the string
-    // (which will become a double quote later):
-    // double up all the backslashes
-    arg = arg.replace(/(\\*)$/, '$1$1');
+      self.fd = fd;
+      self.emit('open', fd);
+      self._read();
+    })
+  }
 
-    // All other backslashes occur literally
+  function WriteStream (path, options) {
+    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
 
-    // Quote the whole thing:
-    arg = `"${arg}"`;
+    Stream.call(this);
 
-    // Escape meta chars
-    arg = arg.replace(metaCharsRegExp, '^$1');
+    this.path = path;
+    this.fd = null;
+    this.writable = true;
 
-    // Double escape meta chars if necessary
-    if (doubleEscapeMetaChars) {
-        arg = arg.replace(metaCharsRegExp, '^$1');
+    this.flags = 'w';
+    this.encoding = 'binary';
+    this.mode = 438; /*=0666*/
+    this.bytesWritten = 0;
+
+    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];
+    }
+
+    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');
+      }
+
+      this.pos = this.start;
     }
 
-    return arg;
+    this.busy = false;
+    this._queue = [];
+
+    if (this.fd === null) {
+      this._open = fs.open;
+      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
+      this.flush();
+    }
+  }
 }
 
-module.exports.command = escapeCommand;
-module.exports.argument = escapeArgument;
-
 
 /***/ }),
-/* 133 */
+/* 555 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+/**
+ * @preserve
+ * JS Implementation of incremental MurmurHash3 (r150) (as of May 10, 2013)
+ *
+ * @author <a href="mailto:jensyt@gmail.com">Jens Taylor</a>
+ * @see http://github.com/homebrewing/brauhaus-diff
+ * @author <a href="mailto:gary.court@gmail.com">Gary Court</a>
+ * @see http://github.com/garycourt/murmurhash-js
+ * @author <a href="mailto:aappleby@gmail.com">Austin Appleby</a>
+ * @see http://sites.google.com/site/murmurhash/
+ */
+(function(){
+    var cache;
 
+    // Call this function without `new` to use the cached object (good for
+    // single-threaded environments), or with `new` to create a new object.
+    //
+    // @param {string} key A UTF-16 or ASCII string
+    // @param {number} seed An optional positive integer
+    // @return {object} A MurmurHash3 object for incremental hashing
+    function MurmurHash3(key, seed) {
+        var m = this instanceof MurmurHash3 ? this : cache;
+        m.reset(seed)
+        if (typeof key === 'string' && key.length > 0) {
+            m.hash(key);
+        }
 
-const fs = __webpack_require__(23);
-const shebangCommand = __webpack_require__(134);
+        if (m !== this) {
+            return m;
+        }
+    };
 
-function readShebang(command) {
-    // Read the first 150 bytes from the file
-    const size = 150;
-    const buffer = Buffer.alloc(size);
+    // Incrementally add a string to this hash
+    //
+    // @param {string} key A UTF-16 or ASCII string
+    // @return {object} this
+    MurmurHash3.prototype.hash = function(key) {
+        var h1, k1, i, top, len;
 
-    let fd;
+        len = key.length;
+        this.len += len;
 
-    try {
-        fd = fs.openSync(command, 'r');
-        fs.readSync(fd, buffer, 0, size, 0);
-        fs.closeSync(fd);
-    } catch (e) { /* Empty */ }
+        k1 = this.k1;
+        i = 0;
+        switch (this.rem) {
+            case 0: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) : 0;
+            case 1: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) << 8 : 0;
+            case 2: k1 ^= len > i ? (key.charCodeAt(i++) & 0xffff) << 16 : 0;
+            case 3:
+                k1 ^= len > i ? (key.charCodeAt(i) & 0xff) << 24 : 0;
+                k1 ^= len > i ? (key.charCodeAt(i++) & 0xff00) >> 8 : 0;
+        }
 
-    // Attempt to extract shebang (null is returned if not a shebang)
-    return shebangCommand(buffer.toString());
-}
+        this.rem = (len + this.rem) & 3; // & 3 is same as % 4
+        len -= this.rem;
+        if (len > 0) {
+            h1 = this.h1;
+            while (1) {
+                k1 = (k1 * 0x2d51 + (k1 & 0xffff) * 0xcc9e0000) & 0xffffffff;
+                k1 = (k1 << 15) | (k1 >>> 17);
+                k1 = (k1 * 0x3593 + (k1 & 0xffff) * 0x1b870000) & 0xffffffff;
 
-module.exports = readShebang;
+                h1 ^= k1;
+                h1 = (h1 << 13) | (h1 >>> 19);
+                h1 = (h1 * 5 + 0xe6546b64) & 0xffffffff;
 
+                if (i >= len) {
+                    break;
+                }
 
-/***/ }),
-/* 134 */
-/***/ (function(module, exports, __webpack_require__) {
+                k1 = ((key.charCodeAt(i++) & 0xffff)) ^
+                     ((key.charCodeAt(i++) & 0xffff) << 8) ^
+                     ((key.charCodeAt(i++) & 0xffff) << 16);
+                top = key.charCodeAt(i++);
+                k1 ^= ((top & 0xff) << 24) ^
+                      ((top & 0xff00) >> 8);
+            }
 
-"use strict";
+            k1 = 0;
+            switch (this.rem) {
+                case 3: k1 ^= (key.charCodeAt(i + 2) & 0xffff) << 16;
+                case 2: k1 ^= (key.charCodeAt(i + 1) & 0xffff) << 8;
+                case 1: k1 ^= (key.charCodeAt(i) & 0xffff);
+            }
 
-const shebangRegex = __webpack_require__(135);
+            this.h1 = h1;
+        }
 
-module.exports = (string = '') => {
-	const match = string.match(shebangRegex);
+        this.k1 = k1;
+        return this;
+    };
 
-	if (!match) {
-		return null;
-	}
+    // Get the result of this hash
+    //
+    // @return {number} The 32-bit hash
+    MurmurHash3.prototype.result = function() {
+        var k1, h1;
+        
+        k1 = this.k1;
+        h1 = this.h1;
 
-	const [path, argument] = match[0].replace(/#! ?/, '').split(' ');
-	const binary = path.split('/').pop();
+        if (k1 > 0) {
+            k1 = (k1 * 0x2d51 + (k1 & 0xffff) * 0xcc9e0000) & 0xffffffff;
+            k1 = (k1 << 15) | (k1 >>> 17);
+            k1 = (k1 * 0x3593 + (k1 & 0xffff) * 0x1b870000) & 0xffffffff;
+            h1 ^= k1;
+        }
 
-	if (binary === 'env') {
-		return argument;
-	}
+        h1 ^= this.len;
 
-	return argument ? `${binary} ${argument}` : binary;
-};
+        h1 ^= h1 >>> 16;
+        h1 = (h1 * 0xca6b + (h1 & 0xffff) * 0x85eb0000) & 0xffffffff;
+        h1 ^= h1 >>> 13;
+        h1 = (h1 * 0xae35 + (h1 & 0xffff) * 0xc2b20000) & 0xffffffff;
+        h1 ^= h1 >>> 16;
 
+        return h1 >>> 0;
+    };
 
-/***/ }),
-/* 135 */
-/***/ (function(module, exports, __webpack_require__) {
+    // Reset the hash object for reuse
+    //
+    // @param {number} seed An optional positive integer
+    MurmurHash3.prototype.reset = function(seed) {
+        this.h1 = typeof seed === 'number' ? seed : 0;
+        this.rem = this.k1 = this.len = 0;
+        return this;
+    };
 
-"use strict";
+    // A cached object to use. This can be safely used if you're in a single-
+    // threaded environment, otherwise you need to create new hashes to use.
+    cache = new MurmurHash3();
 
-module.exports = /^#!(.*)/;
+    if (true) {
+        module.exports = MurmurHash3;
+    } else {}
+}());
 
 
 /***/ }),
-/* 136 */
+/* 556 */
+/***/ (function(module, exports) {
+
+module.exports = require(undefined);
+
+/***/ }),
+/* 557 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const isPlainObj = __webpack_require__(558);
 
-const isWin = process.platform === 'win32';
+module.exports = (obj, opts) => {
+	if (!isPlainObj(obj)) {
+		throw new TypeError('Expected a plain object');
+	}
 
-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,
-    });
-}
+	opts = opts || {};
 
-function hookChildProcess(cp, parsed) {
-    if (!isWin) {
-        return;
-    }
+	// DEPRECATED
+	if (typeof opts === 'function') {
+		throw new TypeError('Specify the compare function as an option instead');
+	}
 
-    const originalEmit = cp.emit;
+	const deep = opts.deep;
+	const seenInput = [];
+	const seenOutput = [];
 
-    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');
+	const sortKeys = x => {
+		const seenIndex = seenInput.indexOf(x);
 
-            if (err) {
-                return originalEmit.call(cp, 'error', err);
-            }
-        }
+		if (seenIndex !== -1) {
+			return seenOutput[seenIndex];
+		}
 
-        return originalEmit.apply(cp, arguments); // eslint-disable-line prefer-rest-params
-    };
-}
+		const ret = {};
+		const keys = Object.keys(x).sort(opts.compare);
 
-function verifyENOENT(status, parsed) {
-    if (isWin && status === 1 && !parsed.file) {
-        return notFoundError(parsed.original, 'spawn');
-    }
+		seenInput.push(x);
+		seenOutput.push(ret);
 
-    return null;
-}
+		for (let i = 0; i < keys.length; i++) {
+			const key = keys[i];
+			const val = x[key];
 
-function verifyENOENTSync(status, parsed) {
-    if (isWin && status === 1 && !parsed.file) {
-        return notFoundError(parsed.original, 'spawnSync');
-    }
+			if (deep && Array.isArray(val)) {
+				const retArr = [];
 
-    return null;
-}
+				for (let j = 0; j < val.length; j++) {
+					retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j];
+				}
 
-module.exports = {
-    hookChildProcess,
-    verifyENOENT,
-    verifyENOENTSync,
-    notFoundError,
+				ret[key] = retArr;
+				continue;
+			}
+
+			ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val;
+		}
+
+		return ret;
+	};
+
+	return sortKeys(obj);
 };
 
 
 /***/ }),
-/* 137 */
+/* 558 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+var toString = Object.prototype.toString;
 
-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);
-	}
-
-	if (input[input.length - 1] === CR) {
-		input = input.slice(0, input.length - 1);
-	}
-
-	return input;
+module.exports = function (x) {
+	var prototype;
+	return toString.call(x) === '[object Object]' && (prototype = Object.getPrototypeOf(x), prototype === null || prototype === Object.getPrototypeOf({}));
 };
 
 
 /***/ }),
-/* 138 */
+/* 559 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
+const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
-const pathKey = __webpack_require__(131);
-
-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 = [];
-
-	while (previous !== cwdPath) {
-		result.push(path.join(cwdPath, 'node_modules/.bin'));
-		previous = cwdPath;
-		cwdPath = path.resolve(cwdPath, '..');
-	}
-
-	// Ensure the running `node` binary is used
-	const execPathDir = path.resolve(options.cwd, options.execPath, '..');
-	result.unshift(execPathDir);
+const pify = __webpack_require__(560);
+const semver = __webpack_require__(561);
 
-	return result.concat(options.path).join(path.delimiter);
+const defaults = {
+	mode: 0o777 & (~process.umask()),
+	fs
 };
 
-module.exports = npmRunPath;
-// TODO: Remove this for the next major release
-module.exports.default = npmRunPath;
-
-module.exports.env = options => {
-	options = {
-		env: process.env,
-		...options
-	};
-
-	const env = {...options.env};
-	const path = pathKey({env});
+const useNativeRecursiveOption = semver.satisfies(process.version, '>=10.12.0');
 
-	options.path = env[path];
-	env[path] = module.exports(options);
+// https://github.com/nodejs/node/issues/8987
+// https://github.com/libuv/libuv/pull/1088
+const checkPath = pth => {
+	if (process.platform === 'win32') {
+		const pathHasInvalidWinCharacters = /[<>:"|?*]/.test(pth.replace(path.parse(pth).root, ''));
 
-	return env;
+		if (pathHasInvalidWinCharacters) {
+			const error = new Error(`Path contains invalid characters: ${pth}`);
+			error.code = 'EINVAL';
+			throw error;
+		}
+	}
 };
 
+const permissionError = pth => {
+	// This replicates the exception of `fs.mkdir` with native the
+	// `recusive` option when run on an invalid drive under Windows.
+	const error = new Error(`operation not permitted, mkdir '${pth}'`);
+	error.code = 'EPERM';
+	error.errno = -4048;
+	error.path = pth;
+	error.syscall = 'mkdir';
+	return error;
+};
 
-/***/ }),
-/* 139 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
+const makeDir = (input, options) => Promise.resolve().then(() => {
+	checkPath(input);
+	options = Object.assign({}, defaults, options);
 
-const mimicFn = __webpack_require__(140);
+	// TODO: Use util.promisify when targeting Node.js 8
+	const mkdir = pify(options.fs.mkdir);
+	const stat = pify(options.fs.stat);
 
-const calledFunctions = new WeakMap();
+	if (useNativeRecursiveOption && options.fs.mkdir === fs.mkdir) {
+		const pth = path.resolve(input);
 
-const oneTime = (fn, options = {}) => {
-	if (typeof fn !== 'function') {
-		throw new TypeError('Expected a function');
+		return mkdir(pth, {
+			mode: options.mode,
+			recursive: true
+		}).then(() => pth);
 	}
 
-	let ret;
-	let isCalled = false;
-	let callCount = 0;
-	const functionName = fn.displayName || fn.name || '<anonymous>';
-
-	const onetime = function (...args) {
-		calledFunctions.set(onetime, ++callCount);
+	const make = pth => {
+		return mkdir(pth, options.mode)
+			.then(() => pth)
+			.catch(error => {
+				if (error.code === 'EPERM') {
+					throw error;
+				}
 
-		if (isCalled) {
-			if (options.throw === true) {
-				throw new Error(`Function \`${functionName}\` can only be called once`);
-			}
+				if (error.code === 'ENOENT') {
+					if (path.dirname(pth) === pth) {
+						throw permissionError(pth);
+					}
 
-			return ret;
-		}
+					if (error.message.includes('null bytes')) {
+						throw error;
+					}
 
-		isCalled = true;
-		ret = fn.apply(this, args);
-		fn = null;
+					return make(path.dirname(pth)).then(() => make(pth));
+				}
 
-		return ret;
+				return stat(pth)
+					.then(stats => stats.isDirectory() ? pth : Promise.reject())
+					.catch(() => {
+						throw error;
+					});
+			});
 	};
 
-	mimicFn(onetime, fn);
-	calledFunctions.set(onetime, callCount);
+	return make(path.resolve(input));
+});
 
-	return onetime;
-};
+module.exports = makeDir;
+module.exports.default = makeDir;
 
-module.exports = oneTime;
-// TODO: Remove this for the next major release
-module.exports.default = oneTime;
+module.exports.sync = (input, options) => {
+	checkPath(input);
+	options = Object.assign({}, defaults, options);
 
-module.exports.callCount = fn => {
-	if (!calledFunctions.has(fn)) {
-		throw new Error(`The given function \`${fn.name}\` is not wrapped by the \`onetime\` package`);
+	if (useNativeRecursiveOption && options.fs.mkdirSync === fs.mkdirSync) {
+		const pth = path.resolve(input);
+
+		fs.mkdirSync(pth, {
+			mode: options.mode,
+			recursive: true
+		});
+
+		return pth;
 	}
 
-	return calledFunctions.get(fn);
-};
+	const make = pth => {
+		try {
+			options.fs.mkdirSync(pth, options.mode);
+		} catch (error) {
+			if (error.code === 'EPERM') {
+				throw error;
+			}
 
+			if (error.code === 'ENOENT') {
+				if (path.dirname(pth) === pth) {
+					throw permissionError(pth);
+				}
 
-/***/ }),
-/* 140 */
-/***/ (function(module, exports, __webpack_require__) {
+				if (error.message.includes('null bytes')) {
+					throw error;
+				}
 
-"use strict";
+				make(path.dirname(pth));
+				return make(pth);
+			}
 
+			try {
+				if (!options.fs.statSync(pth).isDirectory()) {
+					throw new Error('The path is not a directory');
+				}
+			} catch (_) {
+				throw error;
+			}
+		}
 
-const mimicFn = (to, from) => {
-	for (const prop of Reflect.ownKeys(from)) {
-		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
-	}
+		return pth;
+	};
 
-	return to;
+	return make(path.resolve(input));
 };
 
-module.exports = mimicFn;
-// TODO: Remove this for the next major release
-module.exports.default = mimicFn;
-
 
 /***/ }),
-/* 141 */
+/* 560 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const {signalsByName} = __webpack_require__(142);
-
-const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => {
-	if (timedOut) {
-		return `timed out after ${timeout} milliseconds`;
-	}
-
-	if (isCanceled) {
-		return 'was canceled';
-	}
-
-	if (errorCode !== undefined) {
-		return `failed with ${errorCode}`;
-	}
 
-	if (signal !== undefined) {
-		return `was killed with ${signal} (${signalDescription})`;
-	}
+const processFn = (fn, options) => function (...args) {
+	const P = options.promiseModule;
 
-	if (exitCode !== undefined) {
-		return `failed with exit code ${exitCode}`;
-	}
+	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);
+		}
 
-	return 'failed';
+		fn.apply(this, args);
+	});
 };
 
-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}`;
+module.exports = (input, options) => {
+	options = Object.assign({
+		exclude: [/.+(Sync|Stream)$/],
+		errorFirst: true,
+		promiseModule: Promise
+	}, options);
 
-	if (error instanceof Error) {
-		error.originalMessage = error.message;
-		error.message = `${message}\n${error.message}`;
-	} else {
-		error = new Error(message);
+	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}\``);
 	}
 
-	error.command = command;
-	error.exitCode = exitCode;
-	error.signal = signal;
-	error.signalDescription = signalDescription;
-	error.stdout = stdout;
-	error.stderr = stderr;
+	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);
+	};
 
-	if (all !== undefined) {
-		error.all = all;
+	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 ('bufferedData' in error) {
-		delete error.bufferedData;
+	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;
 	}
 
-	error.failed = true;
-	error.timedOut = Boolean(timedOut);
-	error.isCanceled = isCanceled;
-	error.killed = killed && !timedOut;
-
-	return error;
+	return ret;
 };
 
-module.exports = makeError;
-
 
 /***/ }),
-/* 142 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__(11);
-
-var _signals=__webpack_require__(143);
-var _realtime=__webpack_require__(145);
-
+/* 561 */
+/***/ (function(module, exports) {
 
+exports = module.exports = SemVer
 
-const getSignalsByName=function(){
-const signals=(0,_signals.getSignals)();
-return signals.reduce(getSignalByName,{});
-};
+var debug
+/* istanbul ignore next */
+if (typeof process === 'object' &&
+    process.env &&
+    process.env.NODE_DEBUG &&
+    /\bsemver\b/i.test(process.env.NODE_DEBUG)) {
+  debug = function () {
+    var args = Array.prototype.slice.call(arguments, 0)
+    args.unshift('SEMVER')
+    console.log.apply(console, args)
+  }
+} else {
+  debug = function () {}
+}
 
-const getSignalByName=function(
-signalByNameMemo,
-{name,number,description,supported,action,forced,standard})
-{
-return{
-...signalByNameMemo,
-[name]:{name,number,description,supported,action,forced,standard}};
+// 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'
 
-};
+var MAX_LENGTH = 256
+var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER ||
+  /* istanbul ignore next */ 9007199254740991
 
-const signalsByName=getSignalsByName();exports.signalsByName=signalsByName;
+// Max safe segment length for coercion.
+var MAX_SAFE_COMPONENT_LENGTH = 16
 
+// The actual regexps go on exports.re
+var re = exports.re = []
+var src = exports.src = []
+var R = 0
 
+// The following Regular Expressions can be used for tokenizing,
+// validating, and parsing SemVer version strings.
 
+// ## Numeric Identifier
+// A single `0`, or a non-zero digit followed by zero or more digits.
 
-const getSignalsByNumber=function(){
-const signals=(0,_signals.getSignals)();
-const length=_realtime.SIGRTMAX+1;
-const signalsA=Array.from({length},(value,number)=>
-getSignalByNumber(number,signals));
+var NUMERICIDENTIFIER = R++
+src[NUMERICIDENTIFIER] = '0|[1-9]\\d*'
+var NUMERICIDENTIFIERLOOSE = R++
+src[NUMERICIDENTIFIERLOOSE] = '[0-9]+'
 
-return Object.assign({},...signalsA);
-};
+// ## Non-numeric Identifier
+// Zero or more digits, followed by a letter or hyphen, and then zero or
+// more letters, digits, or hyphens.
 
-const getSignalByNumber=function(number,signals){
-const signal=findSignalByNumber(number,signals);
+var NONNUMERICIDENTIFIER = R++
+src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*'
 
-if(signal===undefined){
-return{};
-}
+// ## Main Version
+// Three dot-separated numeric identifiers.
 
-const{name,description,supported,action,forced,standard}=signal;
-return{
-[number]:{
-name,
-number,
-description,
-supported,
-action,
-forced,
-standard}};
+var MAINVERSION = R++
+src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')'
 
+var MAINVERSIONLOOSE = R++
+src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')'
 
-};
+// ## Pre-release Version Identifier
+// A numeric identifier, or a non-numeric identifier.
 
+var PRERELEASEIDENTIFIER = R++
+src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
+                            '|' + src[NONNUMERICIDENTIFIER] + ')'
 
+var PRERELEASEIDENTIFIERLOOSE = R++
+src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
+                                 '|' + src[NONNUMERICIDENTIFIER] + ')'
 
-const findSignalByNumber=function(number,signals){
-const signal=signals.find(({name})=>_os.constants.signals[name]===number);
+// ## Pre-release Version
+// Hyphen, followed by one or more dot-separated pre-release version
+// identifiers.
 
-if(signal!==undefined){
-return signal;
-}
+var PRERELEASE = R++
+src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
+                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))'
 
-return signals.find(signalA=>signalA.number===number);
-};
+var PRERELEASELOOSE = R++
+src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
+                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))'
 
-const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumber;
-//# sourceMappingURL=main.js.map
+// ## Build Metadata Identifier
+// Any combination of digits, letters, or hyphens.
 
-/***/ }),
-/* 143 */
-/***/ (function(module, exports, __webpack_require__) {
+var BUILDIDENTIFIER = R++
+src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+'
 
-"use strict";
-Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__(11);
+// ## Build Metadata
+// Plus sign, followed by one or more period-separated build metadata
+// identifiers.
 
-var _core=__webpack_require__(144);
-var _realtime=__webpack_require__(145);
+var BUILD = R++
+src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
+             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))'
 
+// ## Full Version String
+// A main version, followed optionally by a pre-release version and
+// build metadata.
 
+// 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.
 
-const getSignals=function(){
-const realtimeSignals=(0,_realtime.getRealtimeSignals)();
-const signals=[..._core.SIGNALS,...realtimeSignals].map(normalizeSignal);
-return signals;
-};exports.getSignals=getSignals;
+var FULL = R++
+var FULLPLAIN = 'v?' + src[MAINVERSION] +
+                src[PRERELEASE] + '?' +
+                src[BUILD] + '?'
 
+src[FULL] = '^' + FULLPLAIN + '$'
 
+// 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] + '?'
 
+var LOOSE = R++
+src[LOOSE] = '^' + LOOSEPLAIN + '$'
 
+var GTLT = R++
+src[GTLT] = '((?:<|>)?=?)'
 
+// 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|\\*'
 
+var XRANGEPLAIN = R++
+src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:' + src[PRERELEASE] + ')?' +
+                   src[BUILD] + '?' +
+                   ')?)?'
 
-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
+var XRANGEPLAINLOOSE = R++
+src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:' + src[PRERELEASELOOSE] + ')?' +
+                        src[BUILD] + '?' +
+                        ')?)?'
 
-/***/ }),
-/* 144 */
-/***/ (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";
-Object.defineProperty(exports,"__esModule",{value:true});exports.SIGNALS=void 0;
+// 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 SIGNALS=[
-{
-name:"SIGHUP",
-number:1,
-action:"terminate",
-description:"Terminal closed",
-standard:"posix"},
+// Tilde ranges.
+// Meaning is "reasonably at or greater than"
+var LONETILDE = R++
+src[LONETILDE] = '(?:~>?)'
 
-{
-name:"SIGINT",
-number:2,
-action:"terminate",
-description:"User interruption with CTRL-C",
-standard:"ansi"},
+var TILDETRIM = R++
+src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+'
+re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g')
+var tildeTrimReplace = '$1~'
 
-{
-name:"SIGQUIT",
-number:3,
-action:"core",
-description:"User interruption with CTRL-\\",
-standard:"posix"},
+var TILDE = R++
+src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$'
+var TILDELOOSE = R++
+src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$'
 
-{
-name:"SIGILL",
-number:4,
-action:"core",
-description:"Invalid machine instruction",
-standard:"ansi"},
+// Caret ranges.
+// Meaning is "at least and backwards compatible with"
+var LONECARET = R++
+src[LONECARET] = '(?:\\^)'
 
-{
-name:"SIGTRAP",
-number:5,
-action:"core",
-description:"Debugger breakpoint",
-standard:"posix"},
+var CARETTRIM = R++
+src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+'
+re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g')
+var caretTrimReplace = '$1^'
 
-{
-name:"SIGABRT",
-number:6,
-action:"core",
-description:"Aborted",
-standard:"ansi"},
+var CARET = R++
+src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$'
+var CARETLOOSE = R++
+src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$'
 
-{
-name:"SIGIOT",
-number:6,
-action:"core",
-description:"Aborted",
-standard:"bsd"},
+// 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 + ')$|^$'
 
-{
-name:"SIGBUS",
-number:7,
-action:"core",
-description:
-"Bus error due to misaligned, non-existing address or paging error",
-standard:"bsd"},
+// 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] + ')'
 
-{
-name:"SIGEMT",
-number:7,
-action:"terminate",
-description:"Command should be emulated but is not implemented",
-standard:"other"},
+// this one has to use the /g flag
+re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g')
+var comparatorTrimReplace = '$1$2$3'
 
-{
-name:"SIGFPE",
-number:8,
-action:"core",
-description:"Floating point arithmetic error",
-standard:"ansi"},
+// 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*$'
 
-{
-name:"SIGKILL",
-number:9,
-action:"terminate",
-description:"Forced termination",
-standard:"posix",
-forced:true},
+var HYPHENRANGELOOSE = R++
+src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s+-\\s+' +
+                        '(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s*$'
 
-{
-name:"SIGUSR1",
-number:10,
-action:"terminate",
-description:"Application-specific signal",
-standard:"posix"},
+// Star ranges basically just allow anything at all.
+var STAR = R++
+src[STAR] = '(<|>)?=?\\s*\\*'
 
-{
-name:"SIGSEGV",
-number:11,
-action:"core",
-description:"Segmentation fault",
-standard:"ansi"},
+// 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])
+  }
+}
 
-{
-name:"SIGUSR2",
-number:12,
-action:"terminate",
-description:"Application-specific signal",
-standard:"posix"},
+exports.parse = parse
+function parse (version, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-{
-name:"SIGPIPE",
-number:13,
-action:"terminate",
-description:"Broken pipe or socket",
-standard:"posix"},
+  if (version instanceof SemVer) {
+    return version
+  }
 
-{
-name:"SIGALRM",
-number:14,
-action:"terminate",
-description:"Timeout or timer",
-standard:"posix"},
+  if (typeof version !== 'string') {
+    return null
+  }
 
-{
-name:"SIGTERM",
-number:15,
-action:"terminate",
-description:"Termination",
-standard:"ansi"},
+  if (version.length > MAX_LENGTH) {
+    return null
+  }
 
-{
-name:"SIGSTKFLT",
-number:16,
-action:"terminate",
-description:"Stack is empty or overflowed",
-standard:"other"},
+  var r = options.loose ? re[LOOSE] : re[FULL]
+  if (!r.test(version)) {
+    return null
+  }
 
-{
-name:"SIGCHLD",
-number:17,
-action:"ignore",
-description:"Child process terminated, paused or unpaused",
-standard:"posix"},
+  try {
+    return new SemVer(version, options)
+  } catch (er) {
+    return null
+  }
+}
 
-{
-name:"SIGCLD",
-number:17,
-action:"ignore",
-description:"Child process terminated, paused or unpaused",
-standard:"other"},
+exports.valid = valid
+function valid (version, options) {
+  var v = parse(version, options)
+  return v ? v.version : null
+}
 
-{
-name:"SIGCONT",
-number:18,
-action:"unpause",
-description:"Unpaused",
-standard:"posix",
-forced:true},
+exports.clean = clean
+function clean (version, options) {
+  var s = parse(version.trim().replace(/^[=v]+/, ''), options)
+  return s ? s.version : null
+}
 
-{
-name:"SIGSTOP",
-number:19,
-action:"pause",
-description:"Paused",
-standard:"posix",
-forced:true},
+exports.SemVer = SemVer
 
-{
-name:"SIGTSTP",
-number:20,
-action:"pause",
-description:"Paused using CTRL-Z or \"suspend\"",
-standard:"posix"},
+function SemVer (version, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
+  if (version instanceof SemVer) {
+    if (version.loose === options.loose) {
+      return version
+    } else {
+      version = version.version
+    }
+  } else if (typeof version !== 'string') {
+    throw new TypeError('Invalid Version: ' + version)
+  }
 
-{
-name:"SIGTTIN",
-number:21,
-action:"pause",
-description:"Background process cannot read terminal input",
-standard:"posix"},
+  if (version.length > MAX_LENGTH) {
+    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+  }
 
-{
-name:"SIGBREAK",
-number:21,
-action:"terminate",
-description:"User interruption with CTRL-BREAK",
-standard:"other"},
+  if (!(this instanceof SemVer)) {
+    return new SemVer(version, options)
+  }
 
-{
-name:"SIGTTOU",
-number:22,
-action:"pause",
-description:"Background process cannot write to terminal output",
-standard:"posix"},
+  debug('SemVer', version, options)
+  this.options = options
+  this.loose = !!options.loose
 
-{
-name:"SIGURG",
-number:23,
-action:"ignore",
-description:"Socket received out-of-band data",
-standard:"bsd"},
+  var m = version.trim().match(options.loose ? re[LOOSE] : re[FULL])
 
-{
-name:"SIGXCPU",
-number:24,
-action:"core",
-description:"Process timed out",
-standard:"bsd"},
+  if (!m) {
+    throw new TypeError('Invalid Version: ' + version)
+  }
 
-{
-name:"SIGXFSZ",
-number:25,
-action:"core",
-description:"File too big",
-standard:"bsd"},
+  this.raw = version
 
-{
-name:"SIGVTALRM",
-number:26,
-action:"terminate",
-description:"Timeout or timer",
-standard:"bsd"},
+  // these are actually numbers
+  this.major = +m[1]
+  this.minor = +m[2]
+  this.patch = +m[3]
 
-{
-name:"SIGPROF",
-number:27,
-action:"terminate",
-description:"Timeout or timer",
-standard:"bsd"},
+  if (this.major > MAX_SAFE_INTEGER || this.major < 0) {
+    throw new TypeError('Invalid major version')
+  }
 
-{
-name:"SIGWINCH",
-number:28,
-action:"ignore",
-description:"Terminal window size changed",
-standard:"bsd"},
+  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) {
+    throw new TypeError('Invalid minor version')
+  }
 
-{
-name:"SIGIO",
-number:29,
-action:"terminate",
-description:"I/O is available",
-standard:"other"},
+  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) {
+    throw new TypeError('Invalid patch version')
+  }
 
-{
-name:"SIGPOLL",
-number:29,
-action:"terminate",
-description:"Watched event",
-standard:"other"},
+  // 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
+    })
+  }
 
-{
-name:"SIGINFO",
-number:29,
-action:"ignore",
-description:"Request for process information",
-standard:"other"},
+  this.build = m[5] ? m[5].split('.') : []
+  this.format()
+}
 
-{
-name:"SIGPWR",
-number:30,
-action:"terminate",
-description:"Device running out of power",
-standard:"systemv"},
+SemVer.prototype.format = function () {
+  this.version = this.major + '.' + this.minor + '.' + this.patch
+  if (this.prerelease.length) {
+    this.version += '-' + this.prerelease.join('.')
+  }
+  return this.version
+}
 
-{
-name:"SIGSYS",
-number:31,
-action:"core",
-description:"Invalid system call",
-standard:"other"},
+SemVer.prototype.toString = function () {
+  return this.version
+}
 
-{
-name:"SIGUNUSED",
-number:31,
-action:"terminate",
-description:"Invalid system call",
-standard:"other"}];exports.SIGNALS=SIGNALS;
-//# sourceMappingURL=core.js.map
+SemVer.prototype.compare = function (other) {
+  debug('SemVer.compare', this.version, this.options, other)
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-/***/ }),
-/* 145 */
-/***/ (function(module, exports, __webpack_require__) {
+  return this.compareMain(other) || this.comparePre(other)
+}
 
-"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;
+SemVer.prototype.compareMain = function (other) {
+  if (!(other instanceof SemVer)) {
+    other = new SemVer(other, this.options)
+  }
 
-const getRealtimeSignal=function(value,index){
-return{
-name:`SIGRT${index+1}`,
-number:SIGRTMIN+index,
-action:"terminate",
-description:"Application-specific signal (realtime)",
-standard:"posix"};
+  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.options)
+  }
 
-const SIGRTMIN=34;
-const SIGRTMAX=64;exports.SIGRTMAX=SIGRTMAX;
-//# sourceMappingURL=realtime.js.map
+  // 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
+  }
 
-/***/ }),
-/* 146 */
-/***/ (function(module, exports, __webpack_require__) {
+  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)
+}
 
-"use strict";
+// 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
 
-const aliases = ['stdin', 'stdout', 'stderr'];
+    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 hasAlias = opts => aliases.some(alias => opts[alias] !== undefined);
+    default:
+      throw new Error('invalid increment argument: ' + release)
+  }
+  this.format()
+  this.raw = this.version
+  return this
+}
 
-const normalizeStdio = opts => {
-	if (!opts) {
-		return;
-	}
+exports.inc = inc
+function inc (version, release, loose, identifier) {
+  if (typeof (loose) === 'string') {
+    identifier = loose
+    loose = undefined
+  }
 
-	const {stdio} = opts;
+  try {
+    return new SemVer(version, loose).inc(release, identifier).version
+  } catch (er) {
+    return null
+  }
+}
 
-	if (stdio === undefined) {
-		return aliases.map(alias => opts[alias]);
-	}
+exports.diff = diff
+function diff (version1, version2) {
+  if (eq(version1, version2)) {
+    return null
+  } else {
+    var v1 = parse(version1)
+    var v2 = parse(version2)
+    var prefix = ''
+    if (v1.prerelease.length || v2.prerelease.length) {
+      prefix = 'pre'
+      var defaultResult = 'prerelease'
+    }
+    for (var key in v1) {
+      if (key === 'major' || key === 'minor' || key === 'patch') {
+        if (v1[key] !== v2[key]) {
+          return prefix + key
+        }
+      }
+    }
+    return defaultResult // may be undefined
+  }
+}
 
-	if (hasAlias(opts)) {
-		throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${aliases.map(alias => `\`${alias}\``).join(', ')}`);
-	}
+exports.compareIdentifiers = compareIdentifiers
 
-	if (typeof stdio === 'string') {
-		return stdio;
-	}
+var numeric = /^[0-9]+$/
+function compareIdentifiers (a, b) {
+  var anum = numeric.test(a)
+  var bnum = numeric.test(b)
 
-	if (!Array.isArray(stdio)) {
-		throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``);
-	}
+  if (anum && bnum) {
+    a = +a
+    b = +b
+  }
 
-	const length = Math.max(stdio.length, aliases.length);
-	return Array.from({length}, (value, index) => stdio[index]);
-};
+  return a === b ? 0
+    : (anum && !bnum) ? -1
+    : (bnum && !anum) ? 1
+    : a < b ? -1
+    : 1
+}
 
-module.exports = normalizeStdio;
+exports.rcompareIdentifiers = rcompareIdentifiers
+function rcompareIdentifiers (a, b) {
+  return compareIdentifiers(b, a)
+}
 
-// `ipc` is pushed unless it is already present
-module.exports.node = opts => {
-	const stdio = normalizeStdio(opts);
+exports.major = major
+function major (a, loose) {
+  return new SemVer(a, loose).major
+}
 
-	if (stdio === 'ipc') {
-		return 'ipc';
-	}
+exports.minor = minor
+function minor (a, loose) {
+  return new SemVer(a, loose).minor
+}
 
-	if (stdio === undefined || typeof stdio === 'string') {
-		return [stdio, stdio, stdio, 'ipc'];
-	}
+exports.patch = patch
+function patch (a, loose) {
+  return new SemVer(a, loose).patch
+}
 
-	if (stdio.includes('ipc')) {
-		return stdio;
-	}
+exports.compare = compare
+function compare (a, b, loose) {
+  return new SemVer(a, loose).compare(new SemVer(b, loose))
+}
 
-	return [...stdio, 'ipc'];
-};
+exports.compareLoose = compareLoose
+function compareLoose (a, b) {
+  return compare(a, b, true)
+}
 
+exports.rcompare = rcompare
+function rcompare (a, b, loose) {
+  return compare(b, a, loose)
+}
 
-/***/ }),
-/* 147 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.sort = sort
+function sort (list, loose) {
+  return list.sort(function (a, b) {
+    return exports.compare(a, b, loose)
+  })
+}
 
-"use strict";
+exports.rsort = rsort
+function rsort (list, loose) {
+  return list.sort(function (a, b) {
+    return exports.rcompare(a, b, loose)
+  })
+}
 
-const os = __webpack_require__(11);
-const onExit = __webpack_require__(110);
-const pFinally = __webpack_require__(148);
+exports.gt = gt
+function gt (a, b, loose) {
+  return compare(a, b, loose) > 0
+}
 
-const DEFAULT_FORCE_KILL_TIMEOUT = 1000 * 5;
+exports.lt = lt
+function lt (a, b, loose) {
+  return compare(a, b, loose) < 0
+}
 
-// 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;
-};
+exports.eq = eq
+function eq (a, b, loose) {
+  return compare(a, b, loose) === 0
+}
 
-const setKillTimeout = (kill, signal, options, killResult) => {
-	if (!shouldForceKill(signal, options, killResult)) {
-		return;
-	}
+exports.neq = neq
+function neq (a, b, loose) {
+  return compare(a, b, loose) !== 0
+}
 
-	const timeout = getForceKillAfterTimeout(options);
-	setTimeout(() => {
-		kill('SIGKILL');
-	}, timeout).unref();
-};
+exports.gte = gte
+function gte (a, b, loose) {
+  return compare(a, b, loose) >= 0
+}
 
-const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => {
-	return isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
-};
+exports.lte = lte
+function lte (a, b, loose) {
+  return compare(a, b, loose) <= 0
+}
 
-const isSigterm = signal => {
-	return signal === os.constants.signals.SIGTERM ||
-		(typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM');
-};
+exports.cmp = cmp
+function cmp (a, op, b, loose) {
+  switch (op) {
+    case '===':
+      if (typeof a === 'object')
+        a = a.version
+      if (typeof b === 'object')
+        b = b.version
+      return a === b
 
-const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => {
-	if (forceKillAfterTimeout === true) {
-		return DEFAULT_FORCE_KILL_TIMEOUT;
-	}
+    case '!==':
+      if (typeof a === 'object')
+        a = a.version
+      if (typeof b === 'object')
+        b = b.version
+      return a !== b
 
-	if (!Number.isInteger(forceKillAfterTimeout) || forceKillAfterTimeout < 0) {
-		throw new TypeError(`Expected the \`forceKillAfterTimeout\` option to be a non-negative integer, got \`${forceKillAfterTimeout}\` (${typeof forceKillAfterTimeout})`);
-	}
+    case '':
+    case '=':
+    case '==':
+      return eq(a, b, loose)
 
-	return forceKillAfterTimeout;
-};
+    case '!=':
+      return neq(a, b, loose)
 
-// `childProcess.cancel()`
-const spawnedCancel = (spawned, context) => {
-	const killResult = spawned.kill();
+    case '>':
+      return gt(a, b, loose)
 
-	if (killResult) {
-		context.isCanceled = true;
-	}
-};
+    case '>=':
+      return gte(a, b, loose)
 
-const timeoutKill = (spawned, signal, reject) => {
-	spawned.kill(signal);
-	reject(Object.assign(new Error('Timed out'), {timedOut: true, signal}));
-};
+    case '<':
+      return lt(a, b, loose)
 
-// `timeout` option handling
-const setupTimeout = (spawned, {timeout, killSignal = 'SIGTERM'}, spawnedPromise) => {
-	if (timeout === 0 || timeout === undefined) {
-		return spawnedPromise;
-	}
+    case '<=':
+      return lte(a, b, loose)
 
-	if (!Number.isInteger(timeout) || timeout < 0) {
-		throw new TypeError(`Expected the \`timeout\` option to be a non-negative integer, got \`${timeout}\` (${typeof timeout})`);
-	}
+    default:
+      throw new TypeError('Invalid operator: ' + op)
+  }
+}
 
-	let timeoutId;
-	const timeoutPromise = new Promise((resolve, reject) => {
-		timeoutId = setTimeout(() => {
-			timeoutKill(spawned, killSignal, reject);
-		}, timeout);
-	});
+exports.Comparator = Comparator
+function Comparator (comp, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-	const safeSpawnedPromise = pFinally(spawnedPromise, () => {
-		clearTimeout(timeoutId);
-	});
+  if (comp instanceof Comparator) {
+    if (comp.loose === !!options.loose) {
+      return comp
+    } else {
+      comp = comp.value
+    }
+  }
 
-	return Promise.race([timeoutPromise, safeSpawnedPromise]);
-};
+  if (!(this instanceof Comparator)) {
+    return new Comparator(comp, options)
+  }
 
-// `cleanup` option handling
-const setExitHandler = (spawned, {cleanup, detached}, timedPromise) => {
-	if (!cleanup || detached) {
-		return timedPromise;
-	}
+  debug('comparator', comp, options)
+  this.options = options
+  this.loose = !!options.loose
+  this.parse(comp)
 
-	const removeExitHandler = onExit(() => {
-		spawned.kill();
-	});
+  if (this.semver === ANY) {
+    this.value = ''
+  } else {
+    this.value = this.operator + this.semver.version
+  }
 
-	// TODO: Use native "finally" syntax when targeting Node.js 10
-	return pFinally(timedPromise, removeExitHandler);
-};
+  debug('comp', this)
+}
 
-module.exports = {
-	spawnedKill,
-	spawnedCancel,
-	setupTimeout,
-	setExitHandler
-};
+var ANY = {}
+Comparator.prototype.parse = function (comp) {
+  var r = this.options.loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
+  var m = comp.match(r)
 
+  if (!m) {
+    throw new TypeError('Invalid comparator: ' + comp)
+  }
 
-/***/ }),
-/* 148 */
-/***/ (function(module, exports, __webpack_require__) {
+  this.operator = m[1]
+  if (this.operator === '=') {
+    this.operator = ''
+  }
 
-"use strict";
+  // if it literally is just '>' or '' then allow anything.
+  if (!m[2]) {
+    this.semver = ANY
+  } else {
+    this.semver = new SemVer(m[2], this.options.loose)
+  }
+}
 
+Comparator.prototype.toString = function () {
+  return this.value
+}
 
-module.exports = async (
-	promise,
-	onFinally = (() => {})
-) => {
-	let value;
-	try {
-		value = await promise;
-	} catch (error) {
-		await onFinally();
-		throw error;
-	}
+Comparator.prototype.test = function (version) {
+  debug('Comparator.test', version, this.options.loose)
 
-	await onFinally();
-	return value;
-};
+  if (this.semver === ANY) {
+    return true
+  }
 
+  if (typeof version === 'string') {
+    version = new SemVer(version, this.options)
+  }
 
-/***/ }),
-/* 149 */
-/***/ (function(module, exports, __webpack_require__) {
+  return cmp(version, this.operator, this.semver, this.options)
+}
 
-"use strict";
+Comparator.prototype.intersects = function (comp, options) {
+  if (!(comp instanceof Comparator)) {
+    throw new TypeError('a Comparator is required')
+  }
 
-const isStream = __webpack_require__(150);
-const getStream = __webpack_require__(151);
-const mergeStream = __webpack_require__(155);
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-// `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;
-	}
+  var rangeTmp
 
-	if (isStream(input)) {
-		input.pipe(spawned.stdin);
-	} else {
-		spawned.stdin.end(input);
-	}
-};
+  if (this.operator === '') {
+    rangeTmp = new Range(comp.value, options)
+    return satisfies(this.value, rangeTmp, options)
+  } else if (comp.operator === '') {
+    rangeTmp = new Range(this.value, options)
+    return satisfies(comp.semver, rangeTmp, options)
+  }
 
-// `all` interleaves `stdout` and `stderr`
-const makeAllStream = (spawned, {all}) => {
-	if (!all || (!spawned.stdout && !spawned.stderr)) {
-		return;
-	}
+  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, options) &&
+    ((this.operator === '>=' || this.operator === '>') &&
+    (comp.operator === '<=' || comp.operator === '<'))
+  var oppositeDirectionsGreaterThan =
+    cmp(this.semver, '>', comp.semver, options) &&
+    ((this.operator === '<=' || this.operator === '<') &&
+    (comp.operator === '>=' || comp.operator === '>'))
 
-	const mixed = mergeStream();
+  return sameDirectionIncreasing || sameDirectionDecreasing ||
+    (sameSemVer && differentDirectionsInclusive) ||
+    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan
+}
 
-	if (spawned.stdout) {
-		mixed.add(spawned.stdout);
-	}
+exports.Range = Range
+function Range (range, options) {
+  if (!options || typeof options !== 'object') {
+    options = {
+      loose: !!options,
+      includePrerelease: false
+    }
+  }
 
-	if (spawned.stderr) {
-		mixed.add(spawned.stderr);
-	}
+  if (range instanceof Range) {
+    if (range.loose === !!options.loose &&
+        range.includePrerelease === !!options.includePrerelease) {
+      return range
+    } else {
+      return new Range(range.raw, options)
+    }
+  }
 
-	return mixed;
-};
+  if (range instanceof Comparator) {
+    return new Range(range.value, options)
+  }
 
-// On failure, `result.stdout|stderr|all` should contain the currently buffered stream
-const getBufferedData = async (stream, streamPromise) => {
-	if (!stream) {
-		return;
-	}
+  if (!(this instanceof Range)) {
+    return new Range(range, options)
+  }
 
-	stream.destroy();
+  this.options = options
+  this.loose = !!options.loose
+  this.includePrerelease = !!options.includePrerelease
 
-	try {
-		return await streamPromise;
-	} catch (error) {
-		return error.bufferedData;
-	}
-};
+  // 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
+  })
 
-const getStreamPromise = (stream, {encoding, buffer, maxBuffer}) => {
-	if (!stream || !buffer) {
-		return;
-	}
+  if (!this.set.length) {
+    throw new TypeError('Invalid SemVer Range: ' + range)
+  }
 
-	if (encoding) {
-		return getStream(stream, {encoding, maxBuffer});
-	}
+  this.format()
+}
 
-	return getStream.buffer(stream, {maxBuffer});
-};
+Range.prototype.format = function () {
+  this.range = this.set.map(function (comps) {
+    return comps.join(' ').trim()
+  }).join('||').trim()
+  return this.range
+}
 
-// 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});
+Range.prototype.toString = function () {
+  return this.range
+}
 
-	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)
-		]);
-	}
-};
+Range.prototype.parseRange = function (range) {
+  var loose = this.options.loose
+  range = range.trim()
+  // `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 validateInputSync = ({input}) => {
-	if (isStream(input)) {
-		throw new TypeError('The `input` option cannot be a stream in sync mode');
-	}
-};
+  // `~ 1.2.3` => `~1.2.3`
+  range = range.replace(re[TILDETRIM], tildeTrimReplace)
 
-module.exports = {
-	handleInput,
-	makeAllStream,
-	getSpawnedResult,
-	validateInputSync
-};
+  // `^ 1.2.3` => `^1.2.3`
+  range = range.replace(re[CARETTRIM], caretTrimReplace)
 
+  // normalize spaces
+  range = range.split(/\s+/).join(' ')
 
+  // At this point, the range is completely trimmed and
+  // ready to be split into comparators.
 
-/***/ }),
-/* 150 */
-/***/ (function(module, exports, __webpack_require__) {
+  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR]
+  var set = range.split(' ').map(function (comp) {
+    return parseComparator(comp, this.options)
+  }, this).join(' ').split(/\s+/)
+  if (this.options.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, this.options)
+  }, this)
 
-"use strict";
+  return set
+}
 
+Range.prototype.intersects = function (range, options) {
+  if (!(range instanceof Range)) {
+    throw new TypeError('a Range is required')
+  }
 
-const isStream = stream =>
-	stream !== null &&
-	typeof stream === 'object' &&
-	typeof stream.pipe === 'function';
+  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, options)
+        })
+      })
+    })
+  })
+}
 
-isStream.writable = stream =>
-	isStream(stream) &&
-	stream.writable !== false &&
-	typeof stream._write === 'function' &&
-	typeof stream._writableState === 'object';
+// Mostly just for testing and legacy API reasons
+exports.toComparators = toComparators
+function toComparators (range, options) {
+  return new Range(range, options).set.map(function (comp) {
+    return comp.map(function (c) {
+      return c.value
+    }).join(' ').trim().split(' ')
+  })
+}
 
-isStream.readable = stream =>
-	isStream(stream) &&
-	stream.readable !== false &&
-	typeof stream._read === 'function' &&
-	typeof stream._readableState === 'object';
+// 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, options) {
+  debug('comp', comp, options)
+  comp = replaceCarets(comp, options)
+  debug('caret', comp)
+  comp = replaceTildes(comp, options)
+  debug('tildes', comp)
+  comp = replaceXRanges(comp, options)
+  debug('xrange', comp)
+  comp = replaceStars(comp, options)
+  debug('stars', comp)
+  return comp
+}
 
-isStream.duplex = stream =>
-	isStream.writable(stream) &&
-	isStream.readable(stream);
+function isX (id) {
+  return !id || id.toLowerCase() === 'x' || id === '*'
+}
 
-isStream.transform = stream =>
-	isStream.duplex(stream) &&
-	typeof stream._transform === 'function' &&
-	typeof stream._transformState === 'object';
+// ~, ~> --> * (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, options) {
+  return comp.trim().split(/\s+/).map(function (comp) {
+    return replaceTilde(comp, options)
+  }).join(' ')
+}
 
-module.exports = isStream;
+function replaceTilde (comp, options) {
+  var r = options.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)
+      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'
+    }
 
+    debug('tilde return', ret)
+    return ret
+  })
+}
 
-/***/ }),
-/* 151 */
-/***/ (function(module, exports, __webpack_require__) {
+// ^ --> * (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, options) {
+  return comp.trim().split(/\s+/).map(function (comp) {
+    return replaceCaret(comp, options)
+  }).join(' ')
+}
 
-"use strict";
+function replaceCaret (comp, options) {
+  debug('caret', comp, options)
+  var r = options.loose ? re[CARETLOOSE] : re[CARET]
+  return comp.replace(r, function (_, M, m, p, pr) {
+    debug('caret', comp, _, M, m, p, pr)
+    var ret
 
-const pump = __webpack_require__(152);
-const bufferStream = __webpack_require__(154);
+    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 (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'
+      }
+    }
 
-class MaxBufferError extends Error {
-	constructor() {
-		super('maxBuffer exceeded');
-		this.name = 'MaxBufferError';
-	}
+    debug('caret return', ret)
+    return ret
+  })
 }
 
-async function getStream(inputStream, options) {
-	if (!inputStream) {
-		return Promise.reject(new Error('Expected a stream'));
-	}
-
-	options = {
-		maxBuffer: Infinity,
-		...options
-	};
+function replaceXRanges (comp, options) {
+  debug('replaceXRanges', comp, options)
+  return comp.split(/\s+/).map(function (comp) {
+    return replaceXRange(comp, options)
+  }).join(' ')
+}
 
-	const {maxBuffer} = options;
+function replaceXRange (comp, options) {
+  comp = comp.trim()
+  var r = options.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
 
-	let stream;
-	await new Promise((resolve, reject) => {
-		const rejectPromise = error => {
-			if (error) { // A null check
-				error.bufferedData = stream.getBufferedValue();
-			}
+    if (gtlt === '=' && anyX) {
+      gtlt = ''
+    }
 
-			reject(error);
-		};
+    if (xM) {
+      if (gtlt === '>' || gtlt === '<') {
+        // nothing is allowed
+        ret = '<0.0.0'
+      } else {
+        // nothing is forbidden
+        ret = '*'
+      }
+    } else if (gtlt && anyX) {
+      // we know patch is an x, because we have any x at all.
+      // replace X with 0
+      if (xm) {
+        m = 0
+      }
+      p = 0
 
-		stream = pump(inputStream, bufferStream(options), error => {
-			if (error) {
-				rejectPromise(error);
-				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 {
+          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
+        }
+      }
 
-			resolve();
-		});
+      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'
+    }
 
-		stream.on('data', () => {
-			if (stream.getBufferedLength() > maxBuffer) {
-				rejectPromise(new MaxBufferError());
-			}
-		});
-	});
+    debug('xRange return', ret)
 
-	return stream.getBufferedValue();
+    return ret
+  })
 }
 
-module.exports = getStream;
-// 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;
-
-
-/***/ }),
-/* 152 */
-/***/ (function(module, exports, __webpack_require__) {
+// Because * is AND-ed with everything else in the comparator,
+// and '' means "any version", just remove the *s entirely.
+function replaceStars (comp, options) {
+  debug('replaceStars', comp, options)
+  // Looseness is ignored here.  star is always as loose as it gets!
+  return comp.trim().replace(re[STAR], '')
+}
 
-var once = __webpack_require__(52)
-var eos = __webpack_require__(153)
-var fs = __webpack_require__(23) // we only need fs to get the ReadStream and WriteStream prototypes
+// 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) {
+  if (isX(fM)) {
+    from = ''
+  } else if (isX(fm)) {
+    from = '>=' + fM + '.0.0'
+  } else if (isX(fp)) {
+    from = '>=' + fM + '.' + fm + '.0'
+  } else {
+    from = '>=' + from
+  }
 
-var noop = function () {}
-var ancient = /^v?\.0/.test(process.version)
+  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
+  }
 
-var isFn = function (fn) {
-  return typeof fn === 'function'
+  return (from + ' ' + to).trim()
 }
 
-var isFS = function (stream) {
-  if (!ancient) return false // newer node version do not need to care about fs is a special way
-  if (!fs) return false // browser
-  return (stream instanceof (fs.ReadStream || noop) || stream instanceof (fs.WriteStream || noop)) && isFn(stream.close)
-}
+// if ANY of the sets match ALL of its comparators, then pass
+Range.prototype.test = function (version) {
+  if (!version) {
+    return false
+  }
 
-var isRequest = function (stream) {
-  return stream.setHeader && isFn(stream.abort)
-}
+  if (typeof version === 'string') {
+    version = new SemVer(version, this.options)
+  }
 
-var destroyer = function (stream, reading, writing, callback) {
-  callback = once(callback)
+  for (var i = 0; i < this.set.length; i++) {
+    if (testSet(this.set[i], version, this.options)) {
+      return true
+    }
+  }
+  return false
+}
 
-  var closed = false
-  stream.on('close', function () {
-    closed = true
-  })
+function testSet (set, version, options) {
+  for (var i = 0; i < set.length; i++) {
+    if (!set[i].test(version)) {
+      return false
+    }
+  }
 
-  eos(stream, {readable: reading, writable: writing}, function (err) {
-    if (err) return callback(err)
-    closed = true
-    callback()
-  })
+  if (version.prerelease.length && !options.includePrerelease) {
+    // 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 (i = 0; i < set.length; i++) {
+      debug(set[i].semver)
+      if (set[i].semver === ANY) {
+        continue
+      }
 
-  var destroyed = false
-  return function (err) {
-    if (closed) return
-    if (destroyed) return
-    destroyed = true
+      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
+        }
+      }
+    }
 
-    if (isFS(stream)) return stream.close(noop) // use close for fs streams to avoid fd leaks
-    if (isRequest(stream)) return stream.abort() // request.destroy just do .end - .abort is what we want
+    // Version has a -pre, but it's not one of the ones we like.
+    return false
+  }
 
-    if (isFn(stream.destroy)) return stream.destroy()
+  return true
+}
 
-    callback(err || new Error('stream was destroyed'))
+exports.satisfies = satisfies
+function satisfies (version, range, options) {
+  try {
+    range = new Range(range, options)
+  } catch (er) {
+    return false
   }
+  return range.test(version)
 }
 
-var call = function (fn) {
-  fn()
+exports.maxSatisfying = maxSatisfying
+function maxSatisfying (versions, range, options) {
+  var max = null
+  var maxSV = null
+  try {
+    var rangeObj = new Range(range, options)
+  } catch (er) {
+    return null
+  }
+  versions.forEach(function (v) {
+    if (rangeObj.test(v)) {
+      // satisfies(v, range, options)
+      if (!max || maxSV.compare(v) === -1) {
+        // compare(max, v, true)
+        max = v
+        maxSV = new SemVer(max, options)
+      }
+    }
+  })
+  return max
 }
 
-var pipe = function (from, to) {
-  return from.pipe(to)
+exports.minSatisfying = minSatisfying
+function minSatisfying (versions, range, options) {
+  var min = null
+  var minSV = null
+  try {
+    var rangeObj = new Range(range, options)
+  } catch (er) {
+    return null
+  }
+  versions.forEach(function (v) {
+    if (rangeObj.test(v)) {
+      // satisfies(v, range, options)
+      if (!min || minSV.compare(v) === 1) {
+        // compare(min, v, true)
+        min = v
+        minSV = new SemVer(min, options)
+      }
+    }
+  })
+  return min
 }
 
-var pump = function () {
-  var streams = Array.prototype.slice.call(arguments)
-  var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop
+exports.minVersion = minVersion
+function minVersion (range, loose) {
+  range = new Range(range, loose)
 
-  if (Array.isArray(streams[0])) streams = streams[0]
-  if (streams.length < 2) throw new Error('pump requires two streams per minimum')
+  var minver = new SemVer('0.0.0')
+  if (range.test(minver)) {
+    return minver
+  }
 
-  var error
-  var destroys = streams.map(function (stream, i) {
-    var reading = i < streams.length - 1
-    var writing = i > 0
-    return destroyer(stream, reading, writing, function (err) {
-      if (!error) error = err
-      if (err) destroys.forEach(call)
-      if (reading) return
-      destroys.forEach(call)
-      callback(error)
-    })
-  })
+  minver = new SemVer('0.0.0-0')
+  if (range.test(minver)) {
+    return minver
+  }
 
-  return streams.reduce(pipe)
-}
+  minver = null
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i]
 
-module.exports = pump
+    comparators.forEach(function (comparator) {
+      // Clone to avoid manipulating the comparator's semver object.
+      var compver = new SemVer(comparator.semver.version)
+      switch (comparator.operator) {
+        case '>':
+          if (compver.prerelease.length === 0) {
+            compver.patch++
+          } else {
+            compver.prerelease.push(0)
+          }
+          compver.raw = compver.format()
+          /* fallthrough */
+        case '':
+        case '>=':
+          if (!minver || gt(minver, compver)) {
+            minver = compver
+          }
+          break
+        case '<':
+        case '<=':
+          /* Ignore maximum versions */
+          break
+        /* istanbul ignore next */
+        default:
+          throw new Error('Unexpected operation: ' + comparator.operator)
+      }
+    })
+  }
 
+  if (minver && range.test(minver)) {
+    return minver
+  }
 
-/***/ }),
-/* 153 */
-/***/ (function(module, exports, __webpack_require__) {
+  return null
+}
 
-var once = __webpack_require__(52);
+exports.validRange = validRange
+function validRange (range, options) {
+  try {
+    // Return '*' instead of '' so that truthiness works.
+    // This will throw if it's invalid anyway
+    return new Range(range, options).range || '*'
+  } catch (er) {
+    return null
+  }
+}
 
-var noop = function() {};
+// Determine if version is less than all the versions possible in the range
+exports.ltr = ltr
+function ltr (version, range, options) {
+  return outside(version, range, '<', options)
+}
 
-var isRequest = function(stream) {
-	return stream.setHeader && typeof stream.abort === 'function';
-};
+// Determine if version is greater than all the versions possible in the range.
+exports.gtr = gtr
+function gtr (version, range, options) {
+  return outside(version, range, '>', options)
+}
 
-var isChildProcess = function(stream) {
-	return stream.stdio && Array.isArray(stream.stdio) && stream.stdio.length === 3
-};
+exports.outside = outside
+function outside (version, range, hilo, options) {
+  version = new SemVer(version, options)
+  range = new Range(range, options)
 
-var eos = function(stream, opts, callback) {
-	if (typeof opts === 'function') return eos(stream, null, opts);
-	if (!opts) opts = {};
+  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 ">"')
+  }
 
-	callback = once(callback || noop);
+  // If it satisifes the range it is not outside
+  if (satisfies(version, range, options)) {
+    return false
+  }
 
-	var ws = stream._writableState;
-	var rs = stream._readableState;
-	var readable = opts.readable || (opts.readable !== false && stream.readable);
-	var writable = opts.writable || (opts.writable !== false && stream.writable);
+  // From now on, variable terms are as if we're in "gtr" mode.
+  // but note that everything is flipped for the "ltr" function.
 
-	var onlegacyfinish = function() {
-		if (!stream.writable) onfinish();
-	};
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i]
 
-	var onfinish = function() {
-		writable = false;
-		if (!readable) callback.call(stream);
-	};
+    var high = null
+    var low = null
 
-	var onend = function() {
-		readable = false;
-		if (!writable) callback.call(stream);
-	};
+    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, options)) {
+        high = comparator
+      } else if (ltfn(comparator.semver, low.semver, options)) {
+        low = comparator
+      }
+    })
 
-	var onexit = function(exitCode) {
-		callback.call(stream, exitCode ? new Error('exited with error code: ' + exitCode) : null);
-	};
+    // If the edge version comparator has a operator then our version
+    // isn't outside it
+    if (high.operator === comp || high.operator === ecomp) {
+      return false
+    }
 
-	var onerror = function(err) {
-		callback.call(stream, err);
-	};
+    // 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
+}
 
-	var onclose = function() {
-		if (readable && !(rs && rs.ended)) return callback.call(stream, new Error('premature close'));
-		if (writable && !(ws && ws.ended)) return callback.call(stream, new Error('premature close'));
-	};
+exports.prerelease = prerelease
+function prerelease (version, options) {
+  var parsed = parse(version, options)
+  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null
+}
 
-	var onrequest = function() {
-		stream.req.on('finish', onfinish);
-	};
+exports.intersects = intersects
+function intersects (r1, r2, options) {
+  r1 = new Range(r1, options)
+  r2 = new Range(r2, options)
+  return r1.intersects(r2)
+}
 
-	if (isRequest(stream)) {
-		stream.on('complete', onfinish);
-		stream.on('abort', onclose);
-		if (stream.req) onrequest();
-		else stream.on('request', onrequest);
-	} else if (writable && !ws) { // legacy streams
-		stream.on('end', onlegacyfinish);
-		stream.on('close', onlegacyfinish);
-	}
+exports.coerce = coerce
+function coerce (version) {
+  if (version instanceof SemVer) {
+    return version
+  }
 
-	if (isChildProcess(stream)) stream.on('exit', onexit);
+  if (typeof version !== 'string') {
+    return null
+  }
 
-	stream.on('end', onend);
-	stream.on('finish', onfinish);
-	if (opts.error !== false) stream.on('error', onerror);
-	stream.on('close', onclose);
+  var match = version.match(re[COERCE])
 
-	return function() {
-		stream.removeListener('complete', onfinish);
-		stream.removeListener('abort', onclose);
-		stream.removeListener('request', onrequest);
-		if (stream.req) stream.req.removeListener('finish', onfinish);
-		stream.removeListener('end', onlegacyfinish);
-		stream.removeListener('close', onlegacyfinish);
-		stream.removeListener('finish', onfinish);
-		stream.removeListener('exit', onexit);
-		stream.removeListener('end', onend);
-		stream.removeListener('error', onerror);
-		stream.removeListener('close', onclose);
-	};
-};
+  if (match == null) {
+    return null
+  }
 
-module.exports = eos;
+  return parse(match[1] +
+    '.' + (match[2] || '0') +
+    '.' + (match[3] || '0'))
+}
 
 
 /***/ }),
-/* 154 */
+/* 562 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const {PassThrough: PassThroughStream} = __webpack_require__(28);
 
-module.exports = options => {
-	options = {...options};
+const processFn = (fn, options) => function (...args) {
+	const P = options.promiseModule;
 
-	const {array} = options;
-	let {encoding} = options;
-	const isBuffer = encoding === 'buffer';
-	let objectMode = false;
+	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);
+		}
 
-	if (array) {
-		objectMode = !(encoding || isBuffer);
-	} else {
-		encoding = encoding || 'utf8';
-	}
+		fn.apply(this, args);
+	});
+};
 
-	if (isBuffer) {
-		encoding = null;
+module.exports = (input, options) => {
+	options = Object.assign({
+		exclude: [/.+(Sync|Stream)$/],
+		errorFirst: true,
+		promiseModule: Promise
+	}, options);
+
+	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}\``);
 	}
 
-	const stream = new PassThroughStream({objectMode});
+	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);
+	};
 
-	if (encoding) {
-		stream.setEncoding(encoding);
+	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));
 	}
 
-	let length = 0;
-	const chunks = [];
+	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;
+	}
 
-	stream.on('data', chunk => {
-		chunks.push(chunk);
+	return ret;
+};
 
-		if (objectMode) {
-			length = chunks.length;
-		} else {
-			length += chunk.length;
-		}
-	});
 
-	stream.getBufferedValue = () => {
-		if (array) {
-			return chunks;
-		}
+/***/ }),
+/* 563 */
+/***/ (function(module, exports, __webpack_require__) {
 
-		return isBuffer ? Buffer.concat(chunks, length) : chunks.join('');
-	};
+"use strict";
 
-	stream.getBufferedLength = () => length;
 
-	return stream;
-};
+// detect either spaces or tabs but not both to properly handle tabs
+// for indentation and spaces for alignment
+const INDENT_RE = /^(?:( )+|\t+)/;
 
+function getMostUsed(indents) {
+	let result = 0;
+	let maxUsed = 0;
+	let maxWeight = 0;
 
-/***/ }),
-/* 155 */
-/***/ (function(module, exports, __webpack_require__) {
+	for (const entry of indents) {
+		// TODO: use destructuring when targeting Node.js 6
+		const key = entry[0];
+		const val = entry[1];
 
-"use strict";
+		const u = val[0];
+		const w = val[1];
 
+		if (u > maxUsed || (u === maxUsed && w > maxWeight)) {
+			maxUsed = u;
+			maxWeight = w;
+			result = Number(key);
+		}
+	}
 
-const { PassThrough } = __webpack_require__(28);
+	return result;
+}
 
-module.exports = function (/*streams...*/) {
-  var sources = []
-  var output  = new PassThrough({objectMode: true})
+module.exports = str => {
+	if (typeof str !== 'string') {
+		throw new TypeError('Expected a string');
+	}
 
-  output.setMaxListeners(0)
+	// used to see if tabs or spaces are the most used
+	let tabs = 0;
+	let spaces = 0;
 
-  output.add = add
-  output.isEmpty = isEmpty
+	// remember the size of previous line's indentation
+	let prev = 0;
 
-  output.on('unpipe', remove)
+	// remember how many indents/unindents as occurred for a given size
+	// and how much lines follow a given indentation
+	//
+	// indents = {
+	//    3: [1, 0],
+	//    4: [1, 5],
+	//    5: [1, 0],
+	//   12: [1, 0],
+	// }
+	const indents = new Map();
 
-  Array.prototype.slice.call(arguments).forEach(add)
+	// pointer to the array of last used indent
+	let current;
 
-  return output
+	// whether the last action was an indent (opposed to an unindent)
+	let isIndent;
 
-  function add (source) {
-    if (Array.isArray(source)) {
-      source.forEach(add)
-      return this
-    }
+	for (const line of str.split(/\n/g)) {
+		if (!line) {
+			// ignore empty lines
+			continue;
+		}
 
-    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
-  }
+		let indent;
+		const matches = line.match(INDENT_RE);
 
-  function isEmpty () {
-    return sources.length == 0;
-  }
+		if (matches) {
+			indent = matches[0].length;
 
-  function remove (source) {
-    sources = sources.filter(function (it) { return it !== source })
-    if (!sources.length && output.readable) { output.end() }
-  }
-}
+			if (matches[1]) {
+				spaces++;
+			} else {
+				tabs++;
+			}
+		} else {
+			indent = 0;
+		}
 
+		const diff = indent - prev;
+		prev = indent;
 
-/***/ }),
-/* 156 */
-/***/ (function(module, exports, __webpack_require__) {
+		if (diff) {
+			// an indent or unindent has been detected
 
-"use strict";
+			isIndent = diff > 0;
 
-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);
+			current = indents.get(isIndent ? diff : -diff);
 
-	Object.defineProperty(spawned, property, {
-		value,
-		writable: true,
-		enumerable: false,
-		configurable: true
-	});
-};
+			if (current) {
+				current[0]++;
+			} else {
+				current = [1, 0];
+				indents.set(diff, current);
+			}
+		} else if (current) {
+			// if the last action was an indent, increment the weight
+			current[1] += Number(isIndent);
+		}
+	}
 
-// The return value is a mixin of `childProcess` and `Promise`
-const mergePromise = (spawned, promise) => {
-	mergePromiseProperty(spawned, promise, 'then');
-	mergePromiseProperty(spawned, promise, 'catch');
+	const amount = getMostUsed(indents);
 
-	// TODO: Remove the `if`-guard when targeting Node.js 10
-	if (Promise.prototype.finally) {
-		mergePromiseProperty(spawned, promise, 'finally');
+	let type;
+	let indent;
+	if (!amount) {
+		type = null;
+		indent = '';
+	} else if (spaces >= tabs) {
+		type = 'space';
+		indent = ' '.repeat(amount);
+	} else {
+		type = 'tab';
+		indent = '\t'.repeat(amount);
 	}
 
-	return spawned;
+	return {
+		amount,
+		type,
+		indent
+	};
 };
 
-// Use promises instead of `child_process` events
-const getSpawnedPromise = spawned => {
-	return new Promise((resolve, reject) => {
-		spawned.on('exit', (exitCode, signal) => {
-			resolve({exitCode, signal});
-		});
 
-		spawned.on('error', error => {
-			reject(error);
-		});
+/***/ }),
+/* 564 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-		if (spawned.stdin) {
-			spawned.stdin.on('error', error => {
-				reject(error);
-			});
-		}
-	});
-};
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "installInDir", function() { return installInDir; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackage", function() { return runScriptInPackage; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "runScriptInPackageStreaming", function() { return runScriptInPackageStreaming; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yarnWorkspacesInfo", function() { return yarnWorkspacesInfo; });
+/* harmony import */ var _child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(565);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 = {
-	mergePromise,
-	getSpawnedPromise
-};
 
+/**
+ * Install all dependencies in the given directory
+ */
+async function installInDir(directory, extraArgs = []) {
+  const options = ['install', '--non-interactive', ...extraArgs]; // We pass the mutex flag to ensure only one instance of yarn runs at any
+  // given time (e.g. to avoid conflicts).
+
+  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])('yarn', options, {
+    cwd: directory
+  });
+}
+/**
+ * Run script in the given directory
+ */
+
+async function runScriptInPackage(script, args, pkg) {
+  const execOpts = {
+    cwd: pkg.path
+  };
+  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])('yarn', ['run', script, ...args], execOpts);
+}
+/**
+ * Run script in the given directory
+ */
 
+function runScriptInPackageStreaming(script, args, pkg) {
+  const execOpts = {
+    cwd: pkg.path
+  };
+  return Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawnStreaming"])('yarn', ['run', script, ...args], execOpts, {
+    prefix: pkg.name
+  });
+}
+async function yarnWorkspacesInfo(directory) {
+  const workspacesInfo = await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])('yarn', ['workspaces', 'info', '--json'], {
+    cwd: directory,
+    stdio: 'pipe'
+  });
+  const stdout = JSON.parse(workspacesInfo.stdout);
+  return JSON.parse(stdout.data);
+}
 
 /***/ }),
-/* 157 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 565 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "spawn", function() { return spawn; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "spawnStreaming", function() { return spawnStreaming; });
+/* 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 execa__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(351);
+/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(566);
+/* 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__(571);
+/* 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; }
 
-const SPACES_REGEXP = / +/g;
-
-const joinCommand = (file, args = []) => {
-	if (!Array.isArray(args)) {
-		return file;
-	}
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-	return [file, ...args].join(' ');
-};
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-// Allow spaces to be escaped by a backslash if not meant as a delimiter
-const handleEscaping = (tokens, token, index) => {
-	if (index === 0) {
-		return [token];
-	}
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 previousToken = tokens[tokens.length - 1];
 
-	if (previousToken.endsWith('\\')) {
-		return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`];
-	}
 
-	return [...tokens, token];
-};
 
-// Handle `execa.command()`
-const parseCommand = command => {
-	return command
-		.trim()
-		.split(SPACES_REGEXP)
-		.reduce(handleEscaping, []);
-};
 
-module.exports = {
-	joinCommand,
-	parseCommand
-};
+function generateColors() {
+  const colorWheel = [chalk__WEBPACK_IMPORTED_MODULE_0___default.a.cyan, chalk__WEBPACK_IMPORTED_MODULE_0___default.a.magenta, chalk__WEBPACK_IMPORTED_MODULE_0___default.a.blue, chalk__WEBPACK_IMPORTED_MODULE_0___default.a.yellow, chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green];
+  const count = colorWheel.length;
+  let children = 0;
+  return () => colorWheel[children++ % count];
+}
 
+function spawn(command, args, opts) {
+  return execa__WEBPACK_IMPORTED_MODULE_1___default()(command, args, _objectSpread({
+    stdio: 'inherit',
+    preferLocal: true
+  }, opts));
+}
+const nextColor = generateColors();
+function spawnStreaming(command, args, opts, {
+  prefix
+}) {
+  const spawned = execa__WEBPACK_IMPORTED_MODULE_1___default()(command, args, _objectSpread({
+    stdio: ['ignore', 'pipe', 'pipe'],
+    preferLocal: true
+  }, opts));
+  const color = nextColor();
+  const prefixedStdout = strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default()({
+    tag: `${color.bold(prefix)}:`
+  });
+  const prefixedStderr = strong_log_transformer__WEBPACK_IMPORTED_MODULE_3___default()({
+    mergeMultiline: true,
+    tag: `${log_symbols__WEBPACK_IMPORTED_MODULE_2___default.a.error} ${color.bold(prefix)}:`
+  });
+  spawned.stdout.pipe(prefixedStdout).pipe(process.stdout);
+  spawned.stderr.pipe(prefixedStderr).pipe(process.stderr);
+  return spawned;
+}
 
 /***/ }),
-/* 158 */
+/* 566 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const chalk = __webpack_require__(159);
+const chalk = __webpack_require__(567);
 
 const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color';
 
@@ -21599,16 +56658,16 @@ module.exports = isSupported ? main : fallbacks;
 
 
 /***/ }),
-/* 159 */
+/* 567 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const escapeStringRegexp = __webpack_require__(3);
-const ansiStyles = __webpack_require__(160);
-const stdoutColor = __webpack_require__(161).stdout;
+const ansiStyles = __webpack_require__(568);
+const stdoutColor = __webpack_require__(569).stdout;
 
-const template = __webpack_require__(162);
+const template = __webpack_require__(570);
 
 const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
@@ -21834,7 +56893,7 @@ module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 160 */
+/* 568 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -22007,7 +57066,7 @@ Object.defineProperty(module, 'exports', {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 161 */
+/* 569 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -22149,7 +57208,7 @@ module.exports = {
 
 
 /***/ }),
-/* 162 */
+/* 570 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -22284,7 +57343,7 @@ module.exports = (chalk, tmp) => {
 
 
 /***/ }),
-/* 163 */
+/* 571 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright IBM Corp. 2014,2018. All Rights Reserved.
@@ -22292,12 +57351,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__(164);
-module.exports.cli = __webpack_require__(168);
+module.exports = __webpack_require__(572);
+module.exports.cli = __webpack_require__(576);
 
 
 /***/ }),
-/* 164 */
+/* 572 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -22308,13 +57367,13 @@ module.exports.cli = __webpack_require__(168);
 
 
 
-var stream = __webpack_require__(28);
+var stream = __webpack_require__(27);
 var util = __webpack_require__(29);
 var fs = __webpack_require__(23);
 
-var through = __webpack_require__(165);
-var duplexer = __webpack_require__(166);
-var StringDecoder = __webpack_require__(167).StringDecoder;
+var through = __webpack_require__(573);
+var duplexer = __webpack_require__(574);
+var StringDecoder = __webpack_require__(575).StringDecoder;
 
 module.exports = Logger;
 
@@ -22503,10 +57562,10 @@ function lineMerger(host) {
 
 
 /***/ }),
-/* 165 */
+/* 573 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var Stream = __webpack_require__(28)
+var Stream = __webpack_require__(27)
 
 // through
 //
@@ -22617,10 +57676,10 @@ function through (write, end, opts) {
 
 
 /***/ }),
-/* 166 */
+/* 574 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var Stream = __webpack_require__(28)
+var Stream = __webpack_require__(27)
 var writeMethods = ["write", "end", "destroy"]
 var readMethods = ["resume", "pause"]
 var readEvents = ["data", "close"]
@@ -22710,13 +57769,13 @@ function duplex(writer, reader) {
 
 
 /***/ }),
-/* 167 */
+/* 575 */
 /***/ (function(module, exports) {
 
 module.exports = require("string_decoder");
 
 /***/ }),
-/* 168 */
+/* 576 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -22727,11 +57786,11 @@ module.exports = require("string_decoder");
 
 
 
-var minimist = __webpack_require__(169);
+var minimist = __webpack_require__(577);
 var path = __webpack_require__(16);
 
-var Logger = __webpack_require__(164);
-var pkg = __webpack_require__(170);
+var Logger = __webpack_require__(572);
+var pkg = __webpack_require__(578);
 
 module.exports = cli;
 
@@ -22785,7 +57844,7 @@ function usage($0, p) {
 
 
 /***/ }),
-/* 169 */
+/* 577 */
 /***/ (function(module, exports) {
 
 module.exports = function (args, opts) {
@@ -23027,29 +58086,29 @@ function isNumber (x) {
 
 
 /***/ }),
-/* 170 */
+/* 578 */
 /***/ (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\"}}");
 
 /***/ }),
-/* 171 */
+/* 579 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "workspacePackagePaths", function() { return workspacePackagePaths; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "copyWorkspacePackages", function() { return copyWorkspacePackages; });
-/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(37);
+/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(502);
 /* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(glob__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(16);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(580);
 /* 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);
+/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(517);
+/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(501);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -23097,9968 +58156,10701 @@ async function workspacePackagePaths(rootPath) {
   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/*'));
-  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'examples/*'));
-
-  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 {
-          pattern,
-          cwd
-        } of toDelete) {
-          process.chdir(cwd);
-          const promise = del__WEBPACK_IMPORTED_MODULE_1___default()(pattern);
-          ora__WEBPACK_IMPORTED_MODULE_2___default.a.promise(promise, Object(path__WEBPACK_IMPORTED_MODULE_3__["relative"])(originalCwd, Object(path__WEBPACK_IMPORTED_MODULE_3__["join"])(cwd, String(pattern))));
-          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);
-		}
+      workspaceProjectsPaths = workspaceProjectsPaths.filter(p => p !== pathToRemove);
+    }
+  }
 
-		if (!dryRun) {
-			await rimrafP(file, rimrafOptions);
-		}
+  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);
 
-		return file;
-	};
+  for (const project of projects.values()) {
+    const dest = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(rootPath, 'node_modules', project.name);
 
-	const removedFiles = await pMap(files, mapper, options);
+    if ((await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["isSymlink"])(dest)) === false) {
+      continue;
+    } // Remove the symlink
 
-	removedFiles.sort((a, b) => a.localeCompare(b));
 
-	return removedFiles;
-};
+    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["unlink"])(dest); // Copy in the package
 
-module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
-	options = {
-		expandDirectories: false,
-		onlyFiles: false,
-		followSymbolicLinks: false,
-		cwd,
-		...options
-	};
+    await Object(_fs__WEBPACK_IMPORTED_MODULE_4__["copyDirectory"])(project.path, dest);
+  }
+}
 
-	patterns = normalizePatterns(patterns);
+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 files = globby.sync(patterns, options)
-		.sort((a, b) => b.localeCompare(a));
+/***/ }),
+/* 580 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-	const removedFiles = files.map(file => {
-		file = path.resolve(cwd, file);
+"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.
+ */
 
-		if (!force) {
-			safeCheck(file, cwd);
-		}
 
-		if (!dryRun) {
-			rimraf.sync(file, rimrafOptions);
-		}
+/**
+ * Returns all the paths where plugins are located
+ */
+function getProjectPaths({
+  rootPath,
+  ossOnly,
+  skipKibanaPlugins
+}) {
+  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.
 
-		return file;
-	});
+  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/*'));
+  projectPaths.push(Object(path__WEBPACK_IMPORTED_MODULE_0__["resolve"])(rootPath, 'examples/*'));
 
-	removedFiles.sort((a, b) => a.localeCompare(b));
+  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/*'));
+  }
 
-	return removedFiles;
-};
+  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;
+}
 
 /***/ }),
-/* 175 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 581 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAllChecksums", function() { return getAllChecksums; });
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(23);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(582);
+/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(351);
+/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(583);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 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;
-	}
+const statAsync = Object(util__WEBPACK_IMPORTED_MODULE_2__["promisify"])(fs__WEBPACK_IMPORTED_MODULE_0___default.a.stat);
 
-	let stat;
-	try {
-		stat = fs.statSync(options.cwd);
-	} catch (_) {
-		return;
-	}
+const projectBySpecificitySorter = (a, b) => b.path.length - a.path.length;
+/** Get the changed files for a set of projects */
 
-	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;
+async function getChangesForProjects(projects, kbn, log) {
+  log.verbose('getting changed files');
+  const {
+    stdout
+  } = await execa__WEBPACK_IMPORTED_MODULE_3___default()('git', ['ls-files', '-dmt', '--', ...Array.from(projects.values()).map(p => p.path)], {
+    cwd: kbn.getAbsolute()
+  });
+  const output = stdout.trim();
+  const unassignedChanges = new Map();
+
+  if (output) {
+    for (const line of output.split('\n')) {
+      const [tag, ...pathParts] = line.trim().split(' ');
+      const path = pathParts.join(' ');
+
+      switch (tag) {
+        case 'M':
+        case 'C':
+          // for some reason ls-files returns deleted files as both deleted
+          // and modified, so make sure not to overwrite changes already
+          // tracked as "deleted"
+          if (unassignedChanges.get(path) !== 'deleted') {
+            unassignedChanges.set(path, 'modified');
+          }
 
-const generateGlobTasks = (patterns, taskOptions) => {
-	patterns = arrayUnion([].concat(patterns));
-	assertPatternsInput(patterns);
-	checkCwdOption(taskOptions);
+          break;
 
-	const globTasks = [];
+        case 'R':
+          unassignedChanges.set(path, 'deleted');
+          break;
 
-	taskOptions = {
-		ignore: [],
-		expandDirectories: true,
-		...taskOptions
-	};
+        case 'H':
+        case 'S':
+        case 'K':
+        case '?':
+        default:
+          log.warning(`unexpected modification status "${tag}" for ${path}, please report this!`);
+          unassignedChanges.set(path, 'invalid');
+          break;
+      }
+    }
+  }
 
-	for (const [index, pattern] of patterns.entries()) {
-		if (isNegative(pattern)) {
-			continue;
-		}
+  const sortedRelevantProjects = Array.from(projects.values()).sort(projectBySpecificitySorter);
+  const changesByProject = new Map();
 
-		const ignore = patterns
-			.slice(index)
-			.filter(isNegative)
-			.map(pattern => pattern.slice(1));
+  for (const project of sortedRelevantProjects) {
+    const ownChanges = new Map();
+    const prefix = kbn.getRelative(project.path);
 
-		const options = {
-			...taskOptions,
-			ignore: taskOptions.ignore.concat(ignore)
-		};
+    for (const [path, type] of unassignedChanges) {
+      if (path.startsWith(prefix)) {
+        ownChanges.set(path, type);
+        unassignedChanges.delete(path);
+      }
+    }
 
-		globTasks.push({pattern, options});
-	}
+    log.verbose(`[${project.name}] found ${ownChanges.size} changes`);
+    changesByProject.set(project, ownChanges);
+  }
 
-	return globTasks;
-};
+  if (unassignedChanges.size) {
+    throw new Error(`unable to assign all change paths to a project: ${JSON.stringify(Array.from(unassignedChanges.entries()))}`);
+  }
 
-const globDirs = (task, fn) => {
-	let options = {};
-	if (task.options.cwd) {
-		options.cwd = task.options.cwd;
-	}
+  return changesByProject;
+}
+/** Get the latest commit sha for a project */
 
-	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);
-};
+async function getLatestSha(project, kbn) {
+  const {
+    stdout
+  } = await execa__WEBPACK_IMPORTED_MODULE_3___default()('git', ['log', '-n', '1', '--pretty=format:%H', '--', project.path], {
+    cwd: kbn.getAbsolute()
+  });
+  return stdout.trim() || undefined;
+}
+/**
+ * Get a list of the absolute dependencies of this project, as resolved
+ * in the yarn.lock file, does not include other projects in the workspace
+ * or their dependencies
+ */
 
-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;
-};
+function resolveDepsForProject(project, yarnLock, kbn, log) {
+  /** map of [name@range, name@resolved] */
+  const resolved = new Map();
+  const queue = Object.entries(project.allDependencies);
 
-const globToTask = task => glob => {
-	const {options} = task;
-	if (options.ignore && Array.isArray(options.ignore) && options.expandDirectories) {
-		options.ignore = dirGlob.sync(options.ignore);
-	}
+  while (queue.length) {
+    const [name, versionRange] = queue.shift();
+    const req = `${name}@${versionRange}`;
 
-	return {
-		pattern: glob,
-		options
-	};
-};
+    if (resolved.has(req)) {
+      continue;
+    }
 
-module.exports = async (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+    if (!kbn.hasProject(name)) {
+      const pkg = yarnLock[req];
 
-	const getFilter = async () => {
-		return options && options.gitignore ?
-			gitignore({cwd: options.cwd, ignore: options.ignore}) :
-			DEFAULT_FILTER;
-	};
+      if (!pkg) {
+        log.warning('yarn.lock file is out of date, please run `yarn kbn bootstrap` to re-enable caching');
+        return;
+      }
 
-	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)));
-		}));
+      const res = `${name}@${pkg.version}`;
+      resolved.set(req, res);
+      const allDepsEntries = [...Object.entries(pkg.dependencies || {}), ...Object.entries(pkg.optionalDependencies || {})];
 
-		return arrayUnion(...tasks);
-	};
+      for (const [childName, childVersionRange] of allDepsEntries) {
+        queue.push([childName, childVersionRange]);
+      }
+    }
+  }
 
-	const [filter, tasks] = await Promise.all([getFilter(), getTasks()]);
-	const paths = await Promise.all(tasks.map(task => fastGlob(task.pattern, task.options)));
+  return Array.from(resolved.values()).sort((a, b) => a.localeCompare(b));
+}
+/**
+ * Get the checksum for a specific project in the workspace
+ */
 
-	return arrayUnion(...paths).filter(path_ => !filter(getPathString(path_)));
-};
 
-module.exports.sync = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+async function getChecksum(project, changes, yarnLock, kbn, log) {
+  const sha = await getLatestSha(project, kbn);
 
-	const tasks = globTasks.reduce((tasks, task) => {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		return tasks.concat(newTask);
-	}, []);
+  if (sha) {
+    log.verbose(`[${project.name}] local sha:`, sha);
+  }
 
-	const filter = getFilterSync(options);
+  if (Array.from(changes.values()).includes('invalid')) {
+    log.warning(`[${project.name}] unable to determine local changes, caching disabled`);
+    return;
+  }
 
-	return tasks.reduce(
-		(matches, task) => arrayUnion(matches, fastGlob.sync(task.pattern, task.options)),
-		[]
-	).filter(path_ => !filter(path_));
-};
+  const changesSummary = await Promise.all(Array.from(changes).sort((a, b) => a[0].localeCompare(b[0])).map(async ([path, type]) => {
+    if (type === 'deleted') {
+      return `${path}:deleted`;
+    }
 
-module.exports.stream = (patterns, options) => {
-	const globTasks = generateGlobTasks(patterns, options);
+    const stats = await statAsync(kbn.getAbsolute(path));
+    log.verbose(`[${project.name}] modified time ${stats.mtimeMs} for ${path}`);
+    return `${path}:${stats.mtimeMs}`;
+  }));
+  const deps = await resolveDepsForProject(project, yarnLock, kbn, log);
 
-	const tasks = globTasks.reduce((tasks, task) => {
-		const newTask = getPattern(task, dirGlob.sync).map(globToTask(task));
-		return tasks.concat(newTask);
-	}, []);
+  if (!deps) {
+    return;
+  }
 
-	const filter = getFilterSync(options);
-	const filterStream = new FilterStream(p => !filter(p));
-	const uniqueStream = new UniqueStream();
+  log.verbose(`[${project.name}] resolved %d deps`, deps.length);
+  const checksum = JSON.stringify({
+    sha,
+    changes: changesSummary,
+    deps
+  }, null, 2);
 
-	return merge2(tasks.map(task => fastGlob.stream(task.pattern, task.options)))
-		.pipe(filterStream)
-		.pipe(uniqueStream);
-};
+  if (process.env.BOOTSTRAP_CACHE_DEBUG_CHECKSUM) {
+    return checksum;
+  }
 
-module.exports.generateGlobTasks = generateGlobTasks;
+  const hash = crypto__WEBPACK_IMPORTED_MODULE_1___default.a.createHash('sha1');
+  hash.update(checksum);
+  return hash.digest('hex');
+}
+/**
+ * Calculate checksums for all projects in the workspace based on
+ *  - last git commit to project directory
+ *  - un-committed changes
+ *  - resolved dependencies from yarn.lock referenced by project package.json
+ */
 
-module.exports.hasMagic = (patterns, options) => []
-	.concat(patterns)
-	.some(pattern => glob.hasMagic(pattern, options));
 
-module.exports.gitignore = gitignore;
+async function getAllChecksums(kbn, log) {
+  const projects = kbn.getAllProjects();
+  const changesByProject = await getChangesForProjects(projects, kbn, log);
+  const yarnLock = await Object(_yarn_lock__WEBPACK_IMPORTED_MODULE_4__["readYarnLock"])(kbn);
+  /** map of [project.name, cacheKey] */
 
+  const cacheKeys = new Map();
+  await Promise.all(Array.from(projects.values()).map(async project => {
+    cacheKeys.set(project.name, (await getChecksum(project, changesByProject.get(project), yarnLock, kbn, log)));
+  }));
+  return cacheKeys;
+}
 
 /***/ }),
-/* 176 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 582 */
+/***/ (function(module, exports) {
+
+module.exports = require("crypto");
+
+/***/ }),
+/* 583 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readYarnLock", function() { return readYarnLock; });
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(584);
+/* harmony import */ var _yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _utils_fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 published types are worthless
 
 
-module.exports = (...arguments_) => {
-	return [...new Set([].concat(...arguments_))];
-};
+async function readYarnLock(kbn) {
+  try {
+    const contents = await Object(_utils_fs__WEBPACK_IMPORTED_MODULE_1__["readFile"])(kbn.getAbsolute('yarn.lock'), 'utf8');
+    const yarnLock = Object(_yarnpkg_lockfile__WEBPACK_IMPORTED_MODULE_0__["parse"])(contents);
+
+    if (yarnLock.type === 'success') {
+      return yarnLock.object;
+    }
+
+    throw new Error('unable to read yarn.lock file, please run `yarn kbn bootstrap`');
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error;
+    }
+  }
 
+  return {};
+}
 
 /***/ }),
-/* 177 */
+/* 584 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports =
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// identity function for calling harmony imports with the correct context
+/******/ 	__webpack_require__.i = function(value) { return value; };
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, {
+/******/ 				configurable: false,
+/******/ 				enumerable: true,
+/******/ 				get: getter
+/******/ 			});
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 14);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports) {
+
+module.exports = __webpack_require__(16);
+
+/***/ }),
+/* 1 */
 /***/ (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
+exports.__esModule = true;
 
-function merge2 () {
-  const streamsQueue = []
-  let merging = false
-  const args = slice.call(arguments)
-  let options = args[args.length - 1]
+var _promise = __webpack_require__(173);
 
-  if (options && !Array.isArray(options) && options.pipe == null) args.pop()
-  else options = {}
+var _promise2 = _interopRequireDefault(_promise);
 
-  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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-  function addStream () {
-    for (let i = 0, len = arguments.length; i < len; i++) {
-      streamsQueue.push(pauseStreams(arguments[i], options))
-    }
-    mergeStream()
-    return this
-  }
+exports.default = function (fn) {
+  return function () {
+    var gen = fn.apply(this, arguments);
+    return new _promise2.default(function (resolve, reject) {
+      function step(key, arg) {
+        try {
+          var info = gen[key](arg);
+          var value = info.value;
+        } catch (error) {
+          reject(error);
+          return;
+        }
 
-  function mergeStream () {
-    if (merging) return
-    merging = true
+        if (info.done) {
+          resolve(value);
+        } else {
+          return _promise2.default.resolve(value).then(function (value) {
+            step("next", value);
+          }, function (err) {
+            step("throw", err);
+          });
+        }
+      }
 
-    let streams = streamsQueue.shift()
-    if (!streams) {
-      process.nextTick(endStream)
-      return
-    }
-    if (!Array.isArray(streams)) streams = [streams]
+      return step("next");
+    });
+  };
+};
 
-    let pipesCount = streams.length + 1
+/***/ }),
+/* 2 */
+/***/ (function(module, exports) {
 
-    function next () {
-      if (--pipesCount > 0) return
-      merging = false
-      mergeStream()
-    }
+module.exports = __webpack_require__(29);
 
-    function pipe (stream) {
-      function onend () {
-        stream.removeListener('merge2UnpipeEnd', onend)
-        stream.removeListener('end', onend)
-        next()
-      }
-      // skip ended stream
-      if (stream._readableState.endEmitted) return next()
+/***/ }),
+/* 3 */
+/***/ (function(module, exports) {
 
-      stream.on('merge2UnpipeEnd', onend)
-      stream.on('end', onend)
-      stream.pipe(mergedStream, { end: false })
-      // compatible for old stream
-      stream.resume()
-    }
+module.exports = __webpack_require__(23);
 
-    for (let i = 0; i < streams.length; i++) pipe(streams[i])
+/***/ }),
+/* 4 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    next()
-  }
+"use strict";
 
-  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')
-  })
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+class MessageError extends Error {
+  constructor(msg, code) {
+    super(msg);
+    this.code = code;
+  }
 
-  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)
+exports.MessageError = MessageError;
+class ProcessSpawnError extends MessageError {
+  constructor(msg, code, process) {
+    super(msg, code);
+    this.process = process;
   }
-  return streams
+
 }
 
+exports.ProcessSpawnError = ProcessSpawnError;
+class SecurityError extends MessageError {}
 
-/***/ }),
-/* 178 */
-/***/ (function(module, exports, __webpack_require__) {
+exports.SecurityError = SecurityError;
+class ProcessTermError extends MessageError {}
 
-"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;
+exports.ProcessTermError = ProcessTermError;
+class ResponseError extends Error {
+  constructor(msg, responseCode) {
+    super(msg);
+    this.responseCode = responseCode;
+  }
 
+}
+exports.ResponseError = ResponseError;
 
 /***/ }),
-/* 179 */
+/* 5 */
 /***/ (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;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getFirstSuitableFolder = exports.readFirstAvailableStream = exports.makeTempDir = exports.hardlinksWork = exports.writeFilePreservingEol = exports.getFileSizeOnDisk = exports.walk = exports.symlink = exports.find = exports.readJsonAndFile = exports.readJson = exports.readFileAny = exports.hardlinkBulk = exports.copyBulk = exports.unlink = exports.glob = exports.link = exports.chmod = exports.lstat = exports.exists = exports.mkdirp = exports.stat = exports.access = exports.rename = exports.readdir = exports.realpath = exports.readlink = exports.writeFile = exports.open = exports.readFileBuffer = exports.lockQueue = exports.constants = undefined;
 
+var _asyncToGenerator2;
 
-/***/ }),
-/* 181 */
-/***/ (function(module, exports, __webpack_require__) {
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
+}
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-function flatten(items) {
-    return items.reduce((collection, item) => [].concat(collection, item), []);
-}
-exports.flatten = flatten;
+let buildActionsForCopy = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
 
+    //
+    let build = (() => {
+      var _ref5 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        const src = data.src,
+              dest = data.dest,
+              type = data.type;
+
+        const onFresh = data.onFresh || noop;
+        const onDone = data.onDone || noop;
+
+        // TODO https://github.com/yarnpkg/yarn/issues/3751
+        // related to bundled dependencies handling
+        if (files.has(dest.toLowerCase())) {
+          reporter.verbose(`The case-insensitive file ${dest} shouldn't be copied twice in one bulk copy`);
+        } else {
+          files.add(dest.toLowerCase());
+        }
 
-/***/ }),
-/* 182 */
-/***/ (function(module, exports, __webpack_require__) {
+        if (type === 'symlink') {
+          yield mkdirp((_path || _load_path()).default.dirname(dest));
+          onFresh();
+          actions.symlink.push({
+            dest,
+            linkname: src
+          });
+          onDone();
+          return;
+        }
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-function isEnoentCodeError(error) {
-    return error.code === 'ENOENT';
-}
-exports.isEnoentCodeError = isEnoentCodeError;
+        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
+          // ignored file
+          return;
+        }
 
+        const srcStat = yield lstat(src);
+        let srcFiles;
 
-/***/ }),
-/* 183 */
-/***/ (function(module, exports, __webpack_require__) {
+        if (srcStat.isDirectory()) {
+          srcFiles = yield readdir(src);
+        }
 
-"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;
+        let destStat;
+        try {
+          // try accessing the destination
+          destStat = yield lstat(dest);
+        } catch (e) {
+          // proceed if destination doesn't exist, otherwise error
+          if (e.code !== 'ENOENT') {
+            throw e;
+          }
+        }
 
+        // if destination exists
+        if (destStat) {
+          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
+          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
+          const bothFiles = srcStat.isFile() && destStat.isFile();
 
-/***/ }),
-/* 184 */
-/***/ (function(module, exports, __webpack_require__) {
+          // EINVAL access errors sometimes happen which shouldn't because node shouldn't be giving
+          // us modes that aren't valid. investigate this, it's generally safe to proceed.
 
-"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;
+          /* if (srcStat.mode !== destStat.mode) {
+            try {
+              await access(dest, srcStat.mode);
+            } catch (err) {}
+          } */
+
+          if (bothFiles && artifactFiles.has(dest)) {
+            // this file gets changed during build, likely by a custom install script. Don't bother checking it.
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkipArtifact', src));
+            return;
+          }
 
+          if (bothFiles && srcStat.size === destStat.size && (0, (_fsNormalized || _load_fsNormalized()).fileDatesEqual)(srcStat.mtime, destStat.mtime)) {
+            // we can safely assume this is the same file
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.size, +srcStat.mtime));
+            return;
+          }
 
-/***/ }),
-/* 185 */
-/***/ (function(module, exports, __webpack_require__) {
+          if (bothSymlinks) {
+            const srcReallink = yield readlink(src);
+            if (srcReallink === (yield readlink(dest))) {
+              // if both symlinks are the same then we can continue on
+              onDone();
+              reporter.verbose(reporter.lang('verboseFileSkipSymlink', src, dest, srcReallink));
+              return;
+            }
+          }
 
-"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;
+          if (bothFolders) {
+            // mark files that aren't in this folder as possibly extraneous
+            const destFiles = yield readdir(dest);
+            invariant(srcFiles, 'src files not initialised');
+
+            for (var _iterator4 = destFiles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+              var _ref6;
+
+              if (_isArray4) {
+                if (_i4 >= _iterator4.length) break;
+                _ref6 = _iterator4[_i4++];
+              } else {
+                _i4 = _iterator4.next();
+                if (_i4.done) break;
+                _ref6 = _i4.value;
+              }
 
+              const file = _ref6;
 
-/***/ }),
-/* 186 */
-/***/ (function(module, exports, __webpack_require__) {
+              if (srcFiles.indexOf(file) < 0) {
+                const loc = (_path || _load_path()).default.join(dest, file);
+                possibleExtraneous.add(loc);
 
-"use strict";
+                if ((yield lstat(loc)).isDirectory()) {
+                  for (var _iterator5 = yield readdir(loc), _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+                    var _ref7;
 
+                    if (_isArray5) {
+                      if (_i5 >= _iterator5.length) break;
+                      _ref7 = _iterator5[_i5++];
+                    } else {
+                      _i5 = _iterator5.next();
+                      if (_i5.done) break;
+                      _ref7 = _i5.value;
+                    }
 
-var isGlob = __webpack_require__(187);
-var pathPosixDirname = __webpack_require__(16).posix.dirname;
-var isWin32 = __webpack_require__(11).platform() === 'win32';
+                    const file = _ref7;
 
-var slash = '/';
-var backslash = /\\/g;
-var enclosure = /[\{\[].*[\/]*.*[\}\]]$/;
-var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/;
-var escaped = /\\([\*\?\|\[\]\(\)\{\}])/g;
+                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
+                  }
+                }
+              }
+            }
+          }
+        }
 
-module.exports = function globParent(str) {
-  // flip windows path separators
-  if (isWin32 && str.indexOf(slash) < 0) {
-    str = str.replace(backslash, slash);
-  }
+        if (destStat && destStat.isSymbolicLink()) {
+          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
+          destStat = null;
+        }
 
-  // special case for strings ending in enclosure containing path separator
-  if (enclosure.test(str)) {
-    str += slash;
-  }
+        if (srcStat.isSymbolicLink()) {
+          onFresh();
+          const linkname = yield readlink(src);
+          actions.symlink.push({
+            dest,
+            linkname
+          });
+          onDone();
+        } else if (srcStat.isDirectory()) {
+          if (!destStat) {
+            reporter.verbose(reporter.lang('verboseFileFolder', dest));
+            yield mkdirp(dest);
+          }
 
-  // preserves full path in case of trailing path separator
-  str += 'a';
+          const destParts = dest.split((_path || _load_path()).default.sep);
+          while (destParts.length) {
+            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
+            destParts.pop();
+          }
 
-  // remove path parts that are globby
-  do {
-    str = pathPosixDirname(str);
-  } while (isGlob(str) || globby.test(str));
+          // push all files to queue
+          invariant(srcFiles, 'src files not initialised');
+          let remaining = srcFiles.length;
+          if (!remaining) {
+            onDone();
+          }
+          for (var _iterator6 = srcFiles, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) {
+            var _ref8;
 
-  // remove escape chars and return result
-  return str.replace(escaped, '$1');
-};
+            if (_isArray6) {
+              if (_i6 >= _iterator6.length) break;
+              _ref8 = _iterator6[_i6++];
+            } else {
+              _i6 = _iterator6.next();
+              if (_i6.done) break;
+              _ref8 = _i6.value;
+            }
 
+            const file = _ref8;
 
-/***/ }),
-/* 187 */
-/***/ (function(module, exports, __webpack_require__) {
+            queue.push({
+              dest: (_path || _load_path()).default.join(dest, file),
+              onFresh,
+              onDone: function (_onDone) {
+                function onDone() {
+                  return _onDone.apply(this, arguments);
+                }
 
-/*!
- * is-glob <https://github.com/jonschlinkert/is-glob>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
+                onDone.toString = function () {
+                  return _onDone.toString();
+                };
 
-var isExtglob = __webpack_require__(188);
-var chars = { '{': '}', '(': ')', '[': ']'};
-var strictRegex = /\\(.)|(^!|\*|[\].+)]\?|\[[^\\\]]+\]|\{[^\\}]+\}|\(\?[:!=][^\\)]+\)|\([^|]+\|[^\\)]+\))/;
-var relaxedRegex = /\\(.)|(^!|[*?{}()[\]]|\(\?)/;
+                return onDone;
+              }(function () {
+                if (--remaining === 0) {
+                  onDone();
+                }
+              }),
+              src: (_path || _load_path()).default.join(src, file)
+            });
+          }
+        } else if (srcStat.isFile()) {
+          onFresh();
+          actions.file.push({
+            src,
+            dest,
+            atime: srcStat.atime,
+            mtime: srcStat.mtime,
+            mode: srcStat.mode
+          });
+          onDone();
+        } else {
+          throw new Error(`unsure how to copy this: ${src}`);
+        }
+      });
 
-module.exports = function isGlob(str, options) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
+      return function build(_x5) {
+        return _ref5.apply(this, arguments);
+      };
+    })();
 
-  if (isExtglob(str)) {
-    return true;
-  }
+    const artifactFiles = new Set(events.artifactFiles || []);
+    const files = new Set();
 
-  var regex = strictRegex;
-  var match;
+    // initialise events
+    for (var _iterator = queue, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref2;
 
-  // optionally relax regex
-  if (options && options.strict === false) {
-    regex = relaxedRegex;
-  }
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref2 = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref2 = _i.value;
+      }
 
-  while ((match = regex.exec(str))) {
-    if (match[2]) return true;
-    var idx = match.index + match[0].length;
+      const item = _ref2;
 
-    // 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;
-      }
+      const onDone = item.onDone;
+      item.onDone = function () {
+        events.onProgress(item.dest);
+        if (onDone) {
+          onDone();
+        }
+      };
     }
+    events.onStart(queue.length);
 
-    str = str.slice(idx);
-  }
-  return false;
-};
+    // start building actions
+    const actions = {
+      file: [],
+      symlink: [],
+      link: []
+    };
 
+    // custom concurrency logic as we're always executing stacks of CONCURRENT_QUEUE_ITEMS queue items
+    // at a time due to the requirement to push items onto the queue
+    while (queue.length) {
+      const items = queue.splice(0, CONCURRENT_QUEUE_ITEMS);
+      yield Promise.all(items.map(build));
+    }
 
-/***/ }),
-/* 188 */
-/***/ (function(module, exports) {
+    // simulate the existence of some files to prevent considering them extraneous
+    for (var _iterator2 = artifactFiles, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+      var _ref3;
 
-/*!
- * is-extglob <https://github.com/jonschlinkert/is-extglob>
- *
- * Copyright (c) 2014-2016, Jon Schlinkert.
- * Licensed under the MIT License.
- */
+      if (_isArray2) {
+        if (_i2 >= _iterator2.length) break;
+        _ref3 = _iterator2[_i2++];
+      } else {
+        _i2 = _iterator2.next();
+        if (_i2.done) break;
+        _ref3 = _i2.value;
+      }
 
-module.exports = function isExtglob(str) {
-  if (typeof str !== 'string' || str === '') {
-    return false;
-  }
+      const file = _ref3;
 
-  var match;
-  while ((match = /(\\).|([@?!+*]\(.*\))/g.exec(str))) {
-    if (match[2]) return true;
-    str = str.slice(match.index + match[0].length);
-  }
+      if (possibleExtraneous.has(file)) {
+        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
+        possibleExtraneous.delete(file);
+      }
+    }
 
-  return false;
-};
+    for (var _iterator3 = possibleExtraneous, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+      var _ref4;
+
+      if (_isArray3) {
+        if (_i3 >= _iterator3.length) break;
+        _ref4 = _iterator3[_i3++];
+      } else {
+        _i3 = _iterator3.next();
+        if (_i3.done) break;
+        _ref4 = _i3.value;
+      }
 
+      const loc = _ref4;
 
-/***/ }),
-/* 189 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (files.has(loc.toLowerCase())) {
+        possibleExtraneous.delete(loc);
+      }
+    }
 
-"use strict";
+    return actions;
+  });
 
+  return function buildActionsForCopy(_x, _x2, _x3, _x4) {
+    return _ref.apply(this, arguments);
+  };
+})();
 
-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 === './');
+let buildActionsForHardlink = (() => {
+  var _ref9 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, events, possibleExtraneous, reporter) {
 
-/**
- * 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
- */
+    //
+    let build = (() => {
+      var _ref13 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        const src = data.src,
+              dest = data.dest;
+
+        const onFresh = data.onFresh || noop;
+        const onDone = data.onDone || noop;
+        if (files.has(dest.toLowerCase())) {
+          // Fixes issue https://github.com/yarnpkg/yarn/issues/2734
+          // When bulk hardlinking we have A -> B structure that we want to hardlink to A1 -> B1,
+          // package-linker passes that modules A1 and B1 need to be hardlinked,
+          // the recursive linking algorithm of A1 ends up scheduling files in B1 to be linked twice which will case
+          // an exception.
+          onDone();
+          return;
+        }
+        files.add(dest.toLowerCase());
 
-const micromatch = (list, patterns, options) => {
-  patterns = [].concat(patterns);
-  list = [].concat(list);
+        if (events.ignoreBasenames.indexOf((_path || _load_path()).default.basename(src)) >= 0) {
+          // ignored file
+          return;
+        }
 
-  let omit = new Set();
-  let keep = new Set();
-  let items = new Set();
-  let negatives = 0;
+        const srcStat = yield lstat(src);
+        let srcFiles;
 
-  let onResult = state => {
-    items.add(state.output);
-    if (options && options.onResult) {
-      options.onResult(state);
-    }
-  };
+        if (srcStat.isDirectory()) {
+          srcFiles = yield readdir(src);
+        }
 
-  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++;
+        const destExists = yield exists(dest);
+        if (destExists) {
+          const destStat = yield lstat(dest);
 
-    for (let item of list) {
-      let matched = isMatch(item, true);
+          const bothSymlinks = srcStat.isSymbolicLink() && destStat.isSymbolicLink();
+          const bothFolders = srcStat.isDirectory() && destStat.isDirectory();
+          const bothFiles = srcStat.isFile() && destStat.isFile();
 
-      let match = negated ? !matched.isMatch : matched.isMatch;
-      if (!match) continue;
+          if (srcStat.mode !== destStat.mode) {
+            try {
+              yield access(dest, srcStat.mode);
+            } catch (err) {
+              // EINVAL access errors sometimes happen which shouldn't because node shouldn't be giving
+              // us modes that aren't valid. investigate this, it's generally safe to proceed.
+              reporter.verbose(err);
+            }
+          }
 
-      if (negated) {
-        omit.add(matched.output);
-      } else {
-        omit.delete(matched.output);
-        keep.add(matched.output);
-      }
-    }
-  }
+          if (bothFiles && artifactFiles.has(dest)) {
+            // this file gets changed during build, likely by a custom install script. Don't bother checking it.
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkipArtifact', src));
+            return;
+          }
 
-  let result = negatives === patterns.length ? [...items] : [...keep];
-  let matches = result.filter(item => !omit.has(item));
+          // correct hardlink
+          if (bothFiles && srcStat.ino !== null && srcStat.ino === destStat.ino) {
+            onDone();
+            reporter.verbose(reporter.lang('verboseFileSkip', src, dest, srcStat.ino));
+            return;
+          }
 
-  if (options && matches.length === 0) {
-    if (options.failglob === true) {
-      throw new Error(`No matches found for "${patterns.join(', ')}"`);
-    }
+          if (bothSymlinks) {
+            const srcReallink = yield readlink(src);
+            if (srcReallink === (yield readlink(dest))) {
+              // if both symlinks are the same then we can continue on
+              onDone();
+              reporter.verbose(reporter.lang('verboseFileSkipSymlink', src, dest, srcReallink));
+              return;
+            }
+          }
 
-    if (options.nonull === true || options.nullglob === true) {
-      return options.unescape ? patterns.map(p => p.replace(/\\/g, '')) : patterns;
-    }
-  }
+          if (bothFolders) {
+            // mark files that aren't in this folder as possibly extraneous
+            const destFiles = yield readdir(dest);
+            invariant(srcFiles, 'src files not initialised');
+
+            for (var _iterator10 = destFiles, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : _iterator10[Symbol.iterator]();;) {
+              var _ref14;
+
+              if (_isArray10) {
+                if (_i10 >= _iterator10.length) break;
+                _ref14 = _iterator10[_i10++];
+              } else {
+                _i10 = _iterator10.next();
+                if (_i10.done) break;
+                _ref14 = _i10.value;
+              }
 
-  return matches;
-};
+              const file = _ref14;
 
-/**
- * Backwards compatibility
- */
+              if (srcFiles.indexOf(file) < 0) {
+                const loc = (_path || _load_path()).default.join(dest, file);
+                possibleExtraneous.add(loc);
 
-micromatch.match = micromatch;
+                if ((yield lstat(loc)).isDirectory()) {
+                  for (var _iterator11 = yield readdir(loc), _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : _iterator11[Symbol.iterator]();;) {
+                    var _ref15;
 
-/**
- * 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
- */
+                    if (_isArray11) {
+                      if (_i11 >= _iterator11.length) break;
+                      _ref15 = _iterator11[_i11++];
+                    } else {
+                      _i11 = _iterator11.next();
+                      if (_i11.done) break;
+                      _ref15 = _i11.value;
+                    }
 
-micromatch.matcher = (pattern, options) => picomatch(pattern, options);
+                    const file = _ref15;
 
-/**
- * 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
- */
+                    possibleExtraneous.add((_path || _load_path()).default.join(loc, file));
+                  }
+                }
+              }
+            }
+          }
+        }
 
-micromatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
+        if (srcStat.isSymbolicLink()) {
+          onFresh();
+          const linkname = yield readlink(src);
+          actions.symlink.push({
+            dest,
+            linkname
+          });
+          onDone();
+        } else if (srcStat.isDirectory()) {
+          reporter.verbose(reporter.lang('verboseFileFolder', dest));
+          yield mkdirp(dest);
+
+          const destParts = dest.split((_path || _load_path()).default.sep);
+          while (destParts.length) {
+            files.add(destParts.join((_path || _load_path()).default.sep).toLowerCase());
+            destParts.pop();
+          }
 
-/**
- * Backwards compatibility
- */
+          // push all files to queue
+          invariant(srcFiles, 'src files not initialised');
+          let remaining = srcFiles.length;
+          if (!remaining) {
+            onDone();
+          }
+          for (var _iterator12 = srcFiles, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : _iterator12[Symbol.iterator]();;) {
+            var _ref16;
 
-micromatch.any = micromatch.isMatch;
+            if (_isArray12) {
+              if (_i12 >= _iterator12.length) break;
+              _ref16 = _iterator12[_i12++];
+            } else {
+              _i12 = _iterator12.next();
+              if (_i12.done) break;
+              _ref16 = _i12.value;
+            }
 
-/**
- * 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
- */
+            const file = _ref16;
 
-micromatch.not = (list, patterns, options = {}) => {
-  patterns = [].concat(patterns).map(String);
-  let result = new Set();
-  let items = [];
+            queue.push({
+              onFresh,
+              src: (_path || _load_path()).default.join(src, file),
+              dest: (_path || _load_path()).default.join(dest, file),
+              onDone: function (_onDone2) {
+                function onDone() {
+                  return _onDone2.apply(this, arguments);
+                }
 
-  let onResult = state => {
-    if (options.onResult) options.onResult(state);
-    items.push(state.output);
-  };
+                onDone.toString = function () {
+                  return _onDone2.toString();
+                };
 
-  let matches = micromatch(list, patterns, { ...options, onResult });
+                return onDone;
+              }(function () {
+                if (--remaining === 0) {
+                  onDone();
+                }
+              })
+            });
+          }
+        } else if (srcStat.isFile()) {
+          onFresh();
+          actions.link.push({
+            src,
+            dest,
+            removeDest: destExists
+          });
+          onDone();
+        } else {
+          throw new Error(`unsure how to copy this: ${src}`);
+        }
+      });
 
-  for (let item of items) {
-    if (!matches.includes(item)) {
-      result.add(item);
-    }
-  }
-  return [...result];
-};
+      return function build(_x10) {
+        return _ref13.apply(this, arguments);
+      };
+    })();
 
-/**
- * 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
- */
+    const artifactFiles = new Set(events.artifactFiles || []);
+    const files = new Set();
 
-micromatch.contains = (str, pattern, options) => {
-  if (typeof str !== 'string') {
-    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
-  }
+    // initialise events
+    for (var _iterator7 = queue, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
+      var _ref10;
 
-  if (Array.isArray(pattern)) {
-    return pattern.some(p => micromatch.contains(str, p, options));
-  }
+      if (_isArray7) {
+        if (_i7 >= _iterator7.length) break;
+        _ref10 = _iterator7[_i7++];
+      } else {
+        _i7 = _iterator7.next();
+        if (_i7.done) break;
+        _ref10 = _i7.value;
+      }
 
-  if (typeof pattern === 'string') {
-    if (isEmptyString(str) || isEmptyString(pattern)) {
-      return false;
-    }
+      const item = _ref10;
 
-    if (str.includes(pattern) || (str.startsWith('./') && str.slice(2).includes(pattern))) {
-      return true;
+      const onDone = item.onDone || noop;
+      item.onDone = function () {
+        events.onProgress(item.dest);
+        onDone();
+      };
     }
-  }
+    events.onStart(queue.length);
 
-  return micromatch.isMatch(str, pattern, { ...options, contains: true });
-};
+    // start building actions
+    const actions = {
+      file: [],
+      symlink: [],
+      link: []
+    };
 
-/**
- * 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
- */
+    // custom concurrency logic as we're always executing stacks of CONCURRENT_QUEUE_ITEMS queue items
+    // at a time due to the requirement to push items onto the queue
+    while (queue.length) {
+      const items = queue.splice(0, CONCURRENT_QUEUE_ITEMS);
+      yield Promise.all(items.map(build));
+    }
 
-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;
-};
+    // simulate the existence of some files to prevent considering them extraneous
+    for (var _iterator8 = artifactFiles, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
+      var _ref11;
 
-/**
- * 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
- */
+      if (_isArray8) {
+        if (_i8 >= _iterator8.length) break;
+        _ref11 = _iterator8[_i8++];
+      } else {
+        _i8 = _iterator8.next();
+        if (_i8.done) break;
+        _ref11 = _i8.value;
+      }
 
-micromatch.some = (list, patterns, options) => {
-  let items = [].concat(list);
+      const file = _ref11;
 
-  for (let pattern of [].concat(patterns)) {
-    let isMatch = picomatch(String(pattern), options);
-    if (items.some(item => isMatch(item))) {
-      return true;
+      if (possibleExtraneous.has(file)) {
+        reporter.verbose(reporter.lang('verboseFilePhantomExtraneous', file));
+        possibleExtraneous.delete(file);
+      }
     }
-  }
-  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
- */
+    for (var _iterator9 = possibleExtraneous, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : _iterator9[Symbol.iterator]();;) {
+      var _ref12;
 
-micromatch.every = (list, patterns, options) => {
-  let items = [].concat(list);
+      if (_isArray9) {
+        if (_i9 >= _iterator9.length) break;
+        _ref12 = _iterator9[_i9++];
+      } else {
+        _i9 = _iterator9.next();
+        if (_i9.done) break;
+        _ref12 = _i9.value;
+      }
 
-  for (let pattern of [].concat(patterns)) {
-    let isMatch = picomatch(String(pattern), options);
-    if (!items.every(item => isMatch(item))) {
-      return false;
+      const loc = _ref12;
+
+      if (files.has(loc.toLowerCase())) {
+        possibleExtraneous.delete(loc);
+      }
     }
-  }
-  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
- */
+    return actions;
+  });
 
-micromatch.all = (str, patterns, options) => {
-  if (typeof str !== 'string') {
-    throw new TypeError(`Expected a string: "${util.inspect(str)}"`);
-  }
+  return function buildActionsForHardlink(_x6, _x7, _x8, _x9) {
+    return _ref9.apply(this, arguments);
+  };
+})();
 
-  return [].concat(patterns).every(p => picomatch(p, options)(str));
-};
+let copyBulk = exports.copyBulk = (() => {
+  var _ref17 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, reporter, _events) {
+    const events = {
+      onStart: _events && _events.onStart || noop,
+      onProgress: _events && _events.onProgress || noop,
+      possibleExtraneous: _events ? _events.possibleExtraneous : new Set(),
+      ignoreBasenames: _events && _events.ignoreBasenames || [],
+      artifactFiles: _events && _events.artifactFiles || []
+    };
 
-/**
- * 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
- */
+    const actions = yield buildActionsForCopy(queue, events, events.possibleExtraneous, reporter);
+    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
 
-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);
+    const fileActions = actions.file;
 
-  if (match) {
-    return match.slice(1).map(v => v === void 0 ? '' : v);
-  }
-};
+    const currentlyWriting = new Map();
 
-/**
- * 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
- */
+    yield (_promise || _load_promise()).queue(fileActions, (() => {
+      var _ref18 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        let writePromise;
+        while (writePromise = currentlyWriting.get(data.dest)) {
+          yield writePromise;
+        }
 
-micromatch.makeRe = (...args) => picomatch.makeRe(...args);
+        reporter.verbose(reporter.lang('verboseFileCopy', data.src, data.dest));
+        const copier = (0, (_fsNormalized || _load_fsNormalized()).copyFile)(data, function () {
+          return currentlyWriting.delete(data.dest);
+        });
+        currentlyWriting.set(data.dest, copier);
+        events.onProgress(data.dest);
+        return copier;
+      });
 
-/**
- * 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
- */
+      return function (_x14) {
+        return _ref18.apply(this, arguments);
+      };
+    })(), CONCURRENT_QUEUE_ITEMS);
+
+    // we need to copy symlinks last as they could reference files we were copying
+    const symlinkActions = actions.symlink;
+    yield (_promise || _load_promise()).queue(symlinkActions, function (data) {
+      const linkname = (_path || _load_path()).default.resolve((_path || _load_path()).default.dirname(data.dest), data.linkname);
+      reporter.verbose(reporter.lang('verboseFileSymlink', data.dest, linkname));
+      return symlink(linkname, data.dest);
+    });
+  });
 
-micromatch.scan = (...args) => picomatch.scan(...args);
+  return function copyBulk(_x11, _x12, _x13) {
+    return _ref17.apply(this, arguments);
+  };
+})();
 
-/**
- * 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
- */
+let hardlinkBulk = exports.hardlinkBulk = (() => {
+  var _ref19 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (queue, reporter, _events) {
+    const events = {
+      onStart: _events && _events.onStart || noop,
+      onProgress: _events && _events.onProgress || noop,
+      possibleExtraneous: _events ? _events.possibleExtraneous : new Set(),
+      artifactFiles: _events && _events.artifactFiles || [],
+      ignoreBasenames: []
+    };
 
-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));
+    const actions = yield buildActionsForHardlink(queue, events, events.possibleExtraneous, reporter);
+    events.onStart(actions.file.length + actions.symlink.length + actions.link.length);
+
+    const fileActions = actions.link;
+
+    yield (_promise || _load_promise()).queue(fileActions, (() => {
+      var _ref20 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data) {
+        reporter.verbose(reporter.lang('verboseFileLink', data.src, data.dest));
+        if (data.removeDest) {
+          yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(data.dest);
+        }
+        yield link(data.src, data.dest);
+      });
+
+      return function (_x18) {
+        return _ref20.apply(this, arguments);
+      };
+    })(), CONCURRENT_QUEUE_ITEMS);
+
+    // we need to copy symlinks last as they could reference files we were copying
+    const symlinkActions = actions.symlink;
+    yield (_promise || _load_promise()).queue(symlinkActions, function (data) {
+      const linkname = (_path || _load_path()).default.resolve((_path || _load_path()).default.dirname(data.dest), data.linkname);
+      reporter.verbose(reporter.lang('verboseFileSymlink', data.dest, linkname));
+      return symlink(linkname, data.dest);
+    });
+  });
+
+  return function hardlinkBulk(_x15, _x16, _x17) {
+    return _ref19.apply(this, arguments);
+  };
+})();
+
+let readFileAny = exports.readFileAny = (() => {
+  var _ref21 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (files) {
+    for (var _iterator13 = files, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : _iterator13[Symbol.iterator]();;) {
+      var _ref22;
+
+      if (_isArray13) {
+        if (_i13 >= _iterator13.length) break;
+        _ref22 = _iterator13[_i13++];
+      } else {
+        _i13 = _iterator13.next();
+        if (_i13.done) break;
+        _ref22 = _i13.value;
+      }
+
+      const file = _ref22;
+
+      if (yield exists(file)) {
+        return readFile(file);
+      }
     }
-  }
-  return res;
-};
+    return null;
+  });
 
-/**
- * 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
- */
+  return function readFileAny(_x19) {
+    return _ref21.apply(this, arguments);
+  };
+})();
 
-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);
-};
+let readJson = exports.readJson = (() => {
+  var _ref23 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+    return (yield readJsonAndFile(loc)).object;
+  });
 
-/**
- * Expand braces
- */
+  return function readJson(_x20) {
+    return _ref23.apply(this, arguments);
+  };
+})();
 
-micromatch.braceExpand = (pattern, options) => {
-  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
-  return micromatch.braces(pattern, { ...options, expand: true });
-};
+let readJsonAndFile = exports.readJsonAndFile = (() => {
+  var _ref24 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+    const file = yield readFile(loc);
+    try {
+      return {
+        object: (0, (_map || _load_map()).default)(JSON.parse(stripBOM(file))),
+        content: file
+      };
+    } catch (err) {
+      err.message = `${loc}: ${err.message}`;
+      throw err;
+    }
+  });
 
-/**
- * Expose micromatch
- */
+  return function readJsonAndFile(_x21) {
+    return _ref24.apply(this, arguments);
+  };
+})();
 
-module.exports = micromatch;
+let find = exports.find = (() => {
+  var _ref25 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (filename, dir) {
+    const parts = dir.split((_path || _load_path()).default.sep);
 
+    while (parts.length) {
+      const loc = parts.concat(filename).join((_path || _load_path()).default.sep);
 
-/***/ }),
-/* 190 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (yield exists(loc)) {
+        return loc;
+      } else {
+        parts.pop();
+      }
+    }
 
-"use strict";
+    return false;
+  });
 
+  return function find(_x22, _x23) {
+    return _ref25.apply(this, arguments);
+  };
+})();
 
-const stringify = __webpack_require__(191);
-const compile = __webpack_require__(193);
-const expand = __webpack_require__(197);
-const parse = __webpack_require__(198);
+let symlink = exports.symlink = (() => {
+  var _ref26 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest) {
+    try {
+      const stats = yield lstat(dest);
+      if (stats.isSymbolicLink()) {
+        const resolved = yield realpath(dest);
+        if (resolved === src) {
+          return;
+        }
+      }
+    } catch (err) {
+      if (err.code !== 'ENOENT') {
+        throw err;
+      }
+    }
+    // We use rimraf for unlink which never throws an ENOENT on missing target
+    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dest);
 
-/**
- * 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
- */
+    if (process.platform === 'win32') {
+      // use directory junctions if possible on win32, this requires absolute paths
+      yield fsSymlink(src, dest, 'junction');
+    } else {
+      // use relative paths otherwise which will be retained if the directory is moved
+      let relative;
+      try {
+        relative = (_path || _load_path()).default.relative((_fs || _load_fs()).default.realpathSync((_path || _load_path()).default.dirname(dest)), (_fs || _load_fs()).default.realpathSync(src));
+      } catch (err) {
+        if (err.code !== 'ENOENT') {
+          throw err;
+        }
+        relative = (_path || _load_path()).default.relative((_path || _load_path()).default.dirname(dest), src);
+      }
+      // When path.relative returns an empty string for the current directory, we should instead use
+      // '.', which is a valid fs.symlink target.
+      yield fsSymlink(relative || '.', dest);
+    }
+  });
 
-const braces = (input, options = {}) => {
-  let output = [];
+  return function symlink(_x24, _x25) {
+    return _ref26.apply(this, arguments);
+  };
+})();
 
-  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);
-      }
+let walk = exports.walk = (() => {
+  var _ref27 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir, relativeDir, ignoreBasenames = new Set()) {
+    let files = [];
+
+    let filenames = yield readdir(dir);
+    if (ignoreBasenames.size) {
+      filenames = filenames.filter(function (name) {
+        return !ignoreBasenames.has(name);
+      });
     }
-  } else {
-    output = [].concat(braces.create(input, options));
-  }
 
-  if (options && options.expand === true && options.nodupes === true) {
-    output = [...new Set(output)];
-  }
-  return output;
-};
+    for (var _iterator14 = filenames, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : _iterator14[Symbol.iterator]();;) {
+      var _ref28;
 
-/**
- * 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
- */
+      if (_isArray14) {
+        if (_i14 >= _iterator14.length) break;
+        _ref28 = _iterator14[_i14++];
+      } else {
+        _i14 = _iterator14.next();
+        if (_i14.done) break;
+        _ref28 = _i14.value;
+      }
 
-braces.parse = (input, options = {}) => parse(input, options);
+      const name = _ref28;
 
-/**
- * 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
- */
+      const relative = relativeDir ? (_path || _load_path()).default.join(relativeDir, name) : name;
+      const loc = (_path || _load_path()).default.join(dir, name);
+      const stat = yield lstat(loc);
 
-braces.stringify = (input, options = {}) => {
-  if (typeof input === 'string') {
-    return stringify(braces.parse(input, options), options);
-  }
-  return stringify(input, options);
-};
+      files.push({
+        relative,
+        basename: name,
+        absolute: loc,
+        mtime: +stat.mtime
+      });
 
-/**
- * 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
- */
+      if (stat.isDirectory()) {
+        files = files.concat((yield walk(loc, relative, ignoreBasenames)));
+      }
+    }
 
-braces.compile = (input, options = {}) => {
-  if (typeof input === 'string') {
-    input = braces.parse(input, options);
-  }
-  return compile(input, options);
-};
+    return files;
+  });
 
-/**
- * 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
- */
+  return function walk(_x26, _x27) {
+    return _ref27.apply(this, arguments);
+  };
+})();
 
-braces.expand = (input, options = {}) => {
-  if (typeof input === 'string') {
-    input = braces.parse(input, options);
-  }
+let getFileSizeOnDisk = exports.getFileSizeOnDisk = (() => {
+  var _ref29 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (loc) {
+    const stat = yield lstat(loc);
+    const size = stat.size,
+          blockSize = stat.blksize;
 
-  let result = expand(input, options);
 
-  // filter out empty strings if specified
-  if (options.noempty === true) {
-    result = result.filter(Boolean);
-  }
+    return Math.ceil(size / blockSize) * blockSize;
+  });
 
-  // filter out duplicates if specified
-  if (options.nodupes === true) {
-    result = [...new Set(result)];
-  }
+  return function getFileSizeOnDisk(_x28) {
+    return _ref29.apply(this, arguments);
+  };
+})();
 
-  return result;
-};
+let getEolFromFile = (() => {
+  var _ref30 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path) {
+    if (!(yield exists(path))) {
+      return undefined;
+    }
 
-/**
- * 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
- */
+    const buffer = yield readFileBuffer(path);
 
-braces.create = (input, options = {}) => {
-  if (input === '' || input.length < 3) {
-    return [input];
-  }
+    for (let i = 0; i < buffer.length; ++i) {
+      if (buffer[i] === cr) {
+        return '\r\n';
+      }
+      if (buffer[i] === lf) {
+        return '\n';
+      }
+    }
+    return undefined;
+  });
 
- return options.expand !== true
-    ? braces.compile(input, options)
-    : braces.expand(input, options);
-};
+  return function getEolFromFile(_x29) {
+    return _ref30.apply(this, arguments);
+  };
+})();
 
-/**
- * Expose "braces"
- */
+let writeFilePreservingEol = exports.writeFilePreservingEol = (() => {
+  var _ref31 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (path, data) {
+    const eol = (yield getEolFromFile(path)) || (_os || _load_os()).default.EOL;
+    if (eol !== '\n') {
+      data = data.replace(/\n/g, eol);
+    }
+    yield writeFile(path, data);
+  });
 
-module.exports = braces;
+  return function writeFilePreservingEol(_x30, _x31) {
+    return _ref31.apply(this, arguments);
+  };
+})();
+
+let hardlinksWork = exports.hardlinksWork = (() => {
+  var _ref32 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (dir) {
+    const filename = 'test-file' + Math.random();
+    const file = (_path || _load_path()).default.join(dir, filename);
+    const fileLink = (_path || _load_path()).default.join(dir, filename + '-link');
+    try {
+      yield writeFile(file, 'test');
+      yield link(file, fileLink);
+    } catch (err) {
+      return false;
+    } finally {
+      yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(file);
+      yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(fileLink);
+    }
+    return true;
+  });
 
+  return function hardlinksWork(_x32) {
+    return _ref32.apply(this, arguments);
+  };
+})();
 
-/***/ }),
-/* 191 */
-/***/ (function(module, exports, __webpack_require__) {
+// not a strict polyfill for Node's fs.mkdtemp
 
-"use strict";
 
+let makeTempDir = exports.makeTempDir = (() => {
+  var _ref33 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (prefix) {
+    const dir = (_path || _load_path()).default.join((_os || _load_os()).default.tmpdir(), `yarn-${prefix || ''}-${Date.now()}-${Math.random()}`);
+    yield (0, (_fsNormalized || _load_fsNormalized()).unlink)(dir);
+    yield mkdirp(dir);
+    return dir;
+  });
 
-const utils = __webpack_require__(192);
+  return function makeTempDir(_x33) {
+    return _ref33.apply(this, arguments);
+  };
+})();
 
-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 = '';
+let readFirstAvailableStream = exports.readFirstAvailableStream = (() => {
+  var _ref34 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths) {
+    for (var _iterator15 = paths, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : _iterator15[Symbol.iterator]();;) {
+      var _ref35;
 
-    if (node.value) {
-      if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) {
-        return '\\' + node.value;
+      if (_isArray15) {
+        if (_i15 >= _iterator15.length) break;
+        _ref35 = _iterator15[_i15++];
+      } else {
+        _i15 = _iterator15.next();
+        if (_i15.done) break;
+        _ref35 = _i15.value;
       }
-      return node.value;
-    }
 
-    if (node.value) {
-      return node.value;
-    }
+      const path = _ref35;
 
-    if (node.nodes) {
-      for (let child of node.nodes) {
-        output += stringify(child);
+      try {
+        const fd = yield open(path, 'r');
+        return (_fs || _load_fs()).default.createReadStream(path, { fd });
+      } catch (err) {
+        // Try the next one
       }
     }
-    return output;
+    return null;
+  });
+
+  return function readFirstAvailableStream(_x34) {
+    return _ref34.apply(this, arguments);
   };
+})();
 
-  return stringify(ast);
-};
+let getFirstSuitableFolder = exports.getFirstSuitableFolder = (() => {
+  var _ref36 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (paths, mode = constants.W_OK | constants.X_OK) {
+    const result = {
+      skipped: [],
+      folder: null
+    };
 
+    for (var _iterator16 = paths, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : _iterator16[Symbol.iterator]();;) {
+      var _ref37;
 
+      if (_isArray16) {
+        if (_i16 >= _iterator16.length) break;
+        _ref37 = _iterator16[_i16++];
+      } else {
+        _i16 = _iterator16.next();
+        if (_i16.done) break;
+        _ref37 = _i16.value;
+      }
 
-/***/ }),
-/* 192 */
-/***/ (function(module, exports, __webpack_require__) {
+      const folder = _ref37;
 
-"use strict";
+      try {
+        yield mkdirp(folder);
+        yield access(folder, mode);
 
+        result.folder = folder;
 
-exports.isInteger = num => {
-  if (typeof num === 'number') {
-    return Number.isInteger(num);
-  }
-  if (typeof num === 'string' && num.trim() !== '') {
-    return Number.isInteger(Number(num));
-  }
-  return false;
-};
+        return result;
+      } catch (error) {
+        result.skipped.push({
+          error,
+          folder
+        });
+      }
+    }
+    return result;
+  });
 
-/**
- * Find a node of the given type
- */
+  return function getFirstSuitableFolder(_x35) {
+    return _ref36.apply(this, arguments);
+  };
+})();
 
-exports.find = (node, type) => node.nodes.find(node => node.type === type);
+exports.copy = copy;
+exports.readFile = readFile;
+exports.readFileRaw = readFileRaw;
+exports.normalizeOS = normalizeOS;
 
-/**
- * Find a node of the given type
- */
+var _fs;
 
-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;
-};
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(3));
+}
 
-/**
- * Escape the given node with '\\' before node.value
- */
+var _glob;
 
-exports.escapeNode = (block, n = 0, type) => {
-  let node = block.nodes[n];
-  if (!node) return;
+function _load_glob() {
+  return _glob = _interopRequireDefault(__webpack_require__(75));
+}
 
-  if ((type && node.type === type) || node.type === 'open' || node.type === 'close') {
-    if (node.escaped !== true) {
-      node.value = '\\' + node.value;
-      node.escaped = true;
-    }
-  }
-};
+var _os;
 
-/**
- * Returns true if the given brace node should be enclosed in literal braces
- */
+function _load_os() {
+  return _os = _interopRequireDefault(__webpack_require__(36));
+}
 
-exports.encloseBrace = node => {
-  if (node.type !== 'brace') return false;
-  if ((node.commas >> 0 + node.ranges >> 0) === 0) {
-    node.invalid = true;
-    return true;
-  }
-  return false;
-};
+var _path;
 
-/**
- * Returns true if a brace node is invalid.
- */
+function _load_path() {
+  return _path = _interopRequireDefault(__webpack_require__(0));
+}
 
-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;
-};
+var _blockingQueue;
 
-/**
- * Returns true if a node is an open or close node
- */
+function _load_blockingQueue() {
+  return _blockingQueue = _interopRequireDefault(__webpack_require__(84));
+}
 
-exports.isOpenOrClose = node => {
-  if (node.type === 'open' || node.type === 'close') {
-    return true;
-  }
-  return node.open === true || node.close === true;
-};
+var _promise;
 
-/**
- * Reduce an array of text nodes.
- */
+function _load_promise() {
+  return _promise = _interopRequireWildcard(__webpack_require__(40));
+}
 
-exports.reduce = nodes => nodes.reduce((acc, node) => {
-  if (node.type === 'text') acc.push(node.value);
-  if (node.type === 'range') node.type = 'text';
-  return acc;
-}, []);
+var _promise2;
 
-/**
- * Flatten an array
- */
+function _load_promise2() {
+  return _promise2 = __webpack_require__(40);
+}
 
-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;
-};
+var _map;
 
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
+}
 
-/***/ }),
-/* 193 */
-/***/ (function(module, exports, __webpack_require__) {
+var _fsNormalized;
 
-"use strict";
+function _load_fsNormalized() {
+  return _fsNormalized = __webpack_require__(164);
+}
 
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
-const fill = __webpack_require__(194);
-const utils = __webpack_require__(192);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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 = '';
+const constants = exports.constants = typeof (_fs || _load_fs()).default.constants !== 'undefined' ? (_fs || _load_fs()).default.constants : {
+  R_OK: (_fs || _load_fs()).default.R_OK,
+  W_OK: (_fs || _load_fs()).default.W_OK,
+  X_OK: (_fs || _load_fs()).default.X_OK
+};
 
-    if (node.isOpen === true) {
-      return prefix + node.value;
-    }
-    if (node.isClose === true) {
-      return prefix + node.value;
-    }
+const lockQueue = exports.lockQueue = new (_blockingQueue || _load_blockingQueue()).default('fs lock');
 
-    if (node.type === 'open') {
-      return invalid ? (prefix + node.value) : '(';
-    }
+const readFileBuffer = exports.readFileBuffer = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readFile);
+const open = exports.open = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.open);
+const writeFile = exports.writeFile = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.writeFile);
+const readlink = exports.readlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readlink);
+const realpath = exports.realpath = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.realpath);
+const readdir = exports.readdir = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.readdir);
+const rename = exports.rename = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.rename);
+const access = exports.access = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.access);
+const stat = exports.stat = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.stat);
+const mkdirp = exports.mkdirp = (0, (_promise2 || _load_promise2()).promisify)(__webpack_require__(116));
+const exists = exports.exists = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.exists, true);
+const lstat = exports.lstat = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.lstat);
+const chmod = exports.chmod = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.chmod);
+const link = exports.link = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.link);
+const glob = exports.glob = (0, (_promise2 || _load_promise2()).promisify)((_glob || _load_glob()).default);
+exports.unlink = (_fsNormalized || _load_fsNormalized()).unlink;
 
-    if (node.type === 'close') {
-      return invalid ? (prefix + node.value) : ')';
-    }
+// fs.copyFile uses the native file copying instructions on the system, performing much better
+// than any JS-based solution and consumes fewer resources. Repeated testing to fine tune the
+// concurrency level revealed 128 as the sweet spot on a quad-core, 16 CPU Intel system with SSD.
 
-    if (node.type === 'comma') {
-      return node.prev.type === 'comma' ? '' : (invalid ? node.value : '|');
-    }
+const CONCURRENT_QUEUE_ITEMS = (_fs || _load_fs()).default.copyFile ? 128 : 4;
 
-    if (node.value) {
-      return node.value;
-    }
+const fsSymlink = (0, (_promise2 || _load_promise2()).promisify)((_fs || _load_fs()).default.symlink);
+const invariant = __webpack_require__(7);
+const stripBOM = __webpack_require__(122);
 
-    if (node.nodes && node.ranges > 0) {
-      let args = utils.reduce(node.nodes);
-      let range = fill(...args, { ...options, wrap: false, toRegex: true });
+const noop = () => {};
 
-      if (range.length !== 0) {
-        return args.length > 1 && range.length > 1 ? `(${range})` : range;
-      }
-    }
+function copy(src, dest, reporter) {
+  return copyBulk([{ src, dest }], reporter);
+}
 
-    if (node.nodes) {
-      for (let child of node.nodes) {
-        output += walk(child, node);
+function _readFile(loc, encoding) {
+  return new Promise((resolve, reject) => {
+    (_fs || _load_fs()).default.readFile(loc, encoding, function (err, content) {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(content);
       }
-    }
-    return output;
-  };
+    });
+  });
+}
 
-  return walk(ast);
-};
+function readFile(loc) {
+  return _readFile(loc, 'utf8').then(normalizeOS);
+}
 
-module.exports = compile;
+function readFileRaw(loc) {
+  return _readFile(loc, 'binary');
+}
 
+function normalizeOS(body) {
+  return body.replace(/\r\n/g, '\n');
+}
+
+const cr = '\r'.charCodeAt(0);
+const lf = '\n'.charCodeAt(0);
 
 /***/ }),
-/* 194 */
+/* 6 */
 /***/ (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.
- */
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getPathKey = getPathKey;
+const os = __webpack_require__(36);
+const path = __webpack_require__(0);
+const userHome = __webpack_require__(45).default;
 
-const util = __webpack_require__(29);
-const toRegexRange = __webpack_require__(195);
+var _require = __webpack_require__(171);
 
-const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
+const getCacheDir = _require.getCacheDir,
+      getConfigDir = _require.getConfigDir,
+      getDataDir = _require.getDataDir;
 
-const transform = toNumber => {
-  return value => toNumber === true ? Number(value) : String(value);
-};
+const isWebpackBundle = __webpack_require__(227);
 
-const isValidValue = value => {
-  return typeof value === 'number' || (typeof value === 'string' && value !== '');
-};
+const DEPENDENCY_TYPES = exports.DEPENDENCY_TYPES = ['devDependencies', 'dependencies', 'optionalDependencies', 'peerDependencies'];
+const RESOLUTIONS = exports.RESOLUTIONS = 'resolutions';
+const MANIFEST_FIELDS = exports.MANIFEST_FIELDS = [RESOLUTIONS, ...DEPENDENCY_TYPES];
 
-const isNumber = num => Number.isInteger(+num);
+const SUPPORTED_NODE_VERSIONS = exports.SUPPORTED_NODE_VERSIONS = '^4.8.0 || ^5.7.0 || ^6.2.2 || >=8.0.0';
 
-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 YARN_REGISTRY = exports.YARN_REGISTRY = 'https://registry.yarnpkg.com';
 
-const stringify = (start, end, options) => {
-  if (typeof start === 'string' || typeof end === 'string') {
-    return true;
-  }
-  return options.stringify === true;
-};
+const YARN_DOCS = exports.YARN_DOCS = 'https://yarnpkg.com/en/docs/cli/';
+const YARN_INSTALLER_SH = exports.YARN_INSTALLER_SH = 'https://yarnpkg.com/install.sh';
+const YARN_INSTALLER_MSI = exports.YARN_INSTALLER_MSI = 'https://yarnpkg.com/latest.msi';
 
-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 SELF_UPDATE_VERSION_URL = exports.SELF_UPDATE_VERSION_URL = 'https://yarnpkg.com/latest-version';
 
-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;
-};
+// cache version, bump whenever we make backwards incompatible changes
+const CACHE_VERSION = exports.CACHE_VERSION = 2;
 
-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);
+// lockfile version, bump whenever we make backwards incompatible changes
+const LOCKFILE_VERSION = exports.LOCKFILE_VERSION = 1;
 
-  let prefix = options.capture ? '' : '?:';
-  let positives = '';
-  let negatives = '';
-  let result;
+// max amount of network requests to perform concurrently
+const NETWORK_CONCURRENCY = exports.NETWORK_CONCURRENCY = 8;
 
-  if (parts.positives.length) {
-    positives = parts.positives.join('|');
-  }
+// HTTP timeout used when downloading packages
+const NETWORK_TIMEOUT = exports.NETWORK_TIMEOUT = 30 * 1000; // in milliseconds
 
-  if (parts.negatives.length) {
-    negatives = `-(${prefix}${parts.negatives.join('|')})`;
+// max amount of child processes to execute concurrently
+const CHILD_CONCURRENCY = exports.CHILD_CONCURRENCY = 5;
+
+const REQUIRED_PACKAGE_KEYS = exports.REQUIRED_PACKAGE_KEYS = ['name', 'version', '_uid'];
+
+function getPreferredCacheDirectories() {
+  const preferredCacheDirectories = [getCacheDir()];
+
+  if (process.getuid) {
+    // $FlowFixMe: process.getuid exists, dammit
+    preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache-${process.getuid()}`));
   }
 
-  if (positives && negatives) {
-    result = `${positives}|${negatives}`;
+  preferredCacheDirectories.push(path.join(os.tmpdir(), `.yarn-cache`));
+
+  return preferredCacheDirectories;
+}
+
+const PREFERRED_MODULE_CACHE_DIRECTORIES = exports.PREFERRED_MODULE_CACHE_DIRECTORIES = getPreferredCacheDirectories();
+const CONFIG_DIRECTORY = exports.CONFIG_DIRECTORY = getConfigDir();
+const DATA_DIRECTORY = exports.DATA_DIRECTORY = getDataDir();
+const LINK_REGISTRY_DIRECTORY = exports.LINK_REGISTRY_DIRECTORY = path.join(DATA_DIRECTORY, 'link');
+const GLOBAL_MODULE_DIRECTORY = exports.GLOBAL_MODULE_DIRECTORY = path.join(DATA_DIRECTORY, 'global');
+
+const NODE_BIN_PATH = exports.NODE_BIN_PATH = process.execPath;
+const YARN_BIN_PATH = exports.YARN_BIN_PATH = getYarnBinPath();
+
+// Webpack needs to be configured with node.__dirname/__filename = false
+function getYarnBinPath() {
+  if (isWebpackBundle) {
+    return __filename;
   } else {
-    result = positives || negatives;
+    return path.join(__dirname, '..', 'bin', 'yarn.js');
   }
+}
 
-  if (options.wrap) {
-    return `(${prefix}${result})`;
-  }
+const NODE_MODULES_FOLDER = exports.NODE_MODULES_FOLDER = 'node_modules';
+const NODE_PACKAGE_JSON = exports.NODE_PACKAGE_JSON = 'package.json';
 
-  return result;
-};
+const POSIX_GLOBAL_PREFIX = exports.POSIX_GLOBAL_PREFIX = `${process.env.DESTDIR || ''}/usr/local`;
+const FALLBACK_GLOBAL_PREFIX = exports.FALLBACK_GLOBAL_PREFIX = path.join(userHome, '.yarn');
 
-const toRange = (a, b, isNumbers, options) => {
-  if (isNumbers) {
-    return toRegexRange(a, b, { wrap: false, ...options });
-  }
+const META_FOLDER = exports.META_FOLDER = '.yarn-meta';
+const INTEGRITY_FILENAME = exports.INTEGRITY_FILENAME = '.yarn-integrity';
+const LOCKFILE_FILENAME = exports.LOCKFILE_FILENAME = 'yarn.lock';
+const METADATA_FILENAME = exports.METADATA_FILENAME = '.yarn-metadata.json';
+const TARBALL_FILENAME = exports.TARBALL_FILENAME = '.yarn-tarball.tgz';
+const CLEAN_FILENAME = exports.CLEAN_FILENAME = '.yarnclean';
 
-  let start = String.fromCharCode(a);
-  if (a === b) return start;
+const NPM_LOCK_FILENAME = exports.NPM_LOCK_FILENAME = 'package-lock.json';
+const NPM_SHRINKWRAP_FILENAME = exports.NPM_SHRINKWRAP_FILENAME = 'npm-shrinkwrap.json';
 
-  let stop = String.fromCharCode(b);
-  return `[${start}-${stop}]`;
-};
+const DEFAULT_INDENT = exports.DEFAULT_INDENT = '  ';
+const SINGLE_INSTANCE_PORT = exports.SINGLE_INSTANCE_PORT = 31997;
+const SINGLE_INSTANCE_FILENAME = exports.SINGLE_INSTANCE_FILENAME = '.yarn-single-instance';
 
-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 ENV_PATH_KEY = exports.ENV_PATH_KEY = getPathKey(process.platform, process.env);
 
-const rangeError = (...args) => {
-  return new RangeError('Invalid range arguments: ' + util.inspect(...args));
-};
+function getPathKey(platform, env) {
+  let pathKey = 'PATH';
 
-const invalidRange = (start, end, options) => {
-  if (options.strictRanges === true) throw rangeError([start, end]);
-  return [];
-};
+  // windows calls its path "Path" usually, but this is not guaranteed.
+  if (platform === 'win32') {
+    pathKey = 'Path';
 
-const invalidStep = (step, options) => {
-  if (options.strictRanges === true) {
-    throw new TypeError(`Expected step "${step}" to be a number`);
+    for (const key in env) {
+      if (key.toLowerCase() === 'path') {
+        pathKey = key;
+      }
+    }
   }
-  return [];
+
+  return pathKey;
+}
+
+const VERSION_COLOR_SCHEME = exports.VERSION_COLOR_SCHEME = {
+  major: 'red',
+  premajor: 'red',
+  minor: 'yellow',
+  preminor: 'yellow',
+  patch: 'green',
+  prepatch: 'green',
+  prerelease: 'red',
+  unchanged: 'white',
+  unknown: 'red'
 };
 
-const fillNumbers = (start, end, step = 1, options = {}) => {
-  let a = Number(start);
-  let b = Number(end);
+/***/ }),
+/* 7 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 
-  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);
+/**
+ * Use invariant() to assert state which your program assumes to be true.
+ *
+ * Provide sprintf-style format (only %s is supported) and arguments
+ * to provide information about what broke and what you were
+ * expecting.
+ *
+ * The invariant message will be stripped in production, but the invariant
+ * will remain to ensure logic does not differ in production.
+ */
 
-  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);
+var NODE_ENV = "none";
 
-  if (options.toRegex && step === 1) {
-    return toRange(toMaxLen(start, maxLen), toMaxLen(end, maxLen), true, options);
+var invariant = function(condition, format, a, b, c, d, e, f) {
+  if (NODE_ENV !== 'production') {
+    if (format === undefined) {
+      throw new Error('invariant requires an error message argument');
+    }
   }
 
-  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);
+  if (!condition) {
+    var error;
+    if (format === undefined) {
+      error = new Error(
+        'Minified exception occurred; use the non-minified dev environment ' +
+        'for the full error message and additional helpful warnings.'
+      );
     } else {
-      range.push(pad(format(a, index), maxLen, toNumber));
+      var args = [a, b, c, d, e, f];
+      var argIndex = 0;
+      error = new Error(
+        format.replace(/%s/g, function() { return args[argIndex++]; })
+      );
+      error.name = 'Invariant Violation';
     }
-    a = descending ? a - step : a + step;
-    index++;
-  }
 
-  if (options.toRegex === true) {
-    return step > 1
-      ? toSequence(parts, options)
-      : toRegex(range, null, { wrap: false, ...options });
+    error.framesToPop = 1; // we don't care about invariant's own frame
+    throw error;
   }
-
-  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);
-  }
+module.exports = invariant;
 
 
-  let format = options.transform || (val => String.fromCharCode(val));
-  let a = `${start}`.charCodeAt(0);
-  let b = `${end}`.charCodeAt(0);
+/***/ }),
+/* 8 */,
+/* 9 */
+/***/ (function(module, exports) {
 
-  let descending = a > b;
-  let min = Math.min(a, b);
-  let max = Math.max(a, b);
+module.exports = __webpack_require__(582);
 
-  if (options.toRegex && step === 1) {
-    return toRange(min, max, false, options);
-  }
+/***/ }),
+/* 10 */,
+/* 11 */
+/***/ (function(module, exports) {
 
-  let range = [];
-  let index = 0;
+// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+var global = module.exports = typeof window != 'undefined' && window.Math == Math
+  ? window : typeof self != 'undefined' && self.Math == Math ? self
+  // eslint-disable-next-line no-new-func
+  : Function('return this')();
+if (typeof __g == 'number') __g = global; // eslint-disable-line no-undef
 
-  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 });
-  }
+/***/ }),
+/* 12 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return range;
-};
+"use strict";
 
-const fill = (start, end, step, options = {}) => {
-  if (end == null && isValidValue(start)) {
-    return [start];
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sortAlpha = sortAlpha;
+exports.entries = entries;
+exports.removePrefix = removePrefix;
+exports.removeSuffix = removeSuffix;
+exports.addSuffix = addSuffix;
+exports.hyphenate = hyphenate;
+exports.camelCase = camelCase;
+exports.compareSortedArrays = compareSortedArrays;
+exports.sleep = sleep;
+const _camelCase = __webpack_require__(176);
+
+function sortAlpha(a, b) {
+  // sort alphabetically in a deterministic way
+  const shortLen = Math.min(a.length, b.length);
+  for (let i = 0; i < shortLen; i++) {
+    const aChar = a.charCodeAt(i);
+    const bChar = b.charCodeAt(i);
+    if (aChar !== bChar) {
+      return aChar - bChar;
+    }
   }
+  return a.length - b.length;
+}
 
-  if (!isValidValue(start) || !isValidValue(end)) {
-    return invalidRange(start, end, options);
+function entries(obj) {
+  const entries = [];
+  if (obj) {
+    for (const key in obj) {
+      entries.push([key, obj[key]]);
+    }
   }
+  return entries;
+}
 
-  if (typeof step === 'function') {
-    return fill(start, end, 1, { transform: step });
+function removePrefix(pattern, prefix) {
+  if (pattern.startsWith(prefix)) {
+    pattern = pattern.slice(prefix.length);
   }
 
-  if (isObject(step)) {
-    return fill(start, end, 0, step);
+  return pattern;
+}
+
+function removeSuffix(pattern, suffix) {
+  if (pattern.endsWith(suffix)) {
+    return pattern.slice(0, -suffix.length);
   }
 
-  let opts = { ...options };
-  if (opts.capture === true) opts.wrap = true;
-  step = step || opts.step || 1;
+  return pattern;
+}
 
-  if (!isNumber(step)) {
-    if (step != null && !isObject(step)) return invalidStep(step, opts);
-    return fill(start, end, 1, step);
+function addSuffix(pattern, suffix) {
+  if (!pattern.endsWith(suffix)) {
+    return pattern + suffix;
   }
 
-  if (isNumber(start) && isNumber(end)) {
-    return fillNumbers(start, end, step, opts);
+  return pattern;
+}
+
+function hyphenate(str) {
+  return str.replace(/[A-Z]/g, match => {
+    return '-' + match.charAt(0).toLowerCase();
+  });
+}
+
+function camelCase(str) {
+  if (/[A-Z]/.test(str)) {
+    return null;
+  } else {
+    return _camelCase(str);
   }
+}
 
-  return fillLetters(start, end, Math.max(Math.abs(step), 1), opts);
+function compareSortedArrays(array1, array2) {
+  if (array1.length !== array2.length) {
+    return false;
+  }
+  for (let i = 0, len = array1.length; i < len; i++) {
+    if (array1[i] !== array2[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function sleep(ms) {
+  return new Promise(resolve => {
+    setTimeout(resolve, ms);
+  });
+}
+
+/***/ }),
+/* 13 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var store = __webpack_require__(107)('wks');
+var uid = __webpack_require__(111);
+var Symbol = __webpack_require__(11).Symbol;
+var USE_SYMBOL = typeof Symbol == 'function';
+
+var $exports = module.exports = function (name) {
+  return store[name] || (store[name] =
+    USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)('Symbol.' + name));
 };
 
-module.exports = fill;
+$exports.store = store;
 
 
 /***/ }),
-/* 195 */
+/* 14 */
 /***/ (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.
- */
 
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stringify = exports.parse = undefined;
 
-const isNumber = __webpack_require__(196);
+var _asyncToGenerator2;
 
-const toRegexRange = (min, max, options) => {
-  if (isNumber(min) === false) {
-    throw new TypeError('toRegexRange: expected the first argument to be a number');
-  }
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
+}
 
-  if (max === void 0 || min === max) {
-    return String(min);
-  }
+var _parse;
 
-  if (isNumber(max) === false) {
-    throw new TypeError('toRegexRange: expected the second argument to be a number.');
-  }
+function _load_parse() {
+  return _parse = __webpack_require__(81);
+}
 
-  let opts = { relaxZeros: true, ...options };
-  if (typeof opts.strictZeros === 'boolean') {
-    opts.relaxZeros = opts.strictZeros === false;
+Object.defineProperty(exports, 'parse', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_parse || _load_parse()).default;
   }
+});
 
-  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;
+var _stringify;
 
-  if (toRegexRange.cache.hasOwnProperty(cacheKey)) {
-    return toRegexRange.cache[cacheKey].result;
+function _load_stringify() {
+  return _stringify = __webpack_require__(150);
+}
+
+Object.defineProperty(exports, 'stringify', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_stringify || _load_stringify()).default;
   }
+});
+exports.implodeEntry = implodeEntry;
+exports.explodeEntry = explodeEntry;
 
-  let a = Math.min(min, max);
-  let b = Math.max(min, max);
+var _misc;
 
-  if (Math.abs(a - b) === 1) {
-    let result = min + '|' + max;
-    if (opts.capture) {
-      return `(${result})`;
-    }
-    if (opts.wrap === false) {
-      return result;
-    }
-    return `(?:${result})`;
-  }
+function _load_misc() {
+  return _misc = __webpack_require__(12);
+}
 
-  let isPadded = hasPadding(min) || hasPadding(max);
-  let state = { min, max, a, b };
-  let positives = [];
-  let negatives = [];
+var _normalizePattern;
 
-  if (isPadded) {
-    state.isPadded = isPadded;
-    state.maxLen = String(state.max).length;
-  }
+function _load_normalizePattern() {
+  return _normalizePattern = __webpack_require__(29);
+}
 
-  if (a < 0) {
-    let newMin = b < 0 ? Math.abs(b) : 1;
-    negatives = splitToPatterns(newMin, Math.abs(a), state, opts);
-    a = state.a = 0;
-  }
+var _parse2;
 
-  if (b >= 0) {
-    positives = splitToPatterns(a, b, state, opts);
-  }
+function _load_parse2() {
+  return _parse2 = _interopRequireDefault(__webpack_require__(81));
+}
 
-  state.negatives = negatives;
-  state.positives = positives;
-  state.result = collatePatterns(negatives, positives, opts);
+var _constants;
 
-  if (opts.capture === true) {
-    state.result = `(${state.result})`;
-  } else if (opts.wrap !== false && (positives.length + negatives.length) > 1) {
-    state.result = `(?:${state.result})`;
-  }
+function _load_constants() {
+  return _constants = __webpack_require__(6);
+}
 
-  toRegexRange.cache[cacheKey] = state;
-  return state.result;
-};
+var _fs;
 
-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 _load_fs() {
+  return _fs = _interopRequireWildcard(__webpack_require__(5));
 }
 
-function splitToRanges(min, max) {
-  let nines = 1;
-  let zeros = 1;
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
-  let stop = countNines(min, nines);
-  let stops = new Set([max]);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-  while (min <= stop && stop <= max) {
-    stops.add(stop);
-    nines += 1;
-    stop = countNines(min, nines);
-  }
+const invariant = __webpack_require__(7);
 
-  stop = countZeros(max + 1, zeros) - 1;
+const path = __webpack_require__(0);
+const ssri = __webpack_require__(55);
 
-  while (min < stop && stop <= max) {
-    stops.add(stop);
-    zeros += 1;
-    stop = countZeros(max + 1, zeros) - 1;
-  }
+function getName(pattern) {
+  return (0, (_normalizePattern || _load_normalizePattern()).normalizePattern)(pattern).name;
+}
 
-  stops = [...stops];
-  stops.sort(compare);
-  return stops;
+function blankObjectUndefined(obj) {
+  return obj && Object.keys(obj).length ? obj : undefined;
 }
 
-/**
- * Convert a range to a regex pattern
- * @param {Number} `start`
- * @param {Number} `stop`
- * @return {String}
- */
+function keyForRemote(remote) {
+  return remote.resolved || (remote.reference && remote.hash ? `${remote.reference}#${remote.hash}` : null);
+}
 
-function rangeToPattern(start, stop, options) {
-  if (start === stop) {
-    return { pattern: start, count: [], digits: 0 };
+function serializeIntegrity(integrity) {
+  // We need this because `Integrity.toString()` does not use sorting to ensure a stable string output
+  // See https://git.io/vx2Hy
+  return integrity.toString().split(' ').sort().join(' ');
+}
+
+function implodeEntry(pattern, obj) {
+  const inferredName = getName(pattern);
+  const integrity = obj.integrity ? serializeIntegrity(obj.integrity) : '';
+  const imploded = {
+    name: inferredName === obj.name ? undefined : obj.name,
+    version: obj.version,
+    uid: obj.uid === obj.version ? undefined : obj.uid,
+    resolved: obj.resolved,
+    registry: obj.registry === 'npm' ? undefined : obj.registry,
+    dependencies: blankObjectUndefined(obj.dependencies),
+    optionalDependencies: blankObjectUndefined(obj.optionalDependencies),
+    permissions: blankObjectUndefined(obj.permissions),
+    prebuiltVariants: blankObjectUndefined(obj.prebuiltVariants)
+  };
+  if (integrity) {
+    imploded.integrity = integrity;
   }
+  return imploded;
+}
 
-  let zipped = zip(start, stop);
-  let digits = zipped.length;
-  let pattern = '';
-  let count = 0;
+function explodeEntry(pattern, obj) {
+  obj.optionalDependencies = obj.optionalDependencies || {};
+  obj.dependencies = obj.dependencies || {};
+  obj.uid = obj.uid || obj.version;
+  obj.permissions = obj.permissions || {};
+  obj.registry = obj.registry || 'npm';
+  obj.name = obj.name || getName(pattern);
+  const integrity = obj.integrity;
+  if (integrity && integrity.isIntegrity) {
+    obj.integrity = ssri.parse(integrity);
+  }
+  return obj;
+}
 
-  for (let i = 0; i < digits; i++) {
-    let [startDigit, stopDigit] = zipped[i];
+class Lockfile {
+  constructor({ cache, source, parseResultType } = {}) {
+    this.source = source || '';
+    this.cache = cache;
+    this.parseResultType = parseResultType;
+  }
 
-    if (startDigit === stopDigit) {
-      pattern += startDigit;
+  // source string if the `cache` was parsed
 
-    } else if (startDigit !== '0' || stopDigit !== '9') {
-      pattern += toCharacterClass(startDigit, stopDigit, options);
 
-    } else {
-      count++;
+  // if true, we're parsing an old yarn file and need to update integrity fields
+  hasEntriesExistWithoutIntegrity() {
+    if (!this.cache) {
+      return false;
     }
-  }
 
-  if (count) {
-    pattern += options.shorthand === true ? '\\d' : '[0-9]';
+    for (const key in this.cache) {
+      // $FlowFixMe - `this.cache` is clearly defined at this point
+      if (!/^.*@(file:|http)/.test(key) && this.cache[key] && !this.cache[key].integrity) {
+        return true;
+      }
+    }
+
+    return false;
   }
 
-  return { pattern, count: [count], digits };
-}
+  static fromDirectory(dir, reporter) {
+    return (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* () {
+      // read the manifest in this directory
+      const lockfileLoc = path.join(dir, (_constants || _load_constants()).LOCKFILE_FILENAME);
 
-function splitToPatterns(min, max, tok, options) {
-  let ranges = splitToRanges(min, max);
-  let tokens = [];
-  let start = min;
-  let prev;
+      let lockfile;
+      let rawLockfile = '';
+      let parseResult;
 
-  for (let i = 0; i < ranges.length; i++) {
-    let max = ranges[i];
-    let obj = rangeToPattern(String(start), String(max), options);
-    let zeros = '';
+      if (yield (_fs || _load_fs()).exists(lockfileLoc)) {
+        rawLockfile = yield (_fs || _load_fs()).readFile(lockfileLoc);
+        parseResult = (0, (_parse2 || _load_parse2()).default)(rawLockfile, lockfileLoc);
 
-    if (!tok.isPadded && prev && prev.pattern === obj.pattern) {
-      if (prev.count.length > 1) {
-        prev.count.pop();
+        if (reporter) {
+          if (parseResult.type === 'merge') {
+            reporter.info(reporter.lang('lockfileMerged'));
+          } else if (parseResult.type === 'conflict') {
+            reporter.warn(reporter.lang('lockfileConflict'));
+          }
+        }
+
+        lockfile = parseResult.object;
+      } else if (reporter) {
+        reporter.info(reporter.lang('noLockfileFound'));
       }
 
-      prev.count.push(obj.count[0]);
-      prev.string = prev.pattern + toQuantifier(prev.count);
-      start = max + 1;
-      continue;
+      return new Lockfile({ cache: lockfile, source: rawLockfile, parseResultType: parseResult && parseResult.type });
+    })();
+  }
+
+  getLocked(pattern) {
+    const cache = this.cache;
+    if (!cache) {
+      return undefined;
     }
 
-    if (tok.isPadded) {
-      zeros = padZeros(max, tok, options);
+    const shrunk = pattern in cache && cache[pattern];
+
+    if (typeof shrunk === 'string') {
+      return this.getLocked(shrunk);
+    } else if (shrunk) {
+      explodeEntry(pattern, shrunk);
+      return shrunk;
     }
 
-    obj.string = zeros + obj.pattern + toQuantifier(obj.count);
-    tokens.push(obj);
-    start = max + 1;
-    prev = obj;
+    return undefined;
   }
 
-  return tokens;
+  removePattern(pattern) {
+    const cache = this.cache;
+    if (!cache) {
+      return;
+    }
+    delete cache[pattern];
+  }
+
+  getLockfile(patterns) {
+    const lockfile = {};
+    const seen = new Map();
+
+    // order by name so that lockfile manifest is assigned to the first dependency with this manifest
+    // the others that have the same remoteKey will just refer to the first
+    // ordering allows for consistency in lockfile when it is serialized
+    const sortedPatternsKeys = Object.keys(patterns).sort((_misc || _load_misc()).sortAlpha);
+
+    for (var _iterator = sortedPatternsKeys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const pattern = _ref;
+
+      const pkg = patterns[pattern];
+      const remote = pkg._remote,
+            ref = pkg._reference;
+
+      invariant(ref, 'Package is missing a reference');
+      invariant(remote, 'Package is missing a remote');
+
+      const remoteKey = keyForRemote(remote);
+      const seenPattern = remoteKey && seen.get(remoteKey);
+      if (seenPattern) {
+        // no point in duplicating it
+        lockfile[pattern] = seenPattern;
+
+        // if we're relying on our name being inferred and two of the patterns have
+        // different inferred names then we need to set it
+        if (!seenPattern.name && getName(pattern) !== pkg.name) {
+          seenPattern.name = pkg.name;
+        }
+        continue;
+      }
+      const obj = implodeEntry(pattern, {
+        name: pkg.name,
+        version: pkg.version,
+        uid: pkg._uid,
+        resolved: remote.resolved,
+        integrity: remote.integrity,
+        registry: remote.registry,
+        dependencies: pkg.dependencies,
+        peerDependencies: pkg.peerDependencies,
+        optionalDependencies: pkg.optionalDependencies,
+        permissions: ref.permissions,
+        prebuiltVariants: pkg.prebuiltVariants
+      });
+
+      lockfile[pattern] = obj;
+
+      if (remoteKey) {
+        seen.set(remoteKey, obj);
+      }
+    }
+
+    return lockfile;
+  }
 }
+exports.default = Lockfile;
 
-function filterPatterns(arr, comparison, prefix, intersection, options) {
-  let result = [];
+/***/ }),
+/* 15 */,
+/* 16 */,
+/* 17 */
+/***/ (function(module, exports) {
 
-  for (let ele of arr) {
-    let { string } = ele;
+module.exports = __webpack_require__(27);
 
-    // only push if _both_ are negative...
-    if (!intersection && !contains(comparison, 'string', string)) {
-      result.push(prefix + string);
+/***/ }),
+/* 18 */,
+/* 19 */,
+/* 20 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = nullify;
+function nullify(obj = {}) {
+  if (Array.isArray(obj)) {
+    for (var _iterator = obj, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+      var _ref;
+
+      if (_isArray) {
+        if (_i >= _iterator.length) break;
+        _ref = _iterator[_i++];
+      } else {
+        _i = _iterator.next();
+        if (_i.done) break;
+        _ref = _i.value;
+      }
+
+      const item = _ref;
+
+      nullify(item);
     }
+  } else if (obj !== null && typeof obj === 'object' || typeof obj === 'function') {
+    Object.setPrototypeOf(obj, null);
 
-    // or _both_ are positive
-    if (intersection && contains(comparison, 'string', string)) {
-      result.push(prefix + string);
+    // for..in can only be applied to 'object', not 'function'
+    if (typeof obj === 'object') {
+      for (const key in obj) {
+        nullify(obj[key]);
+      }
     }
   }
-  return result;
+
+  return obj;
 }
 
+/***/ }),
+/* 21 */,
+/* 22 */
+/***/ (function(module, exports) {
+
+module.exports = __webpack_require__(30);
+
+/***/ }),
+/* 23 */
+/***/ (function(module, exports) {
+
+var core = module.exports = { version: '2.5.7' };
+if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
+
+
+/***/ }),
+/* 24 */,
+/* 25 */,
+/* 26 */,
+/* 27 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var isObject = __webpack_require__(34);
+module.exports = function (it) {
+  if (!isObject(it)) throw TypeError(it + ' is not an object!');
+  return it;
+};
+
+
+/***/ }),
+/* 28 */,
+/* 29 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.normalizePattern = normalizePattern;
+
 /**
- * Zip strings
+ * Explode and normalize a pattern into its name and range.
  */
 
-function zip(a, b) {
-  let arr = [];
-  for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
-  return arr;
-}
+function normalizePattern(pattern) {
+  let hasVersion = false;
+  let range = 'latest';
+  let name = pattern;
 
-function compare(a, b) {
-  return a > b ? 1 : b > a ? -1 : 0;
-}
+  // if we're a scope then remove the @ and add it back later
+  let isScoped = false;
+  if (name[0] === '@') {
+    isScoped = true;
+    name = name.slice(1);
+  }
 
-function contains(arr, key, val) {
-  return arr.some(ele => ele[key] === val);
-}
+  // take first part as the name
+  const parts = name.split('@');
+  if (parts.length > 1) {
+    name = parts.shift();
+    range = parts.join('@');
 
-function countNines(min, len) {
-  return Number(String(min).slice(0, -len) + '9'.repeat(len));
-}
+    if (range) {
+      hasVersion = true;
+    } else {
+      range = '*';
+    }
+  }
 
-function countZeros(integer, zeros) {
-  return integer - (integer % Math.pow(10, zeros));
+  // add back @ scope suffix
+  if (isScoped) {
+    name = `@${name}`;
+  }
+
+  return { name, range, hasVersion };
 }
 
-function toQuantifier(digits) {
-  let [start = 0, stop = ''] = digits;
-  if (stop || start > 1) {
-    return `{${start + (stop ? ',' + stop : '')}}`;
+/***/ }),
+/* 30 */,
+/* 31 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var dP = __webpack_require__(50);
+var createDesc = __webpack_require__(106);
+module.exports = __webpack_require__(33) ? function (object, key, value) {
+  return dP.f(object, key, createDesc(1, value));
+} : function (object, key, value) {
+  object[key] = value;
+  return object;
+};
+
+
+/***/ }),
+/* 32 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/* eslint-disable node/no-deprecated-api */
+var buffer = __webpack_require__(63)
+var Buffer = buffer.Buffer
+
+// alternative to using Object.keys for old browsers
+function copyProps (src, dst) {
+  for (var key in src) {
+    dst[key] = src[key]
   }
-  return '';
+}
+if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
+  module.exports = buffer
+} else {
+  // Copy properties from require('buffer')
+  copyProps(buffer, exports)
+  exports.Buffer = SafeBuffer
 }
 
-function toCharacterClass(a, b, options) {
-  return `[${a}${(b - a === 1) ? '' : '-'}${b}]`;
+function SafeBuffer (arg, encodingOrOffset, length) {
+  return Buffer(arg, encodingOrOffset, length)
 }
 
-function hasPadding(str) {
-  return /^-?(0+)\d/.test(str);
+// Copy static methods from Buffer
+copyProps(Buffer, SafeBuffer)
+
+SafeBuffer.from = function (arg, encodingOrOffset, length) {
+  if (typeof arg === 'number') {
+    throw new TypeError('Argument must not be a number')
+  }
+  return Buffer(arg, encodingOrOffset, length)
 }
 
-function padZeros(value, tok, options) {
-  if (!tok.isPadded) {
-    return value;
+SafeBuffer.alloc = function (size, fill, encoding) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  var buf = Buffer(size)
+  if (fill !== undefined) {
+    if (typeof encoding === 'string') {
+      buf.fill(fill, encoding)
+    } else {
+      buf.fill(fill)
+    }
+  } else {
+    buf.fill(0)
   }
+  return buf
+}
 
-  let diff = Math.abs(tok.maxLen - String(value).length);
-  let relax = options.relaxZeros !== false;
+SafeBuffer.allocUnsafe = function (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
+  }
+  return Buffer(size)
+}
 
-  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}}`;
-    }
+SafeBuffer.allocUnsafeSlow = function (size) {
+  if (typeof size !== 'number') {
+    throw new TypeError('Argument must be a number')
   }
+  return buffer.SlowBuffer(size)
 }
 
-/**
- * Cache
- */
 
-toRegexRange.cache = {};
-toRegexRange.clearCache = () => (toRegexRange.cache = {});
+/***/ }),
+/* 33 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Thank's IE8 for his funny defineProperty
+module.exports = !__webpack_require__(85)(function () {
+  return Object.defineProperty({}, 'a', { get: function () { return 7; } }).a != 7;
+});
+
+
+/***/ }),
+/* 34 */
+/***/ (function(module, exports) {
+
+module.exports = function (it) {
+  return typeof it === 'object' ? it !== null : typeof it === 'function';
+};
+
+
+/***/ }),
+/* 35 */
+/***/ (function(module, exports) {
+
+module.exports = {};
 
-/**
- * Expose `toRegexRange`
- */
 
-module.exports = toRegexRange;
+/***/ }),
+/* 36 */
+/***/ (function(module, exports) {
 
+module.exports = __webpack_require__(11);
 
 /***/ }),
-/* 196 */
+/* 37 */,
+/* 38 */,
+/* 39 */,
+/* 40 */
 /***/ (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;
-};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wait = wait;
+exports.promisify = promisify;
+exports.queue = queue;
+function wait(delay) {
+  return new Promise(resolve => {
+    setTimeout(resolve, delay);
+  });
+}
 
+function promisify(fn, firstData) {
+  return function (...args) {
+    return new Promise(function (resolve, reject) {
+      args.push(function (err, ...result) {
+        let res = result;
 
-/***/ }),
-/* 197 */
-/***/ (function(module, exports, __webpack_require__) {
+        if (result.length <= 1) {
+          res = result[0];
+        }
 
-"use strict";
+        if (firstData) {
+          res = err;
+          err = null;
+        }
 
+        if (err) {
+          reject(err);
+        } else {
+          resolve(res);
+        }
+      });
 
-const fill = __webpack_require__(194);
-const stringify = __webpack_require__(191);
-const utils = __webpack_require__(192);
+      fn.apply(null, args);
+    });
+  };
+}
 
-const append = (queue = '', stash = '', enclose = false) => {
-  let result = [];
+function queue(arr, promiseProducer, concurrency = Infinity) {
+  concurrency = Math.min(concurrency, arr.length);
 
-  queue = [].concat(queue);
-  stash = [].concat(stash);
+  // clone
+  arr = arr.slice();
 
-  if (!stash.length) return queue;
-  if (!queue.length) {
-    return enclose ? utils.flatten(stash).map(ele => `{${ele}}`) : stash;
+  const results = [];
+  let total = arr.length;
+  if (!total) {
+    return Promise.resolve(results);
   }
 
-  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 new Promise((resolve, reject) => {
+    for (let i = 0; i < concurrency; i++) {
+      next();
     }
-  }
-  return utils.flatten(result);
-};
-
-const expand = (ast, options = {}) => {
-  let rangeLimit = options.rangeLimit === void 0 ? 1000 : options.rangeLimit;
 
-  let walk = (node, parent = {}) => {
-    node.queue = [];
+    function next() {
+      const item = arr.shift();
+      const promise = promiseProducer(item);
 
-    let p = parent;
-    let q = parent.queue;
+      promise.then(function (result) {
+        results.push(result);
 
-    while (p.type !== 'brace' && p.type !== 'root' && p.parent) {
-      p = p.parent;
-      q = p.queue;
+        total--;
+        if (total === 0) {
+          resolve(results);
+        } else {
+          if (arr.length) {
+            next();
+          }
+        }
+      }, reject);
     }
+  });
+}
 
-    if (node.invalid || node.dollar) {
-      q.push(append(q.pop(), stringify(node, options)));
-      return;
-    }
+/***/ }),
+/* 41 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (node.type === 'brace' && node.invalid !== true && node.nodes.length === 2) {
-      q.push(append(q.pop(), ['{}']));
-      return;
+var global = __webpack_require__(11);
+var core = __webpack_require__(23);
+var ctx = __webpack_require__(48);
+var hide = __webpack_require__(31);
+var has = __webpack_require__(49);
+var PROTOTYPE = 'prototype';
+
+var $export = function (type, name, source) {
+  var IS_FORCED = type & $export.F;
+  var IS_GLOBAL = type & $export.G;
+  var IS_STATIC = type & $export.S;
+  var IS_PROTO = type & $export.P;
+  var IS_BIND = type & $export.B;
+  var IS_WRAP = type & $export.W;
+  var exports = IS_GLOBAL ? core : core[name] || (core[name] = {});
+  var expProto = exports[PROTOTYPE];
+  var target = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE];
+  var key, own, out;
+  if (IS_GLOBAL) source = name;
+  for (key in source) {
+    // contains in native
+    own = !IS_FORCED && target && target[key] !== undefined;
+    if (own && has(exports, key)) continue;
+    // export native or passed
+    out = own ? target[key] : source[key];
+    // prevent global pollution for namespaces
+    exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key]
+    // bind timers to global for call from export context
+    : IS_BIND && own ? ctx(out, global)
+    // wrap global constructors for prevent change them in library
+    : IS_WRAP && target[key] == out ? (function (C) {
+      var F = function (a, b, c) {
+        if (this instanceof C) {
+          switch (arguments.length) {
+            case 0: return new C();
+            case 1: return new C(a);
+            case 2: return new C(a, b);
+          } return new C(a, b, c);
+        } return C.apply(this, arguments);
+      };
+      F[PROTOTYPE] = C[PROTOTYPE];
+      return F;
+    // make static versions for prototype methods
+    })(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out;
+    // export proto methods to core.%CONSTRUCTOR%.methods.%NAME%
+    if (IS_PROTO) {
+      (exports.virtual || (exports.virtual = {}))[key] = out;
+      // export proto methods to core.%CONSTRUCTOR%.prototype.%NAME%
+      if (type & $export.R && expProto && !expProto[key]) hide(expProto, key, out);
     }
+  }
+};
+// type bitmap
+$export.F = 1;   // forced
+$export.G = 2;   // global
+$export.S = 4;   // static
+$export.P = 8;   // proto
+$export.B = 16;  // bind
+$export.W = 32;  // wrap
+$export.U = 64;  // safe
+$export.R = 128; // real proto method for `library`
+module.exports = $export;
 
-    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.');
-      }
+/***/ }),
+/* 42 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      let range = fill(...args, options);
-      if (range.length === 0) {
-        range = stringify(node, options);
-      }
+try {
+  var util = __webpack_require__(2);
+  if (typeof util.inherits !== 'function') throw '';
+  module.exports = util.inherits;
+} catch (e) {
+  module.exports = __webpack_require__(224);
+}
 
-      q.push(append(q.pop(), range));
-      node.nodes = [];
-      return;
-    }
 
-    let enclose = utils.encloseBrace(node);
-    let queue = node.queue;
-    let block = node;
+/***/ }),
+/* 43 */,
+/* 44 */,
+/* 45 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    while (block.type !== 'brace' && block.type !== 'root' && block.parent) {
-      block = block.parent;
-      queue = block.queue;
-    }
+"use strict";
 
-    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;
-      }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.home = undefined;
 
-      if (child.type === 'close') {
-        q.push(append(q.pop(), queue, enclose));
-        continue;
-      }
+var _rootUser;
 
-      if (child.value && child.type !== 'open') {
-        queue.push(append(queue.pop(), child.value));
-        continue;
-      }
+function _load_rootUser() {
+  return _rootUser = _interopRequireDefault(__webpack_require__(169));
+}
 
-      if (child.nodes) {
-        walk(child, node);
-      }
-    }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-    return queue;
-  };
+const path = __webpack_require__(0);
 
-  return utils.flatten(walk(ast));
-};
+const home = exports.home = __webpack_require__(36).homedir();
 
-module.exports = expand;
+const userHomeDir = (_rootUser || _load_rootUser()).default ? path.resolve('/usr/local/share') : home;
 
+exports.default = userHomeDir;
 
 /***/ }),
-/* 198 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 46 */
+/***/ (function(module, exports) {
 
-"use strict";
+module.exports = function (it) {
+  if (typeof it != 'function') throw TypeError(it + ' is not a function!');
+  return it;
+};
 
 
-const stringify = __webpack_require__(191);
+/***/ }),
+/* 47 */
+/***/ (function(module, exports) {
 
-/**
- * Constants
- */
+var toString = {}.toString;
 
-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);
+module.exports = function (it) {
+  return toString.call(it).slice(8, -1);
+};
 
-/**
- * parse
- */
 
-const parse = (input, options = {}) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected a string');
-  }
+/***/ }),
+/* 48 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  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})`);
+// optional / simple context binding
+var aFunction = __webpack_require__(46);
+module.exports = function (fn, that, length) {
+  aFunction(fn);
+  if (that === undefined) return fn;
+  switch (length) {
+    case 1: return function (a) {
+      return fn.call(that, a);
+    };
+    case 2: return function (a, b) {
+      return fn.call(that, a, b);
+    };
+    case 3: return function (a, b, c) {
+      return fn.call(that, a, b, c);
+    };
   }
+  return function (/* ...args */) {
+    return fn.apply(that, arguments);
+  };
+};
 
-  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
-   */
+/***/ }),
+/* 49 */
+/***/ (function(module, exports) {
 
-  const advance = () => input[index++];
-  const push = node => {
-    if (node.type === 'text' && prev.type === 'dot') {
-      prev.type = 'text';
-    }
+var hasOwnProperty = {}.hasOwnProperty;
+module.exports = function (it, key) {
+  return hasOwnProperty.call(it, key);
+};
 
-    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;
-  };
+/***/ }),
+/* 50 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  push({ type: 'bos' });
+var anObject = __webpack_require__(27);
+var IE8_DOM_DEFINE = __webpack_require__(184);
+var toPrimitive = __webpack_require__(201);
+var dP = Object.defineProperty;
 
-  while (index < length) {
-    block = stack[stack.length - 1];
-    value = advance();
+exports.f = __webpack_require__(33) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
+  anObject(O);
+  P = toPrimitive(P, true);
+  anObject(Attributes);
+  if (IE8_DOM_DEFINE) try {
+    return dP(O, P, Attributes);
+  } catch (e) { /* empty */ }
+  if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported!');
+  if ('value' in Attributes) O[P] = Attributes.value;
+  return O;
+};
 
-    /**
-     * Invalid chars
-     */
 
-    if (value === CHAR_ZERO_WIDTH_NOBREAK_SPACE || value === CHAR_NO_BREAK_SPACE) {
-      continue;
-    }
+/***/ }),
+/* 51 */,
+/* 52 */,
+/* 53 */,
+/* 54 */
+/***/ (function(module, exports) {
 
-    /**
-     * Escaped chars
-     */
+module.exports = __webpack_require__(379);
 
-    if (value === CHAR_BACKSLASH) {
-      push({ type: 'text', value: (options.keepEscaping ? value : '') + advance() });
-      continue;
-    }
+/***/ }),
+/* 55 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    /**
-     * Right square bracket (literal): ']'
-     */
+"use strict";
 
-    if (value === CHAR_RIGHT_SQUARE_BRACKET) {
-      push({ type: 'text', value: '\\' + value });
-      continue;
-    }
 
-    /**
-     * Left square bracket: '['
-     */
+const Buffer = __webpack_require__(32).Buffer
 
-    if (value === CHAR_LEFT_SQUARE_BRACKET) {
-      brackets++;
+const crypto = __webpack_require__(9)
+const Transform = __webpack_require__(17).Transform
 
-      let closed = true;
-      let next;
+const SPEC_ALGORITHMS = ['sha256', 'sha384', 'sha512']
 
-      while (index < length && (next = advance())) {
-        value += next;
+const BASE64_REGEX = /^[a-z0-9+/]+(?:=?=?)$/i
+const SRI_REGEX = /^([^-]+)-([^?]+)([?\S*]*)$/
+const STRICT_SRI_REGEX = /^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/
+const VCHAR_REGEX = /^[\x21-\x7E]+$/
 
-        if (next === CHAR_LEFT_SQUARE_BRACKET) {
-          brackets++;
-          continue;
-        }
+class Hash {
+  get isHash () { return true }
+  constructor (hash, opts) {
+    const strict = !!(opts && opts.strict)
+    this.source = hash.trim()
+    // 3.1. Integrity metadata (called "Hash" by ssri)
+    // https://w3c.github.io/webappsec-subresource-integrity/#integrity-metadata-description
+    const match = this.source.match(
+      strict
+      ? STRICT_SRI_REGEX
+      : SRI_REGEX
+    )
+    if (!match) { return }
+    if (strict && !SPEC_ALGORITHMS.some(a => a === match[1])) { return }
+    this.algorithm = match[1]
+    this.digest = match[2]
+
+    const rawOpts = match[3]
+    this.options = rawOpts ? rawOpts.slice(1).split('?') : []
+  }
+  hexDigest () {
+    return this.digest && Buffer.from(this.digest, 'base64').toString('hex')
+  }
+  toJSON () {
+    return this.toString()
+  }
+  toString (opts) {
+    if (opts && opts.strict) {
+      // Strict mode enforces the standard as close to the foot of the
+      // letter as it can.
+      if (!(
+        // The spec has very restricted productions for algorithms.
+        // https://www.w3.org/TR/CSP2/#source-list-syntax
+        SPEC_ALGORITHMS.some(x => x === this.algorithm) &&
+        // Usually, if someone insists on using a "different" base64, we
+        // leave it as-is, since there's multiple standards, and the
+        // specified is not a URL-safe variant.
+        // https://www.w3.org/TR/CSP2/#base64_value
+        this.digest.match(BASE64_REGEX) &&
+        // Option syntax is strictly visual chars.
+        // https://w3c.github.io/webappsec-subresource-integrity/#grammardef-option-expression
+        // https://tools.ietf.org/html/rfc5234#appendix-B.1
+        (this.options || []).every(opt => opt.match(VCHAR_REGEX))
+      )) {
+        return ''
+      }
+    }
+    const options = this.options && this.options.length
+    ? `?${this.options.join('?')}`
+    : ''
+    return `${this.algorithm}-${this.digest}${options}`
+  }
+}
 
-        if (next === CHAR_BACKSLASH) {
-          value += advance();
-          continue;
-        }
+class Integrity {
+  get isIntegrity () { return true }
+  toJSON () {
+    return this.toString()
+  }
+  toString (opts) {
+    opts = opts || {}
+    let sep = opts.sep || ' '
+    if (opts.strict) {
+      // Entries must be separated by whitespace, according to spec.
+      sep = sep.replace(/\S+/g, ' ')
+    }
+    return Object.keys(this).map(k => {
+      return this[k].map(hash => {
+        return Hash.prototype.toString.call(hash, opts)
+      }).filter(x => x.length).join(sep)
+    }).filter(x => x.length).join(sep)
+  }
+  concat (integrity, opts) {
+    const other = typeof integrity === 'string'
+    ? integrity
+    : stringify(integrity, opts)
+    return parse(`${this.toString(opts)} ${other}`, opts)
+  }
+  hexDigest () {
+    return parse(this, {single: true}).hexDigest()
+  }
+  match (integrity, opts) {
+    const other = parse(integrity, opts)
+    const algo = other.pickAlgorithm(opts)
+    return (
+      this[algo] &&
+      other[algo] &&
+      this[algo].find(hash =>
+        other[algo].find(otherhash =>
+          hash.digest === otherhash.digest
+        )
+      )
+    ) || false
+  }
+  pickAlgorithm (opts) {
+    const pickAlgorithm = (opts && opts.pickAlgorithm) || getPrioritizedHash
+    const keys = Object.keys(this)
+    if (!keys.length) {
+      throw new Error(`No algorithms available for ${
+        JSON.stringify(this.toString())
+      }`)
+    }
+    return keys.reduce((acc, algo) => {
+      return pickAlgorithm(acc, algo) || acc
+    })
+  }
+}
 
-        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
-          brackets--;
+module.exports.parse = parse
+function parse (sri, opts) {
+  opts = opts || {}
+  if (typeof sri === 'string') {
+    return _parse(sri, opts)
+  } else if (sri.algorithm && sri.digest) {
+    const fullSri = new Integrity()
+    fullSri[sri.algorithm] = [sri]
+    return _parse(stringify(fullSri, opts), opts)
+  } else {
+    return _parse(stringify(sri, opts), opts)
+  }
+}
 
-          if (brackets === 0) {
-            break;
-          }
-        }
-      }
+function _parse (integrity, opts) {
+  // 3.4.3. Parse metadata
+  // https://w3c.github.io/webappsec-subresource-integrity/#parse-metadata
+  if (opts.single) {
+    return new Hash(integrity, opts)
+  }
+  return integrity.trim().split(/\s+/).reduce((acc, string) => {
+    const hash = new Hash(string, opts)
+    if (hash.algorithm && hash.digest) {
+      const algo = hash.algorithm
+      if (!acc[algo]) { acc[algo] = [] }
+      acc[algo].push(hash)
+    }
+    return acc
+  }, new Integrity())
+}
 
-      push({ type: 'text', value });
-      continue;
+module.exports.stringify = stringify
+function stringify (obj, opts) {
+  if (obj.algorithm && obj.digest) {
+    return Hash.prototype.toString.call(obj, opts)
+  } else if (typeof obj === 'string') {
+    return stringify(parse(obj, opts), opts)
+  } else {
+    return Integrity.prototype.toString.call(obj, opts)
+  }
+}
+
+module.exports.fromHex = fromHex
+function fromHex (hexDigest, algorithm, opts) {
+  const optString = (opts && opts.options && opts.options.length)
+  ? `?${opts.options.join('?')}`
+  : ''
+  return parse(
+    `${algorithm}-${
+      Buffer.from(hexDigest, 'hex').toString('base64')
+    }${optString}`, opts
+  )
+}
+
+module.exports.fromData = fromData
+function fromData (data, opts) {
+  opts = opts || {}
+  const algorithms = opts.algorithms || ['sha512']
+  const optString = opts.options && opts.options.length
+  ? `?${opts.options.join('?')}`
+  : ''
+  return algorithms.reduce((acc, algo) => {
+    const digest = crypto.createHash(algo).update(data).digest('base64')
+    const hash = new Hash(
+      `${algo}-${digest}${optString}`,
+       opts
+    )
+    if (hash.algorithm && hash.digest) {
+      const algo = hash.algorithm
+      if (!acc[algo]) { acc[algo] = [] }
+      acc[algo].push(hash)
+    }
+    return acc
+  }, new Integrity())
+}
+
+module.exports.fromStream = fromStream
+function fromStream (stream, opts) {
+  opts = opts || {}
+  const P = opts.Promise || Promise
+  const istream = integrityStream(opts)
+  return new P((resolve, reject) => {
+    stream.pipe(istream)
+    stream.on('error', reject)
+    istream.on('error', reject)
+    let sri
+    istream.on('integrity', s => { sri = s })
+    istream.on('end', () => resolve(sri))
+    istream.on('data', () => {})
+  })
+}
+
+module.exports.checkData = checkData
+function checkData (data, sri, opts) {
+  opts = opts || {}
+  sri = parse(sri, opts)
+  if (!Object.keys(sri).length) {
+    if (opts.error) {
+      throw Object.assign(
+        new Error('No valid integrity hashes to check against'), {
+          code: 'EINTEGRITY'
+        }
+      )
+    } else {
+      return false
     }
+  }
+  const algorithm = sri.pickAlgorithm(opts)
+  const digest = crypto.createHash(algorithm).update(data).digest('base64')
+  const newSri = parse({algorithm, digest})
+  const match = newSri.match(sri, opts)
+  if (match || !opts.error) {
+    return match
+  } else if (typeof opts.size === 'number' && (data.length !== opts.size)) {
+    const err = new Error(`data size mismatch when checking ${sri}.\n  Wanted: ${opts.size}\n  Found: ${data.length}`)
+    err.code = 'EBADSIZE'
+    err.found = data.length
+    err.expected = opts.size
+    err.sri = sri
+    throw err
+  } else {
+    const err = new Error(`Integrity checksum failed when using ${algorithm}: Wanted ${sri}, but got ${newSri}. (${data.length} bytes)`)
+    err.code = 'EINTEGRITY'
+    err.found = newSri
+    err.expected = sri
+    err.algorithm = algorithm
+    err.sri = sri
+    throw err
+  }
+}
 
-    /**
-     * Parentheses
-     */
+module.exports.checkStream = checkStream
+function checkStream (stream, sri, opts) {
+  opts = opts || {}
+  const P = opts.Promise || Promise
+  const checker = integrityStream(Object.assign({}, opts, {
+    integrity: sri
+  }))
+  return new P((resolve, reject) => {
+    stream.pipe(checker)
+    stream.on('error', reject)
+    checker.on('error', reject)
+    let sri
+    checker.on('verified', s => { sri = s })
+    checker.on('end', () => resolve(sri))
+    checker.on('data', () => {})
+  })
+}
 
-    if (value === CHAR_LEFT_PARENTHESES) {
-      block = push({ type: 'paren', nodes: [] });
-      stack.push(block);
-      push({ type: 'text', value });
-      continue;
+module.exports.integrityStream = integrityStream
+function integrityStream (opts) {
+  opts = opts || {}
+  // For verification
+  const sri = opts.integrity && parse(opts.integrity, opts)
+  const goodSri = sri && Object.keys(sri).length
+  const algorithm = goodSri && sri.pickAlgorithm(opts)
+  const digests = goodSri && sri[algorithm]
+  // Calculating stream
+  const algorithms = Array.from(
+    new Set(
+      (opts.algorithms || ['sha512'])
+      .concat(algorithm ? [algorithm] : [])
+    )
+  )
+  const hashes = algorithms.map(crypto.createHash)
+  let streamSize = 0
+  const stream = new Transform({
+    transform (chunk, enc, cb) {
+      streamSize += chunk.length
+      hashes.forEach(h => h.update(chunk, enc))
+      cb(null, chunk, enc)
+    }
+  }).on('end', () => {
+    const optString = (opts.options && opts.options.length)
+    ? `?${opts.options.join('?')}`
+    : ''
+    const newSri = parse(hashes.map((h, i) => {
+      return `${algorithms[i]}-${h.digest('base64')}${optString}`
+    }).join(' '), opts)
+    // Integrity verification mode
+    const match = goodSri && newSri.match(sri, opts)
+    if (typeof opts.size === 'number' && streamSize !== opts.size) {
+      const err = new Error(`stream size mismatch when checking ${sri}.\n  Wanted: ${opts.size}\n  Found: ${streamSize}`)
+      err.code = 'EBADSIZE'
+      err.found = streamSize
+      err.expected = opts.size
+      err.sri = sri
+      stream.emit('error', err)
+    } else if (opts.integrity && !match) {
+      const err = new Error(`${sri} integrity checksum failed when using ${algorithm}: wanted ${digests} but got ${newSri}. (${streamSize} bytes)`)
+      err.code = 'EINTEGRITY'
+      err.found = newSri
+      err.expected = digests
+      err.algorithm = algorithm
+      err.sri = sri
+      stream.emit('error', err)
+    } else {
+      stream.emit('size', streamSize)
+      stream.emit('integrity', newSri)
+      match && stream.emit('verified', match)
     }
+  })
+  return stream
+}
 
-    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;
+module.exports.create = createIntegrity
+function createIntegrity (opts) {
+  opts = opts || {}
+  const algorithms = opts.algorithms || ['sha512']
+  const optString = opts.options && opts.options.length
+  ? `?${opts.options.join('?')}`
+  : ''
+
+  const hashes = algorithms.map(crypto.createHash)
+
+  return {
+    update: function (chunk, enc) {
+      hashes.forEach(h => h.update(chunk, enc))
+      return this
+    },
+    digest: function (enc) {
+      const integrity = algorithms.reduce((acc, algo) => {
+        const digest = hashes.shift().digest('base64')
+        const hash = new Hash(
+          `${algo}-${digest}${optString}`,
+          opts
+        )
+        if (hash.algorithm && hash.digest) {
+          const algo = hash.algorithm
+          if (!acc[algo]) { acc[algo] = [] }
+          acc[algo].push(hash)
+        }
+        return acc
+      }, new Integrity())
+
+      return integrity
     }
+  }
+}
 
-    /**
-     * Quotes: '|"|`
-     */
+const NODE_HASHES = new Set(crypto.getHashes())
 
-    if (value === CHAR_DOUBLE_QUOTE || value === CHAR_SINGLE_QUOTE || value === CHAR_BACKTICK) {
-      let open = value;
-      let next;
+// This is a Best Effort™ at a reasonable priority for hash algos
+const DEFAULT_PRIORITY = [
+  'md5', 'whirlpool', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512',
+  // TODO - it's unclear _which_ of these Node will actually use as its name
+  //        for the algorithm, so we guesswork it based on the OpenSSL names.
+  'sha3',
+  'sha3-256', 'sha3-384', 'sha3-512',
+  'sha3_256', 'sha3_384', 'sha3_512'
+].filter(algo => NODE_HASHES.has(algo))
 
-      if (options.keepQuotes !== true) {
-        value = '';
-      }
+function getPrioritizedHash (algo1, algo2) {
+  return DEFAULT_PRIORITY.indexOf(algo1.toLowerCase()) >= DEFAULT_PRIORITY.indexOf(algo2.toLowerCase())
+  ? algo1
+  : algo2
+}
 
-      while (index < length && (next = advance())) {
-        if (next === CHAR_BACKSLASH) {
-          value += next + advance();
-          continue;
-        }
 
-        if (next === open) {
-          if (options.keepQuotes === true) value += next;
-          break;
-        }
+/***/ }),
+/* 56 */,
+/* 57 */,
+/* 58 */,
+/* 59 */,
+/* 60 */
+/***/ (function(module, exports, __webpack_require__) {
 
-        value += next;
-      }
+module.exports = minimatch
+minimatch.Minimatch = Minimatch
 
-      push({ type: 'text', value });
-      continue;
-    }
+var path = { sep: '/' }
+try {
+  path = __webpack_require__(0)
+} catch (er) {}
 
-    /**
-     * Left curly brace: '{'
-     */
+var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {}
+var expand = __webpack_require__(175)
 
-    if (value === CHAR_LEFT_CURLY_BRACE) {
-      depth++;
+var plTypes = {
+  '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
+  '?': { open: '(?:', close: ')?' },
+  '+': { open: '(?:', close: ')+' },
+  '*': { open: '(?:', close: ')*' },
+  '@': { open: '(?:', close: ')' }
+}
 
-      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: []
-      };
+// any single thing other than /
+// don't need to escape / when using new RegExp()
+var qmark = '[^/]'
 
-      block = push(brace);
-      stack.push(block);
-      push({ type: 'open', value });
-      continue;
-    }
+// * => any number of characters
+var star = qmark + '*?'
 
-    /**
-     * Right curly brace: '}'
-     */
+// ** when dots are allowed.  Anything goes, except .. and .
+// not (^ or / followed by one or two dots followed by $ or /),
+// followed by anything, any number of times.
+var twoStarDot = '(?:(?!(?:\\\/|^)(?:\\.{1,2})($|\\\/)).)*?'
 
-    if (value === CHAR_RIGHT_CURLY_BRACE) {
-      if (block.type !== 'brace') {
-        push({ type: 'text', value });
-        continue;
-      }
+// not a ^ or / followed by a dot,
+// followed by anything, any number of times.
+var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?'
 
-      let type = 'close';
-      block = stack.pop();
-      block.close = true;
+// characters that need to be escaped in RegExp.
+var reSpecials = charSet('().*{}+?[]^$\\!')
 
-      push({ type, value });
-      depth--;
+// "abc" -> { a:true, b:true, c:true }
+function charSet (s) {
+  return s.split('').reduce(function (set, c) {
+    set[c] = true
+    return set
+  }, {})
+}
 
-      block = stack[stack.length - 1];
-      continue;
-    }
+// normalizes slashes.
+var slashSplit = /\/+/
 
-    /**
-     * Comma: ','
-     */
+minimatch.filter = filter
+function filter (pattern, options) {
+  options = options || {}
+  return function (p, i, list) {
+    return minimatch(p, pattern, options)
+  }
+}
 
-    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) }];
-      }
+function ext (a, b) {
+  a = a || {}
+  b = b || {}
+  var t = {}
+  Object.keys(b).forEach(function (k) {
+    t[k] = b[k]
+  })
+  Object.keys(a).forEach(function (k) {
+    t[k] = a[k]
+  })
+  return t
+}
 
-      push({ type: 'comma', value });
-      block.commas++;
-      continue;
-    }
+minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return minimatch
 
-    /**
-     * Dot: '.'
-     */
+  var orig = minimatch
 
-    if (value === CHAR_DOT && depth > 0 && block.commas === 0) {
-      let siblings = block.nodes;
+  var m = function minimatch (p, pattern, options) {
+    return orig.minimatch(p, pattern, ext(def, options))
+  }
 
-      if (depth === 0 || siblings.length === 0) {
-        push({ type: 'text', value });
-        continue;
-      }
+  m.Minimatch = function Minimatch (pattern, options) {
+    return new orig.Minimatch(pattern, ext(def, options))
+  }
 
-      if (prev.type === 'dot') {
-        block.range = [];
-        prev.value += value;
-        prev.type = 'range';
+  return m
+}
 
-        if (block.nodes.length !== 3 && block.nodes.length !== 5) {
-          block.invalid = true;
-          block.ranges = 0;
-          prev.type = 'text';
-          continue;
-        }
+Minimatch.defaults = function (def) {
+  if (!def || !Object.keys(def).length) return Minimatch
+  return minimatch.defaults(def).Minimatch
+}
 
-        block.ranges++;
-        block.args = [];
-        continue;
-      }
+function minimatch (p, pattern, options) {
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
 
-      if (prev.type === 'range') {
-        siblings.pop();
+  if (!options) options = {}
 
-        let before = siblings[siblings.length - 1];
-        before.value += prev.value + value;
-        prev = before;
-        block.ranges--;
-        continue;
-      }
+  // shortcut: comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    return false
+  }
 
-      push({ type: 'dot', value });
-      continue;
-    }
+  // "" only matches ""
+  if (pattern.trim() === '') return p === ''
 
-    /**
-     * Text
-     */
+  return new Minimatch(pattern, options).match(p)
+}
 
-    push({ type: 'text', value });
+function Minimatch (pattern, options) {
+  if (!(this instanceof Minimatch)) {
+    return new Minimatch(pattern, options)
   }
 
-  // Mark imbalanced braces and brackets as invalid
-  do {
-    block = stack.pop();
+  if (typeof pattern !== 'string') {
+    throw new TypeError('glob pattern string required')
+  }
 
-    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;
-        }
-      });
+  if (!options) options = {}
+  pattern = pattern.trim()
 
-      // 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);
+  // windows support: need to use /, not \
+  if (path.sep !== '/') {
+    pattern = pattern.split(path.sep).join('/')
+  }
 
-  push({ type: 'eos' });
-  return ast;
-};
+  this.options = options
+  this.set = []
+  this.pattern = pattern
+  this.regexp = null
+  this.negate = false
+  this.comment = false
+  this.empty = false
 
-module.exports = parse;
+  // make the set of regexps etc.
+  this.make()
+}
 
+Minimatch.prototype.debug = function () {}
 
-/***/ }),
-/* 199 */
-/***/ (function(module, exports, __webpack_require__) {
+Minimatch.prototype.make = make
+function make () {
+  // don't do it more than once.
+  if (this._made) return
 
-"use strict";
+  var pattern = this.pattern
+  var options = this.options
 
+  // empty patterns and comments match nothing.
+  if (!options.nocomment && pattern.charAt(0) === '#') {
+    this.comment = true
+    return
+  }
+  if (!pattern) {
+    this.empty = true
+    return
+  }
 
-module.exports = {
-  MAX_LENGTH: 1024 * 64,
+  // step 1: figure out negation, etc.
+  this.parseNegate()
 
-  // Digits
-  CHAR_0: '0', /* 0 */
-  CHAR_9: '9', /* 9 */
+  // step 2: expand braces
+  var set = this.globSet = this.braceExpand()
 
-  // Alphabet chars.
-  CHAR_UPPERCASE_A: 'A', /* A */
-  CHAR_LOWERCASE_A: 'a', /* a */
-  CHAR_UPPERCASE_Z: 'Z', /* Z */
-  CHAR_LOWERCASE_Z: 'z', /* z */
+  if (options.debug) this.debug = console.error
 
-  CHAR_LEFT_PARENTHESES: '(', /* ( */
-  CHAR_RIGHT_PARENTHESES: ')', /* ) */
+  this.debug(this.pattern, set)
 
-  CHAR_ASTERISK: '*', /* * */
+  // step 3: now we have a set, so turn each one into a series of path-portion
+  // matching patterns.
+  // These will be regexps, except in the case of "**", which is
+  // set to the GLOBSTAR object for globstar behavior,
+  // and will not contain any / characters
+  set = this.globParts = set.map(function (s) {
+    return s.split(slashSplit)
+  })
 
-  // 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 */
-};
+  this.debug(this.pattern, set)
 
+  // glob --> regexps
+  set = set.map(function (s, si, set) {
+    return s.map(this.parse, this)
+  }, this)
 
-/***/ }),
-/* 200 */
-/***/ (function(module, exports, __webpack_require__) {
+  this.debug(this.pattern, set)
 
-"use strict";
+  // filter out everything that didn't compile properly.
+  set = set.filter(function (s) {
+    return s.indexOf(false) === -1
+  })
 
+  this.debug(this.pattern, set)
 
-module.exports = __webpack_require__(201);
+  this.set = set
+}
 
+Minimatch.prototype.parseNegate = parseNegate
+function parseNegate () {
+  var pattern = this.pattern
+  var negate = false
+  var options = this.options
+  var negateOffset = 0
 
-/***/ }),
-/* 201 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (options.nonegate) return
 
-"use strict";
+  for (var i = 0, l = pattern.length
+    ; i < l && pattern.charAt(i) === '!'
+    ; i++) {
+    negate = !negate
+    negateOffset++
+  }
 
+  if (negateOffset) this.pattern = pattern.substr(negateOffset)
+  this.negate = negate
+}
 
-const path = __webpack_require__(16);
-const scan = __webpack_require__(202);
-const parse = __webpack_require__(205);
-const utils = __webpack_require__(203);
+// Brace expansion:
+// a{b,c}d -> abd acd
+// a{b,}c -> abc ac
+// a{0..3}d -> a0d a1d a2d a3d
+// a{b,c{d,e}f}g -> abg acdfg acefg
+// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg
+//
+// Invalid sets are not expanded.
+// a{2..}b -> a{2..}b
+// a{b}c -> a{b}c
+minimatch.braceExpand = function (pattern, options) {
+  return braceExpand(pattern, options)
+}
 
-/**
- * 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
- */
+Minimatch.prototype.braceExpand = braceExpand
 
-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;
-    };
+function braceExpand (pattern, options) {
+  if (!options) {
+    if (this instanceof Minimatch) {
+      options = this.options
+    } else {
+      options = {}
+    }
   }
 
-  if (typeof glob !== 'string' || glob === '') {
-    throw new TypeError('Expected pattern to be a non-empty string');
+  pattern = typeof pattern === 'undefined'
+    ? this.pattern : pattern
+
+  if (typeof pattern === 'undefined') {
+    throw new TypeError('undefined pattern')
   }
 
-  let opts = options || {};
-  let posix = utils.isWindows(options);
-  let regex = picomatch.makeRe(glob, options, false, true);
-  let state = regex.state;
-  delete regex.state;
+  if (options.nobrace ||
+    !pattern.match(/\{.*\}/)) {
+    // shortcut. no need to expand.
+    return [pattern]
+  }
 
-  let isIgnored = () => false;
-  if (opts.ignore) {
-    let ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
-    isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
+  return expand(pattern)
+}
+
+// parse a component of the expanded set.
+// At this point, no pattern may contain "/" in it
+// so we're going to return a 2d array, where each entry is the full
+// pattern, split on '/', and then turned into a regular expression.
+// A regexp is made at the end which joins each array with an
+// escaped /, and another full one which joins each regexp with |.
+//
+// Following the lead of Bash 4.1, note that "**" only has special meaning
+// when it is the *only* thing in a path portion.  Otherwise, any series
+// of * is equivalent to a single *.  Globstar behavior is enabled by
+// default, and can be disabled by setting options.noglobstar.
+Minimatch.prototype.parse = parse
+var SUBPARSE = {}
+function parse (pattern, isSub) {
+  if (pattern.length > 1024 * 64) {
+    throw new TypeError('pattern is too long')
   }
 
-  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 };
+  var options = this.options
 
-    if (typeof opts.onResult === 'function') {
-      opts.onResult(result);
-    }
+  // shortcuts
+  if (!options.noglobstar && pattern === '**') return GLOBSTAR
+  if (pattern === '') return ''
 
-    if (isMatch === false) {
-      result.isMatch = false;
-      return returnObject ? result : false;
-    }
+  var re = ''
+  var hasMagic = !!options.nocase
+  var escaping = false
+  // ? => one single character
+  var patternListStack = []
+  var negativeLists = []
+  var stateChar
+  var inClass = false
+  var reClassStart = -1
+  var classStart = -1
+  // . and .. never match anything that doesn't start with .,
+  // even when options.dot is set.
+  var patternStart = pattern.charAt(0) === '.' ? '' // anything
+  // not (start or / followed by . or .. followed by / or end)
+  : options.dot ? '(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))'
+  : '(?!\\.)'
+  var self = this
 
-    if (isIgnored(input)) {
-      if (typeof opts.onIgnore === 'function') {
-        opts.onIgnore(result);
+  function clearStateChar () {
+    if (stateChar) {
+      // we had some state-tracking character
+      // that wasn't consumed by this pass.
+      switch (stateChar) {
+        case '*':
+          re += star
+          hasMagic = true
+        break
+        case '?':
+          re += qmark
+          hasMagic = true
+        break
+        default:
+          re += '\\' + stateChar
+        break
       }
-      result.isMatch = false;
-      return returnObject ? result : false;
+      self.debug('clearStateChar %j %j', stateChar, re)
+      stateChar = false
     }
+  }
 
-    if (typeof opts.onMatch === 'function') {
-      opts.onMatch(result);
+  for (var i = 0, len = pattern.length, c
+    ; (i < len) && (c = pattern.charAt(i))
+    ; i++) {
+    this.debug('%s\t%s %s %j', pattern, i, re, c)
+
+    // skip over any that are escaped.
+    if (escaping && reSpecials[c]) {
+      re += '\\' + c
+      escaping = false
+      continue
     }
-    return returnObject ? result : true;
-  };
 
-  if (returnState) {
-    matcher.state = state;
-  }
+    switch (c) {
+      case '/':
+        // completely not allowed, even escaped.
+        // Should already be path-split by now.
+        return false
 
-  return matcher;
-};
+      case '\\':
+        clearStateChar()
+        escaping = true
+      continue
 
-/**
- * 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
- */
+      // the various stateChar values
+      // for the "extglob" stuff.
+      case '?':
+      case '*':
+      case '+':
+      case '@':
+      case '!':
+        this.debug('%s\t%s %s %j <-- stateChar', pattern, i, re, c)
 
-picomatch.test = (input, regex, options, { glob, posix } = {}) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected input to be a string');
-  }
+        // all of those are literals inside a class, except that
+        // the glob [!a] means [^a] in regexp
+        if (inClass) {
+          this.debug('  in class')
+          if (c === '!' && i === classStart + 1) c = '^'
+          re += c
+          continue
+        }
 
-  if (input === '') {
-    return { isMatch: false, output: '' };
-  }
+        // if we already have a stateChar, then it means
+        // that there was something like ** or +? in there.
+        // Handle the stateChar, then proceed with this one.
+        self.debug('call clearStateChar %j', stateChar)
+        clearStateChar()
+        stateChar = c
+        // if extglob is disabled, then +(asdf|foo) isn't a thing.
+        // just clear the statechar *now*, rather than even diving into
+        // the patternList stuff.
+        if (options.noext) clearStateChar()
+      continue
 
-  let opts = options || {};
-  let format = opts.format || (posix ? utils.toPosixSlashes : null);
-  let match = input === glob;
-  let output = (match && format) ? format(input) : input;
+      case '(':
+        if (inClass) {
+          re += '('
+          continue
+        }
 
-  if (match === false) {
-    output = format ? format(input) : input;
-    match = output === glob;
-  }
+        if (!stateChar) {
+          re += '\\('
+          continue
+        }
+
+        patternListStack.push({
+          type: stateChar,
+          start: i - 1,
+          reStart: re.length,
+          open: plTypes[stateChar].open,
+          close: plTypes[stateChar].close
+        })
+        // negation is (?:(?!js)[^/]*)
+        re += stateChar === '!' ? '(?:(?!(?:' : '(?:'
+        this.debug('plType %j %j', stateChar, re)
+        stateChar = false
+      continue
+
+      case ')':
+        if (inClass || !patternListStack.length) {
+          re += '\\)'
+          continue
+        }
+
+        clearStateChar()
+        hasMagic = true
+        var pl = patternListStack.pop()
+        // negation is (?:(?!js)[^/]*)
+        // The others are (?:<pattern>)<type>
+        re += pl.close
+        if (pl.type === '!') {
+          negativeLists.push(pl)
+        }
+        pl.reEnd = re.length
+      continue
+
+      case '|':
+        if (inClass || !patternListStack.length || escaping) {
+          re += '\\|'
+          escaping = false
+          continue
+        }
 
-  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);
-    }
-  }
+        clearStateChar()
+        re += '|'
+      continue
 
-  return { isMatch: !!match, match, output };
-};
+      // these are mostly the same in regexp and glob
+      case '[':
+        // swallow any state-tracking char before the [
+        clearStateChar()
 
-/**
- * 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
- */
+        if (inClass) {
+          re += '\\' + c
+          continue
+        }
 
-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));
-};
+        inClass = true
+        classStart = i
+        reClassStart = re.length
+        re += c
+      continue
 
-/**
- * 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
- */
+      case ']':
+        //  a right bracket shall lose its special
+        //  meaning and represent itself in
+        //  a bracket expression if it occurs
+        //  first in the list.  -- POSIX.2 2.8.3.2
+        if (i === classStart + 1 || !inClass) {
+          re += '\\' + c
+          escaping = false
+          continue
+        }
 
-picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
+        // handle the case where we left a class open.
+        // "[z-a]" is valid, equivalent to "\[z-a\]"
+        if (inClass) {
+          // split where the last [ was, make sure we don't have
+          // an invalid re. if so, re-walk the contents of the
+          // would-be class to re-translate any characters that
+          // were passed through as-is
+          // TODO: It would probably be faster to determine this
+          // without a try/catch and a new RegExp, but it's tricky
+          // to do safely.  For now, this is safe and works.
+          var cs = pattern.substring(classStart + 1, i)
+          try {
+            RegExp('[' + cs + ']')
+          } catch (er) {
+            // not a valid class!
+            var sp = this.parse(cs, SUBPARSE)
+            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]'
+            hasMagic = hasMagic || sp[1]
+            inClass = false
+            continue
+          }
+        }
 
-/**
- * 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
- */
+        // finish up the class.
+        hasMagic = true
+        inClass = false
+        re += c
+      continue
 
-picomatch.parse = (glob, options) => parse(glob, options);
+      default:
+        // swallow any state char that wasn't consumed
+        clearStateChar()
 
-/**
- * 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
- */
+        if (escaping) {
+          // no need
+          escaping = false
+        } else if (reSpecials[c]
+          && !(c === '^' && inClass)) {
+          re += '\\'
+        }
 
-picomatch.scan = (input, options) => scan(input, options);
+        re += c
 
-/**
- * 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
- */
+    } // switch
+  } // for
 
-picomatch.makeRe = (input, options, returnOutput = false, returnState = false) => {
-  if (!input || typeof input !== 'string') {
-    throw new TypeError('Expected a non-empty string');
+  // handle the case where we left a class open.
+  // "[abc" is valid, equivalent to "\[abc"
+  if (inClass) {
+    // split where the last [ was, and escape it
+    // this is a huge pita.  We now have to re-walk
+    // the contents of the would-be class to re-translate
+    // any characters that were passed through as-is
+    cs = pattern.substr(classStart + 1)
+    sp = this.parse(cs, SUBPARSE)
+    re = re.substr(0, reClassStart) + '\\[' + sp[0]
+    hasMagic = hasMagic || sp[1]
   }
 
-  let opts = options || {};
-  let prepend = opts.contains ? '' : '^';
-  let append = opts.contains ? '' : '$';
-  let state = { negated: false, fastpaths: true };
-  let prefix = '';
-  let output;
+  // handle the case where we had a +( thing at the *end*
+  // of the pattern.
+  // each pattern list stack adds 3 chars, and we need to go through
+  // and escape any | chars that were passed through as-is for the regexp.
+  // Go through and escape them, taking care not to double-escape any
+  // | chars that were already escaped.
+  for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
+    var tail = re.slice(pl.reStart + pl.open.length)
+    this.debug('setting tail', re, pl)
+    // maybe some even number of \, then maybe 1 \, followed by a |
+    tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) {
+      if (!$2) {
+        // the | isn't already escaped, so escape it.
+        $2 = '\\'
+      }
 
-  if (input.startsWith('./')) {
-    input = input.slice(2);
-    prefix = state.prefix = './';
+      // need to escape all those slashes *again*, without escaping the
+      // one that we need for escaping the | character.  As it works out,
+      // escaping an even number of slashes can be done by simply repeating
+      // it exactly after itself.  That's why this trick works.
+      //
+      // I am sorry that you have to see this.
+      return $1 + $1 + $2 + '|'
+    })
+
+    this.debug('tail=%j\n   %s', tail, tail, pl, re)
+    var t = pl.type === '*' ? star
+      : pl.type === '?' ? qmark
+      : '\\' + pl.type
+
+    hasMagic = true
+    re = re.slice(0, pl.reStart) + t + '\\(' + tail
   }
 
-  if (opts.fastpaths !== false && (input[0] === '.' || input[0] === '*')) {
-    output = parse.fastpaths(input, options);
+  // handle trailing things that only matter at the very end.
+  clearStateChar()
+  if (escaping) {
+    // trailing \\
+    re += '\\\\'
   }
 
-  if (output === void 0) {
-    state = picomatch.parse(input, options);
-    state.prefix = prefix + (state.prefix || '');
-    output = state.output;
+  // only need to apply the nodot start if the re starts with
+  // something that could conceivably capture a dot
+  var addPatternStart = false
+  switch (re.charAt(0)) {
+    case '.':
+    case '[':
+    case '(': addPatternStart = true
   }
 
-  if (returnOutput === true) {
-    return output;
+  // Hack to work around lack of negative lookbehind in JS
+  // A pattern like: *.!(x).!(y|z) needs to ensure that a name
+  // like 'a.xyz.yz' doesn't match.  So, the first negative
+  // lookahead, has to look ALL the way ahead, to the end of
+  // the pattern.
+  for (var n = negativeLists.length - 1; n > -1; n--) {
+    var nl = negativeLists[n]
+
+    var nlBefore = re.slice(0, nl.reStart)
+    var nlFirst = re.slice(nl.reStart, nl.reEnd - 8)
+    var nlLast = re.slice(nl.reEnd - 8, nl.reEnd)
+    var nlAfter = re.slice(nl.reEnd)
+
+    nlLast += nlAfter
+
+    // Handle nested stuff like *(*.js|!(*.json)), where open parens
+    // mean that we should *not* include the ) in the bit that is considered
+    // "after" the negated section.
+    var openParensBefore = nlBefore.split('(').length - 1
+    var cleanAfter = nlAfter
+    for (i = 0; i < openParensBefore; i++) {
+      cleanAfter = cleanAfter.replace(/\)[+*?]?/, '')
+    }
+    nlAfter = cleanAfter
+
+    var dollar = ''
+    if (nlAfter === '' && isSub !== SUBPARSE) {
+      dollar = '$'
+    }
+    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast
+    re = newRe
   }
 
-  let source = `${prepend}(?:${output})${append}`;
-  if (state && state.negated === true) {
-    source = `^(?!${source}).*$`;
+  // if the re is not "" at this point, then we need to make sure
+  // it doesn't match against an empty path part.
+  // Otherwise a/* will match a/, which it should not.
+  if (re !== '' && hasMagic) {
+    re = '(?=.)' + re
   }
 
-  let regex = picomatch.toRegex(source, options);
-  if (returnState === true) {
-    regex.state = state;
+  if (addPatternStart) {
+    re = patternStart + re
   }
 
-  return regex;
-};
+  // parsing just a piece of a larger pattern.
+  if (isSub === SUBPARSE) {
+    return [re, hasMagic]
+  }
 
-/**
- * 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
- */
+  // skip the regexp for non-magical patterns
+  // unescape anything in it, though, so that it'll be
+  // an exact match against a file etc.
+  if (!hasMagic) {
+    return globUnescape(pattern)
+  }
 
-picomatch.toRegex = (source, options) => {
+  var flags = options.nocase ? 'i' : ''
   try {
-    let opts = options || {};
-    return new RegExp(source, opts.flags || (opts.nocase ? 'i' : ''));
-  } catch (err) {
-    if (options && options.debug === true) throw err;
-    return /$^/;
+    var regExp = new RegExp('^' + re + '$', flags)
+  } catch (er) {
+    // If it was an invalid regular expression, then it can't match
+    // anything.  This trick looks for a character after the end of
+    // the string, which is of course impossible, except in multi-line
+    // mode, but it's not a /m regex.
+    return new RegExp('$.')
   }
-};
 
-/**
- * Picomatch constants.
- * @return {Object}
- */
+  regExp._glob = pattern
+  regExp._src = re
 
-picomatch.constants = __webpack_require__(204);
+  return regExp
+}
 
-/**
- * Expose "picomatch"
- */
+minimatch.makeRe = function (pattern, options) {
+  return new Minimatch(pattern, options || {}).makeRe()
+}
 
-module.exports = picomatch;
+Minimatch.prototype.makeRe = makeRe
+function makeRe () {
+  if (this.regexp || this.regexp === false) return this.regexp
 
+  // at this point, this.set is a 2d array of partial
+  // pattern strings, or "**".
+  //
+  // It's better to use .match().  This function shouldn't
+  // be used, really, but it's pretty convenient sometimes,
+  // when you just want to work with a regex.
+  var set = this.set
 
-/***/ }),
-/* 202 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!set.length) {
+    this.regexp = false
+    return this.regexp
+  }
+  var options = this.options
 
-"use strict";
+  var twoStar = options.noglobstar ? star
+    : options.dot ? twoStarDot
+    : twoStarNoDot
+  var flags = options.nocase ? 'i' : ''
 
+  var re = set.map(function (pattern) {
+    return pattern.map(function (p) {
+      return (p === GLOBSTAR) ? twoStar
+      : (typeof p === 'string') ? regExpEscape(p)
+      : p._src
+    }).join('\\\/')
+  }).join('|')
 
-const utils = __webpack_require__(203);
+  // must match entire pattern
+  // ending in a * or ** will make it less strict.
+  re = '^(?:' + re + ')$'
 
-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);
+  // can match anything, as long as it's not this.
+  if (this.negate) re = '^(?!' + re + ').*$'
 
-const isPathSeparator = code => {
-  return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
-};
+  try {
+    this.regexp = new RegExp(re, flags)
+  } catch (ex) {
+    this.regexp = false
+  }
+  return this.regexp
+}
 
-/**
- * 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
- */
+minimatch.match = function (list, pattern, options) {
+  options = options || {}
+  var mm = new Minimatch(pattern, options)
+  list = list.filter(function (f) {
+    return mm.match(f)
+  })
+  if (mm.options.nonull && !list.length) {
+    list.push(pattern)
+  }
+  return list
+}
 
-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;
+Minimatch.prototype.match = match
+function match (f, partial) {
+  this.debug('match', f, this.pattern)
+  // short-circuit in the case of busted things.
+  // comments, etc.
+  if (this.comment) return false
+  if (this.empty) return f === ''
 
-  let braceEscaped = false;
+  if (f === '/' && partial) return true
 
-  let eos = () => index >= length;
-  let advance = () => {
-    prev = code;
-    return input.charCodeAt(++index);
-  };
+  var options = this.options
 
-  while (index < length) {
-    code = advance();
-    let next;
+  // windows: need to use /, not \
+  if (path.sep !== '/') {
+    f = f.split(path.sep).join('/')
+  }
 
-    if (code === CHAR_BACKWARD_SLASH) {
-      backslashes = true;
-      next = advance();
+  // treat the test path as a set of pathparts.
+  f = f.split(slashSplit)
+  this.debug(this.pattern, 'split', f)
 
-      if (next === CHAR_LEFT_CURLY_BRACE) {
-        braceEscaped = true;
-      }
-      continue;
-    }
+  // just ONE of the pattern sets in this.set needs to match
+  // in order for it to be valid.  If negating, then just one
+  // match means that we have failed.
+  // Either way, return on the first hit.
 
-    if (braceEscaped === true || code === CHAR_LEFT_CURLY_BRACE) {
-      braces++;
+  var set = this.set
+  this.debug(this.pattern, 'set', set)
 
-      while (!eos() && (next = advance())) {
-        if (next === CHAR_BACKWARD_SLASH) {
-          backslashes = true;
-          next = advance();
-          continue;
-        }
+  // Find the basename of the path by looking for the last non-empty segment
+  var filename
+  var i
+  for (i = f.length - 1; i >= 0; i--) {
+    filename = f[i]
+    if (filename) break
+  }
 
-        if (next === CHAR_LEFT_CURLY_BRACE) {
-          braces++;
-          continue;
-        }
+  for (i = 0; i < set.length; i++) {
+    var pattern = set[i]
+    var file = f
+    if (options.matchBase && pattern.length === 1) {
+      file = [filename]
+    }
+    var hit = this.matchOne(file, pattern, partial)
+    if (hit) {
+      if (options.flipNegate) return true
+      return !this.negate
+    }
+  }
 
-        if (!braceEscaped && next === CHAR_DOT && (next = advance()) === CHAR_DOT) {
-          isGlob = true;
-          break;
-        }
+  // didn't get any hits.  this is success if it's a negative
+  // pattern, failure otherwise.
+  if (options.flipNegate) return false
+  return this.negate
+}
 
-        if (!braceEscaped && next === CHAR_COMMA) {
-          isGlob = true;
-          break;
-        }
+// set partial to true to test if, for example,
+// "/a/b" matches the start of "/*/b/*/d"
+// Partial means, if you run out of file before you run
+// out of pattern, then that's fine, as long as all
+// the parts match.
+Minimatch.prototype.matchOne = function (file, pattern, partial) {
+  var options = this.options
 
-        if (next === CHAR_RIGHT_CURLY_BRACE) {
-          braces--;
-          if (braces === 0) {
-            braceEscaped = false;
-            break;
-          }
-        }
-      }
-    }
+  this.debug('matchOne',
+    { 'this': this, file: file, pattern: pattern })
 
-    if (code === CHAR_FORWARD_SLASH) {
-      if (prev === CHAR_DOT && index === (start + 1)) {
-        start += 2;
-        continue;
-      }
+  this.debug('matchOne', file.length, pattern.length)
 
-      lastIndex = index + 1;
-      continue;
-    }
+  for (var fi = 0,
+      pi = 0,
+      fl = file.length,
+      pl = pattern.length
+      ; (fi < fl) && (pi < pl)
+      ; fi++, pi++) {
+    this.debug('matchOne loop')
+    var p = pattern[pi]
+    var f = file[fi]
 
-    if (code === CHAR_ASTERISK) {
-      isGlob = true;
-      break;
-    }
+    this.debug(pattern, p, f)
 
-    if (code === CHAR_ASTERISK || code === CHAR_QUESTION_MARK) {
-      isGlob = true;
-      break;
-    }
+    // should be impossible.
+    // some invalid regexp stuff in the set.
+    if (p === false) return false
 
-    if (code === CHAR_LEFT_SQUARE_BRACKET) {
-      while (!eos() && (next = advance())) {
-        if (next === CHAR_BACKWARD_SLASH) {
-          backslashes = true;
-          next = advance();
-          continue;
-        }
+    if (p === GLOBSTAR) {
+      this.debug('GLOBSTAR', [pattern, p, f])
 
-        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
-          isGlob = true;
-          break;
+      // "**"
+      // a/**/b/**/c would match the following:
+      // a/b/x/y/z/c
+      // a/x/y/z/b/c
+      // a/b/x/b/x/c
+      // a/b/c
+      // To do this, take the rest of the pattern after
+      // the **, and see if it would match the file remainder.
+      // If so, return success.
+      // If not, the ** "swallows" a segment, and try again.
+      // This is recursively awful.
+      //
+      // a/**/b/**/c matching a/b/x/y/z/c
+      // - a matches a
+      // - doublestar
+      //   - matchOne(b/x/y/z/c, b/**/c)
+      //     - b matches b
+      //     - doublestar
+      //       - matchOne(x/y/z/c, c) -> no
+      //       - matchOne(y/z/c, c) -> no
+      //       - matchOne(z/c, c) -> no
+      //       - matchOne(c, c) yes, hit
+      var fr = fi
+      var pr = pi + 1
+      if (pr === pl) {
+        this.debug('** at the end')
+        // a ** at the end will just swallow the rest.
+        // We have found a match.
+        // however, it will not swallow /.x, unless
+        // options.dot is set.
+        // . and .. are *never* matched by **, for explosively
+        // exponential reasons.
+        for (; fi < fl; fi++) {
+          if (file[fi] === '.' || file[fi] === '..' ||
+            (!options.dot && file[fi].charAt(0) === '.')) return false
         }
+        return true
       }
-    }
 
-    let isExtglobChar = code === CHAR_PLUS
-      || code === CHAR_AT
-      || code === CHAR_EXCLAMATION_MARK;
+      // ok, let's see if we can swallow whatever we can.
+      while (fr < fl) {
+        var swallowee = file[fr]
 
-    if (isExtglobChar && input.charCodeAt(index + 1) === CHAR_LEFT_PARENTHESES) {
-      isGlob = true;
-      break;
-    }
+        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
 
-    if (code === CHAR_EXCLAMATION_MARK && index === start) {
-      negated = true;
-      start++;
-      continue;
-    }
+        // XXX remove this slice.  Just pass the start index.
+        if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
+          this.debug('globstar found match!', fr, fl, swallowee)
+          // found a match.
+          return true
+        } else {
+          // can't swallow "." or ".." ever.
+          // can only swallow ".foo" when explicitly asked.
+          if (swallowee === '.' || swallowee === '..' ||
+            (!options.dot && swallowee.charAt(0) === '.')) {
+            this.debug('dot detected!', file, fr, pattern, pr)
+            break
+          }
 
-    if (code === CHAR_LEFT_PARENTHESES) {
-      while (!eos() && (next = advance())) {
-        if (next === CHAR_BACKWARD_SLASH) {
-          backslashes = true;
-          next = advance();
-          continue;
+          // ** swallows a segment, and continue.
+          this.debug('globstar swallow a segment, and continue')
+          fr++
         }
+      }
 
-        if (next === CHAR_RIGHT_PARENTHESES) {
-          isGlob = true;
-          break;
-        }
+      // no match was found.
+      // However, in partial mode, we can't say this is necessarily over.
+      // If there's more *pattern* left, then
+      if (partial) {
+        // ran out of file
+        this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
+        if (fr === fl) return true
       }
+      return false
     }
 
-    if (isGlob) {
-      break;
+    // something other than **
+    // non-magic patterns just have to match exactly
+    // patterns with magic have been turned into regexps.
+    var hit
+    if (typeof p === 'string') {
+      if (options.nocase) {
+        hit = f.toLowerCase() === p.toLowerCase()
+      } else {
+        hit = f === p
+      }
+      this.debug('string match', p, f, hit)
+    } else {
+      hit = f.match(p)
+      this.debug('pattern match', p, f, hit)
     }
-  }
-
-  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 (!hit) return false
   }
 
-  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;
-  }
+  // Note: ending in / means that we'll get a final ""
+  // at the end of the pattern.  This can only match a
+  // corresponding "" at the end of the file.
+  // If the file ends in /, then it can only match a
+  // a pattern that ends in /, unless the pattern just
+  // doesn't have any more for it. But, a/b/ should *not*
+  // match "a/b/*", even though "" matches against the
+  // [^/]*? pattern, except in partial mode, where it might
+  // simply not be reached yet.
+  // However, a/b/ should still satisfy a/*
 
-  if (base && base !== '' && base !== '/' && base !== input) {
-    if (isPathSeparator(base.charCodeAt(base.length - 1))) {
-      base = base.slice(0, -1);
-    }
+  // now either we fell off the end of the pattern, or we're done.
+  if (fi === fl && pi === pl) {
+    // ran out of pattern and filename at the same time.
+    // an exact hit!
+    return true
+  } else if (fi === fl) {
+    // ran out of file, but still had pattern left.
+    // this is ok if we're doing the match as part of
+    // a glob fs traversal.
+    return partial
+  } else if (pi === pl) {
+    // ran out of pattern, still have file left.
+    // this is only acceptable if we're on the very last
+    // empty segment of a file with a trailing slash.
+    // a/* should match a/b/
+    var emptyFileEnd = (fi === fl - 1) && (file[fi] === '')
+    return emptyFileEnd
   }
 
-  if (opts.unescape === true) {
-    if (glob) glob = utils.removeBackslashes(glob);
+  // should be unreachable.
+  throw new Error('wtf?')
+}
 
-    if (base && backslashes === true) {
-      base = utils.removeBackslashes(base);
-    }
-  }
+// replace stuff like \* with *
+function globUnescape (s) {
+  return s.replace(/\\(.)/g, '$1')
+}
 
-  return { prefix, input: orig, base, glob, negated, isGlob };
-};
+function regExpEscape (s) {
+  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')
+}
 
 
 /***/ }),
-/* 203 */
+/* 61 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
+var wrappy = __webpack_require__(123)
+module.exports = wrappy(once)
+module.exports.strict = wrappy(onceStrict)
 
-const path = __webpack_require__(16);
-const win32 = process.platform === 'win32';
-const {
-  REGEX_SPECIAL_CHARS,
-  REGEX_SPECIAL_CHARS_GLOBAL,
-  REGEX_REMOVE_BACKSLASH
-} = __webpack_require__(204);
+once.proto = once(function () {
+  Object.defineProperty(Function.prototype, 'once', {
+    value: function () {
+      return once(this)
+    },
+    configurable: true
+  })
 
-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, '/');
+  Object.defineProperty(Function.prototype, 'onceStrict', {
+    value: function () {
+      return onceStrict(this)
+    },
+    configurable: true
+  })
+})
 
-exports.removeBackslashes = str => {
-  return str.replace(REGEX_REMOVE_BACKSLASH, match => {
-    return match === '\\' ? '' : match;
-  });
+function once (fn) {
+  var f = function () {
+    if (f.called) return f.value
+    f.called = true
+    return f.value = fn.apply(this, arguments)
+  }
+  f.called = false
+  return f
 }
 
-exports.supportsLookbehinds = () => {
-  let segs = process.version.slice(1).split('.');
-  if (segs.length === 3 && +segs[0] >= 9 || (+segs[0] === 8 && +segs[1] >= 10)) {
-    return true;
+function onceStrict (fn) {
+  var f = function () {
+    if (f.called)
+      throw new Error(f.onceError)
+    f.called = true
+    return f.value = fn.apply(this, arguments)
   }
-  return false;
-};
+  var name = fn.name || 'Function wrapped with `once`'
+  f.onceError = name + " shouldn't be called more than once"
+  f.called = false
+  return f
+}
 
-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);
+/***/ }),
+/* 62 */,
+/* 63 */
+/***/ (function(module, exports) {
+
+module.exports = __webpack_require__(585);
+
+/***/ }),
+/* 64 */,
+/* 65 */,
+/* 66 */,
+/* 67 */
+/***/ (function(module, exports) {
+
+// 7.2.1 RequireObjectCoercible(argument)
+module.exports = function (it) {
+  if (it == undefined) throw TypeError("Can't call method on  " + it);
+  return it;
 };
 
 
 /***/ }),
-/* 204 */
+/* 68 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+var isObject = __webpack_require__(34);
+var document = __webpack_require__(11).document;
+// typeof document.createElement is 'object' in old IE
+var is = isObject(document) && isObject(document.createElement);
+module.exports = function (it) {
+  return is ? document.createElement(it) : {};
+};
 
 
-const path = __webpack_require__(16);
-const WIN_SLASH = '\\\\/';
-const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
+/***/ }),
+/* 69 */
+/***/ (function(module, exports) {
 
-/**
- * Posix glob regex
- */
+module.exports = true;
 
-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
+/***/ }),
+/* 70 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+// 25.4.1.5 NewPromiseCapability(C)
+var aFunction = __webpack_require__(46);
+
+function PromiseCapability(C) {
+  var resolve, reject;
+  this.promise = new C(function ($$resolve, $$reject) {
+    if (resolve !== undefined || reject !== undefined) throw TypeError('Bad Promise constructor');
+    resolve = $$resolve;
+    reject = $$reject;
+  });
+  this.resolve = aFunction(resolve);
+  this.reject = aFunction(reject);
+}
+
+module.exports.f = function (C) {
+  return new PromiseCapability(C);
 };
 
-/**
- * Windows glob regex
- */
 
-const WINDOWS_CHARS = {
-  ...POSIX_CHARS,
+/***/ }),
+/* 71 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  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}]|$)`
+var def = __webpack_require__(50).f;
+var has = __webpack_require__(49);
+var TAG = __webpack_require__(13)('toStringTag');
+
+module.exports = function (it, tag, stat) {
+  if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, { configurable: true, value: tag });
 };
 
-/**
- * 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'
+/***/ }),
+/* 72 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var shared = __webpack_require__(107)('keys');
+var uid = __webpack_require__(111);
+module.exports = function (key) {
+  return shared[key] || (shared[key] = uid(key));
 };
 
-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,
+/***/ }),
+/* 73 */
+/***/ (function(module, exports) {
 
-  // Replace globs with equivalent patterns to reduce parsing time.
-  REPLACEMENTS: {
-    '***': '*',
-    '**/**': '**',
-    '**/**/**': '**'
-  },
+// 7.1.4 ToInteger
+var ceil = Math.ceil;
+var floor = Math.floor;
+module.exports = function (it) {
+  return isNaN(it = +it) ? 0 : (it > 0 ? floor : ceil)(it);
+};
 
-  // 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 */
+/***/ }),
+/* 74 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  CHAR_LEFT_PARENTHESES: 40, /* ( */
-  CHAR_RIGHT_PARENTHESES: 41, /* ) */
+// to indexed object, toObject with fallback for non-array-like ES3 strings
+var IObject = __webpack_require__(131);
+var defined = __webpack_require__(67);
+module.exports = function (it) {
+  return IObject(defined(it));
+};
 
-  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 */
+/***/ }),
+/* 75 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// Approach:
+//
+// 1. Get the minimatch set
+// 2. For each pattern in the set, PROCESS(pattern, false)
+// 3. Store matches per-set, then uniq them
+//
+// PROCESS(pattern, inGlobStar)
+// Get the first [n] items from pattern that are all strings
+// Join these together.  This is PREFIX.
+//   If there is no more remaining, then stat(PREFIX) and
+//   add to matches if it succeeds.  END.
+//
+// If inGlobStar and PREFIX is symlink and points to dir
+//   set ENTRIES = []
+// else readdir(PREFIX) as ENTRIES
+//   If fail, END
+//
+// with ENTRIES
+//   If pattern[n] is GLOBSTAR
+//     // handle the case where the globstar match is empty
+//     // by pruning it out, and testing the resulting pattern
+//     PROCESS(pattern[0..n] + pattern[n+1 .. $], false)
+//     // handle other cases.
+//     for ENTRY in ENTRIES (not dotfiles)
+//       // attach globstar + tail onto the entry
+//       // Mark that this entry is a globstar match
+//       PROCESS(pattern[0..n] + ENTRY + pattern[n .. $], true)
+//
+//   else // not globstar
+//     for ENTRY in ENTRIES (not dotfiles, unless pattern[n] is dot)
+//       Test ENTRY against pattern[n]
+//       If fails, continue
+//       If passes, PROCESS(pattern[0..n] + item + pattern[n+1 .. $])
+//
+// Caveat:
+//   Cache all stats and readdirs results to minimize syscall.  Since all
+//   we ever care about is existence and directory-ness, we can just keep
+//   `true` for files, and [children,...] for directories, or `false` for
+//   things that don't exist.
 
-  SEP: path.sep,
+module.exports = glob
 
-  /**
-   * Create EXTGLOB_CHARS
-   */
+var fs = __webpack_require__(3)
+var rp = __webpack_require__(114)
+var minimatch = __webpack_require__(60)
+var Minimatch = minimatch.Minimatch
+var inherits = __webpack_require__(42)
+var EE = __webpack_require__(54).EventEmitter
+var path = __webpack_require__(0)
+var assert = __webpack_require__(22)
+var isAbsolute = __webpack_require__(76)
+var globSync = __webpack_require__(218)
+var common = __webpack_require__(115)
+var alphasort = common.alphasort
+var alphasorti = common.alphasorti
+var setopts = common.setopts
+var ownProp = common.ownProp
+var inflight = __webpack_require__(223)
+var util = __webpack_require__(2)
+var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
 
-  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: ')' }
-    };
-  },
+var once = __webpack_require__(61)
 
-  /**
-   * Create GLOB_CHARS
-   */
+function glob (pattern, options, cb) {
+  if (typeof options === 'function') cb = options, options = {}
+  if (!options) options = {}
 
-  globChars(win32) {
-    return win32 === true ? WINDOWS_CHARS : POSIX_CHARS;
+  if (options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return globSync(pattern, options)
   }
-};
-
 
-/***/ }),
-/* 205 */
-/***/ (function(module, exports, __webpack_require__) {
+  return new Glob(pattern, options, cb)
+}
 
-"use strict";
+glob.sync = globSync
+var GlobSync = glob.GlobSync = globSync.GlobSync
 
+// old api surface
+glob.glob = glob
 
-const utils = __webpack_require__(203);
-const constants = __webpack_require__(204);
+function extend (origin, add) {
+  if (add === null || typeof add !== 'object') {
+    return origin
+  }
 
-/**
- * Constants
- */
+  var keys = Object.keys(add)
+  var i = keys.length
+  while (i--) {
+    origin[keys[i]] = add[keys[i]]
+  }
+  return origin
+}
 
-const {
-  MAX_LENGTH,
-  POSIX_REGEX_SOURCE,
-  REGEX_NON_SPECIAL_CHAR,
-  REGEX_SPECIAL_CHARS_BACKREF,
-  REPLACEMENTS
-} = constants;
+glob.hasMagic = function (pattern, options_) {
+  var options = extend({}, options_)
+  options.noprocess = true
 
-/**
- * Helpers
- */
+  var g = new Glob(pattern, options)
+  var set = g.minimatch.set
 
-const expandRange = (args, options) => {
-  if (typeof options.expandRange === 'function') {
-    return options.expandRange(...args, options);
-  }
+  if (!pattern)
+    return false
 
-  args.sort();
-  let value = `[${args.join('-')}]`;
+  if (set.length > 1)
+    return true
 
-  try {
-    /* eslint-disable no-new */
-    new RegExp(value);
-  } catch (ex) {
-    return args.map(v => utils.escapeRegex(v)).join('..');
+  for (var j = 0; j < set[0].length; j++) {
+    if (typeof set[0][j] !== 'string')
+      return true
   }
 
-  return value;
-};
-
-const negate = state => {
-  let count = 1;
+  return false
+}
 
-  while (state.peek() === '!' && (state.peek(2) !== '(' || state.peek(3) === '?')) {
-    state.advance();
-    state.start++;
-    count++;
+glob.Glob = Glob
+inherits(Glob, EE)
+function Glob (pattern, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = null
   }
 
-  if (count % 2 === 0) {
-    return false;
+  if (options && options.sync) {
+    if (cb)
+      throw new TypeError('callback provided to sync glob')
+    return new GlobSync(pattern, options)
   }
 
-  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`;
-};
+  if (!(this instanceof Glob))
+    return new Glob(pattern, options, cb)
 
-/**
- * Parse the given input string.
- * @param {String} input
- * @param {Object} options
- * @return {Object}
- */
+  setopts(this, pattern, options)
+  this._didRealPath = false
 
-const parse = (input, options) => {
-  if (typeof input !== 'string') {
-    throw new TypeError('Expected a string');
-  }
+  // process each pattern in the minimatch set
+  var n = this.minimatch.set.length
 
-  input = REPLACEMENTS[input] || input;
+  // The matches are stored as {<filename>: true,...} so that
+  // duplicates are automagically pruned.
+  // Later, we do an Object.keys() on these.
+  // Keep them as a list so we can fill in when nonull is set.
+  this.matches = new Array(n)
 
-  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}`);
+  if (typeof cb === 'function') {
+    cb = once(cb)
+    this.on('error', cb)
+    this.on('end', function (matches) {
+      cb(null, matches)
+    })
   }
 
-  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);
+  var self = this
+  this._processing = 0
 
-  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;
+  this._emitQueue = []
+  this._processQueue = []
+  this.paused = false
 
-  const globstar = (opts) => {
-    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
-  };
+  if (this.noprocess)
+    return this
 
-  let nodot = opts.dot ? '' : NO_DOT;
-  let star = opts.bash === true ? globstar(opts) : STAR;
-  let qmarkNoDot = opts.dot ? QMARK : QMARK_NO_DOT;
+  if (n === 0)
+    return done()
 
-  if (opts.capture) {
-    star = `(${star})`;
+  var sync = true
+  for (var i = 0; i < n; i ++) {
+    this._process(this.minimatch.set[i], i, false, done)
   }
+  sync = false
 
-  // minimatch options support
-  if (typeof opts.noext === 'boolean') {
-    opts.noextglob = opts.noext;
+  function done () {
+    --self._processing
+    if (self._processing <= 0) {
+      if (sync) {
+        process.nextTick(function () {
+          self._finish()
+        })
+      } else {
+        self._finish()
+      }
+    }
   }
+}
 
-  let state = {
-    index: -1,
-    start: 0,
-    consumed: '',
-    output: '',
-    backtrack: false,
-    brackets: 0,
-    braces: 0,
-    parens: 0,
-    quotes: 0,
-    tokens
-  };
+Glob.prototype._finish = function () {
+  assert(this instanceof Glob)
+  if (this.aborted)
+    return
 
-  let extglobs = [];
-  let stack = [];
-  let prev = bos;
-  let value;
+  if (this.realpath && !this._didRealpath)
+    return this._realpath()
 
-  /**
-   * Tokenizing helpers
-   */
+  common.finish(this)
+  this.emit('end', this.found)
+}
 
-  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 || '';
-  };
+Glob.prototype._realpath = function () {
+  if (this._didRealpath)
+    return
 
-  const increment = type => {
-    state[type]++;
-    stack.push(type);
-  };
+  this._didRealpath = true
 
-  const decrement = type => {
-    state[type]--;
-    stack.pop();
-  };
+  var n = this.matches.length
+  if (n === 0)
+    return this._finish()
 
-  /**
-   * 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.
-   */
+  var self = this
+  for (var i = 0; i < this.matches.length; i++)
+    this._realpathSet(i, next)
 
-  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;
-      }
-    }
+  function next () {
+    if (--n === 0)
+      self._finish()
+  }
+}
 
-    if (extglobs.length && tok.type !== 'paren' && !EXTGLOB_CHARS[tok.value]) {
-      extglobs[extglobs.length - 1].inner += tok.value;
-    }
+Glob.prototype._realpathSet = function (index, cb) {
+  var matchset = this.matches[index]
+  if (!matchset)
+    return cb()
 
-    if (tok.value || tok.output) append(tok);
-    if (prev && prev.type === 'text' && tok.type === 'text') {
-      prev.value += tok.value;
-      return;
-    }
+  var found = Object.keys(matchset)
+  var self = this
+  var n = found.length
 
-    tok.prev = prev;
-    tokens.push(tok);
-    prev = tok;
-  };
+  if (n === 0)
+    return cb()
 
-  const extglobOpen = (type, value) => {
-    let token = { ...EXTGLOB_CHARS[value], conditions: 1, inner: '' };
+  var set = this.matches[index] = Object.create(null)
+  found.forEach(function (p, i) {
+    // If there's a problem with the stat, then it means that
+    // one or more of the links in the realpath couldn't be
+    // resolved.  just return the abs value in that case.
+    p = self._makeAbs(p)
+    rp.realpath(p, self.realpathCache, function (er, real) {
+      if (!er)
+        set[real] = true
+      else if (er.syscall === 'stat')
+        set[p] = true
+      else
+        self.emit('error', er) // srsly wtf right here
 
-    token.prev = prev;
-    token.parens = state.parens;
-    token.output = state.output;
-    let output = (opts.capture ? '(' : '') + token.open;
+      if (--n === 0) {
+        self.matches[index] = set
+        cb()
+      }
+    })
+  })
+}
 
-    push({ type, value, output: state.output ? '' : ONE_CHAR });
-    push({ type: 'paren', extglob: true, value: advance(), output });
-    increment('parens');
-    extglobs.push(token);
-  };
+Glob.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
 
-  const extglobClose = token => {
-    let output = token.close + (opts.capture ? ')' : '');
+Glob.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
 
-    if (token.type === 'negate') {
-      let extglobStar = star;
+Glob.prototype.abort = function () {
+  this.aborted = true
+  this.emit('abort')
+}
 
-      if (token.inner && token.inner.length > 1 && token.inner.includes('/')) {
-        extglobStar = globstar(opts);
-      }
+Glob.prototype.pause = function () {
+  if (!this.paused) {
+    this.paused = true
+    this.emit('pause')
+  }
+}
 
-      if (extglobStar !== star || eos() || /^\)+$/.test(input.slice(state.index + 1))) {
-        output = token.close = ')$))' + extglobStar;
+Glob.prototype.resume = function () {
+  if (this.paused) {
+    this.emit('resume')
+    this.paused = false
+    if (this._emitQueue.length) {
+      var eq = this._emitQueue.slice(0)
+      this._emitQueue.length = 0
+      for (var i = 0; i < eq.length; i ++) {
+        var e = eq[i]
+        this._emitMatch(e[0], e[1])
       }
-
-      if (token.prev.type === 'bos' && eos()) {
-        state.negatedExtglob = true;
+    }
+    if (this._processQueue.length) {
+      var pq = this._processQueue.slice(0)
+      this._processQueue.length = 0
+      for (var i = 0; i < pq.length; i ++) {
+        var p = pq[i]
+        this._processing--
+        this._process(p[0], p[1], p[2], p[3])
       }
     }
+  }
+}
 
-    push({ type: 'paren', extglob: true, value, output });
-    decrement('parens');
-  };
+Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
+  assert(this instanceof Glob)
+  assert(typeof cb === 'function')
 
-  if (opts.fastpaths !== false && !/(^[*!]|[/{[()\]}"])/.test(input)) {
-    let backslashes = false;
+  if (this.aborted)
+    return
 
-    let output = input.replace(REGEX_SPECIAL_CHARS_BACKREF, (m, esc, chars, first, rest, index) => {
-      if (first === '\\') {
-        backslashes = true;
-        return m;
-      }
+  this._processing++
+  if (this.paused) {
+    this._processQueue.push([pattern, index, inGlobStar, cb])
+    return
+  }
 
-      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);
-      }
+  //console.error('PROCESS %d', this._processing, pattern)
 
-      if (first === '.') {
-        return DOT_LITERAL.repeat(chars.length);
-      }
+  // Get the first [n] parts of pattern that are all strings.
+  var n = 0
+  while (typeof pattern[n] === 'string') {
+    n ++
+  }
+  // now n is the index of the first one that is *not* a string.
 
-      if (first === '*') {
-        if (esc) {
-          return esc + first + (rest ? star : '');
-        }
-        return star;
-      }
-      return esc ? m : '\\' + m;
-    });
+  // see if there's anything else
+  var prefix
+  switch (n) {
+    // if not, then this is rather simple
+    case pattern.length:
+      this._processSimple(pattern.join('/'), index, cb)
+      return
 
-    if (backslashes === true) {
-      if (opts.unescape === true) {
-        output = output.replace(/\\/g, '');
-      } else {
-        output = output.replace(/\\+/g, m => {
-          return m.length % 2 === 0 ? '\\\\' : (m ? '\\' : '');
-        });
-      }
-    }
+    case 0:
+      // pattern *starts* with some non-trivial item.
+      // going to readdir(cwd), but not include the prefix in matches.
+      prefix = null
+      break
 
-    state.output = output;
-    return state;
+    default:
+      // pattern has some string bits in the front.
+      // whatever it starts with, whether that's 'absolute' like /foo/bar,
+      // or 'relative' like '../baz'
+      prefix = pattern.slice(0, n).join('/')
+      break
   }
 
-  /**
-   * Tokenize input until we reach end-of-string
-   */
-
-  while (!eos()) {
-    value = advance();
+  var remain = pattern.slice(n)
 
-    if (value === '\u0000') {
-      continue;
-    }
+  // get the list of entries.
+  var read
+  if (prefix === null)
+    read = '.'
+  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+    if (!prefix || !isAbsolute(prefix))
+      prefix = '/' + prefix
+    read = prefix
+  } else
+    read = prefix
 
-    /**
-     * Escaped characters
-     */
+  var abs = this._makeAbs(read)
 
-    if (value === '\\') {
-      let next = peek();
+  //if ignored, skip _processing
+  if (childrenIgnored(this, read))
+    return cb()
 
-      if (next === '/' && opts.bash !== true) {
-        continue;
-      }
+  var isGlobStar = remain[0] === minimatch.GLOBSTAR
+  if (isGlobStar)
+    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar, cb)
+  else
+    this._processReaddir(prefix, read, abs, remain, index, inGlobStar, cb)
+}
 
-      if (next === '.' || next === ';') {
-        continue;
-      }
+Glob.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar, cb) {
+  var self = this
+  this._readdir(abs, inGlobStar, function (er, entries) {
+    return self._processReaddir2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
+  })
+}
 
-      if (!next) {
-        value += '\\';
-        push({ type: 'text', value });
-        continue;
-      }
+Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
 
-      // collapse slashes to reduce potential for exploits
-      let match = /^\\+/.exec(input.slice(state.index + 1));
-      let slashes = 0;
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return cb()
 
-      if (match && match[0].length > 2) {
-        slashes = match[0].length;
-        state.index += slashes;
-        if (slashes % 2 !== 0) {
-          value += '\\';
-        }
-      }
+  // It will only match dot entries if it starts with a dot, or if
+  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
+  var pn = remain[0]
+  var negate = !!this.minimatch.negate
+  var rawGlob = pn._glob
+  var dotOk = this.dot || rawGlob.charAt(0) === '.'
 
-      if (opts.unescape === true) {
-        value = advance() || '';
+  var matchedEntries = []
+  for (var i = 0; i < entries.length; i++) {
+    var e = entries[i]
+    if (e.charAt(0) !== '.' || dotOk) {
+      var m
+      if (negate && !prefix) {
+        m = !e.match(pn)
       } else {
-        value += advance() || '';
-      }
-
-      if (state.brackets === 0) {
-        push({ type: 'text', value });
-        continue;
+        m = e.match(pn)
       }
+      if (m)
+        matchedEntries.push(e)
     }
+  }
 
-    /**
-     * 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;
+  //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries)
 
-          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();
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return cb()
 
-              if (!bos.output && tokens.indexOf(prev) === 1) {
-                bos.output = ONE_CHAR;
-              }
-              continue;
-            }
-          }
-        }
-      }
+  // if this is the last remaining pattern bit, then no need for
+  // an additional stat *unless* the user has specified mark or
+  // stat explicitly.  We know they exist, since readdir returned
+  // them.
 
-      if ((value === '[' && peek() !== ':') || (value === '-' && peek() === ']')) {
-        value = '\\' + value;
-      }
+  if (remain.length === 1 && !this.mark && !this.stat) {
+    if (!this.matches[index])
+      this.matches[index] = Object.create(null)
 
-      if (value === ']' && (prev.value === '[' || prev.value === '[^')) {
-        value = '\\' + value;
+    for (var i = 0; i < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
       }
 
-      if (opts.posix === true && value === '!' && prev.value === '[') {
-        value = '^';
+      if (e.charAt(0) === '/' && !this.nomount) {
+        e = path.join(this.root, e)
       }
-
-      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;
+      this._emitMatch(index, e)
     }
+    // This was the last one, and no stats were needed
+    return cb()
+  }
 
-    /**
-     * Double quotes
-     */
-
-    if (value === '"') {
-      state.quotes = state.quotes === 1 ? 0 : 1;
-      if (opts.keepQuotes === true) {
-        push({ type: 'text', value });
-      }
-      continue;
+  // now test all matched entries as stand-ins for that part
+  // of the pattern.
+  remain.shift()
+  for (var i = 0; i < len; i ++) {
+    var e = matchedEntries[i]
+    var newPattern
+    if (prefix) {
+      if (prefix !== '/')
+        e = prefix + '/' + e
+      else
+        e = prefix + e
     }
+    this._process([e].concat(remain), index, inGlobStar, cb)
+  }
+  cb()
+}
 
-    /**
-     * Parentheses
-     */
+Glob.prototype._emitMatch = function (index, e) {
+  if (this.aborted)
+    return
 
-    if (value === '(') {
-      push({ type: 'paren', value });
-      increment('parens');
-      continue;
-    }
+  if (isIgnored(this, e))
+    return
 
-    if (value === ')') {
-      if (state.parens === 0 && opts.strictBrackets === true) {
-        throw new SyntaxError(syntaxError('opening', '('));
-      }
+  if (this.paused) {
+    this._emitQueue.push([index, e])
+    return
+  }
 
-      let extglob = extglobs[extglobs.length - 1];
-      if (extglob && state.parens === extglob.parens + 1) {
-        extglobClose(extglobs.pop());
-        continue;
-      }
+  var abs = isAbsolute(e) ? e : this._makeAbs(e)
 
-      push({ type: 'paren', value, output: state.parens ? ')' : '\\)' });
-      decrement('parens');
-      continue;
-    }
+  if (this.mark)
+    e = this._mark(e)
 
-    /**
-     * Brackets
-     */
+  if (this.absolute)
+    e = abs
 
-    if (value === '[') {
-      if (opts.nobracket === true || !input.slice(state.index + 1).includes(']')) {
-        if (opts.nobracket !== true && opts.strictBrackets === true) {
-          throw new SyntaxError(syntaxError('closing', ']'));
-        }
+  if (this.matches[index][e])
+    return
 
-        value = '\\' + value;
-      } else {
-        increment('brackets');
-      }
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
 
-      push({ type: 'bracket', value });
-      continue;
-    }
+  this.matches[index][e] = true
 
-    if (value === ']') {
-      if (opts.nobracket === true || (prev && prev.type === 'bracket' && prev.value.length === 1)) {
-        push({ type: 'text', value, output: '\\' + value });
-        continue;
-      }
+  var st = this.statCache[abs]
+  if (st)
+    this.emit('stat', e, st)
 
-      if (state.brackets === 0) {
-        if (opts.strictBrackets === true) {
-          throw new SyntaxError(syntaxError('opening', '['));
-        }
+  this.emit('match', e)
+}
 
-        push({ type: 'text', value, output: '\\' + value });
-        continue;
-      }
+Glob.prototype._readdirInGlobStar = function (abs, cb) {
+  if (this.aborted)
+    return
 
-      decrement('brackets');
+  // follow all symlinked directories forever
+  // just proceed as if this is a non-globstar situation
+  if (this.follow)
+    return this._readdir(abs, false, cb)
 
-      let prevValue = prev.value.slice(1);
-      if (prev.posix !== true && prevValue[0] === '^' && !prevValue.includes('/')) {
-        value = '/' + value;
-      }
+  var lstatkey = 'lstat\0' + abs
+  var self = this
+  var lstatcb = inflight(lstatkey, lstatcb_)
 
-      prev.value += value;
-      append({ value });
+  if (lstatcb)
+    fs.lstat(abs, lstatcb)
 
-      // when literal brackets are explicitly disabled
-      // assume we should match with a regex character class
-      if (opts.literalBrackets === false || utils.hasRegexChars(prevValue)) {
-        continue;
-      }
+  function lstatcb_ (er, lstat) {
+    if (er && er.code === 'ENOENT')
+      return cb()
 
-      let escaped = utils.escapeRegex(prev.value);
-      state.output = state.output.slice(0, -prev.value.length);
+    var isSym = lstat && lstat.isSymbolicLink()
+    self.symlinks[abs] = isSym
 
-      // 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;
-      }
+    // If it's not a symlink or a dir, then it's definitely a regular file.
+    // don't bother doing a readdir in that case.
+    if (!isSym && lstat && !lstat.isDirectory()) {
+      self.cache[abs] = 'FILE'
+      cb()
+    } else
+      self._readdir(abs, false, cb)
+  }
+}
 
-      // when the user specifies nothing, try to match both
-      prev.value = `(${capture}${escaped}|${prev.value})`;
-      state.output += prev.value;
-      continue;
-    }
+Glob.prototype._readdir = function (abs, inGlobStar, cb) {
+  if (this.aborted)
+    return
 
-    /**
-     * Braces
-     */
+  cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb)
+  if (!cb)
+    return
 
-    if (value === '{' && opts.nobrace !== true) {
-      push({ type: 'brace', value, output: '(' });
-      increment('braces');
-      continue;
-    }
+  //console.error('RD %j %j', +inGlobStar, abs)
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs, cb)
 
-    if (value === '}') {
-      if (opts.nobrace === true || state.braces === 0) {
-        push({ type: 'text', value, output: '\\' + value });
-        continue;
-      }
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return cb()
 
-      let output = ')';
+    if (Array.isArray(c))
+      return cb(null, c)
+  }
 
-      if (state.dots === true) {
-        let arr = tokens.slice();
-        let range = [];
+  var self = this
+  fs.readdir(abs, readdirCb(this, abs, cb))
+}
 
-        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);
-          }
-        }
+function readdirCb (self, abs, cb) {
+  return function (er, entries) {
+    if (er)
+      self._readdirError(abs, er, cb)
+    else
+      self._readdirEntries(abs, entries, cb)
+  }
+}
 
-        output = expandRange(range, opts);
-        state.backtrack = true;
-      }
+Glob.prototype._readdirEntries = function (abs, entries, cb) {
+  if (this.aborted)
+    return
 
-      push({ type: 'brace', value, output });
-      decrement('braces');
-      continue;
+  // if we haven't asked to stat everything, then just
+  // assume that everything in there exists, so we can avoid
+  // having to stat it a second time.
+  if (!this.mark && !this.stat) {
+    for (var i = 0; i < entries.length; i ++) {
+      var e = entries[i]
+      if (abs === '/')
+        e = abs + e
+      else
+        e = abs + '/' + e
+      this.cache[e] = true
     }
+  }
 
-    /**
-     * Pipes
-     */
+  this.cache[abs] = entries
+  return cb(null, entries)
+}
 
-    if (value === '|') {
-      if (extglobs.length > 0) {
-        extglobs[extglobs.length - 1].conditions++;
-      }
-      push({ type: 'text', value });
-      continue;
-    }
+Glob.prototype._readdirError = function (f, er, cb) {
+  if (this.aborted)
+    return
 
-    /**
-     * Commas
-     */
+  // handle errors, and cache the information
+  switch (er.code) {
+    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
+    case 'ENOTDIR': // totally normal. means it *does* exist.
+      var abs = this._makeAbs(f)
+      this.cache[abs] = 'FILE'
+      if (abs === this.cwdAbs) {
+        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
+        error.path = this.cwd
+        error.code = er.code
+        this.emit('error', error)
+        this.abort()
+      }
+      break
 
-    if (value === ',') {
-      let output = value;
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
 
-      if (state.braces > 0 && stack[stack.length - 1] === 'braces') {
-        output = '|';
+    default: // some unusual error.  Treat as failure.
+      this.cache[this._makeAbs(f)] = false
+      if (this.strict) {
+        this.emit('error', er)
+        // If the error is handled, then we abort
+        // if not, we threw out of here
+        this.abort()
       }
+      if (!this.silent)
+        console.error('glob error', er)
+      break
+  }
 
-      push({ type: 'comma', value, output });
-      continue;
-    }
+  return cb()
+}
 
-    /**
-     * Slashes
-     */
+Glob.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar, cb) {
+  var self = this
+  this._readdir(abs, inGlobStar, function (er, entries) {
+    self._processGlobStar2(prefix, read, abs, remain, index, inGlobStar, entries, cb)
+  })
+}
 
-    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;
-    }
+Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) {
+  //console.error('pgs2', prefix, remain[0], entries)
 
-    /**
-     * Dots
-     */
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return cb()
 
-    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;
-      }
+  // test without the globstar, and with every child both below
+  // and replacing the globstar.
+  var remainWithoutGlobStar = remain.slice(1)
+  var gspref = prefix ? [ prefix ] : []
+  var noGlobStar = gspref.concat(remainWithoutGlobStar)
 
-      push({ type: 'dot', value, output: DOT_LITERAL });
-      continue;
-    }
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false, cb)
 
-    /**
-     * Question marks
-     */
+  var isSym = this.symlinks[abs]
+  var len = entries.length
 
-    if (value === '?') {
-      if (prev && prev.type === 'paren') {
-        let next = peek();
-        let output = value;
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return cb()
 
-        if (next === '<' && !utils.supportsLookbehinds()) {
-          throw new Error('Node.js v10 or higher is required for regex lookbehinds');
-        }
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
 
-        if (prev.value === '(' && !/[!=<:]/.test(next) || (next === '<' && !/[!=]/.test(peek(2)))) {
-          output = '\\' + value;
-        }
+    // these two cases enter the inGlobStar state
+    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
+    this._process(instead, index, true, cb)
 
-        push({ type: 'text', value, output });
-        continue;
-      }
+    var below = gspref.concat(entries[i], remain)
+    this._process(below, index, true, cb)
+  }
 
-      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        extglobOpen('qmark', value);
-        continue;
-      }
+  cb()
+}
 
-      if (opts.dot !== true && (prev.type === 'slash' || prev.type === 'bos')) {
-        push({ type: 'qmark', value, output: QMARK_NO_DOT });
-        continue;
-      }
+Glob.prototype._processSimple = function (prefix, index, cb) {
+  // XXX review this.  Shouldn't it be doing the mounting etc
+  // before doing stat?  kinda weird?
+  var self = this
+  this._stat(prefix, function (er, exists) {
+    self._processSimple2(prefix, index, er, exists, cb)
+  })
+}
+Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) {
 
-      push({ type: 'qmark', value, output: QMARK });
-      continue;
-    }
+  //console.error('ps2', prefix, exists)
 
-    /**
-     * Exclamation
-     */
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
 
-    if (value === '!') {
-      if (opts.noextglob !== true && peek() === '(') {
-        if (peek(2) !== '?' || !/[!=<:]/.test(peek(3))) {
-          extglobOpen('negate', value);
-          continue;
-        }
-      }
+  // If it doesn't exist, then just mark the lack of results
+  if (!exists)
+    return cb()
 
-      if (opts.nonegate !== true && state.index === 0) {
-        negate(state);
-        continue;
-      }
+  if (prefix && isAbsolute(prefix) && !this.nomount) {
+    var trail = /[\/\\]$/.test(prefix)
+    if (prefix.charAt(0) === '/') {
+      prefix = path.join(this.root, prefix)
+    } else {
+      prefix = path.resolve(this.root, prefix)
+      if (trail)
+        prefix += '/'
     }
+  }
 
-    /**
-     * Plus
-     */
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
 
-    if (value === '+') {
-      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        extglobOpen('plus', value);
-        continue;
-      }
+  // Mark this as a match
+  this._emitMatch(index, prefix)
+  cb()
+}
 
-      if (prev && (prev.type === 'bracket' || prev.type === 'paren' || prev.type === 'brace')) {
-        let output = prev.extglob === true ? '\\' + value : value;
-        push({ type: 'plus', value, output });
-        continue;
-      }
+// Returns either 'DIR', 'FILE', or false
+Glob.prototype._stat = function (f, cb) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
 
-      // use regex behavior inside parens
-      if (state.parens > 0 && opts.regex !== false) {
-        push({ type: 'plus', value });
-        continue;
-      }
+  if (f.length > this.maxLength)
+    return cb()
 
-      push({ type: 'plus', value: PLUS_LITERAL });
-      continue;
-    }
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
 
-    /**
-     * Plain text
-     */
+    if (Array.isArray(c))
+      c = 'DIR'
 
-    if (value === '@') {
-      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-        push({ type: 'at', value, output: '' });
-        continue;
-      }
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return cb(null, c)
 
-      push({ type: 'text', value });
-      continue;
-    }
+    if (needDir && c === 'FILE')
+      return cb()
 
-    /**
-     * Plain text
-     */
+    // otherwise we have to stat, because maybe c=true
+    // if we know it exists, but not what it is.
+  }
 
-    if (value !== '*') {
-      if (value === '$' || value === '^') {
-        value = '\\' + value;
-      }
+  var exists
+  var stat = this.statCache[abs]
+  if (stat !== undefined) {
+    if (stat === false)
+      return cb(null, stat)
+    else {
+      var type = stat.isDirectory() ? 'DIR' : 'FILE'
+      if (needDir && type === 'FILE')
+        return cb()
+      else
+        return cb(null, type, stat)
+    }
+  }
 
-      let match = REGEX_NON_SPECIAL_CHAR.exec(input.slice(state.index + 1));
-      if (match) {
-        value += match[0];
-        state.index += match[0].length;
-      }
+  var self = this
+  var statcb = inflight('stat\0' + abs, lstatcb_)
+  if (statcb)
+    fs.lstat(abs, statcb)
 
-      push({ type: 'text', value });
-      continue;
+  function lstatcb_ (er, lstat) {
+    if (lstat && lstat.isSymbolicLink()) {
+      // If it's a symlink, then treat it as the target, unless
+      // the target does not exist, then treat it as a file.
+      return fs.stat(abs, function (er, stat) {
+        if (er)
+          self._stat2(f, abs, null, lstat, cb)
+        else
+          self._stat2(f, abs, er, stat, cb)
+      })
+    } else {
+      self._stat2(f, abs, er, lstat, cb)
     }
+  }
+}
 
-    /**
-     * Stars
-     */
+Glob.prototype._stat2 = function (f, abs, er, stat, cb) {
+  if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+    this.statCache[abs] = false
+    return cb()
+  }
 
-    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;
-    }
+  var needDir = f.slice(-1) === '/'
+  this.statCache[abs] = stat
 
-    if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
-      extglobOpen('star', value);
-      continue;
-    }
+  if (abs.slice(-1) === '/' && stat && !stat.isDirectory())
+    return cb(null, false, stat)
 
-    if (prev.type === 'star') {
-      if (opts.noglobstar === true) {
-        state.consumed += value;
-        continue;
-      }
+  var c = true
+  if (stat)
+    c = stat.isDirectory() ? 'DIR' : 'FILE'
+  this.cache[abs] = this.cache[abs] || c
 
-      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 (needDir && c === 'FILE')
+    return cb()
 
-      if (opts.bash === true && (!isStart || (!eos() && peek() !== '/'))) {
-        push({ type: 'star', value, output: '' });
-        continue;
-      }
+  return cb(null, c, stat)
+}
 
-      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;
-      }
+/***/ }),
+/* 76 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      if (prior.type === 'bos' && eos()) {
-        prev.type = 'globstar';
-        prev.value += value;
-        prev.output = globstar(opts);
-        state.output = prev.output;
-        state.consumed += value;
-        continue;
-      }
+"use strict";
 
-      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;
+function posix(path) {
+	return path.charAt(0) === '/';
+}
 
-        state.output += prior.output + prev.output;
-        state.consumed += value;
-        continue;
-      }
+function win32(path) {
+	// https://github.com/nodejs/node/blob/b3fcc245fb25539909ef1d5eaa01dbf92e168633/lib/path.js#L56
+	var splitDeviceRe = /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
+	var result = splitDeviceRe.exec(path);
+	var device = result[1] || '';
+	var isUnc = Boolean(device && device.charAt(1) !== ':');
 
-      let next = peek();
-      if (prior.type === 'slash' && prior.prev.type !== 'bos' && next === '/') {
-        let end = peek(2) !== void 0 ? '|$' : '';
+	// UNC paths are always absolute
+	return Boolean(result[2] || isUnc);
+}
 
-        state.output = state.output.slice(0, -(prior.output + prev.output).length);
-        prior.output = '(?:' + prior.output;
+module.exports = process.platform === 'win32' ? win32 : posix;
+module.exports.posix = posix;
+module.exports.win32 = win32;
 
-        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();
+/***/ }),
+/* 77 */,
+/* 78 */,
+/* 79 */
+/***/ (function(module, exports) {
 
-        push({ type: 'slash', value, output: '' });
-        continue;
-      }
+module.exports = __webpack_require__(480);
 
-      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;
-      }
+/***/ }),
+/* 80 */,
+/* 81 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      // remove single star from output
-      state.output = state.output.slice(0, -prev.output.length);
+"use strict";
 
-      // 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;
-    }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
-    let token = { type: 'star', value, output: star };
+exports.default = function (str, fileLoc = 'lockfile') {
+  str = (0, (_stripBom || _load_stripBom()).default)(str);
+  return hasMergeConflicts(str) ? parseWithConflict(str, fileLoc) : { type: 'success', object: parse(str, fileLoc) };
+};
 
-    if (opts.bash === true) {
-      token.output = '.*?';
-      if (prev.type === 'bos' || prev.type === 'slash') {
-        token.output = nodot + token.output;
-      }
-      push(token);
-      continue;
-    }
+var _util;
 
-    if (prev && (prev.type === 'bracket' || prev.type === 'paren') && opts.regex === true) {
-      token.output = value;
-      push(token);
-      continue;
-    }
+function _load_util() {
+  return _util = _interopRequireDefault(__webpack_require__(2));
+}
 
-    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;
+var _invariant;
 
-      } else if (opts.dot === true) {
-        state.output += NO_DOTS_SLASH;
-        prev.output += NO_DOTS_SLASH;
+function _load_invariant() {
+  return _invariant = _interopRequireDefault(__webpack_require__(7));
+}
 
-      } else {
-        state.output += nodot;
-        prev.output += nodot;
-      }
+var _stripBom;
 
-      if (peek() !== '*') {
-        state.output += ONE_CHAR;
-        prev.output += ONE_CHAR;
-      }
-    }
+function _load_stripBom() {
+  return _stripBom = _interopRequireDefault(__webpack_require__(122));
+}
 
-    push(token);
-  }
+var _constants;
 
-  while (state.brackets > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ']'));
-    state.output = utils.escapeLast(state.output, '[');
-    decrement('brackets');
-  }
+function _load_constants() {
+  return _constants = __webpack_require__(6);
+}
 
-  while (state.parens > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ')'));
-    state.output = utils.escapeLast(state.output, '(');
-    decrement('parens');
-  }
+var _errors;
 
-  while (state.braces > 0) {
-    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', '}'));
-    state.output = utils.escapeLast(state.output, '{');
-    decrement('braces');
-  }
+function _load_errors() {
+  return _errors = __webpack_require__(4);
+}
 
-  if (opts.strictSlashes !== true && (prev.type === 'star' || prev.type === 'bracket')) {
-    push({ type: 'maybe_slash', value: '', output: `${SLASH_LITERAL}?` });
-  }
+var _map;
 
-  // rebuild the output if we had to backtrack at any point
-  if (state.backtrack === true) {
-    state.output = '';
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
+}
 
-    for (let token of state.tokens) {
-      state.output += token.output != null ? token.output : token.value;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-      if (token.suffix) {
-        state.output += token.suffix;
-      }
-    }
-  }
+/* eslint quotes: 0 */
 
-  return state;
+const VERSION_REGEX = /^yarn lockfile v(\d+)$/;
+
+const TOKEN_TYPES = {
+  boolean: 'BOOLEAN',
+  string: 'STRING',
+  identifier: 'IDENTIFIER',
+  eof: 'EOF',
+  colon: 'COLON',
+  newline: 'NEWLINE',
+  comment: 'COMMENT',
+  indent: 'INDENT',
+  invalid: 'INVALID',
+  number: 'NUMBER',
+  comma: 'COMMA'
 };
 
-/**
- * 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.
- */
+const VALID_PROP_VALUE_TOKENS = [TOKEN_TYPES.boolean, TOKEN_TYPES.string, TOKEN_TYPES.number];
 
-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}`);
+function isValidPropValueToken(token) {
+  return VALID_PROP_VALUE_TOKENS.indexOf(token.type) >= 0;
+}
+
+function* tokenise(input) {
+  let lastNewline = false;
+  let line = 1;
+  let col = 0;
+
+  function buildToken(type, value) {
+    return { line, col, type, value };
   }
 
-  input = REPLACEMENTS[input] || input;
-  let win32 = utils.isWindows(options);
+  while (input.length) {
+    let chop = 0;
 
-  // 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);
+    if (input[0] === '\n' || input[0] === '\r') {
+      chop++;
+      // If this is a \r\n line, ignore both chars but only add one new line
+      if (input[1] === '\n') {
+        chop++;
+      }
+      line++;
+      col = 0;
+      yield buildToken(TOKEN_TYPES.newline);
+    } else if (input[0] === '#') {
+      chop++;
 
-  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;
+      let val = '';
+      while (input[chop] !== '\n') {
+        val += input[chop];
+        chop++;
+      }
+      yield buildToken(TOKEN_TYPES.comment, val);
+    } else if (input[0] === ' ') {
+      if (lastNewline) {
+        let indent = '';
+        for (let i = 0; input[i] === ' '; i++) {
+          indent += input[i];
+        }
 
-  if (opts.capture) {
-    star = `(${star})`;
-  }
+        if (indent.length % 2) {
+          throw new TypeError('Invalid number of spaces');
+        } else {
+          chop = indent.length;
+          yield buildToken(TOKEN_TYPES.indent, indent.length / 2);
+        }
+      } else {
+        chop++;
+      }
+    } else if (input[0] === '"') {
+      let val = '';
 
-  const globstar = (opts) => {
-    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
-  };
+      for (let i = 0;; i++) {
+        const currentChar = input[i];
+        val += currentChar;
 
-  const create = str => {
-    switch (str) {
-      case '*':
-        return `${nodot}${ONE_CHAR}${star}`;
+        if (i > 0 && currentChar === '"') {
+          const isEscaped = input[i - 1] === '\\' && input[i - 2] !== '\\';
+          if (!isEscaped) {
+            break;
+          }
+        }
+      }
 
-      case '.*':
-        return `${DOT_LITERAL}${ONE_CHAR}${star}`;
+      chop = val.length;
 
-      case '*.*':
-        return `${nodot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
+      try {
+        yield buildToken(TOKEN_TYPES.string, JSON.parse(val));
+      } catch (err) {
+        if (err instanceof SyntaxError) {
+          yield buildToken(TOKEN_TYPES.invalid);
+        } else {
+          throw err;
+        }
+      }
+    } else if (/^[0-9]/.test(input)) {
+      let val = '';
+      for (let i = 0; /^[0-9]$/.test(input[i]); i++) {
+        val += input[i];
+      }
+      chop = val.length;
+
+      yield buildToken(TOKEN_TYPES.number, +val);
+    } else if (/^true/.test(input)) {
+      yield buildToken(TOKEN_TYPES.boolean, true);
+      chop = 4;
+    } else if (/^false/.test(input)) {
+      yield buildToken(TOKEN_TYPES.boolean, false);
+      chop = 5;
+    } else if (input[0] === ':') {
+      yield buildToken(TOKEN_TYPES.colon);
+      chop++;
+    } else if (input[0] === ',') {
+      yield buildToken(TOKEN_TYPES.comma);
+      chop++;
+    } else if (/^[a-zA-Z\/-]/g.test(input)) {
+      let name = '';
+      for (let i = 0; i < input.length; i++) {
+        const char = input[i];
+        if (char === ':' || char === ' ' || char === '\n' || char === '\r' || char === ',') {
+          break;
+        } else {
+          name += char;
+        }
+      }
+      chop = name.length;
 
-      case '*/*':
-        return `${nodot}${star}${SLASH_LITERAL}${ONE_CHAR}${slashDot}${star}`;
+      yield buildToken(TOKEN_TYPES.string, name);
+    } else {
+      yield buildToken(TOKEN_TYPES.invalid);
+    }
 
-      case '**':
-        return nodot + globstar(opts);
+    if (!chop) {
+      // will trigger infinite recursion
+      yield buildToken(TOKEN_TYPES.invalid);
+    }
 
-      case '**/*':
-        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${ONE_CHAR}${star}`;
+    col += chop;
+    lastNewline = input[0] === '\n' || input[0] === '\r' && input[1] === '\n';
+    input = input.slice(chop);
+  }
 
-      case '**/*.*':
-        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
+  yield buildToken(TOKEN_TYPES.eof);
+}
 
-      case '**/.*':
-        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${DOT_LITERAL}${ONE_CHAR}${star}`;
+class Parser {
+  constructor(input, fileLoc = 'lockfile') {
+    this.comments = [];
+    this.tokens = tokenise(input);
+    this.fileLoc = fileLoc;
+  }
 
-      default: {
-        let match = /^(.*?)\.(\w+)$/.exec(str);
-        if (!match) return;
+  onComment(token) {
+    const value = token.value;
+    (0, (_invariant || _load_invariant()).default)(typeof value === 'string', 'expected token value to be a string');
 
-        let source = create(match[1], options);
-        if (!source) return;
+    const comment = value.trim();
 
-        return source + DOT_LITERAL + match[2];
+    const versionMatch = comment.match(VERSION_REGEX);
+    if (versionMatch) {
+      const version = +versionMatch[1];
+      if (version > (_constants || _load_constants()).LOCKFILE_VERSION) {
+        throw new (_errors || _load_errors()).MessageError(`Can't install from a lockfile of version ${version} as you're on an old yarn version that only supports ` + `versions up to ${(_constants || _load_constants()).LOCKFILE_VERSION}. Run \`$ yarn self-update\` to upgrade to the latest version.`);
       }
     }
-  };
 
-  let output = create(input);
-  if (output && opts.strictSlashes !== true) {
-    output += `${SLASH_LITERAL}?`;
+    this.comments.push(comment);
   }
 
-  return output;
-};
-
-module.exports = parse;
+  next() {
+    const item = this.tokens.next();
+    (0, (_invariant || _load_invariant()).default)(item, 'expected a token');
 
+    const done = item.done,
+          value = item.value;
 
-/***/ }),
-/* 206 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (done || !value) {
+      throw new Error('No more tokens');
+    } else if (value.type === TOKEN_TYPES.comment) {
+      this.onComment(value);
+      return this.next();
+    } else {
+      return this.token = value;
+    }
+  }
 
-"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;
+  unexpected(msg = 'Unexpected token') {
+    throw new SyntaxError(`${msg} ${this.token.line}:${this.token.col} in ${this.fileLoc}`);
+  }
 
+  expect(tokType) {
+    if (this.token.type === tokType) {
+      this.next();
+    } else {
+      this.unexpected();
+    }
+  }
 
-/***/ }),
-/* 207 */
-/***/ (function(module, exports, __webpack_require__) {
+  eat(tokType) {
+    if (this.token.type === tokType) {
+      this.next();
+      return true;
+    } else {
+      return false;
+    }
+  }
 
-"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;
+  parse(indent = 0) {
+    const obj = (0, (_map || _load_map()).default)();
 
+    while (true) {
+      const propToken = this.token;
 
-/***/ }),
-/* 208 */
-/***/ (function(module, exports, __webpack_require__) {
+      if (propToken.type === TOKEN_TYPES.newline) {
+        const nextToken = this.next();
+        if (!indent) {
+          // if we have 0 indentation then the next token doesn't matter
+          continue;
+        }
 
-"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;
+        if (nextToken.type !== TOKEN_TYPES.indent) {
+          // if we have no indentation after a newline then we've gone down a level
+          break;
+        }
 
+        if (nextToken.value === indent) {
+          // all is good, the indent is on our level
+          this.next();
+        } else {
+          // the indentation is less than our level
+          break;
+        }
+      } else if (propToken.type === TOKEN_TYPES.indent) {
+        if (propToken.value === indent) {
+          this.next();
+        } else {
+          break;
+        }
+      } else if (propToken.type === TOKEN_TYPES.eof) {
+        break;
+      } else if (propToken.type === TOKEN_TYPES.string) {
+        // property key
+        const key = propToken.value;
+        (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
 
-/***/ }),
-/* 209 */
-/***/ (function(module, exports, __webpack_require__) {
+        const keys = [key];
+        this.next();
 
-"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);
-}
+        // support multiple keys
+        while (this.token.type === TOKEN_TYPES.comma) {
+          this.next(); // skip comma
 
+          const keyToken = this.token;
+          if (keyToken.type !== TOKEN_TYPES.string) {
+            this.unexpected('Expected string');
+          }
 
-/***/ }),
-/* 210 */
-/***/ (function(module, exports, __webpack_require__) {
+          const key = keyToken.value;
+          (0, (_invariant || _load_invariant()).default)(key, 'Expected a key');
+          keys.push(key);
+          this.next();
+        }
 
-"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);
-}
+        const valToken = this.token;
 
+        if (valToken.type === TOKEN_TYPES.colon) {
+          // object
+          this.next();
 
-/***/ }),
-/* 211 */
-/***/ (function(module, exports, __webpack_require__) {
+          // parse object
+          const val = this.parse(indent + 1);
 
-"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;
+          for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+            var _ref;
 
+            if (_isArray) {
+              if (_i >= _iterator.length) break;
+              _ref = _iterator[_i++];
+            } else {
+              _i = _iterator.next();
+              if (_i.done) break;
+              _ref = _i.value;
+            }
 
-/***/ }),
-/* 212 */
-/***/ (function(module, exports, __webpack_require__) {
+            const key = _ref;
 
-"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;
+            obj[key] = val;
+          }
 
+          if (indent && this.token.type !== TOKEN_TYPES.indent) {
+            break;
+          }
+        } else if (isValidPropValueToken(valToken)) {
+          // plain value
+          for (var _iterator2 = keys, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+            var _ref2;
+
+            if (_isArray2) {
+              if (_i2 >= _iterator2.length) break;
+              _ref2 = _iterator2[_i2++];
+            } else {
+              _i2 = _iterator2.next();
+              if (_i2.done) break;
+              _ref2 = _i2.value;
+            }
 
-/***/ }),
-/* 213 */
-/***/ (function(module, exports, __webpack_require__) {
+            const key = _ref2;
 
-"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;
+            obj[key] = valToken.value;
+          }
 
+          this.next();
+        } else {
+          this.unexpected('Invalid value type');
+        }
+      } else {
+        this.unexpected(`Unknown token: ${(_util || _load_util()).default.inspect(propToken)}`);
+      }
+    }
 
-/***/ }),
-/* 214 */
-/***/ (function(module, exports, __webpack_require__) {
+    return obj;
+  }
+}
 
-"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);
-}
+const MERGE_CONFLICT_ANCESTOR = '|||||||';
+const MERGE_CONFLICT_END = '>>>>>>>';
+const MERGE_CONFLICT_SEP = '=======';
+const MERGE_CONFLICT_START = '<<<<<<<';
 
+/**
+ * Extract the two versions of the lockfile from a merge conflict.
+ */
+function extractConflictVariants(str) {
+  const variants = [[], []];
+  const lines = str.split(/\r?\n/g);
+  let skip = false;
 
-/***/ }),
-/* 215 */
-/***/ (function(module, exports, __webpack_require__) {
+  while (lines.length) {
+    const line = lines.shift();
+    if (line.startsWith(MERGE_CONFLICT_START)) {
+      // get the first variant
+      while (lines.length) {
+        const conflictLine = lines.shift();
+        if (conflictLine === MERGE_CONFLICT_SEP) {
+          skip = false;
+          break;
+        } else if (skip || conflictLine.startsWith(MERGE_CONFLICT_ANCESTOR)) {
+          skip = true;
+          continue;
+        } else {
+          variants[0].push(conflictLine);
+        }
+      }
 
-"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);
-}
+      // get the second variant
+      while (lines.length) {
+        const conflictLine = lines.shift();
+        if (conflictLine.startsWith(MERGE_CONFLICT_END)) {
+          break;
+        } else {
+          variants[1].push(conflictLine);
+        }
+      }
+    } else {
+      variants[0].push(line);
+      variants[1].push(line);
+    }
+  }
 
+  return [variants[0].join('\n'), variants[1].join('\n')];
+}
 
-/***/ }),
-/* 216 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Check if a lockfile has merge conflicts.
+ */
+function hasMergeConflicts(str) {
+  return str.includes(MERGE_CONFLICT_START) && str.includes(MERGE_CONFLICT_SEP) && str.includes(MERGE_CONFLICT_END);
+}
 
-"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;
+/**
+ * Parse the lockfile.
+ */
+function parse(str, fileLoc) {
+  const parser = new Parser(str, fileLoc);
+  parser.next();
+  return parser.parse();
+}
 
+/**
+ * Parse and merge the two variants in a conflicted lockfile.
+ */
+function parseWithConflict(str, fileLoc) {
+  const variants = extractConflictVariants(str);
+  try {
+    return { type: 'merge', object: Object.assign({}, parse(variants[0], fileLoc), parse(variants[1], fileLoc)) };
+  } catch (err) {
+    if (err instanceof SyntaxError) {
+      return { type: 'conflict', object: {} };
+    } else {
+      throw err;
+    }
+  }
+}
 
 /***/ }),
-/* 217 */
+/* 82 */,
+/* 83 */,
+/* 84 */
 /***/ (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);
-}
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
+var _map;
 
-/***/ }),
-/* 219 */
-/***/ (function(module, exports) {
+function _load_map() {
+  return _map = _interopRequireDefault(__webpack_require__(20));
+}
 
-module.exports = runParallel
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function runParallel (tasks, cb) {
-  var results, pending, keys
-  var isSync = true
+const debug = __webpack_require__(212)('yarn');
 
-  if (Array.isArray(tasks)) {
-    results = []
-    pending = tasks.length
-  } else {
-    keys = Object.keys(tasks)
-    results = {}
-    pending = keys.length
+class BlockingQueue {
+  constructor(alias, maxConcurrency = Infinity) {
+    this.concurrencyQueue = [];
+    this.maxConcurrency = maxConcurrency;
+    this.runningCount = 0;
+    this.warnedStuck = false;
+    this.alias = alias;
+    this.first = true;
+
+    this.running = (0, (_map || _load_map()).default)();
+    this.queue = (0, (_map || _load_map()).default)();
+
+    this.stuckTick = this.stuckTick.bind(this);
   }
 
-  function done (err) {
-    function end () {
-      if (cb) cb(err, results)
-      cb = null
+  stillActive() {
+    if (this.stuckTimer) {
+      clearTimeout(this.stuckTimer);
     }
-    if (isSync) process.nextTick(end)
-    else end()
+
+    this.stuckTimer = setTimeout(this.stuckTick, 5000);
+
+    // We need to check the existence of unref because of https://github.com/facebook/jest/issues/4559
+    // $FlowFixMe: Node's setInterval returns a Timeout, not a Number
+    this.stuckTimer.unref && this.stuckTimer.unref();
   }
 
-  function each (i, err, result) {
-    results[i] = result
-    if (--pending === 0 || err) {
-      done(err)
+  stuckTick() {
+    if (this.runningCount === 1) {
+      this.warnedStuck = true;
+      debug(`The ${JSON.stringify(this.alias)} blocking queue may be stuck. 5 seconds ` + `without any activity with 1 worker: ${Object.keys(this.running)[0]}`);
     }
   }
 
-  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) })
-    })
+  push(key, factory) {
+    if (this.first) {
+      this.first = false;
+    } else {
+      this.stillActive();
+    }
+
+    return new Promise((resolve, reject) => {
+      // we're already running so push ourselves to the queue
+      const queue = this.queue[key] = this.queue[key] || [];
+      queue.push({ factory, resolve, reject });
+
+      if (!this.running[key]) {
+        this.shift(key);
+      }
+    });
   }
 
-  isSync = false
+  shift(key) {
+    if (this.running[key]) {
+      delete this.running[key];
+      this.runningCount--;
+
+      if (this.stuckTimer) {
+        clearTimeout(this.stuckTimer);
+        this.stuckTimer = null;
+      }
+
+      if (this.warnedStuck) {
+        this.warnedStuck = false;
+        debug(`${JSON.stringify(this.alias)} blocking queue finally resolved. Nothing to worry about.`);
+      }
+    }
+
+    const queue = this.queue[key];
+    if (!queue) {
+      return;
+    }
+
+    var _queue$shift = queue.shift();
+
+    const resolve = _queue$shift.resolve,
+          reject = _queue$shift.reject,
+          factory = _queue$shift.factory;
+
+    if (!queue.length) {
+      delete this.queue[key];
+    }
+
+    const next = () => {
+      this.shift(key);
+      this.shiftConcurrencyQueue();
+    };
+
+    const run = () => {
+      this.running[key] = true;
+      this.runningCount++;
+
+      factory().then(function (val) {
+        resolve(val);
+        next();
+        return null;
+      }).catch(function (err) {
+        reject(err);
+        next();
+      });
+    };
+
+    this.maybePushConcurrencyQueue(run);
+  }
+
+  maybePushConcurrencyQueue(run) {
+    if (this.runningCount < this.maxConcurrency) {
+      run();
+    } else {
+      this.concurrencyQueue.push(run);
+    }
+  }
+
+  shiftConcurrencyQueue() {
+    if (this.runningCount < this.maxConcurrency) {
+      const fn = this.concurrencyQueue.shift();
+      if (fn) {
+        fn();
+      }
+    }
+  }
 }
+exports.default = BlockingQueue;
+
+/***/ }),
+/* 85 */
+/***/ (function(module, exports) {
+
+module.exports = function (exec) {
+  try {
+    return !!exec();
+  } catch (e) {
+    return true;
+  }
+};
 
 
 /***/ }),
-/* 220 */
+/* 86 */,
+/* 87 */,
+/* 88 */,
+/* 89 */,
+/* 90 */,
+/* 91 */,
+/* 92 */,
+/* 93 */,
+/* 94 */,
+/* 95 */,
+/* 96 */,
+/* 97 */,
+/* 98 */,
+/* 99 */,
+/* 100 */
 /***/ (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);
+// getting tag from 19.1.3.6 Object.prototype.toString()
+var cof = __webpack_require__(47);
+var TAG = __webpack_require__(13)('toStringTag');
+// ES3 wrong here
+var ARG = cof(function () { return arguments; }()) == 'Arguments';
+
+// fallback for IE11 Script Access Denied error
+var tryGet = function (it, key) {
+  try {
+    return it[key];
+  } catch (e) { /* empty */ }
+};
+
+module.exports = function (it) {
+  var O, T, B;
+  return it === undefined ? 'Undefined' : it === null ? 'Null'
+    // @@toStringTag case
+    : typeof (T = tryGet(O = Object(it), TAG)) == 'string' ? T
+    // builtinTag case
+    : ARG ? cof(O)
+    // ES3 arguments fallback
+    : (B = cof(O)) == 'Object' && typeof O.callee == 'function' ? 'Arguments' : B;
+};
 
 
 /***/ }),
-/* 221 */
-/***/ (function(module, exports, __webpack_require__) {
+/* 101 */
+/***/ (function(module, exports) {
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __webpack_require__(222);
-exports.fs = fs;
+// IE 8- don't enum bug keys
+module.exports = (
+  'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'
+).split(',');
 
 
 /***/ }),
-/* 222 */
+/* 102 */
 /***/ (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;
+var document = __webpack_require__(11).document;
+module.exports = document && document.documentElement;
 
 
 /***/ }),
-/* 223 */
+/* 103 */
 /***/ (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;
+
+var LIBRARY = __webpack_require__(69);
+var $export = __webpack_require__(41);
+var redefine = __webpack_require__(197);
+var hide = __webpack_require__(31);
+var Iterators = __webpack_require__(35);
+var $iterCreate = __webpack_require__(188);
+var setToStringTag = __webpack_require__(71);
+var getPrototypeOf = __webpack_require__(194);
+var ITERATOR = __webpack_require__(13)('iterator');
+var BUGGY = !([].keys && 'next' in [].keys()); // Safari has buggy iterators w/o `next`
+var FF_ITERATOR = '@@iterator';
+var KEYS = 'keys';
+var VALUES = 'values';
+
+var returnThis = function () { return this; };
+
+module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED) {
+  $iterCreate(Constructor, NAME, next);
+  var getMethod = function (kind) {
+    if (!BUGGY && kind in proto) return proto[kind];
+    switch (kind) {
+      case KEYS: return function keys() { return new Constructor(this, kind); };
+      case VALUES: return function values() { return new Constructor(this, kind); };
+    } return function entries() { return new Constructor(this, kind); };
+  };
+  var TAG = NAME + ' Iterator';
+  var DEF_VALUES = DEFAULT == VALUES;
+  var VALUES_BUG = false;
+  var proto = Base.prototype;
+  var $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT];
+  var $default = $native || getMethod(DEFAULT);
+  var $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined;
+  var $anyNative = NAME == 'Array' ? proto.entries || $native : $native;
+  var methods, key, IteratorPrototype;
+  // Fix native
+  if ($anyNative) {
+    IteratorPrototype = getPrototypeOf($anyNative.call(new Base()));
+    if (IteratorPrototype !== Object.prototype && IteratorPrototype.next) {
+      // Set @@toStringTag to native iterators
+      setToStringTag(IteratorPrototype, TAG, true);
+      // fix for some old engines
+      if (!LIBRARY && typeof IteratorPrototype[ITERATOR] != 'function') hide(IteratorPrototype, ITERATOR, returnThis);
+    }
+  }
+  // fix Array#{values, @@iterator}.name in V8 / FF
+  if (DEF_VALUES && $native && $native.name !== VALUES) {
+    VALUES_BUG = true;
+    $default = function values() { return $native.call(this); };
+  }
+  // Define iterator
+  if ((!LIBRARY || FORCED) && (BUGGY || VALUES_BUG || !proto[ITERATOR])) {
+    hide(proto, ITERATOR, $default);
+  }
+  // Plug for library
+  Iterators[NAME] = $default;
+  Iterators[TAG] = returnThis;
+  if (DEFAULT) {
+    methods = {
+      values: DEF_VALUES ? $default : getMethod(VALUES),
+      keys: IS_SET ? $default : getMethod(KEYS),
+      entries: $entries
+    };
+    if (FORCED) for (key in methods) {
+      if (!(key in proto)) redefine(proto, key, methods[key]);
+    } else $export($export.P + $export.F * (BUGGY || VALUES_BUG), NAME, methods);
+  }
+  return methods;
+};
 
 
 /***/ }),
-/* 224 */
+/* 104 */
+/***/ (function(module, exports) {
+
+module.exports = function (exec) {
+  try {
+    return { e: false, v: exec() };
+  } catch (e) {
+    return { e: true, v: e };
+  }
+};
+
+
+/***/ }),
+/* 105 */
 /***/ (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;
+var anObject = __webpack_require__(27);
+var isObject = __webpack_require__(34);
+var newPromiseCapability = __webpack_require__(70);
+
+module.exports = function (C, x) {
+  anObject(C);
+  if (isObject(x) && x.constructor === C) return x;
+  var promiseCapability = newPromiseCapability.f(C);
+  var resolve = promiseCapability.resolve;
+  resolve(x);
+  return promiseCapability.promise;
+};
 
 
 /***/ }),
-/* 225 */
+/* 106 */
+/***/ (function(module, exports) {
+
+module.exports = function (bitmap, value) {
+  return {
+    enumerable: !(bitmap & 1),
+    configurable: !(bitmap & 2),
+    writable: !(bitmap & 4),
+    value: value
+  };
+};
+
+
+/***/ }),
+/* 107 */
 /***/ (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;
+var core = __webpack_require__(23);
+var global = __webpack_require__(11);
+var SHARED = '__core-js_shared__';
+var store = global[SHARED] || (global[SHARED] = {});
+
+(module.exports = function (key, value) {
+  return store[key] || (store[key] = value !== undefined ? value : {});
+})('versions', []).push({
+  version: core.version,
+  mode: __webpack_require__(69) ? 'pure' : 'global',
+  copyright: '© 2018 Denis Pushkarev (zloirock.ru)'
+});
 
 
 /***/ }),
-/* 226 */
+/* 108 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+// 7.3.20 SpeciesConstructor(O, defaultConstructor)
+var anObject = __webpack_require__(27);
+var aFunction = __webpack_require__(46);
+var SPECIES = __webpack_require__(13)('species');
+module.exports = function (O, D) {
+  var C = anObject(O).constructor;
+  var S;
+  return C === undefined || (S = anObject(C)[SPECIES]) == undefined ? D : aFunction(S);
+};
 
 
-var reusify = __webpack_require__(227)
+/***/ }),
+/* 109 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function fastqueue (context, worker, concurrency) {
-  if (typeof context === 'function') {
-    concurrency = worker
-    worker = context
-    context = null
+var ctx = __webpack_require__(48);
+var invoke = __webpack_require__(185);
+var html = __webpack_require__(102);
+var cel = __webpack_require__(68);
+var global = __webpack_require__(11);
+var process = global.process;
+var setTask = global.setImmediate;
+var clearTask = global.clearImmediate;
+var MessageChannel = global.MessageChannel;
+var Dispatch = global.Dispatch;
+var counter = 0;
+var queue = {};
+var ONREADYSTATECHANGE = 'onreadystatechange';
+var defer, channel, port;
+var run = function () {
+  var id = +this;
+  // eslint-disable-next-line no-prototype-builtins
+  if (queue.hasOwnProperty(id)) {
+    var fn = queue[id];
+    delete queue[id];
+    fn();
+  }
+};
+var listener = function (event) {
+  run.call(event.data);
+};
+// Node.js 0.9+ & IE10+ has setImmediate, otherwise:
+if (!setTask || !clearTask) {
+  setTask = function setImmediate(fn) {
+    var args = [];
+    var i = 1;
+    while (arguments.length > i) args.push(arguments[i++]);
+    queue[++counter] = function () {
+      // eslint-disable-next-line no-new-func
+      invoke(typeof fn == 'function' ? fn : Function(fn), args);
+    };
+    defer(counter);
+    return counter;
+  };
+  clearTask = function clearImmediate(id) {
+    delete queue[id];
+  };
+  // Node.js 0.8-
+  if (__webpack_require__(47)(process) == 'process') {
+    defer = function (id) {
+      process.nextTick(ctx(run, id, 1));
+    };
+  // Sphere (JS game engine) Dispatch API
+  } else if (Dispatch && Dispatch.now) {
+    defer = function (id) {
+      Dispatch.now(ctx(run, id, 1));
+    };
+  // Browsers with MessageChannel, includes WebWorkers
+  } else if (MessageChannel) {
+    channel = new MessageChannel();
+    port = channel.port2;
+    channel.port1.onmessage = listener;
+    defer = ctx(port.postMessage, port, 1);
+  // Browsers with postMessage, skip WebWorkers
+  // IE8 has postMessage, but it's sync & typeof its postMessage is 'object'
+  } else if (global.addEventListener && typeof postMessage == 'function' && !global.importScripts) {
+    defer = function (id) {
+      global.postMessage(id + '', '*');
+    };
+    global.addEventListener('message', listener, false);
+  // IE8-
+  } else if (ONREADYSTATECHANGE in cel('script')) {
+    defer = function (id) {
+      html.appendChild(cel('script'))[ONREADYSTATECHANGE] = function () {
+        html.removeChild(this);
+        run.call(id);
+      };
+    };
+  // Rest old browsers
+  } else {
+    defer = function (id) {
+      setTimeout(ctx(run, id, 1), 0);
+    };
   }
+}
+module.exports = {
+  set: setTask,
+  clear: clearTask
+};
 
-  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
-  }
+/***/ }),
+/* 110 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return self
+// 7.1.15 ToLength
+var toInteger = __webpack_require__(73);
+var min = Math.min;
+module.exports = function (it) {
+  return it > 0 ? min(toInteger(it), 0x1fffffffffffff) : 0; // pow(2, 53) - 1 == 9007199254740991
+};
 
-  function running () {
-    return _running
-  }
 
-  function pause () {
-    self.paused = true
-  }
+/***/ }),
+/* 111 */
+/***/ (function(module, exports) {
 
-  function length () {
-    var current = queueHead
-    var counter = 0
+var id = 0;
+var px = Math.random();
+module.exports = function (key) {
+  return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
+};
 
-    while (current) {
-      current = current.next
-      counter++
-    }
 
-    return counter
-  }
+/***/ }),
+/* 112 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  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
-  }
+/**
+ * This is the common logic for both the Node.js and web browser
+ * implementations of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-  function push (value, done) {
-    var current = cache.get()
+exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
+exports.coerce = coerce;
+exports.disable = disable;
+exports.enable = enable;
+exports.enabled = enabled;
+exports.humanize = __webpack_require__(229);
 
-    current.context = context
-    current.release = release
-    current.value = value
-    current.callback = done || noop
+/**
+ * Active `debug` instances.
+ */
+exports.instances = [];
 
-    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)
-    }
+/**
+ * The currently active debug mode names, and names to skip.
+ */
+
+exports.names = [];
+exports.skips = [];
+
+/**
+ * Map of special "%n" handling functions, for the debug "format" argument.
+ *
+ * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
+ */
+
+exports.formatters = {};
+
+/**
+ * Select a color.
+ * @param {String} namespace
+ * @return {Number}
+ * @api private
+ */
+
+function selectColor(namespace) {
+  var hash = 0, i;
+
+  for (i in namespace) {
+    hash  = ((hash << 5) - hash) + namespace.charCodeAt(i);
+    hash |= 0; // Convert to 32bit integer
   }
 
-  function unshift (value, done) {
-    var current = cache.get()
+  return exports.colors[Math.abs(hash) % exports.colors.length];
+}
 
-    current.context = context
-    current.release = release
-    current.value = value
-    current.callback = done || noop
+/**
+ * Create a debugger with the given `namespace`.
+ *
+ * @param {String} namespace
+ * @return {Function}
+ * @api public
+ */
 
-    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 createDebug(namespace) {
+
+  var prevTime;
+
+  function debug() {
+    // disabled?
+    if (!debug.enabled) return;
+
+    var self = debug;
+
+    // set `diff` timestamp
+    var curr = +new Date();
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
+    self.prev = prevTime;
+    self.curr = curr;
+    prevTime = curr;
+
+    // turn the `arguments` into a proper Array
+    var args = new Array(arguments.length);
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i];
     }
-  }
 
-  function release (holder) {
-    if (holder) {
-      cache.release(holder)
+    args[0] = exports.coerce(args[0]);
+
+    if ('string' !== typeof args[0]) {
+      // anything else let's inspect with %O
+      args.unshift('%O');
     }
-    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--
+
+    // apply any `formatters` transformations
+    var index = 0;
+    args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) {
+      // if we encounter an escaped % then don't increase the array index
+      if (match === '%%') return match;
+      index++;
+      var formatter = exports.formatters[format];
+      if ('function' === typeof formatter) {
+        var val = args[index];
+        match = formatter.call(self, val);
+
+        // now we need to remove `args[index]` since it's inlined in the `format`
+        args.splice(index, 1);
+        index--;
       }
-    } else if (--_running === 0) {
-      self.drain()
-    }
+      return match;
+    });
+
+    // apply env-specific formatting (colors, etc.)
+    exports.formatArgs.call(self, args);
+
+    var logFn = debug.log || exports.log || console.log.bind(console);
+    logFn.apply(self, args);
+  }
+
+  debug.namespace = namespace;
+  debug.enabled = exports.enabled(namespace);
+  debug.useColors = exports.useColors();
+  debug.color = selectColor(namespace);
+  debug.destroy = destroy;
+
+  // env-specific initialization logic for debug instances
+  if ('function' === typeof exports.init) {
+    exports.init(debug);
+  }
+
+  exports.instances.push(debug);
+
+  return debug;
+}
+
+function destroy () {
+  var index = exports.instances.indexOf(this);
+  if (index !== -1) {
+    exports.instances.splice(index, 1);
+    return true;
+  } else {
+    return false;
   }
+}
 
-  function kill () {
-    queueHead = null
-    queueTail = null
-    self.drain = noop
+/**
+ * Enables a debug mode by namespaces. This can include modes
+ * separated by a colon and wildcards.
+ *
+ * @param {String} namespaces
+ * @api public
+ */
+
+function enable(namespaces) {
+  exports.save(namespaces);
+
+  exports.names = [];
+  exports.skips = [];
+
+  var i;
+  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
+  var len = split.length;
+
+  for (i = 0; i < len; i++) {
+    if (!split[i]) continue; // ignore empty strings
+    namespaces = split[i].replace(/\*/g, '.*?');
+    if (namespaces[0] === '-') {
+      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
+    } else {
+      exports.names.push(new RegExp('^' + namespaces + '$'));
+    }
   }
 
-  function killAndDrain () {
-    queueHead = null
-    queueTail = null
-    self.drain()
-    self.drain = noop
+  for (i = 0; i < exports.instances.length; i++) {
+    var instance = exports.instances[i];
+    instance.enabled = exports.enabled(instance.namespace);
   }
 }
 
-function noop () {}
+/**
+ * Disable debug output.
+ *
+ * @api public
+ */
 
-function Task () {
-  this.value = null
-  this.callback = noop
-  this.next = null
-  this.release = noop
-  this.context = null
+function disable() {
+  exports.enable('');
+}
 
-  var self = this
+/**
+ * Returns true if the given mode name is enabled, false otherwise.
+ *
+ * @param {String} name
+ * @return {Boolean}
+ * @api public
+ */
 
-  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)
+function enabled(name) {
+  if (name[name.length - 1] === '*') {
+    return true;
+  }
+  var i, len;
+  for (i = 0, len = exports.skips.length; i < len; i++) {
+    if (exports.skips[i].test(name)) {
+      return false;
+    }
+  }
+  for (i = 0, len = exports.names.length; i < len; i++) {
+    if (exports.names[i].test(name)) {
+      return true;
+    }
   }
+  return false;
 }
 
-module.exports = fastqueue
+/**
+ * Coerce `val`.
+ *
+ * @param {Mixed} val
+ * @return {Mixed}
+ * @api private
+ */
+
+function coerce(val) {
+  if (val instanceof Error) return val.stack || val.message;
+  return val;
+}
 
 
 /***/ }),
-/* 227 */
+/* 113 */,
+/* 114 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
+module.exports = realpath
+realpath.realpath = realpath
+realpath.sync = realpathSync
+realpath.realpathSync = realpathSync
+realpath.monkeypatch = monkeypatch
+realpath.unmonkeypatch = unmonkeypatch
 
-function reusify (Constructor) {
-  var head = new Constructor()
-  var tail = head
+var fs = __webpack_require__(3)
+var origRealpath = fs.realpath
+var origRealpathSync = fs.realpathSync
 
-  function get () {
-    var current = head
+var version = process.version
+var ok = /^v[0-5]\./.test(version)
+var old = __webpack_require__(217)
 
-    if (current.next) {
-      head = current.next
-    } else {
-      head = new Constructor()
-      tail = head
-    }
+function newError (er) {
+  return er && er.syscall === 'realpath' && (
+    er.code === 'ELOOP' ||
+    er.code === 'ENOMEM' ||
+    er.code === 'ENAMETOOLONG'
+  )
+}
 
-    current.next = null
+function realpath (p, cache, cb) {
+  if (ok) {
+    return origRealpath(p, cache, cb)
+  }
 
-    return current
+  if (typeof cache === 'function') {
+    cb = cache
+    cache = null
   }
+  origRealpath(p, cache, function (er, result) {
+    if (newError(er)) {
+      old.realpath(p, cache, cb)
+    } else {
+      cb(er, result)
+    }
+  })
+}
 
-  function release (obj) {
-    tail.next = obj
-    tail = obj
+function realpathSync (p, cache) {
+  if (ok) {
+    return origRealpathSync(p, cache)
   }
 
-  return {
-    get: get,
-    release: release
+  try {
+    return origRealpathSync(p, cache)
+  } catch (er) {
+    if (newError(er)) {
+      return old.realpathSync(p, cache)
+    } else {
+      throw er
+    }
   }
 }
 
-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__) {
+function monkeypatch () {
+  fs.realpath = realpath
+  fs.realpathSync = realpathSync
+}
 
-"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;
+function unmonkeypatch () {
+  fs.realpath = origRealpath
+  fs.realpathSync = origRealpathSync
+}
 
 
 /***/ }),
-/* 230 */
+/* 115 */
 /***/ (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;
-
+exports.alphasort = alphasort
+exports.alphasorti = alphasorti
+exports.setopts = setopts
+exports.ownProp = ownProp
+exports.makeAbs = makeAbs
+exports.finish = finish
+exports.mark = mark
+exports.isIgnored = isIgnored
+exports.childrenIgnored = childrenIgnored
 
-/***/ }),
-/* 231 */
-/***/ (function(module, exports, __webpack_require__) {
+function ownProp (obj, field) {
+  return Object.prototype.hasOwnProperty.call(obj, field)
+}
 
-"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;
+var path = __webpack_require__(0)
+var minimatch = __webpack_require__(60)
+var isAbsolute = __webpack_require__(76)
+var Minimatch = minimatch.Minimatch
 
+function alphasorti (a, b) {
+  return a.toLowerCase().localeCompare(b.toLowerCase())
+}
 
-/***/ }),
-/* 232 */
-/***/ (function(module, exports, __webpack_require__) {
+function alphasort (a, b) {
+  return a.localeCompare(b)
+}
 
-"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;
+function setupIgnores (self, options) {
+  self.ignore = options.ignore || []
 
+  if (!Array.isArray(self.ignore))
+    self.ignore = [self.ignore]
 
-/***/ }),
-/* 233 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (self.ignore.length) {
+    self.ignore = self.ignore.map(ignoreMap)
+  }
+}
 
-"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;
+// ignore patterns are always in dot:true mode.
+function ignoreMap (pattern) {
+  var gmatcher = null
+  if (pattern.slice(-3) === '/**') {
+    var gpattern = pattern.replace(/(\/\*\*)+$/, '')
+    gmatcher = new Minimatch(gpattern, { dot: true })
+  }
 
+  return {
+    matcher: new Minimatch(pattern, { dot: true }),
+    gmatcher: gmatcher
+  }
+}
 
-/***/ }),
-/* 234 */
-/***/ (function(module, exports, __webpack_require__) {
+function setopts (self, pattern, options) {
+  if (!options)
+    options = {}
 
-"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;
+  // base-matching: just use globstar for that.
+  if (options.matchBase && -1 === pattern.indexOf("/")) {
+    if (options.noglobstar) {
+      throw new Error("base matching requires globstar")
+    }
+    pattern = "**/" + pattern
+  }
 
+  self.silent = !!options.silent
+  self.pattern = pattern
+  self.strict = options.strict !== false
+  self.realpath = !!options.realpath
+  self.realpathCache = options.realpathCache || Object.create(null)
+  self.follow = !!options.follow
+  self.dot = !!options.dot
+  self.mark = !!options.mark
+  self.nodir = !!options.nodir
+  if (self.nodir)
+    self.mark = true
+  self.sync = !!options.sync
+  self.nounique = !!options.nounique
+  self.nonull = !!options.nonull
+  self.nosort = !!options.nosort
+  self.nocase = !!options.nocase
+  self.stat = !!options.stat
+  self.noprocess = !!options.noprocess
+  self.absolute = !!options.absolute
 
-/***/ }),
-/* 235 */
-/***/ (function(module, exports, __webpack_require__) {
+  self.maxLength = options.maxLength || Infinity
+  self.cache = options.cache || Object.create(null)
+  self.statCache = options.statCache || Object.create(null)
+  self.symlinks = options.symlinks || Object.create(null)
 
-"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;
+  setupIgnores(self, options)
 
+  self.changedCwd = false
+  var cwd = process.cwd()
+  if (!ownProp(options, "cwd"))
+    self.cwd = cwd
+  else {
+    self.cwd = path.resolve(options.cwd)
+    self.changedCwd = self.cwd !== cwd
+  }
 
-/***/ }),
-/* 236 */
-/***/ (function(module, exports, __webpack_require__) {
+  self.root = options.root || path.resolve(self.cwd, "/")
+  self.root = path.resolve(self.root)
+  if (process.platform === "win32")
+    self.root = self.root.replace(/\\/g, "/")
 
-"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;
+  // TODO: is an absolute `cwd` supposed to be resolved against `root`?
+  // e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test')
+  self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd)
+  if (process.platform === "win32")
+    self.cwdAbs = self.cwdAbs.replace(/\\/g, "/")
+  self.nomount = !!options.nomount
 
+  // disable comments and negation in Minimatch.
+  // Note that they are not supported in Glob itself anyway.
+  options.nonegate = true
+  options.nocomment = true
 
-/***/ }),
-/* 237 */
-/***/ (function(module, exports, __webpack_require__) {
+  self.minimatch = new Minimatch(pattern, options)
+  self.options = self.minimatch.options
+}
 
-"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;
+function finish (self) {
+  var nou = self.nounique
+  var all = nou ? [] : Object.create(null)
 
+  for (var i = 0, l = self.matches.length; i < l; i ++) {
+    var matches = self.matches[i]
+    if (!matches || Object.keys(matches).length === 0) {
+      if (self.nonull) {
+        // do like the shell, and spit out the literal glob
+        var literal = self.minimatch.globSet[i]
+        if (nou)
+          all.push(literal)
+        else
+          all[literal] = true
+      }
+    } else {
+      // had matches
+      var m = Object.keys(matches)
+      if (nou)
+        all.push.apply(all, m)
+      else
+        m.forEach(function (m) {
+          all[m] = true
+        })
+    }
+  }
 
-/***/ }),
-/* 238 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!nou)
+    all = Object.keys(all)
 
-"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;
+  if (!self.nosort)
+    all = all.sort(self.nocase ? alphasorti : alphasort)
 
+  // at *some* point we statted all of these
+  if (self.mark) {
+    for (var i = 0; i < all.length; i++) {
+      all[i] = self._mark(all[i])
+    }
+    if (self.nodir) {
+      all = all.filter(function (e) {
+        var notDir = !(/\/$/.test(e))
+        var c = self.cache[e] || self.cache[makeAbs(self, e)]
+        if (notDir && c)
+          notDir = c !== 'DIR' && !Array.isArray(c)
+        return notDir
+      })
+    }
+  }
 
-/***/ }),
-/* 239 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (self.ignore.length)
+    all = all.filter(function(m) {
+      return !isIgnored(self, m)
+    })
 
-"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;
+  self.found = all
+}
 
+function mark (self, p) {
+  var abs = makeAbs(self, p)
+  var c = self.cache[abs]
+  var m = p
+  if (c) {
+    var isDir = c === 'DIR' || Array.isArray(c)
+    var slash = p.slice(-1) === '/'
 
-/***/ }),
-/* 240 */
-/***/ (function(module, exports, __webpack_require__) {
+    if (isDir && !slash)
+      m += '/'
+    else if (!isDir && slash)
+      m = m.slice(0, -1)
 
-"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;
+    if (m !== p) {
+      var mabs = makeAbs(self, m)
+      self.statCache[mabs] = self.statCache[abs]
+      self.cache[mabs] = self.cache[abs]
+    }
+  }
 
+  return m
+}
 
-/***/ }),
-/* 241 */
-/***/ (function(module, exports, __webpack_require__) {
+// lotta situps...
+function makeAbs (self, f) {
+  var abs = f
+  if (f.charAt(0) === '/') {
+    abs = path.join(self.root, f)
+  } else if (isAbsolute(f) || f === '') {
+    abs = f
+  } else if (self.changedCwd) {
+    abs = path.resolve(self.cwd, f)
+  } else {
+    abs = path.resolve(f)
+  }
 
-"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;
+  if (process.platform === 'win32')
+    abs = abs.replace(/\\/g, '/')
 
+  return abs
+}
 
-/***/ }),
-/* 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;
+// Return true, if pattern ends with globstar '**', for the accompanying parent directory.
+// Ex:- If node_modules/** is the pattern, add 'node_modules' to ignore list along with it's contents
+function isIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
+
+  return self.ignore.some(function(item) {
+    return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
+
+function childrenIgnored (self, path) {
+  if (!self.ignore.length)
+    return false
+
+  return self.ignore.some(function(item) {
+    return !!(item.gmatcher && item.gmatcher.match(path))
+  })
+}
 
 
 /***/ }),
-/* 243 */
+/* 116 */
 /***/ (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;
+var path = __webpack_require__(0);
+var fs = __webpack_require__(3);
+var _0777 = parseInt('0777', 8);
 
+module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP;
 
-/***/ }),
-/* 244 */
-/***/ (function(module, exports, __webpack_require__) {
+function mkdirP (p, opts, f, made) {
+    if (typeof opts === 'function') {
+        f = opts;
+        opts = {};
+    }
+    else if (!opts || typeof opts !== 'object') {
+        opts = { mode: opts };
+    }
+    
+    var mode = opts.mode;
+    var xfs = opts.fs || fs;
+    
+    if (mode === undefined) {
+        mode = _0777 & (~process.umask());
+    }
+    if (!made) made = null;
+    
+    var cb = f || function () {};
+    p = path.resolve(p);
+    
+    xfs.mkdir(p, mode, function (er) {
+        if (!er) {
+            made = made || p;
+            return cb(null, made);
+        }
+        switch (er.code) {
+            case 'ENOENT':
+                mkdirP(path.dirname(p), opts, function (er, made) {
+                    if (er) cb(er, made);
+                    else mkdirP(p, opts, cb, made);
+                });
+                break;
+
+            // In the case of any other error, just see if there's a dir
+            // there already.  If so, then hooray!  If not, then something
+            // is borked.
+            default:
+                xfs.stat(p, function (er2, stat) {
+                    // if the stat fails, then that's super weird.
+                    // let the original error be the failure reason.
+                    if (er2 || !stat.isDirectory()) cb(er, made)
+                    else cb(null, made);
+                });
+                break;
+        }
+    });
+}
+
+mkdirP.sync = function sync (p, opts, made) {
+    if (!opts || typeof opts !== 'object') {
+        opts = { mode: opts };
+    }
+    
+    var mode = opts.mode;
+    var xfs = opts.fs || fs;
+    
+    if (mode === undefined) {
+        mode = _0777 & (~process.umask());
+    }
+    if (!made) made = null;
 
-"use strict";
+    p = path.resolve(p);
 
-const path = __webpack_require__(16);
-const pathType = __webpack_require__(245);
+    try {
+        xfs.mkdirSync(p, mode);
+        made = made || p;
+    }
+    catch (err0) {
+        switch (err0.code) {
+            case 'ENOENT' :
+                made = sync(path.dirname(p), opts, made);
+                sync(p, opts, made);
+                break;
 
-const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
+            // In the case of any other error, just see if there's a dir
+            // there already.  If so, then hooray!  If not, then something
+            // is borked.
+            default:
+                var stat;
+                try {
+                    stat = xfs.statSync(p);
+                }
+                catch (err1) {
+                    throw err0;
+                }
+                if (!stat.isDirectory()) throw err0;
+                break;
+        }
+    }
 
-const getPath = (filepath, cwd) => {
-	const pth = filepath[0] === '!' ? filepath.slice(1) : filepath;
-	return path.isAbsolute(pth) ? pth : path.join(cwd, pth);
+    return made;
 };
 
-const addExtensions = (file, extensions) => {
-	if (path.extname(file)) {
-		return `**/${file}`;
-	}
 
-	return `**/${file}.${getExtensions(extensions)}`;
-};
+/***/ }),
+/* 117 */,
+/* 118 */,
+/* 119 */,
+/* 120 */,
+/* 121 */,
+/* 122 */
+/***/ (function(module, exports, __webpack_require__) {
 
-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}\``);
-	}
+"use strict";
 
-	if (options.extensions && !Array.isArray(options.extensions)) {
-		throw new TypeError(`Expected \`extensions\` to be of type \`Array\` but received type \`${typeof options.extensions}\``);
+module.exports = x => {
+	if (typeof x !== 'string') {
+		throw new TypeError('Expected a string, got ' + typeof x);
 	}
 
-	if (options.files && options.extensions) {
-		return options.files.map(x => path.posix.join(directory, addExtensions(x, options.extensions)));
+	// Catches EFBBBF (UTF-8 BOM) because the buffer-to-string
+	// conversion translates it to FEFF (UTF-16 BOM)
+	if (x.charCodeAt(0) === 0xFEFF) {
+		return x.slice(1);
 	}
 
-	if (options.files) {
-		return options.files.map(x => path.posix.join(directory, `**/${x}`));
-	}
+	return x;
+};
 
-	if (options.extensions) {
-		return [path.posix.join(directory, `**/*.${getExtensions(options.extensions)}`)];
-	}
 
-	return [path.posix.join(directory, '**')];
-};
+/***/ }),
+/* 123 */
+/***/ (function(module, exports) {
 
-module.exports = async (input, options) => {
-	options = {
-		cwd: process.cwd(),
-		...options
-	};
+// Returns a wrapper function that returns a wrapped callback
+// The wrapper function should do some stuff, and return a
+// presumably different callback function.
+// This makes sure that own properties are retained, so that
+// decorations and such are not lost along the way.
+module.exports = wrappy
+function wrappy (fn, cb) {
+  if (fn && cb) return wrappy(fn)(cb)
 
-	if (typeof options.cwd !== 'string') {
-		throw new TypeError(`Expected \`cwd\` to be of type \`string\` but received type \`${typeof options.cwd}\``);
-	}
+  if (typeof fn !== 'function')
+    throw new TypeError('need wrapper function')
 
-	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;
-	}));
+  Object.keys(fn).forEach(function (k) {
+    wrapper[k] = fn[k]
+  })
 
-	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
-};
+  return wrapper
 
-module.exports.sync = (input, options) => {
-	options = {
-		cwd: process.cwd(),
-		...options
-	};
+  function wrapper() {
+    var args = new Array(arguments.length)
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i]
+    }
+    var ret = fn.apply(this, args)
+    var cb = args[args.length-1]
+    if (typeof ret === 'function' && ret !== cb) {
+      Object.keys(cb).forEach(function (k) {
+        ret[k] = cb[k]
+      })
+    }
+    return ret
+  }
+}
 
-	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);
+/***/ }),
+/* 124 */,
+/* 125 */,
+/* 126 */,
+/* 127 */,
+/* 128 */,
+/* 129 */,
+/* 130 */,
+/* 131 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
+// fallback for non-array-like ES3 and non-enumerable old V8 strings
+var cof = __webpack_require__(47);
+// eslint-disable-next-line no-prototype-builtins
+module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
+  return cof(it) == 'String' ? it.split('') : Object(it);
 };
 
 
 /***/ }),
-/* 245 */
+/* 132 */
 /***/ (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}`);
-	}
+// 19.1.2.14 / 15.2.3.14 Object.keys(O)
+var $keys = __webpack_require__(195);
+var enumBugKeys = __webpack_require__(101);
 
-	try {
-		const stats = await promisify(fs[fsStatType])(filePath);
-		return stats[statsMethodName]();
-	} catch (error) {
-		if (error.code === 'ENOENT') {
-			return false;
-		}
+module.exports = Object.keys || function keys(O) {
+  return $keys(O, enumBugKeys);
+};
 
-		throw error;
-	}
-}
 
-function isTypeSync(fsStatType, statsMethodName, filePath) {
-	if (typeof filePath !== 'string') {
-		throw new TypeError(`Expected a string, got ${typeof filePath}`);
-	}
+/***/ }),
+/* 133 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	try {
-		return fs[fsStatType](filePath)[statsMethodName]();
-	} catch (error) {
-		if (error.code === 'ENOENT') {
-			return false;
-		}
+// 7.1.13 ToObject(argument)
+var defined = __webpack_require__(67);
+module.exports = function (it) {
+  return Object(defined(it));
+};
 
-		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');
+/***/ }),
+/* 134 */,
+/* 135 */,
+/* 136 */,
+/* 137 */,
+/* 138 */,
+/* 139 */,
+/* 140 */,
+/* 141 */,
+/* 142 */,
+/* 143 */,
+/* 144 */,
+/* 145 */
+/***/ (function(module, exports) {
 
+module.exports = {"name":"yarn","installationMethod":"unknown","version":"1.10.0-0","license":"BSD-2-Clause","preferGlobal":true,"description":"📦🐈 Fast, reliable, and secure dependency management.","dependencies":{"@zkochan/cmd-shim":"^2.2.4","babel-runtime":"^6.26.0","bytes":"^3.0.0","camelcase":"^4.0.0","chalk":"^2.1.0","commander":"^2.9.0","death":"^1.0.0","debug":"^3.0.0","deep-equal":"^1.0.1","detect-indent":"^5.0.0","dnscache":"^1.0.1","glob":"^7.1.1","gunzip-maybe":"^1.4.0","hash-for-dep":"^1.2.3","imports-loader":"^0.8.0","ini":"^1.3.4","inquirer":"^3.0.1","invariant":"^2.2.0","is-builtin-module":"^2.0.0","is-ci":"^1.0.10","is-webpack-bundle":"^1.0.0","leven":"^2.0.0","loud-rejection":"^1.2.0","micromatch":"^2.3.11","mkdirp":"^0.5.1","node-emoji":"^1.6.1","normalize-url":"^2.0.0","npm-logical-tree":"^1.2.1","object-path":"^0.11.2","proper-lockfile":"^2.0.0","puka":"^1.0.0","read":"^1.0.7","request":"^2.87.0","request-capture-har":"^1.2.2","rimraf":"^2.5.0","semver":"^5.1.0","ssri":"^5.3.0","strip-ansi":"^4.0.0","strip-bom":"^3.0.0","tar-fs":"^1.16.0","tar-stream":"^1.6.1","uuid":"^3.0.1","v8-compile-cache":"^2.0.0","validate-npm-package-license":"^3.0.3","yn":"^2.0.0"},"devDependencies":{"babel-core":"^6.26.0","babel-eslint":"^7.2.3","babel-loader":"^6.2.5","babel-plugin-array-includes":"^2.0.3","babel-plugin-transform-builtin-extend":"^1.1.2","babel-plugin-transform-inline-imports-commonjs":"^1.0.0","babel-plugin-transform-runtime":"^6.4.3","babel-preset-env":"^1.6.0","babel-preset-flow":"^6.23.0","babel-preset-stage-0":"^6.0.0","babylon":"^6.5.0","commitizen":"^2.9.6","cz-conventional-changelog":"^2.0.0","eslint":"^4.3.0","eslint-config-fb-strict":"^22.0.0","eslint-plugin-babel":"^5.0.0","eslint-plugin-flowtype":"^2.35.0","eslint-plugin-jasmine":"^2.6.2","eslint-plugin-jest":"^21.0.0","eslint-plugin-jsx-a11y":"^6.0.2","eslint-plugin-prefer-object-spread":"^1.2.1","eslint-plugin-prettier":"^2.1.2","eslint-plugin-react":"^7.1.0","eslint-plugin-relay":"^0.0.24","eslint-plugin-yarn-internal":"file:scripts/eslint-rules","execa":"^0.10.0","flow-bin":"^0.66.0","git-release-notes":"^3.0.0","gulp":"^3.9.0","gulp-babel":"^7.0.0","gulp-if":"^2.0.1","gulp-newer":"^1.0.0","gulp-plumber":"^1.0.1","gulp-sourcemaps":"^2.2.0","gulp-util":"^3.0.7","gulp-watch":"^5.0.0","jest":"^22.4.4","jsinspect":"^0.12.6","minimatch":"^3.0.4","mock-stdin":"^0.3.0","prettier":"^1.5.2","temp":"^0.8.3","webpack":"^2.1.0-beta.25","yargs":"^6.3.0"},"resolutions":{"sshpk":"^1.14.2"},"engines":{"node":">=4.0.0"},"repository":"yarnpkg/yarn","bin":{"yarn":"./bin/yarn.js","yarnpkg":"./bin/yarn.js"},"scripts":{"build":"gulp build","build-bundle":"node ./scripts/build-webpack.js","build-chocolatey":"powershell ./scripts/build-chocolatey.ps1","build-deb":"./scripts/build-deb.sh","build-dist":"bash ./scripts/build-dist.sh","build-win-installer":"scripts\\build-windows-installer.bat","changelog":"git-release-notes $(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^)..$(git describe --tags --abbrev=0) scripts/changelog.md","dupe-check":"yarn jsinspect ./src","lint":"eslint . && flow check","pkg-tests":"yarn --cwd packages/pkg-tests jest yarn.test.js","prettier":"eslint src __tests__ --fix","release-branch":"./scripts/release-branch.sh","test":"yarn lint && yarn test-only","test-only":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --verbose","test-only-debug":"node --inspect-brk --max_old_space_size=4096 node_modules/jest/bin/jest.js --runInBand --verbose","test-coverage":"node --max_old_space_size=4096 node_modules/jest/bin/jest.js --coverage --verbose","watch":"gulp watch","commit":"git-cz"},"jest":{"collectCoverageFrom":["src/**/*.js"],"testEnvironment":"node","modulePathIgnorePatterns":["__tests__/fixtures/","packages/pkg-tests/pkg-tests-fixtures","dist/"],"testPathIgnorePatterns":["__tests__/(fixtures|__mocks__)/","updates/","_(temp|mock|install|init|helpers).js$","packages/pkg-tests"]},"config":{"commitizen":{"path":"./node_modules/cz-conventional-changelog"}}}
 
 /***/ }),
-/* 246 */
+/* 146 */,
+/* 147 */,
+/* 148 */,
+/* 149 */,
+/* 150 */
 /***/ (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)));
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = stringify;
 
-	return content
-		.split(/\r?\n/)
-		.filter(Boolean)
-		.filter(line => !line.startsWith('#'))
-		.map(mapGitIgnorePatternTo(base));
-};
+var _misc;
 
-const reduceIgnore = files => {
-	return files.reduce((ignores, file) => {
-		ignores.add(parseGitIgnore(file.content, {
-			cwd: file.cwd,
-			fileName: file.filePath
-		}));
-		return ignores;
-	}, gitIgnore());
-};
+function _load_misc() {
+  return _misc = __webpack_require__(12);
+}
 
-const ensureAbsolutePathForCwd = (cwd, p) => {
-	if (path.isAbsolute(p)) {
-		if (p.startsWith(cwd)) {
-			return p;
-		}
+var _constants;
 
-		throw new Error(`Path ${p} is not in cwd ${cwd}`);
-	}
+function _load_constants() {
+  return _constants = __webpack_require__(6);
+}
 
-	return path.join(cwd, p);
-};
+var _package;
 
-const getIsIgnoredPredecate = (ignores, cwd) => {
-	return p => ignores.ignores(slash(path.relative(cwd, ensureAbsolutePathForCwd(cwd, p))));
-};
+function _load_package() {
+  return _package = __webpack_require__(145);
+}
 
-const getFile = async (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = await readFileP(filePath, 'utf8');
+const NODE_VERSION = process.version;
 
-	return {
-		cwd,
-		filePath,
-		content
-	};
-};
+function shouldWrapKey(str) {
+  return str.indexOf('true') === 0 || str.indexOf('false') === 0 || /[:\s\n\\",\[\]]/g.test(str) || /^[0-9]/g.test(str) || !/^[a-zA-Z]/g.test(str);
+}
 
-const getFileSync = (file, cwd) => {
-	const filePath = path.join(cwd, file);
-	const content = fs.readFileSync(filePath, 'utf8');
+function maybeWrap(str) {
+  if (typeof str === 'boolean' || typeof str === 'number' || shouldWrapKey(str)) {
+    return JSON.stringify(str);
+  } else {
+    return str;
+  }
+}
 
-	return {
-		cwd,
-		filePath,
-		content
-	};
+const priorities = {
+  name: 1,
+  version: 2,
+  uid: 3,
+  resolved: 4,
+  integrity: 5,
+  registry: 6,
+  dependencies: 7
 };
 
-const normalizeOptions = ({
-	ignore = [],
-	cwd = process.cwd()
-} = {}) => {
-	return {ignore, cwd};
-};
+function priorityThenAlphaSort(a, b) {
+  if (priorities[a] || priorities[b]) {
+    return (priorities[a] || 100) > (priorities[b] || 100) ? 1 : -1;
+  } else {
+    return (0, (_misc || _load_misc()).sortAlpha)(a, b);
+  }
+}
 
-module.exports = async options => {
-	options = normalizeOptions(options);
+function _stringify(obj, options) {
+  if (typeof obj !== 'object') {
+    throw new TypeError();
+  }
 
-	const paths = await fastGlob('**/.gitignore', {
-		ignore: DEFAULT_IGNORE.concat(options.ignore),
-		cwd: options.cwd
-	});
+  const indent = options.indent;
+  const lines = [];
 
-	const files = await Promise.all(paths.map(file => getFile(file, options.cwd)));
-	const ignores = reduceIgnore(files);
+  // Sorting order needs to be consistent between runs, we run native sort by name because there are no
+  // problems with it being unstable because there are no to keys the same
+  // However priorities can be duplicated and native sort can shuffle things from run to run
+  const keys = Object.keys(obj).sort(priorityThenAlphaSort);
 
-	return getIsIgnoredPredecate(ignores, options.cwd);
-};
+  let addedKeys = [];
 
-module.exports.sync = options => {
-	options = normalizeOptions(options);
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    const val = obj[key];
+    if (val == null || addedKeys.indexOf(key) >= 0) {
+      continue;
+    }
 
-	const paths = fastGlob.sync('**/.gitignore', {
-		ignore: DEFAULT_IGNORE.concat(options.ignore),
-		cwd: options.cwd
-	});
+    const valKeys = [key];
 
-	const files = paths.map(file => getFileSync(file, options.cwd));
-	const ignores = reduceIgnore(files);
+    // get all keys that have the same value equality, we only want this for objects
+    if (typeof val === 'object') {
+      for (let j = i + 1; j < keys.length; j++) {
+        const key = keys[j];
+        if (val === obj[key]) {
+          valKeys.push(key);
+        }
+      }
+    }
 
-	return getIsIgnoredPredecate(ignores, options.cwd);
-};
+    const keyLine = valKeys.sort((_misc || _load_misc()).sortAlpha).map(maybeWrap).join(', ');
 
+    if (typeof val === 'string' || typeof val === 'boolean' || typeof val === 'number') {
+      lines.push(`${keyLine} ${maybeWrap(val)}`);
+    } else if (typeof val === 'object') {
+      lines.push(`${keyLine}:\n${_stringify(val, { indent: indent + '  ' })}` + (options.topLevel ? '\n' : ''));
+    } else {
+      throw new TypeError();
+    }
 
-/***/ }),
-/* 247 */
-/***/ (function(module, exports) {
+    addedKeys = addedKeys.concat(valKeys);
+  }
 
-// A simple implementation of make-array
-function makeArray (subject) {
-  return Array.isArray(subject)
-    ? subject
-    : [subject]
+  return indent + lines.join(`\n${indent}`);
 }
 
-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 = [
+function stringify(obj, noHeader, enableVersions) {
+  const val = _stringify(obj, {
+    indent: '',
+    topLevel: true
+  });
+  if (noHeader) {
+    return val;
+  }
 
-  // > Trailing spaces are ignored unless they are quoted with backslash ("\")
-  [
-    // (a\ ) -> (a )
-    // (a  ) -> (a)
-    // (a \ ) -> (a  )
-    /\\?\s+$/,
-    match => match.indexOf('\\') === 0
-      ? ' '
-      : ''
-  ],
+  const lines = [];
+  lines.push('# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.');
+  lines.push(`# yarn lockfile v${(_constants || _load_constants()).LOCKFILE_VERSION}`);
+  if (enableVersions) {
+    lines.push(`# yarn v${(_package || _load_package()).version}`);
+    lines.push(`# node ${NODE_VERSION}`);
+  }
+  lines.push('\n');
+  lines.push(val);
 
-  // replace (\ ) with ' '
-  [
-    /\\\s/g,
-    () => ' '
-  ],
+  return lines.join('\n');
+}
 
-  // Escape metacharacters
-  // which is written down by users but means special for regular expressions.
+/***/ }),
+/* 151 */,
+/* 152 */,
+/* 153 */,
+/* 154 */,
+/* 155 */,
+/* 156 */,
+/* 157 */,
+/* 158 */,
+/* 159 */,
+/* 160 */,
+/* 161 */,
+/* 162 */,
+/* 163 */,
+/* 164 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // > 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}`
-  ],
+"use strict";
 
-  [
-    // > [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,
-    () => '[^/]'
-  ],
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fileDatesEqual = exports.copyFile = exports.unlink = undefined;
 
-  // leading slash
-  [
+var _asyncToGenerator2;
 
-    // > 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
-    /^\//,
-    () => '^'
-  ],
+function _load_asyncToGenerator() {
+  return _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(1));
+}
 
-  // replace special metacharacter slash after the leading slash
-  [
-    /\//g,
-    () => '\\/'
-  ],
+// We want to preserve file timestamps when copying a file, since yarn uses them to decide if a file has
+// changed compared to the cache.
+// There are some OS specific cases here:
+// * On linux, fs.copyFile does not preserve timestamps, but does on OSX and Win.
+// * On windows, you must open a file with write permissions to call `fs.futimes`.
+// * On OSX you can open with read permissions and still call `fs.futimes`.
+let fixTimes = (() => {
+  var _ref3 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (fd, dest, data) {
+    const doOpen = fd === undefined;
+    let openfd = fd ? fd : -1;
 
-  [
-    // > 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 '\\*'
-    /^\^*\\\*\\\*\\\//,
+    if (disableTimestampCorrection === undefined) {
+      // if timestamps match already, no correction is needed.
+      // the need to correct timestamps varies based on OS and node versions.
+      const destStat = yield lstat(dest);
+      disableTimestampCorrection = fileDatesEqual(destStat.mtime, data.mtime);
+    }
 
-    // '**/foo' <-> 'foo'
-    () => '^(?:.*\\/)?'
-  ]
-]
+    if (disableTimestampCorrection) {
+      return;
+    }
 
-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
-        ? '(?:^|\\/)'
+    if (doOpen) {
+      try {
+        openfd = yield open(dest, 'a', data.mode);
+      } catch (er) {
+        // file is likely read-only
+        try {
+          openfd = yield open(dest, 'r', data.mode);
+        } catch (err) {
+          // We can't even open this file for reading.
+          return;
+        }
+      }
+    }
 
-        // > Otherwise, Git treats the pattern as a shell glob suitable for
-        // >   consumption by fnmatch(3)
-        : '^'
+    try {
+      if (openfd) {
+        yield futimes(openfd, data.atime, data.mtime);
+      }
+    } catch (er) {
+      // If `futimes` throws an exception, we probably have a case of a read-only file on Windows.
+      // In this case we can just return. The incorrect timestamp will just cause that file to be recopied
+      // on subsequent installs, which will effect yarn performance but not break anything.
+    } finally {
+      if (doOpen && openfd) {
+        yield close(openfd);
+      }
     }
-  ],
+  });
 
-  // two globstars
-  [
-    // Use lookahead assertions so that we could match more than one `'/**'`
-    /\\\/\\\*\\\*(?=\\\/|$)/g,
+  return function fixTimes(_x7, _x8, _x9) {
+    return _ref3.apply(this, arguments);
+  };
+})();
 
-    // Zero, one or several directories
-    // should not use '*', or it will be replaced by the next replacer
+// Compare file timestamps.
+// Some versions of Node on windows zero the milliseconds when utime is used.
 
-    // 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.
-      // '/**/'
-      ? '(?:\\/[^\\/]+)*'
+var _fs;
 
-      // case: /**
-      // > A trailing `"/**"` matches everything inside.
+function _load_fs() {
+  return _fs = _interopRequireDefault(__webpack_require__(3));
+}
 
-      // #21: everything inside but it should not include the current folder
-      : '\\/.+'
-  ],
+var _promise;
 
-  // intermediate wildcards
-  [
-    // Never replace escaped '*'
-    // ignore rule '\*' will match the path '*'
+function _load_promise() {
+  return _promise = __webpack_require__(40);
+}
 
-    // 'abc.*/' -> go
-    // 'abc.*'  -> skip this rule
-    /(^|[^\\]+)\\\*(?=.+)/g,
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-    // '*.js' matches '.js'
-    // '*.js' doesn't match 'abc'
-    (_, p1) => `${p1}[^\\/]*`
-  ],
+// This module serves as a wrapper for file operations that are inconsistant across node and OS versions.
 
-  // trailing wildcard
-  [
-    /(\^|\\\/)?\\\*$/,
-    (_, p1) => {
-      const prefix = p1
-        // '\^':
-        // '/*' does not match ''
-        // '/*' does not match everything
+let disableTimestampCorrection = undefined; // OS dependent. will be detected on first file copy.
 
-        // '\\\/':
-        // 'abc/*' does not match 'abc/'
-        ? `${p1}[^/]+`
+const readFileBuffer = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.readFile);
+const close = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.close);
+const lstat = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.lstat);
+const open = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.open);
+const futimes = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.futimes);
 
-        // 'a*' matches 'a'
-        // 'a*' matches 'aa'
-        : '[^/]*'
+const write = (0, (_promise || _load_promise()).promisify)((_fs || _load_fs()).default.write);
+
+const unlink = exports.unlink = (0, (_promise || _load_promise()).promisify)(__webpack_require__(233));
 
-      return `${prefix}(?=$|\\/$)`
+/**
+ * Unlinks the destination to force a recreation. This is needed on case-insensitive file systems
+ * to force the correct naming when the filename has changed only in character-casing. (Jest -> jest).
+ */
+const copyFile = exports.copyFile = (() => {
+  var _ref = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (data, cleanup) {
+    try {
+      yield unlink(data.dest);
+      yield copyFilePoly(data.src, data.dest, 0, data);
+    } finally {
+      if (cleanup) {
+        cleanup();
+      }
     }
-  ],
+  });
 
-  [
-    // unescape
-    /\\\\\\/g,
-    () => '\\'
-  ]
-]
+  return function copyFile(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+})();
 
-const POSITIVE_REPLACERS = [
-  ...DEFAULT_REPLACER_PREFIX,
+// Node 8.5.0 introduced `fs.copyFile` which is much faster, so use that when available.
+// Otherwise we fall back to reading and writing files as buffers.
+const copyFilePoly = (src, dest, flags, data) => {
+  if ((_fs || _load_fs()).default.copyFile) {
+    return new Promise((resolve, reject) => (_fs || _load_fs()).default.copyFile(src, dest, flags, err => {
+      if (err) {
+        reject(err);
+      } else {
+        fixTimes(undefined, dest, data).then(() => resolve()).catch(ex => reject(ex));
+      }
+    }));
+  } else {
+    return copyWithBuffer(src, dest, flags, data);
+  }
+};
 
-  // 'f'
-  // matches
-  // - /f(end)
-  // - /f/
-  // - (start)f(end)
-  // - (start)f/
-  // doesn't match
-  // - oof
-  // - foo
-  // pseudo:
-  // -> (^|/)f(/|$)
+const copyWithBuffer = (() => {
+  var _ref2 = (0, (_asyncToGenerator2 || _load_asyncToGenerator()).default)(function* (src, dest, flags, data) {
+    // Use open -> write -> futimes -> close sequence to avoid opening the file twice:
+    // one with writeFile and one with utimes
+    const fd = yield open(dest, 'w', data.mode);
+    try {
+      const buffer = yield readFileBuffer(src);
+      yield write(fd, buffer, 0, buffer.length);
+      yield fixTimes(fd, dest, data);
+    } finally {
+      yield close(fd);
+    }
+  });
 
-  // ending
-  [
-    // 'js' will not match 'js.'
-    // 'ab' will not match 'abc'
-    /(?:[^*/])$/,
+  return function copyWithBuffer(_x3, _x4, _x5, _x6) {
+    return _ref2.apply(this, arguments);
+  };
+})();const fileDatesEqual = exports.fileDatesEqual = (a, b) => {
+  const aTime = a.getTime();
+  const bTime = b.getTime();
 
-    // 'js*' will not match 'a.js'
-    // 'js/' will not match 'a.js'
-    // 'js' will match 'a.js' and 'a.js/'
-    match => `${match}(?=$|\\/)`
-  ],
+  if (process.platform !== 'win32') {
+    return aTime === bTime;
+  }
 
-  ...DEFAULT_REPLACER_SUFFIX
-]
+  // See https://github.com/nodejs/node/pull/12607
+  // Submillisecond times from stat and utimes are truncated on Windows,
+  // causing a file with mtime 8.0079998 and 8.0081144 to become 8.007 and 8.008
+  // and making it impossible to update these files to their correct timestamps.
+  if (Math.abs(aTime - bTime) <= 1) {
+    return true;
+  }
 
-const NEGATIVE_REPLACERS = [
-  ...DEFAULT_REPLACER_PREFIX,
+  const aTimeSec = Math.floor(aTime / 1000);
+  const bTimeSec = Math.floor(bTime / 1000);
 
-  // #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.
+  // See https://github.com/nodejs/node/issues/2069
+  // Some versions of Node on windows zero the milliseconds when utime is used
+  // So if any of the time has a milliseconds part of zero we suspect that the
+  // bug is present and compare only seconds.
+  if (aTime - aTimeSec * 1000 === 0 || bTime - bTimeSec * 1000 === 0) {
+    return aTimeSec === bTimeSec;
+  }
 
-  // eg:
-  // ['node_modules/*', '!node_modules']
-  // should ignore `node_modules/a.js`
-  [
-    /(?:[^*])$/,
-    match => `${match}(?=$|\\/$)`
-  ],
+  return aTime === bTime;
+};
 
-  ...DEFAULT_REPLACER_SUFFIX
-]
+/***/ }),
+/* 165 */,
+/* 166 */,
+/* 167 */,
+/* 168 */,
+/* 169 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// A simple cache, because an ignore rule only has only one certain meaning
-const regexCache = Object.create(null)
+"use strict";
 
-// @param {pattern}
-const makeRegex = (pattern, negative, ignorecase) => {
-  const r = regexCache[pattern]
-  if (r) {
-    return r
-  }
 
-  const replacers = negative
-    ? NEGATIVE_REPLACERS
-    : POSITIVE_REPLACERS
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isFakeRoot = isFakeRoot;
+exports.isRootUser = isRootUser;
+function getUid() {
+  if (process.platform !== 'win32' && process.getuid) {
+    return process.getuid();
+  }
+  return null;
+}
 
-  const source = replacers.reduce(
-    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
-    pattern
-  )
+exports.default = isRootUser(getUid()) && !isFakeRoot();
+function isFakeRoot() {
+  return Boolean(process.env.FAKEROOTKEY);
+}
 
-  return regexCache[pattern] = ignorecase
-    ? new RegExp(source, 'i')
-    : new RegExp(source)
+function isRootUser(uid) {
+  return uid === 0;
 }
 
-const isString = subject => typeof subject === 'string'
+/***/ }),
+/* 170 */,
+/* 171 */
+/***/ (function(module, exports, __webpack_require__) {
 
-// > 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)
+"use strict";
 
-  // > A line starting with # serves as a comment.
-  && pattern.indexOf('#') !== 0
 
-const splitPattern = pattern => pattern.split(REGEX_SPLITALL_CRLF)
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDataDir = getDataDir;
+exports.getCacheDir = getCacheDir;
+exports.getConfigDir = getConfigDir;
+const path = __webpack_require__(0);
+const userHome = __webpack_require__(45).default;
 
-class IgnoreRule {
-  constructor (
-    origin,
-    pattern,
-    negative,
-    regex
-  ) {
-    this.origin = origin
-    this.pattern = pattern
-    this.negative = negative
-    this.regex = regex
+const FALLBACK_CONFIG_DIR = path.join(userHome, '.config', 'yarn');
+const FALLBACK_CACHE_DIR = path.join(userHome, '.cache', 'yarn');
+
+function getDataDir() {
+  if (process.platform === 'win32') {
+    const WIN32_APPDATA_DIR = getLocalAppDataDir();
+    return WIN32_APPDATA_DIR == null ? FALLBACK_CONFIG_DIR : path.join(WIN32_APPDATA_DIR, 'Data');
+  } else if (process.env.XDG_DATA_HOME) {
+    return path.join(process.env.XDG_DATA_HOME, 'yarn');
+  } else {
+    // This could arguably be ~/Library/Application Support/Yarn on Macs,
+    // but that feels unintuitive for a cli tool
+
+    // Instead, use our prior fallback. Some day this could be
+    // path.join(userHome, '.local', 'share', 'yarn')
+    // or return path.join(WIN32_APPDATA_DIR, 'Data') on win32
+    return FALLBACK_CONFIG_DIR;
   }
 }
 
-const createRule = (pattern, ignorecase) => {
-  const origin = pattern
-  let negative = false
+function getCacheDir() {
+  if (process.platform === 'win32') {
+    // process.env.TEMP also exists, but most apps put caches here
+    return path.join(getLocalAppDataDir() || path.join(userHome, 'AppData', 'Local', 'Yarn'), 'Cache');
+  } else if (process.env.XDG_CACHE_HOME) {
+    return path.join(process.env.XDG_CACHE_HOME, 'yarn');
+  } else if (process.platform === 'darwin') {
+    return path.join(userHome, 'Library', 'Caches', 'Yarn');
+  } else {
+    return FALLBACK_CACHE_DIR;
+  }
+}
 
-  // > An optional prefix "!" which negates the pattern;
-  if (pattern.indexOf('!') === 0) {
-    negative = true
-    pattern = pattern.substr(1)
+function getConfigDir() {
+  if (process.platform === 'win32') {
+    // Use our prior fallback. Some day this could be
+    // return path.join(WIN32_APPDATA_DIR, 'Config')
+    const WIN32_APPDATA_DIR = getLocalAppDataDir();
+    return WIN32_APPDATA_DIR == null ? FALLBACK_CONFIG_DIR : path.join(WIN32_APPDATA_DIR, 'Config');
+  } else if (process.env.XDG_CONFIG_HOME) {
+    return path.join(process.env.XDG_CONFIG_HOME, 'yarn');
+  } else {
+    return FALLBACK_CONFIG_DIR;
   }
+}
 
-  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, '#')
+function getLocalAppDataDir() {
+  return process.env.LOCALAPPDATA ? path.join(process.env.LOCALAPPDATA, 'Yarn') : null;
+}
 
-  const regex = makeRegex(pattern, negative, ignorecase)
+/***/ }),
+/* 172 */,
+/* 173 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  return new IgnoreRule(
-    origin,
-    pattern,
-    negative,
-    regex
-  )
-}
+module.exports = { "default": __webpack_require__(179), __esModule: true };
 
-const throwError = (message, Ctor) => {
-  throw new Ctor(message)
-}
+/***/ }),
+/* 174 */
+/***/ (function(module, exports, __webpack_require__) {
 
-const checkPath = (path, originalPath, doThrow) => {
-  if (!isString(path)) {
-    return doThrow(
-      `path must be a string, but got \`${originalPath}\``,
-      TypeError
-    )
-  }
+"use strict";
 
-  // We don't know if we should ignore '', so throw
-  if (!path) {
-    return doThrow(`path must not be empty`, TypeError)
-  }
+module.exports = balanced;
+function balanced(a, b, str) {
+  if (a instanceof RegExp) a = maybeMatch(a, str);
+  if (b instanceof RegExp) b = maybeMatch(b, str);
 
-  // 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
-    )
-  }
+  var r = range(a, b, str);
 
-  return true
+  return r && {
+    start: r[0],
+    end: r[1],
+    pre: str.slice(0, r[0]),
+    body: str.slice(r[0] + a.length, r[1]),
+    post: str.slice(r[1] + b.length)
+  };
 }
 
-const isNotRelative = path => REGEX_TEST_INVALID_PATH.test(path)
+function maybeMatch(reg, str) {
+  var m = str.match(reg);
+  return m ? m[0] : null;
+}
 
-checkPath.isNotRelative = isNotRelative
-checkPath.convert = p => p
+balanced.range = range;
+function range(a, b, str) {
+  var begs, beg, left, right, result;
+  var ai = str.indexOf(a);
+  var bi = str.indexOf(b, ai + 1);
+  var i = ai;
 
-class Ignore {
-  constructor ({
-    ignorecase = true
-  } = {}) {
-    this._rules = []
-    this._ignorecase = ignorecase
-    define(this, KEY_IGNORE, true)
-    this._initCache()
-  }
+  if (ai >= 0 && bi > 0) {
+    begs = [];
+    left = str.length;
 
-  _initCache () {
-    this._ignoreCache = Object.create(null)
-    this._testCache = Object.create(null)
-  }
+    while (i >= 0 && !result) {
+      if (i == ai) {
+        begs.push(i);
+        ai = str.indexOf(a, i + 1);
+      } else if (begs.length == 1) {
+        result = [ begs.pop(), bi ];
+      } else {
+        beg = begs.pop();
+        if (beg < left) {
+          left = beg;
+          right = bi;
+        }
 
-  _addPattern (pattern) {
-    // #32
-    if (pattern && pattern[KEY_IGNORE]) {
-      this._rules = this._rules.concat(pattern._rules)
-      this._added = true
-      return
+        bi = str.indexOf(b, i + 1);
+      }
+
+      i = ai < bi && ai >= 0 ? ai : bi;
     }
 
-    if (checkPattern(pattern)) {
-      const rule = createRule(pattern, this._ignorecase)
-      this._added = true
-      this._rules.push(rule)
+    if (begs.length) {
+      result = [ left, right ];
     }
   }
 
-  // @param {Array<string> | string | Ignore} pattern
-  add (pattern) {
-    this._added = false
+  return result;
+}
 
-    makeArray(
-      isString(pattern)
-        ? splitPattern(pattern)
-        : pattern
-    ).forEach(this._addPattern, this)
 
-    // Some rules have just added to the ignore,
-    // making the behavior changed.
-    if (this._added) {
-      this._initCache()
-    }
+/***/ }),
+/* 175 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    return this
-  }
+var concatMap = __webpack_require__(178);
+var balanced = __webpack_require__(174);
 
-  // legacy
-  addPattern (pattern) {
-    return this.add(pattern)
-  }
+module.exports = expandTop;
 
-  //          |           ignored : unignored
-  // negative |   0:0   |   0:1   |   1:0   |   1:1
-  // -------- | ------- | ------- | ------- | --------
-  //     0    |  TEST   |  TEST   |  SKIP   |    X
-  //     1    |  TESTIF |  SKIP   |  TEST   |    X
+var escSlash = '\0SLASH'+Math.random()+'\0';
+var escOpen = '\0OPEN'+Math.random()+'\0';
+var escClose = '\0CLOSE'+Math.random()+'\0';
+var escComma = '\0COMMA'+Math.random()+'\0';
+var escPeriod = '\0PERIOD'+Math.random()+'\0';
 
-  // - SKIP: always skip
-  // - TEST: always test
-  // - TESTIF: only test if checkUnignored
-  // - X: that never happen
+function numeric(str) {
+  return parseInt(str, 10) == str
+    ? parseInt(str, 10)
+    : str.charCodeAt(0);
+}
 
-  // @param {boolean} whether should check if the path is unignored,
-  //   setting `checkUnignored` to `false` could reduce additional
-  //   path matching.
+function escapeBraces(str) {
+  return str.split('\\\\').join(escSlash)
+            .split('\\{').join(escOpen)
+            .split('\\}').join(escClose)
+            .split('\\,').join(escComma)
+            .split('\\.').join(escPeriod);
+}
 
-  // @returns {TestResult} true if a file is ignored
-  _testOne (path, checkUnignored) {
-    let ignored = false
-    let unignored = false
+function unescapeBraces(str) {
+  return str.split(escSlash).join('\\')
+            .split(escOpen).join('{')
+            .split(escClose).join('}')
+            .split(escComma).join(',')
+            .split(escPeriod).join('.');
+}
 
-    this._rules.forEach(rule => {
-      const {negative} = rule
-      if (
-        unignored === negative && ignored !== unignored
-        || negative && !ignored && !unignored && !checkUnignored
-      ) {
-        return
-      }
 
-      const matched = rule.regex.test(path)
+// Basically just str.split(","), but handling cases
+// where we have nested braced sections, which should be
+// treated as individual members, like {a,{b,c},d}
+function parseCommaParts(str) {
+  if (!str)
+    return [''];
 
-      if (matched) {
-        ignored = !negative
-        unignored = negative
-      }
-    })
+  var parts = [];
+  var m = balanced('{', '}', str);
 
-    return {
-      ignored,
-      unignored
-    }
+  if (!m)
+    return str.split(',');
+
+  var pre = m.pre;
+  var body = m.body;
+  var post = m.post;
+  var p = pre.split(',');
+
+  p[p.length-1] += '{' + body + '}';
+  var postParts = parseCommaParts(post);
+  if (post.length) {
+    p[p.length-1] += postParts.shift();
+    p.push.apply(p, postParts);
   }
 
-  // @returns {TestResult}
-  _test (originalPath, cache, checkUnignored, slices) {
-    const path = originalPath
-      // Supports nullable path
-      && checkPath.convert(originalPath)
+  parts.push.apply(parts, p);
 
-    checkPath(path, originalPath, throwError)
+  return parts;
+}
 
-    return this._t(path, cache, checkUnignored, slices)
+function expandTop(str) {
+  if (!str)
+    return [];
+
+  // I don't know why Bash 4.3 does this, but it does.
+  // Anything starting with {} will have the first two bytes preserved
+  // but *only* at the top level, so {},a}b will not expand to anything,
+  // but a{},b}c will be expanded to [a}c,abc].
+  // One could argue that this is a bug in Bash, but since the goal of
+  // this module is to match Bash's rules, we escape a leading {}
+  if (str.substr(0, 2) === '{}') {
+    str = '\\{\\}' + str.substr(2);
   }
 
-  _t (path, cache, checkUnignored, slices) {
-    if (path in cache) {
-      return cache[path]
-    }
+  return expand(escapeBraces(str), true).map(unescapeBraces);
+}
 
-    if (!slices) {
-      // path/to/a.js
-      // ['path', 'to', 'a.js']
-      slices = path.split(SLASH)
-    }
+function identity(e) {
+  return e;
+}
 
-    slices.pop()
+function embrace(str) {
+  return '{' + str + '}';
+}
+function isPadded(el) {
+  return /^-?0\d/.test(el);
+}
 
-    // If the path has no parent directory, just test it
-    if (!slices.length) {
-      return cache[path] = this._testOne(path, checkUnignored)
-    }
+function lte(i, y) {
+  return i <= y;
+}
+function gte(i, y) {
+  return i >= y;
+}
 
-    const parent = this._t(
-      slices.join(SLASH) + SLASH,
-      cache,
-      checkUnignored,
-      slices
-    )
+function expand(str, isTop) {
+  var expansions = [];
 
-    // 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)
+  var m = balanced('{', '}', str);
+  if (!m || /\$$/.test(m.pre)) return [str];
+
+  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+  var isSequence = isNumericSequence || isAlphaSequence;
+  var isOptions = m.body.indexOf(',') >= 0;
+  if (!isSequence && !isOptions) {
+    // {a},b}
+    if (m.post.match(/,.*\}/)) {
+      str = m.pre + '{' + m.body + escClose + m.post;
+      return expand(str);
+    }
+    return [str];
   }
 
-  ignores (path) {
-    return this._test(path, this._ignoreCache, false).ignored
+  var n;
+  if (isSequence) {
+    n = m.body.split(/\.\./);
+  } else {
+    n = parseCommaParts(m.body);
+    if (n.length === 1) {
+      // x{{a,b}}y ==> x{a}y x{b}y
+      n = expand(n[0], false).map(embrace);
+      if (n.length === 1) {
+        var post = m.post.length
+          ? expand(m.post, false)
+          : [''];
+        return post.map(function(p) {
+          return m.pre + n[0] + p;
+        });
+      }
+    }
   }
 
-  createFilter () {
-    return path => !this.ignores(path)
+  // at this point, n is the parts, and we know it's not a comma set
+  // with a single entry.
+
+  // no need to expand pre, since it is guaranteed to be free of brace-sets
+  var pre = m.pre;
+  var post = m.post.length
+    ? expand(m.post, false)
+    : [''];
+
+  var N;
+
+  if (isSequence) {
+    var x = numeric(n[0]);
+    var y = numeric(n[1]);
+    var width = Math.max(n[0].length, n[1].length)
+    var incr = n.length == 3
+      ? Math.abs(numeric(n[2]))
+      : 1;
+    var test = lte;
+    var reverse = y < x;
+    if (reverse) {
+      incr *= -1;
+      test = gte;
+    }
+    var pad = n.some(isPadded);
+
+    N = [];
+
+    for (var i = x; test(i, y); i += incr) {
+      var c;
+      if (isAlphaSequence) {
+        c = String.fromCharCode(i);
+        if (c === '\\')
+          c = '';
+      } else {
+        c = String(i);
+        if (pad) {
+          var need = width - c.length;
+          if (need > 0) {
+            var z = new Array(need + 1).join('0');
+            if (i < 0)
+              c = '-' + z + c.slice(1);
+            else
+              c = z + c;
+          }
+        }
+      }
+      N.push(c);
+    }
+  } else {
+    N = concatMap(n, function(el) { return expand(el, false) });
   }
 
-  filter (paths) {
-    return makeArray(paths).filter(this.createFilter())
+  for (var j = 0; j < N.length; j++) {
+    for (var k = 0; k < post.length; k++) {
+      var expansion = pre + N[j] + post[k];
+      if (!isTop || isSequence || expansion)
+        expansions.push(expansion);
+    }
   }
 
-  // @returns {TestResult}
-  test (path) {
-    return this._test(path, this._testCache, true)
-  }
+  return expansions;
 }
 
-const factory = options => new Ignore(options)
 
-const returnFalse = () => false
 
-const isPathValid = path =>
-  checkPath(path && checkPath.convert(path), path, returnFalse)
+/***/ }),
+/* 176 */
+/***/ (function(module, exports, __webpack_require__) {
 
-factory.isPathValid = isPathValid
+"use strict";
 
-// Fixes typescript
-factory.default = factory
 
-module.exports = factory
+function preserveCamelCase(str) {
+	let isLastCharLower = false;
+	let isLastCharUpper = false;
+	let isLastLastCharUpper = false;
 
-// 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, '/')
+	for (let i = 0; i < str.length; i++) {
+		const c = str[i];
 
-  checkPath.convert = makePosix
+		if (isLastCharLower && /[a-zA-Z]/.test(c) && c.toUpperCase() === c) {
+			str = str.substr(0, i) + '-' + str.substr(i);
+			isLastCharLower = false;
+			isLastLastCharUpper = isLastCharUpper;
+			isLastCharUpper = true;
+			i++;
+		} else if (isLastCharUpper && isLastLastCharUpper && /[a-zA-Z]/.test(c) && c.toLowerCase() === c) {
+			str = str.substr(0, i - 1) + '-' + str.substr(i - 1);
+			isLastLastCharUpper = isLastCharUpper;
+			isLastCharUpper = false;
+			isLastCharLower = true;
+		} else {
+			isLastCharLower = c.toLowerCase() === c;
+			isLastLastCharUpper = isLastCharUpper;
+			isLastCharUpper = c.toUpperCase() === c;
+		}
+	}
 
-  // '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)
+	return str;
 }
 
+module.exports = function (str) {
+	if (arguments.length > 1) {
+		str = Array.from(arguments)
+			.map(x => x.trim())
+			.filter(x => x.length)
+			.join('-');
+	} else {
+		str = str.trim();
+	}
 
-/***/ }),
-/* 248 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (str.length === 0) {
+		return '';
+	}
 
-"use strict";
+	if (str.length === 1) {
+		return str.toLowerCase();
+	}
 
-module.exports = path => {
-	const isExtendedLengthPath = /^\\\\\?\\/.test(path);
-	const hasNonAscii = /[^\u0000-\u0080]+/.test(path); // eslint-disable-line no-control-regex
+	if (/^[a-z0-9]+$/.test(str)) {
+		return str;
+	}
 
-	if (isExtendedLengthPath || hasNonAscii) {
-		return path;
+	const hasUpperCase = str !== str.toLowerCase();
+
+	if (hasUpperCase) {
+		str = preserveCamelCase(str);
 	}
 
-	return path.replace(/\\/g, '/');
+	return str
+		.replace(/^[_.\- ]+/, '')
+		.toLowerCase()
+		.replace(/[_.\- ]+(\w|$)/g, (m, p1) => p1.toUpperCase());
 };
 
 
 /***/ }),
-/* 249 */
+/* 177 */,
+/* 178 */
+/***/ (function(module, exports) {
+
+module.exports = function (xs, fn) {
+    var res = [];
+    for (var i = 0; i < xs.length; i++) {
+        var x = fn(xs[i], i);
+        if (isArray(x)) res.push.apply(res, x);
+        else res.push(x);
+    }
+    return res;
+};
+
+var isArray = Array.isArray || function (xs) {
+    return Object.prototype.toString.call(xs) === '[object Array]';
+};
+
+
+/***/ }),
+/* 179 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+__webpack_require__(205);
+__webpack_require__(207);
+__webpack_require__(210);
+__webpack_require__(206);
+__webpack_require__(208);
+__webpack_require__(209);
+module.exports = __webpack_require__(23).Promise;
 
-const {Transform} = __webpack_require__(28);
 
-class ObjectTransform extends Transform {
-	constructor() {
-		super({
-			objectMode: true
-		});
-	}
-}
+/***/ }),
+/* 180 */
+/***/ (function(module, exports) {
 
-class FilterStream extends ObjectTransform {
-	constructor(filter) {
-		super();
-		this._filter = filter;
-	}
+module.exports = function () { /* empty */ };
 
-	_transform(data, encoding, callback) {
-		if (this._filter(data)) {
-			this.push(data);
-		}
 
-		callback();
-	}
-}
+/***/ }),
+/* 181 */
+/***/ (function(module, exports) {
 
-class UniqueStream extends ObjectTransform {
-	constructor() {
-		super();
-		this._pushed = new Set();
-	}
+module.exports = function (it, Constructor, name, forbiddenField) {
+  if (!(it instanceof Constructor) || (forbiddenField !== undefined && forbiddenField in it)) {
+    throw TypeError(name + ': incorrect invocation!');
+  } return it;
+};
 
-	_transform(data, encoding, callback) {
-		if (!this._pushed.has(data)) {
-			this.push(data);
-			this._pushed.add(data);
-		}
 
-		callback();
-	}
-}
+/***/ }),
+/* 182 */
+/***/ (function(module, exports, __webpack_require__) {
 
-module.exports = {
-	FilterStream,
-	UniqueStream
+// false -> Array#indexOf
+// true  -> Array#includes
+var toIObject = __webpack_require__(74);
+var toLength = __webpack_require__(110);
+var toAbsoluteIndex = __webpack_require__(200);
+module.exports = function (IS_INCLUDES) {
+  return function ($this, el, fromIndex) {
+    var O = toIObject($this);
+    var length = toLength(O.length);
+    var index = toAbsoluteIndex(fromIndex, length);
+    var value;
+    // Array#includes uses SameValueZero equality algorithm
+    // eslint-disable-next-line no-self-compare
+    if (IS_INCLUDES && el != el) while (length > index) {
+      value = O[index++];
+      // eslint-disable-next-line no-self-compare
+      if (value != value) return true;
+    // Array#indexOf ignores holes, Array#includes - not
+    } else for (;length > index; index++) if (IS_INCLUDES || index in O) {
+      if (O[index] === el) return IS_INCLUDES || index || 0;
+    } return !IS_INCLUDES && -1;
+  };
 };
 
 
 /***/ }),
-/* 250 */
+/* 183 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var fs = __webpack_require__(23)
-var polyfills = __webpack_require__(251)
-var legacy = __webpack_require__(252)
-var clone = __webpack_require__(253)
+var ctx = __webpack_require__(48);
+var call = __webpack_require__(187);
+var isArrayIter = __webpack_require__(186);
+var anObject = __webpack_require__(27);
+var toLength = __webpack_require__(110);
+var getIterFn = __webpack_require__(203);
+var BREAK = {};
+var RETURN = {};
+var exports = module.exports = function (iterable, entries, fn, that, ITERATOR) {
+  var iterFn = ITERATOR ? function () { return iterable; } : getIterFn(iterable);
+  var f = ctx(fn, that, entries ? 2 : 1);
+  var index = 0;
+  var length, step, iterator, result;
+  if (typeof iterFn != 'function') throw TypeError(iterable + ' is not iterable!');
+  // fast case for arrays with default iterator
+  if (isArrayIter(iterFn)) for (length = toLength(iterable.length); length > index; index++) {
+    result = entries ? f(anObject(step = iterable[index])[0], step[1]) : f(iterable[index]);
+    if (result === BREAK || result === RETURN) return result;
+  } else for (iterator = iterFn.call(iterable); !(step = iterator.next()).done;) {
+    result = call(iterator, f, step.value, entries);
+    if (result === BREAK || result === RETURN) return result;
+  }
+};
+exports.BREAK = BREAK;
+exports.RETURN = RETURN;
 
-var util = __webpack_require__(29)
 
-/* istanbul ignore next - node 0.x polyfill */
-var gracefulQueue
-var previousSymbol
+/***/ }),
+/* 184 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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'
-}
+module.exports = !__webpack_require__(33) && !__webpack_require__(85)(function () {
+  return Object.defineProperty(__webpack_require__(68)('div'), 'a', { get: function () { return 7; } }).a != 7;
+});
 
-function noop () {}
 
-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)
-  }
+/***/ }),
+/* 185 */
+/***/ (function(module, exports) {
 
-// 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
-    }
-  })
+// fast apply, http://jsperf.lnkit.com/fast-apply/5
+module.exports = function (fn, args, that) {
+  var un = that === undefined;
+  switch (args.length) {
+    case 0: return un ? fn()
+                      : fn.call(that);
+    case 1: return un ? fn(args[0])
+                      : fn.call(that, args[0]);
+    case 2: return un ? fn(args[0], args[1])
+                      : fn.call(that, args[0], args[1]);
+    case 3: return un ? fn(args[0], args[1], args[2])
+                      : fn.call(that, args[0], args[1], args[2]);
+    case 4: return un ? fn(args[0], args[1], args[2], args[3])
+                      : fn.call(that, args[0], args[1], args[2], args[3]);
+  } return fn.apply(that, args);
+};
 
-  // 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 (typeof cb === 'function')
-          cb.apply(this, arguments)
-      })
-    }
+/***/ }),
+/* 186 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    Object.defineProperty(close, previousSymbol, {
-      value: fs$close
-    })
-    return close
-  })(fs.close)
+// check on default Array iterator
+var Iterators = __webpack_require__(35);
+var ITERATOR = __webpack_require__(13)('iterator');
+var ArrayProto = Array.prototype;
 
-  fs.closeSync = (function (fs$closeSync) {
-    function closeSync (fd) {
-      // This function uses the graceful-fs shared queue
-      fs$closeSync.apply(fs, arguments)
-      retry()
-    }
+module.exports = function (it) {
+  return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
+};
 
-    Object.defineProperty(closeSync, previousSymbol, {
-      value: fs$closeSync
-    })
-    return closeSync
-  })(fs.closeSync)
 
-  if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
-    process.on('exit', function() {
-      debug(global[gracefulQueue])
-      __webpack_require__(30).equal(global[gracefulQueue].length, 0)
-    })
+/***/ }),
+/* 187 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// call something on iterator step with safe closing on error
+var anObject = __webpack_require__(27);
+module.exports = function (iterator, fn, value, entries) {
+  try {
+    return entries ? fn(anObject(value)[0], value[1]) : fn(value);
+  // 7.4.6 IteratorClose(iterator, completion)
+  } catch (e) {
+    var ret = iterator['return'];
+    if (ret !== undefined) anObject(ret.call(iterator));
+    throw e;
   }
-}
+};
 
-module.exports = patch(clone(fs))
-if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
-    module.exports = patch(fs)
-    fs.__patched = true;
-}
 
-function patch (fs) {
-  // Everything that references the open() function needs to be in here
-  polyfills(fs)
-  fs.gracefulify = patch
+/***/ }),
+/* 188 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  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
+"use strict";
 
-    return go$readFile(path, options, cb)
+var create = __webpack_require__(192);
+var descriptor = __webpack_require__(106);
+var setToStringTag = __webpack_require__(71);
+var IteratorPrototype = {};
 
-    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()
-        }
-      })
-    }
-  }
+// 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
+__webpack_require__(31)(IteratorPrototype, __webpack_require__(13)('iterator'), function () { return this; });
 
-  var fs$writeFile = fs.writeFile
-  fs.writeFile = writeFile
-  function writeFile (path, data, options, cb) {
-    if (typeof options === 'function')
-      cb = options, options = null
+module.exports = function (Constructor, NAME, next) {
+  Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
+  setToStringTag(Constructor, NAME + ' Iterator');
+};
 
-    return go$writeFile(path, data, options, cb)
 
-    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()
-        }
-      })
-    }
-  }
+/***/ }),
+/* 189 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  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
+var ITERATOR = __webpack_require__(13)('iterator');
+var SAFE_CLOSING = false;
 
-    return go$appendFile(path, data, options, cb)
+try {
+  var riter = [7][ITERATOR]();
+  riter['return'] = function () { SAFE_CLOSING = true; };
+  // eslint-disable-next-line no-throw-literal
+  Array.from(riter, function () { throw 2; });
+} catch (e) { /* empty */ }
+
+module.exports = function (exec, skipClosing) {
+  if (!skipClosing && !SAFE_CLOSING) return false;
+  var safe = false;
+  try {
+    var arr = [7];
+    var iter = arr[ITERATOR]();
+    iter.next = function () { return { done: safe = true }; };
+    arr[ITERATOR] = function () { return iter; };
+    exec(arr);
+  } catch (e) { /* empty */ }
+  return safe;
+};
 
-    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()
-        }
-      })
-    }
-  }
 
-  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)
+/***/ }),
+/* 190 */
+/***/ (function(module, exports) {
 
-    return go$readdir(args)
+module.exports = function (done, value) {
+  return { value: value, done: !!done };
+};
 
-    function go$readdir$cb (err, files) {
-      if (files && files.sort)
-        files.sort()
 
-      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
-        enqueue([go$readdir, [args]])
+/***/ }),
+/* 191 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      else {
-        if (typeof cb === 'function')
-          cb.apply(this, arguments)
-        retry()
+var global = __webpack_require__(11);
+var macrotask = __webpack_require__(109).set;
+var Observer = global.MutationObserver || global.WebKitMutationObserver;
+var process = global.process;
+var Promise = global.Promise;
+var isNode = __webpack_require__(47)(process) == 'process';
+
+module.exports = function () {
+  var head, last, notify;
+
+  var flush = function () {
+    var parent, fn;
+    if (isNode && (parent = process.domain)) parent.exit();
+    while (head) {
+      fn = head.fn;
+      head = head.next;
+      try {
+        fn();
+      } catch (e) {
+        if (head) notify();
+        else last = undefined;
+        throw e;
       }
-    }
-  }
+    } last = undefined;
+    if (parent) parent.enter();
+  };
 
-  function go$readdir (args) {
-    return fs$readdir.apply(fs, args)
+  // Node.js
+  if (isNode) {
+    notify = function () {
+      process.nextTick(flush);
+    };
+  // browsers with MutationObserver, except iOS Safari - https://github.com/zloirock/core-js/issues/339
+  } else if (Observer && !(global.navigator && global.navigator.standalone)) {
+    var toggle = true;
+    var node = document.createTextNode('');
+    new Observer(flush).observe(node, { characterData: true }); // eslint-disable-line no-new
+    notify = function () {
+      node.data = toggle = !toggle;
+    };
+  // environments with maybe non-completely correct, but existent Promise
+  } else if (Promise && Promise.resolve) {
+    // Promise.resolve without an argument throws an error in LG WebOS 2
+    var promise = Promise.resolve(undefined);
+    notify = function () {
+      promise.then(flush);
+    };
+  // for other environments - macrotask based on:
+  // - setImmediate
+  // - MessageChannel
+  // - window.postMessag
+  // - onreadystatechange
+  // - setTimeout
+  } else {
+    notify = function () {
+      // strange IE + webpack dev server bug - use .call(global)
+      macrotask.call(global, flush);
+    };
   }
 
-  if (process.version.substr(0, 4) === 'v0.8') {
-    var legStreams = legacy(fs)
-    ReadStream = legStreams.ReadStream
-    WriteStream = legStreams.WriteStream
-  }
+  return function (fn) {
+    var task = { fn: fn, next: undefined };
+    if (last) last.next = task;
+    if (!head) {
+      head = task;
+      notify();
+    } last = task;
+  };
+};
 
-  var fs$ReadStream = fs.ReadStream
-  if (fs$ReadStream) {
-    ReadStream.prototype = Object.create(fs$ReadStream.prototype)
-    ReadStream.prototype.open = ReadStream$open
-  }
 
-  var fs$WriteStream = fs.WriteStream
-  if (fs$WriteStream) {
-    WriteStream.prototype = Object.create(fs$WriteStream.prototype)
-    WriteStream.prototype.open = WriteStream$open
-  }
+/***/ }),
+/* 192 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  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
-  })
+// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
+var anObject = __webpack_require__(27);
+var dPs = __webpack_require__(193);
+var enumBugKeys = __webpack_require__(101);
+var IE_PROTO = __webpack_require__(72)('IE_PROTO');
+var Empty = function () { /* empty */ };
+var PROTOTYPE = 'prototype';
+
+// Create object with fake `null` prototype: use iframe Object with cleared prototype
+var createDict = function () {
+  // Thrash, waste and sodomy: IE GC bug
+  var iframe = __webpack_require__(68)('iframe');
+  var i = enumBugKeys.length;
+  var lt = '<';
+  var gt = '>';
+  var iframeDocument;
+  iframe.style.display = 'none';
+  __webpack_require__(102).appendChild(iframe);
+  iframe.src = 'javascript:'; // eslint-disable-line no-script-url
+  // createDict = iframe.contentWindow.Object;
+  // html.removeChild(iframe);
+  iframeDocument = iframe.contentWindow.document;
+  iframeDocument.open();
+  iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
+  iframeDocument.close();
+  createDict = iframeDocument.F;
+  while (i--) delete createDict[PROTOTYPE][enumBugKeys[i]];
+  return createDict();
+};
+
+module.exports = Object.create || function create(O, Properties) {
+  var result;
+  if (O !== null) {
+    Empty[PROTOTYPE] = anObject(O);
+    result = new Empty();
+    Empty[PROTOTYPE] = null;
+    // add "__proto__" for Object.getPrototypeOf polyfill
+    result[IE_PROTO] = O;
+  } else result = createDict();
+  return Properties === undefined ? result : dPs(result, Properties);
+};
 
-  // 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
-  })
 
-  function ReadStream (path, options) {
-    if (this instanceof ReadStream)
-      return fs$ReadStream.apply(this, arguments), this
-    else
-      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
-  }
+/***/ }),
+/* 193 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  function ReadStream$open () {
-    var that = this
-    open(that.path, that.flags, that.mode, function (err, fd) {
-      if (err) {
-        if (that.autoClose)
-          that.destroy()
+var dP = __webpack_require__(50);
+var anObject = __webpack_require__(27);
+var getKeys = __webpack_require__(132);
 
-        that.emit('error', err)
-      } else {
-        that.fd = fd
-        that.emit('open', fd)
-        that.read()
-      }
-    })
-  }
+module.exports = __webpack_require__(33) ? Object.defineProperties : function defineProperties(O, Properties) {
+  anObject(O);
+  var keys = getKeys(Properties);
+  var length = keys.length;
+  var i = 0;
+  var P;
+  while (length > i) dP.f(O, P = keys[i++], Properties[P]);
+  return O;
+};
 
-  function WriteStream (path, options) {
-    if (this instanceof WriteStream)
-      return fs$WriteStream.apply(this, arguments), this
-    else
-      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
-  }
 
-  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)
-      }
-    })
-  }
+/***/ }),
+/* 194 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  function createReadStream (path, options) {
-    return new fs.ReadStream(path, options)
-  }
+// 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O)
+var has = __webpack_require__(49);
+var toObject = __webpack_require__(133);
+var IE_PROTO = __webpack_require__(72)('IE_PROTO');
+var ObjectProto = Object.prototype;
 
-  function createWriteStream (path, options) {
-    return new fs.WriteStream(path, options)
-  }
+module.exports = Object.getPrototypeOf || function (O) {
+  O = toObject(O);
+  if (has(O, IE_PROTO)) return O[IE_PROTO];
+  if (typeof O.constructor == 'function' && O instanceof O.constructor) {
+    return O.constructor.prototype;
+  } return O instanceof Object ? ObjectProto : null;
+};
 
-  var fs$open = fs.open
-  fs.open = open
-  function open (path, flags, mode, cb) {
-    if (typeof mode === 'function')
-      cb = mode, mode = null
 
-    return go$open(path, flags, mode, cb)
+/***/ }),
+/* 195 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    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()
-        }
-      })
-    }
+var has = __webpack_require__(49);
+var toIObject = __webpack_require__(74);
+var arrayIndexOf = __webpack_require__(182)(false);
+var IE_PROTO = __webpack_require__(72)('IE_PROTO');
+
+module.exports = function (object, names) {
+  var O = toIObject(object);
+  var i = 0;
+  var result = [];
+  var key;
+  for (key in O) if (key != IE_PROTO) has(O, key) && result.push(key);
+  // Don't enum bug & hidden keys
+  while (names.length > i) if (has(O, key = names[i++])) {
+    ~arrayIndexOf(result, key) || result.push(key);
   }
+  return result;
+};
+
+
+/***/ }),
+/* 196 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var hide = __webpack_require__(31);
+module.exports = function (target, src, safe) {
+  for (var key in src) {
+    if (safe && target[key]) target[key] = src[key];
+    else hide(target, key, src[key]);
+  } return target;
+};
+
+
+/***/ }),
+/* 197 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(31);
+
 
-  return fs
-}
+/***/ }),
+/* 198 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function enqueue (elem) {
-  debug('ENQUEUE', elem[0].name, elem[1])
-  global[gracefulQueue].push(elem)
-}
+"use strict";
 
-function retry () {
-  var elem = global[gracefulQueue].shift()
-  if (elem) {
-    debug('RETRY', elem[0].name, elem[1])
-    elem[0].apply(null, elem[1])
-  }
-}
+var global = __webpack_require__(11);
+var core = __webpack_require__(23);
+var dP = __webpack_require__(50);
+var DESCRIPTORS = __webpack_require__(33);
+var SPECIES = __webpack_require__(13)('species');
+
+module.exports = function (KEY) {
+  var C = typeof core[KEY] == 'function' ? core[KEY] : global[KEY];
+  if (DESCRIPTORS && C && !C[SPECIES]) dP.f(C, SPECIES, {
+    configurable: true,
+    get: function () { return this; }
+  });
+};
 
 
 /***/ }),
-/* 251 */
+/* 199 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var constants = __webpack_require__(26)
+var toInteger = __webpack_require__(73);
+var defined = __webpack_require__(67);
+// true  -> String#at
+// false -> String#codePointAt
+module.exports = function (TO_STRING) {
+  return function (that, pos) {
+    var s = String(defined(that));
+    var i = toInteger(pos);
+    var l = s.length;
+    var a, b;
+    if (i < 0 || i >= l) return TO_STRING ? '' : undefined;
+    a = s.charCodeAt(i);
+    return a < 0xd800 || a > 0xdbff || i + 1 === l || (b = s.charCodeAt(i + 1)) < 0xdc00 || b > 0xdfff
+      ? TO_STRING ? s.charAt(i) : a
+      : TO_STRING ? s.slice(i, i + 2) : (a - 0xd800 << 10) + (b - 0xdc00) + 0x10000;
+  };
+};
 
-var origCwd = process.cwd
-var cwd = null
 
-var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
+/***/ }),
+/* 200 */
+/***/ (function(module, exports, __webpack_require__) {
 
-process.cwd = function() {
-  if (!cwd)
-    cwd = origCwd.call(process)
-  return cwd
-}
-try {
-  process.cwd()
-} catch (er) {}
+var toInteger = __webpack_require__(73);
+var max = Math.max;
+var min = Math.min;
+module.exports = function (index, length) {
+  index = toInteger(index);
+  return index < 0 ? max(index + length, 0) : min(index, length);
+};
 
-var chdir = process.chdir
-process.chdir = function(d) {
-  cwd = null
-  chdir.call(process, d)
-}
 
-module.exports = patch
+/***/ }),
+/* 201 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function patch (fs) {
-  // (re-)implement some things that are known busted or missing.
+// 7.1.1 ToPrimitive(input [, PreferredType])
+var isObject = __webpack_require__(34);
+// instead of the ES6 spec version, we didn't implement @@toPrimitive case
+// and the second argument - flag - preferred type is a string
+module.exports = function (it, S) {
+  if (!isObject(it)) return it;
+  var fn, val;
+  if (S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
+  if (typeof (fn = it.valueOf) == 'function' && !isObject(val = fn.call(it))) return val;
+  if (!S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
+  throw TypeError("Can't convert object to primitive value");
+};
 
-  // 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)
-  }
 
-  // lutimes implementation, or no-op
-  if (!fs.lutimes) {
-    patchLutimes(fs)
-  }
+/***/ }),
+/* 202 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // 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.
+var global = __webpack_require__(11);
+var navigator = global.navigator;
 
-  fs.chown = chownFix(fs.chown)
-  fs.fchown = chownFix(fs.fchown)
-  fs.lchown = chownFix(fs.lchown)
+module.exports = navigator && navigator.userAgent || '';
 
-  fs.chmod = chmodFix(fs.chmod)
-  fs.fchmod = chmodFix(fs.fchmod)
-  fs.lchmod = chmodFix(fs.lchmod)
 
-  fs.chownSync = chownFixSync(fs.chownSync)
-  fs.fchownSync = chownFixSync(fs.fchownSync)
-  fs.lchownSync = chownFixSync(fs.lchownSync)
+/***/ }),
+/* 203 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  fs.chmodSync = chmodFixSync(fs.chmodSync)
-  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
-  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
+var classof = __webpack_require__(100);
+var ITERATOR = __webpack_require__(13)('iterator');
+var Iterators = __webpack_require__(35);
+module.exports = __webpack_require__(23).getIteratorMethod = function (it) {
+  if (it != undefined) return it[ITERATOR]
+    || it['@@iterator']
+    || Iterators[classof(it)];
+};
 
-  fs.stat = statFix(fs.stat)
-  fs.fstat = statFix(fs.fstat)
-  fs.lstat = statFix(fs.lstat)
 
-  fs.statSync = statFixSync(fs.statSync)
-  fs.fstatSync = statFixSync(fs.fstatSync)
-  fs.lstatSync = statFixSync(fs.lstatSync)
+/***/ }),
+/* 204 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  // 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 () {}
-  }
+"use strict";
 
-  // 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.
+var addToUnscopables = __webpack_require__(180);
+var step = __webpack_require__(190);
+var Iterators = __webpack_require__(35);
+var toIObject = __webpack_require__(74);
 
-  // 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)
+// 22.1.3.4 Array.prototype.entries()
+// 22.1.3.13 Array.prototype.keys()
+// 22.1.3.29 Array.prototype.values()
+// 22.1.3.30 Array.prototype[@@iterator]()
+module.exports = __webpack_require__(103)(Array, 'Array', function (iterated, kind) {
+  this._t = toIObject(iterated); // target
+  this._i = 0;                   // next index
+  this._k = kind;                // kind
+// 22.1.5.2.1 %ArrayIteratorPrototype%.next()
+}, function () {
+  var O = this._t;
+  var kind = this._k;
+  var index = this._i++;
+  if (!O || index >= O.length) {
+    this._t = undefined;
+    return step(1);
   }
+  if (kind == 'keys') return step(0, index);
+  if (kind == 'values') return step(0, O[index]);
+  return step(0, [index, O[index]]);
+}, 'values');
 
-  // 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)
-    }
+// argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7)
+Iterators.Arguments = Iterators.Array;
 
-    // This ensures `util.promisify` works as it does for native `fs.read`.
-    read.__proto__ = fs$read
-    return read
-  })(fs.read)
+addToUnscopables('keys');
+addToUnscopables('values');
+addToUnscopables('entries');
 
-  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)
 
-  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)
-          })
-        })
-      })
-    }
+/***/ }),
+/* 205 */
+/***/ (function(module, exports) {
 
-    fs.lchmodSync = function (path, mode) {
-      var fd = fs.openSync(path, constants.O_WRONLY | constants.O_SYMLINK, mode)
 
-      // 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
+
+/***/ }),
+/* 206 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var LIBRARY = __webpack_require__(69);
+var global = __webpack_require__(11);
+var ctx = __webpack_require__(48);
+var classof = __webpack_require__(100);
+var $export = __webpack_require__(41);
+var isObject = __webpack_require__(34);
+var aFunction = __webpack_require__(46);
+var anInstance = __webpack_require__(181);
+var forOf = __webpack_require__(183);
+var speciesConstructor = __webpack_require__(108);
+var task = __webpack_require__(109).set;
+var microtask = __webpack_require__(191)();
+var newPromiseCapabilityModule = __webpack_require__(70);
+var perform = __webpack_require__(104);
+var userAgent = __webpack_require__(202);
+var promiseResolve = __webpack_require__(105);
+var PROMISE = 'Promise';
+var TypeError = global.TypeError;
+var process = global.process;
+var versions = process && process.versions;
+var v8 = versions && versions.v8 || '';
+var $Promise = global[PROMISE];
+var isNode = classof(process) == 'process';
+var empty = function () { /* empty */ };
+var Internal, newGenericPromiseCapability, OwnPromiseCapability, Wrapper;
+var newPromiseCapability = newGenericPromiseCapability = newPromiseCapabilityModule.f;
+
+var USE_NATIVE = !!function () {
+  try {
+    // correct subclassing with @@species support
+    var promise = $Promise.resolve(1);
+    var FakePromise = (promise.constructor = {})[__webpack_require__(13)('species')] = function (exec) {
+      exec(empty, empty);
+    };
+    // unhandled rejections tracking support, NodeJS Promise without it fails @@species test
+    return (isNode || typeof PromiseRejectionEvent == 'function')
+      && promise.then(empty) instanceof FakePromise
+      // v8 6.6 (Node 10 and Chrome 66) have a bug with resolving custom thenables
+      // https://bugs.chromium.org/p/chromium/issues/detail?id=830565
+      // we can't detect it synchronously, so just check versions
+      && v8.indexOf('6.6') !== 0
+      && userAgent.indexOf('Chrome/66') === -1;
+  } catch (e) { /* empty */ }
+}();
+
+// helpers
+var isThenable = function (it) {
+  var then;
+  return isObject(it) && typeof (then = it.then) == 'function' ? then : false;
+};
+var notify = function (promise, isReject) {
+  if (promise._n) return;
+  promise._n = true;
+  var chain = promise._c;
+  microtask(function () {
+    var value = promise._v;
+    var ok = promise._s == 1;
+    var i = 0;
+    var run = function (reaction) {
+      var handler = ok ? reaction.ok : reaction.fail;
+      var resolve = reaction.resolve;
+      var reject = reaction.reject;
+      var domain = reaction.domain;
+      var result, then, exited;
       try {
-        ret = fs.fchmodSync(fd, mode)
-        threw = false
-      } finally {
-        if (threw) {
-          try {
-            fs.closeSync(fd)
-          } catch (er) {}
-        } else {
-          fs.closeSync(fd)
+        if (handler) {
+          if (!ok) {
+            if (promise._h == 2) onHandleUnhandled(promise);
+            promise._h = 1;
+          }
+          if (handler === true) result = value;
+          else {
+            if (domain) domain.enter();
+            result = handler(value); // may throw
+            if (domain) {
+              domain.exit();
+              exited = true;
+            }
+          }
+          if (result === reaction.promise) {
+            reject(TypeError('Promise-chain cycle'));
+          } else if (then = isThenable(result)) {
+            then.call(result, resolve, reject);
+          } else resolve(result);
+        } else reject(value);
+      } catch (e) {
+        if (domain && !exited) domain.exit();
+        reject(e);
+      }
+    };
+    while (chain.length > i) run(chain[i++]); // variable length - can't use forEach
+    promise._c = [];
+    promise._n = false;
+    if (isReject && !promise._h) onUnhandled(promise);
+  });
+};
+var onUnhandled = function (promise) {
+  task.call(global, function () {
+    var value = promise._v;
+    var unhandled = isUnhandled(promise);
+    var result, handler, console;
+    if (unhandled) {
+      result = perform(function () {
+        if (isNode) {
+          process.emit('unhandledRejection', value, promise);
+        } else if (handler = global.onunhandledrejection) {
+          handler({ promise: promise, reason: value });
+        } else if ((console = global.console) && console.error) {
+          console.error('Unhandled promise rejection', value);
         }
-      }
-      return ret
+      });
+      // Browsers should not trigger `rejectionHandled` event if it was handled here, NodeJS - should
+      promise._h = isNode || isUnhandled(promise) ? 2 : 1;
+    } promise._a = undefined;
+    if (unhandled && result.e) throw result.v;
+  });
+};
+var isUnhandled = function (promise) {
+  return promise._h !== 1 && (promise._a || promise._c).length === 0;
+};
+var onHandleUnhandled = function (promise) {
+  task.call(global, function () {
+    var handler;
+    if (isNode) {
+      process.emit('rejectionHandled', promise);
+    } else if (handler = global.onrejectionhandled) {
+      handler({ promise: promise, reason: promise._v });
     }
-  }
-
-  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)
-            })
-          })
-        })
-      }
-
-      fs.lutimesSync = function (path, at, mt) {
-        var fd = fs.openSync(path, constants.O_SYMLINK)
-        var ret
-        var threw = true
+  });
+};
+var $reject = function (value) {
+  var promise = this;
+  if (promise._d) return;
+  promise._d = true;
+  promise = promise._w || promise; // unwrap
+  promise._v = value;
+  promise._s = 2;
+  if (!promise._a) promise._a = promise._c.slice();
+  notify(promise, true);
+};
+var $resolve = function (value) {
+  var promise = this;
+  var then;
+  if (promise._d) return;
+  promise._d = true;
+  promise = promise._w || promise; // unwrap
+  try {
+    if (promise === value) throw TypeError("Promise can't be resolved itself");
+    if (then = isThenable(value)) {
+      microtask(function () {
+        var wrapper = { _w: promise, _d: false }; // wrap
         try {
-          ret = fs.futimesSync(fd, at, mt)
-          threw = false
-        } finally {
-          if (threw) {
-            try {
-              fs.closeSync(fd)
-            } catch (er) {}
-          } else {
-            fs.closeSync(fd)
-          }
+          then.call(value, ctx($resolve, wrapper, 1), ctx($reject, wrapper, 1));
+        } catch (e) {
+          $reject.call(wrapper, e);
         }
-        return ret
-      }
-
+      });
     } else {
-      fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
-      fs.lutimesSync = function () {}
-    }
-  }
-
-  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)
-      })
+      promise._v = value;
+      promise._s = 1;
+      notify(promise, false);
     }
+  } catch (e) {
+    $reject.call({ _w: promise, _d: false }, e); // wrap
   }
+};
 
-  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
-      }
+// constructor polyfill
+if (!USE_NATIVE) {
+  // 25.4.3.1 Promise(executor)
+  $Promise = function Promise(executor) {
+    anInstance(this, $Promise, PROMISE, '_h');
+    aFunction(executor);
+    Internal.call(this);
+    try {
+      executor(ctx($resolve, this, 1), ctx($reject, this, 1));
+    } catch (err) {
+      $reject.call(this, err);
     }
-  }
-
-
-  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)
-      })
+  };
+  // eslint-disable-next-line no-unused-vars
+  Internal = function Promise(executor) {
+    this._c = [];             // <- awaiting reactions
+    this._a = undefined;      // <- checked in isUnhandled reactions
+    this._s = 0;              // <- state
+    this._d = false;          // <- done
+    this._v = undefined;      // <- value
+    this._h = 0;              // <- rejection state, 0 - default, 1 - handled, 2 - unhandled
+    this._n = false;          // <- notify
+  };
+  Internal.prototype = __webpack_require__(196)($Promise.prototype, {
+    // 25.4.5.3 Promise.prototype.then(onFulfilled, onRejected)
+    then: function then(onFulfilled, onRejected) {
+      var reaction = newPromiseCapability(speciesConstructor(this, $Promise));
+      reaction.ok = typeof onFulfilled == 'function' ? onFulfilled : true;
+      reaction.fail = typeof onRejected == 'function' && onRejected;
+      reaction.domain = isNode ? process.domain : undefined;
+      this._c.push(reaction);
+      if (this._a) this._a.push(reaction);
+      if (this._s) notify(this, false);
+      return reaction.promise;
+    },
+    // 25.4.5.1 Promise.prototype.catch(onRejected)
+    'catch': function (onRejected) {
+      return this.then(undefined, onRejected);
     }
-  }
+  });
+  OwnPromiseCapability = function () {
+    var promise = new Internal();
+    this.promise = promise;
+    this.resolve = ctx($resolve, promise, 1);
+    this.reject = ctx($reject, promise, 1);
+  };
+  newPromiseCapabilityModule.f = newPromiseCapability = function (C) {
+    return C === $Promise || C === Wrapper
+      ? new OwnPromiseCapability(C)
+      : newGenericPromiseCapability(C);
+  };
+}
 
-  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
-      }
-    }
-  }
+$export($export.G + $export.W + $export.F * !USE_NATIVE, { Promise: $Promise });
+__webpack_require__(71)($Promise, PROMISE);
+__webpack_require__(198)(PROMISE);
+Wrapper = __webpack_require__(23)[PROMISE];
 
-  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)
-    }
+// statics
+$export($export.S + $export.F * !USE_NATIVE, PROMISE, {
+  // 25.4.4.5 Promise.reject(r)
+  reject: function reject(r) {
+    var capability = newPromiseCapability(this);
+    var $$reject = capability.reject;
+    $$reject(r);
+    return capability.promise;
   }
-
-  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;
-    }
+});
+$export($export.S + $export.F * (LIBRARY || !USE_NATIVE), PROMISE, {
+  // 25.4.4.6 Promise.resolve(x)
+  resolve: function resolve(x) {
+    return promiseResolve(LIBRARY && this === Wrapper ? $Promise : this, x);
   }
-
-  // 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 (er.code === "ENOSYS")
-      return true
-
-    var nonroot = !process.getuid || process.getuid() !== 0
-    if (nonroot) {
-      if (er.code === "EINVAL" || er.code === "EPERM")
-        return true
-    }
-
-    return false
+});
+$export($export.S + $export.F * !(USE_NATIVE && __webpack_require__(189)(function (iter) {
+  $Promise.all(iter)['catch'](empty);
+})), PROMISE, {
+  // 25.4.4.1 Promise.all(iterable)
+  all: function all(iterable) {
+    var C = this;
+    var capability = newPromiseCapability(C);
+    var resolve = capability.resolve;
+    var reject = capability.reject;
+    var result = perform(function () {
+      var values = [];
+      var index = 0;
+      var remaining = 1;
+      forOf(iterable, false, function (promise) {
+        var $index = index++;
+        var alreadyCalled = false;
+        values.push(undefined);
+        remaining++;
+        C.resolve(promise).then(function (value) {
+          if (alreadyCalled) return;
+          alreadyCalled = true;
+          values[$index] = value;
+          --remaining || resolve(values);
+        }, reject);
+      });
+      --remaining || resolve(values);
+    });
+    if (result.e) reject(result.v);
+    return capability.promise;
+  },
+  // 25.4.4.4 Promise.race(iterable)
+  race: function race(iterable) {
+    var C = this;
+    var capability = newPromiseCapability(C);
+    var reject = capability.reject;
+    var result = perform(function () {
+      forOf(iterable, false, function (promise) {
+        C.resolve(promise).then(capability.resolve, reject);
+      });
+    });
+    if (result.e) reject(result.v);
+    return capability.promise;
   }
-}
+});
 
 
 /***/ }),
-/* 252 */
+/* 207 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var Stream = __webpack_require__(28).Stream
-
-module.exports = legacy
-
-function legacy (fs) {
-  return {
-    ReadStream: ReadStream,
-    WriteStream: WriteStream
-  }
-
-  function ReadStream (path, options) {
-    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
-
-    Stream.call(this);
-
-    var self = this;
+"use strict";
 
-    this.path = path;
-    this.fd = null;
-    this.readable = true;
-    this.paused = false;
+var $at = __webpack_require__(199)(true);
 
-    this.flags = 'r';
-    this.mode = 438; /*=0666*/
-    this.bufferSize = 64 * 1024;
+// 21.1.3.27 String.prototype[@@iterator]()
+__webpack_require__(103)(String, 'String', function (iterated) {
+  this._t = String(iterated); // target
+  this._i = 0;                // next index
+// 21.1.5.2.1 %StringIteratorPrototype%.next()
+}, function () {
+  var O = this._t;
+  var index = this._i;
+  var point;
+  if (index >= O.length) return { value: undefined, done: true };
+  point = $at(O, index);
+  this._i += point.length;
+  return { value: point, done: false };
+});
 
-    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];
-    }
+/***/ }),
+/* 208 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    if (this.encoding) this.setEncoding(this.encoding);
+"use strict";
+// https://github.com/tc39/proposal-promise-finally
+
+var $export = __webpack_require__(41);
+var core = __webpack_require__(23);
+var global = __webpack_require__(11);
+var speciesConstructor = __webpack_require__(108);
+var promiseResolve = __webpack_require__(105);
+
+$export($export.P + $export.R, 'Promise', { 'finally': function (onFinally) {
+  var C = speciesConstructor(this, core.Promise || global.Promise);
+  var isFunction = typeof onFinally == 'function';
+  return this.then(
+    isFunction ? function (x) {
+      return promiseResolve(C, onFinally()).then(function () { return x; });
+    } : onFinally,
+    isFunction ? function (e) {
+      return promiseResolve(C, onFinally()).then(function () { throw e; });
+    } : onFinally
+  );
+} });
 
-    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');
-      }
 
-      if (this.start > this.end) {
-        throw new Error('start must be <= end');
-      }
+/***/ }),
+/* 209 */
+/***/ (function(module, exports, __webpack_require__) {
 
-      this.pos = this.start;
-    }
+"use strict";
 
-    if (this.fd !== null) {
-      process.nextTick(function() {
-        self._read();
-      });
-      return;
-    }
+// https://github.com/tc39/proposal-promise-try
+var $export = __webpack_require__(41);
+var newPromiseCapability = __webpack_require__(70);
+var perform = __webpack_require__(104);
 
-    fs.open(this.path, this.flags, this.mode, function (err, fd) {
-      if (err) {
-        self.emit('error', err);
-        self.readable = false;
-        return;
-      }
+$export($export.S, 'Promise', { 'try': function (callbackfn) {
+  var promiseCapability = newPromiseCapability.f(this);
+  var result = perform(callbackfn);
+  (result.e ? promiseCapability.reject : promiseCapability.resolve)(result.v);
+  return promiseCapability.promise;
+} });
 
-      self.fd = fd;
-      self.emit('open', fd);
-      self._read();
-    })
-  }
 
-  function WriteStream (path, options) {
-    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
+/***/ }),
+/* 210 */
+/***/ (function(module, exports, __webpack_require__) {
 
-    Stream.call(this);
+__webpack_require__(204);
+var global = __webpack_require__(11);
+var hide = __webpack_require__(31);
+var Iterators = __webpack_require__(35);
+var TO_STRING_TAG = __webpack_require__(13)('toStringTag');
 
-    this.path = path;
-    this.fd = null;
-    this.writable = true;
+var DOMIterables = ('CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,' +
+  'DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,' +
+  'MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,' +
+  'SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,' +
+  'TextTrackList,TouchList').split(',');
 
-    this.flags = 'w';
-    this.encoding = 'binary';
-    this.mode = 438; /*=0666*/
-    this.bytesWritten = 0;
+for (var i = 0; i < DOMIterables.length; i++) {
+  var NAME = DOMIterables[i];
+  var Collection = global[NAME];
+  var proto = Collection && Collection.prototype;
+  if (proto && !proto[TO_STRING_TAG]) hide(proto, TO_STRING_TAG, NAME);
+  Iterators[NAME] = Iterators.Array;
+}
 
-    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];
-    }
+/***/ }),
+/* 211 */
+/***/ (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');
-      }
+/**
+ * This is the web browser implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-      this.pos = this.start;
-    }
+exports = module.exports = __webpack_require__(112);
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
+exports.storage = 'undefined' != typeof chrome
+               && 'undefined' != typeof chrome.storage
+                  ? chrome.storage.local
+                  : localstorage();
 
-    this.busy = false;
-    this._queue = [];
+/**
+ * Colors.
+ */
 
-    if (this.fd === null) {
-      this._open = fs.open;
-      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
-      this.flush();
-    }
-  }
-}
+exports.colors = [
+  '#0000CC', '#0000FF', '#0033CC', '#0033FF', '#0066CC', '#0066FF', '#0099CC',
+  '#0099FF', '#00CC00', '#00CC33', '#00CC66', '#00CC99', '#00CCCC', '#00CCFF',
+  '#3300CC', '#3300FF', '#3333CC', '#3333FF', '#3366CC', '#3366FF', '#3399CC',
+  '#3399FF', '#33CC00', '#33CC33', '#33CC66', '#33CC99', '#33CCCC', '#33CCFF',
+  '#6600CC', '#6600FF', '#6633CC', '#6633FF', '#66CC00', '#66CC33', '#9900CC',
+  '#9900FF', '#9933CC', '#9933FF', '#99CC00', '#99CC33', '#CC0000', '#CC0033',
+  '#CC0066', '#CC0099', '#CC00CC', '#CC00FF', '#CC3300', '#CC3333', '#CC3366',
+  '#CC3399', '#CC33CC', '#CC33FF', '#CC6600', '#CC6633', '#CC9900', '#CC9933',
+  '#CCCC00', '#CCCC33', '#FF0000', '#FF0033', '#FF0066', '#FF0099', '#FF00CC',
+  '#FF00FF', '#FF3300', '#FF3333', '#FF3366', '#FF3399', '#FF33CC', '#FF33FF',
+  '#FF6600', '#FF6633', '#FF9900', '#FF9933', '#FFCC00', '#FFCC33'
+];
 
+/**
+ * Currently only WebKit-based Web Inspectors, Firefox >= v31,
+ * and the Firebug extension (any Firefox version) are known
+ * to support "%c" CSS customizations.
+ *
+ * TODO: add a `localStorage` variable to explicitly enable/disable colors
+ */
 
-/***/ }),
-/* 253 */
-/***/ (function(module, exports, __webpack_require__) {
+function useColors() {
+  // NB: In an Electron preload script, document will be defined but not fully
+  // initialized. Since we know we're in Chrome, we'll just detect this case
+  // explicitly
+  if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
+    return true;
+  }
 
-"use strict";
+  // Internet Explorer and Edge do not support colors.
+  if (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
+    return false;
+  }
 
+  // is webkit? http://stackoverflow.com/a/16459606/376773
+  // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
+  return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
+    // is firebug? http://stackoverflow.com/a/398120/376773
+    (typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
+    // is firefox >= v31?
+    // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
+    // double check webkit in userAgent just in case we are in a worker
+    (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
+}
 
-module.exports = clone
+/**
+ * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+ */
 
-function clone (obj) {
-  if (obj === null || typeof obj !== 'object')
-    return obj
+exports.formatters.j = function(v) {
+  try {
+    return JSON.stringify(v);
+  } catch (err) {
+    return '[UnexpectedJSONParseError]: ' + err.message;
+  }
+};
 
-  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))
-  })
+/**
+ * Colorize log arguments if enabled.
+ *
+ * @api public
+ */
 
-  return copy
-}
+function formatArgs(args) {
+  var useColors = this.useColors;
 
+  args[0] = (useColors ? '%c' : '')
+    + this.namespace
+    + (useColors ? ' %c' : ' ')
+    + args[0]
+    + (useColors ? '%c ' : ' ')
+    + '+' + exports.humanize(this.diff);
 
-/***/ }),
-/* 254 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (!useColors) return;
 
-"use strict";
+  var c = 'color: ' + this.color;
+  args.splice(1, 0, c, 'color: inherit')
 
-const path = __webpack_require__(16);
+  // the final "%c" is somewhat tricky, because there could be other
+  // arguments passed either before or after the %c, so we need to
+  // figure out the correct index to insert the CSS into
+  var index = 0;
+  var lastC = 0;
+  args[0].replace(/%[a-zA-Z%]/g, function(match) {
+    if ('%%' === match) return;
+    index++;
+    if ('%c' === match) {
+      // we only are interested in the *last* %c
+      // (the user may have provided their own)
+      lastC = index;
+    }
+  });
 
-module.exports = path_ => {
-	let cwd = process.cwd();
+  args.splice(lastC, 0, c);
+}
 
-	path_ = path.resolve(path_);
+/**
+ * Invokes `console.log()` when available.
+ * No-op when `console.log` is not a "function".
+ *
+ * @api public
+ */
 
-	if (process.platform === 'win32') {
-		cwd = cwd.toLowerCase();
-		path_ = path_.toLowerCase();
-	}
+function log() {
+  // this hackery is required for IE8/9, where
+  // the `console.log` function doesn't have 'apply'
+  return 'object' === typeof console
+    && console.log
+    && Function.prototype.apply.call(console.log, console, arguments);
+}
 
-	return path_ === cwd;
-};
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
 
+function save(namespaces) {
+  try {
+    if (null == namespaces) {
+      exports.storage.removeItem('debug');
+    } else {
+      exports.storage.debug = namespaces;
+    }
+  } catch(e) {}
+}
 
-/***/ }),
-/* 255 */
-/***/ (function(module, exports, __webpack_require__) {
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
 
-"use strict";
+function load() {
+  var r;
+  try {
+    r = exports.storage.debug;
+  } catch(e) {}
 
-const path = __webpack_require__(16);
+  // If debug isn't set in LS, and we're in Electron, try to load $DEBUG
+  if (!r && typeof process !== 'undefined' && 'env' in process) {
+    r = process.env.DEBUG;
+  }
 
-module.exports = (childPath, parentPath) => {
-	childPath = path.resolve(childPath);
-	parentPath = path.resolve(parentPath);
+  return r;
+}
 
-	if (process.platform === 'win32') {
-		childPath = childPath.toLowerCase();
-		parentPath = parentPath.toLowerCase();
-	}
+/**
+ * Enable namespaces listed in `localStorage.debug` initially.
+ */
 
-	if (childPath === parentPath) {
-		return false;
-	}
+exports.enable(load());
 
-	childPath += path.sep;
-	parentPath += path.sep;
+/**
+ * Localstorage attempts to return the localstorage.
+ *
+ * This is necessary because safari throws
+ * when a user disables cookies/localstorage
+ * and you attempt to access it.
+ *
+ * @return {LocalStorage}
+ * @api private
+ */
 
-	return childPath.startsWith(parentPath);
-};
+function localstorage() {
+  try {
+    return window.localStorage;
+  } catch (e) {}
+}
 
 
 /***/ }),
-/* 256 */
+/* 212 */
 /***/ (function(module, exports, __webpack_require__) {
 
-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.
-}
+/**
+ * Detect Electron renderer process, which is node, but we should
+ * treat as a browser.
+ */
 
-const defaultGlobOpts = {
-  nosort: true,
-  silent: true
+if (typeof process === 'undefined' || process.type === 'renderer') {
+  module.exports = __webpack_require__(211);
+} else {
+  module.exports = __webpack_require__(213);
 }
 
-// for EMFILE handling
-let timeout = 0
 
-const isWindows = (process.platform === "win32")
+/***/ }),
+/* 213 */
+/***/ (function(module, exports, __webpack_require__) {
 
-const defaults = options => {
-  const methods = [
-    'unlink',
-    'chmod',
-    'stat',
-    'lstat',
-    'rmdir',
-    'readdir'
-  ]
-  methods.forEach(m => {
-    options[m] = options[m] || fs[m]
-    m = m + 'Sync'
-    options[m] = options[m] || fs[m]
-  })
+/**
+ * Module dependencies.
+ */
 
-  options.maxBusyTries = options.maxBusyTries || 3
-  options.emfileWait = options.emfileWait || 1000
-  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
-}
+var tty = __webpack_require__(79);
+var util = __webpack_require__(2);
 
-const rimraf = (p, options, cb) => {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
+/**
+ * This is the Node.js implementation of `debug()`.
+ *
+ * Expose `debug()` as the module.
+ */
 
-  assert(p, 'rimraf: missing path')
-  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
-  assert.equal(typeof cb, 'function', 'rimraf: callback function required')
-  assert(options, 'rimraf: invalid options argument provided')
-  assert.equal(typeof options, 'object', 'rimraf: options should be object')
+exports = module.exports = __webpack_require__(112);
+exports.init = init;
+exports.log = log;
+exports.formatArgs = formatArgs;
+exports.save = save;
+exports.load = load;
+exports.useColors = useColors;
 
-  defaults(options)
+/**
+ * Colors.
+ */
 
-  let busyTries = 0
-  let errState = null
-  let n = 0
+exports.colors = [ 6, 2, 3, 4, 5, 1 ];
 
-  const next = (er) => {
-    errState = errState || er
-    if (--n === 0)
-      cb(errState)
+try {
+  var supportsColor = __webpack_require__(239);
+  if (supportsColor && supportsColor.level >= 2) {
+    exports.colors = [
+      20, 21, 26, 27, 32, 33, 38, 39, 40, 41, 42, 43, 44, 45, 56, 57, 62, 63, 68,
+      69, 74, 75, 76, 77, 78, 79, 80, 81, 92, 93, 98, 99, 112, 113, 128, 129, 134,
+      135, 148, 149, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
+      172, 173, 178, 179, 184, 185, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+      205, 206, 207, 208, 209, 214, 215, 220, 221
+    ];
   }
+} catch (err) {
+  // swallow - we only care if `supports-color` is available; it doesn't have to be.
+}
 
-  const afterGlob = (er, results) => {
-    if (er)
-      return cb(er)
+/**
+ * Build up the default `inspectOpts` object from the environment variables.
+ *
+ *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
+ */
 
-    n = results.length
-    if (n === 0)
-      return cb()
+exports.inspectOpts = Object.keys(process.env).filter(function (key) {
+  return /^debug_/i.test(key);
+}).reduce(function (obj, key) {
+  // camel-case
+  var prop = key
+    .substring(6)
+    .toLowerCase()
+    .replace(/_([a-z])/g, function (_, k) { return k.toUpperCase() });
 
-    results.forEach(p => {
-      const CB = (er) => {
-        if (er) {
-          if ((er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") &&
-              busyTries < options.maxBusyTries) {
-            busyTries ++
-            // try again, with the same exact callback as this one.
-            return setTimeout(() => rimraf_(p, options, CB), busyTries * 100)
-          }
+  // coerce string value into JS value
+  var val = process.env[key];
+  if (/^(yes|on|true|enabled)$/i.test(val)) val = true;
+  else if (/^(no|off|false|disabled)$/i.test(val)) val = false;
+  else if (val === 'null') val = null;
+  else val = Number(val);
 
-          // this one won't happen if graceful-fs is used.
-          if (er.code === "EMFILE" && timeout < options.emfileWait) {
-            return setTimeout(() => rimraf_(p, options, CB), timeout ++)
-          }
+  obj[prop] = val;
+  return obj;
+}, {});
 
-          // already gone
-          if (er.code === "ENOENT") er = null
-        }
+/**
+ * Is stdout a TTY? Colored output is enabled when `true`.
+ */
 
-        timeout = 0
-        next(er)
-      }
-      rimraf_(p, options, CB)
-    })
-  }
+function useColors() {
+  return 'colors' in exports.inspectOpts
+    ? Boolean(exports.inspectOpts.colors)
+    : tty.isatty(process.stderr.fd);
+}
 
-  if (options.disableGlob || !glob.hasMagic(p))
-    return afterGlob(null, [p])
+/**
+ * Map %o to `util.inspect()`, all on a single line.
+ */
 
-  options.lstat(p, (er, stat) => {
-    if (!er)
-      return afterGlob(null, [p])
+exports.formatters.o = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts)
+    .split('\n').map(function(str) {
+      return str.trim()
+    }).join(' ');
+};
 
-    glob(p, options.glob, afterGlob)
-  })
+/**
+ * Map %o to `util.inspect()`, allowing multiple lines if needed.
+ */
 
-}
+exports.formatters.O = function(v) {
+  this.inspectOpts.colors = this.useColors;
+  return util.inspect(v, this.inspectOpts);
+};
 
-// Two possible strategies.
-// 1. Assume it's a file.  unlink it, then do the dir stuff on EPERM or EISDIR
-// 2. Assume it's a directory.  readdir, then do the file stuff on ENOTDIR
-//
-// Both result in an extra syscall when you guess wrong.  However, there
-// are likely far more normal files in the world than directories.  This
-// is based on the assumption that a the average number of files per
-// directory is >= 1.
-//
-// If anyone ever complains about this, then I guess the strategy could
-// be made configurable somehow.  But until then, YAGNI.
-const rimraf_ = (p, options, cb) => {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+/**
+ * Adds ANSI color escape codes if enabled.
+ *
+ * @api public
+ */
 
-  // 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, (er, st) => {
-    if (er && er.code === "ENOENT")
-      return cb(null)
+function formatArgs(args) {
+  var name = this.namespace;
+  var useColors = this.useColors;
 
-    // Windows can EPERM on stat.  Life is suffering.
-    if (er && er.code === "EPERM" && isWindows)
-      fixWinEPERM(p, options, er, cb)
+  if (useColors) {
+    var c = this.color;
+    var colorCode = '\u001b[3' + (c < 8 ? c : '8;5;' + c);
+    var prefix = '  ' + colorCode + ';1m' + name + ' ' + '\u001b[0m';
 
-    if (st && st.isDirectory())
-      return rmdir(p, options, er, cb)
+    args[0] = prefix + args[0].split('\n').join('\n' + prefix);
+    args.push(colorCode + 'm+' + exports.humanize(this.diff) + '\u001b[0m');
+  } else {
+    args[0] = getDate() + name + ' ' + args[0];
+  }
+}
 
-    options.unlink(p, er => {
-      if (er) {
-        if (er.code === "ENOENT")
-          return cb(null)
-        if (er.code === "EPERM")
-          return (isWindows)
-            ? fixWinEPERM(p, options, er, cb)
-            : rmdir(p, options, er, cb)
-        if (er.code === "EISDIR")
-          return rmdir(p, options, er, cb)
-      }
-      return cb(er)
-    })
-  })
+function getDate() {
+  if (exports.inspectOpts.hideDate) {
+    return '';
+  } else {
+    return new Date().toISOString() + ' ';
+  }
 }
 
-const fixWinEPERM = (p, options, er, cb) => {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
-  if (er)
-    assert(er instanceof Error)
+/**
+ * Invokes `util.format()` with the specified arguments and writes to stderr.
+ */
 
-  options.chmod(p, 0o666, er2 => {
-    if (er2)
-      cb(er2.code === "ENOENT" ? null : er)
-    else
-      options.stat(p, (er3, stats) => {
-        if (er3)
-          cb(er3.code === "ENOENT" ? null : er)
-        else if (stats.isDirectory())
-          rmdir(p, options, er, cb)
-        else
-          options.unlink(p, cb)
-      })
-  })
+function log() {
+  return process.stderr.write(util.format.apply(util, arguments) + '\n');
 }
 
-const fixWinEPERMSync = (p, options, er) => {
-  assert(p)
-  assert(options)
-  if (er)
-    assert(er instanceof Error)
-
-  try {
-    options.chmodSync(p, 0o666)
-  } catch (er2) {
-    if (er2.code === "ENOENT")
-      return
-    else
-      throw er
-  }
+/**
+ * Save `namespaces`.
+ *
+ * @param {String} namespaces
+ * @api private
+ */
 
-  let stats
-  try {
-    stats = options.statSync(p)
-  } catch (er3) {
-    if (er3.code === "ENOENT")
-      return
-    else
-      throw er
+function save(namespaces) {
+  if (null == namespaces) {
+    // If you set a process.env field to null or undefined, it gets cast to the
+    // string 'null' or 'undefined'. Just delete instead.
+    delete process.env.DEBUG;
+  } else {
+    process.env.DEBUG = namespaces;
   }
-
-  if (stats.isDirectory())
-    rmdirSync(p, options, er)
-  else
-    options.unlinkSync(p)
 }
 
-const rmdir = (p, options, originalEr, cb) => {
-  assert(p)
-  assert(options)
-  if (originalEr)
-    assert(originalEr instanceof Error)
-  assert(typeof cb === 'function')
+/**
+ * Load `namespaces`.
+ *
+ * @return {String} returns the previously persisted debug modes
+ * @api private
+ */
 
-  // 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, er => {
-    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM"))
-      rmkids(p, options, cb)
-    else if (er && er.code === "ENOTDIR")
-      cb(originalEr)
-    else
-      cb(er)
-  })
+function load() {
+  return process.env.DEBUG;
 }
 
-const rmkids = (p, options, cb) => {
-  assert(p)
-  assert(options)
-  assert(typeof cb === 'function')
+/**
+ * Init logic for `debug` instances.
+ *
+ * Create a new `inspectOpts` object in case `useColors` is set
+ * differently for a particular `debug` instance.
+ */
+
+function init (debug) {
+  debug.inspectOpts = {};
 
-  options.readdir(p, (er, files) => {
-    if (er)
-      return cb(er)
-    let n = files.length
-    if (n === 0)
-      return options.rmdir(p, cb)
-    let errState
-    files.forEach(f => {
-      rimraf(path.join(p, f), options, er => {
-        if (errState)
-          return
-        if (er)
-          return cb(errState = er)
-        if (--n === 0)
-          options.rmdir(p, cb)
-      })
-    })
-  })
+  var keys = Object.keys(exports.inspectOpts);
+  for (var i = 0; i < keys.length; i++) {
+    debug.inspectOpts[keys[i]] = exports.inspectOpts[keys[i]];
+  }
 }
 
-// this looks simpler, and is strictly *faster*, but will
-// tie up the JavaScript thread and fail on excessively
-// deep directory trees.
-const rimrafSync = (p, options) => {
-  options = options || {}
-  defaults(options)
+/**
+ * Enable namespaces listed in `process.env.DEBUG` initially.
+ */
 
-  assert(p, 'rimraf: missing path')
-  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
-  assert(options, 'rimraf: missing options')
-  assert.equal(typeof options, 'object', 'rimraf: options should be object')
+exports.enable(load());
 
-  let results
 
-  if (options.disableGlob || !glob.hasMagic(p)) {
-    results = [p]
-  } else {
-    try {
-      options.lstatSync(p)
-      results = [p]
-    } catch (er) {
-      results = glob.sync(p, options.glob)
-    }
-  }
+/***/ }),
+/* 214 */,
+/* 215 */,
+/* 216 */,
+/* 217 */
+/***/ (function(module, exports, __webpack_require__) {
 
-  if (!results.length)
-    return
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-  for (let i = 0; i < results.length; i++) {
-    const p = results[i]
+var pathModule = __webpack_require__(0);
+var isWindows = process.platform === 'win32';
+var fs = __webpack_require__(3);
 
-    let st
-    try {
-      st = options.lstatSync(p)
-    } catch (er) {
-      if (er.code === "ENOENT")
-        return
+// JavaScript implementation of realpath, ported from node pre-v6
 
-      // Windows can EPERM on stat.  Life is suffering.
-      if (er.code === "EPERM" && isWindows)
-        fixWinEPERMSync(p, options, er)
-    }
+var DEBUG = process.env.NODE_DEBUG && /fs/.test(process.env.NODE_DEBUG);
 
-    try {
-      // sunos lets the root user unlink directories, which is... weird.
-      if (st && st.isDirectory())
-        rmdirSync(p, options, null)
-      else
-        options.unlinkSync(p)
-    } catch (er) {
-      if (er.code === "ENOENT")
-        return
-      if (er.code === "EPERM")
-        return isWindows ? fixWinEPERMSync(p, options, er) : rmdirSync(p, options, er)
-      if (er.code !== "EISDIR")
-        throw er
+function rethrow() {
+  // Only enable in debug mode. A backtrace uses ~1000 bytes of heap space and
+  // is fairly slow to generate.
+  var callback;
+  if (DEBUG) {
+    var backtrace = new Error;
+    callback = debugCallback;
+  } else
+    callback = missingCallback;
 
-      rmdirSync(p, options, er)
+  return callback;
+
+  function debugCallback(err) {
+    if (err) {
+      backtrace.message = err.message;
+      err = backtrace;
+      missingCallback(err);
     }
   }
-}
-
-const rmdirSync = (p, options, originalEr) => {
-  assert(p)
-  assert(options)
-  if (originalEr)
-    assert(originalEr instanceof Error)
 
-  try {
-    options.rmdirSync(p)
-  } catch (er) {
-    if (er.code === "ENOENT")
-      return
-    if (er.code === "ENOTDIR")
-      throw originalEr
-    if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")
-      rmkidsSync(p, options)
+  function missingCallback(err) {
+    if (err) {
+      if (process.throwDeprecation)
+        throw err;  // Forgot a callback but don't know where? Use NODE_DEBUG=fs
+      else if (!process.noDeprecation) {
+        var msg = 'fs: missing callback ' + (err.stack || err.message);
+        if (process.traceDeprecation)
+          console.trace(msg);
+        else
+          console.error(msg);
+      }
+    }
   }
 }
 
-const rmkidsSync = (p, options) => {
-  assert(p)
-  assert(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.
-  // So, we know that it won't be ENOENT or ENOTDIR or anything else.
-  // 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.
-  const retries = isWindows ? 100 : 1
-  let i = 0
-  do {
-    let threw = true
-    try {
-      const ret = options.rmdirSync(p, options)
-      threw = false
-      return ret
-    } finally {
-      if (++i < retries && threw)
-        continue
-    }
-  } while (true)
+function maybeCallback(cb) {
+  return typeof cb === 'function' ? cb : rethrow();
 }
 
-module.exports = rimraf
-rimraf.sync = rimrafSync
+var normalize = pathModule.normalize;
 
+// Regexp that finds the next partion of a (partial) path
+// result is [base_with_slash, base], e.g. ['somedir/', 'somedir']
+if (isWindows) {
+  var nextPartRe = /(.*?)(?:[\/\\]+|$)/g;
+} else {
+  var nextPartRe = /(.*?)(?:[\/]+|$)/g;
+}
 
-/***/ }),
-/* 257 */
-/***/ (function(module, exports, __webpack_require__) {
+// Regex to find the device root, including trailing slash. E.g. 'c:\\'.
+if (isWindows) {
+  var splitRootRe = /^(?:[a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/][^\\\/]+)?[\\\/]*/;
+} else {
+  var splitRootRe = /^[\/]*/;
+}
 
-"use strict";
+exports.realpathSync = function realpathSync(p, cache) {
+  // make p is absolute
+  p = pathModule.resolve(p);
 
-const AggregateError = __webpack_require__(258);
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return cache[p];
+  }
 
-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');
-		}
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
 
-		if (!(typeof concurrency === 'number' && concurrency >= 1)) {
-			throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
-		}
+  // current character position in p
+  var pos;
+  // the partial path so far, including a trailing slash if any
+  var current;
+  // the partial path without a trailing slash (except when pointing at a root)
+  var base;
+  // the partial path scanned in the previous round, with slash
+  var previous;
 
-		const ret = [];
-		const errors = [];
-		const iterator = iterable[Symbol.iterator]();
-		let isRejected = false;
-		let isIterableDone = false;
-		let resolvingCount = 0;
-		let currentIndex = 0;
+  start();
 
-		const next = () => {
-			if (isRejected) {
-				return;
-			}
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
 
-			const nextItem = iterator.next();
-			const i = currentIndex;
-			currentIndex++;
+    // On windows, check that the root exists. On unix there is no need.
+    if (isWindows && !knownHard[base]) {
+      fs.lstatSync(base);
+      knownHard[base] = true;
+    }
+  }
 
-			if (nextItem.done) {
-				isIterableDone = true;
+  // walk down the path, swapping out linked pathparts for their real
+  // values
+  // NB: p.length changes.
+  while (pos < p.length) {
+    // find the next part
+    nextPartRe.lastIndex = pos;
+    var result = nextPartRe.exec(p);
+    previous = current;
+    current += result[0];
+    base = previous + result[1];
+    pos = nextPartRe.lastIndex;
 
-				if (resolvingCount === 0) {
-					if (!stopOnError && errors.length !== 0) {
-						reject(new AggregateError(errors));
-					} else {
-						resolve(ret);
-					}
-				}
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      continue;
+    }
 
-				return;
-			}
+    var resolvedLink;
+    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
+      // some known symbolic link.  no need to stat again.
+      resolvedLink = cache[base];
+    } else {
+      var stat = fs.lstatSync(base);
+      if (!stat.isSymbolicLink()) {
+        knownHard[base] = true;
+        if (cache) cache[base] = base;
+        continue;
+      }
 
-			resolvingCount++;
+      // read the link if it wasn't read before
+      // dev/ino always return 0 on windows, so skip the check.
+      var linkTarget = null;
+      if (!isWindows) {
+        var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
+        if (seenLinks.hasOwnProperty(id)) {
+          linkTarget = seenLinks[id];
+        }
+      }
+      if (linkTarget === null) {
+        fs.statSync(base);
+        linkTarget = fs.readlinkSync(base);
+      }
+      resolvedLink = pathModule.resolve(previous, linkTarget);
+      // track this, if given a cache.
+      if (cache) cache[base] = resolvedLink;
+      if (!isWindows) seenLinks[id] = linkTarget;
+    }
 
-			(async () => {
-				try {
-					const element = await nextItem.value;
-					ret[i] = await mapper(element, i);
-					resolvingCount--;
-					next();
-				} catch (error) {
-					if (stopOnError) {
-						isRejected = true;
-						reject(error);
-					} else {
-						errors.push(error);
-						resolvingCount--;
-						next();
-					}
-				}
-			})();
-		};
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
 
-		for (let i = 0; i < concurrency; i++) {
-			next();
+  if (cache) cache[original] = p;
 
-			if (isIterableDone) {
-				break;
-			}
-		}
-	});
+  return p;
 };
 
 
-/***/ }),
-/* 258 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const indentString = __webpack_require__(259);
-const cleanStack = __webpack_require__(260);
+exports.realpath = function realpath(p, cache, cb) {
+  if (typeof cb !== 'function') {
+    cb = maybeCallback(cache);
+    cache = null;
+  }
 
-const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
+  // make p is absolute
+  p = pathModule.resolve(p);
 
-class AggregateError extends Error {
-	constructor(errors) {
-		if (!Array.isArray(errors)) {
-			throw new TypeError(`Expected input to be an Array, got ${typeof errors}`);
-		}
+  if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
+    return process.nextTick(cb.bind(null, null, cache[p]));
+  }
 
-		errors = [...errors].map(error => {
-			if (error instanceof Error) {
-				return error;
-			}
+  var original = p,
+      seenLinks = {},
+      knownHard = {};
 
-			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);
-			}
+  // current character position in p
+  var pos;
+  // the partial path so far, including a trailing slash if any
+  var current;
+  // the partial path without a trailing slash (except when pointing at a root)
+  var base;
+  // the partial path scanned in the previous round, with slash
+  var previous;
 
-			return new Error(error);
-		});
+  start();
 
-		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);
+  function start() {
+    // Skip over roots
+    var m = splitRootRe.exec(p);
+    pos = m[0].length;
+    current = m[0];
+    base = m[0];
+    previous = '';
 
-		this.name = 'AggregateError';
+    // On windows, check that the root exists. On unix there is no need.
+    if (isWindows && !knownHard[base]) {
+      fs.lstat(base, function(err) {
+        if (err) return cb(err);
+        knownHard[base] = true;
+        LOOP();
+      });
+    } else {
+      process.nextTick(LOOP);
+    }
+  }
 
-		Object.defineProperty(this, '_errors', {value: errors});
-	}
+  // walk down the path, swapping out linked pathparts for their real
+  // values
+  function LOOP() {
+    // stop if scanned past end of path
+    if (pos >= p.length) {
+      if (cache) cache[original] = p;
+      return cb(null, p);
+    }
 
-	* [Symbol.iterator]() {
-		for (const error of this._errors) {
-			yield error;
-		}
-	}
-}
+    // find the next part
+    nextPartRe.lastIndex = pos;
+    var result = nextPartRe.exec(p);
+    previous = current;
+    current += result[0];
+    base = previous + result[1];
+    pos = nextPartRe.lastIndex;
 
-module.exports = AggregateError;
+    // continue if not a symlink
+    if (knownHard[base] || (cache && cache[base] === base)) {
+      return process.nextTick(LOOP);
+    }
 
+    if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
+      // known symbolic link.  no need to stat again.
+      return gotResolvedLink(cache[base]);
+    }
 
-/***/ }),
-/* 259 */
-/***/ (function(module, exports, __webpack_require__) {
+    return fs.lstat(base, gotStat);
+  }
 
-"use strict";
+  function gotStat(err, stat) {
+    if (err) return cb(err);
 
-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 not a symlink, skip to the next path part
+    if (!stat.isSymbolicLink()) {
+      knownHard[base] = true;
+      if (cache) cache[base] = base;
+      return process.nextTick(LOOP);
+    }
 
-	if (typeof str !== 'string') {
-		throw new TypeError(`Expected \`input\` to be a \`string\`, got \`${typeof str}\``);
-	}
+    // stat & read the link if not read before
+    // call gotTarget as soon as the link target is known
+    // dev/ino always return 0 on windows, so skip the check.
+    if (!isWindows) {
+      var id = stat.dev.toString(32) + ':' + stat.ino.toString(32);
+      if (seenLinks.hasOwnProperty(id)) {
+        return gotTarget(null, seenLinks[id], base);
+      }
+    }
+    fs.stat(base, function(err) {
+      if (err) return cb(err);
 
-	if (typeof count !== 'number') {
-		throw new TypeError(`Expected \`count\` to be a \`number\`, got \`${typeof count}\``);
-	}
+      fs.readlink(base, function(err, target) {
+        if (!isWindows) seenLinks[id] = target;
+        gotTarget(err, target);
+      });
+    });
+  }
 
-	if (typeof options.indent !== 'string') {
-		throw new TypeError(`Expected \`options.indent\` to be a \`string\`, got \`${typeof options.indent}\``);
-	}
+  function gotTarget(err, target, base) {
+    if (err) return cb(err);
 
-	if (count === 0) {
-		return str;
-	}
+    var resolvedLink = pathModule.resolve(previous, target);
+    if (cache) cache[base] = resolvedLink;
+    gotResolvedLink(resolvedLink);
+  }
 
-	const regex = options.includeEmptyLines ? /^/mg : /^(?!\s*$)/mg;
-	return str.replace(regex, options.indent.repeat(count));
-}
-;
+  function gotResolvedLink(resolvedLink) {
+    // resolve the link, then start over
+    p = pathModule.resolve(resolvedLink, p.slice(pos));
+    start();
+  }
+};
 
 
 /***/ }),
-/* 260 */
+/* 218 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
+module.exports = globSync
+globSync.GlobSync = GlobSync
 
-const os = __webpack_require__(11);
+var fs = __webpack_require__(3)
+var rp = __webpack_require__(114)
+var minimatch = __webpack_require__(60)
+var Minimatch = minimatch.Minimatch
+var Glob = __webpack_require__(75).Glob
+var util = __webpack_require__(2)
+var path = __webpack_require__(0)
+var assert = __webpack_require__(22)
+var isAbsolute = __webpack_require__(76)
+var common = __webpack_require__(115)
+var alphasort = common.alphasort
+var alphasorti = common.alphasorti
+var setopts = common.setopts
+var ownProp = common.ownProp
+var childrenIgnored = common.childrenIgnored
+var isIgnored = common.isIgnored
 
-const extractPathRegex = /\s+at.*(?:\(|\s)(.*)\)?/;
-const pathRegex = /^(?:(?:(?:node|(?:internal\/[\w/]*|.*node_modules\/(?:babel-polyfill|pirates)\/.*)?\w+)\.js:\d+:\d+)|native)/;
-const homeDir = os.homedir();
+function globSync (pattern, options) {
+  if (typeof options === 'function' || arguments.length === 3)
+    throw new TypeError('callback provided to sync glob\n'+
+                        'See: https://github.com/isaacs/node-glob/issues/167')
 
-module.exports = (stack, options) => {
-	options = Object.assign({pretty: false}, options);
+  return new GlobSync(pattern, options).found
+}
 
-	return stack.replace(/\\/g, '/')
-		.split('\n')
-		.filter(line => {
-			const pathMatches = line.match(extractPathRegex);
-			if (pathMatches === null || !pathMatches[1]) {
-				return true;
-			}
+function GlobSync (pattern, options) {
+  if (!pattern)
+    throw new Error('must provide pattern')
 
-			const match = pathMatches[1];
+  if (typeof options === 'function' || arguments.length === 3)
+    throw new TypeError('callback provided to sync glob\n'+
+                        'See: https://github.com/isaacs/node-glob/issues/167')
 
-			// Electron
-			if (
-				match.includes('.app/Contents/Resources/electron.asar') ||
-				match.includes('.app/Contents/Resources/default_app.asar')
-			) {
-				return false;
-			}
+  if (!(this instanceof GlobSync))
+    return new GlobSync(pattern, options)
 
-			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, '~')));
-			}
+  setopts(this, pattern, options)
 
-			return line;
-		})
-		.join('\n');
-};
+  if (this.noprocess)
+    return this
 
+  var n = this.minimatch.set.length
+  this.matches = new Array(n)
+  for (var i = 0; i < n; i ++) {
+    this._process(this.minimatch.set[i], i, false)
+  }
+  this._finish()
+}
 
-/***/ }),
-/* 261 */
-/***/ (function(module, exports, __webpack_require__) {
+GlobSync.prototype._finish = function () {
+  assert(this instanceof GlobSync)
+  if (this.realpath) {
+    var self = this
+    this.matches.forEach(function (matchset, index) {
+      var set = self.matches[index] = Object.create(null)
+      for (var p in matchset) {
+        try {
+          p = self._makeAbs(p)
+          var real = rp.realpathSync(p, self.realpathCache)
+          set[real] = true
+        } catch (er) {
+          if (er.syscall === 'stat')
+            set[self._makeAbs(p)] = true
+          else
+            throw er
+        }
+      }
+    })
+  }
+  common.finish(this)
+}
 
-"use strict";
 
-const chalk = __webpack_require__(262);
-const cliCursor = __webpack_require__(266);
-const cliSpinners = __webpack_require__(270);
-const logSymbols = __webpack_require__(158);
+GlobSync.prototype._process = function (pattern, index, inGlobStar) {
+  assert(this instanceof GlobSync)
 
-class Ora {
-	constructor(options) {
-		if (typeof options === 'string') {
-			options = {
-				text: options
-			};
-		}
+  // Get the first [n] parts of pattern that are all strings.
+  var n = 0
+  while (typeof pattern[n] === 'string') {
+    n ++
+  }
+  // now n is the index of the first one that is *not* a string.
 
-		this.options = Object.assign({
-			text: '',
-			color: 'cyan',
-			stream: process.stderr
-		}, options);
+  // See if there's anything else
+  var prefix
+  switch (n) {
+    // if not, then this is rather simple
+    case pattern.length:
+      this._processSimple(pattern.join('/'), index)
+      return
 
-		const sp = this.options.spinner;
-		this.spinner = typeof sp === 'object' ? sp : (process.platform === 'win32' ? cliSpinners.line : (cliSpinners[sp] || cliSpinners.dots)); // eslint-disable-line no-nested-ternary
+    case 0:
+      // pattern *starts* with some non-trivial item.
+      // going to readdir(cwd), but not include the prefix in matches.
+      prefix = null
+      break
 
-		if (this.spinner.frames === undefined) {
-			throw new Error('Spinner must define `frames`');
-		}
+    default:
+      // pattern has some string bits in the front.
+      // whatever it starts with, whether that's 'absolute' like /foo/bar,
+      // or 'relative' like '../baz'
+      prefix = pattern.slice(0, n).join('/')
+      break
+  }
 
-		this.text = this.options.text;
-		this.color = this.options.color;
-		this.interval = this.options.interval || this.spinner.interval || 100;
-		this.stream = this.options.stream;
-		this.id = null;
-		this.frameIndex = 0;
-		this.enabled = typeof this.options.enabled === 'boolean' ? this.options.enabled : ((this.stream && this.stream.isTTY) && !process.env.CI);
-	}
-	frame() {
-		const frames = this.spinner.frames;
-		let frame = frames[this.frameIndex];
+  var remain = pattern.slice(n)
 
-		if (this.color) {
-			frame = chalk[this.color](frame);
-		}
+  // get the list of entries.
+  var read
+  if (prefix === null)
+    read = '.'
+  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+    if (!prefix || !isAbsolute(prefix))
+      prefix = '/' + prefix
+    read = prefix
+  } else
+    read = prefix
 
-		this.frameIndex = ++this.frameIndex % frames.length;
+  var abs = this._makeAbs(read)
 
-		return frame + ' ' + this.text;
-	}
-	clear() {
-		if (!this.enabled) {
-			return this;
-		}
+  //if ignored, skip processing
+  if (childrenIgnored(this, read))
+    return
 
-		this.stream.clearLine();
-		this.stream.cursorTo(0);
+  var isGlobStar = remain[0] === minimatch.GLOBSTAR
+  if (isGlobStar)
+    this._processGlobStar(prefix, read, abs, remain, index, inGlobStar)
+  else
+    this._processReaddir(prefix, read, abs, remain, index, inGlobStar)
+}
 
-		return this;
-	}
-	render() {
-		this.clear();
-		this.stream.write(this.frame());
 
-		return this;
-	}
-	start(text) {
-		if (text) {
-			this.text = text;
-		}
+GlobSync.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar) {
+  var entries = this._readdir(abs, inGlobStar)
 
-		if (!this.enabled || this.id) {
-			return this;
-		}
+  // if the abs isn't a dir, then nothing can match!
+  if (!entries)
+    return
 
-		cliCursor.hide(this.stream);
-		this.render();
-		this.id = setInterval(this.render.bind(this), this.interval);
+  // It will only match dot entries if it starts with a dot, or if
+  // dot is set.  Stuff like @(.foo|.bar) isn't allowed.
+  var pn = remain[0]
+  var negate = !!this.minimatch.negate
+  var rawGlob = pn._glob
+  var dotOk = this.dot || rawGlob.charAt(0) === '.'
 
-		return this;
-	}
-	stop() {
-		if (!this.enabled) {
-			return this;
-		}
+  var matchedEntries = []
+  for (var i = 0; i < entries.length; i++) {
+    var e = entries[i]
+    if (e.charAt(0) !== '.' || dotOk) {
+      var m
+      if (negate && !prefix) {
+        m = !e.match(pn)
+      } else {
+        m = e.match(pn)
+      }
+      if (m)
+        matchedEntries.push(e)
+    }
+  }
 
-		clearInterval(this.id);
-		this.id = null;
-		this.frameIndex = 0;
-		this.clear();
-		cliCursor.show(this.stream);
+  var len = matchedEntries.length
+  // If there are no matched entries, then nothing matches.
+  if (len === 0)
+    return
 
-		return this;
-	}
-	succeed(text) {
-		return this.stopAndPersist({symbol: logSymbols.success, text});
-	}
-	fail(text) {
-		return this.stopAndPersist({symbol: logSymbols.error, text});
-	}
-	warn(text) {
-		return this.stopAndPersist({symbol: logSymbols.warning, text});
-	}
-	info(text) {
-		return this.stopAndPersist({symbol: logSymbols.info, text});
-	}
-	stopAndPersist(options) {
-		if (!this.enabled) {
-			return this;
-		}
+  // if this is the last remaining pattern bit, then no need for
+  // an additional stat *unless* the user has specified mark or
+  // stat explicitly.  We know they exist, since readdir returned
+  // them.
 
-		// Legacy argument
-		// TODO: Deprecate sometime in the future
-		if (typeof options === 'string') {
-			options = {
-				symbol: options
-			};
-		}
+  if (remain.length === 1 && !this.mark && !this.stat) {
+    if (!this.matches[index])
+      this.matches[index] = Object.create(null)
 
-		options = options || {};
+    for (var i = 0; i < len; i ++) {
+      var e = matchedEntries[i]
+      if (prefix) {
+        if (prefix.slice(-1) !== '/')
+          e = prefix + '/' + e
+        else
+          e = prefix + e
+      }
 
-		this.stop();
-		this.stream.write(`${options.symbol || ' '} ${options.text || this.text}\n`);
+      if (e.charAt(0) === '/' && !this.nomount) {
+        e = path.join(this.root, e)
+      }
+      this._emitMatch(index, e)
+    }
+    // This was the last one, and no stats were needed
+    return
+  }
 
-		return this;
-	}
+  // now test all matched entries as stand-ins for that part
+  // of the pattern.
+  remain.shift()
+  for (var i = 0; i < len; i ++) {
+    var e = matchedEntries[i]
+    var newPattern
+    if (prefix)
+      newPattern = [prefix, e]
+    else
+      newPattern = [e]
+    this._process(newPattern.concat(remain), index, inGlobStar)
+  }
 }
 
-module.exports = function (opts) {
-	return new Ora(opts);
-};
-
-module.exports.promise = (action, options) => {
-	if (typeof action.then !== 'function') {
-		throw new TypeError('Parameter `action` must be a Promise');
-	}
 
-	const spinner = new Ora(options);
-	spinner.start();
+GlobSync.prototype._emitMatch = function (index, e) {
+  if (isIgnored(this, e))
+    return
 
-	action.then(
-		() => {
-			spinner.succeed();
-		},
-		() => {
-			spinner.fail();
-		}
-	);
+  var abs = this._makeAbs(e)
 
-	return spinner;
-};
+  if (this.mark)
+    e = this._mark(e)
 
+  if (this.absolute) {
+    e = abs
+  }
 
-/***/ }),
-/* 262 */
-/***/ (function(module, exports, __webpack_require__) {
+  if (this.matches[index][e])
+    return
 
-"use strict";
+  if (this.nodir) {
+    var c = this.cache[abs]
+    if (c === 'DIR' || Array.isArray(c))
+      return
+  }
 
-const escapeStringRegexp = __webpack_require__(3);
-const ansiStyles = __webpack_require__(263);
-const stdoutColor = __webpack_require__(264).stdout;
+  this.matches[index][e] = true
 
-const template = __webpack_require__(265);
+  if (this.stat)
+    this._stat(e)
+}
 
-const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
-// `supportsColor.level` → `ansiStyles.color[name]` mapping
-const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
+GlobSync.prototype._readdirInGlobStar = function (abs) {
+  // follow all symlinked directories forever
+  // just proceed as if this is a non-globstar situation
+  if (this.follow)
+    return this._readdir(abs, false)
 
-// `color-convert` models to exclude from the Chalk API due to conflicts and such
-const skipModels = new Set(['gray']);
+  var entries
+  var lstat
+  var stat
+  try {
+    lstat = fs.lstatSync(abs)
+  } catch (er) {
+    if (er.code === 'ENOENT') {
+      // lstat failed, doesn't exist
+      return null
+    }
+  }
 
-const styles = Object.create(null);
+  var isSym = lstat && lstat.isSymbolicLink()
+  this.symlinks[abs] = isSym
 
-function applyOptions(obj, options) {
-	options = options || {};
+  // If it's not a symlink or a dir, then it's definitely a regular file.
+  // don't bother doing a readdir in that case.
+  if (!isSym && lstat && !lstat.isDirectory())
+    this.cache[abs] = 'FILE'
+  else
+    entries = this._readdir(abs, false)
 
-	// Detect level if not set manually
-	const scLevel = stdoutColor ? stdoutColor.level : 0;
-	obj.level = options.level === undefined ? scLevel : options.level;
-	obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0;
+  return entries
 }
 
-function Chalk(options) {
-	// We check for this.template here since calling `chalk.constructor()`
-	// by itself will have a `this` of a previously constructed chalk object
-	if (!this || !(this instanceof Chalk) || this.template) {
-		const chalk = {};
-		applyOptions(chalk, options);
-
-		chalk.template = function () {
-			const args = [].slice.call(arguments);
-			return chalkTag.apply(null, [chalk.template].concat(args));
-		};
+GlobSync.prototype._readdir = function (abs, inGlobStar) {
+  var entries
 
-		Object.setPrototypeOf(chalk, Chalk.prototype);
-		Object.setPrototypeOf(chalk.template, chalk);
+  if (inGlobStar && !ownProp(this.symlinks, abs))
+    return this._readdirInGlobStar(abs)
 
-		chalk.template.constructor = Chalk;
+  if (ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
+    if (!c || c === 'FILE')
+      return null
 
-		return chalk.template;
-	}
+    if (Array.isArray(c))
+      return c
+  }
 
-	applyOptions(this, options);
+  try {
+    return this._readdirEntries(abs, fs.readdirSync(abs))
+  } catch (er) {
+    this._readdirError(abs, er)
+    return null
+  }
 }
 
-// Use bright blue on Windows as the normal blue color is illegible
-if (isSimpleWindowsTerm) {
-	ansiStyles.blue.open = '\u001B[94m';
-}
+GlobSync.prototype._readdirEntries = function (abs, entries) {
+  // if we haven't asked to stat everything, then just
+  // assume that everything in there exists, so we can avoid
+  // having to stat it a second time.
+  if (!this.mark && !this.stat) {
+    for (var i = 0; i < entries.length; i ++) {
+      var e = entries[i]
+      if (abs === '/')
+        e = abs + e
+      else
+        e = abs + '/' + e
+      this.cache[e] = true
+    }
+  }
 
-for (const key of Object.keys(ansiStyles)) {
-	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
+  this.cache[abs] = entries
 
-	styles[key] = {
-		get() {
-			const codes = ansiStyles[key];
-			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
-		}
-	};
+  // mark and cache dir-ness
+  return entries
 }
 
-styles.visible = {
-	get() {
-		return build.call(this, this._styles || [], true, 'visible');
-	}
-};
+GlobSync.prototype._readdirError = function (f, er) {
+  // handle errors, and cache the information
+  switch (er.code) {
+    case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205
+    case 'ENOTDIR': // totally normal. means it *does* exist.
+      var abs = this._makeAbs(f)
+      this.cache[abs] = 'FILE'
+      if (abs === this.cwdAbs) {
+        var error = new Error(er.code + ' invalid cwd ' + this.cwd)
+        error.path = this.cwd
+        error.code = er.code
+        throw error
+      }
+      break
 
-ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
-for (const model of Object.keys(ansiStyles.color.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
+    case 'ENOENT': // not terribly unusual
+    case 'ELOOP':
+    case 'ENAMETOOLONG':
+    case 'UNKNOWN':
+      this.cache[this._makeAbs(f)] = false
+      break
 
-	styles[model] = {
-		get() {
-			const level = this.level;
-			return function () {
-				const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments);
-				const codes = {
-					open,
-					close: ansiStyles.color.close,
-					closeRe: ansiStyles.color.closeRe
-				};
-				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
-			};
-		}
-	};
+    default: // some unusual error.  Treat as failure.
+      this.cache[this._makeAbs(f)] = false
+      if (this.strict)
+        throw er
+      if (!this.silent)
+        console.error('glob error', er)
+      break
+  }
 }
 
-ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
-for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
-	if (skipModels.has(model)) {
-		continue;
-	}
+GlobSync.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar) {
+
+  var entries = this._readdir(abs, inGlobStar)
+
+  // no entries means not a dir, so it can never have matches
+  // foo.txt/** doesn't match foo.txt
+  if (!entries)
+    return
+
+  // test without the globstar, and with every child both below
+  // and replacing the globstar.
+  var remainWithoutGlobStar = remain.slice(1)
+  var gspref = prefix ? [ prefix ] : []
+  var noGlobStar = gspref.concat(remainWithoutGlobStar)
+
+  // the noGlobStar pattern exits the inGlobStar state
+  this._process(noGlobStar, index, false)
 
-	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
-	styles[bgModel] = {
-		get() {
-			const level = this.level;
-			return function () {
-				const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments);
-				const codes = {
-					open,
-					close: ansiStyles.bgColor.close,
-					closeRe: ansiStyles.bgColor.closeRe
-				};
-				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
-			};
-		}
-	};
-}
+  var len = entries.length
+  var isSym = this.symlinks[abs]
 
-const proto = Object.defineProperties(() => {}, styles);
+  // If it's a symlink, and we're in a globstar, then stop
+  if (isSym && inGlobStar)
+    return
 
-function build(_styles, _empty, key) {
-	const builder = function () {
-		return applyStyle.apply(builder, arguments);
-	};
+  for (var i = 0; i < len; i++) {
+    var e = entries[i]
+    if (e.charAt(0) === '.' && !this.dot)
+      continue
 
-	builder._styles = _styles;
-	builder._empty = _empty;
+    // these two cases enter the inGlobStar state
+    var instead = gspref.concat(entries[i], remainWithoutGlobStar)
+    this._process(instead, index, true)
 
-	const self = this;
+    var below = gspref.concat(entries[i], remain)
+    this._process(below, index, true)
+  }
+}
 
-	Object.defineProperty(builder, 'level', {
-		enumerable: true,
-		get() {
-			return self.level;
-		},
-		set(level) {
-			self.level = level;
-		}
-	});
+GlobSync.prototype._processSimple = function (prefix, index) {
+  // XXX review this.  Shouldn't it be doing the mounting etc
+  // before doing stat?  kinda weird?
+  var exists = this._stat(prefix)
 
-	Object.defineProperty(builder, 'enabled', {
-		enumerable: true,
-		get() {
-			return self.enabled;
-		},
-		set(enabled) {
-			self.enabled = enabled;
-		}
-	});
+  if (!this.matches[index])
+    this.matches[index] = Object.create(null)
 
-	// See below for fix regarding invisible grey/dim combination on Windows
-	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
+  // If it doesn't exist, then just mark the lack of results
+  if (!exists)
+    return
 
-	// `__proto__` is used because we must return a function, but there is
-	// no way to create a function with a different prototype
-	builder.__proto__ = proto; // eslint-disable-line no-proto
+  if (prefix && isAbsolute(prefix) && !this.nomount) {
+    var trail = /[\/\\]$/.test(prefix)
+    if (prefix.charAt(0) === '/') {
+      prefix = path.join(this.root, prefix)
+    } else {
+      prefix = path.resolve(this.root, prefix)
+      if (trail)
+        prefix += '/'
+    }
+  }
 
-	return builder;
+  if (process.platform === 'win32')
+    prefix = prefix.replace(/\\/g, '/')
+
+  // Mark this as a match
+  this._emitMatch(index, prefix)
 }
 
-function applyStyle() {
-	// Support varags, but simply cast to string in case there's only one arg
-	const args = arguments;
-	const argsLen = args.length;
-	let str = String(arguments[0]);
+// Returns either 'DIR', 'FILE', or false
+GlobSync.prototype._stat = function (f) {
+  var abs = this._makeAbs(f)
+  var needDir = f.slice(-1) === '/'
 
-	if (argsLen === 0) {
-		return '';
-	}
+  if (f.length > this.maxLength)
+    return false
 
-	if (argsLen > 1) {
-		// Don't slice `arguments`, it prevents V8 optimizations
-		for (let a = 1; a < argsLen; a++) {
-			str += ' ' + args[a];
-		}
-	}
+  if (!this.stat && ownProp(this.cache, abs)) {
+    var c = this.cache[abs]
 
-	if (!this.enabled || this.level <= 0 || !str) {
-		return this._empty ? '' : str;
-	}
+    if (Array.isArray(c))
+      c = 'DIR'
 
-	// Turns out that on Windows dimmed gray text becomes invisible in cmd.exe,
-	// see https://github.com/chalk/chalk/issues/58
-	// If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop.
-	const originalDim = ansiStyles.dim.open;
-	if (isSimpleWindowsTerm && this.hasGrey) {
-		ansiStyles.dim.open = '';
-	}
+    // It exists, but maybe not how we need it
+    if (!needDir || c === 'DIR')
+      return c
 
-	for (const code of this._styles.slice().reverse()) {
-		// Replace any instances already present with a re-opening code
-		// otherwise only the part of the string until said closing code
-		// will be colored, and the rest will simply be 'plain'.
-		str = code.open + str.replace(code.closeRe, code.open) + code.close;
+    if (needDir && c === 'FILE')
+      return false
 
-		// Close the styling before a linebreak and reopen
-		// after next line to fix a bleed issue on macOS
-		// https://github.com/chalk/chalk/pull/92
-		str = str.replace(/\r?\n/g, `${code.close}$&${code.open}`);
-	}
+    // otherwise we have to stat, because maybe c=true
+    // if we know it exists, but not what it is.
+  }
 
-	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
-	ansiStyles.dim.open = originalDim;
+  var exists
+  var stat = this.statCache[abs]
+  if (!stat) {
+    var lstat
+    try {
+      lstat = fs.lstatSync(abs)
+    } catch (er) {
+      if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
+        this.statCache[abs] = false
+        return false
+      }
+    }
 
-	return str;
-}
+    if (lstat && lstat.isSymbolicLink()) {
+      try {
+        stat = fs.statSync(abs)
+      } catch (er) {
+        stat = lstat
+      }
+    } else {
+      stat = lstat
+    }
+  }
 
-function chalkTag(chalk, strings) {
-	if (!Array.isArray(strings)) {
-		// If chalk() was called by itself or with a string,
-		// return the string itself as a string.
-		return [].slice.call(arguments, 1).join(' ');
-	}
+  this.statCache[abs] = stat
 
-	const args = [].slice.call(arguments, 2);
-	const parts = [strings.raw[0]];
+  var c = true
+  if (stat)
+    c = stat.isDirectory() ? 'DIR' : 'FILE'
 
-	for (let i = 1; i < strings.length; i++) {
-		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
-		parts.push(String(strings.raw[i]));
-	}
+  this.cache[abs] = this.cache[abs] || c
 
-	return template(chalk, parts.join(''));
+  if (needDir && c === 'FILE')
+    return false
+
+  return c
 }
 
-Object.defineProperties(Chalk.prototype, styles);
+GlobSync.prototype._mark = function (p) {
+  return common.mark(this, p)
+}
 
-module.exports = Chalk(); // eslint-disable-line new-cap
-module.exports.supportsColor = stdoutColor;
-module.exports.default = module.exports; // For TypeScript
+GlobSync.prototype._makeAbs = function (f) {
+  return common.makeAbs(this, f)
+}
 
 
 /***/ }),
-/* 263 */
+/* 219 */,
+/* 220 */,
+/* 221 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
-const colorConvert = __webpack_require__(6);
 
-const wrapAnsi16 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${code + offset}m`;
-};
+module.exports = function (flag, argv) {
+	argv = argv || process.argv;
 
-const wrapAnsi256 = (fn, offset) => function () {
-	const code = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};5;${code}m`;
-};
+	var terminatorPos = argv.indexOf('--');
+	var prefix = /^--/.test(flag) ? '' : '--';
+	var pos = argv.indexOf(prefix + flag);
 
-const wrapAnsi16m = (fn, offset) => function () {
-	const rgb = fn.apply(colorConvert, arguments);
-	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
+	return pos !== -1 && (terminatorPos !== -1 ? pos < terminatorPos : true);
 };
 
-function assembleStyles() {
-	const codes = new Map();
-	const styles = {
-		modifier: {
-			reset: [0, 0],
-			// 21 isn't widely supported and 22 does the same thing
-			bold: [1, 22],
-			dim: [2, 22],
-			italic: [3, 23],
-			underline: [4, 24],
-			inverse: [7, 27],
-			hidden: [8, 28],
-			strikethrough: [9, 29]
-		},
-		color: {
-			black: [30, 39],
-			red: [31, 39],
-			green: [32, 39],
-			yellow: [33, 39],
-			blue: [34, 39],
-			magenta: [35, 39],
-			cyan: [36, 39],
-			white: [37, 39],
-			gray: [90, 39],
 
-			// Bright color
-			redBright: [91, 39],
-			greenBright: [92, 39],
-			yellowBright: [93, 39],
-			blueBright: [94, 39],
-			magentaBright: [95, 39],
-			cyanBright: [96, 39],
-			whiteBright: [97, 39]
-		},
-		bgColor: {
-			bgBlack: [40, 49],
-			bgRed: [41, 49],
-			bgGreen: [42, 49],
-			bgYellow: [43, 49],
-			bgBlue: [44, 49],
-			bgMagenta: [45, 49],
-			bgCyan: [46, 49],
-			bgWhite: [47, 49],
+/***/ }),
+/* 222 */,
+/* 223 */
+/***/ (function(module, exports, __webpack_require__) {
 
-			// Bright color
-			bgBlackBright: [100, 49],
-			bgRedBright: [101, 49],
-			bgGreenBright: [102, 49],
-			bgYellowBright: [103, 49],
-			bgBlueBright: [104, 49],
-			bgMagentaBright: [105, 49],
-			bgCyanBright: [106, 49],
-			bgWhiteBright: [107, 49]
-		}
-	};
+var wrappy = __webpack_require__(123)
+var reqs = Object.create(null)
+var once = __webpack_require__(61)
 
-	// Fix humans
-	styles.color.grey = styles.color.gray;
+module.exports = wrappy(inflight)
 
-	for (const groupName of Object.keys(styles)) {
-		const group = styles[groupName];
+function inflight (key, cb) {
+  if (reqs[key]) {
+    reqs[key].push(cb)
+    return null
+  } else {
+    reqs[key] = [cb]
+    return makeres(key)
+  }
+}
 
-		for (const styleName of Object.keys(group)) {
-			const style = group[styleName];
+function makeres (key) {
+  return once(function RES () {
+    var cbs = reqs[key]
+    var len = cbs.length
+    var args = slice(arguments)
 
-			styles[styleName] = {
-				open: `\u001B[${style[0]}m`,
-				close: `\u001B[${style[1]}m`
-			};
+    // XXX It's somewhat ambiguous whether a new callback added in this
+    // pass should be queued for later execution if something in the
+    // list of callbacks throws, or if it should just be discarded.
+    // However, it's such an edge case that it hardly matters, and either
+    // choice is likely as surprising as the other.
+    // As it happens, we do go ahead and schedule it for later execution.
+    try {
+      for (var i = 0; i < len; i++) {
+        cbs[i].apply(null, args)
+      }
+    } finally {
+      if (cbs.length > len) {
+        // added more in the interim.
+        // de-zalgo, just in case, but don't call again.
+        cbs.splice(0, len)
+        process.nextTick(function () {
+          RES.apply(null, args)
+        })
+      } else {
+        delete reqs[key]
+      }
+    }
+  })
+}
 
-			group[styleName] = styles[styleName];
+function slice (args) {
+  var length = args.length
+  var array = []
 
-			codes.set(style[0], style[1]);
-		}
+  for (var i = 0; i < length; i++) array[i] = args[i]
+  return array
+}
 
-		Object.defineProperty(styles, groupName, {
-			value: group,
-			enumerable: false
-		});
 
-		Object.defineProperty(styles, 'codes', {
-			value: codes,
-			enumerable: false
-		});
-	}
+/***/ }),
+/* 224 */
+/***/ (function(module, exports) {
 
-	const ansi2ansi = n => n;
-	const rgb2rgb = (r, g, b) => [r, g, b];
+if (typeof Object.create === 'function') {
+  // implementation from standard node.js 'util' module
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    ctor.prototype = Object.create(superCtor.prototype, {
+      constructor: {
+        value: ctor,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+  };
+} else {
+  // old school shim for old browsers
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    var TempCtor = function () {}
+    TempCtor.prototype = superCtor.prototype
+    ctor.prototype = new TempCtor()
+    ctor.prototype.constructor = ctor
+  }
+}
 
-	styles.color.close = '\u001B[39m';
-	styles.bgColor.close = '\u001B[49m';
 
-	styles.color.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 0)
-	};
-	styles.color.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 0)
-	};
-	styles.color.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 0)
-	};
+/***/ }),
+/* 225 */,
+/* 226 */,
+/* 227 */
+/***/ (function(module, exports, __webpack_require__) {
 
-	styles.bgColor.ansi = {
-		ansi: wrapAnsi16(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi256 = {
-		ansi256: wrapAnsi256(ansi2ansi, 10)
-	};
-	styles.bgColor.ansi16m = {
-		rgb: wrapAnsi16m(rgb2rgb, 10)
-	};
+// @flow
 
-	for (let key of Object.keys(colorConvert)) {
-		if (typeof colorConvert[key] !== 'object') {
-			continue;
-		}
+/*::
+declare var __webpack_require__: mixed;
+*/
 
-		const suite = colorConvert[key];
+module.exports = typeof __webpack_require__ !== "undefined";
 
-		if (key === 'ansi16') {
-			key = 'ansi';
-		}
 
-		if ('ansi16' in suite) {
-			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
-			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
-		}
+/***/ }),
+/* 228 */,
+/* 229 */
+/***/ (function(module, exports) {
+
+/**
+ * Helpers.
+ */
+
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var y = d * 365.25;
+
+/**
+ * Parse or format the given `val`.
+ *
+ * Options:
+ *
+ *  - `long` verbose formatting [false]
+ *
+ * @param {String|Number} val
+ * @param {Object} [options]
+ * @throws {Error} throw an error if val is not a non-empty string or a number
+ * @return {String|Number}
+ * @api public
+ */
+
+module.exports = function(val, options) {
+  options = options || {};
+  var type = typeof val;
+  if (type === 'string' && val.length > 0) {
+    return parse(val);
+  } else if (type === 'number' && isNaN(val) === false) {
+    return options.long ? fmtLong(val) : fmtShort(val);
+  }
+  throw new Error(
+    'val is not a non-empty string or a valid number. val=' +
+      JSON.stringify(val)
+  );
+};
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function parse(str) {
+  str = String(str);
+  if (str.length > 100) {
+    return;
+  }
+  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(
+    str
+  );
+  if (!match) {
+    return;
+  }
+  var n = parseFloat(match[1]);
+  var type = (match[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'yrs':
+    case 'yr':
+    case 'y':
+      return n * y;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * d;
+    case 'hours':
+    case 'hour':
+    case 'hrs':
+    case 'hr':
+    case 'h':
+      return n * h;
+    case 'minutes':
+    case 'minute':
+    case 'mins':
+    case 'min':
+    case 'm':
+      return n * m;
+    case 'seconds':
+    case 'second':
+    case 'secs':
+    case 'sec':
+    case 's':
+      return n * s;
+    case 'milliseconds':
+    case 'millisecond':
+    case 'msecs':
+    case 'msec':
+    case 'ms':
+      return n;
+    default:
+      return undefined;
+  }
+}
+
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
 
-		if ('ansi256' in suite) {
-			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
-			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
-		}
+function fmtShort(ms) {
+  if (ms >= d) {
+    return Math.round(ms / d) + 'd';
+  }
+  if (ms >= h) {
+    return Math.round(ms / h) + 'h';
+  }
+  if (ms >= m) {
+    return Math.round(ms / m) + 'm';
+  }
+  if (ms >= s) {
+    return Math.round(ms / s) + 's';
+  }
+  return ms + 'ms';
+}
 
-		if ('rgb' in suite) {
-			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
-			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
-		}
-	}
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
 
-	return styles;
+function fmtLong(ms) {
+  return plural(ms, d, 'day') ||
+    plural(ms, h, 'hour') ||
+    plural(ms, m, 'minute') ||
+    plural(ms, s, 'second') ||
+    ms + ' ms';
 }
 
-// Make the export immutable
-Object.defineProperty(module, 'exports', {
-	enumerable: true,
-	get: assembleStyles
-});
+/**
+ * Pluralization helper.
+ */
+
+function plural(ms, n, name) {
+  if (ms < n) {
+    return;
+  }
+  if (ms < n * 1.5) {
+    return Math.floor(ms / n) + ' ' + name;
+  }
+  return Math.ceil(ms / n) + ' ' + name + 's';
+}
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 264 */
+/* 230 */,
+/* 231 */,
+/* 232 */,
+/* 233 */
 /***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-const os = __webpack_require__(11);
-const hasFlag = __webpack_require__(12);
+module.exports = rimraf
+rimraf.sync = rimrafSync
 
-const env = process.env;
+var assert = __webpack_require__(22)
+var path = __webpack_require__(0)
+var fs = __webpack_require__(3)
+var glob = __webpack_require__(75)
+var _0666 = parseInt('666', 8)
 
-let forceColor;
-if (hasFlag('no-color') ||
-	hasFlag('no-colors') ||
-	hasFlag('color=false')) {
-	forceColor = false;
-} else if (hasFlag('color') ||
-	hasFlag('colors') ||
-	hasFlag('color=true') ||
-	hasFlag('color=always')) {
-	forceColor = true;
-}
-if ('FORCE_COLOR' in env) {
-	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+var defaultGlobOpts = {
+  nosort: true,
+  silent: true
 }
 
-function translateLevel(level) {
-	if (level === 0) {
-		return false;
-	}
+// for EMFILE handling
+var timeout = 0
 
-	return {
-		level,
-		hasBasic: true,
-		has256: level >= 2,
-		has16m: level >= 3
-	};
+var isWindows = (process.platform === "win32")
+
+function defaults (options) {
+  var methods = [
+    'unlink',
+    'chmod',
+    'stat',
+    'lstat',
+    'rmdir',
+    'readdir'
+  ]
+  methods.forEach(function(m) {
+    options[m] = options[m] || fs[m]
+    m = m + 'Sync'
+    options[m] = options[m] || fs[m]
+  })
+
+  options.maxBusyTries = options.maxBusyTries || 3
+  options.emfileWait = options.emfileWait || 1000
+  if (options.glob === false) {
+    options.disableGlob = true
+  }
+  options.disableGlob = options.disableGlob || false
+  options.glob = options.glob || defaultGlobOpts
 }
 
-function supportsColor(stream) {
-	if (forceColor === false) {
-		return 0;
-	}
+function rimraf (p, options, cb) {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
 
-	if (hasFlag('color=16m') ||
-		hasFlag('color=full') ||
-		hasFlag('color=truecolor')) {
-		return 3;
-	}
+  assert(p, 'rimraf: missing path')
+  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
+  assert.equal(typeof cb, 'function', 'rimraf: callback function required')
+  assert(options, 'rimraf: invalid options argument provided')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
 
-	if (hasFlag('color=256')) {
-		return 2;
-	}
+  defaults(options)
 
-	if (stream && !stream.isTTY && forceColor !== true) {
-		// VS code debugger doesn't have isTTY set
-		if (env.VSCODE_PID) {
-			return 1;
-		}
-		return 0;
-	}
+  var busyTries = 0
+  var errState = null
+  var n = 0
 
-	const min = forceColor ? 1 : 0;
+  if (options.disableGlob || !glob.hasMagic(p))
+    return afterGlob(null, [p])
 
-	if (process.platform === 'win32') {
-		// Node.js 7.5.0 is the first version of Node.js to include a patch to
-		// libuv that enables 256 color output on Windows. Anything earlier and it
-		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
-		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
-		// release that supports 256 colors. Windows 10 build 14931 is the first release
-		// that supports 16m/TrueColor.
-		const osRelease = os.release().split('.');
-		if (
-			Number(process.versions.node.split('.')[0]) >= 8 &&
-			Number(osRelease[0]) >= 10 &&
-			Number(osRelease[2]) >= 10586
-		) {
-			return Number(osRelease[2]) >= 14931 ? 3 : 2;
-		}
+  options.lstat(p, function (er, stat) {
+    if (!er)
+      return afterGlob(null, [p])
 
-		return 1;
-	}
+    glob(p, options.glob, afterGlob)
+  })
 
-	if ('CI' in env) {
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
-			return 1;
-		}
+  function next (er) {
+    errState = errState || er
+    if (--n === 0)
+      cb(errState)
+  }
 
-		return min;
-	}
+  function afterGlob (er, results) {
+    if (er)
+      return cb(er)
 
-	if ('TEAMCITY_VERSION' in env) {
-		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
-	}
+    n = results.length
+    if (n === 0)
+      return cb()
 
-	if (env.COLORTERM === 'truecolor') {
-		return 3;
-	}
+    results.forEach(function (p) {
+      rimraf_(p, options, function 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)
+          }
 
-	if ('TERM_PROGRAM' in env) {
-		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+          // 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 ++)
+          }
 
-		switch (env.TERM_PROGRAM) {
-			case 'iTerm.app':
-				return version >= 3 ? 3 : 2;
-			case 'Apple_Terminal':
-				return 2;
-			// No default
-		}
-	}
+          // already gone
+          if (er.code === "ENOENT") er = null
+        }
 
-	if (/-256(color)?$/i.test(env.TERM)) {
-		return 2;
-	}
+        timeout = 0
+        next(er)
+      })
+    })
+  }
+}
 
-	if (/^screen|^xterm|^vt100|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
-		return 1;
-	}
+// Two possible strategies.
+// 1. Assume it's a file.  unlink it, then do the dir stuff on EPERM or EISDIR
+// 2. Assume it's a directory.  readdir, then do the file stuff on ENOTDIR
+//
+// Both result in an extra syscall when you guess wrong.  However, there
+// are likely far more normal files in the world than directories.  This
+// is based on the assumption that a the average number of files per
+// directory is >= 1.
+//
+// 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) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
 
-	if ('COLORTERM' in env) {
-		return 1;
-	}
+  // 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) {
+    if (er && er.code === "ENOENT")
+      return cb(null)
 
-	if (env.TERM === 'dumb') {
-		return min;
-	}
+    // Windows can EPERM on stat.  Life is suffering.
+    if (er && er.code === "EPERM" && isWindows)
+      fixWinEPERM(p, options, er, cb)
 
-	return min;
-}
+    if (st && st.isDirectory())
+      return rmdir(p, options, er, cb)
 
-function getSupportLevel(stream) {
-	const level = supportsColor(stream);
-	return translateLevel(level);
+    options.unlink(p, function (er) {
+      if (er) {
+        if (er.code === "ENOENT")
+          return cb(null)
+        if (er.code === "EPERM")
+          return (isWindows)
+            ? fixWinEPERM(p, options, er, cb)
+            : rmdir(p, options, er, cb)
+        if (er.code === "EISDIR")
+          return rmdir(p, options, er, cb)
+      }
+      return cb(er)
+    })
+  })
 }
 
-module.exports = {
-	supportsColor: getSupportLevel,
-	stdout: getSupportLevel(process.stdout),
-	stderr: getSupportLevel(process.stderr)
-};
+function 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) {
+    if (er2)
+      cb(er2.code === "ENOENT" ? null : er)
+    else
+      options.stat(p, function(er3, stats) {
+        if (er3)
+          cb(er3.code === "ENOENT" ? null : er)
+        else if (stats.isDirectory())
+          rmdir(p, options, er, cb)
+        else
+          options.unlink(p, cb)
+      })
+  })
+}
 
-/***/ }),
-/* 265 */
-/***/ (function(module, exports, __webpack_require__) {
+function fixWinEPERMSync (p, options, er) {
+  assert(p)
+  assert(options)
+  if (er)
+    assert(er instanceof Error)
 
-"use strict";
+  try {
+    options.chmodSync(p, _0666)
+  } catch (er2) {
+    if (er2.code === "ENOENT")
+      return
+    else
+      throw er
+  }
 
-const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
-const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
-const STRING_REGEX = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/;
-const ESCAPE_REGEX = /\\(u[a-f\d]{4}|x[a-f\d]{2}|.)|([^\\])/gi;
+  try {
+    var stats = options.statSync(p)
+  } catch (er3) {
+    if (er3.code === "ENOENT")
+      return
+    else
+      throw er
+  }
 
-const ESCAPES = new Map([
-	['n', '\n'],
-	['r', '\r'],
-	['t', '\t'],
-	['b', '\b'],
-	['f', '\f'],
-	['v', '\v'],
-	['0', '\0'],
-	['\\', '\\'],
-	['e', '\u001B'],
-	['a', '\u0007']
-]);
+  if (stats.isDirectory())
+    rmdirSync(p, options, er)
+  else
+    options.unlinkSync(p)
+}
 
-function unescape(c) {
-	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
-		return String.fromCharCode(parseInt(c.slice(1), 16));
-	}
+function rmdir (p, options, originalEr, cb) {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
+  assert(typeof cb === 'function')
 
-	return ESCAPES.get(c) || c;
+  // 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) {
+    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM"))
+      rmkids(p, options, cb)
+    else if (er && er.code === "ENOTDIR")
+      cb(originalEr)
+    else
+      cb(er)
+  })
 }
 
-function parseArguments(name, args) {
-	const results = [];
-	const chunks = args.trim().split(/\s*,\s*/g);
-	let matches;
-
-	for (const chunk of chunks) {
-		if (!isNaN(chunk)) {
-			results.push(Number(chunk));
-		} else if ((matches = chunk.match(STRING_REGEX))) {
-			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, chr) => escape ? unescape(escape) : chr));
-		} else {
-			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
-		}
-	}
+function rmkids(p, options, cb) {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
 
-	return results;
+  options.readdir(p, function (er, files) {
+    if (er)
+      return cb(er)
+    var 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) {
+        if (errState)
+          return
+        if (er)
+          return cb(errState = er)
+        if (--n === 0)
+          options.rmdir(p, cb)
+      })
+    })
+  })
 }
 
-function parseStyle(style) {
-	STYLE_REGEX.lastIndex = 0;
+// 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) {
+  options = options || {}
+  defaults(options)
 
-	const results = [];
-	let matches;
+  assert(p, 'rimraf: missing path')
+  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
+  assert(options, 'rimraf: missing options')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
 
-	while ((matches = STYLE_REGEX.exec(style)) !== null) {
-		const name = matches[1];
+  var results
 
-		if (matches[2]) {
-			const args = parseArguments(name, matches[2]);
-			results.push([name].concat(args));
-		} else {
-			results.push([name]);
-		}
-	}
+  if (options.disableGlob || !glob.hasMagic(p)) {
+    results = [p]
+  } else {
+    try {
+      options.lstatSync(p)
+      results = [p]
+    } catch (er) {
+      results = glob.sync(p, options.glob)
+    }
+  }
 
-	return results;
-}
+  if (!results.length)
+    return
 
-function buildStyle(chalk, styles) {
-	const enabled = {};
+  for (var i = 0; i < results.length; i++) {
+    var p = results[i]
 
-	for (const layer of styles) {
-		for (const style of layer.styles) {
-			enabled[style[0]] = layer.inverse ? null : style.slice(1);
-		}
-	}
+    try {
+      var st = options.lstatSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
 
-	let current = chalk;
-	for (const styleName of Object.keys(enabled)) {
-		if (Array.isArray(enabled[styleName])) {
-			if (!(styleName in current)) {
-				throw new Error(`Unknown Chalk style: ${styleName}`);
-			}
+      // Windows can EPERM on stat.  Life is suffering.
+      if (er.code === "EPERM" && isWindows)
+        fixWinEPERMSync(p, options, er)
+    }
 
-			if (enabled[styleName].length > 0) {
-				current = current[styleName].apply(current, enabled[styleName]);
-			} else {
-				current = current[styleName];
-			}
-		}
-	}
+    try {
+      // sunos lets the root user unlink directories, which is... weird.
+      if (st && st.isDirectory())
+        rmdirSync(p, options, null)
+      else
+        options.unlinkSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
+      if (er.code === "EPERM")
+        return isWindows ? fixWinEPERMSync(p, options, er) : rmdirSync(p, options, er)
+      if (er.code !== "EISDIR")
+        throw er
 
-	return current;
+      rmdirSync(p, options, er)
+    }
+  }
 }
 
-module.exports = (chalk, tmp) => {
-	const styles = [];
-	const chunks = [];
-	let chunk = [];
-
-	// eslint-disable-next-line max-params
-	tmp.replace(TEMPLATE_REGEX, (m, escapeChar, inverse, style, close, chr) => {
-		if (escapeChar) {
-			chunk.push(unescape(escapeChar));
-		} else if (style) {
-			const str = chunk.join('');
-			chunk = [];
-			chunks.push(styles.length === 0 ? str : buildStyle(chalk, styles)(str));
-			styles.push({inverse, styles: parseStyle(style)});
-		} else if (close) {
-			if (styles.length === 0) {
-				throw new Error('Found extraneous } in Chalk template literal');
-			}
-
-			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
-			chunk = [];
-			styles.pop();
-		} else {
-			chunk.push(chr);
-		}
-	});
+function rmdirSync (p, options, originalEr) {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
 
-	chunks.push(chunk.join(''));
+  try {
+    options.rmdirSync(p)
+  } catch (er) {
+    if (er.code === "ENOENT")
+      return
+    if (er.code === "ENOTDIR")
+      throw originalEr
+    if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")
+      rmkidsSync(p, options)
+  }
+}
 
-	if (styles.length > 0) {
-		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
-		throw new Error(errMsg);
-	}
+function rmkidsSync (p, options) {
+  assert(p)
+  assert(options)
+  options.readdirSync(p).forEach(function (f) {
+    rimrafSync(path.join(p, f), options)
+  })
 
-	return chunks.join('');
-};
+  // 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.
+  // So, we know that it won't be ENOENT or ENOTDIR or anything else.
+  // 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
+  do {
+    var threw = true
+    try {
+      var ret = options.rmdirSync(p, options)
+      threw = false
+      return ret
+    } finally {
+      if (++i < retries && threw)
+        continue
+    }
+  } while (true)
+}
 
 
 /***/ }),
-/* 266 */
+/* 234 */,
+/* 235 */,
+/* 236 */,
+/* 237 */,
+/* 238 */,
+/* 239 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const restoreCursor = __webpack_require__(267);
-
-let hidden = false;
-
-exports.show = stream => {
-	const s = stream || process.stderr;
+var hasFlag = __webpack_require__(221);
 
-	if (!s.isTTY) {
-		return;
+var support = function (level) {
+	if (level === 0) {
+		return false;
 	}
 
-	hidden = false;
-	s.write('\u001b[?25h');
+	return {
+		level: level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
 };
 
-exports.hide = stream => {
-	const s = stream || process.stderr;
-
-	if (!s.isTTY) {
-		return;
+var supportLevel = (function () {
+	if (hasFlag('no-color') ||
+		hasFlag('no-colors') ||
+		hasFlag('color=false')) {
+		return 0;
 	}
 
-	restoreCursor();
-	hidden = true;
-	s.write('\u001b[?25l');
-};
-
-exports.toggle = (force, stream) => {
-	if (force !== undefined) {
-		hidden = force;
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
 	}
 
-	if (hidden) {
-		exports.show(stream);
-	} else {
-		exports.hide(stream);
+	if (hasFlag('color=256')) {
+		return 2;
 	}
-};
-
-
-/***/ }),
-/* 267 */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-const onetime = __webpack_require__(268);
-const signalExit = __webpack_require__(110);
-
-module.exports = onetime(() => {
-	signalExit(() => {
-		process.stderr.write('\u001b[?25h');
-	}, {alwaysLast: true});
-});
-
-
-/***/ }),
-/* 268 */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-const mimicFn = __webpack_require__(269);
-
-module.exports = (fn, opts) => {
-	// TODO: Remove this in v3
-	if (opts === true) {
-		throw new TypeError('The second argument is now an options object');
+	if (hasFlag('color') ||
+		hasFlag('colors') ||
+		hasFlag('color=true') ||
+		hasFlag('color=always')) {
+		return 1;
 	}
 
-	if (typeof fn !== 'function') {
-		throw new TypeError('Expected a function');
+	if (process.stdout && !process.stdout.isTTY) {
+		return 0;
 	}
 
-	opts = opts || {};
-
-	let ret;
-	let called = false;
-	const fnName = fn.displayName || fn.name || '<anonymous>';
-
-	const onetime = function () {
-		if (called) {
-			if (opts.throw === true) {
-				throw new Error(`Function \`${fnName}\` can only be called once`);
-			}
+	if (process.platform === 'win32') {
+		return 1;
+	}
 
-			return ret;
+	if ('CI' in process.env) {
+		if ('TRAVIS' in process.env || process.env.CI === 'Travis') {
+			return 1;
 		}
 
-		called = true;
-		ret = fn.apply(this, arguments);
-		fn = null;
-
-		return ret;
-	};
-
-	mimicFn(onetime, fn);
-
-	return onetime;
-};
+		return 0;
+	}
 
+	if ('TEAMCITY_VERSION' in process.env) {
+		return process.env.TEAMCITY_VERSION.match(/^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/) === null ? 0 : 1;
+	}
 
-/***/ }),
-/* 269 */
-/***/ (function(module, exports, __webpack_require__) {
+	if (/^(screen|xterm)-256(?:color)?/.test(process.env.TERM)) {
+		return 2;
+	}
 
-"use strict";
+	if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
+		return 1;
+	}
 
-module.exports = (to, from) => {
-	// TODO: use `Reflect.ownKeys()` when targeting Node.js 6
-	for (const prop of Object.getOwnPropertyNames(from).concat(Object.getOwnPropertySymbols(from))) {
-		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
+	if ('COLORTERM' in process.env) {
+		return 1;
 	}
 
-	return to;
-};
+	if (process.env.TERM === 'dumb') {
+		return 0;
+	}
 
+	return 0;
+})();
 
-/***/ }),
-/* 270 */
-/***/ (function(module, exports, __webpack_require__) {
+if (supportLevel === 0 && 'FORCE_COLOR' in process.env) {
+	supportLevel = 1;
+}
 
-"use strict";
+module.exports = process && support(supportLevel);
 
-module.exports = __webpack_require__(271);
 
+/***/ })
+/******/ ]);
 
 /***/ }),
-/* 271 */
-/***/ (function(module) {
+/* 585 */
+/***/ (function(module, exports) {
 
-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\":[\"🌲\",\"🎄\"]}}");
+module.exports = require("buffer");
 
 /***/ }),
-/* 272 */
+/* 586 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __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 _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 export (binding) */ __webpack_require__.d(__webpack_exports__, "BootstrapCacheFile", function() { return BootstrapCacheFile; });
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(23);
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(16);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -33079,138 +68871,87 @@ __webpack_require__.r(__webpack_exports__);
  */
 
 
+class BootstrapCacheFile {
+  constructor(kbn, project, checksums) {
+    _defineProperty(this, "path", void 0);
 
+    _defineProperty(this, "expectedValue", void 0);
 
-const RunCommand = {
-  description: 'Run script defined in package.json in each package that contains that script.',
-  name: 'run',
-
-  async run(projects, projectGraph, {
-    extraArgs
-  }) {
-    const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_3__["topologicallyBatchProjects"])(projects, projectGraph);
+    this.path = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(project.targetLocation, '.bootstrap-cache');
 
-    if (extraArgs.length === 0) {
-      _utils_log__WEBPACK_IMPORTED_MODULE_1__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.red.bold('\nNo script specified'));
-      process.exit(1);
+    if (!checksums) {
+      return;
     }
 
-    const scriptName = extraArgs[0];
-    const scriptArgs = extraArgs.slice(1);
-    _utils_log__WEBPACK_IMPORTED_MODULE_1__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`\nRunning script [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(scriptName)}] in batched topological order\n`));
-    await Object(_utils_parallelize__WEBPACK_IMPORTED_MODULE_2__["parallelizeBatches"])(batchedProjects, async pkg => {
-      if (pkg.hasScript(scriptName)) {
-        await pkg.runScriptStreaming(scriptName, scriptArgs);
-      }
-    });
-  }
-
-};
-
-/***/ }),
-/* 273 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WatchCommand", function() { return WatchCommand; });
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
-/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(36);
-/* 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
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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 projectAndDepCacheKeys = Array.from(kbn.getProjectAndDeps(project.name).values()) // sort deps by name so that the key is stable
+    .sort((a, b) => a.name.localeCompare(b.name)) // get the cacheKey for each project, return undefined if the cache key couldn't be determined
+    .map(p => {
+      const cacheKey = checksums.get(p.name);
 
+      if (cacheKey) {
+        return `${p.name}:${cacheKey}`;
+      }
+    }); // if any of the relevant cache keys are undefined then the projectCacheKey must be too
 
-/**
- * Name of the script in the package/project package.json file to run during `kbn watch`.
- */
-const watchScriptName = 'kbn:watch';
-/**
- * Name of the Kibana project.
- */
+    this.expectedValue = projectAndDepCacheKeys.some(k => !k) ? undefined : [`# this is only human readable for debugging, please don't try to parse this`, ...projectAndDepCacheKeys].join('\n');
+  }
 
-const kibanaProjectName = 'kibana';
-/**
- * Command that traverses through list of available projects/packages that have `kbn:watch` script in their
- * package.json files, groups them into topology aware batches and then processes theses batches one by one
- * running `kbn:watch` scripts in parallel within the same batch.
- *
- * Command internally relies on the fact that most of the build systems that are triggered by `kbn:watch`
- * will emit special "marker" once build/watch process is ready that we can use as completion condition for
- * the `kbn:watch` script and eventually for the entire batch. Currently we support completion "markers" for
- * `webpack` and `tsc` only, for the rest we rely on predefined timeouts.
- */
+  isValid() {
+    if (!this.expectedValue) {
+      return false;
+    }
 
-const WatchCommand = {
-  description: 'Runs `kbn:watch` script for every project.',
-  name: 'watch',
+    try {
+      return fs__WEBPACK_IMPORTED_MODULE_0___default.a.readFileSync(this.path, 'utf8') === this.expectedValue;
+    } catch (error) {
+      if (error.code === 'ENOENT') {
+        return false;
+      }
 
-  async run(projects, projectGraph) {
-    const projectsToWatch = new Map();
+      throw error;
+    }
+  }
 
-    for (const project of projects.values()) {
-      // We can't watch project that doesn't have `kbn:watch` script.
-      if (project.hasScript(watchScriptName)) {
-        projectsToWatch.set(project.name, project);
+  delete() {
+    try {
+      fs__WEBPACK_IMPORTED_MODULE_0___default.a.unlinkSync(this.path);
+    } catch (error) {
+      if (error.code !== 'ENOENT') {
+        throw error;
       }
     }
+  }
 
-    if (projectsToWatch.size === 0) {
-      _utils_log__WEBPACK_IMPORTED_MODULE_1__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.red(`\nThere are no projects to watch found. Make sure that projects define 'kbn:watch' script in 'package.json'.\n`));
+  write() {
+    if (!this.expectedValue) {
       return;
     }
 
-    const projectNames = Array.from(projectsToWatch.keys());
-    _utils_log__WEBPACK_IMPORTED_MODULE_1__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(`Running ${watchScriptName} scripts for [${projectNames.join(', ')}].`))); // Kibana should always be run the last, so we don't rely on automatic
-    // topological batching and push it to the last one-entry batch manually.
-
-    const shouldWatchKibanaProject = projectsToWatch.delete(kibanaProjectName);
-    const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_3__["topologicallyBatchProjects"])(projectsToWatch, projectGraph);
-
-    if (shouldWatchKibanaProject) {
-      batchedProjects.push([projects.get(kibanaProjectName)]);
-    }
-
-    await Object(_utils_parallelize__WEBPACK_IMPORTED_MODULE_2__["parallelizeBatches"])(batchedProjects, async pkg => {
-      const completionHint = await Object(_utils_watch__WEBPACK_IMPORTED_MODULE_4__["waitUntilWatchIsReady"])(pkg.runScriptStreaming(watchScriptName).stdout);
-      _utils_log__WEBPACK_IMPORTED_MODULE_1__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`[${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(pkg.name)}] Initial build completed (${completionHint}).`));
+    fs__WEBPACK_IMPORTED_MODULE_0___default.a.mkdirSync(path__WEBPACK_IMPORTED_MODULE_1___default.a.dirname(this.path), {
+      recursive: true
     });
+    fs__WEBPACK_IMPORTED_MODULE_0___default.a.writeFileSync(this.path, this.expectedValue);
   }
 
-};
+}
 
 /***/ }),
-/* 274 */
+/* 587 */
 /***/ (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__(275);
-/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(377);
+/* 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__(588);
+/* 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__(675);
+/* 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
@@ -33231,11721 +68972,10044 @@ __webpack_require__.r(__webpack_exports__);
  */
 
 
-/**
- * Number of milliseconds we wait before we fall back to the default watch handler.
- */
-
-const defaultHandlerDelay = 3000;
-/**
- * If default watch handler is used, then it's the number of milliseconds we wait for
- * any build output before we consider watch task ready.
- */
-
-const defaultHandlerReadinessTimeout = 2000;
-/**
- * Describes configurable watch options.
- */
-
-function getWatchHandlers(buildOutput$, {
-  handlerDelay = defaultHandlerDelay,
-  handlerReadinessTimeout = defaultHandlerReadinessTimeout
-}) {
-  const typescriptHandler = buildOutput$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["first"])(data => data.includes('$ tsc')), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["map"])(() => buildOutput$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["first"])(data => data.includes('Compilation complete.')), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["mapTo"])('tsc'))));
-  const webpackHandler = buildOutput$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["first"])(data => data.includes('$ webpack')), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["map"])(() => buildOutput$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["first"])(data => data.includes('Chunk Names')), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["mapTo"])('webpack'))));
-  const defaultHandler = rxjs__WEBPACK_IMPORTED_MODULE_0__["of"](undefined).pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["delay"])(handlerReadinessTimeout), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["map"])(() => buildOutput$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["timeout"])(handlerDelay), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["catchError"])(() => rxjs__WEBPACK_IMPORTED_MODULE_0__["of"]('timeout')))));
-  return [typescriptHandler, webpackHandler, defaultHandler];
-}
-
-function waitUntilWatchIsReady(stream, opts = {}) {
-  const buildOutput$ = new rxjs__WEBPACK_IMPORTED_MODULE_0__["Subject"]();
-
-  const onDataListener = data => buildOutput$.next(data.toString('utf-8'));
-
-  const onEndListener = () => buildOutput$.complete();
-
-  const onErrorListener = e => buildOutput$.error(e);
-
-  stream.once('end', onEndListener);
-  stream.once('error', onErrorListener);
-  stream.on('data', onDataListener);
-  return rxjs__WEBPACK_IMPORTED_MODULE_0__["race"](getWatchHandlers(buildOutput$, opts)).pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["mergeMap"])(whenReady => whenReady), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["finalize"])(() => {
-    stream.removeListener('data', onDataListener);
-    stream.removeListener('end', onEndListener);
-    stream.removeListener('error', onErrorListener);
-    buildOutput$.complete();
-  })).toPromise();
-}
-
-/***/ }),
-/* 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__(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__(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__(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__(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__(294);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _internal_Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]; });
+const CleanCommand = {
+  description: 'Remove the node_modules and target directories from all projects.',
+  name: 'clean',
 
-/* 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"]; });
+  async run(projects) {
+    const toDelete = [];
 
-/* 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"]; });
+    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)
+        });
+      }
 
-/* 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"]; });
+      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)
+        });
+      }
 
-/* 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"]; });
+      const {
+        extraPatterns
+      } = project.getCleanConfig();
 
-/* 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"]; });
+      if (extraPatterns) {
+        toDelete.push({
+          cwd: project.path,
+          pattern: extraPatterns
+        });
+      }
+    }
 
-/* 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"]; });
+    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.
+       */
 
-/* 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"]; });
+      const originalCwd = process.cwd();
 
-/* 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"]; });
+      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);
+      }
+    }
+  }
 
-/* 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__(307);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__["Scheduler"]; });
+/***/ }),
+/* 588 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
 
-/* 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"]; });
+const {promisify} = __webpack_require__(29);
+const path = __webpack_require__(16);
+const globby = __webpack_require__(589);
+const isGlob = __webpack_require__(601);
+const slash = __webpack_require__(662);
+const gracefulFs = __webpack_require__(664);
+const isPathCwd = __webpack_require__(668);
+const isPathInside = __webpack_require__(669);
+const rimraf = __webpack_require__(670);
+const pMap = __webpack_require__(671);
 
-/* 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"]; });
+const rimrafP = promisify(rimraf);
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["NotificationKind"]; });
+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
+};
 
-/* 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"]; });
+function safeCheck(file, cwd) {
+	if (isPathCwd(file)) {
+		throw new Error('Cannot delete the current working directory. Can be overridden with the `force` option.');
+	}
 
-/* 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"]; });
+	if (!isPathInside(file, cwd)) {
+		throw new Error('Cannot delete files/directories outside the current working directory. Can be overridden with the `force` option.');
+	}
+}
 
-/* 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"]; });
+function normalizePatterns(patterns) {
+	patterns = Array.isArray(patterns) ? patterns : [patterns];
 
-/* 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"]; });
+	patterns = patterns.map(pattern => {
+		if (process.platform === 'win32' && isGlob(pattern) === false) {
+			return slash(pattern);
+		}
 
-/* 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"]; });
+		return pattern;
+	});
 
-/* 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"]; });
+	return patterns;
+}
 
-/* 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"]; });
+module.exports = async (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
+	options = {
+		expandDirectories: false,
+		onlyFiles: false,
+		followSymbolicLinks: false,
+		cwd,
+		...options
+	};
 
-/* 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"]; });
+	patterns = normalizePatterns(patterns);
 
-/* 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"]; });
+	const files = (await globby(patterns, options))
+		.sort((a, b) => b.localeCompare(a));
 
-/* 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"]; });
+	const mapper = async file => {
+		file = path.resolve(cwd, file);
 
-/* 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"]; });
+		if (!force) {
+			safeCheck(file, cwd);
+		}
 
-/* 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"]; });
+		if (!dryRun) {
+			await rimrafP(file, rimrafOptions);
+		}
 
-/* 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"]; });
+		return file;
+	};
 
-/* 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"]; });
+	const removedFiles = await pMap(files, mapper, options);
 
-/* 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"]; });
+	removedFiles.sort((a, b) => a.localeCompare(b));
 
-/* 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"]; });
+	return removedFiles;
+};
 
-/* 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"]; });
+module.exports.sync = (patterns, {force, dryRun, cwd = process.cwd(), ...options} = {}) => {
+	options = {
+		expandDirectories: false,
+		onlyFiles: false,
+		followSymbolicLinks: false,
+		cwd,
+		...options
+	};
 
-/* 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"]; });
+	patterns = normalizePatterns(patterns);
 
-/* 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"]; });
+	const files = globby.sync(patterns, options)
+		.sort((a, b) => b.localeCompare(a));
 
-/* 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"]; });
+	const removedFiles = files.map(file => {
+		file = path.resolve(cwd, file);
 
-/* 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"]; });
+		if (!force) {
+			safeCheck(file, cwd);
+		}
 
-/* 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"]; });
+		if (!dryRun) {
+			rimraf.sync(file, rimrafOptions);
+		}
 
-/* 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"]; });
+		return file;
+	});
 
-/* 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"]; });
+	removedFiles.sort((a, b) => a.localeCompare(b));
 
-/* 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"]; });
+	return removedFiles;
+};
 
-/* 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__(368);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__["pairs"]; });
+/***/ }),
+/* 589 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
 
-/* 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"]; });
+const fs = __webpack_require__(23);
+const arrayUnion = __webpack_require__(590);
+const merge2 = __webpack_require__(591);
+const glob = __webpack_require__(502);
+const fastGlob = __webpack_require__(592);
+const dirGlob = __webpack_require__(658);
+const gitignore = __webpack_require__(660);
+const {FilterStream, UniqueStream} = __webpack_require__(663);
 
-/* 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"]; });
+const DEFAULT_FILTER = () => false;
 
-/* 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"]; });
+const isNegative = pattern => pattern[0] === '!';
 
-/* 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"]; });
+const assertPatternsInput = patterns => {
+	if (!patterns.every(pattern => typeof pattern === 'string')) {
+		throw new TypeError('Patterns must be a string or an array of strings');
+	}
+};
 
-/* 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"]; });
+const checkCwdOption = (options = {}) => {
+	if (!options.cwd) {
+		return;
+	}
 
-/* 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"]; });
+	let stat;
+	try {
+		stat = fs.statSync(options.cwd);
+	} catch (_) {
+		return;
+	}
 
-/* 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"]; });
+	if (!stat.isDirectory()) {
+		throw new Error('The `cwd` option must be a path to a directory');
+	}
+};
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__["EMPTY"]; });
+const getPathString = p => p.stats instanceof fs.Stats ? p.path : p;
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__["NEVER"]; });
+const generateGlobTasks = (patterns, taskOptions) => {
+	patterns = arrayUnion([].concat(patterns));
+	assertPatternsInput(patterns);
+	checkCwdOption(taskOptions);
 
-/* 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"]; });
+	const globTasks = [];
 
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+	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;
 
 
+/***/ }),
+/* 590 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
 
+module.exports = (...arguments_) => {
+	return [...new Set([].concat(...arguments_))];
+};
 
 
+/***/ }),
+/* 591 */
+/***/ (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__(27)
+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
+}
 
-//# sourceMappingURL=index.js.map
+// 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
+}
 
 
 /***/ }),
-/* 276 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 592 */
+/***/ (function(module, 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_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 */
-
-
-
+
+const taskManager = __webpack_require__(593);
+const async_1 = __webpack_require__(621);
+const stream_1 = __webpack_require__(654);
+const sync_1 = __webpack_require__(655);
+const settings_1 = __webpack_require__(657);
+const utils = __webpack_require__(594);
+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;
 
 
-var Observable = /*@__PURE__*/ (function () {
-    function Observable(subscribe) {
-        this._isScalar = false;
-        if (subscribe) {
-            this._subscribe = subscribe;
-        }
-    }
-    Observable.prototype.lift = function (operator) {
-        var observable = new Observable();
-        observable.source = this;
-        observable.operator = operator;
-        return observable;
-    };
-    Observable.prototype.subscribe = function (observerOrNext, error, complete) {
-        var operator = this.operator;
-        var sink = Object(_util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__["toSubscriber"])(observerOrNext, error, complete);
-        if (operator) {
-            sink.add(operator.call(sink, this.source));
-        }
-        else {
-            sink.add(this.source || (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ?
-                this._subscribe(sink) :
-                this._trySubscribe(sink));
-        }
-        if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) {
-            if (sink.syncErrorThrowable) {
-                sink.syncErrorThrowable = false;
-                if (sink.syncErrorThrown) {
-                    throw sink.syncErrorValue;
-                }
-            }
-        }
-        return sink;
-    };
-    Observable.prototype._trySubscribe = function (sink) {
-        try {
-            return this._subscribe(sink);
-        }
-        catch (err) {
-            if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) {
-                sink.syncErrorThrown = true;
-                sink.syncErrorValue = err;
-            }
-            if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_0__["canReportError"])(sink)) {
-                sink.error(err);
-            }
-            else {
-                console.warn(err);
-            }
-        }
-    };
-    Observable.prototype.forEach = function (next, promiseCtor) {
-        var _this = this;
-        promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function (resolve, reject) {
-            var subscription;
-            subscription = _this.subscribe(function (value) {
-                try {
-                    next(value);
-                }
-                catch (err) {
-                    reject(err);
-                    if (subscription) {
-                        subscription.unsubscribe();
-                    }
-                }
-            }, reject, resolve);
-        });
-    };
-    Observable.prototype._subscribe = function (subscriber) {
-        var source = this.source;
-        return source && source.subscribe(subscriber);
-    };
-    Observable.prototype[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]] = function () {
-        return this;
-    };
-    Observable.prototype.pipe = function () {
-        var operations = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            operations[_i] = arguments[_i];
-        }
-        if (operations.length === 0) {
-            return this;
-        }
-        return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipeFromArray"])(operations)(this);
-    };
-    Observable.prototype.toPromise = function (promiseCtor) {
-        var _this = this;
-        promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function (resolve, reject) {
-            var value;
-            _this.subscribe(function (x) { return value = x; }, function (err) { return reject(err); }, function () { return resolve(value); });
-        });
-    };
-    Observable.create = function (subscribe) {
-        return new Observable(subscribe);
-    };
-    return Observable;
-}());
+/***/ }),
+/* 593 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function getPromiseCtor(promiseCtor) {
-    if (!promiseCtor) {
-        promiseCtor = _config__WEBPACK_IMPORTED_MODULE_4__["config"].Promise || Promise;
-    }
-    if (!promiseCtor) {
-        throw new Error('no Promise impl found');
-    }
-    return promiseCtor;
-}
-//# sourceMappingURL=Observable.js.map
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__(594);
+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;
 
 
 /***/ }),
-/* 277 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 594 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* 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;
-        }
-        else if (destination && destination instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) {
-            observer = destination;
-        }
-        else {
-            observer = null;
-        }
-    }
-    return true;
-}
-//# sourceMappingURL=canReportError.js.map
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const array = __webpack_require__(595);
+exports.array = array;
+const errno = __webpack_require__(596);
+exports.errno = errno;
+const fs = __webpack_require__(597);
+exports.fs = fs;
+const path = __webpack_require__(598);
+exports.path = path;
+const pattern = __webpack_require__(599);
+exports.pattern = pattern;
+const stream = __webpack_require__(620);
+exports.stream = stream;
 
 
 /***/ }),
-/* 278 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 595 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return Subscriber; });
-/* 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 */
-
-
-
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function flatten(items) {
+    return items.reduce((collection, item) => [].concat(collection, item), []);
+}
+exports.flatten = flatten;
 
 
+/***/ }),
+/* 596 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+function isEnoentCodeError(error) {
+    return error.code === 'ENOENT';
+}
+exports.isEnoentCodeError = isEnoentCodeError;
 
-var Subscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Subscriber, _super);
-    function Subscriber(destinationOrNext, error, complete) {
-        var _this = _super.call(this) || this;
-        _this.syncErrorValue = null;
-        _this.syncErrorThrown = false;
-        _this.syncErrorThrowable = false;
-        _this.isStopped = false;
-        switch (arguments.length) {
-            case 0:
-                _this.destination = _Observer__WEBPACK_IMPORTED_MODULE_2__["empty"];
-                break;
-            case 1:
-                if (!destinationOrNext) {
-                    _this.destination = _Observer__WEBPACK_IMPORTED_MODULE_2__["empty"];
-                    break;
-                }
-                if (typeof destinationOrNext === 'object') {
-                    if (destinationOrNext instanceof Subscriber) {
-                        _this.syncErrorThrowable = destinationOrNext.syncErrorThrowable;
-                        _this.destination = destinationOrNext;
-                        destinationOrNext.add(_this);
-                    }
-                    else {
-                        _this.syncErrorThrowable = true;
-                        _this.destination = new SafeSubscriber(_this, destinationOrNext);
-                    }
-                    break;
-                }
-            default:
-                _this.syncErrorThrowable = true;
-                _this.destination = new SafeSubscriber(_this, destinationOrNext, error, complete);
-                break;
-        }
-        return _this;
-    }
-    Subscriber.prototype[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_4__["rxSubscriber"]] = function () { return this; };
-    Subscriber.create = function (next, error, complete) {
-        var subscriber = new Subscriber(next, error, complete);
-        subscriber.syncErrorThrowable = false;
-        return subscriber;
-    };
-    Subscriber.prototype.next = function (value) {
-        if (!this.isStopped) {
-            this._next(value);
-        }
-    };
-    Subscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            this.isStopped = true;
-            this._error(err);
-        }
-    };
-    Subscriber.prototype.complete = function () {
-        if (!this.isStopped) {
-            this.isStopped = true;
-            this._complete();
-        }
-    };
-    Subscriber.prototype.unsubscribe = function () {
-        if (this.closed) {
-            return;
-        }
-        this.isStopped = true;
-        _super.prototype.unsubscribe.call(this);
-    };
-    Subscriber.prototype._next = function (value) {
-        this.destination.next(value);
-    };
-    Subscriber.prototype._error = function (err) {
-        this.destination.error(err);
-        this.unsubscribe();
-    };
-    Subscriber.prototype._complete = function () {
-        this.destination.complete();
-        this.unsubscribe();
-    };
-    Subscriber.prototype._unsubscribeAndRecycle = function () {
-        var _parentOrParents = this._parentOrParents;
-        this._parentOrParents = null;
-        this.unsubscribe();
-        this.closed = false;
-        this.isStopped = false;
-        this._parentOrParents = _parentOrParents;
-        return this;
-    };
-    return Subscriber;
-}(_Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"]));
 
-var SafeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SafeSubscriber, _super);
-    function SafeSubscriber(_parentSubscriber, observerOrNext, error, complete) {
-        var _this = _super.call(this) || this;
-        _this._parentSubscriber = _parentSubscriber;
-        var next;
-        var context = _this;
-        if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(observerOrNext)) {
-            next = observerOrNext;
-        }
-        else if (observerOrNext) {
-            next = observerOrNext.next;
-            error = observerOrNext.error;
-            complete = observerOrNext.complete;
-            if (observerOrNext !== _Observer__WEBPACK_IMPORTED_MODULE_2__["empty"]) {
-                context = Object.create(observerOrNext);
-                if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_1__["isFunction"])(context.unsubscribe)) {
-                    _this.add(context.unsubscribe.bind(context));
-                }
-                context.unsubscribe = _this.unsubscribe.bind(_this);
-            }
-        }
-        _this._context = context;
-        _this._next = next;
-        _this._error = error;
-        _this._complete = complete;
-        return _this;
-    }
-    SafeSubscriber.prototype.next = function (value) {
-        if (!this.isStopped && this._next) {
-            var _parentSubscriber = this._parentSubscriber;
-            if (!_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
-                this.__tryOrUnsub(this._next, value);
-            }
-            else if (this.__tryOrSetError(_parentSubscriber, this._next, value)) {
-                this.unsubscribe();
-            }
-        }
-    };
-    SafeSubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var _parentSubscriber = this._parentSubscriber;
-            var useDeprecatedSynchronousErrorHandling = _config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling;
-            if (this._error) {
-                if (!useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
-                    this.__tryOrUnsub(this._error, err);
-                    this.unsubscribe();
-                }
-                else {
-                    this.__tryOrSetError(_parentSubscriber, this._error, err);
-                    this.unsubscribe();
-                }
-            }
-            else if (!_parentSubscriber.syncErrorThrowable) {
-                this.unsubscribe();
-                if (useDeprecatedSynchronousErrorHandling) {
-                    throw err;
-                }
-                Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
-            }
-            else {
-                if (useDeprecatedSynchronousErrorHandling) {
-                    _parentSubscriber.syncErrorValue = err;
-                    _parentSubscriber.syncErrorThrown = true;
-                }
-                else {
-                    Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
-                }
-                this.unsubscribe();
-            }
-        }
-    };
-    SafeSubscriber.prototype.complete = function () {
-        var _this = this;
-        if (!this.isStopped) {
-            var _parentSubscriber = this._parentSubscriber;
-            if (this._complete) {
-                var wrappedComplete = function () { return _this._complete.call(_this._context); };
-                if (!_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) {
-                    this.__tryOrUnsub(wrappedComplete);
-                    this.unsubscribe();
-                }
-                else {
-                    this.__tryOrSetError(_parentSubscriber, wrappedComplete);
-                    this.unsubscribe();
-                }
-            }
-            else {
-                this.unsubscribe();
-            }
-        }
-    };
-    SafeSubscriber.prototype.__tryOrUnsub = function (fn, value) {
-        try {
-            fn.call(this._context, value);
-        }
-        catch (err) {
-            this.unsubscribe();
-            if (_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling) {
-                throw err;
-            }
-            else {
-                Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
-            }
-        }
-    };
-    SafeSubscriber.prototype.__tryOrSetError = function (parent, fn, value) {
-        if (!_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling) {
-            throw new Error('bad call');
-        }
-        try {
-            fn.call(this._context, value);
-        }
-        catch (err) {
-            if (_config__WEBPACK_IMPORTED_MODULE_5__["config"].useDeprecatedSynchronousErrorHandling) {
-                parent.syncErrorValue = err;
-                parent.syncErrorThrown = true;
-                return true;
-            }
-            else {
-                Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_6__["hostReportError"])(err);
-                return true;
-            }
-        }
-        return false;
-    };
-    SafeSubscriber.prototype._unsubscribe = function () {
-        var _parentSubscriber = this._parentSubscriber;
-        this._context = null;
-        this._parentSubscriber = null;
-        _parentSubscriber.unsubscribe();
-    };
-    return SafeSubscriber;
-}(Subscriber));
+/***/ }),
+/* 597 */
+/***/ (function(module, exports, __webpack_require__) {
 
-//# sourceMappingURL=Subscriber.js.map
+"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;
 
 
 /***/ }),
-/* 279 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 598 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__extends", function() { return __extends; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__assign", function() { return __assign; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__rest", function() { return __rest; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__decorate", function() { return __decorate; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__param", function() { return __param; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__metadata", function() { return __metadata; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__awaiter", function() { return __awaiter; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__generator", function() { return __generator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__exportStar", function() { return __exportStar; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncValues", function() { return __asyncValues; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__makeTemplateObject", function() { return __makeTemplateObject; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__importStar", function() { return __importStar; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__importDefault", function() { return __importDefault; });
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
 
-function __extends(d, b) {
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+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, '/');
 }
-
-var __assign = function() {
-    __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-        return t;
-    }
-    return __assign.apply(this, arguments);
+exports.unixify = unixify;
+function makeAbsolute(cwd, filepath) {
+    return path.resolve(cwd, filepath);
 }
+exports.makeAbsolute = makeAbsolute;
+
+
+/***/ }),
+/* 599 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
 
-function __rest(s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
-            t[p[i]] = s[p[i]];
-    return t;
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(16);
+const globParent = __webpack_require__(600);
+const isGlob = __webpack_require__(601);
+const micromatch = __webpack_require__(603);
+const GLOBSTAR = '**';
+function isStaticPattern(pattern) {
+    return !isDynamicPattern(pattern);
 }
-
-function __decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
+exports.isStaticPattern = isStaticPattern;
+function isDynamicPattern(pattern) {
+    return isGlob(pattern, { strict: false });
 }
-
-function __param(paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
+exports.isDynamicPattern = isDynamicPattern;
+function convertToPositivePattern(pattern) {
+    return isNegativePattern(pattern) ? pattern.slice(1) : pattern;
 }
-
-function __metadata(metadataKey, metadataValue) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+exports.convertToPositivePattern = convertToPositivePattern;
+function convertToNegativePattern(pattern) {
+    return '!' + pattern;
 }
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+exports.convertToNegativePattern = convertToNegativePattern;
+function isNegativePattern(pattern) {
+    return pattern.startsWith('!') && pattern[1] !== '(';
 }
-
-function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
+exports.isNegativePattern = isNegativePattern;
+function isPositivePattern(pattern) {
+    return !isNegativePattern(pattern);
 }
-
-function __exportStar(m, exports) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+exports.isPositivePattern = isPositivePattern;
+function getNegativePatterns(patterns) {
+    return patterns.filter(isNegativePattern);
 }
-
-function __values(o) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-    if (m) return m.call(o);
-    return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
+exports.getNegativePatterns = getNegativePatterns;
+function getPositivePatterns(patterns) {
+    return patterns.filter(isPositivePattern);
 }
-
-function __read(o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
+exports.getPositivePatterns = getPositivePatterns;
+function getBaseDirectory(pattern) {
+    return globParent(pattern);
 }
-
-function __spread() {
-    for (var ar = [], i = 0; i < arguments.length; i++)
-        ar = ar.concat(__read(arguments[i]));
-    return ar;
+exports.getBaseDirectory = getBaseDirectory;
+function hasGlobStar(pattern) {
+    return pattern.indexOf(GLOBSTAR) !== -1;
 }
-
-function __await(v) {
-    return this instanceof __await ? (this.v = v, this) : new __await(v);
+exports.hasGlobStar = hasGlobStar;
+function endsWithSlashGlobStar(pattern) {
+    return pattern.endsWith('/' + GLOBSTAR);
 }
-
-function __asyncGenerator(thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+exports.endsWithSlashGlobStar = endsWithSlashGlobStar;
+function isAffectDepthOfReadingPattern(pattern) {
+    const basename = path.basename(pattern);
+    return endsWithSlashGlobStar(pattern) || isStaticPattern(basename);
 }
-
-function __asyncDelegator(o) {
-    var i, p;
-    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+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;
 }
-
-function __asyncValues(o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+exports.getNaiveDepth = getNaiveDepth;
+function getMaxNaivePatternsDepth(patterns) {
+    return patterns.reduce((max, pattern) => {
+        const depth = getNaiveDepth(pattern);
+        return depth > max ? depth : max;
+    }, 0);
 }
-
-function __makeTemplateObject(cooked, raw) {
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-    return cooked;
-};
-
-function __importStar(mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result.default = mod;
-    return result;
+exports.getMaxNaivePatternsDepth = getMaxNaivePatternsDepth;
+function makeRe(pattern, options) {
+    return micromatch.makeRe(pattern, options);
 }
-
-function __importDefault(mod) {
-    return (mod && mod.__esModule) ? mod : { default: mod };
+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;
 
 
 /***/ }),
-/* 280 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 600 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isFunction", function() { return isFunction; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isFunction(x) {
-    return typeof x === 'function';
-}
-//# sourceMappingURL=isFunction.js.map
+
+
+var isGlob = __webpack_require__(601);
+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');
+};
 
 
 /***/ }),
-/* 281 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 601 */
+/***/ (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__(602);
+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;
+};
+
+
+/***/ }),
+/* 602 */
+/***/ (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;
+};
+
+
+/***/ }),
+/* 603 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const util = __webpack_require__(29);
+const braces = __webpack_require__(604);
+const picomatch = __webpack_require__(614);
+const utils = __webpack_require__(617);
+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;
+};
 
-"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__(282);
-/* harmony import */ var _util_hostReportError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(283);
-/** PURE_IMPORTS_START _config,_util_hostReportError PURE_IMPORTS_END */
+/**
+ * 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)}"`);
+  }
 
-var empty = {
-    closed: true,
-    next: function (value) { },
-    error: function (err) {
-        if (_config__WEBPACK_IMPORTED_MODULE_0__["config"].useDeprecatedSynchronousErrorHandling) {
-            throw err;
-        }
-        else {
-            Object(_util_hostReportError__WEBPACK_IMPORTED_MODULE_1__["hostReportError"])(err);
-        }
-    },
-    complete: function () { }
+  return [].concat(patterns).every(p => picomatch(p, options)(str));
 };
-//# sourceMappingURL=Observer.js.map
 
+/**
+ * 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
+ */
 
-/***/ }),
-/* 282 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "config", function() { return config; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var _enable_super_gross_mode_that_will_cause_bad_things = false;
-var config = {
-    Promise: undefined,
-    set useDeprecatedSynchronousErrorHandling(value) {
-        if (value) {
-            var error = /*@__PURE__*/ new Error();
-            /*@__PURE__*/ console.warn('DEPRECATED! RxJS was set to use deprecated synchronous error handling behavior by code at: \n' + error.stack);
-        }
-        else if (_enable_super_gross_mode_that_will_cause_bad_things) {
-            /*@__PURE__*/ console.log('RxJS: Back to a better error behavior. Thank you. <3');
-        }
-        _enable_super_gross_mode_that_will_cause_bad_things = value;
-    },
-    get useDeprecatedSynchronousErrorHandling() {
-        return _enable_super_gross_mode_that_will_cause_bad_things;
-    },
+  if (match) {
+    return match.slice(1).map(v => v === void 0 ? '' : v);
+  }
 };
-//# sourceMappingURL=config.js.map
 
+/**
+ * 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
+ */
 
-/***/ }),
-/* 283 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+micromatch.makeRe = (...args) => picomatch.makeRe(...args);
 
-"use strict";
-__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; }, 0);
-}
-//# sourceMappingURL=hostReportError.js.map
+/**
+ * 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);
 
-/***/ }),
-/* 284 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * 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
+ */
 
-"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__(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 */
+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
+ */
 
-var Subscription = /*@__PURE__*/ (function () {
-    function Subscription(unsubscribe) {
-        this.closed = false;
-        this._parentOrParents = null;
-        this._subscriptions = null;
-        if (unsubscribe) {
-            this._unsubscribe = unsubscribe;
-        }
-    }
-    Subscription.prototype.unsubscribe = function () {
-        var errors;
-        if (this.closed) {
-            return;
-        }
-        var _a = this, _parentOrParents = _a._parentOrParents, _unsubscribe = _a._unsubscribe, _subscriptions = _a._subscriptions;
-        this.closed = true;
-        this._parentOrParents = null;
-        this._subscriptions = 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)) {
-            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)) {
-            var index = -1;
-            var len = _subscriptions.length;
-            while (++index < len) {
-                var sub = _subscriptions[index];
-                if (Object(_util_isObject__WEBPACK_IMPORTED_MODULE_1__["isObject"])(sub)) {
-                    try {
-                        sub.unsubscribe();
-                    }
-                    catch (e) {
-                        errors = errors || [];
-                        if (e instanceof _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"]) {
-                            errors = errors.concat(flattenUnsubscriptionErrors(e.errors));
-                        }
-                        else {
-                            errors.push(e);
-                        }
-                    }
-                }
-            }
-        }
-        if (errors) {
-            throw new _util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_3__["UnsubscriptionError"](errors);
-        }
-    };
-    Subscription.prototype.add = function (teardown) {
-        var subscription = teardown;
-        if (!teardown) {
-            return Subscription.EMPTY;
-        }
-        switch (typeof teardown) {
-            case 'function':
-                subscription = new Subscription(teardown);
-            case 'object':
-                if (subscription === this || subscription.closed || typeof subscription.unsubscribe !== 'function') {
-                    return subscription;
-                }
-                else if (this.closed) {
-                    subscription.unsubscribe();
-                    return subscription;
-                }
-                else if (!(subscription instanceof Subscription)) {
-                    var tmp = subscription;
-                    subscription = new Subscription();
-                    subscription._subscriptions = [tmp];
-                }
-                break;
-            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);
-        }
-        return subscription;
-    };
-    Subscription.prototype.remove = function (subscription) {
-        var subscriptions = this._subscriptions;
-        if (subscriptions) {
-            var subscriptionIndex = subscriptions.indexOf(subscription);
-            if (subscriptionIndex !== -1) {
-                subscriptions.splice(subscriptionIndex, 1);
-            }
-        }
-    };
-    Subscription.EMPTY = (function (empty) {
-        empty.closed = true;
-        return empty;
-    }(new Subscription()));
-    return Subscription;
-}());
+micromatch.braceExpand = (pattern, options) => {
+  if (typeof pattern !== 'string') throw new TypeError('Expected a string');
+  return micromatch.braces(pattern, { ...options, expand: true });
+};
 
-function flattenUnsubscriptionErrors(errors) {
-    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
+/**
+ * Expose micromatch
+ */
+
+module.exports = micromatch;
 
 
 /***/ }),
-/* 285 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 604 */
+/***/ (function(module, 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 = /*@__PURE__*/ (function () { return Array.isArray || (function (x) { return x && typeof x.length === 'number'; }); })();
-//# sourceMappingURL=isArray.js.map
-
 
-/***/ }),
-/* 286 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-"use strict";
-__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';
-}
-//# sourceMappingURL=isObject.js.map
+const stringify = __webpack_require__(605);
+const compile = __webpack_require__(607);
+const expand = __webpack_require__(611);
+const parse = __webpack_require__(612);
 
+/**
+ * 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
+ */
 
-/***/ }),
-/* 287 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const braces = (input, options = {}) => {
+  let output = [];
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* 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;
+  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);
+      }
     }
-    UnsubscriptionErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-    return UnsubscriptionErrorImpl;
-})();
-var UnsubscriptionError = UnsubscriptionErrorImpl;
-//# sourceMappingURL=UnsubscriptionError.js.map
-
+  } else {
+    output = [].concat(braces.create(input, options));
+  }
 
-/***/ }),
-/* 288 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (options && options.expand === true && options.nodupes === true) {
+    output = [...new Set(output)];
+  }
+  return output;
+};
 
-"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 = /*@__PURE__*/ (function () {
-    return typeof Symbol === 'function'
-        ? /*@__PURE__*/ Symbol('rxSubscriber')
-        : '@@rxSubscriber_' + /*@__PURE__*/ Math.random();
-})();
-var $$rxSubscriber = rxSubscriber;
-//# sourceMappingURL=rxSubscriber.js.map
+/**
+ * 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);
 
-/***/ }),
-/* 289 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * 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
+ */
 
-"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__(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 */
+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);
+};
 
-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
+/**
+ * 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);
+  }
 
-/***/ }),
-/* 290 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  let result = expand(input, options);
 
-"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 = /*@__PURE__*/ (function () { return typeof Symbol === 'function' && Symbol.observable || '@@observable'; })();
-//# sourceMappingURL=observable.js.map
+  // 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)];
+  }
 
-/***/ }),
-/* 291 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return result;
+};
 
-"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__(292);
-/** PURE_IMPORTS_START _noop PURE_IMPORTS_END */
+/**
+ * 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
+ */
 
-function pipe() {
-    var fns = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        fns[_i] = arguments[_i];
-    }
-    return pipeFromArray(fns);
-}
-function pipeFromArray(fns) {
-    if (!fns) {
-        return _noop__WEBPACK_IMPORTED_MODULE_0__["noop"];
-    }
-    if (fns.length === 1) {
-        return fns[0];
-    }
-    return function piped(input) {
-        return fns.reduce(function (prev, fn) { return fn(prev); }, input);
-    };
-}
-//# sourceMappingURL=pipe.js.map
+braces.create = (input, options = {}) => {
+  if (input === '' || input.length < 3) {
+    return [input];
+  }
 
+ return options.expand !== true
+    ? braces.compile(input, options)
+    : braces.expand(input, options);
+};
 
-/***/ }),
-/* 292 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * Expose "braces"
+ */
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return noop; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function noop() { }
-//# sourceMappingURL=noop.js.map
+module.exports = braces;
 
 
 /***/ }),
-/* 293 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 605 */
+/***/ (function(module, 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__(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 */
-
-
 
 
+const utils = __webpack_require__(606);
 
+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 = '';
 
-var ConnectableObservable = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ConnectableObservable, _super);
-    function ConnectableObservable(source, subjectFactory) {
-        var _this = _super.call(this) || this;
-        _this.source = source;
-        _this.subjectFactory = subjectFactory;
-        _this._refCount = 0;
-        _this._isComplete = false;
-        return _this;
+    if (node.value) {
+      if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) {
+        return '\\' + node.value;
+      }
+      return node.value;
     }
-    ConnectableObservable.prototype._subscribe = function (subscriber) {
-        return this.getSubject().subscribe(subscriber);
-    };
-    ConnectableObservable.prototype.getSubject = function () {
-        var subject = this._subject;
-        if (!subject || subject.isStopped) {
-            this._subject = this.subjectFactory();
-        }
-        return this._subject;
-    };
-    ConnectableObservable.prototype.connect = function () {
-        var connection = this._connection;
-        if (!connection) {
-            this._isComplete = false;
-            connection = this._connection = new _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"]();
-            connection.add(this.source
-                .subscribe(new ConnectableSubscriber(this.getSubject(), this)));
-            if (connection.closed) {
-                this._connection = null;
-                connection = _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"].EMPTY;
-            }
-        }
-        return connection;
-    };
-    ConnectableObservable.prototype.refCount = function () {
-        return Object(_operators_refCount__WEBPACK_IMPORTED_MODULE_5__["refCount"])()(this);
-    };
-    return ConnectableObservable;
-}(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]));
 
-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) {
-        var _this = _super.call(this, destination) || this;
-        _this.connectable = connectable;
-        return _this;
-    }
-    ConnectableSubscriber.prototype._error = function (err) {
-        this._unsubscribe();
-        _super.prototype._error.call(this, err);
-    };
-    ConnectableSubscriber.prototype._complete = function () {
-        this.connectable._isComplete = true;
-        this._unsubscribe();
-        _super.prototype._complete.call(this);
-    };
-    ConnectableSubscriber.prototype._unsubscribe = function () {
-        var connectable = this.connectable;
-        if (connectable) {
-            this.connectable = null;
-            var connection = connectable._connection;
-            connectable._refCount = 0;
-            connectable._subject = null;
-            connectable._connection = null;
-            if (connection) {
-                connection.unsubscribe();
-            }
-        }
-    };
-    return ConnectableSubscriber;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["SubjectSubscriber"]));
-var RefCountOperator = /*@__PURE__*/ (function () {
-    function RefCountOperator(connectable) {
-        this.connectable = connectable;
+    if (node.value) {
+      return node.value;
     }
-    RefCountOperator.prototype.call = function (subscriber, source) {
-        var connectable = this.connectable;
-        connectable._refCount++;
-        var refCounter = new RefCountSubscriber(subscriber, connectable);
-        var subscription = source.subscribe(refCounter);
-        if (!refCounter.closed) {
-            refCounter.connection = connectable.connect();
-        }
-        return subscription;
-    };
-    return RefCountOperator;
-}());
-var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RefCountSubscriber, _super);
-    function RefCountSubscriber(destination, connectable) {
-        var _this = _super.call(this, destination) || this;
-        _this.connectable = connectable;
-        return _this;
+
+    if (node.nodes) {
+      for (let child of node.nodes) {
+        output += stringify(child);
+      }
     }
-    RefCountSubscriber.prototype._unsubscribe = function () {
-        var connectable = this.connectable;
-        if (!connectable) {
-            this.connection = null;
-            return;
-        }
-        this.connectable = null;
-        var refCount = connectable._refCount;
-        if (refCount <= 0) {
-            this.connection = null;
-            return;
-        }
-        connectable._refCount = refCount - 1;
-        if (refCount > 1) {
-            this.connection = null;
-            return;
-        }
-        var connection = this.connection;
-        var sharedConnection = connectable._connection;
-        this.connection = null;
-        if (sharedConnection && (!connection || sharedConnection === connection)) {
-            sharedConnection.unsubscribe();
-        }
-    };
-    return RefCountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"]));
-//# sourceMappingURL=ConnectableObservable.js.map
+    return output;
+  };
+
+  return stringify(ast);
+};
+
 
 
 /***/ }),
-/* 294 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 606 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__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__(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 */
 
 
+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;
+};
 
-var SubjectSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubjectSubscriber, _super);
-    function SubjectSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        return _this;
-    }
-    return SubjectSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"]));
+/**
+ * Escape the given node with '\\' before node.value
+ */
 
-var Subject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Subject, _super);
-    function Subject() {
-        var _this = _super.call(this) || this;
-        _this.observers = [];
-        _this.closed = false;
-        _this.isStopped = false;
-        _this.hasError = false;
-        _this.thrownError = null;
-        return _this;
-    }
-    Subject.prototype[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__["rxSubscriber"]] = function () {
-        return new SubjectSubscriber(this);
-    };
-    Subject.prototype.lift = function (operator) {
-        var subject = new AnonymousSubject(this, this);
-        subject.operator = operator;
-        return subject;
-    };
-    Subject.prototype.next = function (value) {
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
-        }
-        if (!this.isStopped) {
-            var observers = this.observers;
-            var len = observers.length;
-            var copy = observers.slice();
-            for (var i = 0; i < len; i++) {
-                copy[i].next(value);
-            }
-        }
-    };
-    Subject.prototype.error = function (err) {
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
-        }
-        this.hasError = true;
-        this.thrownError = err;
-        this.isStopped = true;
-        var observers = this.observers;
-        var len = observers.length;
-        var copy = observers.slice();
-        for (var i = 0; i < len; i++) {
-            copy[i].error(err);
-        }
-        this.observers.length = 0;
-    };
-    Subject.prototype.complete = function () {
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
-        }
-        this.isStopped = true;
-        var observers = this.observers;
-        var len = observers.length;
-        var copy = observers.slice();
-        for (var i = 0; i < len; i++) {
-            copy[i].complete();
-        }
-        this.observers.length = 0;
-    };
-    Subject.prototype.unsubscribe = function () {
-        this.isStopped = true;
-        this.closed = true;
-        this.observers = null;
-    };
-    Subject.prototype._trySubscribe = function (subscriber) {
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
-        }
-        else {
-            return _super.prototype._trySubscribe.call(this, subscriber);
-        }
-    };
-    Subject.prototype._subscribe = function (subscriber) {
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"]();
-        }
-        else if (this.hasError) {
-            subscriber.error(this.thrownError);
-            return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
-        }
-        else if (this.isStopped) {
-            subscriber.complete();
-            return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
-        }
-        else {
-            this.observers.push(subscriber);
-            return new _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__["SubjectSubscription"](this, subscriber);
-        }
-    };
-    Subject.prototype.asObservable = function () {
-        var observable = new _Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"]();
-        observable.source = this;
-        return observable;
-    };
-    Subject.create = function (destination, source) {
-        return new AnonymousSubject(destination, source);
-    };
-    return Subject;
-}(_Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"]));
+exports.escapeNode = (block, n = 0, type) => {
+  let node = block.nodes[n];
+  if (!node) return;
 
-var AnonymousSubject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnonymousSubject, _super);
-    function AnonymousSubject(destination, source) {
-        var _this = _super.call(this) || this;
-        _this.destination = destination;
-        _this.source = source;
-        return _this;
+  if ((type && node.type === type) || node.type === 'open' || node.type === 'close') {
+    if (node.escaped !== true) {
+      node.value = '\\' + node.value;
+      node.escaped = true;
     }
-    AnonymousSubject.prototype.next = function (value) {
-        var destination = this.destination;
-        if (destination && destination.next) {
-            destination.next(value);
-        }
-    };
-    AnonymousSubject.prototype.error = function (err) {
-        var destination = this.destination;
-        if (destination && destination.error) {
-            this.destination.error(err);
-        }
-    };
-    AnonymousSubject.prototype.complete = function () {
-        var destination = this.destination;
-        if (destination && destination.complete) {
-            this.destination.complete();
-        }
-    };
-    AnonymousSubject.prototype._subscribe = function (subscriber) {
-        var source = this.source;
-        if (source) {
-            return this.source.subscribe(subscriber);
-        }
-        else {
-            return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
-        }
-    };
-    return AnonymousSubject;
-}(Subject));
+  }
+};
 
-//# sourceMappingURL=Subject.js.map
+/**
+ * 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.
+ */
 
-/***/ }),
-/* 295 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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;
+};
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return ObjectUnsubscribedError; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var ObjectUnsubscribedErrorImpl = /*@__PURE__*/ (function () {
-    function ObjectUnsubscribedErrorImpl() {
-        Error.call(this);
-        this.message = 'object unsubscribed';
-        this.name = 'ObjectUnsubscribedError';
-        return this;
+/**
+ * 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);
     }
-    ObjectUnsubscribedErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-    return ObjectUnsubscribedErrorImpl;
-})();
-var ObjectUnsubscribedError = ObjectUnsubscribedErrorImpl;
-//# sourceMappingURL=ObjectUnsubscribedError.js.map
+    return result;
+  };
+  flat(args);
+  return result;
+};
 
 
 /***/ }),
-/* 296 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 607 */
+/***/ (function(module, 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__(279);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
-/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
 
 
-var SubjectSubscription = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubjectSubscription, _super);
-    function SubjectSubscription(subject, subscriber) {
-        var _this = _super.call(this) || this;
-        _this.subject = subject;
-        _this.subscriber = subscriber;
-        _this.closed = false;
-        return _this;
+const fill = __webpack_require__(608);
+const utils = __webpack_require__(606);
+
+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;
     }
-    SubjectSubscription.prototype.unsubscribe = function () {
-        if (this.closed) {
-            return;
-        }
-        this.closed = true;
-        var subject = this.subject;
-        var observers = subject.observers;
-        this.subject = null;
-        if (!observers || observers.length === 0 || subject.isStopped || subject.closed) {
-            return;
-        }
-        var subscriberIndex = observers.indexOf(this.subscriber);
-        if (subscriberIndex !== -1) {
-            observers.splice(subscriberIndex, 1);
-        }
-    };
-    return SubjectSubscription;
-}(_Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]));
 
-//# sourceMappingURL=SubjectSubscription.js.map
+    if (node.type === 'open') {
+      return invalid ? (prefix + node.value) : '(';
+    }
 
+    if (node.type === 'close') {
+      return invalid ? (prefix + node.value) : ')';
+    }
 
-/***/ }),
-/* 297 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (node.type === 'comma') {
+      return node.prev.type === 'comma' ? '' : (invalid ? node.value : '|');
+    }
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+    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 });
 
-function refCount() {
-    return function refCountOperatorFunction(source) {
-        return source.lift(new RefCountOperator(source));
-    };
-}
-var RefCountOperator = /*@__PURE__*/ (function () {
-    function RefCountOperator(connectable) {
-        this.connectable = connectable;
+      if (range.length !== 0) {
+        return args.length > 1 && range.length > 1 ? `(${range})` : range;
+      }
     }
-    RefCountOperator.prototype.call = function (subscriber, source) {
-        var connectable = this.connectable;
-        connectable._refCount++;
-        var refCounter = new RefCountSubscriber(subscriber, connectable);
-        var subscription = source.subscribe(refCounter);
-        if (!refCounter.closed) {
-            refCounter.connection = connectable.connect();
-        }
-        return subscription;
-    };
-    return RefCountOperator;
-}());
-var RefCountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RefCountSubscriber, _super);
-    function RefCountSubscriber(destination, connectable) {
-        var _this = _super.call(this, destination) || this;
-        _this.connectable = connectable;
-        return _this;
+
+    if (node.nodes) {
+      for (let child of node.nodes) {
+        output += walk(child, node);
+      }
     }
-    RefCountSubscriber.prototype._unsubscribe = function () {
-        var connectable = this.connectable;
-        if (!connectable) {
-            this.connection = null;
-            return;
-        }
-        this.connectable = null;
-        var refCount = connectable._refCount;
-        if (refCount <= 0) {
-            this.connection = null;
-            return;
-        }
-        connectable._refCount = refCount - 1;
-        if (refCount > 1) {
-            this.connection = null;
-            return;
-        }
-        var connection = this.connection;
-        var sharedConnection = connectable._connection;
-        this.connection = null;
-        if (sharedConnection && (!connection || sharedConnection === connection)) {
-            sharedConnection.unsubscribe();
-        }
-    };
-    return RefCountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=refCount.js.map
+    return output;
+  };
+
+  return walk(ast);
+};
+
+module.exports = compile;
 
 
 /***/ }),
-/* 298 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 608 */
+/***/ (function(module, 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__(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 */
+/*!
+ * 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__(609);
 
+const isObject = val => val !== null && typeof val === 'object' && !Array.isArray(val);
 
-function groupBy(keySelector, elementSelector, durationSelector, subjectSelector) {
-    return function (source) {
-        return source.lift(new GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector));
-    };
-}
-var GroupByOperator = /*@__PURE__*/ (function () {
-    function GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector) {
-        this.keySelector = keySelector;
-        this.elementSelector = elementSelector;
-        this.durationSelector = durationSelector;
-        this.subjectSelector = subjectSelector;
-    }
-    GroupByOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new GroupBySubscriber(subscriber, this.keySelector, this.elementSelector, this.durationSelector, this.subjectSelector));
-    };
-    return GroupByOperator;
-}());
-var GroupBySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupBySubscriber, _super);
-    function GroupBySubscriber(destination, keySelector, elementSelector, durationSelector, subjectSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.keySelector = keySelector;
-        _this.elementSelector = elementSelector;
-        _this.durationSelector = durationSelector;
-        _this.subjectSelector = subjectSelector;
-        _this.groups = null;
-        _this.attemptedToUnsubscribe = false;
-        _this.count = 0;
-        return _this;
-    }
-    GroupBySubscriber.prototype._next = function (value) {
-        var key;
-        try {
-            key = this.keySelector(value);
-        }
-        catch (err) {
-            this.error(err);
-            return;
-        }
-        this._group(value, key);
-    };
-    GroupBySubscriber.prototype._group = function (value, key) {
-        var groups = this.groups;
-        if (!groups) {
-            groups = this.groups = new Map();
-        }
-        var group = groups.get(key);
-        var element;
-        if (this.elementSelector) {
-            try {
-                element = this.elementSelector(value);
-            }
-            catch (err) {
-                this.error(err);
-            }
-        }
-        else {
-            element = value;
-        }
-        if (!group) {
-            group = (this.subjectSelector ? this.subjectSelector() : new _Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]());
-            groups.set(key, group);
-            var groupedObservable = new GroupedObservable(key, group, this);
-            this.destination.next(groupedObservable);
-            if (this.durationSelector) {
-                var duration = void 0;
-                try {
-                    duration = this.durationSelector(new GroupedObservable(key, group));
-                }
-                catch (err) {
-                    this.error(err);
-                    return;
-                }
-                this.add(duration.subscribe(new GroupDurationSubscriber(key, group, this)));
-            }
-        }
-        if (!group.closed) {
-            group.next(element);
-        }
-    };
-    GroupBySubscriber.prototype._error = function (err) {
-        var groups = this.groups;
-        if (groups) {
-            groups.forEach(function (group, key) {
-                group.error(err);
-            });
-            groups.clear();
-        }
-        this.destination.error(err);
-    };
-    GroupBySubscriber.prototype._complete = function () {
-        var groups = this.groups;
-        if (groups) {
-            groups.forEach(function (group, key) {
-                group.complete();
-            });
-            groups.clear();
-        }
-        this.destination.complete();
-    };
-    GroupBySubscriber.prototype.removeGroup = function (key) {
-        this.groups.delete(key);
-    };
-    GroupBySubscriber.prototype.unsubscribe = function () {
-        if (!this.closed) {
-            this.attemptedToUnsubscribe = true;
-            if (this.count === 0) {
-                _super.prototype.unsubscribe.call(this);
-            }
-        }
-    };
-    return GroupBySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-var GroupDurationSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupDurationSubscriber, _super);
-    function GroupDurationSubscriber(key, group, parent) {
-        var _this = _super.call(this, group) || this;
-        _this.key = key;
-        _this.group = group;
-        _this.parent = parent;
-        return _this;
-    }
-    GroupDurationSubscriber.prototype._next = function (value) {
-        this.complete();
-    };
-    GroupDurationSubscriber.prototype._unsubscribe = function () {
-        var _a = this, parent = _a.parent, key = _a.key;
-        this.key = this.parent = null;
-        if (parent) {
-            parent.removeGroup(key);
-        }
-    };
-    return GroupDurationSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-var GroupedObservable = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupedObservable, _super);
-    function GroupedObservable(key, groupSubject, refCountSubscription) {
-        var _this = _super.call(this) || this;
-        _this.key = key;
-        _this.groupSubject = groupSubject;
-        _this.refCountSubscription = refCountSubscription;
-        return _this;
-    }
-    GroupedObservable.prototype._subscribe = function (subscriber) {
-        var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]();
-        var _a = this, refCountSubscription = _a.refCountSubscription, groupSubject = _a.groupSubject;
-        if (refCountSubscription && !refCountSubscription.closed) {
-            subscription.add(new InnerRefCountSubscription(refCountSubscription));
-        }
-        subscription.add(groupSubject.subscribe(subscriber));
-        return subscription;
-    };
-    return GroupedObservable;
-}(_Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"]));
+const transform = toNumber => {
+  return value => toNumber === true ? Number(value) : String(value);
+};
 
-var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](InnerRefCountSubscription, _super);
-    function InnerRefCountSubscription(parent) {
-        var _this = _super.call(this) || this;
-        _this.parent = parent;
-        parent.count++;
-        return _this;
-    }
-    InnerRefCountSubscription.prototype.unsubscribe = function () {
-        var parent = this.parent;
-        if (!parent.closed && !this.closed) {
-            _super.prototype.unsubscribe.call(this);
-            parent.count -= 1;
-            if (parent.count === 0 && parent.attemptedToUnsubscribe) {
-                parent.unsubscribe();
-            }
-        }
-    };
-    return InnerRefCountSubscription;
-}(_Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"]));
-//# sourceMappingURL=groupBy.js.map
+const isValidValue = value => {
+  return typeof value === 'number' || (typeof value === 'string' && value !== '');
+};
 
+const isNumber = num => Number.isInteger(+num);
 
-/***/ }),
-/* 299 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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;
+};
 
-"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__(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 */
+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;
 
-var BehaviorSubject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BehaviorSubject, _super);
-    function BehaviorSubject(_value) {
-        var _this = _super.call(this) || this;
-        _this._value = _value;
-        return _this;
-    }
-    Object.defineProperty(BehaviorSubject.prototype, "value", {
-        get: function () {
-            return this.getValue();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    BehaviorSubject.prototype._subscribe = function (subscriber) {
-        var subscription = _super.prototype._subscribe.call(this, subscriber);
-        if (subscription && !subscription.closed) {
-            subscriber.next(this._value);
-        }
-        return subscription;
-    };
-    BehaviorSubject.prototype.getValue = function () {
-        if (this.hasError) {
-            throw this.thrownError;
-        }
-        else if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__["ObjectUnsubscribedError"]();
-        }
-        else {
-            return this._value;
-        }
-    };
-    BehaviorSubject.prototype.next = function (value) {
-        _super.prototype.next.call(this, this._value = value);
-    };
-    return BehaviorSubject;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
+  if (parts.positives.length) {
+    positives = parts.positives.join('|');
+  }
 
-//# sourceMappingURL=BehaviorSubject.js.map
+  if (parts.negatives.length) {
+    negatives = `-(${prefix}${parts.negatives.join('|')})`;
+  }
 
+  if (positives && negatives) {
+    result = `${positives}|${negatives}`;
+  } else {
+    result = positives || negatives;
+  }
 
-/***/ }),
-/* 300 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (options.wrap) {
+    return `(${prefix}${result})`;
+  }
 
-"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__(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 */
+  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 });
+  }
 
-var ReplaySubject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ReplaySubject, _super);
-    function ReplaySubject(bufferSize, windowTime, scheduler) {
-        if (bufferSize === void 0) {
-            bufferSize = Number.POSITIVE_INFINITY;
-        }
-        if (windowTime === void 0) {
-            windowTime = Number.POSITIVE_INFINITY;
-        }
-        var _this = _super.call(this) || this;
-        _this.scheduler = scheduler;
-        _this._events = [];
-        _this._infiniteTimeWindow = false;
-        _this._bufferSize = bufferSize < 1 ? 1 : bufferSize;
-        _this._windowTime = windowTime < 1 ? 1 : windowTime;
-        if (windowTime === Number.POSITIVE_INFINITY) {
-            _this._infiniteTimeWindow = true;
-            _this.next = _this.nextInfiniteTimeWindow;
-        }
-        else {
-            _this.next = _this.nextTimeWindow;
-        }
-        return _this;
-    }
-    ReplaySubject.prototype.nextInfiniteTimeWindow = function (value) {
-        var _events = this._events;
-        _events.push(value);
-        if (_events.length > this._bufferSize) {
-            _events.shift();
-        }
-        _super.prototype.next.call(this, value);
-    };
-    ReplaySubject.prototype.nextTimeWindow = function (value) {
-        this._events.push(new ReplayEvent(this._getNow(), value));
-        this._trimBufferThenGetEvents();
-        _super.prototype.next.call(this, value);
-    };
-    ReplaySubject.prototype._subscribe = function (subscriber) {
-        var _infiniteTimeWindow = this._infiniteTimeWindow;
-        var _events = _infiniteTimeWindow ? this._events : this._trimBufferThenGetEvents();
-        var scheduler = this.scheduler;
-        var len = _events.length;
-        var subscription;
-        if (this.closed) {
-            throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__["ObjectUnsubscribedError"]();
-        }
-        else if (this.isStopped || this.hasError) {
-            subscription = _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY;
-        }
-        else {
-            this.observers.push(subscriber);
-            subscription = new _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__["SubjectSubscription"](this, subscriber);
-        }
-        if (scheduler) {
-            subscriber.add(subscriber = new _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__["ObserveOnSubscriber"](subscriber, scheduler));
-        }
-        if (_infiniteTimeWindow) {
-            for (var i = 0; i < len && !subscriber.closed; i++) {
-                subscriber.next(_events[i]);
-            }
-        }
-        else {
-            for (var i = 0; i < len && !subscriber.closed; i++) {
-                subscriber.next(_events[i].value);
-            }
-        }
-        if (this.hasError) {
-            subscriber.error(this.thrownError);
-        }
-        else if (this.isStopped) {
-            subscriber.complete();
-        }
-        return subscription;
-    };
-    ReplaySubject.prototype._getNow = function () {
-        return (this.scheduler || _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__["queue"]).now();
-    };
-    ReplaySubject.prototype._trimBufferThenGetEvents = function () {
-        var now = this._getNow();
-        var _bufferSize = this._bufferSize;
-        var _windowTime = this._windowTime;
-        var _events = this._events;
-        var eventsCount = _events.length;
-        var spliceCount = 0;
-        while (spliceCount < eventsCount) {
-            if ((now - _events[spliceCount].time) < _windowTime) {
-                break;
-            }
-            spliceCount++;
-        }
-        if (eventsCount > _bufferSize) {
-            spliceCount = Math.max(spliceCount, eventsCount - _bufferSize);
-        }
-        if (spliceCount > 0) {
-            _events.splice(0, spliceCount);
-        }
-        return _events;
-    };
-    return ReplaySubject;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
+  return range;
+};
 
-var ReplayEvent = /*@__PURE__*/ (function () {
-    function ReplayEvent(time, value) {
-        this.time = time;
-        this.value = value;
-    }
-    return ReplayEvent;
-}());
-//# sourceMappingURL=ReplaySubject.js.map
+const fillLetters = (start, end, step = 1, options = {}) => {
+  if ((!isNumber(start) && start.length > 1) || (!isNumber(end) && end.length > 1)) {
+    return invalidRange(start, end, options);
+  }
 
 
-/***/ }),
-/* 301 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  let format = options.transform || (val => String.fromCharCode(val));
+  let a = `${start}`.charCodeAt(0);
+  let b = `${end}`.charCodeAt(0);
 
-"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__(302);
-/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(305);
-/** PURE_IMPORTS_START _QueueAction,_QueueScheduler PURE_IMPORTS_END */
+  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);
+  }
 
-var queue = /*@__PURE__*/ new _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__["QueueScheduler"](_QueueAction__WEBPACK_IMPORTED_MODULE_0__["QueueAction"]);
-//# sourceMappingURL=queue.js.map
+  let range = [];
+  let index = 0;
 
+  while (descending ? a >= b : a <= b) {
+    range.push(format(a, index));
+    a = descending ? a - step : a + step;
+    index++;
+  }
 
-/***/ }),
-/* 302 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (options.toRegex === true) {
+    return toRegex(range, null, { wrap: false, options });
+  }
 
-"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__(279);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(303);
-/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
+  return range;
+};
 
+const fill = (start, end, step, options = {}) => {
+  if (end == null && isValidValue(start)) {
+    return [start];
+  }
 
-var QueueAction = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](QueueAction, _super);
-    function QueueAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        return _this;
-    }
-    QueueAction.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay > 0) {
-            return _super.prototype.schedule.call(this, state, delay);
-        }
-        this.delay = delay;
-        this.state = state;
-        this.scheduler.flush(this);
-        return this;
-    };
-    QueueAction.prototype.execute = function (state, delay) {
-        return (delay > 0 || this.closed) ?
-            _super.prototype.execute.call(this, state, delay) :
-            this._execute(state, delay);
-    };
-    QueueAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
-            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
-        }
-        return scheduler.flush(this);
-    };
-    return QueueAction;
-}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
+  if (!isValidValue(start) || !isValidValue(end)) {
+    return invalidRange(start, end, options);
+  }
 
-//# sourceMappingURL=QueueAction.js.map
+  if (typeof step === 'function') {
+    return fill(start, end, 1, { transform: step });
+  }
 
+  if (isObject(step)) {
+    return fill(start, end, 0, step);
+  }
 
-/***/ }),
-/* 303 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  let opts = { ...options };
+  if (opts.capture === true) opts.wrap = true;
+  step = step || opts.step || 1;
 
-"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__(279);
-/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(304);
-/** PURE_IMPORTS_START tslib,_Action PURE_IMPORTS_END */
+  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);
+  }
 
-var AsyncAction = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncAction, _super);
-    function AsyncAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        _this.pending = false;
-        return _this;
-    }
-    AsyncAction.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (this.closed) {
-            return this;
-        }
-        this.state = state;
-        var id = this.id;
-        var scheduler = this.scheduler;
-        if (id != null) {
-            this.id = this.recycleAsyncId(scheduler, id, delay);
-        }
-        this.pending = true;
-        this.delay = delay;
-        this.id = this.id || this.requestAsyncId(scheduler, this.id, delay);
-        return this;
-    };
-    AsyncAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return setInterval(scheduler.flush.bind(scheduler, this), delay);
-    };
-    AsyncAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay !== null && this.delay === delay && this.pending === false) {
-            return id;
-        }
-        clearInterval(id);
-        return undefined;
-    };
-    AsyncAction.prototype.execute = function (state, delay) {
-        if (this.closed) {
-            return new Error('executing a cancelled action');
-        }
-        this.pending = false;
-        var error = this._execute(state, delay);
-        if (error) {
-            return error;
-        }
-        else if (this.pending === false && this.id != null) {
-            this.id = this.recycleAsyncId(this.scheduler, this.id, null);
-        }
-    };
-    AsyncAction.prototype._execute = function (state, delay) {
-        var errored = false;
-        var errorValue = undefined;
-        try {
-            this.work(state);
-        }
-        catch (e) {
-            errored = true;
-            errorValue = !!e && e || new Error(e);
-        }
-        if (errored) {
-            this.unsubscribe();
-            return errorValue;
-        }
-    };
-    AsyncAction.prototype._unsubscribe = function () {
-        var id = this.id;
-        var scheduler = this.scheduler;
-        var actions = scheduler.actions;
-        var index = actions.indexOf(this);
-        this.work = null;
-        this.state = null;
-        this.pending = false;
-        this.scheduler = null;
-        if (index !== -1) {
-            actions.splice(index, 1);
-        }
-        if (id != null) {
-            this.id = this.recycleAsyncId(scheduler, id, null);
-        }
-        this.delay = null;
-    };
-    return AsyncAction;
-}(_Action__WEBPACK_IMPORTED_MODULE_1__["Action"]));
+  return fillLetters(start, end, Math.max(Math.abs(step), 1), opts);
+};
 
-//# sourceMappingURL=AsyncAction.js.map
+module.exports = fill;
 
 
 /***/ }),
-/* 304 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 609 */
+/***/ (function(module, 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__(279);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
-/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */
-
-
-var Action = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Action, _super);
-    function Action(scheduler, work) {
-        return _super.call(this) || this;
-    }
-    Action.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return this;
-    };
-    return Action;
-}(_Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]));
-
-//# sourceMappingURL=Action.js.map
+/*!
+ * to-regex-range <https://github.com/micromatch/to-regex-range>
+ *
+ * Copyright (c) 2015-present, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
 
-/***/ }),
-/* 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__(279);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306);
-/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
+const isNumber = __webpack_require__(610);
 
+const toRegexRange = (min, max, options) => {
+  if (isNumber(min) === false) {
+    throw new TypeError('toRegexRange: expected the first argument to be a number');
+  }
 
-var QueueScheduler = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](QueueScheduler, _super);
-    function QueueScheduler() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return QueueScheduler;
-}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"]));
+  if (max === void 0 || min === max) {
+    return String(min);
+  }
 
-//# sourceMappingURL=QueueScheduler.js.map
+  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;
+  }
 
-/***/ }),
-/* 306 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  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;
 
-"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__(279);
-/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(307);
-/** PURE_IMPORTS_START tslib,_Scheduler PURE_IMPORTS_END */
+  if (toRegexRange.cache.hasOwnProperty(cacheKey)) {
+    return toRegexRange.cache[cacheKey].result;
+  }
 
+  let a = Math.min(min, max);
+  let b = Math.max(min, max);
 
-var AsyncScheduler = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncScheduler, _super);
-    function AsyncScheduler(SchedulerAction, now) {
-        if (now === void 0) {
-            now = _Scheduler__WEBPACK_IMPORTED_MODULE_1__["Scheduler"].now;
-        }
-        var _this = _super.call(this, SchedulerAction, function () {
-            if (AsyncScheduler.delegate && AsyncScheduler.delegate !== _this) {
-                return AsyncScheduler.delegate.now();
-            }
-            else {
-                return now();
-            }
-        }) || this;
-        _this.actions = [];
-        _this.active = false;
-        _this.scheduled = undefined;
-        return _this;
+  if (Math.abs(a - b) === 1) {
+    let result = min + '|' + max;
+    if (opts.capture) {
+      return `(${result})`;
     }
-    AsyncScheduler.prototype.schedule = function (work, delay, state) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (AsyncScheduler.delegate && AsyncScheduler.delegate !== this) {
-            return AsyncScheduler.delegate.schedule(work, delay, state);
-        }
-        else {
-            return _super.prototype.schedule.call(this, work, delay, state);
-        }
-    };
-    AsyncScheduler.prototype.flush = function (action) {
-        var actions = this.actions;
-        if (this.active) {
-            actions.push(action);
-            return;
-        }
-        var error;
-        this.active = true;
-        do {
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
-        } while (action = actions.shift());
-        this.active = false;
-        if (error) {
-            while (action = actions.shift()) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    return AsyncScheduler;
-}(_Scheduler__WEBPACK_IMPORTED_MODULE_1__["Scheduler"]));
-
-//# sourceMappingURL=AsyncScheduler.js.map
+    if (opts.wrap === false) {
+      return result;
+    }
+    return `(?:${result})`;
+  }
 
+  let isPadded = hasPadding(min) || hasPadding(max);
+  let state = { min, max, a, b };
+  let positives = [];
+  let negatives = [];
 
-/***/ }),
-/* 307 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (isPadded) {
+    state.isPadded = isPadded;
+    state.maxLen = String(state.max).length;
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return Scheduler; });
-var Scheduler = /*@__PURE__*/ (function () {
-    function Scheduler(SchedulerAction, now) {
-        if (now === void 0) {
-            now = Scheduler.now;
-        }
-        this.SchedulerAction = SchedulerAction;
-        this.now = now;
-    }
-    Scheduler.prototype.schedule = function (work, delay, state) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return new this.SchedulerAction(this, work).schedule(state, delay);
-    };
-    Scheduler.now = function () { return Date.now(); };
-    return Scheduler;
-}());
+  if (a < 0) {
+    let newMin = b < 0 ? Math.abs(b) : 1;
+    negatives = splitToPatterns(newMin, Math.abs(a), state, opts);
+    a = state.a = 0;
+  }
 
-//# sourceMappingURL=Scheduler.js.map
+  if (b >= 0) {
+    positives = splitToPatterns(a, b, state, opts);
+  }
 
+  state.negatives = negatives;
+  state.positives = positives;
+  state.result = collatePatterns(negatives, positives, opts);
 
-/***/ }),
-/* 308 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (opts.capture === true) {
+    state.result = `(${state.result})`;
+  } else if (opts.wrap !== false && (positives.length + negatives.length) > 1) {
+    state.result = `(?:${state.result})`;
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return observeOn; });
-/* 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__(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 */
+  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;
 
-function observeOn(scheduler, delay) {
-    if (delay === void 0) {
-        delay = 0;
-    }
-    return function observeOnOperatorFunction(source) {
-        return source.lift(new ObserveOnOperator(scheduler, delay));
-    };
-}
-var ObserveOnOperator = /*@__PURE__*/ (function () {
-    function ObserveOnOperator(scheduler, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        this.scheduler = scheduler;
-        this.delay = delay;
-    }
-    ObserveOnOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ObserveOnSubscriber(subscriber, this.scheduler, this.delay));
-    };
-    return ObserveOnOperator;
-}());
+  let stop = countNines(min, nines);
+  let stops = new Set([max]);
 
-var ObserveOnSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ObserveOnSubscriber, _super);
-    function ObserveOnSubscriber(destination, scheduler, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        var _this = _super.call(this, destination) || this;
-        _this.scheduler = scheduler;
-        _this.delay = delay;
-        return _this;
-    }
-    ObserveOnSubscriber.dispatch = function (arg) {
-        var notification = arg.notification, destination = arg.destination;
-        notification.observe(destination);
-        this.unsubscribe();
-    };
-    ObserveOnSubscriber.prototype.scheduleMessage = function (notification) {
-        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"]));
+  while (min <= stop && stop <= max) {
+    stops.add(stop);
+    nines += 1;
+    stop = countNines(min, nines);
+  }
 
-var ObserveOnMessage = /*@__PURE__*/ (function () {
-    function ObserveOnMessage(notification, destination) {
-        this.notification = notification;
-        this.destination = destination;
-    }
-    return ObserveOnMessage;
-}());
+  stop = countZeros(max + 1, zeros) - 1;
 
-//# sourceMappingURL=observeOn.js.map
+  while (min < stop && stop <= max) {
+    stops.add(stop);
+    zeros += 1;
+    stop = countZeros(max + 1, zeros) - 1;
+  }
 
+  stops = [...stops];
+  stops.sort(compare);
+  return stops;
+}
 
-/***/ }),
-/* 309 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * Convert a range to a regex pattern
+ * @param {Number} `start`
+ * @param {Number} `stop`
+ * @return {String}
+ */
 
-"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__(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 */
+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];
 
-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;
-        this.value = value;
-        this.error = error;
-        this.hasValue = kind === 'N';
+    if (startDigit === stopDigit) {
+      pattern += startDigit;
+
+    } else if (startDigit !== '0' || stopDigit !== '9') {
+      pattern += toCharacterClass(startDigit, stopDigit, options);
+
+    } else {
+      count++;
     }
-    Notification.prototype.observe = function (observer) {
-        switch (this.kind) {
-            case 'N':
-                return observer.next && observer.next(this.value);
-            case 'E':
-                return observer.error && observer.error(this.error);
-            case 'C':
-                return observer.complete && observer.complete();
-        }
-    };
-    Notification.prototype.do = function (next, error, complete) {
-        var kind = this.kind;
-        switch (kind) {
-            case 'N':
-                return next && next(this.value);
-            case 'E':
-                return error && error(this.error);
-            case 'C':
-                return complete && complete();
-        }
-    };
-    Notification.prototype.accept = function (nextOrObserver, error, complete) {
-        if (nextOrObserver && typeof nextOrObserver.next === 'function') {
-            return this.observe(nextOrObserver);
-        }
-        else {
-            return this.do(nextOrObserver, error, complete);
-        }
-    };
-    Notification.prototype.toObservable = function () {
-        var kind = this.kind;
-        switch (kind) {
-            case 'N':
-                return Object(_observable_of__WEBPACK_IMPORTED_MODULE_1__["of"])(this.value);
-            case 'E':
-                return Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_2__["throwError"])(this.error);
-            case 'C':
-                return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_0__["empty"])();
-        }
-        throw new Error('unexpected notification kind value');
-    };
-    Notification.createNext = function (value) {
-        if (typeof value !== 'undefined') {
-            return new Notification('N', value);
-        }
-        return Notification.undefinedValueNotification;
-    };
-    Notification.createError = function (err) {
-        return new Notification('E', undefined, err);
-    };
-    Notification.createComplete = function () {
-        return Notification.completeNotification;
-    };
-    Notification.completeNotification = new Notification('C');
-    Notification.undefinedValueNotification = new Notification('N', undefined);
-    return Notification;
-}());
+  }
 
-//# sourceMappingURL=Notification.js.map
+  if (count) {
+    pattern += options.shorthand === true ? '\\d' : '[0-9]';
+  }
 
+  return { pattern, count: [count], digits };
+}
 
-/***/ }),
-/* 310 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function splitToPatterns(min, max, tok, options) {
+  let ranges = splitToRanges(min, max);
+  let tokens = [];
+  let start = min;
+  let prev;
 
-"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 import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+  for (let i = 0; i < ranges.length; i++) {
+    let max = ranges[i];
+    let obj = rangeToPattern(String(start), String(max), options);
+    let zeros = '';
 
-var EMPTY = /*@__PURE__*/ new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscriber.complete(); });
-function empty(scheduler) {
-    return scheduler ? emptyScheduled(scheduler) : EMPTY;
-}
-function emptyScheduled(scheduler) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return scheduler.schedule(function () { return subscriber.complete(); }); });
-}
-//# sourceMappingURL=empty.js.map
+    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);
+    }
 
-/***/ }),
-/* 311 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    obj.string = zeros + obj.pattern + toQuantifier(obj.count);
+    tokens.push(obj);
+    start = max + 1;
+    prev = obj;
+  }
 
-"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__(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 */
+  return tokens;
+}
 
+function filterPatterns(arr, comparison, prefix, intersection, options) {
+  let result = [];
 
+  for (let ele of arr) {
+    let { string } = ele;
 
-function of() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    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);
+    // only push if _both_ are negative...
+    if (!intersection && !contains(comparison, 'string', string)) {
+      result.push(prefix + string);
     }
-    else {
-        return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(args);
+
+    // or _both_ are positive
+    if (intersection && contains(comparison, 'string', string)) {
+      result.push(prefix + string);
     }
+  }
+  return result;
 }
-//# sourceMappingURL=of.js.map
-
 
-/***/ }),
-/* 312 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * Zip strings
+ */
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isScheduler", function() { return isScheduler; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isScheduler(value) {
-    return value && typeof value.schedule === 'function';
+function zip(a, b) {
+  let arr = [];
+  for (let i = 0; i < a.length; i++) arr.push([a[i], b[i]]);
+  return arr;
 }
-//# sourceMappingURL=isScheduler.js.map
 
+function compare(a, b) {
+  return a > b ? 1 : b > a ? -1 : 0;
+}
 
-/***/ }),
-/* 313 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function contains(arr, key, val) {
+  return arr.some(ele => ele[key] === val);
+}
 
-"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__(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 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 fromArray(input, scheduler) {
-    if (!scheduler) {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__["subscribeToArray"])(input));
-    }
-    else {
-        return Object(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler);
-    }
+function toCharacterClass(a, b, options) {
+  return `[${a}${(b - a === 1) ? '' : '-'}${b}]`;
 }
-//# sourceMappingURL=fromArray.js.map
 
+function hasPadding(str) {
+  return /^-?(0+)\d/.test(str);
+}
 
-/***/ }),
-/* 314 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function padZeros(value, tok, options) {
+  if (!tok.isPadded) {
+    return value;
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToArray", function() { return subscribeToArray; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var subscribeToArray = function (array) {
-    return function (subscriber) {
-        for (var i = 0, len = array.length; i < len && !subscriber.closed; i++) {
-            subscriber.next(array[i]);
-        }
-        subscriber.complete();
-    };
-};
-//# sourceMappingURL=subscribeToArray.js.map
+  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}}`;
+    }
+  }
+}
 
-/***/ }),
-/* 315 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * Cache
+ */
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* 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 */
+toRegexRange.cache = {};
+toRegexRange.clearCache = () => (toRegexRange.cache = {});
 
+/**
+ * Expose `toRegexRange`
+ */
 
-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;
-    });
-}
-//# sourceMappingURL=scheduleArray.js.map
+module.exports = toRegexRange;
 
 
 /***/ }),
-/* 316 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 610 */
+/***/ (function(module, 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__(276);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+/*!
+ * is-number <https://github.com/jonschlinkert/is-number>
+ *
+ * Copyright (c) 2014-present, Jon Schlinkert.
+ * Released under the MIT License.
+ */
 
-function throwError(error, scheduler) {
-    if (!scheduler) {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscriber.error(error); });
-    }
-    else {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return scheduler.schedule(dispatch, 0, { error: error, subscriber: subscriber }); });
-    }
-}
-function dispatch(_a) {
-    var error = _a.error, subscriber = _a.subscriber;
-    subscriber.error(error);
-}
-//# sourceMappingURL=throwError.js.map
+
+
+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;
+};
 
 
 /***/ }),
-/* 317 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 611 */
+/***/ (function(module, 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__(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 */
 
 
+const fill = __webpack_require__(608);
+const stringify = __webpack_require__(605);
+const utils = __webpack_require__(606);
 
-var AsyncSubject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncSubject, _super);
-    function AsyncSubject() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.value = null;
-        _this.hasNext = false;
-        _this.hasCompleted = false;
-        return _this;
-    }
-    AsyncSubject.prototype._subscribe = function (subscriber) {
-        if (this.hasError) {
-            subscriber.error(this.thrownError);
-            return _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY;
-        }
-        else if (this.hasCompleted && this.hasNext) {
-            subscriber.next(this.value);
-            subscriber.complete();
-            return _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY;
-        }
-        return _super.prototype._subscribe.call(this, subscriber);
-    };
-    AsyncSubject.prototype.next = function (value) {
-        if (!this.hasCompleted) {
-            this.value = value;
-            this.hasNext = true;
-        }
-    };
-    AsyncSubject.prototype.error = function (error) {
-        if (!this.hasCompleted) {
-            _super.prototype.error.call(this, error);
-        }
-    };
-    AsyncSubject.prototype.complete = function () {
-        this.hasCompleted = true;
-        if (this.hasNext) {
-            _super.prototype.next.call(this, this.value);
-        }
-        _super.prototype.complete.call(this);
-    };
-    return AsyncSubject;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
-
-//# sourceMappingURL=AsyncSubject.js.map
+const append = (queue = '', stash = '', enclose = false) => {
+  let result = [];
 
+  queue = [].concat(queue);
+  stash = [].concat(stash);
 
-/***/ }),
-/* 318 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (!stash.length) return queue;
+  if (!queue.length) {
+    return enclose ? utils.flatten(stash).map(ele => `{${ele}}`) : stash;
+  }
 
-"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__(319);
-/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(321);
-/** PURE_IMPORTS_START _AsapAction,_AsapScheduler PURE_IMPORTS_END */
+  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;
 
-var asap = /*@__PURE__*/ new _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__["AsapScheduler"](_AsapAction__WEBPACK_IMPORTED_MODULE_0__["AsapAction"]);
-//# sourceMappingURL=asap.js.map
+  let walk = (node, parent = {}) => {
+    node.queue = [];
 
+    let p = parent;
+    let q = parent.queue;
 
-/***/ }),
-/* 319 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    while (p.type !== 'brace' && p.type !== 'root' && p.parent) {
+      p = p.parent;
+      q = p.queue;
+    }
 
-"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__(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 */
+    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);
 
-var AsapAction = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsapAction, _super);
-    function AsapAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        return _this;
-    }
-    AsapAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay !== null && delay > 0) {
-            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
-        }
-        scheduler.actions.push(this);
-        return scheduler.scheduled || (scheduler.scheduled = _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].setImmediate(scheduler.flush.bind(scheduler, null)));
-    };
-    AsapAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
-            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
-        }
-        if (scheduler.actions.length === 0) {
-            _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].clearImmediate(id);
-            scheduler.scheduled = undefined;
-        }
-        return undefined;
-    };
-    return AsapAction;
-}(_AsyncAction__WEBPACK_IMPORTED_MODULE_2__["AsyncAction"]));
+      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.');
+      }
 
-//# sourceMappingURL=AsapAction.js.map
+      let range = fill(...args, options);
+      if (range.length === 0) {
+        range = stringify(node, options);
+      }
 
+      q.push(append(q.pop(), range));
+      node.nodes = [];
+      return;
+    }
 
-/***/ }),
-/* 320 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    let enclose = utils.encloseBrace(node);
+    let queue = node.queue;
+    let block = node;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Immediate", function() { return Immediate; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var nextHandle = 1;
-var tasksByHandle = {};
-function runIfPresent(handle) {
-    var cb = tasksByHandle[handle];
-    if (cb) {
-        cb();
+    while (block.type !== 'brace' && block.type !== 'root' && block.parent) {
+      block = block.parent;
+      queue = block.queue;
     }
-}
-var Immediate = {
-    setImmediate: function (cb) {
-        var handle = nextHandle++;
-        tasksByHandle[handle] = cb;
-        Promise.resolve().then(function () { return runIfPresent(handle); });
-        return handle;
-    },
-    clearImmediate: function (handle) {
-        delete tasksByHandle[handle];
-    },
-};
-//# sourceMappingURL=Immediate.js.map
 
+    for (let i = 0; i < node.nodes.length; i++) {
+      let child = node.nodes[i];
 
-/***/ }),
-/* 321 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      if (child.type === 'comma' && node.type === 'brace') {
+        if (i === 1) queue.push('');
+        queue.push('');
+        continue;
+      }
 
-"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__(279);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306);
-/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
+      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;
+      }
 
-var AsapScheduler = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsapScheduler, _super);
-    function AsapScheduler() {
-        return _super !== null && _super.apply(this, arguments) || this;
+      if (child.nodes) {
+        walk(child, node);
+      }
     }
-    AsapScheduler.prototype.flush = function (action) {
-        this.active = true;
-        this.scheduled = undefined;
-        var actions = this.actions;
-        var error;
-        var index = -1;
-        var count = actions.length;
-        action = action || actions.shift();
-        do {
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
-        } while (++index < count && (action = actions.shift()));
-        this.active = false;
-        if (error) {
-            while (++index < count && (action = actions.shift())) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    return AsapScheduler;
-}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"]));
 
-//# sourceMappingURL=AsapScheduler.js.map
+    return queue;
+  };
+
+  return utils.flatten(walk(ast));
+};
+
+module.exports = expand;
 
 
 /***/ }),
-/* 322 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 612 */
+/***/ (function(module, 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__(303);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306);
-/** PURE_IMPORTS_START _AsyncAction,_AsyncScheduler PURE_IMPORTS_END */
-
 
-var async = /*@__PURE__*/ new _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"](_AsyncAction__WEBPACK_IMPORTED_MODULE_0__["AsyncAction"]);
-//# sourceMappingURL=async.js.map
 
+const stringify = __webpack_require__(605);
 
-/***/ }),
-/* 323 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * Constants
+ */
 
-"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__(324);
-/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(325);
-/** PURE_IMPORTS_START _AnimationFrameAction,_AnimationFrameScheduler PURE_IMPORTS_END */
+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__(613);
 
+/**
+ * parse
+ */
 
-var animationFrame = /*@__PURE__*/ new _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__["AnimationFrameScheduler"](_AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__["AnimationFrameAction"]);
-//# sourceMappingURL=animationFrame.js.map
+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})`);
+  }
 
-/***/ }),
-/* 324 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  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 = {};
 
-"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__(279);
-/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(303);
-/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */
+  /**
+   * Helpers
+   */
 
+  const advance = () => input[index++];
+  const push = node => {
+    if (node.type === 'text' && prev.type === 'dot') {
+      prev.type = 'text';
+    }
 
-var AnimationFrameAction = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnimationFrameAction, _super);
-    function AnimationFrameAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        return _this;
+    if (prev && prev.type === 'text' && node.type === 'text') {
+      prev.value += node.value;
+      return;
     }
-    AnimationFrameAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (delay !== null && delay > 0) {
-            return _super.prototype.requestAsyncId.call(this, scheduler, id, delay);
-        }
-        scheduler.actions.push(this);
-        return scheduler.scheduled || (scheduler.scheduled = requestAnimationFrame(function () { return scheduler.flush(null); }));
-    };
-    AnimationFrameAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) {
-            return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay);
-        }
-        if (scheduler.actions.length === 0) {
-            cancelAnimationFrame(id);
-            scheduler.scheduled = undefined;
-        }
-        return undefined;
-    };
-    return AnimationFrameAction;
-}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
 
-//# sourceMappingURL=AnimationFrameAction.js.map
+    block.nodes.push(node);
+    node.parent = block;
+    node.prev = prev;
+    prev = node;
+    return node;
+  };
 
+  push({ type: 'bos' });
 
-/***/ }),
-/* 325 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  while (index < length) {
+    block = stack[stack.length - 1];
+    value = advance();
 
-"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__(279);
-/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(306);
-/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */
+    /**
+     * Invalid chars
+     */
+
+    if (value === CHAR_ZERO_WIDTH_NOBREAK_SPACE || value === CHAR_NO_BREAK_SPACE) {
+      continue;
+    }
 
+    /**
+     * Escaped chars
+     */
 
-var AnimationFrameScheduler = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnimationFrameScheduler, _super);
-    function AnimationFrameScheduler() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    if (value === CHAR_BACKSLASH) {
+      push({ type: 'text', value: (options.keepEscaping ? value : '') + advance() });
+      continue;
     }
-    AnimationFrameScheduler.prototype.flush = function (action) {
-        this.active = true;
-        this.scheduled = undefined;
-        var actions = this.actions;
-        var error;
-        var index = -1;
-        var count = actions.length;
-        action = action || actions.shift();
-        do {
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
-        } while (++index < count && (action = actions.shift()));
-        this.active = false;
-        if (error) {
-            while (++index < count && (action = actions.shift())) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    return AnimationFrameScheduler;
-}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"]));
 
-//# sourceMappingURL=AnimationFrameScheduler.js.map
+    /**
+     * Right square bracket (literal): ']'
+     */
 
+    if (value === CHAR_RIGHT_SQUARE_BRACKET) {
+      push({ type: 'text', value: '\\' + value });
+      continue;
+    }
 
-/***/ }),
-/* 326 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    /**
+     * Left square bracket: '['
+     */
 
-"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__(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 */
+    if (value === CHAR_LEFT_SQUARE_BRACKET) {
+      brackets++;
 
+      let closed = true;
+      let next;
 
+      while (index < length && (next = advance())) {
+        value += next;
 
-var VirtualTimeScheduler = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](VirtualTimeScheduler, _super);
-    function VirtualTimeScheduler(SchedulerAction, maxFrames) {
-        if (SchedulerAction === void 0) {
-            SchedulerAction = VirtualAction;
-        }
-        if (maxFrames === void 0) {
-            maxFrames = Number.POSITIVE_INFINITY;
-        }
-        var _this = _super.call(this, SchedulerAction, function () { return _this.frame; }) || this;
-        _this.maxFrames = maxFrames;
-        _this.frame = 0;
-        _this.index = -1;
-        return _this;
-    }
-    VirtualTimeScheduler.prototype.flush = function () {
-        var _a = this, actions = _a.actions, maxFrames = _a.maxFrames;
-        var error, action;
-        while ((action = actions[0]) && action.delay <= maxFrames) {
-            actions.shift();
-            this.frame = action.delay;
-            if (error = action.execute(action.state, action.delay)) {
-                break;
-            }
+        if (next === CHAR_LEFT_SQUARE_BRACKET) {
+          brackets++;
+          continue;
         }
-        if (error) {
-            while (action = actions.shift()) {
-                action.unsubscribe();
-            }
-            throw error;
+
+        if (next === CHAR_BACKSLASH) {
+          value += advance();
+          continue;
         }
-    };
-    VirtualTimeScheduler.frameTimeFactor = 10;
-    return VirtualTimeScheduler;
-}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__["AsyncScheduler"]));
 
-var VirtualAction = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](VirtualAction, _super);
-    function VirtualAction(scheduler, work, index) {
-        if (index === void 0) {
-            index = scheduler.index += 1;
+        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
+          brackets--;
+
+          if (brackets === 0) {
+            break;
+          }
         }
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        _this.index = index;
-        _this.active = true;
-        _this.index = scheduler.index = index;
-        return _this;
+      }
+
+      push({ type: 'text', value });
+      continue;
+    }
+
+    /**
+     * Parentheses
+     */
+
+    if (value === CHAR_LEFT_PARENTHESES) {
+      block = push({ type: 'paren', nodes: [] });
+      stack.push(block);
+      push({ type: 'text', value });
+      continue;
     }
-    VirtualAction.prototype.schedule = function (state, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (!this.id) {
-            return _super.prototype.schedule.call(this, state, delay);
-        }
-        this.active = false;
-        var action = new VirtualAction(this.scheduler, this.work);
-        this.add(action);
-        return action.schedule(state, delay);
-    };
-    VirtualAction.prototype.requestAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        this.delay = scheduler.frame + delay;
-        var actions = scheduler.actions;
-        actions.push(this);
-        actions.sort(VirtualAction.sortActions);
-        return true;
-    };
-    VirtualAction.prototype.recycleAsyncId = function (scheduler, id, delay) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        return undefined;
-    };
-    VirtualAction.prototype._execute = function (state, delay) {
-        if (this.active === true) {
-            return _super.prototype._execute.call(this, state, delay);
-        }
-    };
-    VirtualAction.sortActions = function (a, b) {
-        if (a.delay === b.delay) {
-            if (a.index === b.index) {
-                return 0;
-            }
-            else if (a.index > b.index) {
-                return 1;
-            }
-            else {
-                return -1;
-            }
-        }
-        else if (a.delay > b.delay) {
-            return 1;
-        }
-        else {
-            return -1;
-        }
-    };
-    return VirtualAction;
-}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"]));
 
-//# sourceMappingURL=VirtualTimeScheduler.js.map
+    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: '|"|`
+     */
 
-/***/ }),
-/* 327 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (value === CHAR_DOUBLE_QUOTE || value === CHAR_SINGLE_QUOTE || value === CHAR_BACKTICK) {
+      let open = value;
+      let next;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return identity; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function identity(x) {
-    return x;
-}
-//# sourceMappingURL=identity.js.map
+      if (options.keepQuotes !== true) {
+        value = '';
+      }
 
+      while (index < length && (next = advance())) {
+        if (next === CHAR_BACKSLASH) {
+          value += next + advance();
+          continue;
+        }
 
-/***/ }),
-/* 328 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        if (next === open) {
+          if (options.keepQuotes === true) value += next;
+          break;
+        }
 
-"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__(276);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+        value += next;
+      }
 
-function isObservable(obj) {
-    return !!obj && (obj instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"] || (typeof obj.lift === 'function' && typeof obj.subscribe === 'function'));
-}
-//# sourceMappingURL=isObservable.js.map
+      push({ type: 'text', value });
+      continue;
+    }
 
+    /**
+     * Left curly brace: '{'
+     */
 
-/***/ }),
-/* 329 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (value === CHAR_LEFT_CURLY_BRACE) {
+      depth++;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return ArgumentOutOfRangeError; });
-/** 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;
+      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;
     }
-    ArgumentOutOfRangeErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-    return ArgumentOutOfRangeErrorImpl;
-})();
-var ArgumentOutOfRangeError = ArgumentOutOfRangeErrorImpl;
-//# sourceMappingURL=ArgumentOutOfRangeError.js.map
 
+    /**
+     * Right curly brace: '}'
+     */
 
-/***/ }),
-/* 330 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (value === CHAR_RIGHT_CURLY_BRACE) {
+      if (block.type !== 'brace') {
+        push({ type: 'text', value });
+        continue;
+      }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return EmptyError; });
-/** 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;
+      let type = 'close';
+      block = stack.pop();
+      block.close = true;
+
+      push({ type, value });
+      depth--;
+
+      block = stack[stack.length - 1];
+      continue;
     }
-    EmptyErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-    return EmptyErrorImpl;
-})();
-var EmptyError = EmptyErrorImpl;
-//# sourceMappingURL=EmptyError.js.map
 
+    /**
+     * Comma: ','
+     */
 
-/***/ }),
-/* 331 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    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) }];
+      }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return TimeoutError; });
-/** 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;
+      push({ type: 'comma', value });
+      block.commas++;
+      continue;
     }
-    TimeoutErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype);
-    return TimeoutErrorImpl;
-})();
-var TimeoutError = TimeoutErrorImpl;
-//# sourceMappingURL=TimeoutError.js.map
 
+    /**
+     * Dot: '.'
+     */
 
-/***/ }),
-/* 332 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (value === CHAR_DOT && depth > 0 && block.commas === 0) {
+      let siblings = block.nodes;
 
-"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__(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 */
+      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;
+      }
 
-function bindCallback(callbackFunc, resultSelector, scheduler) {
-    if (resultSelector) {
-        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(resultSelector)) {
-            scheduler = resultSelector;
-        }
-        else {
-            return function () {
-                var args = [];
-                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_4__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
-            };
-        }
-    }
-    return function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var context = this;
-        var subject;
-        var params = {
-            context: context,
-            subject: subject,
-            callbackFunc: callbackFunc,
-            scheduler: scheduler,
-        };
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            if (!scheduler) {
-                if (!subject) {
-                    subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
-                    var handler = function () {
-                        var innerArgs = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            innerArgs[_i] = arguments[_i];
-                        }
-                        subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
-                        subject.complete();
-                    };
-                    try {
-                        callbackFunc.apply(context, args.concat([handler]));
-                    }
-                    catch (err) {
-                        if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) {
-                            subject.error(err);
-                        }
-                        else {
-                            console.warn(err);
-                        }
-                    }
-                }
-                return subject.subscribe(subscriber);
-            }
-            else {
-                var state = {
-                    args: args, subscriber: subscriber, params: params,
-                };
-                return scheduler.schedule(dispatch, 0, state);
-            }
-        });
-    };
-}
-function dispatch(state) {
-    var _this = this;
-    var self = this;
-    var args = state.args, subscriber = state.subscriber, params = state.params;
-    var callbackFunc = params.callbackFunc, context = params.context, scheduler = params.scheduler;
-    var subject = params.subject;
-    if (!subject) {
-        subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
-        var handler = function () {
-            var innerArgs = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                innerArgs[_i] = arguments[_i];
-            }
-            var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
-            _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject }));
-        };
-        try {
-            callbackFunc.apply(context, args.concat([handler]));
-        }
-        catch (err) {
-            subject.error(err);
-        }
+      push({ type: 'dot', value });
+      continue;
     }
-    this.add(subject.subscribe(subscriber));
-}
-function dispatchNext(state) {
-    var value = state.value, subject = state.subject;
-    subject.next(value);
-    subject.complete();
-}
-function dispatchError(state) {
-    var err = state.err, subject = state.subject;
-    subject.error(err);
-}
-//# sourceMappingURL=bindCallback.js.map
-
 
-/***/ }),
-/* 333 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    /**
+     * Text
+     */
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+    push({ type: 'text', value });
+  }
 
+  // Mark imbalanced braces and brackets as invalid
+  do {
+    block = stack.pop();
 
-function map(project, thisArg) {
-    return function mapOperation(source) {
-        if (typeof project !== 'function') {
-            throw new TypeError('argument is not a function. Are you looking for `mapTo()`?');
+    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;
         }
-        return source.lift(new MapOperator(project, thisArg));
-    };
-}
-var MapOperator = /*@__PURE__*/ (function () {
-    function MapOperator(project, thisArg) {
-        this.project = project;
-        this.thisArg = thisArg;
-    }
-    MapOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MapSubscriber(subscriber, this.project, this.thisArg));
-    };
-    return MapOperator;
-}());
+      });
 
-var MapSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MapSubscriber, _super);
-    function MapSubscriber(destination, project, thisArg) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.count = 0;
-        _this.thisArg = thisArg || _this;
-        return _this;
+      // 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);
     }
-    MapSubscriber.prototype._next = function (value) {
-        var result;
-        try {
-            result = this.project.call(this.thisArg, value, this.count++);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
-    };
-    return MapSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=map.js.map
+  } while (stack.length > 0);
+
+  push({ type: 'eos' });
+  return ast;
+};
+
+module.exports = parse;
 
 
 /***/ }),
-/* 334 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 613 */
+/***/ (function(module, 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__(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 */
 
 
+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: '*', /* * */
 
-function bindNodeCallback(callbackFunc, resultSelector, scheduler) {
-    if (resultSelector) {
-        if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(resultSelector)) {
-            scheduler = resultSelector;
-        }
-        else {
-            return function () {
-                var args = [];
-                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_5__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
-            };
-        }
-    }
-    return function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        var params = {
-            subject: undefined,
-            args: args,
-            callbackFunc: callbackFunc,
-            scheduler: scheduler,
-            context: this,
-        };
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            var context = params.context;
-            var subject = params.subject;
-            if (!scheduler) {
-                if (!subject) {
-                    subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
-                    var handler = function () {
-                        var innerArgs = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            innerArgs[_i] = arguments[_i];
-                        }
-                        var err = innerArgs.shift();
-                        if (err) {
-                            subject.error(err);
-                            return;
-                        }
-                        subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs);
-                        subject.complete();
-                    };
-                    try {
-                        callbackFunc.apply(context, args.concat([handler]));
-                    }
-                    catch (err) {
-                        if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) {
-                            subject.error(err);
-                        }
-                        else {
-                            console.warn(err);
-                        }
-                    }
-                }
-                return subject.subscribe(subscriber);
-            }
-            else {
-                return scheduler.schedule(dispatch, 0, { params: params, subscriber: subscriber, context: context });
-            }
-        });
-    };
-}
-function dispatch(state) {
-    var _this = this;
-    var params = state.params, subscriber = state.subscriber, context = state.context;
-    var callbackFunc = params.callbackFunc, args = params.args, scheduler = params.scheduler;
-    var subject = params.subject;
-    if (!subject) {
-        subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"]();
-        var handler = function () {
-            var innerArgs = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                innerArgs[_i] = arguments[_i];
-            }
-            var err = innerArgs.shift();
-            if (err) {
-                _this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject }));
-            }
-            else {
-                var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs;
-                _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject }));
-            }
-        };
-        try {
-            callbackFunc.apply(context, args.concat([handler]));
-        }
-        catch (err) {
-            this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject }));
-        }
-    }
-    this.add(subject.subscribe(subscriber));
-}
-function dispatchNext(arg) {
-    var value = arg.value, subject = arg.subject;
-    subject.next(value);
-    subject.complete();
-}
-function dispatchError(arg) {
-    var err = arg.err, subject = arg.subject;
-    subject.error(err);
-}
-//# sourceMappingURL=bindNodeCallback.js.map
+  // 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 */
+};
 
 
 /***/ }),
-/* 335 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 614 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__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__(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 */
 
 
+module.exports = __webpack_require__(615);
 
 
+/***/ }),
+/* 615 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-var NONE = {};
-function combineLatest() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    var resultSelector = null;
-    var scheduler = null;
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(observables[observables.length - 1])) {
-        scheduler = observables.pop();
-    }
-    if (typeof observables[observables.length - 1] === 'function') {
-        resultSelector = observables.pop();
-    }
-    if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(observables[0])) {
-        observables = observables[0];
-    }
-    return Object(_fromArray__WEBPACK_IMPORTED_MODULE_5__["fromArray"])(observables, scheduler).lift(new CombineLatestOperator(resultSelector));
-}
-var CombineLatestOperator = /*@__PURE__*/ (function () {
-    function CombineLatestOperator(resultSelector) {
-        this.resultSelector = resultSelector;
-    }
-    CombineLatestOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new CombineLatestSubscriber(subscriber, this.resultSelector));
-    };
-    return CombineLatestOperator;
-}());
 
-var CombineLatestSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CombineLatestSubscriber, _super);
-    function CombineLatestSubscriber(destination, resultSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.resultSelector = resultSelector;
-        _this.active = 0;
-        _this.values = [];
-        _this.observables = [];
-        return _this;
-    }
-    CombineLatestSubscriber.prototype._next = function (observable) {
-        this.values.push(NONE);
-        this.observables.push(observable);
-    };
-    CombineLatestSubscriber.prototype._complete = function () {
-        var observables = this.observables;
-        var len = observables.length;
-        if (len === 0) {
-            this.destination.complete();
-        }
-        else {
-            this.active = len;
-            this.toRespond = len;
-            for (var i = 0; i < len; i++) {
-                var observable = observables[i];
-                this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, observable, observable, i));
-            }
-        }
-    };
-    CombineLatestSubscriber.prototype.notifyComplete = function (unused) {
-        if ((this.active -= 1) === 0) {
-            this.destination.complete();
-        }
-    };
-    CombineLatestSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        var values = this.values;
-        var oldVal = values[outerIndex];
-        var toRespond = !this.toRespond
-            ? 0
-            : oldVal === NONE ? --this.toRespond : this.toRespond;
-        values[outerIndex] = innerValue;
-        if (toRespond === 0) {
-            if (this.resultSelector) {
-                this._tryResultSelector(values);
-            }
-            else {
-                this.destination.next(values.slice());
-            }
-        }
-    };
-    CombineLatestSubscriber.prototype._tryResultSelector = function (values) {
-        var result;
-        try {
-            result = this.resultSelector.apply(this, values);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
+const path = __webpack_require__(16);
+const scan = __webpack_require__(616);
+const parse = __webpack_require__(619);
+const utils = __webpack_require__(617);
+
+/**
+ * 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;
     };
-    return CombineLatestSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
+  }
 
-//# sourceMappingURL=combineLatest.js.map
+  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;
 
-/***/ }),
-/* 336 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  let isIgnored = () => false;
+  if (opts.ignore) {
+    let ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
+    isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
+  }
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+  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);
+    }
 
-var OuterSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](OuterSubscriber, _super);
-    function OuterSubscriber() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    if (isMatch === false) {
+      result.isMatch = false;
+      return returnObject ? result : false;
     }
-    OuterSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.destination.next(innerValue);
-    };
-    OuterSubscriber.prototype.notifyError = function (error, innerSub) {
-        this.destination.error(error);
-    };
-    OuterSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.destination.complete();
-    };
-    return OuterSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
 
-//# sourceMappingURL=OuterSubscriber.js.map
+    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;
+  };
 
-/***/ }),
-/* 337 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (returnState) {
+    matcher.state = state;
+  }
 
-"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__(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 */
+  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');
+  }
 
-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
+  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;
 
-/***/ }),
-/* 338 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (match === false) {
+    output = format ? format(input) : input;
+    match = output === glob;
+  }
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+  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 };
+};
 
-var InnerSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](InnerSubscriber, _super);
-    function InnerSubscriber(parent, outerValue, outerIndex) {
-        var _this = _super.call(this) || this;
-        _this.parent = parent;
-        _this.outerValue = outerValue;
-        _this.outerIndex = outerIndex;
-        _this.index = 0;
-        return _this;
-    }
-    InnerSubscriber.prototype._next = function (value) {
-        this.parent.notifyNext(this.outerValue, value, this.outerIndex, this.index++, this);
-    };
-    InnerSubscriber.prototype._error = function (error) {
-        this.parent.notifyError(error, this);
-        this.unsubscribe();
-    };
-    InnerSubscriber.prototype._complete = function () {
-        this.parent.notifyComplete(this);
-        this.unsubscribe();
-    };
-    return InnerSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+/**
+ * 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
+ */
 
-//# sourceMappingURL=InnerSubscriber.js.map
+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
+ */
 
-/***/ }),
-/* 339 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeTo", function() { return subscribeTo; });
-/* 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 */
+/**
+ * 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;
+  }
 
-var subscribeTo = function (result) {
-    if (!!result && typeof result[_symbol_observable__WEBPACK_IMPORTED_MODULE_8__["observable"]] === 'function') {
-        return Object(_subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__["subscribeToObservable"])(result);
-    }
-    else if (Object(_isArrayLike__WEBPACK_IMPORTED_MODULE_4__["isArrayLike"])(result)) {
-        return Object(_subscribeToArray__WEBPACK_IMPORTED_MODULE_0__["subscribeToArray"])(result);
-    }
-    else if (Object(_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(result)) {
-        return Object(_subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__["subscribeToPromise"])(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_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);
-    }
-};
-//# sourceMappingURL=subscribeTo.js.map
+  let source = `${prepend}(?:${output})${append}`;
+  if (state && state.negated === true) {
+    source = `^(?!${source}).*$`;
+  }
 
+  let regex = picomatch.toRegex(source, options);
+  if (returnState === true) {
+    regex.state = state;
+  }
 
-/***/ }),
-/* 340 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  return regex;
+};
 
-"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__(283);
-/** PURE_IMPORTS_START _hostReportError PURE_IMPORTS_END */
+/**
+ * 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
+ */
 
-var subscribeToPromise = function (promise) {
-    return function (subscriber) {
-        promise.then(function (value) {
-            if (!subscriber.closed) {
-                subscriber.next(value);
-                subscriber.complete();
-            }
-        }, function (err) { return subscriber.error(err); })
-            .then(null, _hostReportError__WEBPACK_IMPORTED_MODULE_0__["hostReportError"]);
-        return subscriber;
-    };
+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 /$^/;
+  }
 };
-//# sourceMappingURL=subscribeToPromise.js.map
+
+/**
+ * Picomatch constants.
+ * @return {Object}
+ */
+
+picomatch.constants = __webpack_require__(618);
+
+/**
+ * Expose "picomatch"
+ */
+
+module.exports = picomatch;
 
 
 /***/ }),
-/* 341 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 616 */
+/***/ (function(module, 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__(342);
-/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */
 
-var subscribeToIterable = function (iterable) {
-    return function (subscriber) {
-        var iterator = iterable[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]]();
-        do {
-            var item = iterator.next();
-            if (item.done) {
-                subscriber.complete();
-                break;
-            }
-            subscriber.next(item.value);
-            if (subscriber.closed) {
-                break;
-            }
-        } while (true);
-        if (typeof iterator.return === 'function') {
-            subscriber.add(function () {
-                if (iterator.return) {
-                    iterator.return();
-                }
-            });
-        }
-        return subscriber;
-    };
+
+const utils = __webpack_require__(617);
+
+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__(618);
+
+const isPathSeparator = code => {
+  return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
 };
-//# sourceMappingURL=subscribeToIterable.js.map
 
+/**
+ * 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
+ */
 
-/***/ }),
-/* 342 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+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;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSymbolIterator", function() { return getSymbolIterator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "iterator", function() { return iterator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "$$iterator", function() { return $$iterator; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function getSymbolIterator() {
-    if (typeof Symbol !== 'function' || !Symbol.iterator) {
-        return '@@iterator';
-    }
-    return Symbol.iterator;
-}
-var iterator = /*@__PURE__*/ getSymbolIterator();
-var $$iterator = iterator;
-//# sourceMappingURL=iterator.js.map
+  let braceEscaped = false;
 
+  let eos = () => index >= length;
+  let advance = () => {
+    prev = code;
+    return input.charCodeAt(++index);
+  };
 
-/***/ }),
-/* 343 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  while (index < length) {
+    code = advance();
+    let next;
 
-"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__(290);
-/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */
+    if (code === CHAR_BACKWARD_SLASH) {
+      backslashes = true;
+      next = advance();
 
-var subscribeToObservable = function (obj) {
-    return function (subscriber) {
-        var obs = obj[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]]();
-        if (typeof obs.subscribe !== 'function') {
-            throw new TypeError('Provided object does not correctly implement Symbol.observable');
+      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;
         }
-        else {
-            return obs.subscribe(subscriber);
+
+        if (next === CHAR_LEFT_CURLY_BRACE) {
+          braces++;
+          continue;
         }
-    };
-};
-//# sourceMappingURL=subscribeToObservable.js.map
 
+        if (!braceEscaped && next === CHAR_DOT && (next = advance()) === CHAR_DOT) {
+          isGlob = true;
+          break;
+        }
 
-/***/ }),
-/* 344 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        if (!braceEscaped && next === CHAR_COMMA) {
+          isGlob = true;
+          break;
+        }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isArrayLike", function() { return isArrayLike; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-var isArrayLike = (function (x) { return x && typeof x.length === 'number' && typeof x !== 'function'; });
-//# sourceMappingURL=isArrayLike.js.map
+        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;
+      }
 
-/***/ }),
-/* 345 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      lastIndex = index + 1;
+      continue;
+    }
 
-"use strict";
-__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';
-}
-//# sourceMappingURL=isPromise.js.map
+    if (code === CHAR_ASTERISK) {
+      isGlob = true;
+      break;
+    }
 
+    if (code === CHAR_ASTERISK || code === CHAR_QUESTION_MARK) {
+      isGlob = true;
+      break;
+    }
 
-/***/ }),
-/* 346 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (code === CHAR_LEFT_SQUARE_BRACKET) {
+      while (!eos() && (next = advance())) {
+        if (next === CHAR_BACKWARD_SLASH) {
+          backslashes = true;
+          next = advance();
+          continue;
+        }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return concat; });
-/* 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 */
+        if (next === CHAR_RIGHT_SQUARE_BRACKET) {
+          isGlob = true;
+          break;
+        }
+      }
+    }
 
+    let isExtglobChar = code === CHAR_PLUS
+      || code === CHAR_AT
+      || code === CHAR_EXCLAMATION_MARK;
 
-function concat() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
+    if (isExtglobChar && input.charCodeAt(index + 1) === CHAR_LEFT_PARENTHESES) {
+      isGlob = true;
+      break;
     }
-    return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_1__["concatAll"])()(_of__WEBPACK_IMPORTED_MODULE_0__["of"].apply(void 0, observables));
-}
-//# sourceMappingURL=concat.js.map
 
+    if (code === CHAR_EXCLAMATION_MARK && index === start) {
+      negated = true;
+      start++;
+      continue;
+    }
 
-/***/ }),
-/* 347 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (code === CHAR_LEFT_PARENTHESES) {
+      while (!eos() && (next = advance())) {
+        if (next === CHAR_BACKWARD_SLASH) {
+          backslashes = true;
+          next = advance();
+          continue;
+        }
 
-"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__(348);
-/** PURE_IMPORTS_START _mergeAll PURE_IMPORTS_END */
+        if (next === CHAR_RIGHT_PARENTHESES) {
+          isGlob = true;
+          break;
+        }
+      }
+    }
 
-function concatAll() {
-    return Object(_mergeAll__WEBPACK_IMPORTED_MODULE_0__["mergeAll"])(1);
-}
-//# sourceMappingURL=concatAll.js.map
+    if (isGlob) {
+      break;
+    }
+  }
 
+  let prefix = '';
+  let orig = input;
+  let base = input;
+  let glob = '';
 
-/***/ }),
-/* 348 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (start > 0) {
+    prefix = input.slice(0, start);
+    input = input.slice(start);
+    lastIndex -= start;
+  }
 
-"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__(349);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(327);
-/** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */
+  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);
 
-function mergeAll(concurrent) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
+    if (base && backslashes === true) {
+      base = utils.removeBackslashes(base);
     }
-    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"], concurrent);
-}
-//# sourceMappingURL=mergeAll.js.map
+  }
+
+  return { prefix, input: orig, base, glob, negated, isGlob };
+};
 
 
 /***/ }),
-/* 349 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 617 */
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-__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__(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 */
-
-
 
 
+const path = __webpack_require__(16);
+const win32 = process.platform === 'win32';
+const {
+  REGEX_SPECIAL_CHARS,
+  REGEX_SPECIAL_CHARS_GLOBAL,
+  REGEX_REMOVE_BACKSLASH
+} = __webpack_require__(618);
 
+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, '/');
 
-function mergeMap(project, resultSelector, concurrent) {
-    if (concurrent === void 0) {
-        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_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;
-    }
-    return function (source) { return source.lift(new MergeMapOperator(project, concurrent)); };
+exports.removeBackslashes = str => {
+  return str.replace(REGEX_REMOVE_BACKSLASH, match => {
+    return match === '\\' ? '' : match;
+  });
 }
-var MergeMapOperator = /*@__PURE__*/ (function () {
-    function MergeMapOperator(project, concurrent) {
-        if (concurrent === void 0) {
-            concurrent = Number.POSITIVE_INFINITY;
-        }
-        this.project = project;
-        this.concurrent = concurrent;
-    }
-    MergeMapOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new MergeMapSubscriber(observer, this.project, this.concurrent));
-    };
-    return MergeMapOperator;
-}());
 
-var MergeMapSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MergeMapSubscriber, _super);
-    function MergeMapSubscriber(destination, project, concurrent) {
-        if (concurrent === void 0) {
-            concurrent = Number.POSITIVE_INFINITY;
-        }
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.concurrent = concurrent;
-        _this.hasCompleted = false;
-        _this.buffer = [];
-        _this.active = 0;
-        _this.index = 0;
-        return _this;
-    }
-    MergeMapSubscriber.prototype._next = function (value) {
-        if (this.active < this.concurrent) {
-            this._tryNext(value);
-        }
-        else {
-            this.buffer.push(value);
-        }
-    };
-    MergeMapSubscriber.prototype._tryNext = function (value) {
-        var result;
-        var index = this.index++;
-        try {
-            result = this.project(value, index);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.active++;
-        this._innerSub(result, value, index);
-    };
-    MergeMapSubscriber.prototype._innerSub = function (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);
-    };
-    MergeMapSubscriber.prototype.notifyComplete = function (innerSub) {
-        var buffer = this.buffer;
-        this.remove(innerSub);
-        this.active--;
-        if (buffer.length > 0) {
-            this._next(buffer.shift());
-        }
-        else if (this.active === 0 && this.hasCompleted) {
-            this.destination.complete();
-        }
-    };
-    return MergeMapSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
+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;
+};
 
-//# sourceMappingURL=mergeMap.js.map
+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);
+};
 
 
 /***/ }),
-/* 350 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 618 */
+/***/ (function(module, 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 */
 
 
+const path = __webpack_require__(16);
+const WIN_SLASH = '\\\\/';
+const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
 
-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
+/**
+ * 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
+ */
 
-/***/ }),
-/* 351 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const WINDOWS_CHARS = {
+  ...POSIX_CHARS,
 
-"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 */
+  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 */
 
-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
+  CHAR_LEFT_PARENTHESES: 40, /* ( */
+  CHAR_RIGHT_PARENTHESES: 41, /* ) */
 
+  CHAR_ASTERISK: 42, /* * */
 
-/***/ }),
-/* 352 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // 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 */
 
-"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 */
+  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: ')' }
+    };
+  },
 
-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
+  /**
+   * Create GLOB_CHARS
+   */
+
+  globChars(win32) {
+    return win32 === true ? WINDOWS_CHARS : POSIX_CHARS;
+  }
+};
 
 
 /***/ }),
-/* 353 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 619 */
+/***/ (function(module, 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
+const utils = __webpack_require__(617);
+const constants = __webpack_require__(618);
 
+/**
+ * Constants
+ */
 
-/***/ }),
-/* 354 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const {
+  MAX_LENGTH,
+  POSIX_REGEX_SOURCE,
+  REGEX_NON_SPECIAL_CHAR,
+  REGEX_SPECIAL_CHARS_BACKREF,
+  REPLACEMENTS
+} = constants;
 
-"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 */
+/**
+ * Helpers
+ */
 
+const expandRange = (args, options) => {
+  if (typeof options.expandRange === 'function') {
+    return options.expandRange(...args, options);
+  }
 
+  args.sort();
+  let value = `[${args.join('-')}]`;
 
-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
+  try {
+    /* eslint-disable no-new */
+    new RegExp(value);
+  } catch (ex) {
+    return args.map(v => utils.escapeRegex(v)).join('..');
+  }
 
+  return value;
+};
 
-/***/ }),
-/* 355 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const negate = state => {
+  let count = 1;
 
-"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 */
+  while (state.peek() === '!' && (state.peek(2) !== '(' || state.peek(3) === '?')) {
+    state.advance();
+    state.start++;
+    count++;
+  }
 
-function isInteropObservable(input) {
-    return input && typeof input[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]] === 'function';
-}
-//# sourceMappingURL=isInteropObservable.js.map
+  if (count % 2 === 0) {
+    return false;
+  }
 
+  state.negated = true;
+  state.start++;
+  return true;
+};
 
-/***/ }),
-/* 356 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * Create the message for a syntax error
+ */
 
-"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 */
+const syntaxError = (type, char) => {
+  return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
+};
 
-function isIterable(input) {
-    return input && typeof input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]] === 'function';
-}
-//# sourceMappingURL=isIterable.js.map
+/**
+ * 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;
 
-/***/ }),
-/* 357 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  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}`);
+  }
 
-"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__(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 */
+  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);
 
-function defer(observableFactory) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var input;
-        try {
-            input = observableFactory();
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        var source = input ? Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(input) : Object(_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])();
-        return source.subscribe(subscriber);
-    });
-}
-//# sourceMappingURL=defer.js.map
+  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}).)*?)`;
+  };
 
-/***/ }),
-/* 358 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  let nodot = opts.dot ? '' : NO_DOT;
+  let star = opts.bash === true ? globstar(opts) : STAR;
+  let qmarkNoDot = opts.dot ? QMARK : QMARK_NO_DOT;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return forkJoin; });
-/* 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 */
+  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
+   */
 
-function forkJoin() {
-    var sources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        sources[_i] = arguments[_i];
-    }
-    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 (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 forkJoinInternal(sources, null);
-}
-function forkJoinInternal(sources, keys) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var len = sources.length;
-        if (len === 0) {
-            subscriber.complete();
-            return;
-        }
-        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);
-        }
-    });
-}
-//# sourceMappingURL=forkJoin.js.map
+  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);
+  };
 
-/***/ }),
-/* 359 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  const decrement = type => {
+    state[type]--;
+    stack.pop();
+  };
 
-"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__(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 */
+  /**
+   * 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;
+  };
 
-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;
-        options = undefined;
-    }
-    if (resultSelector) {
-        return fromEvent(target, eventName, options).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        function handler(e) {
-            if (arguments.length > 1) {
-                subscriber.next(Array.prototype.slice.call(arguments));
-            }
-            else {
-                subscriber.next(e);
-            }
-        }
-        setupSubscription(target, eventName, handler, subscriber, options);
-    });
-}
-function setupSubscription(sourceObj, eventName, handler, subscriber, options) {
-    var unsubscribe;
-    if (isEventTarget(sourceObj)) {
-        var source_1 = sourceObj;
-        sourceObj.addEventListener(eventName, handler, options);
-        unsubscribe = function () { return source_1.removeEventListener(eventName, handler, options); };
-    }
-    else if (isJQueryStyleEventEmitter(sourceObj)) {
-        var source_2 = sourceObj;
-        sourceObj.on(eventName, handler);
-        unsubscribe = function () { return source_2.off(eventName, handler); };
-    }
-    else if (isNodeStyleEventEmitter(sourceObj)) {
-        var source_3 = sourceObj;
-        sourceObj.addListener(eventName, handler);
-        unsubscribe = function () { return source_3.removeListener(eventName, handler); };
-    }
-    else if (sourceObj && sourceObj.length) {
-        for (var i = 0, len = sourceObj.length; i < len; i++) {
-            setupSubscription(sourceObj[i], eventName, handler, subscriber, options);
-        }
-    }
-    else {
-        throw new TypeError('Invalid event target');
-    }
-    subscriber.add(unsubscribe);
-}
-function isNodeStyleEventEmitter(sourceObj) {
-    return sourceObj && typeof sourceObj.addListener === 'function' && typeof sourceObj.removeListener === 'function';
-}
-function isJQueryStyleEventEmitter(sourceObj) {
-    return sourceObj && typeof sourceObj.on === 'function' && typeof sourceObj.off === 'function';
-}
-function isEventTarget(sourceObj) {
-    return sourceObj && typeof sourceObj.addEventListener === 'function' && typeof sourceObj.removeEventListener === 'function';
-}
-//# sourceMappingURL=fromEvent.js.map
+  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;
 
-/***/ }),
-/* 360 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    push({ type, value, output: state.output ? '' : ONE_CHAR });
+    push({ type: 'paren', extglob: true, value: advance(), output });
+    increment('parens');
+    extglobs.push(token);
+  };
 
-"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__(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 */
+  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;
+      }
 
-function fromEventPattern(addHandler, removeHandler, resultSelector) {
-    if (resultSelector) {
-        return fromEventPattern(addHandler, removeHandler).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); }));
+      if (token.prev.type === 'bos' && eos()) {
+        state.negatedExtglob = true;
+      }
     }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var handler = function () {
-            var e = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                e[_i] = arguments[_i];
-            }
-            return subscriber.next(e.length === 1 ? e[0] : e);
-        };
-        var retValue;
-        try {
-            retValue = addHandler(handler);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        if (!Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(removeHandler)) {
-            return undefined;
-        }
-        return function () { return removeHandler(handler, retValue); };
-    });
-}
-//# sourceMappingURL=fromEventPattern.js.map
 
+    push({ type: 'paren', extglob: true, value, output });
+    decrement('parens');
+  };
 
-/***/ }),
-/* 361 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (opts.fastpaths !== false && !/(^[*!]|[/{[()\]}"])/.test(input)) {
+    let backslashes = false;
 
-"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__(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 */
+    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);
+      }
 
-function generate(initialStateOrOptions, condition, iterate, resultSelectorOrObservable, scheduler) {
-    var resultSelector;
-    var initialState;
-    if (arguments.length == 1) {
-        var options = initialStateOrOptions;
-        initialState = options.initialState;
-        condition = options.condition;
-        iterate = options.iterate;
-        resultSelector = options.resultSelector || _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"];
-        scheduler = options.scheduler;
-    }
-    else if (resultSelectorOrObservable === undefined || Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_2__["isScheduler"])(resultSelectorOrObservable)) {
-        initialState = initialStateOrOptions;
-        resultSelector = _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"];
-        scheduler = resultSelectorOrObservable;
-    }
-    else {
-        initialState = initialStateOrOptions;
-        resultSelector = resultSelectorOrObservable;
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var state = initialState;
-        if (scheduler) {
-            return scheduler.schedule(dispatch, 0, {
-                subscriber: subscriber,
-                iterate: iterate,
-                condition: condition,
-                resultSelector: resultSelector,
-                state: state
-            });
+      if (first === '*') {
+        if (esc) {
+          return esc + first + (rest ? star : '');
         }
-        do {
-            if (condition) {
-                var conditionResult = void 0;
-                try {
-                    conditionResult = condition(state);
-                }
-                catch (err) {
-                    subscriber.error(err);
-                    return undefined;
-                }
-                if (!conditionResult) {
-                    subscriber.complete();
-                    break;
-                }
-            }
-            var value = void 0;
-            try {
-                value = resultSelector(state);
-            }
-            catch (err) {
-                subscriber.error(err);
-                return undefined;
-            }
-            subscriber.next(value);
-            if (subscriber.closed) {
-                break;
-            }
-            try {
-                state = iterate(state);
-            }
-            catch (err) {
-                subscriber.error(err);
-                return undefined;
-            }
-        } while (true);
-        return undefined;
+        return star;
+      }
+      return esc ? m : '\\' + m;
     });
-}
-function dispatch(state) {
-    var subscriber = state.subscriber, condition = state.condition;
-    if (subscriber.closed) {
-        return undefined;
-    }
-    if (state.needIterate) {
-        try {
-            state.state = state.iterate(state.state);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-    }
-    else {
-        state.needIterate = true;
-    }
-    if (condition) {
-        var conditionResult = void 0;
-        try {
-            conditionResult = condition(state.state);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        if (!conditionResult) {
-            subscriber.complete();
-            return undefined;
-        }
-        if (subscriber.closed) {
-            return undefined;
-        }
-    }
-    var value;
-    try {
-        value = state.resultSelector(state.state);
-    }
-    catch (err) {
-        subscriber.error(err);
-        return undefined;
-    }
-    if (subscriber.closed) {
-        return undefined;
-    }
-    subscriber.next(value);
-    if (subscriber.closed) {
-        return undefined;
-    }
-    return this.schedule(state);
-}
-//# sourceMappingURL=generate.js.map
 
+    if (backslashes === true) {
+      if (opts.unescape === true) {
+        output = output.replace(/\\/g, '');
+      } else {
+        output = output.replace(/\\+/g, m => {
+          return m.length % 2 === 0 ? '\\\\' : (m ? '\\' : '');
+        });
+      }
+    }
 
-/***/ }),
-/* 362 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    state.output = output;
+    return state;
+  }
 
-"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__(357);
-/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(310);
-/** PURE_IMPORTS_START _defer,_empty PURE_IMPORTS_END */
+  /**
+   * Tokenize input until we reach end-of-string
+   */
 
+  while (!eos()) {
+    value = advance();
 
-function iif(condition, trueResult, falseResult) {
-    if (trueResult === void 0) {
-        trueResult = _empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"];
-    }
-    if (falseResult === void 0) {
-        falseResult = _empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"];
+    if (value === '\u0000') {
+      continue;
     }
-    return Object(_defer__WEBPACK_IMPORTED_MODULE_0__["defer"])(function () { return condition() ? trueResult : falseResult; });
-}
-//# sourceMappingURL=iif.js.map
 
+    /**
+     * Escaped characters
+     */
 
-/***/ }),
-/* 363 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (value === '\\') {
+      let next = peek();
 
-"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__(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 */
+      if (next === '/' && opts.bash !== true) {
+        continue;
+      }
 
+      if (next === '.' || next === ';') {
+        continue;
+      }
 
+      if (!next) {
+        value += '\\';
+        push({ type: 'text', value });
+        continue;
+      }
 
-function interval(period, scheduler) {
-    if (period === void 0) {
-        period = 0;
-    }
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    }
-    if (!Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(period) || period < 0) {
-        period = 0;
-    }
-    if (!scheduler || typeof scheduler.schedule !== 'function') {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        subscriber.add(scheduler.schedule(dispatch, period, { subscriber: subscriber, counter: 0, period: period }));
-        return subscriber;
-    });
-}
-function dispatch(state) {
-    var subscriber = state.subscriber, counter = state.counter, period = state.period;
-    subscriber.next(counter);
-    this.schedule({ subscriber: subscriber, counter: counter + 1, period: period }, period);
-}
-//# sourceMappingURL=interval.js.map
+      // 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 += '\\';
+        }
+      }
 
-/***/ }),
-/* 364 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      if (opts.unescape === true) {
+        value = advance() || '';
+      } else {
+        value += advance() || '';
+      }
 
-"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__(285);
-/** PURE_IMPORTS_START _isArray PURE_IMPORTS_END */
+      if (state.brackets === 0) {
+        push({ type: 'text', value });
+        continue;
+      }
+    }
 
-function isNumeric(val) {
-    return !Object(_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(val) && (val - parseFloat(val) + 1) >= 0;
-}
-//# sourceMappingURL=isNumeric.js.map
+    /**
+     * 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;
 
-/***/ }),
-/* 365 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+          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();
 
-"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__(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 */
+              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 = '^';
+      }
 
-function merge() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
+      prev.value += value;
+      append({ value });
+      continue;
     }
-    var concurrent = Number.POSITIVE_INFINITY;
-    var scheduler = null;
-    var last = observables[observables.length - 1];
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(last)) {
-        scheduler = observables.pop();
-        if (observables.length > 1 && typeof observables[observables.length - 1] === 'number') {
-            concurrent = observables.pop();
-        }
+
+    /**
+     * 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;
     }
-    else if (typeof last === 'number') {
-        concurrent = observables.pop();
+
+    /**
+     * Double quotes
+     */
+
+    if (value === '"') {
+      state.quotes = state.quotes === 1 ? 0 : 1;
+      if (opts.keepQuotes === true) {
+        push({ type: 'text', value });
+      }
+      continue;
     }
-    if (scheduler === null && observables.length === 1 && observables[0] instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) {
-        return observables[0];
+
+    /**
+     * Parentheses
+     */
+
+    if (value === '(') {
+      push({ type: 'paren', value });
+      increment('parens');
+      continue;
     }
-    return Object(_operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__["mergeAll"])(concurrent)(Object(_fromArray__WEBPACK_IMPORTED_MODULE_3__["fromArray"])(observables, scheduler));
-}
-//# sourceMappingURL=merge.js.map
 
+    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', ']'));
+        }
 
-/***/ }),
-/* 366 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        value = '\\' + value;
+      } else {
+        increment('brackets');
+      }
 
-"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__(276);
-/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(292);
-/** PURE_IMPORTS_START _Observable,_util_noop PURE_IMPORTS_END */
+      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;
+      }
 
-var NEVER = /*@__PURE__*/ new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](_util_noop__WEBPACK_IMPORTED_MODULE_1__["noop"]);
-function never() {
-    return NEVER;
-}
-//# sourceMappingURL=never.js.map
+      if (state.brackets === 0) {
+        if (opts.strictBrackets === true) {
+          throw new SyntaxError(syntaxError('opening', '['));
+        }
 
+        push({ type: 'text', value, output: '\\' + value });
+        continue;
+      }
 
-/***/ }),
-/* 367 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      decrement('brackets');
 
-"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__(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 */
+      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);
 
-function onErrorResumeNext() {
-    var sources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        sources[_i] = arguments[_i];
-    }
-    if (sources.length === 0) {
-        return _empty__WEBPACK_IMPORTED_MODULE_3__["EMPTY"];
-    }
-    var first = sources[0], remainder = sources.slice(1);
-    if (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(first)) {
-        return onErrorResumeNext.apply(void 0, first);
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var subNext = function () { return subscriber.add(onErrorResumeNext.apply(void 0, remainder).subscribe(subscriber)); };
-        return Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(first).subscribe({
-            next: function (value) { subscriber.next(value); },
-            error: subNext,
-            complete: subNext,
-        });
-    });
-}
-//# sourceMappingURL=onErrorResumeNext.js.map
+      // 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;
+    }
 
-/***/ }),
-/* 368 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    /**
+     * Braces
+     */
 
-"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__(276);
-/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284);
-/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
+    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;
+      }
 
-function pairs(obj, scheduler) {
-    if (!scheduler) {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            var keys = Object.keys(obj);
-            for (var i = 0; i < keys.length && !subscriber.closed; i++) {
-                var key = keys[i];
-                if (obj.hasOwnProperty(key)) {
-                    subscriber.next([key, obj[key]]);
-                }
-            }
-            subscriber.complete();
-        });
-    }
-    else {
-        return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-            var keys = Object.keys(obj);
-            var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-            subscription.add(scheduler.schedule(dispatch, 0, { keys: keys, index: 0, subscriber: subscriber, subscription: subscription, obj: obj }));
-            return subscription;
-        });
-    }
-}
-function dispatch(state) {
-    var keys = state.keys, index = state.index, subscriber = state.subscriber, subscription = state.subscription, obj = state.obj;
-    if (!subscriber.closed) {
-        if (index < keys.length) {
-            var key = keys[index];
-            subscriber.next([key, obj[key]]);
-            subscription.add(this.schedule({ keys: keys, index: index + 1, subscriber: subscriber, subscription: subscription, obj: obj }));
-        }
-        else {
-            subscriber.complete();
-        }
-    }
-}
-//# sourceMappingURL=pairs.js.map
+      let output = ')';
 
+      if (state.dots === true) {
+        let arr = tokens.slice();
+        let range = [];
 
-/***/ }),
-/* 369 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        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);
+          }
+        }
 
-"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 */
+        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;
+    }
 
-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
+    /**
+     * Commas
+     */
 
+    if (value === ',') {
+      let output = value;
 
-/***/ }),
-/* 370 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      if (state.braces > 0 && stack[stack.length - 1] === 'braces') {
+        output = '|';
+      }
 
-"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));
+      push({ type: 'comma', value, output });
+      continue;
     }
-    notPred.pred = pred;
-    notPred.thisArg = thisArg;
-    return notPred;
-}
-//# sourceMappingURL=not.js.map
 
+    /**
+     * Slashes
+     */
 
-/***/ }),
-/* 371 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    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;
+      }
 
-"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 */
+      push({ type: 'slash', value, output: SLASH_LITERAL });
+      continue;
+    }
 
+    /**
+     * Dots
+     */
 
-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;
+    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;
     }
-    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
 
+    /**
+     * Question marks
+     */
 
-/***/ }),
-/* 372 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    if (value === '?') {
+      if (prev && prev.type === 'paren') {
+        let next = peek();
+        let output = value;
 
-"use strict";
-__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__(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 */
+        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;
+      }
 
-function race() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
+      push({ type: 'qmark', value, output: QMARK });
+      continue;
     }
-    if (observables.length === 1) {
-        if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(observables[0])) {
-            observables = observables[0];
-        }
-        else {
-            return observables[0];
+
+    /**
+     * Exclamation
+     */
+
+    if (value === '!') {
+      if (opts.noextglob !== true && peek() === '(') {
+        if (peek(2) !== '?' || !/[!=<:]/.test(peek(3))) {
+          extglobOpen('negate', value);
+          continue;
         }
-    }
-    return Object(_fromArray__WEBPACK_IMPORTED_MODULE_2__["fromArray"])(observables, undefined).lift(new RaceOperator());
-}
-var RaceOperator = /*@__PURE__*/ (function () {
-    function RaceOperator() {
-    }
-    RaceOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RaceSubscriber(subscriber));
-    };
-    return RaceOperator;
-}());
+      }
 
-var RaceSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RaceSubscriber, _super);
-    function RaceSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasFirst = false;
-        _this.observables = [];
-        _this.subscriptions = [];
-        return _this;
+      if (opts.nonegate !== true && state.index === 0) {
+        negate(state);
+        continue;
+      }
     }
-    RaceSubscriber.prototype._next = function (observable) {
-        this.observables.push(observable);
-    };
-    RaceSubscriber.prototype._complete = function () {
-        var observables = this.observables;
-        var len = observables.length;
-        if (len === 0) {
-            this.destination.complete();
-        }
-        else {
-            for (var i = 0; i < len && !this.hasFirst; i++) {
-                var observable = observables[i];
-                var subscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, observable, observable, i);
-                if (this.subscriptions) {
-                    this.subscriptions.push(subscription);
-                }
-                this.add(subscription);
-            }
-            this.observables = null;
-        }
-    };
-    RaceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        if (!this.hasFirst) {
-            this.hasFirst = true;
-            for (var i = 0; i < this.subscriptions.length; i++) {
-                if (i !== outerIndex) {
-                    var subscription = this.subscriptions[i];
-                    subscription.unsubscribe();
-                    this.remove(subscription);
-                }
-            }
-            this.subscriptions = null;
-        }
-        this.destination.next(innerValue);
-    };
-    return RaceSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
 
-//# sourceMappingURL=race.js.map
+    /**
+     * Plus
+     */
 
+    if (value === '+') {
+      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        extglobOpen('plus', value);
+        continue;
+      }
 
-/***/ }),
-/* 373 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      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 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__(276);
-/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */
+      // use regex behavior inside parens
+      if (state.parens > 0 && opts.regex !== false) {
+        push({ type: 'plus', value });
+        continue;
+      }
 
-function range(start, count, scheduler) {
-    if (start === void 0) {
-        start = 0;
+      push({ type: 'plus', value: PLUS_LITERAL });
+      continue;
     }
-    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) {
-            return scheduler.schedule(dispatch, 0, {
-                index: index, count: count, start: start, subscriber: subscriber
-            });
-        }
-        else {
-            do {
-                if (index++ >= count) {
-                    subscriber.complete();
-                    break;
-                }
-                subscriber.next(current++);
-                if (subscriber.closed) {
-                    break;
-                }
-            } while (true);
-        }
-        return undefined;
-    });
-}
-function dispatch(state) {
-    var start = state.start, index = state.index, count = state.count, subscriber = state.subscriber;
-    if (index >= count) {
-        subscriber.complete();
-        return;
+
+    /**
+     * Plain text
+     */
+
+    if (value === '@') {
+      if (opts.noextglob !== true && peek() === '(' && peek(2) !== '?') {
+        push({ type: 'at', value, output: '' });
+        continue;
+      }
+
+      push({ type: 'text', value });
+      continue;
     }
-    subscriber.next(start);
-    if (subscriber.closed) {
-        return;
+
+    /**
+     * 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;
     }
-    state.index = index + 1;
-    state.start = start + 1;
-    this.schedule(state);
-}
-//# sourceMappingURL=range.js.map
 
+    /**
+     * Stars
+     */
 
-/***/ }),
-/* 374 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    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;
+    }
 
-"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__(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 */
+    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;
+      }
 
-function timer(dueTime, periodOrScheduler, scheduler) {
-    if (dueTime === void 0) {
-        dueTime = 0;
-    }
-    var period = -1;
-    if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(periodOrScheduler)) {
-        period = Number(periodOrScheduler) < 1 && 1 || Number(periodOrScheduler);
-    }
-    else if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(periodOrScheduler)) {
-        scheduler = periodOrScheduler;
-    }
-    if (!Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(scheduler)) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    }
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var due = Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(dueTime)
-            ? dueTime
-            : (+dueTime - scheduler.now());
-        return scheduler.schedule(dispatch, due, {
-            index: 0, period: period, subscriber: subscriber
-        });
-    });
-}
-function dispatch(state) {
-    var index = state.index, period = state.period, subscriber = state.subscriber;
-    subscriber.next(index);
-    if (subscriber.closed) {
-        return;
-    }
-    else if (period === -1) {
-        return subscriber.complete();
-    }
-    state.index = index + 1;
-    this.schedule(state, period);
-}
-//# sourceMappingURL=timer.js.map
+      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;
+      }
 
-/***/ }),
-/* 375 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      if (prior.type === 'bos' && eos()) {
+        prev.type = 'globstar';
+        prev.value += value;
+        prev.output = globstar(opts);
+        state.output = prev.output;
+        state.consumed += value;
+        continue;
+      }
 
-"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__(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 */
+      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;
+      }
 
-function using(resourceFactory, observableFactory) {
-    return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) {
-        var resource;
-        try {
-            resource = resourceFactory();
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        var result;
-        try {
-            result = observableFactory(resource);
-        }
-        catch (err) {
-            subscriber.error(err);
-            return undefined;
-        }
-        var source = result ? Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(result) : _empty__WEBPACK_IMPORTED_MODULE_2__["EMPTY"];
-        var subscription = source.subscribe(subscriber);
-        return function () {
-            subscription.unsubscribe();
-            if (resource) {
-                resource.unsubscribe();
-            }
-        };
-    });
-}
-//# sourceMappingURL=using.js.map
+      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;
 
-/***/ }),
-/* 376 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+        prev.type = 'globstar';
+        prev.output = `${globstar(opts)}${SLASH_LITERAL}|${SLASH_LITERAL}${end})`;
+        prev.value += value;
 
-"use strict";
-__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__(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 */
+        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 };
 
-function zip() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    var resultSelector = observables[observables.length - 1];
-    if (typeof resultSelector === 'function') {
-        observables.pop();
-    }
-    return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(observables, undefined).lift(new ZipOperator(resultSelector));
-}
-var ZipOperator = /*@__PURE__*/ (function () {
-    function ZipOperator(resultSelector) {
-        this.resultSelector = resultSelector;
+    if (opts.bash === true) {
+      token.output = '.*?';
+      if (prev.type === 'bos' || prev.type === 'slash') {
+        token.output = nodot + token.output;
+      }
+      push(token);
+      continue;
     }
-    ZipOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ZipSubscriber(subscriber, this.resultSelector));
-    };
-    return ZipOperator;
-}());
 
-var ZipSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ZipSubscriber, _super);
-    function ZipSubscriber(destination, resultSelector, values) {
-        if (values === void 0) {
-            values = Object.create(null);
-        }
-        var _this = _super.call(this, destination) || this;
-        _this.iterators = [];
-        _this.active = 0;
-        _this.resultSelector = (typeof resultSelector === 'function') ? resultSelector : null;
-        _this.values = values;
-        return _this;
+    if (prev && (prev.type === 'bracket' || prev.type === 'paren') && opts.regex === true) {
+      token.output = value;
+      push(token);
+      continue;
     }
-    ZipSubscriber.prototype._next = function (value) {
-        var iterators = this.iterators;
-        if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(value)) {
-            iterators.push(new StaticArrayIterator(value));
-        }
-        else if (typeof value[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] === 'function') {
-            iterators.push(new StaticIterator(value[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]]()));
-        }
-        else {
-            iterators.push(new ZipBufferIterator(this.destination, this, value));
-        }
-    };
-    ZipSubscriber.prototype._complete = function () {
-        var iterators = this.iterators;
-        var len = iterators.length;
-        this.unsubscribe();
-        if (len === 0) {
-            this.destination.complete();
-            return;
-        }
-        this.active = len;
-        for (var i = 0; i < len; i++) {
-            var iterator = iterators[i];
-            if (iterator.stillUnsubscribed) {
-                var destination = this.destination;
-                destination.add(iterator.subscribe(iterator, i));
-            }
-            else {
-                this.active--;
-            }
-        }
-    };
-    ZipSubscriber.prototype.notifyInactive = function () {
-        this.active--;
-        if (this.active === 0) {
-            this.destination.complete();
-        }
-    };
-    ZipSubscriber.prototype.checkIterators = function () {
-        var iterators = this.iterators;
-        var len = iterators.length;
-        var destination = this.destination;
-        for (var i = 0; i < len; i++) {
-            var iterator = iterators[i];
-            if (typeof iterator.hasValue === 'function' && !iterator.hasValue()) {
-                return;
-            }
-        }
-        var shouldComplete = false;
-        var args = [];
-        for (var i = 0; i < len; i++) {
-            var iterator = iterators[i];
-            var result = iterator.next();
-            if (iterator.hasCompleted()) {
-                shouldComplete = true;
-            }
-            if (result.done) {
-                destination.complete();
-                return;
-            }
-            args.push(result.value);
-        }
-        if (this.resultSelector) {
-            this._tryresultSelector(args);
-        }
-        else {
-            destination.next(args);
-        }
-        if (shouldComplete) {
-            destination.complete();
-        }
-    };
-    ZipSubscriber.prototype._tryresultSelector = function (args) {
-        var result;
-        try {
-            result = this.resultSelector.apply(this, args);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
-    };
-    return ZipSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"]));
 
-var StaticIterator = /*@__PURE__*/ (function () {
-    function StaticIterator(iterator) {
-        this.iterator = iterator;
-        this.nextResult = iterator.next();
-    }
-    StaticIterator.prototype.hasValue = function () {
-        return true;
-    };
-    StaticIterator.prototype.next = function () {
-        var result = this.nextResult;
-        this.nextResult = this.iterator.next();
-        return result;
-    };
-    StaticIterator.prototype.hasCompleted = function () {
-        var nextResult = this.nextResult;
-        return nextResult && nextResult.done;
-    };
-    return StaticIterator;
-}());
-var StaticArrayIterator = /*@__PURE__*/ (function () {
-    function StaticArrayIterator(array) {
-        this.array = array;
-        this.index = 0;
-        this.length = 0;
-        this.length = array.length;
-    }
-    StaticArrayIterator.prototype[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] = function () {
-        return this;
-    };
-    StaticArrayIterator.prototype.next = function (value) {
-        var i = this.index++;
-        var array = this.array;
-        return i < this.length ? { value: array[i], done: false } : { value: null, done: true };
-    };
-    StaticArrayIterator.prototype.hasValue = function () {
-        return this.array.length > this.index;
-    };
-    StaticArrayIterator.prototype.hasCompleted = function () {
-        return this.array.length === this.index;
-    };
-    return StaticArrayIterator;
-}());
-var ZipBufferIterator = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ZipBufferIterator, _super);
-    function ZipBufferIterator(destination, parent, observable) {
-        var _this = _super.call(this, destination) || this;
-        _this.parent = parent;
-        _this.observable = observable;
-        _this.stillUnsubscribed = true;
-        _this.buffer = [];
-        _this.isComplete = false;
-        return _this;
-    }
-    ZipBufferIterator.prototype[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] = function () {
-        return this;
-    };
-    ZipBufferIterator.prototype.next = function () {
-        var buffer = this.buffer;
-        if (buffer.length === 0 && this.isComplete) {
-            return { value: null, done: true };
-        }
-        else {
-            return { value: buffer.shift(), done: false };
-        }
-    };
-    ZipBufferIterator.prototype.hasValue = function () {
-        return this.buffer.length > 0;
-    };
-    ZipBufferIterator.prototype.hasCompleted = function () {
-        return this.buffer.length === 0 && this.isComplete;
-    };
-    ZipBufferIterator.prototype.notifyComplete = function () {
-        if (this.buffer.length > 0) {
-            this.isComplete = true;
-            this.parent.notifyInactive();
-        }
-        else {
-            this.destination.complete();
-        }
-    };
-    ZipBufferIterator.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.buffer.push(innerValue);
-        this.parent.checkIterators();
-    };
-    ZipBufferIterator.prototype.subscribe = function (value, index) {
-        return Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, this.observable, this, index);
-    };
-    return ZipBufferIterator;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"]));
-//# sourceMappingURL=zip.js.map
+    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;
 
-/***/ }),
-/* 377 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      } else {
+        state.output += nodot;
+        prev.output += nodot;
+      }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* 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"]; });
+      if (peek() !== '*') {
+        state.output += ONE_CHAR;
+        prev.output += ONE_CHAR;
+      }
+    }
 
-/* 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"]; });
+    push(token);
+  }
 
-/* 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"]; });
+  while (state.brackets > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ']'));
+    state.output = utils.escapeLast(state.output, '[');
+    decrement('brackets');
+  }
 
-/* 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"]; });
+  while (state.parens > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', ')'));
+    state.output = utils.escapeLast(state.output, '(');
+    decrement('parens');
+  }
 
-/* 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"]; });
+  while (state.braces > 0) {
+    if (opts.strictBrackets === true) throw new SyntaxError(syntaxError('closing', '}'));
+    state.output = utils.escapeLast(state.output, '{');
+    decrement('braces');
+  }
 
-/* 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"]; });
+  if (opts.strictSlashes !== true && (prev.type === 'star' || prev.type === 'bracket')) {
+    push({ type: 'maybe_slash', value: '', output: `${SLASH_LITERAL}?` });
+  }
 
-/* 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"]; });
+  // rebuild the output if we had to backtrack at any point
+  if (state.backtrack === true) {
+    state.output = '';
 
-/* 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"]; });
+    for (let token of state.tokens) {
+      state.output += token.output != null ? token.output : token.value;
 
-/* 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"]; });
+      if (token.suffix) {
+        state.output += token.suffix;
+      }
+    }
+  }
 
-/* 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"]; });
+  return state;
+};
 
-/* 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"]; });
+/**
+ * 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.
+ */
 
-/* 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"]; });
+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}`);
+  }
 
-/* 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"]; });
+  input = REPLACEMENTS[input] || input;
+  let win32 = utils.isWindows(options);
 
-/* 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"]; });
+  // 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);
 
-/* 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"]; });
+  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;
 
-/* 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"]; });
+  if (opts.capture) {
+    star = `(${star})`;
+  }
 
-/* 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"]; });
+  const globstar = (opts) => {
+    return `(${capture}(?:(?!${START_ANCHOR}${opts.dot ? DOTS_SLASH : DOT_LITERAL}).)*?)`;
+  };
 
-/* 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"]; });
+  const create = str => {
+    switch (str) {
+      case '*':
+        return `${nodot}${ONE_CHAR}${star}`;
 
-/* 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"]; });
+      case '.*':
+        return `${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-/* 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"]; });
+      case '*.*':
+        return `${nodot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-/* 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"]; });
+      case '*/*':
+        return `${nodot}${star}${SLASH_LITERAL}${ONE_CHAR}${slashDot}${star}`;
 
-/* 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"]; });
+      case '**':
+        return nodot + globstar(opts);
 
-/* 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"]; });
+      case '**/*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${ONE_CHAR}${star}`;
 
-/* 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"]; });
+      case '**/*.*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${slashDot}${star}${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-/* 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"]; });
+      case '**/.*':
+        return `(?:${nodot}${globstar(opts)}${SLASH_LITERAL})?${DOT_LITERAL}${ONE_CHAR}${star}`;
 
-/* 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"]; });
+      default: {
+        let match = /^(.*?)\.(\w+)$/.exec(str);
+        if (!match) return;
 
-/* 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"]; });
+        let source = create(match[1], options);
+        if (!source) return;
 
-/* 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"]; });
+        return source + DOT_LITERAL + match[2];
+      }
+    }
+  };
 
-/* 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"]; });
+  let output = create(input);
+  if (output && opts.strictSlashes !== true) {
+    output += `${SLASH_LITERAL}?`;
+  }
 
-/* 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"]; });
+  return output;
+};
 
-/* 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"]; });
+module.exports = parse;
 
-/* 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__(411);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__["find"]; });
+/***/ }),
+/* 620 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const merge2 = __webpack_require__(591);
+function merge(streams) {
+    const mergedStream = merge2(streams);
+    streams.forEach((stream) => {
+        stream.once('error', (err) => mergedStream.emit('error', err));
+    });
+    return mergedStream;
+}
+exports.merge = merge;
 
-/* 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__(298);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__["groupBy"]; });
+/***/ }),
+/* 621 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__(622);
+const provider_1 = __webpack_require__(649);
+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;
 
-/* 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__(416);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__["last"]; });
+/***/ }),
+/* 622 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__(27);
+const fsStat = __webpack_require__(623);
+const fsWalk = __webpack_require__(628);
+const reader_1 = __webpack_require__(648);
+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;
 
-/* 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__(419);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__["materialize"]; });
+/***/ }),
+/* 623 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async = __webpack_require__(624);
+const sync = __webpack_require__(625);
+const settings_1 = __webpack_require__(626);
+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);
+}
 
-/* 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__(348);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__["mergeAll"]; });
+/***/ }),
+/* 624 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"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);
+}
 
-/* 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__(424);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__["mergeMapTo"]; });
+/***/ }),
+/* 625 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"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;
 
-/* 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__(427);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__["multicast"]; });
+/***/ }),
+/* 626 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__(627);
+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;
 
-/* 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__(429);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__["pairwise"]; });
+/***/ }),
+/* 627 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"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;
 
-/* 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__(432);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__["publish"]; });
+/***/ }),
+/* 628 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_1 = __webpack_require__(629);
+const stream_1 = __webpack_require__(644);
+const sync_1 = __webpack_require__(645);
+const settings_1 = __webpack_require__(647);
+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);
+}
 
-/* 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__(435);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__["publishReplay"]; });
+/***/ }),
+/* 629 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_1 = __webpack_require__(630);
+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);
+}
 
-/* 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__(437);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__["repeat"]; });
+/***/ }),
+/* 630 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const events_1 = __webpack_require__(379);
+const fsScandir = __webpack_require__(631);
+const fastq = __webpack_require__(640);
+const common = __webpack_require__(642);
+const reader_1 = __webpack_require__(643);
+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;
 
-/* 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__(440);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__["retryWhen"]; });
+/***/ }),
+/* 631 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const async = __webpack_require__(632);
+const sync = __webpack_require__(637);
+const settings_1 = __webpack_require__(638);
+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);
+}
 
-/* 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__(442);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__["sampleTime"]; });
+/***/ }),
+/* 632 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__(623);
+const rpl = __webpack_require__(633);
+const constants_1 = __webpack_require__(634);
+const utils = __webpack_require__(635);
+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);
+}
 
-/* 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__(444);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__["share"]; });
+/***/ }),
+/* 633 */
+/***/ (function(module, exports) {
 
-/* 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"]; });
+module.exports = runParallel
 
-/* 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"]; });
+function runParallel (tasks, cb) {
+  var results, pending, keys
+  var isSync = true
 
-/* 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"]; });
+  if (Array.isArray(tasks)) {
+    results = []
+    pending = tasks.length
+  } else {
+    keys = Object.keys(tasks)
+    results = {}
+    pending = keys.length
+  }
 
-/* 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"]; });
+  function done (err) {
+    function end () {
+      if (cb) cb(err, results)
+      cb = null
+    }
+    if (isSync) process.nextTick(end)
+    else end()
+  }
 
-/* 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"]; });
+  function each (i, err, result) {
+    results[i] = result
+    if (--pending === 0 || err) {
+      done(err)
+    }
+  }
 
-/* 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"]; });
+  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) })
+    })
+  }
 
-/* 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"]; });
+  isSync = false
+}
 
-/* 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__(454);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__["switchAll"]; });
+/***/ }),
+/* 634 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"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);
 
-/* 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__(404);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__["take"]; });
+/***/ }),
+/* 635 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __webpack_require__(636);
+exports.fs = fs;
 
-/* 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__(458);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__["takeWhile"]; });
+/***/ }),
+/* 636 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"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;
 
-/* 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__(461);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__["throttleTime"]; });
+/***/ }),
+/* 637 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__(623);
+const constants_1 = __webpack_require__(634);
+const utils = __webpack_require__(635);
+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;
 
-/* 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__(463);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__["timeout"]; });
+/***/ }),
+/* 638 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(16);
+const fsStat = __webpack_require__(623);
+const fs = __webpack_require__(639);
+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;
 
-/* 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__(466);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__["toArray"]; });
+/***/ }),
+/* 639 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"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;
 
-/* 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__(469);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__["windowTime"]; });
+/***/ }),
+/* 640 */
+/***/ (function(module, exports, __webpack_require__) {
 
-/* 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"]; });
+"use strict";
 
-/* 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__(472);
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__["withLatestFrom"]; });
+var reusify = __webpack_require__(641)
 
-/* 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"]; });
+function fastqueue (context, worker, concurrency) {
+  if (typeof context === 'function') {
+    concurrency = worker
+    worker = context
+    context = null
+  }
 
-/* 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"]; });
+  var cache = reusify(Task)
+  var queueHead = null
+  var queueTail = null
+  var _running = 0
 
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
+  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
 
 
+/***/ }),
+/* 641 */
+/***/ (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
 
 
+/***/ }),
+/* 642 */
+/***/ (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;
 
 
+/***/ }),
+/* 643 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const common = __webpack_require__(642);
+class Reader {
+    constructor(_root, _settings) {
+        this._root = _root;
+        this._settings = _settings;
+        this._root = common.replacePathSegmentSeparator(_root, _settings.pathSegmentSeparator);
+    }
+}
+exports.default = Reader;
 
 
+/***/ }),
+/* 644 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__(27);
+const async_1 = __webpack_require__(630);
+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;
 
 
+/***/ }),
+/* 645 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync_1 = __webpack_require__(646);
+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;
 
 
+/***/ }),
+/* 646 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsScandir = __webpack_require__(631);
+const common = __webpack_require__(642);
+const reader_1 = __webpack_require__(643);
+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;
 
 
+/***/ }),
+/* 647 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(16);
+const fsScandir = __webpack_require__(631);
+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;
 
 
+/***/ }),
+/* 648 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(16);
+const fsStat = __webpack_require__(623);
+const utils = __webpack_require__(594);
+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;
 
 
+/***/ }),
+/* 649 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __webpack_require__(16);
+const deep_1 = __webpack_require__(650);
+const entry_1 = __webpack_require__(651);
+const error_1 = __webpack_require__(652);
+const entry_2 = __webpack_require__(653);
+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;
 
 
+/***/ }),
+/* 650 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__(594);
+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;
 
 
+/***/ }),
+/* 651 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__(594);
+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;
 
 
+/***/ }),
+/* 652 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__(594);
+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;
 
 
+/***/ }),
+/* 653 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils = __webpack_require__(594);
+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;
 
 
+/***/ }),
+/* 654 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const stream_1 = __webpack_require__(27);
+const stream_2 = __webpack_require__(622);
+const provider_1 = __webpack_require__(649);
+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;
 
 
+/***/ }),
+/* 655 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const sync_1 = __webpack_require__(656);
+const provider_1 = __webpack_require__(649);
+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;
 
 
+/***/ }),
+/* 656 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const fsStat = __webpack_require__(623);
+const fsWalk = __webpack_require__(628);
+const reader_1 = __webpack_require__(648);
+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;
 
 
+/***/ }),
+/* 657 */
+/***/ (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;
 
 
+/***/ }),
+/* 658 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
+const path = __webpack_require__(16);
+const pathType = __webpack_require__(659);
 
+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);
 
-//# sourceMappingURL=index.js.map
+	return [].concat.apply([], globs); // eslint-disable-line prefer-spread
+};
 
 
 /***/ }),
-/* 378 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 659 */
+/***/ (function(module, 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__(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 */
-
-
-
-function audit(durationSelector) {
-    return function auditOperatorFunction(source) {
-        return source.lift(new AuditOperator(durationSelector));
-    };
-}
-var AuditOperator = /*@__PURE__*/ (function () {
-    function AuditOperator(durationSelector) {
-        this.durationSelector = durationSelector;
-    }
-    AuditOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new AuditSubscriber(subscriber, this.durationSelector));
-    };
-    return AuditOperator;
-}());
-var AuditSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AuditSubscriber, _super);
-    function AuditSubscriber(destination, durationSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.durationSelector = durationSelector;
-        _this.hasValue = false;
-        return _this;
-    }
-    AuditSubscriber.prototype._next = function (value) {
-        this.value = value;
-        this.hasValue = true;
-        if (!this.throttled) {
-            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 {
-                this.add(this.throttled = innerSubscription);
-            }
-        }
-    };
-    AuditSubscriber.prototype.clearThrottle = function () {
-        var _a = this, value = _a.value, hasValue = _a.hasValue, throttled = _a.throttled;
-        if (throttled) {
-            this.remove(throttled);
-            this.throttled = null;
-            throttled.unsubscribe();
-        }
-        if (hasValue) {
-            this.value = null;
-            this.hasValue = false;
-            this.destination.next(value);
-        }
-    };
-    AuditSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex) {
-        this.clearThrottle();
-    };
-    AuditSubscriber.prototype.notifyComplete = function () {
-        this.clearThrottle();
-    };
-    return AuditSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=audit.js.map
 
+const {promisify} = __webpack_require__(29);
+const fs = __webpack_require__(23);
 
-/***/ }),
-/* 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__(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 */
-
+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;
+		}
 
-function auditTime(duration, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
-    }
-    return Object(_audit__WEBPACK_IMPORTED_MODULE_1__["audit"])(function () { return Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__["timer"])(duration, scheduler); });
+		throw error;
+	}
 }
-//# sourceMappingURL=auditTime.js.map
-
-
-/***/ }),
-/* 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__(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 */
 
+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;
+		}
 
-function buffer(closingNotifier) {
-    return function bufferOperatorFunction(source) {
-        return source.lift(new BufferOperator(closingNotifier));
-    };
+		throw error;
+	}
 }
-var BufferOperator = /*@__PURE__*/ (function () {
-    function BufferOperator(closingNotifier) {
-        this.closingNotifier = closingNotifier;
-    }
-    BufferOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferSubscriber(subscriber, this.closingNotifier));
-    };
-    return BufferOperator;
-}());
-var BufferSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferSubscriber, _super);
-    function BufferSubscriber(destination, closingNotifier) {
-        var _this = _super.call(this, destination) || this;
-        _this.buffer = [];
-        _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, closingNotifier));
-        return _this;
-    }
-    BufferSubscriber.prototype._next = function (value) {
-        this.buffer.push(value);
-    };
-    BufferSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        var buffer = this.buffer;
-        this.buffer = [];
-        this.destination.next(buffer);
-    };
-    return BufferSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=buffer.js.map
-
-
-/***/ }),
-/* 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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
-
-function bufferCount(bufferSize, startBufferEvery) {
-    if (startBufferEvery === void 0) {
-        startBufferEvery = null;
-    }
-    return function bufferCountOperatorFunction(source) {
-        return source.lift(new BufferCountOperator(bufferSize, startBufferEvery));
-    };
-}
-var BufferCountOperator = /*@__PURE__*/ (function () {
-    function BufferCountOperator(bufferSize, startBufferEvery) {
-        this.bufferSize = bufferSize;
-        this.startBufferEvery = startBufferEvery;
-        if (!startBufferEvery || bufferSize === startBufferEvery) {
-            this.subscriberClass = BufferCountSubscriber;
-        }
-        else {
-            this.subscriberClass = BufferSkipCountSubscriber;
-        }
-    }
-    BufferCountOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new this.subscriberClass(subscriber, this.bufferSize, this.startBufferEvery));
-    };
-    return BufferCountOperator;
-}());
-var BufferCountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferCountSubscriber, _super);
-    function BufferCountSubscriber(destination, bufferSize) {
-        var _this = _super.call(this, destination) || this;
-        _this.bufferSize = bufferSize;
-        _this.buffer = [];
-        return _this;
-    }
-    BufferCountSubscriber.prototype._next = function (value) {
-        var buffer = this.buffer;
-        buffer.push(value);
-        if (buffer.length == this.bufferSize) {
-            this.destination.next(buffer);
-            this.buffer = [];
-        }
-    };
-    BufferCountSubscriber.prototype._complete = function () {
-        var buffer = this.buffer;
-        if (buffer.length > 0) {
-            this.destination.next(buffer);
-        }
-        _super.prototype._complete.call(this);
-    };
-    return BufferCountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferSkipCountSubscriber, _super);
-    function BufferSkipCountSubscriber(destination, bufferSize, startBufferEvery) {
-        var _this = _super.call(this, destination) || this;
-        _this.bufferSize = bufferSize;
-        _this.startBufferEvery = startBufferEvery;
-        _this.buffers = [];
-        _this.count = 0;
-        return _this;
-    }
-    BufferSkipCountSubscriber.prototype._next = function (value) {
-        var _a = this, bufferSize = _a.bufferSize, startBufferEvery = _a.startBufferEvery, buffers = _a.buffers, count = _a.count;
-        this.count++;
-        if (count % startBufferEvery === 0) {
-            buffers.push([]);
-        }
-        for (var i = buffers.length; i--;) {
-            var buffer = buffers[i];
-            buffer.push(value);
-            if (buffer.length === bufferSize) {
-                buffers.splice(i, 1);
-                this.destination.next(buffer);
-            }
-        }
-    };
-    BufferSkipCountSubscriber.prototype._complete = function () {
-        var _a = this, buffers = _a.buffers, destination = _a.destination;
-        while (buffers.length > 0) {
-            var buffer = buffers.shift();
-            if (buffer.length > 0) {
-                destination.next(buffer);
-            }
-        }
-        _super.prototype._complete.call(this);
-    };
-    return BufferSkipCountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=bufferCount.js.map
+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');
 
 
 /***/ }),
-/* 382 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 660 */
+/***/ (function(module, 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__(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 */
-
 
+const {promisify} = __webpack_require__(29);
+const fs = __webpack_require__(23);
+const path = __webpack_require__(16);
+const fastGlob = __webpack_require__(592);
+const gitIgnore = __webpack_require__(661);
+const slash = __webpack_require__(662);
 
+const DEFAULT_IGNORE = [
+	'**/node_modules/**',
+	'**/flow-typed/**',
+	'**/coverage/**',
+	'**/.git'
+];
 
-function bufferTime(bufferTimeSpan) {
-    var length = arguments.length;
-    var scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(arguments[arguments.length - 1])) {
-        scheduler = arguments[arguments.length - 1];
-        length--;
-    }
-    var bufferCreationInterval = null;
-    if (length >= 2) {
-        bufferCreationInterval = arguments[1];
-    }
-    var maxBufferSize = Number.POSITIVE_INFINITY;
-    if (length >= 3) {
-        maxBufferSize = arguments[2];
-    }
-    return function bufferTimeOperatorFunction(source) {
-        return source.lift(new BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler));
-    };
-}
-var BufferTimeOperator = /*@__PURE__*/ (function () {
-    function BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) {
-        this.bufferTimeSpan = bufferTimeSpan;
-        this.bufferCreationInterval = bufferCreationInterval;
-        this.maxBufferSize = maxBufferSize;
-        this.scheduler = scheduler;
-    }
-    BufferTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferTimeSubscriber(subscriber, this.bufferTimeSpan, this.bufferCreationInterval, this.maxBufferSize, this.scheduler));
-    };
-    return BufferTimeOperator;
-}());
-var Context = /*@__PURE__*/ (function () {
-    function Context() {
-        this.buffer = [];
-    }
-    return Context;
-}());
-var BufferTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferTimeSubscriber, _super);
-    function BufferTimeSubscriber(destination, bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.bufferTimeSpan = bufferTimeSpan;
-        _this.bufferCreationInterval = bufferCreationInterval;
-        _this.maxBufferSize = maxBufferSize;
-        _this.scheduler = scheduler;
-        _this.contexts = [];
-        var context = _this.openContext();
-        _this.timespanOnly = bufferCreationInterval == null || bufferCreationInterval < 0;
-        if (_this.timespanOnly) {
-            var timeSpanOnlyState = { subscriber: _this, context: context, bufferTimeSpan: bufferTimeSpan };
-            _this.add(context.closeAction = scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState));
-        }
-        else {
-            var closeState = { subscriber: _this, context: context };
-            var creationState = { bufferTimeSpan: bufferTimeSpan, bufferCreationInterval: bufferCreationInterval, subscriber: _this, scheduler: scheduler };
-            _this.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, closeState));
-            _this.add(scheduler.schedule(dispatchBufferCreation, bufferCreationInterval, creationState));
-        }
-        return _this;
-    }
-    BufferTimeSubscriber.prototype._next = function (value) {
-        var contexts = this.contexts;
-        var len = contexts.length;
-        var filledBufferContext;
-        for (var i = 0; i < len; i++) {
-            var context_1 = contexts[i];
-            var buffer = context_1.buffer;
-            buffer.push(value);
-            if (buffer.length == this.maxBufferSize) {
-                filledBufferContext = context_1;
-            }
-        }
-        if (filledBufferContext) {
-            this.onBufferFull(filledBufferContext);
-        }
-    };
-    BufferTimeSubscriber.prototype._error = function (err) {
-        this.contexts.length = 0;
-        _super.prototype._error.call(this, err);
-    };
-    BufferTimeSubscriber.prototype._complete = function () {
-        var _a = this, contexts = _a.contexts, destination = _a.destination;
-        while (contexts.length > 0) {
-            var context_2 = contexts.shift();
-            destination.next(context_2.buffer);
-        }
-        _super.prototype._complete.call(this);
-    };
-    BufferTimeSubscriber.prototype._unsubscribe = function () {
-        this.contexts = null;
-    };
-    BufferTimeSubscriber.prototype.onBufferFull = function (context) {
-        this.closeContext(context);
-        var closeAction = context.closeAction;
-        closeAction.unsubscribe();
-        this.remove(closeAction);
-        if (!this.closed && this.timespanOnly) {
-            context = this.openContext();
-            var bufferTimeSpan = this.bufferTimeSpan;
-            var timeSpanOnlyState = { subscriber: this, context: context, bufferTimeSpan: bufferTimeSpan };
-            this.add(context.closeAction = this.scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState));
-        }
-    };
-    BufferTimeSubscriber.prototype.openContext = function () {
-        var context = new Context();
-        this.contexts.push(context);
-        return context;
-    };
-    BufferTimeSubscriber.prototype.closeContext = function (context) {
-        this.destination.next(context.buffer);
-        var contexts = this.contexts;
-        var spliceIndex = contexts ? contexts.indexOf(context) : -1;
-        if (spliceIndex >= 0) {
-            contexts.splice(contexts.indexOf(context), 1);
-        }
-    };
-    return BufferTimeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"]));
-function dispatchBufferTimeSpanOnly(state) {
-    var subscriber = state.subscriber;
-    var prevContext = state.context;
-    if (prevContext) {
-        subscriber.closeContext(prevContext);
-    }
-    if (!subscriber.closed) {
-        state.context = subscriber.openContext();
-        state.context.closeAction = this.schedule(state, state.bufferTimeSpan);
-    }
-}
-function dispatchBufferCreation(state) {
-    var bufferCreationInterval = state.bufferCreationInterval, bufferTimeSpan = state.bufferTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler;
-    var context = subscriber.openContext();
-    var action = this;
-    if (!subscriber.closed) {
-        subscriber.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, { subscriber: subscriber, context: context }));
-        action.schedule(state, bufferCreationInterval);
-    }
-}
-function dispatchBufferClose(arg) {
-    var subscriber = arg.subscriber, context = arg.context;
-    subscriber.closeContext(context);
-}
-//# sourceMappingURL=bufferTime.js.map
-
-
-/***/ }),
-/* 383 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const readFileP = promisify(fs.readFile);
 
-"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__(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 */
+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));
+};
 
-function bufferToggle(openings, closingSelector) {
-    return function bufferToggleOperatorFunction(source) {
-        return source.lift(new BufferToggleOperator(openings, closingSelector));
-    };
-}
-var BufferToggleOperator = /*@__PURE__*/ (function () {
-    function BufferToggleOperator(openings, closingSelector) {
-        this.openings = openings;
-        this.closingSelector = closingSelector;
-    }
-    BufferToggleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferToggleSubscriber(subscriber, this.openings, this.closingSelector));
-    };
-    return BufferToggleOperator;
-}());
-var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferToggleSubscriber, _super);
-    function BufferToggleSubscriber(destination, openings, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.openings = openings;
-        _this.closingSelector = closingSelector;
-        _this.contexts = [];
-        _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, openings));
-        return _this;
-    }
-    BufferToggleSubscriber.prototype._next = function (value) {
-        var contexts = this.contexts;
-        var len = contexts.length;
-        for (var i = 0; i < len; i++) {
-            contexts[i].buffer.push(value);
-        }
-    };
-    BufferToggleSubscriber.prototype._error = function (err) {
-        var contexts = this.contexts;
-        while (contexts.length > 0) {
-            var context_1 = contexts.shift();
-            context_1.subscription.unsubscribe();
-            context_1.buffer = null;
-            context_1.subscription = null;
-        }
-        this.contexts = null;
-        _super.prototype._error.call(this, err);
-    };
-    BufferToggleSubscriber.prototype._complete = function () {
-        var contexts = this.contexts;
-        while (contexts.length > 0) {
-            var context_2 = contexts.shift();
-            this.destination.next(context_2.buffer);
-            context_2.subscription.unsubscribe();
-            context_2.buffer = null;
-            context_2.subscription = null;
-        }
-        this.contexts = null;
-        _super.prototype._complete.call(this);
-    };
-    BufferToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        outerValue ? this.closeBuffer(outerValue) : this.openBuffer(innerValue);
-    };
-    BufferToggleSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.closeBuffer(innerSub.context);
-    };
-    BufferToggleSubscriber.prototype.openBuffer = function (value) {
-        try {
-            var closingSelector = this.closingSelector;
-            var closingNotifier = closingSelector.call(this, value);
-            if (closingNotifier) {
-                this.trySubscribe(closingNotifier);
-            }
-        }
-        catch (err) {
-            this._error(err);
-        }
-    };
-    BufferToggleSubscriber.prototype.closeBuffer = function (context) {
-        var contexts = this.contexts;
-        if (contexts && context) {
-            var buffer = context.buffer, subscription = context.subscription;
-            this.destination.next(buffer);
-            contexts.splice(contexts.indexOf(context), 1);
-            this.remove(subscription);
-            subscription.unsubscribe();
-        }
-    };
-    BufferToggleSubscriber.prototype.trySubscribe = function (closingNotifier) {
-        var contexts = this.contexts;
-        var buffer = [];
-        var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"]();
-        var context = { buffer: buffer, subscription: subscription };
-        contexts.push(context);
-        var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, closingNotifier, context);
-        if (!innerSubscription || innerSubscription.closed) {
-            this.closeBuffer(context);
-        }
-        else {
-            innerSubscription.context = context;
-            this.add(innerSubscription);
-            subscription.add(innerSubscription);
-        }
-    };
-    return BufferToggleSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
-//# sourceMappingURL=bufferToggle.js.map
+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;
+		}
 
-/***/ }),
-/* 384 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		throw new Error(`Path ${p} is not in cwd ${cwd}`);
+	}
 
-"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__(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 */
+	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
+	};
+};
 
-function bufferWhen(closingSelector) {
-    return function (source) {
-        return source.lift(new BufferWhenOperator(closingSelector));
-    };
-}
-var BufferWhenOperator = /*@__PURE__*/ (function () {
-    function BufferWhenOperator(closingSelector) {
-        this.closingSelector = closingSelector;
-    }
-    BufferWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new BufferWhenSubscriber(subscriber, this.closingSelector));
-    };
-    return BufferWhenOperator;
-}());
-var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferWhenSubscriber, _super);
-    function BufferWhenSubscriber(destination, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.closingSelector = closingSelector;
-        _this.subscribing = false;
-        _this.openBuffer();
-        return _this;
-    }
-    BufferWhenSubscriber.prototype._next = function (value) {
-        this.buffer.push(value);
-    };
-    BufferWhenSubscriber.prototype._complete = function () {
-        var buffer = this.buffer;
-        if (buffer) {
-            this.destination.next(buffer);
-        }
-        _super.prototype._complete.call(this);
-    };
-    BufferWhenSubscriber.prototype._unsubscribe = function () {
-        this.buffer = null;
-        this.subscribing = false;
-    };
-    BufferWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.openBuffer();
-    };
-    BufferWhenSubscriber.prototype.notifyComplete = function () {
-        if (this.subscribing) {
-            this.complete();
-        }
-        else {
-            this.openBuffer();
-        }
-    };
-    BufferWhenSubscriber.prototype.openBuffer = function () {
-        var closingSubscription = this.closingSubscription;
-        if (closingSubscription) {
-            this.remove(closingSubscription);
-            closingSubscription.unsubscribe();
-        }
-        var buffer = this.buffer;
-        if (this.buffer) {
-            this.destination.next(buffer);
-        }
-        this.buffer = [];
-        var closingNotifier;
-        try {
-            var closingSelector = this.closingSelector;
-            closingNotifier = closingSelector();
-        }
-        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_2__["OuterSubscriber"]));
-//# sourceMappingURL=bufferWhen.js.map
+const getFileSync = (file, cwd) => {
+	const filePath = path.join(cwd, file);
+	const content = fs.readFileSync(filePath, 'utf8');
 
+	return {
+		cwd,
+		filePath,
+		content
+	};
+};
 
-/***/ }),
-/* 385 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const normalizeOptions = ({
+	ignore = [],
+	cwd = process.cwd()
+} = {}) => {
+	return {ignore, cwd};
+};
 
-"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__(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 */
+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);
+};
 
-function catchError(selector) {
-    return function catchErrorOperatorFunction(source) {
-        var operator = new CatchOperator(selector);
-        var caught = source.lift(operator);
-        return (operator.caught = caught);
-    };
-}
-var CatchOperator = /*@__PURE__*/ (function () {
-    function CatchOperator(selector) {
-        this.selector = selector;
-    }
-    CatchOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new CatchSubscriber(subscriber, this.selector, this.caught));
-    };
-    return CatchOperator;
-}());
-var CatchSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CatchSubscriber, _super);
-    function CatchSubscriber(destination, selector, caught) {
-        var _this = _super.call(this, destination) || this;
-        _this.selector = selector;
-        _this.caught = caught;
-        return _this;
-    }
-    CatchSubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var result = void 0;
-            try {
-                result = this.selector(err, this.caught);
-            }
-            catch (err2) {
-                _super.prototype.error.call(this, err2);
-                return;
-            }
-            this._unsubscribeAndRecycle();
-            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;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=catchError.js.map
+module.exports.sync = options => {
+	options = normalizeOptions(options);
 
+	const paths = fastGlob.sync('**/.gitignore', {
+		ignore: DEFAULT_IGNORE.concat(options.ignore),
+		cwd: options.cwd
+	});
 
-/***/ }),
-/* 386 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	const files = paths.map(file => getFileSync(file, options.cwd));
+	const ignores = reduceIgnore(files);
 
-"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__(335);
-/** PURE_IMPORTS_START _observable_combineLatest PURE_IMPORTS_END */
+	return getIsIgnoredPredecate(ignores, options.cwd);
+};
 
-function combineAll(project) {
-    return function (source) { return source.lift(new _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__["CombineLatestOperator"](project)); };
+
+/***/ }),
+/* 661 */
+/***/ (function(module, exports) {
+
+// A simple implementation of make-array
+function makeArray (subject) {
+  return Array.isArray(subject)
+    ? subject
+    : [subject]
 }
-//# sourceMappingURL=combineAll.js.map
 
+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'
 
-/***/ }),
-/* 387 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const define = (object, key, value) =>
+  Object.defineProperty(object, key, {value})
 
-"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__(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 */
+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 = [
 
-var none = {};
-function combineLatest() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    var project = null;
-    if (typeof observables[observables.length - 1] === 'function') {
-        project = observables.pop();
-    }
-    if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(observables[0])) {
-        observables = observables[0].slice();
-    }
-    return function (source) { return source.lift.call(Object(_observable_from__WEBPACK_IMPORTED_MODULE_2__["from"])([source].concat(observables)), new _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__["CombineLatestOperator"](project)); };
-}
-//# sourceMappingURL=combineLatest.js.map
+  // > 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,
+    () => ' '
+  ],
 
-/***/ }),
-/* 388 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // Escape metacharacters
+  // which is written down by users but means special for regular expressions.
 
-"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__(346);
-/** PURE_IMPORTS_START _observable_concat PURE_IMPORTS_END */
+  // > 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
+        ? '(?:^|\\/)'
 
-function concat() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
+        // > Otherwise, Git treats the pattern as a shell glob suitable for
+        // >   consumption by fnmatch(3)
+        : '^'
     }
-    return function (source) { return source.lift.call(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"].apply(void 0, [source].concat(observables))); };
-}
-//# sourceMappingURL=concat.js.map
+  ],
 
+  // two globstars
+  [
+    // Use lookahead assertions so that we could match more than one `'/**'`
+    /\\\/\\\*\\\*(?=\\\/|$)/g,
 
-/***/ }),
-/* 389 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    // Zero, one or several directories
+    // should not use '*', or it will be replaced by the next replacer
 
-"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__(349);
-/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
+    // Check if it is not the last `'/**'`
+    (_, index, str) => index + 6 < str.length
 
-function concatMap(project, resultSelector) {
-    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(project, resultSelector, 1);
-}
-//# sourceMappingURL=concatMap.js.map
+      // 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.
 
-/***/ }),
-/* 390 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      // #21: everything inside but it should not include the current folder
+      : '\\/.+'
+  ],
 
-"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__(389);
-/** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */
+  // intermediate wildcards
+  [
+    // Never replace escaped '*'
+    // ignore rule '\*' will match the path '*'
 
-function concatMapTo(innerObservable, resultSelector) {
-    return Object(_concatMap__WEBPACK_IMPORTED_MODULE_0__["concatMap"])(function () { return innerObservable; }, resultSelector);
-}
-//# sourceMappingURL=concatMapTo.js.map
+    // 'abc.*/' -> go
+    // 'abc.*'  -> skip this rule
+    /(^|[^\\]+)\\\*(?=.+)/g,
 
+    // '*.js' matches '.js'
+    // '*.js' doesn't match 'abc'
+    (_, p1) => `${p1}[^\\/]*`
+  ],
 
-/***/ }),
-/* 391 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // trailing wildcard
+  [
+    /(\^|\\\/)?\\\*$/,
+    (_, p1) => {
+      const prefix = p1
+        // '\^':
+        // '/*' does not match ''
+        // '/*' does not match everything
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+        // '\\\/':
+        // 'abc/*' does not match 'abc/'
+        ? `${p1}[^/]+`
 
+        // 'a*' matches 'a'
+        // 'a*' matches 'aa'
+        : '[^/]*'
 
-function count(predicate) {
-    return function (source) { return source.lift(new CountOperator(predicate, source)); };
-}
-var CountOperator = /*@__PURE__*/ (function () {
-    function CountOperator(predicate, source) {
-        this.predicate = predicate;
-        this.source = source;
-    }
-    CountOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new CountSubscriber(subscriber, this.predicate, this.source));
-    };
-    return CountOperator;
-}());
-var CountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CountSubscriber, _super);
-    function CountSubscriber(destination, predicate, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.source = source;
-        _this.count = 0;
-        _this.index = 0;
-        return _this;
+      return `${prefix}(?=$|\\/$)`
     }
-    CountSubscriber.prototype._next = function (value) {
-        if (this.predicate) {
-            this._tryPredicate(value);
-        }
-        else {
-            this.count++;
-        }
-    };
-    CountSubscriber.prototype._tryPredicate = function (value) {
-        var result;
-        try {
-            result = this.predicate(value, this.index++, this.source);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        if (result) {
-            this.count++;
-        }
-    };
-    CountSubscriber.prototype._complete = function () {
-        this.destination.next(this.count);
-        this.destination.complete();
-    };
-    return CountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=count.js.map
-
-
-/***/ }),
-/* 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__(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 */
+  [
+    // 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(/|$)
 
-function debounce(durationSelector) {
-    return function (source) { return source.lift(new DebounceOperator(durationSelector)); };
-}
-var DebounceOperator = /*@__PURE__*/ (function () {
-    function DebounceOperator(durationSelector) {
-        this.durationSelector = durationSelector;
-    }
-    DebounceOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DebounceSubscriber(subscriber, this.durationSelector));
-    };
-    return DebounceOperator;
-}());
-var DebounceSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DebounceSubscriber, _super);
-    function DebounceSubscriber(destination, durationSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.durationSelector = durationSelector;
-        _this.hasValue = false;
-        _this.durationSubscription = null;
-        return _this;
-    }
-    DebounceSubscriber.prototype._next = function (value) {
-        try {
-            var result = this.durationSelector.call(this, value);
-            if (result) {
-                this._tryNext(value, result);
-            }
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    DebounceSubscriber.prototype._complete = function () {
-        this.emitValue();
-        this.destination.complete();
-    };
-    DebounceSubscriber.prototype._tryNext = function (value, duration) {
-        var subscription = this.durationSubscription;
-        this.value = value;
-        this.hasValue = true;
-        if (subscription) {
-            subscription.unsubscribe();
-            this.remove(subscription);
-        }
-        subscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration);
-        if (subscription && !subscription.closed) {
-            this.add(this.durationSubscription = subscription);
-        }
-    };
-    DebounceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.emitValue();
-    };
-    DebounceSubscriber.prototype.notifyComplete = function () {
-        this.emitValue();
-    };
-    DebounceSubscriber.prototype.emitValue = function () {
-        if (this.hasValue) {
-            var value = this.value;
-            var subscription = this.durationSubscription;
-            if (subscription) {
-                this.durationSubscription = null;
-                subscription.unsubscribe();
-                this.remove(subscription);
-            }
-            this.value = null;
-            this.hasValue = false;
-            _super.prototype._next.call(this, value);
-        }
-    };
-    return DebounceSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=debounce.js.map
+  // 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}(?=$|\\/)`
+  ],
 
-/***/ }),
-/* 393 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  ...DEFAULT_REPLACER_SUFFIX
+]
 
-"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__(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 */
+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}(?=$|\\/$)`
+  ],
 
-function debounceTime(dueTime, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
-    }
-    return function (source) { return source.lift(new DebounceTimeOperator(dueTime, scheduler)); };
-}
-var DebounceTimeOperator = /*@__PURE__*/ (function () {
-    function DebounceTimeOperator(dueTime, scheduler) {
-        this.dueTime = dueTime;
-        this.scheduler = scheduler;
-    }
-    DebounceTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DebounceTimeSubscriber(subscriber, this.dueTime, this.scheduler));
-    };
-    return DebounceTimeOperator;
-}());
-var DebounceTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DebounceTimeSubscriber, _super);
-    function DebounceTimeSubscriber(destination, dueTime, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.dueTime = dueTime;
-        _this.scheduler = scheduler;
-        _this.debouncedSubscription = null;
-        _this.lastValue = null;
-        _this.hasValue = false;
-        return _this;
-    }
-    DebounceTimeSubscriber.prototype._next = function (value) {
-        this.clearDebounce();
-        this.lastValue = value;
-        this.hasValue = true;
-        this.add(this.debouncedSubscription = this.scheduler.schedule(dispatchNext, this.dueTime, this));
-    };
-    DebounceTimeSubscriber.prototype._complete = function () {
-        this.debouncedNext();
-        this.destination.complete();
-    };
-    DebounceTimeSubscriber.prototype.debouncedNext = function () {
-        this.clearDebounce();
-        if (this.hasValue) {
-            var lastValue = this.lastValue;
-            this.lastValue = null;
-            this.hasValue = false;
-            this.destination.next(lastValue);
-        }
-    };
-    DebounceTimeSubscriber.prototype.clearDebounce = function () {
-        var debouncedSubscription = this.debouncedSubscription;
-        if (debouncedSubscription !== null) {
-            this.remove(debouncedSubscription);
-            debouncedSubscription.unsubscribe();
-            this.debouncedSubscription = null;
-        }
-    };
-    return DebounceTimeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-function dispatchNext(subscriber) {
-    subscriber.debouncedNext();
-}
-//# sourceMappingURL=debounceTime.js.map
+  ...DEFAULT_REPLACER_SUFFIX
+]
 
+// A simple cache, because an ignore rule only has only one certain meaning
+const regexCache = Object.create(null)
 
-/***/ }),
-/* 394 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+// @param {pattern}
+const makeRegex = (pattern, negative, ignorecase) => {
+  const r = regexCache[pattern]
+  if (r) {
+    return r
+  }
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+  const replacers = negative
+    ? NEGATIVE_REPLACERS
+    : POSITIVE_REPLACERS
 
+  const source = replacers.reduce(
+    (prev, current) => prev.replace(current[0], current[1].bind(pattern)),
+    pattern
+  )
 
-function defaultIfEmpty(defaultValue) {
-    if (defaultValue === void 0) {
-        defaultValue = null;
-    }
-    return function (source) { return source.lift(new DefaultIfEmptyOperator(defaultValue)); };
+  return regexCache[pattern] = ignorecase
+    ? new RegExp(source, 'i')
+    : new RegExp(source)
 }
-var DefaultIfEmptyOperator = /*@__PURE__*/ (function () {
-    function DefaultIfEmptyOperator(defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-    DefaultIfEmptyOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DefaultIfEmptySubscriber(subscriber, this.defaultValue));
-    };
-    return DefaultIfEmptyOperator;
-}());
-var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DefaultIfEmptySubscriber, _super);
-    function DefaultIfEmptySubscriber(destination, defaultValue) {
-        var _this = _super.call(this, destination) || this;
-        _this.defaultValue = defaultValue;
-        _this.isEmpty = true;
-        return _this;
-    }
-    DefaultIfEmptySubscriber.prototype._next = function (value) {
-        this.isEmpty = false;
-        this.destination.next(value);
-    };
-    DefaultIfEmptySubscriber.prototype._complete = function () {
-        if (this.isEmpty) {
-            this.destination.next(this.defaultValue);
-        }
-        this.destination.complete();
-    };
-    return DefaultIfEmptySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=defaultIfEmpty.js.map
-
 
-/***/ }),
-/* 395 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const isString = subject => typeof subject === 'string'
 
-"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__(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 */
+// > 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)
 
+  // > A line starting with # serves as a comment.
+  && pattern.indexOf('#') !== 0
 
+const splitPattern = pattern => pattern.split(REGEX_SPLITALL_CRLF)
 
+class IgnoreRule {
+  constructor (
+    origin,
+    pattern,
+    negative,
+    regex
+  ) {
+    this.origin = origin
+    this.pattern = pattern
+    this.negative = negative
+    this.regex = regex
+  }
+}
 
+const createRule = (pattern, ignorecase) => {
+  const origin = pattern
+  let negative = false
 
-function delay(delay, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    }
-    var absoluteDelay = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_2__["isDate"])(delay);
-    var delayFor = absoluteDelay ? (+delay - scheduler.now()) : Math.abs(delay);
-    return function (source) { return source.lift(new DelayOperator(delayFor, scheduler)); };
-}
-var DelayOperator = /*@__PURE__*/ (function () {
-    function DelayOperator(delay, scheduler) {
-        this.delay = delay;
-        this.scheduler = scheduler;
-    }
-    DelayOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DelaySubscriber(subscriber, this.delay, this.scheduler));
-    };
-    return DelayOperator;
-}());
-var DelaySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DelaySubscriber, _super);
-    function DelaySubscriber(destination, delay, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.delay = delay;
-        _this.scheduler = scheduler;
-        _this.queue = [];
-        _this.active = false;
-        _this.errored = false;
-        return _this;
-    }
-    DelaySubscriber.dispatch = function (state) {
-        var source = state.source;
-        var queue = source.queue;
-        var scheduler = state.scheduler;
-        var destination = state.destination;
-        while (queue.length > 0 && (queue[0].time - scheduler.now()) <= 0) {
-            queue.shift().notification.observe(destination);
-        }
-        if (queue.length > 0) {
-            var delay_1 = Math.max(0, queue[0].time - scheduler.now());
-            this.schedule(state, delay_1);
-        }
-        else {
-            this.unsubscribe();
-            source.active = false;
-        }
-    };
-    DelaySubscriber.prototype._schedule = function (scheduler) {
-        this.active = true;
-        var destination = this.destination;
-        destination.add(scheduler.schedule(DelaySubscriber.dispatch, this.delay, {
-            source: this, destination: this.destination, scheduler: scheduler
-        }));
-    };
-    DelaySubscriber.prototype.scheduleNotification = function (notification) {
-        if (this.errored === true) {
-            return;
-        }
-        var scheduler = this.scheduler;
-        var message = new DelayMessage(scheduler.now() + this.delay, notification);
-        this.queue.push(message);
-        if (this.active === false) {
-            this._schedule(scheduler);
-        }
-    };
-    DelaySubscriber.prototype._next = function (value) {
-        this.scheduleNotification(_Notification__WEBPACK_IMPORTED_MODULE_4__["Notification"].createNext(value));
-    };
-    DelaySubscriber.prototype._error = function (err) {
-        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"]));
-var DelayMessage = /*@__PURE__*/ (function () {
-    function DelayMessage(time, notification) {
-        this.time = time;
-        this.notification = notification;
-    }
-    return DelayMessage;
-}());
-//# sourceMappingURL=delay.js.map
+  // > 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, '#')
 
-/***/ }),
-/* 396 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  const regex = makeRegex(pattern, negative, ignorecase)
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isDate", function() { return isDate; });
-/** PURE_IMPORTS_START  PURE_IMPORTS_END */
-function isDate(value) {
-    return value instanceof Date && !isNaN(+value);
+  return new IgnoreRule(
+    origin,
+    pattern,
+    negative,
+    regex
+  )
 }
-//# sourceMappingURL=isDate.js.map
 
+const throwError = (message, Ctor) => {
+  throw new Ctor(message)
+}
 
-/***/ }),
-/* 397 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const checkPath = (path, originalPath, doThrow) => {
+  if (!isString(path)) {
+    return doThrow(
+      `path must be a string, but got \`${originalPath}\``,
+      TypeError
+    )
+  }
 
-"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__(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 */
+  // We don't know if we should ignore '', so throw
+  if (!path) {
+    return doThrow(`path must not be empty`, TypeError)
+  }
 
+  // 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 true
+}
 
+const isNotRelative = path => REGEX_TEST_INVALID_PATH.test(path)
 
+checkPath.isNotRelative = isNotRelative
+checkPath.convert = p => p
 
-function delayWhen(delayDurationSelector, subscriptionDelay) {
-    if (subscriptionDelay) {
-        return function (source) {
-            return new SubscriptionDelayObservable(source, subscriptionDelay)
-                .lift(new DelayWhenOperator(delayDurationSelector));
-        };
-    }
-    return function (source) { return source.lift(new DelayWhenOperator(delayDurationSelector)); };
-}
-var DelayWhenOperator = /*@__PURE__*/ (function () {
-    function DelayWhenOperator(delayDurationSelector) {
-        this.delayDurationSelector = delayDurationSelector;
+class Ignore {
+  constructor ({
+    ignorecase = true
+  } = {}) {
+    this._rules = []
+    this._ignorecase = ignorecase
+    define(this, KEY_IGNORE, true)
+    this._initCache()
+  }
+
+  _initCache () {
+    this._ignoreCache = Object.create(null)
+    this._testCache = Object.create(null)
+  }
+
+  _addPattern (pattern) {
+    // #32
+    if (pattern && pattern[KEY_IGNORE]) {
+      this._rules = this._rules.concat(pattern._rules)
+      this._added = true
+      return
     }
-    DelayWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DelayWhenSubscriber(subscriber, this.delayDurationSelector));
-    };
-    return DelayWhenOperator;
-}());
-var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DelayWhenSubscriber, _super);
-    function DelayWhenSubscriber(destination, delayDurationSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.delayDurationSelector = delayDurationSelector;
-        _this.completed = false;
-        _this.delayNotifierSubscriptions = [];
-        _this.index = 0;
-        return _this;
+
+    if (checkPattern(pattern)) {
+      const rule = createRule(pattern, this._ignorecase)
+      this._added = true
+      this._rules.push(rule)
     }
-    DelayWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.destination.next(outerValue);
-        this.removeSubscription(innerSub);
-        this.tryComplete();
-    };
-    DelayWhenSubscriber.prototype.notifyError = function (error, innerSub) {
-        this._error(error);
-    };
-    DelayWhenSubscriber.prototype.notifyComplete = function (innerSub) {
-        var value = this.removeSubscription(innerSub);
-        if (value) {
-            this.destination.next(value);
-        }
-        this.tryComplete();
-    };
-    DelayWhenSubscriber.prototype._next = function (value) {
-        var index = this.index++;
-        try {
-            var delayNotifier = this.delayDurationSelector(value, index);
-            if (delayNotifier) {
-                this.tryDelay(delayNotifier, value);
-            }
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    DelayWhenSubscriber.prototype._complete = function () {
-        this.completed = true;
-        this.tryComplete();
-        this.unsubscribe();
-    };
-    DelayWhenSubscriber.prototype.removeSubscription = function (subscription) {
-        subscription.unsubscribe();
-        var subscriptionIdx = this.delayNotifierSubscriptions.indexOf(subscription);
-        if (subscriptionIdx !== -1) {
-            this.delayNotifierSubscriptions.splice(subscriptionIdx, 1);
-        }
-        return subscription.outerValue;
-    };
-    DelayWhenSubscriber.prototype.tryDelay = function (delayNotifier, value) {
-        var notifierSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, delayNotifier, value);
-        if (notifierSubscription && !notifierSubscription.closed) {
-            var destination = this.destination;
-            destination.add(notifierSubscription);
-            this.delayNotifierSubscriptions.push(notifierSubscription);
-        }
-    };
-    DelayWhenSubscriber.prototype.tryComplete = function () {
-        if (this.completed && this.delayNotifierSubscriptions.length === 0) {
-            this.destination.complete();
-        }
-    };
-    return DelayWhenSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
-var SubscriptionDelayObservable = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscriptionDelayObservable, _super);
-    function SubscriptionDelayObservable(source, subscriptionDelay) {
-        var _this = _super.call(this) || this;
-        _this.source = source;
-        _this.subscriptionDelay = subscriptionDelay;
-        return _this;
+  }
+
+  // @param {Array<string> | string | Ignore} pattern
+  add (pattern) {
+    this._added = false
+
+    makeArray(
+      isString(pattern)
+        ? splitPattern(pattern)
+        : pattern
+    ).forEach(this._addPattern, this)
+
+    // Some rules have just added to the ignore,
+    // making the behavior changed.
+    if (this._added) {
+      this._initCache()
     }
-    SubscriptionDelayObservable.prototype._subscribe = function (subscriber) {
-        this.subscriptionDelay.subscribe(new SubscriptionDelaySubscriber(subscriber, this.source));
-    };
-    return SubscriptionDelayObservable;
-}(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]));
-var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscriptionDelaySubscriber, _super);
-    function SubscriptionDelaySubscriber(parent, source) {
-        var _this = _super.call(this) || this;
-        _this.parent = parent;
-        _this.source = source;
-        _this.sourceSubscribed = false;
-        return _this;
+
+    return this
+  }
+
+  // legacy
+  addPattern (pattern) {
+    return this.add(pattern)
+  }
+
+  //          |           ignored : unignored
+  // negative |   0:0   |   0:1   |   1:0   |   1:1
+  // -------- | ------- | ------- | ------- | --------
+  //     0    |  TEST   |  TEST   |  SKIP   |    X
+  //     1    |  TESTIF |  SKIP   |  TEST   |    X
+
+  // - SKIP: always skip
+  // - TEST: always test
+  // - TESTIF: only test if checkUnignored
+  // - X: that never happen
+
+  // @param {boolean} whether should check if the path is unignored,
+  //   setting `checkUnignored` to `false` could reduce additional
+  //   path matching.
+
+  // @returns {TestResult} true if a file is ignored
+  _testOne (path, checkUnignored) {
+    let ignored = false
+    let unignored = false
+
+    this._rules.forEach(rule => {
+      const {negative} = rule
+      if (
+        unignored === negative && ignored !== unignored
+        || negative && !ignored && !unignored && !checkUnignored
+      ) {
+        return
+      }
+
+      const matched = rule.regex.test(path)
+
+      if (matched) {
+        ignored = !negative
+        unignored = negative
+      }
+    })
+
+    return {
+      ignored,
+      unignored
     }
-    SubscriptionDelaySubscriber.prototype._next = function (unused) {
-        this.subscribeToSource();
-    };
-    SubscriptionDelaySubscriber.prototype._error = function (err) {
-        this.unsubscribe();
-        this.parent.error(err);
-    };
-    SubscriptionDelaySubscriber.prototype._complete = function () {
-        this.unsubscribe();
-        this.subscribeToSource();
-    };
-    SubscriptionDelaySubscriber.prototype.subscribeToSource = function () {
-        if (!this.sourceSubscribed) {
-            this.sourceSubscribed = true;
-            this.unsubscribe();
-            this.source.subscribe(this.parent);
-        }
-    };
-    return SubscriptionDelaySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=delayWhen.js.map
+  }
 
+  // @returns {TestResult}
+  _test (originalPath, cache, checkUnignored, slices) {
+    const path = originalPath
+      // Supports nullable path
+      && checkPath.convert(originalPath)
 
-/***/ }),
-/* 398 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    checkPath(path, originalPath, throwError)
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+    return this._t(path, cache, checkUnignored, slices)
+  }
 
+  _t (path, cache, checkUnignored, slices) {
+    if (path in cache) {
+      return cache[path]
+    }
 
-function dematerialize() {
-    return function dematerializeOperatorFunction(source) {
-        return source.lift(new DeMaterializeOperator());
-    };
-}
-var DeMaterializeOperator = /*@__PURE__*/ (function () {
-    function DeMaterializeOperator() {
+    if (!slices) {
+      // path/to/a.js
+      // ['path', 'to', 'a.js']
+      slices = path.split(SLASH)
     }
-    DeMaterializeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DeMaterializeSubscriber(subscriber));
-    };
-    return DeMaterializeOperator;
-}());
-var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DeMaterializeSubscriber, _super);
-    function DeMaterializeSubscriber(destination) {
-        return _super.call(this, destination) || this;
+
+    slices.pop()
+
+    // If the path has no parent directory, just test it
+    if (!slices.length) {
+      return cache[path] = this._testOne(path, checkUnignored)
     }
-    DeMaterializeSubscriber.prototype._next = function (value) {
-        value.observe(this.destination);
-    };
-    return DeMaterializeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=dematerialize.js.map
 
+    const parent = this._t(
+      slices.join(SLASH) + SLASH,
+      cache,
+      checkUnignored,
+      slices
+    )
 
-/***/ }),
-/* 399 */
-/***/ (function(module, __webpack_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";
-__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__(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 */
+  ignores (path) {
+    return this._test(path, this._ignoreCache, false).ignored
+  }
 
+  createFilter () {
+    return path => !this.ignores(path)
+  }
 
+  filter (paths) {
+    return makeArray(paths).filter(this.createFilter())
+  }
 
-function distinct(keySelector, flushes) {
-    return function (source) { return source.lift(new DistinctOperator(keySelector, flushes)); };
+  // @returns {TestResult}
+  test (path) {
+    return this._test(path, this._testCache, true)
+  }
 }
-var DistinctOperator = /*@__PURE__*/ (function () {
-    function DistinctOperator(keySelector, flushes) {
-        this.keySelector = keySelector;
-        this.flushes = flushes;
-    }
-    DistinctOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DistinctSubscriber(subscriber, this.keySelector, this.flushes));
-    };
-    return DistinctOperator;
-}());
-var DistinctSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DistinctSubscriber, _super);
-    function DistinctSubscriber(destination, keySelector, flushes) {
-        var _this = _super.call(this, destination) || this;
-        _this.keySelector = keySelector;
-        _this.values = new Set();
-        if (flushes) {
-            _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, flushes));
-        }
-        return _this;
-    }
-    DistinctSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.values.clear();
-    };
-    DistinctSubscriber.prototype.notifyError = function (error, innerSub) {
-        this._error(error);
-    };
-    DistinctSubscriber.prototype._next = function (value) {
-        if (this.keySelector) {
-            this._useKeySelector(value);
-        }
-        else {
-            this._finalizeNext(value, value);
-        }
-    };
-    DistinctSubscriber.prototype._useKeySelector = function (value) {
-        var key;
-        var destination = this.destination;
-        try {
-            key = this.keySelector(value);
-        }
-        catch (err) {
-            destination.error(err);
-            return;
-        }
-        this._finalizeNext(key, value);
-    };
-    DistinctSubscriber.prototype._finalizeNext = function (key, value) {
-        var values = this.values;
-        if (!values.has(key)) {
-            values.add(key);
-            this.destination.next(value);
-        }
-    };
-    return DistinctSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
 
-//# sourceMappingURL=distinct.js.map
+const factory = options => new Ignore(options)
 
+const returnFalse = () => false
 
-/***/ }),
-/* 400 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const isPathValid = path =>
+  checkPath(path && checkPath.convert(path), path, returnFalse)
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+factory.isPathValid = isPathValid
 
+// Fixes typescript
+factory.default = factory
 
-function distinctUntilChanged(compare, keySelector) {
-    return function (source) { return source.lift(new DistinctUntilChangedOperator(compare, keySelector)); };
-}
-var DistinctUntilChangedOperator = /*@__PURE__*/ (function () {
-    function DistinctUntilChangedOperator(compare, keySelector) {
-        this.compare = compare;
-        this.keySelector = keySelector;
-    }
-    DistinctUntilChangedOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new DistinctUntilChangedSubscriber(subscriber, this.compare, this.keySelector));
-    };
-    return DistinctUntilChangedOperator;
-}());
-var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DistinctUntilChangedSubscriber, _super);
-    function DistinctUntilChangedSubscriber(destination, compare, keySelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.keySelector = keySelector;
-        _this.hasKey = false;
-        if (typeof compare === 'function') {
-            _this.compare = compare;
-        }
-        return _this;
-    }
-    DistinctUntilChangedSubscriber.prototype.compare = function (x, y) {
-        return x === y;
-    };
-    DistinctUntilChangedSubscriber.prototype._next = function (value) {
-        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) {
-            try {
-                var compare = this.compare;
-                result = compare(this.key, key);
-            }
-            catch (err) {
-                return this.destination.error(err);
-            }
-        }
-        else {
-            this.hasKey = true;
-        }
-        if (!result) {
-            this.key = key;
-            this.destination.next(value);
-        }
-    };
-    return DistinctUntilChangedSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=distinctUntilChanged.js.map
+module.exports = factory
+
+// 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, '/')
+
+  checkPath.convert = makePosix
+
+  // '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)
+}
 
 
 /***/ }),
-/* 401 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 662 */
+/***/ (function(module, 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__(400);
-/** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */
 
-function distinctUntilKeyChanged(key, compare) {
-    return Object(_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__["distinctUntilChanged"])(function (x, y) { return compare ? compare(x[key], y[key]) : x[key] === y[key]; });
-}
-//# sourceMappingURL=distinctUntilKeyChanged.js.map
+module.exports = path => {
+	const isExtendedLengthPath = /^\\\\\?\\/.test(path);
+	const hasNonAscii = /[^\u0000-\u0080]+/.test(path); // eslint-disable-line no-control-regex
+
+	if (isExtendedLengthPath || hasNonAscii) {
+		return path;
+	}
+
+	return path.replace(/\\/g, '/');
+};
 
 
 /***/ }),
-/* 402 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 663 */
+/***/ (function(module, 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__(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 */
 
+const {Transform} = __webpack_require__(27);
 
+class ObjectTransform extends Transform {
+	constructor() {
+		super({
+			objectMode: true
+		});
+	}
+}
 
+class FilterStream extends ObjectTransform {
+	constructor(filter) {
+		super();
+		this._filter = filter;
+	}
 
+	_transform(data, encoding, callback) {
+		if (this._filter(data)) {
+			this.push(data);
+		}
 
-function elementAt(index, defaultValue) {
-    if (index < 0) {
-        throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__["ArgumentOutOfRangeError"]();
-    }
-    var hasDefaultValue = arguments.length >= 2;
-    return function (source) {
-        return source.pipe(Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return i === index; }), Object(_take__WEBPACK_IMPORTED_MODULE_4__["take"])(1), hasDefaultValue
-            ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__["defaultIfEmpty"])(defaultValue)
-            : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__["throwIfEmpty"])(function () { return new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__["ArgumentOutOfRangeError"](); }));
-    };
+		callback();
+	}
 }
-//# sourceMappingURL=elementAt.js.map
+
+class UniqueStream extends ObjectTransform {
+	constructor() {
+		super();
+		this._pushed = new Set();
+	}
+
+	_transform(data, encoding, callback) {
+		if (!this._pushed.has(data)) {
+			this.push(data);
+			this._pushed.add(data);
+		}
+
+		callback();
+	}
+}
+
+module.exports = {
+	FilterStream,
+	UniqueStream
+};
 
 
 /***/ }),
-/* 403 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 664 */
+/***/ (function(module, 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 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 fs = __webpack_require__(23)
+var polyfills = __webpack_require__(665)
+var legacy = __webpack_require__(666)
+var clone = __webpack_require__(667)
 
+var util = __webpack_require__(29)
 
+/* istanbul ignore next - node 0.x polyfill */
+var gracefulQueue
+var previousSymbol
 
-function throwIfEmpty(errorFactory) {
-    if (errorFactory === void 0) {
-        errorFactory = defaultErrorFactory;
-    }
-    return function (source) {
-        return source.lift(new ThrowIfEmptyOperator(errorFactory));
-    };
+/* 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'
 }
-var ThrowIfEmptyOperator = /*@__PURE__*/ (function () {
-    function ThrowIfEmptyOperator(errorFactory) {
-        this.errorFactory = errorFactory;
-    }
-    ThrowIfEmptyOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ThrowIfEmptySubscriber(subscriber, this.errorFactory));
-    };
-    return ThrowIfEmptyOperator;
-}());
-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.errorFactory = errorFactory;
-        _this.hasValue = false;
-        return _this;
+
+function noop () {}
+
+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)
+  }
+
+// 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
     }
-    ThrowIfEmptySubscriber.prototype._next = function (value) {
-        this.hasValue = true;
-        this.destination.next(value);
-    };
-    ThrowIfEmptySubscriber.prototype._complete = function () {
-        if (!this.hasValue) {
-            var err = void 0;
-            try {
-                err = this.errorFactory();
-            }
-            catch (e) {
-                err = e;
-            }
-            this.destination.error(err);
-        }
-        else {
-            return this.destination.complete();
+  })
+
+  // 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()
         }
-    };
-    return ThrowIfEmptySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"]));
-function defaultErrorFactory() {
-    return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__["EmptyError"]();
-}
-//# sourceMappingURL=throwIfEmpty.js.map
 
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+      })
+    }
 
-/***/ }),
-/* 404 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    Object.defineProperty(close, previousSymbol, {
+      value: fs$close
+    })
+    return close
+  })(fs.close)
 
-"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__(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 */
+  fs.closeSync = (function (fs$closeSync) {
+    function closeSync (fd) {
+      // This function uses the graceful-fs shared queue
+      fs$closeSync.apply(fs, arguments)
+      retry()
+    }
+
+    Object.defineProperty(closeSync, previousSymbol, {
+      value: fs$closeSync
+    })
+    return closeSync
+  })(fs.closeSync)
+
+  if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) {
+    process.on('exit', function() {
+      debug(global[gracefulQueue])
+      __webpack_require__(30).equal(global[gracefulQueue].length, 0)
+    })
+  }
+}
+
+module.exports = patch(clone(fs))
+if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH && !fs.__patched) {
+    module.exports = patch(fs)
+    fs.__patched = true;
+}
 
+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)
 
-function take(count) {
-    return function (source) {
-        if (count === 0) {
-            return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_3__["empty"])();
-        }
+    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 {
-            return source.lift(new TakeOperator(count));
-        }
-    };
-}
-var TakeOperator = /*@__PURE__*/ (function () {
-    function TakeOperator(total) {
-        this.total = total;
-        if (this.total < 0) {
-            throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"];
+          if (typeof cb === 'function')
+            cb.apply(this, arguments)
+          retry()
         }
+      })
     }
-    TakeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TakeSubscriber(subscriber, this.total));
-    };
-    return TakeOperator;
-}());
-var TakeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeSubscriber, _super);
-    function TakeSubscriber(destination, total) {
-        var _this = _super.call(this, destination) || this;
-        _this.total = total;
-        _this.count = 0;
-        return _this;
+  }
+
+  var fs$writeFile = fs.writeFile
+  fs.writeFile = writeFile
+  function writeFile (path, data, options, cb) {
+    if (typeof options === 'function')
+      cb = options, options = null
+
+    return go$writeFile(path, data, options, cb)
+
+    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()
+        }
+      })
     }
-    TakeSubscriber.prototype._next = function (value) {
-        var total = this.total;
-        var count = ++this.count;
-        if (count <= total) {
-            this.destination.next(value);
-            if (count === total) {
-                this.destination.complete();
-                this.unsubscribe();
-            }
+  }
+
+  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
+
+    return go$appendFile(path, data, options, cb)
+
+    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()
         }
-    };
-    return TakeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=take.js.map
+      })
+    }
+  }
 
+  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)
 
-/***/ }),
-/* 405 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    return go$readdir(args)
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return endWith; });
-/* 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 go$readdir$cb (err, files) {
+      if (files && files.sort)
+        files.sort()
 
+      if (err && (err.code === 'EMFILE' || err.code === 'ENFILE'))
+        enqueue([go$readdir, [args]])
 
-function endWith() {
-    var array = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        array[_i] = arguments[_i];
+      else {
+        if (typeof cb === 'function')
+          cb.apply(this, arguments)
+        retry()
+      }
     }
-    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
+  }
 
+  function go$readdir (args) {
+    return fs$readdir.apply(fs, args)
+  }
 
-/***/ }),
-/* 406 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  if (process.version.substr(0, 4) === 'v0.8') {
+    var legStreams = legacy(fs)
+    ReadStream = legStreams.ReadStream
+    WriteStream = legStreams.WriteStream
+  }
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+  var fs$ReadStream = fs.ReadStream
+  if (fs$ReadStream) {
+    ReadStream.prototype = Object.create(fs$ReadStream.prototype)
+    ReadStream.prototype.open = ReadStream$open
+  }
 
+  var fs$WriteStream = fs.WriteStream
+  if (fs$WriteStream) {
+    WriteStream.prototype = Object.create(fs$WriteStream.prototype)
+    WriteStream.prototype.open = WriteStream$open
+  }
 
-function every(predicate, thisArg) {
-    return function (source) { return source.lift(new EveryOperator(predicate, thisArg, source)); };
-}
-var EveryOperator = /*@__PURE__*/ (function () {
-    function EveryOperator(predicate, thisArg, source) {
-        this.predicate = predicate;
-        this.thisArg = thisArg;
-        this.source = source;
-    }
-    EveryOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new EverySubscriber(observer, this.predicate, this.thisArg, this.source));
-    };
-    return EveryOperator;
-}());
-var EverySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](EverySubscriber, _super);
-    function EverySubscriber(destination, predicate, thisArg, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.thisArg = thisArg;
-        _this.source = source;
-        _this.index = 0;
-        _this.thisArg = thisArg || _this;
-        return _this;
-    }
-    EverySubscriber.prototype.notifyComplete = function (everyValueMatch) {
-        this.destination.next(everyValueMatch);
-        this.destination.complete();
-    };
-    EverySubscriber.prototype._next = function (value) {
-        var result = false;
-        try {
-            result = this.predicate.call(this.thisArg, value, this.index++, this.source);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        if (!result) {
-            this.notifyComplete(false);
-        }
-    };
-    EverySubscriber.prototype._complete = function () {
-        this.notifyComplete(true);
-    };
-    return EverySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=every.js.map
+  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
+  })
+
+  // 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
+  })
 
+  function ReadStream (path, options) {
+    if (this instanceof ReadStream)
+      return fs$ReadStream.apply(this, arguments), this
+    else
+      return ReadStream.apply(Object.create(ReadStream.prototype), arguments)
+  }
+
+  function ReadStream$open () {
+    var that = this
+    open(that.path, that.flags, that.mode, function (err, fd) {
+      if (err) {
+        if (that.autoClose)
+          that.destroy()
+
+        that.emit('error', err)
+      } else {
+        that.fd = fd
+        that.emit('open', fd)
+        that.read()
+      }
+    })
+  }
+
+  function WriteStream (path, options) {
+    if (this instanceof WriteStream)
+      return fs$WriteStream.apply(this, arguments), this
+    else
+      return WriteStream.apply(Object.create(WriteStream.prototype), arguments)
+  }
+
+  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)
+      }
+    })
+  }
 
-/***/ }),
-/* 407 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  function createReadStream (path, options) {
+    return new fs.ReadStream(path, options)
+  }
 
-"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__(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 */
+  function createWriteStream (path, options) {
+    return new fs.WriteStream(path, options)
+  }
 
+  var fs$open = fs.open
+  fs.open = open
+  function open (path, flags, mode, cb) {
+    if (typeof mode === 'function')
+      cb = mode, mode = null
 
+    return go$open(path, flags, mode, cb)
 
-function exhaust() {
-    return function (source) { return source.lift(new SwitchFirstOperator()); };
-}
-var SwitchFirstOperator = /*@__PURE__*/ (function () {
-    function SwitchFirstOperator() {
-    }
-    SwitchFirstOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SwitchFirstSubscriber(subscriber));
-    };
-    return SwitchFirstOperator;
-}());
-var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SwitchFirstSubscriber, _super);
-    function SwitchFirstSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasCompleted = false;
-        _this.hasSubscription = false;
-        return _this;
-    }
-    SwitchFirstSubscriber.prototype._next = function (value) {
-        if (!this.hasSubscription) {
-            this.hasSubscription = true;
-            this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, value));
-        }
-    };
-    SwitchFirstSubscriber.prototype._complete = function () {
-        this.hasCompleted = true;
-        if (!this.hasSubscription) {
-            this.destination.complete();
-        }
-    };
-    SwitchFirstSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.remove(innerSub);
-        this.hasSubscription = false;
-        if (this.hasCompleted) {
-            this.destination.complete();
+    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 SwitchFirstSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=exhaust.js.map
+      })
+    }
+  }
 
+  return fs
+}
 
-/***/ }),
-/* 408 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function enqueue (elem) {
+  debug('ENQUEUE', elem[0].name, elem[1])
+  global[gracefulQueue].push(elem)
+}
 
-"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__(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 */
+function retry () {
+  var elem = global[gracefulQueue].shift()
+  if (elem) {
+    debug('RETRY', elem[0].name, elem[1])
+    elem[0].apply(null, elem[1])
+  }
+}
 
 
+/***/ }),
+/* 665 */
+/***/ (function(module, exports, __webpack_require__) {
 
+var constants = __webpack_require__(25)
 
+var origCwd = process.cwd
+var cwd = null
 
+var platform = process.env.GRACEFUL_FS_PLATFORM || process.platform
 
-function exhaustMap(project, resultSelector) {
-    if (resultSelector) {
-        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 ExhaustMapOperator(project));
-    };
+process.cwd = function() {
+  if (!cwd)
+    cwd = origCwd.call(process)
+  return cwd
 }
-var ExhaustMapOperator = /*@__PURE__*/ (function () {
-    function ExhaustMapOperator(project) {
-        this.project = project;
-    }
-    ExhaustMapOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ExhaustMapSubscriber(subscriber, this.project));
-    };
-    return ExhaustMapOperator;
-}());
-var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExhaustMapSubscriber, _super);
-    function ExhaustMapSubscriber(destination, project) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.hasSubscription = false;
-        _this.hasCompleted = false;
-        _this.index = 0;
-        return _this;
-    }
-    ExhaustMapSubscriber.prototype._next = function (value) {
-        if (!this.hasSubscription) {
-            this.tryNext(value);
-        }
-    };
-    ExhaustMapSubscriber.prototype.tryNext = function (value) {
-        var result;
-        var index = this.index++;
-        try {
-            result = this.project(value, index);
-        }
-        catch (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);
-    };
-    ExhaustMapSubscriber.prototype.notifyError = function (err) {
-        this.destination.error(err);
-    };
-    ExhaustMapSubscriber.prototype.notifyComplete = function (innerSub) {
-        var destination = this.destination;
-        destination.remove(innerSub);
-        this.hasSubscription = false;
-        if (this.hasCompleted) {
-            this.destination.complete();
-        }
-    };
-    return ExhaustMapSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=exhaustMap.js.map
-
+try {
+  process.cwd()
+} catch (er) {}
 
-/***/ }),
-/* 409 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+var chdir = process.chdir
+process.chdir = function(d) {
+  cwd = null
+  chdir.call(process, d)
+}
 
-"use strict";
-__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__(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 */
+module.exports = patch
 
+function patch (fs) {
+  // (re-)implement some things that are known busted or missing.
 
+  // 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)
+  }
 
-function expand(project, concurrent, scheduler) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    if (scheduler === void 0) {
-        scheduler = undefined;
-    }
-    concurrent = (concurrent || 0) < 1 ? Number.POSITIVE_INFINITY : concurrent;
-    return function (source) { return source.lift(new ExpandOperator(project, concurrent, scheduler)); };
-}
-var ExpandOperator = /*@__PURE__*/ (function () {
-    function ExpandOperator(project, concurrent, scheduler) {
-        this.project = project;
-        this.concurrent = concurrent;
-        this.scheduler = scheduler;
-    }
-    ExpandOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ExpandSubscriber(subscriber, this.project, this.concurrent, this.scheduler));
-    };
-    return ExpandOperator;
-}());
+  // lutimes implementation, or no-op
+  if (!fs.lutimes) {
+    patchLutimes(fs)
+  }
 
-var ExpandSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExpandSubscriber, _super);
-    function ExpandSubscriber(destination, project, concurrent, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.concurrent = concurrent;
-        _this.scheduler = scheduler;
-        _this.index = 0;
-        _this.active = 0;
-        _this.hasCompleted = false;
-        if (concurrent < Number.POSITIVE_INFINITY) {
-            _this.buffer = [];
-        }
-        return _this;
-    }
-    ExpandSubscriber.dispatch = function (arg) {
-        var subscriber = arg.subscriber, result = arg.result, value = arg.value, index = arg.index;
-        subscriber.subscribeToProjection(result, value, index);
-    };
-    ExpandSubscriber.prototype._next = function (value) {
-        var destination = this.destination;
-        if (destination.closed) {
-            this._complete();
-            return;
-        }
-        var index = this.index++;
-        if (this.active < this.concurrent) {
-            destination.next(value);
-            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));
-                }
-            }
-            catch (e) {
-                destination.error(e);
-            }
-        }
-        else {
-            this.buffer.push(value);
-        }
-    };
-    ExpandSubscriber.prototype.subscribeToProjection = function (result, value, index) {
-        this.active++;
-        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;
-        var destination = this.destination;
-        destination.remove(innerSub);
-        this.active--;
-        if (buffer && buffer.length > 0) {
-            this._next(buffer.shift());
-        }
-        if (this.hasCompleted && this.active === 0) {
-            this.destination.complete();
-        }
-    };
-    return ExpandSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
+  // 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.
 
-//# sourceMappingURL=expand.js.map
+  fs.chown = chownFix(fs.chown)
+  fs.fchown = chownFix(fs.fchown)
+  fs.lchown = chownFix(fs.lchown)
 
+  fs.chmod = chmodFix(fs.chmod)
+  fs.fchmod = chmodFix(fs.fchmod)
+  fs.lchmod = chmodFix(fs.lchmod)
 
-/***/ }),
-/* 410 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  fs.chownSync = chownFixSync(fs.chownSync)
+  fs.fchownSync = chownFixSync(fs.fchownSync)
+  fs.lchownSync = chownFixSync(fs.lchownSync)
 
-"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__(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 */
+  fs.chmodSync = chmodFixSync(fs.chmodSync)
+  fs.fchmodSync = chmodFixSync(fs.fchmodSync)
+  fs.lchmodSync = chmodFixSync(fs.lchmodSync)
 
+  fs.stat = statFix(fs.stat)
+  fs.fstat = statFix(fs.fstat)
+  fs.lstat = statFix(fs.lstat)
 
+  fs.statSync = statFixSync(fs.statSync)
+  fs.fstatSync = statFixSync(fs.fstatSync)
+  fs.lstatSync = statFixSync(fs.lstatSync)
 
-function finalize(callback) {
-    return function (source) { return source.lift(new FinallyOperator(callback)); };
-}
-var FinallyOperator = /*@__PURE__*/ (function () {
-    function FinallyOperator(callback) {
-        this.callback = callback;
+  // 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)
     }
-    FinallyOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new FinallySubscriber(subscriber, this.callback));
-    };
-    return FinallyOperator;
-}());
-var FinallySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FinallySubscriber, _super);
-    function FinallySubscriber(destination, callback) {
-        var _this = _super.call(this, destination) || this;
-        _this.add(new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](callback));
-        return _this;
+    fs.lchmodSync = function () {}
+  }
+  if (!fs.lchown) {
+    fs.lchown = function (path, uid, gid, cb) {
+      if (cb) process.nextTick(cb)
     }
-    return FinallySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=finalize.js.map
+    fs.lchownSync = function () {}
+  }
 
+  // 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.
 
-/***/ }),
-/* 411 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  // 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)
+  }
 
-"use strict";
-__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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+  // 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)
 
-function find(predicate, thisArg) {
-    if (typeof predicate !== 'function') {
-        throw new TypeError('predicate is not a function');
-    }
-    return function (source) { return source.lift(new FindValueOperator(predicate, source, false, thisArg)); };
-}
-var FindValueOperator = /*@__PURE__*/ (function () {
-    function FindValueOperator(predicate, source, yieldIndex, thisArg) {
-        this.predicate = predicate;
-        this.source = source;
-        this.yieldIndex = yieldIndex;
-        this.thisArg = thisArg;
+  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
+      }
     }
-    FindValueOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new FindValueSubscriber(observer, this.predicate, this.source, this.yieldIndex, this.thisArg));
-    };
-    return FindValueOperator;
-}());
+  }})(fs.readSync)
 
-var FindValueSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FindValueSubscriber, _super);
-    function FindValueSubscriber(destination, predicate, source, yieldIndex, thisArg) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.source = source;
-        _this.yieldIndex = yieldIndex;
-        _this.thisArg = thisArg;
-        _this.index = 0;
-        return _this;
-    }
-    FindValueSubscriber.prototype.notifyComplete = function (value) {
-        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;
-        var index = this.index++;
-        try {
-            var result = predicate.call(thisArg || this, value, index, this.source);
-            if (result) {
-                this.notifyComplete(this.yieldIndex ? index : value);
-            }
+  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
         }
-        catch (err) {
-            this.destination.error(err);
+        // 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)
+
+      // 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)
         }
-    };
-    FindValueSubscriber.prototype._complete = function () {
-        this.notifyComplete(this.yieldIndex ? -1 : undefined);
-    };
-    return FindValueSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
+      }
+      return ret
+    }
+  }
 
-//# sourceMappingURL=find.js.map
+  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)
+            })
+          })
+        })
+      }
 
+      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
+      }
 
-/***/ }),
-/* 412 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    } else {
+      fs.lutimes = function (_a, _b, _c, cb) { if (cb) process.nextTick(cb) }
+      fs.lutimesSync = function () {}
+    }
+  }
 
-"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__(411);
-/** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */
+  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)
+      })
+    }
+  }
 
-function findIndex(predicate, thisArg) {
-    return function (source) { return source.lift(new _operators_find__WEBPACK_IMPORTED_MODULE_0__["FindValueOperator"](predicate, source, true, thisArg)); };
-}
-//# sourceMappingURL=findIndex.js.map
+  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
+      }
+    }
+  }
 
 
-/***/ }),
-/* 413 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  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)
+      })
+    }
+  }
 
-"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__(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 */
+  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
+      }
+    }
+  }
 
+  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)
+    }
+  }
 
+  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;
+    }
+  }
 
+  // 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 (er.code === "ENOSYS")
+      return true
 
+    var nonroot = !process.getuid || process.getuid() !== 0
+    if (nonroot) {
+      if (er.code === "EINVAL" || er.code === "EPERM")
+        return true
+    }
 
-function first(predicate, defaultValue) {
-    var hasDefaultValue = arguments.length >= 2;
-    return function (source) { return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__["identity"], Object(_take__WEBPACK_IMPORTED_MODULE_2__["take"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__["defaultIfEmpty"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__["throwIfEmpty"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"](); })); };
+    return false
+  }
 }
-//# sourceMappingURL=first.js.map
 
 
 /***/ }),
-/* 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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+/* 666 */
+/***/ (function(module, exports, __webpack_require__) {
 
+var Stream = __webpack_require__(27).Stream
 
-function ignoreElements() {
-    return function ignoreElementsOperatorFunction(source) {
-        return source.lift(new IgnoreElementsOperator());
-    };
-}
-var IgnoreElementsOperator = /*@__PURE__*/ (function () {
-    function IgnoreElementsOperator() {
-    }
-    IgnoreElementsOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new IgnoreElementsSubscriber(subscriber));
-    };
-    return IgnoreElementsOperator;
-}());
-var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](IgnoreElementsSubscriber, _super);
-    function IgnoreElementsSubscriber() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    IgnoreElementsSubscriber.prototype._next = function (unused) {
-    };
-    return IgnoreElementsSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=ignoreElements.js.map
+module.exports = legacy
 
+function legacy (fs) {
+  return {
+    ReadStream: ReadStream,
+    WriteStream: WriteStream
+  }
 
-/***/ }),
-/* 415 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  function ReadStream (path, options) {
+    if (!(this instanceof ReadStream)) return new ReadStream(path, options);
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+    Stream.call(this);
 
+    var self = this;
 
-function isEmpty() {
-    return function (source) { return source.lift(new IsEmptyOperator()); };
-}
-var IsEmptyOperator = /*@__PURE__*/ (function () {
-    function IsEmptyOperator() {
-    }
-    IsEmptyOperator.prototype.call = function (observer, source) {
-        return source.subscribe(new IsEmptySubscriber(observer));
-    };
-    return IsEmptyOperator;
-}());
-var IsEmptySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](IsEmptySubscriber, _super);
-    function IsEmptySubscriber(destination) {
-        return _super.call(this, destination) || this;
-    }
-    IsEmptySubscriber.prototype.notifyComplete = function (isEmpty) {
-        var destination = this.destination;
-        destination.next(isEmpty);
-        destination.complete();
-    };
-    IsEmptySubscriber.prototype._next = function (value) {
-        this.notifyComplete(false);
-    };
-    IsEmptySubscriber.prototype._complete = function () {
-        this.notifyComplete(true);
-    };
-    return IsEmptySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=isEmpty.js.map
+    this.path = path;
+    this.fd = null;
+    this.readable = true;
+    this.paused = false;
 
+    this.flags = 'r';
+    this.mode = 438; /*=0666*/
+    this.bufferSize = 64 * 1024;
 
-/***/ }),
-/* 416 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    options = options || {};
 
-"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__(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 */
+    // 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];
+    }
 
+    if (this.encoding) this.setEncoding(this.encoding);
 
+    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');
+      }
 
+      if (this.start > this.end) {
+        throw new Error('start must be <= end');
+      }
 
+      this.pos = this.start;
+    }
 
+    if (this.fd !== null) {
+      process.nextTick(function() {
+        self._read();
+      });
+      return;
+    }
 
-function last(predicate, defaultValue) {
-    var hasDefaultValue = arguments.length >= 2;
-    return function (source) { return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__["identity"], Object(_takeLast__WEBPACK_IMPORTED_MODULE_2__["takeLast"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__["defaultIfEmpty"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__["throwIfEmpty"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"](); })); };
-}
-//# sourceMappingURL=last.js.map
+    fs.open(this.path, this.flags, this.mode, function (err, fd) {
+      if (err) {
+        self.emit('error', err);
+        self.readable = false;
+        return;
+      }
 
+      self.fd = fd;
+      self.emit('open', fd);
+      self._read();
+    })
+  }
 
-/***/ }),
-/* 417 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  function WriteStream (path, options) {
+    if (!(this instanceof WriteStream)) return new WriteStream(path, options);
 
-"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__(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 */
+    Stream.call(this);
 
+    this.path = path;
+    this.fd = null;
+    this.writable = true;
 
+    this.flags = 'w';
+    this.encoding = 'binary';
+    this.mode = 438; /*=0666*/
+    this.bytesWritten = 0;
 
+    options = options || {};
 
-function takeLast(count) {
-    return function takeLastOperatorFunction(source) {
-        if (count === 0) {
-            return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_3__["empty"])();
-        }
-        else {
-            return source.lift(new TakeLastOperator(count));
-        }
-    };
-}
-var TakeLastOperator = /*@__PURE__*/ (function () {
-    function TakeLastOperator(total) {
-        this.total = total;
-        if (this.total < 0) {
-            throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"];
-        }
-    }
-    TakeLastOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TakeLastSubscriber(subscriber, this.total));
-    };
-    return TakeLastOperator;
-}());
-var TakeLastSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeLastSubscriber, _super);
-    function TakeLastSubscriber(destination, total) {
-        var _this = _super.call(this, destination) || this;
-        _this.total = total;
-        _this.ring = new Array();
-        _this.count = 0;
-        return _this;
+    // 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];
     }
-    TakeLastSubscriber.prototype._next = function (value) {
-        var ring = this.ring;
-        var total = this.total;
-        var count = this.count++;
-        if (ring.length < total) {
-            ring.push(value);
-        }
-        else {
-            var index = count % total;
-            ring[index] = value;
-        }
-    };
-    TakeLastSubscriber.prototype._complete = function () {
-        var destination = this.destination;
-        var count = this.count;
-        if (count > 0) {
-            var total = this.count >= this.total ? this.total : this.count;
-            var ring = this.ring;
-            for (var i = 0; i < total; i++) {
-                var idx = (count++) % total;
-                destination.next(ring[idx]);
-            }
-        }
-        destination.complete();
-    };
-    return TakeLastSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=takeLast.js.map
-
 
-/***/ }),
-/* 418 */
-/***/ (function(module, __webpack_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";
-__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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+      this.pos = this.start;
+    }
 
+    this.busy = false;
+    this._queue = [];
 
-function mapTo(value) {
-    return function (source) { return source.lift(new MapToOperator(value)); };
-}
-var MapToOperator = /*@__PURE__*/ (function () {
-    function MapToOperator(value) {
-        this.value = value;
-    }
-    MapToOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MapToSubscriber(subscriber, this.value));
-    };
-    return MapToOperator;
-}());
-var MapToSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MapToSubscriber, _super);
-    function MapToSubscriber(destination, value) {
-        var _this = _super.call(this, destination) || this;
-        _this.value = value;
-        return _this;
+    if (this.fd === null) {
+      this._open = fs.open;
+      this._queue.push([this._open, this.path, this.flags, this.mode, undefined]);
+      this.flush();
     }
-    MapToSubscriber.prototype._next = function (x) {
-        this.destination.next(this.value);
-    };
-    return MapToSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=mapTo.js.map
+  }
+}
 
 
 /***/ }),
-/* 419 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 667 */
+/***/ (function(module, 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__(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 */
-
 
 
-function materialize() {
-    return function materializeOperatorFunction(source) {
-        return source.lift(new MaterializeOperator());
-    };
-}
-var MaterializeOperator = /*@__PURE__*/ (function () {
-    function MaterializeOperator() {
-    }
-    MaterializeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MaterializeSubscriber(subscriber));
-    };
-    return MaterializeOperator;
-}());
-var MaterializeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MaterializeSubscriber, _super);
-    function MaterializeSubscriber(destination) {
-        return _super.call(this, destination) || this;
-    }
-    MaterializeSubscriber.prototype._next = function (value) {
-        this.destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createNext(value));
-    };
-    MaterializeSubscriber.prototype._error = function (err) {
-        var destination = this.destination;
-        destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createError(err));
-        destination.complete();
-    };
-    MaterializeSubscriber.prototype._complete = function () {
-        var destination = this.destination;
-        destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createComplete());
-        destination.complete();
-    };
-    return MaterializeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=materialize.js.map
-
+module.exports = clone
 
-/***/ }),
-/* 420 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function clone (obj) {
+  if (obj === null || typeof obj !== 'object')
+    return obj
 
-"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__(421);
-/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
+  if (obj instanceof Object)
+    var copy = { __proto__: obj.__proto__ }
+  else
+    var copy = Object.create(null)
 
-function max(comparer) {
-    var max = (typeof comparer === 'function')
-        ? function (x, y) { return comparer(x, y) > 0 ? x : y; }
-        : function (x, y) { return x > y ? x : y; };
-    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(max);
+  Object.getOwnPropertyNames(obj).forEach(function (key) {
+    Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key))
+  })
+
+  return copy
 }
-//# sourceMappingURL=max.js.map
 
 
 /***/ }),
-/* 421 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 668 */
+/***/ (function(module, 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__(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 */
 
+const path = __webpack_require__(16);
+
+module.exports = path_ => {
+	let cwd = process.cwd();
 
+	path_ = path.resolve(path_);
 
+	if (process.platform === 'win32') {
+		cwd = cwd.toLowerCase();
+		path_ = path_.toLowerCase();
+	}
 
-function reduce(accumulator, seed) {
-    if (arguments.length >= 2) {
-        return function reduceOperatorFunctionWithSeed(source) {
-            return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(accumulator, seed), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1), Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__["defaultIfEmpty"])(seed))(source);
-        };
-    }
-    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);
-    };
-}
-//# sourceMappingURL=reduce.js.map
+	return path_ === cwd;
+};
 
 
 /***/ }),
-/* 422 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 669 */
+/***/ (function(module, 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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
 
+const path = __webpack_require__(16);
 
-function scan(accumulator, seed) {
-    var hasSeed = false;
-    if (arguments.length >= 2) {
-        hasSeed = true;
-    }
-    return function scanOperatorFunction(source) {
-        return source.lift(new ScanOperator(accumulator, seed, hasSeed));
-    };
-}
-var ScanOperator = /*@__PURE__*/ (function () {
-    function ScanOperator(accumulator, seed, hasSeed) {
-        if (hasSeed === void 0) {
-            hasSeed = false;
-        }
-        this.accumulator = accumulator;
-        this.seed = seed;
-        this.hasSeed = hasSeed;
-    }
-    ScanOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ScanSubscriber(subscriber, this.accumulator, this.seed, this.hasSeed));
-    };
-    return ScanOperator;
-}());
-var ScanSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ScanSubscriber, _super);
-    function ScanSubscriber(destination, accumulator, _seed, hasSeed) {
-        var _this = _super.call(this, destination) || this;
-        _this.accumulator = accumulator;
-        _this._seed = _seed;
-        _this.hasSeed = hasSeed;
-        _this.index = 0;
-        return _this;
-    }
-    Object.defineProperty(ScanSubscriber.prototype, "seed", {
-        get: function () {
-            return this._seed;
-        },
-        set: function (value) {
-            this.hasSeed = true;
-            this._seed = value;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    ScanSubscriber.prototype._next = function (value) {
-        if (!this.hasSeed) {
-            this.seed = value;
-            this.destination.next(value);
-        }
-        else {
-            return this._tryNext(value);
-        }
-    };
-    ScanSubscriber.prototype._tryNext = function (value) {
-        var index = this.index++;
-        var result;
-        try {
-            result = this.accumulator(this.seed, value, index);
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-        this.seed = result;
-        this.destination.next(result);
-    };
-    return ScanSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=scan.js.map
+module.exports = (childPath, parentPath) => {
+	childPath = path.resolve(childPath);
+	parentPath = path.resolve(parentPath);
 
+	if (process.platform === 'win32') {
+		childPath = childPath.toLowerCase();
+		parentPath = parentPath.toLowerCase();
+	}
 
-/***/ }),
-/* 423 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	if (childPath === parentPath) {
+		return false;
+	}
 
-"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__(365);
-/** PURE_IMPORTS_START _observable_merge PURE_IMPORTS_END */
+	childPath += path.sep;
+	parentPath += path.sep;
 
-function merge() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return function (source) { return source.lift.call(_observable_merge__WEBPACK_IMPORTED_MODULE_0__["merge"].apply(void 0, [source].concat(observables))); };
-}
-//# sourceMappingURL=merge.js.map
+	return childPath.startsWith(parentPath);
+};
 
 
 /***/ }),
-/* 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__(349);
-/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */
+/* 670 */
+/***/ (function(module, exports, __webpack_require__) {
 
-function mergeMapTo(innerObservable, resultSelector, concurrent) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    if (typeof resultSelector === 'function') {
-        return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(function () { return innerObservable; }, resultSelector, concurrent);
-    }
-    if (typeof resultSelector === 'number') {
-        concurrent = resultSelector;
-    }
-    return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(function () { return innerObservable; }, concurrent);
+const assert = __webpack_require__(30)
+const path = __webpack_require__(16)
+const fs = __webpack_require__(23)
+let glob = undefined
+try {
+  glob = __webpack_require__(502)
+} catch (_err) {
+  // treat glob as optional.
 }
-//# sourceMappingURL=mergeMapTo.js.map
-
 
-/***/ }),
-/* 425 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__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__(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 */
+const defaultGlobOpts = {
+  nosort: true,
+  silent: true
+}
 
+// for EMFILE handling
+let timeout = 0
 
+const isWindows = (process.platform === "win32")
 
+const defaults = options => {
+  const methods = [
+    'unlink',
+    'chmod',
+    'stat',
+    'lstat',
+    'rmdir',
+    'readdir'
+  ]
+  methods.forEach(m => {
+    options[m] = options[m] || fs[m]
+    m = m + 'Sync'
+    options[m] = options[m] || fs[m]
+  })
 
-function mergeScan(accumulator, seed, concurrent) {
-    if (concurrent === void 0) {
-        concurrent = Number.POSITIVE_INFINITY;
-    }
-    return function (source) { return source.lift(new MergeScanOperator(accumulator, seed, concurrent)); };
+  options.maxBusyTries = options.maxBusyTries || 3
+  options.emfileWait = options.emfileWait || 1000
+  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
 }
-var MergeScanOperator = /*@__PURE__*/ (function () {
-    function MergeScanOperator(accumulator, seed, concurrent) {
-        this.accumulator = accumulator;
-        this.seed = seed;
-        this.concurrent = concurrent;
-    }
-    MergeScanOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new MergeScanSubscriber(subscriber, this.accumulator, this.seed, this.concurrent));
-    };
-    return MergeScanOperator;
-}());
 
-var MergeScanSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MergeScanSubscriber, _super);
-    function MergeScanSubscriber(destination, accumulator, acc, concurrent) {
-        var _this = _super.call(this, destination) || this;
-        _this.accumulator = accumulator;
-        _this.acc = acc;
-        _this.concurrent = concurrent;
-        _this.hasValue = false;
-        _this.hasCompleted = false;
-        _this.buffer = [];
-        _this.active = 0;
-        _this.index = 0;
-        return _this;
-    }
-    MergeScanSubscriber.prototype._next = function (value) {
-        if (this.active < this.concurrent) {
-            var index = this.index++;
-            var destination = this.destination;
-            var ish = void 0;
-            try {
-                var accumulator = this.accumulator;
-                ish = accumulator(this.acc, 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) {
-        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;
-        if (this.active === 0 && this.buffer.length === 0) {
-            if (this.hasValue === false) {
-                this.destination.next(this.acc);
-            }
-            this.destination.complete();
-        }
-        this.unsubscribe();
-    };
-    MergeScanSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        var destination = this.destination;
-        this.acc = innerValue;
-        this.hasValue = true;
-        destination.next(innerValue);
-    };
-    MergeScanSubscriber.prototype.notifyComplete = function (innerSub) {
-        var buffer = this.buffer;
-        var destination = this.destination;
-        destination.remove(innerSub);
-        this.active--;
-        if (buffer.length > 0) {
-            this._next(buffer.shift());
-        }
-        else if (this.active === 0 && this.hasCompleted) {
-            if (this.hasValue === false) {
-                this.destination.next(this.acc);
-            }
-            this.destination.complete();
-        }
-    };
-    return MergeScanSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
+const rimraf = (p, options, cb) => {
+  if (typeof options === 'function') {
+    cb = options
+    options = {}
+  }
 
-//# sourceMappingURL=mergeScan.js.map
+  assert(p, 'rimraf: missing path')
+  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
+  assert.equal(typeof cb, 'function', 'rimraf: callback function required')
+  assert(options, 'rimraf: invalid options argument provided')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
 
+  defaults(options)
 
-/***/ }),
-/* 426 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  let busyTries = 0
+  let errState = null
+  let n = 0
 
-"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__(421);
-/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
+  const next = (er) => {
+    errState = errState || er
+    if (--n === 0)
+      cb(errState)
+  }
 
-function min(comparer) {
-    var min = (typeof comparer === 'function')
-        ? function (x, y) { return comparer(x, y) < 0 ? x : y; }
-        : function (x, y) { return x < y ? x : y; };
-    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(min);
-}
-//# sourceMappingURL=min.js.map
+  const afterGlob = (er, results) => {
+    if (er)
+      return cb(er)
 
+    n = results.length
+    if (n === 0)
+      return cb()
 
-/***/ }),
-/* 427 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+    results.forEach(p => {
+      const CB = (er) => {
+        if (er) {
+          if ((er.code === "EBUSY" || er.code === "ENOTEMPTY" || er.code === "EPERM") &&
+              busyTries < options.maxBusyTries) {
+            busyTries ++
+            // try again, with the same exact callback as this one.
+            return setTimeout(() => rimraf_(p, options, CB), busyTries * 100)
+          }
 
-"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__(293);
-/** PURE_IMPORTS_START _observable_ConnectableObservable PURE_IMPORTS_END */
+          // this one won't happen if graceful-fs is used.
+          if (er.code === "EMFILE" && timeout < options.emfileWait) {
+            return setTimeout(() => rimraf_(p, options, CB), timeout ++)
+          }
 
-function multicast(subjectOrSubjectFactory, selector) {
-    return function multicastOperatorFunction(source) {
-        var subjectFactory;
-        if (typeof subjectOrSubjectFactory === 'function') {
-            subjectFactory = subjectOrSubjectFactory;
-        }
-        else {
-            subjectFactory = function subjectFactory() {
-                return subjectOrSubjectFactory;
-            };
-        }
-        if (typeof selector === 'function') {
-            return source.lift(new MulticastOperator(subjectFactory, selector));
+          // already gone
+          if (er.code === "ENOENT") er = null
         }
-        var connectable = Object.create(source, _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__["connectableObservableDescriptor"]);
-        connectable.source = source;
-        connectable.subjectFactory = subjectFactory;
-        return connectable;
-    };
-}
-var MulticastOperator = /*@__PURE__*/ (function () {
-    function MulticastOperator(subjectFactory, selector) {
-        this.subjectFactory = subjectFactory;
-        this.selector = selector;
-    }
-    MulticastOperator.prototype.call = function (subscriber, source) {
-        var selector = this.selector;
-        var subject = this.subjectFactory();
-        var subscription = selector(subject).subscribe(subscriber);
-        subscription.add(source.subscribe(subject));
-        return subscription;
-    };
-    return MulticastOperator;
-}());
 
-//# sourceMappingURL=multicast.js.map
+        timeout = 0
+        next(er)
+      }
+      rimraf_(p, options, CB)
+    })
+  }
 
+  if (options.disableGlob || !glob.hasMagic(p))
+    return afterGlob(null, [p])
 
-/***/ }),
-/* 428 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  options.lstat(p, (er, stat) => {
+    if (!er)
+      return afterGlob(null, [p])
 
-"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__(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 */
+    glob(p, options.glob, afterGlob)
+  })
 
+}
 
+// Two possible strategies.
+// 1. Assume it's a file.  unlink it, then do the dir stuff on EPERM or EISDIR
+// 2. Assume it's a directory.  readdir, then do the file stuff on ENOTDIR
+//
+// Both result in an extra syscall when you guess wrong.  However, there
+// are likely far more normal files in the world than directories.  This
+// is based on the assumption that a the average number of files per
+// directory is >= 1.
+//
+// If anyone ever complains about this, then I guess the strategy could
+// be made configurable somehow.  But until then, YAGNI.
+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, (er, st) => {
+    if (er && er.code === "ENOENT")
+      return cb(null)
 
+    // Windows can EPERM on stat.  Life is suffering.
+    if (er && er.code === "EPERM" && isWindows)
+      fixWinEPERM(p, options, er, cb)
 
+    if (st && st.isDirectory())
+      return rmdir(p, options, er, cb)
 
-function onErrorResumeNext() {
-    var nextSources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        nextSources[_i] = arguments[_i];
-    }
-    if (nextSources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(nextSources[0])) {
-        nextSources = nextSources[0];
-    }
-    return function (source) { return source.lift(new OnErrorResumeNextOperator(nextSources)); };
-}
-function onErrorResumeNextStatic() {
-    var nextSources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        nextSources[_i] = arguments[_i];
-    }
-    var source = null;
-    if (nextSources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(nextSources[0])) {
-        nextSources = nextSources[0];
-    }
-    source = nextSources.shift();
-    return Object(_observable_from__WEBPACK_IMPORTED_MODULE_1__["from"])(source, null).lift(new OnErrorResumeNextOperator(nextSources));
-}
-var OnErrorResumeNextOperator = /*@__PURE__*/ (function () {
-    function OnErrorResumeNextOperator(nextSources) {
-        this.nextSources = nextSources;
-    }
-    OnErrorResumeNextOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new OnErrorResumeNextSubscriber(subscriber, this.nextSources));
-    };
-    return OnErrorResumeNextOperator;
-}());
-var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](OnErrorResumeNextSubscriber, _super);
-    function OnErrorResumeNextSubscriber(destination, nextSources) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.nextSources = nextSources;
-        return _this;
-    }
-    OnErrorResumeNextSubscriber.prototype.notifyError = function (error, innerSub) {
-        this.subscribeToNextSource();
-    };
-    OnErrorResumeNextSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.subscribeToNextSource();
-    };
-    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) {
-            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();
-        }
-    };
-    return OnErrorResumeNextSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
-//# sourceMappingURL=onErrorResumeNext.js.map
+    options.unlink(p, er => {
+      if (er) {
+        if (er.code === "ENOENT")
+          return cb(null)
+        if (er.code === "EPERM")
+          return (isWindows)
+            ? fixWinEPERM(p, options, er, cb)
+            : rmdir(p, options, er, cb)
+        if (er.code === "EISDIR")
+          return rmdir(p, options, er, cb)
+      }
+      return cb(er)
+    })
+  })
+}
 
+const fixWinEPERM = (p, options, er, cb) => {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
+  if (er)
+    assert(er instanceof Error)
 
-/***/ }),
-/* 429 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  options.chmod(p, 0o666, er2 => {
+    if (er2)
+      cb(er2.code === "ENOENT" ? null : er)
+    else
+      options.stat(p, (er3, stats) => {
+        if (er3)
+          cb(er3.code === "ENOENT" ? null : er)
+        else if (stats.isDirectory())
+          rmdir(p, options, er, cb)
+        else
+          options.unlink(p, cb)
+      })
+  })
+}
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+const fixWinEPERMSync = (p, options, er) => {
+  assert(p)
+  assert(options)
+  if (er)
+    assert(er instanceof Error)
 
+  try {
+    options.chmodSync(p, 0o666)
+  } catch (er2) {
+    if (er2.code === "ENOENT")
+      return
+    else
+      throw er
+  }
 
-function pairwise() {
-    return function (source) { return source.lift(new PairwiseOperator()); };
-}
-var PairwiseOperator = /*@__PURE__*/ (function () {
-    function PairwiseOperator() {
-    }
-    PairwiseOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new PairwiseSubscriber(subscriber));
-    };
-    return PairwiseOperator;
-}());
-var PairwiseSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](PairwiseSubscriber, _super);
-    function PairwiseSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasPrev = false;
-        return _this;
-    }
-    PairwiseSubscriber.prototype._next = function (value) {
-        var pair;
-        if (this.hasPrev) {
-            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"]));
-//# sourceMappingURL=pairwise.js.map
+  let stats
+  try {
+    stats = options.statSync(p)
+  } catch (er3) {
+    if (er3.code === "ENOENT")
+      return
+    else
+      throw er
+  }
 
+  if (stats.isDirectory())
+    rmdirSync(p, options, er)
+  else
+    options.unlinkSync(p)
+}
 
-/***/ }),
-/* 430 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const rmdir = (p, options, originalEr, cb) => {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
+  assert(typeof cb === 'function')
 
-"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 _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(371);
-/** PURE_IMPORTS_START _util_not,_filter PURE_IMPORTS_END */
+  // 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, er => {
+    if (er && (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM"))
+      rmkids(p, options, cb)
+    else if (er && er.code === "ENOTDIR")
+      cb(originalEr)
+    else
+      cb(er)
+  })
+}
 
+const rmkids = (p, options, cb) => {
+  assert(p)
+  assert(options)
+  assert(typeof cb === 'function')
 
-function partition(predicate, thisArg) {
-    return function (source) {
-        return [
-            Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(predicate, thisArg)(source),
-            Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__["not"])(predicate, thisArg))(source)
-        ];
-    };
+  options.readdir(p, (er, files) => {
+    if (er)
+      return cb(er)
+    let n = files.length
+    if (n === 0)
+      return options.rmdir(p, cb)
+    let errState
+    files.forEach(f => {
+      rimraf(path.join(p, f), options, er => {
+        if (errState)
+          return
+        if (er)
+          return cb(errState = er)
+        if (--n === 0)
+          options.rmdir(p, cb)
+      })
+    })
+  })
 }
-//# sourceMappingURL=partition.js.map
 
+// this looks simpler, and is strictly *faster*, but will
+// tie up the JavaScript thread and fail on excessively
+// deep directory trees.
+const rimrafSync = (p, options) => {
+  options = options || {}
+  defaults(options)
 
-/***/ }),
-/* 431 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  assert(p, 'rimraf: missing path')
+  assert.equal(typeof p, 'string', 'rimraf: path should be a string')
+  assert(options, 'rimraf: missing options')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
 
-"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__(333);
-/** PURE_IMPORTS_START _map PURE_IMPORTS_END */
+  let results
 
-function pluck() {
-    var properties = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        properties[_i] = arguments[_i];
+  if (options.disableGlob || !glob.hasMagic(p)) {
+    results = [p]
+  } else {
+    try {
+      options.lstatSync(p)
+      results = [p]
+    } catch (er) {
+      results = glob.sync(p, options.glob)
     }
-    var length = properties.length;
-    if (length === 0) {
-        throw new Error('list of properties cannot be empty.');
+  }
+
+  if (!results.length)
+    return
+
+  for (let i = 0; i < results.length; i++) {
+    const p = results[i]
+
+    let st
+    try {
+      st = options.lstatSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
+
+      // Windows can EPERM on stat.  Life is suffering.
+      if (er.code === "EPERM" && isWindows)
+        fixWinEPERMSync(p, options, er)
     }
-    return function (source) { return Object(_map__WEBPACK_IMPORTED_MODULE_0__["map"])(plucker(properties, length))(source); };
-}
-function plucker(props, length) {
-    var mapper = function (x) {
-        var currentProp = x;
-        for (var i = 0; i < length; i++) {
-            var p = currentProp[props[i]];
-            if (typeof p !== 'undefined') {
-                currentProp = p;
-            }
-            else {
-                return undefined;
-            }
-        }
-        return currentProp;
-    };
-    return mapper;
-}
-//# sourceMappingURL=pluck.js.map
 
+    try {
+      // sunos lets the root user unlink directories, which is... weird.
+      if (st && st.isDirectory())
+        rmdirSync(p, options, null)
+      else
+        options.unlinkSync(p)
+    } catch (er) {
+      if (er.code === "ENOENT")
+        return
+      if (er.code === "EPERM")
+        return isWindows ? fixWinEPERMSync(p, options, er) : rmdirSync(p, options, er)
+      if (er.code !== "EISDIR")
+        throw er
 
-/***/ }),
-/* 432 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+      rmdirSync(p, options, er)
+    }
+  }
+}
 
-"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__(294);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427);
-/** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */
+const rmdirSync = (p, options, originalEr) => {
+  assert(p)
+  assert(options)
+  if (originalEr)
+    assert(originalEr instanceof Error)
+
+  try {
+    options.rmdirSync(p)
+  } catch (er) {
+    if (er.code === "ENOENT")
+      return
+    if (er.code === "ENOTDIR")
+      throw originalEr
+    if (er.code === "ENOTEMPTY" || er.code === "EEXIST" || er.code === "EPERM")
+      rmkidsSync(p, options)
+  }
+}
 
+const rmkidsSync = (p, options) => {
+  assert(p)
+  assert(options)
+  options.readdirSync(p).forEach(f => rimrafSync(path.join(p, f), options))
 
-function publish(selector) {
-    return selector ?
-        Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(function () { return new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"](); }, selector) :
-        Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]());
+  // 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.
+  // So, we know that it won't be ENOENT or ENOTDIR or anything else.
+  // 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.
+  const retries = isWindows ? 100 : 1
+  let i = 0
+  do {
+    let threw = true
+    try {
+      const ret = options.rmdirSync(p, options)
+      threw = false
+      return ret
+    } finally {
+      if (++i < retries && threw)
+        continue
+    }
+  } while (true)
 }
-//# sourceMappingURL=publish.js.map
+
+module.exports = rimraf
+rimraf.sync = rimrafSync
 
 
 /***/ }),
-/* 433 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 671 */
+/***/ (function(module, 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__(299);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427);
-/** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */
 
+const AggregateError = __webpack_require__(672);
 
-function publishBehavior(value) {
-    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__["BehaviorSubject"](value))(source); };
-}
-//# sourceMappingURL=publishBehavior.js.map
+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');
+		}
 
+		if (!(typeof concurrency === 'number' && concurrency >= 1)) {
+			throw new TypeError(`Expected \`concurrency\` to be a number from 1 and up, got \`${concurrency}\` (${typeof concurrency})`);
+		}
 
-/***/ }),
-/* 434 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		const ret = [];
+		const errors = [];
+		const iterator = iterable[Symbol.iterator]();
+		let isRejected = false;
+		let isIterableDone = false;
+		let resolvingCount = 0;
+		let currentIndex = 0;
 
-"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__(317);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427);
-/** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */
+		const next = () => {
+			if (isRejected) {
+				return;
+			}
+
+			const nextItem = iterator.next();
+			const i = currentIndex;
+			currentIndex++;
 
+			if (nextItem.done) {
+				isIterableDone = true;
 
-function publishLast() {
-    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__["AsyncSubject"]())(source); };
-}
-//# sourceMappingURL=publishLast.js.map
+				if (resolvingCount === 0) {
+					if (!stopOnError && errors.length !== 0) {
+						reject(new AggregateError(errors));
+					} else {
+						resolve(ret);
+					}
+				}
 
+				return;
+			}
 
-/***/ }),
-/* 435 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+			resolvingCount++;
 
-"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__(300);
-/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(427);
-/** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */
+			(async () => {
+				try {
+					const element = await nextItem.value;
+					ret[i] = await mapper(element, i);
+					resolvingCount--;
+					next();
+				} catch (error) {
+					if (stopOnError) {
+						isRejected = true;
+						reject(error);
+					} else {
+						errors.push(error);
+						resolvingCount--;
+						next();
+					}
+				}
+			})();
+		};
 
+		for (let i = 0; i < concurrency; i++) {
+			next();
 
-function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) {
-    if (selectorOrScheduler && typeof selectorOrScheduler !== 'function') {
-        scheduler = selectorOrScheduler;
-    }
-    var selector = typeof selectorOrScheduler === 'function' ? selectorOrScheduler : undefined;
-    var subject = new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, scheduler);
-    return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(function () { return subject; }, selector)(source); };
-}
-//# sourceMappingURL=publishReplay.js.map
+			if (isIterableDone) {
+				break;
+			}
+		}
+	});
+};
 
 
 /***/ }),
-/* 436 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 672 */
+/***/ (function(module, 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__(285);
-/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(372);
-/** PURE_IMPORTS_START _util_isArray,_observable_race PURE_IMPORTS_END */
 
+const indentString = __webpack_require__(673);
+const cleanStack = __webpack_require__(674);
 
-function race() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return function raceOperatorFunction(source) {
-        if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(observables[0])) {
-            observables = observables[0];
-        }
-        return source.lift.call(_observable_race__WEBPACK_IMPORTED_MODULE_1__["race"].apply(void 0, [source].concat(observables)));
-    };
-}
-//# sourceMappingURL=race.js.map
+const cleanInternalStack = stack => stack.replace(/\s+at .*aggregate-error\/index.js:\d+:\d+\)?/g, '');
 
+class AggregateError extends Error {
+	constructor(errors) {
+		if (!Array.isArray(errors)) {
+			throw new TypeError(`Expected input to be an Array, got ${typeof errors}`);
+		}
 
-/***/ }),
-/* 437 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		errors = [...errors].map(error => {
+			if (error instanceof Error) {
+				return error;
+			}
 
-"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__(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 */
+			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});
+	}
 
-function repeat(count) {
-    if (count === void 0) {
-        count = -1;
-    }
-    return function (source) {
-        if (count === 0) {
-            return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])();
-        }
-        else if (count < 0) {
-            return source.lift(new RepeatOperator(-1, source));
-        }
-        else {
-            return source.lift(new RepeatOperator(count - 1, source));
-        }
-    };
+	* [Symbol.iterator]() {
+		for (const error of this._errors) {
+			yield error;
+		}
+	}
 }
-var RepeatOperator = /*@__PURE__*/ (function () {
-    function RepeatOperator(count, source) {
-        this.count = count;
-        this.source = source;
-    }
-    RepeatOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RepeatSubscriber(subscriber, this.count, this.source));
-    };
-    return RepeatOperator;
-}());
-var RepeatSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RepeatSubscriber, _super);
-    function RepeatSubscriber(destination, count, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.count = count;
-        _this.source = source;
-        return _this;
-    }
-    RepeatSubscriber.prototype.complete = function () {
-        if (!this.isStopped) {
-            var _a = this, source = _a.source, count = _a.count;
-            if (count === 0) {
-                return _super.prototype.complete.call(this);
-            }
-            else if (count > -1) {
-                this.count = count - 1;
-            }
-            source.subscribe(this._unsubscribeAndRecycle());
-        }
-    };
-    return RepeatSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=repeat.js.map
+
+module.exports = AggregateError;
 
 
 /***/ }),
-/* 438 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 673 */
+/***/ (function(module, 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__(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 */
 
+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;
+	}
 
-function repeatWhen(notifier) {
-    return function (source) { return source.lift(new RepeatWhenOperator(notifier)); };
+	const regex = options.includeEmptyLines ? /^/mg : /^(?!\s*$)/mg;
+	return str.replace(regex, options.indent.repeat(count));
 }
-var RepeatWhenOperator = /*@__PURE__*/ (function () {
-    function RepeatWhenOperator(notifier) {
-        this.notifier = notifier;
-    }
-    RepeatWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RepeatWhenSubscriber(subscriber, this.notifier, source));
-    };
-    return RepeatWhenOperator;
-}());
-var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RepeatWhenSubscriber, _super);
-    function RepeatWhenSubscriber(destination, notifier, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.notifier = notifier;
-        _this.source = source;
-        _this.sourceIsBeingSubscribedTo = true;
-        return _this;
-    }
-    RepeatWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.sourceIsBeingSubscribedTo = true;
-        this.source.subscribe(this);
-    };
-    RepeatWhenSubscriber.prototype.notifyComplete = function (innerSub) {
-        if (this.sourceIsBeingSubscribedTo === false) {
-            return _super.prototype.complete.call(this);
-        }
-    };
-    RepeatWhenSubscriber.prototype.complete = function () {
-        this.sourceIsBeingSubscribedTo = false;
-        if (!this.isStopped) {
-            if (!this.retries) {
-                this.subscribeToRetries();
-            }
-            if (!this.retriesSubscription || this.retriesSubscription.closed) {
-                return _super.prototype.complete.call(this);
-            }
-            this._unsubscribeAndRecycle();
-            this.notifications.next();
-        }
-    };
-    RepeatWhenSubscriber.prototype._unsubscribe = function () {
-        var _a = this, notifications = _a.notifications, retriesSubscription = _a.retriesSubscription;
-        if (notifications) {
-            notifications.unsubscribe();
-            this.notifications = null;
-        }
-        if (retriesSubscription) {
-            retriesSubscription.unsubscribe();
-            this.retriesSubscription = null;
-        }
-        this.retries = null;
-    };
-    RepeatWhenSubscriber.prototype._unsubscribeAndRecycle = function () {
-        var _unsubscribe = this._unsubscribe;
-        this._unsubscribe = null;
-        _super.prototype._unsubscribeAndRecycle.call(this);
-        this._unsubscribe = _unsubscribe;
-        return this;
-    };
-    RepeatWhenSubscriber.prototype.subscribeToRetries = function () {
-        this.notifications = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-        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_3__["subscribeToResult"])(this, retries);
-    };
-    return RepeatWhenSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
-//# sourceMappingURL=repeatWhen.js.map
+;
 
 
 /***/ }),
-/* 439 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 674 */
+/***/ (function(module, 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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
-
 
-function retry(count) {
-    if (count === void 0) {
-        count = -1;
-    }
-    return function (source) { return source.lift(new RetryOperator(count, source)); };
-}
-var RetryOperator = /*@__PURE__*/ (function () {
-    function RetryOperator(count, source) {
-        this.count = count;
-        this.source = source;
-    }
-    RetryOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RetrySubscriber(subscriber, this.count, this.source));
-    };
-    return RetryOperator;
-}());
-var RetrySubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RetrySubscriber, _super);
-    function RetrySubscriber(destination, count, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.count = count;
-        _this.source = source;
-        return _this;
-    }
-    RetrySubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var _a = this, source = _a.source, count = _a.count;
-            if (count === 0) {
-                return _super.prototype.error.call(this, err);
-            }
-            else if (count > -1) {
-                this.count = count - 1;
-            }
-            source.subscribe(this._unsubscribeAndRecycle());
-        }
-    };
-    return RetrySubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=retry.js.map
+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();
 
-/***/ }),
-/* 440 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+module.exports = (stack, options) => {
+	options = Object.assign({pretty: false}, options);
 
-"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__(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 */
+	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, '~')));
+			}
 
-function retryWhen(notifier) {
-    return function (source) { return source.lift(new RetryWhenOperator(notifier, source)); };
-}
-var RetryWhenOperator = /*@__PURE__*/ (function () {
-    function RetryWhenOperator(notifier, source) {
-        this.notifier = notifier;
-        this.source = source;
-    }
-    RetryWhenOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new RetryWhenSubscriber(subscriber, this.notifier, this.source));
-    };
-    return RetryWhenOperator;
-}());
-var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RetryWhenSubscriber, _super);
-    function RetryWhenSubscriber(destination, notifier, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.notifier = notifier;
-        _this.source = source;
-        return _this;
-    }
-    RetryWhenSubscriber.prototype.error = function (err) {
-        if (!this.isStopped) {
-            var errors = this.errors;
-            var retries = this.retries;
-            var retriesSubscription = this.retriesSubscription;
-            if (!retries) {
-                errors = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-                try {
-                    var notifier = this.notifier;
-                    retries = notifier(errors);
-                }
-                catch (e) {
-                    return _super.prototype.error.call(this, e);
-                }
-                retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, retries);
-            }
-            else {
-                this.errors = null;
-                this.retriesSubscription = null;
-            }
-            this._unsubscribeAndRecycle();
-            this.errors = errors;
-            this.retries = retries;
-            this.retriesSubscription = retriesSubscription;
-            errors.next(err);
-        }
-    };
-    RetryWhenSubscriber.prototype._unsubscribe = function () {
-        var _a = this, errors = _a.errors, retriesSubscription = _a.retriesSubscription;
-        if (errors) {
-            errors.unsubscribe();
-            this.errors = null;
-        }
-        if (retriesSubscription) {
-            retriesSubscription.unsubscribe();
-            this.retriesSubscription = null;
-        }
-        this.retries = null;
-    };
-    RetryWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        var _unsubscribe = this._unsubscribe;
-        this._unsubscribe = null;
-        this._unsubscribeAndRecycle();
-        this._unsubscribe = _unsubscribe;
-        this.source.subscribe(this);
-    };
-    return RetryWhenSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
-//# sourceMappingURL=retryWhen.js.map
+			return line;
+		})
+		.join('\n');
+};
 
 
 /***/ }),
-/* 441 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 675 */
+/***/ (function(module, 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__(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 */
-
 
+const chalk = __webpack_require__(676);
+const cliCursor = __webpack_require__(680);
+const cliSpinners = __webpack_require__(684);
+const logSymbols = __webpack_require__(566);
 
-function sample(notifier) {
-    return function (source) { return source.lift(new SampleOperator(notifier)); };
-}
-var SampleOperator = /*@__PURE__*/ (function () {
-    function SampleOperator(notifier) {
-        this.notifier = notifier;
-    }
-    SampleOperator.prototype.call = function (subscriber, source) {
-        var sampleSubscriber = new SampleSubscriber(subscriber);
-        var subscription = source.subscribe(sampleSubscriber);
-        subscription.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(sampleSubscriber, this.notifier));
-        return subscription;
-    };
-    return SampleOperator;
-}());
-var SampleSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SampleSubscriber, _super);
-    function SampleSubscriber() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.hasValue = false;
-        return _this;
-    }
-    SampleSubscriber.prototype._next = function (value) {
-        this.value = value;
-        this.hasValue = true;
-    };
-    SampleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.emitValue();
-    };
-    SampleSubscriber.prototype.notifyComplete = function () {
-        this.emitValue();
-    };
-    SampleSubscriber.prototype.emitValue = function () {
-        if (this.hasValue) {
-            this.hasValue = false;
-            this.destination.next(this.value);
-        }
-    };
-    return SampleSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=sample.js.map
+class Ora {
+	constructor(options) {
+		if (typeof options === 'string') {
+			options = {
+				text: options
+			};
+		}
 
+		this.options = Object.assign({
+			text: '',
+			color: 'cyan',
+			stream: process.stderr
+		}, options);
 
-/***/ }),
-/* 442 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		const sp = this.options.spinner;
+		this.spinner = typeof sp === 'object' ? sp : (process.platform === 'win32' ? cliSpinners.line : (cliSpinners[sp] || cliSpinners.dots)); // eslint-disable-line no-nested-ternary
 
-"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__(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 */
+		if (this.spinner.frames === undefined) {
+			throw new Error('Spinner must define `frames`');
+		}
 
+		this.text = this.options.text;
+		this.color = this.options.color;
+		this.interval = this.options.interval || this.spinner.interval || 100;
+		this.stream = this.options.stream;
+		this.id = null;
+		this.frameIndex = 0;
+		this.enabled = typeof this.options.enabled === 'boolean' ? this.options.enabled : ((this.stream && this.stream.isTTY) && !process.env.CI);
+	}
+	frame() {
+		const frames = this.spinner.frames;
+		let frame = frames[this.frameIndex];
 
+		if (this.color) {
+			frame = chalk[this.color](frame);
+		}
 
-function sampleTime(period, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
-    }
-    return function (source) { return source.lift(new SampleTimeOperator(period, scheduler)); };
-}
-var SampleTimeOperator = /*@__PURE__*/ (function () {
-    function SampleTimeOperator(period, scheduler) {
-        this.period = period;
-        this.scheduler = scheduler;
-    }
-    SampleTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SampleTimeSubscriber(subscriber, this.period, this.scheduler));
-    };
-    return SampleTimeOperator;
-}());
-var SampleTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SampleTimeSubscriber, _super);
-    function SampleTimeSubscriber(destination, period, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.period = period;
-        _this.scheduler = scheduler;
-        _this.hasValue = false;
-        _this.add(scheduler.schedule(dispatchNotification, period, { subscriber: _this, period: period }));
-        return _this;
-    }
-    SampleTimeSubscriber.prototype._next = function (value) {
-        this.lastValue = value;
-        this.hasValue = true;
-    };
-    SampleTimeSubscriber.prototype.notifyNext = function () {
-        if (this.hasValue) {
-            this.hasValue = false;
-            this.destination.next(this.lastValue);
-        }
-    };
-    return SampleTimeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-function dispatchNotification(state) {
-    var subscriber = state.subscriber, period = state.period;
-    subscriber.notifyNext();
-    this.schedule(state, period);
-}
-//# sourceMappingURL=sampleTime.js.map
+		this.frameIndex = ++this.frameIndex % frames.length;
 
+		return frame + ' ' + this.text;
+	}
+	clear() {
+		if (!this.enabled) {
+			return this;
+		}
 
-/***/ }),
-/* 443 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		this.stream.clearLine();
+		this.stream.cursorTo(0);
 
-"use strict";
-__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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+		return this;
+	}
+	render() {
+		this.clear();
+		this.stream.write(this.frame());
 
+		return this;
+	}
+	start(text) {
+		if (text) {
+			this.text = text;
+		}
 
-function sequenceEqual(compareTo, comparator) {
-    return function (source) { return source.lift(new SequenceEqualOperator(compareTo, comparator)); };
-}
-var SequenceEqualOperator = /*@__PURE__*/ (function () {
-    function SequenceEqualOperator(compareTo, comparator) {
-        this.compareTo = compareTo;
-        this.comparator = comparator;
-    }
-    SequenceEqualOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SequenceEqualSubscriber(subscriber, this.compareTo, this.comparator));
-    };
-    return SequenceEqualOperator;
-}());
+		if (!this.enabled || this.id) {
+			return this;
+		}
 
-var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SequenceEqualSubscriber, _super);
-    function SequenceEqualSubscriber(destination, compareTo, comparator) {
-        var _this = _super.call(this, destination) || this;
-        _this.compareTo = compareTo;
-        _this.comparator = comparator;
-        _this._a = [];
-        _this._b = [];
-        _this._oneComplete = false;
-        _this.destination.add(compareTo.subscribe(new SequenceEqualCompareToSubscriber(destination, _this)));
-        return _this;
-    }
-    SequenceEqualSubscriber.prototype._next = function (value) {
-        if (this._oneComplete && this._b.length === 0) {
-            this.emit(false);
-        }
-        else {
-            this._a.push(value);
-            this.checkValues();
-        }
-    };
-    SequenceEqualSubscriber.prototype._complete = function () {
-        if (this._oneComplete) {
-            this.emit(this._a.length === 0 && this._b.length === 0);
-        }
-        else {
-            this._oneComplete = true;
-        }
-        this.unsubscribe();
-    };
-    SequenceEqualSubscriber.prototype.checkValues = function () {
-        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;
-            try {
-                areEqual = comparator ? comparator(a, b) : a === b;
-            }
-            catch (e) {
-                this.destination.error(e);
-            }
-            if (!areEqual) {
-                this.emit(false);
-            }
-        }
-    };
-    SequenceEqualSubscriber.prototype.emit = function (value) {
-        var destination = this.destination;
-        destination.next(value);
-        destination.complete();
-    };
-    SequenceEqualSubscriber.prototype.nextB = function (value) {
-        if (this._oneComplete && this._a.length === 0) {
-            this.emit(false);
-        }
-        else {
-            this._b.push(value);
-            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"]));
+		cliCursor.hide(this.stream);
+		this.render();
+		this.id = setInterval(this.render.bind(this), this.interval);
 
-var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SequenceEqualCompareToSubscriber, _super);
-    function SequenceEqualCompareToSubscriber(destination, parent) {
-        var _this = _super.call(this, destination) || this;
-        _this.parent = parent;
-        return _this;
-    }
-    SequenceEqualCompareToSubscriber.prototype._next = function (value) {
-        this.parent.nextB(value);
-    };
-    SequenceEqualCompareToSubscriber.prototype._error = function (err) {
-        this.parent.error(err);
-        this.unsubscribe();
-    };
-    SequenceEqualCompareToSubscriber.prototype._complete = function () {
-        this.parent.completeB();
-        this.unsubscribe();
-    };
-    return SequenceEqualCompareToSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=sequenceEqual.js.map
+		return this;
+	}
+	stop() {
+		if (!this.enabled) {
+			return this;
+		}
 
+		clearInterval(this.id);
+		this.id = null;
+		this.frameIndex = 0;
+		this.clear();
+		cliCursor.show(this.stream);
 
-/***/ }),
-/* 444 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		return this;
+	}
+	succeed(text) {
+		return this.stopAndPersist({symbol: logSymbols.success, text});
+	}
+	fail(text) {
+		return this.stopAndPersist({symbol: logSymbols.error, text});
+	}
+	warn(text) {
+		return this.stopAndPersist({symbol: logSymbols.warning, text});
+	}
+	info(text) {
+		return this.stopAndPersist({symbol: logSymbols.info, text});
+	}
+	stopAndPersist(options) {
+		if (!this.enabled) {
+			return this;
+		}
 
-"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__(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 */
+		// Legacy argument
+		// TODO: Deprecate sometime in the future
+		if (typeof options === 'string') {
+			options = {
+				symbol: options
+			};
+		}
 
+		options = options || {};
 
+		this.stop();
+		this.stream.write(`${options.symbol || ' '} ${options.text || this.text}\n`);
 
-function shareSubjectFactory() {
-    return new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]();
-}
-function share() {
-    return function (source) { return Object(_refCount__WEBPACK_IMPORTED_MODULE_1__["refCount"])()(Object(_multicast__WEBPACK_IMPORTED_MODULE_0__["multicast"])(shareSubjectFactory)(source)); };
+		return this;
+	}
 }
-//# sourceMappingURL=share.js.map
 
+module.exports = function (opts) {
+	return new Ora(opts);
+};
 
-/***/ }),
-/* 445 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+module.exports.promise = (action, options) => {
+	if (typeof action.then !== 'function') {
+		throw new TypeError('Parameter `action` must be a Promise');
+	}
 
-"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__(300);
-/** PURE_IMPORTS_START _ReplaySubject PURE_IMPORTS_END */
+	const spinner = new Ora(options);
+	spinner.start();
 
-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(_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;
-    var hasError = false;
-    var isComplete = false;
-    return function shareReplayOperation(source) {
-        refCount++;
-        if (!subject || hasError) {
-            hasError = false;
-            subject = new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, scheduler);
-            subscription = source.subscribe({
-                next: function (value) { subject.next(value); },
-                error: function (err) {
-                    hasError = true;
-                    subject.error(err);
-                },
-                complete: function () {
-                    isComplete = true;
-                    subject.complete();
-                },
-            });
-        }
-        var innerSub = subject.subscribe(this);
-        this.add(function () {
-            refCount--;
-            innerSub.unsubscribe();
-            if (subscription && !isComplete && useRefCount && refCount === 0) {
-                subscription.unsubscribe();
-                subscription = undefined;
-                subject = undefined;
-            }
-        });
-    };
-}
-//# sourceMappingURL=shareReplay.js.map
+	action.then(
+		() => {
+			spinner.succeed();
+		},
+		() => {
+			spinner.fail();
+		}
+	);
+
+	return spinner;
+};
 
 
 /***/ }),
-/* 446 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 676 */
+/***/ (function(module, 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__(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 */
 
+const escapeStringRegexp = __webpack_require__(3);
+const ansiStyles = __webpack_require__(677);
+const stdoutColor = __webpack_require__(678).stdout;
+
+const template = __webpack_require__(679);
 
+const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm');
 
-function single(predicate) {
-    return function (source) { return source.lift(new SingleOperator(predicate, source)); };
+// `supportsColor.level` → `ansiStyles.color[name]` mapping
+const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m'];
+
+// `color-convert` models to exclude from the Chalk API due to conflicts and such
+const skipModels = new Set(['gray']);
+
+const styles = Object.create(null);
+
+function applyOptions(obj, options) {
+	options = options || {};
+
+	// Detect level if not set manually
+	const scLevel = stdoutColor ? stdoutColor.level : 0;
+	obj.level = options.level === undefined ? scLevel : options.level;
+	obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0;
 }
-var SingleOperator = /*@__PURE__*/ (function () {
-    function SingleOperator(predicate, source) {
-        this.predicate = predicate;
-        this.source = source;
-    }
-    SingleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SingleSubscriber(subscriber, this.predicate, this.source));
-    };
-    return SingleOperator;
-}());
-var SingleSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SingleSubscriber, _super);
-    function SingleSubscriber(destination, predicate, source) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.source = source;
-        _this.seenValue = false;
-        _this.index = 0;
-        return _this;
-    }
-    SingleSubscriber.prototype.applySingleValue = function (value) {
-        if (this.seenValue) {
-            this.destination.error('Sequence contains more than one element');
-        }
-        else {
-            this.seenValue = true;
-            this.singleValue = value;
-        }
-    };
-    SingleSubscriber.prototype._next = function (value) {
-        var index = this.index++;
-        if (this.predicate) {
-            this.tryNext(value, index);
-        }
-        else {
-            this.applySingleValue(value);
-        }
-    };
-    SingleSubscriber.prototype.tryNext = function (value, index) {
-        try {
-            if (this.predicate(value, index, this.source)) {
-                this.applySingleValue(value);
-            }
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    SingleSubscriber.prototype._complete = function () {
-        var destination = this.destination;
-        if (this.index > 0) {
-            destination.next(this.seenValue ? this.singleValue : undefined);
-            destination.complete();
-        }
-        else {
-            destination.error(new _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__["EmptyError"]);
-        }
-    };
-    return SingleSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=single.js.map
 
+function Chalk(options) {
+	// We check for this.template here since calling `chalk.constructor()`
+	// by itself will have a `this` of a previously constructed chalk object
+	if (!this || !(this instanceof Chalk) || this.template) {
+		const chalk = {};
+		applyOptions(chalk, options);
 
-/***/ }),
-/* 447 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		chalk.template = function () {
+			const args = [].slice.call(arguments);
+			return chalkTag.apply(null, [chalk.template].concat(args));
+		};
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+		Object.setPrototypeOf(chalk, Chalk.prototype);
+		Object.setPrototypeOf(chalk.template, chalk);
+
+		chalk.template.constructor = Chalk;
 
+		return chalk.template;
+	}
 
-function skip(count) {
-    return function (source) { return source.lift(new SkipOperator(count)); };
+	applyOptions(this, options);
 }
-var SkipOperator = /*@__PURE__*/ (function () {
-    function SkipOperator(total) {
-        this.total = total;
-    }
-    SkipOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SkipSubscriber(subscriber, this.total));
-    };
-    return SkipOperator;
-}());
-var SkipSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipSubscriber, _super);
-    function SkipSubscriber(destination, total) {
-        var _this = _super.call(this, destination) || this;
-        _this.total = total;
-        _this.count = 0;
-        return _this;
-    }
-    SkipSubscriber.prototype._next = function (x) {
-        if (++this.count > this.total) {
-            this.destination.next(x);
-        }
-    };
-    return SkipSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=skip.js.map
 
+// Use bright blue on Windows as the normal blue color is illegible
+if (isSimpleWindowsTerm) {
+	ansiStyles.blue.open = '\u001B[94m';
+}
 
-/***/ }),
-/* 448 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+for (const key of Object.keys(ansiStyles)) {
+	ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
 
-"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__(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 */
+	styles[key] = {
+		get() {
+			const codes = ansiStyles[key];
+			return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key);
+		}
+	};
+}
 
+styles.visible = {
+	get() {
+		return build.call(this, this._styles || [], true, 'visible');
+	}
+};
 
+ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g');
+for (const model of Object.keys(ansiStyles.color.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
 
-function skipLast(count) {
-    return function (source) { return source.lift(new SkipLastOperator(count)); };
+	styles[model] = {
+		get() {
+			const level = this.level;
+			return function () {
+				const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments);
+				const codes = {
+					open,
+					close: ansiStyles.color.close,
+					closeRe: ansiStyles.color.closeRe
+				};
+				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
+			};
+		}
+	};
 }
-var SkipLastOperator = /*@__PURE__*/ (function () {
-    function SkipLastOperator(_skipCount) {
-        this._skipCount = _skipCount;
-        if (this._skipCount < 0) {
-            throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"];
-        }
-    }
-    SkipLastOperator.prototype.call = function (subscriber, source) {
-        if (this._skipCount === 0) {
-            return source.subscribe(new _Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"](subscriber));
-        }
-        else {
-            return source.subscribe(new SkipLastSubscriber(subscriber, this._skipCount));
-        }
-    };
-    return SkipLastOperator;
-}());
-var SkipLastSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipLastSubscriber, _super);
-    function SkipLastSubscriber(destination, _skipCount) {
-        var _this = _super.call(this, destination) || this;
-        _this._skipCount = _skipCount;
-        _this._count = 0;
-        _this._ring = new Array(_skipCount);
-        return _this;
-    }
-    SkipLastSubscriber.prototype._next = function (value) {
-        var skipCount = this._skipCount;
-        var count = this._count++;
-        if (count < skipCount) {
-            this._ring[count] = value;
-        }
-        else {
-            var currentIndex = count % skipCount;
-            var ring = this._ring;
-            var oldValue = ring[currentIndex];
-            ring[currentIndex] = value;
-            this.destination.next(oldValue);
-        }
-    };
-    return SkipLastSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=skipLast.js.map
 
+ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g');
+for (const model of Object.keys(ansiStyles.bgColor.ansi)) {
+	if (skipModels.has(model)) {
+		continue;
+	}
 
-/***/ }),
-/* 449 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1);
+	styles[bgModel] = {
+		get() {
+			const level = this.level;
+			return function () {
+				const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments);
+				const codes = {
+					open,
+					close: ansiStyles.bgColor.close,
+					closeRe: ansiStyles.bgColor.closeRe
+				};
+				return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model);
+			};
+		}
+	};
+}
 
-"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__(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 */
+const proto = Object.defineProperties(() => {}, styles);
+
+function build(_styles, _empty, key) {
+	const builder = function () {
+		return applyStyle.apply(builder, arguments);
+	};
 
+	builder._styles = _styles;
+	builder._empty = _empty;
 
+	const self = this;
 
+	Object.defineProperty(builder, 'level', {
+		enumerable: true,
+		get() {
+			return self.level;
+		},
+		set(level) {
+			self.level = level;
+		}
+	});
 
-function skipUntil(notifier) {
-    return function (source) { return source.lift(new SkipUntilOperator(notifier)); };
+	Object.defineProperty(builder, 'enabled', {
+		enumerable: true,
+		get() {
+			return self.enabled;
+		},
+		set(enabled) {
+			self.enabled = enabled;
+		}
+	});
+
+	// See below for fix regarding invisible grey/dim combination on Windows
+	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';
+
+	// `__proto__` is used because we must return a function, but there is
+	// no way to create a function with a different prototype
+	builder.__proto__ = proto; // eslint-disable-line no-proto
+
+	return builder;
 }
-var SkipUntilOperator = /*@__PURE__*/ (function () {
-    function SkipUntilOperator(notifier) {
-        this.notifier = notifier;
-    }
-    SkipUntilOperator.prototype.call = function (destination, source) {
-        return source.subscribe(new SkipUntilSubscriber(destination, this.notifier));
-    };
-    return SkipUntilOperator;
-}());
-var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipUntilSubscriber, _super);
-    function SkipUntilSubscriber(destination, notifier) {
-        var _this = _super.call(this, destination) || this;
-        _this.hasValue = false;
-        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) {
-        if (this.hasValue) {
-            _super.prototype._next.call(this, value);
-        }
-    };
-    SkipUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.hasValue = true;
-        if (this.innerSubscription) {
-            this.innerSubscription.unsubscribe();
-        }
-    };
-    SkipUntilSubscriber.prototype.notifyComplete = function () {
-    };
-    return SkipUntilSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=skipUntil.js.map
 
+function applyStyle() {
+	// Support varags, but simply cast to string in case there's only one arg
+	const args = arguments;
+	const argsLen = args.length;
+	let str = String(arguments[0]);
+
+	if (argsLen === 0) {
+		return '';
+	}
+
+	if (argsLen > 1) {
+		// Don't slice `arguments`, it prevents V8 optimizations
+		for (let a = 1; a < argsLen; a++) {
+			str += ' ' + args[a];
+		}
+	}
+
+	if (!this.enabled || this.level <= 0 || !str) {
+		return this._empty ? '' : str;
+	}
+
+	// Turns out that on Windows dimmed gray text becomes invisible in cmd.exe,
+	// see https://github.com/chalk/chalk/issues/58
+	// If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop.
+	const originalDim = ansiStyles.dim.open;
+	if (isSimpleWindowsTerm && this.hasGrey) {
+		ansiStyles.dim.open = '';
+	}
 
-/***/ }),
-/* 450 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	for (const code of this._styles.slice().reverse()) {
+		// Replace any instances already present with a re-opening code
+		// otherwise only the part of the string until said closing code
+		// will be colored, and the rest will simply be 'plain'.
+		str = code.open + str.replace(code.closeRe, code.open) + code.close;
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+		// Close the styling before a linebreak and reopen
+		// after next line to fix a bleed issue on macOS
+		// https://github.com/chalk/chalk/pull/92
+		str = str.replace(/\r?\n/g, `${code.close}$&${code.open}`);
+	}
 
+	// Reset the original `dim` if we changed it to work around the Windows dimmed gray issue
+	ansiStyles.dim.open = originalDim;
 
-function skipWhile(predicate) {
-    return function (source) { return source.lift(new SkipWhileOperator(predicate)); };
+	return str;
 }
-var SkipWhileOperator = /*@__PURE__*/ (function () {
-    function SkipWhileOperator(predicate) {
-        this.predicate = predicate;
-    }
-    SkipWhileOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SkipWhileSubscriber(subscriber, this.predicate));
-    };
-    return SkipWhileOperator;
-}());
-var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipWhileSubscriber, _super);
-    function SkipWhileSubscriber(destination, predicate) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.skipping = true;
-        _this.index = 0;
-        return _this;
-    }
-    SkipWhileSubscriber.prototype._next = function (value) {
-        var destination = this.destination;
-        if (this.skipping) {
-            this.tryCallPredicate(value);
-        }
-        if (!this.skipping) {
-            destination.next(value);
-        }
-    };
-    SkipWhileSubscriber.prototype.tryCallPredicate = function (value) {
-        try {
-            var result = this.predicate(value, this.index++);
-            this.skipping = Boolean(result);
-        }
-        catch (err) {
-            this.destination.error(err);
-        }
-    };
-    return SkipWhileSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=skipWhile.js.map
-
 
-/***/ }),
-/* 451 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+function chalkTag(chalk, strings) {
+	if (!Array.isArray(strings)) {
+		// If chalk() was called by itself or with a string,
+		// return the string itself as a string.
+		return [].slice.call(arguments, 1).join(' ');
+	}
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return startWith; });
-/* 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 */
+	const args = [].slice.call(arguments, 2);
+	const parts = [strings.raw[0]];
 
+	for (let i = 1; i < strings.length; i++) {
+		parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
+		parts.push(String(strings.raw[i]));
+	}
 
-function startWith() {
-    var array = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        array[_i] = arguments[_i];
-    }
-    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); };
-    }
+	return template(chalk, parts.join(''));
 }
-//# sourceMappingURL=startWith.js.map
+
+Object.defineProperties(Chalk.prototype, styles);
+
+module.exports = Chalk(); // eslint-disable-line new-cap
+module.exports.supportsColor = stdoutColor;
+module.exports.default = module.exports; // For TypeScript
 
 
 /***/ }),
-/* 452 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 677 */
+/***/ (function(module, 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__(453);
-/** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */
+/* WEBPACK VAR INJECTION */(function(module) {
+const colorConvert = __webpack_require__(6);
 
-function subscribeOn(scheduler, delay) {
-    if (delay === void 0) {
-        delay = 0;
-    }
-    return function subscribeOnOperatorFunction(source) {
-        return source.lift(new SubscribeOnOperator(scheduler, delay));
-    };
-}
-var SubscribeOnOperator = /*@__PURE__*/ (function () {
-    function SubscribeOnOperator(scheduler, delay) {
-        this.scheduler = scheduler;
-        this.delay = delay;
-    }
-    SubscribeOnOperator.prototype.call = function (subscriber, source) {
-        return new _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__["SubscribeOnObservable"](source, this.delay, this.scheduler).subscribe(subscriber);
-    };
-    return SubscribeOnOperator;
-}());
-//# sourceMappingURL=subscribeOn.js.map
+const wrapAnsi16 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${code + offset}m`;
+};
 
+const wrapAnsi256 = (fn, offset) => function () {
+	const code = fn.apply(colorConvert, arguments);
+	return `\u001B[${38 + offset};5;${code}m`;
+};
 
-/***/ }),
-/* 453 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const wrapAnsi16m = (fn, offset) => function () {
+	const rgb = fn.apply(colorConvert, arguments);
+	return `\u001B[${38 + offset};2;${rgb[0]};${rgb[1]};${rgb[2]}m`;
+};
 
-"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__(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 */
+function assembleStyles() {
+	const codes = new Map();
+	const styles = {
+		modifier: {
+			reset: [0, 0],
+			// 21 isn't widely supported and 22 does the same thing
+			bold: [1, 22],
+			dim: [2, 22],
+			italic: [3, 23],
+			underline: [4, 24],
+			inverse: [7, 27],
+			hidden: [8, 28],
+			strikethrough: [9, 29]
+		},
+		color: {
+			black: [30, 39],
+			red: [31, 39],
+			green: [32, 39],
+			yellow: [33, 39],
+			blue: [34, 39],
+			magenta: [35, 39],
+			cyan: [36, 39],
+			white: [37, 39],
+			gray: [90, 39],
+
+			// Bright color
+			redBright: [91, 39],
+			greenBright: [92, 39],
+			yellowBright: [93, 39],
+			blueBright: [94, 39],
+			magentaBright: [95, 39],
+			cyanBright: [96, 39],
+			whiteBright: [97, 39]
+		},
+		bgColor: {
+			bgBlack: [40, 49],
+			bgRed: [41, 49],
+			bgGreen: [42, 49],
+			bgYellow: [43, 49],
+			bgBlue: [44, 49],
+			bgMagenta: [45, 49],
+			bgCyan: [46, 49],
+			bgWhite: [47, 49],
 
+			// Bright color
+			bgBlackBright: [100, 49],
+			bgRedBright: [101, 49],
+			bgGreenBright: [102, 49],
+			bgYellowBright: [103, 49],
+			bgBlueBright: [104, 49],
+			bgMagentaBright: [105, 49],
+			bgCyanBright: [106, 49],
+			bgWhiteBright: [107, 49]
+		}
+	};
 
+	// Fix humans
+	styles.color.grey = styles.color.gray;
 
+	for (const groupName of Object.keys(styles)) {
+		const group = styles[groupName];
 
-var SubscribeOnObservable = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscribeOnObservable, _super);
-    function SubscribeOnObservable(source, delayTime, scheduler) {
-        if (delayTime === void 0) {
-            delayTime = 0;
-        }
-        if (scheduler === void 0) {
-            scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"];
-        }
-        var _this = _super.call(this) || this;
-        _this.source = source;
-        _this.delayTime = delayTime;
-        _this.scheduler = scheduler;
-        if (!Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_3__["isNumeric"])(delayTime) || delayTime < 0) {
-            _this.delayTime = 0;
-        }
-        if (!scheduler || typeof scheduler.schedule !== 'function') {
-            _this.scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"];
-        }
-        return _this;
-    }
-    SubscribeOnObservable.create = function (source, delay, scheduler) {
-        if (delay === void 0) {
-            delay = 0;
-        }
-        if (scheduler === void 0) {
-            scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"];
-        }
-        return new SubscribeOnObservable(source, delay, scheduler);
-    };
-    SubscribeOnObservable.dispatch = function (arg) {
-        var source = arg.source, subscriber = arg.subscriber;
-        return this.add(source.subscribe(subscriber));
-    };
-    SubscribeOnObservable.prototype._subscribe = function (subscriber) {
-        var delay = this.delayTime;
-        var source = this.source;
-        var scheduler = this.scheduler;
-        return scheduler.schedule(SubscribeOnObservable.dispatch, delay, {
-            source: source, subscriber: subscriber
-        });
-    };
-    return SubscribeOnObservable;
-}(_Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"]));
+		for (const styleName of Object.keys(group)) {
+			const style = group[styleName];
 
-//# sourceMappingURL=SubscribeOnObservable.js.map
+			styles[styleName] = {
+				open: `\u001B[${style[0]}m`,
+				close: `\u001B[${style[1]}m`
+			};
 
+			group[styleName] = styles[styleName];
 
-/***/ }),
-/* 454 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+			codes.set(style[0], style[1]);
+		}
 
-"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__(455);
-/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(327);
-/** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */
+		Object.defineProperty(styles, groupName, {
+			value: group,
+			enumerable: false
+		});
 
+		Object.defineProperty(styles, 'codes', {
+			value: codes,
+			enumerable: false
+		});
+	}
 
-function switchAll() {
-    return Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"]);
-}
-//# sourceMappingURL=switchAll.js.map
+	const ansi2ansi = n => n;
+	const rgb2rgb = (r, g, b) => [r, g, b];
 
+	styles.color.close = '\u001B[39m';
+	styles.bgColor.close = '\u001B[49m';
 
-/***/ }),
-/* 455 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	styles.color.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 0)
+	};
+	styles.color.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 0)
+	};
+	styles.color.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 0)
+	};
 
-"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__(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 */
+	styles.bgColor.ansi = {
+		ansi: wrapAnsi16(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi256 = {
+		ansi256: wrapAnsi256(ansi2ansi, 10)
+	};
+	styles.bgColor.ansi16m = {
+		rgb: wrapAnsi16m(rgb2rgb, 10)
+	};
 
+	for (let key of Object.keys(colorConvert)) {
+		if (typeof colorConvert[key] !== 'object') {
+			continue;
+		}
 
+		const suite = colorConvert[key];
+
+		if (key === 'ansi16') {
+			key = 'ansi';
+		}
 
+		if ('ansi16' in suite) {
+			styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0);
+			styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10);
+		}
 
+		if ('ansi256' in suite) {
+			styles.color.ansi256[key] = wrapAnsi256(suite.ansi256, 0);
+			styles.bgColor.ansi256[key] = wrapAnsi256(suite.ansi256, 10);
+		}
 
+		if ('rgb' in suite) {
+			styles.color.ansi16m[key] = wrapAnsi16m(suite.rgb, 0);
+			styles.bgColor.ansi16m[key] = wrapAnsi16m(suite.rgb, 10);
+		}
+	}
 
-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_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)); };
+	return styles;
 }
-var SwitchMapOperator = /*@__PURE__*/ (function () {
-    function SwitchMapOperator(project) {
-        this.project = project;
-    }
-    SwitchMapOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new SwitchMapSubscriber(subscriber, this.project));
-    };
-    return SwitchMapOperator;
-}());
-var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SwitchMapSubscriber, _super);
-    function SwitchMapSubscriber(destination, project) {
-        var _this = _super.call(this, destination) || this;
-        _this.project = project;
-        _this.index = 0;
-        return _this;
-    }
-    SwitchMapSubscriber.prototype._next = function (value) {
-        var result;
-        var index = this.index++;
-        try {
-            result = this.project(value, index);
-        }
-        catch (error) {
-            this.destination.error(error);
-            return;
-        }
-        this._innerSub(result, value, index);
-    };
-    SwitchMapSubscriber.prototype._innerSub = function (result, value, index) {
-        var innerSubscription = this.innerSubscription;
-        if (innerSubscription) {
-            innerSubscription.unsubscribe();
-        }
-        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) {
-        var destination = this.destination;
-        destination.remove(innerSub);
-        this.innerSubscription = null;
-        if (this.isStopped) {
-            _super.prototype._complete.call(this);
-        }
-    };
-    SwitchMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.destination.next(innerValue);
-    };
-    return SwitchMapSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=switchMap.js.map
 
+// Make the export immutable
+Object.defineProperty(module, 'exports', {
+	enumerable: true,
+	get: assembleStyles
+});
+
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
 
 /***/ }),
-/* 456 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 678 */
+/***/ (function(module, 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__(455);
-/** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */
 
-function switchMapTo(innerObservable, resultSelector) {
-    return resultSelector ? Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; }, resultSelector) : Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; });
-}
-//# sourceMappingURL=switchMapTo.js.map
+const os = __webpack_require__(11);
+const hasFlag = __webpack_require__(12);
 
+const env = process.env;
 
-/***/ }),
-/* 457 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+let forceColor;
+if (hasFlag('no-color') ||
+	hasFlag('no-colors') ||
+	hasFlag('color=false')) {
+	forceColor = false;
+} else if (hasFlag('color') ||
+	hasFlag('colors') ||
+	hasFlag('color=true') ||
+	hasFlag('color=always')) {
+	forceColor = true;
+}
+if ('FORCE_COLOR' in env) {
+	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+}
 
-"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__(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 */
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
 
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+}
 
+function supportsColor(stream) {
+	if (forceColor === false) {
+		return 0;
+	}
 
-function takeUntil(notifier) {
-    return function (source) { return source.lift(new TakeUntilOperator(notifier)); };
-}
-var TakeUntilOperator = /*@__PURE__*/ (function () {
-    function TakeUntilOperator(notifier) {
-        this.notifier = notifier;
-    }
-    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 && !takeUntilSubscriber.seenValue) {
-            takeUntilSubscriber.add(notifierSubscription);
-            return source.subscribe(takeUntilSubscriber);
-        }
-        return takeUntilSubscriber;
-    };
-    return TakeUntilOperator;
-}());
-var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeUntilSubscriber, _super);
-    function TakeUntilSubscriber(destination) {
-        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 () {
-    };
-    return TakeUntilSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=takeUntil.js.map
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
 
+	if (hasFlag('color=256')) {
+		return 2;
+	}
 
-/***/ }),
-/* 458 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	if (stream && !stream.isTTY && forceColor !== true) {
+		// VS code debugger doesn't have isTTY set
+		if (env.VSCODE_PID) {
+			return 1;
+		}
+		return 0;
+	}
 
-"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__(279);
-/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(278);
-/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */
+	const min = forceColor ? 1 : 0;
 
+	if (process.platform === 'win32') {
+		// Node.js 7.5.0 is the first version of Node.js to include a patch to
+		// libuv that enables 256 color output on Windows. Anything earlier and it
+		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
+		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
+		// release that supports 256 colors. Windows 10 build 14931 is the first release
+		// that supports 16m/TrueColor.
+		const osRelease = os.release().split('.');
+		if (
+			Number(process.versions.node.split('.')[0]) >= 8 &&
+			Number(osRelease[0]) >= 10 &&
+			Number(osRelease[2]) >= 10586
+		) {
+			return Number(osRelease[2]) >= 14931 ? 3 : 2;
+		}
 
-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, inclusive) {
-        this.predicate = predicate;
-        this.inclusive = inclusive;
-    }
-    TakeWhileOperator.prototype.call = function (subscriber, source) {
-        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, inclusive) {
-        var _this = _super.call(this, destination) || this;
-        _this.predicate = predicate;
-        _this.inclusive = inclusive;
-        _this.index = 0;
-        return _this;
-    }
-    TakeWhileSubscriber.prototype._next = function (value) {
-        var destination = this.destination;
-        var result;
-        try {
-            result = this.predicate(value, this.index++);
-        }
-        catch (err) {
-            destination.error(err);
-            return;
-        }
-        this.nextOrComplete(value, result);
-    };
-    TakeWhileSubscriber.prototype.nextOrComplete = function (value, predicateResult) {
-        var destination = this.destination;
-        if (Boolean(predicateResult)) {
-            destination.next(value);
-        }
-        else {
-            if (this.inclusive) {
-                destination.next(value);
-            }
-            destination.complete();
-        }
-    };
-    return TakeWhileSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=takeWhile.js.map
+		return 1;
+	}
 
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
 
-/***/ }),
-/* 459 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+		return min;
+	}
 
-"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 */
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
 
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
 
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
 
+		switch (env.TERM_PROGRAM) {
+			case 'iTerm.app':
+				return version >= 3 ? 3 : 2;
+			case 'Apple_Terminal':
+				return 2;
+			// No default
+		}
+	}
 
-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
+	if (/-256(color)?$/i.test(env.TERM)) {
+		return 2;
+	}
 
+	if (/^screen|^xterm|^vt100|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
 
-/***/ }),
-/* 460 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	if ('COLORTERM' in env) {
+		return 1;
+	}
 
-"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__(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 */
+	if (env.TERM === 'dumb') {
+		return min;
+	}
 
+	return min;
+}
 
+function getSupportLevel(stream) {
+	const level = supportsColor(stream);
+	return translateLevel(level);
+}
 
-var defaultThrottleConfig = {
-    leading: true,
-    trailing: false
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
 };
-function throttle(durationSelector, config) {
-    if (config === void 0) {
-        config = defaultThrottleConfig;
-    }
-    return function (source) { return source.lift(new ThrottleOperator(durationSelector, config.leading, config.trailing)); };
-}
-var ThrottleOperator = /*@__PURE__*/ (function () {
-    function ThrottleOperator(durationSelector, leading, trailing) {
-        this.durationSelector = durationSelector;
-        this.leading = leading;
-        this.trailing = trailing;
-    }
-    ThrottleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ThrottleSubscriber(subscriber, this.durationSelector, this.leading, this.trailing));
-    };
-    return ThrottleOperator;
-}());
-var ThrottleSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrottleSubscriber, _super);
-    function ThrottleSubscriber(destination, durationSelector, _leading, _trailing) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.durationSelector = durationSelector;
-        _this._leading = _leading;
-        _this._trailing = _trailing;
-        _this._hasValue = false;
-        return _this;
-    }
-    ThrottleSubscriber.prototype._next = function (value) {
-        this._hasValue = true;
-        this._sendValue = value;
-        if (!this._throttled) {
-            if (this._leading) {
-                this.send();
-            }
-            else {
-                this.throttle(value);
-            }
-        }
-    };
-    ThrottleSubscriber.prototype.send = function () {
-        var _a = this, _hasValue = _a._hasValue, _sendValue = _a._sendValue;
-        if (_hasValue) {
-            this.destination.next(_sendValue);
-            this.throttle(_sendValue);
-        }
-        this._hasValue = false;
-        this._sendValue = null;
-    };
-    ThrottleSubscriber.prototype.throttle = function (value) {
-        var duration = this.tryDurationSelector(value);
-        if (!!duration) {
-            this.add(this._throttled = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration));
-        }
-    };
-    ThrottleSubscriber.prototype.tryDurationSelector = function (value) {
-        try {
-            return this.durationSelector(value);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return null;
-        }
-    };
-    ThrottleSubscriber.prototype.throttlingDone = function () {
-        var _a = this, _throttled = _a._throttled, _trailing = _a._trailing;
-        if (_throttled) {
-            _throttled.unsubscribe();
-        }
-        this._throttled = null;
-        if (_trailing) {
-            this.send();
-        }
-    };
-    ThrottleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.throttlingDone();
-    };
-    ThrottleSubscriber.prototype.notifyComplete = function () {
-        this.throttlingDone();
-    };
-    return ThrottleSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=throttle.js.map
 
 
 /***/ }),
-/* 461 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 679 */
+/***/ (function(module, 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__(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 */
 
+const TEMPLATE_REGEX = /(?:\\(u[a-f\d]{4}|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
+const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
+const STRING_REGEX = /^(['"])((?:\\.|(?!\1)[^\\])*)\1$/;
+const ESCAPE_REGEX = /\\(u[a-f\d]{4}|x[a-f\d]{2}|.)|([^\\])/gi;
 
+const ESCAPES = new Map([
+	['n', '\n'],
+	['r', '\r'],
+	['t', '\t'],
+	['b', '\b'],
+	['f', '\f'],
+	['v', '\v'],
+	['0', '\0'],
+	['\\', '\\'],
+	['e', '\u001B'],
+	['a', '\u0007']
+]);
 
+function unescape(c) {
+	if ((c[0] === 'u' && c.length === 5) || (c[0] === 'x' && c.length === 3)) {
+		return String.fromCharCode(parseInt(c.slice(1), 16));
+	}
 
-function throttleTime(duration, scheduler, config) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
-    }
-    if (config === void 0) {
-        config = _throttle__WEBPACK_IMPORTED_MODULE_3__["defaultThrottleConfig"];
-    }
-    return function (source) { return source.lift(new ThrottleTimeOperator(duration, scheduler, config.leading, config.trailing)); };
-}
-var ThrottleTimeOperator = /*@__PURE__*/ (function () {
-    function ThrottleTimeOperator(duration, scheduler, leading, trailing) {
-        this.duration = duration;
-        this.scheduler = scheduler;
-        this.leading = leading;
-        this.trailing = trailing;
-    }
-    ThrottleTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new ThrottleTimeSubscriber(subscriber, this.duration, this.scheduler, this.leading, this.trailing));
-    };
-    return ThrottleTimeOperator;
-}());
-var ThrottleTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrottleTimeSubscriber, _super);
-    function ThrottleTimeSubscriber(destination, duration, scheduler, leading, trailing) {
-        var _this = _super.call(this, destination) || this;
-        _this.duration = duration;
-        _this.scheduler = scheduler;
-        _this.leading = leading;
-        _this.trailing = trailing;
-        _this._hasTrailingValue = false;
-        _this._trailingValue = null;
-        return _this;
-    }
-    ThrottleTimeSubscriber.prototype._next = function (value) {
-        if (this.throttled) {
-            if (this.trailing) {
-                this._trailingValue = value;
-                this._hasTrailingValue = true;
-            }
-        }
-        else {
-            this.add(this.throttled = this.scheduler.schedule(dispatchNext, this.duration, { subscriber: this }));
-            if (this.leading) {
-                this.destination.next(value);
-            }
-            else if (this.trailing) {
-                this._trailingValue = value;
-                this._hasTrailingValue = true;
-            }
-        }
-    };
-    ThrottleTimeSubscriber.prototype._complete = function () {
-        if (this._hasTrailingValue) {
-            this.destination.next(this._trailingValue);
-            this.destination.complete();
-        }
-        else {
-            this.destination.complete();
-        }
-    };
-    ThrottleTimeSubscriber.prototype.clearThrottle = function () {
-        var throttled = this.throttled;
-        if (throttled) {
-            if (this.trailing && this._hasTrailingValue) {
-                this.destination.next(this._trailingValue);
-                this._trailingValue = null;
-                this._hasTrailingValue = false;
-            }
-            throttled.unsubscribe();
-            this.remove(throttled);
-            this.throttled = null;
-        }
-    };
-    return ThrottleTimeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-function dispatchNext(arg) {
-    var subscriber = arg.subscriber;
-    subscriber.clearThrottle();
+	return ESCAPES.get(c) || c;
 }
-//# sourceMappingURL=throttleTime.js.map
 
+function parseArguments(name, args) {
+	const results = [];
+	const chunks = args.trim().split(/\s*,\s*/g);
+	let matches;
 
-/***/ }),
-/* 462 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	for (const chunk of chunks) {
+		if (!isNaN(chunk)) {
+			results.push(Number(chunk));
+		} else if ((matches = chunk.match(STRING_REGEX))) {
+			results.push(matches[2].replace(ESCAPE_REGEX, (m, escape, chr) => escape ? unescape(escape) : chr));
+		} else {
+			throw new Error(`Invalid Chalk template style argument: ${chunk} (in style '${name}')`);
+		}
+	}
 
-"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__(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 */
+	return results;
+}
 
+function parseStyle(style) {
+	STYLE_REGEX.lastIndex = 0;
 
+	const results = [];
+	let matches;
 
+	while ((matches = STYLE_REGEX.exec(style)) !== null) {
+		const name = matches[1];
 
-function timeInterval(scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
-    }
-    return function (source) {
-        return Object(_observable_defer__WEBPACK_IMPORTED_MODULE_2__["defer"])(function () {
-            return source.pipe(Object(_scan__WEBPACK_IMPORTED_MODULE_1__["scan"])(function (_a, value) {
-                var current = _a.current;
-                return ({ value: value, current: scheduler.now(), last: current });
-            }, { current: scheduler.now(), value: undefined, last: undefined }), Object(_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (_a) {
-                var current = _a.current, last = _a.last, value = _a.value;
-                return new TimeInterval(value, current - last);
-            }));
-        });
-    };
+		if (matches[2]) {
+			const args = parseArguments(name, matches[2]);
+			results.push([name].concat(args));
+		} else {
+			results.push([name]);
+		}
+	}
+
+	return results;
 }
-var TimeInterval = /*@__PURE__*/ (function () {
-    function TimeInterval(value, interval) {
-        this.value = value;
-        this.interval = interval;
-    }
-    return TimeInterval;
-}());
 
-//# sourceMappingURL=timeInterval.js.map
+function buildStyle(chalk, styles) {
+	const enabled = {};
 
+	for (const layer of styles) {
+		for (const style of layer.styles) {
+			enabled[style[0]] = layer.inverse ? null : style.slice(1);
+		}
+	}
 
-/***/ }),
-/* 463 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	let current = chalk;
+	for (const styleName of Object.keys(enabled)) {
+		if (Array.isArray(enabled[styleName])) {
+			if (!(styleName in current)) {
+				throw new Error(`Unknown Chalk style: ${styleName}`);
+			}
 
-"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__(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 */
+			if (enabled[styleName].length > 0) {
+				current = current[styleName].apply(current, enabled[styleName]);
+			} else {
+				current = current[styleName];
+			}
+		}
+	}
+
+	return current;
+}
+
+module.exports = (chalk, tmp) => {
+	const styles = [];
+	const chunks = [];
+	let chunk = [];
+
+	// eslint-disable-next-line max-params
+	tmp.replace(TEMPLATE_REGEX, (m, escapeChar, inverse, style, close, chr) => {
+		if (escapeChar) {
+			chunk.push(unescape(escapeChar));
+		} else if (style) {
+			const str = chunk.join('');
+			chunk = [];
+			chunks.push(styles.length === 0 ? str : buildStyle(chalk, styles)(str));
+			styles.push({inverse, styles: parseStyle(style)});
+		} else if (close) {
+			if (styles.length === 0) {
+				throw new Error('Found extraneous } in Chalk template literal');
+			}
 
+			chunks.push(buildStyle(chalk, styles)(chunk.join('')));
+			chunk = [];
+			styles.pop();
+		} else {
+			chunk.push(chr);
+		}
+	});
 
+	chunks.push(chunk.join(''));
 
+	if (styles.length > 0) {
+		const errMsg = `Chalk template literal is missing ${styles.length} closing bracket${styles.length === 1 ? '' : 's'} (\`}\`)`;
+		throw new Error(errMsg);
+	}
 
-function timeout(due, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
-    }
-    return Object(_timeoutWith__WEBPACK_IMPORTED_MODULE_2__["timeoutWith"])(due, Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_3__["throwError"])(new _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__["TimeoutError"]()), scheduler);
-}
-//# sourceMappingURL=timeout.js.map
+	return chunks.join('');
+};
 
 
 /***/ }),
-/* 464 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 680 */
+/***/ (function(module, 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__(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 */
-
 
+const restoreCursor = __webpack_require__(681);
 
+let hidden = false;
 
+exports.show = stream => {
+	const s = stream || process.stderr;
 
-function timeoutWith(due, withObservable, scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"];
-    }
-    return function (source) {
-        var absoluteTimeout = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_2__["isDate"])(due);
-        var waitFor = absoluteTimeout ? (+due - scheduler.now()) : Math.abs(due);
-        return source.lift(new TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler));
-    };
-}
-var TimeoutWithOperator = /*@__PURE__*/ (function () {
-    function TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler) {
-        this.waitFor = waitFor;
-        this.absoluteTimeout = absoluteTimeout;
-        this.withObservable = withObservable;
-        this.scheduler = scheduler;
-    }
-    TimeoutWithOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new TimeoutWithSubscriber(subscriber, this.absoluteTimeout, this.waitFor, this.withObservable, this.scheduler));
-    };
-    return TimeoutWithOperator;
-}());
-var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TimeoutWithSubscriber, _super);
-    function TimeoutWithSubscriber(destination, absoluteTimeout, waitFor, withObservable, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.absoluteTimeout = absoluteTimeout;
-        _this.waitFor = waitFor;
-        _this.withObservable = withObservable;
-        _this.scheduler = scheduler;
-        _this.action = null;
-        _this.scheduleTimeout();
-        return _this;
-    }
-    TimeoutWithSubscriber.dispatchTimeout = function (subscriber) {
-        var withObservable = subscriber.withObservable;
-        subscriber._unsubscribeAndRecycle();
-        subscriber.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(subscriber, withObservable));
-    };
-    TimeoutWithSubscriber.prototype.scheduleTimeout = function () {
-        var action = this.action;
-        if (action) {
-            this.action = action.schedule(this, this.waitFor);
-        }
-        else {
-            this.add(this.action = this.scheduler.schedule(TimeoutWithSubscriber.dispatchTimeout, this.waitFor, this));
-        }
-    };
-    TimeoutWithSubscriber.prototype._next = function (value) {
-        if (!this.absoluteTimeout) {
-            this.scheduleTimeout();
-        }
-        _super.prototype._next.call(this, value);
-    };
-    TimeoutWithSubscriber.prototype._unsubscribe = function () {
-        this.action = null;
-        this.scheduler = null;
-        this.withObservable = null;
-    };
-    return TimeoutWithSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
-//# sourceMappingURL=timeoutWith.js.map
+	if (!s.isTTY) {
+		return;
+	}
 
+	hidden = false;
+	s.write('\u001b[?25h');
+};
 
-/***/ }),
-/* 465 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+exports.hide = stream => {
+	const s = stream || process.stderr;
 
-"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__(322);
-/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(333);
-/** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */
+	if (!s.isTTY) {
+		return;
+	}
 
+	restoreCursor();
+	hidden = true;
+	s.write('\u001b[?25l');
+};
 
-function timestamp(scheduler) {
-    if (scheduler === void 0) {
-        scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"];
-    }
-    return Object(_map__WEBPACK_IMPORTED_MODULE_1__["map"])(function (value) { return new Timestamp(value, scheduler.now()); });
-}
-var Timestamp = /*@__PURE__*/ (function () {
-    function Timestamp(value, timestamp) {
-        this.value = value;
-        this.timestamp = timestamp;
-    }
-    return Timestamp;
-}());
+exports.toggle = (force, stream) => {
+	if (force !== undefined) {
+		hidden = force;
+	}
 
-//# sourceMappingURL=timestamp.js.map
+	if (hidden) {
+		exports.show(stream);
+	} else {
+		exports.hide(stream);
+	}
+};
 
 
 /***/ }),
-/* 466 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 681 */
+/***/ (function(module, 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__(421);
-/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */
 
-function toArrayReducer(arr, item, index) {
-    if (index === 0) {
-        return [item];
-    }
-    arr.push(item);
-    return arr;
-}
-function toArray() {
-    return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(toArrayReducer, []);
-}
-//# sourceMappingURL=toArray.js.map
+const onetime = __webpack_require__(682);
+const signalExit = __webpack_require__(377);
+
+module.exports = onetime(() => {
+	signalExit(() => {
+		process.stderr.write('\u001b[?25h');
+	}, {alwaysLast: true});
+});
 
 
 /***/ }),
-/* 467 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 682 */
+/***/ (function(module, 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__(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 */
 
+const mimicFn = __webpack_require__(683);
 
+module.exports = (fn, opts) => {
+	// TODO: Remove this in v3
+	if (opts === true) {
+		throw new TypeError('The second argument is now an options object');
+	}
 
+	if (typeof fn !== 'function') {
+		throw new TypeError('Expected a function');
+	}
 
-function window(windowBoundaries) {
-    return function windowOperatorFunction(source) {
-        return source.lift(new WindowOperator(windowBoundaries));
-    };
-}
-var WindowOperator = /*@__PURE__*/ (function () {
-    function WindowOperator(windowBoundaries) {
-        this.windowBoundaries = windowBoundaries;
-    }
-    WindowOperator.prototype.call = function (subscriber, source) {
-        var windowSubscriber = new WindowSubscriber(subscriber);
-        var sourceSubscription = source.subscribe(windowSubscriber);
-        if (!sourceSubscription.closed) {
-            windowSubscriber.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(windowSubscriber, this.windowBoundaries));
-        }
-        return sourceSubscription;
-    };
-    return WindowOperator;
-}());
-var WindowSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowSubscriber, _super);
-    function WindowSubscriber(destination) {
-        var _this = _super.call(this, destination) || this;
-        _this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-        destination.next(_this.window);
-        return _this;
-    }
-    WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.openWindow();
-    };
-    WindowSubscriber.prototype.notifyError = function (error, innerSub) {
-        this._error(error);
-    };
-    WindowSubscriber.prototype.notifyComplete = function (innerSub) {
-        this._complete();
-    };
-    WindowSubscriber.prototype._next = function (value) {
-        this.window.next(value);
-    };
-    WindowSubscriber.prototype._error = function (err) {
-        this.window.error(err);
-        this.destination.error(err);
-    };
-    WindowSubscriber.prototype._complete = function () {
-        this.window.complete();
-        this.destination.complete();
-    };
-    WindowSubscriber.prototype._unsubscribe = function () {
-        this.window = null;
-    };
-    WindowSubscriber.prototype.openWindow = function () {
-        var prevWindow = this.window;
-        if (prevWindow) {
-            prevWindow.complete();
-        }
-        var destination = this.destination;
-        var newWindow = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-        destination.next(newWindow);
-    };
-    return WindowSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"]));
-//# sourceMappingURL=window.js.map
+	opts = opts || {};
 
+	let ret;
+	let called = false;
+	const fnName = fn.displayName || fn.name || '<anonymous>';
 
-/***/ }),
-/* 468 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+	const onetime = function () {
+		if (called) {
+			if (opts.throw === true) {
+				throw new Error(`Function \`${fnName}\` can only be called once`);
+			}
 
-"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__(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 */
+			return ret;
+		}
 
+		called = true;
+		ret = fn.apply(this, arguments);
+		fn = null;
 
+		return ret;
+	};
 
-function windowCount(windowSize, startWindowEvery) {
-    if (startWindowEvery === void 0) {
-        startWindowEvery = 0;
-    }
-    return function windowCountOperatorFunction(source) {
-        return source.lift(new WindowCountOperator(windowSize, startWindowEvery));
-    };
-}
-var WindowCountOperator = /*@__PURE__*/ (function () {
-    function WindowCountOperator(windowSize, startWindowEvery) {
-        this.windowSize = windowSize;
-        this.startWindowEvery = startWindowEvery;
-    }
-    WindowCountOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowCountSubscriber(subscriber, this.windowSize, this.startWindowEvery));
-    };
-    return WindowCountOperator;
-}());
-var WindowCountSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowCountSubscriber, _super);
-    function WindowCountSubscriber(destination, windowSize, startWindowEvery) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.windowSize = windowSize;
-        _this.startWindowEvery = startWindowEvery;
-        _this.windows = [new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]()];
-        _this.count = 0;
-        destination.next(_this.windows[0]);
-        return _this;
-    }
-    WindowCountSubscriber.prototype._next = function (value) {
-        var startWindowEvery = (this.startWindowEvery > 0) ? this.startWindowEvery : this.windowSize;
-        var destination = this.destination;
-        var windowSize = this.windowSize;
-        var windows = this.windows;
-        var len = windows.length;
-        for (var i = 0; i < len && !this.closed; i++) {
-            windows[i].next(value);
-        }
-        var c = this.count - windowSize + 1;
-        if (c >= 0 && c % startWindowEvery === 0 && !this.closed) {
-            windows.shift().complete();
-        }
-        if (++this.count % startWindowEvery === 0 && !this.closed) {
-            var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]();
-            windows.push(window_1);
-            destination.next(window_1);
-        }
-    };
-    WindowCountSubscriber.prototype._error = function (err) {
-        var windows = this.windows;
-        if (windows) {
-            while (windows.length > 0 && !this.closed) {
-                windows.shift().error(err);
-            }
-        }
-        this.destination.error(err);
-    };
-    WindowCountSubscriber.prototype._complete = function () {
-        var windows = this.windows;
-        if (windows) {
-            while (windows.length > 0 && !this.closed) {
-                windows.shift().complete();
-            }
-        }
-        this.destination.complete();
-    };
-    WindowCountSubscriber.prototype._unsubscribe = function () {
-        this.count = 0;
-        this.windows = null;
-    };
-    return WindowCountSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"]));
-//# sourceMappingURL=windowCount.js.map
+	mimicFn(onetime, fn);
+
+	return onetime;
+};
 
 
 /***/ }),
-/* 469 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/* 683 */
+/***/ (function(module, 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__(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 */
 
+module.exports = (to, from) => {
+	// TODO: use `Reflect.ownKeys()` when targeting Node.js 6
+	for (const prop of Object.getOwnPropertyNames(from).concat(Object.getOwnPropertySymbols(from))) {
+		Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop));
+	}
 
+	return to;
+};
 
 
+/***/ }),
+/* 684 */
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-function windowTime(windowTimeSpan) {
-    var scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"];
-    var windowCreationInterval = null;
-    var maxWindowSize = Number.POSITIVE_INFINITY;
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[3])) {
-        scheduler = arguments[3];
-    }
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[2])) {
-        scheduler = arguments[2];
-    }
-    else if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_4__["isNumeric"])(arguments[2])) {
-        maxWindowSize = arguments[2];
-    }
-    if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[1])) {
-        scheduler = arguments[1];
-    }
-    else if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_4__["isNumeric"])(arguments[1])) {
-        windowCreationInterval = arguments[1];
-    }
-    return function windowTimeOperatorFunction(source) {
-        return source.lift(new WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler));
-    };
-}
-var WindowTimeOperator = /*@__PURE__*/ (function () {
-    function WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) {
-        this.windowTimeSpan = windowTimeSpan;
-        this.windowCreationInterval = windowCreationInterval;
-        this.maxWindowSize = maxWindowSize;
-        this.scheduler = scheduler;
-    }
-    WindowTimeOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowTimeSubscriber(subscriber, this.windowTimeSpan, this.windowCreationInterval, this.maxWindowSize, this.scheduler));
-    };
-    return WindowTimeOperator;
-}());
-var CountedSubject = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CountedSubject, _super);
-    function CountedSubject() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this._numberOfNextedValues = 0;
-        return _this;
-    }
-    CountedSubject.prototype.next = function (value) {
-        this._numberOfNextedValues++;
-        _super.prototype.next.call(this, value);
-    };
-    Object.defineProperty(CountedSubject.prototype, "numberOfNextedValues", {
-        get: function () {
-            return this._numberOfNextedValues;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return CountedSubject;
-}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]));
-var WindowTimeSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowTimeSubscriber, _super);
-    function WindowTimeSubscriber(destination, windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.windowTimeSpan = windowTimeSpan;
-        _this.windowCreationInterval = windowCreationInterval;
-        _this.maxWindowSize = maxWindowSize;
-        _this.scheduler = scheduler;
-        _this.windows = [];
-        var window = _this.openWindow();
-        if (windowCreationInterval !== null && windowCreationInterval >= 0) {
-            var closeState = { subscriber: _this, window: window, context: null };
-            var creationState = { windowTimeSpan: windowTimeSpan, windowCreationInterval: windowCreationInterval, subscriber: _this, scheduler: scheduler };
-            _this.add(scheduler.schedule(dispatchWindowClose, windowTimeSpan, closeState));
-            _this.add(scheduler.schedule(dispatchWindowCreation, windowCreationInterval, creationState));
-        }
-        else {
-            var timeSpanOnlyState = { subscriber: _this, window: window, windowTimeSpan: windowTimeSpan };
-            _this.add(scheduler.schedule(dispatchWindowTimeSpanOnly, windowTimeSpan, timeSpanOnlyState));
-        }
-        return _this;
-    }
-    WindowTimeSubscriber.prototype._next = function (value) {
-        var windows = this.windows;
-        var len = windows.length;
-        for (var i = 0; i < len; i++) {
-            var window_1 = windows[i];
-            if (!window_1.closed) {
-                window_1.next(value);
-                if (window_1.numberOfNextedValues >= this.maxWindowSize) {
-                    this.closeWindow(window_1);
-                }
-            }
-        }
-    };
-    WindowTimeSubscriber.prototype._error = function (err) {
-        var windows = this.windows;
-        while (windows.length > 0) {
-            windows.shift().error(err);
-        }
-        this.destination.error(err);
-    };
-    WindowTimeSubscriber.prototype._complete = function () {
-        var windows = this.windows;
-        while (windows.length > 0) {
-            var window_2 = windows.shift();
-            if (!window_2.closed) {
-                window_2.complete();
-            }
-        }
-        this.destination.complete();
-    };
-    WindowTimeSubscriber.prototype.openWindow = function () {
-        var window = new CountedSubject();
-        this.windows.push(window);
-        var destination = this.destination;
-        destination.next(window);
-        return window;
-    };
-    WindowTimeSubscriber.prototype.closeWindow = function (window) {
-        window.complete();
-        var windows = this.windows;
-        windows.splice(windows.indexOf(window), 1);
-    };
-    return WindowTimeSubscriber;
-}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"]));
-function dispatchWindowTimeSpanOnly(state) {
-    var subscriber = state.subscriber, windowTimeSpan = state.windowTimeSpan, window = state.window;
-    if (window) {
-        subscriber.closeWindow(window);
-    }
-    state.window = subscriber.openWindow();
-    this.schedule(state, windowTimeSpan);
-}
-function dispatchWindowCreation(state) {
-    var windowTimeSpan = state.windowTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler, windowCreationInterval = state.windowCreationInterval;
-    var window = subscriber.openWindow();
-    var action = this;
-    var context = { action: action, subscription: null };
-    var timeSpanState = { subscriber: subscriber, window: window, context: context };
-    context.subscription = scheduler.schedule(dispatchWindowClose, windowTimeSpan, timeSpanState);
-    action.add(context.subscription);
-    action.schedule(state, windowCreationInterval);
-}
-function dispatchWindowClose(state) {
-    var subscriber = state.subscriber, window = state.window, context = state.context;
-    if (context && context.action && context.subscription) {
-        context.action.remove(context.subscription);
-    }
-    subscriber.closeWindow(window);
-}
-//# sourceMappingURL=windowTime.js.map
+module.exports = __webpack_require__(685);
 
 
 /***/ }),
-/* 470 */
+/* 685 */
+/***/ (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\":[\"🌲\",\"🎄\"]}}");
+
+/***/ }),
+/* 686 */
 /***/ (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__(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 */
+/* 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 _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
+/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(500);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(501);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 RunCommand = {
+  description: 'Run script defined in package.json in each package that contains that script.',
+  name: 'run',
 
-function windowToggle(openings, closingSelector) {
-    return function (source) { return source.lift(new WindowToggleOperator(openings, closingSelector)); };
-}
-var WindowToggleOperator = /*@__PURE__*/ (function () {
-    function WindowToggleOperator(openings, closingSelector) {
-        this.openings = openings;
-        this.closingSelector = closingSelector;
-    }
-    WindowToggleOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowToggleSubscriber(subscriber, this.openings, this.closingSelector));
-    };
-    return WindowToggleOperator;
-}());
-var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowToggleSubscriber, _super);
-    function WindowToggleSubscriber(destination, openings, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.openings = openings;
-        _this.closingSelector = closingSelector;
-        _this.contexts = [];
-        _this.add(_this.openSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(_this, openings, openings));
-        return _this;
+  async run(projects, projectGraph, {
+    extraArgs
+  }) {
+    const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_3__["topologicallyBatchProjects"])(projects, projectGraph);
+
+    if (extraArgs.length === 0) {
+      _utils_log__WEBPACK_IMPORTED_MODULE_1__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.red.bold('\nNo script specified'));
+      process.exit(1);
     }
-    WindowToggleSubscriber.prototype._next = function (value) {
-        var contexts = this.contexts;
-        if (contexts) {
-            var len = contexts.length;
-            for (var i = 0; i < len; i++) {
-                contexts[i].window.next(value);
-            }
-        }
-    };
-    WindowToggleSubscriber.prototype._error = function (err) {
-        var contexts = this.contexts;
-        this.contexts = null;
-        if (contexts) {
-            var len = contexts.length;
-            var index = -1;
-            while (++index < len) {
-                var context_1 = contexts[index];
-                context_1.window.error(err);
-                context_1.subscription.unsubscribe();
-            }
-        }
-        _super.prototype._error.call(this, err);
-    };
-    WindowToggleSubscriber.prototype._complete = function () {
-        var contexts = this.contexts;
-        this.contexts = null;
-        if (contexts) {
-            var len = contexts.length;
-            var index = -1;
-            while (++index < len) {
-                var context_2 = contexts[index];
-                context_2.window.complete();
-                context_2.subscription.unsubscribe();
-            }
-        }
-        _super.prototype._complete.call(this);
-    };
-    WindowToggleSubscriber.prototype._unsubscribe = function () {
-        var contexts = this.contexts;
-        this.contexts = null;
-        if (contexts) {
-            var len = contexts.length;
-            var index = -1;
-            while (++index < len) {
-                var context_3 = contexts[index];
-                context_3.window.unsubscribe();
-                context_3.subscription.unsubscribe();
-            }
-        }
-    };
-    WindowToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        if (outerValue === this.openings) {
-            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 {
-                innerSubscription.context = context_4;
-                subscription.add(innerSubscription);
-            }
-            this.destination.next(window_1);
-        }
-        else {
-            this.closeWindow(this.contexts.indexOf(outerValue));
-        }
-    };
-    WindowToggleSubscriber.prototype.notifyError = function (err) {
-        this.error(err);
-    };
-    WindowToggleSubscriber.prototype.notifyComplete = function (inner) {
-        if (inner !== this.openSubscription) {
-            this.closeWindow(this.contexts.indexOf(inner.context));
-        }
-    };
-    WindowToggleSubscriber.prototype.closeWindow = function (index) {
-        if (index === -1) {
-            return;
-        }
-        var contexts = this.contexts;
-        var context = contexts[index];
-        var window = context.window, subscription = context.subscription;
-        contexts.splice(index, 1);
-        window.complete();
-        subscription.unsubscribe();
-    };
-    return WindowToggleSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"]));
-//# sourceMappingURL=windowToggle.js.map
 
+    const scriptName = extraArgs[0];
+    const scriptArgs = extraArgs.slice(1);
+    _utils_log__WEBPACK_IMPORTED_MODULE_1__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`\nRunning script [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(scriptName)}] in batched topological order\n`));
+    await Object(_utils_parallelize__WEBPACK_IMPORTED_MODULE_2__["parallelizeBatches"])(batchedProjects, async pkg => {
+      if (pkg.hasScript(scriptName)) {
+        await pkg.runScriptStreaming(scriptName, scriptArgs);
+      }
+    });
+  }
+
+};
 
 /***/ }),
-/* 471 */
+/* 687 */
 /***/ (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__(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 */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WatchCommand", function() { return WatchCommand; });
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
+/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(34);
+/* harmony import */ var _utils_parallelize__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(500);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(501);
+/* harmony import */ var _utils_watch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(688);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 
 
 
-function windowWhen(closingSelector) {
-    return function windowWhenOperatorFunction(source) {
-        return source.lift(new WindowOperator(closingSelector));
-    };
-}
-var WindowOperator = /*@__PURE__*/ (function () {
-    function WindowOperator(closingSelector) {
-        this.closingSelector = closingSelector;
-    }
-    WindowOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WindowSubscriber(subscriber, this.closingSelector));
-    };
-    return WindowOperator;
-}());
-var WindowSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowSubscriber, _super);
-    function WindowSubscriber(destination, closingSelector) {
-        var _this = _super.call(this, destination) || this;
-        _this.destination = destination;
-        _this.closingSelector = closingSelector;
-        _this.openWindow();
-        return _this;
-    }
-    WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.openWindow(innerSub);
-    };
-    WindowSubscriber.prototype.notifyError = function (error, innerSub) {
-        this._error(error);
-    };
-    WindowSubscriber.prototype.notifyComplete = function (innerSub) {
-        this.openWindow(innerSub);
-    };
-    WindowSubscriber.prototype._next = function (value) {
-        this.window.next(value);
-    };
-    WindowSubscriber.prototype._error = function (err) {
-        this.window.error(err);
-        this.destination.error(err);
-        this.unsubscribeClosingNotification();
-    };
-    WindowSubscriber.prototype._complete = function () {
-        this.window.complete();
-        this.destination.complete();
-        this.unsubscribeClosingNotification();
-    };
-    WindowSubscriber.prototype.unsubscribeClosingNotification = function () {
-        if (this.closingNotification) {
-            this.closingNotification.unsubscribe();
-        }
-    };
-    WindowSubscriber.prototype.openWindow = function (innerSub) {
-        if (innerSub === void 0) {
-            innerSub = null;
-        }
-        if (innerSub) {
-            this.remove(innerSub);
-            innerSub.unsubscribe();
-        }
-        var prevWindow = this.window;
-        if (prevWindow) {
-            prevWindow.complete();
-        }
-        var window = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"]();
-        this.destination.next(window);
-        var closingNotifier;
-        try {
-            var closingSelector = this.closingSelector;
-            closingNotifier = closingSelector();
-        }
-        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_2__["OuterSubscriber"]));
-//# sourceMappingURL=windowWhen.js.map
 
 
-/***/ }),
-/* 472 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/**
+ * Name of the script in the package/project package.json file to run during `kbn watch`.
+ */
+const watchScriptName = 'kbn:watch';
+/**
+ * Name of the Kibana project.
+ */
 
-"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__(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 */
+const kibanaProjectName = 'kibana';
+/**
+ * Command that traverses through list of available projects/packages that have `kbn:watch` script in their
+ * package.json files, groups them into topology aware batches and then processes theses batches one by one
+ * running `kbn:watch` scripts in parallel within the same batch.
+ *
+ * Command internally relies on the fact that most of the build systems that are triggered by `kbn:watch`
+ * will emit special "marker" once build/watch process is ready that we can use as completion condition for
+ * the `kbn:watch` script and eventually for the entire batch. Currently we support completion "markers" for
+ * `webpack` and `tsc` only, for the rest we rely on predefined timeouts.
+ */
 
+const WatchCommand = {
+  description: 'Runs `kbn:watch` script for every project.',
+  name: 'watch',
 
+  async run(projects, projectGraph) {
+    const projectsToWatch = new Map();
 
-function withLatestFrom() {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
+    for (const project of projects.values()) {
+      // We can't watch project that doesn't have `kbn:watch` script.
+      if (project.hasScript(watchScriptName)) {
+        projectsToWatch.set(project.name, project);
+      }
     }
-    return function (source) {
-        var project;
-        if (typeof args[args.length - 1] === 'function') {
-            project = args.pop();
-        }
-        var observables = args;
-        return source.lift(new WithLatestFromOperator(observables, project));
-    };
-}
-var WithLatestFromOperator = /*@__PURE__*/ (function () {
-    function WithLatestFromOperator(observables, project) {
-        this.observables = observables;
-        this.project = project;
+
+    if (projectsToWatch.size === 0) {
+      _utils_log__WEBPACK_IMPORTED_MODULE_1__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.red(`\nThere are no projects to watch found. Make sure that projects define 'kbn:watch' script in 'package.json'.\n`));
+      return;
     }
-    WithLatestFromOperator.prototype.call = function (subscriber, source) {
-        return source.subscribe(new WithLatestFromSubscriber(subscriber, this.observables, this.project));
-    };
-    return WithLatestFromOperator;
-}());
-var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) {
-    tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WithLatestFromSubscriber, _super);
-    function WithLatestFromSubscriber(destination, observables, project) {
-        var _this = _super.call(this, destination) || this;
-        _this.observables = observables;
-        _this.project = project;
-        _this.toRespond = [];
-        var len = observables.length;
-        _this.values = new Array(len);
-        for (var i = 0; i < len; i++) {
-            _this.toRespond.push(i);
-        }
-        for (var i = 0; i < len; i++) {
-            var observable = observables[i];
-            _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, observable, observable, i));
-        }
-        return _this;
+
+    const projectNames = Array.from(projectsToWatch.keys());
+    _utils_log__WEBPACK_IMPORTED_MODULE_1__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(`Running ${watchScriptName} scripts for [${projectNames.join(', ')}].`))); // Kibana should always be run the last, so we don't rely on automatic
+    // topological batching and push it to the last one-entry batch manually.
+
+    const shouldWatchKibanaProject = projectsToWatch.delete(kibanaProjectName);
+    const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_3__["topologicallyBatchProjects"])(projectsToWatch, projectGraph);
+
+    if (shouldWatchKibanaProject) {
+      batchedProjects.push([projects.get(kibanaProjectName)]);
     }
-    WithLatestFromSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) {
-        this.values[outerIndex] = innerValue;
-        var toRespond = this.toRespond;
-        if (toRespond.length > 0) {
-            var found = toRespond.indexOf(outerIndex);
-            if (found !== -1) {
-                toRespond.splice(found, 1);
-            }
-        }
-    };
-    WithLatestFromSubscriber.prototype.notifyComplete = function () {
-    };
-    WithLatestFromSubscriber.prototype._next = function (value) {
-        if (this.toRespond.length === 0) {
-            var args = [value].concat(this.values);
-            if (this.project) {
-                this._tryProject(args);
-            }
-            else {
-                this.destination.next(args);
-            }
-        }
-    };
-    WithLatestFromSubscriber.prototype._tryProject = function (args) {
-        var result;
-        try {
-            result = this.project.apply(this, args);
-        }
-        catch (err) {
-            this.destination.error(err);
-            return;
-        }
-        this.destination.next(result);
-    };
-    return WithLatestFromSubscriber;
-}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"]));
-//# sourceMappingURL=withLatestFrom.js.map
 
+    await Object(_utils_parallelize__WEBPACK_IMPORTED_MODULE_2__["parallelizeBatches"])(batchedProjects, async pkg => {
+      const completionHint = await Object(_utils_watch__WEBPACK_IMPORTED_MODULE_4__["waitUntilWatchIsReady"])(pkg.runScriptStreaming(watchScriptName).stdout);
+      _utils_log__WEBPACK_IMPORTED_MODULE_1__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`[${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(pkg.name)}] Initial build completed (${completionHint}).`));
+    });
+  }
+
+};
 
 /***/ }),
-/* 473 */
+/* 688 */
 /***/ (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__(376);
-/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "waitUntilWatchIsReady", function() { return waitUntilWatchIsReady; });
+/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(392);
+/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(169);
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
-function zip() {
-    var observables = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        observables[_i] = arguments[_i];
-    }
-    return function zipOperatorFunction(source) {
-        return source.lift.call(_observable_zip__WEBPACK_IMPORTED_MODULE_0__["zip"].apply(void 0, [source].concat(observables)));
-    };
-}
-//# sourceMappingURL=zip.js.map
 
+/**
+ * Number of milliseconds we wait before we fall back to the default watch handler.
+ */
 
-/***/ }),
-/* 474 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+const defaultHandlerDelay = 3000;
+/**
+ * If default watch handler is used, then it's the number of milliseconds we wait for
+ * any build output before we consider watch task ready.
+ */
 
-"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__(376);
-/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */
+const defaultHandlerReadinessTimeout = 2000;
+/**
+ * Describes configurable watch options.
+ */
 
-function zipAll(project) {
-    return function (source) { return source.lift(new _observable_zip__WEBPACK_IMPORTED_MODULE_0__["ZipOperator"](project)); };
+function getWatchHandlers(buildOutput$, {
+  handlerDelay = defaultHandlerDelay,
+  handlerReadinessTimeout = defaultHandlerReadinessTimeout
+}) {
+  const typescriptHandler = buildOutput$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["first"])(data => data.includes('$ tsc')), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["map"])(() => buildOutput$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["first"])(data => data.includes('Compilation complete.')), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["mapTo"])('tsc'))));
+  const webpackHandler = buildOutput$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["first"])(data => data.includes('$ webpack')), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["map"])(() => buildOutput$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["first"])(data => data.includes('Chunk Names')), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["mapTo"])('webpack'))));
+  const defaultHandler = rxjs__WEBPACK_IMPORTED_MODULE_0__["of"](undefined).pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["delay"])(handlerReadinessTimeout), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["map"])(() => buildOutput$.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["timeout"])(handlerDelay), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["catchError"])(() => rxjs__WEBPACK_IMPORTED_MODULE_0__["of"]('timeout')))));
+  return [typescriptHandler, webpackHandler, defaultHandler];
 }
-//# sourceMappingURL=zipAll.js.map
 
+function waitUntilWatchIsReady(stream, opts = {}) {
+  const buildOutput$ = new rxjs__WEBPACK_IMPORTED_MODULE_0__["Subject"]();
+
+  const onDataListener = data => buildOutput$.next(data.toString('utf-8'));
+
+  const onEndListener = () => buildOutput$.complete();
+
+  const onErrorListener = e => buildOutput$.error(e);
+
+  stream.once('end', onEndListener);
+  stream.once('error', onErrorListener);
+  stream.on('data', onDataListener);
+  return rxjs__WEBPACK_IMPORTED_MODULE_0__["race"](getWatchHandlers(buildOutput$, opts)).pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["mergeMap"])(whenReady => whenReady), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_1__["finalize"])(() => {
+    stream.removeListener('data', onDataListener);
+    stream.removeListener('end', onEndListener);
+    stream.removeListener('error', onErrorListener);
+    buildOutput$.complete();
+  })).toPromise();
+}
 
 /***/ }),
-/* 475 */
+/* 689 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -44953,15 +79017,21 @@ __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__(259);
+/* harmony import */ var indent_string__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(673);
 /* 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__(476);
+/* harmony import */ var wrap_ansi__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(690);
 /* 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__(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__(483);
+/* harmony import */ var _utils_errors__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(515);
+/* harmony import */ var _utils_log__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(34);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(501);
+/* harmony import */ var _utils_projects_tree__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(697);
+/* harmony import */ var _utils_kibana__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(698);
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -44990,28 +79060,32 @@ __webpack_require__.r(__webpack_exports__);
 
 async function runCommand(command, config) {
   try {
-    _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`Running [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(command.name)}] command from [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.yellow(config.rootPath)}]:\n`));
-    const projectPaths = Object(_config__WEBPACK_IMPORTED_MODULE_3__["getProjectPaths"])(config.rootPath, config.options);
-    const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_6__["getProjects"])(config.rootPath, projectPaths, {
+    _utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`Running [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(command.name)}] command from [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.yellow(config.rootPath)}]:\n`));
+    const kbn = await _utils_kibana__WEBPACK_IMPORTED_MODULE_7__["Kibana"].loadFrom(config.rootPath);
+    const projects = kbn.getFilteredProjects({
+      skipKibanaPlugins: Boolean(config.options['skip-kibana-plugins']),
+      ossOnly: Boolean(config.options.oss),
       exclude: toArray(config.options.exclude),
       include: toArray(config.options.include)
     });
 
     if (projects.size === 0) {
-      _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.red(`There are no projects found. Double check project name(s) in '-i/--include' and '-e/--exclude' filters.\n`));
+      _utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.red(`There are no projects found. Double check project name(s) in '-i/--include' and '-e/--exclude' filters.\n`));
       return process.exit(1);
     }
 
-    const projectGraph = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_6__["buildProjectGraph"])(projects);
-    _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`Found [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(projects.size.toString())}] projects:\n`));
-    _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(Object(_utils_projects_tree__WEBPACK_IMPORTED_MODULE_7__["renderProjectsTree"])(config.rootPath, projects));
-    await command.run(projects, projectGraph, config);
+    const projectGraph = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_5__["buildProjectGraph"])(projects);
+    _utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold(`Found [${chalk__WEBPACK_IMPORTED_MODULE_0___default.a.green(projects.size.toString())}] projects:\n`));
+    _utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].write(Object(_utils_projects_tree__WEBPACK_IMPORTED_MODULE_6__["renderProjectsTree"])(config.rootPath, projects));
+    await command.run(projects, projectGraph, _objectSpread({}, config, {
+      kbn
+    }));
   } catch (e) {
-    _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold.red(`\n[${command.name}] failed:\n`));
+    _utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].write(chalk__WEBPACK_IMPORTED_MODULE_0___default.a.bold.red(`\n[${command.name}] failed:\n`));
 
-    if (e instanceof _utils_errors__WEBPACK_IMPORTED_MODULE_4__["CliError"]) {
+    if (e instanceof _utils_errors__WEBPACK_IMPORTED_MODULE_3__["CliError"]) {
       const msg = chalk__WEBPACK_IMPORTED_MODULE_0___default.a.red(`CliError: ${e.message}\n`);
-      _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(wrap_ansi__WEBPACK_IMPORTED_MODULE_2___default()(msg, 80));
+      _utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].write(wrap_ansi__WEBPACK_IMPORTED_MODULE_2___default()(msg, 80));
       const keys = Object.keys(e.meta);
 
       if (keys.length > 0) {
@@ -45019,11 +79093,11 @@ async function runCommand(command, config) {
           const value = e.meta[key];
           return `${key}: ${value}`;
         });
-        _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write('Additional debugging info:\n');
-        _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(indent_string__WEBPACK_IMPORTED_MODULE_1___default()(metaOutput.join('\n'), 3));
+        _utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].write('Additional debugging info:\n');
+        _utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].write(indent_string__WEBPACK_IMPORTED_MODULE_1___default()(metaOutput.join('\n'), 3));
       }
     } else {
-      _utils_log__WEBPACK_IMPORTED_MODULE_5__["log"].write(e.stack);
+      _utils_log__WEBPACK_IMPORTED_MODULE_4__["log"].write(e.stack);
     }
 
     process.exit(1);
@@ -45039,13 +79113,13 @@ function toArray(value) {
 }
 
 /***/ }),
-/* 476 */
+/* 690 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const stringWidth = __webpack_require__(477);
-const stripAnsi = __webpack_require__(481);
+const stringWidth = __webpack_require__(691);
+const stripAnsi = __webpack_require__(695);
 
 const ESCAPES = new Set([
 	'\u001B',
@@ -45239,13 +79313,13 @@ module.exports = (str, cols, opts) => {
 
 
 /***/ }),
-/* 477 */
+/* 691 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const stripAnsi = __webpack_require__(478);
-const isFullwidthCodePoint = __webpack_require__(480);
+const stripAnsi = __webpack_require__(692);
+const isFullwidthCodePoint = __webpack_require__(694);
 
 module.exports = str => {
 	if (typeof str !== 'string' || str.length === 0) {
@@ -45282,18 +79356,18 @@ module.exports = str => {
 
 
 /***/ }),
-/* 478 */
+/* 692 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const ansiRegex = __webpack_require__(479);
+const ansiRegex = __webpack_require__(693);
 
 module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input;
 
 
 /***/ }),
-/* 479 */
+/* 693 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -45310,7 +79384,7 @@ module.exports = () => {
 
 
 /***/ }),
-/* 480 */
+/* 694 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -45363,18 +79437,18 @@ module.exports = x => {
 
 
 /***/ }),
-/* 481 */
+/* 695 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const ansiRegex = __webpack_require__(482);
+const ansiRegex = __webpack_require__(696);
 
 module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input;
 
 
 /***/ }),
-/* 482 */
+/* 696 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -45391,7 +79465,7 @@ module.exports = () => {
 
 
 /***/ }),
-/* 483 */
+/* 697 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -45544,15 +79618,247 @@ function addProjectToTree(tree, pathParts, project) {
 }
 
 /***/ }),
-/* 484 */
+/* 698 */
 /***/ (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__(485);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kibana", function() { return Kibana; });
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
+/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(699);
+/* harmony import */ var multimatch__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(multimatch__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _projects__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(501);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(580);
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+
+
+/**
+ * Helper class for dealing with a set of projects as children of
+ * the Kibana project. The kbn/pm is currently implemented to be
+ * more generic, where everything is an operation of generic projects,
+ * but that leads to exceptions where we need the kibana project and
+ * do things like `project.get('kibana')!`.
+ *
+ * Using this helper we can restructre the generic list of projects
+ * as a Kibana object which encapulates all the projects in the
+ * workspace and knows about the root Kibana project.
+ */
+
+class Kibana {
+  static async loadFrom(rootPath) {
+    return new Kibana((await Object(_projects__WEBPACK_IMPORTED_MODULE_2__["getProjects"])(rootPath, Object(_config__WEBPACK_IMPORTED_MODULE_3__["getProjectPaths"])({
+      rootPath
+    }))));
+  }
+
+  constructor(allWorkspaceProjects) {
+    this.allWorkspaceProjects = allWorkspaceProjects;
+
+    _defineProperty(this, "kibanaProject", void 0);
+
+    const kibanaProject = allWorkspaceProjects.get('kibana');
+
+    if (!kibanaProject) {
+      throw new TypeError('Unable to create Kibana object without all projects, including the Kibana project.');
+    }
+
+    this.kibanaProject = kibanaProject;
+  }
+  /** make an absolute path by resolving subPath relative to the kibana repo */
+
+
+  getAbsolute(...subPath) {
+    return path__WEBPACK_IMPORTED_MODULE_0___default.a.resolve(this.kibanaProject.path, ...subPath);
+  }
+  /** convert an absolute path to a relative path, relative to the kibana repo */
+
+
+  getRelative(absolute) {
+    return path__WEBPACK_IMPORTED_MODULE_0___default.a.relative(this.kibanaProject.path, absolute);
+  }
+  /** get a copy of the map of all projects in the kibana workspace */
+
+
+  getAllProjects() {
+    return new Map(this.allWorkspaceProjects);
+  }
+  /** determine if a project with the given name exists */
+
+
+  hasProject(name) {
+    return this.allWorkspaceProjects.has(name);
+  }
+  /** get a specific project, throws if the name is not known (use hasProject() first) */
+
+
+  getProject(name) {
+    const project = this.allWorkspaceProjects.get(name);
+
+    if (!project) {
+      throw new Error(`No package with name "${name}" in the workspace`);
+    }
+
+    return project;
+  }
+  /** get a project and all of the projects it depends on in a ProjectMap */
+
+
+  getProjectAndDeps(name) {
+    const project = this.getProject(name);
+    return Object(_projects__WEBPACK_IMPORTED_MODULE_2__["includeTransitiveProjects"])([project], this.allWorkspaceProjects);
+  }
+  /** filter the projects to just those matching certain paths/include/exclude tags */
+
+
+  getFilteredProjects(options) {
+    const allProjects = this.getAllProjects();
+    const filteredProjects = new Map();
+    const pkgJsonPaths = Array.from(allProjects.values()).map(p => p.packageJsonLocation);
+    const filteredPkgJsonGlobs = Object(_config__WEBPACK_IMPORTED_MODULE_3__["getProjectPaths"])(_objectSpread({}, options, {
+      rootPath: this.kibanaProject.path
+    })).map(g => path__WEBPACK_IMPORTED_MODULE_0___default.a.resolve(g, 'package.json'));
+    const matchingPkgJsonPaths = multimatch__WEBPACK_IMPORTED_MODULE_1___default()(pkgJsonPaths, filteredPkgJsonGlobs);
+
+    for (const project of allProjects.values()) {
+      const pathMatches = matchingPkgJsonPaths.includes(project.packageJsonLocation);
+      const notExcluded = !options.exclude.includes(project.name);
+      const isIncluded = !options.include.length || options.include.includes(project.name);
+
+      if (pathMatches && notExcluded && isIncluded) {
+        filteredProjects.set(project.name, project);
+      }
+    }
+
+    return filteredProjects;
+  }
+
+}
+
+/***/ }),
+/* 699 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+const minimatch = __webpack_require__(505);
+const arrayUnion = __webpack_require__(700);
+const arrayDiffer = __webpack_require__(701);
+const arrify = __webpack_require__(702);
+
+module.exports = (list, patterns, options = {}) => {
+	list = arrify(list);
+	patterns = arrify(patterns);
+
+	if (list.length === 0 || patterns.length === 0) {
+		return [];
+	}
+
+	return patterns.reduce((result, pattern) => {
+		let process = arrayUnion;
+
+		if (pattern[0] === '!') {
+			pattern = pattern.slice(1);
+			process = arrayDiffer;
+		}
+
+		return process(result, minimatch.match(list, pattern, options));
+	}, []);
+};
+
+
+/***/ }),
+/* 700 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = (...arguments_) => {
+	return [...new Set([].concat(...arguments_))];
+};
+
+
+/***/ }),
+/* 701 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const arrayDiffer = (array, ...values) => {
+	const rest = new Set([].concat(...values));
+	return array.filter(element => !rest.has(element));
+};
+
+module.exports = arrayDiffer;
+
+
+/***/ }),
+/* 702 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+const arrify = value => {
+	if (value === null || value === undefined) {
+		return [];
+	}
+
+	if (Array.isArray(value)) {
+		return value;
+	}
+
+	if (typeof value === 'string') {
+		return [value];
+	}
+
+	if (typeof value[Symbol.iterator] === 'function') {
+		return [...value];
+	}
+
+	return [value];
+};
+
+module.exports = arrify;
+
+
+/***/ }),
+/* 703 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _build_production_projects__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(704);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return _build_production_projects__WEBPACK_IMPORTED_MODULE_0__["buildProductionProjects"]; });
 
-/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(697);
+/* harmony import */ var _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(914);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return _prepare_project_dependencies__WEBPACK_IMPORTED_MODULE_1__["prepareExternalProjectDependencies"]; });
 
 /*
@@ -45577,23 +79883,23 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /***/ }),
-/* 485 */
+/* 704 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildProductionProjects", function() { return buildProductionProjects; });
-/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(486);
+/* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(705);
 /* harmony import */ var cpy__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cpy__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(174);
+/* harmony import */ var del__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(588);
 /* 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__(172);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(580);
 /* 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);
-/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(36);
+/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(517);
+/* harmony import */ var _utils_projects__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(501);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -45648,7 +79954,9 @@ async function buildProductionProjects({
  */
 
 async function getProductionProjects(rootPath, onlyOSS) {
-  const projectPaths = Object(_config__WEBPACK_IMPORTED_MODULE_3__["getProjectPaths"])(rootPath, {});
+  const projectPaths = Object(_config__WEBPACK_IMPORTED_MODULE_3__["getProjectPaths"])({
+    rootPath
+  });
   const projects = await Object(_utils_projects__WEBPACK_IMPORTED_MODULE_7__["getProjects"])(rootPath, projectPaths);
   const projectsSubset = [projects.get('kibana')];
 
@@ -45723,17 +80031,17 @@ async function copyToBuild(project, kibanaRoot, buildRoot) {
 }
 
 /***/ }),
-/* 486 */
+/* 705 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const EventEmitter = __webpack_require__(46);
+const EventEmitter = __webpack_require__(379);
 const path = __webpack_require__(16);
-const arrify = __webpack_require__(487);
-const globby = __webpack_require__(488);
-const cpFile = __webpack_require__(687);
-const CpyError = __webpack_require__(695);
+const arrify = __webpack_require__(706);
+const globby = __webpack_require__(707);
+const cpFile = __webpack_require__(905);
+const CpyError = __webpack_require__(912);
 
 const preprocessSrcPath = (srcPath, options) => options.cwd ? path.resolve(options.cwd, srcPath) : srcPath;
 
@@ -45838,7 +80146,7 @@ module.exports.default = cpy;
 
 
 /***/ }),
-/* 487 */
+/* 706 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -45853,17 +80161,17 @@ module.exports = function (val) {
 
 
 /***/ }),
-/* 488 */
+/* 707 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
-const arrayUnion = __webpack_require__(489);
-const glob = __webpack_require__(37);
-const fastGlob = __webpack_require__(491);
-const dirGlob = __webpack_require__(680);
-const gitignore = __webpack_require__(683);
+const arrayUnion = __webpack_require__(708);
+const glob = __webpack_require__(502);
+const fastGlob = __webpack_require__(710);
+const dirGlob = __webpack_require__(898);
+const gitignore = __webpack_require__(901);
 
 const DEFAULT_FILTER = () => false;
 
@@ -46008,12 +80316,12 @@ module.exports.gitignore = gitignore;
 
 
 /***/ }),
-/* 489 */
+/* 708 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-var arrayUniq = __webpack_require__(490);
+var arrayUniq = __webpack_require__(709);
 
 module.exports = function () {
 	return arrayUniq([].concat.apply([], arguments));
@@ -46021,7 +80329,7 @@ module.exports = function () {
 
 
 /***/ }),
-/* 490 */
+/* 709 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -46090,10 +80398,10 @@ if ('Set' in global) {
 
 
 /***/ }),
-/* 491 */
+/* 710 */
 /***/ (function(module, exports, __webpack_require__) {
 
-const pkg = __webpack_require__(492);
+const pkg = __webpack_require__(711);
 
 module.exports = pkg.async;
 module.exports.default = pkg.async;
@@ -46106,19 +80414,19 @@ module.exports.generateTasks = pkg.generateTasks;
 
 
 /***/ }),
-/* 492 */
+/* 711 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var optionsManager = __webpack_require__(493);
-var taskManager = __webpack_require__(494);
-var reader_async_1 = __webpack_require__(651);
-var reader_stream_1 = __webpack_require__(675);
-var reader_sync_1 = __webpack_require__(676);
-var arrayUtils = __webpack_require__(678);
-var streamUtils = __webpack_require__(679);
+var optionsManager = __webpack_require__(712);
+var taskManager = __webpack_require__(713);
+var reader_async_1 = __webpack_require__(869);
+var reader_stream_1 = __webpack_require__(893);
+var reader_sync_1 = __webpack_require__(894);
+var arrayUtils = __webpack_require__(896);
+var streamUtils = __webpack_require__(897);
 /**
  * Synchronous API.
  */
@@ -46184,7 +80492,7 @@ function isString(source) {
 
 
 /***/ }),
-/* 493 */
+/* 712 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -46222,13 +80530,13 @@ exports.prepare = prepare;
 
 
 /***/ }),
-/* 494 */
+/* 713 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var patternUtils = __webpack_require__(495);
+var patternUtils = __webpack_require__(714);
 /**
  * Generate tasks based on parent directory of each pattern.
  */
@@ -46319,16 +80627,16 @@ exports.convertPatternGroupToTask = convertPatternGroupToTask;
 
 
 /***/ }),
-/* 495 */
+/* 714 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __webpack_require__(16);
-var globParent = __webpack_require__(496);
-var isGlob = __webpack_require__(499);
-var micromatch = __webpack_require__(500);
+var globParent = __webpack_require__(715);
+var isGlob = __webpack_require__(718);
+var micromatch = __webpack_require__(719);
 var GLOBSTAR = '**';
 /**
  * Return true for static pattern.
@@ -46474,15 +80782,15 @@ exports.matchAny = matchAny;
 
 
 /***/ }),
-/* 496 */
+/* 715 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var path = __webpack_require__(16);
-var isglob = __webpack_require__(497);
-var pathDirname = __webpack_require__(498);
+var isglob = __webpack_require__(716);
+var pathDirname = __webpack_require__(717);
 var isWin32 = __webpack_require__(11).platform() === 'win32';
 
 module.exports = function globParent(str) {
@@ -46505,7 +80813,7 @@ module.exports = function globParent(str) {
 
 
 /***/ }),
-/* 497 */
+/* 716 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -46515,7 +80823,7 @@ module.exports = function globParent(str) {
  * Licensed under the MIT License.
  */
 
-var isExtglob = __webpack_require__(188);
+var isExtglob = __webpack_require__(602);
 
 module.exports = function isGlob(str) {
   if (typeof str !== 'string' || str === '') {
@@ -46536,7 +80844,7 @@ module.exports = function isGlob(str) {
 
 
 /***/ }),
-/* 498 */
+/* 717 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -46686,7 +80994,7 @@ module.exports.win32 = win32;
 
 
 /***/ }),
-/* 499 */
+/* 718 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*!
@@ -46696,7 +81004,7 @@ module.exports.win32 = win32;
  * Released under the MIT License.
  */
 
-var isExtglob = __webpack_require__(188);
+var isExtglob = __webpack_require__(602);
 var chars = { '{': '}', '(': ')', '[': ']'};
 
 module.exports = function isGlob(str, options) {
@@ -46738,7 +81046,7 @@ module.exports = function isGlob(str, options) {
 
 
 /***/ }),
-/* 500 */
+/* 719 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -46749,18 +81057,18 @@ module.exports = function isGlob(str, options) {
  */
 
 var util = __webpack_require__(29);
-var braces = __webpack_require__(501);
-var toRegex = __webpack_require__(604);
-var extend = __webpack_require__(612);
+var braces = __webpack_require__(720);
+var toRegex = __webpack_require__(822);
+var extend = __webpack_require__(830);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(615);
-var parsers = __webpack_require__(647);
-var cache = __webpack_require__(648);
-var utils = __webpack_require__(649);
+var compilers = __webpack_require__(833);
+var parsers = __webpack_require__(865);
+var cache = __webpack_require__(866);
+var utils = __webpack_require__(867);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -47622,7 +81930,7 @@ module.exports = micromatch;
 
 
 /***/ }),
-/* 501 */
+/* 720 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -47632,18 +81940,18 @@ module.exports = micromatch;
  * Module dependencies
  */
 
-var toRegex = __webpack_require__(502);
-var unique = __webpack_require__(514);
-var extend = __webpack_require__(511);
+var toRegex = __webpack_require__(721);
+var unique = __webpack_require__(733);
+var extend = __webpack_require__(730);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(515);
-var parsers = __webpack_require__(530);
-var Braces = __webpack_require__(540);
-var utils = __webpack_require__(516);
+var compilers = __webpack_require__(734);
+var parsers = __webpack_require__(749);
+var Braces = __webpack_require__(759);
+var utils = __webpack_require__(735);
 var MAX_LENGTH = 1024 * 64;
 var cache = {};
 
@@ -47947,15 +82255,15 @@ module.exports = braces;
 
 
 /***/ }),
-/* 502 */
+/* 721 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var define = __webpack_require__(503);
-var extend = __webpack_require__(511);
-var not = __webpack_require__(513);
+var define = __webpack_require__(722);
+var extend = __webpack_require__(730);
+var not = __webpack_require__(732);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -48102,7 +82410,7 @@ module.exports.makeRe = makeRe;
 
 
 /***/ }),
-/* 503 */
+/* 722 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48115,7 +82423,7 @@ module.exports.makeRe = makeRe;
 
 
 
-var isDescriptor = __webpack_require__(504);
+var isDescriptor = __webpack_require__(723);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -48140,7 +82448,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 504 */
+/* 723 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48153,9 +82461,9 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 
-var typeOf = __webpack_require__(505);
-var isAccessor = __webpack_require__(506);
-var isData = __webpack_require__(509);
+var typeOf = __webpack_require__(724);
+var isAccessor = __webpack_require__(725);
+var isData = __webpack_require__(728);
 
 module.exports = function isDescriptor(obj, key) {
   if (typeOf(obj) !== 'object') {
@@ -48169,7 +82477,7 @@ module.exports = function isDescriptor(obj, key) {
 
 
 /***/ }),
-/* 505 */
+/* 724 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -48322,7 +82630,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 506 */
+/* 725 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48335,7 +82643,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(507);
+var typeOf = __webpack_require__(726);
 
 // accessor descriptor properties
 var accessor = {
@@ -48398,10 +82706,10 @@ module.exports = isAccessorDescriptor;
 
 
 /***/ }),
-/* 507 */
+/* 726 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(508);
+var isBuffer = __webpack_require__(727);
 var toString = Object.prototype.toString;
 
 /**
@@ -48520,7 +82828,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 508 */
+/* 727 */
 /***/ (function(module, exports) {
 
 /*!
@@ -48547,7 +82855,7 @@ function isSlowBuffer (obj) {
 
 
 /***/ }),
-/* 509 */
+/* 728 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48560,7 +82868,7 @@ function isSlowBuffer (obj) {
 
 
 
-var typeOf = __webpack_require__(510);
+var typeOf = __webpack_require__(729);
 
 // data descriptor properties
 var data = {
@@ -48609,10 +82917,10 @@ module.exports = isDataDescriptor;
 
 
 /***/ }),
-/* 510 */
+/* 729 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(508);
+var isBuffer = __webpack_require__(727);
 var toString = Object.prototype.toString;
 
 /**
@@ -48731,13 +83039,13 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 511 */
+/* 730 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(512);
+var isObject = __webpack_require__(731);
 
 module.exports = function extend(o/*, objects*/) {
   if (!isObject(o)) { o = {}; }
@@ -48771,7 +83079,7 @@ function hasOwn(obj, key) {
 
 
 /***/ }),
-/* 512 */
+/* 731 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48791,13 +83099,13 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 513 */
+/* 732 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(511);
+var extend = __webpack_require__(730);
 
 /**
  * The main export is a function that takes a `pattern` string and an `options` object.
@@ -48864,7 +83172,7 @@ module.exports = toRegex;
 
 
 /***/ }),
-/* 514 */
+/* 733 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -48914,13 +83222,13 @@ module.exports.immutable = function uniqueImmutable(arr) {
 
 
 /***/ }),
-/* 515 */
+/* 734 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(516);
+var utils = __webpack_require__(735);
 
 module.exports = function(braces, options) {
   braces.compiler
@@ -49203,25 +83511,25 @@ function hasQueue(node) {
 
 
 /***/ }),
-/* 516 */
+/* 735 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var splitString = __webpack_require__(517);
+var splitString = __webpack_require__(736);
 var utils = module.exports;
 
 /**
  * Module dependencies
  */
 
-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.extend = __webpack_require__(730);
+utils.flatten = __webpack_require__(742);
+utils.isObject = __webpack_require__(740);
+utils.fillRange = __webpack_require__(743);
+utils.repeat = __webpack_require__(748);
+utils.unique = __webpack_require__(733);
 
 utils.define = function(obj, key, val) {
   Object.defineProperty(obj, key, {
@@ -49553,7 +83861,7 @@ utils.escapeRegex = function(str) {
 
 
 /***/ }),
-/* 517 */
+/* 736 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -49566,7 +83874,7 @@ utils.escapeRegex = function(str) {
 
 
 
-var extend = __webpack_require__(518);
+var extend = __webpack_require__(737);
 
 module.exports = function(str, options, fn) {
   if (typeof str !== 'string') {
@@ -49731,14 +84039,14 @@ function keepEscaping(opts, str, idx) {
 
 
 /***/ }),
-/* 518 */
+/* 737 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(519);
-var assignSymbols = __webpack_require__(522);
+var isExtendable = __webpack_require__(738);
+var assignSymbols = __webpack_require__(741);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -49798,7 +84106,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 519 */
+/* 738 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -49811,7 +84119,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(520);
+var isPlainObject = __webpack_require__(739);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -49819,7 +84127,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 520 */
+/* 739 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -49832,7 +84140,7 @@ module.exports = function isExtendable(val) {
 
 
 
-var isObject = __webpack_require__(521);
+var isObject = __webpack_require__(740);
 
 function isObjectObject(o) {
   return isObject(o) === true
@@ -49863,7 +84171,7 @@ module.exports = function isPlainObject(o) {
 
 
 /***/ }),
-/* 521 */
+/* 740 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -49882,7 +84190,7 @@ module.exports = function isObject(val) {
 
 
 /***/ }),
-/* 522 */
+/* 741 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -49929,7 +84237,7 @@ module.exports = function(receiver, objects) {
 
 
 /***/ }),
-/* 523 */
+/* 742 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -49958,7 +84266,7 @@ function flat(arr, res) {
 
 
 /***/ }),
-/* 524 */
+/* 743 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -49972,10 +84280,10 @@ function flat(arr, res) {
 
 
 var util = __webpack_require__(29);
-var isNumber = __webpack_require__(525);
-var extend = __webpack_require__(511);
-var repeat = __webpack_require__(527);
-var toRegex = __webpack_require__(528);
+var isNumber = __webpack_require__(744);
+var extend = __webpack_require__(730);
+var repeat = __webpack_require__(746);
+var toRegex = __webpack_require__(747);
 
 /**
  * Return a range of numbers or letters.
@@ -50173,7 +84481,7 @@ module.exports = fillRange;
 
 
 /***/ }),
-/* 525 */
+/* 744 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50186,7 +84494,7 @@ module.exports = fillRange;
 
 
 
-var typeOf = __webpack_require__(526);
+var typeOf = __webpack_require__(745);
 
 module.exports = function isNumber(num) {
   var type = typeOf(num);
@@ -50202,10 +84510,10 @@ module.exports = function isNumber(num) {
 
 
 /***/ }),
-/* 526 */
+/* 745 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(508);
+var isBuffer = __webpack_require__(727);
 var toString = Object.prototype.toString;
 
 /**
@@ -50324,7 +84632,7 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 527 */
+/* 746 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50401,7 +84709,7 @@ function repeat(str, num) {
 
 
 /***/ }),
-/* 528 */
+/* 747 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50414,8 +84722,8 @@ function repeat(str, num) {
 
 
 
-var repeat = __webpack_require__(527);
-var isNumber = __webpack_require__(525);
+var repeat = __webpack_require__(746);
+var isNumber = __webpack_require__(744);
 var cache = {};
 
 function toRegexRange(min, max, options) {
@@ -50702,7 +85010,7 @@ module.exports = toRegexRange;
 
 
 /***/ }),
-/* 529 */
+/* 748 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -50727,14 +85035,14 @@ module.exports = function repeat(ele, num) {
 
 
 /***/ }),
-/* 530 */
+/* 749 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var Node = __webpack_require__(531);
-var utils = __webpack_require__(516);
+var Node = __webpack_require__(750);
+var utils = __webpack_require__(735);
 
 /**
  * Braces parsers
@@ -51094,15 +85402,15 @@ function concatNodes(pos, node, parent, options) {
 
 
 /***/ }),
-/* 531 */
+/* 750 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(521);
-var define = __webpack_require__(532);
-var utils = __webpack_require__(539);
+var isObject = __webpack_require__(740);
+var define = __webpack_require__(751);
+var utils = __webpack_require__(758);
 var ownNames;
 
 /**
@@ -51593,7 +85901,7 @@ exports = module.exports = Node;
 
 
 /***/ }),
-/* 532 */
+/* 751 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -51606,7 +85914,7 @@ exports = module.exports = Node;
 
 
 
-var isDescriptor = __webpack_require__(533);
+var isDescriptor = __webpack_require__(752);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -51631,7 +85939,7 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 533 */
+/* 752 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -51644,9 +85952,9 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 
-var typeOf = __webpack_require__(534);
-var isAccessor = __webpack_require__(535);
-var isData = __webpack_require__(537);
+var typeOf = __webpack_require__(753);
+var isAccessor = __webpack_require__(754);
+var isData = __webpack_require__(756);
 
 module.exports = function isDescriptor(obj, key) {
   if (typeOf(obj) !== 'object') {
@@ -51660,7 +85968,7 @@ module.exports = function isDescriptor(obj, key) {
 
 
 /***/ }),
-/* 534 */
+/* 753 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -51795,7 +86103,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 535 */
+/* 754 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -51808,7 +86116,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(536);
+var typeOf = __webpack_require__(755);
 
 // accessor descriptor properties
 var accessor = {
@@ -51871,7 +86179,7 @@ module.exports = isAccessorDescriptor;
 
 
 /***/ }),
-/* 536 */
+/* 755 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -52006,7 +86314,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 537 */
+/* 756 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -52019,7 +86327,7 @@ function isBuffer(val) {
 
 
 
-var typeOf = __webpack_require__(538);
+var typeOf = __webpack_require__(757);
 
 module.exports = function isDataDescriptor(obj, prop) {
   // data descriptor properties
@@ -52062,7 +86370,7 @@ module.exports = function isDataDescriptor(obj, prop) {
 
 
 /***/ }),
-/* 538 */
+/* 757 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -52197,13 +86505,13 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 539 */
+/* 758 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var typeOf = __webpack_require__(526);
+var typeOf = __webpack_require__(745);
 var utils = module.exports;
 
 /**
@@ -53223,17 +87531,17 @@ function assert(val, message) {
 
 
 /***/ }),
-/* 540 */
+/* 759 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-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);
+var extend = __webpack_require__(730);
+var Snapdragon = __webpack_require__(760);
+var compilers = __webpack_require__(734);
+var parsers = __webpack_require__(749);
+var utils = __webpack_require__(735);
 
 /**
  * Customize Snapdragon parser and renderer
@@ -53334,17 +87642,17 @@ module.exports = Braces;
 
 
 /***/ }),
-/* 541 */
+/* 760 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-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 Base = __webpack_require__(761);
+var define = __webpack_require__(722);
+var Compiler = __webpack_require__(790);
+var Parser = __webpack_require__(819);
+var utils = __webpack_require__(799);
 var regexCache = {};
 var cache = {};
 
@@ -53515,20 +87823,20 @@ module.exports.Parser = Parser;
 
 
 /***/ }),
-/* 542 */
+/* 761 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-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);
+var define = __webpack_require__(762);
+var CacheBase = __webpack_require__(763);
+var Emitter = __webpack_require__(764);
+var isObject = __webpack_require__(740);
+var merge = __webpack_require__(781);
+var pascal = __webpack_require__(784);
+var cu = __webpack_require__(785);
 
 /**
  * Optionally define a custom `cache` namespace to use.
@@ -53957,7 +88265,7 @@ module.exports.namespace = namespace;
 
 
 /***/ }),
-/* 543 */
+/* 762 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -53970,7 +88278,7 @@ module.exports.namespace = namespace;
 
 
 
-var isDescriptor = __webpack_require__(533);
+var isDescriptor = __webpack_require__(752);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -53995,21 +88303,21 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 544 */
+/* 763 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-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);
+var isObject = __webpack_require__(740);
+var Emitter = __webpack_require__(764);
+var visit = __webpack_require__(765);
+var toPath = __webpack_require__(768);
+var union = __webpack_require__(769);
+var del = __webpack_require__(773);
+var get = __webpack_require__(771);
+var has = __webpack_require__(778);
+var set = __webpack_require__(772);
 
 /**
  * Create a `Cache` constructor that when instantiated will
@@ -54263,7 +88571,7 @@ module.exports.namespace = namespace;
 
 
 /***/ }),
-/* 545 */
+/* 764 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -54432,7 +88740,7 @@ Emitter.prototype.hasListeners = function(event){
 
 
 /***/ }),
-/* 546 */
+/* 765 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54445,8 +88753,8 @@ Emitter.prototype.hasListeners = function(event){
 
 
 
-var visit = __webpack_require__(547);
-var mapVisit = __webpack_require__(548);
+var visit = __webpack_require__(766);
+var mapVisit = __webpack_require__(767);
 
 module.exports = function(collection, method, val) {
   var result;
@@ -54469,7 +88777,7 @@ module.exports = function(collection, method, val) {
 
 
 /***/ }),
-/* 547 */
+/* 766 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54482,7 +88790,7 @@ module.exports = function(collection, method, val) {
 
 
 
-var isObject = __webpack_require__(521);
+var isObject = __webpack_require__(740);
 
 module.exports = function visit(thisArg, method, target, val) {
   if (!isObject(thisArg) && typeof thisArg !== 'function') {
@@ -54509,14 +88817,14 @@ module.exports = function visit(thisArg, method, target, val) {
 
 
 /***/ }),
-/* 548 */
+/* 767 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-var visit = __webpack_require__(547);
+var visit = __webpack_require__(766);
 
 /**
  * Map `visit` over an array of objects.
@@ -54553,7 +88861,7 @@ function isObject(val) {
 
 
 /***/ }),
-/* 549 */
+/* 768 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54566,7 +88874,7 @@ function isObject(val) {
 
 
 
-var typeOf = __webpack_require__(526);
+var typeOf = __webpack_require__(745);
 
 module.exports = function toPath(args) {
   if (typeOf(args) !== 'arguments') {
@@ -54593,16 +88901,16 @@ function filter(arr) {
 
 
 /***/ }),
-/* 550 */
+/* 769 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isObject = __webpack_require__(512);
-var union = __webpack_require__(551);
-var get = __webpack_require__(552);
-var set = __webpack_require__(553);
+var isObject = __webpack_require__(731);
+var union = __webpack_require__(770);
+var get = __webpack_require__(771);
+var set = __webpack_require__(772);
 
 module.exports = function unionValue(obj, prop, value) {
   if (!isObject(obj)) {
@@ -54630,7 +88938,7 @@ function arrayify(val) {
 
 
 /***/ }),
-/* 551 */
+/* 770 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54666,7 +88974,7 @@ module.exports = function union(init) {
 
 
 /***/ }),
-/* 552 */
+/* 771 */
 /***/ (function(module, exports) {
 
 /*!
@@ -54722,7 +89030,7 @@ function toString(val) {
 
 
 /***/ }),
-/* 553 */
+/* 772 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54735,10 +89043,10 @@ function toString(val) {
 
 
 
-var split = __webpack_require__(517);
-var extend = __webpack_require__(511);
-var isPlainObject = __webpack_require__(520);
-var isObject = __webpack_require__(512);
+var split = __webpack_require__(736);
+var extend = __webpack_require__(730);
+var isPlainObject = __webpack_require__(739);
+var isObject = __webpack_require__(731);
 
 module.exports = function(obj, prop, val) {
   if (!isObject(obj)) {
@@ -54784,7 +89092,7 @@ function isValidKey(key) {
 
 
 /***/ }),
-/* 554 */
+/* 773 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54797,8 +89105,8 @@ function isValidKey(key) {
 
 
 
-var isObject = __webpack_require__(521);
-var has = __webpack_require__(555);
+var isObject = __webpack_require__(740);
+var has = __webpack_require__(774);
 
 module.exports = function unset(obj, prop) {
   if (!isObject(obj)) {
@@ -54823,7 +89131,7 @@ module.exports = function unset(obj, prop) {
 
 
 /***/ }),
-/* 555 */
+/* 774 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54836,9 +89144,9 @@ module.exports = function unset(obj, prop) {
 
 
 
-var isObject = __webpack_require__(556);
-var hasValues = __webpack_require__(558);
-var get = __webpack_require__(552);
+var isObject = __webpack_require__(775);
+var hasValues = __webpack_require__(777);
+var get = __webpack_require__(771);
 
 module.exports = function(obj, prop, noZero) {
   if (isObject(obj)) {
@@ -54849,7 +89157,7 @@ module.exports = function(obj, prop, noZero) {
 
 
 /***/ }),
-/* 556 */
+/* 775 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54862,7 +89170,7 @@ module.exports = function(obj, prop, noZero) {
 
 
 
-var isArray = __webpack_require__(557);
+var isArray = __webpack_require__(776);
 
 module.exports = function isObject(val) {
   return val != null && typeof val === 'object' && isArray(val) === false;
@@ -54870,7 +89178,7 @@ module.exports = function isObject(val) {
 
 
 /***/ }),
-/* 557 */
+/* 776 */
 /***/ (function(module, exports) {
 
 var toString = {}.toString;
@@ -54881,7 +89189,7 @@ module.exports = Array.isArray || function (arr) {
 
 
 /***/ }),
-/* 558 */
+/* 777 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54924,7 +89232,7 @@ module.exports = function hasValue(o, noZero) {
 
 
 /***/ }),
-/* 559 */
+/* 778 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54937,9 +89245,9 @@ module.exports = function hasValue(o, noZero) {
 
 
 
-var isObject = __webpack_require__(521);
-var hasValues = __webpack_require__(560);
-var get = __webpack_require__(552);
+var isObject = __webpack_require__(740);
+var hasValues = __webpack_require__(779);
+var get = __webpack_require__(771);
 
 module.exports = function(val, prop) {
   return hasValues(isObject(val) && prop ? get(val, prop) : val);
@@ -54947,7 +89255,7 @@ module.exports = function(val, prop) {
 
 
 /***/ }),
-/* 560 */
+/* 779 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -54960,8 +89268,8 @@ module.exports = function(val, prop) {
 
 
 
-var typeOf = __webpack_require__(561);
-var isNumber = __webpack_require__(525);
+var typeOf = __webpack_require__(780);
+var isNumber = __webpack_require__(744);
 
 module.exports = function hasValue(val) {
   // is-number checks for NaN and other edge cases
@@ -55014,10 +89322,10 @@ module.exports = function hasValue(val) {
 
 
 /***/ }),
-/* 561 */
+/* 780 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var isBuffer = __webpack_require__(508);
+var isBuffer = __webpack_require__(727);
 var toString = Object.prototype.toString;
 
 /**
@@ -55139,14 +89447,14 @@ module.exports = function kindOf(val) {
 
 
 /***/ }),
-/* 562 */
+/* 781 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(563);
-var forIn = __webpack_require__(564);
+var isExtendable = __webpack_require__(782);
+var forIn = __webpack_require__(783);
 
 function mixinDeep(target, objects) {
   var len = arguments.length, i = 0;
@@ -55210,7 +89518,7 @@ module.exports = mixinDeep;
 
 
 /***/ }),
-/* 563 */
+/* 782 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55223,7 +89531,7 @@ module.exports = mixinDeep;
 
 
 
-var isPlainObject = __webpack_require__(520);
+var isPlainObject = __webpack_require__(739);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -55231,7 +89539,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 564 */
+/* 783 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55254,7 +89562,7 @@ module.exports = function forIn(obj, fn, thisArg) {
 
 
 /***/ }),
-/* 565 */
+/* 784 */
 /***/ (function(module, exports) {
 
 /*!
@@ -55281,14 +89589,14 @@ module.exports = pascalcase;
 
 
 /***/ }),
-/* 566 */
+/* 785 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 var util = __webpack_require__(29);
-var utils = __webpack_require__(567);
+var utils = __webpack_require__(786);
 
 /**
  * Expose class utils
@@ -55653,7 +89961,7 @@ cu.bubble = function(Parent, events) {
 
 
 /***/ }),
-/* 567 */
+/* 786 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55667,10 +89975,10 @@ var utils = {};
  * Lazily required module dependencies
  */
 
-utils.union = __webpack_require__(551);
-utils.define = __webpack_require__(503);
-utils.isObj = __webpack_require__(521);
-utils.staticExtend = __webpack_require__(568);
+utils.union = __webpack_require__(770);
+utils.define = __webpack_require__(722);
+utils.isObj = __webpack_require__(740);
+utils.staticExtend = __webpack_require__(787);
 
 
 /**
@@ -55681,7 +89989,7 @@ module.exports = utils;
 
 
 /***/ }),
-/* 568 */
+/* 787 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -55694,8 +90002,8 @@ module.exports = utils;
 
 
 
-var copy = __webpack_require__(569);
-var define = __webpack_require__(503);
+var copy = __webpack_require__(788);
+var define = __webpack_require__(722);
 var util = __webpack_require__(29);
 
 /**
@@ -55778,15 +90086,15 @@ module.exports = extend;
 
 
 /***/ }),
-/* 569 */
+/* 788 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var typeOf = __webpack_require__(526);
-var copyDescriptor = __webpack_require__(570);
-var define = __webpack_require__(503);
+var typeOf = __webpack_require__(745);
+var copyDescriptor = __webpack_require__(789);
+var define = __webpack_require__(722);
 
 /**
  * Copy static properties, prototype properties, and descriptors from one object to another.
@@ -55959,7 +90267,7 @@ module.exports.has = has;
 
 
 /***/ }),
-/* 570 */
+/* 789 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -56047,16 +90355,16 @@ function isObject(val) {
 
 
 /***/ }),
-/* 571 */
+/* 790 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var use = __webpack_require__(572);
-var define = __webpack_require__(503);
-var debug = __webpack_require__(574)('snapdragon:compiler');
-var utils = __webpack_require__(581);
+var use = __webpack_require__(791);
+var define = __webpack_require__(722);
+var debug = __webpack_require__(793)('snapdragon:compiler');
+var utils = __webpack_require__(799);
 
 /**
  * Create a new `Compiler` with the given `options`.
@@ -56210,7 +90518,7 @@ Compiler.prototype = {
 
     // source map support
     if (opts.sourcemap) {
-      var sourcemaps = __webpack_require__(600);
+      var sourcemaps = __webpack_require__(818);
       sourcemaps(this);
       this.mapVisit(this.ast.nodes);
       this.applySourceMaps();
@@ -56231,7 +90539,7 @@ module.exports = Compiler;
 
 
 /***/ }),
-/* 572 */
+/* 791 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -56244,7 +90552,7 @@ module.exports = Compiler;
 
 
 
-var utils = __webpack_require__(573);
+var utils = __webpack_require__(792);
 
 module.exports = function base(app, opts) {
   if (!utils.isObject(app) && typeof app !== 'function') {
@@ -56359,7 +90667,7 @@ module.exports = function base(app, opts) {
 
 
 /***/ }),
-/* 573 */
+/* 792 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -56373,8 +90681,8 @@ var utils = {};
  * Lazily required module dependencies
  */
 
-utils.define = __webpack_require__(503);
-utils.isObject = __webpack_require__(521);
+utils.define = __webpack_require__(722);
+utils.isObject = __webpack_require__(740);
 
 
 utils.isString = function(val) {
@@ -56389,7 +90697,7 @@ module.exports = utils;
 
 
 /***/ }),
-/* 574 */
+/* 793 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -56398,14 +90706,14 @@ module.exports = utils;
  */
 
 if (typeof process !== 'undefined' && process.type === 'renderer') {
-  module.exports = __webpack_require__(575);
+  module.exports = __webpack_require__(794);
 } else {
-  module.exports = __webpack_require__(578);
+  module.exports = __webpack_require__(797);
 }
 
 
 /***/ }),
-/* 575 */
+/* 794 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -56414,7 +90722,7 @@ if (typeof process !== 'undefined' && process.type === 'renderer') {
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(576);
+exports = module.exports = __webpack_require__(795);
 exports.log = log;
 exports.formatArgs = formatArgs;
 exports.save = save;
@@ -56596,7 +90904,7 @@ function localstorage() {
 
 
 /***/ }),
-/* 576 */
+/* 795 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -56612,7 +90920,7 @@ exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
 exports.enabled = enabled;
-exports.humanize = __webpack_require__(577);
+exports.humanize = __webpack_require__(796);
 
 /**
  * The currently active debug mode names, and names to skip.
@@ -56804,7 +91112,7 @@ function coerce(val) {
 
 
 /***/ }),
-/* 577 */
+/* 796 */
 /***/ (function(module, exports) {
 
 /**
@@ -56962,14 +91270,14 @@ function plural(ms, n, name) {
 
 
 /***/ }),
-/* 578 */
+/* 797 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
  * Module dependencies.
  */
 
-var tty = __webpack_require__(579);
+var tty = __webpack_require__(480);
 var util = __webpack_require__(29);
 
 /**
@@ -56978,7 +91286,7 @@ var util = __webpack_require__(29);
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(576);
+exports = module.exports = __webpack_require__(795);
 exports.init = init;
 exports.log = log;
 exports.formatArgs = formatArgs;
@@ -57157,7 +91465,7 @@ function createWritableStdioStream (fd) {
 
     case 'PIPE':
     case 'TCP':
-      var net = __webpack_require__(580);
+      var net = __webpack_require__(798);
       stream = new net.Socket({
         fd: fd,
         readable: false,
@@ -57216,19 +91524,13 @@ exports.enable(load());
 
 
 /***/ }),
-/* 579 */
-/***/ (function(module, exports) {
-
-module.exports = require("tty");
-
-/***/ }),
-/* 580 */
+/* 798 */
 /***/ (function(module, exports) {
 
 module.exports = require("net");
 
 /***/ }),
-/* 581 */
+/* 799 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -57238,9 +91540,9 @@ module.exports = require("net");
  * Module dependencies
  */
 
-exports.extend = __webpack_require__(511);
-exports.SourceMap = __webpack_require__(582);
-exports.sourceMapResolve = __webpack_require__(593);
+exports.extend = __webpack_require__(730);
+exports.SourceMap = __webpack_require__(800);
+exports.sourceMapResolve = __webpack_require__(811);
 
 /**
  * Convert backslash in the given string to forward slashes
@@ -57283,7 +91585,7 @@ exports.last = function(arr, n) {
 
 
 /***/ }),
-/* 582 */
+/* 800 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /*
@@ -57291,13 +91593,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__(583).SourceMapGenerator;
-exports.SourceMapConsumer = __webpack_require__(589).SourceMapConsumer;
-exports.SourceNode = __webpack_require__(592).SourceNode;
+exports.SourceMapGenerator = __webpack_require__(801).SourceMapGenerator;
+exports.SourceMapConsumer = __webpack_require__(807).SourceMapConsumer;
+exports.SourceNode = __webpack_require__(810).SourceNode;
 
 
 /***/ }),
-/* 583 */
+/* 801 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -57307,10 +91609,10 @@ exports.SourceNode = __webpack_require__(592).SourceNode;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var base64VLQ = __webpack_require__(584);
-var util = __webpack_require__(586);
-var ArraySet = __webpack_require__(587).ArraySet;
-var MappingList = __webpack_require__(588).MappingList;
+var base64VLQ = __webpack_require__(802);
+var util = __webpack_require__(804);
+var ArraySet = __webpack_require__(805).ArraySet;
+var MappingList = __webpack_require__(806).MappingList;
 
 /**
  * An instance of the SourceMapGenerator represents a source map which is
@@ -57719,7 +92021,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
 
 
 /***/ }),
-/* 584 */
+/* 802 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -57759,7 +92061,7 @@ exports.SourceMapGenerator = SourceMapGenerator;
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-var base64 = __webpack_require__(585);
+var base64 = __webpack_require__(803);
 
 // 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,
@@ -57865,7 +92167,7 @@ exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
 
 
 /***/ }),
-/* 585 */
+/* 803 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -57938,7 +92240,7 @@ exports.decode = function (charCode) {
 
 
 /***/ }),
-/* 586 */
+/* 804 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -58361,7 +92663,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
 
 
 /***/ }),
-/* 587 */
+/* 805 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -58371,7 +92673,7 @@ exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflate
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(586);
+var util = __webpack_require__(804);
 var has = Object.prototype.hasOwnProperty;
 var hasNativeMap = typeof Map !== "undefined";
 
@@ -58488,7 +92790,7 @@ exports.ArraySet = ArraySet;
 
 
 /***/ }),
-/* 588 */
+/* 806 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -58498,7 +92800,7 @@ exports.ArraySet = ArraySet;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var util = __webpack_require__(586);
+var util = __webpack_require__(804);
 
 /**
  * Determine whether mappingB is after mappingA with respect to generated
@@ -58573,7 +92875,7 @@ exports.MappingList = MappingList;
 
 
 /***/ }),
-/* 589 */
+/* 807 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -58583,11 +92885,11 @@ exports.MappingList = MappingList;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-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;
+var util = __webpack_require__(804);
+var binarySearch = __webpack_require__(808);
+var ArraySet = __webpack_require__(805).ArraySet;
+var base64VLQ = __webpack_require__(802);
+var quickSort = __webpack_require__(809).quickSort;
 
 function SourceMapConsumer(aSourceMap) {
   var sourceMap = aSourceMap;
@@ -59661,7 +93963,7 @@ exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
 
 
 /***/ }),
-/* 590 */
+/* 808 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -59778,7 +94080,7 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
 
 
 /***/ }),
-/* 591 */
+/* 809 */
 /***/ (function(module, exports) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -59898,7 +94200,7 @@ exports.quickSort = function (ary, comparator) {
 
 
 /***/ }),
-/* 592 */
+/* 810 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* -*- Mode: js; js-indent-level: 2; -*- */
@@ -59908,8 +94210,8 @@ exports.quickSort = function (ary, comparator) {
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-var SourceMapGenerator = __webpack_require__(583).SourceMapGenerator;
-var util = __webpack_require__(586);
+var SourceMapGenerator = __webpack_require__(801).SourceMapGenerator;
+var util = __webpack_require__(804);
 
 // Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
 // operating systems these days (capturing the result).
@@ -60317,17 +94619,17 @@ exports.SourceNode = SourceNode;
 
 
 /***/ }),
-/* 593 */
+/* 811 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014, 2015, 2016, 2017 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-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)
+var sourceMappingURL   = __webpack_require__(812)
+var resolveUrl         = __webpack_require__(813)
+var decodeUriComponent = __webpack_require__(814)
+var urix               = __webpack_require__(816)
+var atob               = __webpack_require__(817)
 
 
 
@@ -60625,7 +94927,7 @@ module.exports = {
 
 
 /***/ }),
-/* 594 */
+/* 812 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;// Copyright 2014 Simon Lydell
@@ -60688,13 +94990,13 @@ void (function(root, factory) {
 
 
 /***/ }),
-/* 595 */
+/* 813 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-var url = __webpack_require__(82)
+var url = __webpack_require__(454)
 
 function resolveUrl(/* ...urls */) {
   return Array.prototype.reduce.call(arguments, function(resolved, nextUrl) {
@@ -60706,13 +95008,13 @@ module.exports = resolveUrl
 
 
 /***/ }),
-/* 596 */
+/* 814 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2017 Simon Lydell
 // X11 (“MIT”) Licensed. (See LICENSE.)
 
-var decodeUriComponent = __webpack_require__(597)
+var decodeUriComponent = __webpack_require__(815)
 
 function customDecodeUriComponent(string) {
   // `decodeUriComponent` turns `+` into ` `, but that's not wanted.
@@ -60723,7 +95025,7 @@ module.exports = customDecodeUriComponent
 
 
 /***/ }),
-/* 597 */
+/* 815 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -60824,7 +95126,7 @@ module.exports = function (encodedURI) {
 
 
 /***/ }),
-/* 598 */
+/* 816 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // Copyright 2014 Simon Lydell
@@ -60847,7 +95149,7 @@ module.exports = urix
 
 
 /***/ }),
-/* 599 */
+/* 817 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -60861,7 +95163,7 @@ module.exports = atob.atob = atob;
 
 
 /***/ }),
-/* 600 */
+/* 818 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -60869,8 +95171,8 @@ module.exports = atob.atob = atob;
 
 var fs = __webpack_require__(23);
 var path = __webpack_require__(16);
-var define = __webpack_require__(503);
-var utils = __webpack_require__(581);
+var define = __webpack_require__(722);
+var utils = __webpack_require__(799);
 
 /**
  * Expose `mixin()`.
@@ -61013,19 +95315,19 @@ exports.comment = function(node) {
 
 
 /***/ }),
-/* 601 */
+/* 819 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var use = __webpack_require__(572);
+var use = __webpack_require__(791);
 var util = __webpack_require__(29);
-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);
+var Cache = __webpack_require__(820);
+var define = __webpack_require__(722);
+var debug = __webpack_require__(793)('snapdragon:parser');
+var Position = __webpack_require__(821);
+var utils = __webpack_require__(799);
 
 /**
  * Create a new `Parser` with the given `input` and `options`.
@@ -61553,7 +95855,7 @@ module.exports = Parser;
 
 
 /***/ }),
-/* 602 */
+/* 820 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -61660,13 +95962,13 @@ MapCache.prototype.del = function mapDelete(key) {
 
 
 /***/ }),
-/* 603 */
+/* 821 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var define = __webpack_require__(503);
+var define = __webpack_require__(722);
 
 /**
  * Store position for a node
@@ -61681,16 +95983,16 @@ module.exports = function Position(start, parser) {
 
 
 /***/ }),
-/* 604 */
+/* 822 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var safe = __webpack_require__(605);
-var define = __webpack_require__(611);
-var extend = __webpack_require__(612);
-var not = __webpack_require__(614);
+var safe = __webpack_require__(823);
+var define = __webpack_require__(829);
+var extend = __webpack_require__(830);
+var not = __webpack_require__(832);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -61843,10 +96145,10 @@ module.exports.makeRe = makeRe;
 
 
 /***/ }),
-/* 605 */
+/* 823 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var parse = __webpack_require__(606);
+var parse = __webpack_require__(824);
 var types = parse.types;
 
 module.exports = function (re, opts) {
@@ -61892,13 +96194,13 @@ function isRegExp (x) {
 
 
 /***/ }),
-/* 606 */
+/* 824 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var util      = __webpack_require__(607);
-var types     = __webpack_require__(608);
-var sets      = __webpack_require__(609);
-var positions = __webpack_require__(610);
+var util      = __webpack_require__(825);
+var types     = __webpack_require__(826);
+var sets      = __webpack_require__(827);
+var positions = __webpack_require__(828);
 
 
 module.exports = function(regexpStr) {
@@ -62180,11 +96482,11 @@ module.exports.types = types;
 
 
 /***/ }),
-/* 607 */
+/* 825 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(608);
-var sets  = __webpack_require__(609);
+var types = __webpack_require__(826);
+var sets  = __webpack_require__(827);
 
 
 // All of these are private and only used by randexp.
@@ -62297,7 +96599,7 @@ exports.error = function(regexp, msg) {
 
 
 /***/ }),
-/* 608 */
+/* 826 */
 /***/ (function(module, exports) {
 
 module.exports = {
@@ -62313,10 +96615,10 @@ module.exports = {
 
 
 /***/ }),
-/* 609 */
+/* 827 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(608);
+var types = __webpack_require__(826);
 
 var INTS = function() {
  return [{ type: types.RANGE , from: 48, to: 57 }];
@@ -62401,10 +96703,10 @@ exports.anyChar = function() {
 
 
 /***/ }),
-/* 610 */
+/* 828 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var types = __webpack_require__(608);
+var types = __webpack_require__(826);
 
 exports.wordBoundary = function() {
   return { type: types.POSITION, value: 'b' };
@@ -62424,7 +96726,7 @@ exports.end = function() {
 
 
 /***/ }),
-/* 611 */
+/* 829 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62437,8 +96739,8 @@ exports.end = function() {
 
 
 
-var isobject = __webpack_require__(521);
-var isDescriptor = __webpack_require__(533);
+var isobject = __webpack_require__(740);
+var isDescriptor = __webpack_require__(752);
 var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
   ? Reflect.defineProperty
   : Object.defineProperty;
@@ -62469,14 +96771,14 @@ module.exports = function defineProperty(obj, key, val) {
 
 
 /***/ }),
-/* 612 */
+/* 830 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(613);
-var assignSymbols = __webpack_require__(522);
+var isExtendable = __webpack_require__(831);
+var assignSymbols = __webpack_require__(741);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -62536,7 +96838,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 613 */
+/* 831 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62549,7 +96851,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(520);
+var isPlainObject = __webpack_require__(739);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -62557,14 +96859,14 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 614 */
+/* 832 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extend = __webpack_require__(612);
-var safe = __webpack_require__(605);
+var extend = __webpack_require__(830);
+var safe = __webpack_require__(823);
 
 /**
  * The main export is a function that takes a `pattern` string and an `options` object.
@@ -62636,14 +96938,14 @@ module.exports = toRegex;
 
 
 /***/ }),
-/* 615 */
+/* 833 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var nanomatch = __webpack_require__(616);
-var extglob = __webpack_require__(631);
+var nanomatch = __webpack_require__(834);
+var extglob = __webpack_require__(849);
 
 module.exports = function(snapdragon) {
   var compilers = snapdragon.compiler.compilers;
@@ -62720,7 +97022,7 @@ function escapeExtglobs(compiler) {
 
 
 /***/ }),
-/* 616 */
+/* 834 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -62731,17 +97033,17 @@ function escapeExtglobs(compiler) {
  */
 
 var util = __webpack_require__(29);
-var toRegex = __webpack_require__(502);
-var extend = __webpack_require__(617);
+var toRegex = __webpack_require__(721);
+var extend = __webpack_require__(835);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(619);
-var parsers = __webpack_require__(620);
-var cache = __webpack_require__(623);
-var utils = __webpack_require__(625);
+var compilers = __webpack_require__(837);
+var parsers = __webpack_require__(838);
+var cache = __webpack_require__(841);
+var utils = __webpack_require__(843);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -63565,14 +97867,14 @@ module.exports = nanomatch;
 
 
 /***/ }),
-/* 617 */
+/* 835 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var isExtendable = __webpack_require__(618);
-var assignSymbols = __webpack_require__(522);
+var isExtendable = __webpack_require__(836);
+var assignSymbols = __webpack_require__(741);
 
 module.exports = Object.assign || function(obj/*, objects*/) {
   if (obj === null || typeof obj === 'undefined') {
@@ -63632,7 +97934,7 @@ function isEnum(obj, key) {
 
 
 /***/ }),
-/* 618 */
+/* 836 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -63645,7 +97947,7 @@ function isEnum(obj, key) {
 
 
 
-var isPlainObject = __webpack_require__(520);
+var isPlainObject = __webpack_require__(739);
 
 module.exports = function isExtendable(val) {
   return isPlainObject(val) || typeof val === 'function' || Array.isArray(val);
@@ -63653,7 +97955,7 @@ module.exports = function isExtendable(val) {
 
 
 /***/ }),
-/* 619 */
+/* 837 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -63999,15 +98301,15 @@ module.exports = function(nanomatch, options) {
 
 
 /***/ }),
-/* 620 */
+/* 838 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var regexNot = __webpack_require__(513);
-var toRegex = __webpack_require__(502);
-var isOdd = __webpack_require__(621);
+var regexNot = __webpack_require__(732);
+var toRegex = __webpack_require__(721);
+var isOdd = __webpack_require__(839);
 
 /**
  * Characters to use in negation regex (we want to "not" match
@@ -64393,7 +98695,7 @@ module.exports.not = NOT_REGEX;
 
 
 /***/ }),
-/* 621 */
+/* 839 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -64406,7 +98708,7 @@ module.exports.not = NOT_REGEX;
 
 
 
-var isNumber = __webpack_require__(622);
+var isNumber = __webpack_require__(840);
 
 module.exports = function isOdd(i) {
   if (!isNumber(i)) {
@@ -64420,7 +98722,7 @@ module.exports = function isOdd(i) {
 
 
 /***/ }),
-/* 622 */
+/* 840 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -64448,14 +98750,14 @@ module.exports = function isNumber(num) {
 
 
 /***/ }),
-/* 623 */
+/* 841 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = new (__webpack_require__(624))();
+module.exports = new (__webpack_require__(842))();
 
 
 /***/ }),
-/* 624 */
+/* 842 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -64468,7 +98770,7 @@ module.exports = new (__webpack_require__(624))();
 
 
 
-var MapCache = __webpack_require__(602);
+var MapCache = __webpack_require__(820);
 
 /**
  * Create a new `FragmentCache` with an optional object to use for `caches`.
@@ -64590,7 +98892,7 @@ exports = module.exports = FragmentCache;
 
 
 /***/ }),
-/* 625 */
+/* 843 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -64603,14 +98905,14 @@ var path = __webpack_require__(16);
  * Module dependencies
  */
 
-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);
+var isWindows = __webpack_require__(844)();
+var Snapdragon = __webpack_require__(760);
+utils.define = __webpack_require__(845);
+utils.diff = __webpack_require__(846);
+utils.extend = __webpack_require__(835);
+utils.pick = __webpack_require__(847);
+utils.typeOf = __webpack_require__(848);
+utils.unique = __webpack_require__(733);
 
 /**
  * Returns true if the given value is effectively an empty string
@@ -64976,7 +99278,7 @@ utils.unixify = function(options) {
 
 
 /***/ }),
-/* 626 */
+/* 844 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -65004,7 +99306,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
 /***/ }),
-/* 627 */
+/* 845 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -65017,8 +99319,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 
 
-var isobject = __webpack_require__(521);
-var isDescriptor = __webpack_require__(533);
+var isobject = __webpack_require__(740);
+var isDescriptor = __webpack_require__(752);
 var define = (typeof Reflect !== 'undefined' && Reflect.defineProperty)
   ? Reflect.defineProperty
   : Object.defineProperty;
@@ -65049,7 +99351,7 @@ module.exports = function defineProperty(obj, key, val) {
 
 
 /***/ }),
-/* 628 */
+/* 846 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -65103,7 +99405,7 @@ function diffArray(one, two) {
 
 
 /***/ }),
-/* 629 */
+/* 847 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -65116,7 +99418,7 @@ function diffArray(one, two) {
 
 
 
-var isObject = __webpack_require__(521);
+var isObject = __webpack_require__(740);
 
 module.exports = function pick(obj, keys) {
   if (!isObject(obj) && typeof obj !== 'function') {
@@ -65145,7 +99447,7 @@ module.exports = function pick(obj, keys) {
 
 
 /***/ }),
-/* 630 */
+/* 848 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -65280,7 +99582,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 631 */
+/* 849 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -65290,18 +99592,18 @@ function isBuffer(val) {
  * Module dependencies
  */
 
-var extend = __webpack_require__(511);
-var unique = __webpack_require__(514);
-var toRegex = __webpack_require__(502);
+var extend = __webpack_require__(730);
+var unique = __webpack_require__(733);
+var toRegex = __webpack_require__(721);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(632);
-var parsers = __webpack_require__(643);
-var Extglob = __webpack_require__(646);
-var utils = __webpack_require__(645);
+var compilers = __webpack_require__(850);
+var parsers = __webpack_require__(861);
+var Extglob = __webpack_require__(864);
+var utils = __webpack_require__(863);
 var MAX_LENGTH = 1024 * 64;
 
 /**
@@ -65618,13 +99920,13 @@ module.exports = extglob;
 
 
 /***/ }),
-/* 632 */
+/* 850 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var brackets = __webpack_require__(633);
+var brackets = __webpack_require__(851);
 
 /**
  * Extglob compilers
@@ -65794,7 +100096,7 @@ module.exports = function(extglob) {
 
 
 /***/ }),
-/* 633 */
+/* 851 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -65804,17 +100106,17 @@ module.exports = function(extglob) {
  * Local dependencies
  */
 
-var compilers = __webpack_require__(634);
-var parsers = __webpack_require__(636);
+var compilers = __webpack_require__(852);
+var parsers = __webpack_require__(854);
 
 /**
  * Module dependencies
  */
 
-var debug = __webpack_require__(638)('expand-brackets');
-var extend = __webpack_require__(511);
-var Snapdragon = __webpack_require__(541);
-var toRegex = __webpack_require__(502);
+var debug = __webpack_require__(856)('expand-brackets');
+var extend = __webpack_require__(730);
+var Snapdragon = __webpack_require__(760);
+var toRegex = __webpack_require__(721);
 
 /**
  * Parses the given POSIX character class `pattern` and returns a
@@ -66012,13 +100314,13 @@ module.exports = brackets;
 
 
 /***/ }),
-/* 634 */
+/* 852 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var posix = __webpack_require__(635);
+var posix = __webpack_require__(853);
 
 module.exports = function(brackets) {
   brackets.compiler
@@ -66106,7 +100408,7 @@ module.exports = function(brackets) {
 
 
 /***/ }),
-/* 635 */
+/* 853 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -66135,14 +100437,14 @@ module.exports = {
 
 
 /***/ }),
-/* 636 */
+/* 854 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var utils = __webpack_require__(637);
-var define = __webpack_require__(503);
+var utils = __webpack_require__(855);
+var define = __webpack_require__(722);
 
 /**
  * Text regex
@@ -66361,14 +100663,14 @@ module.exports.TEXT_REGEX = TEXT_REGEX;
 
 
 /***/ }),
-/* 637 */
+/* 855 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var toRegex = __webpack_require__(502);
-var regexNot = __webpack_require__(513);
+var toRegex = __webpack_require__(721);
+var regexNot = __webpack_require__(732);
 var cached;
 
 /**
@@ -66402,7 +100704,7 @@ exports.createRegex = function(pattern, include) {
 
 
 /***/ }),
-/* 638 */
+/* 856 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -66411,14 +100713,14 @@ exports.createRegex = function(pattern, include) {
  */
 
 if (typeof process !== 'undefined' && process.type === 'renderer') {
-  module.exports = __webpack_require__(639);
+  module.exports = __webpack_require__(857);
 } else {
-  module.exports = __webpack_require__(642);
+  module.exports = __webpack_require__(860);
 }
 
 
 /***/ }),
-/* 639 */
+/* 857 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
@@ -66427,7 +100729,7 @@ if (typeof process !== 'undefined' && process.type === 'renderer') {
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(640);
+exports = module.exports = __webpack_require__(858);
 exports.log = log;
 exports.formatArgs = formatArgs;
 exports.save = save;
@@ -66609,7 +100911,7 @@ function localstorage() {
 
 
 /***/ }),
-/* 640 */
+/* 858 */
 /***/ (function(module, exports, __webpack_require__) {
 
 
@@ -66625,7 +100927,7 @@ exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
 exports.enabled = enabled;
-exports.humanize = __webpack_require__(641);
+exports.humanize = __webpack_require__(859);
 
 /**
  * The currently active debug mode names, and names to skip.
@@ -66817,7 +101119,7 @@ function coerce(val) {
 
 
 /***/ }),
-/* 641 */
+/* 859 */
 /***/ (function(module, exports) {
 
 /**
@@ -66975,14 +101277,14 @@ function plural(ms, n, name) {
 
 
 /***/ }),
-/* 642 */
+/* 860 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /**
  * Module dependencies.
  */
 
-var tty = __webpack_require__(579);
+var tty = __webpack_require__(480);
 var util = __webpack_require__(29);
 
 /**
@@ -66991,7 +101293,7 @@ var util = __webpack_require__(29);
  * Expose `debug()` as the module.
  */
 
-exports = module.exports = __webpack_require__(640);
+exports = module.exports = __webpack_require__(858);
 exports.init = init;
 exports.log = log;
 exports.formatArgs = formatArgs;
@@ -67170,7 +101472,7 @@ function createWritableStdioStream (fd) {
 
     case 'PIPE':
     case 'TCP':
-      var net = __webpack_require__(580);
+      var net = __webpack_require__(798);
       stream = new net.Socket({
         fd: fd,
         readable: false,
@@ -67229,15 +101531,15 @@ exports.enable(load());
 
 
 /***/ }),
-/* 643 */
+/* 861 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var brackets = __webpack_require__(633);
-var define = __webpack_require__(644);
-var utils = __webpack_require__(645);
+var brackets = __webpack_require__(851);
+var define = __webpack_require__(862);
+var utils = __webpack_require__(863);
 
 /**
  * Characters to use in text regex (we want to "not" match
@@ -67392,7 +101694,7 @@ module.exports = parsers;
 
 
 /***/ }),
-/* 644 */
+/* 862 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67405,7 +101707,7 @@ module.exports = parsers;
 
 
 
-var isDescriptor = __webpack_require__(533);
+var isDescriptor = __webpack_require__(752);
 
 module.exports = function defineProperty(obj, prop, val) {
   if (typeof obj !== 'object' && typeof obj !== 'function') {
@@ -67430,14 +101732,14 @@ module.exports = function defineProperty(obj, prop, val) {
 
 
 /***/ }),
-/* 645 */
+/* 863 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var regex = __webpack_require__(513);
-var Cache = __webpack_require__(624);
+var regex = __webpack_require__(732);
+var Cache = __webpack_require__(842);
 
 /**
  * Utils
@@ -67506,7 +101808,7 @@ utils.createRegex = function(str) {
 
 
 /***/ }),
-/* 646 */
+/* 864 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67516,16 +101818,16 @@ utils.createRegex = function(str) {
  * Module dependencies
  */
 
-var Snapdragon = __webpack_require__(541);
-var define = __webpack_require__(644);
-var extend = __webpack_require__(511);
+var Snapdragon = __webpack_require__(760);
+var define = __webpack_require__(862);
+var extend = __webpack_require__(730);
 
 /**
  * Local dependencies
  */
 
-var compilers = __webpack_require__(632);
-var parsers = __webpack_require__(643);
+var compilers = __webpack_require__(850);
+var parsers = __webpack_require__(861);
 
 /**
  * Customize Snapdragon parser and renderer
@@ -67591,16 +101893,16 @@ module.exports = Extglob;
 
 
 /***/ }),
-/* 647 */
+/* 865 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-var extglob = __webpack_require__(631);
-var nanomatch = __webpack_require__(616);
-var regexNot = __webpack_require__(513);
-var toRegex = __webpack_require__(604);
+var extglob = __webpack_require__(849);
+var nanomatch = __webpack_require__(834);
+var regexNot = __webpack_require__(732);
+var toRegex = __webpack_require__(822);
 var not;
 
 /**
@@ -67681,14 +101983,14 @@ function textRegex(pattern) {
 
 
 /***/ }),
-/* 648 */
+/* 866 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = new (__webpack_require__(624))();
+module.exports = new (__webpack_require__(842))();
 
 
 /***/ }),
-/* 649 */
+/* 867 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -67701,13 +102003,13 @@ var path = __webpack_require__(16);
  * Module dependencies
  */
 
-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__(650);
-utils.unique = __webpack_require__(514);
+var Snapdragon = __webpack_require__(760);
+utils.define = __webpack_require__(829);
+utils.diff = __webpack_require__(846);
+utils.extend = __webpack_require__(830);
+utils.pick = __webpack_require__(847);
+utils.typeOf = __webpack_require__(868);
+utils.unique = __webpack_require__(733);
 
 /**
  * Returns true if the platform is windows, or `path.sep` is `\\`.
@@ -68004,7 +102306,7 @@ utils.unixify = function(options) {
 
 
 /***/ }),
-/* 650 */
+/* 868 */
 /***/ (function(module, exports) {
 
 var toString = Object.prototype.toString;
@@ -68139,7 +102441,7 @@ function isBuffer(val) {
 
 
 /***/ }),
-/* 651 */
+/* 869 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -68158,9 +102460,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(652);
-var reader_1 = __webpack_require__(665);
-var fs_stream_1 = __webpack_require__(669);
+var readdir = __webpack_require__(870);
+var reader_1 = __webpack_require__(883);
+var fs_stream_1 = __webpack_require__(887);
 var ReaderAsync = /** @class */ (function (_super) {
     __extends(ReaderAsync, _super);
     function ReaderAsync() {
@@ -68221,15 +102523,15 @@ exports.default = ReaderAsync;
 
 
 /***/ }),
-/* 652 */
+/* 870 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const readdirSync = __webpack_require__(653);
-const readdirAsync = __webpack_require__(661);
-const readdirStream = __webpack_require__(664);
+const readdirSync = __webpack_require__(871);
+const readdirAsync = __webpack_require__(879);
+const readdirStream = __webpack_require__(882);
 
 module.exports = exports = readdirAsyncPath;
 exports.readdir = exports.readdirAsync = exports.async = readdirAsyncPath;
@@ -68313,7 +102615,7 @@ function readdirStreamStat (dir, options) {
 
 
 /***/ }),
-/* 653 */
+/* 871 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -68321,11 +102623,11 @@ function readdirStreamStat (dir, options) {
 
 module.exports = readdirSync;
 
-const DirectoryReader = __webpack_require__(654);
+const DirectoryReader = __webpack_require__(872);
 
 let syncFacade = {
-  fs: __webpack_require__(659),
-  forEach: __webpack_require__(660),
+  fs: __webpack_require__(877),
+  forEach: __webpack_require__(878),
   sync: true
 };
 
@@ -68354,18 +102656,18 @@ function readdirSync (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 654 */
+/* 872 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const Readable = __webpack_require__(28).Readable;
-const EventEmitter = __webpack_require__(46).EventEmitter;
+const Readable = __webpack_require__(27).Readable;
+const EventEmitter = __webpack_require__(379).EventEmitter;
 const path = __webpack_require__(16);
-const normalizeOptions = __webpack_require__(655);
-const stat = __webpack_require__(657);
-const call = __webpack_require__(658);
+const normalizeOptions = __webpack_require__(873);
+const stat = __webpack_require__(875);
+const call = __webpack_require__(876);
 
 /**
  * Asynchronously reads the contents of a directory and streams the results
@@ -68741,14 +103043,14 @@ module.exports = DirectoryReader;
 
 
 /***/ }),
-/* 655 */
+/* 873 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const path = __webpack_require__(16);
-const globToRegExp = __webpack_require__(656);
+const globToRegExp = __webpack_require__(874);
 
 module.exports = normalizeOptions;
 
@@ -68925,7 +103227,7 @@ function normalizeOptions (options, internalOptions) {
 
 
 /***/ }),
-/* 656 */
+/* 874 */
 /***/ (function(module, exports) {
 
 module.exports = function (glob, opts) {
@@ -69062,13 +103364,13 @@ module.exports = function (glob, opts) {
 
 
 /***/ }),
-/* 657 */
+/* 875 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const call = __webpack_require__(658);
+const call = __webpack_require__(876);
 
 module.exports = stat;
 
@@ -69143,7 +103445,7 @@ function symlinkStat (fs, path, lstats, callback) {
 
 
 /***/ }),
-/* 658 */
+/* 876 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69204,14 +103506,14 @@ function callOnce (fn) {
 
 
 /***/ }),
-/* 659 */
+/* 877 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
 const fs = __webpack_require__(23);
-const call = __webpack_require__(658);
+const call = __webpack_require__(876);
 
 /**
  * A facade around {@link fs.readdirSync} that allows it to be called
@@ -69275,7 +103577,7 @@ exports.lstat = function (path, callback) {
 
 
 /***/ }),
-/* 660 */
+/* 878 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69304,7 +103606,7 @@ function syncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 661 */
+/* 879 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69312,12 +103614,12 @@ function syncForEach (array, iterator, done) {
 
 module.exports = readdirAsync;
 
-const maybe = __webpack_require__(662);
-const DirectoryReader = __webpack_require__(654);
+const maybe = __webpack_require__(880);
+const DirectoryReader = __webpack_require__(872);
 
 let asyncFacade = {
   fs: __webpack_require__(23),
-  forEach: __webpack_require__(663),
+  forEach: __webpack_require__(881),
   async: true
 };
 
@@ -69359,7 +103661,7 @@ function readdirAsync (dir, options, callback, internalOptions) {
 
 
 /***/ }),
-/* 662 */
+/* 880 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69386,7 +103688,7 @@ module.exports = function maybe (cb, promise) {
 
 
 /***/ }),
-/* 663 */
+/* 881 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69422,7 +103724,7 @@ function asyncForEach (array, iterator, done) {
 
 
 /***/ }),
-/* 664 */
+/* 882 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69430,11 +103732,11 @@ function asyncForEach (array, iterator, done) {
 
 module.exports = readdirStream;
 
-const DirectoryReader = __webpack_require__(654);
+const DirectoryReader = __webpack_require__(872);
 
 let streamFacade = {
   fs: __webpack_require__(23),
-  forEach: __webpack_require__(663),
+  forEach: __webpack_require__(881),
   async: true
 };
 
@@ -69454,16 +103756,16 @@ function readdirStream (dir, options, internalOptions) {
 
 
 /***/ }),
-/* 665 */
+/* 883 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = __webpack_require__(16);
-var deep_1 = __webpack_require__(666);
-var entry_1 = __webpack_require__(668);
-var pathUtil = __webpack_require__(667);
+var deep_1 = __webpack_require__(884);
+var entry_1 = __webpack_require__(886);
+var pathUtil = __webpack_require__(885);
 var Reader = /** @class */ (function () {
     function Reader(options) {
         this.options = options;
@@ -69529,14 +103831,14 @@ exports.default = Reader;
 
 
 /***/ }),
-/* 666 */
+/* 884 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(667);
-var patternUtils = __webpack_require__(495);
+var pathUtils = __webpack_require__(885);
+var patternUtils = __webpack_require__(714);
 var DeepFilter = /** @class */ (function () {
     function DeepFilter(options, micromatchOptions) {
         this.options = options;
@@ -69619,7 +103921,7 @@ exports.default = DeepFilter;
 
 
 /***/ }),
-/* 667 */
+/* 885 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69650,14 +103952,14 @@ exports.makeAbsolute = makeAbsolute;
 
 
 /***/ }),
-/* 668 */
+/* 886 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var pathUtils = __webpack_require__(667);
-var patternUtils = __webpack_require__(495);
+var pathUtils = __webpack_require__(885);
+var patternUtils = __webpack_require__(714);
 var EntryFilter = /** @class */ (function () {
     function EntryFilter(options, micromatchOptions) {
         this.options = options;
@@ -69742,7 +104044,7 @@ exports.default = EntryFilter;
 
 
 /***/ }),
-/* 669 */
+/* 887 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69761,9 +104063,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var stream = __webpack_require__(28);
-var fsStat = __webpack_require__(670);
-var fs_1 = __webpack_require__(674);
+var stream = __webpack_require__(27);
+var fsStat = __webpack_require__(888);
+var fs_1 = __webpack_require__(892);
 var FileSystemStream = /** @class */ (function (_super) {
     __extends(FileSystemStream, _super);
     function FileSystemStream() {
@@ -69813,14 +104115,14 @@ exports.default = FileSystemStream;
 
 
 /***/ }),
-/* 670 */
+/* 888 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const optionsManager = __webpack_require__(671);
-const statProvider = __webpack_require__(673);
+const optionsManager = __webpack_require__(889);
+const statProvider = __webpack_require__(891);
 /**
  * Asynchronous API.
  */
@@ -69851,13 +104153,13 @@ exports.statSync = statSync;
 
 
 /***/ }),
-/* 671 */
+/* 889 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-const fsAdapter = __webpack_require__(672);
+const fsAdapter = __webpack_require__(890);
 function prepare(opts) {
     const options = Object.assign({
         fs: fsAdapter.getFileSystemAdapter(opts ? opts.fs : undefined),
@@ -69870,7 +104172,7 @@ exports.prepare = prepare;
 
 
 /***/ }),
-/* 672 */
+/* 890 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69893,7 +104195,7 @@ exports.getFileSystemAdapter = getFileSystemAdapter;
 
 
 /***/ }),
-/* 673 */
+/* 891 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69945,7 +104247,7 @@ exports.isFollowedSymlink = isFollowedSymlink;
 
 
 /***/ }),
-/* 674 */
+/* 892 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69976,7 +104278,7 @@ exports.default = FileSystem;
 
 
 /***/ }),
-/* 675 */
+/* 893 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -69995,10 +104297,10 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var stream = __webpack_require__(28);
-var readdir = __webpack_require__(652);
-var reader_1 = __webpack_require__(665);
-var fs_stream_1 = __webpack_require__(669);
+var stream = __webpack_require__(27);
+var readdir = __webpack_require__(870);
+var reader_1 = __webpack_require__(883);
+var fs_stream_1 = __webpack_require__(887);
 var TransformStream = /** @class */ (function (_super) {
     __extends(TransformStream, _super);
     function TransformStream(reader) {
@@ -70066,7 +104368,7 @@ exports.default = ReaderStream;
 
 
 /***/ }),
-/* 676 */
+/* 894 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -70085,9 +104387,9 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var readdir = __webpack_require__(652);
-var reader_1 = __webpack_require__(665);
-var fs_sync_1 = __webpack_require__(677);
+var readdir = __webpack_require__(870);
+var reader_1 = __webpack_require__(883);
+var fs_sync_1 = __webpack_require__(895);
 var ReaderSync = /** @class */ (function (_super) {
     __extends(ReaderSync, _super);
     function ReaderSync() {
@@ -70147,7 +104449,7 @@ exports.default = ReaderSync;
 
 
 /***/ }),
-/* 677 */
+/* 895 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -70166,8 +104468,8 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-var fsStat = __webpack_require__(670);
-var fs_1 = __webpack_require__(674);
+var fsStat = __webpack_require__(888);
+var fs_1 = __webpack_require__(892);
 var FileSystemSync = /** @class */ (function (_super) {
     __extends(FileSystemSync, _super);
     function FileSystemSync() {
@@ -70213,7 +104515,7 @@ exports.default = FileSystemSync;
 
 
 /***/ }),
-/* 678 */
+/* 896 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -70229,13 +104531,13 @@ exports.flatten = flatten;
 
 
 /***/ }),
-/* 679 */
+/* 897 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-var merge2 = __webpack_require__(177);
+var merge2 = __webpack_require__(591);
 /**
  * Merge multiple streams and propagate their errors into one stream in parallel.
  */
@@ -70250,13 +104552,13 @@ exports.merge = merge;
 
 
 /***/ }),
-/* 680 */
+/* 898 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
-const pathType = __webpack_require__(681);
+const pathType = __webpack_require__(899);
 
 const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
@@ -70322,13 +104624,13 @@ module.exports.sync = (input, opts) => {
 
 
 /***/ }),
-/* 681 */
+/* 899 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
-const pify = __webpack_require__(682);
+const pify = __webpack_require__(900);
 
 function type(fn, fn2, fp) {
 	if (typeof fp !== 'string') {
@@ -70371,7 +104673,7 @@ exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 
 
 /***/ }),
-/* 682 */
+/* 900 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -70462,17 +104764,17 @@ module.exports = (obj, opts) => {
 
 
 /***/ }),
-/* 683 */
+/* 901 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(23);
 const path = __webpack_require__(16);
-const fastGlob = __webpack_require__(491);
-const gitIgnore = __webpack_require__(684);
-const pify = __webpack_require__(685);
-const slash = __webpack_require__(686);
+const fastGlob = __webpack_require__(710);
+const gitIgnore = __webpack_require__(902);
+const pify = __webpack_require__(903);
+const slash = __webpack_require__(904);
 
 const DEFAULT_IGNORE = [
 	'**/node_modules/**',
@@ -70570,7 +104872,7 @@ module.exports.sync = options => {
 
 
 /***/ }),
-/* 684 */
+/* 902 */
 /***/ (function(module, exports) {
 
 // A simple implementation of make-array
@@ -71039,7 +105341,7 @@ module.exports = options => new IgnoreBase(options)
 
 
 /***/ }),
-/* 685 */
+/* 903 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -71114,7 +105416,7 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 686 */
+/* 904 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -71132,17 +105434,17 @@ module.exports = input => {
 
 
 /***/ }),
-/* 687 */
+/* 905 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(16);
 const {constants: fsConstants} = __webpack_require__(23);
-const {Buffer} = __webpack_require__(688);
-const CpFileError = __webpack_require__(690);
-const fs = __webpack_require__(692);
-const ProgressEmitter = __webpack_require__(694);
+const {Buffer} = __webpack_require__(906);
+const CpFileError = __webpack_require__(907);
+const fs = __webpack_require__(909);
+const ProgressEmitter = __webpack_require__(911);
 
 const cpFile = (source, destination, options) => {
 	if (!source || !destination) {
@@ -71296,11 +105598,11 @@ module.exports.sync = (source, destination, options) => {
 
 
 /***/ }),
-/* 688 */
+/* 906 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* eslint-disable node/no-deprecated-api */
-var buffer = __webpack_require__(689)
+var buffer = __webpack_require__(585)
 var Buffer = buffer.Buffer
 
 // alternative to using Object.keys for old browsers
@@ -71364,18 +105666,12 @@ SafeBuffer.allocUnsafeSlow = function (size) {
 
 
 /***/ }),
-/* 689 */
-/***/ (function(module, exports) {
-
-module.exports = require("buffer");
-
-/***/ }),
-/* 690 */
+/* 907 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(691);
+const NestedError = __webpack_require__(908);
 
 class CpFileError extends NestedError {
 	constructor(message, nested) {
@@ -71389,10 +105685,10 @@ module.exports = CpFileError;
 
 
 /***/ }),
-/* 691 */
+/* 908 */
 /***/ (function(module, exports, __webpack_require__) {
 
-var inherits = __webpack_require__(44);
+var inherits = __webpack_require__(509);
 
 var NestedError = function (message, nested) {
     this.nested = nested;
@@ -71443,15 +105739,15 @@ module.exports = NestedError;
 
 
 /***/ }),
-/* 692 */
+/* 909 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 const fs = __webpack_require__(22);
-const makeDir = __webpack_require__(115);
-const pify = __webpack_require__(693);
-const CpFileError = __webpack_require__(690);
+const makeDir = __webpack_require__(559);
+const pify = __webpack_require__(910);
+const CpFileError = __webpack_require__(907);
 
 const fsP = pify(fs);
 
@@ -71596,7 +105892,7 @@ if (fs.copyFileSync) {
 
 
 /***/ }),
-/* 693 */
+/* 910 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -71671,12 +105967,12 @@ module.exports = (input, options) => {
 
 
 /***/ }),
-/* 694 */
+/* 911 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const EventEmitter = __webpack_require__(46);
+const EventEmitter = __webpack_require__(379);
 
 const written = new WeakMap();
 
@@ -71712,12 +106008,12 @@ module.exports = ProgressEmitter;
 
 
 /***/ }),
-/* 695 */
+/* 912 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
-const NestedError = __webpack_require__(696);
+const NestedError = __webpack_require__(913);
 
 class CpyError extends NestedError {
 	constructor(message, nested) {
@@ -71731,7 +106027,7 @@ module.exports = CpyError;
 
 
 /***/ }),
-/* 696 */
+/* 913 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var inherits = __webpack_require__(29).inherits;
@@ -71787,14 +106083,14 @@ module.exports = NestedError;
 
 
 /***/ }),
-/* 697 */
+/* 914 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "prepareExternalProjectDependencies", function() { return prepareExternalProjectDependencies; });
-/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55);
-/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(54);
+/* harmony import */ var _utils_package_json__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(517);
+/* harmony import */ var _utils_project__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(516);
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
diff --git a/packages/kbn-pm/package.json b/packages/kbn-pm/package.json
index b53414518d853..f57365905292b 100644
--- a/packages/kbn-pm/package.json
+++ b/packages/kbn-pm/package.json
@@ -10,11 +10,11 @@
     "prettier": "prettier --write './src/**/*.ts'"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.5",
-    "@babel/plugin-proposal-class-properties": "^7.7.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
-    "@babel/preset-env": "^7.7.6",
-    "@babel/preset-typescript": "^7.3.3",
+    "@babel/core": "^7.5.5",
+    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/preset-typescript": "^7.7.4",
     "@types/cmd-shim": "^2.0.0",
     "@types/cpy": "^5.1.0",
     "@types/dedent": "^0.7.0",
@@ -34,6 +34,8 @@
     "@types/tempy": "^0.2.0",
     "@types/wrap-ansi": "^2.0.15",
     "@types/write-pkg": "^3.1.0",
+    "@kbn/dev-utils": "1.0.0",
+    "@yarnpkg/lockfile": "^1.1.0",
     "babel-loader": "^8.0.6",
     "chalk": "^2.4.2",
     "cmd-shim": "^2.1.0",
@@ -48,6 +50,7 @@
     "indent-string": "^3.2.0",
     "lodash.clonedeepwith": "^4.5.0",
     "log-symbols": "^2.2.0",
+    "multimatch": "^4.0.0",
     "ncp": "^2.0.0",
     "ora": "^1.4.0",
     "prettier": "^1.19.1",
diff --git a/packages/kbn-pm/src/cli.ts b/packages/kbn-pm/src/cli.ts
index 91274ed8872f9..c2f49356957f7 100644
--- a/packages/kbn-pm/src/cli.ts
+++ b/packages/kbn-pm/src/cli.ts
@@ -47,6 +47,7 @@ function help() {
        -i, --include          Include only specified projects. If left unspecified, it defaults to including all projects.
        --oss                  Do not include the x-pack when running command.
        --skip-kibana-plugins  Filter all plugins in ./plugins and ../kibana-extra when running command.
+       --no-cache             Disable the bootstrap cache
   `);
 }
 
@@ -65,7 +66,10 @@ export async function run(argv: string[]) {
       h: 'help',
       i: 'include',
     },
-    boolean: ['prefer-offline', 'frozen-lockfile'],
+    default: {
+      cache: true,
+    },
+    boolean: ['prefer-offline', 'frozen-lockfile', 'cache'],
   });
 
   const args = options._;
diff --git a/packages/kbn-pm/src/commands/__snapshots__/bootstrap.test.ts.snap b/packages/kbn-pm/src/commands/__snapshots__/bootstrap.test.ts.snap
index 53c942de0aff8..c0505710f5670 100644
--- a/packages/kbn-pm/src/commands/__snapshots__/bootstrap.test.ts.snap
+++ b/packages/kbn-pm/src/commands/__snapshots__/bootstrap.test.ts.snap
@@ -31,6 +31,7 @@ Array [
         },
         "scripts": Object {},
         "targetLocation": "<repoRoot>/packages/kbn-pm/src/commands/target",
+        "version": "1.0.0",
       },
       "bar" => Project {
         "allDependencies": Object {},
@@ -52,6 +53,7 @@ Array [
           "kbn:bootstrap": "node ./bar.js",
         },
         "targetLocation": "<repoRoot>/packages/kbn-pm/src/commands/packages/bar/target",
+        "version": "1.0.0",
       },
     },
     Map {
@@ -76,6 +78,7 @@ Array [
             "kbn:bootstrap": "node ./bar.js",
           },
           "targetLocation": "<repoRoot>/packages/kbn-pm/src/commands/packages/bar/target",
+          "version": "1.0.0",
         },
       ],
       "bar" => Array [],
@@ -109,6 +112,7 @@ Array [
         "kbn:bootstrap": "node ./bar.js",
       },
       "targetLocation": "<repoRoot>/packages/kbn-pm/src/commands/packages/bar/target",
+      "version": "1.0.0",
     },
   ],
 ]
diff --git a/packages/kbn-pm/src/commands/bootstrap.test.ts b/packages/kbn-pm/src/commands/bootstrap.test.ts
index b36246d97c1ad..072f34611f8fc 100644
--- a/packages/kbn-pm/src/commands/bootstrap.test.ts
+++ b/packages/kbn-pm/src/commands/bootstrap.test.ts
@@ -29,6 +29,7 @@ import { Project } from '../utils/project';
 import { buildProjectGraph } from '../utils/projects';
 import { installInDir, runScriptInPackageStreaming, yarnWorkspacesInfo } from '../utils/scripts';
 import { BootstrapCommand } from './bootstrap';
+import { Kibana } from '../utils/kibana';
 
 const mockInstallInDir = installInDir as jest.Mock;
 const mockRunScriptInPackageStreaming = runScriptInPackageStreaming as jest.Mock;
@@ -107,6 +108,7 @@ test('handles dependencies of dependencies', async () => {
     ['bar', bar],
     ['baz', baz],
   ]);
+  const kbn = new Kibana(projects);
   const projectGraph = buildProjectGraph(projects);
 
   const logMock = jest.spyOn(console, 'log').mockImplementation(noop);
@@ -115,6 +117,7 @@ test('handles dependencies of dependencies', async () => {
     extraArgs: [],
     options: {},
     rootPath: '',
+    kbn,
   });
 
   expect(mockInstallInDir.mock.calls).toMatchSnapshot('install in dir');
@@ -142,6 +145,7 @@ test('does not run installer if no deps in package', async () => {
     ['kibana', kibana],
     ['bar', bar],
   ]);
+  const kbn = new Kibana(projects);
   const projectGraph = buildProjectGraph(projects);
 
   const logMock = jest.spyOn(console, 'log').mockImplementation(noop);
@@ -150,6 +154,7 @@ test('does not run installer if no deps in package', async () => {
     extraArgs: [],
     options: {},
     rootPath: '',
+    kbn,
   });
 
   expect(mockInstallInDir.mock.calls).toMatchSnapshot('install in dir');
@@ -167,6 +172,7 @@ test('handles "frozen-lockfile"', async () => {
   });
 
   const projects = new Map([['kibana', kibana]]);
+  const kbn = new Kibana(projects);
   const projectGraph = buildProjectGraph(projects);
 
   jest.spyOn(console, 'log').mockImplementation(noop);
@@ -177,6 +183,7 @@ test('handles "frozen-lockfile"', async () => {
       'frozen-lockfile': true,
     },
     rootPath: '',
+    kbn,
   });
 
   expect(mockInstallInDir.mock.calls).toMatchSnapshot('install in dir');
@@ -205,6 +212,7 @@ test('calls "kbn:bootstrap" scripts and links executables after installing deps'
     ['kibana', kibana],
     ['bar', bar],
   ]);
+  const kbn = new Kibana(projects);
   const projectGraph = buildProjectGraph(projects);
 
   jest.spyOn(console, 'log').mockImplementation(noop);
@@ -213,6 +221,7 @@ test('calls "kbn:bootstrap" scripts and links executables after installing deps'
     extraArgs: [],
     options: {},
     rootPath: '',
+    kbn,
   });
 
   expect(mockLinkProjectExecutables.mock.calls).toMatchSnapshot('link bins');
diff --git a/packages/kbn-pm/src/commands/bootstrap.ts b/packages/kbn-pm/src/commands/bootstrap.ts
index be4b9da7bf516..d0aa220f25f66 100644
--- a/packages/kbn-pm/src/commands/bootstrap.ts
+++ b/packages/kbn-pm/src/commands/bootstrap.ts
@@ -24,12 +24,14 @@ import { log } from '../utils/log';
 import { parallelizeBatches } from '../utils/parallelize';
 import { topologicallyBatchProjects } from '../utils/projects';
 import { ICommand } from './';
+import { getAllChecksums } from '../utils/project_checksums';
+import { BootstrapCacheFile } from '../utils/bootstrap_cache_file';
 
 export const BootstrapCommand: ICommand = {
   description: 'Install dependencies and crosslink projects',
   name: 'bootstrap',
 
-  async run(projects, projectGraph, { options }) {
+  async run(projects, projectGraph, { options, kbn }) {
     const batchedProjectsByWorkspace = topologicallyBatchProjects(projects, projectGraph, {
       batchByWorkspace: true,
     });
@@ -65,9 +67,18 @@ export const BootstrapCommand: ICommand = {
      * have to, as it will slow down the bootstrapping process.
      */
     log.write(chalk.bold('\nLinking executables completed, running `kbn:bootstrap` scripts\n'));
-    await parallelizeBatches(batchedProjects, async pkg => {
-      if (pkg.hasScript('kbn:bootstrap')) {
-        await pkg.runScriptStreaming('kbn:bootstrap');
+
+    const checksums = options.cache ? await getAllChecksums(kbn, log) : false;
+    await parallelizeBatches(batchedProjects, async project => {
+      if (project.hasScript('kbn:bootstrap')) {
+        const cacheFile = new BootstrapCacheFile(kbn, project, checksums);
+        if (cacheFile.isValid()) {
+          log.success(`[${project.name}] cache up to date`);
+        } else {
+          cacheFile.delete();
+          await project.runScriptStreaming('kbn:bootstrap');
+          cacheFile.write();
+        }
       }
     });
 
diff --git a/packages/kbn-pm/src/commands/index.ts b/packages/kbn-pm/src/commands/index.ts
index 21de92bcbf47c..b73e054b03373 100644
--- a/packages/kbn-pm/src/commands/index.ts
+++ b/packages/kbn-pm/src/commands/index.ts
@@ -23,6 +23,7 @@ export interface ICommandConfig {
   extraArgs: string[];
   options: { [key: string]: any };
   rootPath: string;
+  kbn: Kibana;
 }
 
 export interface ICommand {
@@ -36,6 +37,7 @@ import { BootstrapCommand } from './bootstrap';
 import { CleanCommand } from './clean';
 import { RunCommand } from './run';
 import { WatchCommand } from './watch';
+import { Kibana } from '../utils/kibana';
 
 export const commands: { [key: string]: ICommand } = {
   bootstrap: BootstrapCommand,
diff --git a/packages/kbn-pm/src/config.ts b/packages/kbn-pm/src/config.ts
index 2e42a182e7ec3..6d5e67dca7d13 100644
--- a/packages/kbn-pm/src/config.ts
+++ b/packages/kbn-pm/src/config.ts
@@ -19,18 +19,16 @@
 
 import { resolve } from 'path';
 
-export interface IProjectPathOptions {
-  'skip-kibana-plugins'?: boolean;
-  oss?: boolean;
+interface Options {
+  rootPath: string;
+  skipKibanaPlugins?: boolean;
+  ossOnly?: boolean;
 }
 
 /**
  * Returns all the paths where plugins are located
  */
-export function getProjectPaths(rootPath: string, options: IProjectPathOptions = {}) {
-  const skipKibanaPlugins = Boolean(options['skip-kibana-plugins']);
-  const ossOnly = Boolean(options.oss);
-
+export function getProjectPaths({ rootPath, ossOnly, skipKibanaPlugins }: Options) {
   const projectPaths = [rootPath, resolve(rootPath, 'packages/*')];
 
   // This is needed in order to install the dependencies for the declared
diff --git a/packages/kbn-pm/src/production/build_production_projects.ts b/packages/kbn-pm/src/production/build_production_projects.ts
index fd5c4107292fc..0d4be8b016077 100644
--- a/packages/kbn-pm/src/production/build_production_projects.ts
+++ b/packages/kbn-pm/src/production/build_production_projects.ts
@@ -66,7 +66,7 @@ export async function buildProductionProjects({
  * is supplied, we omit projects with build.oss in their package.json set to false.
  */
 async function getProductionProjects(rootPath: string, onlyOSS?: boolean) {
-  const projectPaths = getProjectPaths(rootPath, {});
+  const projectPaths = getProjectPaths({ rootPath });
   const projects = await getProjects(rootPath, projectPaths);
   const projectsSubset = [projects.get('kibana')!];
 
diff --git a/packages/kbn-pm/src/run.test.ts b/packages/kbn-pm/src/run.test.ts
index 13cac6eb745ba..ff0dc2666afea 100644
--- a/packages/kbn-pm/src/run.test.ts
+++ b/packages/kbn-pm/src/run.test.ts
@@ -38,7 +38,7 @@ function getExpectedProjectsAndGraph(runMock: any) {
 }
 
 let command: ICommand;
-let config: ICommandConfig;
+let config: Omit<ICommandConfig, 'kbn'>;
 beforeEach(() => {
   command = {
     description: 'test description',
diff --git a/packages/kbn-pm/src/run.ts b/packages/kbn-pm/src/run.ts
index 980997200a194..44bf5a91ee1b1 100644
--- a/packages/kbn-pm/src/run.ts
+++ b/packages/kbn-pm/src/run.ts
@@ -22,13 +22,13 @@ import indentString from 'indent-string';
 import wrapAnsi from 'wrap-ansi';
 
 import { ICommand, ICommandConfig } from './commands';
-import { getProjectPaths, IProjectPathOptions } from './config';
 import { CliError } from './utils/errors';
 import { log } from './utils/log';
-import { buildProjectGraph, getProjects } from './utils/projects';
+import { buildProjectGraph } from './utils/projects';
 import { renderProjectsTree } from './utils/projects_tree';
+import { Kibana } from './utils/kibana';
 
-export async function runCommand(command: ICommand, config: ICommandConfig) {
+export async function runCommand(command: ICommand, config: Omit<ICommandConfig, 'kbn'>) {
   try {
     log.write(
       chalk.bold(
@@ -36,9 +36,10 @@ export async function runCommand(command: ICommand, config: ICommandConfig) {
       )
     );
 
-    const projectPaths = getProjectPaths(config.rootPath, config.options as IProjectPathOptions);
-
-    const projects = await getProjects(config.rootPath, projectPaths, {
+    const kbn = await Kibana.loadFrom(config.rootPath);
+    const projects = kbn.getFilteredProjects({
+      skipKibanaPlugins: Boolean(config.options['skip-kibana-plugins']),
+      ossOnly: Boolean(config.options.oss),
       exclude: toArray(config.options.exclude),
       include: toArray(config.options.include),
     });
@@ -57,7 +58,10 @@ export async function runCommand(command: ICommand, config: ICommandConfig) {
     log.write(chalk.bold(`Found [${chalk.green(projects.size.toString())}] projects:\n`));
     log.write(renderProjectsTree(config.rootPath, projects));
 
-    await command.run(projects, projectGraph, config);
+    await command.run(projects, projectGraph, {
+      ...config,
+      kbn,
+    });
   } catch (e) {
     log.write(chalk.bold.red(`\n[${command.name}] failed:\n`));
 
diff --git a/packages/kbn-pm/src/utils/bootstrap_cache_file.ts b/packages/kbn-pm/src/utils/bootstrap_cache_file.ts
new file mode 100644
index 0000000000000..7d87179f34605
--- /dev/null
+++ b/packages/kbn-pm/src/utils/bootstrap_cache_file.ts
@@ -0,0 +1,92 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Fs from 'fs';
+import Path from 'path';
+
+import { ChecksumMap } from './project_checksums';
+import { Project } from '../utils/project';
+import { Kibana } from '../utils/kibana';
+
+export class BootstrapCacheFile {
+  private readonly path: string;
+  private readonly expectedValue: string | undefined;
+
+  constructor(kbn: Kibana, project: Project, checksums: ChecksumMap | false) {
+    this.path = Path.resolve(project.targetLocation, '.bootstrap-cache');
+
+    if (!checksums) {
+      return;
+    }
+
+    const projectAndDepCacheKeys = Array.from(kbn.getProjectAndDeps(project.name).values())
+      // sort deps by name so that the key is stable
+      .sort((a, b) => a.name.localeCompare(b.name))
+      // get the cacheKey for each project, return undefined if the cache key couldn't be determined
+      .map(p => {
+        const cacheKey = checksums.get(p.name);
+        if (cacheKey) {
+          return `${p.name}:${cacheKey}`;
+        }
+      });
+
+    // if any of the relevant cache keys are undefined then the projectCacheKey must be too
+    this.expectedValue = projectAndDepCacheKeys.some(k => !k)
+      ? undefined
+      : [
+          `# this is only human readable for debugging, please don't try to parse this`,
+          ...projectAndDepCacheKeys,
+        ].join('\n');
+  }
+
+  isValid() {
+    if (!this.expectedValue) {
+      return false;
+    }
+
+    try {
+      return Fs.readFileSync(this.path, 'utf8') === this.expectedValue;
+    } catch (error) {
+      if (error.code === 'ENOENT') {
+        return false;
+      }
+
+      throw error;
+    }
+  }
+
+  delete() {
+    try {
+      Fs.unlinkSync(this.path);
+    } catch (error) {
+      if (error.code !== 'ENOENT') {
+        throw error;
+      }
+    }
+  }
+
+  write() {
+    if (!this.expectedValue) {
+      return;
+    }
+
+    Fs.mkdirSync(Path.dirname(this.path), { recursive: true });
+    Fs.writeFileSync(this.path, this.expectedValue);
+  }
+}
diff --git a/packages/kbn-pm/src/utils/kibana.ts b/packages/kbn-pm/src/utils/kibana.ts
new file mode 100644
index 0000000000000..36f697d19fc1f
--- /dev/null
+++ b/packages/kbn-pm/src/utils/kibana.ts
@@ -0,0 +1,124 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Path from 'path';
+
+import multimatch from 'multimatch';
+
+import { ProjectMap, getProjects, includeTransitiveProjects } from './projects';
+import { Project } from './project';
+import { getProjectPaths } from '../config';
+
+/**
+ * Helper class for dealing with a set of projects as children of
+ * the Kibana project. The kbn/pm is currently implemented to be
+ * more generic, where everything is an operation of generic projects,
+ * but that leads to exceptions where we need the kibana project and
+ * do things like `project.get('kibana')!`.
+ *
+ * Using this helper we can restructre the generic list of projects
+ * as a Kibana object which encapulates all the projects in the
+ * workspace and knows about the root Kibana project.
+ */
+export class Kibana {
+  static async loadFrom(rootPath: string) {
+    return new Kibana(await getProjects(rootPath, getProjectPaths({ rootPath })));
+  }
+
+  private readonly kibanaProject: Project;
+
+  constructor(private readonly allWorkspaceProjects: ProjectMap) {
+    const kibanaProject = allWorkspaceProjects.get('kibana');
+
+    if (!kibanaProject) {
+      throw new TypeError(
+        'Unable to create Kibana object without all projects, including the Kibana project.'
+      );
+    }
+
+    this.kibanaProject = kibanaProject;
+  }
+
+  /** make an absolute path by resolving subPath relative to the kibana repo */
+  getAbsolute(...subPath: string[]) {
+    return Path.resolve(this.kibanaProject.path, ...subPath);
+  }
+
+  /** convert an absolute path to a relative path, relative to the kibana repo */
+  getRelative(absolute: string) {
+    return Path.relative(this.kibanaProject.path, absolute);
+  }
+
+  /** get a copy of the map of all projects in the kibana workspace */
+  getAllProjects() {
+    return new Map(this.allWorkspaceProjects);
+  }
+
+  /** determine if a project with the given name exists */
+  hasProject(name: string) {
+    return this.allWorkspaceProjects.has(name);
+  }
+
+  /** get a specific project, throws if the name is not known (use hasProject() first) */
+  getProject(name: string) {
+    const project = this.allWorkspaceProjects.get(name);
+
+    if (!project) {
+      throw new Error(`No package with name "${name}" in the workspace`);
+    }
+
+    return project;
+  }
+
+  /** get a project and all of the projects it depends on in a ProjectMap */
+  getProjectAndDeps(name: string) {
+    const project = this.getProject(name);
+    return includeTransitiveProjects([project], this.allWorkspaceProjects);
+  }
+
+  /** filter the projects to just those matching certain paths/include/exclude tags */
+  getFilteredProjects(options: {
+    skipKibanaPlugins: boolean;
+    ossOnly: boolean;
+    exclude: string[];
+    include: string[];
+  }) {
+    const allProjects = this.getAllProjects();
+    const filteredProjects: ProjectMap = new Map();
+
+    const pkgJsonPaths = Array.from(allProjects.values()).map(p => p.packageJsonLocation);
+    const filteredPkgJsonGlobs = getProjectPaths({
+      ...options,
+      rootPath: this.kibanaProject.path,
+    }).map(g => Path.resolve(g, 'package.json'));
+    const matchingPkgJsonPaths = multimatch(pkgJsonPaths, filteredPkgJsonGlobs);
+
+    for (const project of allProjects.values()) {
+      const pathMatches = matchingPkgJsonPaths.includes(project.packageJsonLocation);
+      const notExcluded = !options.exclude.includes(project.name);
+      const isIncluded = !options.include.length || options.include.includes(project.name);
+
+      if (pathMatches && notExcluded && isIncluded) {
+        filteredProjects.set(project.name, project);
+      }
+    }
+
+    return filteredProjects;
+  }
+}
diff --git a/packages/kbn-pm/src/utils/log.ts b/packages/kbn-pm/src/utils/log.ts
index 45ad08b8a24a0..9e5630be5bd19 100644
--- a/packages/kbn-pm/src/utils/log.ts
+++ b/packages/kbn-pm/src/utils/log.ts
@@ -17,7 +17,18 @@
  * under the License.
  */
 
-export const log = {
+import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/dev-utils';
+
+class Log extends ToolingLog {
+  testWriter?: ToolingLogCollectingWriter;
+
+  constructor() {
+    super({
+      level: 'info',
+      writeTo: process.stdout,
+    });
+  }
+
   /**
    * Log something to the console. Ideally we would use a real logger in
    * kbn-pm, but that's a pretty big change for now.
@@ -26,5 +37,7 @@ export const log = {
   write(...args: any[]) {
     // eslint-disable-next-line no-console
     console.log(...args);
-  },
-};
+  }
+}
+
+export const log = new Log();
diff --git a/packages/kbn-pm/src/utils/project.ts b/packages/kbn-pm/src/utils/project.ts
index 83192b33bd756..7b0bbed5c3f46 100644
--- a/packages/kbn-pm/src/utils/project.ts
+++ b/packages/kbn-pm/src/utils/project.ts
@@ -19,7 +19,7 @@
 
 import chalk from 'chalk';
 import fs from 'fs';
-import { relative, resolve as resolvePath } from 'path';
+import Path from 'path';
 import { inspect } from 'util';
 
 import { CliError } from './errors';
@@ -54,15 +54,27 @@ export class Project {
     return new Project(pkgJson, path);
   }
 
+  /** parsed package.json */
   public readonly json: IPackageJson;
+  /** absolute path to the package.json file in the project */
   public readonly packageJsonLocation: string;
+  /** absolute path to the node_modules in the project (might not actually exist) */
   public readonly nodeModulesLocation: string;
+  /** absolute path to the target directory in the project (might not actually exist) */
   public readonly targetLocation: string;
+  /** absolute path to the directory containing the project */
   public readonly path: string;
+  /** the version of the project */
+  public readonly version: string;
+  /** merged set of dependencies of the project, [name => version range] */
   public readonly allDependencies: IPackageDependencies;
+  /** regular dependencies of the project, [name => version range] */
   public readonly productionDependencies: IPackageDependencies;
+  /** development dependencies of the project, [name => version range] */
   public readonly devDependencies: IPackageDependencies;
+  /** scripts defined in the package.json file for the project [name => body] */
   public readonly scripts: IPackageScripts;
+
   public isWorkspaceRoot = false;
   public isWorkspaceProject = false;
 
@@ -70,10 +82,11 @@ export class Project {
     this.json = Object.freeze(packageJson);
     this.path = projectPath;
 
-    this.packageJsonLocation = resolvePath(this.path, 'package.json');
-    this.nodeModulesLocation = resolvePath(this.path, 'node_modules');
-    this.targetLocation = resolvePath(this.path, 'target');
+    this.packageJsonLocation = Path.resolve(this.path, 'package.json');
+    this.nodeModulesLocation = Path.resolve(this.path, 'node_modules');
+    this.targetLocation = Path.resolve(this.path, 'target');
 
+    this.version = this.json.version;
     this.productionDependencies = this.json.dependencies || {};
     this.devDependencies = this.json.devDependencies || {};
     this.allDependencies = {
@@ -96,7 +109,7 @@ export class Project {
     if (dependentProjectIsInWorkspace) {
       expectedVersionInPackageJson = project.json.version;
     } else {
-      const relativePathToProject = normalizePath(relative(this.path, project.path));
+      const relativePathToProject = normalizePath(Path.relative(this.path, project.path));
       expectedVersionInPackageJson = `link:${relativePathToProject}`;
     }
 
@@ -134,7 +147,7 @@ export class Project {
    * instead of everything located in the project directory.
    */
   public getIntermediateBuildDirectory() {
-    return resolvePath(this.path, this.getBuildConfig().intermediateBuildDirectory || '.');
+    return Path.resolve(this.path, this.getBuildConfig().intermediateBuildDirectory || '.');
   }
 
   public getCleanConfig(): CleanConfig {
@@ -154,14 +167,14 @@ export class Project {
 
     if (typeof raw === 'string') {
       return {
-        [this.name]: resolvePath(this.path, raw),
+        [this.name]: Path.resolve(this.path, raw),
       };
     }
 
     if (typeof raw === 'object') {
       const binsConfig: { [k: string]: string } = {};
       for (const binName of Object.keys(raw)) {
-        binsConfig[binName] = resolvePath(this.path, raw[binName]);
+        binsConfig[binName] = Path.resolve(this.path, raw[binName]);
       }
       return binsConfig;
     }
@@ -221,7 +234,7 @@ export class Project {
 
     unusedWorkspaces.forEach(name => {
       const { dependencies, devDependencies } = this.json;
-      const nodeModulesPath = resolvePath(this.nodeModulesLocation, name);
+      const nodeModulesPath = Path.resolve(this.nodeModulesLocation, name);
       const isDependency = dependencies && dependencies.hasOwnProperty(name);
       const isDevDependency = devDependencies && devDependencies.hasOwnProperty(name);
 
diff --git a/packages/kbn-pm/src/utils/project_checksums.ts b/packages/kbn-pm/src/utils/project_checksums.ts
new file mode 100644
index 0000000000000..2fd24c8fc9577
--- /dev/null
+++ b/packages/kbn-pm/src/utils/project_checksums.ts
@@ -0,0 +1,257 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Fs from 'fs';
+import Crypto from 'crypto';
+
+import { promisify } from 'util';
+
+import execa from 'execa';
+import { ToolingLog } from '@kbn/dev-utils';
+
+import { readYarnLock, YarnLock } from './yarn_lock';
+import { ProjectMap } from '../utils/projects';
+import { Project } from '../utils/project';
+import { Kibana } from '../utils/kibana';
+
+export type ChecksumMap = Map<string, string | undefined>;
+/** map of [repo relative path to changed file, type of change] */
+type Changes = Map<string, 'modified' | 'deleted' | 'invalid'>;
+
+const statAsync = promisify(Fs.stat);
+const projectBySpecificitySorter = (a: Project, b: Project) => b.path.length - a.path.length;
+
+/** Get the changed files for a set of projects */
+async function getChangesForProjects(projects: ProjectMap, kbn: Kibana, log: ToolingLog) {
+  log.verbose('getting changed files');
+
+  const { stdout } = await execa(
+    'git',
+    ['ls-files', '-dmt', '--', ...Array.from(projects.values()).map(p => p.path)],
+    {
+      cwd: kbn.getAbsolute(),
+    }
+  );
+
+  const output = stdout.trim();
+  const unassignedChanges: Changes = new Map();
+
+  if (output) {
+    for (const line of output.split('\n')) {
+      const [tag, ...pathParts] = line.trim().split(' ');
+      const path = pathParts.join(' ');
+      switch (tag) {
+        case 'M':
+        case 'C':
+          // for some reason ls-files returns deleted files as both deleted
+          // and modified, so make sure not to overwrite changes already
+          // tracked as "deleted"
+          if (unassignedChanges.get(path) !== 'deleted') {
+            unassignedChanges.set(path, 'modified');
+          }
+          break;
+
+        case 'R':
+          unassignedChanges.set(path, 'deleted');
+          break;
+
+        case 'H':
+        case 'S':
+        case 'K':
+        case '?':
+        default:
+          log.warning(`unexpected modification status "${tag}" for ${path}, please report this!`);
+          unassignedChanges.set(path, 'invalid');
+          break;
+      }
+    }
+  }
+
+  const sortedRelevantProjects = Array.from(projects.values()).sort(projectBySpecificitySorter);
+  const changesByProject = new Map<Project, Changes>();
+
+  for (const project of sortedRelevantProjects) {
+    const ownChanges: Changes = new Map();
+    const prefix = kbn.getRelative(project.path);
+
+    for (const [path, type] of unassignedChanges) {
+      if (path.startsWith(prefix)) {
+        ownChanges.set(path, type);
+        unassignedChanges.delete(path);
+      }
+    }
+
+    log.verbose(`[${project.name}] found ${ownChanges.size} changes`);
+    changesByProject.set(project, ownChanges);
+  }
+
+  if (unassignedChanges.size) {
+    throw new Error(
+      `unable to assign all change paths to a project: ${JSON.stringify(
+        Array.from(unassignedChanges.entries())
+      )}`
+    );
+  }
+
+  return changesByProject;
+}
+
+/** Get the latest commit sha for a project */
+async function getLatestSha(project: Project, kbn: Kibana) {
+  const { stdout } = await execa(
+    'git',
+    ['log', '-n', '1', '--pretty=format:%H', '--', project.path],
+    {
+      cwd: kbn.getAbsolute(),
+    }
+  );
+
+  return stdout.trim() || undefined;
+}
+
+/**
+ * Get a list of the absolute dependencies of this project, as resolved
+ * in the yarn.lock file, does not include other projects in the workspace
+ * or their dependencies
+ */
+function resolveDepsForProject(project: Project, yarnLock: YarnLock, kbn: Kibana, log: ToolingLog) {
+  /** map of [name@range, name@resolved] */
+  const resolved = new Map<string, string>();
+
+  const queue: Array<[string, string]> = Object.entries(project.allDependencies);
+
+  while (queue.length) {
+    const [name, versionRange] = queue.shift()!;
+    const req = `${name}@${versionRange}`;
+
+    if (resolved.has(req)) {
+      continue;
+    }
+
+    if (!kbn.hasProject(name)) {
+      const pkg = yarnLock[req];
+      if (!pkg) {
+        log.warning(
+          'yarn.lock file is out of date, please run `yarn kbn bootstrap` to re-enable caching'
+        );
+        return;
+      }
+
+      const res = `${name}@${pkg.version}`;
+      resolved.set(req, res);
+
+      const allDepsEntries = [
+        ...Object.entries(pkg.dependencies || {}),
+        ...Object.entries(pkg.optionalDependencies || {}),
+      ];
+
+      for (const [childName, childVersionRange] of allDepsEntries) {
+        queue.push([childName, childVersionRange]);
+      }
+    }
+  }
+
+  return Array.from(resolved.values()).sort((a, b) => a.localeCompare(b));
+}
+
+/**
+ * Get the checksum for a specific project in the workspace
+ */
+async function getChecksum(
+  project: Project,
+  changes: Changes,
+  yarnLock: YarnLock,
+  kbn: Kibana,
+  log: ToolingLog
+) {
+  const sha = await getLatestSha(project, kbn);
+  if (sha) {
+    log.verbose(`[${project.name}] local sha:`, sha);
+  }
+
+  if (Array.from(changes.values()).includes('invalid')) {
+    log.warning(`[${project.name}] unable to determine local changes, caching disabled`);
+    return;
+  }
+
+  const changesSummary = await Promise.all(
+    Array.from(changes)
+      .sort((a, b) => a[0].localeCompare(b[0]))
+      .map(async ([path, type]) => {
+        if (type === 'deleted') {
+          return `${path}:deleted`;
+        }
+
+        const stats = await statAsync(kbn.getAbsolute(path));
+        log.verbose(`[${project.name}] modified time ${stats.mtimeMs} for ${path}`);
+        return `${path}:${stats.mtimeMs}`;
+      })
+  );
+
+  const deps = await resolveDepsForProject(project, yarnLock, kbn, log);
+  if (!deps) {
+    return;
+  }
+
+  log.verbose(`[${project.name}] resolved %d deps`, deps.length);
+
+  const checksum = JSON.stringify(
+    {
+      sha,
+      changes: changesSummary,
+      deps,
+    },
+    null,
+    2
+  );
+
+  if (process.env.BOOTSTRAP_CACHE_DEBUG_CHECKSUM) {
+    return checksum;
+  }
+
+  const hash = Crypto.createHash('sha1');
+  hash.update(checksum);
+  return hash.digest('hex');
+}
+
+/**
+ * Calculate checksums for all projects in the workspace based on
+ *  - last git commit to project directory
+ *  - un-committed changes
+ *  - resolved dependencies from yarn.lock referenced by project package.json
+ */
+export async function getAllChecksums(kbn: Kibana, log: ToolingLog) {
+  const projects = kbn.getAllProjects();
+  const changesByProject = await getChangesForProjects(projects, kbn, log);
+  const yarnLock = await readYarnLock(kbn);
+
+  /** map of [project.name, cacheKey] */
+  const cacheKeys: ChecksumMap = new Map();
+
+  await Promise.all(
+    Array.from(projects.values()).map(async project => {
+      cacheKeys.set(
+        project.name,
+        await getChecksum(project, changesByProject.get(project)!, yarnLock, kbn, log)
+      );
+    })
+  );
+
+  return cacheKeys;
+}
diff --git a/packages/kbn-pm/src/utils/projects.test.ts b/packages/kbn-pm/src/utils/projects.test.ts
index 093f178f1813a..ba093b9d5eba1 100644
--- a/packages/kbn-pm/src/utils/projects.test.ts
+++ b/packages/kbn-pm/src/utils/projects.test.ts
@@ -80,7 +80,7 @@ describe('#getProjects', () => {
   });
 
   test('includes additional projects in package.json', async () => {
-    const projectPaths = getProjectPaths(rootPath, {});
+    const projectPaths = getProjectPaths({ rootPath });
     const projects = await getProjects(rootPath, projectPaths);
 
     const expectedProjects = [
@@ -100,7 +100,7 @@ describe('#getProjects', () => {
   describe('with exclude/include filters', () => {
     let projectPaths: string[];
     beforeEach(() => {
-      projectPaths = getProjectPaths(rootPath, {});
+      projectPaths = getProjectPaths({ rootPath });
     });
 
     test('excludes projects specified in `exclude` filter', async () => {
diff --git a/packages/kbn-pm/src/utils/projects.ts b/packages/kbn-pm/src/utils/projects.ts
index e8a40cce3011a..a6f174b1fc5a1 100644
--- a/packages/kbn-pm/src/utils/projects.ts
+++ b/packages/kbn-pm/src/utils/projects.ts
@@ -27,6 +27,7 @@ import { workspacePackagePaths } from './workspaces';
 
 const glob = promisify(globSync);
 
+/** a Map of project names to Project instances */
 export type ProjectMap = Map<string, Project>;
 export type ProjectGraph = Map<string, Project[]>;
 export interface IProjectsOptions {
@@ -198,7 +199,7 @@ export function includeTransitiveProjects(
   allProjects: ProjectMap,
   { onlyProductionDependencies = false } = {}
 ) {
-  const dependentProjects: ProjectMap = new Map();
+  const projectsWithDependents: ProjectMap = new Map();
 
   // the current list of packages we are expanding using breadth-first-search
   const toProcess = [...subsetOfProjects];
@@ -216,8 +217,8 @@ export function includeTransitiveProjects(
       }
     });
 
-    dependentProjects.set(project.name, project);
+    projectsWithDependents.set(project.name, project);
   }
 
-  return dependentProjects;
+  return projectsWithDependents;
 }
diff --git a/packages/kbn-pm/src/utils/projects_tree.test.ts b/packages/kbn-pm/src/utils/projects_tree.test.ts
index f8c99d22eaf22..693400080f4f8 100644
--- a/packages/kbn-pm/src/utils/projects_tree.test.ts
+++ b/packages/kbn-pm/src/utils/projects_tree.test.ts
@@ -43,7 +43,7 @@ test('handles projects outside root folder', async () => {
 });
 
 test('handles projects within projects outside root folder', async () => {
-  const projectPaths = getProjectPaths(rootPath, {});
+  const projectPaths = getProjectPaths({ rootPath });
   const projects = await getProjects(rootPath, projectPaths);
 
   const tree = await renderProjectsTree(rootPath, projects);
diff --git a/packages/kbn-pm/src/utils/workspaces.ts b/packages/kbn-pm/src/utils/workspaces.ts
index 1cc5c5838989f..22fa8636aea90 100644
--- a/packages/kbn-pm/src/utils/workspaces.ts
+++ b/packages/kbn-pm/src/utils/workspaces.ts
@@ -56,7 +56,7 @@ export async function workspacePackagePaths(rootPath: string): Promise<string[]>
 }
 
 export async function copyWorkspacePackages(rootPath: string): Promise<void> {
-  const projectPaths = getProjectPaths(rootPath, {});
+  const projectPaths = getProjectPaths({ rootPath });
   const projects = await getProjects(rootPath, projectPaths);
 
   for (const project of projects.values()) {
diff --git a/packages/kbn-pm/src/utils/yarn_lock.ts b/packages/kbn-pm/src/utils/yarn_lock.ts
new file mode 100644
index 0000000000000..f46240c0e1d2e
--- /dev/null
+++ b/packages/kbn-pm/src/utils/yarn_lock.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.
+ */
+
+// @ts-ignore published types are worthless
+import { parse as parseLockfile } from '@yarnpkg/lockfile';
+
+import { readFile } from '../utils/fs';
+import { Kibana } from '../utils/kibana';
+
+export interface YarnLock {
+  /** a simple map of version@versionrange tags to metadata about a package */
+  [key: string]: {
+    /** resolved version installed for this pacakge */
+    version: string;
+    /** resolved url for this pacakge */
+    resolved: string;
+    /** yarn calculated integrity value for this package */
+    integrity: string;
+    dependencies?: {
+      /** name => versionRange dependencies listed in package's manifest */
+      [key: string]: string;
+    };
+    optionalDependencies?: {
+      /** name => versionRange dependencies listed in package's manifest */
+      [key: string]: string;
+    };
+  };
+}
+
+export async function readYarnLock(kbn: Kibana): Promise<YarnLock> {
+  try {
+    const contents = await readFile(kbn.getAbsolute('yarn.lock'), 'utf8');
+    const yarnLock = parseLockfile(contents);
+
+    if (yarnLock.type === 'success') {
+      return yarnLock.object;
+    }
+
+    throw new Error('unable to read yarn.lock file, please run `yarn kbn bootstrap`');
+  } catch (error) {
+    if (error.code !== 'ENOENT') {
+      throw error;
+    }
+  }
+
+  return {};
+}
diff --git a/packages/kbn-pm/tsconfig.json b/packages/kbn-pm/tsconfig.json
index 2141c5502ae98..bfb13ee8dcf8a 100644
--- a/packages/kbn-pm/tsconfig.json
+++ b/packages/kbn-pm/tsconfig.json
@@ -1,11 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "exclude": [
-    "dist"
-  ],
   "include": [
     "./src/**/*.ts",
+    "./dist/*.d.ts",
   ],
+  "exclude": [],
   "compilerOptions": {
     "types": [
       "jest",
diff --git a/packages/kbn-test/package.json b/packages/kbn-test/package.json
index ac35c583ec747..0cc54fa2a64c4 100644
--- a/packages/kbn-test/package.json
+++ b/packages/kbn-test/package.json
@@ -10,7 +10,7 @@
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.5",
+    "@babel/cli": "^7.5.5",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@types/parse-link-header": "^1.0.0",
diff --git a/packages/kbn-test/src/failed_tests_reporter/add_messages_to_report.test.ts b/packages/kbn-test/src/failed_tests_reporter/add_messages_to_report.test.ts
index 0df95f419a1ff..0c824754b1237 100644
--- a/packages/kbn-test/src/failed_tests_reporter/add_messages_to_report.test.ts
+++ b/packages/kbn-test/src/failed_tests_reporter/add_messages_to_report.test.ts
@@ -36,7 +36,7 @@ expect.addSnapshotSerializer({
 jest.mock('fs', () => {
   const realFs = jest.requireActual('fs');
   return {
-    readFile: realFs.read,
+    ...realFs,
     writeFile: (...args: any[]) => {
       setTimeout(args[args.length - 1], 0);
     },
diff --git a/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.test.ts b/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.test.ts
index 7ae46ef6fac1e..b1f57cee8c23c 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.test.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.test.ts
@@ -25,7 +25,7 @@ it('collects metadata for the current test', async () => {
   const failureMetadata = new FailureMetadata(lifecycle);
 
   const test1 = {};
-  await lifecycle.beforeEachTest.trigger(test1);
+  await lifecycle.beforeEachRunnable.trigger(test1);
   failureMetadata.add({ foo: 'bar' });
 
   expect(failureMetadata.get(test1)).toMatchInlineSnapshot(`
@@ -35,7 +35,7 @@ it('collects metadata for the current test', async () => {
   `);
 
   const test2 = {};
-  await lifecycle.beforeEachTest.trigger(test2);
+  await lifecycle.beforeEachRunnable.trigger(test2);
   failureMetadata.add({ test: 2 });
 
   expect(failureMetadata.get(test1)).toMatchInlineSnapshot(`
@@ -55,7 +55,7 @@ it('adds messages to the messages state', () => {
   const failureMetadata = new FailureMetadata(lifecycle);
 
   const test1 = {};
-  lifecycle.beforeEachTest.trigger(test1);
+  lifecycle.beforeEachRunnable.trigger(test1);
   failureMetadata.addMessages(['foo', 'bar']);
   failureMetadata.addMessages(['baz']);
 
diff --git a/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.ts b/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.ts
index 9dc58d5b0b21f..be033e063fb9d 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.ts
@@ -29,7 +29,7 @@ interface Metadata {
 
 export class FailureMetadata {
   // mocha's global types mean we can't import Mocha or it will override the global jest types..............
-  private currentTest?: any;
+  private currentRunnable?: any;
   private readonly allMetadata = new Map<any, Metadata>();
 
   constructor(lifecycle: Lifecycle) {
@@ -39,18 +39,18 @@ export class FailureMetadata {
       );
     }
 
-    lifecycle.beforeEachTest.add(test => {
-      this.currentTest = test;
+    lifecycle.beforeEachRunnable.add(runnable => {
+      this.currentRunnable = runnable;
     });
   }
 
   add(metadata: Metadata | ((current: Metadata) => Metadata)) {
-    if (!this.currentTest) {
-      throw new Error('no current test to associate metadata with');
+    if (!this.currentRunnable) {
+      throw new Error('no current runnable to associate metadata with');
     }
 
-    const current = this.allMetadata.get(this.currentTest);
-    this.allMetadata.set(this.currentTest, {
+    const current = this.allMetadata.get(this.currentRunnable);
+    this.allMetadata.set(this.currentRunnable, {
       ...current,
       ...(typeof metadata === 'function' ? metadata(current || {}) : metadata),
     });
@@ -98,7 +98,7 @@ export class FailureMetadata {
     return screenshot;
   }
 
-  get(test: any) {
-    return this.allMetadata.get(test);
+  get(runnable: any) {
+    return this.allMetadata.get(runnable);
   }
 }
diff --git a/packages/kbn-test/src/functional_test_runner/lib/lifecycle.ts b/packages/kbn-test/src/functional_test_runner/lib/lifecycle.ts
index 7f78bc28c6d3d..95843ae4dcff2 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/lifecycle.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/lifecycle.ts
@@ -22,11 +22,13 @@ import { LifecyclePhase } from './lifecycle_phase';
 // mocha's global types mean we can't import Mocha or it will override the global jest types..............
 type ItsASuite = any;
 type ItsATest = any;
+type ItsARunnable = any;
 
 export class Lifecycle {
   public readonly beforeTests = new LifecyclePhase<[]>({
     singular: true,
   });
+  public readonly beforeEachRunnable = new LifecyclePhase<[ItsARunnable]>();
   public readonly beforeTestSuite = new LifecyclePhase<[ItsASuite]>();
   public readonly beforeEachTest = new LifecyclePhase<[ItsATest]>();
   public readonly afterTestSuite = new LifecyclePhase<[ItsASuite]>();
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js b/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js
index 4eb45229c2234..64fc51a04aac9 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js
@@ -19,7 +19,7 @@
 
 import { createAssignmentProxy } from './assignment_proxy';
 import { wrapFunction } from './wrap_function';
-import { wrapRunnableArgsWithErrorHandler } from './wrap_runnable_args';
+import { wrapRunnableArgs } from './wrap_runnable_args';
 
 export function decorateMochaUi(lifecycle, context) {
   // incremented at the start of each suite, decremented after
@@ -93,7 +93,7 @@ export function decorateMochaUi(lifecycle, context) {
   function wrapTestFunction(name, fn) {
     return wrapNonSuiteFunction(
       name,
-      wrapRunnableArgsWithErrorHandler(fn, async (err, test) => {
+      wrapRunnableArgs(fn, lifecycle, async (err, test) => {
         await lifecycle.testFailure.trigger(err, test);
       })
     );
@@ -111,7 +111,7 @@ export function decorateMochaUi(lifecycle, context) {
   function wrapTestHookFunction(name, fn) {
     return wrapNonSuiteFunction(
       name,
-      wrapRunnableArgsWithErrorHandler(fn, async (err, test) => {
+      wrapRunnableArgs(fn, lifecycle, async (err, test) => {
         await lifecycle.testHookFailure.trigger(err, test);
       })
     );
diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/wrap_runnable_args.js b/packages/kbn-test/src/functional_test_runner/lib/mocha/wrap_runnable_args.js
index 5ee21e81e83cc..d312ad8079dc1 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/mocha/wrap_runnable_args.js
+++ b/packages/kbn-test/src/functional_test_runner/lib/mocha/wrap_runnable_args.js
@@ -23,28 +23,24 @@ import { wrapFunction, wrapAsyncFunction } from './wrap_function';
  *  Wraps a "runnable" defining function (it(), beforeEach(), etc.)
  *  so that any "runnable" arguments passed to it are wrapped and will
  *  trigger a lifecycle event if they throw an error.
- *
- *  @param  {Function} fn
- *  @param  {String} eventName
- *  @return {Function}
  */
-export function wrapRunnableArgsWithErrorHandler(fn, handler) {
+export function wrapRunnableArgs(fn, lifecycle, handler) {
   return wrapFunction(fn, {
     before(target, thisArg, argumentsList) {
       for (let i = 0; i < argumentsList.length; i++) {
         if (typeof argumentsList[i] === 'function') {
-          argumentsList[i] = wrapRunnableError(argumentsList[i], handler);
+          argumentsList[i] = wrapAsyncFunction(argumentsList[i], {
+            async before(target, thisArg) {
+              await lifecycle.beforeEachRunnable.trigger(thisArg);
+            },
+
+            async handleError(target, thisArg, argumentsList, err) {
+              await handler(err, thisArg.test);
+              throw err;
+            },
+          });
         }
       }
     },
   });
 }
-
-function wrapRunnableError(runnable, handler) {
-  return wrapAsyncFunction(runnable, {
-    async handleError(target, thisArg, argumentsList, err) {
-      await handler(err, thisArg.test);
-      throw err;
-    },
-  });
-}
diff --git a/packages/kbn-ui-framework/package.json b/packages/kbn-ui-framework/package.json
index a4f23dd19da76..b4d9d3dfee03f 100644
--- a/packages/kbn-ui-framework/package.json
+++ b/packages/kbn-ui-framework/package.json
@@ -30,7 +30,7 @@
     "enzyme-adapter-react-16": "^1.9.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.5",
+    "@babel/core": "^7.5.5",
     "@elastic/eui": "0.0.55",
     "@kbn/babel-preset": "1.0.0",
     "autoprefixer": "9.6.1",
@@ -38,7 +38,7 @@
     "brace": "0.11.1",
     "chalk": "^2.4.2",
     "chokidar": "3.2.1",
-    "core-js": "^3.5.0",
+    "core-js": "^3.2.1",
     "css-loader": "^2.1.1",
     "expose-loader": "^0.7.5",
     "file-loader": "^4.2.0",
diff --git a/packages/kbn-utility-types/index.ts b/packages/kbn-utility-types/index.ts
index 495b5fb374b43..36bbc8cc82873 100644
--- a/packages/kbn-utility-types/index.ts
+++ b/packages/kbn-utility-types/index.ts
@@ -18,6 +18,7 @@
  */
 
 import { PromiseType } from 'utility-types';
+export { $Values, Required, Optional, Class } from 'utility-types';
 
 /**
  * Returns wrapped type of a promise.
diff --git a/packages/kbn-utility-types/package.json b/packages/kbn-utility-types/package.json
index a79d08677020b..a999eb41eb781 100644
--- a/packages/kbn-utility-types/package.json
+++ b/packages/kbn-utility-types/package.json
@@ -13,7 +13,7 @@
     "clean": "del target"
   },
   "dependencies": {
-    "utility-types": "^3.7.0"
+    "utility-types": "^3.10.0"
   },
   "devDependencies": {
     "del-cli": "^3.0.0",
diff --git a/renovate.json5 b/renovate.json5
index 49474b28e7908..f069e961c0f2b 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -46,31 +46,6 @@
       enabled: false,
     },
     packageRules: [
-      {
-        groupSlug: 'eslint',
-        groupName: 'eslint related packages',
-        packagePatterns: [
-          '(\\b|_)eslint(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'babel',
-        groupName: 'babel related packages',
-        packagePatterns: [
-          '(\\b|_)babel(\\b|_)',
-        ],
-        packageNames: [
-          'core-js',
-          '@types/core-js',
-        ],
-      },
-      {
-        groupSlug: 'jest',
-        groupName: 'jest related packages',
-        packagePatterns: [
-          '(\\b|_)jest(\\b|_)',
-        ],
-      },
       {
         groupSlug: '@elastic/charts',
         groupName: '@elastic/charts related packages',
@@ -84,31 +59,11 @@
         masterIssueApproval: false,
       },
       {
-        groupSlug: 'mocha',
-        groupName: 'mocha related packages',
-        packagePatterns: [
-          '(\\b|_)mocha(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'karma',
-        groupName: 'karma related packages',
-        packagePatterns: [
-          '(\\b|_)karma(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'gulp',
-        groupName: 'gulp related packages',
-        packagePatterns: [
-          '(\\b|_)gulp(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'grunt',
-        groupName: 'grunt related packages',
-        packagePatterns: [
-          '(\\b|_)grunt(\\b|_)',
+        groupSlug: '@reach/router',
+        groupName: '@reach/router related packages',
+        packageNames: [
+          '@reach/router',
+          '@types/reach__router',
         ],
       },
       {
@@ -118,126 +73,6 @@
           '(\\b|_)angular(\\b|_)',
         ],
       },
-      {
-        groupSlug: 'd3',
-        groupName: 'd3 related packages',
-        packagePatterns: [
-          '(\\b|_)d3(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'react',
-        groupName: 'react related packages',
-        packagePatterns: [
-          '(\\b|_)react(\\b|_)',
-          '(\\b|_)redux(\\b|_)',
-          '(\\b|_)enzyme(\\b|_)',
-        ],
-        packageNames: [
-          'ngreact',
-          '@types/ngreact',
-          'recompose',
-          '@types/recompose',
-          'prop-types',
-          '@types/prop-types',
-          'typescript-fsa-reducers',
-          '@types/typescript-fsa-reducers',
-          'reselect',
-          '@types/reselect',
-        ],
-      },
-      {
-        groupSlug: 'moment',
-        groupName: 'moment related packages',
-        packagePatterns: [
-          '(\\b|_)moment(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'graphql',
-        groupName: 'graphql related packages',
-        packagePatterns: [
-          '(\\b|_)graphql(\\b|_)',
-          '(\\b|_)apollo(\\b|_)',
-        ],
-      },
-      {
-        groupSlug: 'webpack',
-        groupName: 'webpack related packages',
-        packagePatterns: [
-          '(\\b|_)webpack(\\b|_)',
-          '(\\b|_)loader(\\b|_)',
-          '(\\b|_)acorn(\\b|_)',
-          '(\\b|_)terser(\\b|_)',
-        ],
-        packageNames: [
-          'mini-css-extract-plugin',
-          '@types/mini-css-extract-plugin',
-          'chokidar',
-          '@types/chokidar',
-        ],
-      },
-      {
-        groupSlug: 'vega',
-        groupName: 'vega related packages',
-        packagePatterns: [
-          '(\\b|_)vega(\\b|_)',
-        ],
-        enabled: false,
-      },
-      {
-        groupSlug: 'language server',
-        groupName: 'language server related packages',
-        packageNames: [
-          'vscode-jsonrpc',
-          '@types/vscode-jsonrpc',
-          'vscode-languageserver',
-          '@types/vscode-languageserver',
-          'vscode-languageserver-types',
-          '@types/vscode-languageserver-types',
-        ],
-      },
-      {
-        groupSlug: 'hapi',
-        groupName: 'hapi related packages',
-        packagePatterns: [
-          '(\\b|_)hapi(\\b|_)',
-        ],
-        packageNames: [
-          'hapi',
-          '@types/hapi',
-          'joi',
-          '@types/joi',
-          'boom',
-          '@types/boom',
-          'hoek',
-          '@types/hoek',
-          'h2o2',
-          '@types/h2o2',
-          '@elastic/good',
-          '@types/elastic__good',
-          'good-squeeze',
-          '@types/good-squeeze',
-          'inert',
-          '@types/inert',
-        ],
-      },
-      {
-        groupSlug: 'dragselect',
-        groupName: 'dragselect related packages',
-        packageNames: [
-          'dragselect',
-          '@types/dragselect',
-        ],
-        labels: [
-          'release_note:skip',
-          'Team:Operations',
-          'renovate',
-          'v8.0.0',
-          'v7.6.0',
-          ':ml',
-        ],
-      },
       {
         groupSlug: 'api-documenter',
         groupName: 'api-documenter related packages',
@@ -250,47 +85,34 @@
         enabled: false,
       },
       {
-        groupSlug: 'jsts',
-        groupName: 'jsts related packages',
+        groupSlug: 'archiver',
+        groupName: 'archiver related packages',
         packageNames: [
-          'jsts',
-          '@types/jsts',
-        ],
-        allowedVersions: '^1.6.2',
-      },
-      {
-        groupSlug: 'storybook',
-        groupName: 'storybook related packages',
-        packagePatterns: [
-          '(\\b|_)storybook(\\b|_)',
+          'archiver',
+          '@types/archiver',
         ],
       },
       {
-        groupSlug: 'typescript',
-        groupName: 'typescript related packages',
+        groupSlug: 'babel',
+        groupName: 'babel related packages',
         packagePatterns: [
-          '(\\b|_)ts(\\b|_)',
-          '(\\b|_)typescript(\\b|_)',
-        ],
-        packageNames: [
-          'tslib',
-          '@types/tslib',
+          '(\\b|_)babel(\\b|_)',
         ],
-      },
-      {
-        groupSlug: 'json-stable-stringify',
-        groupName: 'json-stable-stringify related packages',
         packageNames: [
-          'json-stable-stringify',
-          '@types/json-stable-stringify',
+          'core-js',
+          '@types/core-js',
+          '@babel/preset-react',
+          '@types/babel__preset-react',
+          '@babel/preset-typescript',
+          '@types/babel__preset-typescript',
         ],
       },
       {
-        groupSlug: 'lodash.clonedeep',
-        groupName: 'lodash.clonedeep related packages',
+        groupSlug: 'base64-js',
+        groupName: 'base64-js related packages',
         packageNames: [
-          'lodash.clonedeep',
-          '@types/lodash.clonedeep',
+          'base64-js',
+          '@types/base64-js',
         ],
       },
       {
@@ -317,6 +139,14 @@
           '@types/cheerio',
         ],
       },
+      {
+        groupSlug: 'chroma-js',
+        groupName: 'chroma-js related packages',
+        packageNames: [
+          'chroma-js',
+          '@types/chroma-js',
+        ],
+      },
       {
         groupSlug: 'chromedriver',
         groupName: 'chromedriver related packages',
@@ -334,403 +164,441 @@
         ],
       },
       {
-        groupSlug: 'dedent',
-        groupName: 'dedent related packages',
+        groupSlug: 'cmd-shim',
+        groupName: 'cmd-shim related packages',
         packageNames: [
-          'dedent',
-          '@types/dedent',
+          'cmd-shim',
+          '@types/cmd-shim',
         ],
       },
       {
-        groupSlug: 'delete-empty',
-        groupName: 'delete-empty related packages',
+        groupSlug: 'color',
+        groupName: 'color related packages',
         packageNames: [
-          'delete-empty',
-          '@types/delete-empty',
+          'color',
+          '@types/color',
         ],
       },
       {
-        groupSlug: 'elasticsearch',
-        groupName: 'elasticsearch related packages',
+        groupSlug: 'cpy',
+        groupName: 'cpy related packages',
         packageNames: [
-          'elasticsearch',
-          '@types/elasticsearch',
+          'cpy',
+          '@types/cpy',
         ],
       },
       {
-        groupSlug: 'fetch-mock',
-        groupName: 'fetch-mock related packages',
+        groupSlug: 'cytoscape',
+        groupName: 'cytoscape related packages',
         packageNames: [
-          'fetch-mock',
-          '@types/fetch-mock',
+          'cytoscape',
+          '@types/cytoscape',
         ],
       },
       {
-        groupSlug: 'getopts',
-        groupName: 'getopts related packages',
-        packageNames: [
-          'getopts',
-          '@types/getopts',
+        groupSlug: 'd3',
+        groupName: 'd3 related packages',
+        packagePatterns: [
+          '(\\b|_)d3(\\b|_)',
         ],
       },
       {
-        groupSlug: 'glob',
-        groupName: 'glob related packages',
+        groupSlug: 'dedent',
+        groupName: 'dedent related packages',
         packageNames: [
-          'glob',
-          '@types/glob',
+          'dedent',
+          '@types/dedent',
         ],
       },
       {
-        groupSlug: 'globby',
-        groupName: 'globby related packages',
+        groupSlug: 'delete-empty',
+        groupName: 'delete-empty related packages',
         packageNames: [
-          'globby',
-          '@types/globby',
+          'delete-empty',
+          '@types/delete-empty',
         ],
       },
       {
-        groupSlug: 'has-ansi',
-        groupName: 'has-ansi related packages',
+        groupSlug: 'dragselect',
+        groupName: 'dragselect related packages',
         packageNames: [
-          'has-ansi',
-          '@types/has-ansi',
+          'dragselect',
+          '@types/dragselect',
+        ],
+        labels: [
+          'release_note:skip',
+          'Team:Operations',
+          'renovate',
+          'v8.0.0',
+          'v7.6.0',
+          ':ml',
         ],
       },
       {
-        groupSlug: 'history',
-        groupName: 'history related packages',
+        groupSlug: 'elasticsearch',
+        groupName: 'elasticsearch related packages',
         packageNames: [
-          'history',
-          '@types/history',
+          'elasticsearch',
+          '@types/elasticsearch',
         ],
       },
       {
-        groupSlug: 'jquery',
-        groupName: 'jquery related packages',
-        packageNames: [
-          'jquery',
-          '@types/jquery',
+        groupSlug: 'eslint',
+        groupName: 'eslint related packages',
+        packagePatterns: [
+          '(\\b|_)eslint(\\b|_)',
         ],
       },
       {
-        groupSlug: 'js-yaml',
-        groupName: 'js-yaml related packages',
+        groupSlug: 'fancy-log',
+        groupName: 'fancy-log related packages',
         packageNames: [
-          'js-yaml',
-          '@types/js-yaml',
+          'fancy-log',
+          '@types/fancy-log',
         ],
       },
       {
-        groupSlug: 'json5',
-        groupName: 'json5 related packages',
+        groupSlug: 'fetch-mock',
+        groupName: 'fetch-mock related packages',
         packageNames: [
-          'json5',
-          '@types/json5',
+          'fetch-mock',
+          '@types/fetch-mock',
         ],
       },
       {
-        groupSlug: 'license-checker',
-        groupName: 'license-checker related packages',
+        groupSlug: 'file-saver',
+        groupName: 'file-saver related packages',
         packageNames: [
-          'license-checker',
-          '@types/license-checker',
+          'file-saver',
+          '@types/file-saver',
         ],
       },
       {
-        groupSlug: 'listr',
-        groupName: 'listr related packages',
+        groupSlug: 'getopts',
+        groupName: 'getopts related packages',
         packageNames: [
-          'listr',
-          '@types/listr',
+          'getopts',
+          '@types/getopts',
         ],
       },
       {
-        groupSlug: 'lodash',
-        groupName: 'lodash related packages',
+        groupSlug: 'getos',
+        groupName: 'getos related packages',
         packageNames: [
-          'lodash',
-          '@types/lodash',
+          'getos',
+          '@types/getos',
         ],
       },
       {
-        groupSlug: 'lru-cache',
-        groupName: 'lru-cache related packages',
+        groupSlug: 'git-url-parse',
+        groupName: 'git-url-parse related packages',
         packageNames: [
-          'lru-cache',
-          '@types/lru-cache',
+          'git-url-parse',
+          '@types/git-url-parse',
         ],
       },
       {
-        groupSlug: 'markdown-it',
-        groupName: 'markdown-it related packages',
+        groupSlug: 'glob',
+        groupName: 'glob related packages',
         packageNames: [
-          'markdown-it',
-          '@types/markdown-it',
+          'glob',
+          '@types/glob',
         ],
       },
       {
-        groupSlug: 'minimatch',
-        groupName: 'minimatch related packages',
+        groupSlug: 'globby',
+        groupName: 'globby related packages',
         packageNames: [
-          'minimatch',
-          '@types/minimatch',
+          'globby',
+          '@types/globby',
         ],
       },
       {
-        groupSlug: 'mustache',
-        groupName: 'mustache related packages',
-        packageNames: [
-          'mustache',
-          '@types/mustache',
+        groupSlug: 'graphql',
+        groupName: 'graphql related packages',
+        packagePatterns: [
+          '(\\b|_)graphql(\\b|_)',
+          '(\\b|_)apollo(\\b|_)',
         ],
       },
       {
-        groupSlug: 'node',
-        groupName: 'node related packages',
-        packageNames: [
-          'node',
-          '@types/node',
+        groupSlug: 'grunt',
+        groupName: 'grunt related packages',
+        packagePatterns: [
+          '(\\b|_)grunt(\\b|_)',
         ],
       },
       {
-        groupSlug: 'opn',
-        groupName: 'opn related packages',
+        groupSlug: 'gulp',
+        groupName: 'gulp related packages',
+        packagePatterns: [
+          '(\\b|_)gulp(\\b|_)',
+        ],
+      },
+      {
+        groupSlug: 'hapi',
+        groupName: 'hapi related packages',
+        packagePatterns: [
+          '(\\b|_)hapi(\\b|_)',
+        ],
         packageNames: [
-          'opn',
-          '@types/opn',
+          'hapi',
+          '@types/hapi',
+          'joi',
+          '@types/joi',
+          'boom',
+          '@types/boom',
+          'hoek',
+          '@types/hoek',
+          'h2o2',
+          '@types/h2o2',
+          '@elastic/good',
+          '@types/elastic__good',
+          'good-squeeze',
+          '@types/good-squeeze',
+          'inert',
+          '@types/inert',
         ],
       },
       {
-        groupSlug: 'pngjs',
-        groupName: 'pngjs related packages',
+        groupSlug: 'has-ansi',
+        groupName: 'has-ansi related packages',
         packageNames: [
-          'pngjs',
-          '@types/pngjs',
+          'has-ansi',
+          '@types/has-ansi',
         ],
       },
       {
-        groupSlug: 'podium',
-        groupName: 'podium related packages',
+        groupSlug: 'history',
+        groupName: 'history related packages',
         packageNames: [
-          'podium',
-          '@types/podium',
+          'history',
+          '@types/history',
         ],
       },
       {
-        groupSlug: '@reach/router',
-        groupName: '@reach/router related packages',
+        groupSlug: 'indent-string',
+        groupName: 'indent-string related packages',
         packageNames: [
-          '@reach/router',
-          '@types/reach__router',
+          'indent-string',
+          '@types/indent-string',
         ],
       },
       {
-        groupSlug: 'request',
-        groupName: 'request related packages',
+        groupSlug: 'intl-relativeformat',
+        groupName: 'intl-relativeformat related packages',
         packageNames: [
-          'request',
-          '@types/request',
+          'intl-relativeformat',
+          '@types/intl-relativeformat',
         ],
       },
       {
-        groupSlug: 'selenium-webdriver',
-        groupName: 'selenium-webdriver related packages',
-        packageNames: [
-          'selenium-webdriver',
-          '@types/selenium-webdriver',
+        groupSlug: 'jest',
+        groupName: 'jest related packages',
+        packagePatterns: [
+          '(\\b|_)jest(\\b|_)',
         ],
       },
       {
-        groupSlug: 'semver',
-        groupName: 'semver related packages',
+        groupSlug: 'jquery',
+        groupName: 'jquery related packages',
         packageNames: [
-          'semver',
-          '@types/semver',
+          'jquery',
+          '@types/jquery',
         ],
       },
       {
-        groupSlug: 'sinon',
-        groupName: 'sinon related packages',
+        groupSlug: 'js-yaml',
+        groupName: 'js-yaml related packages',
         packageNames: [
-          'sinon',
-          '@types/sinon',
+          'js-yaml',
+          '@types/js-yaml',
         ],
       },
       {
-        groupSlug: 'strip-ansi',
-        groupName: 'strip-ansi related packages',
+        groupSlug: 'jsdom',
+        groupName: 'jsdom related packages',
         packageNames: [
-          'strip-ansi',
-          '@types/strip-ansi',
+          'jsdom',
+          '@types/jsdom',
         ],
       },
       {
-        groupSlug: 'styled-components',
-        groupName: 'styled-components related packages',
+        groupSlug: 'json-stable-stringify',
+        groupName: 'json-stable-stringify related packages',
         packageNames: [
-          'styled-components',
-          '@types/styled-components',
+          'json-stable-stringify',
+          '@types/json-stable-stringify',
         ],
       },
       {
-        groupSlug: 'supertest',
-        groupName: 'supertest related packages',
+        groupSlug: 'json5',
+        groupName: 'json5 related packages',
         packageNames: [
-          'supertest',
-          '@types/supertest',
+          'json5',
+          '@types/json5',
         ],
       },
       {
-        groupSlug: 'supertest-as-promised',
-        groupName: 'supertest-as-promised related packages',
+        groupSlug: 'jsonwebtoken',
+        groupName: 'jsonwebtoken related packages',
         packageNames: [
-          'supertest-as-promised',
-          '@types/supertest-as-promised',
+          'jsonwebtoken',
+          '@types/jsonwebtoken',
         ],
       },
       {
-        groupSlug: 'type-detect',
-        groupName: 'type-detect related packages',
+        groupSlug: 'jsts',
+        groupName: 'jsts related packages',
         packageNames: [
-          'type-detect',
-          '@types/type-detect',
+          'jsts',
+          '@types/jsts',
         ],
+        allowedVersions: '^1.6.2',
       },
       {
-        groupSlug: 'uuid',
-        groupName: 'uuid related packages',
-        packageNames: [
-          'uuid',
-          '@types/uuid',
+        groupSlug: 'karma',
+        groupName: 'karma related packages',
+        packagePatterns: [
+          '(\\b|_)karma(\\b|_)',
         ],
       },
       {
-        groupSlug: 'vinyl-fs',
-        groupName: 'vinyl-fs related packages',
+        groupSlug: 'language server',
+        groupName: 'language server related packages',
         packageNames: [
-          'vinyl-fs',
-          '@types/vinyl-fs',
+          'vscode-jsonrpc',
+          '@types/vscode-jsonrpc',
+          'vscode-languageserver',
+          '@types/vscode-languageserver',
+          'vscode-languageserver-types',
+          '@types/vscode-languageserver-types',
         ],
       },
       {
-        groupSlug: 'zen-observable',
-        groupName: 'zen-observable related packages',
+        groupSlug: 'license-checker',
+        groupName: 'license-checker related packages',
         packageNames: [
-          'zen-observable',
-          '@types/zen-observable',
+          'license-checker',
+          '@types/license-checker',
         ],
       },
       {
-        groupSlug: 'archiver',
-        groupName: 'archiver related packages',
+        groupSlug: 'listr',
+        groupName: 'listr related packages',
         packageNames: [
-          'archiver',
-          '@types/archiver',
+          'listr',
+          '@types/listr',
         ],
       },
       {
-        groupSlug: 'base64-js',
-        groupName: 'base64-js related packages',
+        groupSlug: 'lodash',
+        groupName: 'lodash related packages',
         packageNames: [
-          'base64-js',
-          '@types/base64-js',
+          'lodash',
+          '@types/lodash',
         ],
       },
       {
-        groupSlug: 'chroma-js',
-        groupName: 'chroma-js related packages',
+        groupSlug: 'lodash.clonedeep',
+        groupName: 'lodash.clonedeep related packages',
         packageNames: [
-          'chroma-js',
-          '@types/chroma-js',
+          'lodash.clonedeep',
+          '@types/lodash.clonedeep',
         ],
       },
       {
-        groupSlug: 'color',
-        groupName: 'color related packages',
+        groupSlug: 'lodash.clonedeepwith',
+        groupName: 'lodash.clonedeepwith related packages',
         packageNames: [
-          'color',
-          '@types/color',
+          'lodash.clonedeepwith',
+          '@types/lodash.clonedeepwith',
         ],
       },
       {
-        groupSlug: 'cytoscape',
-        groupName: 'cytoscape related packages',
+        groupSlug: 'log-symbols',
+        groupName: 'log-symbols related packages',
         packageNames: [
-          'cytoscape',
-          '@types/cytoscape',
+          'log-symbols',
+          '@types/log-symbols',
         ],
       },
       {
-        groupSlug: 'fancy-log',
-        groupName: 'fancy-log related packages',
+        groupSlug: 'lru-cache',
+        groupName: 'lru-cache related packages',
         packageNames: [
-          'fancy-log',
-          '@types/fancy-log',
+          'lru-cache',
+          '@types/lru-cache',
         ],
       },
       {
-        groupSlug: 'file-saver',
-        groupName: 'file-saver related packages',
+        groupSlug: 'mapbox-gl',
+        groupName: 'mapbox-gl related packages',
         packageNames: [
-          'file-saver',
-          '@types/file-saver',
+          'mapbox-gl',
+          '@types/mapbox-gl',
         ],
       },
       {
-        groupSlug: 'getos',
-        groupName: 'getos related packages',
+        groupSlug: 'markdown-it',
+        groupName: 'markdown-it related packages',
         packageNames: [
-          'getos',
-          '@types/getos',
+          'markdown-it',
+          '@types/markdown-it',
         ],
       },
       {
-        groupSlug: 'git-url-parse',
-        groupName: 'git-url-parse related packages',
+        groupSlug: 'memoize-one',
+        groupName: 'memoize-one related packages',
         packageNames: [
-          'git-url-parse',
-          '@types/git-url-parse',
+          'memoize-one',
+          '@types/memoize-one',
         ],
       },
       {
-        groupSlug: 'jsdom',
-        groupName: 'jsdom related packages',
+        groupSlug: 'mime',
+        groupName: 'mime related packages',
         packageNames: [
-          'jsdom',
-          '@types/jsdom',
+          'mime',
+          '@types/mime',
         ],
       },
       {
-        groupSlug: 'jsonwebtoken',
-        groupName: 'jsonwebtoken related packages',
+        groupSlug: 'minimatch',
+        groupName: 'minimatch related packages',
         packageNames: [
-          'jsonwebtoken',
-          '@types/jsonwebtoken',
+          'minimatch',
+          '@types/minimatch',
         ],
       },
       {
-        groupSlug: 'mapbox-gl',
-        groupName: 'mapbox-gl related packages',
-        packageNames: [
-          'mapbox-gl',
-          '@types/mapbox-gl',
+        groupSlug: 'mocha',
+        groupName: 'mocha related packages',
+        packagePatterns: [
+          '(\\b|_)mocha(\\b|_)',
         ],
       },
       {
-        groupSlug: 'memoize-one',
-        groupName: 'memoize-one related packages',
+        groupSlug: 'moment',
+        groupName: 'moment related packages',
+        packagePatterns: [
+          '(\\b|_)moment(\\b|_)',
+        ],
+      },
+      {
+        groupSlug: 'mustache',
+        groupName: 'mustache related packages',
         packageNames: [
-          'memoize-one',
-          '@types/memoize-one',
+          'mustache',
+          '@types/mustache',
         ],
       },
       {
-        groupSlug: 'mime',
-        groupName: 'mime related packages',
+        groupSlug: 'ncp',
+        groupName: 'ncp related packages',
         packageNames: [
-          'mime',
-          '@types/mime',
+          'ncp',
+          '@types/ncp',
         ],
       },
       {
@@ -741,6 +609,14 @@
           '@types/nock',
         ],
       },
+      {
+        groupSlug: 'node',
+        groupName: 'node related packages',
+        packageNames: [
+          'node',
+          '@types/node',
+        ],
+      },
       {
         groupSlug: 'node-fetch',
         groupName: 'node-fetch related packages',
@@ -765,6 +641,22 @@
           '@types/object-hash',
         ],
       },
+      {
+        groupSlug: 'opn',
+        groupName: 'opn related packages',
+        packageNames: [
+          'opn',
+          '@types/opn',
+        ],
+      },
+      {
+        groupSlug: 'ora',
+        groupName: 'ora related packages',
+        packageNames: [
+          'ora',
+          '@types/ora',
+        ],
+      },
       {
         groupSlug: 'papaparse',
         groupName: 'papaparse related packages',
@@ -773,6 +665,30 @@
           '@types/papaparse',
         ],
       },
+      {
+        groupSlug: 'parse-link-header',
+        groupName: 'parse-link-header related packages',
+        packageNames: [
+          'parse-link-header',
+          '@types/parse-link-header',
+        ],
+      },
+      {
+        groupSlug: 'pngjs',
+        groupName: 'pngjs related packages',
+        packageNames: [
+          'pngjs',
+          '@types/pngjs',
+        ],
+      },
+      {
+        groupSlug: 'podium',
+        groupName: 'podium related packages',
+        packageNames: [
+          'podium',
+          '@types/podium',
+        ],
+      },
       {
         groupSlug: 'proper-lockfile',
         groupName: 'proper-lockfile related packages',
@@ -789,6 +705,35 @@
           '@types/puppeteer',
         ],
       },
+      {
+        groupSlug: 'react',
+        groupName: 'react related packages',
+        packagePatterns: [
+          '(\\b|_)react(\\b|_)',
+          '(\\b|_)redux(\\b|_)',
+          '(\\b|_)enzyme(\\b|_)',
+        ],
+        packageNames: [
+          'ngreact',
+          '@types/ngreact',
+          'recompose',
+          '@types/recompose',
+          'prop-types',
+          '@types/prop-types',
+          'typescript-fsa-reducers',
+          '@types/typescript-fsa-reducers',
+          'reselect',
+          '@types/reselect',
+        ],
+      },
+      {
+        groupSlug: 'read-pkg',
+        groupName: 'read-pkg related packages',
+        packageNames: [
+          'read-pkg',
+          '@types/read-pkg',
+        ],
+      },
       {
         groupSlug: 'reduce-reducers',
         groupName: 'reduce-reducers related packages',
@@ -798,123 +743,166 @@
         ],
       },
       {
-        groupSlug: 'tar-fs',
-        groupName: 'tar-fs related packages',
+        groupSlug: 'request',
+        groupName: 'request related packages',
         packageNames: [
-          'tar-fs',
-          '@types/tar-fs',
+          'request',
+          '@types/request',
         ],
       },
       {
-        groupSlug: 'tinycolor2',
-        groupName: 'tinycolor2 related packages',
+        groupSlug: 'selenium-webdriver',
+        groupName: 'selenium-webdriver related packages',
         packageNames: [
-          'tinycolor2',
-          '@types/tinycolor2',
+          'selenium-webdriver',
+          '@types/selenium-webdriver',
         ],
       },
       {
-        groupSlug: 'xml-crypto',
-        groupName: 'xml-crypto related packages',
+        groupSlug: 'semver',
+        groupName: 'semver related packages',
         packageNames: [
-          'xml-crypto',
-          '@types/xml-crypto',
+          'semver',
+          '@types/semver',
         ],
       },
       {
-        groupSlug: 'xml2js',
-        groupName: 'xml2js related packages',
+        groupSlug: 'sinon',
+        groupName: 'sinon related packages',
         packageNames: [
-          'xml2js',
-          '@types/xml2js',
+          'sinon',
+          '@types/sinon',
         ],
       },
       {
-        groupSlug: 'intl-relativeformat',
-        groupName: 'intl-relativeformat related packages',
+        groupSlug: 'storybook',
+        groupName: 'storybook related packages',
+        packagePatterns: [
+          '(\\b|_)storybook(\\b|_)',
+        ],
+      },
+      {
+        groupSlug: 'strip-ansi',
+        groupName: 'strip-ansi related packages',
         packageNames: [
-          'intl-relativeformat',
-          '@types/intl-relativeformat',
+          'strip-ansi',
+          '@types/strip-ansi',
         ],
       },
       {
-        groupSlug: 'cmd-shim',
-        groupName: 'cmd-shim related packages',
+        groupSlug: 'strong-log-transformer',
+        groupName: 'strong-log-transformer related packages',
         packageNames: [
-          'cmd-shim',
-          '@types/cmd-shim',
+          'strong-log-transformer',
+          '@types/strong-log-transformer',
         ],
       },
       {
-        groupSlug: 'cpy',
-        groupName: 'cpy related packages',
+        groupSlug: 'styled-components',
+        groupName: 'styled-components related packages',
         packageNames: [
-          'cpy',
-          '@types/cpy',
+          'styled-components',
+          '@types/styled-components',
         ],
       },
       {
-        groupSlug: 'indent-string',
-        groupName: 'indent-string related packages',
+        groupSlug: 'supertest',
+        groupName: 'supertest related packages',
         packageNames: [
-          'indent-string',
-          '@types/indent-string',
+          'supertest',
+          '@types/supertest',
         ],
       },
       {
-        groupSlug: 'lodash.clonedeepwith',
-        groupName: 'lodash.clonedeepwith related packages',
+        groupSlug: 'supertest-as-promised',
+        groupName: 'supertest-as-promised related packages',
         packageNames: [
-          'lodash.clonedeepwith',
-          '@types/lodash.clonedeepwith',
+          'supertest-as-promised',
+          '@types/supertest-as-promised',
         ],
       },
       {
-        groupSlug: 'log-symbols',
-        groupName: 'log-symbols related packages',
+        groupSlug: 'tar-fs',
+        groupName: 'tar-fs related packages',
         packageNames: [
-          'log-symbols',
-          '@types/log-symbols',
+          'tar-fs',
+          '@types/tar-fs',
         ],
       },
       {
-        groupSlug: 'ncp',
-        groupName: 'ncp related packages',
+        groupSlug: 'tempy',
+        groupName: 'tempy related packages',
         packageNames: [
-          'ncp',
-          '@types/ncp',
+          'tempy',
+          '@types/tempy',
         ],
       },
       {
-        groupSlug: 'ora',
-        groupName: 'ora related packages',
+        groupSlug: 'tinycolor2',
+        groupName: 'tinycolor2 related packages',
         packageNames: [
-          'ora',
-          '@types/ora',
+          'tinycolor2',
+          '@types/tinycolor2',
         ],
       },
       {
-        groupSlug: 'read-pkg',
-        groupName: 'read-pkg related packages',
+        groupSlug: 'type-detect',
+        groupName: 'type-detect related packages',
         packageNames: [
-          'read-pkg',
-          '@types/read-pkg',
+          'type-detect',
+          '@types/type-detect',
         ],
       },
       {
-        groupSlug: 'strong-log-transformer',
-        groupName: 'strong-log-transformer related packages',
+        groupSlug: 'typescript',
+        groupName: 'typescript related packages',
+        packagePatterns: [
+          '(\\b|_)ts(\\b|_)',
+          '(\\b|_)typescript(\\b|_)',
+        ],
         packageNames: [
-          'strong-log-transformer',
-          '@types/strong-log-transformer',
+          'tslib',
+          '@types/tslib',
         ],
       },
       {
-        groupSlug: 'tempy',
-        groupName: 'tempy related packages',
+        groupSlug: 'uuid',
+        groupName: 'uuid related packages',
         packageNames: [
-          'tempy',
-          '@types/tempy',
+          'uuid',
+          '@types/uuid',
+        ],
+      },
+      {
+        groupSlug: 'vega',
+        groupName: 'vega related packages',
+        packagePatterns: [
+          '(\\b|_)vega(\\b|_)',
+        ],
+        enabled: false,
+      },
+      {
+        groupSlug: 'vinyl-fs',
+        groupName: 'vinyl-fs related packages',
+        packageNames: [
+          'vinyl-fs',
+          '@types/vinyl-fs',
+        ],
+      },
+      {
+        groupSlug: 'webpack',
+        groupName: 'webpack related packages',
+        packagePatterns: [
+          '(\\b|_)webpack(\\b|_)',
+          '(\\b|_)loader(\\b|_)',
+          '(\\b|_)acorn(\\b|_)',
+          '(\\b|_)terser(\\b|_)',
+        ],
+        packageNames: [
+          'mini-css-extract-plugin',
+          '@types/mini-css-extract-plugin',
+          'chokidar',
+          '@types/chokidar',
         ],
       },
       {
@@ -934,11 +922,27 @@
         ],
       },
       {
-        groupSlug: 'parse-link-header',
-        groupName: 'parse-link-header related packages',
+        groupSlug: 'xml-crypto',
+        groupName: 'xml-crypto related packages',
         packageNames: [
-          'parse-link-header',
-          '@types/parse-link-header',
+          'xml-crypto',
+          '@types/xml-crypto',
+        ],
+      },
+      {
+        groupSlug: 'xml2js',
+        groupName: 'xml2js related packages',
+        packageNames: [
+          'xml2js',
+          '@types/xml2js',
+        ],
+      },
+      {
+        groupSlug: 'zen-observable',
+        groupName: 'zen-observable related packages',
+        packageNames: [
+          'zen-observable',
+          '@types/zen-observable',
         ],
       },
       {
diff --git a/rfcs/text/0007_lifecycle_unblocked.md b/rfcs/text/0007_lifecycle_unblocked.md
new file mode 100644
index 0000000000000..cb978d3dcd7ba
--- /dev/null
+++ b/rfcs/text/0007_lifecycle_unblocked.md
@@ -0,0 +1,374 @@
+- Start Date: 2019-09-11
+- RFC PR: (leave this empty)
+- Kibana Issue: (leave this empty)
+
+## Table of contents
+- [Summary](#summary)
+- [Motivation](#motivation)
+- [Detailed design](#detailed-design)
+    - [<ol><li>Synchronous lifecycle methods</li></ol>](#ollisynchronous-lifecycle-methodsliol)
+    - [<ol start="2"><li>Synchronous Context Provider functions</li></ol>](#ol-start2lisynchronous-context-provider-functionsliol)
+    - [<ol start="3"><li>Core should not expose API's as observables</li></ol>](#ol-start3licore-should-not-expose-apis-as-observablesliol)
+    - [<ol start="4"><li>Complete example code</li></ol>](#ol-start4licomplete-example-codeliol)
+    - [<ol start="5"><li>Core should expose a status signal for Core services &amp; plugins</li></ol>](#ol-start5licore-should-expose-a-status-signal-for-core-services-amp-pluginsliol)
+- [Drawbacks](#drawbacks)
+- [Alternatives](#alternatives)
+  - [<ol><li>Introduce a lifecycle/context provider timeout</li></ol>](#olliintroduce-a-lifecyclecontext-provider-timeoutliol)
+  - [<ol start="2"><li>Treat anything that blocks Kibana from starting up as a bug</li></ol>](#ol-start2litreat-anything-that-blocks-kibana-from-starting-up-as-a-bugliol)
+- [Adoption strategy](#adoption-strategy)
+- [How we teach this](#how-we-teach-this)
+- [Unresolved questions](#unresolved-questions)
+- [Footnotes](#footnotes)
+
+# Summary
+
+Prevent plugin lifecycle methods from blocking Kibana startup by making the
+following changes:
+1. Synchronous lifecycle methods 
+2. Synchronous context provider functions
+3. Core should not expose API's as observables
+
+# Motivation
+Plugin lifecycle methods and context provider functions are async
+(promise-returning) functions. Core runs these functions in series and waits
+for each plugin's lifecycle/context provider function to resolve before
+calling the next. This allows plugins to depend on the API's returned from
+other plugins.
+
+With the current design, a single lifecycle method that blocks will block all
+of Kibana from starting up. Similarly, a blocking context provider will block
+all the handlers that depend on that context. Plugins (including legacy
+plugins) rely heavily on this blocking behaviour to ensure that all conditions
+required for their plugin's operation are met before their plugin is started
+and exposes it's API's. This means a single plugin with a network error that
+isn't retried or a dependency on an external host that is down, could block
+all of Kibana from starting up.
+
+We should make it impossible for a single plugin lifecycle function to stall
+all of kibana.
+
+# Detailed design
+
+### 1. Synchronous lifecycle methods
+Lifecycle methods are synchronous functions, they can perform async operations
+but Core doesn't wait for these to complete. This guarantees that no plugin
+lifecycle function can block other plugins or core from starting up [1]. 
+
+Core will still expose special API's that are able block the setup lifecycle
+such as registering Saved Object migrations, but this will be limited to
+operations where the risk of blocking all of kibana starting up is limited.
+
+### 2. Synchronous Context Provider functions
+Making context provider functions synchronous guarantees that a context
+handler will never be blocked by registered context providers. They can expose
+async API's which could potentially have blocking behaviour. 
+
+```ts
+export type IContextProvider<
+  THandler extends HandlerFunction<any>,
+  TContextName extends keyof HandlerContextType<THandler>
+> = (
+  context: Partial<HandlerContextType<THandler>>,
+  ...rest: HandlerParameters<THandler>
+) =>
+  | HandlerContextType<THandler>[TContextName];
+```
+
+### 3. Core should not expose API's as observables
+All Core API's should be reactive: when internal state changes, their behaviour
+should change accordingly. But, exposing these internal state changes as part
+of the API contract leaks internal implementation details consumers can't do
+anything useful with and don't care about.
+
+For example: Core currently exposes `core.elasticsearch.adminClient$`, an
+Observable which emits a pre-configured elasticsearch client every time there's
+a configuration change. This includes changes to the logging configuration and
+might in the future include updating the authentication headers sent to
+elasticsearch https://github.com/elastic/kibana/issues/19829. As a plugin
+author who wants to make search requests against elasticsearch I shouldn't
+have to care about, react to, or keep track of, how many times the underlying
+configuration has changed. I want to use the `callAsInternalUser` method and I
+expect Core to use the most up to date configuration to send this request.
+
+> Note: It would not be desirable for Core to dynamically load all
+> configuration changes. Changing the Elasticsearch `hosts` could mean Kibana
+> is pointing to a completely new Elasticsearch cluster. Since this is a risky
+> change to make and would likely require core and almost all plugins to
+> completely re-initialize, it's safer to require a complete Kibana restart.
+
+This does not mean we should remove all observables from Core's API's. When an
+API consumer is interested in the *state changes itself* it absolutely makes
+sense to expose this as an Observable. Good examples of this is exposing
+plugin config as this is state that changes over time to which a plugin should
+directly react to.
+
+This is important in the context of synchronous lifecycle methods and context 
+handlers since exposing convenient API's become very ugly:
+
+*(3.1): exposing Observable-based API's through the route handler context:*
+```ts
+// Before: Using an async context provider
+coreSetup.http.registerRouteHandlerContext(coreId, 'core', async (context, req) => {
+  const adminClient = await coreSetup.elasticsearch.adminClient$.pipe(take(1)).toPromise();
+  const dataClient = await coreSetup.elasticsearch.dataClient$.pipe(take(1)).toPromise();
+  return {
+    elasticsearch: {
+      adminClient: adminClient.asScoped(req),
+      dataClient: dataClient.asScoped(req),
+    },
+  };
+});
+
+// After: Using a synchronous context provider
+coreSetup.http.registerRouteHandlerContext(coreId, 'core', async (context, req) => {
+  return {
+    elasticsearch: {
+      // (3.1.1) We can expose a convenient API by doing a lot of work
+      adminClient: () => {
+        callAsInternalUser: async (...args) => {
+          const adminClient = await coreSetup.elasticsearch.adminClient$.pipe(take(1)).toPromise();
+          return adminClient.asScoped(req).callAsinternalUser(args);
+        },
+        callAsCurrentUser: async (...args) => {
+          adminClient = await coreSetup.elasticsearch.adminClient$.pipe(take(1)).toPromise();
+          return adminClient.asScoped(req).callAsCurrentUser(args);
+        }
+      },
+      // (3.1.2) Or a lazy approach which perpetuates the problem to consumers:
+      dataClient: async () => {
+        const dataClient = await coreSetup.elasticsearch.dataClient$.pipe(take(1)).toPromise();
+        return dataClient.asScoped(req);
+      },
+    },
+  };
+});
+```
+
+### 4. Complete example code
+*(4.1) Doing async operations in a plugin's setup lifecycle*
+```ts
+export class Plugin {
+  public setup(core: CoreSetup) {
+    // Async setup is possible and any operations involving async API's
+    // will still block until these API's are ready, (savedObjects find only 
+    // resolves once the elasticsearch client has established a connection to 
+    // the cluster). The difference is that these details are now internal to
+    // the API.
+    (async () => {
+      const docs = await core.savedObjects.client.find({...});
+      ...
+      await core.savedObjects.client.update(...);
+    })();
+  }
+}
+```
+
+*(4.2) Exposing an API from a plugin's setup lifecycle*
+```ts
+export class Plugin {
+  constructor(private readonly initializerContext: PluginInitializerContext) {}
+  private async initSavedConfig(core: CoreSetup) {
+    // Note: pulling a config value here means our code isn't reactive to
+    // changes, but this is equivalent to doing it in an async setup lifecycle.
+    const config = await this.initializerContext.config
+          .create<TypeOf<typeof ConfigSchema>>()
+          .pipe(first())
+          .toPromise();
+    try {
+      const savedConfig = await core.savedObjects.internalRepository.get({...});
+      return Object.assign({}, config, savedConfig);
+    } catch (e) {
+      if (SavedObjectErrorHelpers.isNotFoundError(e)) {
+        return await core.savedObjects.internalRepository.create(config, {...});
+      }
+    }
+  }
+  public setup(core: CoreSetup) {
+    // savedConfigPromise resolves with the same kind of "setup state" that a
+    // plugin would have constructed in an async setup lifecycle.
+    const savedConfigPromise = initSavedConfig(core);
+    return {
+      ping: async () => {
+        const savedConfig = await savedConfigPromise;
+        if (config.allowPing === false || savedConfig.allowPing === false) {
+          throw new Error('ping() has been disabled');
+        }
+        // Note: the elasticsearch client no longer exposes an adminClient$
+        // observable, improving the ergonomics of consuming the API.
+        return await core.elasticsearch.adminClient.callAsInternalUser('ping', ...);
+      }
+    };
+  }
+}
+```
+
+*(4.3) Exposing an observable free Elasticsearch API from the route context*
+```ts
+coreSetup.http.registerRouteHandlerContext(coreId, 'core', async (context, req) => {
+  return {
+    elasticsearch: {
+      adminClient: coreSetup.elasticsearch.adminClient.asScoped(req),
+      dataClient: coreSetup.elasticsearch.adminClient.asScoped(req),
+    },
+  };
+});
+```
+
+### 5. Core should expose a status signal for Core services & plugins
+Core should expose a global mechanism for core services and plugins to signal
+their status. This is equivalent to the legacy status API
+`kibana.Plugin.status` which allowed plugins to set their status to e.g. 'red'
+or 'green'. The exact design of this API is outside of the scope of this RFC.
+
+What is important, is that there is a global mechanism to signal status
+changes which Core then makes visible to system administrators in the Kibana
+logs and the `/status` HTTP API. Plugins should be able to inspect and
+subscribe to status changes from any of their dependencies.
+
+This will provide an obvious mechanism for plugins to signal that the
+conditions which are required for this plugin to operate are not currently
+present and manual intervention might be required. Status changes can happen
+in both setup and start lifecycles e.g.:
+ - [setup] a required remote host is down
+ - [start] a remote host which was up during setup, started returning
+   connection timeout errors.
+
+# Drawbacks
+Not being able to block on a lifecycle method means plugins can no longer be
+certain that all setup is "complete" before they expose their API's or reach
+the start lifecycle.
+
+A plugin might want to poll an external host to ensure that the host is up in
+its setup lifecycle before making network requests to this host in it's start
+lifecycle. 
+
+Even if Kibana was using a valid, but incorrect configuration for the remote
+host, with synchronous lifecycles Kibana would still start up. Although the
+status API and logs would indicate a problem, these might not be monitored
+leading to the error only being discovered once someone tries to use it's
+functionality. This is an acceptable drawback because it buys us isolation.
+Some problems might go unnoticed, but no single plugin should affect the
+availability of all other plugins.
+
+In effect, the plugin is polling the world to construct a snapshot
+of state which drives future behaviour. Modeling this with lifecycle functions
+is insufficient since it assumes that any state constructed in the setup
+lifecycle is static and won't and can't be changed in the future.
+
+For example: a plugin's setup lifecycle might poll for the existence of a
+custom Elasticsearch index and if it doesn't exist, create it. Should there be
+an Elasticsearch restore which deletes the index, the plugin wouldn't be able
+to gracefully recover by simply running it's setup lifecycle a second time.
+
+The once-off nature of lifecycle methods are incompatible with the real-world
+dynamic conditions under which plugins run. Not being able to block a
+lifecycle method is, therefore, only a drawback when plugins are authored under
+the false illusion of stability.
+
+# Alternatives
+## 1. Introduce a lifecycle/context provider timeout
+Lifecycle methods and context providers would timeout after X seconds and any
+API's they expose would not be available if the timeout had been reached.
+
+Drawbacks:
+1. A blocking setup lifecycle makes it easy for plugin authors to fall into
+   the trap of assuming that their plugin's behaviour can continue to operate
+   based on the snapshot of conditions present during setup.
+
+2. For lifecycle methods: there would be no way to recover from a timeout,
+   once a timeout had been reached the API will remain unavailable.
+
+   Context providers have the benefit of being re-created for each handler
+   call, so a single timeout would not permanently disable the API.
+
+3. Plugins have less control over their behaviour. When an upstream server
+   becomes unavailable, a plugin might prefer to keep retrying the request
+   indefinitely or only timeout after more than X seconds. It also isn't able
+   to expose detailed error information to downstream consumers such as
+   specifying which host or service is unavailable.
+
+4. (minor) Introduces an additional failure condition that needs to be handled.
+   Consumers should handle the API not being available in setup, as well as,
+   error responses from the API itself. Since remote hosts like Elasticsearch
+   could go down even after a successful setup, this effectively means API
+   consumers have to handle the same error condition in two places.
+
+## 2. Treat anything that blocks Kibana from starting up as a bug
+Keep the existing New Platform blocking behaviour, but through strong
+conventions and developer awareness minimize the risk of plugins blocking
+Kibana's startup indefinetely. By logging detailed diagnostic info on any
+plugins that appear to be blocking startup, we can aid system administrators
+to recover a blocked Kibana.
+
+A parallel can be drawn between Kibana's async plugin initialization and the TC39
+proposal for [top-level await](https://github.com/tc39/proposal-top-level-await).
+> enables modules to act as big async functions: With top-level await,
+> ECMAScript Modules (ESM) can await resources, causing other modules who
+> import them to wait before they start evaluating their body
+
+They believe the benefits outweigh the risk of modules blocking loading since:
+ - [developer education should result in correct usage](https://github.com/tc39/proposal-top-level-await#will-top-level-await-cause-developers-to-make-their-code-block-longer-than-it-should)
+ - [there are existing unavoidable ways in which modules could block loading such as infinite loops or recursion](https://github.com/tc39/proposal-top-level-await#does-top-level-await-increase-the-risk-of-deadlocks)
+
+
+Drawbacks:
+1. A blocking setup lifecycle makes it easy for plugin authors to fall into
+   the trap of assuming that their plugin's behaviour can continue to operate
+   based on the snapshot of conditions present during setup.
+2. This opens up the potential for a bug in Elastic or third-party plugins to
+   effectively "break" kibana. Instead of a single plugin being disabled all
+   of kibana would be down requiring manual intervention by a system
+   administrator. 
+
+# Adoption strategy
+Although the eventual goal is to have sync-only lifecycles / providers, we
+will start by deprecating async behaviour and implementing a 30s timeout as
+per alternative (1). This will immediately lower the impact of plugin bugs
+while at the same time enabling a more incremental rollout and the flexibility
+to discover use cases that would require adopting Core API's to support sync
+lifecycles / providers.
+
+Adoption and implementation should be handled as follows:
+ - Adopt Core API’s to make sync lifecycles easier (3)
+ - Update migration guide and other documentation examples.
+ - Deprecate async lifecycles / context providers with a warning. Add a
+   timeout of 30s after which a plugin and it's dependencies will be disabled.
+ - Refactor existing plugin lifecycles which are easily converted to sync
+ - Future: remove async timeout lifecycles / context providers
+
+The following New Platform plugins or shims currently rely on async lifecycle
+functions and will be impacted:
+1. [region_map](https://github.com/elastic/kibana/blob/6039709929caf0090a4130b8235f3a53bd04ed84/src/legacy/core_plugins/region_map/public/plugin.ts#L68)
+2. [tile_map](https://github.com/elastic/kibana/blob/6039709929caf0090a4130b8235f3a53bd04ed84/src/legacy/core_plugins/tile_map/public/plugin.ts#L62)
+3. [vis_type_table](https://github.com/elastic/kibana/blob/6039709929caf0090a4130b8235f3a53bd04ed84/src/legacy/core_plugins/vis_type_table/public/plugin.ts#L61)
+4. [vis_type_vega](https://github.com/elastic/kibana/blob/6039709929caf0090a4130b8235f3a53bd04ed84/src/legacy/core_plugins/vis_type_vega/public/plugin.ts#L59)
+5. [timelion](https://github.com/elastic/kibana/blob/9d69b72a5f200e58220231035b19da852fc6b0a5/src/plugins/timelion/server/plugin.ts#L40)
+6. [code](https://github.com/elastic/kibana/blob/5049b460b47d4ae3432e1d9219263bb4be441392/x-pack/legacy/plugins/code/server/plugin.ts#L129-L149)
+7. [spaces](https://github.com/elastic/kibana/blob/096c7ee51136327f778845c636d7c4f1188e5db2/x-pack/legacy/plugins/spaces/server/new_platform/plugin.ts#L95)
+8. [licensing](https://github.com/elastic/kibana/blob/4667c46caef26f8f47714504879197708debae32/x-pack/plugins/licensing/server/plugin.ts)
+9. [security](https://github.com/elastic/kibana/blob/0f2324e44566ce2cf083d89082841e57d2db6ef6/x-pack/plugins/security/server/plugin.ts#L96)
+
+# How we teach this
+
+Async Plugin lifecycle methods and async context provider functions have been
+deprecated. In the future all lifecycle methods will by sync only. Plugins
+should treat the setup lifecycle as a place in time to register functionality
+with core or other plugins' API's and not as a mechanism to kick off and wait
+for any initialization that's required for the plugin to be able to run.
+
+# Unresolved questions
+1. ~~Are the drawbacks worth the benefits or can we live with Kibana potentially
+being blocked for the sake of convenient async lifecycle stages?~~
+
+2. Should core provide conventions or patterns for plugins to construct a
+   snapshot of state and reactively updating this state and the behaviour it
+   drives as the state of the world changes?
+
+3. Do plugins ever need to read config values and pass these as parameters to
+   Core API’s? If so we would have to expose synchronous config values to
+   support sync lifecycles.
+
+# Footnotes
+[1] Synchronous lifecycles can still be blocked by e.g. an infine for loop,
+but this would always be unintentional behaviour in contrast to intentional
+async behaviour like blocking until an external service becomes available. 
diff --git a/src/apm.js b/src/apm.js
index cea6f8fc072aa..e3f4d84d9b523 100644
--- a/src/apm.js
+++ b/src/apm.js
@@ -17,21 +17,81 @@
  * under the License.
  */
 
-const { existsSync } = require('fs');
 const { join } = require('path');
-const { name, version } = require('../package.json');
+const { readFileSync } = require('fs');
+const { execSync } = require('child_process');
+const merge = require('lodash.merge');
+const { name, version, build } = require('../package.json');
 
-module.exports = function(serviceName = name) {
-  if (process.env.kbnWorkerType === 'optmzr') return;
+const ROOT_DIR = join(__dirname, '..');
+
+function gitRev() {
+  try {
+    return execSync('git rev-parse --short HEAD', {
+      encoding: 'utf-8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+  } catch (e) {
+    return null;
+  }
+}
+
+function devConfig() {
+  try {
+    const apmDevConfigPath = join(ROOT_DIR, 'config', 'apm.dev.js');
+    return require(apmDevConfigPath); // eslint-disable-line import/no-dynamic-require
+  } catch (e) {
+    return {};
+  }
+}
+
+const apmConfig = merge(
+  {
+    active: false,
+    serverUrl: 'https://f1542b814f674090afd914960583265f.apm.us-central1.gcp.cloud.es.io:443',
+    // The secretToken below is intended to be hardcoded in this file even though
+    // it makes it public. This is not a security/privacy issue. Normally we'd
+    // instead disable the need for a secretToken in the APM Server config where
+    // the data is transmitted to, but due to how it's being hosted, it's easier,
+    // for now, to simply leave it in.
+    secretToken: 'R0Gjg46pE9K9wGestd',
+    globalLabels: {},
+    breakdownMetrics: true,
+    centralConfig: false,
+    logUncaughtExceptions: true,
+  },
+  devConfig()
+);
+
+try {
+  const filename = join(ROOT_DIR, 'data', 'uuid');
+  apmConfig.globalLabels.kibana_uuid = readFileSync(filename, 'utf-8');
+} catch (e) {} // eslint-disable-line no-empty
 
-  const conf = {
-    serviceName: `${serviceName}-${version.replace(/\./g, '_')}`,
+const rev = gitRev();
+if (rev !== null) apmConfig.globalLabels.git_rev = rev;
+
+function getConfig(serviceName) {
+  return {
+    ...apmConfig,
+    ...{
+      serviceName: `${serviceName}-${version.replace(/\./g, '_')}`,
+    },
   };
+}
+
+/**
+ * Flag to disable APM RUM support on all kibana builds by default
+ */
+const isKibanaDistributable = Boolean(build && build.distributable === true);
 
-  const configFile = join(__dirname, '..', 'config', 'apm.js');
+module.exports = function(serviceName = name) {
+  if (process.env.kbnWorkerType === 'optmzr') return;
 
-  if (existsSync(configFile)) conf.configFile = configFile;
-  else conf.active = false;
+  const conf = getConfig(serviceName);
 
   require('elastic-apm-node').start(conf);
 };
+
+module.exports.getConfig = getConfig;
+module.exports.isKibanaDistributable = isKibanaDistributable;
diff --git a/src/cli/cluster/__mocks__/cluster.js b/src/cli/cluster/__mocks__/cluster.js
deleted file mode 100644
index d653771136ae6..0000000000000
--- a/src/cli/cluster/__mocks__/cluster.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.
- */
-/* eslint-env jest */
-
-import EventEmitter from 'events';
-import { assign, random } from 'lodash';
-import { delay } from 'bluebird';
-
-class MockClusterFork extends EventEmitter {
-  constructor(cluster) {
-    super();
-
-    let dead = true;
-
-    function wait() {
-      return delay(random(10, 250));
-    }
-
-    assign(this, {
-      process: {
-        kill: jest.fn(() => {
-          (async () => {
-            await wait();
-            this.emit('disconnect');
-            await wait();
-            dead = true;
-            this.emit('exit');
-            cluster.emit('exit', this, this.exitCode || 0);
-          })();
-        }),
-      },
-      isDead: jest.fn(() => dead),
-      send: jest.fn(),
-    });
-
-    jest.spyOn(this, 'on');
-    jest.spyOn(this, 'off');
-    jest.spyOn(this, 'emit');
-
-    (async () => {
-      await wait();
-      dead = false;
-      this.emit('online');
-    })();
-  }
-}
-
-class MockCluster extends EventEmitter {
-  fork = jest.fn(() => new MockClusterFork(this));
-  setupMaster = jest.fn();
-}
-
-export function mockCluster() {
-  return new MockCluster();
-}
diff --git a/src/cli/cluster/cluster.mock.ts b/src/cli/cluster/cluster.mock.ts
new file mode 100644
index 0000000000000..332f8aad53ba1
--- /dev/null
+++ b/src/cli/cluster/cluster.mock.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.
+ */
+/* eslint-env jest */
+
+// eslint-disable-next-line max-classes-per-file
+import EventEmitter from 'events';
+import { assign, random } from 'lodash';
+import { delay } from 'bluebird';
+
+class MockClusterFork extends EventEmitter {
+  public exitCode = 0;
+
+  constructor(cluster: MockCluster) {
+    super();
+
+    let dead = true;
+
+    function wait() {
+      return delay(random(10, 250));
+    }
+
+    assign(this, {
+      process: {
+        kill: jest.fn(() => {
+          (async () => {
+            await wait();
+            this.emit('disconnect');
+            await wait();
+            dead = true;
+            this.emit('exit');
+            cluster.emit('exit', this, this.exitCode || 0);
+          })();
+        }),
+      },
+      isDead: jest.fn(() => dead),
+      send: jest.fn(),
+    });
+
+    jest.spyOn(this as EventEmitter, 'on');
+    jest.spyOn(this as EventEmitter, 'off');
+    jest.spyOn(this as EventEmitter, 'emit');
+
+    (async () => {
+      await wait();
+      dead = false;
+      this.emit('online');
+    })();
+  }
+}
+
+export class MockCluster extends EventEmitter {
+  fork = jest.fn(() => new MockClusterFork(this));
+  setupMaster = jest.fn();
+}
diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js
deleted file mode 100644
index cd1b3a0dadfc6..0000000000000
--- a/src/cli/cluster/cluster_manager.js
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import { format as formatUrl } from 'url';
-import opn from 'opn';
-
-import { debounce, invoke, bindAll, once, uniq } from 'lodash';
-import * as Rx from 'rxjs';
-import { first, mapTo, filter, map, take } from 'rxjs/operators';
-import { REPO_ROOT } from '@kbn/dev-utils';
-
-import Log from '../log';
-import Worker from './worker';
-import { Config } from '../../legacy/server/config/config';
-
-process.env.kbnWorkerType = 'managr';
-
-export default class ClusterManager {
-  static create(opts, settings = {}, basePathProxy) {
-    return new ClusterManager(opts, Config.withDefaultSchema(settings), basePathProxy);
-  }
-
-  constructor(opts, config, basePathProxy) {
-    this.log = new Log(opts.quiet, opts.silent);
-    this.addedCount = 0;
-    this.inReplMode = !!opts.repl;
-    this.basePathProxy = basePathProxy;
-
-    const serverArgv = [];
-    const optimizerArgv = ['--plugins.initialize=false', '--server.autoListen=false'];
-
-    if (this.basePathProxy) {
-      optimizerArgv.push(
-        `--server.basePath=${this.basePathProxy.basePath}`,
-        '--server.rewriteBasePath=true'
-      );
-
-      serverArgv.push(
-        `--server.port=${this.basePathProxy.targetPort}`,
-        `--server.basePath=${this.basePathProxy.basePath}`,
-        '--server.rewriteBasePath=true'
-      );
-    }
-
-    this.workers = [
-      (this.optimizer = new Worker({
-        type: 'optmzr',
-        title: 'optimizer',
-        log: this.log,
-        argv: optimizerArgv,
-        watch: false,
-      })),
-      (this.server = new Worker({
-        type: 'server',
-        log: this.log,
-        argv: serverArgv,
-      })),
-    ];
-
-    // broker messages between workers
-    this.workers.forEach(worker => {
-      worker.on('broadcast', msg => {
-        this.workers.forEach(to => {
-          if (to !== worker && to.online) {
-            to.fork.send(msg);
-          }
-        });
-      });
-    });
-
-    // When receive that event from server worker
-    // forward a reloadLoggingConfig message to master
-    // and all workers. This is only used by LogRotator service
-    // when the cluster mode is enabled
-    this.server.on('reloadLoggingConfigFromServerWorker', () => {
-      process.emit('message', { reloadLoggingConfig: true });
-
-      this.workers.forEach(worker => {
-        worker.fork.send({ reloadLoggingConfig: true });
-      });
-    });
-
-    bindAll(this, 'onWatcherAdd', 'onWatcherError', 'onWatcherChange');
-
-    if (opts.open) {
-      this.setupOpen(
-        formatUrl({
-          protocol: config.get('server.ssl.enabled') ? 'https' : 'http',
-          hostname: config.get('server.host'),
-          port: config.get('server.port'),
-          pathname: this.basePathProxy ? this.basePathProxy.basePath : '',
-        })
-      );
-    }
-
-    if (opts.watch) {
-      const pluginPaths = config.get('plugins.paths');
-      const scanDirs = [
-        ...config.get('plugins.scanDirs'),
-        resolve(REPO_ROOT, 'src/plugins'),
-        resolve(REPO_ROOT, 'x-pack/plugins'),
-      ];
-      const extraPaths = [...pluginPaths, ...scanDirs];
-
-      const pluginInternalDirsIgnore = scanDirs
-        .map(scanDir => resolve(scanDir, '*'))
-        .concat(pluginPaths)
-        .reduce(
-          (acc, path) =>
-            acc.concat(
-              resolve(path, 'test'),
-              resolve(path, 'build'),
-              resolve(path, 'target'),
-              resolve(path, 'scripts'),
-              resolve(path, 'docs')
-            ),
-          []
-        );
-
-      this.setupWatching(extraPaths, pluginInternalDirsIgnore);
-    } else this.startCluster();
-  }
-
-  startCluster() {
-    this.setupManualRestart();
-    invoke(this.workers, 'start');
-    if (this.basePathProxy) {
-      this.basePathProxy.start({
-        blockUntil: this.blockUntil.bind(this),
-        shouldRedirectFromOldBasePath: this.shouldRedirectFromOldBasePath.bind(this),
-      });
-    }
-  }
-
-  setupOpen(openUrl) {
-    const serverListening$ = Rx.merge(
-      Rx.fromEvent(this.server, 'listening').pipe(mapTo(true)),
-      Rx.fromEvent(this.server, 'fork:exit').pipe(mapTo(false)),
-      Rx.fromEvent(this.server, 'crashed').pipe(mapTo(false))
-    );
-
-    const optimizeSuccess$ = Rx.fromEvent(this.optimizer, 'optimizeStatus').pipe(
-      map(msg => !!msg.success)
-    );
-
-    Rx.combineLatest(serverListening$, optimizeSuccess$)
-      .pipe(
-        filter(([serverListening, optimizeSuccess]) => serverListening && optimizeSuccess),
-        take(1)
-      )
-      .toPromise()
-      .then(() => opn(openUrl));
-  }
-
-  setupWatching(extraPaths, pluginInternalDirsIgnore) {
-    const chokidar = require('chokidar');
-    const { fromRoot } = require('../../core/server/utils');
-
-    const watchPaths = [
-      fromRoot('src/core'),
-      fromRoot('src/legacy/core_plugins'),
-      fromRoot('src/legacy/server'),
-      fromRoot('src/legacy/ui'),
-      fromRoot('src/legacy/utils'),
-      fromRoot('x-pack/legacy/common'),
-      fromRoot('x-pack/legacy/plugins'),
-      fromRoot('x-pack/legacy/server'),
-      fromRoot('config'),
-      ...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/apm/scripts'),
-      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)$/,
-        ...pluginInternalDirsIgnore,
-        ...ignorePaths,
-        'plugins/java_languageserver',
-      ],
-    });
-
-    this.watcher.on('add', this.onWatcherAdd);
-    this.watcher.on('error', this.onWatcherError);
-
-    this.watcher.on(
-      'ready',
-      once(() => {
-        // start sending changes to workers
-        this.watcher.removeListener('add', this.onWatcherAdd);
-        this.watcher.on('all', this.onWatcherChange);
-
-        this.log.good('watching for changes', `(${this.addedCount} files)`);
-        this.startCluster();
-      })
-    );
-  }
-
-  setupManualRestart() {
-    // If we're in REPL mode, the user can use the REPL to manually restart.
-    // The setupManualRestart method interferes with stdin/stdout, in a way
-    // that negatively affects the REPL.
-    if (this.inReplMode) {
-      return;
-    }
-    const readline = require('readline');
-    const rl = readline.createInterface(process.stdin, process.stdout);
-
-    let nls = 0;
-    const clear = () => (nls = 0);
-    const clearSoon = debounce(clear, 2000);
-
-    rl.setPrompt('');
-    rl.prompt();
-
-    rl.on('line', () => {
-      nls = nls + 1;
-
-      if (nls >= 2) {
-        clearSoon.cancel();
-        clear();
-        this.server.start();
-      } else {
-        clearSoon();
-      }
-
-      rl.prompt();
-    });
-
-    rl.on('SIGINT', () => {
-      rl.pause();
-      process.kill(process.pid, 'SIGINT');
-    });
-  }
-
-  onWatcherAdd() {
-    this.addedCount += 1;
-  }
-
-  onWatcherChange(e, path) {
-    invoke(this.workers, 'onChange', path);
-  }
-
-  onWatcherError(err) {
-    this.log.bad('failed to watch files!\n', err.stack);
-    process.exit(1); // eslint-disable-line no-process-exit
-  }
-
-  shouldRedirectFromOldBasePath(path) {
-    // strip `s/{id}` prefix when checking for need to redirect
-    if (path.startsWith('s/')) {
-      path = path
-        .split('/')
-        .slice(2)
-        .join('/');
-    }
-
-    const isApp = path.startsWith('app/');
-    const isKnownShortPath = ['login', 'logout', 'status'].includes(path);
-    return isApp || isKnownShortPath;
-  }
-
-  blockUntil() {
-    // Wait until `server` worker either crashes or starts to listen.
-    if (this.server.listening || this.server.crashed) {
-      return Promise.resolve();
-    }
-
-    return Rx.race(Rx.fromEvent(this.server, 'listening'), Rx.fromEvent(this.server, 'crashed'))
-      .pipe(first())
-      .toPromise();
-  }
-}
diff --git a/src/cli/cluster/cluster_manager.test.js b/src/cli/cluster/cluster_manager.test.js
deleted file mode 100644
index be8a096db9a66..0000000000000
--- a/src/cli/cluster/cluster_manager.test.js
+++ /dev/null
@@ -1,180 +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 { mockCluster } from './__mocks__/cluster';
-jest.mock('cluster', () => mockCluster());
-jest.mock('readline', () => ({
-  createInterface: jest.fn(() => ({
-    on: jest.fn(),
-    prompt: jest.fn(),
-    setPrompt: jest.fn(),
-  })),
-}));
-
-import cluster from 'cluster';
-import { sample } from 'lodash';
-
-import ClusterManager from './cluster_manager';
-import Worker from './worker';
-
-describe('CLI cluster manager', () => {
-  beforeEach(() => {
-    cluster.fork.mockImplementation(() => {
-      return {
-        process: {
-          kill: jest.fn(),
-        },
-        isDead: jest.fn().mockReturnValue(false),
-        off: jest.fn(),
-        on: jest.fn(),
-        send: jest.fn(),
-      };
-    });
-  });
-
-  afterEach(() => {
-    cluster.fork.mockReset();
-  });
-
-  test('has two workers', () => {
-    const manager = ClusterManager.create({});
-
-    expect(manager.workers).toHaveLength(2);
-    for (const worker of manager.workers) expect(worker).toBeInstanceOf(Worker);
-
-    expect(manager.optimizer).toBeInstanceOf(Worker);
-    expect(manager.server).toBeInstanceOf(Worker);
-  });
-
-  test('delivers broadcast messages to other workers', () => {
-    const manager = ClusterManager.create({});
-
-    for (const worker of manager.workers) {
-      Worker.prototype.start.call(worker); // bypass the debounced start method
-      worker.onOnline();
-    }
-
-    const football = {};
-    const messenger = sample(manager.workers);
-
-    messenger.emit('broadcast', football);
-    for (const worker of manager.workers) {
-      if (worker === messenger) {
-        expect(worker.fork.send).not.toHaveBeenCalled();
-      } else {
-        expect(worker.fork.send).toHaveBeenCalledTimes(1);
-        expect(worker.fork.send).toHaveBeenCalledWith(football);
-      }
-    }
-  });
-
-  describe('interaction with BasePathProxy', () => {
-    test('correctly configures `BasePathProxy`.', async () => {
-      const basePathProxyMock = { start: jest.fn() };
-
-      ClusterManager.create({}, {}, basePathProxyMock);
-
-      expect(basePathProxyMock.start).toHaveBeenCalledWith({
-        shouldRedirectFromOldBasePath: expect.any(Function),
-        blockUntil: expect.any(Function),
-      });
-    });
-
-    describe('proxy is configured with the correct `shouldRedirectFromOldBasePath` and `blockUntil` functions.', () => {
-      let clusterManager;
-      let shouldRedirectFromOldBasePath;
-      let blockUntil;
-      beforeEach(async () => {
-        const basePathProxyMock = { start: jest.fn() };
-
-        clusterManager = ClusterManager.create({}, {}, basePathProxyMock);
-
-        jest.spyOn(clusterManager.server, 'on');
-        jest.spyOn(clusterManager.server, 'off');
-
-        [[{ blockUntil, shouldRedirectFromOldBasePath }]] = basePathProxyMock.start.mock.calls;
-      });
-
-      test('`shouldRedirectFromOldBasePath()` returns `false` for unknown paths.', () => {
-        expect(shouldRedirectFromOldBasePath('')).toBe(false);
-        expect(shouldRedirectFromOldBasePath('some-path/')).toBe(false);
-        expect(shouldRedirectFromOldBasePath('some-other-path')).toBe(false);
-      });
-
-      test('`shouldRedirectFromOldBasePath()` returns `true` for `app` and other known paths.', () => {
-        expect(shouldRedirectFromOldBasePath('app/')).toBe(true);
-        expect(shouldRedirectFromOldBasePath('login')).toBe(true);
-        expect(shouldRedirectFromOldBasePath('logout')).toBe(true);
-        expect(shouldRedirectFromOldBasePath('status')).toBe(true);
-      });
-
-      test('`blockUntil()` resolves immediately if worker has already crashed.', async () => {
-        clusterManager.server.crashed = true;
-
-        await expect(blockUntil()).resolves.not.toBeDefined();
-        expect(clusterManager.server.on).not.toHaveBeenCalled();
-        expect(clusterManager.server.off).not.toHaveBeenCalled();
-      });
-
-      test('`blockUntil()` resolves immediately if worker is already listening.', async () => {
-        clusterManager.server.listening = true;
-
-        await expect(blockUntil()).resolves.not.toBeDefined();
-        expect(clusterManager.server.on).not.toHaveBeenCalled();
-        expect(clusterManager.server.off).not.toHaveBeenCalled();
-      });
-
-      test('`blockUntil()` resolves when worker crashes.', async () => {
-        const blockUntilPromise = blockUntil();
-
-        expect(clusterManager.server.on).toHaveBeenCalledTimes(2);
-        expect(clusterManager.server.on).toHaveBeenCalledWith('crashed', expect.any(Function));
-
-        const [, [eventName, onCrashed]] = clusterManager.server.on.mock.calls;
-        // Check event name to make sure we call the right callback,
-        // in Jest 23 we could use `toHaveBeenNthCalledWith` instead.
-        expect(eventName).toBe('crashed');
-        expect(clusterManager.server.off).not.toHaveBeenCalled();
-
-        onCrashed();
-        await expect(blockUntilPromise).resolves.not.toBeDefined();
-
-        expect(clusterManager.server.off).toHaveBeenCalledTimes(2);
-      });
-
-      test('`blockUntil()` resolves when worker starts listening.', async () => {
-        const blockUntilPromise = blockUntil();
-
-        expect(clusterManager.server.on).toHaveBeenCalledTimes(2);
-        expect(clusterManager.server.on).toHaveBeenCalledWith('listening', expect.any(Function));
-
-        const [[eventName, onListening]] = clusterManager.server.on.mock.calls;
-        // Check event name to make sure we call the right callback,
-        // in Jest 23 we could use `toHaveBeenNthCalledWith` instead.
-        expect(eventName).toBe('listening');
-        expect(clusterManager.server.off).not.toHaveBeenCalled();
-
-        onListening();
-        await expect(blockUntilPromise).resolves.not.toBeDefined();
-
-        expect(clusterManager.server.off).toHaveBeenCalledTimes(2);
-      });
-    });
-  });
-});
diff --git a/src/cli/cluster/cluster_manager.test.mocks.ts b/src/cli/cluster/cluster_manager.test.mocks.ts
new file mode 100644
index 0000000000000..53984fd12cbf1
--- /dev/null
+++ b/src/cli/cluster/cluster_manager.test.mocks.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 { MockCluster } from './cluster.mock';
+export const mockCluster = new MockCluster();
+jest.mock('cluster', () => mockCluster);
diff --git a/src/cli/cluster/cluster_manager.test.ts b/src/cli/cluster/cluster_manager.test.ts
new file mode 100644
index 0000000000000..bd37e854e1691
--- /dev/null
+++ b/src/cli/cluster/cluster_manager.test.ts
@@ -0,0 +1,178 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mockCluster } from './cluster_manager.test.mocks';
+jest.mock('readline', () => ({
+  createInterface: jest.fn(() => ({
+    on: jest.fn(),
+    prompt: jest.fn(),
+    setPrompt: jest.fn(),
+  })),
+}));
+
+import { sample } from 'lodash';
+
+import { ClusterManager } from './cluster_manager';
+import { Worker } from './worker';
+
+describe('CLI cluster manager', () => {
+  beforeEach(() => {
+    mockCluster.fork.mockImplementation(() => {
+      return {
+        process: {
+          kill: jest.fn(),
+        },
+        isDead: jest.fn().mockReturnValue(false),
+        off: jest.fn(),
+        on: jest.fn(),
+        send: jest.fn(),
+      } as any;
+    });
+  });
+
+  afterEach(() => {
+    mockCluster.fork.mockReset();
+  });
+
+  test('has two workers', () => {
+    const manager = new ClusterManager({}, {} as any);
+
+    expect(manager.workers).toHaveLength(2);
+    for (const worker of manager.workers) expect(worker).toBeInstanceOf(Worker);
+
+    expect(manager.optimizer).toBeInstanceOf(Worker);
+    expect(manager.server).toBeInstanceOf(Worker);
+  });
+
+  test('delivers broadcast messages to other workers', () => {
+    const manager = new ClusterManager({}, {} as any);
+
+    for (const worker of manager.workers) {
+      Worker.prototype.start.call(worker); // bypass the debounced start method
+      worker.onOnline();
+    }
+
+    const football = {};
+    const messenger = sample(manager.workers);
+
+    messenger.emit('broadcast', football);
+    for (const worker of manager.workers) {
+      if (worker === messenger) {
+        expect(worker.fork!.send).not.toHaveBeenCalled();
+      } else {
+        expect(worker.fork!.send).toHaveBeenCalledTimes(1);
+        expect(worker.fork!.send).toHaveBeenCalledWith(football);
+      }
+    }
+  });
+
+  describe('interaction with BasePathProxy', () => {
+    test('correctly configures `BasePathProxy`.', async () => {
+      const basePathProxyMock = { start: jest.fn() };
+
+      new ClusterManager({}, {} as any, basePathProxyMock as any);
+
+      expect(basePathProxyMock.start).toHaveBeenCalledWith({
+        shouldRedirectFromOldBasePath: expect.any(Function),
+        blockUntil: expect.any(Function),
+      });
+    });
+
+    describe('proxy is configured with the correct `shouldRedirectFromOldBasePath` and `blockUntil` functions.', () => {
+      let clusterManager: ClusterManager;
+      let shouldRedirectFromOldBasePath: (path: string) => boolean;
+      let blockUntil: () => Promise<any>;
+      beforeEach(async () => {
+        const basePathProxyMock = { start: jest.fn() };
+
+        clusterManager = new ClusterManager({}, {} as any, basePathProxyMock as any);
+
+        jest.spyOn(clusterManager.server, 'on');
+        jest.spyOn(clusterManager.server, 'off');
+
+        [[{ blockUntil, shouldRedirectFromOldBasePath }]] = basePathProxyMock.start.mock.calls;
+      });
+
+      test('`shouldRedirectFromOldBasePath()` returns `false` for unknown paths.', () => {
+        expect(shouldRedirectFromOldBasePath('')).toBe(false);
+        expect(shouldRedirectFromOldBasePath('some-path/')).toBe(false);
+        expect(shouldRedirectFromOldBasePath('some-other-path')).toBe(false);
+      });
+
+      test('`shouldRedirectFromOldBasePath()` returns `true` for `app` and other known paths.', () => {
+        expect(shouldRedirectFromOldBasePath('app/')).toBe(true);
+        expect(shouldRedirectFromOldBasePath('login')).toBe(true);
+        expect(shouldRedirectFromOldBasePath('logout')).toBe(true);
+        expect(shouldRedirectFromOldBasePath('status')).toBe(true);
+      });
+
+      test('`blockUntil()` resolves immediately if worker has already crashed.', async () => {
+        clusterManager.server.crashed = true;
+
+        await expect(blockUntil()).resolves.not.toBeDefined();
+        expect(clusterManager.server.on).not.toHaveBeenCalled();
+        expect(clusterManager.server.off).not.toHaveBeenCalled();
+      });
+
+      test('`blockUntil()` resolves immediately if worker is already listening.', async () => {
+        clusterManager.server.listening = true;
+
+        await expect(blockUntil()).resolves.not.toBeDefined();
+        expect(clusterManager.server.on).not.toHaveBeenCalled();
+        expect(clusterManager.server.off).not.toHaveBeenCalled();
+      });
+
+      test('`blockUntil()` resolves when worker crashes.', async () => {
+        const blockUntilPromise = blockUntil();
+
+        expect(clusterManager.server.on).toHaveBeenCalledTimes(2);
+        expect(clusterManager.server.on).toHaveBeenCalledWith('crashed', expect.any(Function));
+
+        const [, [eventName, onCrashed]] = (clusterManager.server.on as jest.Mock).mock.calls;
+        // Check event name to make sure we call the right callback,
+        // in Jest 23 we could use `toHaveBeenNthCalledWith` instead.
+        expect(eventName).toBe('crashed');
+        expect(clusterManager.server.off).not.toHaveBeenCalled();
+
+        onCrashed();
+        await expect(blockUntilPromise).resolves.not.toBeDefined();
+
+        expect(clusterManager.server.off).toHaveBeenCalledTimes(2);
+      });
+
+      test('`blockUntil()` resolves when worker starts listening.', async () => {
+        const blockUntilPromise = blockUntil();
+
+        expect(clusterManager.server.on).toHaveBeenCalledTimes(2);
+        expect(clusterManager.server.on).toHaveBeenCalledWith('listening', expect.any(Function));
+
+        const [[eventName, onListening]] = (clusterManager.server.on as jest.Mock).mock.calls;
+        // Check event name to make sure we call the right callback,
+        // in Jest 23 we could use `toHaveBeenNthCalledWith` instead.
+        expect(eventName).toBe('listening');
+        expect(clusterManager.server.off).not.toHaveBeenCalled();
+
+        onListening();
+        await expect(blockUntilPromise).resolves.not.toBeDefined();
+
+        expect(clusterManager.server.off).toHaveBeenCalledTimes(2);
+      });
+    });
+  });
+});
diff --git a/src/cli/cluster/cluster_manager.ts b/src/cli/cluster/cluster_manager.ts
new file mode 100644
index 0000000000000..3fa4bdcbc5fa5
--- /dev/null
+++ b/src/cli/cluster/cluster_manager.ts
@@ -0,0 +1,314 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { format as formatUrl } from 'url';
+import opn from 'opn';
+import { debounce, invoke, bindAll, once, uniq } from 'lodash';
+import * as Rx from 'rxjs';
+import { first, mapTo, filter, map, take } from 'rxjs/operators';
+import { REPO_ROOT } from '@kbn/dev-utils';
+import { FSWatcher } from 'chokidar';
+
+import { LegacyConfig } from '../../core/server/legacy';
+import { BasePathProxyServer } from '../../core/server/http';
+
+// @ts-ignore
+import Log from '../log';
+import { Worker } from './worker';
+
+process.env.kbnWorkerType = 'managr';
+
+export class ClusterManager {
+  public optimizer: Worker;
+  public server: Worker;
+  public workers: Worker[];
+
+  private watcher: FSWatcher | null = null;
+  private basePathProxy: BasePathProxyServer | undefined;
+  private log: any;
+  private addedCount = 0;
+  private inReplMode: boolean;
+
+  constructor(
+    opts: Record<string, any>,
+    config: LegacyConfig,
+    basePathProxy?: BasePathProxyServer
+  ) {
+    this.log = new Log(opts.quiet, opts.silent);
+    this.inReplMode = !!opts.repl;
+    this.basePathProxy = basePathProxy;
+
+    const serverArgv = [];
+    const optimizerArgv = ['--plugins.initialize=false', '--server.autoListen=false'];
+
+    if (this.basePathProxy) {
+      optimizerArgv.push(
+        `--server.basePath=${this.basePathProxy.basePath}`,
+        '--server.rewriteBasePath=true'
+      );
+
+      serverArgv.push(
+        `--server.port=${this.basePathProxy.targetPort}`,
+        `--server.basePath=${this.basePathProxy.basePath}`,
+        '--server.rewriteBasePath=true'
+      );
+    }
+
+    this.workers = [
+      (this.optimizer = new Worker({
+        type: 'optmzr',
+        title: 'optimizer',
+        log: this.log,
+        argv: optimizerArgv,
+        watch: false,
+      })),
+      (this.server = new Worker({
+        type: 'server',
+        log: this.log,
+        argv: serverArgv,
+      })),
+    ];
+
+    // broker messages between workers
+    this.workers.forEach(worker => {
+      worker.on('broadcast', msg => {
+        this.workers.forEach(to => {
+          if (to !== worker && to.online) {
+            to.fork!.send(msg);
+          }
+        });
+      });
+    });
+
+    // When receive that event from server worker
+    // forward a reloadLoggingConfig message to master
+    // and all workers. This is only used by LogRotator service
+    // when the cluster mode is enabled
+    this.server.on('reloadLoggingConfigFromServerWorker', () => {
+      process.emit('message' as any, { reloadLoggingConfig: true } as any);
+
+      this.workers.forEach(worker => {
+        worker.fork!.send({ reloadLoggingConfig: true });
+      });
+    });
+
+    bindAll(this, 'onWatcherAdd', 'onWatcherError', 'onWatcherChange');
+
+    if (opts.open) {
+      this.setupOpen(
+        formatUrl({
+          protocol: config.get('server.ssl.enabled') ? 'https' : 'http',
+          hostname: config.get('server.host'),
+          port: config.get('server.port'),
+          pathname: this.basePathProxy ? this.basePathProxy.basePath : '',
+        })
+      );
+    }
+
+    if (opts.watch) {
+      const pluginPaths = config.get<string[]>('plugins.paths');
+      const scanDirs = [
+        ...config.get<string[]>('plugins.scanDirs'),
+        resolve(REPO_ROOT, 'src/plugins'),
+        resolve(REPO_ROOT, 'x-pack/plugins'),
+      ];
+      const extraPaths = [...pluginPaths, ...scanDirs];
+
+      const pluginInternalDirsIgnore = scanDirs
+        .map(scanDir => resolve(scanDir, '*'))
+        .concat(pluginPaths)
+        .reduce(
+          (acc, path) =>
+            acc.concat(
+              resolve(path, 'test'),
+              resolve(path, 'build'),
+              resolve(path, 'target'),
+              resolve(path, 'scripts'),
+              resolve(path, 'docs')
+            ),
+          [] as string[]
+        );
+
+      this.setupWatching(extraPaths, pluginInternalDirsIgnore);
+    } else this.startCluster();
+  }
+
+  startCluster() {
+    this.setupManualRestart();
+    invoke(this.workers, 'start');
+    if (this.basePathProxy) {
+      this.basePathProxy.start({
+        blockUntil: this.blockUntil.bind(this),
+        shouldRedirectFromOldBasePath: this.shouldRedirectFromOldBasePath.bind(this),
+      });
+    }
+  }
+
+  setupOpen(openUrl: string) {
+    const serverListening$ = Rx.merge(
+      Rx.fromEvent(this.server, 'listening').pipe(mapTo(true)),
+      Rx.fromEvent(this.server, 'fork:exit').pipe(mapTo(false)),
+      Rx.fromEvent(this.server, 'crashed').pipe(mapTo(false))
+    );
+
+    const optimizeSuccess$ = Rx.fromEvent(this.optimizer, 'optimizeStatus').pipe(
+      map((msg: any) => !!msg.success)
+    );
+
+    Rx.combineLatest(serverListening$, optimizeSuccess$)
+      .pipe(
+        filter(([serverListening, optimizeSuccess]) => serverListening && optimizeSuccess),
+        take(1)
+      )
+      .toPromise()
+      .then(() => opn(openUrl));
+  }
+
+  setupWatching(extraPaths: string[], pluginInternalDirsIgnore: string[]) {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const chokidar = require('chokidar');
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const { fromRoot } = require('../../core/server/utils');
+
+    const watchPaths = [
+      fromRoot('src/core'),
+      fromRoot('src/legacy/core_plugins'),
+      fromRoot('src/legacy/server'),
+      fromRoot('src/legacy/ui'),
+      fromRoot('src/legacy/utils'),
+      fromRoot('x-pack/legacy/common'),
+      fromRoot('x-pack/legacy/plugins'),
+      fromRoot('x-pack/legacy/server'),
+      fromRoot('config'),
+      ...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/apm/scripts'),
+      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)$/,
+        ...pluginInternalDirsIgnore,
+        ...ignorePaths,
+        'plugins/java_languageserver',
+      ],
+    }) as FSWatcher;
+
+    this.watcher.on('add', this.onWatcherAdd);
+    this.watcher.on('error', this.onWatcherError);
+
+    this.watcher.on(
+      'ready',
+      once(() => {
+        // start sending changes to workers
+        this.watcher!.removeListener('add', this.onWatcherAdd);
+        this.watcher!.on('all', this.onWatcherChange);
+
+        this.log.good('watching for changes', `(${this.addedCount} files)`);
+        this.startCluster();
+      })
+    );
+  }
+
+  setupManualRestart() {
+    // If we're in REPL mode, the user can use the REPL to manually restart.
+    // The setupManualRestart method interferes with stdin/stdout, in a way
+    // that negatively affects the REPL.
+    if (this.inReplMode) {
+      return;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const readline = require('readline');
+    const rl = readline.createInterface(process.stdin, process.stdout);
+
+    let nls = 0;
+    const clear = () => (nls = 0);
+    const clearSoon = debounce(clear, 2000);
+
+    rl.setPrompt('');
+    rl.prompt();
+
+    rl.on('line', () => {
+      nls = nls + 1;
+
+      if (nls >= 2) {
+        clearSoon.cancel();
+        clear();
+        this.server.start();
+      } else {
+        clearSoon();
+      }
+
+      rl.prompt();
+    });
+
+    rl.on('SIGINT', () => {
+      rl.pause();
+      process.kill(process.pid, 'SIGINT');
+    });
+  }
+
+  onWatcherAdd() {
+    this.addedCount += 1;
+  }
+
+  onWatcherChange(e: any, path: string) {
+    invoke(this.workers, 'onChange', path);
+  }
+
+  onWatcherError(err: any) {
+    this.log.bad('failed to watch files!\n', err.stack);
+    process.exit(1); // eslint-disable-line no-process-exit
+  }
+
+  shouldRedirectFromOldBasePath(path: string) {
+    // strip `s/{id}` prefix when checking for need to redirect
+    if (path.startsWith('s/')) {
+      path = path
+        .split('/')
+        .slice(2)
+        .join('/');
+    }
+
+    const isApp = path.startsWith('app/');
+    const isKnownShortPath = ['login', 'logout', 'status'].includes(path);
+    return isApp || isKnownShortPath;
+  }
+
+  blockUntil() {
+    // Wait until `server` worker either crashes or starts to listen.
+    if (this.server.listening || this.server.crashed) {
+      return Promise.resolve();
+    }
+
+    return Rx.race(Rx.fromEvent(this.server, 'listening'), Rx.fromEvent(this.server, 'crashed'))
+      .pipe(first())
+      .toPromise();
+  }
+}
diff --git a/src/cli/cluster/worker.js b/src/cli/cluster/worker.js
deleted file mode 100644
index 2250075f20a60..0000000000000
--- a/src/cli/cluster/worker.js
+++ /dev/null
@@ -1,190 +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 cluster from 'cluster';
-import { EventEmitter } from 'events';
-
-import { BinderFor } from '../../legacy/utils';
-import { fromRoot } from '../../core/server/utils';
-
-const cliPath = fromRoot('src/cli');
-const baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);
-const baseArgv = [process.execPath, cliPath].concat(baseArgs);
-
-cluster.setupMaster({
-  exec: cliPath,
-  silent: false,
-});
-
-const dead = fork => {
-  return fork.isDead() || fork.killed;
-};
-
-export default class Worker extends EventEmitter {
-  constructor(opts) {
-    opts = opts || {};
-    super();
-
-    this.log = opts.log;
-    this.type = opts.type;
-    this.title = opts.title || opts.type;
-    this.watch = opts.watch !== false;
-    this.startCount = 0;
-
-    // status flags
-    this.online = false; // the fork can accept messages
-    this.listening = false; // the fork is listening for connections
-    this.crashed = false; // the fork crashed
-
-    this.changes = [];
-
-    this.forkBinder = null; // defined when the fork is
-    this.clusterBinder = new BinderFor(cluster);
-    this.processBinder = new BinderFor(process);
-
-    this.env = {
-      NODE_OPTIONS: process.env.NODE_OPTIONS || '',
-      kbnWorkerType: this.type,
-      kbnWorkerArgv: JSON.stringify([...(opts.baseArgv || baseArgv), ...(opts.argv || [])]),
-    };
-  }
-
-  onExit(fork, code) {
-    if (this.fork !== fork) return;
-
-    // we have our fork's exit, so stop listening for others
-    this.clusterBinder.destroy();
-
-    // our fork is gone, clear our ref so we don't try to talk to it anymore
-    this.fork = null;
-    this.forkBinder = null;
-
-    this.online = false;
-    this.listening = false;
-    this.emit('fork:exit');
-    this.crashed = code > 0;
-
-    if (this.crashed) {
-      this.emit('crashed');
-      this.log.bad(`${this.title} crashed`, 'with status code', code);
-      if (!this.watch) process.exit(code);
-    } else {
-      // restart after graceful shutdowns
-      this.start();
-    }
-  }
-
-  onChange(path) {
-    if (!this.watch) return;
-    this.changes.push(path);
-    this.start();
-  }
-
-  async shutdown() {
-    if (this.fork && !dead(this.fork)) {
-      // kill the fork
-      this.fork.process.kill();
-      this.fork.killed = true;
-
-      // stop listening to the fork, it's just going to die
-      this.forkBinder.destroy();
-
-      // we don't need to react to process.exit anymore
-      this.processBinder.destroy();
-
-      // wait until the cluster reports this fork has exited, then resolve
-      await new Promise(resolve => this.once('fork:exit', resolve));
-    }
-  }
-
-  parseIncomingMessage(msg) {
-    if (!Array.isArray(msg)) return;
-    this.onMessage(...msg);
-  }
-
-  onMessage(type, data) {
-    switch (type) {
-      case 'WORKER_BROADCAST':
-        this.emit('broadcast', data);
-        break;
-      case 'OPTIMIZE_STATUS':
-        this.emit('optimizeStatus', data);
-        break;
-      case 'WORKER_LISTENING':
-        this.listening = true;
-        this.emit('listening');
-        break;
-      case 'RELOAD_LOGGING_CONFIG_FROM_SERVER_WORKER':
-        this.emit('reloadLoggingConfigFromServerWorker');
-        break;
-    }
-  }
-
-  onOnline() {
-    this.online = true;
-    this.emit('fork:online');
-    this.crashed = false;
-  }
-
-  onDisconnect() {
-    this.online = false;
-    this.listening = false;
-  }
-
-  flushChangeBuffer() {
-    const files = _.unique(this.changes.splice(0));
-    const prefix = files.length > 1 ? '\n - ' : '';
-    return files.reduce(function(list, file) {
-      return `${list || ''}${prefix}"${file}"`;
-    }, '');
-  }
-
-  async start() {
-    if (this.fork) {
-      // once "exit" event is received with 0 status, start() is called again
-      this.shutdown();
-      await new Promise(cb => this.once('online', cb));
-      return;
-    }
-
-    if (this.changes.length) {
-      this.log.warn(`restarting ${this.title}`, `due to changes in ${this.flushChangeBuffer()}`);
-    } else if (this.startCount++) {
-      this.log.warn(`restarting ${this.title}...`);
-    }
-
-    this.fork = cluster.fork(this.env);
-    this.forkBinder = new BinderFor(this.fork);
-
-    // when the fork sends a message, comes online, or loses its connection, then react
-    this.forkBinder.on('message', msg => this.parseIncomingMessage(msg));
-    this.forkBinder.on('online', () => this.onOnline());
-    this.forkBinder.on('disconnect', () => this.onDisconnect());
-
-    // when the cluster says a fork has exited, check if it is ours
-    this.clusterBinder.on('exit', (fork, code) => this.onExit(fork, code));
-
-    // when the process exits, make sure we kill our workers
-    this.processBinder.on('exit', () => this.shutdown());
-
-    // wait for the fork to report it is online before resolving
-    await new Promise(cb => this.once('fork:online', cb));
-  }
-}
diff --git a/src/cli/cluster/worker.test.js b/src/cli/cluster/worker.test.js
deleted file mode 100644
index b43cc123abcbb..0000000000000
--- a/src/cli/cluster/worker.test.js
+++ /dev/null
@@ -1,222 +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 { mockCluster } from './__mocks__/cluster';
-jest.mock('cluster', () => mockCluster());
-
-import cluster from 'cluster';
-
-import Worker from './worker';
-import Log from '../log';
-
-const workersToShutdown = [];
-
-function assertListenerAdded(emitter, event) {
-  expect(emitter.on).toHaveBeenCalledWith(event, expect.any(Function));
-}
-
-function assertListenerRemoved(emitter, event) {
-  const [, onEventListener] = emitter.on.mock.calls.find(([eventName]) => {
-    return eventName === event;
-  });
-
-  expect(emitter.off).toHaveBeenCalledWith(event, onEventListener);
-}
-
-function setup(opts = {}) {
-  const worker = new Worker({
-    log: new Log(false, true),
-    ...opts,
-    baseArgv: [],
-  });
-
-  workersToShutdown.push(worker);
-  return worker;
-}
-
-describe('CLI cluster manager', () => {
-  afterEach(async () => {
-    while (workersToShutdown.length > 0) {
-      const worker = workersToShutdown.pop();
-      // If `fork` exists we should set `exitCode` to the non-zero value to
-      // prevent worker from auto restart.
-      if (worker.fork) {
-        worker.fork.exitCode = 1;
-      }
-
-      await worker.shutdown();
-    }
-
-    cluster.fork.mockClear();
-  });
-
-  describe('#onChange', () => {
-    describe('opts.watch = true', () => {
-      test('restarts the fork', () => {
-        const worker = setup({ watch: true });
-        jest.spyOn(worker, 'start').mockImplementation(() => {});
-        worker.onChange('/some/path');
-        expect(worker.changes).toEqual(['/some/path']);
-        expect(worker.start).toHaveBeenCalledTimes(1);
-      });
-    });
-
-    describe('opts.watch = false', () => {
-      test('does not restart the fork', () => {
-        const worker = setup({ watch: false });
-        jest.spyOn(worker, 'start').mockImplementation(() => {});
-        worker.onChange('/some/path');
-        expect(worker.changes).toEqual([]);
-        expect(worker.start).not.toHaveBeenCalled();
-      });
-    });
-  });
-
-  describe('#shutdown', () => {
-    describe('after starting()', () => {
-      test('kills the worker and unbinds from message, online, and disconnect events', async () => {
-        const worker = setup();
-        await worker.start();
-        expect(worker).toHaveProperty('online', true);
-        const fork = worker.fork;
-        expect(fork.process.kill).not.toHaveBeenCalled();
-        assertListenerAdded(fork, 'message');
-        assertListenerAdded(fork, 'online');
-        assertListenerAdded(fork, 'disconnect');
-        await worker.shutdown();
-        expect(fork.process.kill).toHaveBeenCalledTimes(1);
-        assertListenerRemoved(fork, 'message');
-        assertListenerRemoved(fork, 'online');
-        assertListenerRemoved(fork, 'disconnect');
-      });
-    });
-
-    describe('before being started', () => {
-      test('does nothing', () => {
-        const worker = setup();
-        worker.shutdown();
-      });
-    });
-  });
-
-  describe('#parseIncomingMessage()', () => {
-    describe('on a started worker', () => {
-      test(`is bound to fork's message event`, async () => {
-        const worker = setup();
-        await worker.start();
-        expect(worker.fork.on).toHaveBeenCalledWith('message', expect.any(Function));
-      });
-    });
-
-    describe('do after', () => {
-      test('ignores non-array messages', () => {
-        const worker = setup();
-        worker.parseIncomingMessage('some string thing');
-        worker.parseIncomingMessage(0);
-        worker.parseIncomingMessage(null);
-        worker.parseIncomingMessage(undefined);
-        worker.parseIncomingMessage({ like: 'an object' });
-        worker.parseIncomingMessage(/weird/);
-      });
-
-      test('calls #onMessage with message parts', () => {
-        const worker = setup();
-        jest.spyOn(worker, 'onMessage').mockImplementation(() => {});
-        worker.parseIncomingMessage([10, 100, 1000, 10000]);
-        expect(worker.onMessage).toHaveBeenCalledWith(10, 100, 1000, 10000);
-      });
-    });
-  });
-
-  describe('#onMessage', () => {
-    describe('when sent WORKER_BROADCAST message', () => {
-      test('emits the data to be broadcasted', () => {
-        const worker = setup();
-        const data = {};
-        jest.spyOn(worker, 'emit').mockImplementation(() => {});
-        worker.onMessage('WORKER_BROADCAST', data);
-        expect(worker.emit).toHaveBeenCalledWith('broadcast', data);
-      });
-    });
-
-    describe('when sent WORKER_LISTENING message', () => {
-      test('sets the listening flag and emits the listening event', () => {
-        const worker = setup();
-        jest.spyOn(worker, 'emit').mockImplementation(() => {});
-        expect(worker).toHaveProperty('listening', false);
-        worker.onMessage('WORKER_LISTENING');
-        expect(worker).toHaveProperty('listening', true);
-        expect(worker.emit).toHaveBeenCalledWith('listening');
-      });
-    });
-
-    describe('when passed an unknown message', () => {
-      test('does nothing', () => {
-        const worker = setup();
-        worker.onMessage('asdlfkajsdfahsdfiohuasdofihsdoif');
-        worker.onMessage({});
-        worker.onMessage(23049283094);
-      });
-    });
-  });
-
-  describe('#start', () => {
-    describe('when not started', () => {
-      test('creates a fork and waits for it to come online', async () => {
-        const worker = setup();
-
-        jest.spyOn(worker, 'on');
-
-        await worker.start();
-
-        expect(cluster.fork).toHaveBeenCalledTimes(1);
-        expect(worker.on).toHaveBeenCalledWith('fork:online', expect.any(Function));
-      });
-
-      test('listens for cluster and process "exit" events', async () => {
-        const worker = setup();
-
-        jest.spyOn(process, 'on');
-        jest.spyOn(cluster, 'on');
-
-        await worker.start();
-
-        expect(cluster.on).toHaveBeenCalledTimes(1);
-        expect(cluster.on).toHaveBeenCalledWith('exit', expect.any(Function));
-        expect(process.on).toHaveBeenCalledTimes(1);
-        expect(process.on).toHaveBeenCalledWith('exit', expect.any(Function));
-      });
-    });
-
-    describe('when already started', () => {
-      test('calls shutdown and waits for the graceful shutdown to cause a restart', async () => {
-        const worker = setup();
-        await worker.start();
-
-        jest.spyOn(worker, 'shutdown');
-        jest.spyOn(worker, 'on');
-
-        worker.start();
-
-        expect(worker.shutdown).toHaveBeenCalledTimes(1);
-        expect(worker.on).toHaveBeenCalledWith('online', expect.any(Function));
-      });
-    });
-  });
-});
diff --git a/src/cli/cluster/worker.test.ts b/src/cli/cluster/worker.test.ts
new file mode 100644
index 0000000000000..4f9337681e083
--- /dev/null
+++ b/src/cli/cluster/worker.test.ts
@@ -0,0 +1,219 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mockCluster } from './cluster_manager.test.mocks';
+
+import { Worker, ClusterWorker } from './worker';
+// @ts-ignore
+import Log from '../log';
+
+const workersToShutdown: Worker[] = [];
+
+function assertListenerAdded(emitter: NodeJS.EventEmitter, event: any) {
+  expect(emitter.on).toHaveBeenCalledWith(event, expect.any(Function));
+}
+
+function assertListenerRemoved(emitter: NodeJS.EventEmitter, event: any) {
+  const [, onEventListener] = (emitter.on as jest.Mock).mock.calls.find(([eventName]) => {
+    return eventName === event;
+  });
+
+  expect(emitter.off).toHaveBeenCalledWith(event, onEventListener);
+}
+
+function setup(opts = {}) {
+  const worker = new Worker({
+    log: new Log(false, true),
+    ...opts,
+    baseArgv: [],
+    type: 'test',
+  });
+
+  workersToShutdown.push(worker);
+  return worker;
+}
+
+describe('CLI cluster manager', () => {
+  afterEach(async () => {
+    while (workersToShutdown.length > 0) {
+      const worker = workersToShutdown.pop() as Worker;
+      // If `fork` exists we should set `exitCode` to the non-zero value to
+      // prevent worker from auto restart.
+      if (worker.fork) {
+        worker.fork.exitCode = 1;
+      }
+
+      await worker.shutdown();
+    }
+
+    mockCluster.fork.mockClear();
+  });
+
+  describe('#onChange', () => {
+    describe('opts.watch = true', () => {
+      test('restarts the fork', () => {
+        const worker = setup({ watch: true });
+        jest.spyOn(worker, 'start').mockResolvedValue();
+        worker.onChange('/some/path');
+        expect(worker.changes).toEqual(['/some/path']);
+        expect(worker.start).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe('opts.watch = false', () => {
+      test('does not restart the fork', () => {
+        const worker = setup({ watch: false });
+        jest.spyOn(worker, 'start').mockResolvedValue();
+        worker.onChange('/some/path');
+        expect(worker.changes).toEqual([]);
+        expect(worker.start).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('#shutdown', () => {
+    describe('after starting()', () => {
+      test('kills the worker and unbinds from message, online, and disconnect events', async () => {
+        const worker = setup();
+        await worker.start();
+        expect(worker).toHaveProperty('online', true);
+        const fork = worker.fork as ClusterWorker;
+        expect(fork!.process.kill).not.toHaveBeenCalled();
+        assertListenerAdded(fork, 'message');
+        assertListenerAdded(fork, 'online');
+        assertListenerAdded(fork, 'disconnect');
+        await worker.shutdown();
+        expect(fork!.process.kill).toHaveBeenCalledTimes(1);
+        assertListenerRemoved(fork, 'message');
+        assertListenerRemoved(fork, 'online');
+        assertListenerRemoved(fork, 'disconnect');
+      });
+    });
+
+    describe('before being started', () => {
+      test('does nothing', () => {
+        const worker = setup();
+        worker.shutdown();
+      });
+    });
+  });
+
+  describe('#parseIncomingMessage()', () => {
+    describe('on a started worker', () => {
+      test(`is bound to fork's message event`, async () => {
+        const worker = setup();
+        await worker.start();
+        expect(worker.fork!.on).toHaveBeenCalledWith('message', expect.any(Function));
+      });
+    });
+
+    describe('do after', () => {
+      test('ignores non-array messages', () => {
+        const worker = setup();
+        worker.parseIncomingMessage('some string thing');
+        worker.parseIncomingMessage(0);
+        worker.parseIncomingMessage(null);
+        worker.parseIncomingMessage(undefined);
+        worker.parseIncomingMessage({ like: 'an object' });
+        worker.parseIncomingMessage(/weird/);
+      });
+
+      test('calls #onMessage with message parts', () => {
+        const worker = setup();
+        jest.spyOn(worker, 'onMessage').mockImplementation(() => {});
+        worker.parseIncomingMessage(['event', 'some-data']);
+        expect(worker.onMessage).toHaveBeenCalledWith('event', 'some-data');
+      });
+    });
+  });
+
+  describe('#onMessage', () => {
+    describe('when sent WORKER_BROADCAST message', () => {
+      test('emits the data to be broadcasted', () => {
+        const worker = setup();
+        const data = {};
+        jest.spyOn(worker, 'emit').mockImplementation(() => true);
+        worker.onMessage('WORKER_BROADCAST', data);
+        expect(worker.emit).toHaveBeenCalledWith('broadcast', data);
+      });
+    });
+
+    describe('when sent WORKER_LISTENING message', () => {
+      test('sets the listening flag and emits the listening event', () => {
+        const worker = setup();
+        jest.spyOn(worker, 'emit').mockImplementation(() => true);
+        expect(worker).toHaveProperty('listening', false);
+        worker.onMessage('WORKER_LISTENING');
+        expect(worker).toHaveProperty('listening', true);
+        expect(worker.emit).toHaveBeenCalledWith('listening');
+      });
+    });
+
+    describe('when passed an unknown message', () => {
+      test('does nothing', () => {
+        const worker = setup();
+        worker.onMessage('asdlfkajsdfahsdfiohuasdofihsdoif');
+      });
+    });
+  });
+
+  describe('#start', () => {
+    describe('when not started', () => {
+      test('creates a fork and waits for it to come online', async () => {
+        const worker = setup();
+
+        jest.spyOn(worker, 'on');
+
+        await worker.start();
+
+        expect(mockCluster.fork).toHaveBeenCalledTimes(1);
+        expect(worker.on).toHaveBeenCalledWith('fork:online', expect.any(Function));
+      });
+
+      test('listens for cluster and process "exit" events', async () => {
+        const worker = setup();
+
+        jest.spyOn(process, 'on');
+        jest.spyOn(mockCluster, 'on');
+
+        await worker.start();
+
+        expect(mockCluster.on).toHaveBeenCalledTimes(1);
+        expect(mockCluster.on).toHaveBeenCalledWith('exit', expect.any(Function));
+        expect(process.on).toHaveBeenCalledTimes(1);
+        expect(process.on).toHaveBeenCalledWith('exit', expect.any(Function));
+      });
+    });
+
+    describe('when already started', () => {
+      test('calls shutdown and waits for the graceful shutdown to cause a restart', async () => {
+        const worker = setup();
+        await worker.start();
+
+        jest.spyOn(worker, 'shutdown');
+        jest.spyOn(worker, 'on');
+
+        worker.start();
+
+        expect(worker.shutdown).toHaveBeenCalledTimes(1);
+        expect(worker.on).toHaveBeenCalledWith('online', expect.any(Function));
+      });
+    });
+  });
+});
diff --git a/src/cli/cluster/worker.ts b/src/cli/cluster/worker.ts
new file mode 100644
index 0000000000000..fb87f1a87654c
--- /dev/null
+++ b/src/cli/cluster/worker.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 _ from 'lodash';
+import cluster from 'cluster';
+import { EventEmitter } from 'events';
+
+import { BinderFor } from '../../legacy/utils/binder_for';
+import { fromRoot } from '../../core/server/utils';
+
+const cliPath = fromRoot('src/cli');
+const baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);
+const baseArgv = [process.execPath, cliPath].concat(baseArgs);
+
+export type ClusterWorker = cluster.Worker & {
+  killed: boolean;
+  exitCode?: number;
+};
+
+cluster.setupMaster({
+  exec: cliPath,
+  silent: false,
+});
+
+const dead = (fork: ClusterWorker) => {
+  return fork.isDead() || fork.killed;
+};
+
+interface WorkerOptions {
+  type: string;
+  log: any; // src/cli/log.js
+  argv?: string[];
+  title?: string;
+  watch?: boolean;
+  baseArgv?: string[];
+}
+
+export class Worker extends EventEmitter {
+  private readonly clusterBinder: BinderFor;
+  private readonly processBinder: BinderFor;
+
+  private type: string;
+  private title: string;
+  private log: any;
+  private forkBinder: BinderFor | null = null;
+  private startCount: number;
+  private watch: boolean;
+  private env: Record<string, string>;
+
+  public fork: ClusterWorker | null = null;
+  public changes: string[];
+
+  // status flags
+  public online = false; // the fork can accept messages
+  public listening = false; // the fork is listening for connections
+  public crashed = false; // the fork crashed
+
+  constructor(opts: WorkerOptions) {
+    super();
+
+    this.log = opts.log;
+    this.type = opts.type;
+    this.title = opts.title || opts.type;
+    this.watch = opts.watch !== false;
+    this.startCount = 0;
+
+    this.changes = [];
+
+    this.clusterBinder = new BinderFor(cluster as any); // lack the 'off' method
+    this.processBinder = new BinderFor(process);
+
+    this.env = {
+      NODE_OPTIONS: process.env.NODE_OPTIONS || '',
+      kbnWorkerType: this.type,
+      kbnWorkerArgv: JSON.stringify([...(opts.baseArgv || baseArgv), ...(opts.argv || [])]),
+    };
+  }
+
+  onExit(fork: ClusterWorker, code: number) {
+    if (this.fork !== fork) return;
+
+    // we have our fork's exit, so stop listening for others
+    this.clusterBinder.destroy();
+
+    // our fork is gone, clear our ref so we don't try to talk to it anymore
+    this.fork = null;
+    this.forkBinder = null;
+
+    this.online = false;
+    this.listening = false;
+    this.emit('fork:exit');
+    this.crashed = code > 0;
+
+    if (this.crashed) {
+      this.emit('crashed');
+      this.log.bad(`${this.title} crashed`, 'with status code', code);
+      if (!this.watch) process.exit(code);
+    } else {
+      // restart after graceful shutdowns
+      this.start();
+    }
+  }
+
+  onChange(path: string) {
+    if (!this.watch) return;
+    this.changes.push(path);
+    this.start();
+  }
+
+  async shutdown() {
+    if (this.fork && !dead(this.fork)) {
+      // kill the fork
+      this.fork.process.kill();
+      this.fork.killed = true;
+
+      // stop listening to the fork, it's just going to die
+      this.forkBinder!.destroy();
+
+      // we don't need to react to process.exit anymore
+      this.processBinder.destroy();
+
+      // wait until the cluster reports this fork has exited, then resolve
+      await new Promise(resolve => this.once('fork:exit', resolve));
+    }
+  }
+
+  parseIncomingMessage(msg: any) {
+    if (!Array.isArray(msg)) {
+      return;
+    }
+    this.onMessage(msg[0], msg[1]);
+  }
+
+  onMessage(type: string, data?: any) {
+    switch (type) {
+      case 'WORKER_BROADCAST':
+        this.emit('broadcast', data);
+        break;
+      case 'OPTIMIZE_STATUS':
+        this.emit('optimizeStatus', data);
+        break;
+      case 'WORKER_LISTENING':
+        this.listening = true;
+        this.emit('listening');
+        break;
+      case 'RELOAD_LOGGING_CONFIG_FROM_SERVER_WORKER':
+        this.emit('reloadLoggingConfigFromServerWorker');
+        break;
+    }
+  }
+
+  onOnline() {
+    this.online = true;
+    this.emit('fork:online');
+    this.crashed = false;
+  }
+
+  onDisconnect() {
+    this.online = false;
+    this.listening = false;
+  }
+
+  flushChangeBuffer() {
+    const files = _.unique(this.changes.splice(0));
+    const prefix = files.length > 1 ? '\n - ' : '';
+    return files.reduce(function(list, file) {
+      return `${list || ''}${prefix}"${file}"`;
+    }, '');
+  }
+
+  async start() {
+    if (this.fork) {
+      // once "exit" event is received with 0 status, start() is called again
+      this.shutdown();
+      await new Promise(cb => this.once('online', cb));
+      return;
+    }
+
+    if (this.changes.length) {
+      this.log.warn(`restarting ${this.title}`, `due to changes in ${this.flushChangeBuffer()}`);
+    } else if (this.startCount++) {
+      this.log.warn(`restarting ${this.title}...`);
+    }
+
+    this.fork = cluster.fork(this.env) as ClusterWorker;
+    this.forkBinder = new BinderFor(this.fork);
+
+    // when the fork sends a message, comes online, or loses its connection, then react
+    this.forkBinder.on('message', (msg: any) => this.parseIncomingMessage(msg));
+    this.forkBinder.on('online', () => this.onOnline());
+    this.forkBinder.on('disconnect', () => this.onDisconnect());
+
+    // when the cluster says a fork has exited, check if it is ours
+    this.clusterBinder.on('exit', (fork: ClusterWorker, code: number) => this.onExit(fork, code));
+
+    // when the process exits, make sure we kill our workers
+    this.processBinder.on('exit', () => this.shutdown());
+
+    // wait for the fork to report it is online before resolving
+    await new Promise(cb => this.once('fork:online', cb));
+  }
+}
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index 27c93cec4c098..6b13d0dc32d3f 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -140,21 +140,12 @@ function applyConfigOverrides(rawConfig, opts, extraCliOptions) {
   }
 
   set('plugins.scanDirs', _.compact([].concat(get('plugins.scanDirs'), opts.pluginDir)));
-
   set(
     'plugins.paths',
     _.compact(
       [].concat(
         get('plugins.paths'),
         opts.pluginPath,
-        opts.runExamples
-          ? [
-              // Ideally this would automatically include all plugins in the examples dir
-              fromRoot('examples/demo_search'),
-              fromRoot('examples/search_explorer'),
-            ]
-          : [],
-
         XPACK_INSTALLED && !opts.oss ? [XPACK_DIR] : []
       )
     )
@@ -251,6 +242,7 @@ export default function(program) {
         silent: !!opts.silent,
         watch: !!opts.watch,
         repl: !!opts.repl,
+        runExamples: !!opts.runExamples,
         // We want to run without base path when the `--run-examples` flag is given so that we can use local
         // links in other documentation sources, like "View this tutorial [here](http://localhost:5601/app/tutorial/xyz)".
         // We can tell users they only have to run with `yarn start --run-examples` to get those
diff --git a/src/core/MIGRATION.md b/src/core/MIGRATION.md
index 5bb22579d123e..b70ac610f24a7 100644
--- a/src/core/MIGRATION.md
+++ b/src/core/MIGRATION.md
@@ -46,6 +46,8 @@
   - [How to](#how-to)
     - [Configure plugin](#configure-plugin)
       - [Handle plugin configuration deprecations](#handle-plugin-config-deprecations)
+    - [Use scoped services](#use-scoped-services)
+      - [Declare a custom scoped service](#declare-a-custom-scoped-service)
     - [Mock new platform services in tests](#mock-new-platform-services-in-tests)
       - [Writing mocks for your plugin](#writing-mocks-for-your-plugin)
       - [Using mocks in your tests](#using-mocks-in-your-tests)
@@ -1190,22 +1192,24 @@ In server code, `core` can be accessed from either `server.newPlatform` or `kbnS
 | `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)                      |
 | `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                          |
-| `xpackMainPlugin.info.feature(pluginID).registerLicenseCheckResultsGenerator` | [`x-pack licensing plugin`](/x-pack/plugins/licensing/README.md)                                                                                                                                                                                                                                            |                                                                             |
+| `server.plugins.elasticsearch.getCluster('data')`                             | [`context.elasticsearch.dataClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)                                                                                                                                                                                            |                                                                             |
+| `server.plugins.elasticsearch.getCluster('admin')`                            | [`context.elasticsearch.adminClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)                                                                                                                                                                                           |                                                                             |
+| `server.plugins.elasticsearch.createCluster(...)`                            | [`core.elasticsearch.createClient`](/docs/development/core/server/kibana-plugin-server.elasticsearchservicesetup.createclient.md)                                                                                                                                                                                           |                                                                             |
 | `server.savedObjects.setScopedSavedObjectsClientFactory`                      | [`core.savedObjects.setClientFactory`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.setclientfactory.md)                                                                                                                                                                     |                                                                             |
 | `server.savedObjects.addScopedSavedObjectsClientWrapperFactory`               | [`core.savedObjects.addClientWrapper`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.addclientwrapper.md)                                                                                                                                                                     |                                                                             |
 | `server.savedObjects.getSavedObjectsRepository`                               | [`core.savedObjects.createInternalRepository`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.createinternalrepository.md) [`core.savedObjects.createScopedRepository`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicesetup.createscopedrepository.md) |                                                                             |
 | `server.savedObjects.getScopedSavedObjectsClient`                             | [`core.savedObjects.getScopedClient`](/docs/development/core/server/kibana-plugin-server.savedobjectsservicestart.getscopedclient.md)                                                                                                                                                                       |                                                                             |
 | `request.getSavedObjectsClient`                                               | [`context.core.savedObjects.client`](/docs/development/core/server/kibana-plugin-server.requesthandlercontext.core.md)                                                                                                                                                                                      |                                                                             |
+| `request.getUiSettingsService`                                                | [`context.uiSettings.client`](/docs/development/core/server/kibana-plugin-server.iuisettingsclient.md)                                                                                                                                                                                                      |                                                                             |
 | `kibana.Plugin.deprecations`                                                  | [Handle plugin configuration deprecations](#handle-plugin-config-deprecations) and [`PluginConfigDescriptor.deprecations`](docs/development/core/server/kibana-plugin-server.pluginconfigdescriptor.md)                                                                                                     | Deprecations from New Platform are not applied to legacy configuration      |
 
 _See also: [Server's CoreSetup API Docs](/docs/development/core/server/kibana-plugin-server.coresetup.md)_
 
 ##### Plugin services
-| Legacy Platform                             | New Platform                                                                   | Notes |
-| ------------------------------------------- | ------------------------------------------------------------------------------ | ----- |
-| `server.plugins.xpack_main.registerFeature` | [`plugins.features.registerFeature`](x-pack/plugins/features/server/plugin.ts) |       |
+| Legacy Platform                                                                    | New Platform                                                                   | Notes |
+| ---------------------------------------------------------------------------------- | ------------------------------------------------------------------------------ | ----- |
+| `server.plugins.xpack_main.registerFeature`                                        | [`plugins.features.registerFeature`](x-pack/plugins/features/server/plugin.ts) |       |
+| `server.plugins.xpack_main.feature(pluginID).registerLicenseCheckResultsGenerator` | [`x-pack licensing plugin`](/x-pack/plugins/licensing/README.md)               |       |
 
 #### UI Exports
 
@@ -1399,7 +1403,7 @@ export const config: PluginConfigDescriptor<ConfigType> = {
   deprecations: ({ rename, unused }) => [
     rename('oldProperty', 'newProperty'),
     unused('someUnusedProperty'),
-  ]   
+  ]
 };
 ```
 
@@ -1413,7 +1417,7 @@ export const config: PluginConfigDescriptor<ConfigType> = {
   deprecations: ({ renameFromRoot, unusedFromRoot }) => [
     renameFromRoot('oldplugin.property', 'myplugin.property'),
     unusedFromRoot('oldplugin.deprecated'),
-  ]   
+  ]
 };
 ```
 
@@ -1421,6 +1425,68 @@ Note that deprecations registered in new platform's plugins are not applied to t
 During migration, if you still need the deprecations to be effective in the legacy plugin, you need to declare them in
 both plugin definitions.
 
+### Use scoped services
+Whenever Kibana needs to get access to data saved in elasticsearch, it should perform a check whether an end-user has access to the data.
+In the legacy platform, Kibana requires to bind elasticsearch related API with an incoming request to access elasticsearch service on behalf of a user.
+```js
+  async function handler(req, res) {
+    const dataCluster = server.plugins.elasticsearch.getCluster('data');
+    const data = await dataCluster.callWithRequest(req, 'ping');
+  }
+```
+
+The new platform introduced [a handler interface](/rfcs/text/0003_handler_interface.md) on the server-side to perform that association internally. Core services, that require impersonation with an incoming request, are
+exposed via `context` argument of [the request handler interface.](/docs/development/core/server/kibana-plugin-server.requesthandler.md)
+The above example looks in the new platform as
+```js
+  async function handler(context, req, res) {
+    const data = await context.core.elasticsearch.adminClient.callAsInternalUser('ping')
+  }
+```
+
+The [request handler context](/docs/development/core/server/kibana-plugin-server.requesthandlercontext.md) exposed the next scoped **core** services:
+| Legacy Platform                                     | New Platform                                                                                                       |
+| --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------|
+| `request.getSavedObjectsClient`                     | [`context.savedObjects.client`](/docs/development/core/server/kibana-plugin-server.savedobjectsclient.md)          |
+| `server.plugins.elasticsearch.getCluster('admin')`  | [`context.elasticsearch.adminClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)  |
+| `server.plugins.elasticsearch.getCluster('data')`   | [`context.elasticsearch.dataClient`](/docs/development/core/server/kibana-plugin-server.iscopedclusterclient.md)   |
+| `request.getUiSettingsService`                      | [`context.uiSettings.client`](/docs/development/core/server/kibana-plugin-server.iuisettingsclient.md)             |
+
+#### Declare a custom scoped service
+Plugins can extend the handler context with custom API that will be available to the plugin itself and all dependent plugins.
+For example, the plugin creates a custom elasticsearch client and want to use it via the request handler context:
+
+```ts
+import { CoreSetup, IScopedClusterClient } from 'kibana/server';
+
+export interface MyPluginContext {
+  client: IScopedClusterClient;
+}
+
+// extend RequestHandlerContext when a dependent plugin imports MyPluginContext from the file
+declare module 'src/core/server' {
+  interface RequestHandlerContext {
+    myPlugin?: MyPluginContext;
+  }
+}
+
+class Plugin {
+  setup(core: CoreSetup) {
+    const client = core.elasticsearch.createClient('myClient');
+    core.http.registerRouteHandlerContext('myPlugin', (context, req, res) => {
+      return { client: client.asScoped(req) };
+    });
+
+    router.get(
+      { path: '/api/my-plugin/', validate },
+      async (context, req, res) => {
+        const data = await context.myPlugin.client.callAsCurrentUser('endpoint');
+        ...
+      }
+    );
+  }
+```
+
 ### Mock new platform services in tests
 
 #### Writing mocks for your plugin
diff --git a/src/core/public/application/application_service.mock.ts b/src/core/public/application/application_service.mock.ts
index a2db755224636..b2e2161c92cc8 100644
--- a/src/core/public/application/application_service.mock.ts
+++ b/src/core/public/application/application_service.mock.ts
@@ -20,15 +20,13 @@
 import { Subject } from 'rxjs';
 
 import { capabilitiesServiceMock } from './capabilities/capabilities_service.mock';
-import { ApplicationService } from './application_service';
 import {
   ApplicationSetup,
   InternalApplicationStart,
   ApplicationStart,
   InternalApplicationSetup,
 } from './types';
-
-type ApplicationServiceContract = PublicMethodsOf<ApplicationService>;
+import { ApplicationServiceContract } from './test_types';
 
 const createSetupContractMock = (): jest.Mocked<ApplicationSetup> => ({
   register: jest.fn(),
@@ -41,23 +39,27 @@ const createInternalSetupContractMock = (): jest.Mocked<InternalApplicationSetup
   registerMountContext: jest.fn(),
 });
 
-const createStartContractMock = (legacyMode = false): jest.Mocked<ApplicationStart> => ({
+const createStartContractMock = (): jest.Mocked<ApplicationStart> => ({
   capabilities: capabilitiesServiceMock.createStartContract().capabilities,
   navigateToApp: jest.fn(),
   getUrlForApp: jest.fn(),
   registerMountContext: jest.fn(),
 });
 
-const createInternalStartContractMock = (): jest.Mocked<InternalApplicationStart> => ({
-  availableApps: new Map(),
-  availableLegacyApps: new Map(),
-  capabilities: capabilitiesServiceMock.createStartContract().capabilities,
-  navigateToApp: jest.fn(),
-  getUrlForApp: jest.fn(),
-  registerMountContext: jest.fn(),
-  currentAppId$: new Subject<string | undefined>(),
-  getComponent: jest.fn(),
-});
+const createInternalStartContractMock = (): jest.Mocked<InternalApplicationStart> => {
+  const currentAppId$ = new Subject<string | undefined>();
+
+  return {
+    availableApps: new Map(),
+    availableLegacyApps: new Map(),
+    capabilities: capabilitiesServiceMock.createStartContract().capabilities,
+    currentAppId$: currentAppId$.asObservable(),
+    getComponent: jest.fn(),
+    getUrlForApp: jest.fn(),
+    navigateToApp: jest.fn().mockImplementation(appId => currentAppId$.next(appId)),
+    registerMountContext: jest.fn(),
+  };
+};
 
 const createMock = (): jest.Mocked<ApplicationServiceContract> => ({
   setup: jest.fn().mockReturnValue(createInternalSetupContractMock()),
@@ -69,7 +71,6 @@ export const applicationServiceMock = {
   create: createMock,
   createSetupContract: createSetupContractMock,
   createStartContract: createStartContractMock,
-
   createInternalSetupContract: createInternalSetupContractMock,
   createInternalStartContract: createInternalStartContractMock,
 };
diff --git a/src/core/public/application/application_service.test.ts b/src/core/public/application/application_service.test.ts
new file mode 100644
index 0000000000000..d064b17ace142
--- /dev/null
+++ b/src/core/public/application/application_service.test.ts
@@ -0,0 +1,441 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createElement } from 'react';
+import { Subject } from 'rxjs';
+import { bufferCount, skip, takeUntil } from 'rxjs/operators';
+import { shallow } from 'enzyme';
+
+import { injectedMetadataServiceMock } from '../injected_metadata/injected_metadata_service.mock';
+import { contextServiceMock } from '../context/context_service.mock';
+import { httpServiceMock } from '../http/http_service.mock';
+import { MockCapabilitiesService, MockHistory } from './application_service.test.mocks';
+import { MockLifecycle } from './test_types';
+import { ApplicationService } from './application_service';
+
+function mount() {}
+
+describe('#setup()', () => {
+  let setupDeps: MockLifecycle<'setup'>;
+  let startDeps: MockLifecycle<'start'>;
+  let service: ApplicationService;
+
+  beforeEach(() => {
+    const http = httpServiceMock.createSetupContract({ basePath: '/test' });
+    setupDeps = {
+      http,
+      context: contextServiceMock.createSetupContract(),
+      injectedMetadata: injectedMetadataServiceMock.createSetupContract(),
+    };
+    setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(false);
+    startDeps = { http, injectedMetadata: setupDeps.injectedMetadata };
+    service = new ApplicationService();
+  });
+
+  describe('register', () => {
+    it('throws an error if two apps with the same id are registered', () => {
+      const { register } = service.setup(setupDeps);
+
+      register(Symbol(), { id: 'app1', mount } as any);
+      expect(() =>
+        register(Symbol(), { id: 'app1', mount } as any)
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"An application is already registered with the id \\"app1\\""`
+      );
+    });
+
+    it('throws error if additional apps are registered after setup', async () => {
+      const { register } = service.setup(setupDeps);
+
+      await service.start(startDeps);
+      expect(() =>
+        register(Symbol(), { id: 'app1', mount } as any)
+      ).toThrowErrorMatchingInlineSnapshot(`"Applications cannot be registered after \\"setup\\""`);
+    });
+
+    it('throws an error if an App with the same appRoute is registered', () => {
+      const { register, registerLegacyApp } = service.setup(setupDeps);
+
+      register(Symbol(), { id: 'app1', mount } as any);
+
+      expect(() =>
+        register(Symbol(), { id: 'app2', mount, appRoute: '/app/app1' } as any)
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"An application is already registered with the appRoute \\"/app/app1\\""`
+      );
+      expect(() => registerLegacyApp({ id: 'app1' } as any)).not.toThrow();
+
+      register(Symbol(), { id: 'app-next', mount, appRoute: '/app/app3' } as any);
+
+      expect(() =>
+        register(Symbol(), { id: 'app2', mount, appRoute: '/app/app3' } as any)
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"An application is already registered with the appRoute \\"/app/app3\\""`
+      );
+      expect(() => registerLegacyApp({ id: 'app3' } as any)).not.toThrow();
+    });
+
+    it('throws an error if an App starts with the HTTP base path', () => {
+      const { register } = service.setup(setupDeps);
+
+      expect(() =>
+        register(Symbol(), { id: 'app2', mount, appRoute: '/test/app2' } as any)
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Cannot register an application route that includes HTTP base path"`
+      );
+    });
+  });
+
+  describe('registerLegacyApp', () => {
+    it('throws an error if two apps with the same id are registered', () => {
+      const { registerLegacyApp } = service.setup(setupDeps);
+
+      registerLegacyApp({ id: 'app2' } as any);
+      expect(() => registerLegacyApp({ id: 'app2' } as any)).toThrowErrorMatchingInlineSnapshot(
+        `"A legacy application is already registered with the id \\"app2\\""`
+      );
+    });
+
+    it('throws error if additional apps are registered after setup', async () => {
+      const { registerLegacyApp } = service.setup(setupDeps);
+
+      await service.start(startDeps);
+      expect(() => registerLegacyApp({ id: 'app2' } as any)).toThrowErrorMatchingInlineSnapshot(
+        `"Applications cannot be registered after \\"setup\\""`
+      );
+    });
+
+    it('throws an error if a LegacyApp with the same appRoute is registered', () => {
+      const { register, registerLegacyApp } = service.setup(setupDeps);
+
+      registerLegacyApp({ id: 'app1' } as any);
+
+      expect(() =>
+        register(Symbol(), { id: 'app2', mount, appRoute: '/app/app1' } as any)
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"An application is already registered with the appRoute \\"/app/app1\\""`
+      );
+      expect(() => registerLegacyApp({ id: 'app1:other' } as any)).not.toThrow();
+    });
+  });
+
+  it("`registerMountContext` calls context container's registerContext", () => {
+    const { registerMountContext } = service.setup(setupDeps);
+    const container = setupDeps.context.createContextContainer.mock.results[0].value;
+    const pluginId = Symbol();
+
+    registerMountContext(pluginId, 'test' as any, mount as any);
+    expect(container.registerContext).toHaveBeenCalledWith(pluginId, 'test', mount);
+  });
+});
+
+describe('#start()', () => {
+  let setupDeps: MockLifecycle<'setup'>;
+  let startDeps: MockLifecycle<'start'>;
+  let service: ApplicationService;
+
+  beforeEach(() => {
+    MockHistory.push.mockReset();
+    const http = httpServiceMock.createSetupContract({ basePath: '/test' });
+    setupDeps = {
+      http,
+      context: contextServiceMock.createSetupContract(),
+      injectedMetadata: injectedMetadataServiceMock.createSetupContract(),
+    };
+    setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(false);
+    startDeps = { http, injectedMetadata: setupDeps.injectedMetadata };
+    service = new ApplicationService();
+  });
+
+  it('rejects if called prior to #setup()', async () => {
+    await expect(service.start(startDeps)).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"ApplicationService#setup() must be invoked before start."`
+    );
+  });
+
+  it('exposes available apps', async () => {
+    setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
+    const { register, registerLegacyApp } = service.setup(setupDeps);
+
+    register(Symbol(), { id: 'app1', mount } as any);
+    registerLegacyApp({ id: 'app2' } as any);
+
+    const { availableApps, availableLegacyApps } = await service.start(startDeps);
+
+    expect(availableApps).toMatchInlineSnapshot(`
+      Map {
+        "app1" => Object {
+          "appRoute": "/app/app1",
+          "id": "app1",
+          "mount": [Function],
+        },
+      }
+    `);
+    expect(availableLegacyApps).toMatchInlineSnapshot(`
+      Map {
+        "app2" => Object {
+          "id": "app2",
+        },
+      }
+    `);
+  });
+
+  it('passes appIds to capabilities', async () => {
+    const { register } = service.setup(setupDeps);
+
+    register(Symbol(), { id: 'app1', mount } as any);
+    register(Symbol(), { id: 'app2', mount } as any);
+    register(Symbol(), { id: 'app3', mount } as any);
+    await service.start(startDeps);
+
+    expect(MockCapabilitiesService.start).toHaveBeenCalledWith({
+      appIds: ['app1', 'app2', 'app3'],
+      http: setupDeps.http,
+    });
+  });
+
+  it('filters available applications based on capabilities', async () => {
+    MockCapabilitiesService.start.mockResolvedValueOnce({
+      capabilities: {
+        navLinks: {
+          app1: true,
+          app2: false,
+          legacyApp1: true,
+          legacyApp2: false,
+        },
+      },
+    } as any);
+
+    const { register, registerLegacyApp } = service.setup(setupDeps);
+
+    register(Symbol(), { id: 'app1', mount } as any);
+    registerLegacyApp({ id: 'legacyApp1' } as any);
+    register(Symbol(), { id: 'app2', mount } as any);
+    registerLegacyApp({ id: 'legacyApp2' } as any);
+
+    const { availableApps, availableLegacyApps } = await service.start(startDeps);
+
+    expect(availableApps).toMatchInlineSnapshot(`
+      Map {
+        "app1" => Object {
+          "appRoute": "/app/app1",
+          "id": "app1",
+          "mount": [Function],
+        },
+      }
+    `);
+    expect(availableLegacyApps).toMatchInlineSnapshot(`
+      Map {
+        "legacyApp1" => Object {
+          "id": "legacyApp1",
+        },
+      }
+    `);
+  });
+
+  describe('getComponent', () => {
+    it('returns renderable JSX tree', async () => {
+      service.setup(setupDeps);
+
+      const { getComponent } = await service.start(startDeps);
+
+      expect(() => shallow(createElement(getComponent))).not.toThrow();
+      expect(getComponent()).toMatchInlineSnapshot(`
+        <AppRouter
+          history={
+            Object {
+              "push": [MockFunction],
+            }
+          }
+          mounters={Map {}}
+        />
+      `);
+    });
+
+    it('renders null when in legacy mode', async () => {
+      setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
+      service.setup(setupDeps);
+
+      const { getComponent } = await service.start(startDeps);
+
+      expect(() => shallow(createElement(getComponent))).not.toThrow();
+      expect(getComponent()).toBe(null);
+    });
+  });
+
+  describe('getUrlForApp', () => {
+    it('creates URL for unregistered appId', async () => {
+      service.setup(setupDeps);
+
+      const { getUrlForApp } = await service.start(startDeps);
+
+      expect(getUrlForApp('app1')).toBe('/app/app1');
+    });
+
+    it('creates URL for registered appId', async () => {
+      const { register, registerLegacyApp } = service.setup(setupDeps);
+
+      register(Symbol(), { id: 'app1', mount } as any);
+      registerLegacyApp({ id: 'legacyApp1' } as any);
+      register(Symbol(), { id: 'app2', mount, appRoute: '/custom/path' } as any);
+
+      const { getUrlForApp } = await service.start(startDeps);
+
+      expect(getUrlForApp('app1')).toBe('/app/app1');
+      expect(getUrlForApp('legacyApp1')).toBe('/app/legacyApp1');
+      expect(getUrlForApp('app2')).toBe('/custom/path');
+    });
+
+    it('creates URLs with path parameter', async () => {
+      service.setup(setupDeps);
+
+      const { getUrlForApp } = await service.start(startDeps);
+
+      expect(getUrlForApp('app1', { path: 'deep/link' })).toBe('/app/app1/deep/link');
+      expect(getUrlForApp('app1', { path: '/deep//link/' })).toBe('/app/app1/deep/link');
+      expect(getUrlForApp('app1', { path: '//deep/link//' })).toBe('/app/app1/deep/link');
+      expect(getUrlForApp('app1', { path: 'deep/link///' })).toBe('/app/app1/deep/link');
+    });
+  });
+
+  describe('navigateToApp', () => {
+    it('changes the browser history to /app/:appId', async () => {
+      service.setup(setupDeps);
+
+      const { navigateToApp } = await service.start(startDeps);
+
+      navigateToApp('myTestApp');
+      expect(MockHistory.push).toHaveBeenCalledWith('/app/myTestApp', undefined);
+
+      navigateToApp('myOtherApp');
+      expect(MockHistory.push).toHaveBeenCalledWith('/app/myOtherApp', undefined);
+    });
+
+    it('changes the browser history for custom appRoutes', async () => {
+      const { register } = service.setup(setupDeps);
+
+      register(Symbol(), { id: 'app2', mount, appRoute: '/custom/path' } as any);
+
+      const { navigateToApp } = await service.start(startDeps);
+
+      navigateToApp('myTestApp');
+      expect(MockHistory.push).toHaveBeenCalledWith('/app/myTestApp', undefined);
+
+      navigateToApp('app2');
+      expect(MockHistory.push).toHaveBeenCalledWith('/custom/path', undefined);
+    });
+
+    it('appends a path if specified', async () => {
+      const { register } = service.setup(setupDeps);
+
+      register(Symbol(), { id: 'app2', mount, appRoute: '/custom/path' } as any);
+
+      const { navigateToApp } = await service.start(startDeps);
+
+      navigateToApp('myTestApp', { path: 'deep/link/to/location/2' });
+      expect(MockHistory.push).toHaveBeenCalledWith(
+        '/app/myTestApp/deep/link/to/location/2',
+        undefined
+      );
+
+      navigateToApp('app2', { path: 'deep/link/to/location/2' });
+      expect(MockHistory.push).toHaveBeenCalledWith(
+        '/custom/path/deep/link/to/location/2',
+        undefined
+      );
+    });
+
+    it('includes state if specified', async () => {
+      const { register } = service.setup(setupDeps);
+
+      register(Symbol(), { id: 'app2', mount, appRoute: '/custom/path' } as any);
+
+      const { navigateToApp } = await service.start(startDeps);
+
+      navigateToApp('myTestApp', { state: 'my-state' });
+      expect(MockHistory.push).toHaveBeenCalledWith('/app/myTestApp', 'my-state');
+
+      navigateToApp('app2', { state: 'my-state' });
+      expect(MockHistory.push).toHaveBeenCalledWith('/custom/path', 'my-state');
+    });
+
+    it('redirects when in legacyMode', async () => {
+      setupDeps.redirectTo = jest.fn();
+      setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
+      service.setup(setupDeps);
+
+      const { navigateToApp } = await service.start(startDeps);
+
+      navigateToApp('myTestApp');
+      expect(setupDeps.redirectTo).toHaveBeenCalledWith('/test/app/myTestApp');
+    });
+
+    it('updates currentApp$ after mounting', async () => {
+      service.setup(setupDeps);
+
+      const { currentAppId$, navigateToApp } = await service.start(startDeps);
+      const stop$ = new Subject();
+      const promise = currentAppId$.pipe(skip(1), bufferCount(4), takeUntil(stop$)).toPromise();
+
+      await navigateToApp('alpha');
+      await navigateToApp('beta');
+      await navigateToApp('gamma');
+      await navigateToApp('delta');
+      stop$.next();
+
+      const appIds = await promise;
+
+      expect(appIds).toMatchInlineSnapshot(`
+        Array [
+          "alpha",
+          "beta",
+          "gamma",
+          "delta",
+        ]
+      `);
+    });
+
+    it('sets window.location.href when navigating to legacy apps', async () => {
+      setupDeps.http = httpServiceMock.createSetupContract({ basePath: '/test' });
+      setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
+      setupDeps.redirectTo = jest.fn();
+      service.setup(setupDeps);
+
+      const { navigateToApp } = await service.start(startDeps);
+
+      await navigateToApp('alpha');
+      expect(setupDeps.redirectTo).toHaveBeenCalledWith('/test/app/alpha');
+    });
+
+    it('handles legacy apps with subapps', async () => {
+      setupDeps.http = httpServiceMock.createSetupContract({ basePath: '/test' });
+      setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
+      setupDeps.redirectTo = jest.fn();
+
+      const { registerLegacyApp } = service.setup(setupDeps);
+
+      registerLegacyApp({ id: 'baseApp:legacyApp1' } as any);
+
+      const { navigateToApp } = await service.start(startDeps);
+
+      await navigateToApp('baseApp:legacyApp1');
+      expect(setupDeps.redirectTo).toHaveBeenCalledWith('/test/app/baseApp');
+    });
+  });
+});
diff --git a/src/core/public/application/application_service.test.tsx b/src/core/public/application/application_service.test.tsx
deleted file mode 100644
index 32634572466a6..0000000000000
--- a/src/core/public/application/application_service.test.tsx
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { injectedMetadataServiceMock } from '../injected_metadata/injected_metadata_service.mock';
-import { MockCapabilitiesService, MockHistory } from './application_service.test.mocks';
-import { ApplicationService } from './application_service';
-import { contextServiceMock } from '../context/context_service.mock';
-import { httpServiceMock } from '../http/http_service.mock';
-
-describe('#setup()', () => {
-  describe('register', () => {
-    it('throws an error if two apps with the same id are registered', () => {
-      const service = new ApplicationService();
-      const context = contextServiceMock.createSetupContract();
-      const setup = service.setup({ context });
-      setup.register(Symbol(), { id: 'app1', mount: jest.fn() } as any);
-      expect(() =>
-        setup.register(Symbol(), { id: 'app1', mount: jest.fn() } as any)
-      ).toThrowErrorMatchingInlineSnapshot(
-        `"An application is already registered with the id \\"app1\\""`
-      );
-    });
-
-    it('throws error if additional apps are registered after setup', async () => {
-      const service = new ApplicationService();
-      const context = contextServiceMock.createSetupContract();
-      const setup = service.setup({ context });
-      const http = httpServiceMock.createStartContract();
-      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-      await service.start({ http, injectedMetadata });
-      expect(() =>
-        setup.register(Symbol(), { id: 'app1' } as any)
-      ).toThrowErrorMatchingInlineSnapshot(`"Applications cannot be registered after \\"setup\\""`);
-    });
-
-    it('logs a warning when registering a deprecated app mount', async () => {
-      const consoleWarnSpy = jest.spyOn(console, 'warn');
-      const service = new ApplicationService();
-      const context = contextServiceMock.createSetupContract();
-      const setup = service.setup({ context });
-      setup.register(Symbol(), { id: 'app1', mount: (ctx: any, params: any) => {} } as any);
-      expect(consoleWarnSpy).toHaveBeenCalledWith(
-        `App [app1] is using deprecated mount context. Use core.getStartServices() instead.`
-      );
-      consoleWarnSpy.mockRestore();
-    });
-  });
-
-  describe('registerLegacyApp', () => {
-    it('throws an error if two apps with the same id are registered', () => {
-      const service = new ApplicationService();
-      const context = contextServiceMock.createSetupContract();
-      const setup = service.setup({ context });
-      setup.registerLegacyApp({ id: 'app2' } as any);
-      expect(() =>
-        setup.registerLegacyApp({ id: 'app2' } as any)
-      ).toThrowErrorMatchingInlineSnapshot(
-        `"A legacy application is already registered with the id \\"app2\\""`
-      );
-    });
-
-    it('throws error if additional apps are registered after setup', async () => {
-      const service = new ApplicationService();
-      const context = contextServiceMock.createSetupContract();
-      const setup = service.setup({ context });
-      const http = httpServiceMock.createStartContract();
-      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-      await service.start({ http, injectedMetadata });
-      expect(() =>
-        setup.registerLegacyApp({ id: 'app2' } as any)
-      ).toThrowErrorMatchingInlineSnapshot(`"Applications cannot be registered after \\"setup\\""`);
-    });
-  });
-
-  it("`registerMountContext` calls context container's registerContext", () => {
-    const service = new ApplicationService();
-    const context = contextServiceMock.createSetupContract();
-    const setup = service.setup({ context });
-    const container = context.createContextContainer.mock.results[0].value;
-    const pluginId = Symbol();
-    const noop = () => {};
-    setup.registerMountContext(pluginId, 'test' as any, noop as any);
-    expect(container.registerContext).toHaveBeenCalledWith(pluginId, 'test', noop);
-  });
-});
-
-describe('#start()', () => {
-  beforeEach(() => {
-    MockHistory.push.mockReset();
-  });
-
-  it('exposes available apps from capabilities', async () => {
-    const service = new ApplicationService();
-    const context = contextServiceMock.createSetupContract();
-    const setup = service.setup({ context });
-    setup.register(Symbol(), { id: 'app1', mount: jest.fn() } as any);
-    setup.registerLegacyApp({ id: 'app2' } as any);
-
-    const http = httpServiceMock.createStartContract();
-    const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-    const startContract = await service.start({ http, injectedMetadata });
-
-    expect(startContract.availableApps).toMatchInlineSnapshot(`
-      Map {
-        "app1" => Object {
-          "id": "app1",
-          "mount": [MockFunction],
-        },
-      }
-    `);
-    expect(startContract.availableLegacyApps).toMatchInlineSnapshot(`
-                        Map {
-                          "app2" => Object {
-                            "id": "app2",
-                          },
-                        }
-                `);
-  });
-
-  it('passes registered applications to capabilities', async () => {
-    const service = new ApplicationService();
-    const context = contextServiceMock.createSetupContract();
-    const setup = service.setup({ context });
-    const app1 = { id: 'app1', mount: jest.fn() };
-    setup.register(Symbol(), app1 as any);
-
-    const http = httpServiceMock.createStartContract();
-    const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-    await service.start({ http, injectedMetadata });
-
-    expect(MockCapabilitiesService.start).toHaveBeenCalledWith({
-      apps: new Map([['app1', app1]]),
-      legacyApps: new Map(),
-      http,
-    });
-  });
-
-  it('passes registered legacy applications to capabilities', async () => {
-    const service = new ApplicationService();
-    const context = contextServiceMock.createSetupContract();
-    const setup = service.setup({ context });
-    setup.registerLegacyApp({ id: 'legacyApp1' } as any);
-
-    const http = httpServiceMock.createStartContract();
-    const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-    await service.start({ http, injectedMetadata });
-
-    expect(MockCapabilitiesService.start).toHaveBeenCalledWith({
-      apps: new Map(),
-      legacyApps: new Map([['legacyApp1', { id: 'legacyApp1' }]]),
-      http,
-    });
-  });
-
-  it('returns renderable JSX tree', async () => {
-    const service = new ApplicationService();
-    const context = contextServiceMock.createSetupContract();
-    service.setup({ context });
-
-    const http = httpServiceMock.createStartContract();
-    const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-    injectedMetadata.getLegacyMode.mockReturnValue(false);
-    const start = await service.start({ http, injectedMetadata });
-
-    expect(() => shallow(React.createElement(() => start.getComponent()))).not.toThrow();
-  });
-
-  describe('navigateToApp', () => {
-    it('changes the browser history to /app/:appId', async () => {
-      const service = new ApplicationService();
-      const context = contextServiceMock.createSetupContract();
-      service.setup({ context });
-
-      const http = httpServiceMock.createStartContract();
-      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-      injectedMetadata.getLegacyMode.mockReturnValue(false);
-      const start = await service.start({ http, injectedMetadata });
-
-      start.navigateToApp('myTestApp');
-      expect(MockHistory.push).toHaveBeenCalledWith('/app/myTestApp', undefined);
-      start.navigateToApp('myOtherApp');
-      expect(MockHistory.push).toHaveBeenCalledWith('/app/myOtherApp', undefined);
-    });
-
-    it('appends a path if specified', async () => {
-      const service = new ApplicationService();
-      const context = contextServiceMock.createSetupContract();
-      service.setup({ context });
-
-      const http = httpServiceMock.createStartContract();
-      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-      injectedMetadata.getLegacyMode.mockReturnValue(false);
-      const start = await service.start({ http, injectedMetadata });
-
-      start.navigateToApp('myTestApp', { path: 'deep/link/to/location/2' });
-      expect(MockHistory.push).toHaveBeenCalledWith(
-        '/app/myTestApp/deep/link/to/location/2',
-        undefined
-      );
-    });
-
-    it('includes state if specified', async () => {
-      const service = new ApplicationService();
-      const context = contextServiceMock.createSetupContract();
-      service.setup({ context });
-
-      const http = httpServiceMock.createStartContract();
-      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-      injectedMetadata.getLegacyMode.mockReturnValue(false);
-      const start = await service.start({ http, injectedMetadata });
-
-      start.navigateToApp('myTestApp', { state: 'my-state' });
-      expect(MockHistory.push).toHaveBeenCalledWith('/app/myTestApp', 'my-state');
-    });
-
-    it('redirects when in legacyMode', async () => {
-      const service = new ApplicationService();
-      const context = contextServiceMock.createSetupContract();
-      service.setup({ context });
-
-      const http = httpServiceMock.createStartContract();
-      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-      injectedMetadata.getLegacyMode.mockReturnValue(true);
-      const redirectTo = jest.fn();
-      const start = await service.start({ http, injectedMetadata, redirectTo });
-      start.navigateToApp('myTestApp');
-      expect(redirectTo).toHaveBeenCalledWith('/app/myTestApp');
-    });
-  });
-});
diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index df00c84028e6f..a96b9dea9b9c7 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -17,31 +17,32 @@
  * under the License.
  */
 
-import { createBrowserHistory } from 'history';
-import { BehaviorSubject } from 'rxjs';
 import React from 'react';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+import { createBrowserHistory, History } from 'history';
 
-import { InjectedMetadataStart } from '../injected_metadata';
-import { CapabilitiesService } from './capabilities';
-import { AppRouter } from './ui';
-import { HttpStart } from '../http';
+import { InjectedMetadataSetup, InjectedMetadataStart } from '../injected_metadata';
+import { HttpSetup, HttpStart } from '../http';
 import { ContextSetup, IContextContainer } from '../context';
+import { AppRouter } from './ui';
+import { CapabilitiesService, Capabilities } from './capabilities';
 import {
   App,
   LegacyApp,
   AppMount,
   AppMountDeprecated,
+  AppMounter,
+  LegacyAppMounter,
+  Mounter,
   InternalApplicationSetup,
   InternalApplicationStart,
 } from './types';
 
 interface SetupDeps {
   context: ContextSetup;
-}
-
-interface StartDeps {
-  http: HttpStart;
-  injectedMetadata: InjectedMetadataStart;
+  http: HttpSetup;
+  injectedMetadata: InjectedMetadataSetup;
   /**
    * Only necessary for redirecting to legacy apps
    * @deprecated
@@ -49,144 +50,158 @@ interface StartDeps {
   redirectTo?: (path: string) => void;
 }
 
-interface AppBox {
-  app: App;
-  mount: AppMount;
+interface StartDeps {
+  injectedMetadata: InjectedMetadataStart;
+  http: HttpStart;
 }
 
+// Mount functions with two arguments are assumed to expect deprecated `context` object.
+const isAppMountDeprecated = (mount: (...args: any[]) => any): mount is AppMountDeprecated =>
+  mount.length === 2;
+const filterAvailable = (map: Map<string, any>, capabilities: Capabilities) =>
+  new Map(
+    [...map].filter(
+      ([id]) => capabilities.navLinks[id] === undefined || capabilities.navLinks[id] === true
+    )
+  );
+const findMounter = (mounters: Map<string, Mounter>, appRoute?: string) =>
+  [...mounters].find(([, mounter]) => mounter.appRoute === appRoute);
+const getAppUrl = (mounters: Map<string, Mounter>, appId: string, path: string = '') =>
+  `/${mounters.get(appId)?.appRoute ?? `/app/${appId}`}/${path}`
+    .replace(/\/{2,}/g, '/') // Remove duplicate slashes
+    .replace(/\/$/, ''); // Remove trailing slash
+
 /**
  * Service that is responsible for registering new applications.
  * @internal
  */
 export class ApplicationService {
-  private readonly apps$ = new BehaviorSubject<ReadonlyMap<string, AppBox>>(new Map());
-  private readonly legacyApps$ = new BehaviorSubject<ReadonlyMap<string, LegacyApp>>(new Map());
+  private readonly apps = new Map<string, App>();
+  private readonly legacyApps = new Map<string, LegacyApp>();
+  private readonly mounters = new Map<string, Mounter>();
   private readonly capabilities = new CapabilitiesService();
+  private currentAppId$ = new BehaviorSubject<string | undefined>(undefined);
+  private stop$ = new Subject();
+  private registrationClosed = false;
+  private history?: History<any>;
   private mountContext?: IContextContainer<AppMountDeprecated>;
+  private navigate?: (url: string, state: any) => void;
 
-  public setup({ context }: SetupDeps): InternalApplicationSetup {
+  public setup({
+    context,
+    http: { basePath },
+    injectedMetadata,
+    redirectTo = (path: string) => (window.location.href = path),
+  }: SetupDeps): InternalApplicationSetup {
+    const basename = basePath.get();
+    // Only setup history if we're not in legacy mode
+    if (!injectedMetadata.getLegacyMode()) {
+      this.history = createBrowserHistory({ basename });
+    }
+
+    // If we do not have history available, use redirectTo to do a full page refresh.
+    this.navigate = (url, state) =>
+      // basePath not needed here because `history` is configured with basename
+      this.history ? this.history.push(url, state) : redirectTo(basePath.prepend(url));
     this.mountContext = context.createContextContainer();
 
     return {
-      register: (plugin: symbol, app: App) => {
-        if (this.apps$.value.has(app.id)) {
-          throw new Error(`An application is already registered with the id "${app.id}"`);
-        }
-        if (this.apps$.isStopped) {
+      registerMountContext: this.mountContext!.registerContext,
+      register: (plugin, app) => {
+        app = { appRoute: `/app/${app.id}`, ...app };
+
+        if (this.registrationClosed) {
           throw new Error(`Applications cannot be registered after "setup"`);
+        } else if (this.apps.has(app.id)) {
+          throw new Error(`An application is already registered with the id "${app.id}"`);
+        } else if (findMounter(this.mounters, app.appRoute)) {
+          throw new Error(
+            `An application is already registered with the appRoute "${app.appRoute}"`
+          );
+        } else if (basename && app.appRoute!.startsWith(basename)) {
+          throw new Error('Cannot register an application route that includes HTTP base path');
         }
 
-        let appBox: AppBox;
+        let handler: AppMount;
+
         if (isAppMountDeprecated(app.mount)) {
+          handler = this.mountContext!.createHandler(plugin, app.mount);
           // eslint-disable-next-line no-console
           console.warn(
             `App [${app.id}] is using deprecated mount context. Use core.getStartServices() instead.`
           );
-
-          appBox = {
-            app,
-            mount: this.mountContext!.createHandler(plugin, app.mount),
-          };
         } else {
-          appBox = { app, mount: app.mount };
+          handler = app.mount;
         }
 
-        this.apps$.next(new Map([...this.apps$.value.entries(), [app.id, appBox]]));
+        const mount: AppMounter = async params => {
+          const unmount = await handler(params);
+          this.currentAppId$.next(app.id);
+          return unmount;
+        };
+        this.apps.set(app.id, app);
+        this.mounters.set(app.id, {
+          appRoute: app.appRoute!,
+          appBasePath: basePath.prepend(app.appRoute!),
+          mount,
+          unmountBeforeMounting: false,
+        });
       },
-      registerLegacyApp: (app: LegacyApp) => {
-        if (this.legacyApps$.value.has(app.id)) {
+      registerLegacyApp: app => {
+        const appRoute = `/app/${app.id.split(':')[0]}`;
+
+        if (this.registrationClosed) {
+          throw new Error('Applications cannot be registered after "setup"');
+        } else if (this.legacyApps.has(app.id)) {
           throw new Error(`A legacy application is already registered with the id "${app.id}"`);
-        }
-        if (this.legacyApps$.isStopped) {
-          throw new Error(`Applications cannot be registered after "setup"`);
+        } else if (basename && appRoute!.startsWith(basename)) {
+          throw new Error('Cannot register an application route that includes HTTP base path');
         }
 
-        this.legacyApps$.next(new Map([...this.legacyApps$.value.entries(), [app.id, app]]));
+        const appBasePath = basePath.prepend(appRoute);
+        const mount: LegacyAppMounter = () => redirectTo(appBasePath);
+        this.legacyApps.set(app.id, app);
+        this.mounters.set(app.id, {
+          appRoute,
+          appBasePath,
+          mount,
+          unmountBeforeMounting: true,
+        });
       },
-      registerMountContext: this.mountContext!.registerContext,
     };
   }
 
-  public async start({
-    http,
-    injectedMetadata,
-    redirectTo = (path: string) => (window.location.href = path),
-  }: StartDeps): Promise<InternalApplicationStart> {
+  public async start({ injectedMetadata, http }: StartDeps): Promise<InternalApplicationStart> {
     if (!this.mountContext) {
-      throw new Error(`ApplicationService#setup() must be invoked before start.`);
+      throw new Error('ApplicationService#setup() must be invoked before start.');
     }
 
-    // Disable registration of new applications
-    this.apps$.complete();
-    this.legacyApps$.complete();
-
-    const legacyMode = injectedMetadata.getLegacyMode();
-    const currentAppId$ = new BehaviorSubject<string | undefined>(undefined);
-    const { availableApps, availableLegacyApps, capabilities } = await this.capabilities.start({
+    this.registrationClosed = true;
+    const { capabilities } = await this.capabilities.start({
+      appIds: [...this.mounters.keys()],
       http,
-      apps: new Map([...this.apps$.value].map(([id, { app }]) => [id, app])),
-      legacyApps: this.legacyApps$.value,
     });
-
-    // Only setup history if we're not in legacy mode
-    const history = legacyMode ? null : createBrowserHistory({ basename: http.basePath.get() });
+    const availableMounters = filterAvailable(this.mounters, capabilities);
 
     return {
-      availableApps,
-      availableLegacyApps,
+      availableApps: filterAvailable(this.apps, capabilities),
+      availableLegacyApps: filterAvailable(this.legacyApps, capabilities),
       capabilities,
+      currentAppId$: this.currentAppId$.pipe(takeUntil(this.stop$)),
       registerMountContext: this.mountContext.registerContext,
-      currentAppId$,
-
-      getUrlForApp: (appId, options: { path?: string } = {}) => {
-        return http.basePath.prepend(appPath(appId, options));
-      },
-
+      getUrlForApp: (appId, { path }: { path?: string } = {}) =>
+        getAppUrl(availableMounters, appId, path),
       navigateToApp: (appId, { path, state }: { path?: string; state?: any } = {}) => {
-        if (legacyMode) {
-          // If we're in legacy mode, do a full page refresh to load the NP app.
-          redirectTo(http.basePath.prepend(appPath(appId, { path })));
-        } else {
-          // basePath not needed here because `history` is configured with basename
-          history!.push(appPath(appId, { path }), state);
-        }
-      },
-
-      getComponent: () => {
-        if (legacyMode) {
-          return null;
-        }
-
-        // Filter only available apps and map to just the mount function.
-        const appMounts = new Map<string, AppMount>(
-          [...this.apps$.value]
-            .filter(([id]) => availableApps.has(id))
-            .map(([id, { mount }]) => [id, mount])
-        );
-
-        return (
-          <AppRouter
-            apps={appMounts}
-            legacyApps={availableLegacyApps}
-            basePath={http.basePath}
-            currentAppId$={currentAppId$}
-            history={history!}
-            redirectTo={redirectTo}
-          />
-        );
+        this.navigate!(getAppUrl(availableMounters, appId, path), state);
+        this.currentAppId$.next(appId);
       },
+      getComponent: () =>
+        this.history ? <AppRouter history={this.history} mounters={availableMounters} /> : null,
     };
   }
 
-  public stop() {}
-}
-
-const appPath = (appId: string, { path }: { path?: string } = {}): string =>
-  path
-    ? `/app/${appId}/${path.replace(/^\//, '')}` // Remove preceding slash from path if present
-    : `/app/${appId}`;
-
-function isAppMountDeprecated(mount: (...args: any[]) => any): mount is AppMountDeprecated {
-  // Mount functions with two arguments are assumed to expect deprecated `context` object.
-  return mount.length === 2;
+  public stop() {
+    this.stop$.next();
+    this.currentAppId$.complete();
+  }
 }
diff --git a/src/core/public/application/capabilities/capabilities_service.mock.ts b/src/core/public/application/capabilities/capabilities_service.mock.ts
index 29c3275f0e3b2..54aaa31e08859 100644
--- a/src/core/public/application/capabilities/capabilities_service.mock.ts
+++ b/src/core/public/application/capabilities/capabilities_service.mock.ts
@@ -17,15 +17,9 @@
  * under the License.
  */
 import { CapabilitiesService, CapabilitiesStart } from './capabilities_service';
-import { deepFreeze } from '../../../utils/';
-import { App, LegacyApp } from '../types';
+import { deepFreeze } from '../../../utils';
 
-const createStartContractMock = (
-  apps: ReadonlyMap<string, App> = new Map(),
-  legacyApps: ReadonlyMap<string, LegacyApp> = new Map()
-): jest.Mocked<CapabilitiesStart> => ({
-  availableApps: apps,
-  availableLegacyApps: legacyApps,
+const createStartContractMock = (): jest.Mocked<CapabilitiesStart> => ({
   capabilities: deepFreeze({
     catalogue: {},
     management: {},
@@ -33,11 +27,8 @@ const createStartContractMock = (
   }),
 });
 
-type CapabilitiesServiceContract = PublicMethodsOf<CapabilitiesService>;
-const createMock = (): jest.Mocked<CapabilitiesServiceContract> => ({
-  start: jest
-    .fn()
-    .mockImplementation(({ apps, legacyApps }) => createStartContractMock(apps, legacyApps)),
+const createMock = (): jest.Mocked<PublicMethodsOf<CapabilitiesService>> => ({
+  start: jest.fn().mockImplementation(createStartContractMock),
 });
 
 export const capabilitiesServiceMock = {
diff --git a/src/core/public/application/capabilities/capabilities_service.test.ts b/src/core/public/application/capabilities/capabilities_service.test.ts
index 3245be8dd502d..dfbb449b4d58e 100644
--- a/src/core/public/application/capabilities/capabilities_service.test.ts
+++ b/src/core/public/application/capabilities/capabilities_service.test.ts
@@ -19,7 +19,6 @@
 
 import { httpServiceMock, HttpSetupMock } from '../../http/http_service.mock';
 import { CapabilitiesService } from './capabilities_service';
-import { LegacyApp, App } from '../types';
 
 const mockedCapabilities = {
   catalogue: {},
@@ -42,36 +41,22 @@ describe('#start', () => {
     http.post.mockReturnValue(Promise.resolve(mockedCapabilities));
   });
 
-  const apps = new Map([
-    ['app1', { id: 'app1' }],
-    ['app2', { id: 'app2', capabilities: { app2: { feature: true } } }],
-    ['appMissingInCapabilities', { id: 'appMissingInCapabilities' }],
-  ] as Array<[string, App]>);
-  const legacyApps = new Map([
-    ['legacyApp1', { id: 'legacyApp1' }],
-    ['legacyApp2', { id: 'legacyApp2', capabilities: { app2: { feature: true } } }],
-  ] as Array<[string, LegacyApp]>);
-
-  it('filters available apps based on returned navLinks', async () => {
+  it('only returns capabilities for given appIds', async () => {
     const service = new CapabilitiesService();
-    const startContract = await service.start({ apps, legacyApps, http });
-    expect(startContract.availableApps).toEqual(
-      new Map([
-        ['app1', { id: 'app1' }],
-        ['appMissingInCapabilities', { id: 'appMissingInCapabilities' }],
-      ])
-    );
-    expect(startContract.availableLegacyApps).toEqual(
-      new Map([['legacyApp1', { id: 'legacyApp1' }]])
-    );
+    const { capabilities } = await service.start({
+      http,
+      appIds: ['app1', 'app2', 'legacyApp1', 'legacyApp2'],
+    });
+
+    // @ts-ignore TypeScript knows this shouldn't be possible
+    expect(() => (capabilities.foo = 'foo')).toThrowError();
   });
 
   it('does not allow Capabilities to be modified', async () => {
     const service = new CapabilitiesService();
     const { capabilities } = await service.start({
-      apps,
-      legacyApps,
       http,
+      appIds: ['app1', 'app2', 'legacyApp1', 'legacyApp2'],
     });
 
     // @ts-ignore TypeScript knows this shouldn't be possible
diff --git a/src/core/public/application/capabilities/capabilities_service.tsx b/src/core/public/application/capabilities/capabilities_service.tsx
index 24d9765953c44..05d718e1073df 100644
--- a/src/core/public/application/capabilities/capabilities_service.tsx
+++ b/src/core/public/application/capabilities/capabilities_service.tsx
@@ -19,22 +19,16 @@
 
 import { Capabilities } from '../../../types/capabilities';
 import { deepFreeze, RecursiveReadonly } from '../../../utils';
-import { LegacyApp, App } from '../types';
 import { HttpStart } from '../../http';
 
 interface StartDeps {
-  apps: ReadonlyMap<string, App>;
-  legacyApps: ReadonlyMap<string, LegacyApp>;
+  appIds: string[];
   http: HttpStart;
 }
 
-export { Capabilities };
-
 /** @internal */
 export interface CapabilitiesStart {
   capabilities: RecursiveReadonly<Capabilities>;
-  availableApps: ReadonlyMap<string, App>;
-  availableLegacyApps: ReadonlyMap<string, LegacyApp>;
 }
 
 /**
@@ -42,41 +36,14 @@ export interface CapabilitiesStart {
  * @internal
  */
 export class CapabilitiesService {
-  public async start({ apps, legacyApps, http }: StartDeps): Promise<CapabilitiesStart> {
-    const capabilities = await this.fetchCapabilities(http, [...apps.keys(), ...legacyApps.keys()]);
-
-    const availableApps = new Map(
-      [...apps].filter(
-        ([appId]) =>
-          capabilities.navLinks[appId] === undefined || capabilities.navLinks[appId] === true
-      )
-    );
-
-    const availableLegacyApps = new Map(
-      [...legacyApps].filter(
-        ([appId]) =>
-          capabilities.navLinks[appId] === undefined || capabilities.navLinks[appId] === true
-      )
-    );
+  public async start({ appIds, http }: StartDeps): Promise<CapabilitiesStart> {
+    const route = http.anonymousPaths.isAnonymous(window.location.pathname) ? '/defaults' : '';
+    const capabilities = await http.post<Capabilities>(`/api/core/capabilities${route}`, {
+      body: JSON.stringify({ applications: appIds }),
+    });
 
     return {
-      availableApps,
-      availableLegacyApps,
-      capabilities,
+      capabilities: deepFreeze(capabilities),
     };
   }
-
-  private async fetchCapabilities(http: HttpStart, appIds: string[]): Promise<Capabilities> {
-    const payload = JSON.stringify({
-      applications: appIds,
-    });
-
-    const url = http.anonymousPaths.isAnonymous(window.location.pathname)
-      ? '/api/core/capabilities/defaults'
-      : '/api/core/capabilities';
-    const capabilities = await http.post<Capabilities>(url, {
-      body: payload,
-    });
-    return deepFreeze(capabilities);
-  }
 }
diff --git a/src/core/public/application/capabilities/index.ts b/src/core/public/application/capabilities/index.ts
index 9d8bec955eb97..e4112a55ef6bd 100644
--- a/src/core/public/application/capabilities/index.ts
+++ b/src/core/public/application/capabilities/index.ts
@@ -17,4 +17,5 @@
  * under the License.
  */
 
-export { Capabilities, CapabilitiesService } from './capabilities_service';
+export { Capabilities } from '../../../types/capabilities';
+export { CapabilitiesService } from './capabilities_service';
diff --git a/src/core/public/application/integration_tests/router.test.tsx b/src/core/public/application/integration_tests/router.test.tsx
index 81aef5204c7e2..10544c348afb0 100644
--- a/src/core/public/application/integration_tests/router.test.tsx
+++ b/src/core/public/application/integration_tests/router.test.tsx
@@ -18,107 +18,161 @@
  */
 
 import React from 'react';
-import { mount, ReactWrapper } from 'enzyme';
-import { createMemoryHistory, History } from 'history';
-import { BehaviorSubject } from 'rxjs';
+import { createMemoryHistory, History, createHashHistory } from 'history';
 
-import { I18nProvider } from '@kbn/i18n/react';
-
-import { AppMount, LegacyApp, AppMountParameters } from '../types';
-import { httpServiceMock } from '../../http/http_service.mock';
 import { AppRouter, AppNotFound } from '../ui';
-
-const createMountHandler = (htmlString: string) =>
-  jest.fn(async ({ appBasePath: basename, element: el }: AppMountParameters) => {
-    el.innerHTML = `<div>\nbasename: ${basename}\nhtml: ${htmlString}\n</div>`;
-    return jest.fn(() => (el.innerHTML = ''));
-  });
+import { EitherApp, MockedMounterMap, MockedMounterTuple } from '../test_types';
+import { createRenderer, createAppMounter, createLegacyAppMounter } from './utils';
 
 describe('AppContainer', () => {
-  let apps: Map<string, jest.Mock<ReturnType<AppMount>, Parameters<AppMount>>>;
-  let legacyApps: Map<string, LegacyApp>;
+  let mounters: MockedMounterMap<EitherApp>;
   let history: History;
-  let router: ReactWrapper;
-  let redirectTo: jest.Mock<void, [string]>;
-  let currentAppId$: BehaviorSubject<string | undefined>;
+  let update: ReturnType<typeof createRenderer>;
 
-  const navigate = async (path: string) => {
+  const navigate = (path: string) => {
     history.push(path);
-    router.update();
-    // flushes any pending promises
-    return new Promise(resolve => setImmediate(resolve));
+    return update();
   };
 
+  const mockMountersToMounters = () =>
+    new Map([...mounters].map(([appId, { mounter }]) => [appId, mounter]));
+
   beforeEach(() => {
-    redirectTo = jest.fn();
-    apps = new Map([
-      ['app1', createMountHandler('<span>App 1</span>')],
-      ['app2', createMountHandler('<div>App 2</div>')],
-    ]);
-    legacyApps = new Map([
-      ['legacyApp1', { id: 'legacyApp1' }],
-      ['baseApp:legacyApp2', { id: 'baseApp:legacyApp2' }],
-    ]) as Map<string, LegacyApp>;
+    mounters = new Map([
+      createAppMounter('app1', '<span>App 1</span>'),
+      createLegacyAppMounter('legacyApp1', jest.fn()),
+      createAppMounter('app2', '<div>App 2</div>'),
+      createLegacyAppMounter('baseApp:legacyApp2', jest.fn()),
+      createAppMounter('app3', '<div>App 3</div>', '/custom/path'),
+    ] as Array<MockedMounterTuple<EitherApp>>);
     history = createMemoryHistory();
-    currentAppId$ = new BehaviorSubject<string | undefined>(undefined);
-    // Use 'asdf' as the basepath
-    const http = httpServiceMock.createStartContract({ basePath: '/asdf' });
-    router = mount(
-      <I18nProvider>
-        <AppRouter
-          redirectTo={redirectTo}
-          history={history}
-          apps={apps}
-          legacyApps={legacyApps}
-          basePath={http.basePath}
-          currentAppId$={currentAppId$}
-        />
-      </I18nProvider>
-    );
+    update = createRenderer(<AppRouter history={history} mounters={mockMountersToMounters()} />);
   });
 
-  it('calls mountHandler and returned unmount function when navigating between apps', async () => {
-    await navigate('/app/app1');
-    expect(apps.get('app1')!).toHaveBeenCalled();
-    expect(router.html()).toMatchInlineSnapshot(`
+  it('calls mount handler and returned unmount function when navigating between apps', async () => {
+    const dom1 = await navigate('/app/app1');
+    const app1 = mounters.get('app1')!;
+
+    expect(app1.mounter.mount).toHaveBeenCalled();
+    expect(dom1?.html()).toMatchInlineSnapshot(`
       "<div><div>
-      basename: /asdf/app/app1
+      basename: /app/app1
       html: <span>App 1</span>
       </div></div>"
     `);
 
-    const app1Unmount = await apps.get('app1')!.mock.results[0].value;
-    await navigate('/app/app2');
-    expect(app1Unmount).toHaveBeenCalled();
+    const app1Unmount = await app1.mounter.mount.mock.results[0].value;
+    const dom2 = await navigate('/app/app2');
 
-    expect(apps.get('app2')!).toHaveBeenCalled();
-    expect(router.html()).toMatchInlineSnapshot(`
+    expect(app1Unmount).toHaveBeenCalled();
+    expect(mounters.get('app2')!.mounter.mount).toHaveBeenCalled();
+    expect(dom2?.html()).toMatchInlineSnapshot(`
       "<div><div>
-      basename: /asdf/app/app2
+      basename: /app/app2
       html: <div>App 2</div>
       </div></div>"
     `);
   });
 
-  it('updates currentApp$ after mounting', async () => {
-    await navigate('/app/app1');
-    expect(currentAppId$.value).toEqual('app1');
-    await navigate('/app/app2');
-    expect(currentAppId$.value).toEqual('app2');
+  it('should not mount when partial route path matches', async () => {
+    mounters.set(...createAppMounter('spaces', '<div>Custom Space</div>', '/spaces/fake-login'));
+    mounters.set(...createAppMounter('login', '<div>Login Page</div>', '/fake-login'));
+    history = createMemoryHistory();
+    update = createRenderer(<AppRouter history={history} mounters={mockMountersToMounters()} />);
+
+    await navigate('/fake-login');
+
+    expect(mounters.get('spaces')!.mounter.mount).not.toHaveBeenCalled();
+    expect(mounters.get('login')!.mounter.mount).toHaveBeenCalled();
+  });
+
+  it('should not mount when partial route path has higher specificity', async () => {
+    mounters.set(...createAppMounter('login', '<div>Login Page</div>', '/fake-login'));
+    mounters.set(...createAppMounter('spaces', '<div>Custom Space</div>', '/spaces/fake-login'));
+    history = createMemoryHistory();
+    update = createRenderer(<AppRouter history={history} mounters={mockMountersToMounters()} />);
+
+    await navigate('/spaces/fake-login');
+
+    expect(mounters.get('spaces')!.mounter.mount).toHaveBeenCalled();
+    expect(mounters.get('login')!.mounter.mount).not.toHaveBeenCalled();
   });
 
-  it('sets window.location.href when navigating to legacy apps', async () => {
+  it('should not remount when changing pages within app', async () => {
+    const { mounter, unmount } = mounters.get('app1')!;
+    await navigate('/app/app1/page1');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+
+    // Navigating to page within app does not trigger re-render
+    await navigate('/app/app1/page2');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+    expect(unmount).not.toHaveBeenCalled();
+  });
+
+  it('should not remount when going back within app', async () => {
+    const { mounter, unmount } = mounters.get('app1')!;
+    await navigate('/app/app1/page1');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+
+    // Hitting back button within app does not trigger re-render
+    await navigate('/app/app1/page2');
+    history.goBack();
+    await update();
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+    expect(unmount).not.toHaveBeenCalled();
+  });
+
+  it('should not remount when when changing pages within app using hash history', async () => {
+    history = createHashHistory();
+    update = createRenderer(<AppRouter history={history} mounters={mockMountersToMounters()} />);
+
+    const { mounter, unmount } = mounters.get('app1')!;
+    await navigate('/app/app1/page1');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+
+    // Changing hash history does not trigger re-render
+    await navigate('/app/app1/page2');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+    expect(unmount).not.toHaveBeenCalled();
+  });
+
+  it('should unmount when changing between apps', async () => {
+    const { mounter, unmount } = mounters.get('app1')!;
+    await navigate('/app/app1/page1');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+
+    // Navigating to other app triggers unmount
+    await navigate('/app/app2/page1');
+    expect(unmount).toHaveBeenCalledTimes(1);
+  });
+
+  it('calls legacy mount handler', async () => {
     await navigate('/app/legacyApp1');
-    expect(redirectTo).toHaveBeenCalledWith('/asdf/app/legacyApp1');
+    expect(mounters.get('legacyApp1')!.mounter.mount.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "appBasePath": "/app/legacyApp1",
+          "element": <div />,
+        },
+      ]
+    `);
   });
 
   it('handles legacy apps with subapps', async () => {
     await navigate('/app/baseApp');
-    expect(redirectTo).toHaveBeenCalledWith('/asdf/app/baseApp');
+    expect(mounters.get('baseApp:legacyApp2')!.mounter.mount.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "appBasePath": "/app/baseApp",
+          "element": <div />,
+        },
+      ]
+    `);
   });
 
   it('displays error page if no app is found', async () => {
-    await navigate('/app/unknown');
-    expect(router.exists(AppNotFound)).toBe(true);
+    const dom = await navigate('/app/unknown');
+
+    expect(dom?.exists(AppNotFound)).toBe(true);
   });
 });
diff --git a/src/core/public/application/integration_tests/utils.tsx b/src/core/public/application/integration_tests/utils.tsx
new file mode 100644
index 0000000000000..6367d1fa12697
--- /dev/null
+++ b/src/core/public/application/integration_tests/utils.tsx
@@ -0,0 +1,82 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { ReactElement } from 'react';
+import { mount } from 'enzyme';
+
+import { I18nProvider } from '@kbn/i18n/react';
+
+import { App, LegacyApp, AppMountParameters } from '../types';
+import { MockedMounter, MockedMounterTuple } from '../test_types';
+
+type Dom = ReturnType<typeof mount> | null;
+type Renderer = () => Dom | Promise<Dom>;
+
+export const createRenderer = (element: ReactElement | null): Renderer => {
+  const dom: Dom = element && mount(<I18nProvider>{element}</I18nProvider>);
+
+  return () =>
+    new Promise(async resolve => {
+      if (dom) {
+        dom.update();
+      }
+      setImmediate(() => resolve(dom)); // flushes any pending promises
+    });
+};
+
+export const createAppMounter = (
+  appId: string,
+  html: string,
+  appRoute = `/app/${appId}`
+): MockedMounterTuple<App> => {
+  const unmount = jest.fn();
+  return [
+    appId,
+    {
+      mounter: {
+        appRoute,
+        appBasePath: appRoute,
+        mount: jest.fn(async ({ appBasePath: basename, element }: AppMountParameters) => {
+          Object.assign(element, {
+            innerHTML: `<div>\nbasename: ${basename}\nhtml: ${html}\n</div>`,
+          });
+          unmount.mockImplementation(() => Object.assign(element, { innerHTML: '' }));
+          return unmount;
+        }),
+      },
+      unmount,
+    },
+  ];
+};
+
+export const createLegacyAppMounter = (
+  appId: string,
+  legacyMount: MockedMounter<LegacyApp>['mount']
+): MockedMounterTuple<LegacyApp> => [
+  appId,
+  {
+    mounter: {
+      appRoute: `/app/${appId.split(':')[0]}`,
+      appBasePath: `/app/${appId.split(':')[0]}`,
+      unmountBeforeMounting: true,
+      mount: legacyMount,
+    },
+    unmount: jest.fn(),
+  },
+];
diff --git a/src/core/public/application/test_types.ts b/src/core/public/application/test_types.ts
new file mode 100644
index 0000000000000..3d992cb950eb4
--- /dev/null
+++ b/src/core/public/application/test_types.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 { App, LegacyApp, Mounter, AppUnmount } from './types';
+import { ApplicationService } from './application_service';
+
+/** @internal */
+export type ApplicationServiceContract = PublicMethodsOf<ApplicationService>;
+/** @internal */
+export type EitherApp = App | LegacyApp;
+/** @internal */
+export type MockedUnmount = jest.Mocked<AppUnmount>;
+/** @internal */
+export type MockedMounter<T extends EitherApp> = jest.Mocked<Mounter<jest.Mocked<T>>>;
+/** @internal */
+export type MockedMounterTuple<T extends EitherApp> = [
+  string,
+  { mounter: MockedMounter<T>; unmount: MockedUnmount }
+];
+/** @internal */
+export type MockedMounterMap<T extends EitherApp> = Map<
+  string,
+  { mounter: MockedMounter<T>; unmount: MockedUnmount }
+>;
+/** @internal */
+export type MockLifecycle<
+  T extends keyof ApplicationService,
+  U = Parameters<ApplicationService[T]>[0]
+> = { [P in keyof U]: jest.Mocked<U[P]> };
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index fd009066fc664..c026851af7eb8 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Observable, Subject } from 'rxjs';
+import { Observable } from 'rxjs';
 
 import { Capabilities } from './capabilities';
 import { ChromeStart } from '../chrome';
@@ -89,6 +89,13 @@ export interface App extends AppBase {
    * Takes precedence over chrome service visibility settings.
    */
   chromeless?: boolean;
+
+  /**
+   * Override the application's routing path from `/app/${id}`.
+   * Must be unique across registered applications. Should not include the
+   * base path from HTTP.
+   */
+  appRoute?: string;
 }
 
 /** @internal */
@@ -177,7 +184,8 @@ export interface AppMountParameters {
   element: HTMLElement;
 
   /**
-   * The base path for configuring the application's router.
+   * The route path for configuring navigation to the application.
+   * This string should not include the base path from HTTP.
    *
    * @example
    *
@@ -189,6 +197,7 @@ export interface AppMountParameters {
    *   setup({ application }) {
    *     application.register({
    *      id: 'my-app',
+   *      appRoute: '/my-app',
    *      async mount(params) {
    *        const { renderApp } = await import('./application');
    *        return renderApp(params);
@@ -229,6 +238,23 @@ export interface AppMountParameters {
  */
 export type AppUnmount = () => void;
 
+/** @internal */
+export type AppMounter = (params: AppMountParameters) => Promise<AppUnmount>;
+
+/** @internal */
+export type LegacyAppMounter = (params: AppMountParameters) => void;
+
+/** @internal */
+export type Mounter<T = App | LegacyApp> = SelectivePartial<
+  {
+    appRoute: string;
+    appBasePath: string;
+    mount: T extends LegacyApp ? LegacyAppMounter : AppMounter;
+    unmountBeforeMounting: T extends LegacyApp ? true : boolean;
+  },
+  T extends LegacyApp ? never : 'unmountBeforeMounting'
+>;
+
 /** @public */
 export interface ApplicationSetup {
   /**
@@ -352,6 +378,12 @@ export interface InternalApplicationStart
   ): void;
 
   // Internal APIs
-  currentAppId$: Subject<string | undefined>;
+  currentAppId$: Observable<string | undefined>;
   getComponent(): JSX.Element | null;
 }
+
+/** @internal */
+type SelectivePartial<T, K extends keyof T> = Partial<Pick<T, K>> &
+  Required<Pick<T, Exclude<keyof T, K>>> extends infer U
+  ? { [P in keyof U]: U[P] }
+  : never;
diff --git a/src/core/public/application/ui/app_container.tsx b/src/core/public/application/ui/app_container.tsx
index 9c2bb30e79503..153582e805fa1 100644
--- a/src/core/public/application/ui/app_container.tsx
+++ b/src/core/public/application/ui/app_container.tsx
@@ -17,95 +17,60 @@
  * under the License.
  */
 
-import React from 'react';
-import { RouteComponentProps } from 'react-router-dom';
-import { Subject } from 'rxjs';
-
-import { LegacyApp, AppMount, AppUnmount } from '../types';
-import { HttpStart } from '../../http';
+import React, {
+  Fragment,
+  FunctionComponent,
+  useLayoutEffect,
+  useRef,
+  useState,
+  MutableRefObject,
+} from 'react';
+
+import { AppUnmount, Mounter } from '../types';
 import { AppNotFound } from './app_not_found_screen';
 
-interface Props extends RouteComponentProps<{ appId: string }> {
-  apps: ReadonlyMap<string, AppMount>;
-  legacyApps: ReadonlyMap<string, LegacyApp>;
-  basePath: HttpStart['basePath'];
-  currentAppId$: Subject<string | undefined>;
-  /**
-   * Only necessary for redirecting to legacy apps
-   * @deprecated
-   */
-  redirectTo: (path: string) => void;
-}
-
-interface State {
-  appNotFound: boolean;
-}
-
-export class AppContainer extends React.Component<Props, State> {
-  private readonly containerDiv = React.createRef<HTMLDivElement>();
-  private unmountFunc?: AppUnmount;
-
-  state: State = { appNotFound: false };
-
-  componentDidMount() {
-    this.mountApp();
-  }
-
-  componentWillUnmount() {
-    this.unmountApp();
-  }
-
-  componentDidUpdate(prevProps: Props) {
-    if (prevProps.match.params.appId !== this.props.match.params.appId) {
-      this.unmountApp();
-      this.mountApp();
-    }
-  }
-
-  async mountApp() {
-    const { apps, legacyApps, match, basePath, currentAppId$, redirectTo } = this.props;
-    const { appId } = match.params;
-
-    const mount = apps.get(appId);
-    if (mount) {
-      this.unmountFunc = await mount({
-        appBasePath: basePath.prepend(`/app/${appId}`),
-        element: this.containerDiv.current!,
-      });
-      currentAppId$.next(appId);
-      this.setState({ appNotFound: false });
-      return;
-    }
-
-    const legacyApp = findLegacyApp(appId, legacyApps);
-    if (legacyApp) {
-      this.unmountApp();
-      redirectTo(basePath.prepend(`/app/${appId}`));
-      this.setState({ appNotFound: false });
-      return;
-    }
-
-    this.setState({ appNotFound: true });
-  }
-
-  async unmountApp() {
-    if (this.unmountFunc) {
-      this.unmountFunc();
-      this.unmountFunc = undefined;
-    }
-  }
-
-  render() {
-    return (
-      <React.Fragment>
-        {this.state.appNotFound && <AppNotFound />}
-        <div key={this.props.match.params.appId} ref={this.containerDiv} />
-      </React.Fragment>
-    );
-  }
+interface Props {
+  appId: string;
+  mounter?: Mounter;
 }
 
-function findLegacyApp(appId: string, apps: ReadonlyMap<string, LegacyApp>) {
-  const matchingApps = [...apps.entries()].filter(([id]) => id.split(':')[0] === appId);
-  return matchingApps.length ? matchingApps[0][1] : null;
-}
+export const AppContainer: FunctionComponent<Props> = ({ mounter, appId }: Props) => {
+  const [appNotFound, setAppNotFound] = useState(false);
+  const elementRef = useRef<HTMLDivElement>(null);
+  const unmountRef: MutableRefObject<AppUnmount | null> = useRef<AppUnmount>(null);
+
+  useLayoutEffect(() => {
+    const unmount = () => {
+      if (unmountRef.current) {
+        unmountRef.current();
+        unmountRef.current = null;
+      }
+    };
+    const mount = async () => {
+      if (!mounter) {
+        return setAppNotFound(true);
+      }
+
+      if (mounter.unmountBeforeMounting) {
+        unmount();
+      }
+
+      unmountRef.current =
+        (await mounter.mount({
+          appBasePath: mounter.appBasePath,
+          element: elementRef.current!,
+        })) || null;
+      setAppNotFound(false);
+    };
+
+    mount();
+    return unmount;
+  }, [mounter]);
+
+  return (
+    <Fragment>
+      {appNotFound && <AppNotFound />}
+      <div key={appId} ref={elementRef} />
+    </Fragment>
+  );
+};
diff --git a/src/core/public/application/ui/app_router.tsx b/src/core/public/application/ui/app_router.tsx
index 67701a33dabf4..8db46f9794277 100644
--- a/src/core/public/application/ui/app_router.tsx
+++ b/src/core/public/application/ui/app_router.tsx
@@ -17,37 +17,53 @@
  * under the License.
  */
 
+import React, { FunctionComponent } from 'react';
 import { History } from 'history';
-import React from 'react';
-import { Router, Route } from 'react-router-dom';
-import { Subject } from 'rxjs';
+import { Router, Route, RouteComponentProps, Switch } from 'react-router-dom';
 
-import { LegacyApp, AppMount } from '../types';
+import { Mounter } from '../types';
 import { AppContainer } from './app_container';
-import { HttpStart } from '../../http';
 
 interface Props {
-  apps: ReadonlyMap<string, AppMount>;
-  legacyApps: ReadonlyMap<string, LegacyApp>;
-  basePath: HttpStart['basePath'];
-  currentAppId$: Subject<string | undefined>;
+  mounters: Map<string, Mounter>;
   history: History;
-  /**
-   * Only necessary for redirecting to legacy apps
-   * @deprecated
-   */
-  redirectTo?: (path: string) => void;
 }
 
-export const AppRouter: React.FunctionComponent<Props> = ({
-  history,
-  redirectTo = (path: string) => (window.location.href = path),
-  ...otherProps
-}) => (
+interface Params {
+  appId: string;
+}
+
+export const AppRouter: FunctionComponent<Props> = ({ history, mounters }) => (
   <Router history={history}>
-    <Route
-      path="/app/:appId"
-      render={props => <AppContainer redirectTo={redirectTo} {...otherProps} {...props} />}
-    />
+    <Switch>
+      {[...mounters].flatMap(([appId, mounter]) =>
+        // Remove /app paths from the routes as they will be handled by the
+        // "named" route parameter `:appId` below
+        mounter.appBasePath.startsWith('/app')
+          ? []
+          : [
+              <Route
+                key={mounter.appRoute}
+                path={mounter.appRoute}
+                render={() => <AppContainer mounter={mounter} appId={appId} />}
+              />,
+            ]
+      )}
+      <Route
+        path="/app/:appId"
+        render={({
+          match: {
+            params: { appId },
+          },
+        }: RouteComponentProps<Params>) => {
+          // Find the mounter including legacy mounters with subapps:
+          const [id, mounter] = mounters.has(appId)
+            ? [appId, mounters.get(appId)]
+            : [...mounters].filter(([key]) => key.split(':')[0] === appId)[0] ?? [];
+
+          return <AppContainer mounter={mounter} appId={id} />;
+        }}
+      />
+    </Switch>
   </Router>
 );
diff --git a/src/core/public/chrome/chrome_service.test.ts b/src/core/public/chrome/chrome_service.test.ts
index 9656739421686..d9c35b20db03b 100644
--- a/src/core/public/chrome/chrome_service.test.ts
+++ b/src/core/public/chrome/chrome_service.test.ts
@@ -211,14 +211,14 @@ describe('start', () => {
         new FakeApp('beta', true),
         new FakeApp('gamma', false),
       ]);
-      const { availableApps, currentAppId$ } = startDeps.application;
+      const { availableApps, navigateToApp } = startDeps.application;
       const { chrome, service } = await start({ startDeps });
       const promise = chrome
         .getIsVisible$()
         .pipe(toArray())
         .toPromise();
 
-      [...availableApps.keys()].forEach(appId => currentAppId$.next(appId));
+      [...availableApps.keys()].forEach(appId => navigateToApp(appId));
       service.stop();
 
       await expect(promise).resolves.toMatchInlineSnapshot(`
@@ -233,14 +233,14 @@ describe('start', () => {
 
     it('changing visibility has no effect on chrome-hiding application', async () => {
       const startDeps = defaultStartDeps([new FakeApp('alpha', true)]);
-      const { currentAppId$ } = startDeps.application;
+      const { navigateToApp } = startDeps.application;
       const { chrome, service } = await start({ startDeps });
       const promise = chrome
         .getIsVisible$()
         .pipe(toArray())
         .toPromise();
 
-      currentAppId$.next('alpha');
+      navigateToApp('alpha');
       chrome.setIsVisible(true);
       service.stop();
 
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index 25c00836a4db7..18c0c9870d72f 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -127,7 +127,7 @@ export class ChromeService {
       )
     );
     this.isVisible$ = combineLatest(this.appHidden$, this.toggleHidden$).pipe(
-      map(([appHidden, chromeHidden]) => !(appHidden || chromeHidden)),
+      map(([appHidden, toggleHidden]) => !(appHidden || toggleHidden)),
       takeUntil(this.stop$)
     );
   }
diff --git a/src/core/public/core_system.ts b/src/core/public/core_system.ts
index abc4c144356e8..485c11aae6508 100644
--- a/src/core/public/core_system.ts
+++ b/src/core/public/core_system.ts
@@ -174,7 +174,7 @@ export class CoreSystem {
           [this.legacy.legacyId, [...pluginDependencies.keys()]],
         ]),
       });
-      const application = this.application.setup({ context });
+      const application = this.application.setup({ context, http, injectedMetadata });
 
       const core: InternalCoreSetup = {
         application,
@@ -211,7 +211,7 @@ export class CoreSystem {
       const injectedMetadata = await this.injectedMetadata.start();
       const uiSettings = await this.uiSettings.start();
       const docLinks = await this.docLinks.start({ injectedMetadata });
-      const http = await this.http.start({ injectedMetadata, fatalErrors: this.fatalErrorsSetup });
+      const http = await this.http.start({ injectedMetadata, fatalErrors: this.fatalErrorsSetup! });
       const savedObjects = await this.savedObjects.start({ http });
       const i18n = await this.i18n.start();
       const application = await this.application.start({ http, injectedMetadata });
@@ -307,6 +307,7 @@ export class CoreSystem {
     this.uiSettings.stop();
     this.chrome.stop();
     this.i18n.stop();
+    this.application.stop();
     this.rootDomElement.textContent = '';
   }
 }
diff --git a/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap b/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap
index 08b72c35ee2d3..b9a4f775c2b56 100644
--- a/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap
+++ b/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap
@@ -2,20 +2,15 @@
 
 exports[`rendering render matches snapshot 1`] = `
 <EuiPage
-  restrictWidth={false}
   style={
     Object {
       "minHeight": "100vh",
     }
   }
 >
-  <EuiPageBody
-    component="main"
-    restrictWidth={false}
-  >
+  <EuiPageBody>
     <EuiPageContent
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <EuiEmptyPrompt
diff --git a/src/core/public/http/__snapshots__/http_service.test.ts.snap b/src/core/public/http/__snapshots__/http_service.test.ts.snap
deleted file mode 100644
index 3d0309476365d..0000000000000
--- a/src/core/public/http/__snapshots__/http_service.test.ts.snap
+++ /dev/null
@@ -1,38 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`addLoadingCount() adds a fatal error if source observable emits a negative number 1`] = `
-Array [
-  Array [
-    [Error: Observables passed to loadingCount.add() must only emit positive numbers],
-  ],
-]
-`;
-
-exports[`addLoadingCount() adds a fatal error if source observables emit an error 1`] = `
-Array [
-  Array [
-    [Error: foo bar],
-  ],
-]
-`;
-
-exports[`getLoadingCount$() emits 0 initially, the right count when sources emit their own count, and ends with zero 1`] = `
-Array [
-  0,
-  100,
-  110,
-  111,
-  11,
-  21,
-  20,
-  0,
-]
-`;
-
-exports[`getLoadingCount$() only emits when loading count changes 1`] = `
-Array [
-  0,
-  1,
-  0,
-]
-`;
diff --git a/src/core/public/http/anonymous_paths.test.ts b/src/core/public/http/anonymous_paths.test.ts
deleted file mode 100644
index bf9212f625f1e..0000000000000
--- a/src/core/public/http/anonymous_paths.test.ts
+++ /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 { 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
deleted file mode 100644
index 300c4d64df353..0000000000000
--- a/src/core/public/http/anonymous_paths.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 { 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/anonymous_paths_service.test.ts b/src/core/public/http/anonymous_paths_service.test.ts
new file mode 100644
index 0000000000000..515715d9a613d
--- /dev/null
+++ b/src/core/public/http/anonymous_paths_service.test.ts
@@ -0,0 +1,109 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { AnonymousPathsService } from './anonymous_paths_service';
+import { BasePath } from './base_path';
+
+describe('#setup()', () => {
+  describe('#register', () => {
+    it(`allows paths that don't start with /`, () => {
+      const basePath = new BasePath('/foo');
+      const anonymousPaths = new AnonymousPathsService().setup({ basePath });
+      anonymousPaths.register('bar');
+    });
+
+    it(`allows paths that end with '/'`, () => {
+      const basePath = new BasePath('/foo');
+      const anonymousPaths = new AnonymousPathsService().setup({ basePath });
+      anonymousPaths.register('/bar/');
+    });
+  });
+
+  describe('#isAnonymous', () => {
+    it('returns true for registered paths', () => {
+      const basePath = new BasePath('/foo');
+      const anonymousPaths = new AnonymousPathsService().setup({ 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 AnonymousPathsService().setup({ 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 AnonymousPathsService().setup({ 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 AnonymousPathsService().setup({ 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 AnonymousPathsService().setup({ 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 AnonymousPathsService().setup({ 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 AnonymousPathsService().setup({ 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 AnonymousPathsService().setup({ 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 AnonymousPathsService().setup({ 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 AnonymousPathsService().setup({ basePath });
+      anonymousPaths.register('/bar');
+      expect(anonymousPaths.isAnonymous('/foo/bar/baz')).toBe(false);
+    });
+  });
+});
diff --git a/src/core/public/http/anonymous_paths_service.ts b/src/core/public/http/anonymous_paths_service.ts
new file mode 100644
index 0000000000000..ee9b3578c0270
--- /dev/null
+++ b/src/core/public/http/anonymous_paths_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 { IAnonymousPaths, IBasePath } from 'src/core/public';
+import { CoreService } from '../../types';
+
+interface Deps {
+  basePath: IBasePath;
+}
+
+export class AnonymousPathsService implements CoreService<IAnonymousPaths, IAnonymousPaths> {
+  private readonly paths = new Set<string>();
+
+  public setup({ basePath }: Deps) {
+    return {
+      isAnonymous: (path: string): boolean => {
+        const pathWithoutBasePath = basePath.remove(path);
+        return this.paths.has(normalizePath(pathWithoutBasePath));
+      },
+
+      register: (path: string) => {
+        this.paths.add(normalizePath(path));
+      },
+
+      normalizePath,
+    };
+  }
+
+  public start(deps: Deps) {
+    return this.setup(deps);
+  }
+
+  public stop() {}
+}
+
+const 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/base_path.test.ts b/src/core/public/http/base_path.test.ts
new file mode 100644
index 0000000000000..63b7fa61cee84
--- /dev/null
+++ b/src/core/public/http/base_path.test.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 { BasePath } from './base_path';
+
+describe('BasePath', () => {
+  describe('#get()', () => {
+    it('returns an empty string if no basePath not provided', () => {
+      expect(new BasePath().get()).toBe('');
+    });
+
+    it('returns basePath value if provided', () => {
+      expect(new BasePath('/foo').get()).toBe('/foo');
+    });
+
+    describe('#prepend()', () => {
+      it('adds the base path to the path if it is relative and starts with a slash', () => {
+        const basePath = new BasePath('/foo/bar');
+
+        expect(basePath.prepend('/a/b')).toBe('/foo/bar/a/b');
+      });
+
+      it('leaves the query string and hash of path unchanged', () => {
+        const basePath = new BasePath('/foo/bar');
+
+        expect(basePath.prepend('/a/b?x=y#c/d/e')).toBe('/foo/bar/a/b?x=y#c/d/e');
+      });
+
+      it('returns the path unchanged if it does not start with a slash', () => {
+        const basePath = new BasePath('/foo/bar');
+
+        expect(basePath.prepend('a/b')).toBe('a/b');
+      });
+
+      it('returns the path unchanged it it has a hostname', () => {
+        const basePath = new BasePath('/foo/bar');
+
+        expect(basePath.prepend('http://localhost:5601/a/b')).toBe('http://localhost:5601/a/b');
+      });
+    });
+
+    describe('#remove()', () => {
+      it('removes the basePath if relative path starts with it', () => {
+        const basePath = new BasePath('/foo/bar');
+
+        expect(basePath.remove('/foo/bar/a/b')).toBe('/a/b');
+      });
+
+      it('leaves query string and hash intact', () => {
+        const basePath = new BasePath('/foo/bar');
+
+        expect(basePath.remove('/foo/bar/a/b?c=y#1234')).toBe('/a/b?c=y#1234');
+      });
+
+      it('ignores urls with hostnames', () => {
+        const basePath = new BasePath('/foo/bar');
+
+        expect(basePath.remove('http://localhost:5601/foo/bar/a/b')).toBe(
+          'http://localhost:5601/foo/bar/a/b'
+        );
+      });
+
+      it('returns slash if path is just basePath', () => {
+        const basePath = new BasePath('/foo/bar');
+
+        expect(basePath.remove('/foo/bar')).toBe('/');
+      });
+
+      it('returns full path if basePath is not its own segment', () => {
+        const basePath = new BasePath('/foo/bar');
+
+        expect(basePath.remove('/foo/barhop')).toBe('/foo/barhop');
+      });
+    });
+  });
+});
diff --git a/src/core/public/http/base_path_service.ts b/src/core/public/http/base_path.ts
similarity index 100%
rename from src/core/public/http/base_path_service.ts
rename to src/core/public/http/base_path.ts
diff --git a/src/core/public/http/base_path_service.test.ts b/src/core/public/http/base_path_service.test.ts
deleted file mode 100644
index 65403c906e614..0000000000000
--- a/src/core/public/http/base_path_service.test.ts
+++ /dev/null
@@ -1,91 +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 { BasePath } from './base_path_service';
-
-describe('BasePath', () => {
-  describe('#get()', () => {
-    it('returns an empty string if no basePath not provided', () => {
-      expect(new BasePath().get()).toBe('');
-    });
-
-    it('returns basePath value if provided', () => {
-      expect(new BasePath('/foo').get()).toBe('/foo');
-    });
-
-    describe('#prepend()', () => {
-      it('adds the base path to the path if it is relative and starts with a slash', () => {
-        const basePath = new BasePath('/foo/bar');
-
-        expect(basePath.prepend('/a/b')).toBe('/foo/bar/a/b');
-      });
-
-      it('leaves the query string and hash of path unchanged', () => {
-        const basePath = new BasePath('/foo/bar');
-
-        expect(basePath.prepend('/a/b?x=y#c/d/e')).toBe('/foo/bar/a/b?x=y#c/d/e');
-      });
-
-      it('returns the path unchanged if it does not start with a slash', () => {
-        const basePath = new BasePath('/foo/bar');
-
-        expect(basePath.prepend('a/b')).toBe('a/b');
-      });
-
-      it('returns the path unchanged it it has a hostname', () => {
-        const basePath = new BasePath('/foo/bar');
-
-        expect(basePath.prepend('http://localhost:5601/a/b')).toBe('http://localhost:5601/a/b');
-      });
-    });
-
-    describe('#remove()', () => {
-      it('removes the basePath if relative path starts with it', () => {
-        const basePath = new BasePath('/foo/bar');
-
-        expect(basePath.remove('/foo/bar/a/b')).toBe('/a/b');
-      });
-
-      it('leaves query string and hash intact', () => {
-        const basePath = new BasePath('/foo/bar');
-
-        expect(basePath.remove('/foo/bar/a/b?c=y#1234')).toBe('/a/b?c=y#1234');
-      });
-
-      it('ignores urls with hostnames', () => {
-        const basePath = new BasePath('/foo/bar');
-
-        expect(basePath.remove('http://localhost:5601/foo/bar/a/b')).toBe(
-          'http://localhost:5601/foo/bar/a/b'
-        );
-      });
-
-      it('returns slash if path is just basePath', () => {
-        const basePath = new BasePath('/foo/bar');
-
-        expect(basePath.remove('/foo/bar')).toBe('/');
-      });
-
-      it('returns full path if basePath is not its own segment', () => {
-        const basePath = new BasePath('/foo/bar');
-
-        expect(basePath.remove('/foo/barhop')).toBe('/foo/barhop');
-      });
-    });
-  });
-});
diff --git a/src/core/public/http/fetch.test.ts b/src/core/public/http/fetch.test.ts
new file mode 100644
index 0000000000000..adb3d696a962f
--- /dev/null
+++ b/src/core/public/http/fetch.test.ts
@@ -0,0 +1,569 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 fetchMock from 'fetch-mock/es5/client';
+import { readFileSync } from 'fs';
+import { join } from 'path';
+
+import { Fetch } from './fetch';
+import { BasePath } from './base_path';
+import { IHttpResponse } from './types';
+
+function delay<T>(duration: number) {
+  return new Promise<T>(r => setTimeout(r, duration));
+}
+
+describe('Fetch', () => {
+  const fetchInstance = new Fetch({
+    basePath: new BasePath('http://localhost/myBase'),
+    kibanaVersion: 'VERSION',
+  });
+  afterEach(() => {
+    fetchMock.restore();
+  });
+
+  describe('http requests', () => {
+    it('should use supplied request method', async () => {
+      fetchMock.post('*', {});
+      await fetchInstance.fetch('/my/path', { method: 'POST' });
+
+      expect(fetchMock.lastOptions()!.method).toBe('POST');
+    });
+
+    it('should use supplied Content-Type', async () => {
+      fetchMock.get('*', {});
+      await fetchInstance.fetch('/my/path', { headers: { 'Content-Type': 'CustomContentType' } });
+
+      expect(fetchMock.lastOptions()!.headers).toMatchObject({
+        'content-type': 'CustomContentType',
+      });
+    });
+
+    it('should use supplied pathname and querystring', async () => {
+      fetchMock.get('*', {});
+      await fetchInstance.fetch('/my/path', { query: { a: 'b' } });
+
+      expect(fetchMock.lastUrl()).toBe('http://localhost/myBase/my/path?a=b');
+    });
+
+    it('should use supplied headers', async () => {
+      fetchMock.get('*', {});
+      await fetchInstance.fetch('/my/path', {
+        headers: { myHeader: 'foo' },
+      });
+
+      expect(fetchMock.lastOptions()!.headers).toEqual({
+        'content-type': 'application/json',
+        'kbn-version': 'VERSION',
+        myheader: 'foo',
+      });
+    });
+
+    it('should return response', async () => {
+      fetchMock.get('*', { foo: 'bar' });
+      const json = await fetchInstance.fetch('/my/path');
+      expect(json).toEqual({ foo: 'bar' });
+    });
+
+    it('should prepend url with basepath by default', async () => {
+      fetchMock.get('*', {});
+      await fetchInstance.fetch('/my/path');
+      expect(fetchMock.lastUrl()).toBe('http://localhost/myBase/my/path');
+    });
+
+    it('should not prepend url with basepath when disabled', async () => {
+      fetchMock.get('*', {});
+      await fetchInstance.fetch('my/path', { prependBasePath: false });
+      expect(fetchMock.lastUrl()).toBe('/my/path');
+    });
+
+    it('should not include undefined query params', async () => {
+      fetchMock.get('*', {});
+      await fetchInstance.fetch('/my/path', { query: { a: undefined } });
+      expect(fetchMock.lastUrl()).toBe('http://localhost/myBase/my/path');
+    });
+
+    it('should make request with defaults', async () => {
+      fetchMock.get('*', {});
+      await fetchInstance.fetch('/my/path');
+
+      const lastCall = fetchMock.lastCall();
+
+      expect(lastCall!.request.credentials).toBe('same-origin');
+      expect(lastCall![1]).toMatchObject({
+        method: 'GET',
+        headers: {
+          'content-type': 'application/json',
+          'kbn-version': 'VERSION',
+        },
+      });
+    });
+
+    it('should expose detailed response object when asResponse = true', async () => {
+      fetchMock.get('*', { foo: 'bar' });
+
+      const response = await fetchInstance.fetch('/my/path', { asResponse: true });
+
+      expect(response.request).toBeInstanceOf(Request);
+      expect(response.response).toBeInstanceOf(Response);
+      expect(response.body).toEqual({ foo: 'bar' });
+    });
+
+    it('should reject on network error', async () => {
+      expect.assertions(1);
+      fetchMock.get('*', { status: 500 });
+
+      await expect(fetchInstance.fetch('/my/path')).rejects.toThrow(/Internal Server Error/);
+    });
+
+    it('should contain error message when throwing response', async () => {
+      fetchMock.get('*', { status: 404, body: { foo: 'bar' } });
+
+      await expect(fetchInstance.fetch('/my/path')).rejects.toMatchObject({
+        message: 'Not Found',
+        body: {
+          foo: 'bar',
+        },
+        response: {
+          status: 404,
+          url: 'http://localhost/myBase/my/path',
+        },
+      });
+    });
+
+    it('should support get() helper', async () => {
+      fetchMock.get('*', {});
+      await fetchInstance.get('/my/path', { method: 'POST' });
+
+      expect(fetchMock.lastOptions()!.method).toBe('GET');
+    });
+
+    it('should support head() helper', async () => {
+      fetchMock.head('*', {});
+      await fetchInstance.head('/my/path', { method: 'GET' });
+
+      expect(fetchMock.lastOptions()!.method).toBe('HEAD');
+    });
+
+    it('should support post() helper', async () => {
+      fetchMock.post('*', {});
+      await fetchInstance.post('/my/path', { method: 'GET', body: '{}' });
+
+      expect(fetchMock.lastOptions()!.method).toBe('POST');
+    });
+
+    it('should support put() helper', async () => {
+      fetchMock.put('*', {});
+      await fetchInstance.put('/my/path', { method: 'GET', body: '{}' });
+
+      expect(fetchMock.lastOptions()!.method).toBe('PUT');
+    });
+
+    it('should support patch() helper', async () => {
+      fetchMock.patch('*', {});
+      await fetchInstance.patch('/my/path', { method: 'GET', body: '{}' });
+
+      expect(fetchMock.lastOptions()!.method).toBe('PATCH');
+    });
+
+    it('should support delete() helper', async () => {
+      fetchMock.delete('*', {});
+      await fetchInstance.delete('/my/path', { method: 'GET' });
+
+      expect(fetchMock.lastOptions()!.method).toBe('DELETE');
+    });
+
+    it('should support options() helper', async () => {
+      fetchMock.mock('*', { method: 'OPTIONS' });
+      await fetchInstance.options('/my/path', { method: 'GET' });
+
+      expect(fetchMock.lastOptions()!.method).toBe('OPTIONS');
+    });
+
+    it('should make requests for NDJSON content', async () => {
+      const content = readFileSync(join(__dirname, '_import_objects.ndjson'), {
+        encoding: 'utf-8',
+      });
+      const body = new FormData();
+
+      body.append('file', content);
+      fetchMock.post('*', {
+        body: content,
+        headers: { 'Content-Type': 'application/ndjson' },
+      });
+
+      const data = await fetchInstance.post('/my/path', {
+        body,
+        headers: {
+          'Content-Type': undefined,
+        },
+      });
+
+      expect(data).toBeInstanceOf(Blob);
+
+      const ndjson = await new Response(data).text();
+
+      expect(ndjson).toEqual(content);
+    });
+  });
+
+  describe('interception', () => {
+    beforeEach(async () => {
+      fetchMock.get('*', { foo: 'bar' });
+    });
+
+    afterEach(() => {
+      fetchMock.restore();
+      fetchInstance.removeAllInterceptors();
+    });
+
+    it('should make request and receive response', async () => {
+      fetchInstance.intercept({});
+
+      const body = await fetchInstance.fetch('/my/path');
+
+      expect(fetchMock.called()).toBe(true);
+      expect(body).toEqual({ foo: 'bar' });
+    });
+
+    it('should be able to manipulate request instance', async () => {
+      fetchInstance.intercept({
+        request(request) {
+          request.headers.set('Content-Type', 'CustomContentType');
+        },
+      });
+      fetchInstance.intercept({
+        request(request) {
+          return new Request('/my/route', request);
+        },
+      });
+
+      const body = await fetchInstance.fetch('/my/path');
+
+      expect(fetchMock.called()).toBe(true);
+      expect(body).toEqual({ foo: 'bar' });
+      expect(fetchMock.lastOptions()!.headers).toMatchObject({
+        'content-type': 'CustomContentType',
+      });
+      expect(fetchMock.lastUrl()).toBe('/my/route');
+    });
+
+    it('should call interceptors in correct order', async () => {
+      const order: string[] = [];
+
+      fetchInstance.intercept({
+        request() {
+          order.push('Request 1');
+        },
+        response() {
+          order.push('Response 1');
+        },
+      });
+      fetchInstance.intercept({
+        request() {
+          order.push('Request 2');
+        },
+        response() {
+          order.push('Response 2');
+        },
+      });
+      fetchInstance.intercept({
+        request() {
+          order.push('Request 3');
+        },
+        response() {
+          order.push('Response 3');
+        },
+      });
+
+      const body = await fetchInstance.fetch('/my/path');
+
+      expect(fetchMock.called()).toBe(true);
+      expect(body).toEqual({ foo: 'bar' });
+      expect(order).toEqual([
+        'Request 3',
+        'Request 2',
+        'Request 1',
+        'Response 1',
+        'Response 2',
+        'Response 3',
+      ]);
+    });
+
+    it('should skip remaining interceptors when controller halts during request', async () => {
+      const usedSpy = jest.fn();
+      const unusedSpy = jest.fn();
+
+      fetchInstance.intercept({ request: unusedSpy, response: unusedSpy });
+      fetchInstance.intercept({
+        request(request, controller) {
+          controller.halt();
+        },
+        response: unusedSpy,
+      });
+      fetchInstance.intercept({
+        request: usedSpy,
+        response: unusedSpy,
+      });
+
+      fetchInstance.fetch('/my/path').then(unusedSpy, unusedSpy);
+      await delay(1000);
+
+      expect(unusedSpy).toHaveBeenCalledTimes(0);
+      expect(usedSpy).toHaveBeenCalledTimes(1);
+      expect(fetchMock.called()).toBe(false);
+    });
+
+    it('should skip remaining interceptors when controller halts during response', async () => {
+      const usedSpy = jest.fn();
+      const unusedSpy = jest.fn();
+
+      fetchInstance.intercept({
+        request: usedSpy,
+        response(response, controller) {
+          controller.halt();
+        },
+      });
+      fetchInstance.intercept({ request: usedSpy, response: unusedSpy });
+      fetchInstance.intercept({ request: usedSpy, response: unusedSpy });
+
+      fetchInstance.fetch('/my/path').then(unusedSpy, unusedSpy);
+      await delay(1000);
+
+      expect(fetchMock.called()).toBe(true);
+      expect(usedSpy).toHaveBeenCalledTimes(3);
+      expect(unusedSpy).toHaveBeenCalledTimes(0);
+    });
+
+    it('should skip remaining interceptors when controller halts during responseError', async () => {
+      fetchMock.post('*', 401);
+
+      const unusedSpy = jest.fn();
+
+      fetchInstance.intercept({
+        responseError(response, controller) {
+          controller.halt();
+        },
+      });
+      fetchInstance.intercept({ response: unusedSpy, responseError: unusedSpy });
+
+      fetchInstance.post('/my/path').then(unusedSpy, unusedSpy);
+      await delay(1000);
+
+      expect(fetchMock.called()).toBe(true);
+      expect(unusedSpy).toHaveBeenCalledTimes(0);
+    });
+
+    it('should not fetch if exception occurs during request interception', async () => {
+      const usedSpy = jest.fn();
+      const unusedSpy = jest.fn();
+
+      fetchInstance.intercept({
+        request: unusedSpy,
+        requestError: usedSpy,
+        response: unusedSpy,
+        responseError: unusedSpy,
+      });
+      fetchInstance.intercept({
+        request() {
+          throw new Error('Interception Error');
+        },
+        response: unusedSpy,
+        responseError: unusedSpy,
+      });
+      fetchInstance.intercept({ request: usedSpy, response: unusedSpy, responseError: unusedSpy });
+
+      await expect(fetchInstance.fetch('/my/path')).rejects.toThrow(/Interception Error/);
+      expect(fetchMock.called()).toBe(false);
+      expect(unusedSpy).toHaveBeenCalledTimes(0);
+      expect(usedSpy).toHaveBeenCalledTimes(2);
+    });
+
+    it('should succeed if request throws but caught by interceptor', async () => {
+      const usedSpy = jest.fn();
+      const unusedSpy = jest.fn();
+
+      fetchInstance.intercept({
+        request: unusedSpy,
+        requestError({ request }) {
+          return new Request('/my/route', request);
+        },
+        response: usedSpy,
+      });
+      fetchInstance.intercept({
+        request() {
+          throw new Error('Interception Error');
+        },
+        response: usedSpy,
+      });
+      fetchInstance.intercept({ request: usedSpy, response: usedSpy });
+
+      await expect(fetchInstance.fetch('/my/route')).resolves.toEqual({ foo: 'bar' });
+      expect(fetchMock.called()).toBe(true);
+      expect(unusedSpy).toHaveBeenCalledTimes(0);
+      expect(usedSpy).toHaveBeenCalledTimes(4);
+    });
+
+    it('should accumulate request information', async () => {
+      const routes = ['alpha', 'beta', 'gamma'];
+      const createRequest = jest.fn(
+        (request: Request) => new Request(`/api/${routes.shift()}`, request)
+      );
+
+      fetchInstance.intercept({
+        request: createRequest,
+      });
+      fetchInstance.intercept({
+        requestError(httpErrorRequest) {
+          return httpErrorRequest.request;
+        },
+      });
+      fetchInstance.intercept({
+        request(request) {
+          throw new Error('Invalid');
+        },
+      });
+      fetchInstance.intercept({
+        request: createRequest,
+      });
+      fetchInstance.intercept({
+        request: createRequest,
+      });
+
+      await expect(fetchInstance.fetch('/my/route')).resolves.toEqual({ foo: 'bar' });
+      expect(fetchMock.called()).toBe(true);
+      expect(routes.length).toBe(0);
+      expect(createRequest.mock.calls[0][0].url).toContain('/my/route');
+      expect(createRequest.mock.calls[1][0].url).toContain('/api/alpha');
+      expect(createRequest.mock.calls[2][0].url).toContain('/api/beta');
+      expect(fetchMock.lastCall()!.request.url).toContain('/api/gamma');
+    });
+
+    it('should accumulate response information', async () => {
+      const bodies = ['alpha', 'beta', 'gamma'];
+      const createResponse = jest.fn((httpResponse: IHttpResponse) => ({
+        body: bodies.shift(),
+      }));
+
+      fetchInstance.intercept({
+        response: createResponse,
+      });
+      fetchInstance.intercept({
+        response: createResponse,
+      });
+      fetchInstance.intercept({
+        response(httpResponse) {
+          throw new Error('Invalid');
+        },
+      });
+      fetchInstance.intercept({
+        responseError({ error, ...httpResponse }) {
+          return httpResponse;
+        },
+      });
+      fetchInstance.intercept({
+        response: createResponse,
+      });
+
+      await expect(fetchInstance.fetch('/my/route')).resolves.toEqual('gamma');
+      expect(fetchMock.called()).toBe(true);
+      expect(bodies.length).toBe(0);
+      expect(createResponse.mock.calls[0][0].body).toEqual({ foo: 'bar' });
+      expect(createResponse.mock.calls[1][0].body).toBe('alpha');
+      expect(createResponse.mock.calls[2][0].body).toBe('beta');
+    });
+
+    describe('request availability during interception', () => {
+      it('should be available to responseError when response throws', async () => {
+        let spiedRequest: Request | undefined;
+
+        fetchInstance.intercept({
+          response() {
+            throw new Error('Internal Server Error');
+          },
+        });
+        fetchInstance.intercept({
+          responseError({ request }) {
+            spiedRequest = request;
+          },
+        });
+
+        await expect(fetchInstance.fetch('/my/path')).rejects.toThrow();
+        expect(fetchMock.called()).toBe(true);
+        expect(spiedRequest).toBeDefined();
+      });
+    });
+
+    describe('response availability during interception', () => {
+      it('should be available to responseError when network request fails', async () => {
+        fetchMock.restore();
+        fetchMock.get('*', { status: 500 });
+
+        let spiedResponse: Response | undefined;
+
+        fetchInstance.intercept({
+          responseError({ response }) {
+            spiedResponse = response;
+          },
+        });
+
+        await expect(fetchInstance.fetch('/my/path')).rejects.toThrow();
+        expect(spiedResponse).toBeDefined();
+      });
+    });
+
+    it('should actually halt request interceptors in reverse order', async () => {
+      const unusedSpy = jest.fn();
+
+      fetchInstance.intercept({ request: unusedSpy });
+      fetchInstance.intercept({
+        request(request, controller) {
+          controller.halt();
+        },
+      });
+
+      fetchInstance.fetch('/my/path');
+      await delay(500);
+
+      expect(unusedSpy).toHaveBeenCalledTimes(0);
+    });
+
+    it('should recover from failing request interception via request error interceptor', async () => {
+      const usedSpy = jest.fn();
+
+      fetchInstance.intercept({
+        requestError(httpErrorRequest) {
+          return httpErrorRequest.request;
+        },
+        response: usedSpy,
+      });
+
+      fetchInstance.intercept({
+        request(request, controller) {
+          throw new Error('Request Error');
+        },
+        response: usedSpy,
+      });
+
+      await expect(fetchInstance.fetch('/my/path')).resolves.toEqual({ foo: 'bar' });
+      expect(usedSpy).toHaveBeenCalledTimes(2);
+    });
+  });
+});
diff --git a/src/core/public/http/fetch.ts b/src/core/public/http/fetch.ts
index 472b617cacd7f..b86f1f5c08029 100644
--- a/src/core/public/http/fetch.ts
+++ b/src/core/public/http/fetch.ts
@@ -35,20 +35,30 @@ interface Params {
 const JSON_CONTENT = /^(application\/(json|x-javascript)|text\/(x-)?javascript|x-json)(;.*)?$/;
 const NDJSON_CONTENT = /^(application\/ndjson)(;.*)?$/;
 
-export class FetchService {
+export class Fetch {
   private readonly interceptors = new Set<HttpInterceptor>();
 
   constructor(private readonly params: Params) {}
 
   public intercept(interceptor: HttpInterceptor) {
     this.interceptors.add(interceptor);
-    return () => this.interceptors.delete(interceptor);
+    return () => {
+      this.interceptors.delete(interceptor);
+    };
   }
 
   public removeAllInterceptors() {
     this.interceptors.clear();
   }
 
+  public readonly delete = this.shorthand('DELETE');
+  public readonly get = this.shorthand('GET');
+  public readonly head = this.shorthand('HEAD');
+  public readonly options = this.shorthand('options');
+  public readonly patch = this.shorthand('PATCH');
+  public readonly post = this.shorthand('POST');
+  public readonly put = this.shorthand('PUT');
+
   public fetch: HttpHandler = async <TResponseBody>(
     path: string,
     options: HttpFetchOptions = {}
@@ -152,4 +162,9 @@ export class FetchService {
 
     return new HttpResponse({ request, response, body });
   }
+
+  private shorthand(method: string) {
+    return (path: string, options: HttpFetchOptions = {}) =>
+      this.fetch(path, { ...options, method });
+  }
 }
diff --git a/src/core/public/http/http_service.mock.ts b/src/core/public/http/http_service.mock.ts
index 5887e7b3e96d0..1111fd39ec78e 100644
--- a/src/core/public/http/http_service.mock.ts
+++ b/src/core/public/http/http_service.mock.ts
@@ -20,7 +20,7 @@
 import { HttpService } from './http_service';
 import { HttpSetup } from './types';
 import { BehaviorSubject } from 'rxjs';
-import { BasePath } from './base_path_service';
+import { BasePath } from './base_path';
 
 export type HttpSetupMock = jest.Mocked<HttpSetup> & {
   basePath: BasePath;
@@ -41,15 +41,13 @@ const createServiceMock = ({ basePath = '' } = {}): HttpSetupMock => ({
     register: jest.fn(),
     isAnonymous: jest.fn(),
   },
-  addLoadingCount: jest.fn(),
+  addLoadingCountSource: jest.fn(),
   getLoadingCount$: jest.fn().mockReturnValue(new BehaviorSubject(0)),
-  stop: jest.fn(),
   intercept: jest.fn(),
-  removeAllInterceptors: jest.fn(),
 });
 
 const createMock = ({ basePath = '' } = {}) => {
-  const mocked: jest.Mocked<Required<HttpService>> = {
+  const mocked: jest.Mocked<PublicMethodsOf<HttpService>> = {
     setup: jest.fn(),
     start: jest.fn(),
     stop: jest.fn(),
diff --git a/src/core/public/http/http_service.test.mocks.ts b/src/core/public/http/http_service.test.mocks.ts
new file mode 100644
index 0000000000000..e60dad0509699
--- /dev/null
+++ b/src/core/public/http/http_service.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 { loadingCountServiceMock } from './loading_count_service.mock';
+
+export const loadingServiceMock = loadingCountServiceMock.create();
+jest.doMock('./loading_count_service', () => ({
+  LoadingCountService: jest.fn(() => loadingServiceMock),
+}));
diff --git a/src/core/public/http/http_service.test.ts b/src/core/public/http/http_service.test.ts
index 09f3cca419e4d..f95d25d116976 100644
--- a/src/core/public/http/http_service.test.ts
+++ b/src/core/public/http/http_service.test.ts
@@ -17,692 +17,22 @@
  * under the License.
  */
 
-import * as Rx from 'rxjs';
-import { toArray } from 'rxjs/operators';
 // @ts-ignore
 import fetchMock from 'fetch-mock/es5/client';
-import { readFileSync } from 'fs';
-import { join } from 'path';
-import { setup, SetupTap } from '../../../test_utils/public/http_test_setup';
-import { IHttpResponse } from './types';
-
-function delay<T>(duration: number) {
-  return new Promise<T>(r => setTimeout(r, duration));
-}
-
-const setupFakeBasePath: SetupTap = injectedMetadata => {
-  injectedMetadata.getBasePath.mockReturnValue('/foo/bar');
-};
-
-describe('basePath.get()', () => {
-  it('returns an empty string if no basePath is injected', () => {
-    const { http } = setup(injectedMetadata => {
-      injectedMetadata.getBasePath.mockReturnValue(undefined as any);
-    });
-
-    expect(http.basePath.get()).toBe('');
-  });
-
-  it('returns the injected basePath', () => {
-    const { http } = setup(setupFakeBasePath);
-
-    expect(http.basePath.get()).toBe('/foo/bar');
-  });
-});
-
-describe('http requests', () => {
-  afterEach(() => {
-    fetchMock.restore();
-  });
-
-  it('should use supplied request method', async () => {
-    const { http } = setup();
-
-    fetchMock.post('*', {});
-    await http.fetch('/my/path', { method: 'POST' });
-
-    expect(fetchMock.lastOptions()!.method).toBe('POST');
-  });
-
-  it('should use supplied Content-Type', async () => {
-    const { http } = setup();
-
-    fetchMock.get('*', {});
-    await http.fetch('/my/path', { headers: { 'Content-Type': 'CustomContentType' } });
-
-    expect(fetchMock.lastOptions()!.headers).toMatchObject({
-      'content-type': 'CustomContentType',
-    });
-  });
-
-  it('should use supplied pathname and querystring', async () => {
-    const { http } = setup();
-
-    fetchMock.get('*', {});
-    await http.fetch('/my/path', { query: { a: 'b' } });
-
-    expect(fetchMock.lastUrl()).toBe('http://localhost/myBase/my/path?a=b');
-  });
-
-  it('should use supplied headers', async () => {
-    const { http } = setup();
-
-    fetchMock.get('*', {});
-    await http.fetch('/my/path', {
-      headers: { myHeader: 'foo' },
-    });
-
-    expect(fetchMock.lastOptions()!.headers).toEqual({
-      'content-type': 'application/json',
-      'kbn-version': 'kibanaVersion',
-      myheader: 'foo',
-    });
-  });
-
-  it('should return response', async () => {
-    const { http } = setup();
-    fetchMock.get('*', { foo: 'bar' });
-    const json = await http.fetch('/my/path');
-    expect(json).toEqual({ foo: 'bar' });
-  });
-
-  it('should prepend url with basepath by default', async () => {
-    const { http } = setup();
-    fetchMock.get('*', {});
-    await http.fetch('/my/path');
-    expect(fetchMock.lastUrl()).toBe('http://localhost/myBase/my/path');
-  });
-
-  it('should not prepend url with basepath when disabled', async () => {
-    const { http } = setup();
-    fetchMock.get('*', {});
-    await http.fetch('my/path', { prependBasePath: false });
-    expect(fetchMock.lastUrl()).toBe('/my/path');
-  });
-
-  it('should not include undefined query params', async () => {
-    const { http } = setup();
-    fetchMock.get('*', {});
-    await http.fetch('/my/path', { query: { a: undefined } });
-    expect(fetchMock.lastUrl()).toBe('http://localhost/myBase/my/path');
-  });
-
-  it('should make request with defaults', async () => {
-    const { http } = setup();
-
-    fetchMock.get('*', {});
-    await http.fetch('/my/path');
-
-    const lastCall = fetchMock.lastCall();
-
-    expect(lastCall!.request.credentials).toBe('same-origin');
-    expect(lastCall![1]).toMatchObject({
-      method: 'GET',
-      headers: {
-        'content-type': 'application/json',
-        'kbn-version': 'kibanaVersion',
-      },
-    });
-  });
-
-  it('should expose detailed response object when asResponse = true', async () => {
-    const { http } = setup();
-
-    fetchMock.get('*', { foo: 'bar' });
-
-    const response = await http.fetch('/my/path', { asResponse: true });
-
-    expect(response.request).toBeInstanceOf(Request);
-    expect(response.response).toBeInstanceOf(Response);
-    expect(response.body).toEqual({ foo: 'bar' });
-  });
-
-  it('should reject on network error', async () => {
-    const { http } = setup();
-
-    expect.assertions(1);
-    fetchMock.get('*', { status: 500 });
-
-    await expect(http.fetch('/my/path')).rejects.toThrow(/Internal Server Error/);
-  });
-
-  it('should contain error message when throwing response', async () => {
-    const { http } = setup();
-
-    fetchMock.get('*', { status: 404, body: { foo: 'bar' } });
-
-    await expect(http.fetch('/my/path')).rejects.toMatchObject({
-      message: 'Not Found',
-      body: {
-        foo: 'bar',
-      },
-      response: {
-        status: 404,
-        url: 'http://localhost/myBase/my/path',
-      },
-    });
-  });
-
-  it('should support get() helper', async () => {
-    const { http } = setup();
-
-    fetchMock.get('*', {});
-    await http.get('/my/path', { method: 'POST' });
-
-    expect(fetchMock.lastOptions()!.method).toBe('GET');
-  });
-
-  it('should support head() helper', async () => {
-    const { http } = setup();
-
-    fetchMock.head('*', {});
-    await http.head('/my/path', { method: 'GET' });
-
-    expect(fetchMock.lastOptions()!.method).toBe('HEAD');
-  });
-
-  it('should support post() helper', async () => {
-    const { http } = setup();
-
-    fetchMock.post('*', {});
-    await http.post('/my/path', { method: 'GET', body: '{}' });
-
-    expect(fetchMock.lastOptions()!.method).toBe('POST');
-  });
-
-  it('should support put() helper', async () => {
-    const { http } = setup();
-
-    fetchMock.put('*', {});
-    await http.put('/my/path', { method: 'GET', body: '{}' });
-
-    expect(fetchMock.lastOptions()!.method).toBe('PUT');
-  });
-
-  it('should support patch() helper', async () => {
-    const { http } = setup();
-
-    fetchMock.patch('*', {});
-    await http.patch('/my/path', { method: 'GET', body: '{}' });
-
-    expect(fetchMock.lastOptions()!.method).toBe('PATCH');
-  });
-
-  it('should support delete() helper', async () => {
-    const { http } = setup();
-
-    fetchMock.delete('*', {});
-    await http.delete('/my/path', { method: 'GET' });
-
-    expect(fetchMock.lastOptions()!.method).toBe('DELETE');
-  });
-
-  it('should support options() helper', async () => {
-    const { http } = setup();
-
-    fetchMock.mock('*', { method: 'OPTIONS' });
-    await http.options('/my/path', { method: 'GET' });
-
-    expect(fetchMock.lastOptions()!.method).toBe('OPTIONS');
-  });
-
-  it('should make requests for NDJSON content', async () => {
-    const { http } = setup();
-    const content = readFileSync(join(__dirname, '_import_objects.ndjson'), { encoding: 'utf-8' });
-    const body = new FormData();
-
-    body.append('file', content);
-    fetchMock.post('*', {
-      body: content,
-      headers: { 'Content-Type': 'application/ndjson' },
-    });
-
-    const data = await http.post('/my/path', {
-      body,
-      headers: {
-        'Content-Type': undefined,
-      },
-    });
-
-    expect(data).toBeInstanceOf(Blob);
-
-    const ndjson = await new Response(data).text();
-
-    expect(ndjson).toEqual(content);
-  });
-});
-
-describe('interception', () => {
-  const { http } = setup();
-
-  beforeEach(() => {
-    fetchMock.get('*', { foo: 'bar' });
-  });
-
-  afterEach(() => {
-    fetchMock.restore();
-    http.removeAllInterceptors();
-  });
-
-  it('should make request and receive response', async () => {
-    http.intercept({});
-
-    const body = await http.fetch('/my/path');
-
-    expect(fetchMock.called()).toBe(true);
-    expect(body).toEqual({ foo: 'bar' });
-  });
-
-  it('should be able to manipulate request instance', async () => {
-    http.intercept({
-      request(request) {
-        request.headers.set('Content-Type', 'CustomContentType');
-      },
-    });
-    http.intercept({
-      request(request) {
-        return new Request('/my/route', request);
-      },
-    });
-
-    const body = await http.fetch('/my/path');
-
-    expect(fetchMock.called()).toBe(true);
-    expect(body).toEqual({ foo: 'bar' });
-    expect(fetchMock.lastOptions()!.headers).toMatchObject({
-      'content-type': 'CustomContentType',
-    });
-    expect(fetchMock.lastUrl()).toBe('/my/route');
-  });
-
-  it('should call interceptors in correct order', async () => {
-    const order: string[] = [];
-
-    http.intercept({
-      request() {
-        order.push('Request 1');
-      },
-      response() {
-        order.push('Response 1');
-      },
-    });
-    http.intercept({
-      request() {
-        order.push('Request 2');
-      },
-      response() {
-        order.push('Response 2');
-      },
-    });
-    http.intercept({
-      request() {
-        order.push('Request 3');
-      },
-      response() {
-        order.push('Response 3');
-      },
-    });
-
-    const body = await http.fetch('/my/path');
-
-    expect(fetchMock.called()).toBe(true);
-    expect(body).toEqual({ foo: 'bar' });
-    expect(order).toEqual([
-      'Request 3',
-      'Request 2',
-      'Request 1',
-      'Response 1',
-      'Response 2',
-      'Response 3',
-    ]);
-  });
-
-  it('should skip remaining interceptors when controller halts during request', async () => {
-    const usedSpy = jest.fn();
-    const unusedSpy = jest.fn();
-
-    http.intercept({ request: unusedSpy, response: unusedSpy });
-    http.intercept({
-      request(request, controller) {
-        controller.halt();
-      },
-      response: unusedSpy,
-    });
-    http.intercept({
-      request: usedSpy,
-      response: unusedSpy,
-    });
-
-    http.fetch('/my/path').then(unusedSpy, unusedSpy);
-    await delay(1000);
-
-    expect(unusedSpy).toHaveBeenCalledTimes(0);
-    expect(usedSpy).toHaveBeenCalledTimes(1);
-    expect(fetchMock.called()).toBe(false);
-  });
-
-  it('should skip remaining interceptors when controller halts during response', async () => {
-    const usedSpy = jest.fn();
-    const unusedSpy = jest.fn();
-
-    http.intercept({
-      request: usedSpy,
-      response(response, controller) {
-        controller.halt();
-      },
-    });
-    http.intercept({ request: usedSpy, response: unusedSpy });
-    http.intercept({ request: usedSpy, response: unusedSpy });
-
-    http.fetch('/my/path').then(unusedSpy, unusedSpy);
-    await delay(1000);
-
-    expect(fetchMock.called()).toBe(true);
-    expect(usedSpy).toHaveBeenCalledTimes(3);
-    expect(unusedSpy).toHaveBeenCalledTimes(0);
-  });
-
-  it('should skip remaining interceptors when controller halts during responseError', async () => {
-    fetchMock.post('*', 401);
-
-    const unusedSpy = jest.fn();
-
-    http.intercept({
-      responseError(response, controller) {
-        controller.halt();
-      },
-    });
-    http.intercept({ response: unusedSpy, responseError: unusedSpy });
-
-    http.post('/my/path').then(unusedSpy, unusedSpy);
-    await delay(1000);
-
-    expect(fetchMock.called()).toBe(true);
-    expect(unusedSpy).toHaveBeenCalledTimes(0);
-  });
-
-  it('should not fetch if exception occurs during request interception', async () => {
-    const usedSpy = jest.fn();
-    const unusedSpy = jest.fn();
-
-    http.intercept({
-      request: unusedSpy,
-      requestError: usedSpy,
-      response: unusedSpy,
-      responseError: unusedSpy,
-    });
-    http.intercept({
-      request() {
-        throw new Error('Interception Error');
-      },
-      response: unusedSpy,
-      responseError: unusedSpy,
-    });
-    http.intercept({ request: usedSpy, response: unusedSpy, responseError: unusedSpy });
-
-    await expect(http.fetch('/my/path')).rejects.toThrow(/Interception Error/);
-    expect(fetchMock.called()).toBe(false);
-    expect(unusedSpy).toHaveBeenCalledTimes(0);
-    expect(usedSpy).toHaveBeenCalledTimes(2);
-  });
-
-  it('should succeed if request throws but caught by interceptor', async () => {
-    const usedSpy = jest.fn();
-    const unusedSpy = jest.fn();
-
-    http.intercept({
-      request: unusedSpy,
-      requestError({ request }) {
-        return new Request('/my/route', request);
-      },
-      response: usedSpy,
-    });
-    http.intercept({
-      request() {
-        throw new Error('Interception Error');
-      },
-      response: usedSpy,
-    });
-    http.intercept({ request: usedSpy, response: usedSpy });
-
-    await expect(http.fetch('/my/route')).resolves.toEqual({ foo: 'bar' });
-    expect(fetchMock.called()).toBe(true);
-    expect(unusedSpy).toHaveBeenCalledTimes(0);
-    expect(usedSpy).toHaveBeenCalledTimes(4);
-  });
-
-  it('should accumulate request information', async () => {
-    const routes = ['alpha', 'beta', 'gamma'];
-    const createRequest = jest.fn(
-      (request: Request) => new Request(`/api/${routes.shift()}`, request)
-    );
-
-    http.intercept({
-      request: createRequest,
-    });
-    http.intercept({
-      requestError(httpErrorRequest) {
-        return httpErrorRequest.request;
-      },
-    });
-    http.intercept({
-      request(request) {
-        throw new Error('Invalid');
-      },
-    });
-    http.intercept({
-      request: createRequest,
-    });
-    http.intercept({
-      request: createRequest,
-    });
-
-    await expect(http.fetch('/my/route')).resolves.toEqual({ foo: 'bar' });
-    expect(fetchMock.called()).toBe(true);
-    expect(routes.length).toBe(0);
-    expect(createRequest.mock.calls[0][0].url).toContain('/my/route');
-    expect(createRequest.mock.calls[1][0].url).toContain('/api/alpha');
-    expect(createRequest.mock.calls[2][0].url).toContain('/api/beta');
-    expect(fetchMock.lastCall()!.request.url).toContain('/api/gamma');
-  });
-
-  it('should accumulate response information', async () => {
-    const bodies = ['alpha', 'beta', 'gamma'];
-    const createResponse = jest.fn((httpResponse: IHttpResponse) => ({
-      body: bodies.shift(),
-    }));
-
-    http.intercept({
-      response: createResponse,
-    });
-    http.intercept({
-      response: createResponse,
-    });
-    http.intercept({
-      response(httpResponse) {
-        throw new Error('Invalid');
-      },
-    });
-    http.intercept({
-      responseError({ error, ...httpResponse }) {
-        return httpResponse;
-      },
-    });
-    http.intercept({
-      response: createResponse,
-    });
-
-    await expect(http.fetch('/my/route')).resolves.toEqual('gamma');
-    expect(fetchMock.called()).toBe(true);
-    expect(bodies.length).toBe(0);
-    expect(createResponse.mock.calls[0][0].body).toEqual({ foo: 'bar' });
-    expect(createResponse.mock.calls[1][0].body).toBe('alpha');
-    expect(createResponse.mock.calls[2][0].body).toBe('beta');
-  });
-
-  describe('request availability during interception', () => {
-    it('should be available to responseError when response throws', async () => {
-      let spiedRequest: Request | undefined;
-
-      http.intercept({
-        response() {
-          throw new Error('Internal Server Error');
-        },
-      });
-      http.intercept({
-        responseError({ request }) {
-          spiedRequest = request;
-        },
-      });
-
-      await expect(http.fetch('/my/path')).rejects.toThrow();
-      expect(fetchMock.called()).toBe(true);
-      expect(spiedRequest).toBeDefined();
-    });
-  });
-
-  describe('response availability during interception', () => {
-    it('should be available to responseError when network request fails', async () => {
-      fetchMock.restore();
-      fetchMock.get('*', { status: 500 });
-
-      let spiedResponse: Response | undefined;
-
-      http.intercept({
-        responseError({ response }) {
-          spiedResponse = response;
-        },
-      });
-
-      await expect(http.fetch('/my/path')).rejects.toThrow();
-      expect(spiedResponse).toBeDefined();
-    });
-  });
-
-  it('should actually halt request interceptors in reverse order', async () => {
-    const unusedSpy = jest.fn();
-
-    http.intercept({ request: unusedSpy });
-    http.intercept({
-      request(request, controller) {
-        controller.halt();
-      },
-    });
-
-    http.fetch('/my/path');
-    await delay(500);
-
-    expect(unusedSpy).toHaveBeenCalledTimes(0);
-  });
-
-  it('should recover from failing request interception via request error interceptor', async () => {
-    const usedSpy = jest.fn();
-
-    http.intercept({
-      requestError(httpErrorRequest) {
-        return httpErrorRequest.request;
-      },
-      response: usedSpy,
-    });
-
-    http.intercept({
-      request(request, controller) {
-        throw new Error('Request Error');
-      },
-      response: usedSpy,
-    });
-
-    await expect(http.fetch('/my/path')).resolves.toEqual({ foo: 'bar' });
-    expect(usedSpy).toHaveBeenCalledTimes(2);
-  });
-});
-
-describe('addLoadingCount()', () => {
-  it('subscribes to passed in sources, unsubscribes on stop', () => {
-    const { httpService, http } = setup();
-
-    const unsubA = jest.fn();
-    const subA = jest.fn().mockReturnValue(unsubA);
-    http.addLoadingCount(new Rx.Observable(subA));
-    expect(subA).toHaveBeenCalledTimes(1);
-    expect(unsubA).not.toHaveBeenCalled();
-
-    const unsubB = jest.fn();
-    const subB = jest.fn().mockReturnValue(unsubB);
-    http.addLoadingCount(new Rx.Observable(subB));
-    expect(subB).toHaveBeenCalledTimes(1);
-    expect(unsubB).not.toHaveBeenCalled();
-
+import { loadingServiceMock } from './http_service.test.mocks';
+
+import { fatalErrorsServiceMock } from '../fatal_errors/fatal_errors_service.mock';
+import { injectedMetadataServiceMock } from '../injected_metadata/injected_metadata_service.mock';
+import { HttpService } from './http_service';
+
+describe('#stop()', () => {
+  it('calls loadingCount.stop()', () => {
+    const injectedMetadata = injectedMetadataServiceMock.createSetupContract();
+    const fatalErrors = fatalErrorsServiceMock.createSetupContract();
+    const httpService = new HttpService();
+    httpService.setup({ fatalErrors, injectedMetadata });
+    httpService.start({ fatalErrors, injectedMetadata });
     httpService.stop();
-
-    expect(subA).toHaveBeenCalledTimes(1);
-    expect(unsubA).toHaveBeenCalledTimes(1);
-    expect(subB).toHaveBeenCalledTimes(1);
-    expect(unsubB).toHaveBeenCalledTimes(1);
-  });
-
-  it('adds a fatal error if source observables emit an error', async () => {
-    const { http, fatalErrors } = setup();
-
-    http.addLoadingCount(Rx.throwError(new Error('foo bar')));
-    expect(fatalErrors.add.mock.calls).toMatchSnapshot();
-  });
-
-  it('adds a fatal error if source observable emits a negative number', async () => {
-    const { http, fatalErrors } = setup();
-
-    http.addLoadingCount(Rx.of(1, 2, 3, 4, -9));
-    expect(fatalErrors.add.mock.calls).toMatchSnapshot();
-  });
-});
-
-describe('getLoadingCount$()', () => {
-  it('emits 0 initially, the right count when sources emit their own count, and ends with zero', async () => {
-    const { httpService, http } = setup();
-
-    const countA$ = new Rx.Subject<number>();
-    const countB$ = new Rx.Subject<number>();
-    const countC$ = new Rx.Subject<number>();
-    const promise = http
-      .getLoadingCount$()
-      .pipe(toArray())
-      .toPromise();
-
-    http.addLoadingCount(countA$);
-    http.addLoadingCount(countB$);
-    http.addLoadingCount(countC$);
-
-    countA$.next(100);
-    countB$.next(10);
-    countC$.next(1);
-    countA$.complete();
-    countB$.next(20);
-    countC$.complete();
-    countB$.next(0);
-
-    httpService.stop();
-    expect(await promise).toMatchSnapshot();
-  });
-
-  it('only emits when loading count changes', async () => {
-    const { httpService, http } = setup();
-
-    const count$ = new Rx.Subject<number>();
-    const promise = http
-      .getLoadingCount$()
-      .pipe(toArray())
-      .toPromise();
-
-    http.addLoadingCount(count$);
-    count$.next(0);
-    count$.next(0);
-    count$.next(0);
-    count$.next(0);
-    count$.next(0);
-    count$.next(1);
-    count$.next(1);
-    httpService.stop();
-
-    expect(await promise).toMatchSnapshot();
+    expect(loadingServiceMock.stop).toHaveBeenCalled();
   });
 });
diff --git a/src/core/public/http/http_service.ts b/src/core/public/http/http_service.ts
index 477bcd6152d44..567cdd310cbdf 100644
--- a/src/core/public/http/http_service.ts
+++ b/src/core/public/http/http_service.ts
@@ -17,32 +17,52 @@
  * under the License.
  */
 
-import { HttpSetup, HttpStart, HttpServiceBase } from './types';
-import { setup } from './http_setup';
+import { HttpSetup, HttpStart } from './types';
 import { InjectedMetadataSetup } from '../injected_metadata';
 import { FatalErrorsSetup } from '../fatal_errors';
+import { BasePath } from './base_path';
+import { AnonymousPathsService } from './anonymous_paths_service';
+import { LoadingCountService } from './loading_count_service';
+import { Fetch } from './fetch';
+import { CoreService } from '../../types';
 
 interface HttpDeps {
   injectedMetadata: InjectedMetadataSetup;
-  fatalErrors: FatalErrorsSetup | null;
+  fatalErrors: FatalErrorsSetup;
 }
 
 /** @internal */
-export class HttpService {
-  private service!: HttpServiceBase;
+export class HttpService implements CoreService<HttpSetup, HttpStart> {
+  private readonly anonymousPaths = new AnonymousPathsService();
+  private readonly loadingCount = new LoadingCountService();
 
-  public setup(deps: HttpDeps): HttpSetup {
-    this.service = setup(deps.injectedMetadata, deps.fatalErrors);
-    return this.service;
+  public setup({ injectedMetadata, fatalErrors }: HttpDeps): HttpSetup {
+    const kibanaVersion = injectedMetadata.getKibanaVersion();
+    const basePath = new BasePath(injectedMetadata.getBasePath());
+    const fetchService = new Fetch({ basePath, kibanaVersion });
+    const loadingCount = this.loadingCount.setup({ fatalErrors });
+
+    return {
+      basePath,
+      anonymousPaths: this.anonymousPaths.setup({ basePath }),
+      intercept: fetchService.intercept.bind(fetchService),
+      fetch: fetchService.fetch.bind(fetchService),
+      delete: fetchService.delete.bind(fetchService),
+      get: fetchService.get.bind(fetchService),
+      head: fetchService.head.bind(fetchService),
+      options: fetchService.options.bind(fetchService),
+      patch: fetchService.patch.bind(fetchService),
+      post: fetchService.post.bind(fetchService),
+      put: fetchService.put.bind(fetchService),
+      ...loadingCount,
+    };
   }
 
-  public start(deps: HttpDeps): HttpStart {
-    return this.service || this.setup(deps);
+  public start(deps: HttpDeps) {
+    return this.setup(deps);
   }
 
   public stop() {
-    if (this.service) {
-      this.service.stop();
-    }
+    this.loadingCount.stop();
   }
 }
diff --git a/src/core/public/http/http_setup.ts b/src/core/public/http/http_setup.ts
deleted file mode 100644
index c63750849f13a..0000000000000
--- a/src/core/public/http/http_setup.ts
+++ /dev/null
@@ -1,123 +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 { BehaviorSubject, Observable, Subject } from 'rxjs';
-import {
-  distinctUntilChanged,
-  endWith,
-  map,
-  pairwise,
-  startWith,
-  takeUntil,
-  tap,
-} from 'rxjs/operators';
-import { InjectedMetadataSetup } from '../injected_metadata';
-import { FatalErrorsSetup } from '../fatal_errors';
-import { HttpFetchOptions, HttpServiceBase } from './types';
-import { HttpInterceptController } from './http_intercept_controller';
-import { HttpInterceptHaltError } from './http_intercept_halt_error';
-import { BasePath } from './base_path_service';
-import { AnonymousPaths } from './anonymous_paths';
-import { FetchService } from './fetch';
-
-export function checkHalt(controller: HttpInterceptController, error?: Error) {
-  if (error instanceof HttpInterceptHaltError) {
-    throw error;
-  } else if (controller.halted) {
-    throw new HttpInterceptHaltError();
-  }
-}
-
-export const setup = (
-  injectedMetadata: InjectedMetadataSetup,
-  fatalErrors: FatalErrorsSetup | null
-): HttpServiceBase => {
-  const loadingCount$ = new BehaviorSubject(0);
-  const stop$ = new Subject();
-  const kibanaVersion = injectedMetadata.getKibanaVersion();
-  const basePath = new BasePath(injectedMetadata.getBasePath());
-  const anonymousPaths = new AnonymousPaths(basePath);
-
-  const fetchService = new FetchService({ basePath, kibanaVersion });
-
-  function shorthand(method: string) {
-    return (path: string, options: HttpFetchOptions = {}) =>
-      fetchService.fetch(path, { ...options, method });
-  }
-
-  function stop() {
-    stop$.next();
-    loadingCount$.complete();
-  }
-
-  function addLoadingCount(count$: Observable<number>) {
-    count$
-      .pipe(
-        distinctUntilChanged(),
-
-        tap(count => {
-          if (count < 0) {
-            throw new Error(
-              'Observables passed to loadingCount.add() must only emit positive numbers'
-            );
-          }
-        }),
-
-        // use takeUntil() so that we can finish each stream on stop() the same way we do when they complete,
-        // by removing the previous count from the total
-        takeUntil(stop$),
-        endWith(0),
-        startWith(0),
-        pairwise(),
-        map(([prev, next]) => next - prev)
-      )
-      .subscribe({
-        next: delta => {
-          loadingCount$.next(loadingCount$.getValue() + delta);
-        },
-        error: error => {
-          if (fatalErrors) {
-            fatalErrors.add(error);
-          }
-        },
-      });
-  }
-
-  function getLoadingCount$() {
-    return loadingCount$.pipe(distinctUntilChanged());
-  }
-
-  return {
-    stop,
-    basePath,
-    anonymousPaths,
-    intercept: fetchService.intercept.bind(fetchService),
-    removeAllInterceptors: fetchService.removeAllInterceptors.bind(fetchService),
-    fetch: fetchService.fetch.bind(fetchService),
-    delete: shorthand('DELETE'),
-    get: shorthand('GET'),
-    head: shorthand('HEAD'),
-    options: shorthand('OPTIONS'),
-    patch: shorthand('PATCH'),
-    post: shorthand('POST'),
-    put: shorthand('PUT'),
-    addLoadingCount,
-    getLoadingCount$,
-  };
-};
diff --git a/src/core/public/http/loading_count_service.mock.ts b/src/core/public/http/loading_count_service.mock.ts
new file mode 100644
index 0000000000000..79928aa4b160d
--- /dev/null
+++ b/src/core/public/http/loading_count_service.mock.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 { LoadingCountSetup, LoadingCountService } from './loading_count_service';
+import { BehaviorSubject } from 'rxjs';
+
+const createSetupContractMock = () => {
+  const setupContract: jest.Mocked<LoadingCountSetup> = {
+    addLoadingCountSource: jest.fn(),
+    getLoadingCount$: jest.fn(),
+  };
+  setupContract.getLoadingCount$.mockReturnValue(new BehaviorSubject(0));
+  return setupContract;
+};
+
+type LoadingCountServiceContract = PublicMethodsOf<LoadingCountService>;
+const createServiceMock = () => {
+  const mocked: jest.Mocked<LoadingCountServiceContract> = {
+    setup: jest.fn(),
+    start: jest.fn(),
+    stop: jest.fn(),
+  };
+
+  mocked.setup.mockReturnValue(createSetupContractMock());
+  mocked.start.mockReturnValue(createSetupContractMock());
+
+  return mocked;
+};
+
+export const loadingCountServiceMock = {
+  create: createServiceMock,
+  createSetupContract: createSetupContractMock,
+  createStartContract: createSetupContractMock,
+};
diff --git a/src/core/public/http/loading_count_service.test.ts b/src/core/public/http/loading_count_service.test.ts
new file mode 100644
index 0000000000000..3ba4d315178cc
--- /dev/null
+++ b/src/core/public/http/loading_count_service.test.ts
@@ -0,0 +1,152 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Observable, throwError, of, Subject } from 'rxjs';
+import { toArray } from 'rxjs/operators';
+
+import { fatalErrorsServiceMock } from '../fatal_errors/fatal_errors_service.mock';
+import { LoadingCountService } from './loading_count_service';
+
+describe('LoadingCountService', () => {
+  const setup = () => {
+    const fatalErrors = fatalErrorsServiceMock.createSetupContract();
+    const service = new LoadingCountService();
+    const loadingCount = service.setup({ fatalErrors });
+    return { fatalErrors, loadingCount, service };
+  };
+
+  describe('addLoadingCountSource()', () => {
+    it('subscribes to passed in sources, unsubscribes on stop', () => {
+      const { service, loadingCount } = setup();
+
+      const unsubA = jest.fn();
+      const subA = jest.fn().mockReturnValue(unsubA);
+      loadingCount.addLoadingCountSource(new Observable(subA));
+      expect(subA).toHaveBeenCalledTimes(1);
+      expect(unsubA).not.toHaveBeenCalled();
+
+      const unsubB = jest.fn();
+      const subB = jest.fn().mockReturnValue(unsubB);
+      loadingCount.addLoadingCountSource(new Observable(subB));
+      expect(subB).toHaveBeenCalledTimes(1);
+      expect(unsubB).not.toHaveBeenCalled();
+
+      service.stop();
+
+      expect(subA).toHaveBeenCalledTimes(1);
+      expect(unsubA).toHaveBeenCalledTimes(1);
+      expect(subB).toHaveBeenCalledTimes(1);
+      expect(unsubB).toHaveBeenCalledTimes(1);
+    });
+
+    it('adds a fatal error if source observables emit an error', () => {
+      const { loadingCount, fatalErrors } = setup();
+
+      loadingCount.addLoadingCountSource(throwError(new Error('foo bar')));
+      expect(fatalErrors.add.mock.calls).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            [Error: foo bar],
+          ],
+        ]
+      `);
+    });
+
+    it('adds a fatal error if source observable emits a negative number', () => {
+      const { loadingCount, fatalErrors } = setup();
+
+      loadingCount.addLoadingCountSource(of(1, 2, 3, 4, -9));
+      expect(fatalErrors.add.mock.calls).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            [Error: Observables passed to loadingCount.add() must only emit positive numbers],
+          ],
+        ]
+      `);
+    });
+  });
+
+  describe('getLoadingCount$()', () => {
+    it('emits 0 initially, the right count when sources emit their own count, and ends with zero', async () => {
+      const { service, loadingCount } = setup();
+
+      const countA$ = new Subject<number>();
+      const countB$ = new Subject<number>();
+      const countC$ = new Subject<number>();
+      const promise = loadingCount
+        .getLoadingCount$()
+        .pipe(toArray())
+        .toPromise();
+
+      loadingCount.addLoadingCountSource(countA$);
+      loadingCount.addLoadingCountSource(countB$);
+      loadingCount.addLoadingCountSource(countC$);
+
+      countA$.next(100);
+      countB$.next(10);
+      countC$.next(1);
+      countA$.complete();
+      countB$.next(20);
+      countC$.complete();
+      countB$.next(0);
+
+      service.stop();
+      expect(await promise).toMatchInlineSnapshot(`
+        Array [
+          0,
+          100,
+          110,
+          111,
+          11,
+          21,
+          20,
+          0,
+        ]
+      `);
+    });
+
+    it('only emits when loading count changes', async () => {
+      const { service, loadingCount } = setup();
+
+      const count$ = new Subject<number>();
+      const promise = loadingCount
+        .getLoadingCount$()
+        .pipe(toArray())
+        .toPromise();
+
+      loadingCount.addLoadingCountSource(count$);
+      count$.next(0);
+      count$.next(0);
+      count$.next(0);
+      count$.next(0);
+      count$.next(0);
+      count$.next(1);
+      count$.next(1);
+      service.stop();
+
+      expect(await promise).toMatchInlineSnapshot(`
+        Array [
+          0,
+          1,
+          0,
+        ]
+      `);
+    });
+  });
+});
diff --git a/src/core/public/http/loading_count_service.ts b/src/core/public/http/loading_count_service.ts
new file mode 100644
index 0000000000000..14b945e0801ca
--- /dev/null
+++ b/src/core/public/http/loading_count_service.ts
@@ -0,0 +1,93 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import {
+  distinctUntilChanged,
+  endWith,
+  map,
+  pairwise,
+  startWith,
+  takeUntil,
+  tap,
+} from 'rxjs/operators';
+import { FatalErrorsSetup } from '../fatal_errors';
+import { CoreService } from '../../types';
+
+/** @public */
+export interface LoadingCountSetup {
+  addLoadingCountSource(countSource$: Observable<number>): void;
+
+  getLoadingCount$(): Observable<number>;
+}
+
+/**
+ * See {@link LoadingCountSetup}.
+ * @public
+ */
+export type LoadingCountStart = LoadingCountSetup;
+
+/** @internal */
+export class LoadingCountService implements CoreService<LoadingCountSetup, LoadingCountStart> {
+  private readonly stop$ = new Subject();
+  private readonly loadingCount$ = new BehaviorSubject(0);
+
+  public setup({ fatalErrors }: { fatalErrors: FatalErrorsSetup }) {
+    return {
+      getLoadingCount$: () => this.loadingCount$.pipe(distinctUntilChanged()),
+      addLoadingCountSource: (count$: Observable<number>) => {
+        count$
+          .pipe(
+            distinctUntilChanged(),
+
+            tap(count => {
+              if (count < 0) {
+                throw new Error(
+                  'Observables passed to loadingCount.add() must only emit positive numbers'
+                );
+              }
+            }),
+
+            // use takeUntil() so that we can finish each stream on stop() the same way we do when they complete,
+            // by removing the previous count from the total
+            takeUntil(this.stop$),
+            endWith(0),
+            startWith(0),
+            pairwise(),
+            map(([prev, next]) => next - prev)
+          )
+          .subscribe({
+            next: delta => {
+              this.loadingCount$.next(this.loadingCount$.getValue() + delta);
+            },
+            error: error => fatalErrors.add(error),
+          });
+      },
+    };
+  }
+
+  public start({ fatalErrors }: { fatalErrors: FatalErrorsSetup }) {
+    return this.setup({ fatalErrors });
+  }
+
+  public stop() {
+    this.stop$.next();
+    this.loadingCount$.complete();
+  }
+}
diff --git a/src/core/public/http/types.ts b/src/core/public/http/types.ts
index 48385a72325db..27ffddc79cf65 100644
--- a/src/core/public/http/types.ts
+++ b/src/core/public/http/types.ts
@@ -20,10 +20,7 @@
 import { Observable } from 'rxjs';
 
 /** @public */
-export interface HttpServiceBase {
-  /** @internal */
-  stop(): void;
-
+export interface HttpSetup {
   /**
    * APIs for manipulating the basePath on URL segments.
    */
@@ -41,11 +38,6 @@ export interface HttpServiceBase {
    */
   intercept(interceptor: HttpInterceptor): () => void;
 
-  /**
-   * Removes all configured interceptors.
-   */
-  removeAllInterceptors(): void;
-
   /** Makes an HTTP request. Defaults to a GET request unless overriden. See {@link HttpHandler} for options. */
   fetch: HttpHandler;
   /** Makes an HTTP request with the DELETE method. See {@link HttpHandler} for options. */
@@ -68,7 +60,7 @@ export interface HttpServiceBase {
    * more than 0.
    * @param countSource$ an Observable to subscribe to for loading count updates.
    */
-  addLoadingCount(countSource$: Observable<number>): void;
+  addLoadingCountSource(countSource$: Observable<number>): void;
 
   /**
    * Get the sum of all loading count sources as a single Observable.
@@ -76,6 +68,12 @@ export interface HttpServiceBase {
   getLoadingCount$(): Observable<number>;
 }
 
+/**
+ * See {@link HttpSetup}
+ * @public
+ */
+export type HttpStart = HttpSetup;
+
 /**
  * APIs for manipulating the basePath on URL segments.
  * @public
@@ -112,18 +110,6 @@ export interface IAnonymousPaths {
   register(path: string): void;
 }
 
-/**
- * See {@link HttpServiceBase}
- * @public
- */
-export type HttpSetup = HttpServiceBase;
-
-/**
- * See {@link HttpServiceBase}
- * @public
- */
-export type HttpStart = HttpServiceBase;
-
 /** @public */
 export interface HttpHeadersInit {
   [name: string]: any;
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index f83ca2564de8e..7488f9b973b71 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -121,7 +121,6 @@ export {
 } from './saved_objects';
 
 export {
-  HttpServiceBase,
   HttpHeadersInit,
   HttpRequestInit,
   HttpFetchOptions,
diff --git a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
index 626c91b6a9668..9bd686776138f 100644
--- a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
+++ b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
@@ -31,7 +31,7 @@ Array [
 ]
 `;
 
-exports[`FlyoutService openFlyout() renders a flyout to the DOM 2`] = `"<div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" 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=\\"false\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Closes this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"></svg></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content</span></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div></div>"`;
+exports[`FlyoutService openFlyout() renders a flyout to the DOM 2`] = `"<div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" 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=\\"false\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Closes this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"></svg></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content</span></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div></div>"`;
 
 exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 1`] = `
 Array [
@@ -74,4 +74,4 @@ Array [
 ]
 `;
 
-exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"<div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" 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=\\"false\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Closes this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"></svg></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content 2</span></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div></div>"`;
+exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"<div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" 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=\\"false\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Closes this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"></svg></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content 2</span></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div></div>"`;
diff --git a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
index 3928c54f90179..131ec836f5252 100644
--- a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
+++ b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
@@ -29,7 +29,7 @@ Array [
 ]
 `;
 
-exports[`ModalService openModal() renders a modal to the DOM 2`] = `"<div data-focus-guard=\\"true\\" tabindex=\\"0\\" 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=\\"false\\"><div class=\\"euiModal euiModal--maxWidth-default\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"></svg></button><div class=\\"euiModal__flex\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div>"`;
+exports[`ModalService openModal() renders a modal to the DOM 2`] = `"<div data-focus-guard=\\"true\\" tabindex=\\"0\\" 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=\\"false\\"><div class=\\"euiModal euiModal--maxWidth-default\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"></svg></button><div class=\\"euiModal__flex\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div><div data-focus-guard=\\"true\\" tabindex=\\"0\\" style=\\"width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;\\"></div>"`;
 
 exports[`ModalService openModal() with a currently active modal replaces the current modal with a new one 1`] = `
 Array [
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 83b4e67c1cb15..f61741571dc1d 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -18,6 +18,7 @@ import { UserProvidedValues as UserProvidedValues_2 } from 'src/core/server/type
 
 // @public
 export interface App extends AppBase {
+    appRoute?: string;
     chromeless?: boolean;
     mount: AppMount | AppMountDeprecated;
 }
@@ -544,8 +545,8 @@ export interface HttpRequestInit {
 }
 
 // @public (undocumented)
-export interface HttpServiceBase {
-    addLoadingCount(countSource$: Observable<number>): void;
+export interface HttpSetup {
+    addLoadingCountSource(countSource$: Observable<number>): void;
     anonymousPaths: IAnonymousPaths;
     basePath: IBasePath;
     delete: HttpHandler;
@@ -558,16 +559,10 @@ export interface HttpServiceBase {
     patch: HttpHandler;
     post: HttpHandler;
     put: HttpHandler;
-    removeAllInterceptors(): void;
-    // @internal (undocumented)
-    stop(): void;
 }
 
 // @public
-export type HttpSetup = HttpServiceBase;
-
-// @public
-export type HttpStart = HttpServiceBase;
+export type HttpStart = HttpSetup;
 
 // @public
 export interface I18nStart {
@@ -877,7 +872,7 @@ export interface SavedObjectsBulkUpdateOptions {
 // @public
 export class SavedObjectsClient {
     // @internal
-    constructor(http: HttpServiceBase);
+    constructor(http: HttpSetup);
     bulkCreate: (objects?: SavedObjectsBulkCreateObject<SavedObjectAttributes>[], options?: SavedObjectsBulkCreateOptions) => Promise<SavedObjectsBatchResponse<SavedObjectAttributes>>;
     bulkGet: (objects?: {
         id: string;
diff --git a/src/core/public/saved_objects/saved_objects_client.ts b/src/core/public/saved_objects/saved_objects_client.ts
index c71fe51956c28..dab98ee66cdb1 100644
--- a/src/core/public/saved_objects/saved_objects_client.ts
+++ b/src/core/public/saved_objects/saved_objects_client.ts
@@ -36,7 +36,7 @@ import {
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../legacy/ui/public/error_auto_create_index/error_auto_create_index';
 import { SimpleSavedObject } from './simple_saved_object';
-import { HttpFetchOptions, HttpServiceBase } from '../http';
+import { HttpFetchOptions, HttpSetup } from '../http';
 
 type SavedObjectsFindOptions = Omit<SavedObjectFindOptionsServer, 'namespace' | 'sortOrder'>;
 
@@ -158,7 +158,7 @@ export type SavedObjectsClientContract = PublicMethodsOf<SavedObjectsClient>;
  * @public
  */
 export class SavedObjectsClient {
-  private http: HttpServiceBase;
+  private http: HttpSetup;
   private batchQueue: BatchQueueEntry[];
 
   /**
@@ -194,7 +194,7 @@ export class SavedObjectsClient {
   );
 
   /** @internal */
-  constructor(http: HttpServiceBase) {
+  constructor(http: HttpSetup) {
     this.http = http;
     this.batchQueue = [];
   }
diff --git a/src/core/public/ui_settings/ui_settings_service.test.ts b/src/core/public/ui_settings/ui_settings_service.test.ts
index afb68c4844901..2747a78d93fa6 100644
--- a/src/core/public/ui_settings/ui_settings_service.test.ts
+++ b/src/core/public/ui_settings/ui_settings_service.test.ts
@@ -38,7 +38,7 @@ describe('#stop', () => {
   it('stops the uiSettingsClient and uiSettingsApi', async () => {
     const service = new UiSettingsService();
     let loadingCount$: Rx.Observable<unknown>;
-    defaultDeps.http.addLoadingCount.mockImplementation(obs$ => (loadingCount$ = obs$));
+    defaultDeps.http.addLoadingCountSource.mockImplementation(obs$ => (loadingCount$ = obs$));
     const client = service.setup(defaultDeps);
 
     service.stop();
diff --git a/src/core/public/ui_settings/ui_settings_service.ts b/src/core/public/ui_settings/ui_settings_service.ts
index 5a03cd1cfeedc..1e01d15fa337b 100644
--- a/src/core/public/ui_settings/ui_settings_service.ts
+++ b/src/core/public/ui_settings/ui_settings_service.ts
@@ -38,7 +38,7 @@ export class UiSettingsService {
 
   public setup({ http, injectedMetadata }: UiSettingsServiceDeps): IUiSettingsClient {
     this.uiSettingsApi = new UiSettingsApi(http);
-    http.addLoadingCount(this.uiSettingsApi.getLoadingCount$());
+    http.addLoadingCountSource(this.uiSettingsApi.getLoadingCount$());
 
     // TODO: Migrate away from legacyMetadata https://github.com/elastic/kibana/issues/22779
     const legacyMetadata = injectedMetadata.getLegacyMetadata();
diff --git a/src/core/server/config/__mocks__/env.ts b/src/core/server/config/__mocks__/env.ts
index 644b499ff56d8..80cfab81fb557 100644
--- a/src/core/server/config/__mocks__/env.ts
+++ b/src/core/server/config/__mocks__/env.ts
@@ -38,6 +38,7 @@ export function getEnvOptions(options: DeepPartial<EnvOptions> = {}): EnvOptions
       basePath: false,
       optimize: false,
       oss: false,
+      runExamples: false,
       ...(options.cliArgs || {}),
     },
     isDevClusterMaster:
diff --git a/src/core/server/config/__snapshots__/env.test.ts.snap b/src/core/server/config/__snapshots__/env.test.ts.snap
index 1f4661283de6e..204b8a70aa877 100644
--- a/src/core/server/config/__snapshots__/env.test.ts.snap
+++ b/src/core/server/config/__snapshots__/env.test.ts.snap
@@ -12,6 +12,7 @@ Env {
     "oss": false,
     "quiet": false,
     "repl": false,
+    "runExamples": false,
     "silent": false,
     "watch": false,
   },
@@ -40,7 +41,6 @@ Env {
     "/test/kibanaRoot/plugins",
     "/test/kibanaRoot/../kibana-extra",
   ],
-  "staticFilesDir": "/test/kibanaRoot/ui",
 }
 `;
 
@@ -56,6 +56,7 @@ Env {
     "oss": false,
     "quiet": false,
     "repl": false,
+    "runExamples": false,
     "silent": false,
     "watch": false,
   },
@@ -84,7 +85,6 @@ Env {
     "/test/kibanaRoot/plugins",
     "/test/kibanaRoot/../kibana-extra",
   ],
-  "staticFilesDir": "/test/kibanaRoot/ui",
 }
 `;
 
@@ -99,6 +99,7 @@ Env {
     "oss": false,
     "quiet": false,
     "repl": false,
+    "runExamples": false,
     "silent": false,
     "watch": false,
   },
@@ -127,7 +128,6 @@ Env {
     "/test/kibanaRoot/plugins",
     "/test/kibanaRoot/../kibana-extra",
   ],
-  "staticFilesDir": "/test/kibanaRoot/ui",
 }
 `;
 
@@ -142,6 +142,7 @@ Env {
     "oss": false,
     "quiet": false,
     "repl": false,
+    "runExamples": false,
     "silent": false,
     "watch": false,
   },
@@ -170,7 +171,6 @@ Env {
     "/test/kibanaRoot/plugins",
     "/test/kibanaRoot/../kibana-extra",
   ],
-  "staticFilesDir": "/test/kibanaRoot/ui",
 }
 `;
 
@@ -185,6 +185,7 @@ Env {
     "oss": false,
     "quiet": false,
     "repl": false,
+    "runExamples": false,
     "silent": false,
     "watch": false,
   },
@@ -213,7 +214,6 @@ Env {
     "/test/kibanaRoot/plugins",
     "/test/kibanaRoot/../kibana-extra",
   ],
-  "staticFilesDir": "/test/kibanaRoot/ui",
 }
 `;
 
@@ -228,6 +228,7 @@ Env {
     "oss": false,
     "quiet": false,
     "repl": false,
+    "runExamples": false,
     "silent": false,
     "watch": false,
   },
@@ -256,6 +257,5 @@ Env {
     "/some/home/dir/plugins",
     "/some/home/dir/../kibana-extra",
   ],
-  "staticFilesDir": "/some/home/dir/ui",
 }
 `;
diff --git a/src/core/server/config/config.mock.ts b/src/core/server/config/config.mock.ts
new file mode 100644
index 0000000000000..e098fa142b9d1
--- /dev/null
+++ b/src/core/server/config/config.mock.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 { Config } from './config';
+
+type ConfigMock = jest.Mocked<Config>;
+
+const createConfigMock = (): ConfigMock => ({
+  has: jest.fn(),
+  get: jest.fn(),
+  set: jest.fn(),
+  getFlattenedPaths: jest.fn(),
+  toRaw: jest.fn(),
+});
+
+export const configMock = {
+  create: createConfigMock,
+};
diff --git a/src/core/server/config/deprecation/core_deprecations.ts b/src/core/server/config/deprecation/core_deprecations.ts
index 6a401ec6625a2..36fe95e05cb53 100644
--- a/src/core/server/config/deprecation/core_deprecations.ts
+++ b/src/core/server/config/deprecation/core_deprecations.ts
@@ -97,7 +97,6 @@ export const coreDeprecationProvider: ConfigDeprecationProvider = ({
 }) => [
   unusedFromRoot('savedObjects.indexCheckTimeout'),
   unusedFromRoot('server.xsrf.token'),
-  unusedFromRoot('uiSettings.enabled'),
   renameFromRoot('optimize.lazy', 'optimize.watch'),
   renameFromRoot('optimize.lazyPort', 'optimize.watchPort'),
   renameFromRoot('optimize.lazyHost', 'optimize.watchHost'),
diff --git a/src/core/server/config/env.test.ts b/src/core/server/config/env.test.ts
index 5812fa93cf18f..c244012e34469 100644
--- a/src/core/server/config/env.test.ts
+++ b/src/core/server/config/env.test.ts
@@ -152,3 +152,25 @@ test('pluginSearchPaths does not contains x-pack plugins path if --oss flag is t
 
   expect(env.pluginSearchPaths).not.toContain('/some/home/dir/x-pack/plugins');
 });
+
+test('pluginSearchPaths contains examples plugins path if --run-examples flag is true', () => {
+  const env = new Env(
+    '/some/home/dir',
+    getEnvOptions({
+      cliArgs: { runExamples: true },
+    })
+  );
+
+  expect(env.pluginSearchPaths).toContain('/some/home/dir/examples');
+});
+
+test('pluginSearchPaths does not contains examples plugins path if --run-examples flag is false', () => {
+  const env = new Env(
+    '/some/home/dir',
+    getEnvOptions({
+      cliArgs: { runExamples: false },
+    })
+  );
+
+  expect(env.pluginSearchPaths).not.toContain('/some/home/dir/examples');
+});
diff --git a/src/core/server/config/env.ts b/src/core/server/config/env.ts
index 460773d89db85..db363fcd4d751 100644
--- a/src/core/server/config/env.ts
+++ b/src/core/server/config/env.ts
@@ -43,6 +43,7 @@ export interface CliArgs {
   optimize: boolean;
   open: boolean;
   oss: boolean;
+  runExamples: boolean;
 }
 
 export class Env {
@@ -61,8 +62,6 @@ export class Env {
   /** @internal */
   public readonly logDir: string;
   /** @internal */
-  public readonly staticFilesDir: string;
-  /** @internal */
   public readonly pluginSearchPaths: readonly string[];
 
   /**
@@ -100,14 +99,14 @@ export class Env {
     this.configDir = resolve(this.homeDir, 'config');
     this.binDir = resolve(this.homeDir, 'bin');
     this.logDir = resolve(this.homeDir, 'log');
-    this.staticFilesDir = resolve(this.homeDir, 'ui');
 
     this.pluginSearchPaths = [
       resolve(this.homeDir, 'src', 'plugins'),
-      options.cliArgs.oss ? '' : resolve(this.homeDir, 'x-pack', 'plugins'),
+      ...(options.cliArgs.oss ? [] : [resolve(this.homeDir, 'x-pack', 'plugins')]),
       resolve(this.homeDir, 'plugins'),
+      ...(options.cliArgs.runExamples ? [resolve(this.homeDir, 'examples')] : []),
       resolve(this.homeDir, '..', 'kibana-extra'),
-    ].filter(Boolean);
+    ];
 
     this.cliArgs = Object.freeze(options.cliArgs);
     this.configs = Object.freeze(options.configs);
diff --git a/src/core/server/elasticsearch/cluster_client.ts b/src/core/server/elasticsearch/cluster_client.ts
index d43ab9d546ed2..2352677b8d3e0 100644
--- a/src/core/server/elasticsearch/cluster_client.ts
+++ b/src/core/server/elasticsearch/cluster_client.ts
@@ -89,15 +89,35 @@ export interface FakeRequest {
 }
 
 /**
- * Represents an Elasticsearch cluster API client and allows to call API on behalf
- * of the internal Kibana user and the actual user that is derived from the request
- * headers (via `asScoped(...)`).
+ * Represents an Elasticsearch cluster API client created by the platform.
+ * It allows to call API on behalf of the internal Kibana user and
+ * the actual user that is derived from the request headers (via `asScoped(...)`).
  *
  * See {@link ClusterClient}.
  *
  * @public
  */
-export type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+export type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
+
+/**
+ * Represents an Elasticsearch cluster API client created by a plugin.
+ * It allows to call API on behalf of the internal Kibana user and
+ * the actual user that is derived from the request headers (via `asScoped(...)`).
+ *
+ * See {@link ClusterClient}.
+ *
+ * @public
+ */
+export type ICustomClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+
+/**
+ A user credentials container.
+ * It accommodates the necessary auth credentials to impersonate the current user.
+ *
+ * @public
+ * See {@link KibanaRequest}.
+ */
+export type ScopeableRequest = KibanaRequest | LegacyRequest | FakeRequest;
 
 /**
  * {@inheritDoc IClusterClient}
@@ -174,7 +194,7 @@ export class ClusterClient implements IClusterClient {
    * @param request - Request the `IScopedClusterClient` instance will be scoped to.
    * Supports request optionality, Legacy.Request & FakeRequest for BWC with LegacyPlatform
    */
-  public asScoped(request?: KibanaRequest | LegacyRequest | FakeRequest): IScopedClusterClient {
+  public asScoped(request?: ScopeableRequest): IScopedClusterClient {
     // It'd have been quite expensive to create and configure client for every incoming
     // request since it involves parsing of the config, reading of the SSL certificate and
     // key files etc. Moreover scoped client needs two Elasticsearch JS clients at the same
diff --git a/src/core/server/elasticsearch/elasticsearch_service.mock.ts b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
index d935d1a66eccf..1b52f22c4da09 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.mock.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
@@ -18,33 +18,67 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { IClusterClient } from './cluster_client';
+import { IClusterClient, ICustomClusterClient } from './cluster_client';
 import { IScopedClusterClient } from './scoped_cluster_client';
 import { ElasticsearchConfig } from './elasticsearch_config';
 import { ElasticsearchService } from './elasticsearch_service';
-import { InternalElasticsearchServiceSetup } from './types';
+import { InternalElasticsearchServiceSetup, ElasticsearchServiceSetup } from './types';
 
 const createScopedClusterClientMock = (): jest.Mocked<IScopedClusterClient> => ({
   callAsInternalUser: jest.fn(),
   callAsCurrentUser: jest.fn(),
 });
 
-const createClusterClientMock = (): jest.Mocked<IClusterClient> => ({
-  callAsInternalUser: jest.fn(),
-  asScoped: jest.fn().mockImplementation(createScopedClusterClientMock),
+const createCustomClusterClientMock = (): jest.Mocked<ICustomClusterClient> => ({
+  ...createClusterClientMock(),
   close: jest.fn(),
 });
 
+function createClusterClientMock() {
+  const client: jest.Mocked<IClusterClient> = {
+    callAsInternalUser: jest.fn(),
+    asScoped: jest.fn(),
+  };
+  client.asScoped.mockReturnValue(createScopedClusterClientMock());
+  return client;
+}
+
+type MockedElasticSearchServiceSetup = jest.Mocked<
+  ElasticsearchServiceSetup & {
+    adminClient: jest.Mocked<IClusterClient>;
+    dataClient: jest.Mocked<IClusterClient>;
+  }
+>;
+
 const createSetupContractMock = () => {
-  const setupContract: jest.Mocked<InternalElasticsearchServiceSetup> = {
+  const setupContract: MockedElasticSearchServiceSetup = {
+    createClient: jest.fn(),
+    adminClient: createClusterClientMock(),
+    dataClient: createClusterClientMock(),
+  };
+  setupContract.createClient.mockReturnValue(createCustomClusterClientMock());
+  setupContract.adminClient.asScoped.mockReturnValue(createScopedClusterClientMock());
+  setupContract.dataClient.asScoped.mockReturnValue(createScopedClusterClientMock());
+  return setupContract;
+};
+
+type MockedInternalElasticSearchServiceSetup = jest.Mocked<
+  InternalElasticsearchServiceSetup & {
+    adminClient: jest.Mocked<IClusterClient>;
+    dataClient: jest.Mocked<IClusterClient>;
+  }
+>;
+const createInternalSetupContractMock = () => {
+  const setupContract: MockedInternalElasticSearchServiceSetup = {
+    ...createSetupContractMock(),
     legacy: {
       config$: new BehaviorSubject({} as ElasticsearchConfig),
     },
-
-    createClient: jest.fn().mockImplementation(createClusterClientMock),
-    adminClient$: new BehaviorSubject((createClusterClientMock() as unknown) as IClusterClient),
-    dataClient$: new BehaviorSubject((createClusterClientMock() as unknown) as IClusterClient),
+    adminClient$: new BehaviorSubject(createClusterClientMock()),
+    dataClient$: new BehaviorSubject(createClusterClientMock()),
   };
+  setupContract.adminClient.asScoped.mockReturnValue(createScopedClusterClientMock());
+  setupContract.dataClient.asScoped.mockReturnValue(createScopedClusterClientMock());
   return setupContract;
 };
 
@@ -55,14 +89,16 @@ const createMock = () => {
     start: jest.fn(),
     stop: jest.fn(),
   };
-  mocked.setup.mockResolvedValue(createSetupContractMock());
+  mocked.setup.mockResolvedValue(createInternalSetupContractMock());
   mocked.stop.mockResolvedValue();
   return mocked;
 };
 
 export const elasticsearchServiceMock = {
   create: createMock,
-  createSetupContract: createSetupContractMock,
+  createInternalSetup: createInternalSetupContractMock,
+  createSetup: createSetupContractMock,
   createClusterClient: createClusterClientMock,
+  createCustomClusterClient: createCustomClusterClientMock,
   createScopedClusterClient: createScopedClusterClientMock,
 };
diff --git a/src/core/server/elasticsearch/elasticsearch_service.test.ts b/src/core/server/elasticsearch/elasticsearch_service.test.ts
index 6c4a1f263bc71..aefc8b1fdf047 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.test.ts
@@ -30,6 +30,7 @@ import { loggingServiceMock } from '../logging/logging_service.mock';
 import { httpServiceMock } from '../http/http_service.mock';
 import { ElasticsearchConfig } from './elasticsearch_config';
 import { ElasticsearchService } from './elasticsearch_service';
+import { elasticsearchServiceMock } from './elasticsearch_service.mock';
 
 let elasticsearchService: ElasticsearchService;
 const configService = configServiceMock.create();
@@ -69,6 +70,27 @@ describe('#setup', () => {
     );
   });
 
+  it('returns data and admin client as a part of the contract', async () => {
+    const mockAdminClusterClientInstance = elasticsearchServiceMock.createClusterClient();
+    const mockDataClusterClientInstance = elasticsearchServiceMock.createClusterClient();
+    MockClusterClient.mockImplementationOnce(
+      () => mockAdminClusterClientInstance
+    ).mockImplementationOnce(() => mockDataClusterClientInstance);
+
+    const setupContract = await elasticsearchService.setup(deps);
+
+    const adminClient = setupContract.adminClient;
+    const dataClient = setupContract.dataClient;
+
+    expect(mockAdminClusterClientInstance.callAsInternalUser).toHaveBeenCalledTimes(0);
+    await adminClient.callAsInternalUser('any');
+    expect(mockAdminClusterClientInstance.callAsInternalUser).toHaveBeenCalledTimes(1);
+
+    expect(mockDataClusterClientInstance.callAsInternalUser).toHaveBeenCalledTimes(0);
+    await dataClient.callAsInternalUser('any');
+    expect(mockDataClusterClientInstance.callAsInternalUser).toHaveBeenCalledTimes(1);
+  });
+
   it('returns data and admin client observables as a part of the contract', async () => {
     const mockAdminClusterClientInstance = { close: jest.fn() };
     const mockDataClusterClientInstance = { close: jest.fn() };
diff --git a/src/core/server/elasticsearch/elasticsearch_service.ts b/src/core/server/elasticsearch/elasticsearch_service.ts
index be0a817c54146..de32e7f6cf225 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.ts
@@ -18,17 +18,18 @@
  */
 
 import { ConnectableObservable, Observable, Subscription } from 'rxjs';
-import { filter, first, map, publishReplay, switchMap } from 'rxjs/operators';
+import { filter, first, map, publishReplay, switchMap, take } from 'rxjs/operators';
 
 import { CoreService } from '../../types';
 import { merge } from '../../utils';
 import { CoreContext } from '../core_context';
 import { Logger } from '../logging';
-import { ClusterClient } from './cluster_client';
+import { ClusterClient, ScopeableRequest } from './cluster_client';
 import { ElasticsearchClientConfig } from './elasticsearch_client_config';
 import { ElasticsearchConfig, ElasticsearchConfigType } from './elasticsearch_config';
 import { InternalHttpServiceSetup, GetAuthHeaders } from '../http/';
 import { InternalElasticsearchServiceSetup } from './types';
+import { CallAPIOptions } from './api_types';
 
 /** @internal */
 interface CoreClusterClients {
@@ -94,11 +95,67 @@ export class ElasticsearchService implements CoreService<InternalElasticsearchSe
 
     const config = await this.config$.pipe(first()).toPromise();
 
+    const adminClient$ = clients$.pipe(map(clients => clients.adminClient));
+    const dataClient$ = clients$.pipe(map(clients => clients.dataClient));
+
+    const adminClient = {
+      async callAsInternalUser(
+        endpoint: string,
+        clientParams: Record<string, any> = {},
+        options?: CallAPIOptions
+      ) {
+        const client = await adminClient$.pipe(take(1)).toPromise();
+        return await client.callAsInternalUser(endpoint, clientParams, options);
+      },
+      asScoped(request: ScopeableRequest) {
+        return {
+          callAsInternalUser: adminClient.callAsInternalUser,
+          async callAsCurrentUser(
+            endpoint: string,
+            clientParams: Record<string, any> = {},
+            options?: CallAPIOptions
+          ) {
+            const client = await adminClient$.pipe(take(1)).toPromise();
+            return await client
+              .asScoped(request)
+              .callAsCurrentUser(endpoint, clientParams, options);
+          },
+        };
+      },
+    };
+    const dataClient = {
+      async callAsInternalUser(
+        endpoint: string,
+        clientParams: Record<string, any> = {},
+        options?: CallAPIOptions
+      ) {
+        const client = await dataClient$.pipe(take(1)).toPromise();
+        return await client.callAsInternalUser(endpoint, clientParams, options);
+      },
+      asScoped(request: ScopeableRequest) {
+        return {
+          callAsInternalUser: dataClient.callAsInternalUser,
+          async callAsCurrentUser(
+            endpoint: string,
+            clientParams: Record<string, any> = {},
+            options?: CallAPIOptions
+          ) {
+            const client = await dataClient$.pipe(take(1)).toPromise();
+            return await client
+              .asScoped(request)
+              .callAsCurrentUser(endpoint, clientParams, options);
+          },
+        };
+      },
+    };
+
     return {
       legacy: { config$: clients$.pipe(map(clients => clients.config)) },
 
-      adminClient$: clients$.pipe(map(clients => clients.adminClient)),
-      dataClient$: clients$.pipe(map(clients => clients.dataClient)),
+      adminClient$,
+      dataClient$,
+      adminClient,
+      dataClient,
 
       createClient: (type: string, clientConfig: Partial<ElasticsearchClientConfig> = {}) => {
         const finalConfig = merge({}, config, clientConfig);
diff --git a/src/core/server/elasticsearch/index.ts b/src/core/server/elasticsearch/index.ts
index 1f99f86d9887b..5d64fadfaa184 100644
--- a/src/core/server/elasticsearch/index.ts
+++ b/src/core/server/elasticsearch/index.ts
@@ -18,7 +18,13 @@
  */
 
 export { ElasticsearchService } from './elasticsearch_service';
-export { IClusterClient, ClusterClient, FakeRequest } from './cluster_client';
+export {
+  ClusterClient,
+  FakeRequest,
+  IClusterClient,
+  ICustomClusterClient,
+  ScopeableRequest,
+} from './cluster_client';
 export { IScopedClusterClient, ScopedClusterClient, Headers } from './scoped_cluster_client';
 export { ElasticsearchClientConfig } from './elasticsearch_client_config';
 export { config } from './elasticsearch_config';
diff --git a/src/core/server/elasticsearch/types.ts b/src/core/server/elasticsearch/types.ts
index 505b57c7c9e8e..22340bf3f2fc6 100644
--- a/src/core/server/elasticsearch/types.ts
+++ b/src/core/server/elasticsearch/types.ts
@@ -20,7 +20,7 @@
 import { Observable } from 'rxjs';
 import { ElasticsearchConfig } from './elasticsearch_config';
 import { ElasticsearchClientConfig } from './elasticsearch_client_config';
-import { IClusterClient } from './cluster_client';
+import { IClusterClient, ICustomClusterClient } from './cluster_client';
 
 /**
  * @public
@@ -46,29 +46,29 @@ export interface ElasticsearchServiceSetup {
   readonly createClient: (
     type: string,
     clientConfig?: Partial<ElasticsearchClientConfig>
-  ) => IClusterClient;
+  ) => ICustomClusterClient;
 
   /**
-   * Observable of clients for the `admin` cluster. Observable emits when Elasticsearch config changes on the Kibana
-   * server. See {@link IClusterClient}.
+   * A client for the `admin` cluster. All Elasticsearch config value changes are processed under the hood.
+   * See {@link IClusterClient}.
    *
-   * @exmaple
+   * @example
    * ```js
-   * const client = await elasticsearch.adminClient$.pipe(take(1)).toPromise();
+   * const client = core.elasticsearch.adminClient;
    * ```
    */
-  readonly adminClient$: Observable<IClusterClient>;
+  readonly adminClient: IClusterClient;
 
   /**
-   * Observable of clients for the `data` cluster. Observable emits when Elasticsearch config changes on the Kibana
-   * server. See {@link IClusterClient}.
+   * A client for the `data` cluster. All Elasticsearch config value changes are processed under the hood.
+   * See {@link IClusterClient}.
    *
-   * @exmaple
+   * @example
    * ```js
-   * const client = await elasticsearch.dataClient$.pipe(take(1)).toPromise();
+   * const client = core.elasticsearch.dataClient;
    * ```
    */
-  readonly dataClient$: Observable<IClusterClient>;
+  readonly dataClient: IClusterClient;
 }
 
 /** @internal */
@@ -77,4 +77,7 @@ export interface InternalElasticsearchServiceSetup extends ElasticsearchServiceS
   readonly legacy: {
     readonly config$: Observable<ElasticsearchConfig>;
   };
+
+  readonly adminClient$: Observable<IClusterClient>;
+  readonly dataClient$: Observable<IClusterClient>;
 }
diff --git a/src/core/server/http/__snapshots__/http_config.test.ts.snap b/src/core/server/http/__snapshots__/http_config.test.ts.snap
index 6c690f9da70c3..8856eb95ba722 100644
--- a/src/core/server/http/__snapshots__/http_config.test.ts.snap
+++ b/src/core/server/http/__snapshots__/http_config.test.ts.snap
@@ -31,11 +31,13 @@ Object {
     "enabled": true,
   },
   "cors": false,
+  "customResponseHeaders": Object {},
   "host": "localhost",
   "keepaliveTimeout": 120000,
   "maxPayload": ByteSizeValue {
     "valueInBytes": 1048576,
   },
+  "name": "kibana-hostname",
   "port": 5601,
   "rewriteBasePath": false,
   "socketTimeout": 120000,
@@ -70,6 +72,10 @@ Object {
       "TLSv1.2",
     ],
   },
+  "xsrf": Object {
+    "disableProtection": false,
+    "whitelist": Array [],
+  },
 }
 `;
 
diff --git a/src/core/server/http/cookie_session_storage.test.ts b/src/core/server/http/cookie_session_storage.test.ts
index 0e4f3972fe9dc..4ce422e1f65c4 100644
--- a/src/core/server/http/cookie_session_storage.test.ts
+++ b/src/core/server/http/cookie_session_storage.test.ts
@@ -58,6 +58,10 @@ configService.atPath.mockReturnValue(
       verificationMode: 'none',
     },
     compression: { enabled: true },
+    xsrf: {
+      disableProtection: true,
+      whitelist: [],
+    },
   } as any)
 );
 
diff --git a/src/core/server/http/http_config.test.ts b/src/core/server/http/http_config.test.ts
index 888313e1478cb..3dc5fa48bc366 100644
--- a/src/core/server/http/http_config.test.ts
+++ b/src/core/server/http/http_config.test.ts
@@ -17,13 +17,17 @@
  * under the License.
  */
 
+import uuid from 'uuid';
 import { config, HttpConfig } from '.';
-import { Env } from '../config';
-import { getEnvOptions } from '../config/__mocks__/env';
 
 const validHostnames = ['www.example.com', '8.8.8.8', '::1', 'localhost'];
 const invalidHostname = 'asdf$%^';
 
+jest.mock('os', () => ({
+  ...jest.requireActual('os'),
+  hostname: () => 'kibana-hostname',
+}));
+
 test('has defaults for config', () => {
   const httpSchema = config.schema;
   const obj = {};
@@ -77,6 +81,32 @@ test('throws if basepath is not specified, but rewriteBasePath is set', () => {
   expect(() => httpSchema.validate(obj)).toThrowErrorMatchingSnapshot();
 });
 
+test('accepts only valid uuids for server.uuid', () => {
+  const httpSchema = config.schema;
+  expect(() => httpSchema.validate({ uuid: uuid.v4() })).not.toThrow();
+  expect(() => httpSchema.validate({ uuid: 'not an uuid' })).toThrowErrorMatchingInlineSnapshot(
+    `"[uuid]: must be a valid uuid"`
+  );
+});
+
+test('uses os.hostname() as default for server.name', () => {
+  const httpSchema = config.schema;
+  const validated = httpSchema.validate({});
+  expect(validated.name).toEqual('kibana-hostname');
+});
+
+test('throws if xsrf.whitelist element does not start with a slash', () => {
+  const httpSchema = config.schema;
+  const obj = {
+    xsrf: {
+      whitelist: ['/valid-path', 'invalid-path'],
+    },
+  };
+  expect(() => httpSchema.validate(obj)).toThrowErrorMatchingInlineSnapshot(
+    `"[xsrf.whitelist.1]: must start with a slash"`
+  );
+});
+
 describe('with TLS', () => {
   test('throws if TLS is enabled but `key` is not specified', () => {
     const httpSchema = config.schema;
@@ -256,8 +286,7 @@ describe('with TLS', () => {
           clientAuthentication: 'none',
         },
       }),
-      {} as any,
-      Env.createDefault(getEnvOptions())
+      {} as any
     );
 
     expect(httpConfig.ssl.requestCert).toBe(false);
@@ -274,8 +303,7 @@ describe('with TLS', () => {
           clientAuthentication: 'optional',
         },
       }),
-      {} as any,
-      Env.createDefault(getEnvOptions())
+      {} as any
     );
 
     expect(httpConfig.ssl.requestCert).toBe(true);
@@ -292,8 +320,7 @@ describe('with TLS', () => {
           clientAuthentication: 'required',
         },
       }),
-      {} as any,
-      Env.createDefault(getEnvOptions())
+      {} as any
     );
 
     expect(httpConfig.ssl.requestCert).toBe(true);
diff --git a/src/core/server/http/http_config.ts b/src/core/server/http/http_config.ts
index 912459c83df6e..73f44f3c5ab5c 100644
--- a/src/core/server/http/http_config.ts
+++ b/src/core/server/http/http_config.ts
@@ -18,11 +18,13 @@
  */
 
 import { ByteSizeValue, schema, TypeOf } from '@kbn/config-schema';
-import { Env } from '../config';
+import { hostname } from 'os';
+
 import { CspConfigType, CspConfig, ICspConfig } from '../csp';
 import { SslConfig, sslSchema } from './ssl_config';
 
 const validBasePathRegex = /(^$|^\/.*[^\/]$)/;
+const uuidRegexp = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 
 const match = (regex: RegExp, errorMsg: string) => (str: string) =>
   regex.test(str) ? undefined : errorMsg;
@@ -33,21 +35,13 @@ export const config = {
   path: 'server',
   schema: schema.object(
     {
+      name: schema.string({ defaultValue: () => hostname() }),
       autoListen: schema.boolean({ defaultValue: true }),
       basePath: schema.maybe(
         schema.string({
           validate: match(validBasePathRegex, "must start with a slash, don't end with one"),
         })
       ),
-      defaultRoute: schema.maybe(
-        schema.string({
-          validate(value) {
-            if (!value.startsWith('/')) {
-              return 'must start with a slash';
-            }
-          },
-        })
-      ),
       cors: schema.conditional(
         schema.contextRef('dev'),
         true,
@@ -63,6 +57,9 @@ export const config = {
         ),
         schema.boolean({ defaultValue: false })
       ),
+      customResponseHeaders: schema.recordOf(schema.string(), schema.string(), {
+        defaultValue: {},
+      }),
       host: schema.string({
         defaultValue: 'localhost',
         hostname: true,
@@ -92,6 +89,18 @@ export const config = {
           )
         ),
       }),
+      uuid: schema.maybe(
+        schema.string({
+          validate: match(uuidRegexp, 'must be a valid uuid'),
+        })
+      ),
+      xsrf: schema.object({
+        disableProtection: schema.boolean({ defaultValue: false }),
+        whitelist: schema.arrayOf(
+          schema.string({ validate: match(/^\//, 'must start with a slash') }),
+          { defaultValue: [] }
+        ),
+      }),
     },
     {
       validate: rawConfig => {
@@ -120,38 +129,40 @@ export const config = {
 export type HttpConfigType = TypeOf<typeof config.schema>;
 
 export class HttpConfig {
+  public name: string;
   public autoListen: boolean;
   public host: string;
   public keepaliveTimeout: number;
   public socketTimeout: number;
   public port: number;
   public cors: boolean | { origin: string[] };
+  public customResponseHeaders: Record<string, string>;
   public maxPayload: ByteSizeValue;
   public basePath?: string;
   public rewriteBasePath: boolean;
-  public publicDir: string;
-  public defaultRoute?: string;
   public ssl: SslConfig;
   public compression: { enabled: boolean; referrerWhitelist?: string[] };
   public csp: ICspConfig;
+  public xsrf: { disableProtection: boolean; whitelist: string[] };
 
   /**
    * @internal
    */
-  constructor(rawHttpConfig: HttpConfigType, rawCspConfig: CspConfigType, env: Env) {
+  constructor(rawHttpConfig: HttpConfigType, rawCspConfig: CspConfigType) {
     this.autoListen = rawHttpConfig.autoListen;
     this.host = rawHttpConfig.host;
     this.port = rawHttpConfig.port;
     this.cors = rawHttpConfig.cors;
+    this.customResponseHeaders = rawHttpConfig.customResponseHeaders;
     this.maxPayload = rawHttpConfig.maxPayload;
+    this.name = rawHttpConfig.name;
     this.basePath = rawHttpConfig.basePath;
     this.keepaliveTimeout = rawHttpConfig.keepaliveTimeout;
     this.socketTimeout = rawHttpConfig.socketTimeout;
     this.rewriteBasePath = rawHttpConfig.rewriteBasePath;
-    this.publicDir = env.staticFilesDir;
     this.ssl = new SslConfig(rawHttpConfig.ssl || {});
-    this.defaultRoute = rawHttpConfig.defaultRoute;
     this.compression = rawHttpConfig.compression;
     this.csp = new CspConfig(rawCspConfig);
+    this.xsrf = rawHttpConfig.xsrf;
   }
 }
diff --git a/src/core/server/http/http_server.mocks.ts b/src/core/server/http/http_server.mocks.ts
index 8469a1d23a44b..230a229b36888 100644
--- a/src/core/server/http/http_server.mocks.ts
+++ b/src/core/server/http/http_server.mocks.ts
@@ -30,6 +30,9 @@ import {
   RouteMethod,
   KibanaResponseFactory,
 } from './router';
+import { OnPreResponseToolkit } from './lifecycle/on_pre_response';
+import { OnPostAuthToolkit } from './lifecycle/on_post_auth';
+import { OnPreAuthToolkit } from './lifecycle/on_pre_auth';
 
 interface RequestFixtureOptions {
   headers?: Record<string, string>;
@@ -77,7 +80,7 @@ function createKibanaRequestMock({
       body: schema.object({}, { allowUnknowns: true }),
       query: schema.object({}, { allowUnknowns: true }),
     }
-  ) as KibanaRequest<Readonly<{}>, Readonly<{}>, Readonly<{}>>;
+  );
 }
 
 type DeepPartial<T> = T extends any[]
@@ -137,9 +140,19 @@ const createLifecycleResponseFactoryMock = (): jest.Mocked<LifecycleResponseFact
   customError: jest.fn(),
 });
 
+type ToolkitMock = jest.Mocked<OnPreResponseToolkit & OnPostAuthToolkit & OnPreAuthToolkit>;
+
+const createToolkitMock = (): ToolkitMock => {
+  return {
+    next: jest.fn(),
+    rewriteUrl: jest.fn(),
+  };
+};
+
 export const httpServerMock = {
   createKibanaRequest: createKibanaRequestMock,
   createRawRequest: createRawRequestMock,
   createResponseFactory: createResponseFactoryMock,
   createLifecycleResponseFactory: createLifecycleResponseFactoryMock,
+  createToolkit: createToolkitMock,
 };
diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts
index 27d9f530050be..df357aeaf2731 100644
--- a/src/core/server/http/http_server.test.ts
+++ b/src/core/server/http/http_server.test.ts
@@ -27,10 +27,18 @@ import supertest from 'supertest';
 
 import { ByteSizeValue, schema } from '@kbn/config-schema';
 import { HttpConfig } from './http_config';
-import { Router } from './router';
+import {
+  Router,
+  KibanaRequest,
+  KibanaResponseFactory,
+  RequestHandler,
+  RouteValidationResultFactory,
+  RouteValidationFunction,
+} from './router';
 import { loggingServiceMock } from '../logging/logging_service.mock';
 import { HttpServer } from './http_server';
 import { Readable } from 'stream';
+import { RequestHandlerContext } from 'kibana/server';
 
 const cookieOptions = {
   name: 'sid',
@@ -288,6 +296,229 @@ test('valid body', async () => {
     });
 });
 
+test('valid body with validate function', async () => {
+  const router = new Router('/foo', logger, enhanceWithContext);
+
+  router.post(
+    {
+      path: '/',
+      validate: {
+        body: ({ bar, baz } = {}, { ok, badRequest }) => {
+          if (typeof bar === 'string' && typeof baz === 'number') {
+            return ok({ bar, baz });
+          } else {
+            return badRequest('Wrong payload', ['body']);
+          }
+        },
+      },
+    },
+    (context, req, res) => {
+      return res.ok({ body: req.body });
+    }
+  );
+
+  const { registerRouter, server: innerServer } = await server.setup(config);
+  registerRouter(router);
+
+  await server.start();
+
+  await supertest(innerServer.listener)
+    .post('/foo/')
+    .send({
+      bar: 'test',
+      baz: 123,
+    })
+    .expect(200)
+    .then(res => {
+      expect(res.body).toEqual({ bar: 'test', baz: 123 });
+    });
+});
+
+test('not inline validation - specifying params', async () => {
+  const router = new Router('/foo', logger, enhanceWithContext);
+
+  const bodyValidation = (
+    { bar, baz }: any = {},
+    { ok, badRequest }: RouteValidationResultFactory
+  ) => {
+    if (typeof bar === 'string' && typeof baz === 'number') {
+      return ok({ bar, baz });
+    } else {
+      return badRequest('Wrong payload', ['body']);
+    }
+  };
+
+  router.post(
+    {
+      path: '/',
+      validate: {
+        body: bodyValidation,
+      },
+    },
+    (context, req, res) => {
+      return res.ok({ body: req.body });
+    }
+  );
+
+  const { registerRouter, server: innerServer } = await server.setup(config);
+  registerRouter(router);
+
+  await server.start();
+
+  await supertest(innerServer.listener)
+    .post('/foo/')
+    .send({
+      bar: 'test',
+      baz: 123,
+    })
+    .expect(200)
+    .then(res => {
+      expect(res.body).toEqual({ bar: 'test', baz: 123 });
+    });
+});
+
+test('not inline validation - specifying validation handler', async () => {
+  const router = new Router('/foo', logger, enhanceWithContext);
+
+  const bodyValidation: RouteValidationFunction<{ bar: string; baz: number }> = (
+    { bar, baz } = {},
+    { ok, badRequest }
+  ) => {
+    if (typeof bar === 'string' && typeof baz === 'number') {
+      return ok({ bar, baz });
+    } else {
+      return badRequest('Wrong payload', ['body']);
+    }
+  };
+
+  router.post(
+    {
+      path: '/',
+      validate: {
+        body: bodyValidation,
+      },
+    },
+    (context, req, res) => {
+      return res.ok({ body: req.body });
+    }
+  );
+
+  const { registerRouter, server: innerServer } = await server.setup(config);
+  registerRouter(router);
+
+  await server.start();
+
+  await supertest(innerServer.listener)
+    .post('/foo/')
+    .send({
+      bar: 'test',
+      baz: 123,
+    })
+    .expect(200)
+    .then(res => {
+      expect(res.body).toEqual({ bar: 'test', baz: 123 });
+    });
+});
+
+// https://github.com/elastic/kibana/issues/47047
+test('not inline handler - KibanaRequest', async () => {
+  const router = new Router('/foo', logger, enhanceWithContext);
+
+  const handler = (
+    context: RequestHandlerContext,
+    req: KibanaRequest<unknown, unknown, { bar: string; baz: number }>,
+    res: KibanaResponseFactory
+  ) => {
+    const body = {
+      bar: req.body.bar.toUpperCase(),
+      baz: req.body.baz.toString(),
+    };
+
+    return res.ok({ body });
+  };
+
+  router.post(
+    {
+      path: '/',
+      validate: {
+        body: ({ bar, baz } = {}, { ok, badRequest }) => {
+          if (typeof bar === 'string' && typeof baz === 'number') {
+            return ok({ bar, baz });
+          } else {
+            return badRequest('Wrong payload', ['body']);
+          }
+        },
+      },
+    },
+    handler
+  );
+
+  const { registerRouter, server: innerServer } = await server.setup(config);
+  registerRouter(router);
+
+  await server.start();
+
+  await supertest(innerServer.listener)
+    .post('/foo/')
+    .send({
+      bar: 'test',
+      baz: 123,
+    })
+    .expect(200)
+    .then(res => {
+      expect(res.body).toEqual({ bar: 'TEST', baz: '123' });
+    });
+});
+
+test('not inline handler - RequestHandler', async () => {
+  const router = new Router('/foo', logger, enhanceWithContext);
+
+  const handler: RequestHandler<unknown, unknown, { bar: string; baz: number }> = (
+    context,
+    req,
+    res
+  ) => {
+    const body = {
+      bar: req.body.bar.toUpperCase(),
+      baz: req.body.baz.toString(),
+    };
+
+    return res.ok({ body });
+  };
+
+  router.post(
+    {
+      path: '/',
+      validate: {
+        body: ({ bar, baz } = {}, { ok, badRequest }) => {
+          if (typeof bar === 'string' && typeof baz === 'number') {
+            return ok({ bar, baz });
+          } else {
+            return badRequest('Wrong payload', ['body']);
+          }
+        },
+      },
+    },
+    handler
+  );
+
+  const { registerRouter, server: innerServer } = await server.setup(config);
+  registerRouter(router);
+
+  await server.start();
+
+  await supertest(innerServer.listener)
+    .post('/foo/')
+    .send({
+      bar: 'test',
+      baz: 123,
+    })
+    .expect(200)
+    .then(res => {
+      expect(res.body).toEqual({ bar: 'TEST', baz: '123' });
+    });
+});
+
 test('invalid body', async () => {
   const router = new Router('/foo', logger, enhanceWithContext);
 
diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts
index 994a6cced8914..6b978b71c6f2b 100644
--- a/src/core/server/http/http_server.ts
+++ b/src/core/server/http/http_server.ts
@@ -60,6 +60,12 @@ export interface HttpServerSetup {
   };
 }
 
+/** @internal */
+export type LifecycleRegistrar = Pick<
+  HttpServerSetup,
+  'registerAuth' | 'registerOnPreAuth' | 'registerOnPostAuth' | 'registerOnPreResponse'
+>;
+
 export class HttpServer {
   private server?: Server;
   private config?: HttpConfig;
diff --git a/src/core/server/http/http_service.mock.ts b/src/core/server/http/http_service.mock.ts
index 1668b409050b7..6db1ca80ab437 100644
--- a/src/core/server/http/http_service.mock.ts
+++ b/src/core/server/http/http_service.mock.ts
@@ -20,6 +20,7 @@
 import { Server } from 'hapi';
 import { CspConfig } from '../csp';
 import { mockRouter } from './router/router.mock';
+import { configMock } from '../config/config.mock';
 import { InternalHttpServiceSetup } from './types';
 import { HttpService } from './http_service';
 import { OnPreAuthToolkit } from './lifecycle/on_pre_auth';
@@ -28,13 +29,14 @@ import { sessionStorageMock } from './cookie_session_storage.mocks';
 import { OnPostAuthToolkit } from './lifecycle/on_post_auth';
 import { OnPreResponseToolkit } from './lifecycle/on_pre_response';
 
+type BasePathMocked = jest.Mocked<InternalHttpServiceSetup['basePath']>;
 export type HttpServiceSetupMock = jest.Mocked<InternalHttpServiceSetup> & {
-  basePath: jest.Mocked<InternalHttpServiceSetup['basePath']>;
+  basePath: BasePathMocked;
 };
 
-const createBasePathMock = (): jest.Mocked<InternalHttpServiceSetup['basePath']> => ({
-  serverBasePath: '/mock-server-basepath',
-  get: jest.fn(),
+const createBasePathMock = (serverBasePath = '/mock-server-basepath'): BasePathMocked => ({
+  serverBasePath,
+  get: jest.fn().mockReturnValue(serverBasePath),
   set: jest.fn(),
   prepend: jest.fn(),
   remove: jest.fn(),
@@ -44,9 +46,12 @@ const createSetupContractMock = () => {
   const setupContract: HttpServiceSetupMock = {
     // we can mock other hapi server methods when we need it
     server: ({
+      name: 'http-server-test',
+      version: 'kibana',
       route: jest.fn(),
       start: jest.fn(),
       stop: jest.fn(),
+      config: jest.fn().mockReturnValue(configMock.create()),
     } as unknown) as jest.MockedClass<Server>,
     createCookieSessionStorageFactory: jest.fn(),
     registerOnPreAuth: jest.fn(),
@@ -63,7 +68,6 @@ const createSetupContractMock = () => {
       getAuthHeaders: jest.fn(),
     },
     isTlsEnabled: false,
-    config: {},
   };
   setupContract.createCookieSessionStorageFactory.mockResolvedValue(
     sessionStorageMock.createFactory()
diff --git a/src/core/server/http/http_service.test.mocks.ts b/src/core/server/http/http_service.test.mocks.ts
index c147944f2b7d8..e18008d3b405d 100644
--- a/src/core/server/http/http_service.test.mocks.ts
+++ b/src/core/server/http/http_service.test.mocks.ts
@@ -27,3 +27,7 @@ jest.mock('./http_server', () => {
     HttpServer: mockHttpServer,
   };
 });
+
+jest.mock('./lifecycle_handlers', () => ({
+  registerCoreHandlers: jest.fn(),
+}));
diff --git a/src/core/server/http/http_service.ts b/src/core/server/http/http_service.ts
index faeae0b559b6b..ae9d53f9fd3db 100644
--- a/src/core/server/http/http_service.ts
+++ b/src/core/server/http/http_service.ts
@@ -21,11 +21,10 @@ import { Observable, Subscription, combineLatest } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 import { Server } from 'hapi';
 
-import { LoggerFactory } from '../logging';
 import { CoreService } from '../../types';
-
-import { Logger } from '../logging';
+import { Logger, LoggerFactory } from '../logging';
 import { ContextSetup } from '../context';
+import { Env } from '../config';
 import { CoreContext } from '../core_context';
 import { PluginOpaqueId } from '../plugins';
 import { CspConfigType, config as cspConfig } from '../csp';
@@ -43,6 +42,7 @@ import {
 } from './types';
 
 import { RequestHandlerContext } from '../../server';
+import { registerCoreHandlers } from './lifecycle_handlers';
 
 interface SetupDeps {
   context: ContextSetup;
@@ -57,6 +57,7 @@ export class HttpService implements CoreService<InternalHttpServiceSetup, HttpSe
 
   private readonly logger: LoggerFactory;
   private readonly log: Logger;
+  private readonly env: Env;
   private notReadyServer?: Server;
   private requestHandlerContext?: RequestHandlerContextContainer;
 
@@ -64,11 +65,12 @@ export class HttpService implements CoreService<InternalHttpServiceSetup, HttpSe
     const { logger, configService, env } = coreContext;
 
     this.logger = logger;
+    this.env = env;
     this.log = logger.get('http');
-    this.config$ = combineLatest(
+    this.config$ = combineLatest([
       configService.atPath<HttpConfigType>(httpConfig.path),
-      configService.atPath<CspConfigType>(cspConfig.path)
-    ).pipe(map(([http, csp]) => new HttpConfig(http, csp, env)));
+      configService.atPath<CspConfigType>(cspConfig.path),
+    ]).pipe(map(([http, csp]) => new HttpConfig(http, csp)));
     this.httpServer = new HttpServer(logger, 'Kibana');
     this.httpsRedirectServer = new HttpsRedirectServer(logger.get('http', 'redirect', 'server'));
   }
@@ -92,6 +94,9 @@ export class HttpService implements CoreService<InternalHttpServiceSetup, HttpSe
     }
 
     const { registerRouter, ...serverContract } = await this.httpServer.setup(config);
+
+    registerCoreHandlers(serverContract, config, this.env);
+
     const contract: InternalHttpServiceSetup = {
       ...serverContract,
 
@@ -107,10 +112,6 @@ export class HttpService implements CoreService<InternalHttpServiceSetup, HttpSe
         contextName: T,
         provider: RequestHandlerContextProvider<T>
       ) => this.requestHandlerContext!.registerContext(pluginOpaqueId, contextName, provider),
-
-      config: {
-        defaultRoute: config.defaultRoute,
-      },
     };
 
     return contract;
diff --git a/src/core/server/http/http_tools.test.ts b/src/core/server/http/http_tools.test.ts
index b889ebd64971f..c1322a5aa94db 100644
--- a/src/core/server/http/http_tools.test.ts
+++ b/src/core/server/http/http_tools.test.ts
@@ -31,8 +31,6 @@ import { HttpConfig, config } from './http_config';
 import { Router } from './router';
 import { loggingServiceMock } from '../logging/logging_service.mock';
 import { ByteSizeValue } from '@kbn/config-schema';
-import { Env } from '../config';
-import { getEnvOptions } from '../config/__mocks__/env';
 
 const emptyOutput = {
   statusCode: 400,
@@ -122,8 +120,7 @@ describe('getServerOptions', () => {
           certificate: 'some-certificate-path',
         },
       }),
-      {} as any,
-      Env.createDefault(getEnvOptions())
+      {} as any
     );
 
     expect(getServerOptions(httpConfig).tls).toMatchInlineSnapshot(`
@@ -152,8 +149,7 @@ describe('getServerOptions', () => {
           clientAuthentication: 'required',
         },
       }),
-      {} as any,
-      Env.createDefault(getEnvOptions())
+      {} as any
     );
 
     expect(getServerOptions(httpConfig).tls).toMatchInlineSnapshot(`
diff --git a/src/core/server/http/index.ts b/src/core/server/http/index.ts
index 21de3945f1044..55ba813484268 100644
--- a/src/core/server/http/index.ts
+++ b/src/core/server/http/index.ts
@@ -47,10 +47,16 @@ export {
   RouteMethod,
   RouteRegistrar,
   RouteConfigOptions,
-  RouteSchemas,
   RouteConfigOptionsBody,
   RouteContentType,
   validBodyOutput,
+  RouteValidatorConfig,
+  RouteValidationSpec,
+  RouteValidationFunction,
+  RouteValidatorOptions,
+  RouteValidationError,
+  RouteValidatorFullConfig,
+  RouteValidationResultFactory,
 } from './router';
 export { BasePathProxyServer } from './base_path_proxy_server';
 export { OnPreAuthHandler, OnPreAuthToolkit } from './lifecycle/on_pre_auth';
diff --git a/src/core/server/http/integration_tests/lifecycle_handlers.test.ts b/src/core/server/http/integration_tests/lifecycle_handlers.test.ts
new file mode 100644
index 0000000000000..f4c5f16870c7e
--- /dev/null
+++ b/src/core/server/http/integration_tests/lifecycle_handlers.test.ts
@@ -0,0 +1,241 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 supertest from 'supertest';
+import { BehaviorSubject } from 'rxjs';
+import { ByteSizeValue } from '@kbn/config-schema';
+
+import { createHttpServer } from '../test_utils';
+import { HttpService } from '../http_service';
+import { HttpServerSetup } from '../http_server';
+import { IRouter, RouteRegistrar } from '../router';
+
+import { configServiceMock } from '../../config/config_service.mock';
+import { contextServiceMock } from '../../context/context_service.mock';
+
+const pkgPath = resolve(__dirname, '../../../../../package.json');
+const actualVersion = require(pkgPath).version;
+const versionHeader = 'kbn-version';
+const xsrfHeader = 'kbn-xsrf';
+const nameHeader = 'kbn-name';
+const whitelistedTestPath = '/xsrf/test/route/whitelisted';
+const kibanaName = 'my-kibana-name';
+const setupDeps = {
+  context: contextServiceMock.createSetupContract(),
+};
+
+describe('core lifecycle handlers', () => {
+  let server: HttpService;
+  let innerServer: HttpServerSetup['server'];
+  let router: IRouter;
+
+  beforeEach(async () => {
+    const configService = configServiceMock.create();
+    configService.atPath.mockReturnValue(
+      new BehaviorSubject({
+        hosts: ['localhost'],
+        maxPayload: new ByteSizeValue(1024),
+        autoListen: true,
+        ssl: {
+          enabled: false,
+        },
+        compression: { enabled: true },
+        name: kibanaName,
+        customResponseHeaders: {
+          'some-header': 'some-value',
+        },
+        xsrf: { disableProtection: false, whitelist: [whitelistedTestPath] },
+      } as any)
+    );
+    server = createHttpServer({ configService });
+
+    const serverSetup = await server.setup(setupDeps);
+    router = serverSetup.createRouter('/');
+    innerServer = serverSetup.server;
+  }, 30000);
+
+  afterEach(async () => {
+    await server.stop();
+  });
+
+  describe('versionCheck post-auth handler', () => {
+    const testRoute = '/version_check/test/route';
+
+    beforeEach(async () => {
+      router.get({ path: testRoute, validate: false }, (context, req, res) => {
+        return res.ok({ body: 'ok' });
+      });
+      await server.start();
+    });
+
+    it('accepts requests with the correct version passed in the version header', async () => {
+      await supertest(innerServer.listener)
+        .get(testRoute)
+        .set(versionHeader, actualVersion)
+        .expect(200, 'ok');
+    });
+
+    it('accepts requests that do not include a version header', async () => {
+      await supertest(innerServer.listener)
+        .get(testRoute)
+        .expect(200, 'ok');
+    });
+
+    it('rejects requests with an incorrect version passed in the version header', async () => {
+      await supertest(innerServer.listener)
+        .get(testRoute)
+        .set(versionHeader, 'invalid-version')
+        .expect(400, /Browser client is out of date/);
+    });
+  });
+
+  describe('customHeaders pre-response handler', () => {
+    const testRoute = '/custom_headers/test/route';
+    const testErrorRoute = '/custom_headers/test/error_route';
+
+    beforeEach(async () => {
+      router.get({ path: testRoute, validate: false }, (context, req, res) => {
+        return res.ok({ body: 'ok' });
+      });
+      router.get({ path: testErrorRoute, validate: false }, (context, req, res) => {
+        return res.badRequest({ body: 'bad request' });
+      });
+      await server.start();
+    });
+
+    it('adds the kbn-name header', async () => {
+      const result = await supertest(innerServer.listener)
+        .get(testRoute)
+        .expect(200, 'ok');
+      const headers = result.header as Record<string, string>;
+      expect(headers).toEqual(
+        expect.objectContaining({
+          [nameHeader]: kibanaName,
+        })
+      );
+    });
+
+    it('adds the kbn-name header in case of error', async () => {
+      const result = await supertest(innerServer.listener)
+        .get(testErrorRoute)
+        .expect(400);
+      const headers = result.header as Record<string, string>;
+      expect(headers).toEqual(
+        expect.objectContaining({
+          [nameHeader]: kibanaName,
+        })
+      );
+    });
+
+    it('adds the custom headers', async () => {
+      const result = await supertest(innerServer.listener)
+        .get(testRoute)
+        .expect(200, 'ok');
+      const headers = result.header as Record<string, string>;
+      expect(headers).toEqual(expect.objectContaining({ 'some-header': 'some-value' }));
+    });
+
+    it('adds the custom headers in case of error', async () => {
+      const result = await supertest(innerServer.listener)
+        .get(testErrorRoute)
+        .expect(400);
+      const headers = result.header as Record<string, string>;
+      expect(headers).toEqual(expect.objectContaining({ 'some-header': 'some-value' }));
+    });
+  });
+
+  describe('xsrf post-auth handler', () => {
+    const testPath = '/xsrf/test/route';
+    const destructiveMethods = ['POST', 'PUT', 'DELETE'];
+    const nonDestructiveMethods = ['GET', 'HEAD'];
+
+    const getSupertest = (method: string, path: string): supertest.Test => {
+      return (supertest(innerServer.listener) as any)[method.toLowerCase()](path) as supertest.Test;
+    };
+
+    beforeEach(async () => {
+      router.get({ path: testPath, validate: false }, (context, req, res) => {
+        return res.ok({ body: 'ok' });
+      });
+
+      destructiveMethods.forEach(method => {
+        ((router as any)[method.toLowerCase()] as RouteRegistrar<any>)<any, any, any>(
+          { path: testPath, validate: false },
+          (context, req, res) => {
+            return res.ok({ body: 'ok' });
+          }
+        );
+        ((router as any)[method.toLowerCase()] as RouteRegistrar<any>)<any, any, any>(
+          { path: whitelistedTestPath, validate: false },
+          (context, req, res) => {
+            return res.ok({ body: 'ok' });
+          }
+        );
+      });
+
+      await server.start();
+    });
+
+    nonDestructiveMethods.forEach(method => {
+      describe(`When using non-destructive ${method} method`, () => {
+        it('accepts requests without a token', async () => {
+          await getSupertest(method.toLowerCase(), testPath).expect(
+            200,
+            method === 'HEAD' ? undefined : 'ok'
+          );
+        });
+
+        it('accepts requests with the xsrf header', async () => {
+          await getSupertest(method.toLowerCase(), testPath)
+            .set(xsrfHeader, 'anything')
+            .expect(200, method === 'HEAD' ? undefined : 'ok');
+        });
+      });
+    });
+
+    destructiveMethods.forEach(method => {
+      describe(`When using destructive ${method} method`, () => {
+        it('accepts requests with the xsrf header', async () => {
+          await getSupertest(method.toLowerCase(), testPath)
+            .set(xsrfHeader, 'anything')
+            .expect(200, 'ok');
+        });
+
+        it('accepts requests with the version header', async () => {
+          await getSupertest(method.toLowerCase(), testPath)
+            .set(versionHeader, actualVersion)
+            .expect(200, 'ok');
+        });
+
+        it('rejects requests without either an xsrf or version header', async () => {
+          await getSupertest(method.toLowerCase(), testPath).expect(400, {
+            statusCode: 400,
+            error: 'Bad Request',
+            message: 'Request must contain a kbn-xsrf header.',
+          });
+        });
+
+        it('accepts whitelisted requests without either an xsrf or version header', async () => {
+          await getSupertest(method.toLowerCase(), whitelistedTestPath).expect(200, 'ok');
+        });
+      });
+    });
+  });
+});
diff --git a/src/core/server/http/integration_tests/router.test.ts b/src/core/server/http/integration_tests/router.test.ts
index 6117190c57ba8..c3b9b20d84865 100644
--- a/src/core/server/http/integration_tests/router.test.ts
+++ b/src/core/server/http/integration_tests/router.test.ts
@@ -642,6 +642,116 @@ describe('Response factory', () => {
       });
     });
 
+    it('validate function in body', async () => {
+      const { server: innerServer, createRouter } = await server.setup(setupDeps);
+      const router = createRouter('/foo');
+
+      router.post(
+        {
+          path: '/',
+          validate: {
+            body: ({ bar, baz } = {}, { ok, badRequest }) => {
+              if (typeof bar === 'string' && typeof baz === 'number') {
+                return ok({ bar, baz });
+              } else {
+                return badRequest('Wrong payload', ['body']);
+              }
+            },
+          },
+        },
+        (context, req, res) => {
+          return res.ok({ body: req.body });
+        }
+      );
+
+      await server.start();
+
+      await supertest(innerServer.listener)
+        .post('/foo/')
+        .send({
+          bar: 'test',
+          baz: 123,
+        })
+        .expect(200)
+        .then(res => {
+          expect(res.body).toEqual({ bar: 'test', baz: 123 });
+        });
+
+      await supertest(innerServer.listener)
+        .post('/foo/')
+        .send({
+          bar: 'test',
+          baz: '123',
+        })
+        .expect(400)
+        .then(res => {
+          expect(res.body).toEqual({
+            error: 'Bad Request',
+            message: '[request body.body]: Wrong payload',
+            statusCode: 400,
+          });
+        });
+    });
+
+    it('@kbn/config-schema validation in body', async () => {
+      const { server: innerServer, createRouter } = await server.setup(setupDeps);
+      const router = createRouter('/foo');
+
+      router.post(
+        {
+          path: '/',
+          validate: {
+            body: schema.object({
+              bar: schema.string(),
+              baz: schema.number(),
+            }),
+          },
+        },
+        (context, req, res) => {
+          return res.ok({ body: req.body });
+        }
+      );
+
+      await server.start();
+
+      await supertest(innerServer.listener)
+        .post('/foo/')
+        .send({
+          bar: 'test',
+          baz: 123,
+        })
+        .expect(200)
+        .then(res => {
+          expect(res.body).toEqual({ bar: 'test', baz: 123 });
+        });
+
+      await supertest(innerServer.listener)
+        .post('/foo/')
+        .send({
+          bar: 'test',
+          baz: '123', // Automatic casting happens
+        })
+        .expect(200)
+        .then(res => {
+          expect(res.body).toEqual({ bar: 'test', baz: 123 });
+        });
+
+      await supertest(innerServer.listener)
+        .post('/foo/')
+        .send({
+          bar: 'test',
+          baz: 'test', // Can't cast it into number
+        })
+        .expect(400)
+        .then(res => {
+          expect(res.body).toEqual({
+            error: 'Bad Request',
+            message: '[request body.baz]: expected value of type [number] but got [string]',
+            statusCode: 400,
+          });
+        });
+    });
+
     it('401 Unauthorized', async () => {
       const { server: innerServer, createRouter } = await server.setup(setupDeps);
       const router = createRouter('/');
diff --git a/src/core/server/http/lifecycle_handlers.test.ts b/src/core/server/http/lifecycle_handlers.test.ts
new file mode 100644
index 0000000000000..48a6973b741ba
--- /dev/null
+++ b/src/core/server/http/lifecycle_handlers.test.ts
@@ -0,0 +1,269 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import {
+  createCustomHeadersPreResponseHandler,
+  createVersionCheckPostAuthHandler,
+  createXsrfPostAuthHandler,
+} from './lifecycle_handlers';
+import { httpServerMock } from './http_server.mocks';
+import { HttpConfig } from './http_config';
+import { KibanaRequest, RouteMethod } from './router';
+
+const createConfig = (partial: Partial<HttpConfig>): HttpConfig => partial as HttpConfig;
+
+const forgeRequest = ({
+  headers = {},
+  path = '/',
+  method = 'get',
+}: Partial<{
+  headers: Record<string, string>;
+  path: string;
+  method: RouteMethod;
+}>): KibanaRequest => {
+  return httpServerMock.createKibanaRequest({ headers, path, method });
+};
+
+describe('xsrf post-auth handler', () => {
+  let toolkit: ReturnType<typeof httpServerMock.createToolkit>;
+  let responseFactory: ReturnType<typeof httpServerMock.createLifecycleResponseFactory>;
+
+  beforeEach(() => {
+    toolkit = httpServerMock.createToolkit();
+    responseFactory = httpServerMock.createLifecycleResponseFactory();
+  });
+
+  describe('non destructive methods', () => {
+    it('accepts requests without version or xsrf header', () => {
+      const config = createConfig({ xsrf: { whitelist: [], disableProtection: false } });
+      const handler = createXsrfPostAuthHandler(config);
+      const request = forgeRequest({ method: 'get', headers: {} });
+
+      toolkit.next.mockReturnValue('next' as any);
+
+      const result = handler(request, responseFactory, toolkit);
+
+      expect(responseFactory.badRequest).not.toHaveBeenCalled();
+      expect(toolkit.next).toHaveBeenCalledTimes(1);
+      expect(result).toEqual('next');
+    });
+  });
+
+  describe('destructive methods', () => {
+    it('accepts requests with xsrf header', () => {
+      const config = createConfig({ xsrf: { whitelist: [], disableProtection: false } });
+      const handler = createXsrfPostAuthHandler(config);
+      const request = forgeRequest({ method: 'post', headers: { 'kbn-xsrf': 'xsrf' } });
+
+      toolkit.next.mockReturnValue('next' as any);
+
+      const result = handler(request, responseFactory, toolkit);
+
+      expect(responseFactory.badRequest).not.toHaveBeenCalled();
+      expect(toolkit.next).toHaveBeenCalledTimes(1);
+      expect(result).toEqual('next');
+    });
+
+    it('accepts requests with version header', () => {
+      const config = createConfig({ xsrf: { whitelist: [], disableProtection: false } });
+      const handler = createXsrfPostAuthHandler(config);
+      const request = forgeRequest({ method: 'post', headers: { 'kbn-version': 'some-version' } });
+
+      toolkit.next.mockReturnValue('next' as any);
+
+      const result = handler(request, responseFactory, toolkit);
+
+      expect(responseFactory.badRequest).not.toHaveBeenCalled();
+      expect(toolkit.next).toHaveBeenCalledTimes(1);
+      expect(result).toEqual('next');
+    });
+
+    it('returns a bad request if called without xsrf or version header', () => {
+      const config = createConfig({ xsrf: { whitelist: [], disableProtection: false } });
+      const handler = createXsrfPostAuthHandler(config);
+      const request = forgeRequest({ method: 'post' });
+
+      responseFactory.badRequest.mockReturnValue('badRequest' as any);
+
+      const result = handler(request, responseFactory, toolkit);
+
+      expect(toolkit.next).not.toHaveBeenCalled();
+      expect(responseFactory.badRequest).toHaveBeenCalledTimes(1);
+      expect(responseFactory.badRequest.mock.calls[0][0]).toMatchInlineSnapshot(`
+        Object {
+          "body": "Request must contain a kbn-xsrf header.",
+        }
+      `);
+      expect(result).toEqual('badRequest');
+    });
+
+    it('accepts requests if protection is disabled', () => {
+      const config = createConfig({ xsrf: { whitelist: [], disableProtection: true } });
+      const handler = createXsrfPostAuthHandler(config);
+      const request = forgeRequest({ method: 'post', headers: {} });
+
+      toolkit.next.mockReturnValue('next' as any);
+
+      const result = handler(request, responseFactory, toolkit);
+
+      expect(responseFactory.badRequest).not.toHaveBeenCalled();
+      expect(toolkit.next).toHaveBeenCalledTimes(1);
+      expect(result).toEqual('next');
+    });
+
+    it('accepts requests if path is whitelisted', () => {
+      const config = createConfig({
+        xsrf: { whitelist: ['/some-path'], disableProtection: false },
+      });
+      const handler = createXsrfPostAuthHandler(config);
+      const request = forgeRequest({ method: 'post', headers: {}, path: '/some-path' });
+
+      toolkit.next.mockReturnValue('next' as any);
+
+      const result = handler(request, responseFactory, toolkit);
+
+      expect(responseFactory.badRequest).not.toHaveBeenCalled();
+      expect(toolkit.next).toHaveBeenCalledTimes(1);
+      expect(result).toEqual('next');
+    });
+  });
+});
+
+describe('versionCheck post-auth handler', () => {
+  let toolkit: ReturnType<typeof httpServerMock.createToolkit>;
+  let responseFactory: ReturnType<typeof httpServerMock.createLifecycleResponseFactory>;
+
+  beforeEach(() => {
+    toolkit = httpServerMock.createToolkit();
+    responseFactory = httpServerMock.createLifecycleResponseFactory();
+  });
+
+  it('forward the request to the next interceptor if header matches', () => {
+    const handler = createVersionCheckPostAuthHandler('actual-version');
+    const request = forgeRequest({ headers: { 'kbn-version': 'actual-version' } });
+
+    toolkit.next.mockReturnValue('next' as any);
+
+    const result = handler(request, responseFactory, toolkit);
+
+    expect(toolkit.next).toHaveBeenCalledTimes(1);
+    expect(responseFactory.badRequest).not.toHaveBeenCalled();
+    expect(result).toBe('next');
+  });
+
+  it('returns a badRequest error if header does not match', () => {
+    const handler = createVersionCheckPostAuthHandler('actual-version');
+    const request = forgeRequest({ headers: { 'kbn-version': 'another-version' } });
+
+    responseFactory.badRequest.mockReturnValue('badRequest' as any);
+
+    const result = handler(request, responseFactory, toolkit);
+
+    expect(toolkit.next).not.toHaveBeenCalled();
+    expect(responseFactory.badRequest).toHaveBeenCalledTimes(1);
+    expect(responseFactory.badRequest.mock.calls[0][0]).toMatchInlineSnapshot(`
+      Object {
+        "body": Object {
+          "attributes": Object {
+            "expected": "actual-version",
+            "got": "another-version",
+          },
+          "message": "Browser client is out of date, please refresh the page (\\"kbn-version\\" header was \\"another-version\\" but should be \\"actual-version\\")",
+        },
+      }
+    `);
+    expect(result).toBe('badRequest');
+  });
+
+  it('forward the request to the next interceptor if header is not present', () => {
+    const handler = createVersionCheckPostAuthHandler('actual-version');
+    const request = forgeRequest({ headers: {} });
+
+    toolkit.next.mockReturnValue('next' as any);
+
+    const result = handler(request, responseFactory, toolkit);
+
+    expect(toolkit.next).toHaveBeenCalledTimes(1);
+    expect(responseFactory.badRequest).not.toHaveBeenCalled();
+    expect(result).toBe('next');
+  });
+});
+
+describe('customHeaders pre-response handler', () => {
+  let toolkit: ReturnType<typeof httpServerMock.createToolkit>;
+
+  beforeEach(() => {
+    toolkit = httpServerMock.createToolkit();
+  });
+
+  it('adds the kbn-name header to the response', () => {
+    const config = createConfig({ name: 'my-server-name' });
+    const handler = createCustomHeadersPreResponseHandler(config as HttpConfig);
+
+    handler({} as any, {} as any, toolkit);
+
+    expect(toolkit.next).toHaveBeenCalledTimes(1);
+    expect(toolkit.next).toHaveBeenCalledWith({ headers: { 'kbn-name': 'my-server-name' } });
+  });
+
+  it('adds the custom headers defined in the configuration', () => {
+    const config = createConfig({
+      name: 'my-server-name',
+      customResponseHeaders: {
+        headerA: 'value-A',
+        headerB: 'value-B',
+      },
+    });
+    const handler = createCustomHeadersPreResponseHandler(config as HttpConfig);
+
+    handler({} as any, {} as any, toolkit);
+
+    expect(toolkit.next).toHaveBeenCalledTimes(1);
+    expect(toolkit.next).toHaveBeenCalledWith({
+      headers: {
+        'kbn-name': 'my-server-name',
+        headerA: 'value-A',
+        headerB: 'value-B',
+      },
+    });
+  });
+
+  it('preserve the kbn-name value from server.name if definied in custom headders ', () => {
+    const config = createConfig({
+      name: 'my-server-name',
+      customResponseHeaders: {
+        'kbn-name': 'custom-name',
+        headerA: 'value-A',
+        headerB: 'value-B',
+      },
+    });
+    const handler = createCustomHeadersPreResponseHandler(config as HttpConfig);
+
+    handler({} as any, {} as any, toolkit);
+
+    expect(toolkit.next).toHaveBeenCalledTimes(1);
+    expect(toolkit.next).toHaveBeenCalledWith({
+      headers: {
+        'kbn-name': 'my-server-name',
+        headerA: 'value-A',
+        headerB: 'value-B',
+      },
+    });
+  });
+});
diff --git a/src/core/server/http/lifecycle_handlers.ts b/src/core/server/http/lifecycle_handlers.ts
new file mode 100644
index 0000000000000..ee877ee031a2b
--- /dev/null
+++ b/src/core/server/http/lifecycle_handlers.ts
@@ -0,0 +1,93 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { OnPostAuthHandler } from './lifecycle/on_post_auth';
+import { OnPreResponseHandler } from './lifecycle/on_pre_response';
+import { HttpConfig } from './http_config';
+import { Env } from '../config';
+import { LifecycleRegistrar } from './http_server';
+
+const VERSION_HEADER = 'kbn-version';
+const XSRF_HEADER = 'kbn-xsrf';
+const KIBANA_NAME_HEADER = 'kbn-name';
+
+export const createXsrfPostAuthHandler = (config: HttpConfig): OnPostAuthHandler => {
+  const { whitelist, disableProtection } = config.xsrf;
+
+  return (request, response, toolkit) => {
+    if (disableProtection || whitelist.includes(request.route.path)) {
+      return toolkit.next();
+    }
+
+    const isSafeMethod = request.route.method === 'get' || request.route.method === 'head';
+    const hasVersionHeader = VERSION_HEADER in request.headers;
+    const hasXsrfHeader = XSRF_HEADER in request.headers;
+
+    if (!isSafeMethod && !hasVersionHeader && !hasXsrfHeader) {
+      return response.badRequest({ body: `Request must contain a ${XSRF_HEADER} header.` });
+    }
+
+    return toolkit.next();
+  };
+};
+
+export const createVersionCheckPostAuthHandler = (kibanaVersion: string): OnPostAuthHandler => {
+  return (request, response, toolkit) => {
+    const requestVersion = request.headers[VERSION_HEADER];
+    if (requestVersion && requestVersion !== kibanaVersion) {
+      return response.badRequest({
+        body: {
+          message:
+            `Browser client is out of date, please refresh the page ` +
+            `("${VERSION_HEADER}" header was "${requestVersion}" but should be "${kibanaVersion}")`,
+          attributes: {
+            expected: kibanaVersion,
+            got: requestVersion,
+          },
+        },
+      });
+    }
+
+    return toolkit.next();
+  };
+};
+
+export const createCustomHeadersPreResponseHandler = (config: HttpConfig): OnPreResponseHandler => {
+  const serverName = config.name;
+  const customHeaders = config.customResponseHeaders;
+
+  return (request, response, toolkit) => {
+    const additionalHeaders = {
+      ...customHeaders,
+      [KIBANA_NAME_HEADER]: serverName,
+    };
+
+    return toolkit.next({ headers: additionalHeaders });
+  };
+};
+
+export const registerCoreHandlers = (
+  registrar: LifecycleRegistrar,
+  config: HttpConfig,
+  env: Env
+) => {
+  registrar.registerOnPreResponse(createCustomHeadersPreResponseHandler(config));
+  registrar.registerOnPostAuth(createXsrfPostAuthHandler(config));
+  registrar.registerOnPostAuth(createVersionCheckPostAuthHandler(env.packageInfo.version));
+};
diff --git a/src/core/server/http/router/error_wrapper.ts b/src/core/server/http/router/error_wrapper.ts
index c4b4d3840d1b9..8f895753c38c3 100644
--- a/src/core/server/http/router/error_wrapper.ts
+++ b/src/core/server/http/router/error_wrapper.ts
@@ -18,19 +18,18 @@
  */
 
 import Boom from 'boom';
-import { ObjectType, TypeOf } from '@kbn/config-schema';
 import { KibanaRequest } from './request';
 import { KibanaResponseFactory } from './response';
 import { RequestHandler } from './router';
 import { RequestHandlerContext } from '../../../server';
 import { RouteMethod } from './route';
 
-export const wrapErrors = <P extends ObjectType, Q extends ObjectType, B extends ObjectType>(
+export const wrapErrors = <P, Q, B>(
   handler: RequestHandler<P, Q, B, RouteMethod>
 ): RequestHandler<P, Q, B, RouteMethod> => {
   return async (
     context: RequestHandlerContext,
-    request: KibanaRequest<TypeOf<P>, TypeOf<Q>, TypeOf<B>, RouteMethod>,
+    request: KibanaRequest<P, Q, B, RouteMethod>,
     response: KibanaResponseFactory
   ) => {
     try {
diff --git a/src/core/server/http/router/index.ts b/src/core/server/http/router/index.ts
index 35bfb3ba9c33a..084d30d694474 100644
--- a/src/core/server/http/router/index.ts
+++ b/src/core/server/http/router/index.ts
@@ -31,7 +31,6 @@ export {
   RouteMethod,
   RouteConfig,
   RouteConfigOptions,
-  RouteSchemas,
   RouteContentType,
   RouteConfigOptionsBody,
   validBodyOutput,
@@ -55,3 +54,13 @@ export {
 } from './response';
 
 export { IKibanaSocket } from './socket';
+
+export {
+  RouteValidatorConfig,
+  RouteValidationSpec,
+  RouteValidationFunction,
+  RouteValidatorOptions,
+  RouteValidationError,
+  RouteValidatorFullConfig,
+  RouteValidationResultFactory,
+} from './validator';
diff --git a/src/core/server/http/router/request.test.ts b/src/core/server/http/router/request.test.ts
index ebb7ffa7a6fc9..51162a2c258e9 100644
--- a/src/core/server/http/router/request.test.ts
+++ b/src/core/server/http/router/request.test.ts
@@ -18,6 +18,7 @@
  */
 import { KibanaRequest } from './request';
 import { httpServerMock } from '../http_server.mocks';
+import { schema } from '@kbn/config-schema';
 
 describe('KibanaRequest', () => {
   describe('get all headers', () => {
@@ -64,4 +65,56 @@ describe('KibanaRequest', () => {
       });
     });
   });
+
+  describe('RouteSchema type inferring', () => {
+    it('should work with config-schema', () => {
+      const body = Buffer.from('body!');
+      const request = {
+        ...httpServerMock.createRawRequest({
+          params: { id: 'params' },
+          query: { search: 'query' },
+        }),
+        payload: body, // Set outside because the mock is using `merge` by lodash and breaks the Buffer into arrays
+      } as any;
+      const kibanaRequest = KibanaRequest.from(request, {
+        params: schema.object({ id: schema.string() }),
+        query: schema.object({ search: schema.string() }),
+        body: schema.buffer(),
+      });
+      expect(kibanaRequest.params).toStrictEqual({ id: 'params' });
+      expect(kibanaRequest.params.id.toUpperCase()).toEqual('PARAMS'); // infers it's a string
+      expect(kibanaRequest.query).toStrictEqual({ search: 'query' });
+      expect(kibanaRequest.query.search.toUpperCase()).toEqual('QUERY'); // infers it's a string
+      expect(kibanaRequest.body).toEqual(body);
+      expect(kibanaRequest.body.byteLength).toBeGreaterThan(0); // infers it's a buffer
+    });
+
+    it('should work with ValidationFunction', () => {
+      const body = Buffer.from('body!');
+      const request = {
+        ...httpServerMock.createRawRequest({
+          params: { id: 'params' },
+          query: { search: 'query' },
+        }),
+        payload: body, // Set outside because the mock is using `merge` by lodash and breaks the Buffer into arrays
+      } as any;
+      const kibanaRequest = KibanaRequest.from(request, {
+        params: schema.object({ id: schema.string() }),
+        query: schema.object({ search: schema.string() }),
+        body: (data, { ok, badRequest }) => {
+          if (Buffer.isBuffer(data)) {
+            return ok(data);
+          } else {
+            return badRequest('It should be a Buffer', []);
+          }
+        },
+      });
+      expect(kibanaRequest.params).toStrictEqual({ id: 'params' });
+      expect(kibanaRequest.params.id.toUpperCase()).toEqual('PARAMS'); // infers it's a string
+      expect(kibanaRequest.query).toStrictEqual({ search: 'query' });
+      expect(kibanaRequest.query.search.toUpperCase()).toEqual('QUERY'); // infers it's a string
+      expect(kibanaRequest.body).toEqual(body);
+      expect(kibanaRequest.body.byteLength).toBeGreaterThan(0); // infers it's a buffer
+    });
+  });
 });
diff --git a/src/core/server/http/router/request.ts b/src/core/server/http/router/request.ts
index b132899910569..47b001700b015 100644
--- a/src/core/server/http/router/request.ts
+++ b/src/core/server/http/router/request.ts
@@ -20,13 +20,11 @@
 import { Url } from 'url';
 import { Request } from 'hapi';
 
-import { ObjectType, Type, TypeOf } from '@kbn/config-schema';
-
-import { Stream } from 'stream';
 import { deepFreeze, RecursiveReadonly } from '../../../utils';
 import { Headers } from './headers';
-import { RouteMethod, RouteSchemas, RouteConfigOptions, validBodyOutput } from './route';
+import { RouteMethod, RouteConfigOptions, validBodyOutput } from './route';
 import { KibanaSocket, IKibanaSocket } from './socket';
+import { RouteValidator, RouteValidatorFullConfig } from './validator';
 
 const requestSymbol = Symbol('request');
 
@@ -70,12 +68,13 @@ export class KibanaRequest<
    * instance of a KibanaRequest.
    * @internal
    */
-  public static from<
-    P extends ObjectType,
-    Q extends ObjectType,
-    B extends ObjectType | Type<Buffer> | Type<Stream>
-  >(req: Request, routeSchemas?: RouteSchemas<P, Q, B>, withoutSecretHeaders: boolean = true) {
-    const requestParts = KibanaRequest.validate(req, routeSchemas);
+  public static from<P, Q, B>(
+    req: Request,
+    routeSchemas: RouteValidator<P, Q, B> | RouteValidatorFullConfig<P, Q, B> = {},
+    withoutSecretHeaders: boolean = true
+  ) {
+    const routeValidator = RouteValidator.from<P, Q, B>(routeSchemas);
+    const requestParts = KibanaRequest.validate(req, routeValidator);
     return new KibanaRequest(
       req,
       requestParts.params,
@@ -91,40 +90,17 @@ export class KibanaRequest<
    * received in the route handler.
    * @internal
    */
-  private static validate<
-    P extends ObjectType,
-    Q extends ObjectType,
-    B extends ObjectType | Type<Buffer> | Type<Stream>
-  >(
+  private static validate<P, Q, B>(
     req: Request,
-    routeSchemas: RouteSchemas<P, Q, B> | undefined
+    routeValidator: RouteValidator<P, Q, B>
   ): {
-    params: TypeOf<P>;
-    query: TypeOf<Q>;
-    body: TypeOf<B>;
+    params: P;
+    query: Q;
+    body: B;
   } {
-    if (routeSchemas === undefined) {
-      return {
-        body: {},
-        params: {},
-        query: {},
-      };
-    }
-
-    const params =
-      routeSchemas.params === undefined
-        ? {}
-        : routeSchemas.params.validate(req.params, {}, 'request params');
-
-    const query =
-      routeSchemas.query === undefined
-        ? {}
-        : routeSchemas.query.validate(req.query, {}, 'request query');
-
-    const body =
-      routeSchemas.body === undefined
-        ? {}
-        : routeSchemas.body.validate(req.payload, {}, 'request body');
+    const params = routeValidator.getParams(req.params, 'request params');
+    const query = routeValidator.getQuery(req.query, 'request query');
+    const body = routeValidator.getBody(req.payload, 'request body');
 
     return { query, params, body };
   }
diff --git a/src/core/server/http/router/route.ts b/src/core/server/http/router/route.ts
index 129cf4c922ffd..4439a80b1eac7 100644
--- a/src/core/server/http/router/route.ts
+++ b/src/core/server/http/router/route.ts
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import { ObjectType, Type } from '@kbn/config-schema';
-import { Stream } from 'stream';
+import { RouteValidatorFullConfig } from './validator';
 
 /**
  * The set of common HTTP methods supported by Kibana routing.
@@ -124,12 +123,7 @@ export interface RouteConfigOptions<Method extends RouteMethod> {
  * Route specific configuration.
  * @public
  */
-export interface RouteConfig<
-  P extends ObjectType,
-  Q extends ObjectType,
-  B extends ObjectType | Type<Buffer> | Type<Stream>,
-  Method extends RouteMethod
-> {
+export interface RouteConfig<P, Q, B, Method extends RouteMethod> {
   /**
    * The endpoint _within_ the router path to register the route.
    *
@@ -201,25 +195,10 @@ export interface RouteConfig<
    * });
    * ```
    */
-  validate: RouteSchemas<P, Q, B> | false;
+  validate: RouteValidatorFullConfig<P, Q, B> | false;
 
   /**
    * Additional route options {@link RouteConfigOptions}.
    */
   options?: RouteConfigOptions<Method>;
 }
-
-/**
- * RouteSchemas contains the schemas for validating the different parts of a
- * request.
- * @public
- */
-export interface RouteSchemas<
-  P extends ObjectType,
-  Q extends ObjectType,
-  B extends ObjectType | Type<Buffer> | Type<Stream>
-> {
-  params?: P;
-  query?: Q;
-  body?: B;
-}
diff --git a/src/core/server/http/router/router.test.ts b/src/core/server/http/router/router.test.ts
index f5469a95b5106..a936da6a40a9f 100644
--- a/src/core/server/http/router/router.test.ts
+++ b/src/core/server/http/router/router.test.ts
@@ -20,6 +20,7 @@
 import { Router } from './router';
 import { loggingServiceMock } from '../../logging/logging_service.mock';
 import { schema } from '@kbn/config-schema';
+
 const logger = loggingServiceMock.create().get();
 const enhanceWithContext = (fn: (...args: any[]) => any) => fn.bind(null, {});
 
@@ -38,12 +39,15 @@ describe('Router', () => {
       const router = new Router('', logger, enhanceWithContext);
       expect(() =>
         router.get(
-          // we use 'any' because validate requires @kbn/config-schema usage
-          { path: '/', validate: { params: { validate: () => 'error' } } } as any,
+          // we use 'any' because validate requires valid Type or function usage
+          {
+            path: '/',
+            validate: { params: { validate: () => 'error' } } as any,
+          },
           (context, req, res) => res.ok({})
         )
       ).toThrowErrorMatchingInlineSnapshot(
-        `"Expected a valid schema declared with '@kbn/config-schema' package at key: [params]."`
+        `"Expected a valid validation logic declared with '@kbn/config-schema' package or a RouteValidationFunction at key: [params]."`
       );
     });
 
diff --git a/src/core/server/http/router/router.ts b/src/core/server/http/router/router.ts
index 3bed8fe4186ac..bb56ee3727d1a 100644
--- a/src/core/server/http/router/router.ts
+++ b/src/core/server/http/router/router.ts
@@ -17,24 +17,18 @@
  * under the License.
  */
 
-import { ObjectType, TypeOf, Type } from '@kbn/config-schema';
 import { Request, ResponseObject, ResponseToolkit } from 'hapi';
 import Boom from 'boom';
 
-import { Stream } from 'stream';
+import { Type } from '@kbn/config-schema';
 import { Logger } from '../../logging';
 import { KibanaRequest } from './request';
 import { KibanaResponseFactory, kibanaResponseFactory, IKibanaResponse } from './response';
-import {
-  RouteConfig,
-  RouteConfigOptions,
-  RouteMethod,
-  RouteSchemas,
-  validBodyOutput,
-} from './route';
+import { RouteConfig, RouteConfigOptions, RouteMethod, validBodyOutput } from './route';
 import { HapiResponseAdapter } from './response_adapter';
 import { RequestHandlerContext } from '../../../server';
 import { wrapErrors } from './error_wrapper';
+import { RouteValidator } from './validator';
 
 interface RouterRoute {
   method: RouteMethod;
@@ -48,11 +42,7 @@ interface RouterRoute {
  *
  * @public
  */
-export type RouteRegistrar<Method extends RouteMethod> = <
-  P extends ObjectType,
-  Q extends ObjectType,
-  B extends ObjectType | Type<Buffer> | Type<Stream>
->(
+export type RouteRegistrar<Method extends RouteMethod> = <P, Q, B>(
   route: RouteConfig<P, Q, B, Method>,
   handler: RequestHandler<P, Q, B, Method>
 ) => void;
@@ -108,9 +98,7 @@ export interface IRouter {
    * Wrap a router handler to catch and converts legacy boom errors to proper custom errors.
    * @param handler {@link RequestHandler} - a route handler to wrap
    */
-  handleLegacyErrors: <P extends ObjectType, Q extends ObjectType, B extends ObjectType>(
-    handler: RequestHandler<P, Q, B>
-  ) => RequestHandler<P, Q, B>;
+  handleLegacyErrors: <P, Q, B>(handler: RequestHandler<P, Q, B>) => RequestHandler<P, Q, B>;
 
   /**
    * Returns all routes registered with this router.
@@ -120,12 +108,9 @@ export interface IRouter {
   getRoutes: () => RouterRoute[];
 }
 
-export type ContextEnhancer<
-  P extends ObjectType,
-  Q extends ObjectType,
-  B extends ObjectType,
-  Method extends RouteMethod
-> = (handler: RequestHandler<P, Q, B, Method>) => RequestHandlerEnhanced<P, Q, B, Method>;
+export type ContextEnhancer<P, Q, B, Method extends RouteMethod> = (
+  handler: RequestHandler<P, Q, B, Method>
+) => RequestHandlerEnhanced<P, Q, B, Method>;
 
 function getRouteFullPath(routerPath: string, routePath: string) {
   // If router's path ends with slash and route's path starts with slash,
@@ -140,11 +125,10 @@ function getRouteFullPath(routerPath: string, routePath: string) {
  * @returns Route schemas if `validate` is specified on the route, otherwise
  * undefined.
  */
-function routeSchemasFromRouteConfig<
-  P extends ObjectType,
-  Q extends ObjectType,
-  B extends ObjectType | Type<Buffer> | Type<Stream>
->(route: RouteConfig<P, Q, B, typeof routeMethod>, routeMethod: RouteMethod) {
+function routeSchemasFromRouteConfig<P, Q, B>(
+  route: RouteConfig<P, Q, B, typeof routeMethod>,
+  routeMethod: RouteMethod
+) {
   // The type doesn't allow `validate` to be undefined, but it can still
   // happen when it's used from JavaScript.
   if (route.validate === undefined) {
@@ -155,15 +139,17 @@ function routeSchemasFromRouteConfig<
 
   if (route.validate !== false) {
     Object.entries(route.validate).forEach(([key, schema]) => {
-      if (!(schema instanceof Type)) {
+      if (!(schema instanceof Type || typeof schema === 'function')) {
         throw new Error(
-          `Expected a valid schema declared with '@kbn/config-schema' package at key: [${key}].`
+          `Expected a valid validation logic declared with '@kbn/config-schema' package or a RouteValidationFunction at key: [${key}].`
         );
       }
     });
   }
 
-  return route.validate ? route.validate : undefined;
+  if (route.validate) {
+    return RouteValidator.from(route.validate);
+  }
 }
 
 /**
@@ -174,12 +160,7 @@ function routeSchemasFromRouteConfig<
  */
 function validOptions(
   method: RouteMethod,
-  routeConfig: RouteConfig<
-    ObjectType,
-    ObjectType,
-    ObjectType | Type<Buffer> | Type<Stream>,
-    typeof method
-  >
+  routeConfig: RouteConfig<unknown, unknown, unknown, typeof method>
 ) {
   const shouldNotHavePayload = ['head', 'get'].includes(method);
   const { options = {}, validate } = routeConfig;
@@ -225,11 +206,7 @@ export class Router implements IRouter {
     private readonly log: Logger,
     private readonly enhanceWithContext: ContextEnhancer<any, any, any, any>
   ) {
-    const buildMethod = <Method extends RouteMethod>(method: Method) => <
-      P extends ObjectType,
-      Q extends ObjectType,
-      B extends ObjectType | Type<Buffer> | Type<Stream>
-    >(
+    const buildMethod = <Method extends RouteMethod>(method: Method) => <P, Q, B>(
       route: RouteConfig<P, Q, B, Method>,
       handler: RequestHandler<P, Q, B, Method>
     ) => {
@@ -260,17 +237,11 @@ export class Router implements IRouter {
     return [...this.routes];
   }
 
-  public handleLegacyErrors<P extends ObjectType, Q extends ObjectType, B extends ObjectType>(
-    handler: RequestHandler<P, Q, B>
-  ): RequestHandler<P, Q, B> {
+  public handleLegacyErrors<P, Q, B>(handler: RequestHandler<P, Q, B>): RequestHandler<P, Q, B> {
     return wrapErrors(handler);
   }
 
-  private async handle<
-    P extends ObjectType,
-    Q extends ObjectType,
-    B extends ObjectType | Type<Buffer> | Type<Stream>
-  >({
+  private async handle<P, Q, B>({
     routeSchemas,
     request,
     responseToolkit,
@@ -279,9 +250,9 @@ export class Router implements IRouter {
     request: Request;
     responseToolkit: ResponseToolkit;
     handler: RequestHandlerEnhanced<P, Q, B, typeof request.method>;
-    routeSchemas?: RouteSchemas<P, Q, B>;
+    routeSchemas?: RouteValidator<P, Q, B>;
   }) {
-    let kibanaRequest: KibanaRequest<TypeOf<P>, TypeOf<Q>, TypeOf<B>, typeof request.method>;
+    let kibanaRequest: KibanaRequest<P, Q, B, typeof request.method>;
     const hapiResponseAdapter = new HapiResponseAdapter(responseToolkit);
     try {
       kibanaRequest = KibanaRequest.from(request, routeSchemas);
@@ -303,16 +274,14 @@ type WithoutHeadArgument<T> = T extends (first: any, ...rest: infer Params) => i
   ? (...rest: Params) => Return
   : never;
 
-type RequestHandlerEnhanced<
-  P extends ObjectType,
-  Q extends ObjectType,
-  B extends ObjectType | Type<Buffer> | Type<Stream>,
-  Method extends RouteMethod
-> = WithoutHeadArgument<RequestHandler<P, Q, B, Method>>;
+type RequestHandlerEnhanced<P, Q, B, Method extends RouteMethod> = WithoutHeadArgument<
+  RequestHandler<P, Q, B, Method>
+>;
 
 /**
  * A function executed when route path matched requested resource path.
  * Request handler is expected to return a result of one of {@link KibanaResponseFactory} functions.
+ * @param context {@link RequestHandlerContext} - the core context exposed for this request.
  * @param request {@link KibanaRequest} - object containing information about requested resource,
  * such as path, method, headers, parameters, query, body, etc.
  * @param response {@link KibanaResponseFactory} - a set of helper functions used to respond to a request.
@@ -344,12 +313,12 @@ type RequestHandlerEnhanced<
  * @public
  */
 export type RequestHandler<
-  P extends ObjectType,
-  Q extends ObjectType,
-  B extends ObjectType | Type<Buffer> | Type<Stream>,
+  P = unknown,
+  Q = unknown,
+  B = unknown,
   Method extends RouteMethod = any
 > = (
   context: RequestHandlerContext,
-  request: KibanaRequest<TypeOf<P>, TypeOf<Q>, TypeOf<B>, Method>,
+  request: KibanaRequest<P, Q, B, Method>,
   response: KibanaResponseFactory
 ) => IKibanaResponse<any> | Promise<IKibanaResponse<any>>;
diff --git a/src/core/server/http/router/validator/index.ts b/src/core/server/http/router/validator/index.ts
new file mode 100644
index 0000000000000..edb116c40144a
--- /dev/null
+++ b/src/core/server/http/router/validator/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.
+ */
+
+export {
+  RouteValidator,
+  RouteValidatorConfig,
+  RouteValidationSpec,
+  RouteValidationFunction,
+  RouteValidatorOptions,
+  RouteValidatorFullConfig,
+  RouteValidationResultFactory,
+} from './validator';
+export { RouteValidationError } from './validator_error';
diff --git a/src/core/server/http/router/validator/validator.test.ts b/src/core/server/http/router/validator/validator.test.ts
new file mode 100644
index 0000000000000..729eb1b60c10a
--- /dev/null
+++ b/src/core/server/http/router/validator/validator.test.ts
@@ -0,0 +1,135 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { RouteValidationError, RouteValidator } from './';
+import { schema, Type } from '@kbn/config-schema';
+
+describe('Router validator', () => {
+  it('should validate and infer the type from a function', () => {
+    const validator = RouteValidator.from({
+      params: ({ foo }, validationResult) => {
+        if (typeof foo === 'string') {
+          return validationResult.ok({ foo });
+        }
+        return validationResult.badRequest('Not a string', ['foo']);
+      },
+    });
+    expect(validator.getParams({ foo: 'bar' })).toStrictEqual({ foo: 'bar' });
+    expect(validator.getParams({ foo: 'bar' }).foo.toUpperCase()).toBe('BAR'); // It knows it's a string! :)
+    expect(() => validator.getParams({ foo: 1 })).toThrowError('[foo]: Not a string');
+    expect(() => validator.getParams({})).toThrowError('[foo]: Not a string');
+
+    expect(() => validator.getParams(undefined)).toThrowError(
+      "Cannot destructure property `foo` of 'undefined' or 'null'."
+    );
+    expect(() => validator.getParams({}, 'myField')).toThrowError('[myField.foo]: Not a string');
+
+    expect(validator.getBody(undefined)).toStrictEqual({});
+    expect(validator.getQuery(undefined)).toStrictEqual({});
+  });
+
+  it('should validate and infer the type from a function that does not use the resolver', () => {
+    const validator = RouteValidator.from({
+      params: data => {
+        if (typeof data.foo === 'string') {
+          return { value: { foo: data.foo as string } };
+        }
+        return { error: new RouteValidationError('Not a string', ['foo']) };
+      },
+    });
+    expect(validator.getParams({ foo: 'bar' })).toStrictEqual({ foo: 'bar' });
+    expect(validator.getParams({ foo: 'bar' }).foo.toUpperCase()).toBe('BAR'); // It knows it's a string! :)
+    expect(() => validator.getParams({ foo: 1 })).toThrowError('[foo]: Not a string');
+    expect(() => validator.getParams({})).toThrowError('[foo]: Not a string');
+
+    expect(() => validator.getParams(undefined)).toThrowError(
+      `Cannot read property 'foo' of undefined`
+    );
+    expect(() => validator.getParams({}, 'myField')).toThrowError('[myField.foo]: Not a string');
+
+    expect(validator.getBody(undefined)).toStrictEqual({});
+    expect(validator.getQuery(undefined)).toStrictEqual({});
+  });
+
+  it('should validate and infer the type from a config-schema ObjectType', () => {
+    const schemaValidation = RouteValidator.from({
+      params: schema.object({
+        foo: schema.string(),
+      }),
+    });
+
+    expect(schemaValidation.getParams({ foo: 'bar' })).toStrictEqual({ foo: 'bar' });
+    expect(schemaValidation.getParams({ foo: 'bar' }).foo.toUpperCase()).toBe('BAR'); // It knows it's a string! :)
+    expect(() => schemaValidation.getParams({ foo: 1 })).toThrowError(
+      '[foo]: expected value of type [string] but got [number]'
+    );
+    expect(() => schemaValidation.getParams({})).toThrowError(
+      '[foo]: expected value of type [string] but got [undefined]'
+    );
+    expect(() => schemaValidation.getParams(undefined)).toThrowError(
+      '[foo]: expected value of type [string] but got [undefined]'
+    );
+    expect(() => schemaValidation.getParams({}, 'myField')).toThrowError(
+      '[myField.foo]: expected value of type [string] but got [undefined]'
+    );
+  });
+
+  it('should validate and infer the type from a config-schema non-ObjectType', () => {
+    const schemaValidation = RouteValidator.from({ params: schema.buffer() });
+
+    const foo = Buffer.from('hi!');
+    expect(schemaValidation.getParams(foo)).toStrictEqual(foo);
+    expect(schemaValidation.getParams(foo).byteLength).toBeGreaterThan(0); // It knows it's a buffer! :)
+    expect(() => schemaValidation.getParams({ foo: 1 })).toThrowError(
+      'expected value of type [Buffer] but got [Object]'
+    );
+    expect(() => schemaValidation.getParams({})).toThrowError(
+      'expected value of type [Buffer] but got [Object]'
+    );
+    expect(() => schemaValidation.getParams(undefined)).toThrowError(
+      `expected value of type [Buffer] but got [undefined]`
+    );
+    expect(() => schemaValidation.getParams({}, 'myField')).toThrowError(
+      '[myField]: expected value of type [Buffer] but got [Object]'
+    );
+  });
+
+  it('should catch the errors thrown by the validate function', () => {
+    const validator = RouteValidator.from({
+      params: data => {
+        throw new Error('Something went terribly wrong');
+      },
+    });
+
+    expect(() => validator.getParams({ foo: 1 })).toThrowError('Something went terribly wrong');
+    expect(() => validator.getParams({}, 'myField')).toThrowError(
+      '[myField]: Something went terribly wrong'
+    );
+  });
+
+  it('should not accept invalid validation options', () => {
+    const wrongValidateSpec = RouteValidator.from({
+      params: { validate: <T>(data: T): T => data } as Type<any>,
+    });
+
+    expect(() => wrongValidateSpec.getParams({ foo: 1 })).toThrowError(
+      'The validation rule provided in the handler is not valid'
+    );
+  });
+});
diff --git a/src/core/server/http/router/validator/validator.ts b/src/core/server/http/router/validator/validator.ts
new file mode 100644
index 0000000000000..65c0a934e6ef0
--- /dev/null
+++ b/src/core/server/http/router/validator/validator.ts
@@ -0,0 +1,280 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ValidationError, Type, schema, ObjectType } from '@kbn/config-schema';
+import { Stream } from 'stream';
+import { RouteValidationError } from './validator_error';
+
+/**
+ * Validation result factory to be used in the custom validation function to return the valid data or validation errors
+ *
+ * See {@link RouteValidationFunction}.
+ *
+ * @public
+ */
+export interface RouteValidationResultFactory {
+  ok: <T>(value: T) => { value: T };
+  badRequest: (error: Error | string, path?: string[]) => { error: RouteValidationError };
+}
+
+/**
+ * The custom validation function if @kbn/config-schema is not a valid solution for your specific plugin requirements.
+ *
+ * @example
+ *
+ * The validation should look something like:
+ * ```typescript
+ * interface MyExpectedBody {
+ *   bar: string;
+ *   baz: number;
+ * }
+ *
+ * const myBodyValidation: RouteValidationFunction<MyExpectedBody> = (data, validationResult) => {
+ *   const { ok, badRequest } = validationResult;
+ *   const { bar, baz } = data || {};
+ *   if (typeof bar === 'string' && typeof baz === 'number') {
+ *     return ok({ bar, baz });
+ *   } else {
+ *     return badRequest('Wrong payload', ['body']);
+ *   }
+ * }
+ * ```
+ *
+ * @public
+ */
+export type RouteValidationFunction<T> = (
+  data: any,
+  validationResult: RouteValidationResultFactory
+) =>
+  | {
+      value: T;
+      error?: never;
+    }
+  | {
+      value?: never;
+      error: RouteValidationError;
+    };
+
+/**
+ * Allowed property validation options: either @kbn/config-schema validations or custom validation functions
+ *
+ * See {@link RouteValidationFunction} for custom validation.
+ *
+ * @public
+ */
+export type RouteValidationSpec<T> = ObjectType | Type<T> | RouteValidationFunction<T>;
+
+// Ugly as hell but we need this conditional typing to have proper type inference
+type RouteValidationResultType<T extends RouteValidationSpec<any> | undefined> = NonNullable<
+  T extends RouteValidationFunction<any>
+    ? ReturnType<T>['value']
+    : T extends Type<any>
+    ? ReturnType<T['validate']>
+    : undefined
+>;
+
+/**
+ * The configuration object to the RouteValidator class.
+ * Set `params`, `query` and/or `body` to specify the validation logic to follow for that property.
+ *
+ * @public
+ */
+export interface RouteValidatorConfig<P, Q, B> {
+  /**
+   * Validation logic for the URL params
+   * @public
+   */
+  params?: RouteValidationSpec<P>;
+  /**
+   * Validation logic for the Query params
+   * @public
+   */
+  query?: RouteValidationSpec<Q>;
+  /**
+   * Validation logic for the body payload
+   * @public
+   */
+  body?: RouteValidationSpec<B>;
+}
+
+/**
+ * Additional options for the RouteValidator class to modify its default behaviour.
+ *
+ * @public
+ */
+export interface RouteValidatorOptions {
+  /**
+   * Set the `unsafe` config to avoid running some additional internal *safe* validations on top of your custom validation
+   * @public
+   */
+  unsafe?: {
+    params?: boolean;
+    query?: boolean;
+    body?: boolean;
+  };
+}
+
+/**
+ * Route validations config and options merged into one object
+ * @public
+ */
+export type RouteValidatorFullConfig<P, Q, B> = RouteValidatorConfig<P, Q, B> &
+  RouteValidatorOptions;
+
+/**
+ * Route validator class to define the validation logic for each new route.
+ *
+ * @internal
+ */
+export class RouteValidator<P = {}, Q = {}, B = {}> {
+  public static from<P = {}, Q = {}, B = {}>(
+    opts: RouteValidator<P, Q, B> | RouteValidatorFullConfig<P, Q, B>
+  ) {
+    if (opts instanceof RouteValidator) {
+      return opts;
+    }
+    const { params, query, body, ...options } = opts;
+    return new RouteValidator({ params, query, body }, options);
+  }
+
+  private static ResultFactory: RouteValidationResultFactory = {
+    ok: <T>(value: T) => ({ value }),
+    badRequest: (error: Error | string, path?: string[]) => ({
+      error: new RouteValidationError(error, path),
+    }),
+  };
+
+  private constructor(
+    private readonly config: RouteValidatorConfig<P, Q, B>,
+    private readonly options: RouteValidatorOptions = {}
+  ) {}
+
+  /**
+   * Get validated URL params
+   * @internal
+   */
+  public getParams(data: unknown, namespace?: string): Readonly<P> {
+    return this.validate(this.config.params, this.options.unsafe?.params, data, namespace);
+  }
+
+  /**
+   * Get validated query params
+   * @internal
+   */
+  public getQuery(data: unknown, namespace?: string): Readonly<Q> {
+    return this.validate(this.config.query, this.options.unsafe?.query, data, namespace);
+  }
+
+  /**
+   * Get validated body
+   * @internal
+   */
+  public getBody(data: unknown, namespace?: string): Readonly<B> {
+    return this.validate(this.config.body, this.options.unsafe?.body, data, namespace);
+  }
+
+  /**
+   * Has body validation
+   * @internal
+   */
+  public hasBody(): boolean {
+    return typeof this.config.body !== 'undefined';
+  }
+
+  private validate<T>(
+    validationRule?: RouteValidationSpec<T>,
+    unsafe?: boolean,
+    data?: unknown,
+    namespace?: string
+  ): RouteValidationResultType<typeof validationRule> {
+    if (typeof validationRule === 'undefined') {
+      return {};
+    }
+    let precheckedData = this.preValidateSchema(data).validate(data, {}, namespace);
+
+    if (unsafe !== true) {
+      precheckedData = this.safetyPrechecks(precheckedData, namespace);
+    }
+
+    const customCheckedData = this.customValidation(validationRule, precheckedData, namespace);
+
+    if (unsafe === true) {
+      return customCheckedData;
+    }
+
+    return this.safetyPostchecks(customCheckedData, namespace);
+  }
+
+  private safetyPrechecks<T>(data: T, namespace?: string): T {
+    // We can add any pre-validation safety logic in here
+    return data;
+  }
+
+  private safetyPostchecks<T>(data: T, namespace?: string): T {
+    // We can add any post-validation safety logic in here
+    return data;
+  }
+
+  private customValidation<T>(
+    validationRule: RouteValidationSpec<T>,
+    data?: unknown,
+    namespace?: string
+  ): RouteValidationResultType<typeof validationRule> {
+    if (validationRule instanceof Type) {
+      return validationRule.validate(data, {}, namespace);
+    } else if (typeof validationRule === 'function') {
+      return this.validateFunction(validationRule, data, namespace);
+    } else {
+      throw new ValidationError(
+        new RouteValidationError(`The validation rule provided in the handler is not valid`),
+        namespace
+      );
+    }
+  }
+
+  private validateFunction<T>(
+    validateFn: RouteValidationFunction<T>,
+    data: unknown,
+    namespace?: string
+  ): T {
+    let result: ReturnType<typeof validateFn>;
+    try {
+      result = validateFn(data, RouteValidator.ResultFactory);
+    } catch (err) {
+      result = { error: new RouteValidationError(err) };
+    }
+
+    if (result.error) {
+      throw new ValidationError(result.error, namespace);
+    }
+    return result.value;
+  }
+
+  private preValidateSchema(data: any) {
+    if (Buffer.isBuffer(data)) {
+      // if options.body.parse !== true
+      return schema.buffer();
+    } else if (data instanceof Stream) {
+      // if options.body.output === 'stream'
+      return schema.stream();
+    } else {
+      return schema.maybe(schema.nullable(schema.object({}, { allowUnknowns: true })));
+    }
+  }
+}
diff --git a/src/core/server/http/router/validator/validator_error.ts b/src/core/server/http/router/validator/validator_error.ts
new file mode 100644
index 0000000000000..d306db4ad1cf4
--- /dev/null
+++ b/src/core/server/http/router/validator/validator_error.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 { SchemaTypeError } from '@kbn/config-schema';
+
+/**
+ * Error to return when the validation is not successful.
+ * @public
+ */
+export class RouteValidationError extends SchemaTypeError {
+  constructor(error: Error | string, path: string[] = []) {
+    super(error, path);
+
+    // 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, RouteValidationError.prototype);
+  }
+}
diff --git a/src/core/server/http/test_utils.ts b/src/core/server/http/test_utils.ts
index e0a15cdc6e839..ffdc04d156ca0 100644
--- a/src/core/server/http/test_utils.ts
+++ b/src/core/server/http/test_utils.ts
@@ -41,6 +41,10 @@ configService.atPath.mockReturnValue(
       enabled: false,
     },
     compression: { enabled: true },
+    xsrf: {
+      disableProtection: true,
+      whitelist: [],
+    },
   } as any)
 );
 
diff --git a/src/core/server/http/types.ts b/src/core/server/http/types.ts
index 92217515a22a1..9c8bfc073a524 100644
--- a/src/core/server/http/types.ts
+++ b/src/core/server/http/types.ts
@@ -250,16 +250,6 @@ export interface InternalHttpServiceSetup
     contextName: T,
     provider: RequestHandlerContextProvider<T>
   ) => RequestHandlerContextContainer;
-  config: {
-    /**
-     * @internalRemarks
-     * Deprecated part of the server config, provided until
-     * https://github.com/elastic/kibana/issues/40255
-     *
-     * @deprecated
-     * */
-    defaultRoute?: string;
-  };
 }
 
 /** @public */
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 835c5872d51a3..eccf3985fc495 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -41,12 +41,14 @@
 
 import { ElasticsearchServiceSetup, IScopedClusterClient } from './elasticsearch';
 import { HttpServiceSetup } from './http';
+import { IScopedRenderingClient } from './rendering';
 import { PluginsServiceSetup, PluginsServiceStart, PluginOpaqueId } from './plugins';
 import { ContextSetup } from './context';
-import { IUiSettingsClient, UiSettingsServiceSetup } from './ui_settings';
+import { IUiSettingsClient, UiSettingsServiceSetup, UiSettingsServiceStart } from './ui_settings';
 import { SavedObjectsClientContract } from './saved_objects/types';
 import { SavedObjectsServiceSetup, SavedObjectsServiceStart } from './saved_objects';
 import { CapabilitiesSetup, CapabilitiesStart } from './capabilities';
+import { UuidServiceSetup } from './uuid';
 
 export { bootstrap } from './bootstrap';
 export { Capabilities, CapabilitiesProvider, CapabilitiesSwitcher } from './capabilities';
@@ -72,6 +74,7 @@ export { CspConfig, ICspConfig } from './csp';
 export {
   ClusterClient,
   IClusterClient,
+  ICustomClusterClient,
   Headers,
   ScopedClusterClient,
   IScopedClusterClient,
@@ -81,6 +84,7 @@ export {
   ElasticsearchServiceSetup,
   APICaller,
   FakeRequest,
+  ScopeableRequest,
 } from './elasticsearch';
 export * from './elasticsearch/api_types';
 export {
@@ -133,15 +137,22 @@ export {
   RouteRegistrar,
   RouteMethod,
   RouteConfigOptions,
-  RouteSchemas,
   RouteConfigOptionsBody,
   RouteContentType,
   validBodyOutput,
+  RouteValidatorConfig,
+  RouteValidationSpec,
+  RouteValidationFunction,
+  RouteValidatorOptions,
+  RouteValidatorFullConfig,
+  RouteValidationResultFactory,
+  RouteValidationError,
   SessionStorage,
   SessionStorageCookieOptions,
   SessionCookieValidationResult,
   SessionStorageFactory,
 } from './http';
+export { RenderingServiceSetup, IRenderOptions, LegacyRenderOptions } from './rendering';
 export { Logger, LoggerFactory, LogMeta, LogRecord, LogLevel } from './logging';
 
 export {
@@ -203,6 +214,7 @@ export {
   UiSettingsParams,
   UiSettingsType,
   UiSettingsServiceSetup,
+  UiSettingsServiceStart,
   UserProvidedValues,
 } from './ui_settings';
 
@@ -221,23 +233,35 @@ export {
   SavedObjectsMigrationVersion,
 } from './types';
 
-export { LegacyServiceSetupDeps, LegacyServiceStartDeps } from './legacy';
+export {
+  LegacyServiceSetupDeps,
+  LegacyServiceStartDeps,
+  LegacyServiceDiscoverPlugins,
+  LegacyConfig,
+  LegacyUiExports,
+  LegacyInternals,
+} from './legacy';
 
 /**
  * Plugin specific context passed to a route handler.
  *
  * Provides the following clients:
+ *    - {@link IScopedRenderingClient | rendering} - Rendering client
+ *      which uses the data of the incoming request
  *    - {@link SavedObjectsClient | savedObjects.client} - Saved Objects client
  *      which uses the credentials of the incoming request
  *    - {@link ScopedClusterClient | elasticsearch.dataClient} - Elasticsearch
  *      data client which uses the credentials of the incoming request
  *    - {@link ScopedClusterClient | elasticsearch.adminClient} - Elasticsearch
  *      admin client which uses the credentials of the incoming request
+ *    - {@link IUiSettingsClient | uiSettings.client} - uiSettings client
+ *      which uses the credentials of the incoming request
  *
  * @public
  */
 export interface RequestHandlerContext {
   core: {
+    rendering: IScopedRenderingClient;
     savedObjects: {
       client: SavedObjectsClientContract;
     };
@@ -269,6 +293,8 @@ export interface CoreSetup {
   savedObjects: SavedObjectsServiceSetup;
   /** {@link UiSettingsServiceSetup} */
   uiSettings: UiSettingsServiceSetup;
+  /** {@link UuidServiceSetup} */
+  uuid: UuidServiceSetup;
 }
 
 /**
@@ -281,13 +307,17 @@ export interface CoreStart {
   capabilities: CapabilitiesStart;
   /** {@link SavedObjectsServiceStart} */
   savedObjects: SavedObjectsServiceStart;
+  /** {@link UiSettingsServiceStart} */
+  uiSettings: UiSettingsServiceStart;
 }
 
 export {
   CapabilitiesSetup,
   CapabilitiesStart,
   ContextSetup,
+  IScopedRenderingClient,
   PluginsServiceSetup,
   PluginsServiceStart,
   PluginOpaqueId,
+  UuidServiceSetup,
 };
diff --git a/src/core/server/internal_types.ts b/src/core/server/internal_types.ts
index 07fd77f83d774..ff68d1544d119 100644
--- a/src/core/server/internal_types.ts
+++ b/src/core/server/internal_types.ts
@@ -17,15 +17,19 @@
  * under the License.
  */
 
+import { Type } from '@kbn/config-schema';
+
+import { CapabilitiesSetup, CapabilitiesStart } from './capabilities';
+import { ConfigDeprecationProvider } from './config';
+import { ContextSetup } from './context';
 import { InternalElasticsearchServiceSetup } from './elasticsearch';
 import { InternalHttpServiceSetup } from './http';
-import { InternalUiSettingsServiceSetup } from './ui_settings';
-import { ContextSetup } from './context';
 import {
-  InternalSavedObjectsServiceStart,
   InternalSavedObjectsServiceSetup,
+  InternalSavedObjectsServiceStart,
 } from './saved_objects';
-import { CapabilitiesSetup, CapabilitiesStart } from './capabilities';
+import { InternalUiSettingsServiceSetup, InternalUiSettingsServiceStart } from './ui_settings';
+import { UuidServiceSetup } from './uuid';
 
 /** @internal */
 export interface InternalCoreSetup {
@@ -35,6 +39,7 @@ export interface InternalCoreSetup {
   elasticsearch: InternalElasticsearchServiceSetup;
   uiSettings: InternalUiSettingsServiceSetup;
   savedObjects: InternalSavedObjectsServiceSetup;
+  uuid: UuidServiceSetup;
 }
 
 /**
@@ -43,4 +48,20 @@ export interface InternalCoreSetup {
 export interface InternalCoreStart {
   capabilities: CapabilitiesStart;
   savedObjects: InternalSavedObjectsServiceStart;
+  uiSettings: InternalUiSettingsServiceStart;
+}
+
+/**
+ * @internal
+ */
+export interface ServiceConfigDescriptor<T = any> {
+  path: string;
+  /**
+   * Schema to use to validate the configuration.
+   */
+  schema: Type<T>;
+  /**
+   * Provider for the {@link ConfigDeprecation} to apply to the plugin configuration.
+   */
+  deprecations?: ConfigDeprecationProvider;
 }
diff --git a/src/core/server/legacy/config/__snapshots__/legacy_object_to_config_adapter.test.ts.snap b/src/core/server/legacy/config/__snapshots__/legacy_object_to_config_adapter.test.ts.snap
index d327860052eb9..74ecaa9f09c0e 100644
--- a/src/core/server/legacy/config/__snapshots__/legacy_object_to_config_adapter.test.ts.snap
+++ b/src/core/server/legacy/config/__snapshots__/legacy_object_to_config_adapter.test.ts.snap
@@ -8,10 +8,13 @@ Object {
     "enabled": true,
   },
   "cors": false,
-  "defaultRoute": undefined,
+  "customResponseHeaders": Object {
+    "custom-header": "custom-value",
+  },
   "host": "host",
   "keepaliveTimeout": 5000,
   "maxPayload": 1000,
+  "name": "kibana-hostname",
   "port": 1234,
   "rewriteBasePath": false,
   "socketTimeout": 2000,
@@ -20,6 +23,11 @@ Object {
     "keyPassphrase": "some-phrase",
     "someNewValue": "new",
   },
+  "uuid": undefined,
+  "xsrf": Object {
+    "disableProtection": false,
+    "whitelist": Array [],
+  },
 }
 `;
 
@@ -31,10 +39,13 @@ Object {
     "enabled": true,
   },
   "cors": false,
-  "defaultRoute": undefined,
+  "customResponseHeaders": Object {
+    "custom-header": "custom-value",
+  },
   "host": "host",
   "keepaliveTimeout": 5000,
   "maxPayload": 1000,
+  "name": "kibana-hostname",
   "port": 1234,
   "rewriteBasePath": false,
   "socketTimeout": 2000,
@@ -43,6 +54,11 @@ Object {
     "enabled": false,
     "key": "key",
   },
+  "uuid": undefined,
+  "xsrf": Object {
+    "disableProtection": false,
+    "whitelist": Array [],
+  },
 }
 `;
 
diff --git a/src/core/server/legacy/config/ensure_valid_configuration.ts b/src/core/server/legacy/config/ensure_valid_configuration.ts
index 026683a7b7cb0..a68d3df577a89 100644
--- a/src/core/server/legacy/config/ensure_valid_configuration.ts
+++ b/src/core/server/legacy/config/ensure_valid_configuration.ts
@@ -19,7 +19,7 @@
 
 import { getUnusedConfigKeys } from './get_unused_config_keys';
 import { ConfigService } from '../../config';
-import { LegacyServiceDiscoverPlugins } from '../legacy_service';
+import { LegacyServiceDiscoverPlugins } from '../types';
 import { CriticalError } from '../../errors';
 
 export async function ensureValidConfiguration(
diff --git a/src/core/server/legacy/config/get_unused_config_keys.test.ts b/src/core/server/legacy/config/get_unused_config_keys.test.ts
index bf011fa01a342..c4452fc6a1209 100644
--- a/src/core/server/legacy/config/get_unused_config_keys.test.ts
+++ b/src/core/server/legacy/config/get_unused_config_keys.test.ts
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import { LegacyPluginSpec } from '../plugins/find_legacy_plugin_specs';
-import { LegacyConfig } from './types';
+import { LegacyPluginSpec, LegacyConfig, LegacyVars } from '../types';
 import { getUnusedConfigKeys } from './get_unused_config_keys';
 
 describe('getUnusedConfigKeys', () => {
@@ -26,7 +25,7 @@ describe('getUnusedConfigKeys', () => {
     jest.resetAllMocks();
   });
 
-  const getConfig = (values: Record<string, any> = {}): LegacyConfig =>
+  const getConfig = (values: LegacyVars = {}): LegacyConfig =>
     ({
       get: () => values as any,
     } as LegacyConfig);
diff --git a/src/core/server/legacy/config/get_unused_config_keys.ts b/src/core/server/legacy/config/get_unused_config_keys.ts
index 73cc7d8c50474..e425082ba126d 100644
--- a/src/core/server/legacy/config/get_unused_config_keys.ts
+++ b/src/core/server/legacy/config/get_unused_config_keys.ts
@@ -22,8 +22,7 @@ import { difference, get, set } from 'lodash';
 import { getTransform } from '../../../../legacy/deprecation/index';
 import { unset, getFlattenedObject } from '../../../../legacy/utils';
 import { hasConfigPathIntersection } from '../../config';
-import { LegacyPluginSpec } from '../plugins/find_legacy_plugin_specs';
-import { LegacyConfig } from './types';
+import { LegacyPluginSpec, LegacyConfig, LegacyVars } from '../types';
 
 const getFlattenedKeys = (object: object) => Object.keys(getFlattenedObject(object));
 
@@ -37,7 +36,7 @@ export async function getUnusedConfigKeys({
   coreHandledConfigPaths: string[];
   pluginSpecs: LegacyPluginSpec[];
   disabledPluginSpecs: LegacyPluginSpec[];
-  settings: Record<string, any>;
+  settings: LegacyVars;
   legacyConfig: LegacyConfig;
 }) {
   // transform deprecated plugin settings
diff --git a/src/core/server/legacy/config/index.ts b/src/core/server/legacy/config/index.ts
index c3f308fd6d903..f10e3f22d53c5 100644
--- a/src/core/server/legacy/config/index.ts
+++ b/src/core/server/legacy/config/index.ts
@@ -20,9 +20,3 @@
 export { ensureValidConfiguration } from './ensure_valid_configuration';
 export { LegacyObjectToConfigAdapter } from './legacy_object_to_config_adapter';
 export { convertLegacyDeprecationProvider } from './legacy_deprecation_adapters';
-export {
-  LegacyConfig,
-  LegacyConfigDeprecation,
-  LegacyConfigDeprecationFactory,
-  LegacyConfigDeprecationProvider,
-} from './types';
diff --git a/src/core/server/legacy/config/legacy_deprecation_adapters.test.ts b/src/core/server/legacy/config/legacy_deprecation_adapters.test.ts
index 144e057c118f7..8651d05064492 100644
--- a/src/core/server/legacy/config/legacy_deprecation_adapters.test.ts
+++ b/src/core/server/legacy/config/legacy_deprecation_adapters.test.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { convertLegacyDeprecationProvider } from './legacy_deprecation_adapters';
-import { LegacyConfigDeprecationProvider } from './types';
 import { ConfigDeprecation } from '../../config';
 import { configDeprecationFactory } from '../../config/deprecation/deprecation_factory';
 import { applyDeprecations } from '../../config/deprecation/apply_deprecations';
+import { LegacyConfigDeprecationProvider } from '../types';
+import { convertLegacyDeprecationProvider } from './legacy_deprecation_adapters';
 
 jest.spyOn(configDeprecationFactory, 'unusedFromRoot');
 jest.spyOn(configDeprecationFactory, 'renameFromRoot');
diff --git a/src/core/server/legacy/config/legacy_deprecation_adapters.ts b/src/core/server/legacy/config/legacy_deprecation_adapters.ts
index b0e3bc37e1510..1e0733969e662 100644
--- a/src/core/server/legacy/config/legacy_deprecation_adapters.ts
+++ b/src/core/server/legacy/config/legacy_deprecation_adapters.ts
@@ -18,8 +18,8 @@
  */
 
 import { ConfigDeprecation, ConfigDeprecationProvider } from '../../config/deprecation';
-import { LegacyConfigDeprecation, LegacyConfigDeprecationProvider } from './index';
 import { configDeprecationFactory } from '../../config/deprecation/deprecation_factory';
+import { LegacyConfigDeprecation, LegacyConfigDeprecationProvider } from '../types';
 
 const convertLegacyDeprecation = (
   legacyDeprecation: LegacyConfigDeprecation
diff --git a/src/core/server/legacy/config/legacy_object_to_config_adapter.test.ts b/src/core/server/legacy/config/legacy_object_to_config_adapter.test.ts
index db2bc117280ca..1c51564187442 100644
--- a/src/core/server/legacy/config/legacy_object_to_config_adapter.test.ts
+++ b/src/core/server/legacy/config/legacy_object_to_config_adapter.test.ts
@@ -80,9 +80,11 @@ describe('#get', () => {
   test('correctly handles server config.', () => {
     const configAdapter = new LegacyObjectToConfigAdapter({
       server: {
+        name: 'kibana-hostname',
         autoListen: true,
         basePath: '/abc',
         cors: false,
+        customResponseHeaders: { 'custom-header': 'custom-value' },
         host: 'host',
         maxPayloadBytes: 1000,
         keepaliveTimeout: 5000,
@@ -92,14 +94,20 @@ describe('#get', () => {
         ssl: { enabled: true, keyPassphrase: 'some-phrase', someNewValue: 'new' },
         compression: { enabled: true },
         someNotSupportedValue: 'val',
+        xsrf: {
+          disableProtection: false,
+          whitelist: [],
+        },
       },
     });
 
     const configAdapterWithDisabledSSL = new LegacyObjectToConfigAdapter({
       server: {
+        name: 'kibana-hostname',
         autoListen: true,
         basePath: '/abc',
         cors: false,
+        customResponseHeaders: { 'custom-header': 'custom-value' },
         host: 'host',
         maxPayloadBytes: 1000,
         keepaliveTimeout: 5000,
@@ -109,6 +117,10 @@ describe('#get', () => {
         ssl: { enabled: false, certificate: 'cert', key: 'key' },
         compression: { enabled: true },
         someNotSupportedValue: 'val',
+        xsrf: {
+          disableProtection: false,
+          whitelist: [],
+        },
       },
     });
 
diff --git a/src/core/server/legacy/config/legacy_object_to_config_adapter.ts b/src/core/server/legacy/config/legacy_object_to_config_adapter.ts
index 75e1813f8c1f6..30bb150e6c15a 100644
--- a/src/core/server/legacy/config/legacy_object_to_config_adapter.ts
+++ b/src/core/server/legacy/config/legacy_object_to_config_adapter.ts
@@ -19,6 +19,7 @@
 
 import { ConfigPath } from '../../config';
 import { ObjectToConfigAdapter } from '../../config/object_to_config_adapter';
+import { LegacyVars } from '../types';
 
 /**
  * Represents logging config supported by the legacy platform.
@@ -59,24 +60,27 @@ export class LegacyObjectToConfigAdapter extends ObjectToConfigAdapter {
 
   private static transformServer(configValue: any = {}) {
     // TODO: New platform uses just a subset of `server` config from the legacy platform,
-    // new values will be exposed once we need them (eg. customResponseHeaders or xsrf).
+    // new values will be exposed once we need them
     return {
       autoListen: configValue.autoListen,
       basePath: configValue.basePath,
-      defaultRoute: configValue.defaultRoute,
       cors: configValue.cors,
+      customResponseHeaders: configValue.customResponseHeaders,
       host: configValue.host,
       maxPayload: configValue.maxPayloadBytes,
+      name: configValue.name,
       port: configValue.port,
       rewriteBasePath: configValue.rewriteBasePath,
       ssl: configValue.ssl,
       keepaliveTimeout: configValue.keepaliveTimeout,
       socketTimeout: configValue.socketTimeout,
       compression: configValue.compression,
+      uuid: configValue.uuid,
+      xsrf: configValue.xsrf,
     };
   }
 
-  private static transformPlugins(configValue: Record<string, any>) {
+  private static transformPlugins(configValue: LegacyVars) {
     // These properties are the only ones we use from the existing `plugins` config node
     // since `scanDirs` isn't respected by new platform plugin discovery.
     return {
@@ -93,7 +97,7 @@ export class LegacyObjectToConfigAdapter extends ObjectToConfigAdapter {
       case 'server':
         return LegacyObjectToConfigAdapter.transformServer(configValue);
       case 'plugins':
-        return LegacyObjectToConfigAdapter.transformPlugins(configValue as Record<string, any>);
+        return LegacyObjectToConfigAdapter.transformPlugins(configValue as LegacyVars);
       default:
         return configValue;
     }
diff --git a/src/core/server/legacy/config/types.ts b/src/core/server/legacy/config/types.ts
deleted file mode 100644
index 24869e361c39c..0000000000000
--- a/src/core/server/legacy/config/types.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.
- */
-
-/**
- * New platform representation of the legacy configuration (KibanaConfig)
- *
- * @internal
- */
-export interface LegacyConfig {
-  get<T>(key?: string): T;
-  has(key: string): boolean;
-}
-
-/**
- * Representation of a legacy configuration deprecation factory used for
- * legacy plugin deprecations.
- *
- * @internal
- */
-export interface LegacyConfigDeprecationFactory {
-  rename(oldKey: string, newKey: string): LegacyConfigDeprecation;
-  unused(unusedKey: string): LegacyConfigDeprecation;
-}
-
-/**
- * Representation of a legacy configuration deprecation.
- *
- * @internal
- */
-export type LegacyConfigDeprecation = (
-  settings: Record<string, any>,
-  log: (msg: string) => void
-) => void;
-
-/**
- * Representation of a legacy configuration deprecation provider.
- *
- * @internal
- */
-export type LegacyConfigDeprecationProvider = (
-  factory: LegacyConfigDeprecationFactory
-) => LegacyConfigDeprecation[] | Promise<LegacyConfigDeprecation[]>;
diff --git a/src/core/server/legacy/index.ts b/src/core/server/legacy/index.ts
index 10686fc521d35..208e9b1167253 100644
--- a/src/core/server/legacy/index.ts
+++ b/src/core/server/legacy/index.ts
@@ -18,6 +18,10 @@
  */
 
 /** @internal */
-export { LegacyObjectToConfigAdapter, ensureValidConfiguration, LegacyConfig } from './config';
+export { LegacyObjectToConfigAdapter, ensureValidConfiguration } from './config';
 /** @internal */
-export { LegacyService, LegacyServiceSetupDeps, LegacyServiceStartDeps } from './legacy_service';
+export { LegacyInternals } from './legacy_internals';
+/** @internal */
+export { LegacyService, ILegacyService } from './legacy_service';
+/** @internal */
+export * from './types';
diff --git a/src/core/server/legacy/legacy_internals.test.ts b/src/core/server/legacy/legacy_internals.test.ts
new file mode 100644
index 0000000000000..dcab62627442b
--- /dev/null
+++ b/src/core/server/legacy/legacy_internals.test.ts
@@ -0,0 +1,211 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Server } from 'hapi';
+
+import { configMock } from '../config/config.mock';
+import { httpServiceMock } from '../http/http_service.mock';
+import { httpServerMock } from '../http/http_server.mocks';
+import { findLegacyPluginSpecsMock } from './legacy_service.test.mocks';
+import { LegacyInternals } from './legacy_internals';
+import { ILegacyInternals, LegacyConfig, LegacyVars, LegacyUiExports } from './types';
+
+function varsProvider(vars: LegacyVars, configValue?: any) {
+  return {
+    fn: jest.fn().mockReturnValue(vars),
+    pluginSpec: {
+      readConfigValue: jest.fn().mockReturnValue(configValue),
+    },
+  };
+}
+
+describe('LegacyInternals', () => {
+  describe('getInjectedUiAppVars()', () => {
+    let uiExports: LegacyUiExports;
+    let config: LegacyConfig;
+    let server: Server;
+    let legacyInternals: ILegacyInternals;
+
+    beforeEach(async () => {
+      uiExports = findLegacyPluginSpecsMock().uiExports;
+      config = configMock.create() as any;
+      server = httpServiceMock.createSetupContract().server;
+      legacyInternals = new LegacyInternals(uiExports, config, server);
+    });
+
+    it('gets with no injectors', async () => {
+      await expect(legacyInternals.getInjectedUiAppVars('core')).resolves.toMatchInlineSnapshot(
+        `Object {}`
+      );
+    });
+
+    it('gets with no matching injectors', async () => {
+      const injector = jest.fn().mockResolvedValue({ not: 'core' });
+      legacyInternals.injectUiAppVars('not-core', injector);
+
+      await expect(legacyInternals.getInjectedUiAppVars('core')).resolves.toMatchInlineSnapshot(
+        `Object {}`
+      );
+      expect(injector).not.toHaveBeenCalled();
+    });
+
+    it('gets with single matching injector', async () => {
+      const injector = jest.fn().mockResolvedValue({ is: 'core' });
+      legacyInternals.injectUiAppVars('core', injector);
+
+      await expect(legacyInternals.getInjectedUiAppVars('core')).resolves.toMatchInlineSnapshot(`
+        Object {
+          "is": "core",
+        }
+      `);
+      expect(injector).toHaveBeenCalled();
+    });
+
+    it('gets with multiple matching injectors', async () => {
+      const injectors = [
+        jest.fn().mockResolvedValue({ is: 'core' }),
+        jest.fn().mockReturnValue({ sync: 'injector' }),
+        jest.fn().mockResolvedValue({ is: 'merged-core' }),
+      ];
+
+      injectors.forEach(injector => legacyInternals.injectUiAppVars('core', injector));
+
+      await expect(legacyInternals.getInjectedUiAppVars('core')).resolves.toMatchInlineSnapshot(`
+        Object {
+          "is": "merged-core",
+          "sync": "injector",
+        }
+      `);
+      expect(injectors[0]).toHaveBeenCalled();
+      expect(injectors[1]).toHaveBeenCalled();
+      expect(injectors[2]).toHaveBeenCalled();
+    });
+  });
+
+  describe('getVars()', () => {
+    let uiExports: LegacyUiExports;
+    let config: LegacyConfig;
+    let server: Server;
+    let legacyInternals: LegacyInternals;
+
+    beforeEach(async () => {
+      uiExports = findLegacyPluginSpecsMock().uiExports;
+      config = configMock.create() as any;
+      server = httpServiceMock.createSetupContract().server;
+      legacyInternals = new LegacyInternals(uiExports, config, server);
+    });
+
+    it('gets: no default injectors, no injected vars replacers, no ui app injectors, no inject arg', async () => {
+      const vars = await legacyInternals.getVars('core', httpServerMock.createRawRequest());
+
+      expect(vars).toMatchInlineSnapshot(`Object {}`);
+    });
+
+    it('gets: with default injectors, no injected vars replacers, no ui app injectors, no inject arg', async () => {
+      uiExports.defaultInjectedVarProviders = [
+        varsProvider({ alpha: 'alpha' }),
+        varsProvider({ gamma: 'gamma' }),
+        varsProvider({ alpha: 'beta' }),
+      ];
+
+      const vars = await legacyInternals.getVars('core', httpServerMock.createRawRequest());
+
+      expect(vars).toMatchInlineSnapshot(`
+        Object {
+          "alpha": "beta",
+          "gamma": "gamma",
+        }
+      `);
+    });
+
+    it('gets: no default injectors, with injected vars replacers, with ui app injectors, no inject arg', async () => {
+      uiExports.injectedVarsReplacers = [
+        jest.fn(async vars => ({ ...vars, added: 'key' })),
+        jest.fn(vars => vars),
+        jest.fn(vars => ({ replaced: 'all' })),
+        jest.fn(async vars => ({ ...vars, added: 'last-key' })),
+      ];
+
+      const request = httpServerMock.createRawRequest();
+      const vars = await legacyInternals.getVars('core', request);
+
+      expect(vars).toMatchInlineSnapshot(`
+        Object {
+          "added": "last-key",
+          "replaced": "all",
+        }
+      `);
+    });
+
+    it('gets: no default injectors, no injected vars replacers, with ui app injectors, no inject arg', async () => {
+      legacyInternals.injectUiAppVars('core', async () => ({ is: 'core' }));
+      legacyInternals.injectUiAppVars('core', () => ({ sync: 'injector' }));
+      legacyInternals.injectUiAppVars('core', async () => ({ is: 'merged-core' }));
+
+      const vars = await legacyInternals.getVars('core', httpServerMock.createRawRequest());
+
+      expect(vars).toMatchInlineSnapshot(`
+        Object {
+          "is": "merged-core",
+          "sync": "injector",
+        }
+      `);
+    });
+
+    it('gets: no default injectors, no injected vars replacers, no ui app injectors, with inject arg', async () => {
+      const vars = await legacyInternals.getVars('core', httpServerMock.createRawRequest(), {
+        injected: 'arg',
+      });
+
+      expect(vars).toMatchInlineSnapshot(`
+        Object {
+          "injected": "arg",
+        }
+      `);
+    });
+
+    it('gets: with default injectors, with injected vars replacers, with ui app injectors, with inject arg', async () => {
+      uiExports.defaultInjectedVarProviders = [
+        varsProvider({ alpha: 'alpha' }),
+        varsProvider({ gamma: 'gamma' }),
+        varsProvider({ alpha: 'beta' }),
+      ];
+      uiExports.injectedVarsReplacers = [jest.fn(async vars => ({ ...vars, gamma: 'delta' }))];
+
+      legacyInternals.injectUiAppVars('core', async () => ({ is: 'core' }));
+      legacyInternals.injectUiAppVars('core', () => ({ sync: 'injector' }));
+      legacyInternals.injectUiAppVars('core', async () => ({ is: 'merged-core' }));
+
+      const vars = await legacyInternals.getVars('core', httpServerMock.createRawRequest(), {
+        injected: 'arg',
+        sync: 'arg',
+      });
+
+      expect(vars).toMatchInlineSnapshot(`
+        Object {
+          "alpha": "beta",
+          "gamma": "delta",
+          "injected": "arg",
+          "is": "merged-core",
+          "sync": "arg",
+        }
+      `);
+    });
+  });
+});
diff --git a/src/core/server/legacy/legacy_internals.ts b/src/core/server/legacy/legacy_internals.ts
new file mode 100644
index 0000000000000..3bf54e5f75dce
--- /dev/null
+++ b/src/core/server/legacy/legacy_internals.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 { Server } from 'hapi';
+
+import { LegacyRequest } from '../http';
+import { mergeVars } from './merge_vars';
+import { ILegacyInternals, LegacyVars, VarsInjector, LegacyConfig, LegacyUiExports } from './types';
+
+/**
+ * @internal
+ * @deprecated
+ */
+export class LegacyInternals implements ILegacyInternals {
+  private readonly injectors = new Map<string, Set<VarsInjector>>();
+  private cachedDefaultVars?: LegacyVars;
+
+  constructor(
+    private readonly uiExports: LegacyUiExports,
+    private readonly config: LegacyConfig,
+    private readonly server: Server
+  ) {}
+
+  private get defaultVars(): LegacyVars {
+    if (this.cachedDefaultVars) {
+      return this.cachedDefaultVars;
+    }
+
+    const { defaultInjectedVarProviders = [] } = this.uiExports;
+
+    return (this.cachedDefaultVars = defaultInjectedVarProviders.reduce(
+      (vars, { fn, pluginSpec }) =>
+        mergeVars(vars, fn(this.server, pluginSpec.readConfigValue(this.config, []))),
+      {}
+    ));
+  }
+
+  private replaceVars(vars: LegacyVars, request: LegacyRequest) {
+    const { injectedVarsReplacers = [] } = this.uiExports;
+
+    return injectedVarsReplacers.reduce(
+      async (injected, replacer) => replacer(await injected, request, this.server),
+      Promise.resolve(vars)
+    );
+  }
+
+  public injectUiAppVars(id: string, injector: VarsInjector) {
+    if (!this.injectors.has(id)) {
+      this.injectors.set(id, new Set());
+    }
+
+    this.injectors.get(id)!.add(injector);
+  }
+
+  public getInjectedUiAppVars(id: string) {
+    return [...(this.injectors.get(id) || [])].reduce(
+      async (promise, injector) => ({
+        ...(await promise),
+        ...(await injector()),
+      }),
+      Promise.resolve<LegacyVars>({})
+    );
+  }
+
+  public async getVars(id: string, request: LegacyRequest, injected: LegacyVars = {}) {
+    return this.replaceVars(
+      mergeVars(this.defaultVars, await this.getInjectedUiAppVars(id), injected),
+      request
+    );
+  }
+}
diff --git a/src/core/server/legacy/legacy_service.mock.ts b/src/core/server/legacy/legacy_service.mock.ts
new file mode 100644
index 0000000000000..495141cdcb58d
--- /dev/null
+++ b/src/core/server/legacy/legacy_service.mock.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 { LegacyService } from './legacy_service';
+import { LegacyServiceDiscoverPlugins, LegacyServiceSetupDeps } from './types';
+
+type LegacyServiceMock = jest.Mocked<PublicMethodsOf<LegacyService> & { legacyId: symbol }>;
+
+const createDiscoverPluginsMock = (): LegacyServiceDiscoverPlugins => ({
+  pluginSpecs: [],
+  uiExports: {} as any,
+  navLinks: [],
+  pluginExtendedConfig: {
+    get: jest.fn(),
+    has: jest.fn(),
+    set: jest.fn(),
+  },
+  disabledPluginSpecs: [],
+  settings: {},
+});
+const createLegacyServiceMock = (): LegacyServiceMock => ({
+  legacyId: Symbol(),
+  discoverPlugins: jest.fn().mockResolvedValue(createDiscoverPluginsMock()),
+  setup: jest.fn(),
+  start: jest.fn(),
+  stop: jest.fn(),
+});
+
+export const legacyServiceMock = {
+  create: createLegacyServiceMock,
+  createSetupContract: (deps: LegacyServiceSetupDeps) => createLegacyServiceMock().setup(deps),
+  createDiscoverPlugins: createDiscoverPluginsMock,
+};
diff --git a/src/core/server/legacy/legacy_service.test.mocks.ts b/src/core/server/legacy/legacy_service.test.mocks.ts
new file mode 100644
index 0000000000000..451a75ced7ae2
--- /dev/null
+++ b/src/core/server/legacy/legacy_service.test.mocks.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 { LegacyVars } from './types';
+
+export const findLegacyPluginSpecsMock = jest.fn().mockImplementation((settings: LegacyVars) => ({
+  pluginSpecs: [],
+  pluginExtendedConfig: {
+    has: jest.fn(),
+    get: jest.fn().mockReturnValue(settings),
+    set: jest.fn(),
+  },
+  disabledPluginSpecs: [],
+  uiExports: {},
+  navLinks: [],
+}));
+jest.doMock('./plugins/find_legacy_plugin_specs.ts', () => ({
+  findLegacyPluginSpecs: findLegacyPluginSpecsMock,
+}));
diff --git a/src/core/server/legacy/legacy_service.test.ts b/src/core/server/legacy/legacy_service.test.ts
index d4360c577d24c..608392e4943f9 100644
--- a/src/core/server/legacy/legacy_service.test.ts
+++ b/src/core/server/legacy/legacy_service.test.ts
@@ -17,36 +17,37 @@
  * under the License.
  */
 
-import { BehaviorSubject, throwError } from 'rxjs';
-
 jest.mock('../../../legacy/server/kbn_server');
 jest.mock('../../../cli/cluster/cluster_manager');
-jest.mock('./plugins/find_legacy_plugin_specs');
 jest.mock('./config/legacy_deprecation_adapters', () => ({
   convertLegacyDeprecationProvider: (provider: any) => Promise.resolve(provider),
 }));
+import { findLegacyPluginSpecsMock } from './legacy_service.test.mocks';
+
+import { BehaviorSubject, throwError } from 'rxjs';
 
-import { LegacyService, LegacyServiceSetupDeps, LegacyServiceStartDeps } from '.';
 // @ts-ignore: implicit any for JS file
-import MockClusterManager from '../../../cli/cluster/cluster_manager';
+import { ClusterManager as MockClusterManager } from '../../../cli/cluster/cluster_manager';
 import KbnServer from '../../../legacy/server/kbn_server';
 import { Config, Env, ObjectToConfigAdapter } from '../config';
-import { contextServiceMock } from '../context/context_service.mock';
 import { getEnvOptions } from '../config/__mocks__/env';
-import { configServiceMock } from '../config/config_service.mock';
-
 import { BasePathProxyServer } from '../http';
-import { loggingServiceMock } from '../logging/logging_service.mock';
 import { DiscoveredPlugin } from '../plugins';
 
+import { configServiceMock } from '../config/config_service.mock';
+import { loggingServiceMock } from '../logging/logging_service.mock';
+import { contextServiceMock } from '../context/context_service.mock';
 import { httpServiceMock } from '../http/http_service.mock';
 import { uiSettingsServiceMock } from '../ui_settings/ui_settings_service.mock';
 import { savedObjectsServiceMock } from '../saved_objects/saved_objects_service.mock';
 import { capabilitiesServiceMock } from '../capabilities/capabilities_service.mock';
-import { findLegacyPluginSpecs } from './plugins/find_legacy_plugin_specs';
+import { setupMock as renderingServiceMock } from '../rendering/__mocks__/rendering_service';
+import { uuidServiceMock } from '../uuid/uuid_service.mock';
+import { findLegacyPluginSpecs } from './plugins';
+import { LegacyVars, LegacyServiceSetupDeps, LegacyServiceStartDeps } from './types';
+import { LegacyService } from './legacy_service';
 
 const MockKbnServer: jest.Mock<KbnServer> = KbnServer as any;
-const findLegacyPluginSpecsMock: jest.Mock<typeof findLegacyPluginSpecs> = findLegacyPluginSpecs as any;
 
 let coreId: symbol;
 let env: Env;
@@ -58,23 +59,17 @@ let startDeps: LegacyServiceStartDeps;
 
 const logger = loggingServiceMock.create();
 let configService: ReturnType<typeof configServiceMock.create>;
+let uuidSetup: ReturnType<typeof uuidServiceMock.createSetupContract>;
 
 beforeEach(() => {
   coreId = Symbol();
   env = Env.createDefault(getEnvOptions());
   configService = configServiceMock.create();
+  uuidSetup = uuidServiceMock.createSetupContract();
 
-  findLegacyPluginSpecsMock.mockImplementation(
-    settings =>
-      Promise.resolve({
-        pluginSpecs: [],
-        pluginExtendedConfig: settings,
-        disabledPluginSpecs: [],
-        uiExports: [],
-      }) as any
-  );
-
+  findLegacyPluginSpecsMock.mockClear();
   MockKbnServer.prototype.ready = jest.fn().mockReturnValue(Promise.resolve());
+  MockKbnServer.prototype.listen = jest.fn();
 
   setupDeps = {
     core: {
@@ -97,6 +92,8 @@ beforeEach(() => {
           browserConfigs: new Map(),
         },
       },
+      rendering: renderingServiceMock,
+      uuid: uuidSetup,
     },
     plugins: { 'plugin-id': 'plugin-value' },
   };
@@ -105,6 +102,7 @@ beforeEach(() => {
     core: {
       capabilities: capabilitiesServiceMock.createStartContract(),
       savedObjects: savedObjectsServiceMock.createStartContract(),
+      uiSettings: uiSettingsServiceMock.createStartContract(),
       plugins: { contracts: new Map() },
     },
     plugins: {},
@@ -123,7 +121,6 @@ beforeEach(() => {
 
 afterEach(() => {
   jest.clearAllMocks();
-  findLegacyPluginSpecsMock.mockReset();
 });
 
 describe('once LegacyService is set up with connection info', () => {
@@ -142,11 +139,15 @@ describe('once LegacyService is set up with connection info', () => {
 
     expect(MockKbnServer).toHaveBeenCalledTimes(1);
     expect(MockKbnServer).toHaveBeenCalledWith(
-      { path: { autoListen: true }, server: { autoListen: true } },
       { path: { autoListen: true }, server: { autoListen: true } }, // Because of the mock, path also gets the value
+      expect.objectContaining({ get: expect.any(Function) }),
       expect.any(Object),
-      { disabledPluginSpecs: [], pluginSpecs: [], uiExports: [] }
+      { disabledPluginSpecs: [], pluginSpecs: [], uiExports: {}, navLinks: [] }
     );
+    expect(MockKbnServer.mock.calls[0][1].get()).toEqual({
+      path: { autoListen: true },
+      server: { autoListen: true },
+    });
 
     const [mockKbnServer] = MockKbnServer.mock.instances;
     expect(mockKbnServer.listen).toHaveBeenCalledTimes(1);
@@ -169,10 +170,14 @@ describe('once LegacyService is set up with connection info', () => {
     expect(MockKbnServer).toHaveBeenCalledTimes(1);
     expect(MockKbnServer).toHaveBeenCalledWith(
       { path: { autoListen: false }, server: { autoListen: true } },
-      { path: { autoListen: false }, server: { autoListen: true } },
+      expect.objectContaining({ get: expect.any(Function) }),
       expect.any(Object),
-      { disabledPluginSpecs: [], pluginSpecs: [], uiExports: [] }
+      { disabledPluginSpecs: [], pluginSpecs: [], uiExports: {}, navLinks: [] }
     );
+    expect(MockKbnServer.mock.calls[0][1].get()).toEqual({
+      path: { autoListen: false },
+      server: { autoListen: true },
+    });
 
     const [mockKbnServer] = MockKbnServer.mock.instances;
     expect(mockKbnServer.ready).toHaveBeenCalledTimes(1);
@@ -306,10 +311,14 @@ describe('once LegacyService is set up without connection info', () => {
     expect(MockKbnServer).toHaveBeenCalledTimes(1);
     expect(MockKbnServer).toHaveBeenCalledWith(
       { path: {}, server: { autoListen: true } },
-      { path: {}, server: { autoListen: true } },
+      expect.objectContaining({ get: expect.any(Function) }),
       expect.any(Object),
-      { disabledPluginSpecs: [], pluginSpecs: [], uiExports: [] }
+      { disabledPluginSpecs: [], pluginSpecs: [], uiExports: {}, navLinks: [] }
     );
+    expect(MockKbnServer.mock.calls[0][1].get()).toEqual({
+      path: {},
+      server: { autoListen: true },
+    });
   });
 
   test('reconfigures logging configuration if new config is received.', async () => {
@@ -350,9 +359,15 @@ describe('once LegacyService is set up in `devClusterMaster` mode', () => {
     await devClusterLegacyService.setup(setupDeps);
     await devClusterLegacyService.start(startDeps);
 
-    const [[cliArgs, , basePathProxy]] = MockClusterManager.create.mock.calls;
-    expect(cliArgs.basePath).toBe(false);
-    expect(basePathProxy).not.toBeDefined();
+    expect(MockClusterManager).toHaveBeenCalledTimes(1);
+    expect(MockClusterManager).toHaveBeenCalledWith(
+      expect.objectContaining({ silent: true, basePath: false }),
+      expect.objectContaining({
+        get: expect.any(Function),
+        set: expect.any(Function),
+      }),
+      undefined
+    );
   });
 
   test('creates ClusterManager with base path proxy.', async () => {
@@ -372,24 +387,30 @@ describe('once LegacyService is set up in `devClusterMaster` mode', () => {
     await devClusterLegacyService.setup(setupDeps);
     await devClusterLegacyService.start(startDeps);
 
-    expect(MockClusterManager.create).toBeCalledTimes(1);
-
-    const [[cliArgs, , basePathProxy]] = MockClusterManager.create.mock.calls;
-    expect(cliArgs.basePath).toEqual(true);
-    expect(basePathProxy).toBeInstanceOf(BasePathProxyServer);
+    expect(MockClusterManager).toHaveBeenCalledTimes(1);
+    expect(MockClusterManager).toHaveBeenCalledWith(
+      expect.objectContaining({ quiet: true, basePath: true }),
+      expect.objectContaining({
+        get: expect.any(Function),
+        set: expect.any(Function),
+      }),
+      expect.any(BasePathProxyServer)
+    );
   });
 });
 
-test('Cannot start without setup phase', async () => {
-  const legacyService = new LegacyService({
-    coreId,
-    env,
-    logger,
-    configService: configService as any,
+describe('start', () => {
+  test('Cannot start without setup phase', async () => {
+    const legacyService = new LegacyService({
+      coreId,
+      env,
+      logger,
+      configService: configService as any,
+    });
+    await expect(legacyService.start(startDeps)).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"Legacy service is not setup yet."`
+    );
   });
-  await expect(legacyService.start(startDeps)).rejects.toThrowErrorMatchingInlineSnapshot(
-    `"Legacy service is not setup yet."`
-  );
 });
 
 describe('#discoverPlugins()', () => {
@@ -423,7 +444,8 @@ describe('#discoverPlugins()', () => {
           ],
           pluginExtendedConfig: settings,
           disabledPluginSpecs: [],
-          uiExports: [],
+          uiExports: {},
+          navLinks: [],
         }) as any
     );
 
@@ -440,3 +462,35 @@ describe('#discoverPlugins()', () => {
     expect(configService.addDeprecationProvider).toHaveBeenCalledWith('', 'providerB');
   });
 });
+
+test('Sets the server.uuid property on the legacy configuration', async () => {
+  configService.atPath.mockReturnValue(new BehaviorSubject({ autoListen: true }));
+  const legacyService = new LegacyService({
+    coreId,
+    env,
+    logger,
+    configService: configService as any,
+  });
+
+  uuidSetup.getInstanceUuid.mockImplementation(() => 'UUID_FROM_SERVICE');
+
+  const configSetMock = jest.fn();
+
+  findLegacyPluginSpecsMock.mockImplementation((settings: LegacyVars) => ({
+    pluginSpecs: [],
+    pluginExtendedConfig: {
+      has: jest.fn(),
+      get: jest.fn().mockReturnValue(settings),
+      set: configSetMock,
+    },
+    disabledPluginSpecs: [],
+    uiExports: {},
+    navLinks: [],
+  }));
+
+  await legacyService.discoverPlugins();
+  await legacyService.setup(setupDeps);
+
+  expect(configSetMock).toHaveBeenCalledTimes(1);
+  expect(configSetMock).toHaveBeenCalledWith('server.uuid', 'UUID_FROM_SERVICE');
+});
diff --git a/src/core/server/legacy/legacy_service.ts b/src/core/server/legacy/legacy_service.ts
index 662cc0bdf2f3a..cc36b90ec526d 100644
--- a/src/core/server/legacy/legacy_service.ts
+++ b/src/core/server/legacy/legacy_service.ts
@@ -19,24 +19,30 @@
 
 import { combineLatest, ConnectableObservable, EMPTY, Observable, Subscription } from 'rxjs';
 import { first, map, publishReplay, tap } from 'rxjs/operators';
+
 import { CoreService } from '../../types';
-import { CoreSetup, CoreStart } from '../';
-import { InternalCoreSetup, InternalCoreStart } from '../internal_types';
-import { SavedObjectsLegacyUiExports } from '../types';
 import { Config, ConfigDeprecationProvider } from '../config';
 import { CoreContext } from '../core_context';
 import { CspConfigType, config as cspConfig } from '../csp';
 import { DevConfig, DevConfigType, config as devConfig } from '../dev';
 import { BasePathProxyServer, HttpConfig, HttpConfigType, config as httpConfig } from '../http';
 import { Logger } from '../logging';
-import { PluginsServiceSetup, PluginsServiceStart } from '../plugins';
-import { findLegacyPluginSpecs } from './plugins';
-import { LegacyPluginSpec } from './plugins/find_legacy_plugin_specs';
 import { PathConfigType } from '../path';
-import { LegacyConfig, convertLegacyDeprecationProvider } from './config';
+import { findLegacyPluginSpecs } from './plugins';
+import { convertLegacyDeprecationProvider } from './config';
+import {
+  LegacyServiceSetupDeps,
+  LegacyServiceStartDeps,
+  LegacyPlugins,
+  LegacyServiceDiscoverPlugins,
+  LegacyConfig,
+  LegacyVars,
+} from './types';
+import { LegacyInternals } from './legacy_internals';
+import { CoreSetup, CoreStart } from '..';
 
 interface LegacyKbnServer {
-  applyLoggingConfiguration: (settings: Readonly<Record<string, any>>) => void;
+  applyLoggingConfiguration: (settings: Readonly<LegacyVars>) => void;
   listen: () => Promise<void>;
   ready: () => Promise<void>;
   close: () => Promise<void>;
@@ -53,43 +59,14 @@ function getLegacyRawConfig(config: Config, pathConfig: PathConfigType) {
 
   return {
     ...rawConfig,
-    path: pathConfig, // We rely heavily in the default value of 'path.data' in the legacy world and, since it has been moved to NP, it won't show up in RawConfig
-  };
-}
-
-/**
- * @public
- * @deprecated
- */
-export interface LegacyServiceSetupDeps {
-  core: InternalCoreSetup & {
-    plugins: PluginsServiceSetup;
-  };
-  plugins: Record<string, unknown>;
-}
-
-/**
- * @public
- * @deprecated
- */
-export interface LegacyServiceStartDeps {
-  core: InternalCoreStart & {
-    plugins: PluginsServiceStart;
+    // We rely heavily in the default value of 'path.data' in the legacy world and,
+    // since it has been moved to NP, it won't show up in RawConfig.
+    path: pathConfig,
   };
-  plugins: Record<string, unknown>;
 }
 
 /** @internal */
-export interface LegacyServiceDiscoverPlugins {
-  pluginSpecs: LegacyPluginSpec[];
-  disabledPluginSpecs: LegacyPluginSpec[];
-  uiExports: SavedObjectsLegacyUiExports;
-  pluginExtendedConfig: LegacyConfig;
-  settings: Record<string, any>;
-}
-
-/** @internal */
-export type ILegacyService = Pick<LegacyService, keyof LegacyService>;
+export type ILegacyService = PublicMethodsOf<LegacyService>;
 
 /** @internal */
 export class LegacyService implements CoreService {
@@ -101,19 +78,13 @@ export class LegacyService implements CoreService {
   private kbnServer?: LegacyKbnServer;
   private configSubscription?: Subscription;
   private setupDeps?: LegacyServiceSetupDeps;
-  private update$: ConnectableObservable<[Config, PathConfigType]> | undefined;
-  private legacyRawConfig: LegacyConfig | undefined;
-  private legacyPlugins:
-    | {
-        pluginSpecs: LegacyPluginSpec[];
-        disabledPluginSpecs: LegacyPluginSpec[];
-        uiExports: SavedObjectsLegacyUiExports;
-      }
-    | undefined;
-  private settings: Record<string, any> | undefined;
+  private update$?: ConnectableObservable<[Config, PathConfigType]>;
+  private legacyRawConfig?: LegacyConfig;
+  private legacyPlugins?: LegacyPlugins;
+  private settings?: LegacyVars;
 
   constructor(private readonly coreContext: CoreContext) {
-    const { logger, configService, env } = coreContext;
+    const { logger, configService } = coreContext;
 
     this.log = logger.get('legacy-service');
     this.devConfig$ = configService
@@ -122,7 +93,7 @@ export class LegacyService implements CoreService {
     this.httpConfig$ = combineLatest(
       configService.atPath<HttpConfigType>(httpConfig.path),
       configService.atPath<CspConfigType>(cspConfig.path)
-    ).pipe(map(([http, csp]) => new HttpConfig(http, csp, env)));
+    ).pipe(map(([http, csp]) => new HttpConfig(http, csp)));
   }
 
   public async discoverPlugins(): Promise<LegacyServiceDiscoverPlugins> {
@@ -153,12 +124,14 @@ export class LegacyService implements CoreService {
       pluginExtendedConfig,
       disabledPluginSpecs,
       uiExports,
+      navLinks,
     } = await findLegacyPluginSpecs(this.settings, this.coreContext.logger);
 
     this.legacyPlugins = {
       pluginSpecs,
       disabledPluginSpecs,
       uiExports,
+      navLinks,
     };
 
     const deprecationProviders = await pluginSpecs
@@ -188,6 +161,7 @@ export class LegacyService implements CoreService {
       pluginSpecs,
       disabledPluginSpecs,
       uiExports,
+      navLinks,
       pluginExtendedConfig,
       settings: this.settings,
     };
@@ -195,32 +169,37 @@ export class LegacyService implements CoreService {
 
   public async setup(setupDeps: LegacyServiceSetupDeps) {
     this.log.debug('setting up legacy service');
-    if (!this.legacyRawConfig || !this.legacyPlugins || !this.settings) {
+
+    if (!this.legacyPlugins) {
       throw new Error(
         'Legacy service has not discovered legacy plugins yet. Ensure LegacyService.discoverPlugins() is called before LegacyService.setup()'
       );
     }
+
+    // propagate the instance uuid to the legacy config, as it was the legacy way to access it.
+    this.legacyRawConfig!.set('server.uuid', setupDeps.core.uuid.getInstanceUuid());
     this.setupDeps = setupDeps;
   }
 
   public async start(startDeps: LegacyServiceStartDeps) {
     const { setupDeps } = this;
-    if (!setupDeps || !this.legacyRawConfig || !this.legacyPlugins || !this.settings) {
+
+    if (!setupDeps || !this.legacyPlugins) {
       throw new Error('Legacy service is not setup yet.');
     }
+
     this.log.debug('starting legacy service');
 
     // Receive initial config and create kbnServer/ClusterManager.
-
     if (this.coreContext.env.isDevClusterMaster) {
-      await this.createClusterManager(this.legacyRawConfig);
+      await this.createClusterManager(this.legacyRawConfig!);
     } else {
       this.kbnServer = await this.createKbnServer(
-        this.settings,
-        this.legacyRawConfig,
+        this.settings!,
+        this.legacyRawConfig!,
         setupDeps,
         startDeps,
-        this.legacyPlugins
+        this.legacyPlugins!
       );
     }
   }
@@ -241,7 +220,7 @@ export class LegacyService implements CoreService {
 
   private async createClusterManager(config: LegacyConfig) {
     const basePathProxy$ = this.coreContext.env.cliArgs.basePath
-      ? combineLatest(this.devConfig$, this.httpConfig$).pipe(
+      ? combineLatest([this.devConfig$, this.httpConfig$]).pipe(
           first(),
           map(
             ([dev, http]) =>
@@ -250,7 +229,9 @@ export class LegacyService implements CoreService {
         )
       : EMPTY;
 
-    require('../../../cli/cluster/cluster_manager').create(
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const { ClusterManager } = require('../../../cli/cluster/cluster_manager');
+    return new ClusterManager(
       this.coreContext.env.cliArgs,
       config,
       await basePathProxy$.toPromise()
@@ -258,22 +239,18 @@ export class LegacyService implements CoreService {
   }
 
   private async createKbnServer(
-    settings: Record<string, any>,
+    settings: LegacyVars,
     config: LegacyConfig,
     setupDeps: LegacyServiceSetupDeps,
     startDeps: LegacyServiceStartDeps,
-    legacyPlugins: {
-      pluginSpecs: LegacyPluginSpec[];
-      disabledPluginSpecs: LegacyPluginSpec[];
-      uiExports: SavedObjectsLegacyUiExports;
-    }
+    legacyPlugins: LegacyPlugins
   ) {
     const coreSetup: CoreSetup = {
       capabilities: setupDeps.core.capabilities,
       context: setupDeps.core.context,
       elasticsearch: {
-        adminClient$: setupDeps.core.elasticsearch.adminClient$,
-        dataClient$: setupDeps.core.elasticsearch.dataClient$,
+        adminClient: setupDeps.core.elasticsearch.adminClient,
+        dataClient: setupDeps.core.elasticsearch.dataClient,
         createClient: setupDeps.core.elasticsearch.createClient,
       },
       http: {
@@ -300,10 +277,14 @@ export class LegacyService implements CoreService {
       uiSettings: {
         register: setupDeps.core.uiSettings.register,
       },
+      uuid: {
+        getInstanceUuid: setupDeps.core.uuid.getInstanceUuid,
+      },
     };
     const coreStart: CoreStart = {
       capabilities: startDeps.core.capabilities,
       savedObjects: { getScopedClient: startDeps.core.savedObjects.getScopedClient },
+      uiSettings: { asScopedToClient: startDeps.core.uiSettings.asScopedToClient },
     };
 
     // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -329,8 +310,10 @@ export class LegacyService implements CoreService {
           kibanaMigrator: startDeps.core.savedObjects.migrator,
           uiPlugins: setupDeps.core.plugins.uiPlugins,
           elasticsearch: setupDeps.core.elasticsearch,
+          rendering: setupDeps.core.rendering,
           uiSettings: setupDeps.core.uiSettings,
           savedObjectsClientProvider: startDeps.core.savedObjects.clientProvider,
+          legacy: new LegacyInternals(legacyPlugins.uiExports, config, setupDeps.core.http.server),
         },
         logger: this.coreContext.logger,
       },
diff --git a/src/core/server/legacy/logging/appenders/legacy_appender.ts b/src/core/server/legacy/logging/appenders/legacy_appender.ts
index 011dfae8a5cef..6d82d929e7daa 100644
--- a/src/core/server/legacy/logging/appenders/legacy_appender.ts
+++ b/src/core/server/legacy/logging/appenders/legacy_appender.ts
@@ -21,6 +21,7 @@ import { schema } from '@kbn/config-schema';
 import { DisposableAppender } from '../../../logging/appenders/appenders';
 import { LogRecord } from '../../../logging/log_record';
 import { LegacyLoggingServer } from '../legacy_logging_server';
+import { LegacyVars } from '../../types';
 
 /**
  * Simple appender that just forwards `LogRecord` to the legacy KbnServer log.
@@ -34,7 +35,7 @@ export class LegacyAppender implements DisposableAppender {
 
   private readonly loggingServer: LegacyLoggingServer;
 
-  constructor(legacyLoggingConfig: Readonly<Record<string, any>>) {
+  constructor(legacyLoggingConfig: Readonly<LegacyVars>) {
     this.loggingServer = new LegacyLoggingServer(legacyLoggingConfig);
   }
 
diff --git a/src/core/server/legacy/logging/legacy_logging_server.ts b/src/core/server/legacy/logging/legacy_logging_server.ts
index 57706bcac2232..85a8686b4eded 100644
--- a/src/core/server/legacy/logging/legacy_logging_server.ts
+++ b/src/core/server/legacy/logging/legacy_logging_server.ts
@@ -25,9 +25,10 @@ import { Config } from '../../../../legacy/server/config';
 import { setupLogging } from '../../../../legacy/server/logging';
 import { LogLevel } from '../../logging/log_level';
 import { LogRecord } from '../../logging/log_record';
+import { LegacyVars } from '../../types';
 
 export const metadataSymbol = Symbol('log message with metadata');
-export function attachMetaData(message: string, metadata: Record<string, any> = {}) {
+export function attachMetaData(message: string, metadata: LegacyVars = {}) {
   return {
     [metadataSymbol]: {
       message,
@@ -50,7 +51,7 @@ interface PluginRegisterParams {
       options: PluginRegisterParams['options']
     ) => Promise<void>;
   };
-  options: Record<string, any>;
+  options: LegacyVars;
 }
 
 /**
@@ -84,7 +85,7 @@ export class LegacyLoggingServer {
 
   private onPostStopCallback?: () => void;
 
-  constructor(legacyLoggingConfig: Readonly<Record<string, any>>) {
+  constructor(legacyLoggingConfig: Readonly<LegacyVars>) {
     // We set `ops.interval` to max allowed number and `ops` filter to value
     // that doesn't exist to avoid logging of ops at all, if turned on it will be
     // logged by the "legacy" Kibana.
diff --git a/src/core/server/legacy/merge_vars.test.ts b/src/core/server/legacy/merge_vars.test.ts
new file mode 100644
index 0000000000000..d977ee292d039
--- /dev/null
+++ b/src/core/server/legacy/merge_vars.test.ts
@@ -0,0 +1,199 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mergeVars } from './merge_vars';
+
+describe('mergeVars', () => {
+  it('merges two objects together', () => {
+    const first = {
+      otherName: 'value',
+      otherCanFoo: true,
+      otherNested: {
+        otherAnotherVariable: 'ok',
+      },
+    };
+    const second = {
+      name: 'value',
+      canFoo: true,
+      nested: {
+        anotherVariable: 'ok',
+      },
+    };
+
+    expect(mergeVars(first, second)).toEqual({
+      name: 'value',
+      canFoo: true,
+      nested: {
+        anotherVariable: 'ok',
+      },
+      otherName: 'value',
+      otherCanFoo: true,
+      otherNested: {
+        otherAnotherVariable: 'ok',
+      },
+    });
+  });
+
+  it('does not mutate the source objects', () => {
+    const first = {
+      var1: 'first',
+    };
+    const second = {
+      var1: 'second',
+      var2: 'second',
+    };
+    const third = {
+      var1: 'third',
+      var2: 'third',
+      var3: 'third',
+    };
+    const fourth = {
+      var1: 'fourth',
+      var2: 'fourth',
+      var3: 'fourth',
+      var4: 'fourth',
+    };
+
+    mergeVars(first, second, third, fourth);
+
+    expect(first).toEqual({ var1: 'first' });
+    expect(second).toEqual({ var1: 'second', var2: 'second' });
+    expect(third).toEqual({ var1: 'third', var2: 'third', var3: 'third' });
+    expect(fourth).toEqual({ var1: 'fourth', var2: 'fourth', var3: 'fourth', var4: 'fourth' });
+  });
+
+  it('merges multiple objects together with precedence increasing from left-to-right', () => {
+    const first = {
+      var1: 'first',
+      var2: 'first',
+      var3: 'first',
+      var4: 'first',
+    };
+    const second = {
+      var1: 'second',
+      var2: 'second',
+      var3: 'second',
+    };
+    const third = {
+      var1: 'third',
+      var2: 'third',
+    };
+    const fourth = {
+      var1: 'fourth',
+    };
+
+    expect(mergeVars(first, second, third, fourth)).toEqual({
+      var1: 'fourth',
+      var2: 'third',
+      var3: 'second',
+      var4: 'first',
+    });
+  });
+
+  it('overwrites the original variable value if a duplicate entry is found', () => {
+    const first = {
+      nested: {
+        otherAnotherVariable: 'ok',
+      },
+    };
+    const second = {
+      name: 'value',
+      canFoo: true,
+      nested: {
+        anotherVariable: 'ok',
+      },
+    };
+
+    expect(mergeVars(first, second)).toEqual({
+      name: 'value',
+      canFoo: true,
+      nested: {
+        anotherVariable: 'ok',
+      },
+    });
+  });
+
+  it('combines entries within "uiCapabilities"', () => {
+    const first = {
+      uiCapabilities: {
+        firstCapability: 'ok',
+        sharedCapability: 'shared',
+      },
+    };
+    const second = {
+      name: 'value',
+      canFoo: true,
+      uiCapabilities: {
+        secondCapability: 'ok',
+      },
+    };
+    const third = {
+      name: 'value',
+      canFoo: true,
+      uiCapabilities: {
+        thirdCapability: 'ok',
+        sharedCapability: 'blocked',
+      },
+    };
+
+    expect(mergeVars(first, second, third)).toEqual({
+      name: 'value',
+      canFoo: true,
+      uiCapabilities: {
+        firstCapability: 'ok',
+        secondCapability: 'ok',
+        thirdCapability: 'ok',
+        sharedCapability: 'blocked',
+      },
+    });
+  });
+
+  it('does not deeply combine entries within "uiCapabilities"', () => {
+    const first = {
+      uiCapabilities: {
+        firstCapability: 'ok',
+        nestedCapability: {
+          otherNestedProp: 'otherNestedValue',
+        },
+      },
+    };
+    const second = {
+      name: 'value',
+      canFoo: true,
+      uiCapabilities: {
+        secondCapability: 'ok',
+        nestedCapability: {
+          nestedProp: 'nestedValue',
+        },
+      },
+    };
+
+    expect(mergeVars(first, second)).toEqual({
+      name: 'value',
+      canFoo: true,
+      uiCapabilities: {
+        firstCapability: 'ok',
+        secondCapability: 'ok',
+        nestedCapability: {
+          nestedProp: 'nestedValue',
+        },
+      },
+    });
+  });
+});
diff --git a/src/core/server/legacy/merge_vars.ts b/src/core/server/legacy/merge_vars.ts
new file mode 100644
index 0000000000000..a1d43af2f861d
--- /dev/null
+++ b/src/core/server/legacy/merge_vars.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 { LegacyVars } from './types';
+
+const ELIGIBLE_FLAT_MERGE_KEYS = ['uiCapabilities'];
+
+export function mergeVars(...sources: LegacyVars[]): LegacyVars {
+  return Object.assign(
+    {},
+    ...sources,
+    ...ELIGIBLE_FLAT_MERGE_KEYS.flatMap(key =>
+      sources.some(source => key in source)
+        ? [{ [key]: Object.assign({}, ...sources.map(source => source[key] || {})) }]
+        : []
+    )
+  );
+}
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 0a49154801e56..d2e7a39236d0a 100644
--- a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
+++ b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
@@ -19,25 +19,77 @@
 
 import { Observable, merge, forkJoin } from 'rxjs';
 import { toArray, tap, distinct, map } from 'rxjs/operators';
+
 import {
   findPluginSpecs,
   defaultConfig,
   // @ts-ignore
 } from '../../../../legacy/plugin_discovery/find_plugin_specs.js';
-import { LoggerFactory } from '../../logging';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { collectUiExports as collectLegacyUiExports } from '../../../../legacy/ui/ui_exports/collect_ui_exports';
-import { LegacyConfig, LegacyConfigDeprecationProvider } from '../config';
 
-export interface LegacyPluginPack {
-  getPath(): string;
+import { LoggerFactory } from '../../logging';
+import {
+  LegacyUiExports,
+  LegacyNavLink,
+  LegacyPluginSpec,
+  LegacyPluginPack,
+  LegacyConfig,
+} from '../types';
+
+const REMOVE_FROM_ARRAY: LegacyNavLink[] = [];
+
+function getUiAppsNavLinks({ uiAppSpecs = [] }: LegacyUiExports, pluginSpecs: LegacyPluginSpec[]) {
+  return uiAppSpecs.flatMap(spec => {
+    if (!spec) {
+      return REMOVE_FROM_ARRAY;
+    }
+
+    const id = spec.pluginId || spec.id;
+
+    if (!id) {
+      throw new Error('Every app must specify an id');
+    }
+
+    if (spec.pluginId && !pluginSpecs.some(plugin => plugin.getId() === spec.pluginId)) {
+      throw new Error(`Unknown plugin id "${spec.pluginId}"`);
+    }
+
+    const listed = typeof spec.listed === 'boolean' ? spec.listed : true;
+
+    if (spec.hidden || !listed) {
+      return REMOVE_FROM_ARRAY;
+    }
+
+    return {
+      id,
+      title: spec.title,
+      order: typeof spec.order === 'number' ? spec.order : 0,
+      icon: spec.icon,
+      euiIconType: spec.euiIconType,
+      url: spec.url || `/app/${id}`,
+      linkToLastSubUrl: spec.linkToLastSubUrl,
+    };
+  });
 }
 
-export interface LegacyPluginSpec {
-  getId: () => unknown;
-  getExpectedKibanaVersion: () => string;
-  getConfigPrefix: () => string;
-  getDeprecationsProvider: () => LegacyConfigDeprecationProvider | undefined;
+function getNavLinks(uiExports: LegacyUiExports, pluginSpecs: LegacyPluginSpec[]) {
+  return (uiExports.navLinkSpecs || [])
+    .map<LegacyNavLink>(spec => ({
+      id: spec.id,
+      title: spec.title,
+      order: typeof spec.order === 'number' ? spec.order : 0,
+      url: spec.url,
+      subUrlBase: spec.subUrlBase || spec.url,
+      icon: spec.icon,
+      euiIconType: spec.euiIconType,
+      linkToLastSub: 'linkToLastSubUrl' in spec ? spec.linkToLastSubUrl : false,
+      hidden: 'hidden' in spec ? spec.hidden : false,
+      disabled: 'disabled' in spec ? spec.disabled : false,
+      tooltip: spec.tooltip || '',
+    }))
+    .concat(getUiAppsNavLinks(uiExports, pluginSpecs))
+    .sort((a, b) => a.order - b.order);
 }
 
 export async function findLegacyPluginSpecs(settings: unknown, loggerFactory: LoggerFactory) {
@@ -128,11 +180,14 @@ export async function findLegacyPluginSpecs(settings: unknown, loggerFactory: Lo
     spec$.pipe(toArray()),
     log$.pipe(toArray())
   ).toPromise();
+  const uiExports = collectLegacyUiExports(pluginSpecs);
+  const navLinks = getNavLinks(uiExports, pluginSpecs);
 
   return {
     disabledPluginSpecs,
     pluginSpecs,
     pluginExtendedConfig: configToMutate,
-    uiExports: collectLegacyUiExports(pluginSpecs),
+    uiExports,
+    navLinks,
   };
 }
diff --git a/src/core/server/legacy/plugins/index.ts b/src/core/server/legacy/plugins/index.ts
index 7c69546f0c4de..a6d55e1da7839 100644
--- a/src/core/server/legacy/plugins/index.ts
+++ b/src/core/server/legacy/plugins/index.ts
@@ -16,4 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 export { findLegacyPluginSpecs } from './find_legacy_plugin_specs';
diff --git a/src/core/server/legacy/types.ts b/src/core/server/legacy/types.ts
new file mode 100644
index 0000000000000..6ec893be9b310
--- /dev/null
+++ b/src/core/server/legacy/types.ts
@@ -0,0 +1,222 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Server } from 'hapi';
+
+import { ChromeNavLink } from '../../public';
+import { LegacyRequest } from '../http';
+import { InternalCoreSetup, InternalCoreStart } from '../internal_types';
+import { PluginsServiceSetup, PluginsServiceStart } from '../plugins';
+import { RenderingServiceSetup } from '../rendering';
+import { SavedObjectsLegacyUiExports } from '../types';
+
+/**
+ * @internal
+ * @deprecated
+ */
+export type LegacyVars = Record<string, any>;
+
+type LegacyCoreSetup = InternalCoreSetup & {
+  plugins: PluginsServiceSetup;
+  rendering: RenderingServiceSetup;
+};
+type LegacyCoreStart = InternalCoreStart & { plugins: PluginsServiceStart };
+
+/**
+ * New platform representation of the legacy configuration (KibanaConfig)
+ *
+ * @internal
+ * @deprecated
+ */
+export interface LegacyConfig {
+  get<T>(key?: string): T;
+  has(key: string): boolean;
+  set(key: string, value: any): void;
+  set(config: LegacyVars): void;
+}
+
+/**
+ * Representation of a legacy configuration deprecation factory used for
+ * legacy plugin deprecations.
+ *
+ * @internal
+ * @deprecated
+ */
+export interface LegacyConfigDeprecationFactory {
+  rename(oldKey: string, newKey: string): LegacyConfigDeprecation;
+  unused(unusedKey: string): LegacyConfigDeprecation;
+}
+
+/**
+ * Representation of a legacy configuration deprecation.
+ *
+ * @internal
+ * @deprecated
+ */
+export type LegacyConfigDeprecation = (settings: LegacyVars, log: (msg: string) => void) => void;
+
+/**
+ * Representation of a legacy configuration deprecation provider.
+ *
+ * @internal
+ * @deprecated
+ */
+export type LegacyConfigDeprecationProvider = (
+  factory: LegacyConfigDeprecationFactory
+) => LegacyConfigDeprecation[] | Promise<LegacyConfigDeprecation[]>;
+
+/**
+ * @internal
+ * @deprecated
+ */
+export interface LegacyPluginPack {
+  getPath(): string;
+}
+
+/**
+ * @internal
+ * @deprecated
+ */
+export interface LegacyPluginSpec {
+  getId: () => unknown;
+  getExpectedKibanaVersion: () => string;
+  getConfigPrefix: () => string;
+  getDeprecationsProvider: () => LegacyConfigDeprecationProvider | undefined;
+}
+
+/**
+ * @internal
+ * @deprecated
+ */
+export interface VarsProvider {
+  fn: (server: Server, configValue: any) => LegacyVars;
+  pluginSpec: {
+    readConfigValue(config: any, key: string | string[]): any;
+  };
+}
+
+/**
+ * @internal
+ * @deprecated
+ */
+export type VarsInjector = () => LegacyVars;
+
+/**
+ * @internal
+ * @deprecated
+ */
+export type VarsReplacer = (
+  vars: LegacyVars,
+  request: LegacyRequest,
+  server: Server
+) => LegacyVars | Promise<LegacyVars>;
+
+/**
+ * @internal
+ * @deprecated
+ */
+export type LegacyNavLinkSpec = Record<string, unknown> & ChromeNavLink;
+
+/**
+ * @internal
+ * @deprecated
+ */
+export type LegacyAppSpec = Pick<
+  ChromeNavLink,
+  'title' | 'order' | 'icon' | 'euiIconType' | 'url' | 'linkToLastSubUrl' | 'hidden'
+> & { pluginId?: string; id?: string; listed?: boolean };
+
+/**
+ * @internal
+ * @deprecated
+ */
+export type LegacyNavLink = Omit<ChromeNavLink, 'baseUrl' | 'legacy' | 'order'> & {
+  order: number;
+};
+
+/**
+ * @internal
+ * @deprecated
+ */
+export type LegacyUiExports = SavedObjectsLegacyUiExports & {
+  defaultInjectedVarProviders?: VarsProvider[];
+  injectedVarsReplacers?: VarsReplacer[];
+  navLinkSpecs?: LegacyNavLinkSpec[] | null;
+  uiAppSpecs?: Array<LegacyAppSpec | undefined>;
+  unknown?: [{ pluginSpec: LegacyPluginSpec; type: unknown }];
+};
+
+/**
+ * @public
+ * @deprecated
+ */
+export interface LegacyServiceSetupDeps {
+  core: LegacyCoreSetup;
+  plugins: Record<string, unknown>;
+}
+
+/**
+ * @public
+ * @deprecated
+ */
+export interface LegacyServiceStartDeps {
+  core: LegacyCoreStart;
+  plugins: Record<string, unknown>;
+}
+
+/**
+ * @internal
+ * @deprecated
+ */
+export interface ILegacyInternals {
+  /**
+   * Inject UI app vars for a particular plugin
+   */
+  injectUiAppVars(id: string, injector: VarsInjector): void;
+
+  /**
+   * Get all the merged injected UI app vars for a particular plugin
+   */
+  getInjectedUiAppVars(id: string): Promise<LegacyVars>;
+
+  /**
+   * Get the metadata vars for a particular plugin
+   */
+  getVars(id: string, request: LegacyRequest, injected?: LegacyVars): Promise<LegacyVars>;
+}
+
+/**
+ * @internal
+ * @deprecated
+ */
+export interface LegacyPlugins {
+  disabledPluginSpecs: LegacyPluginSpec[];
+  pluginSpecs: LegacyPluginSpec[];
+  uiExports: LegacyUiExports;
+  navLinks: LegacyNavLink[];
+}
+
+/**
+ * @internal
+ * @deprecated
+ */
+export interface LegacyServiceDiscoverPlugins extends LegacyPlugins {
+  pluginExtendedConfig: LegacyConfig;
+  settings: LegacyVars;
+}
diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
index 07b60e771d643..073d380d3aa67 100644
--- a/src/core/server/mocks.ts
+++ b/src/core/server/mocks.ts
@@ -38,6 +38,7 @@ 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 { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
+import { uuidServiceMock } from './uuid/uuid_service.mock';
 
 export function pluginInitializerContextConfigMock<T>(config: T) {
   const globalConfig: SharedGlobalConfig = {
@@ -106,10 +107,11 @@ function createCoreSetupMock() {
   const mock: MockedKeys<CoreSetup> = {
     capabilities: capabilitiesServiceMock.createSetupContract(),
     context: contextServiceMock.createSetupContract(),
-    elasticsearch: elasticsearchServiceMock.createSetupContract(),
+    elasticsearch: elasticsearchServiceMock.createSetup(),
     http: httpMock,
     savedObjects: savedObjectsServiceMock.createSetupContract(),
     uiSettings: uiSettingsMock,
+    uuid: uuidServiceMock.createSetupContract(),
   };
 
   return mock;
@@ -119,6 +121,7 @@ function createCoreStartMock() {
   const mock: MockedKeys<CoreStart> = {
     capabilities: capabilitiesServiceMock.createStartContract(),
     savedObjects: savedObjectsServiceMock.createStartContract(),
+    uiSettings: uiSettingsServiceMock.createStartContract(),
   };
 
   return mock;
@@ -128,10 +131,11 @@ function createInternalCoreSetupMock() {
   const setupDeps: InternalCoreSetup = {
     capabilities: capabilitiesServiceMock.createSetupContract(),
     context: contextServiceMock.createSetupContract(),
-    elasticsearch: elasticsearchServiceMock.createSetupContract(),
+    elasticsearch: elasticsearchServiceMock.createInternalSetup(),
     http: httpServiceMock.createSetupContract(),
     uiSettings: uiSettingsServiceMock.createSetupContract(),
     savedObjects: savedObjectsServiceMock.createSetupContract(),
+    uuid: uuidServiceMock.createSetupContract(),
   };
   return setupDeps;
 }
@@ -140,6 +144,7 @@ function createInternalCoreStartMock() {
   const startDeps: InternalCoreStart = {
     capabilities: capabilitiesServiceMock.createStartContract(),
     savedObjects: savedObjectsServiceMock.createStartContract(),
+    uiSettings: uiSettingsServiceMock.createStartContract(),
   };
   return startDeps;
 }
diff --git a/src/core/server/plugins/discovery/plugins_discovery.test.ts b/src/core/server/plugins/discovery/plugins_discovery.test.ts
index bf55fc7caae4c..2902aafdbf146 100644
--- a/src/core/server/plugins/discovery/plugins_discovery.test.ts
+++ b/src/core/server/plugins/discovery/plugins_discovery.test.ts
@@ -18,13 +18,14 @@
  */
 
 import { mockPackage, mockReaddir, mockReadFile, mockStat } from './plugins_discovery.test.mocks';
+import { rawConfigServiceMock } from '../../config/raw_config_service.mock';
+import { loggingServiceMock } from '../../logging/logging_service.mock';
 
 import { resolve } from 'path';
 import { first, map, toArray } from 'rxjs/operators';
+
 import { ConfigService, Env } from '../../config';
-import { rawConfigServiceMock } from '../../config/raw_config_service.mock';
 import { getEnvOptions } from '../../config/__mocks__/env';
-import { loggingServiceMock } from '../../logging/logging_service.mock';
 import { PluginWrapper } from '../plugin';
 import { PluginsConfig, PluginsConfigType, config } from '../plugins_config';
 import { discover } from './plugins_discovery';
@@ -37,6 +38,7 @@ const TEST_PLUGIN_SEARCH_PATHS = {
 const TEST_EXTRA_PLUGIN_PATH = resolve(process.cwd(), 'my-extra-plugin');
 
 const logger = loggingServiceMock.create();
+
 beforeEach(() => {
   mockReaddir.mockImplementation((path, cb) => {
     if (path === TEST_PLUGIN_SEARCH_PATHS.nonEmptySrcPlugins) {
@@ -182,12 +184,84 @@ test('properly iterates through plugin search locations', async () => {
       'kibana.json'
     )})`,
   ]);
+});
+
+test('logs a warning about --plugin-path when used in development', async () => {
+  mockPackage.raw = {
+    branch: 'master',
+    version: '1.2.3',
+    build: {
+      distributable: true,
+      number: 1,
+      sha: '',
+    },
+  };
+
+  const env = Env.createDefault(
+    getEnvOptions({
+      cliArgs: { dev: false, envName: 'development' },
+    })
+  );
+  const configService = new ConfigService(
+    rawConfigServiceMock.create({ rawConfig: { plugins: { paths: [TEST_EXTRA_PLUGIN_PATH] } } }),
+    env,
+    logger
+  );
+  await configService.setSchema(config.path, config.schema);
+
+  const rawConfig = await configService
+    .atPath<PluginsConfigType>('plugins')
+    .pipe(first())
+    .toPromise();
+
+  discover(new PluginsConfig(rawConfig, env), {
+    coreId: Symbol(),
+    configService,
+    env,
+    logger,
+  });
+
+  expect(loggingServiceMock.collect(logger).warn).toEqual([
+    [
+      `Explicit plugin paths [${TEST_EXTRA_PLUGIN_PATH}] should only be used in development. Relative imports may not work properly in production.`,
+    ],
+  ]);
+});
+
+test('does not log a warning about --plugin-path when used in production', async () => {
+  mockPackage.raw = {
+    branch: 'master',
+    version: '1.2.3',
+    build: {
+      distributable: true,
+      number: 1,
+      sha: '',
+    },
+  };
+
+  const env = Env.createDefault(
+    getEnvOptions({
+      cliArgs: { dev: false, envName: 'production' },
+    })
+  );
+  const configService = new ConfigService(
+    rawConfigServiceMock.create({ rawConfig: { plugins: { paths: [TEST_EXTRA_PLUGIN_PATH] } } }),
+    env,
+    logger
+  );
+  await configService.setSchema(config.path, config.schema);
+
+  const rawConfig = await configService
+    .atPath<PluginsConfigType>('plugins')
+    .pipe(first())
+    .toPromise();
+
+  discover(new PluginsConfig(rawConfig, env), {
+    coreId: Symbol(),
+    configService,
+    env,
+    logger,
+  });
 
-  expect(loggingServiceMock.collect(logger).warn).toMatchInlineSnapshot(`
-Array [
-  Array [
-    "Explicit plugin paths [${TEST_EXTRA_PLUGIN_PATH}] are only supported in development. Relative imports will not work in production.",
-  ],
-]
-`);
+  expect(loggingServiceMock.collect(logger).warn).toEqual([]);
 });
diff --git a/src/core/server/plugins/discovery/plugins_discovery.ts b/src/core/server/plugins/discovery/plugins_discovery.ts
index 521d02e487df6..79238afdf5c81 100644
--- a/src/core/server/plugins/discovery/plugins_discovery.ts
+++ b/src/core/server/plugins/discovery/plugins_discovery.ts
@@ -46,9 +46,9 @@ export function discover(config: PluginsConfig, coreContext: CoreContext) {
   const log = coreContext.logger.get('plugins-discovery');
   log.debug('Discovering plugins...');
 
-  if (config.additionalPluginPaths.length) {
+  if (config.additionalPluginPaths.length && coreContext.env.mode.dev) {
     log.warn(
-      `Explicit plugin paths [${config.additionalPluginPaths}] are only supported in development. Relative imports will not work in production.`
+      `Explicit plugin paths [${config.additionalPluginPaths}] should only be used in development. Relative imports may not work properly in production.`
     );
   }
 
diff --git a/src/core/server/plugins/plugin_context.ts b/src/core/server/plugins/plugin_context.ts
index 26c65baf95535..6d82a8d3ec6cf 100644
--- a/src/core/server/plugins/plugin_context.ts
+++ b/src/core/server/plugins/plugin_context.ts
@@ -145,8 +145,8 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
       createContextContainer: deps.context.createContextContainer,
     },
     elasticsearch: {
-      adminClient$: deps.elasticsearch.adminClient$,
-      dataClient$: deps.elasticsearch.dataClient$,
+      adminClient: deps.elasticsearch.adminClient,
+      dataClient: deps.elasticsearch.dataClient,
       createClient: deps.elasticsearch.createClient,
     },
     http: {
@@ -173,6 +173,9 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
     uiSettings: {
       register: deps.uiSettings.register,
     },
+    uuid: {
+      getInstanceUuid: deps.uuid.getInstanceUuid,
+    },
   };
 }
 
@@ -197,6 +200,11 @@ export function createPluginStartContext<TPlugin, TPluginDependencies>(
     capabilities: {
       resolveCapabilities: deps.capabilities.resolveCapabilities,
     },
-    savedObjects: { getScopedClient: deps.savedObjects.getScopedClient },
+    savedObjects: {
+      getScopedClient: deps.savedObjects.getScopedClient,
+    },
+    uiSettings: {
+      asScopedToClient: deps.uiSettings.asScopedToClient,
+    },
   };
 }
diff --git a/src/core/server/plugins/plugins_config.test.ts b/src/core/server/plugins/plugins_config.test.ts
new file mode 100644
index 0000000000000..180d6093e0404
--- /dev/null
+++ b/src/core/server/plugins/plugins_config.test.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 { PluginsConfig, PluginsConfigType } from './plugins_config';
+import { Env } from '../config';
+import { getEnvOptions } from '../config/__mocks__/env';
+
+describe('PluginsConfig', () => {
+  it('retrieves additionalPluginPaths from config.paths when in production mode', () => {
+    const env = Env.createDefault(getEnvOptions({ cliArgs: { dev: false } }));
+    const rawConfig: PluginsConfigType = {
+      initialize: true,
+      paths: ['some-path', 'another-path'],
+    };
+    const config = new PluginsConfig(rawConfig, env);
+    expect(config.additionalPluginPaths).toEqual(['some-path', 'another-path']);
+  });
+
+  it('retrieves additionalPluginPaths from config.paths when in development mode', () => {
+    const env = Env.createDefault(getEnvOptions({ cliArgs: { dev: true } }));
+    const rawConfig: PluginsConfigType = {
+      initialize: true,
+      paths: ['some-path', 'another-path'],
+    };
+    const config = new PluginsConfig(rawConfig, env);
+    expect(config.additionalPluginPaths).toEqual(['some-path', 'another-path']);
+  });
+});
diff --git a/src/core/server/plugins/plugins_config.ts b/src/core/server/plugins/plugins_config.ts
index 93ae229737fae..8ebcc92672dde 100644
--- a/src/core/server/plugins/plugins_config.ts
+++ b/src/core/server/plugins/plugins_config.ts
@@ -29,7 +29,6 @@ export const config = {
 
     /**
      * Defines an array of directories where another plugin should be loaded from.
-     * Should only be used in a development environment.
      */
     paths: schema.arrayOf(schema.string(), { defaultValue: [] }),
   }),
@@ -55,7 +54,6 @@ export class PluginsConfig {
   constructor(rawConfig: PluginsConfigType, env: Env) {
     this.initialize = rawConfig.initialize;
     this.pluginSearchPaths = env.pluginSearchPaths;
-    // Only allow custom plugin paths in dev.
-    this.additionalPluginPaths = env.mode.dev ? rawConfig.paths : [];
+    this.additionalPluginPaths = rawConfig.paths;
   }
 }
diff --git a/src/core/server/plugins/plugins_service.mock.ts b/src/core/server/plugins/plugins_service.mock.ts
index 8d3c6a8c909a2..5a52ebccbd472 100644
--- a/src/core/server/plugins/plugins_service.mock.ts
+++ b/src/core/server/plugins/plugins_service.mock.ts
@@ -17,28 +17,28 @@
  * under the License.
  */
 
-import { PluginsService } from './plugins_service';
+import { PluginsService, PluginsServiceSetup } from './plugins_service';
 
-type ServiceContract = PublicMethodsOf<PluginsService>;
-const createServiceMock = () => {
-  const mocked: jest.Mocked<ServiceContract> = {
-    discover: jest.fn(),
-    setup: jest.fn(),
-    start: jest.fn(),
-    stop: jest.fn(),
-  };
-  mocked.setup.mockResolvedValue({
-    contracts: new Map(),
-    uiPlugins: {
-      browserConfigs: new Map(),
-      internal: new Map(),
-      public: new Map(),
-    },
-  });
-  mocked.start.mockResolvedValue({ contracts: new Map() });
-  return mocked;
-};
+type PluginsServiceMock = jest.Mocked<PublicMethodsOf<PluginsService>>;
+
+const createSetupContractMock = (): PluginsServiceSetup => ({
+  contracts: new Map(),
+  uiPlugins: {
+    browserConfigs: new Map(),
+    internal: new Map(),
+    public: new Map(),
+  },
+});
+const createStartContractMock = () => ({ contracts: new Map() });
+const createServiceMock = (): PluginsServiceMock => ({
+  discover: jest.fn(),
+  setup: jest.fn().mockResolvedValue(createSetupContractMock()),
+  start: jest.fn().mockResolvedValue(createStartContractMock()),
+  stop: jest.fn(),
+});
 
 export const pluginServiceMock = {
   create: createServiceMock,
+  createSetupContract: createSetupContractMock,
+  createStartContract: createStartContractMock,
 };
diff --git a/src/core/server/rendering/__mocks__/params.ts b/src/core/server/rendering/__mocks__/params.ts
new file mode 100644
index 0000000000000..392b2f0c5e2a4
--- /dev/null
+++ b/src/core/server/rendering/__mocks__/params.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 { mockCoreContext } from '../../core_context.mock';
+import { httpServiceMock } from '../../http/http_service.mock';
+import { pluginServiceMock } from '../../plugins/plugins_service.mock';
+import { legacyServiceMock } from '../../legacy/legacy_service.mock';
+
+const context = mockCoreContext.create();
+const http = httpServiceMock.createSetupContract();
+const plugins = pluginServiceMock.createSetupContract();
+const legacyPlugins = legacyServiceMock.createDiscoverPlugins();
+
+export const mockRenderingServiceParams = context;
+export const mockRenderingSetupDeps = {
+  http,
+  legacyPlugins,
+  plugins,
+};
diff --git a/src/core/server/rendering/__mocks__/rendering_service.ts b/src/core/server/rendering/__mocks__/rendering_service.ts
new file mode 100644
index 0000000000000..33dca7cc0d30e
--- /dev/null
+++ b/src/core/server/rendering/__mocks__/rendering_service.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 { RenderingService as Service } from '../rendering_service';
+import { RenderingServiceSetup } from '../types';
+import { mockRenderingServiceParams } from './params';
+
+type IRenderingService = PublicMethodsOf<Service>;
+
+export const setupMock: jest.Mocked<RenderingServiceSetup> = {
+  render: jest.fn(),
+};
+export const mockSetup = jest.fn().mockResolvedValue(setupMock);
+export const mockStart = jest.fn();
+export const mockStop = jest.fn();
+export const mockRenderingService: jest.Mocked<IRenderingService> = {
+  setup: mockSetup,
+  start: mockStart,
+  stop: mockStop,
+};
+export const RenderingService = jest.fn<IRenderingService, [typeof mockRenderingServiceParams]>(
+  () => mockRenderingService
+);
diff --git a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
new file mode 100644
index 0000000000000..5e6e977663bc4
--- /dev/null
+++ b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
@@ -0,0 +1,719 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`RenderingService setup() render() renders "core" from legacy request 1`] = `
+Object {
+  "basePath": "/mock-server-basepath",
+  "branch": Any<String>,
+  "buildNumber": Any<Number>,
+  "csp": Object {
+    "warnLegacyBrowsers": true,
+  },
+  "env": Object {
+    "binDir": Any<String>,
+    "cliArgs": Object {
+      "basePath": false,
+      "dev": true,
+      "open": false,
+      "optimize": false,
+      "oss": false,
+      "quiet": false,
+      "repl": false,
+      "runExamples": false,
+      "silent": false,
+      "watch": false,
+    },
+    "configDir": Any<String>,
+    "configs": Array [],
+    "homeDir": Any<String>,
+    "isDevClusterMaster": false,
+    "logDir": Any<String>,
+    "mode": Object {
+      "dev": true,
+      "name": "development",
+      "prod": false,
+    },
+    "packageInfo": Object {
+      "branch": Any<String>,
+      "buildNum": Any<Number>,
+      "buildSha": Any<String>,
+      "dist": false,
+      "version": Any<String>,
+    },
+    "pluginSearchPaths": Any<Array>,
+  },
+  "i18n": Object {
+    "translationsUrl": "/mock-server-basepath/translations/en.json",
+  },
+  "legacyMetadata": Object {
+    "app": Object {},
+    "basePath": "/mock-server-basepath",
+    "branch": Any<String>,
+    "buildNum": Any<Number>,
+    "buildSha": Any<String>,
+    "bundleId": "app:core",
+    "devMode": true,
+    "nav": Array [],
+    "serverName": "http-server-test",
+    "uiSettings": Object {
+      "defaults": Object {
+        "registered": Object {
+          "name": "title",
+        },
+      },
+      "user": Object {},
+    },
+    "version": Any<String>,
+  },
+  "legacyMode": false,
+  "uiPlugins": Array [],
+  "vars": Object {},
+  "version": Any<String>,
+}
+`;
+
+exports[`RenderingService setup() render() renders "core" page 1`] = `
+Object {
+  "basePath": "/mock-server-basepath",
+  "branch": Any<String>,
+  "buildNumber": Any<Number>,
+  "csp": Object {
+    "warnLegacyBrowsers": true,
+  },
+  "env": Object {
+    "binDir": Any<String>,
+    "cliArgs": Object {
+      "basePath": false,
+      "dev": true,
+      "open": false,
+      "optimize": false,
+      "oss": false,
+      "quiet": false,
+      "repl": false,
+      "runExamples": false,
+      "silent": false,
+      "watch": false,
+    },
+    "configDir": Any<String>,
+    "configs": Array [],
+    "homeDir": Any<String>,
+    "isDevClusterMaster": false,
+    "logDir": Any<String>,
+    "mode": Object {
+      "dev": true,
+      "name": "development",
+      "prod": false,
+    },
+    "packageInfo": Object {
+      "branch": Any<String>,
+      "buildNum": Any<Number>,
+      "buildSha": Any<String>,
+      "dist": false,
+      "version": Any<String>,
+    },
+    "pluginSearchPaths": Any<Array>,
+  },
+  "i18n": Object {
+    "translationsUrl": "/mock-server-basepath/translations/en.json",
+  },
+  "legacyMetadata": Object {
+    "app": Object {},
+    "basePath": "/mock-server-basepath",
+    "branch": Any<String>,
+    "buildNum": Any<Number>,
+    "buildSha": Any<String>,
+    "bundleId": "app:core",
+    "devMode": true,
+    "nav": Array [],
+    "serverName": "http-server-test",
+    "uiSettings": Object {
+      "defaults": Object {
+        "registered": Object {
+          "name": "title",
+        },
+      },
+      "user": Object {},
+    },
+    "version": Any<String>,
+  },
+  "legacyMode": false,
+  "uiPlugins": Array [],
+  "vars": Object {},
+  "version": Any<String>,
+}
+`;
+
+exports[`RenderingService setup() render() renders "core" page driven by settings 1`] = `
+Object {
+  "basePath": "/mock-server-basepath",
+  "branch": Any<String>,
+  "buildNumber": Any<Number>,
+  "csp": Object {
+    "warnLegacyBrowsers": true,
+  },
+  "env": Object {
+    "binDir": Any<String>,
+    "cliArgs": Object {
+      "basePath": false,
+      "dev": true,
+      "open": false,
+      "optimize": false,
+      "oss": false,
+      "quiet": false,
+      "repl": false,
+      "runExamples": false,
+      "silent": false,
+      "watch": false,
+    },
+    "configDir": Any<String>,
+    "configs": Array [],
+    "homeDir": Any<String>,
+    "isDevClusterMaster": false,
+    "logDir": Any<String>,
+    "mode": Object {
+      "dev": true,
+      "name": "development",
+      "prod": false,
+    },
+    "packageInfo": Object {
+      "branch": Any<String>,
+      "buildNum": Any<Number>,
+      "buildSha": Any<String>,
+      "dist": false,
+      "version": Any<String>,
+    },
+    "pluginSearchPaths": Any<Array>,
+  },
+  "i18n": Object {
+    "translationsUrl": "/mock-server-basepath/translations/en.json",
+  },
+  "legacyMetadata": Object {
+    "app": Object {},
+    "basePath": "/mock-server-basepath",
+    "branch": Any<String>,
+    "buildNum": Any<Number>,
+    "buildSha": Any<String>,
+    "bundleId": "app:core",
+    "devMode": true,
+    "nav": Array [],
+    "serverName": "http-server-test",
+    "uiSettings": Object {
+      "defaults": Object {
+        "registered": Object {
+          "name": "title",
+        },
+      },
+      "user": Object {
+        "theme:darkMode": Object {
+          "userValue": true,
+        },
+      },
+    },
+    "version": Any<String>,
+  },
+  "legacyMode": false,
+  "uiPlugins": Array [],
+  "vars": Object {},
+  "version": Any<String>,
+}
+`;
+
+exports[`RenderingService setup() render() renders "core" page for blank basepath 1`] = `
+Object {
+  "basePath": "",
+  "branch": Any<String>,
+  "buildNumber": Any<Number>,
+  "csp": Object {
+    "warnLegacyBrowsers": true,
+  },
+  "env": Object {
+    "binDir": Any<String>,
+    "cliArgs": Object {
+      "basePath": false,
+      "dev": true,
+      "open": false,
+      "optimize": false,
+      "oss": false,
+      "quiet": false,
+      "repl": false,
+      "runExamples": false,
+      "silent": false,
+      "watch": false,
+    },
+    "configDir": Any<String>,
+    "configs": Array [],
+    "homeDir": Any<String>,
+    "isDevClusterMaster": false,
+    "logDir": Any<String>,
+    "mode": Object {
+      "dev": true,
+      "name": "development",
+      "prod": false,
+    },
+    "packageInfo": Object {
+      "branch": Any<String>,
+      "buildNum": Any<Number>,
+      "buildSha": Any<String>,
+      "dist": false,
+      "version": Any<String>,
+    },
+    "pluginSearchPaths": Any<Array>,
+  },
+  "i18n": Object {
+    "translationsUrl": "/translations/en.json",
+  },
+  "legacyMetadata": Object {
+    "app": Object {},
+    "basePath": "",
+    "branch": Any<String>,
+    "buildNum": Any<Number>,
+    "buildSha": Any<String>,
+    "bundleId": "app:core",
+    "devMode": true,
+    "nav": Array [],
+    "serverName": "http-server-test",
+    "uiSettings": Object {
+      "defaults": Object {
+        "registered": Object {
+          "name": "title",
+        },
+      },
+      "user": Object {},
+    },
+    "version": Any<String>,
+  },
+  "legacyMode": false,
+  "uiPlugins": Array [],
+  "vars": Object {},
+  "version": Any<String>,
+}
+`;
+
+exports[`RenderingService setup() render() renders "core" with excluded user settings 1`] = `
+Object {
+  "basePath": "/mock-server-basepath",
+  "branch": Any<String>,
+  "buildNumber": Any<Number>,
+  "csp": Object {
+    "warnLegacyBrowsers": true,
+  },
+  "env": Object {
+    "binDir": Any<String>,
+    "cliArgs": Object {
+      "basePath": false,
+      "dev": true,
+      "open": false,
+      "optimize": false,
+      "oss": false,
+      "quiet": false,
+      "repl": false,
+      "runExamples": false,
+      "silent": false,
+      "watch": false,
+    },
+    "configDir": Any<String>,
+    "configs": Array [],
+    "homeDir": Any<String>,
+    "isDevClusterMaster": false,
+    "logDir": Any<String>,
+    "mode": Object {
+      "dev": true,
+      "name": "development",
+      "prod": false,
+    },
+    "packageInfo": Object {
+      "branch": Any<String>,
+      "buildNum": Any<Number>,
+      "buildSha": Any<String>,
+      "dist": false,
+      "version": Any<String>,
+    },
+    "pluginSearchPaths": Any<Array>,
+  },
+  "i18n": Object {
+    "translationsUrl": "/mock-server-basepath/translations/en.json",
+  },
+  "legacyMetadata": Object {
+    "app": Object {},
+    "basePath": "/mock-server-basepath",
+    "branch": Any<String>,
+    "buildNum": Any<Number>,
+    "buildSha": Any<String>,
+    "bundleId": "app:core",
+    "devMode": true,
+    "nav": Array [],
+    "serverName": "http-server-test",
+    "uiSettings": Object {
+      "defaults": Object {
+        "registered": Object {
+          "name": "title",
+        },
+      },
+      "user": Object {},
+    },
+    "version": Any<String>,
+  },
+  "legacyMode": false,
+  "uiPlugins": Array [],
+  "vars": Object {},
+  "version": Any<String>,
+}
+`;
+
+exports[`RenderingService setup() render() renders "legacy" page 1`] = `
+Object {
+  "basePath": "/mock-server-basepath",
+  "branch": Any<String>,
+  "buildNumber": Any<Number>,
+  "csp": Object {
+    "warnLegacyBrowsers": true,
+  },
+  "env": Object {
+    "binDir": Any<String>,
+    "cliArgs": Object {
+      "basePath": false,
+      "dev": true,
+      "open": false,
+      "optimize": false,
+      "oss": false,
+      "quiet": false,
+      "repl": false,
+      "runExamples": false,
+      "silent": false,
+      "watch": false,
+    },
+    "configDir": Any<String>,
+    "configs": Array [],
+    "homeDir": Any<String>,
+    "isDevClusterMaster": false,
+    "logDir": Any<String>,
+    "mode": Object {
+      "dev": true,
+      "name": "development",
+      "prod": false,
+    },
+    "packageInfo": Object {
+      "branch": Any<String>,
+      "buildNum": Any<Number>,
+      "buildSha": Any<String>,
+      "dist": false,
+      "version": Any<String>,
+    },
+    "pluginSearchPaths": Any<Array>,
+  },
+  "i18n": Object {
+    "translationsUrl": "/mock-server-basepath/translations/en.json",
+  },
+  "legacyMetadata": Object {
+    "app": Object {},
+    "basePath": "/mock-server-basepath",
+    "branch": Any<String>,
+    "buildNum": Any<Number>,
+    "buildSha": Any<String>,
+    "bundleId": "app:legacy",
+    "devMode": true,
+    "nav": Array [],
+    "serverName": "http-server-test",
+    "uiSettings": Object {
+      "defaults": Object {
+        "registered": Object {
+          "name": "title",
+        },
+      },
+      "user": Object {},
+    },
+    "version": Any<String>,
+  },
+  "legacyMode": true,
+  "uiPlugins": Array [],
+  "vars": Object {},
+  "version": Any<String>,
+}
+`;
+
+exports[`RenderingService setup() render() renders "legacy" page for blank basepath 1`] = `
+Object {
+  "basePath": "",
+  "branch": Any<String>,
+  "buildNumber": Any<Number>,
+  "csp": Object {
+    "warnLegacyBrowsers": true,
+  },
+  "env": Object {
+    "binDir": Any<String>,
+    "cliArgs": Object {
+      "basePath": false,
+      "dev": true,
+      "open": false,
+      "optimize": false,
+      "oss": false,
+      "quiet": false,
+      "repl": false,
+      "runExamples": false,
+      "silent": false,
+      "watch": false,
+    },
+    "configDir": Any<String>,
+    "configs": Array [],
+    "homeDir": Any<String>,
+    "isDevClusterMaster": false,
+    "logDir": Any<String>,
+    "mode": Object {
+      "dev": true,
+      "name": "development",
+      "prod": false,
+    },
+    "packageInfo": Object {
+      "branch": Any<String>,
+      "buildNum": Any<Number>,
+      "buildSha": Any<String>,
+      "dist": false,
+      "version": Any<String>,
+    },
+    "pluginSearchPaths": Any<Array>,
+  },
+  "i18n": Object {
+    "translationsUrl": "/translations/en.json",
+  },
+  "legacyMetadata": Object {
+    "app": Object {},
+    "basePath": "",
+    "branch": Any<String>,
+    "buildNum": Any<Number>,
+    "buildSha": Any<String>,
+    "bundleId": "app:legacy",
+    "devMode": true,
+    "nav": Array [],
+    "serverName": "http-server-test",
+    "uiSettings": Object {
+      "defaults": Object {
+        "registered": Object {
+          "name": "title",
+        },
+      },
+      "user": Object {},
+    },
+    "version": Any<String>,
+  },
+  "legacyMode": true,
+  "uiPlugins": Array [],
+  "vars": Object {},
+  "version": Any<String>,
+}
+`;
+
+exports[`RenderingService setup() render() renders "legacy" with custom vars 1`] = `
+Object {
+  "basePath": "/mock-server-basepath",
+  "branch": Any<String>,
+  "buildNumber": Any<Number>,
+  "csp": Object {
+    "warnLegacyBrowsers": true,
+  },
+  "env": Object {
+    "binDir": Any<String>,
+    "cliArgs": Object {
+      "basePath": false,
+      "dev": true,
+      "open": false,
+      "optimize": false,
+      "oss": false,
+      "quiet": false,
+      "repl": false,
+      "runExamples": false,
+      "silent": false,
+      "watch": false,
+    },
+    "configDir": Any<String>,
+    "configs": Array [],
+    "homeDir": Any<String>,
+    "isDevClusterMaster": false,
+    "logDir": Any<String>,
+    "mode": Object {
+      "dev": true,
+      "name": "development",
+      "prod": false,
+    },
+    "packageInfo": Object {
+      "branch": Any<String>,
+      "buildNum": Any<Number>,
+      "buildSha": Any<String>,
+      "dist": false,
+      "version": Any<String>,
+    },
+    "pluginSearchPaths": Any<Array>,
+  },
+  "i18n": Object {
+    "translationsUrl": "/mock-server-basepath/translations/en.json",
+  },
+  "legacyMetadata": Object {
+    "app": Object {},
+    "basePath": "/mock-server-basepath",
+    "branch": Any<String>,
+    "buildNum": Any<Number>,
+    "buildSha": Any<String>,
+    "bundleId": "app:legacy",
+    "devMode": true,
+    "nav": Array [],
+    "serverName": "http-server-test",
+    "uiSettings": Object {
+      "defaults": Object {
+        "registered": Object {
+          "name": "title",
+        },
+      },
+      "user": Object {},
+    },
+    "version": Any<String>,
+  },
+  "legacyMode": true,
+  "uiPlugins": Array [],
+  "vars": Object {
+    "fake": "__TEST_TOKEN__",
+  },
+  "version": Any<String>,
+}
+`;
+
+exports[`RenderingService setup() render() renders "legacy" with excluded user settings 1`] = `
+Object {
+  "basePath": "/mock-server-basepath",
+  "branch": Any<String>,
+  "buildNumber": Any<Number>,
+  "csp": Object {
+    "warnLegacyBrowsers": true,
+  },
+  "env": Object {
+    "binDir": Any<String>,
+    "cliArgs": Object {
+      "basePath": false,
+      "dev": true,
+      "open": false,
+      "optimize": false,
+      "oss": false,
+      "quiet": false,
+      "repl": false,
+      "runExamples": false,
+      "silent": false,
+      "watch": false,
+    },
+    "configDir": Any<String>,
+    "configs": Array [],
+    "homeDir": Any<String>,
+    "isDevClusterMaster": false,
+    "logDir": Any<String>,
+    "mode": Object {
+      "dev": true,
+      "name": "development",
+      "prod": false,
+    },
+    "packageInfo": Object {
+      "branch": Any<String>,
+      "buildNum": Any<Number>,
+      "buildSha": Any<String>,
+      "dist": false,
+      "version": Any<String>,
+    },
+    "pluginSearchPaths": Any<Array>,
+  },
+  "i18n": Object {
+    "translationsUrl": "/mock-server-basepath/translations/en.json",
+  },
+  "legacyMetadata": Object {
+    "app": Object {},
+    "basePath": "/mock-server-basepath",
+    "branch": Any<String>,
+    "buildNum": Any<Number>,
+    "buildSha": Any<String>,
+    "bundleId": "app:legacy",
+    "devMode": true,
+    "nav": Array [],
+    "serverName": "http-server-test",
+    "uiSettings": Object {
+      "defaults": Object {
+        "registered": Object {
+          "name": "title",
+        },
+      },
+      "user": Object {},
+    },
+    "version": Any<String>,
+  },
+  "legacyMode": true,
+  "uiPlugins": Array [],
+  "vars": Object {},
+  "version": Any<String>,
+}
+`;
+
+exports[`RenderingService setup() render() renders "legacy" with excluded user settings and custom vars 1`] = `
+Object {
+  "basePath": "/mock-server-basepath",
+  "branch": Any<String>,
+  "buildNumber": Any<Number>,
+  "csp": Object {
+    "warnLegacyBrowsers": true,
+  },
+  "env": Object {
+    "binDir": Any<String>,
+    "cliArgs": Object {
+      "basePath": false,
+      "dev": true,
+      "open": false,
+      "optimize": false,
+      "oss": false,
+      "quiet": false,
+      "repl": false,
+      "runExamples": false,
+      "silent": false,
+      "watch": false,
+    },
+    "configDir": Any<String>,
+    "configs": Array [],
+    "homeDir": Any<String>,
+    "isDevClusterMaster": false,
+    "logDir": Any<String>,
+    "mode": Object {
+      "dev": true,
+      "name": "development",
+      "prod": false,
+    },
+    "packageInfo": Object {
+      "branch": Any<String>,
+      "buildNum": Any<Number>,
+      "buildSha": Any<String>,
+      "dist": false,
+      "version": Any<String>,
+    },
+    "pluginSearchPaths": Any<Array>,
+  },
+  "i18n": Object {
+    "translationsUrl": "/mock-server-basepath/translations/en.json",
+  },
+  "legacyMetadata": Object {
+    "app": Object {},
+    "basePath": "/mock-server-basepath",
+    "branch": Any<String>,
+    "buildNum": Any<Number>,
+    "buildSha": Any<String>,
+    "bundleId": "app:legacy",
+    "devMode": true,
+    "nav": Array [],
+    "serverName": "http-server-test",
+    "uiSettings": Object {
+      "defaults": Object {
+        "registered": Object {
+          "name": "title",
+        },
+      },
+      "user": Object {},
+    },
+    "version": Any<String>,
+  },
+  "legacyMode": true,
+  "uiPlugins": Array [],
+  "vars": Object {
+    "fake": "__TEST_TOKEN__",
+  },
+  "version": Any<String>,
+}
+`;
diff --git a/src/core/server/rendering/index.ts b/src/core/server/rendering/index.ts
new file mode 100644
index 0000000000000..233f4b26a70db
--- /dev/null
+++ b/src/core/server/rendering/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 { RenderingService } from './rendering_service';
+export * from './types';
diff --git a/src/core/server/rendering/rendering_service.test.ts b/src/core/server/rendering/rendering_service.test.ts
new file mode 100644
index 0000000000000..43ff4f633085c
--- /dev/null
+++ b/src/core/server/rendering/rendering_service.test.ts
@@ -0,0 +1,185 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { load } from 'cheerio';
+
+import { httpServerMock } from '../http/http_server.mocks';
+import { uiSettingsServiceMock } from '../ui_settings/ui_settings_service.mock';
+import { mockRenderingServiceParams, mockRenderingSetupDeps } from './__mocks__/params';
+import { RenderingServiceSetup } from './types';
+import { RenderingService } from './rendering_service';
+
+const INJECTED_METADATA = {
+  version: expect.any(String),
+  branch: expect.any(String),
+  buildNumber: expect.any(Number),
+  env: {
+    binDir: expect.any(String),
+    configDir: expect.any(String),
+    homeDir: expect.any(String),
+    logDir: expect.any(String),
+    packageInfo: {
+      branch: expect.any(String),
+      buildNum: expect.any(Number),
+      buildSha: expect.any(String),
+      version: expect.any(String),
+    },
+    pluginSearchPaths: expect.any(Array),
+  },
+  legacyMetadata: {
+    branch: expect.any(String),
+    buildNum: expect.any(Number),
+    buildSha: expect.any(String),
+    version: expect.any(String),
+  },
+};
+
+const { createKibanaRequest, createRawRequest } = httpServerMock;
+const legacyApp = { getId: () => 'legacy' };
+
+describe('RenderingService', () => {
+  let service: RenderingService;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    service = new RenderingService(mockRenderingServiceParams);
+  });
+
+  describe('setup()', () => {
+    it('creates instance of RenderingServiceSetup', async () => {
+      const rendering = await service.setup(mockRenderingSetupDeps);
+
+      expect(rendering.render).toBeInstanceOf(Function);
+    });
+
+    describe('render()', () => {
+      let uiSettings: ReturnType<typeof uiSettingsServiceMock.createClient>;
+      let render: RenderingServiceSetup['render'];
+
+      beforeEach(async () => {
+        uiSettings = uiSettingsServiceMock.createClient();
+        uiSettings.getRegistered.mockReturnValue({
+          registered: { name: 'title' },
+        });
+        render = (await service.setup(mockRenderingSetupDeps)).render;
+      });
+
+      it('renders "core" page', async () => {
+        const content = await render(createKibanaRequest(), uiSettings);
+        const dom = load(content);
+        const data = JSON.parse(dom('kbn-injected-metadata').attr('data'));
+
+        expect(data).toMatchSnapshot(INJECTED_METADATA);
+      });
+
+      it('renders "core" page for blank basepath', async () => {
+        mockRenderingSetupDeps.http.basePath.get.mockReturnValueOnce('');
+
+        const content = await render(createKibanaRequest(), uiSettings);
+        const dom = load(content);
+        const data = JSON.parse(dom('kbn-injected-metadata').attr('data'));
+
+        expect(data).toMatchSnapshot(INJECTED_METADATA);
+      });
+
+      it('renders "core" page driven by settings', async () => {
+        uiSettings.getUserProvided.mockResolvedValue({ 'theme:darkMode': { userValue: true } });
+        const content = await render(createKibanaRequest(), uiSettings);
+        const dom = load(content);
+        const data = JSON.parse(dom('kbn-injected-metadata').attr('data'));
+
+        expect(data).toMatchSnapshot(INJECTED_METADATA);
+      });
+
+      it('renders "core" with excluded user settings', async () => {
+        const content = await render(createKibanaRequest(), uiSettings, {
+          includeUserSettings: false,
+        });
+        const dom = load(content);
+        const data = JSON.parse(dom('kbn-injected-metadata').attr('data'));
+
+        expect(data).toMatchSnapshot(INJECTED_METADATA);
+      });
+
+      it('renders "core" from legacy request', async () => {
+        const content = await render(createRawRequest(), uiSettings);
+        const dom = load(content);
+        const data = JSON.parse(dom('kbn-injected-metadata').attr('data'));
+
+        expect(data).toMatchSnapshot(INJECTED_METADATA);
+      });
+
+      it('renders "legacy" page', async () => {
+        const content = await render(createRawRequest(), uiSettings, { app: legacyApp });
+        const dom = load(content);
+        const data = JSON.parse(dom('kbn-injected-metadata').attr('data'));
+
+        expect(data).toMatchSnapshot(INJECTED_METADATA);
+      });
+
+      it('renders "legacy" page for blank basepath', async () => {
+        mockRenderingSetupDeps.http.basePath.get.mockReturnValueOnce('');
+
+        const content = await render(createRawRequest(), uiSettings, { app: legacyApp });
+        const dom = load(content);
+        const data = JSON.parse(dom('kbn-injected-metadata').attr('data'));
+
+        expect(data).toMatchSnapshot(INJECTED_METADATA);
+      });
+
+      it('renders "legacy" with custom vars', async () => {
+        const content = await render(createRawRequest(), uiSettings, {
+          app: legacyApp,
+          vars: {
+            fake: '__TEST_TOKEN__',
+          },
+        });
+        const dom = load(content);
+        const data = JSON.parse(dom('kbn-injected-metadata').attr('data'));
+
+        expect(data).toMatchSnapshot(INJECTED_METADATA);
+      });
+
+      it('renders "legacy" with excluded user settings', async () => {
+        const content = await render(createRawRequest(), uiSettings, {
+          app: legacyApp,
+          includeUserSettings: false,
+        });
+        const dom = load(content);
+        const data = JSON.parse(dom('kbn-injected-metadata').attr('data'));
+
+        expect(data).toMatchSnapshot(INJECTED_METADATA);
+      });
+
+      it('renders "legacy" with excluded user settings and custom vars', async () => {
+        const content = await render(createRawRequest(), uiSettings, {
+          app: legacyApp,
+          includeUserSettings: false,
+          vars: {
+            fake: '__TEST_TOKEN__',
+          },
+        });
+        const dom = load(content);
+        const data = JSON.parse(dom('kbn-injected-metadata').attr('data'));
+
+        expect(data).toMatchSnapshot(INJECTED_METADATA);
+      });
+    });
+  });
+});
diff --git a/src/core/server/rendering/rendering_service.tsx b/src/core/server/rendering/rendering_service.tsx
new file mode 100644
index 0000000000000..41810c6a10655
--- /dev/null
+++ b/src/core/server/rendering/rendering_service.tsx
@@ -0,0 +1,120 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { renderToStaticMarkup } from 'react-dom/server';
+import { take } from 'rxjs/operators';
+
+import { i18n } from '@kbn/i18n';
+
+import { CoreService } from '../../types';
+import { CoreContext } from '../core_context';
+import { Template } from './views';
+import {
+  RenderingSetupDeps,
+  RenderingServiceSetup,
+  RenderingMetadata,
+  LegacyRenderOptions,
+} from './types';
+
+/** @internal */
+export class RenderingService implements CoreService<RenderingServiceSetup> {
+  constructor(private readonly coreContext: CoreContext) {}
+
+  public async setup({
+    http,
+    legacyPlugins,
+    plugins,
+  }: RenderingSetupDeps): Promise<RenderingServiceSetup> {
+    async function getUiConfig(pluginId: string) {
+      const browserConfig = plugins.uiPlugins.browserConfigs.get(pluginId);
+
+      return ((await browserConfig?.pipe(take(1)).toPromise()) ?? {}) as Record<string, any>;
+    }
+
+    return {
+      render: async (
+        request,
+        uiSettings,
+        {
+          app = { getId: () => 'core' },
+          includeUserSettings = true,
+          vars = {},
+        }: LegacyRenderOptions = {}
+      ) => {
+        const { env } = this.coreContext;
+        const basePath = http.basePath.get(request);
+        const settings = {
+          defaults: uiSettings.getRegistered(),
+          user: includeUserSettings ? await uiSettings.getUserProvided() : {},
+        };
+        const appId = app.getId();
+        const metadata: RenderingMetadata = {
+          strictCsp: http.csp.strict,
+          uiPublicUrl: `${basePath}/ui`,
+          bootstrapScriptUrl: `${basePath}/bundles/app/${appId}/bootstrap.js`,
+          i18n: i18n.translate,
+          locale: i18n.getLocale(),
+          darkMode: settings.user?.['theme:darkMode']?.userValue
+            ? Boolean(settings.user['theme:darkMode'].userValue)
+            : false,
+          injectedMetadata: {
+            version: env.packageInfo.version,
+            buildNumber: env.packageInfo.buildNum,
+            branch: env.packageInfo.branch,
+            basePath,
+            env,
+            legacyMode: appId !== 'core',
+            i18n: {
+              translationsUrl: `${basePath}/translations/${i18n.getLocale()}.json`,
+            },
+            csp: { warnLegacyBrowsers: http.csp.warnLegacyBrowsers },
+            vars,
+            uiPlugins: await Promise.all(
+              [...plugins.uiPlugins.public].map(async ([id, plugin]) => ({
+                id,
+                plugin,
+                config: await getUiConfig(id),
+              }))
+            ),
+            legacyMetadata: {
+              app,
+              bundleId: `app:${appId}`,
+              nav: legacyPlugins.navLinks,
+              version: env.packageInfo.version,
+              branch: env.packageInfo.branch,
+              buildNum: env.packageInfo.buildNum,
+              buildSha: env.packageInfo.buildSha,
+              serverName: http.server.name,
+              devMode: env.mode.dev,
+              basePath,
+              uiSettings: settings,
+            },
+          },
+        };
+
+        return `<!DOCTYPE html>${renderToStaticMarkup(<Template metadata={metadata} />)}`;
+      },
+    };
+  }
+
+  public async start() {}
+
+  public async stop() {}
+}
diff --git a/src/core/server/rendering/types.ts b/src/core/server/rendering/types.ts
new file mode 100644
index 0000000000000..31b326bab6c78
--- /dev/null
+++ b/src/core/server/rendering/types.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 { i18n } from '@kbn/i18n';
+
+import { Env } from '../config';
+import { ICspConfig } from '../csp';
+import { InternalHttpServiceSetup, KibanaRequest, LegacyRequest } from '../http';
+import { LegacyNavLink, LegacyServiceDiscoverPlugins } from '../legacy';
+import { PluginsServiceSetup, DiscoveredPlugin } from '../plugins';
+import { IUiSettingsClient, UserProvidedValues } from '../ui_settings';
+
+/** @internal */
+export interface RenderingMetadata {
+  strictCsp: ICspConfig['strict'];
+  uiPublicUrl: string;
+  bootstrapScriptUrl: string;
+  i18n: typeof i18n.translate;
+  locale: string;
+  darkMode: boolean;
+  injectedMetadata: {
+    version: string;
+    buildNumber: number;
+    branch: string;
+    basePath: string;
+    env: Env;
+    legacyMode: boolean;
+    i18n: {
+      translationsUrl: string;
+    };
+    csp: Pick<ICspConfig, 'warnLegacyBrowsers'>;
+    vars: Record<string, any>;
+    uiPlugins: Array<{
+      id: string;
+      plugin: DiscoveredPlugin;
+      config?: Record<string, unknown>;
+    }>;
+    legacyMetadata: {
+      app: { getId(): string };
+      bundleId: string;
+      nav: LegacyNavLink[];
+      version: string;
+      branch: string;
+      buildNum: number;
+      buildSha: string;
+      serverName: string;
+      devMode: boolean;
+      basePath: string;
+      uiSettings: {
+        defaults: Record<string, any>;
+        user: Record<string, UserProvidedValues<any>>;
+      };
+    };
+  };
+}
+
+/** @internal */
+export interface RenderingSetupDeps {
+  http: InternalHttpServiceSetup;
+  legacyPlugins: LegacyServiceDiscoverPlugins;
+  plugins: PluginsServiceSetup;
+}
+
+/** @public */
+export interface IRenderOptions {
+  /**
+   * Set whether to output user settings in the page metadata.
+   * `true` by default.
+   */
+  includeUserSettings?: boolean;
+}
+
+/**
+ * @internal
+ * @deprecated for legacy use only, remove with ui_render_mixin
+ */
+export interface LegacyRenderOptions extends IRenderOptions {
+  /**
+   * Render the bootstrapped HTML content for an optional legacy application.
+   * Defaults to `core`.
+   */
+  app?: { getId(): string };
+
+  /**
+   * Inject custom vars into the page metadata.
+   */
+  vars?: Record<string, any>;
+}
+
+/** @public */
+export interface IScopedRenderingClient {
+  /**
+   * Generate a `KibanaResponse` which renders an HTML page bootstrapped
+   * with the `core` bundle. Intended as a response body for HTTP route handlers.
+   *
+   * @example
+   * ```ts
+   * router.get(
+   *   { path: '/', validate: false },
+   *   (context, request, response) =>
+   *     response.ok({
+   *       body: await context.core.rendering.render(),
+   *       headers: {
+   *         'content-security-policy': context.core.http.csp.header,
+   *       },
+   *     })
+   * );
+   * ```
+   */
+  render(options?: IRenderOptions): Promise<string>;
+}
+
+/** @internal */
+export interface RenderingServiceSetup {
+  /**
+   * Generate a `KibanaResponse` which renders an HTML page bootstrapped
+   * with the `core` bundle or the ID of another specified legacy bundle.
+   *
+   * @example
+   * ```ts
+   * const html = await rendering.render(request, uiSettings);
+   * ```
+   */
+  render<R extends KibanaRequest | LegacyRequest>(
+    request: R,
+    uiSettings: IUiSettingsClient,
+    options?: R extends LegacyRequest ? LegacyRenderOptions : IRenderOptions
+  ): Promise<string>;
+}
diff --git a/src/core/server/rendering/views/fonts.tsx b/src/core/server/rendering/views/fonts.tsx
new file mode 100644
index 0000000000000..e87179920202a
--- /dev/null
+++ b/src/core/server/rendering/views/fonts.tsx
@@ -0,0 +1,336 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 react/no-danger */
+
+import React, { FunctionComponent } from 'react';
+
+import { RenderingMetadata } from '../types';
+
+interface Props {
+  url: RenderingMetadata['uiPublicUrl'];
+}
+
+interface FontFace {
+  family: string;
+  variants: Array<{
+    style: 'normal' | 'italic';
+    weight: 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;
+    sources: string[];
+    unicodeRange?: string;
+    format?: string;
+  }>;
+}
+
+export const Fonts: FunctionComponent<Props> = ({ url }) => {
+  const interUi: FontFace = {
+    family: 'Inter UI',
+    variants: [
+      {
+        style: 'normal',
+        weight: 100,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-Thin-BETA.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-Thin-BETA.woff`,
+        ],
+      },
+      {
+        style: 'italic',
+        weight: 100,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff`,
+        ],
+      },
+      {
+        style: 'normal',
+        weight: 200,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff`,
+        ],
+      },
+      {
+        style: 'italic',
+        weight: 200,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff`,
+        ],
+      },
+      {
+        style: 'normal',
+        weight: 300,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-Light-BETA.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-Light-BETA.woff`,
+        ],
+      },
+      {
+        style: 'italic',
+        weight: 300,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff`,
+        ],
+      },
+      {
+        style: 'normal',
+        weight: 400,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-Regular.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-Regular.woff`,
+        ],
+      },
+      {
+        style: 'italic',
+        weight: 400,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-Italic.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-Italic.woff`,
+        ],
+      },
+      {
+        style: 'normal',
+        weight: 500,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-Medium.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-Medium.woff`,
+        ],
+      },
+      {
+        style: 'italic',
+        weight: 500,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-MediumItalic.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-MediumItalic.woff`,
+        ],
+      },
+      {
+        style: 'normal',
+        weight: 600,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-SemiBold.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-SemiBold.woff`,
+        ],
+      },
+      {
+        style: 'italic',
+        weight: 600,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff`,
+        ],
+      },
+      {
+        style: 'normal',
+        weight: 700,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-Bold.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-Bold.woff`,
+        ],
+      },
+      {
+        style: 'italic',
+        weight: 700,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-BoldItalic.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-BoldItalic.woff`,
+        ],
+      },
+      {
+        style: 'normal',
+        weight: 800,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-ExtraBold.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-ExtraBold.woff`,
+        ],
+      },
+      {
+        style: 'italic',
+        weight: 800,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff`,
+        ],
+      },
+      {
+        style: 'normal',
+        weight: 900,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-Black.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-Black.woff`,
+        ],
+      },
+      {
+        style: 'italic',
+        weight: 900,
+        sources: [
+          `${url}/fonts/inter_ui/Inter-UI-BlackItalic.woff2`,
+          `${url}/fonts/inter_ui/Inter-UI-BlackItalic.woff`,
+        ],
+      },
+    ],
+  };
+  const roboto: FontFace = {
+    family: 'Roboto Mono',
+    variants: [
+      {
+        style: 'normal',
+        weight: 400,
+        format: 'woff2',
+        sources: [
+          'Roboto Mono',
+          'RobotoMono-Regular',
+          `${url}/fonts/roboto_mono/RobotoMono-Regular.ttf`,
+        ],
+        unicodeRange:
+          'U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD',
+      },
+      {
+        style: 'italic',
+        weight: 400,
+        sources: [
+          'Roboto Mono Italic',
+          'RobotoMono-Italic',
+          `${url}/fonts/roboto_mono/RobotoMono-Italic.ttf`,
+        ],
+        unicodeRange:
+          'U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD',
+      },
+      {
+        style: 'normal',
+        weight: 700,
+        format: 'woff2',
+        sources: [
+          'Roboto Mono Bold',
+          'RobotoMono-Bold',
+          `${url}/fonts/roboto_mono/RobotoMono-Bold.ttf`,
+        ],
+        unicodeRange:
+          'U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD',
+      },
+      {
+        style: 'italic',
+        weight: 700,
+        format: 'woff2',
+        sources: [
+          'Roboto Mono Bold Italic',
+          'RobotoMono-BoldItalic',
+          `${url}/fonts/roboto_mono/RobotoMono-BoldItalic.ttf`,
+        ],
+        unicodeRange:
+          'U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD',
+      },
+    ],
+  };
+
+  return (
+    <style
+      dangerouslySetInnerHTML={{
+        __html: `
+        ${[interUi, roboto]
+          .flatMap(({ family, variants }) =>
+            variants.map(({ style, weight, format, sources, unicodeRange }) => {
+              const src = sources
+                .map(source =>
+                  source.startsWith(url)
+                    ? `url('${source}') format('${format || source.split('.').pop()}')`
+                    : `local('${source}')`
+                )
+                .join(', ');
+
+              return `
+        @font-face {
+          font-family: '${family}';
+          font-style: ${style};
+          font-weight: ${weight};
+          src: ${src};${
+                unicodeRange
+                  ? `
+          unicode-range: ${unicodeRange};`
+                  : ''
+              }
+        }`;
+            })
+          )
+          .join('\n')}
+        /*
+        Single variable font.
+
+        Note that you may want to do something like this to make sure you're serving
+        constant fonts to older browsers:
+        html {
+          font-family: 'Inter UI', sans-serif;
+        }
+        @supports (font-variation-settings: normal) {
+          html {
+            font-family: 'Inter UI var', sans-serif;
+          }
+        }
+
+        BUGS:
+        - Safari 12.0 will default to italic instead of regular when font-weight
+          is provided in a @font-face declaration.
+          Workaround: Use 'Inter UI var alt' for Safari, or explicitly set
+          \`font-variation-settings: 'slnt' DEGREE\`.
+
+        @font-face {
+          font-family: 'Inter UI var';
+          font-weight: 100 900;
+          font-style: oblique 0deg 10deg;
+          src:
+            url('${url}/fonts/inter_ui/Inter-UI.var.woff2') format('woff2-variations'),
+            url('${url}/fonts/inter_ui/Inter-UI.var.woff2') format('woff2');
+        }
+
+        'Inter UI var alt' is recommended for Safari and Edge, for reliable italics.
+
+        @supports (font-variation-settings: normal) {
+          html {
+            font-family: 'Inter UI var alt', sans-serif;
+          }
+        }
+
+        @font-face {
+          font-family: 'Inter UI var alt';
+          font-weight: 100 900;
+          font-style: normal;
+          font-named-instance: 'Regular';
+          src:
+            url('${url}/fonts/inter_ui/Inter-UI-upright.var.woff2') format('woff2 supports variations(gvar)'),
+            url('${url}/fonts/inter_ui/Inter-UI-upright.var.woff2') format('woff2-variations'),
+            url('${url}/fonts/inter_ui/Inter-UI-upright.var.woff2') format('woff2');
+        }
+        @font-face {
+          font-family: 'Inter UI var alt';
+          font-weight: 100 900;
+          font-style: italic;
+          font-named-instance: 'Italic';
+          src:
+            url('${url}/fonts/inter_ui/Inter-UI-italic.var.woff2') format('woff2 supports variations(gvar)'),
+            url('${url}/fonts/inter_ui/Inter-UI-italic.var.woff2') format('woff2-variations'),
+            url('${url}/fonts/inter_ui/Inter-UI-italic.var.woff2') format('woff2');
+        }
+        */
+      `,
+      }}
+    />
+  );
+};
diff --git a/src/core/server/rendering/views/index.ts b/src/core/server/rendering/views/index.ts
new file mode 100644
index 0000000000000..98a8bba0cc003
--- /dev/null
+++ b/src/core/server/rendering/views/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 { Template } from './template';
diff --git a/src/core/server/rendering/views/styles.tsx b/src/core/server/rendering/views/styles.tsx
new file mode 100644
index 0000000000000..dfcb4213d90f7
--- /dev/null
+++ b/src/core/server/rendering/views/styles.tsx
@@ -0,0 +1,171 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 react/no-danger */
+
+import React, { FunctionComponent } from 'react';
+
+import { RenderingMetadata } from '../types';
+
+interface Props {
+  darkMode: RenderingMetadata['darkMode'];
+}
+
+export const Styles: FunctionComponent<Props> = ({ darkMode }) => {
+  return (
+    <style
+      dangerouslySetInnerHTML={{
+        __html: `
+          * {
+            box-sizing: border-box;
+          }
+
+          body, html {
+            width: 100%;
+            height: 100%;
+            margin: 0;
+          }
+
+          .kibanaWelcomeView {
+            height: 100%;
+            display: -webkit-box;
+            display: -webkit-flex;
+            display: -ms-flexbox;
+            display: flex;
+            -webkit-box-flex: 1;
+            -webkit-flex: 1 0 auto;
+                -ms-flex: 1 0 auto;
+                    flex: 1 0 auto;
+            -webkit-box-orient: vertical;
+            -webkit-box-direction: normal;
+            -webkit-flex-direction: column;
+                -ms-flex-direction: column;
+                    flex-direction: column;
+            -webkit-box-align: center;
+            -webkit-align-items: center;
+                -ms-flex-align: center;
+                    align-items: center;
+            -webkit-box-pack: center;
+            -webkit-justify-content: center;
+                -ms-flex-pack: center;
+                    justify-content: center;
+          }
+
+          .kibanaWelcomeLogo {
+            width: 60px;
+            height: 60px;
+            margin: 10px 0 10px 20px;
+            background-repeat: no-repeat;
+            background-size: contain;
+            /* SVG optimized according to http://codepen.io/tigt/post/optimizing-svgs-in-data-uris */
+            background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMCIgaGVpZ2h0PSIzOSIgdmlld0JveD0iMCAwIDMwIDM5Ij4gIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgIDxwb2x5Z29uIGZpbGw9IiNGMDRFOTgiIHBvaW50cz0iMCAwIDAgMzQuNTQ3IDI5LjkyMiAuMDIiLz4gICAgPHBhdGggZmlsbD0iIzM0Mzc0MSIgZD0iTTAsMTQuNCBMMCwzNC41NDY4IEwxNC4yODcyLDE4LjA2MTIgQzEwLjA0MTYsMTUuNzM4IDUuMTgwNCwxNC40IDAsMTQuNCIvPiAgICA8cGF0aCBmaWxsPSIjMDBCRkIzIiBkPSJNMTcuMzc0MiwxOS45OTY4IEwyLjcyMSwzNi45MDQ4IEwxLjQzMzQsMzguMzg5MiBMMjkuMjYzOCwzOC4zODkyIEMyNy43NjE0LDMwLjgzODggMjMuNDA0MiwyNC4zMjY0IDE3LjM3NDIsMTkuOTk2OCIvPiAgPC9nPjwvc3ZnPg==');
+          }
+
+          .kibanaWelcomeTitle {
+            color: #000;
+            font-size: 20px;
+            font-family: sans-serif;
+            margin-top: 20px;
+            animation: fadeIn 1s ease-in-out;
+            animation-fill-mode: forwards;
+            opacity: 0;
+            animation-delay: 1.0s;
+          }
+
+          .kibanaWelcomeText {
+            font-size: 14px;
+            font-family: sans-serif;
+            color: #98a2b3;
+            animation: fadeIn 1s ease-in-out;
+            animation-fill-mode: forwards;
+            opacity: 0;
+            animation-delay: 1.0s;
+          }
+
+          .kibanaLoaderWrap {
+            height: 128px;
+            width: 128px;
+            position: relative;
+            margin-top: 40px;
+          }
+
+          .kibanaLoaderWrap + * {
+            margin-top: 24px;
+          }
+
+          .kibanaLoader {
+            height: 128px;
+            width: 128px;
+            margin: 0 auto;
+            position: relative;
+            border: 2px solid transparent;
+            border-top: 2px solid #017d73;
+            border-radius: 100%;
+            display: block;
+            opacity: 0;
+            animation: rotation .75s .5s infinite linear, fadeIn 1s .5s ease-in-out forwards;
+          }
+
+          .kibanaWelcomeLogoCircle {
+            position: absolute;
+            left: 4px;
+            top: 4px;
+            width: 120px;
+            height: 120px;
+            padding: 20px;
+            background-color: #fff;
+            border-radius: 50%;
+            animation: bounceIn .5s ease-in-out;
+          }
+
+          @keyframes rotation {
+            from {
+              transform: rotate(0deg);
+            }
+            to {
+              transform: rotate(359deg);
+            }
+          }
+          @keyframes fadeIn {
+            from {
+              opacity: 0;
+            }
+            to {
+              opacity: 1;
+            }
+          }
+          @keyframes bounceIn {
+            0% {
+              opacity: 0;
+              transform: scale(.1);
+            }
+            80% {
+              opacity: .5;
+              transform: scale(1.2);
+            }
+            100% {
+              opacity: 1;
+              transform: scale(1);
+            }
+          }
+        `,
+      }}
+    />
+  );
+};
diff --git a/src/core/server/rendering/views/template.tsx b/src/core/server/rendering/views/template.tsx
new file mode 100644
index 0000000000000..0c827db9540b6
--- /dev/null
+++ b/src/core/server/rendering/views/template.tsx
@@ -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 React, { FunctionComponent, createElement } from 'react';
+
+import { RenderingMetadata } from '../types';
+import { Fonts } from './fonts';
+import { Styles } from './styles';
+
+interface Props {
+  metadata: RenderingMetadata;
+}
+
+export const Template: FunctionComponent<Props> = ({
+  metadata: {
+    uiPublicUrl,
+    locale,
+    darkMode,
+    injectedMetadata,
+    i18n,
+    bootstrapScriptUrl,
+    strictCsp,
+  },
+}) => {
+  return (
+    <html lang={locale}>
+      <head>
+        <meta charSet="utf-8" />
+        <meta httpEquiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+        <meta name="viewport" content="width=device-width" />
+        <title>Kibana</title>
+        <Fonts url={uiPublicUrl} />
+        {/* Favicons (generated from http://realfavicongenerator.net/) */}
+        <link
+          rel="apple-touch-icon"
+          sizes="180x180"
+          href={`${uiPublicUrl}/favicons/apple-touch-icon.png`}
+        />
+        <link
+          rel="icon"
+          type="image/png"
+          sizes="32x32"
+          href={`${uiPublicUrl}/favicons/favicon-32x32.png`}
+        />
+        <link
+          rel="icon"
+          type="image/png"
+          sizes="16x16"
+          href={`${uiPublicUrl}/favicons/favicon-16x16.png`}
+        />
+        <link rel="manifest" href={`${uiPublicUrl}/favicons/manifest.json`} />
+        <link
+          rel="mask-icon"
+          color="#e8488b"
+          href={`${uiPublicUrl}/favicons/safari-pinned-tab.svg`}
+        />
+        <link rel="shortcut icon" href={`${uiPublicUrl}/favicons/favicon.ico`} />
+        <meta name="msapplication-config" content={`${uiPublicUrl}/favicons/browserconfig.xml`} />
+        <meta name="theme-color" content="#ffffff" />
+        <Styles darkMode={darkMode} />
+      </head>
+      <body>
+        {createElement('kbn-csp', {
+          data: JSON.stringify({ strictCsp }),
+        })}
+        {createElement('kbn-injected-metadata', { data: JSON.stringify(injectedMetadata) })}
+        <div
+          className="kibanaWelcomeView"
+          id="kbn_loading_message"
+          style={{ display: 'none' }}
+          data-test-subj="kbnLoadingMessage"
+        >
+          <div className="kibanaLoaderWrap">
+            <div className="kibanaLoader" />
+            <div className="kibanaWelcomeLogoCircle">
+              <div className="kibanaWelcomeLogo" />
+            </div>
+          </div>
+
+          <div
+            className="kibanaWelcomeText"
+            data-error-message={i18n('core.ui.welcomeErrorMessage', {
+              defaultMessage:
+                'Kibana did not load properly. Check the server output for more information.',
+            })}
+          >
+            {i18n('core.ui.welcomeMessage', { defaultMessage: 'Loading Kibana' })}
+          </div>
+        </div>
+
+        <div
+          className="kibanaWelcomeView"
+          id="kbn_legacy_browser_error"
+          style={{ display: 'none' }}
+        >
+          <div className="kibanaLoaderWrap">
+            <div className="kibanaWelcomeLogoCircle">
+              <div className="kibanaWelcomeLogo" />
+            </div>
+          </div>
+
+          <h2 className="kibanaWelcomeTitle">
+            {i18n('core.ui.legacyBrowserTitle', {
+              defaultMessage: 'Please upgrade your browser',
+            })}
+          </h2>
+          <div className="kibanaWelcomeText">
+            {i18n('core.ui.legacyBrowserMessage', {
+              defaultMessage:
+                'This Kibana installation has strict security requirements enabled that your current browser does not meet.',
+            })}
+          </div>
+        </div>
+
+        <script>
+          {`
+            // Since this is an unsafe inline script, this code will not run
+            // in browsers that support content security policy(CSP). This is
+            // intentional as we check for the existence of __kbnCspNotEnforced__ in
+            // bootstrap.
+            window.__kbnCspNotEnforced__ = true;
+          `}
+        </script>
+        <script src={bootstrapScriptUrl} />
+      </body>
+    </html>
+  );
+};
diff --git a/src/core/server/saved_objects/migrations/core/build_index_map.test.ts b/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
index 622f32d3e653b..bdc96323238c0 100644
--- a/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
+++ b/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
@@ -20,11 +20,13 @@
 import { createIndexMap } from './build_index_map';
 import { ObjectToConfigAdapter } from '../../../config';
 import { SavedObjectsSchema } from '../../schema';
-import { LegacyConfig } from '../../../legacy/config';
+import { LegacyConfig } from '../../../legacy';
+
+const config = (new ObjectToConfigAdapter({}) as unknown) as LegacyConfig;
 
 test('mappings without index pattern goes to default index', () => {
   const result = createIndexMap({
-    config: new ObjectToConfigAdapter({}) as LegacyConfig,
+    config,
     kibanaIndexName: '.kibana',
     schema: new SavedObjectsSchema({
       type1: {
@@ -58,7 +60,7 @@ test('mappings without index pattern goes to default index', () => {
 
 test(`mappings with custom index pattern doesn't go to default index`, () => {
   const result = createIndexMap({
-    config: new ObjectToConfigAdapter({}) as LegacyConfig,
+    config,
     kibanaIndexName: '.kibana',
     schema: new SavedObjectsSchema({
       type1: {
@@ -93,7 +95,7 @@ test(`mappings with custom index pattern doesn't go to default index`, () => {
 
 test('creating a script gets added to the index pattern', () => {
   const result = createIndexMap({
-    config: new ObjectToConfigAdapter({}) as LegacyConfig,
+    config,
     kibanaIndexName: '.kibana',
     schema: new SavedObjectsSchema({
       type1: {
@@ -158,7 +160,7 @@ test('throws when two scripts are defined for an index pattern', () => {
   };
   expect(() =>
     createIndexMap({
-      config: new ObjectToConfigAdapter({}) as LegacyConfig,
+      config,
       kibanaIndexName: defaultIndex,
       schema,
       indexMap,
diff --git a/src/core/server/saved_objects/migrations/core/build_index_map.ts b/src/core/server/saved_objects/migrations/core/build_index_map.ts
index fdb2cff4d2e43..914447563cc77 100644
--- a/src/core/server/saved_objects/migrations/core/build_index_map.ts
+++ b/src/core/server/saved_objects/migrations/core/build_index_map.ts
@@ -19,7 +19,7 @@
 
 import { MappingProperties } from '../../mappings';
 import { SavedObjectsSchema } from '../../schema';
-import { LegacyConfig } from '../../../legacy/config';
+import { LegacyConfig } from '../../../legacy';
 
 export interface CreateIndexMapOptions {
   config: LegacyConfig;
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
index f92ce01f2a273..c35e8dd90b5b1 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
@@ -36,7 +36,7 @@ import {
 } from '../core/document_migrator';
 import { createIndexMap } from '../core/build_index_map';
 import { SavedObjectsConfigType } from '../../saved_objects_config';
-import { LegacyConfig } from '../../../legacy/config';
+import { LegacyConfig } from '../../../legacy';
 
 export interface KibanaMigratorOptions {
   callCluster: CallCluster;
diff --git a/src/core/server/saved_objects/saved_objects_service.test.ts b/src/core/server/saved_objects/saved_objects_service.test.ts
index f58939c58e85e..deb6f98e17b7b 100644
--- a/src/core/server/saved_objects/saved_objects_service.test.ts
+++ b/src/core/server/saved_objects/saved_objects_service.test.ts
@@ -23,7 +23,6 @@ import { SavedObjectsService, SavedObjectsSetupDeps } from './saved_objects_serv
 import { mockCoreContext } from '../core_context.mock';
 // @ts-ignore Typescript doesn't know about the jest mock
 import { KibanaMigrator, mockKibanaMigratorInstance } from './migrations/kibana/kibana_migrator';
-import { of } from 'rxjs';
 import * as legacyElasticsearch from 'elasticsearch';
 import { Env } from '../config';
 import { configServiceMock } from '../mocks';
@@ -49,7 +48,7 @@ describe('SavedObjectsService', () => {
 
       const soService = new SavedObjectsService(coreContext);
       const coreSetup = ({
-        elasticsearch: { adminClient$: of(clusterClient) },
+        elasticsearch: { adminClient: clusterClient },
         legacyPlugins: { uiExports: { savedObjectMappings: [] }, pluginExtendedConfig: {} },
       } as unknown) as SavedObjectsSetupDeps;
 
@@ -68,7 +67,7 @@ describe('SavedObjectsService', () => {
       });
       const soService = new SavedObjectsService(coreContext);
       const coreSetup = ({
-        elasticsearch: { adminClient$: of({ callAsInternalUser: jest.fn() }) },
+        elasticsearch: { adminClient: { callAsInternalUser: jest.fn() } },
         legacyPlugins: { uiExports: {}, pluginExtendedConfig: {} },
       } as unknown) as SavedObjectsSetupDeps;
 
@@ -82,7 +81,7 @@ describe('SavedObjectsService', () => {
       const coreContext = mockCoreContext.create({ configService });
       const soService = new SavedObjectsService(coreContext);
       const coreSetup = ({
-        elasticsearch: { adminClient$: of({ callAsInternalUser: jest.fn() }) },
+        elasticsearch: { adminClient: { callAsInternalUser: jest.fn() } },
         legacyPlugins: { uiExports: {}, pluginExtendedConfig: {} },
       } as unknown) as SavedObjectsSetupDeps;
 
@@ -96,7 +95,7 @@ describe('SavedObjectsService', () => {
       const coreContext = mockCoreContext.create({ configService });
       const soService = new SavedObjectsService(coreContext);
       const coreSetup = ({
-        elasticsearch: { adminClient$: of({ callAsInternalUser: jest.fn() }) },
+        elasticsearch: { adminClient: { callAsInternalUser: jest.fn() } },
         legacyPlugins: { uiExports: {}, pluginExtendedConfig: {} },
       } as unknown) as SavedObjectsSetupDeps;
 
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
index 6ee33aebe5efa..69ca8306ca4da 100644
--- a/src/core/server/saved_objects/saved_objects_service.ts
+++ b/src/core/server/saved_objects/saved_objects_service.ts
@@ -28,8 +28,8 @@ import {
 } from './';
 import { KibanaMigrator, IKibanaMigrator } from './migrations';
 import { CoreContext } from '../core_context';
-import { LegacyServiceDiscoverPlugins } from '../legacy/legacy_service';
-import { ElasticsearchServiceSetup, APICaller } from '../elasticsearch';
+import { LegacyServiceDiscoverPlugins } from '../legacy';
+import { InternalElasticsearchServiceSetup, APICaller } from '../elasticsearch';
 import { KibanaConfigType } from '../kibana_config';
 import { migrationsRetryCallCluster } from '../elasticsearch/retry_call_cluster';
 import { SavedObjectsConfigType } from './saved_objects_config';
@@ -174,7 +174,7 @@ export interface InternalSavedObjectsServiceStart extends SavedObjectsServiceSta
 /** @internal */
 export interface SavedObjectsSetupDeps {
   legacyPlugins: LegacyServiceDiscoverPlugins;
-  elasticsearch: ElasticsearchServiceSetup;
+  elasticsearch: InternalElasticsearchServiceSetup;
 }
 
 /** @internal */
@@ -206,8 +206,6 @@ export class SavedObjectsService
 
     const savedObjectSchemas = new SavedObjectsSchema(savedObjectsSchemasDefinition);
 
-    const adminClient = await setupDeps.elasticsearch.adminClient$.pipe(first()).toPromise();
-
     const kibanaConfig = await this.coreContext.configService
       .atPath<KibanaConfigType>('kibana')
       .pipe(first())
@@ -218,6 +216,8 @@ export class SavedObjectsService
       .pipe(first())
       .toPromise();
 
+    const adminClient = setupDeps.elasticsearch.adminClient;
+
     const migrator = (this.migrator = new KibanaMigrator({
       savedObjectSchemas,
       savedObjectMappings,
diff --git a/src/core/server/saved_objects/schema/schema.ts b/src/core/server/saved_objects/schema/schema.ts
index 9404b00d82058..00c4939233318 100644
--- a/src/core/server/saved_objects/schema/schema.ts
+++ b/src/core/server/saved_objects/schema/schema.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { LegacyConfig } from '../../legacy/config';
+import { LegacyConfig } from '../../legacy';
 
 interface SavedObjectsSchemaTypeDefinition {
   isNamespaceAgnostic: boolean;
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index 4ff44ced6fb7c..ef5bcecc948a9 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -52,7 +52,7 @@ import {
   MutatingOperationRefreshSetting,
 } from '../../types';
 import { validateConvertFilterToKueryNode } from './filter_utils';
-import { LegacyConfig } from '../../../legacy/config';
+import { LegacyConfig } from '../../../legacy';
 
 // BEWARE: The SavedObjectClient depends on the implementation details of the SavedObjectsRepository
 // so any breaking changes to this repository are considered breaking changes to the SavedObjectsClient.
diff --git a/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts b/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts
index 975ad20dc679d..b3ea056484760 100644
--- a/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts
+++ b/src/core/server/saved_objects/service/lib/repository_create_repository.test.ts
@@ -20,7 +20,7 @@ import { SavedObjectsRepository } from './repository';
 import { mockKibanaMigrator } from '../../migrations/kibana/kibana_migrator.mock';
 import { SavedObjectsSchema } from '../../schema';
 import { KibanaMigrator } from '../../migrations';
-import { LegacyConfig } from '../../../legacy/config';
+import { LegacyConfig } from '../../../legacy';
 jest.mock('./repository');
 
 const { SavedObjectsRepository: originalRepository } = jest.requireActual('./repository');
diff --git a/src/core/server/saved_objects/service/lib/scoped_client_provider.ts b/src/core/server/saved_objects/service/lib/scoped_client_provider.ts
index 0b67727455333..42f75e2517126 100644
--- a/src/core/server/saved_objects/service/lib/scoped_client_provider.ts
+++ b/src/core/server/saved_objects/service/lib/scoped_client_provider.ts
@@ -66,12 +66,6 @@ export type ISavedObjectsClientProvider<T = unknown> = Pick<
  * Provider for the Scoped Saved Objects Client.
  *
  * @internal
- *
- * @internalRemarks Because `getClient` is synchronous the Client Provider does
- * not support creating factories that react to new ES clients emitted from
- * elasticsearch.adminClient$. The Client Provider therefore doesn't support
- * configuration changes to the Elasticsearch client. TODO: revisit once we've
- * closed https://github.com/elastic/kibana/pull/45796
  */
 export class SavedObjectsClientProvider<Request = unknown> {
   private readonly _wrapperFactories = new PriorityCollection<{
diff --git a/src/core/server/saved_objects/types.ts b/src/core/server/saved_objects/types.ts
index c1fa820ef2019..dfce4a4c8ab18 100644
--- a/src/core/server/saved_objects/types.ts
+++ b/src/core/server/saved_objects/types.ts
@@ -236,7 +236,6 @@ export type SavedObjectsClientContract = Pick<SavedObjectsClient, keyof SavedObj
  * @deprecated
  */
 export interface SavedObjectsLegacyUiExports {
-  unknown: [{ pluginSpec: { getId: () => unknown }; type: unknown }] | undefined;
   savedObjectMappings: SavedObjectsMapping[];
   savedObjectMigrations: MigrationDefinition;
   savedObjectSchemas: SavedObjectsSchemaDefinition;
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 780a1532a859e..e41f045622a42 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -1,1847 +1,1985 @@
-## API Report File for "kibana"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-
-import Boom from 'boom';
-import { BulkIndexDocumentsParams } from 'elasticsearch';
-import { CatAliasesParams } from 'elasticsearch';
-import { CatAllocationParams } from 'elasticsearch';
-import { CatCommonParams } from 'elasticsearch';
-import { CatFielddataParams } from 'elasticsearch';
-import { CatHealthParams } from 'elasticsearch';
-import { CatHelpParams } from 'elasticsearch';
-import { CatIndicesParams } from 'elasticsearch';
-import { CatRecoveryParams } from 'elasticsearch';
-import { CatSegmentsParams } from 'elasticsearch';
-import { CatShardsParams } from 'elasticsearch';
-import { CatSnapshotsParams } from 'elasticsearch';
-import { CatTasksParams } from 'elasticsearch';
-import { CatThreadPoolParams } from 'elasticsearch';
-import { ClearScrollParams } from 'elasticsearch';
-import { Client } from 'elasticsearch';
-import { ClusterAllocationExplainParams } from 'elasticsearch';
-import { ClusterGetSettingsParams } from 'elasticsearch';
-import { ClusterHealthParams } from 'elasticsearch';
-import { ClusterPendingTasksParams } from 'elasticsearch';
-import { ClusterPutSettingsParams } from 'elasticsearch';
-import { ClusterRerouteParams } from 'elasticsearch';
-import { ClusterStateParams } from 'elasticsearch';
-import { ClusterStatsParams } from 'elasticsearch';
-import { ConfigOptions } from 'elasticsearch';
-import { CountParams } from 'elasticsearch';
-import { CreateDocumentParams } from 'elasticsearch';
-import { DeleteDocumentByQueryParams } from 'elasticsearch';
-import { DeleteDocumentParams } from 'elasticsearch';
-import { DeleteScriptParams } from 'elasticsearch';
-import { DeleteTemplateParams } from 'elasticsearch';
-import { DetailedPeerCertificate } from 'tls';
-import { Duration } from 'moment';
-import { ExistsParams } from 'elasticsearch';
-import { ExplainParams } from 'elasticsearch';
-import { FieldStatsParams } from 'elasticsearch';
-import { GenericParams } from 'elasticsearch';
-import { GetParams } from 'elasticsearch';
-import { GetResponse } from 'elasticsearch';
-import { GetScriptParams } from 'elasticsearch';
-import { GetSourceParams } from 'elasticsearch';
-import { GetTemplateParams } from 'elasticsearch';
-import { IncomingHttpHeaders } from 'http';
-import { IndexDocumentParams } from 'elasticsearch';
-import { IndicesAnalyzeParams } from 'elasticsearch';
-import { IndicesClearCacheParams } from 'elasticsearch';
-import { IndicesCloseParams } from 'elasticsearch';
-import { IndicesCreateParams } from 'elasticsearch';
-import { IndicesDeleteAliasParams } from 'elasticsearch';
-import { IndicesDeleteParams } from 'elasticsearch';
-import { IndicesDeleteTemplateParams } from 'elasticsearch';
-import { IndicesExistsAliasParams } from 'elasticsearch';
-import { IndicesExistsParams } from 'elasticsearch';
-import { IndicesExistsTemplateParams } from 'elasticsearch';
-import { IndicesExistsTypeParams } from 'elasticsearch';
-import { IndicesFlushParams } from 'elasticsearch';
-import { IndicesFlushSyncedParams } from 'elasticsearch';
-import { IndicesForcemergeParams } from 'elasticsearch';
-import { IndicesGetAliasParams } from 'elasticsearch';
-import { IndicesGetFieldMappingParams } from 'elasticsearch';
-import { IndicesGetMappingParams } from 'elasticsearch';
-import { IndicesGetParams } from 'elasticsearch';
-import { IndicesGetSettingsParams } from 'elasticsearch';
-import { IndicesGetTemplateParams } from 'elasticsearch';
-import { IndicesGetUpgradeParams } from 'elasticsearch';
-import { IndicesOpenParams } from 'elasticsearch';
-import { IndicesPutAliasParams } from 'elasticsearch';
-import { IndicesPutMappingParams } from 'elasticsearch';
-import { IndicesPutSettingsParams } from 'elasticsearch';
-import { IndicesPutTemplateParams } from 'elasticsearch';
-import { IndicesRecoveryParams } from 'elasticsearch';
-import { IndicesRefreshParams } from 'elasticsearch';
-import { IndicesRolloverParams } from 'elasticsearch';
-import { IndicesSegmentsParams } from 'elasticsearch';
-import { IndicesShardStoresParams } from 'elasticsearch';
-import { IndicesShrinkParams } from 'elasticsearch';
-import { IndicesStatsParams } from 'elasticsearch';
-import { IndicesUpdateAliasesParams } from 'elasticsearch';
-import { IndicesUpgradeParams } from 'elasticsearch';
-import { IndicesValidateQueryParams } from 'elasticsearch';
-import { InfoParams } from 'elasticsearch';
-import { IngestDeletePipelineParams } from 'elasticsearch';
-import { IngestGetPipelineParams } from 'elasticsearch';
-import { IngestPutPipelineParams } from 'elasticsearch';
-import { IngestSimulateParams } from 'elasticsearch';
-import { KibanaConfigType } from 'src/core/server/kibana_config';
-import { Logger as Logger_2 } from 'src/core/server/logging';
-import { MGetParams } from 'elasticsearch';
-import { MGetResponse } from 'elasticsearch';
-import { MSearchParams } from 'elasticsearch';
-import { MSearchResponse } from 'elasticsearch';
-import { MSearchTemplateParams } from 'elasticsearch';
-import { MTermVectorsParams } from 'elasticsearch';
-import { NodesHotThreadsParams } from 'elasticsearch';
-import { NodesInfoParams } from 'elasticsearch';
-import { NodesStatsParams } from 'elasticsearch';
-import { ObjectType } from '@kbn/config-schema';
-import { Observable } from 'rxjs';
-import { PeerCertificate } from 'tls';
-import { PingParams } from 'elasticsearch';
-import { PutScriptParams } from 'elasticsearch';
-import { PutTemplateParams } from 'elasticsearch';
-import { Readable } from 'stream';
-import { RecursiveReadonly as RecursiveReadonly_2 } from 'kibana/public';
-import { ReindexParams } from 'elasticsearch';
-import { ReindexRethrottleParams } from 'elasticsearch';
-import { RenderSearchTemplateParams } from 'elasticsearch';
-import { Request } from 'hapi';
-import { ResponseObject } from 'hapi';
-import { ResponseToolkit } from 'hapi';
-import { ScrollParams } from 'elasticsearch';
-import { SearchParams } from 'elasticsearch';
-import { SearchResponse } from 'elasticsearch';
-import { SearchShardsParams } from 'elasticsearch';
-import { SearchTemplateParams } from 'elasticsearch';
-import { Server } from 'hapi';
-import { ShallowPromise } from '@kbn/utility-types';
-import { SnapshotCreateParams } from 'elasticsearch';
-import { SnapshotCreateRepositoryParams } from 'elasticsearch';
-import { SnapshotDeleteParams } from 'elasticsearch';
-import { SnapshotDeleteRepositoryParams } from 'elasticsearch';
-import { SnapshotGetParams } from 'elasticsearch';
-import { SnapshotGetRepositoryParams } from 'elasticsearch';
-import { SnapshotRestoreParams } from 'elasticsearch';
-import { SnapshotStatusParams } from 'elasticsearch';
-import { SnapshotVerifyRepositoryParams } from 'elasticsearch';
-import { Stream } from 'stream';
-import { SuggestParams } from 'elasticsearch';
-import { TasksCancelParams } from 'elasticsearch';
-import { TasksGetParams } from 'elasticsearch';
-import { TasksListParams } from 'elasticsearch';
-import { TermvectorsParams } from 'elasticsearch';
-import { Type } from '@kbn/config-schema';
-import { TypeOf } from '@kbn/config-schema';
-import { UpdateDocumentByQueryParams } from 'elasticsearch';
-import { UpdateDocumentParams } from 'elasticsearch';
-import { Url } from 'url';
-
-// @public (undocumented)
-export interface APICaller {
-    // (undocumented)
-    (endpoint: 'cluster.state', params: ClusterStateParams, options?: CallAPIOptions): ReturnType<Client['cluster']['state']>;
-    // (undocumented)
-    (endpoint: 'bulk', params: BulkIndexDocumentsParams, options?: CallAPIOptions): ReturnType<Client['bulk']>;
-    // (undocumented)
-    (endpoint: 'count', params: CountParams, options?: CallAPIOptions): ReturnType<Client['count']>;
-    // (undocumented)
-    (endpoint: 'create', params: CreateDocumentParams, options?: CallAPIOptions): ReturnType<Client['create']>;
-    // (undocumented)
-    (endpoint: 'delete', params: DeleteDocumentParams, options?: CallAPIOptions): ReturnType<Client['delete']>;
-    // (undocumented)
-    (endpoint: 'deleteByQuery', params: DeleteDocumentByQueryParams, options?: CallAPIOptions): ReturnType<Client['deleteByQuery']>;
-    // (undocumented)
-    (endpoint: 'deleteScript', params: DeleteScriptParams, options?: CallAPIOptions): ReturnType<Client['deleteScript']>;
-    // (undocumented)
-    (endpoint: 'deleteTemplate', params: DeleteTemplateParams, options?: CallAPIOptions): ReturnType<Client['deleteTemplate']>;
-    // (undocumented)
-    (endpoint: 'exists', params: ExistsParams, options?: CallAPIOptions): ReturnType<Client['exists']>;
-    // (undocumented)
-    (endpoint: 'explain', params: ExplainParams, options?: CallAPIOptions): ReturnType<Client['explain']>;
-    // (undocumented)
-    (endpoint: 'fieldStats', params: FieldStatsParams, options?: CallAPIOptions): ReturnType<Client['fieldStats']>;
-    // (undocumented)
-    <T>(endpoint: 'get', params: GetParams, options?: CallAPIOptions): Promise<GetResponse<T>>;
-    // (undocumented)
-    (endpoint: 'getScript', params: GetScriptParams, options?: CallAPIOptions): ReturnType<Client['getScript']>;
-    // (undocumented)
-    (endpoint: 'getSource', params: GetSourceParams, options?: CallAPIOptions): ReturnType<Client['getSource']>;
-    // (undocumented)
-    (endpoint: 'getTemplate', params: GetTemplateParams, options?: CallAPIOptions): ReturnType<Client['getTemplate']>;
-    // (undocumented)
-    <T>(endpoint: 'index', params: IndexDocumentParams<T>, options?: CallAPIOptions): ReturnType<Client['index']>;
-    // (undocumented)
-    (endpoint: 'info', params: InfoParams, options?: CallAPIOptions): ReturnType<Client['info']>;
-    // (undocumented)
-    <T>(endpoint: 'mget', params: MGetParams, options?: CallAPIOptions): Promise<MGetResponse<T>>;
-    // (undocumented)
-    <T>(endpoint: 'msearch', params: MSearchParams, options?: CallAPIOptions): Promise<MSearchResponse<T>>;
-    // (undocumented)
-    <T>(endpoint: 'msearchTemplate', params: MSearchTemplateParams, options?: CallAPIOptions): Promise<MSearchResponse<T>>;
-    // (undocumented)
-    (endpoint: 'mtermvectors', params: MTermVectorsParams, options?: CallAPIOptions): ReturnType<Client['mtermvectors']>;
-    // (undocumented)
-    (endpoint: 'ping', params: PingParams, options?: CallAPIOptions): ReturnType<Client['ping']>;
-    // (undocumented)
-    (endpoint: 'putScript', params: PutScriptParams, options?: CallAPIOptions): ReturnType<Client['putScript']>;
-    // (undocumented)
-    (endpoint: 'putTemplate', params: PutTemplateParams, options?: CallAPIOptions): ReturnType<Client['putTemplate']>;
-    // (undocumented)
-    (endpoint: 'reindex', params: ReindexParams, options?: CallAPIOptions): ReturnType<Client['reindex']>;
-    // (undocumented)
-    (endpoint: 'reindexRethrottle', params: ReindexRethrottleParams, options?: CallAPIOptions): ReturnType<Client['reindexRethrottle']>;
-    // (undocumented)
-    (endpoint: 'renderSearchTemplate', params: RenderSearchTemplateParams, options?: CallAPIOptions): ReturnType<Client['renderSearchTemplate']>;
-    // (undocumented)
-    <T>(endpoint: 'scroll', params: ScrollParams, options?: CallAPIOptions): Promise<SearchResponse<T>>;
-    // (undocumented)
-    <T>(endpoint: 'search', params: SearchParams, options?: CallAPIOptions): Promise<SearchResponse<T>>;
-    // (undocumented)
-    (endpoint: 'searchShards', params: SearchShardsParams, options?: CallAPIOptions): ReturnType<Client['searchShards']>;
-    // (undocumented)
-    (endpoint: 'searchTemplate', params: SearchTemplateParams, options?: CallAPIOptions): ReturnType<Client['searchTemplate']>;
-    // (undocumented)
-    (endpoint: 'suggest', params: SuggestParams, options?: CallAPIOptions): ReturnType<Client['suggest']>;
-    // (undocumented)
-    (endpoint: 'termvectors', params: TermvectorsParams, options?: CallAPIOptions): ReturnType<Client['termvectors']>;
-    // (undocumented)
-    (endpoint: 'update', params: UpdateDocumentParams, options?: CallAPIOptions): ReturnType<Client['update']>;
-    // (undocumented)
-    (endpoint: 'updateByQuery', params: UpdateDocumentByQueryParams, options?: CallAPIOptions): ReturnType<Client['updateByQuery']>;
-    // (undocumented)
-    (endpoint: 'cat.aliases', params: CatAliasesParams, options?: CallAPIOptions): ReturnType<Client['cat']['aliases']>;
-    // (undocumented)
-    (endpoint: 'cat.allocation', params: CatAllocationParams, options?: CallAPIOptions): ReturnType<Client['cat']['allocation']>;
-    // (undocumented)
-    (endpoint: 'cat.count', params: CatAllocationParams, options?: CallAPIOptions): ReturnType<Client['cat']['count']>;
-    // (undocumented)
-    (endpoint: 'cat.fielddata', params: CatFielddataParams, options?: CallAPIOptions): ReturnType<Client['cat']['fielddata']>;
-    // (undocumented)
-    (endpoint: 'cat.health', params: CatHealthParams, options?: CallAPIOptions): ReturnType<Client['cat']['health']>;
-    // (undocumented)
-    (endpoint: 'cat.help', params: CatHelpParams, options?: CallAPIOptions): ReturnType<Client['cat']['help']>;
-    // (undocumented)
-    (endpoint: 'cat.indices', params: CatIndicesParams, options?: CallAPIOptions): ReturnType<Client['cat']['indices']>;
-    // (undocumented)
-    (endpoint: 'cat.master', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['master']>;
-    // (undocumented)
-    (endpoint: 'cat.nodeattrs', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['nodeattrs']>;
-    // (undocumented)
-    (endpoint: 'cat.nodes', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['nodes']>;
-    // (undocumented)
-    (endpoint: 'cat.pendingTasks', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['pendingTasks']>;
-    // (undocumented)
-    (endpoint: 'cat.plugins', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['plugins']>;
-    // (undocumented)
-    (endpoint: 'cat.recovery', params: CatRecoveryParams, options?: CallAPIOptions): ReturnType<Client['cat']['recovery']>;
-    // (undocumented)
-    (endpoint: 'cat.repositories', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['repositories']>;
-    // (undocumented)
-    (endpoint: 'cat.segments', params: CatSegmentsParams, options?: CallAPIOptions): ReturnType<Client['cat']['segments']>;
-    // (undocumented)
-    (endpoint: 'cat.shards', params: CatShardsParams, options?: CallAPIOptions): ReturnType<Client['cat']['shards']>;
-    // (undocumented)
-    (endpoint: 'cat.snapshots', params: CatSnapshotsParams, options?: CallAPIOptions): ReturnType<Client['cat']['snapshots']>;
-    // (undocumented)
-    (endpoint: 'cat.tasks', params: CatTasksParams, options?: CallAPIOptions): ReturnType<Client['cat']['tasks']>;
-    // (undocumented)
-    (endpoint: 'cat.threadPool', params: CatThreadPoolParams, options?: CallAPIOptions): ReturnType<Client['cat']['threadPool']>;
-    // (undocumented)
-    (endpoint: 'cluster.allocationExplain', params: ClusterAllocationExplainParams, options?: CallAPIOptions): ReturnType<Client['cluster']['allocationExplain']>;
-    // (undocumented)
-    (endpoint: 'cluster.getSettings', params: ClusterGetSettingsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['getSettings']>;
-    // (undocumented)
-    (endpoint: 'cluster.health', params: ClusterHealthParams, options?: CallAPIOptions): ReturnType<Client['cluster']['health']>;
-    // (undocumented)
-    (endpoint: 'cluster.pendingTasks', params: ClusterPendingTasksParams, options?: CallAPIOptions): ReturnType<Client['cluster']['pendingTasks']>;
-    // (undocumented)
-    (endpoint: 'cluster.putSettings', params: ClusterPutSettingsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['putSettings']>;
-    // (undocumented)
-    (endpoint: 'cluster.reroute', params: ClusterRerouteParams, options?: CallAPIOptions): ReturnType<Client['cluster']['reroute']>;
-    // (undocumented)
-    (endpoint: 'clearScroll', params: ClearScrollParams, options?: CallAPIOptions): ReturnType<Client['clearScroll']>;
-    // (undocumented)
-    (endpoint: 'cluster.stats', params: ClusterStatsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['stats']>;
-    // (undocumented)
-    (endpoint: 'indices.analyze', params: IndicesAnalyzeParams, options?: CallAPIOptions): ReturnType<Client['indices']['analyze']>;
-    // (undocumented)
-    (endpoint: 'indices.clearCache', params: IndicesClearCacheParams, options?: CallAPIOptions): ReturnType<Client['indices']['clearCache']>;
-    // (undocumented)
-    (endpoint: 'indices.close', params: IndicesCloseParams, options?: CallAPIOptions): ReturnType<Client['indices']['close']>;
-    // (undocumented)
-    (endpoint: 'indices.create', params: IndicesCreateParams, options?: CallAPIOptions): ReturnType<Client['indices']['create']>;
-    // (undocumented)
-    (endpoint: 'indices.delete', params: IndicesDeleteParams, options?: CallAPIOptions): ReturnType<Client['indices']['delete']>;
-    // (undocumented)
-    (endpoint: 'indices.deleteAlias', params: IndicesDeleteAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['deleteAlias']>;
-    // (undocumented)
-    (endpoint: 'indices.deleteTemplate', params: IndicesDeleteTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['deleteTemplate']>;
-    // (undocumented)
-    (endpoint: 'indices.exists', params: IndicesExistsParams, options?: CallAPIOptions): ReturnType<Client['indices']['exists']>;
-    // (undocumented)
-    (endpoint: 'indices.existsAlias', params: IndicesExistsAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsAlias']>;
-    // (undocumented)
-    (endpoint: 'indices.existsTemplate', params: IndicesExistsTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsTemplate']>;
-    // (undocumented)
-    (endpoint: 'indices.existsType', params: IndicesExistsTypeParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsType']>;
-    // (undocumented)
-    (endpoint: 'indices.flush', params: IndicesFlushParams, options?: CallAPIOptions): ReturnType<Client['indices']['flush']>;
-    // (undocumented)
-    (endpoint: 'indices.flushSynced', params: IndicesFlushSyncedParams, options?: CallAPIOptions): ReturnType<Client['indices']['flushSynced']>;
-    // (undocumented)
-    (endpoint: 'indices.forcemerge', params: IndicesForcemergeParams, options?: CallAPIOptions): ReturnType<Client['indices']['forcemerge']>;
-    // (undocumented)
-    (endpoint: 'indices.get', params: IndicesGetParams, options?: CallAPIOptions): ReturnType<Client['indices']['get']>;
-    // (undocumented)
-    (endpoint: 'indices.getAlias', params: IndicesGetAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['getAlias']>;
-    // (undocumented)
-    (endpoint: 'indices.getFieldMapping', params: IndicesGetFieldMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['getFieldMapping']>;
-    // (undocumented)
-    (endpoint: 'indices.getMapping', params: IndicesGetMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['getMapping']>;
-    // (undocumented)
-    (endpoint: 'indices.getSettings', params: IndicesGetSettingsParams, options?: CallAPIOptions): ReturnType<Client['indices']['getSettings']>;
-    // (undocumented)
-    (endpoint: 'indices.getTemplate', params: IndicesGetTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['getTemplate']>;
-    // (undocumented)
-    (endpoint: 'indices.getUpgrade', params: IndicesGetUpgradeParams, options?: CallAPIOptions): ReturnType<Client['indices']['getUpgrade']>;
-    // (undocumented)
-    (endpoint: 'indices.open', params: IndicesOpenParams, options?: CallAPIOptions): ReturnType<Client['indices']['open']>;
-    // (undocumented)
-    (endpoint: 'indices.putAlias', params: IndicesPutAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['putAlias']>;
-    // (undocumented)
-    (endpoint: 'indices.putMapping', params: IndicesPutMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['putMapping']>;
-    // (undocumented)
-    (endpoint: 'indices.putSettings', params: IndicesPutSettingsParams, options?: CallAPIOptions): ReturnType<Client['indices']['putSettings']>;
-    // (undocumented)
-    (endpoint: 'indices.putTemplate', params: IndicesPutTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['putTemplate']>;
-    // (undocumented)
-    (endpoint: 'indices.recovery', params: IndicesRecoveryParams, options?: CallAPIOptions): ReturnType<Client['indices']['recovery']>;
-    // (undocumented)
-    (endpoint: 'indices.refresh', params: IndicesRefreshParams, options?: CallAPIOptions): ReturnType<Client['indices']['refresh']>;
-    // (undocumented)
-    (endpoint: 'indices.rollover', params: IndicesRolloverParams, options?: CallAPIOptions): ReturnType<Client['indices']['rollover']>;
-    // (undocumented)
-    (endpoint: 'indices.segments', params: IndicesSegmentsParams, options?: CallAPIOptions): ReturnType<Client['indices']['segments']>;
-    // (undocumented)
-    (endpoint: 'indices.shardStores', params: IndicesShardStoresParams, options?: CallAPIOptions): ReturnType<Client['indices']['shardStores']>;
-    // (undocumented)
-    (endpoint: 'indices.shrink', params: IndicesShrinkParams, options?: CallAPIOptions): ReturnType<Client['indices']['shrink']>;
-    // (undocumented)
-    (endpoint: 'indices.stats', params: IndicesStatsParams, options?: CallAPIOptions): ReturnType<Client['indices']['stats']>;
-    // (undocumented)
-    (endpoint: 'indices.updateAliases', params: IndicesUpdateAliasesParams, options?: CallAPIOptions): ReturnType<Client['indices']['updateAliases']>;
-    // (undocumented)
-    (endpoint: 'indices.upgrade', params: IndicesUpgradeParams, options?: CallAPIOptions): ReturnType<Client['indices']['upgrade']>;
-    // (undocumented)
-    (endpoint: 'indices.validateQuery', params: IndicesValidateQueryParams, options?: CallAPIOptions): ReturnType<Client['indices']['validateQuery']>;
-    // (undocumented)
-    (endpoint: 'ingest.deletePipeline', params: IngestDeletePipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['deletePipeline']>;
-    // (undocumented)
-    (endpoint: 'ingest.getPipeline', params: IngestGetPipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['getPipeline']>;
-    // (undocumented)
-    (endpoint: 'ingest.putPipeline', params: IngestPutPipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['putPipeline']>;
-    // (undocumented)
-    (endpoint: 'ingest.simulate', params: IngestSimulateParams, options?: CallAPIOptions): ReturnType<Client['ingest']['simulate']>;
-    // (undocumented)
-    (endpoint: 'nodes.hotThreads', params: NodesHotThreadsParams, options?: CallAPIOptions): ReturnType<Client['nodes']['hotThreads']>;
-    // (undocumented)
-    (endpoint: 'nodes.info', params: NodesInfoParams, options?: CallAPIOptions): ReturnType<Client['nodes']['info']>;
-    // (undocumented)
-    (endpoint: 'nodes.stats', params: NodesStatsParams, options?: CallAPIOptions): ReturnType<Client['nodes']['stats']>;
-    // (undocumented)
-    (endpoint: 'snapshot.create', params: SnapshotCreateParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['create']>;
-    // (undocumented)
-    (endpoint: 'snapshot.createRepository', params: SnapshotCreateRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['createRepository']>;
-    // (undocumented)
-    (endpoint: 'snapshot.delete', params: SnapshotDeleteParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['delete']>;
-    // (undocumented)
-    (endpoint: 'snapshot.deleteRepository', params: SnapshotDeleteRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['deleteRepository']>;
-    // (undocumented)
-    (endpoint: 'snapshot.get', params: SnapshotGetParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['get']>;
-    // (undocumented)
-    (endpoint: 'snapshot.getRepository', params: SnapshotGetRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['getRepository']>;
-    // (undocumented)
-    (endpoint: 'snapshot.restore', params: SnapshotRestoreParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['restore']>;
-    // (undocumented)
-    (endpoint: 'snapshot.status', params: SnapshotStatusParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['status']>;
-    // (undocumented)
-    (endpoint: 'snapshot.verifyRepository', params: SnapshotVerifyRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['verifyRepository']>;
-    // (undocumented)
-    (endpoint: 'tasks.cancel', params: TasksCancelParams, options?: CallAPIOptions): ReturnType<Client['tasks']['cancel']>;
-    // (undocumented)
-    (endpoint: 'tasks.get', params: TasksGetParams, options?: CallAPIOptions): ReturnType<Client['tasks']['get']>;
-    // (undocumented)
-    (endpoint: 'tasks.list', params: TasksListParams, options?: CallAPIOptions): ReturnType<Client['tasks']['list']>;
-    // (undocumented)
-    (endpoint: 'transport.request', clientParams: AssistantAPIClientParams, options?: CallAPIOptions): Promise<AssistanceAPIResponse>;
-    // (undocumented)
-    (endpoint: 'transport.request', clientParams: DeprecationAPIClientParams, options?: CallAPIOptions): Promise<DeprecationAPIResponse>;
-    // (undocumented)
-    <T = any>(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<T>;
-}
-
-// @public (undocumented)
-export interface AssistanceAPIResponse {
-    // (undocumented)
-    indices: {
-        [indexName: string]: {
-            action_required: MIGRATION_ASSISTANCE_INDEX_ACTION;
-        };
-    };
-}
-
-// @public (undocumented)
-export interface AssistantAPIClientParams extends GenericParams {
-    // (undocumented)
-    method: 'GET';
-    // (undocumented)
-    path: '/_migration/assistance';
-}
-
-// @public (undocumented)
-export interface Authenticated extends AuthResultParams {
-    // (undocumented)
-    type: AuthResultType.authenticated;
-}
-
-// @public
-export type AuthenticationHandler = (request: KibanaRequest, response: LifecycleResponseFactory, toolkit: AuthToolkit) => AuthResult | IKibanaResponse | Promise<AuthResult | IKibanaResponse>;
-
-// @public
-export type AuthHeaders = Record<string, string | string[]>;
-
-// @public (undocumented)
-export type AuthResult = Authenticated;
-
-// @public
-export interface AuthResultParams {
-    requestHeaders?: AuthHeaders;
-    responseHeaders?: AuthHeaders;
-    state?: Record<string, any>;
-}
-
-// @public (undocumented)
-export enum AuthResultType {
-    // (undocumented)
-    authenticated = "authenticated"
-}
-
-// @public
-export enum AuthStatus {
-    authenticated = "authenticated",
-    unauthenticated = "unauthenticated",
-    unknown = "unknown"
-}
-
-// @public
-export interface AuthToolkit {
-    authenticated: (data?: AuthResultParams) => AuthResult;
-}
-
-// @public
-export class BasePath {
-    // @internal
-    constructor(serverBasePath?: string);
-    get: (request: KibanaRequest<unknown, unknown, unknown, any> | LegacyRequest) => string;
-    prepend: (path: string) => string;
-    remove: (path: string) => string;
-    readonly serverBasePath: string;
-    set: (request: KibanaRequest<unknown, unknown, unknown, any> | LegacyRequest, requestSpecificBasePath: string) => void;
-}
-
-// Warning: (ae-forgotten-export) The symbol "BootstrapArgs" needs to be exported by the entry point index.d.ts
-// 
-// @internal (undocumented)
-export function bootstrap({ configs, cliArgs, applyConfigOverrides, features, }: BootstrapArgs): Promise<void>;
-
-// @public
-export interface CallAPIOptions {
-    signal?: AbortSignal;
-    wrap401Errors?: boolean;
-}
-
-// @public
-export interface Capabilities {
-    [key: string]: Record<string, boolean | Record<string, boolean>>;
-    catalogue: Record<string, boolean>;
-    management: {
-        [sectionId: string]: Record<string, boolean>;
-    };
-    navLinks: Record<string, boolean>;
-}
-
-// @public
-export type CapabilitiesProvider = () => Partial<Capabilities>;
-
-// @public
-export interface CapabilitiesSetup {
-    registerProvider(provider: CapabilitiesProvider): void;
-    registerSwitcher(switcher: CapabilitiesSwitcher): void;
-}
-
-// @public
-export interface CapabilitiesStart {
-    resolveCapabilities(request: KibanaRequest): Promise<Capabilities>;
-}
-
-// @public
-export type CapabilitiesSwitcher = (request: KibanaRequest, uiCapabilities: Capabilities) => Partial<Capabilities> | Promise<Partial<Capabilities>>;
-
-// @public
-export class ClusterClient implements IClusterClient {
-    constructor(config: ElasticsearchClientConfig, log: Logger, getAuthHeaders?: GetAuthHeaders);
-    asScoped(request?: KibanaRequest | LegacyRequest | FakeRequest): IScopedClusterClient;
-    callAsInternalUser: APICaller;
-    close(): void;
-    }
-
-// @public
-export type ConfigDeprecation = (config: Record<string, any>, fromPath: string, logger: ConfigDeprecationLogger) => Record<string, any>;
-
-// @public
-export interface ConfigDeprecationFactory {
-    rename(oldKey: string, newKey: string): ConfigDeprecation;
-    renameFromRoot(oldKey: string, newKey: string): ConfigDeprecation;
-    unused(unusedKey: string): ConfigDeprecation;
-    unusedFromRoot(unusedKey: string): ConfigDeprecation;
-}
-
-// @public
-export type ConfigDeprecationLogger = (message: string) => void;
-
-// @public
-export type ConfigDeprecationProvider = (factory: ConfigDeprecationFactory) => ConfigDeprecation[];
-
-// @public (undocumented)
-export type ConfigPath = string | string[];
-
-// @internal (undocumented)
-export class ConfigService {
-    // Warning: (ae-forgotten-export) The symbol "RawConfigurationProvider" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-forgotten-export) The symbol "Env" needs to be exported by the entry point index.d.ts
-    constructor(rawConfigProvider: RawConfigurationProvider, env: Env, logger: LoggerFactory);
-    addDeprecationProvider(path: ConfigPath, provider: ConfigDeprecationProvider): void;
-    atPath<TSchema>(path: ConfigPath): Observable<TSchema>;
-    // Warning: (ae-forgotten-export) The symbol "Config" needs to be exported by the entry point index.d.ts
-    getConfig$(): Observable<Config>;
-    // (undocumented)
-    getUnusedPaths(): Promise<string[]>;
-    // (undocumented)
-    getUsedPaths(): Promise<string[]>;
-    // (undocumented)
-    isEnabledAtPath(path: ConfigPath): Promise<boolean>;
-    optionalAtPath<TSchema>(path: ConfigPath): Observable<TSchema | undefined>;
-    setSchema(path: ConfigPath, schema: Type<unknown>): Promise<void>;
-    validate(): Promise<void>;
-    }
-
-// @public
-export interface ContextSetup {
-    createContextContainer<THandler extends HandlerFunction<any>>(): IContextContainer<THandler>;
-}
-
-// @internal (undocumented)
-export type CoreId = symbol;
-
-// @public
-export interface CoreSetup {
-    // (undocumented)
-    capabilities: CapabilitiesSetup;
-    // (undocumented)
-    context: ContextSetup;
-    // (undocumented)
-    elasticsearch: ElasticsearchServiceSetup;
-    // (undocumented)
-    http: HttpServiceSetup;
-    // (undocumented)
-    savedObjects: SavedObjectsServiceSetup;
-    // (undocumented)
-    uiSettings: UiSettingsServiceSetup;
-}
-
-// @public
-export interface CoreStart {
-    // (undocumented)
-    capabilities: CapabilitiesStart;
-    // (undocumented)
-    savedObjects: SavedObjectsServiceStart;
-}
-
-// @public
-export class CspConfig implements ICspConfig {
-    // @internal
-    constructor(rawCspConfig?: Partial<Omit<ICspConfig, 'header'>>);
-    // (undocumented)
-    static readonly DEFAULT: CspConfig;
-    // (undocumented)
-    readonly header: string;
-    // (undocumented)
-    readonly rules: string[];
-    // (undocumented)
-    readonly strict: boolean;
-    // (undocumented)
-    readonly warnLegacyBrowsers: boolean;
-}
-
-// @public
-export interface CustomHttpResponseOptions<T extends HttpResponsePayload | ResponseError> {
-    body?: T;
-    headers?: ResponseHeaders;
-    // (undocumented)
-    statusCode: number;
-}
-
-// @public (undocumented)
-export interface DeprecationAPIClientParams extends GenericParams {
-    // (undocumented)
-    method: 'GET';
-    // (undocumented)
-    path: '/_migration/deprecations';
-}
-
-// @public (undocumented)
-export interface DeprecationAPIResponse {
-    // (undocumented)
-    cluster_settings: DeprecationInfo[];
-    // (undocumented)
-    index_settings: IndexSettingsDeprecationInfo;
-    // (undocumented)
-    ml_settings: DeprecationInfo[];
-    // (undocumented)
-    node_settings: DeprecationInfo[];
-}
-
-// @public (undocumented)
-export interface DeprecationInfo {
-    // (undocumented)
-    details?: string;
-    // (undocumented)
-    level: MIGRATION_DEPRECATION_LEVEL;
-    // (undocumented)
-    message: string;
-    // (undocumented)
-    url: string;
-}
-
-// @public
-export interface DiscoveredPlugin {
-    readonly configPath: ConfigPath;
-    readonly id: PluginName;
-    readonly optionalPlugins: readonly PluginName[];
-    readonly requiredPlugins: readonly PluginName[];
-}
-
-// Warning: (ae-forgotten-export) The symbol "ElasticsearchConfig" needs to be exported by the entry point index.d.ts
-// 
-// @public (undocumented)
-export type ElasticsearchClientConfig = Pick<ConfigOptions, 'keepAlive' | 'log' | 'plugins'> & Pick<ElasticsearchConfig, 'apiVersion' | 'customHeaders' | 'logQueries' | 'requestHeadersWhitelist' | 'sniffOnStart' | 'sniffOnConnectionFault' | 'hosts' | 'username' | 'password'> & {
-    pingTimeout?: ElasticsearchConfig['pingTimeout'] | ConfigOptions['pingTimeout'];
-    requestTimeout?: ElasticsearchConfig['requestTimeout'] | ConfigOptions['requestTimeout'];
-    sniffInterval?: ElasticsearchConfig['sniffInterval'] | ConfigOptions['sniffInterval'];
-    ssl?: Partial<ElasticsearchConfig['ssl']>;
-};
-
-// @public (undocumented)
-export interface ElasticsearchError extends Boom {
-    // (undocumented)
-    [code]?: string;
-}
-
-// @public
-export class ElasticsearchErrorHelpers {
-    // (undocumented)
-    static decorateNotAuthorizedError(error: Error, reason?: string): ElasticsearchError;
-    // (undocumented)
-    static isNotAuthorizedError(error: any): error is ElasticsearchError;
-}
-
-// @public (undocumented)
-export interface ElasticsearchServiceSetup {
-    readonly adminClient$: Observable<IClusterClient>;
-    readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => IClusterClient;
-    readonly dataClient$: Observable<IClusterClient>;
-}
-
-// @public (undocumented)
-export interface EnvironmentMode {
-    // (undocumented)
-    dev: boolean;
-    // (undocumented)
-    name: 'development' | 'production';
-    // (undocumented)
-    prod: boolean;
-}
-
-// @public
-export interface ErrorHttpResponseOptions {
-    body?: ResponseError;
-    headers?: ResponseHeaders;
-}
-
-// @public
-export interface FakeRequest {
-    headers: Headers;
-}
-
-// @public
-export type GetAuthHeaders = (request: KibanaRequest | LegacyRequest) => AuthHeaders | undefined;
-
-// @public
-export type GetAuthState = (request: KibanaRequest | LegacyRequest) => {
-    status: AuthStatus;
-    state: unknown;
-};
-
-// @public
-export type HandlerContextType<T extends HandlerFunction<any>> = T extends HandlerFunction<infer U> ? U : never;
-
-// @public
-export type HandlerFunction<T extends object> = (context: T, ...args: any[]) => any;
-
-// @public
-export type HandlerParameters<T extends HandlerFunction<any>> = T extends (context: any, ...args: infer U) => any ? U : never;
-
-// @public
-export type Headers = {
-    [header in KnownHeaders]?: string | string[] | undefined;
-} & {
-    [header: string]: string | string[] | undefined;
-};
-
-// @public
-export interface HttpResponseOptions {
-    body?: HttpResponsePayload;
-    headers?: ResponseHeaders;
-}
-
-// @public
-export type HttpResponsePayload = undefined | string | Record<string, any> | Buffer | Stream;
-
-// @public
-export interface HttpServiceSetup {
-    basePath: IBasePath;
-    createCookieSessionStorageFactory: <T>(cookieOptions: SessionStorageCookieOptions<T>) => Promise<SessionStorageFactory<T>>;
-    createRouter: () => IRouter;
-    csp: ICspConfig;
-    isTlsEnabled: boolean;
-    registerAuth: (handler: AuthenticationHandler) => void;
-    registerOnPostAuth: (handler: OnPostAuthHandler) => void;
-    registerOnPreAuth: (handler: OnPreAuthHandler) => void;
-    registerOnPreResponse: (handler: OnPreResponseHandler) => void;
-    registerRouteHandlerContext: <T extends keyof RequestHandlerContext>(contextName: T, provider: RequestHandlerContextProvider<T>) => RequestHandlerContextContainer;
-}
-
-// @public (undocumented)
-export interface HttpServiceStart {
-    isListening: (port: number) => boolean;
-}
-
-// @public
-export type IBasePath = Pick<BasePath, keyof BasePath>;
-
-// @public
-export type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
-
-// @public
-export interface IContextContainer<THandler extends HandlerFunction<any>> {
-    createHandler(pluginOpaqueId: PluginOpaqueId, handler: THandler): (...rest: HandlerParameters<THandler>) => ShallowPromise<ReturnType<THandler>>;
-    registerContext<TContextName extends keyof HandlerContextType<THandler>>(pluginOpaqueId: PluginOpaqueId, contextName: TContextName, provider: IContextProvider<THandler, TContextName>): this;
-}
-
-// @public
-export type IContextProvider<THandler extends HandlerFunction<any>, TContextName extends keyof HandlerContextType<THandler>> = (context: Partial<HandlerContextType<THandler>>, ...rest: HandlerParameters<THandler>) => Promise<HandlerContextType<THandler>[TContextName]> | HandlerContextType<THandler>[TContextName];
-
-// @public
-export interface ICspConfig {
-    readonly header: string;
-    readonly rules: string[];
-    readonly strict: boolean;
-    readonly warnLegacyBrowsers: boolean;
-}
-
-// @public
-export interface IKibanaResponse<T extends HttpResponsePayload | ResponseError = any> {
-    // (undocumented)
-    readonly options: HttpResponseOptions;
-    // (undocumented)
-    readonly payload?: T;
-    // (undocumented)
-    readonly status: number;
-}
-
-// @public
-export interface IKibanaSocket {
-    readonly authorizationError?: Error;
-    readonly authorized?: boolean;
-    // (undocumented)
-    getPeerCertificate(detailed: true): DetailedPeerCertificate | null;
-    // (undocumented)
-    getPeerCertificate(detailed: false): PeerCertificate | null;
-    getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate | null;
-}
-
-// @public (undocumented)
-export interface IndexSettingsDeprecationInfo {
-    // (undocumented)
-    [indexName: string]: DeprecationInfo[];
-}
-
-// @public
-export interface IRouter {
-    delete: RouteRegistrar<'delete'>;
-    get: RouteRegistrar<'get'>;
-    // Warning: (ae-forgotten-export) The symbol "RouterRoute" needs to be exported by the entry point index.d.ts
-    // 
-    // @internal
-    getRoutes: () => RouterRoute[];
-    handleLegacyErrors: <P extends ObjectType, Q extends ObjectType, B extends ObjectType>(handler: RequestHandler<P, Q, B>) => RequestHandler<P, Q, B>;
-    patch: RouteRegistrar<'patch'>;
-    post: RouteRegistrar<'post'>;
-    put: RouteRegistrar<'put'>;
-    routerPath: string;
-}
-
-// @public
-export type IsAuthenticated = (request: KibanaRequest | LegacyRequest) => boolean;
-
-// @public
-export type ISavedObjectsRepository = Pick<SavedObjectsRepository, keyof SavedObjectsRepository>;
-
-// @public
-export type IScopedClusterClient = Pick<ScopedClusterClient, 'callAsCurrentUser' | 'callAsInternalUser'>;
-
-// @public
-export interface IUiSettingsClient {
-    get: <T = any>(key: string) => Promise<T>;
-    getAll: <T = any>() => Promise<Record<string, T>>;
-    getRegistered: () => Readonly<Record<string, UiSettingsParams>>;
-    getUserProvided: <T = any>() => Promise<Record<string, UserProvidedValues<T>>>;
-    isOverridden: (key: string) => boolean;
-    remove: (key: string) => Promise<void>;
-    removeMany: (keys: string[]) => Promise<void>;
-    set: (key: string, value: any) => Promise<void>;
-    setMany: (changes: Record<string, any>) => Promise<void>;
-}
-
-// @public
-export class KibanaRequest<Params = unknown, Query = unknown, Body = unknown, Method extends RouteMethod = any> {
-    // @internal (undocumented)
-    protected readonly [requestSymbol]: Request;
-    constructor(request: Request, params: Params, query: Query, body: Body, withoutSecretHeaders: boolean);
-    // (undocumented)
-    readonly body: Body;
-    // @internal
-    static from<P extends ObjectType, Q extends ObjectType, B extends ObjectType | Type<Buffer> | Type<Stream>>(req: Request, routeSchemas?: RouteSchemas<P, Q, B>, withoutSecretHeaders?: boolean): KibanaRequest<P["type"], Q["type"], B["type"], any>;
-    readonly headers: Headers;
-    // (undocumented)
-    readonly params: Params;
-    // (undocumented)
-    readonly query: Query;
-    readonly route: RecursiveReadonly<KibanaRequestRoute<Method>>;
-    // (undocumented)
-    readonly socket: IKibanaSocket;
-    readonly url: Url;
-    }
-
-// @public
-export interface KibanaRequestRoute<Method extends RouteMethod> {
-    // (undocumented)
-    method: Method;
-    // (undocumented)
-    options: KibanaRequestRouteOptions<Method>;
-    // (undocumented)
-    path: string;
-}
-
-// @public
-export type KibanaRequestRouteOptions<Method extends RouteMethod> = Method extends 'get' | 'options' ? Required<Omit<RouteConfigOptions<Method>, 'body'>> : Required<RouteConfigOptions<Method>>;
-
-// @public
-export type KibanaResponseFactory = typeof kibanaResponseFactory;
-
-// @public
-export const kibanaResponseFactory: {
-    custom: <T extends string | Error | Record<string, any> | Buffer | Stream | {
-        message: string | Error;
-        attributes?: Record<string, any> | undefined;
-    } | undefined>(options: CustomHttpResponseOptions<T>) => KibanaResponse<T>;
-    badRequest: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
-    unauthorized: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
-    forbidden: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
-    notFound: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
-    conflict: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
-    internalError: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
-    customError: (options: CustomHttpResponseOptions<ResponseError>) => KibanaResponse<ResponseError>;
-    redirected: (options: RedirectResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
-    ok: (options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
-    accepted: (options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
-    noContent: (options?: HttpResponseOptions) => KibanaResponse<undefined>;
-};
-
-// Warning: (ae-forgotten-export) The symbol "KnownKeys" needs to be exported by the entry point index.d.ts
-// 
-// @public
-export type KnownHeaders = KnownKeys<IncomingHttpHeaders>;
-
-// @public @deprecated (undocumented)
-export interface LegacyRequest extends Request {
-}
-
-// @public @deprecated (undocumented)
-export interface LegacyServiceSetupDeps {
-    // Warning: (ae-forgotten-export) The symbol "InternalCoreSetup" needs to be exported by the entry point index.d.ts
-    // 
-    // (undocumented)
-    core: InternalCoreSetup & {
-        plugins: PluginsServiceSetup;
-    };
-    // (undocumented)
-    plugins: Record<string, unknown>;
-}
-
-// @public @deprecated (undocumented)
-export interface LegacyServiceStartDeps {
-    // Warning: (ae-forgotten-export) The symbol "InternalCoreStart" needs to be exported by the entry point index.d.ts
-    // 
-    // (undocumented)
-    core: InternalCoreStart & {
-        plugins: PluginsServiceStart;
-    };
-    // (undocumented)
-    plugins: Record<string, unknown>;
-}
-
-// Warning: (ae-forgotten-export) The symbol "lifecycleResponseFactory" needs to be exported by the entry point index.d.ts
-// 
-// @public
-export type LifecycleResponseFactory = typeof lifecycleResponseFactory;
-
-// @public
-export interface Logger {
-    debug(message: string, meta?: LogMeta): void;
-    error(errorOrMessage: string | Error, meta?: LogMeta): void;
-    fatal(errorOrMessage: string | Error, meta?: LogMeta): void;
-    get(...childContextPaths: string[]): Logger;
-    info(message: string, meta?: LogMeta): void;
-    // @internal (undocumented)
-    log(record: LogRecord): void;
-    trace(message: string, meta?: LogMeta): void;
-    warn(errorOrMessage: string | Error, meta?: LogMeta): void;
-}
-
-// @public
-export interface LoggerFactory {
-    get(...contextParts: string[]): Logger;
-}
-
-// @internal
-export class LogLevel {
-    // (undocumented)
-    static readonly All: LogLevel;
-    // (undocumented)
-    static readonly Debug: LogLevel;
-    // (undocumented)
-    static readonly Error: LogLevel;
-    // (undocumented)
-    static readonly Fatal: LogLevel;
-    static fromId(level: LogLevelId): LogLevel;
-    // Warning: (ae-forgotten-export) The symbol "LogLevelId" needs to be exported by the entry point index.d.ts
-    // 
-    // (undocumented)
-    readonly id: LogLevelId;
-    // (undocumented)
-    static readonly Info: LogLevel;
-    // (undocumented)
-    static readonly Off: LogLevel;
-    supports(level: LogLevel): boolean;
-    // (undocumented)
-    static readonly Trace: LogLevel;
-    // (undocumented)
-    readonly value: number;
-    // (undocumented)
-    static readonly Warn: LogLevel;
-}
-
-// @public
-export interface LogMeta {
-    // (undocumented)
-    [key: string]: any;
-}
-
-// @internal
-export interface LogRecord {
-    // (undocumented)
-    context: string;
-    // (undocumented)
-    error?: Error;
-    // (undocumented)
-    level: LogLevel;
-    // (undocumented)
-    message: string;
-    // (undocumented)
-    meta?: {
-        [name: string]: any;
-    };
-    // (undocumented)
-    timestamp: Date;
-}
-
-// @public (undocumented)
-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
-export type OnPostAuthHandler = (request: KibanaRequest, response: LifecycleResponseFactory, toolkit: OnPostAuthToolkit) => OnPostAuthResult | KibanaResponse | Promise<OnPostAuthResult | KibanaResponse>;
-
-// @public
-export interface OnPostAuthToolkit {
-    next: () => OnPostAuthResult;
-}
-
-// Warning: (ae-forgotten-export) The symbol "OnPreAuthResult" needs to be exported by the entry point index.d.ts
-// 
-// @public
-export type OnPreAuthHandler = (request: KibanaRequest, response: LifecycleResponseFactory, toolkit: OnPreAuthToolkit) => OnPreAuthResult | KibanaResponse | Promise<OnPreAuthResult | KibanaResponse>;
-
-// @public
-export interface OnPreAuthToolkit {
-    next: () => OnPreAuthResult;
-    rewriteUrl: (url: string) => OnPreAuthResult;
-}
-
-// @public
-export interface OnPreResponseExtensions {
-    headers?: ResponseHeaders;
-}
-
-// Warning: (ae-forgotten-export) The symbol "OnPreResponseResult" needs to be exported by the entry point index.d.ts
-// 
-// @public
-export type OnPreResponseHandler = (request: KibanaRequest, preResponse: OnPreResponseInfo, toolkit: OnPreResponseToolkit) => OnPreResponseResult | Promise<OnPreResponseResult>;
-
-// @public
-export interface OnPreResponseInfo {
-    // (undocumented)
-    statusCode: number;
-}
-
-// @public
-export interface OnPreResponseToolkit {
-    next: (responseExtensions?: OnPreResponseExtensions) => OnPreResponseResult;
-}
-
-// @public (undocumented)
-export interface PackageInfo {
-    // (undocumented)
-    branch: string;
-    // (undocumented)
-    buildNum: number;
-    // (undocumented)
-    buildSha: string;
-    // (undocumented)
-    dist: boolean;
-    // (undocumented)
-    version: string;
-}
-
-// @public
-export interface Plugin<TSetup = void, TStart = void, TPluginsSetup extends object = object, TPluginsStart extends object = object> {
-    // (undocumented)
-    setup(core: CoreSetup, plugins: TPluginsSetup): TSetup | Promise<TSetup>;
-    // (undocumented)
-    start(core: CoreStart, plugins: TPluginsStart): TStart | Promise<TStart>;
-    // (undocumented)
-    stop?(): void;
-}
-
-// @public
-export interface PluginConfigDescriptor<T = any> {
-    deprecations?: ConfigDeprecationProvider;
-    exposeToBrowser?: {
-        [P in keyof T]?: boolean;
-    };
-    schema: PluginConfigSchema<T>;
-}
-
-// @public
-export type PluginConfigSchema<T> = Type<T>;
-
-// @public
-export type PluginInitializer<TSetup, TStart, TPluginsSetup extends object = object, TPluginsStart extends object = object> = (core: PluginInitializerContext) => Plugin<TSetup, TStart, TPluginsSetup, TPluginsStart>;
-
-// @public
-export interface PluginInitializerContext<ConfigSchema = unknown> {
-    // (undocumented)
-    config: {
-        legacy: {
-            globalConfig$: Observable<SharedGlobalConfig>;
-        };
-        create: <T = ConfigSchema>() => Observable<T>;
-        createIfExists: <T = ConfigSchema>() => Observable<T | undefined>;
-    };
-    // (undocumented)
-    env: {
-        mode: EnvironmentMode;
-        packageInfo: Readonly<PackageInfo>;
-    };
-    // (undocumented)
-    logger: LoggerFactory;
-    // (undocumented)
-    opaqueId: PluginOpaqueId;
-}
-
-// @public
-export interface PluginManifest {
-    readonly configPath: ConfigPath;
-    readonly id: PluginName;
-    readonly kibanaVersion: string;
-    readonly optionalPlugins: readonly PluginName[];
-    readonly requiredPlugins: readonly PluginName[];
-    readonly server: boolean;
-    readonly ui: boolean;
-    readonly version: string;
-}
-
-// @public
-export type PluginName = string;
-
-// @public (undocumented)
-export type PluginOpaqueId = symbol;
-
-// @public (undocumented)
-export interface PluginsServiceSetup {
-    // (undocumented)
-    contracts: Map<PluginName, unknown>;
-    // (undocumented)
-    uiPlugins: {
-        internal: Map<PluginName, InternalPluginInfo>;
-        public: Map<PluginName, DiscoveredPlugin>;
-        browserConfigs: Map<PluginName, Observable<unknown>>;
-    };
-}
-
-// @public (undocumented)
-export interface PluginsServiceStart {
-    // (undocumented)
-    contracts: Map<PluginName, unknown>;
-}
-
-// Warning: (ae-forgotten-export) The symbol "RecursiveReadonlyArray" needs to be exported by the entry point index.d.ts
-// 
-// @public (undocumented)
-export type RecursiveReadonly<T> = T extends (...args: any[]) => any ? T : T extends any[] ? RecursiveReadonlyArray<T[number]> : T extends object ? Readonly<{
-    [K in keyof T]: RecursiveReadonly<T[K]>;
-}> : T;
-
-// @public
-export type RedirectResponseOptions = HttpResponseOptions & {
-    headers: {
-        location: string;
-    };
-};
-
-// @public
-export type RequestHandler<P extends ObjectType, Q extends ObjectType, B extends ObjectType | Type<Buffer> | Type<Stream>, Method extends RouteMethod = any> = (context: RequestHandlerContext, request: KibanaRequest<TypeOf<P>, TypeOf<Q>, TypeOf<B>, Method>, response: KibanaResponseFactory) => IKibanaResponse<any> | Promise<IKibanaResponse<any>>;
-
-// @public
-export interface RequestHandlerContext {
-    // (undocumented)
-    core: {
-        savedObjects: {
-            client: SavedObjectsClientContract;
-        };
-        elasticsearch: {
-            dataClient: IScopedClusterClient;
-            adminClient: IScopedClusterClient;
-        };
-        uiSettings: {
-            client: IUiSettingsClient;
-        };
-    };
-}
-
-// @public
-export type RequestHandlerContextContainer = IContextContainer<RequestHandler<any, any, any>>;
-
-// @public
-export type RequestHandlerContextProvider<TContextName extends keyof RequestHandlerContext> = IContextProvider<RequestHandler<any, any, any>, TContextName>;
-
-// @public
-export type ResponseError = string | Error | {
-    message: string | Error;
-    attributes?: ResponseErrorAttributes;
-};
-
-// @public
-export type ResponseErrorAttributes = Record<string, any>;
-
-// @public
-export type ResponseHeaders = {
-    [header in KnownHeaders]?: string | string[];
-} & {
-    [header: string]: string | string[];
-};
-
-// @public
-export interface RouteConfig<P extends ObjectType, Q extends ObjectType, B extends ObjectType | Type<Buffer> | Type<Stream>, Method extends RouteMethod> {
-    options?: RouteConfigOptions<Method>;
-    path: string;
-    validate: RouteSchemas<P, Q, B> | false;
-}
-
-// @public
-export interface RouteConfigOptions<Method extends RouteMethod> {
-    authRequired?: boolean;
-    body?: Method extends 'get' | 'options' ? undefined : RouteConfigOptionsBody;
-    tags?: readonly string[];
-}
-
-// @public
-export interface RouteConfigOptionsBody {
-    accepts?: RouteContentType | RouteContentType[] | string | string[];
-    maxBytes?: number;
-    output?: typeof validBodyOutput[number];
-    parse?: boolean | 'gunzip';
-}
-
-// @public
-export type RouteContentType = 'application/json' | 'application/*+json' | 'application/octet-stream' | 'application/x-www-form-urlencoded' | 'multipart/form-data' | 'text/*';
-
-// @public
-export type RouteMethod = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options';
-
-// @public
-export type RouteRegistrar<Method extends RouteMethod> = <P extends ObjectType, Q extends ObjectType, B extends ObjectType | Type<Buffer> | Type<Stream>>(route: RouteConfig<P, Q, B, Method>, handler: RequestHandler<P, Q, B, Method>) => void;
-
-// @public
-export interface RouteSchemas<P extends ObjectType, Q extends ObjectType, B extends ObjectType | Type<Buffer> | Type<Stream>> {
-    // (undocumented)
-    body?: B;
-    // (undocumented)
-    params?: P;
-    // (undocumented)
-    query?: Q;
-}
-
-// @public (undocumented)
-export interface SavedObject<T extends SavedObjectAttributes = any> {
-    attributes: T;
-    // (undocumented)
-    error?: {
-        message: string;
-        statusCode: number;
-    };
-    id: string;
-    migrationVersion?: SavedObjectsMigrationVersion;
-    references: SavedObjectReference[];
-    type: string;
-    updated_at?: string;
-    version?: string;
-}
-
-// @public
-export type SavedObjectAttribute = SavedObjectAttributeSingle | SavedObjectAttributeSingle[];
-
-// @public
-export interface SavedObjectAttributes {
-    // (undocumented)
-    [key: string]: SavedObjectAttribute;
-}
-
-// @public
-export type SavedObjectAttributeSingle = string | number | boolean | null | undefined | SavedObjectAttributes;
-
-// @public
-export interface SavedObjectReference {
-    // (undocumented)
-    id: string;
-    // (undocumented)
-    name: string;
-    // (undocumented)
-    type: string;
-}
-
-// @public (undocumented)
-export interface SavedObjectsBaseOptions {
-    namespace?: string;
-}
-
-// @public (undocumented)
-export interface SavedObjectsBulkCreateObject<T extends SavedObjectAttributes = any> {
-    // (undocumented)
-    attributes: T;
-    // (undocumented)
-    id?: string;
-    migrationVersion?: SavedObjectsMigrationVersion;
-    // (undocumented)
-    references?: SavedObjectReference[];
-    // (undocumented)
-    type: string;
-}
-
-// @public (undocumented)
-export interface SavedObjectsBulkGetObject {
-    fields?: string[];
-    // (undocumented)
-    id: string;
-    // (undocumented)
-    type: string;
-}
-
-// @public (undocumented)
-export interface SavedObjectsBulkResponse<T extends SavedObjectAttributes = any> {
-    // (undocumented)
-    saved_objects: Array<SavedObject<T>>;
-}
-
-// @public (undocumented)
-export interface SavedObjectsBulkResponse<T extends SavedObjectAttributes = any> {
-    // (undocumented)
-    saved_objects: Array<SavedObject<T>>;
-}
-
-// @public (undocumented)
-export interface SavedObjectsBulkUpdateObject<T extends SavedObjectAttributes = any> extends Pick<SavedObjectsUpdateOptions, 'version' | 'references'> {
-    attributes: Partial<T>;
-    id: string;
-    type: string;
-}
-
-// @public (undocumented)
-export interface SavedObjectsBulkUpdateOptions extends SavedObjectsBaseOptions {
-    refresh?: MutatingOperationRefreshSetting;
-}
-
-// @public (undocumented)
-export interface SavedObjectsBulkUpdateResponse<T extends SavedObjectAttributes = any> {
-    // (undocumented)
-    saved_objects: Array<SavedObjectsUpdateResponse<T>>;
-}
-
-// @public (undocumented)
-export class SavedObjectsClient {
-    // @internal
-    constructor(repository: ISavedObjectsRepository);
-    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?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
-    create<T extends SavedObjectAttributes = any>(type: string, attributes: T, options?: SavedObjectsCreateOptions): Promise<SavedObject<T>>;
-    delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
-    // (undocumented)
-    errors: typeof SavedObjectsErrorHelpers;
-    // (undocumented)
-    static errors: typeof SavedObjectsErrorHelpers;
-    find<T extends SavedObjectAttributes = any>(options: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
-    get<T extends SavedObjectAttributes = any>(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<SavedObject<T>>;
-    update<T extends SavedObjectAttributes = any>(type: string, id: string, attributes: Partial<T>, options?: SavedObjectsUpdateOptions): Promise<SavedObjectsUpdateResponse<T>>;
-}
-
-// @public
-export type SavedObjectsClientContract = Pick<SavedObjectsClient, keyof SavedObjectsClient>;
-
-// @public
-export type SavedObjectsClientFactory<Request = unknown> = ({ request, }: {
-    request: Request;
-}) => SavedObjectsClientContract;
-
-// @public
-export interface SavedObjectsClientProviderOptions {
-    // (undocumented)
-    excludedWrappers?: string[];
-}
-
-// @public
-export type SavedObjectsClientWrapperFactory<Request = unknown> = (options: SavedObjectsClientWrapperOptions<Request>) => SavedObjectsClientContract;
-
-// @public
-export interface SavedObjectsClientWrapperOptions<Request = unknown> {
-    // (undocumented)
-    client: SavedObjectsClientContract;
-    // (undocumented)
-    request: Request;
-}
-
-// @public (undocumented)
-export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions {
-    id?: string;
-    migrationVersion?: SavedObjectsMigrationVersion;
-    overwrite?: boolean;
-    // (undocumented)
-    references?: SavedObjectReference[];
-    refresh?: MutatingOperationRefreshSetting;
-}
-
-// @public (undocumented)
-export interface SavedObjectsDeleteByNamespaceOptions extends SavedObjectsBaseOptions {
-    refresh?: MutatingOperationRefreshSetting;
-}
-
-// @public (undocumented)
-export interface SavedObjectsDeleteOptions extends SavedObjectsBaseOptions {
-    refresh?: MutatingOperationRefreshSetting;
-}
-
-// @public (undocumented)
-export class SavedObjectsErrorHelpers {
-    // (undocumented)
-    static createBadRequestError(reason?: string): DecoratedError;
-    // (undocumented)
-    static createEsAutoCreateIndexError(): DecoratedError;
-    // (undocumented)
-    static createGenericNotFoundError(type?: string | null, id?: string | null): DecoratedError;
-    // (undocumented)
-    static createInvalidVersionError(versionInput?: string): DecoratedError;
-    // (undocumented)
-    static createUnsupportedTypeError(type: string): DecoratedError;
-    // (undocumented)
-    static decorateBadRequestError(error: Error, reason?: string): DecoratedError;
-    // (undocumented)
-    static decorateConflictError(error: Error, reason?: string): DecoratedError;
-    // (undocumented)
-    static decorateEsUnavailableError(error: Error, reason?: string): DecoratedError;
-    // (undocumented)
-    static decorateForbiddenError(error: Error, reason?: string): DecoratedError;
-    // (undocumented)
-    static decorateGeneralError(error: Error, reason?: string): DecoratedError;
-    // (undocumented)
-    static decorateNotAuthorizedError(error: Error, reason?: string): DecoratedError;
-    // (undocumented)
-    static decorateRequestEntityTooLargeError(error: Error, reason?: string): DecoratedError;
-    // (undocumented)
-    static isBadRequestError(error: Error | DecoratedError): boolean;
-    // (undocumented)
-    static isConflictError(error: Error | DecoratedError): boolean;
-    // (undocumented)
-    static isEsAutoCreateIndexError(error: Error | DecoratedError): boolean;
-    // (undocumented)
-    static isEsUnavailableError(error: Error | DecoratedError): boolean;
-    // (undocumented)
-    static isForbiddenError(error: Error | DecoratedError): boolean;
-    // (undocumented)
-    static isInvalidVersionError(error: Error | DecoratedError): boolean;
-    // (undocumented)
-    static isNotAuthorizedError(error: Error | DecoratedError): boolean;
-    // (undocumented)
-    static isNotFoundError(error: Error | DecoratedError): boolean;
-    // (undocumented)
-    static isRequestEntityTooLargeError(error: Error | DecoratedError): boolean;
-    // Warning: (ae-forgotten-export) The symbol "DecoratedError" needs to be exported by the entry point index.d.ts
-    // 
-    // (undocumented)
-    static isSavedObjectsClientError(error: any): error is DecoratedError;
-}
-
-// @public
-export interface SavedObjectsExportOptions {
-    excludeExportDetails?: boolean;
-    exportSizeLimit: number;
-    includeReferencesDeep?: boolean;
-    namespace?: string;
-    objects?: Array<{
-        id: string;
-        type: string;
-    }>;
-    savedObjectsClient: SavedObjectsClientContract;
-    search?: string;
-    types?: string[];
-}
-
-// @public
-export interface SavedObjectsExportResultDetails {
-    exportedCount: number;
-    missingRefCount: number;
-    missingReferences: Array<{
-        id: string;
-        type: string;
-    }>;
-}
-
-// @public (undocumented)
-export interface SavedObjectsFindOptions extends SavedObjectsBaseOptions {
-    // (undocumented)
-    defaultSearchOperator?: 'AND' | 'OR';
-    fields?: string[];
-    // (undocumented)
-    filter?: string;
-    // (undocumented)
-    hasReference?: {
-        type: string;
-        id: string;
-    };
-    // (undocumented)
-    page?: number;
-    // (undocumented)
-    perPage?: number;
-    search?: string;
-    searchFields?: string[];
-    // (undocumented)
-    sortField?: string;
-    // (undocumented)
-    sortOrder?: string;
-    // (undocumented)
-    type: string | string[];
-}
-
-// @public
-export interface SavedObjectsFindResponse<T extends SavedObjectAttributes = any> {
-    // (undocumented)
-    page: number;
-    // (undocumented)
-    per_page: number;
-    // (undocumented)
-    saved_objects: Array<SavedObject<T>>;
-    // (undocumented)
-    total: number;
-}
-
-// @public
-export interface SavedObjectsImportConflictError {
-    // (undocumented)
-    type: 'conflict';
-}
-
-// @public
-export interface SavedObjectsImportError {
-    // (undocumented)
-    error: SavedObjectsImportConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
-    // (undocumented)
-    id: string;
-    // (undocumented)
-    title?: string;
-    // (undocumented)
-    type: string;
-}
-
-// @public
-export interface SavedObjectsImportMissingReferencesError {
-    // (undocumented)
-    blocking: Array<{
-        type: string;
-        id: string;
-    }>;
-    // (undocumented)
-    references: Array<{
-        type: string;
-        id: string;
-    }>;
-    // (undocumented)
-    type: 'missing_references';
-}
-
-// @public
-export interface SavedObjectsImportOptions {
-    // (undocumented)
-    namespace?: string;
-    // (undocumented)
-    objectLimit: number;
-    // (undocumented)
-    overwrite: boolean;
-    // (undocumented)
-    readStream: Readable;
-    // (undocumented)
-    savedObjectsClient: SavedObjectsClientContract;
-    // (undocumented)
-    supportedTypes: string[];
-}
-
-// @public
-export interface SavedObjectsImportResponse {
-    // (undocumented)
-    errors?: SavedObjectsImportError[];
-    // (undocumented)
-    success: boolean;
-    // (undocumented)
-    successCount: number;
-}
-
-// @public
-export interface SavedObjectsImportRetry {
-    // (undocumented)
-    id: string;
-    // (undocumented)
-    overwrite: boolean;
-    // (undocumented)
-    replaceReferences: Array<{
-        type: string;
-        from: string;
-        to: string;
-    }>;
-    // (undocumented)
-    type: string;
-}
-
-// @public
-export interface SavedObjectsImportUnknownError {
-    // (undocumented)
-    message: string;
-    // (undocumented)
-    statusCode: number;
-    // (undocumented)
-    type: 'unknown';
-}
-
-// @public
-export interface SavedObjectsImportUnsupportedTypeError {
-    // (undocumented)
-    type: 'unsupported_type';
-}
-
-// @public (undocumented)
-export interface SavedObjectsIncrementCounterOptions extends SavedObjectsBaseOptions {
-    // (undocumented)
-    migrationVersion?: SavedObjectsMigrationVersion;
-    refresh?: MutatingOperationRefreshSetting;
-}
-
-// @internal @deprecated (undocumented)
-export interface SavedObjectsLegacyService<Request = any> {
-    // Warning: (ae-forgotten-export) The symbol "SavedObjectsClientProvider" needs to be exported by the entry point index.d.ts
-    // 
-    // (undocumented)
-    addScopedSavedObjectsClientWrapperFactory: SavedObjectsClientProvider<Request>['addClientWrapperFactory'];
-    // (undocumented)
-    getSavedObjectsRepository(...rest: any[]): any;
-    // (undocumented)
-    getScopedSavedObjectsClient: SavedObjectsClientProvider<Request>['getClient'];
-    // (undocumented)
-    importExport: {
-        objectLimit: number;
-        importSavedObjects(options: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;
-        resolveImportErrors(options: SavedObjectsResolveImportErrorsOptions): Promise<SavedObjectsImportResponse>;
-        getSortedObjectsForExport(options: SavedObjectsExportOptions): Promise<Readable>;
-    };
-    // (undocumented)
-    SavedObjectsClient: typeof SavedObjectsClient;
-    // (undocumented)
-    schema: SavedObjectsSchema;
-    // (undocumented)
-    setScopedSavedObjectsClientFactory: SavedObjectsClientProvider<Request>['setClientFactory'];
-    // (undocumented)
-    types: string[];
-}
-
-// @public (undocumented)
-export interface SavedObjectsMigrationLogger {
-    // (undocumented)
-    debug: (msg: string) => void;
-    // (undocumented)
-    info: (msg: string) => void;
-    // (undocumented)
-    warning: (msg: string) => void;
-}
-
-// @public
-export interface SavedObjectsMigrationVersion {
-    // (undocumented)
-    [pluginName: string]: string;
-}
-
-// Warning: (ae-missing-release-tag) "RawDoc" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-// 
-// @public
-export interface SavedObjectsRawDoc {
-    // (undocumented)
-    _id: string;
-    // (undocumented)
-    _primary_term?: number;
-    // (undocumented)
-    _seq_no?: number;
-    // (undocumented)
-    _source: any;
-    // (undocumented)
-    _type?: string;
-}
-
-// @public (undocumented)
-export class 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?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
-    create<T extends SavedObjectAttributes>(type: string, attributes: T, options?: SavedObjectsCreateOptions): Promise<SavedObject<T>>;
-    // Warning: (ae-forgotten-export) The symbol "KibanaMigrator" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-forgotten-export) The symbol "LegacyConfig" needs to be exported by the entry point index.d.ts
-    // 
-    // @internal
-    static createRepository(migrator: KibanaMigrator, schema: SavedObjectsSchema, config: LegacyConfig, indexName: string, callCluster: APICaller, extraTypes?: string[], injectedConstructor?: any): any;
-    delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
-    deleteByNamespace(namespace: string, options?: SavedObjectsDeleteByNamespaceOptions): Promise<any>;
-    // (undocumented)
-    find<T extends SavedObjectAttributes = any>({ search, defaultSearchOperator, searchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespace, type, filter, }: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
-    get<T extends SavedObjectAttributes = any>(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<SavedObject<T>>;
-    incrementCounter(type: string, id: string, counterFieldName: string, options?: SavedObjectsIncrementCounterOptions): Promise<{
-        id: string;
-        type: string;
-        updated_at: string;
-        references: any;
-        version: string;
-        attributes: any;
-    }>;
-    update<T extends SavedObjectAttributes = any>(type: string, id: string, attributes: Partial<T>, options?: SavedObjectsUpdateOptions): Promise<SavedObjectsUpdateResponse<T>>;
-    }
-
-// @public
-export interface SavedObjectsResolveImportErrorsOptions {
-    // (undocumented)
-    namespace?: string;
-    // (undocumented)
-    objectLimit: number;
-    // (undocumented)
-    readStream: Readable;
-    // (undocumented)
-    retries: SavedObjectsImportRetry[];
-    // (undocumented)
-    savedObjectsClient: SavedObjectsClientContract;
-    // (undocumented)
-    supportedTypes: string[];
-}
-
-// @internal (undocumented)
-export class SavedObjectsSchema {
-    // Warning: (ae-forgotten-export) The symbol "SavedObjectsSchemaDefinition" needs to be exported by the entry point index.d.ts
-    constructor(schemaDefinition?: SavedObjectsSchemaDefinition);
-    // (undocumented)
-    getConvertToAliasScript(type: string): string | undefined;
-    // (undocumented)
-    getIndexForType(config: LegacyConfig, type: string): string | undefined;
-    // (undocumented)
-    isHiddenType(type: string): boolean;
-    // (undocumented)
-    isNamespaceAgnostic(type: string): boolean;
-}
-
-// @internal (undocumented)
-export class SavedObjectsSerializer {
-    constructor(schema: SavedObjectsSchema);
-    generateRawId(namespace: string | undefined, type: string, id?: string): string;
-    isRawSavedObject(rawDoc: SavedObjectsRawDoc): any;
-    // Warning: (ae-forgotten-export) The symbol "SanitizedSavedObjectDoc" needs to be exported by the entry point index.d.ts
-    rawToSavedObject(doc: SavedObjectsRawDoc): SanitizedSavedObjectDoc;
-    savedObjectToRaw(savedObj: SanitizedSavedObjectDoc): SavedObjectsRawDoc;
-    }
-
-// @public
-export interface SavedObjectsServiceSetup {
-    addClientWrapper: (priority: number, id: string, factory: SavedObjectsClientWrapperFactory<KibanaRequest>) => void;
-    createInternalRepository: (extraTypes?: string[]) => ISavedObjectsRepository;
-    createScopedRepository: (req: KibanaRequest, extraTypes?: string[]) => ISavedObjectsRepository;
-    setClientFactory: (customClientFactory: SavedObjectsClientFactory<KibanaRequest>) => void;
-}
-
-// @public
-export interface SavedObjectsServiceStart {
-    getScopedClient: (req: KibanaRequest, options?: SavedObjectsClientProviderOptions) => SavedObjectsClientContract;
-}
-
-// @public (undocumented)
-export interface SavedObjectsUpdateOptions extends SavedObjectsBaseOptions {
-    references?: SavedObjectReference[];
-    refresh?: MutatingOperationRefreshSetting;
-    version?: string;
-}
-
-// @public (undocumented)
-export interface SavedObjectsUpdateResponse<T extends SavedObjectAttributes = any> extends Omit<SavedObject<T>, 'attributes' | 'references'> {
-    // (undocumented)
-    attributes: Partial<T>;
-    // (undocumented)
-    references: SavedObjectReference[] | undefined;
-}
-
-// @public
-export class ScopedClusterClient implements IScopedClusterClient {
-    constructor(internalAPICaller: APICaller, scopedAPICaller: APICaller, headers?: Headers | undefined);
-    callAsCurrentUser(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<any>;
-    callAsInternalUser(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<any>;
-    }
-
-// @public
-export interface SessionCookieValidationResult {
-    isValid: boolean;
-    path?: string;
-}
-
-// @public
-export interface SessionStorage<T> {
-    clear(): void;
-    get(): Promise<T | null>;
-    set(sessionValue: T): void;
-}
-
-// @public
-export interface SessionStorageCookieOptions<T> {
-    encryptionKey: string;
-    isSecure: boolean;
-    name: string;
-    validate: (sessionValue: T | T[]) => SessionCookieValidationResult;
-}
-
-// @public
-export interface SessionStorageFactory<T> {
-    // (undocumented)
-    asScoped: (request: KibanaRequest) => SessionStorage<T>;
-}
-
-// @public (undocumented)
-export type SharedGlobalConfig = RecursiveReadonly_2<{
-    kibana: Pick<KibanaConfigType_2, typeof SharedGlobalConfigKeys.kibana[number]>;
-    elasticsearch: Pick<ElasticsearchConfigType, typeof SharedGlobalConfigKeys.elasticsearch[number]>;
-    path: Pick<PathConfigType, typeof SharedGlobalConfigKeys.path[number]>;
-}>;
-
-// @public
-export interface UiSettingsParams {
-    category?: string[];
-    description?: string;
-    name?: string;
-    optionLabels?: Record<string, string>;
-    options?: string[];
-    readonly?: boolean;
-    requiresPageReload?: boolean;
-    type?: UiSettingsType;
-    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 = any> {
-    // (undocumented)
-    isOverridden?: boolean;
-    // (undocumented)
-    userValue?: T;
-}
-
-// @public
-export const validBodyOutput: readonly ["data", "stream"];
-
-
-// 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:43:5 - (ae-forgotten-export) The symbol "InternalPluginInfo" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/types.ts:221:3 - (ae-forgotten-export) The symbol "KibanaConfigType" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/types.ts:221:3 - (ae-forgotten-export) The symbol "SharedGlobalConfigKeys" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/types.ts:222:3 - (ae-forgotten-export) The symbol "ElasticsearchConfigType" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/types.ts:223:3 - (ae-forgotten-export) The symbol "PathConfigType" needs to be exported by the entry point index.d.ts
-
-```
+## API Report File for "kibana"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import Boom from 'boom';
+import { BulkIndexDocumentsParams } from 'elasticsearch';
+import { CatAliasesParams } from 'elasticsearch';
+import { CatAllocationParams } from 'elasticsearch';
+import { CatCommonParams } from 'elasticsearch';
+import { CatFielddataParams } from 'elasticsearch';
+import { CatHealthParams } from 'elasticsearch';
+import { CatHelpParams } from 'elasticsearch';
+import { CatIndicesParams } from 'elasticsearch';
+import { CatRecoveryParams } from 'elasticsearch';
+import { CatSegmentsParams } from 'elasticsearch';
+import { CatShardsParams } from 'elasticsearch';
+import { CatSnapshotsParams } from 'elasticsearch';
+import { CatTasksParams } from 'elasticsearch';
+import { CatThreadPoolParams } from 'elasticsearch';
+import { ClearScrollParams } from 'elasticsearch';
+import { Client } from 'elasticsearch';
+import { ClusterAllocationExplainParams } from 'elasticsearch';
+import { ClusterGetSettingsParams } from 'elasticsearch';
+import { ClusterHealthParams } from 'elasticsearch';
+import { ClusterPendingTasksParams } from 'elasticsearch';
+import { ClusterPutSettingsParams } from 'elasticsearch';
+import { ClusterRerouteParams } from 'elasticsearch';
+import { ClusterStateParams } from 'elasticsearch';
+import { ClusterStatsParams } from 'elasticsearch';
+import { ConfigOptions } from 'elasticsearch';
+import { CountParams } from 'elasticsearch';
+import { CreateDocumentParams } from 'elasticsearch';
+import { DeleteDocumentByQueryParams } from 'elasticsearch';
+import { DeleteDocumentParams } from 'elasticsearch';
+import { DeleteScriptParams } from 'elasticsearch';
+import { DeleteTemplateParams } from 'elasticsearch';
+import { DetailedPeerCertificate } from 'tls';
+import { Duration } from 'moment';
+import { ExistsParams } from 'elasticsearch';
+import { ExplainParams } from 'elasticsearch';
+import { FieldStatsParams } from 'elasticsearch';
+import { GenericParams } from 'elasticsearch';
+import { GetParams } from 'elasticsearch';
+import { GetResponse } from 'elasticsearch';
+import { GetScriptParams } from 'elasticsearch';
+import { GetSourceParams } from 'elasticsearch';
+import { GetTemplateParams } from 'elasticsearch';
+import { IncomingHttpHeaders } from 'http';
+import { IndexDocumentParams } from 'elasticsearch';
+import { IndicesAnalyzeParams } from 'elasticsearch';
+import { IndicesClearCacheParams } from 'elasticsearch';
+import { IndicesCloseParams } from 'elasticsearch';
+import { IndicesCreateParams } from 'elasticsearch';
+import { IndicesDeleteAliasParams } from 'elasticsearch';
+import { IndicesDeleteParams } from 'elasticsearch';
+import { IndicesDeleteTemplateParams } from 'elasticsearch';
+import { IndicesExistsAliasParams } from 'elasticsearch';
+import { IndicesExistsParams } from 'elasticsearch';
+import { IndicesExistsTemplateParams } from 'elasticsearch';
+import { IndicesExistsTypeParams } from 'elasticsearch';
+import { IndicesFlushParams } from 'elasticsearch';
+import { IndicesFlushSyncedParams } from 'elasticsearch';
+import { IndicesForcemergeParams } from 'elasticsearch';
+import { IndicesGetAliasParams } from 'elasticsearch';
+import { IndicesGetFieldMappingParams } from 'elasticsearch';
+import { IndicesGetMappingParams } from 'elasticsearch';
+import { IndicesGetParams } from 'elasticsearch';
+import { IndicesGetSettingsParams } from 'elasticsearch';
+import { IndicesGetTemplateParams } from 'elasticsearch';
+import { IndicesGetUpgradeParams } from 'elasticsearch';
+import { IndicesOpenParams } from 'elasticsearch';
+import { IndicesPutAliasParams } from 'elasticsearch';
+import { IndicesPutMappingParams } from 'elasticsearch';
+import { IndicesPutSettingsParams } from 'elasticsearch';
+import { IndicesPutTemplateParams } from 'elasticsearch';
+import { IndicesRecoveryParams } from 'elasticsearch';
+import { IndicesRefreshParams } from 'elasticsearch';
+import { IndicesRolloverParams } from 'elasticsearch';
+import { IndicesSegmentsParams } from 'elasticsearch';
+import { IndicesShardStoresParams } from 'elasticsearch';
+import { IndicesShrinkParams } from 'elasticsearch';
+import { IndicesStatsParams } from 'elasticsearch';
+import { IndicesUpdateAliasesParams } from 'elasticsearch';
+import { IndicesUpgradeParams } from 'elasticsearch';
+import { IndicesValidateQueryParams } from 'elasticsearch';
+import { InfoParams } from 'elasticsearch';
+import { IngestDeletePipelineParams } from 'elasticsearch';
+import { IngestGetPipelineParams } from 'elasticsearch';
+import { IngestPutPipelineParams } from 'elasticsearch';
+import { IngestSimulateParams } from 'elasticsearch';
+import { KibanaConfigType } from 'src/core/server/kibana_config';
+import { Logger as Logger_2 } from 'src/core/server/logging';
+import { MGetParams } from 'elasticsearch';
+import { MGetResponse } from 'elasticsearch';
+import { MSearchParams } from 'elasticsearch';
+import { MSearchResponse } from 'elasticsearch';
+import { MSearchTemplateParams } from 'elasticsearch';
+import { MTermVectorsParams } from 'elasticsearch';
+import { NodesHotThreadsParams } from 'elasticsearch';
+import { NodesInfoParams } from 'elasticsearch';
+import { NodesStatsParams } from 'elasticsearch';
+import { ObjectType } from '@kbn/config-schema';
+import { Observable } from 'rxjs';
+import { PeerCertificate } from 'tls';
+import { PingParams } from 'elasticsearch';
+import { PutScriptParams } from 'elasticsearch';
+import { PutTemplateParams } from 'elasticsearch';
+import { Readable } from 'stream';
+import { RecursiveReadonly as RecursiveReadonly_2 } from 'kibana/public';
+import { ReindexParams } from 'elasticsearch';
+import { ReindexRethrottleParams } from 'elasticsearch';
+import { RenderSearchTemplateParams } from 'elasticsearch';
+import { Request } from 'hapi';
+import { ResponseObject } from 'hapi';
+import { ResponseToolkit } from 'hapi';
+import { SchemaTypeError } from '@kbn/config-schema';
+import { ScrollParams } from 'elasticsearch';
+import { SearchParams } from 'elasticsearch';
+import { SearchResponse } from 'elasticsearch';
+import { SearchShardsParams } from 'elasticsearch';
+import { SearchTemplateParams } from 'elasticsearch';
+import { Server } from 'hapi';
+import { ShallowPromise } from '@kbn/utility-types';
+import { SnapshotCreateParams } from 'elasticsearch';
+import { SnapshotCreateRepositoryParams } from 'elasticsearch';
+import { SnapshotDeleteParams } from 'elasticsearch';
+import { SnapshotDeleteRepositoryParams } from 'elasticsearch';
+import { SnapshotGetParams } from 'elasticsearch';
+import { SnapshotGetRepositoryParams } from 'elasticsearch';
+import { SnapshotRestoreParams } from 'elasticsearch';
+import { SnapshotStatusParams } from 'elasticsearch';
+import { SnapshotVerifyRepositoryParams } from 'elasticsearch';
+import { Stream } from 'stream';
+import { SuggestParams } from 'elasticsearch';
+import { TasksCancelParams } from 'elasticsearch';
+import { TasksGetParams } from 'elasticsearch';
+import { TasksListParams } from 'elasticsearch';
+import { TermvectorsParams } from 'elasticsearch';
+import { Type } from '@kbn/config-schema';
+import { TypeOf } from '@kbn/config-schema';
+import { UpdateDocumentByQueryParams } from 'elasticsearch';
+import { UpdateDocumentParams } from 'elasticsearch';
+import { Url } from 'url';
+
+// @public (undocumented)
+export interface APICaller {
+    // (undocumented)
+    (endpoint: 'bulk', params: BulkIndexDocumentsParams, options?: CallAPIOptions): ReturnType<Client['bulk']>;
+    // (undocumented)
+    (endpoint: 'clearScroll', params: ClearScrollParams, options?: CallAPIOptions): ReturnType<Client['clearScroll']>;
+    // (undocumented)
+    (endpoint: 'count', params: CountParams, options?: CallAPIOptions): ReturnType<Client['count']>;
+    // (undocumented)
+    (endpoint: 'create', params: CreateDocumentParams, options?: CallAPIOptions): ReturnType<Client['create']>;
+    // (undocumented)
+    (endpoint: 'delete', params: DeleteDocumentParams, options?: CallAPIOptions): ReturnType<Client['delete']>;
+    // (undocumented)
+    (endpoint: 'deleteByQuery', params: DeleteDocumentByQueryParams, options?: CallAPIOptions): ReturnType<Client['deleteByQuery']>;
+    // (undocumented)
+    (endpoint: 'deleteScript', params: DeleteScriptParams, options?: CallAPIOptions): ReturnType<Client['deleteScript']>;
+    // (undocumented)
+    (endpoint: 'deleteTemplate', params: DeleteTemplateParams, options?: CallAPIOptions): ReturnType<Client['deleteTemplate']>;
+    // (undocumented)
+    (endpoint: 'exists', params: ExistsParams, options?: CallAPIOptions): ReturnType<Client['exists']>;
+    // (undocumented)
+    (endpoint: 'explain', params: ExplainParams, options?: CallAPIOptions): ReturnType<Client['explain']>;
+    // (undocumented)
+    (endpoint: 'fieldStats', params: FieldStatsParams, options?: CallAPIOptions): ReturnType<Client['fieldStats']>;
+    // (undocumented)
+    <T>(endpoint: 'get', params: GetParams, options?: CallAPIOptions): Promise<GetResponse<T>>;
+    // (undocumented)
+    (endpoint: 'getScript', params: GetScriptParams, options?: CallAPIOptions): ReturnType<Client['getScript']>;
+    // (undocumented)
+    (endpoint: 'getSource', params: GetSourceParams, options?: CallAPIOptions): ReturnType<Client['getSource']>;
+    // (undocumented)
+    (endpoint: 'getTemplate', params: GetTemplateParams, options?: CallAPIOptions): ReturnType<Client['getTemplate']>;
+    // (undocumented)
+    <T>(endpoint: 'index', params: IndexDocumentParams<T>, options?: CallAPIOptions): ReturnType<Client['index']>;
+    // (undocumented)
+    (endpoint: 'info', params: InfoParams, options?: CallAPIOptions): ReturnType<Client['info']>;
+    // (undocumented)
+    <T>(endpoint: 'mget', params: MGetParams, options?: CallAPIOptions): Promise<MGetResponse<T>>;
+    // (undocumented)
+    <T>(endpoint: 'msearch', params: MSearchParams, options?: CallAPIOptions): Promise<MSearchResponse<T>>;
+    // (undocumented)
+    <T>(endpoint: 'msearchTemplate', params: MSearchTemplateParams, options?: CallAPIOptions): Promise<MSearchResponse<T>>;
+    // (undocumented)
+    (endpoint: 'mtermvectors', params: MTermVectorsParams, options?: CallAPIOptions): ReturnType<Client['mtermvectors']>;
+    // (undocumented)
+    (endpoint: 'ping', params: PingParams, options?: CallAPIOptions): ReturnType<Client['ping']>;
+    // (undocumented)
+    (endpoint: 'putScript', params: PutScriptParams, options?: CallAPIOptions): ReturnType<Client['putScript']>;
+    // (undocumented)
+    (endpoint: 'putTemplate', params: PutTemplateParams, options?: CallAPIOptions): ReturnType<Client['putTemplate']>;
+    // (undocumented)
+    (endpoint: 'reindex', params: ReindexParams, options?: CallAPIOptions): ReturnType<Client['reindex']>;
+    // (undocumented)
+    (endpoint: 'reindexRethrottle', params: ReindexRethrottleParams, options?: CallAPIOptions): ReturnType<Client['reindexRethrottle']>;
+    // (undocumented)
+    (endpoint: 'renderSearchTemplate', params: RenderSearchTemplateParams, options?: CallAPIOptions): ReturnType<Client['renderSearchTemplate']>;
+    // (undocumented)
+    <T>(endpoint: 'scroll', params: ScrollParams, options?: CallAPIOptions): Promise<SearchResponse<T>>;
+    // (undocumented)
+    <T>(endpoint: 'search', params: SearchParams, options?: CallAPIOptions): Promise<SearchResponse<T>>;
+    // (undocumented)
+    (endpoint: 'searchShards', params: SearchShardsParams, options?: CallAPIOptions): ReturnType<Client['searchShards']>;
+    // (undocumented)
+    (endpoint: 'searchTemplate', params: SearchTemplateParams, options?: CallAPIOptions): ReturnType<Client['searchTemplate']>;
+    // (undocumented)
+    (endpoint: 'suggest', params: SuggestParams, options?: CallAPIOptions): ReturnType<Client['suggest']>;
+    // (undocumented)
+    (endpoint: 'termvectors', params: TermvectorsParams, options?: CallAPIOptions): ReturnType<Client['termvectors']>;
+    // (undocumented)
+    (endpoint: 'update', params: UpdateDocumentParams, options?: CallAPIOptions): ReturnType<Client['update']>;
+    // (undocumented)
+    (endpoint: 'updateByQuery', params: UpdateDocumentByQueryParams, options?: CallAPIOptions): ReturnType<Client['updateByQuery']>;
+    // (undocumented)
+    (endpoint: 'cat.aliases', params: CatAliasesParams, options?: CallAPIOptions): ReturnType<Client['cat']['aliases']>;
+    // (undocumented)
+    (endpoint: 'cat.allocation', params: CatAllocationParams, options?: CallAPIOptions): ReturnType<Client['cat']['allocation']>;
+    // (undocumented)
+    (endpoint: 'cat.count', params: CatAllocationParams, options?: CallAPIOptions): ReturnType<Client['cat']['count']>;
+    // (undocumented)
+    (endpoint: 'cat.fielddata', params: CatFielddataParams, options?: CallAPIOptions): ReturnType<Client['cat']['fielddata']>;
+    // (undocumented)
+    (endpoint: 'cat.health', params: CatHealthParams, options?: CallAPIOptions): ReturnType<Client['cat']['health']>;
+    // (undocumented)
+    (endpoint: 'cat.help', params: CatHelpParams, options?: CallAPIOptions): ReturnType<Client['cat']['help']>;
+    // (undocumented)
+    (endpoint: 'cat.indices', params: CatIndicesParams, options?: CallAPIOptions): ReturnType<Client['cat']['indices']>;
+    // (undocumented)
+    (endpoint: 'cat.master', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['master']>;
+    // (undocumented)
+    (endpoint: 'cat.nodeattrs', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['nodeattrs']>;
+    // (undocumented)
+    (endpoint: 'cat.nodes', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['nodes']>;
+    // (undocumented)
+    (endpoint: 'cat.pendingTasks', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['pendingTasks']>;
+    // (undocumented)
+    (endpoint: 'cat.plugins', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['plugins']>;
+    // (undocumented)
+    (endpoint: 'cat.recovery', params: CatRecoveryParams, options?: CallAPIOptions): ReturnType<Client['cat']['recovery']>;
+    // (undocumented)
+    (endpoint: 'cat.repositories', params: CatCommonParams, options?: CallAPIOptions): ReturnType<Client['cat']['repositories']>;
+    // (undocumented)
+    (endpoint: 'cat.segments', params: CatSegmentsParams, options?: CallAPIOptions): ReturnType<Client['cat']['segments']>;
+    // (undocumented)
+    (endpoint: 'cat.shards', params: CatShardsParams, options?: CallAPIOptions): ReturnType<Client['cat']['shards']>;
+    // (undocumented)
+    (endpoint: 'cat.snapshots', params: CatSnapshotsParams, options?: CallAPIOptions): ReturnType<Client['cat']['snapshots']>;
+    // (undocumented)
+    (endpoint: 'cat.tasks', params: CatTasksParams, options?: CallAPIOptions): ReturnType<Client['cat']['tasks']>;
+    // (undocumented)
+    (endpoint: 'cat.threadPool', params: CatThreadPoolParams, options?: CallAPIOptions): ReturnType<Client['cat']['threadPool']>;
+    // (undocumented)
+    (endpoint: 'cluster.allocationExplain', params: ClusterAllocationExplainParams, options?: CallAPIOptions): ReturnType<Client['cluster']['allocationExplain']>;
+    // (undocumented)
+    (endpoint: 'cluster.getSettings', params: ClusterGetSettingsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['getSettings']>;
+    // (undocumented)
+    (endpoint: 'cluster.health', params: ClusterHealthParams, options?: CallAPIOptions): ReturnType<Client['cluster']['health']>;
+    // (undocumented)
+    (endpoint: 'cluster.pendingTasks', params: ClusterPendingTasksParams, options?: CallAPIOptions): ReturnType<Client['cluster']['pendingTasks']>;
+    // (undocumented)
+    (endpoint: 'cluster.putSettings', params: ClusterPutSettingsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['putSettings']>;
+    // (undocumented)
+    (endpoint: 'cluster.reroute', params: ClusterRerouteParams, options?: CallAPIOptions): ReturnType<Client['cluster']['reroute']>;
+    // (undocumented)
+    (endpoint: 'cluster.state', params: ClusterStateParams, options?: CallAPIOptions): ReturnType<Client['cluster']['state']>;
+    // (undocumented)
+    (endpoint: 'cluster.stats', params: ClusterStatsParams, options?: CallAPIOptions): ReturnType<Client['cluster']['stats']>;
+    // (undocumented)
+    (endpoint: 'indices.analyze', params: IndicesAnalyzeParams, options?: CallAPIOptions): ReturnType<Client['indices']['analyze']>;
+    // (undocumented)
+    (endpoint: 'indices.clearCache', params: IndicesClearCacheParams, options?: CallAPIOptions): ReturnType<Client['indices']['clearCache']>;
+    // (undocumented)
+    (endpoint: 'indices.close', params: IndicesCloseParams, options?: CallAPIOptions): ReturnType<Client['indices']['close']>;
+    // (undocumented)
+    (endpoint: 'indices.create', params: IndicesCreateParams, options?: CallAPIOptions): ReturnType<Client['indices']['create']>;
+    // (undocumented)
+    (endpoint: 'indices.delete', params: IndicesDeleteParams, options?: CallAPIOptions): ReturnType<Client['indices']['delete']>;
+    // (undocumented)
+    (endpoint: 'indices.deleteAlias', params: IndicesDeleteAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['deleteAlias']>;
+    // (undocumented)
+    (endpoint: 'indices.deleteTemplate', params: IndicesDeleteTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['deleteTemplate']>;
+    // (undocumented)
+    (endpoint: 'indices.exists', params: IndicesExistsParams, options?: CallAPIOptions): ReturnType<Client['indices']['exists']>;
+    // (undocumented)
+    (endpoint: 'indices.existsAlias', params: IndicesExistsAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsAlias']>;
+    // (undocumented)
+    (endpoint: 'indices.existsTemplate', params: IndicesExistsTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsTemplate']>;
+    // (undocumented)
+    (endpoint: 'indices.existsType', params: IndicesExistsTypeParams, options?: CallAPIOptions): ReturnType<Client['indices']['existsType']>;
+    // (undocumented)
+    (endpoint: 'indices.flush', params: IndicesFlushParams, options?: CallAPIOptions): ReturnType<Client['indices']['flush']>;
+    // (undocumented)
+    (endpoint: 'indices.flushSynced', params: IndicesFlushSyncedParams, options?: CallAPIOptions): ReturnType<Client['indices']['flushSynced']>;
+    // (undocumented)
+    (endpoint: 'indices.forcemerge', params: IndicesForcemergeParams, options?: CallAPIOptions): ReturnType<Client['indices']['forcemerge']>;
+    // (undocumented)
+    (endpoint: 'indices.get', params: IndicesGetParams, options?: CallAPIOptions): ReturnType<Client['indices']['get']>;
+    // (undocumented)
+    (endpoint: 'indices.getAlias', params: IndicesGetAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['getAlias']>;
+    // (undocumented)
+    (endpoint: 'indices.getFieldMapping', params: IndicesGetFieldMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['getFieldMapping']>;
+    // (undocumented)
+    (endpoint: 'indices.getMapping', params: IndicesGetMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['getMapping']>;
+    // (undocumented)
+    (endpoint: 'indices.getSettings', params: IndicesGetSettingsParams, options?: CallAPIOptions): ReturnType<Client['indices']['getSettings']>;
+    // (undocumented)
+    (endpoint: 'indices.getTemplate', params: IndicesGetTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['getTemplate']>;
+    // (undocumented)
+    (endpoint: 'indices.getUpgrade', params: IndicesGetUpgradeParams, options?: CallAPIOptions): ReturnType<Client['indices']['getUpgrade']>;
+    // (undocumented)
+    (endpoint: 'indices.open', params: IndicesOpenParams, options?: CallAPIOptions): ReturnType<Client['indices']['open']>;
+    // (undocumented)
+    (endpoint: 'indices.putAlias', params: IndicesPutAliasParams, options?: CallAPIOptions): ReturnType<Client['indices']['putAlias']>;
+    // (undocumented)
+    (endpoint: 'indices.putMapping', params: IndicesPutMappingParams, options?: CallAPIOptions): ReturnType<Client['indices']['putMapping']>;
+    // (undocumented)
+    (endpoint: 'indices.putSettings', params: IndicesPutSettingsParams, options?: CallAPIOptions): ReturnType<Client['indices']['putSettings']>;
+    // (undocumented)
+    (endpoint: 'indices.putTemplate', params: IndicesPutTemplateParams, options?: CallAPIOptions): ReturnType<Client['indices']['putTemplate']>;
+    // (undocumented)
+    (endpoint: 'indices.recovery', params: IndicesRecoveryParams, options?: CallAPIOptions): ReturnType<Client['indices']['recovery']>;
+    // (undocumented)
+    (endpoint: 'indices.refresh', params: IndicesRefreshParams, options?: CallAPIOptions): ReturnType<Client['indices']['refresh']>;
+    // (undocumented)
+    (endpoint: 'indices.rollover', params: IndicesRolloverParams, options?: CallAPIOptions): ReturnType<Client['indices']['rollover']>;
+    // (undocumented)
+    (endpoint: 'indices.segments', params: IndicesSegmentsParams, options?: CallAPIOptions): ReturnType<Client['indices']['segments']>;
+    // (undocumented)
+    (endpoint: 'indices.shardStores', params: IndicesShardStoresParams, options?: CallAPIOptions): ReturnType<Client['indices']['shardStores']>;
+    // (undocumented)
+    (endpoint: 'indices.shrink', params: IndicesShrinkParams, options?: CallAPIOptions): ReturnType<Client['indices']['shrink']>;
+    // (undocumented)
+    (endpoint: 'indices.stats', params: IndicesStatsParams, options?: CallAPIOptions): ReturnType<Client['indices']['stats']>;
+    // (undocumented)
+    (endpoint: 'indices.updateAliases', params: IndicesUpdateAliasesParams, options?: CallAPIOptions): ReturnType<Client['indices']['updateAliases']>;
+    // (undocumented)
+    (endpoint: 'indices.upgrade', params: IndicesUpgradeParams, options?: CallAPIOptions): ReturnType<Client['indices']['upgrade']>;
+    // (undocumented)
+    (endpoint: 'indices.validateQuery', params: IndicesValidateQueryParams, options?: CallAPIOptions): ReturnType<Client['indices']['validateQuery']>;
+    // (undocumented)
+    (endpoint: 'ingest.deletePipeline', params: IngestDeletePipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['deletePipeline']>;
+    // (undocumented)
+    (endpoint: 'ingest.getPipeline', params: IngestGetPipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['getPipeline']>;
+    // (undocumented)
+    (endpoint: 'ingest.putPipeline', params: IngestPutPipelineParams, options?: CallAPIOptions): ReturnType<Client['ingest']['putPipeline']>;
+    // (undocumented)
+    (endpoint: 'ingest.simulate', params: IngestSimulateParams, options?: CallAPIOptions): ReturnType<Client['ingest']['simulate']>;
+    // (undocumented)
+    (endpoint: 'nodes.hotThreads', params: NodesHotThreadsParams, options?: CallAPIOptions): ReturnType<Client['nodes']['hotThreads']>;
+    // (undocumented)
+    (endpoint: 'nodes.info', params: NodesInfoParams, options?: CallAPIOptions): ReturnType<Client['nodes']['info']>;
+    // (undocumented)
+    (endpoint: 'nodes.stats', params: NodesStatsParams, options?: CallAPIOptions): ReturnType<Client['nodes']['stats']>;
+    // (undocumented)
+    (endpoint: 'snapshot.create', params: SnapshotCreateParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['create']>;
+    // (undocumented)
+    (endpoint: 'snapshot.createRepository', params: SnapshotCreateRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['createRepository']>;
+    // (undocumented)
+    (endpoint: 'snapshot.delete', params: SnapshotDeleteParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['delete']>;
+    // (undocumented)
+    (endpoint: 'snapshot.deleteRepository', params: SnapshotDeleteRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['deleteRepository']>;
+    // (undocumented)
+    (endpoint: 'snapshot.get', params: SnapshotGetParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['get']>;
+    // (undocumented)
+    (endpoint: 'snapshot.getRepository', params: SnapshotGetRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['getRepository']>;
+    // (undocumented)
+    (endpoint: 'snapshot.restore', params: SnapshotRestoreParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['restore']>;
+    // (undocumented)
+    (endpoint: 'snapshot.status', params: SnapshotStatusParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['status']>;
+    // (undocumented)
+    (endpoint: 'snapshot.verifyRepository', params: SnapshotVerifyRepositoryParams, options?: CallAPIOptions): ReturnType<Client['snapshot']['verifyRepository']>;
+    // (undocumented)
+    (endpoint: 'tasks.cancel', params: TasksCancelParams, options?: CallAPIOptions): ReturnType<Client['tasks']['cancel']>;
+    // (undocumented)
+    (endpoint: 'tasks.get', params: TasksGetParams, options?: CallAPIOptions): ReturnType<Client['tasks']['get']>;
+    // (undocumented)
+    (endpoint: 'tasks.list', params: TasksListParams, options?: CallAPIOptions): ReturnType<Client['tasks']['list']>;
+    // (undocumented)
+    (endpoint: 'transport.request', clientParams: AssistantAPIClientParams, options?: CallAPIOptions): Promise<AssistanceAPIResponse>;
+    // (undocumented)
+    (endpoint: 'transport.request', clientParams: DeprecationAPIClientParams, options?: CallAPIOptions): Promise<DeprecationAPIResponse>;
+    // (undocumented)
+    <T = any>(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<T>;
+}
+
+// @public (undocumented)
+export interface AssistanceAPIResponse {
+    // (undocumented)
+    indices: {
+        [indexName: string]: {
+            action_required: MIGRATION_ASSISTANCE_INDEX_ACTION;
+        };
+    };
+}
+
+// @public (undocumented)
+export interface AssistantAPIClientParams extends GenericParams {
+    // (undocumented)
+    method: 'GET';
+    // (undocumented)
+    path: '/_migration/assistance';
+}
+
+// @public (undocumented)
+export interface Authenticated extends AuthResultParams {
+    // (undocumented)
+    type: AuthResultType.authenticated;
+}
+
+// @public
+export type AuthenticationHandler = (request: KibanaRequest, response: LifecycleResponseFactory, toolkit: AuthToolkit) => AuthResult | IKibanaResponse | Promise<AuthResult | IKibanaResponse>;
+
+// @public
+export type AuthHeaders = Record<string, string | string[]>;
+
+// @public (undocumented)
+export type AuthResult = Authenticated;
+
+// @public
+export interface AuthResultParams {
+    requestHeaders?: AuthHeaders;
+    responseHeaders?: AuthHeaders;
+    state?: Record<string, any>;
+}
+
+// @public (undocumented)
+export enum AuthResultType {
+    // (undocumented)
+    authenticated = "authenticated"
+}
+
+// @public
+export enum AuthStatus {
+    authenticated = "authenticated",
+    unauthenticated = "unauthenticated",
+    unknown = "unknown"
+}
+
+// @public
+export interface AuthToolkit {
+    authenticated: (data?: AuthResultParams) => AuthResult;
+}
+
+// @public
+export class BasePath {
+    // @internal
+    constructor(serverBasePath?: string);
+    get: (request: KibanaRequest<unknown, unknown, unknown, any> | LegacyRequest) => string;
+    prepend: (path: string) => string;
+    remove: (path: string) => string;
+    readonly serverBasePath: string;
+    set: (request: KibanaRequest<unknown, unknown, unknown, any> | LegacyRequest, requestSpecificBasePath: string) => void;
+}
+
+// Warning: (ae-forgotten-export) The symbol "BootstrapArgs" needs to be exported by the entry point index.d.ts
+//
+// @internal (undocumented)
+export function bootstrap({ configs, cliArgs, applyConfigOverrides, features, }: BootstrapArgs): Promise<void>;
+
+// @public
+export interface CallAPIOptions {
+    signal?: AbortSignal;
+    wrap401Errors?: boolean;
+}
+
+// @public
+export interface Capabilities {
+    [key: string]: Record<string, boolean | Record<string, boolean>>;
+    catalogue: Record<string, boolean>;
+    management: {
+        [sectionId: string]: Record<string, boolean>;
+    };
+    navLinks: Record<string, boolean>;
+}
+
+// @public
+export type CapabilitiesProvider = () => Partial<Capabilities>;
+
+// @public
+export interface CapabilitiesSetup {
+    registerProvider(provider: CapabilitiesProvider): void;
+    registerSwitcher(switcher: CapabilitiesSwitcher): void;
+}
+
+// @public
+export interface CapabilitiesStart {
+    resolveCapabilities(request: KibanaRequest): Promise<Capabilities>;
+}
+
+// @public
+export type CapabilitiesSwitcher = (request: KibanaRequest, uiCapabilities: Capabilities) => Partial<Capabilities> | Promise<Partial<Capabilities>>;
+
+// @public
+export class ClusterClient implements IClusterClient {
+    constructor(config: ElasticsearchClientConfig, log: Logger, getAuthHeaders?: GetAuthHeaders);
+    asScoped(request?: ScopeableRequest): IScopedClusterClient;
+    callAsInternalUser: APICaller;
+    close(): void;
+    }
+
+// @public
+export type ConfigDeprecation = (config: Record<string, any>, fromPath: string, logger: ConfigDeprecationLogger) => Record<string, any>;
+
+// @public
+export interface ConfigDeprecationFactory {
+    rename(oldKey: string, newKey: string): ConfigDeprecation;
+    renameFromRoot(oldKey: string, newKey: string): ConfigDeprecation;
+    unused(unusedKey: string): ConfigDeprecation;
+    unusedFromRoot(unusedKey: string): ConfigDeprecation;
+}
+
+// @public
+export type ConfigDeprecationLogger = (message: string) => void;
+
+// @public
+export type ConfigDeprecationProvider = (factory: ConfigDeprecationFactory) => ConfigDeprecation[];
+
+// @public (undocumented)
+export type ConfigPath = string | string[];
+
+// @internal (undocumented)
+export class ConfigService {
+    // Warning: (ae-forgotten-export) The symbol "RawConfigurationProvider" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "Env" needs to be exported by the entry point index.d.ts
+    constructor(rawConfigProvider: RawConfigurationProvider, env: Env, logger: LoggerFactory);
+    addDeprecationProvider(path: ConfigPath, provider: ConfigDeprecationProvider): void;
+    atPath<TSchema>(path: ConfigPath): Observable<TSchema>;
+    // Warning: (ae-forgotten-export) The symbol "Config" needs to be exported by the entry point index.d.ts
+    getConfig$(): Observable<Config>;
+    // (undocumented)
+    getUnusedPaths(): Promise<string[]>;
+    // (undocumented)
+    getUsedPaths(): Promise<string[]>;
+    // (undocumented)
+    isEnabledAtPath(path: ConfigPath): Promise<boolean>;
+    optionalAtPath<TSchema>(path: ConfigPath): Observable<TSchema | undefined>;
+    setSchema(path: ConfigPath, schema: Type<unknown>): Promise<void>;
+    validate(): Promise<void>;
+    }
+
+// @public
+export interface ContextSetup {
+    createContextContainer<THandler extends HandlerFunction<any>>(): IContextContainer<THandler>;
+}
+
+// @internal (undocumented)
+export type CoreId = symbol;
+
+// @public
+export interface CoreSetup {
+    // (undocumented)
+    capabilities: CapabilitiesSetup;
+    // (undocumented)
+    context: ContextSetup;
+    // (undocumented)
+    elasticsearch: ElasticsearchServiceSetup;
+    // (undocumented)
+    http: HttpServiceSetup;
+    // (undocumented)
+    savedObjects: SavedObjectsServiceSetup;
+    // (undocumented)
+    uiSettings: UiSettingsServiceSetup;
+    // (undocumented)
+    uuid: UuidServiceSetup;
+}
+
+// @public
+export interface CoreStart {
+    // (undocumented)
+    capabilities: CapabilitiesStart;
+    // (undocumented)
+    savedObjects: SavedObjectsServiceStart;
+    // (undocumented)
+    uiSettings: UiSettingsServiceStart;
+}
+
+// @public
+export class CspConfig implements ICspConfig {
+    // @internal
+    constructor(rawCspConfig?: Partial<Omit<ICspConfig, 'header'>>);
+    // (undocumented)
+    static readonly DEFAULT: CspConfig;
+    // (undocumented)
+    readonly header: string;
+    // (undocumented)
+    readonly rules: string[];
+    // (undocumented)
+    readonly strict: boolean;
+    // (undocumented)
+    readonly warnLegacyBrowsers: boolean;
+}
+
+// @public
+export interface CustomHttpResponseOptions<T extends HttpResponsePayload | ResponseError> {
+    body?: T;
+    headers?: ResponseHeaders;
+    // (undocumented)
+    statusCode: number;
+}
+
+// @public (undocumented)
+export interface DeprecationAPIClientParams extends GenericParams {
+    // (undocumented)
+    method: 'GET';
+    // (undocumented)
+    path: '/_migration/deprecations';
+}
+
+// @public (undocumented)
+export interface DeprecationAPIResponse {
+    // (undocumented)
+    cluster_settings: DeprecationInfo[];
+    // (undocumented)
+    index_settings: IndexSettingsDeprecationInfo;
+    // (undocumented)
+    ml_settings: DeprecationInfo[];
+    // (undocumented)
+    node_settings: DeprecationInfo[];
+}
+
+// @public (undocumented)
+export interface DeprecationInfo {
+    // (undocumented)
+    details?: string;
+    // (undocumented)
+    level: MIGRATION_DEPRECATION_LEVEL;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    url: string;
+}
+
+// @public
+export interface DiscoveredPlugin {
+    readonly configPath: ConfigPath;
+    readonly id: PluginName;
+    readonly optionalPlugins: readonly PluginName[];
+    readonly requiredPlugins: readonly PluginName[];
+}
+
+// Warning: (ae-forgotten-export) The symbol "ElasticsearchConfig" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export type ElasticsearchClientConfig = Pick<ConfigOptions, 'keepAlive' | 'log' | 'plugins'> & Pick<ElasticsearchConfig, 'apiVersion' | 'customHeaders' | 'logQueries' | 'requestHeadersWhitelist' | 'sniffOnStart' | 'sniffOnConnectionFault' | 'hosts' | 'username' | 'password'> & {
+    pingTimeout?: ElasticsearchConfig['pingTimeout'] | ConfigOptions['pingTimeout'];
+    requestTimeout?: ElasticsearchConfig['requestTimeout'] | ConfigOptions['requestTimeout'];
+    sniffInterval?: ElasticsearchConfig['sniffInterval'] | ConfigOptions['sniffInterval'];
+    ssl?: Partial<ElasticsearchConfig['ssl']>;
+};
+
+// @public (undocumented)
+export interface ElasticsearchError extends Boom {
+    // (undocumented)
+    [code]?: string;
+}
+
+// @public
+export class ElasticsearchErrorHelpers {
+    // (undocumented)
+    static decorateNotAuthorizedError(error: Error, reason?: string): ElasticsearchError;
+    // (undocumented)
+    static isNotAuthorizedError(error: any): error is ElasticsearchError;
+}
+
+// @public (undocumented)
+export interface ElasticsearchServiceSetup {
+    readonly adminClient: IClusterClient;
+    readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ICustomClusterClient;
+    readonly dataClient: IClusterClient;
+}
+
+// @public (undocumented)
+export interface EnvironmentMode {
+    // (undocumented)
+    dev: boolean;
+    // (undocumented)
+    name: 'development' | 'production';
+    // (undocumented)
+    prod: boolean;
+}
+
+// @public
+export interface ErrorHttpResponseOptions {
+    body?: ResponseError;
+    headers?: ResponseHeaders;
+}
+
+// @public
+export interface FakeRequest {
+    headers: Headers;
+}
+
+// @public
+export type GetAuthHeaders = (request: KibanaRequest | LegacyRequest) => AuthHeaders | undefined;
+
+// @public
+export type GetAuthState = (request: KibanaRequest | LegacyRequest) => {
+    status: AuthStatus;
+    state: unknown;
+};
+
+// @public
+export type HandlerContextType<T extends HandlerFunction<any>> = T extends HandlerFunction<infer U> ? U : never;
+
+// @public
+export type HandlerFunction<T extends object> = (context: T, ...args: any[]) => any;
+
+// @public
+export type HandlerParameters<T extends HandlerFunction<any>> = T extends (context: any, ...args: infer U) => any ? U : never;
+
+// @public
+export type Headers = {
+    [header in KnownHeaders]?: string | string[] | undefined;
+} & {
+    [header: string]: string | string[] | undefined;
+};
+
+// @public
+export interface HttpResponseOptions {
+    body?: HttpResponsePayload;
+    headers?: ResponseHeaders;
+}
+
+// @public
+export type HttpResponsePayload = undefined | string | Record<string, any> | Buffer | Stream;
+
+// @public
+export interface HttpServiceSetup {
+    basePath: IBasePath;
+    createCookieSessionStorageFactory: <T>(cookieOptions: SessionStorageCookieOptions<T>) => Promise<SessionStorageFactory<T>>;
+    createRouter: () => IRouter;
+    csp: ICspConfig;
+    isTlsEnabled: boolean;
+    registerAuth: (handler: AuthenticationHandler) => void;
+    registerOnPostAuth: (handler: OnPostAuthHandler) => void;
+    registerOnPreAuth: (handler: OnPreAuthHandler) => void;
+    registerOnPreResponse: (handler: OnPreResponseHandler) => void;
+    registerRouteHandlerContext: <T extends keyof RequestHandlerContext>(contextName: T, provider: RequestHandlerContextProvider<T>) => RequestHandlerContextContainer;
+}
+
+// @public (undocumented)
+export interface HttpServiceStart {
+    isListening: (port: number) => boolean;
+}
+
+// @public
+export type IBasePath = Pick<BasePath, keyof BasePath>;
+
+// @public
+export type IClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'asScoped'>;
+
+// @public
+export interface IContextContainer<THandler extends HandlerFunction<any>> {
+    createHandler(pluginOpaqueId: PluginOpaqueId, handler: THandler): (...rest: HandlerParameters<THandler>) => ShallowPromise<ReturnType<THandler>>;
+    registerContext<TContextName extends keyof HandlerContextType<THandler>>(pluginOpaqueId: PluginOpaqueId, contextName: TContextName, provider: IContextProvider<THandler, TContextName>): this;
+}
+
+// @public
+export type IContextProvider<THandler extends HandlerFunction<any>, TContextName extends keyof HandlerContextType<THandler>> = (context: Partial<HandlerContextType<THandler>>, ...rest: HandlerParameters<THandler>) => Promise<HandlerContextType<THandler>[TContextName]> | HandlerContextType<THandler>[TContextName];
+
+// @public
+export interface ICspConfig {
+    readonly header: string;
+    readonly rules: string[];
+    readonly strict: boolean;
+    readonly warnLegacyBrowsers: boolean;
+}
+
+// @public
+export type ICustomClusterClient = Pick<ClusterClient, 'callAsInternalUser' | 'close' | 'asScoped'>;
+
+// @public
+export interface IKibanaResponse<T extends HttpResponsePayload | ResponseError = any> {
+    // (undocumented)
+    readonly options: HttpResponseOptions;
+    // (undocumented)
+    readonly payload?: T;
+    // (undocumented)
+    readonly status: number;
+}
+
+// @public
+export interface IKibanaSocket {
+    readonly authorizationError?: Error;
+    readonly authorized?: boolean;
+    // (undocumented)
+    getPeerCertificate(detailed: true): DetailedPeerCertificate | null;
+    // (undocumented)
+    getPeerCertificate(detailed: false): PeerCertificate | null;
+    getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate | null;
+}
+
+// @public (undocumented)
+export interface IndexSettingsDeprecationInfo {
+    // (undocumented)
+    [indexName: string]: DeprecationInfo[];
+}
+
+// @public (undocumented)
+export interface IRenderOptions {
+    includeUserSettings?: boolean;
+}
+
+// @public
+export interface IRouter {
+    delete: RouteRegistrar<'delete'>;
+    get: RouteRegistrar<'get'>;
+    // Warning: (ae-forgotten-export) The symbol "RouterRoute" needs to be exported by the entry point index.d.ts
+    //
+    // @internal
+    getRoutes: () => RouterRoute[];
+    handleLegacyErrors: <P, Q, B>(handler: RequestHandler<P, Q, B>) => RequestHandler<P, Q, B>;
+    patch: RouteRegistrar<'patch'>;
+    post: RouteRegistrar<'post'>;
+    put: RouteRegistrar<'put'>;
+    routerPath: string;
+}
+
+// @public
+export type IsAuthenticated = (request: KibanaRequest | LegacyRequest) => boolean;
+
+// @public
+export type ISavedObjectsRepository = Pick<SavedObjectsRepository, keyof SavedObjectsRepository>;
+
+// @public
+export type IScopedClusterClient = Pick<ScopedClusterClient, 'callAsCurrentUser' | 'callAsInternalUser'>;
+
+// @public (undocumented)
+export interface IScopedRenderingClient {
+    render(options?: IRenderOptions): Promise<string>;
+}
+
+// @public
+export interface IUiSettingsClient {
+    get: <T = any>(key: string) => Promise<T>;
+    getAll: <T = any>() => Promise<Record<string, T>>;
+    getRegistered: () => Readonly<Record<string, UiSettingsParams>>;
+    getUserProvided: <T = any>() => Promise<Record<string, UserProvidedValues<T>>>;
+    isOverridden: (key: string) => boolean;
+    remove: (key: string) => Promise<void>;
+    removeMany: (keys: string[]) => Promise<void>;
+    set: (key: string, value: any) => Promise<void>;
+    setMany: (changes: Record<string, any>) => Promise<void>;
+}
+
+// @public
+export class KibanaRequest<Params = unknown, Query = unknown, Body = unknown, Method extends RouteMethod = any> {
+    // @internal (undocumented)
+    protected readonly [requestSymbol]: Request;
+    constructor(request: Request, params: Params, query: Query, body: Body, withoutSecretHeaders: boolean);
+    // (undocumented)
+    readonly body: Body;
+    // Warning: (ae-forgotten-export) The symbol "RouteValidator" needs to be exported by the entry point index.d.ts
+    //
+    // @internal
+    static from<P, Q, B>(req: Request, routeSchemas?: RouteValidator<P, Q, B> | RouteValidatorFullConfig<P, Q, B>, withoutSecretHeaders?: boolean): KibanaRequest<P, Q, B, any>;
+    readonly headers: Headers;
+    // (undocumented)
+    readonly params: Params;
+    // (undocumented)
+    readonly query: Query;
+    readonly route: RecursiveReadonly<KibanaRequestRoute<Method>>;
+    // (undocumented)
+    readonly socket: IKibanaSocket;
+    readonly url: Url;
+    }
+
+// @public
+export interface KibanaRequestRoute<Method extends RouteMethod> {
+    // (undocumented)
+    method: Method;
+    // (undocumented)
+    options: KibanaRequestRouteOptions<Method>;
+    // (undocumented)
+    path: string;
+}
+
+// @public
+export type KibanaRequestRouteOptions<Method extends RouteMethod> = Method extends 'get' | 'options' ? Required<Omit<RouteConfigOptions<Method>, 'body'>> : Required<RouteConfigOptions<Method>>;
+
+// @public
+export type KibanaResponseFactory = typeof kibanaResponseFactory;
+
+// @public
+export const kibanaResponseFactory: {
+    custom: <T extends string | Error | Record<string, any> | Buffer | Stream | {
+        message: string | Error;
+        attributes?: Record<string, any> | undefined;
+    } | undefined>(options: CustomHttpResponseOptions<T>) => KibanaResponse<T>;
+    badRequest: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
+    unauthorized: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
+    forbidden: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
+    notFound: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
+    conflict: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
+    internalError: (options?: ErrorHttpResponseOptions) => KibanaResponse<ResponseError>;
+    customError: (options: CustomHttpResponseOptions<ResponseError>) => KibanaResponse<ResponseError>;
+    redirected: (options: RedirectResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
+    ok: (options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
+    accepted: (options?: HttpResponseOptions) => KibanaResponse<string | Record<string, any> | Buffer | Stream>;
+    noContent: (options?: HttpResponseOptions) => KibanaResponse<undefined>;
+};
+
+// Warning: (ae-forgotten-export) The symbol "KnownKeys" needs to be exported by the entry point index.d.ts
+//
+// @public
+export type KnownHeaders = KnownKeys<IncomingHttpHeaders>;
+
+// @internal @deprecated
+export interface LegacyConfig {
+    // (undocumented)
+    get<T>(key?: string): T;
+    // (undocumented)
+    has(key: string): boolean;
+    // (undocumented)
+    set(key: string, value: any): void;
+    // Warning: (ae-forgotten-export) The symbol "LegacyVars" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    set(config: LegacyVars): void;
+}
+
+// Warning: (ae-forgotten-export) The symbol "ILegacyInternals" needs to be exported by the entry point index.d.ts
+//
+// @internal @deprecated (undocumented)
+export class LegacyInternals implements ILegacyInternals {
+    constructor(uiExports: LegacyUiExports, config: LegacyConfig, server: Server);
+    // (undocumented)
+    getInjectedUiAppVars(id: string): Promise<Record<string, any>>;
+    // (undocumented)
+    getVars(id: string, request: LegacyRequest, injected?: LegacyVars): Promise<Record<string, any>>;
+    // Warning: (ae-forgotten-export) The symbol "VarsInjector" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    injectUiAppVars(id: string, injector: VarsInjector): void;
+    }
+
+// @internal @deprecated (undocumented)
+export interface LegacyRenderOptions extends IRenderOptions {
+    app?: {
+        getId(): string;
+    };
+    vars?: Record<string, any>;
+}
+
+// @public @deprecated (undocumented)
+export interface LegacyRequest extends Request {
+}
+
+// Warning: (ae-forgotten-export) The symbol "LegacyPlugins" needs to be exported by the entry point index.d.ts
+//
+// @internal @deprecated (undocumented)
+export interface LegacyServiceDiscoverPlugins extends LegacyPlugins {
+    // (undocumented)
+    pluginExtendedConfig: LegacyConfig;
+    // (undocumented)
+    settings: LegacyVars;
+}
+
+// @public @deprecated (undocumented)
+export interface LegacyServiceSetupDeps {
+    // Warning: (ae-forgotten-export) The symbol "LegacyCoreSetup" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    core: LegacyCoreSetup;
+    // (undocumented)
+    plugins: Record<string, unknown>;
+}
+
+// @public @deprecated (undocumented)
+export interface LegacyServiceStartDeps {
+    // Warning: (ae-forgotten-export) The symbol "LegacyCoreStart" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    core: LegacyCoreStart;
+    // (undocumented)
+    plugins: Record<string, unknown>;
+}
+
+// Warning: (ae-forgotten-export) The symbol "SavedObjectsLegacyUiExports" needs to be exported by the entry point index.d.ts
+//
+// @internal @deprecated (undocumented)
+export type LegacyUiExports = SavedObjectsLegacyUiExports & {
+    defaultInjectedVarProviders?: VarsProvider[];
+    injectedVarsReplacers?: VarsReplacer[];
+    navLinkSpecs?: LegacyNavLinkSpec[] | null;
+    uiAppSpecs?: Array<LegacyAppSpec | undefined>;
+    unknown?: [{
+        pluginSpec: LegacyPluginSpec;
+        type: unknown;
+    }];
+};
+
+// Warning: (ae-forgotten-export) The symbol "lifecycleResponseFactory" needs to be exported by the entry point index.d.ts
+//
+// @public
+export type LifecycleResponseFactory = typeof lifecycleResponseFactory;
+
+// @public
+export interface Logger {
+    debug(message: string, meta?: LogMeta): void;
+    error(errorOrMessage: string | Error, meta?: LogMeta): void;
+    fatal(errorOrMessage: string | Error, meta?: LogMeta): void;
+    get(...childContextPaths: string[]): Logger;
+    info(message: string, meta?: LogMeta): void;
+    // @internal (undocumented)
+    log(record: LogRecord): void;
+    trace(message: string, meta?: LogMeta): void;
+    warn(errorOrMessage: string | Error, meta?: LogMeta): void;
+}
+
+// @public
+export interface LoggerFactory {
+    get(...contextParts: string[]): Logger;
+}
+
+// @internal
+export class LogLevel {
+    // (undocumented)
+    static readonly All: LogLevel;
+    // (undocumented)
+    static readonly Debug: LogLevel;
+    // (undocumented)
+    static readonly Error: LogLevel;
+    // (undocumented)
+    static readonly Fatal: LogLevel;
+    static fromId(level: LogLevelId): LogLevel;
+    // Warning: (ae-forgotten-export) The symbol "LogLevelId" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    readonly id: LogLevelId;
+    // (undocumented)
+    static readonly Info: LogLevel;
+    // (undocumented)
+    static readonly Off: LogLevel;
+    supports(level: LogLevel): boolean;
+    // (undocumented)
+    static readonly Trace: LogLevel;
+    // (undocumented)
+    readonly value: number;
+    // (undocumented)
+    static readonly Warn: LogLevel;
+}
+
+// @public
+export interface LogMeta {
+    // (undocumented)
+    [key: string]: any;
+}
+
+// @internal
+export interface LogRecord {
+    // (undocumented)
+    context: string;
+    // (undocumented)
+    error?: Error;
+    // (undocumented)
+    level: LogLevel;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    meta?: {
+        [name: string]: any;
+    };
+    // (undocumented)
+    timestamp: Date;
+}
+
+// @public (undocumented)
+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
+export type OnPostAuthHandler = (request: KibanaRequest, response: LifecycleResponseFactory, toolkit: OnPostAuthToolkit) => OnPostAuthResult | KibanaResponse | Promise<OnPostAuthResult | KibanaResponse>;
+
+// @public
+export interface OnPostAuthToolkit {
+    next: () => OnPostAuthResult;
+}
+
+// Warning: (ae-forgotten-export) The symbol "OnPreAuthResult" needs to be exported by the entry point index.d.ts
+//
+// @public
+export type OnPreAuthHandler = (request: KibanaRequest, response: LifecycleResponseFactory, toolkit: OnPreAuthToolkit) => OnPreAuthResult | KibanaResponse | Promise<OnPreAuthResult | KibanaResponse>;
+
+// @public
+export interface OnPreAuthToolkit {
+    next: () => OnPreAuthResult;
+    rewriteUrl: (url: string) => OnPreAuthResult;
+}
+
+// @public
+export interface OnPreResponseExtensions {
+    headers?: ResponseHeaders;
+}
+
+// Warning: (ae-forgotten-export) The symbol "OnPreResponseResult" needs to be exported by the entry point index.d.ts
+//
+// @public
+export type OnPreResponseHandler = (request: KibanaRequest, preResponse: OnPreResponseInfo, toolkit: OnPreResponseToolkit) => OnPreResponseResult | Promise<OnPreResponseResult>;
+
+// @public
+export interface OnPreResponseInfo {
+    // (undocumented)
+    statusCode: number;
+}
+
+// @public
+export interface OnPreResponseToolkit {
+    next: (responseExtensions?: OnPreResponseExtensions) => OnPreResponseResult;
+}
+
+// @public (undocumented)
+export interface PackageInfo {
+    // (undocumented)
+    branch: string;
+    // (undocumented)
+    buildNum: number;
+    // (undocumented)
+    buildSha: string;
+    // (undocumented)
+    dist: boolean;
+    // (undocumented)
+    version: string;
+}
+
+// @public
+export interface Plugin<TSetup = void, TStart = void, TPluginsSetup extends object = object, TPluginsStart extends object = object> {
+    // (undocumented)
+    setup(core: CoreSetup, plugins: TPluginsSetup): TSetup | Promise<TSetup>;
+    // (undocumented)
+    start(core: CoreStart, plugins: TPluginsStart): TStart | Promise<TStart>;
+    // (undocumented)
+    stop?(): void;
+}
+
+// @public
+export interface PluginConfigDescriptor<T = any> {
+    deprecations?: ConfigDeprecationProvider;
+    exposeToBrowser?: {
+        [P in keyof T]?: boolean;
+    };
+    schema: PluginConfigSchema<T>;
+}
+
+// @public
+export type PluginConfigSchema<T> = Type<T>;
+
+// @public
+export type PluginInitializer<TSetup, TStart, TPluginsSetup extends object = object, TPluginsStart extends object = object> = (core: PluginInitializerContext) => Plugin<TSetup, TStart, TPluginsSetup, TPluginsStart>;
+
+// @public
+export interface PluginInitializerContext<ConfigSchema = unknown> {
+    // (undocumented)
+    config: {
+        legacy: {
+            globalConfig$: Observable<SharedGlobalConfig>;
+        };
+        create: <T = ConfigSchema>() => Observable<T>;
+        createIfExists: <T = ConfigSchema>() => Observable<T | undefined>;
+    };
+    // (undocumented)
+    env: {
+        mode: EnvironmentMode;
+        packageInfo: Readonly<PackageInfo>;
+    };
+    // (undocumented)
+    logger: LoggerFactory;
+    // (undocumented)
+    opaqueId: PluginOpaqueId;
+}
+
+// @public
+export interface PluginManifest {
+    readonly configPath: ConfigPath;
+    readonly id: PluginName;
+    readonly kibanaVersion: string;
+    readonly optionalPlugins: readonly PluginName[];
+    readonly requiredPlugins: readonly PluginName[];
+    readonly server: boolean;
+    readonly ui: boolean;
+    readonly version: string;
+}
+
+// @public
+export type PluginName = string;
+
+// @public (undocumented)
+export type PluginOpaqueId = symbol;
+
+// @public (undocumented)
+export interface PluginsServiceSetup {
+    // (undocumented)
+    contracts: Map<PluginName, unknown>;
+    // (undocumented)
+    uiPlugins: {
+        internal: Map<PluginName, InternalPluginInfo>;
+        public: Map<PluginName, DiscoveredPlugin>;
+        browserConfigs: Map<PluginName, Observable<unknown>>;
+    };
+}
+
+// @public (undocumented)
+export interface PluginsServiceStart {
+    // (undocumented)
+    contracts: Map<PluginName, unknown>;
+}
+
+// Warning: (ae-forgotten-export) The symbol "RecursiveReadonlyArray" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export type RecursiveReadonly<T> = T extends (...args: any[]) => any ? T : T extends any[] ? RecursiveReadonlyArray<T[number]> : T extends object ? Readonly<{
+    [K in keyof T]: RecursiveReadonly<T[K]>;
+}> : T;
+
+// @public
+export type RedirectResponseOptions = HttpResponseOptions & {
+    headers: {
+        location: string;
+    };
+};
+
+// @internal (undocumented)
+export interface RenderingServiceSetup {
+    render<R extends KibanaRequest | LegacyRequest>(request: R, uiSettings: IUiSettingsClient, options?: R extends LegacyRequest ? LegacyRenderOptions : IRenderOptions): Promise<string>;
+}
+
+// @public
+export type RequestHandler<P = unknown, Q = unknown, B = unknown, Method extends RouteMethod = any> = (context: RequestHandlerContext, request: KibanaRequest<P, Q, B, Method>, response: KibanaResponseFactory) => IKibanaResponse<any> | Promise<IKibanaResponse<any>>;
+
+// @public
+export interface RequestHandlerContext {
+    // (undocumented)
+    core: {
+        rendering: IScopedRenderingClient;
+        savedObjects: {
+            client: SavedObjectsClientContract;
+        };
+        elasticsearch: {
+            dataClient: IScopedClusterClient;
+            adminClient: IScopedClusterClient;
+        };
+        uiSettings: {
+            client: IUiSettingsClient;
+        };
+    };
+}
+
+// @public
+export type RequestHandlerContextContainer = IContextContainer<RequestHandler<any, any, any>>;
+
+// @public
+export type RequestHandlerContextProvider<TContextName extends keyof RequestHandlerContext> = IContextProvider<RequestHandler<any, any, any>, TContextName>;
+
+// @public
+export type ResponseError = string | Error | {
+    message: string | Error;
+    attributes?: ResponseErrorAttributes;
+};
+
+// @public
+export type ResponseErrorAttributes = Record<string, any>;
+
+// @public
+export type ResponseHeaders = {
+    [header in KnownHeaders]?: string | string[];
+} & {
+    [header: string]: string | string[];
+};
+
+// @public
+export interface RouteConfig<P, Q, B, Method extends RouteMethod> {
+    options?: RouteConfigOptions<Method>;
+    path: string;
+    validate: RouteValidatorFullConfig<P, Q, B> | false;
+}
+
+// @public
+export interface RouteConfigOptions<Method extends RouteMethod> {
+    authRequired?: boolean;
+    body?: Method extends 'get' | 'options' ? undefined : RouteConfigOptionsBody;
+    tags?: readonly string[];
+}
+
+// @public
+export interface RouteConfigOptionsBody {
+    accepts?: RouteContentType | RouteContentType[] | string | string[];
+    maxBytes?: number;
+    output?: typeof validBodyOutput[number];
+    parse?: boolean | 'gunzip';
+}
+
+// @public
+export type RouteContentType = 'application/json' | 'application/*+json' | 'application/octet-stream' | 'application/x-www-form-urlencoded' | 'multipart/form-data' | 'text/*';
+
+// @public
+export type RouteMethod = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options';
+
+// @public
+export type RouteRegistrar<Method extends RouteMethod> = <P, Q, B>(route: RouteConfig<P, Q, B, Method>, handler: RequestHandler<P, Q, B, Method>) => void;
+
+// @public
+export class RouteValidationError extends SchemaTypeError {
+    constructor(error: Error | string, path?: string[]);
+}
+
+// @public
+export type RouteValidationFunction<T> = (data: any, validationResult: RouteValidationResultFactory) => {
+    value: T;
+    error?: never;
+} | {
+    value?: never;
+    error: RouteValidationError;
+};
+
+// @public
+export interface RouteValidationResultFactory {
+    // (undocumented)
+    badRequest: (error: Error | string, path?: string[]) => {
+        error: RouteValidationError;
+    };
+    // (undocumented)
+    ok: <T>(value: T) => {
+        value: T;
+    };
+}
+
+// @public
+export type RouteValidationSpec<T> = ObjectType | Type<T> | RouteValidationFunction<T>;
+
+// @public
+export interface RouteValidatorConfig<P, Q, B> {
+    body?: RouteValidationSpec<B>;
+    params?: RouteValidationSpec<P>;
+    query?: RouteValidationSpec<Q>;
+}
+
+// @public
+export type RouteValidatorFullConfig<P, Q, B> = RouteValidatorConfig<P, Q, B> & RouteValidatorOptions;
+
+// @public
+export interface RouteValidatorOptions {
+    unsafe?: {
+        params?: boolean;
+        query?: boolean;
+        body?: boolean;
+    };
+}
+
+// @public (undocumented)
+export interface SavedObject<T extends SavedObjectAttributes = any> {
+    attributes: T;
+    // (undocumented)
+    error?: {
+        message: string;
+        statusCode: number;
+    };
+    id: string;
+    migrationVersion?: SavedObjectsMigrationVersion;
+    references: SavedObjectReference[];
+    type: string;
+    updated_at?: string;
+    version?: string;
+}
+
+// @public
+export type SavedObjectAttribute = SavedObjectAttributeSingle | SavedObjectAttributeSingle[];
+
+// @public
+export interface SavedObjectAttributes {
+    // (undocumented)
+    [key: string]: SavedObjectAttribute;
+}
+
+// @public
+export type SavedObjectAttributeSingle = string | number | boolean | null | undefined | SavedObjectAttributes;
+
+// @public
+export interface SavedObjectReference {
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    type: string;
+}
+
+// @public (undocumented)
+export interface SavedObjectsBaseOptions {
+    namespace?: string;
+}
+
+// @public (undocumented)
+export interface SavedObjectsBulkCreateObject<T extends SavedObjectAttributes = any> {
+    // (undocumented)
+    attributes: T;
+    // (undocumented)
+    id?: string;
+    migrationVersion?: SavedObjectsMigrationVersion;
+    // (undocumented)
+    references?: SavedObjectReference[];
+    // (undocumented)
+    type: string;
+}
+
+// @public (undocumented)
+export interface SavedObjectsBulkGetObject {
+    fields?: string[];
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    type: string;
+}
+
+// @public (undocumented)
+export interface SavedObjectsBulkResponse<T extends SavedObjectAttributes = any> {
+    // (undocumented)
+    saved_objects: Array<SavedObject<T>>;
+}
+
+// @public (undocumented)
+export interface SavedObjectsBulkResponse<T extends SavedObjectAttributes = any> {
+    // (undocumented)
+    saved_objects: Array<SavedObject<T>>;
+}
+
+// @public (undocumented)
+export interface SavedObjectsBulkUpdateObject<T extends SavedObjectAttributes = any> extends Pick<SavedObjectsUpdateOptions, 'version' | 'references'> {
+    attributes: Partial<T>;
+    id: string;
+    type: string;
+}
+
+// @public (undocumented)
+export interface SavedObjectsBulkUpdateOptions extends SavedObjectsBaseOptions {
+    refresh?: MutatingOperationRefreshSetting;
+}
+
+// @public (undocumented)
+export interface SavedObjectsBulkUpdateResponse<T extends SavedObjectAttributes = any> {
+    // (undocumented)
+    saved_objects: Array<SavedObjectsUpdateResponse<T>>;
+}
+
+// @public (undocumented)
+export class SavedObjectsClient {
+    // @internal
+    constructor(repository: ISavedObjectsRepository);
+    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?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
+    create<T extends SavedObjectAttributes = any>(type: string, attributes: T, options?: SavedObjectsCreateOptions): Promise<SavedObject<T>>;
+    delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
+    // (undocumented)
+    static errors: typeof SavedObjectsErrorHelpers;
+    // (undocumented)
+    errors: typeof SavedObjectsErrorHelpers;
+    find<T extends SavedObjectAttributes = any>(options: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
+    get<T extends SavedObjectAttributes = any>(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<SavedObject<T>>;
+    update<T extends SavedObjectAttributes = any>(type: string, id: string, attributes: Partial<T>, options?: SavedObjectsUpdateOptions): Promise<SavedObjectsUpdateResponse<T>>;
+}
+
+// @public
+export type SavedObjectsClientContract = Pick<SavedObjectsClient, keyof SavedObjectsClient>;
+
+// @public
+export type SavedObjectsClientFactory<Request = unknown> = ({ request, }: {
+    request: Request;
+}) => SavedObjectsClientContract;
+
+// @public
+export interface SavedObjectsClientProviderOptions {
+    // (undocumented)
+    excludedWrappers?: string[];
+}
+
+// @public
+export type SavedObjectsClientWrapperFactory<Request = unknown> = (options: SavedObjectsClientWrapperOptions<Request>) => SavedObjectsClientContract;
+
+// @public
+export interface SavedObjectsClientWrapperOptions<Request = unknown> {
+    // (undocumented)
+    client: SavedObjectsClientContract;
+    // (undocumented)
+    request: Request;
+}
+
+// @public (undocumented)
+export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions {
+    id?: string;
+    migrationVersion?: SavedObjectsMigrationVersion;
+    overwrite?: boolean;
+    // (undocumented)
+    references?: SavedObjectReference[];
+    refresh?: MutatingOperationRefreshSetting;
+}
+
+// @public (undocumented)
+export interface SavedObjectsDeleteByNamespaceOptions extends SavedObjectsBaseOptions {
+    refresh?: MutatingOperationRefreshSetting;
+}
+
+// @public (undocumented)
+export interface SavedObjectsDeleteOptions extends SavedObjectsBaseOptions {
+    refresh?: MutatingOperationRefreshSetting;
+}
+
+// @public (undocumented)
+export class SavedObjectsErrorHelpers {
+    // (undocumented)
+    static createBadRequestError(reason?: string): DecoratedError;
+    // (undocumented)
+    static createEsAutoCreateIndexError(): DecoratedError;
+    // (undocumented)
+    static createGenericNotFoundError(type?: string | null, id?: string | null): DecoratedError;
+    // (undocumented)
+    static createInvalidVersionError(versionInput?: string): DecoratedError;
+    // (undocumented)
+    static createUnsupportedTypeError(type: string): DecoratedError;
+    // (undocumented)
+    static decorateBadRequestError(error: Error, reason?: string): DecoratedError;
+    // (undocumented)
+    static decorateConflictError(error: Error, reason?: string): DecoratedError;
+    // (undocumented)
+    static decorateEsUnavailableError(error: Error, reason?: string): DecoratedError;
+    // (undocumented)
+    static decorateForbiddenError(error: Error, reason?: string): DecoratedError;
+    // (undocumented)
+    static decorateGeneralError(error: Error, reason?: string): DecoratedError;
+    // (undocumented)
+    static decorateNotAuthorizedError(error: Error, reason?: string): DecoratedError;
+    // (undocumented)
+    static decorateRequestEntityTooLargeError(error: Error, reason?: string): DecoratedError;
+    // (undocumented)
+    static isBadRequestError(error: Error | DecoratedError): boolean;
+    // (undocumented)
+    static isConflictError(error: Error | DecoratedError): boolean;
+    // (undocumented)
+    static isEsAutoCreateIndexError(error: Error | DecoratedError): boolean;
+    // (undocumented)
+    static isEsUnavailableError(error: Error | DecoratedError): boolean;
+    // (undocumented)
+    static isForbiddenError(error: Error | DecoratedError): boolean;
+    // (undocumented)
+    static isInvalidVersionError(error: Error | DecoratedError): boolean;
+    // (undocumented)
+    static isNotAuthorizedError(error: Error | DecoratedError): boolean;
+    // (undocumented)
+    static isNotFoundError(error: Error | DecoratedError): boolean;
+    // (undocumented)
+    static isRequestEntityTooLargeError(error: Error | DecoratedError): boolean;
+    // Warning: (ae-forgotten-export) The symbol "DecoratedError" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    static isSavedObjectsClientError(error: any): error is DecoratedError;
+}
+
+// @public
+export interface SavedObjectsExportOptions {
+    excludeExportDetails?: boolean;
+    exportSizeLimit: number;
+    includeReferencesDeep?: boolean;
+    namespace?: string;
+    objects?: Array<{
+        id: string;
+        type: string;
+    }>;
+    savedObjectsClient: SavedObjectsClientContract;
+    search?: string;
+    types?: string[];
+}
+
+// @public
+export interface SavedObjectsExportResultDetails {
+    exportedCount: number;
+    missingRefCount: number;
+    missingReferences: Array<{
+        id: string;
+        type: string;
+    }>;
+}
+
+// @public (undocumented)
+export interface SavedObjectsFindOptions extends SavedObjectsBaseOptions {
+    // (undocumented)
+    defaultSearchOperator?: 'AND' | 'OR';
+    fields?: string[];
+    // (undocumented)
+    filter?: string;
+    // (undocumented)
+    hasReference?: {
+        type: string;
+        id: string;
+    };
+    // (undocumented)
+    page?: number;
+    // (undocumented)
+    perPage?: number;
+    search?: string;
+    searchFields?: string[];
+    // (undocumented)
+    sortField?: string;
+    // (undocumented)
+    sortOrder?: string;
+    // (undocumented)
+    type: string | string[];
+}
+
+// @public
+export interface SavedObjectsFindResponse<T extends SavedObjectAttributes = any> {
+    // (undocumented)
+    page: number;
+    // (undocumented)
+    per_page: number;
+    // (undocumented)
+    saved_objects: Array<SavedObject<T>>;
+    // (undocumented)
+    total: number;
+}
+
+// @public
+export interface SavedObjectsImportConflictError {
+    // (undocumented)
+    type: 'conflict';
+}
+
+// @public
+export interface SavedObjectsImportError {
+    // (undocumented)
+    error: SavedObjectsImportConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    title?: string;
+    // (undocumented)
+    type: string;
+}
+
+// @public
+export interface SavedObjectsImportMissingReferencesError {
+    // (undocumented)
+    blocking: Array<{
+        type: string;
+        id: string;
+    }>;
+    // (undocumented)
+    references: Array<{
+        type: string;
+        id: string;
+    }>;
+    // (undocumented)
+    type: 'missing_references';
+}
+
+// @public
+export interface SavedObjectsImportOptions {
+    // (undocumented)
+    namespace?: string;
+    // (undocumented)
+    objectLimit: number;
+    // (undocumented)
+    overwrite: boolean;
+    // (undocumented)
+    readStream: Readable;
+    // (undocumented)
+    savedObjectsClient: SavedObjectsClientContract;
+    // (undocumented)
+    supportedTypes: string[];
+}
+
+// @public
+export interface SavedObjectsImportResponse {
+    // (undocumented)
+    errors?: SavedObjectsImportError[];
+    // (undocumented)
+    success: boolean;
+    // (undocumented)
+    successCount: number;
+}
+
+// @public
+export interface SavedObjectsImportRetry {
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    overwrite: boolean;
+    // (undocumented)
+    replaceReferences: Array<{
+        type: string;
+        from: string;
+        to: string;
+    }>;
+    // (undocumented)
+    type: string;
+}
+
+// @public
+export interface SavedObjectsImportUnknownError {
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    statusCode: number;
+    // (undocumented)
+    type: 'unknown';
+}
+
+// @public
+export interface SavedObjectsImportUnsupportedTypeError {
+    // (undocumented)
+    type: 'unsupported_type';
+}
+
+// @public (undocumented)
+export interface SavedObjectsIncrementCounterOptions extends SavedObjectsBaseOptions {
+    // (undocumented)
+    migrationVersion?: SavedObjectsMigrationVersion;
+    refresh?: MutatingOperationRefreshSetting;
+}
+
+// @internal @deprecated (undocumented)
+export interface SavedObjectsLegacyService<Request = any> {
+    // Warning: (ae-forgotten-export) The symbol "SavedObjectsClientProvider" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    addScopedSavedObjectsClientWrapperFactory: SavedObjectsClientProvider<Request>['addClientWrapperFactory'];
+    // (undocumented)
+    getSavedObjectsRepository(...rest: any[]): any;
+    // (undocumented)
+    getScopedSavedObjectsClient: SavedObjectsClientProvider<Request>['getClient'];
+    // (undocumented)
+    importExport: {
+        objectLimit: number;
+        importSavedObjects(options: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;
+        resolveImportErrors(options: SavedObjectsResolveImportErrorsOptions): Promise<SavedObjectsImportResponse>;
+        getSortedObjectsForExport(options: SavedObjectsExportOptions): Promise<Readable>;
+    };
+    // (undocumented)
+    SavedObjectsClient: typeof SavedObjectsClient;
+    // (undocumented)
+    schema: SavedObjectsSchema;
+    // (undocumented)
+    setScopedSavedObjectsClientFactory: SavedObjectsClientProvider<Request>['setClientFactory'];
+    // (undocumented)
+    types: string[];
+}
+
+// @public (undocumented)
+export interface SavedObjectsMigrationLogger {
+    // (undocumented)
+    debug: (msg: string) => void;
+    // (undocumented)
+    info: (msg: string) => void;
+    // (undocumented)
+    warning: (msg: string) => void;
+}
+
+// @public
+export interface SavedObjectsMigrationVersion {
+    // (undocumented)
+    [pluginName: string]: string;
+}
+
+// Warning: (ae-missing-release-tag) "RawDoc" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public
+export interface SavedObjectsRawDoc {
+    // (undocumented)
+    _id: string;
+    // (undocumented)
+    _primary_term?: number;
+    // (undocumented)
+    _seq_no?: number;
+    // (undocumented)
+    _source: any;
+    // (undocumented)
+    _type?: string;
+}
+
+// @public (undocumented)
+export class 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?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
+    create<T extends SavedObjectAttributes>(type: string, attributes: T, options?: SavedObjectsCreateOptions): Promise<SavedObject<T>>;
+    // Warning: (ae-forgotten-export) The symbol "KibanaMigrator" needs to be exported by the entry point index.d.ts
+    //
+    // @internal
+    static createRepository(migrator: KibanaMigrator, schema: SavedObjectsSchema, config: LegacyConfig, indexName: string, callCluster: APICaller, extraTypes?: string[], injectedConstructor?: any): any;
+    delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
+    deleteByNamespace(namespace: string, options?: SavedObjectsDeleteByNamespaceOptions): Promise<any>;
+    // (undocumented)
+    find<T extends SavedObjectAttributes = any>({ search, defaultSearchOperator, searchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespace, type, filter, }: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
+    get<T extends SavedObjectAttributes = any>(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<SavedObject<T>>;
+    incrementCounter(type: string, id: string, counterFieldName: string, options?: SavedObjectsIncrementCounterOptions): Promise<{
+        id: string;
+        type: string;
+        updated_at: string;
+        references: any;
+        version: string;
+        attributes: any;
+    }>;
+    update<T extends SavedObjectAttributes = any>(type: string, id: string, attributes: Partial<T>, options?: SavedObjectsUpdateOptions): Promise<SavedObjectsUpdateResponse<T>>;
+    }
+
+// @public
+export interface SavedObjectsResolveImportErrorsOptions {
+    // (undocumented)
+    namespace?: string;
+    // (undocumented)
+    objectLimit: number;
+    // (undocumented)
+    readStream: Readable;
+    // (undocumented)
+    retries: SavedObjectsImportRetry[];
+    // (undocumented)
+    savedObjectsClient: SavedObjectsClientContract;
+    // (undocumented)
+    supportedTypes: string[];
+}
+
+// @internal (undocumented)
+export class SavedObjectsSchema {
+    // Warning: (ae-forgotten-export) The symbol "SavedObjectsSchemaDefinition" needs to be exported by the entry point index.d.ts
+    constructor(schemaDefinition?: SavedObjectsSchemaDefinition);
+    // (undocumented)
+    getConvertToAliasScript(type: string): string | undefined;
+    // (undocumented)
+    getIndexForType(config: LegacyConfig, type: string): string | undefined;
+    // (undocumented)
+    isHiddenType(type: string): boolean;
+    // (undocumented)
+    isNamespaceAgnostic(type: string): boolean;
+}
+
+// @internal (undocumented)
+export class SavedObjectsSerializer {
+    constructor(schema: SavedObjectsSchema);
+    generateRawId(namespace: string | undefined, type: string, id?: string): string;
+    isRawSavedObject(rawDoc: SavedObjectsRawDoc): any;
+    // Warning: (ae-forgotten-export) The symbol "SanitizedSavedObjectDoc" needs to be exported by the entry point index.d.ts
+    rawToSavedObject(doc: SavedObjectsRawDoc): SanitizedSavedObjectDoc;
+    savedObjectToRaw(savedObj: SanitizedSavedObjectDoc): SavedObjectsRawDoc;
+    }
+
+// @public
+export interface SavedObjectsServiceSetup {
+    addClientWrapper: (priority: number, id: string, factory: SavedObjectsClientWrapperFactory<KibanaRequest>) => void;
+    createInternalRepository: (extraTypes?: string[]) => ISavedObjectsRepository;
+    createScopedRepository: (req: KibanaRequest, extraTypes?: string[]) => ISavedObjectsRepository;
+    setClientFactory: (customClientFactory: SavedObjectsClientFactory<KibanaRequest>) => void;
+}
+
+// @public
+export interface SavedObjectsServiceStart {
+    getScopedClient: (req: KibanaRequest, options?: SavedObjectsClientProviderOptions) => SavedObjectsClientContract;
+}
+
+// @public (undocumented)
+export interface SavedObjectsUpdateOptions extends SavedObjectsBaseOptions {
+    references?: SavedObjectReference[];
+    refresh?: MutatingOperationRefreshSetting;
+    version?: string;
+}
+
+// @public (undocumented)
+export interface SavedObjectsUpdateResponse<T extends SavedObjectAttributes = any> extends Omit<SavedObject<T>, 'attributes' | 'references'> {
+    // (undocumented)
+    attributes: Partial<T>;
+    // (undocumented)
+    references: SavedObjectReference[] | undefined;
+}
+
+// @public
+export type ScopeableRequest = KibanaRequest | LegacyRequest | FakeRequest;
+
+// @public
+export class ScopedClusterClient implements IScopedClusterClient {
+    constructor(internalAPICaller: APICaller, scopedAPICaller: APICaller, headers?: Headers | undefined);
+    callAsCurrentUser(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<any>;
+    callAsInternalUser(endpoint: string, clientParams?: Record<string, any>, options?: CallAPIOptions): Promise<any>;
+    }
+
+// @public
+export interface SessionCookieValidationResult {
+    isValid: boolean;
+    path?: string;
+}
+
+// @public
+export interface SessionStorage<T> {
+    clear(): void;
+    get(): Promise<T | null>;
+    set(sessionValue: T): void;
+}
+
+// @public
+export interface SessionStorageCookieOptions<T> {
+    encryptionKey: string;
+    isSecure: boolean;
+    name: string;
+    validate: (sessionValue: T | T[]) => SessionCookieValidationResult;
+}
+
+// @public
+export interface SessionStorageFactory<T> {
+    // (undocumented)
+    asScoped: (request: KibanaRequest) => SessionStorage<T>;
+}
+
+// @public (undocumented)
+export type SharedGlobalConfig = RecursiveReadonly_2<{
+    kibana: Pick<KibanaConfigType_2, typeof SharedGlobalConfigKeys.kibana[number]>;
+    elasticsearch: Pick<ElasticsearchConfigType, typeof SharedGlobalConfigKeys.elasticsearch[number]>;
+    path: Pick<PathConfigType, typeof SharedGlobalConfigKeys.path[number]>;
+}>;
+
+// @public
+export interface UiSettingsParams {
+    category?: string[];
+    description?: string;
+    name?: string;
+    optionLabels?: Record<string, string>;
+    options?: string[];
+    readonly?: boolean;
+    requiresPageReload?: boolean;
+    type?: UiSettingsType;
+    value?: SavedObjectAttribute;
+}
+
+// @public (undocumented)
+export interface UiSettingsServiceSetup {
+    register(settings: Record<string, UiSettingsParams>): void;
+}
+
+// @public (undocumented)
+export interface UiSettingsServiceStart {
+    asScopedToClient(savedObjectsClient: SavedObjectsClientContract): IUiSettingsClient;
+}
+
+// @public
+export type UiSettingsType = 'json' | 'markdown' | 'number' | 'select' | 'boolean' | 'string';
+
+// @public
+export interface UserProvidedValues<T = any> {
+    // (undocumented)
+    isOverridden?: boolean;
+    // (undocumented)
+    userValue?: T;
+}
+
+// @public
+export interface UuidServiceSetup {
+    getInstanceUuid(): string;
+}
+
+// @public
+export const validBodyOutput: readonly ["data", "stream"];
+
+
+// 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/legacy/types.ts:158:3 - (ae-forgotten-export) The symbol "VarsProvider" needs to be exported by the entry point index.d.ts
+// src/core/server/legacy/types.ts:159:3 - (ae-forgotten-export) The symbol "VarsReplacer" needs to be exported by the entry point index.d.ts
+// src/core/server/legacy/types.ts:160:3 - (ae-forgotten-export) The symbol "LegacyNavLinkSpec" needs to be exported by the entry point index.d.ts
+// src/core/server/legacy/types.ts:161:3 - (ae-forgotten-export) The symbol "LegacyAppSpec" needs to be exported by the entry point index.d.ts
+// src/core/server/legacy/types.ts:162:16 - (ae-forgotten-export) The symbol "LegacyPluginSpec" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/plugins_service.ts:43:5 - (ae-forgotten-export) The symbol "InternalPluginInfo" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/types.ts:221:3 - (ae-forgotten-export) The symbol "KibanaConfigType" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/types.ts:221:3 - (ae-forgotten-export) The symbol "SharedGlobalConfigKeys" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/types.ts:222:3 - (ae-forgotten-export) The symbol "ElasticsearchConfigType" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/types.ts:223:3 - (ae-forgotten-export) The symbol "PathConfigType" needs to be exported by the entry point index.d.ts
+
+```
diff --git a/src/core/server/server.test.mocks.ts b/src/core/server/server.test.mocks.ts
index 7820a14fec8f3..038c4651ff5a7 100644
--- a/src/core/server/server.test.mocks.ts
+++ b/src/core/server/server.test.mocks.ts
@@ -35,14 +35,8 @@ jest.doMock('./elasticsearch/elasticsearch_service', () => ({
   ElasticsearchService: jest.fn(() => mockElasticsearchService),
 }));
 
-import { ILegacyService } from './legacy/legacy_service';
-export const mockLegacyService: ILegacyService = {
-  legacyId: Symbol(),
-  discoverPlugins: jest.fn().mockReturnValue({ uiExports: {} }),
-  setup: jest.fn(),
-  start: jest.fn(),
-  stop: jest.fn(),
-};
+import { legacyServiceMock } from './legacy/legacy_service.mock';
+export const mockLegacyService = legacyServiceMock.create();
 jest.mock('./legacy/legacy_service', () => ({
   LegacyService: jest.fn(() => mockLegacyService),
 }));
@@ -65,7 +59,23 @@ jest.doMock('./context/context_service', () => ({
   ContextService: jest.fn(() => mockContextService),
 }));
 
+import { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
+export const mockUiSettingsService = uiSettingsServiceMock.create();
+jest.doMock('./ui_settings/ui_settings_service', () => ({
+  UiSettingsService: jest.fn(() => mockUiSettingsService),
+}));
+
 export const mockEnsureValidConfiguration = jest.fn();
 jest.doMock('./legacy/config/ensure_valid_configuration', () => ({
   ensureValidConfiguration: mockEnsureValidConfiguration,
 }));
+
+import { RenderingService, mockRenderingService } from './rendering/__mocks__/rendering_service';
+export { mockRenderingService };
+jest.doMock('./rendering/rendering_service', () => ({ RenderingService }));
+
+import { uuidServiceMock } from './uuid/uuid_service.mock';
+export const mockUuidService = uuidServiceMock.create();
+jest.doMock('./uuid/uuid_service', () => ({
+  UuidService: jest.fn(() => mockUuidService),
+}));
diff --git a/src/core/server/server.test.ts b/src/core/server/server.test.ts
index d593a6275fa4c..161dd3759a218 100644
--- a/src/core/server/server.test.ts
+++ b/src/core/server/server.test.ts
@@ -26,6 +26,8 @@ import {
   mockSavedObjectsService,
   mockContextService,
   mockEnsureValidConfiguration,
+  mockUiSettingsService,
+  mockRenderingService,
 } from './server.test.mocks';
 
 import { BehaviorSubject } from 'rxjs';
@@ -57,6 +59,8 @@ test('sets up services on "setup"', async () => {
   expect(mockPluginsService.setup).not.toHaveBeenCalled();
   expect(mockLegacyService.setup).not.toHaveBeenCalled();
   expect(mockSavedObjectsService.setup).not.toHaveBeenCalled();
+  expect(mockUiSettingsService.setup).not.toHaveBeenCalled();
+  expect(mockRenderingService.setup).not.toHaveBeenCalled();
 
   await server.setup();
 
@@ -65,6 +69,8 @@ test('sets up services on "setup"', async () => {
   expect(mockPluginsService.setup).toHaveBeenCalledTimes(1);
   expect(mockLegacyService.setup).toHaveBeenCalledTimes(1);
   expect(mockSavedObjectsService.setup).toHaveBeenCalledTimes(1);
+  expect(mockUiSettingsService.setup).toHaveBeenCalledTimes(1);
+  expect(mockRenderingService.setup).toHaveBeenCalledTimes(1);
 });
 
 test('injects legacy dependency to context#setup()', async () => {
@@ -100,11 +106,14 @@ test('runs services on "start"', async () => {
   expect(mockHttpService.start).not.toHaveBeenCalled();
   expect(mockLegacyService.start).not.toHaveBeenCalled();
   expect(mockSavedObjectsService.start).not.toHaveBeenCalled();
+  expect(mockUiSettingsService.start).not.toHaveBeenCalled();
+
   await server.start();
 
   expect(mockHttpService.start).toHaveBeenCalledTimes(1);
   expect(mockLegacyService.start).toHaveBeenCalledTimes(1);
   expect(mockSavedObjectsService.start).toHaveBeenCalledTimes(1);
+  expect(mockUiSettingsService.start).toHaveBeenCalledTimes(1);
 });
 
 test('does not fail on "setup" if there are unused paths detected', async () => {
@@ -125,6 +134,7 @@ test('stops services on "stop"', async () => {
   expect(mockPluginsService.stop).not.toHaveBeenCalled();
   expect(mockLegacyService.stop).not.toHaveBeenCalled();
   expect(mockSavedObjectsService.stop).not.toHaveBeenCalled();
+  expect(mockUiSettingsService.stop).not.toHaveBeenCalled();
 
   await server.stop();
 
@@ -133,6 +143,7 @@ test('stops services on "stop"', async () => {
   expect(mockPluginsService.stop).toHaveBeenCalledTimes(1);
   expect(mockLegacyService.stop).toHaveBeenCalledTimes(1);
   expect(mockSavedObjectsService.stop).toHaveBeenCalledTimes(1);
+  expect(mockUiSettingsService.stop).toHaveBeenCalledTimes(1);
 });
 
 test(`doesn't setup core services if config validation fails`, async () => {
@@ -146,6 +157,8 @@ test(`doesn't setup core services if config validation fails`, async () => {
   expect(mockElasticsearchService.setup).not.toHaveBeenCalled();
   expect(mockPluginsService.setup).not.toHaveBeenCalled();
   expect(mockLegacyService.setup).not.toHaveBeenCalled();
+  expect(mockUiSettingsService.setup).not.toHaveBeenCalled();
+  expect(mockRenderingService.setup).not.toHaveBeenCalled();
 });
 
 test(`doesn't setup core services if legacy config validation fails`, async () => {
@@ -164,4 +177,5 @@ test(`doesn't setup core services if legacy config validation fails`, async () =
   expect(mockPluginsService.setup).not.toHaveBeenCalled();
   expect(mockLegacyService.setup).not.toHaveBeenCalled();
   expect(mockSavedObjectsService.stop).not.toHaveBeenCalled();
+  expect(mockUiSettingsService.setup).not.toHaveBeenCalled();
 });
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index 725a45f131992..eced24b84908c 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -29,6 +29,7 @@ import {
 } from './config';
 import { ElasticsearchService } from './elasticsearch';
 import { HttpService, InternalHttpServiceSetup } from './http';
+import { RenderingService, RenderingServiceSetup } from './rendering';
 import { LegacyService, ensureValidConfiguration } from './legacy';
 import { Logger, LoggerFactory } from './logging';
 import { UiSettingsService } from './ui_settings';
@@ -44,11 +45,12 @@ import { config as pathConfig } from './path';
 import { config as kibanaConfig } from './kibana_config';
 import { config as savedObjectsConfig } from './saved_objects';
 import { config as uiSettingsConfig } from './ui_settings';
-import { mapToObject } from '../utils/';
+import { mapToObject } from '../utils';
 import { ContextService } from './context';
 import { RequestHandlerContext } from '.';
 import { InternalCoreSetup } from './internal_types';
 import { CapabilitiesService } from './capabilities';
+import { UuidService } from './uuid';
 
 const coreId = Symbol('core');
 const rootConfigPath = '';
@@ -59,11 +61,13 @@ export class Server {
   private readonly context: ContextService;
   private readonly elasticsearch: ElasticsearchService;
   private readonly http: HttpService;
+  private readonly rendering: RenderingService;
   private readonly legacy: LegacyService;
   private readonly log: Logger;
   private readonly plugins: PluginsService;
   private readonly savedObjects: SavedObjectsService;
   private readonly uiSettings: UiSettingsService;
+  private readonly uuid: UuidService;
 
   constructor(
     rawConfigProvider: RawConfigurationProvider,
@@ -76,12 +80,14 @@ export class Server {
     const core = { coreId, configService: this.configService, env, logger };
     this.context = new ContextService(core);
     this.http = new HttpService(core);
+    this.rendering = new RenderingService(core);
     this.plugins = new PluginsService(core);
     this.legacy = new LegacyService(core);
     this.elasticsearch = new ElasticsearchService(core);
     this.savedObjects = new SavedObjectsService(core);
     this.uiSettings = new UiSettingsService(core);
     this.capabilities = new CapabilitiesService(core);
+    this.uuid = new UuidService(core);
   }
 
   public async setup() {
@@ -106,6 +112,8 @@ export class Server {
       ]),
     });
 
+    const uuidSetup = await this.uuid.setup();
+
     const httpSetup = await this.http.setup({
       context: contextServiceSetup,
     });
@@ -134,16 +142,23 @@ export class Server {
       http: httpSetup,
       uiSettings: uiSettingsSetup,
       savedObjects: savedObjectsSetup,
+      uuid: uuidSetup,
     };
 
     const pluginsSetup = await this.plugins.setup(coreSetup);
 
+    const renderingSetup = await this.rendering.setup({
+      http: httpSetup,
+      legacyPlugins,
+      plugins: pluginsSetup,
+    });
+
     await this.legacy.setup({
-      core: { ...coreSetup, plugins: pluginsSetup },
+      core: { ...coreSetup, plugins: pluginsSetup, rendering: renderingSetup },
       plugins: mapToObject(pluginsSetup.contracts),
     });
 
-    this.registerCoreContext(coreSetup);
+    this.registerCoreContext(coreSetup, renderingSetup);
 
     return coreSetup;
   }
@@ -152,14 +167,18 @@ export class Server {
     this.log.debug('starting server');
     const savedObjectsStart = await this.savedObjects.start({});
     const capabilitiesStart = this.capabilities.start();
+    const uiSettingsStart = await this.uiSettings.start();
+
     const pluginsStart = await this.plugins.start({
       capabilities: capabilitiesStart,
       savedObjects: savedObjectsStart,
+      uiSettings: uiSettingsStart,
     });
 
     const coreStart = {
       capabilities: capabilitiesStart,
       savedObjects: savedObjectsStart,
+      uiSettings: uiSettingsStart,
       plugins: pluginsStart,
     };
     await this.legacy.start({
@@ -168,6 +187,7 @@ export class Server {
     });
 
     await this.http.start();
+    await this.rendering.start();
 
     return coreStart;
   }
@@ -180,6 +200,8 @@ export class Server {
     await this.savedObjects.stop();
     await this.elasticsearch.stop();
     await this.http.stop();
+    await this.uiSettings.stop();
+    await this.rendering.stop();
   }
 
   private registerDefaultRoute(httpSetup: InternalHttpServiceSetup) {
@@ -189,19 +211,22 @@ export class Server {
     );
   }
 
-  private registerCoreContext(coreSetup: InternalCoreSetup) {
+  private registerCoreContext(coreSetup: InternalCoreSetup, rendering: RenderingServiceSetup) {
     coreSetup.http.registerRouteHandlerContext(
       coreId,
       'core',
-      async (context, req): Promise<RequestHandlerContext['core']> => {
+      async (context, req, res): Promise<RequestHandlerContext['core']> => {
+        // it consumes elasticsearch observables to provide the same client throughout the context lifetime.
         const adminClient = await coreSetup.elasticsearch.adminClient$.pipe(take(1)).toPromise();
         const dataClient = await coreSetup.elasticsearch.dataClient$.pipe(take(1)).toPromise();
         const savedObjectsClient = coreSetup.savedObjects.getScopedClient(req);
+        const uiSettingsClient = coreSetup.uiSettings.asScopedToClient(savedObjectsClient);
 
         return {
+          rendering: {
+            render: rendering.render.bind(rendering, req, uiSettingsClient),
+          },
           savedObjects: {
-            // Note: the client provider doesn't support new ES clients
-            // emitted from adminClient$
             client: savedObjectsClient,
           },
           elasticsearch: {
@@ -209,7 +234,7 @@ export class Server {
             dataClient: dataClient.asScoped(req),
           },
           uiSettings: {
-            client: coreSetup.uiSettings.asScopedToClient(savedObjectsClient),
+            client: uiSettingsClient,
           },
         };
       }
@@ -231,6 +256,10 @@ export class Server {
     ];
 
     this.configService.addDeprecationProvider(rootConfigPath, coreDeprecationProvider);
+    this.configService.addDeprecationProvider(
+      uiSettingsConfig.path,
+      uiSettingsConfig.deprecations!
+    );
 
     for (const [path, schema] of schemas) {
       await this.configService.setSchema(path, schema);
diff --git a/src/core/server/types.ts b/src/core/server/types.ts
index 6e3e6bfe208a6..9919c7f0386b5 100644
--- a/src/core/server/types.ts
+++ b/src/core/server/types.ts
@@ -21,5 +21,6 @@
 export { PluginOpaqueId } from './plugins/types';
 export * from './saved_objects/types';
 export * from './ui_settings/types';
+export * from './legacy/types';
 export { EnvironmentMode, PackageInfo } from './config/types';
 export { ICspConfig } from './csp';
diff --git a/src/core/server/ui_settings/index.ts b/src/core/server/ui_settings/index.ts
index fd0a21bed4e12..f1185474c2160 100644
--- a/src/core/server/ui_settings/index.ts
+++ b/src/core/server/ui_settings/index.ts
@@ -24,9 +24,11 @@ export { UiSettingsService } from './ui_settings_service';
 
 export {
   UiSettingsServiceSetup,
+  UiSettingsServiceStart,
   IUiSettingsClient,
   UiSettingsParams,
   InternalUiSettingsServiceSetup,
+  InternalUiSettingsServiceStart,
   UiSettingsType,
   UserProvidedValues,
 } from './types';
diff --git a/src/core/server/ui_settings/types.ts b/src/core/server/ui_settings/types.ts
index 49d3d3b33392f..5e3f0a4fbb6bd 100644
--- a/src/core/server/ui_settings/types.ts
+++ b/src/core/server/ui_settings/types.ts
@@ -125,6 +125,7 @@ export interface UiSettingsServiceSetup {
    * @param settings
    *
    * @example
+   * ```ts
    * setup(core: CoreSetup){
    *  core.uiSettings.register([{
    *   foo: {
@@ -134,6 +135,29 @@ export interface UiSettingsServiceSetup {
    *   },
    *  }]);
    * }
+   * ```
    */
   register(settings: Record<string, UiSettingsParams>): void;
 }
+
+/** @public */
+export interface UiSettingsServiceStart {
+  /**
+   * Creates a {@link IUiSettingsClient} with provided *scoped* saved objects client.
+   *
+   * This should only be used in the specific case where the client needs to be accessed
+   * from outside of the scope of a {@link RequestHandler}.
+   *
+   * @example
+   * ```ts
+   * start(core: CoreStart) {
+   *  const soClient = core.savedObjects.getScopedClient(arbitraryRequest);
+   *  const uiSettingsClient = core.uiSettings.asScopedToClient(soClient);
+   * }
+   * ```
+   */
+  asScopedToClient(savedObjectsClient: SavedObjectsClientContract): IUiSettingsClient;
+}
+
+/** @internal */
+export type InternalUiSettingsServiceStart = UiSettingsServiceStart;
diff --git a/src/core/server/ui_settings/ui_settings_config.ts b/src/core/server/ui_settings/ui_settings_config.ts
index 702286f953ef1..a54d482a0296a 100644
--- a/src/core/server/ui_settings/ui_settings_config.ts
+++ b/src/core/server/ui_settings/ui_settings_config.ts
@@ -18,15 +18,35 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
+import { ConfigDeprecationProvider } from 'src/core/server';
+import { ServiceConfigDescriptor } from '../internal_types';
 
-export type UiSettingsConfigType = TypeOf<typeof config.schema>;
+const deprecations: ConfigDeprecationProvider = ({ unused, renameFromRoot }) => [
+  unused('enabled'),
+  renameFromRoot('server.defaultRoute', 'uiSettings.overrides.defaultRoute'),
+];
 
-export const config = {
+const configSchema = schema.object({
+  overrides: schema.object(
+    {
+      defaultRoute: schema.maybe(
+        schema.string({
+          validate(value) {
+            if (!value.startsWith('/')) {
+              return 'must start with a slash';
+            }
+          },
+        })
+      ),
+    },
+    { allowUnknowns: true }
+  ),
+});
+
+export type UiSettingsConfigType = TypeOf<typeof configSchema>;
+
+export const config: ServiceConfigDescriptor<UiSettingsConfigType> = {
   path: 'uiSettings',
-  schema: schema.object({
-    overrides: schema.object({}, { allowUnknowns: true }),
-    // Deprecation is implemented in LP.
-    // We define schema here not to fail on the validation step.
-    enabled: schema.maybe(schema.boolean()),
-  }),
+  schema: configSchema,
+  deprecations,
 };
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 bb21109a2f967..cd781e9759b07 100644
--- a/src/core/server/ui_settings/ui_settings_service.mock.ts
+++ b/src/core/server/ui_settings/ui_settings_service.mock.ts
@@ -17,7 +17,12 @@
  * under the License.
  */
 
-import { IUiSettingsClient, InternalUiSettingsServiceSetup } from './types';
+import {
+  IUiSettingsClient,
+  InternalUiSettingsServiceSetup,
+  InternalUiSettingsServiceStart,
+} from './types';
+import { UiSettingsService } from './ui_settings_service';
 
 const createClientMock = () => {
   const mocked: jest.Mocked<IUiSettingsClient> = {
@@ -32,6 +37,9 @@ const createClientMock = () => {
     isOverridden: jest.fn(),
   };
   mocked.get.mockResolvedValue(false);
+  mocked.getAll.mockResolvedValue({});
+  mocked.getRegistered.mockReturnValue({});
+  mocked.getUserProvided.mockResolvedValue({});
   return mocked;
 };
 
@@ -46,7 +54,31 @@ const createSetupMock = () => {
   return mocked;
 };
 
+const createStartMock = () => {
+  const mocked: jest.Mocked<InternalUiSettingsServiceStart> = {
+    asScopedToClient: jest.fn(),
+  };
+
+  mocked.asScopedToClient.mockReturnValue(createClientMock());
+
+  return mocked;
+};
+
+type UiSettingsServiceContract = PublicMethodsOf<UiSettingsService>;
+const createMock = () => {
+  const mocked: jest.Mocked<UiSettingsServiceContract> = {
+    setup: jest.fn(),
+    start: jest.fn(),
+    stop: jest.fn(),
+  };
+  mocked.setup.mockResolvedValue(createSetupMock());
+  mocked.start.mockResolvedValue(createStartMock());
+  return mocked;
+};
+
 export const uiSettingsServiceMock = {
   createSetupContract: createSetupMock,
+  createStartContract: createStartMock,
   createClient: createClientMock,
+  create: createMock,
 };
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 d7a085a220190..9b6a5ba0a4884 100644
--- a/src/core/server/ui_settings/ui_settings_service.test.ts
+++ b/src/core/server/ui_settings/ui_settings_service.test.ts
@@ -22,7 +22,6 @@ 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 { mockCoreContext } from '../core_context.mock';
 
@@ -69,27 +68,6 @@ describe('uiSettings', () => {
         expect(MockUiSettingsClientConstructor.mock.calls[0][0].overrides).toEqual(overrides);
       });
 
-      it('passes overrides with deprecated "server.defaultRoute"', async () => {
-        const service = new UiSettingsService(coreContext);
-        const httpSetupWithDefaultRoute = httpServiceMock.createSetupContract();
-        httpSetupWithDefaultRoute.config.defaultRoute = '/defaultRoute';
-        const setup = await service.setup({ http: httpSetupWithDefaultRoute });
-        setup.asScopedToClient(savedObjectsClient);
-
-        expect(MockUiSettingsClientConstructor.mock.calls[0][0].overrides).toEqual({
-          ...overrides,
-          defaultRoute: '/defaultRoute',
-        });
-
-        expect(loggingServiceMock.collect(coreContext.logger).warn).toMatchInlineSnapshot(`
-          Array [
-            Array [
-              "Config key \\"server.defaultRoute\\" is deprecated. It has been replaced with \\"uiSettings.overrides.defaultRoute\\"",
-            ],
-          ]
-        `);
-      });
-
       it('passes a copy of set defaults to UiSettingsClient', async () => {
         const service = new UiSettingsService(coreContext);
         const setup = await service.setup(setupDeps);
@@ -114,4 +92,40 @@ describe('uiSettings', () => {
       });
     });
   });
+
+  describe('#start', () => {
+    describe('#asScopedToClient', () => {
+      it('passes saved object type "config" to UiSettingsClient', async () => {
+        const service = new UiSettingsService(coreContext);
+        await service.setup(setupDeps);
+        const start = await service.start();
+        start.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);
+        await service.setup(setupDeps);
+        const start = await service.start();
+        start.asScopedToClient(savedObjectsClient);
+        expect(MockUiSettingsClientConstructor).toBeCalledTimes(1);
+        expect(MockUiSettingsClientConstructor.mock.calls[0][0].overrides).toBe(overrides);
+        expect(MockUiSettingsClientConstructor.mock.calls[0][0].overrides).toEqual(overrides);
+      });
+
+      it('passes a copy of set defaults to UiSettingsClient', async () => {
+        const service = new UiSettingsService(coreContext);
+        const setup = await service.setup(setupDeps);
+        setup.register(defaults);
+        const start = await service.start();
+        start.asScopedToClient(savedObjectsClient);
+
+        expect(MockUiSettingsClientConstructor).toBeCalledTimes(1);
+        expect(MockUiSettingsClientConstructor.mock.calls[0][0].defaults).toEqual(defaults);
+        expect(MockUiSettingsClientConstructor.mock.calls[0][0].defaults).not.toBe(defaults);
+      });
+    });
+  });
 });
diff --git a/src/core/server/ui_settings/ui_settings_service.ts b/src/core/server/ui_settings/ui_settings_service.ts
index 8458a80de4952..942c2625ac8e7 100644
--- a/src/core/server/ui_settings/ui_settings_service.ts
+++ b/src/core/server/ui_settings/ui_settings_service.ts
@@ -25,9 +25,13 @@ import { Logger } from '../logging';
 
 import { SavedObjectsClientContract } from '../saved_objects/types';
 import { InternalHttpServiceSetup } from '../http';
-import { UiSettingsConfigType } from './ui_settings_config';
+import { UiSettingsConfigType, config as uiConfigDefinition } from './ui_settings_config';
 import { UiSettingsClient } from './ui_settings_client';
-import { InternalUiSettingsServiceSetup, UiSettingsParams } from './types';
+import {
+  InternalUiSettingsServiceSetup,
+  InternalUiSettingsServiceStart,
+  UiSettingsParams,
+} from './types';
 import { mapToObject } from '../../utils/';
 
 import { registerRoutes } from './routes';
@@ -37,42 +41,54 @@ interface SetupDeps {
 }
 
 /** @internal */
-export class UiSettingsService implements CoreService<InternalUiSettingsServiceSetup> {
+export class UiSettingsService
+  implements CoreService<InternalUiSettingsServiceSetup, InternalUiSettingsServiceStart> {
   private readonly log: Logger;
   private readonly config$: Observable<UiSettingsConfigType>;
   private readonly uiSettingsDefaults = new Map<string, UiSettingsParams>();
+  private overrides: Record<string, any> = {};
 
   constructor(private readonly coreContext: CoreContext) {
     this.log = coreContext.logger.get('ui-settings-service');
-    this.config$ = coreContext.configService.atPath<UiSettingsConfigType>('uiSettings');
+    this.config$ = coreContext.configService.atPath<UiSettingsConfigType>(uiConfigDefinition.path);
   }
 
   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;
+    const config = await this.config$.pipe(first()).toPromise();
+    this.overrides = config.overrides;
 
     return {
       register: this.register.bind(this),
-      asScopedToClient: (savedObjectsClient: SavedObjectsClientContract) => {
-        return new UiSettingsClient({
-          type: 'config',
-          id: version,
-          buildNum,
-          savedObjectsClient,
-          defaults: mapToObject(this.uiSettingsDefaults),
-          overrides,
-          log: this.log,
-        });
-      },
+      asScopedToClient: this.getScopedClientFactory(),
     };
   }
 
-  public async start() {}
+  public async start(): Promise<InternalUiSettingsServiceStart> {
+    return {
+      asScopedToClient: this.getScopedClientFactory(),
+    };
+  }
 
   public async stop() {}
 
+  private getScopedClientFactory(): (
+    savedObjectsClient: SavedObjectsClientContract
+  ) => UiSettingsClient {
+    const { version, buildNum } = this.coreContext.env.packageInfo;
+    return (savedObjectsClient: SavedObjectsClientContract) =>
+      new UiSettingsClient({
+        type: 'config',
+        id: version,
+        buildNum,
+        savedObjectsClient,
+        defaults: mapToObject(this.uiSettingsDefaults),
+        overrides: this.overrides,
+        log: this.log,
+      });
+  }
+
   private register(settings: Record<string, UiSettingsParams> = {}) {
     Object.entries(settings).forEach(([key, value]) => {
       if (this.uiSettingsDefaults.has(key)) {
@@ -81,19 +97,4 @@ export class UiSettingsService implements CoreService<InternalUiSettingsServiceS
       this.uiSettingsDefaults.set(key, value);
     });
   }
-
-  private async getOverrides(deps: SetupDeps) {
-    const config = await this.config$.pipe(first()).toPromise();
-    const overrides: Record<string, any> = config.overrides;
-    // manually implemented deprecation until New platform Config service
-    // supports them https://github.com/elastic/kibana/issues/40255
-    if (typeof deps.http.config.defaultRoute !== 'undefined') {
-      overrides.defaultRoute = deps.http.config.defaultRoute;
-      this.log.warn(
-        'Config key "server.defaultRoute" is deprecated. It has been replaced with "uiSettings.overrides.defaultRoute"'
-      );
-    }
-
-    return overrides;
-  }
 }
diff --git a/src/core/server/uuid/fs.ts b/src/core/server/uuid/fs.ts
new file mode 100644
index 0000000000000..f10d6370c09d1
--- /dev/null
+++ b/src/core/server/uuid/fs.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Fs from 'fs';
+import { promisify } from 'util';
+
+export const readFile = promisify(Fs.readFile);
+export const writeFile = promisify(Fs.writeFile);
diff --git a/src/core/server/uuid/index.ts b/src/core/server/uuid/index.ts
new file mode 100644
index 0000000000000..ad57041a124c9
--- /dev/null
+++ b/src/core/server/uuid/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 { UuidService, UuidServiceSetup } from './uuid_service';
diff --git a/src/core/server/uuid/resolve_uuid.test.ts b/src/core/server/uuid/resolve_uuid.test.ts
new file mode 100644
index 0000000000000..d1332daa02057
--- /dev/null
+++ b/src/core/server/uuid/resolve_uuid.test.ts
@@ -0,0 +1,201 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { join } from 'path';
+import { readFile, writeFile } from './fs';
+import { resolveInstanceUuid } from './resolve_uuid';
+import { configServiceMock } from '../config/config_service.mock';
+import { loggingServiceMock } from '../logging/logging_service.mock';
+import { BehaviorSubject } from 'rxjs';
+import { Logger } from '../logging';
+
+jest.mock('uuid', () => ({
+  v4: () => 'NEW_UUID',
+}));
+
+jest.mock('./fs', () => ({
+  readFile: jest.fn(() => Promise.resolve('')),
+  writeFile: jest.fn(() => Promise.resolve('')),
+}));
+
+const DEFAULT_FILE_UUID = 'FILE_UUID';
+const DEFAULT_CONFIG_UUID = 'CONFIG_UUID';
+const fileNotFoundError = { code: 'ENOENT' };
+const permissionError = { code: 'EACCES' };
+const isDirectoryError = { code: 'EISDIR' };
+
+const mockReadFile = ({
+  uuid = DEFAULT_FILE_UUID,
+  error = null,
+}: Partial<{
+  uuid: string;
+  error: any;
+}>) => {
+  ((readFile as unknown) as jest.Mock).mockImplementation(() => {
+    if (error) {
+      return Promise.reject(error);
+    } else {
+      return Promise.resolve(uuid);
+    }
+  });
+};
+
+const mockWriteFile = (error?: object) => {
+  ((writeFile as unknown) as jest.Mock).mockImplementation(() => {
+    if (error) {
+      return Promise.reject(error);
+    } else {
+      return Promise.resolve();
+    }
+  });
+};
+
+const getConfigService = (serverUuid: string | undefined) => {
+  const configService = configServiceMock.create();
+  configService.atPath.mockImplementation(path => {
+    if (path === 'path') {
+      return new BehaviorSubject({
+        data: 'data-folder',
+      });
+    }
+    if (path === 'server') {
+      return new BehaviorSubject({
+        uuid: serverUuid,
+      });
+    }
+    return new BehaviorSubject({});
+  });
+  return configService;
+};
+
+describe('resolveInstanceUuid', () => {
+  let configService: ReturnType<typeof configServiceMock.create>;
+  let logger: jest.Mocked<Logger>;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockReadFile({ uuid: DEFAULT_FILE_UUID });
+    mockWriteFile();
+    configService = getConfigService(DEFAULT_CONFIG_UUID);
+    logger = loggingServiceMock.create().get() as any;
+  });
+
+  describe('when file is present and config property is set', () => {
+    it('writes to file and returns the config uuid if they mismatch', async () => {
+      const uuid = await resolveInstanceUuid(configService, logger);
+      expect(uuid).toEqual(DEFAULT_CONFIG_UUID);
+      expect(writeFile).toHaveBeenCalledWith(
+        join('data-folder', 'uuid'),
+        DEFAULT_CONFIG_UUID,
+        expect.any(Object)
+      );
+      expect(logger.debug).toHaveBeenCalledTimes(1);
+      expect(logger.debug.mock.calls[0]).toMatchInlineSnapshot(`
+        Array [
+          "Updating Kibana instance UUID to: CONFIG_UUID (was: FILE_UUID)",
+        ]
+      `);
+    });
+    it('does not write to file if they match', async () => {
+      mockReadFile({ uuid: DEFAULT_CONFIG_UUID });
+      const uuid = await resolveInstanceUuid(configService, logger);
+      expect(uuid).toEqual(DEFAULT_CONFIG_UUID);
+      expect(writeFile).not.toHaveBeenCalled();
+      expect(logger.debug).toHaveBeenCalledTimes(1);
+      expect(logger.debug.mock.calls[0]).toMatchInlineSnapshot(`
+        Array [
+          "Kibana instance UUID: CONFIG_UUID",
+        ]
+      `);
+    });
+  });
+
+  describe('when file is not present and config property is set', () => {
+    it('writes the uuid to file and returns the config uuid', async () => {
+      mockReadFile({ error: fileNotFoundError });
+      const uuid = await resolveInstanceUuid(configService, logger);
+      expect(uuid).toEqual(DEFAULT_CONFIG_UUID);
+      expect(writeFile).toHaveBeenCalledWith(
+        join('data-folder', 'uuid'),
+        DEFAULT_CONFIG_UUID,
+        expect.any(Object)
+      );
+      expect(logger.debug).toHaveBeenCalledTimes(1);
+      expect(logger.debug.mock.calls[0]).toMatchInlineSnapshot(`
+        Array [
+          "Setting new Kibana instance UUID: CONFIG_UUID",
+        ]
+      `);
+    });
+  });
+
+  describe('when file is present and config property is not set', () => {
+    it('does not write to file and returns the file uuid', async () => {
+      configService = getConfigService(undefined);
+      const uuid = await resolveInstanceUuid(configService, logger);
+      expect(uuid).toEqual(DEFAULT_FILE_UUID);
+      expect(writeFile).not.toHaveBeenCalled();
+      expect(logger.debug).toHaveBeenCalledTimes(1);
+      expect(logger.debug.mock.calls[0]).toMatchInlineSnapshot(`
+        Array [
+          "Resuming persistent Kibana instance UUID: FILE_UUID",
+        ]
+      `);
+    });
+  });
+
+  describe('when file is not present and config property is not set', () => {
+    it('generates a new uuid and write it to file', async () => {
+      configService = getConfigService(undefined);
+      mockReadFile({ error: fileNotFoundError });
+      const uuid = await resolveInstanceUuid(configService, logger);
+      expect(uuid).toEqual('NEW_UUID');
+      expect(writeFile).toHaveBeenCalledWith(
+        join('data-folder', 'uuid'),
+        'NEW_UUID',
+        expect.any(Object)
+      );
+      expect(logger.debug).toHaveBeenCalledTimes(1);
+      expect(logger.debug.mock.calls[0]).toMatchInlineSnapshot(`
+        Array [
+          "Setting new Kibana instance UUID: NEW_UUID",
+        ]
+      `);
+    });
+  });
+
+  describe('when file access error occurs', () => {
+    it('throws an explicit error for file read errors', async () => {
+      mockReadFile({ error: permissionError });
+      await expect(
+        resolveInstanceUuid(configService, logger)
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Unable to read Kibana UUID file, please check the uuid.server configuration value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. Error was: EACCES"`
+      );
+    });
+    it('throws an explicit error for file write errors', async () => {
+      mockWriteFile(isDirectoryError);
+      await expect(
+        resolveInstanceUuid(configService, logger)
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Unable to write Kibana UUID file, please check the uuid.server configuration value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. Error was: EISDIR"`
+      );
+    });
+  });
+});
diff --git a/src/core/server/uuid/resolve_uuid.ts b/src/core/server/uuid/resolve_uuid.ts
new file mode 100644
index 0000000000000..3f5bdc7387392
--- /dev/null
+++ b/src/core/server/uuid/resolve_uuid.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 uuid from 'uuid';
+import { join } from 'path';
+import { take } from 'rxjs/operators';
+import { readFile, writeFile } from './fs';
+import { IConfigService } from '../config';
+import { PathConfigType, config as pathConfigDef } from '../path';
+import { HttpConfigType, config as httpConfigDef } from '../http';
+import { Logger } from '../logging';
+
+const FILE_ENCODING = 'utf8';
+const FILE_NAME = 'uuid';
+
+export async function resolveInstanceUuid(
+  configService: IConfigService,
+  logger: Logger
+): Promise<string> {
+  const [pathConfig, serverConfig] = await Promise.all([
+    configService
+      .atPath<PathConfigType>(pathConfigDef.path)
+      .pipe(take(1))
+      .toPromise(),
+    configService
+      .atPath<HttpConfigType>(httpConfigDef.path)
+      .pipe(take(1))
+      .toPromise(),
+  ]);
+
+  const uuidFilePath = join(pathConfig.data, FILE_NAME);
+
+  const uuidFromFile = await readUuidFromFile(uuidFilePath);
+  const uuidFromConfig = serverConfig.uuid;
+
+  if (uuidFromConfig) {
+    if (uuidFromConfig === uuidFromFile) {
+      // uuid matches, nothing to do
+      logger.debug(`Kibana instance UUID: ${uuidFromConfig}`);
+      return uuidFromConfig;
+    } else {
+      // uuid in file don't match, or file was not present, we need to write it.
+      if (uuidFromFile === undefined) {
+        logger.debug(`Setting new Kibana instance UUID: ${uuidFromConfig}`);
+      } else {
+        logger.debug(`Updating Kibana instance UUID to: ${uuidFromConfig} (was: ${uuidFromFile})`);
+      }
+      await writeUuidToFile(uuidFilePath, uuidFromConfig);
+      return uuidFromConfig;
+    }
+  }
+  if (uuidFromFile === undefined) {
+    const newUuid = uuid.v4();
+    // no uuid either in config or file, we need to generate and write it.
+    logger.debug(`Setting new Kibana instance UUID: ${newUuid}`);
+    await writeUuidToFile(uuidFilePath, newUuid);
+    return newUuid;
+  }
+
+  logger.debug(`Resuming persistent Kibana instance UUID: ${uuidFromFile}`);
+  return uuidFromFile;
+}
+
+async function readUuidFromFile(filepath: string): Promise<string | undefined> {
+  try {
+    const content = await readFile(filepath);
+    return content.toString(FILE_ENCODING);
+  } catch (e) {
+    if (e.code === 'ENOENT') {
+      // non-existent uuid file is ok, we will create it.
+      return undefined;
+    }
+    throw new Error(
+      'Unable to read Kibana UUID file, please check the uuid.server configuration ' +
+        'value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. ' +
+        `Error was: ${e.code}`
+    );
+  }
+}
+
+async function writeUuidToFile(filepath: string, uuidValue: string) {
+  try {
+    return await writeFile(filepath, uuidValue, { encoding: FILE_ENCODING });
+  } catch (e) {
+    throw new Error(
+      'Unable to write Kibana UUID file, please check the uuid.server configuration ' +
+        'value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. ' +
+        `Error was: ${e.code}`
+    );
+  }
+}
diff --git a/src/core/server/uuid/uuid_service.mock.ts b/src/core/server/uuid/uuid_service.mock.ts
new file mode 100644
index 0000000000000..bf40eaee20636
--- /dev/null
+++ b/src/core/server/uuid/uuid_service.mock.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 { UuidService, UuidServiceSetup } from './uuid_service';
+
+const createSetupContractMock = () => {
+  const setupContract: jest.Mocked<UuidServiceSetup> = {
+    getInstanceUuid: jest.fn().mockImplementation(() => 'uuid'),
+  };
+  return setupContract;
+};
+
+type UuidServiceContract = PublicMethodsOf<UuidService>;
+const createMock = () => {
+  const mocked: jest.Mocked<UuidServiceContract> = {
+    setup: jest.fn(),
+  };
+  mocked.setup.mockResolvedValue(createSetupContractMock());
+  return mocked;
+};
+
+export const uuidServiceMock = {
+  create: createMock,
+  createSetupContract: createSetupContractMock,
+};
diff --git a/src/core/server/uuid/uuid_service.test.ts b/src/core/server/uuid/uuid_service.test.ts
new file mode 100644
index 0000000000000..315df7af8aa19
--- /dev/null
+++ b/src/core/server/uuid/uuid_service.test.ts
@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { UuidService } from './uuid_service';
+import { resolveInstanceUuid } from './resolve_uuid';
+import { CoreContext } from '../core_context';
+
+import { loggingServiceMock } from '../logging/logging_service.mock';
+import { mockCoreContext } from '../core_context.mock';
+
+jest.mock('./resolve_uuid', () => ({
+  resolveInstanceUuid: jest.fn().mockResolvedValue('SOME_UUID'),
+}));
+
+describe('UuidService', () => {
+  let logger: ReturnType<typeof loggingServiceMock.create>;
+  let coreContext: CoreContext;
+  let service: UuidService;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    logger = loggingServiceMock.create();
+    coreContext = mockCoreContext.create({ logger });
+    service = new UuidService(coreContext);
+  });
+
+  describe('#setup()', () => {
+    it('calls manageInstanceUuid with core configuration service', async () => {
+      await service.setup();
+      expect(resolveInstanceUuid).toHaveBeenCalledTimes(1);
+      expect(resolveInstanceUuid).toHaveBeenCalledWith(
+        coreContext.configService,
+        logger.get('uuid')
+      );
+    });
+
+    it('returns the uuid resolved from manageInstanceUuid', async () => {
+      const setup = await service.setup();
+      expect(setup.getInstanceUuid()).toEqual('SOME_UUID');
+    });
+  });
+});
diff --git a/src/core/server/uuid/uuid_service.ts b/src/core/server/uuid/uuid_service.ts
new file mode 100644
index 0000000000000..10104fa704936
--- /dev/null
+++ b/src/core/server/uuid/uuid_service.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 { resolveInstanceUuid } from './resolve_uuid';
+import { CoreContext } from '../core_context';
+import { Logger } from '../logging';
+import { IConfigService } from '../config';
+
+/**
+ * APIs to access the application's instance uuid.
+ *
+ * @public
+ */
+export interface UuidServiceSetup {
+  /**
+   * Retrieve the Kibana instance uuid.
+   */
+  getInstanceUuid(): string;
+}
+
+/** @internal */
+export class UuidService {
+  private readonly log: Logger;
+  private readonly configService: IConfigService;
+  private uuid: string = '';
+
+  constructor(core: CoreContext) {
+    this.log = core.logger.get('uuid');
+    this.configService = core.configService;
+  }
+
+  public async setup() {
+    this.uuid = await resolveInstanceUuid(this.configService, this.log);
+
+    return {
+      getInstanceUuid: () => this.uuid,
+    };
+  }
+}
diff --git a/src/core/types/core_service.ts b/src/core/types/core_service.ts
index b99c419b796ba..5056396f1f9f0 100644
--- a/src/core/types/core_service.ts
+++ b/src/core/types/core_service.ts
@@ -19,7 +19,7 @@
 
 /** @internal */
 export interface CoreService<TSetup = void, TStart = void> {
-  setup(...params: any[]): Promise<TSetup>;
-  start(...params: any[]): Promise<TStart>;
-  stop(): Promise<void>;
+  setup(...params: any[]): TSetup | Promise<TSetup>;
+  start(...params: any[]): TStart | Promise<TStart>;
+  stop(): void | Promise<void>;
 }
diff --git a/src/dev/build/tasks/copy_source_task.js b/src/dev/build/tasks/copy_source_task.js
index e5698c37ba16f..ee9dc159de47f 100644
--- a/src/dev/build/tasks/copy_source_task.js
+++ b/src/dev/build/tasks/copy_source_task.js
@@ -46,7 +46,6 @@ export const CopySourceTask = {
         'typings/**',
         'webpackShims/**',
         'config/kibana.yml',
-        'config/apm.js',
         'tsconfig*.json',
         '.i18nrc.json',
         'kibana.d.ts',
diff --git a/src/dev/build/tasks/optimize_task.js b/src/dev/build/tasks/optimize_task.js
index 0bd91b5565844..4034092273239 100644
--- a/src/dev/build/tasks/optimize_task.js
+++ b/src/dev/build/tasks/optimize_task.js
@@ -43,7 +43,7 @@ export const OptimizeBuildTask = {
       env: {
         FORCE_DLL_CREATION: 'true',
         KBN_CACHE_LOADER_WRITABLE: 'true',
-        NODE_OPTIONS: '--max-old-space-size=3072',
+        NODE_OPTIONS: '--max-old-space-size=4096',
       },
     });
 
diff --git a/src/dev/build/tasks/os_packages/create_os_package_tasks.js b/src/dev/build/tasks/os_packages/create_os_package_tasks.js
index 3a328971538db..0416dac0aad8c 100644
--- a/src/dev/build/tasks/os_packages/create_os_package_tasks.js
+++ b/src/dev/build/tasks/os_packages/create_os_package_tasks.js
@@ -18,7 +18,7 @@
  */
 
 import { runFpm } from './run_fpm';
-import { runDockerGenerator } from './docker_generator';
+import { runDockerGenerator, runDockerGeneratorForUBI } from './docker_generator';
 
 export const CreateDebPackageTask = {
   description: 'Creating deb package',
@@ -45,6 +45,10 @@ export const CreateDockerPackageTask = {
   description: 'Creating docker package',
 
   async run(config, log, build) {
+    // Builds Docker targets for default and oss
     await runDockerGenerator(config, log, build);
+
+    // Builds Docker target default with ubi7 base image
+    await runDockerGeneratorForUBI(config, log, build);
   },
 };
diff --git a/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.js b/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.js
index 65b0ffdfa5e81..bbcb6dfeeb109 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.js
+++ b/src/dev/build/tasks/os_packages/docker_generator/bundle_dockerfiles.js
@@ -22,9 +22,11 @@ import { compress, copyAll, mkdirp, write } from '../../../lib';
 import { dockerfileTemplate } from './templates';
 
 export async function bundleDockerFiles(config, log, build, scope) {
-  log.info(`Generating kibana${scope.imageFlavor} docker build context bundle`);
+  log.info(
+    `Generating kibana${scope.imageFlavor}${scope.ubiImageFlavor} docker build context bundle`
+  );
 
-  const dockerFilesDirName = `kibana${scope.imageFlavor}-${scope.versionTag}-docker-build-context`;
+  const dockerFilesDirName = `kibana${scope.imageFlavor}${scope.ubiImageFlavor}-${scope.versionTag}-docker-build-context`;
   const dockerFilesBuildDir = resolve(scope.dockerBuildDir, dockerFilesDirName);
   const dockerFilesOutputDir = config.resolveFromTarget(`${dockerFilesDirName}.tar.gz`);
 
diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.js b/src/dev/build/tasks/os_packages/docker_generator/run.js
index fcd95357790e5..7424b6f01b82b 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/run.js
+++ b/src/dev/build/tasks/os_packages/docker_generator/run.js
@@ -29,20 +29,27 @@ const linkAsync = promisify(link);
 const unlinkAsync = promisify(unlink);
 const chmodAsync = promisify(chmod);
 
-export async function runDockerGenerator(config, log, build) {
+export async function runDockerGenerator(config, log, build, ubi = false) {
+  // UBI var config
+  const baseOSImage = ubi ? 'registry.access.redhat.com/ubi7/ubi-minimal:7.7' : 'centos:7';
+  const ubiVersionTag = 'ubi7';
+  const ubiImageFlavor = ubi ? `-${ubiVersionTag}` : '';
+
+  // General docker var config
   const license = build.isOss() ? 'ASL 2.0' : 'Elastic License';
   const imageFlavor = build.isOss() ? '-oss' : '';
   const imageTag = 'docker.elastic.co/kibana/kibana';
   const versionTag = config.getBuildVersion();
   const artifactTarball = `kibana${imageFlavor}-${versionTag}-linux-x86_64.tar.gz`;
   const artifactsDir = config.resolveFromTarget('.');
+  // That would produce oss, default and default-ubi7
   const dockerBuildDir = config.resolveFromRepo(
     'build',
     'kibana-docker',
-    build.isOss() ? 'oss' : 'default'
+    build.isOss() ? `oss` : `default${ubiImageFlavor}`
   );
   const dockerOutputDir = config.resolveFromTarget(
-    `kibana${imageFlavor}-${versionTag}-docker.tar.gz`
+    `kibana${imageFlavor}${ubiImageFlavor}-${versionTag}-docker.tar.gz`
   );
   const scope = {
     artifactTarball,
@@ -53,6 +60,8 @@ export async function runDockerGenerator(config, log, build) {
     imageTag,
     dockerBuildDir,
     dockerOutputDir,
+    baseOSImage,
+    ubiImageFlavor,
   };
 
   // Verify if we have the needed kibana target in order
@@ -103,3 +112,12 @@ export async function runDockerGenerator(config, log, build) {
   // Pack Dockerfiles and create a target for them
   await bundleDockerFiles(config, log, build, scope);
 }
+
+export async function runDockerGeneratorForUBI(config, log, build) {
+  // Only run ubi docker image build for default distribution
+  if (build.isOss()) {
+    return;
+  }
+
+  await runDockerGenerator(config, log, build, true);
+}
diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.js b/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.js
index 66f2fd65832e4..4e8dfe188b867 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.js
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.js
@@ -19,21 +19,28 @@
 
 import dedent from 'dedent';
 
-function generator({ imageTag, imageFlavor, versionTag, dockerOutputDir }) {
+function generator({
+  imageTag,
+  imageFlavor,
+  versionTag,
+  dockerOutputDir,
+  baseOSImage,
+  ubiImageFlavor,
+}) {
   return dedent(`
   #!/usr/bin/env bash
   #
   # ** THIS IS AN AUTO-GENERATED FILE **
   #
   set -euo pipefail
-  
-  docker pull centos:7
-  
-  echo "Building: kibana${imageFlavor}-docker"; \\
-  docker build -t ${imageTag}${imageFlavor}:${versionTag} -f Dockerfile . || exit 1;
 
-  docker save ${imageTag}${imageFlavor}:${versionTag} | gzip -c > ${dockerOutputDir}
-  
+  docker pull ${baseOSImage}
+
+  echo "Building: kibana${imageFlavor}${ubiImageFlavor}-docker"; \\
+  docker build -t ${imageTag}${imageFlavor}${ubiImageFlavor}:${versionTag} -f Dockerfile . || exit 1;
+
+  docker save ${imageTag}${imageFlavor}${ubiImageFlavor}:${versionTag} | gzip -c > ${dockerOutputDir}
+
   exit 0
   `);
 }
diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.js b/src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.js
index 5228eed84cd59..25ae71856c12d 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.js
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.js
@@ -19,7 +19,14 @@
 
 import dedent from 'dedent';
 
-function generator({ artifactTarball, versionTag, license, usePublicArtifact }) {
+function generator({
+  artifactTarball,
+  versionTag,
+  license,
+  usePublicArtifact,
+  baseOSImage,
+  ubiImageFlavor,
+}) {
   const copyArtifactTarballInsideDockerOptFolder = () => {
     if (usePublicArtifact) {
       return `RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/kibana/${artifactTarball} && cd -`;
@@ -28,6 +35,14 @@ function generator({ artifactTarball, versionTag, license, usePublicArtifact })
     return `COPY ${artifactTarball} /opt`;
   };
 
+  const packageManager = () => {
+    if (ubiImageFlavor) {
+      return 'microdnf';
+    }
+
+    return 'yum';
+  };
+
   return dedent(`
   #
   # ** THIS IS AN AUTO-GENERATED FILE **
@@ -37,7 +52,9 @@ function generator({ artifactTarball, versionTag, license, usePublicArtifact })
   # Build stage 0
   # Extract Kibana and make various file manipulations.
   ################################################################################
-  FROM centos:7 AS prep_files
+  FROM ${baseOSImage} AS prep_files
+  # Add tar and gzip
+  RUN ${packageManager()} update -y && ${packageManager()} install -y tar gzip && ${packageManager()} clean all
   ${copyArtifactTarballInsideDockerOptFolder()}
   RUN mkdir /usr/share/kibana
   WORKDIR /usr/share/kibana
@@ -53,11 +70,11 @@ function generator({ artifactTarball, versionTag, license, usePublicArtifact })
   # Build stage 1
   # Copy prepared files from the previous stage and complete the image.
   ################################################################################
-  FROM centos:7
+  FROM ${baseOSImage}
   EXPOSE 5601
 
   # Add Reporting dependencies.
-  RUN yum update -y && yum install -y fontconfig freetype && yum clean all
+  RUN ${packageManager()} update -y && ${packageManager()} install -y fontconfig freetype shadow-utils && ${packageManager()} clean all
 
   # Add an init process, check the checksum to make sure it's a match
   RUN curl -L -o /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh
index e5edf5bd9c260..5217fdf002be9 100644
--- a/src/dev/ci_setup/setup_env.sh
+++ b/src/dev/ci_setup/setup_env.sh
@@ -14,7 +14,7 @@ cacheDir="$HOME/.kibana"
 RED='\033[0;31m'
 C_RESET='\033[0m' # Reset color
 
-export NODE_OPTIONS="$NODE_OPTIONS --throw-deprecation"
+export NODE_OPTIONS="$NODE_OPTIONS --throw-deprecation --max-old-space-size=4096"
 
 ###
 ### Since the Jenkins logging output collector doesn't look like a TTY
diff --git a/src/dev/renovate/config.ts b/src/dev/renovate/config.ts
index 61feb4e47f022..c7056ba69449a 100644
--- a/src/dev/renovate/config.ts
+++ b/src/dev/renovate/config.ts
@@ -95,7 +95,7 @@ export const RENOVATE_CONFIG = {
         allowedVersions: group.allowedVersions || undefined,
         reviewers: group.reviewers || undefined,
         masterIssueApproval: group.autoOpenPr ? false : undefined,
-      })),
+      })).sort((a, b) => a.groupName.localeCompare(b.groupName)),
 
       // internal/local packages
       {
diff --git a/src/dev/renovate/package_groups.ts b/src/dev/renovate/package_groups.ts
index fd637409e433a..1bc65fd149f47 100644
--- a/src/dev/renovate/package_groups.ts
+++ b/src/dev/renovate/package_groups.ts
@@ -78,7 +78,7 @@ export const RENOVATE_PACKAGE_GROUPS: PackageGroup[] = [
   {
     name: 'babel',
     packageWords: ['babel'],
-    packageNames: ['core-js'],
+    packageNames: ['core-js', '@babel/preset-react', '@babel/preset-typescript'],
   },
 
   {
diff --git a/src/dev/run_check_core_api_changes.ts b/src/dev/run_check_core_api_changes.ts
index ccf92cc432d2b..56664477df491 100644
--- a/src/dev/run_check_core_api_changes.ts
+++ b/src/dev/run_check_core_api_changes.ts
@@ -35,6 +35,7 @@ import getopts from 'getopts';
 
 const apiExtractorConfig = (folder: string): ExtractorConfig => {
   const config: IConfigFile = {
+    newlineKind: 'lf',
     compiler: {
       tsconfigFilePath: '<projectFolder>/tsconfig.json',
     },
diff --git a/src/dev/run_i18n_check.ts b/src/dev/run_i18n_check.ts
index f686c18c848f2..97ea988b1de3a 100644
--- a/src/dev/run_i18n_check.ts
+++ b/src/dev/run_i18n_check.ts
@@ -133,6 +133,7 @@ run(
   {
     flags: {
       allowUnexpected: true,
+      guessTypesForUnexpectedFlags: true,
     },
   }
 );
diff --git a/src/dev/run_i18n_extract.ts b/src/dev/run_i18n_extract.ts
index 5492b5cd6795c..106c8f10cb5cc 100644
--- a/src/dev/run_i18n_extract.ts
+++ b/src/dev/run_i18n_extract.ts
@@ -93,6 +93,7 @@ run(
   {
     flags: {
       allowUnexpected: true,
+      guessTypesForUnexpectedFlags: true,
     },
   }
 );
diff --git a/src/dev/run_i18n_integrate.ts b/src/dev/run_i18n_integrate.ts
index e8cd020773419..23d66fae9f26e 100644
--- a/src/dev/run_i18n_integrate.ts
+++ b/src/dev/run_i18n_integrate.ts
@@ -121,6 +121,7 @@ run(
   {
     flags: {
       allowUnexpected: true,
+      guessTypesForUnexpectedFlags: true,
     },
   }
 );
diff --git a/src/docs/docs_repo.js b/src/docs/docs_repo.js
index 63fcd2a6de5ec..51ae0d495b9ff 100644
--- a/src/docs/docs_repo.js
+++ b/src/docs/docs_repo.js
@@ -27,7 +27,7 @@ export function buildDocsScript(cmd) {
 
 export function buildDocsArgs(cmd) {
   const docsIndexFile = resolve(kibanaDir, 'docs', 'index.asciidoc');
-  let args = ['--doc', docsIndexFile, '--chunk=1'];
+  let args = ['--doc', docsIndexFile, '--direct_html', '--chunk=1'];
   if (cmd.open) {
     args = [...args, '--open'];
   }
diff --git a/src/fixtures/stubbed_logstash_index_pattern.js b/src/fixtures/stubbed_logstash_index_pattern.js
index 22fbf0ab5a5f8..e20d1b5cd7717 100644
--- a/src/fixtures/stubbed_logstash_index_pattern.js
+++ b/src/fixtures/stubbed_logstash_index_pattern.js
@@ -21,7 +21,7 @@ import StubIndexPattern from 'test_utils/stub_index_pattern';
 import stubbedLogstashFields from 'fixtures/logstash_fields';
 
 import { getKbnFieldType } from '../plugins/data/common';
-import { mockUiSettings } from '../legacy/ui/public/new_platform/new_platform.karma_mock';
+import { npSetup } from '../legacy/ui/public/new_platform/new_platform.karma_mock';
 
 export default function stubbedLogstashIndexPatternService() {
   const mockLogstashFields = stubbedLogstashFields();
@@ -41,13 +41,8 @@ export default function stubbedLogstashIndexPatternService() {
     };
   });
 
-  const indexPattern = new StubIndexPattern(
-    'logstash-*',
-    cfg => cfg,
-    'time',
-    fields,
-    mockUiSettings
-  );
+  const indexPattern = new StubIndexPattern('logstash-*', cfg => cfg, 'time', fields, npSetup.core);
+
   indexPattern.id = 'logstash-*';
   indexPattern.isTimeNanosBased = () => false;
 
diff --git a/src/legacy/core_plugins/console/public/kibana.json b/src/legacy/core_plugins/console/public/kibana.json
index 3363af353912a..c58a5a90fb9f2 100644
--- a/src/legacy/core_plugins/console/public/kibana.json
+++ b/src/legacy/core_plugins/console/public/kibana.json
@@ -3,5 +3,6 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["home"]
+  "requiredPlugins": ["home"],
+  "optionalPlugins": ["usageCollection"]
 }
diff --git a/src/legacy/core_plugins/console/public/legacy.ts b/src/legacy/core_plugins/console/public/legacy.ts
index c456d777187aa..d151a27d27e5c 100644
--- a/src/legacy/core_plugins/console/public/legacy.ts
+++ b/src/legacy/core_plugins/console/public/legacy.ts
@@ -22,7 +22,13 @@ import { I18nContext } from 'ui/i18n';
 import chrome from 'ui/chrome';
 import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
 
+import { plugin } from './np_ready';
+import { DevToolsSetup } from '../../../../plugins/dev_tools/public';
+import { HomePublicPluginSetup } from '../../../../plugins/home/public';
+import { UsageCollectionSetup } from '../../../../plugins/usage_collection/public';
+
 export interface XPluginSet {
+  usageCollection: UsageCollectionSetup;
   dev_tools: DevToolsSetup;
   home: HomePublicPluginSetup;
   __LEGACY: {
@@ -32,10 +38,6 @@ export interface XPluginSet {
   };
 }
 
-import { plugin } from './np_ready';
-import { DevToolsSetup } from '../../../../plugins/dev_tools/public';
-import { HomePublicPluginSetup } from '../../../../plugins/home/public';
-
 const pluginInstance = plugin({} as any);
 
 (async () => {
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.mock.tsx b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
index 5df72c0f03496..0ee7998d331f5 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
+++ b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
@@ -22,6 +22,7 @@ jest.mock('../../../../contexts/editor_context/editor_registry.ts', () => ({
     setInputEditor: () => {},
     getInputEditor: () => ({
       getRequestsInRange: async () => [{ test: 'test' }],
+      getCoreEditor: () => ({ getCurrentPosition: jest.fn() }),
     }),
   },
 }));
@@ -52,3 +53,6 @@ jest.mock('../../../../models/sense_editor', () => {
 jest.mock('../../../../hooks/use_send_current_request_to_es/send_request_to_es', () => ({
   sendRequestToES: jest.fn(),
 }));
+jest.mock('../../../../../lib/autocomplete/get_endpoint_from_position', () => ({
+  getEndpointFromPosition: jest.fn(),
+}));
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.tsx b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.tsx
index 6162397ce0650..73ee6d160613f 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.tsx
+++ b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.tsx
@@ -32,14 +32,18 @@ import {
   ServicesContextProvider,
   EditorContextProvider,
   RequestContextProvider,
+  ContextValue,
 } from '../../../../contexts';
 
+// Mocked functions
 import { sendRequestToES } from '../../../../hooks/use_send_current_request_to_es/send_request_to_es';
+import { getEndpointFromPosition } from '../../../../../lib/autocomplete/get_endpoint_from_position';
+
 import * as consoleMenuActions from '../console_menu_actions';
 import { Editor } from './editor';
 
 describe('Legacy (Ace) Console Editor Component Smoke Test', () => {
-  let mockedAppContextValue: any;
+  let mockedAppContextValue: ContextValue;
   const sandbox = sinon.createSandbox();
 
   const doMount = () =>
@@ -58,11 +62,15 @@ describe('Legacy (Ace) Console Editor Component Smoke Test', () => {
   beforeEach(() => {
     document.queryCommandSupported = sinon.fake(() => true);
     mockedAppContextValue = {
+      elasticsearchUrl: 'test',
       services: {
+        trackUiMetric: { count: () => {}, load: () => {} },
+        settings: {} as any,
+        storage: {} as any,
         history: {
-          getSavedEditorState: () => null,
+          getSavedEditorState: () => ({} as any),
           updateCurrentState: jest.fn(),
-        },
+        } as any,
         notifications: notificationServiceMock.createSetupContract(),
       },
       docLinkVersion: 'NA',
@@ -70,10 +78,12 @@ describe('Legacy (Ace) Console Editor Component Smoke Test', () => {
   });
 
   afterEach(() => {
+    jest.clearAllMocks();
     sandbox.restore();
   });
 
   it('calls send current request to ES', async () => {
+    (getEndpointFromPosition as jest.Mock).mockReturnValue({ patterns: [] });
     (sendRequestToES as jest.Mock).mockRejectedValue({});
     const editor = doMount();
     act(() => {
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_menu_actions.ts b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_menu_actions.ts
index 797ff5744eec3..2bbe49cd53eac 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_menu_actions.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_menu_actions.ts
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-// @ts-ignore
-import { getEndpointFromPosition } from '../../../../lib/autocomplete/autocomplete';
+import { getEndpointFromPosition } from '../../../../lib/autocomplete/get_endpoint_from_position';
 import { SenseEditor } from '../../../models/sense_editor';
 
 export async function autoIndent(editor: SenseEditor, event: Event) {
@@ -40,7 +39,7 @@ export function getDocumentation(
     }
     const position = requests[0].range.end;
     position.column = position.column - 1;
-    const endpoint = getEndpointFromPosition(editor, position, editor.parser);
+    const endpoint = getEndpointFromPosition(editor.getCoreEditor(), position, editor.parser);
     if (endpoint && endpoint.documentation && endpoint.documentation.indexOf('http') !== -1) {
       return endpoint.documentation
         .replace('/master/', `/${docLinkVersion}/`)
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/contexts/index.ts b/src/legacy/core_plugins/console/public/np_ready/application/contexts/index.ts
index 18234acf15957..e489bd50c9ce0 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/contexts/index.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/contexts/index.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-export { useServicesContext, ServicesContextProvider } from './services_context';
+export { useServicesContext, ServicesContextProvider, ContextValue } from './services_context';
 
 export {
   useRequestActionContext,
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/contexts/services_context.tsx b/src/legacy/core_plugins/console/public/np_ready/application/contexts/services_context.tsx
index 77f0924a51842..f14685ecd4ac7 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/contexts/services_context.tsx
+++ b/src/legacy/core_plugins/console/public/np_ready/application/contexts/services_context.tsx
@@ -20,13 +20,15 @@
 import React, { createContext, useContext } from 'react';
 import { NotificationsSetup } from 'kibana/public';
 import { History, Storage, Settings } from '../../services';
+import { MetricsTracker } from '../../types';
 
-interface ContextValue {
+export interface ContextValue {
   services: {
     history: History;
     storage: Storage;
     settings: Settings;
     notifications: NotificationsSetup;
+    trackUiMetric: MetricsTracker;
   };
   elasticsearchUrl: string;
   docLinkVersion: string;
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/send_request_to_es.ts b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
index 11c1f6638e9cf..10dab65b61d44 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
@@ -39,7 +39,8 @@ export interface ESRequestResult {
 }
 
 let CURRENT_REQ_ID = 0;
-export function sendRequestToES({ requests }: EsRequestArgs): Promise<ESRequestResult[]> {
+export function sendRequestToES(args: EsRequestArgs): Promise<ESRequestResult[]> {
+  const requests = args.requests.slice();
   return new Promise((resolve, reject) => {
     const reqId = ++CURRENT_REQ_ID;
     const results: ESRequestResult[] = [];
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/track.ts b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/track.ts
new file mode 100644
index 0000000000000..4d993512c8fa7
--- /dev/null
+++ b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/track.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 { SenseEditor } from '../../models/sense_editor';
+import { getEndpointFromPosition } from '../../../lib/autocomplete/get_endpoint_from_position';
+import { MetricsTracker } from '../../../types';
+
+export const track = (requests: any[], editor: SenseEditor, trackUiMetric: MetricsTracker) => {
+  const coreEditor = editor.getCoreEditor();
+  // `getEndpointFromPosition` gets values from the server-side generated JSON files which
+  // are a combination of JS, automatically generated JSON and manual overrides. That means
+  // the metrics reported from here will be tied to the definitions in those files.
+  // See src/legacy/core_plugins/console/server/api_server/spec
+  const endpointDescription = getEndpointFromPosition(
+    coreEditor,
+    coreEditor.getCurrentPosition(),
+    editor.parser
+  );
+
+  if (requests[0] && endpointDescription) {
+    const eventName = `${requests[0].method}_${endpointDescription.id ?? 'unknown'}`;
+    trackUiMetric.count(eventName);
+  }
+};
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
index b51c29f8e9db6..6bf0b5024376b 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
@@ -19,15 +19,16 @@
 import { i18n } from '@kbn/i18n';
 import { useCallback } from 'react';
 import { instance as registry } from '../../contexts/editor_context/editor_registry';
-import { useServicesContext } from '../../contexts';
+import { useRequestActionContext, useServicesContext } from '../../contexts';
 import { sendRequestToES } from './send_request_to_es';
-import { useRequestActionContext } from '../../contexts';
+import { track } from './track';
+
 // @ts-ignore
 import mappings from '../../../lib/mappings/mappings';
 
 export const useSendCurrentRequestToES = () => {
   const {
-    services: { history, settings, notifications },
+    services: { history, settings, notifications, trackUiMetric },
   } = useServicesContext();
 
   const dispatch = useRequestActionContext();
@@ -45,9 +46,10 @@ export const useSendCurrentRequestToES = () => {
         return;
       }
 
-      const results = await sendRequestToES({
-        requests,
-      });
+      // Fire and forget
+      setTimeout(() => track(requests, editor, trackUiMetric), 0);
+
+      const results = await sendRequestToES({ requests });
 
       results.forEach(({ request: { path, method, data } }) => {
         history.addToHistory(path, method, data);
@@ -82,5 +84,5 @@ export const useSendCurrentRequestToES = () => {
         });
       }
     }
-  }, [dispatch, settings, history, notifications]);
+  }, [dispatch, settings, history, notifications, trackUiMetric]);
 };
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/index.tsx b/src/legacy/core_plugins/console/public/np_ready/application/index.tsx
index 239e4320f00f8..89756513b2b22 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/index.tsx
+++ b/src/legacy/core_plugins/console/public/np_ready/application/index.tsx
@@ -22,6 +22,7 @@ import { NotificationsSetup } from 'kibana/public';
 import { ServicesContextProvider, EditorContextProvider, RequestContextProvider } from './contexts';
 import { Main } from './containers';
 import { createStorage, createHistory, createSettings, Settings } from '../services';
+import { createUsageTracker } from '../services/tracker';
 
 let settingsRef: Settings;
 export function legacyBackDoorToSettings() {
@@ -36,6 +37,9 @@ export function boot(deps: {
 }) {
   const { I18nContext, notifications, docLinkVersion, elasticsearchUrl } = deps;
 
+  const trackUiMetric = createUsageTracker();
+  trackUiMetric.load('opened_app');
+
   const storage = createStorage({
     engine: window.localStorage,
     prefix: 'sense:',
@@ -50,7 +54,13 @@ export function boot(deps: {
         value={{
           elasticsearchUrl,
           docLinkVersion,
-          services: { storage, history, settings, notifications },
+          services: {
+            storage,
+            history,
+            settings,
+            notifications,
+            trackUiMetric,
+          },
         }}
       >
         <RequestContextProvider>
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/script_highlight_rules.js b/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/script_highlight_rules.js
index 801580f4e158c..b3999c76493c0 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/script_highlight_rules.js
+++ b/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/script_highlight_rules.js
@@ -61,7 +61,6 @@ export function ScriptHighlightRules() {
       },
       {
         token: 'script.keyword.operator',
-
         regex:
           '\\?\\.|\\*\\.|=~|==~|!|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|->|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|typeof|void)',
       },
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/index.ts b/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/index.ts
index 9310de2724fbe..f2102d75685fd 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/index.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/index.ts
@@ -21,3 +21,4 @@ export * from './create';
 export * from '../legacy_core_editor/create_readonly';
 export { MODE } from '../../../lib/row_parser';
 export { SenseEditor } from './sense_editor';
+export { getEndpointFromPosition } from '../../../lib/autocomplete/get_endpoint_from_position';
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/autocomplete.ts b/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/autocomplete.ts
index 7520807ca77f5..ac8fa1ea48caa 100644
--- a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/autocomplete.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/autocomplete.ts
@@ -38,7 +38,6 @@ import { URL_PATH_END_MARKER } from './components/index';
 import { createTokenIterator } from '../../application/factories';
 
 import { Position, Token, Range, CoreEditor } from '../../types';
-import { SenseEditor } from '../../application/models/sense_editor';
 
 let LAST_EVALUATED_TOKEN: any = null;
 
@@ -54,11 +53,20 @@ function isUrlParamsToken(token: any) {
       return false;
   }
 }
-function getCurrentMethodAndTokenPaths(
+
+/**
+ * Get the method and token paths for a specific position in the current editor buffer.
+ *
+ * This function can be used for getting autocomplete information or for getting more information
+ * about the endpoint associated with autocomplete. In future, these concerns should be better
+ * separated.
+ *
+ */
+export function getCurrentMethodAndTokenPaths(
   editor: CoreEditor,
   pos: Position,
   parser: any,
-  forceEndOfUrl?: boolean
+  forceEndOfUrl?: boolean /* Flag for indicating whether we want to avoid early escape optimization. */
 ) {
   const tokenIter = createTokenIterator({
     editor,
@@ -186,7 +194,7 @@ function getCurrentMethodAndTokenPaths(
     }
   }
 
-  if (walkedSomeBody && (!bodyTokenPath || bodyTokenPath.length === 0)) {
+  if (walkedSomeBody && (!bodyTokenPath || bodyTokenPath.length === 0) && !forceEndOfUrl) {
     // we had some content and still no path -> the cursor is position after a closed body -> no auto complete
     return {};
   }
@@ -298,20 +306,6 @@ function getCurrentMethodAndTokenPaths(
   }
   return ret;
 }
-export function getEndpointFromPosition(senseEditor: SenseEditor, pos: Position, parser: any) {
-  const editor = senseEditor.getCoreEditor();
-  const context = {
-    ...getCurrentMethodAndTokenPaths(
-      editor,
-      { column: pos.column, lineNumber: pos.lineNumber },
-      parser,
-      true
-    ),
-  };
-  const components = getTopLevelUrlCompleteComponents(context.method);
-  populateContext(context.urlTokenPath, context, editor, true, components);
-  return context.endpoint;
-}
 
 // eslint-disable-next-line
 export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor; parser: any }) {
@@ -812,7 +806,6 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
     if (!ret.urlTokenPath) {
       // zero length tokenPath is true
 
-      // console.log("Can't extract a valid url token path.");
       return context;
     }
 
@@ -825,13 +818,11 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
     );
 
     if (!context.endpoint) {
-      // console.log("couldn't resolve an endpoint.");
       return context;
     }
 
     if (!ret.urlParamsTokenPath) {
       // zero length tokenPath is true
-      // console.log("Can't extract a valid urlParams token path.");
       return context;
     }
     let tokenPath: any[] = [];
@@ -859,7 +850,6 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
     context.requestStartRow = ret.requestStartRow;
     if (!ret.urlTokenPath) {
       // zero length tokenPath is true
-      // console.log("Can't extract a valid url token path.");
       return context;
     }
 
@@ -875,7 +865,6 @@ export default function({ coreEditor: editor, parser }: { coreEditor: CoreEditor
     if (!ret.bodyTokenPath) {
       // zero length tokenPath is true
 
-      // console.log("Can't extract a valid body token path.");
       return context;
     }
 
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.ts b/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.ts
new file mode 100644
index 0000000000000..cb037e29e33f6
--- /dev/null
+++ b/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.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 { CoreEditor, Position } from '../../types';
+import { getCurrentMethodAndTokenPaths } from './autocomplete';
+
+// @ts-ignore
+import { getTopLevelUrlCompleteComponents } from '../kb/kb';
+// @ts-ignore
+import { populateContext } from './engine';
+
+export function getEndpointFromPosition(editor: CoreEditor, pos: Position, parser: any) {
+  const lineValue = editor.getLineValue(pos.lineNumber);
+  const context = {
+    ...getCurrentMethodAndTokenPaths(
+      editor,
+      { column: lineValue.length, lineNumber: pos.lineNumber },
+      parser,
+      true
+    ),
+  };
+  const components = getTopLevelUrlCompleteComponents(context.method);
+  populateContext(context.urlTokenPath, context, editor, true, components);
+  return context.endpoint;
+}
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/es/es.js b/src/legacy/core_plugins/console/public/np_ready/lib/es/es.js
index 9012b875e0f2b..e36976fb7acee 100644
--- a/src/legacy/core_plugins/console/public/np_ready/lib/es/es.js
+++ b/src/legacy/core_plugins/console/public/np_ready/lib/es/es.js
@@ -18,7 +18,6 @@
  */
 
 import { stringify as formatQueryString } from 'querystring';
-
 import $ from 'jquery';
 
 const esVersion = [];
diff --git a/src/legacy/core_plugins/console/public/np_ready/services/tracker.ts b/src/legacy/core_plugins/console/public/np_ready/services/tracker.ts
new file mode 100644
index 0000000000000..13d5f875b3c6f
--- /dev/null
+++ b/src/legacy/core_plugins/console/public/np_ready/services/tracker.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 { METRIC_TYPE } from '@kbn/analytics';
+import { MetricsTracker } from '../types';
+import { createUiStatsReporter } from '../../../../ui_metric/public';
+
+const APP_TRACKER_NAME = 'console';
+export const createUsageTracker = (): MetricsTracker => {
+  const track = createUiStatsReporter(APP_TRACKER_NAME);
+  return {
+    count: (eventName: string) => track(METRIC_TYPE.COUNT, eventName),
+    load: (eventName: string) => track(METRIC_TYPE.LOADED, eventName),
+  };
+};
diff --git a/src/legacy/core_plugins/console/public/np_ready/types/common.ts b/src/legacy/core_plugins/console/public/np_ready/types/common.ts
index ad9ed10d4188f..e44969cd9e80a 100644
--- a/src/legacy/core_plugins/console/public/np_ready/types/common.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/types/common.ts
@@ -17,6 +17,11 @@
  * under the License.
  */
 
+export interface MetricsTracker {
+  count: (eventName: string) => void;
+  load: (eventName: string) => void;
+}
+
 export type BaseResponseType =
   | 'application/json'
   | 'text/csv'
diff --git a/src/legacy/core_plugins/console/public/np_ready/types/index.ts b/src/legacy/core_plugins/console/public/np_ready/types/index.ts
index 9d82237d667b3..78c6b6c8f55cc 100644
--- a/src/legacy/core_plugins/console/public/np_ready/types/index.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/types/index.ts
@@ -20,3 +20,4 @@
 export * from './core_editor';
 export * from './token';
 export * from './tokens_provider';
+export * from './common';
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/filter.js b/src/legacy/core_plugins/console/server/api_server/es_6_0/filter.js
index 2a1a903c8565f..bf669cff788e8 100644
--- a/src/legacy/core_plugins/console/server/api_server/es_6_0/filter.js
+++ b/src/legacy/core_plugins/console/server/api_server/es_6_0/filter.js
@@ -260,7 +260,7 @@ filters.range = {
     gt: 1,
     lte: 20,
     lt: 20,
-    time_zone: '+1:00',
+    time_zone: '+01:00',
     format: 'dd/MM/yyyy||yyyy',
     execution: { __one_of: ['index', 'fielddata'] },
   },
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/query/dsl.js b/src/legacy/core_plugins/console/server/api_server/es_6_0/query/dsl.js
index 3ff9bed848346..a5f0d15dee0e9 100644
--- a/src/legacy/core_plugins/console/server/api_server/es_6_0/query/dsl.js
+++ b/src/legacy/core_plugins/console/server/api_server/es_6_0/query/dsl.js
@@ -467,7 +467,7 @@ export function queryDsl(api) {
         __one_of: [true, false],
       },
       tie_breaker: 0,
-      time_zone: '+1:00',
+      time_zone: '+01:00',
     },
     simple_query_string: {
       __template: {
@@ -493,7 +493,7 @@ export function queryDsl(api) {
         gt: 10,
         lte: 20,
         lt: 20,
-        time_zone: '+1:00',
+        time_zone: '+01:00',
         boost: 1.0,
         format: 'dd/MM/yyyy||yyyy',
       },
diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts
index c9ce825f3596e..4514d67ea5fcd 100644
--- a/src/legacy/core_plugins/data/public/index.ts
+++ b/src/legacy/core_plugins/data/public/index.ts
@@ -28,11 +28,15 @@ export function plugin() {
 
 /** @public types */
 export { DataStart };
-
-export { Field, FieldType, IFieldList, IndexPattern } from './index_patterns';
-export { SavedQuery, SavedQueryTimeFilter } from '../../../../plugins/data/public';
+export { EsQuerySortValue, FetchOptions, ISearchSource, SortDirection } from './search/types';
+export { SearchSourceFields } from './search/types';
+export {
+  SavedQueryAttributes,
+  SavedQuery,
+  SavedQueryTimeFilter,
+} from '../../../../plugins/data/public';
 
 /** @public static code */
 export * from '../common';
 export { FilterStateManager } from './filter/filter_manager';
-export { getFromSavedObject, getRoutes, flattenHitWrapper } from './index_patterns';
+export { getRequestInspectorStats, getResponseInspectorStats } from './search';
diff --git a/src/legacy/core_plugins/data/public/index_patterns/index.ts b/src/legacy/core_plugins/data/public/index_patterns/index.ts
deleted file mode 100644
index 96995c10e5469..0000000000000
--- a/src/legacy/core_plugins/data/public/index_patterns/index.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { IFieldType, indexPatterns } from '../../../../../plugins/data/public';
-
-const getFromSavedObject = indexPatterns.getFromSavedObject;
-const getRoutes = indexPatterns.getRoutes;
-const flattenHitWrapper = indexPatterns.flattenHitWrapper;
-
-export { getFromSavedObject, getRoutes, flattenHitWrapper };
-export { IFieldType as FieldType };
-export {
-  Field,
-  IFieldList,
-  IndexPattern,
-  IndexPatternsContract,
-} from '../../../../../plugins/data/public';
diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts
index 676904faf6f2f..893e477b38583 100644
--- a/src/legacy/core_plugins/data/public/plugin.ts
+++ b/src/legacy/core_plugins/data/public/plugin.ts
@@ -18,10 +18,16 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { SearchService, SearchStart } from './search';
 import { DataPublicPluginStart } from '../../../../plugins/data/public';
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { setFieldFormats } from '../../../../plugins/data/public/services';
+import {
+  setFieldFormats,
+  setNotifications,
+  setIndexPatterns,
+  setQueryService,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../plugins/data/public/services';
 
 export interface DataPluginStartDependencies {
   data: DataPublicPluginStart;
@@ -32,8 +38,9 @@ export interface DataPluginStartDependencies {
  *
  * @public
  */
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface DataStart {}
+export interface DataStart {
+  search: SearchStart;
+}
 
 /**
  * Data Plugin - public
@@ -48,13 +55,24 @@ export interface DataStart {}
  */
 
 export class DataPlugin implements Plugin<void, DataStart, {}, DataPluginStartDependencies> {
+  private readonly search = new SearchService();
+
   public setup(core: CoreSetup) {}
 
   public start(core: CoreStart, { data }: DataPluginStartDependencies): DataStart {
     // This is required for when Angular code uses Field and FieldList.
     setFieldFormats(data.fieldFormats);
-    return {};
+    setQueryService(data.query);
+    setIndexPatterns(data.indexPatterns);
+    setFieldFormats(data.fieldFormats);
+    setNotifications(core.notifications);
+
+    return {
+      search: this.search.start(core),
+    };
   }
 
-  public stop() {}
+  public stop() {
+    this.search.stop();
+  }
 }
diff --git a/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts b/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
index c94d35d1f7f2a..4ec4dbd7f88d6 100644
--- a/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
+++ b/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
@@ -21,43 +21,43 @@ import { get, has } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { AggConfigs } from 'ui/agg_types/agg_configs';
 import { createFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
-import chrome from 'ui/chrome';
-import { Query, TimeRange, esFilters } from 'src/plugins/data/public';
 import {
   KibanaContext,
   KibanaDatatable,
   ExpressionFunction,
   KibanaDatatableColumn,
 } from 'src/plugins/expressions/public';
-import { npStart } from 'ui/new_platform';
+import {
+  Query,
+  TimeRange,
+  esFilters,
+  getTime,
+  FilterManager,
+} from '../../../../../../plugins/data/public';
 import {
   SearchSource,
-  SearchSourceContract,
+  ISearchSource,
   getRequestInspectorStats,
   getResponseInspectorStats,
 } from '../../../../../ui/public/courier';
-// @ts-ignore
-import {
-  FilterBarQueryFilterProvider,
-  QueryFilter,
-} from '../../../../../ui/public/filter_manager/query_filter';
 
 import { buildTabularInspectorData } from '../../../../../ui/public/inspector/build_tabular_inspector_data';
 import { calculateObjectHash } from '../../../../visualizations/public';
-import { getTime } from '../../../../../ui/public/timefilter';
 // @ts-ignore
 import { tabifyAggResponse } from '../../../../../ui/public/agg_response/tabify/tabify';
 import { PersistedState } from '../../../../../ui/public/persisted_state';
 import { Adapters } from '../../../../../../plugins/inspector/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getQueryService, getIndexPatterns } from '../../../../../../plugins/data/public/services';
 
 export interface RequestHandlerParams {
-  searchSource: SearchSourceContract;
+  searchSource: ISearchSource;
   aggs: AggConfigs;
   timeRange?: TimeRange;
   query?: Query;
   filters?: esFilters.Filter[];
   forceFetch: boolean;
-  queryFilter: QueryFilter;
+  filterManager: FilterManager;
   uiState?: PersistedState;
   partialRows?: boolean;
   inspectorAdapters: Adapters;
@@ -90,7 +90,7 @@ const handleCourierRequest = async ({
   partialRows,
   metricsAtAllLevels,
   inspectorAdapters,
-  queryFilter,
+  filterManager,
   abortSignal,
 }: RequestHandlerParams) => {
   // Create a new search source that inherits the original search source
@@ -216,7 +216,7 @@ const handleCourierRequest = async ({
   }
 
   inspectorAdapters.data.setTabularLoader(
-    () => buildTabularInspectorData((searchSource as any).tabifiedResponse, queryFilter),
+    () => buildTabularInspectorData((searchSource as any).tabifiedResponse, filterManager),
     { returnsFormattedValues: true }
   );
 
@@ -259,10 +259,8 @@ export const esaggs = (): ExpressionFunction<typeof name, Context, Arguments, Re
     },
   },
   async fn(context, args, { inspectorAdapters, abortSignal }) {
-    const $injector = await chrome.dangerouslyGetActiveInjector();
-    const Private: Function = $injector.get('Private');
-    const { indexPatterns } = npStart.plugins.data;
-    const queryFilter = Private(FilterBarQueryFilterProvider);
+    const indexPatterns = getIndexPatterns();
+    const { filterManager } = getQueryService();
 
     const aggConfigsState = JSON.parse(args.aggConfigs);
     const indexPattern = await indexPatterns.get(args.index);
@@ -283,7 +281,7 @@ export const esaggs = (): ExpressionFunction<typeof name, Context, Arguments, Re
       metricsAtAllLevels: args.metricsAtAllLevels,
       partialRows: args.partialRows,
       inspectorAdapters,
-      queryFilter,
+      filterManager,
       abortSignal: (abortSignal as unknown) as AbortSignal,
     });
 
diff --git a/src/legacy/ui/public/courier/fetch/call_client.test.ts b/src/legacy/core_plugins/data/public/search/fetch/call_client.test.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/call_client.test.ts
rename to src/legacy/core_plugins/data/public/search/fetch/call_client.test.ts
diff --git a/src/legacy/ui/public/courier/fetch/call_client.ts b/src/legacy/core_plugins/data/public/search/fetch/call_client.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/call_client.ts
rename to src/legacy/core_plugins/data/public/search/fetch/call_client.ts
diff --git a/src/legacy/ui/public/courier/fetch/components/__mocks__/shard_failure_request.ts b/src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_request.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/__mocks__/shard_failure_request.ts
rename to src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_request.ts
diff --git a/src/legacy/ui/public/courier/fetch/components/__mocks__/shard_failure_response.ts b/src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_response.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/__mocks__/shard_failure_response.ts
rename to src/legacy/core_plugins/data/public/search/fetch/components/__mocks__/shard_failure_response.ts
diff --git a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_description.test.tsx.snap b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_description.test.tsx.snap
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_description.test.tsx.snap
rename to src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_description.test.tsx.snap
diff --git a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
similarity index 98%
rename from src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
rename to src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
index 9a47fff2745c3..f7f3d1c1fbd0c 100644
--- a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_modal.test.tsx.snap
@@ -181,7 +181,7 @@ exports[`ShardFailureModal renders matching snapshot given valid properties 1`]
       <FormattedMessage
         defaultMessage="Close"
         description="Closing the Modal"
-        id="common.ui.courier.fetch.shardsFailedModal.close"
+        id="data.search.searchSource.fetch.shardsFailedModal.close"
         values={Object {}}
       />
     </EuiButton>
diff --git a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
similarity index 98%
rename from src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
rename to src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
index 1c7ae60fa4d9e..55e2c63f608d4 100644
--- a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
@@ -36,7 +36,6 @@ exports[`ShardFailureTable renders matching snapshot given valid properties 1`]
       },
     ]
   }
-  executeQueryOptions={Object {}}
   itemId="id"
   itemIdToExpandedRowMap={Object {}}
   items={
diff --git a/src/legacy/ui/public/courier/fetch/components/_shard_failure_modal.scss b/src/legacy/core_plugins/data/public/search/fetch/components/_shard_failure_modal.scss
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/_shard_failure_modal.scss
rename to src/legacy/core_plugins/data/public/search/fetch/components/_shard_failure_modal.scss
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_description.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_description.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_description.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx
similarity index 96%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_description.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx
index 6028a50cf9c3e..60e0e35a0f152 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_description.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { EuiCodeBlock, EuiDescriptionList, EuiSpacer } from '@elastic/eui';
 import { ShardFailure } from './shard_failure_types';
-import { getFlattenedObject } from '../../../../../../legacy/utils/get_flattened_object';
+import { getFlattenedObject } from '../../../../../../../legacy/utils/get_flattened_object';
 import { ShardFailureDescriptionHeader } from './shard_failure_description_header';
 
 /**
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_description_header.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx
similarity index 96%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_description_header.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx
index ea4f33f9e914e..947f33efa242c 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_description_header.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx
@@ -35,7 +35,7 @@ export function getFailureSummaryText(failure: ShardFailure, failureDetails?: st
   const displayDetails =
     typeof failureDetails === 'string' ? failureDetails : getFailureSummaryDetailsText(failure);
 
-  return i18n.translate('common.ui.courier.fetch.shardsFailedModal.failureHeader', {
+  return i18n.translate('data.search.searchSource.fetch.shardsFailedModal.failureHeader', {
     defaultMessage: '{failureName} at {failureDetails}',
     values: { failureName, failureDetails: displayDetails },
     description: 'Summary of shard failures, e.g. "IllegalArgumentException at shard 0 node xyz"',
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_modal.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_modal.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_modal.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx
similarity index 85%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_modal.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx
index d028a831a6e39..65cb49c611575 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_modal.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx
@@ -59,15 +59,18 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
   const tabs = [
     {
       id: 'table',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderShardFailures', {
-        defaultMessage: 'Shard failures',
-        description: 'Name of the tab displaying shard failures',
-      }),
+      name: i18n.translate(
+        'data.search.searchSource.fetch.shardsFailedModal.tabHeaderShardFailures',
+        {
+          defaultMessage: 'Shard failures',
+          description: 'Name of the tab displaying shard failures',
+        }
+      ),
       content: <ShardFailureTable failures={failures} />,
     },
     {
       id: 'json-request',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderRequest', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tabHeaderRequest', {
         defaultMessage: 'Request',
         description: 'Name of the tab displaying the JSON request',
       }),
@@ -79,7 +82,7 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
     },
     {
       id: 'json-response',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderResponse', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tabHeaderResponse', {
         defaultMessage: 'Response',
         description: 'Name of the tab displaying the JSON response',
       }),
@@ -104,7 +107,7 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
           {copy => (
             <EuiButtonEmpty onClick={copy}>
               <FormattedMessage
-                id="common.ui.courier.fetch.shardsFailedModal.copyToClipboard"
+                id="data.search.searchSource.fetch.shardsFailedModal.copyToClipboard"
                 defaultMessage="Copy response to clipboard"
               />
             </EuiButtonEmpty>
@@ -112,7 +115,7 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
         </EuiCopy>
         <EuiButton onClick={() => onClose()} fill data-test-sub="closeShardFailureModal">
           <FormattedMessage
-            id="common.ui.courier.fetch.shardsFailedModal.close"
+            id="data.search.searchSource.fetch.shardsFailedModal.close"
             defaultMessage="Close"
             description="Closing the Modal"
           />
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.mocks.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
similarity index 77%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
index b09270881cc05..4dd4d5943fadc 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
@@ -16,16 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { setOverlays } from '../../../../../../../plugins/data/public/services';
+import { OverlayStart } from 'kibana/public';
+
 export const openModal = jest.fn();
 
-jest.doMock('ui/new_platform', () => {
-  return {
-    npStart: {
-      core: {
-        overlays: {
-          openModal,
-        },
-      },
-    },
-  };
-});
+setOverlays(({
+  openModal,
+} as unknown) as OverlayStart);
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx
similarity index 84%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx
index b02344ce6dd72..c3ff042083473 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx
@@ -17,12 +17,12 @@
  * under the License.
  */
 import React from 'react';
-// @ts-ignore
-import { npStart } from 'ui/new_platform';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiButton, EuiTextAlign } from '@elastic/eui';
 
-import { toMountPoint } from '../../../../../../plugins/kibana_react/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getOverlays } from '../../../../../../../plugins/data/public/services';
+import { toMountPoint } from '../../../../../../../plugins/kibana_react/public';
 import { ShardFailureModal } from './shard_failure_modal';
 import { ResponseWithShardFailure, Request } from './shard_failure_types';
 
@@ -34,7 +34,7 @@ interface Props {
 
 export function ShardFailureOpenModalButton({ request, response, title }: Props) {
   function onClick() {
-    const modal = npStart.core.overlays.openModal(
+    const modal = getOverlays().openModal(
       toMountPoint(
         <ShardFailureModal
           request={request}
@@ -57,7 +57,7 @@ export function ShardFailureOpenModalButton({ request, response, title }: Props)
         data-test-subj="openShardFailureModalBtn"
       >
         <FormattedMessage
-          id="common.ui.courier.fetch.shardsFailedModal.showDetails"
+          id="data.search.searchSource.fetch.shardsFailedModal.showDetails"
           defaultMessage="Show details"
           description="Open the modal to show details"
         />
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_table.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_table.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_table.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx
similarity index 84%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_table.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx
index 7b19102647701..5d5047631231a 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_table.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx
@@ -44,7 +44,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
       render: (item: ListItem) => {
         const failureSummeryText = getFailureSummaryText(item);
         const collapseLabel = i18n.translate(
-          'common.ui.courier.fetch.shardsFailedModal.tableRowCollapse',
+          'data.search.searchSource.fetch.shardsFailedModal.tableRowCollapse',
           {
             defaultMessage: 'Collapse {rowDescription}',
             description: 'Collapse a row of a table with failures',
@@ -53,7 +53,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
         );
 
         const expandLabel = i18n.translate(
-          'common.ui.courier.fetch.shardsFailedModal.tableRowExpand',
+          'data.search.searchSource.fetch.shardsFailedModal.tableRowExpand',
           {
             defaultMessage: 'Expand {rowDescription}',
             description: 'Expand a row of a table with failures',
@@ -81,7 +81,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
     },
     {
       field: 'shard',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColShard', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColShard', {
         defaultMessage: 'Shard',
       }),
       sortable: true,
@@ -90,7 +90,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
     },
     {
       field: 'index',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColIndex', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColIndex', {
         defaultMessage: 'Index',
       }),
       sortable: true,
@@ -98,7 +98,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
     },
     {
       field: 'node',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColNode', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColNode', {
         defaultMessage: 'Node',
       }),
       sortable: true,
@@ -106,27 +106,25 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
     },
     {
       field: 'reason.type',
-      name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColReason', {
+      name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColReason', {
         defaultMessage: 'Reason',
       }),
       truncateText: true,
     },
   ];
 
-  const sorting = {
-    sort: {
-      field: 'index',
-      direction: 'desc',
-    },
-  };
-
   return (
     <EuiInMemoryTable
       itemId="id"
       items={itemList}
       columns={columns}
       pagination={true}
-      sorting={sorting}
+      sorting={{
+        sort: {
+          field: 'index',
+          direction: 'desc',
+        },
+      }}
       itemIdToExpandedRowMap={expandMap}
     />
   );
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_types.ts b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_types.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_types.ts
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_types.ts
diff --git a/src/legacy/ui/public/courier/fetch/errors.ts b/src/legacy/core_plugins/data/public/search/fetch/errors.ts
similarity index 91%
rename from src/legacy/ui/public/courier/fetch/errors.ts
rename to src/legacy/core_plugins/data/public/search/fetch/errors.ts
index a2ac013915b4b..5f5dc0452df51 100644
--- a/src/legacy/ui/public/courier/fetch/errors.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/errors.ts
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-import { SearchError } from '../../courier';
-import { KbnError } from '../../../../../plugins/kibana_utils/public';
+import { SearchError } from '../search_strategy';
+import { KbnError } from '../../../../../../plugins/kibana_utils/public';
 import { SearchResponse } from '../types';
+
 /**
  * Request Failure - When an entire multi request fails
  * @param {Error} err - the Error that came back
diff --git a/src/legacy/ui/public/courier/fetch/fetch_soon.test.ts b/src/legacy/core_plugins/data/public/search/fetch/fetch_soon.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/fetch/fetch_soon.test.ts
rename to src/legacy/core_plugins/data/public/search/fetch/fetch_soon.test.ts
index d96fb536985da..69a343c78b1e1 100644
--- a/src/legacy/ui/public/courier/fetch/fetch_soon.test.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/fetch_soon.test.ts
@@ -19,7 +19,7 @@
 
 import { fetchSoon } from './fetch_soon';
 import { callClient } from './call_client';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
 import { FetchHandlers, FetchOptions } from './types';
 import { SearchRequest, SearchResponse } from '../types';
 
diff --git a/src/legacy/ui/public/courier/fetch/fetch_soon.ts b/src/legacy/core_plugins/data/public/search/fetch/fetch_soon.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/fetch_soon.ts
rename to src/legacy/core_plugins/data/public/search/fetch/fetch_soon.ts
diff --git a/src/legacy/ui/public/courier/fetch/get_search_params.test.ts b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/fetch/get_search_params.test.ts
rename to src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts
index 76f3105d7f942..f856aa77bf1f8 100644
--- a/src/legacy/ui/public/courier/fetch/get_search_params.test.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { getMSearchParams, getSearchParams } from './get_search_params';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
 
 function getConfigStub(config: any = {}) {
   return {
diff --git a/src/legacy/ui/public/courier/fetch/get_search_params.ts b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts
similarity index 97%
rename from src/legacy/ui/public/courier/fetch/get_search_params.ts
rename to src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts
index 9fb8f2c728c6f..de9ec4cb920e8 100644
--- a/src/legacy/ui/public/courier/fetch/get_search_params.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
 
 const sessionId = Date.now();
 
diff --git a/src/legacy/core_plugins/data/public/search/fetch/handle_response.test.ts b/src/legacy/core_plugins/data/public/search/fetch/handle_response.test.ts
new file mode 100644
index 0000000000000..231ebf56993b6
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/fetch/handle_response.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 { handleResponse } from './handle_response';
+
+// 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';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { setNotifications } from '../../../../../../plugins/data/public/services';
+
+jest.mock('@kbn/i18n', () => {
+  return {
+    i18n: {
+      translate: (id: string, { defaultMessage }: { defaultMessage: string }) => defaultMessage,
+    },
+  };
+});
+
+describe('handleResponse', () => {
+  const notifications = notificationServiceMock.createStartContract();
+
+  beforeEach(() => {
+    setNotifications(notifications);
+    (notifications.toasts.addWarning as jest.Mock).mockReset();
+  });
+
+  test('should notify if timed out', () => {
+    const request = { body: {} };
+    const response = {
+      timed_out: true,
+    };
+    const result = handleResponse(request, response);
+    expect(result).toBe(response);
+    expect(notifications.toasts.addWarning).toBeCalled();
+    expect((notifications.toasts.addWarning as jest.Mock).mock.calls[0][0].title).toMatch(
+      'request timed out'
+    );
+  });
+
+  test('should notify if shards failed', () => {
+    const request = { body: {} };
+    const response = {
+      _shards: {
+        failed: true,
+      },
+    };
+    const result = handleResponse(request, response);
+    expect(result).toBe(response);
+    expect(notifications.toasts.addWarning).toBeCalled();
+    expect((notifications.toasts.addWarning as jest.Mock).mock.calls[0][0].title).toMatch(
+      'shards failed'
+    );
+  });
+
+  test('returns the response', () => {
+    const request = {};
+    const response = {};
+    const result = handleResponse(request, response);
+    expect(result).toBe(response);
+  });
+});
diff --git a/src/legacy/ui/public/courier/fetch/handle_response.tsx b/src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx
similarity index 77%
rename from src/legacy/ui/public/courier/fetch/handle_response.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx
index d7f2263268f8c..a08b7d14fd1c3 100644
--- a/src/legacy/ui/public/courier/fetch/handle_response.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx
@@ -20,23 +20,24 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer } from '@elastic/eui';
-import { toastNotifications } from '../../notify/toasts';
 import { ShardFailureOpenModalButton } from './components/shard_failure_open_modal_button';
 import { Request, ResponseWithShardFailure } from './components/shard_failure_types';
 import { SearchRequest, SearchResponse } from '../types';
-import { toMountPoint } from '../../../../../plugins/kibana_react/public';
+import { toMountPoint } from '../../../../../../plugins/kibana_react/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getNotifications } from '../../../../../../plugins/data/public/services';
 
 export function handleResponse(request: SearchRequest, response: SearchResponse) {
   if (response.timed_out) {
-    toastNotifications.addWarning({
-      title: i18n.translate('common.ui.courier.fetch.requestTimedOutNotificationMessage', {
+    getNotifications().toasts.addWarning({
+      title: i18n.translate('data.search.searchSource.fetch.requestTimedOutNotificationMessage', {
         defaultMessage: 'Data might be incomplete because your request timed out',
       }),
     });
   }
 
   if (response._shards && response._shards.failed) {
-    const title = i18n.translate('common.ui.courier.fetch.shardsFailedNotificationMessage', {
+    const title = i18n.translate('data.search.searchSource.fetch.shardsFailedNotificationMessage', {
       defaultMessage: '{shardsFailed} of {shardsTotal} shards failed',
       values: {
         shardsFailed: response._shards.failed,
@@ -44,7 +45,7 @@ export function handleResponse(request: SearchRequest, response: SearchResponse)
       },
     });
     const description = i18n.translate(
-      'common.ui.courier.fetch.shardsFailedNotificationDescription',
+      'data.search.searchSource.fetch.shardsFailedNotificationDescription',
       {
         defaultMessage: 'The data you are seeing might be incomplete or wrong.',
       }
@@ -62,7 +63,7 @@ export function handleResponse(request: SearchRequest, response: SearchResponse)
       </>
     );
 
-    toastNotifications.addWarning({ title, text });
+    getNotifications().toasts.addWarning({ title, text });
   }
 
   return response;
diff --git a/src/legacy/ui/public/courier/fetch/index.ts b/src/legacy/core_plugins/data/public/search/fetch/index.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/index.ts
rename to src/legacy/core_plugins/data/public/search/fetch/index.ts
diff --git a/src/legacy/core_plugins/data/public/search/fetch/types.ts b/src/legacy/core_plugins/data/public/search/fetch/types.ts
new file mode 100644
index 0000000000000..0887a1f84c7c8
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/fetch/types.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 { IUiSettingsClient } from '../../../../../../core/public';
+import { SearchRequest, SearchResponse } from '../types';
+
+export interface ApiCaller {
+  search: (searchRequest: SearchRequest) => ApiCallerResponse;
+  msearch: (searchRequest: SearchRequest) => ApiCallerResponse;
+}
+
+export interface ApiCallerResponse extends Promise<SearchResponse> {
+  abort: () => void;
+}
+
+export interface FetchOptions {
+  abortSignal?: AbortSignal;
+  searchStrategyId?: string;
+}
+
+export interface FetchHandlers {
+  es: ApiCaller;
+  config: IUiSettingsClient;
+  esShardTimeout: number;
+}
diff --git a/src/legacy/core_plugins/data/public/search/index.ts b/src/legacy/core_plugins/data/public/search/index.ts
index 9880b336e76e5..d930a47219514 100644
--- a/src/legacy/core_plugins/data/public/search/index.ts
+++ b/src/legacy/core_plugins/data/public/search/index.ts
@@ -16,3 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+export { SearchService, SearchSetup, SearchStart } from './search_service';
+
+export { getRequestInspectorStats, getResponseInspectorStats } from './utils';
diff --git a/src/legacy/core_plugins/data/public/search/search_service.ts b/src/legacy/core_plugins/data/public/search/search_service.ts
new file mode 100644
index 0000000000000..85701187fb31d
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_service.ts
@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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, CoreStart } from '../../../../../core/public';
+import { SearchSource } from './search_source';
+import { defaultSearchStrategy } from './search_strategy';
+import { SearchStrategyProvider } from './search_strategy/types';
+
+export interface SearchSetup {} // eslint-disable-line @typescript-eslint/no-empty-interface
+
+export interface SearchStart {
+  defaultSearchStrategy: SearchStrategyProvider;
+  SearchSource: typeof SearchSource;
+}
+
+/**
+ * The contract provided here is a new platform shim for ui/courier.
+ *
+ * Once it has been refactored to work with new platform services,
+ * it will move into the existing search service in src/plugins/data/public/search
+ */
+export class SearchService implements Plugin<SearchSetup, SearchStart> {
+  public setup(core: CoreSetup): SearchSetup {
+    return {};
+  }
+
+  public start(core: CoreStart): SearchStart {
+    return {
+      defaultSearchStrategy,
+      SearchSource,
+    };
+  }
+
+  public stop() {}
+}
diff --git a/src/legacy/ui/public/courier/search_source/filter_docvalue_fields.test.ts b/src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.test.ts
similarity index 100%
rename from src/legacy/ui/public/courier/search_source/filter_docvalue_fields.test.ts
rename to src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.test.ts
diff --git a/src/legacy/ui/public/courier/search_source/filter_docvalue_fields.ts b/src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.ts
similarity index 100%
rename from src/legacy/ui/public/courier/search_source/filter_docvalue_fields.ts
rename to src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.ts
diff --git a/src/legacy/core_plugins/data/public/search/search_source/index.ts b/src/legacy/core_plugins/data/public/search/search_source/index.ts
new file mode 100644
index 0000000000000..72170adc2b129
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_source/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 './search_source';
diff --git a/src/legacy/core_plugins/data/public/search/search_source/mocks.ts b/src/legacy/core_plugins/data/public/search/search_source/mocks.ts
new file mode 100644
index 0000000000000..fd72158012de6
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_source/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.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"), you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ISearchSource } from './search_source';
+
+export const searchSourceMock: MockedKeys<ISearchSource> = {
+  setPreferredSearchStrategyId: jest.fn(),
+  setFields: jest.fn().mockReturnThis(),
+  setField: jest.fn().mockReturnThis(),
+  getId: jest.fn(),
+  getFields: jest.fn(),
+  getField: jest.fn(),
+  getOwnField: jest.fn(),
+  create: jest.fn().mockReturnThis(),
+  createCopy: jest.fn().mockReturnThis(),
+  createChild: jest.fn().mockReturnThis(),
+  setParent: jest.fn(),
+  getParent: jest.fn().mockReturnThis(),
+  fetch: jest.fn().mockResolvedValue({}),
+  onRequestStart: jest.fn(),
+  getSearchRequestBody: jest.fn(),
+  destroy: jest.fn(),
+  history: [],
+};
diff --git a/src/legacy/ui/public/courier/search_source/normalize_sort_request.test.ts b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts
similarity index 97%
rename from src/legacy/ui/public/courier/search_source/normalize_sort_request.test.ts
rename to src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts
index d27b01eb5cf7c..22d1d931a9d09 100644
--- a/src/legacy/ui/public/courier/search_source/normalize_sort_request.test.ts
+++ b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts
@@ -19,7 +19,7 @@
 
 import { normalizeSortRequest } from './normalize_sort_request';
 import { SortDirection } from './types';
-import { IndexPattern } from '../../../../core_plugins/data/public/index_patterns';
+import { IIndexPattern } from '../../../../../../plugins/data/public';
 
 jest.mock('ui/new_platform');
 
@@ -40,7 +40,7 @@ describe('SearchSource#normalizeSortRequest', function() {
   };
   const indexPattern = {
     fields: [scriptedField, murmurScriptedField],
-  } as IndexPattern;
+  } as IIndexPattern;
 
   it('should return an array', function() {
     const sortable = { someField: SortDirection.desc };
diff --git a/src/legacy/ui/public/courier/search_source/normalize_sort_request.ts b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts
similarity index 93%
rename from src/legacy/ui/public/courier/search_source/normalize_sort_request.ts
rename to src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts
index 0f8fc8076caa0..93834c95514dc 100644
--- a/src/legacy/ui/public/courier/search_source/normalize_sort_request.ts
+++ b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IIndexPattern } from '../../../../../../plugins/data/public';
 import { EsQuerySortValue, SortOptions } from './types';
 
 export function normalizeSortRequest(
   sortObject: EsQuerySortValue | EsQuerySortValue[],
-  indexPattern: IndexPattern | string | undefined,
+  indexPattern: IIndexPattern | string | undefined,
   defaultSortOptions: SortOptions = {}
 ) {
   const sortArray: EsQuerySortValue[] = Array.isArray(sortObject) ? sortObject : [sortObject];
@@ -38,7 +38,7 @@ export function normalizeSortRequest(
  */
 function normalize(
   sortable: EsQuerySortValue,
-  indexPattern: IndexPattern | string | undefined,
+  indexPattern: IIndexPattern | string | undefined,
   defaultSortOptions: any
 ) {
   const [[sortField, sortOrder]] = Object.entries(sortable);
diff --git a/src/legacy/ui/public/courier/search_source/search_source.test.ts b/src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/search_source/search_source.test.ts
rename to src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts
index ddd3717f55e29..28f8dba9a75de 100644
--- a/src/legacy/ui/public/courier/search_source/search_source.test.ts
+++ b/src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { SearchSource } from '../search_source';
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../../plugins/data/public';
 
 jest.mock('ui/new_platform');
 
@@ -26,7 +26,7 @@ jest.mock('../fetch', () => ({
   fetchSoon: jest.fn().mockResolvedValue({}),
 }));
 
-jest.mock('../../chrome', () => ({
+jest.mock('ui/chrome', () => ({
   dangerouslyGetActiveInjector: () => ({
     get: jest.fn(),
   }),
diff --git a/src/legacy/core_plugins/data/public/search/search_source/search_source.ts b/src/legacy/core_plugins/data/public/search/search_source/search_source.ts
new file mode 100644
index 0000000000000..6efcae4d4b88d
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_source/search_source.ts
@@ -0,0 +1,410 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * @name SearchSource
+ *
+ * @description A promise-based stream of search results that can inherit from other search sources.
+ *
+ * Because filters/queries in Kibana have different levels of persistence and come from different
+ * places, it is important to keep track of where filters come from for when they are saved back to
+ * the savedObject store in the Kibana index. To do this, we create trees of searchSource objects
+ * that can have associated query parameters (index, query, filter, etc) which can also inherit from
+ * other searchSource objects.
+ *
+ * At query time, all of the searchSource objects that have subscribers are "flattened", at which
+ * point the query params from the searchSource are collected while traversing up the inheritance
+ * chain. At each link in the chain a decision about how to merge the query params is made until a
+ * single set of query parameters is created for each active searchSource (a searchSource with
+ * subscribers).
+ *
+ * That set of query parameters is then sent to elasticsearch. This is how the filter hierarchy
+ * works in Kibana.
+ *
+ * Visualize, starting from a new search:
+ *
+ *  - the `savedVis.searchSource` is set as the `appSearchSource`.
+ *  - The `savedVis.searchSource` would normally inherit from the `appSearchSource`, but now it is
+ *    upgraded to inherit from the `rootSearchSource`.
+ *  - Any interaction with the visualization will still apply filters to the `appSearchSource`, so
+ *    they will be stored directly on the `savedVis.searchSource`.
+ *  - Any interaction with the time filter will be written to the `rootSearchSource`, so those
+ *    filters will not be saved by the `savedVis`.
+ *  - When the `savedVis` is saved to elasticsearch, it takes with it all the filters that are
+ *    defined on it directly, but none of the ones that it inherits from other places.
+ *
+ * Visualize, starting from an existing search:
+ *
+ *  - The `savedVis` loads the `savedSearch` on which it is built.
+ *  - The `savedVis.searchSource` is set to inherit from the `saveSearch.searchSource` and set as
+ *    the `appSearchSource`.
+ *  - The `savedSearch.searchSource`, is set to inherit from the `rootSearchSource`.
+ *  - Then the `savedVis` is written to elasticsearch it will be flattened and only include the
+ *    filters created in the visualize application and will reconnect the filters from the
+ *    `savedSearch` at runtime to prevent losing the relationship
+ *
+ * Dashboard search sources:
+ *
+ *  - Each panel in a dashboard has a search source.
+ *  - The `savedDashboard` also has a searchsource, and it is set as the `appSearchSource`.
+ *  - Each panel's search source inherits from the `appSearchSource`, meaning that they inherit from
+ *    the dashboard search source.
+ *  - When a filter is added to the search box, or via a visualization, it is written to the
+ *    `appSearchSource`.
+ */
+
+import _ from 'lodash';
+import { npSetup } from 'ui/new_platform';
+import chrome from 'ui/chrome';
+import { normalizeSortRequest } from './normalize_sort_request';
+import { fetchSoon } from '../fetch';
+import { fieldWildcardFilter } from '../../../../../../plugins/kibana_utils/public';
+import { getHighlightRequest, esFilters, esQuery } from '../../../../../../plugins/data/public';
+import { RequestFailure } from '../fetch/errors';
+import { filterDocvalueFields } from './filter_docvalue_fields';
+import { SearchSourceOptions, SearchSourceFields, SearchRequest } from './types';
+import { FetchOptions, ApiCaller } from '../fetch/types';
+
+const esShardTimeout = npSetup.core.injectedMetadata.getInjectedVar('esShardTimeout') as number;
+const config = npSetup.core.uiSettings;
+
+export type ISearchSource = Pick<SearchSource, keyof SearchSource>;
+
+export class SearchSource {
+  private id: string = _.uniqueId('data_source');
+  private searchStrategyId?: string;
+  private parent?: SearchSource;
+  private requestStartHandlers: Array<
+    (searchSource: ISearchSource, options?: FetchOptions) => Promise<unknown>
+  > = [];
+  private inheritOptions: SearchSourceOptions = {};
+  public history: SearchRequest[] = [];
+
+  constructor(private fields: SearchSourceFields = {}) {}
+
+  /** ***
+   * PUBLIC API
+   *****/
+
+  setPreferredSearchStrategyId(searchStrategyId: string) {
+    this.searchStrategyId = searchStrategyId;
+  }
+
+  setFields(newFields: SearchSourceFields) {
+    this.fields = newFields;
+    return this;
+  }
+
+  setField<K extends keyof SearchSourceFields>(field: K, value: SearchSourceFields[K]) {
+    if (value == null) {
+      delete this.fields[field];
+    } else {
+      this.fields[field] = value;
+    }
+    return this;
+  }
+
+  getId() {
+    return this.id;
+  }
+
+  getFields() {
+    return { ...this.fields };
+  }
+
+  /**
+   * Get fields from the fields
+   */
+  getField<K extends keyof SearchSourceFields>(field: K, recurse = true): SearchSourceFields[K] {
+    if (!recurse || this.fields[field] !== void 0) {
+      return this.fields[field];
+    }
+    const parent = this.getParent();
+    return parent && parent.getField(field);
+  }
+
+  /**
+   * Get the field from our own fields, don't traverse up the chain
+   */
+  getOwnField<K extends keyof SearchSourceFields>(field: K): SearchSourceFields[K] {
+    return this.getField(field, false);
+  }
+
+  create() {
+    return new SearchSource();
+  }
+
+  createCopy() {
+    const newSearchSource = new SearchSource();
+    newSearchSource.setFields({ ...this.fields });
+    // when serializing the internal fields we lose the internal classes used in the index
+    // pattern, so we have to set it again to workaround this behavior
+    newSearchSource.setField('index', this.getField('index'));
+    newSearchSource.setParent(this.getParent());
+    return newSearchSource;
+  }
+
+  createChild(options = {}) {
+    const childSearchSource = new SearchSource();
+    childSearchSource.setParent(this, options);
+    return childSearchSource;
+  }
+
+  /**
+   * Set a searchSource that this source should inherit from
+   * @param  {SearchSource} parent - the parent searchSource
+   * @param  {SearchSourceOptions} options - the inherit options
+   * @return {this} - chainable
+   */
+  setParent(parent?: ISearchSource, options: SearchSourceOptions = {}) {
+    this.parent = parent as SearchSource;
+    this.inheritOptions = options;
+    return this;
+  }
+
+  /**
+   * Get the parent of this SearchSource
+   * @return {undefined|searchSource}
+   */
+  getParent() {
+    return this.parent;
+  }
+
+  /**
+   * Fetch this source and reject the returned Promise on error
+   *
+   * @async
+   */
+  async fetch(options: FetchOptions = {}) {
+    const $injector = await chrome.dangerouslyGetActiveInjector();
+    const es = $injector.get('es') as ApiCaller;
+
+    await this.requestIsStarting(options);
+
+    const searchRequest = await this.flatten();
+    this.history = [searchRequest];
+
+    const response = await fetchSoon(
+      searchRequest,
+      {
+        ...(this.searchStrategyId && { searchStrategyId: this.searchStrategyId }),
+        ...options,
+      },
+      { es, config, esShardTimeout }
+    );
+
+    if (response.error) {
+      throw new RequestFailure(null, response);
+    }
+
+    return response;
+  }
+
+  /**
+   *  Add a handler that will be notified whenever requests start
+   *  @param  {Function} handler
+   *  @return {undefined}
+   */
+  onRequestStart(
+    handler: (searchSource: ISearchSource, options?: FetchOptions) => Promise<unknown>
+  ) {
+    this.requestStartHandlers.push(handler);
+  }
+
+  async getSearchRequestBody() {
+    const searchRequest = await this.flatten();
+    return searchRequest.body;
+  }
+
+  /**
+   * Completely destroy the SearchSource.
+   * @return {undefined}
+   */
+  destroy() {
+    this.requestStartHandlers.length = 0;
+  }
+
+  /** ****
+   * PRIVATE APIS
+   ******/
+
+  /**
+   *  Called by requests of this search source when they are started
+   *  @param  {Courier.Request} request
+   *  @param options
+   *  @return {Promise<undefined>}
+   */
+  private requestIsStarting(options: FetchOptions = {}) {
+    const handlers = [...this.requestStartHandlers];
+    // If callParentStartHandlers has been set to true, we also call all
+    // handlers of parent search sources.
+    if (this.inheritOptions.callParentStartHandlers) {
+      let searchSource = this.getParent();
+      while (searchSource) {
+        handlers.push(...searchSource.requestStartHandlers);
+        searchSource = searchSource.getParent();
+      }
+    }
+
+    return Promise.all(handlers.map(fn => fn(this, options)));
+  }
+
+  /**
+   * Used to merge properties into the data within ._flatten().
+   * The data is passed in and modified by the function
+   *
+   * @param  {object} data - the current merged data
+   * @param  {*} val - the value at `key`
+   * @param  {*} key - The key of `val`
+   * @return {undefined}
+   */
+  private mergeProp<K extends keyof SearchSourceFields>(
+    data: SearchRequest,
+    val: SearchSourceFields[K],
+    key: K
+  ) {
+    val = typeof val === 'function' ? val(this) : val;
+    if (val == null || !key) return;
+
+    const addToRoot = (rootKey: string, value: any) => {
+      data[rootKey] = value;
+    };
+
+    /**
+     * Add the key and val to the body of the request
+     */
+    const addToBody = (bodyKey: string, value: any) => {
+      // ignore if we already have a value
+      if (data.body[bodyKey] == null) {
+        data.body[bodyKey] = value;
+      }
+    };
+
+    switch (key) {
+      case 'filter':
+        return addToRoot('filters', (data.filters || []).concat(val));
+      case 'query':
+        return addToRoot(key, (data[key] || []).concat(val));
+      case 'fields':
+        const fields = _.uniq((data[key] || []).concat(val));
+        return addToRoot(key, fields);
+      case 'index':
+      case 'type':
+      case 'highlightAll':
+        return key && data[key] == null && addToRoot(key, val);
+      case 'searchAfter':
+        return addToBody('search_after', val);
+      case 'source':
+        return addToBody('_source', val);
+      case 'sort':
+        const sort = normalizeSortRequest(val, this.getField('index'), config.get('sort:options'));
+        return addToBody(key, sort);
+      default:
+        return addToBody(key, val);
+    }
+  }
+
+  /**
+   * Walk the inheritance chain of a source and return its
+   * flat representation (taking into account merging rules)
+   * @returns {Promise}
+   * @resolved {Object|null} - the flat data of the SearchSource
+   */
+  private mergeProps(root = this, searchRequest: SearchRequest = { body: {} }) {
+    Object.entries(this.fields).forEach(([key, value]) => {
+      this.mergeProp(searchRequest, value, key as keyof SearchSourceFields);
+    });
+    if (this.parent) {
+      this.parent.mergeProps(root, searchRequest);
+    }
+    return searchRequest;
+  }
+
+  private flatten() {
+    const searchRequest = this.mergeProps();
+
+    searchRequest.body = searchRequest.body || {};
+    const { body, index, fields, query, filters, highlightAll } = searchRequest;
+
+    const computedFields = index ? index.getComputedFields() : {};
+
+    body.stored_fields = computedFields.storedFields;
+    body.script_fields = body.script_fields || {};
+    _.extend(body.script_fields, computedFields.scriptFields);
+
+    const defaultDocValueFields = computedFields.docvalueFields
+      ? computedFields.docvalueFields
+      : [];
+    body.docvalue_fields = body.docvalue_fields || defaultDocValueFields;
+
+    if (!body.hasOwnProperty('_source') && index) {
+      body._source = index.getSourceFiltering();
+    }
+
+    if (body._source) {
+      // exclude source fields for this index pattern specified by the user
+      const filter = fieldWildcardFilter(body._source.excludes, config.get('metaFields'));
+      body.docvalue_fields = body.docvalue_fields.filter((docvalueField: any) =>
+        filter(docvalueField.field)
+      );
+    }
+
+    // if we only want to search for certain fields
+    if (fields) {
+      // filter out the docvalue_fields, and script_fields to only include those that we are concerned with
+      body.docvalue_fields = filterDocvalueFields(body.docvalue_fields, fields);
+      body.script_fields = _.pick(body.script_fields, fields);
+
+      // request the remaining fields from both stored_fields and _source
+      const remainingFields = _.difference(fields, _.keys(body.script_fields));
+      body.stored_fields = remainingFields;
+      _.set(body, '_source.includes', remainingFields);
+    }
+
+    const esQueryConfigs = esQuery.getEsQueryConfig(config);
+    body.query = esQuery.buildEsQuery(index, query, filters, esQueryConfigs);
+
+    if (highlightAll && body.query) {
+      body.highlight = getHighlightRequest(body.query, config.get('doc_table:highlight'));
+      delete searchRequest.highlightAll;
+    }
+
+    const translateToQuery = (filter: esFilters.Filter) => filter && (filter.query || filter);
+
+    // re-write filters within filter aggregations
+    (function recurse(aggBranch) {
+      if (!aggBranch) return;
+      Object.keys(aggBranch).forEach(function(id) {
+        const agg = aggBranch[id];
+
+        if (agg.filters) {
+          // translate filters aggregations
+          const { filters: aggFilters } = agg.filters;
+          Object.keys(aggFilters).forEach(filterId => {
+            aggFilters[filterId] = translateToQuery(aggFilters[filterId]);
+          });
+        }
+
+        recurse(agg.aggs || agg.aggregations);
+      });
+    })(body.aggs || body.aggregations);
+
+    return searchRequest;
+  }
+}
diff --git a/src/legacy/core_plugins/data/public/search/search_source/types.ts b/src/legacy/core_plugins/data/public/search/search_source/types.ts
new file mode 100644
index 0000000000000..9c5b57519d75f
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_source/types.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 { NameList } from 'elasticsearch';
+import { esFilters, IndexPattern, Query } from '../../../../../../plugins/data/public';
+
+export type EsQuerySearchAfter = [string | number, string | number];
+
+export enum SortDirection {
+  asc = 'asc',
+  desc = 'desc',
+}
+
+export type EsQuerySortValue = Record<string, SortDirection>;
+
+export interface SearchSourceFields {
+  type?: string;
+  query?: Query;
+  filter?:
+    | esFilters.Filter[]
+    | esFilters.Filter
+    | (() => esFilters.Filter[] | esFilters.Filter | undefined);
+  sort?: EsQuerySortValue | EsQuerySortValue[];
+  highlight?: any;
+  highlightAll?: boolean;
+  aggs?: any;
+  from?: number;
+  size?: number;
+  source?: NameList;
+  version?: boolean;
+  fields?: NameList;
+  index?: IndexPattern;
+  searchAfter?: EsQuerySearchAfter;
+  timeout?: string;
+  terminate_after?: number;
+}
+
+export interface SearchSourceOptions {
+  callParentStartHandlers?: boolean;
+}
+
+export { ISearchSource } from './search_source';
+
+export interface SortOptions {
+  mode?: 'min' | 'max' | 'sum' | 'avg' | 'median';
+  type?: 'double' | 'long' | 'date' | 'date_nanos';
+  nested?: object;
+  unmapped_type?: string;
+  distance_type?: 'arc' | 'plane';
+  unit?: string;
+  ignore_unmapped?: boolean;
+  _script?: object;
+}
+
+export interface Request {
+  docvalue_fields: string[];
+  _source: unknown;
+  query: unknown;
+  script_fields: unknown;
+  sort: unknown;
+  stored_fields: string[];
+}
+
+export interface ResponseWithShardFailure {
+  _shards: {
+    failed: number;
+    failures: ShardFailure[];
+    skipped: number;
+    successful: number;
+    total: number;
+  };
+}
+
+export interface ShardFailure {
+  index: string;
+  node: string;
+  reason: {
+    caused_by: {
+      reason: string;
+      type: string;
+    };
+    reason: string;
+    lang?: string;
+    script?: string;
+    script_stack?: string[];
+    type: string;
+  };
+  shard: number;
+}
+
+export type SearchRequest = any;
+export type SearchResponse = any;
diff --git a/src/legacy/ui/public/courier/search_strategy/default_search_strategy.test.ts b/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/search_strategy/default_search_strategy.test.ts
rename to src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.test.ts
index 53a857a72c1a3..0ec6a6c2e143e 100644
--- a/src/legacy/ui/public/courier/search_strategy/default_search_strategy.test.ts
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { defaultSearchStrategy } from './default_search_strategy';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
 import { SearchStrategySearchParams } from './types';
 
 const { search } = defaultSearchStrategy;
diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.ts b/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.ts
new file mode 100644
index 0000000000000..9bfa1df71aa81
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/default_search_strategy.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 { SearchStrategyProvider, SearchStrategySearchParams } from './types';
+import { isDefaultTypeIndexPattern } from './is_default_type_index_pattern';
+import {
+  getSearchParams,
+  getMSearchParams,
+  getPreference,
+  getTimeout,
+} from '../fetch/get_search_params';
+
+export const defaultSearchStrategy: SearchStrategyProvider = {
+  id: 'default',
+
+  search: params => {
+    return params.config.get('courier:batchSearches') ? msearch(params) : search(params);
+  },
+
+  isViable: indexPattern => {
+    return indexPattern && isDefaultTypeIndexPattern(indexPattern);
+  },
+};
+
+function msearch({ searchRequests, es, config, esShardTimeout }: SearchStrategySearchParams) {
+  const inlineRequests = searchRequests.map(({ index, body, search_type: searchType }) => {
+    const inlineHeader = {
+      index: index.title || index,
+      search_type: searchType,
+      ignore_unavailable: true,
+      preference: getPreference(config),
+    };
+    const inlineBody = {
+      ...body,
+      timeout: getTimeout(esShardTimeout),
+    };
+    return `${JSON.stringify(inlineHeader)}\n${JSON.stringify(inlineBody)}`;
+  });
+
+  const searching = es.msearch({
+    ...getMSearchParams(config),
+    body: `${inlineRequests.join('\n')}\n`,
+  });
+  return {
+    searching: searching.then(({ responses }) => responses),
+    abort: searching.abort,
+  };
+}
+
+function search({ searchRequests, es, config, esShardTimeout }: SearchStrategySearchParams) {
+  const abortController = new AbortController();
+  const searchParams = getSearchParams(config, esShardTimeout);
+  const promises = searchRequests.map(({ index, body }) => {
+    const searching = es.search({ index: index.title || index, body, ...searchParams });
+    abortController.signal.addEventListener('abort', searching.abort);
+    return searching.catch(({ response }) => JSON.parse(response));
+  });
+  return {
+    searching: Promise.all(promises),
+    abort: () => abortController.abort(),
+  };
+}
diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/index.ts b/src/legacy/core_plugins/data/public/search/search_strategy/index.ts
new file mode 100644
index 0000000000000..1584baa4faade
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/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 {
+  addSearchStrategy,
+  hasSearchStategyForIndexPattern,
+  getSearchStrategyById,
+  getSearchStrategyForSearchRequest,
+} from './search_strategy_registry';
+
+export { defaultSearchStrategy } from './default_search_strategy';
+
+export { isDefaultTypeIndexPattern } from './is_default_type_index_pattern';
+
+export { SearchError, getSearchErrorType } from './search_error';
diff --git a/src/legacy/ui/public/courier/search_strategy/is_default_type_index_pattern.ts b/src/legacy/core_plugins/data/public/search/search_strategy/is_default_type_index_pattern.ts
similarity index 93%
rename from src/legacy/ui/public/courier/search_strategy/is_default_type_index_pattern.ts
rename to src/legacy/core_plugins/data/public/search/search_strategy/is_default_type_index_pattern.ts
index 3785ce6341078..7d03b1dc9e0b1 100644
--- a/src/legacy/ui/public/courier/search_strategy/is_default_type_index_pattern.ts
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/is_default_type_index_pattern.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../../plugins/data/public';
 
 export const isDefaultTypeIndexPattern = (indexPattern: IndexPattern) => {
   // Default index patterns don't have `type` defined.
diff --git a/src/legacy/ui/public/courier/search_strategy/no_op_search_strategy.ts b/src/legacy/core_plugins/data/public/search/search_strategy/no_op_search_strategy.ts
similarity index 83%
rename from src/legacy/ui/public/courier/search_strategy/no_op_search_strategy.ts
rename to src/legacy/core_plugins/data/public/search/search_strategy/no_op_search_strategy.ts
index 24c3876cfcc05..dc7331e614a0e 100644
--- a/src/legacy/ui/public/courier/search_strategy/no_op_search_strategy.ts
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/no_op_search_strategy.ts
@@ -27,11 +27,14 @@ export const noOpSearchStrategy: SearchStrategyProvider = {
   search: () => {
     const searchError = new SearchError({
       status: '418', // "I'm a teapot" error
-      title: i18n.translate('common.ui.courier.noSearchStrategyRegisteredErrorMessageTitle', {
-        defaultMessage: 'No search strategy registered',
-      }),
+      title: i18n.translate(
+        'data.search.searchSource.noSearchStrategyRegisteredErrorMessageTitle',
+        {
+          defaultMessage: 'No search strategy registered',
+        }
+      ),
       message: i18n.translate(
-        'common.ui.courier.noSearchStrategyRegisteredErrorMessageDescription',
+        'data.search.searchSource.noSearchStrategyRegisteredErrorMessageDescription',
         {
           defaultMessage: `Couldn't find a search strategy for the search request`,
         }
diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/search_error.ts b/src/legacy/core_plugins/data/public/search/search_strategy/search_error.ts
new file mode 100644
index 0000000000000..d4042fb17499c
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/search_error.ts
@@ -0,0 +1,62 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+interface SearchErrorOptions {
+  status: string;
+  title: string;
+  message: string;
+  path: string;
+  type: string;
+}
+
+export class SearchError extends Error {
+  public name: string;
+  public status: string;
+  public title: string;
+  public message: string;
+  public path: string;
+  public type: string;
+
+  constructor({ status, title, message, path, type }: SearchErrorOptions) {
+    super(message);
+    this.name = 'SearchError';
+    this.status = status;
+    this.title = title;
+    this.message = message;
+    this.path = path;
+    this.type = type;
+
+    // captureStackTrace is only available in the V8 engine, so any browser using
+    // a different JS engine won't have access to this method.
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, SearchError);
+    }
+
+    // Babel doesn't support traditional `extends` syntax for built-in classes.
+    // https://babeljs.io/docs/en/caveats/#classes
+    Object.setPrototypeOf(this, SearchError.prototype);
+  }
+}
+
+export function getSearchErrorType({ message }: Pick<SearchError, 'message'>) {
+  const msg = message.toLowerCase();
+  if (msg.indexOf('unsupported query') > -1) {
+    return 'UNSUPPORTED_QUERY';
+  }
+}
diff --git a/src/legacy/ui/public/courier/search_strategy/search_strategy_registry.test.ts b/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/search_strategy/search_strategy_registry.test.ts
rename to src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.test.ts
index ae2ed6128c8ea..73b011896a97d 100644
--- a/src/legacy/ui/public/courier/search_strategy/search_strategy_registry.test.ts
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../../plugins/data/public';
 import { noOpSearchStrategy } from './no_op_search_strategy';
 import {
   searchStrategies,
diff --git a/src/legacy/ui/public/courier/search_strategy/search_strategy_registry.ts b/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.ts
similarity index 97%
rename from src/legacy/ui/public/courier/search_strategy/search_strategy_registry.ts
rename to src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.ts
index 9ef007f97531e..d814a04737f75 100644
--- a/src/legacy/ui/public/courier/search_strategy/search_strategy_registry.ts
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/search_strategy_registry.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../../plugins/data/public';
 import { SearchStrategyProvider } from './types';
 import { noOpSearchStrategy } from './no_op_search_strategy';
 import { SearchResponse } from '../types';
diff --git a/src/legacy/core_plugins/data/public/search/search_strategy/types.ts b/src/legacy/core_plugins/data/public/search/search_strategy/types.ts
new file mode 100644
index 0000000000000..ad8576589e4e3
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_strategy/types.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 { IndexPattern } from '../../../../../../plugins/data/public';
+import { FetchHandlers } from '../fetch/types';
+import { SearchRequest, SearchResponse } from '../types';
+
+export interface SearchStrategyProvider {
+  id: string;
+  search: (params: SearchStrategySearchParams) => SearchStrategyResponse;
+  isViable: (indexPattern: IndexPattern) => boolean;
+}
+
+export interface SearchStrategyResponse {
+  searching: Promise<SearchResponse[]>;
+  abort: () => void;
+}
+
+export interface SearchStrategySearchParams extends FetchHandlers {
+  searchRequests: SearchRequest[];
+}
diff --git a/src/legacy/core_plugins/data/public/search/types.ts b/src/legacy/core_plugins/data/public/search/types.ts
new file mode 100644
index 0000000000000..23d74ce6a57da
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/types.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.
+ */
+
+export * from './fetch/types';
+export * from './search_source/types';
+export * from './search_strategy/types';
+export * from './utils/types';
diff --git a/src/legacy/core_plugins/data/public/search/utils/courier_inspector_utils.ts b/src/legacy/core_plugins/data/public/search/utils/courier_inspector_utils.ts
new file mode 100644
index 0000000000000..7f7d216d8f0f3
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/utils/courier_inspector_utils.ts
@@ -0,0 +1,124 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 function collects statistics from a SearchSource and a response
+ * for the usage in the inspector stats panel. Pass in a searchSource and a response
+ * and the returned object can be passed to the `stats` method of the request
+ * logger.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { SearchResponse } from 'elasticsearch';
+import { ISearchSource, RequestInspectorStats } from '../types';
+
+export function getRequestInspectorStats(searchSource: ISearchSource) {
+  const stats: RequestInspectorStats = {};
+  const index = searchSource.getField('index');
+
+  if (index) {
+    stats.indexPattern = {
+      label: i18n.translate('data.search.searchSource.indexPatternLabel', {
+        defaultMessage: 'Index pattern',
+      }),
+      value: index.title,
+      description: i18n.translate('data.search.searchSource.indexPatternDescription', {
+        defaultMessage: 'The index pattern that connected to the Elasticsearch indices.',
+      }),
+    };
+    stats.indexPatternId = {
+      label: i18n.translate('data.search.searchSource.indexPatternIdLabel', {
+        defaultMessage: 'Index pattern ID',
+      }),
+      value: index.id!,
+      description: i18n.translate('data.search.searchSource.indexPatternIdDescription', {
+        defaultMessage: 'The ID in the {kibanaIndexPattern} index.',
+        values: { kibanaIndexPattern: '.kibana' },
+      }),
+    };
+  }
+
+  return stats;
+}
+
+export function getResponseInspectorStats(
+  searchSource: ISearchSource,
+  resp: SearchResponse<unknown>
+) {
+  const lastRequest = searchSource.history && searchSource.history[searchSource.history.length - 1];
+  const stats: RequestInspectorStats = {};
+
+  if (resp && resp.took) {
+    stats.queryTime = {
+      label: i18n.translate('data.search.searchSource.queryTimeLabel', {
+        defaultMessage: 'Query time',
+      }),
+      value: i18n.translate('data.search.searchSource.queryTimeValue', {
+        defaultMessage: '{queryTime}ms',
+        values: { queryTime: resp.took },
+      }),
+      description: i18n.translate('data.search.searchSource.queryTimeDescription', {
+        defaultMessage:
+          'The time it took to process the query. ' +
+          'Does not include the time to send the request or parse it in the browser.',
+      }),
+    };
+  }
+
+  if (resp && resp.hits) {
+    stats.hitsTotal = {
+      label: i18n.translate('data.search.searchSource.hitsTotalLabel', {
+        defaultMessage: 'Hits (total)',
+      }),
+      value: `${resp.hits.total}`,
+      description: i18n.translate('data.search.searchSource.hitsTotalDescription', {
+        defaultMessage: 'The number of documents that match the query.',
+      }),
+    };
+
+    stats.hits = {
+      label: i18n.translate('data.search.searchSource.hitsLabel', {
+        defaultMessage: 'Hits',
+      }),
+      value: `${resp.hits.hits.length}`,
+      description: i18n.translate('data.search.searchSource.hitsDescription', {
+        defaultMessage: 'The number of documents returned by the query.',
+      }),
+    };
+  }
+
+  if (lastRequest && (lastRequest.ms === 0 || lastRequest.ms)) {
+    stats.requestTime = {
+      label: i18n.translate('data.search.searchSource.requestTimeLabel', {
+        defaultMessage: 'Request time',
+      }),
+      value: i18n.translate('data.search.searchSource.requestTimeValue', {
+        defaultMessage: '{requestTime}ms',
+        values: { requestTime: lastRequest.ms },
+      }),
+      description: i18n.translate('data.search.searchSource.requestTimeDescription', {
+        defaultMessage:
+          'The time of the request from the browser to Elasticsearch and back. ' +
+          'Does not include the time the requested waited in the queue.',
+      }),
+    };
+  }
+
+  return stats;
+}
diff --git a/src/legacy/core_plugins/data/public/search/utils/index.ts b/src/legacy/core_plugins/data/public/search/utils/index.ts
new file mode 100644
index 0000000000000..021ece8701e98
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/utils/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './courier_inspector_utils';
diff --git a/src/legacy/ui/public/courier/utils/types.ts b/src/legacy/core_plugins/data/public/search/utils/types.ts
similarity index 100%
rename from src/legacy/ui/public/courier/utils/types.ts
rename to src/legacy/core_plugins/data/public/search/utils/types.ts
diff --git a/src/legacy/core_plugins/elasticsearch/index.js b/src/legacy/core_plugins/elasticsearch/index.js
index 7fc00e27e5b5f..da7b557e7ea19 100644
--- a/src/legacy/core_plugins/elasticsearch/index.js
+++ b/src/legacy/core_plugins/elasticsearch/index.js
@@ -16,9 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { combineLatest } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { first } from 'rxjs/operators';
 import healthCheck from './lib/health_check';
 import { Cluster } from './lib/cluster';
 import { createProxy } from './lib/create_proxy';
@@ -36,19 +34,12 @@ export default function(kibana) {
       // All methods that ES plugin exposes are synchronous so we should get the first
       // value from all observables here to be able to synchronously return and create
       // cluster clients afterwards.
-      const [esConfig, adminCluster, dataCluster] = await combineLatest(
-        server.newPlatform.__internals.elasticsearch.legacy.config$,
-        server.newPlatform.setup.core.elasticsearch.adminClient$,
-        server.newPlatform.setup.core.elasticsearch.dataClient$
-      )
-        .pipe(
-          first(),
-          map(([config, adminClusterClient, dataClusterClient]) => [
-            config,
-            new Cluster(adminClusterClient),
-            new Cluster(dataClusterClient),
-          ])
-        )
+      const { adminClient, dataClient } = server.newPlatform.setup.core.elasticsearch;
+      const adminCluster = new Cluster(adminClient);
+      const dataCluster = new Cluster(dataClient);
+
+      const esConfig = await server.newPlatform.__internals.elasticsearch.legacy.config$
+        .pipe(first())
         .toPromise();
 
       defaultVars = {
diff --git a/src/legacy/core_plugins/input_control_vis/index.js b/src/legacy/core_plugins/input_control_vis/index.js
deleted file mode 100644
index a21b79e28fb7f..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/index.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.
- */
-
-import { resolve } from 'path';
-
-export default function(kibana) {
-  return new kibana.Plugin({
-    uiExports: {
-      visTypes: ['plugins/input_control_vis/register_vis'],
-      interpreter: ['plugins/input_control_vis/input_control_fn'],
-      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-    },
-  });
-}
diff --git a/src/legacy/core_plugins/input_control_vis/index.ts b/src/legacy/core_plugins/input_control_vis/index.ts
new file mode 100644
index 0000000000000..8f6178e26126b
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/index.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 { resolve } from 'path';
+import { Legacy } from 'kibana';
+
+import { LegacyPluginApi, LegacyPluginInitializer } from '../../../../src/legacy/types';
+
+const inputControlVisPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
+  new Plugin({
+    id: 'input_control_vis',
+    require: ['kibana', 'elasticsearch', 'visualizations', 'interpreter', 'data'],
+    publicDir: resolve(__dirname, 'public'),
+    uiExports: {
+      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
+      hacks: [resolve(__dirname, 'public/legacy')],
+      injectDefaultVars: server => ({}),
+    },
+    init: (server: Legacy.Server) => ({}),
+    config(Joi: any) {
+      return Joi.object({
+        enabled: Joi.boolean().default(true),
+      }).default();
+    },
+  } as Legacy.PluginSpecOptions);
+
+// eslint-disable-next-line import/no-default-export
+export default inputControlVisPluginInitializer;
diff --git a/src/legacy/core_plugins/input_control_vis/public/__snapshots__/input_control_fn.test.js.snap b/src/legacy/core_plugins/input_control_vis/public/__snapshots__/input_control_fn.test.ts.snap
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/__snapshots__/input_control_fn.test.js.snap
rename to src/legacy/core_plugins/input_control_vis/public/__snapshots__/input_control_fn.test.ts.snap
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.js.snap b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.js.snap
deleted file mode 100644
index 809214f756713..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.js.snap
+++ /dev/null
@@ -1,142 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`renders ControlsTab 1`] = `
-<div>
-  <InjectIntl(ControlEditorUi)
-    controlIndex={0}
-    controlParams={
-      Object {
-        "fieldName": "keywordField",
-        "id": "1",
-        "indexPattern": "indexPattern1",
-        "label": "custom label",
-        "options": Object {
-          "multiselect": true,
-          "order": "desc",
-          "size": 5,
-          "type": "terms",
-        },
-        "type": "list",
-      }
-    }
-    getIndexPattern={[Function]}
-    handleCheckboxOptionChange={[Function]}
-    handleFieldNameChange={[Function]}
-    handleIndexPatternChange={[Function]}
-    handleLabelChange={[Function]}
-    handleNumberOptionChange={[Function]}
-    handleParentChange={[Function]}
-    handleRemoveControl={[Function]}
-    key="1"
-    moveControl={[Function]}
-    parentCandidates={
-      Array [
-        Object {
-          "text": "numberField",
-          "value": "2",
-        },
-      ]
-    }
-  />
-  <InjectIntl(ControlEditorUi)
-    controlIndex={1}
-    controlParams={
-      Object {
-        "fieldName": "numberField",
-        "id": "2",
-        "indexPattern": "indexPattern1",
-        "label": "",
-        "options": Object {
-          "step": 1,
-        },
-        "type": "range",
-      }
-    }
-    getIndexPattern={[Function]}
-    handleCheckboxOptionChange={[Function]}
-    handleFieldNameChange={[Function]}
-    handleIndexPatternChange={[Function]}
-    handleLabelChange={[Function]}
-    handleNumberOptionChange={[Function]}
-    handleParentChange={[Function]}
-    handleRemoveControl={[Function]}
-    key="2"
-    moveControl={[Function]}
-    parentCandidates={
-      Array [
-        Object {
-          "text": "custom label",
-          "value": "1",
-        },
-      ]
-    }
-  />
-  <EuiPanel
-    grow={false}
-  >
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiFormRow
-          describedByIds={Array []}
-          display="row"
-          fullWidth={false}
-          hasChildLabel={true}
-          hasEmptyLabelSpace={false}
-          id="selectControlType"
-          labelType="label"
-        >
-          <EuiSelect
-            aria-label="Select control type"
-            compressed={false}
-            data-test-subj="selectControlType"
-            fullWidth={false}
-            hasNoInitialSelection={false}
-            isLoading={false}
-            onChange={[Function]}
-            options={
-              Array [
-                Object {
-                  "text": "Range slider",
-                  "value": "range",
-                },
-                Object {
-                  "text": "Options list",
-                  "value": "list",
-                },
-              ]
-            }
-            value="list"
-          />
-        </EuiFormRow>
-      </EuiFlexItem>
-      <EuiFlexItem
-        grow={false}
-      >
-        <EuiFormRow
-          describedByIds={Array []}
-          display="row"
-          fullWidth={false}
-          hasChildLabel={true}
-          hasEmptyLabelSpace={false}
-          id="addControl"
-          labelType="label"
-        >
-          <EuiButton
-            aria-label="Add control"
-            data-test-subj="inputControlEditorAddBtn"
-            fill={true}
-            iconType="plusInCircle"
-            onClick={[Function]}
-          >
-            <FormattedMessage
-              defaultMessage="Add"
-              id="inputControl.editor.controlsTab.addButtonLabel"
-              values={Object {}}
-            />
-          </EuiButton>
-        </EuiFormRow>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPanel>
-</div>
-`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap
new file mode 100644
index 0000000000000..632fe63e9e148
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap
@@ -0,0 +1,190 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders ControlsTab 1`] = `
+<div>
+  <InjectIntl(ControlEditorUi)
+    controlIndex={0}
+    controlParams={
+      Object {
+        "fieldName": "keywordField",
+        "id": "1",
+        "indexPattern": "indexPattern1",
+        "label": "custom label",
+        "options": Object {
+          "multiselect": true,
+          "order": "desc",
+          "size": 5,
+          "type": "terms",
+        },
+        "parent": "parent",
+        "type": "list",
+      }
+    }
+    deps={
+      Object {
+        "core": Object {
+          "getStartServices": [MockFunction],
+          "injectedMetadata": Object {
+            "getInjectedVar": [MockFunction],
+          },
+        },
+        "data": Object {
+          "query": Object {
+            "filterManager": Object {
+              "fieldName": "myField",
+              "getAppFilters": [MockFunction],
+              "getGlobalFilters": [MockFunction],
+              "getIndexPattern": [Function],
+            },
+            "timefilter": Object {
+              "timefilter": Object {},
+            },
+          },
+        },
+      }
+    }
+    getIndexPattern={[Function]}
+    handleCheckboxOptionChange={[Function]}
+    handleFieldNameChange={[Function]}
+    handleIndexPatternChange={[Function]}
+    handleLabelChange={[Function]}
+    handleNumberOptionChange={[Function]}
+    handleParentChange={[Function]}
+    handleRemoveControl={[Function]}
+    key="1"
+    moveControl={[Function]}
+    parentCandidates={
+      Array [
+        Object {
+          "text": "numberField",
+          "value": "2",
+        },
+      ]
+    }
+  />
+  <InjectIntl(ControlEditorUi)
+    controlIndex={1}
+    controlParams={
+      Object {
+        "fieldName": "numberField",
+        "id": "2",
+        "indexPattern": "indexPattern1",
+        "label": "",
+        "options": Object {
+          "step": 1,
+        },
+        "parent": "parent",
+        "type": "range",
+      }
+    }
+    deps={
+      Object {
+        "core": Object {
+          "getStartServices": [MockFunction],
+          "injectedMetadata": Object {
+            "getInjectedVar": [MockFunction],
+          },
+        },
+        "data": Object {
+          "query": Object {
+            "filterManager": Object {
+              "fieldName": "myField",
+              "getAppFilters": [MockFunction],
+              "getGlobalFilters": [MockFunction],
+              "getIndexPattern": [Function],
+            },
+            "timefilter": Object {
+              "timefilter": Object {},
+            },
+          },
+        },
+      }
+    }
+    getIndexPattern={[Function]}
+    handleCheckboxOptionChange={[Function]}
+    handleFieldNameChange={[Function]}
+    handleIndexPatternChange={[Function]}
+    handleLabelChange={[Function]}
+    handleNumberOptionChange={[Function]}
+    handleParentChange={[Function]}
+    handleRemoveControl={[Function]}
+    key="2"
+    moveControl={[Function]}
+    parentCandidates={
+      Array [
+        Object {
+          "text": "custom label",
+          "value": "1",
+        },
+      ]
+    }
+  />
+  <EuiPanel
+    grow={false}
+  >
+    <EuiFlexGroup>
+      <EuiFlexItem>
+        <EuiFormRow
+          describedByIds={Array []}
+          display="row"
+          fullWidth={false}
+          hasChildLabel={true}
+          hasEmptyLabelSpace={false}
+          id="selectControlType"
+          labelType="label"
+        >
+          <EuiSelect
+            aria-label="Select control type"
+            compressed={false}
+            data-test-subj="selectControlType"
+            fullWidth={false}
+            hasNoInitialSelection={false}
+            isLoading={false}
+            onChange={[Function]}
+            options={
+              Array [
+                Object {
+                  "text": "Range slider",
+                  "value": "range",
+                },
+                Object {
+                  "text": "Options list",
+                  "value": "list",
+                },
+              ]
+            }
+            value="list"
+          />
+        </EuiFormRow>
+      </EuiFlexItem>
+      <EuiFlexItem
+        grow={false}
+      >
+        <EuiFormRow
+          describedByIds={Array []}
+          display="row"
+          fullWidth={false}
+          hasChildLabel={true}
+          hasEmptyLabelSpace={false}
+          id="addControl"
+          labelType="label"
+        >
+          <EuiButton
+            aria-label="Add control"
+            data-test-subj="inputControlEditorAddBtn"
+            fill={true}
+            iconType="plusInCircle"
+            onClick={[Function]}
+          >
+            <FormattedMessage
+              defaultMessage="Add"
+              id="inputControl.editor.controlsTab.addButtonLabel"
+              values={Object {}}
+            />
+          </EuiButton>
+        </EuiFormRow>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </EuiPanel>
+</div>
+`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.js.snap b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.js.snap
deleted file mode 100644
index ff3d1ffc146e3..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.js.snap
+++ /dev/null
@@ -1,485 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`renders dynamic options should display disabled dynamic options with tooltip for non-string fields 1`] = `
-<Fragment>
-  <InjectIntl(IndexPatternSelectFormRowUi)
-    controlIndex={0}
-    indexPatternId="mockIndexPattern"
-    onChange={[Function]}
-  />
-  <InjectIntl(FieldSelectUi)
-    controlIndex={0}
-    fieldName="numberField"
-    filterField={[Function]}
-    getIndexPattern={[Function]}
-    indexPatternId="mockIndexPattern"
-    onChange={[Function]}
-  />
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Allow multiple selection"
-        id="inputControl.editor.listControl.multiselectDescription"
-        values={Object {}}
-      />
-    }
-    id="multiselect-0"
-    key="multiselect"
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={true}
-      data-test-subj="listControlMultiselectInput"
-      label={
-        <FormattedMessage
-          defaultMessage="Multiselect"
-          id="inputControl.editor.listControl.multiselectLabel"
-          values={Object {}}
-        />
-      }
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Only available for \\"string\\" fields"
-        id="inputControl.editor.listControl.dynamicOptions.stringFieldDescription"
-        values={Object {}}
-      />
-    }
-    id="dynamicOptions-0"
-    key="dynamicOptions"
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={true}
-      data-test-subj="listControlDynamicOptionsSwitch"
-      disabled={true}
-      label={
-        <FormattedMessage
-          defaultMessage="Dynamic Options"
-          id="inputControl.editor.listControl.dynamicOptionsLabel"
-          values={Object {}}
-        />
-      }
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Number of options"
-        id="inputControl.editor.listControl.sizeDescription"
-        values={Object {}}
-      />
-    }
-    id="size-0"
-    key="size"
-    label={
-      <FormattedMessage
-        defaultMessage="Size"
-        id="inputControl.editor.listControl.sizeLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
-  >
-    <EuiFieldNumber
-      compressed={false}
-      data-test-subj="listControlSizeInput"
-      fullWidth={false}
-      isLoading={false}
-      min={1}
-      onChange={[Function]}
-      value={5}
-    />
-  </EuiFormRow>
-</Fragment>
-`;
-
-exports[`renders dynamic options should display dynamic options for string fields 1`] = `
-<Fragment>
-  <InjectIntl(IndexPatternSelectFormRowUi)
-    controlIndex={0}
-    indexPatternId="mockIndexPattern"
-    onChange={[Function]}
-  />
-  <InjectIntl(FieldSelectUi)
-    controlIndex={0}
-    fieldName="keywordField"
-    filterField={[Function]}
-    getIndexPattern={[Function]}
-    indexPatternId="mockIndexPattern"
-    onChange={[Function]}
-  />
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Allow multiple selection"
-        id="inputControl.editor.listControl.multiselectDescription"
-        values={Object {}}
-      />
-    }
-    id="multiselect-0"
-    key="multiselect"
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={true}
-      data-test-subj="listControlMultiselectInput"
-      label={
-        <FormattedMessage
-          defaultMessage="Multiselect"
-          id="inputControl.editor.listControl.multiselectLabel"
-          values={Object {}}
-        />
-      }
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Update options in response to user input"
-        id="inputControl.editor.listControl.dynamicOptions.updateDescription"
-        values={Object {}}
-      />
-    }
-    id="dynamicOptions-0"
-    key="dynamicOptions"
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={true}
-      data-test-subj="listControlDynamicOptionsSwitch"
-      disabled={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Dynamic Options"
-          id="inputControl.editor.listControl.dynamicOptionsLabel"
-          values={Object {}}
-        />
-      }
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-</Fragment>
-`;
-
-exports[`renders dynamic options should display size field when dynamic options is disabled 1`] = `
-<Fragment>
-  <InjectIntl(IndexPatternSelectFormRowUi)
-    controlIndex={0}
-    indexPatternId="mockIndexPattern"
-    onChange={[Function]}
-  />
-  <InjectIntl(FieldSelectUi)
-    controlIndex={0}
-    fieldName="keywordField"
-    filterField={[Function]}
-    getIndexPattern={[Function]}
-    indexPatternId="mockIndexPattern"
-    onChange={[Function]}
-  />
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Allow multiple selection"
-        id="inputControl.editor.listControl.multiselectDescription"
-        values={Object {}}
-      />
-    }
-    id="multiselect-0"
-    key="multiselect"
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={true}
-      data-test-subj="listControlMultiselectInput"
-      label={
-        <FormattedMessage
-          defaultMessage="Multiselect"
-          id="inputControl.editor.listControl.multiselectLabel"
-          values={Object {}}
-        />
-      }
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Update options in response to user input"
-        id="inputControl.editor.listControl.dynamicOptions.updateDescription"
-        values={Object {}}
-      />
-    }
-    id="dynamicOptions-0"
-    key="dynamicOptions"
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={false}
-      data-test-subj="listControlDynamicOptionsSwitch"
-      disabled={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Dynamic Options"
-          id="inputControl.editor.listControl.dynamicOptionsLabel"
-          values={Object {}}
-        />
-      }
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Number of options"
-        id="inputControl.editor.listControl.sizeDescription"
-        values={Object {}}
-      />
-    }
-    id="size-0"
-    key="size"
-    label={
-      <FormattedMessage
-        defaultMessage="Size"
-        id="inputControl.editor.listControl.sizeLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
-  >
-    <EuiFieldNumber
-      compressed={false}
-      data-test-subj="listControlSizeInput"
-      fullWidth={false}
-      isLoading={false}
-      min={1}
-      onChange={[Function]}
-      value={5}
-    />
-  </EuiFormRow>
-</Fragment>
-`;
-
-exports[`renders should display chaining input when parents are provided 1`] = `
-<Fragment>
-  <InjectIntl(IndexPatternSelectFormRowUi)
-    controlIndex={0}
-    indexPatternId="indexPattern1"
-    onChange={[Function]}
-  />
-  <InjectIntl(FieldSelectUi)
-    controlIndex={0}
-    fieldName="keywordField"
-    filterField={[Function]}
-    getIndexPattern={[Function]}
-    indexPatternId="indexPattern1"
-    onChange={[Function]}
-  />
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Options are based on the value of parent control. Disabled if parent is not set."
-        id="inputControl.editor.listControl.parentDescription"
-        values={Object {}}
-      />
-    }
-    id="parentSelect-0"
-    key="parentSelect"
-    label={
-      <FormattedMessage
-        defaultMessage="Parent control"
-        id="inputControl.editor.listControl.parentLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
-  >
-    <EuiSelect
-      compressed={false}
-      fullWidth={false}
-      hasNoInitialSelection={false}
-      isLoading={false}
-      onChange={[Function]}
-      options={
-        Array [
-          Object {
-            "text": "",
-            "value": "",
-          },
-          Object {
-            "text": "fieldA",
-            "value": "1",
-          },
-          Object {
-            "text": "fieldB",
-            "value": "2",
-          },
-        ]
-      }
-    />
-  </EuiFormRow>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Allow multiple selection"
-        id="inputControl.editor.listControl.multiselectDescription"
-        values={Object {}}
-      />
-    }
-    id="multiselect-0"
-    key="multiselect"
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={true}
-      data-test-subj="listControlMultiselectInput"
-      label={
-        <FormattedMessage
-          defaultMessage="Multiselect"
-          id="inputControl.editor.listControl.multiselectLabel"
-          values={Object {}}
-        />
-      }
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Update options in response to user input"
-        id="inputControl.editor.listControl.dynamicOptions.updateDescription"
-        values={Object {}}
-      />
-    }
-    id="dynamicOptions-0"
-    key="dynamicOptions"
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={false}
-      data-test-subj="listControlDynamicOptionsSwitch"
-      disabled={false}
-      label={
-        <FormattedMessage
-          defaultMessage="Dynamic Options"
-          id="inputControl.editor.listControl.dynamicOptionsLabel"
-          values={Object {}}
-        />
-      }
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    helpText={
-      <FormattedMessage
-        defaultMessage="Number of options"
-        id="inputControl.editor.listControl.sizeDescription"
-        values={Object {}}
-      />
-    }
-    id="size-0"
-    key="size"
-    label={
-      <FormattedMessage
-        defaultMessage="Size"
-        id="inputControl.editor.listControl.sizeLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
-  >
-    <EuiFieldNumber
-      compressed={false}
-      data-test-subj="listControlSizeInput"
-      fullWidth={false}
-      isLoading={false}
-      min={1}
-      onChange={[Function]}
-      value={10}
-    />
-  </EuiFormRow>
-</Fragment>
-`;
-
-exports[`renders should not display any options until field is selected 1`] = `
-<Fragment>
-  <InjectIntl(IndexPatternSelectFormRowUi)
-    controlIndex={0}
-    indexPatternId="mockIndexPattern"
-    onChange={[Function]}
-  />
-  <InjectIntl(FieldSelectUi)
-    controlIndex={0}
-    fieldName=""
-    filterField={[Function]}
-    getIndexPattern={[Function]}
-    indexPatternId="mockIndexPattern"
-    onChange={[Function]}
-  />
-</Fragment>
-`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.tsx.snap b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.tsx.snap
new file mode 100644
index 0000000000000..d30822e28ce35
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.tsx.snap
@@ -0,0 +1,482 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders dynamic options should display disabled dynamic options with tooltip for non-string fields 1`] = `
+<Fragment>
+  <InjectIntl(IndexPatternSelectFormRowUi)
+    IndexPatternSelect={[Function]}
+    controlIndex={0}
+    indexPatternId="mockIndexPattern"
+    onChange={[Function]}
+  />
+  <InjectIntl(FieldSelectUi)
+    controlIndex={0}
+    fieldName="numberField"
+    filterField={[Function]}
+    getIndexPattern={[Function]}
+    indexPatternId="mockIndexPattern"
+    onChange={[Function]}
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Allow multiple selection"
+        id="inputControl.editor.listControl.multiselectDescription"
+        values={Object {}}
+      />
+    }
+    id="multiselect-0"
+    key="multiselect"
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      data-test-subj="listControlMultiselectInput"
+      label={
+        <FormattedMessage
+          defaultMessage="Multiselect"
+          id="inputControl.editor.listControl.multiselectLabel"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Only available for \\"string\\" fields"
+        id="inputControl.editor.listControl.dynamicOptions.stringFieldDescription"
+        values={Object {}}
+      />
+    }
+    id="dynamicOptions-0"
+    key="dynamicOptions"
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      data-test-subj="listControlDynamicOptionsSwitch"
+      disabled={true}
+      label={
+        <FormattedMessage
+          defaultMessage="Dynamic Options"
+          id="inputControl.editor.listControl.dynamicOptionsLabel"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Number of options"
+        id="inputControl.editor.listControl.sizeDescription"
+        values={Object {}}
+      />
+    }
+    id="size-0"
+    key="size"
+    label={
+      <FormattedMessage
+        defaultMessage="Size"
+        id="inputControl.editor.listControl.sizeLabel"
+        values={Object {}}
+      />
+    }
+    labelType="label"
+  >
+    <EuiFieldNumber
+      data-test-subj="listControlSizeInput"
+      min={1}
+      onChange={[Function]}
+      value={5}
+    />
+  </EuiFormRow>
+</Fragment>
+`;
+
+exports[`renders dynamic options should display dynamic options for string fields 1`] = `
+<Fragment>
+  <InjectIntl(IndexPatternSelectFormRowUi)
+    IndexPatternSelect={[Function]}
+    controlIndex={0}
+    indexPatternId="mockIndexPattern"
+    onChange={[Function]}
+  />
+  <InjectIntl(FieldSelectUi)
+    controlIndex={0}
+    fieldName="keywordField"
+    filterField={[Function]}
+    getIndexPattern={[Function]}
+    indexPatternId="mockIndexPattern"
+    onChange={[Function]}
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Allow multiple selection"
+        id="inputControl.editor.listControl.multiselectDescription"
+        values={Object {}}
+      />
+    }
+    id="multiselect-0"
+    key="multiselect"
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      data-test-subj="listControlMultiselectInput"
+      label={
+        <FormattedMessage
+          defaultMessage="Multiselect"
+          id="inputControl.editor.listControl.multiselectLabel"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Update options in response to user input"
+        id="inputControl.editor.listControl.dynamicOptions.updateDescription"
+        values={Object {}}
+      />
+    }
+    id="dynamicOptions-0"
+    key="dynamicOptions"
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      data-test-subj="listControlDynamicOptionsSwitch"
+      disabled={false}
+      label={
+        <FormattedMessage
+          defaultMessage="Dynamic Options"
+          id="inputControl.editor.listControl.dynamicOptionsLabel"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+</Fragment>
+`;
+
+exports[`renders dynamic options should display size field when dynamic options is disabled 1`] = `
+<Fragment>
+  <InjectIntl(IndexPatternSelectFormRowUi)
+    IndexPatternSelect={[Function]}
+    controlIndex={0}
+    indexPatternId="mockIndexPattern"
+    onChange={[Function]}
+  />
+  <InjectIntl(FieldSelectUi)
+    controlIndex={0}
+    fieldName="keywordField"
+    filterField={[Function]}
+    getIndexPattern={[Function]}
+    indexPatternId="mockIndexPattern"
+    onChange={[Function]}
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Allow multiple selection"
+        id="inputControl.editor.listControl.multiselectDescription"
+        values={Object {}}
+      />
+    }
+    id="multiselect-0"
+    key="multiselect"
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      data-test-subj="listControlMultiselectInput"
+      label={
+        <FormattedMessage
+          defaultMessage="Multiselect"
+          id="inputControl.editor.listControl.multiselectLabel"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Update options in response to user input"
+        id="inputControl.editor.listControl.dynamicOptions.updateDescription"
+        values={Object {}}
+      />
+    }
+    id="dynamicOptions-0"
+    key="dynamicOptions"
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={false}
+      data-test-subj="listControlDynamicOptionsSwitch"
+      disabled={false}
+      label={
+        <FormattedMessage
+          defaultMessage="Dynamic Options"
+          id="inputControl.editor.listControl.dynamicOptionsLabel"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Number of options"
+        id="inputControl.editor.listControl.sizeDescription"
+        values={Object {}}
+      />
+    }
+    id="size-0"
+    key="size"
+    label={
+      <FormattedMessage
+        defaultMessage="Size"
+        id="inputControl.editor.listControl.sizeLabel"
+        values={Object {}}
+      />
+    }
+    labelType="label"
+  >
+    <EuiFieldNumber
+      data-test-subj="listControlSizeInput"
+      min={1}
+      onChange={[Function]}
+      value={5}
+    />
+  </EuiFormRow>
+</Fragment>
+`;
+
+exports[`renders should display chaining input when parents are provided 1`] = `
+<Fragment>
+  <InjectIntl(IndexPatternSelectFormRowUi)
+    IndexPatternSelect={[Function]}
+    controlIndex={0}
+    indexPatternId="indexPattern1"
+    onChange={[Function]}
+  />
+  <InjectIntl(FieldSelectUi)
+    controlIndex={0}
+    fieldName="keywordField"
+    filterField={[Function]}
+    getIndexPattern={[Function]}
+    indexPatternId="indexPattern1"
+    onChange={[Function]}
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Options are based on the value of parent control. Disabled if parent is not set."
+        id="inputControl.editor.listControl.parentDescription"
+        values={Object {}}
+      />
+    }
+    id="parentSelect-0"
+    key="parentSelect"
+    label={
+      <FormattedMessage
+        defaultMessage="Parent control"
+        id="inputControl.editor.listControl.parentLabel"
+        values={Object {}}
+      />
+    }
+    labelType="label"
+  >
+    <EuiSelect
+      compressed={false}
+      fullWidth={false}
+      hasNoInitialSelection={false}
+      isLoading={false}
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "text": "",
+            "value": "",
+          },
+          Object {
+            "text": "fieldA",
+            "value": "1",
+          },
+          Object {
+            "text": "fieldB",
+            "value": "2",
+          },
+        ]
+      }
+      value=""
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Allow multiple selection"
+        id="inputControl.editor.listControl.multiselectDescription"
+        values={Object {}}
+      />
+    }
+    id="multiselect-0"
+    key="multiselect"
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      data-test-subj="listControlMultiselectInput"
+      label={
+        <FormattedMessage
+          defaultMessage="Multiselect"
+          id="inputControl.editor.listControl.multiselectLabel"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Update options in response to user input"
+        id="inputControl.editor.listControl.dynamicOptions.updateDescription"
+        values={Object {}}
+      />
+    }
+    id="dynamicOptions-0"
+    key="dynamicOptions"
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={false}
+      data-test-subj="listControlDynamicOptionsSwitch"
+      disabled={false}
+      label={
+        <FormattedMessage
+          defaultMessage="Dynamic Options"
+          id="inputControl.editor.listControl.dynamicOptionsLabel"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    helpText={
+      <FormattedMessage
+        defaultMessage="Number of options"
+        id="inputControl.editor.listControl.sizeDescription"
+        values={Object {}}
+      />
+    }
+    id="size-0"
+    key="size"
+    label={
+      <FormattedMessage
+        defaultMessage="Size"
+        id="inputControl.editor.listControl.sizeLabel"
+        values={Object {}}
+      />
+    }
+    labelType="label"
+  >
+    <EuiFieldNumber
+      data-test-subj="listControlSizeInput"
+      min={1}
+      onChange={[Function]}
+      value={10}
+    />
+  </EuiFormRow>
+</Fragment>
+`;
+
+exports[`renders should not display any options until field is selected 1`] = `
+<Fragment>
+  <InjectIntl(IndexPatternSelectFormRowUi)
+    IndexPatternSelect={[Function]}
+    controlIndex={0}
+    indexPatternId="mockIndexPattern"
+    onChange={[Function]}
+  />
+  <InjectIntl(FieldSelectUi)
+    controlIndex={0}
+    fieldName=""
+    filterField={[Function]}
+    getIndexPattern={[Function]}
+    indexPatternId="mockIndexPattern"
+    onChange={[Function]}
+  />
+</Fragment>
+`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.js.snap b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.js.snap
deleted file mode 100644
index 9f06065b32363..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.js.snap
+++ /dev/null
@@ -1,71 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`OptionsTab should renders OptionsTab 1`] = `
-<EuiForm>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    id="updateFiltersOnChange"
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={false}
-      data-test-subj="inputControlEditorUpdateFiltersOnChangeCheckbox"
-      label={
-        <FormattedMessage
-          defaultMessage="Update Kibana filters on each change"
-          id="inputControl.editor.optionsTab.updateFilterLabel"
-          values={Object {}}
-        />
-      }
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    id="useTimeFilter"
-    labelType="label"
-  >
-    <EuiSwitch
-      checked={false}
-      data-test-subj="inputControlEditorUseTimeFilterCheckbox"
-      label={
-        <FormattedMessage
-          defaultMessage="Use time filter"
-          id="inputControl.editor.optionsTab.useTimeFilterLabel"
-          values={Object {}}
-        />
-      }
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    id="pinFilters"
-    labelType="label"
-  >
-    <EuiSwitch
-      data-test-subj="inputControlEditorPinFiltersCheckbox"
-      label={
-        <FormattedMessage
-          defaultMessage="Pin filters for all applications"
-          id="inputControl.editor.optionsTab.pinFiltersLabel"
-          values={Object {}}
-        />
-      }
-      onChange={[Function]}
-    />
-  </EuiFormRow>
-</EuiForm>
-`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.tsx.snap b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.tsx.snap
new file mode 100644
index 0000000000000..3356538870f80
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/options_tab.test.tsx.snap
@@ -0,0 +1,72 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`OptionsTab should renders OptionsTab 1`] = `
+<EuiForm>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    id="updateFiltersOnChange"
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={false}
+      data-test-subj="inputControlEditorUpdateFiltersOnChangeCheckbox"
+      label={
+        <FormattedMessage
+          defaultMessage="Update Kibana filters on each change"
+          id="inputControl.editor.optionsTab.updateFilterLabel"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    id="useTimeFilter"
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={false}
+      data-test-subj="inputControlEditorUseTimeFilterCheckbox"
+      label={
+        <FormattedMessage
+          defaultMessage="Use time filter"
+          id="inputControl.editor.optionsTab.useTimeFilterLabel"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    id="pinFilters"
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={false}
+      data-test-subj="inputControlEditorPinFiltersCheckbox"
+      label={
+        <FormattedMessage
+          defaultMessage="Pin filters for all applications"
+          id="inputControl.editor.optionsTab.pinFiltersLabel"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+</EuiForm>
+`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.js.snap b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.js.snap
deleted file mode 100644
index 031a447a3ad50..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.js.snap
+++ /dev/null
@@ -1,70 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`renders RangeControlEditor 1`] = `
-<Fragment>
-  <InjectIntl(IndexPatternSelectFormRowUi)
-    controlIndex={0}
-    indexPatternId="indexPattern1"
-    onChange={[Function]}
-  />
-  <InjectIntl(FieldSelectUi)
-    controlIndex={0}
-    fieldName="numberField"
-    filterField={[Function]}
-    getIndexPattern={[Function]}
-    indexPatternId="indexPattern1"
-    onChange={[Function]}
-  />
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    id="stepSize-0"
-    label={
-      <FormattedMessage
-        defaultMessage="Step Size"
-        id="inputControl.editor.rangeControl.stepSizeLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
-  >
-    <EuiFieldNumber
-      compressed={false}
-      data-test-subj="rangeControlSizeInput0"
-      fullWidth={false}
-      isLoading={false}
-      onChange={[Function]}
-      value={1}
-    />
-  </EuiFormRow>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="row"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    id="decimalPlaces-0"
-    label={
-      <FormattedMessage
-        defaultMessage="Decimal Places"
-        id="inputControl.editor.rangeControl.decimalPlacesLabel"
-        values={Object {}}
-      />
-    }
-    labelType="label"
-  >
-    <EuiFieldNumber
-      compressed={false}
-      data-test-subj="rangeControlDecimalPlacesInput0"
-      fullWidth={false}
-      isLoading={false}
-      min={0}
-      onChange={[Function]}
-      value={0}
-    />
-  </EuiFormRow>
-</Fragment>
-`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.tsx.snap b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.tsx.snap
new file mode 100644
index 0000000000000..67480e68a6bc3
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/range_control_editor.test.tsx.snap
@@ -0,0 +1,65 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders RangeControlEditor 1`] = `
+<Fragment>
+  <InjectIntl(IndexPatternSelectFormRowUi)
+    IndexPatternSelect={[Function]}
+    controlIndex={0}
+    indexPatternId="indexPattern1"
+    onChange={[Function]}
+  />
+  <InjectIntl(FieldSelectUi)
+    controlIndex={0}
+    fieldName="numberField"
+    filterField={[Function]}
+    getIndexPattern={[Function]}
+    indexPatternId="indexPattern1"
+    onChange={[Function]}
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    id="stepSize-0"
+    label={
+      <FormattedMessage
+        defaultMessage="Step Size"
+        id="inputControl.editor.rangeControl.stepSizeLabel"
+        values={Object {}}
+      />
+    }
+    labelType="label"
+  >
+    <EuiFieldNumber
+      data-test-subj="rangeControlSizeInput0"
+      onChange={[Function]}
+      value={1}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    id="decimalPlaces-0"
+    label={
+      <FormattedMessage
+        defaultMessage="Decimal Places"
+        id="inputControl.editor.rangeControl.decimalPlacesLabel"
+        values={Object {}}
+      />
+    }
+    labelType="label"
+  >
+    <EuiFieldNumber
+      data-test-subj="rangeControlDecimalPlacesInput0"
+      min={0}
+      onChange={[Function]}
+      value={0}
+    />
+  </EuiFormRow>
+</Fragment>
+`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_deps_mock.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_deps_mock.tsx
new file mode 100644
index 0000000000000..a9505aefa3113
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_deps_mock.tsx
@@ -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 React from 'react';
+import { FieldList } from 'src/plugins/data/public';
+import { InputControlVisDependencies } from '../../../plugin';
+
+const fields: FieldList = [] as any;
+fields.push({ name: 'myField' } as any);
+fields.getByName = (name: any) => {
+  return fields.find(({ name: n }) => n === name);
+};
+
+export const getDepsMock = (): InputControlVisDependencies =>
+  ({
+    core: {
+      getStartServices: jest.fn().mockReturnValue([
+        null,
+        {
+          data: {
+            ui: {
+              IndexPatternSelect: () => (<div />) as any,
+            },
+            indexPatterns: {
+              get: () => ({
+                fields,
+              }),
+            },
+          },
+        },
+      ]),
+      injectedMetadata: {
+        getInjectedVar: jest.fn().mockImplementation(key => {
+          switch (key) {
+            case 'autocompleteTimeout':
+              return 1000;
+            case 'autocompleteTerminateAfter':
+              return 100000;
+            default:
+              return '';
+          }
+        }),
+      },
+    },
+    data: {
+      query: {
+        filterManager: {
+          fieldName: 'myField',
+          getIndexPattern: () => ({
+            fields,
+          }),
+          getAppFilters: jest.fn().mockImplementation(() => []),
+          getGlobalFilters: jest.fn().mockImplementation(() => []),
+        },
+        timefilter: {
+          timefilter: {},
+        },
+      },
+    },
+  } as any);
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_index_pattern_mock.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_index_pattern_mock.js
deleted file mode 100644
index c693bf100e265..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_index_pattern_mock.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.
- */
-
-export const getIndexPatternMock = () => {
-  return Promise.resolve({
-    id: 'mockIndexPattern',
-    title: 'mockIndexPattern',
-    fields: [
-      { name: 'keywordField', type: 'string', aggregatable: true },
-      { name: 'textField', type: 'string', aggregatable: false },
-      { name: 'numberField', type: 'number', aggregatable: true },
-    ],
-  });
-};
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_index_pattern_mock.ts b/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_index_pattern_mock.ts
new file mode 100644
index 0000000000000..638dd7170cb8d
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_index_pattern_mock.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 { IIndexPattern } from '../../../../../../../plugins/data/public';
+
+/**
+ * Returns forced **Partial** IndexPattern for use in tests
+ */
+export const getIndexPatternMock = (): Promise<IIndexPattern> => {
+  return Promise.resolve({
+    id: 'mockIndexPattern',
+    title: 'mockIndexPattern',
+    fields: [
+      { name: 'keywordField', type: 'string', aggregatable: true },
+      { name: 'textField', type: 'string', aggregatable: false },
+      { name: 'numberField', type: 'number', aggregatable: true },
+    ],
+  } as IIndexPattern);
+};
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_index_patterns_mock.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_index_patterns_mock.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_index_patterns_mock.js
rename to src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_index_patterns_mock.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_search_service_mock.ts b/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_search_service_mock.ts
new file mode 100644
index 0000000000000..9da47bedcc784
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/get_search_service_mock.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 { SearchSource } from '../../../legacy_imports';
+
+export const getSearchSourceMock = (esSearchResponse?: any): SearchSource =>
+  jest.fn().mockImplementation(() => ({
+    setParent: jest.fn(),
+    setField: jest.fn(),
+    fetch: jest.fn().mockResolvedValue(
+      esSearchResponse
+        ? esSearchResponse
+        : {
+            aggregations: {
+              termsAgg: {
+                buckets: [
+                  {
+                    key: 'Zurich Airport',
+                    doc_count: 691,
+                  },
+                  {
+                    key: 'Xi an Xianyang International Airport',
+                    doc_count: 526,
+                  },
+                ],
+              },
+            },
+          }
+    ),
+  }));
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/update_component.ts b/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/update_component.ts
new file mode 100644
index 0000000000000..881412a7c56fd
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/__tests__/update_component.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 { ShallowWrapper, ReactWrapper } from 'enzyme';
+
+export const updateComponent = async (
+  component:
+    | ShallowWrapper<any, Readonly<{}>, React.Component<{}, {}, any>>
+    | ReactWrapper<any, Readonly<{}>, React.Component<{}, {}, any>>
+) => {
+  // Ensure all promises resolve
+  await new Promise(resolve => process.nextTick(resolve));
+  // Ensure the state changes are reflected
+  component.update();
+};
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/control_editor.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/control_editor.js
deleted file mode 100644
index cc31b8d238dbe..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/control_editor.js
+++ /dev/null
@@ -1,190 +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 PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { RangeControlEditor } from './range_control_editor';
-import { ListControlEditor } from './list_control_editor';
-import { getTitle } from '../../editor_utils';
-import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
-
-import {
-  EuiAccordion,
-  EuiButtonIcon,
-  EuiFieldText,
-  EuiForm,
-  EuiFormRow,
-  EuiPanel,
-  EuiSpacer,
-} from '@elastic/eui';
-
-class ControlEditorUi extends Component {
-  changeLabel = evt => {
-    this.props.handleLabelChange(this.props.controlIndex, evt);
-  };
-
-  removeControl = () => {
-    this.props.handleRemoveControl(this.props.controlIndex);
-  };
-
-  moveUpControl = () => {
-    this.props.moveControl(this.props.controlIndex, -1);
-  };
-
-  moveDownControl = () => {
-    this.props.moveControl(this.props.controlIndex, 1);
-  };
-
-  changeIndexPattern = evt => {
-    this.props.handleIndexPatternChange(this.props.controlIndex, evt);
-  };
-
-  changeFieldName = evt => {
-    this.props.handleFieldNameChange(this.props.controlIndex, evt);
-  };
-
-  renderEditor() {
-    let controlEditor = null;
-    switch (this.props.controlParams.type) {
-      case 'list':
-        controlEditor = (
-          <ListControlEditor
-            controlIndex={this.props.controlIndex}
-            controlParams={this.props.controlParams}
-            handleIndexPatternChange={this.changeIndexPattern}
-            handleFieldNameChange={this.changeFieldName}
-            getIndexPattern={this.props.getIndexPattern}
-            handleNumberOptionChange={this.props.handleNumberOptionChange}
-            handleCheckboxOptionChange={this.props.handleCheckboxOptionChange}
-            parentCandidates={this.props.parentCandidates}
-            handleParentChange={this.props.handleParentChange}
-          />
-        );
-        break;
-      case 'range':
-        controlEditor = (
-          <RangeControlEditor
-            controlIndex={this.props.controlIndex}
-            controlParams={this.props.controlParams}
-            handleIndexPatternChange={this.changeIndexPattern}
-            handleFieldNameChange={this.changeFieldName}
-            getIndexPattern={this.props.getIndexPattern}
-            handleNumberOptionChange={this.props.handleNumberOptionChange}
-          />
-        );
-        break;
-      default:
-        throw new Error(`Unhandled control editor type ${this.props.controlParams.type}`);
-    }
-
-    const labelId = `controlLabel${this.props.controlIndex}`;
-    return (
-      <EuiForm>
-        <EuiFormRow
-          id={labelId}
-          label={
-            <FormattedMessage
-              id="inputControl.editor.controlEditor.controlLabel"
-              defaultMessage="Control Label"
-            />
-          }
-        >
-          <EuiFieldText value={this.props.controlParams.label} onChange={this.changeLabel} />
-        </EuiFormRow>
-
-        {controlEditor}
-      </EuiForm>
-    );
-  }
-
-  renderEditorButtons() {
-    return (
-      <div>
-        <EuiButtonIcon
-          aria-label={this.props.intl.formatMessage({
-            id: 'inputControl.editor.controlEditor.moveControlUpAriaLabel',
-            defaultMessage: 'Move control up',
-          })}
-          color="primary"
-          onClick={this.moveUpControl}
-          iconType="sortUp"
-          data-test-subj={`inputControlEditorMoveUpControl${this.props.controlIndex}`}
-        />
-        <EuiButtonIcon
-          aria-label={this.props.intl.formatMessage({
-            id: 'inputControl.editor.controlEditor.moveControlDownAriaLabel',
-            defaultMessage: 'Move control down',
-          })}
-          color="primary"
-          onClick={this.moveDownControl}
-          iconType="sortDown"
-          data-test-subj={`inputControlEditorMoveDownControl${this.props.controlIndex}`}
-        />
-        <EuiButtonIcon
-          aria-label={this.props.intl.formatMessage({
-            id: 'inputControl.editor.controlEditor.removeControlAriaLabel',
-            defaultMessage: 'Remove control',
-          })}
-          color="danger"
-          onClick={this.removeControl}
-          iconType="cross"
-          data-test-subj={`inputControlEditorRemoveControl${this.props.controlIndex}`}
-        />
-      </div>
-    );
-  }
-
-  render() {
-    return (
-      <EuiPanel grow={false} className="icvControlEditor__panel">
-        <EuiAccordion
-          id="controlEditorAccordion"
-          buttonContent={getTitle(this.props.controlParams, this.props.controlIndex)}
-          extraAction={this.renderEditorButtons()}
-          initialIsOpen={true}
-        >
-          <EuiSpacer size="s" />
-          {this.renderEditor()}
-        </EuiAccordion>
-      </EuiPanel>
-    );
-  }
-}
-
-ControlEditorUi.propTypes = {
-  controlIndex: PropTypes.number.isRequired,
-  controlParams: PropTypes.object.isRequired,
-  handleLabelChange: PropTypes.func.isRequired,
-  moveControl: PropTypes.func.isRequired,
-  handleRemoveControl: PropTypes.func.isRequired,
-  handleIndexPatternChange: PropTypes.func.isRequired,
-  handleFieldNameChange: PropTypes.func.isRequired,
-  getIndexPattern: PropTypes.func.isRequired,
-  handleCheckboxOptionChange: PropTypes.func.isRequired,
-  handleNumberOptionChange: PropTypes.func.isRequired,
-  parentCandidates: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.string.isRequired,
-      text: PropTypes.string.isRequired,
-    })
-  ).isRequired,
-  handleParentChange: PropTypes.func.isRequired,
-};
-
-export const ControlEditor = injectI18n(ControlEditorUi);
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/control_editor.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/control_editor.tsx
new file mode 100644
index 0000000000000..dbac5d9d94371
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/control_editor.tsx
@@ -0,0 +1,203 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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, { PureComponent, ChangeEvent } from 'react';
+import { InjectedIntlProps } from 'react-intl';
+
+import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiAccordion,
+  EuiButtonIcon,
+  EuiFieldText,
+  EuiForm,
+  EuiFormRow,
+  EuiPanel,
+  EuiSpacer,
+  EuiSwitchEvent,
+} from '@elastic/eui';
+
+import { RangeControlEditor } from './range_control_editor';
+import { ListControlEditor } from './list_control_editor';
+import { getTitle, ControlParams, CONTROL_TYPES, ControlParamsOptions } from '../../editor_utils';
+import { IIndexPattern } from '../../../../../../plugins/data/public';
+import { InputControlVisDependencies } from '../../plugin';
+
+interface ControlEditorUiProps {
+  controlIndex: number;
+  controlParams: ControlParams;
+  handleLabelChange: (controlIndex: number, event: ChangeEvent<HTMLInputElement>) => void;
+  moveControl: (controlIndex: number, direction: number) => void;
+  handleRemoveControl: (controlIndex: number) => void;
+  handleIndexPatternChange: (controlIndex: number, indexPatternId: string) => void;
+  handleFieldNameChange: (controlIndex: number, fieldName: string) => void;
+  getIndexPattern: (indexPatternId: string) => Promise<IIndexPattern>;
+  handleCheckboxOptionChange: (
+    controlIndex: number,
+    optionName: keyof ControlParamsOptions,
+    event: EuiSwitchEvent
+  ) => void;
+  handleNumberOptionChange: (
+    controlIndex: number,
+    optionName: keyof ControlParamsOptions,
+    event: ChangeEvent<HTMLInputElement>
+  ) => void;
+  parentCandidates: Array<{
+    value: string;
+    text: string;
+  }>;
+  handleParentChange: (controlIndex: number, event: ChangeEvent<HTMLSelectElement>) => void;
+  deps: InputControlVisDependencies;
+}
+
+class ControlEditorUi extends PureComponent<ControlEditorUiProps & InjectedIntlProps> {
+  changeLabel = (event: ChangeEvent<HTMLInputElement>) => {
+    this.props.handleLabelChange(this.props.controlIndex, event);
+  };
+
+  removeControl = () => {
+    this.props.handleRemoveControl(this.props.controlIndex);
+  };
+
+  moveUpControl = () => {
+    this.props.moveControl(this.props.controlIndex, -1);
+  };
+
+  moveDownControl = () => {
+    this.props.moveControl(this.props.controlIndex, 1);
+  };
+
+  changeIndexPattern = (indexPatternId: string) => {
+    this.props.handleIndexPatternChange(this.props.controlIndex, indexPatternId);
+  };
+
+  changeFieldName = (fieldName: string) => {
+    this.props.handleFieldNameChange(this.props.controlIndex, fieldName);
+  };
+
+  renderEditor() {
+    let controlEditor = null;
+    switch (this.props.controlParams.type) {
+      case CONTROL_TYPES.LIST:
+        controlEditor = (
+          <ListControlEditor
+            controlIndex={this.props.controlIndex}
+            controlParams={this.props.controlParams}
+            handleIndexPatternChange={this.changeIndexPattern}
+            handleFieldNameChange={this.changeFieldName}
+            getIndexPattern={this.props.getIndexPattern}
+            handleNumberOptionChange={this.props.handleNumberOptionChange}
+            handleCheckboxOptionChange={this.props.handleCheckboxOptionChange}
+            parentCandidates={this.props.parentCandidates}
+            handleParentChange={this.props.handleParentChange}
+            deps={this.props.deps}
+          />
+        );
+        break;
+      case CONTROL_TYPES.RANGE:
+        controlEditor = (
+          <RangeControlEditor
+            controlIndex={this.props.controlIndex}
+            controlParams={this.props.controlParams}
+            handleIndexPatternChange={this.changeIndexPattern}
+            handleFieldNameChange={this.changeFieldName}
+            getIndexPattern={this.props.getIndexPattern}
+            handleNumberOptionChange={this.props.handleNumberOptionChange}
+            deps={this.props.deps}
+          />
+        );
+        break;
+      default:
+        throw new Error(`Unhandled control editor type ${this.props.controlParams.type}`);
+    }
+
+    const labelId = `controlLabel${this.props.controlIndex}`;
+    return (
+      <EuiForm>
+        <EuiFormRow
+          id={labelId}
+          label={
+            <FormattedMessage
+              id="inputControl.editor.controlEditor.controlLabel"
+              defaultMessage="Control Label"
+            />
+          }
+        >
+          <EuiFieldText value={this.props.controlParams.label} onChange={this.changeLabel} />
+        </EuiFormRow>
+
+        {controlEditor}
+      </EuiForm>
+    );
+  }
+
+  renderEditorButtons() {
+    return (
+      <div>
+        <EuiButtonIcon
+          aria-label={this.props.intl.formatMessage({
+            id: 'inputControl.editor.controlEditor.moveControlUpAriaLabel',
+            defaultMessage: 'Move control up',
+          })}
+          color="primary"
+          onClick={this.moveUpControl}
+          iconType="sortUp"
+          data-test-subj={`inputControlEditorMoveUpControl${this.props.controlIndex}`}
+        />
+        <EuiButtonIcon
+          aria-label={this.props.intl.formatMessage({
+            id: 'inputControl.editor.controlEditor.moveControlDownAriaLabel',
+            defaultMessage: 'Move control down',
+          })}
+          color="primary"
+          onClick={this.moveDownControl}
+          iconType="sortDown"
+          data-test-subj={`inputControlEditorMoveDownControl${this.props.controlIndex}`}
+        />
+        <EuiButtonIcon
+          aria-label={this.props.intl.formatMessage({
+            id: 'inputControl.editor.controlEditor.removeControlAriaLabel',
+            defaultMessage: 'Remove control',
+          })}
+          color="danger"
+          onClick={this.removeControl}
+          iconType="cross"
+          data-test-subj={`inputControlEditorRemoveControl${this.props.controlIndex}`}
+        />
+      </div>
+    );
+  }
+
+  render() {
+    return (
+      <EuiPanel grow={false} className="icvControlEditor__panel">
+        <EuiAccordion
+          id="controlEditorAccordion"
+          buttonContent={getTitle(this.props.controlParams, this.props.controlIndex)}
+          extraAction={this.renderEditorButtons()}
+          initialIsOpen={true}
+        >
+          <EuiSpacer size="s" />
+          {this.renderEditor()}
+        </EuiAccordion>
+      </EuiPanel>
+    );
+  }
+}
+
+export const ControlEditor = injectI18n(ControlEditorUi);
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.js
deleted file mode 100644
index 97036d7b0f5df..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.js
+++ /dev/null
@@ -1,194 +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 PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { ControlEditor } from './control_editor';
-import { addControl, moveControl, newControl, removeControl, setControl } from '../../editor_utils';
-import { getLineageMap, getParentCandidates } from '../../lineage';
-import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
-import { npStart } from 'ui/new_platform';
-
-import {
-  EuiButton,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFormRow,
-  EuiPanel,
-  EuiSelect,
-} from '@elastic/eui';
-
-class ControlsTabUi extends Component {
-  state = {
-    type: 'list',
-  };
-
-  getIndexPattern = async indexPatternId => {
-    return await npStart.plugins.data.indexPatterns.get(indexPatternId);
-  };
-
-  onChange = value => this.props.setValue('controls', value);
-
-  handleLabelChange = (controlIndex, evt) => {
-    const updatedControl = this.props.stateParams.controls[controlIndex];
-    updatedControl.label = evt.target.value;
-    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
-  };
-
-  handleIndexPatternChange = (controlIndex, indexPatternId) => {
-    const updatedControl = this.props.stateParams.controls[controlIndex];
-    updatedControl.indexPattern = indexPatternId;
-    updatedControl.fieldName = '';
-    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
-  };
-
-  handleFieldNameChange = (controlIndex, fieldName) => {
-    const updatedControl = this.props.stateParams.controls[controlIndex];
-    updatedControl.fieldName = fieldName;
-    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
-  };
-
-  handleCheckboxOptionChange = (controlIndex, optionName, evt) => {
-    const updatedControl = this.props.stateParams.controls[controlIndex];
-    updatedControl.options[optionName] = evt.target.checked;
-    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
-  };
-
-  handleNumberOptionChange = (controlIndex, optionName, evt) => {
-    const updatedControl = this.props.stateParams.controls[controlIndex];
-    updatedControl.options[optionName] = parseFloat(evt.target.value);
-    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
-  };
-
-  handleRemoveControl = controlIndex => {
-    this.onChange(removeControl(this.props.stateParams.controls, controlIndex));
-  };
-
-  moveControl = (controlIndex, direction) => {
-    this.onChange(moveControl(this.props.stateParams.controls, controlIndex, direction));
-  };
-
-  handleAddControl = () => {
-    this.onChange(addControl(this.props.stateParams.controls, newControl(this.state.type)));
-  };
-
-  handleParentChange = (controlIndex, evt) => {
-    const updatedControl = this.props.stateParams.controls[controlIndex];
-    updatedControl.parent = evt.target.value;
-    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
-  };
-
-  renderControls() {
-    const lineageMap = getLineageMap(this.props.stateParams.controls);
-    return this.props.stateParams.controls.map((controlParams, controlIndex) => {
-      const parentCandidates = getParentCandidates(
-        this.props.stateParams.controls,
-        controlParams.id,
-        lineageMap
-      );
-      return (
-        <ControlEditor
-          key={controlParams.id}
-          controlIndex={controlIndex}
-          controlParams={controlParams}
-          handleLabelChange={this.handleLabelChange}
-          moveControl={this.moveControl}
-          handleRemoveControl={this.handleRemoveControl}
-          handleIndexPatternChange={this.handleIndexPatternChange}
-          handleFieldNameChange={this.handleFieldNameChange}
-          getIndexPattern={this.getIndexPattern}
-          handleCheckboxOptionChange={this.handleCheckboxOptionChange}
-          handleNumberOptionChange={this.handleNumberOptionChange}
-          parentCandidates={parentCandidates}
-          handleParentChange={this.handleParentChange}
-        />
-      );
-    });
-  }
-
-  render() {
-    const { intl } = this.props;
-
-    return (
-      <div>
-        {this.renderControls()}
-
-        <EuiPanel grow={false}>
-          <EuiFlexGroup>
-            <EuiFlexItem>
-              <EuiFormRow id="selectControlType">
-                <EuiSelect
-                  data-test-subj="selectControlType"
-                  options={[
-                    {
-                      value: 'range',
-                      text: intl.formatMessage({
-                        id: 'inputControl.editor.controlsTab.select.rangeDropDownOptionLabel',
-                        defaultMessage: 'Range slider',
-                      }),
-                    },
-                    {
-                      value: 'list',
-                      text: intl.formatMessage({
-                        id: 'inputControl.editor.controlsTab.select.listDropDownOptionLabel',
-                        defaultMessage: 'Options list',
-                      }),
-                    },
-                  ]}
-                  value={this.state.type}
-                  onChange={evt => this.setState({ type: evt.target.value })}
-                  aria-label={intl.formatMessage({
-                    id: 'inputControl.editor.controlsTab.select.controlTypeAriaLabel',
-                    defaultMessage: 'Select control type',
-                  })}
-                />
-              </EuiFormRow>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiFormRow id="addControl">
-                <EuiButton
-                  fill
-                  onClick={this.handleAddControl}
-                  iconType="plusInCircle"
-                  data-test-subj="inputControlEditorAddBtn"
-                  aria-label={intl.formatMessage({
-                    id: 'inputControl.editor.controlsTab.select.addControlAriaLabel',
-                    defaultMessage: 'Add control',
-                  })}
-                >
-                  <FormattedMessage
-                    id="inputControl.editor.controlsTab.addButtonLabel"
-                    defaultMessage="Add"
-                  />
-                </EuiButton>
-              </EuiFormRow>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiPanel>
-      </div>
-    );
-  }
-}
-
-ControlsTabUi.propTypes = {
-  vis: PropTypes.object.isRequired,
-  setValue: PropTypes.func.isRequired,
-};
-
-export const ControlsTab = injectI18n(ControlsTabUi);
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.test.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.test.js
deleted file mode 100644
index 28f435c27ea8f..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.test.js
+++ /dev/null
@@ -1,202 +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('../../../../../core_plugins/data/public/legacy', () => ({
-  indexPatterns: {
-    indexPatterns: {
-      get: jest.fn(),
-    },
-  },
-}));
-
-jest.mock('ui/new_platform', () => ({
-  npStart: {
-    plugins: {
-      data: {
-        ui: {
-          IndexPatternSelect: () => {
-            return <div />;
-          },
-        },
-      },
-    },
-  },
-}));
-
-import React from 'react';
-import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';
-import { findTestSubject } from '@elastic/eui/lib/test';
-import { getIndexPatternMock } from './__tests__/get_index_pattern_mock';
-import { ControlsTab } from './controls_tab';
-
-const indexPatternsMock = {
-  get: getIndexPatternMock,
-};
-let props;
-
-beforeEach(() => {
-  props = {
-    vis: {
-      API: {
-        indexPatterns: indexPatternsMock,
-      },
-    },
-    stateParams: {
-      controls: [
-        {
-          id: '1',
-          indexPattern: 'indexPattern1',
-          fieldName: 'keywordField',
-          label: 'custom label',
-          type: 'list',
-          options: {
-            type: 'terms',
-            multiselect: true,
-            size: 5,
-            order: 'desc',
-          },
-        },
-        {
-          id: '2',
-          indexPattern: 'indexPattern1',
-          fieldName: 'numberField',
-          label: '',
-          type: 'range',
-          options: {
-            step: 1,
-          },
-        },
-      ],
-    },
-    setValue: jest.fn(),
-  };
-});
-
-test('renders ControlsTab', () => {
-  const component = shallowWithIntl(<ControlsTab.WrappedComponent {...props} />);
-
-  expect(component).toMatchSnapshot();
-});
-
-describe('behavior', () => {
-  test('add control button', () => {
-    const component = mountWithIntl(<ControlsTab.WrappedComponent {...props} />);
-
-    findTestSubject(component, 'inputControlEditorAddBtn').simulate('click');
-
-    // // Use custom match function since control.id is dynamically generated and never the same.
-    expect(props.setValue).toHaveBeenCalledWith(
-      'controls',
-      expect.arrayContaining(props.stateParams.controls)
-    );
-    expect(props.setValue.mock.calls[0][1].length).toEqual(3);
-  });
-
-  test('remove control button', () => {
-    const component = mountWithIntl(<ControlsTab.WrappedComponent {...props} />);
-    findTestSubject(component, 'inputControlEditorRemoveControl0').simulate('click');
-    const expectedParams = [
-      'controls',
-      [
-        {
-          id: '2',
-          indexPattern: 'indexPattern1',
-          fieldName: 'numberField',
-          label: '',
-          type: 'range',
-          options: {
-            step: 1,
-          },
-        },
-      ],
-    ];
-
-    expect(props.setValue).toHaveBeenCalledWith(...expectedParams);
-  });
-
-  test('move down control button', () => {
-    const component = mountWithIntl(<ControlsTab.WrappedComponent {...props} />);
-    findTestSubject(component, 'inputControlEditorMoveDownControl0').simulate('click');
-    const expectedParams = [
-      'controls',
-      [
-        {
-          id: '2',
-          indexPattern: 'indexPattern1',
-          fieldName: 'numberField',
-          label: '',
-          type: 'range',
-          options: {
-            step: 1,
-          },
-        },
-        {
-          id: '1',
-          indexPattern: 'indexPattern1',
-          fieldName: 'keywordField',
-          label: 'custom label',
-          type: 'list',
-          options: {
-            type: 'terms',
-            multiselect: true,
-            size: 5,
-            order: 'desc',
-          },
-        },
-      ],
-    ];
-
-    expect(props.setValue).toHaveBeenCalledWith(...expectedParams);
-  });
-
-  test('move up control button', () => {
-    const component = mountWithIntl(<ControlsTab.WrappedComponent {...props} />);
-    findTestSubject(component, 'inputControlEditorMoveUpControl1').simulate('click');
-    const expectedParams = [
-      'controls',
-      [
-        {
-          id: '2',
-          indexPattern: 'indexPattern1',
-          fieldName: 'numberField',
-          label: '',
-          type: 'range',
-          options: {
-            step: 1,
-          },
-        },
-        {
-          id: '1',
-          indexPattern: 'indexPattern1',
-          fieldName: 'keywordField',
-          label: 'custom label',
-          type: 'list',
-          options: {
-            type: 'terms',
-            multiselect: true,
-            size: 5,
-            order: 'desc',
-          },
-        },
-      ],
-    ];
-
-    expect(props.setValue).toHaveBeenCalledWith(...expectedParams);
-  });
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.test.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
new file mode 100644
index 0000000000000..4e7c9bafbf510
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.test.tsx
@@ -0,0 +1,201 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';
+// @ts-ignore
+import { findTestSubject } from '@elastic/eui/lib/test';
+import { getDepsMock } from './__tests__/get_deps_mock';
+import { getIndexPatternMock } from './__tests__/get_index_pattern_mock';
+import { ControlsTab, ControlsTabUiProps } from './controls_tab';
+
+const indexPatternsMock = {
+  get: getIndexPatternMock,
+};
+let props: ControlsTabUiProps;
+
+beforeEach(() => {
+  props = {
+    deps: getDepsMock(),
+    vis: {
+      API: {
+        indexPatterns: indexPatternsMock,
+      },
+      type: {
+        name: 'test',
+        title: 'test',
+        visualization: null,
+        requestHandler: 'test',
+        responseHandler: 'test',
+        stage: 'beta',
+        requiresSearch: false,
+        hidden: false,
+      },
+    },
+    stateParams: {
+      controls: [
+        {
+          id: '1',
+          indexPattern: 'indexPattern1',
+          fieldName: 'keywordField',
+          label: 'custom label',
+          type: 'list',
+          options: {
+            type: 'terms',
+            multiselect: true,
+            size: 5,
+            order: 'desc',
+          },
+          parent: 'parent',
+        },
+        {
+          id: '2',
+          indexPattern: 'indexPattern1',
+          fieldName: 'numberField',
+          label: '',
+          type: 'range',
+          options: {
+            step: 1,
+          },
+          parent: 'parent',
+        },
+      ],
+    },
+    setValue: jest.fn(),
+    intl: null as any,
+  };
+});
+
+test('renders ControlsTab', () => {
+  const component = shallowWithIntl(<ControlsTab.WrappedComponent {...props} />);
+
+  expect(component).toMatchSnapshot();
+});
+
+describe('behavior', () => {
+  test('add control button', () => {
+    const component = mountWithIntl(<ControlsTab.WrappedComponent {...props} />);
+
+    findTestSubject(component, 'inputControlEditorAddBtn').simulate('click');
+
+    // // Use custom match function since control.id is dynamically generated and never the same.
+    expect(props.setValue).toHaveBeenCalledWith(
+      'controls',
+      expect.arrayContaining(props.stateParams.controls)
+    );
+    expect((props.setValue as jest.Mock).mock.calls[0][1].length).toEqual(3);
+  });
+
+  test('remove control button', () => {
+    const component = mountWithIntl(<ControlsTab.WrappedComponent {...props} />);
+    findTestSubject(component, 'inputControlEditorRemoveControl0').simulate('click');
+    const expectedParams = [
+      'controls',
+      [
+        {
+          id: '2',
+          indexPattern: 'indexPattern1',
+          fieldName: 'numberField',
+          label: '',
+          type: 'range',
+          parent: 'parent',
+          options: {
+            step: 1,
+          },
+        },
+      ],
+    ];
+
+    expect(props.setValue).toHaveBeenCalledWith(...expectedParams);
+  });
+
+  test('move down control button', () => {
+    const component = mountWithIntl(<ControlsTab.WrappedComponent {...props} />);
+    findTestSubject(component, 'inputControlEditorMoveDownControl0').simulate('click');
+    const expectedParams = [
+      'controls',
+      [
+        {
+          id: '2',
+          indexPattern: 'indexPattern1',
+          fieldName: 'numberField',
+          label: '',
+          type: 'range',
+          parent: 'parent',
+          options: {
+            step: 1,
+          },
+        },
+        {
+          id: '1',
+          indexPattern: 'indexPattern1',
+          fieldName: 'keywordField',
+          label: 'custom label',
+          type: 'list',
+          parent: 'parent',
+          options: {
+            type: 'terms',
+            multiselect: true,
+            size: 5,
+            order: 'desc',
+          },
+        },
+      ],
+    ];
+
+    expect(props.setValue).toHaveBeenCalledWith(...expectedParams);
+  });
+
+  test('move up control button', () => {
+    const component = mountWithIntl(<ControlsTab.WrappedComponent {...props} />);
+    findTestSubject(component, 'inputControlEditorMoveUpControl1').simulate('click');
+    const expectedParams = [
+      'controls',
+      [
+        {
+          id: '2',
+          indexPattern: 'indexPattern1',
+          fieldName: 'numberField',
+          label: '',
+          type: 'range',
+          parent: 'parent',
+          options: {
+            step: 1,
+          },
+        },
+        {
+          id: '1',
+          indexPattern: 'indexPattern1',
+          fieldName: 'keywordField',
+          label: 'custom label',
+          type: 'list',
+          parent: 'parent',
+          options: {
+            type: 'terms',
+            multiselect: true,
+            size: 5,
+            order: 'desc',
+          },
+        },
+      ],
+    ];
+
+    expect(props.setValue).toHaveBeenCalledWith(...expectedParams);
+  });
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.tsx
new file mode 100644
index 0000000000000..56381ef7d1570
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/controls_tab.tsx
@@ -0,0 +1,232 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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, { PureComponent, ChangeEvent } from 'react';
+import { InjectedIntlProps } from 'react-intl';
+
+import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiButton,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFormRow,
+  EuiPanel,
+  EuiSelect,
+  EuiSwitchEvent,
+} from '@elastic/eui';
+
+import { ControlEditor } from './control_editor';
+import {
+  addControl,
+  moveControl,
+  newControl,
+  removeControl,
+  setControl,
+  ControlParams,
+  CONTROL_TYPES,
+  ControlParamsOptions,
+} from '../../editor_utils';
+import { getLineageMap, getParentCandidates } from '../../lineage';
+import { IIndexPattern } from '../../../../../../plugins/data/public';
+import { VisOptionsProps } from '../../legacy_imports';
+import { InputControlVisDependencies } from '../../plugin';
+
+interface ControlsTabUiState {
+  type: CONTROL_TYPES;
+}
+
+interface ControlsTabUiParams {
+  controls: ControlParams[];
+}
+type ControlsTabUiInjectedProps = InjectedIntlProps &
+  Pick<VisOptionsProps<ControlsTabUiParams>, 'vis' | 'stateParams' | 'setValue'> & {
+    deps: InputControlVisDependencies;
+  };
+
+export type ControlsTabUiProps = ControlsTabUiInjectedProps;
+
+class ControlsTabUi extends PureComponent<ControlsTabUiProps, ControlsTabUiState> {
+  state = {
+    type: CONTROL_TYPES.LIST,
+  };
+
+  getIndexPattern = async (indexPatternId: string): Promise<IIndexPattern> => {
+    const [, startDeps] = await this.props.deps.core.getStartServices();
+    return await startDeps.data.indexPatterns.get(indexPatternId);
+  };
+
+  onChange = (value: ControlParams[]) => this.props.setValue('controls', value);
+
+  handleLabelChange = (controlIndex: number, event: ChangeEvent<HTMLInputElement>) => {
+    const updatedControl = this.props.stateParams.controls[controlIndex];
+    updatedControl.label = event.target.value;
+    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
+  };
+
+  handleIndexPatternChange = (controlIndex: number, indexPatternId: string) => {
+    const updatedControl = this.props.stateParams.controls[controlIndex];
+    updatedControl.indexPattern = indexPatternId;
+    updatedControl.fieldName = '';
+    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
+  };
+
+  handleFieldNameChange = (controlIndex: number, fieldName: string) => {
+    const updatedControl = this.props.stateParams.controls[controlIndex];
+    updatedControl.fieldName = fieldName;
+    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
+  };
+
+  handleCheckboxOptionChange = (
+    controlIndex: number,
+    optionName: keyof ControlParamsOptions,
+    event: EuiSwitchEvent
+  ) => {
+    const updatedControl = this.props.stateParams.controls[controlIndex];
+    // @ts-ignore
+    updatedControl.options[optionName] = event.target.checked;
+    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
+  };
+
+  handleNumberOptionChange = (
+    controlIndex: number,
+    optionName: keyof ControlParamsOptions,
+    event: ChangeEvent<HTMLInputElement>
+  ) => {
+    const updatedControl = this.props.stateParams.controls[controlIndex];
+    // @ts-ignore
+    updatedControl.options[optionName] = parseFloat(event.target.value);
+    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
+  };
+
+  handleRemoveControl = (controlIndex: number) => {
+    this.onChange(removeControl(this.props.stateParams.controls, controlIndex));
+  };
+
+  moveControl = (controlIndex: number, direction: number) => {
+    this.onChange(moveControl(this.props.stateParams.controls, controlIndex, direction));
+  };
+
+  handleAddControl = () => {
+    this.onChange(addControl(this.props.stateParams.controls, newControl(this.state.type)));
+  };
+
+  handleParentChange = (controlIndex: number, event: ChangeEvent<HTMLSelectElement>) => {
+    const updatedControl = this.props.stateParams.controls[controlIndex];
+    updatedControl.parent = event.target.value;
+    this.onChange(setControl(this.props.stateParams.controls, controlIndex, updatedControl));
+  };
+
+  renderControls() {
+    const lineageMap = getLineageMap(this.props.stateParams.controls);
+    return this.props.stateParams.controls.map((controlParams, controlIndex) => {
+      const parentCandidates = getParentCandidates(
+        this.props.stateParams.controls,
+        controlParams.id,
+        lineageMap
+      );
+      return (
+        <ControlEditor
+          key={controlParams.id}
+          controlIndex={controlIndex}
+          controlParams={controlParams}
+          handleLabelChange={this.handleLabelChange}
+          moveControl={this.moveControl}
+          handleRemoveControl={this.handleRemoveControl}
+          handleIndexPatternChange={this.handleIndexPatternChange}
+          handleFieldNameChange={this.handleFieldNameChange}
+          getIndexPattern={this.getIndexPattern}
+          handleCheckboxOptionChange={this.handleCheckboxOptionChange}
+          handleNumberOptionChange={this.handleNumberOptionChange}
+          parentCandidates={parentCandidates}
+          handleParentChange={this.handleParentChange}
+          deps={this.props.deps}
+        />
+      );
+    });
+  }
+
+  render() {
+    const { intl } = this.props;
+
+    return (
+      <div>
+        {this.renderControls()}
+
+        <EuiPanel grow={false}>
+          <EuiFlexGroup>
+            <EuiFlexItem>
+              <EuiFormRow id="selectControlType">
+                <EuiSelect
+                  data-test-subj="selectControlType"
+                  options={[
+                    {
+                      value: CONTROL_TYPES.RANGE,
+                      text: intl.formatMessage({
+                        id: 'inputControl.editor.controlsTab.select.rangeDropDownOptionLabel',
+                        defaultMessage: 'Range slider',
+                      }),
+                    },
+                    {
+                      value: CONTROL_TYPES.LIST,
+                      text: intl.formatMessage({
+                        id: 'inputControl.editor.controlsTab.select.listDropDownOptionLabel',
+                        defaultMessage: 'Options list',
+                      }),
+                    },
+                  ]}
+                  value={this.state.type}
+                  onChange={event => this.setState({ type: event.target.value as CONTROL_TYPES })}
+                  aria-label={intl.formatMessage({
+                    id: 'inputControl.editor.controlsTab.select.controlTypeAriaLabel',
+                    defaultMessage: 'Select control type',
+                  })}
+                />
+              </EuiFormRow>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiFormRow id="addControl">
+                <EuiButton
+                  fill
+                  onClick={this.handleAddControl}
+                  iconType="plusInCircle"
+                  data-test-subj="inputControlEditorAddBtn"
+                  aria-label={intl.formatMessage({
+                    id: 'inputControl.editor.controlsTab.select.addControlAriaLabel',
+                    defaultMessage: 'Add control',
+                  })}
+                >
+                  <FormattedMessage
+                    id="inputControl.editor.controlsTab.addButtonLabel"
+                    defaultMessage="Add"
+                  />
+                </EuiButton>
+              </EuiFormRow>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiPanel>
+      </div>
+    );
+  }
+}
+
+export const ControlsTab = injectI18n(ControlsTabUi);
+
+export const getControlsTab = (deps: InputControlVisDependencies) => (
+  props: Omit<ControlsTabUiProps, 'core'>
+) => <ControlsTab {...props} deps={deps} />;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/field_select.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/field_select.js
deleted file mode 100644
index 456ff17a316a1..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/field_select.js
+++ /dev/null
@@ -1,177 +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 PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
-
-import { EuiFormRow, EuiComboBox } from '@elastic/eui';
-
-class FieldSelectUi extends Component {
-  constructor(props) {
-    super(props);
-
-    this._hasUnmounted = false;
-
-    this.state = {
-      isLoading: false,
-      fields: [],
-      indexPatternId: props.indexPatternId,
-    };
-    this.filterField = _.get(props, 'filterField', () => {
-      return true;
-    });
-  }
-
-  componentWillUnmount() {
-    this._hasUnmounted = true;
-  }
-
-  componentDidMount() {
-    this.loadFields(this.state.indexPatternId);
-  }
-
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (this.props.indexPatternId !== nextProps.indexPatternId) {
-      this.loadFields(nextProps.indexPatternId);
-    }
-  }
-
-  loadFields = indexPatternId => {
-    this.setState(
-      {
-        isLoading: true,
-        fields: [],
-        indexPatternId,
-      },
-      this.debouncedLoad.bind(null, indexPatternId)
-    );
-  };
-
-  debouncedLoad = _.debounce(async indexPatternId => {
-    if (!indexPatternId || indexPatternId.length === 0) {
-      return;
-    }
-
-    let indexPattern;
-    try {
-      indexPattern = await this.props.getIndexPattern(indexPatternId);
-    } catch (err) {
-      // index pattern no longer exists
-      return;
-    }
-
-    if (this._hasUnmounted) {
-      return;
-    }
-
-    // props.indexPatternId may be updated before getIndexPattern returns
-    // ignore response when fetched index pattern does not match active index pattern
-    if (indexPattern.id !== this.state.indexPatternId) {
-      return;
-    }
-
-    const fieldsByTypeMap = new Map();
-    const fields = [];
-    indexPattern.fields.filter(this.filterField).forEach(field => {
-      if (fieldsByTypeMap.has(field.type)) {
-        const fieldsList = fieldsByTypeMap.get(field.type);
-        fieldsList.push(field.name);
-        fieldsByTypeMap.set(field.type, fieldsList);
-      } else {
-        fieldsByTypeMap.set(field.type, [field.name]);
-      }
-    });
-
-    fieldsByTypeMap.forEach((fieldsList, fieldType) => {
-      fields.push({
-        label: fieldType,
-        options: fieldsList.sort().map(fieldName => {
-          return { value: fieldName, label: fieldName };
-        }),
-      });
-    });
-
-    fields.sort((a, b) => {
-      if (a.label < b.label) return -1;
-      if (a.label > b.label) return 1;
-      return 0;
-    });
-
-    this.setState({
-      isLoading: false,
-      fields: fields,
-    });
-  }, 300);
-
-  onChange = selectedOptions => {
-    this.props.onChange(_.get(selectedOptions, '0.value'));
-  };
-
-  render() {
-    if (!this.props.indexPatternId || this.props.indexPatternId.trim().length === 0) {
-      return null;
-    }
-
-    const selectId = `fieldSelect-${this.props.controlIndex}`;
-
-    const selectedOptions = [];
-    const { intl } = this.props;
-    if (this.props.fieldName) {
-      selectedOptions.push({ value: this.props.fieldName, label: this.props.fieldName });
-    }
-
-    return (
-      <EuiFormRow
-        id={selectId}
-        label={
-          <FormattedMessage
-            id="inputControl.editor.fieldSelect.fieldLabel"
-            defaultMessage="Field"
-          />
-        }
-      >
-        <EuiComboBox
-          placeholder={intl.formatMessage({
-            id: 'inputControl.editor.fieldSelect.selectFieldPlaceholder',
-            defaultMessage: 'Select field...',
-          })}
-          singleSelection={true}
-          isLoading={this.state.isLoading}
-          options={this.state.fields}
-          selectedOptions={selectedOptions}
-          onChange={this.onChange}
-          data-test-subj={selectId}
-        />
-      </EuiFormRow>
-    );
-  }
-}
-
-FieldSelectUi.propTypes = {
-  getIndexPattern: PropTypes.func.isRequired,
-  indexPatternId: PropTypes.string,
-  onChange: PropTypes.func.isRequired,
-  fieldName: PropTypes.string,
-  filterField: PropTypes.func,
-  controlIndex: PropTypes.number.isRequired,
-};
-
-export const FieldSelect = injectI18n(FieldSelectUi);
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/field_select.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/field_select.tsx
new file mode 100644
index 0000000000000..bde2f09ab0a47
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/field_select.tsx
@@ -0,0 +1,182 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 React, { Component } from 'react';
+import { InjectedIntlProps } from 'react-intl';
+
+import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
+import { EuiFormRow, EuiComboBox, EuiComboBoxOptionProps } from '@elastic/eui';
+
+import { IIndexPattern, IFieldType } from '../../../../../../plugins/data/public';
+
+interface FieldSelectUiState {
+  isLoading: boolean;
+  fields: Array<EuiComboBoxOptionProps<string>>;
+  indexPatternId: string;
+}
+
+export type FieldSelectUiProps = InjectedIntlProps & {
+  getIndexPattern: (indexPatternId: string) => Promise<IIndexPattern>;
+  indexPatternId: string;
+  onChange: (value: any) => void;
+  fieldName?: string;
+  filterField?: (field: IFieldType) => boolean;
+  controlIndex: number;
+};
+
+class FieldSelectUi extends Component<FieldSelectUiProps, FieldSelectUiState> {
+  private hasUnmounted: boolean;
+
+  constructor(props: FieldSelectUiProps) {
+    super(props);
+
+    this.hasUnmounted = false;
+
+    this.state = {
+      isLoading: false,
+      fields: [],
+      indexPatternId: props.indexPatternId,
+    };
+  }
+
+  componentWillUnmount() {
+    this.hasUnmounted = true;
+  }
+
+  componentDidMount() {
+    this.loadFields(this.state.indexPatternId);
+  }
+
+  UNSAFE_componentWillReceiveProps(nextProps: FieldSelectUiProps) {
+    if (this.props.indexPatternId !== nextProps.indexPatternId) {
+      this.loadFields(nextProps.indexPatternId ?? '');
+    }
+  }
+
+  loadFields = (indexPatternId: string) => {
+    this.setState(
+      {
+        isLoading: true,
+        fields: [],
+        indexPatternId,
+      },
+      this.debouncedLoad.bind(null, indexPatternId)
+    );
+  };
+
+  debouncedLoad = _.debounce(async (indexPatternId: string) => {
+    if (!indexPatternId || indexPatternId.length === 0) {
+      return;
+    }
+
+    let indexPattern: IIndexPattern;
+    try {
+      indexPattern = await this.props.getIndexPattern(indexPatternId);
+    } catch (err) {
+      // index pattern no longer exists
+      return;
+    }
+
+    if (this.hasUnmounted) {
+      return;
+    }
+
+    // props.indexPatternId may be updated before getIndexPattern returns
+    // ignore response when fetched index pattern does not match active index pattern
+    if (indexPattern.id !== this.state.indexPatternId) {
+      return;
+    }
+
+    const fieldsByTypeMap = new Map<string, string[]>();
+    const fields: Array<EuiComboBoxOptionProps<string>> = [];
+    indexPattern.fields
+      .filter(this.props.filterField ?? (() => true))
+      .forEach((field: IFieldType) => {
+        const fieldsList = fieldsByTypeMap.get(field.type) ?? [];
+        fieldsList.push(field.name);
+        fieldsByTypeMap.set(field.type, fieldsList);
+      });
+
+    fieldsByTypeMap.forEach((fieldsList, fieldType) => {
+      fields.push({
+        label: fieldType,
+        options: fieldsList.sort().map(fieldName => {
+          return { value: fieldName, label: fieldName };
+        }),
+      });
+    });
+
+    fields.sort((a, b) => {
+      if (a.label < b.label) return -1;
+      if (a.label > b.label) return 1;
+      return 0;
+    });
+
+    this.setState({
+      isLoading: false,
+      fields,
+    });
+  }, 300);
+
+  onChange = (selectedOptions: Array<EuiComboBoxOptionProps<any>>) => {
+    this.props.onChange(_.get(selectedOptions, '0.value'));
+  };
+
+  render() {
+    if (!this.props.indexPatternId || this.props.indexPatternId.trim().length === 0) {
+      return null;
+    }
+
+    const selectId = `fieldSelect-${this.props.controlIndex}`;
+
+    const selectedOptions = [];
+    const { intl } = this.props;
+    if (this.props.fieldName) {
+      selectedOptions.push({ value: this.props.fieldName, label: this.props.fieldName });
+    }
+
+    return (
+      <EuiFormRow
+        id={selectId}
+        label={
+          <FormattedMessage
+            id="inputControl.editor.fieldSelect.fieldLabel"
+            defaultMessage="Field"
+          />
+        }
+      >
+        <EuiComboBox
+          placeholder={intl.formatMessage({
+            id: 'inputControl.editor.fieldSelect.selectFieldPlaceholder',
+            defaultMessage: 'Select field...',
+          })}
+          singleSelection={true}
+          isLoading={this.state.isLoading}
+          options={this.state.fields}
+          selectedOptions={selectedOptions}
+          onChange={this.onChange}
+          data-test-subj={selectId}
+        />
+      </EuiFormRow>
+    );
+  }
+}
+
+export const FieldSelect = injectI18n(FieldSelectUi);
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.js
deleted file mode 100644
index 7d7fbc0539de0..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.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 PropTypes from 'prop-types';
-import React from 'react';
-import { injectI18n } from '@kbn/i18n/react';
-import { EuiFormRow } from '@elastic/eui';
-
-import { npStart } from 'ui/new_platform';
-const { IndexPatternSelect } = npStart.plugins.data.ui;
-
-function IndexPatternSelectFormRowUi(props) {
-  const { controlIndex, indexPatternId, intl, onChange } = props;
-  const selectId = `indexPatternSelect-${controlIndex}`;
-
-  return (
-    <EuiFormRow
-      id={selectId}
-      label={intl.formatMessage({
-        id: 'inputControl.editor.indexPatternSelect.patternLabel',
-        defaultMessage: 'Index Pattern',
-      })}
-    >
-      <IndexPatternSelect
-        placeholder={intl.formatMessage({
-          id: 'inputControl.editor.indexPatternSelect.patternPlaceholder',
-          defaultMessage: 'Select index pattern...',
-        })}
-        indexPatternId={indexPatternId}
-        onChange={onChange}
-        data-test-subj={selectId}
-      />
-    </EuiFormRow>
-  );
-}
-
-IndexPatternSelectFormRowUi.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  indexPatternId: PropTypes.string,
-  controlIndex: PropTypes.number.isRequired,
-};
-
-export const IndexPatternSelectFormRow = injectI18n(IndexPatternSelectFormRowUi);
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
new file mode 100644
index 0000000000000..66fdbca64f053
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/index_pattern_select_form_row.tsx
@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { ComponentType } from 'react';
+import { injectI18n } from '@kbn/i18n/react';
+import { EuiFormRow } from '@elastic/eui';
+import { InjectedIntlProps } from 'react-intl';
+import { IndexPatternSelect } from 'src/plugins/data/public';
+
+export type IndexPatternSelectFormRowUiProps = InjectedIntlProps & {
+  onChange: (opt: any) => void;
+  indexPatternId: string;
+  controlIndex: number;
+  IndexPatternSelect: ComponentType<IndexPatternSelect['props']>;
+};
+
+function IndexPatternSelectFormRowUi(props: IndexPatternSelectFormRowUiProps) {
+  const { controlIndex, indexPatternId, intl, onChange } = props;
+  const selectId = `indexPatternSelect-${controlIndex}`;
+
+  return (
+    <EuiFormRow
+      id={selectId}
+      label={intl.formatMessage({
+        id: 'inputControl.editor.indexPatternSelect.patternLabel',
+        defaultMessage: 'Index Pattern',
+      })}
+    >
+      <props.IndexPatternSelect
+        placeholder={intl.formatMessage({
+          id: 'inputControl.editor.indexPatternSelect.patternPlaceholder',
+          defaultMessage: 'Select index pattern...',
+        })}
+        indexPatternId={indexPatternId}
+        onChange={onChange}
+        data-test-subj={selectId}
+        // TODO: supply actual savedObjectsClient here
+        savedObjectsClient={{} as any}
+      />
+    </EuiFormRow>
+  );
+}
+
+export const IndexPatternSelectFormRow = injectI18n(IndexPatternSelectFormRowUi);
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.js
deleted file mode 100644
index 2ee225475b0fe..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.js
+++ /dev/null
@@ -1,266 +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 PropTypes from 'prop-types';
-import React, { Component, Fragment } from 'react';
-import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
-import { FieldSelect } from './field_select';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import { EuiFormRow, EuiFieldNumber, EuiSwitch, EuiSelect } from '@elastic/eui';
-
-function filterField(field) {
-  return field.aggregatable && ['number', 'boolean', 'date', 'ip', 'string'].includes(field.type);
-}
-
-export class ListControlEditor extends Component {
-  state = {
-    isLoadingFieldType: true,
-    isStringField: false,
-    prevFieldName: this.props.controlParams.fieldName,
-  };
-
-  componentDidMount() {
-    this._isMounted = true;
-    this.loadIsStringField();
-  }
-
-  componentWillUnmount() {
-    this._isMounted = false;
-  }
-
-  static getDerivedStateFromProps = (nextProps, prevState) => {
-    const isNewFieldName = prevState.prevFieldName !== nextProps.controlParams.fieldName;
-    if (!prevState.isLoadingFieldType && isNewFieldName) {
-      return {
-        prevFieldName: nextProps.controlParams.fieldName,
-        isLoadingFieldType: true,
-      };
-    }
-
-    return null;
-  };
-
-  componentDidUpdate = () => {
-    if (this.state.isLoadingFieldType) {
-      this.loadIsStringField();
-    }
-  };
-
-  loadIsStringField = async () => {
-    if (!this.props.controlParams.indexPattern || !this.props.controlParams.fieldName) {
-      this.setState({ isLoadingFieldType: false });
-      return;
-    }
-
-    let indexPattern;
-    try {
-      indexPattern = await this.props.getIndexPattern(this.props.controlParams.indexPattern);
-    } catch (err) {
-      // index pattern no longer exists
-      return;
-    }
-
-    if (!this._isMounted) {
-      return;
-    }
-
-    const field = indexPattern.fields.find(field => {
-      return field.name === this.props.controlParams.fieldName;
-    });
-    if (!field) {
-      return;
-    }
-    this.setState({
-      isLoadingFieldType: false,
-      isStringField: field.type === 'string',
-    });
-  };
-
-  renderOptions = () => {
-    if (this.state.isLoadingFieldType || !this.props.controlParams.fieldName) {
-      return;
-    }
-
-    const options = [];
-    if (this.props.parentCandidates && this.props.parentCandidates.length > 0) {
-      const parentCandidatesOptions = [{ value: '', text: '' }, ...this.props.parentCandidates];
-      options.push(
-        <EuiFormRow
-          id={`parentSelect-${this.props.controlIndex}`}
-          label={
-            <FormattedMessage
-              id="inputControl.editor.listControl.parentLabel"
-              defaultMessage="Parent control"
-            />
-          }
-          helpText={
-            <FormattedMessage
-              id="inputControl.editor.listControl.parentDescription"
-              defaultMessage="Options are based on the value of parent control. Disabled if parent is not set."
-            />
-          }
-          key="parentSelect"
-        >
-          <EuiSelect
-            options={parentCandidatesOptions}
-            value={this.props.controlParams.parent}
-            onChange={evt => {
-              this.props.handleParentChange(this.props.controlIndex, evt);
-            }}
-          />
-        </EuiFormRow>
-      );
-    }
-
-    options.push(
-      <EuiFormRow
-        id={`multiselect-${this.props.controlIndex}`}
-        key="multiselect"
-        helpText={
-          <FormattedMessage
-            id="inputControl.editor.listControl.multiselectDescription"
-            defaultMessage="Allow multiple selection"
-          />
-        }
-      >
-        <EuiSwitch
-          label={
-            <FormattedMessage
-              id="inputControl.editor.listControl.multiselectLabel"
-              defaultMessage="Multiselect"
-            />
-          }
-          checked={this.props.controlParams.options.multiselect}
-          onChange={evt => {
-            this.props.handleCheckboxOptionChange(this.props.controlIndex, 'multiselect', evt);
-          }}
-          data-test-subj="listControlMultiselectInput"
-        />
-      </EuiFormRow>
-    );
-
-    const dynamicOptionsHelpText = this.state.isStringField ? (
-      <FormattedMessage
-        id="inputControl.editor.listControl.dynamicOptions.updateDescription"
-        defaultMessage="Update options in response to user input"
-      />
-    ) : (
-      <FormattedMessage
-        id="inputControl.editor.listControl.dynamicOptions.stringFieldDescription"
-        defaultMessage='Only available for "string" fields'
-      />
-    );
-    options.push(
-      <EuiFormRow
-        id={`dynamicOptions-${this.props.controlIndex}`}
-        key="dynamicOptions"
-        helpText={dynamicOptionsHelpText}
-      >
-        <EuiSwitch
-          label={
-            <FormattedMessage
-              id="inputControl.editor.listControl.dynamicOptionsLabel"
-              defaultMessage="Dynamic Options"
-            />
-          }
-          checked={this.props.controlParams.options.dynamicOptions}
-          onChange={evt => {
-            this.props.handleCheckboxOptionChange(this.props.controlIndex, 'dynamicOptions', evt);
-          }}
-          disabled={this.state.isStringField ? false : true}
-          data-test-subj="listControlDynamicOptionsSwitch"
-        />
-      </EuiFormRow>
-    );
-
-    // size is not used when dynamic options is set
-    if (!this.props.controlParams.options.dynamicOptions || !this.state.isStringField) {
-      options.push(
-        <EuiFormRow
-          id={`size-${this.props.controlIndex}`}
-          label={
-            <FormattedMessage
-              id="inputControl.editor.listControl.sizeLabel"
-              defaultMessage="Size"
-            />
-          }
-          key="size"
-          helpText={
-            <FormattedMessage
-              id="inputControl.editor.listControl.sizeDescription"
-              defaultMessage="Number of options"
-            />
-          }
-        >
-          <EuiFieldNumber
-            min={1}
-            value={this.props.controlParams.options.size}
-            onChange={evt => {
-              this.props.handleNumberOptionChange(this.props.controlIndex, 'size', evt);
-            }}
-            data-test-subj="listControlSizeInput"
-          />
-        </EuiFormRow>
-      );
-    }
-
-    return options;
-  };
-
-  render() {
-    return (
-      <Fragment>
-        <IndexPatternSelectFormRow
-          indexPatternId={this.props.controlParams.indexPattern}
-          onChange={this.props.handleIndexPatternChange}
-          controlIndex={this.props.controlIndex}
-        />
-
-        <FieldSelect
-          fieldName={this.props.controlParams.fieldName}
-          indexPatternId={this.props.controlParams.indexPattern}
-          filterField={filterField}
-          onChange={this.props.handleFieldNameChange}
-          getIndexPattern={this.props.getIndexPattern}
-          controlIndex={this.props.controlIndex}
-        />
-
-        {this.renderOptions()}
-      </Fragment>
-    );
-  }
-}
-
-ListControlEditor.propTypes = {
-  getIndexPattern: PropTypes.func.isRequired,
-  controlIndex: PropTypes.number.isRequired,
-  controlParams: PropTypes.object.isRequired,
-  handleFieldNameChange: PropTypes.func.isRequired,
-  handleIndexPatternChange: PropTypes.func.isRequired,
-  handleCheckboxOptionChange: PropTypes.func.isRequired,
-  handleNumberOptionChange: PropTypes.func.isRequired,
-  parentCandidates: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.string.isRequired,
-      text: PropTypes.string.isRequired,
-    })
-  ).isRequired,
-  handleParentChange: PropTypes.func.isRequired,
-};
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.test.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.test.js
deleted file mode 100644
index 24b14943c8bb3..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.test.js
+++ /dev/null
@@ -1,381 +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', () => ({
-  npStart: {
-    plugins: {
-      data: {
-        ui: {
-          IndexPatternSelect: () => {
-            return <div />;
-          },
-        },
-      },
-    },
-  },
-}));
-
-import React from 'react';
-import sinon from 'sinon';
-import { shallow } from 'enzyme';
-
-import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { findTestSubject } from '@elastic/eui/lib/test';
-import { getIndexPatternMock } from './__tests__/get_index_pattern_mock';
-
-import { ListControlEditor } from './list_control_editor';
-
-const controlParams = {
-  id: '1',
-  indexPattern: 'indexPattern1',
-  fieldName: 'keywordField',
-  label: 'custom label',
-  type: 'list',
-  options: {
-    type: 'terms',
-    multiselect: true,
-    dynamicOptions: false,
-    size: 10,
-  },
-};
-let handleFieldNameChange;
-let handleIndexPatternChange;
-let handleCheckboxOptionChange;
-let handleNumberOptionChange;
-
-beforeEach(() => {
-  handleFieldNameChange = sinon.spy();
-  handleIndexPatternChange = sinon.spy();
-  handleCheckboxOptionChange = sinon.spy();
-  handleNumberOptionChange = sinon.spy();
-});
-
-describe('renders', () => {
-  test('should not display any options until field is selected', async () => {
-    const controlParams = {
-      id: '1',
-      indexPattern: 'mockIndexPattern',
-      fieldName: '',
-      type: 'list',
-      options: {
-        type: 'terms',
-        multiselect: true,
-        dynamicOptions: true,
-        size: 5,
-      },
-    };
-    const component = shallow(
-      <ListControlEditor
-        getIndexPattern={getIndexPatternMock}
-        controlIndex={0}
-        controlParams={controlParams}
-        handleFieldNameChange={handleFieldNameChange}
-        handleIndexPatternChange={handleIndexPatternChange}
-        handleCheckboxOptionChange={handleCheckboxOptionChange}
-        handleNumberOptionChange={handleNumberOptionChange}
-        handleParentChange={() => {}}
-        parentCandidates={[]}
-      />
-    );
-
-    // Ensure all promises resolve
-    await new Promise(resolve => process.nextTick(resolve));
-    // Ensure the state changes are reflected
-    component.update();
-
-    expect(component).toMatchSnapshot();
-  });
-
-  test('should display chaining input when parents are provided', async () => {
-    const parentCandidates = [
-      { value: '1', text: 'fieldA' },
-      { value: '2', text: 'fieldB' },
-    ];
-    const component = shallow(
-      <ListControlEditor
-        getIndexPattern={getIndexPatternMock}
-        controlIndex={0}
-        controlParams={controlParams}
-        handleFieldNameChange={handleFieldNameChange}
-        handleIndexPatternChange={handleIndexPatternChange}
-        handleCheckboxOptionChange={handleCheckboxOptionChange}
-        handleNumberOptionChange={handleNumberOptionChange}
-        handleParentChange={() => {}}
-        parentCandidates={parentCandidates}
-      />
-    );
-
-    // Ensure all promises resolve
-    await new Promise(resolve => process.nextTick(resolve));
-    // Ensure the state changes are reflected
-    component.update();
-
-    expect(component).toMatchSnapshot();
-  });
-
-  describe('dynamic options', () => {
-    test('should display dynamic options for string fields', async () => {
-      const controlParams = {
-        id: '1',
-        indexPattern: 'mockIndexPattern',
-        fieldName: 'keywordField',
-        type: 'list',
-        options: {
-          type: 'terms',
-          multiselect: true,
-          dynamicOptions: true,
-          size: 5,
-        },
-      };
-      const component = shallow(
-        <ListControlEditor
-          getIndexPattern={getIndexPatternMock}
-          controlIndex={0}
-          controlParams={controlParams}
-          handleFieldNameChange={handleFieldNameChange}
-          handleIndexPatternChange={handleIndexPatternChange}
-          handleCheckboxOptionChange={handleCheckboxOptionChange}
-          handleNumberOptionChange={handleNumberOptionChange}
-          handleParentChange={() => {}}
-          parentCandidates={[]}
-        />
-      );
-
-      // Ensure all promises resolve
-      await new Promise(resolve => process.nextTick(resolve));
-      // Ensure the state changes are reflected
-      component.update();
-
-      expect(component).toMatchSnapshot();
-    });
-
-    test('should display size field when dynamic options is disabled', async () => {
-      const controlParams = {
-        id: '1',
-        indexPattern: 'mockIndexPattern',
-        fieldName: 'keywordField',
-        type: 'list',
-        options: {
-          type: 'terms',
-          multiselect: true,
-          dynamicOptions: false,
-          size: 5,
-        },
-      };
-      const component = shallow(
-        <ListControlEditor
-          getIndexPattern={getIndexPatternMock}
-          controlIndex={0}
-          controlParams={controlParams}
-          handleFieldNameChange={handleFieldNameChange}
-          handleIndexPatternChange={handleIndexPatternChange}
-          handleCheckboxOptionChange={handleCheckboxOptionChange}
-          handleNumberOptionChange={handleNumberOptionChange}
-          handleParentChange={() => {}}
-          parentCandidates={[]}
-        />
-      );
-
-      // Ensure all promises resolve
-      await new Promise(resolve => process.nextTick(resolve));
-      // Ensure the state changes are reflected
-      component.update();
-
-      expect(component).toMatchSnapshot();
-    });
-
-    test('should display disabled dynamic options with tooltip for non-string fields', async () => {
-      const controlParams = {
-        id: '1',
-        indexPattern: 'mockIndexPattern',
-        fieldName: 'numberField',
-        type: 'list',
-        options: {
-          type: 'terms',
-          multiselect: true,
-          dynamicOptions: true,
-          size: 5,
-        },
-      };
-      const component = shallow(
-        <ListControlEditor
-          getIndexPattern={getIndexPatternMock}
-          controlIndex={0}
-          controlParams={controlParams}
-          handleFieldNameChange={handleFieldNameChange}
-          handleIndexPatternChange={handleIndexPatternChange}
-          handleCheckboxOptionChange={handleCheckboxOptionChange}
-          handleNumberOptionChange={handleNumberOptionChange}
-          handleParentChange={() => {}}
-          parentCandidates={[]}
-        />
-      );
-
-      // Ensure all promises resolve
-      await new Promise(resolve => process.nextTick(resolve));
-      // Ensure the state changes are reflected
-      component.update();
-
-      expect(component).toMatchSnapshot();
-    });
-  });
-});
-
-test('handleCheckboxOptionChange - multiselect', async () => {
-  const component = mountWithIntl(
-    <ListControlEditor
-      getIndexPattern={getIndexPatternMock}
-      controlIndex={0}
-      controlParams={controlParams}
-      handleFieldNameChange={handleFieldNameChange}
-      handleIndexPatternChange={handleIndexPatternChange}
-      handleCheckboxOptionChange={handleCheckboxOptionChange}
-      handleNumberOptionChange={handleNumberOptionChange}
-      handleParentChange={() => {}}
-      parentCandidates={[]}
-    />
-  );
-
-  // Ensure all promises resolve
-  await new Promise(resolve => process.nextTick(resolve));
-  // Ensure the state changes are reflected
-  component.update();
-
-  const checkbox = findTestSubject(component, 'listControlMultiselectInput');
-  checkbox.simulate('click');
-  sinon.assert.notCalled(handleFieldNameChange);
-  sinon.assert.notCalled(handleIndexPatternChange);
-  sinon.assert.notCalled(handleNumberOptionChange);
-  const expectedControlIndex = 0;
-  const expectedOptionName = 'multiselect';
-  sinon.assert.calledWith(
-    handleCheckboxOptionChange,
-    expectedControlIndex,
-    expectedOptionName,
-    sinon.match(evt => {
-      // Synthetic `evt.target.checked` does not get altered by EuiSwitch,
-      // but its aria attribute is correctly updated
-      if (evt.target.getAttribute('aria-checked') === 'true') {
-        return true;
-      }
-      return false;
-    }, 'unexpected checkbox input event')
-  );
-});
-
-test('handleNumberOptionChange - size', async () => {
-  const component = mountWithIntl(
-    <ListControlEditor
-      getIndexPattern={getIndexPatternMock}
-      controlIndex={0}
-      controlParams={controlParams}
-      handleFieldNameChange={handleFieldNameChange}
-      handleIndexPatternChange={handleIndexPatternChange}
-      handleCheckboxOptionChange={handleCheckboxOptionChange}
-      handleNumberOptionChange={handleNumberOptionChange}
-      handleParentChange={() => {}}
-      parentCandidates={[]}
-    />
-  );
-
-  // Ensure all promises resolve
-  await new Promise(resolve => process.nextTick(resolve));
-  // Ensure the state changes are reflected
-  component.update();
-
-  const input = findTestSubject(component, 'listControlSizeInput');
-  input.simulate('change', { target: { value: 7 } });
-  sinon.assert.notCalled(handleCheckboxOptionChange);
-  sinon.assert.notCalled(handleFieldNameChange);
-  sinon.assert.notCalled(handleIndexPatternChange);
-  const expectedControlIndex = 0;
-  const expectedOptionName = 'size';
-  sinon.assert.calledWith(
-    handleNumberOptionChange,
-    expectedControlIndex,
-    expectedOptionName,
-    sinon.match(evt => {
-      if (evt.target.value === 7) {
-        return true;
-      }
-      return false;
-    }, 'unexpected input event')
-  );
-});
-
-test('field name change', async () => {
-  const component = shallowWithIntl(
-    <ListControlEditor
-      getIndexPattern={getIndexPatternMock}
-      controlIndex={0}
-      controlParams={controlParams}
-      handleFieldNameChange={handleFieldNameChange}
-      handleIndexPatternChange={handleIndexPatternChange}
-      handleCheckboxOptionChange={handleCheckboxOptionChange}
-      handleNumberOptionChange={handleNumberOptionChange}
-      handleParentChange={() => {}}
-      parentCandidates={[]}
-    />
-  );
-
-  const update = async () => {
-    // Ensure all promises resolve
-    await new Promise(resolve => process.nextTick(resolve));
-    // Ensure the state changes are reflected
-    component.update();
-  };
-
-  // ensure that after async loading is complete the DynamicOptionsSwitch is not disabled
-  expect(
-    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')
-  ).toHaveLength(0);
-  await update();
-  expect(
-    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')
-  ).toHaveLength(1);
-
-  component.setProps({
-    controlParams: {
-      ...controlParams,
-      fieldName: 'numberField',
-    },
-  });
-
-  // ensure that after async loading is complete the DynamicOptionsSwitch is disabled, because this is not a "string" field
-  expect(
-    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=true]')
-  ).toHaveLength(0);
-  await update();
-  expect(
-    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=true]')
-  ).toHaveLength(1);
-
-  component.setProps({
-    controlParams,
-  });
-
-  // ensure that after async loading is complete the DynamicOptionsSwitch is not disabled again, because we switched to original "string" field
-  expect(
-    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')
-  ).toHaveLength(0);
-  await update();
-  expect(
-    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')
-  ).toHaveLength(1);
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.test.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.test.tsx
new file mode 100644
index 0000000000000..de0187f87212f
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.test.tsx
@@ -0,0 +1,361 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 sinon from 'sinon';
+import { shallow } from 'enzyme';
+
+// @ts-ignore
+import { findTestSubject } from '@elastic/eui/lib/test';
+
+import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { getDepsMock } from './__tests__/get_deps_mock';
+import { getIndexPatternMock } from './__tests__/get_index_pattern_mock';
+import { ListControlEditor } from './list_control_editor';
+import { ControlParams } from '../../editor_utils';
+import { updateComponent } from './__tests__/update_component';
+
+const controlParamsBase: ControlParams = {
+  id: '1',
+  indexPattern: 'indexPattern1',
+  fieldName: 'keywordField',
+  label: 'custom label',
+  type: 'list',
+  options: {
+    type: 'terms',
+    multiselect: true,
+    dynamicOptions: false,
+    size: 10,
+  },
+  parent: '',
+};
+const deps = getDepsMock();
+let handleFieldNameChange: sinon.SinonSpy;
+let handleIndexPatternChange: sinon.SinonSpy;
+let handleCheckboxOptionChange: sinon.SinonSpy;
+let handleNumberOptionChange: sinon.SinonSpy;
+
+beforeEach(() => {
+  handleFieldNameChange = sinon.spy();
+  handleIndexPatternChange = sinon.spy();
+  handleCheckboxOptionChange = sinon.spy();
+  handleNumberOptionChange = sinon.spy();
+});
+
+describe('renders', () => {
+  test('should not display any options until field is selected', async () => {
+    const controlParams: ControlParams = {
+      id: '1',
+      label: 'mock',
+      indexPattern: 'mockIndexPattern',
+      fieldName: '',
+      type: 'list',
+      options: {
+        type: 'terms',
+        multiselect: true,
+        dynamicOptions: true,
+        size: 5,
+      },
+      parent: '',
+    };
+    const component = shallow(
+      <ListControlEditor
+        deps={deps}
+        getIndexPattern={getIndexPatternMock}
+        controlIndex={0}
+        controlParams={controlParams}
+        handleFieldNameChange={handleFieldNameChange}
+        handleIndexPatternChange={handleIndexPatternChange}
+        handleCheckboxOptionChange={handleCheckboxOptionChange}
+        handleNumberOptionChange={handleNumberOptionChange}
+        handleParentChange={() => {}}
+        parentCandidates={[]}
+      />
+    );
+
+    await updateComponent(component);
+
+    expect(component).toMatchSnapshot();
+  });
+
+  test('should display chaining input when parents are provided', async () => {
+    const parentCandidates = [
+      { value: '1', text: 'fieldA' },
+      { value: '2', text: 'fieldB' },
+    ];
+    const component = shallow(
+      <ListControlEditor
+        deps={deps}
+        getIndexPattern={getIndexPatternMock}
+        controlIndex={0}
+        controlParams={controlParamsBase}
+        handleFieldNameChange={handleFieldNameChange}
+        handleIndexPatternChange={handleIndexPatternChange}
+        handleCheckboxOptionChange={handleCheckboxOptionChange}
+        handleNumberOptionChange={handleNumberOptionChange}
+        handleParentChange={() => {}}
+        parentCandidates={parentCandidates}
+      />
+    );
+
+    await updateComponent(component);
+
+    expect(component).toMatchSnapshot();
+  });
+
+  describe('dynamic options', () => {
+    test('should display dynamic options for string fields', async () => {
+      const controlParams: ControlParams = {
+        id: '1',
+        label: 'mock',
+        indexPattern: 'mockIndexPattern',
+        fieldName: 'keywordField',
+        type: 'list',
+        options: {
+          type: 'terms',
+          multiselect: true,
+          dynamicOptions: true,
+          size: 5,
+        },
+        parent: '',
+      };
+      const component = shallow(
+        <ListControlEditor
+          deps={deps}
+          getIndexPattern={getIndexPatternMock}
+          controlIndex={0}
+          controlParams={controlParams}
+          handleFieldNameChange={handleFieldNameChange}
+          handleIndexPatternChange={handleIndexPatternChange}
+          handleCheckboxOptionChange={handleCheckboxOptionChange}
+          handleNumberOptionChange={handleNumberOptionChange}
+          handleParentChange={() => {}}
+          parentCandidates={[]}
+        />
+      );
+
+      await updateComponent(component);
+
+      expect(component).toMatchSnapshot();
+    });
+
+    test('should display size field when dynamic options is disabled', async () => {
+      const controlParams: ControlParams = {
+        id: '1',
+        label: 'mock',
+        indexPattern: 'mockIndexPattern',
+        fieldName: 'keywordField',
+        type: 'list',
+        options: {
+          type: 'terms',
+          multiselect: true,
+          dynamicOptions: false,
+          size: 5,
+        },
+        parent: '',
+      };
+      const component = shallow(
+        <ListControlEditor
+          deps={deps}
+          getIndexPattern={getIndexPatternMock}
+          controlIndex={0}
+          controlParams={controlParams}
+          handleFieldNameChange={handleFieldNameChange}
+          handleIndexPatternChange={handleIndexPatternChange}
+          handleCheckboxOptionChange={handleCheckboxOptionChange}
+          handleNumberOptionChange={handleNumberOptionChange}
+          handleParentChange={() => {}}
+          parentCandidates={[]}
+        />
+      );
+
+      await updateComponent(component);
+
+      expect(component).toMatchSnapshot();
+    });
+
+    test('should display disabled dynamic options with tooltip for non-string fields', async () => {
+      const controlParams: ControlParams = {
+        id: '1',
+        label: 'mock',
+        indexPattern: 'mockIndexPattern',
+        fieldName: 'numberField',
+        type: 'list',
+        options: {
+          type: 'terms',
+          multiselect: true,
+          dynamicOptions: true,
+          size: 5,
+        },
+        parent: '',
+      };
+      const component = shallow(
+        <ListControlEditor
+          deps={deps}
+          getIndexPattern={getIndexPatternMock}
+          controlIndex={0}
+          controlParams={controlParams}
+          handleFieldNameChange={handleFieldNameChange}
+          handleIndexPatternChange={handleIndexPatternChange}
+          handleCheckboxOptionChange={handleCheckboxOptionChange}
+          handleNumberOptionChange={handleNumberOptionChange}
+          handleParentChange={() => {}}
+          parentCandidates={[]}
+        />
+      );
+
+      await updateComponent(component);
+
+      expect(component).toMatchSnapshot();
+    });
+  });
+});
+
+test('handleCheckboxOptionChange - multiselect', async () => {
+  const component = mountWithIntl(
+    <ListControlEditor
+      deps={deps}
+      getIndexPattern={getIndexPatternMock}
+      controlIndex={0}
+      controlParams={controlParamsBase}
+      handleFieldNameChange={handleFieldNameChange}
+      handleIndexPatternChange={handleIndexPatternChange}
+      handleCheckboxOptionChange={handleCheckboxOptionChange}
+      handleNumberOptionChange={handleNumberOptionChange}
+      handleParentChange={() => {}}
+      parentCandidates={[]}
+    />
+  );
+
+  await updateComponent(component);
+
+  const checkbox = findTestSubject(component, 'listControlMultiselectInput');
+  checkbox.simulate('click');
+  sinon.assert.notCalled(handleFieldNameChange);
+  sinon.assert.notCalled(handleIndexPatternChange);
+  sinon.assert.notCalled(handleNumberOptionChange);
+  const expectedControlIndex = 0;
+  const expectedOptionName = 'multiselect';
+  sinon.assert.calledWith(
+    handleCheckboxOptionChange,
+    expectedControlIndex,
+    expectedOptionName,
+    sinon.match(event => {
+      // Synthetic `event.target.checked` does not get altered by EuiSwitch,
+      // but its aria attribute is correctly updated
+      if (event.target.getAttribute('aria-checked') === 'true') {
+        return true;
+      }
+      return false;
+    }, 'unexpected checkbox input event')
+  );
+});
+
+test('handleNumberOptionChange - size', async () => {
+  const component = mountWithIntl(
+    <ListControlEditor
+      deps={deps}
+      getIndexPattern={getIndexPatternMock}
+      controlIndex={0}
+      controlParams={controlParamsBase}
+      handleFieldNameChange={handleFieldNameChange}
+      handleIndexPatternChange={handleIndexPatternChange}
+      handleCheckboxOptionChange={handleCheckboxOptionChange}
+      handleNumberOptionChange={handleNumberOptionChange}
+      handleParentChange={() => {}}
+      parentCandidates={[]}
+    />
+  );
+
+  await updateComponent(component);
+
+  const input = findTestSubject(component, 'listControlSizeInput');
+  input.simulate('change', { target: { value: 7 } });
+  sinon.assert.notCalled(handleCheckboxOptionChange);
+  sinon.assert.notCalled(handleFieldNameChange);
+  sinon.assert.notCalled(handleIndexPatternChange);
+  const expectedControlIndex = 0;
+  const expectedOptionName = 'size';
+  sinon.assert.calledWith(
+    handleNumberOptionChange,
+    expectedControlIndex,
+    expectedOptionName,
+    sinon.match(event => {
+      if (event.target.value === 7) {
+        return true;
+      }
+      return false;
+    }, 'unexpected input event')
+  );
+});
+
+test('field name change', async () => {
+  const component = shallowWithIntl(
+    <ListControlEditor
+      deps={deps}
+      getIndexPattern={getIndexPatternMock}
+      controlIndex={0}
+      controlParams={controlParamsBase}
+      handleFieldNameChange={handleFieldNameChange}
+      handleIndexPatternChange={handleIndexPatternChange}
+      handleCheckboxOptionChange={handleCheckboxOptionChange}
+      handleNumberOptionChange={handleNumberOptionChange}
+      handleParentChange={() => {}}
+      parentCandidates={[]}
+    />
+  );
+
+  // ensure that after async loading is complete the DynamicOptionsSwitch is not disabled
+  expect(
+    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')
+  ).toHaveLength(0);
+  await updateComponent(component);
+  expect(
+    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')
+  ).toHaveLength(1);
+
+  component.setProps({
+    controlParams: {
+      ...controlParamsBase,
+      fieldName: 'numberField',
+    },
+  });
+
+  // ensure that after async loading is complete the DynamicOptionsSwitch is disabled, because this is not a "string" field
+  expect(
+    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=true]')
+  ).toHaveLength(0);
+  await updateComponent(component);
+  expect(
+    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=true]')
+  ).toHaveLength(1);
+
+  component.setProps({
+    controlParams: controlParamsBase,
+  });
+
+  // ensure that after async loading is complete the DynamicOptionsSwitch is not disabled again, because we switched to original "string" field
+  expect(
+    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')
+  ).toHaveLength(0);
+  await updateComponent(component);
+  expect(
+    component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')
+  ).toHaveLength(1);
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.tsx
new file mode 100644
index 0000000000000..ff74d30a6e1a8
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/list_control_editor.tsx
@@ -0,0 +1,316 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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, { PureComponent, ChangeEvent, ComponentType } from 'react';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiFormRow,
+  EuiFieldNumber,
+  EuiSwitch,
+  EuiSelect,
+  EuiSelectProps,
+  EuiSwitchEvent,
+} from '@elastic/eui';
+
+import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
+import { FieldSelect } from './field_select';
+import { ControlParams, ControlParamsOptions } from '../../editor_utils';
+import {
+  IIndexPattern,
+  IFieldType,
+  IndexPatternSelect,
+} from '../../../../../../plugins/data/public';
+import { InputControlVisDependencies } from '../../plugin';
+
+interface ListControlEditorState {
+  isLoadingFieldType: boolean;
+  isStringField: boolean;
+  prevFieldName: string;
+  IndexPatternSelect: ComponentType<IndexPatternSelect['props']> | null;
+}
+
+interface ListControlEditorProps {
+  getIndexPattern: (indexPatternId: string) => Promise<IIndexPattern>;
+  controlIndex: number;
+  controlParams: ControlParams;
+  handleFieldNameChange: (fieldName: string) => void;
+  handleIndexPatternChange: (indexPatternId: string) => void;
+  handleCheckboxOptionChange: (
+    controlIndex: number,
+    optionName: keyof ControlParamsOptions,
+    event: EuiSwitchEvent
+  ) => void;
+  handleNumberOptionChange: (
+    controlIndex: number,
+    optionName: keyof ControlParamsOptions,
+    event: ChangeEvent<HTMLInputElement>
+  ) => void;
+  handleParentChange: (controlIndex: number, event: ChangeEvent<HTMLSelectElement>) => void;
+  parentCandidates: EuiSelectProps['options'];
+  deps: InputControlVisDependencies;
+}
+
+function filterField(field: IFieldType) {
+  return (
+    Boolean(field.aggregatable) &&
+    ['number', 'boolean', 'date', 'ip', 'string'].includes(field.type)
+  );
+}
+
+export class ListControlEditor extends PureComponent<
+  ListControlEditorProps,
+  ListControlEditorState
+> {
+  private isMounted: boolean = false;
+
+  state: ListControlEditorState = {
+    isLoadingFieldType: true,
+    isStringField: false,
+    prevFieldName: this.props.controlParams.fieldName,
+    IndexPatternSelect: null,
+  };
+
+  componentDidMount() {
+    this.isMounted = true;
+    this.loadIsStringField();
+    this.getIndexPatternSelect();
+  }
+
+  componentWillUnmount() {
+    this.isMounted = false;
+  }
+
+  static getDerivedStateFromProps = (
+    nextProps: ListControlEditorProps,
+    prevState: ListControlEditorState
+  ) => {
+    const isNewFieldName = prevState.prevFieldName !== nextProps.controlParams.fieldName;
+    if (!prevState.isLoadingFieldType && isNewFieldName) {
+      return {
+        prevFieldName: nextProps.controlParams.fieldName,
+        isLoadingFieldType: true,
+      };
+    }
+
+    return null;
+  };
+
+  componentDidUpdate = () => {
+    if (this.state.isLoadingFieldType) {
+      this.loadIsStringField();
+    }
+  };
+
+  async getIndexPatternSelect() {
+    const [, { data }] = await this.props.deps.core.getStartServices();
+    this.setState({
+      IndexPatternSelect: data.ui.IndexPatternSelect,
+    });
+  }
+
+  loadIsStringField = async () => {
+    if (!this.props.controlParams.indexPattern || !this.props.controlParams.fieldName) {
+      this.setState({ isLoadingFieldType: false });
+      return;
+    }
+
+    let indexPattern: IIndexPattern;
+    try {
+      indexPattern = await this.props.getIndexPattern(this.props.controlParams.indexPattern);
+    } catch (err) {
+      // index pattern no longer exists
+      return;
+    }
+
+    if (!this.isMounted) {
+      return;
+    }
+
+    const field = (indexPattern.fields as IFieldType[]).find(
+      ({ name }) => name === this.props.controlParams.fieldName
+    );
+    if (!field) {
+      return;
+    }
+    this.setState({
+      isLoadingFieldType: false,
+      isStringField: field.type === 'string',
+    });
+  };
+
+  renderOptions = () => {
+    if (this.state.isLoadingFieldType || !this.props.controlParams.fieldName) {
+      return;
+    }
+
+    const options = [];
+    if (this.props.parentCandidates && this.props.parentCandidates.length > 0) {
+      const parentCandidatesOptions = [{ value: '', text: '' }, ...this.props.parentCandidates];
+      options.push(
+        <EuiFormRow
+          id={`parentSelect-${this.props.controlIndex}`}
+          label={
+            <FormattedMessage
+              id="inputControl.editor.listControl.parentLabel"
+              defaultMessage="Parent control"
+            />
+          }
+          helpText={
+            <FormattedMessage
+              id="inputControl.editor.listControl.parentDescription"
+              defaultMessage="Options are based on the value of parent control. Disabled if parent is not set."
+            />
+          }
+          key="parentSelect"
+        >
+          <EuiSelect
+            options={parentCandidatesOptions}
+            value={this.props.controlParams.parent}
+            onChange={event => {
+              this.props.handleParentChange(this.props.controlIndex, event);
+            }}
+          />
+        </EuiFormRow>
+      );
+    }
+
+    options.push(
+      <EuiFormRow
+        id={`multiselect-${this.props.controlIndex}`}
+        key="multiselect"
+        helpText={
+          <FormattedMessage
+            id="inputControl.editor.listControl.multiselectDescription"
+            defaultMessage="Allow multiple selection"
+          />
+        }
+      >
+        <EuiSwitch
+          label={
+            <FormattedMessage
+              id="inputControl.editor.listControl.multiselectLabel"
+              defaultMessage="Multiselect"
+            />
+          }
+          checked={this.props.controlParams.options.multiselect ?? true}
+          onChange={event => {
+            this.props.handleCheckboxOptionChange(this.props.controlIndex, 'multiselect', event);
+          }}
+          data-test-subj="listControlMultiselectInput"
+        />
+      </EuiFormRow>
+    );
+
+    const dynamicOptionsHelpText = this.state.isStringField ? (
+      <FormattedMessage
+        id="inputControl.editor.listControl.dynamicOptions.updateDescription"
+        defaultMessage="Update options in response to user input"
+      />
+    ) : (
+      <FormattedMessage
+        id="inputControl.editor.listControl.dynamicOptions.stringFieldDescription"
+        defaultMessage='Only available for "string" fields'
+      />
+    );
+    options.push(
+      <EuiFormRow
+        id={`dynamicOptions-${this.props.controlIndex}`}
+        key="dynamicOptions"
+        helpText={dynamicOptionsHelpText}
+      >
+        <EuiSwitch
+          label={
+            <FormattedMessage
+              id="inputControl.editor.listControl.dynamicOptionsLabel"
+              defaultMessage="Dynamic Options"
+            />
+          }
+          checked={this.props.controlParams.options.dynamicOptions ?? false}
+          onChange={event => {
+            this.props.handleCheckboxOptionChange(this.props.controlIndex, 'dynamicOptions', event);
+          }}
+          disabled={this.state.isStringField ? false : true}
+          data-test-subj="listControlDynamicOptionsSwitch"
+        />
+      </EuiFormRow>
+    );
+
+    // size is not used when dynamic options is set
+    if (!this.props.controlParams.options.dynamicOptions || !this.state.isStringField) {
+      options.push(
+        <EuiFormRow
+          id={`size-${this.props.controlIndex}`}
+          label={
+            <FormattedMessage
+              id="inputControl.editor.listControl.sizeLabel"
+              defaultMessage="Size"
+            />
+          }
+          key="size"
+          helpText={
+            <FormattedMessage
+              id="inputControl.editor.listControl.sizeDescription"
+              defaultMessage="Number of options"
+            />
+          }
+        >
+          <EuiFieldNumber
+            min={1}
+            value={this.props.controlParams.options.size}
+            onChange={event => {
+              this.props.handleNumberOptionChange(this.props.controlIndex, 'size', event);
+            }}
+            data-test-subj="listControlSizeInput"
+          />
+        </EuiFormRow>
+      );
+    }
+
+    return options;
+  };
+
+  render() {
+    if (this.state.IndexPatternSelect === null) {
+      return null;
+    }
+
+    return (
+      <>
+        <IndexPatternSelectFormRow
+          indexPatternId={this.props.controlParams.indexPattern}
+          onChange={this.props.handleIndexPatternChange}
+          controlIndex={this.props.controlIndex}
+          IndexPatternSelect={this.state.IndexPatternSelect}
+        />
+
+        <FieldSelect
+          fieldName={this.props.controlParams.fieldName}
+          indexPatternId={this.props.controlParams.indexPattern}
+          filterField={filterField}
+          onChange={this.props.handleFieldNameChange}
+          getIndexPattern={this.props.getIndexPattern}
+          controlIndex={this.props.controlIndex}
+        />
+
+        {this.renderOptions()}
+      </>
+    );
+  }
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.js
deleted file mode 100644
index 236624b11118c..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.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 PropTypes from 'prop-types';
-import React, { Component } from 'react';
-
-import { EuiForm, EuiFormRow, EuiSwitch } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-
-export class OptionsTab extends Component {
-  handleUpdateFiltersChange = evt => {
-    this.props.setValue('updateFiltersOnChange', evt.target.checked);
-  };
-
-  handleUseTimeFilter = evt => {
-    this.props.setValue('useTimeFilter', evt.target.checked);
-  };
-
-  handlePinFilters = evt => {
-    this.props.setValue('pinFilters', evt.target.checked);
-  };
-
-  render() {
-    return (
-      <EuiForm>
-        <EuiFormRow id="updateFiltersOnChange">
-          <EuiSwitch
-            label={
-              <FormattedMessage
-                id="inputControl.editor.optionsTab.updateFilterLabel"
-                defaultMessage="Update Kibana filters on each change"
-              />
-            }
-            checked={this.props.stateParams.updateFiltersOnChange}
-            onChange={this.handleUpdateFiltersChange}
-            data-test-subj="inputControlEditorUpdateFiltersOnChangeCheckbox"
-          />
-        </EuiFormRow>
-
-        <EuiFormRow id="useTimeFilter">
-          <EuiSwitch
-            label={
-              <FormattedMessage
-                id="inputControl.editor.optionsTab.useTimeFilterLabel"
-                defaultMessage="Use time filter"
-              />
-            }
-            checked={this.props.stateParams.useTimeFilter}
-            onChange={this.handleUseTimeFilter}
-            data-test-subj="inputControlEditorUseTimeFilterCheckbox"
-          />
-        </EuiFormRow>
-
-        <EuiFormRow id="pinFilters">
-          <EuiSwitch
-            label={
-              <FormattedMessage
-                id="inputControl.editor.optionsTab.pinFiltersLabel"
-                defaultMessage="Pin filters for all applications"
-              />
-            }
-            checked={this.props.stateParams.pinFilters}
-            onChange={this.handlePinFilters}
-            data-test-subj="inputControlEditorPinFiltersCheckbox"
-          />
-        </EuiFormRow>
-      </EuiForm>
-    );
-  }
-}
-
-OptionsTab.propTypes = {
-  vis: PropTypes.object.isRequired,
-  setValue: PropTypes.func.isRequired,
-};
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.test.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.test.js
deleted file mode 100644
index ef84d37ca8de5..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.test.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import { shallow } from 'enzyme';
-import { mountWithIntl } from 'test_utils/enzyme_helpers';
-
-import { OptionsTab } from './options_tab';
-
-describe('OptionsTab', () => {
-  let props;
-
-  beforeEach(() => {
-    props = {
-      vis: {},
-      stateParams: {
-        updateFiltersOnChange: false,
-        useTimeFilter: false,
-      },
-      setValue: jest.fn(),
-    };
-  });
-
-  it('should renders OptionsTab', () => {
-    const component = shallow(<OptionsTab {...props} />);
-
-    expect(component).toMatchSnapshot();
-  });
-
-  it('should update updateFiltersOnChange', () => {
-    const component = mountWithIntl(<OptionsTab {...props} />);
-    const checkbox = component.find(
-      '[data-test-subj="inputControlEditorUpdateFiltersOnChangeCheckbox"] button'
-    );
-    checkbox.simulate('click');
-
-    expect(props.setValue).toHaveBeenCalledTimes(1);
-    expect(props.setValue).toHaveBeenCalledWith('updateFiltersOnChange', true);
-  });
-
-  it('should update useTimeFilter', () => {
-    const component = mountWithIntl(<OptionsTab {...props} />);
-    const checkbox = component.find(
-      '[data-test-subj="inputControlEditorUseTimeFilterCheckbox"] button'
-    );
-    checkbox.simulate('click');
-
-    expect(props.setValue).toHaveBeenCalledTimes(1);
-    expect(props.setValue).toHaveBeenCalledWith('useTimeFilter', true);
-  });
-
-  it('should update pinFilters', () => {
-    const component = mountWithIntl(<OptionsTab {...props} />);
-    const checkbox = component.find(
-      '[data-test-subj="inputControlEditorPinFiltersCheckbox"] button'
-    );
-    checkbox.simulate('click');
-
-    expect(props.setValue).toHaveBeenCalledTimes(1);
-    expect(props.setValue).toHaveBeenCalledWith('pinFilters', true);
-  });
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.test.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.test.tsx
new file mode 100644
index 0000000000000..36ec4d4446fd6
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.test.tsx
@@ -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 React from 'react';
+import { shallow } from 'enzyme';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+
+import { OptionsTab, OptionsTabProps } from './options_tab';
+import { Vis } from '../../legacy_imports';
+
+describe('OptionsTab', () => {
+  let props: OptionsTabProps;
+
+  beforeEach(() => {
+    props = {
+      vis: {} as Vis,
+      stateParams: {
+        updateFiltersOnChange: false,
+        useTimeFilter: false,
+        pinFilters: false,
+      },
+      setValue: jest.fn(),
+    };
+  });
+
+  it('should renders OptionsTab', () => {
+    const component = shallow(<OptionsTab {...props} />);
+
+    expect(component).toMatchSnapshot();
+  });
+
+  it('should update updateFiltersOnChange', () => {
+    const component = mountWithIntl(<OptionsTab {...props} />);
+    const checkbox = component.find(
+      '[data-test-subj="inputControlEditorUpdateFiltersOnChangeCheckbox"] button'
+    );
+    checkbox.simulate('click');
+
+    expect(props.setValue).toHaveBeenCalledTimes(1);
+    expect(props.setValue).toHaveBeenCalledWith('updateFiltersOnChange', true);
+  });
+
+  it('should update useTimeFilter', () => {
+    const component = mountWithIntl(<OptionsTab {...props} />);
+    const checkbox = component.find(
+      '[data-test-subj="inputControlEditorUseTimeFilterCheckbox"] button'
+    );
+    checkbox.simulate('click');
+
+    expect(props.setValue).toHaveBeenCalledTimes(1);
+    expect(props.setValue).toHaveBeenCalledWith('useTimeFilter', true);
+  });
+
+  it('should update pinFilters', () => {
+    const component = mountWithIntl(<OptionsTab {...props} />);
+    const checkbox = component.find(
+      '[data-test-subj="inputControlEditorPinFiltersCheckbox"] button'
+    );
+    checkbox.simulate('click');
+
+    expect(props.setValue).toHaveBeenCalledTimes(1);
+    expect(props.setValue).toHaveBeenCalledWith('pinFilters', true);
+  });
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.tsx
new file mode 100644
index 0000000000000..43f9e15302e51
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/options_tab.tsx
@@ -0,0 +1,100 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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, { PureComponent } from 'react';
+
+import { EuiForm, EuiFormRow, EuiSwitch } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiSwitchEvent } from '@elastic/eui';
+
+import { VisOptionsProps } from '../../legacy_imports';
+
+interface OptionsTabParams {
+  updateFiltersOnChange: boolean;
+  useTimeFilter: boolean;
+  pinFilters: boolean;
+}
+type OptionsTabInjectedProps = Pick<
+  VisOptionsProps<OptionsTabParams>,
+  'vis' | 'setValue' | 'stateParams'
+>;
+
+export type OptionsTabProps = OptionsTabInjectedProps;
+
+export class OptionsTab extends PureComponent<OptionsTabProps> {
+  handleUpdateFiltersChange = (event: EuiSwitchEvent) => {
+    this.props.setValue('updateFiltersOnChange', event.target.checked);
+  };
+
+  handleUseTimeFilter = (event: EuiSwitchEvent) => {
+    this.props.setValue('useTimeFilter', event.target.checked);
+  };
+
+  handlePinFilters = (event: EuiSwitchEvent) => {
+    this.props.setValue('pinFilters', event.target.checked);
+  };
+
+  render() {
+    return (
+      <EuiForm>
+        <EuiFormRow id="updateFiltersOnChange">
+          <EuiSwitch
+            label={
+              <FormattedMessage
+                id="inputControl.editor.optionsTab.updateFilterLabel"
+                defaultMessage="Update Kibana filters on each change"
+              />
+            }
+            checked={this.props.stateParams.updateFiltersOnChange}
+            onChange={this.handleUpdateFiltersChange}
+            data-test-subj="inputControlEditorUpdateFiltersOnChangeCheckbox"
+          />
+        </EuiFormRow>
+
+        <EuiFormRow id="useTimeFilter">
+          <EuiSwitch
+            label={
+              <FormattedMessage
+                id="inputControl.editor.optionsTab.useTimeFilterLabel"
+                defaultMessage="Use time filter"
+              />
+            }
+            checked={this.props.stateParams.useTimeFilter}
+            onChange={this.handleUseTimeFilter}
+            data-test-subj="inputControlEditorUseTimeFilterCheckbox"
+          />
+        </EuiFormRow>
+
+        <EuiFormRow id="pinFilters">
+          <EuiSwitch
+            label={
+              <FormattedMessage
+                id="inputControl.editor.optionsTab.pinFiltersLabel"
+                defaultMessage="Pin filters for all applications"
+              />
+            }
+            checked={this.props.stateParams.pinFilters}
+            onChange={this.handlePinFilters}
+            data-test-subj="inputControlEditorPinFiltersCheckbox"
+          />
+        </EuiFormRow>
+      </EuiForm>
+    );
+  }
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.js
deleted file mode 100644
index 6e1754b28647f..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import PropTypes from 'prop-types';
-import React, { Fragment } from 'react';
-import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
-import { FieldSelect } from './field_select';
-
-import { EuiFormRow, EuiFieldNumber } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-
-function filterField(field) {
-  return field.type === 'number';
-}
-
-export function RangeControlEditor(props) {
-  const stepSizeId = `stepSize-${props.controlIndex}`;
-  const decimalPlacesId = `decimalPlaces-${props.controlIndex}`;
-  const handleDecimalPlacesChange = evt => {
-    props.handleNumberOptionChange(props.controlIndex, 'decimalPlaces', evt);
-  };
-  const handleStepChange = evt => {
-    props.handleNumberOptionChange(props.controlIndex, 'step', evt);
-  };
-  return (
-    <Fragment>
-      <IndexPatternSelectFormRow
-        indexPatternId={props.controlParams.indexPattern}
-        onChange={props.handleIndexPatternChange}
-        controlIndex={props.controlIndex}
-      />
-
-      <FieldSelect
-        fieldName={props.controlParams.fieldName}
-        indexPatternId={props.controlParams.indexPattern}
-        filterField={filterField}
-        onChange={props.handleFieldNameChange}
-        getIndexPattern={props.getIndexPattern}
-        controlIndex={props.controlIndex}
-      />
-
-      <EuiFormRow
-        id={stepSizeId}
-        label={
-          <FormattedMessage
-            id="inputControl.editor.rangeControl.stepSizeLabel"
-            defaultMessage="Step Size"
-          />
-        }
-      >
-        <EuiFieldNumber
-          value={props.controlParams.options.step}
-          onChange={handleStepChange}
-          data-test-subj={`rangeControlSizeInput${props.controlIndex}`}
-        />
-      </EuiFormRow>
-
-      <EuiFormRow
-        id={decimalPlacesId}
-        label={
-          <FormattedMessage
-            id="inputControl.editor.rangeControl.decimalPlacesLabel"
-            defaultMessage="Decimal Places"
-          />
-        }
-      >
-        <EuiFieldNumber
-          min={0}
-          value={props.controlParams.options.decimalPlaces}
-          onChange={handleDecimalPlacesChange}
-          data-test-subj={`rangeControlDecimalPlacesInput${props.controlIndex}`}
-        />
-      </EuiFormRow>
-    </Fragment>
-  );
-}
-
-RangeControlEditor.propTypes = {
-  getIndexPattern: PropTypes.func.isRequired,
-  controlIndex: PropTypes.number.isRequired,
-  controlParams: PropTypes.object.isRequired,
-  handleFieldNameChange: PropTypes.func.isRequired,
-  handleIndexPatternChange: PropTypes.func.isRequired,
-  handleNumberOptionChange: PropTypes.func.isRequired,
-};
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.test.js b/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.test.js
deleted file mode 100644
index 145b18a42dc15..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.test.js
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import sinon from 'sinon';
-import { shallow } from 'enzyme';
-import { mountWithIntl } from 'test_utils/enzyme_helpers';
-
-jest.mock('ui/new_platform', () => ({
-  npStart: {
-    plugins: {
-      data: {
-        ui: {
-          IndexPatternSelect: () => {
-            return <div />;
-          },
-        },
-      },
-    },
-  },
-}));
-
-import { findTestSubject } from '@elastic/eui/lib/test';
-import { getIndexPatternMock } from './__tests__/get_index_pattern_mock';
-
-import { RangeControlEditor } from './range_control_editor';
-
-const controlParams = {
-  id: '1',
-  indexPattern: 'indexPattern1',
-  fieldName: 'numberField',
-  label: 'custom label',
-  type: 'range',
-  options: {
-    decimalPlaces: 0,
-    step: 1,
-  },
-};
-let handleFieldNameChange;
-let handleIndexPatternChange;
-let handleNumberOptionChange;
-
-beforeEach(() => {
-  handleFieldNameChange = sinon.spy();
-  handleIndexPatternChange = sinon.spy();
-  handleNumberOptionChange = sinon.spy();
-});
-
-test('renders RangeControlEditor', () => {
-  const component = shallow(
-    <RangeControlEditor
-      getIndexPattern={getIndexPatternMock}
-      controlIndex={0}
-      controlParams={controlParams}
-      handleFieldNameChange={handleFieldNameChange}
-      handleIndexPatternChange={handleIndexPatternChange}
-      handleNumberOptionChange={handleNumberOptionChange}
-    />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-});
-
-test('handleNumberOptionChange - step', () => {
-  const component = mountWithIntl(
-    <RangeControlEditor
-      getIndexPattern={getIndexPatternMock}
-      controlIndex={0}
-      controlParams={controlParams}
-      handleFieldNameChange={handleFieldNameChange}
-      handleIndexPatternChange={handleIndexPatternChange}
-      handleNumberOptionChange={handleNumberOptionChange}
-    />
-  );
-  findTestSubject(component, 'rangeControlSizeInput0').simulate('change', {
-    target: { value: 0.5 },
-  });
-  sinon.assert.notCalled(handleFieldNameChange);
-  sinon.assert.notCalled(handleIndexPatternChange);
-  const expectedControlIndex = 0;
-  const expectedOptionName = 'step';
-  sinon.assert.calledWith(
-    handleNumberOptionChange,
-    expectedControlIndex,
-    expectedOptionName,
-    sinon.match(evt => {
-      if (evt.target.value === 0.5) {
-        return true;
-      }
-      return false;
-    }, 'unexpected input event')
-  );
-});
-
-test('handleNumberOptionChange - decimalPlaces', () => {
-  const component = mountWithIntl(
-    <RangeControlEditor
-      getIndexPattern={getIndexPatternMock}
-      controlIndex={0}
-      controlParams={controlParams}
-      handleFieldNameChange={handleFieldNameChange}
-      handleIndexPatternChange={handleIndexPatternChange}
-      handleNumberOptionChange={handleNumberOptionChange}
-    />
-  );
-  findTestSubject(component, 'rangeControlDecimalPlacesInput0').simulate('change', {
-    target: { value: 2 },
-  });
-  sinon.assert.notCalled(handleFieldNameChange);
-  sinon.assert.notCalled(handleIndexPatternChange);
-  const expectedControlIndex = 0;
-  const expectedOptionName = 'decimalPlaces';
-  sinon.assert.calledWith(
-    handleNumberOptionChange,
-    expectedControlIndex,
-    expectedOptionName,
-    sinon.match(evt => {
-      if (evt.target.value === 2) {
-        return true;
-      }
-      return false;
-    }, 'unexpected input event')
-  );
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.test.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.test.tsx
new file mode 100644
index 0000000000000..e7f9b6083890c
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.test.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 React from 'react';
+import { shallow } from 'enzyme';
+import { SinonSpy, spy, assert, match } from 'sinon';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+
+// @ts-ignore
+import { findTestSubject } from '@elastic/eui/lib/test';
+import { getIndexPatternMock } from './__tests__/get_index_pattern_mock';
+
+import { RangeControlEditor } from './range_control_editor';
+import { ControlParams } from '../../editor_utils';
+import { getDepsMock } from './__tests__/get_deps_mock';
+import { updateComponent } from './__tests__/update_component';
+
+const controlParams: ControlParams = {
+  id: '1',
+  indexPattern: 'indexPattern1',
+  fieldName: 'numberField',
+  label: 'custom label',
+  type: 'range',
+  options: {
+    decimalPlaces: 0,
+    step: 1,
+  },
+  parent: '',
+};
+const deps = getDepsMock();
+let handleFieldNameChange: SinonSpy;
+let handleIndexPatternChange: SinonSpy;
+let handleNumberOptionChange: SinonSpy;
+
+beforeEach(() => {
+  handleFieldNameChange = spy();
+  handleIndexPatternChange = spy();
+  handleNumberOptionChange = spy();
+});
+
+test('renders RangeControlEditor', async () => {
+  const component = shallow(
+    <RangeControlEditor
+      deps={deps}
+      getIndexPattern={getIndexPatternMock}
+      controlIndex={0}
+      controlParams={controlParams}
+      handleFieldNameChange={handleFieldNameChange}
+      handleIndexPatternChange={handleIndexPatternChange}
+      handleNumberOptionChange={handleNumberOptionChange}
+    />
+  );
+
+  await updateComponent(component);
+
+  expect(component).toMatchSnapshot(); // eslint-disable-line
+});
+
+test('handleNumberOptionChange - step', async () => {
+  const component = mountWithIntl(
+    <RangeControlEditor
+      deps={deps}
+      getIndexPattern={getIndexPatternMock}
+      controlIndex={0}
+      controlParams={controlParams}
+      handleFieldNameChange={handleFieldNameChange}
+      handleIndexPatternChange={handleIndexPatternChange}
+      handleNumberOptionChange={handleNumberOptionChange}
+    />
+  );
+
+  await updateComponent(component);
+
+  findTestSubject(component, 'rangeControlSizeInput0').simulate('change', {
+    target: { value: 0.5 },
+  });
+  assert.notCalled(handleFieldNameChange);
+  assert.notCalled(handleIndexPatternChange);
+  const expectedControlIndex = 0;
+  const expectedOptionName = 'step';
+  assert.calledWith(
+    handleNumberOptionChange,
+    expectedControlIndex,
+    expectedOptionName,
+    match(event => {
+      if (event.target.value === 0.5) {
+        return true;
+      }
+      return false;
+    }, 'unexpected input event')
+  );
+});
+
+test('handleNumberOptionChange - decimalPlaces', async () => {
+  const component = mountWithIntl(
+    <RangeControlEditor
+      deps={deps}
+      getIndexPattern={getIndexPatternMock}
+      controlIndex={0}
+      controlParams={controlParams}
+      handleFieldNameChange={handleFieldNameChange}
+      handleIndexPatternChange={handleIndexPatternChange}
+      handleNumberOptionChange={handleNumberOptionChange}
+    />
+  );
+
+  await updateComponent(component);
+
+  findTestSubject(component, 'rangeControlDecimalPlacesInput0').simulate('change', {
+    target: { value: 2 },
+  });
+  assert.notCalled(handleFieldNameChange);
+  assert.notCalled(handleIndexPatternChange);
+  const expectedControlIndex = 0;
+  const expectedOptionName = 'decimalPlaces';
+  assert.calledWith(
+    handleNumberOptionChange,
+    expectedControlIndex,
+    expectedOptionName,
+    match(event => {
+      if (event.target.value === 2) {
+        return true;
+      }
+      return false;
+    }, 'unexpected input event')
+  );
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.tsx b/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.tsx
new file mode 100644
index 0000000000000..44477eafda6b1
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/range_control_editor.tsx
@@ -0,0 +1,139 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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, { Component, Fragment, ChangeEvent, ComponentType } from 'react';
+
+import { EuiFormRow, EuiFieldNumber } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import { IndexPatternSelectFormRow } from './index_pattern_select_form_row';
+import { FieldSelect } from './field_select';
+import { ControlParams, ControlParamsOptions } from '../../editor_utils';
+import {
+  IIndexPattern,
+  IFieldType,
+  IndexPatternSelect,
+} from '../../../../../../plugins/data/public';
+import { InputControlVisDependencies } from '../../plugin';
+
+interface RangeControlEditorProps {
+  controlIndex: number;
+  controlParams: ControlParams;
+  getIndexPattern: (indexPatternId: string) => Promise<IIndexPattern>;
+  handleFieldNameChange: (fieldName: string) => void;
+  handleIndexPatternChange: (indexPatternId: string) => void;
+  handleNumberOptionChange: (
+    controlIndex: number,
+    optionName: keyof ControlParamsOptions,
+    event: ChangeEvent<HTMLInputElement>
+  ) => void;
+  deps: InputControlVisDependencies;
+}
+
+interface RangeControlEditorState {
+  IndexPatternSelect: ComponentType<IndexPatternSelect['props']> | null;
+}
+
+function filterField(field: IFieldType) {
+  return field.type === 'number';
+}
+
+export class RangeControlEditor extends Component<
+  RangeControlEditorProps,
+  RangeControlEditorState
+> {
+  state: RangeControlEditorState = {
+    IndexPatternSelect: null,
+  };
+
+  componentDidMount() {
+    this.getIndexPatternSelect();
+  }
+
+  async getIndexPatternSelect() {
+    const [, { data }] = await this.props.deps.core.getStartServices();
+    this.setState({
+      IndexPatternSelect: data.ui.IndexPatternSelect,
+    });
+  }
+
+  render() {
+    const stepSizeId = `stepSize-${this.props.controlIndex}`;
+    const decimalPlacesId = `decimalPlaces-${this.props.controlIndex}`;
+    if (this.state.IndexPatternSelect === null) {
+      return null;
+    }
+
+    return (
+      <Fragment>
+        <IndexPatternSelectFormRow
+          indexPatternId={this.props.controlParams.indexPattern}
+          onChange={this.props.handleIndexPatternChange}
+          controlIndex={this.props.controlIndex}
+          IndexPatternSelect={this.state.IndexPatternSelect}
+        />
+
+        <FieldSelect
+          fieldName={this.props.controlParams.fieldName}
+          indexPatternId={this.props.controlParams.indexPattern}
+          filterField={filterField}
+          onChange={this.props.handleFieldNameChange}
+          getIndexPattern={this.props.getIndexPattern}
+          controlIndex={this.props.controlIndex}
+        />
+
+        <EuiFormRow
+          id={stepSizeId}
+          label={
+            <FormattedMessage
+              id="inputControl.editor.rangeControl.stepSizeLabel"
+              defaultMessage="Step Size"
+            />
+          }
+        >
+          <EuiFieldNumber
+            value={this.props.controlParams.options.step}
+            onChange={event => {
+              this.props.handleNumberOptionChange(this.props.controlIndex, 'step', event);
+            }}
+            data-test-subj={`rangeControlSizeInput${this.props.controlIndex}`}
+          />
+        </EuiFormRow>
+
+        <EuiFormRow
+          id={decimalPlacesId}
+          label={
+            <FormattedMessage
+              id="inputControl.editor.rangeControl.decimalPlacesLabel"
+              defaultMessage="Decimal Places"
+            />
+          }
+        >
+          <EuiFieldNumber
+            min={0}
+            value={this.props.controlParams.options.decimalPlaces}
+            onChange={event => {
+              this.props.handleNumberOptionChange(this.props.controlIndex, 'decimalPlaces', event);
+            }}
+            data-test-subj={`rangeControlDecimalPlacesInput${this.props.controlIndex}`}
+          />
+        </EuiFormRow>
+      </Fragment>
+    );
+  }
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.js.snap b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.js.snap
deleted file mode 100644
index 6437cb19aef97..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.js.snap
+++ /dev/null
@@ -1,76 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`renders control with warning 1`] = `
-<EuiFormRow
-  data-test-subj="inputControl0"
-  describedByIds={Array []}
-  display="row"
-  fullWidth={false}
-  hasChildLabel={true}
-  hasEmptyLabelSpace={false}
-  id="controlId"
-  label={
-    <React.Fragment>
-      <EuiToolTip
-        content="This is a warning"
-        delay="regular"
-        position="top"
-      >
-        <EuiIcon
-          type="alert"
-        />
-      </EuiToolTip>
-      test control
-    </React.Fragment>
-  }
-  labelType="label"
->
-  <div>
-    My Control
-  </div>
-</EuiFormRow>
-`;
-
-exports[`renders disabled control with tooltip 1`] = `
-<EuiFormRow
-  data-test-subj="inputControl0"
-  describedByIds={Array []}
-  display="row"
-  fullWidth={false}
-  hasChildLabel={true}
-  hasEmptyLabelSpace={false}
-  id="controlId"
-  label="test control"
-  labelType="label"
->
-  <EuiToolTip
-    anchorClassName="eui-displayBlock"
-    content="I am disabled for testing purposes"
-    delay="regular"
-    placement="top"
-    position="top"
-  >
-    <div>
-      My Control
-    </div>
-  </EuiToolTip>
-</EuiFormRow>
-`;
-
-exports[`renders enabled control 1`] = `
-<EuiFormRow
-  data-test-subj="inputControl0"
-  describedByIds={Array []}
-  display="row"
-  fullWidth={false}
-  hasChildLabel={true}
-  hasEmptyLabelSpace={false}
-  id="controlId"
-  label="test control"
-  labelType="label"
->
-  <div>
-    My Control
-  </div>
-</EuiFormRow>
-`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.tsx.snap b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.tsx.snap
new file mode 100644
index 0000000000000..ba183cc40b126
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/form_row.test.tsx.snap
@@ -0,0 +1,75 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders control with warning 1`] = `
+<EuiFormRow
+  data-test-subj="inputControl0"
+  describedByIds={Array []}
+  display="row"
+  fullWidth={false}
+  hasChildLabel={true}
+  hasEmptyLabelSpace={false}
+  id="controlId"
+  label={
+    <React.Fragment>
+      <EuiToolTip
+        content="This is a warning"
+        delay="regular"
+        position="top"
+      >
+        <EuiIcon
+          type="alert"
+        />
+      </EuiToolTip>
+      test control
+    </React.Fragment>
+  }
+  labelType="label"
+>
+  <div>
+    My Control
+  </div>
+</EuiFormRow>
+`;
+
+exports[`renders disabled control with tooltip 1`] = `
+<EuiFormRow
+  data-test-subj="inputControl0"
+  describedByIds={Array []}
+  display="row"
+  fullWidth={false}
+  hasChildLabel={true}
+  hasEmptyLabelSpace={false}
+  id="controlId"
+  label="test control"
+  labelType="label"
+>
+  <EuiToolTip
+    anchorClassName="eui-displayBlock"
+    content="I am disabled for testing purposes"
+    delay="regular"
+    position="top"
+  >
+    <div>
+      My Control
+    </div>
+  </EuiToolTip>
+</EuiFormRow>
+`;
+
+exports[`renders enabled control 1`] = `
+<EuiFormRow
+  data-test-subj="inputControl0"
+  describedByIds={Array []}
+  display="row"
+  fullWidth={false}
+  hasChildLabel={true}
+  hasEmptyLabelSpace={false}
+  id="controlId"
+  label="test control"
+  labelType="label"
+>
+  <div>
+    My Control
+  </div>
+</EuiFormRow>
+`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap
deleted file mode 100644
index 841421474e7b1..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap
+++ /dev/null
@@ -1,359 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Apply and Cancel change btns enabled when there are changes 1`] = `
-<div
-  className="icvContainer"
->
-  <EuiFlexGroup
-    wrap={true}
-  >
-    <EuiFlexItem
-      data-test-subj="inputControlItem"
-      key="mock-list-control"
-      style={
-        Object {
-          "minWidth": "250px",
-        }
-      }
-    >
-      <InjectIntl(ListControlUi)
-        controlIndex={0}
-        disableMsg={null}
-        fetchOptions={[Function]}
-        formatOptionLabel={[Function]}
-        id="mock-list-control"
-        label="list control"
-        multiselect={true}
-        options={
-          Array [
-            "choice1",
-            "choice2",
-          ]
-        }
-        selectedOptions={Array []}
-        stageFilter={[Function]}
-      />
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiFlexGroup
-    wrap={true}
-  >
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButton
-        data-test-subj="inputControlSubmitBtn"
-        disabled={false}
-        fill={true}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Apply changes"
-          id="inputControl.vis.inputControlVis.applyChangesButtonLabel"
-          values={Object {}}
-        />
-      </EuiButton>
-    </EuiFlexItem>
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButtonEmpty
-        data-test-subj="inputControlCancelBtn"
-        disabled={false}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Cancel changes"
-          id="inputControl.vis.inputControlVis.cancelChangesButtonLabel"
-          values={Object {}}
-        />
-      </EuiButtonEmpty>
-    </EuiFlexItem>
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButtonEmpty
-        data-test-subj="inputControlClearBtn"
-        disabled={true}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Clear form"
-          id="inputControl.vis.inputControlVis.clearFormButtonLabel"
-          values={Object {}}
-        />
-      </EuiButtonEmpty>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-</div>
-`;
-
-exports[`Clear btns enabled when there are values 1`] = `
-<div
-  className="icvContainer"
->
-  <EuiFlexGroup
-    wrap={true}
-  >
-    <EuiFlexItem
-      data-test-subj="inputControlItem"
-      key="mock-list-control"
-      style={
-        Object {
-          "minWidth": "250px",
-        }
-      }
-    >
-      <InjectIntl(ListControlUi)
-        controlIndex={0}
-        disableMsg={null}
-        fetchOptions={[Function]}
-        formatOptionLabel={[Function]}
-        id="mock-list-control"
-        label="list control"
-        multiselect={true}
-        options={
-          Array [
-            "choice1",
-            "choice2",
-          ]
-        }
-        selectedOptions={Array []}
-        stageFilter={[Function]}
-      />
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiFlexGroup
-    wrap={true}
-  >
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButton
-        data-test-subj="inputControlSubmitBtn"
-        disabled={true}
-        fill={true}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Apply changes"
-          id="inputControl.vis.inputControlVis.applyChangesButtonLabel"
-          values={Object {}}
-        />
-      </EuiButton>
-    </EuiFlexItem>
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButtonEmpty
-        data-test-subj="inputControlCancelBtn"
-        disabled={true}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Cancel changes"
-          id="inputControl.vis.inputControlVis.cancelChangesButtonLabel"
-          values={Object {}}
-        />
-      </EuiButtonEmpty>
-    </EuiFlexItem>
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButtonEmpty
-        data-test-subj="inputControlClearBtn"
-        disabled={false}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Clear form"
-          id="inputControl.vis.inputControlVis.clearFormButtonLabel"
-          values={Object {}}
-        />
-      </EuiButtonEmpty>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-</div>
-`;
-
-exports[`Renders list control 1`] = `
-<div
-  className="icvContainer"
->
-  <EuiFlexGroup
-    wrap={true}
-  >
-    <EuiFlexItem
-      data-test-subj="inputControlItem"
-      key="mock-list-control"
-      style={
-        Object {
-          "minWidth": "250px",
-        }
-      }
-    >
-      <InjectIntl(ListControlUi)
-        controlIndex={0}
-        disableMsg={null}
-        fetchOptions={[Function]}
-        formatOptionLabel={[Function]}
-        id="mock-list-control"
-        label="list control"
-        multiselect={true}
-        options={
-          Array [
-            "choice1",
-            "choice2",
-          ]
-        }
-        selectedOptions={Array []}
-        stageFilter={[Function]}
-      />
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiFlexGroup
-    wrap={true}
-  >
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButton
-        data-test-subj="inputControlSubmitBtn"
-        disabled={true}
-        fill={true}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Apply changes"
-          id="inputControl.vis.inputControlVis.applyChangesButtonLabel"
-          values={Object {}}
-        />
-      </EuiButton>
-    </EuiFlexItem>
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButtonEmpty
-        data-test-subj="inputControlCancelBtn"
-        disabled={true}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Cancel changes"
-          id="inputControl.vis.inputControlVis.cancelChangesButtonLabel"
-          values={Object {}}
-        />
-      </EuiButtonEmpty>
-    </EuiFlexItem>
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButtonEmpty
-        data-test-subj="inputControlClearBtn"
-        disabled={true}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Clear form"
-          id="inputControl.vis.inputControlVis.clearFormButtonLabel"
-          values={Object {}}
-        />
-      </EuiButtonEmpty>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-</div>
-`;
-
-exports[`Renders range control 1`] = `
-<div
-  className="icvContainer"
->
-  <EuiFlexGroup
-    wrap={true}
-  >
-    <EuiFlexItem
-      data-test-subj="inputControlItem"
-      key="mock-range-control"
-      style={
-        Object {
-          "minWidth": "250px",
-        }
-      }
-    >
-      <RangeControl
-        control={
-          Object {
-            "format": [Function],
-            "id": "mock-range-control",
-            "isEnabled": [Function],
-            "label": "range control",
-            "max": 100,
-            "min": 0,
-            "options": Object {
-              "decimalPlaces": 0,
-              "step": 1,
-            },
-            "type": "range",
-            "value": Object {
-              "max": 0,
-              "min": 0,
-            },
-          }
-        }
-        controlIndex={0}
-        stageFilter={[Function]}
-      />
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiFlexGroup
-    wrap={true}
-  >
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButton
-        data-test-subj="inputControlSubmitBtn"
-        disabled={true}
-        fill={true}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Apply changes"
-          id="inputControl.vis.inputControlVis.applyChangesButtonLabel"
-          values={Object {}}
-        />
-      </EuiButton>
-    </EuiFlexItem>
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButtonEmpty
-        data-test-subj="inputControlCancelBtn"
-        disabled={true}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Cancel changes"
-          id="inputControl.vis.inputControlVis.cancelChangesButtonLabel"
-          values={Object {}}
-        />
-      </EuiButtonEmpty>
-    </EuiFlexItem>
-    <EuiFlexItem
-      grow={false}
-    >
-      <EuiButtonEmpty
-        data-test-subj="inputControlClearBtn"
-        disabled={true}
-        onClick={[Function]}
-      >
-        <FormattedMessage
-          defaultMessage="Clear form"
-          id="inputControl.vis.inputControlVis.clearFormButtonLabel"
-          values={Object {}}
-        />
-      </EuiButtonEmpty>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-</div>
-`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.tsx.snap b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.tsx.snap
new file mode 100644
index 0000000000000..5a76967c71fbb
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.tsx.snap
@@ -0,0 +1,356 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Apply and Cancel change btns enabled when there are changes 1`] = `
+<div
+  className="icvContainer"
+>
+  <EuiFlexGroup
+    wrap={true}
+  >
+    <EuiFlexItem
+      data-test-subj="inputControlItem"
+      key="mock-list-control"
+      style={
+        Object {
+          "minWidth": "250px",
+        }
+      }
+    >
+      <InjectIntl(ListControlUi)
+        controlIndex={0}
+        fetchOptions={[Function]}
+        formatOptionLabel={[Function]}
+        id="mock-list-control"
+        label="list control"
+        multiselect={true}
+        options={
+          Array [
+            "choice1",
+            "choice2",
+          ]
+        }
+        selectedOptions={Array []}
+        stageFilter={[Function]}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiFlexGroup
+    wrap={true}
+  >
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButton
+        data-test-subj="inputControlSubmitBtn"
+        disabled={false}
+        fill={true}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Apply changes"
+          id="inputControl.vis.inputControlVis.applyChangesButtonLabel"
+          values={Object {}}
+        />
+      </EuiButton>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButtonEmpty
+        data-test-subj="inputControlCancelBtn"
+        disabled={false}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Cancel changes"
+          id="inputControl.vis.inputControlVis.cancelChangesButtonLabel"
+          values={Object {}}
+        />
+      </EuiButtonEmpty>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButtonEmpty
+        data-test-subj="inputControlClearBtn"
+        disabled={true}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Clear form"
+          id="inputControl.vis.inputControlVis.clearFormButtonLabel"
+          values={Object {}}
+        />
+      </EuiButtonEmpty>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+</div>
+`;
+
+exports[`Clear btns enabled when there are values 1`] = `
+<div
+  className="icvContainer"
+>
+  <EuiFlexGroup
+    wrap={true}
+  >
+    <EuiFlexItem
+      data-test-subj="inputControlItem"
+      key="mock-list-control"
+      style={
+        Object {
+          "minWidth": "250px",
+        }
+      }
+    >
+      <InjectIntl(ListControlUi)
+        controlIndex={0}
+        fetchOptions={[Function]}
+        formatOptionLabel={[Function]}
+        id="mock-list-control"
+        label="list control"
+        multiselect={true}
+        options={
+          Array [
+            "choice1",
+            "choice2",
+          ]
+        }
+        selectedOptions={Array []}
+        stageFilter={[Function]}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiFlexGroup
+    wrap={true}
+  >
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButton
+        data-test-subj="inputControlSubmitBtn"
+        disabled={true}
+        fill={true}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Apply changes"
+          id="inputControl.vis.inputControlVis.applyChangesButtonLabel"
+          values={Object {}}
+        />
+      </EuiButton>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButtonEmpty
+        data-test-subj="inputControlCancelBtn"
+        disabled={true}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Cancel changes"
+          id="inputControl.vis.inputControlVis.cancelChangesButtonLabel"
+          values={Object {}}
+        />
+      </EuiButtonEmpty>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButtonEmpty
+        data-test-subj="inputControlClearBtn"
+        disabled={false}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Clear form"
+          id="inputControl.vis.inputControlVis.clearFormButtonLabel"
+          values={Object {}}
+        />
+      </EuiButtonEmpty>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+</div>
+`;
+
+exports[`Renders list control 1`] = `
+<div
+  className="icvContainer"
+>
+  <EuiFlexGroup
+    wrap={true}
+  >
+    <EuiFlexItem
+      data-test-subj="inputControlItem"
+      key="mock-list-control"
+      style={
+        Object {
+          "minWidth": "250px",
+        }
+      }
+    >
+      <InjectIntl(ListControlUi)
+        controlIndex={0}
+        fetchOptions={[Function]}
+        formatOptionLabel={[Function]}
+        id="mock-list-control"
+        label="list control"
+        multiselect={true}
+        options={
+          Array [
+            "choice1",
+            "choice2",
+          ]
+        }
+        selectedOptions={Array []}
+        stageFilter={[Function]}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiFlexGroup
+    wrap={true}
+  >
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButton
+        data-test-subj="inputControlSubmitBtn"
+        disabled={true}
+        fill={true}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Apply changes"
+          id="inputControl.vis.inputControlVis.applyChangesButtonLabel"
+          values={Object {}}
+        />
+      </EuiButton>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButtonEmpty
+        data-test-subj="inputControlCancelBtn"
+        disabled={true}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Cancel changes"
+          id="inputControl.vis.inputControlVis.cancelChangesButtonLabel"
+          values={Object {}}
+        />
+      </EuiButtonEmpty>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButtonEmpty
+        data-test-subj="inputControlClearBtn"
+        disabled={true}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Clear form"
+          id="inputControl.vis.inputControlVis.clearFormButtonLabel"
+          values={Object {}}
+        />
+      </EuiButtonEmpty>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+</div>
+`;
+
+exports[`Renders range control 1`] = `
+<div
+  className="icvContainer"
+>
+  <EuiFlexGroup
+    wrap={true}
+  >
+    <EuiFlexItem
+      data-test-subj="inputControlItem"
+      key="mock-range-control"
+      style={
+        Object {
+          "minWidth": "250px",
+        }
+      }
+    >
+      <RangeControl
+        control={
+          Object {
+            "format": [Function],
+            "id": "mock-range-control",
+            "isEnabled": [Function],
+            "label": "range control",
+            "max": 100,
+            "min": 0,
+            "options": Object {
+              "decimalPlaces": 0,
+              "step": 1,
+            },
+            "type": "range",
+            "value": Object {
+              "max": 0,
+              "min": 0,
+            },
+          }
+        }
+        controlIndex={0}
+        stageFilter={[Function]}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiFlexGroup
+    wrap={true}
+  >
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButton
+        data-test-subj="inputControlSubmitBtn"
+        disabled={true}
+        fill={true}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Apply changes"
+          id="inputControl.vis.inputControlVis.applyChangesButtonLabel"
+          values={Object {}}
+        />
+      </EuiButton>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButtonEmpty
+        data-test-subj="inputControlCancelBtn"
+        disabled={true}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Cancel changes"
+          id="inputControl.vis.inputControlVis.cancelChangesButtonLabel"
+          values={Object {}}
+        />
+      </EuiButtonEmpty>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButtonEmpty
+        data-test-subj="inputControlClearBtn"
+        disabled={true}
+        onClick={[Function]}
+      >
+        <FormattedMessage
+          defaultMessage="Clear form"
+          id="inputControl.vis.inputControlVis.clearFormButtonLabel"
+          values={Object {}}
+        />
+      </EuiButtonEmpty>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+</div>
+`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.js.snap b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.js.snap
deleted file mode 100644
index 34d1eda5c8c0b..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.js.snap
+++ /dev/null
@@ -1,52 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`disableMsg 1`] = `
-<FormRow
-  controlIndex={0}
-  disableMsg="control is disabled to test rendering when disabled"
-  id="mock-list-control"
-  label="list control"
->
-  <EuiFieldText
-    compressed={false}
-    disabled={true}
-    fullWidth={false}
-    isLoading={false}
-    placeholder="Select..."
-  />
-</FormRow>
-`;
-
-exports[`renders ListControl 1`] = `
-<FormRow
-  controlIndex={0}
-  id="mock-list-control"
-  label="list control"
->
-  <EuiComboBox
-    compressed={false}
-    data-test-subj="listControlSelect0"
-    fullWidth={false}
-    isClearable={true}
-    isLoading={false}
-    onChange={[Function]}
-    options={
-      Array [
-        Object {
-          "data-test-subj": "option_choice1",
-          "label": "choice1 + formatting",
-          "value": "choice1",
-        },
-        Object {
-          "data-test-subj": "option_choice2",
-          "label": "choice2 + formatting",
-          "value": "choice2",
-        },
-      ]
-    }
-    placeholder="Select..."
-    selectedOptions={Array []}
-    singleSelection={false}
-  />
-</FormRow>
-`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.tsx.snap b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.tsx.snap
new file mode 100644
index 0000000000000..31c221b36e2b2
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.tsx.snap
@@ -0,0 +1,53 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`disableMsg 1`] = `
+<FormRow
+  controlIndex={0}
+  disableMsg="control is disabled to test rendering when disabled"
+  id="mock-list-control"
+  label="list control"
+>
+  <EuiFieldText
+    compressed={false}
+    disabled={true}
+    fullWidth={false}
+    isLoading={false}
+    placeholder="Select..."
+  />
+</FormRow>
+`;
+
+exports[`renders ListControl 1`] = `
+<FormRow
+  controlIndex={0}
+  id="mock-list-control"
+  label="list control"
+>
+  <EuiComboBox
+    async={false}
+    compressed={false}
+    data-test-subj="listControlSelect0"
+    fullWidth={false}
+    isClearable={true}
+    isLoading={false}
+    onChange={[Function]}
+    options={
+      Array [
+        Object {
+          "data-test-subj": "option_choice1",
+          "label": "choice1 + formatting",
+          "value": "choice1",
+        },
+        Object {
+          "data-test-subj": "option_choice2",
+          "label": "choice2 + formatting",
+          "value": "choice2",
+        },
+      ]
+    }
+    placeholder="Select..."
+    selectedOptions={Array []}
+    singleSelection={false}
+  />
+</FormRow>
+`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/range_control.test.js.snap b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/range_control.test.js.snap
deleted file mode 100644
index 2e6c1058e160d..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/range_control.test.js.snap
+++ /dev/null
@@ -1,58 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`disabled 1`] = `
-<FormRow
-  controlIndex={0}
-  disableMsg="control is disabled to test rendering when disabled"
-  id="mock-range-control"
-  label="range control"
->
-  <ValidatedDualRange
-    allowEmptyRange={true}
-    compressed={false}
-    disabled={true}
-    fullWidth={false}
-    showInput={true}
-  />
-</FormRow>
-`;
-
-exports[`renders RangeControl 1`] = `
-<FormRow
-  controlIndex={0}
-  disableMsg={null}
-  id="mock-range-control"
-  label="range control"
->
-  <ValidatedDualRange
-    allowEmptyRange={true}
-    compressed={false}
-    fullWidth={false}
-    id="mock-range-control"
-    max={100}
-    min={0}
-    onChange={[Function]}
-    showInput={true}
-    showRange={true}
-    showTicks={true}
-    ticks={
-      Array [
-        Object {
-          "label": 0,
-          "value": 0,
-        },
-        Object {
-          "label": 100,
-          "value": 100,
-        },
-      ]
-    }
-    value={
-      Array [
-        "",
-        "",
-      ]
-    }
-  />
-</FormRow>
-`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/range_control.test.tsx.snap b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/range_control.test.tsx.snap
new file mode 100644
index 0000000000000..c54397bf0e30c
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/range_control.test.tsx.snap
@@ -0,0 +1,57 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`disabled 1`] = `
+<FormRow
+  controlIndex={0}
+  disableMsg="control is disabled to test rendering when disabled"
+  id="mock-range-control"
+  label="range control"
+>
+  <ValidatedDualRange
+    allowEmptyRange={true}
+    compressed={false}
+    disabled={true}
+    fullWidth={false}
+    showInput={true}
+  />
+</FormRow>
+`;
+
+exports[`renders RangeControl 1`] = `
+<FormRow
+  controlIndex={0}
+  id="mock-range-control"
+  label="range control"
+>
+  <ValidatedDualRange
+    allowEmptyRange={true}
+    compressed={false}
+    fullWidth={false}
+    id="mock-range-control"
+    max={100}
+    min={0}
+    onChange={[Function]}
+    showInput={true}
+    showRange={true}
+    showTicks={true}
+    ticks={
+      Array [
+        Object {
+          "label": 0,
+          "value": 0,
+        },
+        Object {
+          "label": 100,
+          "value": 100,
+        },
+      ]
+    }
+    value={
+      Array [
+        "",
+        "",
+      ]
+    }
+  />
+</FormRow>
+`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.js b/src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.js
deleted file mode 100644
index fdd4fcb6e26ae..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.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 PropTypes from 'prop-types';
-import React from 'react';
-
-import { EuiFormRow, EuiToolTip, EuiIcon } from '@elastic/eui';
-
-export function FormRow(props) {
-  let control = props.children;
-  if (props.disableMsg) {
-    control = (
-      <EuiToolTip placement="top" content={props.disableMsg} anchorClassName="eui-displayBlock">
-        {control}
-      </EuiToolTip>
-    );
-  }
-
-  const label = props.warningMsg ? (
-    <>
-      <EuiToolTip position="top" content={props.warningMsg}>
-        <EuiIcon type="alert" />
-      </EuiToolTip>
-      {props.label}
-    </>
-  ) : (
-    props.label
-  );
-
-  return (
-    <EuiFormRow label={label} id={props.id} data-test-subj={'inputControl' + props.controlIndex}>
-      {control}
-    </EuiFormRow>
-  );
-}
-
-FormRow.propTypes = {
-  label: PropTypes.string.isRequired,
-  warningMsg: PropTypes.string,
-  id: PropTypes.string.isRequired,
-  children: PropTypes.node.isRequired,
-  controlIndex: PropTypes.number.isRequired,
-  disableMsg: PropTypes.string,
-};
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.test.js b/src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.test.js
rename to src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.test.tsx
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.tsx b/src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.tsx
new file mode 100644
index 0000000000000..29385582924e7
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/form_row.tsx
@@ -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 React, { ReactElement } from 'react';
+
+import { EuiFormRow, EuiToolTip, EuiIcon } from '@elastic/eui';
+
+export interface FormRowProps {
+  label: string;
+  warningMsg?: string;
+  id: string;
+  children: ReactElement;
+  controlIndex: number;
+  disableMsg?: string;
+}
+
+export function FormRow(props: FormRowProps) {
+  let control = props.children;
+  if (props.disableMsg) {
+    control = (
+      <EuiToolTip position="top" content={props.disableMsg} anchorClassName="eui-displayBlock">
+        {control}
+      </EuiToolTip>
+    );
+  }
+
+  const label = props.warningMsg ? (
+    <>
+      <EuiToolTip position="top" content={props.warningMsg}>
+        <EuiIcon type="alert" />
+      </EuiToolTip>
+      {props.label}
+    </>
+  ) : (
+    props.label
+  );
+
+  return (
+    <EuiFormRow label={label} id={props.id} data-test-subj={'inputControl' + props.controlIndex}>
+      {control}
+    </EuiFormRow>
+  );
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.js b/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.js
deleted file mode 100644
index 9e140155698f0..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.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 PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { RangeControl } from './range_control';
-import { ListControl } from './list_control';
-import { EuiButton, EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-
-export class InputControlVis extends Component {
-  constructor(props) {
-    super(props);
-
-    this.handleSubmit = this.handleSubmit.bind(this);
-    this.handleReset = this.handleReset.bind(this);
-    this.handleClearAll = this.handleClearAll.bind(this);
-  }
-
-  handleSubmit() {
-    this.props.submitFilters();
-  }
-
-  handleReset() {
-    this.props.resetControls();
-  }
-
-  handleClearAll() {
-    this.props.clearControls();
-  }
-
-  renderControls() {
-    return this.props.controls.map((control, index) => {
-      let controlComponent = null;
-      switch (control.type) {
-        case 'list':
-          controlComponent = (
-            <ListControl
-              id={control.id}
-              label={control.label}
-              options={control.selectOptions}
-              selectedOptions={control.value}
-              formatOptionLabel={control.format}
-              disableMsg={control.isEnabled() ? null : control.disabledReason}
-              multiselect={control.options.multiselect}
-              partialResults={control.partialResults}
-              dynamicOptions={control.options.dynamicOptions}
-              controlIndex={index}
-              stageFilter={this.props.stageFilter}
-              fetchOptions={query => {
-                this.props.refreshControl(index, query);
-              }}
-            />
-          );
-          break;
-        case 'range':
-          controlComponent = (
-            <RangeControl
-              control={control}
-              controlIndex={index}
-              stageFilter={this.props.stageFilter}
-            />
-          );
-          break;
-        default:
-          throw new Error(`Unhandled control type ${control.type}`);
-      }
-      return (
-        <EuiFlexItem
-          key={control.id}
-          style={{ minWidth: '250px' }}
-          data-test-subj="inputControlItem"
-        >
-          {controlComponent}
-        </EuiFlexItem>
-      );
-    });
-  }
-
-  renderStagingButtons() {
-    return (
-      <EuiFlexGroup wrap={true}>
-        <EuiFlexItem grow={false}>
-          <EuiButton
-            fill
-            onClick={this.handleSubmit}
-            disabled={!this.props.hasChanges()}
-            data-test-subj="inputControlSubmitBtn"
-          >
-            <FormattedMessage
-              id="inputControl.vis.inputControlVis.applyChangesButtonLabel"
-              defaultMessage="Apply changes"
-            />
-          </EuiButton>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiButtonEmpty
-            onClick={this.handleReset}
-            disabled={!this.props.hasChanges()}
-            data-test-subj="inputControlCancelBtn"
-          >
-            <FormattedMessage
-              id="inputControl.vis.inputControlVis.cancelChangesButtonLabel"
-              defaultMessage="Cancel changes"
-            />
-          </EuiButtonEmpty>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiButtonEmpty
-            onClick={this.handleClearAll}
-            disabled={!this.props.hasValues()}
-            data-test-subj="inputControlClearBtn"
-          >
-            <FormattedMessage
-              id="inputControl.vis.inputControlVis.clearFormButtonLabel"
-              defaultMessage="Clear form"
-            />
-          </EuiButtonEmpty>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    );
-  }
-
-  render() {
-    let stagingButtons;
-    if (this.props.controls.length > 0 && !this.props.updateFiltersOnChange) {
-      stagingButtons = this.renderStagingButtons();
-    }
-
-    return (
-      <div className="icvContainer">
-        <EuiFlexGroup wrap>{this.renderControls()}</EuiFlexGroup>
-        {stagingButtons}
-      </div>
-    );
-  }
-}
-
-InputControlVis.propTypes = {
-  stageFilter: PropTypes.func.isRequired,
-  submitFilters: PropTypes.func.isRequired,
-  resetControls: PropTypes.func.isRequired,
-  clearControls: PropTypes.func.isRequired,
-  controls: PropTypes.array.isRequired,
-  updateFiltersOnChange: PropTypes.bool,
-  hasChanges: PropTypes.func.isRequired,
-  hasValues: PropTypes.func.isRequired,
-  refreshControl: PropTypes.func.isRequired,
-};
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.test.js b/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.test.js
deleted file mode 100644
index a835078ab4dc0..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.test.js
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import sinon from 'sinon';
-import { shallow } from 'enzyme';
-import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { findTestSubject } from '@elastic/eui/lib/test';
-
-import { InputControlVis } from './input_control_vis';
-
-const mockListControl = {
-  id: 'mock-list-control',
-  isEnabled: () => {
-    return true;
-  },
-  options: {
-    type: 'terms',
-    multiselect: true,
-  },
-  type: 'list',
-  label: 'list control',
-  value: [],
-  selectOptions: ['choice1', 'choice2'],
-  format: value => {
-    return value;
-  },
-};
-const mockRangeControl = {
-  id: 'mock-range-control',
-  isEnabled: () => {
-    return true;
-  },
-  options: {
-    decimalPlaces: 0,
-    step: 1,
-  },
-  type: 'range',
-  label: 'range control',
-  value: { min: 0, max: 0 },
-  min: 0,
-  max: 100,
-  format: value => {
-    return value;
-  },
-};
-const updateFiltersOnChange = false;
-
-let stageFilter;
-let submitFilters;
-let resetControls;
-let clearControls;
-
-beforeEach(() => {
-  stageFilter = sinon.spy();
-  submitFilters = sinon.spy();
-  resetControls = sinon.spy();
-  clearControls = sinon.spy();
-});
-
-test('Renders list control', () => {
-  const component = shallow(
-    <InputControlVis
-      stageFilter={stageFilter}
-      submitFilters={submitFilters}
-      resetControls={resetControls}
-      clearControls={clearControls}
-      controls={[mockListControl]}
-      updateFiltersOnChange={updateFiltersOnChange}
-      hasChanges={() => {
-        return false;
-      }}
-      hasValues={() => {
-        return false;
-      }}
-      refreshControl={() => {}}
-    />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-});
-
-test('Renders range control', () => {
-  const component = shallow(
-    <InputControlVis
-      stageFilter={stageFilter}
-      submitFilters={submitFilters}
-      resetControls={resetControls}
-      clearControls={clearControls}
-      controls={[mockRangeControl]}
-      updateFiltersOnChange={updateFiltersOnChange}
-      hasChanges={() => {
-        return false;
-      }}
-      hasValues={() => {
-        return false;
-      }}
-      refreshControl={() => {}}
-    />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-});
-
-test('Apply and Cancel change btns enabled when there are changes', () => {
-  const component = shallow(
-    <InputControlVis
-      stageFilter={stageFilter}
-      submitFilters={submitFilters}
-      resetControls={resetControls}
-      clearControls={clearControls}
-      controls={[mockListControl]}
-      updateFiltersOnChange={updateFiltersOnChange}
-      hasChanges={() => {
-        return true;
-      }}
-      hasValues={() => {
-        return false;
-      }}
-      refreshControl={() => {}}
-    />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-});
-
-test('Clear btns enabled when there are values', () => {
-  const component = shallow(
-    <InputControlVis
-      stageFilter={stageFilter}
-      submitFilters={submitFilters}
-      resetControls={resetControls}
-      clearControls={clearControls}
-      controls={[mockListControl]}
-      updateFiltersOnChange={updateFiltersOnChange}
-      hasChanges={() => {
-        return false;
-      }}
-      hasValues={() => {
-        return true;
-      }}
-      refreshControl={() => {}}
-    />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-});
-
-test('clearControls', () => {
-  const component = mountWithIntl(
-    <InputControlVis
-      stageFilter={stageFilter}
-      submitFilters={submitFilters}
-      resetControls={resetControls}
-      clearControls={clearControls}
-      controls={[mockListControl]}
-      updateFiltersOnChange={updateFiltersOnChange}
-      hasChanges={() => {
-        return true;
-      }}
-      hasValues={() => {
-        return true;
-      }}
-      refreshControl={() => {}}
-    />
-  );
-  findTestSubject(component, 'inputControlClearBtn').simulate('click');
-  sinon.assert.calledOnce(clearControls);
-  sinon.assert.notCalled(submitFilters);
-  sinon.assert.notCalled(resetControls);
-  sinon.assert.notCalled(stageFilter);
-});
-
-test('submitFilters', () => {
-  const component = mountWithIntl(
-    <InputControlVis
-      stageFilter={stageFilter}
-      submitFilters={submitFilters}
-      resetControls={resetControls}
-      clearControls={clearControls}
-      controls={[mockListControl]}
-      updateFiltersOnChange={updateFiltersOnChange}
-      hasChanges={() => {
-        return true;
-      }}
-      hasValues={() => {
-        return true;
-      }}
-      refreshControl={() => {}}
-    />
-  );
-  findTestSubject(component, 'inputControlSubmitBtn').simulate('click');
-  sinon.assert.calledOnce(submitFilters);
-  sinon.assert.notCalled(clearControls);
-  sinon.assert.notCalled(resetControls);
-  sinon.assert.notCalled(stageFilter);
-});
-
-test('resetControls', () => {
-  const component = mountWithIntl(
-    <InputControlVis
-      stageFilter={stageFilter}
-      submitFilters={submitFilters}
-      resetControls={resetControls}
-      clearControls={clearControls}
-      controls={[mockListControl]}
-      updateFiltersOnChange={updateFiltersOnChange}
-      hasChanges={() => {
-        return true;
-      }}
-      hasValues={() => {
-        return true;
-      }}
-      refreshControl={() => {}}
-    />
-  );
-  findTestSubject(component, 'inputControlCancelBtn').simulate('click');
-  sinon.assert.calledOnce(resetControls);
-  sinon.assert.notCalled(clearControls);
-  sinon.assert.notCalled(submitFilters);
-  sinon.assert.notCalled(stageFilter);
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.test.tsx b/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.test.tsx
new file mode 100644
index 0000000000000..1712f024f5b7b
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.test.tsx
@@ -0,0 +1,237 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 sinon from 'sinon';
+import { shallow } from 'enzyme';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+// @ts-ignore
+import { findTestSubject } from '@elastic/eui/lib/test';
+
+import { InputControlVis } from './input_control_vis';
+import { ListControl } from '../../control/list_control_factory';
+import { RangeControl } from '../../control/range_control_factory';
+
+jest.mock('ui/new_platform');
+
+const mockListControl: ListControl = {
+  id: 'mock-list-control',
+  isEnabled: () => {
+    return true;
+  },
+  options: {
+    type: 'terms',
+    multiselect: true,
+  },
+  type: 'list',
+  label: 'list control',
+  value: [],
+  selectOptions: ['choice1', 'choice2'],
+  format: (value: any) => value,
+} as ListControl;
+const mockRangeControl: RangeControl = {
+  id: 'mock-range-control',
+  isEnabled: () => {
+    return true;
+  },
+  options: {
+    decimalPlaces: 0,
+    step: 1,
+  },
+  type: 'range',
+  label: 'range control',
+  value: { min: 0, max: 0 },
+  min: 0,
+  max: 100,
+  format: (value: any) => value,
+} as RangeControl;
+const updateFiltersOnChange = false;
+
+const refreshControlMock = () => Promise.resolve();
+
+let stageFilter: sinon.SinonSpy;
+let submitFilters: sinon.SinonSpy;
+let resetControls: sinon.SinonSpy;
+let clearControls: sinon.SinonSpy;
+
+beforeEach(() => {
+  stageFilter = sinon.spy();
+  submitFilters = sinon.spy();
+  resetControls = sinon.spy();
+  clearControls = sinon.spy();
+});
+
+test('Renders list control', () => {
+  const component = shallow(
+    <InputControlVis
+      stageFilter={stageFilter}
+      submitFilters={submitFilters}
+      resetControls={resetControls}
+      clearControls={clearControls}
+      controls={[mockListControl]}
+      updateFiltersOnChange={updateFiltersOnChange}
+      hasChanges={() => {
+        return false;
+      }}
+      hasValues={() => {
+        return false;
+      }}
+      refreshControl={refreshControlMock}
+    />
+  );
+  expect(component).toMatchSnapshot(); // eslint-disable-line
+});
+
+test('Renders range control', () => {
+  const component = shallow(
+    <InputControlVis
+      stageFilter={stageFilter}
+      submitFilters={submitFilters}
+      resetControls={resetControls}
+      clearControls={clearControls}
+      controls={[mockRangeControl]}
+      updateFiltersOnChange={updateFiltersOnChange}
+      hasChanges={() => {
+        return false;
+      }}
+      hasValues={() => {
+        return false;
+      }}
+      refreshControl={refreshControlMock}
+    />
+  );
+  expect(component).toMatchSnapshot(); // eslint-disable-line
+});
+
+test('Apply and Cancel change btns enabled when there are changes', () => {
+  const component = shallow(
+    <InputControlVis
+      stageFilter={stageFilter}
+      submitFilters={submitFilters}
+      resetControls={resetControls}
+      clearControls={clearControls}
+      controls={[mockListControl]}
+      updateFiltersOnChange={updateFiltersOnChange}
+      hasChanges={() => {
+        return true;
+      }}
+      hasValues={() => {
+        return false;
+      }}
+      refreshControl={refreshControlMock}
+    />
+  );
+  expect(component).toMatchSnapshot(); // eslint-disable-line
+});
+
+test('Clear btns enabled when there are values', () => {
+  const component = shallow(
+    <InputControlVis
+      stageFilter={stageFilter}
+      submitFilters={submitFilters}
+      resetControls={resetControls}
+      clearControls={clearControls}
+      controls={[mockListControl]}
+      updateFiltersOnChange={updateFiltersOnChange}
+      hasChanges={() => {
+        return false;
+      }}
+      hasValues={() => {
+        return true;
+      }}
+      refreshControl={refreshControlMock}
+    />
+  );
+  expect(component).toMatchSnapshot(); // eslint-disable-line
+});
+
+test('clearControls', () => {
+  const component = mountWithIntl(
+    <InputControlVis
+      stageFilter={stageFilter}
+      submitFilters={submitFilters}
+      resetControls={resetControls}
+      clearControls={clearControls}
+      controls={[mockListControl]}
+      updateFiltersOnChange={updateFiltersOnChange}
+      hasChanges={() => {
+        return true;
+      }}
+      hasValues={() => {
+        return true;
+      }}
+      refreshControl={refreshControlMock}
+    />
+  );
+  findTestSubject(component, 'inputControlClearBtn').simulate('click');
+  sinon.assert.calledOnce(clearControls);
+  sinon.assert.notCalled(submitFilters);
+  sinon.assert.notCalled(resetControls);
+  sinon.assert.notCalled(stageFilter);
+});
+
+test('submitFilters', () => {
+  const component = mountWithIntl(
+    <InputControlVis
+      stageFilter={stageFilter}
+      submitFilters={submitFilters}
+      resetControls={resetControls}
+      clearControls={clearControls}
+      controls={[mockListControl]}
+      updateFiltersOnChange={updateFiltersOnChange}
+      hasChanges={() => {
+        return true;
+      }}
+      hasValues={() => {
+        return true;
+      }}
+      refreshControl={refreshControlMock}
+    />
+  );
+  findTestSubject(component, 'inputControlSubmitBtn').simulate('click');
+  sinon.assert.calledOnce(submitFilters);
+  sinon.assert.notCalled(clearControls);
+  sinon.assert.notCalled(resetControls);
+  sinon.assert.notCalled(stageFilter);
+});
+
+test('resetControls', () => {
+  const component = mountWithIntl(
+    <InputControlVis
+      stageFilter={stageFilter}
+      submitFilters={submitFilters}
+      resetControls={resetControls}
+      clearControls={clearControls}
+      controls={[mockListControl]}
+      updateFiltersOnChange={updateFiltersOnChange}
+      hasChanges={() => {
+        return true;
+      }}
+      hasValues={() => {
+        return true;
+      }}
+      refreshControl={refreshControlMock}
+    />
+  );
+  findTestSubject(component, 'inputControlCancelBtn').simulate('click');
+  sinon.assert.calledOnce(resetControls);
+  sinon.assert.notCalled(clearControls);
+  sinon.assert.notCalled(submitFilters);
+  sinon.assert.notCalled(stageFilter);
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.tsx b/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.tsx
new file mode 100644
index 0000000000000..e2497287f35d0
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/input_control_vis.tsx
@@ -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 React, { Component } from 'react';
+import { EuiButton, EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { CONTROL_TYPES } from '../../editor_utils';
+import { ListControl } from '../../control/list_control_factory';
+import { RangeControl } from '../../control/range_control_factory';
+import { ListControl as ListControlComponent } from '../vis/list_control';
+import { RangeControl as RangeControlComponent } from '../vis/range_control';
+
+function isListControl(control: RangeControl | ListControl): control is ListControl {
+  return control.type === CONTROL_TYPES.LIST;
+}
+
+function isRangeControl(control: RangeControl | ListControl): control is RangeControl {
+  return control.type === CONTROL_TYPES.RANGE;
+}
+
+interface InputControlVisProps {
+  stageFilter: (controlIndex: number, newValue: any) => void;
+  submitFilters: () => void;
+  resetControls: () => void;
+  clearControls: () => void;
+  controls: Array<RangeControl | ListControl>;
+  updateFiltersOnChange?: boolean;
+  hasChanges: () => boolean;
+  hasValues: () => boolean;
+  refreshControl: (controlIndex: number, query: any) => Promise<void>;
+}
+
+export class InputControlVis extends Component<InputControlVisProps> {
+  constructor(props: InputControlVisProps) {
+    super(props);
+
+    this.handleSubmit = this.handleSubmit.bind(this);
+    this.handleReset = this.handleReset.bind(this);
+    this.handleClearAll = this.handleClearAll.bind(this);
+  }
+
+  handleSubmit() {
+    this.props.submitFilters();
+  }
+
+  handleReset() {
+    this.props.resetControls();
+  }
+
+  handleClearAll() {
+    this.props.clearControls();
+  }
+
+  renderControls() {
+    return this.props.controls.map((control, index) => {
+      let controlComponent = null;
+
+      if (isListControl(control)) {
+        controlComponent = (
+          <ListControlComponent
+            id={control.id}
+            label={control.label}
+            options={control.selectOptions}
+            selectedOptions={control.value}
+            formatOptionLabel={control.format}
+            disableMsg={control.isEnabled() ? undefined : control.disabledReason}
+            multiselect={control.options.multiselect}
+            partialResults={control.partialResults}
+            dynamicOptions={control.options.dynamicOptions}
+            controlIndex={index}
+            stageFilter={this.props.stageFilter}
+            fetchOptions={query => {
+              this.props.refreshControl(index, query);
+            }}
+          />
+        );
+      } else if (isRangeControl(control)) {
+        controlComponent = (
+          <RangeControlComponent
+            control={control}
+            controlIndex={index}
+            stageFilter={this.props.stageFilter}
+          />
+        );
+      } else {
+        throw new Error(`Unhandled control type ${control!.type}`);
+      }
+
+      return (
+        <EuiFlexItem
+          key={control.id}
+          style={{ minWidth: '250px' }}
+          data-test-subj="inputControlItem"
+        >
+          {controlComponent}
+        </EuiFlexItem>
+      );
+    });
+  }
+
+  renderStagingButtons() {
+    return (
+      <EuiFlexGroup wrap={true}>
+        <EuiFlexItem grow={false}>
+          <EuiButton
+            fill
+            onClick={this.handleSubmit}
+            disabled={!this.props.hasChanges()}
+            data-test-subj="inputControlSubmitBtn"
+          >
+            <FormattedMessage
+              id="inputControl.vis.inputControlVis.applyChangesButtonLabel"
+              defaultMessage="Apply changes"
+            />
+          </EuiButton>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButtonEmpty
+            onClick={this.handleReset}
+            disabled={!this.props.hasChanges()}
+            data-test-subj="inputControlCancelBtn"
+          >
+            <FormattedMessage
+              id="inputControl.vis.inputControlVis.cancelChangesButtonLabel"
+              defaultMessage="Cancel changes"
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButtonEmpty
+            onClick={this.handleClearAll}
+            disabled={!this.props.hasValues()}
+            data-test-subj="inputControlClearBtn"
+          >
+            <FormattedMessage
+              id="inputControl.vis.inputControlVis.clearFormButtonLabel"
+              defaultMessage="Clear form"
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    );
+  }
+
+  render() {
+    let stagingButtons;
+    if (this.props.controls.length > 0 && !this.props.updateFiltersOnChange) {
+      stagingButtons = this.renderStagingButtons();
+    }
+
+    return (
+      <div className="icvContainer">
+        <EuiFlexGroup wrap>{this.renderControls()}</EuiFlexGroup>
+        {stagingButtons}
+      </div>
+    );
+  }
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.js b/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.js
deleted file mode 100644
index 7e92545e817e0..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.js
+++ /dev/null
@@ -1,169 +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 PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import _ from 'lodash';
-import { FormRow } from './form_row';
-import { injectI18n } from '@kbn/i18n/react';
-
-import { EuiFieldText, EuiComboBox } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-
-class ListControlUi extends Component {
-  state = {
-    isLoading: false,
-  };
-
-  componentDidMount = () => {
-    this._isMounted = true;
-  };
-
-  componentWillUnmount = () => {
-    this._isMounted = false;
-  };
-
-  handleOnChange = selectedOptions => {
-    const selectedValues = selectedOptions.map(({ value }) => {
-      return value;
-    });
-    this.props.stageFilter(this.props.controlIndex, selectedValues);
-  };
-
-  debouncedFetch = _.debounce(async searchValue => {
-    await this.props.fetchOptions(searchValue);
-
-    if (this._isMounted) {
-      this.setState({
-        isLoading: false,
-      });
-    }
-  }, 300);
-
-  onSearchChange = searchValue => {
-    this.setState(
-      {
-        isLoading: true,
-      },
-      this.debouncedFetch.bind(null, searchValue)
-    );
-  };
-
-  renderControl() {
-    const { intl } = this.props;
-
-    if (this.props.disableMsg) {
-      return (
-        <EuiFieldText
-          placeholder={intl.formatMessage({
-            id: 'inputControl.vis.listControl.selectTextPlaceholder',
-            defaultMessage: 'Select...',
-          })}
-          disabled={true}
-        />
-      );
-    }
-
-    const options = this.props.options
-      .map(option => {
-        return {
-          label: this.props.formatOptionLabel(option).toString(),
-          value: option,
-          ['data-test-subj']: `option_${option.toString().replace(' ', '_')}`,
-        };
-      })
-      .sort((a, b) => {
-        return a.label.toLowerCase().localeCompare(b.label.toLowerCase());
-      });
-
-    const selectedOptions = this.props.selectedOptions.map(selectedOption => {
-      return {
-        label: this.props.formatOptionLabel(selectedOption).toString(),
-        value: selectedOption,
-      };
-    });
-
-    return (
-      <EuiComboBox
-        placeholder={intl.formatMessage({
-          id: 'inputControl.vis.listControl.selectPlaceholder',
-          defaultMessage: 'Select...',
-        })}
-        options={options}
-        isLoading={this.state.isLoading}
-        async={this.props.dynamicOptions}
-        onSearchChange={this.props.dynamicOptions ? this.onSearchChange : undefined}
-        selectedOptions={selectedOptions}
-        onChange={this.handleOnChange}
-        singleSelection={!this.props.multiselect}
-        data-test-subj={`listControlSelect${this.props.controlIndex}`}
-      />
-    );
-  }
-
-  render() {
-    const partialResultsWarningMessage = i18n.translate(
-      'inputControl.vis.listControl.partialResultsWarningMessage',
-      {
-        defaultMessage:
-          'Terms list might be incomplete because the request is taking too long. ' +
-          'Adjust the autocomplete settings in kibana.yml for complete results.',
-      }
-    );
-
-    return (
-      <FormRow
-        id={this.props.id}
-        label={this.props.label}
-        warningMsg={this.props.partialResults ? partialResultsWarningMessage : undefined}
-        controlIndex={this.props.controlIndex}
-        disableMsg={this.props.disableMsg}
-      >
-        {this.renderControl()}
-      </FormRow>
-    );
-  }
-}
-
-ListControlUi.propTypes = {
-  id: PropTypes.string.isRequired,
-  label: PropTypes.string.isRequired,
-  selectedOptions: PropTypes.array.isRequired,
-  options: PropTypes.array,
-  formatOptionLabel: PropTypes.func.isRequired,
-  disableMsg: PropTypes.string,
-  multiselect: PropTypes.bool,
-  dynamicOptions: PropTypes.bool,
-  partialResults: PropTypes.bool,
-  controlIndex: PropTypes.number.isRequired,
-  stageFilter: PropTypes.func.isRequired,
-  fetchOptions: PropTypes.func,
-};
-
-ListControlUi.defaultProps = {
-  dynamicOptions: false,
-  multiselect: true,
-};
-
-ListControlUi.defaultProps = {
-  selectedOptions: [],
-  options: [],
-};
-
-export const ListControl = injectI18n(ListControlUi);
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.test.js b/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.test.js
deleted file mode 100644
index 8d3ea21ecd807..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.test.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 React from 'react';
-import sinon from 'sinon';
-import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-
-import { ListControl } from './list_control';
-
-const options = ['choice1', 'choice2'];
-
-const formatOptionLabel = value => {
-  return `${value} + formatting`;
-};
-
-let stageFilter;
-
-beforeEach(() => {
-  stageFilter = sinon.spy();
-});
-
-test('renders ListControl', () => {
-  const component = shallowWithIntl(
-    <ListControl.WrappedComponent
-      id="mock-list-control"
-      label="list control"
-      options={options}
-      selectedOptions={[]}
-      multiselect={true}
-      controlIndex={0}
-      stageFilter={stageFilter}
-      formatOptionLabel={formatOptionLabel}
-    />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-});
-
-test('disableMsg', () => {
-  const component = shallowWithIntl(
-    <ListControl.WrappedComponent
-      id="mock-list-control"
-      label="list control"
-      multiselect={true}
-      controlIndex={0}
-      stageFilter={stageFilter}
-      formatOptionLabel={formatOptionLabel}
-      disableMsg={'control is disabled to test rendering when disabled'}
-    />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.test.tsx b/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.test.tsx
new file mode 100644
index 0000000000000..79fe2e376863a
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.test.tsx
@@ -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 React from 'react';
+import sinon from 'sinon';
+import { shallowWithIntl } from 'test_utils/enzyme_helpers';
+
+import { ListControl } from './list_control';
+
+const options = ['choice1', 'choice2'];
+
+const formatOptionLabel = (value: any) => {
+  return `${value} + formatting`;
+};
+
+let stageFilter: sinon.SinonSpy;
+
+beforeEach(() => {
+  stageFilter = sinon.spy();
+});
+
+test('renders ListControl', () => {
+  const component = shallowWithIntl(
+    <ListControl.WrappedComponent
+      id="mock-list-control"
+      label="list control"
+      options={options}
+      selectedOptions={[]}
+      multiselect={true}
+      controlIndex={0}
+      stageFilter={stageFilter}
+      formatOptionLabel={formatOptionLabel}
+      intl={{} as any}
+    />
+  );
+  expect(component).toMatchSnapshot(); // eslint-disable-line
+});
+
+test('disableMsg', () => {
+  const component = shallowWithIntl(
+    <ListControl.WrappedComponent
+      id="mock-list-control"
+      label="list control"
+      selectedOptions={[]}
+      multiselect={true}
+      controlIndex={0}
+      stageFilter={stageFilter}
+      formatOptionLabel={formatOptionLabel}
+      disableMsg={'control is disabled to test rendering when disabled'}
+      intl={{} as any}
+    />
+  );
+  expect(component).toMatchSnapshot(); // eslint-disable-line
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.tsx b/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.tsx
new file mode 100644
index 0000000000000..d62adfdce56b4
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/list_control.tsx
@@ -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 React, { PureComponent } from 'react';
+import _ from 'lodash';
+import { injectI18n } from '@kbn/i18n/react';
+import { InjectedIntlProps } from 'react-intl';
+
+import { EuiFieldText, EuiComboBox } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormRow } from './form_row';
+
+interface ListControlUiState {
+  isLoading: boolean;
+}
+
+export type ListControlUiProps = InjectedIntlProps & {
+  id: string;
+  label: string;
+  selectedOptions: any[];
+  options?: any[];
+  formatOptionLabel: (option: any) => any;
+  disableMsg?: string;
+  multiselect?: boolean;
+  dynamicOptions?: boolean;
+  partialResults?: boolean;
+  controlIndex: number;
+  stageFilter: (controlIndex: number, value: any) => void;
+  fetchOptions?: (searchValue: string) => void;
+};
+
+class ListControlUi extends PureComponent<ListControlUiProps, ListControlUiState> {
+  static defaultProps = {
+    dynamicOptions: false,
+    multiselect: true,
+    selectedOptions: [],
+    options: [],
+  };
+
+  private isMounted: boolean = false;
+
+  state = {
+    isLoading: false,
+  };
+
+  componentDidMount = () => {
+    this.isMounted = true;
+  };
+
+  componentWillUnmount = () => {
+    this.isMounted = false;
+  };
+
+  handleOnChange = (selectedOptions: any[]) => {
+    const selectedValues = selectedOptions.map(({ value }) => {
+      return value;
+    });
+    this.props.stageFilter(this.props.controlIndex, selectedValues);
+  };
+
+  debouncedFetch = _.debounce(async (searchValue: string) => {
+    if (this.props.fetchOptions) {
+      await this.props.fetchOptions(searchValue);
+    }
+
+    if (this.isMounted) {
+      this.setState({
+        isLoading: false,
+      });
+    }
+  }, 300);
+
+  onSearchChange = (searchValue: string) => {
+    this.setState(
+      {
+        isLoading: true,
+      },
+      this.debouncedFetch.bind(null, searchValue)
+    );
+  };
+
+  renderControl() {
+    const { intl } = this.props;
+
+    if (this.props.disableMsg) {
+      return (
+        <EuiFieldText
+          placeholder={intl.formatMessage({
+            id: 'inputControl.vis.listControl.selectTextPlaceholder',
+            defaultMessage: 'Select...',
+          })}
+          disabled={true}
+        />
+      );
+    }
+
+    const options = this.props.options
+      ?.map(option => {
+        return {
+          label: this.props.formatOptionLabel(option).toString(),
+          value: option,
+          ['data-test-subj']: `option_${option.toString().replace(' ', '_')}`,
+        };
+      })
+      .sort((a, b) => {
+        return a.label.toLowerCase().localeCompare(b.label.toLowerCase());
+      });
+
+    const selectedOptions = this.props.selectedOptions.map(selectedOption => {
+      return {
+        label: this.props.formatOptionLabel(selectedOption).toString(),
+        value: selectedOption,
+      };
+    });
+
+    return (
+      <EuiComboBox
+        placeholder={intl.formatMessage({
+          id: 'inputControl.vis.listControl.selectPlaceholder',
+          defaultMessage: 'Select...',
+        })}
+        options={options}
+        isLoading={this.state.isLoading}
+        async={this.props.dynamicOptions}
+        onSearchChange={this.props.dynamicOptions ? this.onSearchChange : undefined}
+        selectedOptions={selectedOptions}
+        onChange={this.handleOnChange}
+        singleSelection={!this.props.multiselect}
+        data-test-subj={`listControlSelect${this.props.controlIndex}`}
+      />
+    );
+  }
+
+  render() {
+    const partialResultsWarningMessage = i18n.translate(
+      'inputControl.vis.listControl.partialResultsWarningMessage',
+      {
+        defaultMessage:
+          'Terms list might be incomplete because the request is taking too long. ' +
+          'Adjust the autocomplete settings in kibana.yml for complete results.',
+      }
+    );
+
+    return (
+      <FormRow
+        id={this.props.id}
+        label={this.props.label}
+        warningMsg={this.props.partialResults ? partialResultsWarningMessage : undefined}
+        controlIndex={this.props.controlIndex}
+        disableMsg={this.props.disableMsg}
+      >
+        {this.renderControl()}
+      </FormRow>
+    );
+  }
+}
+
+export const ListControl = injectI18n(ListControlUi);
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.js b/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.js
deleted file mode 100644
index ee3e3c8fe4788..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { FormRow } from './form_row';
-import { ValidatedDualRange } from 'ui/validated_range';
-
-function roundWithPrecision(value, decimalPlaces, roundFunction) {
-  if (decimalPlaces <= 0) {
-    return roundFunction(value);
-  }
-
-  let results = value;
-  results = results * Math.pow(10, decimalPlaces);
-  results = roundFunction(results);
-  results = results / Math.pow(10, decimalPlaces);
-  return results;
-}
-
-export function ceilWithPrecision(value, decimalPlaces) {
-  return roundWithPrecision(value, decimalPlaces, Math.ceil);
-}
-
-export function floorWithPrecision(value, decimalPlaces) {
-  return roundWithPrecision(value, decimalPlaces, Math.floor);
-}
-
-export class RangeControl extends Component {
-  state = {};
-
-  static getDerivedStateFromProps(nextProps, prevState) {
-    const nextValue = nextProps.control.hasValue()
-      ? [nextProps.control.value.min, nextProps.control.value.max]
-      : ['', ''];
-
-    if (nextProps.control.hasValue() && nextProps.control.value.min == null) {
-      nextValue[0] = '';
-    }
-    if (nextProps.control.hasValue() && nextProps.control.value.max == null) {
-      nextValue[1] = '';
-    }
-
-    if (nextValue !== prevState.prevValue) {
-      return {
-        value: nextValue,
-        prevValue: nextValue,
-      };
-    }
-
-    return null;
-  }
-
-  onChangeComplete = _.debounce(value => {
-    const controlValue = {
-      min: value[0],
-      max: value[1],
-    };
-    this.props.stageFilter(this.props.controlIndex, controlValue);
-  }, 200);
-
-  renderControl() {
-    if (!this.props.control.isEnabled()) {
-      return <ValidatedDualRange disabled showInput />;
-    }
-
-    const decimalPlaces = _.get(this.props, 'control.options.decimalPlaces', 0);
-    const min = floorWithPrecision(this.props.control.min, decimalPlaces);
-    const max = ceilWithPrecision(this.props.control.max, decimalPlaces);
-
-    const ticks = [
-      { value: min, label: min },
-      { value: max, label: max },
-    ];
-
-    return (
-      <ValidatedDualRange
-        id={this.props.control.id}
-        min={min}
-        max={max}
-        value={this.state.value}
-        onChange={this.onChangeComplete}
-        showInput
-        showRange
-        showTicks
-        ticks={ticks}
-      />
-    );
-  }
-
-  render() {
-    return (
-      <FormRow
-        id={this.props.control.id}
-        label={this.props.control.label}
-        controlIndex={this.props.controlIndex}
-        disableMsg={this.props.control.isEnabled() ? null : this.props.control.disabledReason}
-      >
-        {this.renderControl()}
-      </FormRow>
-    );
-  }
-}
-
-RangeControl.propTypes = {
-  control: PropTypes.object.isRequired,
-  controlIndex: PropTypes.number.isRequired,
-  stageFilter: PropTypes.func.isRequired,
-};
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.test.js b/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.test.js
deleted file mode 100644
index 8b72def2f2698..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.test.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-
-import { RangeControl, ceilWithPrecision, floorWithPrecision } from './range_control';
-
-const control = {
-  id: 'mock-range-control',
-  isEnabled: () => {
-    return true;
-  },
-  options: {
-    decimalPlaces: 0,
-    step: 1,
-  },
-  type: 'range',
-  label: 'range control',
-  value: { min: 0, max: 0 },
-  min: 0,
-  max: 100,
-  hasValue: () => {
-    return false;
-  },
-};
-
-test('renders RangeControl', () => {
-  const component = shallowWithIntl(
-    <RangeControl control={control} controlIndex={0} stageFilter={() => {}} />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-});
-
-test('disabled', () => {
-  const disabledRangeControl = {
-    id: 'mock-range-control',
-    isEnabled: () => {
-      return false;
-    },
-    options: {
-      decimalPlaces: 0,
-      step: 1,
-    },
-    type: 'range',
-    label: 'range control',
-    disabledReason: 'control is disabled to test rendering when disabled',
-    hasValue: () => {
-      return false;
-    },
-  };
-  const component = shallowWithIntl(
-    <RangeControl control={disabledRangeControl} controlIndex={0} stageFilter={() => {}} />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-});
-
-test('ceilWithPrecision', () => {
-  expect(ceilWithPrecision(999.133, 0)).toBe(1000);
-  expect(ceilWithPrecision(999.133, 2)).toBe(999.14);
-});
-
-test('floorWithPrecision', () => {
-  expect(floorWithPrecision(100.777, 0)).toBe(100);
-  expect(floorWithPrecision(100.777, 2)).toBe(100.77);
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.test.tsx b/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.test.tsx
new file mode 100644
index 0000000000000..639616151a395
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.test.tsx
@@ -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 React from 'react';
+import { shallowWithIntl } from 'test_utils/enzyme_helpers';
+
+import { RangeControl, ceilWithPrecision, floorWithPrecision } from './range_control';
+import { RangeControl as RangeControlClass } from '../../control/range_control_factory';
+
+jest.mock('ui/new_platform');
+
+const control: RangeControlClass = {
+  id: 'mock-range-control',
+  isEnabled: () => {
+    return true;
+  },
+  options: {
+    decimalPlaces: 0,
+    step: 1,
+  },
+  type: 'range',
+  label: 'range control',
+  value: { min: 0, max: 0 },
+  min: 0,
+  max: 100,
+  hasValue: () => {
+    return false;
+  },
+} as RangeControlClass;
+
+test('renders RangeControl', () => {
+  const component = shallowWithIntl(
+    <RangeControl control={control} controlIndex={0} stageFilter={() => {}} />
+  );
+  expect(component).toMatchSnapshot(); // eslint-disable-line
+});
+
+test('disabled', () => {
+  const disabledRangeControl: RangeControlClass = {
+    id: 'mock-range-control',
+    isEnabled: () => {
+      return false;
+    },
+    options: {
+      decimalPlaces: 0,
+      step: 1,
+    },
+    type: 'range',
+    label: 'range control',
+    disabledReason: 'control is disabled to test rendering when disabled',
+    hasValue: () => {
+      return false;
+    },
+  } as RangeControlClass;
+  const component = shallowWithIntl(
+    <RangeControl control={disabledRangeControl} controlIndex={0} stageFilter={() => {}} />
+  );
+  expect(component).toMatchSnapshot(); // eslint-disable-line
+});
+
+test('ceilWithPrecision', () => {
+  expect(ceilWithPrecision(999.133, 0)).toBe(1000);
+  expect(ceilWithPrecision(999.133, 2)).toBe(999.14);
+});
+
+test('floorWithPrecision', () => {
+  expect(floorWithPrecision(100.777, 0)).toBe(100);
+  expect(floorWithPrecision(100.777, 2)).toBe(100.77);
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.tsx b/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.tsx
new file mode 100644
index 0000000000000..cd3982afd9afd
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/range_control.tsx
@@ -0,0 +1,136 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 React, { PureComponent } from 'react';
+
+import { ValidatedDualRange } from '../../legacy_imports';
+import { FormRow } from './form_row';
+import { RangeControl as RangeControlClass } from '../../control/range_control_factory';
+
+function roundWithPrecision(
+  value: number,
+  decimalPlaces: number,
+  roundFunction: (n: number) => number
+) {
+  if (decimalPlaces <= 0) {
+    return roundFunction(value);
+  }
+
+  let results = value;
+  results = results * Math.pow(10, decimalPlaces);
+  results = roundFunction(results);
+  results = results / Math.pow(10, decimalPlaces);
+  return results;
+}
+
+export function ceilWithPrecision(value: number, decimalPlaces: number) {
+  return roundWithPrecision(value, decimalPlaces, Math.ceil);
+}
+
+export function floorWithPrecision(value: number, decimalPlaces: number) {
+  return roundWithPrecision(value, decimalPlaces, Math.floor);
+}
+
+export interface RangeControlState {
+  value?: [string, string];
+  prevValue?: [string, string];
+}
+
+export interface RangeControlProps {
+  control: RangeControlClass;
+  controlIndex: number;
+  stageFilter: (controlIndex: number, value: any) => void;
+}
+
+export class RangeControl extends PureComponent<RangeControlProps, RangeControlState> {
+  state: RangeControlState = {};
+
+  static getDerivedStateFromProps(nextProps: RangeControlProps, prevState: RangeControlState) {
+    const nextValue = nextProps.control.hasValue()
+      ? [nextProps.control.value.min, nextProps.control.value.max]
+      : ['', ''];
+
+    if (nextProps.control.hasValue() && nextProps.control.value.min == null) {
+      nextValue[0] = '';
+    }
+    if (nextProps.control.hasValue() && nextProps.control.value.max == null) {
+      nextValue[1] = '';
+    }
+
+    if (nextValue !== prevState.prevValue) {
+      return {
+        value: nextValue,
+        prevValue: nextValue,
+      };
+    }
+
+    return null;
+  }
+
+  onChangeComplete = _.debounce((value: [string, string]) => {
+    const controlValue = {
+      min: value[0],
+      max: value[1],
+    };
+    this.props.stageFilter(this.props.controlIndex, controlValue);
+  }, 200);
+
+  renderControl() {
+    if (!this.props.control.isEnabled()) {
+      return <ValidatedDualRange disabled showInput />;
+    }
+
+    const decimalPlaces = _.get(this.props, 'control.options.decimalPlaces', 0);
+    const min = floorWithPrecision(this.props.control.min, decimalPlaces);
+    const max = ceilWithPrecision(this.props.control.max, decimalPlaces);
+
+    const ticks = [
+      { value: min, label: min },
+      { value: max, label: max },
+    ];
+
+    return (
+      <ValidatedDualRange
+        id={this.props.control.id}
+        min={min}
+        max={max}
+        value={this.state.value}
+        onChange={this.onChangeComplete}
+        showInput
+        showRange
+        showTicks
+        ticks={ticks}
+      />
+    );
+  }
+
+  render() {
+    return (
+      <FormRow
+        id={this.props.control.id}
+        label={this.props.control.label}
+        controlIndex={this.props.controlIndex}
+        disableMsg={this.props.control.isEnabled() ? undefined : this.props.control.disabledReason}
+      >
+        {this.renderControl()}
+      </FormRow>
+    );
+  }
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/control.js b/src/legacy/core_plugins/input_control_vis/public/control/control.js
deleted file mode 100644
index 4035dc1adefe8..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/control.js
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* eslint-disable no-multi-str*/
-
-import _ from 'lodash';
-import { i18n } from '@kbn/i18n';
-
-export function noValuesDisableMsg(fieldName, indexPatternName) {
-  return i18n.translate('inputControl.control.noValuesDisableTooltip', {
-    defaultMessage:
-      'Filtering occurs on the "{fieldName}" field, which doesn\'t exist on any documents in the "{indexPatternName}" \
-index pattern. Choose a different field or index documents that contain values for this field.',
-    values: { fieldName: fieldName, indexPatternName: indexPatternName },
-  });
-}
-
-export function noIndexPatternMsg(indexPatternId) {
-  return i18n.translate('inputControl.control.noIndexPatternTooltip', {
-    defaultMessage: 'Could not locate index-pattern id: {indexPatternId}.',
-    values: { indexPatternId },
-  });
-}
-
-export class Control {
-  constructor(controlParams, filterManager, useTimeFilter, SearchSource) {
-    this.id = controlParams.id;
-    this.controlParams = controlParams;
-    this.options = controlParams.options;
-    this.type = controlParams.type;
-    this.label = controlParams.label ? controlParams.label : controlParams.fieldName;
-    this.useTimeFilter = useTimeFilter;
-    this.filterManager = filterManager;
-    this.SearchSource = SearchSource;
-
-    // restore state from kibana filter context
-    this.reset();
-    // disable until initialized
-    this.disable(
-      i18n.translate('inputControl.control.notInitializedTooltip', {
-        defaultMessage: 'Control has not been initialized',
-      })
-    );
-  }
-
-  async fetch() {
-    throw new Error('fetch method not defined, subclass are required to implement');
-  }
-
-  destroy() {
-    throw new Error('destroy method not defined, subclass are required to implement');
-  }
-
-  format = value => {
-    const field = this.filterManager.getField();
-    if (field) {
-      return field.format.convert(value);
-    }
-
-    return value;
-  };
-
-  /**
-   *
-   * @param ancestors {array of Controls}
-   */
-  setAncestors(ancestors) {
-    this.ancestors = ancestors;
-  }
-
-  hasAncestors() {
-    return this.ancestors && this.ancestors.length > 0;
-  }
-
-  hasUnsetAncestor() {
-    return this.ancestors.reduce((accumulator, ancestor) => {
-      return accumulator || !ancestor.hasValue();
-    }, false);
-  }
-
-  getAncestorValues() {
-    return this.ancestors.map(ancestor => {
-      return ancestor.value;
-    });
-  }
-
-  getAncestorFilters() {
-    return this.ancestors.map(ancestor => {
-      return ancestor.filterManager.createFilter(ancestor.value);
-    });
-  }
-
-  isEnabled() {
-    return this.enable;
-  }
-
-  disable(reason) {
-    this.enable = false;
-    this.disabledReason = reason;
-  }
-
-  set(newValue) {
-    this.value = newValue;
-    if (this.hasValue()) {
-      this._kbnFilter = this.filterManager.createFilter(this.value);
-    } else {
-      this._kbnFilter = null;
-    }
-  }
-
-  /*
-   * Remove any user changes to value by resetting value to that as provided by Kibana filter pills
-   */
-  reset() {
-    this._kbnFilter = null;
-    this.value = this.filterManager.getValueFromFilterBar();
-  }
-
-  /*
-   * Clear any filter on the field by setting the control value to undefined.
-   */
-  clear() {
-    this.value = undefined;
-  }
-
-  hasChanged() {
-    return !_.isEqual(this.value, this.filterManager.getValueFromFilterBar());
-  }
-
-  hasKbnFilter() {
-    if (this._kbnFilter) {
-      return true;
-    }
-    return false;
-  }
-
-  getKbnFilter() {
-    return this._kbnFilter;
-  }
-
-  hasValue() {
-    return this.value !== undefined;
-  }
-}
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/control.test.js b/src/legacy/core_plugins/input_control_vis/public/control/control.test.js
deleted file mode 100644
index aa9bed44d031d..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/control.test.js
+++ /dev/null
@@ -1,162 +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 { Control } from './control';
-
-function createControlParams(id, label) {
-  return {
-    id: id,
-    options: {},
-    label: label,
-  };
-}
-
-let valueFromFilterBar;
-const mockFilterManager = {
-  getValueFromFilterBar: () => {
-    return valueFromFilterBar;
-  },
-  createFilter: value => {
-    return `mockKbnFilter:${value}`;
-  },
-  getIndexPattern: () => {
-    return 'mockIndexPattern';
-  },
-};
-const mockKbnApi = {};
-
-describe('hasChanged', () => {
-  let control;
-
-  beforeEach(() => {
-    control = new Control(createControlParams(3, 'control'), mockFilterManager, mockKbnApi);
-  });
-
-  afterEach(() => {
-    valueFromFilterBar = undefined;
-  });
-
-  test('should be false if value has not changed', () => {
-    expect(control.hasChanged()).to.be(false);
-  });
-
-  test('should be true if value has been set', () => {
-    control.set('new value');
-    expect(control.hasChanged()).to.be(true);
-  });
-
-  test('should be false if value has been set and control is cleared', () => {
-    control.set('new value');
-    control.clear();
-    expect(control.hasChanged()).to.be(false);
-  });
-});
-
-describe('ancestors', () => {
-  let grandParentControl;
-  let parentControl;
-  let childControl;
-  beforeEach(() => {
-    grandParentControl = new Control(
-      createControlParams(1, 'grandparent control'),
-      mockFilterManager,
-      mockKbnApi
-    );
-    parentControl = new Control(
-      createControlParams(2, 'parent control'),
-      mockFilterManager,
-      mockKbnApi
-    );
-    childControl = new Control(
-      createControlParams(3, 'child control'),
-      mockFilterManager,
-      mockKbnApi
-    );
-  });
-
-  describe('hasUnsetAncestor', () => {
-    test('should be true if parent is not set', function() {
-      grandParentControl.set('myGrandParentValue');
-
-      childControl.setAncestors([parentControl, grandParentControl]);
-      expect(grandParentControl.hasValue()).to.be(true);
-      expect(parentControl.hasValue()).to.be(false);
-      expect(childControl.hasUnsetAncestor()).to.be(true);
-    });
-
-    test('should be true if grand parent is not set', function() {
-      parentControl.set('myParentValue');
-
-      childControl.setAncestors([parentControl, grandParentControl]);
-      expect(grandParentControl.hasValue()).to.be(false);
-      expect(parentControl.hasValue()).to.be(true);
-      expect(childControl.hasUnsetAncestor()).to.be(true);
-    });
-
-    test('should be false if all ancestors are set', function() {
-      grandParentControl.set('myGrandParentValue');
-      parentControl.set('myParentValue');
-
-      childControl.setAncestors([parentControl, grandParentControl]);
-      expect(grandParentControl.hasValue()).to.be(true);
-      expect(parentControl.hasValue()).to.be(true);
-      expect(childControl.hasUnsetAncestor()).to.be(false);
-    });
-  });
-
-  describe('getAncestorValues', () => {
-    let lastAncestorValues;
-    beforeEach(() => {
-      grandParentControl.set('myGrandParentValue');
-      parentControl.set('myParentValue');
-      childControl.setAncestors([parentControl, grandParentControl]);
-      lastAncestorValues = childControl.getAncestorValues();
-    });
-
-    test('should be the same when ancestor values have not changed', function() {
-      const newAncestorValues = childControl.getAncestorValues();
-      expect(newAncestorValues).to.eql(lastAncestorValues);
-    });
-
-    test('should be different when grand parent value changes', function() {
-      grandParentControl.set('new myGrandParentValue');
-      const newAncestorValues = childControl.getAncestorValues();
-      expect(newAncestorValues).to.not.eql(lastAncestorValues);
-    });
-
-    test('should be different when parent value changes', function() {
-      parentControl.set('new myParentValue');
-      const newAncestorValues = childControl.getAncestorValues();
-      expect(newAncestorValues).to.not.eql(lastAncestorValues);
-    });
-  });
-
-  test('should build filters from ancestors', function() {
-    grandParentControl.set('myGrandParentValue');
-    parentControl.set('myParentValue');
-
-    childControl.setAncestors([parentControl, grandParentControl]);
-
-    const ancestorFilters = childControl.getAncestorFilters();
-    expect(ancestorFilters.length).to.be(2);
-    expect(ancestorFilters[0]).to.eql('mockKbnFilter:myParentValue');
-    expect(ancestorFilters[1]).to.eql('mockKbnFilter:myGrandParentValue');
-  });
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/control.test.ts b/src/legacy/core_plugins/input_control_vis/public/control/control.test.ts
new file mode 100644
index 0000000000000..e76b199a0262c
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/control.test.ts
@@ -0,0 +1,181 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { Control } from './control';
+import { ControlParams } from '../editor_utils';
+import { FilterManager as BaseFilterManager } from './filter_manager/filter_manager';
+import { SearchSource } from '../legacy_imports';
+
+function createControlParams(id: string, label: string): ControlParams {
+  return {
+    id,
+    options: {},
+    label,
+  } as ControlParams;
+}
+
+let valueFromFilterBar: any;
+const mockFilterManager: BaseFilterManager = {
+  getValueFromFilterBar: () => {
+    return valueFromFilterBar;
+  },
+  createFilter: (value: any) => {
+    return `mockKbnFilter:${value}` as any;
+  },
+  getIndexPattern: () => {
+    return 'mockIndexPattern';
+  },
+} as any;
+
+class ControlMock extends Control<BaseFilterManager> {
+  fetch() {
+    return Promise.resolve();
+  }
+
+  destroy() {}
+}
+const mockKbnApi: SearchSource = {} as SearchSource;
+
+describe('hasChanged', () => {
+  let control: ControlMock;
+
+  beforeEach(() => {
+    control = new ControlMock(
+      createControlParams('3', 'control'),
+      mockFilterManager,
+      false,
+      mockKbnApi
+    );
+  });
+
+  afterEach(() => {
+    valueFromFilterBar = undefined;
+  });
+
+  test('should be false if value has not changed', () => {
+    expect(control.hasChanged()).to.be(false);
+  });
+
+  test('should be true if value has been set', () => {
+    control.set('new value');
+    expect(control.hasChanged()).to.be(true);
+  });
+
+  test('should be false if value has been set and control is cleared', () => {
+    control.set('new value');
+    control.clear();
+    expect(control.hasChanged()).to.be(false);
+  });
+});
+
+describe('ancestors', () => {
+  let grandParentControl: any;
+  let parentControl: any;
+  let childControl: any;
+  beforeEach(() => {
+    grandParentControl = new ControlMock(
+      createControlParams('1', 'grandparent control'),
+      mockFilterManager,
+      false,
+      mockKbnApi
+    );
+    parentControl = new ControlMock(
+      createControlParams('2', 'parent control'),
+      mockFilterManager,
+      false,
+      mockKbnApi
+    );
+    childControl = new ControlMock(
+      createControlParams('3', 'child control'),
+      mockFilterManager,
+      false,
+      mockKbnApi
+    );
+  });
+
+  describe('hasUnsetAncestor', () => {
+    test('should be true if parent is not set', function() {
+      grandParentControl.set('myGrandParentValue');
+
+      childControl.setAncestors([parentControl, grandParentControl]);
+      expect(grandParentControl.hasValue()).to.be(true);
+      expect(parentControl.hasValue()).to.be(false);
+      expect(childControl.hasUnsetAncestor()).to.be(true);
+    });
+
+    test('should be true if grand parent is not set', function() {
+      parentControl.set('myParentValue');
+
+      childControl.setAncestors([parentControl, grandParentControl]);
+      expect(grandParentControl.hasValue()).to.be(false);
+      expect(parentControl.hasValue()).to.be(true);
+      expect(childControl.hasUnsetAncestor()).to.be(true);
+    });
+
+    test('should be false if all ancestors are set', function() {
+      grandParentControl.set('myGrandParentValue');
+      parentControl.set('myParentValue');
+
+      childControl.setAncestors([parentControl, grandParentControl]);
+      expect(grandParentControl.hasValue()).to.be(true);
+      expect(parentControl.hasValue()).to.be(true);
+      expect(childControl.hasUnsetAncestor()).to.be(false);
+    });
+  });
+
+  describe('getAncestorValues', () => {
+    let lastAncestorValues: any[];
+    beforeEach(() => {
+      grandParentControl.set('myGrandParentValue');
+      parentControl.set('myParentValue');
+      childControl.setAncestors([parentControl, grandParentControl]);
+      lastAncestorValues = childControl.getAncestorValues();
+    });
+
+    test('should be the same when ancestor values have not changed', function() {
+      const newAncestorValues = childControl.getAncestorValues();
+      expect(newAncestorValues).to.eql(lastAncestorValues);
+    });
+
+    test('should be different when grand parent value changes', function() {
+      grandParentControl.set('new myGrandParentValue');
+      const newAncestorValues = childControl.getAncestorValues();
+      expect(newAncestorValues).to.not.eql(lastAncestorValues);
+    });
+
+    test('should be different when parent value changes', function() {
+      parentControl.set('new myParentValue');
+      const newAncestorValues = childControl.getAncestorValues();
+      expect(newAncestorValues).to.not.eql(lastAncestorValues);
+    });
+  });
+
+  test('should build filters from ancestors', function() {
+    grandParentControl.set('myGrandParentValue');
+    parentControl.set('myParentValue');
+
+    childControl.setAncestors([parentControl, grandParentControl]);
+
+    const ancestorFilters = childControl.getAncestorFilters();
+    expect(ancestorFilters.length).to.be(2);
+    expect(ancestorFilters[0]).to.eql('mockKbnFilter:myParentValue');
+    expect(ancestorFilters[1]).to.eql('mockKbnFilter:myGrandParentValue');
+  });
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/control.ts b/src/legacy/core_plugins/input_control_vis/public/control/control.ts
new file mode 100644
index 0000000000000..9dc03ecc23452
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/control.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.
+ */
+
+/* eslint-disable no-multi-str*/
+
+import _ from 'lodash';
+import { i18n } from '@kbn/i18n';
+
+import { esFilters } from '../../../../../plugins/data/public';
+import { SearchSource as SearchSourceClass } from '../legacy_imports';
+import { ControlParams, ControlParamsOptions, CONTROL_TYPES } from '../editor_utils';
+import { RangeFilterManager } from './filter_manager/range_filter_manager';
+import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
+import { FilterManager as BaseFilterManager } from './filter_manager/filter_manager';
+
+export function noValuesDisableMsg(fieldName: string, indexPatternName: string) {
+  return i18n.translate('inputControl.control.noValuesDisableTooltip', {
+    defaultMessage:
+      'Filtering occurs on the "{fieldName}" field, which doesn\'t exist on any documents in the "{indexPatternName}" \
+index pattern. Choose a different field or index documents that contain values for this field.',
+    values: { fieldName, indexPatternName },
+  });
+}
+
+export function noIndexPatternMsg(indexPatternId: string) {
+  return i18n.translate('inputControl.control.noIndexPatternTooltip', {
+    defaultMessage: 'Could not locate index-pattern id: {indexPatternId}.',
+    values: { indexPatternId },
+  });
+}
+
+export abstract class Control<FilterManager extends BaseFilterManager> {
+  private kbnFilter: esFilters.Filter | null = null;
+
+  enable: boolean = false;
+  disabledReason: string = '';
+  value: any;
+
+  id: string;
+  options: ControlParamsOptions;
+  type: CONTROL_TYPES;
+  label: string;
+  ancestors: Array<Control<PhraseFilterManager | RangeFilterManager>> = [];
+
+  constructor(
+    public controlParams: ControlParams,
+    public filterManager: FilterManager,
+    public useTimeFilter: boolean,
+    public SearchSource: SearchSourceClass
+  ) {
+    this.id = controlParams.id;
+    this.controlParams = controlParams;
+    this.options = controlParams.options;
+    this.type = controlParams.type;
+    this.label = controlParams.label ? controlParams.label : controlParams.fieldName;
+
+    // restore state from kibana filter context
+    this.reset();
+    // disable until initialized
+    this.disable(
+      i18n.translate('inputControl.control.notInitializedTooltip', {
+        defaultMessage: 'Control has not been initialized',
+      })
+    );
+  }
+
+  abstract fetch(query: string): Promise<void>;
+
+  abstract destroy(): void;
+
+  format = (value: any) => {
+    const field = this.filterManager.getField();
+    if (field?.format?.convert) {
+      return field.format.convert(value);
+    }
+
+    return value;
+  };
+
+  setAncestors(ancestors: Array<Control<PhraseFilterManager | RangeFilterManager>>) {
+    this.ancestors = ancestors;
+  }
+
+  hasAncestors() {
+    return this.ancestors && this.ancestors.length > 0;
+  }
+
+  hasUnsetAncestor() {
+    return this.ancestors.reduce((accumulator, ancestor) => {
+      return accumulator || !ancestor.hasValue();
+    }, false);
+  }
+
+  getAncestorValues() {
+    return this.ancestors.map(ancestor => {
+      return ancestor.value;
+    });
+  }
+
+  getAncestorFilters() {
+    return this.ancestors.map(ancestor => {
+      return ancestor.filterManager.createFilter(ancestor.value);
+    });
+  }
+
+  isEnabled() {
+    return this.enable;
+  }
+
+  disable(reason: string) {
+    this.enable = false;
+    this.disabledReason = reason;
+  }
+
+  set(newValue: any) {
+    this.value = newValue;
+    if (this.hasValue()) {
+      this.kbnFilter = this.filterManager.createFilter(this.value);
+    } else {
+      this.kbnFilter = null;
+    }
+  }
+
+  /*
+   * Remove any user changes to value by resetting value to that as provided by Kibana filter pills
+   */
+  reset() {
+    this.kbnFilter = null;
+    this.value = this.filterManager.getValueFromFilterBar();
+  }
+
+  /*
+   * Clear any filter on the field by setting the control value to undefined.
+   */
+  clear() {
+    this.value = undefined;
+  }
+
+  hasChanged() {
+    return !_.isEqual(this.value, this.filterManager.getValueFromFilterBar());
+  }
+
+  hasKbnFilter() {
+    if (this.kbnFilter) {
+      return true;
+    }
+    return false;
+  }
+
+  getKbnFilter() {
+    return this.kbnFilter;
+  }
+
+  hasValue(): boolean {
+    return this.value !== undefined;
+  }
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/control_factory.js b/src/legacy/core_plugins/input_control_vis/public/control/control_factory.js
deleted file mode 100644
index 6d3c7756f72aa..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/control_factory.js
+++ /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 { rangeControlFactory } from './range_control_factory';
-import { listControlFactory } from './list_control_factory';
-
-export function controlFactory(controlParams) {
-  let factory = null;
-  switch (controlParams.type) {
-    case 'range':
-      factory = rangeControlFactory;
-      break;
-    case 'list':
-      factory = listControlFactory;
-      break;
-    default:
-      throw new Error(`Unhandled control type ${controlParams.type}`);
-  }
-  return factory;
-}
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/control_factory.ts b/src/legacy/core_plugins/input_control_vis/public/control/control_factory.ts
new file mode 100644
index 0000000000000..3dcc1d53d4211
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/control_factory.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 { rangeControlFactory } from './range_control_factory';
+import { listControlFactory } from './list_control_factory';
+import { ControlParams, CONTROL_TYPES } from '../editor_utils';
+
+export function getControlFactory(controlParams: ControlParams) {
+  let factory = null;
+  switch (controlParams.type) {
+    case CONTROL_TYPES.RANGE:
+      factory = rangeControlFactory;
+      break;
+    case CONTROL_TYPES.LIST:
+      factory = listControlFactory;
+      break;
+    default:
+      throw new Error(`Unhandled control type ${controlParams.type}`);
+  }
+  return factory;
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.js b/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.js
deleted file mode 100644
index 2917dda5e96a7..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.js
+++ /dev/null
@@ -1,43 +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 { timefilter } from 'ui/timefilter';
-
-export function createSearchSource(
-  SearchSource,
-  initialState,
-  indexPattern,
-  aggs,
-  useTimeFilter,
-  filters = []
-) {
-  const searchSource = initialState ? new SearchSource(initialState) : new SearchSource();
-  // Do not not inherit from rootSearchSource to avoid picking up time and globals
-  searchSource.setParent(undefined);
-  searchSource.setField('filter', () => {
-    const activeFilters = [...filters];
-    if (useTimeFilter) {
-      activeFilters.push(timefilter.createFilter(indexPattern));
-    }
-    return activeFilters;
-  });
-  searchSource.setField('size', 0);
-  searchSource.setField('index', indexPattern);
-  searchSource.setField('aggs', aggs);
-  return searchSource;
-}
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.ts b/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.ts
new file mode 100644
index 0000000000000..c8fa5af5e052b
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/create_search_source.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 { esFilters, IndexPattern, TimefilterSetup } from '../../../../../plugins/data/public';
+import { SearchSource as SearchSourceClass, SearchSourceFields } from '../legacy_imports';
+
+export function createSearchSource(
+  SearchSource: SearchSourceClass,
+  initialState: SearchSourceFields | null,
+  indexPattern: IndexPattern,
+  aggs: any,
+  useTimeFilter: boolean,
+  filters: esFilters.PhraseFilter[] = [],
+  timefilter: TimefilterSetup['timefilter']
+) {
+  const searchSource = initialState ? new SearchSource(initialState) : new SearchSource();
+  // Do not not inherit from rootSearchSource to avoid picking up time and globals
+  searchSource.setParent(undefined);
+  searchSource.setField('filter', () => {
+    const activeFilters = [...filters];
+    if (useTimeFilter) {
+      const filter = timefilter.createFilter(indexPattern);
+      if (filter) {
+        activeFilters.push(filter);
+      }
+    }
+    return activeFilters;
+  });
+  searchSource.setField('size', 0);
+  searchSource.setField('index', indexPattern);
+  searchSource.setField('aggs', aggs);
+  return searchSource;
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.js b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.js
deleted file mode 100644
index 672f56746cf80..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.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 _ from 'lodash';
-
-export class FilterManager {
-  constructor(controlId, fieldName, indexPattern, queryFilter) {
-    this.controlId = controlId;
-    this.fieldName = fieldName;
-    this.indexPattern = indexPattern;
-    this.queryFilter = queryFilter;
-  }
-
-  getIndexPattern() {
-    return this.indexPattern;
-  }
-
-  getField() {
-    return this.indexPattern.fields.getByName(this.fieldName);
-  }
-
-  createFilter() {
-    throw new Error('Must implement createFilter.');
-  }
-
-  findFilters() {
-    const kbnFilters = _.flatten([
-      this.queryFilter.getAppFilters(),
-      this.queryFilter.getGlobalFilters(),
-    ]);
-    return kbnFilters.filter(kbnFilter => {
-      return _.get(kbnFilter, 'meta.controlledBy') === this.controlId;
-    });
-  }
-
-  getValueFromFilterBar() {
-    throw new Error('Must implement getValueFromFilterBar.');
-  }
-}
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.test.js b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.test.js
deleted file mode 100644
index 95277ac073d75..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.test.js
+++ /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 expect from '@kbn/expect';
-import { FilterManager } from './filter_manager';
-
-describe('FilterManager', function() {
-  const controlId = 'control1';
-
-  describe('findFilters', function() {
-    const indexPatternMock = {};
-    let kbnFilters;
-    const queryFilterMock = {
-      getAppFilters: () => {
-        return kbnFilters;
-      },
-      getGlobalFilters: () => {
-        return [];
-      },
-    };
-    let filterManager;
-    beforeEach(() => {
-      kbnFilters = [];
-      filterManager = new FilterManager(controlId, 'field1', indexPatternMock, queryFilterMock);
-    });
-
-    test('should not find filters that are not controlled by any visualization', function() {
-      kbnFilters.push({});
-      const foundFilters = filterManager.findFilters();
-      expect(foundFilters.length).to.be(0);
-    });
-
-    test('should not find filters that are controlled by other Visualizations', function() {
-      kbnFilters.push({
-        meta: {
-          controlledBy: 'anotherControl',
-        },
-      });
-      const foundFilters = filterManager.findFilters();
-      expect(foundFilters.length).to.be(0);
-    });
-
-    test('should find filter that is controlled by target Visualization', function() {
-      kbnFilters.push({
-        meta: {
-          controlledBy: controlId,
-        },
-      });
-      const foundFilters = filterManager.findFilters();
-      expect(foundFilters.length).to.be(1);
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
new file mode 100644
index 0000000000000..fd2cbae121b7e
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.test.ts
@@ -0,0 +1,84 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { FilterManager } from './filter_manager';
+import { coreMock } from '../../../../../../core/public/mocks';
+import {
+  esFilters,
+  IndexPattern,
+  FilterManager as QueryFilterManager,
+} from '../../../../../../plugins/data/public';
+
+const setupMock = coreMock.createSetup();
+
+class FilterManagerTest extends FilterManager {
+  createFilter() {
+    return {} as esFilters.Filter;
+  }
+
+  getValueFromFilterBar() {
+    return null;
+  }
+}
+
+describe('FilterManager', function() {
+  const controlId = 'control1';
+
+  describe('findFilters', function() {
+    const indexPatternMock = {} as IndexPattern;
+    let kbnFilters: esFilters.Filter[];
+    const queryFilterMock = new QueryFilterManager(setupMock.uiSettings);
+    queryFilterMock.getAppFilters = () => kbnFilters;
+    queryFilterMock.getGlobalFilters = () => [];
+
+    let filterManager: FilterManagerTest;
+    beforeEach(() => {
+      kbnFilters = [];
+      filterManager = new FilterManagerTest(controlId, 'field1', indexPatternMock, queryFilterMock);
+    });
+
+    test('should not find filters that are not controlled by any visualization', function() {
+      kbnFilters.push({} as esFilters.Filter);
+      const foundFilters = filterManager.findFilters();
+      expect(foundFilters.length).to.be(0);
+    });
+
+    test('should not find filters that are controlled by other Visualizations', function() {
+      kbnFilters.push({
+        meta: {
+          controlledBy: 'anotherControl',
+        },
+      } as esFilters.Filter);
+      const foundFilters = filterManager.findFilters();
+      expect(foundFilters.length).to.be(0);
+    });
+
+    test('should find filter that is controlled by target Visualization', function() {
+      kbnFilters.push({
+        meta: {
+          controlledBy: controlId,
+        },
+      } as esFilters.Filter);
+      const foundFilters = filterManager.findFilters();
+      expect(foundFilters.length).to.be(1);
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.ts b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.ts
new file mode 100644
index 0000000000000..d80a74ed46eae
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/filter_manager.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 _ from 'lodash';
+
+import {
+  FilterManager as QueryFilterManager,
+  IndexPattern,
+  esFilters,
+} from '../../../../../../plugins/data/public';
+
+export abstract class FilterManager {
+  constructor(
+    public controlId: string,
+    public fieldName: string,
+    public indexPattern: IndexPattern,
+    public queryFilter: QueryFilterManager
+  ) {}
+
+  /**
+   * Convert phrases into filter
+   *
+   * @param  {any[]} phrases
+   * @returns PhraseFilter
+   *   single phrase: match query
+   *   multiple phrases: bool query with should containing list of match_phrase queries
+   */
+  abstract createFilter(phrases: any): esFilters.Filter;
+
+  abstract getValueFromFilterBar(): any;
+
+  getIndexPattern(): IndexPattern {
+    return this.indexPattern;
+  }
+
+  getField() {
+    return this.indexPattern.fields.getByName(this.fieldName);
+  }
+
+  findFilters(): esFilters.Filter[] {
+    const kbnFilters = _.flatten([
+      this.queryFilter.getAppFilters(),
+      this.queryFilter.getGlobalFilters(),
+    ]);
+    return kbnFilters.filter(kbnFilter => {
+      return _.get(kbnFilter, 'meta.controlledBy') === this.controlId;
+    });
+  }
+}
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
deleted file mode 100644
index 1e60f8c4ebb67..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js
+++ /dev/null
@@ -1,118 +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 { FilterManager } from './filter_manager.js';
-import { esFilters } from '../../../../../../plugins/data/public';
-
-export class PhraseFilterManager extends FilterManager {
-  constructor(controlId, fieldName, indexPattern, queryFilter) {
-    super(controlId, fieldName, indexPattern, queryFilter);
-  }
-
-  /**
-   * Convert phrases into filter
-   *
-   * @param {array} phrases
-   * @return {object} query filter
-   *   single phrase: match query
-   *   multiple phrases: bool query with should containing list of match_phrase queries
-   */
-  createFilter(phrases) {
-    let newFilter;
-    if (phrases.length === 1) {
-      newFilter = esFilters.buildPhraseFilter(
-        this.indexPattern.fields.getByName(this.fieldName),
-        phrases[0],
-        this.indexPattern
-      );
-    } else {
-      newFilter = esFilters.buildPhrasesFilter(
-        this.indexPattern.fields.getByName(this.fieldName),
-        phrases,
-        this.indexPattern
-      );
-    }
-    newFilter.meta.key = this.fieldName;
-    newFilter.meta.controlledBy = this.controlId;
-    return newFilter;
-  }
-
-  getValueFromFilterBar() {
-    const kbnFilters = this.findFilters();
-    if (kbnFilters.length === 0) {
-      return;
-    }
-
-    const values = kbnFilters
-      .map(kbnFilter => {
-        return this._getValueFromFilter(kbnFilter);
-      })
-      .filter(value => value != null);
-
-    if (values.length === 0) {
-      return;
-    }
-
-    return values.reduce((accumulator, currentValue) => {
-      return accumulator.concat(currentValue);
-    }, []);
-  }
-
-  /**
-   * Extract filtering value from kibana filters
-   *
-   * @param {object} kbnFilter
-   * @return {Array.<string>} array of values pulled from filter
-   */
-  _getValueFromFilter(kbnFilter) {
-    // bool filter - multiple phrase filters
-    if (_.has(kbnFilter, 'query.bool.should')) {
-      return _.get(kbnFilter, 'query.bool.should')
-        .map(kbnFilter => {
-          return this._getValueFromFilter(kbnFilter);
-        })
-        .filter(value => {
-          if (value) {
-            return true;
-          }
-          return false;
-        });
-    }
-
-    // scripted field filter
-    if (_.has(kbnFilter, 'script')) {
-      return _.get(kbnFilter, 'script.script.params.value');
-    }
-
-    // single phrase filter
-    if (esFilters.isPhraseFilter(kbnFilter)) {
-      if (esFilters.getPhraseFilterField(kbnFilter) !== this.fieldName) {
-        return;
-      }
-
-      return esFilters.getPhraseFilterValue(kbnFilter);
-    }
-
-    // single phrase filter from bool filter
-    if (_.has(kbnFilter, ['match_phrase', this.fieldName])) {
-      return _.get(kbnFilter, ['match_phrase', this.fieldName]);
-    }
-  }
-}
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.js b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.js
deleted file mode 100644
index 7aa1ec6632043..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.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 expect from '@kbn/expect';
-import { PhraseFilterManager } from './phrase_filter_manager';
-
-describe('PhraseFilterManager', function() {
-  const controlId = 'control1';
-
-  describe('createFilter', function() {
-    const indexPatternId = '1';
-    const fieldMock = {
-      name: 'field1',
-      format: {
-        convert: val => {
-          return val;
-        },
-      },
-    };
-    const indexPatternMock = {
-      id: indexPatternId,
-      fields: {
-        getByName: name => {
-          const fields = { field1: fieldMock };
-          return fields[name];
-        },
-      },
-    };
-    const queryFilterMock = {};
-    let filterManager;
-    beforeEach(() => {
-      filterManager = new PhraseFilterManager(
-        controlId,
-        'field1',
-        indexPatternMock,
-        queryFilterMock
-      );
-    });
-
-    test('should create match phrase filter from single value', function() {
-      const newFilter = filterManager.createFilter(['ios']);
-      expect(newFilter).to.have.property('meta');
-      expect(newFilter.meta.index).to.be(indexPatternId);
-      expect(newFilter.meta.controlledBy).to.be(controlId);
-      expect(newFilter.meta.key).to.be('field1');
-      expect(newFilter).to.have.property('query');
-      expect(JSON.stringify(newFilter.query, null, '')).to.be('{"match_phrase":{"field1":"ios"}}');
-    });
-
-    test('should create bool filter from multiple values', function() {
-      const newFilter = filterManager.createFilter(['ios', 'win xp']);
-      expect(newFilter).to.have.property('meta');
-      expect(newFilter.meta.index).to.be(indexPatternId);
-      expect(newFilter.meta.controlledBy).to.be(controlId);
-      expect(newFilter.meta.key).to.be('field1');
-      expect(newFilter).to.have.property('query');
-      const query = newFilter.query;
-      expect(query).to.have.property('bool');
-      expect(query.bool.should.length).to.be(2);
-      expect(JSON.stringify(query.bool.should[0], null, '')).to.be(
-        '{"match_phrase":{"field1":"ios"}}'
-      );
-      expect(JSON.stringify(query.bool.should[1], null, '')).to.be(
-        '{"match_phrase":{"field1":"win xp"}}'
-      );
-    });
-  });
-
-  describe('getValueFromFilterBar', function() {
-    const indexPatternMock = {};
-    const queryFilterMock = {};
-    let filterManager;
-    beforeEach(() => {
-      class MockFindFiltersPhraseFilterManager extends PhraseFilterManager {
-        constructor(controlId, fieldName, indexPattern, queryFilter, delimiter) {
-          super(controlId, fieldName, indexPattern, queryFilter, delimiter);
-          this.mockFilters = [];
-        }
-        findFilters() {
-          return this.mockFilters;
-        }
-        setMockFilters(mockFilters) {
-          this.mockFilters = mockFilters;
-        }
-      }
-      filterManager = new MockFindFiltersPhraseFilterManager(
-        controlId,
-        'field1',
-        indexPatternMock,
-        queryFilterMock
-      );
-    });
-
-    test('should extract value from match phrase filter', function() {
-      filterManager.setMockFilters([
-        {
-          query: {
-            match: {
-              field1: {
-                query: 'ios',
-                type: 'phrase',
-              },
-            },
-          },
-        },
-      ]);
-      expect(filterManager.getValueFromFilterBar()).to.eql(['ios']);
-    });
-
-    test('should extract value from multiple filters', function() {
-      filterManager.setMockFilters([
-        {
-          query: {
-            match: {
-              field1: {
-                query: 'ios',
-                type: 'phrase',
-              },
-            },
-          },
-        },
-        {
-          query: {
-            match: {
-              field1: {
-                query: 'win xp',
-                type: 'phrase',
-              },
-            },
-          },
-        },
-      ]);
-      expect(filterManager.getValueFromFilterBar()).to.eql(['ios', 'win xp']);
-    });
-
-    test('should extract value from bool filter', function() {
-      filterManager.setMockFilters([
-        {
-          query: {
-            bool: {
-              should: [
-                {
-                  match_phrase: {
-                    field1: 'ios',
-                  },
-                },
-                {
-                  match_phrase: {
-                    field1: 'win xp',
-                  },
-                },
-              ],
-            },
-          },
-        },
-      ]);
-      expect(filterManager.getValueFromFilterBar()).to.eql(['ios', 'win xp']);
-    });
-
-    test('should return undefined when filter value can not be extracted from Kibana filter', function() {
-      filterManager.setMockFilters([
-        {
-          query: {
-            match: {
-              myFieldWhichIsNotField1: {
-                query: 'ios',
-                type: 'phrase',
-              },
-            },
-          },
-        },
-      ]);
-      expect(filterManager.getValueFromFilterBar()).to.eql(undefined);
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
new file mode 100644
index 0000000000000..dc577ca7168d1
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.test.ts
@@ -0,0 +1,206 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 {
+  esFilters,
+  IndexPattern,
+  FilterManager as QueryFilterManager,
+} from '../../../../../../plugins/data/public';
+import { PhraseFilterManager } from './phrase_filter_manager';
+
+describe('PhraseFilterManager', function() {
+  const controlId = 'control1';
+
+  describe('createFilter', function() {
+    const indexPatternId = '1';
+    const fieldMock = {
+      name: 'field1',
+      format: {
+        convert: (value: any) => value,
+      },
+    };
+    const indexPatternMock: IndexPattern = {
+      id: indexPatternId,
+      fields: {
+        getByName: (name: string) => {
+          const fields: any = { field1: fieldMock };
+          return fields[name];
+        },
+      },
+    } as IndexPattern;
+    const queryFilterMock: QueryFilterManager = {} as QueryFilterManager;
+    let filterManager: PhraseFilterManager;
+    beforeEach(() => {
+      filterManager = new PhraseFilterManager(
+        controlId,
+        'field1',
+        indexPatternMock,
+        queryFilterMock
+      );
+    });
+
+    test('should create match phrase filter from single value', function() {
+      const newFilter = filterManager.createFilter(['ios']);
+      expect(newFilter).to.have.property('meta');
+      expect(newFilter.meta.index).to.be(indexPatternId);
+      expect(newFilter.meta.controlledBy).to.be(controlId);
+      expect(newFilter.meta.key).to.be('field1');
+      expect(newFilter).to.have.property('query');
+      expect(JSON.stringify(newFilter.query, null, '')).to.be('{"match_phrase":{"field1":"ios"}}');
+    });
+
+    test('should create bool filter from multiple values', function() {
+      const newFilter = filterManager.createFilter(['ios', 'win xp']);
+      expect(newFilter).to.have.property('meta');
+      expect(newFilter.meta.index).to.be(indexPatternId);
+      expect(newFilter.meta.controlledBy).to.be(controlId);
+      expect(newFilter.meta.key).to.be('field1');
+      expect(newFilter).to.have.property('query');
+      const query = newFilter.query;
+      expect(query).to.have.property('bool');
+      expect(query.bool.should.length).to.be(2);
+      expect(JSON.stringify(query.bool.should[0], null, '')).to.be(
+        '{"match_phrase":{"field1":"ios"}}'
+      );
+      expect(JSON.stringify(query.bool.should[1], null, '')).to.be(
+        '{"match_phrase":{"field1":"win xp"}}'
+      );
+    });
+  });
+
+  describe('getValueFromFilterBar', function() {
+    class MockFindFiltersPhraseFilterManager extends PhraseFilterManager {
+      mockFilters: esFilters.Filter[];
+
+      constructor(
+        id: string,
+        fieldName: string,
+        indexPattern: IndexPattern,
+        queryFilter: QueryFilterManager
+      ) {
+        super(id, fieldName, indexPattern, queryFilter);
+        this.mockFilters = [];
+      }
+
+      findFilters() {
+        return this.mockFilters;
+      }
+
+      setMockFilters(mockFilters: esFilters.Filter[]) {
+        this.mockFilters = mockFilters;
+      }
+    }
+
+    const indexPatternMock: IndexPattern = {} as IndexPattern;
+    const queryFilterMock: QueryFilterManager = {} as QueryFilterManager;
+    let filterManager: MockFindFiltersPhraseFilterManager;
+    beforeEach(() => {
+      filterManager = new MockFindFiltersPhraseFilterManager(
+        controlId,
+        'field1',
+        indexPatternMock,
+        queryFilterMock
+      );
+    });
+
+    test('should extract value from match phrase filter', function() {
+      filterManager.setMockFilters([
+        {
+          query: {
+            match: {
+              field1: {
+                query: 'ios',
+                type: 'phrase',
+              },
+            },
+          },
+        },
+      ] as esFilters.Filter[]);
+      expect(filterManager.getValueFromFilterBar()).to.eql(['ios']);
+    });
+
+    test('should extract value from multiple filters', function() {
+      filterManager.setMockFilters([
+        {
+          query: {
+            match: {
+              field1: {
+                query: 'ios',
+                type: 'phrase',
+              },
+            },
+          },
+        },
+        {
+          query: {
+            match: {
+              field1: {
+                query: 'win xp',
+                type: 'phrase',
+              },
+            },
+          },
+        },
+      ] as esFilters.Filter[]);
+      expect(filterManager.getValueFromFilterBar()).to.eql(['ios', 'win xp']);
+    });
+
+    test('should extract value from bool filter', function() {
+      filterManager.setMockFilters([
+        {
+          query: {
+            bool: {
+              should: [
+                {
+                  match_phrase: {
+                    field1: 'ios',
+                  },
+                },
+                {
+                  match_phrase: {
+                    field1: 'win xp',
+                  },
+                },
+              ],
+            },
+          },
+        },
+      ] as esFilters.Filter[]);
+      expect(filterManager.getValueFromFilterBar()).to.eql(['ios', 'win xp']);
+    });
+
+    test('should return undefined when filter value can not be extracted from Kibana filter', function() {
+      filterManager.setMockFilters([
+        {
+          query: {
+            match: {
+              myFieldWhichIsNotField1: {
+                query: 'ios',
+                type: 'phrase',
+              },
+            },
+          },
+        },
+      ] as esFilters.Filter[]);
+      expect(filterManager.getValueFromFilterBar()).to.eql(undefined);
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
new file mode 100644
index 0000000000000..b0b46be86f1e8
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.ts
@@ -0,0 +1,119 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { FilterManager } from './filter_manager';
+import {
+  esFilters,
+  IndexPattern,
+  FilterManager as QueryFilterManager,
+} from '../../../../../../plugins/data/public';
+
+export class PhraseFilterManager extends FilterManager {
+  constructor(
+    controlId: string,
+    fieldName: string,
+    indexPattern: IndexPattern,
+    queryFilter: QueryFilterManager
+  ) {
+    super(controlId, fieldName, indexPattern, queryFilter);
+  }
+
+  createFilter(phrases: any): esFilters.PhraseFilter {
+    let newFilter: esFilters.PhraseFilter;
+    const value = this.indexPattern.fields.getByName(this.fieldName);
+
+    if (!value) {
+      throw new Error(`Unable to find field with name: ${this.fieldName} on indexPattern`);
+    }
+
+    if (phrases.length === 1) {
+      newFilter = esFilters.buildPhraseFilter(value, phrases[0], this.indexPattern);
+    } else {
+      newFilter = esFilters.buildPhrasesFilter(value, phrases, this.indexPattern);
+    }
+
+    newFilter.meta.key = this.fieldName;
+    newFilter.meta.controlledBy = this.controlId;
+    return newFilter;
+  }
+
+  getValueFromFilterBar() {
+    const kbnFilters = this.findFilters();
+    if (kbnFilters.length === 0) {
+      return;
+    }
+
+    const values = kbnFilters
+      .map(kbnFilter => {
+        return this.getValueFromFilter(kbnFilter);
+      })
+      .filter(value => value != null);
+
+    if (values.length === 0) {
+      return;
+    }
+
+    return values.reduce((accumulator, currentValue) => {
+      return accumulator.concat(currentValue);
+    }, []);
+  }
+
+  /**
+   * Extract filtering value from kibana filters
+   *
+   * @param  {esFilters.PhraseFilter} kbnFilter
+   * @return {Array.<string>} array of values pulled from filter
+   */
+  private getValueFromFilter(kbnFilter: esFilters.PhraseFilter): any {
+    // bool filter - multiple phrase filters
+    if (_.has(kbnFilter, 'query.bool.should')) {
+      return _.get<esFilters.PhraseFilter[]>(kbnFilter, 'query.bool.should')
+        .map(kbnQueryFilter => {
+          return this.getValueFromFilter(kbnQueryFilter);
+        })
+        .filter(value => {
+          if (value) {
+            return true;
+          }
+          return false;
+        });
+    }
+
+    // scripted field filter
+    if (_.has(kbnFilter, 'script')) {
+      return _.get(kbnFilter, 'script.script.params.value');
+    }
+
+    // single phrase filter
+    if (esFilters.isPhraseFilter(kbnFilter)) {
+      if (esFilters.getPhraseFilterField(kbnFilter) !== this.fieldName) {
+        return;
+      }
+
+      return esFilters.getPhraseFilterValue(kbnFilter);
+    }
+
+    // single phrase filter from bool filter
+    if (_.has(kbnFilter, ['match_phrase', this.fieldName])) {
+      return _.get(kbnFilter, ['match_phrase', this.fieldName]);
+    }
+  }
+}
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
deleted file mode 100644
index 5a2e7b7d779bc..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js
+++ /dev/null
@@ -1,87 +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 { FilterManager } from './filter_manager.js';
-import { esFilters } from '../../../../../../plugins/data/public';
-
-// Convert slider value into ES range filter
-function toRange(sliderValue) {
-  return {
-    gte: sliderValue.min,
-    lte: sliderValue.max,
-  };
-}
-
-// Convert ES range filter into slider value
-function fromRange(range) {
-  const sliderValue = {};
-  if (_.has(range, 'gte')) {
-    sliderValue.min = _.get(range, 'gte');
-  }
-  if (_.has(range, 'gt')) {
-    sliderValue.min = _.get(range, 'gt');
-  }
-  if (_.has(range, 'lte')) {
-    sliderValue.max = _.get(range, 'lte');
-  }
-  if (_.has(range, 'lt')) {
-    sliderValue.max = _.get(range, 'lt');
-  }
-  return sliderValue;
-}
-
-export class RangeFilterManager extends FilterManager {
-  /**
-   * Convert slider value into filter
-   *
-   * @param {object} react-input-range value - POJO with `min` and `max` properties
-   * @return {object} range filter
-   */
-  createFilter(value) {
-    const newFilter = esFilters.buildRangeFilter(
-      this.indexPattern.fields.getByName(this.fieldName),
-      toRange(value),
-      this.indexPattern
-    );
-    newFilter.meta.key = this.fieldName;
-    newFilter.meta.controlledBy = this.controlId;
-    return newFilter;
-  }
-
-  getValueFromFilterBar() {
-    const kbnFilters = this.findFilters();
-    if (kbnFilters.length === 0) {
-      return;
-    }
-
-    let range;
-    if (_.has(kbnFilters[0], 'script')) {
-      range = _.get(kbnFilters[0], 'script.script.params');
-    } else {
-      range = _.get(kbnFilters[0], ['range', this.fieldName]);
-    }
-
-    if (!range) {
-      return;
-    }
-
-    return fromRange(range);
-  }
-}
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.js b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.js
deleted file mode 100644
index ffe2ebdad53bc..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.js
+++ /dev/null
@@ -1,122 +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 { RangeFilterManager } from './range_filter_manager';
-
-describe('RangeFilterManager', function() {
-  const controlId = 'control1';
-
-  describe('createFilter', function() {
-    const indexPatternId = '1';
-    const fieldMock = {
-      name: 'field1',
-    };
-    const indexPatternMock = {
-      id: indexPatternId,
-      fields: {
-        getByName: name => {
-          const fields = {
-            field1: fieldMock,
-          };
-          return fields[name];
-        },
-      },
-    };
-    const queryFilterMock = {};
-    let filterManager;
-    beforeEach(() => {
-      filterManager = new RangeFilterManager(
-        controlId,
-        'field1',
-        indexPatternMock,
-        queryFilterMock
-      );
-    });
-
-    test('should create range filter from slider value', function() {
-      const newFilter = filterManager.createFilter({ min: 1, max: 3 });
-      expect(newFilter).to.have.property('meta');
-      expect(newFilter.meta.index).to.be(indexPatternId);
-      expect(newFilter.meta.controlledBy).to.be(controlId);
-      expect(newFilter.meta.key).to.be('field1');
-      expect(newFilter).to.have.property('range');
-      expect(JSON.stringify(newFilter.range, null, '')).to.be('{"field1":{"gte":1,"lte":3}}');
-    });
-  });
-
-  describe('getValueFromFilterBar', function() {
-    const indexPatternMock = {};
-    const queryFilterMock = {};
-    let filterManager;
-    beforeEach(() => {
-      class MockFindFiltersRangeFilterManager extends RangeFilterManager {
-        constructor(controlId, fieldName, indexPattern, queryFilter) {
-          super(controlId, fieldName, indexPattern, queryFilter);
-          this.mockFilters = [];
-        }
-        findFilters() {
-          return this.mockFilters;
-        }
-        setMockFilters(mockFilters) {
-          this.mockFilters = mockFilters;
-        }
-      }
-      filterManager = new MockFindFiltersRangeFilterManager(
-        controlId,
-        'field1',
-        indexPatternMock,
-        queryFilterMock
-      );
-    });
-
-    test('should extract value from range filter', function() {
-      filterManager.setMockFilters([
-        {
-          range: {
-            field1: {
-              gt: 1,
-              lt: 3,
-            },
-          },
-        },
-      ]);
-      const value = filterManager.getValueFromFilterBar();
-      expect(value).to.be.a('object');
-      expect(value).to.have.property('min');
-      expect(value.min).to.be(1);
-      expect(value).to.have.property('max');
-      expect(value.max).to.be(3);
-    });
-
-    test('should return undefined when filter value can not be extracted from Kibana filter', function() {
-      filterManager.setMockFilters([
-        {
-          range: {
-            myFieldWhichIsNotField1: {
-              gte: 1,
-              lte: 3,
-            },
-          },
-        },
-      ]);
-      expect(filterManager.getValueFromFilterBar()).to.eql(undefined);
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
new file mode 100644
index 0000000000000..f4993a60c5b39
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.test.ts
@@ -0,0 +1,140 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { RangeFilterManager } from './range_filter_manager';
+import {
+  esFilters,
+  IndexPattern,
+  FilterManager as QueryFilterManager,
+} from '../../../../../../plugins/data/public';
+
+describe('RangeFilterManager', function() {
+  const controlId = 'control1';
+
+  describe('createFilter', function() {
+    const indexPatternId = '1';
+    const fieldMock = {
+      name: 'field1',
+    };
+    const indexPatternMock: IndexPattern = {
+      id: indexPatternId,
+      fields: {
+        getByName: (name: any) => {
+          const fields: any = {
+            field1: fieldMock,
+          };
+          return fields[name];
+        },
+      },
+    } as IndexPattern;
+    const queryFilterMock: QueryFilterManager = {} as QueryFilterManager;
+    let filterManager: RangeFilterManager;
+    beforeEach(() => {
+      filterManager = new RangeFilterManager(
+        controlId,
+        'field1',
+        indexPatternMock,
+        queryFilterMock
+      );
+    });
+
+    test('should create range filter from slider value', function() {
+      const newFilter = filterManager.createFilter({ min: 1, max: 3 });
+      expect(newFilter).to.have.property('meta');
+      expect(newFilter.meta.index).to.be(indexPatternId);
+      expect(newFilter.meta.controlledBy).to.be(controlId);
+      expect(newFilter.meta.key).to.be('field1');
+      expect(newFilter).to.have.property('range');
+      expect(JSON.stringify(newFilter.range, null, '')).to.be('{"field1":{"gte":1,"lte":3}}');
+    });
+  });
+
+  describe('getValueFromFilterBar', function() {
+    class MockFindFiltersRangeFilterManager extends RangeFilterManager {
+      mockFilters: esFilters.RangeFilter[];
+
+      constructor(
+        id: string,
+        fieldName: string,
+        indexPattern: IndexPattern,
+        queryFilter: QueryFilterManager
+      ) {
+        super(id, fieldName, indexPattern, queryFilter);
+        this.mockFilters = [];
+      }
+
+      findFilters() {
+        return this.mockFilters;
+      }
+
+      setMockFilters(mockFilters: esFilters.RangeFilter[]) {
+        this.mockFilters = mockFilters;
+      }
+    }
+
+    const indexPatternMock: IndexPattern = {} as IndexPattern;
+    const queryFilterMock: QueryFilterManager = {} as QueryFilterManager;
+    let filterManager: MockFindFiltersRangeFilterManager;
+    beforeEach(() => {
+      filterManager = new MockFindFiltersRangeFilterManager(
+        controlId,
+        'field1',
+        indexPatternMock,
+        queryFilterMock
+      );
+    });
+
+    test('should extract value from range filter', function() {
+      filterManager.setMockFilters([
+        {
+          range: {
+            field1: {
+              gt: 1,
+              lt: 3,
+            },
+          },
+          meta: {} as esFilters.RangeFilterMeta,
+        },
+      ] as esFilters.RangeFilter[]);
+      const value = filterManager.getValueFromFilterBar();
+      expect(value).to.be.a('object');
+      expect(value).to.have.property('min');
+      expect(value?.min).to.be(1);
+      expect(value).to.have.property('max');
+      expect(value?.max).to.be(3);
+    });
+
+    test('should return undefined when filter value can not be extracted from Kibana filter', function() {
+      filterManager.setMockFilters([
+        {
+          range: {
+            myFieldWhichIsNotField1: {
+              gte: 1,
+              lte: 3,
+            },
+          },
+          meta: {} as esFilters.RangeFilterMeta,
+        },
+      ] as esFilters.RangeFilter[]);
+      expect(filterManager.getValueFromFilterBar()).to.eql(undefined);
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts
new file mode 100644
index 0000000000000..0a6819bd68e6f
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.ts
@@ -0,0 +1,94 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { FilterManager } from './filter_manager';
+import { esFilters, IFieldType } from '../../../../../../plugins/data/public';
+
+interface SliderValue {
+  min?: string | number;
+  max?: string | number;
+}
+
+// Convert slider value into ES range filter
+function toRange(sliderValue: SliderValue) {
+  return {
+    gte: sliderValue.min,
+    lte: sliderValue.max,
+  };
+}
+
+// Convert ES range filter into slider value
+function fromRange(range: esFilters.RangeFilterParams): SliderValue {
+  const sliderValue: SliderValue = {};
+  if (_.has(range, 'gte')) {
+    sliderValue.min = _.get(range, 'gte');
+  }
+  if (_.has(range, 'gt')) {
+    sliderValue.min = _.get(range, 'gt');
+  }
+  if (_.has(range, 'lte')) {
+    sliderValue.max = _.get(range, 'lte');
+  }
+  if (_.has(range, 'lt')) {
+    sliderValue.max = _.get(range, 'lt');
+  }
+  return sliderValue;
+}
+
+export class RangeFilterManager extends FilterManager {
+  /**
+   * Convert slider value into filter
+   *
+   * @param {object} react-input-range value - POJO with `min` and `max` properties
+   * @return {object} range filter
+   */
+  createFilter(value: SliderValue): esFilters.RangeFilter {
+    const newFilter = esFilters.buildRangeFilter(
+      // TODO: Fix type to be required
+      this.indexPattern.fields.getByName(this.fieldName) as IFieldType,
+      toRange(value),
+      this.indexPattern
+    );
+    newFilter.meta.key = this.fieldName;
+    newFilter.meta.controlledBy = this.controlId;
+    return newFilter;
+  }
+
+  getValueFromFilterBar(): SliderValue | undefined {
+    const kbnFilters = this.findFilters();
+    if (kbnFilters.length === 0) {
+      return;
+    }
+
+    let range: esFilters.RangeFilterParams;
+    if (_.has(kbnFilters[0], 'script')) {
+      range = _.get(kbnFilters[0], 'script.script.params');
+    } else {
+      range = _.get(kbnFilters[0], ['range', this.fieldName]);
+    }
+
+    if (!range) {
+      return;
+    }
+
+    return fromRange(range);
+  }
+}
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
deleted file mode 100644
index d90b21eead5c6..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js
+++ /dev/null
@@ -1,195 +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 { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
-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';
-
-function getEscapedQuery(query = '') {
-  // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html#_standard_operators
-  return query.replace(/[.?+*|{}[\]()"\\#@&<>~]/g, match => `\\${match}`);
-}
-
-const termsAgg = ({ field, size, direction, query }) => {
-  const terms = {
-    order: {
-      _count: direction,
-    },
-  };
-
-  if (size) {
-    terms.size = size < 1 ? 1 : size;
-  }
-
-  if (field.scripted) {
-    terms.script = {
-      source: field.script,
-      lang: field.lang,
-    };
-    terms.value_type = field.type === 'number' ? 'float' : field.type;
-  } else {
-    terms.field = field.name;
-  }
-
-  if (query) {
-    terms.include = `.*${getEscapedQuery(query)}.*`;
-  }
-
-  return {
-    termsAgg: {
-      terms: terms,
-    },
-  };
-};
-
-class ListControl extends Control {
-  fetch = async query => {
-    // Abort any in-progress fetch
-    if (this.abortController) {
-      this.abortController.abort();
-    }
-    this.abortController = new AbortController();
-
-    const indexPattern = this.filterManager.getIndexPattern();
-    if (!indexPattern) {
-      this.disable(noIndexPatternMsg(this.controlParams.indexPattern));
-      return;
-    }
-
-    let ancestorFilters;
-    if (this.hasAncestors()) {
-      if (this.hasUnsetAncestor()) {
-        this.disable(
-          i18n.translate('inputControl.listControl.disableTooltip', {
-            defaultMessage: "Disabled until '{label}' is set.",
-            values: { label: this.ancestors[0].label },
-          })
-        );
-        this.lastAncestorValues = undefined;
-        return;
-      }
-
-      const ancestorValues = this.getAncestorValues();
-      if (_.isEqual(ancestorValues, this.lastAncestorValues) && _.isEqual(query, this.lastQuery)) {
-        // short circuit to avoid fetching options list for same ancestor values
-        return;
-      }
-      this.lastAncestorValues = ancestorValues;
-      this.lastQuery = query;
-
-      ancestorFilters = this.getAncestorFilters();
-    }
-
-    const fieldName = this.filterManager.fieldName;
-    const initialSearchSourceState = {
-      timeout: `${chrome.getInjected('autocompleteTimeout')}ms`,
-      terminate_after: chrome.getInjected('autocompleteTerminateAfter'),
-    };
-    const aggs = termsAgg({
-      field: indexPattern.fields.getByName(fieldName),
-      size: this.options.dynamicOptions ? null : _.get(this.options, 'size', 5),
-      direction: 'desc',
-      query,
-    });
-    const searchSource = createSearchSource(
-      this.SearchSource,
-      initialSearchSourceState,
-      indexPattern,
-      aggs,
-      this.useTimeFilter,
-      ancestorFilters
-    );
-    const abortSignal = this.abortController.signal;
-
-    this.lastQuery = query;
-    let resp;
-    try {
-      resp = await searchSource.fetch({ abortSignal });
-    } catch (error) {
-      // If the fetch was aborted then no need to surface this error in the UI
-      if (error.name === 'AbortError') return;
-
-      this.disable(
-        i18n.translate('inputControl.listControl.unableToFetchTooltip', {
-          defaultMessage: 'Unable to fetch terms, error: {errorMessage}',
-          values: { errorMessage: error.message },
-        })
-      );
-      return;
-    }
-
-    if (query && this.lastQuery !== query) {
-      // search results returned out of order - ignore results from old query
-      return;
-    }
-
-    const selectOptions = _.get(resp, 'aggregations.termsAgg.buckets', []).map(bucket => {
-      return bucket.key;
-    });
-
-    if (selectOptions.length === 0 && !query) {
-      this.disable(noValuesDisableMsg(fieldName, indexPattern.title));
-      return;
-    }
-
-    this.partialResults = resp.terminated_early || resp.timed_out;
-    this.selectOptions = selectOptions;
-    this.enable = true;
-    this.disabledReason = '';
-  };
-
-  destroy() {
-    if (this.abortController) this.abortController.abort();
-  }
-
-  hasValue() {
-    return typeof this.value !== 'undefined' && this.value.length > 0;
-  }
-}
-
-export async function listControlFactory(controlParams, useTimeFilter, SearchSource) {
-  let indexPattern;
-  try {
-    indexPattern = await npStart.plugins.data.indexPatterns.get(controlParams.indexPattern);
-
-    // dynamic options are only allowed on String fields but the setting defaults to true so it could
-    // be enabled for non-string fields (since UI input is hidden for non-string fields).
-    // If field is not string, then disable dynamic options.
-    const field = indexPattern.fields.find(field => {
-      return field.name === controlParams.fieldName;
-    });
-    if (field && field.type !== 'string') {
-      controlParams.options.dynamicOptions = false;
-    }
-  } 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 ListControl(
-    controlParams,
-    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
deleted file mode 100644
index 3b5ef7372bc1f..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.js
+++ /dev/null
@@ -1,189 +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 { listControlFactory } from './list_control_factory';
-
-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(() => []),
-          },
-        },
-        indexPatterns: {
-          get: () => ({
-            fields: {
-              getByName: name => {
-                const fields = { myField: { name: 'myField' } };
-                return fields[name];
-              },
-            },
-          }),
-        },
-      },
-    },
-  },
-}));
-
-chrome.getInjected.mockImplementation(key => {
-  switch (key) {
-    case 'autocompleteTimeout':
-      return 1000;
-    case 'autocompleteTerminateAfter':
-      return 100000;
-  }
-});
-
-function MockSearchSource() {
-  return {
-    setParent: () => {},
-    setField: () => {},
-    fetch: async () => {
-      return {
-        aggregations: {
-          termsAgg: {
-            buckets: [
-              {
-                key: 'Zurich Airport',
-                doc_count: 691,
-              },
-              {
-                key: 'Xi an Xianyang International Airport',
-                doc_count: 526,
-              },
-            ],
-          },
-        },
-      };
-    },
-  };
-}
-
-describe('hasValue', () => {
-  const controlParams = {
-    id: '1',
-    fieldName: 'myField',
-    options: {},
-  };
-  const useTimeFilter = false;
-
-  let listControl;
-  beforeEach(async () => {
-    listControl = await listControlFactory(controlParams, useTimeFilter, MockSearchSource);
-  });
-
-  test('should be false when control has no value', () => {
-    expect(listControl.hasValue()).toBe(false);
-  });
-
-  test('should be true when control has value', () => {
-    listControl.set([{ value: 'selected option', label: 'selection option' }]);
-    expect(listControl.hasValue()).toBe(true);
-  });
-
-  test('should be true when control has value that is the string "false"', () => {
-    listControl.set([{ value: 'false', label: 'selection option' }]);
-    expect(listControl.hasValue()).toBe(true);
-  });
-});
-
-describe('fetch', () => {
-  const controlParams = {
-    id: '1',
-    fieldName: 'myField',
-    options: {},
-  };
-  const useTimeFilter = false;
-  const SearchSource = jest.fn(MockSearchSource);
-
-  let listControl;
-  beforeEach(async () => {
-    listControl = await listControlFactory(controlParams, useTimeFilter, SearchSource);
-  });
-
-  test('should pass in timeout parameters from injected vars', async () => {
-    await listControl.fetch();
-    expect(SearchSource).toHaveBeenCalledWith({
-      timeout: `1000ms`,
-      terminate_after: 100000,
-    });
-  });
-
-  test('should set selectOptions to results of terms aggregation', async () => {
-    await listControl.fetch();
-    expect(listControl.selectOptions).toEqual([
-      'Zurich Airport',
-      'Xi an Xianyang International Airport',
-    ]);
-  });
-});
-
-describe('fetch with ancestors', () => {
-  const controlParams = {
-    id: '1',
-    fieldName: 'myField',
-    options: {},
-  };
-  const useTimeFilter = false;
-
-  let listControl;
-  let parentControl;
-  beforeEach(async () => {
-    listControl = await listControlFactory(controlParams, useTimeFilter, MockSearchSource);
-
-    const parentControlParams = {
-      id: 'parent',
-      fieldName: 'myField',
-      options: {},
-    };
-    parentControl = await listControlFactory(parentControlParams, useTimeFilter, MockSearchSource);
-    parentControl.clear();
-    listControl.setAncestors([parentControl]);
-  });
-
-  describe('ancestor does not have value', () => {
-    test('should disable control', async () => {
-      await listControl.fetch();
-      expect(listControl.isEnabled()).toBe(false);
-    });
-
-    test('should reset lastAncestorValues', async () => {
-      listControl.lastAncestorValues = 'last ancestor value';
-      await listControl.fetch();
-      expect(listControl.lastAncestorValues).toBeUndefined();
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.ts b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.ts
new file mode 100644
index 0000000000000..2420907727638
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.ts
@@ -0,0 +1,146 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { listControlFactory, ListControl } from './list_control_factory';
+import { ControlParams, CONTROL_TYPES } from '../editor_utils';
+import { getDepsMock } from '../components/editor/__tests__/get_deps_mock';
+import { getSearchSourceMock } from '../components/editor/__tests__/get_search_service_mock';
+
+const MockSearchSource = getSearchSourceMock();
+const deps = getDepsMock();
+
+jest.doMock('./create_search_source.ts', () => ({
+  createSearchSource: MockSearchSource,
+}));
+
+describe('hasValue', () => {
+  const controlParams: ControlParams = {
+    id: '1',
+    fieldName: 'myField',
+    options: {} as any,
+    type: CONTROL_TYPES.LIST,
+    label: 'test',
+    indexPattern: {} as any,
+    parent: 'parent',
+  };
+  const useTimeFilter = false;
+
+  let listControl: ListControl;
+  beforeEach(async () => {
+    listControl = await listControlFactory(controlParams, useTimeFilter, MockSearchSource, deps);
+  });
+
+  test('should be false when control has no value', () => {
+    expect(listControl.hasValue()).toBe(false);
+  });
+
+  test('should be true when control has value', () => {
+    listControl.set([{ value: 'selected option', label: 'selection option' }]);
+    expect(listControl.hasValue()).toBe(true);
+  });
+
+  test('should be true when control has value that is the string "false"', () => {
+    listControl.set([{ value: 'false', label: 'selection option' }]);
+    expect(listControl.hasValue()).toBe(true);
+  });
+});
+
+describe('fetch', () => {
+  const controlParams: ControlParams = {
+    id: '1',
+    fieldName: 'myField',
+    options: {} as any,
+    type: CONTROL_TYPES.LIST,
+    label: 'test',
+    indexPattern: {} as any,
+    parent: 'parent',
+  };
+  const useTimeFilter = false;
+
+  let listControl: ListControl;
+  beforeEach(async () => {
+    listControl = await listControlFactory(controlParams, useTimeFilter, MockSearchSource, deps);
+  });
+
+  test('should pass in timeout parameters from injected vars', async () => {
+    await listControl.fetch();
+    expect(MockSearchSource).toHaveBeenCalledWith({
+      timeout: `1000ms`,
+      terminate_after: 100000,
+    });
+  });
+
+  test('should set selectOptions to results of terms aggregation', async () => {
+    await listControl.fetch();
+    expect(listControl.selectOptions).toEqual([
+      'Zurich Airport',
+      'Xi an Xianyang International Airport',
+    ]);
+  });
+});
+
+describe('fetch with ancestors', () => {
+  const controlParams: ControlParams = {
+    id: '1',
+    fieldName: 'myField',
+    options: {} as any,
+    type: CONTROL_TYPES.LIST,
+    label: 'test',
+    indexPattern: {} as any,
+    parent: 'parent',
+  };
+  const useTimeFilter = false;
+
+  let listControl: ListControl;
+  let parentControl;
+  beforeEach(async () => {
+    listControl = await listControlFactory(controlParams, useTimeFilter, MockSearchSource, deps);
+
+    const parentControlParams: ControlParams = {
+      id: 'parent',
+      fieldName: 'myField',
+      options: {} as any,
+      type: CONTROL_TYPES.LIST,
+      label: 'test',
+      indexPattern: {} as any,
+      parent: 'parent',
+    };
+    parentControl = await listControlFactory(
+      parentControlParams,
+      useTimeFilter,
+      MockSearchSource,
+      deps
+    );
+    parentControl.clear();
+    listControl.setAncestors([parentControl]);
+  });
+
+  describe('ancestor does not have value', () => {
+    test('should disable control', async () => {
+      await listControl.fetch();
+      expect(listControl.isEnabled()).toBe(false);
+    });
+
+    test('should reset lastAncestorValues', async () => {
+      listControl.lastAncestorValues = 'last ancestor value';
+      await listControl.fetch();
+      expect(listControl.lastAncestorValues).toBeUndefined();
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.ts b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.ts
new file mode 100644
index 0000000000000..56b42f295ce15
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.ts
@@ -0,0 +1,232 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { SearchSource as SearchSourceClass, SearchSourceFields } from '../legacy_imports';
+import { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
+import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
+import { createSearchSource } from './create_search_source';
+import { ControlParams } from '../editor_utils';
+import { InputControlVisDependencies } from '../plugin';
+import { IFieldType, TimefilterSetup } from '../../../../../plugins/data/public';
+
+function getEscapedQuery(query = '') {
+  // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html#_standard_operators
+  return query.replace(/[.?+*|{}[\]()"\\#@&<>~]/g, match => `\\${match}`);
+}
+
+interface TermsAggArgs {
+  field?: IFieldType;
+  size: number | null;
+  direction: string;
+  query?: string;
+}
+
+const termsAgg = ({ field, size, direction, query }: TermsAggArgs) => {
+  const terms: any = {
+    order: {
+      _count: direction,
+    },
+  };
+
+  if (size) {
+    terms.size = size < 1 ? 1 : size;
+  }
+
+  if (field?.scripted) {
+    terms.script = {
+      source: field.script,
+      lang: field.lang,
+    };
+    terms.value_type = field.type === 'number' ? 'float' : field.type;
+  } else {
+    terms.field = field?.name;
+  }
+
+  if (query) {
+    terms.include = `.*${getEscapedQuery(query)}.*`;
+  }
+
+  return {
+    termsAgg: {
+      terms,
+    },
+  };
+};
+
+export class ListControl extends Control<PhraseFilterManager> {
+  private getInjectedVar: InputControlVisDependencies['core']['injectedMetadata']['getInjectedVar'];
+  private timefilter: TimefilterSetup['timefilter'];
+
+  abortController?: AbortController;
+  lastAncestorValues: any;
+  lastQuery?: string;
+  partialResults?: boolean;
+  selectOptions?: string[];
+
+  constructor(
+    controlParams: ControlParams,
+    filterManager: PhraseFilterManager,
+    useTimeFilter: boolean,
+    SearchSource: SearchSourceClass,
+    deps: InputControlVisDependencies
+  ) {
+    super(controlParams, filterManager, useTimeFilter, SearchSource);
+    this.getInjectedVar = deps.core.injectedMetadata.getInjectedVar;
+    this.timefilter = deps.data.query.timefilter.timefilter;
+  }
+
+  fetch = async (query?: string) => {
+    // Abort any in-progress fetch
+    if (this.abortController) {
+      this.abortController.abort();
+    }
+    this.abortController = new AbortController();
+
+    const indexPattern = this.filterManager.getIndexPattern();
+    if (!indexPattern) {
+      this.disable(noIndexPatternMsg(this.controlParams.indexPattern));
+      return;
+    }
+
+    let ancestorFilters;
+    if (this.hasAncestors()) {
+      if (this.hasUnsetAncestor()) {
+        this.disable(
+          i18n.translate('inputControl.listControl.disableTooltip', {
+            defaultMessage: "Disabled until '{label}' is set.",
+            values: { label: this.ancestors[0].label },
+          })
+        );
+        this.lastAncestorValues = undefined;
+        return;
+      }
+
+      const ancestorValues = this.getAncestorValues();
+      if (_.isEqual(ancestorValues, this.lastAncestorValues) && _.isEqual(query, this.lastQuery)) {
+        // short circuit to avoid fetching options list for same ancestor values
+        return;
+      }
+      this.lastAncestorValues = ancestorValues;
+      this.lastQuery = query;
+
+      ancestorFilters = this.getAncestorFilters();
+    }
+
+    const fieldName = this.filterManager.fieldName;
+    const initialSearchSourceState: SearchSourceFields = {
+      timeout: `${this.getInjectedVar('autocompleteTimeout')}ms`,
+      terminate_after: Number(this.getInjectedVar('autocompleteTerminateAfter')),
+    };
+    const aggs = termsAgg({
+      field: indexPattern.fields.getByName(fieldName),
+      size: this.options.dynamicOptions ? null : _.get(this.options, 'size', 5),
+      direction: 'desc',
+      query,
+    });
+    const searchSource = createSearchSource(
+      this.SearchSource,
+      initialSearchSourceState,
+      indexPattern,
+      aggs,
+      this.useTimeFilter,
+      ancestorFilters,
+      this.timefilter
+    );
+    const abortSignal = this.abortController.signal;
+
+    this.lastQuery = query;
+    let resp;
+    try {
+      resp = await searchSource.fetch({ abortSignal });
+    } catch (error) {
+      // If the fetch was aborted then no need to surface this error in the UI
+      if (error.name === 'AbortError') return;
+
+      this.disable(
+        i18n.translate('inputControl.listControl.unableToFetchTooltip', {
+          defaultMessage: 'Unable to fetch terms, error: {errorMessage}',
+          values: { errorMessage: error.message },
+        })
+      );
+      return;
+    }
+
+    if (query && this.lastQuery !== query) {
+      // search results returned out of order - ignore results from old query
+      return;
+    }
+
+    const selectOptions = _.get(resp, 'aggregations.termsAgg.buckets', []).map((bucket: any) => {
+      return bucket?.key;
+    });
+
+    if (selectOptions.length === 0 && !query) {
+      this.disable(noValuesDisableMsg(fieldName, indexPattern.title));
+      return;
+    }
+
+    this.partialResults = resp.terminated_early || resp.timed_out;
+    this.selectOptions = selectOptions;
+    this.enable = true;
+    this.disabledReason = '';
+  };
+
+  destroy() {
+    if (this.abortController) this.abortController.abort();
+  }
+
+  hasValue() {
+    return typeof this.value !== 'undefined' && this.value.length > 0;
+  }
+}
+
+export async function listControlFactory(
+  controlParams: ControlParams,
+  useTimeFilter: boolean,
+  SearchSource: SearchSourceClass,
+  deps: InputControlVisDependencies
+) {
+  const [, { data: dataPluginStart }] = await deps.core.getStartServices();
+  const indexPattern = await dataPluginStart.indexPatterns.get(controlParams.indexPattern);
+
+  // dynamic options are only allowed on String fields but the setting defaults to true so it could
+  // be enabled for non-string fields (since UI input is hidden for non-string fields).
+  // If field is not string, then disable dynamic options.
+  const field = indexPattern.fields.find(({ name }) => name === controlParams.fieldName);
+  if (field && field.type !== 'string') {
+    controlParams.options.dynamicOptions = false;
+  }
+
+  const listControl = new ListControl(
+    controlParams,
+    new PhraseFilterManager(
+      controlParams.id,
+      controlParams.fieldName,
+      indexPattern,
+      deps.data.query.filterManager
+    ),
+    useTimeFilter,
+    SearchSource,
+    deps
+  );
+  return listControl;
+}
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
deleted file mode 100644
index c99c794c1fcd5..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js
+++ /dev/null
@@ -1,119 +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 { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
-import { RangeFilterManager } from './filter_manager/range_filter_manager';
-import { createSearchSource } from './create_search_source';
-import { i18n } from '@kbn/i18n';
-import { npStart } from 'ui/new_platform';
-
-const minMaxAgg = field => {
-  const aggBody = {};
-  if (field.scripted) {
-    aggBody.script = {
-      source: field.script,
-      lang: field.lang,
-    };
-  } else {
-    aggBody.field = field.name;
-  }
-  return {
-    maxAgg: {
-      max: aggBody,
-    },
-    minAgg: {
-      min: aggBody,
-    },
-  };
-};
-
-class RangeControl extends Control {
-  async fetch() {
-    // Abort any in-progress fetch
-    if (this.abortController) {
-      this.abortController.abort();
-    }
-    this.abortController = new AbortController();
-    const indexPattern = this.filterManager.getIndexPattern();
-    if (!indexPattern) {
-      this.disable(noIndexPatternMsg(this.controlParams.indexPattern));
-      return;
-    }
-
-    const fieldName = this.filterManager.fieldName;
-
-    const aggs = minMaxAgg(indexPattern.fields.getByName(fieldName));
-    const searchSource = createSearchSource(
-      this.SearchSource,
-      null,
-      indexPattern,
-      aggs,
-      this.useTimeFilter
-    );
-    const abortSignal = this.abortController.signal;
-
-    let resp;
-    try {
-      resp = await searchSource.fetch({ abortSignal });
-    } catch (error) {
-      // If the fetch was aborted then no need to surface this error in the UI
-      if (error.name === 'AbortError') return;
-      this.disable(
-        i18n.translate('inputControl.rangeControl.unableToFetchTooltip', {
-          defaultMessage: 'Unable to fetch range min and max, error: {errorMessage}',
-          values: { errorMessage: error.message },
-        })
-      );
-      return;
-    }
-
-    const min = _.get(resp, 'aggregations.minAgg.value', null);
-    const max = _.get(resp, 'aggregations.maxAgg.value', null);
-
-    if (min === null || max === null) {
-      this.disable(noValuesDisableMsg(fieldName, indexPattern.title));
-      return;
-    }
-
-    this.min = min;
-    this.max = max;
-    this.enable = true;
-  }
-
-  destroy() {
-    if (this.abortController) this.abortController.abort();
-  }
-}
-
-export async function rangeControlFactory(controlParams, useTimeFilter, SearchSource) {
-  let indexPattern;
-  try {
-    indexPattern = await npStart.plugins.data.indexPatterns.get(controlParams.indexPattern);
-  } 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, 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
deleted file mode 100644
index b545c6e2834f3..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { rangeControlFactory } from './range_control_factory';
-
-let esSearchResponse;
-class MockSearchSource {
-  setParent() {}
-  setField() {}
-  async fetch() {
-    return esSearchResponse;
-  }
-}
-
-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(() => []),
-          },
-        },
-        indexPatterns: {
-          get: () => ({
-            fields: {
-              getByName: name => {
-                const fields = { myNumberField: { name: 'myNumberField' } };
-                return fields[name];
-              },
-            },
-          }),
-        },
-      },
-    },
-  },
-}));
-
-describe('fetch', () => {
-  const controlParams = {
-    id: '1',
-    fieldName: 'myNumberField',
-    options: {},
-  };
-  const useTimeFilter = false;
-
-  let rangeControl;
-  beforeEach(async () => {
-    rangeControl = await rangeControlFactory(controlParams, useTimeFilter, MockSearchSource);
-  });
-
-  test('should set min and max from aggregation results', async () => {
-    esSearchResponse = {
-      aggregations: {
-        maxAgg: { value: 100 },
-        minAgg: { value: 10 },
-      },
-    };
-    await rangeControl.fetch();
-
-    expect(rangeControl.isEnabled()).toBe(true);
-    expect(rangeControl.min).toBe(10);
-    expect(rangeControl.max).toBe(100);
-  });
-
-  test('should disable control when there are 0 hits', async () => {
-    // ES response when the query does not match any documents
-    esSearchResponse = {
-      aggregations: {
-        maxAgg: { value: null },
-        minAgg: { value: null },
-      },
-    };
-    await rangeControl.fetch();
-
-    expect(rangeControl.isEnabled()).toBe(false);
-  });
-
-  test('should disable control when response is empty', async () => {
-    // ES response for dashboardonly user who does not have read permissions on index is 200 (which is weird)
-    // and there is not aggregations key
-    esSearchResponse = {};
-    await rangeControl.fetch();
-
-    expect(rangeControl.isEnabled()).toBe(false);
-  });
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.ts b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.ts
new file mode 100644
index 0000000000000..5328aeb6c6a47
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.test.ts
@@ -0,0 +1,92 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { rangeControlFactory } from './range_control_factory';
+import { ControlParams, CONTROL_TYPES } from '../editor_utils';
+import { getSearchSourceMock } from '../components/editor/__tests__/get_search_service_mock';
+import { getDepsMock } from '../components/editor/__tests__/get_deps_mock';
+
+const deps = getDepsMock();
+
+describe('fetch', () => {
+  const controlParams: ControlParams = {
+    id: '1',
+    fieldName: 'myNumberField',
+    options: {},
+    type: CONTROL_TYPES.RANGE,
+    label: 'test',
+    indexPattern: {} as any,
+    parent: {} as any,
+  };
+  const useTimeFilter = false;
+
+  test('should set min and max from aggregation results', async () => {
+    const esSearchResponse = {
+      aggregations: {
+        maxAgg: { value: 100 },
+        minAgg: { value: 10 },
+      },
+    };
+    const rangeControl = await rangeControlFactory(
+      controlParams,
+      useTimeFilter,
+      getSearchSourceMock(esSearchResponse),
+      deps
+    );
+    await rangeControl.fetch();
+
+    expect(rangeControl.isEnabled()).toBe(true);
+    expect(rangeControl.min).toBe(10);
+    expect(rangeControl.max).toBe(100);
+  });
+
+  test('should disable control when there are 0 hits', async () => {
+    // ES response when the query does not match any documents
+    const esSearchResponse = {
+      aggregations: {
+        maxAgg: { value: null },
+        minAgg: { value: null },
+      },
+    };
+    const rangeControl = await rangeControlFactory(
+      controlParams,
+      useTimeFilter,
+      getSearchSourceMock(esSearchResponse),
+      deps
+    );
+    await rangeControl.fetch();
+
+    expect(rangeControl.isEnabled()).toBe(false);
+  });
+
+  test('should disable control when response is empty', async () => {
+    // ES response for dashboardonly user who does not have read permissions on index is 200 (which is weird)
+    // and there is not aggregations key
+    const esSearchResponse = {};
+    const rangeControl = await rangeControlFactory(
+      controlParams,
+      useTimeFilter,
+      getSearchSourceMock(esSearchResponse),
+      deps
+    );
+    await rangeControl.fetch();
+
+    expect(rangeControl.isEnabled()).toBe(false);
+  });
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.ts b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.ts
new file mode 100644
index 0000000000000..b9191436b5968
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.ts
@@ -0,0 +1,150 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+import { i18n } from '@kbn/i18n';
+
+import { SearchSource as SearchSourceClass } from '../legacy_imports';
+import { Control, noValuesDisableMsg, noIndexPatternMsg } from './control';
+import { RangeFilterManager } from './filter_manager/range_filter_manager';
+import { createSearchSource } from './create_search_source';
+import { ControlParams } from '../editor_utils';
+import { InputControlVisDependencies } from '../plugin';
+import { IFieldType, TimefilterSetup } from '../.../../../../../../plugins/data/public';
+
+const minMaxAgg = (field?: IFieldType) => {
+  const aggBody: any = {};
+  if (field) {
+    if (field.scripted) {
+      aggBody.script = {
+        source: field.script,
+        lang: field.lang,
+      };
+    } else {
+      aggBody.field = field.name;
+    }
+  }
+
+  return {
+    maxAgg: {
+      max: aggBody,
+    },
+    minAgg: {
+      min: aggBody,
+    },
+  };
+};
+
+export class RangeControl extends Control<RangeFilterManager> {
+  timefilter: TimefilterSetup['timefilter'];
+  abortController: any;
+  min: any;
+  max: any;
+
+  constructor(
+    controlParams: ControlParams,
+    filterManager: RangeFilterManager,
+    useTimeFilter: boolean,
+    SearchSource: SearchSourceClass,
+    deps: InputControlVisDependencies
+  ) {
+    super(controlParams, filterManager, useTimeFilter, SearchSource);
+    this.timefilter = deps.data.query.timefilter.timefilter;
+  }
+
+  async fetch() {
+    // Abort any in-progress fetch
+    if (this.abortController) {
+      this.abortController.abort();
+    }
+    this.abortController = new AbortController();
+    const indexPattern = this.filterManager.getIndexPattern();
+    if (!indexPattern) {
+      this.disable(noIndexPatternMsg(this.controlParams.indexPattern));
+      return;
+    }
+
+    const fieldName = this.filterManager.fieldName;
+    const aggs = minMaxAgg(indexPattern.fields.getByName(fieldName));
+    const searchSource = createSearchSource(
+      this.SearchSource,
+      null,
+      indexPattern,
+      aggs,
+      this.useTimeFilter,
+      [],
+      this.timefilter
+    );
+    const abortSignal = this.abortController.signal;
+
+    let resp;
+    try {
+      resp = await searchSource.fetch({ abortSignal });
+    } catch (error) {
+      // If the fetch was aborted then no need to surface this error in the UI
+      if (error.name === 'AbortError') return;
+      this.disable(
+        i18n.translate('inputControl.rangeControl.unableToFetchTooltip', {
+          defaultMessage: 'Unable to fetch range min and max, error: {errorMessage}',
+          values: { errorMessage: error.message },
+        })
+      );
+      return;
+    }
+
+    const min = _.get(resp, 'aggregations.minAgg.value', null);
+    const max = _.get(resp, 'aggregations.maxAgg.value', null);
+
+    if (min === null || max === null) {
+      this.disable(noValuesDisableMsg(fieldName, indexPattern.title));
+      return;
+    }
+
+    this.min = min;
+    this.max = max;
+    this.enable = true;
+  }
+
+  destroy() {
+    if (this.abortController) this.abortController.abort();
+  }
+}
+
+export async function rangeControlFactory(
+  controlParams: ControlParams,
+  useTimeFilter: boolean,
+  SearchSource: SearchSourceClass,
+  deps: InputControlVisDependencies
+): Promise<RangeControl> {
+  const [, { data: dataPluginStart }] = await deps.core.getStartServices();
+  const indexPattern = await dataPluginStart.indexPatterns.get(controlParams.indexPattern);
+
+  return new RangeControl(
+    controlParams,
+    new RangeFilterManager(
+      controlParams.id,
+      controlParams.fieldName,
+      indexPattern,
+      deps.data.query.filterManager
+    ),
+    useTimeFilter,
+    SearchSource,
+    deps
+  );
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/editor_utils.js b/src/legacy/core_plugins/input_control_vis/public/editor_utils.js
deleted file mode 100644
index f5b4390342a0f..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/editor_utils.js
+++ /dev/null
@@ -1,98 +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 CONTROL_TYPES = {
-  LIST: 'list',
-  RANGE: 'range',
-};
-
-export const setControl = (controls, controlIndex, control) => [
-  ...controls.slice(0, controlIndex),
-  control,
-  ...controls.slice(controlIndex + 1),
-];
-
-export const addControl = (controls, control) => [...controls, control];
-
-export const moveControl = (controls, controlIndex, direction) => {
-  let newIndex;
-  if (direction >= 0) {
-    newIndex = controlIndex + 1;
-  } else {
-    newIndex = controlIndex - 1;
-  }
-
-  if (newIndex < 0) {
-    // Move first item to last
-    return [...controls.slice(1), controls[0]];
-  } else if (newIndex >= controls.length) {
-    const lastItemIndex = controls.length - 1;
-    // Move last item to first
-    return [controls[lastItemIndex], ...controls.slice(0, lastItemIndex)];
-  } else {
-    const swapped = controls.slice();
-    const temp = swapped[newIndex];
-    swapped[newIndex] = swapped[controlIndex];
-    swapped[controlIndex] = temp;
-    return swapped;
-  }
-};
-
-export const removeControl = (controls, controlIndex) => [
-  ...controls.slice(0, controlIndex),
-  ...controls.slice(controlIndex + 1),
-];
-
-export const getDefaultOptions = type => {
-  const defaultOptions = {};
-  switch (type) {
-    case CONTROL_TYPES.RANGE:
-      defaultOptions.decimalPlaces = 0;
-      defaultOptions.step = 1;
-      break;
-    case CONTROL_TYPES.LIST:
-      defaultOptions.type = 'terms';
-      defaultOptions.multiselect = true;
-      defaultOptions.dynamicOptions = true;
-      defaultOptions.size = 5;
-      defaultOptions.order = 'desc';
-      break;
-  }
-  return defaultOptions;
-};
-
-export const newControl = type => ({
-  id: new Date().getTime().toString(),
-  indexPattern: '',
-  fieldName: '',
-  parent: '',
-  label: '',
-  type: type,
-  options: getDefaultOptions(type),
-});
-
-export const getTitle = (controlParams, controlIndex) => {
-  let title = `${controlParams.type}: ${controlIndex}`;
-  if (controlParams.label) {
-    title = `${controlParams.label}`;
-  } else if (controlParams.fieldName) {
-    title = `${controlParams.fieldName}`;
-  }
-  return title;
-};
diff --git a/src/legacy/core_plugins/input_control_vis/public/editor_utils.ts b/src/legacy/core_plugins/input_control_vis/public/editor_utils.ts
new file mode 100644
index 0000000000000..74def0a8d86f4
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/editor_utils.ts
@@ -0,0 +1,131 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 '@kbn/utility-types';
+
+export const CONTROL_TYPES = {
+  LIST: 'list' as 'list',
+  RANGE: 'range' as 'range',
+};
+export type CONTROL_TYPES = $Values<typeof CONTROL_TYPES>;
+
+export interface ControlParamsOptions {
+  decimalPlaces?: number;
+  step?: number;
+  type?: string;
+  multiselect?: boolean;
+  dynamicOptions?: boolean;
+  size?: number;
+  order?: string;
+}
+
+export interface ControlParams {
+  id: string;
+  type: CONTROL_TYPES;
+  label: string;
+  fieldName: string;
+  indexPattern: string;
+  parent: string;
+  options: ControlParamsOptions;
+}
+
+export const setControl = (
+  controls: ControlParams[],
+  controlIndex: number,
+  control: ControlParams
+): ControlParams[] => [
+  ...controls.slice(0, controlIndex),
+  control,
+  ...controls.slice(controlIndex + 1),
+];
+
+export const addControl = (controls: ControlParams[], control: ControlParams): ControlParams[] => [
+  ...controls,
+  control,
+];
+
+export const moveControl = (
+  controls: ControlParams[],
+  controlIndex: number,
+  direction: number
+): ControlParams[] => {
+  let newIndex;
+  if (direction >= 0) {
+    newIndex = controlIndex + 1;
+  } else {
+    newIndex = controlIndex - 1;
+  }
+
+  if (newIndex < 0) {
+    // Move first item to last
+    return [...controls.slice(1), controls[0]];
+  } else if (newIndex >= controls.length) {
+    const lastItemIndex = controls.length - 1;
+    // Move last item to first
+    return [controls[lastItemIndex], ...controls.slice(0, lastItemIndex)];
+  } else {
+    const swapped = controls.slice();
+    const temp = swapped[newIndex];
+    swapped[newIndex] = swapped[controlIndex];
+    swapped[controlIndex] = temp;
+    return swapped;
+  }
+};
+
+export const removeControl = (controls: ControlParams[], controlIndex: number): ControlParams[] => [
+  ...controls.slice(0, controlIndex),
+  ...controls.slice(controlIndex + 1),
+];
+
+export const getDefaultOptions = (type: CONTROL_TYPES): ControlParamsOptions => {
+  const defaultOptions: ControlParamsOptions = {};
+  switch (type) {
+    case CONTROL_TYPES.RANGE:
+      defaultOptions.decimalPlaces = 0;
+      defaultOptions.step = 1;
+      break;
+    case CONTROL_TYPES.LIST:
+      defaultOptions.type = 'terms';
+      defaultOptions.multiselect = true;
+      defaultOptions.dynamicOptions = true;
+      defaultOptions.size = 5;
+      defaultOptions.order = 'desc';
+      break;
+  }
+  return defaultOptions;
+};
+
+export const newControl = (type: CONTROL_TYPES): ControlParams => ({
+  id: new Date().getTime().toString(),
+  indexPattern: '',
+  fieldName: '',
+  parent: '',
+  label: '',
+  type,
+  options: getDefaultOptions(type),
+});
+
+export const getTitle = (controlParams: ControlParams, controlIndex: number): string => {
+  let title = `${controlParams.type}: ${controlIndex}`;
+  if (controlParams.label) {
+    title = `${controlParams.label}`;
+  } else if (controlParams.fieldName) {
+    title = `${controlParams.fieldName}`;
+  }
+  return title;
+};
diff --git a/src/legacy/core_plugins/input_control_vis/public/index.ts b/src/legacy/core_plugins/input_control_vis/public/index.ts
new file mode 100644
index 0000000000000..e14c2cc4b69b6
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/index.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from '../../../../core/public';
+import { InputControlVisPlugin as Plugin } from './plugin';
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new Plugin(initializerContext);
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/input_control_fn.js b/src/legacy/core_plugins/input_control_vis/public/input_control_fn.js
deleted file mode 100644
index 0bd435f502a5d..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/input_control_fn.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 { functionsRegistry } from 'plugins/interpreter/registries';
-import { i18n } from '@kbn/i18n';
-
-export const inputControlVis = () => ({
-  name: 'input_control_vis',
-  type: 'render',
-  context: {
-    types: [],
-  },
-  help: i18n.translate('inputControl.function.help', {
-    defaultMessage: 'Input control visualization',
-  }),
-  args: {
-    visConfig: {
-      types: ['string'],
-      default: '"{}"',
-    },
-  },
-  fn(context, args) {
-    const params = JSON.parse(args.visConfig);
-    return {
-      type: 'render',
-      as: 'visualization',
-      value: {
-        visType: 'input_control_vis',
-        visConfig: params,
-      },
-    };
-  },
-});
-
-functionsRegistry.register(inputControlVis);
diff --git a/src/legacy/core_plugins/input_control_vis/public/input_control_fn.test.js b/src/legacy/core_plugins/input_control_vis/public/input_control_fn.test.js
deleted file mode 100644
index 09c6749bcab94..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/input_control_fn.test.js
+++ /dev/null
@@ -1,54 +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');
-
-// eslint-disable-next-line
-import { functionWrapper } from '../../../../plugins/expressions/public/functions/tests/utils';
-import { inputControlVis } from './input_control_fn';
-
-describe('interpreter/functions#input_control_vis', () => {
-  const fn = functionWrapper(inputControlVis);
-  const visConfig = {
-    controls: [
-      {
-        id: '123',
-        fieldName: 'geo.src',
-        label: 'Source Country',
-        type: 'list',
-        options: {
-          type: 'terms',
-          multiselect: true,
-          size: 100,
-          order: 'desc',
-        },
-        parent: '',
-        indexPatternRefName: 'control_0_index_pattern',
-      },
-    ],
-    updateFiltersOnChange: false,
-    useTimeFilter: false,
-    pinFilters: false,
-  };
-
-  it('returns an object with the correct structure', () => {
-    const actual = fn(undefined, { visConfig: JSON.stringify(visConfig) });
-    expect(actual).toMatchSnapshot();
-  });
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/input_control_fn.test.ts b/src/legacy/core_plugins/input_control_vis/public/input_control_fn.test.ts
new file mode 100644
index 0000000000000..aa1383587ea68
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/input_control_fn.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 { createInputControlVisFn } from './input_control_fn';
+
+// eslint-disable-next-line
+import { functionWrapper } from '../../../../plugins/expressions/public/functions/tests/utils';
+
+jest.mock('./legacy_imports.ts');
+
+describe('interpreter/functions#input_control_vis', () => {
+  const fn = functionWrapper(createInputControlVisFn);
+  const visConfig = {
+    controls: [
+      {
+        id: '123',
+        fieldName: 'geo.src',
+        label: 'Source Country',
+        type: 'list',
+        options: {
+          type: 'terms',
+          multiselect: true,
+          size: 100,
+          order: 'desc',
+        },
+        parent: '',
+        indexPatternRefName: 'control_0_index_pattern',
+      },
+    ],
+    updateFiltersOnChange: false,
+    useTimeFilter: false,
+    pinFilters: false,
+  };
+
+  it('returns an object with the correct structure', async () => {
+    const actual = await fn(null, { visConfig: JSON.stringify(visConfig) });
+    expect(actual).toMatchSnapshot();
+  });
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/input_control_fn.ts b/src/legacy/core_plugins/input_control_vis/public/input_control_fn.ts
new file mode 100644
index 0000000000000..0482c0d2cbff3
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/input_control_fn.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 { i18n } from '@kbn/i18n';
+
+import {
+  ExpressionFunction,
+  KibanaDatatable,
+  Render,
+} from '../../../../plugins/expressions/public';
+
+const name = 'input_control_vis';
+
+type Context = KibanaDatatable;
+
+interface Arguments {
+  visConfig: string;
+}
+
+type VisParams = Required<Arguments>;
+
+interface RenderValue {
+  visType: 'input_control_vis';
+  visConfig: VisParams;
+}
+
+type Return = Promise<Render<RenderValue>>;
+
+export const createInputControlVisFn = (): ExpressionFunction<
+  typeof name,
+  Context,
+  Arguments,
+  Return
+> => ({
+  name: 'input_control_vis',
+  type: 'render',
+  context: {
+    types: [],
+  },
+  help: i18n.translate('inputControl.function.help', {
+    defaultMessage: 'Input control visualization',
+  }),
+  args: {
+    visConfig: {
+      types: ['string'],
+      default: '"{}"',
+      help: '',
+    },
+  },
+  async fn(context, args) {
+    const params = JSON.parse(args.visConfig);
+    return {
+      type: 'render',
+      as: 'visualization',
+      value: {
+        visType: 'input_control_vis',
+        visConfig: params,
+      },
+    };
+  },
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/input_control_vis_type.ts b/src/legacy/core_plugins/input_control_vis/public/input_control_vis_type.ts
new file mode 100644
index 0000000000000..b6774aa87b43c
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/input_control_vis_type.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 { i18n } from '@kbn/i18n';
+
+import { createInputControlVisController } from './vis_controller';
+import { getControlsTab } from './components/editor/controls_tab';
+import { OptionsTab } from './components/editor/options_tab';
+import { Status, defaultFeedbackMessage } from '../../visualizations/public';
+import { InputControlVisDependencies } from './plugin';
+
+export function createInputControlVisTypeDefinition(deps: InputControlVisDependencies) {
+  const InputControlVisController = createInputControlVisController(deps);
+  const ControlsTab = getControlsTab(deps);
+
+  return {
+    name: 'input_control_vis',
+    title: i18n.translate('inputControl.register.controlsTitle', {
+      defaultMessage: 'Controls',
+    }),
+    icon: 'visControls',
+    description: i18n.translate('inputControl.register.controlsDescription', {
+      defaultMessage: 'Create interactive controls for easy dashboard manipulation.',
+    }),
+    stage: 'experimental',
+    requiresUpdateStatus: [Status.PARAMS, Status.TIME],
+    feedbackMessage: defaultFeedbackMessage,
+    visualization: InputControlVisController,
+    visConfig: {
+      defaults: {
+        controls: [],
+        updateFiltersOnChange: false,
+        useTimeFilter: false,
+        pinFilters: false,
+      },
+    },
+    editor: 'default',
+    editorConfig: {
+      optionTabs: [
+        {
+          name: 'controls',
+          title: i18n.translate('inputControl.register.tabs.controlsTitle', {
+            defaultMessage: 'Controls',
+          }),
+          editor: ControlsTab,
+        },
+        {
+          name: 'options',
+          title: i18n.translate('inputControl.register.tabs.optionsTitle', {
+            defaultMessage: 'Options',
+          }),
+          editor: OptionsTab,
+        },
+      ],
+    },
+    requestHandler: 'none',
+    responseHandler: 'none',
+  };
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/legacy.ts b/src/legacy/core_plugins/input_control_vis/public/legacy.ts
new file mode 100644
index 0000000000000..438cdffdb323a
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/legacy.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 { PluginInitializerContext } from 'kibana/public';
+import { npSetup, npStart } from 'ui/new_platform';
+
+import { plugin } from '.';
+
+import {
+  InputControlVisPluginSetupDependencies,
+  InputControlVisPluginStartDependencies,
+} from './plugin';
+import {
+  setup as visualizationsSetup,
+  start as visualizationsStart,
+} from '../../visualizations/public/np_ready/public/legacy';
+
+const setupPlugins: Readonly<InputControlVisPluginSetupDependencies> = {
+  expressions: npSetup.plugins.expressions,
+  data: npSetup.plugins.data,
+  visualizations: visualizationsSetup,
+};
+
+const startPlugins: Readonly<InputControlVisPluginStartDependencies> = {
+  expressions: npStart.plugins.expressions,
+  data: npStart.plugins.data,
+  visualizations: visualizationsStart,
+};
+
+const pluginInstance = plugin({} as PluginInitializerContext);
+
+export const setup = pluginInstance.setup(npSetup.core, setupPlugins);
+export const start = pluginInstance.start(npStart.core, startPlugins);
diff --git a/src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts b/src/legacy/core_plugins/input_control_vis/public/legacy_imports.ts
new file mode 100644
index 0000000000000..176fe68fe4788
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/legacy_imports.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 { SearchSource as SearchSourceClass, ISearchSource } from 'ui/courier';
+import { Class } from '@kbn/utility-types';
+
+export { Vis, VisParams } from 'ui/vis';
+export { VisOptionsProps } from 'ui/vis/editors/default';
+export { ValidatedDualRange } from 'ui/validated_range';
+export { SearchSourceFields } from '../../data/public';
+
+export type SearchSource = Class<ISearchSource>;
+export const SearchSource = SearchSourceClass;
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/index.js b/src/legacy/core_plugins/input_control_vis/public/lineage/index.ts
similarity index 100%
rename from src/legacy/core_plugins/input_control_vis/public/lineage/index.js
rename to src/legacy/core_plugins/input_control_vis/public/lineage/index.ts
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.js b/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.js
deleted file mode 100644
index a08c5d1670a09..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.js
+++ /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 _ from 'lodash';
-
-export function getLineageMap(controlParamsList) {
-  function getControlParamsById(controlId) {
-    return controlParamsList.find(controlParams => {
-      return controlParams.id === controlId;
-    });
-  }
-
-  const lineageMap = new Map();
-  controlParamsList.forEach(rootControlParams => {
-    const lineage = [rootControlParams.id];
-    const getLineage = controlParams => {
-      if (
-        _.has(controlParams, 'parent') &&
-        controlParams.parent !== '' &&
-        !lineage.includes(controlParams.parent)
-      ) {
-        lineage.push(controlParams.parent);
-        const parent = getControlParamsById(controlParams.parent);
-        getLineage(parent);
-      }
-    };
-
-    getLineage(rootControlParams);
-    lineageMap.set(rootControlParams.id, lineage);
-  });
-  return lineageMap;
-}
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.test.js b/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.test.js
deleted file mode 100644
index de1b589b7dfa9..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.test.js
+++ /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 expect from '@kbn/expect';
-import { getLineageMap } from './lineage_map';
-import { CONTROL_TYPES, newControl } from '../editor_utils';
-
-test('creates lineage map', () => {
-  const control1 = newControl(CONTROL_TYPES.LIST);
-  control1.id = 1;
-  const control2 = newControl(CONTROL_TYPES.LIST);
-  control2.id = 2;
-  const control3 = newControl(CONTROL_TYPES.LIST);
-  control3.id = 3;
-
-  control2.parent = control1.id;
-  control3.parent = control2.id;
-
-  const lineageMap = getLineageMap([control1, control2, control3]);
-  expect([control1.id]).to.eql(lineageMap.get(control1.id));
-  expect([control2.id, control1.id]).to.eql(lineageMap.get(control2.id));
-  expect([control3.id, control2.id, control1.id]).to.eql(lineageMap.get(control3.id));
-});
-
-test('safely handles circular graph', () => {
-  const control1 = newControl(CONTROL_TYPES.LIST);
-  control1.id = 1;
-  const control2 = newControl(CONTROL_TYPES.LIST);
-  control2.id = 2;
-
-  control1.parent = control2.id;
-  control2.parent = control1.id;
-
-  const lineageMap = getLineageMap([control1, control2]);
-  expect([control1.id, control2.id]).to.eql(lineageMap.get(control1.id));
-  expect([control2.id, control1.id]).to.eql(lineageMap.get(control2.id));
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.test.ts b/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.test.ts
new file mode 100644
index 0000000000000..a0cd648007ecc
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.test.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 { getLineageMap } from './lineage_map';
+import { CONTROL_TYPES, newControl } from '../editor_utils';
+
+test('creates lineage map', () => {
+  const control1 = newControl(CONTROL_TYPES.LIST);
+  control1.id = '1';
+  const control2 = newControl(CONTROL_TYPES.LIST);
+  control2.id = '2';
+  const control3 = newControl(CONTROL_TYPES.LIST);
+  control3.id = '3';
+
+  control2.parent = control1.id;
+  control3.parent = control2.id;
+
+  const lineageMap = getLineageMap([control1, control2, control3]);
+  expect([control1.id]).to.eql(lineageMap.get(control1.id));
+  expect([control2.id, control1.id]).to.eql(lineageMap.get(control2.id));
+  expect([control3.id, control2.id, control1.id]).to.eql(lineageMap.get(control3.id));
+});
+
+test('safely handles circular graph', () => {
+  const control1 = newControl(CONTROL_TYPES.LIST);
+  control1.id = '1';
+  const control2 = newControl(CONTROL_TYPES.LIST);
+  control2.id = '2';
+
+  control1.parent = control2.id;
+  control2.parent = control1.id;
+
+  const lineageMap = getLineageMap([control1, control2]);
+  expect([control1.id, control2.id]).to.eql(lineageMap.get(control1.id));
+  expect([control2.id, control1.id]).to.eql(lineageMap.get(control2.id));
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.ts b/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.ts
new file mode 100644
index 0000000000000..d74782c373942
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/lineage/lineage_map.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 _ from 'lodash';
+import { ControlParams } from '../editor_utils';
+
+export function getLineageMap(controlParamsList: ControlParams[]) {
+  function getControlParamsById(controlId: string) {
+    return controlParamsList.find(controlParams => {
+      return controlParams.id === controlId;
+    });
+  }
+
+  const lineageMap = new Map<string, string[]>();
+  controlParamsList.forEach(rootControlParams => {
+    const lineage = [rootControlParams.id];
+    const getLineage = (controlParams: ControlParams) => {
+      if (
+        _.has(controlParams, 'parent') &&
+        controlParams.parent !== '' &&
+        !lineage.includes(controlParams.parent)
+      ) {
+        lineage.push(controlParams.parent);
+        const parent = getControlParamsById(controlParams.parent);
+
+        if (parent) {
+          getLineage(parent);
+        }
+      }
+    };
+
+    getLineage(rootControlParams);
+    lineageMap.set(rootControlParams.id, lineage);
+  });
+  return lineageMap;
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.js b/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.js
deleted file mode 100644
index 17005c24dd41d..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.js
+++ /dev/null
@@ -1,42 +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 { getTitle } from '../editor_utils';
-
-export function getParentCandidates(controlParamsList, controlId, lineageMap) {
-  return controlParamsList
-    .filter(controlParams => {
-      // Ignore controls that do not have index pattern and field set
-      if (!controlParams.indexPattern || !controlParams.fieldName) {
-        return false;
-      }
-      // Ignore controls that would create a circular graph
-      const lineage = lineageMap.get(controlParams.id);
-      if (lineage.includes(controlId)) {
-        return false;
-      }
-      return true;
-    })
-    .map((controlParams, controlIndex) => {
-      return {
-        value: controlParams.id,
-        text: getTitle(controlParams, controlIndex),
-      };
-    });
-}
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.test.js b/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.test.js
deleted file mode 100644
index fe180357067a9..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.test.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 { getLineageMap } from './lineage_map';
-import { getParentCandidates } from './parent_candidates';
-import { CONTROL_TYPES, newControl } from '../editor_utils';
-
-function createControlParams(id) {
-  const controlParams = newControl(CONTROL_TYPES.LIST);
-  controlParams.id = id;
-  controlParams.indexPattern = 'indexPatternId';
-  controlParams.fieldName = 'fieldName';
-  return controlParams;
-}
-
-test('creates parent candidates that avoid circular graphs', () => {
-  const control1 = createControlParams(1);
-  const control2 = createControlParams(2);
-  const control3 = createControlParams(3);
-  control2.parent = control1.id;
-  control3.parent = control2.id;
-
-  const controlParamsList = [control1, control2, control3];
-  const lineageMap = getLineageMap(controlParamsList);
-
-  const parentCandidatesForControl1 = getParentCandidates(
-    controlParamsList,
-    control1.id,
-    lineageMap
-  );
-  expect([]).to.eql(parentCandidatesForControl1);
-
-  const parentCandidatesForControl2 = getParentCandidates(
-    controlParamsList,
-    control2.id,
-    lineageMap
-  );
-  expect([{ value: 1, text: 'fieldName' }]).to.eql(parentCandidatesForControl2);
-
-  const parentCandidatesForControl3 = getParentCandidates(
-    controlParamsList,
-    control3.id,
-    lineageMap
-  );
-  expect([
-    { value: 1, text: 'fieldName' },
-    { value: 2, text: 'fieldName' },
-  ]).to.eql(parentCandidatesForControl3);
-});
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.test.ts b/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.test.ts
new file mode 100644
index 0000000000000..af6e2444b486f
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.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 expect from '@kbn/expect';
+import { getLineageMap } from './lineage_map';
+import { getParentCandidates } from './parent_candidates';
+import { CONTROL_TYPES, newControl } from '../editor_utils';
+
+function createControlParams(id: any) {
+  const controlParams = newControl(CONTROL_TYPES.LIST);
+  controlParams.id = id;
+  controlParams.indexPattern = 'indexPatternId';
+  controlParams.fieldName = 'fieldName';
+  return controlParams;
+}
+
+test('creates parent candidates that avoid circular graphs', () => {
+  const control1 = createControlParams(1);
+  const control2 = createControlParams(2);
+  const control3 = createControlParams(3);
+  control2.parent = control1.id;
+  control3.parent = control2.id;
+
+  const controlParamsList = [control1, control2, control3];
+  const lineageMap = getLineageMap(controlParamsList);
+
+  const parentCandidatesForControl1 = getParentCandidates(
+    controlParamsList,
+    control1.id,
+    lineageMap
+  );
+  expect([]).to.eql(parentCandidatesForControl1);
+
+  const parentCandidatesForControl2 = getParentCandidates(
+    controlParamsList,
+    control2.id,
+    lineageMap
+  );
+  expect([{ value: 1, text: 'fieldName' }]).to.eql(parentCandidatesForControl2);
+
+  const parentCandidatesForControl3 = getParentCandidates(
+    controlParamsList,
+    control3.id,
+    lineageMap
+  );
+  expect([
+    { value: 1, text: 'fieldName' },
+    { value: 2, text: 'fieldName' },
+  ]).to.eql(parentCandidatesForControl3);
+});
diff --git a/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.ts b/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.ts
new file mode 100644
index 0000000000000..af4fddef19001
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/lineage/parent_candidates.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 { getTitle, ControlParams } from '../editor_utils';
+
+export function getParentCandidates(
+  controlParamsList: ControlParams[],
+  controlId: string,
+  lineageMap: Map<string, string[]>
+) {
+  return controlParamsList
+    .filter(controlParams => {
+      // Ignore controls that do not have index pattern and field set
+      if (!controlParams.indexPattern || !controlParams.fieldName) {
+        return false;
+      }
+      // Ignore controls that would create a circular graph
+      const lineage = lineageMap.get(controlParams.id);
+      if (lineage?.includes(controlId)) {
+        return false;
+      }
+      return true;
+    })
+    .map((controlParams, controlIndex) => {
+      return {
+        value: controlParams.id,
+        text: getTitle(controlParams, controlIndex),
+      };
+    });
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/plugin.ts b/src/legacy/core_plugins/input_control_vis/public/plugin.ts
new file mode 100644
index 0000000000000..e9ffad8b35f21
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/plugin.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 { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'kibana/public';
+
+import { DataPublicPluginSetup, DataPublicPluginStart } from 'src/plugins/data/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
+import { VisualizationsSetup, VisualizationsStart } from '../../visualizations/public';
+import { createInputControlVisFn } from './input_control_fn';
+import { createInputControlVisTypeDefinition } from './input_control_vis_type';
+
+type InputControlVisCoreSetup = CoreSetup<InputControlVisPluginStartDependencies>;
+
+export interface InputControlVisDependencies {
+  core: InputControlVisCoreSetup;
+  data: DataPublicPluginSetup;
+}
+
+/** @internal */
+export interface InputControlVisPluginSetupDependencies {
+  expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
+  visualizations: VisualizationsSetup;
+  data: DataPublicPluginSetup;
+}
+
+/** @internal */
+export interface InputControlVisPluginStartDependencies {
+  expressions: ReturnType<ExpressionsPublicPlugin['start']>;
+  visualizations: VisualizationsStart;
+  data: DataPublicPluginStart;
+}
+
+/** @internal */
+export class InputControlVisPlugin implements Plugin<Promise<void>, void> {
+  constructor(public initializerContext: PluginInitializerContext) {}
+
+  public async setup(
+    core: InputControlVisCoreSetup,
+    { expressions, visualizations, data }: InputControlVisPluginSetupDependencies
+  ) {
+    const visualizationDependencies: Readonly<InputControlVisDependencies> = {
+      core,
+      data,
+    };
+
+    expressions.registerFunction(createInputControlVisFn);
+    visualizations.types.createBaseVisualization(
+      createInputControlVisTypeDefinition(visualizationDependencies)
+    );
+  }
+
+  public start(core: CoreStart, deps: InputControlVisPluginStartDependencies) {
+    // nothing to do here
+  }
+}
diff --git a/src/legacy/core_plugins/input_control_vis/public/register_vis.js b/src/legacy/core_plugins/input_control_vis/public/register_vis.js
deleted file mode 100644
index 09993be3614f2..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/register_vis.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { VisController } from './vis_controller';
-import { ControlsTab } from './components/editor/controls_tab';
-import { OptionsTab } from './components/editor/options_tab';
-import { i18n } from '@kbn/i18n';
-import { setup as visualizations } from '../../visualizations/public/np_ready/public/legacy';
-import { Status, defaultFeedbackMessage } from '../../visualizations/public';
-
-export const inputControlVisDefinition = {
-  name: 'input_control_vis',
-  title: i18n.translate('inputControl.register.controlsTitle', {
-    defaultMessage: 'Controls',
-  }),
-  icon: 'visControls',
-  description: i18n.translate('inputControl.register.controlsDescription', {
-    defaultMessage: 'Create interactive controls for easy dashboard manipulation.',
-  }),
-  stage: 'experimental',
-  requiresUpdateStatus: [Status.PARAMS, Status.TIME],
-  feedbackMessage: defaultFeedbackMessage,
-  visualization: VisController,
-  visConfig: {
-    defaults: {
-      controls: [],
-      updateFiltersOnChange: false,
-      useTimeFilter: false,
-      pinFilters: false,
-    },
-  },
-  editor: 'default',
-  editorConfig: {
-    optionTabs: [
-      {
-        name: 'controls',
-        title: i18n.translate('inputControl.register.tabs.controlsTitle', {
-          defaultMessage: 'Controls',
-        }),
-        editor: ControlsTab,
-      },
-      {
-        name: 'options',
-        title: i18n.translate('inputControl.register.tabs.optionsTitle', {
-          defaultMessage: 'Options',
-        }),
-        editor: OptionsTab,
-      },
-    ],
-  },
-  requestHandler: 'none',
-  responseHandler: 'none',
-};
-
-// register the provider with the visTypes registry
-visualizations.types.createBaseVisualization(inputControlVisDefinition);
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
deleted file mode 100644
index 6a1e23769e28c..0000000000000
--- a/src/legacy/core_plugins/input_control_vis/public/vis_controller.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import { render, unmountComponentAtNode } from 'react-dom';
-import { I18nContext } from 'ui/i18n';
-import { InputControlVis } from './components/vis/input_control_vis';
-import { controlFactory } from './control/control_factory';
-import { getLineageMap } from './lineage';
-import { npStart } from 'ui/new_platform';
-import { SearchSource } from '../../../ui/public/courier/search_source/search_source';
-
-class VisController {
-  constructor(el, vis) {
-    this.el = el;
-    this.vis = vis;
-    this.controls = [];
-
-    this.queryBarUpdateHandler = this.updateControlsFromKbn.bind(this);
-
-    this.filterManager = npStart.plugins.data.query.filterManager;
-    this.updateSubsciption = this.filterManager.getUpdates$().subscribe(this.queryBarUpdateHandler);
-  }
-
-  async render(visData, visParams, status) {
-    if (status.params || (visParams.useTimeFilter && status.time)) {
-      this.visParams = visParams;
-      this.controls = [];
-      this.controls = await this.initControls();
-      this.drawVis();
-    }
-  }
-
-  destroy() {
-    this.updateSubsciption.unsubscribe();
-    unmountComponentAtNode(this.el);
-    this.controls.forEach(control => control.destroy());
-  }
-
-  drawVis = () => {
-    render(
-      <I18nContext>
-        <InputControlVis
-          updateFiltersOnChange={this.visParams.updateFiltersOnChange}
-          controls={this.controls}
-          stageFilter={this.stageFilter}
-          submitFilters={this.submitFilters}
-          resetControls={this.updateControlsFromKbn}
-          clearControls={this.clearControls}
-          hasChanges={this.hasChanges}
-          hasValues={this.hasValues}
-          refreshControl={this.refreshControl}
-        />
-      </I18nContext>,
-      this.el
-    );
-  };
-
-  async initControls() {
-    const controlParamsList = this.visParams.controls.filter(controlParams => {
-      // ignore controls that do not have indexPattern or field
-      return controlParams.indexPattern && controlParams.fieldName;
-    });
-
-    const controlFactoryPromises = controlParamsList.map(controlParams => {
-      const factory = controlFactory(controlParams);
-      return factory(controlParams, this.visParams.useTimeFilter, SearchSource);
-    });
-    const controls = await Promise.all(controlFactoryPromises);
-
-    const getControl = id => {
-      return controls.find(control => {
-        return id === control.id;
-      });
-    };
-
-    const controlInitPromises = [];
-    getLineageMap(controlParamsList).forEach((lineage, controlId) => {
-      // first lineage item is the control. remove it
-      lineage.shift();
-      const ancestors = [];
-      lineage.forEach(ancestorId => {
-        ancestors.push(getControl(ancestorId));
-      });
-      const control = getControl(controlId);
-      control.setAncestors(ancestors);
-      controlInitPromises.push(control.fetch());
-    });
-
-    await Promise.all(controlInitPromises);
-    return controls;
-  }
-
-  stageFilter = async (controlIndex, newValue) => {
-    this.controls[controlIndex].set(newValue);
-    if (this.visParams.updateFiltersOnChange) {
-      // submit filters on each control change
-      this.submitFilters();
-    } else {
-      // Do not submit filters, just update vis so controls are updated with latest value
-      await this.updateNestedControls();
-      this.drawVis();
-    }
-  };
-
-  submitFilters = () => {
-    const stagedControls = this.controls.filter(control => {
-      return control.hasChanged();
-    });
-
-    const newFilters = stagedControls
-      .filter(control => {
-        return control.hasKbnFilter();
-      })
-      .map(control => {
-        return control.getKbnFilter();
-      });
-
-    stagedControls.forEach(control => {
-      // to avoid duplicate filters, remove any old filters for control
-      control.filterManager.findFilters().forEach(existingFilter => {
-        this.filterManager.removeFilter(existingFilter);
-      });
-    });
-
-    // Clean up filter pills for nested controls that are now disabled because ancestors are not set.
-    // This has to be done after looking up the staged controls because otherwise removing a filter
-    // will re-sync the controls of all other filters.
-    this.controls.map(control => {
-      if (control.hasAncestors() && control.hasUnsetAncestor()) {
-        control.filterManager.findFilters().forEach(existingFilter => {
-          this.filterManager.removeFilter(existingFilter);
-        });
-      }
-    });
-
-    this.filterManager.addFilters(newFilters, this.visParams.pinFilters);
-  };
-
-  clearControls = async () => {
-    this.controls.forEach(control => {
-      control.clear();
-    });
-    await this.updateNestedControls();
-    this.drawVis();
-  };
-
-  updateControlsFromKbn = async () => {
-    this.controls.forEach(control => {
-      control.reset();
-    });
-    await this.updateNestedControls();
-    this.drawVis();
-  };
-
-  async updateNestedControls() {
-    const fetchPromises = this.controls.map(async control => {
-      if (control.hasAncestors()) {
-        await control.fetch();
-      }
-    });
-    return await Promise.all(fetchPromises);
-  }
-
-  hasChanges = () => {
-    return this.controls
-      .map(control => {
-        return control.hasChanged();
-      })
-      .reduce((a, b) => {
-        return a || b;
-      });
-  };
-
-  hasValues = () => {
-    return this.controls
-      .map(control => {
-        return control.hasValue();
-      })
-      .reduce((a, b) => {
-        return a || b;
-      });
-  };
-
-  refreshControl = async (controlIndex, query) => {
-    await this.controls[controlIndex].fetch(query);
-    this.drawVis();
-  };
-}
-
-export { VisController };
diff --git a/src/legacy/core_plugins/input_control_vis/public/vis_controller.tsx b/src/legacy/core_plugins/input_control_vis/public/vis_controller.tsx
new file mode 100644
index 0000000000000..849b58b8ee2da
--- /dev/null
+++ b/src/legacy/core_plugins/input_control_vis/public/vis_controller.tsx
@@ -0,0 +1,226 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { I18nStart } from 'kibana/public';
+import { Vis, VisParams, SearchSource } from './legacy_imports';
+
+import { InputControlVis } from './components/vis/input_control_vis';
+import { getControlFactory } from './control/control_factory';
+import { getLineageMap } from './lineage';
+import { ControlParams } from './editor_utils';
+import { RangeControl } from './control/range_control_factory';
+import { ListControl } from './control/list_control_factory';
+import { InputControlVisDependencies } from './plugin';
+import { FilterManager, esFilters } from '../../../../plugins/data/public';
+
+export const createInputControlVisController = (deps: InputControlVisDependencies) => {
+  return class InputControlVisController {
+    private I18nContext?: I18nStart['Context'];
+
+    controls: Array<RangeControl | ListControl>;
+    queryBarUpdateHandler: () => void;
+    filterManager: FilterManager;
+    updateSubsciption: any;
+    visParams?: VisParams;
+
+    constructor(public el: Element, public vis: Vis) {
+      this.controls = [];
+
+      this.queryBarUpdateHandler = this.updateControlsFromKbn.bind(this);
+
+      this.filterManager = deps.data.query.filterManager;
+      this.updateSubsciption = this.filterManager
+        .getUpdates$()
+        .subscribe(this.queryBarUpdateHandler);
+    }
+
+    async render(visData: any, visParams: VisParams, status: any) {
+      if (status.params || (visParams.useTimeFilter && status.time)) {
+        this.visParams = visParams;
+        this.controls = [];
+        this.controls = await this.initControls();
+        const [{ i18n }] = await deps.core.getStartServices();
+        this.I18nContext = i18n.Context;
+        this.drawVis();
+      }
+    }
+
+    destroy() {
+      this.updateSubsciption.unsubscribe();
+      unmountComponentAtNode(this.el);
+      this.controls.forEach(control => control.destroy());
+    }
+
+    drawVis = () => {
+      if (!this.I18nContext) {
+        throw new Error('no i18n context found');
+      }
+
+      render(
+        <this.I18nContext>
+          <InputControlVis
+            updateFiltersOnChange={this.visParams?.updateFiltersOnChange}
+            controls={this.controls}
+            stageFilter={this.stageFilter}
+            submitFilters={this.submitFilters}
+            resetControls={this.updateControlsFromKbn}
+            clearControls={this.clearControls}
+            hasChanges={this.hasChanges}
+            hasValues={this.hasValues}
+            refreshControl={this.refreshControl}
+          />
+        </this.I18nContext>,
+        this.el
+      );
+    };
+
+    async initControls() {
+      const controlParamsList = (this.visParams?.controls as ControlParams[])?.filter(
+        controlParams => {
+          // ignore controls that do not have indexPattern or field
+          return controlParams.indexPattern && controlParams.fieldName;
+        }
+      );
+
+      const controlFactoryPromises = controlParamsList.map(controlParams => {
+        const factory = getControlFactory(controlParams);
+        return factory(controlParams, this.visParams?.useTimeFilter, SearchSource, deps);
+      });
+      const controls = await Promise.all<RangeControl | ListControl>(controlFactoryPromises);
+
+      const getControl = (controlId: string) => {
+        return controls.find(({ id }) => id === controlId);
+      };
+
+      const controlInitPromises: Array<Promise<void>> = [];
+      getLineageMap(controlParamsList).forEach((lineage, controlId) => {
+        // first lineage item is the control. remove it
+        lineage.shift();
+        const ancestors: Array<RangeControl | ListControl> = [];
+        lineage.forEach(ancestorId => {
+          const control = getControl(ancestorId);
+
+          if (control) {
+            ancestors.push(control);
+          }
+        });
+        const control = getControl(controlId);
+
+        if (control) {
+          control.setAncestors(ancestors);
+          controlInitPromises.push(control.fetch());
+        }
+      });
+
+      await Promise.all(controlInitPromises);
+      return controls;
+    }
+
+    stageFilter = async (controlIndex: number, newValue: any) => {
+      this.controls[controlIndex].set(newValue);
+      if (this.visParams?.updateFiltersOnChange) {
+        // submit filters on each control change
+        this.submitFilters();
+      } else {
+        // Do not submit filters, just update vis so controls are updated with latest value
+        await this.updateNestedControls();
+        this.drawVis();
+      }
+    };
+
+    submitFilters = () => {
+      const stagedControls = this.controls.filter(control => {
+        return control.hasChanged();
+      });
+
+      const newFilters = stagedControls
+        .map(control => control.getKbnFilter())
+        .filter((filter): filter is esFilters.Filter => {
+          return filter !== null;
+        });
+
+      stagedControls.forEach(control => {
+        // to avoid duplicate filters, remove any old filters for control
+        control.filterManager.findFilters().forEach(existingFilter => {
+          this.filterManager.removeFilter(existingFilter);
+        });
+      });
+
+      // Clean up filter pills for nested controls that are now disabled because ancestors are not set.
+      // This has to be done after looking up the staged controls because otherwise removing a filter
+      // will re-sync the controls of all other filters.
+      this.controls.map(control => {
+        if (control.hasAncestors() && control.hasUnsetAncestor()) {
+          control.filterManager.findFilters().forEach(existingFilter => {
+            this.filterManager.removeFilter(existingFilter);
+          });
+        }
+      });
+
+      this.filterManager.addFilters(newFilters, this.visParams?.pinFilters);
+    };
+
+    clearControls = async () => {
+      this.controls.forEach(control => {
+        control.clear();
+      });
+      await this.updateNestedControls();
+      this.drawVis();
+    };
+
+    updateControlsFromKbn = async () => {
+      this.controls.forEach(control => {
+        control.reset();
+      });
+      await this.updateNestedControls();
+      this.drawVis();
+    };
+
+    async updateNestedControls() {
+      const fetchPromises = this.controls.map(async control => {
+        if (control.hasAncestors()) {
+          await control.fetch();
+        }
+      });
+      return await Promise.all(fetchPromises);
+    }
+
+    hasChanges = () => {
+      return this.controls.map(control => control.hasChanged()).some(control => control);
+    };
+
+    hasValues = () => {
+      return this.controls
+        .map(control => {
+          return control.hasValue();
+        })
+        .reduce((a, b) => {
+          return a || b;
+        });
+    };
+
+    refreshControl = async (controlIndex: number, query: any) => {
+      await this.controls[controlIndex].fetch(query);
+      this.drawVis();
+    };
+  };
+};
diff --git a/src/legacy/core_plugins/kbn_doc_views/index.js b/src/legacy/core_plugins/kbn_doc_views/index.js
deleted file mode 100644
index 9078a82d63381..0000000000000
--- a/src/legacy/core_plugins/kbn_doc_views/index.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export default function(kibana) {
-  return new kibana.Plugin({
-    uiExports: {
-      docViews: ['plugins/kbn_doc_views/kbn_doc_views'],
-    },
-  });
-}
diff --git a/src/legacy/core_plugins/kbn_doc_views/package.json b/src/legacy/core_plugins/kbn_doc_views/package.json
deleted file mode 100644
index efad9ec42f1f2..0000000000000
--- a/src/legacy/core_plugins/kbn_doc_views/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "kbn_doc_views",
-  "version": "kibana"
-}
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/kbn_doc_views.js b/src/legacy/core_plugins/kbn_doc_views/public/kbn_doc_views.js
deleted file mode 100644
index 2608e60e70742..0000000000000
--- a/src/legacy/core_plugins/kbn_doc_views/public/kbn_doc_views.js
+++ /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.
- */
-
-import './views/table';
-import './views/json';
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/json.tsx b/src/legacy/core_plugins/kbn_doc_views/public/views/json.tsx
deleted file mode 100644
index 73167b56bddea..0000000000000
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/json.tsx
+++ /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 { addDocView } from 'ui/registry/doc_views';
-import { i18n } from '@kbn/i18n';
-import { JsonCodeBlock } from './json_code_block';
-
-/*
- * Registration of the the doc view: json
- * - used to display an ES hit as pretty printed JSON at Discover
- */
-addDocView({
-  title: i18n.translate('kbnDocViews.json.jsonTitle', {
-    defaultMessage: 'JSON',
-  }),
-  order: 20,
-  component: JsonCodeBlock,
-});
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table.ts b/src/legacy/core_plugins/kbn_doc_views/public/views/table.ts
deleted file mode 100644
index f90840f195003..0000000000000
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table.ts
+++ /dev/null
@@ -1,31 +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 { addDocView } from 'ui/registry/doc_views';
-import { i18n } from '@kbn/i18n';
-import { DocViewTable } from './table/table';
-
-addDocView({
-  title: i18n.translate('kbnDocViews.table.tableTitle', {
-    defaultMessage: 'Table',
-  }),
-  order: 10,
-  component: DocViewTable,
-});
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_no_mapping.tsx b/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_no_mapping.tsx
deleted file mode 100644
index ab22ba7bea7bd..0000000000000
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_no_mapping.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React from 'react';
-import { EuiIconTip } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-
-export function DocViewTableRowIconNoMapping() {
-  const ariaLabel = i18n.translate('kbnDocViews.table.noCachedMappingForThisFieldAriaLabel', {
-    defaultMessage: 'Warning',
-  });
-  const tooltipContent = i18n.translate('kbnDocViews.table.noCachedMappingForThisFieldTooltip', {
-    defaultMessage:
-      'No cached mapping for this field. Refresh field list from the Management > Index Patterns page',
-  });
-  return (
-    <EuiIconTip
-      aria-label={ariaLabel}
-      color="warning"
-      content={tooltipContent}
-      iconProps={{
-        className: 'kbnDocViewer__warning',
-        'data-test-subj': 'noMappingWarning',
-      }}
-      size="s"
-      type="alert"
-    />
-  );
-}
diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js
index 93167cb0e6bf9..111b74d8aa6af 100644
--- a/src/legacy/core_plugins/kibana/index.js
+++ b/src/legacy/core_plugins/kibana/index.js
@@ -22,20 +22,15 @@ import { resolve } from 'path';
 import { promisify } from 'util';
 
 import { migrations } from './migrations';
-import manageUuid from './server/lib/manage_uuid';
 import { importApi } from './server/routes/api/import';
 import { exportApi } from './server/routes/api/export';
 import { homeApi } from './server/routes/api/home';
 import { managementApi } from './server/routes/api/management';
-import { scriptsApi } from './server/routes/api/scripts';
-import { registerSuggestionsApi } from './server/routes/api/suggestions';
-import { registerKqlTelemetryApi } from './server/routes/api/kql_telemetry';
 import { registerFieldFormats } from './server/field_formats/register';
 import { registerTutorials } from './server/tutorials/register';
 import * as systemApi from './server/lib/system_api';
 import mappings from './mappings.json';
 import { getUiSettingDefaults } from './ui_setting_defaults';
-import { makeKQLUsageCollector } from './server/lib/kql_usage_collector';
 import { registerCspCollector } from './server/lib/csp_usage_collector';
 import { injectVars } from './inject_vars';
 import { i18n } from '@kbn/i18n';
@@ -326,19 +321,13 @@ export default function(kibana) {
 
     init: async function(server) {
       const { usageCollection } = server.newPlatform.setup.plugins;
-      // uuid
-      await manageUuid(server);
       // routes
-      scriptsApi(server);
       importApi(server);
       exportApi(server);
       homeApi(server);
       managementApi(server);
-      registerSuggestionsApi(server);
-      registerKqlTelemetryApi(server);
       registerFieldFormats(server);
       registerTutorials(server);
-      makeKQLUsageCollector(usageCollection, server);
       registerCspCollector(usageCollection, server);
       server.expose('systemApi', systemApi);
       server.injectUiAppVars('kibana', () => injectVars(server));
diff --git a/src/legacy/core_plugins/kibana/public/.eslintrc b/src/legacy/core_plugins/kibana/public/.eslintrc
deleted file mode 100644
index cc44af915ba25..0000000000000
--- a/src/legacy/core_plugins/kibana/public/.eslintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-rules:
-  no-console: 2
-  'import/no-default-export': error
diff --git a/src/legacy/core_plugins/kibana/public/.eslintrc.js b/src/legacy/core_plugins/kibana/public/.eslintrc.js
new file mode 100644
index 0000000000000..160adcc5b63f1
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/.eslintrc.js
@@ -0,0 +1,72 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 path = require('path');
+
+/**
+ * Builds custom restricted paths configuration for the shimmed plugins within the kibana plugin.
+ * These custom rules extend the default checks in the top level `eslintrc.js` by also checking two other things:
+ * * Making sure nothing within np_ready imports from the `ui` directory
+ * * Making sure no other code is importing things deep from within the shimmed plugins
+ * @param shimmedPlugins List of plugin names within the kibana plugin that are partially np ready
+ * @returns zones configuration for the no-restricted-paths linter
+ */
+function buildRestrictedPaths(shimmedPlugins) {
+  return shimmedPlugins.map(shimmedPlugin => ([{
+    target: [
+      `src/legacy/core_plugins/kibana/public/${shimmedPlugin}/np_ready/**/*`,
+    ],
+    from: [
+      'ui/**/*',
+      'src/legacy/ui/**/*',
+      'src/legacy/core_plugins/kibana/public/**/*',
+      'src/legacy/core_plugins/data/public/**/*',
+      '!src/legacy/core_plugins/data/public/index.ts',
+      `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
+    ],
+    allowSameFolder: false,
+    errorMessage: `${shimmedPlugin} is a shimmed plugin that is not allowed to import modules from the legacy platform. If you need legacy modules for the transition period, import them either in the legacy_imports, kibana_services or index module.`,
+  }, {
+    target: [
+      'src/**/*',
+      `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
+      'x-pack/**/*',
+    ],
+    from: [
+      `src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
+      `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/index.ts`,
+    ],
+    allowSameFolder: false,
+    errorMessage: `kibana/public/${shimmedPlugin} is behaving like a NP plugin and does not allow deep imports. If you need something from within ${shimmedPlugin} in another plugin, consider re-exporting it from the top level index module`,
+  }])).reduce((acc, part) => [...acc, ...part], []);
+}
+
+module.exports = {
+  rules: {
+    'no-console': 2,
+    'import/no-default-export': 'error',
+    '@kbn/eslint/no-restricted-paths': [
+      'error',
+      {
+        basePath: path.resolve(__dirname, '../../../../../'),
+        zones: buildRestrictedPaths(['visualize', 'discover', 'dashboard', 'devTools', 'home']),
+      },
+    ],
+  },
+};
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/__snapshots__/dashboard_empty_screen.test.tsx.snap b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/__snapshots__/dashboard_empty_screen.test.tsx.snap
index 4ea658bcd03ef..f7fc3b0891fef 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/__snapshots__/dashboard_empty_screen.test.tsx.snap
+++ b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/__snapshots__/dashboard_empty_screen.test.tsx.snap
@@ -1,7 +1,32 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DashboardEmptyScreen renders correctly with visualize paragraph 1`] = `
+exports[`DashboardEmptyScreen renders correctly with readonly mode 1`] = `
 <DashboardEmptyScreen
+  http={
+    Object {
+      "addLoadingCountSource": [MockFunction],
+      "anonymousPaths": Object {
+        "isAnonymous": [MockFunction],
+        "register": [MockFunction],
+      },
+      "basePath": BasePath {
+        "basePath": "",
+        "get": [Function],
+        "prepend": [Function],
+        "remove": [Function],
+      },
+      "delete": [MockFunction],
+      "fetch": [MockFunction],
+      "get": [MockFunction],
+      "getLoadingCount$": [MockFunction],
+      "head": [MockFunction],
+      "intercept": [MockFunction],
+      "options": [MockFunction],
+      "patch": [MockFunction],
+      "post": [MockFunction],
+      "put": [MockFunction],
+    }
+  }
   intl={
     Object {
       "defaultFormats": Object {},
@@ -104,8 +129,59 @@ exports[`DashboardEmptyScreen renders correctly with visualize paragraph 1`] = `
       "timeZone": null,
     }
   }
+  isReadonlyMode={true}
   onLinkClick={[MockFunction]}
   showLinkToVisualize={true}
+  uiSettings={
+    Object {
+      "get": [MockFunction] {
+        "calls": Array [
+          Array [
+            "theme:darkMode",
+          ],
+          Array [
+            "theme:darkMode",
+          ],
+          Array [
+            "theme:darkMode",
+          ],
+          Array [
+            "theme:darkMode",
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      },
+      "get$": [MockFunction],
+      "getAll": [MockFunction],
+      "getSaved$": [MockFunction],
+      "getUpdate$": [MockFunction],
+      "getUpdateErrors$": [MockFunction],
+      "isCustom": [MockFunction],
+      "isDeclared": [MockFunction],
+      "isDefault": [MockFunction],
+      "isOverridden": [MockFunction],
+      "overrideLocalDefault": [MockFunction],
+      "remove": [MockFunction],
+      "set": [MockFunction],
+    }
+  }
 >
   <I18nProvider>
     <IntlProvider
@@ -195,167 +271,84 @@ exports[`DashboardEmptyScreen renders correctly with visualize paragraph 1`] = `
       <PseudoLocaleWrapper>
         <EuiPage
           className="dshStartScreen"
-          restrictWidth="36em"
+          restrictWidth="500px"
         >
           <div
             className="euiPage euiPage--restrictWidth-custom dshStartScreen"
             style={
               Object {
-                "maxWidth": "36em",
+                "maxWidth": "500px",
               }
             }
           >
-            <EuiPageBody
-              component="main"
-              restrictWidth={false}
-            >
+            <EuiPageBody>
               <main
                 className="euiPageBody"
               >
                 <EuiPageContent
+                  className="dshStartScreen__pageContent"
                   horizontalPosition="center"
-                  panelPaddingSize="l"
+                  paddingSize="none"
                   verticalPosition="center"
                 >
                   <EuiPanel
-                    className="euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter"
-                    paddingSize="l"
+                    className="euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter dshStartScreen__pageContent"
+                    paddingSize="none"
                   >
                     <div
-                      className="euiPanel euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter"
+                      className="euiPanel euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter dshStartScreen__pageContent"
                     >
-                      <EuiIcon
-                        color="subdued"
-                        size="xxl"
-                        type="dashboardApp"
+                      <EuiImage
+                        alt=""
+                        url="/plugins/kibana/home/assets/welcome_graphic_light_2x.png"
                       >
-                        <EuiIconEmpty
-                          className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoading"
-                          focusable="false"
-                          style={null}
+                        <figure
+                          className="euiImage"
+                          role="figure"
                         >
-                          <svg
-                            className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoading"
-                            focusable="false"
-                            height={16}
-                            style={null}
-                            viewBox="0 0 16 16"
-                            width={16}
-                            xmlns="http://www.w3.org/2000/svg"
+                          <img
+                            alt=""
+                            className="euiImage__img"
+                            src="/plugins/kibana/home/assets/welcome_graphic_light_2x.png"
                           />
-                        </EuiIconEmpty>
-                      </EuiIcon>
-                      <EuiSpacer
-                        size="s"
-                      >
-                        <div
-                          className="euiSpacer euiSpacer--s"
-                        />
-                      </EuiSpacer>
+                        </figure>
+                      </EuiImage>
                       <EuiText
-                        grow={true}
+                        size="m"
                       >
                         <div
                           className="euiText euiText--medium"
                         >
-                          <h2
-                            key="0.5"
+                          <p
+                            style={
+                              Object {
+                                "fontWeight": "bold",
+                              }
+                            }
                           >
-                            This dashboard is empty. Let’s fill it up!
-                          </h2>
+                            This dashboard is empty.
+                          </p>
                         </div>
                       </EuiText>
-                      <EuiSpacer
-                        size="m"
-                      >
-                        <div
-                          className="euiSpacer euiSpacer--m"
-                        />
-                      </EuiSpacer>
                       <EuiText
+                        color="subdued"
                         size="m"
                       >
                         <div
                           className="euiText euiText--medium"
                         >
-                          <p>
-                            Click the 
-                            <EuiLink
-                              aria-label="Add visualization"
-                              data-test-subj="emptyDashboardAddPanelButton"
-                              onClick={[MockFunction]}
+                          <EuiTextColor
+                            color="subdued"
+                            component="div"
+                          >
+                            <div
+                              className="euiTextColor euiTextColor--subdued"
                             >
-                              <button
-                                aria-label="Add visualization"
-                                className="euiLink euiLink--primary"
-                                data-test-subj="emptyDashboardAddPanelButton"
-                                onClick={[MockFunction]}
-                                type="button"
-                              >
-                                Add
-                              </button>
-                            </EuiLink>
-                             button in the menu bar above to add a visualization to the dashboard.
-                          </p>
+                              You need additional privileges to edit this dashboard.
+                            </div>
+                          </EuiTextColor>
                         </div>
                       </EuiText>
-                      <EuiSpacer
-                        size="m"
-                      >
-                        <div
-                          className="euiSpacer euiSpacer--m"
-                        />
-                      </EuiSpacer>
-                      <p
-                        data-test-subj="linkToVisualizeParagraph"
-                      >
-                        <EuiButton
-                          data-test-subj="addVisualizationButton"
-                          fill={true}
-                          iconSide="right"
-                          iconType="arrowDown"
-                        >
-                          <button
-                            className="euiButton euiButton--primary euiButton--iconRight euiButton--fill"
-                            data-test-subj="addVisualizationButton"
-                            type="button"
-                          >
-                            <span
-                              className="euiButton__content"
-                            >
-                              <EuiIcon
-                                aria-hidden="true"
-                                className="euiButton__icon"
-                                size="m"
-                                type="arrowDown"
-                              >
-                                <EuiIconEmpty
-                                  aria-hidden="true"
-                                  className="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
-                                  focusable="false"
-                                  style={null}
-                                >
-                                  <svg
-                                    aria-hidden="true"
-                                    className="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
-                                    focusable="false"
-                                    height={16}
-                                    style={null}
-                                    viewBox="0 0 16 16"
-                                    width={16}
-                                    xmlns="http://www.w3.org/2000/svg"
-                                  />
-                                </EuiIconEmpty>
-                              </EuiIcon>
-                              <span
-                                className="euiButton__text"
-                              >
-                                Create new
-                              </span>
-                            </span>
-                          </button>
-                        </EuiButton>
-                      </p>
                     </div>
                   </EuiPanel>
                 </EuiPageContent>
@@ -369,8 +362,392 @@ exports[`DashboardEmptyScreen renders correctly with visualize paragraph 1`] = `
 </DashboardEmptyScreen>
 `;
 
+exports[`DashboardEmptyScreen renders correctly with visualize paragraph 1`] = `
+<DashboardEmptyScreen
+  http={
+    Object {
+      "addLoadingCountSource": [MockFunction],
+      "anonymousPaths": Object {
+        "isAnonymous": [MockFunction],
+        "register": [MockFunction],
+      },
+      "basePath": BasePath {
+        "basePath": "",
+        "get": [Function],
+        "prepend": [Function],
+        "remove": [Function],
+      },
+      "delete": [MockFunction],
+      "fetch": [MockFunction],
+      "get": [MockFunction],
+      "getLoadingCount$": [MockFunction],
+      "head": [MockFunction],
+      "intercept": [MockFunction],
+      "options": [MockFunction],
+      "patch": [MockFunction],
+      "post": [MockFunction],
+      "put": [MockFunction],
+    }
+  }
+  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,
+    }
+  }
+  onLinkClick={[MockFunction]}
+  showLinkToVisualize={true}
+  uiSettings={
+    Object {
+      "get": [MockFunction] {
+        "calls": Array [
+          Array [
+            "theme:darkMode",
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      },
+      "get$": [MockFunction],
+      "getAll": [MockFunction],
+      "getSaved$": [MockFunction],
+      "getUpdate$": [MockFunction],
+      "getUpdateErrors$": [MockFunction],
+      "isCustom": [MockFunction],
+      "isDeclared": [MockFunction],
+      "isDefault": [MockFunction],
+      "isOverridden": [MockFunction],
+      "overrideLocalDefault": [MockFunction],
+      "remove": [MockFunction],
+      "set": [MockFunction],
+    }
+  }
+>
+  <I18nProvider>
+    <IntlProvider
+      defaultLocale="en"
+      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",
+            },
+          },
+        }
+      }
+      locale="en"
+      messages={Object {}}
+      textComponent={Symbol(react.fragment)}
+    >
+      <PseudoLocaleWrapper>
+        <div
+          className="dshEmptyWidget"
+          data-test-subj="emptyDashboardWidget"
+        >
+          <EuiText
+            color="subdued"
+            size="m"
+          >
+            <div
+              className="euiText euiText--medium"
+            >
+              <EuiTextColor
+                color="subdued"
+                component="div"
+              >
+                <div
+                  className="euiTextColor euiTextColor--subdued"
+                >
+                  <p>
+                    <EuiLink
+                      aria-label="Add an existing visualization"
+                      data-test-subj=""
+                      onClick={[MockFunction]}
+                    >
+                      <button
+                        aria-label="Add an existing visualization"
+                        className="euiLink euiLink--primary"
+                        data-test-subj=""
+                        onClick={[MockFunction]}
+                        type="button"
+                      >
+                        Add an existing
+                      </button>
+                    </EuiLink>
+                    <span>
+                       
+                    </span>
+                    or new object to this dashboard
+                  </p>
+                </div>
+              </EuiTextColor>
+            </div>
+          </EuiText>
+          <EuiSpacer
+            size="l"
+          >
+            <div
+              className="euiSpacer euiSpacer--l"
+            />
+          </EuiSpacer>
+          <p
+            data-test-subj="linkToVisualizeParagraph"
+          >
+            <EuiButton
+              aria-label="Create new visualization button"
+              data-test-subj="addVisualizationButton"
+              fill={true}
+              iconSide="right"
+              iconType="arrowDown"
+              size="s"
+            >
+              <button
+                aria-label="Create new visualization button"
+                className="euiButton euiButton--primary euiButton--small euiButton--iconRight euiButton--fill"
+                data-test-subj="addVisualizationButton"
+                type="button"
+              >
+                <span
+                  className="euiButton__content"
+                >
+                  <EuiIcon
+                    aria-hidden="true"
+                    className="euiButton__icon"
+                    size="m"
+                    type="arrowDown"
+                  >
+                    <EuiIconEmpty
+                      aria-hidden={true}
+                      className="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
+                      focusable="false"
+                      role="img"
+                      style={null}
+                    >
+                      <svg
+                        aria-hidden={true}
+                        className="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
+                        focusable="false"
+                        height={16}
+                        role="img"
+                        style={null}
+                        viewBox="0 0 16 16"
+                        width={16}
+                        xmlns="http://www.w3.org/2000/svg"
+                      />
+                    </EuiIconEmpty>
+                  </EuiIcon>
+                  <span
+                    className="euiButton__text"
+                  >
+                    Create new
+                  </span>
+                </span>
+              </button>
+            </EuiButton>
+          </p>
+        </div>
+      </PseudoLocaleWrapper>
+    </IntlProvider>
+  </I18nProvider>
+</DashboardEmptyScreen>
+`;
+
 exports[`DashboardEmptyScreen renders correctly without visualize paragraph 1`] = `
 <DashboardEmptyScreen
+  http={
+    Object {
+      "addLoadingCountSource": [MockFunction],
+      "anonymousPaths": Object {
+        "isAnonymous": [MockFunction],
+        "register": [MockFunction],
+      },
+      "basePath": BasePath {
+        "basePath": "",
+        "get": [Function],
+        "prepend": [Function],
+        "remove": [Function],
+      },
+      "delete": [MockFunction],
+      "fetch": [MockFunction],
+      "get": [MockFunction],
+      "getLoadingCount$": [MockFunction],
+      "head": [MockFunction],
+      "intercept": [MockFunction],
+      "options": [MockFunction],
+      "patch": [MockFunction],
+      "post": [MockFunction],
+      "put": [MockFunction],
+    }
+  }
   intl={
     Object {
       "defaultFormats": Object {},
@@ -475,6 +852,42 @@ exports[`DashboardEmptyScreen renders correctly without visualize paragraph 1`]
   }
   onLinkClick={[MockFunction]}
   showLinkToVisualize={false}
+  uiSettings={
+    Object {
+      "get": [MockFunction] {
+        "calls": Array [
+          Array [
+            "theme:darkMode",
+          ],
+          Array [
+            "theme:darkMode",
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+          Object {
+            "type": "return",
+            "value": undefined,
+          },
+        ],
+      },
+      "get$": [MockFunction],
+      "getAll": [MockFunction],
+      "getSaved$": [MockFunction],
+      "getUpdate$": [MockFunction],
+      "getUpdateErrors$": [MockFunction],
+      "isCustom": [MockFunction],
+      "isDeclared": [MockFunction],
+      "isDefault": [MockFunction],
+      "isOverridden": [MockFunction],
+      "overrideLocalDefault": [MockFunction],
+      "remove": [MockFunction],
+      "set": [MockFunction],
+    }
+  }
 >
   <I18nProvider>
     <IntlProvider
@@ -564,74 +977,63 @@ exports[`DashboardEmptyScreen renders correctly without visualize paragraph 1`]
       <PseudoLocaleWrapper>
         <EuiPage
           className="dshStartScreen"
-          restrictWidth="36em"
+          restrictWidth="500px"
         >
           <div
             className="euiPage euiPage--restrictWidth-custom dshStartScreen"
             style={
               Object {
-                "maxWidth": "36em",
+                "maxWidth": "500px",
               }
             }
           >
-            <EuiPageBody
-              component="main"
-              restrictWidth={false}
-            >
+            <EuiPageBody>
               <main
                 className="euiPageBody"
               >
                 <EuiPageContent
+                  className="dshStartScreen__pageContent"
                   horizontalPosition="center"
-                  panelPaddingSize="l"
+                  paddingSize="none"
                   verticalPosition="center"
                 >
                   <EuiPanel
-                    className="euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter"
-                    paddingSize="l"
+                    className="euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter dshStartScreen__pageContent"
+                    paddingSize="none"
                   >
                     <div
-                      className="euiPanel euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter"
+                      className="euiPanel euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter dshStartScreen__pageContent"
                     >
-                      <EuiIcon
-                        color="subdued"
-                        size="xxl"
-                        type="dashboardApp"
+                      <EuiImage
+                        alt=""
+                        url="/plugins/kibana/home/assets/welcome_graphic_light_2x.png"
                       >
-                        <EuiIconEmpty
-                          className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoading"
-                          focusable="false"
-                          style={null}
+                        <figure
+                          className="euiImage"
+                          role="figure"
                         >
-                          <svg
-                            className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoading"
-                            focusable="false"
-                            height={16}
-                            style={null}
-                            viewBox="0 0 16 16"
-                            width={16}
-                            xmlns="http://www.w3.org/2000/svg"
+                          <img
+                            alt=""
+                            className="euiImage__img"
+                            src="/plugins/kibana/home/assets/welcome_graphic_light_2x.png"
                           />
-                        </EuiIconEmpty>
-                      </EuiIcon>
-                      <EuiSpacer
-                        size="s"
-                      >
-                        <div
-                          className="euiSpacer euiSpacer--s"
-                        />
-                      </EuiSpacer>
+                        </figure>
+                      </EuiImage>
                       <EuiText
-                        grow={true}
+                        size="m"
                       >
                         <div
                           className="euiText euiText--medium"
                         >
-                          <h2
-                            key="0.5"
+                          <p
+                            style={
+                              Object {
+                                "fontWeight": "bold",
+                              }
+                            }
                           >
                             This dashboard is empty. Let’s fill it up!
-                          </h2>
+                          </p>
                         </div>
                       </EuiText>
                       <EuiSpacer
@@ -641,33 +1043,53 @@ exports[`DashboardEmptyScreen renders correctly without visualize paragraph 1`]
                           className="euiSpacer euiSpacer--m"
                         />
                       </EuiSpacer>
-                      <EuiText
-                        size="m"
+                      <div
+                        className="dshStartScreen__panelDesc"
                       >
-                        <div
-                          className="euiText euiText--medium"
+                        <EuiText
+                          color="subdued"
+                          size="m"
                         >
-                          <p>
-                            Click the 
-                            <EuiLink
-                              aria-label="Edit dashboard"
-                              data-test-subj=""
-                              onClick={[MockFunction]}
+                          <div
+                            className="euiText euiText--medium"
+                          >
+                            <EuiTextColor
+                              color="subdued"
+                              component="div"
                             >
-                              <button
-                                aria-label="Edit dashboard"
-                                className="euiLink euiLink--primary"
-                                data-test-subj=""
-                                onClick={[MockFunction]}
-                                type="button"
+                              <div
+                                className="euiTextColor euiTextColor--subdued"
                               >
-                                Edit
-                              </button>
-                            </EuiLink>
-                             button in the menu bar above to start working on your new dashboard.
-                          </p>
-                        </div>
-                      </EuiText>
+                                <p>
+                                  Click
+                                  <span>
+                                     
+                                  </span>
+                                  <EuiLink
+                                    aria-label="Edit dashboard"
+                                    data-test-subj=""
+                                    onClick={[MockFunction]}
+                                  >
+                                    <button
+                                      aria-label="Edit dashboard"
+                                      className="euiLink euiLink--primary"
+                                      data-test-subj=""
+                                      onClick={[MockFunction]}
+                                      type="button"
+                                    >
+                                      Edit
+                                    </button>
+                                  </EuiLink>
+                                  <span>
+                                     
+                                  </span>
+                                  in the menu bar above to start adding panels.
+                                </p>
+                              </div>
+                            </EuiTextColor>
+                          </div>
+                        </EuiText>
+                      </div>
                     </div>
                   </EuiPanel>
                 </EuiPageContent>
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx
index 653e7d4215eef..347502c2560ab 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/dashboard_empty_screen.test.tsx
@@ -18,20 +18,27 @@
  */
 import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { DashboardEmptyScreen, DashboardEmptyScreenProps } from '../dashboard_empty_screen';
+import {
+  DashboardEmptyScreen,
+  DashboardEmptyScreenProps,
+} from '../np_ready/dashboard_empty_screen';
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
+import { coreMock } from '../../../../../../core/public/mocks';
 
 describe('DashboardEmptyScreen', () => {
+  const setupMock = coreMock.createSetup();
+
   const defaultProps = {
     showLinkToVisualize: true,
     onLinkClick: jest.fn(),
+    uiSettings: setupMock.uiSettings,
+    http: setupMock.http,
   };
 
   function mountComponent(props?: DashboardEmptyScreenProps) {
     const compProps = props || defaultProps;
-    const comp = mountWithIntl(<DashboardEmptyScreen {...compProps} />);
-    return comp;
+    return mountWithIntl(<DashboardEmptyScreen {...compProps} />);
   }
 
   test('renders correctly with visualize paragraph', () => {
@@ -44,8 +51,10 @@ describe('DashboardEmptyScreen', () => {
   test('renders correctly without visualize paragraph', () => {
     const component = mountComponent({ ...defaultProps, ...{ showLinkToVisualize: false } });
     expect(component).toMatchSnapshot();
-    const paragraph = findTestSubject(component, 'linkToVisualizeParagraph');
-    expect(paragraph.length).toBe(0);
+    const linkToVisualizeParagraph = findTestSubject(component, 'linkToVisualizeParagraph');
+    expect(linkToVisualizeParagraph.length).toBe(0);
+    const enterEditModeParagraph = component.find('.dshStartScreen__panelDesc');
+    expect(enterEditModeParagraph.length).toBe(1);
   });
 
   test('when specified, prop onVisualizeClick is called correctly', () => {
@@ -58,4 +67,11 @@ describe('DashboardEmptyScreen', () => {
     button.simulate('click');
     expect(onVisualizeClick).toHaveBeenCalled();
   });
+
+  test('renders correctly with readonly mode', () => {
+    const component = mountComponent({ ...defaultProps, ...{ isReadonlyMode: true } });
+    expect(component).toMatchSnapshot();
+    const paragraph = component.find('.dshStartScreen__panelDesc');
+    expect(paragraph.length).toBe(0);
+  });
 });
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts
index bf7135098ea74..1c2405b5824f2 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/get_saved_dashboard_mock.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { searchSourceMock } from '../../../../../ui/public/courier/search_source/mocks';
+import { searchSourceMock } from 'ui/courier/search_source/mocks';
 import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
 
 export function getSavedDashboardMock(
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/_dashboard_app.scss b/src/legacy/core_plugins/kibana/public/dashboard/_dashboard_app.scss
index d9eadf6c0e37d..03a8a07d6b17d 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/_dashboard_app.scss
+++ b/src/legacy/core_plugins/kibana/public/dashboard/_dashboard_app.scss
@@ -6,5 +6,31 @@
 
 .dshStartScreen {
   text-align: center;
-  padding: $euiSizeS;
+}
+
+.dshStartScreen__pageContent {
+  padding: $euiSizeXXL;
+}
+
+.dshStartScreen__panelDesc {
+  max-width: 260px;
+  margin: 0 auto;
+}
+
+.dshEmptyWidget {
+  border: $euiBorderThin;
+  border-style:  dashed;
+  border-radius: $euiBorderRadius;
+  padding: $euiSizeXXL * 2;
+  max-width: 400px;
+  margin-left: $euiSizeS;
+  text-align: center;
+}
+
+.dshEmptyWidget {
+  border: 2px dashed $euiColorLightShade;
+  padding: 4 * $euiSize;
+  max-width: 20em;
+  margin-left: 10px;
+  text-align: center;
 }
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/application.ts
deleted file mode 100644
index 3482197e381e6..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/application.ts
+++ /dev/null
@@ -1,225 +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 { EuiConfirmModal, EuiIcon } from '@elastic/eui';
-import angular, { IModule } from 'angular';
-import { IPrivate } from 'ui/private';
-import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
-import {
-  AppMountContext,
-  ChromeStart,
-  LegacyCoreStart,
-  SavedObjectsClientContract,
-  IUiSettingsClient,
-} from 'kibana/public';
-import { Storage } from '../../../../../plugins/kibana_utils/public';
-import {
-  GlobalStateProvider,
-  StateManagementConfigProvider,
-  AppStateProvider,
-  PrivateProvider,
-  EventsProvider,
-  PersistedState,
-  createTopNavDirective,
-  createTopNavHelper,
-  PromiseServiceCreator,
-  KbnUrlProvider,
-  RedirectWhenMissingProvider,
-  confirmModalFactory,
-  configureAppAngularModule,
-} from './legacy_imports';
-
-// @ts-ignore
-import { initDashboardApp } from './legacy_app';
-import { IEmbeddableStart } from '../../../../../plugins/embeddable/public';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
-import { DataPublicPluginStart as NpDataStart } from '../../../../../plugins/data/public';
-import { SharePluginStart } from '../../../../../plugins/share/public';
-
-export interface RenderDeps {
-  core: LegacyCoreStart;
-  npDataStart: NpDataStart;
-  navigation: NavigationStart;
-  savedObjectsClient: SavedObjectsClientContract;
-  savedObjectRegistry: any;
-  dashboardConfig: any;
-  savedDashboards: any;
-  dashboardCapabilities: any;
-  uiSettings: IUiSettingsClient;
-  chrome: ChromeStart;
-  addBasePath: (path: string) => string;
-  savedQueryService: NpDataStart['query']['savedQueries'];
-  embeddables: IEmbeddableStart;
-  localStorage: Storage;
-  share: SharePluginStart;
-}
-
-let angularModuleInstance: IModule | null = null;
-
-export const renderApp = (element: HTMLElement, appBasePath: string, deps: RenderDeps) => {
-  if (!angularModuleInstance) {
-    angularModuleInstance = createLocalAngularModule(deps.core, deps.navigation);
-    // global routing stuff
-    configureAppAngularModule(angularModuleInstance, deps.core as LegacyCoreStart, true);
-    // custom routing stuff
-    initDashboardApp(angularModuleInstance, deps);
-  }
-  const $injector = mountDashboardApp(appBasePath, element);
-  return () => {
-    $injector.get('$rootScope').$destroy();
-  };
-};
-
-const mainTemplate = (basePath: string) => `<div style="height: 100%">
-  <base href="${basePath}" />
-  <div ng-view style="height: 100%;"></div>
-</div>
-`;
-
-const moduleName = 'app/dashboard';
-
-const thirdPartyAngularDependencies = ['ngSanitize', 'ngRoute', 'react'];
-
-function mountDashboardApp(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]);
-  // initialize global state handler
-  element.appendChild(mountpoint);
-  return $injector;
-}
-
-function createLocalAngularModule(core: AppMountContext['core'], navigation: NavigationStart) {
-  createLocalI18nModule();
-  createLocalPrivateModule();
-  createLocalPromiseModule();
-  createLocalConfigModule(core);
-  createLocalKbnUrlModule();
-  createLocalStateModule();
-  createLocalPersistedStateModule();
-  createLocalTopNavModule(navigation);
-  createLocalConfirmModalModule();
-  createLocalIconModule();
-
-  const dashboardAngularModule = angular.module(moduleName, [
-    ...thirdPartyAngularDependencies,
-    'app/dashboard/Config',
-    'app/dashboard/I18n',
-    'app/dashboard/Private',
-    'app/dashboard/PersistedState',
-    'app/dashboard/TopNav',
-    'app/dashboard/State',
-    'app/dashboard/ConfirmModal',
-    'app/dashboard/icon',
-  ]);
-  return dashboardAngularModule;
-}
-
-function createLocalIconModule() {
-  angular
-    .module('app/dashboard/icon', ['react'])
-    .directive('icon', reactDirective => reactDirective(EuiIcon));
-}
-
-function createLocalConfirmModalModule() {
-  angular
-    .module('app/dashboard/ConfirmModal', ['react'])
-    .factory('confirmModal', confirmModalFactory)
-    .directive('confirmModal', reactDirective => reactDirective(EuiConfirmModal));
-}
-
-function createLocalStateModule() {
-  angular
-    .module('app/dashboard/State', [
-      'app/dashboard/Private',
-      'app/dashboard/Config',
-      'app/dashboard/KbnUrl',
-      'app/dashboard/Promise',
-      'app/dashboard/PersistedState',
-    ])
-    .factory('AppState', function(Private: any) {
-      return Private(AppStateProvider);
-    })
-    .service('getAppState', function(Private: any) {
-      return Private(AppStateProvider).getAppState;
-    })
-    .service('globalState', function(Private: any) {
-      return Private(GlobalStateProvider);
-    });
-}
-
-function createLocalPersistedStateModule() {
-  angular
-    .module('app/dashboard/PersistedState', ['app/dashboard/Private', 'app/dashboard/Promise'])
-    .factory('PersistedState', (Private: IPrivate) => {
-      const Events = Private(EventsProvider);
-      return class AngularPersistedState extends PersistedState {
-        constructor(value: any, path: any) {
-          super(value, path, Events);
-        }
-      };
-    });
-}
-
-function createLocalKbnUrlModule() {
-  angular
-    .module('app/dashboard/KbnUrl', ['app/dashboard/Private', 'ngRoute'])
-    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider))
-    .service('redirectWhenMissing', (Private: IPrivate) => Private(RedirectWhenMissingProvider));
-}
-
-function createLocalConfigModule(core: AppMountContext['core']) {
-  angular
-    .module('app/dashboard/Config', ['app/dashboard/Private'])
-    .provider('stateManagementConfig', StateManagementConfigProvider)
-    .provider('config', () => {
-      return {
-        $get: () => ({
-          get: core.uiSettings.get.bind(core.uiSettings),
-        }),
-      };
-    });
-}
-
-function createLocalPromiseModule() {
-  angular.module('app/dashboard/Promise', []).service('Promise', PromiseServiceCreator);
-}
-
-function createLocalPrivateModule() {
-  angular.module('app/dashboard/Private', []).provider('Private', PrivateProvider);
-}
-
-function createLocalTopNavModule(navigation: NavigationStart) {
-  angular
-    .module('app/dashboard/TopNav', ['react'])
-    .directive('kbnTopNav', createTopNavDirective)
-    .directive('kbnTopNavHelper', createTopNavHelper(navigation.ui));
-}
-
-function createLocalI18nModule() {
-  angular
-    .module('app/dashboard/I18n', [])
-    .provider('i18n', I18nProvider)
-    .filter('i18n', i18nFilter)
-    .directive('i18nId', i18nDirective);
-}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_empty_screen.tsx b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_empty_screen.tsx
deleted file mode 100644
index 2fc78d64d0a0c..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_empty_screen.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React from 'react';
-import { I18nProvider } from '@kbn/i18n/react';
-import {
-  EuiIcon,
-  EuiLink,
-  EuiSpacer,
-  EuiPageContent,
-  EuiPageBody,
-  EuiPage,
-  EuiText,
-  EuiButton,
-} from '@elastic/eui';
-import * as constants from './dashboard_empty_screen_constants';
-
-export interface DashboardEmptyScreenProps {
-  showLinkToVisualize: boolean;
-  onLinkClick: () => void;
-  onVisualizeClick?: () => void;
-}
-
-export function DashboardEmptyScreen({
-  showLinkToVisualize,
-  onLinkClick,
-  onVisualizeClick,
-}: DashboardEmptyScreenProps) {
-  const linkToVisualizeParagraph = (
-    <p data-test-subj="linkToVisualizeParagraph">
-      <EuiButton
-        iconSide="right"
-        fill
-        iconType="arrowDown"
-        onClick={onVisualizeClick}
-        data-test-subj="addVisualizationButton"
-      >
-        {constants.createNewVisualizationButton}
-      </EuiButton>
-    </p>
-  );
-  const paragraph = (
-    description1: string,
-    description2: string,
-    linkText: string,
-    ariaLabel: string,
-    dataTestSubj?: string
-  ) => {
-    return (
-      <EuiText size="m">
-        <p>
-          {description1}
-          <EuiLink onClick={onLinkClick} aria-label={ariaLabel} data-test-subj={dataTestSubj || ''}>
-            {linkText}
-          </EuiLink>
-          {description2}
-        </p>
-      </EuiText>
-    );
-  };
-  const addVisualizationParagraph = (
-    <React.Fragment>
-      {paragraph(
-        constants.addVisualizationDescription1,
-        constants.addVisualizationDescription2,
-        constants.addVisualizationLinkText,
-        constants.addVisualizationLinkAriaLabel,
-        'emptyDashboardAddPanelButton'
-      )}
-      <EuiSpacer size="m" />
-      {linkToVisualizeParagraph}
-    </React.Fragment>
-  );
-  const enterEditModeParagraph = paragraph(
-    constants.howToStartWorkingOnNewDashboardDescription1,
-    constants.howToStartWorkingOnNewDashboardDescription2,
-    constants.howToStartWorkingOnNewDashboardEditLinkText,
-    constants.howToStartWorkingOnNewDashboardEditLinkAriaLabel
-  );
-  return (
-    <I18nProvider>
-      <EuiPage className="dshStartScreen" restrictWidth="36em">
-        <EuiPageBody>
-          <EuiPageContent verticalPosition="center" horizontalPosition="center">
-            <EuiIcon type="dashboardApp" size="xxl" color="subdued" />
-            <EuiSpacer size="s" />
-            <EuiText grow={true}>
-              <h2 key={0.5}>{constants.fillDashboardTitle}</h2>
-            </EuiText>
-            <EuiSpacer size="m" />
-            {showLinkToVisualize ? addVisualizationParagraph : enterEditModeParagraph}
-          </EuiPageContent>
-        </EuiPageBody>
-      </EuiPage>
-    </I18nProvider>
-  );
-}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_empty_screen_constants.tsx b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_empty_screen_constants.tsx
deleted file mode 100644
index 03004f6270fef..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_empty_screen_constants.tsx
+++ /dev/null
@@ -1,84 +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 const addVisualizationDescription1: string = i18n.translate(
-  'kbn.dashboard.addVisualizationDescription1',
-  {
-    defaultMessage: 'Click the ',
-  }
-);
-export const addVisualizationDescription2: string = i18n.translate(
-  'kbn.dashboard.addVisualizationDescription2',
-  {
-    defaultMessage: ' button in the menu bar above to add a visualization to the dashboard.',
-  }
-);
-export const addVisualizationLinkText: string = i18n.translate(
-  'kbn.dashboard.addVisualizationLinkText',
-  {
-    defaultMessage: 'Add',
-  }
-);
-export const addVisualizationLinkAriaLabel: string = i18n.translate(
-  'kbn.dashboard.addVisualizationLinkAriaLabel',
-  {
-    defaultMessage: 'Add visualization',
-  }
-);
-export const howToStartWorkingOnNewDashboardDescription1: string = i18n.translate(
-  'kbn.dashboard.howToStartWorkingOnNewDashboardDescription1',
-  {
-    defaultMessage: 'Click the ',
-  }
-);
-export const howToStartWorkingOnNewDashboardDescription2: string = i18n.translate(
-  'kbn.dashboard.howToStartWorkingOnNewDashboardDescription2',
-  {
-    defaultMessage: ' button in the menu bar above to start working on your new dashboard.',
-  }
-);
-export const howToStartWorkingOnNewDashboardEditLinkText: string = i18n.translate(
-  'kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkText',
-  {
-    defaultMessage: 'Edit',
-  }
-);
-export const howToStartWorkingOnNewDashboardEditLinkAriaLabel: string = i18n.translate(
-  'kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkAriaLabel',
-  {
-    defaultMessage: 'Edit dashboard',
-  }
-);
-export const fillDashboardTitle: string = i18n.translate('kbn.dashboard.fillDashboardTitle', {
-  defaultMessage: 'This dashboard is empty. Let\u2019s fill it up!',
-});
-export const visualizeAppLinkTest: string = i18n.translate(
-  'kbn.dashboard.visitVisualizeAppLinkText',
-  {
-    defaultMessage: 'visit the Visualize app',
-  }
-);
-export const createNewVisualizationButton: string = i18n.translate(
-  'kbn.dashboard.createNewVisualizationButton',
-  {
-    defaultMessage: 'Create new',
-  }
-);
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/global_state_sync.ts b/src/legacy/core_plugins/kibana/public/dashboard/global_state_sync.ts
deleted file mode 100644
index 8a733f940734b..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/global_state_sync.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { State } from './legacy_imports';
-import { DataPublicPluginStart as NpDataStart } from '../../../../../plugins/data/public';
-
-/**
- * Helper function to sync the global state with the various state providers
- * when a local angular application mounts. There are three different ways
- * global state can be passed into the application:
- * * parameter in the URL hash - e.g. shared link
- * * in-memory state in the data plugin exports (timefilter and filterManager) - e.g. default values
- *
- * This function looks up the three sources (earlier in the list means it takes precedence),
- * puts it into the globalState object and syncs it with the url.
- *
- * Currently the legacy chrome takes care of restoring the global state when navigating from
- * one app to another - to migrate away from that it will become necessary to also write the current
- * state to local storage
- */
-export function syncOnMount(
-  globalState: State,
-  {
-    query: {
-      filterManager,
-      timefilter: { timefilter },
-    },
-  }: NpDataStart
-) {
-  // pull in global state information from the URL
-  globalState.fetch();
-  // remember whether there were info in the URL
-  const hasGlobalURLState = Boolean(Object.keys(globalState.toObject()).length);
-
-  // sync kibana platform state with the angular global state
-  if (!globalState.time) {
-    globalState.time = timefilter.getTime();
-  }
-  if (!globalState.refreshInterval) {
-    globalState.refreshInterval = timefilter.getRefreshInterval();
-  }
-  if (!globalState.filters && filterManager.getGlobalFilters().length > 0) {
-    globalState.filters = filterManager.getGlobalFilters();
-  }
-  // only inject cross app global state if there is none in the url itself (that takes precedence)
-  if (hasGlobalURLState) {
-    // set flag the global state is set from the URL
-    globalState.$inheritedGlobalState = true;
-  }
-  globalState.save();
-}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/help_menu/help_menu_util.js b/src/legacy/core_plugins/kibana/public/dashboard/help_menu/help_menu_util.js
deleted file mode 100644
index 55abfa179b56d..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/help_menu/help_menu_util.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 { i18n } from '@kbn/i18n';
-import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
-
-export function addHelpMenuToAppChrome(chrome) {
-  chrome.setHelpExtension({
-    appName: i18n.translate('kbn.dashboard.helpMenu.appName', {
-      defaultMessage: 'Dashboards',
-    }),
-    links: [
-      {
-        linkType: 'documentation',
-        href: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html`,
-      },
-    ],
-  });
-}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/index.ts b/src/legacy/core_plugins/kibana/public/dashboard/index.ts
index dccc4c11e334f..fd39f28a7673a 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/index.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/index.ts
@@ -17,19 +17,15 @@
  * under the License.
  */
 
-import {
-  npSetup,
-  npStart,
-  SavedObjectRegistryProvider,
-  legacyChrome,
-  IPrivate,
-} from './legacy_imports';
+import { npSetup, npStart, legacyChrome } from './legacy_imports';
 import { DashboardPlugin, LegacyAngularInjectedDependencies } from './plugin';
 import { start as data } from '../../../data/public/legacy';
 import { start as embeddables } from '../../../embeddable_api/public/np_ready/public/legacy';
-import './saved_dashboard/saved_dashboards';
+import './saved_dashboard/saved_dashboard_register';
 import './dashboard_config';
 
+export * from './np_ready/dashboard_constants';
+
 /**
  * Get dependencies relying on the global angular context.
  * They also have to get resolved together with the legacy imports above
@@ -37,14 +33,8 @@ import './dashboard_config';
 async function getAngularDependencies(): Promise<LegacyAngularInjectedDependencies> {
   const injector = await legacyChrome.dangerouslyGetActiveInjector();
 
-  const Private = injector.get<IPrivate>('Private');
-
-  const savedObjectRegistry = Private(SavedObjectRegistryProvider);
-
   return {
     dashboardConfig: injector.get('dashboardConfig'),
-    savedObjectRegistry,
-    savedDashboards: injector.get('savedDashboards'),
   };
 }
 
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_app.js b/src/legacy/core_plugins/kibana/public/dashboard/legacy_app.js
deleted file mode 100644
index 927717948168a..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_app.js
+++ /dev/null
@@ -1,233 +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 dashboardTemplate from './dashboard_app.html';
-import dashboardListingTemplate from './listing/dashboard_listing_ng_wrapper.html';
-
-import { ensureDefaultIndexPattern } from './legacy_imports';
-import { initDashboardAppDirective } from './dashboard_app';
-import { DashboardConstants, createDashboardEditUrl } from './dashboard_constants';
-import {
-  InvalidJSONProperty,
-  SavedObjectNotFound,
-} from '../../../../../plugins/kibana_utils/public';
-import { DashboardListing, EMPTY_FILTER } from './listing/dashboard_listing';
-import { addHelpMenuToAppChrome } from './help_menu/help_menu_util';
-import { registerTimefilterWithGlobalStateFactory } from '../../../../ui/public/timefilter/setup_router';
-import { syncOnMount } from './global_state_sync';
-
-export function initDashboardApp(app, deps) {
-  initDashboardAppDirective(app, deps);
-
-  app.directive('dashboardListing', function(reactDirective) {
-    return reactDirective(DashboardListing);
-  });
-
-  function createNewDashboardCtrl($scope) {
-    $scope.visitVisualizeAppLinkText = i18n.translate('kbn.dashboard.visitVisualizeAppLinkText', {
-      defaultMessage: 'visit the Visualize app',
-    });
-    addHelpMenuToAppChrome(deps.chrome, deps.core.docLinks);
-  }
-
-  app.run(globalState => {
-    syncOnMount(globalState, deps.npDataStart);
-  });
-
-  app.run((globalState, $rootScope) => {
-    registerTimefilterWithGlobalStateFactory(
-      deps.npDataStart.query.timefilter.timefilter,
-      globalState,
-      $rootScope
-    );
-  });
-
-  app.config(function($routeProvider) {
-    const defaults = {
-      reloadOnSearch: false,
-      requireUICapability: 'dashboard.show',
-      badge: () => {
-        if (deps.dashboardCapabilities.showWriteControls) {
-          return undefined;
-        }
-
-        return {
-          text: i18n.translate('kbn.dashboard.badge.readOnly.text', {
-            defaultMessage: 'Read only',
-          }),
-          tooltip: i18n.translate('kbn.dashboard.badge.readOnly.tooltip', {
-            defaultMessage: 'Unable to save dashboards',
-          }),
-          iconType: 'glasses',
-        };
-      },
-    };
-
-    $routeProvider
-      .when(DashboardConstants.LANDING_PAGE_PATH, {
-        ...defaults,
-        template: dashboardListingTemplate,
-        controller($injector, $location, $scope) {
-          const services = deps.savedObjectRegistry.byLoaderPropertiesName;
-          const kbnUrl = $injector.get('kbnUrl');
-          const dashboardConfig = deps.dashboardConfig;
-
-          $scope.listingLimit = deps.uiSettings.get('savedObjects:listingLimit');
-          $scope.create = () => {
-            kbnUrl.redirect(DashboardConstants.CREATE_NEW_DASHBOARD_URL);
-          };
-          $scope.find = search => {
-            return services.dashboards.find(search, $scope.listingLimit);
-          };
-          $scope.editItem = ({ id }) => {
-            kbnUrl.redirect(`${createDashboardEditUrl(id)}?_a=(viewMode:edit)`);
-          };
-          $scope.getViewUrl = ({ id }) => {
-            return deps.addBasePath(`#${createDashboardEditUrl(id)}`);
-          };
-          $scope.delete = dashboards => {
-            return services.dashboards.delete(dashboards.map(d => d.id));
-          };
-          $scope.hideWriteControls = dashboardConfig.getHideWriteControls();
-          $scope.initialFilter = $location.search().filter || EMPTY_FILTER;
-          deps.chrome.setBreadcrumbs([
-            {
-              text: i18n.translate('kbn.dashboard.dashboardBreadcrumbsTitle', {
-                defaultMessage: 'Dashboards',
-              }),
-            },
-          ]);
-          addHelpMenuToAppChrome(deps.chrome, deps.core.docLinks);
-        },
-        resolve: {
-          dash: function($rootScope, $route, redirectWhenMissing, kbnUrl) {
-            return ensureDefaultIndexPattern(deps.core, deps.npDataStart, $rootScope, kbnUrl).then(
-              () => {
-                const savedObjectsClient = deps.savedObjectsClient;
-                const title = $route.current.params.title;
-                if (title) {
-                  return savedObjectsClient
-                    .find({
-                      search: `"${title}"`,
-                      search_fields: 'title',
-                      type: 'dashboard',
-                    })
-                    .then(results => {
-                      // The search isn't an exact match, lets see if we can find a single exact match to use
-                      const matchingDashboards = results.savedObjects.filter(
-                        dashboard =>
-                          dashboard.attributes.title.toLowerCase() === title.toLowerCase()
-                      );
-                      if (matchingDashboards.length === 1) {
-                        kbnUrl.redirect(createDashboardEditUrl(matchingDashboards[0].id));
-                      } else {
-                        kbnUrl.redirect(
-                          `${DashboardConstants.LANDING_PAGE_PATH}?filter="${title}"`
-                        );
-                      }
-                      $rootScope.$digest();
-                      return new Promise(() => {});
-                    });
-                }
-              }
-            );
-          },
-        },
-      })
-      .when(DashboardConstants.CREATE_NEW_DASHBOARD_URL, {
-        ...defaults,
-        template: dashboardTemplate,
-        controller: createNewDashboardCtrl,
-        requireUICapability: 'dashboard.createNew',
-        resolve: {
-          dash: function(redirectWhenMissing, $rootScope, kbnUrl) {
-            return ensureDefaultIndexPattern(deps.core, deps.npDataStart, $rootScope, kbnUrl)
-              .then(() => {
-                return deps.savedDashboards.get();
-              })
-              .catch(
-                redirectWhenMissing({
-                  dashboard: DashboardConstants.LANDING_PAGE_PATH,
-                })
-              );
-          },
-        },
-      })
-      .when(createDashboardEditUrl(':id'), {
-        ...defaults,
-        template: dashboardTemplate,
-        controller: createNewDashboardCtrl,
-        resolve: {
-          dash: function($rootScope, $route, redirectWhenMissing, kbnUrl, AppState) {
-            const id = $route.current.params.id;
-
-            return ensureDefaultIndexPattern(deps.core, deps.npDataStart, $rootScope, kbnUrl)
-              .then(() => {
-                return deps.savedDashboards.get(id);
-              })
-              .then(savedDashboard => {
-                deps.chrome.recentlyAccessed.add(
-                  savedDashboard.getFullPath(),
-                  savedDashboard.title,
-                  id
-                );
-                return savedDashboard;
-              })
-              .catch(error => {
-                // A corrupt dashboard was detected (e.g. with invalid JSON properties)
-                if (error instanceof InvalidJSONProperty) {
-                  deps.toastNotifications.addDanger(error.message);
-                  kbnUrl.redirect(DashboardConstants.LANDING_PAGE_PATH);
-                  return;
-                }
-
-                // Preserve BWC of v5.3.0 links for new, unsaved dashboards.
-                // See https://github.com/elastic/kibana/issues/10951 for more context.
-                if (error instanceof SavedObjectNotFound && id === 'create') {
-                  // Note "new AppState" is necessary so the state in the url is preserved through the redirect.
-                  kbnUrl.redirect(DashboardConstants.CREATE_NEW_DASHBOARD_URL, {}, new AppState());
-                  deps.toastNotifications.addWarning(
-                    i18n.translate('kbn.dashboard.urlWasRemovedInSixZeroWarningMessage', {
-                      defaultMessage:
-                        'The url "dashboard/create" was removed in 6.0. Please update your bookmarks.',
-                    })
-                  );
-                  return new Promise(() => {});
-                } else {
-                  throw error;
-                }
-              })
-              .catch(
-                redirectWhenMissing({
-                  dashboard: DashboardConstants.LANDING_PAGE_PATH,
-                })
-              );
-          },
-        },
-      })
-      .when(`dashboard/:tail*?`, {
-        redirectTo: `/${deps.core.injectedMetadata.getInjectedVar('kbnDefaultAppId')}`,
-      })
-      .when(`dashboards/:tail*?`, {
-        redirectTo: `/${deps.core.injectedMetadata.getInjectedVar('kbnDefaultAppId')}`,
-      });
-  });
-}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
index adae063a1470b..ec0913e5fb3e7 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
@@ -32,7 +32,6 @@ export { AppState } from 'ui/state_management/app_state';
 export { AppStateClass } from 'ui/state_management/app_state';
 export { SavedObjectSaveOpts } from 'ui/saved_objects/types';
 export { npSetup, npStart } from 'ui/new_platform';
-export { SavedObjectRegistryProvider } from 'ui/saved_objects';
 export { IPrivate } from 'ui/private';
 export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
@@ -57,7 +56,7 @@ export { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_to
 // @ts-ignore
 export { PromiseServiceCreator } from 'ui/promises/promises';
 // @ts-ignore
-export { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url';
+export { KbnUrlProvider, RedirectWhenMissingProvider } from 'ui/url/index';
 // @ts-ignore
 export { confirmModalFactory } from 'ui/modals/confirm_modal';
 export { configureAppAngularModule } from 'ui/legacy_compat';
@@ -65,3 +64,6 @@ export { stateMonitorFactory, StateMonitor } from 'ui/state_management/state_mon
 export { ensureDefaultIndexPattern } from 'ui/legacy_compat';
 export { unhashUrl } from '../../../../../plugins/kibana_utils/public';
 export { IInjector } from 'ui/chrome';
+export { SavedObjectLoader } from 'ui/saved_objects';
+export { VISUALIZE_EMBEDDABLE_TYPE } from '../visualize_embeddable';
+export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
index 09677f149c064..ad4feacde0815 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts
@@ -37,7 +37,7 @@ jest.mock(
 jest.mock('ui/new_platform');
 
 import { migratePanelsTo730 } from './migrate_to_730_panels';
-import { SavedDashboardPanelTo60, SavedDashboardPanel730ToLatest } from '../types';
+import { SavedDashboardPanelTo60, SavedDashboardPanel730ToLatest } from '../np_ready/types';
 import {
   RawSavedDashboardPanelTo60,
   RawSavedDashboardPanel610,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts
index b1b5a57ca27dc..b0d20b4482728 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts
@@ -34,7 +34,7 @@ import {
   SavedDashboardPanel620,
   SavedDashboardPanel630,
   SavedDashboardPanel610,
-} from '../types';
+} from '../np_ready/types';
 
 const PANEL_HEIGHT_SCALE_FACTOR = 5;
 const PANEL_HEIGHT_SCALE_FACTOR_WITH_MARGINS = 4;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/types.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/types.ts
index 7fba2f4003f31..c264358a8f81f 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/types.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { GridData } from '../types';
+import { GridData } from '../np_ready/types';
 import { Doc, DocPre700 } from '../../../migrations/types';
 
 export interface SavedObjectAttributes {
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
new file mode 100644
index 0000000000000..2a5dedab98151
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
@@ -0,0 +1,225 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { EuiConfirmModal, EuiIcon } from '@elastic/eui';
+import angular, { IModule } from 'angular';
+import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
+import {
+  AppMountContext,
+  ChromeStart,
+  LegacyCoreStart,
+  SavedObjectsClientContract,
+  IUiSettingsClient,
+} from 'kibana/public';
+import { Storage } from '../../../../../../plugins/kibana_utils/public';
+import {
+  GlobalStateProvider,
+  StateManagementConfigProvider,
+  AppStateProvider,
+  PrivateProvider,
+  EventsProvider,
+  PersistedState,
+  createTopNavDirective,
+  createTopNavHelper,
+  PromiseServiceCreator,
+  KbnUrlProvider,
+  RedirectWhenMissingProvider,
+  confirmModalFactory,
+  configureAppAngularModule,
+  SavedObjectLoader,
+  IPrivate,
+} from '../legacy_imports';
+
+// @ts-ignore
+import { initDashboardApp } from './legacy_app';
+import { IEmbeddableStart } from '../../../../../../plugins/embeddable/public';
+import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../plugins/navigation/public';
+import { DataPublicPluginStart as NpDataStart } from '../../../../../../plugins/data/public';
+import { SharePluginStart } from '../../../../../../plugins/share/public';
+
+export interface RenderDeps {
+  core: LegacyCoreStart;
+  npDataStart: NpDataStart;
+  navigation: NavigationStart;
+  savedObjectsClient: SavedObjectsClientContract;
+  savedDashboards: SavedObjectLoader;
+  dashboardConfig: any;
+  dashboardCapabilities: any;
+  uiSettings: IUiSettingsClient;
+  chrome: ChromeStart;
+  addBasePath: (path: string) => string;
+  savedQueryService: NpDataStart['query']['savedQueries'];
+  embeddables: IEmbeddableStart;
+  localStorage: Storage;
+  share: SharePluginStart;
+}
+
+let angularModuleInstance: IModule | null = null;
+
+export const renderApp = (element: HTMLElement, appBasePath: string, deps: RenderDeps) => {
+  if (!angularModuleInstance) {
+    angularModuleInstance = createLocalAngularModule(deps.core, deps.navigation);
+    // global routing stuff
+    configureAppAngularModule(angularModuleInstance, deps.core as LegacyCoreStart, true);
+    // custom routing stuff
+    initDashboardApp(angularModuleInstance, deps);
+  }
+  const $injector = mountDashboardApp(appBasePath, element);
+  return () => {
+    $injector.get('$rootScope').$destroy();
+  };
+};
+
+const mainTemplate = (basePath: string) => `<div style="height: 100%">
+  <base href="${basePath}" />
+  <div ng-view style="height: 100%;"></div>
+</div>
+`;
+
+const moduleName = 'app/dashboard';
+
+const thirdPartyAngularDependencies = ['ngSanitize', 'ngRoute', 'react'];
+
+function mountDashboardApp(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]);
+  // initialize global state handler
+  element.appendChild(mountpoint);
+  return $injector;
+}
+
+function createLocalAngularModule(core: AppMountContext['core'], navigation: NavigationStart) {
+  createLocalI18nModule();
+  createLocalPrivateModule();
+  createLocalPromiseModule();
+  createLocalConfigModule(core);
+  createLocalKbnUrlModule();
+  createLocalStateModule();
+  createLocalPersistedStateModule();
+  createLocalTopNavModule(navigation);
+  createLocalConfirmModalModule();
+  createLocalIconModule();
+
+  const dashboardAngularModule = angular.module(moduleName, [
+    ...thirdPartyAngularDependencies,
+    'app/dashboard/Config',
+    'app/dashboard/I18n',
+    'app/dashboard/Private',
+    'app/dashboard/PersistedState',
+    'app/dashboard/TopNav',
+    'app/dashboard/State',
+    'app/dashboard/ConfirmModal',
+    'app/dashboard/icon',
+  ]);
+  return dashboardAngularModule;
+}
+
+function createLocalIconModule() {
+  angular
+    .module('app/dashboard/icon', ['react'])
+    .directive('icon', reactDirective => reactDirective(EuiIcon));
+}
+
+function createLocalConfirmModalModule() {
+  angular
+    .module('app/dashboard/ConfirmModal', ['react'])
+    .factory('confirmModal', confirmModalFactory)
+    .directive('confirmModal', reactDirective => reactDirective(EuiConfirmModal));
+}
+
+function createLocalStateModule() {
+  angular
+    .module('app/dashboard/State', [
+      'app/dashboard/Private',
+      'app/dashboard/Config',
+      'app/dashboard/KbnUrl',
+      'app/dashboard/Promise',
+      'app/dashboard/PersistedState',
+    ])
+    .factory('AppState', function(Private: any) {
+      return Private(AppStateProvider);
+    })
+    .service('getAppState', function(Private: any) {
+      return Private(AppStateProvider).getAppState;
+    })
+    .service('globalState', function(Private: any) {
+      return Private(GlobalStateProvider);
+    });
+}
+
+function createLocalPersistedStateModule() {
+  angular
+    .module('app/dashboard/PersistedState', ['app/dashboard/Private', 'app/dashboard/Promise'])
+    .factory('PersistedState', (Private: IPrivate) => {
+      const Events = Private(EventsProvider);
+      return class AngularPersistedState extends PersistedState {
+        constructor(value: any, path: any) {
+          super(value, path, Events);
+        }
+      };
+    });
+}
+
+function createLocalKbnUrlModule() {
+  angular
+    .module('app/dashboard/KbnUrl', ['app/dashboard/Private', 'ngRoute'])
+    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider))
+    .service('redirectWhenMissing', (Private: IPrivate) => Private(RedirectWhenMissingProvider));
+}
+
+function createLocalConfigModule(core: AppMountContext['core']) {
+  angular
+    .module('app/dashboard/Config', ['app/dashboard/Private'])
+    .provider('stateManagementConfig', StateManagementConfigProvider)
+    .provider('config', () => {
+      return {
+        $get: () => ({
+          get: core.uiSettings.get.bind(core.uiSettings),
+        }),
+      };
+    });
+}
+
+function createLocalPromiseModule() {
+  angular.module('app/dashboard/Promise', []).service('Promise', PromiseServiceCreator);
+}
+
+function createLocalPrivateModule() {
+  angular.module('app/dashboard/Private', []).provider('Private', PrivateProvider);
+}
+
+function createLocalTopNavModule(navigation: NavigationStart) {
+  angular
+    .module('app/dashboard/TopNav', ['react'])
+    .directive('kbnTopNav', createTopNavDirective)
+    .directive('kbnTopNavHelper', createTopNavHelper(navigation.ui));
+}
+
+function createLocalI18nModule() {
+  angular
+    .module('app/dashboard/I18n', [])
+    .provider('i18n', I18nProvider)
+    .filter('i18n', i18nFilter)
+    .directive('i18nId', i18nDirective);
+}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.html b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.html
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.html
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
index 04a8e68276fc2..e9fdc335ba572 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
@@ -25,10 +25,10 @@ import {
   AppState as TAppState,
   IInjector,
   KbnUrl,
-} from './legacy_imports';
+} from '../legacy_imports';
 
-import { ViewMode } from '../../../embeddable_api/public/np_ready/public';
-import { SavedObjectDashboard } from './saved_dashboard/saved_dashboard';
+import { ViewMode } from '../../../../embeddable_api/public/np_ready/public';
+import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
 import { DashboardAppState, SavedDashboardPanel, ConfirmModalFn } from './types';
 import {
   IIndexPattern,
@@ -36,7 +36,7 @@ import {
   Query,
   esFilters,
   SavedQuery,
-} from '../../../../../../src/plugins/data/public';
+} from '../../../../../../plugins/data/public';
 
 import { DashboardAppController } from './dashboard_app_controller';
 import { RenderDeps } from './application';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
index 24b64a88998f4..2523d1e60a741 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -37,9 +37,15 @@ import {
   KbnUrl,
   SavedObjectSaveOpts,
   unhashUrl,
-} from './legacy_imports';
-import { FilterStateManager, IndexPattern } from '../../../data/public';
-import { Query, SavedQuery, IndexPatternsContract } from '../../../../../plugins/data/public';
+  VISUALIZE_EMBEDDABLE_TYPE,
+} from '../legacy_imports';
+import { FilterStateManager } from '../../../../data/public';
+import {
+  IndexPattern,
+  Query,
+  SavedQuery,
+  IndexPatternsContract,
+} from '../../../../../../plugins/data/public';
 
 import {
   DashboardContainer,
@@ -47,14 +53,14 @@ import {
   DashboardContainerFactory,
   DashboardContainerInput,
   DashboardPanelState,
-} from '../../../dashboard_embeddable_container/public/np_ready/public';
+} from '../../../../dashboard_embeddable_container/public/np_ready/public';
 import {
   isErrorEmbeddable,
   ErrorEmbeddable,
   ViewMode,
   openAddPanelFlyout,
   EmbeddableFactoryNotFoundError,
-} from '../../../embeddable_api/public/np_ready/public';
+} from '../../../../embeddable_api/public/np_ready/public';
 import { DashboardAppState, NavAction, ConfirmModalFn, SavedDashboardPanel } from './types';
 
 import { showOptionsPopover } from './top_nav/show_options_popover';
@@ -67,13 +73,12 @@ import { getTopNavConfig } from './top_nav/get_top_nav_config';
 import { TopNavIds } from './top_nav/top_nav_ids';
 import { getDashboardTitle } from './dashboard_strings';
 import { DashboardAppScope } from './dashboard_app';
-import { VISUALIZE_EMBEDDABLE_TYPE } from '../visualize/embeddable';
 import { convertSavedDashboardPanelToPanelState } from './lib/embeddable_saved_object_converters';
 import { RenderDeps } from './application';
 import {
   SavedObjectFinderProps,
   SavedObjectFinderUi,
-} from '../../../../../plugins/kibana_react/public';
+} from '../../../../../../plugins/kibana_react/public';
 
 export interface DashboardAppControllerDependencies extends RenderDeps {
   $scope: DashboardAppScope;
@@ -118,7 +123,7 @@ export class DashboardAppController {
         timefilter: { timefilter },
       },
     },
-    core: { notifications, overlays, chrome, injectedMetadata, uiSettings, savedObjects },
+    core: { notifications, overlays, chrome, injectedMetadata, uiSettings, savedObjects, http },
   }: DashboardAppControllerDependencies) {
     new FilterStateManager(globalState, getAppState, filterManager);
     const queryFilter = filterManager;
@@ -156,6 +161,12 @@ export class DashboardAppController {
       dashboardStateManager.getIsViewMode() &&
       !dashboardConfig.getHideWriteControls();
 
+    const getIsEmptyInReadonlyMode = () =>
+      !dashboardStateManager.getPanels().length &&
+      !getShouldShowEditHelp() &&
+      !getShouldShowViewHelp() &&
+      dashboardConfig.getHideWriteControls();
+
     const addVisualization = () => {
       navActions[TopNavIds.VISUALIZE]();
     };
@@ -188,14 +199,22 @@ export class DashboardAppController {
       }
     };
 
-    const getEmptyScreenProps = (shouldShowEditHelp: boolean): DashboardEmptyScreenProps => {
+    const getEmptyScreenProps = (
+      shouldShowEditHelp: boolean,
+      isEmptyInReadOnlyMode: boolean
+    ): DashboardEmptyScreenProps => {
       const emptyScreenProps: DashboardEmptyScreenProps = {
         onLinkClick: shouldShowEditHelp ? $scope.showAddPanel : $scope.enterEditMode,
         showLinkToVisualize: shouldShowEditHelp,
+        uiSettings,
+        http,
       };
       if (shouldShowEditHelp) {
         emptyScreenProps.onVisualizeClick = addVisualization;
       }
+      if (isEmptyInReadOnlyMode) {
+        emptyScreenProps.isReadonlyMode = true;
+      }
       return emptyScreenProps;
     };
 
@@ -212,6 +231,7 @@ export class DashboardAppController {
       }
       const shouldShowEditHelp = getShouldShowEditHelp();
       const shouldShowViewHelp = getShouldShowViewHelp();
+      const isEmptyInReadonlyMode = getIsEmptyInReadonlyMode();
       return {
         id: dashboardStateManager.savedDashboard.id || '',
         filters: queryFilter.getFilters(),
@@ -224,7 +244,7 @@ export class DashboardAppController {
         viewMode: dashboardStateManager.getViewMode(),
         panels: embeddablesMap,
         isFullScreenMode: dashboardStateManager.getFullScreenMode(),
-        isEmptyState: shouldShowEditHelp || shouldShowViewHelp,
+        isEmptyState: shouldShowEditHelp || shouldShowViewHelp || isEmptyInReadonlyMode,
         useMargins: dashboardStateManager.getUseMargins(),
         lastReloadRequestTime,
         title: dashboardStateManager.getTitle(),
@@ -268,9 +288,12 @@ export class DashboardAppController {
           dashboardContainer.renderEmpty = () => {
             const shouldShowEditHelp = getShouldShowEditHelp();
             const shouldShowViewHelp = getShouldShowViewHelp();
-            const isEmptyState = shouldShowEditHelp || shouldShowViewHelp;
+            const isEmptyInReadOnlyMode = getIsEmptyInReadonlyMode();
+            const isEmptyState = shouldShowEditHelp || shouldShowViewHelp || isEmptyInReadOnlyMode;
             return isEmptyState ? (
-              <DashboardEmptyScreen {...getEmptyScreenProps(shouldShowEditHelp)} />
+              <DashboardEmptyScreen
+                {...getEmptyScreenProps(shouldShowEditHelp, isEmptyInReadOnlyMode)}
+              />
             ) : null;
           };
 
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.tsx
new file mode 100644
index 0000000000000..3ef87fda7236b
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.tsx
@@ -0,0 +1,148 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { I18nProvider } from '@kbn/i18n/react';
+import {
+  EuiLink,
+  EuiSpacer,
+  EuiPageContent,
+  EuiPageBody,
+  EuiPage,
+  EuiImage,
+  EuiText,
+  EuiButton,
+} from '@elastic/eui';
+import { IUiSettingsClient, HttpStart } from 'kibana/public';
+import * as constants from './dashboard_empty_screen_constants';
+
+export interface DashboardEmptyScreenProps {
+  showLinkToVisualize: boolean;
+  onLinkClick: () => void;
+  onVisualizeClick?: () => void;
+  uiSettings: IUiSettingsClient;
+  http: HttpStart;
+  isReadonlyMode?: boolean;
+}
+
+export function DashboardEmptyScreen({
+  showLinkToVisualize,
+  onLinkClick,
+  onVisualizeClick,
+  uiSettings,
+  http,
+  isReadonlyMode,
+}: DashboardEmptyScreenProps) {
+  const IS_DARK_THEME = uiSettings.get('theme:darkMode');
+  const emptyStateGraphicURL = IS_DARK_THEME
+    ? '/plugins/kibana/home/assets/welcome_graphic_dark_2x.png'
+    : '/plugins/kibana/home/assets/welcome_graphic_light_2x.png';
+  const linkToVisualizeParagraph = (
+    <p data-test-subj="linkToVisualizeParagraph">
+      <EuiButton
+        iconSide="right"
+        size="s"
+        fill
+        iconType="arrowDown"
+        onClick={onVisualizeClick}
+        data-test-subj="addVisualizationButton"
+        aria-label={constants.createNewVisualizationButtonAriaLabel}
+      >
+        {constants.createNewVisualizationButton}
+      </EuiButton>
+    </p>
+  );
+  const paragraph = (
+    description1: string | null,
+    description2: string,
+    linkText: string,
+    ariaLabel: string,
+    dataTestSubj?: string
+  ) => {
+    return (
+      <EuiText size="m" color="subdued">
+        <p>
+          {description1}
+          {description1 && <span>&nbsp;</span>}
+          <EuiLink onClick={onLinkClick} aria-label={ariaLabel} data-test-subj={dataTestSubj || ''}>
+            {linkText}
+          </EuiLink>
+          <span>&nbsp;</span>
+          {description2}
+        </p>
+      </EuiText>
+    );
+  };
+  const enterEditModeParagraph = paragraph(
+    constants.howToStartWorkingOnNewDashboardDescription1,
+    constants.howToStartWorkingOnNewDashboardDescription2,
+    constants.howToStartWorkingOnNewDashboardEditLinkText,
+    constants.howToStartWorkingOnNewDashboardEditLinkAriaLabel
+  );
+  const enterViewModeParagraph = paragraph(
+    null,
+    constants.addNewVisualizationDescription,
+    constants.addExistingVisualizationLinkText,
+    constants.addExistingVisualizationLinkAriaLabel
+  );
+  const page = (mainText: string, showAdditionalParagraph?: boolean, additionalText?: string) => {
+    return (
+      <EuiPage className="dshStartScreen" restrictWidth="500px">
+        <EuiPageBody>
+          <EuiPageContent
+            verticalPosition="center"
+            horizontalPosition="center"
+            paddingSize="none"
+            className="dshStartScreen__pageContent"
+          >
+            <EuiImage url={http.basePath.prepend(emptyStateGraphicURL)} alt="" />
+            <EuiText size="m">
+              <p style={{ fontWeight: 'bold' }}>{mainText}</p>
+            </EuiText>
+            {additionalText ? (
+              <EuiText size="m" color="subdued">
+                {additionalText}
+              </EuiText>
+            ) : null}
+            {showAdditionalParagraph ? (
+              <React.Fragment>
+                <EuiSpacer size="m" />
+                <div className="dshStartScreen__panelDesc">{enterEditModeParagraph}</div>
+              </React.Fragment>
+            ) : null}
+          </EuiPageContent>
+        </EuiPageBody>
+      </EuiPage>
+    );
+  };
+  const readonlyMode = page(
+    constants.emptyDashboardTitle,
+    false,
+    constants.emptyDashboardAdditionalPrivilege
+  );
+  const viewMode = page(constants.fillDashboardTitle, true);
+  const editMode = (
+    <div data-test-subj="emptyDashboardWidget" className="dshEmptyWidget">
+      {enterViewModeParagraph}
+      <EuiSpacer size="l" />
+      {linkToVisualizeParagraph}
+    </div>
+  );
+  const actionableMode = showLinkToVisualize ? editMode : viewMode;
+  return <I18nProvider>{isReadonlyMode ? readonlyMode : actionableMode}</I18nProvider>;
+}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx
new file mode 100644
index 0000000000000..51fe31913662a
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx
@@ -0,0 +1,90 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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';
+
+/** READONLY VIEW CONSTANTS **/
+export const emptyDashboardTitle: string = i18n.translate('kbn.dashboard.emptyDashboardTitle', {
+  defaultMessage: 'This dashboard is empty.',
+});
+export const emptyDashboardAdditionalPrivilege = i18n.translate(
+  'kbn.dashboard.emptyDashboardAdditionalPrivilege',
+  {
+    defaultMessage: 'You need additional privileges to edit this dashboard.',
+  }
+);
+/** VIEW MODE CONSTANTS **/
+export const fillDashboardTitle: string = i18n.translate('kbn.dashboard.fillDashboardTitle', {
+  defaultMessage: 'This dashboard is empty. Let\u2019s fill it up!',
+});
+export const howToStartWorkingOnNewDashboardDescription1: string = i18n.translate(
+  'kbn.dashboard.howToStartWorkingOnNewDashboardDescription1',
+  {
+    defaultMessage: 'Click',
+  }
+);
+export const howToStartWorkingOnNewDashboardDescription2: string = i18n.translate(
+  'kbn.dashboard.howToStartWorkingOnNewDashboardDescription2',
+  {
+    defaultMessage: 'in the menu bar above to start adding panels.',
+  }
+);
+export const howToStartWorkingOnNewDashboardEditLinkText: string = i18n.translate(
+  'kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkText',
+  {
+    defaultMessage: 'Edit',
+  }
+);
+export const howToStartWorkingOnNewDashboardEditLinkAriaLabel: string = i18n.translate(
+  'kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkAriaLabel',
+  {
+    defaultMessage: 'Edit dashboard',
+  }
+);
+/** EDIT MODE CONSTANTS **/
+export const addExistingVisualizationLinkText: string = i18n.translate(
+  'kbn.dashboard.addExistingVisualizationLinkText',
+  {
+    defaultMessage: 'Add an existing',
+  }
+);
+export const addExistingVisualizationLinkAriaLabel: string = i18n.translate(
+  'kbn.dashboard.addVisualizationLinkAriaLabel',
+  {
+    defaultMessage: 'Add an existing visualization',
+  }
+);
+export const addNewVisualizationDescription: string = i18n.translate(
+  'kbn.dashboard.addNewVisualizationText',
+  {
+    defaultMessage: 'or new object to this dashboard',
+  }
+);
+export const createNewVisualizationButton: string = i18n.translate(
+  'kbn.dashboard.createNewVisualizationButton',
+  {
+    defaultMessage: 'Create new',
+  }
+);
+export const createNewVisualizationButtonAriaLabel: string = i18n.translate(
+  'kbn.dashboard.createNewVisualizationButtonAriaLabel',
+  {
+    defaultMessage: 'Create new visualization button',
+  }
+);
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts
index 8b786144c7420..4d5101e1f9e5f 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts
@@ -19,8 +19,8 @@
 
 import './np_core.test.mocks';
 import { DashboardStateManager } from './dashboard_state_manager';
-import { getAppStateMock, getSavedDashboardMock } from './__tests__';
-import { AppStateClass } from './legacy_imports';
+import { getAppStateMock, getSavedDashboardMock } from '../__tests__';
+import { AppStateClass } from '../legacy_imports';
 import { DashboardAppState } from './types';
 import { TimeRange, TimefilterContract, InputTimeRange } from 'src/plugins/data/public';
 import { ViewMode } from 'src/plugins/embeddable/public';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts
index ac8628ec2a9d9..6df18757da6f5 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts
@@ -23,23 +23,23 @@ import _ from 'lodash';
 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 { ViewMode } from '../../../../../../plugins/embeddable/public';
 import {
   stateMonitorFactory,
   StateMonitor,
   AppStateClass as TAppStateClass,
   migrateLegacyQuery,
-} from './legacy_imports';
+} from '../legacy_imports';
 import {
   Query,
   esFilters,
   TimefilterContract as Timefilter,
-} from '../../../../../../src/plugins/data/public';
+} from '../../../../../../plugins/data/public';
 
 import { getAppStateDefaults, migrateAppState } from './lib';
 import { convertPanelStateToSavedDashboardPanel } from './lib/embeddable_saved_object_converters';
 import { FilterUtils } from './lib/filter_utils';
-import { SavedObjectDashboard } from './saved_dashboard/saved_dashboard';
+import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
 
 import { SavedDashboardPanel, DashboardAppState, DashboardAppStateDefaults } from './types';
 
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_strings.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_strings.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/dashboard/dashboard_strings.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_strings.ts
index d932116d08dc8..d9406ccba18ba 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_strings.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_strings.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
+import { ViewMode } from '../../../../../../plugins/embeddable/public';
 
 /**
  * @param title {string} the current title of the dashboard
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/global_state_sync.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/global_state_sync.ts
new file mode 100644
index 0000000000000..1a6c2b09ee3fc
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/global_state_sync.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 { State } from '../legacy_imports';
+import { DataPublicPluginStart as NpDataStart } from '../../../../../../plugins/data/public';
+
+/**
+ * Helper function to sync the global state with the various state providers
+ * when a local angular application mounts. There are three different ways
+ * global state can be passed into the application:
+ * * parameter in the URL hash - e.g. shared link
+ * * in-memory state in the data plugin exports (timefilter and filterManager) - e.g. default values
+ *
+ * This function looks up the three sources (earlier in the list means it takes precedence),
+ * puts it into the globalState object and syncs it with the url.
+ *
+ * Currently the legacy chrome takes care of restoring the global state when navigating from
+ * one app to another - to migrate away from that it will become necessary to also write the current
+ * state to local storage
+ */
+export function syncOnMount(
+  globalState: State,
+  {
+    query: {
+      filterManager,
+      timefilter: { timefilter },
+    },
+  }: NpDataStart
+) {
+  // pull in global state information from the URL
+  globalState.fetch();
+  // remember whether there were info in the URL
+  const hasGlobalURLState = Boolean(Object.keys(globalState.toObject()).length);
+
+  // sync kibana platform state with the angular global state
+  if (!globalState.time) {
+    globalState.time = timefilter.getTime();
+  }
+  if (!globalState.refreshInterval) {
+    globalState.refreshInterval = timefilter.getRefreshInterval();
+  }
+  if (!globalState.filters && filterManager.getGlobalFilters().length > 0) {
+    globalState.filters = filterManager.getGlobalFilters();
+  }
+  // only inject cross app global state if there is none in the url itself (that takes precedence)
+  if (hasGlobalURLState) {
+    // set flag the global state is set from the URL
+    globalState.$inheritedGlobalState = true;
+  }
+  globalState.save();
+}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/help_menu/help_menu_util.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/help_menu/help_menu_util.ts
new file mode 100644
index 0000000000000..bc281c6eb340f
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/help_menu/help_menu_util.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 { i18n } from '@kbn/i18n';
+import { CoreStart } from 'kibana/public';
+
+export function addHelpMenuToAppChrome(
+  chrome: CoreStart['chrome'],
+  docLinks: CoreStart['docLinks']
+) {
+  chrome.setHelpExtension({
+    appName: i18n.translate('kbn.dashboard.helpMenu.appName', {
+      defaultMessage: 'Dashboards',
+    }),
+    links: [
+      {
+        linkType: 'documentation',
+        href: `${docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${docLinks.DOC_LINK_VERSION}/dashboard.html`,
+      },
+    ],
+  });
+}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
new file mode 100644
index 0000000000000..540bfcf5aa684
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
@@ -0,0 +1,247 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 dashboardTemplate from './dashboard_app.html';
+import dashboardListingTemplate from './listing/dashboard_listing_ng_wrapper.html';
+
+import {
+  ensureDefaultIndexPattern,
+  registerTimefilterWithGlobalStateFactory,
+} from '../legacy_imports';
+import { initDashboardAppDirective } from './dashboard_app';
+import { DashboardConstants, createDashboardEditUrl } from './dashboard_constants';
+import {
+  InvalidJSONProperty,
+  SavedObjectNotFound,
+} from '../../../../../../plugins/kibana_utils/public';
+import { DashboardListing, EMPTY_FILTER } from './listing/dashboard_listing';
+import { addHelpMenuToAppChrome } from './help_menu/help_menu_util';
+import { syncOnMount } from './global_state_sync';
+
+export function initDashboardApp(app, deps) {
+  initDashboardAppDirective(app, deps);
+
+  app.directive('dashboardListing', function(reactDirective) {
+    return reactDirective(DashboardListing, [
+      ['core', { watchDepth: 'reference' }],
+      ['createItem', { watchDepth: 'reference' }],
+      ['getViewUrl', { watchDepth: 'reference' }],
+      ['editItem', { watchDepth: 'reference' }],
+      ['findItems', { watchDepth: 'reference' }],
+      ['deleteItems', { watchDepth: 'reference' }],
+      ['listingLimit', { watchDepth: 'reference' }],
+      ['hideWriteControls', { watchDepth: 'reference' }],
+      ['initialFilter', { watchDepth: 'reference' }],
+    ]);
+  });
+
+  function createNewDashboardCtrl($scope) {
+    $scope.visitVisualizeAppLinkText = i18n.translate('kbn.dashboard.visitVisualizeAppLinkText', {
+      defaultMessage: 'visit the Visualize app',
+    });
+    addHelpMenuToAppChrome(deps.chrome, deps.core.docLinks);
+  }
+
+  app.run(globalState => {
+    syncOnMount(globalState, deps.npDataStart);
+  });
+
+  app.run((globalState, $rootScope) => {
+    registerTimefilterWithGlobalStateFactory(
+      deps.npDataStart.query.timefilter.timefilter,
+      globalState,
+      $rootScope
+    );
+  });
+
+  app.config(function($routeProvider) {
+    const defaults = {
+      reloadOnSearch: false,
+      requireUICapability: 'dashboard.show',
+      badge: () => {
+        if (deps.dashboardCapabilities.showWriteControls) {
+          return undefined;
+        }
+
+        return {
+          text: i18n.translate('kbn.dashboard.badge.readOnly.text', {
+            defaultMessage: 'Read only',
+          }),
+          tooltip: i18n.translate('kbn.dashboard.badge.readOnly.tooltip', {
+            defaultMessage: 'Unable to save dashboards',
+          }),
+          iconType: 'glasses',
+        };
+      },
+    };
+
+    $routeProvider
+      .when(DashboardConstants.LANDING_PAGE_PATH, {
+        ...defaults,
+        template: dashboardListingTemplate,
+        controller($injector, $location, $scope) {
+          const service = deps.savedDashboards;
+
+          const kbnUrl = $injector.get('kbnUrl');
+          const dashboardConfig = deps.dashboardConfig;
+
+          $scope.listingLimit = deps.uiSettings.get('savedObjects:listingLimit');
+          $scope.create = () => {
+            kbnUrl.redirect(DashboardConstants.CREATE_NEW_DASHBOARD_URL);
+          };
+          $scope.find = search => {
+            return service.find(search, $scope.listingLimit);
+          };
+          $scope.editItem = ({ id }) => {
+            kbnUrl.redirect(`${createDashboardEditUrl(id)}?_a=(viewMode:edit)`);
+          };
+          $scope.getViewUrl = ({ id }) => {
+            return deps.addBasePath(`#${createDashboardEditUrl(id)}`);
+          };
+          $scope.delete = dashboards => {
+            return service.delete(dashboards.map(d => d.id));
+          };
+          $scope.hideWriteControls = dashboardConfig.getHideWriteControls();
+          $scope.initialFilter = $location.search().filter || EMPTY_FILTER;
+          deps.chrome.setBreadcrumbs([
+            {
+              text: i18n.translate('kbn.dashboard.dashboardBreadcrumbsTitle', {
+                defaultMessage: 'Dashboards',
+              }),
+            },
+          ]);
+          addHelpMenuToAppChrome(deps.chrome, deps.core.docLinks);
+          $scope.core = deps.core;
+        },
+        resolve: {
+          dash: function($rootScope, $route, redirectWhenMissing, kbnUrl) {
+            return ensureDefaultIndexPattern(deps.core, deps.npDataStart, $rootScope, kbnUrl).then(
+              () => {
+                const savedObjectsClient = deps.savedObjectsClient;
+                const title = $route.current.params.title;
+                if (title) {
+                  return savedObjectsClient
+                    .find({
+                      search: `"${title}"`,
+                      search_fields: 'title',
+                      type: 'dashboard',
+                    })
+                    .then(results => {
+                      // The search isn't an exact match, lets see if we can find a single exact match to use
+                      const matchingDashboards = results.savedObjects.filter(
+                        dashboard =>
+                          dashboard.attributes.title.toLowerCase() === title.toLowerCase()
+                      );
+                      if (matchingDashboards.length === 1) {
+                        kbnUrl.redirect(createDashboardEditUrl(matchingDashboards[0].id));
+                      } else {
+                        kbnUrl.redirect(
+                          `${DashboardConstants.LANDING_PAGE_PATH}?filter="${title}"`
+                        );
+                      }
+                      $rootScope.$digest();
+                      return new Promise(() => {});
+                    });
+                }
+              }
+            );
+          },
+        },
+      })
+      .when(DashboardConstants.CREATE_NEW_DASHBOARD_URL, {
+        ...defaults,
+        template: dashboardTemplate,
+        controller: createNewDashboardCtrl,
+        requireUICapability: 'dashboard.createNew',
+        resolve: {
+          dash: function(redirectWhenMissing, $rootScope, kbnUrl) {
+            return ensureDefaultIndexPattern(deps.core, deps.npDataStart, $rootScope, kbnUrl)
+              .then(() => {
+                return deps.savedDashboards.get();
+              })
+              .catch(
+                redirectWhenMissing({
+                  dashboard: DashboardConstants.LANDING_PAGE_PATH,
+                })
+              );
+          },
+        },
+      })
+      .when(createDashboardEditUrl(':id'), {
+        ...defaults,
+        template: dashboardTemplate,
+        controller: createNewDashboardCtrl,
+        resolve: {
+          dash: function($rootScope, $route, redirectWhenMissing, kbnUrl, AppState) {
+            const id = $route.current.params.id;
+
+            return ensureDefaultIndexPattern(deps.core, deps.npDataStart, $rootScope, kbnUrl)
+              .then(() => {
+                return deps.savedDashboards.get(id);
+              })
+              .then(savedDashboard => {
+                deps.chrome.recentlyAccessed.add(
+                  savedDashboard.getFullPath(),
+                  savedDashboard.title,
+                  id
+                );
+                return savedDashboard;
+              })
+              .catch(error => {
+                // A corrupt dashboard was detected (e.g. with invalid JSON properties)
+                if (error instanceof InvalidJSONProperty) {
+                  deps.toastNotifications.addDanger(error.message);
+                  kbnUrl.redirect(DashboardConstants.LANDING_PAGE_PATH);
+                  return;
+                }
+
+                // Preserve BWC of v5.3.0 links for new, unsaved dashboards.
+                // See https://github.com/elastic/kibana/issues/10951 for more context.
+                if (error instanceof SavedObjectNotFound && id === 'create') {
+                  // Note "new AppState" is necessary so the state in the url is preserved through the redirect.
+                  kbnUrl.redirect(DashboardConstants.CREATE_NEW_DASHBOARD_URL, {}, new AppState());
+                  deps.toastNotifications.addWarning(
+                    i18n.translate('kbn.dashboard.urlWasRemovedInSixZeroWarningMessage', {
+                      defaultMessage:
+                        'The url "dashboard/create" was removed in 6.0. Please update your bookmarks.',
+                    })
+                  );
+                  return new Promise(() => {});
+                } else {
+                  throw error;
+                }
+              })
+              .catch(
+                redirectWhenMissing({
+                  dashboard: DashboardConstants.LANDING_PAGE_PATH,
+                })
+              );
+          },
+        },
+      })
+      .when(`dashboard/:tail*?`, {
+        redirectTo: `/${deps.core.injectedMetadata.getInjectedVar('kbnDefaultAppId')}`,
+      })
+      .when(`dashboards/:tail*?`, {
+        redirectTo: `/${deps.core.injectedMetadata.getInjectedVar('kbnDefaultAppId')}`,
+      });
+  });
+}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/embeddable_saved_object_converters.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/embeddable_saved_object_converters.test.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/embeddable_saved_object_converters.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/embeddable_saved_object_converters.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/filter_utils.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/filter_utils.ts
index 19a0c32210737..6fbc04969b1c8 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/lib/filter_utils.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/filter_utils.ts
@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import moment, { Moment } from 'moment';
-import { esFilters } from '../../../../../../plugins/data/public';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 /**
  * @typedef {Object} QueryFilter
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/get_app_state_defaults.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts
similarity index 90%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/get_app_state_defaults.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts
index eb4a4356fb27a..eceb51f17d164 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/lib/get_app_state_defaults.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { ViewMode } from '../../../../../../../src/plugins/embeddable/public';
-import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
+import { ViewMode } from '../../../../../../../plugins/embeddable/public';
+import { SavedObjectDashboard } from '../../saved_dashboard/saved_dashboard';
 import { DashboardAppStateDefaults } from '../types';
 
 export function getAppStateDefaults(
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/index.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/index.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/migrate_app_state.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/migrate_app_state.test.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/migrate_app_state.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/migrate_app_state.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.ts
index c4ad754548459..4083900c7ede7 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/lib/migrate_app_state.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.ts
@@ -19,7 +19,7 @@
 
 import semver from 'semver';
 import { i18n } from '@kbn/i18n';
-import { createUiStatsReporter, METRIC_TYPE } from '../../../../ui_metric/public';
+import { createUiStatsReporter, METRIC_TYPE } from '../../../../../ui_metric/public';
 import {
   DashboardAppState,
   SavedDashboardPanelTo60,
@@ -29,7 +29,7 @@ import {
   SavedDashboardPanel640To720,
   SavedDashboardPanel620,
 } from '../types';
-import { migratePanelsTo730 } from '../migrations/migrate_to_730_panels';
+import { migratePanelsTo730 } from '../../migrations/migrate_to_730_panels';
 
 /**
  * Attempts to migrate the state stored in the URL into the latest version of it.
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/save_dashboard.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/save_dashboard.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts
index e322677433ce6..691c87122564f 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/lib/save_dashboard.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts
@@ -18,7 +18,7 @@
  */
 
 import { TimefilterContract } from 'src/plugins/data/public';
-import { SavedObjectSaveOpts } from '../legacy_imports';
+import { SavedObjectSaveOpts } from '../../legacy_imports';
 import { updateSavedDashboard } from './update_saved_dashboard';
 import { DashboardStateManager } from '../dashboard_state_manager';
 
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/lib/update_saved_dashboard.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/dashboard/lib/update_saved_dashboard.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts
index ce9096b3a56f0..2072b5d4f6eb0 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/lib/update_saved_dashboard.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts
@@ -19,9 +19,9 @@
 
 import _ from 'lodash';
 import { RefreshInterval, TimefilterContract } from 'src/plugins/data/public';
-import { AppState } from '../legacy_imports';
+import { AppState } from '../../legacy_imports';
 import { FilterUtils } from './filter_utils';
-import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
+import { SavedObjectDashboard } from '../../saved_dashboard/saved_dashboard';
 
 export function updateSavedDashboard(
   savedDashboard: SavedObjectDashboard,
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/__snapshots__/dashboard_listing.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/__snapshots__/dashboard_listing.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.js
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.js
index 98581223afa46..827fe6eabe784 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.js
@@ -19,13 +19,12 @@
 
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
+
 import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-
 import { EuiLink, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
-import { npStart } from 'ui/new_platform';
 
-import { TableListView } from '../../../../../../../src/plugins/kibana_react/public';
+import { TableListView } from '../../../../../../../plugins/kibana_react/public';
 
 export const EMPTY_FILTER = '';
 
@@ -60,8 +59,8 @@ export class DashboardListing extends React.Component {
           tableListTitle={i18n.translate('kbn.dashboard.listing.dashboardsTitle', {
             defaultMessage: 'Dashboards',
           })}
-          toastNotifications={npStart.core.notifications.toasts}
-          uiSettings={npStart.core.uiSettings}
+          toastNotifications={this.props.core.notifications.toasts}
+          uiSettings={this.props.core.uiSettings}
         />
       </I18nProvider>
     );
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.test.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.test.js
similarity index 90%
rename from src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.test.js
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.test.js
index a933607d256a9..c47a54ad60460 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing.test.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.test.js
@@ -42,17 +42,6 @@ jest.mock(
   { virtual: true }
 );
 
-jest.mock('ui/new_platform', () => {
-  return {
-    npStart: {
-      core: {
-        notifications: { toasts: {} },
-        uiSettings: { get: jest.fn(() => 10) },
-      },
-    },
-  };
-});
-
 import React from 'react';
 import { shallow } from 'enzyme';
 
@@ -83,6 +72,7 @@ test('renders empty page in before initial fetch to avoid flickering', () => {
       getViewUrl={() => {}}
       listingLimit={1000}
       hideWriteControls={false}
+      core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
     />
   );
   expect(component).toMatchSnapshot();
@@ -100,6 +90,7 @@ describe('after fetch', () => {
         listingLimit={1000}
         hideWriteControls={false}
         initialFilter="my dashboard"
+        core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
       />
     );
 
@@ -121,6 +112,7 @@ describe('after fetch', () => {
         getViewUrl={() => {}}
         listingLimit={1000}
         hideWriteControls={false}
+        core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
       />
     );
 
@@ -142,6 +134,7 @@ describe('after fetch', () => {
         getViewUrl={() => {}}
         listingLimit={1}
         hideWriteControls={false}
+        core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
       />
     );
 
@@ -163,6 +156,7 @@ describe('after fetch', () => {
         getViewUrl={() => {}}
         listingLimit={1}
         hideWriteControls={true}
+        core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
       />
     );
 
@@ -184,6 +178,7 @@ describe('after fetch', () => {
         getViewUrl={() => {}}
         listingLimit={1}
         hideWriteControls={false}
+        core={{ notifications: { toasts: {} }, uiSettings: { get: jest.fn(() => 10) } }}
       />
     );
 
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing_ng_wrapper.html b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing_ng_wrapper.html
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html
index a1dd9f30bdd81..f473e91af7ae9 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/listing/dashboard_listing_ng_wrapper.html
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html
@@ -1,4 +1,5 @@
 <dashboard-listing
+  core="core"
   create-item="create"
   get-view-url="getViewUrl"
   edit-item="editItem"
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_core.test.mocks.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/np_core.test.mocks.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/np_core.test.mocks.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/np_core.test.mocks.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/__snapshots__/clone_modal.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/__snapshots__/clone_modal.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/save_modal.test.js.snap b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/__snapshots__/save_modal.test.js.snap
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/save_modal.test.js.snap
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/__snapshots__/save_modal.test.js.snap
index aac4cad804a02..aa9eaf09c7e0a 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/save_modal.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/__snapshots__/save_modal.test.js.snap
@@ -24,9 +24,7 @@ exports[`renders DashboardSaveModal 1`] = `
       >
         <EuiTextArea
           data-test-subj="dashboardDescription"
-          fullWidth={false}
           onChange={[Function]}
-          resize="vertical"
           value="dash description"
         />
       </EuiFormRow>
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/clone_modal.test.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/clone_modal.test.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/clone_modal.test.js
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/clone_modal.test.js
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/clone_modal.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/clone_modal.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/clone_modal.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/clone_modal.tsx
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/get_top_nav_config.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/get_top_nav_config.ts
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/get_top_nav_config.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/get_top_nav_config.ts
index 0606cc4f7bdad..7188fab19d6f2 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/get_top_nav_config.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/get_top_nav_config.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ViewMode } from '../../../../../../plugins/embeddable/public';
+import { ViewMode } from '../../../../../../../plugins/embeddable/public';
 import { TopNavIds } from './top_nav_ids';
 import { NavAction } from '../types';
 
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/options.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/options.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/options.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/options.tsx
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/save_modal.test.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.test.js
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/save_modal.test.js
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.test.js
index 2231dd6bc4183..5f708a22fd530 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/save_modal.test.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.test.js
@@ -20,7 +20,7 @@
 import React from 'react';
 import { shallowWithI18nProvider } from 'test_utils/enzyme_helpers';
 
-jest.mock('../legacy_imports', () => ({
+jest.mock('../../legacy_imports', () => ({
   SavedObjectSaveModal: () => null,
 }));
 
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/save_modal.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/save_modal.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.tsx
index 0640b2be431be..bd53fd5a13083 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/save_modal.tsx
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.tsx
@@ -21,7 +21,7 @@ import React, { Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFormRow, EuiTextArea, EuiSwitch } from '@elastic/eui';
 
-import { SavedObjectSaveModal } from '../legacy_imports';
+import { SavedObjectSaveModal } from '../../legacy_imports';
 
 interface SaveOptions {
   newTitle: string;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/show_clone_modal.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/show_clone_modal.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/show_clone_modal.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/show_clone_modal.tsx
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/show_options_popover.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/show_options_popover.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/show_options_popover.tsx
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/show_options_popover.tsx
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/top_nav_ids.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/top_nav_ids.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/dashboard/top_nav/top_nav_ids.ts
rename to src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/top_nav_ids.ts
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts
new file mode 100644
index 0000000000000..e3eb25a208856
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts
@@ -0,0 +1,156 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ViewMode } from 'src/plugins/embeddable/public';
+import { AppState } from '../legacy_imports';
+import {
+  RawSavedDashboardPanelTo60,
+  RawSavedDashboardPanel610,
+  RawSavedDashboardPanel620,
+  RawSavedDashboardPanel630,
+  RawSavedDashboardPanel640To720,
+  RawSavedDashboardPanel730ToLatest,
+} from '../migrations/types';
+import { Query, esFilters } from '../../../../../../plugins/data/public';
+
+export type NavAction = (anchorElement?: any) => void;
+
+export interface GridData {
+  w: number;
+  h: number;
+  x: number;
+  y: number;
+  i: string;
+}
+
+/**
+ * This should always represent the latest dashboard panel shape, after all possible migrations.
+ */
+export type SavedDashboardPanel = SavedDashboardPanel730ToLatest;
+
+// id becomes optional starting in 7.3.0
+export type SavedDashboardPanel730ToLatest = Pick<
+  RawSavedDashboardPanel730ToLatest,
+  Exclude<keyof RawSavedDashboardPanel730ToLatest, 'name'>
+> & {
+  readonly id?: string;
+  readonly type: string;
+};
+
+export type SavedDashboardPanel640To720 = Pick<
+  RawSavedDashboardPanel640To720,
+  Exclude<keyof RawSavedDashboardPanel640To720, 'name'>
+> & {
+  readonly id: string;
+  readonly type: string;
+};
+
+export type SavedDashboardPanel630 = Pick<
+  RawSavedDashboardPanel630,
+  Exclude<keyof RawSavedDashboardPanel620, 'name'>
+> & {
+  readonly id: string;
+  readonly type: string;
+};
+
+export type SavedDashboardPanel620 = Pick<
+  RawSavedDashboardPanel620,
+  Exclude<keyof RawSavedDashboardPanel620, 'name'>
+> & {
+  readonly id: string;
+  readonly type: string;
+};
+
+export type SavedDashboardPanel610 = Pick<
+  RawSavedDashboardPanel610,
+  Exclude<keyof RawSavedDashboardPanel610, 'name'>
+> & {
+  readonly id: string;
+  readonly type: string;
+};
+
+export type SavedDashboardPanelTo60 = Pick<
+  RawSavedDashboardPanelTo60,
+  Exclude<keyof RawSavedDashboardPanelTo60, 'name'>
+> & {
+  readonly id: string;
+  readonly type: string;
+};
+
+export type DashboardAppStateDefaults = DashboardAppStateParameters & {
+  description?: string;
+};
+
+export interface DashboardAppStateParameters {
+  panels: SavedDashboardPanel[];
+  fullScreenMode: boolean;
+  title: string;
+  description: string;
+  timeRestore: boolean;
+  options: {
+    hidePanelTitles: boolean;
+    useMargins: boolean;
+  };
+  query: Query | string;
+  filters: esFilters.Filter[];
+  viewMode: ViewMode;
+  savedQuery?: string;
+}
+
+// This could probably be improved if we flesh out AppState more... though AppState will be going away
+// so maybe not worth too much time atm.
+export type DashboardAppState = DashboardAppStateParameters & AppState;
+
+export interface SavedDashboardPanelMap {
+  [key: string]: SavedDashboardPanel;
+}
+
+export interface StagedFilter {
+  field: string;
+  value: string;
+  operator: string;
+  index: string;
+}
+
+export type ConfirmModalFn = (
+  message: string,
+  confirmOptions: {
+    onConfirm: () => void;
+    onCancel: () => void;
+    confirmButtonText: string;
+    cancelButtonText: string;
+    defaultFocusedButton: string;
+    title: string;
+  }
+) => void;
+
+export type AddFilterFn = (
+  {
+    field,
+    value,
+    operator,
+    index,
+  }: {
+    field: string;
+    value: string;
+    operator: string;
+    index: string;
+  },
+  appState: AppState
+) => void;
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
index 0e0d315ce592d..ca4b18a37504c 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
@@ -26,24 +26,23 @@ import {
   SavedObjectsClientContract,
 } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
-import { RenderDeps } from './application';
+import { RenderDeps } from './np_ready/application';
 import { DataStart } from '../../../data/public';
 import { DataPublicPluginStart as NpDataStart } from '../../../../../plugins/data/public';
 import { IEmbeddableStart } from '../../../../../plugins/embeddable/public';
 import { Storage } from '../../../../../plugins/kibana_utils/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
-import { DashboardConstants } from './dashboard_constants';
+import { DashboardConstants } from './np_ready/dashboard_constants';
 import {
   FeatureCatalogueCategory,
   HomePublicPluginSetup,
 } from '../../../../../plugins/home/public';
 import { SharePluginStart } from '../../../../../plugins/share/public';
 import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
+import { createSavedDashboardLoader } from './saved_dashboard/saved_dashboards';
 
 export interface LegacyAngularInjectedDependencies {
   dashboardConfig: any;
-  savedObjectRegistry: any;
-  savedDashboards: any;
 }
 
 export interface DashboardPluginStartDependencies {
@@ -90,6 +89,13 @@ export class DashboardPlugin implements Plugin {
           npDataStart,
         } = this.startDependencies;
         const angularDependencies = await getAngularDependencies();
+        const savedDashboards = createSavedDashboardLoader({
+          savedObjectsClient,
+          indexPatterns: npDataStart.indexPatterns,
+          chrome: contextCore.chrome,
+          overlays: contextCore.overlays,
+        });
+
         const deps: RenderDeps = {
           core: contextCore as LegacyCoreStart,
           ...angularDependencies,
@@ -97,6 +103,7 @@ export class DashboardPlugin implements Plugin {
           share,
           npDataStart,
           savedObjectsClient,
+          savedDashboards,
           chrome: contextCore.chrome,
           addBasePath: contextCore.http.basePath.prepend,
           uiSettings: contextCore.uiSettings,
@@ -105,7 +112,7 @@ export class DashboardPlugin implements Plugin {
           dashboardCapabilities: contextCore.application.capabilities.dashboard,
           localStorage: new Storage(localStorage),
         };
-        const { renderApp } = await import('./application');
+        const { renderApp } = await import('./np_ready/application');
         return renderApp(params.element, params.appBasePath, deps);
       },
     };
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
deleted file mode 100644
index 20544fa97fdb0..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.d.ts
+++ /dev/null
@@ -1,42 +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 { SavedObject } from 'ui/saved_objects/types';
-import { SearchSourceContract } from '../../../../../ui/public/courier';
-import { esFilters, Query, RefreshInterval } from '../../../../../../plugins/data/public';
-
-export interface SavedObjectDashboard extends SavedObject {
-  id?: string;
-  copyOnSave: boolean;
-  timeRestore: boolean;
-  timeTo?: string;
-  timeFrom?: string;
-  title: string;
-  description?: string;
-  panelsJSON: string;
-  optionsJSON?: string;
-  // TODO: write a migration to rid of this, it's only around for bwc.
-  uiStateJSON?: string;
-  lastSavedTitle: string;
-  searchSource: SearchSourceContract;
-  destroy: () => void;
-  refreshInterval?: RefreshInterval;
-  getQuery(): Query;
-  getFilters(): esFilters.Filter[];
-}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.js b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.js
deleted file mode 100644
index a98625cf3af92..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.js
+++ /dev/null
@@ -1,116 +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';
-import { uiModules } from 'ui/modules';
-import { createDashboardEditUrl } from '../dashboard_constants';
-import { createLegacyClass } from 'ui/utils/legacy_class';
-import { SavedObjectProvider } from 'ui/saved_objects/saved_object';
-import { extractReferences, injectReferences } from './saved_dashboard_references';
-
-const module = uiModules.get('app/dashboard');
-
-// Used only by the savedDashboards service, usually no reason to change this
-module.factory('SavedDashboard', function(Private) {
-  // SavedDashboard constructor. Usually you'd interact with an instance of this.
-  // ID is option, without it one will be generated on save.
-  const SavedObject = Private(SavedObjectProvider);
-  createLegacyClass(SavedDashboard).inherits(SavedObject);
-  function SavedDashboard(id) {
-    // Gives our SavedDashboard the properties of a SavedObject
-    SavedDashboard.Super.call(this, {
-      type: SavedDashboard.type,
-      mapping: SavedDashboard.mapping,
-      searchSource: SavedDashboard.searchsource,
-      extractReferences: extractReferences,
-      injectReferences: injectReferences,
-
-      // if this is null/undefined then the SavedObject will be assigned the defaults
-      id: id,
-
-      // default values that will get assigned if the doc is new
-      defaults: {
-        title: '',
-        hits: 0,
-        description: '',
-        panelsJSON: '[]',
-        optionsJSON: angular.toJson({
-          // for BWC reasons we can't default dashboards that already exist without this setting to true.
-          useMargins: id ? false : true,
-          hidePanelTitles: false,
-        }),
-        version: 1,
-        timeRestore: false,
-        timeTo: undefined,
-        timeFrom: undefined,
-        refreshInterval: undefined,
-      },
-
-      // if an indexPattern was saved with the searchsource of a SavedDashboard
-      // object, clear it. It was a mistake
-      clearSavedIndexPattern: true,
-    });
-
-    this.showInRecentlyAccessed = true;
-  }
-
-  // save these objects with the 'dashboard' type
-  SavedDashboard.type = 'dashboard';
-
-  // if type:dashboard has no mapping, we push this mapping into ES
-  SavedDashboard.mapping = {
-    title: 'text',
-    hits: 'integer',
-    description: 'text',
-    panelsJSON: 'text',
-    optionsJSON: 'text',
-    version: 'integer',
-    timeRestore: 'boolean',
-    timeTo: 'keyword',
-    timeFrom: 'keyword',
-    refreshInterval: {
-      type: 'object',
-      properties: {
-        display: { type: 'keyword' },
-        pause: { type: 'boolean' },
-        section: { type: 'integer' },
-        value: { type: 'integer' },
-      },
-    },
-  };
-
-  // Order these fields to the top, the rest are alphabetical
-  SavedDashboard.fieldOrder = ['title', 'description'];
-
-  SavedDashboard.searchsource = true;
-
-  SavedDashboard.prototype.getFullPath = function() {
-    return `/app/kibana#${createDashboardEditUrl(this.id)}`;
-  };
-
-  SavedDashboard.prototype.getQuery = function() {
-    return this.searchSource.getOwnField('query') || { query: '', language: 'kuery' };
-  };
-
-  SavedDashboard.prototype.getFilters = function() {
-    return this.searchSource.getOwnField('filter') || [];
-  };
-
-  return SavedDashboard;
-});
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.ts
new file mode 100644
index 0000000000000..18e15b215523e
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard.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 { ISearchSource } from 'ui/courier';
+import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
+import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+import { extractReferences, injectReferences } from './saved_dashboard_references';
+
+import { esFilters, Query, RefreshInterval } from '../../../../../../plugins/data/public';
+import { createDashboardEditUrl } from '..';
+
+export interface SavedObjectDashboard extends SavedObject {
+  id?: string;
+  timeRestore: boolean;
+  timeTo?: string;
+  timeFrom?: string;
+  description?: string;
+  panelsJSON: string;
+  optionsJSON?: string;
+  // TODO: write a migration to rid of this, it's only around for bwc.
+  uiStateJSON?: string;
+  lastSavedTitle: string;
+  refreshInterval?: RefreshInterval;
+  searchSource: ISearchSource;
+  getQuery(): Query;
+  getFilters(): esFilters.Filter[];
+}
+
+// Used only by the savedDashboards service, usually no reason to change this
+export function createSavedDashboardClass(services: SavedObjectKibanaServices) {
+  const SavedObjectClass = createSavedObjectClass(services);
+  class SavedDashboard extends SavedObjectClass {
+    // save these objects with the 'dashboard' type
+    public static type = 'dashboard';
+
+    // if type:dashboard has no mapping, we push this mapping into ES
+    public static mapping = {
+      title: 'text',
+      hits: 'integer',
+      description: 'text',
+      panelsJSON: 'text',
+      optionsJSON: 'text',
+      version: 'integer',
+      timeRestore: 'boolean',
+      timeTo: 'keyword',
+      timeFrom: 'keyword',
+      refreshInterval: {
+        type: 'object',
+        properties: {
+          display: { type: 'keyword' },
+          pause: { type: 'boolean' },
+          section: { type: 'integer' },
+          value: { type: 'integer' },
+        },
+      },
+    };
+    public static fieldOrder = ['title', 'description'];
+    public static searchSource = true;
+    public showInRecentlyAccessed = true;
+
+    constructor(id: string) {
+      super({
+        type: SavedDashboard.type,
+        mapping: SavedDashboard.mapping,
+        searchSource: SavedDashboard.searchSource,
+        extractReferences,
+        injectReferences,
+
+        // if this is null/undefined then the SavedObject will be assigned the defaults
+        id,
+
+        // default values that will get assigned if the doc is new
+        defaults: {
+          title: '',
+          hits: 0,
+          description: '',
+          panelsJSON: '[]',
+          optionsJSON: JSON.stringify({
+            // for BWC reasons we can't default dashboards that already exist without this setting to true.
+            useMargins: !id,
+            hidePanelTitles: false,
+          }),
+          version: 1,
+          timeRestore: false,
+          timeTo: undefined,
+          timeFrom: undefined,
+          refreshInterval: undefined,
+        },
+      });
+      this.getFullPath = () => `/app/kibana#${createDashboardEditUrl(String(this.id))}`;
+    }
+
+    getQuery() {
+      return this.searchSource!.getOwnField('query') || { query: '', language: 'kuery' };
+    }
+
+    getFilters() {
+      return this.searchSource!.getOwnField('filter') || [];
+    }
+  }
+
+  return SavedDashboard;
+}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.js b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.js
deleted file mode 100644
index 121814cdc2150..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.js
+++ /dev/null
@@ -1,76 +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 function extractReferences({ attributes, references = [] }) {
-  const panelReferences = [];
-  const panels = JSON.parse(attributes.panelsJSON);
-  panels.forEach((panel, i) => {
-    if (!panel.type) {
-      throw new Error(`"type" attribute is missing from panel "${i}"`);
-    }
-    if (!panel.id) {
-      // Embeddables are not required to be backed off a saved object.
-      return;
-    }
-    panel.panelRefName = `panel_${i}`;
-    panelReferences.push({
-      name: `panel_${i}`,
-      type: panel.type,
-      id: panel.id,
-    });
-    delete panel.type;
-    delete panel.id;
-  });
-  return {
-    references: [...references, ...panelReferences],
-    attributes: {
-      ...attributes,
-      panelsJSON: JSON.stringify(panels),
-    },
-  };
-}
-
-export function injectReferences(savedObject, references) {
-  // Skip if panelsJSON is missing otherwise this will cause saved object import to fail when
-  // importing objects without panelsJSON. At development time of this, there is no guarantee each saved
-  // object has panelsJSON in all previous versions of kibana.
-  if (typeof savedObject.panelsJSON !== 'string') {
-    return;
-  }
-  const panels = JSON.parse(savedObject.panelsJSON);
-  // Same here, prevent failing saved object import if ever panels aren't an array.
-  if (!Array.isArray(panels)) {
-    return;
-  }
-  panels.forEach(panel => {
-    if (!panel.panelRefName) {
-      return;
-    }
-    const reference = references.find(reference => reference.name === panel.panelRefName);
-    if (!reference) {
-      // Throw an error since "panelRefName" means the reference exists within
-      // "references" and in this scenario we have bad data.
-      throw new Error(`Could not find reference "${panel.panelRefName}"`);
-    }
-    panel.id = reference.id;
-    panel.type = reference.type;
-    delete panel.panelRefName;
-  });
-  savedObject.panelsJSON = JSON.stringify(panels);
-}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.test.js b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.test.js
deleted file mode 100644
index efb596b1a86d3..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.test.js
+++ /dev/null
@@ -1,224 +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 { extractReferences, injectReferences } from './saved_dashboard_references';
-
-describe('extractReferences', () => {
-  test('extracts references from panelsJSON', () => {
-    const doc = {
-      id: '1',
-      attributes: {
-        foo: true,
-        panelsJSON: JSON.stringify([
-          {
-            type: 'visualization',
-            id: '1',
-            title: 'Title 1',
-          },
-          {
-            type: 'visualization',
-            id: '2',
-            title: 'Title 2',
-          },
-        ]),
-      },
-    };
-    const updatedDoc = extractReferences(doc);
-
-    expect(updatedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "panelsJSON": "[{\\"title\\":\\"Title 1\\",\\"panelRefName\\":\\"panel_0\\"},{\\"title\\":\\"Title 2\\",\\"panelRefName\\":\\"panel_1\\"}]",
-  },
-  "references": Array [
-    Object {
-      "id": "1",
-      "name": "panel_0",
-      "type": "visualization",
-    },
-    Object {
-      "id": "2",
-      "name": "panel_1",
-      "type": "visualization",
-    },
-  ],
-}
-`);
-  });
-
-  test('fails when "type" attribute is missing from a panel', () => {
-    const doc = {
-      id: '1',
-      attributes: {
-        foo: true,
-        panelsJSON: JSON.stringify([
-          {
-            id: '1',
-            title: 'Title 1',
-          },
-        ]),
-      },
-    };
-    expect(() => extractReferences(doc)).toThrowErrorMatchingInlineSnapshot(
-      `"\\"type\\" attribute is missing from panel \\"0\\""`
-    );
-  });
-
-  test('passes when "id" attribute is missing from a panel', () => {
-    const doc = {
-      id: '1',
-      attributes: {
-        foo: true,
-        panelsJSON: JSON.stringify([
-          {
-            type: 'visualization',
-            title: 'Title 1',
-          },
-        ]),
-      },
-    };
-    expect(extractReferences(doc)).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "panelsJSON": "[{\\"type\\":\\"visualization\\",\\"title\\":\\"Title 1\\"}]",
-  },
-  "references": Array [],
-}
-`);
-  });
-});
-
-describe('injectReferences', () => {
-  test('injects references into context', () => {
-    const context = {
-      id: '1',
-      foo: true,
-      panelsJSON: JSON.stringify([
-        {
-          panelRefName: 'panel_0',
-          title: 'Title 1',
-        },
-        {
-          panelRefName: 'panel_1',
-          title: 'Title 2',
-        },
-      ]),
-    };
-    const references = [
-      {
-        name: 'panel_0',
-        type: 'visualization',
-        id: '1',
-      },
-      {
-        name: 'panel_1',
-        type: 'visualization',
-        id: '2',
-      },
-    ];
-    injectReferences(context, references);
-
-    expect(context).toMatchInlineSnapshot(`
-Object {
-  "foo": true,
-  "id": "1",
-  "panelsJSON": "[{\\"title\\":\\"Title 1\\",\\"id\\":\\"1\\",\\"type\\":\\"visualization\\"},{\\"title\\":\\"Title 2\\",\\"id\\":\\"2\\",\\"type\\":\\"visualization\\"}]",
-}
-`);
-  });
-
-  test('skips when panelsJSON is missing', () => {
-    const context = {
-      id: '1',
-      foo: true,
-    };
-    injectReferences(context, []);
-    expect(context).toMatchInlineSnapshot(`
-Object {
-  "foo": true,
-  "id": "1",
-}
-`);
-  });
-
-  test('skips when panelsJSON is not an array', () => {
-    const context = {
-      id: '1',
-      foo: true,
-      panelsJSON: '{}',
-    };
-    injectReferences(context, []);
-    expect(context).toMatchInlineSnapshot(`
-Object {
-  "foo": true,
-  "id": "1",
-  "panelsJSON": "{}",
-}
-`);
-  });
-
-  test('skips a panel when panelRefName is missing', () => {
-    const context = {
-      id: '1',
-      foo: true,
-      panelsJSON: JSON.stringify([
-        {
-          panelRefName: 'panel_0',
-          title: 'Title 1',
-        },
-        {
-          title: 'Title 2',
-        },
-      ]),
-    };
-    const references = [
-      {
-        name: 'panel_0',
-        type: 'visualization',
-        id: '1',
-      },
-    ];
-    injectReferences(context, references);
-    expect(context).toMatchInlineSnapshot(`
-Object {
-  "foo": true,
-  "id": "1",
-  "panelsJSON": "[{\\"title\\":\\"Title 1\\",\\"id\\":\\"1\\",\\"type\\":\\"visualization\\"},{\\"title\\":\\"Title 2\\"}]",
-}
-`);
-  });
-
-  test(`fails when it can't find the reference in the array`, () => {
-    const context = {
-      id: '1',
-      foo: true,
-      panelsJSON: JSON.stringify([
-        {
-          panelRefName: 'panel_0',
-          title: 'Title 1',
-        },
-      ]),
-    };
-    expect(() => injectReferences(context, [])).toThrowErrorMatchingInlineSnapshot(
-      `"Could not find reference \\"panel_0\\""`
-    );
-  });
-});
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.test.ts
new file mode 100644
index 0000000000000..48f15e84c9307
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.test.ts
@@ -0,0 +1,228 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { extractReferences, injectReferences } from './saved_dashboard_references';
+import { SavedObjectDashboard } from './saved_dashboard';
+
+describe('extractReferences', () => {
+  test('extracts references from panelsJSON', () => {
+    const doc = {
+      id: '1',
+      attributes: {
+        foo: true,
+        panelsJSON: JSON.stringify([
+          {
+            type: 'visualization',
+            id: '1',
+            title: 'Title 1',
+          },
+          {
+            type: 'visualization',
+            id: '2',
+            title: 'Title 2',
+          },
+        ]),
+      },
+      references: [],
+    };
+    const updatedDoc = extractReferences(doc);
+
+    expect(updatedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "panelsJSON": "[{\\"title\\":\\"Title 1\\",\\"panelRefName\\":\\"panel_0\\"},{\\"title\\":\\"Title 2\\",\\"panelRefName\\":\\"panel_1\\"}]",
+  },
+  "references": Array [
+    Object {
+      "id": "1",
+      "name": "panel_0",
+      "type": "visualization",
+    },
+    Object {
+      "id": "2",
+      "name": "panel_1",
+      "type": "visualization",
+    },
+  ],
+}
+`);
+  });
+
+  test('fails when "type" attribute is missing from a panel', () => {
+    const doc = {
+      id: '1',
+      attributes: {
+        foo: true,
+        panelsJSON: JSON.stringify([
+          {
+            id: '1',
+            title: 'Title 1',
+          },
+        ]),
+      },
+      references: [],
+    };
+    expect(() => extractReferences(doc)).toThrowErrorMatchingInlineSnapshot(
+      `"\\"type\\" attribute is missing from panel \\"0\\""`
+    );
+  });
+
+  test('passes when "id" attribute is missing from a panel', () => {
+    const doc = {
+      id: '1',
+      attributes: {
+        foo: true,
+        panelsJSON: JSON.stringify([
+          {
+            type: 'visualization',
+            title: 'Title 1',
+          },
+        ]),
+      },
+      references: [],
+    };
+    expect(extractReferences(doc)).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "panelsJSON": "[{\\"type\\":\\"visualization\\",\\"title\\":\\"Title 1\\"}]",
+  },
+  "references": Array [],
+}
+`);
+  });
+});
+
+describe('injectReferences', () => {
+  test('injects references into context', () => {
+    const context = {
+      id: '1',
+      title: 'test',
+      panelsJSON: JSON.stringify([
+        {
+          panelRefName: 'panel_0',
+          title: 'Title 1',
+        },
+        {
+          panelRefName: 'panel_1',
+          title: 'Title 2',
+        },
+      ]),
+    } as SavedObjectDashboard;
+    const references = [
+      {
+        name: 'panel_0',
+        type: 'visualization',
+        id: '1',
+      },
+      {
+        name: 'panel_1',
+        type: 'visualization',
+        id: '2',
+      },
+    ];
+    injectReferences(context, references);
+
+    expect(context).toMatchInlineSnapshot(`
+Object {
+  "id": "1",
+  "panelsJSON": "[{\\"title\\":\\"Title 1\\",\\"id\\":\\"1\\",\\"type\\":\\"visualization\\"},{\\"title\\":\\"Title 2\\",\\"id\\":\\"2\\",\\"type\\":\\"visualization\\"}]",
+  "title": "test",
+}
+`);
+  });
+
+  test('skips when panelsJSON is missing', () => {
+    const context = {
+      id: '1',
+      title: 'test',
+    } as SavedObjectDashboard;
+    injectReferences(context, []);
+    expect(context).toMatchInlineSnapshot(`
+Object {
+  "id": "1",
+  "title": "test",
+}
+`);
+  });
+
+  test('skips when panelsJSON is not an array', () => {
+    const context = {
+      id: '1',
+      panelsJSON: '{}',
+      title: 'test',
+    } as SavedObjectDashboard;
+    injectReferences(context, []);
+    expect(context).toMatchInlineSnapshot(`
+Object {
+  "id": "1",
+  "panelsJSON": "{}",
+  "title": "test",
+}
+`);
+  });
+
+  test('skips a panel when panelRefName is missing', () => {
+    const context = {
+      id: '1',
+      title: 'test',
+      panelsJSON: JSON.stringify([
+        {
+          panelRefName: 'panel_0',
+          title: 'Title 1',
+        },
+        {
+          title: 'Title 2',
+        },
+      ]),
+    } as SavedObjectDashboard;
+    const references = [
+      {
+        name: 'panel_0',
+        type: 'visualization',
+        id: '1',
+      },
+    ];
+    injectReferences(context, references);
+    expect(context).toMatchInlineSnapshot(`
+Object {
+  "id": "1",
+  "panelsJSON": "[{\\"title\\":\\"Title 1\\",\\"id\\":\\"1\\",\\"type\\":\\"visualization\\"},{\\"title\\":\\"Title 2\\"}]",
+  "title": "test",
+}
+`);
+  });
+
+  test(`fails when it can't find the reference in the array`, () => {
+    const context = {
+      id: '1',
+      title: 'test',
+      panelsJSON: JSON.stringify([
+        {
+          panelRefName: 'panel_0',
+          title: 'Title 1',
+        },
+      ]),
+    } as SavedObjectDashboard;
+    expect(() => injectReferences(context, [])).toThrowErrorMatchingInlineSnapshot(
+      `"Could not find reference \\"panel_0\\""`
+    );
+  });
+});
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.ts
new file mode 100644
index 0000000000000..3e49b6636f562
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_references.ts
@@ -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 { SavedObjectAttributes, SavedObjectReference } from 'kibana/public';
+import { SavedObjectDashboard } from './saved_dashboard';
+
+export function extractReferences({
+  attributes,
+  references = [],
+}: {
+  attributes: SavedObjectAttributes;
+  references: SavedObjectReference[];
+}) {
+  const panelReferences: SavedObjectReference[] = [];
+  const panels: Array<Record<string, string>> = JSON.parse(String(attributes.panelsJSON));
+  panels.forEach((panel, i) => {
+    if (!panel.type) {
+      throw new Error(`"type" attribute is missing from panel "${i}"`);
+    }
+    if (!panel.id) {
+      // Embeddables are not required to be backed off a saved object.
+      return;
+    }
+    panel.panelRefName = `panel_${i}`;
+    panelReferences.push({
+      name: `panel_${i}`,
+      type: panel.type,
+      id: panel.id,
+    });
+    delete panel.type;
+    delete panel.id;
+  });
+  return {
+    references: [...references, ...panelReferences],
+    attributes: {
+      ...attributes,
+      panelsJSON: JSON.stringify(panels),
+    },
+  };
+}
+
+export function injectReferences(
+  savedObject: SavedObjectDashboard,
+  references: SavedObjectReference[]
+) {
+  // Skip if panelsJSON is missing otherwise this will cause saved object import to fail when
+  // importing objects without panelsJSON. At development time of this, there is no guarantee each saved
+  // object has panelsJSON in all previous versions of kibana.
+  if (typeof savedObject.panelsJSON !== 'string') {
+    return;
+  }
+  const panels = JSON.parse(savedObject.panelsJSON);
+  // Same here, prevent failing saved object import if ever panels aren't an array.
+  if (!Array.isArray(panels)) {
+    return;
+  }
+  panels.forEach(panel => {
+    if (!panel.panelRefName) {
+      return;
+    }
+    const reference = references.find(ref => ref.name === panel.panelRefName);
+    if (!reference) {
+      // Throw an error since "panelRefName" means the reference exists within
+      // "references" and in this scenario we have bad data.
+      throw new Error(`Could not find reference "${panel.panelRefName}"`);
+    }
+    panel.id = reference.id;
+    panel.type = reference.type;
+    delete panel.panelRefName;
+  });
+  savedObject.panelsJSON = JSON.stringify(panels);
+}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.js b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.js
deleted file mode 100644
index 6da514a7e7f5f..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.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.
- */
-
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
-import './saved_dashboards';
-
-SavedObjectRegistryProvider.register(savedDashboards => {
-  return savedDashboards;
-});
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.ts
new file mode 100644
index 0000000000000..b9ea49ca4fd44
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboard_register.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 { i18n } from '@kbn/i18n';
+import { npStart } from 'ui/new_platform';
+// @ts-ignore
+import { uiModules } from 'ui/modules';
+// @ts-ignore
+import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
+import { createSavedDashboardLoader } from './saved_dashboards';
+
+const module = uiModules.get('app/dashboard');
+
+// Register this service with the saved object registry so it can be
+// edited by the object editor.
+savedObjectManagementRegistry.register({
+  service: 'savedDashboards',
+  title: i18n.translate('kbn.dashboard.savedDashboardsTitle', {
+    defaultMessage: 'dashboards',
+  }),
+});
+
+// this is no longer used in the conroller, but just here for savedObjectManagementRegistry
+module.service('savedDashboards', () =>
+  createSavedDashboardLoader({
+    savedObjectsClient: npStart.core.savedObjects.client,
+    indexPatterns: npStart.plugins.data.indexPatterns,
+    chrome: npStart.core.chrome,
+    overlays: npStart.core.overlays,
+  })
+);
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.js b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.js
deleted file mode 100644
index 3cb30386dd499..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.js
+++ /dev/null
@@ -1,42 +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 './saved_dashboard';
-import { uiModules } from 'ui/modules';
-import { SavedObjectLoader, SavedObjectsClientProvider } from 'ui/saved_objects';
-import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
-import { npStart } from '../../../../../ui/public/new_platform';
-
-const module = uiModules.get('app/dashboard');
-
-// Register this service with the saved object registry so it can be
-// edited by the object editor.
-savedObjectManagementRegistry.register({
-  service: 'savedDashboards',
-  title: i18n.translate('kbn.dashboard.savedDashboardsTitle', {
-    defaultMessage: 'dashboards',
-  }),
-});
-
-// This is the only thing that gets injected into controllers
-module.service('savedDashboards', function(Private, SavedDashboard) {
-  const savedObjectClient = Private(SavedObjectsClientProvider);
-  return new SavedObjectLoader(SavedDashboard, savedObjectClient, npStart.core.chrome);
-});
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.ts
new file mode 100644
index 0000000000000..4ece5d46358ba
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/saved_dashboard/saved_dashboards.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.
+ */
+
+import { SavedObjectLoader } from 'ui/saved_objects';
+import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
+import { createSavedDashboardClass } from './saved_dashboard';
+
+export function createSavedDashboardLoader(services: SavedObjectKibanaServices) {
+  const SavedDashboard = createSavedDashboardClass(services);
+  return new SavedObjectLoader(SavedDashboard, services.savedObjectsClient, services.chrome);
+}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/types.ts b/src/legacy/core_plugins/kibana/public/dashboard/types.ts
deleted file mode 100644
index 371274401739e..0000000000000
--- a/src/legacy/core_plugins/kibana/public/dashboard/types.ts
+++ /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 { ViewMode } from 'src/plugins/embeddable/public';
-import { AppState } from './legacy_imports';
-import {
-  RawSavedDashboardPanelTo60,
-  RawSavedDashboardPanel610,
-  RawSavedDashboardPanel620,
-  RawSavedDashboardPanel630,
-  RawSavedDashboardPanel640To720,
-  RawSavedDashboardPanel730ToLatest,
-} from './migrations/types';
-import { Query, esFilters } from '../../../../../plugins/data/public';
-
-export type NavAction = (anchorElement?: any) => void;
-
-export interface GridData {
-  w: number;
-  h: number;
-  x: number;
-  y: number;
-  i: string;
-}
-
-/**
- * This should always represent the latest dashboard panel shape, after all possible migrations.
- */
-export type SavedDashboardPanel = SavedDashboardPanel730ToLatest;
-
-// id becomes optional starting in 7.3.0
-export type SavedDashboardPanel730ToLatest = Pick<
-  RawSavedDashboardPanel730ToLatest,
-  Exclude<keyof RawSavedDashboardPanel730ToLatest, 'name'>
-> & {
-  readonly id?: string;
-  readonly type: string;
-};
-
-export type SavedDashboardPanel640To720 = Pick<
-  RawSavedDashboardPanel640To720,
-  Exclude<keyof RawSavedDashboardPanel640To720, 'name'>
-> & {
-  readonly id: string;
-  readonly type: string;
-};
-
-export type SavedDashboardPanel630 = Pick<
-  RawSavedDashboardPanel630,
-  Exclude<keyof RawSavedDashboardPanel620, 'name'>
-> & {
-  readonly id: string;
-  readonly type: string;
-};
-
-export type SavedDashboardPanel620 = Pick<
-  RawSavedDashboardPanel620,
-  Exclude<keyof RawSavedDashboardPanel620, 'name'>
-> & {
-  readonly id: string;
-  readonly type: string;
-};
-
-export type SavedDashboardPanel610 = Pick<
-  RawSavedDashboardPanel610,
-  Exclude<keyof RawSavedDashboardPanel610, 'name'>
-> & {
-  readonly id: string;
-  readonly type: string;
-};
-
-export type SavedDashboardPanelTo60 = Pick<
-  RawSavedDashboardPanelTo60,
-  Exclude<keyof RawSavedDashboardPanelTo60, 'name'>
-> & {
-  readonly id: string;
-  readonly type: string;
-};
-
-export type DashboardAppStateDefaults = DashboardAppStateParameters & {
-  description?: string;
-};
-
-export interface DashboardAppStateParameters {
-  panels: SavedDashboardPanel[];
-  fullScreenMode: boolean;
-  title: string;
-  description: string;
-  timeRestore: boolean;
-  options: {
-    hidePanelTitles: boolean;
-    useMargins: boolean;
-  };
-  query: Query | string;
-  filters: esFilters.Filter[];
-  viewMode: ViewMode;
-  savedQuery?: string;
-}
-
-// This could probably be improved if we flesh out AppState more... though AppState will be going away
-// so maybe not worth too much time atm.
-export type DashboardAppState = DashboardAppStateParameters & AppState;
-
-export interface SavedDashboardPanelMap {
-  [key: string]: SavedDashboardPanel;
-}
-
-export interface StagedFilter {
-  field: string;
-  value: string;
-  operator: string;
-  index: string;
-}
-
-export type ConfirmModalFn = (
-  message: string,
-  confirmOptions: {
-    onConfirm: () => void;
-    onCancel: () => void;
-    confirmButtonText: string;
-    cancelButtonText: string;
-    defaultFocusedButton: string;
-    title: string;
-  }
-) => void;
-
-export type AddFilterFn = (
-  {
-    field,
-    value,
-    operator,
-    index,
-  }: {
-    field: string;
-    value: string;
-    operator: string;
-    index: string;
-  },
-  appState: AppState
-) => void;
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 dcd04d31af076..378a9e9325655 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
@@ -20,7 +20,7 @@
 import _ from 'lodash';
 import { pluginInstance } from 'plugins/kibana/discover/index';
 import ngMock from 'ng_mock';
-import { fieldCalculator } from '../../components/field_chooser/lib/field_calculator';
+import { fieldCalculator } from '../../np_ready/components/field_chooser/lib/field_calculator';
 import expect from '@kbn/expect';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/doc_table.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/doc_table.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/doc_table.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/doc_table.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/get_sort.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/get_sort.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/get_sort.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/get_sort.js
index f264f0fb4d754..d9fdcc48608d2 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/get_sort.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/get_sort.js
@@ -20,7 +20,7 @@
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 
-import { getSort } from '../../lib/get_sort';
+import { getSort } from '../../../np_ready/angular/doc_table/lib/get_sort';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 const defaultSort = [{ time: 'desc' }];
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/rows_headers.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/rows_headers.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/rows_headers.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/rows_headers.js
index 677a067e7b3fe..012f2b6061ee4 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/__tests__/lib/rows_headers.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/doc_table/lib/rows_headers.js
@@ -50,14 +50,18 @@ describe('Doc Table', function() {
       // Stub `getConverterFor` for a field in the indexPattern to return mock data.
       // Returns `val` if provided, otherwise generates fake data for the field.
       fakeRowVals = getFakeRowVals('formatted', 0, mapping);
-      stubFieldFormatConverter = function($root, field, val = null) {
-        $root.indexPattern.fields.getByName(field).format.getConverterFor = () => (...args) => {
+      stubFieldFormatConverter = function($root, field, val) {
+        const convertFn = (value, type, options) => {
           if (val) {
             return val;
           }
-          const fieldName = _.get(args, '[1].name', null);
+          const fieldName = _.get(options, 'field.name', null);
+
           return fakeRowVals[fieldName] || '';
         };
+
+        $root.indexPattern.fields.getByName(field).format.convert = convertFn;
+        $root.indexPattern.fields.getByName(field).format.getConverterFor = () => convertFn;
       };
     })
   );
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/_utils.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/_utils.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/_utils.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/_utils.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_add_filter.js
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_add_filter.js
index 1dbdea4c89f00..90614cf3c132c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_add_filter.js
@@ -20,8 +20,8 @@
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import { createStateStub } from './_utils';
-import { getQueryParameterActions } from '../actions';
-import { createIndexPatternsStub } from '../../api/__tests__/_stubs';
+import { getQueryParameterActions } from '../../np_ready/angular/context/query_parameters/actions';
+import { createIndexPatternsStub } from '../../np_ready/angular/context/api/__tests__/_stubs';
 import { pluginInstance } from 'plugins/kibana/discover/index';
 import { npStart } from 'ui/new_platform';
 
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_predecessor_count.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_predecessor_count.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_predecessor_count.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_predecessor_count.js
index 52db1bab64945..1ad4bdbea210d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_predecessor_count.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_predecessor_count.js
@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import { pluginInstance } from 'plugins/kibana/discover/index';
 import { createStateStub } from './_utils';
-import { getQueryParameterActions } from '../actions';
+import { getQueryParameterActions } from '../../np_ready/angular/context/query_parameters/actions';
 
 describe('context app', function() {
   beforeEach(() => pluginInstance.initializeInnerAngular());
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_query_parameters.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_query_parameters.js
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_query_parameters.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_query_parameters.js
index 6cc5e1ae6db04..e9ec2c300faa1 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_query_parameters.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_query_parameters.js
@@ -22,7 +22,7 @@ import ngMock from 'ng_mock';
 import { pluginInstance } from 'plugins/kibana/discover/index';
 
 import { createStateStub } from './_utils';
-import { getQueryParameterActions } from '../actions';
+import { getQueryParameterActions } from '../../np_ready/angular/context/query_parameters/actions';
 
 describe('context app', function() {
   beforeEach(() => pluginInstance.initializeInnerAngular());
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_successor_count.js b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_successor_count.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_successor_count.js
rename to src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_successor_count.js
index a976cf0d04d20..15f3eefac3fd1 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_set_successor_count.js
+++ b/src/legacy/core_plugins/kibana/public/discover/__tests__/query_parameters/action_set_successor_count.js
@@ -22,7 +22,7 @@ import ngMock from 'ng_mock';
 import { pluginInstance } from 'plugins/kibana/discover/index';
 
 import { createStateStub } from './_utils';
-import { getQueryParameterActions } from '../actions';
+import { getQueryParameterActions } from '../../np_ready/angular/context/query_parameters/actions';
 
 describe('context app', function() {
   beforeEach(() => pluginInstance.initializeInnerAngular());
diff --git a/src/legacy/core_plugins/kibana/public/discover/_index.scss b/src/legacy/core_plugins/kibana/public/discover/_index.scss
index 0d70bb993fac1..386472a9f6e01 100644
--- a/src/legacy/core_plugins/kibana/public/discover/_index.scss
+++ b/src/legacy/core_plugins/kibana/public/discover/_index.scss
@@ -1,26 +1,2 @@
 // Discover plugin styles
-@import 'mixins';
-
-// Prefix all styles with "dsc" to avoid conflicts.
-// Examples
-//   dscTable
-//   dscTable__footer
-//   monChart__legend--small
-//   monChart__legend-isLoading
-
-@import 'components/fetch_error/index';
-@import 'components/field_chooser/index';
-@import 'angular/directives/index';
-@import 'angular/doc_table/index';
-
-@import 'hacks';
-
-@import 'discover';
-
-@import 'embeddable/index';
-
-// Doc Viewer
-@import 'components/doc_viewer/index';
-
-// Context styles
-@import 'angular/context/index';
+@import 'np_ready/index';
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
deleted file mode 100644
index b7f6fab676a1e..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query/actions.js
+++ /dev/null
@@ -1,186 +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 { getServices, SearchSource } from '../../../kibana_services';
-
-import { fetchAnchorProvider } from '../api/anchor';
-import { fetchContextProvider } from '../api/context';
-import { getQueryParameterActions } from '../query_parameters';
-import { FAILURE_REASONS, LOADING_STATUS } from './constants';
-import { MarkdownSimple } from '../../../../../../kibana_react/public';
-
-export function QueryActionsProvider(Promise) {
-  const fetchAnchor = fetchAnchorProvider(getServices().indexPatterns, new SearchSource());
-  const { fetchSurroundingDocs } = fetchContextProvider(getServices().indexPatterns);
-  const { setPredecessorCount, setQueryParameters, setSuccessorCount } = getQueryParameterActions();
-
-  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 });
-        getServices().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 });
-        getServices().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/angular/context/query_parameters/actions.js b/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js
deleted file mode 100644
index 01573f8983d0f..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js
+++ /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 _ from 'lodash';
-import { getServices } from '../../../kibana_services';
-import { generateFilters } from '../../../../../../../../plugins/data/public';
-
-import { MAX_CONTEXT_SIZE, MIN_CONTEXT_SIZE, QUERY_PARAMETER_KEYS } from './constants';
-
-export function getQueryParameterActions() {
-  const filterManager = getServices().filterManager;
-
-  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 => {
-    filterManager.setFilters(filters);
-  };
-
-  const addFilter = state => async (field, values, operation) => {
-    const indexPatternId = state.queryParameters.indexPatternId;
-    const newFilters = generateFilters(filterManager, field, values, operation, indexPatternId);
-    filterManager.addFilters(newFilters);
-    const indexPattern = await getServices().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/angular/directives/index.js b/src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js
deleted file mode 100644
index eb4cf10a2d28f..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/index.js
+++ /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 '../../../../../../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 { getAngularModule, wrapInI18nContext } from '../../kibana_services';
-
-const app = getAngularModule();
-
-app.directive('discoverNoResults', reactDirective =>
-  reactDirective(wrapInI18nContext(DiscoverNoResults))
-);
-
-app.directive('discoverUninitialized', reactDirective =>
-  reactDirective(wrapInI18nContext(DiscoverUninitialized))
-);
-
-app.directive('discoverUnsupportedIndexPattern', reactDirective =>
-  reactDirective(wrapInI18nContext(DiscoverUnsupportedIndexPattern), ['unsupportedType'])
-);
-
-app.directive('discoverHistogram', reactDirective => reactDirective(DiscoverHistogram));
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_index.scss
deleted file mode 100644
index 23d6609a5cffb..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './doc_table';
-@import './components/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_index.scss
deleted file mode 100644
index a73ff41db7c03..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './table_header';
-@import './table_row/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/index.ts b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/index.ts
deleted file mode 100644
index 3a037971a1253..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/index.ts
+++ /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 { wrapInI18nContext } from '../../../../kibana_services';
-import { ToolBarPagerText } from './tool_bar_pager_text';
-import { ToolBarPagerButtons } from './tool_bar_pager_buttons';
-
-export function createToolBarPagerTextDirective(reactDirective: any) {
-  return reactDirective(wrapInI18nContext(ToolBarPagerText));
-}
-
-export function createToolBarPagerButtonsDirective(reactDirective: any) {
-  return reactDirective(wrapInI18nContext(ToolBarPagerButtons));
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/helpers.tsx b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/helpers.tsx
deleted file mode 100644
index 80f963c8ccb3e..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/helpers.tsx
+++ /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 { IndexPattern } from '../../../../kibana_services';
-// @ts-ignore
-import { shortenDottedString } from '../../../../../../common/utils/shorten_dotted_string';
-
-export type SortOrder = [string, 'asc' | 'desc'];
-export interface ColumnProps {
-  name: string;
-  displayName: string;
-  isSortable: boolean;
-  isRemoveable: boolean;
-  colLeftIdx: number;
-  colRightIdx: number;
-}
-
-/**
- * Returns properties necessary to display the time column
- * If it's an IndexPattern with timefield, the time column is
- * prepended, not moveable and removeable
- * @param timeFieldName
- */
-export function getTimeColumn(timeFieldName: string): ColumnProps {
-  return {
-    name: timeFieldName,
-    displayName: 'Time',
-    isSortable: true,
-    isRemoveable: false,
-    colLeftIdx: -1,
-    colRightIdx: -1,
-  };
-}
-/**
- * A given array of column names returns an array of properties
- * necessary to display the columns. If the given indexPattern
- * has a timefield, a time column is prepended
- * @param columns
- * @param indexPattern
- * @param hideTimeField
- * @param isShortDots
- */
-export function getDisplayedColumns(
-  columns: string[],
-  indexPattern: IndexPattern,
-  hideTimeField: boolean,
-  isShortDots: boolean
-) {
-  if (!Array.isArray(columns) || typeof indexPattern !== 'object' || !indexPattern.getFieldByName) {
-    return [];
-  }
-  const columnProps = columns.map((column, idx) => {
-    const field = indexPattern.getFieldByName(column);
-    return {
-      name: column,
-      displayName: isShortDots ? shortenDottedString(column) : column,
-      isSortable: field && field.sortable ? true : false,
-      isRemoveable: column !== '_source' || columns.length > 1,
-      colLeftIdx: idx - 1 < 0 ? -1 : idx - 1,
-      colRightIdx: idx + 1 >= columns.length ? -1 : idx + 1,
-    };
-  });
-  return !hideTimeField && indexPattern.timeFieldName
-    ? [getTimeColumn(indexPattern.timeFieldName), ...columnProps]
-    : columnProps;
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_index.scss b/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_index.scss
deleted file mode 100644
index a452ce140ba93..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './cell';
-@import './details';
-@import './open';
diff --git a/src/legacy/core_plugins/kibana/public/discover/helpers/build_services.ts b/src/legacy/core_plugins/kibana/public/discover/build_services.ts
similarity index 77%
rename from src/legacy/core_plugins/kibana/public/discover/helpers/build_services.ts
rename to src/legacy/core_plugins/kibana/public/discover/build_services.ts
index 14ea4e99b0de4..1fb8b4abb21c4 100644
--- a/src/legacy/core_plugins/kibana/public/discover/helpers/build_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/build_services.ts
@@ -24,25 +24,27 @@ import {
   ToastsStart,
   IUiSettingsClient,
 } from 'kibana/public';
-import * as docViewsRegistry from 'ui/registry/doc_views';
-import { FilterManager, TimefilterContract, IndexPatternsContract } from 'src/plugins/data/public';
-// @ts-ignore
-import { createSavedSearchesService } from '../saved_searches/saved_searches';
-// @ts-ignore
-import { DiscoverStartPlugins } from '../plugin';
-import { DataStart } from '../../../../data/public';
-import { EuiUtilsStart } from '../../../../../../plugins/eui_utils/public';
-import { SavedSearch } from '../types';
-import { SharePluginStart } from '../../../../../../plugins/share/public';
+import {
+  FilterManager,
+  TimefilterContract,
+  IndexPatternsContract,
+  DataPublicPluginStart,
+} from 'src/plugins/data/public';
+import { createSavedSearchesService } from './saved_searches';
+import { DiscoverStartPlugins } from './plugin';
+import { EuiUtilsStart } from '../../../../../plugins/eui_utils/public';
+import { SharePluginStart } from '../../../../../plugins/share/public';
+import { SavedSearch } from './np_ready/types';
+import { DocViewsRegistry } from './np_ready/doc_views/doc_views_registry';
 
 export interface DiscoverServices {
   addBasePath: (path: string) => string;
   capabilities: Capabilities;
   chrome: ChromeStart;
   core: CoreStart;
-  data: DataStart;
+  data: DataPublicPluginStart;
   docLinks: DocLinksStart;
-  docViewsRegistry: docViewsRegistry.DocViewsRegistry;
+  docViewsRegistry: DocViewsRegistry;
   eui_utils: EuiUtilsStart;
   filterManager: FilterManager;
   indexPatterns: IndexPatternsContract;
@@ -55,7 +57,11 @@ export interface DiscoverServices {
   getSavedSearchUrlById: (id: string) => Promise<string>;
   uiSettings: IUiSettingsClient;
 }
-export async function buildServices(core: CoreStart, plugins: DiscoverStartPlugins) {
+export async function buildServices(
+  core: CoreStart,
+  plugins: DiscoverStartPlugins,
+  docViewsRegistry: DocViewsRegistry
+): Promise<DiscoverServices> {
   const services = {
     savedObjectsClient: core.savedObjects.client,
     indexPatterns: plugins.data.indexPatterns,
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.test.tsx b/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.test.tsx
deleted file mode 100644
index 158ed4ccc7759..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.test.tsx
+++ /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 React from 'react';
-import { mount, shallow } from 'enzyme';
-import { DocViewer } from './doc_viewer';
-// @ts-ignore
-import { findTestSubject } from '@elastic/eui/lib/test';
-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', () => {
-  addDocView({ order: 20, title: 'React component', component: () => <div>test</div> });
-  addDocView({ order: 10, title: 'Render function', render: jest.fn() });
-  addDocView({ order: 30, title: 'Invalid doc view' });
-
-  const renderProps = { hit: {} } as DocViewRenderProps;
-
-  const wrapper = shallow(<DocViewer {...renderProps} />);
-
-  expect(wrapper).toMatchSnapshot();
-});
-
-test('Render <DocViewer/> with 1 tab displaying error message', () => {
-  function SomeComponent() {
-    // this is just a placeholder
-    return null;
-  }
-
-  addDocView({
-    order: 10,
-    title: 'React component',
-    component: SomeComponent,
-  });
-
-  const renderProps = { hit: {} } as DocViewRenderProps;
-  const errorMsg = 'Catch me if you can!';
-
-  const wrapper = mount(<DocViewer {...renderProps} />);
-  const error = new Error(errorMsg);
-  wrapper.find(SomeComponent).simulateError(error);
-  const errorMsgComponent = findTestSubject(wrapper, 'docViewerError');
-  expect(errorMsgComponent.text()).toMatch(new RegExp(`${errorMsg}`));
-});
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap
deleted file mode 100644
index d7737bbfe4078..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap
+++ /dev/null
@@ -1,11 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`DiscoverIndexPattern A single index pattern is just displayed 1`] = `
-<DiscoverIndexPatternTitle
-  isChangeable={false}
-  onChange={[Function]}
-  title="test1"
-/>
-`;
-
-exports[`DiscoverIndexPattern Invalid props dont cause an exception: "" 1`] = `""`;
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_index.scss b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_index.scss
deleted file mode 100644
index ad65834519eb1..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './field_chooser';
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.test.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.test.tsx
deleted file mode 100644
index 68ef0f5b46694..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.test.tsx
+++ /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 React from 'react';
-import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';
-// @ts-ignore
-import { findTestSubject } from '@elastic/eui/lib/test';
-import { SavedObject } from 'kibana/server';
-import { DiscoverIndexPattern, DiscoverIndexPatternProps } from './discover_index_pattern';
-import { comboBoxKeyCodes } from '@elastic/eui';
-
-const indexPattern1 = {
-  id: 'test1',
-  attributes: {
-    title: 'test1',
-  },
-} as SavedObject;
-
-const indexPattern2 = {
-  id: 'test2',
-  attributes: {
-    title: 'test2',
-  },
-} as SavedObject;
-
-describe('DiscoverIndexPattern', () => {
-  test('Invalid props dont cause an exception', () => {
-    const props = {
-      indexPatternList: null,
-      selectedIndexPattern: null,
-      setIndexPattern: jest.fn(),
-    } as any;
-
-    expect(shallowWithIntl(<DiscoverIndexPattern {...props} />)).toMatchSnapshot(`""`);
-  });
-  test('A single index pattern is just displayed', () => {
-    const props = {
-      indexPatternList: [indexPattern1],
-      selectedIndexPattern: indexPattern1,
-      setIndexPattern: jest.fn(),
-    } as DiscoverIndexPatternProps;
-
-    expect(shallowWithIntl(<DiscoverIndexPattern {...props} />)).toMatchSnapshot();
-  });
-
-  test('Multiple index patterns are selectable', () => {
-    const props = {
-      indexPatternList: [indexPattern1, indexPattern2],
-      selectedIndexPattern: indexPattern2,
-      setIndexPattern: jest.fn(),
-    } as DiscoverIndexPatternProps;
-    const component = mountWithIntl(<DiscoverIndexPattern {...props} />);
-    findTestSubject(component, 'indexPattern-switch-link').simulate('click');
-
-    const searchInput = findTestSubject(component, 'comboBoxSearchInput');
-    searchInput.simulate('change', { target: { value: 'test1' } });
-    searchInput.simulate('keyDown', { keyCode: comboBoxKeyCodes.ENTER });
-    expect(props.setIndexPattern).toBeCalledWith('test1');
-  });
-});
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.tsx
deleted file mode 100644
index 55f58d352ac23..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern.tsx
+++ /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 React, { useState } from 'react';
-import { EuiComboBox } from '@elastic/eui';
-import { SavedObject } from 'kibana/server';
-import { DiscoverIndexPatternTitle } from './discover_index_pattern_title';
-
-export interface DiscoverIndexPatternProps {
-  /**
-   * list of available index patterns, if length > 1, component offers a "change" link
-   */
-  indexPatternList: SavedObject[];
-  /**
-   * currently selected index pattern, due to angular issues it's undefined at first rendering
-   */
-  selectedIndexPattern: SavedObject;
-  /**
-   * triggered when user selects a new index pattern
-   */
-  setIndexPattern: (id: string) => void;
-}
-
-/**
- * Component allows you to select an index pattern in discovers side bar
- */
-export function DiscoverIndexPattern({
-  indexPatternList,
-  selectedIndexPattern,
-  setIndexPattern,
-}: DiscoverIndexPatternProps) {
-  if (!indexPatternList || indexPatternList.length === 0 || !selectedIndexPattern) {
-    // just in case, shouldn't happen
-    return null;
-  }
-  const [selected, setSelected] = useState(selectedIndexPattern);
-  const [showCombo, setShowCombo] = useState(false);
-  const options = indexPatternList.map(entity => ({
-    value: entity.id,
-    label: entity.attributes!.title,
-  }));
-  const selectedOptions = selected
-    ? [{ value: selected.id, label: selected.attributes.title }]
-    : [];
-
-  const findIndexPattern = (id?: string) => indexPatternList.find(entity => entity.id === id);
-
-  if (!showCombo) {
-    return (
-      <DiscoverIndexPatternTitle
-        isChangeable={indexPatternList.length > 1}
-        onChange={() => setShowCombo(true)}
-        title={selected.attributes ? selected.attributes.title : ''}
-      />
-    );
-  }
-
-  /**
-   * catches a EuiComboBox related 'Can't perform a React state update on an unmounted component'
-   * warning in console by delaying the hiding/removal of the EuiComboBox a bit
-   */
-  function hideCombo() {
-    setTimeout(() => setShowCombo(false), 50);
-  }
-
-  return (
-    <EuiComboBox
-      className="index-pattern-selection"
-      data-test-subj="index-pattern-selection"
-      fullWidth={true}
-      isClearable={false}
-      onBlur={() => hideCombo()}
-      onChange={choices => {
-        const newSelected = choices[0] && findIndexPattern(choices[0].value);
-        if (newSelected) {
-          setSelected(newSelected);
-          setIndexPattern(newSelected.id);
-        }
-        hideCombo();
-      }}
-      inputRef={el => {
-        // auto focus input element when combo box is displayed
-        if (el) {
-          el.focus();
-        }
-      }}
-      options={options}
-      selectedOptions={selectedOptions}
-      singleSelection={{ asPlainText: true }}
-    />
-  );
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_title.tsx b/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_title.tsx
deleted file mode 100644
index fb5c3c8d45ce8..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_title.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import React from 'react';
-import { EuiToolTip, EuiFlexItem, EuiFlexGroup, EuiTitle, EuiButtonEmpty } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-export interface DiscoverIndexPatternTitleProps {
-  /**
-   * determines whether the change link is displayed
-   */
-  isChangeable: boolean;
-  /**
-   * function triggered when the change link is clicked
-   */
-  onChange: () => void;
-  /**
-   * title of the current index pattern
-   */
-  title: string;
-}
-
-/**
- * Component displaying the title of the current selected index pattern
- * and if changeable is true, a link is provided to change the index pattern
- */
-export function DiscoverIndexPatternTitle({
-  isChangeable,
-  onChange,
-  title,
-}: DiscoverIndexPatternTitleProps) {
-  return (
-    <EuiFlexGroup gutterSize="none" responsive={false} className="index-pattern-selection">
-      <EuiFlexItem className="eui-textTruncate">
-        <EuiToolTip content={title}>
-          <EuiTitle size="xxs" className="eui-textTruncate">
-            <h2 title={title}>{title}</h2>
-          </EuiTitle>
-        </EuiToolTip>
-      </EuiFlexItem>
-      {isChangeable && (
-        <EuiFlexItem grow={false}>
-          <EuiToolTip
-            content={
-              <FormattedMessage
-                id="kbn.discover.fieldChooser.indexPattern.changeLinkTooltip"
-                defaultMessage="Change current index pattern"
-              />
-            }
-          >
-            <EuiButtonEmpty
-              aria-label={i18n.translate(
-                'kbn.discover.fieldChooser.indexPattern.changeLinkAriaLabel',
-                {
-                  defaultMessage: 'Change current index pattern',
-                }
-              )}
-              data-test-subj="indexPattern-switch-link"
-              size="xs"
-              onClick={() => onChange()}
-              iconSide="right"
-              iconType="arrowDown"
-              color="text"
-            />
-          </EuiToolTip>
-        </EuiFlexItem>
-      )}
-    </EuiFlexGroup>
-  );
-}
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
deleted file mode 100644
index adf4b1b4326e8..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<section class="sidebar-list" aria-label="{{::'kbn.discover.fieldChooser.filter.indexAndFieldsSectionAriaLabel' | i18n: {defaultMessage: 'Index and fields'} }}">
-  <discover-index-pattern-select
-    selected-index-pattern="selectedIndexPattern"
-    set-index-pattern="setIndexPattern"
-    index-pattern-list="indexPatternList"
-  >
-  </discover-index-pattern-select>
-  <div class="sidebar-item" >
-    <form>
-      <discover-field-search
-        on-change="setFilterValue"
-        value="filter.vals.name"
-        types="fieldTypes"
-      >
-      </discover-field-search>
-      <div data-test-subj="discoverFieldFilter" class="dscFieldFilter" ng-show="showFilter">
-        <div class="form-group" >
-          <label
-            for="discoverFieldChooserFilterAggregatable"
-            i18n-id="kbn.discover.fieldChooser.filter.aggregatableLabel"
-            i18n-default-message="Aggregatable"
-          ></label>
-          <select
-            id="discoverFieldChooserFilterAggregatable"
-            ng-options="opt.value as opt.label for opt in filter.boolOpts"
-            ng-model="filter.vals.aggregatable"
-            class="form-control">
-          </select>
-        </div>
-        <div class="form-group" ng-show="showFilter">
-          <label
-            for="discoverFieldChooserFilterSearchable"
-            i18n-id="kbn.discover.fieldChooser.filter.searchableLabel"
-            i18n-default-message="Searchable"
-          ></label>
-          <select
-            id="discoverFieldChooserFilterSearchable"
-            ng-options="opt.value as opt.label for opt in filter.boolOpts"
-            ng-model="filter.vals.searchable"
-            class="form-control">
-          </select>
-        </div>
-        <div class="form-group" ng-show="showFilter">
-          <label
-            for="discoverFieldChooserFilterType"
-            i18n-id="kbn.discover.fieldChooser.filter.typeLabel"
-            i18n-default-message="Type"
-          ></label>
-          <select
-            id="discoverFieldChooserFilterType"
-            ng-options="field as field for field in fieldTypes"
-            ng-model="filter.vals.type"
-            class="form-control">
-          </select>
-        </div>
-        <div class="form-group"  ng-show="showFilter">
-          <label for="discoverFieldChooserHideMissingFields">
-            <input id="discoverFieldChooserHideMissingFields" type="checkbox" ng-model="filter.vals.missing">
-            <span
-              i18n-id="kbn.discover.fieldChooser.filter.hideMissingFieldsLabel"
-              i18n-default-message="Hide missing fields"
-            ></span>
-          </label>
-        </div>
-        <button
-          ng-show="showFilter"
-          ng-click="filter.reset()"
-          ng-disabled="!filter.active"
-          class="kuiButton kuiButton--danger kuiButton--fullWidth"
-          i18n-id="kbn.discover.fieldChooser.filter.resetFiltersButtonLabel"
-          i18n-default-message="Reset filters"
-        ></button>
-      </div>
-    </form>
-  </div>
-
-  <div class="dscSidebar__listHeader sidebar-list-header" ng-if="fields.length">
-    <h3
-      class="euiFlexItem euiTitle euiTitle--xxxsmall sidebar-list-header-heading"
-      id="selected_fields"
-      tabindex="0"
-      i18n-id="kbn.discover.fieldChooser.filter.selectedFieldsTitle"
-      i18n-default-message="Selected fields"
-    ></h3>
-  </div>
-  <ul class="list-unstyled dscFieldList--selected" aria-labelledby="selected_fields">
-    <discover-field
-      ng-repeat="field in fields|filter:filter.isFieldFilteredAndDisplayed"
-      field="field"
-      on-add-field="onAddField"
-      on-add-filter="onAddFilter"
-      on-remove-field="onRemoveField"
-      on-show-details="computeDetails"
-    >
-    </discover-field>
-  </ul>
-
-  <div class="sidebar-list-header sidebar-item euiFlexGroup euiFlexGroup--gutterMedium" ng-if="fields.length">
-    <h3
-      class="euiFlexItem euiTitle euiTitle--xxxsmall sidebar-list-header-heading"
-      id="available_fields"
-      tabindex="0"
-      i18n-id="kbn.discover.fieldChooser.filter.availableFieldsTitle"
-      i18n-default-message="Available fields"
-    ></h3>
-
-    <div class="euiFlexItem euiFlexItem--flexGrowZero">
-      <button
-        ng-click="$parent.showFields = !$parent.showFields"
-        aria-hidden="true"
-        class="kuiButton kuiButton--small visible-xs visible-sm pull-right dscFieldChooser__toggle"
-      >
-        <span
-          aria-hidden="true"
-          class="kuiIcon"
-          ng-class="{ 'fa-chevron-right': !$parent.showFields, 'fa-chevron-down': $parent.showFields }"
-        ></span>
-      </button>
-    </div>
-  </div>
-
-  <ul
-    ng-show="(popularFields | filter:filter.isFieldFilteredAndNotDisplayed).length > 0"
-    ng-class="{ 'hidden-sm': !showFields, 'hidden-xs': !showFields }"
-    class="list-unstyled sidebar-well dscFieldList--popular">
-    <li class="sidebar-item sidebar-list-header">
-      <h6
-        i18n-id="kbn.discover.fieldChooser.filter.popularTitle"
-        i18n-default-message="Popular"
-      ></h6>
-    </li>
-    <discover-field
-      ng-repeat="field in popularFields | filter:filter.isFieldFilteredAndNotDisplayed"
-      field="field"
-      on-add-field="onAddField"
-      on-add-filter="onAddFilter"
-      on-remove-field="onRemoveField"
-      on-show-details="computeDetails"
-    >
-    </discover-field>
-  </ul>
-
-  <ul
-    ng-class="{ 'hidden-sm': !showFields, 'hidden-xs': !showFields  }"
-    class="list-unstyled dscFieldList--unpopular">
-    <discover-field
-      ng-repeat="field in unpopularFields | filter:filter.isFieldFilteredAndNotDisplayed"
-      field="field"
-      on-add-field="onAddField"
-      on-add-filter="onAddFilter"
-      on-remove-field="onRemoveField"
-      on-show-details="computeDetails"
-    >
-    </discover-field>
-  </ul>
-
-</section>
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
deleted file mode 100644
index eb40130137e00..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/components/help_menu/help_menu_util.js
+++ /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 { i18n } from '@kbn/i18n';
-import { getServices } from '../../kibana_services';
-const { docLinks } = getServices();
-
-export function addHelpMenuToAppChrome(chrome) {
-  chrome.setHelpExtension({
-    appName: i18n.translate('kbn.discover.helpMenu.appName', {
-      defaultMessage: 'Discover',
-    }),
-    links: [
-      {
-        linkType: 'documentation',
-        href: `${docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${docLinks.DOC_LINK_VERSION}/discover.html`,
-      },
-    ],
-  });
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts
deleted file mode 100644
index adfa3d5acbf7a..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/types.ts
+++ /dev/null
@@ -1,42 +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 { EmbeddableInput, EmbeddableOutput, IEmbeddable } from 'src/plugins/embeddable/public';
-import { SavedSearch } from '../types';
-import { SortOrder } from '../angular/doc_table/components/table_header/helpers';
-import { esFilters, IIndexPattern, TimeRange, Query } from '../../../../../../plugins/data/public';
-
-export interface SearchInput extends EmbeddableInput {
-  timeRange: TimeRange;
-  query?: Query;
-  filters?: esFilters.Filter[];
-  hidePanelTitles?: boolean;
-  columns?: string[];
-  sort?: SortOrder[];
-}
-
-export interface SearchOutput extends EmbeddableOutput {
-  editUrl: string;
-  indexPatterns?: IIndexPattern[];
-  editable: boolean;
-}
-
-export interface ISearchEmbeddable extends IEmbeddable<SearchInput, SearchOutput> {
-  getSavedSearch(): SavedSearch;
-}
diff --git a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
index 1335dbb01d4a7..1cefabe08c2d5 100644
--- a/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/get_inner_angular.ts
@@ -69,24 +69,24 @@ import { configureAppAngularModule } from 'ui/legacy_compat';
 import { IndexPatterns } from '../../../../../plugins/data/public';
 import { Storage } from '../../../../../plugins/kibana_utils/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
-import { createDocTableDirective } from './angular/doc_table/doc_table';
-import { createTableHeaderDirective } from './angular/doc_table/components/table_header';
+import { createDocTableDirective } from './np_ready/angular/doc_table/doc_table';
+import { createTableHeaderDirective } from './np_ready/angular/doc_table/components/table_header';
 import {
   createToolBarPagerButtonsDirective,
   createToolBarPagerTextDirective,
-} from './angular/doc_table/components/pager';
-import { createTableRowDirective } from './angular/doc_table/components/table_row';
-import { createPagerFactory } from './angular/doc_table/lib/pager/pager_factory';
-import { createInfiniteScrollDirective } from './angular/doc_table/infinite_scroll';
-import { createDocViewerDirective } from './angular/doc_viewer';
-import { createFieldSearchDirective } from './components/field_chooser/discover_field_search_directive';
-import { createIndexPatternSelectDirective } from './components/field_chooser/discover_index_pattern_directive';
-import { createStringFieldProgressBarDirective } from './components/field_chooser/string_progress_bar';
+} from './np_ready/angular/doc_table/components/pager';
+import { createTableRowDirective } from './np_ready/angular/doc_table/components/table_row';
+import { createPagerFactory } from './np_ready/angular/doc_table/lib/pager/pager_factory';
+import { createInfiniteScrollDirective } from './np_ready/angular/doc_table/infinite_scroll';
+import { createDocViewerDirective } from './np_ready/angular/doc_viewer';
+import { createFieldSearchDirective } from './np_ready/components/field_chooser/discover_field_search_directive';
+import { createIndexPatternSelectDirective } from './np_ready/components/field_chooser/discover_index_pattern_directive';
+import { createStringFieldProgressBarDirective } from './np_ready/components/field_chooser/string_progress_bar';
 // @ts-ignore
-import { createFieldChooserDirective } from './components/field_chooser/field_chooser';
+import { createFieldChooserDirective } from './np_ready/components/field_chooser/field_chooser';
 
 // @ts-ignore
-import { createDiscoverFieldDirective } from './components/field_chooser/discover_field';
+import { createDiscoverFieldDirective } from './np_ready/components/field_chooser/discover_field';
 import { DiscoverStartPlugins } from './plugin';
 
 /**
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
deleted file mode 100644
index eb8c2aec91558..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/helpers/register_feature.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 { 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.ts b/src/legacy/core_plugins/kibana/public/discover/index.ts
index 6ea658682c89d..7bde30e0d0f0e 100644
--- a/src/legacy/core_plugins/kibana/public/discover/index.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/index.ts
@@ -16,23 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
+import chrome from 'ui/chrome';
+import { PluginInitializerContext } from 'kibana/public';
 import { npSetup, npStart } from 'ui/new_platform';
-import { SavedObjectRegistryProvider } from 'ui/saved_objects';
-import { DiscoverPlugin, DiscoverSetup, DiscoverStart } from './plugin';
+import { DiscoverPlugin } from './plugin';
 
 // Core will be looking for this when loading our plugin in the new platform
-export const plugin: PluginInitializer<DiscoverSetup, DiscoverStart> = () => {
+export const plugin = (context: PluginInitializerContext) => {
   return new DiscoverPlugin();
 };
 
 // Legacy compatiblity part - to be removed at cutover, replaced by a kibana.json file
 export const pluginInstance = plugin({} as PluginInitializerContext);
-(async () => {
-  pluginInstance.setup(npSetup.core, npSetup.plugins);
-  pluginInstance.start(npStart.core, npStart.plugins);
-})();
-
-SavedObjectRegistryProvider.register((savedSearches: any) => {
-  return savedSearches;
+export const setup = pluginInstance.setup(npSetup.core, {
+  ...npSetup.plugins,
+  __LEGACY: {
+    chrome,
+  },
 });
+export const start = pluginInstance.start(npStart.core, npStart.plugins);
+
+export { createSavedSearchesService } from './saved_searches/saved_searches';
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index d13d0dc868a58..d2eefba2cecdd 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import angular from 'angular'; // just used in embeddables and discover controller
-import { DiscoverServices } from './helpers/build_services';
+import { DiscoverServices } from './build_services';
 
 let angularModule: any = null;
 let services: DiscoverServices | null = null;
@@ -47,6 +47,10 @@ export function setServices(newServices: any) {
   services = newServices;
 }
 
+// import directives that
+import 'ui/directives/css_truncate';
+import 'ui/directives/field_name';
+
 // EXPORT legacy static dependencies, should be migrated when available in a new version;
 export { angular };
 export { wrapInI18nContext } from 'ui/i18n';
@@ -59,7 +63,10 @@ export {
   hasSearchStategyForIndexPattern,
   isDefaultTypeIndexPattern,
   SearchSource,
-} from '../../../../ui/public/courier';
+  EsQuerySortValue,
+  SortDirection,
+  ISearchSource,
+} from 'ui/courier';
 // @ts-ignore
 export { intervalOptions } from 'ui/agg_types/buckets/_interval_options';
 // @ts-ignore
@@ -78,6 +85,8 @@ export { tabifyAggResponse } from 'ui/agg_response/tabify';
 export { vislibSeriesResponseHandlerProvider } from 'ui/vis/response_handlers/vislib';
 export { ensureDefaultIndexPattern } from 'ui/legacy_compat';
 export { unhashUrl } from '../../../../../plugins/kibana_utils/public';
+// @ts-ignore
+export { formatMsg, formatStack } from 'ui/notify/lib/index';
 
 // EXPORT types
 export { Vis } from 'ui/vis';
@@ -85,8 +94,11 @@ export {
   IndexPatternsContract,
   IIndexPattern,
   IndexPattern,
+  indexPatterns,
   IFieldType,
 } from '../../../../../plugins/data/public';
-export { ElasticSearchHit } from 'ui/registry/doc_views_types';
-export { DocViewRenderProps, DocViewRenderFn } from 'ui/registry/doc_views';
+export { ElasticSearchHit } from './np_ready/doc_views/doc_views_types';
 export { Adapters } from 'ui/inspector/types';
+export { Chrome, IInjector } from 'ui/chrome';
+export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';
+export { FieldName } from 'ui/directives/field_name/field_name';
diff --git a/src/legacy/core_plugins/kibana/public/discover/_discover.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/_discover.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/_discover.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/_discover.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/_hacks.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/_hacks.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/_hacks.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/_hacks.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/_index.scss
new file mode 100644
index 0000000000000..0de036b1e1707
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/_index.scss
@@ -0,0 +1,15 @@
+// Discover plugin styles
+@import 'mixins';
+@import 'discover';
+@import 'hacks';
+
+// Prefix all styles with "dsc" to avoid conflicts.
+// Examples
+//   dscTable
+//   dscTable__footer
+//   monChart__legend--small
+//   monChart__legend-isLoading
+
+@import 'components/index';
+@import 'angular/index';
+@import 'embeddable/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/_mixins.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/_mixins.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/_mixins.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/_mixins.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/_index.scss
new file mode 100644
index 0000000000000..9e00ade3d41f6
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/_index.scss
@@ -0,0 +1,3 @@
+@import 'directives/index';
+@import 'doc_table/index';
+@import 'context/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js
index d33e3424e4647..a370c66ae330b 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js
@@ -19,12 +19,12 @@
 
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { getAngularModule, getServices, subscribeWithScope } from './../kibana_services';
+import { getAngularModule, getServices, subscribeWithScope } from '../../kibana_services';
 
 import './context_app';
 import contextAppRouteTemplate from './context.html';
 import { getRootBreadcrumbs } from '../helpers/breadcrumbs';
-import { FilterStateManager } from '../../../../data/public/filter/filter_manager';
+import { FilterStateManager } from '../../../../../data/public';
 const { chrome } = getServices();
 
 const k7Breadcrumbs = $route => {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/NOTES.md b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/NOTES.md
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/NOTES.md
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/NOTES.md
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/_stubs.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/_stubs.js
index 3bc83cacaaf28..53be4e5bd0f2d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/_stubs.js
@@ -19,7 +19,7 @@
 
 import sinon from 'sinon';
 import moment from 'moment';
-import { SearchSource } from '../../../../kibana_services';
+import { SearchSource } from '../../../../../kibana_services';
 
 export function createIndexPatternsStub() {
   return {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/anchor.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/anchor.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/anchor.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/anchor.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/predecessors.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/predecessors.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/predecessors.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/predecessors.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/successors.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/successors.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/successors.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/__tests__/successors.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/anchor.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/anchor.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/anchor.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/anchor.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/context.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/context.ts
index fd71b7c49e837..a6c6d91084625 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/context.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/context.ts
@@ -17,14 +17,14 @@
  * under the License.
  */
 
-import { IndexPattern, SearchSource } from '../../../kibana_services';
+import { IndexPattern, SearchSource } 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, IndexPatternsContract } from '../../../../../../../../plugins/data/public';
+import { esFilters, IndexPatternsContract } from '../../../../../../../../../plugins/data/public';
 
 export type SurrDocType = 'successors' | 'predecessors';
 export interface EsHitRecord {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/date_conversion.test.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/__tests__/date_conversion.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/date_conversion.test.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/__tests__/date_conversion.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/sorting.test.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/__tests__/sorting.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/__tests__/sorting.test.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/__tests__/sorting.test.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/date_conversion.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/date_conversion.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/date_conversion.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/date_conversion.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/fetch_hits_in_interval.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/fetch_hits_in_interval.ts
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/fetch_hits_in_interval.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/fetch_hits_in_interval.ts
index 19c2ee2cdfe10..e7df44e6fe61c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/fetch_hits_in_interval.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/fetch_hits_in_interval.ts
@@ -16,11 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  EsQuerySortValue,
-  SortDirection,
-  SearchSourceContract,
-} from '../../../../../../../../ui/public/courier';
+import { EsQuerySortValue, SortDirection, ISearchSource } from '../../../../../kibana_services';
 import { convertTimeValueToIso } from './date_conversion';
 import { EsHitRecordList } from '../context';
 import { IntervalValue } from './generate_intervals';
@@ -40,7 +36,7 @@ interface RangeQuery {
  * and filters set.
  */
 export async function fetchHitsInInterval(
-  searchSource: SearchSourceContract,
+  searchSource: ISearchSource,
   timeField: string,
   sort: [EsQuerySortValue, EsQuerySortValue],
   sortDir: SortDirection,
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/generate_intervals.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/generate_intervals.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/generate_intervals.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/generate_intervals.ts
index cb4878239ff92..373dc37e56f6f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/generate_intervals.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/generate_intervals.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SortDirection } from '../../../../../../../../ui/public/courier';
+import { SortDirection } from '../../../../../kibana_services';
 
 export type IntervalValue = number | null;
 
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_search_after.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_search_after.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_search_after.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_search_after.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_sort.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_sort.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_sort.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_sort.ts
index 39c69112e58cb..8bcf5328f24ba 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/get_es_query_sort.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/get_es_query_sort.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { EsQuerySortValue, SortDirection } from '../../../../../../../../ui/public/courier/types';
+import { EsQuerySortValue, SortDirection } from '../../../../../kibana_services';
 
 /**
  * Returns `EsQuerySort` which is used to sort records in the ES query
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/sorting.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/sorting.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/sorting.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/sorting.ts
index 4a0f531845f46..ef1be8d48d338 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/api/utils/sorting.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/api/utils/sorting.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IndexPattern } from '../../../../kibana_services';
+import { IndexPattern } from '../../../../../kibana_services';
 
 export enum SortDirection {
   asc = 'asc',
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_action_bar.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/_action_bar.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_action_bar.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/_action_bar.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_directive.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar_directive.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_directive.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar_directive.ts
index 55a378367392c..697b039adde81 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_directive.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar_directive.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { getAngularModule, wrapInI18nContext } from '../../../../kibana_services';
+import { getAngularModule, wrapInI18nContext } from '../../../../../kibana_services';
 import { ActionBar } from './action_bar';
 
 getAngularModule().directive('contextActionBar', function(reactDirective: any) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_warning.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar_warning.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/action_bar_warning.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/action_bar_warning.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/index.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/components/action_bar/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/components/action_bar/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/actions.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/actions.js
new file mode 100644
index 0000000000000..966ecffda7755
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/actions.js
@@ -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 _ from 'lodash';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import { getServices, SearchSource } from '../../../../kibana_services';
+
+import { fetchAnchorProvider } from '../api/anchor';
+import { fetchContextProvider } from '../api/context';
+import { getQueryParameterActions } from '../query_parameters';
+import { FAILURE_REASONS, LOADING_STATUS } from './constants';
+import { MarkdownSimple } from '../../../../../../../kibana_react/public';
+
+export function QueryActionsProvider(Promise) {
+  const fetchAnchor = fetchAnchorProvider(getServices().indexPatterns, new SearchSource());
+  const { fetchSurroundingDocs } = fetchContextProvider(getServices().indexPatterns);
+  const { setPredecessorCount, setQueryParameters, setSuccessorCount } = getQueryParameterActions();
+
+  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 });
+        getServices().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 });
+        getServices().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/angular/context/query/constants.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/constants.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query/constants.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/constants.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query/index.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/index.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query/state.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/state.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query/state.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query/state.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/actions.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/actions.js
new file mode 100644
index 0000000000000..c5f1836bcc0e1
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/actions.js
@@ -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 _ from 'lodash';
+import { getServices } from '../../../../kibana_services';
+import { generateFilters } from '../../../../../../../../../plugins/data/public';
+
+import { MAX_CONTEXT_SIZE, MIN_CONTEXT_SIZE, QUERY_PARAMETER_KEYS } from './constants';
+
+export function getQueryParameterActions() {
+  const filterManager = getServices().filterManager;
+
+  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 => {
+    filterManager.setFilters(filters);
+  };
+
+  const addFilter = state => async (field, values, operation) => {
+    const indexPatternId = state.queryParameters.indexPatternId;
+    const newFilters = generateFilters(filterManager, field, values, operation, indexPatternId);
+    filterManager.addFilters(newFilters);
+    const indexPattern = await getServices().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/angular/context/query_parameters/constants.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/constants.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/constants.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/index.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/index.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/state.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/state.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/state.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context/query_parameters/state.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/context_app.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_app.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context_app.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/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/np_ready/angular/context_app.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/context_app.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_app.js
index 3f91980ccc50f..5fa0958249d79 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/context_app.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_app.js
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { getServices, callAfterBindingsWorkaround, getAngularModule } from './../kibana_services';
+import { getServices, callAfterBindingsWorkaround, getAngularModule } from '../../kibana_services';
 import contextAppTemplate from './context_app.html';
 import './context/components/action_bar';
 import { getFirstSortableField } from './context/api/utils/sorting';
@@ -36,9 +36,6 @@ import {
 
 const { timefilter } = getServices();
 
-// load directives
-import '../../../../data/public/legacy';
-
 const module = getAngularModule();
 
 module.directive('contextApp', function ContextApp() {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/__snapshots__/no_results.test.js.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/__snapshots__/no_results.test.js.snap
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/__snapshots__/no_results.test.js.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/__snapshots__/no_results.test.js.snap
index ed7a4b5d548ed..98cb3ccf6dd91 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/__snapshots__/no_results.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/__snapshots__/no_results.test.js.snap
@@ -23,6 +23,7 @@ Array [
             class="euiIcon euiIcon--medium euiIcon-isLoading euiCallOutHeader__icon"
             focusable="false"
             height="16"
+            role="img"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
@@ -214,6 +215,7 @@ Array [
             class="euiIcon euiIcon--medium euiIcon-isLoading euiCallOutHeader__icon"
             focusable="false"
             height="16"
+            role="img"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
@@ -253,6 +255,7 @@ Array [
             class="euiIcon euiIcon--medium euiIcon-isLoading euiCallOutHeader__icon"
             focusable="false"
             height="16"
+            role="img"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
@@ -360,6 +363,7 @@ Array [
             class="euiIcon euiIcon--medium euiIcon-isLoading euiCallOutHeader__icon"
             focusable="false"
             height="16"
+            role="img"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/_histogram.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_histogram.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/_histogram.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_histogram.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/_no_results.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_no_results.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/_no_results.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/_no_results.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
index 496e1cf375588..c2f716ff6c45a 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/histogram.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
@@ -30,9 +30,6 @@ import {
   Chart,
   HistogramBarSeries,
   GeometryValue,
-  getAnnotationId,
-  getAxisId,
-  getSpecId,
   LineAnnotation,
   Position,
   ScaleType,
@@ -45,7 +42,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { EuiChartThemeType } from '@elastic/eui/src/themes/charts/themes';
 import { Subscription } from 'rxjs';
-import { getServices, timezoneProvider } from '../../kibana_services';
+import { getServices, timezoneProvider } from '../../../kibana_services';
 
 export interface DiscoverHistogramProps {
   chartData: any;
@@ -237,20 +234,20 @@ export class DiscoverHistogram extends Component<DiscoverHistogramProps, Discove
           theme={chartsTheme}
         />
         <Axis
-          id={getAxisId('discover-histogram-left-axis')}
+          id="discover-histogram-left-axis"
           position={Position.Left}
           ticks={5}
           title={chartData.yAxisLabel}
         />
         <Axis
-          id={getAxisId('discover-histogram-bottom-axis')}
+          id="discover-histogram-bottom-axis"
           position={Position.Bottom}
           title={chartData.xAxisLabel}
           tickFormat={this.formatXValue}
           ticks={10}
         />
         <LineAnnotation
-          annotationId={getAnnotationId('line-annotation')}
+          id="line-annotation"
           domainType={AnnotationDomainTypes.XDomain}
           dataValues={lineAnnotationData}
           hideTooltips={true}
@@ -258,13 +255,13 @@ export class DiscoverHistogram extends Component<DiscoverHistogramProps, Discove
         />
         <RectAnnotation
           dataValues={rectAnnotations}
-          annotationId={getAnnotationId('rect-annotation')}
+          id="rect-annotation"
           zIndex={2}
           style={rectAnnotationStyle}
           hideTooltips={true}
         />
         <HistogramBarSeries
-          id={getSpecId('discover-histogram')}
+          id="discover-histogram"
           xScaleType={ScaleType.Time}
           yScaleType={ScaleType.Linear}
           xAccessor="x"
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/index.js
new file mode 100644
index 0000000000000..1a3922dfc2008
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/index.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 { DiscoverNoResults } from './no_results';
+import { DiscoverUninitialized } from './uninitialized';
+import { DiscoverUnsupportedIndexPattern } from './unsupported_index_pattern';
+import { DiscoverHistogram } from './histogram';
+import { getAngularModule, wrapInI18nContext } from '../../../kibana_services';
+
+const app = getAngularModule();
+
+app.directive('discoverNoResults', reactDirective =>
+  reactDirective(wrapInI18nContext(DiscoverNoResults))
+);
+
+app.directive('discoverUninitialized', reactDirective =>
+  reactDirective(wrapInI18nContext(DiscoverUninitialized))
+);
+
+app.directive('discoverUnsupportedIndexPattern', reactDirective =>
+  reactDirective(wrapInI18nContext(DiscoverUnsupportedIndexPattern), ['unsupportedType'])
+);
+
+app.directive('discoverHistogram', reactDirective => reactDirective(DiscoverHistogram));
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.js
index d22a8d495bd0e..ba02068590c14 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.js
@@ -32,7 +32,7 @@ import {
   EuiSpacer,
   EuiText,
 } from '@elastic/eui';
-import { getServices } from '../../kibana_services';
+import { getServices } from '../../../kibana_services';
 
 // eslint-disable-next-line react/prefer-stateless-function
 export class DiscoverNoResults extends Component {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.test.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.test.js
index 33dff54f94c7f..7de792c612993 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/directives/no_results.test.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/no_results.test.js
@@ -22,7 +22,7 @@ import { renderWithIntl } from 'test_utils/enzyme_helpers';
 
 import { DiscoverNoResults } from './no_results';
 
-jest.mock('../../kibana_services', () => {
+jest.mock('../../../kibana_services', () => {
   return {
     getServices: () => ({
       docLinks: {
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/uninitialized.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/uninitialized.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/uninitialized.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/uninitialized.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/directives/unsupported_index_pattern.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/unsupported_index_pattern.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/directives/unsupported_index_pattern.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/unsupported_index_pattern.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/discover.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/discover.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/discover/angular/discover.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index 39a7bb96e11e0..abf025524522b 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -57,7 +57,8 @@ import {
   SavedObjectSaveModal,
   getAngularModule,
   ensureDefaultIndexPattern,
-} from '../kibana_services';
+  registerTimefilterWithGlobalStateFactory,
+} from '../../kibana_services';
 
 const {
   core,
@@ -72,10 +73,9 @@ const {
 } = getServices();
 
 import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../helpers/breadcrumbs';
-import { generateFilters } from '../../../../../../plugins/data/public';
+import { generateFilters } from '../../../../../../../plugins/data/public';
 import { getIndexPatternId } from '../helpers/get_index_pattern_id';
-import { registerTimefilterWithGlobalStateFactory } from '../../../../../ui/public/timefilter/setup_router';
-import { FilterStateManager } from '../../../../data/public/filter/filter_manager';
+import { FilterStateManager } from '../../../../../data/public';
 
 const { getSavedQuery } = data.query.savedQueries;
 
@@ -328,6 +328,7 @@ function discoverController(
           makeUrl: searchId => {
             return kbnUrl.eval('#/discover/{{id}}', { id: searchId });
           },
+          I18nContext: core.i18n.Context,
         });
       },
     };
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc.ts
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc.ts
index af9556656afab..459dcfb30d17b 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { getAngularModule, wrapInI18nContext, getServices } from '../kibana_services';
+import { getAngularModule, wrapInI18nContext, getServices } from '../../kibana_services';
 // @ts-ignore
 import { getRootBreadcrumbs } from '../helpers/breadcrumbs';
 import html from './doc.html';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_doc_table.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/_doc_table.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/_doc_table.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/_doc_table.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/_index.scss
new file mode 100644
index 0000000000000..3663d807851c4
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/_index.scss
@@ -0,0 +1,2 @@
+@import 'doc_table';
+@import 'components/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/actions/columns.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/actions/columns.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/actions/columns.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/actions/columns.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/_index.scss
new file mode 100644
index 0000000000000..6a294c1ed173d
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/_index.scss
@@ -0,0 +1,2 @@
+@import 'table_header';
+@import 'table_row/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_table_header.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/_table_header.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/_table_header.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/_table_header.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/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/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/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/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/index.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/index.ts
new file mode 100644
index 0000000000000..f21f3b17c6955
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/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 { wrapInI18nContext } from '../../../../../kibana_services';
+import { ToolBarPagerText } from './tool_bar_pager_text';
+import { ToolBarPagerButtons } from './tool_bar_pager_buttons';
+
+export function createToolBarPagerTextDirective(reactDirective: any) {
+  return reactDirective(wrapInI18nContext(ToolBarPagerText));
+}
+
+export function createToolBarPagerButtonsDirective(reactDirective: any) {
+  return reactDirective(wrapInI18nContext(ToolBarPagerButtons));
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_buttons.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_buttons.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_buttons.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_text.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_text.test.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_text.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/pager/tool_bar_pager_text.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/pager/tool_bar_pager_text.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header.ts
index 055f14f164476..a5cb9180333a4 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header.ts
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { wrapInI18nContext } from 'ui/i18n';
 import { IUiSettingsClient } from 'kibana/public';
 import { TableHeader } from './table_header/table_header';
+import { wrapInI18nContext } from '../../../../kibana_services';
 
 export function createTableHeaderDirective(reactDirective: any, config: IUiSettingsClient) {
   return reactDirective(
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx
new file mode 100644
index 0000000000000..13833d724967a
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/helpers.tsx
@@ -0,0 +1,81 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { IndexPattern } from '../../../../../kibana_services';
+// @ts-ignore
+import { shortenDottedString } from '../../../../../../../common/utils/shorten_dotted_string';
+
+export type SortOrder = [string, 'asc' | 'desc'];
+export interface ColumnProps {
+  name: string;
+  displayName: string;
+  isSortable: boolean;
+  isRemoveable: boolean;
+  colLeftIdx: number;
+  colRightIdx: number;
+}
+
+/**
+ * Returns properties necessary to display the time column
+ * If it's an IndexPattern with timefield, the time column is
+ * prepended, not moveable and removeable
+ * @param timeFieldName
+ */
+export function getTimeColumn(timeFieldName: string): ColumnProps {
+  return {
+    name: timeFieldName,
+    displayName: 'Time',
+    isSortable: true,
+    isRemoveable: false,
+    colLeftIdx: -1,
+    colRightIdx: -1,
+  };
+}
+/**
+ * A given array of column names returns an array of properties
+ * necessary to display the columns. If the given indexPattern
+ * has a timefield, a time column is prepended
+ * @param columns
+ * @param indexPattern
+ * @param hideTimeField
+ * @param isShortDots
+ */
+export function getDisplayedColumns(
+  columns: string[],
+  indexPattern: IndexPattern,
+  hideTimeField: boolean,
+  isShortDots: boolean
+) {
+  if (!Array.isArray(columns) || typeof indexPattern !== 'object' || !indexPattern.getFieldByName) {
+    return [];
+  }
+  const columnProps = columns.map((column, idx) => {
+    const field = indexPattern.getFieldByName(column);
+    return {
+      name: column,
+      displayName: isShortDots ? shortenDottedString(column) : column,
+      isSortable: field && field.sortable ? true : false,
+      isRemoveable: column !== '_source' || columns.length > 1,
+      colLeftIdx: idx - 1 < 0 ? -1 : idx - 1,
+      colRightIdx: idx + 1 >= columns.length ? -1 : idx + 1,
+    };
+  });
+  return !hideTimeField && indexPattern.timeFieldName
+    ? [getTimeColumn(indexPattern.timeFieldName), ...columnProps]
+    : columnProps;
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header.test.tsx
index e5706b5e3c9bb..ef3d4ecc4b18f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/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, IFieldType } from '../../../../kibana_services';
+import { IndexPattern, IFieldType } from '../../../../../kibana_services';
 
 function getMockIndexPattern() {
   return ({
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header.tsx
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header.tsx
index 71674710ac855..17b961dbe6832 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React from 'react';
-import { IndexPattern } from '../../../../kibana_services';
+import { IndexPattern } from '../../../../../kibana_services';
 // @ts-ignore
 import { TableHeaderColumn } from './table_header_column';
 import { SortOrder, getDisplayedColumns } from './helpers';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header_column.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header_column.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_header/table_header_column.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_header/table_header_column.tsx
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts
index 8ff4ab46ef532..8df035d098469 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row.ts
@@ -24,15 +24,15 @@ import { IUiSettingsClient } from 'kibana/public';
 import rison from 'rison-node';
 import '../../doc_viewer';
 // @ts-ignore
-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 { dispatchRenderComplete } from '../../../../../../../../plugins/kibana_utils/public';
+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';
+import { esFilters } from '../../../../../../../../../plugins/data/public';
 
 // guesstimate at the minimum number of chars wide cells in the table should be
 const MIN_LINE_LENGTH = 20;
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_cell.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_cell.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_cell.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_cell.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_details.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_details.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_details.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_details.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_index.scss
new file mode 100644
index 0000000000000..c7ccdaa39ff65
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_index.scss
@@ -0,0 +1,3 @@
+@import 'cell';
+@import 'details';
+@import 'open';
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_open.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_open.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/_open.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/_open.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/cell.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/cell.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/cell.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/cell.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/details.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/details.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/details.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/details.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/open.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/open.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/open.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/open.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/truncate_by_height.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/truncate_by_height.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/components/table_row/truncate_by_height.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/components/table_row/truncate_by_height.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.ts
index 92ebc24c6e378..3329ffc7cd102 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table.ts
@@ -23,7 +23,7 @@ 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 { dispatchRenderComplete } from '../../../../../../../../plugins/kibana_utils/public';
 import './components/pager';
 import './lib/pager';
 // @ts-ignore
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table_strings.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table_strings.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/doc_table_strings.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/doc_table_strings.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/index.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/infinite_scroll.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/infinite_scroll.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/infinite_scroll.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/infinite_scroll.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.d.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.d.ts
similarity index 92%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.d.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.d.ts
index ebf715a64d939..0bf8a93a88367 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.d.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.d.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IIndexPattern } from '../../../../../../../../plugins/data/public';
+import { IIndexPattern } from '../../../../../../../../../plugins/data/public';
 import { SortOrder } from '../components/table_header/helpers';
 
 export function getSort(
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort_for_search_source.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort_for_search_source.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort_for_search_source.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/get_sort_for_search_source.ts
index 952eadf7cbd94..26bba4589cf6a 100644
--- a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/get_sort_for_search_source.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/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 '../../../kibana_services';
+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/angular/doc_table/lib/pager/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/index.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/index.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/pager.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/pager.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager_factory.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/pager_factory.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_table/lib/pager/pager_factory.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_table/lib/pager/pager_factory.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/doc_viewer.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_viewer.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/doc_viewer.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/doc_viewer.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/get_painless_error.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/get_painless_error.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/get_painless_error.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/get_painless_error.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/angular/index.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/angular/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/angular/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/application.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/application.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/application.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/application.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/_index.scss
new file mode 100644
index 0000000000000..0491430e5fddd
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/_index.scss
@@ -0,0 +1,3 @@
+@import 'fetch_error/index';
+@import 'field_chooser/index';
+@import 'doc_viewer/index';
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc/doc.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc/doc.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
index 4df56483fa5c6..e09f26311e4e3 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc/doc.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.test.tsx
@@ -25,10 +25,10 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { Doc, DocProps } from './doc';
 
 jest.mock('../doc_viewer/doc_viewer', () => ({
-  DocViewer: 'test',
+  DocViewer: () => null,
 }));
 
-jest.mock('../../kibana_services', () => {
+jest.mock('../../../kibana_services', () => {
   return {
     getServices: () => ({
       metadata: {
@@ -67,7 +67,7 @@ async function mountDoc(search: () => void, update = false, indexPatternGetter:
     indexPatternService,
   } as DocProps;
   let comp!: ReactWrapper;
-  act(() => {
+  await act(async () => {
     comp = mountWithIntl(<Doc {...props} />);
     if (update) comp.update();
   });
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc/doc.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.tsx
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc/doc.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.tsx
index 7020addb2bc6d..819eb9df592bd 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc/doc.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/doc.tsx
@@ -22,7 +22,7 @@ import { EuiCallOut, EuiLink, EuiLoadingSpinner, EuiPageContent } from '@elastic
 import { IndexPatternsContract } from 'src/plugins/data/public';
 import { DocViewer } from '../doc_viewer/doc_viewer';
 import { ElasticRequestState, useEsDocSearch } from './use_es_doc_search';
-import { ElasticSearchHit, getServices } from '../../kibana_services';
+import { ElasticSearchHit, getServices } from '../../../kibana_services';
 
 export interface ElasticSearchResult {
   hits: {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc/use_es_doc_search.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.test.tsx
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc/use_es_doc_search.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.test.tsx
index 2420eb2cd22bb..a8fe8de833315 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc/use_es_doc_search.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.test.tsx
@@ -43,7 +43,7 @@ describe('Test of <Doc /> helper / hook', () => {
     `);
   });
 
-  test('useEsDocSearch', () => {
+  test('useEsDocSearch', async () => {
     const indexPattern = {
       getComputedFields: () => [],
     };
@@ -53,16 +53,16 @@ describe('Test of <Doc /> helper / hook', () => {
     const props = {
       id: '1',
       index: 'index1',
-      esClient: { search: jest.fn() },
+      esClient: { search: jest.fn(() => new Promise(() => {})) },
       indexPatternId: 'xyz',
       indexPatternService,
     } as DocProps;
     let hook;
-    act(() => {
+    await act(async () => {
       hook = renderHook((p: DocProps) => useEsDocSearch(p), { initialProps: props });
     });
     // @ts-ignore
-    expect(hook.result.current).toEqual([ElasticRequestState.Loading, null, null]);
+    expect(hook.result.current).toEqual([ElasticRequestState.Loading, null, indexPattern]);
     expect(indexPatternService.get).toHaveBeenCalled();
   });
 });
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc/use_es_doc_search.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc/use_es_doc_search.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
index 20bffe829de16..a40d9731a04f5 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc/use_es_doc_search.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc/use_es_doc_search.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { useEffect, useState } from 'react';
-import { ElasticSearchHit, IndexPattern } from '../../kibana_services';
+import { ElasticSearchHit, IndexPattern } from '../../../kibana_services';
 import { DocProps } from './doc';
 
 export enum ElasticRequestState {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/__snapshots__/doc_viewer_render_tab.test.tsx.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/_doc_viewer.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_doc_viewer.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/_doc_viewer.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_doc_viewer.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.tsx
new file mode 100644
index 0000000000000..15f0f40700abc
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.test.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 from 'react';
+import { mount, shallow } from 'enzyme';
+import { DocViewer } from './doc_viewer';
+// @ts-ignore
+import { findTestSubject } from '@elastic/eui/lib/test';
+import { getServices } from '../../../kibana_services';
+import { DocViewRenderProps } from '../../doc_views/doc_views_types';
+
+jest.mock('../../../kibana_services', () => {
+  let registry: any[] = [];
+  return {
+    getServices: () => ({
+      docViewsRegistry: {
+        addDocView(view: any) {
+          registry.push(view);
+        },
+        getDocViewsSorted() {
+          return registry;
+        },
+      },
+      resetRegistry: () => {
+        registry = [];
+      },
+    }),
+    formatMsg: (x: any) => String(x),
+    formatStack: (x: any) => String(x),
+  };
+});
+
+beforeEach(() => {
+  (getServices() as any).resetRegistry();
+  jest.clearAllMocks();
+});
+
+test('Render <DocViewer/> with 3 different tabs', () => {
+  const registry = getServices().docViewsRegistry;
+  registry.addDocView({ order: 10, title: 'Render function', render: jest.fn() });
+  registry.addDocView({ order: 20, title: 'React component', component: () => <div>test</div> });
+  registry.addDocView({ order: 30, title: 'Invalid doc view' });
+
+  const renderProps = { hit: {} } as DocViewRenderProps;
+
+  const wrapper = shallow(<DocViewer {...renderProps} />);
+
+  expect(wrapper).toMatchSnapshot();
+});
+
+test('Render <DocViewer/> with 1 tab displaying error message', () => {
+  function SomeComponent() {
+    // this is just a placeholder
+    return null;
+  }
+
+  const registry = getServices().docViewsRegistry;
+  registry.addDocView({
+    order: 10,
+    title: 'React component',
+    component: SomeComponent,
+  });
+
+  const renderProps = { hit: {} } as DocViewRenderProps;
+  const errorMsg = 'Catch me if you can!';
+
+  const wrapper = mount(<DocViewer {...renderProps} />);
+  const error = new Error(errorMsg);
+  wrapper.find(SomeComponent).simulateError(error);
+  const errorMsgComponent = findTestSubject(wrapper, 'docViewerError');
+  expect(errorMsgComponent.text()).toMatch(new RegExp(`${errorMsg}`));
+});
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx
index a2d58439ad031..a177d8c29304c 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer.tsx
@@ -17,10 +17,10 @@
  * under the License.
  */
 import React from 'react';
-import { DocView } from 'ui/registry/doc_views_types';
 import { EuiTabbedContent } from '@elastic/eui';
-import { getServices, DocViewRenderProps } from '../../kibana_services';
+import { getServices } from '../../../kibana_services';
 import { DocViewerTab } from './doc_viewer_tab';
+import { DocView, DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 /**
  * Rendering tabs with different views of 1 Elasticsearch hit in Discover.
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_error.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_error.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_error.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_error.tsx
index 80b9cb5110db7..201ed562cfd6f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_error.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_error.tsx
@@ -18,8 +18,7 @@
  */
 import React from 'react';
 import { EuiCallOut, EuiCodeBlock } from '@elastic/eui';
-// @ts-ignore
-import { formatMsg, formatStack } from 'ui/notify/lib/index';
+import { formatMsg, formatStack } from '../../../kibana_services';
 
 interface Props {
   error: Error | string | null;
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.test.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.test.tsx
index 476d7cef159fb..79f185452164f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/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 '../../kibana_services';
+import { DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 test('Mounting and unmounting DocViewerRenderTab', () => {
   const unmountFn = jest.fn();
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx
index 8ac11caefff90..0b1a02f1987c2 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_tab.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_render_tab.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useRef, useEffect } from 'react';
-import { DocViewRenderFn, DocViewRenderProps } from '../../kibana_services';
+import { DocViewRenderFn, DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 interface Props {
   render: DocViewRenderFn;
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_tab.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_tab.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx
index 19558129eae8d..0c21fafc91d69 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_tab.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/doc_viewer/doc_viewer_tab.tsx
@@ -18,9 +18,9 @@
  */
 import React from 'react';
 import { I18nProvider } from '@kbn/i18n/react';
-import { DocViewRenderProps, DocViewRenderFn } from '../../kibana_services';
 import { DocViewRenderTab } from './doc_viewer_render_tab';
 import { DocViewerError } from './doc_viewer_render_error';
+import { DocViewRenderFn, DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 interface Props {
   component?: React.ComponentType<DocViewRenderProps>;
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/_fetch_error.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/_fetch_error.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/fetch_error/_fetch_error.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/_fetch_error.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/fetch_error/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/fetch_error.tsx
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/fetch_error.tsx
index 8f67c1952f998..d2dda32f318fe 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/fetch_error.tsx
@@ -19,7 +19,7 @@
 import React, { Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFlexGroup, EuiFlexItem, EuiCallOut, EuiCodeBlock, EuiSpacer } from '@elastic/eui';
-import { getAngularModule, wrapInI18nContext, getServices } from '../../kibana_services';
+import { getAngularModule, wrapInI18nContext, getServices } from '../../../kibana_services';
 
 interface Props {
   fetchError: {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/fetch_error/index.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/fetch_error/index.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/fetch_error/index.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap
new file mode 100644
index 0000000000000..42c11152e2633
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/__snapshots__/discover_index_pattern.test.tsx.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DiscoverIndexPattern Invalid props dont cause an exception: "" 1`] = `""`;
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/_field_chooser.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/_field_chooser.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/_field_chooser.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/_index.scss
new file mode 100644
index 0000000000000..91daed8ea048e
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/_index.scss
@@ -0,0 +1 @@
+@import 'field_chooser';
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/change_indexpattern.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/change_indexpattern.tsx
new file mode 100644
index 0000000000000..60842ac81ee03
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/change_indexpattern.tsx
@@ -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 { i18n } from '@kbn/i18n';
+import React, { useState } from 'react';
+import {
+  EuiButtonEmpty,
+  EuiPopover,
+  EuiPopoverTitle,
+  EuiSelectable,
+  EuiButtonEmptyProps,
+} from '@elastic/eui';
+import { EuiSelectableProps } from '@elastic/eui/src/components/selectable/selectable';
+import { IndexPatternRef } from './types';
+
+export type ChangeIndexPatternTriggerProps = EuiButtonEmptyProps & {
+  label: string;
+  title?: string;
+};
+
+// TODO: refactor to shared component with ../../../../../../../../x-pack/legacy/plugins/lens/public/indexpattern_plugin/change_indexpattern
+
+export function ChangeIndexPattern({
+  indexPatternRefs,
+  indexPatternId,
+  onChangeIndexPattern,
+  trigger,
+  selectableProps,
+}: {
+  trigger: ChangeIndexPatternTriggerProps;
+  indexPatternRefs: IndexPatternRef[];
+  onChangeIndexPattern: (newId: string) => void;
+  indexPatternId?: string;
+  selectableProps?: EuiSelectableProps;
+}) {
+  const [isPopoverOpen, setPopoverIsOpen] = useState(false);
+
+  const createTrigger = function() {
+    const { label, title, ...rest } = trigger;
+    return (
+      <EuiButtonEmpty
+        className="eui-textTruncate"
+        flush="left"
+        color="text"
+        iconSide="right"
+        iconType="arrowDown"
+        title={title}
+        onClick={() => setPopoverIsOpen(!isPopoverOpen)}
+        {...rest}
+      >
+        {label}
+      </EuiButtonEmpty>
+    );
+  };
+
+  return (
+    <EuiPopover
+      button={createTrigger()}
+      isOpen={isPopoverOpen}
+      closePopover={() => setPopoverIsOpen(false)}
+      className="eui-textTruncate"
+      anchorClassName="eui-textTruncate"
+      display="block"
+      panelPaddingSize="s"
+      ownFocus
+    >
+      <div style={{ width: 320 }}>
+        <EuiPopoverTitle>
+          {i18n.translate('kbn.discover.fieldChooser.indexPattern.changeIndexPatternTitle', {
+            defaultMessage: 'Change index pattern',
+          })}
+        </EuiPopoverTitle>
+        <EuiSelectable
+          data-test-subj="indexPattern-switcher"
+          {...selectableProps}
+          searchable
+          singleSelection="always"
+          options={indexPatternRefs.map(({ title, id }) => ({
+            label: title,
+            key: id,
+            value: id,
+            checked: id === indexPatternId ? 'on' : undefined,
+          }))}
+          onChange={choices => {
+            const choice = (choices.find(({ checked }) => checked) as unknown) as {
+              value: string;
+            };
+            onChangeIndexPattern(choice.value);
+            setPopoverIsOpen(false);
+          }}
+          searchProps={{
+            compressed: true,
+            ...(selectableProps ? selectableProps.searchProps : undefined),
+          }}
+        >
+          {(list, search) => (
+            <>
+              {search}
+              {list}
+            </>
+          )}
+        </EuiSelectable>
+      </div>
+    </EuiPopover>
+  );
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field.js
index 0d2d0788dd175..f7f219a287492 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field.js
@@ -20,10 +20,8 @@
 import $ from 'jquery';
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { getServices } from '../../kibana_services';
+import { getServices } from '../../../kibana_services';
 import html from './discover_field.html';
-import 'ui/directives/css_truncate';
-import 'ui/directives/field_name';
 import './string_progress_bar';
 import detailsHtml from './lib/detail_views/string.html';
 
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/np_ready/components/field_chooser/discover_field_search.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search.test.tsx
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/np_ready/components/field_chooser/discover_field_search.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search.tsx
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/np_ready/components/field_chooser/discover_field_search_directive.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_field_search_directive.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_field_search_directive.ts
index 69865ec424325..6d570349ee0c6 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/np_ready/components/field_chooser/discover_field_search_directive.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { wrapInI18nContext } from '../../kibana_services';
+import { wrapInI18nContext } from '../../../kibana_services';
 import { DiscoverFieldSearch } from './discover_field_search';
 
 export function createFieldSearchDirective(reactDirective: any) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.test.tsx
new file mode 100644
index 0000000000000..96b8cc383888e
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.test.tsx
@@ -0,0 +1,100 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { shallowWithIntl as shallow } from 'test_utils/enzyme_helpers';
+
+// @ts-ignore
+import { ShallowWrapper } from 'enzyme';
+import { ChangeIndexPattern } from './change_indexpattern';
+import { SavedObject } from 'kibana/server';
+import { DiscoverIndexPattern } from './discover_index_pattern';
+import { EuiSelectable, EuiSelectableList } from '@elastic/eui';
+
+const indexPattern1 = {
+  id: 'test1',
+  attributes: {
+    title: 'test1 title',
+  },
+} as SavedObject;
+
+const indexPattern2 = {
+  id: 'test2',
+  attributes: {
+    title: 'test2 title',
+  },
+} as SavedObject;
+
+const defaultProps = {
+  indexPatternList: [indexPattern1, indexPattern2],
+  selectedIndexPattern: indexPattern1,
+  setIndexPattern: jest.fn(async () => {}),
+};
+
+function getIndexPatternPickerList(instance: ShallowWrapper) {
+  return instance
+    .find(ChangeIndexPattern)
+    .first()
+    .dive()
+    .find(EuiSelectable);
+}
+
+function getIndexPatternPickerOptions(instance: ShallowWrapper) {
+  return getIndexPatternPickerList(instance)
+    .dive()
+    .find(EuiSelectableList)
+    .prop('options');
+}
+
+function selectIndexPatternPickerOption(instance: ShallowWrapper, selectedLabel: string) {
+  const options: Array<{ label: string; checked?: 'on' | 'off' }> = getIndexPatternPickerOptions(
+    instance
+  ).map((option: any) =>
+    option.label === selectedLabel
+      ? { ...option, checked: 'on' }
+      : { ...option, checked: undefined }
+  );
+  return getIndexPatternPickerList(instance).prop('onChange')!(options);
+}
+
+describe('DiscoverIndexPattern', () => {
+  test('Invalid props dont cause an exception', () => {
+    const props = {
+      indexPatternList: null,
+      selectedIndexPattern: null,
+      setIndexPattern: jest.fn(),
+    } as any;
+
+    expect(shallow(<DiscoverIndexPattern {...props} />)).toMatchSnapshot(`""`);
+  });
+  test('should list all index patterns', () => {
+    const instance = shallow(<DiscoverIndexPattern {...defaultProps} />);
+
+    expect(getIndexPatternPickerOptions(instance)!.map((option: any) => option.label)).toEqual([
+      'test1 title',
+      'test2 title',
+    ]);
+  });
+
+  test('should switch data panel to target index pattern', () => {
+    const instance = shallow(<DiscoverIndexPattern {...defaultProps} />);
+
+    selectIndexPatternPickerOption(instance, 'test2 title');
+    expect(defaultProps.setIndexPattern).toHaveBeenCalledWith('test2');
+  });
+});
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.tsx
new file mode 100644
index 0000000000000..37338decce2c2
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern.tsx
@@ -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 React, { useState } from 'react';
+import { SavedObject } from 'kibana/server';
+import { I18nProvider } from '@kbn/i18n/react';
+
+import { IndexPatternRef } from './types';
+import { ChangeIndexPattern } from './change_indexpattern';
+export interface DiscoverIndexPatternProps {
+  /**
+   * list of available index patterns, if length > 1, component offers a "change" link
+   */
+  indexPatternList: SavedObject[];
+  /**
+   * currently selected index pattern, due to angular issues it's undefined at first rendering
+   */
+  selectedIndexPattern: SavedObject;
+  /**
+   * triggered when user selects a new index pattern
+   */
+  setIndexPattern: (id: string) => void;
+}
+
+/**
+ * Component allows you to select an index pattern in discovers side bar
+ */
+export function DiscoverIndexPattern({
+  indexPatternList,
+  selectedIndexPattern,
+  setIndexPattern,
+}: DiscoverIndexPatternProps) {
+  if (!indexPatternList || indexPatternList.length === 0 || !selectedIndexPattern) {
+    // just in case, shouldn't happen
+    return null;
+  }
+  const options: IndexPatternRef[] = indexPatternList.map(entity => ({
+    id: entity.id,
+    title: entity.attributes!.title,
+  }));
+
+  const [selected, setSelected] = useState({
+    id: selectedIndexPattern.id,
+    title: selectedIndexPattern.attributes!.title,
+  });
+
+  return (
+    <div className="indexPattern__container">
+      <I18nProvider>
+        <ChangeIndexPattern
+          trigger={{
+            label: selected.title,
+            title: selected.title,
+            'data-test-subj': 'indexPattern-switch-link',
+            className: 'indexPattern__triggerButton',
+          }}
+          indexPatternId={selected.id}
+          indexPatternRefs={options}
+          onChangeIndexPattern={id => {
+            const indexPattern = options.find(pattern => pattern.id === id);
+            if (indexPattern) {
+              setIndexPattern(id);
+              setSelected(indexPattern);
+            }
+          }}
+        />
+      </I18nProvider>
+    </div>
+  );
+}
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/np_ready/components/field_chooser/discover_index_pattern_directive.ts
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/discover_index_pattern_directive.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/discover_index_pattern_directive.ts
index 46c8fa854847a..8bbeac086f093 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/np_ready/components/field_chooser/discover_index_pattern_directive.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { wrapInI18nContext } from '../../kibana_services';
+import { wrapInI18nContext } from '../../../kibana_services';
 import { DiscoverIndexPattern } from './discover_index_pattern';
 
 export function createIndexPatternSelectDirective(reactDirective: any) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.html
new file mode 100644
index 0000000000000..1587c2af79752
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.html
@@ -0,0 +1,99 @@
+<section class="sidebar-list" aria-label="{{::'kbn.discover.fieldChooser.filter.indexAndFieldsSectionAriaLabel' | i18n: {defaultMessage: 'Index and fields'} }}">
+  <discover-index-pattern-select
+    selected-index-pattern="selectedIndexPattern"
+    set-index-pattern="setIndexPattern"
+    index-pattern-list="indexPatternList"
+  >
+  </discover-index-pattern-select>
+  <div class="sidebar-item" >
+    <form>
+      <discover-field-search
+        on-change="setFilterValue"
+        value="filter.vals.name"
+        types="fieldTypes"
+      >
+      </discover-field-search>
+    </form>
+  </div>
+
+  <div class="dscSidebar__listHeader sidebar-list-header" ng-if="fields.length">
+    <h3
+      class="euiFlexItem euiTitle euiTitle--xxxsmall sidebar-list-header-heading"
+      id="selected_fields"
+      tabindex="0"
+      i18n-id="kbn.discover.fieldChooser.filter.selectedFieldsTitle"
+      i18n-default-message="Selected fields"
+    ></h3>
+  </div>
+  <ul class="list-unstyled dscFieldList--selected" aria-labelledby="selected_fields">
+    <discover-field
+      ng-repeat="field in fields|filter:filter.isFieldFilteredAndDisplayed"
+      field="field"
+      on-add-field="onAddField"
+      on-add-filter="onAddFilter"
+      on-remove-field="onRemoveField"
+      on-show-details="computeDetails"
+    >
+    </discover-field>
+  </ul>
+
+  <div class="sidebar-list-header sidebar-item euiFlexGroup euiFlexGroup--gutterMedium" ng-if="fields.length">
+    <h3
+      class="euiFlexItem euiTitle euiTitle--xxxsmall sidebar-list-header-heading"
+      id="available_fields"
+      tabindex="0"
+      i18n-id="kbn.discover.fieldChooser.filter.availableFieldsTitle"
+      i18n-default-message="Available fields"
+    ></h3>
+
+    <div class="euiFlexItem euiFlexItem--flexGrowZero">
+      <button
+        ng-click="$parent.showFields = !$parent.showFields"
+        aria-hidden="true"
+        class="kuiButton kuiButton--small visible-xs visible-sm pull-right dscFieldChooser__toggle"
+      >
+        <span
+          aria-hidden="true"
+          class="kuiIcon"
+          ng-class="{ 'fa-chevron-right': !$parent.showFields, 'fa-chevron-down': $parent.showFields }"
+        ></span>
+      </button>
+    </div>
+  </div>
+
+  <ul
+    ng-show="(popularFields | filter:filter.isFieldFilteredAndNotDisplayed).length > 0"
+    ng-class="{ 'hidden-sm': !showFields, 'hidden-xs': !showFields }"
+    class="list-unstyled sidebar-well dscFieldList--popular">
+    <li class="sidebar-item sidebar-list-header">
+      <h6
+        i18n-id="kbn.discover.fieldChooser.filter.popularTitle"
+        i18n-default-message="Popular"
+      ></h6>
+    </li>
+    <discover-field
+      ng-repeat="field in popularFields | filter:filter.isFieldFilteredAndNotDisplayed"
+      field="field"
+      on-add-field="onAddField"
+      on-add-filter="onAddFilter"
+      on-remove-field="onRemoveField"
+      on-show-details="computeDetails"
+    >
+    </discover-field>
+  </ul>
+
+  <ul
+    ng-class="{ 'hidden-sm': !showFields, 'hidden-xs': !showFields  }"
+    class="list-unstyled dscFieldList--unpopular">
+    <discover-field
+      ng-repeat="field in unpopularFields | filter:filter.isFieldFilteredAndNotDisplayed"
+      field="field"
+      on-add-field="onAddField"
+      on-add-filter="onAddFilter"
+      on-remove-field="onRemoveField"
+      on-show-details="computeDetails"
+    >
+    </discover-field>
+  </ul>
+
+</section>
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js
index cf636a1675eb0..47b3ec6b07e8e 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/field_chooser.js
@@ -23,7 +23,7 @@ import { fieldCalculator } from './lib/field_calculator';
 import './discover_field';
 import './discover_field_search_directive';
 import './discover_index_pattern_directive';
-import { FieldList } from '../../../../../../../plugins/data/public';
+import { FieldList } from '../../../../../../../../plugins/data/public';
 import fieldChooserTemplate from './field_chooser.html';
 
 export function createFieldChooserDirective($location, config, $route) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/detail_views/string.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/lib/detail_views/string.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/detail_views/string.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/field_calculator.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/field_calculator.js
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/string_progress_bar.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/string_progress_bar.tsx
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/components/field_chooser/string_progress_bar.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/string_progress_bar.tsx
index 7e4fc79839a52..0c5e7fa69357d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/field_chooser/string_progress_bar.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/string_progress_bar.tsx
@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiProgress, EuiText, EuiToolTip } from '@elastic/eui';
-import { wrapInI18nContext } from '../../kibana_services';
+import { wrapInI18nContext } from '../../../kibana_services';
 
 interface Props {
   percent: number;
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/types.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/types.ts
new file mode 100644
index 0000000000000..302bf5165777c
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/types.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.
+ */
+
+export interface IndexPatternRef {
+  id: string;
+  title: string;
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/help_menu/help_menu_util.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/help_menu/help_menu_util.js
new file mode 100644
index 0000000000000..37fa79b490d56
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/help_menu/help_menu_util.js
@@ -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.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { getServices } from '../../../kibana_services';
+const { docLinks } = getServices();
+
+export function addHelpMenuToAppChrome(chrome) {
+  chrome.setHelpExtension({
+    appName: i18n.translate('kbn.discover.helpMenu.appName', {
+      defaultMessage: 'Discover',
+    }),
+    links: [
+      {
+        linkType: 'documentation',
+        href: `${docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${docLinks.DOC_LINK_VERSION}/discover.html`,
+      },
+    ],
+  });
+}
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/__snapshots__/json_code_block.test.tsx.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/__snapshots__/json_code_block.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/__snapshots__/json_code_block.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/__snapshots__/json_code_block.test.tsx.snap
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.test.tsx
similarity index 95%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.test.tsx
index 776971e57091d..9cab7974c9eb2 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.test.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { JsonCodeBlock } from './json_code_block';
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../kibana_services';
 
 it('returns the `JsonCodeEditor` component', () => {
   const props = {
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.tsx
similarity index 88%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.tsx
index 3f412b0500523..3331969e351ab 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/json_code_block.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/json_code_block/json_code_block.tsx
@@ -19,10 +19,10 @@
 import React from 'react';
 import { EuiCodeBlock } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DocViewRenderProps } from 'ui/registry/doc_views';
+import { DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 export function JsonCodeBlock({ hit }: DocViewRenderProps) {
-  const label = i18n.translate('kbnDocViews.json.codeEditorAriaLabel', {
+  const label = i18n.translate('kbn.discover.docViews.json.codeEditorAriaLabel', {
     defaultMessage: 'Read only JSON view of an elasticsearch document',
   });
   return (
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.test.tsx
similarity index 97%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.test.tsx
index bad006aa8c7d5..f816b33bcd0ae 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.test.tsx
@@ -18,12 +18,14 @@
  */
 import React from 'react';
 import { mount } from 'enzyme';
-import { IndexPattern } from 'ui/index_patterns';
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { flattenHitWrapper } from '../../../../data/public/';
 import { DocViewTable } from './table';
 
+import { IndexPattern, indexPatterns } from '../../../kibana_services';
+
+jest.mock('ui/new_platform');
+
 // @ts-ignore
 const indexPattern = {
   fields: {
@@ -68,7 +70,7 @@ const indexPattern = {
   formatHit: jest.fn(hit => hit._source),
 } as IndexPattern;
 
-indexPattern.flattenHit = flattenHitWrapper(indexPattern, indexPattern.metaFields);
+indexPattern.flattenHit = indexPatterns.flattenHitWrapper(indexPattern, indexPattern.metaFields);
 
 describe('DocViewTable at Discover', () => {
   // At Discover's main view, all buttons are rendered
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.tsx
similarity index 97%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.tsx
index 7158739e5d437..4bb2f83016c22 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table.tsx
@@ -17,9 +17,9 @@
  * under the License.
  */
 import React, { useState } from 'react';
-import { DocViewRenderProps } from 'ui/registry/doc_views';
 import { DocViewTableRow } from './table_row';
 import { arrayContainsObjects, trimAngularSpan } from './table_helper';
+import { DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 const COLLAPSE_LINE_LENGTH = 350;
 
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.test.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.test.ts
similarity index 100%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.test.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.test.ts
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.tsx
similarity index 100%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_helper.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_helper.tsx
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
similarity index 96%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
index 045e8093124a6..ffcb20f076736 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { ReactNode } from 'react';
-import { FieldName } from 'ui/directives/field_name/field_name';
-import { FieldMapping, DocViewFilterFn } from 'ui/registry/doc_views_types';
 import classNames from 'classnames';
+import React, { ReactNode } from 'react';
+import { FieldName } from '../../../kibana_services';
+import { FieldMapping, DocViewFilterFn } from '../../doc_views/doc_views_types';
 import { DocViewTableRowBtnFilterAdd } from './table_row_btn_filter_add';
 import { DocViewTableRowBtnFilterRemove } from './table_row_btn_filter_remove';
 import { DocViewTableRowBtnToggleColumn } from './table_row_btn_toggle_column';
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_collapse.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_collapse.tsx
similarity index 94%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_collapse.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_collapse.tsx
index cb6b522ba9559..e59f607329d4a 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_collapse.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_collapse.tsx
@@ -26,7 +26,7 @@ export interface Props {
 }
 
 export function DocViewTableRowBtnCollapse({ onClick, isCollapsed }: Props) {
-  const label = i18n.translate('kbnDocViews.table.toggleFieldDetails', {
+  const label = i18n.translate('kbn.discover.docViews.table.toggleFieldDetails', {
     defaultMessage: 'Toggle field details',
   });
   return (
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_add.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_add.tsx
similarity index 87%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_add.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_add.tsx
index df4572c5bb53b..8e2668e26cf08 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_add.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_add.tsx
@@ -29,12 +29,12 @@ export interface Props {
 export function DocViewTableRowBtnFilterAdd({ onClick, disabled = false }: Props) {
   const tooltipContent = disabled ? (
     <FormattedMessage
-      id="kbnDocViews.table.unindexedFieldsCanNotBeSearchedTooltip"
+      id="kbn.discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip"
       defaultMessage="Unindexed fields can not be searched"
     />
   ) : (
     <FormattedMessage
-      id="kbnDocViews.table.filterForValueButtonTooltip"
+      id="kbn.discover.docViews.table.filterForValueButtonTooltip"
       defaultMessage="Filter for value"
     />
   );
@@ -42,7 +42,7 @@ export function DocViewTableRowBtnFilterAdd({ onClick, disabled = false }: Props
   return (
     <EuiToolTip content={tooltipContent}>
       <EuiButtonIcon
-        aria-label={i18n.translate('kbnDocViews.table.filterForValueButtonAriaLabel', {
+        aria-label={i18n.translate('kbn.discover.docViews.table.filterForValueButtonAriaLabel', {
           defaultMessage: 'Filter for value',
         })}
         className="kbnDocViewer__actionButton"
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_exists.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_exists.tsx
similarity index 80%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_exists.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_exists.tsx
index ae387ef1c4fa1..ba1cb4a4db4cf 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_exists.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_exists.tsx
@@ -35,18 +35,18 @@ export function DocViewTableRowBtnFilterExists({
   const tooltipContent = disabled ? (
     scripted ? (
       <FormattedMessage
-        id="kbnDocViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip"
+        id="kbn.discover.docViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip"
         defaultMessage="Unable to filter for presence of scripted fields"
       />
     ) : (
       <FormattedMessage
-        id="kbnDocViews.table.unableToFilterForPresenceOfMetaFieldsTooltip"
+        id="kbn.discover.docViews.table.unableToFilterForPresenceOfMetaFieldsTooltip"
         defaultMessage="Unable to filter for presence of meta fields"
       />
     )
   ) : (
     <FormattedMessage
-      id="kbnDocViews.table.filterForFieldPresentButtonTooltip"
+      id="kbn.discover.docViews.table.filterForFieldPresentButtonTooltip"
       defaultMessage="Filter for field present"
     />
   );
@@ -54,9 +54,12 @@ export function DocViewTableRowBtnFilterExists({
   return (
     <EuiToolTip content={tooltipContent}>
       <EuiButtonIcon
-        aria-label={i18n.translate('kbnDocViews.table.filterForFieldPresentButtonAriaLabel', {
-          defaultMessage: 'Filter for field present',
-        })}
+        aria-label={i18n.translate(
+          'kbn.discover.docViews.table.filterForFieldPresentButtonAriaLabel',
+          {
+            defaultMessage: 'Filter for field present',
+          }
+        )}
         onClick={onClick}
         className="kbnDocViewer__actionButton"
         data-test-subj="addExistsFilterButton"
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_remove.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_remove.tsx
similarity index 87%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_remove.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_remove.tsx
index eda6636582977..78538f337ba9e 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_filter_remove.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_filter_remove.tsx
@@ -29,12 +29,12 @@ export interface Props {
 export function DocViewTableRowBtnFilterRemove({ onClick, disabled = false }: Props) {
   const tooltipContent = disabled ? (
     <FormattedMessage
-      id="kbnDocViews.table.unindexedFieldsCanNotBeSearchedTooltip"
+      id="kbn.discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip"
       defaultMessage="Unindexed fields can not be searched"
     />
   ) : (
     <FormattedMessage
-      id="kbnDocViews.table.filterOutValueButtonTooltip"
+      id="kbn.discover.docViews.table.filterOutValueButtonTooltip"
       defaultMessage="Filter out value"
     />
   );
@@ -42,7 +42,7 @@ export function DocViewTableRowBtnFilterRemove({ onClick, disabled = false }: Pr
   return (
     <EuiToolTip content={tooltipContent}>
       <EuiButtonIcon
-        aria-label={i18n.translate('kbnDocViews.table.filterOutValueButtonAriaLabel', {
+        aria-label={i18n.translate('kbn.discover.docViews.table.filterOutValueButtonAriaLabel', {
           defaultMessage: 'Filter out value',
         })}
         className="kbnDocViewer__actionButton"
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_toggle_column.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_toggle_column.tsx
similarity index 79%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_toggle_column.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_toggle_column.tsx
index 55864f6567fe9..7a8fca529ec5e 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_btn_toggle_column.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_btn_toggle_column.tsx
@@ -31,9 +31,12 @@ export function DocViewTableRowBtnToggleColumn({ onClick, active, disabled = fal
   if (disabled) {
     return (
       <EuiButtonIcon
-        aria-label={i18n.translate('kbnDocViews.table.toggleColumnInTableButtonAriaLabel', {
-          defaultMessage: 'Toggle column in table',
-        })}
+        aria-label={i18n.translate(
+          'kbn.discover.docViews.table.toggleColumnInTableButtonAriaLabel',
+          {
+            defaultMessage: 'Toggle column in table',
+          }
+        )}
         className="kbnDocViewer__actionButton"
         data-test-subj="toggleColumnButton"
         disabled
@@ -46,15 +49,18 @@ export function DocViewTableRowBtnToggleColumn({ onClick, active, disabled = fal
     <EuiToolTip
       content={
         <FormattedMessage
-          id="kbnDocViews.table.toggleColumnInTableButtonTooltip"
+          id="kbn.discover.docViews.table.toggleColumnInTableButtonTooltip"
           defaultMessage="Toggle column in table"
         />
       }
     >
       <EuiButtonIcon
-        aria-label={i18n.translate('kbnDocViews.table.toggleColumnInTableButtonAriaLabel', {
-          defaultMessage: 'Toggle column in table',
-        })}
+        aria-label={i18n.translate(
+          'kbn.discover.docViews.table.toggleColumnInTableButtonAriaLabel',
+          {
+            defaultMessage: 'Toggle column in table',
+          }
+        )}
         aria-pressed={active}
         onClick={onClick}
         className="kbnDocViewer__actionButton"
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_no_mapping.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_no_mapping.tsx
new file mode 100644
index 0000000000000..347deb842c0bc
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_no_mapping.tsx
@@ -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 React from 'react';
+import { EuiIconTip } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+export function DocViewTableRowIconNoMapping() {
+  const ariaLabel = i18n.translate(
+    'kbn.discover.docViews.table.noCachedMappingForThisFieldAriaLabel',
+    {
+      defaultMessage: 'Warning',
+    }
+  );
+  const tooltipContent = i18n.translate(
+    'kbn.discover.docViews.table.noCachedMappingForThisFieldTooltip',
+    {
+      defaultMessage:
+        'No cached mapping for this field. Refresh field list from the Management > Index Patterns page',
+    }
+  );
+  return (
+    <EuiIconTip
+      aria-label={ariaLabel}
+      color="warning"
+      content={tooltipContent}
+      iconProps={{
+        className: 'kbnDocViewer__warning',
+        'data-test-subj': 'noMappingWarning',
+      }}
+      size="s"
+      type="alert"
+    />
+  );
+}
diff --git a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_underscore.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_underscore.tsx
similarity index 89%
rename from src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_underscore.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_underscore.tsx
index b527714014dae..724b5712cf1fe 100644
--- a/src/legacy/core_plugins/kbn_doc_views/public/views/table/table_row_icon_underscore.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row_icon_underscore.tsx
@@ -22,13 +22,13 @@ import { i18n } from '@kbn/i18n';
 
 export function DocViewTableRowIconUnderscore() {
   const ariaLabel = i18n.translate(
-    'kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel',
+    'kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel',
     {
       defaultMessage: 'Warning',
     }
   );
   const tooltipContent = i18n.translate(
-    'kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip',
+    'kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip',
     {
       defaultMessage: 'Field names beginning with {underscoreSign} are not supported',
       values: { underscoreSign: '_' },
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/__snapshots__/open_search_panel.test.js.snap b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/__snapshots__/open_search_panel.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/components/top_nav/__snapshots__/open_search_panel.test.js.snap
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/__snapshots__/open_search_panel.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.js
index ec1763f44f25f..ebe4cbb1ddb69 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.js
@@ -32,8 +32,8 @@ import {
   EuiFlyoutBody,
   EuiTitle,
 } from '@elastic/eui';
-import { SavedObjectFinderUi } from '../../../../../../../plugins/kibana_react/public';
-import { getServices } from '../../kibana_services';
+import { SavedObjectFinderUi } from '../../../../../../../../plugins/kibana_react/public';
+import { getServices } from '../../../kibana_services';
 
 const SEARCH_OBJECT_TYPE = 'search';
 
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.test.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.test.js
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.test.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.test.js
index 22487421bf61b..c8f2ca220386d 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/open_search_panel.test.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/open_search_panel.test.js
@@ -20,7 +20,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-jest.mock('../../kibana_services', () => {
+jest.mock('../../../kibana_services', () => {
   return {
     getServices: () => ({
       core: { uiSettings: {}, savedObjects: {} },
diff --git a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/show_open_search_panel.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/show_open_search_panel.js
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/discover/components/top_nav/show_open_search_panel.js
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/show_open_search_panel.js
index 4beee3c02fa6f..e40d700b48885 100644
--- a/src/legacy/core_plugins/kibana/public/discover/components/top_nav/show_open_search_panel.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/top_nav/show_open_search_panel.js
@@ -20,11 +20,10 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { OpenSearchPanel } from './open_search_panel';
-import { I18nContext } from 'ui/i18n';
 
 let isOpen = false;
 
-export function showOpenSearchPanel({ makeUrl }) {
+export function showOpenSearchPanel({ makeUrl, I18nContext }) {
   if (isOpen) {
     return;
   }
diff --git a/src/legacy/ui/public/registry/doc_views_helpers.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_helpers.tsx
similarity index 92%
rename from src/legacy/ui/public/registry/doc_views_helpers.tsx
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_helpers.tsx
index d9e42e71dfff1..fb4f0c6056a83 100644
--- a/src/legacy/ui/public/registry/doc_views_helpers.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_helpers.tsx
@@ -19,14 +19,14 @@
 import React from 'react';
 import { render } from 'react-dom';
 import angular, { ICompileService } from 'angular';
-import chrome from 'ui/chrome';
 import {
   DocViewRenderProps,
   AngularScope,
   AngularController,
   AngularDirective,
 } from './doc_views_types';
-import { DocViewerError } from '../../../core_plugins/kibana/public/discover/components/doc_viewer/doc_viewer_render_error';
+import { DocViewerError } from '../components/doc_viewer/doc_viewer_render_error';
+import { Chrome } from '../../kibana_services';
 
 /**
  * Compiles and injects the give angular template into the given dom node
@@ -36,7 +36,8 @@ export async function injectAngularElement(
   domNode: Element,
   template: string,
   scopeProps: DocViewRenderProps,
-  Controller: AngularController
+  Controller: AngularController,
+  chrome: Chrome
 ): Promise<() => void> {
   const $injector = await chrome.dangerouslyGetActiveInjector();
   const rootScope: AngularScope = $injector.get('$rootScope');
@@ -68,7 +69,7 @@ export async function injectAngularElement(
  * Converts a given legacy angular directive to a render function
  * for usage in a react component. Note that the rendering is async
  */
-export function convertDirectiveToRenderFn(directive: AngularDirective) {
+export function convertDirectiveToRenderFn(directive: AngularDirective, chrome: Chrome) {
   return (domNode: Element, props: DocViewRenderProps) => {
     let rejected = false;
 
@@ -76,7 +77,8 @@ export function convertDirectiveToRenderFn(directive: AngularDirective) {
       domNode,
       directive.template,
       props,
-      directive.controller
+      directive.controller,
+      chrome
     );
     cleanupFnPromise.catch(e => {
       rejected = true;
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_registry.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_registry.ts
new file mode 100644
index 0000000000000..1952ec3af2f6c
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_registry.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 { convertDirectiveToRenderFn } from './doc_views_helpers';
+import { DocView, DocViewInput, ElasticSearchHit, DocViewInputFn } from './doc_views_types';
+import { Chrome } from '../../kibana_services';
+
+export class DocViewsRegistry {
+  private docViews: DocView[] = [];
+
+  constructor(private legacyChrome: Chrome) {}
+
+  /**
+   * Extends and adds the given doc view to the registry array
+   */
+  addDocView(docViewRaw: DocViewInput | DocViewInputFn) {
+    const docView = typeof docViewRaw === 'function' ? docViewRaw() : docViewRaw;
+    if (docView.directive) {
+      // convert angular directive to render function for backwards compatibility
+      docView.render = convertDirectiveToRenderFn(docView.directive, this.legacyChrome);
+    }
+    if (typeof docView.shouldShow !== 'function') {
+      docView.shouldShow = () => true;
+    }
+    this.docViews.push(docView as DocView);
+  }
+  /**
+   * Returns a sorted array of doc_views for rendering tabs
+   */
+  getDocViewsSorted(hit: ElasticSearchHit) {
+    return this.docViews
+      .filter(docView => docView.shouldShow(hit))
+      .sort((a, b) => (Number(a.order) > Number(b.order) ? 1 : -1));
+  }
+}
diff --git a/src/legacy/ui/public/registry/doc_views_types.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_types.ts
similarity index 96%
rename from src/legacy/ui/public/registry/doc_views_types.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_types.ts
index f078f374b4579..92e18e7ea7b88 100644
--- a/src/legacy/ui/public/registry/doc_views_types.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/doc_views/doc_views_types.ts
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IndexPattern } from 'src/legacy/core_plugins/data/public';
 import { ComponentType } from 'react';
 import { IScope } from 'angular';
+import { IndexPattern } from '../../kibana_services';
 
 export interface AngularDirective {
   controller: (scope: AngularScope) => void;
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/_embeddables.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/_embeddables.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/_embeddables.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/_embeddables.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/_index.scss b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/_index.scss
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/_index.scss
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/constants.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/constants.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/constants.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/index.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/index.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable.ts
index 273c7d80f216c..3aa8dea816694 100644
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable.ts
@@ -21,7 +21,6 @@ import * as Rx from 'rxjs';
 import { Subscription } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { TExecuteTriggerActions } from 'src/plugins/ui_actions/public';
-import { SearchSourceContract } from '../../../../../ui/public/courier';
 import {
   esFilters,
   TimeRange,
@@ -31,12 +30,12 @@ import {
   getTime,
   Query,
   IFieldType,
-} from '../../../../../../plugins/data/public';
+} from '../../../../../../../plugins/data/public';
 import {
   APPLY_FILTER_TRIGGER,
   Container,
   Embeddable,
-} from '../../../../embeddable_api/public/np_ready/public';
+} from '../../../../../embeddable_api/public/np_ready/public';
 import * as columnActions from '../angular/doc_table/actions/columns';
 import { SavedSearch } from '../types';
 import searchTemplate from './search_template.html';
@@ -51,7 +50,8 @@ import {
   getServices,
   IndexPattern,
   RequestAdapter,
-} from '../kibana_services';
+  ISearchSource,
+} from '../../kibana_services';
 import { SEARCH_EMBEDDABLE_TYPE } from './constants';
 
 interface SearchScope extends ng.IScope {
@@ -89,7 +89,7 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
   private inspectorAdaptors: Adapters;
   private searchScope?: SearchScope;
   private panelTitle: string = '';
-  private filtersSearchSource?: SearchSourceContract;
+  private filtersSearchSource?: ISearchSource;
   private searchInstance?: JQLite;
   private autoRefreshFetchSubscription?: Subscription;
   private subscription?: Subscription;
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable_factory.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable_factory.ts
index b5475b2629c70..3226b3af93cee 100644
--- a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_embeddable_factory.ts
@@ -18,15 +18,14 @@
  */
 import { i18n } from '@kbn/i18n';
 import { TExecuteTriggerActions } from 'src/plugins/ui_actions/public';
-import { IInjector } from 'ui/chrome';
-import { getServices } from '../kibana_services';
+import { getServices, IInjector } from '../../kibana_services';
 import {
   EmbeddableFactory,
   ErrorEmbeddable,
   Container,
-} from '../../../../../../plugins/embeddable/public';
+} from '../../../../../../../plugins/embeddable/public';
 
-import { TimeRange } from '../../../../../../plugins/data/public';
+import { TimeRange } from '../../../../../../../plugins/data/public';
 import { SearchEmbeddable } from './search_embeddable';
 import { SearchInput, SearchOutput } from './types';
 import { SEARCH_EMBEDDABLE_TYPE } from './constants';
diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_template.html b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_template.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/embeddable/search_template.html
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/search_template.html
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/types.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/types.ts
new file mode 100644
index 0000000000000..3d6acb0963bed
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/types.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 { EmbeddableInput, EmbeddableOutput, IEmbeddable } from 'src/plugins/embeddable/public';
+import { SavedSearch } from '../types';
+import { SortOrder } from '../angular/doc_table/components/table_header/helpers';
+import {
+  esFilters,
+  IIndexPattern,
+  TimeRange,
+  Query,
+} from '../../../../../../../plugins/data/public';
+
+export interface SearchInput extends EmbeddableInput {
+  timeRange: TimeRange;
+  query?: Query;
+  filters?: esFilters.Filter[];
+  hidePanelTitles?: boolean;
+  columns?: string[];
+  sort?: SortOrder[];
+}
+
+export interface SearchOutput extends EmbeddableOutput {
+  editUrl: string;
+  indexPatterns?: IIndexPattern[];
+  editable: boolean;
+}
+
+export interface ISearchEmbeddable extends IEmbeddable<SearchInput, SearchOutput> {
+  getSavedSearch(): SavedSearch;
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/helpers/breadcrumbs.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/breadcrumbs.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/discover/helpers/breadcrumbs.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/breadcrumbs.ts
diff --git a/src/legacy/core_plugins/kibana/public/discover/helpers/get_index_pattern_id.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/get_index_pattern_id.ts
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/discover/helpers/get_index_pattern_id.ts
rename to src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/get_index_pattern_id.ts
index bd62460fd6868..8f4d1b28624a4 100644
--- a/src/legacy/core_plugins/kibana/public/discover/helpers/get_index_pattern_id.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/helpers/get_index_pattern_id.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IIndexPattern } from '../../../../../../plugins/data/common/index_patterns';
+import { IIndexPattern } from '../../../../../../../plugins/data/common/index_patterns';
 
 export function findIndexPatternById(
   indexPatterns: IIndexPattern[],
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/register_feature.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/register_feature.ts
new file mode 100644
index 0000000000000..74255642ab2c9
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/register_feature.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 { i18n } from '@kbn/i18n';
+import {
+  FeatureCatalogueCategory,
+  HomePublicPluginSetup,
+} from '../../../../../../plugins/home/public';
+
+export function registerFeature(home: HomePublicPluginSetup) {
+  home.featureCatalogue.register({
+    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/np_ready/types.d.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/types.d.ts
new file mode 100644
index 0000000000000..d36a6b02e1f7a
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/types.d.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 { ISearchSource } from '../kibana_services';
+import { SortOrder } from './angular/doc_table/components/table_header/helpers';
+
+export interface SavedSearch {
+  readonly id: string;
+  title: string;
+  searchSource: ISearchSource;
+  description?: string;
+  columns: string[];
+  sort: SortOrder[];
+  destroy: () => void;
+}
+export interface SavedSearchLoader {
+  get: (id: string) => Promise<SavedSearch>;
+  urlFor: (id: string) => string;
+}
diff --git a/src/legacy/core_plugins/kibana/public/discover/plugin.ts b/src/legacy/core_plugins/kibana/public/discover/plugin.ts
index b5a8e25dc11ea..8f1eb7ef75559 100644
--- a/src/legacy/core_plugins/kibana/public/discover/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/plugin.ts
@@ -16,32 +16,44 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { i18n } from '@kbn/i18n';
 import { AppMountParameters, CoreSetup, CoreStart, Plugin } from 'kibana/public';
 import angular from 'angular';
-import { IUiActionsStart } from 'src/plugins/ui_actions/public';
+import { IUiActionsSetup, IUiActionsStart } from 'src/plugins/ui_actions/public';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
-import { registerFeature } from './helpers/register_feature';
+import { registerFeature } from './np_ready/register_feature';
 import './kibana_services';
 import { IEmbeddableStart, IEmbeddableSetup } from '../../../../../plugins/embeddable/public';
 import { getInnerAngularModule, getInnerAngularModuleEmbeddable } from './get_inner_angular';
-import { setAngularModule, setServices } from './kibana_services';
+import { Chrome, setAngularModule, setServices } from './kibana_services';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
 import { EuiUtilsStart } from '../../../../../plugins/eui_utils/public';
-import { buildServices } from './helpers/build_services';
+import { buildServices } from './build_services';
 import { SharePluginStart } from '../../../../../plugins/share/public';
 import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
+import { DocViewsRegistry } from './np_ready/doc_views/doc_views_registry';
+import { DocViewInput, DocViewInputFn } from './np_ready/doc_views/doc_views_types';
+import { DocViewTable } from './np_ready/components/table/table';
+import { JsonCodeBlock } from './np_ready/components/json_code_block/json_code_block';
+import { HomePublicPluginSetup } from '../../../../../plugins/home/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 interface DiscoverSetup {
+  addDocView(docViewRaw: DocViewInput | DocViewInputFn): void;
+}
 export type DiscoverStart = void;
 export interface DiscoverSetupPlugins {
-  uiActions: IUiActionsStart;
+  uiActions: IUiActionsSetup;
   embeddable: IEmbeddableSetup;
   kibana_legacy: KibanaLegacySetup;
+  __LEGACY: {
+    chrome: Chrome;
+  };
+  home: HomePublicPluginSetup;
 }
 export interface DiscoverStartPlugins {
   uiActions: IUiActionsStart;
@@ -63,13 +75,30 @@ const embeddableAngularName = 'app/discoverEmbeddable';
 export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
   private servicesInitialized: boolean = false;
   private innerAngularInitialized: boolean = false;
+  private docViewsRegistry: DocViewsRegistry | null = null;
   /**
    * why are those functions public? they are needed for some mocha tests
    * can be removed once all is Jest
    */
   public initializeInnerAngular?: () => void;
   public initializeServices?: () => void;
+
   setup(core: CoreSetup, plugins: DiscoverSetupPlugins): DiscoverSetup {
+    this.docViewsRegistry = new DocViewsRegistry(plugins.__LEGACY.chrome);
+    this.docViewsRegistry.addDocView({
+      title: i18n.translate('kbn.discover.docViews.table.tableTitle', {
+        defaultMessage: 'Table',
+      }),
+      order: 10,
+      component: DocViewTable,
+    });
+    this.docViewsRegistry.addDocView({
+      title: i18n.translate('kbn.discover.docViews.json.jsonTitle', {
+        defaultMessage: 'JSON',
+      }),
+      order: 20,
+      component: JsonCodeBlock,
+    });
     plugins.kibana_legacy.registerLegacyApp({
       id: 'discover',
       title: 'Discover',
@@ -84,10 +113,15 @@ export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
         }
         await this.initializeServices();
         await this.initializeInnerAngular();
-        const { renderApp } = await import('./application');
+        const { renderApp } = await import('./np_ready/application');
         return renderApp(innerAngularName, params.element);
       },
     });
+    registerFeature(plugins.home);
+
+    return {
+      addDocView: this.docViewsRegistry.addDocView.bind(this.docViewsRegistry),
+    };
   }
 
   start(core: CoreStart, plugins: DiscoverStartPlugins): DiscoverStart {
@@ -109,20 +143,19 @@ export class DiscoverPlugin implements Plugin<DiscoverSetup, DiscoverStart> {
       if (this.servicesInitialized) {
         return;
       }
-      const services = await buildServices(core, plugins);
+      const services = await buildServices(core, plugins, this.docViewsRegistry!);
       setServices(services);
       this.servicesInitialized = true;
     };
 
     this.registerEmbeddable(core, plugins);
-    registerFeature();
   }
 
   /**
    * register embeddable with a slimmer embeddable version of inner angular
    */
   private async registerEmbeddable(core: CoreStart, plugins: DiscoverStartPlugins) {
-    const { SearchEmbeddableFactory } = await import('./embeddable');
+    const { SearchEmbeddableFactory } = await import('./np_ready/embeddable');
     const getInjector = async () => {
       if (!this.initializeServices) {
         throw Error('Discover plugin registerEmbeddable:  initializeServices is undefined');
diff --git a/src/legacy/core_plugins/kibana/public/discover/saved_searches/index.ts b/src/legacy/core_plugins/kibana/public/discover/saved_searches/index.ts
index b9601e2fd257a..1dd99025b4b70 100644
--- a/src/legacy/core_plugins/kibana/public/discover/saved_searches/index.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/saved_searches/index.ts
@@ -17,4 +17,5 @@
  * under the License.
  */
 
-import './saved_searches';
+export * from './saved_searches';
+import './saved_searches_register';
diff --git a/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches.ts b/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches.ts
index 46fdd3a7baedc..abd3d46820c18 100644
--- a/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches.ts
@@ -16,22 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { npStart } from 'ui/new_platform';
-// @ts-ignore
-import { uiModules } from 'ui/modules';
 import { SavedObjectLoader } from 'ui/saved_objects';
 import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
-// @ts-ignore
-import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
 import { createSavedSearchClass } from './_saved_search';
 
-// Register this service with the saved object registry so it can be
-// edited by the object editor.
-savedObjectManagementRegistry.register({
-  service: 'savedSearches',
-  title: 'searches',
-});
-
 export function createSavedSearchesService(services: SavedObjectKibanaServices) {
   const SavedSearchClass = createSavedSearchClass(services);
   const savedSearchLoader = new SavedObjectLoader(
@@ -50,14 +38,3 @@ export function createSavedSearchesService(services: SavedObjectKibanaServices)
 
   return savedSearchLoader;
 }
-// this is needed for saved object management
-const module = uiModules.get('discover/saved_searches');
-module.service('savedSearches', () => {
-  const services = {
-    savedObjectsClient: npStart.core.savedObjects.client,
-    indexPatterns: npStart.plugins.data.indexPatterns,
-    chrome: npStart.core.chrome,
-    overlays: npStart.core.overlays,
-  };
-  return createSavedSearchesService(services);
-});
diff --git a/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches_register.ts b/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches_register.ts
new file mode 100644
index 0000000000000..ab7894fd5e730
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/discover/saved_searches/saved_searches_register.ts
@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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';
+// @ts-ignore
+import { uiModules } from 'ui/modules';
+// @ts-ignore
+import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
+
+import { createSavedSearchesService } from './saved_searches';
+
+// this is needed for saved object management
+// Register this service with the saved object registry so it can be
+// edited by the object editor.
+savedObjectManagementRegistry.register({
+  service: 'savedSearches',
+  title: 'searches',
+});
+const services = {
+  savedObjectsClient: npStart.core.savedObjects.client,
+  indexPatterns: npStart.plugins.data.indexPatterns,
+  chrome: npStart.core.chrome,
+  overlays: npStart.core.overlays,
+};
+const savedSearches = createSavedSearchesService(services);
+
+const module = uiModules.get('discover/saved_searches');
+module.service('savedSearches', () => savedSearches);
diff --git a/src/legacy/core_plugins/kibana/public/discover/types.d.ts b/src/legacy/core_plugins/kibana/public/discover/types.d.ts
deleted file mode 100644
index 6cdd802fa2800..0000000000000
--- a/src/legacy/core_plugins/kibana/public/discover/types.d.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 { SearchSourceContract } from '../../../../ui/public/courier';
-import { SortOrder } from './angular/doc_table/components/table_header/helpers';
-export { SortOrder } from './angular/doc_table/components/table_header/helpers';
-
-export interface SavedSearch {
-  readonly id: string;
-  title: string;
-  searchSource: SearchSourceContract;
-  description?: string;
-  columns: string[];
-  sort: SortOrder[];
-  destroy: () => void;
-}
-export interface SavedSearchLoader {
-  get: (id: string) => Promise<SavedSearch>;
-  urlFor: (id: string) => string;
-}
diff --git a/src/legacy/core_plugins/kibana/public/home/_index.scss b/src/legacy/core_plugins/kibana/public/home/_index.scss
index 192091fb04e3c..f42254c1096ce 100644
--- a/src/legacy/core_plugins/kibana/public/home/_index.scss
+++ b/src/legacy/core_plugins/kibana/public/home/_index.scss
@@ -1 +1 @@
-@import './components/index';
+@import 'np_ready/components/index';
diff --git a/src/legacy/core_plugins/kibana/public/home/assets/welcome_graphic_dark_2x.png b/src/legacy/core_plugins/kibana/public/home/assets/welcome_graphic_dark_2x.png
new file mode 100644
index 0000000000000..8f551c54bd552
Binary files /dev/null and b/src/legacy/core_plugins/kibana/public/home/assets/welcome_graphic_dark_2x.png differ
diff --git a/src/legacy/core_plugins/kibana/public/home/assets/welcome_graphic_light_2x.png b/src/legacy/core_plugins/kibana/public/home/assets/welcome_graphic_light_2x.png
new file mode 100644
index 0000000000000..034e8b87ff0f5
Binary files /dev/null and b/src/legacy/core_plugins/kibana/public/home/assets/welcome_graphic_light_2x.png differ
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/welcome.test.tsx.snap b/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/welcome.test.tsx.snap
deleted file mode 100644
index 2007a3bb773cf..0000000000000
--- a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/welcome.test.tsx.snap
+++ /dev/null
@@ -1,188 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`should render a Welcome screen with no telemetry disclaimer 1`] = `
-<EuiPortal>
-  <div
-    className="homWelcome"
-  >
-    <header
-      className="homWelcome__header"
-    >
-      <div
-        className="homWelcome__content eui-textCenter"
-      >
-        <EuiSpacer
-          size="xl"
-        />
-        <span
-          className="homWelcome__logo"
-        >
-          <EuiIcon
-            size="xxl"
-            type="logoKibana"
-          />
-        </span>
-        <EuiTitle
-          className="homWelcome__title"
-          size="l"
-        >
-          <h1>
-            <FormattedMessage
-              defaultMessage="Welcome to Kibana"
-              id="kbn.home.welcomeTitle"
-              values={Object {}}
-            />
-          </h1>
-        </EuiTitle>
-        <EuiText
-          className="homWelcome__subtitle"
-          color="subdued"
-          size="s"
-        >
-          <p>
-            <FormattedMessage
-              defaultMessage="Your window into the Elastic Stack"
-              id="kbn.home.welcomeDescription"
-              values={Object {}}
-            />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
-      </div>
-    </header>
-    <div
-      className="homWelcome__content homWelcome-body"
-    >
-      <EuiFlexGroup
-        gutterSize="l"
-      >
-        <EuiFlexItem>
-          <SampleDataCard
-            onConfirm={[Function]}
-            onDecline={[Function]}
-          />
-          <EuiSpacer
-            size="s"
-          />
-          <EuiSpacer
-            size="xs"
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </div>
-  </div>
-</EuiPortal>
-`;
-
-exports[`should render a Welcome screen with the telemetry disclaimer 1`] = `
-<EuiPortal>
-  <div
-    className="homWelcome"
-  >
-    <header
-      className="homWelcome__header"
-    >
-      <div
-        className="homWelcome__content eui-textCenter"
-      >
-        <EuiSpacer
-          size="xl"
-        />
-        <span
-          className="homWelcome__logo"
-        >
-          <EuiIcon
-            size="xxl"
-            type="logoKibana"
-          />
-        </span>
-        <EuiTitle
-          className="homWelcome__title"
-          size="l"
-        >
-          <h1>
-            <FormattedMessage
-              defaultMessage="Welcome to Kibana"
-              id="kbn.home.welcomeTitle"
-              values={Object {}}
-            />
-          </h1>
-        </EuiTitle>
-        <EuiText
-          className="homWelcome__subtitle"
-          color="subdued"
-          size="s"
-        >
-          <p>
-            <FormattedMessage
-              defaultMessage="Your window into the Elastic Stack"
-              id="kbn.home.welcomeDescription"
-              values={Object {}}
-            />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
-      </div>
-    </header>
-    <div
-      className="homWelcome__content homWelcome-body"
-    >
-      <EuiFlexGroup
-        gutterSize="l"
-      >
-        <EuiFlexItem>
-          <SampleDataCard
-            onConfirm={[Function]}
-            onDecline={[Function]}
-          />
-          <EuiSpacer
-            size="s"
-          />
-          <EuiTextColor
-            className="euiText--small"
-            color="subdued"
-          >
-            <FormattedMessage
-              defaultMessage="To learn about how usage data helps us manage and improve our products and services, see our "
-              id="kbn.home.dataManagementDisclaimerPrivacy"
-              values={Object {}}
-            />
-            <EuiLink
-              href="https://www.elastic.co/legal/privacy-statement"
-              rel="noopener"
-              target="_blank"
-            >
-              <FormattedMessage
-                defaultMessage="Privacy Statement."
-                id="kbn.home.dataManagementDisclaimerPrivacyLink"
-                values={Object {}}
-              />
-            </EuiLink>
-            <FormattedMessage
-              defaultMessage=" To stop collection, "
-              id="kbn.home.dataManagementDisableCollection"
-              values={Object {}}
-            />
-            <EuiLink
-              href="#/management/kibana/settings"
-            >
-              <FormattedMessage
-                defaultMessage="disable usage data here."
-                id="kbn.home.dataManagementDisableCollectionLink"
-                values={Object {}}
-              />
-            </EuiLink>
-          </EuiTextColor>
-          <EuiSpacer
-            size="xs"
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </div>
-  </div>
-</EuiPortal>
-`;
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_index.scss b/src/legacy/core_plugins/kibana/public/home/components/_index.scss
deleted file mode 100644
index af23752e54287..0000000000000
--- a/src/legacy/core_plugins/kibana/public/home/components/_index.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-// Prefix all styles with "hom" to avoid conflicts.
-// Examples
-//   homChart
-//   homChart__legend
-//   homChart__legend--small
-//   homChart__legend-isLoading
-
-@import './add_data';
-@import './home';
-@import './sample_data_set_cards';
-@import './synopsis';
-@import './welcome';
-
-@import './tutorial/tutorial';
diff --git a/src/legacy/core_plugins/kibana/public/home/components/welcome.test.tsx b/src/legacy/core_plugins/kibana/public/home/components/welcome.test.tsx
deleted file mode 100644
index 21dcfd9ef15de..0000000000000
--- a/src/legacy/core_plugins/kibana/public/home/components/welcome.test.tsx
+++ /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 React from 'react';
-import { shallow } from 'enzyme';
-import { Welcome } from './welcome';
-
-jest.mock('../kibana_services', () => ({
-  getServices: () => ({
-    addBasePath: (path: string) => `root${path}`,
-    trackUiMetric: () => {},
-    METRIC_TYPE: {
-      LOADED: 'loaded',
-      CLICK: 'click',
-    },
-  }),
-}));
-
-test('should render a Welcome screen with the telemetry disclaimer', () => {
-  const component = shallow(
-    // @ts-ignore
-    <Welcome urlBase="/" onSkip={() => {}} showTelemetryDisclaimer={true} onOptInSeen={() => {}} />
-  );
-
-  expect(component).toMatchSnapshot();
-});
-
-test('should render a Welcome screen with no telemetry disclaimer', () => {
-  // @ts-ignore
-  const component = shallow(
-    // @ts-ignore
-    <Welcome urlBase="/" onSkip={() => {}} showTelemetryDisclaimer={false} onOptInSeen={() => {}} />
-  );
-
-  expect(component).toMatchSnapshot();
-});
-
-test('fires opt-in seen when mounted', () => {
-  const seen = jest.fn();
-
-  shallow(
-    // @ts-ignore
-    <Welcome urlBase="/" onSkip={() => {}} showTelemetryDisclaimer={true} onOptInSeen={seen} />
-  );
-
-  expect(seen).toHaveBeenCalled();
-});
diff --git a/src/legacy/core_plugins/kibana/public/home/components/welcome.tsx b/src/legacy/core_plugins/kibana/public/home/components/welcome.tsx
deleted file mode 100644
index c8de0bf7bb936..0000000000000
--- a/src/legacy/core_plugins/kibana/public/home/components/welcome.tsx
+++ /dev/null
@@ -1,160 +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 UI and related logic for the welcome screen that *should* show only
- * when it is enabled (the default) and there is no Kibana-consumed data
- * in Elasticsearch.
- */
-
-import React from 'react';
-import {
-  EuiLink,
-  EuiTextColor,
-  EuiTitle,
-  EuiSpacer,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiText,
-  EuiIcon,
-  EuiPortal,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { getServices } from '../kibana_services';
-
-import { SampleDataCard } from './sample_data';
-
-interface Props {
-  urlBasePath: string;
-  onSkip: () => void;
-  onOptInSeen: () => any;
-  showTelemetryDisclaimer: boolean;
-}
-
-/**
- * Shows a full-screen welcome page that gives helpful quick links to beginners.
- */
-export class Welcome extends React.Component<Props> {
-  private services = getServices();
-
-  private hideOnEsc = (e: KeyboardEvent) => {
-    if (e.key === 'Escape') {
-      this.props.onSkip();
-    }
-  };
-
-  private redirecToSampleData() {
-    const path = this.services.addBasePath('#/home/tutorial_directory/sampleData');
-    window.location.href = path;
-  }
-
-  private onSampleDataDecline = () => {
-    this.services.trackUiMetric(this.services.METRIC_TYPE.CLICK, 'sampleDataDecline');
-    this.props.onSkip();
-  };
-
-  private onSampleDataConfirm = () => {
-    this.services.trackUiMetric(this.services.METRIC_TYPE.CLICK, 'sampleDataConfirm');
-    this.redirecToSampleData();
-  };
-
-  componentDidMount() {
-    this.services.trackUiMetric(this.services.METRIC_TYPE.LOADED, 'welcomeScreenMount');
-    this.props.onOptInSeen();
-    document.addEventListener('keydown', this.hideOnEsc);
-  }
-
-  componentWillUnmount() {
-    document.removeEventListener('keydown', this.hideOnEsc);
-  }
-
-  render() {
-    const { urlBasePath, showTelemetryDisclaimer } = this.props;
-
-    return (
-      <EuiPortal>
-        <div className="homWelcome">
-          <header className="homWelcome__header">
-            <div className="homWelcome__content eui-textCenter">
-              <EuiSpacer size="xl" />
-              <span className="homWelcome__logo">
-                <EuiIcon type="logoKibana" size="xxl" />
-              </span>
-              <EuiTitle size="l" className="homWelcome__title">
-                <h1>
-                  <FormattedMessage id="kbn.home.welcomeTitle" defaultMessage="Welcome to Kibana" />
-                </h1>
-              </EuiTitle>
-              <EuiText size="s" color="subdued" className="homWelcome__subtitle">
-                <p>
-                  <FormattedMessage
-                    id="kbn.home.welcomeDescription"
-                    defaultMessage="Your window into the Elastic Stack"
-                  />
-                </p>
-              </EuiText>
-              <EuiSpacer size="m" />
-            </div>
-          </header>
-          <div className="homWelcome__content homWelcome-body">
-            <EuiFlexGroup gutterSize="l">
-              <EuiFlexItem>
-                <SampleDataCard
-                  urlBasePath={urlBasePath}
-                  onConfirm={this.onSampleDataConfirm}
-                  onDecline={this.onSampleDataDecline}
-                />
-                <EuiSpacer size="s" />
-                {showTelemetryDisclaimer && (
-                  <EuiTextColor className="euiText--small" color="subdued">
-                    <FormattedMessage
-                      id="kbn.home.dataManagementDisclaimerPrivacy"
-                      defaultMessage="To learn about how usage data helps us manage and improve our products and services, see our "
-                    />
-                    <EuiLink
-                      href="https://www.elastic.co/legal/privacy-statement"
-                      target="_blank"
-                      rel="noopener"
-                    >
-                      <FormattedMessage
-                        id="kbn.home.dataManagementDisclaimerPrivacyLink"
-                        defaultMessage="Privacy Statement."
-                      />
-                    </EuiLink>
-                    <FormattedMessage
-                      id="kbn.home.dataManagementDisableCollection"
-                      defaultMessage=" To stop collection, "
-                    />
-                    <EuiLink href="#/management/kibana/settings">
-                      <FormattedMessage
-                        id="kbn.home.dataManagementDisableCollectionLink"
-                        defaultMessage="disable usage data here."
-                      />
-                    </EuiLink>
-                  </EuiTextColor>
-                )}
-                <EuiSpacer size="xs" />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </div>
-        </div>
-      </EuiPortal>
-    );
-  }
-}
diff --git a/src/legacy/core_plugins/kibana/public/home/np_ready/application.tsx b/src/legacy/core_plugins/kibana/public/home/np_ready/application.tsx
new file mode 100644
index 0000000000000..8345491d99972
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/application.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/components/__snapshots__/add_data.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/add_data.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/add_data.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/home.test.js.snap
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/home.test.js.snap
index 0bf8c808ae920..4563b633c3dfc 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/home.test.js.snap
@@ -7,8 +7,6 @@ exports[`home directories should not render directory entry when showOnHomePage
 >
   <EuiPageBody
     className="eui-displayBlock"
-    component="main"
-    restrictWidth={false}
   >
     <EuiScreenReaderOnly>
       <h1>
@@ -123,8 +121,6 @@ exports[`home directories should render ADMIN directory entry in "Manage" panel
 >
   <EuiPageBody
     className="eui-displayBlock"
-    component="main"
-    restrictWidth={false}
   >
     <EuiScreenReaderOnly>
       <h1>
@@ -252,8 +248,6 @@ exports[`home directories should render DATA directory entry in "Explore Data" p
 >
   <EuiPageBody
     className="eui-displayBlock"
-    component="main"
-    restrictWidth={false}
   >
     <EuiScreenReaderOnly>
       <h1>
@@ -381,8 +375,6 @@ exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
 >
   <EuiPageBody
     className="eui-displayBlock"
-    component="main"
-    restrictWidth={false}
   >
     <EuiScreenReaderOnly>
       <h1>
@@ -497,8 +489,6 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when t
 >
   <EuiPageBody
     className="eui-displayBlock"
-    component="main"
-    restrictWidth={false}
   >
     <EuiScreenReaderOnly>
       <h1>
@@ -613,8 +603,6 @@ exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when th
 >
   <EuiPageBody
     className="eui-displayBlock"
-    component="main"
-    restrictWidth={false}
   >
     <EuiScreenReaderOnly>
       <h1>
@@ -729,8 +717,6 @@ exports[`home should render home component 1`] = `
 >
   <EuiPageBody
     className="eui-displayBlock"
-    component="main"
-    restrictWidth={false}
   >
     <EuiScreenReaderOnly>
       <h1>
@@ -845,8 +831,6 @@ exports[`home welcome should show the normal home page if loading fails 1`] = `
 >
   <EuiPageBody
     className="eui-displayBlock"
-    component="main"
-    restrictWidth={false}
   >
     <EuiScreenReaderOnly>
       <h1>
@@ -961,8 +945,6 @@ exports[`home welcome should show the normal home page if welcome screen is disa
 >
   <EuiPageBody
     className="eui-displayBlock"
-    component="main"
-    restrictWidth={false}
   >
     <EuiScreenReaderOnly>
       <h1>
@@ -1072,8 +1054,8 @@ exports[`home welcome should show the normal home page if welcome screen is disa
 
 exports[`home welcome should show the welcome screen if enabled, and there are no index patterns defined 1`] = `
 <Welcome
+  onOptInSeen={[Function]}
   onSkip={[Function]}
-  showTelemetryDisclaimer=""
   urlBasePath="goober"
 />
 `;
@@ -1085,8 +1067,6 @@ exports[`home welcome stores skip welcome setting if skipped 1`] = `
 >
   <EuiPageBody
     className="eui-displayBlock"
-    component="main"
-    restrictWidth={false}
   >
     <EuiScreenReaderOnly>
       <h1>
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/recently_accessed.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/recently_accessed.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/__snapshots__/recently_accessed.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/recently_accessed.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/sample_data_view_data_button.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/sample_data_view_data_button.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/__snapshots__/sample_data_view_data_button.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/sample_data_view_data_button.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/__snapshots__/synopsis.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/synopsis.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/__snapshots__/synopsis.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/synopsis.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/welcome.test.tsx.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/welcome.test.tsx.snap
new file mode 100644
index 0000000000000..e36a6e0a5a9fb
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/__snapshots__/welcome.test.tsx.snap
@@ -0,0 +1,449 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should render a Welcome screen with no telemetry disclaimer 1`] = `
+<EuiPortal>
+  <div
+    className="homWelcome"
+  >
+    <header
+      className="homWelcome__header"
+    >
+      <div
+        className="homWelcome__content eui-textCenter"
+      >
+        <EuiSpacer
+          size="xl"
+        />
+        <span
+          className="homWelcome__logo"
+        >
+          <EuiIcon
+            size="xxl"
+            type="logoKibana"
+          />
+        </span>
+        <EuiTitle
+          className="homWelcome__title"
+          size="l"
+        >
+          <h1>
+            <FormattedMessage
+              defaultMessage="Welcome to Kibana"
+              id="kbn.home.welcomeTitle"
+              values={Object {}}
+            />
+          </h1>
+        </EuiTitle>
+        <EuiText
+          className="homWelcome__subtitle"
+          color="subdued"
+          size="s"
+        >
+          <p>
+            <FormattedMessage
+              defaultMessage="Your window into the Elastic Stack"
+              id="kbn.home.welcomeDescription"
+              values={Object {}}
+            />
+          </p>
+        </EuiText>
+        <EuiSpacer
+          size="m"
+        />
+      </div>
+    </header>
+    <div
+      className="homWelcome__content homWelcome-body"
+    >
+      <EuiFlexGroup
+        gutterSize="l"
+      >
+        <EuiFlexItem>
+          <SampleDataCard
+            onConfirm={[Function]}
+            onDecline={[Function]}
+            urlBasePath="/"
+          />
+          <EuiSpacer
+            size="s"
+          />
+          <EuiTextColor
+            className="euiText--small"
+            color="subdued"
+          >
+            <FormattedMessage
+              defaultMessage="To learn about how usage data helps us manage and improve our products and services, see our "
+              id="kbn.home.dataManagementDisclaimerPrivacy"
+              values={Object {}}
+            />
+            <EuiLink
+              href="https://www.elastic.co/legal/privacy-statement"
+              rel="noopener"
+              target="_blank"
+            >
+              <FormattedMessage
+                defaultMessage="Privacy Statement."
+                id="kbn.home.dataManagementDisclaimerPrivacyLink"
+                values={Object {}}
+              />
+            </EuiLink>
+            <FormattedMessage
+              defaultMessage=" To start collection, "
+              id="kbn.home.dataManagementEnableCollection"
+              values={Object {}}
+            />
+            <EuiLink
+              href="#/management/kibana/settings"
+            >
+              <FormattedMessage
+                defaultMessage="enable usage data here."
+                id="kbn.home.dataManagementEnableCollectionLink"
+                values={Object {}}
+              />
+            </EuiLink>
+          </EuiTextColor>
+          <EuiSpacer
+            size="xs"
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </div>
+</EuiPortal>
+`;
+
+exports[`should render a Welcome screen with the telemetry disclaimer 1`] = `
+<EuiPortal>
+  <div
+    className="homWelcome"
+  >
+    <header
+      className="homWelcome__header"
+    >
+      <div
+        className="homWelcome__content eui-textCenter"
+      >
+        <EuiSpacer
+          size="xl"
+        />
+        <span
+          className="homWelcome__logo"
+        >
+          <EuiIcon
+            size="xxl"
+            type="logoKibana"
+          />
+        </span>
+        <EuiTitle
+          className="homWelcome__title"
+          size="l"
+        >
+          <h1>
+            <FormattedMessage
+              defaultMessage="Welcome to Kibana"
+              id="kbn.home.welcomeTitle"
+              values={Object {}}
+            />
+          </h1>
+        </EuiTitle>
+        <EuiText
+          className="homWelcome__subtitle"
+          color="subdued"
+          size="s"
+        >
+          <p>
+            <FormattedMessage
+              defaultMessage="Your window into the Elastic Stack"
+              id="kbn.home.welcomeDescription"
+              values={Object {}}
+            />
+          </p>
+        </EuiText>
+        <EuiSpacer
+          size="m"
+        />
+      </div>
+    </header>
+    <div
+      className="homWelcome__content homWelcome-body"
+    >
+      <EuiFlexGroup
+        gutterSize="l"
+      >
+        <EuiFlexItem>
+          <SampleDataCard
+            onConfirm={[Function]}
+            onDecline={[Function]}
+            urlBasePath="/"
+          />
+          <EuiSpacer
+            size="s"
+          />
+          <EuiTextColor
+            className="euiText--small"
+            color="subdued"
+          >
+            <FormattedMessage
+              defaultMessage="To learn about how usage data helps us manage and improve our products and services, see our "
+              id="kbn.home.dataManagementDisclaimerPrivacy"
+              values={Object {}}
+            />
+            <EuiLink
+              href="https://www.elastic.co/legal/privacy-statement"
+              rel="noopener"
+              target="_blank"
+            >
+              <FormattedMessage
+                defaultMessage="Privacy Statement."
+                id="kbn.home.dataManagementDisclaimerPrivacyLink"
+                values={Object {}}
+              />
+            </EuiLink>
+            <FormattedMessage
+              defaultMessage=" To start collection, "
+              id="kbn.home.dataManagementEnableCollection"
+              values={Object {}}
+            />
+            <EuiLink
+              href="#/management/kibana/settings"
+            >
+              <FormattedMessage
+                defaultMessage="enable usage data here."
+                id="kbn.home.dataManagementEnableCollectionLink"
+                values={Object {}}
+              />
+            </EuiLink>
+          </EuiTextColor>
+          <EuiSpacer
+            size="xs"
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </div>
+</EuiPortal>
+`;
+
+exports[`should render a Welcome screen with the telemetry disclaimer when optIn is false 1`] = `
+<EuiPortal>
+  <div
+    className="homWelcome"
+  >
+    <header
+      className="homWelcome__header"
+    >
+      <div
+        className="homWelcome__content eui-textCenter"
+      >
+        <EuiSpacer
+          size="xl"
+        />
+        <span
+          className="homWelcome__logo"
+        >
+          <EuiIcon
+            size="xxl"
+            type="logoKibana"
+          />
+        </span>
+        <EuiTitle
+          className="homWelcome__title"
+          size="l"
+        >
+          <h1>
+            <FormattedMessage
+              defaultMessage="Welcome to Kibana"
+              id="kbn.home.welcomeTitle"
+              values={Object {}}
+            />
+          </h1>
+        </EuiTitle>
+        <EuiText
+          className="homWelcome__subtitle"
+          color="subdued"
+          size="s"
+        >
+          <p>
+            <FormattedMessage
+              defaultMessage="Your window into the Elastic Stack"
+              id="kbn.home.welcomeDescription"
+              values={Object {}}
+            />
+          </p>
+        </EuiText>
+        <EuiSpacer
+          size="m"
+        />
+      </div>
+    </header>
+    <div
+      className="homWelcome__content homWelcome-body"
+    >
+      <EuiFlexGroup
+        gutterSize="l"
+      >
+        <EuiFlexItem>
+          <SampleDataCard
+            onConfirm={[Function]}
+            onDecline={[Function]}
+            urlBasePath="/"
+          />
+          <EuiSpacer
+            size="s"
+          />
+          <EuiTextColor
+            className="euiText--small"
+            color="subdued"
+          >
+            <FormattedMessage
+              defaultMessage="To learn about how usage data helps us manage and improve our products and services, see our "
+              id="kbn.home.dataManagementDisclaimerPrivacy"
+              values={Object {}}
+            />
+            <EuiLink
+              href="https://www.elastic.co/legal/privacy-statement"
+              rel="noopener"
+              target="_blank"
+            >
+              <FormattedMessage
+                defaultMessage="Privacy Statement."
+                id="kbn.home.dataManagementDisclaimerPrivacyLink"
+                values={Object {}}
+              />
+            </EuiLink>
+            <FormattedMessage
+              defaultMessage=" To start collection, "
+              id="kbn.home.dataManagementEnableCollection"
+              values={Object {}}
+            />
+            <EuiLink
+              href="#/management/kibana/settings"
+            >
+              <FormattedMessage
+                defaultMessage="enable usage data here."
+                id="kbn.home.dataManagementEnableCollectionLink"
+                values={Object {}}
+              />
+            </EuiLink>
+          </EuiTextColor>
+          <EuiSpacer
+            size="xs"
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </div>
+</EuiPortal>
+`;
+
+exports[`should render a Welcome screen with the telemetry disclaimer when optIn is true 1`] = `
+<EuiPortal>
+  <div
+    className="homWelcome"
+  >
+    <header
+      className="homWelcome__header"
+    >
+      <div
+        className="homWelcome__content eui-textCenter"
+      >
+        <EuiSpacer
+          size="xl"
+        />
+        <span
+          className="homWelcome__logo"
+        >
+          <EuiIcon
+            size="xxl"
+            type="logoKibana"
+          />
+        </span>
+        <EuiTitle
+          className="homWelcome__title"
+          size="l"
+        >
+          <h1>
+            <FormattedMessage
+              defaultMessage="Welcome to Kibana"
+              id="kbn.home.welcomeTitle"
+              values={Object {}}
+            />
+          </h1>
+        </EuiTitle>
+        <EuiText
+          className="homWelcome__subtitle"
+          color="subdued"
+          size="s"
+        >
+          <p>
+            <FormattedMessage
+              defaultMessage="Your window into the Elastic Stack"
+              id="kbn.home.welcomeDescription"
+              values={Object {}}
+            />
+          </p>
+        </EuiText>
+        <EuiSpacer
+          size="m"
+        />
+      </div>
+    </header>
+    <div
+      className="homWelcome__content homWelcome-body"
+    >
+      <EuiFlexGroup
+        gutterSize="l"
+      >
+        <EuiFlexItem>
+          <SampleDataCard
+            onConfirm={[Function]}
+            onDecline={[Function]}
+            urlBasePath="/"
+          />
+          <EuiSpacer
+            size="s"
+          />
+          <EuiTextColor
+            className="euiText--small"
+            color="subdued"
+          >
+            <FormattedMessage
+              defaultMessage="To learn about how usage data helps us manage and improve our products and services, see our "
+              id="kbn.home.dataManagementDisclaimerPrivacy"
+              values={Object {}}
+            />
+            <EuiLink
+              href="https://www.elastic.co/legal/privacy-statement"
+              rel="noopener"
+              target="_blank"
+            >
+              <FormattedMessage
+                defaultMessage="Privacy Statement."
+                id="kbn.home.dataManagementDisclaimerPrivacyLink"
+                values={Object {}}
+              />
+            </EuiLink>
+            <FormattedMessage
+              defaultMessage="To stop collection, "
+              id="kbn.home.dataManagementDisableCollection"
+              values={Object {}}
+            />
+            <EuiLink
+              href="#/management/kibana/settings"
+            >
+              <FormattedMessage
+                defaultMessage="disable usage data here."
+                id="kbn.home.dataManagementDisableCollectionLink"
+                values={Object {}}
+              />
+            </EuiLink>
+          </EuiTextColor>
+          <EuiSpacer
+            size="xs"
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </div>
+</EuiPortal>
+`;
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_add_data.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_add_data.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/_add_data.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/_add_data.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_home.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_home.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/_home.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/_home.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/np_ready/components/_index.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_index.scss
new file mode 100644
index 0000000000000..870099ffb350e
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_index.scss
@@ -0,0 +1,14 @@
+// Prefix all styles with "hom" to avoid conflicts.
+// Examples
+//   homChart
+//   homChart__legend
+//   homChart__legend--small
+//   homChart__legend-isLoading
+
+@import 'add_data';
+@import 'home';
+@import 'sample_data_set_cards';
+@import 'synopsis';
+@import 'welcome';
+
+@import 'tutorial/tutorial';
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_sample_data_set_cards.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_sample_data_set_cards.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/_sample_data_set_cards.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/_sample_data_set_cards.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_synopsis.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_synopsis.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/_synopsis.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/_synopsis.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/components/_welcome.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/_welcome.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/_welcome.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/_welcome.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/components/add_data.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/home/components/add_data.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.js
index 8ea9d78507ceb..a49620be2d229 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/add_data.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/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 { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
 
 import {
   EuiButton,
diff --git a/src/legacy/core_plugins/kibana/public/home/components/add_data.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.test.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/home/components/add_data.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.test.js
index 9457f766409b8..86eec564f0b61 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/add_data.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/add_data.test.js
@@ -20,9 +20,9 @@
 import React from 'react';
 import { AddData } from './add_data';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
 
-jest.mock('../kibana_services', () => {
+jest.mock('../../kibana_services', () => {
   const mock = {
     getBasePath: jest.fn(() => 'path'),
   };
diff --git a/src/legacy/core_plugins/kibana/public/home/components/feature_directory.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/feature_directory.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/components/feature_directory.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/feature_directory.js
index 447a54bd89701..5545944a1029f 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/feature_directory.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/feature_directory.js
@@ -31,7 +31,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
-import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
+import { FeatureCatalogueCategory } from '../../../../../../../plugins/home/public';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/home/components/home.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/home.js
index c87ceb9777c74..5c32a463da115 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.js
@@ -38,8 +38,8 @@ import {
 } from '@elastic/eui';
 
 import { Welcome } from './welcome';
-import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
-import { getServices } from '../kibana_services';
+import { FeatureCatalogueCategory } from '../../../../../../../plugins/home/public';
+import { getServices } from '../../kibana_services';
 
 const KEY_ENABLE_WELCOME = 'home:welcome:show';
 
@@ -51,10 +51,7 @@ export class Home extends Component {
       getServices().getInjected('disableWelcomeScreen') ||
       props.localStorage.getItem(KEY_ENABLE_WELCOME) === 'false'
     );
-    const showTelemetryDisclaimer = getServices().getInjected(
-      'telemetryNotifyUserAboutOptInDefault'
-    );
-
+    const currentOptInStatus = this.props.getOptInStatus();
     this.state = {
       // If welcome is enabled, we wait for loading to complete
       // before rendering. This prevents an annoying flickering
@@ -63,7 +60,7 @@ export class Home extends Component {
       isLoading: isWelcomeEnabled,
       isNewKibanaInstance: false,
       isWelcomeEnabled,
-      showTelemetryDisclaimer,
+      currentOptInStatus,
     };
   }
 
@@ -222,14 +219,13 @@ export class Home extends Component {
   renderLoading() {
     return '';
   }
-
   renderWelcome() {
     return (
       <Welcome
         onSkip={this.skipWelcome}
         urlBasePath={this.props.urlBasePath}
-        showTelemetryDisclaimer={this.state.showTelemetryDisclaimer}
         onOptInSeen={this.props.onOptInSeen}
+        currentOptInStatus={this.state.currentOptInStatus}
       />
     );
   }
@@ -269,4 +265,5 @@ Home.propTypes = {
   urlBasePath: PropTypes.string.isRequired,
   mlEnabled: PropTypes.bool.isRequired,
   onOptInSeen: PropTypes.func.isRequired,
+  getOptInStatus: PropTypes.func.isRequired,
 };
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.js
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/home/components/home.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.js
index 780e2af695381..be2ceb66f69d0 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.js
@@ -23,9 +23,10 @@ import React from 'react';
 import sinon from 'sinon';
 import { shallow } from 'enzyme';
 import { Home } from './home';
-import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
 
-jest.mock('../kibana_services', () => ({
+import { FeatureCatalogueCategory } from '../../../../../../../plugins/home/public';
+
+jest.mock('../../kibana_services', () => ({
   getServices: () => ({
     getBasePath: () => 'path',
     getInjected: () => '',
@@ -63,6 +64,10 @@ describe('home', () => {
         setItem: sinon.mock(),
       },
       urlBasePath: 'goober',
+      onOptInSeen() {
+        return false;
+      },
+      getOptInStatus: jest.fn(),
     };
   });
 
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home.test.mocks.ts b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.mocks.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/home/components/home.test.mocks.ts
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.mocks.ts
index cd7bc82fe3345..a0b9d7c779b02 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home.test.mocks.ts
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.mocks.ts
@@ -22,7 +22,7 @@ import {
   overlayServiceMock,
   httpServiceMock,
   injectedMetadataServiceMock,
-} from '../../../../../../core/public/mocks';
+} from '../../../../../../../core/public/mocks';
 
 jest.doMock('ui/new_platform', () => {
   return {
diff --git a/src/legacy/core_plugins/kibana/public/home/components/home_app.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home_app.js
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/home/components/home_app.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/home_app.js
index 5a12eb0a66cf1..6532737cc02e8 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/home_app.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/home_app.js
@@ -27,16 +27,17 @@ import { Tutorial } from './tutorial/tutorial';
 import { HashRouter as Router, Switch, Route, Redirect } from 'react-router-dom';
 import { getTutorial } from '../load_tutorials';
 import { replaceTemplateStrings } from './tutorial/replace_template_strings';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
+// TODO This is going to be refactored soon
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { npSetup } from 'ui/new_platform';
-
 export function HomeApp({ directories }) {
   const {
     getInjected,
     savedObjectsClient,
     getBasePath,
     addBasePath,
-    telemetryOptInProvider: { setOptInNoticeSeen },
+    telemetryOptInProvider: { setOptInNoticeSeen, getOptIn },
   } = getServices();
   const { cloud } = npSetup.plugins;
   const isCloudEnabled = !!(cloud && cloud.isCloudEnabled);
@@ -87,6 +88,7 @@ export function HomeApp({ directories }) {
               localStorage={localStorage}
               urlBasePath={getBasePath()}
               onOptInSeen={setOptInNoticeSeen}
+              getOptInStatus={getOptIn}
             />
           </Route>
           <Route path="/home">
diff --git a/src/legacy/core_plugins/kibana/public/home/components/recently_accessed.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/recently_accessed.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/recently_accessed.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/recently_accessed.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/recently_accessed.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/recently_accessed.test.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/recently_accessed.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/recently_accessed.test.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/sample_data/index.tsx b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data/index.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/sample_data/index.tsx
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data/index.tsx
diff --git a/src/legacy/core_plugins/kibana/public/home/components/sample_data_set_card.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_set_card.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/sample_data_set_card.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_set_card.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/sample_data_set_cards.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_set_cards.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/home/components/sample_data_set_cards.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_set_cards.js
index 7daf10e5f01f8..198e0d95271d7 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/sample_data_set_cards.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_set_cards.js
@@ -24,7 +24,7 @@ import { EuiFlexGrid, EuiFlexItem } from '@elastic/eui';
 
 import { SampleDataSetCard, INSTALLED_STATUS, UNINSTALLED_STATUS } from './sample_data_set_card';
 
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
 
 import {
   listSampleDataSets,
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/np_ready/components/sample_data_view_data_button.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_view_data_button.js
index c9bd32a7d14d5..e6f5c07c94f9f 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_view_data_button.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
 import { EuiButton, EuiContextMenu, EuiIcon, EuiPopover } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
 
 export class SampleDataViewDataButton extends React.Component {
   addBasePath = getServices().addBasePath;
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/np_ready/components/sample_data_view_data_button.test.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/home/components/sample_data_view_data_button.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/sample_data_view_data_button.test.js
index f594ec1264c94..e33c206ed8482 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/np_ready/components/sample_data_view_data_button.test.js
@@ -22,7 +22,7 @@ import { shallow } from 'enzyme';
 
 import { SampleDataViewDataButton } from './sample_data_view_data_button';
 
-jest.mock('../kibana_services', () => ({
+jest.mock('../../kibana_services', () => ({
   getServices: () => ({
     addBasePath: path => `root${path}`,
   }),
diff --git a/src/legacy/core_plugins/kibana/public/home/components/synopsis.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/synopsis.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/synopsis.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/synopsis.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/synopsis.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/synopsis.test.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/synopsis.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/synopsis.test.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/content.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/content.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/content.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/content.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/footer.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/footer.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/instruction_set.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/instruction_set.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/instruction_set.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/instruction_set.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/introduction.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/introduction.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/introduction.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/introduction.test.js.snap
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
index 07744dd0f6f4b..161061868dab2 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
@@ -508,6 +508,7 @@ exports[`bulkCreate should display success message when bulkCreate is successful
                         aria-label="complete"
                         className="euiIcon euiIcon--medium euiIcon-isLoaded euiStepNumber__icon"
                         focusable="false"
+                        role="img"
                         style={null}
                       >
                         <svg
@@ -515,13 +516,15 @@ exports[`bulkCreate should display success message when bulkCreate is successful
                           className="euiIcon euiIcon--medium euiIcon-isLoaded euiStepNumber__icon"
                           focusable="false"
                           height={16}
+                          role="img"
                           style={null}
                           viewBox="0 0 16 16"
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
                         >
+                          <title />
                           <path
-                            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"
+                            d="M6.5 12a.502.502 0 01-.354-.146l-4-4a.502.502 0 01.708-.708L6.5 10.793l6.646-6.647a.502.502 0 01.708.708l-7 7A.502.502 0 016.5 12"
                             fillRule="evenodd"
                           />
                         </svg>
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/tutorial.test.js.snap
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/tutorial.test.js.snap
index db286fb4d2fee..3fe75c22f3fc5 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/__snapshots__/tutorial.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/__snapshots__/tutorial.test.js.snap
@@ -4,10 +4,7 @@ exports[`isCloudEnabled is false should not render instruction toggle when ON_PR
 <EuiPage
   restrictWidth={1200}
 >
-  <EuiPageBody
-    component="main"
-    restrictWidth={false}
-  >
+  <EuiPageBody>
     <div>
       <InjectIntl(IntroductionUI)
         description="tutorial used to drive jest tests"
@@ -53,10 +50,7 @@ exports[`isCloudEnabled is false should render ON_PREM instructions with instruc
 <EuiPage
   restrictWidth={1200}
 >
-  <EuiPageBody
-    component="main"
-    restrictWidth={false}
-  >
+  <EuiPageBody>
     <div>
       <InjectIntl(IntroductionUI)
         description="tutorial used to drive jest tests"
@@ -129,10 +123,7 @@ exports[`should render ELASTIC_CLOUD instructions when isCloudEnabled is true 1`
 <EuiPage
   restrictWidth={1200}
 >
-  <EuiPageBody
-    component="main"
-    restrictWidth={false}
-  >
+  <EuiPageBody>
     <div>
       <InjectIntl(IntroductionUI)
         description="tutorial used to drive jest tests"
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/_tutorial.scss b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/_tutorial.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/_tutorial.scss
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/_tutorial.scss
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.js
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.js
index db1f55b503e84..669eb6c4c42cd 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.js
@@ -19,7 +19,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Markdown } from '../../../../../kibana_react/public';
+import { Markdown } from '../../../../../../kibana_react/public';
 
 const whiteListedRules = ['backticks', 'emphasis', 'link', 'list'];
 
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.test.js
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/content.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.test.js
index d3a4d7085a0aa..64864b6a5404d 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/content.test.js
@@ -22,7 +22,7 @@ import { shallow } from 'enzyme';
 
 import { Content } from './content';
 
-jest.mock('../../../../../kibana_react/public', () => {
+jest.mock('../../../../../../kibana_react/public', () => {
   return {
     Markdown: () => <div className="markdown" />,
   };
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/footer.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/footer.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/footer.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/footer.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/footer.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/footer.test.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/footer.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/footer.test.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.js
index 7ec2133a98ca1..4f60de00819e7 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
 import { Instruction } from './instruction';
 import { ParameterForm } from './parameter_form';
 import { Content } from './content';
-import { getDisplayText } from '../../../../common/tutorials/instruction_variant';
+import { getDisplayText } from '../../../../../common/tutorials/instruction_variant';
 import {
   EuiTabs,
   EuiTab,
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.test.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.test.js
index 6c9ce530f6b20..21c3ddeceff6b 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/instruction_set.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.test.js
@@ -45,7 +45,7 @@ const instructionVariants = [
   },
 ];
 
-jest.mock('../../../../../kibana_react/public', () => {
+jest.mock('../../../../../../kibana_react/public', () => {
   return {
     Markdown: () => <div className="markdown" />,
   };
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/introduction.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/introduction.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/introduction.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/introduction.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/introduction.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/introduction.test.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/introduction.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/introduction.test.js
index ae87bc6030c9a..8862ef7334f93 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/introduction.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/introduction.test.js
@@ -22,7 +22,7 @@ import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 
 import { Introduction } from './introduction';
 
-jest.mock('../../../../../kibana_react/public', () => {
+jest.mock('../../../../../../kibana_react/public', () => {
   return {
     Markdown: () => <div className="markdown" />,
   };
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/number_parameter.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/number_parameter.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/number_parameter.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/number_parameter.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/parameter_form.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/parameter_form.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/parameter_form.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/parameter_form.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js
index 62116ae1a0663..daf996444eb3c 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js
@@ -18,7 +18,7 @@
  */
 
 import { Writer } from 'mustache';
-import { getServices } from '../../kibana_services';
+import { getServices } from '../../../kibana_services';
 
 const TEMPLATE_TAGS = ['{', '}'];
 
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/saved_objects_installer.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/saved_objects_installer.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/saved_objects_installer.test.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/saved_objects_installer.test.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/status_check_states.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/status_check_states.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/status_check_states.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/status_check_states.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/string_parameter.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/string_parameter.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/string_parameter.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/string_parameter.js
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/tutorial.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/tutorial.js
index 7461db9c54cc8..314ddf2196f06 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/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 { getServices } from '../../kibana_services';
+import { getServices } from '../../../kibana_services';
 
 const INSTRUCTIONS_TYPE = {
   ELASTIC_CLOUD: 'elasticCloud',
diff --git a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/tutorial.test.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/tutorial.test.js
index 41d83d7562f6e..733223fe79046 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/tutorial.test.js
@@ -22,7 +22,7 @@ import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';
 
 import { Tutorial } from './tutorial';
 
-jest.mock('../../kibana_services', () => ({
+jest.mock('../../../kibana_services', () => ({
   getServices: () => ({
     getBasePath: jest.fn(() => 'path'),
     chrome: {
@@ -30,7 +30,7 @@ jest.mock('../../kibana_services', () => ({
     },
   }),
 }));
-jest.mock('../../../../../kibana_react/public', () => {
+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/np_ready/components/tutorial_directory.js
similarity index 99%
rename from src/legacy/core_plugins/kibana/public/home/components/tutorial_directory.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial_directory.js
index 0c537c8e9ae8a..06da6f35ee42e 100644
--- a/src/legacy/core_plugins/kibana/public/home/components/tutorial_directory.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/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 { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
 
 import {
   EuiPage,
diff --git a/src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.test.tsx b/src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.test.tsx
new file mode 100644
index 0000000000000..28bdab14193c4
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.test.tsx
@@ -0,0 +1,81 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 { Welcome } from './welcome';
+
+jest.mock('../../kibana_services', () => ({
+  getServices: () => ({
+    addBasePath: (path: string) => `root${path}`,
+    trackUiMetric: () => {},
+    METRIC_TYPE: {
+      LOADED: 'loaded',
+      CLICK: 'click',
+    },
+  }),
+}));
+
+test('should render a Welcome screen with the telemetry disclaimer', () => {
+  const component = shallow(
+    // @ts-ignore
+    <Welcome urlBasePath="/" onSkip={() => {}} onOptInSeen={() => {}} />
+  );
+
+  expect(component).toMatchSnapshot();
+});
+
+test('should render a Welcome screen with the telemetry disclaimer when optIn is true', () => {
+  const component = shallow(
+    // @ts-ignore
+    <Welcome urlBasePath="/" onSkip={() => {}} onOptInSeen={() => {}} currentOptInStatus={true} />
+  );
+
+  expect(component).toMatchSnapshot();
+});
+
+test('should render a Welcome screen with the telemetry disclaimer when optIn is false', () => {
+  const component = shallow(
+    // @ts-ignore
+    <Welcome urlBasePath="/" onSkip={() => {}} onOptInSeen={() => {}} currentOptInStatus={false} />
+  );
+
+  expect(component).toMatchSnapshot();
+});
+
+test('should render a Welcome screen with no telemetry disclaimer', () => {
+  // @ts-ignore
+  const component = shallow(
+    // @ts-ignore
+    <Welcome urlBasePath="/" onSkip={() => {}} onOptInSeen={() => {}} />
+  );
+
+  expect(component).toMatchSnapshot();
+});
+
+test('fires opt-in seen when mounted', () => {
+  const seen = jest.fn();
+
+  shallow(
+    // @ts-ignore
+    <Welcome urlBasePath="/" onSkip={() => {}} onOptInSeen={seen} />
+  );
+
+  expect(seen).toHaveBeenCalled();
+});
diff --git a/src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.tsx b/src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.tsx
new file mode 100644
index 0000000000000..9bbb7aaceb915
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/welcome.tsx
@@ -0,0 +1,181 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 UI and related logic for the welcome screen that *should* show only
+ * when it is enabled (the default) and there is no Kibana-consumed data
+ * in Elasticsearch.
+ */
+
+import React, { Fragment } from 'react';
+import {
+  EuiLink,
+  EuiTextColor,
+  EuiTitle,
+  EuiSpacer,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiText,
+  EuiIcon,
+  EuiPortal,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { getServices } from '../../kibana_services';
+
+import { SampleDataCard } from './sample_data';
+interface Props {
+  urlBasePath: string;
+  onSkip: () => void;
+  onOptInSeen: () => any;
+  currentOptInStatus: boolean;
+}
+
+/**
+ * Shows a full-screen welcome page that gives helpful quick links to beginners.
+ */
+export class Welcome extends React.Component<Props> {
+  private services = getServices();
+
+  private hideOnEsc = (e: KeyboardEvent) => {
+    if (e.key === 'Escape') {
+      this.props.onSkip();
+    }
+  };
+
+  private redirecToSampleData() {
+    const path = this.services.addBasePath('#/home/tutorial_directory/sampleData');
+    window.location.href = path;
+  }
+
+  private onSampleDataDecline = () => {
+    this.services.trackUiMetric(this.services.METRIC_TYPE.CLICK, 'sampleDataDecline');
+    this.props.onSkip();
+  };
+
+  private onSampleDataConfirm = () => {
+    this.services.trackUiMetric(this.services.METRIC_TYPE.CLICK, 'sampleDataConfirm');
+    this.redirecToSampleData();
+  };
+
+  componentDidMount() {
+    this.services.trackUiMetric(this.services.METRIC_TYPE.LOADED, 'welcomeScreenMount');
+    this.props.onOptInSeen();
+    document.addEventListener('keydown', this.hideOnEsc);
+  }
+
+  componentWillUnmount() {
+    document.removeEventListener('keydown', this.hideOnEsc);
+  }
+
+  private renderTelemetryEnabledOrDisabledText = () => {
+    if (this.props.currentOptInStatus) {
+      return (
+        <Fragment>
+          <FormattedMessage
+            id="kbn.home.dataManagementDisableCollection"
+            defaultMessage="To stop collection, "
+          />
+          <EuiLink href="#/management/kibana/settings">
+            <FormattedMessage
+              id="kbn.home.dataManagementDisableCollectionLink"
+              defaultMessage="disable usage data here."
+            />
+          </EuiLink>
+        </Fragment>
+      );
+    } else {
+      return (
+        <Fragment>
+          <FormattedMessage
+            id="kbn.home.dataManagementEnableCollection"
+            defaultMessage=" To start collection, "
+          />
+          <EuiLink href="#/management/kibana/settings">
+            <FormattedMessage
+              id="kbn.home.dataManagementEnableCollectionLink"
+              defaultMessage="enable usage data here."
+            />
+          </EuiLink>
+        </Fragment>
+      );
+    }
+  };
+
+  render() {
+    const { urlBasePath } = this.props;
+    return (
+      <EuiPortal>
+        <div className="homWelcome">
+          <header className="homWelcome__header">
+            <div className="homWelcome__content eui-textCenter">
+              <EuiSpacer size="xl" />
+              <span className="homWelcome__logo">
+                <EuiIcon type="logoKibana" size="xxl" />
+              </span>
+              <EuiTitle size="l" className="homWelcome__title">
+                <h1>
+                  <FormattedMessage id="kbn.home.welcomeTitle" defaultMessage="Welcome to Kibana" />
+                </h1>
+              </EuiTitle>
+              <EuiText size="s" color="subdued" className="homWelcome__subtitle">
+                <p>
+                  <FormattedMessage
+                    id="kbn.home.welcomeDescription"
+                    defaultMessage="Your window into the Elastic Stack"
+                  />
+                </p>
+              </EuiText>
+              <EuiSpacer size="m" />
+            </div>
+          </header>
+          <div className="homWelcome__content homWelcome-body">
+            <EuiFlexGroup gutterSize="l">
+              <EuiFlexItem>
+                <SampleDataCard
+                  urlBasePath={urlBasePath}
+                  onConfirm={this.onSampleDataConfirm}
+                  onDecline={this.onSampleDataDecline}
+                />
+                <EuiSpacer size="s" />
+                <EuiTextColor className="euiText--small" color="subdued">
+                  <FormattedMessage
+                    id="kbn.home.dataManagementDisclaimerPrivacy"
+                    defaultMessage="To learn about how usage data helps us manage and improve our products and services, see our "
+                  />
+                  <EuiLink
+                    href="https://www.elastic.co/legal/privacy-statement"
+                    target="_blank"
+                    rel="noopener"
+                  >
+                    <FormattedMessage
+                      id="kbn.home.dataManagementDisclaimerPrivacyLink"
+                      defaultMessage="Privacy Statement."
+                    />
+                  </EuiLink>
+                  {this.renderTelemetryEnabledOrDisabledText()}
+                </EuiTextColor>
+                <EuiSpacer size="xs" />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </div>
+        </div>
+      </EuiPortal>
+    );
+  }
+}
diff --git a/src/legacy/core_plugins/kibana/public/home/load_tutorials.js b/src/legacy/core_plugins/kibana/public/home/np_ready/load_tutorials.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/home/load_tutorials.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/load_tutorials.js
index be84027296259..6a0a01ebda8db 100644
--- a/src/legacy/core_plugins/kibana/public/home/load_tutorials.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/load_tutorials.js
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { getServices } from './kibana_services';
+import { getServices } from '../kibana_services';
 import { i18n } from '@kbn/i18n';
 
 const baseUrlLP = getServices().addBasePath('/api/kibana/home/tutorials_LP');
diff --git a/src/legacy/core_plugins/kibana/public/home/sample_data_client.js b/src/legacy/core_plugins/kibana/public/home/np_ready/sample_data_client.js
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/home/sample_data_client.js
rename to src/legacy/core_plugins/kibana/public/home/np_ready/sample_data_client.js
index 600b1c3cb7dff..34c85d8d2c350 100644
--- a/src/legacy/core_plugins/kibana/public/home/sample_data_client.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/sample_data_client.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { getServices } from './kibana_services';
+import { getServices } from '../kibana_services';
 
 const sampleDataUrl = '/api/sample_data';
 
diff --git a/src/legacy/core_plugins/kibana/public/home/plugin.ts b/src/legacy/core_plugins/kibana/public/home/plugin.ts
index fc1747d71d069..a998e4d07ab15 100644
--- a/src/legacy/core_plugins/kibana/public/home/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/home/plugin.ts
@@ -88,7 +88,7 @@ export class HomePlugin implements Plugin {
           indexPatternService: this.dataStart!.indexPatterns,
           ...angularDependencies,
         });
-        const { renderApp } = await import('./render_app');
+        const { renderApp } = await import('./np_ready/application');
         return await renderApp(params.element);
       },
     });
diff --git a/src/legacy/core_plugins/kibana/public/home/render_app.tsx b/src/legacy/core_plugins/kibana/public/home/render_app.tsx
deleted file mode 100644
index a8c35144a45b0..0000000000000
--- a/src/legacy/core_plugins/kibana/public/home/render_app.tsx
+++ /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 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/tutorial_resources/logos/envoyproxy.svg b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/envoyproxy.svg
new file mode 100644
index 0000000000000..45c995b19603b
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/home/tutorial_resources/logos/envoyproxy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 65 65" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" width="300" height="300" font-family="Roboto" font-size="14px" text-anchor="middle"><defs><style type="text/css"></style></defs><use xlink:href="#A" x=".5" y=".5"></use><symbol id="A" overflow="visible"><svg width="64" height="64" stroke="initial" fill="initial" fill-rule="initial"><defs><clipPath id="B"><use xlink:href="#C"></use></clipPath><path id="C" d="M22.9 13.6h271.8v296.2H22.9z"></path></defs><g transform="matrix(.283424 0 0 .283424 -13.064191 3.213972)"><path clip-path="url(#B)" d="M116.7 107.6l-14.3-8.9.3 13.6 14.3 8.9zm20.6 47.6l-.3-13.3-12.5-7.8c-.2-.1-.4-.3-.5-.4l.3 13.4zm-44.7 17.9l-32.7-20.3-.8-34 16-6.9-.3-13.6-25.6 11c-2 .9-3.2 2.7-3.1 4.8l1 40.8c0 2.1 1.3 4.2 3.3 5.4l39.2 24.3c1.8 1.1 4 1.4 5.9.9.2-.1.4-.1.6-.2l24.1-10.4-13.1-8.1z" fill="#b31aab"></path><path d="M198.3 97.9c-.1-2.4-1.5-4.9-3.9-6.3l-47.6-29.5-1.5.6.3 14.3 37.7 23.4.9 38.2 14.4 8.9.8-.3zm-57 67.1L97 137.6l-1.1-46 20.2-8.7-.4-15.9-31.3 13.5c-2.3 1-3.7 3.1-3.6 5.6l1.3 54c0 2.5 1.5 4.9 3.9 6.3l51.9 32.2c2.1 1.3 4.7 1.7 6.9 1 .2-.1.4-.2.6-.2l30.6-13.2-15.2-9.4z" clip-path="url(#B)" fill="#d163ce"></path><path d="M265.8 60.1l-66.5-41.2c-2.5-1.5-5.4-1.9-7.9-1.1-.2.1-.5.2-.7.3l-64.9 28c-2.6 1.1-4.2 3.5-4.1 6.4l1.6 69.2c.1 2.8 1.8 5.6 4.5 7.2l66.5 41.2c2.4 1.5 5.4 1.9 7.9 1.1.2-.1.5-.2.7-.3l64.9-28c2.6-1.1 4.2-3.6 4.1-6.4l-1.6-69.2c-.1-2.8-1.8-5.5-4.5-7.2m-67.6 94.5l-57.8-35.8-1.4-60.1 56.4-24.3 57.8 35.8 1.4 60.1z" clip-path="url(#B)" fill="#e13eaf"></path></g></svg></symbol></svg>
\ No newline at end of file
diff --git a/src/legacy/core_plugins/kibana/public/index.scss b/src/legacy/core_plugins/kibana/public/index.scss
index 611fe613ad99c..3b49af9a4a6a6 100644
--- a/src/legacy/core_plugins/kibana/public/index.scss
+++ b/src/legacy/core_plugins/kibana/public/index.scss
@@ -11,13 +11,14 @@
 @import './dev_tools/index';
 
 // Discover styles
-@import './discover/index';
+@import 'discover/index';
 
 // Home styles
 @import './home/index';
 
 // Visualize styles
 @import './visualize/index';
+@import './visualize_embeddable/index';
 // Has to come after visualize because of some
 // bad cascading in the Editor layout
 @import 'src/legacy/ui/public/vis/index';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/__jest__/render.test.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/__jest__/render.test.js
index be4866f9dfdd4..375e80028f317 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/__jest__/render.test.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/__jest__/render.test.js
@@ -22,12 +22,6 @@ const unmountComponentAtNode = jest.fn();
 
 jest.doMock('react-dom', () => ({ render, unmountComponentAtNode }));
 
-// If we don't mock this, Jest fails with the error `TypeError: Cannot redefine property: prototype
-// at Function.defineProperties`.
-jest.mock('ui/index_patterns', () => ({
-  INDEX_PATTERN_ILLEGAL_CHARACTERS: ['\\', '/', '?', '"', '<', '>', '|', ' '],
-}));
-
 jest.mock('ui/chrome', () => ({
   getUiSettingsClient: () => ({
     get: () => '',
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/__jest__/step_index_pattern.test.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/__jest__/step_index_pattern.test.js
index 1797fc203ccd8..85e610bbbf993 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/__jest__/step_index_pattern.test.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/__jest__/step_index_pattern.test.js
@@ -32,11 +32,6 @@ const mockIndexPatternCreationType = {
   checkIndicesForErrors: () => false,
   getShowSystemIndices: () => false,
 };
-// If we don't mock this, Jest fails with the error `TypeError: Cannot redefine property: prototype
-// at Function.defineProperties`.
-jest.mock('ui/index_patterns', () => ({
-  INDEX_PATTERN_ILLEGAL_CHARACTERS: ['\\', '/', '?', '"', '<', '>', '|', ' '],
-}));
 
 jest.mock('ui/chrome', () => ({
   getUiSettingsClient: () => ({
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.js
index 4764b516dffec..c990efaf43547 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.js
@@ -19,7 +19,7 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { INDEX_PATTERN_ILLEGAL_CHARACTERS as ILLEGAL_CHARACTERS } from 'ui/index_patterns';
+import { indexPatterns } from '../../../../../../../../../../plugins/data/public';
 import { MAX_SEARCH_SIZE } from '../../constants';
 import {
   getIndices,
@@ -71,7 +71,7 @@ export class StepIndexPattern extends Component {
       indexPatternName: indexPatternCreationType.getIndexPatternName(),
     };
 
-    this.ILLEGAL_CHARACTERS = [...ILLEGAL_CHARACTERS];
+    this.ILLEGAL_CHARACTERS = [...indexPatterns.ILLEGAL_CHARACTERS];
     this.lastQuery = null;
   }
 
@@ -243,7 +243,7 @@ export class StepIndexPattern extends Component {
     if (!query || !query.length || query === '.' || query === '..') {
       // This is an error scenario but do not report an error
       containsErrors = true;
-    } else if (containsIllegalCharacters(query, ILLEGAL_CHARACTERS)) {
+    } else if (containsIllegalCharacters(query, indexPatterns.ILLEGAL_CHARACTERS)) {
       const errorMessage = i18n.translate(
         'kbn.management.createIndexPattern.step.invalidCharactersErrorMessage',
         {
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.js
index 9d84c03383743..ffc9aed9a27a3 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/edit_index_pattern.js
@@ -27,7 +27,7 @@ import { fatalError, toastNotifications } from 'ui/notify';
 import uiRoutes from 'ui/routes';
 import { uiModules } from 'ui/modules';
 import template from './edit_index_pattern.html';
-import { fieldWildcardMatcher } from 'ui/field_wildcard';
+import { fieldWildcardMatcher } from '../../../../../../../../plugins/kibana_utils/public';
 import { setup as managementSetup } from '../../../../../../management/public/legacy';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/indexed_fields_table/components/table/__jest__/__snapshots__/table.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/indexed_fields_table/components/table/__jest__/__snapshots__/table.test.js.snap
index ca04ac8fcfaab..f758511990d6f 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/indexed_fields_table/components/table/__jest__/__snapshots__/table.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/indexed_fields_table/components/table/__jest__/__snapshots__/table.test.js.snap
@@ -93,7 +93,6 @@ exports[`Table should render normally 1`] = `
       },
     ]
   }
-  executeQueryOptions={Object {}}
   items={
     Array [
       Object {
@@ -136,9 +135,11 @@ exports[`Table should render the boolean template (false) 1`] = `<span />`;
 
 exports[`Table should render the boolean template (true) 1`] = `
 <EuiIconEmpty
+  aria-hidden={true}
   aria-label="Is searchable"
   className="euiIcon euiIcon--medium euiIcon--secondary euiIcon-isLoading"
   focusable="false"
+  role="img"
   style={null}
 />
 `;
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/table/__jest__/__snapshots__/table.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/table/__jest__/__snapshots__/table.test.js.snap
index f2a55649fe4d7..4716fb8f77633 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/table/__jest__/__snapshots__/table.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/scripted_fields_table/components/table/__jest__/__snapshots__/table.test.js.snap
@@ -55,7 +55,6 @@ exports[`Table should render normally 1`] = `
       },
     ]
   }
-  executeQueryOptions={Object {}}
   items={
     Array [
       Object {
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/__jest__/__snapshots__/table.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/__jest__/__snapshots__/table.test.js.snap
index 415bae7389e97..7856572373e79 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/__jest__/__snapshots__/table.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/__jest__/__snapshots__/table.test.js.snap
@@ -78,7 +78,6 @@ exports[`Table should render normally 1`] = `
       },
     ]
   }
-  executeQueryOptions={Object {}}
   items={
     Array [
       Object {
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/index_pattern_table/index_pattern_table.tsx b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/index_pattern_table/index_pattern_table.tsx
index f54afc4a5e359..f254a6bc22a0d 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/index_pattern_table/index_pattern_table.tsx
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/index_pattern_table/index_pattern_table.tsx
@@ -59,7 +59,7 @@ const columns = [
           ))}
       </EuiButtonEmpty>
     ),
-    dataType: 'string',
+    dataType: 'string' as const,
     sortable: ({ sort }: { sort: string }) => sort,
   },
 ];
@@ -72,7 +72,7 @@ const pagination = {
 const sorting = {
   sort: {
     field: 'title',
-    direction: 'asc',
+    direction: 'asc' as const,
   },
 };
 
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js
index 0909b6947895c..f7e654fd3c76d 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js
@@ -29,7 +29,7 @@ import { uiModules } from 'ui/modules';
 import { fatalError, toastNotifications } from 'ui/notify';
 import 'ui/accessibility/kbn_ui_ace_keyboard_mode';
 import { SavedObjectsClientProvider } from 'ui/saved_objects';
-import { isNumeric } from 'ui/utils/numeric';
+import { isNumeric } from './lib/numeric';
 import { canViewInApp } from './lib/in_app_url';
 
 import { castEsToKbnFieldTypeName } from '../../../../../../../plugins/data/public';
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap
index 843c8207c88c3..2aaa291f6122b 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap
@@ -54,7 +54,6 @@ exports[`ObjectsTable delete should show a confirm modal 1`] = `
         },
       ]
     }
-    executeQueryOptions={Object {}}
     items={
       Array [
         Object {
@@ -241,7 +240,6 @@ exports[`ObjectsTable relationships should show the flyout 1`] = `
 exports[`ObjectsTable should render normally 1`] = `
 <EuiPageContent
   horizontalPosition="center"
-  panelPaddingSize="l"
 >
   <Header
     filteredCount={4}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap
index a9175e7b2a63e..ace06e0420a7c 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap
@@ -90,7 +90,6 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
           },
         ]
       }
-      executeQueryOptions={Object {}}
       items={
         Array [
           Object {
@@ -116,7 +115,6 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
         }
       }
       responsive={true}
-      sorting={false}
     />
   </EuiFlyoutBody>
   <EuiFlyoutFooter>
@@ -411,7 +409,6 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
           },
         ]
       }
-      executeQueryOptions={Object {}}
       items={
         Array [
           Object {
@@ -448,7 +445,6 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
         }
       }
       responsive={true}
-      sorting={false}
     />
   </EuiFlyoutBody>
   <EuiFlyoutFooter>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap
index 6060e96f3cfb6..941a0ffded820 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap
@@ -83,7 +83,6 @@ exports[`Relationships should render dashboards normally 1`] = `
             },
           ]
         }
-        executeQueryOptions={Object {}}
         items={
           Array [
             Object {
@@ -155,7 +154,6 @@ exports[`Relationships should render dashboards normally 1`] = `
             ],
           }
         }
-        sorting={false}
       />
     </div>
   </EuiFlyoutBody>
@@ -294,7 +292,6 @@ exports[`Relationships should render index patterns normally 1`] = `
             },
           ]
         }
-        executeQueryOptions={Object {}}
         items={
           Array [
             Object {
@@ -371,7 +368,6 @@ exports[`Relationships should render index patterns normally 1`] = `
             ],
           }
         }
-        sorting={false}
       />
     </div>
   </EuiFlyoutBody>
@@ -461,7 +457,6 @@ exports[`Relationships should render searches normally 1`] = `
             },
           ]
         }
-        executeQueryOptions={Object {}}
         items={
           Array [
             Object {
@@ -538,7 +533,6 @@ exports[`Relationships should render searches normally 1`] = `
             ],
           }
         }
-        sorting={false}
       />
     </div>
   </EuiFlyoutBody>
@@ -628,7 +622,6 @@ exports[`Relationships should render visualizations normally 1`] = `
             },
           ]
         }
-        executeQueryOptions={Object {}}
         items={
           Array [
             Object {
@@ -700,7 +693,6 @@ exports[`Relationships should render visualizations normally 1`] = `
             ],
           }
         }
-        sorting={false}
       />
     </div>
   </EuiFlyoutBody>
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.test.ts b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.test.ts
new file mode 100644
index 0000000000000..bb749de8dcb71
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.test.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.
+ */
+
+import { keysToCamelCaseShallow } from './case_conversion';
+
+describe('keysToCamelCaseShallow', () => {
+  test("should convert all of an object's keys to camel case", () => {
+    const data = {
+      camelCase: 'camelCase',
+      'kebab-case': 'kebabCase',
+      snake_case: 'snakeCase',
+    };
+
+    const result = keysToCamelCaseShallow(data);
+
+    expect(result.camelCase).toBe('camelCase');
+    expect(result.kebabCase).toBe('kebabCase');
+    expect(result.snakeCase).toBe('snakeCase');
+  });
+});
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.ts b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.ts
new file mode 100644
index 0000000000000..718530eb3b602
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/case_conversion.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mapKeys, camelCase } from 'lodash';
+
+export function keysToCamelCaseShallow(object: Record<string, any>) {
+  return mapKeys(object, (value, key) => camelCase(key));
+}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/find_objects.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/find_objects.js
index f982966d1e314..caf2b5f503440 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/find_objects.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/find_objects.js
@@ -18,7 +18,7 @@
  */
 
 import { kfetch } from 'ui/kfetch';
-import { keysToCamelCaseShallow } from 'ui/utils/case_conversion';
+import { keysToCamelCaseShallow } from './case_conversion';
 
 export async function findObjects(findOptions) {
   const response = await kfetch({
@@ -26,5 +26,6 @@ export async function findObjects(findOptions) {
     pathname: '/api/kibana/management/saved_objects/_find',
     query: findOptions,
   });
+
   return keysToCamelCaseShallow(response);
 }
diff --git a/src/legacy/ui/public/utils/numeric.ts b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/numeric.ts
similarity index 86%
rename from src/legacy/ui/public/utils/numeric.ts
rename to src/legacy/core_plugins/kibana/public/management/sections/objects/lib/numeric.ts
index 1342498cf5dc3..c7bc6c26a378f 100644
--- a/src/legacy/ui/public/utils/numeric.ts
+++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/lib/numeric.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import { isNaN } from 'lodash';
 
 export function isNumeric(v: any): boolean {
-  return !_.isNaN(v) && (typeof v === 'number' || (!Array.isArray(v) && !_.isNaN(parseFloat(v))));
+  return !isNaN(v) && (typeof v === 'number' || (!Array.isArray(v) && !isNaN(parseFloat(v))));
 }
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 8e7ae33a60068..ae168e76d359b 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
@@ -2427,10 +2427,8 @@ exports[`Field for number setting should render as read only if saving is disabl
       >
         <EuiFieldNumber
           aria-label="number test setting"
-          compressed={false}
           data-test-subj="advancedSetting-editField-number:test:setting"
           disabled={true}
-          fullWidth={false}
           isLoading={false}
           onChange={[Function]}
           onKeyDown={[Function]}
@@ -2527,10 +2525,8 @@ exports[`Field for number setting should render as read only with help text if o
       >
         <EuiFieldNumber
           aria-label="number test setting"
-          compressed={false}
           data-test-subj="advancedSetting-editField-number:test:setting"
           disabled={true}
-          fullWidth={false}
           isLoading={false}
           onChange={[Function]}
           onKeyDown={[Function]}
@@ -2606,10 +2602,8 @@ exports[`Field for number setting should render custom setting icon if it is cus
       >
         <EuiFieldNumber
           aria-label="number test setting"
-          compressed={false}
           data-test-subj="advancedSetting-editField-number:test:setting"
           disabled={false}
-          fullWidth={false}
           isLoading={false}
           onChange={[Function]}
           onKeyDown={[Function]}
@@ -2674,10 +2668,8 @@ exports[`Field for number setting should render default value if there is no use
       >
         <EuiFieldNumber
           aria-label="number test setting"
-          compressed={false}
           data-test-subj="advancedSetting-editField-number:test:setting"
           disabled={false}
-          fullWidth={false}
           isLoading={false}
           onChange={[Function]}
           onKeyDown={[Function]}
@@ -2781,10 +2773,8 @@ exports[`Field for number setting should render user value if there is user valu
       >
         <EuiFieldNumber
           aria-label="number test setting"
-          compressed={false}
           data-test-subj="advancedSetting-editField-number:test:setting"
           disabled={false}
-          fullWidth={false}
           isLoading={false}
           onChange={[Function]}
           onKeyDown={[Function]}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js
index 0155b10f60218..c64b332e8ebee 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-import { StringUtils } from 'ui/utils/string_utils';
 import { i18n } from '@kbn/i18n';
 
+const upperFirst = (str = '') => str.replace(/^./, str => str.toUpperCase());
+
 const names = {
   general: i18n.translate('kbn.management.settings.categoryNames.generalLabel', {
     defaultMessage: 'General',
@@ -51,5 +52,5 @@ const names = {
 };
 
 export function getCategoryName(category) {
-  return category ? names[category] || StringUtils.upperFirst(category) : '';
+  return category ? names[category] || upperFirst(category) : '';
 }
diff --git a/src/legacy/core_plugins/kibana/public/visualize/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/_index.scss
index fbd218a64b5fb..0632831578bd0 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/_index.scss
+++ b/src/legacy/core_plugins/kibana/public/visualize/_index.scss
@@ -1,11 +1,2 @@
-// Prefix all styles with "vis" to avoid conflicts.
-// Examples
-//   visChart
-//   visChart__legend
-//   visChart__legend--small
-//   visChart__legend-isLoading
-
-@import './editor/index';
-@import './embeddable/index';
-@import './listing/index';
-@import './wizard/index';
+// Visualize plugin styles
+@import 'np_ready/index';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/application.ts b/src/legacy/core_plugins/kibana/public/visualize/application.ts
deleted file mode 100644
index 3161576eacf71..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/application.ts
+++ /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 angular, { IModule } from 'angular';
-import { EuiConfirmModal } from '@elastic/eui';
-import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
-
-import { AppMountContext, LegacyCoreStart } from 'kibana/public';
-import {
-  AppStateProvider,
-  AppState,
-  configureAppAngularModule,
-  confirmModalFactory,
-  createTopNavDirective,
-  createTopNavHelper,
-  EventsProvider,
-  GlobalStateProvider,
-  KbnUrlProvider,
-  RedirectWhenMissingProvider,
-  IPrivate,
-  PersistedState,
-  PrivateProvider,
-  PromiseServiceCreator,
-  StateManagementConfigProvider,
-} from './legacy_imports';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
-
-// @ts-ignore
-import { initVisualizeApp } from './legacy_app';
-import { VisualizeKibanaServices } from './kibana_services';
-
-let angularModuleInstance: IModule | null = null;
-
-export const renderApp = async (
-  element: HTMLElement,
-  appBasePath: string,
-  deps: VisualizeKibanaServices
-) => {
-  if (!angularModuleInstance) {
-    angularModuleInstance = createLocalAngularModule(deps.core, deps.navigation);
-    // global routing stuff
-    configureAppAngularModule(angularModuleInstance, deps.core as LegacyCoreStart, true);
-    // custom routing stuff
-    initVisualizeApp(angularModuleInstance, deps);
-  }
-  const $injector = mountVisualizeApp(appBasePath, element);
-  return () => $injector.get('$rootScope').$destroy();
-};
-
-const mainTemplate = (basePath: string) => `<div style="height: 100%">
-  <base href="${basePath}" />
-  <div ng-view style="height: 100%;"></div>
-</div>
-`;
-
-const moduleName = 'app/visualize';
-
-const thirdPartyAngularDependencies = ['ngSanitize', 'ngRoute', 'react'];
-
-function mountVisualizeApp(appBasePath: string, element: HTMLElement) {
-  const mountpoint = document.createElement('div');
-  mountpoint.setAttribute('style', 'height: 100%');
-  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]);
-  // initialize global state handler
-  element.appendChild(mountpoint);
-  return $injector;
-}
-
-function createLocalAngularModule(core: AppMountContext['core'], navigation: NavigationStart) {
-  createLocalI18nModule();
-  createLocalPrivateModule();
-  createLocalPromiseModule();
-  createLocalConfigModule(core);
-  createLocalKbnUrlModule();
-  createLocalStateModule();
-  createLocalPersistedStateModule();
-  createLocalTopNavModule(navigation);
-  createLocalConfirmModalModule();
-
-  const visualizeAngularModule: IModule = angular.module(moduleName, [
-    ...thirdPartyAngularDependencies,
-    'app/visualize/Config',
-    'app/visualize/I18n',
-    'app/visualize/Private',
-    'app/visualize/PersistedState',
-    'app/visualize/TopNav',
-    'app/visualize/State',
-    'app/visualize/ConfirmModal',
-  ]);
-  return visualizeAngularModule;
-}
-
-function createLocalConfirmModalModule() {
-  angular
-    .module('app/visualize/ConfirmModal', ['react'])
-    .factory('confirmModal', confirmModalFactory)
-    .directive('confirmModal', reactDirective => reactDirective(EuiConfirmModal));
-}
-
-function createLocalStateModule() {
-  angular
-    .module('app/visualize/State', [
-      'app/visualize/Private',
-      'app/visualize/Config',
-      'app/visualize/KbnUrl',
-      'app/visualize/Promise',
-      'app/visualize/PersistedState',
-    ])
-    .factory('AppState', function(Private: IPrivate) {
-      return Private(AppStateProvider);
-    })
-    .service('getAppState', function(Private: IPrivate) {
-      return Private<AppState>(AppStateProvider).getAppState;
-    })
-    .service('globalState', function(Private: IPrivate) {
-      return Private(GlobalStateProvider);
-    });
-}
-
-function createLocalPersistedStateModule() {
-  angular
-    .module('app/visualize/PersistedState', ['app/visualize/Private', 'app/visualize/Promise'])
-    .factory('PersistedState', (Private: IPrivate) => {
-      const Events = Private(EventsProvider);
-      return class AngularPersistedState extends PersistedState {
-        constructor(value: any, path: any) {
-          super(value, path, Events);
-        }
-      };
-    });
-}
-
-function createLocalKbnUrlModule() {
-  angular
-    .module('app/visualize/KbnUrl', ['app/visualize/Private', 'ngRoute'])
-    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider))
-    .service('redirectWhenMissing', (Private: IPrivate) => Private(RedirectWhenMissingProvider));
-}
-
-function createLocalConfigModule(core: AppMountContext['core']) {
-  angular
-    .module('app/visualize/Config', ['app/visualize/Private'])
-    .provider('stateManagementConfig', StateManagementConfigProvider)
-    .provider('config', () => {
-      return {
-        $get: () => ({
-          get: core.uiSettings.get.bind(core.uiSettings),
-        }),
-      };
-    });
-}
-
-function createLocalPromiseModule() {
-  angular.module('app/visualize/Promise', []).service('Promise', PromiseServiceCreator);
-}
-
-function createLocalPrivateModule() {
-  angular.module('app/visualize/Private', []).provider('Private', PrivateProvider);
-}
-
-function createLocalTopNavModule(navigation: NavigationStart) {
-  angular
-    .module('app/visualize/TopNav', ['react'])
-    .directive('kbnTopNav', createTopNavDirective)
-    .directive('kbnTopNavHelper', createTopNavHelper(navigation.ui));
-}
-
-function createLocalI18nModule() {
-  angular
-    .module('app/visualize/I18n', [])
-    .provider('i18n', I18nProvider)
-    .filter('i18n', i18nFilter)
-    .directive('i18nId', i18nDirective);
-}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/editor/_index.scss
deleted file mode 100644
index 15c3c6df0ac03..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/editor/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './editor';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/embeddable/_index.scss
deleted file mode 100644
index 6b31803e7c8c5..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './visualize_lab_disabled';
-@import './embeddables';
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
deleted file mode 100644
index 7fe3678bb1f77..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/embeddable/get_index_pattern.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 { npStart } from 'ui/new_platform';
-
-import { VisSavedObject } from './visualize_embeddable';
-import { indexPatterns, IIndexPattern } from '../../../../../../plugins/data/public';
-
-export async function getIndexPattern(
-  savedVis: VisSavedObject
-): Promise<IIndexPattern | undefined> {
-  if (savedVis.vis.type.name !== 'metrics') {
-    return savedVis.vis.indexPattern;
-  }
-
-  const savedObjectsClient = npStart.core.savedObjects.client;
-  const defaultIndex = npStart.core.uiSettings.get('defaultIndex');
-
-  if (savedVis.vis.params.index_pattern) {
-    const indexPatternObjects = await savedObjectsClient.find({
-      type: 'index-pattern',
-      fields: ['title', 'fields'],
-      search: `"${savedVis.vis.params.index_pattern}"`,
-      searchFields: ['title'],
-    });
-    const [indexPattern] = indexPatternObjects.savedObjects.map(indexPatterns.getFromSavedObject);
-    return indexPattern;
-  }
-
-  const savedObject = await savedObjectsClient.get('index-pattern', defaultIndex);
-  return indexPatterns.getFromSavedObject(savedObject);
-}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/global_state_sync.ts b/src/legacy/core_plugins/kibana/public/visualize/global_state_sync.ts
deleted file mode 100644
index 71156bc38d498..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/global_state_sync.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { State } from './legacy_imports';
-import { DataPublicPluginStart as DataStart } from '../../../../../plugins/data/public';
-
-/**
- * Helper function to sync the global state with the various state providers
- * when a local angular application mounts. There are three different ways
- * global state can be passed into the application:
- * * parameter in the URL hash - e.g. shared link
- * * in-memory state in the data plugin exports (timefilter and filterManager) - e.g. default values
- *
- * This function looks up the three sources (earlier in the list means it takes precedence),
- * puts it into the globalState object and syncs it with the url.
- *
- * Currently the legacy chrome takes care of restoring the global state when navigating from
- * one app to another - to migrate away from that it will become necessary to also write the current
- * state to local storage
- */
-export function syncOnMount(
-  globalState: State,
-  {
-    query: {
-      filterManager,
-      timefilter: { timefilter },
-    },
-  }: DataStart
-) {
-  // pull in global state information from the URL
-  globalState.fetch();
-  // remember whether there were info in the URL
-  const hasGlobalURLState = Boolean(Object.keys(globalState.toObject()).length);
-
-  // sync kibana platform state with the angular global state
-  if (!globalState.time) {
-    globalState.time = timefilter.getTime();
-  }
-  if (!globalState.refreshInterval) {
-    globalState.refreshInterval = timefilter.getRefreshInterval();
-  }
-  if (!globalState.filters && filterManager.getGlobalFilters().length > 0) {
-    globalState.filters = filterManager.getGlobalFilters();
-  }
-  // only inject cross app global state if there is none in the url itself (that takes precedence)
-  if (hasGlobalURLState) {
-    // set flag the global state is set from the URL
-    globalState.$inheritedGlobalState = true;
-  }
-  globalState.save();
-}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/index.ts b/src/legacy/core_plugins/kibana/public/visualize/index.ts
index 7c22bb3d0eaeb..a389a44197baf 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/index.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/index.ts
@@ -25,13 +25,15 @@ import {
   legacyChrome,
   npSetup,
   npStart,
-  SavedObjectRegistryProvider,
   VisEditorTypesRegistryProvider,
 } from './legacy_imports';
 import { VisualizePlugin, LegacyAngularInjectedDependencies } from './plugin';
 import { start as embeddables } from '../../../embeddable_api/public/np_ready/public/legacy';
 import { start as visualizations } from '../../../visualizations/public/np_ready/public/legacy';
 
+export * from './np_ready/visualize_constants';
+export { showNewVisModal } from './np_ready/wizard';
+
 /**
  * Get dependencies relying on the global angular context.
  * They also have to get resolved together with the legacy imports above
@@ -42,13 +44,10 @@ async function getAngularDependencies(): Promise<LegacyAngularInjectedDependenci
   const Private = injector.get<IPrivate>('Private');
 
   const editorTypes = Private(VisEditorTypesRegistryProvider);
-  const savedObjectRegistry = Private(SavedObjectRegistryProvider);
 
   return {
     legacyChrome,
     editorTypes,
-    savedObjectRegistry,
-    savedVisualizations: injector.get('savedVisualizations'),
   };
 }
 
@@ -66,3 +65,5 @@ async function getAngularDependencies(): Promise<LegacyAngularInjectedDependenci
     visualizations,
   });
 })();
+
+export { createSavedVisLoader } from './saved_visualizations/saved_visualizations';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts b/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts
index 38cedc7463e7c..ea4cd0669a7cd 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts
@@ -31,7 +31,8 @@ import { IEmbeddableStart } from '../../../../../plugins/embeddable/public';
 import { SharePluginStart } from '../../../../../plugins/share/public';
 import { DataPublicPluginStart, IndexPatternsContract } from '../../../../../plugins/data/public';
 import { VisualizationsStart } from '../../../visualizations/public';
-import { SavedVisualizations } from './types';
+import { SavedVisualizations } from './np_ready/types';
+import { UsageCollectionSetup } from '../../../../../plugins/usage_collection/public';
 
 export interface VisualizeKibanaServices {
   addBasePath: (url: string) => string;
@@ -47,13 +48,13 @@ export interface VisualizeKibanaServices {
   navigation: NavigationStart;
   toastNotifications: ToastsStart;
   savedObjectsClient: SavedObjectsClientContract;
-  savedObjectRegistry: any;
   savedQueryService: DataPublicPluginStart['query']['savedQueries'];
   savedVisualizations: SavedVisualizations;
   share: SharePluginStart;
   uiSettings: IUiSettingsClient;
   visualizeCapabilities: any;
   visualizations: VisualizationsStart;
+  usageCollection?: UsageCollectionSetup;
 }
 
 let services: VisualizeKibanaServices | null = null;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_app.js b/src/legacy/core_plugins/kibana/public/visualize/legacy_app.js
deleted file mode 100644
index e948862071f69..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/legacy_app.js
+++ /dev/null
@@ -1,179 +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 { find } from 'lodash';
-import { i18n } from '@kbn/i18n';
-
-import editorTemplate from './editor/editor.html';
-import visualizeListingTemplate from './listing/visualize_listing.html';
-
-import { initVisualizeAppDirective } from './visualize_app';
-import { VisualizeConstants } from './visualize_constants';
-import { VisualizeListingController } from './listing/visualize_listing';
-import {
-  ensureDefaultIndexPattern,
-  registerTimefilterWithGlobalStateFactory,
-} from './legacy_imports';
-import { syncOnMount } from './global_state_sync';
-
-import {
-  getLandingBreadcrumbs,
-  getWizardStep1Breadcrumbs,
-  getCreateBreadcrumbs,
-  getEditBreadcrumbs,
-} from './breadcrumbs';
-
-export function initVisualizeApp(app, deps) {
-  initVisualizeAppDirective(app, deps);
-
-  app.run(globalState => {
-    syncOnMount(globalState, deps.data);
-  });
-
-  app.run((globalState, $rootScope) => {
-    registerTimefilterWithGlobalStateFactory(
-      deps.data.query.timefilter.timefilter,
-      globalState,
-      $rootScope
-    );
-  });
-
-  app.config(function($routeProvider) {
-    const defaults = {
-      reloadOnSearch: false,
-      requireUICapability: 'visualize.show',
-      badge: () => {
-        if (deps.visualizeCapabilities.save) {
-          return undefined;
-        }
-
-        return {
-          text: i18n.translate('kbn.visualize.badge.readOnly.text', {
-            defaultMessage: 'Read only',
-          }),
-          tooltip: i18n.translate('kbn.visualize.badge.readOnly.tooltip', {
-            defaultMessage: 'Unable to save visualizations',
-          }),
-          iconType: 'glasses',
-        };
-      },
-    };
-
-    $routeProvider
-      .when(VisualizeConstants.LANDING_PAGE_PATH, {
-        ...defaults,
-        template: visualizeListingTemplate,
-        k7Breadcrumbs: getLandingBreadcrumbs,
-        controller: VisualizeListingController,
-        controllerAs: 'listingController',
-        resolve: {
-          createNewVis: () => false,
-          hasDefaultIndex: ($rootScope, kbnUrl) =>
-            ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl),
-        },
-      })
-      .when(VisualizeConstants.WIZARD_STEP_1_PAGE_PATH, {
-        ...defaults,
-        template: visualizeListingTemplate,
-        k7Breadcrumbs: getWizardStep1Breadcrumbs,
-        controller: VisualizeListingController,
-        controllerAs: 'listingController',
-        resolve: {
-          createNewVis: () => true,
-          hasDefaultIndex: ($rootScope, kbnUrl) =>
-            ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl),
-        },
-      })
-      .when(VisualizeConstants.CREATE_PATH, {
-        ...defaults,
-        template: editorTemplate,
-        k7Breadcrumbs: getCreateBreadcrumbs,
-        resolve: {
-          savedVis: function(redirectWhenMissing, $route, $rootScope, kbnUrl) {
-            const { core, data, savedVisualizations, visualizations } = deps;
-            const visTypes = visualizations.types.all();
-            const visType = find(visTypes, { name: $route.current.params.type });
-            const shouldHaveIndex = visType.requiresSearch && visType.options.showIndexSelection;
-            const hasIndex =
-              $route.current.params.indexPattern || $route.current.params.savedSearchId;
-            if (shouldHaveIndex && !hasIndex) {
-              throw new Error(
-                i18n.translate(
-                  'kbn.visualize.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage',
-                  {
-                    defaultMessage: 'You must provide either an indexPattern or a savedSearchId',
-                  }
-                )
-              );
-            }
-
-            return ensureDefaultIndexPattern(core, data, $rootScope, kbnUrl)
-              .then(() => savedVisualizations.get($route.current.params))
-              .then(savedVis => {
-                if (savedVis.vis.type.setup) {
-                  return savedVis.vis.type.setup(savedVis).catch(() => savedVis);
-                }
-                return savedVis;
-              })
-              .catch(
-                redirectWhenMissing({
-                  '*': '/visualize',
-                })
-              );
-          },
-        },
-      })
-      .when(`${VisualizeConstants.EDIT_PATH}/:id`, {
-        ...defaults,
-        template: editorTemplate,
-        k7Breadcrumbs: getEditBreadcrumbs,
-        resolve: {
-          savedVis: function(redirectWhenMissing, $route, $rootScope, kbnUrl) {
-            const { chrome, core, data, savedVisualizations } = deps;
-            return ensureDefaultIndexPattern(core, data, $rootScope, kbnUrl)
-              .then(() => savedVisualizations.get($route.current.params.id))
-              .then(savedVis => {
-                chrome.recentlyAccessed.add(savedVis.getFullPath(), savedVis.title, savedVis.id);
-                return savedVis;
-              })
-              .then(savedVis => {
-                if (savedVis.vis.type.setup) {
-                  return savedVis.vis.type.setup(savedVis).catch(() => savedVis);
-                }
-                return savedVis;
-              })
-              .catch(
-                redirectWhenMissing({
-                  visualization: '/visualize',
-                  search:
-                    '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
-                  'index-pattern':
-                    '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
-                  'index-pattern-field':
-                    '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
-                })
-              );
-          },
-        },
-      })
-      .when(`visualize/:tail*?`, {
-        redirectTo: `/${deps.core.injectedMetadata.getInjectedVar('kbnDefaultAppId')}`,
-      });
-  });
-}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
index b9909e522b571..141063adcbd6a 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
@@ -43,7 +43,6 @@ export { IPrivate } from 'ui/private';
 // @ts-ignore
 export { PrivateProvider } from 'ui/private/private';
 
-export { SavedObjectRegistryProvider } from 'ui/saved_objects';
 export { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal';
 export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
 
@@ -72,4 +71,7 @@ export { defaultEditor } from 'ui/vis/editors/default/default';
 export { VisType } from 'ui/vis';
 export { wrapInI18nContext } from 'ui/i18n';
 
-export { VisSavedObject } from './embeddable/visualize_embeddable';
+export { DashboardConstants } from '../dashboard/np_ready/dashboard_constants';
+export { VisSavedObject } from '../visualize_embeddable/visualize_embeddable';
+export { VISUALIZE_EMBEDDABLE_TYPE } from '../visualize_embeddable';
+export { VisualizeEmbeddableFactory } from '../visualize_embeddable/visualize_embeddable_factory';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/listing/_index.scss
deleted file mode 100644
index 0829e9af7039b..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './listing';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/_index.scss
new file mode 100644
index 0000000000000..f97ae012055b0
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/_index.scss
@@ -0,0 +1,10 @@
+// Prefix all styles with "vis" to avoid conflicts.
+// Examples
+//   visChart
+//   visChart__legend
+//   visChart__legend--small
+//   visChart__legend-isLoading
+
+@import 'editor/index';
+@import 'listing/index';
+@import 'wizard/index';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
new file mode 100644
index 0000000000000..dcd68a26743ab
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/application.ts
@@ -0,0 +1,193 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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, { IModule } from 'angular';
+import { EuiConfirmModal } from '@elastic/eui';
+import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
+
+import { AppMountContext, LegacyCoreStart } from 'kibana/public';
+import {
+  AppStateProvider,
+  AppState,
+  configureAppAngularModule,
+  confirmModalFactory,
+  createTopNavDirective,
+  createTopNavHelper,
+  EventsProvider,
+  GlobalStateProvider,
+  KbnUrlProvider,
+  RedirectWhenMissingProvider,
+  IPrivate,
+  PersistedState,
+  PrivateProvider,
+  PromiseServiceCreator,
+  StateManagementConfigProvider,
+} from '../legacy_imports';
+import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../plugins/navigation/public';
+
+// @ts-ignore
+import { initVisualizeApp } from './legacy_app';
+import { VisualizeKibanaServices } from '../kibana_services';
+
+let angularModuleInstance: IModule | null = null;
+
+export const renderApp = async (
+  element: HTMLElement,
+  appBasePath: string,
+  deps: VisualizeKibanaServices
+) => {
+  if (!angularModuleInstance) {
+    angularModuleInstance = createLocalAngularModule(deps.core, deps.navigation);
+    // global routing stuff
+    configureAppAngularModule(angularModuleInstance, deps.core as LegacyCoreStart, true);
+    // custom routing stuff
+    initVisualizeApp(angularModuleInstance, deps);
+  }
+  const $injector = mountVisualizeApp(appBasePath, element);
+  return () => $injector.get('$rootScope').$destroy();
+};
+
+const mainTemplate = (basePath: string) => `<div style="height: 100%">
+  <base href="${basePath}" />
+  <div ng-view style="height: 100%;"></div>
+</div>
+`;
+
+const moduleName = 'app/visualize';
+
+const thirdPartyAngularDependencies = ['ngSanitize', 'ngRoute', 'react'];
+
+function mountVisualizeApp(appBasePath: string, element: HTMLElement) {
+  const mountpoint = document.createElement('div');
+  mountpoint.setAttribute('style', 'height: 100%');
+  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]);
+  // initialize global state handler
+  element.appendChild(mountpoint);
+  return $injector;
+}
+
+function createLocalAngularModule(core: AppMountContext['core'], navigation: NavigationStart) {
+  createLocalI18nModule();
+  createLocalPrivateModule();
+  createLocalPromiseModule();
+  createLocalConfigModule(core);
+  createLocalKbnUrlModule();
+  createLocalStateModule();
+  createLocalPersistedStateModule();
+  createLocalTopNavModule(navigation);
+  createLocalConfirmModalModule();
+
+  const visualizeAngularModule: IModule = angular.module(moduleName, [
+    ...thirdPartyAngularDependencies,
+    'app/visualize/Config',
+    'app/visualize/I18n',
+    'app/visualize/Private',
+    'app/visualize/PersistedState',
+    'app/visualize/TopNav',
+    'app/visualize/State',
+    'app/visualize/ConfirmModal',
+  ]);
+  return visualizeAngularModule;
+}
+
+function createLocalConfirmModalModule() {
+  angular
+    .module('app/visualize/ConfirmModal', ['react'])
+    .factory('confirmModal', confirmModalFactory)
+    .directive('confirmModal', reactDirective => reactDirective(EuiConfirmModal));
+}
+
+function createLocalStateModule() {
+  angular
+    .module('app/visualize/State', [
+      'app/visualize/Private',
+      'app/visualize/Config',
+      'app/visualize/KbnUrl',
+      'app/visualize/Promise',
+      'app/visualize/PersistedState',
+    ])
+    .factory('AppState', function(Private: IPrivate) {
+      return Private(AppStateProvider);
+    })
+    .service('getAppState', function(Private: IPrivate) {
+      return Private<AppState>(AppStateProvider).getAppState;
+    })
+    .service('globalState', function(Private: IPrivate) {
+      return Private(GlobalStateProvider);
+    });
+}
+
+function createLocalPersistedStateModule() {
+  angular
+    .module('app/visualize/PersistedState', ['app/visualize/Private', 'app/visualize/Promise'])
+    .factory('PersistedState', (Private: IPrivate) => {
+      const Events = Private(EventsProvider);
+      return class AngularPersistedState extends PersistedState {
+        constructor(value: any, path: any) {
+          super(value, path, Events);
+        }
+      };
+    });
+}
+
+function createLocalKbnUrlModule() {
+  angular
+    .module('app/visualize/KbnUrl', ['app/visualize/Private', 'ngRoute'])
+    .service('kbnUrl', (Private: IPrivate) => Private(KbnUrlProvider))
+    .service('redirectWhenMissing', (Private: IPrivate) => Private(RedirectWhenMissingProvider));
+}
+
+function createLocalConfigModule(core: AppMountContext['core']) {
+  angular
+    .module('app/visualize/Config', ['app/visualize/Private'])
+    .provider('stateManagementConfig', StateManagementConfigProvider)
+    .provider('config', () => {
+      return {
+        $get: () => ({
+          get: core.uiSettings.get.bind(core.uiSettings),
+        }),
+      };
+    });
+}
+
+function createLocalPromiseModule() {
+  angular.module('app/visualize/Promise', []).service('Promise', PromiseServiceCreator);
+}
+
+function createLocalPrivateModule() {
+  angular.module('app/visualize/Private', []).provider('Private', PrivateProvider);
+}
+
+function createLocalTopNavModule(navigation: NavigationStart) {
+  angular
+    .module('app/visualize/TopNav', ['react'])
+    .directive('kbnTopNav', createTopNavDirective)
+    .directive('kbnTopNavHelper', createTopNavHelper(navigation.ui));
+}
+
+function createLocalI18nModule() {
+  angular
+    .module('app/visualize/I18n', [])
+    .provider('i18n', I18nProvider)
+    .filter('i18n', i18nFilter)
+    .directive('i18nId', i18nDirective);
+}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/breadcrumbs.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/breadcrumbs.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/breadcrumbs.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/breadcrumbs.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/_editor.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_editor.scss
similarity index 90%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/_editor.scss
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_editor.scss
index dfe74acd47ea8..f738820677beb 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/editor/_editor.scss
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_editor.scss
@@ -1,11 +1,7 @@
 .visEditor {
   @include flex-parent();
 
-  @include euiBreakpoint('l', 'xl') {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-  }
+  height: 100%;
 
   @include euiBreakpoint('xs', 's', 'm') {
     .visualization {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_index.scss
new file mode 100644
index 0000000000000..9d3ca4b539947
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/_index.scss
@@ -0,0 +1 @@
+@import 'editor';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.html b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/editor.html
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.html
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/editor.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
index f745e65cc5d1c..ed9bec9db4112 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js
@@ -21,33 +21,33 @@ import angular from 'angular';
 import _ from 'lodash';
 import { Subscription } from 'rxjs';
 import { i18n } from '@kbn/i18n';
-import '../saved_visualizations/saved_visualizations';
+import '../../saved_visualizations/saved_visualizations';
 
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { migrateAppState } from './lib';
-import { DashboardConstants } from '../../dashboard/dashboard_constants';
 import { VisualizeConstants } from '../visualize_constants';
 import { getEditBreadcrumbs } from '../breadcrumbs';
 
 import { addHelpMenuToAppChrome } from '../help_menu/help_menu_util';
-import { FilterStateManager } from '../../../../data/public/filter/filter_manager';
-import { unhashUrl } from '../../../../../../plugins/kibana_utils/public';
+import { FilterStateManager } from '../../../../../data/public';
+import { unhashUrl } from '../../../../../../../plugins/kibana_utils/public';
 
 import { initVisEditorDirective } from './visualization_editor';
 import { initVisualizationDirective } from './visualization';
 
 import {
+  subscribeWithScope,
   absoluteToParsedUrl,
   KibanaParsedUrl,
   migrateLegacyQuery,
   SavedObjectSaveModal,
   showSaveModal,
   stateMonitorFactory,
-  subscribeWithScope,
-} from '../legacy_imports';
+  DashboardConstants,
+} from '../../legacy_imports';
 
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
 
 export function initEditorDirective(app, deps) {
   app.directive('visualizeApp', function() {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/lib/index.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/index.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/lib/index.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/index.js
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/lib/migrate_app_state.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/migrate_app_state.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/lib/migrate_app_state.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/lib/migrate_app_state.js
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/visualization.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/visualization.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization.js
diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization_editor.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/editor/visualization_editor.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/visualization_editor.js
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/global_state_sync.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/global_state_sync.ts
new file mode 100644
index 0000000000000..f29fb72a9fbc5
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/global_state_sync.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 { State } from '../legacy_imports';
+import { DataPublicPluginStart as DataStart } from '../../../../../../plugins/data/public';
+
+/**
+ * Helper function to sync the global state with the various state providers
+ * when a local angular application mounts. There are three different ways
+ * global state can be passed into the application:
+ * * parameter in the URL hash - e.g. shared link
+ * * in-memory state in the data plugin exports (timefilter and filterManager) - e.g. default values
+ *
+ * This function looks up the three sources (earlier in the list means it takes precedence),
+ * puts it into the globalState object and syncs it with the url.
+ *
+ * Currently the legacy chrome takes care of restoring the global state when navigating from
+ * one app to another - to migrate away from that it will become necessary to also write the current
+ * state to local storage
+ */
+export function syncOnMount(
+  globalState: State,
+  {
+    query: {
+      filterManager,
+      timefilter: { timefilter },
+    },
+  }: DataStart
+) {
+  // pull in global state information from the URL
+  globalState.fetch();
+  // remember whether there were info in the URL
+  const hasGlobalURLState = Boolean(Object.keys(globalState.toObject()).length);
+
+  // sync kibana platform state with the angular global state
+  if (!globalState.time) {
+    globalState.time = timefilter.getTime();
+  }
+  if (!globalState.refreshInterval) {
+    globalState.refreshInterval = timefilter.getRefreshInterval();
+  }
+  if (!globalState.filters && filterManager.getGlobalFilters().length > 0) {
+    globalState.filters = filterManager.getGlobalFilters();
+  }
+  // only inject cross app global state if there is none in the url itself (that takes precedence)
+  if (hasGlobalURLState) {
+    // set flag the global state is set from the URL
+    globalState.$inheritedGlobalState = true;
+  }
+  globalState.save();
+}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/help_menu/help_menu_util.js
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/help_menu/help_menu_util.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/help_menu/help_menu_util.js
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
new file mode 100644
index 0000000000000..d99771ccc912d
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js
@@ -0,0 +1,179 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { find } from 'lodash';
+import { i18n } from '@kbn/i18n';
+
+import editorTemplate from './editor/editor.html';
+import visualizeListingTemplate from './listing/visualize_listing.html';
+
+import { initVisualizeAppDirective } from './visualize_app';
+import { VisualizeConstants } from './visualize_constants';
+import { VisualizeListingController } from './listing/visualize_listing';
+import {
+  ensureDefaultIndexPattern,
+  registerTimefilterWithGlobalStateFactory,
+} from '../legacy_imports';
+import { syncOnMount } from './global_state_sync';
+
+import {
+  getLandingBreadcrumbs,
+  getWizardStep1Breadcrumbs,
+  getCreateBreadcrumbs,
+  getEditBreadcrumbs,
+} from './breadcrumbs';
+
+export function initVisualizeApp(app, deps) {
+  initVisualizeAppDirective(app, deps);
+
+  app.run(globalState => {
+    syncOnMount(globalState, deps.data);
+  });
+
+  app.run((globalState, $rootScope) => {
+    registerTimefilterWithGlobalStateFactory(
+      deps.data.query.timefilter.timefilter,
+      globalState,
+      $rootScope
+    );
+  });
+
+  app.config(function($routeProvider) {
+    const defaults = {
+      reloadOnSearch: false,
+      requireUICapability: 'visualize.show',
+      badge: () => {
+        if (deps.visualizeCapabilities.save) {
+          return undefined;
+        }
+
+        return {
+          text: i18n.translate('kbn.visualize.badge.readOnly.text', {
+            defaultMessage: 'Read only',
+          }),
+          tooltip: i18n.translate('kbn.visualize.badge.readOnly.tooltip', {
+            defaultMessage: 'Unable to save visualizations',
+          }),
+          iconType: 'glasses',
+        };
+      },
+    };
+
+    $routeProvider
+      .when(VisualizeConstants.LANDING_PAGE_PATH, {
+        ...defaults,
+        template: visualizeListingTemplate,
+        k7Breadcrumbs: getLandingBreadcrumbs,
+        controller: VisualizeListingController,
+        controllerAs: 'listingController',
+        resolve: {
+          createNewVis: () => false,
+          hasDefaultIndex: ($rootScope, kbnUrl) =>
+            ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl),
+        },
+      })
+      .when(VisualizeConstants.WIZARD_STEP_1_PAGE_PATH, {
+        ...defaults,
+        template: visualizeListingTemplate,
+        k7Breadcrumbs: getWizardStep1Breadcrumbs,
+        controller: VisualizeListingController,
+        controllerAs: 'listingController',
+        resolve: {
+          createNewVis: () => true,
+          hasDefaultIndex: ($rootScope, kbnUrl) =>
+            ensureDefaultIndexPattern(deps.core, deps.data, $rootScope, kbnUrl),
+        },
+      })
+      .when(VisualizeConstants.CREATE_PATH, {
+        ...defaults,
+        template: editorTemplate,
+        k7Breadcrumbs: getCreateBreadcrumbs,
+        resolve: {
+          savedVis: function(redirectWhenMissing, $route, $rootScope, kbnUrl) {
+            const { core, data, savedVisualizations, visualizations } = deps;
+            const visTypes = visualizations.types.all();
+            const visType = find(visTypes, { name: $route.current.params.type });
+            const shouldHaveIndex = visType.requiresSearch && visType.options.showIndexSelection;
+            const hasIndex =
+              $route.current.params.indexPattern || $route.current.params.savedSearchId;
+            if (shouldHaveIndex && !hasIndex) {
+              throw new Error(
+                i18n.translate(
+                  'kbn.visualize.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage',
+                  {
+                    defaultMessage: 'You must provide either an indexPattern or a savedSearchId',
+                  }
+                )
+              );
+            }
+
+            return ensureDefaultIndexPattern(core, data, $rootScope, kbnUrl)
+              .then(() => savedVisualizations.get($route.current.params))
+              .then(savedVis => {
+                if (savedVis.vis.type.setup) {
+                  return savedVis.vis.type.setup(savedVis).catch(() => savedVis);
+                }
+                return savedVis;
+              })
+              .catch(
+                redirectWhenMissing({
+                  '*': '/visualize',
+                })
+              );
+          },
+        },
+      })
+      .when(`${VisualizeConstants.EDIT_PATH}/:id`, {
+        ...defaults,
+        template: editorTemplate,
+        k7Breadcrumbs: getEditBreadcrumbs,
+        resolve: {
+          savedVis: function(redirectWhenMissing, $route, $rootScope, kbnUrl) {
+            const { chrome, core, data, savedVisualizations } = deps;
+            return ensureDefaultIndexPattern(core, data, $rootScope, kbnUrl)
+              .then(() => savedVisualizations.get($route.current.params.id))
+              .then(savedVis => {
+                chrome.recentlyAccessed.add(savedVis.getFullPath(), savedVis.title, savedVis.id);
+                return savedVis;
+              })
+              .then(savedVis => {
+                if (savedVis.vis.type.setup) {
+                  return savedVis.vis.type.setup(savedVis).catch(() => savedVis);
+                }
+                return savedVis;
+              })
+              .catch(
+                redirectWhenMissing({
+                  visualization: '/visualize',
+                  search:
+                    '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
+                  'index-pattern':
+                    '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
+                  'index-pattern-field':
+                    '/management/kibana/objects/savedVisualizations/' + $route.current.params.id,
+                })
+              );
+          },
+        },
+      })
+      .when(`visualize/:tail*?`, {
+        redirectTo: `/${deps.core.injectedMetadata.getInjectedVar('kbnDefaultAppId')}`,
+      });
+  });
+}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_index.scss
new file mode 100644
index 0000000000000..924c164e467d8
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_index.scss
@@ -0,0 +1 @@
+@import 'listing';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/_listing.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_listing.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/listing/_listing.scss
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/_listing.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.html b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.html
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.html
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.html
index 4ee8809fab228..522d20fffafd3 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.html
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.html
@@ -17,6 +17,7 @@
     add-base-path="listingController.addBasePath"
     ui-settings="listingController.uiSettings"
     saved-objects="listingController.savedObjects"
+    usage-collection="listingController.usageCollection"
   ></new-vis-modal>
 
 </div>
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js
similarity index 92%
rename from src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js
index ca6660f34a0a6..ac8308e1cd1c5 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing.js
@@ -23,8 +23,8 @@ import { NewVisModal } from '../wizard/new_vis_modal';
 import { VisualizeConstants } from '../visualize_constants';
 import { i18n } from '@kbn/i18n';
 
-import { getServices } from '../kibana_services';
-import { wrapInI18nContext } from '../legacy_imports';
+import { getServices } from '../../kibana_services';
+import { wrapInI18nContext } from '../../legacy_imports';
 
 export function initListingDirective(app) {
   app.directive('visualizeListingTable', reactDirective =>
@@ -37,6 +37,7 @@ export function initListingDirective(app) {
       ['addBasePath', { watchDepth: 'reference' }],
       ['uiSettings', { watchDepth: 'reference' }],
       ['savedObjects', { watchDepth: 'reference' }],
+      ['usageCollection', { watchDepth: 'reference' }],
       'isOpen',
     ])
   );
@@ -47,8 +48,8 @@ export function VisualizeListingController($injector, createNewVis) {
     addBasePath,
     chrome,
     legacyChrome,
-    savedObjectRegistry,
     savedObjectsClient,
+    savedVisualizations,
     data: {
       query: {
         timefilter: { timefilter },
@@ -58,6 +59,7 @@ export function VisualizeListingController($injector, createNewVis) {
     uiSettings,
     visualizations,
     core: { docLinks, savedObjects },
+    usageCollection,
   } = getServices();
   const kbnUrl = $injector.get('kbnUrl');
 
@@ -68,6 +70,7 @@ export function VisualizeListingController($injector, createNewVis) {
   this.addBasePath = addBasePath;
   this.uiSettings = uiSettings;
   this.savedObjects = savedObjects;
+  this.usageCollection = usageCollection;
 
   this.createNewVis = () => {
     this.showNewVisModal = true;
@@ -94,15 +97,11 @@ export function VisualizeListingController($injector, createNewVis) {
     // In case the user navigated to the page via the /visualize/new URL we start the dialog immediately
     this.createNewVis();
   }
-
-  // TODO: Extract this into an external service.
-  const services = savedObjectRegistry.byLoaderPropertiesName;
-  const visualizationService = services.visualizations;
   this.visTypeRegistry = visualizations.types;
 
   this.fetchItems = filter => {
     const isLabsEnabled = uiSettings.get('visualize:enableLabs');
-    return visualizationService
+    return savedVisualizations
       .findListItems(filter, uiSettings.get('savedObjects:listingLimit'))
       .then(result => {
         this.totalItems = result.total;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing_table.js
similarity index 98%
rename from src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing_table.js
index 890fa64af9693..840e647edcc86 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/listing/visualize_listing_table.js
@@ -21,11 +21,11 @@ import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { TableListView } from '../../../../../../../src/plugins/kibana_react/public';
+import { TableListView } from '../../../../../../../plugins/kibana_react/public';
 
 import { EuiIcon, EuiBetaBadge, EuiLink, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 
-import { getServices } from '../kibana_services';
+import { getServices } from '../../kibana_services';
 
 class VisualizeListingTable extends Component {
   constructor(props) {
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/types.d.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/types.d.ts
new file mode 100644
index 0000000000000..f47a54baac9a1
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/types.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 { VisSavedObject } from '../legacy_imports';
+
+export interface SavedVisualizations {
+  urlFor: (id: string) => string;
+  get: (id: string) => Promise<VisSavedObject>;
+}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/visualize_app.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_app.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/visualize/visualize_app.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_app.ts
index c64287a0e63b8..1e7ac668697de 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/visualize_app.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_app.ts
@@ -18,7 +18,7 @@
  */
 
 import { IModule } from 'angular';
-import { VisualizeKibanaServices } from './kibana_services';
+import { VisualizeKibanaServices } from '../kibana_services';
 
 // @ts-ignore
 import { initEditorDirective } from './editor/editor';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/visualize_constants.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/visualize_constants.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants.ts
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/np_ready/wizard/__snapshots__/new_vis_modal.test.tsx.snap
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/__snapshots__/new_vis_modal.test.tsx.snap
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/__snapshots__/new_vis_modal.test.tsx.snap
index ca6b872c73f8f..0b44c7dc4e860 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/np_ready/wizard/__snapshots__/new_vis_modal.test.tsx.snap
@@ -169,6 +169,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                   class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                   focusable="false"
                   height="16"
+                  role="img"
                   viewBox="0 0 16 16"
                   width="16"
                   xmlns="http://www.w3.org/2000/svg"
@@ -226,6 +227,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                     class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height="16"
+                                    role="img"
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
@@ -275,6 +277,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                         class="euiIcon euiIcon--medium euiIcon-isLoading euiBetaBadge__icon"
                                         focusable="false"
                                         height="16"
+                                        role="img"
                                         viewBox="0 0 16 16"
                                         width="16"
                                         xmlns="http://www.w3.org/2000/svg"
@@ -290,6 +293,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                     class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                     focusable="false"
                                     height="16"
+                                    role="img"
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
@@ -325,6 +329,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                     class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                     focusable="false"
                                     height="16"
+                                    role="img"
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
@@ -361,6 +366,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                     class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                     focusable="false"
                                     height="16"
+                                    role="img"
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
@@ -494,6 +500,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                           class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
                           height="16"
+                          role="img"
                           viewBox="0 0 16 16"
                           width="16"
                           xmlns="http://www.w3.org/2000/svg"
@@ -551,6 +558,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                             class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                             focusable="false"
                                             height="16"
+                                            role="img"
                                             viewBox="0 0 16 16"
                                             width="16"
                                             xmlns="http://www.w3.org/2000/svg"
@@ -600,6 +608,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                 class="euiIcon euiIcon--medium euiIcon-isLoading euiBetaBadge__icon"
                                                 focusable="false"
                                                 height="16"
+                                                role="img"
                                                 viewBox="0 0 16 16"
                                                 width="16"
                                                 xmlns="http://www.w3.org/2000/svg"
@@ -615,6 +624,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                             class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                             focusable="false"
                                             height="16"
+                                            role="img"
                                             viewBox="0 0 16 16"
                                             width="16"
                                             xmlns="http://www.w3.org/2000/svg"
@@ -650,6 +660,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                             class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                             focusable="false"
                                             height="16"
+                                            role="img"
                                             viewBox="0 0 16 16"
                                             width="16"
                                             xmlns="http://www.w3.org/2000/svg"
@@ -686,6 +697,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                             class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                             focusable="false"
                                             height="16"
+                                            role="img"
                                             viewBox="0 0 16 16"
                                             width="16"
                                             xmlns="http://www.w3.org/2000/svg"
@@ -758,6 +770,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                             class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                             focusable="false"
                             height="16"
+                            role="img"
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
@@ -815,6 +828,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                               class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                               focusable="false"
                                               height="16"
+                                              role="img"
                                               viewBox="0 0 16 16"
                                               width="16"
                                               xmlns="http://www.w3.org/2000/svg"
@@ -864,6 +878,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                   class="euiIcon euiIcon--medium euiIcon-isLoading euiBetaBadge__icon"
                                                   focusable="false"
                                                   height="16"
+                                                  role="img"
                                                   viewBox="0 0 16 16"
                                                   width="16"
                                                   xmlns="http://www.w3.org/2000/svg"
@@ -879,6 +894,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                               class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                               focusable="false"
                                               height="16"
+                                              role="img"
                                               viewBox="0 0 16 16"
                                               width="16"
                                               xmlns="http://www.w3.org/2000/svg"
@@ -914,6 +930,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                               class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                               focusable="false"
                                               height="16"
+                                              role="img"
                                               viewBox="0 0 16 16"
                                               width="16"
                                               xmlns="http://www.w3.org/2000/svg"
@@ -950,6 +967,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                               class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                               focusable="false"
                                               height="16"
+                                              role="img"
                                               viewBox="0 0 16 16"
                                               width="16"
                                               xmlns="http://www.w3.org/2000/svg"
@@ -1031,16 +1049,18 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                         type="cross"
                       >
                         <EuiIconEmpty
-                          aria-hidden="true"
+                          aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
+                          role="img"
                           style={null}
                         >
                           <svg
-                            aria-hidden="true"
+                            aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                             focusable="false"
                             height={16}
+                            role="img"
                             style={null}
                             viewBox="0 0 16 16"
                             width={16}
@@ -1167,16 +1187,18 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                         type="search"
                                                       >
                                                         <EuiIconEmpty
-                                                          aria-hidden="true"
+                                                          aria-hidden={true}
                                                           className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                           focusable="false"
+                                                          role="img"
                                                           style={null}
                                                         >
                                                           <svg
-                                                            aria-hidden="true"
+                                                            aria-hidden={true}
                                                             className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                             focusable="false"
                                                             height={16}
+                                                            role="img"
                                                             style={null}
                                                             viewBox="0 0 16 16"
                                                             width={16}
@@ -1302,16 +1324,18 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                             type="popout"
                                                           >
                                                             <EuiIconEmpty
-                                                              aria-hidden="true"
+                                                              aria-hidden={true}
                                                               className="euiIcon euiIcon--medium euiIcon-isLoading euiBetaBadge__icon"
                                                               focusable="false"
+                                                              role="img"
                                                               style={null}
                                                             >
                                                               <svg
-                                                                aria-hidden="true"
+                                                                aria-hidden={true}
                                                                 className="euiIcon euiIcon--medium euiIcon-isLoading euiBetaBadge__icon"
                                                                 focusable="false"
                                                                 height={16}
+                                                                role="img"
                                                                 style={null}
                                                                 viewBox="0 0 16 16"
                                                                 width={16}
@@ -1335,16 +1359,18 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                       type="empty"
                                                     >
                                                       <EuiIconEmpty
-                                                        aria-hidden="true"
+                                                        aria-hidden={true}
                                                         className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                         focusable="false"
+                                                        role="img"
                                                         style={null}
                                                       >
                                                         <svg
-                                                          aria-hidden="true"
+                                                          aria-hidden={true}
                                                           className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                           focusable="false"
                                                           height={16}
+                                                          role="img"
                                                           style={null}
                                                           viewBox="0 0 16 16"
                                                           width={16}
@@ -1415,16 +1441,18 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                       type="empty"
                                                     >
                                                       <EuiIconEmpty
-                                                        aria-hidden="true"
+                                                        aria-hidden={true}
                                                         className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                         focusable="false"
+                                                        role="img"
                                                         style={null}
                                                       >
                                                         <svg
-                                                          aria-hidden="true"
+                                                          aria-hidden={true}
                                                           className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                           focusable="false"
                                                           height={16}
+                                                          role="img"
                                                           style={null}
                                                           viewBox="0 0 16 16"
                                                           width={16}
@@ -1495,16 +1523,18 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                       type="empty"
                                                     >
                                                       <EuiIconEmpty
-                                                        aria-hidden="true"
+                                                        aria-hidden={true}
                                                         className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                         focusable="false"
+                                                        role="img"
                                                         style={null}
                                                       >
                                                         <svg
-                                                          aria-hidden="true"
+                                                          aria-hidden={true}
                                                           className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                           focusable="false"
                                                           height={16}
+                                                          role="img"
                                                           style={null}
                                                           viewBox="0 0 16 16"
                                                           width={16}
@@ -1784,6 +1814,7 @@ exports[`NewVisModal should render as expected 1`] = `
                   class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                   focusable="false"
                   height="16"
+                  role="img"
                   viewBox="0 0 16 16"
                   width="16"
                   xmlns="http://www.w3.org/2000/svg"
@@ -1841,6 +1872,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                     class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
                                     height="16"
+                                    role="img"
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
@@ -1881,6 +1913,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                     class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                     focusable="false"
                                     height="16"
+                                    role="img"
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
@@ -1923,6 +1956,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                         class="euiIcon euiIcon--medium euiIcon-isLoading euiBetaBadge__icon"
                                         focusable="false"
                                         height="16"
+                                        role="img"
                                         viewBox="0 0 16 16"
                                         width="16"
                                         xmlns="http://www.w3.org/2000/svg"
@@ -1938,6 +1972,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                     class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                     focusable="false"
                                     height="16"
+                                    role="img"
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
@@ -1973,6 +2008,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                     class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                     focusable="false"
                                     height="16"
+                                    role="img"
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
@@ -2106,6 +2142,7 @@ exports[`NewVisModal should render as expected 1`] = `
                           class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
                           height="16"
+                          role="img"
                           viewBox="0 0 16 16"
                           width="16"
                           xmlns="http://www.w3.org/2000/svg"
@@ -2163,6 +2200,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                             class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                             focusable="false"
                                             height="16"
+                                            role="img"
                                             viewBox="0 0 16 16"
                                             width="16"
                                             xmlns="http://www.w3.org/2000/svg"
@@ -2203,6 +2241,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                             class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                             focusable="false"
                                             height="16"
+                                            role="img"
                                             viewBox="0 0 16 16"
                                             width="16"
                                             xmlns="http://www.w3.org/2000/svg"
@@ -2245,6 +2284,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                                 class="euiIcon euiIcon--medium euiIcon-isLoading euiBetaBadge__icon"
                                                 focusable="false"
                                                 height="16"
+                                                role="img"
                                                 viewBox="0 0 16 16"
                                                 width="16"
                                                 xmlns="http://www.w3.org/2000/svg"
@@ -2260,6 +2300,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                             class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                             focusable="false"
                                             height="16"
+                                            role="img"
                                             viewBox="0 0 16 16"
                                             width="16"
                                             xmlns="http://www.w3.org/2000/svg"
@@ -2295,6 +2336,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                             class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                             focusable="false"
                                             height="16"
+                                            role="img"
                                             viewBox="0 0 16 16"
                                             width="16"
                                             xmlns="http://www.w3.org/2000/svg"
@@ -2367,6 +2409,7 @@ exports[`NewVisModal should render as expected 1`] = `
                             class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                             focusable="false"
                             height="16"
+                            role="img"
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
@@ -2424,6 +2467,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                               class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                               focusable="false"
                                               height="16"
+                                              role="img"
                                               viewBox="0 0 16 16"
                                               width="16"
                                               xmlns="http://www.w3.org/2000/svg"
@@ -2464,6 +2508,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                               class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                               focusable="false"
                                               height="16"
+                                              role="img"
                                               viewBox="0 0 16 16"
                                               width="16"
                                               xmlns="http://www.w3.org/2000/svg"
@@ -2506,6 +2551,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                                   class="euiIcon euiIcon--medium euiIcon-isLoading euiBetaBadge__icon"
                                                   focusable="false"
                                                   height="16"
+                                                  role="img"
                                                   viewBox="0 0 16 16"
                                                   width="16"
                                                   xmlns="http://www.w3.org/2000/svg"
@@ -2521,6 +2567,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                               class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                               focusable="false"
                                               height="16"
+                                              role="img"
                                               viewBox="0 0 16 16"
                                               width="16"
                                               xmlns="http://www.w3.org/2000/svg"
@@ -2556,6 +2603,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                               class="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                               focusable="false"
                                               height="16"
+                                              role="img"
                                               viewBox="0 0 16 16"
                                               width="16"
                                               xmlns="http://www.w3.org/2000/svg"
@@ -2637,16 +2685,18 @@ exports[`NewVisModal should render as expected 1`] = `
                         type="cross"
                       >
                         <EuiIconEmpty
-                          aria-hidden="true"
+                          aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
+                          role="img"
                           style={null}
                         >
                           <svg
-                            aria-hidden="true"
+                            aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                             focusable="false"
                             height={16}
+                            role="img"
                             style={null}
                             viewBox="0 0 16 16"
                             width={16}
@@ -2773,16 +2823,18 @@ exports[`NewVisModal should render as expected 1`] = `
                                                         type="search"
                                                       >
                                                         <EuiIconEmpty
-                                                          aria-hidden="true"
+                                                          aria-hidden={true}
                                                           className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                           focusable="false"
+                                                          role="img"
                                                           style={null}
                                                         >
                                                           <svg
-                                                            aria-hidden="true"
+                                                            aria-hidden={true}
                                                             className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                             focusable="false"
                                                             height={16}
+                                                            role="img"
                                                             style={null}
                                                             viewBox="0 0 16 16"
                                                             width={16}
@@ -2871,16 +2923,18 @@ exports[`NewVisModal should render as expected 1`] = `
                                                       type="empty"
                                                     >
                                                       <EuiIconEmpty
-                                                        aria-hidden="true"
+                                                        aria-hidden={true}
                                                         className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                         focusable="false"
+                                                        role="img"
                                                         style={null}
                                                       >
                                                         <svg
-                                                          aria-hidden="true"
+                                                          aria-hidden={true}
                                                           className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                           focusable="false"
                                                           height={16}
+                                                          role="img"
                                                           style={null}
                                                           viewBox="0 0 16 16"
                                                           width={16}
@@ -2976,16 +3030,18 @@ exports[`NewVisModal should render as expected 1`] = `
                                                             type="popout"
                                                           >
                                                             <EuiIconEmpty
-                                                              aria-hidden="true"
+                                                              aria-hidden={true}
                                                               className="euiIcon euiIcon--medium euiIcon-isLoading euiBetaBadge__icon"
                                                               focusable="false"
+                                                              role="img"
                                                               style={null}
                                                             >
                                                               <svg
-                                                                aria-hidden="true"
+                                                                aria-hidden={true}
                                                                 className="euiIcon euiIcon--medium euiIcon-isLoading euiBetaBadge__icon"
                                                                 focusable="false"
                                                                 height={16}
+                                                                role="img"
                                                                 style={null}
                                                                 viewBox="0 0 16 16"
                                                                 width={16}
@@ -3009,16 +3065,18 @@ exports[`NewVisModal should render as expected 1`] = `
                                                       type="empty"
                                                     >
                                                       <EuiIconEmpty
-                                                        aria-hidden="true"
+                                                        aria-hidden={true}
                                                         className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                         focusable="false"
+                                                        role="img"
                                                         style={null}
                                                       >
                                                         <svg
-                                                          aria-hidden="true"
+                                                          aria-hidden={true}
                                                           className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                           focusable="false"
                                                           height={16}
+                                                          role="img"
                                                           style={null}
                                                           viewBox="0 0 16 16"
                                                           width={16}
@@ -3089,16 +3147,18 @@ exports[`NewVisModal should render as expected 1`] = `
                                                       type="empty"
                                                     >
                                                       <EuiIconEmpty
-                                                        aria-hidden="true"
+                                                        aria-hidden={true}
                                                         className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                         focusable="false"
+                                                        role="img"
                                                         style={null}
                                                       >
                                                         <svg
-                                                          aria-hidden="true"
+                                                          aria-hidden={true}
                                                           className="euiIcon euiIcon--large euiIcon--secondary euiIcon-isLoading"
                                                           focusable="false"
                                                           height={16}
+                                                          role="img"
                                                           style={null}
                                                           viewBox="0 0 16 16"
                                                           width={16}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/_dialog.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/_dialog.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/_dialog.scss
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/_dialog.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/_index.scss
new file mode 100644
index 0000000000000..a10b4b1b347b7
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/_index.scss
@@ -0,0 +1 @@
+@import 'dialog';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/index.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/index.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.test.tsx
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.test.tsx
index 8e4d50d27a453..2005133e6d03e 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.test.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.test.tsx
@@ -20,11 +20,10 @@
 import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
-import { VisType } from '../legacy_imports';
-import { TypesStart } from '../../../../visualizations/public/np_ready/public/types';
+import { VisType } from '../../legacy_imports';
+import { TypesStart } from '../../../../../visualizations/public/np_ready/public/types';
 
-jest.mock('ui/new_platform');
-jest.mock('../legacy_imports', () => ({
+jest.mock('../../legacy_imports', () => ({
   State: () => null,
   AppState: () => null,
 }));
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.tsx
similarity index 86%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.tsx
index e84797302589d..9e8f46407f591 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/new_vis_modal.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/new_vis_modal.tsx
@@ -22,13 +22,17 @@ import React from 'react';
 import { EuiModal, EuiOverlayMask } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
+import { METRIC_TYPE, UiStatsMetricType } from '@kbn/analytics';
 import { IUiSettingsClient, SavedObjectsStart } from 'kibana/public';
-import { VisType } from '../legacy_imports';
+import { VisType } from '../../legacy_imports';
 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 {
+  TypesStart,
+  VisTypeAlias,
+} from '../../../../../visualizations/public/np_ready/public/types';
+import { UsageCollectionSetup } from '../../../../../../../plugins/usage_collection/public';
 
 interface TypeSelectionProps {
   isOpen: boolean;
@@ -38,6 +42,7 @@ interface TypeSelectionProps {
   addBasePath: (path: string) => string;
   uiSettings: IUiSettingsClient;
   savedObjects: SavedObjectsStart;
+  usageCollection?: UsageCollectionSetup;
 }
 
 interface TypeSelectionState {
@@ -53,7 +58,9 @@ class NewVisModal extends React.Component<TypeSelectionProps, TypeSelectionState
   };
 
   private readonly isLabsEnabled: boolean;
-  private readonly trackUiMetric: ReturnType<typeof createUiStatsReporter>;
+  private readonly trackUiMetric:
+    | ((type: UiStatsMetricType, eventNames: string | string[], count?: number) => void)
+    | undefined;
 
   constructor(props: TypeSelectionProps) {
     super(props);
@@ -63,7 +70,10 @@ class NewVisModal extends React.Component<TypeSelectionProps, TypeSelectionState
       showSearchVisModal: false,
     };
 
-    this.trackUiMetric = createUiStatsReporter('visualize');
+    this.trackUiMetric = this.props.usageCollection?.reportUiStats.bind(
+      this.props.usageCollection,
+      'visualize'
+    );
   }
 
   public render() {
@@ -129,7 +139,9 @@ class NewVisModal extends React.Component<TypeSelectionProps, TypeSelectionState
   };
 
   private redirectToVis(visType: VisType | VisTypeAlias, searchType?: string, searchId?: string) {
-    this.trackUiMetric(METRIC_TYPE.CLICK, visType.name);
+    if (this.trackUiMetric) {
+      this.trackUiMetric(METRIC_TYPE.CLICK, visType.name);
+    }
 
     if ('aliasUrl' in visType) {
       window.location.assign(this.props.addBasePath(visType.aliasUrl));
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/index.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/search_selection/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/index.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/search_selection/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/search_selection.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/search_selection/search_selection.tsx
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/search_selection.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/search_selection/search_selection.tsx
index 6088b68c7fbd7..5cab85c11c3c7 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/search_selection.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/search_selection/search_selection.tsx
@@ -23,8 +23,8 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 import { IUiSettingsClient, SavedObjectsStart } from 'kibana/public';
 
-import { SavedObjectFinderUi } from '../../../../../../../plugins/kibana_react/public';
-import { VisType } from '../../legacy_imports';
+import { SavedObjectFinderUi } from '../../../../../../../../plugins/kibana_react/public';
+import { VisType } from '../../../legacy_imports';
 
 interface SearchSelectionProps {
   onSearchSelected: (searchId: string, searchType: string) => void;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/show_new_vis.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/show_new_vis.tsx
similarity index 86%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/show_new_vis.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/show_new_vis.tsx
index 88838e16c40e2..567b7e861ad8e 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/show_new_vis.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/show_new_vis.tsx
@@ -23,7 +23,8 @@ import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n/react';
 import { IUiSettingsClient, SavedObjectsStart } from 'kibana/public';
 import { NewVisModal } from './new_vis_modal';
-import { TypesStart } from '../../../../visualizations/public/np_ready/public/types';
+import { TypesStart } from '../../../../../visualizations/public/np_ready/public/types';
+import { UsageCollectionSetup } from '../../../../../../../plugins/usage_collection/public';
 
 interface ShowNewVisModalParams {
   editorParams?: string[];
@@ -34,7 +35,8 @@ export function showNewVisModal(
   { editorParams = [] }: ShowNewVisModalParams = {},
   addBasePath: (path: string) => string,
   uiSettings: IUiSettingsClient,
-  savedObjects: SavedObjectsStart
+  savedObjects: SavedObjectsStart,
+  usageCollection?: UsageCollectionSetup
 ) {
   const container = document.createElement('div');
   const onClose = () => {
@@ -53,6 +55,7 @@ export function showNewVisModal(
         addBasePath={addBasePath}
         uiSettings={uiSettings}
         savedObjects={savedObjects}
+        usageCollection={usageCollection}
       />
     </I18nProvider>
   );
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/index.ts b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/index.ts
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/index.ts
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/np_ready/wizard/type_selection/new_vis_help.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.test.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/new_vis_help.test.tsx
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/np_ready/wizard/type_selection/new_vis_help.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/new_vis_help.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/new_vis_help.tsx
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/type_selection.tsx
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/type_selection.tsx
index 38cd7fbe315ad..28cafde45a714 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/type_selection.tsx
+++ b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/type_selection.tsx
@@ -34,13 +34,13 @@ import {
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
-import { VisType } from '../../legacy_imports';
-import { memoizeLast } from '../../../../../visualizations/public/np_ready/public/legacy/memoize';
-import { VisTypeAlias } from '../../../../../visualizations/public';
+import { VisType } from '../../../legacy_imports';
+import { memoizeLast } from '../../../../../../visualizations/public/np_ready/public/legacy/memoize';
+import { VisTypeAlias } from '../../../../../../visualizations/public';
 import { NewVisHelp } from './new_vis_help';
 import { VisHelpText } from './vis_help_text';
 import { VisTypeIcon } from './vis_type_icon';
-import { TypesStart } from '../../../../../visualizations/public/np_ready/public/types';
+import { TypesStart } from '../../../../../../visualizations/public/np_ready/public/types';
 
 export interface VisTypeListEntry extends VisType {
   highlighted: boolean;
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/vis_help_text.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/vis_help_text.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/vis_help_text.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/vis_help_text.tsx
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/vis_type_icon.tsx b/src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/vis_type_icon.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/wizard/type_selection/vis_type_icon.tsx
rename to src/legacy/core_plugins/kibana/public/visualize/np_ready/wizard/type_selection/vis_type_icon.tsx
diff --git a/src/legacy/core_plugins/kibana/public/visualize/plugin.ts b/src/legacy/core_plugins/kibana/public/visualize/plugin.ts
index 9dff936761a4b..9ea26f129895c 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/plugin.ts
@@ -34,22 +34,24 @@ import { NavigationPublicPluginStart as NavigationStart } from '../../../../../p
 import { SharePluginStart } from '../../../../../plugins/share/public';
 import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
 import { VisualizationsStart } from '../../../visualizations/public';
-import { VisualizeEmbeddableFactory } from './embeddable/visualize_embeddable_factory';
-import { VISUALIZE_EMBEDDABLE_TYPE } from './embeddable/constants';
-import { VisualizeConstants } from './visualize_constants';
+import { VisualizeConstants } from './np_ready/visualize_constants';
 import { setServices, VisualizeKibanaServices } from './kibana_services';
 import {
   FeatureCatalogueCategory,
   HomePublicPluginSetup,
 } from '../../../../../plugins/home/public';
-import { defaultEditor, VisEditorTypesRegistryProvider } from './legacy_imports';
-import { SavedVisualizations } from './types';
+import {
+  defaultEditor,
+  VisEditorTypesRegistryProvider,
+  VisualizeEmbeddableFactory,
+  VISUALIZE_EMBEDDABLE_TYPE,
+} from './legacy_imports';
+import { UsageCollectionSetup } from '../../../../../plugins/usage_collection/public';
+import { createSavedVisLoader } from './saved_visualizations/saved_visualizations';
 
 export interface LegacyAngularInjectedDependencies {
   legacyChrome: any;
   editorTypes: any;
-  savedObjectRegistry: any;
-  savedVisualizations: SavedVisualizations;
 }
 
 export interface VisualizePluginStartDependencies {
@@ -66,6 +68,7 @@ export interface VisualizePluginSetupDependencies {
   };
   home: HomePublicPluginSetup;
   kibana_legacy: KibanaLegacySetup;
+  usageCollection?: UsageCollectionSetup;
 }
 
 export class VisualizePlugin implements Plugin {
@@ -80,7 +83,12 @@ export class VisualizePlugin implements Plugin {
 
   public async setup(
     core: CoreSetup,
-    { home, kibana_legacy, __LEGACY: { getAngularDependencies } }: VisualizePluginSetupDependencies
+    {
+      home,
+      kibana_legacy,
+      __LEGACY: { getAngularDependencies },
+      usageCollection,
+    }: VisualizePluginSetupDependencies
   ) {
     kibana_legacy.registerLegacyApp({
       id: 'visualize',
@@ -100,6 +108,12 @@ export class VisualizePlugin implements Plugin {
         } = this.startDependencies;
 
         const angularDependencies = await getAngularDependencies();
+        const savedVisualizations = createSavedVisLoader({
+          savedObjectsClient,
+          indexPatterns: data.indexPatterns,
+          chrome: contextCore.chrome,
+          overlays: contextCore.overlays,
+        });
         const deps: VisualizeKibanaServices = {
           ...angularDependencies,
           addBasePath: contextCore.http.basePath.prepend,
@@ -112,16 +126,18 @@ export class VisualizePlugin implements Plugin {
           localStorage: new Storage(localStorage),
           navigation,
           savedObjectsClient,
+          savedVisualizations,
           savedQueryService: data.query.savedQueries,
           share,
           toastNotifications: contextCore.notifications.toasts,
           uiSettings: contextCore.uiSettings,
           visualizeCapabilities: contextCore.application.capabilities.visualize,
           visualizations,
+          usageCollection,
         };
         setServices(deps);
 
-        const { renderApp } = await import('./application');
+        const { renderApp } = await import('./np_ready/application');
         return renderApp(params.element, params.appBasePath, deps);
       },
     });
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
deleted file mode 100644
index fd643115e9084..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * @name SavedVis
- *
- * @extends SavedObject.
- *
- * NOTE: It's a type of SavedObject, but specific to visualizations.
- */
-
-import { Vis } from 'ui/vis';
-import { uiModules } from 'ui/modules';
-import { updateOldState } from '../../../../visualizations/public';
-import { VisualizeConstants } from '../visualize_constants';
-import { createLegacyClass } from 'ui/utils/legacy_class';
-import { SavedObjectProvider } from 'ui/saved_objects/saved_object';
-import { extractReferences, injectReferences } from './saved_visualization_references';
-
-uiModules.get('app/visualize').factory('SavedVis', function(savedSearches, Private) {
-  const SavedObject = Private(SavedObjectProvider);
-  createLegacyClass(SavedVis).inherits(SavedObject);
-  function SavedVis(opts) {
-    const self = this;
-    opts = opts || {};
-    if (typeof opts !== 'object') opts = { id: opts };
-
-    SavedVis.Super.call(self, {
-      type: SavedVis.type,
-      mapping: SavedVis.mapping,
-      searchSource: SavedVis.searchSource,
-      extractReferences: extractReferences,
-      injectReferences: injectReferences,
-
-      id: opts.id,
-      indexPattern: opts.indexPattern,
-      defaults: {
-        title: '',
-        visState: (function() {
-          if (!opts.type) return null;
-          const def = {};
-          def.type = opts.type;
-          return def;
-        })(),
-        uiStateJSON: '{}',
-        description: '',
-        savedSearchId: opts.savedSearchId,
-        version: 1,
-      },
-
-      afterESResp: this._afterEsResp,
-    });
-
-    this.showInRecentlyAccessed = true;
-  }
-
-  SavedVis.type = 'visualization';
-
-  SavedVis.mapping = {
-    title: 'text',
-    visState: 'json',
-    uiStateJSON: 'text',
-    description: 'text',
-    savedSearchId: 'keyword',
-    version: 'integer',
-  };
-
-  // Order these fields to the top, the rest are alphabetical
-  SavedVis.fieldOrder = ['title', 'description'];
-
-  SavedVis.searchSource = true;
-
-  SavedVis.prototype.getFullPath = function() {
-    return `/app/kibana#${VisualizeConstants.EDIT_PATH}/${this.id}`;
-  };
-
-  SavedVis.prototype._afterEsResp = async function() {
-    const self = this;
-
-    await self._getLinkedSavedSearch();
-    self.searchSource.setField('size', 0);
-    return self.vis ? self._updateVis() : self._createVis();
-  };
-
-  SavedVis.prototype._getLinkedSavedSearch = async function() {
-    const self = this;
-    const linkedSearch = !!self.savedSearchId;
-    const current = self.savedSearch;
-
-    if (linkedSearch && current && current.id === self.savedSearchId) {
-      return;
-    }
-
-    if (self.savedSearch) {
-      self.searchSource.setParent(self.savedSearch.searchSource.getParent());
-      self.savedSearch.destroy();
-      self.savedSearch = null;
-    }
-
-    if (linkedSearch) {
-      self.savedSearch = await savedSearches.get(self.savedSearchId);
-      self.searchSource.setParent(self.savedSearch.searchSource);
-    }
-  };
-
-  SavedVis.prototype._createVis = function() {
-    const self = this;
-
-    self.visState = updateOldState(self.visState);
-
-    // visState doesn't yet exist when importing a visualization, so we can't
-    // assume that exists at this point. If it does exist, then we're not
-    // importing a visualization, so we want to sync the title.
-    if (self.visState) {
-      self.visState.title = self.title;
-    }
-    self.vis = new Vis(self.searchSource.getField('index'), self.visState);
-
-    self.vis.savedSearchId = self.savedSearchId;
-
-    return self.vis;
-  };
-
-  SavedVis.prototype._updateVis = function() {
-    const self = this;
-
-    self.vis.indexPattern = self.searchSource.getField('index');
-    self.visState.title = self.title;
-    self.vis.setState(self.visState);
-    self.vis.savedSearchId = self.savedSearchId;
-  };
-
-  return SavedVis;
-});
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.ts b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.ts
new file mode 100644
index 0000000000000..9f7ba342d803f
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.ts
@@ -0,0 +1,146 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * @name SavedVis
+ *
+ * @extends SavedObject.
+ *
+ * NOTE: It's a type of SavedObject, but specific to visualizations.
+ */
+// @ts-ignore
+import { Vis } from 'ui/vis';
+import { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
+import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+import { updateOldState } from '../../../../visualizations/public';
+import { extractReferences, injectReferences } from './saved_visualization_references';
+import { IIndexPattern } from '../../../../../../plugins/data/public';
+import { VisSavedObject } from '../legacy_imports';
+
+import { createSavedSearchesService } from '../../discover';
+import { VisualizeConstants } from '..';
+
+async function _afterEsResp(savedVis: VisSavedObject, services: any) {
+  await _getLinkedSavedSearch(savedVis, services);
+  savedVis.searchSource!.setField('size', 0);
+  savedVis.vis = savedVis.vis ? _updateVis(savedVis) : await _createVis(savedVis);
+  return savedVis;
+}
+
+async function _getLinkedSavedSearch(savedVis: VisSavedObject, services: any) {
+  const linkedSearch = !!savedVis.savedSearchId;
+  const current = savedVis.savedSearch;
+
+  if (linkedSearch && current && current.id === savedVis.savedSearchId) {
+    return;
+  }
+
+  if (savedVis.savedSearch) {
+    savedVis.searchSource!.setParent(savedVis.savedSearch.searchSource.getParent());
+    savedVis.savedSearch.destroy();
+    delete savedVis.savedSearch;
+  }
+  const savedSearches = createSavedSearchesService(services);
+
+  if (linkedSearch) {
+    savedVis.savedSearch = await savedSearches.get(savedVis.savedSearchId!);
+    savedVis.searchSource!.setParent(savedVis.savedSearch!.searchSource);
+  }
+}
+
+async function _createVis(savedVis: VisSavedObject) {
+  savedVis.visState = updateOldState(savedVis.visState);
+
+  // visState doesn't yet exist when importing a visualization, so we can't
+  // assume that exists at this point. If it does exist, then we're not
+  // importing a visualization, so we want to sync the title.
+  if (savedVis.visState) {
+    savedVis.visState.title = savedVis.title;
+  }
+  // the typescript compiler is wrong here, will be right when vis.js -> vis.ts
+  // @ts-ignore
+  savedVis.vis = new Vis(savedVis.searchSource!.getField('index'), savedVis.visState);
+
+  savedVis.vis!.savedSearchId = savedVis.savedSearchId;
+
+  return savedVis.vis;
+}
+
+function _updateVis(savedVis: VisSavedObject) {
+  if (savedVis.vis && savedVis.searchSource) {
+    savedVis.vis.indexPattern = savedVis.searchSource.getField('index');
+    savedVis.visState.title = savedVis.title;
+    savedVis.vis.setState(savedVis.visState);
+    savedVis.vis.savedSearchId = savedVis.savedSearchId;
+  }
+  return savedVis.vis;
+}
+
+export function createSavedVisClass(services: SavedObjectKibanaServices) {
+  const SavedObjectClass = createSavedObjectClass(services);
+
+  class SavedVis extends SavedObjectClass {
+    public static type: string = 'visualization';
+    public static mapping: Record<string, string> = {
+      title: 'text',
+      visState: 'json',
+      uiStateJSON: 'text',
+      description: 'text',
+      savedSearchId: 'keyword',
+      version: 'integer',
+    };
+    // Order these fields to the top, the rest are alphabetical
+    public static fieldOrder = ['title', 'description'];
+    public static searchSource = true;
+
+    constructor(opts: Record<string, unknown> | string = {}) {
+      if (typeof opts !== 'object') {
+        opts = { id: opts };
+      }
+      const visState = !opts.type ? null : { type: opts.type };
+      // Gives our SavedWorkspace the properties of a SavedObject
+      super({
+        type: SavedVis.type,
+        mapping: SavedVis.mapping,
+        searchSource: SavedVis.searchSource,
+        extractReferences,
+        injectReferences,
+        id: (opts.id as string) || '',
+        indexPattern: opts.indexPattern as IIndexPattern,
+        defaults: {
+          title: '',
+          visState,
+          uiStateJSON: '{}',
+          description: '',
+          savedSearchId: opts.savedSearchId,
+          version: 1,
+        },
+        afterESResp: (savedObject: SavedObject) => {
+          return _afterEsResp(savedObject as VisSavedObject, services) as Promise<SavedObject>;
+        },
+      });
+      this.showInRecentlyAccessed = true;
+      this.getFullPath = () => {
+        return `/app/kibana#${VisualizeConstants.EDIT_PATH}/${this.id}`;
+      };
+    }
+  }
+
+  return SavedVis;
+}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/index.js b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/index.js
rename to src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.js b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.js
deleted file mode 100644
index 7f451076e239c..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.js
+++ /dev/null
@@ -1,87 +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 function extractReferences({ attributes, references = [] }) {
-  const updatedAttributes = { ...attributes };
-  const updatedReferences = [...references];
-
-  // Extract saved search
-  if (updatedAttributes.savedSearchId) {
-    updatedReferences.push({
-      name: 'search_0',
-      type: 'search',
-      id: updatedAttributes.savedSearchId,
-    });
-    delete updatedAttributes.savedSearchId;
-    updatedAttributes.savedSearchRefName = 'search_0';
-  }
-
-  // Extract index patterns from controls
-  if (updatedAttributes.visState) {
-    const visState = JSON.parse(updatedAttributes.visState);
-    const controls = (visState.params && visState.params.controls) || [];
-    controls.forEach((control, i) => {
-      if (!control.indexPattern) {
-        return;
-      }
-      control.indexPatternRefName = `control_${i}_index_pattern`;
-      updatedReferences.push({
-        name: control.indexPatternRefName,
-        type: 'index-pattern',
-        id: control.indexPattern,
-      });
-      delete control.indexPattern;
-    });
-    updatedAttributes.visState = JSON.stringify(visState);
-  }
-
-  return {
-    references: updatedReferences,
-    attributes: updatedAttributes,
-  };
-}
-
-export function injectReferences(savedObject, references) {
-  if (savedObject.savedSearchRefName) {
-    const savedSearchReference = references.find(
-      reference => reference.name === savedObject.savedSearchRefName
-    );
-    if (!savedSearchReference) {
-      throw new Error(`Could not find saved search reference "${savedObject.savedSearchRefName}"`);
-    }
-    savedObject.savedSearchId = savedSearchReference.id;
-    delete savedObject.savedSearchRefName;
-  }
-  if (savedObject.visState) {
-    const controls = (savedObject.visState.params && savedObject.visState.params.controls) || [];
-    controls.forEach(control => {
-      if (!control.indexPatternRefName) {
-        return;
-      }
-      const reference = references.find(
-        reference => reference.name === control.indexPatternRefName
-      );
-      if (!reference) {
-        throw new Error(`Could not find index pattern reference "${control.indexPatternRefName}"`);
-      }
-      control.indexPattern = reference.id;
-      delete control.indexPatternRefName;
-    });
-  }
-}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.test.js b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.test.js
deleted file mode 100644
index cdc232b06cf51..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.test.js
+++ /dev/null
@@ -1,205 +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 { extractReferences, injectReferences } from './saved_visualization_references';
-
-describe('extractReferences', () => {
-  test('extracts nothing if savedSearchId is empty', () => {
-    const doc = {
-      id: '1',
-      attributes: {
-        foo: true,
-      },
-    };
-    const updatedDoc = extractReferences(doc);
-    expect(updatedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-  },
-  "references": Array [],
-}
-`);
-  });
-
-  test('extracts references from savedSearchId', () => {
-    const doc = {
-      id: '1',
-      attributes: {
-        foo: true,
-        savedSearchId: '123',
-      },
-    };
-    const updatedDoc = extractReferences(doc);
-    expect(updatedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "savedSearchRefName": "search_0",
-  },
-  "references": Array [
-    Object {
-      "id": "123",
-      "name": "search_0",
-      "type": "search",
-    },
-  ],
-}
-`);
-  });
-
-  test('extracts references from controls', () => {
-    const doc = {
-      id: '1',
-      attributes: {
-        foo: true,
-        visState: JSON.stringify({
-          params: {
-            controls: [
-              {
-                bar: true,
-                indexPattern: 'pattern*',
-              },
-              {
-                bar: false,
-              },
-            ],
-          },
-        }),
-      },
-    };
-    const updatedDoc = extractReferences(doc);
-
-    expect(updatedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "visState": "{\\"params\\":{\\"controls\\":[{\\"bar\\":true,\\"indexPatternRefName\\":\\"control_0_index_pattern\\"},{\\"bar\\":false}]}}",
-  },
-  "references": Array [
-    Object {
-      "id": "pattern*",
-      "name": "control_0_index_pattern",
-      "type": "index-pattern",
-    },
-  ],
-}
-`);
-  });
-});
-
-describe('injectReferences', () => {
-  test('injects nothing when savedSearchRefName is null', () => {
-    const context = {
-      id: '1',
-      foo: true,
-    };
-    injectReferences(context, []);
-    expect(context).toMatchInlineSnapshot(`
-Object {
-  "foo": true,
-  "id": "1",
-}
-`);
-  });
-
-  test('injects references into context', () => {
-    const context = {
-      id: '1',
-      foo: true,
-      savedSearchRefName: 'search_0',
-      visState: {
-        params: {
-          controls: [
-            {
-              foo: true,
-              indexPatternRefName: 'control_0_index_pattern',
-            },
-            {
-              foo: false,
-            },
-          ],
-        },
-      },
-    };
-    const references = [
-      {
-        name: 'search_0',
-        type: 'search',
-        id: '123',
-      },
-      {
-        name: 'control_0_index_pattern',
-        type: 'index-pattern',
-        id: 'pattern*',
-      },
-    ];
-    injectReferences(context, references);
-    expect(context).toMatchInlineSnapshot(`
-Object {
-  "foo": true,
-  "id": "1",
-  "savedSearchId": "123",
-  "visState": Object {
-    "params": Object {
-      "controls": Array [
-        Object {
-          "foo": true,
-          "indexPattern": "pattern*",
-        },
-        Object {
-          "foo": false,
-        },
-      ],
-    },
-  },
-}
-`);
-  });
-
-  test(`fails when it can't find the saved search reference in the array`, () => {
-    const context = {
-      id: '1',
-      foo: true,
-      savedSearchRefName: 'search_0',
-    };
-    expect(() => injectReferences(context, [])).toThrowErrorMatchingInlineSnapshot(
-      `"Could not find saved search reference \\"search_0\\""`
-    );
-  });
-
-  test(`fails when it can't find the index pattern reference in the array`, () => {
-    const context = {
-      id: '1',
-      visState: {
-        params: {
-          controls: [
-            {
-              foo: true,
-              indexPatternRefName: 'control_0_index_pattern',
-            },
-          ],
-        },
-      },
-    };
-    expect(() => injectReferences(context, [])).toThrowErrorMatchingInlineSnapshot(
-      `"Could not find index pattern reference \\"control_0_index_pattern\\""`
-    );
-  });
-});
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.test.ts b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.test.ts
new file mode 100644
index 0000000000000..b71a10ab000d8
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.test.ts
@@ -0,0 +1,210 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { extractReferences, injectReferences } from './saved_visualization_references';
+import { VisSavedObject } from '../../visualize_embeddable/visualize_embeddable';
+
+describe('extractReferences', () => {
+  test('extracts nothing if savedSearchId is empty', () => {
+    const doc = {
+      id: '1',
+      attributes: {
+        foo: true,
+      },
+      references: [],
+    };
+    const updatedDoc = extractReferences(doc);
+    expect(updatedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+  },
+  "references": Array [],
+}
+`);
+  });
+
+  test('extracts references from savedSearchId', () => {
+    const doc = {
+      id: '1',
+      attributes: {
+        foo: true,
+        savedSearchId: '123',
+      },
+      references: [],
+    };
+    const updatedDoc = extractReferences(doc);
+    expect(updatedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "savedSearchRefName": "search_0",
+  },
+  "references": Array [
+    Object {
+      "id": "123",
+      "name": "search_0",
+      "type": "search",
+    },
+  ],
+}
+`);
+  });
+
+  test('extracts references from controls', () => {
+    const doc = {
+      id: '1',
+      attributes: {
+        foo: true,
+        visState: JSON.stringify({
+          params: {
+            controls: [
+              {
+                bar: true,
+                indexPattern: 'pattern*',
+              },
+              {
+                bar: false,
+              },
+            ],
+          },
+        }),
+      },
+      references: [],
+    };
+    const updatedDoc = extractReferences(doc);
+
+    expect(updatedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "visState": "{\\"params\\":{\\"controls\\":[{\\"bar\\":true,\\"indexPatternRefName\\":\\"control_0_index_pattern\\"},{\\"bar\\":false}]}}",
+  },
+  "references": Array [
+    Object {
+      "id": "pattern*",
+      "name": "control_0_index_pattern",
+      "type": "index-pattern",
+    },
+  ],
+}
+`);
+  });
+});
+
+describe('injectReferences', () => {
+  test('injects nothing when savedSearchRefName is null', () => {
+    const context = {
+      id: '1',
+      title: 'test',
+    } as VisSavedObject;
+    injectReferences(context, []);
+    expect(context).toMatchInlineSnapshot(`
+Object {
+  "id": "1",
+  "title": "test",
+}
+`);
+  });
+
+  test('injects references into context', () => {
+    const context = {
+      id: '1',
+      title: 'test',
+      savedSearchRefName: 'search_0',
+      visState: {
+        params: {
+          controls: [
+            {
+              foo: true,
+              indexPatternRefName: 'control_0_index_pattern',
+            },
+            {
+              foo: false,
+            },
+          ],
+        },
+      },
+    } as VisSavedObject;
+    const references = [
+      {
+        name: 'search_0',
+        type: 'search',
+        id: '123',
+      },
+      {
+        name: 'control_0_index_pattern',
+        type: 'index-pattern',
+        id: 'pattern*',
+      },
+    ];
+    injectReferences(context, references);
+    expect(context).toMatchInlineSnapshot(`
+Object {
+  "id": "1",
+  "savedSearchId": "123",
+  "title": "test",
+  "visState": Object {
+    "params": Object {
+      "controls": Array [
+        Object {
+          "foo": true,
+          "indexPattern": "pattern*",
+        },
+        Object {
+          "foo": false,
+        },
+      ],
+    },
+  },
+}
+`);
+  });
+
+  test(`fails when it can't find the saved search reference in the array`, () => {
+    const context = {
+      id: '1',
+      savedSearchRefName: 'search_0',
+      title: 'test',
+    } as VisSavedObject;
+    expect(() => injectReferences(context, [])).toThrowErrorMatchingInlineSnapshot(
+      `"Could not find saved search reference \\"search_0\\""`
+    );
+  });
+
+  test(`fails when it can't find the index pattern reference in the array`, () => {
+    const context = {
+      id: '1',
+      title: 'test',
+      visState: {
+        params: {
+          controls: [
+            {
+              foo: true,
+              indexPatternRefName: 'control_0_index_pattern',
+            },
+          ],
+        },
+      },
+    } as VisSavedObject;
+    expect(() => injectReferences(context, [])).toThrowErrorMatchingInlineSnapshot(
+      `"Could not find index pattern reference \\"control_0_index_pattern\\""`
+    );
+  });
+});
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.ts b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.ts
new file mode 100644
index 0000000000000..0c76aaff4345d
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_references.ts
@@ -0,0 +1,93 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { SavedObjectAttributes, SavedObjectReference } from 'kibana/server';
+import { VisSavedObject } from '../../visualize_embeddable/visualize_embeddable';
+
+export function extractReferences({
+  attributes,
+  references = [],
+}: {
+  attributes: SavedObjectAttributes;
+  references: SavedObjectReference[];
+}) {
+  const updatedAttributes = { ...attributes };
+  const updatedReferences = [...references];
+
+  // Extract saved search
+  if (updatedAttributes.savedSearchId) {
+    updatedReferences.push({
+      name: 'search_0',
+      type: 'search',
+      id: String(updatedAttributes.savedSearchId),
+    });
+    delete updatedAttributes.savedSearchId;
+    updatedAttributes.savedSearchRefName = 'search_0';
+  }
+
+  // Extract index patterns from controls
+  if (updatedAttributes.visState) {
+    const visState = JSON.parse(String(updatedAttributes.visState));
+    const controls = (visState.params && visState.params.controls) || [];
+    controls.forEach((control: Record<string, string>, i: number) => {
+      if (!control.indexPattern) {
+        return;
+      }
+      control.indexPatternRefName = `control_${i}_index_pattern`;
+      updatedReferences.push({
+        name: control.indexPatternRefName,
+        type: 'index-pattern',
+        id: control.indexPattern,
+      });
+      delete control.indexPattern;
+    });
+    updatedAttributes.visState = JSON.stringify(visState);
+  }
+
+  return {
+    references: updatedReferences,
+    attributes: updatedAttributes,
+  };
+}
+
+export function injectReferences(savedObject: VisSavedObject, references: SavedObjectReference[]) {
+  if (savedObject.savedSearchRefName) {
+    const savedSearchReference = references.find(
+      reference => reference.name === savedObject.savedSearchRefName
+    );
+    if (!savedSearchReference) {
+      throw new Error(`Could not find saved search reference "${savedObject.savedSearchRefName}"`);
+    }
+    savedObject.savedSearchId = savedSearchReference.id;
+    delete savedObject.savedSearchRefName;
+  }
+  if (savedObject.visState) {
+    const controls = (savedObject.visState.params && savedObject.visState.params.controls) || [];
+    controls.forEach((control: Record<string, string>) => {
+      if (!control.indexPatternRefName) {
+        return;
+      }
+      const reference = references.find(ref => ref.name === control.indexPatternRefName);
+      if (!reference) {
+        throw new Error(`Could not find index pattern reference "${control.indexPatternRefName}"`);
+      }
+      control.indexPattern = reference.id;
+      delete control.indexPatternRefName;
+    });
+  }
+}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.js b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.js
deleted file mode 100644
index c50cda56c7151..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.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.
- */
-
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
-import './saved_visualizations';
-
-SavedObjectRegistryProvider.register(savedVisualizations => {
-  return savedVisualizations;
-});
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.ts b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.ts
new file mode 100644
index 0000000000000..cbf72339804ce
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.ts
@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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';
+// @ts-ignore
+import { uiModules } from 'ui/modules';
+// @ts-ignore
+import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
+import './saved_visualizations';
+import { createSavedVisLoader } from './saved_visualizations';
+
+const services = {
+  savedObjectsClient: npStart.core.savedObjects.client,
+  indexPatterns: npStart.plugins.data.indexPatterns,
+  chrome: npStart.core.chrome,
+  overlays: npStart.core.overlays,
+};
+
+const savedObjectLoaderVisualize = createSavedVisLoader(services);
+
+// Register this service with the saved object registry so it can be
+// edited by the object editor.
+savedObjectManagementRegistry.register({
+  service: 'savedVisualizations',
+  title: 'visualizations',
+});
+
+uiModules.get('app/visualize').service('savedVisualizations', () => savedObjectLoaderVisualize);
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
deleted file mode 100644
index 784f45436e3a3..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.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 './_saved_vis';
-import { uiModules } from 'ui/modules';
-import { SavedObjectLoader, SavedObjectsClientProvider } from 'ui/saved_objects';
-import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
-import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy';
-import { createVisualizeEditUrl } from '../visualize_constants';
-import { findListItems } from './find_list_items';
-import { npStart } from '../../../../../ui/public/new_platform';
-
-const app = uiModules.get('app/visualize');
-
-// Register this service with the saved object registry so it can be
-// edited by the object editor.
-savedObjectManagementRegistry.register({
-  service: 'savedVisualizations',
-  title: 'visualizations',
-});
-
-app.service('savedVisualizations', function(SavedVis, Private) {
-  const visTypes = visualizations.types;
-  const savedObjectClient = Private(SavedObjectsClientProvider);
-  const saveVisualizationLoader = new SavedObjectLoader(
-    SavedVis,
-    savedObjectClient,
-    npStart.core.chrome
-  );
-
-  saveVisualizationLoader.mapHitSource = function(source, id) {
-    source.id = id;
-    source.url = this.urlFor(id);
-
-    let typeName = source.typeName;
-    if (source.visState) {
-      try {
-        typeName = JSON.parse(source.visState).type;
-      } catch (e) {
-        /* missing typename handled below */
-      } // eslint-disable-line no-empty
-    }
-
-    if (!typeName || !visTypes.get(typeName)) {
-      source.error = 'Unknown visualization type';
-      return source;
-    }
-
-    source.type = visTypes.get(typeName);
-    source.savedObjectType = 'visualization';
-    source.icon = source.type.icon;
-    source.image = source.type.image;
-    source.typeTitle = source.type.title;
-    source.editUrl = `#${createVisualizeEditUrl(id)}`;
-
-    return source;
-  };
-
-  saveVisualizationLoader.urlFor = function(id) {
-    return `#/visualize/edit/${encodeURIComponent(id)}`;
-  };
-
-  // This behaves similarly to find, except it returns visualizations that are
-  // defined as appExtensions and which may not conform to type: visualization
-  saveVisualizationLoader.findListItems = function(search = '', size = 100) {
-    return findListItems({
-      search,
-      size,
-      mapSavedObjectApiHits: this.mapSavedObjectApiHits.bind(this),
-      savedObjectsClient: this.savedObjectsClient,
-      visTypes: visualizations.types.getAliases(),
-    });
-  };
-
-  return saveVisualizationLoader;
-});
diff --git a/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.ts b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.ts
new file mode 100644
index 0000000000000..c19c7818c1fbd
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.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 { SavedObjectLoader } from 'ui/saved_objects';
+import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
+
+import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy';
+// @ts-ignore
+import { findListItems } from './find_list_items';
+import { createSavedVisClass } from './_saved_vis';
+import { createVisualizeEditUrl } from '..';
+
+export function createSavedVisLoader(services: SavedObjectKibanaServices) {
+  const { savedObjectsClient } = services;
+
+  class SavedObjectLoaderVisualize extends SavedObjectLoader {
+    mapHitSource = (source: Record<string, any>, id: string) => {
+      const visTypes = visualizations.types;
+      source.id = id;
+      source.url = this.urlFor(id);
+
+      let typeName = source.typeName;
+      if (source.visState) {
+        try {
+          typeName = JSON.parse(String(source.visState)).type;
+        } catch (e) {
+          /* missing typename handled below */
+        } // eslint-disable-line no-empty
+      }
+
+      if (!typeName || !visTypes.get(typeName)) {
+        source.error = 'Unknown visualization type';
+        return source;
+      }
+
+      source.type = visTypes.get(typeName);
+      source.savedObjectType = 'visualization';
+      source.icon = source.type.icon;
+      source.image = source.type.image;
+      source.typeTitle = source.type.title;
+      source.editUrl = `#${createVisualizeEditUrl(id)}`;
+
+      return source;
+    };
+    urlFor(id: string) {
+      return `#/visualize/edit/${encodeURIComponent(id)}`;
+    }
+    // This behaves similarly to find, except it returns visualizations that are
+    // defined as appExtensions and which may not conform to type: visualization
+    findListItems(search: string = '', size: number = 100) {
+      return findListItems({
+        search,
+        size,
+        mapSavedObjectApiHits: this.mapSavedObjectApiHits.bind(this),
+        savedObjectsClient,
+        visTypes: visualizations.types.getAliases(),
+      });
+    }
+  }
+  const SavedVis = createSavedVisClass(services);
+  return new SavedObjectLoaderVisualize(SavedVis, savedObjectsClient, services.chrome);
+}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/types.d.ts b/src/legacy/core_plugins/kibana/public/visualize/types.d.ts
deleted file mode 100644
index b6a3981215384..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/types.d.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 { VisSavedObject } from './legacy_imports';
-
-export interface SavedVisualizations {
-  urlFor: (id: string) => string;
-  get: (id: string) => Promise<VisSavedObject>;
-}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/_index.scss b/src/legacy/core_plugins/kibana/public/visualize/wizard/_index.scss
deleted file mode 100644
index 328af16f3eebd..0000000000000
--- a/src/legacy/core_plugins/kibana/public/visualize/wizard/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './dialog';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/_embeddables.scss b/src/legacy/core_plugins/kibana/public/visualize_embeddable/_embeddables.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/_embeddables.scss
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/_embeddables.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize_embeddable/_index.scss b/src/legacy/core_plugins/kibana/public/visualize_embeddable/_index.scss
new file mode 100644
index 0000000000000..c1e3809657bfa
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize_embeddable/_index.scss
@@ -0,0 +1,2 @@
+@import 'visualize_lab_disabled';
+@import 'embeddables';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/_visualize_lab_disabled.scss b/src/legacy/core_plugins/kibana/public/visualize_embeddable/_visualize_lab_disabled.scss
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/_visualize_lab_disabled.scss
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/_visualize_lab_disabled.scss
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/constants.ts b/src/legacy/core_plugins/kibana/public/visualize_embeddable/constants.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/constants.ts
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/constants.ts
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
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_embeddable.tsx
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/disabled_lab_embeddable.tsx
index d8792a761b186..f9dfd5d2b98f4 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,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Embeddable, EmbeddableOutput } from '../../../../../../plugins/embeddable/public';
+import { Embeddable, EmbeddableOutput } from '../../../../../plugins/embeddable/public';
 
 import { DisabledLabVisualization } from './disabled_lab_visualization';
 import { VisualizeInput } from './visualize_embeddable';
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_visualization.tsx b/src/legacy/core_plugins/kibana/public/visualize_embeddable/disabled_lab_visualization.tsx
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/disabled_lab_visualization.tsx
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/disabled_lab_visualization.tsx
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
new file mode 100644
index 0000000000000..36efc4b86d0d3
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/visualize_embeddable/get_index_pattern.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 { npStart } from 'ui/new_platform';
+
+import { VisSavedObject } from './visualize_embeddable';
+import { indexPatterns, IIndexPattern } from '../../../../../plugins/data/public';
+
+export async function getIndexPattern(
+  savedVis: VisSavedObject
+): Promise<IIndexPattern | undefined> {
+  if (savedVis.vis.type.name !== 'metrics') {
+    return savedVis.vis.indexPattern;
+  }
+
+  const savedObjectsClient = npStart.core.savedObjects.client;
+  const defaultIndex = npStart.core.uiSettings.get('defaultIndex');
+
+  if (savedVis.vis.params.index_pattern) {
+    const indexPatternObjects = await savedObjectsClient.find({
+      type: 'index-pattern',
+      fields: ['title', 'fields'],
+      search: `"${savedVis.vis.params.index_pattern}"`,
+      searchFields: ['title'],
+    });
+    const [indexPattern] = indexPatternObjects.savedObjects.map(indexPatterns.getFromSavedObject);
+    return indexPattern;
+  }
+
+  const savedObject = await savedObjectsClient.get('index-pattern', defaultIndex);
+  return indexPatterns.getFromSavedObject(savedObject);
+}
diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/index.ts b/src/legacy/core_plugins/kibana/public/visualize_embeddable/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/index.ts
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/index.ts
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
similarity index 95%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.ts
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable.ts
index 8e414984a0c08..fc91742c53cca 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
@@ -29,7 +29,7 @@ import { getTableAggs } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import { AppState } from 'ui/state_management/app_state';
 import { npStart } from 'ui/new_platform';
 import { IExpressionLoaderParams } from 'src/plugins/expressions/public';
-import { SearchSourceContract } from '../../../../../ui/public/courier';
+import { ISearchSource } from 'ui/courier';
 import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
 import {
   IIndexPattern,
@@ -38,25 +38,30 @@ import {
   onlyDisabledFiltersChanged,
   esFilters,
   mapAndFlattenFilters,
-} from '../../../../../../plugins/data/public';
+} from '../../../../../plugins/data/public';
 import {
   EmbeddableInput,
   EmbeddableOutput,
   Embeddable,
   Container,
   APPLY_FILTER_TRIGGER,
-} from '../../../../../../plugins/embeddable/public';
-import { dispatchRenderComplete } from '../../../../../../plugins/kibana_utils/public';
+} from '../../../../../plugins/embeddable/public';
+import { dispatchRenderComplete } from '../../../../../plugins/kibana_utils/public';
+import { SavedSearch } from '../discover/np_ready/types';
 
 const getKeys = <T extends {}>(o: T): Array<keyof T> => Object.keys(o) as Array<keyof T>;
 
 export interface VisSavedObject extends SavedObject {
   vis: Vis;
   description?: string;
-  searchSource: SearchSourceContract;
+  searchSource: ISearchSource;
   title: string;
   uiStateJSON?: string;
   destroy: () => void;
+  savedSearchRefName?: string;
+  savedSearchId?: string;
+  savedSearch?: SavedSearch;
+  visState: any;
 }
 
 export interface VisualizeEmbeddableConfiguration {
@@ -272,7 +277,13 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
 
     // this is a hack to make editor still work, will be removed once we clean up editor
     this.vis.hasInspector = () => {
-      const visTypesWithoutInspector = ['markdown', 'input_control_vis', 'metrics', 'vega'];
+      const visTypesWithoutInspector = [
+        'markdown',
+        'input_control_vis',
+        'metrics',
+        'vega',
+        'timelion',
+      ];
       if (visTypesWithoutInspector.includes(this.vis.type.name)) {
         return false;
       }
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
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.tsx
rename to src/legacy/core_plugins/kibana/public/visualize_embeddable/visualize_embeddable_factory.tsx
index a377dafe9e512..dd6723fb578af 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
@@ -35,7 +35,7 @@ import 'uiExports/visualize';
 import { i18n } from '@kbn/i18n';
 
 import chrome from 'ui/chrome';
-import { npStart } from 'ui/new_platform';
+import { npSetup, npStart } from 'ui/new_platform';
 
 import { Legacy } from 'kibana';
 
@@ -45,10 +45,10 @@ import {
   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';
+} from '../../../../../plugins/embeddable/public';
+import { start as visualizations } from '../../../visualizations/public/np_ready/public/legacy';
+import { showNewVisModal } from '../visualize';
+import { SavedVisualizations } from '../visualize/np_ready/types';
 import { DisabledLabEmbeddable } from './disabled_lab_embeddable';
 import { getIndexPattern } from './get_index_pattern';
 import {
@@ -58,7 +58,7 @@ import {
   VisSavedObject,
 } from './visualize_embeddable';
 import { VISUALIZE_EMBEDDABLE_TYPE } from './constants';
-import { TypesStart } from '../../../../visualizations/public/np_ready/public/types';
+import { TypesStart } from '../../../visualizations/public/np_ready/public/types';
 
 interface VisualizationAttributes extends SavedObjectAttributes {
   visState: string;
@@ -200,7 +200,8 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<
         },
         npStart.core.http.basePath.prepend,
         npStart.core.uiSettings,
-        npStart.core.savedObjects
+        npStart.core.savedObjects,
+        npSetup.plugins.usageCollection
       );
     }
     return undefined;
diff --git a/src/legacy/core_plugins/kibana/server/lib/__tests__/manage_uuid.js b/src/legacy/core_plugins/kibana/server/lib/__tests__/manage_uuid.js
deleted file mode 100644
index 852e75876ad15..0000000000000
--- a/src/legacy/core_plugins/kibana/server/lib/__tests__/manage_uuid.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import { createTestServers } from '../../../../../../test_utils/kbn_server';
-import manageUuid from '../manage_uuid';
-
-describe('legacy/core_plugins/kibana/server/lib', function() {
-  describe('manage_uuid', function() {
-    const testUuid = 'c4add484-0cba-4e05-86fe-4baa112d9e53';
-    let kbn;
-    let kbnServer;
-    let esServer;
-    let config;
-    let servers;
-
-    before(async function() {
-      servers = createTestServers({
-        adjustTimeout: t => {
-          this.timeout(t);
-        },
-      });
-      esServer = await servers.startES();
-
-      kbn = await servers.startKibana();
-      kbnServer = kbn.kbnServer;
-    });
-
-    // Clear uuid stuff from previous test runs
-    beforeEach(function() {
-      kbnServer.server.log = sinon.stub();
-      config = kbnServer.server.config();
-    });
-
-    after(() => {
-      esServer.stop();
-      kbn.stop();
-    });
-
-    it('ensure config uuid is validated as a guid', async function() {
-      config.set('server.uuid', testUuid);
-      expect(config.get('server.uuid')).to.be(testUuid);
-
-      expect(() => {
-        config.set('server.uuid', 'foouid');
-      }).to.throwException(e => {
-        expect(e.name).to.be('ValidationError');
-      });
-    });
-
-    it('finds the previously set uuid with config match', async function() {
-      const msg = `Kibana instance UUID: ${testUuid}`;
-      config.set('server.uuid', testUuid);
-
-      await manageUuid(kbnServer.server);
-      await manageUuid(kbnServer.server);
-
-      expect(kbnServer.server.log.lastCall.args[1]).to.be.eql(msg);
-    });
-
-    it('updates the previously set uuid with config value', async function() {
-      config.set('server.uuid', testUuid);
-
-      await manageUuid(kbnServer.server);
-
-      const newUuid = '5b2de169-2785-441b-ae8c-186a1936b17d';
-      const msg = `Updating Kibana instance UUID to: ${newUuid} (was: ${testUuid})`;
-
-      config.set('server.uuid', newUuid);
-      await manageUuid(kbnServer.server);
-
-      expect(kbnServer.server.log.lastCall.args[1]).to.be(msg);
-    });
-
-    it('resumes the uuid stored in data and sets it to the config', async function() {
-      const partialMsg = 'Resuming persistent Kibana instance UUID';
-      config.set('server.uuid'); // set to undefined
-
-      await manageUuid(kbnServer.server);
-
-      expect(config.get('server.uuid')).to.be.ok(); // not undefined any more
-      expect(kbnServer.server.log.lastCall.args[1]).to.match(new RegExp(`^${partialMsg}`));
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.js b/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.js
deleted file mode 100644
index 0a886d364c6fd..0000000000000
--- a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.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 { getUiSettingDefaults } from '../../../ui_setting_defaults';
-import { get } from 'lodash';
-
-const uiSettingDefaults = getUiSettingDefaults();
-const defaultSearchQueryLanguageSetting = uiSettingDefaults['search:queryLanguage'].value;
-
-export function fetchProvider(index) {
-  return async callCluster => {
-    const [response, config] = await Promise.all([
-      callCluster('get', {
-        index,
-        id: 'kql-telemetry:kql-telemetry',
-        ignore: [404],
-      }),
-      callCluster('search', {
-        index,
-        body: { query: { term: { type: 'config' } } },
-        ignore: [404],
-      }),
-    ]);
-
-    const queryLanguageConfigValue = get(
-      config,
-      'hits.hits[0]._source.config.search:queryLanguage'
-    );
-
-    // search:queryLanguage can potentially be in four states in the .kibana index:
-    // 1. undefined: this means the user has never touched this setting
-    // 2. null: this means the user has touched the setting, but the current value matches the default
-    // 3. 'kuery' or 'lucene': this means the user has explicitly selected the given non-default language
-    //
-    // It's nice to know if the user has never touched the setting or if they tried kuery then
-    // went back to the default, so I preserve this info by prefixing the language name with
-    // 'default-' when the value in .kibana is undefined (case #1).
-    let defaultLanguage;
-    if (queryLanguageConfigValue === undefined) {
-      defaultLanguage = `default-${defaultSearchQueryLanguageSetting}`;
-    } else if (queryLanguageConfigValue === null) {
-      defaultLanguage = defaultSearchQueryLanguageSetting;
-    } else {
-      defaultLanguage = queryLanguageConfigValue;
-    }
-
-    const kqlTelemetryDoc = {
-      optInCount: 0,
-      optOutCount: 0,
-      ...get(response, '_source.kql-telemetry', {}),
-    };
-
-    return {
-      ...kqlTelemetryDoc,
-      defaultQueryLanguage: defaultLanguage,
-    };
-  };
-}
diff --git a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.test.js b/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.test.js
deleted file mode 100644
index a5db4602872ee..0000000000000
--- a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/fetch.test.js
+++ /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_setting_defaults', () => ({
-  getUiSettingDefaults: () => ({ 'search:queryLanguage': { value: 'lucene' } }),
-}));
-
-import { fetchProvider } from './fetch';
-
-let fetch;
-let callCluster;
-
-function setupMockCallCluster(optCount, language) {
-  callCluster = jest.fn((method, params) => {
-    if ('id' in params && params.id === 'kql-telemetry:kql-telemetry') {
-      if (optCount === null) {
-        return Promise.resolve({
-          _index: '.kibana_1',
-          _id: 'kql-telemetry:kql-telemetry',
-          found: false,
-        });
-      } else {
-        return Promise.resolve({
-          _source: {
-            'kql-telemetry': {
-              ...optCount,
-            },
-            type: 'kql-telemetry',
-            updated_at: '2018-10-05T20:20:56.258Z',
-          },
-        });
-      }
-    } else if ('body' in params && params.body.query.term.type === 'config') {
-      if (language === 'missingConfigDoc') {
-        Promise.resolve({
-          hits: {
-            hits: [],
-          },
-        });
-      } else {
-        return Promise.resolve({
-          hits: {
-            hits: [
-              {
-                _source: {
-                  config: {
-                    'search:queryLanguage': language,
-                  },
-                },
-              },
-            ],
-          },
-        });
-      }
-    }
-  });
-}
-
-describe('makeKQLUsageCollector', () => {
-  describe('fetch method', () => {
-    beforeEach(() => {
-      fetch = fetchProvider('.kibana');
-    });
-
-    it('should return opt in data from the .kibana/kql-telemetry doc', async () => {
-      setupMockCallCluster({ optInCount: 1 }, 'kuery');
-      const fetchResponse = await fetch(callCluster);
-      expect(fetchResponse.optInCount).toBe(1);
-      expect(fetchResponse.optOutCount).toBe(0);
-    });
-
-    it('should return the default query language set in advanced settings', async () => {
-      setupMockCallCluster({ optInCount: 1 }, 'kuery');
-      const fetchResponse = await fetch(callCluster);
-      expect(fetchResponse.defaultQueryLanguage).toBe('kuery');
-    });
-
-    // Indicates the user has modified the setting at some point but the value is currently the default
-    it('should return the kibana default query language if the config value is null', async () => {
-      setupMockCallCluster({ optInCount: 1 }, null);
-      const fetchResponse = await fetch(callCluster);
-      expect(fetchResponse.defaultQueryLanguage).toBe('lucene');
-    });
-
-    it('should indicate when the default language has never been modified by the user', async () => {
-      setupMockCallCluster({ optInCount: 1 }, undefined);
-      const fetchResponse = await fetch(callCluster);
-      expect(fetchResponse.defaultQueryLanguage).toBe('default-lucene');
-    });
-
-    it('should default to 0 opt in counts if the .kibana/kql-telemetry doc does not exist', async () => {
-      setupMockCallCluster(null, 'kuery');
-      const fetchResponse = await fetch(callCluster);
-      expect(fetchResponse.optInCount).toBe(0);
-      expect(fetchResponse.optOutCount).toBe(0);
-    });
-
-    it('should default to the kibana default language if the config document does not exist', async () => {
-      setupMockCallCluster(null, 'missingConfigDoc');
-      const fetchResponse = await fetch(callCluster);
-      expect(fetchResponse.defaultQueryLanguage).toBe('default-lucene');
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.js b/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.js
deleted file mode 100644
index 6d751a9e9ff45..0000000000000
--- a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.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 { fetchProvider } from './fetch';
-
-export function makeKQLUsageCollector(usageCollection, server) {
-  const index = server.config().get('kibana.index');
-  const fetch = fetchProvider(index);
-  const kqlUsageCollector = usageCollection.makeUsageCollector({
-    type: 'kql',
-    fetch,
-    isReady: () => true,
-  });
-
-  usageCollection.registerCollector(kqlUsageCollector);
-}
diff --git a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.test.js b/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.test.js
deleted file mode 100644
index 34503bf56ad84..0000000000000
--- a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.test.js
+++ /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 { makeKQLUsageCollector } from './make_kql_usage_collector';
-
-describe('makeKQLUsageCollector', () => {
-  let server;
-  let makeUsageCollectorStub;
-  let registerStub;
-  let usageCollection;
-
-  beforeEach(() => {
-    makeUsageCollectorStub = jest.fn();
-    registerStub = jest.fn();
-    usageCollection = {
-      makeUsageCollector: makeUsageCollectorStub,
-      registerCollector: registerStub,
-    };
-    server = {
-      config: () => ({ get: () => '.kibana' }),
-    };
-  });
-
-  it('should call registerCollector', () => {
-    makeKQLUsageCollector(usageCollection, server);
-    expect(registerStub).toHaveBeenCalledTimes(1);
-  });
-
-  it('should call makeUsageCollector with type = kql', () => {
-    makeKQLUsageCollector(usageCollection, server);
-    expect(makeUsageCollectorStub).toHaveBeenCalledTimes(1);
-    expect(makeUsageCollectorStub.mock.calls[0][0].type).toBe('kql');
-  });
-});
diff --git a/src/legacy/core_plugins/kibana/server/lib/manage_uuid.js b/src/legacy/core_plugins/kibana/server/lib/manage_uuid.js
deleted file mode 100644
index adae8517287d6..0000000000000
--- a/src/legacy/core_plugins/kibana/server/lib/manage_uuid.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 uuid from 'uuid';
-import Bluebird from 'bluebird';
-import { join as pathJoin } from 'path';
-import { readFile as readFileCallback, writeFile as writeFileCallback } from 'fs';
-
-const FILE_ENCODING = 'utf8';
-
-export default async function manageUuid(server) {
-  const config = server.config();
-  const fileName = 'uuid';
-  const uuidFile = pathJoin(config.get('path.data'), fileName);
-
-  async function detectUuid() {
-    const readFile = Bluebird.promisify(readFileCallback);
-    try {
-      const result = await readFile(uuidFile);
-      return result.toString(FILE_ENCODING);
-    } catch (err) {
-      if (err.code === 'ENOENT') {
-        // non-existent uuid file is ok
-        return false;
-      }
-      server.log(['error', 'read-uuid'], err);
-      // Note: this will most likely be logged as an Unhandled Rejection
-      throw err;
-    }
-  }
-
-  async function writeUuid(uuid) {
-    const writeFile = Bluebird.promisify(writeFileCallback);
-    try {
-      return await writeFile(uuidFile, uuid, { encoding: FILE_ENCODING });
-    } catch (err) {
-      server.log(['error', 'write-uuid'], err);
-      // Note: this will most likely be logged as an Unhandled Rejection
-      throw err;
-    }
-  }
-
-  // detect if uuid exists already from before a restart
-  const logToServer = msg => server.log(['server', 'uuid', fileName], msg);
-  const dataFileUuid = await detectUuid();
-  let serverConfigUuid = config.get('server.uuid'); // check if already set in config
-
-  if (dataFileUuid) {
-    // data uuid found
-    if (serverConfigUuid === dataFileUuid) {
-      // config uuid exists, data uuid exists and matches
-      logToServer(`Kibana instance UUID: ${dataFileUuid}`);
-      return;
-    }
-
-    if (!serverConfigUuid) {
-      // config uuid missing, data uuid exists
-      serverConfigUuid = dataFileUuid;
-      logToServer(`Resuming persistent Kibana instance UUID: ${serverConfigUuid}`);
-      config.set('server.uuid', serverConfigUuid);
-      return;
-    }
-
-    if (serverConfigUuid !== dataFileUuid) {
-      // config uuid exists, data uuid exists but mismatches
-      logToServer(`Updating Kibana instance UUID to: ${serverConfigUuid} (was: ${dataFileUuid})`);
-      return writeUuid(serverConfigUuid);
-    }
-  }
-
-  // data uuid missing
-
-  if (!serverConfigUuid) {
-    // config uuid missing
-    serverConfigUuid = uuid.v4();
-    config.set('server.uuid', serverConfigUuid);
-  }
-
-  logToServer(`Setting new Kibana instance UUID: ${serverConfigUuid}`);
-  return writeUuid(serverConfigUuid);
-}
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/kql_telemetry/index.js b/src/legacy/core_plugins/kibana/server/routes/api/kql_telemetry/index.js
deleted file mode 100644
index 430240169c81c..0000000000000
--- a/src/legacy/core_plugins/kibana/server/routes/api/kql_telemetry/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 Joi from 'joi';
-import Boom from 'boom';
-
-export function registerKqlTelemetryApi(server) {
-  server.route({
-    path: '/api/kibana/kql_opt_in_telemetry',
-    method: 'POST',
-    config: {
-      validate: {
-        payload: Joi.object({
-          opt_in: Joi.bool().required(),
-        }),
-      },
-      tags: ['api'],
-    },
-    handler: async function(request) {
-      const {
-        savedObjects: { getSavedObjectsRepository },
-      } = server;
-      const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
-      const internalRepository = getSavedObjectsRepository(callWithInternalUser);
-
-      const {
-        payload: { opt_in: optIn },
-      } = request;
-
-      const counterName = optIn ? 'optInCount' : 'optOutCount';
-
-      try {
-        await internalRepository.incrementCounter('kql-telemetry', 'kql-telemetry', counterName);
-      } catch (error) {
-        return new Boom('Something went wrong', {
-          statusCode: error.status,
-          data: { success: false },
-        });
-      }
-
-      return { success: true };
-    },
-  });
-}
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/scripts/index.js b/src/legacy/core_plugins/kibana/server/routes/api/scripts/index.js
deleted file mode 100644
index 441963b02f14f..0000000000000
--- a/src/legacy/core_plugins/kibana/server/routes/api/scripts/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 { registerLanguages } from './register_languages';
-
-export function scriptsApi(server) {
-  registerLanguages(server);
-}
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/scripts/register_languages.js b/src/legacy/core_plugins/kibana/server/routes/api/scripts/register_languages.js
deleted file mode 100644
index d28ca50e32088..0000000000000
--- a/src/legacy/core_plugins/kibana/server/routes/api/scripts/register_languages.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.
- */
-
-export function registerLanguages(server) {
-  server.route({
-    path: '/api/kibana/scripts/languages',
-    method: 'GET',
-    handler: function() {
-      return ['painless', 'expression'];
-    },
-  });
-}
diff --git a/src/legacy/core_plugins/kibana/server/routes/api/suggestions/index.js b/src/legacy/core_plugins/kibana/server/routes/api/suggestions/index.js
deleted file mode 100644
index 15110b192ee33..0000000000000
--- a/src/legacy/core_plugins/kibana/server/routes/api/suggestions/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 { registerValueSuggestions } from './register_value_suggestions';
-
-export function registerSuggestionsApi(server) {
-  registerValueSuggestions(server);
-}
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
deleted file mode 100644
index 6a6276234e550..0000000000000
--- a/src/legacy/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { get, map } from 'lodash';
-import { abortableRequestHandler } from '../../../../../elasticsearch/lib/abortable_request_handler';
-
-export function registerValueSuggestions(server) {
-  const serverConfig = server.config();
-  const autocompleteTerminateAfter = serverConfig.get('kibana.autocompleteTerminateAfter');
-  const autocompleteTimeout = serverConfig.get('kibana.autocompleteTimeout');
-  server.route({
-    path: '/api/kibana/suggestions/values/{index}',
-    method: ['POST'],
-    handler: abortableRequestHandler(async function(signal, req) {
-      const { index } = req.params;
-      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 }, { signal });
-        const buckets =
-          get(response, 'aggregations.suggestions.buckets') ||
-          get(response, 'aggregations.nestedSuggestions.suggestions.buckets') ||
-          [];
-        const suggestions = map(buckets, 'key');
-        return suggestions;
-      } catch (error) {
-        throw server.plugins.elasticsearch.handleESError(error);
-      }
-    }),
-  });
-}
-
-function getBody({ field, query, boolFilter = [] }, terminateAfter, timeout) {
-  // Helps ensure that the regex is not evaluated eagerly against the terms dictionary
-  const executionHint = 'map';
-
-  // We don't care about the accuracy of the counts, just the content of the terms, so this reduces
-  // the amount of information that needs to be transmitted to the coordinating node
-  const shardSize = 10;
-
-  const body = {
-    size: 0,
-    timeout: `${timeout}ms`,
-    terminate_after: terminateAfter,
-    query: {
-      bool: {
-        filter: boolFilter,
-      },
-    },
-    aggs: {
-      suggestions: {
-        terms: {
-          field: field.name || field,
-          include: `${getEscapedQuery(query)}.*`,
-          execution_hint: executionHint,
-          shard_size: shardSize,
-        },
-      },
-    },
-  };
-
-  if (field.subType && field.subType.nested) {
-    return {
-      ...body,
-      aggs: {
-        nestedSuggestions: {
-          nested: {
-            path: field.subType.nested.path,
-          },
-          aggs: body.aggs,
-        },
-      },
-    };
-  }
-
-  return body;
-}
-
-function getEscapedQuery(query = '') {
-  // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html#_standard_operators
-  return query.replace(/[.?+*|{}[\]()"\\#@&<>~]/g, match => `\\${match}`);
-}
diff --git a/src/legacy/core_plugins/kibana/server/tutorials/apm/index_pattern.json b/src/legacy/core_plugins/kibana/server/tutorials/apm/index_pattern.json
index 9001613623ccb..090586a612d4f 100644
--- a/src/legacy/core_plugins/kibana/server/tutorials/apm/index_pattern.json
+++ b/src/legacy/core_plugins/kibana/server/tutorials/apm/index_pattern.json
@@ -1,7 +1,7 @@
 {
   "attributes": {
     "fieldFormatMap": "{\"client.bytes\":{\"id\":\"bytes\"},\"client.nat.port\":{\"id\":\"string\"},\"client.port\":{\"id\":\"string\"},\"destination.bytes\":{\"id\":\"bytes\"},\"destination.nat.port\":{\"id\":\"string\"},\"destination.port\":{\"id\":\"string\"},\"event.duration\":{\"id\":\"duration\",\"params\":{\"inputFormat\":\"nanoseconds\",\"outputFormat\":\"asMilliseconds\",\"outputPrecision\":1}},\"event.sequence\":{\"id\":\"string\"},\"event.severity\":{\"id\":\"string\"},\"http.request.body.bytes\":{\"id\":\"bytes\"},\"http.request.bytes\":{\"id\":\"bytes\"},\"http.response.body.bytes\":{\"id\":\"bytes\"},\"http.response.bytes\":{\"id\":\"bytes\"},\"http.response.status_code\":{\"id\":\"string\"},\"log.syslog.facility.code\":{\"id\":\"string\"},\"log.syslog.priority\":{\"id\":\"string\"},\"network.bytes\":{\"id\":\"bytes\"},\"package.size\":{\"id\":\"string\"},\"process.pgid\":{\"id\":\"string\"},\"process.pid\":{\"id\":\"string\"},\"process.ppid\":{\"id\":\"string\"},\"process.thread.id\":{\"id\":\"string\"},\"server.bytes\":{\"id\":\"bytes\"},\"server.nat.port\":{\"id\":\"string\"},\"server.port\":{\"id\":\"string\"},\"source.bytes\":{\"id\":\"bytes\"},\"source.nat.port\":{\"id\":\"string\"},\"source.port\":{\"id\":\"string\"},\"system.cpu.total.norm.pct\":{\"id\":\"percent\"},\"system.memory.actual.free\":{\"id\":\"bytes\"},\"system.memory.total\":{\"id\":\"bytes\"},\"system.process.cpu.total.norm.pct\":{\"id\":\"percent\"},\"system.process.memory.rss.bytes\":{\"id\":\"bytes\"},\"system.process.memory.size\":{\"id\":\"bytes\"},\"url.port\":{\"id\":\"string\"},\"view spans\":{\"id\":\"url\",\"params\":{\"labelTemplate\":\"View Spans\"}}}",
-    "fields": "[{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"@timestamp\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.account.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.availability_zone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.machine.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.region\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.tag\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.runtime\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.data\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.ttl\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.header_flags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.op_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.subdomain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.resolved_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.response_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"ecs.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.stack_trace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.category\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.dataset\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.end\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.kind\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.outcome\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score_norm\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.sequence\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.severity\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.timezone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.accessed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.ctime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.device\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.gid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.group\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.inode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mtime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.owner\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.target_path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.method\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.referrer\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.status_code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.logger\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.priority\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.application\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.community_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.direction\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.forwarded_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.iana_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.protocol\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.transport\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.product\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.serial_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.vendor\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.checksum\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.install_scope\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.installed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.license\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.args\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.executable\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pgid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.ppid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.id\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.title\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.working_directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"related.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.state\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.framework\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.fragment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.password\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.query\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.scheme\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.username\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.device.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"fields\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"timeseries.instance\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.project.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.image.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"docker.container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.containerized\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.build\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.codename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.namespace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.labels.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.annotations.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.replicaset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.deployment.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.statefulset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.image\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.event\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"timestamp.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.request.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.finished\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.response.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.environment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.sampled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.breakdown.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.subtype\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"parent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.listening\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version_major\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"experimental\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.culprit\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.grouping_key\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.handled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.logger_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.param_message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.total\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.actual.free\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.rss.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.cpu.ns\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.samples.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.bundle_filepath\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"view spans\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.start.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.sync\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.db.link\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.result\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks.*.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.span_count.dropped\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_id\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_index\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_score\",\"scripted\":false,\"searchable\":false,\"type\":\"number\"}]",
+    "fields": "[{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"@timestamp\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"client.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.account.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.availability_zone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.instance.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.machine.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.region\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.image.tag\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"container.runtime\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"destination.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.data\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.ttl\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.answers.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.header_flags\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.op_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.class\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.subdomain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.question.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.resolved_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.response_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"dns.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"ecs.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.stack_trace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.category\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.dataset\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.end\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.kind\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.outcome\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.provider\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.risk_score_norm\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.sequence\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.severity\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.timezone\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"event.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.accessed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.created\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.ctime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.device\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.gid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.group\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.inode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mode\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.mtime\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.owner\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.target_path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"file.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.method\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.request.referrer\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.body.content\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.status_code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.logger\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.file.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.origin.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.facility.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.priority\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.code\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"log.syslog.severity.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.application\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.community_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.direction\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.forwarded_ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.iana_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.protocol\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.transport\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"network.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.product\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.serial_number\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.vendor\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.architecture\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.checksum\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.description\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.install_scope\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.installed\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.license\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"package.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.args\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.executable\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.md5\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha1\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha256\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.hash.sha512\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pgid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.pid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.ppid\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.start\",\"scripted\":false,\"searchable\":true,\"type\":\"date\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.id\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.thread.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.title\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.uptime\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"process.working_directory\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"related.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"server.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.ephemeral_id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.state\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.address\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.number\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.as.organization.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.city_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.continent_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.country_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.location\",\"scripted\":false,\"searchable\":true,\"type\":\"geo_point\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_iso_code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.geo.region_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.mac\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.ip\",\"scripted\":false,\"searchable\":true,\"type\":\"ip\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.nat.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.packets\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"source.user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.framework\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.tactic.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"threat.technique.reference\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"tracing.transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.extension\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.fragment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.password\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.path\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.port\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.query\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.registered_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.scheme\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.top_level_domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"url.username\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.email\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.full_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.domain\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.group.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.hash\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.device.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.family\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.full\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.kernel\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.platform\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.os.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"agent.hostname\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"fields\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"timeseries.instance\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.project.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"cloud.image.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"docker.container.labels\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.containerized\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.build\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"host.os.codename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.pod.uid\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.namespace\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.node.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.labels.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.annotations.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.replicaset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.deployment.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.statefulset.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"kubernetes.container.image\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"processor.event\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"timestamp.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.request.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"http.response.finished\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"enabled\":false,\"indexed\":false,\"name\":\"http.response.headers\",\"scripted\":false,\"searchable\":false},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.environment\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.language.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.runtime.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"service.framework.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.sampled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.name.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.breakdown.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.subtype\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.self_time.sum.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"trace.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"parent.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.listening\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"observer.version_major\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"user_agent.original.text\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"experimental\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.culprit\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.grouping_key\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.code\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.module\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":4,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.exception.handled\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.level\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.logger_name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":2,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"error.log.param_message\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.total\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.memory.actual.free\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.cpu.total.norm.pct\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.size\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"system.process.memory.rss.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.cpu.ns\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.samples.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.alloc_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_objects.count\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.inuse_space.bytes\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.duration\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.top.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.function\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.filename\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"profile.stack.line\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.service.version\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"sourcemap.bundle_filepath\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"view spans\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.id\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.action\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.start.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":1,\"doc_values\":true,\"indexed\":true,\"name\":\"span.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.sync\",\"scripted\":false,\"searchable\":true,\"type\":\"boolean\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.db.link\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.db.rows_affected\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.destination.service.resource\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.message.queue.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"span.message.age.ms\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.duration.us\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.result\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.marks.*.*\",\"scripted\":false,\"searchable\":true},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.span_count.dropped\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.message.queue.name\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":true,\"indexed\":true,\"name\":\"transaction.message.age.ms\",\"scripted\":false,\"searchable\":true,\"type\":\"number\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_id\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":true,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_type\",\"scripted\":false,\"searchable\":true,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_index\",\"scripted\":false,\"searchable\":false,\"type\":\"string\"},{\"aggregatable\":false,\"analyzed\":false,\"count\":0,\"doc_values\":false,\"indexed\":false,\"name\":\"_score\",\"scripted\":false,\"searchable\":false,\"type\":\"number\"}]",
     "sourceFilters": "[{\"value\":\"sourcemap.sourcemap\"}]",
     "timeFieldName": "@timestamp"
   },
diff --git a/src/legacy/core_plugins/kibana/server/tutorials/envoyproxy_metrics/index.js b/src/legacy/core_plugins/kibana/server/tutorials/envoyproxy_metrics/index.js
new file mode 100644
index 0000000000000..4e5301149b35b
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/server/tutorials/envoyproxy_metrics/index.js
@@ -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 { i18n } from '@kbn/i18n';
+import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category';
+import {
+  onPremInstructions,
+  cloudInstructions,
+  onPremCloudInstructions,
+} from '../../../common/tutorials/metricbeat_instructions';
+
+export function envoyproxyMetricsSpecProvider(server, context) {
+  const moduleName = 'envoyproxy';
+  return {
+    id: 'envoyproxyMetrics',
+    name: i18n.translate('kbn.server.tutorials.envoyproxyMetrics.nameTitle', {
+      defaultMessage: 'Envoy Proxy metrics',
+    }),
+    category: TUTORIAL_CATEGORY.METRICS,
+    shortDescription: i18n.translate('kbn.server.tutorials.envoyproxyMetrics.shortDescription', {
+      defaultMessage: 'Fetch monitoring metrics from Envoy Proxy.',
+    }),
+    longDescription: i18n.translate('kbn.server.tutorials.envoyproxyMetrics.longDescription', {
+      defaultMessage:
+        'The `envoyproxy` Metricbeat module fetches monitoring metrics from Envoy Proxy. \
+[Learn more]({learnMoreLink}).',
+      values: {
+        learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-envoyproxy.html',
+      },
+    }),
+    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/envoyproxy.svg',
+    artifacts: {
+      dashboards: [],
+      exportedFields: {
+        documentationUrl: '{config.docs.beats.metricbeat}/exported-fields-envoyproxy.html',
+      },
+    },
+    completionTimeMinutes: 10,
+    // previewImagePath: '/plugins/kibana/home/tutorial_resources/envoyproxy_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/register.js b/src/legacy/core_plugins/kibana/server/tutorials/register.js
index eb06c97629b17..ecc2d1df8c388 100644
--- a/src/legacy/core_plugins/kibana/server/tutorials/register.js
+++ b/src/legacy/core_plugins/kibana/server/tutorials/register.js
@@ -83,6 +83,7 @@ import { awsLogsSpecProvider } from './aws_logs';
 import { activemqLogsSpecProvider } from './activemq_logs';
 import { activemqMetricsSpecProvider } from './activemq_metrics';
 import { azureMetricsSpecProvider } from './azure_metrics';
+import { envoyproxyMetricsSpecProvider } from './envoyproxy_metrics';
 
 export function registerTutorials(server) {
   server.newPlatform.setup.plugins.home.tutorials.registerTutorial(systemLogsSpecProvider);
@@ -154,4 +155,5 @@ export function registerTutorials(server) {
   server.newPlatform.setup.plugins.home.tutorials.registerTutorial(activemqLogsSpecProvider);
   server.newPlatform.setup.plugins.home.tutorials.registerTutorial(activemqMetricsSpecProvider);
   server.newPlatform.setup.plugins.home.tutorials.registerTutorial(azureMetricsSpecProvider);
+  server.newPlatform.setup.plugins.home.tutorials.registerTutorial(envoyproxyMetricsSpecProvider);
 }
diff --git a/src/legacy/core_plugins/kibana/ui_setting_defaults.js b/src/legacy/core_plugins/kibana/ui_setting_defaults.js
index 682da20ca4118..196d9662f8b15 100644
--- a/src/legacy/core_plugins/kibana/ui_setting_defaults.js
+++ b/src/legacy/core_plugins/kibana/ui_setting_defaults.js
@@ -20,6 +20,7 @@
 import moment from 'moment-timezone';
 import numeralLanguages from '@elastic/numeral/languages';
 import { i18n } from '@kbn/i18n';
+import { DEFAULT_QUERY_LANGUAGE } from '../../../plugins/data/common';
 
 export function getUiSettingDefaults() {
   const weekdays = moment.weekdays().slice();
@@ -121,7 +122,7 @@ export function getUiSettingDefaults() {
     },
     'search:queryLanguage': {
       name: queryLanguageSettingName,
-      value: 'kuery',
+      value: DEFAULT_QUERY_LANGUAGE,
       description: i18n.translate('kbn.advancedSettings.searchQueryLanguageText', {
         defaultMessage:
           'Query language used by the query bar. KQL is a new language built specifically for Kibana.',
diff --git a/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/creation/manager.ts b/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/creation/manager.ts
index 605ffdd6f2134..e7fa13409ab04 100644
--- a/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/creation/manager.ts
+++ b/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/creation/manager.ts
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-import { HttpServiceBase } from '../../../../../../../../core/public';
+import { HttpSetup } from '../../../../../../../../core/public';
 import { IndexPatternCreationConfig, UrlHandler, IndexPatternCreationOption } from './config';
 
 export class IndexPatternCreationManager {
   private configs: IndexPatternCreationConfig[];
 
-  constructor(private readonly httpClient: HttpServiceBase) {
+  constructor(private readonly httpClient: HttpSetup) {
     this.configs = [];
   }
 
diff --git a/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/index_pattern_management_service.ts b/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/index_pattern_management_service.ts
index b9e07564a324c..b421024b60f4b 100644
--- a/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/index_pattern_management_service.ts
+++ b/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/index_pattern_management_service.ts
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-import { HttpServiceBase } from '../../../../../../../core/public';
+import { HttpSetup } from '../../../../../../../core/public';
 import { IndexPatternCreationManager, IndexPatternCreationConfig } from './creation';
 import { IndexPatternListManager, IndexPatternListConfig } from './list';
 
 interface SetupDependencies {
-  httpClient: HttpServiceBase;
+  httpClient: HttpSetup;
 }
 
 /**
diff --git a/src/legacy/core_plugins/telemetry/index.ts b/src/legacy/core_plugins/telemetry/index.ts
index 35037d3793a95..2a81e3fa05c6c 100644
--- a/src/legacy/core_plugins/telemetry/index.ts
+++ b/src/legacy/core_plugins/telemetry/index.ts
@@ -91,8 +91,8 @@ const telemetry = (kibana: any) => {
           isNamespaceAgnostic: true,
         },
       },
-      async replaceInjectedVars(originalInjectedVars: any, request: any) {
-        const telemetryInjectedVars = await replaceTelemetryInjectedVars(request);
+      async replaceInjectedVars(originalInjectedVars: any, request: any, server: any) {
+        const telemetryInjectedVars = await replaceTelemetryInjectedVars(request, server);
         return Object.assign({}, originalInjectedVars, telemetryInjectedVars);
       },
       injectDefaultVars(server: Server) {
diff --git a/src/legacy/core_plugins/telemetry/public/components/telemetry_form.js b/src/legacy/core_plugins/telemetry/public/components/telemetry_form.js
index 94a387565f38d..aed8477057165 100644
--- a/src/legacy/core_plugins/telemetry/public/components/telemetry_form.js
+++ b/src/legacy/core_plugins/telemetry/public/components/telemetry_form.js
@@ -31,7 +31,7 @@ import {
 } from '@elastic/eui';
 import { PRIVACY_STATEMENT_URL } from '../../common/constants';
 import { OptInExampleFlyout } from './opt_in_details_component';
-import { Field } from 'ui/management';
+import { Field } from '../../../kibana/public/management/sections/settings/components/field/field';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 
diff --git a/src/legacy/core_plugins/telemetry/server/telemetry_config/replace_injected_vars.ts b/src/legacy/core_plugins/telemetry/server/telemetry_config/replace_injected_vars.ts
index 02f9150a095d9..f09ee8623afac 100644
--- a/src/legacy/core_plugins/telemetry/server/telemetry_config/replace_injected_vars.ts
+++ b/src/legacy/core_plugins/telemetry/server/telemetry_config/replace_injected_vars.ts
@@ -23,8 +23,8 @@ import { getTelemetrySendUsageFrom } from './get_telemetry_send_usage_from';
 import { getTelemetryAllowChangingOptInStatus } from './get_telemetry_allow_changing_opt_in_status';
 import { getNotifyUserAboutOptInDefault } from './get_telemetry_notify_user_about_optin_default';
 
-export async function replaceTelemetryInjectedVars(request: any) {
-  const config = request.server.config();
+export async function replaceTelemetryInjectedVars(request: any, server: any) {
+  const config = server.config();
   const configTelemetrySendUsageFrom = config.get('telemetry.sendUsageFrom');
   const configTelemetryOptIn = config.get('telemetry.optIn');
   const configTelemetryAllowChangingOptInStatus = config.get('telemetry.allowChangingOptInStatus');
@@ -38,7 +38,7 @@ export async function replaceTelemetryInjectedVars(request: any) {
   }
 
   const currentKibanaVersion = config.get('pkg.version');
-  const savedObjectsClient = request.getSavedObjectsClient();
+  const savedObjectsClient = server.savedObjects.getScopedSavedObjectsClient(request);
   const telemetrySavedObject = await getTelemetrySavedObject(savedObjectsClient);
   const allowChangingOptInStatus = getTelemetryAllowChangingOptInStatus({
     configTelemetryAllowChangingOptInStatus,
diff --git a/src/legacy/core_plugins/tile_map/index.ts b/src/legacy/core_plugins/tile_map/index.ts
index 298675e75b0d7..27f019318a82b 100644
--- a/src/legacy/core_plugins/tile_map/index.ts
+++ b/src/legacy/core_plugins/tile_map/index.ts
@@ -30,7 +30,14 @@ const tileMapPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPlu
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       hacks: [resolve(__dirname, 'public/legacy')],
-      injectDefaultVars: server => ({}),
+      injectDefaultVars: server => {
+        const serverConfig = server.config();
+        const mapConfig: Record<string, any> = serverConfig.get('map');
+
+        return {
+          emsTileLayerId: mapConfig.emsTileLayerId,
+        };
+      },
     },
     config(Joi: any) {
       return Joi.object({
diff --git a/src/legacy/core_plugins/tile_map/public/css_filters.js b/src/legacy/core_plugins/tile_map/public/css_filters.js
new file mode 100644
index 0000000000000..63d6a358059b3
--- /dev/null
+++ b/src/legacy/core_plugins/tile_map/public/css_filters.js
@@ -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 _ from 'lodash';
+
+/**
+ * just a place to put feature detection checks
+ */
+export const supportsCssFilters = (function() {
+  const e = document.createElement('img');
+  const rules = ['webkitFilter', 'mozFilter', 'msFilter', 'filter'];
+  const test = 'grayscale(1)';
+
+  rules.forEach(function(rule) {
+    e.style[rule] = test;
+  });
+
+  document.body.appendChild(e);
+  const styles = window.getComputedStyle(e);
+  const can = _(styles)
+    .pick(rules)
+    .includes(test);
+  document.body.removeChild(e);
+
+  return can;
+})();
diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_type.js b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
index f2354614ac41a..f2e6469e768e7 100644
--- a/src/legacy/core_plugins/tile_map/public/tile_map_type.js
+++ b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
@@ -20,7 +20,6 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { supports } from 'ui/utils/supports';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { colorSchemas } from 'ui/vislib/components/color/truncated_colormaps';
 import { convertToGeoJson } from 'ui/vis/map/convert_to_geojson';
@@ -29,6 +28,7 @@ import { createTileMapVisualization } from './tile_map_visualization';
 import { Status } from '../../visualizations/public';
 import { TileMapOptions } from './components/tile_map_options';
 import { MapTypes } from './map_types';
+import { supportsCssFilters } from './css_filters';
 
 export function createTileMapTypeDefinition(dependencies) {
   const CoordinateMapsVisualization = createTileMapVisualization(dependencies);
@@ -44,7 +44,7 @@ export function createTileMapTypeDefinition(dependencies) {
       defaultMessage: 'Plot latitude and longitude coordinates on a map',
     }),
     visConfig: {
-      canDesaturate: !!supports.cssFilters,
+      canDesaturate: Boolean(supportsCssFilters),
       defaults: {
         colorSchema: 'Yellow to Red',
         mapType: 'Scaled Circle Markers',
diff --git a/src/legacy/core_plugins/timelion/index.ts b/src/legacy/core_plugins/timelion/index.ts
index 77e62ed02718c..ec121647f4e47 100644
--- a/src/legacy/core_plugins/timelion/index.ts
+++ b/src/legacy/core_plugins/timelion/index.ts
@@ -31,7 +31,7 @@ const experimentalLabel = i18n.translate('timelion.uiSettings.experimentalLabel'
 
 const timelionPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
   new Plugin({
-    require: ['kibana', 'elasticsearch'],
+    require: ['kibana', 'elasticsearch', 'data'],
     config(Joi: any) {
       return Joi.object({
         enabled: Joi.boolean().default(true),
diff --git a/src/legacy/core_plugins/timelion/public/app.js b/src/legacy/core_plugins/timelion/public/app.js
index 82f6d56f8f22a..7ef722ee3a277 100644
--- a/src/legacy/core_plugins/timelion/public/app.js
+++ b/src/legacy/core_plugins/timelion/public/app.js
@@ -23,7 +23,6 @@ import { i18n } from '@kbn/i18n';
 
 import { capabilities } from 'ui/capabilities';
 import { docTitle } from 'ui/doc_title';
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
 import { fatalError, toastNotifications } from 'ui/notify';
 import { timezoneProvider } from 'ui/vis/lib/timezone';
 import { timefilter } from 'ui/timefilter';
@@ -36,12 +35,15 @@ require('ui/autoload/all');
 
 // TODO: remove ui imports completely (move to plugins)
 import 'ui/directives/input_focus';
-import 'ui/directives/saved_object_finder';
+import './directives/saved_object_finder';
 import 'ui/directives/listen';
 import 'ui/kbn_top_nav';
 import 'ui/saved_objects/ui/saved_object_save_as_checkbox';
+import '../../data/public/legacy';
+import './services/saved_sheet_register';
 
 import rootTemplate from 'plugins/timelion/index.html';
+import { createSavedVisLoader } from '../../kibana/public/visualize';
 
 require('plugins/timelion/directives/cells/cells');
 require('plugins/timelion/directives/fixed_element');
@@ -57,13 +59,8 @@ document.title = 'Timelion - Kibana';
 
 const app = require('ui/modules').get('apps/timelion', []);
 
-require('plugins/timelion/services/saved_sheets');
-require('plugins/timelion/services/_saved_sheet');
-
 require('./vis');
 
-SavedObjectRegistryProvider.register(require('plugins/timelion/services/saved_sheet_register'));
-
 require('ui/routes').enable();
 
 require('ui/routes').when('/:id?', {
@@ -131,8 +128,12 @@ app.controller('timelion', function(
   timefilter.enableAutoRefreshSelector();
   timefilter.enableTimeRangeSelector();
 
-  const savedVisualizations = Private(SavedObjectRegistryProvider).byLoaderPropertiesName
-    .visualizations;
+  const savedVisualizations = createSavedVisLoader({
+    savedObjectsClient: npStart.core.savedObjects.client,
+    indexPatterns: npStart.plugins.data.indexPatterns,
+    chrome: npStart.core.chrome,
+    overlays: npStart.core.overlays,
+  });
   const timezone = Private(timezoneProvider)();
 
   const defaultExpression = '.es(*)';
diff --git a/src/legacy/ui/public/directives/partials/saved_object_finder.html b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.html
similarity index 86%
rename from src/legacy/ui/public/directives/partials/saved_object_finder.html
rename to src/legacy/core_plugins/timelion/public/directives/saved_object_finder.html
index adf7f5dacae9a..ad148801c03a4 100644
--- a/src/legacy/ui/public/directives/partials/saved_object_finder.html
+++ b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.html
@@ -23,7 +23,7 @@
 
     <div class="kuiBarSection">
       <p class="kuiText kuiSubduedText"
-        i18n-id="common.ui.savedObjectFinder.pageItemsFromHitCountDescription"
+        i18n-id="timelion.savedObjectFinder.pageItemsFromHitCountDescription"
         i18n-default-message="{pageFirstItem}-{pageLastItem} of {hitCount}"
         i18n-values="{pageFirstItem, pageLastItem, hitCount: finder.hitCount}"
       ></p>
@@ -33,7 +33,7 @@
           ng-if="onAddNew"
           ng-click="onAddNew()"
           data-test-subj="addNewSavedObjectLink"
-          i18n-id="common.ui.savedObjectFinder.addNewItemButtonLabel"
+          i18n-id="timelion.savedObjectFinder.addNewItemButtonLabel"
           i18n-default-message="Add new {item}"
           i18n-values="{item: finder.properties.noun}"
           i18n-description="{item} can be a type of object in Kibana, like 'visualization', 'dashboard', etc"
@@ -43,7 +43,7 @@
           class="kuiButton kuiButton--secondary"
           ng-if="!useLocalManagement"
           ng-click="finder.manageObjects(finder.properties.name)"
-          i18n-id="common.ui.savedObjectFinder.manageItemsButtonLabel"
+          i18n-id="timelion.savedObjectFinder.manageItemsButtonLabel"
           i18n-default-message="Manage {items}"
           i18n-values="{items: finder.properties.nouns}"
           i18n-description="{items} can be a type of object in Kibana, like 'visualizations', 'dashboards', etc"
@@ -64,11 +64,11 @@
     aria-live="assertive"
   >
     <span class="euiScreenReaderOnly"
-      i18n-id="common.ui.savedObjectFinder.sortByButtonLabelScreenReaderOnly"
+      i18n-id="timelion.savedObjectFinder.sortByButtonLabelScreenReaderOnly"
       i18n-default-message="Sort by"
     ></span>
     <span
-      i18n-id="common.ui.savedObjectFinder.sortByButtonLabel"
+      i18n-id="timelion.savedObjectFinder.sortByButtonLabel"
       i18n-default-message="Name"
     ></span>
     <span
@@ -77,12 +77,12 @@
     >
       <span class="euiScreenReaderOnly"
         ng-if="finder.isAscending"
-        i18n-id="common.ui.savedObjectFinder.sortByButtonLabeAscendingScreenReaderOnly"
+        i18n-id="timelion.savedObjectFinder.sortByButtonLabeAscendingScreenReaderOnly"
         i18n-default-message="ascending"
       ></span>
       <span class="euiScreenReaderOnly"
         ng-if="!finder.isAscending"
-        i18n-id="common.ui.savedObjectFinder.sortByButtonLabeDescendingScreenReaderOnly"
+        i18n-id="timelion.savedObjectFinder.sortByButtonLabeDescendingScreenReaderOnly"
         i18n-default-message="descending"
       ></span>
     </span>
@@ -108,7 +108,7 @@
       class="list-group-item list-group-no-results"
       ng-if="finder.hits.length === 0"
     >
-      <p i18n-id="common.ui.savedObjectFinder.noMatchesFoundDescription"
+      <p i18n-id="timelion.savedObjectFinder.noMatchesFoundDescription"
         i18n-default-message="No matching {items} found."
         i18n-values="{items: finder.properties.nouns}"
         i18n-description="{items} can be a type of object in Kibana, like 'visualizations', 'dashboards', etc"
diff --git a/src/legacy/ui/public/directives/saved_object_finder.js b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js
similarity index 95%
rename from src/legacy/ui/public/directives/saved_object_finder.js
rename to src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js
index 7e0430c1d2834..111db0a83ffc4 100644
--- a/src/legacy/ui/public/directives/saved_object_finder.js
+++ b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js
@@ -19,19 +19,16 @@
 
 import _ from 'lodash';
 import rison from 'rison-node';
-import { keyMap } from '../utils/key_map';
-import { SavedObjectRegistryProvider } from '../saved_objects/saved_object_registry';
-import { uiModules } from '../modules';
-
-import savedObjectFinderTemplate from './partials/saved_object_finder.html';
-import './input_focus';
-import './paginate';
+import { uiModules } from 'ui/modules';
+import 'ui/directives/input_focus';
+import 'ui/directives/paginate';
+import savedObjectFinderTemplate from './saved_object_finder.html';
+import { savedSheetLoader } from '../services/saved_sheets';
+import { keyMap } from 'ui/directives/key_map';
 
 const module = uiModules.get('kibana');
 
 module.directive('savedObjectFinder', function($location, kbnUrl, Private, config) {
-  const services = Private(SavedObjectRegistryProvider).byLoaderPropertiesName;
-
   return {
     restrict: 'E',
     scope: {
@@ -76,7 +73,7 @@ module.directive('savedObjectFinder', function($location, kbnUrl, Private, confi
       // the list of hits, used to render display
       self.hits = [];
 
-      self.service = services[$scope.type];
+      self.service = savedSheetLoader;
       self.properties = self.service.loaderProperties;
 
       filterResults();
diff --git a/src/legacy/core_plugins/timelion/public/services/_saved_sheet.js b/src/legacy/core_plugins/timelion/public/services/_saved_sheet.js
deleted file mode 100644
index 8875a84d4d3a1..0000000000000
--- a/src/legacy/core_plugins/timelion/public/services/_saved_sheet.js
+++ /dev/null
@@ -1,82 +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 { createLegacyClass } from 'ui/utils/legacy_class';
-import { SavedObjectProvider } from 'ui/saved_objects/saved_object';
-const module = uiModules.get('app/timelion');
-
-// Used only by the savedSheets service, usually no reason to change this
-module.factory('SavedSheet', function(Private, config) {
-  // SavedSheet constructor. Usually you'd interact with an instance of this.
-  // ID is option, without it one will be generated on save.
-  const SavedObject = Private(SavedObjectProvider);
-  createLegacyClass(SavedSheet).inherits(SavedObject);
-  function SavedSheet(id) {
-    // Gives our SavedSheet the properties of a SavedObject
-    SavedObject.call(this, {
-      type: SavedSheet.type,
-      mapping: SavedSheet.mapping,
-
-      // if this is null/undefined then the SavedObject will be assigned the defaults
-      id: id,
-
-      // default values that will get assigned if the doc is new
-      defaults: {
-        title: 'New TimeLion Sheet',
-        hits: 0,
-        description: '',
-        timelion_sheet: ['.es(*)'],
-        timelion_interval: 'auto',
-        timelion_chart_height: 275,
-        timelion_columns: config.get('timelion:default_columns') || 2,
-        timelion_rows: config.get('timelion:default_rows') || 2,
-        version: 1,
-      },
-    });
-
-    this.showInRecentlyAccessed = true;
-  }
-
-  // save these objects with the 'sheet' type
-  SavedSheet.type = 'timelion-sheet';
-
-  // if type:sheet has no mapping, we push this mapping into ES
-  SavedSheet.mapping = {
-    title: 'text',
-    hits: 'integer',
-    description: 'text',
-    timelion_sheet: 'text',
-    timelion_interval: 'keyword',
-    timelion_other_interval: 'keyword',
-    timelion_chart_height: 'integer',
-    timelion_columns: 'integer',
-    timelion_rows: 'integer',
-    version: 'integer',
-  };
-
-  // Order these fields to the top, the rest are alphabetical
-  SavedSheet.fieldOrder = ['title', 'description'];
-
-  SavedSheet.prototype.getFullPath = function() {
-    return `/app/timelion#/${this.id}`;
-  };
-
-  return SavedSheet;
-});
diff --git a/src/legacy/core_plugins/timelion/public/services/_saved_sheet.ts b/src/legacy/core_plugins/timelion/public/services/_saved_sheet.ts
new file mode 100644
index 0000000000000..1e956cbd3e5ac
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/services/_saved_sheet.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 { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+import { SavedObjectKibanaServices } from 'ui/saved_objects/types';
+import { IUiSettingsClient } from 'kibana/public';
+
+// Used only by the savedSheets service, usually no reason to change this
+export function createSavedSheetClass(
+  services: SavedObjectKibanaServices,
+  config: IUiSettingsClient
+) {
+  const SavedObjectClass = createSavedObjectClass(services);
+
+  class SavedSheet extends SavedObjectClass {
+    static type = 'timelion-sheet';
+
+    // if type:sheet has no mapping, we push this mapping into ES
+    static mapping = {
+      title: 'text',
+      hits: 'integer',
+      description: 'text',
+      timelion_sheet: 'text',
+      timelion_interval: 'keyword',
+      timelion_other_interval: 'keyword',
+      timelion_chart_height: 'integer',
+      timelion_columns: 'integer',
+      timelion_rows: 'integer',
+      version: 'integer',
+    };
+
+    // Order these fields to the top, the rest are alphabetical
+    static fieldOrder = ['title', 'description'];
+    // SavedSheet constructor. Usually you'd interact with an instance of this.
+    // ID is option, without it one will be generated on save.
+    constructor(id: string) {
+      super({
+        type: SavedSheet.type,
+        mapping: SavedSheet.mapping,
+
+        // if this is null/undefined then the SavedObject will be assigned the defaults
+        id,
+
+        // default values that will get assigned if the doc is new
+        defaults: {
+          title: 'New TimeLion Sheet',
+          hits: 0,
+          description: '',
+          timelion_sheet: ['.es(*)'],
+          timelion_interval: 'auto',
+          timelion_chart_height: 275,
+          timelion_columns: config.get('timelion:default_columns') || 2,
+          timelion_rows: config.get('timelion:default_rows') || 2,
+          version: 1,
+        },
+      });
+      this.showInRecentlyAccessed = true;
+      this.getFullPath = () => `/app/timelion#/${this.id}`;
+    }
+  }
+
+  return SavedSheet;
+}
diff --git a/src/legacy/core_plugins/timelion/public/services/saved_sheet_register.js b/src/legacy/core_plugins/timelion/public/services/saved_sheet_register.js
deleted file mode 100644
index 0353a4d742dd3..0000000000000
--- a/src/legacy/core_plugins/timelion/public/services/saved_sheet_register.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 './saved_sheets';
-
-export default function savedSearchObjectFn(savedSheets) {
-  return savedSheets;
-}
diff --git a/src/legacy/core_plugins/timelion/public/services/saved_sheet_register.ts b/src/legacy/core_plugins/timelion/public/services/saved_sheet_register.ts
new file mode 100644
index 0000000000000..7c8a2909238da
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/services/saved_sheet_register.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.
+ */
+import './saved_sheets';
diff --git a/src/legacy/core_plugins/timelion/public/services/saved_sheets.js b/src/legacy/core_plugins/timelion/public/services/saved_sheets.js
deleted file mode 100644
index 064b59a0d45d9..0000000000000
--- a/src/legacy/core_plugins/timelion/public/services/saved_sheets.js
+++ /dev/null
@@ -1,54 +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 { SavedObjectLoader, SavedObjectsClientProvider } from 'ui/saved_objects';
-import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
-import { uiModules } from 'ui/modules';
-import './_saved_sheet.js';
-import { npStart } from '../../../../ui/public/new_platform';
-
-const module = uiModules.get('app/sheet');
-
-// Register this service with the saved object registry so it can be
-// edited by the object editor.
-savedObjectManagementRegistry.register({
-  service: 'savedSheets',
-  title: 'sheets',
-});
-
-// This is the only thing that gets injected into controllers
-module.service('savedSheets', function(Private, SavedSheet, kbnUrl) {
-  const savedObjectClient = Private(SavedObjectsClientProvider);
-  const savedSheetLoader = new SavedObjectLoader(
-    SavedSheet,
-    savedObjectClient,
-    npStart.core.chrome
-  );
-  savedSheetLoader.urlFor = function(id) {
-    return kbnUrl.eval('#/{{id}}', { id: id });
-  };
-
-  // Customize loader properties since adding an 's' on type doesn't work for type 'timelion-sheet'.
-  savedSheetLoader.loaderProperties = {
-    name: 'timelion-sheet',
-    noun: 'Saved Sheets',
-    nouns: 'saved sheets',
-  };
-  return savedSheetLoader;
-});
diff --git a/src/legacy/core_plugins/timelion/public/services/saved_sheets.ts b/src/legacy/core_plugins/timelion/public/services/saved_sheets.ts
new file mode 100644
index 0000000000000..df3898e3410dd
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/public/services/saved_sheets.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 { npStart } from 'ui/new_platform';
+import { SavedObjectLoader } from 'ui/saved_objects';
+// @ts-ignore
+import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
+// @ts-ignore
+import { uiModules } from 'ui/modules';
+import { createSavedSheetClass } from './_saved_sheet';
+
+const module = uiModules.get('app/sheet');
+
+// Register this service with the saved object registry so it can be
+// edited by the object editor.
+savedObjectManagementRegistry.register({
+  service: 'savedSheets',
+  title: 'sheets',
+});
+
+const savedObjectsClient = npStart.core.savedObjects.client;
+const services = {
+  savedObjectsClient,
+  indexPatterns: npStart.plugins.data.indexPatterns,
+  chrome: npStart.core.chrome,
+  overlays: npStart.core.overlays,
+};
+
+const SavedSheet = createSavedSheetClass(services, npStart.core.uiSettings);
+
+export const savedSheetLoader = new SavedObjectLoader(
+  SavedSheet,
+  savedObjectsClient,
+  npStart.core.chrome
+);
+savedSheetLoader.urlFor = id => `#/${encodeURIComponent(id)}`;
+// Customize loader properties since adding an 's' on type doesn't work for type 'timelion-sheet'.
+savedSheetLoader.loaderProperties = {
+  name: 'timelion-sheet',
+  noun: 'Saved Sheets',
+  nouns: 'saved sheets',
+};
+
+// This is the only thing that gets injected into controllers
+module.service('savedSheets', () => savedSheetLoader);
diff --git a/src/legacy/core_plugins/timelion/server/routes/run.js b/src/legacy/core_plugins/timelion/server/routes/run.js
deleted file mode 100644
index da0e3d5cb21eb..0000000000000
--- a/src/legacy/core_plugins/timelion/server/routes/run.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Bluebird from 'bluebird';
-import _ from 'lodash';
-import chainRunnerFn from '../handlers/chain_runner.js';
-const timelionDefaults = require('../lib/get_namespaced_settings')();
-
-function formatErrorResponse(e, h) {
-  return h
-    .response({
-      title: e.toString(),
-      message: e.toString(),
-    })
-    .code(500);
-}
-
-export function runRoute(server) {
-  server.route({
-    method: ['POST', 'GET'],
-    path: '/api/timelion/run',
-    handler: async (request, h) => {
-      try {
-        const uiSettings = await request.getUiSettingsService().getAll();
-
-        const tlConfig = require('../handlers/lib/tl_config.js')({
-          server,
-          request,
-          settings: _.defaults(uiSettings, timelionDefaults), // Just in case they delete some setting.
-        });
-
-        const chainRunner = chainRunnerFn(tlConfig);
-        const sheet = await Bluebird.all(
-          chainRunner.processRequest(
-            request.payload || {
-              sheet: [request.query.expression],
-              time: {
-                from: request.query.from,
-                to: request.query.to,
-                interval: request.query.interval,
-                timezone: request.query.timezone,
-              },
-            }
-          )
-        );
-
-        return {
-          sheet,
-          stats: chainRunner.getStats(),
-        };
-      } catch (err) {
-        server.log(['timelion', 'error'], `${err.toString()}: ${err.stack}`);
-        // TODO Maybe we should just replace everywhere we throw with Boom? Probably.
-        if (err.isBoom) {
-          return err;
-        } else {
-          return formatErrorResponse(err, h);
-        }
-      }
-    },
-  });
-}
diff --git a/src/legacy/core_plugins/timelion/server/routes/run.ts b/src/legacy/core_plugins/timelion/server/routes/run.ts
new file mode 100644
index 0000000000000..17f87825cd8b0
--- /dev/null
+++ b/src/legacy/core_plugins/timelion/server/routes/run.ts
@@ -0,0 +1,125 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import Joi from 'joi';
+import Bluebird from 'bluebird';
+import _ from 'lodash';
+import { Legacy } from 'kibana';
+// @ts-ignore
+import chainRunnerFn from '../handlers/chain_runner.js';
+// @ts-ignore
+import getNamespacesSettings from '../lib/get_namespaced_settings';
+// @ts-ignore
+import getTlConfig from '../handlers/lib/tl_config';
+
+const timelionDefaults = getNamespacesSettings();
+
+export interface TimelionRequestQuery {
+  payload: {
+    sheet: string[];
+    extended?: {
+      es: {
+        filter: {
+          bool: {
+            filter: string[] | object;
+            must: string[];
+            should: string[];
+            must_not: string[];
+          };
+        };
+      };
+    };
+  };
+  time?: {
+    from?: string;
+    interval: string;
+    timezone: string;
+    to?: string;
+  };
+}
+
+function formatErrorResponse(e: Error, h: Legacy.ResponseToolkit) {
+  return h
+    .response({
+      title: e.toString(),
+      message: e.toString(),
+    })
+    .code(500);
+}
+
+const requestPayload = {
+  payload: Joi.object({
+    sheet: Joi.array()
+      .items(Joi.string())
+      .required(),
+    extended: Joi.object({
+      es: Joi.object({
+        filter: Joi.object({
+          bool: Joi.object({
+            filter: Joi.array().allow(null),
+            must: Joi.array().allow(null),
+            should: Joi.array().allow(null),
+            must_not: Joi.array().allow(null),
+          }),
+        }),
+      }),
+    }).optional(),
+    time: Joi.object({
+      from: Joi.string(),
+      interval: Joi.string().required(),
+      timezone: Joi.string().required(),
+      to: Joi.string(),
+    }).required(),
+  }),
+};
+
+export function runRoute(server: Legacy.Server) {
+  server.route({
+    method: 'POST',
+    path: '/api/timelion/run',
+    options: {
+      validate: requestPayload,
+    },
+    handler: async (request: Legacy.Request & TimelionRequestQuery, h: Legacy.ResponseToolkit) => {
+      try {
+        const uiSettings = await request.getUiSettingsService().getAll();
+
+        const tlConfig = getTlConfig({
+          server,
+          request,
+          settings: _.defaults(uiSettings, timelionDefaults), // Just in case they delete some setting.
+        });
+        const chainRunner = chainRunnerFn(tlConfig);
+        const sheet = await Bluebird.all(chainRunner.processRequest(request.payload));
+
+        return {
+          sheet,
+          stats: chainRunner.getStats(),
+        };
+      } catch (err) {
+        server.log(['timelion', 'error'], `${err.toString()}: ${err.stack}`);
+        // TODO Maybe we should just replace everywhere we throw with Boom? Probably.
+        if (err.isBoom) {
+          return err;
+        } else {
+          return formatErrorResponse(err, h);
+        }
+      }
+    },
+  });
+}
diff --git a/src/legacy/core_plugins/timelion/server/types.ts b/src/legacy/core_plugins/timelion/server/types.ts
index 4971fa34863d3..e612bc14a0daa 100644
--- a/src/legacy/core_plugins/timelion/server/types.ts
+++ b/src/legacy/core_plugins/timelion/server/types.ts
@@ -24,3 +24,5 @@ export {
   TimelionFunctionArgsSuggestion,
   TimelionFunctionArgsTypes,
 } from './lib/classes/timelion_function';
+
+export { TimelionRequestQuery } from './routes/run';
diff --git a/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts b/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts
index a2f98b8c64e53..1f6600ea56a12 100644
--- a/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts
@@ -110,7 +110,7 @@ describe('Table Vis - Controller', () => {
       (cfg: any) => cfg,
       'time',
       stubFields,
-      npStart.core.uiSettings
+      npStart.core
     );
   });
 
diff --git a/src/legacy/core_plugins/vis_type_timeseries/index.ts b/src/legacy/core_plugins/vis_type_timeseries/index.ts
index eb20c0f23965a..9ca14b28e19b2 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/index.ts
+++ b/src/legacy/core_plugins/vis_type_timeseries/index.ts
@@ -19,13 +19,9 @@
 
 import { resolve } from 'path';
 import { Legacy } from 'kibana';
-import { PluginInitializerContext } from 'src/core/server';
-import { CoreSetup } from 'src/core/server';
-
-import { plugin } from './server/';
-import { CustomCoreSetup } from './server/plugin';
 
 import { LegacyPluginApi, LegacyPluginInitializer } from '../../../../src/legacy/types';
+import { VisTypeTimeseriesSetup } from '../../../plugins/vis_type_timeseries/server';
 
 const metricsPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
   new Plugin({
@@ -38,10 +34,9 @@ const metricsPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPlu
       injectDefaultVars: server => ({}),
     },
     init: (server: Legacy.Server) => {
-      const initializerContext = {} as PluginInitializerContext;
-      const core = { http: { server } } as CoreSetup & CustomCoreSetup;
-
-      plugin(initializerContext).setup(core);
+      const visTypeTimeSeriesPlugin = server.newPlatform.setup.plugins
+        .metrics as VisTypeTimeseriesSetup;
+      visTypeTimeSeriesPlugin.__legacy.registerLegacyAPI({ server });
     },
     config(Joi: any) {
       return Joi.object({
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/__snapshots__/terms.test.js.snap b/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/__snapshots__/terms.test.js.snap
index d46ddb497e426..ffd4d08204a7e 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/__snapshots__/terms.test.js.snap
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/__snapshots__/terms.test.js.snap
@@ -139,9 +139,6 @@ exports[`src/legacy/core_plugins/metrics/public/components/splits/terms.test.js
         labelType="label"
       >
         <EuiFieldNumber
-          compressed={false}
-          fullWidth={false}
-          isLoading={false}
           onChange={[Function]}
           value={10}
         />
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js b/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js
index 46dab92f3b245..2dbcdc4749a66 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { parseInterval } from 'ui/utils/parse_interval';
 import { GTE_INTERVAL_RE } from '../../common/interval_regexp';
 import { i18n } from '@kbn/i18n';
+import { parseInterval } from '../../../../../plugins/data/public';
 
 export function validateInterval(bounds, panel, maxBuckets) {
   const { interval } = panel;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/__mocks__/@elastic/charts.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/__mocks__/@elastic/charts.js
index cb59bef63681b..d7f96cf4354b5 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/__mocks__/@elastic/charts.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/__mocks__/@elastic/charts.js
@@ -38,8 +38,5 @@ export const ScaleType = {
   Time: 'time',
 };
 
-export const getSpecId = x => `id:${x}`;
-export const getGroupId = x => `groupId:${x}`;
-
 export const BarSeries = () => null;
 export const AreaSeries = () => null;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap
index 822de4cef0813..56504ca11ca39 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap
@@ -24,12 +24,9 @@ exports[`src/legacy/core_plugins/metrics/public/visualizations/views/timeseries/
   }
   curve={9}
   customSeriesColors={
-    Map {
-      Object {
-        "colorValues": Array [],
-        "specId": "id:61ca57f1-469d-11e7-af02-69e470af7417:Rome",
-      } => "rgb(0, 156, 224)",
-    }
+    Array [
+      "rgb(0, 156, 224)",
+    ]
   }
   data={
     Array [
@@ -44,10 +41,10 @@ exports[`src/legacy/core_plugins/metrics/public/visualizations/views/timeseries/
     ]
   }
   enableHistogramMode={true}
-  groupId="groupId:yaxis_main_group"
+  groupId="yaxis_main_group"
   hideInLegend={false}
   histogramModeAlignment="center"
-  id="id:61ca57f1-469d-11e7-af02-69e470af7417:Rome"
+  id="61ca57f1-469d-11e7-af02-69e470af7417:Rome"
   name="Rome"
   stackAsPercentage={false}
   timeZone="local"
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap
index 78133f2dda7cc..6317973cef536 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap
@@ -16,12 +16,9 @@ exports[`src/legacy/core_plugins/metrics/public/visualizations/views/timeseries/
     }
   }
   customSeriesColors={
-    Map {
-      Object {
-        "colorValues": Array [],
-        "specId": "id:61ca57f1-469d-11e7-af02-69e470af7417:Rome",
-      } => "rgb(0, 156, 224)",
-    }
+    Array [
+      "rgb(0, 156, 224)",
+    ]
   }
   data={
     Array [
@@ -36,10 +33,10 @@ exports[`src/legacy/core_plugins/metrics/public/visualizations/views/timeseries/
     ]
   }
   enableHistogramMode={true}
-  groupId="groupId:yaxis_main_group"
+  groupId="yaxis_main_group"
   hideInLegend={false}
   histogramModeAlignment="center"
-  id="id:61ca57f1-469d-11e7-af02-69e470af7417:Rome"
+  id="61ca57f1-469d-11e7-af02-69e470af7417:Rome"
   name="Rome"
   stackAsPercentage={false}
   timeZone="local"
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/area_decorator.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/area_decorator.js
index 536064139e6ea..411c0813cad7c 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/area_decorator.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/area_decorator.js
@@ -18,8 +18,8 @@
  */
 
 import React from 'react';
-import { getSpecId, getGroupId, ScaleType, AreaSeries } from '@elastic/charts';
-import { getSeriesColors, getAreaStyles } from '../utils/series_styles';
+import { ScaleType, AreaSeries } from '@elastic/charts';
+import { getAreaStyles } from '../utils/series_styles';
 import { ChartsEntities } from '../model/charts';
 import { X_ACCESSOR_INDEX, Y_ACCESSOR_INDEXES } from '../../../constants';
 
@@ -41,9 +41,9 @@ export function AreaSeriesDecorator({
   useDefaultGroupDomain,
   sortIndex,
 }) {
-  const id = getSpecId(seriesId);
-  const groupId = getGroupId(seriesGroupId);
-  const customSeriesColors = getSeriesColors(color, id);
+  const id = seriesId;
+  const groupId = seriesGroupId;
+  const customSeriesColors = [color];
   const areaSeriesStyle = getAreaStyles({ points, lines, color });
 
   const seriesSettings = {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/bar_decorator.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/bar_decorator.js
index 3dbe04dca06b8..9cc8931b48d9f 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/bar_decorator.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/bar_decorator.js
@@ -18,8 +18,8 @@
  */
 
 import React from 'react';
-import { getSpecId, getGroupId, ScaleType, BarSeries } from '@elastic/charts';
-import { getSeriesColors, getBarStyles } from '../utils/series_styles';
+import { ScaleType, BarSeries } from '@elastic/charts';
+import { getBarStyles } from '../utils/series_styles';
 import { ChartsEntities } from '../model/charts';
 import { X_ACCESSOR_INDEX, Y_ACCESSOR_INDEXES } from '../../../constants';
 
@@ -40,9 +40,9 @@ export function BarSeriesDecorator({
   useDefaultGroupDomain,
   sortIndex,
 }) {
-  const id = getSpecId(seriesId);
-  const groupId = getGroupId(seriesGroupId);
-  const customSeriesColors = getSeriesColors(color, id);
+  const id = seriesId;
+  const groupId = seriesGroupId;
+  const customSeriesColors = [color];
   const barSeriesStyle = getBarStyles(bars, color);
 
   const seriesSettings = {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/index.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/index.js
index a02ea83e5104b..bcd0b6314cef1 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/index.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/index.js
@@ -25,11 +25,8 @@ import {
   Chart,
   Position,
   Settings,
-  getAxisId,
-  getGroupId,
   DARK_THEME,
   LIGHT_THEME,
-  getAnnotationId,
   AnnotationDomainTypes,
   LineAnnotation,
   TooltipType,
@@ -75,7 +72,7 @@ export const TimeSeries = ({
   const chartRef = useRef();
   const updateCursor = (_, cursor) => {
     if (chartRef.current) {
-      chartRef.current.dispatchExternalCursorEvent(cursor);
+      chartRef.current.dispatchExternalPointerEvent(cursor);
     }
   };
 
@@ -99,7 +96,7 @@ export const TimeSeries = ({
         legendPosition={legendPosition}
         onBrushEnd={onBrush}
         animateData={false}
-        onCursorUpdate={handleCursorUpdate}
+        onPointerUpdate={handleCursorUpdate}
         theme={
           hasBarChart
             ? {}
@@ -126,7 +123,7 @@ export const TimeSeries = ({
         return (
           <LineAnnotation
             key={id}
-            annotationId={getAnnotationId(id)}
+            id={id}
             domainType={AnnotationDomainTypes.XDomain}
             dataValues={dataValues}
             marker={<EuiIcon type={ICON_TYPES_MAP[icon] || 'asterisk'} />}
@@ -213,8 +210,8 @@ export const TimeSeries = ({
       {yAxis.map(({ id, groupId, position, tickFormatter, domain, hide }) => (
         <Axis
           key={groupId}
-          groupId={getGroupId(groupId)}
-          id={getAxisId(id)}
+          groupId={groupId}
+          id={id}
           position={position}
           domain={domain}
           hide={hide}
@@ -225,7 +222,7 @@ export const TimeSeries = ({
       ))}
 
       <Axis
-        id={getAxisId('bottom')}
+        id="bottom"
         position={Position.Bottom}
         title={xAxisLabel}
         tickFormat={xAxisFormatter}
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/__snapshots__/series_styles.test.js.snap b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/__snapshots__/series_styles.test.js.snap
index 607580d1f37f8..8f0d602e09c7a 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/__snapshots__/series_styles.test.js.snap
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/__snapshots__/series_styles.test.js.snap
@@ -79,12 +79,3 @@ Object {
   },
 }
 `;
-
-exports[`src/legacy/core_plugins/metrics/public/visualizations/views/timeseries/utils/series_styles.js getSeriesColors() should match a snapshot 1`] = `
-Map {
-  Object {
-    "colorValues": Array [],
-    "specId": "IT",
-  } => "rgb(224, 0, 221)",
-}
-`;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/series_styles.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/series_styles.js
index 63be14790c6c5..2891751f121ca 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/series_styles.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/series_styles.js
@@ -56,12 +56,3 @@ export const getBarStyles = ({ show = true, lineWidth = 0, fill = 1 }, color) =>
     },
   },
 });
-
-export const getSeriesColors = (color, specId) => {
-  const map = new Map();
-  const seriesColorsValues = { specId, colorValues: [] };
-
-  map.set(seriesColorsValues, color);
-
-  return map;
-};
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/series_styles.test.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/series_styles.test.js
index ac0a7610f2660..c04ec457d1523 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/series_styles.test.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/utils/series_styles.test.js
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-import { getBarStyles, getSeriesColors, getAreaStyles } from './series_styles';
+import { getBarStyles, getAreaStyles } from './series_styles';
 
 describe('src/legacy/core_plugins/metrics/public/visualizations/views/timeseries/utils/series_styles.js', () => {
   let bars;
   let color;
-  let specId;
   let points;
   let lines;
 
@@ -33,7 +32,6 @@ describe('src/legacy/core_plugins/metrics/public/visualizations/views/timeseries
       show: true,
     };
     color = 'rgb(224, 0, 221)';
-    specId = 'IT';
     points = {
       lineWidth: 1,
       show: true,
@@ -60,12 +58,6 @@ describe('src/legacy/core_plugins/metrics/public/visualizations/views/timeseries
     });
   });
 
-  describe('getSeriesColors()', () => {
-    test('should match a snapshot', () => {
-      expect(getSeriesColors(color, specId)).toMatchSnapshot();
-    });
-  });
-
   describe('getAreaStyles()', () => {
     test('should match a snapshot', () => {
       expect(getAreaStyles({ points, lines, color })).toMatchSnapshot();
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/index.ts b/src/legacy/core_plugins/vis_type_timeseries/server/index.ts
index 14047c31f2dcd..c010628ca04bf 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/index.ts
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/index.ts
@@ -17,9 +17,5 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from 'kibana/server';
-import { MetricsServerPlugin as Plugin } from './plugin';
-
-export function plugin(initializerContext: PluginInitializerContext) {
-  return new Plugin(initializerContext);
-}
+export { init } from './init';
+export { getVisData, GetVisData, GetVisDataOptions } from './lib/get_vis_data';
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/init.ts b/src/legacy/core_plugins/vis_type_timeseries/server/init.ts
new file mode 100644
index 0000000000000..7b42ae8098016
--- /dev/null
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/init.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.
+ */
+
+// @ts-ignore
+import { fieldsRoutes } from './routes/fields';
+// @ts-ignore
+import { visDataRoutes } from './routes/vis';
+// @ts-ignore
+import { SearchStrategiesRegister } from './lib/search_strategies/search_strategies_register';
+// @ts-ignore
+import { getVisData } from './lib/get_vis_data';
+import { Framework } from '../../../../plugins/vis_type_timeseries/server';
+
+export const init = async (framework: Framework, __LEGACY: any) => {
+  const { core } = framework;
+  const router = core.http.createRouter();
+
+  visDataRoutes(router, framework);
+
+  // [LEGACY_TODO]
+  fieldsRoutes(__LEGACY.server);
+  SearchStrategiesRegister.init(__LEGACY.server);
+};
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.js
deleted file mode 100644
index 055d4477825c7..0000000000000
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.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.
- */
-
-import _ from 'lodash';
-import { getPanelData } from './vis_data/get_panel_data';
-
-export function getVisData(req) {
-  const promises = req.payload.panels.map(getPanelData(req));
-  return Promise.all(promises).then(res => {
-    return res.reduce((acc, data) => {
-      return _.assign(acc, data);
-    }, {});
-  });
-}
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.ts b/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.ts
new file mode 100644
index 0000000000000..58e624fa13442
--- /dev/null
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.ts
@@ -0,0 +1,101 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { RequestHandlerContext } from 'src/core/server';
+import _ from 'lodash';
+import { first, map } from 'rxjs/operators';
+import { getPanelData } from './vis_data/get_panel_data';
+import { Framework } from '../../../../../plugins/vis_type_timeseries/server';
+
+interface GetVisDataResponse {
+  [key: string]: GetVisDataPanel;
+}
+
+interface GetVisDataPanel {
+  id: string;
+  series: GetVisDataSeries[];
+}
+
+interface GetVisDataSeries {
+  id: string;
+  label: string;
+  data: GetVisDataDataPoint[];
+}
+
+type GetVisDataDataPoint = [number, number];
+
+export interface GetVisDataOptions {
+  timerange?: any;
+  panels?: any;
+  filters?: any;
+  state?: any;
+  query?: any;
+}
+
+export type GetVisData = (
+  requestContext: RequestHandlerContext,
+  options: GetVisDataOptions,
+  framework: Framework
+) => Promise<GetVisDataResponse>;
+
+export function getVisData(
+  requestContext: RequestHandlerContext,
+  options: GetVisDataOptions,
+  framework: Framework
+): Promise<GetVisDataResponse> {
+  // NOTE / TODO: This facade has been put in place to make migrating to the New Platform easier. It
+  // removes the need to refactor many layers of dependencies on "req", and instead just augments the top
+  // level object passed from here. The layers should be refactored fully at some point, but for now
+  // this works and we are still using the New Platform services for these vis data portions.
+  const reqFacade: any = {
+    payload: options,
+    getUiSettingsService: () => requestContext.core.uiSettings.client,
+    getSavedObjectsClient: () => requestContext.core.savedObjects.client,
+    server: {
+      plugins: {
+        elasticsearch: {
+          getCluster: () => {
+            return {
+              callWithRequest: async (req: any, endpoint: string, params: any) => {
+                return await requestContext.core.elasticsearch.dataClient.callAsCurrentUser(
+                  endpoint,
+                  params
+                );
+              },
+            };
+          },
+        },
+      },
+    },
+    getEsShardTimeout: async () => {
+      return await framework.globalConfig$
+        .pipe(
+          first(),
+          map(config => config.elasticsearch.shardTimeout.asMilliseconds())
+        )
+        .toPromise();
+    },
+  };
+  const promises = reqFacade.payload.panels.map(getPanelData(reqFacade));
+  return Promise.all(promises).then(res => {
+    return res.reduce((acc, data) => {
+      return _.assign(acc as any, data);
+    }, {});
+  }) as Promise<GetVisDataResponse>;
+}
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/__tests__/helpers/get_es_shard_timeout.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/__tests__/helpers/get_es_shard_timeout.js
index 2b53fc5a93b7b..b19f6a3241597 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/__tests__/helpers/get_es_shard_timeout.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/__tests__/helpers/get_es_shard_timeout.js
@@ -17,20 +17,14 @@
  * under the License.
  */
 
-import moment from 'moment';
-import { of } from 'rxjs';
 import { expect } from 'chai';
 import { getEsShardTimeout } from '../../helpers/get_es_shard_timeout';
 
 describe('getEsShardTimeout', () => {
   it('should return the elasticsearch.shardTimeout', async () => {
     const req = {
-      server: {
-        newPlatform: {
-          __internals: {
-            elasticsearch: { legacy: { config$: of({ shardTimeout: moment.duration(12345) }) } },
-          },
-        },
+      getEsShardTimeout: async () => {
+        return 12345;
       },
     };
 
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.ts b/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.ts
new file mode 100644
index 0000000000000..2f86236fefedc
--- /dev/null
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.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 function getPanelData(req: any): any;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js
index e3745bd6963e0..b4eb9e6b108ff 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js
@@ -48,7 +48,6 @@ export async function getSeriesData(req, panel) {
 
     const data = await searchRequest.search(searches);
     const series = data.map(handleResponseBody(panel));
-
     let annotations = null;
 
     if (panel.annotations && panel.annotations.length) {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js
index c8acfa730af67..4eb3075e9b658 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js
@@ -16,13 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { first, map } from 'rxjs/operators';
 
 export async function getEsShardTimeout(req) {
-  return await req.server.newPlatform.__internals.elasticsearch.legacy.config$
-    .pipe(
-      first(),
-      map(config => config.shardTimeout.asMilliseconds())
-    )
-    .toPromise();
+  return await req.getEsShardTimeout();
 }
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/plugin.ts b/src/legacy/core_plugins/vis_type_timeseries/server/plugin.ts
deleted file mode 100644
index ce4ab64ffa07a..0000000000000
--- a/src/legacy/core_plugins/vis_type_timeseries/server/plugin.ts
+++ /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 { Legacy } from 'kibana';
-import { PluginInitializerContext, CoreSetup } from 'kibana/server';
-
-// @ts-ignore
-import { fieldsRoutes } from './routes/fields';
-// @ts-ignore
-import { visDataRoutes } from './routes/vis';
-// @ts-ignore
-import { SearchStrategiesRegister } from './lib/search_strategies/search_strategies_register';
-// @ts-ignore
-import { getVisData } from './lib/get_vis_data';
-
-// TODO: Remove as CoreSetup is completed.
-export interface CustomCoreSetup {
-  http: {
-    server: Legacy.Server;
-  };
-}
-
-export class MetricsServerPlugin {
-  public initializerContext: PluginInitializerContext;
-
-  constructor(initializerContext: PluginInitializerContext) {
-    this.initializerContext = initializerContext;
-  }
-
-  public setup(core: CoreSetup & CustomCoreSetup) {
-    const { http } = core;
-
-    fieldsRoutes(http.server);
-    visDataRoutes(http.server);
-
-    // Expose getVisData to allow plugins to use TSVB's backend for metrics
-    http.server.expose('getVisData', getVisData);
-
-    SearchStrategiesRegister.init(http.server);
-  }
-}
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.js b/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.js
index 15ff7b9a6c90b..d2ded81309ffa 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.js
@@ -17,23 +17,28 @@
  * under the License.
  */
 
+import { schema } from '@kbn/config-schema';
 import { getVisData } from '../lib/get_vis_data';
-import Boom from 'boom';
 
-export const visDataRoutes = server => {
-  server.route({
-    path: '/api/metrics/vis/data',
-    method: 'POST',
-    handler: async req => {
-      try {
-        return await getVisData(req);
-      } catch (err) {
-        if (err.isBoom && err.status === 401) {
-          return err;
-        }
+const escapeHatch = schema.object({}, { allowUnknowns: true });
 
-        throw Boom.boomify(err, { statusCode: 500 });
-      }
+export const visDataRoutes = (router, framework) => {
+  router.post(
+    {
+      path: '/api/metrics/vis/data',
+      validate: {
+        body: escapeHatch,
+      },
     },
-  });
+    async (requestContext, request, response) => {
+      try {
+        const results = await getVisData(requestContext, request.body, framework);
+        return response.ok({ body: results });
+      } catch (error) {
+        return response.internalError({
+          body: error.message,
+        });
+      }
+    }
+  );
 };
diff --git a/src/legacy/core_plugins/vis_type_vega/index.ts b/src/legacy/core_plugins/vis_type_vega/index.ts
index 153cd6afb3ccc..52c253c6ac0b5 100644
--- a/src/legacy/core_plugins/vis_type_vega/index.ts
+++ b/src/legacy/core_plugins/vis_type_vega/index.ts
@@ -33,9 +33,15 @@ const vegaPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPlugin
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       hacks: [resolve(__dirname, 'public/legacy')],
-      injectDefaultVars: server => ({
-        enableExternalUrls: server.config().get('vega.enableExternalUrls'),
-      }),
+      injectDefaultVars: server => {
+        const serverConfig = server.config();
+        const mapConfig: Record<string, any> = serverConfig.get('map');
+
+        return {
+          emsTileLayerId: mapConfig.emsTileLayerId,
+          enableExternalUrls: serverConfig.get('vega.enableExternalUrls'),
+        };
+      },
     },
     init: (server: Legacy.Server) => ({}),
     config(Joi: any) {
diff --git a/src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js b/src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js
index d10f5a3bd7b14..0c12b3d928815 100644
--- a/src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js
+++ b/src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js
@@ -62,7 +62,18 @@ describe('VegaVisualizations', () => {
       vegaVisualizationDependencies = {
         es: $injector.get('es'),
         serviceSettings: $injector.get('serviceSettings'),
-        uiSettings: $injector.get('config'),
+        core: {
+          uiSettings: $injector.get('config'),
+        },
+        plugins: {
+          data: {
+            query: {
+              timefilter: {
+                timefilter: {},
+              },
+            },
+          },
+        },
       };
 
       if (!visRegComplete) {
diff --git a/src/legacy/core_plugins/vis_type_vega/public/legacy.ts b/src/legacy/core_plugins/vis_type_vega/public/legacy.ts
index d40212bec3b7f..a7928c7d65e81 100644
--- a/src/legacy/core_plugins/vis_type_vega/public/legacy.ts
+++ b/src/legacy/core_plugins/vis_type_vega/public/legacy.ts
@@ -21,20 +21,25 @@ import { PluginInitializerContext } from 'kibana/public';
 import { npSetup, npStart } from 'ui/new_platform';
 
 import { setup as visualizationsSetup } from '../../visualizations/public/np_ready/public/legacy';
-import { VegaPluginSetupDependencies } from './plugin';
+import { VegaPluginSetupDependencies, VegaPluginStartDependencies } from './plugin';
 import { LegacyDependenciesPlugin } from './shim';
 import { plugin } from '.';
 
-const plugins: Readonly<VegaPluginSetupDependencies> = {
+const setupPlugins: Readonly<VegaPluginSetupDependencies> = {
   expressions: npSetup.plugins.expressions,
   visualizations: visualizationsSetup,
+  data: npSetup.plugins.data,
 
   // Temporary solution
   // It will be removed when all dependent services are migrated to the new platform.
   __LEGACY: new LegacyDependenciesPlugin(),
 };
 
+const startPlugins: Readonly<VegaPluginStartDependencies> = {
+  data: npStart.plugins.data,
+};
+
 const pluginInstance = plugin({} as PluginInitializerContext);
 
-export const setup = pluginInstance.setup(npSetup.core, plugins);
-export const start = pluginInstance.start(npStart.core);
+export const setup = pluginInstance.setup(npSetup.core, setupPlugins);
+export const start = pluginInstance.start(npStart.core, startPlugins);
diff --git a/src/legacy/core_plugins/vis_type_vega/public/plugin.ts b/src/legacy/core_plugins/vis_type_vega/public/plugin.ts
index 5166770d1727b..75444a4a4f8e4 100644
--- a/src/legacy/core_plugins/vis_type_vega/public/plugin.ts
+++ b/src/legacy/core_plugins/vis_type_vega/public/plugin.ts
@@ -16,32 +16,37 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import {
-  PluginInitializerContext,
-  CoreSetup,
-  CoreStart,
-  Plugin,
-  IUiSettingsClient,
-} from '../../../../core/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../../core/public';
 import { LegacyDependenciesPlugin, LegacyDependenciesPluginSetup } from './shim';
 import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
+import { Plugin as DataPublicPlugin } from '../../../../plugins/data/public';
 import { VisualizationsSetup } from '../../visualizations/public';
+import { setNotifications, setData, setSavedObjects } from './services';
 
 import { createVegaFn } from './vega_fn';
 import { createVegaTypeDefinition } from './vega_type';
 
 /** @internal */
 export interface VegaVisualizationDependencies extends LegacyDependenciesPluginSetup {
-  uiSettings: IUiSettingsClient;
+  core: CoreSetup;
+  plugins: {
+    data: ReturnType<DataPublicPlugin['setup']>;
+  };
 }
 
 /** @internal */
 export interface VegaPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
   visualizations: VisualizationsSetup;
+  data: ReturnType<DataPublicPlugin['setup']>;
   __LEGACY: LegacyDependenciesPlugin;
 }
 
+/** @internal */
+export interface VegaPluginStartDependencies {
+  data: ReturnType<DataPublicPlugin['start']>;
+}
+
 /** @internal */
 export class VegaPlugin implements Plugin<Promise<void>, void> {
   initializerContext: PluginInitializerContext;
@@ -52,10 +57,13 @@ export class VegaPlugin implements Plugin<Promise<void>, void> {
 
   public async setup(
     core: CoreSetup,
-    { expressions, visualizations, __LEGACY }: VegaPluginSetupDependencies
+    { data, expressions, visualizations, __LEGACY }: VegaPluginSetupDependencies
   ) {
     const visualizationDependencies: Readonly<VegaVisualizationDependencies> = {
-      uiSettings: core.uiSettings,
+      core,
+      plugins: {
+        data,
+      },
       ...(await __LEGACY.setup()),
     };
 
@@ -66,7 +74,9 @@ export class VegaPlugin implements Plugin<Promise<void>, void> {
     );
   }
 
-  public start(core: CoreStart) {
-    // nothing to do here yet
+  public start(core: CoreStart, { data }: VegaPluginStartDependencies) {
+    setNotifications(core.notifications);
+    setSavedObjects(core.savedObjects);
+    setData(data);
   }
 }
diff --git a/src/legacy/core_plugins/vis_type_vega/public/services.ts b/src/legacy/core_plugins/vis_type_vega/public/services.ts
new file mode 100644
index 0000000000000..94723f1a378d2
--- /dev/null
+++ b/src/legacy/core_plugins/vis_type_vega/public/services.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 { SavedObjectsStart } from 'kibana/public';
+import { NotificationsStart } from 'src/core/public';
+import { DataPublicPluginStart } from '../../../../plugins/data/public';
+import { createGetterSetter } from '../../../../plugins/kibana_utils/public';
+
+export const [getData, setData] = createGetterSetter<DataPublicPluginStart>('Data');
+
+export const [getNotifications, setNotifications] = createGetterSetter<NotificationsStart>(
+  'Notifications'
+);
+
+export const [getSavedObjects, setSavedObjects] = createGetterSetter<SavedObjectsStart>(
+  'SavedObjects'
+);
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 26380bf2b9d94..089cc3215d87d 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,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { timefilter } from 'ui/timefilter';
 import { esFilters, esQuery, TimeRange, Query } from '../../../../plugins/data/public';
 
 // @ts-ignore
@@ -39,10 +37,12 @@ interface VegaRequestHandlerParams {
 
 export function createVegaRequestHandler({
   es,
-  uiSettings,
+  plugins,
+  core: { uiSettings },
   serviceSettings,
 }: VegaVisualizationDependencies) {
   const searchCache = new SearchCache(es, { max: 10, maxAge: 4 * 1000 });
+  const { timefilter } = plugins.data.query.timefilter;
   const timeCache = new TimeCache(timefilter, 3 * 1000);
 
   return ({ timeRange, filters, query, visParams }: VegaRequestHandlerParams) => {
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 98e376fdac2d6..9d6adfd11aedd 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
@@ -64,7 +64,7 @@ export class VegaBaseView {
     this._$parentEl = $(opts.parentEl);
     this._parser = opts.vegaParser;
     this._serviceSettings = opts.serviceSettings;
-    this._queryfilter = opts.queryfilter;
+    this._filterManager = opts.filterManager;
     this._timefilter = opts.timefilter;
     this._findIndex = opts.findIndex;
     this._view = null;
@@ -271,7 +271,7 @@ export class VegaBaseView {
   async addFilterHandler(query, index) {
     const indexId = await this._findIndex(index);
     const filter = esFilters.buildQueryFilter(query, indexId);
-    this._queryfilter.addFilters(filter);
+    this._filterManager.addFilters(filter);
   }
 
   /**
@@ -288,7 +288,7 @@ export class VegaBaseView {
     //  this._queryfilter.removeFilter(filter);
     $injector.get('$rootScope').$evalAsync(() => {
       try {
-        this._queryfilter.removeFilter(filter);
+        this._filterManager.removeFilter(filter);
       } catch (err) {
         this.onError(err);
       }
@@ -296,7 +296,7 @@ export class VegaBaseView {
   }
 
   removeAllFiltersHandler() {
-    this._queryfilter.removeAll();
+    this._filterManager.removeAll();
   }
 
   /**
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 1d95978a9dadb..3d48eeaaf3f94 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
@@ -16,22 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import chrome from 'ui/chrome';
 import { i18n } from '@kbn/i18n';
-import { toastNotifications } from 'ui/notify';
 import { VegaView } from './vega_view/vega_view';
 import { VegaMapView } from './vega_view/vega_map_view';
-import { timefilter } from 'ui/timefilter';
-import { npStart } from 'ui/new_platform';
-
-import { findIndexPatternByTitle } from '../../data/public/index_patterns';
+import { getNotifications, getData, getSavedObjects } from './services';
 
 export const createVegaVisualization = ({ serviceSettings }) =>
   class VegaVisualization {
     constructor(el, vis) {
-      this.savedObjectsClient = chrome.getSavedObjectsClient();
       this._el = el;
       this._vis = vis;
+
+      this.savedObjectsClient = getSavedObjects();
+      this.dataPlugin = getData();
     }
 
     /**
@@ -40,9 +37,11 @@ export const createVegaVisualization = ({ serviceSettings }) =>
      * @returns {Promise<string>} index id
      */
     async findIndex(index) {
+      const { indexPatterns } = this.dataPlugin;
       let idxObj;
+
       if (index) {
-        idxObj = await findIndexPatternByTitle(this.savedObjectsClient, index);
+        idxObj = indexPatterns.findByTitle(this.savedObjectsClient, index);
         if (!idxObj) {
           throw new Error(
             i18n.translate('visTypeVega.visualization.indexNotFoundErrorMessage', {
@@ -52,7 +51,7 @@ export const createVegaVisualization = ({ serviceSettings }) =>
           );
         }
       } else {
-        idxObj = await npStart.plugins.data.indexPatterns.getDefault();
+        idxObj = await indexPatterns.getDefault();
         if (!idxObj) {
           throw new Error(
             i18n.translate('visTypeVega.visualization.unableToFindDefaultIndexErrorMessage', {
@@ -71,8 +70,10 @@ export const createVegaVisualization = ({ serviceSettings }) =>
      * @returns {Promise<void>}
      */
     async render(visData, visParams, status) {
+      const { toasts } = getNotifications();
+
       if (!visData && !this._vegaView) {
-        toastNotifications.addWarning(
+        toasts.addWarning(
           i18n.translate('visTypeVega.visualization.unableToRenderWithoutDataWarningMessage', {
             defaultMessage: 'Unable to render without data',
           })
@@ -86,7 +87,7 @@ export const createVegaVisualization = ({ serviceSettings }) =>
         if (this._vegaView) {
           this._vegaView.onError(error);
         } else {
-          toastNotifications.addError(error, {
+          toasts.addError(error, {
             title: i18n.translate('visTypeVega.visualization.renderErrorTitle', {
               defaultMessage: 'Vega error',
             }),
@@ -103,13 +104,14 @@ export const createVegaVisualization = ({ serviceSettings }) =>
           this._vegaView = null;
         }
 
-        const { filterManager } = npStart.plugins.data.query;
+        const { filterManager } = this.dataPlugin.query;
+        const { timefilter } = this.dataPlugin.query.timefilter;
         const vegaViewParams = {
           parentEl: this._el,
           vegaParser,
           serviceSettings,
-          queryfilter: filterManager,
-          timefilter: timefilter,
+          filterManager,
+          timefilter,
           findIndex: this.findIndex.bind(this),
         };
 
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/__snapshots__/visualization_noresults.test.js.snap b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/__snapshots__/visualization_noresults.test.js.snap
index d0539439dd33e..336b39cf15879 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/__snapshots__/visualization_noresults.test.js.snap
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/__snapshots__/visualization_noresults.test.js.snap
@@ -21,6 +21,7 @@ exports[`VisualizationNoResults should render according to snapshot 1`] = `
           class="euiIcon euiIcon--medium euiIcon--subdued euiIcon--app euiIcon-isLoading"
           focusable="false"
           height="16"
+          role="img"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/__snapshots__/visualization_requesterror.test.js.snap b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/__snapshots__/visualization_requesterror.test.js.snap
index d494567e6d250..84b504a305605 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/components/__snapshots__/visualization_requesterror.test.js.snap
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/components/__snapshots__/visualization_requesterror.test.js.snap
@@ -15,6 +15,7 @@ exports[`VisualizationRequestError should render according to snapshot 1`] = `
         class="euiIcon euiIcon--medium euiIcon--danger euiIcon-isLoading"
         focusable="false"
         height="16"
+        role="img"
         viewBox="0 0 16 16"
         width="16"
         xmlns="http://www.w3.org/2000/svg"
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
index 0f9e9c11a9dbc..59c6bddb64521 100644
--- a/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
+++ b/src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts
@@ -28,7 +28,7 @@ import {
   createFormat,
 } from '../../../legacy_imports';
 // eslint-disable-next-line
-import { SearchSourceContract } from '../../../../../../ui/public/courier/search_source/search_source';
+import { ISearchSource } from '../../../../../../ui/public/courier/search_source/search_source';
 import { Vis, VisParams, VisState } from '..';
 
 interface SchemaConfigParams {
@@ -466,7 +466,7 @@ export const buildVislibDimensions = async (
 // take a Vis object and decorate it with the necessary params (dimensions, bucket, metric, etc)
 export const getVisParams = async (
   vis: Vis,
-  params: { searchSource: SearchSourceContract; timeRange?: any; abortSignal?: AbortSignal }
+  params: { searchSource: ISearchSource; timeRange?: any; abortSignal?: AbortSignal }
 ) => {
   const schemas = getSchemas(vis, params.timeRange);
   let visConfig = cloneDeep(vis.params);
@@ -484,7 +484,7 @@ export const getVisParams = async (
 export const buildPipeline = async (
   vis: Vis,
   params: {
-    searchSource: SearchSourceContract;
+    searchSource: ISearchSource;
     timeRange?: any;
   }
 ) => {
diff --git a/src/legacy/server/config/schema.js b/src/legacy/server/config/schema.js
index 00993b01179ef..a18cb7de5a61b 100644
--- a/src/legacy/server/config/schema.js
+++ b/src/legacy/server/config/schema.js
@@ -69,24 +69,7 @@ export default () =>
     }),
 
     server: Joi.object({
-      uuid: Joi.string()
-        .guid()
-        .default(),
       name: Joi.string().default(os.hostname()),
-      defaultRoute: Joi.string().regex(/^\//, `start with a slash`),
-      customResponseHeaders: Joi.object()
-        .unknown(true)
-        .default({}),
-      xsrf: Joi.object({
-        disableProtection: Joi.boolean().default(false),
-        whitelist: Joi.array()
-          .items(Joi.string().regex(/^\//, 'start with a slash'))
-          .default([]),
-        token: Joi.string()
-          .optional()
-          .notes('Deprecated'),
-      }).default(),
-
       // keep them for BWC, remove when not used in Legacy.
       // validation should be in sync with one in New platform.
       // https://github.com/elastic/kibana/blob/master/src/core/server/http/http_config.ts
@@ -106,11 +89,14 @@ export default () =>
 
       autoListen: HANDLED_IN_NEW_PLATFORM,
       cors: HANDLED_IN_NEW_PLATFORM,
+      customResponseHeaders: HANDLED_IN_NEW_PLATFORM,
       keepaliveTimeout: HANDLED_IN_NEW_PLATFORM,
       maxPayloadBytes: HANDLED_IN_NEW_PLATFORM,
       socketTimeout: HANDLED_IN_NEW_PLATFORM,
       ssl: HANDLED_IN_NEW_PLATFORM,
       compression: HANDLED_IN_NEW_PLATFORM,
+      uuid: HANDLED_IN_NEW_PLATFORM,
+      xsrf: HANDLED_IN_NEW_PLATFORM,
     }).default(),
 
     uiSettings: HANDLED_IN_NEW_PLATFORM,
@@ -143,7 +129,11 @@ export default () =>
           .keys({
             enabled: Joi.boolean().default(false),
             everyBytes: Joi.number()
-              .greater(1024)
+              // > 100KB
+              .greater(102399)
+              // < 1GB
+              .less(1073741825)
+              // 10MB
               .default(10485760),
             keepFiles: Joi.number()
               .greater(2)
diff --git a/src/legacy/server/config/schema.test.js b/src/legacy/server/config/schema.test.js
index 1207a05a47497..03d2fe53c2ce7 100644
--- a/src/legacy/server/config/schema.test.js
+++ b/src/legacy/server/config/schema.test.js
@@ -19,7 +19,6 @@
 
 import schemaProvider from './schema';
 import Joi from 'joi';
-import { set } from 'lodash';
 
 describe('Config schema', function() {
   let schema;
@@ -100,60 +99,5 @@ describe('Config schema', function() {
         expect(error.details[0]).toHaveProperty('path', ['server', 'rewriteBasePath']);
       });
     });
-
-    describe('xsrf', () => {
-      it('disableProtection is `false` by default.', () => {
-        const {
-          error,
-          value: {
-            server: {
-              xsrf: { disableProtection },
-            },
-          },
-        } = validate({});
-        expect(error).toBe(null);
-        expect(disableProtection).toBe(false);
-      });
-
-      it('whitelist is empty by default.', () => {
-        const {
-          value: {
-            server: {
-              xsrf: { whitelist },
-            },
-          },
-        } = validate({});
-        expect(whitelist).toBeInstanceOf(Array);
-        expect(whitelist).toHaveLength(0);
-      });
-
-      it('whitelist rejects paths that do not start with a slash.', () => {
-        const config = {};
-        set(config, 'server.xsrf.whitelist', ['path/to']);
-
-        const { error } = validate(config);
-        expect(error).toBeInstanceOf(Object);
-        expect(error).toHaveProperty('details');
-        expect(error.details[0]).toHaveProperty('path', ['server', 'xsrf', 'whitelist', 0]);
-      });
-
-      it('whitelist accepts paths that start with a slash.', () => {
-        const config = {};
-        set(config, 'server.xsrf.whitelist', ['/path/to']);
-
-        const {
-          error,
-          value: {
-            server: {
-              xsrf: { whitelist },
-            },
-          },
-        } = validate(config);
-        expect(error).toBe(null);
-        expect(whitelist).toBeInstanceOf(Array);
-        expect(whitelist).toHaveLength(1);
-        expect(whitelist).toContain('/path/to');
-      });
-    });
   });
 });
diff --git a/src/legacy/server/http/index.js b/src/legacy/server/http/index.js
index 9b5ce2046c5d3..265d71e95b301 100644
--- a/src/legacy/server/http/index.js
+++ b/src/legacy/server/http/index.js
@@ -22,11 +22,9 @@ import { resolve } from 'path';
 import _ from 'lodash';
 import Boom from 'boom';
 
-import { setupVersionCheck } from './version_check';
 import { registerHapiPlugins } from './register_hapi_plugins';
 import { setupBasePathProvider } from './setup_base_path_provider';
 import { setupDefaultRouteProvider } from './setup_default_route_provider';
-import { setupXsrf } from './xsrf';
 
 export default async function(kbnServer, server, config) {
   server = kbnServer.server;
@@ -62,29 +60,6 @@ export default async function(kbnServer, server, config) {
     });
   });
 
-  // attach the app name to the server, so we can be sure we are actually talking to kibana
-  server.ext('onPreResponse', function onPreResponse(req, h) {
-    const response = req.response;
-
-    const customHeaders = {
-      ...config.get('server.customResponseHeaders'),
-      'kbn-name': kbnServer.name,
-    };
-
-    if (response.isBoom) {
-      response.output.headers = {
-        ...response.output.headers,
-        ...customHeaders,
-      };
-    } else {
-      Object.keys(customHeaders).forEach(name => {
-        response.header(name, customHeaders[name]);
-      });
-    }
-
-    return h.continue;
-  });
-
   server.route({
     path: '/',
     method: 'GET',
@@ -116,7 +91,4 @@ export default async function(kbnServer, server, config) {
 
   // Expose static assets
   server.exposeStaticDir('/ui/{path*}', resolve(__dirname, '../../ui/public/assets'));
-
-  setupVersionCheck(server, config);
-  setupXsrf(server, config);
 }
diff --git a/src/legacy/server/http/integration_tests/version_check.test.js b/src/legacy/server/http/integration_tests/version_check.test.js
deleted file mode 100644
index 8d71c98d64969..0000000000000
--- a/src/legacy/server/http/integration_tests/version_check.test.js
+++ /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 { resolve } from 'path';
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
-
-const src = resolve.bind(null, __dirname, '../../../../../src');
-
-const versionHeader = 'kbn-version';
-const version = require(src('../package.json')).version; // eslint-disable-line import/no-dynamic-require
-
-describe('version_check request filter', function() {
-  let root;
-  beforeAll(async () => {
-    root = kbnTestServer.createRoot();
-
-    await root.setup();
-    await root.start();
-
-    kbnTestServer.getKbnServer(root).server.route({
-      path: '/version_check/test/route',
-      method: 'GET',
-      handler: function() {
-        return 'ok';
-      },
-    });
-  }, 30000);
-
-  afterAll(async () => await root.shutdown());
-
-  it('accepts requests with the correct version passed in the version header', async function() {
-    await kbnTestServer.request
-      .get(root, '/version_check/test/route')
-      .set(versionHeader, version)
-      .expect(200, 'ok');
-  });
-
-  it('rejects requests with an incorrect version passed in the version header', async function() {
-    await kbnTestServer.request
-      .get(root, '/version_check/test/route')
-      .set(versionHeader, `invalid:${version}`)
-      .expect(400, /"Browser client is out of date/);
-  });
-
-  it('accepts requests that do not include a version header', async function() {
-    await kbnTestServer.request.get(root, '/version_check/test/route').expect(200, 'ok');
-  });
-});
diff --git a/src/legacy/server/http/integration_tests/xsrf.test.js b/src/legacy/server/http/integration_tests/xsrf.test.js
deleted file mode 100644
index a06f4eec4fd5c..0000000000000
--- a/src/legacy/server/http/integration_tests/xsrf.test.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
-
-const destructiveMethods = ['POST', 'PUT', 'DELETE'];
-const src = resolve.bind(null, __dirname, '../../../../../src');
-
-const xsrfHeader = 'kbn-xsrf';
-const versionHeader = 'kbn-version';
-const testPath = '/xsrf/test/route';
-const whitelistedTestPath = '/xsrf/test/route/whitelisted';
-const actualVersion = require(src('../package.json')).version; // eslint-disable-line import/no-dynamic-require
-
-describe('xsrf request filter', () => {
-  let root;
-  beforeAll(async () => {
-    root = kbnTestServer.createRoot({
-      server: {
-        xsrf: { disableProtection: false, whitelist: [whitelistedTestPath] },
-      },
-    });
-
-    await root.setup();
-    await root.start();
-
-    const kbnServer = kbnTestServer.getKbnServer(root);
-    kbnServer.server.route({
-      path: testPath,
-      method: 'GET',
-      handler: async function() {
-        return 'ok';
-      },
-    });
-
-    kbnServer.server.route({
-      path: testPath,
-      method: destructiveMethods,
-      config: {
-        // Disable payload parsing to make HapiJS server accept any content-type header.
-        payload: {
-          parse: false,
-        },
-        validate: { payload: null },
-      },
-      handler: async function() {
-        return 'ok';
-      },
-    });
-
-    kbnServer.server.route({
-      path: whitelistedTestPath,
-      method: destructiveMethods,
-      config: {
-        // Disable payload parsing to make HapiJS server accept any content-type header.
-        payload: {
-          parse: false,
-        },
-        validate: { payload: null },
-      },
-      handler: async function() {
-        return 'ok';
-      },
-    });
-  }, 30000);
-
-  afterAll(async () => await root.shutdown());
-
-  describe(`nonDestructiveMethod: GET`, function() {
-    it('accepts requests without a token', async function() {
-      await kbnTestServer.request.get(root, testPath).expect(200, 'ok');
-    });
-
-    it('accepts requests with the xsrf header', async function() {
-      await kbnTestServer.request
-        .get(root, testPath)
-        .set(xsrfHeader, 'anything')
-        .expect(200, 'ok');
-    });
-  });
-
-  describe(`nonDestructiveMethod: HEAD`, function() {
-    it('accepts requests without a token', async function() {
-      await kbnTestServer.request.head(root, testPath).expect(200, undefined);
-    });
-
-    it('accepts requests with the xsrf header', async function() {
-      await kbnTestServer.request
-        .head(root, testPath)
-        .set(xsrfHeader, 'anything')
-        .expect(200, undefined);
-    });
-  });
-
-  for (const method of destructiveMethods) {
-    // eslint-disable-next-line no-loop-func
-    describe(`destructiveMethod: ${method}`, function() {
-      it('accepts requests with the xsrf header', async function() {
-        await kbnTestServer.request[method.toLowerCase()](root, testPath)
-          .set(xsrfHeader, 'anything')
-          .expect(200, 'ok');
-      });
-
-      // this is still valid for existing csrf protection support
-      // it does not actually do any validation on the version value itself
-      it('accepts requests with the version header', async function() {
-        await kbnTestServer.request[method.toLowerCase()](root, testPath)
-          .set(versionHeader, actualVersion)
-          .expect(200, 'ok');
-      });
-
-      it('rejects requests without either an xsrf or version header', async function() {
-        await kbnTestServer.request[method.toLowerCase()](root, testPath).expect(400, {
-          statusCode: 400,
-          error: 'Bad Request',
-          message: 'Request must contain a kbn-xsrf header.',
-        });
-      });
-
-      it('accepts whitelisted requests without either an xsrf or version header', async function() {
-        await kbnTestServer.request[method.toLowerCase()](root, whitelistedTestPath).expect(
-          200,
-          'ok'
-        );
-      });
-    });
-  }
-});
diff --git a/src/legacy/server/http/setup_default_route_provider.ts b/src/legacy/server/http/setup_default_route_provider.ts
index 0e7bcf1f56f6f..9a580dd1c59bd 100644
--- a/src/legacy/server/http/setup_default_route_provider.ts
+++ b/src/legacy/server/http/setup_default_route_provider.ts
@@ -29,7 +29,7 @@ export function setupDefaultRouteProvider(server: Legacy.Server) {
 
     const uiSettings = request.getUiSettingsService();
 
-    const defaultRoute = await uiSettings.get('defaultRoute');
+    const defaultRoute = await uiSettings.get<string>('defaultRoute');
     const qualifiedDefaultRoute = `${request.getBasePath()}${defaultRoute}`;
 
     if (isRelativePath(qualifiedDefaultRoute, serverBasePath)) {
diff --git a/src/legacy/server/http/version_check.js b/src/legacy/server/http/version_check.js
deleted file mode 100644
index 12666c9a0f3f6..0000000000000
--- a/src/legacy/server/http/version_check.js
+++ /dev/null
@@ -1,39 +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 { badRequest } from 'boom';
-
-export function setupVersionCheck(server, config) {
-  const versionHeader = 'kbn-version';
-  const actualVersion = config.get('pkg.version');
-
-  server.ext('onPostAuth', function onPostAuthVersionCheck(req, h) {
-    const versionRequested = req.headers[versionHeader];
-
-    if (versionRequested && versionRequested !== actualVersion) {
-      throw badRequest(
-        `Browser client is out of date, \
-        please refresh the page ("${versionHeader}" header was "${versionRequested}" but should be "${actualVersion}")`,
-        { expected: actualVersion, got: versionRequested }
-      );
-    }
-
-    return h.continue;
-  });
-}
diff --git a/src/legacy/server/http/xsrf.js b/src/legacy/server/http/xsrf.js
deleted file mode 100644
index 79ac3af6d9f90..0000000000000
--- a/src/legacy/server/http/xsrf.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 { badRequest } from 'boom';
-
-export function setupXsrf(server, config) {
-  const disabled = config.get('server.xsrf.disableProtection');
-  const whitelist = config.get('server.xsrf.whitelist');
-  const versionHeader = 'kbn-version';
-  const xsrfHeader = 'kbn-xsrf';
-
-  server.ext('onPostAuth', function onPostAuthXsrf(req, h) {
-    if (disabled) {
-      return h.continue;
-    }
-
-    if (whitelist.includes(req.path)) {
-      return h.continue;
-    }
-
-    const isSafeMethod = req.method === 'get' || req.method === 'head';
-    const hasVersionHeader = versionHeader in req.headers;
-    const hasXsrfHeader = xsrfHeader in req.headers;
-
-    if (!isSafeMethod && !hasVersionHeader && !hasXsrfHeader) {
-      throw badRequest(`Request must contain a ${xsrfHeader} header.`);
-    }
-
-    return h.continue;
-  });
-}
diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts
index d6dea4decee00..0af6dacee59c8 100644
--- a/src/legacy/server/kbn_server.d.ts
+++ b/src/legacy/server/kbn_server.d.ts
@@ -20,32 +20,39 @@
 import { ResponseObject, Server } from 'hapi';
 import { UnwrapPromise } from '@kbn/utility-types';
 
-import { SavedObjectsClientProviderOptions, CoreSetup, CoreStart } from 'src/core/server';
 import {
   ConfigService,
+  CoreSetup,
+  CoreStart,
   ElasticsearchServiceSetup,
   EnvironmentMode,
   LoggerFactory,
   SavedObjectsClientContract,
   SavedObjectsLegacyService,
+  SavedObjectsClientProviderOptions,
   IUiSettingsClient,
   PackageInfo,
+  LegacyRequest,
+  LegacyServiceSetupDeps,
+  LegacyServiceStartDeps,
+  LegacyServiceDiscoverPlugins,
 } from '../../core/server';
 
-import { LegacyServiceSetupDeps, LegacyServiceStartDeps } from '../../core/server/';
 // Disable lint errors for imports from src/core/server/saved_objects until SavedObjects migration is complete
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { SavedObjectsManagement } from '../../core/server/saved_objects/management';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { LegacyConfig } from '../../core/server/legacy';
+import { LegacyConfig, ILegacyService, ILegacyInternals } from '../../core/server/legacy';
 import { ApmOssPlugin } from '../core_plugins/apm_oss';
 import { CallClusterWithRequest, ElasticsearchPlugin } from '../core_plugins/elasticsearch';
 import { UsageCollectionSetup } from '../../plugins/usage_collection/server';
 import { IndexPatternsServiceFactory } from './index_patterns';
 import { Capabilities } from '../../core/server';
 import { UiSettingsServiceFactoryOptions } from '../../legacy/ui/ui_settings/ui_settings_service_factory';
+import { HomeServerPluginSetup } from '../../plugins/home/server';
 
-export type KibanaConfig = LegacyConfig;
+// lot of legacy code was assuming this type only had these two methods
+export type KibanaConfig = Pick<LegacyConfig, 'get' | 'has'>;
 
 export interface UiApp {
   getId(): string;
@@ -98,41 +105,65 @@ type KbnMixinFunc = (kbnServer: KbnServer, server: Server, config: any) => Promi
 
 export interface PluginsSetup {
   usageCollection: UsageCollectionSetup;
+  home: HomeServerPluginSetup;
   [key: string]: object;
 }
 
+export interface KibanaCore {
+  __internals: {
+    elasticsearch: LegacyServiceSetupDeps['core']['elasticsearch'];
+    hapiServer: LegacyServiceSetupDeps['core']['http']['server'];
+    kibanaMigrator: LegacyServiceStartDeps['core']['savedObjects']['migrator'];
+    legacy: ILegacyInternals;
+    rendering: LegacyServiceSetupDeps['core']['rendering'];
+    uiPlugins: LegacyServiceSetupDeps['core']['plugins']['uiPlugins'];
+    uiSettings: LegacyServiceSetupDeps['core']['uiSettings'];
+    savedObjectsClientProvider: LegacyServiceStartDeps['core']['savedObjects']['clientProvider'];
+  };
+  env: {
+    mode: Readonly<EnvironmentMode>;
+    packageInfo: Readonly<PackageInfo>;
+  };
+  setupDeps: {
+    core: CoreSetup;
+    plugins: PluginsSetup;
+  };
+  startDeps: {
+    core: CoreSetup;
+    plugins: Record<string, object>;
+  };
+  logger: LoggerFactory;
+}
+
+export interface NewPlatform {
+  __internals: KibanaCore['__internals'];
+  env: KibanaCore['env'];
+  coreContext: {
+    logger: KibanaCore['logger'];
+  };
+  setup: KibanaCore['setupDeps'];
+  start: KibanaCore['startDeps'];
+  stop: null;
+}
+
+export type LegacyPlugins = Pick<
+  LegacyServiceDiscoverPlugins,
+  'pluginSpecs' | 'disabledPluginSpecs' | 'uiExports'
+>;
+
 // eslint-disable-next-line import/no-default-export
 export default class KbnServer {
-  public readonly newPlatform: {
-    __internals: {
-      hapiServer: LegacyServiceSetupDeps['core']['http']['server'];
-      uiPlugins: LegacyServiceSetupDeps['core']['plugins']['uiPlugins'];
-      elasticsearch: LegacyServiceSetupDeps['core']['elasticsearch'];
-      uiSettings: LegacyServiceSetupDeps['core']['uiSettings'];
-      kibanaMigrator: LegacyServiceStartDeps['core']['savedObjects']['migrator'];
-    };
-    env: {
-      mode: Readonly<EnvironmentMode>;
-      packageInfo: Readonly<PackageInfo>;
-    };
-    coreContext: {
-      logger: LoggerFactory;
-    };
-    setup: {
-      core: CoreSetup;
-      plugins: PluginsSetup;
-    };
-    start: {
-      core: CoreStart;
-      plugins: Record<string, object>;
-    };
-    stop: null;
-  };
+  public readonly newPlatform: NewPlatform;
   public server: Server;
   public inject: Server['inject'];
   public pluginSpecs: any[];
 
-  constructor(settings: any, core: any);
+  constructor(
+    settings: Record<string, any>,
+    config: KibanaConfig,
+    core: KibanaCore,
+    legacyPlugins: LegacyPlugins
+  );
 
   public ready(): Promise<void>;
   public mixin(...fns: KbnMixinFunc[]): Promise<void>;
diff --git a/src/legacy/server/kbn_server.js b/src/legacy/server/kbn_server.js
index ffa16fb0a0ad1..8ab55d4c517b5 100644
--- a/src/legacy/server/kbn_server.js
+++ b/src/legacy/server/kbn_server.js
@@ -35,7 +35,6 @@ import optimizeMixin from '../../optimize';
 import * as Plugins from './plugins';
 import { indexPatternsMixin } from './index_patterns';
 import { savedObjectsMixin } from './saved_objects/saved_objects_mixin';
-import { sampleDataMixin } from './sample_data';
 import { capabilitiesMixin } from './capabilities';
 import { urlShorteningMixin } from './url_shortening';
 import { serverExtensionsMixin } from './server_extensions';
@@ -43,9 +42,21 @@ import { uiMixin } from '../ui';
 import { sassMixin } from './sass';
 import { i18nMixin } from './i18n';
 
+/**
+ * @typedef {import('./kbn_server').KibanaConfig} KibanaConfig
+ * @typedef {import('./kbn_server').KibanaCore} KibanaCore
+ * @typedef {import('./kbn_server').LegacyPlugins} LegacyPlugins
+ */
+
 const rootDir = fromRoot('.');
 
 export default class KbnServer {
+  /**
+   * @param {Record<string, any>} settings
+   * @param {KibanaConfig} config
+   * @param {KibanaCore} core
+   * @param {LegacyPlugins} legacyPlugins
+   */
   constructor(settings, config, core, legacyPlugins) {
     this.name = pkg.name;
     this.version = pkg.version;
@@ -112,9 +123,6 @@ export default class KbnServer {
         // setup capabilities routes
         capabilitiesMixin,
 
-        // setup routes for installing/uninstalling sample data sets
-        sampleDataMixin,
-
         // setup routes for short urls
         urlShorteningMixin,
 
diff --git a/src/legacy/server/sample_data/README.md b/src/legacy/server/sample_data/README.md
deleted file mode 100644
index 9e93504348922..0000000000000
--- a/src/legacy/server/sample_data/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-### What happens when a user installs a sample data set?
-1) Kibana deletes existing Elastic search indicies for the sample data set if they exist from previous installs.
-2) Kibana creates Elasticsearch indicies with the provided field mappings.
-3) Kibana uses bulk insert to ingest the new-line delimited json into the Elasticsearch index. Kibana migrates timestamps provided in new-line delimited json to the current time frame for any date field defined in `timeFields`
-4) Kibana will install all saved objects for sample data set. This will override any saved objects previouslly installed for sample data set.
-
-Elasticsearch index names are prefixed with `kibana_sample_data_`. For more details see [createIndexName](/src/legacy/server/sample_data/routes/lib/create_index_name.js)
-
-Sample data sets typically provide data that spans 5 weeks from the past and 5 weeks into the future so users see data relative to `now` for a few weeks after installing sample data sets.
-
-### Adding new sample data sets
-Use [existing sample data sets](/src/legacy/server/sample_data/data_sets) as examples.
-To avoid bloating the Kibana distribution, keep data set size to a minimum.
-
-Follow the steps below to add new Sample data sets to Kibana.
-1) Create new-line delimited json containing sample data.
-2) Create file with Elasticsearch field mappings for sample data indices.
-3) Create Kibana saved objects for sample data including index-patterns, visualizations, and dashboards. The best way to extract the saved objects is from the Kibana management -> saved objects [export UI](https://www.elastic.co/guide/en/kibana/current/managing-saved-objects.html#_export)
-4) Define sample data spec conforming to [Data Set Schema](/src/legacy/server/sample_data/data_set_schema.js).
-5) Register sample data by calling `server.registerSampleDataset(yourSpecProvider)` where `yourSpecProvider` is a function that returns an object containing your sample data spec from step 4.
diff --git a/src/legacy/server/sample_data/data_sets/ecommerce/index.js b/src/legacy/server/sample_data/data_sets/ecommerce/index.js
deleted file mode 100644
index ebf415c9a428d..0000000000000
--- a/src/legacy/server/sample_data/data_sets/ecommerce/index.js
+++ /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 path from 'path';
-import { i18n } from '@kbn/i18n';
-import { getSavedObjects } from './saved_objects';
-import { fieldMappings } from './field_mappings';
-
-export function ecommerceSpecProvider() {
-  return {
-    id: 'ecommerce',
-    name: i18n.translate('server.sampleData.ecommerceSpecTitle', {
-      defaultMessage: 'Sample eCommerce orders',
-    }),
-    description: i18n.translate('server.sampleData.ecommerceSpecDescription', {
-      defaultMessage: 'Sample data, visualizations, and dashboards for tracking eCommerce orders.',
-    }),
-    previewImagePath: '/plugins/kibana/home/sample_data_resources/ecommerce/dashboard.png',
-    darkPreviewImagePath: '/plugins/kibana/home/sample_data_resources/ecommerce/dashboard_dark.png',
-    overviewDashboard: '722b74f0-b882-11e8-a6d9-e546fe2bba5f',
-    defaultIndex: 'ff959d40-b880-11e8-a6d9-e546fe2bba5f',
-    savedObjects: getSavedObjects(),
-    dataIndices: [
-      {
-        id: 'ecommerce',
-        dataPath: path.join(__dirname, './ecommerce.json.gz'),
-        fields: fieldMappings,
-        timeFields: ['order_date'],
-        currentTimeMarker: '2016-12-11T00:00:00',
-        preserveDayOfWeekTimeOfDay: true,
-      },
-    ],
-  };
-}
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
deleted file mode 100644
index 1438ce4bbc3cd..0000000000000
--- a/src/legacy/server/sample_data/data_sets/ecommerce/saved_objects.js
+++ /dev/null
@@ -1,381 +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 const getSavedObjects = () => [
-  {
-    id: '37cc8650-b882-11e8-a6d9-e546fe2bba5f',
-    type: 'visualization',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.salesByCategoryTitle', {
-        defaultMessage: '[eCommerce] Sales by Category',
-      }),
-      visState:
-        '{"title":"[eCommerce] Sales by Category","type":"area","params":{"type":"area","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Sum of total_quantity"}}],"seriesParams":[{"show":"true","type":"area","mode":"stacked","data":{"label":"Sum of total_quantity","id":"1"},"drawLinesBetweenPoints":true,"showCircles":true,"interpolate":"linear","valueAxis":"ValueAxis-1"}],"addTooltip":true,"addLegend":true,"legendPosition":"top","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"sum","schema":"metric","params":{"field":"total_quantity"}},{"id":"2","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"order_date","interval":"auto","time_zone":"America/New_York","drop_partials":false,"customInterval":"2h","min_doc_count":1,"extended_bounds":{}}},{"id":"3","enabled":true,"type":"terms","schema":"group","params":{"field":"category.keyword","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: 'ed8436b0-b88b-11e8-a6d9-e546fe2bba5f',
-    type: 'visualization',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.salesByGenderTitle', {
-        defaultMessage: '[eCommerce] Sales by Gender',
-      }),
-      visState:
-        '{"title":"[eCommerce] Sales by Gender","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"customer_gender","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '09ffee60-b88c-11e8-a6d9-e546fe2bba5f',
-    type: 'visualization',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.markdownTitle', {
-        defaultMessage: '[eCommerce] Markdown',
-      }),
-      visState:
-        '{"title":"[eCommerce] Markdown","type":"markdown","params":{"fontSize":12,"openLinksInNewTab":false,"markdown":"### Sample eCommerce Data\\nThis dashboard contains sample data for you to play with. You can view it, search it, and interact with the visualizations. For more information about Kibana, check our [docs](https://www.elastic.co/guide/en/kibana/current/index.html)."},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '1c389590-b88d-11e8-a6d9-e546fe2bba5f',
-    type: 'visualization',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.controlsTitle', {
-        defaultMessage: '[eCommerce] Controls',
-      }),
-      visState:
-        '{"title":"[eCommerce] Controls","type":"input_control_vis","params":{"controls":[{"id":"1536977437774","indexPattern":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","fieldName":"manufacturer.keyword","parent":"","label":"Manufacturer","type":"list","options":{"type":"terms","multiselect":true,"dynamicOptions":true,"size":5,"order":"desc"}},{"id":"1536977465554","indexPattern":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","fieldName":"category.keyword","parent":"","label":"Category","type":"list","options":{"type":"terms","multiselect":true,"dynamicOptions":true,"size":5,"order":"desc"}},{"id":"1536977596163","indexPattern":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","fieldName":"total_quantity","parent":"","label":"Quantity","type":"range","options":{"decimalPlaces":0,"step":1}}],"updateFiltersOnChange":false,"useTimeFilter":true,"pinFilters":false},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '45e07720-b890-11e8-a6d9-e546fe2bba5f',
-    type: 'visualization',
-    updated_at: '2018-10-01T15:17:30.755Z',
-    version: 2,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.promotionTrackingTitle', {
-        defaultMessage: '[eCommerce] Promotion Tracking',
-      }),
-      visState:
-        '{"title":"[eCommerce] Promotion Tracking","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417","type":"timeseries","series":[{"id":"ea20ae70-b88d-11e8-a451-f37365e9f268","color":"rgba(240,138,217,1)","split_mode":"everything","metrics":[{"id":"ea20ae71-b88d-11e8-a451-f37365e9f268","type":"sum","field":"taxful_total_price"}],"separate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":"0.7","stacked":"none","filter":"products.product_name:*trouser*","label":"Revenue Trousers","value_template":"${{value}}"},{"id":"062d77b0-b88e-11e8-a451-f37365e9f268","color":"rgba(191,240,129,1)","split_mode":"everything","metrics":[{"id":"062d77b1-b88e-11e8-a451-f37365e9f268","type":"sum","field":"taxful_total_price"}],"separate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":"0.7","stacked":"none","filter":"products.product_name:*watch*","label":"Revenue Watches","value_template":"${{value}}"},{"id":"61ca57f1-469d-11e7-af02-69e470af7417","color":"rgba(23,233,230,1)","split_mode":"everything","metrics":[{"id":"61ca57f2-469d-11e7-af02-69e470af7417","type":"sum","field":"taxful_total_price"}],"separate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":"0.7","stacked":"none","filter":"products.product_name:*bag*","label":"Revenue Bags","value_template":"${{value}}"},{"id":"faa2c170-b88d-11e8-a451-f37365e9f268","color":"rgba(235,186,180,1)","split_mode":"everything","metrics":[{"id":"faa2c171-b88d-11e8-a451-f37365e9f268","type":"sum","field":"taxful_total_price"}],"separate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":"0.7","stacked":"none","filter":"products.product_name:*cocktail dress*","label":"Revenue Cocktail Dresses","value_template":"${{value}}"}],"time_field":"order_date","index_pattern":"kibana_sample_data_ecommerce","interval":">=12h","axis_position":"left","axis_formatter":"number","axis_scale":"normal","show_legend":1,"show_grid":1,"legend_position":"bottom","annotations":[{"fields":"taxful_total_price","template":"Ring the bell! ${{taxful_total_price}}","index_pattern":"kibana_sample_data_ecommerce","query_string":"taxful_total_price:>250","id":"c8c30be0-b88f-11e8-a451-f37365e9f268","color":"rgba(25,77,51,1)","time_field":"order_date","icon":"fa-bell","ignore_global_filters":1,"ignore_panel_filters":1}]},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '10f1a240-b891-11e8-a6d9-e546fe2bba5f',
-    type: 'visualization',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.totalRevenueTitle', {
-        defaultMessage: '[eCommerce] Total Revenue',
-      }),
-      visState:
-        '{"title":"[eCommerce] Total Revenue","type":"metric","params":{"addTooltip":true,"addLegend":false,"type":"metric","metric":{"percentageMode":false,"useRanges":false,"colorSchema":"Green to Red","metricColorMode":"None","colorsRange":[{"from":0,"to":10000}],"labels":{"show":false},"invertColors":false,"style":{"bgFill":"#000","bgColor":false,"labelColor":false,"subText":"","fontSize":36}}},"aggs":[{"id":"1","enabled":true,"type":"sum","schema":"metric","params":{"field":"taxful_total_price","customLabel":"Total Revenue"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: 'b80e6540-b891-11e8-a6d9-e546fe2bba5f',
-    type: 'visualization',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.soldProductsPerDayTitle', {
-        defaultMessage: '[eCommerce] Sold Products per Day',
-      }),
-      visState:
-        '{"title":"[eCommerce] Sold Products per Day","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417","type":"gauge","series":[{"id":"61ca57f1-469d-11e7-af02-69e470af7417","color":"#68BC00","split_mode":"everything","metrics":[{"id":"61ca57f2-469d-11e7-af02-69e470af7417","type":"count"}],"separate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":0.5,"stacked":"none","label":"Trxns / day"}],"time_field":"order_date","index_pattern":"kibana_sample_data_ecommerce","interval":"1d","axis_position":"left","axis_formatter":"number","axis_scale":"normal","show_legend":1,"show_grid":1,"gauge_color_rules":[{"value":150,"id":"6da070c0-b891-11e8-b645-195edeb9de84","gauge":"rgba(104,188,0,1)","operator":"gte"},{"value":150,"id":"9b0cdbc0-b891-11e8-b645-195edeb9de84","gauge":"rgba(244,78,59,1)","operator":"lt"}],"gauge_width":"15","gauge_inner_width":10,"gauge_style":"half","filter":"","gauge_max":"300"},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '4b3ec120-b892-11e8-a6d9-e546fe2bba5f',
-    type: 'visualization',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.averageSalesPriceTitle', {
-        defaultMessage: '[eCommerce] Average Sales Price',
-      }),
-      visState:
-        '{"title":"[eCommerce] Average Sales Price","type":"gauge","params":{"type":"gauge","addTooltip":true,"addLegend":true,"isDisplayWarning":false,"gauge":{"verticalSplit":false,"extendRange":true,"percentageMode":false,"gaugeType":"Circle","gaugeStyle":"Full","backStyle":"Full","orientation":"vertical","colorSchema":"Green to Red","gaugeColorMode":"Labels","colorsRange":[{"from":0,"to":50},{"from":50,"to":75},{"from":75,"to":100}],"invertColors":true,"labels":{"show":true,"color":"black"},"scale":{"show":false,"labels":false,"color":"#333"},"type":"meter","style":{"bgWidth":0.9,"width":0.9,"mask":false,"bgMask":false,"maskBars":50,"bgFill":"#eee","bgColor":false,"subText":"per order","fontSize":60,"labelColor":true},"minAngle":0,"maxAngle":6.283185307179586}},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"taxful_total_price","customLabel":"average spend"}}]}',
-      uiStateJSON:
-        '{"vis":{"defaultColors":{"0 - 50":"rgb(165,0,38)","50 - 75":"rgb(255,255,190)","75 - 100":"rgb(0,104,55)"}}}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '9ca7aa90-b892-11e8-a6d9-e546fe2bba5f',
-    type: 'visualization',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.averageSoldQuantityTitle', {
-        defaultMessage: '[eCommerce] Average Sold Quantity',
-      }),
-      visState:
-        '{"title":"[eCommerce] Average Sold Quantity","type":"gauge","params":{"type":"gauge","addTooltip":true,"addLegend":true,"isDisplayWarning":false,"gauge":{"verticalSplit":false,"extendRange":true,"percentageMode":false,"gaugeType":"Circle","gaugeStyle":"Full","backStyle":"Full","orientation":"vertical","colorSchema":"Green to Red","gaugeColorMode":"Labels","colorsRange":[{"from":0,"to":2},{"from":2,"to":3},{"from":3,"to":4}],"invertColors":true,"labels":{"show":true,"color":"black"},"scale":{"show":false,"labels":false,"color":"#333"},"type":"meter","style":{"bgWidth":0.9,"width":0.9,"mask":false,"bgMask":false,"maskBars":50,"bgFill":"#eee","bgColor":false,"subText":"per order","fontSize":60,"labelColor":true},"minAngle":0,"maxAngle":6.283185307179586}},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"total_quantity","customLabel":"average items"}}]}',
-      uiStateJSON:
-        '{"vis":{"defaultColors":{"0 - 2":"rgb(165,0,38)","2 - 3":"rgb(255,255,190)","3 - 4":"rgb(0,104,55)"}}}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '3ba638e0-b894-11e8-a6d9-e546fe2bba5f',
-    type: 'search',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.ordersTitle', {
-        defaultMessage: '[eCommerce] Orders',
-      }),
-      description: '',
-      hits: 0,
-      columns: ['category', 'sku', 'taxful_total_price', 'total_quantity'],
-      sort: [['order_date', 'desc']],
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","highlightAll":true,"version":true,"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '9c6f83f0-bb4d-11e8-9c84-77068524bcab',
-    type: 'visualization',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.averageSalesPerRegionTitle', {
-        defaultMessage: '[eCommerce] Average Sales Per Region',
-      }),
-      visState:
-        '{"title":"[eCommerce] Average Sales Per Region","type":"region_map","params":{"legendPosition":"bottomright","addTooltip":true,"colorSchema":"Blues","selectedLayer":{"attribution":"<p><a href=\\"http://www.naturalearthdata.com/about/terms-of-use\\">Made with NaturalEarth</a>|<a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","weight":1,"name":"World Countries","url":"https://vector.maps.elastic.co/blob/5659313586569216?elastic_tile_service_tos=agree&my_app_version=7.0.0-alpha1&license=f6c534b8-91b9-4499-8804-a2e9789ecc95","format":{"type":"geojson"},"fields":[{"name":"iso2","description":"Two letter abbreviation"},{"name":"name","description":"Country name"},{"name":"iso3","description":"Three letter abbreviation"}],"created_at":"2017-04-26T17:12:15.978370","tags":[],"id":5659313586569216,"layerId":"elastic_maps_service.World Countries","isEMS":true},"emsHotLink":"https://maps.elastic.co/v2#file/World Countries","selectedJoinField":{"name":"iso2","description":"Two letter abbreviation"},"isDisplayWarning":true,"wms":{"enabled":false,"options":{"format":"image/png","transparent":true}},"mapZoom":2,"mapCenter":[0,0],"outlineWeight":1,"showAllShapes":true},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"taxful_total_price","customLabel":"Average Sale"}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"geoip.country_iso_code","size":100,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: 'b72dd430-bb4d-11e8-9c84-77068524bcab',
-    type: 'visualization',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.topSellingProductsTitle', {
-        defaultMessage: '[eCommerce] Top Selling Products',
-      }),
-      visState:
-        '{"title":"[eCommerce] Top Selling Products","type":"tagcloud","params":{"scale":"linear","orientation":"single","minFontSize":18,"maxFontSize":72,"showLabel":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"products.product_name.keyword","size":7,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: 'ff959d40-b880-11e8-a6d9-e546fe2bba5f',
-    type: 'index-pattern',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    migrationVersion: {},
-    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,"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]"}}}',
-    },
-  },
-  {
-    id: '722b74f0-b882-11e8-a6d9-e546fe2bba5f',
-    type: 'dashboard',
-    updated_at: '2018-10-01T15:13:03.270Z',
-    version: 1,
-    references: [
-      {
-        name: 'panel_0',
-        type: 'visualization',
-        id: '37cc8650-b882-11e8-a6d9-e546fe2bba5f',
-      },
-      {
-        name: 'panel_1',
-        type: 'visualization',
-        id: 'ed8436b0-b88b-11e8-a6d9-e546fe2bba5f',
-      },
-      {
-        name: 'panel_2',
-        type: 'visualization',
-        id: '09ffee60-b88c-11e8-a6d9-e546fe2bba5f',
-      },
-      {
-        name: 'panel_3',
-        type: 'visualization',
-        id: '1c389590-b88d-11e8-a6d9-e546fe2bba5f',
-      },
-      {
-        name: 'panel_4',
-        type: 'visualization',
-        id: '45e07720-b890-11e8-a6d9-e546fe2bba5f',
-      },
-      {
-        name: 'panel_5',
-        type: 'visualization',
-        id: '10f1a240-b891-11e8-a6d9-e546fe2bba5f',
-      },
-      {
-        name: 'panel_6',
-        type: 'visualization',
-        id: 'b80e6540-b891-11e8-a6d9-e546fe2bba5f',
-      },
-      {
-        name: 'panel_7',
-        type: 'visualization',
-        id: '4b3ec120-b892-11e8-a6d9-e546fe2bba5f',
-      },
-      {
-        name: 'panel_8',
-        type: 'visualization',
-        id: '9ca7aa90-b892-11e8-a6d9-e546fe2bba5f',
-      },
-      {
-        name: 'panel_9',
-        type: 'search',
-        id: '3ba638e0-b894-11e8-a6d9-e546fe2bba5f',
-      },
-      {
-        name: 'panel_10',
-        type: 'visualization',
-        id: '9c6f83f0-bb4d-11e8-9c84-77068524bcab',
-      },
-      {
-        name: 'panel_11',
-        type: 'visualization',
-        id: 'b72dd430-bb4d-11e8-9c84-77068524bcab',
-      },
-    ],
-    migrationVersion: {
-      dashboard: '7.0.0',
-    },
-    attributes: {
-      title: i18n.translate('server.sampleData.ecommerceSpec.revenueDashboardTitle', {
-        defaultMessage: '[eCommerce] Revenue Dashboard',
-      }),
-      hits: 0,
-      description: i18n.translate('server.sampleData.ecommerceSpec.revenueDashboardDescription', {
-        defaultMessage: 'Analyze mock eCommerce orders and revenue',
-      }),
-      panelsJSON:
-        '[{"embeddableConfig":{"vis":{"colors":{"Men\'s Accessories":"#82B5D8","Men\'s Clothing":"#F9BA8F","Men\'s Shoes":"#F29191","Women\'s Accessories":"#F4D598","Women\'s Clothing":"#70DBED","Women\'s Shoes":"#B7DBAB"}}},"gridData":{"x":12,"y":18,"w":36,"h":10,"i":"1"},"panelIndex":"1","version":"7.0.0-alpha1","panelRefName":"panel_0"},{"embeddableConfig":{"vis":{"colors":{"FEMALE":"#6ED0E0","MALE":"#447EBC"},"legendOpen":false}},"gridData":{"x":12,"y":7,"w":12,"h":11,"i":"2"},"panelIndex":"2","version":"7.0.0-alpha1","panelRefName":"panel_1"},{"embeddableConfig":{},"gridData":{"x":0,"y":0,"w":18,"h":7,"i":"3"},"panelIndex":"3","version":"7.0.0-alpha1","panelRefName":"panel_2"},{"embeddableConfig":{},"gridData":{"x":18,"y":0,"w":30,"h":7,"i":"4"},"panelIndex":"4","version":"7.0.0-alpha1","panelRefName":"panel_3"},{"embeddableConfig":{},"gridData":{"x":0,"y":28,"w":48,"h":11,"i":"5"},"panelIndex":"5","version":"7.0.0-alpha1","panelRefName":"panel_4"},{"embeddableConfig":{},"gridData":{"x":0,"y":18,"w":12,"h":10,"i":"6"},"panelIndex":"6","version":"7.0.0-alpha1","panelRefName":"panel_5"},{"embeddableConfig":{},"gridData":{"x":0,"y":7,"w":12,"h":11,"i":"7"},"panelIndex":"7","version":"7.0.0-alpha1","panelRefName":"panel_6"},{"embeddableConfig":{"vis":{"colors":{"0 - 50":"#E24D42","50 - 75":"#EAB839","75 - 100":"#7EB26D"},"defaultColors":{"0 - 50":"rgb(165,0,38)","50 - 75":"rgb(255,255,190)","75 - 100":"rgb(0,104,55)"},"legendOpen":false}},"gridData":{"x":24,"y":7,"w":12,"h":11,"i":"8"},"panelIndex":"8","version":"7.0.0-alpha1","panelRefName":"panel_7"},{"embeddableConfig":{"vis":{"colors":{"0 - 2":"#E24D42","2 - 3":"#F2C96D","3 - 4":"#9AC48A"},"defaultColors":{"0 - 2":"rgb(165,0,38)","2 - 3":"rgb(255,255,190)","3 - 4":"rgb(0,104,55)"},"legendOpen":false}},"gridData":{"x":36,"y":7,"w":12,"h":11,"i":"9"},"panelIndex":"9","version":"7.0.0-alpha1","panelRefName":"panel_8"},{"embeddableConfig":{},"gridData":{"x":0,"y":54,"w":48,"h":18,"i":"10"},"panelIndex":"10","version":"7.0.0-alpha1","panelRefName":"panel_9"},{"embeddableConfig":{"mapZoom":2,"mapCenter":[28.304380682962783,-22.148437500000004]},"gridData":{"x":0,"y":39,"w":24,"h":15,"i":"11"},"panelIndex":"11","version":"7.0.0-alpha1","panelRefName":"panel_10"},{"embeddableConfig":{},"gridData":{"x":24,"y":39,"w":24,"h":15,"i":"12"},"panelIndex":"12","version":"7.0.0-alpha1","panelRefName":"panel_11"}]',
-      optionsJSON: '{"hidePanelTitles":false,"useMargins":true}',
-      version: 1,
-      timeRestore: true,
-      timeTo: 'now',
-      timeFrom: 'now-7d',
-      refreshInterval: {
-        pause: false,
-        value: 900000,
-      },
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"language":"kuery","query":""},"filter":[]}',
-      },
-    },
-  },
-];
diff --git a/src/legacy/server/sample_data/data_sets/flights/index.js b/src/legacy/server/sample_data/data_sets/flights/index.js
deleted file mode 100644
index 382f82de88305..0000000000000
--- a/src/legacy/server/sample_data/data_sets/flights/index.js
+++ /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 path from 'path';
-import { i18n } from '@kbn/i18n';
-import { getSavedObjects } from './saved_objects';
-import { fieldMappings } from './field_mappings';
-
-export function flightsSpecProvider() {
-  return {
-    id: 'flights',
-    name: i18n.translate('server.sampleData.flightsSpecTitle', {
-      defaultMessage: 'Sample flight data',
-    }),
-    description: i18n.translate('server.sampleData.flightsSpecDescription', {
-      defaultMessage: 'Sample data, visualizations, and dashboards for monitoring flight routes.',
-    }),
-    previewImagePath: '/plugins/kibana/home/sample_data_resources/flights/dashboard.png',
-    darkPreviewImagePath: '/plugins/kibana/home/sample_data_resources/flights/dashboard_dark.png',
-    overviewDashboard: '7adfa750-4c81-11e8-b3d7-01146121b73d',
-    defaultIndex: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
-    savedObjects: getSavedObjects(),
-    dataIndices: [
-      {
-        id: 'flights',
-        dataPath: path.join(__dirname, './flights.json.gz'),
-        fields: fieldMappings,
-        timeFields: ['timestamp'],
-        currentTimeMarker: '2018-01-09T00:00:00',
-        preserveDayOfWeekTimeOfDay: true,
-      },
-    ],
-  };
-}
diff --git a/src/legacy/server/sample_data/data_sets/flights/saved_objects.js b/src/legacy/server/sample_data/data_sets/flights/saved_objects.js
deleted file mode 100644
index 69e77e67c5d9c..0000000000000
--- a/src/legacy/server/sample_data/data_sets/flights/saved_objects.js
+++ /dev/null
@@ -1,557 +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 const getSavedObjects = () => [
-  {
-    id: 'aeb212e0-4c84-11e8-b3d7-01146121b73d',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.controlsTitle', {
-        defaultMessage: '[Flights] Controls',
-      }),
-      visState:
-        '{"title":"[Flights] Controls","type":"input_control_vis","params":{"controls":[{"id":"1525098134264","indexPattern":"d3d7af60-4c81-11e8-b3d7-01146121b73d","fieldName":"OriginCityName","parent":"","label":"Origin City","type":"list","options":{"type":"terms","multiselect":true,"size":100,"order":"desc"}},{"id":"1525099277699","indexPattern":"d3d7af60-4c81-11e8-b3d7-01146121b73d","fieldName":"DestCityName","parent":"1525098134264","label":"Destination City","type":"list","options":{"type":"terms","multiselect":true,"size":100,"order":"desc"}},{"id":"1525099307278","indexPattern":"d3d7af60-4c81-11e8-b3d7-01146121b73d","fieldName":"AvgTicketPrice","parent":"","label":"Average Ticket Price","type":"range","options":{"decimalPlaces":0,"step":10}}],"updateFiltersOnChange":false,"useTimeFilter":true,"pinFilters":false},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{}',
-      },
-    },
-  },
-  {
-    id: 'c8fc3d30-4c87-11e8-b3d7-01146121b73d',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.flightCountAndAverageTicketPriceTitle', {
-        defaultMessage: '[Flights] Flight Count and Average Ticket Price',
-      }),
-      visState:
-        '{"title":"[Flights] Flight Count and Average Ticket Price","type":"area","params":{"type":"area","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Average Ticket Price"}},{"id":"ValueAxis-2","name":"RightAxis-1","type":"value","position":"right","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Flight Count"}}],"seriesParams":[{"show":true,"mode":"stacked","type":"area","drawLinesBetweenPoints":true,"showCircles":false,"interpolate":"linear","lineWidth":2,"data":{"id":"5","label":"Flight Count"},"valueAxis":"ValueAxis-2"},{"show":true,"mode":"stacked","type":"line","drawLinesBetweenPoints":false,"showCircles":true,"interpolate":"linear","data":{"id":"4","label":"Average Ticket Price"},"valueAxis":"ValueAxis-1","lineWidth":2}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false,"radiusRatio":13},"aggs":[{"id":"3","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"timestamp","interval":"auto","customInterval":"2h","min_doc_count":1,"extended_bounds":{}}},{"id":"5","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Flight Count"}},{"id":"4","enabled":true,"type":"avg","schema":"metric","params":{"field":"AvgTicketPrice","customLabel":"Average Ticket Price"}},{"id":"2","enabled":true,"type":"avg","schema":"radius","params":{"field":"AvgTicketPrice"}}]}',
-      uiStateJSON:
-        '{"vis":{"legendOpen":true,"colors":{"Average Ticket Price":"#629E51","Flight Count":"#AEA2E0"}}}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '571aaf70-4c88-11e8-b3d7-01146121b73d',
-    type: 'search',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.flightLogTitle', {
-        defaultMessage: '[Flights] Flight Log',
-      }),
-      description: '',
-      hits: 0,
-      columns: [
-        'Carrier',
-        'OriginCityName',
-        'OriginCountry',
-        'DestCityName',
-        'DestCountry',
-        'FlightTimeMin',
-        'AvgTicketPrice',
-        'Cancelled',
-        'FlightDelayType',
-      ],
-      sort: [['timestamp', 'desc']],
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","highlightAll":true,"version":true,"query":{"language":"kuery","query":""},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '8f4d0c00-4c86-11e8-b3d7-01146121b73d',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.airlineCarrierTitle', {
-        defaultMessage: '[Flights] Airline Carrier',
-      }),
-      visState:
-        '{"title":"[Flights] Airline Carrier","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"Carrier","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
-      uiStateJSON: '{"vis":{"legendOpen":false}}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: 'f8290060-4c88-11e8-b3d7-01146121b73d',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.delayTypeTitle', {
-        defaultMessage: '[Flights] Delay Type',
-      }),
-      visState:
-        '{"title":"[Flights] Delay Type","type":"area","params":{"type":"area","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Count"}}],"seriesParams":[{"show":"true","type":"histogram","mode":"stacked","data":{"label":"Count","id":"1"},"drawLinesBetweenPoints":true,"showCircles":true,"interpolate":"cardinal","valueAxis":"ValueAxis-1"}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"timestamp","interval":"auto","customInterval":"2h","min_doc_count":1,"extended_bounds":{}}},{"id":"3","enabled":true,"type":"terms","schema":"group","params":{"field":"FlightDelayType","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: 'bcb63b50-4c89-11e8-b3d7-01146121b73d',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.delaysAndCancellationsTitle', {
-        defaultMessage: '[Flights] Delays & Cancellations',
-      }),
-      visState:
-        '{"title":"[Flights] Delays & Cancellations","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417","type":"timeseries","series":[{"id":"61ca57f1-469d-11e7-af02-69e470af7417","color":"rgba(0,156,224,1)","split_mode":"everything","metrics":[{"id":"61ca57f2-469d-11e7-af02-69e470af7417","type":"filter_ratio","numerator":"FlightDelay:true"}],"separate_axis":0,"axis_position":"right","formatter":"percent","chart_type":"line","line_width":"2","point_size":"0","fill":0.5,"stacked":"none","label":"Percent Delays"}],"time_field":"timestamp","index_pattern":"kibana_sample_data_flights","interval":">=1h","axis_position":"left","axis_formatter":"number","show_legend":1,"show_grid":1,"annotations":[{"fields":"FlightDelay,Cancelled,Carrier","template":"{{Carrier}}: Flight Delayed and Cancelled!","index_pattern":"kibana_sample_data_flights","query_string":"FlightDelay:true AND Cancelled:true","id":"53b7dff0-4c89-11e8-a66a-6989ad5a0a39","color":"rgba(0,98,177,1)","time_field":"timestamp","icon":"fa-exclamation-triangle","ignore_global_filters":1,"ignore_panel_filters":1}],"legend_position":"bottom"},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{}',
-      },
-    },
-  },
-  {
-    id: '9886b410-4c8b-11e8-b3d7-01146121b73d',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.delayBucketsTitle', {
-        defaultMessage: '[Flights] Delay Buckets',
-      }),
-      visState:
-        '{"title":"[Flights] Delay Buckets","type":"histogram","params":{"type":"histogram","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Count"}}],"seriesParams":[{"show":"true","type":"histogram","mode":"stacked","data":{"label":"Count","id":"1"},"valueAxis":"ValueAxis-1","drawLinesBetweenPoints":true,"showCircles":true}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"histogram","schema":"segment","params":{"field":"FlightDelayMin","interval":30,"extended_bounds":{},"customLabel":"Flight Delay Minutes"}}]}',
-      uiStateJSON: '{"vis":{"legendOpen":false}}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[{"meta":{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","negate":true,"disabled":false,"alias":null,"type":"phrase","key":"FlightDelayMin","value":"0","params":{"query":0,"type":"phrase"}},"query":{"match":{"FlightDelayMin":{"query":0,"type":"phrase"}}},"$state":{"store":"appState"}}],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '76e3c090-4c8c-11e8-b3d7-01146121b73d',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.flightDelaysTitle', {
-        defaultMessage: '[Flights] Flight Delays',
-      }),
-      visState:
-        '{"title":"[Flights] Flight Delays","type":"histogram","params":{"type":"histogram","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"left","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"BottomAxis-1","type":"value","position":"bottom","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Count"}}],"seriesParams":[{"show":"true","type":"histogram","mode":"stacked","data":{"label":"Count","id":"1"},"valueAxis":"ValueAxis-1","drawLinesBetweenPoints":true,"showCircles":true}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":""}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"FlightDelay","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Flight Delays"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '707665a0-4c8c-11e8-b3d7-01146121b73d',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.flightCancellationsTitle', {
-        defaultMessage: '[Flights] Flight Cancellations',
-      }),
-      visState:
-        '{"title":"[Flights] Flight Cancellations","type":"histogram","params":{"type":"histogram","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"left","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"BottomAxis-1","type":"value","position":"bottom","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Count"}}],"seriesParams":[{"show":"true","type":"histogram","mode":"stacked","data":{"label":"Count","id":"1"},"valueAxis":"ValueAxis-1","drawLinesBetweenPoints":true,"showCircles":true}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":""}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"Cancelled","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Flight Cancellations"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '293b5a30-4c8f-11e8-b3d7-01146121b73d',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.destinationWeatherTitle', {
-        defaultMessage: '[Flights] Destination Weather',
-      }),
-      visState:
-        '{"title":"[Flights] Destination Weather","type":"tagcloud","params":{"scale":"linear","orientation":"single","minFontSize":18,"maxFontSize":72,"showLabel":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"DestWeather","size":10,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '129be430-4c93-11e8-b3d7-01146121b73d',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.markdownInstructionsTitle', {
-        defaultMessage: '[Flights] Markdown Instructions',
-      }),
-      visState:
-        '{"title":"[Flights] Markdown Instructions","type":"markdown","params":{"fontSize":10,"openLinksInNewTab":true,"markdown":"### Sample Flight data\\nThis dashboard contains sample data for you to play with. You can view it, search it, and interact with the visualizations. For more information about Kibana, check our [docs](https://www.elastic.co/guide/en/kibana/current/index.html)."},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{}',
-      },
-    },
-  },
-  {
-    id: '334084f0-52fd-11e8-a160-89cc2ad9e8e2',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.originCountryTicketPricesTitle', {
-        defaultMessage: '[Flights] Origin Country Ticket Prices',
-      }),
-      visState:
-        '{"title":"[Flights] Origin Country Ticket Prices","type":"region_map","params":{"legendPosition":"bottomright","addTooltip":true,"colorSchema":"Blues","selectedLayer":{"attribution":"<p><a href=\\"http://www.naturalearthdata.com/about/terms-of-use\\">Made with NaturalEarth</a> | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","name":"World Countries","weight":1,"format":{"type":"geojson"},"url":"https://vector.maps.elastic.co/blob/5659313586569216?elastic_tile_service_tos=agree&my_app_version=6.3.0&license=686f9ec6-d775-44f0-b334-38caf85da617","fields":[{"name":"iso2","description":"Two letter abbreviation"},{"name":"name","description":"Country name"},{"name":"iso3","description":"Three letter abbreviation"}],"created_at":"2017-04-26T17:12:15.978370","tags":[],"id":5659313586569216,"layerId":"elastic_maps_service.World Countries"},"selectedJoinField":{"name":"iso2","description":"Two letter abbreviation"},"isDisplayWarning":false,"wms":{"enabled":false,"options":{"format":"image/png","transparent":true},"baseLayersAreLoaded":{},"tmsLayers":[{"id":"road_map","url":"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.3.0&license=686f9ec6-d775-44f0-b334-38caf85da617","minZoom":0,"maxZoom":18,"attribution":"<p>&#169; <a href=\\"http://www.openstreetmap.org/copyright\\">OpenStreetMap</a> contributors | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","subdomains":[]}],"selectedTmsLayer":{"id":"road_map","url":"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.3.0&license=686f9ec6-d775-44f0-b334-38caf85da617","minZoom":0,"maxZoom":18,"attribution":"<p>&#169; <a href=\\"http://www.openstreetmap.org/copyright\\">OpenStreetMap</a> contributors | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","subdomains":[]}},"mapZoom":2,"mapCenter":[0,0],"outlineWeight":1,"showAllShapes":true},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"AvgTicketPrice"}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"OriginCountry","size":100,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: 'f8283bf0-52fd-11e8-a160-89cc2ad9e8e2',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.totalFlightDelaysTitle', {
-        defaultMessage: '[Flights] Total Flight Delays',
-      }),
-      visState:
-        '{"title":"[Flights] Total Flight Delays","type":"gauge","params":{"type":"gauge","addTooltip":true,"addLegend":true,"isDisplayWarning":false,"gauge":{"verticalSplit":false,"extendRange":true,"percentageMode":false,"gaugeType":"Arc","gaugeStyle":"Full","backStyle":"Full","orientation":"vertical","colorSchema":"Blues","gaugeColorMode":"Labels","colorsRange":[{"from":0,"to":75},{"from":75,"to":150},{"from":150,"to":225},{"from":225,"to":300}],"invertColors":true,"labels":{"show":false,"color":"black"},"scale":{"show":false,"labels":false,"color":"#333"},"type":"meter","style":{"bgWidth":0.9,"width":0.9,"mask":false,"bgMask":false,"maskBars":50,"bgFill":"#eee","bgColor":false,"subText":"","fontSize":60,"labelColor":true}}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Total Delays"}}]}',
-      uiStateJSON:
-        '{"vis":{"defaultColors":{"0 - 75":"rgb(8,48,107)","75 - 150":"rgb(55,135,192)","150 - 225":"rgb(171,208,230)","225 - 300":"rgb(247,251,255)"}}}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[{"meta":{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","negate":false,"disabled":false,"alias":null,"type":"phrase","key":"FlightDelay","value":"true","params":{"query":true,"type":"phrase"}},"query":{"match":{"FlightDelay":{"query":true,"type":"phrase"}}},"$state":{"store":"appState"}}],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '08884800-52fe-11e8-a160-89cc2ad9e8e2',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.totalFlightCancellationsTitle', {
-        defaultMessage: '[Flights] Total Flight Cancellations',
-      }),
-      visState:
-        '{"title":"[Flights] Total Flight Cancellations","type":"gauge","params":{"type":"gauge","addTooltip":true,"addLegend":true,"isDisplayWarning":false,"gauge":{"verticalSplit":false,"extendRange":true,"percentageMode":false,"gaugeType":"Arc","gaugeStyle":"Full","backStyle":"Full","orientation":"vertical","colorSchema":"Blues","gaugeColorMode":"Labels","colorsRange":[{"from":0,"to":75},{"from":75,"to":150},{"from":150,"to":225},{"from":225,"to":300}],"invertColors":true,"labels":{"show":false,"color":"black"},"scale":{"show":false,"labels":false,"color":"#333"},"type":"meter","style":{"bgWidth":0.9,"width":0.9,"mask":false,"bgMask":false,"maskBars":50,"bgFill":"#eee","bgColor":false,"subText":"","fontSize":60,"labelColor":true}}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Total Cancellations"}}]}',
-      uiStateJSON:
-        '{"vis":{"defaultColors":{"0 - 75":"rgb(8,48,107)","75 - 150":"rgb(55,135,192)","150 - 225":"rgb(171,208,230)","225 - 300":"rgb(247,251,255)"}}}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[{"meta":{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","negate":false,"disabled":false,"alias":null,"type":"phrase","key":"Cancelled","value":"true","params":{"query":true,"type":"phrase"}},"query":{"match":{"Cancelled":{"query":true,"type":"phrase"}}},"$state":{"store":"appState"}}],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: 'e6944e50-52fe-11e8-a160-89cc2ad9e8e2',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.originCountryTitle', {
-        defaultMessage: '[Flights] Origin Country vs. Destination Country',
-      }),
-      visState:
-        '{"title":"[Flights] Origin Country vs. Destination Country","type":"heatmap","params":{"type":"heatmap","addTooltip":true,"addLegend":true,"enableHover":false,"legendPosition":"right","times":[],"colorsNumber":5,"colorSchema":"Blues","setColorRange":false,"colorsRange":[],"invertColors":false,"percentageMode":false,"valueAxes":[{"show":false,"id":"ValueAxis-1","type":"value","scale":{"type":"linear","defaultYExtents":false},"labels":{"show":false,"rotate":0,"overwriteColor":false,"color":"#555"}}]},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"group","params":{"field":"OriginCountry","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Origin Country"}},{"id":"3","enabled":true,"type":"terms","schema":"segment","params":{"field":"DestCountry","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Destination Country"}}]}',
-      uiStateJSON:
-        '{"vis":{"defaultColors":{"0 - 22":"rgb(247,251,255)","22 - 44":"rgb(208,225,242)","44 - 66":"rgb(148,196,223)","66 - 88":"rgb(74,152,201)","88 - 110":"rgb(23,100,171)"}}}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '01c413e0-5395-11e8-99bf-1ba7b1bdaa61',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.totalFlightsTitle', {
-        defaultMessage: '[Flights] Total Flights',
-      }),
-      visState:
-        '{"title":"[Flights] Total Flights","type":"metric","params":{"addTooltip":true,"addLegend":false,"type":"metric","metric":{"percentageMode":false,"useRanges":false,"colorSchema":"Green to Red","metricColorMode":"None","colorsRange":[{"from":0,"to":10000}],"labels":{"show":true},"invertColors":false,"style":{"bgFill":"#000","bgColor":false,"labelColor":false,"subText":"","fontSize":36}}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Total Flights"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '2edf78b0-5395-11e8-99bf-1ba7b1bdaa61',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.averageTicketPriceTitle', {
-        defaultMessage: '[Flights] Average Ticket Price',
-      }),
-      visState:
-        '{"title":"[Flights] Average Ticket Price","type":"metric","params":{"addTooltip":true,"addLegend":false,"type":"metric","metric":{"percentageMode":false,"useRanges":false,"colorSchema":"Green to Red","metricColorMode":"None","colorsRange":[{"from":0,"to":10000}],"labels":{"show":true},"invertColors":false,"style":{"bgFill":"#000","bgColor":false,"labelColor":false,"subText":"","fontSize":36}}},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"AvgTicketPrice","customLabel":"Avg. Ticket Price"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: 'ed78a660-53a0-11e8-acbd-0be0ad9d822b',
-    type: 'visualization',
-    updated_at: '2018-05-09T15:55:51.195Z',
-    version: 3,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.airportConnectionsTitle', {
-        defaultMessage: '[Flights] Airport Connections (Hover Over Airport)',
-      }),
-      visState:
-        '{"aggs":[],"params":{"spec":"{\\n  $schema: https://vega.github.io/schema/vega/v3.0.json\\n  config: {\\n    kibana: {type: \\"map\\", latitude: 25, longitude: -70, zoom: 3}\\n  }\\n  data: [\\n    {\\n      name: table\\n      url: {\\n        index: kibana_sample_data_flights\\n        %context%: true\\n        // Uncomment to enable time filtering\\n        // %timefield%: timestamp\\n        body: {\\n          size: 0\\n          aggs: {\\n            origins: {\\n              terms: {field: \\"OriginAirportID\\", size: 10000}\\n              aggs: {\\n                originLocation: {\\n                  top_hits: {\\n                    size: 1\\n                    _source: {\\n                      includes: [\\"OriginLocation\\", \\"Origin\\"]\\n                    }\\n                  }\\n                }\\n                distinations: {\\n                  terms: {field: \\"DestAirportID\\", size: 10000}\\n                  aggs: {\\n                    destLocation: {\\n                      top_hits: {\\n                        size: 1\\n                        _source: {\\n                          includes: [\\"DestLocation\\"]\\n                        }\\n                      }\\n                    }\\n                  }\\n                }\\n              }\\n            }\\n          }\\n        }\\n      }\\n      format: {property: \\"aggregations.origins.buckets\\"}\\n      transform: [\\n        {\\n          type: geopoint\\n          projection: projection\\n          fields: [\\n            originLocation.hits.hits[0]._source.OriginLocation.lon\\n            originLocation.hits.hits[0]._source.OriginLocation.lat\\n          ]\\n        }\\n      ]\\n    }\\n    {\\n      name: selectedDatum\\n      on: [\\n        {trigger: \\"!selected\\", remove: true}\\n        {trigger: \\"selected\\", insert: \\"selected\\"}\\n      ]\\n    }\\n  ]\\n  signals: [\\n    {\\n      name: selected\\n      value: null\\n      on: [\\n        {events: \\"@airport:mouseover\\", update: \\"datum\\"}\\n        {events: \\"@airport:mouseout\\", update: \\"null\\"}\\n      ]\\n    }\\n  ]\\n  scales: [\\n    {\\n      name: airportSize\\n      type: linear\\n      domain: {data: \\"table\\", field: \\"doc_count\\"}\\n      range: [\\n        {signal: \\"zoom*zoom*0.2+1\\"}\\n        {signal: \\"zoom*zoom*10+1\\"}\\n      ]\\n    }\\n  ]\\n  marks: [\\n    {\\n      type: group\\n      from: {\\n        facet: {\\n          name: facetedDatum\\n          data: selectedDatum\\n          field: distinations.buckets\\n        }\\n      }\\n      data: [\\n        {\\n          name: facetDatumElems\\n          source: facetedDatum\\n          transform: [\\n            {\\n              type: geopoint\\n              projection: projection\\n              fields: [\\n                destLocation.hits.hits[0]._source.DestLocation.lon\\n                destLocation.hits.hits[0]._source.DestLocation.lat\\n              ]\\n            }\\n            {type: \\"formula\\", expr: \\"{x:parent.x, y:parent.y}\\", as: \\"source\\"}\\n            {type: \\"formula\\", expr: \\"{x:datum.x, y:datum.y}\\", as: \\"target\\"}\\n            {type: \\"linkpath\\", shape: \\"diagonal\\"}\\n          ]\\n        }\\n      ]\\n      scales: [\\n        {\\n          name: lineThickness\\n          type: linear\\n          domain: {data: \\"facetDatumElems\\", field: \\"doc_count\\"}\\n          range: [1, 8]\\n        }\\n        {\\n          name: lineOpacity\\n          type: linear\\n          domain: {data: \\"facetDatumElems\\", field: \\"doc_count\\"}\\n          range: [0.2, 0.8]\\n        }\\n      ]\\n      marks: [\\n        {\\n          from: {data: \\"facetDatumElems\\"}\\n          type: path\\n          interactive: false\\n          encode: {\\n            update: {\\n              path: {field: \\"path\\"}\\n              stroke: {value: \\"black\\"}\\n              strokeWidth: {scale: \\"lineThickness\\", field: \\"doc_count\\"}\\n              strokeOpacity: {scale: \\"lineOpacity\\", field: \\"doc_count\\"}\\n            }\\n          }\\n        }\\n      ]\\n    }\\n    {\\n      name: airport\\n      type: symbol\\n      from: {data: \\"table\\"}\\n      encode: {\\n        update: {\\n          size: {scale: \\"airportSize\\", field: \\"doc_count\\"}\\n          xc: {signal: \\"datum.x\\"}\\n          yc: {signal: \\"datum.y\\"}\\n          tooltip: {\\n            signal: \\"{title: datum.originLocation.hits.hits[0]._source.Origin + \' (\' + datum.key + \')\', connnections: length(datum.distinations.buckets), flights: datum.doc_count}\\"\\n          }\\n        }\\n      }\\n    }\\n  ]\\n}"},"title":"[Flights] Airport Connections (Hover Over Airport)","type":"vega"}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
-    type: 'index-pattern',
-    updated_at: '2018-05-09T15:49:03.736Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: 'kibana_sample_data_flights',
-      timeFieldName: 'timestamp',
-      fields:
-        '[{"name":"AvgTicketPrice","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Cancelled","type":"boolean","esTypes":["boolean"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Carrier","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Dest","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestAirportID","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestCityName","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestCountry","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestLocation","type":"geo_point","esTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestRegion","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestWeather","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DistanceKilometers","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DistanceMiles","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelay","type":"boolean","esTypes":["boolean"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelayMin","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelayType","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightNum","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightTimeHour","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightTimeMin","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Origin","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginAirportID","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginCityName","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginCountry","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginLocation","type":"geo_point","esTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginRegion","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginWeather","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":"_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":"dayOfWeek","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"timestamp","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.hourOfDay","lang":"painless","searchable":true,"aggregatable":true,"readFromDocValues":false}]',
-      fieldFormatMap:
-        '{"hour_of_day":{"id":"number","params":{"pattern":"00"}},"AvgTicketPrice":{"id":"number","params":{"pattern":"$0,0.[00]"}}}',
-    },
-  },
-  {
-    id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
-    type: 'dashboard',
-    updated_at: '2018-05-09T15:59:04.578Z',
-    version: 4,
-    references: [
-      {
-        name: 'panel_0',
-        type: 'visualization',
-        id: 'aeb212e0-4c84-11e8-b3d7-01146121b73d',
-      },
-      {
-        name: 'panel_1',
-        type: 'visualization',
-        id: 'c8fc3d30-4c87-11e8-b3d7-01146121b73d',
-      },
-      {
-        name: 'panel_2',
-        type: 'search',
-        id: '571aaf70-4c88-11e8-b3d7-01146121b73d',
-      },
-      {
-        name: 'panel_3',
-        type: 'visualization',
-        id: '8f4d0c00-4c86-11e8-b3d7-01146121b73d',
-      },
-      {
-        name: 'panel_4',
-        type: 'visualization',
-        id: 'f8290060-4c88-11e8-b3d7-01146121b73d',
-      },
-      {
-        name: 'panel_5',
-        type: 'visualization',
-        id: 'bcb63b50-4c89-11e8-b3d7-01146121b73d',
-      },
-      {
-        name: 'panel_6',
-        type: 'visualization',
-        id: '9886b410-4c8b-11e8-b3d7-01146121b73d',
-      },
-      {
-        name: 'panel_7',
-        type: 'visualization',
-        id: '76e3c090-4c8c-11e8-b3d7-01146121b73d',
-      },
-      {
-        name: 'panel_8',
-        type: 'visualization',
-        id: '707665a0-4c8c-11e8-b3d7-01146121b73d',
-      },
-      {
-        name: 'panel_10',
-        type: 'visualization',
-        id: '293b5a30-4c8f-11e8-b3d7-01146121b73d',
-      },
-      {
-        name: 'panel_11',
-        type: 'visualization',
-        id: '129be430-4c93-11e8-b3d7-01146121b73d',
-      },
-      {
-        name: 'panel_12',
-        type: 'visualization',
-        id: '334084f0-52fd-11e8-a160-89cc2ad9e8e2',
-      },
-      {
-        name: 'panel_13',
-        type: 'visualization',
-        id: 'f8283bf0-52fd-11e8-a160-89cc2ad9e8e2',
-      },
-      {
-        name: 'panel_14',
-        type: 'visualization',
-        id: '08884800-52fe-11e8-a160-89cc2ad9e8e2',
-      },
-      {
-        name: 'panel_15',
-        type: 'visualization',
-        id: 'e6944e50-52fe-11e8-a160-89cc2ad9e8e2',
-      },
-      {
-        name: 'panel_16',
-        type: 'visualization',
-        id: '01c413e0-5395-11e8-99bf-1ba7b1bdaa61',
-      },
-      {
-        name: 'panel_17',
-        type: 'visualization',
-        id: '2edf78b0-5395-11e8-99bf-1ba7b1bdaa61',
-      },
-      {
-        name: 'panel_18',
-        type: 'visualization',
-        id: 'ed78a660-53a0-11e8-acbd-0be0ad9d822b',
-      },
-    ],
-    migrationVersion: {
-      dashboard: '7.0.0',
-    },
-    attributes: {
-      title: i18n.translate('server.sampleData.flightsSpec.globalFlightDashboardTitle', {
-        defaultMessage: '[Flights] Global Flight Dashboard',
-      }),
-      hits: 0,
-      description: i18n.translate(
-        'server.sampleData.flightsSpec.globalFlightDashboardDescription',
-        {
-          defaultMessage:
-            'Analyze mock flight data for ES-Air, Logstash Airways, Kibana Airlines and JetBeats',
-        }
-      ),
-      panelsJSON:
-        '[{"panelIndex":"1","gridData":{"x":0,"y":0,"w":32,"h":7,"i":"1"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_0"},{"panelIndex":"3","gridData":{"x":17,"y":7,"w":23,"h":12,"i":"3"},"embeddableConfig":{"vis":{"colors":{"Average Ticket Price":"#0A50A1","Flight Count":"#82B5D8"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_1"},{"panelIndex":"4","gridData":{"x":0,"y":85,"w":48,"h":15,"i":"4"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_2"},{"panelIndex":"5","gridData":{"x":0,"y":7,"w":17,"h":12,"i":"5"},"embeddableConfig":{"vis":{"colors":{"ES-Air":"#447EBC","JetBeats":"#65C5DB","Kibana Airlines":"#BA43A9","Logstash Airways":"#E5AC0E"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_3"},{"panelIndex":"6","gridData":{"x":24,"y":33,"w":24,"h":14,"i":"6"},"embeddableConfig":{"vis":{"colors":{"Carrier Delay":"#5195CE","Late Aircraft Delay":"#1F78C1","NAS Delay":"#70DBED","No Delay":"#BADFF4","Security Delay":"#052B51","Weather Delay":"#6ED0E0"}}},"version":"6.3.0","panelRefName":"panel_4"},{"panelIndex":"7","gridData":{"x":24,"y":19,"w":24,"h":14,"i":"7"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_5"},{"panelIndex":"10","gridData":{"x":0,"y":35,"w":24,"h":12,"i":"10"},"embeddableConfig":{"vis":{"colors":{"Count":"#1F78C1"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_6"},{"panelIndex":"13","gridData":{"x":10,"y":19,"w":14,"h":8,"i":"13"},"embeddableConfig":{"vis":{"colors":{"Count":"#1F78C1"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_7"},{"panelIndex":"14","gridData":{"x":10,"y":27,"w":14,"h":8,"i":"14"},"embeddableConfig":{"vis":{"colors":{"Count":"#1F78C1"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_8"},{"panelIndex":"21","gridData":{"x":0,"y":62,"w":48,"h":8,"i":"21"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_10"},{"panelIndex":"22","gridData":{"x":32,"y":0,"w":16,"h":7,"i":"22"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_11"},{"panelIndex":"23","gridData":{"x":0,"y":70,"w":48,"h":15,"i":"23"},"embeddableConfig":{"mapCenter":[42.19556096274418,9.536742995308601e-7],"mapZoom":1},"version":"6.3.0","panelRefName":"panel_12"},{"panelIndex":"25","gridData":{"x":0,"y":19,"w":10,"h":8,"i":"25"},"embeddableConfig":{"vis":{"defaultColors":{"0 - 50":"rgb(247,251,255)","100 - 150":"rgb(107,174,214)","150 - 200":"rgb(33,113,181)","200 - 250":"rgb(8,48,107)","50 - 100":"rgb(198,219,239)"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_13"},{"panelIndex":"27","gridData":{"x":0,"y":27,"w":10,"h":8,"i":"27"},"embeddableConfig":{"vis":{"defaultColors":{"0 - 50":"rgb(247,251,255)","100 - 150":"rgb(107,174,214)","150 - 200":"rgb(33,113,181)","200 - 250":"rgb(8,48,107)","50 - 100":"rgb(198,219,239)"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_14"},{"panelIndex":"28","gridData":{"x":0,"y":47,"w":24,"h":15,"i":"28"},"embeddableConfig":{"vis":{"defaultColors":{"0 - 11":"rgb(247,251,255)","11 - 22":"rgb(208,225,242)","22 - 33":"rgb(148,196,223)","33 - 44":"rgb(74,152,201)","44 - 55":"rgb(23,100,171)"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_15"},{"panelIndex":"29","gridData":{"x":40,"y":7,"w":8,"h":6,"i":"29"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_16"},{"panelIndex":"30","gridData":{"x":40,"y":13,"w":8,"h":6,"i":"30"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_17"},{"panelIndex":"31","gridData":{"x":24,"y":47,"w":24,"h":15,"i":"31"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_18"}]',
-      optionsJSON: '{"hidePanelTitles":false,"useMargins":true}',
-      version: 1,
-      timeRestore: true,
-      timeTo: 'now',
-      timeFrom: 'now-24h',
-      refreshInterval: {
-        display: '15 minutes',
-        pause: false,
-        section: 2,
-        value: 900000,
-      },
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"query":{"language":"kuery","query":""},"filter":[],"highlightAll":true,"version":true}',
-      },
-    },
-  },
-];
diff --git a/src/legacy/server/sample_data/data_sets/logs/index.js b/src/legacy/server/sample_data/data_sets/logs/index.js
deleted file mode 100644
index c6d955eb2ff51..0000000000000
--- a/src/legacy/server/sample_data/data_sets/logs/index.js
+++ /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 path from 'path';
-import { i18n } from '@kbn/i18n';
-import { getSavedObjects } from './saved_objects';
-import { fieldMappings } from './field_mappings';
-
-export function logsSpecProvider() {
-  return {
-    id: 'logs',
-    name: i18n.translate('server.sampleData.logsSpecTitle', {
-      defaultMessage: 'Sample web logs',
-    }),
-    description: i18n.translate('server.sampleData.logsSpecDescription', {
-      defaultMessage: 'Sample data, visualizations, and dashboards for monitoring web logs.',
-    }),
-    previewImagePath: '/plugins/kibana/home/sample_data_resources/logs/dashboard.png',
-    darkPreviewImagePath: '/plugins/kibana/home/sample_data_resources/logs/dashboard_dark.png',
-    overviewDashboard: 'edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b',
-    defaultIndex: '90943e30-9a47-11e8-b64d-95841ca0b247',
-    savedObjects: getSavedObjects(),
-    dataIndices: [
-      {
-        id: 'logs',
-        dataPath: path.join(__dirname, './logs.json.gz'),
-        fields: fieldMappings,
-        timeFields: ['timestamp', 'utc_time'],
-        currentTimeMarker: '2018-08-01T00:00:00',
-        preserveDayOfWeekTimeOfDay: true,
-      },
-    ],
-  };
-}
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
deleted file mode 100644
index 9ce6e0d001e9e..0000000000000
--- a/src/legacy/server/sample_data/data_sets/logs/saved_objects.js
+++ /dev/null
@@ -1,354 +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 const getSavedObjects = () => [
-  {
-    id: 'e1d0f010-9ee7-11e7-8711-e7a007dcef99',
-    type: 'visualization',
-    updated_at: '2018-08-29T13:22:17.617Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.uniqueVisitorsTitle', {
-        defaultMessage: '[Logs] Unique Visitors vs. Average Bytes',
-      }),
-      visState:
-        '{"title":"[Logs] Unique Visitors vs. Average Bytes","type":"area","params":{"type":"area","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Avg. Bytes"}},{"id":"ValueAxis-2","name":"RightAxis-1","type":"value","position":"right","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Unique Visitors"}}],"seriesParams":[{"show":"true","type":"histogram","mode":"stacked","data":{"label":"Avg. Bytes","id":"1"},"drawLinesBetweenPoints":true,"showCircles":true,"interpolate":"linear","valueAxis":"ValueAxis-1"},{"show":true,"mode":"stacked","type":"line","drawLinesBetweenPoints":false,"showCircles":true,"interpolate":"linear","data":{"id":"2","label":"Unique Visitors"},"valueAxis":"ValueAxis-2"}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false,"radiusRatio":17},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"bytes","customLabel":"Avg. Bytes"}},{"id":"2","enabled":true,"type":"cardinality","schema":"metric","params":{"field":"clientip","customLabel":"Unique Visitors"}},{"id":"3","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"timestamp","interval":"auto","time_zone":"America/Los_Angeles","customInterval":"2h","min_doc_count":1,"extended_bounds":{}}},{"id":"4","enabled":true,"type":"count","schema":"radius","params":{}}]}',
-      uiStateJSON: '{"vis":{"colors":{"Avg. Bytes":"#70DBED","Unique Visitors":"#0A437C"}}}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '06cf9c40-9ee8-11e7-8711-e7a007dcef99',
-    type: 'visualization',
-    updated_at: '2018-08-29T13:22:17.617Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.uniqueVisitorsByCountryTitle', {
-        defaultMessage: '[Logs] Unique Visitors by Country',
-      }),
-      visState:
-        '{"title":"[Logs] Unique Visitors by Country","type":"region_map","params":{"legendPosition":"bottomright","addTooltip":true,"colorSchema":"Reds","selectedLayer":{"attribution":"<p><a href=\\"http://www.naturalearthdata.com/about/terms-of-use\\">Made with NaturalEarth</a> | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","name":"World Countries","weight":1,"format":{"type":"geojson"},"url":"https://vector.maps.elastic.co/blob/5659313586569216?elastic_tile_service_tos=agree&my_app_version=6.2.3&license=77ab0ecf-a521-499d-bd52-fbd740bb81d0","fields":[{"name":"iso2","description":"Two letter abbreviation"},{"name":"name","description":"Country name"},{"name":"iso3","description":"Three letter abbreviation"}],"created_at":"2017-04-26T17:12:15.978370","tags":[],"id":5659313586569216,"layerId":"elastic_maps_service.World Countries"},"selectedJoinField":{"name":"iso2","description":"Two letter abbreviation"},"isDisplayWarning":false,"wms":{"enabled":false,"options":{"format":"image/png","transparent":true},"baseLayersAreLoaded":{},"tmsLayers":[{"id":"road_map","url":"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.2.3&license=77ab0ecf-a521-499d-bd52-fbd740bb81d0","minZoom":0,"maxZoom":18,"attribution":"<p>&#169; <a href=\\"http://www.openstreetmap.org/copyright\\">OpenStreetMap</a> contributors | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","subdomains":[]}],"selectedTmsLayer":{"id":"road_map","url":"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.2.3&license=77ab0ecf-a521-499d-bd52-fbd740bb81d0","minZoom":0,"maxZoom":18,"attribution":"<p>&#169; <a href=\\"http://www.openstreetmap.org/copyright\\">OpenStreetMap</a> contributors | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","subdomains":[]}},"mapZoom":2,"mapCenter":[0,0],"outlineWeight":1,"showAllShapes":true,"emsHotLink":null},"aggs":[{"id":"1","enabled":true,"type":"cardinality","schema":"metric","params":{"field":"clientip","customLabel":"Unique Visitors"}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"geo.src","size":50,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '935afa20-e0cd-11e7-9d07-1398ccfcefa3',
-    type: 'visualization',
-    updated_at: '2018-08-29T13:22:17.617Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.heatmapTitle', {
-        defaultMessage: '[Logs] Heatmap',
-      }),
-      visState:
-        '{"title":"[Logs] Heatmap","type":"heatmap","params":{"type":"heatmap","addTooltip":true,"addLegend":true,"enableHover":true,"legendPosition":"right","times":[],"colorsNumber":10,"colorSchema":"Reds","setColorRange":false,"colorsRange":[],"invertColors":false,"percentageMode":false,"valueAxes":[{"show":false,"id":"ValueAxis-1","type":"value","scale":{"type":"linear","defaultYExtents":false},"labels":{"show":false,"rotate":0,"color":"#555","overwriteColor":false}}]},"aggs":[{"id":"1","enabled":true,"type":"cardinality","schema":"metric","params":{"field":"clientip"}},{"id":"3","enabled":true,"type":"terms","schema":"group","params":{"field":"geo.src","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Country Source"}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"hour_of_day","size":25,"order":"asc","orderBy":"_key","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Hour of Day"}}]}',
-      uiStateJSON:
-        '{"vis":{"defaultColors":{"0 - 4":"rgb(255,245,240)","4 - 8":"rgb(254,228,216)","8 - 12":"rgb(253,202,181)","12 - 16":"rgb(252,171,142)","16 - 20":"rgb(252,138,106)","20 - 24":"rgb(251,106,74)","24 - 28":"rgb(241,68,50)","28 - 32":"rgb(217,38,35)","32 - 36":"rgb(188,20,26)","36 - 40":"rgb(152,12,19)"}}}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '4eb6e500-e1c7-11e7-b6d5-4dc382ef7f5b',
-    type: 'visualization',
-    updated_at: '2018-08-29T13:23:20.897Z',
-    version: 2,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.hostVisitsBytesTableTitle', {
-        defaultMessage: '[Logs] Host, Visits and Bytes Table',
-      }),
-      visState:
-        '{"title":"[Logs] Host, Visits and Bytes Table","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417","type":"table","series":[{"id":"bd09d600-e5b1-11e7-bfc2-a1f7e71965a1","color":"#68BC00","split_mode":"everything","metrics":[{"id":"bd09d601-e5b1-11e7-bfc2-a1f7e71965a1","type":"sum","field":"bytes"},{"sigma":"","id":"c9514c90-e5b1-11e7-bfc2-a1f7e71965a1","type":"sum_bucket","field":"bd09d601-e5b1-11e7-bfc2-a1f7e71965a1"}],"seperate_axis":0,"axis_position":"right","formatter":"bytes","chart_type":"line","line_width":1,"point_size":1,"fill":0.5,"stacked":"none","color_rules":[{"id":"c0c668d0-e5b1-11e7-bfc2-a1f7e71965a1"}],"label":"Bytes (Total)"},{"id":"b7672c30-a6df-11e8-8b18-1da1dfc50975","color":"#68BC00","split_mode":"everything","metrics":[{"id":"b7672c31-a6df-11e8-8b18-1da1dfc50975","type":"sum","field":"bytes"}],"seperate_axis":0,"axis_position":"right","formatter":"bytes","chart_type":"line","line_width":1,"point_size":1,"fill":0.5,"stacked":"none","color_rules":[{"id":"c0c668d0-e5b1-11e7-bfc2-a1f7e71965a1"}],"label":"Bytes (Last Hour)"},{"id":"f2c20700-a6df-11e8-8b18-1da1dfc50975","color":"#68BC00","split_mode":"everything","metrics":[{"id":"f2c20701-a6df-11e8-8b18-1da1dfc50975","type":"cardinality","field":"ip"},{"sigma":"","id":"f46333e0-a6df-11e8-8b18-1da1dfc50975","type":"sum_bucket","field":"f2c20701-a6df-11e8-8b18-1da1dfc50975"}],"seperate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":0.5,"stacked":"none","label":"Unique Visits (Total)","color_rules":[{"value":1000,"id":"2e963080-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(211,49,21,1)","operator":"lt"},{"value":1000,"id":"3d4fb880-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(252,196,0,1)","operator":"gte"},{"value":1500,"id":"435f8a20-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(104,188,0,1)","operator":"gte"}],"offset_time":"","value_template":"","trend_arrows":1},{"id":"46fd7fc0-e5b1-11e7-bfc2-a1f7e71965a1","color":"#68BC00","split_mode":"everything","metrics":[{"id":"46fd7fc1-e5b1-11e7-bfc2-a1f7e71965a1","type":"cardinality","field":"ip"}],"seperate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":0.5,"stacked":"none","label":"Unique Visits (Last Hour)","color_rules":[{"value":10,"id":"4e90aeb0-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(211,49,21,1)","operator":"lt"},{"value":10,"id":"6d59b1c0-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(252,196,0,1)","operator":"gte"},{"value":25,"id":"77578670-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(104,188,0,1)","operator":"gte"}],"offset_time":"","value_template":"","trend_arrows":1}],"time_field":"timestamp","index_pattern":"kibana_sample_data_logs","interval":"1h","axis_position":"left","axis_formatter":"number","show_legend":1,"show_grid":1,"bar_color_rules":[{"id":"e9b4e490-e1c6-11e7-b4f6-0f68c45f7387"}],"pivot_id":"extension.keyword","pivot_label":"Type","drilldown_url":"","axis_scale":"normal"},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '69a34b00-9ee8-11e7-8711-e7a007dcef99',
-    type: 'visualization',
-    updated_at: '2018-08-29T13:24:46.136Z',
-    version: 2,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.goalsTitle', {
-        defaultMessage: '[Logs] Goals',
-      }),
-      visState:
-        '{"title":"[Logs] Goals","type":"gauge","params":{"type":"gauge","addTooltip":true,"addLegend":false,"gauge":{"verticalSplit":false,"extendRange":true,"percentageMode":false,"gaugeType":"Arc","gaugeStyle":"Full","backStyle":"Full","orientation":"vertical","colorSchema":"Green to Red","gaugeColorMode":"Labels","colorsRange":[{"from":0,"to":500},{"from":500,"to":1000},{"from":1000,"to":1500}],"invertColors":true,"labels":{"show":false,"color":"black"},"scale":{"show":true,"labels":false,"color":"#333"},"type":"meter","style":{"bgWidth":0.9,"width":0.9,"mask":false,"bgMask":false,"maskBars":50,"bgFill":"#eee","bgColor":false,"subText":"visitors","fontSize":60,"labelColor":true}},"isDisplayWarning":false},"aggs":[{"id":"1","enabled":true,"type":"cardinality","schema":"metric","params":{"field":"clientip","customLabel":"Unique Visitors"}}]}',
-      uiStateJSON:
-        '{"vis":{"defaultColors":{"0 - 500":"rgb(165,0,38)","500 - 1000":"rgb(255,255,190)","1000 - 1500":"rgb(0,104,55)"},"colors":{"75 - 100":"#629E51","50 - 75":"#EAB839","0 - 50":"#E24D42","0 - 100":"#E24D42","200 - 300":"#7EB26D","500 - 1000":"#E5AC0E","0 - 500":"#E24D42","1000 - 1500":"#7EB26D"},"legendOpen":true}}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '42b997f0-0c26-11e8-b0ec-3bb475f6b6ff',
-    type: 'visualization',
-    updated_at: '2018-08-29T13:22:17.617Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.fileTypeScatterPlotTitle', {
-        defaultMessage: '[Logs] File Type Scatter Plot',
-      }),
-      visState:
-        '{"title":"[Logs] File Type Scatter Plot","type":"vega","params":{"spec":"{\\n  $schema: \\"https://vega.github.io/schema/vega-lite/v2.json\\"\\n  // Use points for drawing to actually create a scatterplot\\n  mark: point\\n  // Specify where to load data from\\n  data: {\\n    // By using an object to the url parameter we will\\n    // construct an Elasticsearch query\\n    url: {\\n      // Context == true means filters of the dashboard will be taken into account\\n      %context%: true\\n      // Specify on which field the time picker should operate\\n      %timefield%: timestamp\\n      // Specify the index pattern to load data from\\n      index: kibana_sample_data_logs\\n      // This body will be send to Elasticsearch\'s _search endpoint\\n      // You can use everything the ES Query DSL supports here\\n      body: {\\n        // Set the size to load 10000 documents\\n        size: 10000,\\n        // Just ask for the fields we actually need for visualization\\n        _source: [\\"timestamp\\", \\"bytes\\", \\"extension\\"]\\n      }\\n    }\\n    // Tell Vega, that the array of data will be inside hits.hits of the response\\n    // since the result returned from Elasticsearch fill have a format like:\\n    // {\\n    //   hits: {\\n    //     total: 42000,\\n    //     max_score: 2,\\n    //     hits: [\\n    //       < our individual documents >\\n    //     ]\\n    //   }\\n    // }\\n    format: { property: \\"hits.hits\\" }\\n  }\\n  // You can do transformation and calculation of the data before drawing it\\n  transform: [\\n    // Since timestamp is a string value, we need to convert it to a unix timestamp\\n    // so that Vega can work on it properly.\\n    {\\n      // Convert _source.timestamp field to a date\\n      calculate: \\"toDate(datum._source[\'timestamp\'])\\"\\n      // Store the result in a field named \\"time\\" in the object\\n      as: \\"time\\"\\n    }\\n  ]\\n  // Specify what data will be drawn on which axis\\n  encoding: {\\n    x: {\\n      // Draw the time field on the x-axis in temporal mode (i.e. as a time axis)\\n      field: time\\n      type: temporal\\n      // Hide the axis label for the x-axis\\n      axis: { title: false }\\n    }\\n    y: {\\n      // Draw the bytes of each document on the y-axis\\n      field: _source.bytes\\n      // Mark the y-axis as quantitative\\n      type: quantitative\\n      // Specify the label for this axis\\n      axis: { title: \\"Transferred bytes\\" }\\n    }\\n    color: {\\n      // Make the color of each point depend on the _source.extension field\\n      field: _source.extension\\n      // Treat different values as completely unrelated values to each other.\\n      // You could switch this to quantitative if you have a numeric field and\\n      // want to create a color scale from one color to another depending on that\\n      // field\'s value.\\n      type: nominal\\n      // Rename the legend title so it won\'t just state: \\"_source.extension\\"\\n      legend: { title: \'File type\' }\\n    }\\n    shape: {\\n      // Also make the shape of each point dependent on the extension.\\n      field: _source.extension\\n      type: nominal\\n    }\\n  }\\n}"},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '7cbd2350-2223-11e8-b802-5bcf64c2cfb4',
-    type: 'visualization',
-    updated_at: '2018-08-29T13:22:17.617Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.sourceAndDestinationSankeyChartTitle', {
-        defaultMessage: '[Logs] Source and Destination Sankey Chart',
-      }),
-      visState:
-        '{"title":"[Logs] Source and Destination Sankey Chart","type":"vega","params":{"spec":"{ \\n $schema: https://vega.github.io/schema/vega/v3.0.json\\n  data: [\\n\\t{\\n  \\t// query ES based on the currently selected time range and filter string\\n  \\tname: rawData\\n  \\turl: {\\n    \\t%context%: true\\n    \\t%timefield%: timestamp\\n    \\tindex: kibana_sample_data_logs\\n    \\tbody: {\\n      \\tsize: 0\\n      \\taggs: {\\n        \\ttable: {\\n          \\tcomposite: {\\n            \\tsize: 10000\\n            \\tsources: [\\n              \\t{\\n                \\tstk1: {\\n                  \\tterms: {field: \\"geo.src\\"}\\n                \\t}\\n              \\t}\\n              \\t{\\n                \\tstk2: {\\n                  \\tterms: {field: \\"geo.dest\\"}\\n                \\t}\\n              \\t}\\n            \\t]\\n          \\t}\\n        \\t}\\n      \\t}\\n    \\t}\\n  \\t}\\n  \\t// From the result, take just the data we are interested in\\n  \\tformat: {property: \\"aggregations.table.buckets\\"}\\n  \\t// Convert key.stk1 -> stk1 for simpler access below\\n  \\ttransform: [\\n    \\t{type: \\"formula\\", expr: \\"datum.key.stk1\\", as: \\"stk1\\"}\\n    \\t{type: \\"formula\\", expr: \\"datum.key.stk2\\", as: \\"stk2\\"}\\n    \\t{type: \\"formula\\", expr: \\"datum.doc_count\\", as: \\"size\\"}\\n  \\t]\\n\\t}\\n\\t{\\n  \\tname: nodes\\n  \\tsource: rawData\\n  \\ttransform: [\\n    \\t// when a country is selected, filter out unrelated data\\n    \\t{\\n      \\ttype: filter\\n      \\texpr: !groupSelector || groupSelector.stk1 == datum.stk1 || groupSelector.stk2 == datum.stk2\\n    \\t}\\n    \\t// Set new key for later lookups - identifies each node\\n    \\t{type: \\"formula\\", expr: \\"datum.stk1+datum.stk2\\", as: \\"key\\"}\\n    \\t// instead of each table row, create two new rows,\\n    \\t// one for the source (stack=stk1) and one for destination node (stack=stk2).\\n    \\t// The country code stored in stk1 and stk2 fields is placed into grpId field.\\n    \\t{\\n      \\ttype: fold\\n      \\tfields: [\\"stk1\\", \\"stk2\\"]\\n      \\tas: [\\"stack\\", \\"grpId\\"]\\n    \\t}\\n    \\t// Create a sortkey, different for stk1 and stk2 stacks.\\n    \\t{\\n      \\ttype: formula\\n      \\texpr: datum.stack == \'stk1\' ? datum.stk1+datum.stk2 : datum.stk2+datum.stk1\\n      \\tas: sortField\\n    \\t}\\n    \\t// Calculate y0 and y1 positions for stacking nodes one on top of the other,\\n    \\t// independently for each stack, and ensuring they are in the proper order,\\n    \\t// alphabetical from the top (reversed on the y axis)\\n    \\t{\\n      \\ttype: stack\\n      \\tgroupby: [\\"stack\\"]\\n      \\tsort: {field: \\"sortField\\", order: \\"descending\\"}\\n      \\tfield: size\\n    \\t}\\n    \\t// calculate vertical center point for each node, used to draw edges\\n    \\t{type: \\"formula\\", expr: \\"(datum.y0+datum.y1)/2\\", as: \\"yc\\"}\\n  \\t]\\n\\t}\\n\\t{\\n  \\tname: groups\\n  \\tsource: nodes\\n  \\ttransform: [\\n    \\t// combine all nodes into country groups, summing up the doc counts\\n    \\t{\\n      \\ttype: aggregate\\n      \\tgroupby: [\\"stack\\", \\"grpId\\"]\\n      \\tfields: [\\"size\\"]\\n      \\tops: [\\"sum\\"]\\n      \\tas: [\\"total\\"]\\n    \\t}\\n    \\t// re-calculate the stacking y0,y1 values\\n    \\t{\\n      \\ttype: stack\\n      \\tgroupby: [\\"stack\\"]\\n      \\tsort: {field: \\"grpId\\", order: \\"descending\\"}\\n      \\tfield: total\\n    \\t}\\n    \\t// project y0 and y1 values to screen coordinates\\n    \\t// doing it once here instead of doing it several times in marks\\n    \\t{type: \\"formula\\", expr: \\"scale(\'y\', datum.y0)\\", as: \\"scaledY0\\"}\\n    \\t{type: \\"formula\\", expr: \\"scale(\'y\', datum.y1)\\", as: \\"scaledY1\\"}\\n    \\t// boolean flag if the label should be on the right of the stack\\n    \\t{type: \\"formula\\", expr: \\"datum.stack == \'stk1\'\\", as: \\"rightLabel\\"}\\n    \\t// Calculate traffic percentage for this country using \\"y\\" scale\\n    \\t// domain upper bound, which represents the total traffic\\n    \\t{\\n      \\ttype: formula\\n      \\texpr: datum.total/domain(\'y\')[1]\\n      \\tas: percentage\\n    \\t}\\n  \\t]\\n\\t}\\n\\t{\\n  \\t// This is a temp lookup table with all the \'stk2\' stack nodes\\n  \\tname: destinationNodes\\n  \\tsource: nodes\\n  \\ttransform: [\\n    \\t{type: \\"filter\\", expr: \\"datum.stack == \'stk2\'\\"}\\n  \\t]\\n\\t}\\n\\t{\\n  \\tname: edges\\n  \\tsource: nodes\\n  \\ttransform: [\\n    \\t// we only want nodes from the left stack\\n    \\t{type: \\"filter\\", expr: \\"datum.stack == \'stk1\'\\"}\\n    \\t// find corresponding node from the right stack, keep it as \\"target\\"\\n    \\t{\\n      \\ttype: lookup\\n      \\tfrom: destinationNodes\\n      \\tkey: key\\n      \\tfields: [\\"key\\"]\\n      \\tas: [\\"target\\"]\\n    \\t}\\n    \\t// calculate SVG link path between stk1 and stk2 stacks for the node pair\\n    \\t{\\n      \\ttype: linkpath\\n      \\torient: horizontal\\n      \\tshape: diagonal\\n      \\tsourceY: {expr: \\"scale(\'y\', datum.yc)\\"}\\n      \\tsourceX: {expr: \\"scale(\'x\', \'stk1\') + bandwidth(\'x\')\\"}\\n      \\ttargetY: {expr: \\"scale(\'y\', datum.target.yc)\\"}\\n      \\ttargetX: {expr: \\"scale(\'x\', \'stk2\')\\"}\\n    \\t}\\n    \\t// A little trick to calculate the thickness of the line.\\n    \\t// The value needs to be the same as the hight of the node, but scaling\\n    \\t// size to screen\'s height gives inversed value because screen\'s Y\\n    \\t// coordinate goes from the top to the bottom, whereas the graph\'s Y=0\\n    \\t// is at the bottom. So subtracting scaled doc count from screen height\\n    \\t// (which is the \\"lower\\" bound of the \\"y\\" scale) gives us the right value\\n    \\t{\\n      \\ttype: formula\\n      \\texpr: range(\'y\')[0]-scale(\'y\', datum.size)\\n      \\tas: strokeWidth\\n    \\t}\\n    \\t// Tooltip needs individual link\'s percentage of all traffic\\n    \\t{\\n      \\ttype: formula\\n      \\texpr: datum.size/domain(\'y\')[1]\\n      \\tas: percentage\\n    \\t}\\n  \\t]\\n\\t}\\n  ]\\n  scales: [\\n\\t{\\n  \\t// calculates horizontal stack positioning\\n  \\tname: x\\n  \\ttype: band\\n  \\trange: width\\n  \\tdomain: [\\"stk1\\", \\"stk2\\"]\\n  \\tpaddingOuter: 0.05\\n  \\tpaddingInner: 0.95\\n\\t}\\n\\t{\\n  \\t// this scale goes up as high as the highest y1 value of all nodes\\n  \\tname: y\\n  \\ttype: linear\\n  \\trange: height\\n  \\tdomain: {data: \\"nodes\\", field: \\"y1\\"}\\n\\t}\\n\\t{\\n  \\t// use rawData to ensure the colors stay the same when clicking.\\n  \\tname: color\\n  \\ttype: ordinal\\n  \\trange: category\\n  \\tdomain: {data: \\"rawData\\", field: \\"stk1\\"}\\n\\t}\\n\\t{\\n  \\t// this scale is used to map internal ids (stk1, stk2) to stack names\\n  \\tname: stackNames\\n  \\ttype: ordinal\\n  \\trange: [\\"Source\\", \\"Destination\\"]\\n  \\tdomain: [\\"stk1\\", \\"stk2\\"]\\n\\t}\\n  ]\\n  axes: [\\n\\t{\\n  \\t// x axis should use custom label formatting to print proper stack names\\n  \\torient: bottom\\n  \\tscale: x\\n  \\tencode: {\\n    \\tlabels: {\\n      \\tupdate: {\\n        \\ttext: {scale: \\"stackNames\\", field: \\"value\\"}\\n      \\t}\\n    \\t}\\n  \\t}\\n\\t}\\n\\t{orient: \\"left\\", scale: \\"y\\"}\\n  ]\\n  marks: [\\n\\t{\\n  \\t// draw the connecting line between stacks\\n  \\ttype: path\\n  \\tname: edgeMark\\n  \\tfrom: {data: \\"edges\\"}\\n  \\t// this prevents some autosizing issues with large strokeWidth for paths\\n  \\tclip: true\\n  \\tencode: {\\n    \\tupdate: {\\n      \\t// By default use color of the left node, except when showing traffic\\n      \\t// from just one country, in which case use destination color.\\n      \\tstroke: [\\n        \\t{\\n          \\ttest: groupSelector && groupSelector.stack==\'stk1\'\\n          \\tscale: color\\n          \\tfield: stk2\\n        \\t}\\n        \\t{scale: \\"color\\", field: \\"stk1\\"}\\n      \\t]\\n      \\tstrokeWidth: {field: \\"strokeWidth\\"}\\n      \\tpath: {field: \\"path\\"}\\n      \\t// when showing all traffic, and hovering over a country,\\n      \\t// highlight the traffic from that country.\\n      \\tstrokeOpacity: {\\n        \\tsignal: !groupSelector && (groupHover.stk1 == datum.stk1 || groupHover.stk2 == datum.stk2) ? 0.9 : 0.3\\n      \\t}\\n      \\t// Ensure that the hover-selected edges show on top\\n      \\tzindex: {\\n        \\tsignal: !groupSelector && (groupHover.stk1 == datum.stk1 || groupHover.stk2 == datum.stk2) ? 1 : 0\\n      \\t}\\n      \\t// format tooltip string\\n      \\ttooltip: {\\n        \\tsignal: datum.stk1 + \' → \' + datum.stk2 + \'\\t\' + format(datum.size, \',.0f\') + \'   (\' + format(datum.percentage, \'.1%\') + \')\'\\n      \\t}\\n    \\t}\\n    \\t// Simple mouseover highlighting of a single line\\n    \\thover: {\\n      \\tstrokeOpacity: {value: 1}\\n    \\t}\\n  \\t}\\n\\t}\\n\\t{\\n  \\t// draw stack groups (countries)\\n  \\ttype: rect\\n  \\tname: groupMark\\n  \\tfrom: {data: \\"groups\\"}\\n  \\tencode: {\\n    \\tenter: {\\n      \\tfill: {scale: \\"color\\", field: \\"grpId\\"}\\n      \\twidth: {scale: \\"x\\", band: 1}\\n    \\t}\\n    \\tupdate: {\\n      \\tx: {scale: \\"x\\", field: \\"stack\\"}\\n      \\ty: {field: \\"scaledY0\\"}\\n      \\ty2: {field: \\"scaledY1\\"}\\n      \\tfillOpacity: {value: 0.6}\\n      \\ttooltip: {\\n        \\tsignal: datum.grpId + \'   \' + format(datum.total, \',.0f\') + \'   (\' + format(datum.percentage, \'.1%\') + \')\'\\n      \\t}\\n    \\t}\\n    \\thover: {\\n      \\tfillOpacity: {value: 1}\\n    \\t}\\n  \\t}\\n\\t}\\n\\t{\\n  \\t// draw country code labels on the inner side of the stack\\n  \\ttype: text\\n  \\tfrom: {data: \\"groups\\"}\\n  \\t// don\'t process events for the labels - otherwise line mouseover is unclean\\n  \\tinteractive: false\\n  \\tencode: {\\n    \\tupdate: {\\n      \\t// depending on which stack it is, position x with some padding\\n      \\tx: {\\n        \\tsignal: scale(\'x\', datum.stack) + (datum.rightLabel ? bandwidth(\'x\') + 8 : -8)\\n      \\t}\\n      \\t// middle of the group\\n      \\tyc: {signal: \\"(datum.scaledY0 + datum.scaledY1)/2\\"}\\n      \\talign: {signal: \\"datum.rightLabel ? \'left\' : \'right\'\\"}\\n      \\tbaseline: {value: \\"middle\\"}\\n      \\tfontWeight: {value: \\"bold\\"}\\n      \\t// only show text label if the group\'s height is large enough\\n      \\ttext: {signal: \\"abs(datum.scaledY0-datum.scaledY1) > 13 ? datum.grpId : \'\'\\"}\\n    \\t}\\n  \\t}\\n\\t}\\n\\t{\\n  \\t// Create a \\"show all\\" button. Shown only when a country is selected.\\n  \\ttype: group\\n  \\tdata: [\\n    \\t// We need to make the button show only when groupSelector signal is true.\\n    \\t// Each mark is drawn as many times as there are elements in the backing data.\\n    \\t// Which means that if values list is empty, it will not be drawn.\\n    \\t// Here I create a data source with one empty object, and filter that list\\n    \\t// based on the signal value. This can only be done in a group.\\n    \\t{\\n      \\tname: dataForShowAll\\n      \\tvalues: [{}]\\n      \\ttransform: [{type: \\"filter\\", expr: \\"groupSelector\\"}]\\n    \\t}\\n  \\t]\\n  \\t// Set button size and positioning\\n  \\tencode: {\\n    \\tenter: {\\n      \\txc: {signal: \\"width/2\\"}\\n      \\ty: {value: 30}\\n      \\twidth: {value: 80}\\n      \\theight: {value: 30}\\n    \\t}\\n  \\t}\\n  \\tmarks: [\\n    \\t{\\n      \\t// This group is shown as a button with rounded corners.\\n      \\ttype: group\\n      \\t// mark name allows signal capturing\\n      \\tname: groupReset\\n      \\t// Only shows button if dataForShowAll has values.\\n      \\tfrom: {data: \\"dataForShowAll\\"}\\n      \\tencode: {\\n        \\tenter: {\\n          \\tcornerRadius: {value: 6}\\n          \\tfill: {value: \\"#F5F7FA\\"}\\n          \\tstroke: {value: \\"#c1c1c1\\"}\\n          \\tstrokeWidth: {value: 2}\\n          \\t// use parent group\'s size\\n          \\theight: {\\n            \\tfield: {group: \\"height\\"}\\n          \\t}\\n          \\twidth: {\\n            \\tfield: {group: \\"width\\"}\\n          \\t}\\n        \\t}\\n        \\tupdate: {\\n          \\t// groups are transparent by default\\n          \\topacity: {value: 1}\\n        \\t}\\n        \\thover: {\\n          \\topacity: {value: 0.7}\\n        \\t}\\n      \\t}\\n      \\tmarks: [\\n        \\t{\\n          \\ttype: text\\n          \\t// if true, it will prevent clicking on the button when over text.\\n          \\tinteractive: false\\n          \\tencode: {\\n            \\tenter: {\\n              \\t// center text in the paren group\\n              \\txc: {\\n                \\tfield: {group: \\"width\\"}\\n                \\tmult: 0.5\\n              \\t}\\n              \\tyc: {\\n                \\tfield: {group: \\"height\\"}\\n                \\tmult: 0.5\\n                \\toffset: 2\\n              \\t}\\n              \\talign: {value: \\"center\\"}\\n              \\tbaseline: {value: \\"middle\\"}\\n              \\tfontWeight: {value: \\"bold\\"}\\n              \\ttext: {value: \\"Show All\\"}\\n            \\t}\\n          \\t}\\n        \\t}\\n      \\t]\\n    \\t}\\n  \\t]\\n\\t}\\n  ]\\n  signals: [\\n\\t{\\n  \\t// used to highlight traffic to/from the same country\\n  \\tname: groupHover\\n  \\tvalue: {}\\n  \\ton: [\\n    \\t{\\n      \\tevents: @groupMark:mouseover\\n      \\tupdate: \\"{stk1:datum.stack==\'stk1\' && datum.grpId, stk2:datum.stack==\'stk2\' && datum.grpId}\\"\\n    \\t}\\n    \\t{events: \\"mouseout\\", update: \\"{}\\"}\\n  \\t]\\n\\t}\\n\\t// used to filter only the data related to the selected country\\n\\t{\\n  \\tname: groupSelector\\n  \\tvalue: false\\n  \\ton: [\\n    \\t{\\n      \\t// Clicking groupMark sets this signal to the filter values\\n      \\tevents: @groupMark:click!\\n      \\tupdate: \\"{stack:datum.stack, stk1:datum.stack==\'stk1\' && datum.grpId, stk2:datum.stack==\'stk2\' && datum.grpId}\\"\\n    \\t}\\n    \\t{\\n      \\t// Clicking \\"show all\\" button, or double-clicking anywhere resets it\\n      \\tevents: [\\n        \\t{type: \\"click\\", markname: \\"groupReset\\"}\\n        \\t{type: \\"dblclick\\"}\\n      \\t]\\n      \\tupdate: \\"false\\"\\n    \\t}\\n  \\t]\\n\\t}\\n  ]\\n}\\n"},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '314c6f60-2224-11e8-b802-5bcf64c2cfb4',
-    type: 'visualization',
-    updated_at: '2018-08-29T13:22:17.617Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.responseCodesOverTimeTitle', {
-        defaultMessage: '[Logs] Response Codes Over Time + Annotations',
-      }),
-      visState:
-        '{"title":"[Logs] Response Codes Over Time + Annotations","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417","type":"timeseries","series":[{"id":"61ca57f1-469d-11e7-af02-69e470af7417","color":"rgba(115,216,255,1)","split_mode":"terms","metrics":[{"id":"61ca57f2-469d-11e7-af02-69e470af7417","type":"cardinality","field":"ip"}],"seperate_axis":0,"axis_position":"right","formatter":"percent","chart_type":"line","line_width":"2","point_size":"0","fill":"0.5","stacked":"percent","terms_field":"response.keyword","terms_order_by":"61ca57f2-469d-11e7-af02-69e470af7417","label":"Response Code Count","split_color_mode":"gradient"}],"time_field":"timestamp","index_pattern":"kibana_sample_data_logs","interval":">=4h","axis_position":"left","axis_formatter":"number","show_legend":1,"show_grid":1,"annotations":[{"fields":"geo.src, host","template":"Security Error from {{geo.src}} on {{host}}","index_pattern":"kibana_sample_data_logs","query_string":"tags:error AND tags:security","id":"bd7548a0-2223-11e8-832f-d5027f3c8a47","color":"rgba(211,49,21,1)","time_field":"timestamp","icon":"fa-asterisk","ignore_global_filters":1,"ignore_panel_filters":1}],"legend_position":"bottom","axis_scale":"normal","drop_last_bucket":0},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '24a3e970-4257-11e8-b3aa-73fdaf54bfc9',
-    type: 'visualization',
-    updated_at: '2018-08-29T13:22:17.617Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.inputControlsTitle', {
-        defaultMessage: '[Logs] Input Controls',
-      }),
-      visState:
-        '{"title":"[Logs] Input Controls","type":"input_control_vis","params":{"controls":[{"id":"1523980210832","indexPattern":"90943e30-9a47-11e8-b64d-95841ca0b247","fieldName":"geo.src","label":"Source Country","type":"list","options":{"type":"terms","multiselect":true,"size":100,"order":"desc"},"parent":""},{"id":"1523980191978","indexPattern":"90943e30-9a47-11e8-b64d-95841ca0b247","fieldName":"machine.os.keyword","label":"OS","type":"list","options":{"type":"terms","multiselect":true,"size":100,"order":"desc"},"parent":"1523980210832"},{"id":"1523980232790","indexPattern":"90943e30-9a47-11e8-b64d-95841ca0b247","fieldName":"bytes","label":"Bytes","type":"range","options":{"decimalPlaces":0,"step":1024}}],"updateFiltersOnChange":true,"useTimeFilter":true,"pinFilters":false},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '14e2e710-4258-11e8-b3aa-73fdaf54bfc9',
-    type: 'visualization',
-    updated_at: '2018-08-29T13:22:17.617Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.visitorOSTitle', {
-        defaultMessage: '[Logs] Visitors by OS',
-      }),
-      visState:
-        '{"title":"[Logs] Visitors by OS","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"machine.os.keyword","otherBucket":true,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","size":10,"order":"desc","orderBy":"1"}}]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
-      },
-    },
-  },
-  {
-    id: '47f2c680-a6e3-11e8-94b4-c30c0228351b',
-    type: 'visualization',
-    updated_at: '2018-08-29T13:22:17.617Z',
-    version: 1,
-    migrationVersion: {},
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.markdownInstructionsTitle', {
-        defaultMessage: '[Logs] Markdown Instructions',
-      }),
-      visState:
-        '{"title":"[Logs] Markdown Instructions","type":"markdown","params":{"fontSize":12,"openLinksInNewTab":true,"markdown":"### Sample Logs Data\\nThis dashboard contains sample data for you to play with. You can view it, search it, and interact with the visualizations. For more information about Kibana, check our [docs](https://www.elastic.co/guide/en/kibana/current/index.html)."},"aggs":[]}',
-      uiStateJSON: '{}',
-      description: '',
-      version: 1,
-      kibanaSavedObjectMeta: {
-        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
-      },
-    },
-  },
-  {
-    id: '90943e30-9a47-11e8-b64d-95841ca0b247',
-    type: 'index-pattern',
-    updated_at: '2018-08-29T13:22:17.617Z',
-    version: 1,
-    migrationVersion: {},
-    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,"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":{}}',
-    },
-  },
-  {
-    id: 'edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b',
-    type: 'dashboard',
-    updated_at: '2018-08-29T13:26:13.463Z',
-    version: 3,
-    references: [
-      {
-        name: 'panel_0',
-        type: 'visualization',
-        id: 'e1d0f010-9ee7-11e7-8711-e7a007dcef99',
-      },
-      {
-        name: 'panel_1',
-        type: 'visualization',
-        id: '06cf9c40-9ee8-11e7-8711-e7a007dcef99',
-      },
-      {
-        name: 'panel_2',
-        type: 'visualization',
-        id: '935afa20-e0cd-11e7-9d07-1398ccfcefa3',
-      },
-      {
-        name: 'panel_3',
-        type: 'visualization',
-        id: '4eb6e500-e1c7-11e7-b6d5-4dc382ef7f5b',
-      },
-      {
-        name: 'panel_4',
-        type: 'visualization',
-        id: '69a34b00-9ee8-11e7-8711-e7a007dcef99',
-      },
-      {
-        name: 'panel_5',
-        type: 'visualization',
-        id: '42b997f0-0c26-11e8-b0ec-3bb475f6b6ff',
-      },
-      {
-        name: 'panel_6',
-        type: 'visualization',
-        id: '7cbd2350-2223-11e8-b802-5bcf64c2cfb4',
-      },
-      {
-        name: 'panel_7',
-        type: 'visualization',
-        id: '314c6f60-2224-11e8-b802-5bcf64c2cfb4',
-      },
-      {
-        name: 'panel_8',
-        type: 'visualization',
-        id: '24a3e970-4257-11e8-b3aa-73fdaf54bfc9',
-      },
-      {
-        name: 'panel_9',
-        type: 'visualization',
-        id: '14e2e710-4258-11e8-b3aa-73fdaf54bfc9',
-      },
-      {
-        name: 'panel_10',
-        type: 'visualization',
-        id: '47f2c680-a6e3-11e8-94b4-c30c0228351b',
-      },
-    ],
-    migrationVersion: {
-      dashboard: '7.0.0',
-    },
-    attributes: {
-      title: i18n.translate('server.sampleData.logsSpec.webTrafficTitle', {
-        defaultMessage: '[Logs] Web Traffic',
-      }),
-      hits: 0,
-      description: i18n.translate('server.sampleData.logsSpec.webTrafficDescription', {
-        defaultMessage: "Analyze mock web traffic log data for Elastic's website",
-      }),
-      panelsJSON:
-        '[{"embeddableConfig":{"vis":{"colors":{"Avg. Bytes":"#6ED0E0","Unique Visitors":"#0A437C"},"legendOpen":false}},"gridData":{"x":27,"y":11,"w":21,"h":13,"i":"2"},"panelIndex":"2","version":"7.0.0-alpha1","panelRefName":"panel_0"},{"gridData":{"x":0,"y":49,"w":24,"h":18,"i":"4"},"panelIndex":"4","version":"7.0.0-alpha1","panelRefName":"panel_1"},{"embeddableConfig":{"vis":{"defaultColors":{"0 - 22":"rgb(247,251,255)","22 - 44":"rgb(208,225,242)","44 - 66":"rgb(148,196,223)","66 - 88":"rgb(74,152,201)","88 - 110":"rgb(23,100,171)"},"legendOpen":false}},"gridData":{"x":0,"y":36,"w":24,"h":13,"i":"7"},"panelIndex":"7","version":"6.3.0","panelRefName":"panel_2"},{"embeddableConfig":{"mapCenter":[36.8092847020594,-96.94335937500001],"vis":{"params":{"sort":{"columnIndex":null,"direction":null}}}},"gridData":{"x":27,"y":24,"w":21,"h":12,"i":"9"},"panelIndex":"9","version":"6.3.0","panelRefName":"panel_3"},{"embeddableConfig":{"vis":{"colors":{"0 - 500":"#BF1B00","1000 - 1500":"#7EB26D","500 - 1000":"#F2C96D"},"defaultColors":{"0 - 500":"rgb(165,0,38)","1000 - 1500":"rgb(0,104,55)","500 - 1000":"rgb(255,255,190)"},"legendOpen":false}},"gridData":{"x":10,"y":0,"w":9,"h":11,"i":"11"},"panelIndex":"11","title":"","version":"6.3.0","panelRefName":"panel_4"},{"gridData":{"x":0,"y":24,"w":27,"h":12,"i":"13"},"panelIndex":"13","version":"6.3.0","panelRefName":"panel_5"},{"gridData":{"x":24,"y":36,"w":24,"h":31,"i":"14"},"panelIndex":"14","version":"6.3.0","panelRefName":"panel_6"},{"gridData":{"x":0,"y":11,"w":27,"h":13,"i":"15"},"panelIndex":"15","version":"6.3.0","panelRefName":"panel_7"},{"gridData":{"x":19,"y":0,"w":15,"h":11,"i":"16"},"panelIndex":"16","title":"","version":"6.3.0","panelRefName":"panel_8"},{"embeddableConfig":{"vis":{"legendOpen":false}},"gridData":{"x":34,"y":0,"w":14,"h":11,"i":"17"},"panelIndex":"17","version":"6.3.0","panelRefName":"panel_9"},{"embeddableConfig":{},"gridData":{"x":0,"y":0,"w":10,"h":11,"i":"18"},"panelIndex":"18","title":"","version":"7.0.0-alpha1","panelRefName":"panel_10"}]',
-      optionsJSON: '{"hidePanelTitles":false,"useMargins":true}',
-      version: 1,
-      timeRestore: true,
-      timeTo: 'now',
-      timeFrom: 'now-7d',
-      refreshInterval: {
-        pause: false,
-        value: 900000,
-      },
-      kibanaSavedObjectMeta: {
-        searchSourceJSON:
-          '{"query":{"language":"kuery","query":""},"filter":[],"highlightAll":true,"version":true}',
-      },
-    },
-  },
-];
diff --git a/src/legacy/server/sample_data/index.js b/src/legacy/server/sample_data/index.js
deleted file mode 100644
index 2e24946761f20..0000000000000
--- a/src/legacy/server/sample_data/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.
- */
-
-export { sampleDataMixin } from './sample_data_mixin';
diff --git a/src/legacy/server/sample_data/routes/index.js b/src/legacy/server/sample_data/routes/index.js
deleted file mode 100644
index 800c165e9eae6..0000000000000
--- a/src/legacy/server/sample_data/routes/index.js
+++ /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 { createListRoute } from './list';
-export { createInstallRoute } from './install';
-export { createUninstallRoute } from './uninstall';
diff --git a/src/legacy/server/sample_data/routes/install.js b/src/legacy/server/sample_data/routes/install.js
deleted file mode 100644
index 42635618e1ad6..0000000000000
--- a/src/legacy/server/sample_data/routes/install.js
+++ /dev/null
@@ -1,184 +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 Boom from 'boom';
-import Joi from 'joi';
-import { usage } from '../usage';
-import { loadData } from './lib/load_data';
-import { createIndexName } from './lib/create_index_name';
-import {
-  dateToIso8601IgnoringTime,
-  translateTimeRelativeToDifference,
-  translateTimeRelativeToWeek,
-} from './lib/translate_timestamp';
-
-function insertDataIntoIndex(
-  dataIndexConfig,
-  index,
-  nowReference,
-  request,
-  server,
-  callWithRequest
-) {
-  const bulkInsert = async docs => {
-    function updateTimestamps(doc) {
-      dataIndexConfig.timeFields.forEach(timeFieldName => {
-        if (doc[timeFieldName]) {
-          doc[timeFieldName] = dataIndexConfig.preserveDayOfWeekTimeOfDay
-            ? translateTimeRelativeToWeek(
-                doc[timeFieldName],
-                dataIndexConfig.currentTimeMarker,
-                nowReference
-              )
-            : translateTimeRelativeToDifference(
-                doc[timeFieldName],
-                dataIndexConfig.currentTimeMarker,
-                nowReference
-              );
-        }
-      });
-      return doc;
-    }
-
-    const insertCmd = { index: { _index: index } };
-
-    const bulk = [];
-    docs.forEach(doc => {
-      bulk.push(insertCmd);
-      bulk.push(updateTimestamps(doc));
-    });
-    const resp = await callWithRequest(request, 'bulk', { body: bulk });
-    if (resp.errors) {
-      server.log(
-        ['warning'],
-        `sample_data install errors while bulk inserting. Elasticsearch response: ${JSON.stringify(
-          resp,
-          null,
-          ''
-        )}`
-      );
-      return Promise.reject(
-        new Error(`Unable to load sample data into index "${index}", see kibana logs for details`)
-      );
-    }
-  };
-
-  return loadData(dataIndexConfig.dataPath, bulkInsert);
-}
-
-export const createInstallRoute = () => ({
-  path: '/api/sample_data/{id}',
-  method: 'POST',
-  config: {
-    validate: {
-      query: Joi.object().keys({ now: Joi.date().iso() }),
-      params: Joi.object()
-        .keys({ id: Joi.string().required() })
-        .required(),
-    },
-    handler: async (request, h) => {
-      const { server, params, query } = request;
-
-      const sampleDataset = server.getSampleDatasets().find(({ id }) => id === params.id);
-      if (!sampleDataset) {
-        return h.response().code(404);
-      }
-
-      const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
-
-      const now = query.now ? query.now : new Date();
-      const nowReference = dateToIso8601IgnoringTime(now);
-
-      const counts = {};
-      for (let i = 0; i < sampleDataset.dataIndices.length; i++) {
-        const dataIndexConfig = sampleDataset.dataIndices[i];
-        const index = createIndexName(sampleDataset.id, dataIndexConfig.id);
-
-        // clean up any old installation of dataset
-        try {
-          await callWithRequest(request, 'indices.delete', { index });
-        } catch (err) {
-          // ignore delete errors
-        }
-
-        try {
-          const createIndexParams = {
-            index: index,
-            body: {
-              settings: { index: { number_of_shards: 1, auto_expand_replicas: '0-1' } },
-              mappings: { properties: dataIndexConfig.fields },
-            },
-          };
-          await callWithRequest(request, 'indices.create', createIndexParams);
-        } catch (err) {
-          const errMsg = `Unable to create sample data index "${index}", error: ${err.message}`;
-          server.log(['warning'], errMsg);
-          return h.response(errMsg).code(err.status);
-        }
-
-        try {
-          const count = await insertDataIntoIndex(
-            dataIndexConfig,
-            index,
-            nowReference,
-            request,
-            server,
-            callWithRequest
-          );
-          counts[index] = count;
-        } catch (err) {
-          server.log(['warning'], `sample_data install errors while loading data. Error: ${err}`);
-          return h.response(err.message).code(500);
-        }
-      }
-
-      let createResults;
-      try {
-        createResults = await request
-          .getSavedObjectsClient()
-          .bulkCreate(sampleDataset.savedObjects, { overwrite: true });
-      } catch (err) {
-        server.log(['warning'], `bulkCreate failed, error: ${err.message}`);
-        return Boom.badImplementation(
-          `Unable to load kibana saved objects, see kibana logs for details`
-        );
-      }
-      const errors = createResults.saved_objects.filter(savedObjectCreateResult => {
-        return Boolean(savedObjectCreateResult.error);
-      });
-      if (errors.length > 0) {
-        server.log(
-          ['warning'],
-          `sample_data install errors while loading saved objects. Errors: ${errors.join(',')}`
-        );
-        return h
-          .response(`Unable to load kibana saved objects, see kibana logs for details`)
-          .code(403);
-      }
-
-      // track the usage operation in a non-blocking way
-      usage(request).addInstall(params.id);
-
-      return h.response({
-        elasticsearchIndicesCreated: counts,
-        kibanaSavedObjectsLoaded: sampleDataset.savedObjects.length,
-      });
-    },
-  },
-});
diff --git a/src/legacy/server/sample_data/routes/lib/create_index_name.js b/src/legacy/server/sample_data/routes/lib/create_index_name.js
deleted file mode 100644
index de9dac7c96fa0..0000000000000
--- a/src/legacy/server/sample_data/routes/lib/create_index_name.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.
- */
-
-export function createIndexName(sampleDataSetId, dataIndexId) {
-  // Sample data schema was updated to support multiple indices in 6.5.
-  // This if statement ensures that sample data sets that used a single index prior to the schema change
-  // have the same index name to avoid orphaned indices when uninstalling.
-  if (sampleDataSetId === dataIndexId) {
-    return `kibana_sample_data_${sampleDataSetId}`;
-  }
-  return `kibana_sample_data_${sampleDataSetId}_${dataIndexId}`;
-}
diff --git a/src/legacy/server/sample_data/routes/lib/create_index_name.test.js b/src/legacy/server/sample_data/routes/lib/create_index_name.test.js
deleted file mode 100644
index e285dc0120ac8..0000000000000
--- a/src/legacy/server/sample_data/routes/lib/create_index_name.test.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.
- */
-
-import { createIndexName } from './create_index_name';
-
-test('should include sampleDataSetId and dataIndexId in elasticsearch index name', async () => {
-  expect(createIndexName('mySampleDataSetId', 'myDataIndexId')).toBe(
-    'kibana_sample_data_mySampleDataSetId_myDataIndexId'
-  );
-});
-
-test('should only include sampleDataSetId when sampleDataSetId and dataIndexId are identical', async () => {
-  expect(createIndexName('flights', 'flights')).toBe('kibana_sample_data_flights');
-});
diff --git a/src/legacy/server/sample_data/routes/lib/load_data.js b/src/legacy/server/sample_data/routes/lib/load_data.js
deleted file mode 100644
index 9e343b644ec7b..0000000000000
--- a/src/legacy/server/sample_data/routes/lib/load_data.js
+++ /dev/null
@@ -1,99 +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 readline from 'readline';
-import fs from 'fs';
-import zlib from 'zlib';
-
-const BULK_INSERT_SIZE = 500;
-
-export function loadData(path, bulkInsert) {
-  return new Promise((resolve, reject) => {
-    let count = 0;
-    let docs = [];
-    let isPaused = false;
-
-    // pause does not stop lines already in buffer. Use smaller buffer size to avoid bulk inserting to many records
-    const readStream = fs.createReadStream(path, { highWaterMark: 1024 * 4 });
-    // eslint-disable-next-line new-cap
-    const lineStream = readline.createInterface({ input: readStream.pipe(zlib.Unzip()) });
-    const onClose = async () => {
-      if (docs.length > 0) {
-        try {
-          await bulkInsert(docs);
-        } catch (err) {
-          reject(err);
-          return;
-        }
-      }
-      resolve(count);
-    };
-    lineStream.on('close', onClose);
-
-    const closeWithError = err => {
-      lineStream.removeListener('close', onClose);
-      lineStream.close();
-      reject(err);
-    };
-
-    lineStream.on('line', async line => {
-      if (line.length === 0 || line.charAt(0) === '#') {
-        return;
-      }
-
-      let doc;
-      try {
-        doc = JSON.parse(line);
-      } catch (err) {
-        closeWithError(
-          new Error(
-            `Unable to parse line as JSON document, line: """${line}""", Error: ${err.message}`
-          )
-        );
-        return;
-      }
-
-      count++;
-      docs.push(doc);
-
-      if (docs.length >= BULK_INSERT_SIZE && !isPaused) {
-        lineStream.pause();
-
-        // readline pause is leaky and events in buffer still get sent after pause
-        // need to clear buffer before async call
-        const docstmp = docs.slice();
-        docs = [];
-        try {
-          await bulkInsert(docstmp);
-          lineStream.resume();
-        } catch (err) {
-          closeWithError(err);
-        }
-      }
-    });
-
-    lineStream.on('pause', async () => {
-      isPaused = true;
-    });
-
-    lineStream.on('resume', async () => {
-      isPaused = false;
-    });
-  });
-}
diff --git a/src/legacy/server/sample_data/routes/lib/load_data.test.js b/src/legacy/server/sample_data/routes/lib/load_data.test.js
deleted file mode 100644
index 0af07e14ff965..0000000000000
--- a/src/legacy/server/sample_data/routes/lib/load_data.test.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 { loadData } from './load_data';
-
-test('load flight data', async () => {
-  let myDocsCount = 0;
-  const bulkInsertMock = docs => {
-    myDocsCount += docs.length;
-  };
-  const count = await loadData(
-    './src/legacy/server/sample_data/data_sets/flights/flights.json.gz',
-    bulkInsertMock
-  );
-  expect(myDocsCount).toBe(13059);
-  expect(count).toBe(13059);
-});
-
-test('load log data', async () => {
-  let myDocsCount = 0;
-  const bulkInsertMock = docs => {
-    myDocsCount += docs.length;
-  };
-  const count = await loadData(
-    './src/legacy/server/sample_data/data_sets/logs/logs.json.gz',
-    bulkInsertMock
-  );
-  expect(myDocsCount).toBe(14074);
-  expect(count).toBe(14074);
-});
-
-test('load ecommerce data', async () => {
-  let myDocsCount = 0;
-  const bulkInsertMock = docs => {
-    myDocsCount += docs.length;
-  };
-  const count = await loadData(
-    './src/legacy/server/sample_data/data_sets/ecommerce/ecommerce.json.gz',
-    bulkInsertMock
-  );
-  expect(myDocsCount).toBe(4675);
-  expect(count).toBe(4675);
-});
diff --git a/src/legacy/server/sample_data/routes/lib/translate_timestamp.js b/src/legacy/server/sample_data/routes/lib/translate_timestamp.js
deleted file mode 100644
index 5d98eb34af247..0000000000000
--- a/src/legacy/server/sample_data/routes/lib/translate_timestamp.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.
- */
-
-const MILLISECONDS_IN_DAY = 86400000;
-
-function iso8601ToDateIgnoringTime(iso8601) {
-  const split = iso8601.split('-');
-  if (split.length < 3) {
-    throw new Error('Unexpected timestamp format, expecting YYYY-MM-DDTHH:mm:ss');
-  }
-  const year = parseInt(split[0]);
-  const month = parseInt(split[1]) - 1; // javascript months are zero-based indexed
-  const date = parseInt(split[2]);
-  return new Date(year, month, date);
-}
-
-export function dateToIso8601IgnoringTime(date) {
-  // not using "Date.toISOString" because only using Date methods that deal with local time
-  const year = date.getFullYear();
-  const month = date.getMonth() + 1;
-  const monthString = month < 10 ? `0${month}` : `${month}`;
-  const dateString = date.getDate() < 10 ? `0${date.getDate()}` : `${date.getDate()}`;
-  return `${year}-${monthString}-${dateString}`;
-}
-
-// Translate source timestamp by targetReference timestamp,
-// perserving the distance between source and sourceReference
-export function translateTimeRelativeToDifference(source, sourceReference, targetReference) {
-  const sourceDate = iso8601ToDateIgnoringTime(source);
-  const sourceReferenceDate = iso8601ToDateIgnoringTime(sourceReference);
-  const targetReferenceDate = iso8601ToDateIgnoringTime(targetReference);
-
-  const timeDelta = sourceDate.getTime() - sourceReferenceDate.getTime();
-  const translatedDate = new Date(targetReferenceDate.getTime() + timeDelta);
-
-  return `${dateToIso8601IgnoringTime(translatedDate)}T${source.substring(11)}`;
-}
-
-// Translate source timestamp by targetReference timestamp,
-// perserving the week distance between source and sourceReference and day of week of the source timestamp
-export function translateTimeRelativeToWeek(source, sourceReference, targetReference) {
-  const sourceReferenceDate = iso8601ToDateIgnoringTime(sourceReference);
-  const targetReferenceDate = iso8601ToDateIgnoringTime(targetReference);
-
-  // If these dates were in the same week, how many days apart would they be?
-  const dayOfWeekDelta = sourceReferenceDate.getDay() - targetReferenceDate.getDay();
-
-  // If we pretend that the targetReference is actually the same day of the week as the
-  // sourceReference, then we can translate the source to the target while preserving their
-  // days of the week.
-  const normalizationDelta = dayOfWeekDelta * MILLISECONDS_IN_DAY;
-  const normalizedTargetReference = dateToIso8601IgnoringTime(
-    new Date(targetReferenceDate.getTime() + normalizationDelta)
-  );
-
-  return translateTimeRelativeToDifference(source, sourceReference, normalizedTargetReference);
-}
diff --git a/src/legacy/server/sample_data/routes/lib/translate_timestamp.test.js b/src/legacy/server/sample_data/routes/lib/translate_timestamp.test.js
deleted file mode 100644
index e03d4870ad064..0000000000000
--- a/src/legacy/server/sample_data/routes/lib/translate_timestamp.test.js
+++ /dev/null
@@ -1,105 +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 { translateTimeRelativeToWeek } from './translate_timestamp';
-
-describe('translateTimeRelativeToWeek', () => {
-  const sourceReference = '2018-01-02T00:00:00'; //Tuesday
-  const targetReference = '2018-04-25T18:24:58.650'; // Wednesday
-
-  describe('2 weeks before', () => {
-    test('should properly adjust timestamp when day is before targetReference day of week', () => {
-      const source = '2017-12-18T23:50:00'; // Monday, -2 week relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-04-09T23:50:00'); // Monday 2 week before targetReference week
-    });
-
-    test('should properly adjust timestamp when day is same as targetReference day of week', () => {
-      const source = '2017-12-20T23:50:00'; // Wednesday, -2 week relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-04-11T23:50:00'); // Wednesday 2 week before targetReference week
-    });
-
-    test('should properly adjust timestamp when day is after targetReference day of week', () => {
-      const source = '2017-12-22T16:16:50'; // Friday, -2 week relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-04-13T16:16:50'); // Friday 2 week before targetReference week
-    });
-  });
-
-  describe('week before', () => {
-    test('should properly adjust timestamp when day is before targetReference day of week', () => {
-      const source = '2017-12-25T23:50:00'; // Monday, -1 week relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-04-16T23:50:00'); // Monday 1 week before targetReference week
-    });
-
-    test('should properly adjust timestamp when day is same as targetReference day of week', () => {
-      const source = '2017-12-27T23:50:00'; // Wednesday, -1 week relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-04-18T23:50:00'); // Wednesday 1 week before targetReference week
-    });
-
-    test('should properly adjust timestamp when day is after targetReference day of week', () => {
-      const source = '2017-12-29T16:16:50'; // Friday, -1 week relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-04-20T16:16:50'); // Friday 1 week before targetReference week
-    });
-  });
-
-  describe('same week', () => {
-    test('should properly adjust timestamp when day is before targetReference day of week', () => {
-      const source = '2018-01-01T23:50:00'; // Monday, same week relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-04-23T23:50:00'); // Monday same week as targetReference
-    });
-
-    test('should properly adjust timestamp when day is same as targetReference day of week', () => {
-      const source = '2018-01-03T23:50:00'; // Wednesday, same week relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-04-25T23:50:00'); // Wednesday same week as targetReference
-    });
-
-    test('should properly adjust timestamp when day is after targetReference day of week', () => {
-      const source = '2018-01-05T16:16:50'; // Friday, same week relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-04-27T16:16:50'); // Friday same week as targetReference
-    });
-  });
-
-  describe('week after', () => {
-    test('should properly adjust timestamp when day is before targetReference day of week', () => {
-      const source = '2018-01-08T23:50:00'; // Monday, 1 week after relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-04-30T23:50:00'); // Monday 1 week after targetReference week
-    });
-
-    test('should properly adjust timestamp when day is same as targetReference day of week', () => {
-      const source = '2018-01-10T23:50:00'; // Wednesday, same week relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-05-02T23:50:00'); // Wednesday 1 week after targetReference week
-    });
-
-    test('should properly adjust timestamp when day is after targetReference day of week', () => {
-      const source = '2018-01-12T16:16:50'; // Friday, same week relative to sourceReference
-      const timestamp = translateTimeRelativeToWeek(source, sourceReference, targetReference);
-      expect(timestamp).toBe('2018-05-04T16:16:50'); // Friday 1 week after targetReference week
-    });
-  });
-});
diff --git a/src/legacy/server/sample_data/routes/list.js b/src/legacy/server/sample_data/routes/list.js
deleted file mode 100644
index 65370e6da9fb1..0000000000000
--- a/src/legacy/server/sample_data/routes/list.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 _ from 'lodash';
-import { createIndexName } from './lib/create_index_name';
-
-const NOT_INSTALLED = 'not_installed';
-const INSTALLED = 'installed';
-const UNKNOWN = 'unknown';
-
-export const createListRoute = () => ({
-  path: '/api/sample_data',
-  method: 'GET',
-  config: {
-    handler: async request => {
-      const { callWithRequest } = request.server.plugins.elasticsearch.getCluster('data');
-
-      const sampleDatasets = request.server.getSampleDatasets().map(sampleDataset => {
-        return {
-          id: sampleDataset.id,
-          name: sampleDataset.name,
-          description: sampleDataset.description,
-          previewImagePath: sampleDataset.previewImagePath,
-          darkPreviewImagePath: sampleDataset.darkPreviewImagePath,
-          overviewDashboard: sampleDataset.overviewDashboard,
-          appLinks: sampleDataset.appLinks,
-          defaultIndex: sampleDataset.defaultIndex,
-          dataIndices: sampleDataset.dataIndices.map(({ id }) => ({ id })),
-        };
-      });
-
-      const isInstalledPromises = sampleDatasets.map(async sampleDataset => {
-        for (let i = 0; i < sampleDataset.dataIndices.length; i++) {
-          const dataIndexConfig = sampleDataset.dataIndices[i];
-          const index = createIndexName(sampleDataset.id, dataIndexConfig.id);
-          try {
-            const indexExists = await callWithRequest(request, 'indices.exists', { index: index });
-            if (!indexExists) {
-              sampleDataset.status = NOT_INSTALLED;
-              return;
-            }
-
-            const { count } = await callWithRequest(request, 'count', { index: index });
-            if (count === 0) {
-              sampleDataset.status = NOT_INSTALLED;
-              return;
-            }
-          } catch (err) {
-            sampleDataset.status = UNKNOWN;
-            sampleDataset.statusMsg = err.message;
-            return;
-          }
-        }
-
-        try {
-          await request.getSavedObjectsClient().get('dashboard', sampleDataset.overviewDashboard);
-        } catch (err) {
-          // savedObjectClient.get() throws an boom error when object is not found.
-          if (_.get(err, 'output.statusCode') === 404) {
-            sampleDataset.status = NOT_INSTALLED;
-            return;
-          }
-
-          sampleDataset.status = UNKNOWN;
-          sampleDataset.statusMsg = err.message;
-          return;
-        }
-
-        sampleDataset.status = INSTALLED;
-      });
-
-      await Promise.all(isInstalledPromises);
-      return sampleDatasets;
-    },
-  },
-});
diff --git a/src/legacy/server/sample_data/routes/uninstall.js b/src/legacy/server/sample_data/routes/uninstall.js
deleted file mode 100644
index 6177c0379cd68..0000000000000
--- a/src/legacy/server/sample_data/routes/uninstall.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 _ from 'lodash';
-import Joi from 'joi';
-import { usage } from '../usage';
-import { createIndexName } from './lib/create_index_name';
-
-export const createUninstallRoute = () => ({
-  path: '/api/sample_data/{id}',
-  method: 'DELETE',
-  config: {
-    validate: {
-      params: Joi.object()
-        .keys({
-          id: Joi.string().required(),
-        })
-        .required(),
-    },
-    handler: async (request, h) => {
-      const { server, params } = request;
-      const sampleDataset = server.getSampleDatasets().find(({ id }) => id === params.id);
-
-      if (!sampleDataset) {
-        return h.response().code(404);
-      }
-
-      const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
-
-      for (let i = 0; i < sampleDataset.dataIndices.length; i++) {
-        const dataIndexConfig = sampleDataset.dataIndices[i];
-        const index = createIndexName(sampleDataset.id, dataIndexConfig.id);
-
-        try {
-          await callWithRequest(request, 'indices.delete', { index: index });
-        } catch (err) {
-          return h
-            .response(`Unable to delete sample data index "${index}", error: ${err.message}`)
-            .code(err.status);
-        }
-      }
-
-      const deletePromises = sampleDataset.savedObjects.map(({ type, id }) =>
-        request.getSavedObjectsClient().delete(type, id)
-      );
-
-      try {
-        await Promise.all(deletePromises);
-      } catch (err) {
-        // ignore 404s since users could have deleted some of the saved objects via the UI
-        if (_.get(err, 'output.statusCode') !== 404) {
-          return h
-            .response(`Unable to delete sample dataset saved objects, error: ${err.message}`)
-            .code(403);
-        }
-      }
-
-      // track the usage operation in a non-blocking way
-      usage(request).addUninstall(params.id);
-
-      return {};
-    },
-  },
-});
diff --git a/src/legacy/server/sample_data/sample_data_mixin.js b/src/legacy/server/sample_data/sample_data_mixin.js
deleted file mode 100644
index 338d6fd8cb5da..0000000000000
--- a/src/legacy/server/sample_data/sample_data_mixin.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Joi from 'joi';
-import { sampleDataSchema } from './data_set_schema';
-import { createListRoute, createInstallRoute, createUninstallRoute } from './routes';
-import { flightsSpecProvider, logsSpecProvider, ecommerceSpecProvider } from './data_sets';
-import { makeSampleDataUsageCollector } from './usage';
-
-export function sampleDataMixin(kbnServer, server) {
-  server.route(createListRoute());
-  server.route(createInstallRoute());
-  server.route(createUninstallRoute());
-
-  const sampleDatasets = [];
-
-  server.decorate('server', 'getSampleDatasets', () => {
-    return sampleDatasets;
-  });
-
-  server.decorate('server', 'registerSampleDataset', specProvider => {
-    const { error, value } = Joi.validate(specProvider(server), sampleDataSchema);
-
-    if (error) {
-      throw new Error(`Unable to register sample dataset spec because it's invalid. ${error}`);
-    }
-
-    const defaultIndexSavedObjectJson = value.savedObjects.find(savedObjectJson => {
-      return savedObjectJson.type === 'index-pattern' && savedObjectJson.id === value.defaultIndex;
-    });
-    if (!defaultIndexSavedObjectJson) {
-      throw new Error(
-        `Unable to register sample dataset spec, defaultIndex: "${value.defaultIndex}" does not exist in savedObjects list.`
-      );
-    }
-
-    const dashboardSavedObjectJson = value.savedObjects.find(savedObjectJson => {
-      return savedObjectJson.type === 'dashboard' && savedObjectJson.id === value.overviewDashboard;
-    });
-    if (!dashboardSavedObjectJson) {
-      throw new Error(
-        `Unable to register sample dataset spec, overviewDashboard: "${value.overviewDashboard}" does not exist in savedObjects list.`
-      );
-    }
-
-    sampleDatasets.push(value);
-  });
-
-  server.decorate('server', 'addSavedObjectsToSampleDataset', (id, savedObjects) => {
-    const sampleDataset = sampleDatasets.find(sampleDataset => {
-      return sampleDataset.id === id;
-    });
-
-    if (!sampleDataset) {
-      throw new Error(`Unable to find sample dataset with id: ${id}`);
-    }
-
-    sampleDataset.savedObjects = sampleDataset.savedObjects.concat(savedObjects);
-  });
-
-  server.decorate('server', 'addAppLinksToSampleDataset', (id, appLinks) => {
-    const sampleDataset = sampleDatasets.find(sampleDataset => {
-      return sampleDataset.id === id;
-    });
-
-    if (!sampleDataset) {
-      throw new Error(`Unable to find sample dataset with id: ${id}`);
-    }
-
-    sampleDataset.appLinks = sampleDataset.appLinks.concat(appLinks);
-  });
-
-  server.decorate(
-    'server',
-    'replacePanelInSampleDatasetDashboard',
-    ({
-      sampleDataId,
-      dashboardId,
-      oldEmbeddableId,
-      embeddableId,
-      embeddableType,
-      embeddableConfig = {},
-    }) => {
-      const sampleDataset = sampleDatasets.find(sampleDataset => {
-        return sampleDataset.id === sampleDataId;
-      });
-      if (!sampleDataset) {
-        throw new Error(`Unable to find sample dataset with id: ${sampleDataId}`);
-      }
-
-      const dashboard = sampleDataset.savedObjects.find(savedObject => {
-        return savedObject.id === dashboardId && savedObject.type === 'dashboard';
-      });
-      if (!dashboard) {
-        throw new Error(`Unable to find dashboard with id: ${dashboardId}`);
-      }
-
-      try {
-        const reference = dashboard.references.find(reference => {
-          return reference.id === oldEmbeddableId;
-        });
-        if (!reference) {
-          throw new Error(`Unable to find reference for embeddable: ${oldEmbeddableId}`);
-        }
-        reference.type = embeddableType;
-        reference.id = embeddableId;
-
-        const panels = JSON.parse(dashboard.attributes.panelsJSON);
-        const panel = panels.find(panel => {
-          return panel.panelRefName === reference.name;
-        });
-        if (!panel) {
-          throw new Error(`Unable to find panel for reference: ${reference.name}`);
-        }
-        panel.embeddableConfig = embeddableConfig;
-        dashboard.attributes.panelsJSON = JSON.stringify(panels);
-      } catch (error) {
-        throw new Error(
-          `Unable to replace panel with embeddable ${oldEmbeddableId}, error: ${error}`
-        );
-      }
-    }
-  );
-
-  server.registerSampleDataset(flightsSpecProvider);
-  server.registerSampleDataset(logsSpecProvider);
-  server.registerSampleDataset(ecommerceSpecProvider);
-
-  makeSampleDataUsageCollector(server);
-}
diff --git a/src/legacy/server/sample_data/usage/collector.ts b/src/legacy/server/sample_data/usage/collector.ts
deleted file mode 100644
index bcb5e7be2597a..0000000000000
--- a/src/legacy/server/sample_data/usage/collector.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 { Server } from 'hapi';
-import { fetchProvider } from './collector_fetch';
-import { UsageCollectionSetup } from '../../../../plugins/usage_collection/server';
-
-export function makeSampleDataUsageCollector(
-  usageCollection: UsageCollectionSetup,
-  server: Server
-) {
-  let index: string;
-  try {
-    index = server.config().get('kibana.index');
-  } catch (err) {
-    return; // kibana plugin is not enabled (test environment)
-  }
-  const collector = usageCollection.makeUsageCollector({
-    type: 'sample-data',
-    fetch: fetchProvider(index),
-    isReady: () => true,
-  });
-
-  usageCollection.registerCollector(collector);
-}
diff --git a/src/legacy/server/sample_data/usage/usage.ts b/src/legacy/server/sample_data/usage/usage.ts
deleted file mode 100644
index 0fb17128b102c..0000000000000
--- a/src/legacy/server/sample_data/usage/usage.ts
+++ /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 * as Hapi from 'hapi';
-
-const SAVED_OBJECT_ID = 'sample-data-telemetry';
-
-export function usage(request: Hapi.Request) {
-  const { server } = request;
-
-  const handleIncrementError = (err: Error) => {
-    if (err != null) {
-      server.log(['debug', 'sample_data', 'telemetry'], err.stack);
-    }
-    server.log(
-      ['warning', 'sample_data', 'telemetry'],
-      `saved objects repository incrementCounter encountered an error: ${err}`
-    );
-  };
-
-  const {
-    savedObjects: { getSavedObjectsRepository },
-  } = server;
-  const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
-  const internalRepository = getSavedObjectsRepository(callWithInternalUser);
-
-  return {
-    addInstall: async (dataSet: string) => {
-      try {
-        internalRepository.incrementCounter(SAVED_OBJECT_ID, dataSet, `installCount`);
-      } catch (err) {
-        handleIncrementError(err);
-      }
-    },
-    addUninstall: async (dataSet: string) => {
-      try {
-        internalRepository.incrementCounter(SAVED_OBJECT_ID, dataSet, `unInstallCount`);
-      } catch (err) {
-        handleIncrementError(err);
-      }
-    },
-  };
-}
diff --git a/src/legacy/server/saved_objects/saved_objects_mixin.test.js b/src/legacy/server/saved_objects/saved_objects_mixin.test.js
index 0e96189db4650..691878cf66d27 100644
--- a/src/legacy/server/saved_objects/saved_objects_mixin.test.js
+++ b/src/legacy/server/saved_objects/saved_objects_mixin.test.js
@@ -106,12 +106,7 @@ describe('Saved Objects Mixin', () => {
       newPlatform: {
         __internals: {
           elasticsearch: {
-            adminClient$: {
-              pipe: jest.fn().mockImplementation(() => ({
-                toPromise: () =>
-                  Promise.resolve({ adminClient: { callAsInternalUser: mockCallCluster } }),
-              })),
-            },
+            adminClient: { callAsInternalUser: mockCallCluster },
           },
         },
       },
diff --git a/src/legacy/server/status/lib/case_conversion.test.ts b/src/legacy/server/status/lib/case_conversion.test.ts
new file mode 100644
index 0000000000000..a231ee0ba4b0f
--- /dev/null
+++ b/src/legacy/server/status/lib/case_conversion.test.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.
+ */
+
+import { keysToSnakeCaseShallow } from './case_conversion';
+
+describe('keysToSnakeCaseShallow', () => {
+  test("should convert all of an object's keys to snake case", () => {
+    const data = {
+      camelCase: 'camel_case',
+      'kebab-case': 'kebab_case',
+      snake_case: 'snake_case',
+    };
+
+    const result = keysToSnakeCaseShallow(data);
+
+    expect(result.camel_case).toBe('camel_case');
+    expect(result.kebab_case).toBe('kebab_case');
+    expect(result.snake_case).toBe('snake_case');
+  });
+});
diff --git a/src/legacy/server/status/lib/case_conversion.ts b/src/legacy/server/status/lib/case_conversion.ts
new file mode 100644
index 0000000000000..a3ae15028daeb
--- /dev/null
+++ b/src/legacy/server/status/lib/case_conversion.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mapKeys, snakeCase } from 'lodash';
+
+export function keysToSnakeCaseShallow(object: Record<string, any>) {
+  return mapKeys(object, (value, key) => snakeCase(key));
+}
diff --git a/src/legacy/server/status/lib/metrics.js b/src/legacy/server/status/lib/metrics.js
index 322d8d8bd9ab4..2631b245e72ab 100644
--- a/src/legacy/server/status/lib/metrics.js
+++ b/src/legacy/server/status/lib/metrics.js
@@ -20,7 +20,7 @@
 import os from 'os';
 import v8 from 'v8';
 import { get, isObject, merge } from 'lodash';
-import { keysToSnakeCaseShallow } from '../../../utils/case_conversion';
+import { keysToSnakeCaseShallow } from './case_conversion';
 import { getAllStats as cGroupStats } from './cgroup';
 import { getOSInfo } from './get_os_info';
 
diff --git a/src/legacy/ui/__tests__/ui_exports_replace_injected_vars.js b/src/legacy/ui/__tests__/ui_exports_replace_injected_vars.js
deleted file mode 100644
index 54021d92eb003..0000000000000
--- a/src/legacy/ui/__tests__/ui_exports_replace_injected_vars.js
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-
-import { delay } from 'bluebird';
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import cheerio from 'cheerio';
-import { noop } from 'lodash';
-
-import * as getUiSettingsServiceForRequestNS from '../ui_settings/ui_settings_service_for_request';
-import { createRoot, getKbnServer, request } from '../../../test_utils/kbn_server';
-
-const getInjectedVarsFromResponse = resp => {
-  expect(resp.statusCode).to.be(200);
-  const $ = cheerio.load(resp.text);
-  const data = $('kbn-injected-metadata').attr('data');
-  return JSON.parse(data).vars;
-};
-
-const injectReplacer = (kbnServer, replacer) => {
-  // normally the replacer would be defined in a plugin's uiExports,
-  // but that requires stubbing out an entire plugin directory for
-  // each test, so we fake it and jam the replacer into uiExports
-  const { injectedVarsReplacers = [] } = kbnServer.uiExports;
-  kbnServer.uiExports.injectedVarsReplacers = [...injectedVarsReplacers, replacer];
-};
-
-describe('UiExports', function() {
-  const sandbox = sinon.createSandbox();
-
-  let root;
-  let kbnServer;
-  before(async () => {
-    this.slow(2000);
-    this.timeout(30000);
-
-    root = root = createRoot({
-      // inject an app so we can hit /app/{id}
-      plugins: { paths: [resolve(__dirname, './fixtures/test_app')] },
-    });
-
-    await root.setup();
-    await root.start();
-
-    kbnServer = getKbnServer(root);
-
-    // Mock out the ui settings which depends on ES
-    sandbox.stub(getUiSettingsServiceForRequestNS, 'getUiSettingsServiceForRequest').returns({
-      getRegistered: noop,
-      getUserProvided: noop,
-    });
-  });
-
-  after(async () => {
-    await root.shutdown();
-    sandbox.restore();
-  });
-
-  let originalInjectedVarsReplacers;
-  beforeEach(() => {
-    originalInjectedVarsReplacers = kbnServer.uiExports.injectedVarsReplacers;
-  });
-
-  afterEach(() => {
-    kbnServer.uiExports.injectedVarsReplacers = originalInjectedVarsReplacers;
-  });
-
-  describe('#replaceInjectedVars', function() {
-    it('allows sync replacing of injected vars', async () => {
-      injectReplacer(kbnServer, () => ({ a: 1 }));
-
-      const resp = await request.get(root, '/app/test_app').expect(200);
-      const injectedVars = getInjectedVarsFromResponse(resp);
-
-      expect(injectedVars).to.eql({ a: 1 });
-    });
-
-    it('allows async replacing of injected vars', async () => {
-      const asyncThing = () => delay(100).return('world');
-
-      injectReplacer(kbnServer, async () => {
-        return {
-          hello: await asyncThing(),
-        };
-      });
-
-      const resp = await request.get(root, '/app/test_app').expect(200);
-      const injectedVars = getInjectedVarsFromResponse(resp);
-
-      expect(injectedVars).to.eql({
-        hello: 'world',
-      });
-    });
-
-    it('passes originalInjectedVars, request, and server to replacer', async () => {
-      const stub = sinon.stub();
-      injectReplacer(kbnServer, () => ({ foo: 'bar' }));
-      injectReplacer(kbnServer, stub);
-
-      await await request.get(root, '/app/test_app').expect(200);
-
-      sinon.assert.calledOnce(stub);
-      expect(stub.firstCall.args[0]).to.eql({ foo: 'bar' }); // originalInjectedVars
-      expect(stub.firstCall.args[1]).to.have.property('path', '/app/test_app'); // request
-      expect(stub.firstCall.args[1]).to.have.property('server', kbnServer.server); // request
-      expect(stub.firstCall.args[2]).to.be(kbnServer.server);
-    });
-
-    it('calls the methods sequentially', async () => {
-      injectReplacer(kbnServer, () => ({ name: '' }));
-      injectReplacer(kbnServer, orig => ({ name: orig.name + 's' }));
-      injectReplacer(kbnServer, orig => ({ name: orig.name + 'a' }));
-      injectReplacer(kbnServer, orig => ({ name: orig.name + 'm' }));
-
-      const resp = await request.get(root, '/app/test_app').expect(200);
-      const injectedVars = getInjectedVarsFromResponse(resp);
-
-      expect(injectedVars).to.eql({ name: 'sam' });
-    });
-
-    it('propagates errors thrown in replacers', async () => {
-      injectReplacer(kbnServer, async () => {
-        await delay(100);
-        throw new Error('replacer failed');
-      });
-
-      await request.get(root, '/app/test_app').expect(500);
-    });
-
-    it('starts off with the injected vars for the app merged with the default injected vars', async () => {
-      const stub = sinon.stub();
-      injectReplacer(kbnServer, stub);
-
-      await request.get(root, '/app/test_app').expect(200);
-
-      sinon.assert.calledOnce(stub);
-      const args = stub.lastCall.args[0];
-      expect(args.from_defaults).to.be(true);
-      expect(args.from_test_app).to.be(true);
-    });
-  });
-});
diff --git a/src/legacy/ui/apm/index.js b/src/legacy/ui/apm/index.js
new file mode 100644
index 0000000000000..e2ff415865b56
--- /dev/null
+++ b/src/legacy/ui/apm/index.js
@@ -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 { getConfig, isKibanaDistributable } from '../../../apm';
+import agent from 'elastic-apm-node';
+
+const apmEnabled = !isKibanaDistributable && process.env.ELASTIC_APM_ACTIVE === 'true';
+
+export function apmImport() {
+  return apmEnabled ? 'import { init } from "@elastic/apm-rum"' : '';
+}
+
+export function apmInit(config) {
+  return apmEnabled ? `init(${config})` : '';
+}
+
+export function getApmConfig(appMetadata) {
+  if (!apmEnabled) {
+    return {};
+  }
+  /**
+   * we use the injected app metadata from the server to extract the
+   * app URL path to be used for page-load transaction
+   */
+  const navLink = appMetadata.getNavLink();
+  const pageUrl = navLink ? navLink.toJSON().url : appMetadata._url;
+
+  const config = {
+    ...getConfig('kibana-frontend'),
+    ...{
+      active: true,
+      pageLoadTransactionName: pageUrl,
+    },
+  };
+  /**
+   * Get current active backend transaction to make distrubuted tracing
+   * work for rendering the app
+   */
+  const backendTransaction = agent.currentTransaction;
+
+  if (backendTransaction) {
+    const { sampled, traceId } = backendTransaction;
+    return {
+      ...config,
+      ...{
+        pageLoadTraceId: traceId,
+        pageLoadSampled: sampled,
+        pageLoadSpanId: backendTransaction.ensureParentId(),
+      },
+    };
+  }
+  return config;
+}
diff --git a/src/legacy/ui/public/agg_types/agg_config.ts b/src/legacy/ui/public/agg_types/agg_config.ts
index 9306ffcaff9fd..07e0d46e4eb70 100644
--- a/src/legacy/ui/public/agg_types/agg_config.ts
+++ b/src/legacy/ui/public/agg_types/agg_config.ts
@@ -27,7 +27,7 @@
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { npStart } from 'ui/new_platform';
-import { SearchSourceContract, FetchOptions } from '../courier/types';
+import { ISearchSource, FetchOptions } from '../courier/types';
 import { AggType } from './agg_type';
 import { AggGroupNames } from '../vis/editors/default/agg_groups';
 import { writeParams } from './agg_params';
@@ -236,7 +236,7 @@ export class AggConfig {
    *  @param {Courier.FetchOptions} options
    *  @return {Promise<undefined>}
    */
-  onSearchRequestStart(searchSource: SearchSourceContract, options?: FetchOptions) {
+  onSearchRequestStart(searchSource: ISearchSource, options?: FetchOptions) {
     if (!this.type) {
       return Promise.resolve();
     }
diff --git a/src/legacy/ui/public/agg_types/agg_configs.ts b/src/legacy/ui/public/agg_types/agg_configs.ts
index b5a7474c99b0e..6e811afb1849d 100644
--- a/src/legacy/ui/public/agg_types/agg_configs.ts
+++ b/src/legacy/ui/public/agg_types/agg_configs.ts
@@ -31,8 +31,8 @@ import { TimeRange } from 'src/plugins/data/public';
 import { Schema } from '../vis/editors/default/schemas';
 import { AggConfig, AggConfigOptions } from './agg_config';
 import { AggGroupNames } from '../vis/editors/default/agg_groups';
-import { IndexPattern } from '../../../core_plugins/data/public';
-import { SearchSourceContract, FetchOptions } from '../courier/types';
+import { IndexPattern } from '../../../../plugins/data/public';
+import { ISearchSource, FetchOptions } from '../courier/types';
 
 type Schemas = Record<string, any>;
 
@@ -306,7 +306,7 @@ export class AggConfigs {
     return _.find(reqAgg.getResponseAggs(), { id });
   }
 
-  onSearchRequestStart(searchSource: SearchSourceContract, options?: FetchOptions) {
+  onSearchRequestStart(searchSource: ISearchSource, options?: FetchOptions) {
     return Promise.all(
       // @ts-ignore
       this.getRequestAggs().map((agg: AggConfig) => agg.onSearchRequestStart(searchSource, options))
diff --git a/src/legacy/ui/public/agg_types/agg_type.ts b/src/legacy/ui/public/agg_types/agg_type.ts
index ff4c6875ec6c0..39be1983223bc 100644
--- a/src/legacy/ui/public/agg_types/agg_type.ts
+++ b/src/legacy/ui/public/agg_types/agg_type.ts
@@ -24,7 +24,7 @@ import { initParams } from './agg_params';
 
 import { AggConfig } from '../vis';
 import { AggConfigs } from './agg_configs';
-import { SearchSource } from '../courier';
+import { ISearchSource } from '../courier';
 import { Adapters } from '../inspector';
 import { BaseParamType } from './param_types/base';
 import { AggParamType } from '../agg_types/param_types/agg';
@@ -51,7 +51,7 @@ export interface AggTypeConfig<
     resp: any,
     aggConfigs: AggConfigs,
     aggConfig: TAggConfig,
-    searchSource: SearchSource,
+    searchSource: ISearchSource,
     inspectorAdapters: Adapters,
     abortSignal?: AbortSignal
   ) => Promise<any>;
@@ -180,7 +180,7 @@ export class AggType<
     resp: any,
     aggConfigs: AggConfigs,
     aggConfig: TAggConfig,
-    searchSource: SearchSource,
+    searchSource: ISearchSource,
     inspectorAdapters: Adapters,
     abortSignal?: AbortSignal
   ) => Promise<any>;
diff --git a/src/legacy/ui/public/agg_types/buckets/terms.ts b/src/legacy/ui/public/agg_types/buckets/terms.ts
index e38f7ca4cc038..c805e53eb2b91 100644
--- a/src/legacy/ui/public/agg_types/buckets/terms.ts
+++ b/src/legacy/ui/public/agg_types/buckets/terms.ts
@@ -17,10 +17,9 @@
  * under the License.
  */
 
-import chrome from 'ui/chrome';
 import { noop } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { SearchSource, getRequestInspectorStats, getResponseInspectorStats } from '../../courier';
+import { ISearchSource, getRequestInspectorStats, getResponseInspectorStats } from '../../courier';
 import { BucketAggType } from './_bucket_agg_type';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { IBucketAggConfig } from './_bucket_agg_type';
@@ -80,14 +79,8 @@ export const termsBucketAgg = new BucketAggType({
           if (val === '__missing__') {
             return bucket.params.missingBucketLabel;
           }
-          const parsedUrl = {
-            origin: window.location.origin,
-            pathname: window.location.pathname,
-            basePath: chrome.getBasePath(),
-          };
-          const converter = bucket.params.field.format.getConverterFor(type);
 
-          return converter(val, undefined, undefined, parsedUrl);
+          return bucket.params.field.format.convert(val, type);
         };
       },
     } as FieldFormat;
@@ -97,7 +90,7 @@ export const termsBucketAgg = new BucketAggType({
     resp: any,
     aggConfigs: AggConfigs,
     aggConfig: IBucketAggConfig,
-    searchSource: SearchSource,
+    searchSource: ISearchSource,
     inspectorAdapters: Adapters,
     abortSignal?: AbortSignal
   ) => {
diff --git a/src/legacy/ui/public/agg_types/filter/agg_type_filters.test.ts b/src/legacy/ui/public/agg_types/filter/agg_type_filters.test.ts
index f470ebbc90b48..517cee23e6be1 100644
--- a/src/legacy/ui/public/agg_types/filter/agg_type_filters.test.ts
+++ b/src/legacy/ui/public/agg_types/filter/agg_type_filters.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../../plugins/data/public';
 import { AggTypeFilters } from './agg_type_filters';
 import { AggType } from '..';
 import { AggConfig } from '../../vis';
diff --git a/src/legacy/ui/public/agg_types/filter/agg_type_filters.ts b/src/legacy/ui/public/agg_types/filter/agg_type_filters.ts
index 4d99575e4ae38..2388d458d4abb 100644
--- a/src/legacy/ui/public/agg_types/filter/agg_type_filters.ts
+++ b/src/legacy/ui/public/agg_types/filter/agg_type_filters.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IndexPattern } from '../../index_patterns';
+import { IndexPattern } from '../../../../../plugins/data/public';
 import { AggConfig } from '../../vis';
 import { AggType } from '..';
 
diff --git a/src/legacy/ui/public/agg_types/param_types/base.ts b/src/legacy/ui/public/agg_types/param_types/base.ts
index bc8fd30e6324e..f466a9512edf9 100644
--- a/src/legacy/ui/public/agg_types/param_types/base.ts
+++ b/src/legacy/ui/public/agg_types/param_types/base.ts
@@ -19,7 +19,7 @@
 
 import { AggConfigs } from '../agg_configs';
 import { AggConfig } from '../../vis';
-import { SearchSourceContract, FetchOptions } from '../../courier/types';
+import { ISearchSource, FetchOptions } from '../../courier/types';
 
 export class BaseParamType<TAggConfig extends AggConfig = AggConfig> {
   name: string;
@@ -54,7 +54,7 @@ export class BaseParamType<TAggConfig extends AggConfig = AggConfig> {
    */
   modifyAggConfigOnSearchRequestStart: (
     aggConfig: TAggConfig,
-    searchSource?: SearchSourceContract,
+    searchSource?: ISearchSource,
     options?: FetchOptions
   ) => void;
 
diff --git a/src/legacy/ui/public/agg_types/param_types/field.ts b/src/legacy/ui/public/agg_types/param_types/field.ts
index 4fda86bd1379f..0ca60267becec 100644
--- a/src/legacy/ui/public/agg_types/param_types/field.ts
+++ b/src/legacy/ui/public/agg_types/param_types/field.ts
@@ -25,7 +25,7 @@ import { FieldParamEditor } from '../../vis/editors/default/controls/field';
 import { BaseParamType } from './base';
 import { toastNotifications } from '../../notify';
 import { propFilter } from '../filter';
-import { Field, IFieldList } from '../../index_patterns';
+import { Field, IFieldList } from '../../../../../plugins/data/public';
 
 const filterByType = propFilter('type');
 
diff --git a/src/legacy/ui/public/agg_types/param_types/filter/field_filters.test.ts b/src/legacy/ui/public/agg_types/param_types/filter/field_filters.test.ts
index e8d53754f6682..978b7edaa83ff 100644
--- a/src/legacy/ui/public/agg_types/param_types/filter/field_filters.test.ts
+++ b/src/legacy/ui/public/agg_types/param_types/filter/field_filters.test.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { Field } from 'ui/index_patterns';
 import { IndexedArray } from 'ui/indexed_array';
 import { AggTypeFieldFilters } from './field_filters';
 import { AggConfig } from 'ui/vis';
+import { Field } from '../../../../../../plugins/data/public';
 
 describe('AggTypeFieldFilters', () => {
   let registry: AggTypeFieldFilters;
diff --git a/src/legacy/ui/public/agg_types/param_types/filter/field_filters.ts b/src/legacy/ui/public/agg_types/param_types/filter/field_filters.ts
index b3dbcf05681db..e5cb5226435ff 100644
--- a/src/legacy/ui/public/agg_types/param_types/filter/field_filters.ts
+++ b/src/legacy/ui/public/agg_types/param_types/filter/field_filters.ts
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { Field } from 'ui/index_patterns';
 import { AggConfig } from '../../../vis';
+import { Field } from '../../../../../../plugins/data/public';
 
 type AggTypeFieldFilter = (field: Field, aggConfig: AggConfig) => boolean;
 
diff --git a/src/legacy/ui/public/chrome/api/loading_count.js b/src/legacy/ui/public/chrome/api/loading_count.js
index cafabbc5f7529..71d1e354773d5 100644
--- a/src/legacy/ui/public/chrome/api/loading_count.js
+++ b/src/legacy/ui/public/chrome/api/loading_count.js
@@ -24,7 +24,7 @@ const newPlatformHttp = npSetup.core.http;
 
 export function initLoadingCountApi(chrome) {
   const manualCount$ = new Rx.BehaviorSubject(0);
-  newPlatformHttp.addLoadingCount(manualCount$);
+  newPlatformHttp.addLoadingCountSource(manualCount$);
 
   chrome.loadingCount = new (class ChromeLoadingCountApi {
     /**
diff --git a/src/legacy/ui/public/courier/_index.scss b/src/legacy/ui/public/courier/_index.scss
index a5b3911b1d53c..17382cfa30ce5 100644
--- a/src/legacy/ui/public/courier/_index.scss
+++ b/src/legacy/ui/public/courier/_index.scss
@@ -1 +1 @@
-@import './fetch/components/shard_failure_modal';
\ No newline at end of file
+@import '../../../core_plugins/data/public/search/fetch/components/shard_failure_modal';
\ No newline at end of file
diff --git a/src/legacy/ui/public/courier/fetch/handle_response.test.ts b/src/legacy/ui/public/courier/fetch/handle_response.test.ts
deleted file mode 100644
index 0163aca777161..0000000000000
--- a/src/legacy/ui/public/courier/fetch/handle_response.test.ts
+++ /dev/null
@@ -1,78 +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 { handleResponse } from './handle_response';
-import { toastNotifications } from '../../notify/toasts';
-
-jest.mock('../../notify/toasts', () => {
-  return {
-    toastNotifications: {
-      addWarning: jest.fn(),
-    },
-  };
-});
-
-jest.mock('@kbn/i18n', () => {
-  return {
-    i18n: {
-      translate: (id: string, { defaultMessage }: { defaultMessage: string }) => defaultMessage,
-    },
-  };
-});
-
-describe('handleResponse', () => {
-  beforeEach(() => {
-    (toastNotifications.addWarning as jest.Mock).mockReset();
-  });
-
-  test('should notify if timed out', () => {
-    const request = { body: {} };
-    const response = {
-      timed_out: true,
-    };
-    const result = handleResponse(request, response);
-    expect(result).toBe(response);
-    expect(toastNotifications.addWarning).toBeCalled();
-    expect((toastNotifications.addWarning as jest.Mock).mock.calls[0][0].title).toMatch(
-      'request timed out'
-    );
-  });
-
-  test('should notify if shards failed', () => {
-    const request = { body: {} };
-    const response = {
-      _shards: {
-        failed: true,
-      },
-    };
-    const result = handleResponse(request, response);
-    expect(result).toBe(response);
-    expect(toastNotifications.addWarning).toBeCalled();
-    expect((toastNotifications.addWarning as jest.Mock).mock.calls[0][0].title).toMatch(
-      'shards failed'
-    );
-  });
-
-  test('returns the response', () => {
-    const request = {};
-    const response = {};
-    const result = handleResponse(request, response);
-    expect(result).toBe(response);
-  });
-});
diff --git a/src/legacy/ui/public/courier/fetch/types.ts b/src/legacy/ui/public/courier/fetch/types.ts
deleted file mode 100644
index 03bf51ae15d45..0000000000000
--- a/src/legacy/ui/public/courier/fetch/types.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 { IUiSettingsClient } from '../../../../../core/public';
-import { SearchRequest, SearchResponse } from '../types';
-
-export interface ApiCaller {
-  search: (searchRequest: SearchRequest) => ApiCallerResponse;
-  msearch: (searchRequest: SearchRequest) => ApiCallerResponse;
-}
-
-export interface ApiCallerResponse extends Promise<SearchResponse> {
-  abort: () => void;
-}
-
-export interface FetchOptions {
-  abortSignal?: AbortSignal;
-  searchStrategyId?: string;
-}
-
-export interface FetchHandlers {
-  es: ApiCaller;
-  config: IUiSettingsClient;
-  esShardTimeout: number;
-}
diff --git a/src/legacy/ui/public/courier/index.ts b/src/legacy/ui/public/courier/index.ts
index c8a06ec2a5518..709ff1c11e901 100644
--- a/src/legacy/ui/public/courier/index.ts
+++ b/src/legacy/ui/public/courier/index.ts
@@ -17,31 +17,46 @@
  * under the License.
  */
 
-export { SearchSource } from './search_source';
+/**
+ * Nothing to see here!
+ *
+ * Courier / SearchSource has moved to the data plugin, and is being
+ * re-exported from ui/courier for backwards compatibility.
+ */
+
+import { start as dataStart } from '../../../core_plugins/data/public/legacy';
+
+// runtime contracts
+export const { defaultSearchStrategy, SearchSource } = dataStart.search;
+
+// types
+export {
+  ISearchSource,
+  EsQuerySortValue, // used externally by Discover
+  FetchOptions, // used externally by AggTypes
+  SortDirection, // used externally by Discover
+} from '../../../core_plugins/data/public';
+
+// static code
+export {
+  getRequestInspectorStats,
+  getResponseInspectorStats,
+} from '../../../core_plugins/data/public';
 
 // TODO: Exporting this mock outside of jest tests causes errors because
 // jest is undefined. Need to refactor the mock to be consistent with
 // other NP-style mocks.
 // export { searchSourceMock } from './search_source/mocks';
 
+// Most these can probably be made internal to the search
+// service, so we are temporarily deeply importing them
+// until we relocate them to a longer-term home.
+/* eslint-disable @kbn/eslint/no-restricted-paths */
 export {
   addSearchStrategy, // used externally by Rollups
   getSearchErrorType, // used externally by Rollups
   hasSearchStategyForIndexPattern, // used externally by Discover
   isDefaultTypeIndexPattern, // used externally by Discover
   SearchError, // used externally by Visualizations & Rollups
-} from './search_strategy';
-
-export {
-  getRequestInspectorStats,
-  getResponseInspectorStats,
-} from './utils/courier_inspector_utils';
-
-// types
-export { SearchSourceContract } from './search_source';
-
-export {
-  EsQuerySortValue, // used externally by Discover
-  FetchOptions, // used externally by AggTypes
-  SortDirection, // used externally by Discover
-} from './types';
+} from '../../../core_plugins/data/public/search/search_strategy';
+/* eslint-enable @kbn/eslint/no-restricted-paths */
diff --git a/src/legacy/ui/public/courier/search_source/index.ts b/src/legacy/ui/public/courier/search_source/index.ts
index 72170adc2b129..e7ca48a894b3d 100644
--- a/src/legacy/ui/public/courier/search_source/index.ts
+++ b/src/legacy/ui/public/courier/search_source/index.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export * from './search_source';
+export { SearchSource, ISearchSource } from '../index';
diff --git a/src/legacy/ui/public/courier/search_source/mocks.ts b/src/legacy/ui/public/courier/search_source/mocks.ts
index 2b83f379b4f09..7b7843d22f519 100644
--- a/src/legacy/ui/public/courier/search_source/mocks.ts
+++ b/src/legacy/ui/public/courier/search_source/mocks.ts
@@ -36,9 +36,11 @@
  * under the License.
  */
 
-import { SearchSourceContract } from './search_source';
+// This mock is here for BWC, but will be left behind and replaced by
+// the data service mock in the new platform.
+import { ISearchSource } from '../index';
 
-export const searchSourceMock: MockedKeys<SearchSourceContract> = {
+export const searchSourceMock: MockedKeys<ISearchSource> = {
   setPreferredSearchStrategyId: jest.fn(),
   setFields: jest.fn().mockReturnThis(),
   setField: jest.fn().mockReturnThis(),
diff --git a/src/legacy/ui/public/courier/search_source/search_source.ts b/src/legacy/ui/public/courier/search_source/search_source.ts
index e862bb1118a74..e7ca48a894b3d 100644
--- a/src/legacy/ui/public/courier/search_source/search_source.ts
+++ b/src/legacy/ui/public/courier/search_source/search_source.ts
@@ -17,394 +17,4 @@
  * under the License.
  */
 
-/**
- * @name SearchSource
- *
- * @description A promise-based stream of search results that can inherit from other search sources.
- *
- * Because filters/queries in Kibana have different levels of persistence and come from different
- * places, it is important to keep track of where filters come from for when they are saved back to
- * the savedObject store in the Kibana index. To do this, we create trees of searchSource objects
- * that can have associated query parameters (index, query, filter, etc) which can also inherit from
- * other searchSource objects.
- *
- * At query time, all of the searchSource objects that have subscribers are "flattened", at which
- * point the query params from the searchSource are collected while traversing up the inheritance
- * chain. At each link in the chain a decision about how to merge the query params is made until a
- * single set of query parameters is created for each active searchSource (a searchSource with
- * subscribers).
- *
- * That set of query parameters is then sent to elasticsearch. This is how the filter hierarchy
- * works in Kibana.
- *
- * Visualize, starting from a new search:
- *
- *  - the `savedVis.searchSource` is set as the `appSearchSource`.
- *  - The `savedVis.searchSource` would normally inherit from the `appSearchSource`, but now it is
- *    upgraded to inherit from the `rootSearchSource`.
- *  - Any interaction with the visualization will still apply filters to the `appSearchSource`, so
- *    they will be stored directly on the `savedVis.searchSource`.
- *  - Any interaction with the time filter will be written to the `rootSearchSource`, so those
- *    filters will not be saved by the `savedVis`.
- *  - When the `savedVis` is saved to elasticsearch, it takes with it all the filters that are
- *    defined on it directly, but none of the ones that it inherits from other places.
- *
- * Visualize, starting from an existing search:
- *
- *  - The `savedVis` loads the `savedSearch` on which it is built.
- *  - The `savedVis.searchSource` is set to inherit from the `saveSearch.searchSource` and set as
- *    the `appSearchSource`.
- *  - The `savedSearch.searchSource`, is set to inherit from the `rootSearchSource`.
- *  - Then the `savedVis` is written to elasticsearch it will be flattened and only include the
- *    filters created in the visualize application and will reconnect the filters from the
- *    `savedSearch` at runtime to prevent losing the relationship
- *
- * Dashboard search sources:
- *
- *  - Each panel in a dashboard has a search source.
- *  - The `savedDashboard` also has a searchsource, and it is set as the `appSearchSource`.
- *  - Each panel's search source inherits from the `appSearchSource`, meaning that they inherit from
- *    the dashboard search source.
- *  - When a filter is added to the search box, or via a visualization, it is written to the
- *    `appSearchSource`.
- */
-
-import _ from 'lodash';
-import { npSetup } from 'ui/new_platform';
-import { normalizeSortRequest } from './normalize_sort_request';
-import { fetchSoon } from '../fetch';
-import { fieldWildcardFilter } from '../../field_wildcard';
-import { getHighlightRequest, esFilters, esQuery } from '../../../../../plugins/data/public';
-import chrome from '../../chrome';
-import { RequestFailure } from '../fetch/errors';
-import { filterDocvalueFields } from './filter_docvalue_fields';
-import { SearchSourceOptions, SearchSourceFields, SearchRequest } from './types';
-import { FetchOptions, ApiCaller } from '../fetch/types';
-
-const esShardTimeout = npSetup.core.injectedMetadata.getInjectedVar('esShardTimeout') as number;
-const config = npSetup.core.uiSettings;
-
-export type SearchSourceContract = Pick<SearchSource, keyof SearchSource>;
-
-export class SearchSource {
-  private id: string = _.uniqueId('data_source');
-  private searchStrategyId?: string;
-  private parent?: SearchSource;
-  private requestStartHandlers: Array<
-    (searchSource: SearchSourceContract, options?: FetchOptions) => Promise<unknown>
-  > = [];
-  private inheritOptions: SearchSourceOptions = {};
-  public history: SearchRequest[] = [];
-
-  constructor(private fields: SearchSourceFields = {}) {}
-
-  /** ***
-   * PUBLIC API
-   *****/
-
-  setPreferredSearchStrategyId(searchStrategyId: string) {
-    this.searchStrategyId = searchStrategyId;
-  }
-
-  setFields(newFields: SearchSourceFields) {
-    this.fields = newFields;
-    return this;
-  }
-
-  setField<K extends keyof SearchSourceFields>(field: K, value: SearchSourceFields[K]) {
-    if (value == null) {
-      delete this.fields[field];
-    } else {
-      this.fields[field] = value;
-    }
-    return this;
-  }
-
-  getId() {
-    return this.id;
-  }
-
-  getFields() {
-    return { ...this.fields };
-  }
-
-  /**
-   * Get fields from the fields
-   */
-  getField<K extends keyof SearchSourceFields>(field: K, recurse = true): SearchSourceFields[K] {
-    if (!recurse || this.fields[field] !== void 0) {
-      return this.fields[field];
-    }
-    const parent = this.getParent();
-    return parent && parent.getField(field);
-  }
-
-  /**
-   * Get the field from our own fields, don't traverse up the chain
-   */
-  getOwnField<K extends keyof SearchSourceFields>(field: K): SearchSourceFields[K] {
-    return this.getField(field, false);
-  }
-
-  create() {
-    return new SearchSource();
-  }
-
-  createCopy() {
-    const newSearchSource = new SearchSource();
-    newSearchSource.setFields({ ...this.fields });
-    // when serializing the internal fields we lose the internal classes used in the index
-    // pattern, so we have to set it again to workaround this behavior
-    newSearchSource.setField('index', this.getField('index'));
-    newSearchSource.setParent(this.getParent());
-    return newSearchSource;
-  }
-
-  createChild(options = {}) {
-    const childSearchSource = new SearchSource();
-    childSearchSource.setParent(this, options);
-    return childSearchSource;
-  }
-
-  /**
-   * Set a searchSource that this source should inherit from
-   * @param  {SearchSource} parent - the parent searchSource
-   * @param  {SearchSourceOptions} options - the inherit options
-   * @return {this} - chainable
-   */
-  setParent(parent?: SearchSourceContract, options: SearchSourceOptions = {}) {
-    this.parent = parent as SearchSource;
-    this.inheritOptions = options;
-    return this;
-  }
-
-  /**
-   * Get the parent of this SearchSource
-   * @return {undefined|searchSource}
-   */
-  getParent() {
-    return this.parent;
-  }
-
-  /**
-   * Fetch this source and reject the returned Promise on error
-   *
-   * @async
-   */
-  async fetch(options: FetchOptions = {}) {
-    const $injector = await chrome.dangerouslyGetActiveInjector();
-    const es = $injector.get('es') as ApiCaller;
-
-    await this.requestIsStarting(options);
-
-    const searchRequest = await this.flatten();
-    this.history = [searchRequest];
-
-    const response = await fetchSoon(
-      searchRequest,
-      {
-        ...(this.searchStrategyId && { searchStrategyId: this.searchStrategyId }),
-        ...options,
-      },
-      { es, config, esShardTimeout }
-    );
-
-    if (response.error) {
-      throw new RequestFailure(null, response);
-    }
-
-    return response;
-  }
-
-  /**
-   *  Add a handler that will be notified whenever requests start
-   *  @param  {Function} handler
-   *  @return {undefined}
-   */
-  onRequestStart(
-    handler: (searchSource: SearchSourceContract, options?: FetchOptions) => Promise<unknown>
-  ) {
-    this.requestStartHandlers.push(handler);
-  }
-
-  async getSearchRequestBody() {
-    const searchRequest = await this.flatten();
-    return searchRequest.body;
-  }
-
-  /**
-   * Completely destroy the SearchSource.
-   * @return {undefined}
-   */
-  destroy() {
-    this.requestStartHandlers.length = 0;
-  }
-
-  /** ****
-   * PRIVATE APIS
-   ******/
-
-  /**
-   *  Called by requests of this search source when they are started
-   *  @param  {Courier.Request} request
-   *  @param options
-   *  @return {Promise<undefined>}
-   */
-  private requestIsStarting(options: FetchOptions = {}) {
-    const handlers = [...this.requestStartHandlers];
-    // If callParentStartHandlers has been set to true, we also call all
-    // handlers of parent search sources.
-    if (this.inheritOptions.callParentStartHandlers) {
-      let searchSource = this.getParent();
-      while (searchSource) {
-        handlers.push(...searchSource.requestStartHandlers);
-        searchSource = searchSource.getParent();
-      }
-    }
-
-    return Promise.all(handlers.map(fn => fn(this, options)));
-  }
-
-  /**
-   * Used to merge properties into the data within ._flatten().
-   * The data is passed in and modified by the function
-   *
-   * @param  {object} data - the current merged data
-   * @param  {*} val - the value at `key`
-   * @param  {*} key - The key of `val`
-   * @return {undefined}
-   */
-  private mergeProp<K extends keyof SearchSourceFields>(
-    data: SearchRequest,
-    val: SearchSourceFields[K],
-    key: K
-  ) {
-    val = typeof val === 'function' ? val(this) : val;
-    if (val == null || !key) return;
-
-    const addToRoot = (rootKey: string, value: any) => {
-      data[rootKey] = value;
-    };
-
-    /**
-     * Add the key and val to the body of the request
-     */
-    const addToBody = (bodyKey: string, value: any) => {
-      // ignore if we already have a value
-      if (data.body[bodyKey] == null) {
-        data.body[bodyKey] = value;
-      }
-    };
-
-    switch (key) {
-      case 'filter':
-        return addToRoot('filters', (data.filters || []).concat(val));
-      case 'query':
-        return addToRoot(key, (data[key] || []).concat(val));
-      case 'fields':
-        const fields = _.uniq((data[key] || []).concat(val));
-        return addToRoot(key, fields);
-      case 'index':
-      case 'type':
-      case 'highlightAll':
-        return key && data[key] == null && addToRoot(key, val);
-      case 'searchAfter':
-        return addToBody('search_after', val);
-      case 'source':
-        return addToBody('_source', val);
-      case 'sort':
-        const sort = normalizeSortRequest(val, this.getField('index'), config.get('sort:options'));
-        return addToBody(key, sort);
-      default:
-        return addToBody(key, val);
-    }
-  }
-
-  /**
-   * Walk the inheritance chain of a source and return its
-   * flat representation (taking into account merging rules)
-   * @returns {Promise}
-   * @resolved {Object|null} - the flat data of the SearchSource
-   */
-  private mergeProps(root = this, searchRequest: SearchRequest = { body: {} }) {
-    Object.entries(this.fields).forEach(([key, value]) => {
-      this.mergeProp(searchRequest, value, key as keyof SearchSourceFields);
-    });
-    if (this.parent) {
-      this.parent.mergeProps(root, searchRequest);
-    }
-    return searchRequest;
-  }
-
-  private flatten() {
-    const searchRequest = this.mergeProps();
-
-    searchRequest.body = searchRequest.body || {};
-    const { body, index, fields, query, filters, highlightAll } = searchRequest;
-
-    const computedFields = index ? index.getComputedFields() : {};
-
-    body.stored_fields = computedFields.storedFields;
-    body.script_fields = body.script_fields || {};
-    _.extend(body.script_fields, computedFields.scriptFields);
-
-    const defaultDocValueFields = computedFields.docvalueFields
-      ? computedFields.docvalueFields
-      : [];
-    body.docvalue_fields = body.docvalue_fields || defaultDocValueFields;
-
-    if (!body.hasOwnProperty('_source') && index) {
-      body._source = index.getSourceFiltering();
-    }
-
-    if (body._source) {
-      // exclude source fields for this index pattern specified by the user
-      const filter = fieldWildcardFilter(body._source.excludes, config.get('metaFields'));
-      body.docvalue_fields = body.docvalue_fields.filter((docvalueField: any) =>
-        filter(docvalueField.field)
-      );
-    }
-
-    // if we only want to search for certain fields
-    if (fields) {
-      // filter out the docvalue_fields, and script_fields to only include those that we are concerned with
-      body.docvalue_fields = filterDocvalueFields(body.docvalue_fields, fields);
-      body.script_fields = _.pick(body.script_fields, fields);
-
-      // request the remaining fields from both stored_fields and _source
-      const remainingFields = _.difference(fields, _.keys(body.script_fields));
-      body.stored_fields = remainingFields;
-      _.set(body, '_source.includes', remainingFields);
-    }
-
-    const esQueryConfigs = esQuery.getEsQueryConfig(config);
-    body.query = esQuery.buildEsQuery(index, query, filters, esQueryConfigs);
-
-    if (highlightAll && body.query) {
-      body.highlight = getHighlightRequest(body.query, config.get('doc_table:highlight'));
-      delete searchRequest.highlightAll;
-    }
-
-    const translateToQuery = (filter: esFilters.Filter) => filter && (filter.query || filter);
-
-    // re-write filters within filter aggregations
-    (function recurse(aggBranch) {
-      if (!aggBranch) return;
-      Object.keys(aggBranch).forEach(function(id) {
-        const agg = aggBranch[id];
-
-        if (agg.filters) {
-          // translate filters aggregations
-          const { filters: aggFilters } = agg.filters;
-          Object.keys(aggFilters).forEach(filterId => {
-            aggFilters[filterId] = translateToQuery(aggFilters[filterId]);
-          });
-        }
-
-        recurse(agg.aggs || agg.aggregations);
-      });
-    })(body.aggs || body.aggregations);
-
-    return searchRequest;
-  }
-}
+export { SearchSource, ISearchSource } from '../index';
diff --git a/src/legacy/ui/public/courier/search_source/types.ts b/src/legacy/ui/public/courier/search_source/types.ts
deleted file mode 100644
index 293f3d49596c3..0000000000000
--- a/src/legacy/ui/public/courier/search_source/types.ts
+++ /dev/null
@@ -1,106 +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 { NameList } from 'elasticsearch';
-import { esFilters, Query } from '../../../../../plugins/data/public';
-import { IndexPattern } from '../../../../core_plugins/data/public/index_patterns';
-
-export type EsQuerySearchAfter = [string | number, string | number];
-
-export enum SortDirection {
-  asc = 'asc',
-  desc = 'desc',
-}
-
-export type EsQuerySortValue = Record<string, SortDirection>;
-
-export interface SearchSourceFields {
-  type?: string;
-  query?: Query;
-  filter?:
-    | esFilters.Filter[]
-    | esFilters.Filter
-    | (() => esFilters.Filter[] | esFilters.Filter | undefined);
-  sort?: EsQuerySortValue | EsQuerySortValue[];
-  highlight?: any;
-  highlightAll?: boolean;
-  aggs?: any;
-  from?: number;
-  size?: number;
-  source?: NameList;
-  version?: boolean;
-  fields?: NameList;
-  index?: IndexPattern;
-  searchAfter?: EsQuerySearchAfter;
-}
-
-export interface SearchSourceOptions {
-  callParentStartHandlers?: boolean;
-}
-
-export { SearchSourceContract } from './search_source';
-
-export interface SortOptions {
-  mode?: 'min' | 'max' | 'sum' | 'avg' | 'median';
-  type?: 'double' | 'long' | 'date' | 'date_nanos';
-  nested?: object;
-  unmapped_type?: string;
-  distance_type?: 'arc' | 'plane';
-  unit?: string;
-  ignore_unmapped?: boolean;
-  _script?: object;
-}
-
-export interface Request {
-  docvalue_fields: string[];
-  _source: unknown;
-  query: unknown;
-  script_fields: unknown;
-  sort: unknown;
-  stored_fields: string[];
-}
-
-export interface ResponseWithShardFailure {
-  _shards: {
-    failed: number;
-    failures: ShardFailure[];
-    skipped: number;
-    successful: number;
-    total: number;
-  };
-}
-
-export interface ShardFailure {
-  index: string;
-  node: string;
-  reason: {
-    caused_by: {
-      reason: string;
-      type: string;
-    };
-    reason: string;
-    lang?: string;
-    script?: string;
-    script_stack?: string[];
-    type: string;
-  };
-  shard: number;
-}
-
-export type SearchRequest = any;
-export type SearchResponse = any;
diff --git a/src/legacy/ui/public/courier/search_strategy/default_search_strategy.ts b/src/legacy/ui/public/courier/search_strategy/default_search_strategy.ts
index 5be4fef076655..55dee19cae32a 100644
--- a/src/legacy/ui/public/courier/search_strategy/default_search_strategy.ts
+++ b/src/legacy/ui/public/courier/search_strategy/default_search_strategy.ts
@@ -17,65 +17,8 @@
  * under the License.
  */
 
-import { SearchStrategyProvider, SearchStrategySearchParams } from './types';
-import { addSearchStrategy } from './search_strategy_registry';
-import { isDefaultTypeIndexPattern } from './is_default_type_index_pattern';
-import {
-  getSearchParams,
-  getMSearchParams,
-  getPreference,
-  getTimeout,
-} from '../fetch/get_search_params';
-
-export const defaultSearchStrategy: SearchStrategyProvider = {
-  id: 'default',
-
-  search: params => {
-    return params.config.get('courier:batchSearches') ? msearch(params) : search(params);
-  },
-
-  isViable: indexPattern => {
-    return indexPattern && isDefaultTypeIndexPattern(indexPattern);
-  },
-};
-
-function msearch({ searchRequests, es, config, esShardTimeout }: SearchStrategySearchParams) {
-  const inlineRequests = searchRequests.map(({ index, body, search_type: searchType }) => {
-    const inlineHeader = {
-      index: index.title || index,
-      search_type: searchType,
-      ignore_unavailable: true,
-      preference: getPreference(config),
-    };
-    const inlineBody = {
-      ...body,
-      timeout: getTimeout(esShardTimeout),
-    };
-    return `${JSON.stringify(inlineHeader)}\n${JSON.stringify(inlineBody)}`;
-  });
-
-  const searching = es.msearch({
-    ...getMSearchParams(config),
-    body: `${inlineRequests.join('\n')}\n`,
-  });
-  return {
-    searching: searching.then(({ responses }) => responses),
-    abort: searching.abort,
-  };
-}
-
-function search({ searchRequests, es, config, esShardTimeout }: SearchStrategySearchParams) {
-  const abortController = new AbortController();
-  const searchParams = getSearchParams(config, esShardTimeout);
-  const promises = searchRequests.map(({ index, body }) => {
-    const searching = es.search({ index: index.title || index, body, ...searchParams });
-    abortController.signal.addEventListener('abort', searching.abort);
-    return searching.catch(({ response }) => JSON.parse(response));
-  });
-  return {
-    searching: Promise.all(promises),
-    abort: () => abortController.abort(),
-  };
-}
+import { addSearchStrategy, defaultSearchStrategy } from '../index';
 
 addSearchStrategy(defaultSearchStrategy);
+
+export { defaultSearchStrategy };
diff --git a/src/legacy/ui/public/courier/search_strategy/index.ts b/src/legacy/ui/public/courier/search_strategy/index.ts
index 229d0cbb1da5d..1dce0316596d0 100644
--- a/src/legacy/ui/public/courier/search_strategy/index.ts
+++ b/src/legacy/ui/public/courier/search_strategy/index.ts
@@ -20,10 +20,6 @@
 export {
   addSearchStrategy,
   hasSearchStategyForIndexPattern,
-  getSearchStrategyById,
-  getSearchStrategyForSearchRequest,
-} from './search_strategy_registry';
-
-export { isDefaultTypeIndexPattern } from './is_default_type_index_pattern';
-
-export { SearchError, getSearchErrorType } from './search_error';
+  isDefaultTypeIndexPattern,
+  SearchError,
+} from '../index';
diff --git a/src/legacy/ui/public/courier/search_strategy/search_error.ts b/src/legacy/ui/public/courier/search_strategy/search_error.ts
index d4042fb17499c..a815ac4ff008f 100644
--- a/src/legacy/ui/public/courier/search_strategy/search_error.ts
+++ b/src/legacy/ui/public/courier/search_strategy/search_error.ts
@@ -17,46 +17,4 @@
  * under the License.
  */
 
-interface SearchErrorOptions {
-  status: string;
-  title: string;
-  message: string;
-  path: string;
-  type: string;
-}
-
-export class SearchError extends Error {
-  public name: string;
-  public status: string;
-  public title: string;
-  public message: string;
-  public path: string;
-  public type: string;
-
-  constructor({ status, title, message, path, type }: SearchErrorOptions) {
-    super(message);
-    this.name = 'SearchError';
-    this.status = status;
-    this.title = title;
-    this.message = message;
-    this.path = path;
-    this.type = type;
-
-    // captureStackTrace is only available in the V8 engine, so any browser using
-    // a different JS engine won't have access to this method.
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, SearchError);
-    }
-
-    // Babel doesn't support traditional `extends` syntax for built-in classes.
-    // https://babeljs.io/docs/en/caveats/#classes
-    Object.setPrototypeOf(this, SearchError.prototype);
-  }
-}
-
-export function getSearchErrorType({ message }: Pick<SearchError, 'message'>) {
-  const msg = message.toLowerCase();
-  if (msg.indexOf('unsupported query') > -1) {
-    return 'UNSUPPORTED_QUERY';
-  }
-}
+export { SearchError } from '../index';
diff --git a/src/legacy/ui/public/courier/search_strategy/types.ts b/src/legacy/ui/public/courier/search_strategy/types.ts
deleted file mode 100644
index 1542f9824a5b1..0000000000000
--- a/src/legacy/ui/public/courier/search_strategy/types.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 { IndexPattern } from '../../../../core_plugins/data/public';
-import { FetchHandlers } from '../fetch/types';
-import { SearchRequest, SearchResponse } from '../types';
-
-export interface SearchStrategyProvider {
-  id: string;
-  search: (params: SearchStrategySearchParams) => SearchStrategyResponse;
-  isViable: (indexPattern: IndexPattern) => boolean;
-}
-
-export interface SearchStrategyResponse {
-  searching: Promise<SearchResponse[]>;
-  abort: () => void;
-}
-
-export interface SearchStrategySearchParams extends FetchHandlers {
-  searchRequests: SearchRequest[];
-}
diff --git a/src/legacy/ui/public/courier/types.ts b/src/legacy/ui/public/courier/types.ts
index 23d74ce6a57da..75035ceef321f 100644
--- a/src/legacy/ui/public/courier/types.ts
+++ b/src/legacy/ui/public/courier/types.ts
@@ -17,7 +17,9 @@
  * under the License.
  */
 
-export * from './fetch/types';
-export * from './search_source/types';
-export * from './search_strategy/types';
-export * from './utils/types';
+export {
+  ISearchSource,
+  EsQuerySortValue, // used externally by Discover
+  FetchOptions, // used externally by AggTypes
+  SortDirection, // used externally by Discover
+} from './index';
diff --git a/src/legacy/ui/public/courier/utils/courier_inspector_utils.ts b/src/legacy/ui/public/courier/utils/courier_inspector_utils.ts
deleted file mode 100644
index b4d5d5537333e..0000000000000
--- a/src/legacy/ui/public/courier/utils/courier_inspector_utils.ts
+++ /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.
- */
-
-/**
- * This function collects statistics from a SearchSource and a response
- * for the usage in the inspector stats panel. Pass in a searchSource and a response
- * and the returned object can be passed to the `stats` method of the request
- * logger.
- */
-
-import { i18n } from '@kbn/i18n';
-import { SearchResponse } from 'elasticsearch';
-import { SearchSourceContract, RequestInspectorStats } from '../types';
-
-export function getRequestInspectorStats(searchSource: SearchSourceContract) {
-  const stats: RequestInspectorStats = {};
-  const index = searchSource.getField('index');
-
-  if (index) {
-    stats.indexPattern = {
-      label: i18n.translate('common.ui.courier.indexPatternLabel', {
-        defaultMessage: 'Index pattern',
-      }),
-      value: index.title,
-      description: i18n.translate('common.ui.courier.indexPatternDescription', {
-        defaultMessage: 'The index pattern that connected to the Elasticsearch indices.',
-      }),
-    };
-    stats.indexPatternId = {
-      label: i18n.translate('common.ui.courier.indexPatternIdLabel', {
-        defaultMessage: 'Index pattern ID',
-      }),
-      value: index.id!,
-      description: i18n.translate('common.ui.courier.indexPatternIdDescription', {
-        defaultMessage: 'The ID in the {kibanaIndexPattern} index.',
-        values: { kibanaIndexPattern: '.kibana' },
-      }),
-    };
-  }
-
-  return stats;
-}
-
-export function getResponseInspectorStats(
-  searchSource: SearchSourceContract,
-  resp: SearchResponse<unknown>
-) {
-  const lastRequest = searchSource.history && searchSource.history[searchSource.history.length - 1];
-  const stats: RequestInspectorStats = {};
-
-  if (resp && resp.took) {
-    stats.queryTime = {
-      label: i18n.translate('common.ui.courier.queryTimeLabel', {
-        defaultMessage: 'Query time',
-      }),
-      value: i18n.translate('common.ui.courier.queryTimeValue', {
-        defaultMessage: '{queryTime}ms',
-        values: { queryTime: resp.took },
-      }),
-      description: i18n.translate('common.ui.courier.queryTimeDescription', {
-        defaultMessage:
-          'The time it took to process the query. ' +
-          'Does not include the time to send the request or parse it in the browser.',
-      }),
-    };
-  }
-
-  if (resp && resp.hits) {
-    stats.hitsTotal = {
-      label: i18n.translate('common.ui.courier.hitsTotalLabel', {
-        defaultMessage: 'Hits (total)',
-      }),
-      value: `${resp.hits.total}`,
-      description: i18n.translate('common.ui.courier.hitsTotalDescription', {
-        defaultMessage: 'The number of documents that match the query.',
-      }),
-    };
-
-    stats.hits = {
-      label: i18n.translate('common.ui.courier.hitsLabel', {
-        defaultMessage: 'Hits',
-      }),
-      value: `${resp.hits.hits.length}`,
-      description: i18n.translate('common.ui.courier.hitsDescription', {
-        defaultMessage: 'The number of documents returned by the query.',
-      }),
-    };
-  }
-
-  if (lastRequest && (lastRequest.ms === 0 || lastRequest.ms)) {
-    stats.requestTime = {
-      label: i18n.translate('common.ui.courier.requestTimeLabel', {
-        defaultMessage: 'Request time',
-      }),
-      value: i18n.translate('common.ui.courier.requestTimeValue', {
-        defaultMessage: '{requestTime}ms',
-        values: { requestTime: lastRequest.ms },
-      }),
-      description: i18n.translate('common.ui.courier.requestTimeDescription', {
-        defaultMessage:
-          'The time of the request from the browser to Elasticsearch and back. ' +
-          'Does not include the time the requested waited in the queue.',
-      }),
-    };
-  }
-
-  return stats;
-}
diff --git a/src/legacy/ui/public/directives/field_name/__snapshots__/field_name.test.tsx.snap b/src/legacy/ui/public/directives/field_name/__snapshots__/field_name.test.tsx.snap
index ff4258746db7a..bdb003771619c 100644
--- a/src/legacy/ui/public/directives/field_name/__snapshots__/field_name.test.tsx.snap
+++ b/src/legacy/ui/public/directives/field_name/__snapshots__/field_name.test.tsx.snap
@@ -6,10 +6,12 @@ exports[`FieldName renders a geo field, useShortDots is set to true 1`] = `
   title="Geo point field"
 >
   <svg
+    aria-hidden="true"
     aria-label="Geo point field"
     class="euiIcon euiIcon--small euiIcon-isLoading"
     focusable="false"
     height="16"
+    role="img"
     viewBox="0 0 16 16"
     width="16"
     xmlns="http://www.w3.org/2000/svg"
@@ -28,10 +30,12 @@ exports[`FieldName renders a number field by providing a field record, useShortD
   title="Number field"
 >
   <svg
+    aria-hidden="true"
     aria-label="Number field"
     class="euiIcon euiIcon--small euiIcon-isLoading"
     focusable="false"
     height="16"
+    role="img"
     viewBox="0 0 16 16"
     width="16"
     xmlns="http://www.w3.org/2000/svg"
@@ -50,10 +54,12 @@ exports[`FieldName renders a string field by providing fieldType and fieldName 1
   title="String field"
 >
   <svg
+    aria-hidden="true"
     aria-label="String field"
     class="euiIcon euiIcon--small euiIcon-isLoading"
     focusable="false"
     height="16"
+    role="img"
     viewBox="0 0 16 16"
     width="16"
     xmlns="http://www.w3.org/2000/svg"
diff --git a/src/legacy/ui/public/utils/key_map.ts b/src/legacy/ui/public/directives/key_map.ts
similarity index 100%
rename from src/legacy/ui/public/utils/key_map.ts
rename to src/legacy/ui/public/directives/key_map.ts
diff --git a/src/legacy/ui/public/directives/watch_multi/watch_multi.js b/src/legacy/ui/public/directives/watch_multi/watch_multi.js
index 2a2ffe24cba9c..54b5cf08a9397 100644
--- a/src/legacy/ui/public/directives/watch_multi/watch_multi.js
+++ b/src/legacy/ui/public/directives/watch_multi/watch_multi.js
@@ -19,7 +19,6 @@
 
 import _ from 'lodash';
 import { uiModules } from '../../modules';
-import { callEach } from '../../utils/function';
 
 export function watchMultiDecorator($provide) {
   $provide.decorator('$rootScope', function($delegate) {
@@ -112,7 +111,9 @@ export function watchMultiDecorator($provide) {
         )
       );
 
-      return _.partial(callEach, unwatchers);
+      return function() {
+        unwatchers.forEach(listener => listener());
+      };
     };
 
     function normalizeExpression($scope, expr) {
diff --git a/src/legacy/ui/public/exit_full_screen/__snapshots__/exit_full_screen_button.test.js.snap b/src/legacy/ui/public/exit_full_screen/__snapshots__/exit_full_screen_button.test.js.snap
index 6bd9652d2a1b0..317067f5c103c 100644
--- a/src/legacy/ui/public/exit_full_screen/__snapshots__/exit_full_screen_button.test.js.snap
+++ b/src/legacy/ui/public/exit_full_screen/__snapshots__/exit_full_screen_button.test.js.snap
@@ -23,9 +23,11 @@ exports[`is rendered 1`] = `
       >
         Exit full screen
         <svg
+          aria-hidden="true"
           class="euiIcon euiIcon--small euiIcon-isLoading"
           focusable="false"
           height="16"
+          role="img"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
diff --git a/src/legacy/ui/public/field_editor/_index.scss b/src/legacy/ui/public/field_editor/_index.scss
index 9c94861eb74aa..39f69c013d428 100644
--- a/src/legacy/ui/public/field_editor/_index.scss
+++ b/src/legacy/ui/public/field_editor/_index.scss
@@ -1 +1,2 @@
 @import './components/field_format_editor/samples/index';
+@import './components/scripting_help/test_script';
diff --git a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/duration/__snapshots__/duration.test.js.snap b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/duration/__snapshots__/duration.test.js.snap
index b4493a6b5557b..9722a01986434 100644
--- a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/duration/__snapshots__/duration.test.js.snap
+++ b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/duration/__snapshots__/duration.test.js.snap
@@ -210,10 +210,7 @@ exports[`DurationFormatEditor should render non-human readable output normally 1
     labelType="label"
   >
     <EuiFieldNumber
-      compressed={false}
-      fullWidth={false}
       isInvalid={false}
-      isLoading={false}
       max={20}
       min={0}
       onChange={[Function]}
diff --git a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/truncate/__snapshots__/truncate.test.js.snap b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/truncate/__snapshots__/truncate.test.js.snap
index d034d93b27af2..c0954491a2a47 100644
--- a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/truncate/__snapshots__/truncate.test.js.snap
+++ b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/truncate/__snapshots__/truncate.test.js.snap
@@ -20,10 +20,7 @@ exports[`TruncateFormatEditor should render normally 1`] = `
     labelType="label"
   >
     <EuiFieldNumber
-      compressed={false}
-      fullWidth={false}
       isInvalid={false}
-      isLoading={false}
       onChange={[Function]}
     />
   </EuiFormRow>
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 3e1d45095e251..4b246fecb8146 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
@@ -534,10 +534,7 @@ exports[`UrlFormatEditor should render width and height fields if image 1`] = `
     labelType="label"
   >
     <EuiFieldNumber
-      compressed={false}
       data-test-subj="urlEditorWidth"
-      fullWidth={false}
-      isLoading={false}
       onChange={[Function]}
       value=""
     />
@@ -558,10 +555,7 @@ exports[`UrlFormatEditor should render width and height fields if image 1`] = `
     labelType="label"
   >
     <EuiFieldNumber
-      compressed={false}
       data-test-subj="urlEditorHeight"
-      fullWidth={false}
-      isLoading={false}
       onChange={[Function]}
       value=""
     />
diff --git a/src/legacy/ui/public/field_editor/components/scripting_help/__snapshots__/help_flyout.test.js.snap b/src/legacy/ui/public/field_editor/components/scripting_help/__snapshots__/help_flyout.test.js.snap
index b2ee13e865a9a..ca252b6d0147b 100644
--- a/src/legacy/ui/public/field_editor/components/scripting_help/__snapshots__/help_flyout.test.js.snap
+++ b/src/legacy/ui/public/field_editor/components/scripting_help/__snapshots__/help_flyout.test.js.snap
@@ -34,7 +34,6 @@ exports[`ScriptingHelpFlyout should render normally 1`] = `
               executeScript={[Function]}
               indexPattern={Object {}}
               lang="painless"
-              name="myScriptedField"
             />,
             "data-test-subj": "testTab",
             "id": "test",
diff --git a/src/legacy/ui/public/field_editor/components/scripting_help/_test_script.scss b/src/legacy/ui/public/field_editor/components/scripting_help/_test_script.scss
new file mode 100644
index 0000000000000..34e8a60d07074
--- /dev/null
+++ b/src/legacy/ui/public/field_editor/components/scripting_help/_test_script.scss
@@ -0,0 +1,5 @@
+.testScript__searchBar {
+  .globalQueryBar { 
+    padding: $euiSize 0 0;
+  }
+}
diff --git a/src/legacy/ui/public/field_editor/components/scripting_help/help_flyout.test.js b/src/legacy/ui/public/field_editor/components/scripting_help/help_flyout.test.js
index 69e6f9430b4e1..2fac8c7641ddb 100644
--- a/src/legacy/ui/public/field_editor/components/scripting_help/help_flyout.test.js
+++ b/src/legacy/ui/public/field_editor/components/scripting_help/help_flyout.test.js
@@ -26,6 +26,12 @@ jest.mock('ui/documentation_links', () => ({
   getDocLink: doc => `(docLink for ${doc})`,
 }));
 
+jest.mock('./test_script', () => ({
+  TestScript: () => {
+    return `<div>mockTestScript</div>`;
+  },
+}));
+
 const indexPatternMock = {};
 
 describe('ScriptingHelpFlyout', () => {
diff --git a/src/legacy/ui/public/field_editor/components/scripting_help/test_script.js b/src/legacy/ui/public/field_editor/components/scripting_help/test_script.js
index 08d22af66e451..942f39fc98dec 100644
--- a/src/legacy/ui/public/field_editor/components/scripting_help/test_script.js
+++ b/src/legacy/ui/public/field_editor/components/scripting_help/test_script.js
@@ -31,6 +31,13 @@ import {
   EuiCallOut,
 } from '@elastic/eui';
 
+import { npStart } from 'ui/new_platform';
+const { SearchBar } = npStart.plugins.data.ui;
+
+const { uiSettings } = npStart.core;
+
+import { esQuery } from '../../../../../../plugins/data/public';
+
 export class TestScript extends Component {
   state = {
     isLoading: false,
@@ -43,7 +50,7 @@ export class TestScript extends Component {
     }
   }
 
-  previewScript = async () => {
+  previewScript = async searchContext => {
     const { indexPattern, lang, name, script, executeScript } = this.props;
 
     if (!script || script.length === 0) {
@@ -54,11 +61,23 @@ export class TestScript extends Component {
       isLoading: true,
     });
 
+    let query;
+    if (searchContext) {
+      const esQueryConfigs = esQuery.getEsQueryConfig(uiSettings);
+      query = esQuery.buildEsQuery(
+        this.props.indexPattern,
+        searchContext.query,
+        null,
+        esQueryConfigs
+      );
+    }
+
     const scriptResponse = await executeScript({
       name,
       lang,
       script,
       indexPatternTitle: indexPattern.title,
+      query,
       additionalFields: this.state.additionalFields.map(option => {
         return option.value;
       }),
@@ -161,24 +180,36 @@ export class TestScript extends Component {
 
     return (
       <Fragment>
-        <EuiFormRow label="Additional fields">
+        <EuiFormRow label="Additional fields" fullWidth>
           <EuiComboBox
             placeholder="Select..."
             options={fields}
             selectedOptions={this.state.additionalFields}
             onChange={this.onAdditionalFieldsChange}
             data-test-subj="additionalFieldsSelect"
+            fullWidth
           />
         </EuiFormRow>
 
-        <EuiButton
-          onClick={this.previewScript}
-          disabled={this.props.script ? false : true}
-          isLoading={this.state.isLoading}
-          data-test-subj="runScriptButton"
-        >
-          Run script
-        </EuiButton>
+        <div className="testScript__searchBar">
+          <SearchBar
+            showFilterBar={false}
+            showDatePicker={false}
+            showQueryInput={true}
+            query={{ language: uiSettings.get('search:queryLanguage'), query: '' }}
+            onQuerySubmit={this.previewScript}
+            indexPatterns={[this.props.indexPattern]}
+            customSubmitButton={
+              <EuiButton
+                disabled={this.props.script ? false : true}
+                isLoading={this.state.isLoading}
+                data-test-subj="runScriptButton"
+              >
+                Run script
+              </EuiButton>
+            }
+          />
+        </div>
       </Fragment>
     );
   }
@@ -191,7 +222,8 @@ export class TestScript extends Component {
           <h3>Preview results</h3>
           <p>
             Run your script to preview the first 10 results. You can also select some additional
-            fields to include in your results to gain more context.
+            fields to include in your results to gain more context or add a query to filter on
+            specific documents.
           </p>
         </EuiText>
         <EuiSpacer />
diff --git a/src/legacy/ui/public/field_editor/lib/validate_script.js b/src/legacy/ui/public/field_editor/lib/validate_script.js
index ee51fe8858bc0..47e2091565c30 100644
--- a/src/legacy/ui/public/field_editor/lib/validate_script.js
+++ b/src/legacy/ui/public/field_editor/lib/validate_script.js
@@ -24,6 +24,7 @@ export const executeScript = async ({
   lang,
   script,
   indexPatternTitle,
+  query,
   additionalFields = [],
 }) => {
   // Using _msearch because _search with index name in path dorks everything up
@@ -52,6 +53,10 @@ export const executeScript = async ({
     search._source = additionalFields;
   }
 
+  if (query) {
+    search.query = query;
+  }
+
   const body = `${JSON.stringify(header)}\n${JSON.stringify(search)}\n`;
   const esResp = await kfetch({ method: 'POST', pathname: '/elasticsearch/_msearch', body });
   // unwrap _msearch response
diff --git a/src/legacy/ui/public/index_patterns/__mocks__/index.ts b/src/legacy/ui/public/index_patterns/__mocks__/index.ts
deleted file mode 100644
index 0cb1cf897b166..0000000000000
--- a/src/legacy/ui/public/index_patterns/__mocks__/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.
- */
-
-import { indexPatterns as npIndexPatterns } from '../../../../../plugins/data/public';
-
-export const flattenHitWrapper = npIndexPatterns.flattenHitWrapper;
-
-// static code
-export { getFromSavedObject, getRoutes } from '../../../../core_plugins/data/public';
diff --git a/src/legacy/ui/public/index_patterns/index.ts b/src/legacy/ui/public/index_patterns/index.ts
deleted file mode 100644
index 47f6e697c54e9..0000000000000
--- a/src/legacy/ui/public/index_patterns/index.ts
+++ /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.
- */
-
-/**
- * Nothing to see here!
- *
- * Index Patterns have moved to the data plugin, and are being re-exported
- * from ui/index_patterns for backwards compatibility.
- */
-
-import { indexPatterns } from '../../../../plugins/data/public';
-
-// static code
-export const INDEX_PATTERN_ILLEGAL_CHARACTERS = indexPatterns.ILLEGAL_CHARACTERS;
-export const INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE = indexPatterns.ILLEGAL_CHARACTERS_VISIBLE;
-export const ILLEGAL_CHARACTERS = indexPatterns.ILLEGAL_CHARACTERS_KEY;
-export const CONTAINS_SPACES = indexPatterns.CONTAINS_SPACES_KEY;
-export const validateIndexPattern = indexPatterns.validate;
-export const flattenHitWrapper = indexPatterns.flattenHitWrapper;
-export const getFromSavedObject = indexPatterns.getFromSavedObject;
-export const getRoutes = indexPatterns.getRoutes;
-
-// types
-export { Field, FieldType, IFieldList, IndexPattern } from '../../../core_plugins/data/public';
diff --git a/src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts b/src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts
new file mode 100644
index 0000000000000..fc4ca8469382a
--- /dev/null
+++ b/src/legacy/ui/public/indexed_array/helpers/organize_by.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 { groupBy } from 'lodash';
+import { organizeBy } from './organize_by';
+
+describe('organizeBy', () => {
+  test('it works', () => {
+    const col = [
+      {
+        name: 'one',
+        roles: ['user', 'admin', 'owner'],
+      },
+      {
+        name: 'two',
+        roles: ['user'],
+      },
+      {
+        name: 'three',
+        roles: ['user'],
+      },
+      {
+        name: 'four',
+        roles: ['user', 'admin'],
+      },
+    ];
+
+    const resp = organizeBy(col, 'roles');
+    expect(resp).toHaveProperty('user');
+    expect(resp.user.length).toBe(4);
+
+    expect(resp).toHaveProperty('admin');
+    expect(resp.admin.length).toBe(2);
+
+    expect(resp).toHaveProperty('owner');
+    expect(resp.owner.length).toBe(1);
+  });
+
+  test('behaves just like groupBy in normal scenarios', () => {
+    const col = [{ name: 'one' }, { name: 'two' }, { name: 'three' }, { name: 'four' }];
+
+    const orgs = organizeBy(col, 'name');
+    const groups = groupBy(col, 'name');
+
+    expect(orgs).toEqual(groups);
+  });
+});
diff --git a/src/legacy/ui/public/indexed_array/helpers/organize_by.ts b/src/legacy/ui/public/indexed_array/helpers/organize_by.ts
new file mode 100644
index 0000000000000..e923767c892cd
--- /dev/null
+++ b/src/legacy/ui/public/indexed_array/helpers/organize_by.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 { each, isFunction } from 'lodash';
+
+/**
+ * Like _.groupBy, but allows specifying multiple groups for a
+ * single object.
+ *
+ * organizeBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a')
+ * // Object {1: Array[2], 2: Array[1], 3: Array[1], 4: Array[1]}
+ *
+ * _.groupBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a')
+ * // Object {'1,2,3': Array[1], '1,4': Array[1]}
+ *
+ * @param  {array} collection - the list of values to organize
+ * @param  {Function} callback - either a property name, or a callback.
+ * @return {object}
+ */
+export function organizeBy(collection: object[], callback: ((obj: object) => string) | string) {
+  const buckets: { [key: string]: object[] } = {};
+
+  function add(key: string, obj: object) {
+    if (!buckets[key]) {
+      buckets[key] = [];
+    }
+    buckets[key].push(obj);
+  }
+
+  each(collection, (obj: Record<string, any>) => {
+    const keys = isFunction(callback) ? callback(obj) : obj[callback];
+
+    if (!Array.isArray(keys)) {
+      add(keys, obj);
+      return;
+    }
+
+    let length = keys.length;
+    while (length-- > 0) {
+      add(keys[length], obj);
+    }
+  });
+
+  return buckets;
+}
diff --git a/src/legacy/ui/public/indexed_array/indexed_array.js b/src/legacy/ui/public/indexed_array/indexed_array.js
index 96b37a1423be0..39c79b2f021a3 100644
--- a/src/legacy/ui/public/indexed_array/indexed_array.js
+++ b/src/legacy/ui/public/indexed_array/indexed_array.js
@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import { inflector } from './inflector';
-import { organizeBy } from '../utils/collection';
+import { organizeBy } from './helpers/organize_by';
 
 const pathGetter = _(_.get)
   .rearg(1, 0)
diff --git a/src/legacy/ui/public/indices/constants/index.js b/src/legacy/ui/public/indices/constants/index.js
index 87d36d1c6d14a..72ecc2e4c87de 100644
--- a/src/legacy/ui/public/indices/constants/index.js
+++ b/src/legacy/ui/public/indices/constants/index.js
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from '../../index_patterns';
+import { indexPatterns } from '../../../../../plugins/data/public';
 
-export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = [...INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE, '*'];
+export const INDEX_ILLEGAL_CHARACTERS_VISIBLE = [...indexPatterns.ILLEGAL_CHARACTERS_VISIBLE, '*'];
 
 // Insert the comma into the middle, so it doesn't look as if it has grammatical meaning when
 // these characters are rendered in the UI.
-const insertionIndex = Math.floor(INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.length / 2);
+const insertionIndex = Math.floor(indexPatterns.ILLEGAL_CHARACTERS_VISIBLE.length / 2);
 INDEX_ILLEGAL_CHARACTERS_VISIBLE.splice(insertionIndex, 0, ',');
diff --git a/src/legacy/ui/public/legacy_compat/angular_config.tsx b/src/legacy/ui/public/legacy_compat/angular_config.tsx
index 6e9f5c85aa1b2..7002b1c365eff 100644
--- a/src/legacy/ui/public/legacy_compat/angular_config.tsx
+++ b/src/legacy/ui/public/legacy_compat/angular_config.tsx
@@ -173,7 +173,7 @@ const capture$httpLoadingCount = (newPlatform: CoreStart) => (
   $rootScope: IRootScopeService,
   $http: IHttpService
 ) => {
-  newPlatform.http.addLoadingCount(
+  newPlatform.http.addLoadingCountSource(
     new Rx.Observable(observer => {
       const unwatch = $rootScope.$watch(() => {
         const reqs = $http.pendingRequests || [];
diff --git a/src/legacy/ui/public/management/__tests__/index.js b/src/legacy/ui/public/management/__tests__/index.js
deleted file mode 100644
index 6c794b3c189f0..0000000000000
--- a/src/legacy/ui/public/management/__tests__/index.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 expect from '@kbn/expect';
-
-import { management } from '..';
-import { ManagementSection } from '../section';
-
-describe('Management', () => {
-  it('provides ManagementSection', () => {
-    expect(management).to.be.a(ManagementSection);
-  });
-});
diff --git a/src/legacy/ui/public/management/index.js b/src/legacy/ui/public/management/index.js
index a27ff493b317e..ed8ddb65315e2 100644
--- a/src/legacy/ui/public/management/index.js
+++ b/src/legacy/ui/public/management/index.js
@@ -23,7 +23,8 @@ export {
   PAGE_FOOTER_COMPONENT,
 } from '../../../core_plugins/kibana/public/management/sections/settings/components/default_component_registry';
 export { registerSettingsComponent } from '../../../core_plugins/kibana/public/management/sections/settings/components/component_registry';
-export { Field } from '../../../core_plugins/kibana/public/management/sections/settings/components/field/field';
-export { management } from './sections_register';
 export { SidebarNav } from './components';
 export { MANAGEMENT_BREADCRUMB } from './breadcrumbs';
+
+import { npStart } from 'ui/new_platform';
+export const management = npStart.plugins.management.legacy;
diff --git a/src/legacy/ui/public/management/sections_register.js b/src/legacy/ui/public/management/sections_register.js
deleted file mode 100644
index a63fd390ea3ca..0000000000000
--- a/src/legacy/ui/public/management/sections_register.js
+++ /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 { ManagementSection } from './section';
-import { i18n } from '@kbn/i18n';
-
-export const management = new ManagementSection('management', {
-  display: i18n.translate('common.ui.management.displayName', {
-    defaultMessage: 'Management',
-  }),
-});
-
-management.register('data', {
-  display: i18n.translate('common.ui.management.connectDataDisplayName', {
-    defaultMessage: 'Connect Data',
-  }),
-  order: 0,
-});
-
-management.register('elasticsearch', {
-  display: 'Elasticsearch',
-  order: 20,
-  icon: 'logoElasticsearch',
-});
-
-management.register('kibana', {
-  display: 'Kibana',
-  order: 30,
-  icon: 'logoKibana',
-});
-
-management.register('logstash', {
-  display: 'Logstash',
-  order: 30,
-  icon: 'logoLogstash',
-});
diff --git a/src/legacy/ui/public/new_platform/__mocks__/helpers.ts b/src/legacy/ui/public/new_platform/__mocks__/helpers.ts
index a0a917bc48049..d1d7603bd82ed 100644
--- a/src/legacy/ui/public/new_platform/__mocks__/helpers.ts
+++ b/src/legacy/ui/public/new_platform/__mocks__/helpers.ts
@@ -25,6 +25,7 @@ import { navigationPluginMock } from '../../../../../plugins/navigation/public/m
 import { expressionsPluginMock } from '../../../../../plugins/expressions/public/mocks';
 import { inspectorPluginMock } from '../../../../../plugins/inspector/public/mocks';
 import { uiActionsPluginMock } from '../../../../../plugins/ui_actions/public/mocks';
+import { managementPluginMock } from '../../../../../plugins/management/public/mocks';
 import { usageCollectionPluginMock } from '../../../../../plugins/usage_collection/public/mocks';
 /* eslint-enable @kbn/eslint/no-restricted-paths */
 
@@ -45,6 +46,7 @@ export const pluginsMock = {
     inspector: inspectorPluginMock.createStartContract(),
     expressions: expressionsPluginMock.createStartContract(),
     uiActions: uiActionsPluginMock.createStartContract(),
+    management: managementPluginMock.createStartContract(),
   }),
 };
 
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 20a7e0d5dde8d..06424ea48a40f 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
@@ -45,11 +45,18 @@ export const mockUiSettings = {
   'format:defaultTypeMap': {},
 };
 
-export const npSetup = {
-  core: {
-    chrome: {},
-    uiSettings: mockUiSettings,
+const mockCore = {
+  chrome: {},
+  uiSettings: mockUiSettings,
+  http: {
+    basePath: {
+      get: sinon.fake.returns(''),
+    },
   },
+};
+
+export const npSetup = {
+  core: mockCore,
   plugins: {
     usageCollection: {
       allowTrackUserAgent: sinon.fake(),
@@ -95,7 +102,7 @@ export const npSetup = {
           getSavedQueryCount: sinon.fake(),
         },
       },
-      fieldFormats: getFieldFormatsRegistry(mockUiSettings),
+      fieldFormats: getFieldFormatsRegistry(mockCore),
     },
     share: {
       register: () => {},
@@ -137,6 +144,15 @@ export const npStart = {
     chrome: {},
   },
   plugins: {
+    management: {
+      legacy: {
+        getSection: () => ({
+          register: sinon.fake(),
+          deregister: sinon.fake(),
+          hasItem: sinon.fake(),
+        }),
+      },
+    },
     embeddable: {
       getEmbeddableFactory: sinon.fake(),
       getEmbeddableFactories: sinon.fake(),
@@ -217,7 +233,7 @@ export const npStart = {
           history: sinon.fake(),
         },
       },
-      fieldFormats: getFieldFormatsRegistry(mockUiSettings),
+      fieldFormats: getFieldFormatsRegistry(mockCore),
     },
     share: {
       toggleShareContextMenu: () => {},
diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
index 138bb4135c507..df3fa7c6ea466 100644
--- a/src/legacy/ui/public/new_platform/new_platform.ts
+++ b/src/legacy/ui/public/new_platform/new_platform.ts
@@ -32,6 +32,7 @@ import { DevToolsSetup, DevToolsStart } from '../../../../plugins/dev_tools/publ
 import { KibanaLegacySetup, KibanaLegacyStart } from '../../../../plugins/kibana_legacy/public';
 import { HomePublicPluginSetup, HomePublicPluginStart } from '../../../../plugins/home/public';
 import { SharePluginSetup, SharePluginStart } from '../../../../plugins/share/public';
+import { ManagementStart } from '../../../../plugins/management/public';
 import { BfetchPublicSetup, BfetchPublicStart } from '../../../../plugins/bfetch/public';
 import { UsageCollectionSetup } from '../../../../plugins/usage_collection/public';
 import {
@@ -67,6 +68,7 @@ export interface PluginsStart {
   dev_tools: DevToolsStart;
   kibana_legacy: KibanaLegacyStart;
   share: SharePluginStart;
+  management: ManagementStart;
 }
 
 export const npSetup = {
diff --git a/src/legacy/ui/public/registry/doc_views.ts b/src/legacy/ui/public/registry/doc_views.ts
deleted file mode 100644
index bf1e8416ae66d..0000000000000
--- a/src/legacy/ui/public/registry/doc_views.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 { convertDirectiveToRenderFn } from './doc_views_helpers';
-import { DocView, DocViewInput, ElasticSearchHit, DocViewInputFn } from './doc_views_types';
-
-export { DocViewRenderProps, DocView, DocViewRenderFn } from './doc_views_types';
-
-export interface DocViewsRegistry {
-  docViews: DocView[];
-  addDocView: (docView: DocViewInput) => void;
-  getDocViewsSorted: (hit: ElasticSearchHit) => DocView[];
-}
-
-export const docViews: DocView[] = [];
-
-/**
- * Extends and adds the given doc view to the registry array
- */
-export function addDocView(docView: DocViewInput) {
-  if (docView.directive) {
-    // convert angular directive to render function for backwards compatibility
-    docView.render = convertDirectiveToRenderFn(docView.directive);
-  }
-  if (typeof docView.shouldShow !== 'function') {
-    docView.shouldShow = () => true;
-  }
-  docViews.push(docView as DocView);
-}
-
-/**
- * Empty array of doc views for testing
- */
-export function emptyDocViews() {
-  docViews.length = 0;
-}
-
-/**
- * Returns a sorted array of doc_views for rendering tabs
- */
-export function getDocViewsSorted(hit: ElasticSearchHit): DocView[] {
-  return docViews
-    .filter(docView => docView.shouldShow(hit))
-    .sort((a, b) => (Number(a.order) > Number(b.order) ? 1 : -1));
-}
-/**
- * Provider for compatibility with 3rd Party plugins
- */
-export const DocViewsRegistryProvider = {
-  register: (docViewRaw: DocViewInput | DocViewInputFn) => {
-    const docView = typeof docViewRaw === 'function' ? docViewRaw() : docViewRaw;
-    addDocView(docView);
-  },
-};
diff --git a/src/legacy/ui/public/routes/route_manager.js b/src/legacy/ui/public/routes/route_manager.js
index cf6413fb5ba7e..1cf2a5fc5a64a 100644
--- a/src/legacy/ui/public/routes/route_manager.js
+++ b/src/legacy/ui/public/routes/route_manager.js
@@ -56,7 +56,23 @@ export default function RouteManager() {
     }
   };
 
-  self.run = function($location, $route, $injector) {
+  self.run = function($location, $route, $injector, $rootScope) {
+    if (window.elasticApm && typeof window.elasticApm.startTransaction === 'function') {
+      /**
+       * capture route-change events as transactions which happens after
+       * the browser's on load event.
+       *
+       * In Kibana app, this logic would run after the boostrap js files gets
+       * downloaded and get associated with the page-load transaction
+       */
+      $rootScope.$on('$routeChangeStart', (_, nextRoute) => {
+        if (nextRoute.$$route) {
+          const name = nextRoute.$$route.originalPath;
+          window.elasticApm.startTransaction(name, 'route-change');
+        }
+      });
+    }
+
     self.getBreadcrumbs = () => {
       const breadcrumbs = parsePathToBreadcrumbs($location.path());
       const map = $route.current.mapBreadcrumbs;
diff --git a/src/legacy/ui/public/saved_objects/__tests__/saved_object.js b/src/legacy/ui/public/saved_objects/__tests__/saved_object.js
index 30fb0c0c38aef..d9622ac3dc6d2 100644
--- a/src/legacy/ui/public/saved_objects/__tests__/saved_object.js
+++ b/src/legacy/ui/public/saved_objects/__tests__/saved_object.js
@@ -26,7 +26,7 @@ import { createSavedObjectClass } from '../saved_object';
 import StubIndexPattern from 'test_utils/stub_index_pattern';
 import { npStart } from 'ui/new_platform';
 import { InvalidJSONProperty } from '../../../../../plugins/kibana_utils/public';
-import { mockUiSettings } from '../../new_platform/new_platform.karma_mock';
+import { npSetup } from '../../new_platform/new_platform.karma_mock';
 
 const getConfig = cfg => cfg;
 
@@ -310,7 +310,7 @@ describe('Saved Object', function() {
               getConfig,
               null,
               [],
-              mockUiSettings
+              npSetup.core
             );
             indexPattern.title = indexPattern.id;
             savedObject.searchSource.setField('index', indexPattern);
@@ -700,7 +700,7 @@ describe('Saved Object', function() {
             getConfig,
             null,
             [],
-            mockUiSettings
+            npSetup.core
           );
           indexPattern.title = indexPattern.id;
           savedObject.searchSource.setField('index', indexPattern);
diff --git a/src/legacy/ui/public/saved_objects/helpers/apply_es_resp.ts b/src/legacy/ui/public/saved_objects/helpers/apply_es_resp.ts
index 77f504d108076..ee49b7495f2af 100644
--- a/src/legacy/ui/public/saved_objects/helpers/apply_es_resp.ts
+++ b/src/legacy/ui/public/saved_objects/helpers/apply_es_resp.ts
@@ -20,7 +20,7 @@ import _ from 'lodash';
 import { EsResponse, SavedObject, SavedObjectConfig } from 'ui/saved_objects/types';
 import { parseSearchSource } from 'ui/saved_objects/helpers/parse_search_source';
 import { expandShorthand, SavedObjectNotFound } from '../../../../../plugins/kibana_utils/public';
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../plugins/data/public';
 
 /**
  * A given response of and ElasticSearch containing a plain saved object is applied to the given
@@ -64,19 +64,13 @@ export async function applyESResp(
   _.assign(savedObject, savedObject._source);
   savedObject.lastSavedTitle = savedObject.title;
 
-  try {
-    await parseSearchSource(savedObject, esType, meta.searchSourceJSON, resp.references);
-    await hydrateIndexPattern();
-    if (injectReferences && resp.references && resp.references.length > 0) {
-      injectReferences(savedObject, resp.references);
-    }
-    if (typeof config.afterESResp === 'function') {
-      await config.afterESResp.call(savedObject);
-    }
-    return savedObject;
-  } catch (e) {
-    // eslint-disable-next-line no-console
-    console.error(e);
-    throw e;
+  await parseSearchSource(savedObject, esType, meta.searchSourceJSON, resp.references);
+  await hydrateIndexPattern();
+  if (injectReferences && resp.references && resp.references.length > 0) {
+    injectReferences(savedObject, resp.references);
+  }
+  if (typeof config.afterESResp === 'function') {
+    savedObject = await config.afterESResp(savedObject);
   }
+  return savedObject;
 }
diff --git a/src/legacy/ui/public/saved_objects/helpers/initialize_saved_object.ts b/src/legacy/ui/public/saved_objects/helpers/initialize_saved_object.ts
index c5ea31e0784aa..a9d4b416add1e 100644
--- a/src/legacy/ui/public/saved_objects/helpers/initialize_saved_object.ts
+++ b/src/legacy/ui/public/saved_objects/helpers/initialize_saved_object.ts
@@ -37,7 +37,7 @@ export async function intializeSavedObject(
     _.assign(savedObject, savedObject.defaults);
     await savedObject.hydrateIndexPattern!();
     if (typeof config.afterESResp === 'function') {
-      await config.afterESResp.call(savedObject);
+      savedObject = await config.afterESResp(savedObject);
     }
     return savedObject;
   }
diff --git a/src/legacy/ui/public/saved_objects/helpers/string_utils.test.ts b/src/legacy/ui/public/saved_objects/helpers/string_utils.test.ts
new file mode 100644
index 0000000000000..5b108a4cc0180
--- /dev/null
+++ b/src/legacy/ui/public/saved_objects/helpers/string_utils.test.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 { StringUtils } from './string_utils';
+
+describe('StringUtils class', () => {
+  describe('static upperFirst', () => {
+    test('should converts the first character of string to upper case', () => {
+      expect(StringUtils.upperFirst()).toBe('');
+      expect(StringUtils.upperFirst('')).toBe('');
+
+      expect(StringUtils.upperFirst('Fred')).toBe('Fred');
+      expect(StringUtils.upperFirst('fred')).toBe('Fred');
+      expect(StringUtils.upperFirst('FRED')).toBe('FRED');
+    });
+  });
+});
diff --git a/src/legacy/ui/public/saved_objects/helpers/string_utils.ts b/src/legacy/ui/public/saved_objects/helpers/string_utils.ts
new file mode 100644
index 0000000000000..fb10b792b7e69
--- /dev/null
+++ b/src/legacy/ui/public/saved_objects/helpers/string_utils.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.
+ */
+
+export class StringUtils {
+  /**
+   * Returns a version of the string with the first letter capitalized.
+   * @param str {string}
+   * @returns {string}
+   */
+  public static upperFirst(str: string = ''): string {
+    return str ? str.charAt(0).toUpperCase() + str.slice(1) : '';
+  }
+}
diff --git a/src/legacy/ui/public/saved_objects/index.ts b/src/legacy/ui/public/saved_objects/index.ts
index 3c77a02c608c6..129938ebe0509 100644
--- a/src/legacy/ui/public/saved_objects/index.ts
+++ b/src/legacy/ui/public/saved_objects/index.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-export { SavedObjectRegistryProvider } from './saved_object_registry';
 export { SavedObjectsClientProvider } from './saved_objects_client_provider';
 export { SavedObjectLoader } from './saved_object_loader';
 export { findObjectByTitle } from './helpers/find_object_by_title';
diff --git a/src/legacy/ui/public/saved_objects/saved_object_loader.ts b/src/legacy/ui/public/saved_objects/saved_object_loader.ts
index eb880ce5380c0..7784edc9ad528 100644
--- a/src/legacy/ui/public/saved_objects/saved_object_loader.ts
+++ b/src/legacy/ui/public/saved_objects/saved_object_loader.ts
@@ -18,7 +18,7 @@
  */
 import { SavedObject } from 'ui/saved_objects/types';
 import { ChromeStart, SavedObjectsClientContract, SavedObjectsFindOptions } from 'kibana/public';
-import { StringUtils } from '../utils/string_utils';
+import { StringUtils } from './helpers/string_utils';
 
 /**
  * The SavedObjectLoader class provides some convenience functions
diff --git a/src/legacy/ui/public/saved_objects/saved_object_registry.ts b/src/legacy/ui/public/saved_objects/saved_object_registry.ts
deleted file mode 100644
index 34b91267bfb32..0000000000000
--- a/src/legacy/ui/public/saved_objects/saved_object_registry.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { uiRegistry } from '../registry/_registry';
-
-export const SavedObjectRegistryProvider = uiRegistry({
-  name: 'savedObjects',
-  index: ['loaderProperties.name'],
-  order: ['loaderProperties.name'],
-});
diff --git a/src/legacy/ui/public/saved_objects/types.ts b/src/legacy/ui/public/saved_objects/types.ts
index bccf73917882a..2578c2015e819 100644
--- a/src/legacy/ui/public/saved_objects/types.ts
+++ b/src/legacy/ui/public/saved_objects/types.ts
@@ -16,11 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ChromeStart, OverlayStart, SavedObjectsClientContract } from 'kibana/public';
-import { SearchSource, SearchSourceContract } from 'ui/courier';
-import { SavedObjectAttributes, SavedObjectReference } from 'kibana/server';
-import { IndexPatternsContract } from '../../../../plugins/data/public';
-import { IndexPattern } from '../../../core_plugins/data/public';
+
+import {
+  ChromeStart,
+  OverlayStart,
+  SavedObjectsClientContract,
+  SavedObjectAttributes,
+  SavedObjectReference,
+} from 'kibana/public';
+import { ISearchSource } from 'ui/courier';
+import { IIndexPattern, IndexPatternsContract } from '../../../../plugins/data/public';
 
 export interface SavedObject {
   _serialize: () => { attributes: SavedObjectAttributes; references: SavedObjectReference[] };
@@ -30,11 +35,11 @@ export interface SavedObject {
   creationOpts: (opts: SavedObjectCreationOpts) => Record<string, unknown>;
   defaults: any;
   delete?: () => Promise<{}>;
-  destroy?: () => void;
+  destroy: () => void;
   getDisplayName: () => string;
   getEsType: () => string;
   getFullPath: () => string;
-  hydrateIndexPattern?: (id?: string) => Promise<null | IndexPattern>;
+  hydrateIndexPattern?: (id?: string) => Promise<null | IIndexPattern>;
   id?: string;
   init?: () => Promise<SavedObject>;
   isSaving: boolean;
@@ -42,7 +47,7 @@ export interface SavedObject {
   lastSavedTitle: string;
   migrationVersion?: Record<string, any>;
   save: (saveOptions: SavedObjectSaveOpts) => Promise<string>;
-  searchSource?: SearchSourceContract;
+  searchSource?: ISearchSource;
   showInRecentlyAccessed: boolean;
   title: string;
 }
@@ -66,7 +71,8 @@ export interface SavedObjectKibanaServices {
 }
 
 export interface SavedObjectConfig {
-  afterESResp?: () => any;
+  // is only used by visualize
+  afterESResp?: (savedObject: SavedObject) => Promise<SavedObject>;
   clearSavedIndexPattern?: boolean;
   defaults?: any;
   extractReferences?: (opts: {
@@ -78,12 +84,12 @@ export interface SavedObjectConfig {
   };
   id?: string;
   init?: () => void;
-  indexPattern?: IndexPattern;
+  indexPattern?: IIndexPattern;
   injectReferences?: any;
   mapping?: any;
   migrationVersion?: Record<string, any>;
   path?: string;
-  searchSource?: SearchSource | boolean;
+  searchSource?: ISearchSource | boolean;
   type?: string;
 }
 
diff --git a/src/legacy/ui/public/state_management/app_state.js b/src/legacy/ui/public/state_management/app_state.js
index 4bf386febf836..e253d49c04131 100644
--- a/src/legacy/ui/public/state_management/app_state.js
+++ b/src/legacy/ui/public/state_management/app_state.js
@@ -31,7 +31,6 @@ import { uiModules } from '../modules';
 import { StateProvider } from './state';
 import '../persisted_state';
 import { createLegacyClass } from '../utils/legacy_class';
-import { callEach } from '../utils/function';
 
 const urlParam = '_a';
 
@@ -62,7 +61,8 @@ export function AppStateProvider(Private, $location, $injector) {
   AppState.prototype.destroy = function() {
     AppState.Super.prototype.destroy.call(this);
     AppState.getAppState._set(null);
-    callEach(eventUnsubscribers);
+
+    eventUnsubscribers.forEach(listener => listener());
   };
 
   /**
diff --git a/src/legacy/ui/public/state_management/state.js b/src/legacy/ui/public/state_management/state.js
index a9898303fa5be..289d4b8006cba 100644
--- a/src/legacy/ui/public/state_management/state.js
+++ b/src/legacy/ui/public/state_management/state.js
@@ -29,12 +29,11 @@ import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import angular from 'angular';
 import rison from 'rison-node';
-import { applyDiff } from '../utils/diff_object';
+import { applyDiff } from './utils/diff_object';
 import { EventsProvider } from '../events';
 import { fatalError, toastNotifications } from '../notify';
 import './config_provider';
 import { createLegacyClass } from '../utils/legacy_class';
-import { callEach } from '../utils/function';
 import {
   hashedItemStore,
   isStateHash,
@@ -66,7 +65,7 @@ export function StateProvider(
     this._hashedItemStore = _hashedItemStore;
 
     // When the URL updates we need to fetch the values from the URL
-    this._cleanUpListeners = _.partial(callEach, [
+    this._cleanUpListeners = [
       // partial route update, no app reload
       $rootScope.$on('$routeUpdate', () => {
         this.fetch();
@@ -85,7 +84,7 @@ export function StateProvider(
           this.fetch();
         }
       }),
-    ]);
+    ];
 
     // Initialize the State with fetch
     this.fetch();
@@ -242,7 +241,9 @@ export function StateProvider(
    */
   State.prototype.destroy = function() {
     this.off(); // removes all listeners
-    this._cleanUpListeners(); // Removes the $routeUpdate listener
+
+    // Removes the $routeUpdate listener
+    this._cleanUpListeners.forEach(listener => listener(this));
   };
 
   State.prototype.setDefaults = function(defaults) {
diff --git a/src/legacy/ui/public/state_management/utils/diff_object.test.ts b/src/legacy/ui/public/state_management/utils/diff_object.test.ts
new file mode 100644
index 0000000000000..d93fa0fe5a169
--- /dev/null
+++ b/src/legacy/ui/public/state_management/utils/diff_object.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 { cloneDeep } from 'lodash';
+import { applyDiff } from './diff_object';
+
+describe('diff_object', () => {
+  test('should list the removed keys', () => {
+    const target = { test: 'foo' };
+    const source = { foo: 'test' };
+    const results = applyDiff(target, source);
+
+    expect(results).toHaveProperty('removed');
+    expect(results.removed).toEqual(['test']);
+  });
+
+  test('should list the changed keys', () => {
+    const target = { foo: 'bar' };
+    const source = { foo: 'test' };
+    const results = applyDiff(target, source);
+
+    expect(results).toHaveProperty('changed');
+    expect(results.changed).toEqual(['foo']);
+  });
+
+  test('should list the added keys', () => {
+    const target = {};
+    const source = { foo: 'test' };
+    const results = applyDiff(target, source);
+
+    expect(results).toHaveProperty('added');
+    expect(results.added).toEqual(['foo']);
+  });
+
+  test('should list all the keys that are change or removed', () => {
+    const target = { foo: 'bar', test: 'foo' };
+    const source = { foo: 'test' };
+    const results = applyDiff(target, source);
+
+    expect(results).toHaveProperty('keys');
+    expect(results.keys).toEqual(['foo', 'test']);
+  });
+
+  test('should ignore functions', () => {
+    const target = { foo: 'bar', test: 'foo' };
+    const source = { foo: 'test', fn: () => {} };
+
+    applyDiff(target, source);
+
+    expect(target).not.toHaveProperty('fn');
+  });
+
+  test('should ignore underscores', () => {
+    const target = { foo: 'bar', test: 'foo' };
+    const source = { foo: 'test', _private: 'foo' };
+
+    applyDiff(target, source);
+
+    expect(target).not.toHaveProperty('_private');
+  });
+
+  test('should ignore dollar signs', () => {
+    const target = { foo: 'bar', test: 'foo' };
+    const source = { foo: 'test', $private: 'foo' };
+
+    applyDiff(target, source);
+
+    expect(target).not.toHaveProperty('$private');
+  });
+
+  test('should not list any changes for similar objects', () => {
+    const target = { foo: 'bar', test: 'foo' };
+    const source = { foo: 'bar', test: 'foo', $private: 'foo' };
+    const results = applyDiff(target, source);
+
+    expect(results.changed).toEqual([]);
+  });
+
+  test('should only change keys that actually changed', () => {
+    const obj = { message: 'foo' };
+    const target = { obj, message: 'foo' };
+    const source = { obj: cloneDeep(obj), message: 'test' };
+
+    applyDiff(target, source);
+
+    expect(target.obj).toBe(obj);
+  });
+});
diff --git a/src/legacy/ui/public/state_management/utils/diff_object.ts b/src/legacy/ui/public/state_management/utils/diff_object.ts
new file mode 100644
index 0000000000000..2590e2271f771
--- /dev/null
+++ b/src/legacy/ui/public/state_management/utils/diff_object.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 { keys, isFunction, difference, filter, union, pick, each, assign, isEqual } from 'lodash';
+
+export interface IDiffObject {
+  removed: string[];
+  added: string[];
+  changed: string[];
+  keys: string[];
+}
+
+/**
+ * Filter the private vars
+ * @param {string} key The keys
+ * @returns {boolean}
+ */
+const filterPrivateAndMethods = function(obj: Record<string, any>) {
+  return function(key: string) {
+    if (isFunction(obj[key])) return false;
+    if (key.charAt(0) === '$') return false;
+    return key.charAt(0) !== '_';
+  };
+};
+
+export function applyDiff(target: Record<string, any>, source: Record<string, any>) {
+  const diff: IDiffObject = {
+    removed: [],
+    added: [],
+    changed: [],
+    keys: [],
+  };
+
+  const targetKeys = keys(target).filter(filterPrivateAndMethods(target));
+  const sourceKeys = keys(source).filter(filterPrivateAndMethods(source));
+
+  // Find the keys to be removed
+  diff.removed = difference(targetKeys, sourceKeys);
+
+  // Find the keys to be added
+  diff.added = difference(sourceKeys, targetKeys);
+
+  // Find the keys that will be changed
+  diff.changed = filter(sourceKeys, key => !isEqual(target[key], source[key]));
+
+  // Make a list of all the keys that are changing
+  diff.keys = union(diff.changed, diff.removed, diff.added);
+
+  // Remove all the keys
+  each(diff.removed, key => {
+    delete target[key];
+  });
+
+  // Assign the changed to the source to the target
+  assign(target, pick(source, diff.changed));
+  // Assign the added to the source to the target
+  assign(target, pick(source, diff.added));
+
+  return diff;
+}
diff --git a/src/legacy/ui/public/styles/_legacy/components/_sidebar.scss b/src/legacy/ui/public/styles/_legacy/components/_sidebar.scss
index 571064a1f29c4..d44129b6ec849 100644
--- a/src/legacy/ui/public/styles/_legacy/components/_sidebar.scss
+++ b/src/legacy/ui/public/styles/_legacy/components/_sidebar.scss
@@ -112,8 +112,16 @@
       align-self: center;
     }
   }
+}
 
-  .index-pattern-selection:not(.euiComboBox) {
-    padding: $euiSizeS 0;
-  }
+.indexPattern__container {
+  display: flex;
+  align-items: center;
+  height: $euiSize * 3;
+  margin-top: -$euiSizeS;
+}
+
+.indexPattern__triggerButton {
+  @include euiTitle('xs');
+  line-height: $euiSizeXXL;
 }
diff --git a/src/legacy/ui/public/styles/_legacy/components/_table.scss b/src/legacy/ui/public/styles/_legacy/components/_table.scss
index e7c1bda829f0e..c9472cbd2faa7 100644
--- a/src/legacy/ui/public/styles/_legacy/components/_table.scss
+++ b/src/legacy/ui/public/styles/_legacy/components/_table.scss
@@ -1,4 +1,4 @@
-@import '../../../../../core_plugins/kibana/public/discover/mixins';
+@import '../../../../../core_plugins/kibana/public/discover/np_ready/mixins';
 
 .table {
   // Nesting
diff --git a/src/legacy/ui/public/time_buckets/time_buckets.js b/src/legacy/ui/public/time_buckets/time_buckets.js
index 92de88b47e3c3..96ba4bfb2ac2c 100644
--- a/src/legacy/ui/public/time_buckets/time_buckets.js
+++ b/src/legacy/ui/public/time_buckets/time_buckets.js
@@ -20,13 +20,12 @@
 import _ from 'lodash';
 import moment from 'moment';
 import { npStart } from 'ui/new_platform';
-import { parseInterval } from '../utils/parse_interval';
 import { calcAutoIntervalLessThan, calcAutoIntervalNear } from './calc_auto_interval';
 import {
   convertDurationToNormalizedEsInterval,
   convertIntervalToEsInterval,
 } from './calc_es_interval';
-import { FIELD_FORMAT_IDS } from '../../../../plugins/data/public';
+import { FIELD_FORMAT_IDS, parseInterval } from '../../../../plugins/data/public';
 
 const getConfig = (...args) => npStart.core.uiSettings.get(...args);
 
diff --git a/src/legacy/ui/public/utils/__tests__/collection.js b/src/legacy/ui/public/utils/__tests__/collection.js
deleted file mode 100644
index 402f0387e53ce..0000000000000
--- a/src/legacy/ui/public/utils/__tests__/collection.js
+++ /dev/null
@@ -1,200 +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 { groupBy } from 'lodash';
-import { move, pushAll, organizeBy } from '../collection';
-
-describe('collection', () => {
-  describe('move', function() {
-    it('accepts previous from->to syntax', function() {
-      const list = [1, 1, 1, 1, 1, 1, 1, 1, 8, 1, 1];
-
-      expect(list[3]).to.be(1);
-      expect(list[8]).to.be(8);
-
-      move(list, 8, 3);
-
-      expect(list[8]).to.be(1);
-      expect(list[3]).to.be(8);
-    });
-
-    it('moves an object up based on a function callback', function() {
-      const list = [1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1];
-
-      expect(list[4]).to.be(0);
-      expect(list[5]).to.be(1);
-      expect(list[6]).to.be(0);
-
-      move(list, 5, false, function(v) {
-        return v === 0;
-      });
-
-      expect(list[4]).to.be(1);
-      expect(list[5]).to.be(0);
-      expect(list[6]).to.be(0);
-    });
-
-    it('moves an object down based on a function callback', function() {
-      const list = [1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1];
-
-      expect(list[4]).to.be(0);
-      expect(list[5]).to.be(1);
-      expect(list[6]).to.be(0);
-
-      move(list, 5, true, function(v) {
-        return v === 0;
-      });
-
-      expect(list[4]).to.be(0);
-      expect(list[5]).to.be(0);
-      expect(list[6]).to.be(1);
-    });
-
-    it('moves an object up based on a where callback', function() {
-      const list = [
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-      ];
-
-      expect(list[4]).to.have.property('v', 0);
-      expect(list[5]).to.have.property('v', 1);
-      expect(list[6]).to.have.property('v', 0);
-
-      move(list, 5, false, { v: 0 });
-
-      expect(list[4]).to.have.property('v', 1);
-      expect(list[5]).to.have.property('v', 0);
-      expect(list[6]).to.have.property('v', 0);
-    });
-
-    it('moves an object down based on a where callback', function() {
-      const list = [
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-      ];
-
-      expect(list[4]).to.have.property('v', 0);
-      expect(list[5]).to.have.property('v', 1);
-      expect(list[6]).to.have.property('v', 0);
-
-      move(list, 5, true, { v: 0 });
-
-      expect(list[4]).to.have.property('v', 0);
-      expect(list[5]).to.have.property('v', 0);
-      expect(list[6]).to.have.property('v', 1);
-    });
-
-    it('moves an object down based on a pluck callback', function() {
-      const list = [
-        { id: 0, normal: true },
-        { id: 1, normal: true },
-        { id: 2, normal: true },
-        { id: 3, normal: true },
-        { id: 4, normal: true },
-        { id: 5, normal: false },
-        { id: 6, normal: true },
-        { id: 7, normal: true },
-        { id: 8, normal: true },
-        { id: 9, normal: true },
-      ];
-
-      expect(list[4]).to.have.property('id', 4);
-      expect(list[5]).to.have.property('id', 5);
-      expect(list[6]).to.have.property('id', 6);
-
-      move(list, 5, true, 'normal');
-
-      expect(list[4]).to.have.property('id', 4);
-      expect(list[5]).to.have.property('id', 6);
-      expect(list[6]).to.have.property('id', 5);
-    });
-  });
-
-  describe('pushAll', function() {
-    it('pushes an entire array into another', function() {
-      const a = [1, 2, 3, 4];
-      const b = [5, 6, 7, 8];
-
-      const output = pushAll(b, a);
-      expect(output).to.be(a);
-      expect(a).to.eql([1, 2, 3, 4, 5, 6, 7, 8]);
-      expect(b).to.eql([5, 6, 7, 8]);
-    });
-  });
-
-  describe('organizeBy', function() {
-    it('it works', function() {
-      const col = [
-        {
-          name: 'one',
-          roles: ['user', 'admin', 'owner'],
-        },
-        {
-          name: 'two',
-          roles: ['user'],
-        },
-        {
-          name: 'three',
-          roles: ['user'],
-        },
-        {
-          name: 'four',
-          roles: ['user', 'admin'],
-        },
-      ];
-
-      const resp = organizeBy(col, 'roles');
-      expect(resp).to.have.property('user');
-      expect(resp.user).to.have.length(4);
-
-      expect(resp).to.have.property('admin');
-      expect(resp.admin).to.have.length(2);
-
-      expect(resp).to.have.property('owner');
-      expect(resp.owner).to.have.length(1);
-    });
-
-    it('behaves just like groupBy in normal scenarios', function() {
-      const col = [{ name: 'one' }, { name: 'two' }, { name: 'three' }, { name: 'four' }];
-
-      const orgs = organizeBy(col, 'name');
-      const groups = groupBy(col, 'name');
-      expect(orgs).to.eql(groups);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/utils/__tests__/diff_object.js b/src/legacy/ui/public/utils/__tests__/diff_object.js
deleted file mode 100644
index 8459aa60436b1..0000000000000
--- a/src/legacy/ui/public/utils/__tests__/diff_object.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 expect from '@kbn/expect';
-import _ from 'lodash';
-import { applyDiff } from '../diff_object';
-
-describe('ui/utils/diff_object', function() {
-  it('should list the removed keys', function() {
-    const target = { test: 'foo' };
-    const source = { foo: 'test' };
-    const results = applyDiff(target, source);
-    expect(results).to.have.property('removed');
-    expect(results.removed).to.eql(['test']);
-  });
-
-  it('should list the changed keys', function() {
-    const target = { foo: 'bar' };
-    const source = { foo: 'test' };
-    const results = applyDiff(target, source);
-    expect(results).to.have.property('changed');
-    expect(results.changed).to.eql(['foo']);
-  });
-
-  it('should list the added keys', function() {
-    const target = {};
-    const source = { foo: 'test' };
-    const results = applyDiff(target, source);
-    expect(results).to.have.property('added');
-    expect(results.added).to.eql(['foo']);
-  });
-
-  it('should list all the keys that are change or removed', function() {
-    const target = { foo: 'bar', test: 'foo' };
-    const source = { foo: 'test' };
-    const results = applyDiff(target, source);
-    expect(results).to.have.property('keys');
-    expect(results.keys).to.eql(['foo', 'test']);
-  });
-
-  it('should ignore functions', function() {
-    const target = { foo: 'bar', test: 'foo' };
-    const source = { foo: 'test', fn: _.noop };
-    applyDiff(target, source);
-    expect(target).to.not.have.property('fn');
-  });
-
-  it('should ignore underscores', function() {
-    const target = { foo: 'bar', test: 'foo' };
-    const source = { foo: 'test', _private: 'foo' };
-    applyDiff(target, source);
-    expect(target).to.not.have.property('_private');
-  });
-
-  it('should ignore dollar signs', function() {
-    const target = { foo: 'bar', test: 'foo' };
-    const source = { foo: 'test', $private: 'foo' };
-    applyDiff(target, source);
-    expect(target).to.not.have.property('$private');
-  });
-
-  it('should not list any changes for similar objects', function() {
-    const target = { foo: 'bar', test: 'foo' };
-    const source = { foo: 'bar', test: 'foo', $private: 'foo' };
-    const results = applyDiff(target, source);
-    expect(results.changed).to.be.empty();
-  });
-
-  it('should only change keys that actually changed', function() {
-    const obj = { message: 'foo' };
-    const target = { obj: obj, message: 'foo' };
-    const source = { obj: _.cloneDeep(obj), message: 'test' };
-    applyDiff(target, source);
-    expect(target.obj).to.be(obj);
-  });
-});
diff --git a/src/legacy/ui/public/utils/__tests__/parse_interval.js b/src/legacy/ui/public/utils/__tests__/parse_interval.js
deleted file mode 100644
index a33b0ab958072..0000000000000
--- a/src/legacy/ui/public/utils/__tests__/parse_interval.js
+++ /dev/null
@@ -1,93 +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 { parseInterval } from '../parse_interval';
-import expect from '@kbn/expect';
-
-describe('parseInterval', function() {
-  it('should correctly parse an interval containing unit and value', function() {
-    let duration = parseInterval('1d');
-    expect(duration.as('d')).to.be(1);
-
-    duration = parseInterval('2y');
-    expect(duration.as('y')).to.be(2);
-
-    duration = parseInterval('5M');
-    expect(duration.as('M')).to.be(5);
-
-    duration = parseInterval('5m');
-    expect(duration.as('m')).to.be(5);
-
-    duration = parseInterval('250ms');
-    expect(duration.as('ms')).to.be(250);
-
-    duration = parseInterval('100s');
-    expect(duration.as('s')).to.be(100);
-
-    duration = parseInterval('23d');
-    expect(duration.as('d')).to.be(23);
-
-    duration = parseInterval('52w');
-    expect(duration.as('w')).to.be(52);
-  });
-
-  it('should correctly parse fractional intervals containing unit and value', function() {
-    let duration = parseInterval('1.5w');
-    expect(duration.as('w')).to.be(1.5);
-
-    duration = parseInterval('2.35y');
-    expect(duration.as('y')).to.be(2.35);
-  });
-
-  it('should correctly bubble up intervals which are less than 1', function() {
-    let duration = parseInterval('0.5y');
-    expect(duration.as('d')).to.be(183);
-
-    duration = parseInterval('0.5d');
-    expect(duration.as('h')).to.be(12);
-  });
-
-  it('should correctly parse a unit in an interval only', function() {
-    let duration = parseInterval('ms');
-    expect(duration.as('ms')).to.be(1);
-
-    duration = parseInterval('d');
-    expect(duration.as('d')).to.be(1);
-
-    duration = parseInterval('m');
-    expect(duration.as('m')).to.be(1);
-
-    duration = parseInterval('y');
-    expect(duration.as('y')).to.be(1);
-
-    duration = parseInterval('M');
-    expect(duration.as('M')).to.be(1);
-  });
-
-  it('should return null for an invalid interval', function() {
-    let duration = parseInterval('');
-    expect(duration).to.not.be.ok();
-
-    duration = parseInterval(null);
-    expect(duration).to.not.be.ok();
-
-    duration = parseInterval('234asdf');
-    expect(duration).to.not.be.ok();
-  });
-});
diff --git a/src/legacy/ui/public/utils/__tests__/sort_prefix_first.js b/src/legacy/ui/public/utils/__tests__/sort_prefix_first.js
deleted file mode 100644
index 721de95cbd27d..0000000000000
--- a/src/legacy/ui/public/utils/__tests__/sort_prefix_first.js
+++ /dev/null
@@ -1,87 +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 { sortPrefixFirst } from '../sort_prefix_first';
-
-describe('sortPrefixFirst', function() {
-  it('should return the original unmodified array if no prefix is provided', function() {
-    const array = ['foo', 'bar', 'baz'];
-    const result = sortPrefixFirst(array);
-    expect(result).to.be(array);
-    expect(result).to.eql(['foo', 'bar', 'baz']);
-  });
-
-  it('should sort items that match the prefix first without modifying the original array', function() {
-    const array = ['foo', 'bar', 'baz'];
-    const result = sortPrefixFirst(array, 'b');
-    expect(result).to.not.be(array);
-    expect(result).to.eql(['bar', 'baz', 'foo']);
-    expect(array).to.eql(['foo', 'bar', 'baz']);
-  });
-
-  it('should not modify the order of the array other than matching prefix without modifying the original array', function() {
-    const array = ['foo', 'bar', 'baz', 'qux', 'quux'];
-    const result = sortPrefixFirst(array, 'b');
-    expect(result).to.not.be(array);
-    expect(result).to.eql(['bar', 'baz', 'foo', 'qux', 'quux']);
-    expect(array).to.eql(['foo', 'bar', 'baz', 'qux', 'quux']);
-  });
-
-  it('should sort objects by property if provided', function() {
-    const array = [
-      { name: 'foo' },
-      { name: 'bar' },
-      { name: 'baz' },
-      { name: 'qux' },
-      { name: 'quux' },
-    ];
-    const result = sortPrefixFirst(array, 'b', 'name');
-    expect(result).to.not.be(array);
-    expect(result).to.eql([
-      { name: 'bar' },
-      { name: 'baz' },
-      { name: 'foo' },
-      { name: 'qux' },
-      { name: 'quux' },
-    ]);
-    expect(array).to.eql([
-      { name: 'foo' },
-      { name: 'bar' },
-      { name: 'baz' },
-      { name: 'qux' },
-      { name: 'quux' },
-    ]);
-  });
-
-  it('should handle numbers', function() {
-    const array = [1, 50, 5];
-    const result = sortPrefixFirst(array, 5);
-    expect(result).to.not.be(array);
-    expect(result).to.eql([50, 5, 1]);
-  });
-
-  it('should handle mixed case', function() {
-    const array = ['Date Histogram', 'Histogram'];
-    const prefix = 'histo';
-    const result = sortPrefixFirst(array, prefix);
-    expect(result).to.not.be(array);
-    expect(result).to.eql(['Histogram', 'Date Histogram']);
-  });
-});
diff --git a/src/legacy/ui/public/utils/case_conversion.ts b/src/legacy/ui/public/utils/case_conversion.ts
deleted file mode 100644
index e0c4cad6b4e94..0000000000000
--- a/src/legacy/ui/public/utils/case_conversion.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.
- */
-
-// TODO: This file is copied from src/legacy/utils/case_conversion.ts
-// because TS-imports from utils in ui are currently not possible.
-// When the build process is updated, this file can be removed
-
-import _ from 'lodash';
-
-export function keysToSnakeCaseShallow(object: Record<string, any>) {
-  return _.mapKeys(object, (value, key) => {
-    return _.snakeCase(key);
-  });
-}
-
-export function keysToCamelCaseShallow(object: Record<string, any>) {
-  return _.mapKeys(object, (value, key) => {
-    return _.camelCase(key);
-  });
-}
diff --git a/src/legacy/ui/public/utils/collection.test.ts b/src/legacy/ui/public/utils/collection.test.ts
new file mode 100644
index 0000000000000..0841e3554c0d0
--- /dev/null
+++ b/src/legacy/ui/public/utils/collection.test.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 { move } from './collection';
+
+describe('collection', () => {
+  describe('move', () => {
+    test('accepts previous from->to syntax', () => {
+      const list = [1, 1, 1, 1, 1, 1, 1, 1, 8, 1, 1];
+
+      expect(list[3]).toBe(1);
+      expect(list[8]).toBe(8);
+
+      move(list, 8, 3);
+
+      expect(list[8]).toBe(1);
+      expect(list[3]).toBe(8);
+    });
+
+    test('moves an object up based on a function callback', () => {
+      const list = [1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1];
+
+      expect(list[4]).toBe(0);
+      expect(list[5]).toBe(1);
+      expect(list[6]).toBe(0);
+
+      move(list, 5, false, (v: any) => v === 0);
+
+      expect(list[4]).toBe(1);
+      expect(list[5]).toBe(0);
+      expect(list[6]).toBe(0);
+    });
+
+    test('moves an object down based on a function callback', () => {
+      const list = [1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1];
+
+      expect(list[4]).toBe(0);
+      expect(list[5]).toBe(1);
+      expect(list[6]).toBe(0);
+
+      move(list, 5, true, (v: any) => v === 0);
+
+      expect(list[4]).toBe(0);
+      expect(list[5]).toBe(0);
+      expect(list[6]).toBe(1);
+    });
+
+    test('moves an object up based on a where callback', () => {
+      const list = [
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 0 },
+        { v: 1 },
+        { v: 0 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+      ];
+
+      expect(list[4]).toHaveProperty('v', 0);
+      expect(list[5]).toHaveProperty('v', 1);
+      expect(list[6]).toHaveProperty('v', 0);
+
+      move(list, 5, false, { v: 0 });
+
+      expect(list[4]).toHaveProperty('v', 1);
+      expect(list[5]).toHaveProperty('v', 0);
+      expect(list[6]).toHaveProperty('v', 0);
+    });
+
+    test('moves an object down based on a where callback', () => {
+      const list = [
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 0 },
+        { v: 1 },
+        { v: 0 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+        { v: 1 },
+      ];
+
+      expect(list[4]).toHaveProperty('v', 0);
+      expect(list[5]).toHaveProperty('v', 1);
+      expect(list[6]).toHaveProperty('v', 0);
+
+      move(list, 5, true, { v: 0 });
+
+      expect(list[4]).toHaveProperty('v', 0);
+      expect(list[5]).toHaveProperty('v', 0);
+      expect(list[6]).toHaveProperty('v', 1);
+    });
+
+    test('moves an object down based on a pluck callback', () => {
+      const list = [
+        { id: 0, normal: true },
+        { id: 1, normal: true },
+        { id: 2, normal: true },
+        { id: 3, normal: true },
+        { id: 4, normal: true },
+        { id: 5, normal: false },
+        { id: 6, normal: true },
+        { id: 7, normal: true },
+        { id: 8, normal: true },
+        { id: 9, normal: true },
+      ];
+
+      expect(list[4]).toHaveProperty('id', 4);
+      expect(list[5]).toHaveProperty('id', 5);
+      expect(list[6]).toHaveProperty('id', 6);
+
+      move(list, 5, true, 'normal');
+
+      expect(list[4]).toHaveProperty('id', 4);
+      expect(list[5]).toHaveProperty('id', 6);
+      expect(list[6]).toHaveProperty('id', 5);
+    });
+  });
+});
diff --git a/src/legacy/ui/public/utils/collection.ts b/src/legacy/ui/public/utils/collection.ts
index 61a7388575c93..45e5a0704c37b 100644
--- a/src/legacy/ui/public/utils/collection.ts
+++ b/src/legacy/ui/public/utils/collection.ts
@@ -33,10 +33,10 @@ import _ from 'lodash';
  * @return {array} - the objs argument
  */
 export function move(
-  objs: object[],
+  objs: any[],
   obj: object | number,
   below: number | boolean,
-  qualifier: (object: object, index: number) => any
+  qualifier?: ((object: object, index: number) => any) | Record<string, any> | string
 ): object[] {
   const origI = _.isNumber(obj) ? obj : objs.indexOf(obj);
   if (origI === -1) {
@@ -50,7 +50,7 @@ export function move(
   }
 
   below = !!below;
-  qualifier = _.callback(qualifier);
+  qualifier = qualifier && _.callback(qualifier);
 
   const above = !below;
   const finder = below ? _.findIndex : _.findLastIndex;
@@ -63,7 +63,7 @@ export function move(
     if (above && otherI >= origI) {
       return;
     }
-    return !!qualifier(otherAgg, otherI);
+    return Boolean(_.isFunction(qualifier) && qualifier(otherAgg, otherI));
   });
 
   if (targetI === -1) {
@@ -74,68 +74,3 @@ export function move(
   objs.splice(targetI, 0, objs.splice(origI, 1)[0]);
   return objs;
 }
-
-/**
- * Like _.groupBy, but allows specifying multiple groups for a
- * single object.
- *
- * organizeBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a')
- * // Object {1: Array[2], 2: Array[1], 3: Array[1], 4: Array[1]}
- *
- * _.groupBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a')
- * // Object {'1,2,3': Array[1], '1,4': Array[1]}
- *
- * @param  {array} collection - the list of values to organize
- * @param  {Function} callback - either a property name, or a callback.
- * @return {object}
- */
-export function organizeBy(collection: object[], callback: (obj: object) => string | string) {
-  const buckets: { [key: string]: object[] } = {};
-  const prop = typeof callback === 'function' ? false : callback;
-
-  function add(key: string, obj: object) {
-    if (!buckets[key]) {
-      buckets[key] = [];
-    }
-    buckets[key].push(obj);
-  }
-
-  _.each(collection, (obj: object) => {
-    const keys = prop === false ? callback(obj) : obj[prop];
-
-    if (!Array.isArray(keys)) {
-      add(keys, obj);
-      return;
-    }
-
-    let length = keys.length;
-    while (length-- > 0) {
-      add(keys[length], obj);
-    }
-  });
-
-  return buckets;
-}
-
-/**
- * Efficient and safe version of [].push(dest, source);
- *
- * @param  {Array} source - the array to pull values from
- * @param  {Array} dest   - the array to push values into
- * @return {Array} dest
- */
-export function pushAll(source: any[], dest: any[]): any[] {
-  const start = dest.length;
-  const adding = source.length;
-
-  // allocate - http://goo.gl/e2i0S0
-  dest.length = start + adding;
-
-  // fill sparse positions
-  let i = -1;
-  while (++i < adding) {
-    dest[start + i] = source[i];
-  }
-
-  return dest;
-}
diff --git a/src/legacy/ui/public/utils/diff_object.js b/src/legacy/ui/public/utils/diff_object.js
deleted file mode 100644
index ddad5e0ae42a0..0000000000000
--- a/src/legacy/ui/public/utils/diff_object.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 angular from 'angular';
-
-export function applyDiff(target, source) {
-  const diff = {};
-
-  /**
-   * Filter the private vars
-   * @param {string} key The keys
-   * @returns {boolean}
-   */
-  const filterPrivateAndMethods = function(obj) {
-    return function(key) {
-      if (_.isFunction(obj[key])) return false;
-      if (key.charAt(0) === '$') return false;
-      return key.charAt(0) !== '_';
-    };
-  };
-
-  const targetKeys = _.keys(target).filter(filterPrivateAndMethods(target));
-  const sourceKeys = _.keys(source).filter(filterPrivateAndMethods(source));
-
-  // Find the keys to be removed
-  diff.removed = _.difference(targetKeys, sourceKeys);
-
-  // Find the keys to be added
-  diff.added = _.difference(sourceKeys, targetKeys);
-
-  // Find the keys that will be changed
-  diff.changed = _.filter(sourceKeys, function(key) {
-    return !angular.equals(target[key], source[key]);
-  });
-
-  // Make a list of all the keys that are changing
-  diff.keys = _.union(diff.changed, diff.removed, diff.added);
-
-  // Remove all the keys
-  _.each(diff.removed, function(key) {
-    delete target[key];
-  });
-
-  // Assign the changed to the source to the target
-  _.assign(target, _.pick(source, diff.changed));
-  // Assign the added to the source to the target
-  _.assign(target, _.pick(source, diff.added));
-
-  return diff;
-}
diff --git a/src/legacy/ui/public/utils/function.js b/src/legacy/ui/public/utils/function.js
deleted file mode 100644
index f9e7777d08bfe..0000000000000
--- a/src/legacy/ui/public/utils/function.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 _ from 'lodash';
-
-/**
- * Call all of the function in an array
- *
- * @param  {array[functions]} arr
- * @return {undefined}
- */
-export function callEach(arr) {
-  return _.map(arr, function(fn) {
-    return _.isFunction(fn) ? fn() : undefined;
-  });
-}
diff --git a/src/legacy/ui/public/utils/math.test.ts b/src/legacy/ui/public/utils/math.test.ts
deleted file mode 100644
index 13f090e77647b..0000000000000
--- a/src/legacy/ui/public/utils/math.test.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 { greatestCommonDivisor, leastCommonMultiple } from './math';
-
-describe('math utils', () => {
-  describe('greatestCommonDivisor', () => {
-    const tests: Array<[number, number, number]> = [
-      [3, 5, 1],
-      [30, 36, 6],
-      [5, 1, 1],
-      [9, 9, 9],
-      [40, 20, 20],
-      [3, 0, 3],
-      [0, 5, 5],
-      [0, 0, 0],
-      [-9, -3, 3],
-      [-24, 8, 8],
-      [22, -7, 1],
-    ];
-
-    tests.map(([a, b, expected]) => {
-      it(`should return ${expected} for greatestCommonDivisor(${a}, ${b})`, () => {
-        expect(greatestCommonDivisor(a, b)).toBe(expected);
-      });
-    });
-  });
-
-  describe('leastCommonMultiple', () => {
-    const tests: Array<[number, number, number]> = [
-      [3, 5, 15],
-      [1, 1, 1],
-      [5, 6, 30],
-      [3, 9, 9],
-      [8, 20, 40],
-      [5, 5, 5],
-      [0, 5, 0],
-      [-4, -5, 20],
-      [-2, -3, 6],
-      [-8, 2, 8],
-      [-8, 5, 40],
-    ];
-
-    tests.map(([a, b, expected]) => {
-      it(`should return ${expected} for leastCommonMultiple(${a}, ${b})`, () => {
-        expect(leastCommonMultiple(a, b)).toBe(expected);
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/utils/math.ts b/src/legacy/ui/public/utils/math.ts
deleted file mode 100644
index e0cab4236e2b8..0000000000000
--- a/src/legacy/ui/public/utils/math.ts
+++ /dev/null
@@ -1,42 +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.
- */
-
-/**
- * Calculates the greates common divisor of two numbers. This will be the
- * greatest positive integer number, that both input values share as a divisor.
- *
- * This method does not properly work for fractional (non integer) numbers. If you
- * pass in fractional numbers there usually will be an output, but that's not necessarily
- * the greatest common divisor of those two numbers.
- */
-export function greatestCommonDivisor(a: number, b: number): number {
-  return a === 0 ? Math.abs(b) : greatestCommonDivisor(b % a, a);
-}
-
-/**
- * Calculates the least common multiple of two numbers. The least common multiple
- * is the smallest positive integer number, that is divisible by both input parameters.
- *
- * Since this calculation suffers from rounding issues in decimal values, this method
- * won't work for passing in fractional (non integer) numbers. It will return a value,
- * but that value won't necessarily be the mathematical correct least common multiple.
- */
-export function leastCommonMultiple(a: number, b: number): number {
-  return Math.abs((a * b) / greatestCommonDivisor(a, b));
-}
diff --git a/src/legacy/ui/public/utils/parse_interval.d.ts b/src/legacy/ui/public/utils/parse_interval.d.ts
deleted file mode 100644
index 9d78b4ef6cddf..0000000000000
--- a/src/legacy/ui/public/utils/parse_interval.d.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 moment from 'moment';
-
-export function parseInterval(interval: string): moment.Duration | null;
diff --git a/src/legacy/ui/public/utils/parse_interval.js b/src/legacy/ui/public/utils/parse_interval.js
deleted file mode 100644
index fe484985ef101..0000000000000
--- a/src/legacy/ui/public/utils/parse_interval.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 _ from 'lodash';
-import moment from 'moment';
-import dateMath from '@elastic/datemath';
-
-// Assume interval is in the form (value)(unit), such as "1h"
-const INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$');
-
-export function parseInterval(interval) {
-  const matches = String(interval)
-    .trim()
-    .match(INTERVAL_STRING_RE);
-
-  if (!matches) return null;
-
-  try {
-    const value = parseFloat(matches[1]) || 1;
-    const unit = matches[2];
-
-    const duration = moment.duration(value, unit);
-
-    // There is an error with moment, where if you have a fractional interval between 0 and 1, then when you add that
-    // interval to an existing moment object, it will remain unchanged, which causes problems in the ordered_x_keys
-    // code. To counteract this, we find the first unit that doesn't result in a value between 0 and 1.
-    // For example, if you have '0.5d', then when calculating the x-axis series, we take the start date and begin
-    // adding 0.5 days until we hit the end date. However, since there is a bug in moment, when you add 0.5 days to
-    // the start date, you get the same exact date (instead of being ahead by 12 hours). So instead of returning
-    // a duration corresponding to 0.5 hours, we return a duration corresponding to 12 hours.
-    const selectedUnit = _.find(dateMath.units, function(unit) {
-      return Math.abs(duration.as(unit)) >= 1;
-    });
-
-    return moment.duration(duration.as(selectedUnit), selectedUnit);
-  } catch (e) {
-    return null;
-  }
-}
diff --git a/src/legacy/ui/public/utils/sort_prefix_first.ts b/src/legacy/ui/public/utils/sort_prefix_first.ts
deleted file mode 100644
index 4d1a8d7f39866..0000000000000
--- a/src/legacy/ui/public/utils/sort_prefix_first.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { partition } from 'lodash';
-
-export function sortPrefixFirst(array: any[], prefix?: string | number, property?: string): any[] {
-  if (!prefix) {
-    return array;
-  }
-  const lowerCasePrefix = ('' + prefix).toLowerCase();
-
-  const partitions = partition(array, entry => {
-    const value = ('' + (property ? entry[property] : entry)).toLowerCase();
-    return value.startsWith(lowerCasePrefix);
-  });
-  return [...partitions[0], ...partitions[1]];
-}
diff --git a/src/legacy/ui/public/utils/string_utils.ts b/src/legacy/ui/public/utils/string_utils.ts
deleted file mode 100644
index 22a57aeb07933..0000000000000
--- a/src/legacy/ui/public/utils/string_utils.ts
+++ /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.
- */
-
-export class StringUtils {
-  /**
-   * Returns a version of the string with the first letter capitalized.
-   * @param str {string}
-   * @returns {string}
-   */
-  public static upperFirst(str: string): string {
-    return str ? str.charAt(0).toUpperCase() + str.slice(1) : '';
-  }
-}
diff --git a/src/legacy/ui/public/utils/supports.js b/src/legacy/ui/public/utils/supports.js
deleted file mode 100644
index 19c5f34d97f36..0000000000000
--- a/src/legacy/ui/public/utils/supports.js
+++ /dev/null
@@ -1,43 +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';
-
-/**
- * just a place to put feature detection checks
- */
-export const supports = {
-  cssFilters: (function() {
-    const e = document.createElement('img');
-    const rules = ['webkitFilter', 'mozFilter', 'msFilter', 'filter'];
-    const test = 'grayscale(1)';
-    rules.forEach(function(rule) {
-      e.style[rule] = test;
-    });
-
-    document.body.appendChild(e);
-    const styles = window.getComputedStyle(e);
-    const can = _(styles)
-      .pick(rules)
-      .includes(test);
-    document.body.removeChild(e);
-
-    return can;
-  })(),
-};
diff --git a/src/legacy/ui/public/vis/editors/config/editor_config_providers.ts b/src/legacy/ui/public/vis/editors/config/editor_config_providers.ts
index 3dd911efc324c..c7fb937b97424 100644
--- a/src/legacy/ui/public/vis/editors/config/editor_config_providers.ts
+++ b/src/legacy/ui/public/vis/editors/config/editor_config_providers.ts
@@ -20,8 +20,8 @@
 import { TimeIntervalParam } from 'ui/vis/editors/config/types';
 import { AggConfig } from '../..';
 import { AggType } from '../../../agg_types';
-import { IndexPattern } from '../../../index_patterns';
-import { leastCommonMultiple } from '../../../utils/math';
+import { IndexPattern } from '../../../../../../plugins/data/public';
+import { leastCommonMultiple } from '../../lib/least_common_multiple';
 import { parseEsInterval } from '../../../../../core_plugins/data/public';
 import { leastCommonInterval } from '../../lib/least_common_interval';
 import { EditorConfig, EditorParamConfig, FixedParam, NumericIntervalParam } from './types';
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 661ece5944fa3..c19f101fa2c32 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
@@ -24,8 +24,8 @@ import { AggGroupNames } from '../agg_groups';
 import { DefaultEditorAgg, DefaultEditorAggProps } from './agg';
 import { act } from 'react-dom/test-utils';
 import { DefaultEditorAggParams } from './agg_params';
-import { IndexPattern } from 'ui/index_patterns';
 import { AggType } from 'ui/agg_types';
+import { IndexPattern } from '../../../../../../../plugins/data/public';
 
 jest.mock('./agg_params', () => ({
   DefaultEditorAggParams: () => null,
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_param_props.ts b/src/legacy/ui/public/vis/editors/default/components/agg_param_props.ts
index aafba008f97c5..df77ea9e43eab 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_param_props.ts
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_param_props.ts
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-import { Field } from 'ui/index_patterns';
 import { AggParam } from 'ui/agg_types';
 import { AggConfig } from '../../../../agg_types/agg_config';
 import { ComboBoxGroupedOptions } from '../utils';
 import { EditorConfig } from '../../config/types';
 import { VisState } from '../../..';
 import { SubAggParamsProp } from './agg_params';
+import { Field } from '../../../../../../../plugins/data/public';
 
 // NOTE: we cannot export the interface with export { InterfaceName }
 // as there is currently a bug on babel typescript transform plugin for it
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_params.test.tsx b/src/legacy/ui/public/vis/editors/default/components/agg_params.test.tsx
index 25e2db8ef1836..9f3f5bff3f56e 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_params.test.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_params.test.tsx
@@ -19,9 +19,9 @@
 
 import React from 'react';
 import { mount, shallow } from 'enzyme';
-import { IndexPattern } from 'ui/index_patterns';
 import { AggConfig, VisState } from '../../..';
 import { DefaultEditorAggParams, DefaultEditorAggParamsProps } from './agg_params';
+import { IndexPattern } from '../../../../../../../plugins/data/public';
 
 const mockEditorConfig = {
   useNormalizedEsInterval: { hidden: false, fixedValue: false },
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 4f4c0bda6520a..c62e2837908c7 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
@@ -20,10 +20,11 @@
 import React, { useReducer, useEffect, useMemo } from 'react';
 import { EuiForm, EuiAccordion, EuiSpacer, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import useUnmount from 'react-use/lib/useUnmount';
 
 import { VisState } from 'ui/vis';
 import { aggTypes, AggType, AggParam, AggConfig } from 'ui/agg_types/';
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../../../../plugins/data/public';
 
 import { DefaultEditorAggSelect } from './agg_select';
 import { DefaultEditorAggParam } from './agg_param';
@@ -44,9 +45,6 @@ import {
 } from './agg_params_state';
 import { editorConfigProviders } from '../../config/editor_config_providers';
 import { FixedParam, TimeIntervalParam, EditorParamConfig } from '../../config/types';
-// TODO: Below import is temporary, use `react-use` lib instead.
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { useUnmount } from '../../../../../../../plugins/kibana_react/public/util/use_unmount';
 import { AggGroupNames } from '../agg_groups';
 import { OnAggParamsChange } from './agg_common_props';
 
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_params_helper.test.ts b/src/legacy/ui/public/vis/editors/default/components/agg_params_helper.test.ts
index eb6bef4887642..fb37dd5d94618 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_params_helper.test.ts
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_params_helper.test.ts
@@ -19,7 +19,6 @@
 
 import { AggConfig, VisState } from '../../..';
 import { AggType } from 'ui/agg_types';
-import { IndexPattern, Field } from 'ui/index_patterns';
 import { IndexedArray } from 'ui/indexed_array';
 import {
   getAggParamsToRender,
@@ -28,6 +27,7 @@ import {
   isInvalidParamsTouched,
 } from './agg_params_helper';
 import { EditorConfig } from '../../config/types';
+import { IndexPattern, Field } from '../../../../../../../plugins/data/public';
 
 jest.mock('ui/agg_types', () => ({
   aggTypes: {
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_params_helper.ts b/src/legacy/ui/public/vis/editors/default/components/agg_params_helper.ts
index d233f561940da..e0e014f69ef3f 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_params_helper.ts
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_params_helper.ts
@@ -20,7 +20,6 @@
 import { get, isEmpty } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { aggTypeFilters } from 'ui/agg_types/filter';
-import { IndexPattern, Field } from 'ui/index_patterns';
 import { aggTypes, AggParam, FieldParamType, AggType } from 'ui/agg_types';
 import { aggTypeFieldFilters } from 'ui/agg_types/param_types/filter';
 import { AggConfig, VisState } from '../../..';
@@ -28,6 +27,7 @@ import { groupAndSortBy, ComboBoxGroupedOptions } from '../utils';
 import { EditorConfig } from '../../config/types';
 import { AggTypeState, AggParamsState } from './agg_params_state';
 import { AggParamEditorProps } from './agg_param_props';
+import { IndexPattern, Field } from '../../../../../../../plugins/data/public';
 
 interface ParamInstanceBase {
   agg: AggConfig;
diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_select.tsx b/src/legacy/ui/public/vis/editors/default/components/agg_select.tsx
index 2934711b2357a..443c655912a55 100644
--- a/src/legacy/ui/public/vis/editors/default/components/agg_select.tsx
+++ b/src/legacy/ui/public/vis/editors/default/components/agg_select.tsx
@@ -23,9 +23,9 @@ import { EuiComboBox, EuiComboBoxOptionProps, EuiFormRow, EuiLink, EuiText } fro
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { AggType } from 'ui/agg_types';
-import { IndexPattern } from 'ui/index_patterns';
 import { documentationLinks } from '../../../../documentation_links/documentation_links';
 import { ComboBoxGroupedOptions } from '../utils';
+import { IndexPattern } from '../../../../../../../plugins/data/public';
 
 interface DefaultEditorAggSelectProps {
   aggError?: string;
diff --git a/src/legacy/ui/public/vis/editors/default/controls/__snapshots__/extended_bounds.test.tsx.snap b/src/legacy/ui/public/vis/editors/default/controls/__snapshots__/extended_bounds.test.tsx.snap
index 37783dc01492d..25824c3b59fb0 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/__snapshots__/extended_bounds.test.tsx.snap
+++ b/src/legacy/ui/public/vis/editors/default/controls/__snapshots__/extended_bounds.test.tsx.snap
@@ -21,7 +21,6 @@ exports[`ExtendedBoundsParamEditor should be rendered with default set of props
         compressed={true}
         fullWidth={true}
         isInvalid={false}
-        isLoading={false}
         onChange={[Function]}
         prepend="Min"
         value=""
@@ -33,7 +32,6 @@ exports[`ExtendedBoundsParamEditor should be rendered with default set of props
         compressed={true}
         fullWidth={true}
         isInvalid={false}
-        isLoading={false}
         onChange={[Function]}
         prepend="Max"
         value=""
diff --git a/src/legacy/ui/public/vis/editors/default/controls/__snapshots__/size.test.tsx.snap b/src/legacy/ui/public/vis/editors/default/controls/__snapshots__/size.test.tsx.snap
index 024865ec733d6..a2897ad417bae 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/__snapshots__/size.test.tsx.snap
+++ b/src/legacy/ui/public/vis/editors/default/controls/__snapshots__/size.test.tsx.snap
@@ -25,7 +25,6 @@ exports[`SizeParamEditor should init with the default set of props 1`] = `
     data-test-subj="sizeParamEditor"
     fullWidth={true}
     isInvalid={false}
-    isLoading={false}
     min={1}
     onBlur={[MockFunction]}
     onChange={[Function]}
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
index 3882425594cf3..6b2f160e417a0 100644
--- 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
@@ -13,7 +13,6 @@ exports[`NumberRow should be rendered with default set of props 1`] = `
       compressed={true}
       fullWidth={true}
       isInvalid={false}
-      isLoading={false}
       max={10}
       min={1}
       onBlur={[MockFunction]}
diff --git a/src/legacy/ui/public/vis/editors/default/controls/field.test.tsx b/src/legacy/ui/public/vis/editors/default/controls/field.test.tsx
index aac32e28c80a5..4d15ac8e80e63 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/field.test.tsx
+++ b/src/legacy/ui/public/vis/editors/default/controls/field.test.tsx
@@ -21,7 +21,7 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { mount, shallow, ReactWrapper } from 'enzyme';
 import { EuiComboBoxProps, EuiComboBox } from '@elastic/eui';
-import { Field } from '../../../../index_patterns';
+import { Field } from '../../../../../../../plugins/data/public';
 import { ComboBoxGroupedOptions, SubAggParamsProp } from '..';
 import { FieldParamEditor, FieldParamEditorProps } from './field';
 import { AggConfig, VisState } from '../../..';
diff --git a/src/legacy/ui/public/vis/editors/default/controls/field.tsx b/src/legacy/ui/public/vis/editors/default/controls/field.tsx
index a96be3a14b7ef..75a9e24cd0dee 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/field.tsx
+++ b/src/legacy/ui/public/vis/editors/default/controls/field.tsx
@@ -23,7 +23,7 @@ import React, { useEffect } from 'react';
 import { EuiComboBox, EuiComboBoxOptionProps, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { AggConfig } from '../../..';
-import { Field } from '../../../../index_patterns';
+import { Field } from '../../../../../../../plugins/data/public';
 import { formatListAsProse, parseCommaSeparatedList } from '../../../../../../utils';
 import { AggParam, FieldParamType } from '../../../../agg_types';
 import { AggParamEditorProps, ComboBoxGroupedOptions } from '..';
diff --git a/src/legacy/ui/public/vis/editors/default/controls/top_field.tsx b/src/legacy/ui/public/vis/editors/default/controls/top_field.tsx
index 5a5f2ceee3a56..e15187621954f 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/top_field.tsx
+++ b/src/legacy/ui/public/vis/editors/default/controls/top_field.tsx
@@ -19,7 +19,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { Field } from '../../../../index_patterns';
+import { Field } from '../../../../../../../plugins/data/public';
 import { FieldParamEditor } from './field';
 import { getCompatibleAggs } from './top_aggregate';
 import { AggParamEditorProps } from '..';
diff --git a/src/legacy/ui/public/vis/editors/default/controls/top_sort_field.tsx b/src/legacy/ui/public/vis/editors/default/controls/top_sort_field.tsx
index 4116ae878209e..905bd052ec695 100644
--- a/src/legacy/ui/public/vis/editors/default/controls/top_sort_field.tsx
+++ b/src/legacy/ui/public/vis/editors/default/controls/top_sort_field.tsx
@@ -19,7 +19,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { Field } from '../../../../index_patterns';
+import { Field } from '../../../../../../../plugins/data/public';
 import { FieldParamEditor } from './field';
 import { AggParamEditorProps } from '..';
 
diff --git a/src/legacy/ui/public/vis/editors/default/vis_type_agg_filter.ts b/src/legacy/ui/public/vis/editors/default/vis_type_agg_filter.ts
index 5842d7579f60a..c64907fff58a1 100644
--- a/src/legacy/ui/public/vis/editors/default/vis_type_agg_filter.ts
+++ b/src/legacy/ui/public/vis/editors/default/vis_type_agg_filter.ts
@@ -18,7 +18,7 @@
  */
 import { AggType } from '../../../agg_types';
 import { aggTypeFilters, propFilter } from '../../../agg_types/filter';
-import { IndexPattern } from '../../../index_patterns';
+import { IndexPattern } from '../../../../../../plugins/data/public';
 import { AggConfig } from '../../../vis';
 
 const filterByName = propFilter('name');
diff --git a/src/legacy/ui/public/vis/lib/least_common_interval.ts b/src/legacy/ui/public/vis/lib/least_common_interval.ts
index dfdb099249228..244bc1d0111e3 100644
--- a/src/legacy/ui/public/vis/lib/least_common_interval.ts
+++ b/src/legacy/ui/public/vis/lib/least_common_interval.ts
@@ -18,7 +18,7 @@
  */
 
 import dateMath from '@elastic/datemath';
-import { leastCommonMultiple } from '../../utils/math';
+import { leastCommonMultiple } from './least_common_multiple';
 import { parseEsInterval } from '../../../../core_plugins/data/public';
 
 /**
diff --git a/src/legacy/ui/public/vis/lib/least_common_multiple.test.ts b/src/legacy/ui/public/vis/lib/least_common_multiple.test.ts
new file mode 100644
index 0000000000000..d07ac96b5f4d5
--- /dev/null
+++ b/src/legacy/ui/public/vis/lib/least_common_multiple.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 { leastCommonMultiple } from './least_common_multiple';
+
+describe('leastCommonMultiple', () => {
+  const tests: Array<[number, number, number]> = [
+    [3, 5, 15],
+    [1, 1, 1],
+    [5, 6, 30],
+    [3, 9, 9],
+    [8, 20, 40],
+    [5, 5, 5],
+    [0, 5, 0],
+    [-4, -5, 20],
+    [-2, -3, 6],
+    [-8, 2, 8],
+    [-8, 5, 40],
+  ];
+
+  tests.map(([a, b, expected]) => {
+    test(`should return ${expected} for leastCommonMultiple(${a}, ${b})`, () => {
+      expect(leastCommonMultiple(a, b)).toBe(expected);
+    });
+  });
+});
diff --git a/src/legacy/ui/public/vis/lib/least_common_multiple.ts b/src/legacy/ui/public/vis/lib/least_common_multiple.ts
new file mode 100644
index 0000000000000..dedddbf22ab44
--- /dev/null
+++ b/src/legacy/ui/public/vis/lib/least_common_multiple.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.
+ */
+
+/**
+ * Calculates the greates common divisor of two numbers. This will be the
+ * greatest positive integer number, that both input values share as a divisor.
+ *
+ * This method does not properly work for fractional (non integer) numbers. If you
+ * pass in fractional numbers there usually will be an output, but that's not necessarily
+ * the greatest common divisor of those two numbers.
+ *
+ * @private
+ */
+function greatestCommonDivisor(a: number, b: number): number {
+  return a === 0 ? Math.abs(b) : greatestCommonDivisor(b % a, a);
+}
+
+/**
+ * Calculates the least common multiple of two numbers. The least common multiple
+ * is the smallest positive integer number, that is divisible by both input parameters.
+ *
+ * Since this calculation suffers from rounding issues in decimal values, this method
+ * won't work for passing in fractional (non integer) numbers. It will return a value,
+ * but that value won't necessarily be the mathematical correct least common multiple.
+ *
+ * @internal
+ */
+export function leastCommonMultiple(a: number, b: number): number {
+  return Math.abs((a * b) / greatestCommonDivisor(a, b));
+}
diff --git a/src/legacy/ui/public/vis/vis_types/vislib_vis_legend/__snapshots__/vislib_vis_legend.test.tsx.snap b/src/legacy/ui/public/vis/vis_types/vislib_vis_legend/__snapshots__/vislib_vis_legend.test.tsx.snap
index f2c9f4e1b53ec..9b2b633fd0e16 100644
--- a/src/legacy/ui/public/vis/vis_types/vislib_vis_legend/__snapshots__/vislib_vis_legend.test.tsx.snap
+++ b/src/legacy/ui/public/vis/vis_types/vislib_vis_legend/__snapshots__/vislib_vis_legend.test.tsx.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`VisLegend Component Legend closed should match the snapshot 1`] = `"<div class=\\"visLegend\\"><button type=\\"button\\" class=\\"visLegend__toggle kbn-resetFocusState\\" aria-label=\\"Toggle legend\\" aria-expanded=\\"false\\" aria-controls=\\"legendId\\" data-test-subj=\\"vislibToggleLegend\\" title=\\"Toggle legend\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon--text euiIcon-isLoaded\\" focusable=\\"false\\"><path d=\\"M2 4V3h2v1H2zm4 0V3h8v1H6zm0 3V6h8v1H6zm0 3V9h8v1H6zM2 7V6h2v1H2zm0 3V9h2v1H2zm4 3v-1h8v1H6zm-4 0v-1h2v1H2z\\"></path></svg></button></div>"`;
+exports[`VisLegend Component Legend closed should match the snapshot 1`] = `"<div class=\\"visLegend\\"><button type=\\"button\\" class=\\"visLegend__toggle kbn-resetFocusState\\" aria-label=\\"Toggle legend\\" aria-expanded=\\"false\\" aria-controls=\\"legendId\\" data-test-subj=\\"vislibToggleLegend\\" title=\\"Toggle legend\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon--text euiIcon-isLoaded\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path d=\\"M2 4V3h2v1H2zm4 0V3h8v1H6zm0 3V6h8v1H6zm0 3V9h8v1H6zM2 7V6h2v1H2zm0 3V9h2v1H2zm4 3v-1h8v1H6zm-4 0v-1h2v1H2z\\"></path></svg></button></div>"`;
 
-exports[`VisLegend Component Legend open should match the snapshot 1`] = `"<div class=\\"visLegend\\"><button type=\\"button\\" class=\\"visLegend__toggle kbn-resetFocusState visLegend__toggle--isOpen\\" aria-label=\\"Toggle legend\\" aria-expanded=\\"true\\" aria-controls=\\"legendId\\" data-test-subj=\\"vislibToggleLegend\\" title=\\"Toggle legend\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon--text euiIcon-isLoaded\\" focusable=\\"false\\"><path d=\\"M2 4V3h2v1H2zm4 0V3h8v1H6zm0 3V6h8v1H6zm0 3V9h8v1H6zM2 7V6h2v1H2zm0 3V9h2v1H2zm4 3v-1h8v1H6zm-4 0v-1h2v1H2z\\"></path></svg></button><ul class=\\"visLegend__list\\" id=\\"legendId\\"><li class=\\"visLegend__value\\"><div class=\\"euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--flushLeft visLegend__button\\" type=\\"button\\" data-label=\\"A\\" title=\\"A\\" aria-label=\\"A, toggle options\\" data-test-subj=\\"legend-A\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" style=\\"fill: red;\\" focusable=\\"false\\" data-test-subj=\\"legendSelectedColor-red\\"><circle cx=\\"8\\" cy=\\"8\\" r=\\"4\\"></circle></svg><span class=\\"visLegend__valueTitle\\">A</span></span></span></button></div></div></li><li class=\\"visLegend__value\\"><div class=\\"euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--flushLeft visLegend__button\\" type=\\"button\\" data-label=\\"B\\" title=\\"B\\" aria-label=\\"B, toggle options\\" data-test-subj=\\"legend-B\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" style=\\"fill: red;\\" focusable=\\"false\\" data-test-subj=\\"legendSelectedColor-red\\"><circle cx=\\"8\\" cy=\\"8\\" r=\\"4\\"></circle></svg><span class=\\"visLegend__valueTitle\\">B</span></span></span></button></div></div></li></ul></div>"`;
+exports[`VisLegend Component Legend open should match the snapshot 1`] = `"<div class=\\"visLegend\\"><button type=\\"button\\" class=\\"visLegend__toggle kbn-resetFocusState visLegend__toggle--isOpen\\" aria-label=\\"Toggle legend\\" aria-expanded=\\"true\\" aria-controls=\\"legendId\\" data-test-subj=\\"vislibToggleLegend\\" title=\\"Toggle legend\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon--text euiIcon-isLoaded\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path d=\\"M2 4V3h2v1H2zm4 0V3h8v1H6zm0 3V6h8v1H6zm0 3V9h8v1H6zM2 7V6h2v1H2zm0 3V9h2v1H2zm4 3v-1h8v1H6zm-4 0v-1h2v1H2z\\"></path></svg></button><ul class=\\"visLegend__list\\" id=\\"legendId\\"><li class=\\"visLegend__value\\"><div class=\\"euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--flushLeft visLegend__button\\" type=\\"button\\" data-label=\\"A\\" title=\\"A\\" aria-label=\\"A, toggle options\\" data-test-subj=\\"legend-A\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" style=\\"fill: red;\\" focusable=\\"false\\" role=\\"img\\" data-test-subj=\\"legendSelectedColor-red\\" aria-hidden=\\"true\\"><title></title><circle cx=\\"8\\" cy=\\"8\\" r=\\"4\\"></circle></svg><span class=\\"visLegend__valueTitle\\">A</span></span></span></button></div></div></li><li class=\\"visLegend__value\\"><div class=\\"euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--flushLeft visLegend__button\\" type=\\"button\\" data-label=\\"B\\" title=\\"B\\" aria-label=\\"B, toggle options\\" data-test-subj=\\"legend-B\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" style=\\"fill: red;\\" focusable=\\"false\\" role=\\"img\\" data-test-subj=\\"legendSelectedColor-red\\" aria-hidden=\\"true\\"><title></title><circle cx=\\"8\\" cy=\\"8\\" r=\\"4\\"></circle></svg><span class=\\"visLegend__valueTitle\\">B</span></span></span></button></div></div></li></ul></div>"`;
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 d754c1d395595..0b99810a85afe 100644
--- a/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
+++ b/src/legacy/ui/public/visualize/loader/pipeline_helpers/utilities.ts
@@ -23,7 +23,7 @@ import { AggConfig, Vis } from 'ui/vis';
 import { npStart } from 'ui/new_platform';
 import { SerializedFieldFormat } from 'src/plugins/expressions/public';
 
-import { IFieldFormatId, FieldFormat } from '../../../../../../plugins/data/public';
+import { IFieldFormatId, FieldFormat, ContentType } from '../../../../../../plugins/data/public';
 
 import { tabifyGetColumns } from '../../../agg_response/tabify/_get_columns';
 import { DateRangeKey, convertDateRangeToString } from '../../../agg_types/buckets/date_range';
@@ -129,42 +129,23 @@ export const getFormat: FormatFactory = mapping => {
     });
     return new IpRangeFormat();
   } else if (isTermsFieldFormat(mapping) && mapping.params) {
-    const params = mapping.params;
+    const { params } = mapping;
+    const convert = (val: string, type: ContentType) => {
+      const format = getFieldFormat(params.id, mapping.params);
+
+      if (val === '__other__') {
+        return params.otherBucketLabel;
+      }
+      if (val === '__missing__') {
+        return params.missingBucketLabel;
+      }
+
+      return format.convert(val, type);
+    };
+
     return {
-      getConverterFor: (type: string) => {
-        const format = getFieldFormat(params.id, mapping.params);
-        return (val: string) => {
-          if (val === '__other__') {
-            return params.otherBucketLabel;
-          }
-          if (val === '__missing__') {
-            return params.missingBucketLabel;
-          }
-          const parsedUrl = {
-            origin: window.location.origin,
-            pathname: window.location.pathname,
-            basePath: npStart.core.http.basePath,
-          };
-          // @ts-ignore
-          return format.convert(val, undefined, undefined, parsedUrl);
-        };
-      },
-      convert: (val: string, type: string) => {
-        const format = getFieldFormat(params.id, mapping.params);
-        if (val === '__other__') {
-          return params.otherBucketLabel;
-        }
-        if (val === '__missing__') {
-          return params.missingBucketLabel;
-        }
-        const parsedUrl = {
-          origin: window.location.origin,
-          pathname: window.location.pathname,
-          basePath: npStart.core.http.basePath,
-        };
-        // @ts-ignore
-        return format.convert(val, type, undefined, parsedUrl);
-      },
+      convert,
+      getConverterFor: (type: ContentType) => (val: string) => convert(val, type),
     } as FieldFormat;
   } else {
     return getFieldFormat(id, mapping.params);
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 a9203415321fa..5054c34118f78 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
@@ -24,13 +24,13 @@ import { toastNotifications } from 'ui/notify';
 import { AggConfig } from 'ui/vis';
 import { timefilter } from 'ui/timefilter';
 import { Vis } from '../../../vis';
-import { SearchSource, SearchSourceContract } from '../../../courier';
+import { SearchSource, ISearchSource } from '../../../courier';
 import { esFilters, Query } from '../../../../../../plugins/data/public';
 
 interface QueryGeohashBoundsParams {
   filters?: esFilters.Filter[];
   query?: Query;
-  searchSource?: SearchSourceContract;
+  searchSource?: ISearchSource;
 }
 
 /**
diff --git a/src/legacy/ui/ui_apps/ui_apps_mixin.js b/src/legacy/ui/ui_apps/ui_apps_mixin.js
index 9b8d2ef8ba6c4..5165c9859fec5 100644
--- a/src/legacy/ui/ui_apps/ui_apps_mixin.js
+++ b/src/legacy/ui/ui_apps/ui_apps_mixin.js
@@ -19,6 +19,15 @@
 
 import { UiApp } from './ui_app';
 
+/**
+ * @typedef {import('../../server/kbn_server').default} KbnServer
+ */
+
+/**
+ *
+ * @param {KbnServer} kbnServer
+ * @param {KbnServer['server']} server
+ */
 export function uiAppsMixin(kbnServer, server) {
   const { uiAppSpecs = [] } = kbnServer.uiExports;
   const existingIds = new Set();
@@ -47,21 +56,12 @@ export function uiAppsMixin(kbnServer, server) {
   server.decorate('server', 'getAllUiApps', () => kbnServer.uiApps.slice(0));
   server.decorate('server', 'getUiAppById', id => appsById.get(id));
   server.decorate('server', 'getHiddenUiAppById', id => hiddenAppsById.get(id));
-
-  const injectedVarProviders = [];
-  server.decorate('server', 'injectUiAppVars', (appId, provider) => {
-    injectedVarProviders.push({ appId, provider });
-  });
-
-  server.decorate('server', 'getInjectedUiAppVars', async appId => {
-    return await injectedVarProviders
-      .filter(p => p.appId === appId)
-      .reduce(
-        async (acc, { provider }) => ({
-          ...(await acc),
-          ...(await provider(server)),
-        }),
-        {}
-      );
-  });
+  server.decorate('server', 'injectUiAppVars', (appId, provider) =>
+    kbnServer.newPlatform.__internals.legacy.injectUiAppVars(appId, provider)
+  );
+  server.decorate(
+    'server',
+    'getInjectedUiAppVars',
+    async appId => await kbnServer.newPlatform.__internals.legacy.getInjectedUiAppVars(appId)
+  );
 }
diff --git a/src/legacy/ui/ui_apps/ui_apps_mixin.test.js b/src/legacy/ui/ui_apps/ui_apps_mixin.test.js
index 595283f85564a..048358edfc10b 100644
--- a/src/legacy/ui/ui_apps/ui_apps_mixin.test.js
+++ b/src/legacy/ui/ui_apps/ui_apps_mixin.test.js
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { LegacyInternals } from '../../../core/server';
+
 import { uiAppsMixin } from './ui_apps_mixin';
 
 jest.mock('./ui_app', () => ({
@@ -37,23 +39,21 @@ jest.mock('./ui_app', () => ({
 describe('UiAppsMixin', () => {
   let kbnServer;
   let server;
+  let uiExports;
 
   beforeEach(() => {
-    kbnServer = {
-      uiExports: {
-        uiAppSpecs: [
-          {
-            id: 'foo',
-            hidden: true,
-          },
-          {
-            id: 'bar',
-            hidden: false,
-          },
-        ],
-      },
+    uiExports = {
+      uiAppSpecs: [
+        {
+          id: 'foo',
+          hidden: true,
+        },
+        {
+          id: 'bar',
+          hidden: false,
+        },
+      ],
     };
-
     server = {
       decorate: jest.fn((type, name, value) => {
         if (type !== 'server') {
@@ -63,6 +63,14 @@ describe('UiAppsMixin', () => {
         server[name] = value;
       }),
     };
+    kbnServer = {
+      uiExports,
+      newPlatform: {
+        __internals: {
+          legacy: new LegacyInternals(uiExports, {}, server),
+        },
+      },
+    };
 
     uiAppsMixin(kbnServer, server);
   });
diff --git a/src/legacy/ui/ui_bundles/app_entry_template.js b/src/legacy/ui/ui_bundles/app_entry_template.js
index 6e270b24ff4a9..f0ca97f473324 100644
--- a/src/legacy/ui/ui_bundles/app_entry_template.js
+++ b/src/legacy/ui/ui_bundles/app_entry_template.js
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { apmImport, apmInit } from '../apm';
+
 export const appEntryTemplate = bundle => `
 /**
  * Kibana entry file
@@ -34,12 +36,14 @@ import 'custom-event-polyfill';
 import 'whatwg-fetch';
 import 'abortcontroller-polyfill';
 import 'childnode-remove-polyfill';
-
+${apmImport()}
 import { i18n } from '@kbn/i18n';
 import { CoreSystem } from '__kibanaCore__'
 
 const injectedMetadata = JSON.parse(document.querySelector('kbn-injected-metadata').getAttribute('data'));
 
+${apmInit('injectedMetadata.vars.apmConfig')}
+
 i18n.load(injectedMetadata.i18n.translationsUrl)
   .catch(e => e)
   .then((i18nError) => {
diff --git a/src/legacy/ui/ui_exports/collect_ui_exports.ts b/src/legacy/ui/ui_exports/collect_ui_exports.ts
index bfb290ffb3615..edb2a11dc0527 100644
--- a/src/legacy/ui/ui_exports/collect_ui_exports.ts
+++ b/src/legacy/ui/ui_exports/collect_ui_exports.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsLegacyUiExports } from 'src/core/server/types';
+import { LegacyUiExports } from '../../../core/server';
+
 // @ts-ignore
 import { UI_EXPORT_DEFAULTS } from './ui_export_defaults';
 // @ts-ignore
@@ -26,6 +26,6 @@ import * as uiExportTypeReducers from './ui_export_types';
 // @ts-ignore
 import { reduceExportSpecs } from '../../plugin_discovery';
 
-export function collectUiExports(pluginSpecs: unknown[]): SavedObjectsLegacyUiExports {
+export function collectUiExports(pluginSpecs: unknown[]): LegacyUiExports {
   return reduceExportSpecs(pluginSpecs, uiExportTypeReducers, UI_EXPORT_DEFAULTS);
 }
diff --git a/src/legacy/ui/ui_mixin.js b/src/legacy/ui/ui_mixin.js
index f5a25937c3a75..24d22efe4fa06 100644
--- a/src/legacy/ui/ui_mixin.js
+++ b/src/legacy/ui/ui_mixin.js
@@ -21,7 +21,6 @@ import { fieldFormatsMixin } from './field_formats';
 import { tutorialsMixin } from './tutorials_mixin';
 import { uiAppsMixin } from './ui_apps';
 import { uiBundlesMixin } from './ui_bundles';
-import { uiNavLinksMixin } from './ui_nav_links';
 import { uiRenderMixin } from './ui_render';
 import { uiSettingsMixin } from './ui_settings';
 
@@ -31,6 +30,5 @@ export async function uiMixin(kbnServer) {
   await kbnServer.mixin(uiSettingsMixin);
   await kbnServer.mixin(fieldFormatsMixin);
   await kbnServer.mixin(tutorialsMixin);
-  await kbnServer.mixin(uiNavLinksMixin);
   await kbnServer.mixin(uiRenderMixin);
 }
diff --git a/src/legacy/ui/ui_nav_links/index.js b/src/legacy/ui/ui_nav_links/index.js
index 42cea918a6afc..e725a77ee1183 100644
--- a/src/legacy/ui/ui_nav_links/index.js
+++ b/src/legacy/ui/ui_nav_links/index.js
@@ -18,4 +18,3 @@
  */
 
 export { UiNavLink } from './ui_nav_link';
-export { uiNavLinksMixin } from './ui_nav_links_mixin';
diff --git a/src/legacy/ui/ui_nav_links/ui_nav_links_mixin.js b/src/legacy/ui/ui_nav_links/ui_nav_links_mixin.js
deleted file mode 100644
index e445f5e9126d4..0000000000000
--- a/src/legacy/ui/ui_nav_links/ui_nav_links_mixin.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.
- */
-
-import { UiNavLink } from './ui_nav_link';
-
-export function uiNavLinksMixin(kbnServer, server) {
-  const uiApps = server.getAllUiApps();
-
-  const { navLinkSpecs = [] } = kbnServer.uiExports;
-
-  const fromSpecs = navLinkSpecs.map(navLinkSpec => new UiNavLink(navLinkSpec));
-
-  const fromApps = uiApps.map(app => app.getNavLink()).filter(Boolean);
-
-  const uiNavLinks = fromSpecs.concat(fromApps).sort((a, b) => a.getOrder() - b.getOrder());
-
-  server.decorate('server', 'getUiNavLinks', () => uiNavLinks.slice(0));
-}
diff --git a/src/legacy/ui/ui_render/lib/index.ts b/src/legacy/ui/ui_render/lib/index.ts
deleted file mode 100644
index 7c6ac60d1a6ca..0000000000000
--- a/src/legacy/ui/ui_render/lib/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 { mergeVariables } from './merge_variables';
diff --git a/src/legacy/ui/ui_render/lib/merge_variables.test.ts b/src/legacy/ui/ui_render/lib/merge_variables.test.ts
deleted file mode 100644
index 4d69216bc0bfd..0000000000000
--- a/src/legacy/ui/ui_render/lib/merge_variables.test.ts
+++ /dev/null
@@ -1,206 +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 { mergeVariables } from './merge_variables';
-
-describe('mergeVariables', () => {
-  it('merges two objects together', () => {
-    const someVariables = {
-      name: 'value',
-      canFoo: true,
-      nested: {
-        anotherVariable: 'ok',
-      },
-    };
-
-    const otherVariables = {
-      otherName: 'value',
-      otherCanFoo: true,
-      otherNested: {
-        otherAnotherVariable: 'ok',
-      },
-    };
-
-    const result = mergeVariables(someVariables, otherVariables);
-
-    expect(result).toEqual({
-      name: 'value',
-      canFoo: true,
-      nested: {
-        anotherVariable: 'ok',
-      },
-      otherName: 'value',
-      otherCanFoo: true,
-      otherNested: {
-        otherAnotherVariable: 'ok',
-      },
-    });
-  });
-
-  it('does not mutate the source objects', () => {
-    const original = {
-      var1: 'original',
-    };
-
-    const set1 = {
-      var1: 'value1',
-      var2: 'value1',
-    };
-
-    const set2 = {
-      var1: 'value2',
-      var2: 'value2',
-      var3: 'value2',
-    };
-
-    const set3 = {
-      var1: 'value3',
-      var2: 'value3',
-      var3: 'value3',
-      var4: 'value3',
-    };
-
-    mergeVariables(original, set1, set2, set3);
-
-    expect(original).toEqual({ var1: 'original' });
-    expect(set1).toEqual({ var1: 'value1', var2: 'value1' });
-    expect(set2).toEqual({ var1: 'value2', var2: 'value2', var3: 'value2' });
-    expect(set3).toEqual({ var1: 'value3', var2: 'value3', var3: 'value3', var4: 'value3' });
-  });
-
-  it('merges multiple objects together, preferring the leftmost values', () => {
-    const original = {
-      var1: 'original',
-    };
-
-    const set1 = {
-      var1: 'value1',
-      var2: 'value1',
-    };
-
-    const set2 = {
-      var1: 'value2',
-      var2: 'value2',
-      var3: 'value2',
-    };
-
-    const set3 = {
-      var1: 'value3',
-      var2: 'value3',
-      var3: 'value3',
-      var4: 'value3',
-    };
-
-    const result = mergeVariables(original, set1, set2, set3);
-
-    expect(result).toEqual({
-      var1: 'original',
-      var2: 'value1',
-      var3: 'value2',
-      var4: 'value3',
-    });
-  });
-
-  it('retains the original variable value if a duplicate entry is found', () => {
-    const someVariables = {
-      name: 'value',
-      canFoo: true,
-      nested: {
-        anotherVariable: 'ok',
-      },
-    };
-
-    const otherVariables = {
-      nested: {
-        otherAnotherVariable: 'ok',
-      },
-    };
-
-    const result = mergeVariables(someVariables, otherVariables);
-    expect(result).toEqual({
-      name: 'value',
-      canFoo: true,
-      nested: {
-        anotherVariable: 'ok',
-      },
-    });
-  });
-
-  it('combines entries within "uiCapabilities"', () => {
-    const someVariables = {
-      name: 'value',
-      canFoo: true,
-      uiCapabilities: {
-        firstCapability: 'ok',
-      },
-    };
-
-    const otherVariables = {
-      uiCapabilities: {
-        secondCapability: 'ok',
-      },
-    };
-
-    const result = mergeVariables(someVariables, otherVariables);
-
-    expect(result).toEqual({
-      name: 'value',
-      canFoo: true,
-      uiCapabilities: {
-        firstCapability: 'ok',
-        secondCapability: 'ok',
-      },
-    });
-  });
-
-  it('does not deeply combine entries within "uiCapabilities"', () => {
-    const someVariables = {
-      name: 'value',
-      canFoo: true,
-      uiCapabilities: {
-        firstCapability: 'ok',
-        nestedCapability: {
-          nestedProp: 'nestedValue',
-        },
-      },
-    };
-
-    const otherVariables = {
-      uiCapabilities: {
-        secondCapability: 'ok',
-        nestedCapability: {
-          otherNestedProp: 'otherNestedValue',
-        },
-      },
-    };
-
-    const result = mergeVariables(someVariables, otherVariables);
-    expect(result).toEqual({
-      name: 'value',
-      canFoo: true,
-      uiCapabilities: {
-        firstCapability: 'ok',
-        secondCapability: 'ok',
-        nestedCapability: {
-          nestedProp: 'nestedValue',
-        },
-      },
-    });
-  });
-});
diff --git a/src/legacy/ui/ui_render/lib/merge_variables.ts b/src/legacy/ui/ui_render/lib/merge_variables.ts
deleted file mode 100644
index 0f65c7825bdba..0000000000000
--- a/src/legacy/ui/ui_render/lib/merge_variables.ts
+++ /dev/null
@@ -1,39 +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.
- */
-
-const ELIGIBLE_FLAT_MERGE_KEYS = ['uiCapabilities'];
-
-export function mergeVariables(...sources: Array<Record<string, any>>) {
-  const result: Record<string, any> = {};
-
-  for (const source of sources) {
-    Object.entries(source).forEach(([key, value]) => {
-      if (ELIGIBLE_FLAT_MERGE_KEYS.includes(key)) {
-        result[key] = {
-          ...value,
-          ...result[key],
-        };
-      } else if (!result.hasOwnProperty(key)) {
-        result[key] = value;
-      }
-    });
-  }
-
-  return result;
-}
diff --git a/src/legacy/ui/ui_render/ui_render_mixin.js b/src/legacy/ui/ui_render/ui_render_mixin.js
index e3189f02bbbf2..0b266b8b62726 100644
--- a/src/legacy/ui/ui_render/ui_render_mixin.js
+++ b/src/legacy/ui/ui_render/ui_render_mixin.js
@@ -17,42 +17,27 @@
  * under the License.
  */
 
-import { take } from 'rxjs/operators';
 import { createHash } from 'crypto';
-import { props, reduce as reduceAsync } from 'bluebird';
 import Boom from 'boom';
 import { resolve } from 'path';
-import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { AppBootstrap } from './bootstrap';
-import { mergeVariables } from './lib';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { fromRoot } from '../../../core/server/utils';
+import { getApmConfig } from '../apm';
 
-export function uiRenderMixin(kbnServer, server, config) {
-  function replaceInjectedVars(request, injectedVars) {
-    const { injectedVarsReplacers = [] } = kbnServer.uiExports;
-
-    return reduceAsync(
-      injectedVarsReplacers,
-      async (acc, replacer) => await replacer(acc, request, kbnServer.server),
-      injectedVars
-    );
-  }
-
-  let defaultInjectedVars = {};
-  kbnServer.afterPluginsInit(() => {
-    const { defaultInjectedVarProviders = [] } = kbnServer.uiExports;
-    defaultInjectedVars = defaultInjectedVarProviders.reduce(
-      (allDefaults, { fn, pluginSpec }) =>
-        mergeVariables(
-          allDefaults,
-          fn(kbnServer.server, pluginSpec.readConfigValue(kbnServer.config, []))
-        ),
-      {}
-    );
-  });
+/**
+ * @typedef {import('../../server/kbn_server').default} KbnServer
+ * @typedef {import('../../server/kbn_server').ResponseToolkit} ResponseToolkit
+ */
 
+/**
+ *
+ * @param {KbnServer} kbnServer
+ * @param {KbnServer['server']} server
+ * @param {KbnServer['config']} config
+ */
+export function uiRenderMixin(kbnServer, server, config) {
   // render all views from ./views
   server.setupViews(resolve(__dirname, 'views'));
 
@@ -191,119 +176,41 @@ export function uiRenderMixin(kbnServer, server, config) {
     },
   });
 
-  async function getUiSettings({ request, includeUserProvidedConfig }) {
-    const uiSettings = request.getUiSettingsService();
-    return props({
-      defaults: uiSettings.getRegistered(),
-      user: includeUserProvidedConfig && uiSettings.getUserProvided(),
-    });
-  }
-
-  function getLegacyKibanaPayload({ app, basePath, uiSettings }) {
-    return {
-      app,
-      bundleId: `app:${app.getId()}`,
-      nav: server.getUiNavLinks(),
-      version: kbnServer.version,
-      branch: config.get('pkg.branch'),
-      buildNum: config.get('pkg.buildNum'),
-      buildSha: config.get('pkg.buildSha'),
-      serverName: config.get('server.name'),
-      devMode: config.get('env.dev'),
-      basePath,
-      uiSettings,
-    };
-  }
-
-  async function renderApp({
-    app,
+  async function renderApp(
     h,
-    includeUserProvidedConfig = true,
-    injectedVarsOverrides = {},
-  }) {
-    const request = h.request;
-    const basePath = request.getBasePath();
-    const uiSettings = await getUiSettings({ request, includeUserProvidedConfig });
-    app = app || { getId: () => 'core' };
-
-    const legacyMetadata = getLegacyKibanaPayload({
-      app,
-      basePath,
-      uiSettings,
+    app = { getId: () => 'core' },
+    includeUserSettings = true,
+    overrides = {}
+  ) {
+    const { http } = kbnServer.newPlatform.setup.core;
+    const {
+      rendering,
+      legacy,
+      savedObjectsClientProvider: savedObjects,
+      uiSettings: { asScopedToClient },
+    } = kbnServer.newPlatform.__internals;
+    const uiSettings = asScopedToClient(savedObjects.getClient(h.request));
+    const vars = await legacy.getVars(app.getId(), h.request, {
+      apmConfig: getApmConfig(app),
+      ...overrides,
     });
-
-    // Get the list of new platform plugins.
-    // Convert the Map into an array of objects so it is JSON serializable and order is preserved.
-    const uiPluginConfigs = kbnServer.newPlatform.__internals.uiPlugins.browserConfigs;
-    const uiPlugins = await Promise.all(
-      [...kbnServer.newPlatform.__internals.uiPlugins.public.entries()].map(
-        async ([id, plugin]) => {
-          const config$ = uiPluginConfigs.get(id);
-          if (config$) {
-            return { id, plugin, config: await config$.pipe(take(1)).toPromise() };
-          } else {
-            return { id, plugin, config: {} };
-          }
-        }
-      )
-    );
-    const { strict, warnLegacyBrowsers, header } = kbnServer.newPlatform.setup.core.http.csp;
-
-    const response = h.view('ui_app', {
-      strictCsp: strict,
-      uiPublicUrl: `${basePath}/ui`,
-      bootstrapScriptUrl: `${basePath}/bundles/app/${app.getId()}/bootstrap.js`,
-      i18n: (id, options) => i18n.translate(id, options),
-      locale: i18n.getLocale(),
-      darkMode: get(uiSettings.user, ['theme:darkMode', 'userValue'], false),
-
-      injectedMetadata: {
-        version: kbnServer.version,
-        buildNumber: config.get('pkg.buildNum'),
-        branch: config.get('pkg.branch'),
-        basePath,
-        env: kbnServer.newPlatform.env,
-        legacyMode: app.getId() !== 'core',
-        i18n: {
-          translationsUrl: `${basePath}/translations/${i18n.getLocale()}.json`,
-        },
-        csp: {
-          warnLegacyBrowsers,
-        },
-        vars: await replaceInjectedVars(
-          request,
-          mergeVariables(
-            injectedVarsOverrides,
-            app ? await server.getInjectedUiAppVars(app.getId()) : {},
-            defaultInjectedVars
-          )
-        ),
-
-        uiPlugins,
-
-        legacyMetadata,
-      },
+    const content = await rendering.render(h.request, uiSettings, {
+      app,
+      includeUserSettings,
+      vars,
     });
 
-    response.header('content-security-policy', header);
-
-    return response;
+    return h
+      .response(content)
+      .type('text/html')
+      .header('content-security-policy', http.csp.header);
   }
 
-  server.decorate('toolkit', 'renderApp', function(app, injectedVarsOverrides) {
-    return renderApp({
-      app,
-      h: this,
-      includeUserProvidedConfig: true,
-      injectedVarsOverrides,
-    });
+  server.decorate('toolkit', 'renderApp', function(app, overrides) {
+    return renderApp(this, app, true, overrides);
   });
 
   server.decorate('toolkit', 'renderAppWithDefaultConfig', function(app) {
-    return renderApp({
-      app,
-      h: this,
-      includeUserProvidedConfig: false,
-    });
+    return renderApp(this, app, false);
   });
 }
diff --git a/src/legacy/ui/ui_render/views/chrome.pug b/src/legacy/ui/ui_render/views/chrome.pug
deleted file mode 100644
index 9cb99f961767b..0000000000000
--- a/src/legacy/ui/ui_render/views/chrome.pug
+++ /dev/null
@@ -1,305 +0,0 @@
-block vars
-
-doctype html
-html(lang=locale)
-  head
-    meta(charset='utf-8')
-    meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1')
-    meta(name='viewport', content='width=device-width')
-    title Kibana
-    style.
-      /* INTER UI FONT */
-      /* INTER UI FONT */
-      /* INTER UI FONT */
-      /* INTER UI FONT */
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  normal;
-        font-weight: 100;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Thin-BETA.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Thin-BETA.woff") format("woff");
-      }
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  italic;
-        font-weight: 100;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ThinItalic-BETA.woff") format("woff");
-      }
-
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  normal;
-        font-weight: 200;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraLight-BETA.woff") format("woff");
-      }
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  italic;
-        font-weight: 200;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraLightItalic-BETA.woff") format("woff");
-      }
-
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  normal;
-        font-weight: 300;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Light-BETA.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Light-BETA.woff") format("woff");
-      }
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  italic;
-        font-weight: 300;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-LightItalic-BETA.woff") format("woff");
-      }
-
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  normal;
-        font-weight: 400;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Regular.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Regular.woff") format("woff");
-      }
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  italic;
-        font-weight: 400;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Italic.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Italic.woff") format("woff");
-      }
-
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  normal;
-        font-weight: 500;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Medium.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Medium.woff") format("woff");
-      }
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  italic;
-        font-weight: 500;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-MediumItalic.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-MediumItalic.woff") format("woff");
-      }
-
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  normal;
-        font-weight: 600;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-SemiBold.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-SemiBold.woff") format("woff");
-      }
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  italic;
-        font-weight: 600;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-SemiBoldItalic.woff") format("woff");
-      }
-
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  normal;
-        font-weight: 700;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Bold.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Bold.woff") format("woff");
-      }
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  italic;
-        font-weight: 700;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-BoldItalic.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-BoldItalic.woff") format("woff");
-      }
-
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  normal;
-        font-weight: 800;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraBold.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraBold.woff") format("woff");
-      }
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  italic;
-        font-weight: 800;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-ExtraBoldItalic.woff") format("woff");
-      }
-
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  normal;
-        font-weight: 900;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Black.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-Black.woff") format("woff");
-      }
-      @font-face {
-        font-family: 'Inter UI';
-        font-style:  italic;
-        font-weight: 900;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-BlackItalic.woff2") format("woff2"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-BlackItalic.woff") format("woff");
-      }
-
-      /* --------------------------------------------------------------------------
-      Single variable font.
-
-      Note that you may want to do something like this to make sure you're serving
-      constant fonts to older browsers:
-      html {
-        font-family: 'Inter UI', sans-serif;
-      }
-      @supports (font-variation-settings: normal) {
-        html {
-          font-family: 'Inter UI var', sans-serif;
-        }
-      }
-
-      BUGS:
-      - Safari 12.0 will default to italic instead of regular when font-weight
-        is provided in a @font-face declaration.
-        Workaround: Use "Inter UI var alt" for Safari, or explicitly set
-        `font-variation-settings:"slnt" DEGREE`.
-      @font-face {
-        font-family: 'Inter UI var';
-        font-weight: 100 900;
-        font-style: oblique 0deg 10deg;
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI.var.woff2") format("woff2-variations"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI.var.woff2") format("woff2");
-      }
-
-      "Inter UI var alt" is recommended for Safari and Edge, for reliable italics.
-
-      @supports (font-variation-settings: normal) {
-        html {
-          font-family: 'Inter UI var alt', sans-serif;
-        }
-      }
-
-      @font-face {
-        font-family: 'Inter UI var alt';
-        font-weight: 100 900;
-        font-style: normal;
-        font-named-instance: 'Regular';
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-upright.var.woff2") format("woff2 supports variations(gvar)"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-upright.var.woff2") format("woff2-variations"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-upright.var.woff2") format("woff2");
-      }
-      @font-face {
-        font-family: 'Inter UI var alt';
-        font-weight: 100 900;
-        font-style: italic;
-        font-named-instance: 'Italic';
-        src: url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-italic.var.woff2") format("woff2 supports variations(gvar)"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-italic.var.woff2") format("woff2-variations"),
-            url("#{uiPublicUrl}/fonts/inter_ui/Inter-UI-italic.var.woff2") format("woff2");
-      }
-      */
-
-      /* ROBOTO MONO FONTS */
-      /* ROBOTO MONO FONTS */
-      /* ROBOTO MONO FONTS */
-      /* ROBOTO MONO FONTS */
-      /* ROBOTO MONO FONTS */
-      @font-face {
-        font-family: 'Roboto Mono';
-        font-style: italic;
-        font-weight: 400;
-        src: local('Roboto Mono Italic'), local('RobotoMono-Italic'), url("#{uiPublicUrl}/fonts/roboto_mono/RobotoMono-Italic.ttf") format('ttf');
-        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-      }
-      @font-face {
-        font-family: 'Roboto Mono';
-        font-style: italic;
-        font-weight: 700;
-        src: local('Roboto Mono Bold Italic'), local('RobotoMono-BoldItalic'), url("#{uiPublicUrl}/fonts/roboto_mono/RobotoMono-BoldItalic.ttf") format('woff2');
-        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-      }
-      @font-face {
-        font-family: 'Roboto Mono';
-        font-style: normal;
-        font-weight: 400;
-        src: local('Roboto Mono'), local('RobotoMono-Regular'), url("#{uiPublicUrl}/fonts/roboto_mono/RobotoMono-Regular.ttf") format('woff2');
-        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-      }
-      @font-face {
-        font-family: 'Roboto Mono';
-        font-style: normal;
-        font-weight: 700;
-        src: local('Roboto Mono Bold'), local('RobotoMono-Bold'), url("#{uiPublicUrl}/fonts/roboto_mono/RobotoMono-Bold.ttf") format('woff2');
-        unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-      }
-    //- Favicons (generated from http://realfavicongenerator.net/)
-    link(
-      rel='apple-touch-icon' sizes='180x180' href=`${uiPublicUrl}/favicons/apple-touch-icon.png`
-    )
-    link(
-      rel='icon' type='image/png' href=`${uiPublicUrl}/favicons/favicon-32x32.png` sizes='32x32'
-    )
-    link(
-      rel='icon' type='image/png' href=`${uiPublicUrl}/favicons/favicon-16x16.png` sizes='16x16'
-    )
-    link(
-      rel='manifest' href=`${uiPublicUrl}/favicons/manifest.json`
-    )
-    link(
-      rel='mask-icon' href=`${uiPublicUrl}/favicons/safari-pinned-tab.svg` color='#e8488b'
-    )
-    link(
-      rel='shortcut icon' href=`${uiPublicUrl}/favicons/favicon.ico`
-    )
-    meta(
-      name='msapplication-config' content=`${uiPublicUrl}/favicons/browserconfig.xml`
-    )
-    meta(
-      name='theme-color' content='#ffffff'
-    )
-
-    style.
-      .kibanaWelcomeView {
-        height: 100%;
-        display: -webkit-box;
-        display: -webkit-flex;
-        display: -ms-flexbox;
-        display: flex;
-        -webkit-box-flex: 1;
-        -webkit-flex: 1 0 auto;
-            -ms-flex: 1 0 auto;
-                flex: 1 0 auto;
-        -webkit-box-orient: vertical;
-        -webkit-box-direction: normal;
-        -webkit-flex-direction: column;
-            -ms-flex-direction: column;
-                flex-direction: column;
-        -webkit-box-align: center;
-        -webkit-align-items: center;
-            -ms-flex-align: center;
-                align-items: center;
-        -webkit-box-pack: center;
-        -webkit-justify-content: center;
-            -ms-flex-pack: center;
-                justify-content: center;
-        background: #FFFFFF;
-      }
-
-      .kibanaWelcomeLogo {
-        width: 100%;
-        height: 100%;
-        background-repeat: no-repeat;
-        background-size: contain;
-        /* SVG optimized according to http://codepen.io/tigt/post/optimizing-svgs-in-data-uris */
-        background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0OSIgaGVpZ2h0PSI2NCIgdmlld0JveD0iMCAwIDQ5IDY0Ij4KICA8ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgPHBhdGggZmlsbD0iIzNFQkVCMCIgZD0iTTEuNDE2MzE1NzMsNjQgTDQ4LjY0MDA4MTEsNjQgQzQ4LjY0MDA4MTEsNTEuMTI2NCA0MS4yMzYyNjI0LDM5LjY4NDggMjkuNzQ3NDk0NCwzMi4zNzA0IEwxLjQxNjMxNTczLDY0IFoiLz4KICAgIDxwYXRoIGZpbGw9IiMzN0E1OTUiIGQ9Ik0wLDQxLjYgTDAsNjQgTDMuMDM3NTY4LDY0IEwyOS43NTA2NTYsMzIuMzY1NiBDMjcuOTI1ODQ1MywzMS4yMDMyIDI1Ljk5MjQwNTMsMzAuMTUyIDIzLjk3NTQ2NjcsMjkuMjA4IEwwLDQxLjYgWiIvPgogICAgPHBhdGggZmlsbD0iIzM1MzUzNCIgZD0iTTAsMjAuOCBMMCw1Ny42IEwyMy45Nzk1MiwyOS4yMDMyIEMxNi45MDA3Nzg3LDI1Ljg5NzYgMjQuOTM1Mjk2LDIyLjQgMTYuMjEzMzMzMywyMi40IEwwLDIwLjggWiIvPgogICAgPHBhdGggZmlsbD0iI0U5NDc4QiIgZD0iTTQ4LjY0LDAgTDAsMCBMMCwyNCBDOC43MjE5NjI2NywyNCAxNi45MDA3Nzg3LDI1Ljg5NzYgMjMuOTc5NTIsMjkuMjAzMiBMNDguNjQsMCBaIi8+CiAgPC9nPgo8L3N2Zz4K");
-      }
-
-    block head
-
-  body
-    kbn-csp(data=JSON.stringify({ strictCsp }))
-    kbn-injected-metadata(data=JSON.stringify(injectedMetadata))
-    block content
diff --git a/src/legacy/ui/ui_render/views/ui_app.pug b/src/legacy/ui/ui_render/views/ui_app.pug
deleted file mode 100644
index 95b321e09b500..0000000000000
--- a/src/legacy/ui/ui_render/views/ui_app.pug
+++ /dev/null
@@ -1,140 +0,0 @@
-extends ./chrome
-
-block content
-  style.
-    * {
-      box-sizing: border-box;
-    }
-
-    body, html {
-      width: 100%;
-      height: 100%;
-      margin: 0;
-      background-color: #{darkMode ? '#25262E' : '#F5F7FA'};
-    }
-    .kibanaWelcomeView {
-      background-color: #{darkMode ? '#25262E' : '#F5F7FA'};
-    }
-
-    .kibanaWelcomeTitle {
-      color: #000;
-      font-size: 20px;
-      font-family: Sans-serif;
-      margin-top: 20px;
-      animation: fadeIn 1s ease-in-out;
-      animation-fill-mode: forwards;
-      opacity: 0;
-      animation-delay: 1.0s;
-    }
-
-    .kibanaWelcomeText {
-      font-size: 14px;
-      font-family: Sans-serif;
-      color: #98A2B3;
-      animation: fadeIn 1s ease-in-out;
-      animation-fill-mode: forwards;
-      opacity: 0;
-      animation-delay: 1.0s;
-    }
-
-    .kibanaLoaderWrap {
-      height: 128px;
-      width: 128px;
-      position: relative;
-      margin-top: 40px;
-    }
-
-    .kibanaLoaderWrap + * {
-      margin-top: 24px;
-    }
-
-    .kibanaLoader {
-      height: 128px;
-      width: 128px;
-      margin: 0 auto;
-      position: relative;
-      border: 2px solid transparent;
-      border-top: 2px solid #017D73;
-      border-radius: 100%;
-      display: block;
-      opacity: 0;
-      animation: rotation .75s .5s infinite linear, fadeIn 1s .5s ease-in-out forwards;
-    }
-
-    .kibanaWelcomeLogoCircle {
-      position: absolute;
-      left: 4px;
-      top: 4px;
-      width: 120px;
-      height: 120px;
-      padding: 20px;
-      background-color: #FFF;
-      border-radius: 50%;
-      animation: bounceIn .5s ease-in-out;
-    }
-
-    .kibanaWelcomeLogo {
-      background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMCIgaGVpZ2h0PSIzOSIgdmlld0JveD0iMCAwIDMwIDM5Ij4gIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgIDxwb2x5Z29uIGZpbGw9IiNGMDRFOTgiIHBvaW50cz0iMCAwIDAgMzQuNTQ3IDI5LjkyMiAuMDIiLz4gICAgPHBhdGggZmlsbD0iIzM0Mzc0MSIgZD0iTTAsMTQuNCBMMCwzNC41NDY4IEwxNC4yODcyLDE4LjA2MTIgQzEwLjA0MTYsMTUuNzM4IDUuMTgwNCwxNC40IDAsMTQuNCIvPiAgICA8cGF0aCBmaWxsPSIjMDBCRkIzIiBkPSJNMTcuMzc0MiwxOS45OTY4IEwyLjcyMSwzNi45MDQ4IEwxLjQzMzQsMzguMzg5MiBMMjkuMjYzOCwzOC4zODkyIEMyNy43NjE0LDMwLjgzODggMjMuNDA0MiwyNC4zMjY0IDE3LjM3NDIsMTkuOTk2OCIvPiAgPC9nPjwvc3ZnPg==");
-      background-repeat: no-repeat;
-      background-size: contain;
-      width: 60px;
-      height: 60px;
-      margin: 10px 0px 10px 20px;
-    }
-
-    @keyframes rotation {
-      from {
-        transform: rotate(0deg);
-      }
-      to {
-        transform: rotate(359deg);
-      }
-    }
-    @keyframes fadeIn {
-      from {
-        opacity: 0;
-      }
-      to {
-        opacity: 1;
-      }
-    }
-
-    @keyframes bounceIn {
-      0% {
-        opacity: 0;
-        transform: scale(.1);
-      }
-      80% {
-        opacity: .5;
-        transform: scale(1.2);
-      }
-      100% {
-        opacity: 1;
-        transform: scale(1);
-      }
-    }
-
-  .kibanaWelcomeView(id="kbn_loading_message", style="display: none;", data-test-subj="kbnLoadingMessage")
-    .kibanaLoaderWrap
-      .kibanaLoader
-      .kibanaWelcomeLogoCircle
-        .kibanaWelcomeLogo
-    .kibanaWelcomeText(data-error-message=i18n('common.ui.welcomeErrorMessage', { defaultMessage: 'Kibana did not load properly. Check the server output for more information.' }))
-      | #{i18n('common.ui.welcomeMessage', { defaultMessage: 'Loading Kibana' })}
-
-  .kibanaWelcomeView(id="kbn_legacy_browser_error", style="display: none;")
-    .kibanaLoaderWrap
-      .kibanaWelcomeLogoCircle
-        .kibanaWelcomeLogo
-    h2.kibanaWelcomeTitle
-      | #{i18n('common.ui.legacyBrowserTitle', { defaultMessage: 'Please upgrade your browser' })}
-    .kibanaWelcomeText
-      | #{i18n('common.ui.legacyBrowserMessage', { defaultMessage: 'This Kibana installation has strict security requirements enabled that your current browser does not meet.' })}
-
-  script.
-    // Since this is an unsafe inline script, this code will not run
-    // in browsers that support content security policy(CSP). This is
-    // intentional as we check for the existence of __kbnCspNotEnforced__ in
-    // bootstrap.
-    window.__kbnCspNotEnforced__ = true;
-  script(src=bootstrapScriptUrl)
diff --git a/src/legacy/utils/case_conversion.test.ts b/src/legacy/utils/case_conversion.test.ts
deleted file mode 100644
index 27498f3878980..0000000000000
--- a/src/legacy/utils/case_conversion.test.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 { keysToCamelCaseShallow, keysToSnakeCaseShallow } from './case_conversion';
-
-describe('keysToSnakeCaseShallow', () => {
-  it("should convert all of an object's keys to snake case", () => {
-    const result = keysToSnakeCaseShallow({
-      camelCase: 'camel_case',
-      'kebab-case': 'kebab_case',
-      snake_case: 'snake_case',
-    });
-
-    expect(result).toMatchInlineSnapshot(`
-Object {
-  "camel_case": "camel_case",
-  "kebab_case": "kebab_case",
-  "snake_case": "snake_case",
-}
-`);
-  });
-});
-
-describe('keysToCamelCaseShallow', () => {
-  it("should convert all of an object's keys to camel case", () => {
-    const result = keysToCamelCaseShallow({
-      camelCase: 'camelCase',
-      'kebab-case': 'kebabCase',
-      snake_case: 'snakeCase',
-    });
-
-    expect(result).toMatchInlineSnapshot(`
-Object {
-  "camelCase": "camelCase",
-  "kebabCase": "kebabCase",
-  "snakeCase": "snakeCase",
-}
-`);
-  });
-});
diff --git a/src/legacy/utils/case_conversion.ts b/src/legacy/utils/case_conversion.ts
deleted file mode 100644
index e1c1317b26b14..0000000000000
--- a/src/legacy/utils/case_conversion.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 _ from 'lodash';
-
-export function keysToSnakeCaseShallow(object: Record<string, any>) {
-  return _.mapKeys(object, (value, key) => {
-    return _.snakeCase(key);
-  });
-}
-
-export function keysToCamelCaseShallow(object: Record<string, any>) {
-  return _.mapKeys(object, (value, key) => {
-    return _.camelCase(key);
-  });
-}
diff --git a/src/plugins/dashboard_embeddable_container/public/embeddable/grid/_dashboard_grid.scss b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/_dashboard_grid.scss
index 9efd36b05095e..a205e611531b6 100644
--- a/src/plugins/dashboard_embeddable_container/public/embeddable/grid/_dashboard_grid.scss
+++ b/src/plugins/dashboard_embeddable_container/public/embeddable/grid/_dashboard_grid.scss
@@ -74,7 +74,7 @@
     background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='6' height='6' viewBox='0 0 6 6'%3E%3Cpolygon fill='#{hexToRGB($euiColorDarkShade)}' points='6 6 0 6 0 4.2 4 4.2 4.2 4.2 4.2 0 6 0' /%3E%3C/svg%3E%0A");
 
     &::after {
-      border: none;
+      border: none !important;  /** overrides library default visual indicator **/
     }
 
     &:hover,
diff --git a/packages/kbn-dev-utils/src/constants.ts b/src/plugins/data/common/constants.ts
similarity index 88%
rename from packages/kbn-dev-utils/src/constants.ts
rename to src/plugins/data/common/constants.ts
index 5d3b57509715e..00786a0c72cf1 100644
--- a/packages/kbn-dev-utils/src/constants.ts
+++ b/src/plugins/data/common/constants.ts
@@ -17,6 +17,4 @@
  * under the License.
  */
 
-import { dirname } from 'path';
-
-export const REPO_ROOT = dirname(require.resolve('../../../package.json'));
+export const DEFAULT_QUERY_LANGUAGE = 'kuery';
diff --git a/src/plugins/data/common/es_query/filters/phrases_filter.ts b/src/plugins/data/common/es_query/filters/phrases_filter.ts
index 006e0623be913..2c964097e7c0f 100644
--- a/src/plugins/data/common/es_query/filters/phrases_filter.ts
+++ b/src/plugins/data/common/es_query/filters/phrases_filter.ts
@@ -42,7 +42,11 @@ export const getPhrasesFilterField = (filter: PhrasesFilter) => {
 
 // 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: IFieldType, params: any, indexPattern: IIndexPattern) => {
+export const buildPhrasesFilter = (
+  field: IFieldType,
+  params: any[],
+  indexPattern: IIndexPattern
+) => {
   const index = indexPattern.id;
   const type = FILTERS.PHRASES;
   const key = field.name;
diff --git a/src/plugins/data/common/field_formats/content_types/html_content_type.ts b/src/plugins/data/common/field_formats/content_types/html_content_type.ts
index ba2236c41790f..1b6ee9e63fad1 100644
--- a/src/plugins/data/common/field_formats/content_types/html_content_type.ts
+++ b/src/plugins/data/common/field_formats/content_types/html_content_type.ts
@@ -26,7 +26,8 @@ const getConvertFn = (
   format: IFieldFormat,
   convert?: HtmlContextTypeConvert
 ): HtmlContextTypeConvert => {
-  const fallbackHtml: HtmlContextTypeConvert = (value, field, hit) => {
+  const fallbackHtml: HtmlContextTypeConvert = (value, options = {}) => {
+    const { field, hit } = options;
     const formatted = escape(format.convert(value, 'text'));
 
     return !field || !hit || !hit.highlight || !hit.highlight[field.name]
@@ -43,27 +44,23 @@ export const setup = (
 ): HtmlContextTypeConvert => {
   const convert = getConvertFn(format, htmlContextTypeConvert);
 
-  const recurse: HtmlContextTypeConvert = (value, field, hit, meta) => {
+  const recurse: HtmlContextTypeConvert = (value, options = {}) => {
     if (value == null) {
       return asPrettyString(value);
     }
 
     if (!value || !isFunction(value.map)) {
-      return convert.call(format, value, field, hit, meta);
+      return convert.call(format, value, options);
     }
 
-    const subValues = value.map((v: any) => {
-      return recurse(v, field, hit, meta);
-    });
-    const useMultiLine = subValues.some((sub: string) => {
-      return sub.indexOf('\n') > -1;
-    });
+    const subValues = value.map((v: any) => recurse(v, options));
+    const useMultiLine = subValues.some((sub: string) => sub.indexOf('\n') > -1);
 
     return subValues.join(',' + (useMultiLine ? '\n' : ' '));
   };
 
-  const wrap: HtmlContextTypeConvert = (value, field, hit, meta) => {
-    return `<span ng-non-bindable>${recurse(value, field, hit, meta)}</span>`;
+  const wrap: HtmlContextTypeConvert = (value, options) => {
+    return `<span ng-non-bindable>${recurse(value, options)}</span>`;
   };
 
   return wrap;
diff --git a/src/plugins/data/common/field_formats/converters/date_server.ts b/src/plugins/data/common/field_formats/converters/date_server.ts
index 0c214e424f163..34278ea9fe641 100644
--- a/src/plugins/data/common/field_formats/converters/date_server.ts
+++ b/src/plugins/data/common/field_formats/converters/date_server.ts
@@ -20,7 +20,7 @@
 import { memoize, noop } from 'lodash';
 import moment from 'moment-timezone';
 import { KBN_FIELD_TYPES } from '../../kbn_field_types/types';
-import { FieldFormat } from '../field_format';
+import { FieldFormat, IFieldFormatMetaParams } from '../field_format';
 import { TextContextTypeConvert, FIELD_FORMAT_IDS } from '../types';
 
 export class DateFormat extends FieldFormat {
@@ -32,7 +32,7 @@ export class DateFormat extends FieldFormat {
   private memoizedPattern: string = '';
   private timeZone: string = '';
 
-  constructor(params: Record<string, any>, getConfig: Function) {
+  constructor(params: IFieldFormatMetaParams, getConfig: Function) {
     super(params, getConfig);
 
     this.memoizedConverter = memoize((val: any) => {
diff --git a/src/plugins/data/common/field_formats/converters/source.ts b/src/plugins/data/common/field_formats/converters/source.ts
index c9906fb136052..702e1579e945f 100644
--- a/src/plugins/data/common/field_formats/converters/source.ts
+++ b/src/plugins/data/common/field_formats/converters/source.ts
@@ -42,7 +42,9 @@ export class SourceFormat extends FieldFormat {
 
   textConvert: TextContextTypeConvert = value => JSON.stringify(value);
 
-  htmlConvert: HtmlContextTypeConvert = (value, field, hit) => {
+  htmlConvert: HtmlContextTypeConvert = (value, options = {}) => {
+    const { field, hit } = options;
+
     if (!field) {
       const converter = this.getConverterFor('text') as Function;
 
diff --git a/src/plugins/data/common/field_formats/converters/url.test.ts b/src/plugins/data/common/field_formats/converters/url.test.ts
index 66307cefe08f7..b1107d46179bf 100644
--- a/src/plugins/data/common/field_formats/converters/url.test.ts
+++ b/src/plugins/data/common/field_formats/converters/url.test.ts
@@ -169,64 +169,64 @@ describe('UrlFormat', () => {
 
   describe('whitelist', () => {
     test('should assume a relative url if the value is not in the whitelist without a base path', () => {
-      const url = new UrlFormat({});
       const parsedUrl = {
         origin: 'http://kibana',
         basePath: '',
       };
+      const url = new UrlFormat({ parsedUrl });
       const converter = url.getConverterFor(HTML_CONTEXT_TYPE) as Function;
 
-      expect(converter('www.elastic.co', null, null, parsedUrl)).toBe(
+      expect(converter('www.elastic.co')).toBe(
         '<span ng-non-bindable><a href="http://kibana/app/www.elastic.co" target="_blank" rel="noopener noreferrer">www.elastic.co</a></span>'
       );
 
-      expect(converter('elastic.co', null, null, parsedUrl)).toBe(
+      expect(converter('elastic.co')).toBe(
         '<span ng-non-bindable><a href="http://kibana/app/elastic.co" target="_blank" rel="noopener noreferrer">elastic.co</a></span>'
       );
 
-      expect(converter('elastic', null, null, parsedUrl)).toBe(
+      expect(converter('elastic')).toBe(
         '<span ng-non-bindable><a href="http://kibana/app/elastic" target="_blank" rel="noopener noreferrer">elastic</a></span>'
       );
 
-      expect(converter('ftp://elastic.co', null, null, parsedUrl)).toBe(
+      expect(converter('ftp://elastic.co')).toBe(
         '<span ng-non-bindable><a href="http://kibana/app/ftp://elastic.co" target="_blank" rel="noopener noreferrer">ftp://elastic.co</a></span>'
       );
     });
 
     test('should assume a relative url if the value is not in the whitelist with a basepath', () => {
-      const url = new UrlFormat({});
       const parsedUrl = {
         origin: 'http://kibana',
         basePath: '/xyz',
       };
+      const url = new UrlFormat({ parsedUrl });
       const converter = url.getConverterFor(HTML_CONTEXT_TYPE) as Function;
 
-      expect(converter('www.elastic.co', null, null, parsedUrl)).toBe(
+      expect(converter('www.elastic.co')).toBe(
         '<span ng-non-bindable><a href="http://kibana/xyz/app/www.elastic.co" target="_blank" rel="noopener noreferrer">www.elastic.co</a></span>'
       );
 
-      expect(converter('elastic.co', null, null, parsedUrl)).toBe(
+      expect(converter('elastic.co')).toBe(
         '<span ng-non-bindable><a href="http://kibana/xyz/app/elastic.co" target="_blank" rel="noopener noreferrer">elastic.co</a></span>'
       );
 
-      expect(converter('elastic', null, null, parsedUrl)).toBe(
+      expect(converter('elastic')).toBe(
         '<span ng-non-bindable><a href="http://kibana/xyz/app/elastic" target="_blank" rel="noopener noreferrer">elastic</a></span>'
       );
 
-      expect(converter('ftp://elastic.co', null, null, parsedUrl)).toBe(
+      expect(converter('ftp://elastic.co')).toBe(
         '<span ng-non-bindable><a href="http://kibana/xyz/app/ftp://elastic.co" target="_blank" rel="noopener noreferrer">ftp://elastic.co</a></span>'
       );
     });
 
     test('should rely on parsedUrl', () => {
-      const url = new UrlFormat({});
       const parsedUrl = {
         origin: 'http://kibana.host.com',
         basePath: '/abc',
       };
+      const url = new UrlFormat({ parsedUrl });
       const converter = url.getConverterFor(HTML_CONTEXT_TYPE) as Function;
 
-      expect(converter('../app/kibana', null, null, parsedUrl)).toBe(
+      expect(converter('../app/kibana')).toBe(
         '<span ng-non-bindable><a href="http://kibana.host.com/abc/app/../app/kibana" target="_blank" rel="noopener noreferrer">../app/kibana</a></span>'
       );
     });
@@ -244,54 +244,52 @@ describe('UrlFormat', () => {
     });
 
     test('should support multiple types of relative urls', () => {
-      const url = new UrlFormat({});
       const parsedUrl = {
         origin: 'http://kibana.host.com',
         pathname: '/nbc/app/kibana#/discover',
         basePath: '/nbc',
       };
+      const url = new UrlFormat({ parsedUrl });
       const converter = url.getConverterFor(HTML_CONTEXT_TYPE) as Function;
 
-      expect(converter('#/foo', null, null, parsedUrl)).toBe(
+      expect(converter('#/foo')).toBe(
         '<span ng-non-bindable><a href="http://kibana.host.com/nbc/app/kibana#/discover#/foo" target="_blank" rel="noopener noreferrer">#/foo</a></span>'
       );
 
-      expect(converter('/nbc/app/kibana#/discover', null, null, parsedUrl)).toBe(
+      expect(converter('/nbc/app/kibana#/discover')).toBe(
         '<span ng-non-bindable><a href="http://kibana.host.com/nbc/app/kibana#/discover" target="_blank" rel="noopener noreferrer">/nbc/app/kibana#/discover</a></span>'
       );
 
-      expect(converter('../foo/bar', null, null, parsedUrl)).toBe(
+      expect(converter('../foo/bar')).toBe(
         '<span ng-non-bindable><a href="http://kibana.host.com/nbc/app/../foo/bar" target="_blank" rel="noopener noreferrer">../foo/bar</a></span>'
       );
     });
 
     test('should support multiple types of urls w/o basePath', () => {
-      const url = new UrlFormat({});
       const parsedUrl = {
         origin: 'http://kibana.host.com',
         pathname: '/app/kibana',
       };
+      const url = new UrlFormat({ parsedUrl });
       const converter = url.getConverterFor(HTML_CONTEXT_TYPE) as Function;
 
-      expect(converter('10.22.55.66', null, null, parsedUrl)).toBe(
+      expect(converter('10.22.55.66')).toBe(
         '<span ng-non-bindable><a href="http://kibana.host.com/app/10.22.55.66" target="_blank" rel="noopener noreferrer">10.22.55.66</a></span>'
       );
 
-      expect(
-        converter('http://www.domain.name/app/kibana#/dashboard/', null, null, parsedUrl)
-      ).toBe(
+      expect(converter('http://www.domain.name/app/kibana#/dashboard/')).toBe(
         '<span ng-non-bindable><a href="http://www.domain.name/app/kibana#/dashboard/" target="_blank" rel="noopener noreferrer">http://www.domain.name/app/kibana#/dashboard/</a></span>'
       );
 
-      expect(converter('/app/kibana', null, null, parsedUrl)).toBe(
+      expect(converter('/app/kibana')).toBe(
         '<span ng-non-bindable><a href="http://kibana.host.com/app/kibana" target="_blank" rel="noopener noreferrer">/app/kibana</a></span>'
       );
 
-      expect(converter('kibana#/dashboard/', null, null, parsedUrl)).toBe(
+      expect(converter('kibana#/dashboard/')).toBe(
         '<span ng-non-bindable><a href="http://kibana.host.com/app/kibana#/dashboard/" target="_blank" rel="noopener noreferrer">kibana#/dashboard/</a></span>'
       );
 
-      expect(converter('#/dashboard/', null, null, parsedUrl)).toBe(
+      expect(converter('#/dashboard/')).toBe(
         '<span ng-non-bindable><a href="http://kibana.host.com/app/kibana#/dashboard/" target="_blank" rel="noopener noreferrer">#/dashboard/</a></span>'
       );
     });
diff --git a/src/plugins/data/common/field_formats/converters/url.ts b/src/plugins/data/common/field_formats/converters/url.ts
index bd68dedf38a67..21688dd8d1138 100644
--- a/src/plugins/data/common/field_formats/converters/url.ts
+++ b/src/plugins/data/common/field_formats/converters/url.ts
@@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n';
 import { escape, memoize } from 'lodash';
 import { getHighlightHtml } from '../utils';
 import { KBN_FIELD_TYPES } from '../../kbn_field_types/types';
-import { FieldFormat } from '../field_format';
+import { FieldFormat, IFieldFormatMetaParams } from '../field_format';
 import { TextContextTypeConvert, HtmlContextTypeConvert, FIELD_FORMAT_IDS } from '../types';
 
 const templateMatchRE = /{{([\s\S]+?)}}/g;
@@ -64,7 +64,7 @@ export class UrlFormat extends FieldFormat {
   ];
   static urlTypes = URL_TYPES;
 
-  constructor(params: Record<string, any>) {
+  constructor(params: IFieldFormatMetaParams) {
     super(params);
     this.compileTemplate = memoize(this.compileTemplate);
   }
@@ -134,7 +134,11 @@ export class UrlFormat extends FieldFormat {
 
   textConvert: TextContextTypeConvert = value => this.formatLabel(value);
 
-  htmlConvert: HtmlContextTypeConvert = (rawValue, field, hit, parsedUrl) => {
+  htmlConvert: HtmlContextTypeConvert = (rawValue, options = {}) => {
+    const { field, hit } = options;
+    const { parsedUrl } = this._params;
+    const { basePath, pathname, origin } = parsedUrl || {};
+
     const url = escape(this.formatUrl(rawValue));
     const label = escape(this.formatLabel(rawValue, url));
 
@@ -170,17 +174,17 @@ export class UrlFormat extends FieldFormat {
         if (!inWhitelist) {
           // Handles urls like: `#/discover`
           if (url[0] === '#') {
-            prefix = `${parsedUrl.origin}${parsedUrl.pathname}`;
+            prefix = `${origin}${pathname}`;
           }
           // Handle urls like: `/app/kibana` or `/xyz/app/kibana`
-          else if (url.indexOf(parsedUrl.basePath || '/') === 0) {
-            prefix = `${parsedUrl.origin}`;
+          else if (url.indexOf(basePath || '/') === 0) {
+            prefix = `${origin}`;
           }
           // Handle urls like: `../app/kibana`
           else {
             const prefixEnd = url[0] === '/' ? '' : '/';
 
-            prefix = `${parsedUrl.origin}${parsedUrl.basePath || ''}/app${prefixEnd}`;
+            prefix = `${origin}${basePath || ''}/app${prefixEnd}`;
           }
         }
 
diff --git a/src/plugins/data/common/field_formats/field_format.ts b/src/plugins/data/common/field_formats/field_format.ts
index 85d276767b5a7..a0621b27f5bc0 100644
--- a/src/plugins/data/common/field_formats/field_format.ts
+++ b/src/plugins/data/common/field_formats/field_format.ts
@@ -24,6 +24,8 @@ import {
   FIELD_FORMAT_IDS,
   FieldFormatConvert,
   FieldFormatConvertFunction,
+  HtmlContextTypeOptions,
+  TextContextTypeOptions,
 } from './types';
 import {
   htmlContentTypeSetup,
@@ -35,6 +37,15 @@ import { HtmlContextTypeConvert, TextContextTypeConvert } from './types';
 
 const DEFAULT_CONTEXT_TYPE = TEXT_CONTEXT_TYPE;
 
+export interface IFieldFormatMetaParams {
+  [key: string]: any;
+  parsedUrl?: {
+    origin: string;
+    pathname?: string;
+    basePath?: string;
+  };
+}
+
 export abstract class FieldFormat {
   /**
    * @property {string} - Field Format Id
@@ -63,8 +74,20 @@ export abstract class FieldFormat {
    */
   convertObject: FieldFormatConvert | undefined;
 
+  /**
+   * @property {htmlConvert}
+   * @protected
+   * have to remove the protected because of
+   * https://github.com/Microsoft/TypeScript/issues/17293
+   */
   htmlConvert: HtmlContextTypeConvert | undefined;
 
+  /**
+   * @property {textConvert}
+   * @protected
+   * have to remove the protected because of
+   * https://github.com/Microsoft/TypeScript/issues/17293
+   */
   textConvert: TextContextTypeConvert | undefined;
 
   /**
@@ -76,7 +99,7 @@ export abstract class FieldFormat {
   protected readonly _params: any;
   protected getConfig: Function | undefined;
 
-  constructor(_params: any = {}, getConfig?: Function) {
+  constructor(_params: IFieldFormatMetaParams = {}, getConfig?: Function) {
     this._params = _params;
 
     if (getConfig) {
@@ -94,11 +117,15 @@ export abstract class FieldFormat {
    *                    injecting into the DOM or a DOM attribute
    * @public
    */
-  convert(value: any, contentType: ContentType = DEFAULT_CONTEXT_TYPE): string {
+  convert(
+    value: any,
+    contentType: ContentType = DEFAULT_CONTEXT_TYPE,
+    options?: HtmlContextTypeOptions | TextContextTypeOptions
+  ): string {
     const converter = this.getConverterFor(contentType);
 
     if (converter) {
-      return converter.call(this, value);
+      return converter.call(this, value, options);
     }
 
     return value;
diff --git a/src/plugins/data/common/field_formats/index.ts b/src/plugins/data/common/field_formats/index.ts
index b751b097b5ed2..b1e8744e26745 100644
--- a/src/plugins/data/common/field_formats/index.ts
+++ b/src/plugins/data/common/field_formats/index.ts
@@ -18,7 +18,12 @@
  */
 
 export { HTML_CONTEXT_TYPE, TEXT_CONTEXT_TYPE } from './content_types';
-export { FieldFormat, IFieldFormatType, IFieldFormatId } from './field_format';
+export {
+  FieldFormat,
+  IFieldFormatType,
+  IFieldFormatId,
+  IFieldFormatMetaParams,
+} from './field_format';
 export { getHighlightRequest, asPrettyString, getHighlightHtml } from './utils';
 export * from './converters';
 export * from './constants';
diff --git a/src/plugins/data/common/field_formats/types.ts b/src/plugins/data/common/field_formats/types.ts
index fc8e6e20a1a96..dce3c66b0f886 100644
--- a/src/plugins/data/common/field_formats/types.ts
+++ b/src/plugins/data/common/field_formats/types.ts
@@ -24,15 +24,19 @@ export type ContentType = 'html' | 'text';
 export { IFieldFormat } from './field_format';
 
 /** @internal **/
-export type HtmlContextTypeConvert = (
-  value: any,
-  field?: any,
-  hit?: Record<string, any>,
-  meta?: any
-) => string;
+export interface HtmlContextTypeOptions {
+  field?: any;
+  hit?: Record<string, any>;
+}
+
+/** @internal **/
+export type HtmlContextTypeConvert = (value: any, options?: HtmlContextTypeOptions) => string;
+
+/** @internal **/
+export type TextContextTypeOptions = Record<string, any>;
 
 /** @internal **/
-export type TextContextTypeConvert = (value: any) => string;
+export type TextContextTypeConvert = (value: any, options?: TextContextTypeOptions) => string;
 
 /** @internal **/
 export type FieldFormatConvertFunction = HtmlContextTypeConvert | TextContextTypeConvert;
diff --git a/src/plugins/data/common/index.ts b/src/plugins/data/common/index.ts
index b334342a57ec6..e02045de24e8f 100644
--- a/src/plugins/data/common/index.ts
+++ b/src/plugins/data/common/index.ts
@@ -24,3 +24,4 @@ export * from './index_patterns';
 export * from './es_query';
 export * from './utils';
 export * from './types';
+export * from './constants';
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index 0a1ba48342244..98cdd20ea4b84 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -20,6 +20,7 @@
 import { IFieldType } from './fields';
 
 export interface IIndexPattern {
+  [key: string]: any;
   fields: IFieldType[];
   title: string;
   id?: string;
diff --git a/src/plugins/data/common/utils/index.ts b/src/plugins/data/common/utils/index.ts
index 7196c96989e97..c5f1276feb81d 100644
--- a/src/plugins/data/common/utils/index.ts
+++ b/src/plugins/data/common/utils/index.ts
@@ -18,3 +18,4 @@
  */
 
 export { shortenDottedString } from './shorten_dotted_string';
+export { parseInterval } from './parse_interval';
diff --git a/src/plugins/data/common/utils/parse_interval.test.ts b/src/plugins/data/common/utils/parse_interval.test.ts
new file mode 100644
index 0000000000000..0c02b02a25af0
--- /dev/null
+++ b/src/plugins/data/common/utils/parse_interval.test.ts
@@ -0,0 +1,119 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Duration, unitOfTime } from 'moment';
+import { parseInterval } from './parse_interval';
+
+const validateDuration = (duration: Duration | null, unit: unitOfTime.Base, value: number) => {
+  expect(duration).toBeDefined();
+
+  if (duration) {
+    expect(duration.as(unit)).toBe(value);
+  }
+};
+
+describe('parseInterval', () => {
+  describe('integer', () => {
+    test('should correctly parse 1d interval', () => {
+      validateDuration(parseInterval('1d'), 'd', 1);
+    });
+
+    test('should correctly parse 2y interval', () => {
+      validateDuration(parseInterval('2y'), 'y', 2);
+    });
+
+    test('should correctly parse 5M interval', () => {
+      validateDuration(parseInterval('5M'), 'M', 5);
+    });
+
+    test('should correctly parse 5m interval', () => {
+      validateDuration(parseInterval('5m'), 'm', 5);
+    });
+
+    test('should correctly parse 250ms interval', () => {
+      validateDuration(parseInterval('250ms'), 'ms', 250);
+    });
+
+    test('should correctly parse 100s interval', () => {
+      validateDuration(parseInterval('100s'), 's', 100);
+    });
+
+    test('should correctly parse 23d interval', () => {
+      validateDuration(parseInterval('23d'), 'd', 23);
+    });
+
+    test('should correctly parse 52w interval', () => {
+      validateDuration(parseInterval('52w'), 'w', 52);
+    });
+  });
+
+  describe('fractional interval', () => {
+    test('should correctly parse fractional 2.35y interval', () => {
+      validateDuration(parseInterval('2.35y'), 'y', 2.35);
+    });
+
+    test('should correctly parse fractional 1.5w interval', () => {
+      validateDuration(parseInterval('1.5w'), 'w', 1.5);
+    });
+  });
+
+  describe('less than 1', () => {
+    test('should correctly bubble up 0.5h interval which are less than 1', () => {
+      validateDuration(parseInterval('0.5h'), 'm', 30);
+    });
+
+    test('should correctly bubble up 0.5d interval which are less than 1', () => {
+      validateDuration(parseInterval('0.5d'), 'h', 12);
+    });
+  });
+
+  describe('unit in an interval only', () => {
+    test('should correctly parse ms interval', () => {
+      validateDuration(parseInterval('ms'), 'ms', 1);
+    });
+
+    test('should correctly parse d interval', () => {
+      validateDuration(parseInterval('d'), 'd', 1);
+    });
+
+    test('should correctly parse m interval', () => {
+      validateDuration(parseInterval('m'), 'm', 1);
+    });
+
+    test('should correctly parse y interval', () => {
+      validateDuration(parseInterval('y'), 'y', 1);
+    });
+
+    test('should correctly parse M interval', () => {
+      validateDuration(parseInterval('M'), 'M', 1);
+    });
+  });
+
+  test('should return null for an invalid interval', () => {
+    let duration = parseInterval('');
+    expect(duration).toBeNull();
+
+    // @ts-ignore
+    duration = parseInterval(null);
+    expect(duration).toBeNull();
+
+    duration = parseInterval('234asdf');
+    expect(duration).toBeNull();
+  });
+});
diff --git a/src/plugins/data/common/utils/parse_interval.ts b/src/plugins/data/common/utils/parse_interval.ts
new file mode 100644
index 0000000000000..ef1d89e400b72
--- /dev/null
+++ b/src/plugins/data/common/utils/parse_interval.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 { find } from 'lodash';
+import moment, { unitOfTime } from 'moment';
+import dateMath from '@elastic/datemath';
+
+// Assume interval is in the form (value)(unit), such as "1h"
+const INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$');
+
+export function parseInterval(interval: string): moment.Duration | null {
+  const matches = String(interval)
+    .trim()
+    .match(INTERVAL_STRING_RE);
+
+  if (!matches) return null;
+
+  try {
+    const value = parseFloat(matches[1]) || 1;
+    const unit = matches[2] as unitOfTime.Base;
+
+    const duration = moment.duration(value, unit);
+
+    // There is an error with moment, where if you have a fractional interval between 0 and 1, then when you add that
+    // interval to an existing moment object, it will remain unchanged, which causes problems in the ordered_x_keys
+    // code. To counteract this, we find the first unit that doesn't result in a value between 0 and 1.
+    // For example, if you have '0.5d', then when calculating the x-axis series, we take the start date and begin
+    // adding 0.5 days until we hit the end date. However, since there is a bug in moment, when you add 0.5 days to
+    // the start date, you get the same exact date (instead of being ahead by 12 hours). So instead of returning
+    // a duration corresponding to 0.5 hours, we return a duration corresponding to 12 hours.
+    const selectedUnit = find(
+      dateMath.units,
+      u => Math.abs(duration.as(u)) >= 1
+    ) as unitOfTime.Base;
+
+    return moment.duration(duration.as(selectedUnit), selectedUnit);
+  } catch (e) {
+    return null;
+  }
+}
diff --git a/src/plugins/data/kibana.json b/src/plugins/data/kibana.json
index 998eaa55858d2..6553ce8ce4d91 100644
--- a/src/plugins/data/kibana.json
+++ b/src/plugins/data/kibana.json
@@ -3,5 +3,6 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["uiActions"]
+  "requiredPlugins": ["uiActions"],
+  "optionalPlugins": ["usageCollection"]
 }
diff --git a/src/plugins/data/public/field_formats_provider/field_formats.test.ts b/src/plugins/data/public/field_formats_provider/field_formats.test.ts
new file mode 100644
index 0000000000000..8ad6cff77abc0
--- /dev/null
+++ b/src/plugins/data/public/field_formats_provider/field_formats.test.ts
@@ -0,0 +1,171 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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, IUiSettingsClient } from 'kibana/public';
+
+import { FieldFormatRegisty } from './field_formats';
+import {
+  BoolFormat,
+  IFieldFormatType,
+  PercentFormat,
+  StringFormat,
+} from '../../common/field_formats';
+import { coreMock } from '../../../../core/public/mocks';
+import { KBN_FIELD_TYPES } from '../../common';
+
+const getValueOfPrivateField = (instance: any, field: string) => instance[field];
+const getUiSettingsMock = (data: any): IUiSettingsClient['get'] => () => data;
+
+describe('FieldFormatRegisty', () => {
+  let mockCoreSetup: CoreSetup;
+  let fieldFormatRegisty: FieldFormatRegisty;
+
+  beforeEach(() => {
+    mockCoreSetup = coreMock.createSetup();
+    fieldFormatRegisty = new FieldFormatRegisty();
+  });
+
+  test('should allows to create an instance of "FieldFormatRegisty"', () => {
+    expect(fieldFormatRegisty).toBeDefined();
+    expect(getValueOfPrivateField(fieldFormatRegisty, 'fieldFormats')).toBeDefined();
+    expect(getValueOfPrivateField(fieldFormatRegisty, 'defaultMap')).toEqual({});
+  });
+
+  describe('init', () => {
+    test('should provide an public "init" method', () => {
+      expect(fieldFormatRegisty.init).toBeDefined();
+      expect(typeof fieldFormatRegisty.init).toBe('function');
+    });
+
+    test('should set basePath value from "init" method', () => {
+      fieldFormatRegisty.init(mockCoreSetup);
+
+      expect(getValueOfPrivateField(fieldFormatRegisty, 'basePath')).toBe(
+        mockCoreSetup.http.basePath.get()
+      );
+    });
+
+    test('should populate the "defaultMap" object', () => {
+      const defaultMap = {
+        number: { id: 'number', params: {} },
+      };
+
+      mockCoreSetup.uiSettings.get = getUiSettingsMock(defaultMap);
+      fieldFormatRegisty.init(mockCoreSetup);
+      expect(getValueOfPrivateField(fieldFormatRegisty, 'defaultMap')).toEqual(defaultMap);
+    });
+  });
+
+  describe('register', () => {
+    test('should provide an public "register" method', () => {
+      expect(fieldFormatRegisty.register).toBeDefined();
+      expect(typeof fieldFormatRegisty.register).toBe('function');
+    });
+
+    test('should register field formats', () => {
+      fieldFormatRegisty.register([StringFormat, BoolFormat]);
+
+      const registeredFieldFormatters: Map<string, IFieldFormatType> = getValueOfPrivateField(
+        fieldFormatRegisty,
+        'fieldFormats'
+      );
+
+      expect(registeredFieldFormatters.size).toBe(2);
+
+      expect(registeredFieldFormatters.get(BoolFormat.id)).toBe(BoolFormat);
+      expect(registeredFieldFormatters.get(StringFormat.id)).toBe(StringFormat);
+      expect(registeredFieldFormatters.get(PercentFormat.id)).toBeUndefined();
+    });
+  });
+
+  describe('getType', () => {
+    test('should provide an public "getType" method', () => {
+      expect(fieldFormatRegisty.getType).toBeDefined();
+      expect(typeof fieldFormatRegisty.getType).toBe('function');
+    });
+
+    test('should return the registered type of the field format by identifier', () => {
+      fieldFormatRegisty.register([StringFormat]);
+
+      expect(fieldFormatRegisty.getType(StringFormat.id)).toBeDefined();
+    });
+
+    test('should return void if the field format type has not been registered', () => {
+      fieldFormatRegisty.register([BoolFormat]);
+
+      expect(fieldFormatRegisty.getType(StringFormat.id)).toBeUndefined();
+    });
+  });
+
+  describe('fieldFormatMetaParamsDecorator', () => {
+    test('should set meta params for all instances of FieldFormats', () => {
+      fieldFormatRegisty.register([StringFormat]);
+
+      const DecoratedStingFormat = fieldFormatRegisty.getType(StringFormat.id);
+
+      expect(DecoratedStingFormat).toBeDefined();
+
+      if (DecoratedStingFormat) {
+        const stringFormat = new DecoratedStingFormat({
+          foo: 'foo',
+        });
+        const params = getValueOfPrivateField(stringFormat, '_params');
+
+        expect(params).toHaveProperty('foo');
+        expect(params).toHaveProperty('parsedUrl');
+        expect(params.parsedUrl).toHaveProperty('origin');
+        expect(params.parsedUrl).toHaveProperty('pathname');
+        expect(params.parsedUrl).toHaveProperty('basePath');
+      }
+    });
+
+    test('should decorate static fields', () => {
+      fieldFormatRegisty.register([BoolFormat]);
+
+      const DecoratedBoolFormat = fieldFormatRegisty.getType(BoolFormat.id);
+
+      expect(DecoratedBoolFormat).toBeDefined();
+
+      if (DecoratedBoolFormat) {
+        expect(DecoratedBoolFormat.id).toBe(BoolFormat.id);
+        expect(DecoratedBoolFormat.fieldType).toBe(BoolFormat.fieldType);
+      }
+    });
+  });
+
+  describe('getByFieldType', () => {
+    test('should provide an public "getByFieldType" method', () => {
+      expect(fieldFormatRegisty.getByFieldType).toBeDefined();
+      expect(typeof fieldFormatRegisty.getByFieldType).toBe('function');
+    });
+
+    test('should decorate returns types', () => {
+      fieldFormatRegisty.register([StringFormat, BoolFormat]);
+
+      const [DecoratedStringFormat] = fieldFormatRegisty.getByFieldType(KBN_FIELD_TYPES.STRING);
+
+      expect(DecoratedStringFormat).toBeDefined();
+
+      const stingFormat = new DecoratedStringFormat({ foo: 'foo' });
+      const params = getValueOfPrivateField(stingFormat, '_params');
+
+      expect(params).toHaveProperty('foo');
+      expect(params).toHaveProperty('parsedUrl');
+    });
+  });
+});
diff --git a/src/plugins/data/public/field_formats_provider/field_formats.ts b/src/plugins/data/public/field_formats_provider/field_formats.ts
index 20e90b8e4a545..d3d57d42028cd 100644
--- a/src/plugins/data/public/field_formats_provider/field_formats.ts
+++ b/src/plugins/data/public/field_formats_provider/field_formats.ts
@@ -17,8 +17,9 @@
  * under the License.
  */
 
+// eslint-disable-next-line max-classes-per-file
 import { forOwn, isFunction, memoize } from 'lodash';
-import { IUiSettingsClient } from 'kibana/public';
+import { IUiSettingsClient, CoreSetup } from 'kibana/public';
 import {
   ES_FIELD_TYPES,
   KBN_FIELD_TYPES,
@@ -26,6 +27,7 @@ import {
   IFieldFormatType,
   IFieldFormatId,
   FieldFormat,
+  IFieldFormatMetaParams,
 } from '../../common';
 import { FieldType } from './types';
 
@@ -33,6 +35,7 @@ export class FieldFormatRegisty {
   private fieldFormats: Map<IFieldFormatId, IFieldFormatType>;
   private uiSettings!: IUiSettingsClient;
   private defaultMap: Record<string, FieldType>;
+  private basePath?: string;
 
   constructor() {
     this.fieldFormats = new Map();
@@ -41,8 +44,9 @@ export class FieldFormatRegisty {
 
   getConfig = (key: string, override?: any) => this.uiSettings.get(key, override);
 
-  init(uiSettings: IUiSettingsClient) {
+  init({ uiSettings, http }: CoreSetup) {
     this.uiSettings = uiSettings;
+    this.basePath = http.basePath.get();
 
     this.parseDefaultTypeMap(this.uiSettings.get('format:defaultTypeMap'));
 
@@ -73,10 +77,20 @@ export class FieldFormatRegisty {
    * Get a derived FieldFormat class by its id.
    *
    * @param  {IFieldFormatId} formatId - the format id
-   * @return {FieldFormat}
+   * @return {FieldFormat | undefined}
    */
   getType = (formatId: IFieldFormatId): IFieldFormatType | undefined => {
-    return this.fieldFormats.get(formatId);
+    const fieldFormat = this.fieldFormats.get(formatId);
+
+    if (fieldFormat) {
+      const decoratedFieldFormat: any = this.fieldFormatMetaParamsDecorator(fieldFormat);
+
+      if (decoratedFieldFormat) {
+        return decoratedFieldFormat as IFieldFormatType;
+      }
+    }
+
+    return undefined;
   };
 
   /**
@@ -86,7 +100,7 @@ export class FieldFormatRegisty {
    *
    * @param  {KBN_FIELD_TYPES} fieldType
    * @param  {ES_FIELD_TYPES[]} esTypes - Array of ES data types
-   * @return {FieldFormat}
+   * @return {FieldFormat | undefined}
    */
   getDefaultType = (
     fieldType: KBN_FIELD_TYPES,
@@ -102,11 +116,11 @@ export class FieldFormatRegisty {
    * using the format:defaultTypeMap config map
    *
    * @param  {ES_FIELD_TYPES[]} esTypes - Array of ES data types
-   * @return {ES_FIELD_TYPES}
+   * @return {ES_FIELD_TYPES | undefined}
    */
   getTypeNameByEsTypes = (esTypes: ES_FIELD_TYPES[] | undefined): ES_FIELD_TYPES | undefined => {
     if (!Array.isArray(esTypes)) {
-      return;
+      return undefined;
     }
 
     return esTypes.find(type => this.defaultMap[type] && this.defaultMap[type].es);
@@ -136,14 +150,14 @@ export class FieldFormatRegisty {
    * @return {FIELD_FORMATS_INSTANCES[number]}
    */
   getInstance = memoize(
-    (formatId: IFieldFormatId): FieldFormat => {
+    (formatId: IFieldFormatId, params: Record<string, any> = {}): FieldFormat => {
       const DerivedFieldFormat = this.getType(formatId);
 
       if (!DerivedFieldFormat) {
         throw new Error(`Field Format '${formatId}' not found!`);
       }
 
-      return new DerivedFieldFormat({}, this.getConfig);
+      return new DerivedFieldFormat(params, this.getConfig);
     }
   );
 
@@ -190,9 +204,12 @@ export class FieldFormatRegisty {
    * @return {FieldFormat[]}
    */
   getByFieldType(fieldType: KBN_FIELD_TYPES): IFieldFormatType[] {
-    return [...this.fieldFormats.values()].filter(
-      (format: IFieldFormatType) => format.fieldType.indexOf(fieldType) !== -1
-    );
+    return [...this.fieldFormats.values()]
+      .filter((format: IFieldFormatType) => format && format.fieldType.indexOf(fieldType) !== -1)
+      .map(
+        (format: IFieldFormatType) =>
+          this.fieldFormatMetaParamsDecorator(format) as IFieldFormatType
+      );
   }
 
   /**
@@ -217,10 +234,50 @@ export class FieldFormatRegisty {
   }
 
   register = (fieldFormats: IFieldFormatType[]) => {
-    fieldFormats.forEach(fieldFormat => {
-      this.fieldFormats.set(fieldFormat.id, fieldFormat);
-    });
+    fieldFormats.forEach(fieldFormat => this.fieldFormats.set(fieldFormat.id, fieldFormat));
 
     return this;
   };
+
+  /**
+   * FieldFormat decorator - provide a one way to add meta-params for all field formatters
+   *
+   * @private
+   * @param  {IFieldFormatType} fieldFormat - field format type
+   * @return {FieldFormat | undefined}
+   */
+  private fieldFormatMetaParamsDecorator = (
+    fieldFormat: IFieldFormatType
+  ): IFieldFormatType | undefined => {
+    const getMetaParams = (customParams: Record<string, any>) => this.buildMetaParams(customParams);
+
+    if (fieldFormat) {
+      return class DecoratedFieldFormat extends fieldFormat {
+        static id = fieldFormat.id;
+        static fieldType = fieldFormat.fieldType;
+
+        constructor(params: Record<string, any> = {}, getConfig?: Function) {
+          super(getMetaParams(params), getConfig);
+        }
+      };
+    }
+
+    return undefined;
+  };
+
+  /**
+   * Build Meta Params
+   *
+   * @static
+   * @param  {Record<string, any>} custom params
+   * @return {Record<string, any>}
+   */
+  private buildMetaParams = <T extends IFieldFormatMetaParams>(customParams: T): T => ({
+    parsedUrl: {
+      origin: window.location.origin,
+      pathname: window.location.pathname,
+      basePath: this.basePath,
+    },
+    ...customParams,
+  });
 }
diff --git a/src/plugins/data/public/field_formats_provider/field_formats_service.ts b/src/plugins/data/public/field_formats_provider/field_formats_service.ts
index ea1a8af2930b0..42abeecc6fda0 100644
--- a/src/plugins/data/public/field_formats_provider/field_formats_service.ts
+++ b/src/plugins/data/public/field_formats_provider/field_formats_service.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IUiSettingsClient } from 'src/core/public';
+import { CoreSetup } from 'src/core/public';
 import { FieldFormatRegisty } from './field_formats';
 
 import {
@@ -38,19 +38,11 @@ import {
   UrlFormat,
 } from '../../common/';
 
-/**
- * Field Format Service
- * @internal
- */
-interface FieldFormatsServiceDependencies {
-  uiSettings: IUiSettingsClient;
-}
-
 export class FieldFormatsService {
   private readonly fieldFormats: FieldFormatRegisty = new FieldFormatRegisty();
 
-  public setup({ uiSettings }: FieldFormatsServiceDependencies) {
-    this.fieldFormats.init(uiSettings);
+  public setup(core: CoreSetup) {
+    this.fieldFormats.init(core);
 
     this.fieldFormats.register([
       BoolFormat,
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 967887764237d..4b330600417e7 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -90,6 +90,8 @@ export {
   castEsToKbnFieldTypeName,
   getKbnFieldType,
   getKbnTypeNames,
+  // utils
+  parseInterval,
 } from '../common';
 
 // Export plugin after all other imports
diff --git a/src/plugins/data/public/index_patterns/index_patterns/format_hit.ts b/src/plugins/data/public/index_patterns/index_patterns/format_hit.ts
index 02d61f8b32c86..59ee18b3dcb50 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/format_hit.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/format_hit.ts
@@ -19,6 +19,7 @@
 
 import _ from 'lodash';
 import { IndexPattern } from './index_pattern';
+import { ContentType } from '../../../common';
 
 const formattedCache = new WeakMap();
 const partialFormattedCache = new WeakMap();
@@ -26,14 +27,16 @@ const partialFormattedCache = new WeakMap();
 // Takes a hit, merges it with any stored/scripted fields, and with the metaFields
 // returns a formatted version
 export function formatHitProvider(indexPattern: IndexPattern, defaultFormat: any) {
-  function convert(hit: Record<string, any>, val: any, fieldName: string, type: string = 'html') {
+  function convert(
+    hit: Record<string, any>,
+    val: any,
+    fieldName: string,
+    type: ContentType = 'html'
+  ) {
     const field = indexPattern.fields.getByName(fieldName);
-    if (!field) return defaultFormat.convert(val, type);
-    const parsedUrl = {
-      origin: window.location.origin,
-      pathname: window.location.pathname,
-    };
-    return field.format.getConverterFor(type)(val, field, hit, parsedUrl);
+    const format = field ? field.format : defaultFormat;
+
+    return format.convert(val, type, { field, hit });
   }
 
   function formatHit(hit: Record<string, any>, type: string = 'html') {
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts b/src/plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts
index 591290065d024..919115d40b068 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts
@@ -19,7 +19,7 @@
 
 // eslint-disable-next-line max-classes-per-file
 import { IndexPatterns } from './index_patterns';
-import { SavedObjectsClientContract, IUiSettingsClient, HttpServiceBase } from 'kibana/public';
+import { SavedObjectsClientContract, IUiSettingsClient, HttpSetup } from 'kibana/public';
 
 jest.mock('./index_pattern', () => {
   class IndexPattern {
@@ -49,7 +49,7 @@ describe('IndexPatterns', () => {
   beforeEach(() => {
     const savedObjectsClient = {} as SavedObjectsClientContract;
     const uiSettings = {} as IUiSettingsClient;
-    const http = {} as HttpServiceBase;
+    const http = {} as HttpSetup;
 
     indexPatterns = new IndexPatterns(uiSettings, savedObjectsClient, http);
   });
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts
index da58881b5b96e..8d7dd0f054366 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts
@@ -21,7 +21,7 @@ import {
   SavedObjectsClientContract,
   SimpleSavedObject,
   IUiSettingsClient,
-  HttpServiceBase,
+  HttpStart,
 } from 'src/core/public';
 
 import { createIndexPatternCache } from './_pattern_cache';
@@ -39,7 +39,7 @@ export class IndexPatterns {
   constructor(
     config: IUiSettingsClient,
     savedObjectsClient: SavedObjectsClientContract,
-    http: HttpServiceBase
+    http: HttpStart
   ) {
     this.apiClient = new IndexPatternsApiClient(http);
     this.config = config;
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts b/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts
index 961e519338ac4..52d18170168d4 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { HttpServiceBase } from 'src/core/public';
+import { HttpSetup } from 'src/core/public';
 import { indexPatterns } from '../';
 
 const API_BASE_URL: string = `/api/index_patterns/`;
@@ -33,9 +33,9 @@ export interface GetFieldsOptions {
 export type IIndexPatternsApiClient = PublicMethodsOf<IndexPatternsApiClient>;
 
 export class IndexPatternsApiClient {
-  private http: HttpServiceBase;
+  private http: HttpSetup;
 
-  constructor(http: HttpServiceBase) {
+  constructor(http: HttpSetup) {
     this.http = http;
   }
 
diff --git a/src/plugins/data/public/index_patterns/lib/get_from_saved_object.ts b/src/plugins/data/public/index_patterns/lib/get_from_saved_object.ts
index 0faf6f4a10346..60b2023f25609 100644
--- a/src/plugins/data/public/index_patterns/lib/get_from_saved_object.ts
+++ b/src/plugins/data/public/index_patterns/lib/get_from_saved_object.ts
@@ -18,8 +18,9 @@
  */
 
 import { get } from 'lodash';
+import { IIndexPattern } from '../..';
 
-export function getFromSavedObject(savedObject: any) {
+export function getFromSavedObject(savedObject: any): IIndexPattern | undefined {
   if (get(savedObject, 'attributes.fields') === undefined) {
     return;
   }
diff --git a/src/plugins/data/public/query/timefilter/get_time.ts b/src/plugins/data/public/query/timefilter/get_time.ts
index d3fbc17734f81..76f39da1cf706 100644
--- a/src/plugins/data/public/query/timefilter/get_time.ts
+++ b/src/plugins/data/public/query/timefilter/get_time.ts
@@ -18,10 +18,10 @@
  */
 
 import dateMath from '@elastic/datemath';
-import { TimeRange } from '../../../common';
+import { IIndexPattern } from '../..';
+import { TimeRange, IFieldType } from '../../../common';
 
 // TODO: remove this
-import { IndexPattern, Field } from '../../../../../legacy/core_plugins/data/public';
 import { esFilters } from '../../../common';
 
 interface CalculateBoundsOptions {
@@ -36,7 +36,7 @@ export function calculateBounds(timeRange: TimeRange, options: CalculateBoundsOp
 }
 
 export function getTime(
-  indexPattern: IndexPattern | undefined,
+  indexPattern: IIndexPattern | undefined,
   timeRange: TimeRange,
   forceNow?: Date
 ) {
@@ -45,7 +45,7 @@ export function getTime(
     return;
   }
 
-  const timefield: Field | undefined = indexPattern.fields.find(
+  const timefield: IFieldType | undefined = indexPattern.fields.find(
     field => field.name === indexPattern.timeFieldName
   );
 
diff --git a/src/plugins/data/public/query/timefilter/timefilter.ts b/src/plugins/data/public/query/timefilter/timefilter.ts
index 639f3f4a66f18..58806a9328b1c 100644
--- a/src/plugins/data/public/query/timefilter/timefilter.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter.ts
@@ -20,13 +20,13 @@
 import _ from 'lodash';
 import { Subject, BehaviorSubject } from 'rxjs';
 import moment from 'moment';
-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';
 import { RefreshInterval, TimeRange } from '../../../common';
 import { TimeHistoryContract } from './time_history';
+import { IndexPattern } from '../../index_patterns';
 
 // TODO: remove!
 
diff --git a/src/plugins/data/public/services.ts b/src/plugins/data/public/services.ts
index 4a832105b6991..76b3283220f67 100644
--- a/src/plugins/data/public/services.ts
+++ b/src/plugins/data/public/services.ts
@@ -22,6 +22,7 @@ import { CoreStart } from 'kibana/public';
 import { FieldFormatsStart } from '.';
 import { createGetterSetter } from '../../kibana_utils/public';
 import { IndexPatternsContract } from './index_patterns';
+import { DataPublicPluginStart } from './types';
 
 export const [getNotifications, setNotifications] = createGetterSetter<NotificationsStart>(
   'Notifications'
@@ -36,3 +37,7 @@ export const [getOverlays, setOverlays] = createGetterSetter<CoreStart['overlays
 export const [getIndexPatterns, setIndexPatterns] = createGetterSetter<IndexPatternsContract>(
   'IndexPatterns'
 );
+
+export const [getQueryService, setQueryService] = createGetterSetter<
+  DataPublicPluginStart['query']
+>('Query');
diff --git a/src/plugins/data/public/suggestions_provider/value_suggestions.ts b/src/plugins/data/public/suggestions_provider/value_suggestions.ts
index 68076cd43c336..e64156c290db1 100644
--- a/src/plugins/data/public/suggestions_provider/value_suggestions.ts
+++ b/src/plugins/data/public/suggestions_provider/value_suggestions.ts
@@ -19,13 +19,13 @@
 
 import { memoize } from 'lodash';
 
-import { IUiSettingsClient, HttpServiceBase } from 'src/core/public';
+import { IUiSettingsClient, HttpSetup } from 'src/core/public';
 import { IGetSuggestions } from './types';
 import { IFieldType } from '../../common';
 
 export function getSuggestionsProvider(
   uiSettings: IUiSettingsClient,
-  http: HttpServiceBase
+  http: HttpSetup
 ): IGetSuggestions {
   const requestSuggestions = memoize(
     (
diff --git a/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx b/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx
index ad453c4e5d11d..829c8205a8b52 100644
--- a/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx
+++ b/src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx
@@ -20,18 +20,21 @@
 import _ from 'lodash';
 import React, { Component } from 'react';
 
-import { EuiComboBox } from '@elastic/eui';
+import { Required } from '@kbn/utility-types';
+import { EuiComboBox, EuiComboBoxProps } from '@elastic/eui';
+
 import { SavedObjectsClientContract, SimpleSavedObject } from '../../../../../core/public';
 import { getTitle } from '../../index_patterns/lib';
 
-export interface IndexPatternSelectProps {
-  onChange: (opt: any) => void;
+export type IndexPatternSelectProps = Required<
+  Omit<EuiComboBoxProps<any>, 'isLoading' | 'onSearchChange' | 'options' | 'selectedOptions'>,
+  'onChange' | 'placeholder'
+> & {
   indexPatternId: string;
-  placeholder: string;
-  fieldTypes: string[];
-  onNoIndexPatterns: () => void;
+  fieldTypes?: string[];
+  onNoIndexPatterns?: () => void;
   savedObjectsClient: SavedObjectsClientContract;
-}
+};
 
 interface IndexPatternSelectState {
   isLoading: boolean;
@@ -136,7 +139,7 @@ export class IndexPatternSelect extends Component<IndexPatternSelectProps> {
         try {
           const indexPatternFields = JSON.parse(savedObject.attributes.fields as any);
           return indexPatternFields.some((field: any) => {
-            return fieldTypes.includes(field.type);
+            return fieldTypes?.includes(field.type);
           });
         } catch (err) {
           // Unable to parse fields JSON, invalid index pattern
@@ -196,6 +199,7 @@ export class IndexPatternSelect extends Component<IndexPatternSelectProps> {
 
     return (
       <EuiComboBox
+        {...rest}
         placeholder={placeholder}
         singleSelection={true}
         isLoading={this.state.isLoading}
@@ -203,7 +207,6 @@ export class IndexPatternSelect extends Component<IndexPatternSelectProps> {
         options={this.state.options}
         selectedOptions={this.state.selectedIndexPattern ? [this.state.selectedIndexPattern] : []}
         onChange={this.onChange}
-        {...rest}
       />
     );
   }
diff --git a/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap b/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
index 4de883295bd8a..2fce33793cd46 100644
--- a/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
+++ b/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
@@ -299,7 +299,7 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
               },
             },
             "http": Object {
-              "addLoadingCount": [MockFunction],
+              "addLoadingCountSource": [MockFunction],
               "anonymousPaths": Object {
                 "isAnonymous": [MockFunction],
                 "register": [MockFunction],
@@ -320,8 +320,6 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
               "patch": [MockFunction],
               "post": [MockFunction],
               "put": [MockFunction],
-              "removeAllInterceptors": [MockFunction],
-              "stop": [MockFunction],
             },
             "i18n": Object {
               "Context": [MockFunction],
@@ -920,7 +918,7 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
                       },
                     },
                     "http": Object {
-                      "addLoadingCount": [MockFunction],
+                      "addLoadingCountSource": [MockFunction],
                       "anonymousPaths": Object {
                         "isAnonymous": [MockFunction],
                         "register": [MockFunction],
@@ -941,8 +939,6 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
                       "patch": [MockFunction],
                       "post": [MockFunction],
                       "put": [MockFunction],
-                      "removeAllInterceptors": [MockFunction],
-                      "stop": [MockFunction],
                     },
                     "i18n": Object {
                       "Context": [MockFunction],
@@ -1529,7 +1525,7 @@ exports[`QueryStringInput Should pass the query language to the language switche
               },
             },
             "http": Object {
-              "addLoadingCount": [MockFunction],
+              "addLoadingCountSource": [MockFunction],
               "anonymousPaths": Object {
                 "isAnonymous": [MockFunction],
                 "register": [MockFunction],
@@ -1550,8 +1546,6 @@ exports[`QueryStringInput Should pass the query language to the language switche
               "patch": [MockFunction],
               "post": [MockFunction],
               "put": [MockFunction],
-              "removeAllInterceptors": [MockFunction],
-              "stop": [MockFunction],
             },
             "i18n": Object {
               "Context": [MockFunction],
@@ -2147,7 +2141,7 @@ exports[`QueryStringInput Should pass the query language to the language switche
                       },
                     },
                     "http": Object {
-                      "addLoadingCount": [MockFunction],
+                      "addLoadingCountSource": [MockFunction],
                       "anonymousPaths": Object {
                         "isAnonymous": [MockFunction],
                         "register": [MockFunction],
@@ -2168,8 +2162,6 @@ exports[`QueryStringInput Should pass the query language to the language switche
                       "patch": [MockFunction],
                       "post": [MockFunction],
                       "put": [MockFunction],
-                      "removeAllInterceptors": [MockFunction],
-                      "stop": [MockFunction],
                     },
                     "i18n": Object {
                       "Context": [MockFunction],
@@ -2756,7 +2748,7 @@ exports[`QueryStringInput Should render the given query 1`] = `
               },
             },
             "http": Object {
-              "addLoadingCount": [MockFunction],
+              "addLoadingCountSource": [MockFunction],
               "anonymousPaths": Object {
                 "isAnonymous": [MockFunction],
                 "register": [MockFunction],
@@ -2777,8 +2769,6 @@ exports[`QueryStringInput Should render the given query 1`] = `
               "patch": [MockFunction],
               "post": [MockFunction],
               "put": [MockFunction],
-              "removeAllInterceptors": [MockFunction],
-              "stop": [MockFunction],
             },
             "i18n": Object {
               "Context": [MockFunction],
@@ -3374,7 +3364,7 @@ exports[`QueryStringInput Should render the given query 1`] = `
                       },
                     },
                     "http": Object {
-                      "addLoadingCount": [MockFunction],
+                      "addLoadingCountSource": [MockFunction],
                       "anonymousPaths": Object {
                         "isAnonymous": [MockFunction],
                         "register": [MockFunction],
@@ -3395,8 +3385,6 @@ exports[`QueryStringInput Should render the given query 1`] = `
                       "patch": [MockFunction],
                       "post": [MockFunction],
                       "put": [MockFunction],
-                      "removeAllInterceptors": [MockFunction],
-                      "stop": [MockFunction],
                     },
                     "i18n": Object {
                       "Context": [MockFunction],
diff --git a/src/plugins/data/server/autocomplete/autocomplete_service.ts b/src/plugins/data/server/autocomplete/autocomplete_service.ts
new file mode 100644
index 0000000000000..1b85321aa2185
--- /dev/null
+++ b/src/plugins/data/server/autocomplete/autocomplete_service.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 { CoreSetup, Plugin } from 'kibana/server';
+import { registerRoutes } from './routes';
+
+export class AutocompleteService implements Plugin<void> {
+  public setup(core: CoreSetup) {
+    registerRoutes(core);
+  }
+
+  public start() {}
+}
diff --git a/src/plugins/data/server/autocomplete/index.ts b/src/plugins/data/server/autocomplete/index.ts
new file mode 100644
index 0000000000000..6c10a8c98bdbf
--- /dev/null
+++ b/src/plugins/data/server/autocomplete/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 { AutocompleteService } from './autocomplete_service';
diff --git a/src/plugins/data/server/autocomplete/routes.ts b/src/plugins/data/server/autocomplete/routes.ts
new file mode 100644
index 0000000000000..9134287d2b8ff
--- /dev/null
+++ b/src/plugins/data/server/autocomplete/routes.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.
+ */
+
+import { CoreSetup } from 'kibana/server';
+import { registerValueSuggestionsRoute } from './value_suggestions_route';
+
+export function registerRoutes({ http }: CoreSetup): void {
+  const router = http.createRouter();
+
+  registerValueSuggestionsRoute(router);
+}
diff --git a/src/plugins/data/server/autocomplete/value_suggestions_route.ts b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
new file mode 100644
index 0000000000000..b415e83becf93
--- /dev/null
+++ b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
@@ -0,0 +1,135 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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, map } from 'lodash';
+import { schema } from '@kbn/config-schema';
+import { IRouter } from 'kibana/server';
+
+import { IFieldType, indexPatterns, esFilters } from '../index';
+
+export function registerValueSuggestionsRoute(router: IRouter) {
+  router.post(
+    {
+      path: '/api/kibana/suggestions/values/{index}',
+      validate: {
+        params: schema.object(
+          {
+            index: schema.string(),
+          },
+          { allowUnknowns: false }
+        ),
+        body: schema.object(
+          {
+            field: schema.string(),
+            query: schema.string(),
+            boolFilter: schema.maybe(schema.any()),
+          },
+          { allowUnknowns: false }
+        ),
+      },
+    },
+    async (context, request, response) => {
+      const { client: uiSettings } = context.core.uiSettings;
+      const { field: fieldName, query, boolFilter } = request.body;
+      const { index } = request.params;
+      const { dataClient } = context.core.elasticsearch;
+
+      const autocompleteSearchOptions = {
+        timeout: await uiSettings.get<number>('kibana.autocompleteTimeout'),
+        terminate_after: await uiSettings.get<number>('kibana.autocompleteTerminateAfter'),
+      };
+
+      const indexPattern = await indexPatterns.findIndexPatternById(
+        context.core.savedObjects.client,
+        index
+      );
+
+      const field = indexPattern && indexPatterns.getFieldByName(fieldName, indexPattern);
+      const body = await getBody(autocompleteSearchOptions, field || fieldName, query, boolFilter);
+
+      try {
+        const result = await dataClient.callAsCurrentUser('search', { index, body });
+
+        const buckets: any[] =
+          get(result, 'aggregations.suggestions.buckets') ||
+          get(result, 'aggregations.nestedSuggestions.suggestions.buckets');
+
+        return response.ok({ body: map(buckets || [], 'key') });
+      } catch (error) {
+        return response.internalError({ body: error });
+      }
+    }
+  );
+}
+
+async function getBody(
+  { timeout, terminate_after }: Record<string, any>,
+  field: IFieldType | string,
+  query: string,
+  boolFilter: esFilters.Filter[] = []
+) {
+  const isFieldObject = (f: any): f is IFieldType => Boolean(f && f.name);
+
+  // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html#_standard_operators
+  const getEscapedQuery = (q: string = '') =>
+    q.replace(/[.?+*|{}[\]()"\\#@&<>~]/g, match => `\\${match}`);
+
+  // Helps ensure that the regex is not evaluated eagerly against the terms dictionary
+  const executionHint = 'map';
+
+  // We don't care about the accuracy of the counts, just the content of the terms, so this reduces
+  // the amount of information that needs to be transmitted to the coordinating node
+  const shardSize = 10;
+  const body = {
+    size: 0,
+    timeout,
+    terminate_after,
+    query: {
+      bool: {
+        filter: boolFilter,
+      },
+    },
+    aggs: {
+      suggestions: {
+        terms: {
+          field: isFieldObject(field) ? field.name : field,
+          include: `${getEscapedQuery(query)}.*`,
+          execution_hint: executionHint,
+          shard_size: shardSize,
+        },
+      },
+    },
+  };
+
+  if (isFieldObject(field) && field.subType && field.subType.nested) {
+    return {
+      ...body,
+      aggs: {
+        nestedSuggestions: {
+          nested: {
+            path: field.subType.nested.path,
+          },
+          aggs: body.aggs,
+        },
+      },
+    };
+  }
+
+  return body;
+}
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index 022eb0ae50295..8194e9a6c847e 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -47,6 +47,8 @@ export {
   // timefilter
   RefreshInterval,
   TimeRange,
+  // utils
+  parseInterval,
 } from '../common';
 
 /**
@@ -57,6 +59,7 @@ export {
   IndexPatternsFetcher,
   FieldDescriptor,
   shouldReadFieldFromDocValues,
+  indexPatterns,
 } from './index_patterns';
 export * from './search';
 export {
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
index 5f1493a49ab7d..f563976cae9b8 100644
--- a/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/index_patterns_fetcher.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { APICaller } from 'src/core/server';
+import { APICaller } from 'kibana/server';
 
 import { getFieldCapabilities, resolveTimePattern, createNoMatchingIndicesError } from './lib';
 
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
index 92b64fafddd66..734e845e85769 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/es_api.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { APICaller } from 'src/core/server';
+import { APICaller } from 'kibana/server';
 import { convertEsError } from './errors';
 import { FieldCapsResponse } from './field_capabilities';
 
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
index c275fb714088e..2a30c89342cf3 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
@@ -19,7 +19,7 @@
 
 import { defaults, indexBy, sortBy } from 'lodash';
 
-import { APICaller } from 'src/core/server';
+import { APICaller } from 'kibana/server';
 import { callFieldCapsApi } from '../es_api';
 import { FieldCapsResponse, readFieldCapsResponse } from './field_caps_response';
 import { mergeOverrides } from './overrides';
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
index d8c56a8082cb1..7504d7bc9c460 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/resolve_time_pattern.ts
@@ -20,7 +20,7 @@
 import { chain } from 'lodash';
 import moment from 'moment';
 
-import { APICaller } from 'src/core/server';
+import { APICaller } from 'kibana/server';
 
 import { timePatternToWildcard } from './time_pattern_to_wildcard';
 import { callIndexAliasApi, IndicesAliasResponse } from './es_api';
diff --git a/src/plugins/data/server/index_patterns/index.ts b/src/plugins/data/server/index_patterns/index.ts
index 6937fa22c4e5d..b303ae30ea810 100644
--- a/src/plugins/data/server/index_patterns/index.ts
+++ b/src/plugins/data/server/index_patterns/index.ts
@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import * as indexPatterns from './utils';
 
 export { IndexPatternsFetcher, FieldDescriptor, shouldReadFieldFromDocValues } from './fetcher';
 export { IndexPatternsService } from './index_patterns_service';
+export { indexPatterns };
diff --git a/src/plugins/data/server/index_patterns/index_patterns_service.ts b/src/plugins/data/server/index_patterns/index_patterns_service.ts
index 30d199c0e522e..78f34e21b9e41 100644
--- a/src/plugins/data/server/index_patterns/index_patterns_service.ts
+++ b/src/plugins/data/server/index_patterns/index_patterns_service.ts
@@ -17,13 +17,12 @@
  * under the License.
  */
 
-import { CoreSetup } from 'kibana/server';
-import { Plugin } from '../../../../core/server';
+import { CoreSetup, Plugin } from 'kibana/server';
 import { registerRoutes } from './routes';
 
 export class IndexPatternsService implements Plugin<void> {
-  public setup({ http, elasticsearch }: CoreSetup) {
-    registerRoutes(http, elasticsearch);
+  public setup({ http }: CoreSetup) {
+    registerRoutes(http);
   }
 
   public start() {}
diff --git a/src/plugins/data/server/index_patterns/routes.ts b/src/plugins/data/server/index_patterns/routes.ts
index 7975e923e219b..8f017a73083ec 100644
--- a/src/plugins/data/server/index_patterns/routes.ts
+++ b/src/plugins/data/server/index_patterns/routes.ts
@@ -17,28 +17,11 @@
  * under the License.
  */
 
-import { first } from 'rxjs/operators';
 import { schema } from '@kbn/config-schema';
-import {
-  CoreSetup,
-  KibanaRequest,
-  RequestHandlerContext,
-  APICaller,
-  CallAPIOptions,
-} from '../../../../core/server';
+import { HttpServiceSetup, RequestHandlerContext } from 'kibana/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)));
-  };
-
+export function registerRoutes(http: HttpServiceSetup) {
   const parseMetaFields = (metaFields: string | string[]) => {
     let parsedFields: string[] = [];
     if (typeof metaFields === 'string') {
@@ -62,8 +45,9 @@ export function registerRoutes(http: CoreSetup['http'], elasticsearch: CoreSetup
         }),
       },
     },
-    async (context: RequestHandlerContext, request: any, response: any) => {
-      const indexPatterns = await getIndexPatternsService(request);
+    async (context, request, response) => {
+      const { callAsCurrentUser } = context.core.elasticsearch.dataClient;
+      const indexPatterns = new IndexPatternsFetcher(callAsCurrentUser);
       const { pattern, meta_fields: metaFields } = request.query;
 
       let parsedFields: string[] = [];
@@ -106,7 +90,8 @@ export function registerRoutes(http: CoreSetup['http'], elasticsearch: CoreSetup
       },
     },
     async (context: RequestHandlerContext, request: any, response: any) => {
-      const indexPatterns = await getIndexPatternsService(request);
+      const { callAsCurrentUser } = context.core.elasticsearch.dataClient;
+      const indexPatterns = new IndexPatternsFetcher(callAsCurrentUser);
       const { pattern, interval, look_back: lookBack, meta_fields: metaFields } = request.query;
 
       let parsedFields: string[] = [];
diff --git a/src/plugins/data/server/index_patterns/utils.ts b/src/plugins/data/server/index_patterns/utils.ts
new file mode 100644
index 0000000000000..b7adafaeb3e94
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/utils.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 { SavedObjectsClientContract } from 'kibana/server';
+import { IIndexPattern, IFieldType } from '../../common';
+
+export const getFieldByName = (
+  fieldName: string,
+  indexPattern: IIndexPattern
+): IFieldType | undefined => {
+  const fields: IFieldType[] = indexPattern && JSON.parse(indexPattern.attributes.fields);
+  const field = fields && fields.find(f => f.name === fieldName);
+
+  return field;
+};
+
+export const findIndexPatternById = async (
+  savedObjectsClient: SavedObjectsClientContract,
+  index: string
+): Promise<IIndexPattern | undefined> => {
+  const savedObjectsResponse = await savedObjectsClient.find<any>({
+    type: 'index-pattern',
+    fields: ['fields'],
+    search: `"${index}"`,
+    searchFields: ['title'],
+  });
+
+  if (savedObjectsResponse.total > 0) {
+    return (savedObjectsResponse.saved_objects[0] as unknown) as IIndexPattern;
+  }
+};
diff --git a/src/plugins/data/server/kql_telemetry/index.ts b/src/plugins/data/server/kql_telemetry/index.ts
new file mode 100644
index 0000000000000..0191113d95007
--- /dev/null
+++ b/src/plugins/data/server/kql_telemetry/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 { KqlTelemetryService } from './kql_telemetry_service';
diff --git a/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts b/src/plugins/data/server/kql_telemetry/kql_telemetry_service.ts
new file mode 100644
index 0000000000000..8f68e63703d40
--- /dev/null
+++ b/src/plugins/data/server/kql_telemetry/kql_telemetry_service.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 { first } from 'rxjs/operators';
+import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import { registerKqlTelemetryRoute } from './route';
+import { UsageCollectionSetup } from '../../../usage_collection/server';
+import { makeKQLUsageCollector } from './usage_collector';
+
+export class KqlTelemetryService implements Plugin<void> {
+  constructor(private initializerContext: PluginInitializerContext) {}
+
+  public setup(
+    { http, savedObjects }: CoreSetup,
+    { usageCollection }: { usageCollection?: UsageCollectionSetup }
+  ) {
+    registerKqlTelemetryRoute(
+      http.createRouter(),
+      savedObjects,
+      this.initializerContext.logger.get('data', 'kql-telemetry')
+    );
+
+    if (usageCollection) {
+      this.initializerContext.config.legacy.globalConfig$
+        .pipe(first())
+        .toPromise()
+        .then(config => makeKQLUsageCollector(usageCollection, config.kibana.index))
+        .catch(e => {
+          this.initializerContext.logger
+            .get('kql-telemetry')
+            .warn(`Registering KQL telemetry collector failed: ${e}`);
+        });
+    }
+  }
+
+  public start() {}
+}
diff --git a/src/plugins/data/server/kql_telemetry/route.ts b/src/plugins/data/server/kql_telemetry/route.ts
new file mode 100644
index 0000000000000..3185da22b12b3
--- /dev/null
+++ b/src/plugins/data/server/kql_telemetry/route.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 { CoreSetup, IRouter, Logger } from 'kibana/server';
+import { schema } from '@kbn/config-schema';
+
+export function registerKqlTelemetryRoute(
+  router: IRouter,
+  savedObjects: CoreSetup['savedObjects'],
+  logger: Logger
+) {
+  router.post(
+    {
+      path: '/api/kibana/kql_opt_in_telemetry',
+      validate: {
+        body: schema.object({
+          opt_in: schema.boolean(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      const internalRepository = savedObjects.createScopedRepository(request);
+
+      const {
+        body: { opt_in: optIn },
+      } = request;
+
+      const counterName = optIn ? 'optInCount' : 'optOutCount';
+
+      try {
+        await internalRepository.incrementCounter('kql-telemetry', 'kql-telemetry', counterName);
+      } catch (error) {
+        logger.warn(`Unable to increment counter: ${error}`);
+        return response.customError({
+          statusCode: error.status,
+          body: {
+            message: 'Something went wrong',
+            attributes: {
+              success: false,
+            },
+          },
+        });
+      }
+
+      return response.ok({ body: { success: true } });
+    }
+  );
+}
diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
new file mode 100644
index 0000000000000..446320b09757a
--- /dev/null
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.test.ts
@@ -0,0 +1,126 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { fetchProvider } from './fetch';
+import { APICaller } from 'kibana/server';
+
+jest.mock('../../../common', () => ({
+  DEFAULT_QUERY_LANGUAGE: 'lucene',
+}));
+
+let fetch: ReturnType<typeof fetchProvider>;
+let callCluster: APICaller;
+
+function setupMockCallCluster(
+  optCount: { optInCount?: number; optOutCount?: number } | null,
+  language: string | undefined | null
+) {
+  callCluster = (jest.fn((method, params) => {
+    if (params && 'id' in params && params.id === 'kql-telemetry:kql-telemetry') {
+      if (optCount === null) {
+        return Promise.resolve({
+          _index: '.kibana_1',
+          _id: 'kql-telemetry:kql-telemetry',
+          found: false,
+        });
+      } else {
+        return Promise.resolve({
+          _source: {
+            'kql-telemetry': {
+              ...optCount,
+            },
+            type: 'kql-telemetry',
+            updated_at: '2018-10-05T20:20:56.258Z',
+          },
+        });
+      }
+    } else if (params && 'body' in params && params.body.query.term.type === 'config') {
+      if (language === 'missingConfigDoc') {
+        return Promise.resolve({
+          hits: {
+            hits: [],
+          },
+        });
+      } else {
+        return Promise.resolve({
+          hits: {
+            hits: [
+              {
+                _source: {
+                  config: {
+                    'search:queryLanguage': language,
+                  },
+                },
+              },
+            ],
+          },
+        });
+      }
+    }
+
+    throw new Error('invalid call');
+  }) as unknown) as APICaller;
+}
+
+describe('makeKQLUsageCollector', () => {
+  describe('fetch method', () => {
+    beforeEach(() => {
+      fetch = fetchProvider('.kibana');
+    });
+
+    it('should return opt in data from the .kibana/kql-telemetry doc', async () => {
+      setupMockCallCluster({ optInCount: 1 }, 'kuery');
+      const fetchResponse = await fetch(callCluster);
+      expect(fetchResponse.optInCount).toBe(1);
+      expect(fetchResponse.optOutCount).toBe(0);
+    });
+
+    it('should return the default query language set in advanced settings', async () => {
+      setupMockCallCluster({ optInCount: 1 }, 'kuery');
+      const fetchResponse = await fetch(callCluster);
+      expect(fetchResponse.defaultQueryLanguage).toBe('kuery');
+    });
+
+    // Indicates the user has modified the setting at some point but the value is currently the default
+    it('should return the kibana default query language if the config value is null', async () => {
+      setupMockCallCluster({ optInCount: 1 }, null);
+      const fetchResponse = await fetch(callCluster);
+      expect(fetchResponse.defaultQueryLanguage).toBe('lucene');
+    });
+
+    it('should indicate when the default language has never been modified by the user', async () => {
+      setupMockCallCluster({ optInCount: 1 }, undefined);
+      const fetchResponse = await fetch(callCluster);
+      expect(fetchResponse.defaultQueryLanguage).toBe('default-lucene');
+    });
+
+    it('should default to 0 opt in counts if the .kibana/kql-telemetry doc does not exist', async () => {
+      setupMockCallCluster(null, 'kuery');
+      const fetchResponse = await fetch(callCluster);
+      expect(fetchResponse.optInCount).toBe(0);
+      expect(fetchResponse.optOutCount).toBe(0);
+    });
+
+    it('should default to the kibana default language if the config document does not exist', async () => {
+      setupMockCallCluster(null, 'missingConfigDoc');
+      const fetchResponse = await fetch(callCluster);
+      expect(fetchResponse.defaultQueryLanguage).toBe('default-lucene');
+    });
+  });
+});
diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.ts
new file mode 100644
index 0000000000000..9f3437161541f
--- /dev/null
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/fetch.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 { get } from 'lodash';
+import { APICaller } from 'kibana/server';
+import { DEFAULT_QUERY_LANGUAGE } from '../../../common';
+
+const defaultSearchQueryLanguageSetting = DEFAULT_QUERY_LANGUAGE;
+
+export function fetchProvider(index: string) {
+  return async (callCluster: APICaller) => {
+    const [response, config] = await Promise.all([
+      callCluster('get', {
+        index,
+        id: 'kql-telemetry:kql-telemetry',
+        ignore: [404],
+      }),
+      callCluster('search', {
+        index,
+        body: { query: { term: { type: 'config' } } },
+        ignore: [404],
+      }),
+    ]);
+
+    const queryLanguageConfigValue = get(
+      config,
+      'hits.hits[0]._source.config.search:queryLanguage'
+    );
+
+    // search:queryLanguage can potentially be in four states in the .kibana index:
+    // 1. undefined: this means the user has never touched this setting
+    // 2. null: this means the user has touched the setting, but the current value matches the default
+    // 3. 'kuery' or 'lucene': this means the user has explicitly selected the given non-default language
+    //
+    // It's nice to know if the user has never touched the setting or if they tried kuery then
+    // went back to the default, so I preserve this info by prefixing the language name with
+    // 'default-' when the value in .kibana is undefined (case #1).
+    let defaultLanguage;
+    if (queryLanguageConfigValue === undefined) {
+      defaultLanguage = `default-${defaultSearchQueryLanguageSetting}`;
+    } else if (queryLanguageConfigValue === null) {
+      defaultLanguage = defaultSearchQueryLanguageSetting;
+    } else {
+      defaultLanguage = queryLanguageConfigValue;
+    }
+
+    const kqlTelemetryDoc = {
+      optInCount: 0,
+      optOutCount: 0,
+      ...get(response, '_source.kql-telemetry', {}),
+    };
+
+    return {
+      ...kqlTelemetryDoc,
+      defaultQueryLanguage: defaultLanguage,
+    };
+  };
+}
diff --git a/src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/index.js b/src/plugins/data/server/kql_telemetry/usage_collector/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/server/lib/kql_usage_collector/index.js
rename to src/plugins/data/server/kql_telemetry/usage_collector/index.ts
diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.test.ts b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.test.ts
new file mode 100644
index 0000000000000..97a714f09474b
--- /dev/null
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.test.ts
@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { makeKQLUsageCollector } from './make_kql_usage_collector';
+import { UsageCollectionSetup } from '../../../../usage_collection/server';
+
+describe('makeKQLUsageCollector', () => {
+  let usageCollectionMock: jest.Mocked<UsageCollectionSetup>;
+
+  beforeEach(() => {
+    usageCollectionMock = ({
+      makeUsageCollector: jest.fn(),
+      registerCollector: jest.fn(),
+    } as unknown) as jest.Mocked<UsageCollectionSetup>;
+  });
+
+  it('should call registerCollector', () => {
+    makeKQLUsageCollector(usageCollectionMock, '.kibana');
+    expect(usageCollectionMock.registerCollector).toHaveBeenCalledTimes(1);
+  });
+
+  it('should call makeUsageCollector with type = kql', () => {
+    makeKQLUsageCollector(usageCollectionMock, '.kibana');
+    expect(usageCollectionMock.makeUsageCollector).toHaveBeenCalledTimes(1);
+    expect(usageCollectionMock.makeUsageCollector.mock.calls[0][0].type).toBe('kql');
+  });
+});
diff --git a/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.ts
new file mode 100644
index 0000000000000..db4c9a8f0b4c7
--- /dev/null
+++ b/src/plugins/data/server/kql_telemetry/usage_collector/make_kql_usage_collector.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 { fetchProvider } from './fetch';
+import { UsageCollectionSetup } from '../../../../usage_collection/server';
+
+export async function makeKQLUsageCollector(
+  usageCollection: UsageCollectionSetup,
+  kibanaIndex: string
+) {
+  const fetch = fetchProvider(kibanaIndex);
+  const kqlUsageCollector = usageCollection.makeUsageCollector({
+    type: 'kql',
+    fetch,
+    isReady: () => true,
+  });
+
+  usageCollection.registerCollector(kqlUsageCollector);
+}
diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts
index e81250e653ebd..591fdb4c4080d 100644
--- a/src/plugins/data/server/plugin.ts
+++ b/src/plugins/data/server/plugin.ts
@@ -21,22 +21,42 @@ import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../..
 import { IndexPatternsService } from './index_patterns';
 import { ISearchSetup } from './search';
 import { SearchService } from './search/search_service';
+import { ScriptsService } from './scripts';
+import { KqlTelemetryService } from './kql_telemetry';
+import { UsageCollectionSetup } from '../../usage_collection/server';
+import { AutocompleteService } from './autocomplete';
 
 export interface DataPluginSetup {
   search: ISearchSetup;
 }
+
+export interface DataPluginSetupDependencies {
+  usageCollection?: UsageCollectionSetup;
+}
 export class DataServerPlugin implements Plugin<DataPluginSetup> {
   private readonly searchService: SearchService;
+  private readonly scriptsService: ScriptsService;
+  private readonly kqlTelemetryService: KqlTelemetryService;
+  private readonly autocompleteService = new AutocompleteService();
   private readonly indexPatterns = new IndexPatternsService();
+
   constructor(initializerContext: PluginInitializerContext) {
     this.searchService = new SearchService(initializerContext);
+    this.scriptsService = new ScriptsService();
+    this.kqlTelemetryService = new KqlTelemetryService(initializerContext);
   }
-  public setup(core: CoreSetup) {
+
+  public setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies) {
     this.indexPatterns.setup(core);
+    this.scriptsService.setup(core);
+    this.autocompleteService.setup(core);
+    this.kqlTelemetryService.setup(core, { usageCollection });
+
     return {
       search: this.searchService.setup(core),
     };
   }
+
   public start(core: CoreStart) {}
   public stop() {}
 }
diff --git a/src/plugins/data/server/scripts/index.ts b/src/plugins/data/server/scripts/index.ts
new file mode 100644
index 0000000000000..d4a3e70fdbf53
--- /dev/null
+++ b/src/plugins/data/server/scripts/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 { ScriptsService } from './scripts_service';
diff --git a/src/plugins/data/server/scripts/route.ts b/src/plugins/data/server/scripts/route.ts
new file mode 100644
index 0000000000000..3eb77f09b25cd
--- /dev/null
+++ b/src/plugins/data/server/scripts/route.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 'kibana/server';
+
+export function registerScriptsRoute(router: IRouter) {
+  router.get(
+    { path: '/api/kibana/scripts/languages', validate: false },
+    async (context, request, response) => {
+      return response.ok({
+        body: ['painless', 'expression'],
+      });
+    }
+  );
+}
diff --git a/src/plugins/data/server/scripts/scripts_service.ts b/src/plugins/data/server/scripts/scripts_service.ts
new file mode 100644
index 0000000000000..9a3a20a64276d
--- /dev/null
+++ b/src/plugins/data/server/scripts/scripts_service.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 { CoreSetup, Plugin } from 'kibana/server';
+import { registerScriptsRoute } from './route';
+
+export class ScriptsService implements Plugin<void> {
+  public setup({ http }: CoreSetup) {
+    registerScriptsRoute(http.createRouter());
+  }
+
+  public start() {}
+}
diff --git a/src/plugins/embeddable/public/index.ts b/src/plugins/embeddable/public/index.ts
index ea2bd910b0624..583b21ddfa433 100644
--- a/src/plugins/embeddable/public/index.ts
+++ b/src/plugins/embeddable/public/index.ts
@@ -55,6 +55,9 @@ export {
   ViewMode,
   isErrorEmbeddable,
   openAddPanelFlyout,
+  withEmbeddableSubscription,
+  EmbeddableFactoryRenderer,
+  EmbeddableRoot,
 } from './lib';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/embeddable/public/lib/containers/i_container.ts b/src/plugins/embeddable/public/lib/containers/i_container.ts
index 8f094447064f0..7da5f92ec92c1 100644
--- a/src/plugins/embeddable/public/lib/containers/i_container.ts
+++ b/src/plugins/embeddable/public/lib/containers/i_container.ts
@@ -45,7 +45,7 @@ export interface ContainerOutput extends EmbeddableOutput {
 export interface ContainerInput<PanelExplicitInput = {}> extends EmbeddableInput {
   hidePanelTitles?: boolean;
   panels: {
-    [key: string]: PanelState<PanelExplicitInput & { id: string }>;
+    [key: string]: PanelState<PanelExplicitInput & { [id: string]: unknown } & { id: string }>;
   };
 }
 
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_renderer.test.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_renderer.test.tsx
new file mode 100644
index 0000000000000..7c3a1c6ca45c4
--- /dev/null
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_renderer.test.tsx
@@ -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 React from 'react';
+import {
+  HELLO_WORLD_EMBEDDABLE,
+  HelloWorldEmbeddableFactory,
+} from '../../../../../../examples/embeddable_examples/public';
+import { EmbeddableFactory } from './embeddable_factory';
+import { GetEmbeddableFactory } from '../types';
+import { EmbeddableFactoryRenderer } from './embeddable_factory_renderer';
+import { mount } from 'enzyme';
+import { nextTick } from 'test_utils/enzyme_helpers';
+// @ts-ignore
+import { findTestSubject } from '@elastic/eui/lib/test';
+
+test('EmbeddableFactoryRenderer renders an embeddable', async () => {
+  const embeddableFactories = new Map<string, EmbeddableFactory>();
+  embeddableFactories.set(HELLO_WORLD_EMBEDDABLE, new HelloWorldEmbeddableFactory());
+  const getEmbeddableFactory: GetEmbeddableFactory = (id: string) => embeddableFactories.get(id);
+
+  const component = mount(
+    <EmbeddableFactoryRenderer
+      getEmbeddableFactory={getEmbeddableFactory}
+      type={HELLO_WORLD_EMBEDDABLE}
+      input={{ id: '123' }}
+    />
+  );
+
+  await nextTick();
+  component.update();
+
+  // Due to the way embeddables mount themselves on the dom node, they are not forced to be
+  // react components, and hence, we can't use the usual
+  // findTestSubject(component, 'subjIdHere');
+  expect(
+    component.getDOMNode().querySelectorAll('[data-test-subj="helloWorldEmbeddable"]').length
+  ).toBe(1);
+});
+
+test('EmbeddableRoot renders an error if the type does not exist', async () => {
+  const getEmbeddableFactory: GetEmbeddableFactory = (id: string) => undefined;
+
+  const component = mount(
+    <EmbeddableFactoryRenderer
+      getEmbeddableFactory={getEmbeddableFactory}
+      type={HELLO_WORLD_EMBEDDABLE}
+      input={{ id: '123' }}
+    />
+  );
+
+  await nextTick();
+  component.update();
+  expect(findTestSubject(component, 'embedSpinner').length).toBe(0);
+  expect(findTestSubject(component, 'embedError').length).toBe(1);
+});
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_renderer.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_renderer.tsx
new file mode 100644
index 0000000000000..1c94319e8d57f
--- /dev/null
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_factory_renderer.tsx
@@ -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 React from 'react';
+import { i18n } from '@kbn/i18n';
+import { IEmbeddable, EmbeddableInput } from './i_embeddable';
+import { EmbeddableRoot } from './embeddable_root';
+import { GetEmbeddableFactory } from '../types';
+
+interface Props {
+  type: string;
+  getEmbeddableFactory: GetEmbeddableFactory;
+  input: EmbeddableInput;
+}
+
+interface State {
+  loading: boolean;
+  error?: string;
+}
+
+export class EmbeddableFactoryRenderer extends React.Component<Props, State> {
+  private embeddable?: IEmbeddable;
+
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      loading: true,
+      error: undefined,
+    };
+  }
+
+  public componentDidMount() {
+    const factory = this.props.getEmbeddableFactory(this.props.type);
+
+    if (factory === undefined) {
+      this.setState({
+        loading: false,
+        error: i18n.translate('embeddableApi.errors.factoryDoesNotExist', {
+          defaultMessage:
+            'Embeddable factory of {type} does not exist. Ensure all neccessary plugins are installed and enabled.',
+          values: {
+            type: this.props.type,
+          },
+        }),
+      });
+      return;
+    }
+
+    factory.create(this.props.input).then(embeddable => {
+      this.embeddable = embeddable;
+      this.setState({ loading: false });
+    });
+  }
+
+  public render() {
+    return (
+      <EmbeddableRoot
+        embeddable={this.embeddable}
+        loading={this.state.loading}
+        error={this.state.error}
+      />
+    );
+  }
+}
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_root.test.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable_root.test.tsx
new file mode 100644
index 0000000000000..c0f2dcf5d0ce2
--- /dev/null
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_root.test.tsx
@@ -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 React from 'react';
+import { HelloWorldEmbeddable } from '../../../../../../examples/embeddable_examples/public';
+import { EmbeddableRoot } from './embeddable_root';
+import { mount } from 'enzyme';
+// @ts-ignore
+import { findTestSubject } from '@elastic/eui/lib/test';
+
+test('EmbeddableRoot renders an embeddable', async () => {
+  const embeddable = new HelloWorldEmbeddable({ id: 'hello' });
+  const component = mount(<EmbeddableRoot embeddable={embeddable} />);
+  // Due to the way embeddables mount themselves on the dom node, they are not forced to be
+  // react components, and hence, we can't use the usual
+  // findTestSubject.
+  expect(
+    component.getDOMNode().querySelectorAll('[data-test-subj="helloWorldEmbeddable"]').length
+  ).toBe(1);
+  expect(findTestSubject(component, 'embedSpinner').length).toBe(0);
+  expect(findTestSubject(component, 'embedError').length).toBe(0);
+});
+
+test('EmbeddableRoot renders a spinner if loading an no embeddable given', async () => {
+  const component = mount(<EmbeddableRoot loading={true} />);
+  // Due to the way embeddables mount themselves on the dom node, they are not forced to be
+  // react components, and hence, we can't use the usual
+  // findTestSubject.
+  expect(findTestSubject(component, 'embedSpinner').length).toBe(1);
+  expect(findTestSubject(component, 'embedError').length).toBe(0);
+});
+
+test('EmbeddableRoot renders an error if given with no embeddable', async () => {
+  const component = mount(<EmbeddableRoot error="bad" />);
+  // Due to the way embeddables mount themselves on the dom node, they are not forced to be
+  // react components, and hence, we can't use the usual
+  // findTestSubject.
+  expect(findTestSubject(component, 'embedError').length).toBe(1);
+  expect(findTestSubject(component, 'embedSpinner').length).toBe(0);
+});
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable_root.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable_root.tsx
new file mode 100644
index 0000000000000..70f417388c007
--- /dev/null
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable_root.tsx
@@ -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 React from 'react';
+import { EuiLoadingSpinner } from '@elastic/eui';
+import { EuiText } from '@elastic/eui';
+import { IEmbeddable } from './i_embeddable';
+
+interface Props {
+  embeddable?: IEmbeddable;
+  loading?: boolean;
+  error?: string;
+}
+
+export class EmbeddableRoot extends React.Component<Props> {
+  private root?: React.RefObject<HTMLDivElement>;
+  private alreadyMounted: boolean = false;
+
+  constructor(props: Props) {
+    super(props);
+
+    this.root = React.createRef();
+  }
+
+  public componentDidMount() {
+    if (this.root && this.root.current && this.props.embeddable) {
+      this.alreadyMounted = true;
+      this.props.embeddable.render(this.root.current);
+    }
+  }
+
+  public componentDidUpdate() {
+    if (this.root && this.root.current && this.props.embeddable && !this.alreadyMounted) {
+      this.alreadyMounted = true;
+      this.props.embeddable.render(this.root.current);
+    }
+  }
+
+  public shouldComponentUpdate(newProps: Props) {
+    return Boolean(
+      newProps.error !== this.props.error ||
+        newProps.loading !== this.props.loading ||
+        newProps.embeddable !== this.props.embeddable ||
+        (this.root && this.root.current && newProps.embeddable && !this.alreadyMounted)
+    );
+  }
+
+  public render() {
+    return (
+      <React.Fragment>
+        <div ref={this.root} />
+        {this.props.loading && <EuiLoadingSpinner data-test-subj="embedSpinner" />}
+        {this.props.error && <EuiText data-test-subj="embedError">{this.props.error}</EuiText>}
+      </React.Fragment>
+    );
+  }
+}
diff --git a/src/plugins/embeddable/public/lib/embeddables/index.ts b/src/plugins/embeddable/public/lib/embeddables/index.ts
index 49c9625454a69..2175c3a59aa58 100644
--- a/src/plugins/embeddable/public/lib/embeddables/index.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/index.ts
@@ -24,3 +24,6 @@ export {
   OutputSpec,
 } from './embeddable_factory';
 export { ErrorEmbeddable, isErrorEmbeddable } from './error_embeddable';
+export { withEmbeddableSubscription } from './with_subscription';
+export { EmbeddableFactoryRenderer } from './embeddable_factory_renderer';
+export { EmbeddableRoot } from './embeddable_root';
diff --git a/src/plugins/embeddable/public/lib/embeddables/with_subscription.tsx b/src/plugins/embeddable/public/lib/embeddables/with_subscription.tsx
new file mode 100644
index 0000000000000..47b8001961cf5
--- /dev/null
+++ b/src/plugins/embeddable/public/lib/embeddables/with_subscription.tsx
@@ -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 React from 'react';
+import * as Rx from 'rxjs';
+import { IEmbeddable, EmbeddableInput, EmbeddableOutput } from './i_embeddable';
+
+export const withEmbeddableSubscription = <
+  I extends EmbeddableInput,
+  O extends EmbeddableOutput,
+  E extends IEmbeddable<I, O> = IEmbeddable<I, O>
+>(
+  WrappedComponent: React.ComponentType<{ input: I; output: O; embeddable: E }>
+): React.ComponentType<{ embeddable: E }> =>
+  class WithEmbeddableSubscription extends React.Component<
+    { embeddable: E },
+    { input: I; output: O }
+  > {
+    private subscription?: Rx.Subscription;
+    private mounted: boolean = false;
+
+    constructor(props: { embeddable: E }) {
+      super(props);
+      this.state = {
+        input: this.props.embeddable.getInput(),
+        output: this.props.embeddable.getOutput(),
+      };
+    }
+
+    componentDidMount() {
+      this.mounted = true;
+
+      this.subscription = Rx.merge(
+        this.props.embeddable.getOutput$(),
+        this.props.embeddable.getInput$()
+      ).subscribe(() => {
+        if (this.mounted) {
+          this.setState({
+            input: this.props.embeddable.getInput(),
+            output: this.props.embeddable.getOutput(),
+          });
+        }
+      });
+    }
+
+    componentWillUnmount() {
+      this.mounted = false;
+      if (this.subscription) {
+        this.subscription.unsubscribe();
+      }
+    }
+
+    render() {
+      return (
+        <WrappedComponent
+          input={this.state.input}
+          output={this.state.output}
+          embeddable={this.props.embeddable}
+        />
+      );
+    }
+  };
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/index.ts b/src/plugins/embeddable/public/lib/test_samples/embeddables/index.ts
index a2f74ac0923c9..d19539ced5903 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/index.ts
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/index.ts
@@ -23,6 +23,5 @@ export * from './filterable_container';
 export * from './filterable_container_factory';
 export * from './filterable_embeddable';
 export * from './filterable_embeddable_factory';
-export * from './hello_world';
 export * from './hello_world_container';
 export * from './hello_world_container_component';
diff --git a/src/plugins/embeddable/public/tests/container.test.ts b/src/plugins/embeddable/public/tests/container.test.ts
index f97c26a41b901..10836c2a9a84f 100644
--- a/src/plugins/embeddable/public/tests/container.test.ts
+++ b/src/plugins/embeddable/public/tests/container.test.ts
@@ -29,8 +29,10 @@ import { ERROR_EMBEDDABLE_TYPE } from '../lib/embeddables/error_embeddable';
 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';
-import { HELLO_WORLD_EMBEDDABLE_TYPE } from '../lib/test_samples/embeddables/hello_world/hello_world_embeddable';
-import { HelloWorldEmbeddableFactory } from '../lib/test_samples/embeddables/hello_world/hello_world_embeddable_factory';
+import {
+  HELLO_WORLD_EMBEDDABLE,
+  HelloWorldEmbeddableFactory,
+} from '../../../../../examples/embeddable_examples/public';
 import { HelloWorldContainer } from '../lib/test_samples/embeddables/hello_world_container';
 import {
   ContactCardEmbeddableInput,
@@ -730,7 +732,7 @@ test('untilEmbeddableLoaded() resolves if child is loaded in the container', asy
       id: 'hello',
       panels: {
         '123': {
-          type: HELLO_WORLD_EMBEDDABLE_TYPE,
+          type: HELLO_WORLD_EMBEDDABLE,
           explicitInput: { id: '123' },
         },
       },
@@ -748,7 +750,7 @@ test('untilEmbeddableLoaded() resolves if child is loaded in the container', asy
 
   const child = await container.untilEmbeddableLoaded('123');
   expect(child).toBeDefined();
-  expect(child.type).toBe(HELLO_WORLD_EMBEDDABLE_TYPE);
+  expect(child.type).toBe(HELLO_WORLD_EMBEDDABLE);
   done();
 });
 
diff --git a/src/plugins/embeddable/public/tests/explicit_input.test.ts b/src/plugins/embeddable/public/tests/explicit_input.test.ts
index 47c4b0944cef2..08875210c7165 100644
--- a/src/plugins/embeddable/public/tests/explicit_input.test.ts
+++ b/src/plugins/embeddable/public/tests/explicit_input.test.ts
@@ -26,8 +26,10 @@ import {
 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';
-import { HELLO_WORLD_EMBEDDABLE_TYPE } from '../lib/test_samples/embeddables/hello_world/hello_world_embeddable';
-import { HelloWorldEmbeddableFactory } from '../lib/test_samples/embeddables/hello_world/hello_world_embeddable_factory';
+import {
+  HELLO_WORLD_EMBEDDABLE,
+  HelloWorldEmbeddableFactory,
+} from '../../../../../examples/embeddable_examples/public';
 import { FilterableContainer } from '../lib/test_samples/embeddables/filterable_container';
 import { isErrorEmbeddable } from '../lib';
 import { HelloWorldContainer } from '../lib/test_samples/embeddables/hello_world_container';
@@ -47,7 +49,7 @@ const factory = new SlowContactCardEmbeddableFactory({
   execAction: uiActions.executeTriggerActions,
 });
 setup.registerEmbeddableFactory(CONTACT_CARD_EMBEDDABLE, factory);
-setup.registerEmbeddableFactory(HELLO_WORLD_EMBEDDABLE_TYPE, new HelloWorldEmbeddableFactory());
+setup.registerEmbeddableFactory(HELLO_WORLD_EMBEDDABLE, new HelloWorldEmbeddableFactory());
 
 test('Explicit embeddable input mapped to undefined will default to inherited', async () => {
   const derivedFilter: esFilters.Filter = {
diff --git a/src/plugins/embeddable/public/tests/test_plugin.ts b/src/plugins/embeddable/public/tests/test_plugin.ts
index 6d1e15137480a..49ee795bcb98a 100644
--- a/src/plugins/embeddable/public/tests/test_plugin.ts
+++ b/src/plugins/embeddable/public/tests/test_plugin.ts
@@ -21,6 +21,7 @@ import { CoreSetup, CoreStart } from 'src/core/public';
 // eslint-disable-next-line
 import { uiActionsTestPlugin } from 'src/plugins/ui_actions/public/tests';
 import { IUiActionsApi } from 'src/plugins/ui_actions/public';
+import { coreMock } from '../../../../core/public/mocks';
 import { EmbeddablePublicPlugin, IEmbeddableSetup, IEmbeddableStart } from '../plugin';
 
 export interface TestPluginReturn {
@@ -33,8 +34,8 @@ export interface TestPluginReturn {
 }
 
 export const testPlugin = (
-  coreSetup: CoreSetup = {} as CoreSetup,
-  coreStart: CoreStart = {} as CoreStart
+  coreSetup: CoreSetup = coreMock.createSetup(),
+  coreStart: CoreStart = coreMock.createStart()
 ): TestPluginReturn => {
   const uiActions = uiActionsTestPlugin(coreSetup, coreStart);
   const initializerContext = {} as any;
diff --git a/src/plugins/es_ui_shared/public/request/np_ready_request.ts b/src/plugins/es_ui_shared/public/request/np_ready_request.ts
index 5a3f28ed76486..b8f7db1463ab8 100644
--- a/src/plugins/es_ui_shared/public/request/np_ready_request.ts
+++ b/src/plugins/es_ui_shared/public/request/np_ready_request.ts
@@ -19,7 +19,7 @@
 
 import { useEffect, useState, useRef } from 'react';
 
-import { HttpServiceBase, HttpFetchQuery } from '../../../../../src/core/public';
+import { HttpSetup, HttpFetchQuery } from '../../../../../src/core/public';
 
 export interface SendRequestConfig {
   path: string;
@@ -48,7 +48,7 @@ export interface UseRequestResponse {
 }
 
 export const sendRequest = async (
-  httpClient: HttpServiceBase,
+  httpClient: HttpSetup,
   { path, method, body, query }: SendRequestConfig
 ): Promise<SendRequestResponse> => {
   try {
@@ -67,7 +67,7 @@ export const sendRequest = async (
 };
 
 export const useRequest = (
-  httpClient: HttpServiceBase,
+  httpClient: HttpSetup,
   {
     path,
     method,
diff --git a/src/plugins/es_ui_shared/static/forms/components/fields/numeric_field.tsx b/src/plugins/es_ui_shared/static/forms/components/fields/numeric_field.tsx
index ad8c006438c3e..92f697f6ae73a 100644
--- a/src/plugins/es_ui_shared/static/forms/components/fields/numeric_field.tsx
+++ b/src/plugins/es_ui_shared/static/forms/components/fields/numeric_field.tsx
@@ -18,7 +18,7 @@
  */
 
 import React from 'react';
-import { EuiFormRow, EuiFieldNumber } from '@elastic/eui';
+import { EuiFormRow, EuiFieldNumber, EuiFieldNumberProps } from '@elastic/eui';
 
 import { FieldHook, getFieldValidityAndErrorMessage } from '../../hook_form_lib';
 
@@ -44,7 +44,7 @@ export const NumericField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
     >
       <EuiFieldNumber
         isInvalid={isInvalid}
-        value={field.value as string}
+        value={field.value as EuiFieldNumberProps['value']}
         onChange={field.onChange}
         isLoading={field.isValidating}
         fullWidth
diff --git a/src/plugins/es_ui_shared/static/forms/helpers/field_validators/index_pattern_field.ts b/src/plugins/es_ui_shared/static/forms/helpers/field_validators/index_pattern_field.ts
index 7f178eabdcd19..48702a32bfde8 100644
--- a/src/plugins/es_ui_shared/static/forms/helpers/field_validators/index_pattern_field.ts
+++ b/src/plugins/es_ui_shared/static/forms/helpers/field_validators/index_pattern_field.ts
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ILLEGAL_CHARACTERS, validateIndexPattern } from 'ui/index_patterns';
 
 import { ValidationFunc } from '../../hook_form_lib';
 import { containsChars } from '../../../validators/string';
 import { ERROR_CODE } from './types';
 
+import { indexPatterns } from '../../../../../data/public';
+
 export const indexPatternField = (i18n: any) => (
   ...args: Parameters<ValidationFunc>
 ): ReturnType<ValidationFunc<any, ERROR_CODE>> => {
@@ -45,9 +46,9 @@ export const indexPatternField = (i18n: any) => (
   }
 
   // Validate illegal characters
-  const errors = validateIndexPattern(value);
+  const errors = indexPatterns.validate(value);
 
-  if (errors[ILLEGAL_CHARACTERS]) {
+  if (errors[indexPatterns.ILLEGAL_CHARACTERS_KEY]) {
     return {
       code: 'ERR_FIELD_FORMAT',
       formatType: 'INDEX_PATTERN',
@@ -55,8 +56,8 @@ export const indexPatternField = (i18n: any) => (
         defaultMessage:
           'The index pattern contains the invalid {characterListLength, plural, one {character} other {characters}} { characterList }.',
         values: {
-          characterList: errors[ILLEGAL_CHARACTERS].join(' '),
-          characterListLength: errors[ILLEGAL_CHARACTERS].length,
+          characterList: errors[indexPatterns.ILLEGAL_CHARACTERS_KEY].join(' '),
+          characterListLength: errors[indexPatterns.ILLEGAL_CHARACTERS_KEY].length,
         },
       }),
     };
diff --git a/src/plugins/expressions/public/expression_renderer.tsx b/src/plugins/expressions/public/expression_renderer.tsx
index 3989f4ed7d698..5c04d8405479f 100644
--- a/src/plugins/expressions/public/expression_renderer.tsx
+++ b/src/plugins/expressions/public/expression_renderer.tsx
@@ -22,9 +22,9 @@ import React from 'react';
 import classNames from 'classnames';
 import { Subscription } from 'rxjs';
 import { filter } from 'rxjs/operators';
+import useShallowCompareEffect from 'react-use/lib/useShallowCompareEffect';
 import { EuiLoadingChart, EuiProgress } from '@elastic/eui';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { useShallowCompareEffect } from '../../kibana_react/public';
 import { IExpressionLoaderParams, IInterpreterRenderHandlers, RenderError } from './types';
 import { ExpressionAST } from '../common/types';
 import { ExpressionLoader } from './loader';
diff --git a/src/plugins/home/README.md b/src/plugins/home/README.md
index 74e12a799b1b7..1ce0ae0bf44d3 100644
--- a/src/plugins/home/README.md
+++ b/src/plugins/home/README.md
@@ -1,13 +1,13 @@
 # home plugin
 Moves the legacy `ui/registry/feature_catalogue` module for registering "features" that should be shown in the home page's feature catalogue to a service within a "home" plugin. The feature catalogue refered to here should not be confused with the "feature" plugin for registering features used to derive UI capabilities for feature controls.
 
-# Feature catalogue (public service)
+## Feature catalogue (public service)
 
 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
+### Example registration
 
 ```ts
 // For legacy plugins
@@ -27,3 +27,28 @@ class MyPlugin {
 ```
 
 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.
+
+## Sample data
+
+Replaces the sample data mixin putting functions on the global `server` object.
+
+### What happens when a user installs a sample data set?
+1) Kibana deletes existing Elastic search indicies for the sample data set if they exist from previous installs.
+2) Kibana creates Elasticsearch indicies with the provided field mappings.
+3) Kibana uses bulk insert to ingest the new-line delimited json into the Elasticsearch index. Kibana migrates timestamps provided in new-line delimited json to the current time frame for any date field defined in `timeFields`
+4) Kibana will install all saved objects for sample data set. This will override any saved objects previouslly installed for sample data set.
+
+Elasticsearch index names are prefixed with `kibana_sample_data_`. For more details see [createIndexName](/src/plugins/home/server/services/sample_data/lib/create_index_name.js)
+
+Sample data sets typically provide data that spans 5 weeks from the past and 5 weeks into the future so users see data relative to `now` for a few weeks after installing sample data sets.
+
+### Adding new sample data sets
+Use [existing sample data sets](/src/plugins/home/server/services/sample_data/data_sets) as examples.
+To avoid bloating the Kibana distribution, keep data set size to a minimum.
+
+Follow the steps below to add new Sample data sets to Kibana.
+1) Create new-line delimited json containing sample data.
+2) Create file with Elasticsearch field mappings for sample data indices.
+3) Create Kibana saved objects for sample data including index-patterns, visualizations, and dashboards. The best way to extract the saved objects is from the Kibana management -> saved objects [export UI](https://www.elastic.co/guide/en/kibana/current/managing-saved-objects.html#_export)
+4) Define sample data spec conforming to [Data Set Schema](/src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts).
+5) Register sample data by calling `plguins.home.sampleData.registerSampleDataset(yourSpecProvider)` in your `setup` method where `yourSpecProvider` is a function that returns an object containing your sample data spec from step 4.
diff --git a/src/plugins/home/kibana.json b/src/plugins/home/kibana.json
index a5c65e3efa597..31e7ebc138dcb 100644
--- a/src/plugins/home/kibana.json
+++ b/src/plugins/home/kibana.json
@@ -2,5 +2,6 @@
   "id": "home",
   "version": "kibana",
   "server": true,
-  "ui": true
+  "ui": true,
+  "optionalPlugins": ["usage_collection"]
 }
diff --git a/src/plugins/home/server/index.ts b/src/plugins/home/server/index.ts
index be4e20ab63d3c..ed336f4a41d6e 100644
--- a/src/plugins/home/server/index.ts
+++ b/src/plugins/home/server/index.ts
@@ -19,6 +19,8 @@
 
 export { HomeServerPluginSetup, HomeServerPluginStart } from './plugin';
 export { TutorialProvider } from './services';
+export { SampleDatasetProvider, SampleDataRegistrySetup } from './services';
+import { PluginInitializerContext } from 'src/core/server';
 import { HomeServerPlugin } from './plugin';
 
-export const plugin = () => new HomeServerPlugin();
+export const plugin = (initContext: PluginInitializerContext) => new HomeServerPlugin(initContext);
diff --git a/src/plugins/home/server/plugin.test.mocks.ts b/src/plugins/home/server/plugin.test.mocks.ts
index a5640de579b15..ac11948c040d0 100644
--- a/src/plugins/home/server/plugin.test.mocks.ts
+++ b/src/plugins/home/server/plugin.test.mocks.ts
@@ -17,8 +17,11 @@
  * under the License.
  */
 import { tutorialsRegistryMock } from './services/tutorials/tutorials_registry.mock';
+import { sampleDataRegistryMock } from './services/sample_data/sample_data_registry.mock';
 
-export const registryMock = tutorialsRegistryMock.create();
+export const registryForTutorialsMock = tutorialsRegistryMock.create();
+export const registryForSampleDataMock = sampleDataRegistryMock.create();
 jest.doMock('./services', () => ({
-  TutorialsRegistry: jest.fn(() => registryMock),
+  TutorialsRegistry: jest.fn(() => registryForTutorialsMock),
+  SampleDataRegistry: jest.fn(() => registryForSampleDataMock),
 }));
diff --git a/src/plugins/home/server/plugin.test.ts b/src/plugins/home/server/plugin.test.ts
index eec6501436bf4..33d907315e512 100644
--- a/src/plugins/home/server/plugin.test.ts
+++ b/src/plugins/home/server/plugin.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { registryMock } from './plugin.test.mocks';
+import { registryForTutorialsMock, registryForSampleDataMock } from './plugin.test.mocks';
 import { HomeServerPlugin } from './plugin';
 import { coreMock } from '../../../core/server/mocks';
 import { CoreSetup } from '../../../core/server';
@@ -26,26 +26,41 @@ type MockedKeys<T> = { [P in keyof T]: jest.Mocked<T[P]> };
 
 describe('HomeServerPlugin', () => {
   beforeEach(() => {
-    registryMock.setup.mockClear();
-    registryMock.start.mockClear();
+    registryForTutorialsMock.setup.mockClear();
+    registryForTutorialsMock.start.mockClear();
+    registryForSampleDataMock.setup.mockClear();
+    registryForSampleDataMock.start.mockClear();
   });
 
   describe('setup', () => {
     const mockCoreSetup: MockedKeys<CoreSetup> = coreMock.createSetup();
+    const initContext = coreMock.createPluginInitializerContext();
 
-    test('wires up and returns registerTutorial and addScopedTutorialContextFactory', () => {
-      const setup = new HomeServerPlugin().setup(mockCoreSetup);
+    test('wires up tutorials provider service and returns registerTutorial and addScopedTutorialContextFactory', () => {
+      const setup = new HomeServerPlugin(initContext).setup(mockCoreSetup, {});
       expect(setup).toHaveProperty('tutorials');
       expect(setup.tutorials).toHaveProperty('registerTutorial');
       expect(setup.tutorials).toHaveProperty('addScopedTutorialContextFactory');
     });
+
+    test('wires up sample data provider service and returns registerTutorial and addScopedTutorialContextFactory', () => {
+      const setup = new HomeServerPlugin(initContext).setup(mockCoreSetup, {});
+      expect(setup).toHaveProperty('sampleData');
+      expect(setup.sampleData).toHaveProperty('registerSampleDataset');
+      expect(setup.sampleData).toHaveProperty('getSampleDatasets');
+      expect(setup.sampleData).toHaveProperty('addSavedObjectsToSampleDataset');
+      expect(setup.sampleData).toHaveProperty('addAppLinksToSampleDataset');
+      expect(setup.sampleData).toHaveProperty('replacePanelInSampleDatasetDashboard');
+    });
   });
 
   describe('start', () => {
+    const initContext = coreMock.createPluginInitializerContext();
     test('is defined', () => {
-      const start = new HomeServerPlugin().start();
+      const start = new HomeServerPlugin(initContext).start();
       expect(start).toBeDefined();
       expect(start).toHaveProperty('tutorials');
+      expect(start).toHaveProperty('sampleData');
     });
   });
 });
diff --git a/src/plugins/home/server/plugin.ts b/src/plugins/home/server/plugin.ts
index 89dda8205ce02..23c236764cddc 100644
--- a/src/plugins/home/server/plugin.ts
+++ b/src/plugins/home/server/plugin.ts
@@ -16,21 +16,37 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { CoreSetup, Plugin } from 'src/core/server';
-import { TutorialsRegistry, TutorialsRegistrySetup, TutorialsRegistryStart } from './services';
+import { CoreSetup, Plugin, PluginInitializerContext } from 'src/core/server';
+import {
+  TutorialsRegistry,
+  TutorialsRegistrySetup,
+  TutorialsRegistryStart,
+  SampleDataRegistry,
+  SampleDataRegistrySetup,
+  SampleDataRegistryStart,
+} from './services';
+import { UsageCollectionSetup } from '../../usage_collection/server';
+
+interface HomeServerPluginSetupDependencies {
+  usage_collection?: UsageCollectionSetup;
+}
 
 export class HomeServerPlugin implements Plugin<HomeServerPluginSetup, HomeServerPluginStart> {
+  constructor(private readonly initContext: PluginInitializerContext) {}
   private readonly tutorialsRegistry = new TutorialsRegistry();
+  private readonly sampleDataRegistry = new SampleDataRegistry(this.initContext);
 
-  public setup(core: CoreSetup) {
+  public setup(core: CoreSetup, plugins: HomeServerPluginSetupDependencies): HomeServerPluginSetup {
     return {
       tutorials: { ...this.tutorialsRegistry.setup(core) },
+      sampleData: { ...this.sampleDataRegistry.setup(core, plugins.usage_collection) },
     };
   }
 
-  public start() {
+  public start(): HomeServerPluginStart {
     return {
       tutorials: { ...this.tutorialsRegistry.start() },
+      sampleData: { ...this.sampleDataRegistry.start() },
     };
   }
 }
@@ -38,9 +54,11 @@ export class HomeServerPlugin implements Plugin<HomeServerPluginSetup, HomeServe
 /** @public */
 export interface HomeServerPluginSetup {
   tutorials: TutorialsRegistrySetup;
+  sampleData: SampleDataRegistrySetup;
 }
 
 /** @public */
 export interface HomeServerPluginStart {
   tutorials: TutorialsRegistryStart;
+  sampleData: SampleDataRegistryStart;
 }
diff --git a/src/plugins/home/server/services/index.ts b/src/plugins/home/server/services/index.ts
index 9bfbe4079c6be..e6df930b34b29 100644
--- a/src/plugins/home/server/services/index.ts
+++ b/src/plugins/home/server/services/index.ts
@@ -33,3 +33,11 @@ export {
   TutorialContextFactory,
   ScopedTutorialContextFactory,
 } from './tutorials';
+
+export {
+  SampleDataRegistry,
+  SampleDataRegistrySetup,
+  SampleDataRegistryStart,
+} from './sample_data';
+
+export { SampleDatasetSchema, SampleDatasetProvider } from './sample_data';
diff --git a/src/legacy/server/sample_data/data_sets/ecommerce/ecommerce.json.gz b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/ecommerce.json.gz
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/ecommerce/ecommerce.json.gz
rename to src/plugins/home/server/services/sample_data/data_sets/ecommerce/ecommerce.json.gz
diff --git a/src/legacy/server/sample_data/data_sets/ecommerce/field_mappings.js b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/field_mappings.ts
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/ecommerce/field_mappings.js
rename to src/plugins/home/server/services/sample_data/data_sets/ecommerce/field_mappings.ts
diff --git a/src/plugins/home/server/services/sample_data/data_sets/ecommerce/index.ts b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/index.ts
new file mode 100644
index 0000000000000..3e16187c44343
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/index.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 path from 'path';
+import { i18n } from '@kbn/i18n';
+import { getSavedObjects } from './saved_objects';
+import { fieldMappings } from './field_mappings';
+import { SampleDatasetSchema, AppLinkSchema } from '../../lib/sample_dataset_registry_types';
+
+const ecommerceName = i18n.translate('home.sampleData.ecommerceSpecTitle', {
+  defaultMessage: 'Sample eCommerce orders',
+});
+const ecommerceDescription = i18n.translate('home.sampleData.ecommerceSpecDescription', {
+  defaultMessage: 'Sample data, visualizations, and dashboards for tracking eCommerce orders.',
+});
+const initialAppLinks = [] as AppLinkSchema[];
+
+export const ecommerceSpecProvider = function(): SampleDatasetSchema {
+  return {
+    id: 'ecommerce',
+    name: ecommerceName,
+    description: ecommerceDescription,
+    previewImagePath: '/plugins/kibana/home/sample_data_resources/ecommerce/dashboard.png',
+    darkPreviewImagePath: '/plugins/kibana/home/sample_data_resources/ecommerce/dashboard_dark.png',
+    overviewDashboard: '722b74f0-b882-11e8-a6d9-e546fe2bba5f',
+    appLinks: initialAppLinks,
+    defaultIndex: 'ff959d40-b880-11e8-a6d9-e546fe2bba5f',
+    savedObjects: getSavedObjects(),
+    dataIndices: [
+      {
+        id: 'ecommerce',
+        dataPath: path.join(__dirname, './ecommerce.json.gz'),
+        fields: fieldMappings,
+        timeFields: ['order_date'],
+        currentTimeMarker: '2016-12-11T00:00:00',
+        preserveDayOfWeekTimeOfDay: true,
+      },
+    ],
+    status: 'not_installed',
+  };
+};
diff --git a/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts
new file mode 100644
index 0000000000000..b2392742c0197
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/data_sets/ecommerce/saved_objects.ts
@@ -0,0 +1,398 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 max-len: 0 */
+/* eslint-disable */
+
+import { i18n } from '@kbn/i18n';
+import { SavedObject } from 'kibana/server';
+
+export const getSavedObjects = (): SavedObject[] => [
+  {
+    id: '37cc8650-b882-11e8-a6d9-e546fe2bba5f',
+    type: 'visualization',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.salesByCategoryTitle', {
+        defaultMessage: '[eCommerce] Sales by Category',
+      }),
+      visState:
+        '{"title":"[eCommerce] Sales by Category","type":"area","params":{"type":"area","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Sum of total_quantity"}}],"seriesParams":[{"show":"true","type":"area","mode":"stacked","data":{"label":"Sum of total_quantity","id":"1"},"drawLinesBetweenPoints":true,"showCircles":true,"interpolate":"linear","valueAxis":"ValueAxis-1"}],"addTooltip":true,"addLegend":true,"legendPosition":"top","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"sum","schema":"metric","params":{"field":"total_quantity"}},{"id":"2","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"order_date","interval":"auto","time_zone":"America/New_York","drop_partials":false,"customInterval":"2h","min_doc_count":1,"extended_bounds":{}}},{"id":"3","enabled":true,"type":"terms","schema":"group","params":{"field":"category.keyword","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: 'ed8436b0-b88b-11e8-a6d9-e546fe2bba5f',
+    type: 'visualization',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.salesByGenderTitle', {
+        defaultMessage: '[eCommerce] Sales by Gender',
+      }),
+      visState:
+        '{"title":"[eCommerce] Sales by Gender","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"customer_gender","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '09ffee60-b88c-11e8-a6d9-e546fe2bba5f',
+    type: 'visualization',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.markdownTitle', {
+        defaultMessage: '[eCommerce] Markdown',
+      }),
+      visState:
+        '{"title":"[eCommerce] Markdown","type":"markdown","params":{"fontSize":12,"openLinksInNewTab":false,"markdown":"### Sample eCommerce Data\\nThis dashboard contains sample data for you to play with. You can view it, search it, and interact with the visualizations. For more information about Kibana, check our [docs](https://www.elastic.co/guide/en/kibana/current/index.html)."},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '1c389590-b88d-11e8-a6d9-e546fe2bba5f',
+    type: 'visualization',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.controlsTitle', {
+        defaultMessage: '[eCommerce] Controls',
+      }),
+      visState:
+        '{"title":"[eCommerce] Controls","type":"input_control_vis","params":{"controls":[{"id":"1536977437774","indexPattern":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","fieldName":"manufacturer.keyword","parent":"","label":"Manufacturer","type":"list","options":{"type":"terms","multiselect":true,"dynamicOptions":true,"size":5,"order":"desc"}},{"id":"1536977465554","indexPattern":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","fieldName":"category.keyword","parent":"","label":"Category","type":"list","options":{"type":"terms","multiselect":true,"dynamicOptions":true,"size":5,"order":"desc"}},{"id":"1536977596163","indexPattern":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","fieldName":"total_quantity","parent":"","label":"Quantity","type":"range","options":{"decimalPlaces":0,"step":1}}],"updateFiltersOnChange":false,"useTimeFilter":true,"pinFilters":false},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '45e07720-b890-11e8-a6d9-e546fe2bba5f',
+    type: 'visualization',
+    updated_at: '2018-10-01T15:17:30.755Z',
+    version: '2',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.promotionTrackingTitle', {
+        defaultMessage: '[eCommerce] Promotion Tracking',
+      }),
+      visState:
+        '{"title":"[eCommerce] Promotion Tracking","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417","type":"timeseries","series":[{"id":"ea20ae70-b88d-11e8-a451-f37365e9f268","color":"rgba(240,138,217,1)","split_mode":"everything","metrics":[{"id":"ea20ae71-b88d-11e8-a451-f37365e9f268","type":"sum","field":"taxful_total_price"}],"separate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":"0.7","stacked":"none","filter":"products.product_name:*trouser*","label":"Revenue Trousers","value_template":"${{value}}"},{"id":"062d77b0-b88e-11e8-a451-f37365e9f268","color":"rgba(191,240,129,1)","split_mode":"everything","metrics":[{"id":"062d77b1-b88e-11e8-a451-f37365e9f268","type":"sum","field":"taxful_total_price"}],"separate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":"0.7","stacked":"none","filter":"products.product_name:*watch*","label":"Revenue Watches","value_template":"${{value}}"},{"id":"61ca57f1-469d-11e7-af02-69e470af7417","color":"rgba(23,233,230,1)","split_mode":"everything","metrics":[{"id":"61ca57f2-469d-11e7-af02-69e470af7417","type":"sum","field":"taxful_total_price"}],"separate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":"0.7","stacked":"none","filter":"products.product_name:*bag*","label":"Revenue Bags","value_template":"${{value}}"},{"id":"faa2c170-b88d-11e8-a451-f37365e9f268","color":"rgba(235,186,180,1)","split_mode":"everything","metrics":[{"id":"faa2c171-b88d-11e8-a451-f37365e9f268","type":"sum","field":"taxful_total_price"}],"separate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":"0.7","stacked":"none","filter":"products.product_name:*cocktail dress*","label":"Revenue Cocktail Dresses","value_template":"${{value}}"}],"time_field":"order_date","index_pattern":"kibana_sample_data_ecommerce","interval":">=12h","axis_position":"left","axis_formatter":"number","axis_scale":"normal","show_legend":1,"show_grid":1,"legend_position":"bottom","annotations":[{"fields":"taxful_total_price","template":"Ring the bell! ${{taxful_total_price}}","index_pattern":"kibana_sample_data_ecommerce","query_string":"taxful_total_price:>250","id":"c8c30be0-b88f-11e8-a451-f37365e9f268","color":"rgba(25,77,51,1)","time_field":"order_date","icon":"fa-bell","ignore_global_filters":1,"ignore_panel_filters":1}]},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '10f1a240-b891-11e8-a6d9-e546fe2bba5f',
+    type: 'visualization',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.totalRevenueTitle', {
+        defaultMessage: '[eCommerce] Total Revenue',
+      }),
+      visState:
+        '{"title":"[eCommerce] Total Revenue","type":"metric","params":{"addTooltip":true,"addLegend":false,"type":"metric","metric":{"percentageMode":false,"useRanges":false,"colorSchema":"Green to Red","metricColorMode":"None","colorsRange":[{"from":0,"to":10000}],"labels":{"show":false},"invertColors":false,"style":{"bgFill":"#000","bgColor":false,"labelColor":false,"subText":"","fontSize":36}}},"aggs":[{"id":"1","enabled":true,"type":"sum","schema":"metric","params":{"field":"taxful_total_price","customLabel":"Total Revenue"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: 'b80e6540-b891-11e8-a6d9-e546fe2bba5f',
+    type: 'visualization',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.soldProductsPerDayTitle', {
+        defaultMessage: '[eCommerce] Sold Products per Day',
+      }),
+      visState:
+        '{"title":"[eCommerce] Sold Products per Day","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417","type":"gauge","series":[{"id":"61ca57f1-469d-11e7-af02-69e470af7417","color":"#68BC00","split_mode":"everything","metrics":[{"id":"61ca57f2-469d-11e7-af02-69e470af7417","type":"count"}],"separate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":0.5,"stacked":"none","label":"Trxns / day"}],"time_field":"order_date","index_pattern":"kibana_sample_data_ecommerce","interval":"1d","axis_position":"left","axis_formatter":"number","axis_scale":"normal","show_legend":1,"show_grid":1,"gauge_color_rules":[{"value":150,"id":"6da070c0-b891-11e8-b645-195edeb9de84","gauge":"rgba(104,188,0,1)","operator":"gte"},{"value":150,"id":"9b0cdbc0-b891-11e8-b645-195edeb9de84","gauge":"rgba(244,78,59,1)","operator":"lt"}],"gauge_width":"15","gauge_inner_width":10,"gauge_style":"half","filter":"","gauge_max":"300"},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '4b3ec120-b892-11e8-a6d9-e546fe2bba5f',
+    type: 'visualization',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.averageSalesPriceTitle', {
+        defaultMessage: '[eCommerce] Average Sales Price',
+      }),
+      visState:
+        '{"title":"[eCommerce] Average Sales Price","type":"gauge","params":{"type":"gauge","addTooltip":true,"addLegend":true,"isDisplayWarning":false,"gauge":{"verticalSplit":false,"extendRange":true,"percentageMode":false,"gaugeType":"Circle","gaugeStyle":"Full","backStyle":"Full","orientation":"vertical","colorSchema":"Green to Red","gaugeColorMode":"Labels","colorsRange":[{"from":0,"to":50},{"from":50,"to":75},{"from":75,"to":100}],"invertColors":true,"labels":{"show":true,"color":"black"},"scale":{"show":false,"labels":false,"color":"#333"},"type":"meter","style":{"bgWidth":0.9,"width":0.9,"mask":false,"bgMask":false,"maskBars":50,"bgFill":"#eee","bgColor":false,"subText":"per order","fontSize":60,"labelColor":true},"minAngle":0,"maxAngle":6.283185307179586}},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"taxful_total_price","customLabel":"average spend"}}]}',
+      uiStateJSON:
+        '{"vis":{"defaultColors":{"0 - 50":"rgb(165,0,38)","50 - 75":"rgb(255,255,190)","75 - 100":"rgb(0,104,55)"}}}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '9ca7aa90-b892-11e8-a6d9-e546fe2bba5f',
+    type: 'visualization',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.averageSoldQuantityTitle', {
+        defaultMessage: '[eCommerce] Average Sold Quantity',
+      }),
+      visState:
+        '{"title":"[eCommerce] Average Sold Quantity","type":"gauge","params":{"type":"gauge","addTooltip":true,"addLegend":true,"isDisplayWarning":false,"gauge":{"verticalSplit":false,"extendRange":true,"percentageMode":false,"gaugeType":"Circle","gaugeStyle":"Full","backStyle":"Full","orientation":"vertical","colorSchema":"Green to Red","gaugeColorMode":"Labels","colorsRange":[{"from":0,"to":2},{"from":2,"to":3},{"from":3,"to":4}],"invertColors":true,"labels":{"show":true,"color":"black"},"scale":{"show":false,"labels":false,"color":"#333"},"type":"meter","style":{"bgWidth":0.9,"width":0.9,"mask":false,"bgMask":false,"maskBars":50,"bgFill":"#eee","bgColor":false,"subText":"per order","fontSize":60,"labelColor":true},"minAngle":0,"maxAngle":6.283185307179586}},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"total_quantity","customLabel":"average items"}}]}',
+      uiStateJSON:
+        '{"vis":{"defaultColors":{"0 - 2":"rgb(165,0,38)","2 - 3":"rgb(255,255,190)","3 - 4":"rgb(0,104,55)"}}}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '3ba638e0-b894-11e8-a6d9-e546fe2bba5f',
+    type: 'search',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.ordersTitle', {
+        defaultMessage: '[eCommerce] Orders',
+      }),
+      description: '',
+      hits: 0,
+      columns: ['category', 'sku', 'taxful_total_price', 'total_quantity'],
+      sort: [['order_date', 'desc']],
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","highlightAll":true,"version":true,"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '9c6f83f0-bb4d-11e8-9c84-77068524bcab',
+    type: 'visualization',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.averageSalesPerRegionTitle', {
+        defaultMessage: '[eCommerce] Average Sales Per Region',
+      }),
+      visState:
+        '{"title":"[eCommerce] Average Sales Per Region","type":"region_map","params":{"legendPosition":"bottomright","addTooltip":true,"colorSchema":"Blues","selectedLayer":{"attribution":"<p><a href=\\"http://www.naturalearthdata.com/about/terms-of-use\\">Made with NaturalEarth</a>|<a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","weight":1,"name":"World Countries","url":"https://vector.maps.elastic.co/blob/5659313586569216?elastic_tile_service_tos=agree&my_app_version=7.0.0-alpha1&license=f6c534b8-91b9-4499-8804-a2e9789ecc95","format":{"type":"geojson"},"fields":[{"name":"iso2","description":"Two letter abbreviation"},{"name":"name","description":"Country name"},{"name":"iso3","description":"Three letter abbreviation"}],"created_at":"2017-04-26T17:12:15.978370","tags":[],"id":5659313586569216,"layerId":"elastic_maps_service.World Countries","isEMS":true},"emsHotLink":"https://maps.elastic.co/v2#file/World Countries","selectedJoinField":{"name":"iso2","description":"Two letter abbreviation"},"isDisplayWarning":true,"wms":{"enabled":false,"options":{"format":"image/png","transparent":true}},"mapZoom":2,"mapCenter":[0,0],"outlineWeight":1,"showAllShapes":true},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"taxful_total_price","customLabel":"Average Sale"}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"geoip.country_iso_code","size":100,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: 'b72dd430-bb4d-11e8-9c84-77068524bcab',
+    type: 'visualization',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.topSellingProductsTitle', {
+        defaultMessage: '[eCommerce] Top Selling Products',
+      }),
+      visState:
+        '{"title":"[eCommerce] Top Selling Products","type":"tagcloud","params":{"scale":"linear","orientation":"single","minFontSize":18,"maxFontSize":72,"showLabel":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"products.product_name.keyword","size":7,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"ff959d40-b880-11e8-a6d9-e546fe2bba5f","query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: 'ff959d40-b880-11e8-a6d9-e546fe2bba5f',
+    type: 'index-pattern',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    migrationVersion: {},
+    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,"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]"}}}',
+    },
+    references: [],
+  },
+  {
+    id: '722b74f0-b882-11e8-a6d9-e546fe2bba5f',
+    type: 'dashboard',
+    updated_at: '2018-10-01T15:13:03.270Z',
+    version: '1',
+    references: [
+      {
+        name: 'panel_0',
+        type: 'visualization',
+        id: '37cc8650-b882-11e8-a6d9-e546fe2bba5f',
+      },
+      {
+        name: 'panel_1',
+        type: 'visualization',
+        id: 'ed8436b0-b88b-11e8-a6d9-e546fe2bba5f',
+      },
+      {
+        name: 'panel_2',
+        type: 'visualization',
+        id: '09ffee60-b88c-11e8-a6d9-e546fe2bba5f',
+      },
+      {
+        name: 'panel_3',
+        type: 'visualization',
+        id: '1c389590-b88d-11e8-a6d9-e546fe2bba5f',
+      },
+      {
+        name: 'panel_4',
+        type: 'visualization',
+        id: '45e07720-b890-11e8-a6d9-e546fe2bba5f',
+      },
+      {
+        name: 'panel_5',
+        type: 'visualization',
+        id: '10f1a240-b891-11e8-a6d9-e546fe2bba5f',
+      },
+      {
+        name: 'panel_6',
+        type: 'visualization',
+        id: 'b80e6540-b891-11e8-a6d9-e546fe2bba5f',
+      },
+      {
+        name: 'panel_7',
+        type: 'visualization',
+        id: '4b3ec120-b892-11e8-a6d9-e546fe2bba5f',
+      },
+      {
+        name: 'panel_8',
+        type: 'visualization',
+        id: '9ca7aa90-b892-11e8-a6d9-e546fe2bba5f',
+      },
+      {
+        name: 'panel_9',
+        type: 'search',
+        id: '3ba638e0-b894-11e8-a6d9-e546fe2bba5f',
+      },
+      {
+        name: 'panel_10',
+        type: 'visualization',
+        id: '9c6f83f0-bb4d-11e8-9c84-77068524bcab',
+      },
+      {
+        name: 'panel_11',
+        type: 'visualization',
+        id: 'b72dd430-bb4d-11e8-9c84-77068524bcab',
+      },
+    ],
+    migrationVersion: {
+      dashboard: '7.0.0',
+    },
+    attributes: {
+      title: i18n.translate('home.sampleData.ecommerceSpec.revenueDashboardTitle', {
+        defaultMessage: '[eCommerce] Revenue Dashboard',
+      }),
+      hits: 0,
+      description: i18n.translate('home.sampleData.ecommerceSpec.revenueDashboardDescription', {
+        defaultMessage: 'Analyze mock eCommerce orders and revenue',
+      }),
+      panelsJSON:
+        '[{"embeddableConfig":{"vis":{"colors":{"Men\'s Accessories":"#82B5D8","Men\'s Clothing":"#F9BA8F","Men\'s Shoes":"#F29191","Women\'s Accessories":"#F4D598","Women\'s Clothing":"#70DBED","Women\'s Shoes":"#B7DBAB"}}},"gridData":{"x":12,"y":18,"w":36,"h":10,"i":"1"},"panelIndex":"1","version":"7.0.0-alpha1","panelRefName":"panel_0"},{"embeddableConfig":{"vis":{"colors":{"FEMALE":"#6ED0E0","MALE":"#447EBC"},"legendOpen":false}},"gridData":{"x":12,"y":7,"w":12,"h":11,"i":"2"},"panelIndex":"2","version":"7.0.0-alpha1","panelRefName":"panel_1"},{"embeddableConfig":{},"gridData":{"x":0,"y":0,"w":18,"h":7,"i":"3"},"panelIndex":"3","version":"7.0.0-alpha1","panelRefName":"panel_2"},{"embeddableConfig":{},"gridData":{"x":18,"y":0,"w":30,"h":7,"i":"4"},"panelIndex":"4","version":"7.0.0-alpha1","panelRefName":"panel_3"},{"embeddableConfig":{},"gridData":{"x":0,"y":28,"w":48,"h":11,"i":"5"},"panelIndex":"5","version":"7.0.0-alpha1","panelRefName":"panel_4"},{"embeddableConfig":{},"gridData":{"x":0,"y":18,"w":12,"h":10,"i":"6"},"panelIndex":"6","version":"7.0.0-alpha1","panelRefName":"panel_5"},{"embeddableConfig":{},"gridData":{"x":0,"y":7,"w":12,"h":11,"i":"7"},"panelIndex":"7","version":"7.0.0-alpha1","panelRefName":"panel_6"},{"embeddableConfig":{"vis":{"colors":{"0 - 50":"#E24D42","50 - 75":"#EAB839","75 - 100":"#7EB26D"},"defaultColors":{"0 - 50":"rgb(165,0,38)","50 - 75":"rgb(255,255,190)","75 - 100":"rgb(0,104,55)"},"legendOpen":false}},"gridData":{"x":24,"y":7,"w":12,"h":11,"i":"8"},"panelIndex":"8","version":"7.0.0-alpha1","panelRefName":"panel_7"},{"embeddableConfig":{"vis":{"colors":{"0 - 2":"#E24D42","2 - 3":"#F2C96D","3 - 4":"#9AC48A"},"defaultColors":{"0 - 2":"rgb(165,0,38)","2 - 3":"rgb(255,255,190)","3 - 4":"rgb(0,104,55)"},"legendOpen":false}},"gridData":{"x":36,"y":7,"w":12,"h":11,"i":"9"},"panelIndex":"9","version":"7.0.0-alpha1","panelRefName":"panel_8"},{"embeddableConfig":{},"gridData":{"x":0,"y":54,"w":48,"h":18,"i":"10"},"panelIndex":"10","version":"7.0.0-alpha1","panelRefName":"panel_9"},{"embeddableConfig":{"mapZoom":2,"mapCenter":[28.304380682962783,-22.148437500000004]},"gridData":{"x":0,"y":39,"w":24,"h":15,"i":"11"},"panelIndex":"11","version":"7.0.0-alpha1","panelRefName":"panel_10"},{"embeddableConfig":{},"gridData":{"x":24,"y":39,"w":24,"h":15,"i":"12"},"panelIndex":"12","version":"7.0.0-alpha1","panelRefName":"panel_11"}]',
+      optionsJSON: '{"hidePanelTitles":false,"useMargins":true}',
+      version: 1,
+      timeRestore: true,
+      timeTo: 'now',
+      timeFrom: 'now-7d',
+      refreshInterval: {
+        pause: false,
+        value: 900000,
+      },
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"language":"kuery","query":""},"filter":[]}',
+      },
+    },
+  },
+];
diff --git a/src/legacy/server/sample_data/data_sets/flights/field_mappings.js b/src/plugins/home/server/services/sample_data/data_sets/flights/field_mappings.ts
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/flights/field_mappings.js
rename to src/plugins/home/server/services/sample_data/data_sets/flights/field_mappings.ts
diff --git a/src/legacy/server/sample_data/data_sets/flights/flights.json.gz b/src/plugins/home/server/services/sample_data/data_sets/flights/flights.json.gz
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/flights/flights.json.gz
rename to src/plugins/home/server/services/sample_data/data_sets/flights/flights.json.gz
diff --git a/src/plugins/home/server/services/sample_data/data_sets/flights/index.ts b/src/plugins/home/server/services/sample_data/data_sets/flights/index.ts
new file mode 100644
index 0000000000000..d63ea8f7fb493
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/data_sets/flights/index.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 path from 'path';
+import { i18n } from '@kbn/i18n';
+import { getSavedObjects } from './saved_objects';
+import { fieldMappings } from './field_mappings';
+import { SampleDatasetSchema, AppLinkSchema } from '../../lib/sample_dataset_registry_types';
+
+const flightsName = i18n.translate('home.sampleData.flightsSpecTitle', {
+  defaultMessage: 'Sample flight data',
+});
+const flightsDescription = i18n.translate('home.sampleData.flightsSpecDescription', {
+  defaultMessage: 'Sample data, visualizations, and dashboards for monitoring flight routes.',
+});
+const initialAppLinks = [] as AppLinkSchema[];
+
+export const flightsSpecProvider = function(): SampleDatasetSchema {
+  return {
+    id: 'flights',
+    name: flightsName,
+    description: flightsDescription,
+    previewImagePath: '/plugins/kibana/home/sample_data_resources/flights/dashboard.png',
+    darkPreviewImagePath: '/plugins/kibana/home/sample_data_resources/flights/dashboard_dark.png',
+    overviewDashboard: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+    appLinks: initialAppLinks,
+    defaultIndex: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+    savedObjects: getSavedObjects(),
+    dataIndices: [
+      {
+        id: 'flights',
+        dataPath: path.join(__dirname, './flights.json.gz'),
+        fields: fieldMappings,
+        timeFields: ['timestamp'],
+        currentTimeMarker: '2018-01-09T00:00:00',
+        preserveDayOfWeekTimeOfDay: true,
+      },
+    ],
+    status: 'not_installed',
+  };
+};
diff --git a/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts
new file mode 100644
index 0000000000000..1cce11aea37fb
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts
@@ -0,0 +1,580 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 max-len: 0 */
+/* eslint-disable */
+
+import { i18n } from '@kbn/i18n';
+import { SavedObject } from 'kibana/server';
+
+export const getSavedObjects = (): SavedObject[] => [
+  {
+    id: 'aeb212e0-4c84-11e8-b3d7-01146121b73d',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.controlsTitle', {
+        defaultMessage: '[Flights] Controls',
+      }),
+      visState:
+        '{"title":"[Flights] Controls","type":"input_control_vis","params":{"controls":[{"id":"1525098134264","indexPattern":"d3d7af60-4c81-11e8-b3d7-01146121b73d","fieldName":"OriginCityName","parent":"","label":"Origin City","type":"list","options":{"type":"terms","multiselect":true,"size":100,"order":"desc"}},{"id":"1525099277699","indexPattern":"d3d7af60-4c81-11e8-b3d7-01146121b73d","fieldName":"DestCityName","parent":"1525098134264","label":"Destination City","type":"list","options":{"type":"terms","multiselect":true,"size":100,"order":"desc"}},{"id":"1525099307278","indexPattern":"d3d7af60-4c81-11e8-b3d7-01146121b73d","fieldName":"AvgTicketPrice","parent":"","label":"Average Ticket Price","type":"range","options":{"decimalPlaces":0,"step":10}}],"updateFiltersOnChange":false,"useTimeFilter":true,"pinFilters":false},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: 'c8fc3d30-4c87-11e8-b3d7-01146121b73d',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.flightCountAndAverageTicketPriceTitle', {
+        defaultMessage: '[Flights] Flight Count and Average Ticket Price',
+      }),
+      visState:
+        '{"title":"[Flights] Flight Count and Average Ticket Price","type":"area","params":{"type":"area","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Average Ticket Price"}},{"id":"ValueAxis-2","name":"RightAxis-1","type":"value","position":"right","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Flight Count"}}],"seriesParams":[{"show":true,"mode":"stacked","type":"area","drawLinesBetweenPoints":true,"showCircles":false,"interpolate":"linear","lineWidth":2,"data":{"id":"5","label":"Flight Count"},"valueAxis":"ValueAxis-2"},{"show":true,"mode":"stacked","type":"line","drawLinesBetweenPoints":false,"showCircles":true,"interpolate":"linear","data":{"id":"4","label":"Average Ticket Price"},"valueAxis":"ValueAxis-1","lineWidth":2}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false,"radiusRatio":13},"aggs":[{"id":"3","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"timestamp","interval":"auto","customInterval":"2h","min_doc_count":1,"extended_bounds":{}}},{"id":"5","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Flight Count"}},{"id":"4","enabled":true,"type":"avg","schema":"metric","params":{"field":"AvgTicketPrice","customLabel":"Average Ticket Price"}},{"id":"2","enabled":true,"type":"avg","schema":"radius","params":{"field":"AvgTicketPrice"}}]}',
+      uiStateJSON:
+        '{"vis":{"legendOpen":true,"colors":{"Average Ticket Price":"#629E51","Flight Count":"#AEA2E0"}}}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '571aaf70-4c88-11e8-b3d7-01146121b73d',
+    type: 'search',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.flightLogTitle', {
+        defaultMessage: '[Flights] Flight Log',
+      }),
+      description: '',
+      hits: 0,
+      columns: [
+        'Carrier',
+        'OriginCityName',
+        'OriginCountry',
+        'DestCityName',
+        'DestCountry',
+        'FlightTimeMin',
+        'AvgTicketPrice',
+        'Cancelled',
+        'FlightDelayType',
+      ],
+      sort: [['timestamp', 'desc']],
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","highlightAll":true,"version":true,"query":{"language":"kuery","query":""},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '8f4d0c00-4c86-11e8-b3d7-01146121b73d',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.airlineCarrierTitle', {
+        defaultMessage: '[Flights] Airline Carrier',
+      }),
+      visState:
+        '{"title":"[Flights] Airline Carrier","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"Carrier","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
+      uiStateJSON: '{"vis":{"legendOpen":false}}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: 'f8290060-4c88-11e8-b3d7-01146121b73d',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.delayTypeTitle', {
+        defaultMessage: '[Flights] Delay Type',
+      }),
+      visState:
+        '{"title":"[Flights] Delay Type","type":"area","params":{"type":"area","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Count"}}],"seriesParams":[{"show":"true","type":"histogram","mode":"stacked","data":{"label":"Count","id":"1"},"drawLinesBetweenPoints":true,"showCircles":true,"interpolate":"cardinal","valueAxis":"ValueAxis-1"}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"timestamp","interval":"auto","customInterval":"2h","min_doc_count":1,"extended_bounds":{}}},{"id":"3","enabled":true,"type":"terms","schema":"group","params":{"field":"FlightDelayType","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: 'bcb63b50-4c89-11e8-b3d7-01146121b73d',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.delaysAndCancellationsTitle', {
+        defaultMessage: '[Flights] Delays & Cancellations',
+      }),
+      visState:
+        '{"title":"[Flights] Delays & Cancellations","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417","type":"timeseries","series":[{"id":"61ca57f1-469d-11e7-af02-69e470af7417","color":"rgba(0,156,224,1)","split_mode":"everything","metrics":[{"id":"61ca57f2-469d-11e7-af02-69e470af7417","type":"filter_ratio","numerator":"FlightDelay:true"}],"separate_axis":0,"axis_position":"right","formatter":"percent","chart_type":"line","line_width":"2","point_size":"0","fill":0.5,"stacked":"none","label":"Percent Delays"}],"time_field":"timestamp","index_pattern":"kibana_sample_data_flights","interval":">=1h","axis_position":"left","axis_formatter":"number","show_legend":1,"show_grid":1,"annotations":[{"fields":"FlightDelay,Cancelled,Carrier","template":"{{Carrier}}: Flight Delayed and Cancelled!","index_pattern":"kibana_sample_data_flights","query_string":"FlightDelay:true AND Cancelled:true","id":"53b7dff0-4c89-11e8-a66a-6989ad5a0a39","color":"rgba(0,98,177,1)","time_field":"timestamp","icon":"fa-exclamation-triangle","ignore_global_filters":1,"ignore_panel_filters":1}],"legend_position":"bottom"},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '9886b410-4c8b-11e8-b3d7-01146121b73d',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.delayBucketsTitle', {
+        defaultMessage: '[Flights] Delay Buckets',
+      }),
+      visState:
+        '{"title":"[Flights] Delay Buckets","type":"histogram","params":{"type":"histogram","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Count"}}],"seriesParams":[{"show":"true","type":"histogram","mode":"stacked","data":{"label":"Count","id":"1"},"valueAxis":"ValueAxis-1","drawLinesBetweenPoints":true,"showCircles":true}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"histogram","schema":"segment","params":{"field":"FlightDelayMin","interval":30,"extended_bounds":{},"customLabel":"Flight Delay Minutes"}}]}',
+      uiStateJSON: '{"vis":{"legendOpen":false}}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[{"meta":{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","negate":true,"disabled":false,"alias":null,"type":"phrase","key":"FlightDelayMin","value":"0","params":{"query":0,"type":"phrase"}},"query":{"match":{"FlightDelayMin":{"query":0,"type":"phrase"}}},"$state":{"store":"appState"}}],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '76e3c090-4c8c-11e8-b3d7-01146121b73d',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.flightDelaysTitle', {
+        defaultMessage: '[Flights] Flight Delays',
+      }),
+      visState:
+        '{"title":"[Flights] Flight Delays","type":"histogram","params":{"type":"histogram","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"left","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"BottomAxis-1","type":"value","position":"bottom","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Count"}}],"seriesParams":[{"show":"true","type":"histogram","mode":"stacked","data":{"label":"Count","id":"1"},"valueAxis":"ValueAxis-1","drawLinesBetweenPoints":true,"showCircles":true}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":""}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"FlightDelay","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Flight Delays"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '707665a0-4c8c-11e8-b3d7-01146121b73d',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.flightCancellationsTitle', {
+        defaultMessage: '[Flights] Flight Cancellations',
+      }),
+      visState:
+        '{"title":"[Flights] Flight Cancellations","type":"histogram","params":{"type":"histogram","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"left","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"BottomAxis-1","type":"value","position":"bottom","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Count"}}],"seriesParams":[{"show":"true","type":"histogram","mode":"stacked","data":{"label":"Count","id":"1"},"valueAxis":"ValueAxis-1","drawLinesBetweenPoints":true,"showCircles":true}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":""}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"Cancelled","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Flight Cancellations"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '293b5a30-4c8f-11e8-b3d7-01146121b73d',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.destinationWeatherTitle', {
+        defaultMessage: '[Flights] Destination Weather',
+      }),
+      visState:
+        '{"title":"[Flights] Destination Weather","type":"tagcloud","params":{"scale":"linear","orientation":"single","minFontSize":18,"maxFontSize":72,"showLabel":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"DestWeather","size":10,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '129be430-4c93-11e8-b3d7-01146121b73d',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.markdownInstructionsTitle', {
+        defaultMessage: '[Flights] Markdown Instructions',
+      }),
+      visState:
+        '{"title":"[Flights] Markdown Instructions","type":"markdown","params":{"fontSize":10,"openLinksInNewTab":true,"markdown":"### Sample Flight data\\nThis dashboard contains sample data for you to play with. You can view it, search it, and interact with the visualizations. For more information about Kibana, check our [docs](https://www.elastic.co/guide/en/kibana/current/index.html)."},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '334084f0-52fd-11e8-a160-89cc2ad9e8e2',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.originCountryTicketPricesTitle', {
+        defaultMessage: '[Flights] Origin Country Ticket Prices',
+      }),
+      visState:
+        '{"title":"[Flights] Origin Country Ticket Prices","type":"region_map","params":{"legendPosition":"bottomright","addTooltip":true,"colorSchema":"Blues","selectedLayer":{"attribution":"<p><a href=\\"http://www.naturalearthdata.com/about/terms-of-use\\">Made with NaturalEarth</a> | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","name":"World Countries","weight":1,"format":{"type":"geojson"},"url":"https://vector.maps.elastic.co/blob/5659313586569216?elastic_tile_service_tos=agree&my_app_version=6.3.0&license=686f9ec6-d775-44f0-b334-38caf85da617","fields":[{"name":"iso2","description":"Two letter abbreviation"},{"name":"name","description":"Country name"},{"name":"iso3","description":"Three letter abbreviation"}],"created_at":"2017-04-26T17:12:15.978370","tags":[],"id":5659313586569216,"layerId":"elastic_maps_service.World Countries"},"selectedJoinField":{"name":"iso2","description":"Two letter abbreviation"},"isDisplayWarning":false,"wms":{"enabled":false,"options":{"format":"image/png","transparent":true},"baseLayersAreLoaded":{},"tmsLayers":[{"id":"road_map","url":"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.3.0&license=686f9ec6-d775-44f0-b334-38caf85da617","minZoom":0,"maxZoom":18,"attribution":"<p>&#169; <a href=\\"http://www.openstreetmap.org/copyright\\">OpenStreetMap</a> contributors | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","subdomains":[]}],"selectedTmsLayer":{"id":"road_map","url":"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.3.0&license=686f9ec6-d775-44f0-b334-38caf85da617","minZoom":0,"maxZoom":18,"attribution":"<p>&#169; <a href=\\"http://www.openstreetmap.org/copyright\\">OpenStreetMap</a> contributors | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","subdomains":[]}},"mapZoom":2,"mapCenter":[0,0],"outlineWeight":1,"showAllShapes":true},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"AvgTicketPrice"}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"OriginCountry","size":100,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: 'f8283bf0-52fd-11e8-a160-89cc2ad9e8e2',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.totalFlightDelaysTitle', {
+        defaultMessage: '[Flights] Total Flight Delays',
+      }),
+      visState:
+        '{"title":"[Flights] Total Flight Delays","type":"gauge","params":{"type":"gauge","addTooltip":true,"addLegend":true,"isDisplayWarning":false,"gauge":{"verticalSplit":false,"extendRange":true,"percentageMode":false,"gaugeType":"Arc","gaugeStyle":"Full","backStyle":"Full","orientation":"vertical","colorSchema":"Blues","gaugeColorMode":"Labels","colorsRange":[{"from":0,"to":75},{"from":75,"to":150},{"from":150,"to":225},{"from":225,"to":300}],"invertColors":true,"labels":{"show":false,"color":"black"},"scale":{"show":false,"labels":false,"color":"#333"},"type":"meter","style":{"bgWidth":0.9,"width":0.9,"mask":false,"bgMask":false,"maskBars":50,"bgFill":"#eee","bgColor":false,"subText":"","fontSize":60,"labelColor":true}}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Total Delays"}}]}',
+      uiStateJSON:
+        '{"vis":{"defaultColors":{"0 - 75":"rgb(8,48,107)","75 - 150":"rgb(55,135,192)","150 - 225":"rgb(171,208,230)","225 - 300":"rgb(247,251,255)"}}}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[{"meta":{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","negate":false,"disabled":false,"alias":null,"type":"phrase","key":"FlightDelay","value":"true","params":{"query":true,"type":"phrase"}},"query":{"match":{"FlightDelay":{"query":true,"type":"phrase"}}},"$state":{"store":"appState"}}],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '08884800-52fe-11e8-a160-89cc2ad9e8e2',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.totalFlightCancellationsTitle', {
+        defaultMessage: '[Flights] Total Flight Cancellations',
+      }),
+      visState:
+        '{"title":"[Flights] Total Flight Cancellations","type":"gauge","params":{"type":"gauge","addTooltip":true,"addLegend":true,"isDisplayWarning":false,"gauge":{"verticalSplit":false,"extendRange":true,"percentageMode":false,"gaugeType":"Arc","gaugeStyle":"Full","backStyle":"Full","orientation":"vertical","colorSchema":"Blues","gaugeColorMode":"Labels","colorsRange":[{"from":0,"to":75},{"from":75,"to":150},{"from":150,"to":225},{"from":225,"to":300}],"invertColors":true,"labels":{"show":false,"color":"black"},"scale":{"show":false,"labels":false,"color":"#333"},"type":"meter","style":{"bgWidth":0.9,"width":0.9,"mask":false,"bgMask":false,"maskBars":50,"bgFill":"#eee","bgColor":false,"subText":"","fontSize":60,"labelColor":true}}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Total Cancellations"}}]}',
+      uiStateJSON:
+        '{"vis":{"defaultColors":{"0 - 75":"rgb(8,48,107)","75 - 150":"rgb(55,135,192)","150 - 225":"rgb(171,208,230)","225 - 300":"rgb(247,251,255)"}}}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[{"meta":{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","negate":false,"disabled":false,"alias":null,"type":"phrase","key":"Cancelled","value":"true","params":{"query":true,"type":"phrase"}},"query":{"match":{"Cancelled":{"query":true,"type":"phrase"}}},"$state":{"store":"appState"}}],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: 'e6944e50-52fe-11e8-a160-89cc2ad9e8e2',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.originCountryTitle', {
+        defaultMessage: '[Flights] Origin Country vs. Destination Country',
+      }),
+      visState:
+        '{"title":"[Flights] Origin Country vs. Destination Country","type":"heatmap","params":{"type":"heatmap","addTooltip":true,"addLegend":true,"enableHover":false,"legendPosition":"right","times":[],"colorsNumber":5,"colorSchema":"Blues","setColorRange":false,"colorsRange":[],"invertColors":false,"percentageMode":false,"valueAxes":[{"show":false,"id":"ValueAxis-1","type":"value","scale":{"type":"linear","defaultYExtents":false},"labels":{"show":false,"rotate":0,"overwriteColor":false,"color":"#555"}}]},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"group","params":{"field":"OriginCountry","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Origin Country"}},{"id":"3","enabled":true,"type":"terms","schema":"segment","params":{"field":"DestCountry","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Destination Country"}}]}',
+      uiStateJSON:
+        '{"vis":{"defaultColors":{"0 - 22":"rgb(247,251,255)","22 - 44":"rgb(208,225,242)","44 - 66":"rgb(148,196,223)","66 - 88":"rgb(74,152,201)","88 - 110":"rgb(23,100,171)"}}}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '01c413e0-5395-11e8-99bf-1ba7b1bdaa61',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.totalFlightsTitle', {
+        defaultMessage: '[Flights] Total Flights',
+      }),
+      visState:
+        '{"title":"[Flights] Total Flights","type":"metric","params":{"addTooltip":true,"addLegend":false,"type":"metric","metric":{"percentageMode":false,"useRanges":false,"colorSchema":"Green to Red","metricColorMode":"None","colorsRange":[{"from":0,"to":10000}],"labels":{"show":true},"invertColors":false,"style":{"bgFill":"#000","bgColor":false,"labelColor":false,"subText":"","fontSize":36}}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Total Flights"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '2edf78b0-5395-11e8-99bf-1ba7b1bdaa61',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.averageTicketPriceTitle', {
+        defaultMessage: '[Flights] Average Ticket Price',
+      }),
+      visState:
+        '{"title":"[Flights] Average Ticket Price","type":"metric","params":{"addTooltip":true,"addLegend":false,"type":"metric","metric":{"percentageMode":false,"useRanges":false,"colorSchema":"Green to Red","metricColorMode":"None","colorsRange":[{"from":0,"to":10000}],"labels":{"show":true},"invertColors":false,"style":{"bgFill":"#000","bgColor":false,"labelColor":false,"subText":"","fontSize":36}}},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"AvgTicketPrice","customLabel":"Avg. Ticket Price"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"d3d7af60-4c81-11e8-b3d7-01146121b73d","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: 'ed78a660-53a0-11e8-acbd-0be0ad9d822b',
+    type: 'visualization',
+    updated_at: '2018-05-09T15:55:51.195Z',
+    version: '3',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.airportConnectionsTitle', {
+        defaultMessage: '[Flights] Airport Connections (Hover Over Airport)',
+      }),
+      visState:
+        '{"aggs":[],"params":{"spec":"{\\n  $schema: https://vega.github.io/schema/vega/v3.0.json\\n  config: {\\n    kibana: {type: \\"map\\", latitude: 25, longitude: -70, zoom: 3}\\n  }\\n  data: [\\n    {\\n      name: table\\n      url: {\\n        index: kibana_sample_data_flights\\n        %context%: true\\n        // Uncomment to enable time filtering\\n        // %timefield%: timestamp\\n        body: {\\n          size: 0\\n          aggs: {\\n            origins: {\\n              terms: {field: \\"OriginAirportID\\", size: 10000}\\n              aggs: {\\n                originLocation: {\\n                  top_hits: {\\n                    size: 1\\n                    _source: {\\n                      includes: [\\"OriginLocation\\", \\"Origin\\"]\\n                    }\\n                  }\\n                }\\n                distinations: {\\n                  terms: {field: \\"DestAirportID\\", size: 10000}\\n                  aggs: {\\n                    destLocation: {\\n                      top_hits: {\\n                        size: 1\\n                        _source: {\\n                          includes: [\\"DestLocation\\"]\\n                        }\\n                      }\\n                    }\\n                  }\\n                }\\n              }\\n            }\\n          }\\n        }\\n      }\\n      format: {property: \\"aggregations.origins.buckets\\"}\\n      transform: [\\n        {\\n          type: geopoint\\n          projection: projection\\n          fields: [\\n            originLocation.hits.hits[0]._source.OriginLocation.lon\\n            originLocation.hits.hits[0]._source.OriginLocation.lat\\n          ]\\n        }\\n      ]\\n    }\\n    {\\n      name: selectedDatum\\n      on: [\\n        {trigger: \\"!selected\\", remove: true}\\n        {trigger: \\"selected\\", insert: \\"selected\\"}\\n      ]\\n    }\\n  ]\\n  signals: [\\n    {\\n      name: selected\\n      value: null\\n      on: [\\n        {events: \\"@airport:mouseover\\", update: \\"datum\\"}\\n        {events: \\"@airport:mouseout\\", update: \\"null\\"}\\n      ]\\n    }\\n  ]\\n  scales: [\\n    {\\n      name: airportSize\\n      type: linear\\n      domain: {data: \\"table\\", field: \\"doc_count\\"}\\n      range: [\\n        {signal: \\"zoom*zoom*0.2+1\\"}\\n        {signal: \\"zoom*zoom*10+1\\"}\\n      ]\\n    }\\n  ]\\n  marks: [\\n    {\\n      type: group\\n      from: {\\n        facet: {\\n          name: facetedDatum\\n          data: selectedDatum\\n          field: distinations.buckets\\n        }\\n      }\\n      data: [\\n        {\\n          name: facetDatumElems\\n          source: facetedDatum\\n          transform: [\\n            {\\n              type: geopoint\\n              projection: projection\\n              fields: [\\n                destLocation.hits.hits[0]._source.DestLocation.lon\\n                destLocation.hits.hits[0]._source.DestLocation.lat\\n              ]\\n            }\\n            {type: \\"formula\\", expr: \\"{x:parent.x, y:parent.y}\\", as: \\"source\\"}\\n            {type: \\"formula\\", expr: \\"{x:datum.x, y:datum.y}\\", as: \\"target\\"}\\n            {type: \\"linkpath\\", shape: \\"diagonal\\"}\\n          ]\\n        }\\n      ]\\n      scales: [\\n        {\\n          name: lineThickness\\n          type: linear\\n          domain: {data: \\"facetDatumElems\\", field: \\"doc_count\\"}\\n          range: [1, 8]\\n        }\\n        {\\n          name: lineOpacity\\n          type: linear\\n          domain: {data: \\"facetDatumElems\\", field: \\"doc_count\\"}\\n          range: [0.2, 0.8]\\n        }\\n      ]\\n      marks: [\\n        {\\n          from: {data: \\"facetDatumElems\\"}\\n          type: path\\n          interactive: false\\n          encode: {\\n            update: {\\n              path: {field: \\"path\\"}\\n              stroke: {value: \\"black\\"}\\n              strokeWidth: {scale: \\"lineThickness\\", field: \\"doc_count\\"}\\n              strokeOpacity: {scale: \\"lineOpacity\\", field: \\"doc_count\\"}\\n            }\\n          }\\n        }\\n      ]\\n    }\\n    {\\n      name: airport\\n      type: symbol\\n      from: {data: \\"table\\"}\\n      encode: {\\n        update: {\\n          size: {scale: \\"airportSize\\", field: \\"doc_count\\"}\\n          xc: {signal: \\"datum.x\\"}\\n          yc: {signal: \\"datum.y\\"}\\n          tooltip: {\\n            signal: \\"{title: datum.originLocation.hits.hits[0]._source.Origin + \' (\' + datum.key + \')\', connnections: length(datum.distinations.buckets), flights: datum.doc_count}\\"\\n          }\\n        }\\n      }\\n    }\\n  ]\\n}"},"title":"[Flights] Airport Connections (Hover Over Airport)","type":"vega"}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+    type: 'index-pattern',
+    updated_at: '2018-05-09T15:49:03.736Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: 'kibana_sample_data_flights',
+      timeFieldName: 'timestamp',
+      fields:
+        '[{"name":"AvgTicketPrice","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Cancelled","type":"boolean","esTypes":["boolean"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Carrier","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Dest","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestAirportID","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestCityName","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestCountry","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestLocation","type":"geo_point","esTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestRegion","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DestWeather","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DistanceKilometers","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"DistanceMiles","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelay","type":"boolean","esTypes":["boolean"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelayMin","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightDelayType","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightNum","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightTimeHour","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"FlightTimeMin","type":"number","esTypes":["float"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"Origin","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginAirportID","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginCityName","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginCountry","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginLocation","type":"geo_point","esTypes":["geo_point"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginRegion","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"OriginWeather","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":"_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":"dayOfWeek","type":"number","esTypes":["integer"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"name":"timestamp","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.hourOfDay","lang":"painless","searchable":true,"aggregatable":true,"readFromDocValues":false}]',
+      fieldFormatMap:
+        '{"hour_of_day":{"id":"number","params":{"pattern":"00"}},"AvgTicketPrice":{"id":"number","params":{"pattern":"$0,0.[00]"}}}',
+    },
+    references: [],
+  },
+  {
+    id: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+    type: 'dashboard',
+    updated_at: '2018-05-09T15:59:04.578Z',
+    version: '4',
+    references: [
+      {
+        name: 'panel_0',
+        type: 'visualization',
+        id: 'aeb212e0-4c84-11e8-b3d7-01146121b73d',
+      },
+      {
+        name: 'panel_1',
+        type: 'visualization',
+        id: 'c8fc3d30-4c87-11e8-b3d7-01146121b73d',
+      },
+      {
+        name: 'panel_2',
+        type: 'search',
+        id: '571aaf70-4c88-11e8-b3d7-01146121b73d',
+      },
+      {
+        name: 'panel_3',
+        type: 'visualization',
+        id: '8f4d0c00-4c86-11e8-b3d7-01146121b73d',
+      },
+      {
+        name: 'panel_4',
+        type: 'visualization',
+        id: 'f8290060-4c88-11e8-b3d7-01146121b73d',
+      },
+      {
+        name: 'panel_5',
+        type: 'visualization',
+        id: 'bcb63b50-4c89-11e8-b3d7-01146121b73d',
+      },
+      {
+        name: 'panel_6',
+        type: 'visualization',
+        id: '9886b410-4c8b-11e8-b3d7-01146121b73d',
+      },
+      {
+        name: 'panel_7',
+        type: 'visualization',
+        id: '76e3c090-4c8c-11e8-b3d7-01146121b73d',
+      },
+      {
+        name: 'panel_8',
+        type: 'visualization',
+        id: '707665a0-4c8c-11e8-b3d7-01146121b73d',
+      },
+      {
+        name: 'panel_10',
+        type: 'visualization',
+        id: '293b5a30-4c8f-11e8-b3d7-01146121b73d',
+      },
+      {
+        name: 'panel_11',
+        type: 'visualization',
+        id: '129be430-4c93-11e8-b3d7-01146121b73d',
+      },
+      {
+        name: 'panel_12',
+        type: 'visualization',
+        id: '334084f0-52fd-11e8-a160-89cc2ad9e8e2',
+      },
+      {
+        name: 'panel_13',
+        type: 'visualization',
+        id: 'f8283bf0-52fd-11e8-a160-89cc2ad9e8e2',
+      },
+      {
+        name: 'panel_14',
+        type: 'visualization',
+        id: '08884800-52fe-11e8-a160-89cc2ad9e8e2',
+      },
+      {
+        name: 'panel_15',
+        type: 'visualization',
+        id: 'e6944e50-52fe-11e8-a160-89cc2ad9e8e2',
+      },
+      {
+        name: 'panel_16',
+        type: 'visualization',
+        id: '01c413e0-5395-11e8-99bf-1ba7b1bdaa61',
+      },
+      {
+        name: 'panel_17',
+        type: 'visualization',
+        id: '2edf78b0-5395-11e8-99bf-1ba7b1bdaa61',
+      },
+      {
+        name: 'panel_18',
+        type: 'visualization',
+        id: 'ed78a660-53a0-11e8-acbd-0be0ad9d822b',
+      },
+    ],
+    migrationVersion: {
+      dashboard: '7.0.0',
+    },
+    attributes: {
+      title: i18n.translate('home.sampleData.flightsSpec.globalFlightDashboardTitle', {
+        defaultMessage: '[Flights] Global Flight Dashboard',
+      }),
+      hits: 0,
+      description: i18n.translate(
+        'home.sampleData.flightsSpec.globalFlightDashboardDescription',
+        {
+          defaultMessage:
+            'Analyze mock flight data for ES-Air, Logstash Airways, Kibana Airlines and JetBeats',
+        }
+      ),
+      panelsJSON:
+        '[{"panelIndex":"1","gridData":{"x":0,"y":0,"w":32,"h":7,"i":"1"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_0"},{"panelIndex":"3","gridData":{"x":17,"y":7,"w":23,"h":12,"i":"3"},"embeddableConfig":{"vis":{"colors":{"Average Ticket Price":"#0A50A1","Flight Count":"#82B5D8"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_1"},{"panelIndex":"4","gridData":{"x":0,"y":85,"w":48,"h":15,"i":"4"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_2"},{"panelIndex":"5","gridData":{"x":0,"y":7,"w":17,"h":12,"i":"5"},"embeddableConfig":{"vis":{"colors":{"ES-Air":"#447EBC","JetBeats":"#65C5DB","Kibana Airlines":"#BA43A9","Logstash Airways":"#E5AC0E"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_3"},{"panelIndex":"6","gridData":{"x":24,"y":33,"w":24,"h":14,"i":"6"},"embeddableConfig":{"vis":{"colors":{"Carrier Delay":"#5195CE","Late Aircraft Delay":"#1F78C1","NAS Delay":"#70DBED","No Delay":"#BADFF4","Security Delay":"#052B51","Weather Delay":"#6ED0E0"}}},"version":"6.3.0","panelRefName":"panel_4"},{"panelIndex":"7","gridData":{"x":24,"y":19,"w":24,"h":14,"i":"7"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_5"},{"panelIndex":"10","gridData":{"x":0,"y":35,"w":24,"h":12,"i":"10"},"embeddableConfig":{"vis":{"colors":{"Count":"#1F78C1"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_6"},{"panelIndex":"13","gridData":{"x":10,"y":19,"w":14,"h":8,"i":"13"},"embeddableConfig":{"vis":{"colors":{"Count":"#1F78C1"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_7"},{"panelIndex":"14","gridData":{"x":10,"y":27,"w":14,"h":8,"i":"14"},"embeddableConfig":{"vis":{"colors":{"Count":"#1F78C1"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_8"},{"panelIndex":"21","gridData":{"x":0,"y":62,"w":48,"h":8,"i":"21"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_10"},{"panelIndex":"22","gridData":{"x":32,"y":0,"w":16,"h":7,"i":"22"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_11"},{"panelIndex":"23","gridData":{"x":0,"y":70,"w":48,"h":15,"i":"23"},"embeddableConfig":{"mapCenter":[42.19556096274418,9.536742995308601e-7],"mapZoom":1},"version":"6.3.0","panelRefName":"panel_12"},{"panelIndex":"25","gridData":{"x":0,"y":19,"w":10,"h":8,"i":"25"},"embeddableConfig":{"vis":{"defaultColors":{"0 - 50":"rgb(247,251,255)","100 - 150":"rgb(107,174,214)","150 - 200":"rgb(33,113,181)","200 - 250":"rgb(8,48,107)","50 - 100":"rgb(198,219,239)"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_13"},{"panelIndex":"27","gridData":{"x":0,"y":27,"w":10,"h":8,"i":"27"},"embeddableConfig":{"vis":{"defaultColors":{"0 - 50":"rgb(247,251,255)","100 - 150":"rgb(107,174,214)","150 - 200":"rgb(33,113,181)","200 - 250":"rgb(8,48,107)","50 - 100":"rgb(198,219,239)"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_14"},{"panelIndex":"28","gridData":{"x":0,"y":47,"w":24,"h":15,"i":"28"},"embeddableConfig":{"vis":{"defaultColors":{"0 - 11":"rgb(247,251,255)","11 - 22":"rgb(208,225,242)","22 - 33":"rgb(148,196,223)","33 - 44":"rgb(74,152,201)","44 - 55":"rgb(23,100,171)"},"legendOpen":false}},"version":"6.3.0","panelRefName":"panel_15"},{"panelIndex":"29","gridData":{"x":40,"y":7,"w":8,"h":6,"i":"29"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_16"},{"panelIndex":"30","gridData":{"x":40,"y":13,"w":8,"h":6,"i":"30"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_17"},{"panelIndex":"31","gridData":{"x":24,"y":47,"w":24,"h":15,"i":"31"},"embeddableConfig":{},"version":"6.3.0","panelRefName":"panel_18"}]',
+      optionsJSON: '{"hidePanelTitles":false,"useMargins":true}',
+      version: 1,
+      timeRestore: true,
+      timeTo: 'now',
+      timeFrom: 'now-24h',
+      refreshInterval: {
+        display: '15 minutes',
+        pause: false,
+        section: 2,
+        value: 900000,
+      },
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"query":{"language":"kuery","query":""},"filter":[],"highlightAll":true,"version":true}',
+      },
+    },
+  },
+];
diff --git a/src/legacy/server/sample_data/data_sets/index.js b/src/plugins/home/server/services/sample_data/data_sets/index.ts
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/index.js
rename to src/plugins/home/server/services/sample_data/data_sets/index.ts
diff --git a/src/legacy/server/sample_data/data_sets/logs/field_mappings.js b/src/plugins/home/server/services/sample_data/data_sets/logs/field_mappings.ts
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/logs/field_mappings.js
rename to src/plugins/home/server/services/sample_data/data_sets/logs/field_mappings.ts
diff --git a/src/plugins/home/server/services/sample_data/data_sets/logs/index.ts b/src/plugins/home/server/services/sample_data/data_sets/logs/index.ts
new file mode 100644
index 0000000000000..bb6e2982f59a0
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/data_sets/logs/index.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 path from 'path';
+import { i18n } from '@kbn/i18n';
+import { getSavedObjects } from './saved_objects';
+import { fieldMappings } from './field_mappings';
+import { SampleDatasetSchema, AppLinkSchema } from '../../lib/sample_dataset_registry_types';
+
+const logsName = i18n.translate('home.sampleData.logsSpecTitle', {
+  defaultMessage: 'Sample web logs',
+});
+const logsDescription = i18n.translate('home.sampleData.logsSpecDescription', {
+  defaultMessage: 'Sample data, visualizations, and dashboards for monitoring web logs.',
+});
+const initialAppLinks = [] as AppLinkSchema[];
+
+export const logsSpecProvider = function(): SampleDatasetSchema {
+  return {
+    id: 'logs',
+    name: logsName,
+    description: logsDescription,
+    previewImagePath: '/plugins/kibana/home/sample_data_resources/logs/dashboard.png',
+    darkPreviewImagePath: '/plugins/kibana/home/sample_data_resources/logs/dashboard_dark.png',
+    overviewDashboard: 'edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b',
+    appLinks: initialAppLinks,
+    defaultIndex: '90943e30-9a47-11e8-b64d-95841ca0b247',
+    savedObjects: getSavedObjects(),
+    dataIndices: [
+      {
+        id: 'logs',
+        dataPath: path.join(__dirname, './logs.json.gz'),
+        fields: fieldMappings,
+        timeFields: ['timestamp', 'utc_time'],
+        currentTimeMarker: '2018-08-01T00:00:00',
+        preserveDayOfWeekTimeOfDay: true,
+      },
+    ],
+    status: 'not_installed',
+  };
+};
diff --git a/src/legacy/server/sample_data/data_sets/logs/logs.json.gz b/src/plugins/home/server/services/sample_data/data_sets/logs/logs.json.gz
similarity index 100%
rename from src/legacy/server/sample_data/data_sets/logs/logs.json.gz
rename to src/plugins/home/server/services/sample_data/data_sets/logs/logs.json.gz
diff --git a/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts
new file mode 100644
index 0000000000000..883108651bfc5
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts
@@ -0,0 +1,369 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 max-len: 0 */
+/* eslint-disable */
+import { i18n } from '@kbn/i18n';
+import { SavedObject } from 'kibana/server';
+
+export const getSavedObjects = (): SavedObject[] => [
+  {
+    id: 'e1d0f010-9ee7-11e7-8711-e7a007dcef99',
+    type: 'visualization',
+    updated_at: '2018-08-29T13:22:17.617Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.uniqueVisitorsTitle', {
+        defaultMessage: '[Logs] Unique Visitors vs. Average Bytes',
+      }),
+      visState:
+        '{"title":"[Logs] Unique Visitors vs. Average Bytes","type":"area","params":{"type":"area","grid":{"categoryLines":false,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Avg. Bytes"}},{"id":"ValueAxis-2","name":"RightAxis-1","type":"value","position":"right","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Unique Visitors"}}],"seriesParams":[{"show":"true","type":"histogram","mode":"stacked","data":{"label":"Avg. Bytes","id":"1"},"drawLinesBetweenPoints":true,"showCircles":true,"interpolate":"linear","valueAxis":"ValueAxis-1"},{"show":true,"mode":"stacked","type":"line","drawLinesBetweenPoints":false,"showCircles":true,"interpolate":"linear","data":{"id":"2","label":"Unique Visitors"},"valueAxis":"ValueAxis-2"}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false,"radiusRatio":17},"aggs":[{"id":"1","enabled":true,"type":"avg","schema":"metric","params":{"field":"bytes","customLabel":"Avg. Bytes"}},{"id":"2","enabled":true,"type":"cardinality","schema":"metric","params":{"field":"clientip","customLabel":"Unique Visitors"}},{"id":"3","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"timestamp","interval":"auto","time_zone":"America/Los_Angeles","customInterval":"2h","min_doc_count":1,"extended_bounds":{}}},{"id":"4","enabled":true,"type":"count","schema":"radius","params":{}}]}',
+      uiStateJSON: '{"vis":{"colors":{"Avg. Bytes":"#70DBED","Unique Visitors":"#0A437C"}}}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '06cf9c40-9ee8-11e7-8711-e7a007dcef99',
+    type: 'visualization',
+    updated_at: '2018-08-29T13:22:17.617Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.uniqueVisitorsByCountryTitle', {
+        defaultMessage: '[Logs] Unique Visitors by Country',
+      }),
+      visState:
+        '{"title":"[Logs] Unique Visitors by Country","type":"region_map","params":{"legendPosition":"bottomright","addTooltip":true,"colorSchema":"Reds","selectedLayer":{"attribution":"<p><a href=\\"http://www.naturalearthdata.com/about/terms-of-use\\">Made with NaturalEarth</a> | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","name":"World Countries","weight":1,"format":{"type":"geojson"},"url":"https://vector.maps.elastic.co/blob/5659313586569216?elastic_tile_service_tos=agree&my_app_version=6.2.3&license=77ab0ecf-a521-499d-bd52-fbd740bb81d0","fields":[{"name":"iso2","description":"Two letter abbreviation"},{"name":"name","description":"Country name"},{"name":"iso3","description":"Three letter abbreviation"}],"created_at":"2017-04-26T17:12:15.978370","tags":[],"id":5659313586569216,"layerId":"elastic_maps_service.World Countries"},"selectedJoinField":{"name":"iso2","description":"Two letter abbreviation"},"isDisplayWarning":false,"wms":{"enabled":false,"options":{"format":"image/png","transparent":true},"baseLayersAreLoaded":{},"tmsLayers":[{"id":"road_map","url":"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.2.3&license=77ab0ecf-a521-499d-bd52-fbd740bb81d0","minZoom":0,"maxZoom":18,"attribution":"<p>&#169; <a href=\\"http://www.openstreetmap.org/copyright\\">OpenStreetMap</a> contributors | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","subdomains":[]}],"selectedTmsLayer":{"id":"road_map","url":"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.2.3&license=77ab0ecf-a521-499d-bd52-fbd740bb81d0","minZoom":0,"maxZoom":18,"attribution":"<p>&#169; <a href=\\"http://www.openstreetmap.org/copyright\\">OpenStreetMap</a> contributors | <a href=\\"https://www.elastic.co/elastic-maps-service\\">Elastic Maps Service</a></p>&#10;","subdomains":[]}},"mapZoom":2,"mapCenter":[0,0],"outlineWeight":1,"showAllShapes":true,"emsHotLink":null},"aggs":[{"id":"1","enabled":true,"type":"cardinality","schema":"metric","params":{"field":"clientip","customLabel":"Unique Visitors"}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"geo.src","size":50,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '935afa20-e0cd-11e7-9d07-1398ccfcefa3',
+    type: 'visualization',
+    updated_at: '2018-08-29T13:22:17.617Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.heatmapTitle', {
+        defaultMessage: '[Logs] Heatmap',
+      }),
+      visState:
+        '{"title":"[Logs] Heatmap","type":"heatmap","params":{"type":"heatmap","addTooltip":true,"addLegend":true,"enableHover":true,"legendPosition":"right","times":[],"colorsNumber":10,"colorSchema":"Reds","setColorRange":false,"colorsRange":[],"invertColors":false,"percentageMode":false,"valueAxes":[{"show":false,"id":"ValueAxis-1","type":"value","scale":{"type":"linear","defaultYExtents":false},"labels":{"show":false,"rotate":0,"color":"#555","overwriteColor":false}}]},"aggs":[{"id":"1","enabled":true,"type":"cardinality","schema":"metric","params":{"field":"clientip"}},{"id":"3","enabled":true,"type":"terms","schema":"group","params":{"field":"geo.src","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Country Source"}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"hour_of_day","size":25,"order":"asc","orderBy":"_key","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","customLabel":"Hour of Day"}}]}',
+      uiStateJSON:
+        '{"vis":{"defaultColors":{"0 - 4":"rgb(255,245,240)","4 - 8":"rgb(254,228,216)","8 - 12":"rgb(253,202,181)","12 - 16":"rgb(252,171,142)","16 - 20":"rgb(252,138,106)","20 - 24":"rgb(251,106,74)","24 - 28":"rgb(241,68,50)","28 - 32":"rgb(217,38,35)","32 - 36":"rgb(188,20,26)","36 - 40":"rgb(152,12,19)"}}}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '4eb6e500-e1c7-11e7-b6d5-4dc382ef7f5b',
+    type: 'visualization',
+    updated_at: '2018-08-29T13:23:20.897Z',
+    version: '2',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.hostVisitsBytesTableTitle', {
+        defaultMessage: '[Logs] Host, Visits and Bytes Table',
+      }),
+      visState:
+        '{"title":"[Logs] Host, Visits and Bytes Table","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417","type":"table","series":[{"id":"bd09d600-e5b1-11e7-bfc2-a1f7e71965a1","color":"#68BC00","split_mode":"everything","metrics":[{"id":"bd09d601-e5b1-11e7-bfc2-a1f7e71965a1","type":"sum","field":"bytes"},{"sigma":"","id":"c9514c90-e5b1-11e7-bfc2-a1f7e71965a1","type":"sum_bucket","field":"bd09d601-e5b1-11e7-bfc2-a1f7e71965a1"}],"seperate_axis":0,"axis_position":"right","formatter":"bytes","chart_type":"line","line_width":1,"point_size":1,"fill":0.5,"stacked":"none","color_rules":[{"id":"c0c668d0-e5b1-11e7-bfc2-a1f7e71965a1"}],"label":"Bytes (Total)"},{"id":"b7672c30-a6df-11e8-8b18-1da1dfc50975","color":"#68BC00","split_mode":"everything","metrics":[{"id":"b7672c31-a6df-11e8-8b18-1da1dfc50975","type":"sum","field":"bytes"}],"seperate_axis":0,"axis_position":"right","formatter":"bytes","chart_type":"line","line_width":1,"point_size":1,"fill":0.5,"stacked":"none","color_rules":[{"id":"c0c668d0-e5b1-11e7-bfc2-a1f7e71965a1"}],"label":"Bytes (Last Hour)"},{"id":"f2c20700-a6df-11e8-8b18-1da1dfc50975","color":"#68BC00","split_mode":"everything","metrics":[{"id":"f2c20701-a6df-11e8-8b18-1da1dfc50975","type":"cardinality","field":"ip"},{"sigma":"","id":"f46333e0-a6df-11e8-8b18-1da1dfc50975","type":"sum_bucket","field":"f2c20701-a6df-11e8-8b18-1da1dfc50975"}],"seperate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":0.5,"stacked":"none","label":"Unique Visits (Total)","color_rules":[{"value":1000,"id":"2e963080-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(211,49,21,1)","operator":"lt"},{"value":1000,"id":"3d4fb880-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(252,196,0,1)","operator":"gte"},{"value":1500,"id":"435f8a20-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(104,188,0,1)","operator":"gte"}],"offset_time":"","value_template":"","trend_arrows":1},{"id":"46fd7fc0-e5b1-11e7-bfc2-a1f7e71965a1","color":"#68BC00","split_mode":"everything","metrics":[{"id":"46fd7fc1-e5b1-11e7-bfc2-a1f7e71965a1","type":"cardinality","field":"ip"}],"seperate_axis":0,"axis_position":"right","formatter":"number","chart_type":"line","line_width":1,"point_size":1,"fill":0.5,"stacked":"none","label":"Unique Visits (Last Hour)","color_rules":[{"value":10,"id":"4e90aeb0-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(211,49,21,1)","operator":"lt"},{"value":10,"id":"6d59b1c0-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(252,196,0,1)","operator":"gte"},{"value":25,"id":"77578670-a6e0-11e8-8b18-1da1dfc50975","text":"rgba(104,188,0,1)","operator":"gte"}],"offset_time":"","value_template":"","trend_arrows":1}],"time_field":"timestamp","index_pattern":"kibana_sample_data_logs","interval":"1h","axis_position":"left","axis_formatter":"number","show_legend":1,"show_grid":1,"bar_color_rules":[{"id":"e9b4e490-e1c6-11e7-b4f6-0f68c45f7387"}],"pivot_id":"extension.keyword","pivot_label":"Type","drilldown_url":"","axis_scale":"normal"},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '69a34b00-9ee8-11e7-8711-e7a007dcef99',
+    type: 'visualization',
+    updated_at: '2018-08-29T13:24:46.136Z',
+    version: '2',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.goalsTitle', {
+        defaultMessage: '[Logs] Goals',
+      }),
+      visState:
+        '{"title":"[Logs] Goals","type":"gauge","params":{"type":"gauge","addTooltip":true,"addLegend":false,"gauge":{"verticalSplit":false,"extendRange":true,"percentageMode":false,"gaugeType":"Arc","gaugeStyle":"Full","backStyle":"Full","orientation":"vertical","colorSchema":"Green to Red","gaugeColorMode":"Labels","colorsRange":[{"from":0,"to":500},{"from":500,"to":1000},{"from":1000,"to":1500}],"invertColors":true,"labels":{"show":false,"color":"black"},"scale":{"show":true,"labels":false,"color":"#333"},"type":"meter","style":{"bgWidth":0.9,"width":0.9,"mask":false,"bgMask":false,"maskBars":50,"bgFill":"#eee","bgColor":false,"subText":"visitors","fontSize":60,"labelColor":true}},"isDisplayWarning":false},"aggs":[{"id":"1","enabled":true,"type":"cardinality","schema":"metric","params":{"field":"clientip","customLabel":"Unique Visitors"}}]}',
+      uiStateJSON:
+        '{"vis":{"defaultColors":{"0 - 500":"rgb(165,0,38)","500 - 1000":"rgb(255,255,190)","1000 - 1500":"rgb(0,104,55)"},"colors":{"75 - 100":"#629E51","50 - 75":"#EAB839","0 - 50":"#E24D42","0 - 100":"#E24D42","200 - 300":"#7EB26D","500 - 1000":"#E5AC0E","0 - 500":"#E24D42","1000 - 1500":"#7EB26D"},"legendOpen":true}}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '42b997f0-0c26-11e8-b0ec-3bb475f6b6ff',
+    type: 'visualization',
+    updated_at: '2018-08-29T13:22:17.617Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.fileTypeScatterPlotTitle', {
+        defaultMessage: '[Logs] File Type Scatter Plot',
+      }),
+      visState:
+        '{"title":"[Logs] File Type Scatter Plot","type":"vega","params":{"spec":"{\\n  $schema: \\"https://vega.github.io/schema/vega-lite/v2.json\\"\\n  // Use points for drawing to actually create a scatterplot\\n  mark: point\\n  // Specify where to load data from\\n  data: {\\n    // By using an object to the url parameter we will\\n    // construct an Elasticsearch query\\n    url: {\\n      // Context == true means filters of the dashboard will be taken into account\\n      %context%: true\\n      // Specify on which field the time picker should operate\\n      %timefield%: timestamp\\n      // Specify the index pattern to load data from\\n      index: kibana_sample_data_logs\\n      // This body will be send to Elasticsearch\'s _search endpoint\\n      // You can use everything the ES Query DSL supports here\\n      body: {\\n        // Set the size to load 10000 documents\\n        size: 10000,\\n        // Just ask for the fields we actually need for visualization\\n        _source: [\\"timestamp\\", \\"bytes\\", \\"extension\\"]\\n      }\\n    }\\n    // Tell Vega, that the array of data will be inside hits.hits of the response\\n    // since the result returned from Elasticsearch fill have a format like:\\n    // {\\n    //   hits: {\\n    //     total: 42000,\\n    //     max_score: 2,\\n    //     hits: [\\n    //       < our individual documents >\\n    //     ]\\n    //   }\\n    // }\\n    format: { property: \\"hits.hits\\" }\\n  }\\n  // You can do transformation and calculation of the data before drawing it\\n  transform: [\\n    // Since timestamp is a string value, we need to convert it to a unix timestamp\\n    // so that Vega can work on it properly.\\n    {\\n      // Convert _source.timestamp field to a date\\n      calculate: \\"toDate(datum._source[\'timestamp\'])\\"\\n      // Store the result in a field named \\"time\\" in the object\\n      as: \\"time\\"\\n    }\\n  ]\\n  // Specify what data will be drawn on which axis\\n  encoding: {\\n    x: {\\n      // Draw the time field on the x-axis in temporal mode (i.e. as a time axis)\\n      field: time\\n      type: temporal\\n      // Hide the axis label for the x-axis\\n      axis: { title: false }\\n    }\\n    y: {\\n      // Draw the bytes of each document on the y-axis\\n      field: _source.bytes\\n      // Mark the y-axis as quantitative\\n      type: quantitative\\n      // Specify the label for this axis\\n      axis: { title: \\"Transferred bytes\\" }\\n    }\\n    color: {\\n      // Make the color of each point depend on the _source.extension field\\n      field: _source.extension\\n      // Treat different values as completely unrelated values to each other.\\n      // You could switch this to quantitative if you have a numeric field and\\n      // want to create a color scale from one color to another depending on that\\n      // field\'s value.\\n      type: nominal\\n      // Rename the legend title so it won\'t just state: \\"_source.extension\\"\\n      legend: { title: \'File type\' }\\n    }\\n    shape: {\\n      // Also make the shape of each point dependent on the extension.\\n      field: _source.extension\\n      type: nominal\\n    }\\n  }\\n}"},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '7cbd2350-2223-11e8-b802-5bcf64c2cfb4',
+    type: 'visualization',
+    updated_at: '2018-08-29T13:22:17.617Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.sourceAndDestinationSankeyChartTitle', {
+        defaultMessage: '[Logs] Source and Destination Sankey Chart',
+      }),
+      visState:
+        '{"title":"[Logs] Source and Destination Sankey Chart","type":"vega","params":{"spec":"{ \\n $schema: https://vega.github.io/schema/vega/v3.0.json\\n  data: [\\n\\t{\\n  \\t// query ES based on the currently selected time range and filter string\\n  \\tname: rawData\\n  \\turl: {\\n    \\t%context%: true\\n    \\t%timefield%: timestamp\\n    \\tindex: kibana_sample_data_logs\\n    \\tbody: {\\n      \\tsize: 0\\n      \\taggs: {\\n        \\ttable: {\\n          \\tcomposite: {\\n            \\tsize: 10000\\n            \\tsources: [\\n              \\t{\\n                \\tstk1: {\\n                  \\tterms: {field: \\"geo.src\\"}\\n                \\t}\\n              \\t}\\n              \\t{\\n                \\tstk2: {\\n                  \\tterms: {field: \\"geo.dest\\"}\\n                \\t}\\n              \\t}\\n            \\t]\\n          \\t}\\n        \\t}\\n      \\t}\\n    \\t}\\n  \\t}\\n  \\t// From the result, take just the data we are interested in\\n  \\tformat: {property: \\"aggregations.table.buckets\\"}\\n  \\t// Convert key.stk1 -> stk1 for simpler access below\\n  \\ttransform: [\\n    \\t{type: \\"formula\\", expr: \\"datum.key.stk1\\", as: \\"stk1\\"}\\n    \\t{type: \\"formula\\", expr: \\"datum.key.stk2\\", as: \\"stk2\\"}\\n    \\t{type: \\"formula\\", expr: \\"datum.doc_count\\", as: \\"size\\"}\\n  \\t]\\n\\t}\\n\\t{\\n  \\tname: nodes\\n  \\tsource: rawData\\n  \\ttransform: [\\n    \\t// when a country is selected, filter out unrelated data\\n    \\t{\\n      \\ttype: filter\\n      \\texpr: !groupSelector || groupSelector.stk1 == datum.stk1 || groupSelector.stk2 == datum.stk2\\n    \\t}\\n    \\t// Set new key for later lookups - identifies each node\\n    \\t{type: \\"formula\\", expr: \\"datum.stk1+datum.stk2\\", as: \\"key\\"}\\n    \\t// instead of each table row, create two new rows,\\n    \\t// one for the source (stack=stk1) and one for destination node (stack=stk2).\\n    \\t// The country code stored in stk1 and stk2 fields is placed into grpId field.\\n    \\t{\\n      \\ttype: fold\\n      \\tfields: [\\"stk1\\", \\"stk2\\"]\\n      \\tas: [\\"stack\\", \\"grpId\\"]\\n    \\t}\\n    \\t// Create a sortkey, different for stk1 and stk2 stacks.\\n    \\t{\\n      \\ttype: formula\\n      \\texpr: datum.stack == \'stk1\' ? datum.stk1+datum.stk2 : datum.stk2+datum.stk1\\n      \\tas: sortField\\n    \\t}\\n    \\t// Calculate y0 and y1 positions for stacking nodes one on top of the other,\\n    \\t// independently for each stack, and ensuring they are in the proper order,\\n    \\t// alphabetical from the top (reversed on the y axis)\\n    \\t{\\n      \\ttype: stack\\n      \\tgroupby: [\\"stack\\"]\\n      \\tsort: {field: \\"sortField\\", order: \\"descending\\"}\\n      \\tfield: size\\n    \\t}\\n    \\t// calculate vertical center point for each node, used to draw edges\\n    \\t{type: \\"formula\\", expr: \\"(datum.y0+datum.y1)/2\\", as: \\"yc\\"}\\n  \\t]\\n\\t}\\n\\t{\\n  \\tname: groups\\n  \\tsource: nodes\\n  \\ttransform: [\\n    \\t// combine all nodes into country groups, summing up the doc counts\\n    \\t{\\n      \\ttype: aggregate\\n      \\tgroupby: [\\"stack\\", \\"grpId\\"]\\n      \\tfields: [\\"size\\"]\\n      \\tops: [\\"sum\\"]\\n      \\tas: [\\"total\\"]\\n    \\t}\\n    \\t// re-calculate the stacking y0,y1 values\\n    \\t{\\n      \\ttype: stack\\n      \\tgroupby: [\\"stack\\"]\\n      \\tsort: {field: \\"grpId\\", order: \\"descending\\"}\\n      \\tfield: total\\n    \\t}\\n    \\t// project y0 and y1 values to screen coordinates\\n    \\t// doing it once here instead of doing it several times in marks\\n    \\t{type: \\"formula\\", expr: \\"scale(\'y\', datum.y0)\\", as: \\"scaledY0\\"}\\n    \\t{type: \\"formula\\", expr: \\"scale(\'y\', datum.y1)\\", as: \\"scaledY1\\"}\\n    \\t// boolean flag if the label should be on the right of the stack\\n    \\t{type: \\"formula\\", expr: \\"datum.stack == \'stk1\'\\", as: \\"rightLabel\\"}\\n    \\t// Calculate traffic percentage for this country using \\"y\\" scale\\n    \\t// domain upper bound, which represents the total traffic\\n    \\t{\\n      \\ttype: formula\\n      \\texpr: datum.total/domain(\'y\')[1]\\n      \\tas: percentage\\n    \\t}\\n  \\t]\\n\\t}\\n\\t{\\n  \\t// This is a temp lookup table with all the \'stk2\' stack nodes\\n  \\tname: destinationNodes\\n  \\tsource: nodes\\n  \\ttransform: [\\n    \\t{type: \\"filter\\", expr: \\"datum.stack == \'stk2\'\\"}\\n  \\t]\\n\\t}\\n\\t{\\n  \\tname: edges\\n  \\tsource: nodes\\n  \\ttransform: [\\n    \\t// we only want nodes from the left stack\\n    \\t{type: \\"filter\\", expr: \\"datum.stack == \'stk1\'\\"}\\n    \\t// find corresponding node from the right stack, keep it as \\"target\\"\\n    \\t{\\n      \\ttype: lookup\\n      \\tfrom: destinationNodes\\n      \\tkey: key\\n      \\tfields: [\\"key\\"]\\n      \\tas: [\\"target\\"]\\n    \\t}\\n    \\t// calculate SVG link path between stk1 and stk2 stacks for the node pair\\n    \\t{\\n      \\ttype: linkpath\\n      \\torient: horizontal\\n      \\tshape: diagonal\\n      \\tsourceY: {expr: \\"scale(\'y\', datum.yc)\\"}\\n      \\tsourceX: {expr: \\"scale(\'x\', \'stk1\') + bandwidth(\'x\')\\"}\\n      \\ttargetY: {expr: \\"scale(\'y\', datum.target.yc)\\"}\\n      \\ttargetX: {expr: \\"scale(\'x\', \'stk2\')\\"}\\n    \\t}\\n    \\t// A little trick to calculate the thickness of the line.\\n    \\t// The value needs to be the same as the hight of the node, but scaling\\n    \\t// size to screen\'s height gives inversed value because screen\'s Y\\n    \\t// coordinate goes from the top to the bottom, whereas the graph\'s Y=0\\n    \\t// is at the bottom. So subtracting scaled doc count from screen height\\n    \\t// (which is the \\"lower\\" bound of the \\"y\\" scale) gives us the right value\\n    \\t{\\n      \\ttype: formula\\n      \\texpr: range(\'y\')[0]-scale(\'y\', datum.size)\\n      \\tas: strokeWidth\\n    \\t}\\n    \\t// Tooltip needs individual link\'s percentage of all traffic\\n    \\t{\\n      \\ttype: formula\\n      \\texpr: datum.size/domain(\'y\')[1]\\n      \\tas: percentage\\n    \\t}\\n  \\t]\\n\\t}\\n  ]\\n  scales: [\\n\\t{\\n  \\t// calculates horizontal stack positioning\\n  \\tname: x\\n  \\ttype: band\\n  \\trange: width\\n  \\tdomain: [\\"stk1\\", \\"stk2\\"]\\n  \\tpaddingOuter: 0.05\\n  \\tpaddingInner: 0.95\\n\\t}\\n\\t{\\n  \\t// this scale goes up as high as the highest y1 value of all nodes\\n  \\tname: y\\n  \\ttype: linear\\n  \\trange: height\\n  \\tdomain: {data: \\"nodes\\", field: \\"y1\\"}\\n\\t}\\n\\t{\\n  \\t// use rawData to ensure the colors stay the same when clicking.\\n  \\tname: color\\n  \\ttype: ordinal\\n  \\trange: category\\n  \\tdomain: {data: \\"rawData\\", field: \\"stk1\\"}\\n\\t}\\n\\t{\\n  \\t// this scale is used to map internal ids (stk1, stk2) to stack names\\n  \\tname: stackNames\\n  \\ttype: ordinal\\n  \\trange: [\\"Source\\", \\"Destination\\"]\\n  \\tdomain: [\\"stk1\\", \\"stk2\\"]\\n\\t}\\n  ]\\n  axes: [\\n\\t{\\n  \\t// x axis should use custom label formatting to print proper stack names\\n  \\torient: bottom\\n  \\tscale: x\\n  \\tencode: {\\n    \\tlabels: {\\n      \\tupdate: {\\n        \\ttext: {scale: \\"stackNames\\", field: \\"value\\"}\\n      \\t}\\n    \\t}\\n  \\t}\\n\\t}\\n\\t{orient: \\"left\\", scale: \\"y\\"}\\n  ]\\n  marks: [\\n\\t{\\n  \\t// draw the connecting line between stacks\\n  \\ttype: path\\n  \\tname: edgeMark\\n  \\tfrom: {data: \\"edges\\"}\\n  \\t// this prevents some autosizing issues with large strokeWidth for paths\\n  \\tclip: true\\n  \\tencode: {\\n    \\tupdate: {\\n      \\t// By default use color of the left node, except when showing traffic\\n      \\t// from just one country, in which case use destination color.\\n      \\tstroke: [\\n        \\t{\\n          \\ttest: groupSelector && groupSelector.stack==\'stk1\'\\n          \\tscale: color\\n          \\tfield: stk2\\n        \\t}\\n        \\t{scale: \\"color\\", field: \\"stk1\\"}\\n      \\t]\\n      \\tstrokeWidth: {field: \\"strokeWidth\\"}\\n      \\tpath: {field: \\"path\\"}\\n      \\t// when showing all traffic, and hovering over a country,\\n      \\t// highlight the traffic from that country.\\n      \\tstrokeOpacity: {\\n        \\tsignal: !groupSelector && (groupHover.stk1 == datum.stk1 || groupHover.stk2 == datum.stk2) ? 0.9 : 0.3\\n      \\t}\\n      \\t// Ensure that the hover-selected edges show on top\\n      \\tzindex: {\\n        \\tsignal: !groupSelector && (groupHover.stk1 == datum.stk1 || groupHover.stk2 == datum.stk2) ? 1 : 0\\n      \\t}\\n      \\t// format tooltip string\\n      \\ttooltip: {\\n        \\tsignal: datum.stk1 + \' → \' + datum.stk2 + \'\\t\' + format(datum.size, \',.0f\') + \'   (\' + format(datum.percentage, \'.1%\') + \')\'\\n      \\t}\\n    \\t}\\n    \\t// Simple mouseover highlighting of a single line\\n    \\thover: {\\n      \\tstrokeOpacity: {value: 1}\\n    \\t}\\n  \\t}\\n\\t}\\n\\t{\\n  \\t// draw stack groups (countries)\\n  \\ttype: rect\\n  \\tname: groupMark\\n  \\tfrom: {data: \\"groups\\"}\\n  \\tencode: {\\n    \\tenter: {\\n      \\tfill: {scale: \\"color\\", field: \\"grpId\\"}\\n      \\twidth: {scale: \\"x\\", band: 1}\\n    \\t}\\n    \\tupdate: {\\n      \\tx: {scale: \\"x\\", field: \\"stack\\"}\\n      \\ty: {field: \\"scaledY0\\"}\\n      \\ty2: {field: \\"scaledY1\\"}\\n      \\tfillOpacity: {value: 0.6}\\n      \\ttooltip: {\\n        \\tsignal: datum.grpId + \'   \' + format(datum.total, \',.0f\') + \'   (\' + format(datum.percentage, \'.1%\') + \')\'\\n      \\t}\\n    \\t}\\n    \\thover: {\\n      \\tfillOpacity: {value: 1}\\n    \\t}\\n  \\t}\\n\\t}\\n\\t{\\n  \\t// draw country code labels on the inner side of the stack\\n  \\ttype: text\\n  \\tfrom: {data: \\"groups\\"}\\n  \\t// don\'t process events for the labels - otherwise line mouseover is unclean\\n  \\tinteractive: false\\n  \\tencode: {\\n    \\tupdate: {\\n      \\t// depending on which stack it is, position x with some padding\\n      \\tx: {\\n        \\tsignal: scale(\'x\', datum.stack) + (datum.rightLabel ? bandwidth(\'x\') + 8 : -8)\\n      \\t}\\n      \\t// middle of the group\\n      \\tyc: {signal: \\"(datum.scaledY0 + datum.scaledY1)/2\\"}\\n      \\talign: {signal: \\"datum.rightLabel ? \'left\' : \'right\'\\"}\\n      \\tbaseline: {value: \\"middle\\"}\\n      \\tfontWeight: {value: \\"bold\\"}\\n      \\t// only show text label if the group\'s height is large enough\\n      \\ttext: {signal: \\"abs(datum.scaledY0-datum.scaledY1) > 13 ? datum.grpId : \'\'\\"}\\n    \\t}\\n  \\t}\\n\\t}\\n\\t{\\n  \\t// Create a \\"show all\\" button. Shown only when a country is selected.\\n  \\ttype: group\\n  \\tdata: [\\n    \\t// We need to make the button show only when groupSelector signal is true.\\n    \\t// Each mark is drawn as many times as there are elements in the backing data.\\n    \\t// Which means that if values list is empty, it will not be drawn.\\n    \\t// Here I create a data source with one empty object, and filter that list\\n    \\t// based on the signal value. This can only be done in a group.\\n    \\t{\\n      \\tname: dataForShowAll\\n      \\tvalues: [{}]\\n      \\ttransform: [{type: \\"filter\\", expr: \\"groupSelector\\"}]\\n    \\t}\\n  \\t]\\n  \\t// Set button size and positioning\\n  \\tencode: {\\n    \\tenter: {\\n      \\txc: {signal: \\"width/2\\"}\\n      \\ty: {value: 30}\\n      \\twidth: {value: 80}\\n      \\theight: {value: 30}\\n    \\t}\\n  \\t}\\n  \\tmarks: [\\n    \\t{\\n      \\t// This group is shown as a button with rounded corners.\\n      \\ttype: group\\n      \\t// mark name allows signal capturing\\n      \\tname: groupReset\\n      \\t// Only shows button if dataForShowAll has values.\\n      \\tfrom: {data: \\"dataForShowAll\\"}\\n      \\tencode: {\\n        \\tenter: {\\n          \\tcornerRadius: {value: 6}\\n          \\tfill: {value: \\"#F5F7FA\\"}\\n          \\tstroke: {value: \\"#c1c1c1\\"}\\n          \\tstrokeWidth: {value: 2}\\n          \\t// use parent group\'s size\\n          \\theight: {\\n            \\tfield: {group: \\"height\\"}\\n          \\t}\\n          \\twidth: {\\n            \\tfield: {group: \\"width\\"}\\n          \\t}\\n        \\t}\\n        \\tupdate: {\\n          \\t// groups are transparent by default\\n          \\topacity: {value: 1}\\n        \\t}\\n        \\thover: {\\n          \\topacity: {value: 0.7}\\n        \\t}\\n      \\t}\\n      \\tmarks: [\\n        \\t{\\n          \\ttype: text\\n          \\t// if true, it will prevent clicking on the button when over text.\\n          \\tinteractive: false\\n          \\tencode: {\\n            \\tenter: {\\n              \\t// center text in the paren group\\n              \\txc: {\\n                \\tfield: {group: \\"width\\"}\\n                \\tmult: 0.5\\n              \\t}\\n              \\tyc: {\\n                \\tfield: {group: \\"height\\"}\\n                \\tmult: 0.5\\n                \\toffset: 2\\n              \\t}\\n              \\talign: {value: \\"center\\"}\\n              \\tbaseline: {value: \\"middle\\"}\\n              \\tfontWeight: {value: \\"bold\\"}\\n              \\ttext: {value: \\"Show All\\"}\\n            \\t}\\n          \\t}\\n        \\t}\\n      \\t]\\n    \\t}\\n  \\t]\\n\\t}\\n  ]\\n  signals: [\\n\\t{\\n  \\t// used to highlight traffic to/from the same country\\n  \\tname: groupHover\\n  \\tvalue: {}\\n  \\ton: [\\n    \\t{\\n      \\tevents: @groupMark:mouseover\\n      \\tupdate: \\"{stk1:datum.stack==\'stk1\' && datum.grpId, stk2:datum.stack==\'stk2\' && datum.grpId}\\"\\n    \\t}\\n    \\t{events: \\"mouseout\\", update: \\"{}\\"}\\n  \\t]\\n\\t}\\n\\t// used to filter only the data related to the selected country\\n\\t{\\n  \\tname: groupSelector\\n  \\tvalue: false\\n  \\ton: [\\n    \\t{\\n      \\t// Clicking groupMark sets this signal to the filter values\\n      \\tevents: @groupMark:click!\\n      \\tupdate: \\"{stack:datum.stack, stk1:datum.stack==\'stk1\' && datum.grpId, stk2:datum.stack==\'stk2\' && datum.grpId}\\"\\n    \\t}\\n    \\t{\\n      \\t// Clicking \\"show all\\" button, or double-clicking anywhere resets it\\n      \\tevents: [\\n        \\t{type: \\"click\\", markname: \\"groupReset\\"}\\n        \\t{type: \\"dblclick\\"}\\n      \\t]\\n      \\tupdate: \\"false\\"\\n    \\t}\\n  \\t]\\n\\t}\\n  ]\\n}\\n"},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '314c6f60-2224-11e8-b802-5bcf64c2cfb4',
+    type: 'visualization',
+    updated_at: '2018-08-29T13:22:17.617Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.responseCodesOverTimeTitle', {
+        defaultMessage: '[Logs] Response Codes Over Time + Annotations',
+      }),
+      visState:
+        '{"title":"[Logs] Response Codes Over Time + Annotations","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417","type":"timeseries","series":[{"id":"61ca57f1-469d-11e7-af02-69e470af7417","color":"rgba(115,216,255,1)","split_mode":"terms","metrics":[{"id":"61ca57f2-469d-11e7-af02-69e470af7417","type":"cardinality","field":"ip"}],"seperate_axis":0,"axis_position":"right","formatter":"percent","chart_type":"line","line_width":"2","point_size":"0","fill":"0.5","stacked":"percent","terms_field":"response.keyword","terms_order_by":"61ca57f2-469d-11e7-af02-69e470af7417","label":"Response Code Count","split_color_mode":"gradient"}],"time_field":"timestamp","index_pattern":"kibana_sample_data_logs","interval":">=4h","axis_position":"left","axis_formatter":"number","show_legend":1,"show_grid":1,"annotations":[{"fields":"geo.src, host","template":"Security Error from {{geo.src}} on {{host}}","index_pattern":"kibana_sample_data_logs","query_string":"tags:error AND tags:security","id":"bd7548a0-2223-11e8-832f-d5027f3c8a47","color":"rgba(211,49,21,1)","time_field":"timestamp","icon":"fa-asterisk","ignore_global_filters":1,"ignore_panel_filters":1}],"legend_position":"bottom","axis_scale":"normal","drop_last_bucket":0},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '24a3e970-4257-11e8-b3aa-73fdaf54bfc9',
+    type: 'visualization',
+    updated_at: '2018-08-29T13:22:17.617Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.inputControlsTitle', {
+        defaultMessage: '[Logs] Input Controls',
+      }),
+      visState:
+        '{"title":"[Logs] Input Controls","type":"input_control_vis","params":{"controls":[{"id":"1523980210832","indexPattern":"90943e30-9a47-11e8-b64d-95841ca0b247","fieldName":"geo.src","label":"Source Country","type":"list","options":{"type":"terms","multiselect":true,"size":100,"order":"desc"},"parent":""},{"id":"1523980191978","indexPattern":"90943e30-9a47-11e8-b64d-95841ca0b247","fieldName":"machine.os.keyword","label":"OS","type":"list","options":{"type":"terms","multiselect":true,"size":100,"order":"desc"},"parent":"1523980210832"},{"id":"1523980232790","indexPattern":"90943e30-9a47-11e8-b64d-95841ca0b247","fieldName":"bytes","label":"Bytes","type":"range","options":{"decimalPlaces":0,"step":1024}}],"updateFiltersOnChange":true,"useTimeFilter":true,"pinFilters":false},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '14e2e710-4258-11e8-b3aa-73fdaf54bfc9',
+    type: 'visualization',
+    updated_at: '2018-08-29T13:22:17.617Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.visitorOSTitle', {
+        defaultMessage: '[Logs] Visitors by OS',
+      }),
+      visState:
+        '{"title":"[Logs] Visitors by OS","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"machine.os.keyword","otherBucket":true,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","size":10,"order":"desc","orderBy":"1"}}]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"index":"90943e30-9a47-11e8-b64d-95841ca0b247","filter":[],"query":{"query":"","language":"kuery"}}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '47f2c680-a6e3-11e8-94b4-c30c0228351b',
+    type: 'visualization',
+    updated_at: '2018-08-29T13:22:17.617Z',
+    version: '1',
+    migrationVersion: {},
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.markdownInstructionsTitle', {
+        defaultMessage: '[Logs] Markdown Instructions',
+      }),
+      visState:
+        '{"title":"[Logs] Markdown Instructions","type":"markdown","params":{"fontSize":12,"openLinksInNewTab":true,"markdown":"### Sample Logs Data\\nThis dashboard contains sample data for you to play with. You can view it, search it, and interact with the visualizations. For more information about Kibana, check our [docs](https://www.elastic.co/guide/en/kibana/current/index.html)."},"aggs":[]}',
+      uiStateJSON: '{}',
+      description: '',
+      version: 1,
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{"query":{"query":"","language":"kuery"},"filter":[]}',
+      },
+    },
+    references: [],
+  },
+  {
+    id: '90943e30-9a47-11e8-b64d-95841ca0b247',
+    type: 'index-pattern',
+    updated_at: '2018-08-29T13:22:17.617Z',
+    version: '1',
+    migrationVersion: {},
+    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,"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":{}}',
+    },
+    references: [],
+  },
+  {
+    id: 'edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b',
+    type: 'dashboard',
+    updated_at: '2018-08-29T13:26:13.463Z',
+    version: '3',
+    references: [
+      {
+        name: 'panel_0',
+        type: 'visualization',
+        id: 'e1d0f010-9ee7-11e7-8711-e7a007dcef99',
+      },
+      {
+        name: 'panel_1',
+        type: 'visualization',
+        id: '06cf9c40-9ee8-11e7-8711-e7a007dcef99',
+      },
+      {
+        name: 'panel_2',
+        type: 'visualization',
+        id: '935afa20-e0cd-11e7-9d07-1398ccfcefa3',
+      },
+      {
+        name: 'panel_3',
+        type: 'visualization',
+        id: '4eb6e500-e1c7-11e7-b6d5-4dc382ef7f5b',
+      },
+      {
+        name: 'panel_4',
+        type: 'visualization',
+        id: '69a34b00-9ee8-11e7-8711-e7a007dcef99',
+      },
+      {
+        name: 'panel_5',
+        type: 'visualization',
+        id: '42b997f0-0c26-11e8-b0ec-3bb475f6b6ff',
+      },
+      {
+        name: 'panel_6',
+        type: 'visualization',
+        id: '7cbd2350-2223-11e8-b802-5bcf64c2cfb4',
+      },
+      {
+        name: 'panel_7',
+        type: 'visualization',
+        id: '314c6f60-2224-11e8-b802-5bcf64c2cfb4',
+      },
+      {
+        name: 'panel_8',
+        type: 'visualization',
+        id: '24a3e970-4257-11e8-b3aa-73fdaf54bfc9',
+      },
+      {
+        name: 'panel_9',
+        type: 'visualization',
+        id: '14e2e710-4258-11e8-b3aa-73fdaf54bfc9',
+      },
+      {
+        name: 'panel_10',
+        type: 'visualization',
+        id: '47f2c680-a6e3-11e8-94b4-c30c0228351b',
+      },
+    ],
+    migrationVersion: {
+      dashboard: '7.0.0',
+    },
+    attributes: {
+      title: i18n.translate('home.sampleData.logsSpec.webTrafficTitle', {
+        defaultMessage: '[Logs] Web Traffic',
+      }),
+      hits: 0,
+      description: i18n.translate('home.sampleData.logsSpec.webTrafficDescription', {
+        defaultMessage: "Analyze mock web traffic log data for Elastic's website",
+      }),
+      panelsJSON:
+        '[{"embeddableConfig":{"vis":{"colors":{"Avg. Bytes":"#6ED0E0","Unique Visitors":"#0A437C"},"legendOpen":false}},"gridData":{"x":27,"y":11,"w":21,"h":13,"i":"2"},"panelIndex":"2","version":"7.0.0-alpha1","panelRefName":"panel_0"},{"gridData":{"x":0,"y":49,"w":24,"h":18,"i":"4"},"panelIndex":"4","version":"7.0.0-alpha1","panelRefName":"panel_1"},{"embeddableConfig":{"vis":{"defaultColors":{"0 - 22":"rgb(247,251,255)","22 - 44":"rgb(208,225,242)","44 - 66":"rgb(148,196,223)","66 - 88":"rgb(74,152,201)","88 - 110":"rgb(23,100,171)"},"legendOpen":false}},"gridData":{"x":0,"y":36,"w":24,"h":13,"i":"7"},"panelIndex":"7","version":"6.3.0","panelRefName":"panel_2"},{"embeddableConfig":{"mapCenter":[36.8092847020594,-96.94335937500001],"vis":{"params":{"sort":{"columnIndex":null,"direction":null}}}},"gridData":{"x":27,"y":24,"w":21,"h":12,"i":"9"},"panelIndex":"9","version":"6.3.0","panelRefName":"panel_3"},{"embeddableConfig":{"vis":{"colors":{"0 - 500":"#BF1B00","1000 - 1500":"#7EB26D","500 - 1000":"#F2C96D"},"defaultColors":{"0 - 500":"rgb(165,0,38)","1000 - 1500":"rgb(0,104,55)","500 - 1000":"rgb(255,255,190)"},"legendOpen":false}},"gridData":{"x":10,"y":0,"w":9,"h":11,"i":"11"},"panelIndex":"11","title":"","version":"6.3.0","panelRefName":"panel_4"},{"gridData":{"x":0,"y":24,"w":27,"h":12,"i":"13"},"panelIndex":"13","version":"6.3.0","panelRefName":"panel_5"},{"gridData":{"x":24,"y":36,"w":24,"h":31,"i":"14"},"panelIndex":"14","version":"6.3.0","panelRefName":"panel_6"},{"gridData":{"x":0,"y":11,"w":27,"h":13,"i":"15"},"panelIndex":"15","version":"6.3.0","panelRefName":"panel_7"},{"gridData":{"x":19,"y":0,"w":15,"h":11,"i":"16"},"panelIndex":"16","title":"","version":"6.3.0","panelRefName":"panel_8"},{"embeddableConfig":{"vis":{"legendOpen":false}},"gridData":{"x":34,"y":0,"w":14,"h":11,"i":"17"},"panelIndex":"17","version":"6.3.0","panelRefName":"panel_9"},{"embeddableConfig":{},"gridData":{"x":0,"y":0,"w":10,"h":11,"i":"18"},"panelIndex":"18","title":"","version":"7.0.0-alpha1","panelRefName":"panel_10"}]',
+      optionsJSON: '{"hidePanelTitles":false,"useMargins":true}',
+      version: 1,
+      timeRestore: true,
+      timeTo: 'now',
+      timeFrom: 'now-7d',
+      refreshInterval: {
+        pause: false,
+        value: 900000,
+      },
+      kibanaSavedObjectMeta: {
+        searchSourceJSON:
+          '{"query":{"language":"kuery","query":""},"filter":[],"highlightAll":true,"version":true}',
+      },
+    },
+  },
+];
diff --git a/src/plugins/home/server/services/sample_data/index.ts b/src/plugins/home/server/services/sample_data/index.ts
new file mode 100644
index 0000000000000..f9fbee8fc6e81
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/index.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+export {
+  SampleDataRegistry,
+  SampleDataRegistrySetup,
+  SampleDataRegistryStart,
+} from './sample_data_registry';
+
+export { SampleDatasetSchema, SampleDatasetProvider } from './lib/sample_dataset_registry_types';
diff --git a/src/plugins/home/server/services/sample_data/lib/create_index_name.ts b/src/plugins/home/server/services/sample_data/lib/create_index_name.ts
new file mode 100644
index 0000000000000..9aecef405d7ce
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/lib/create_index_name.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 createIndexName = function(sampleDataSetId: string, dataIndexId: string): string {
+  // Sample data schema was updated to support multiple indices in 6.5.
+  // This if statement ensures that sample data sets that used a single index prior to the schema change
+  // have the same index name to avoid orphaned indices when uninstalling.
+  if (sampleDataSetId === dataIndexId) {
+    return `kibana_sample_data_${sampleDataSetId}`;
+  }
+  return `kibana_sample_data_${sampleDataSetId}_${dataIndexId}`;
+};
diff --git a/src/plugins/home/server/services/sample_data/lib/load_data.ts b/src/plugins/home/server/services/sample_data/lib/load_data.ts
new file mode 100644
index 0000000000000..481ed8da93dba
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/lib/load_data.ts
@@ -0,0 +1,99 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import readline from 'readline';
+import fs from 'fs';
+import { createUnzip } from 'zlib';
+
+const BULK_INSERT_SIZE = 500;
+
+export function loadData(path: any, bulkInsert: (docs: any[]) => Promise<void>) {
+  return new Promise((resolve, reject) => {
+    let count: number = 0;
+    let docs: any[] = [];
+    let isPaused: boolean = false;
+
+    // pause does not stop lines already in buffer. Use smaller buffer size to avoid bulk inserting to many records
+    const readStream = fs.createReadStream(path, { highWaterMark: 1024 * 4 });
+
+    const lineStream = readline.createInterface({ input: readStream.pipe(createUnzip()) });
+    const onClose = async () => {
+      if (docs.length > 0) {
+        try {
+          await bulkInsert(docs);
+        } catch (err) {
+          reject(err);
+          return;
+        }
+      }
+      resolve(count);
+    };
+    lineStream.on('close', onClose);
+
+    const closeWithError = (err: any) => {
+      lineStream.removeListener('close', onClose);
+      lineStream.close();
+      reject(err);
+    };
+
+    lineStream.on('line', async line => {
+      if (line.length === 0 || line.charAt(0) === '#') {
+        return;
+      }
+
+      let doc;
+      try {
+        doc = JSON.parse(line);
+      } catch (err) {
+        closeWithError(
+          new Error(
+            `Unable to parse line as JSON document, line: """${line}""", Error: ${err.message}`
+          )
+        );
+        return;
+      }
+
+      count++;
+      docs.push(doc);
+
+      if (docs.length >= BULK_INSERT_SIZE && !isPaused) {
+        lineStream.pause();
+
+        // readline pause is leaky and events in buffer still get sent after pause
+        // need to clear buffer before async call
+        const docstmp = docs.slice();
+        docs = [];
+        try {
+          await bulkInsert(docstmp);
+          lineStream.resume();
+        } catch (err) {
+          closeWithError(err);
+        }
+      }
+    });
+
+    lineStream.on('pause', async () => {
+      isPaused = true;
+    });
+
+    lineStream.on('resume', async () => {
+      isPaused = false;
+    });
+  });
+}
diff --git a/src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts b/src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts
new file mode 100644
index 0000000000000..29cf2289fc5b3
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts
@@ -0,0 +1,92 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { SavedObject } from 'src/core/server';
+
+export enum DatasetStatusTypes {
+  NOT_INSTALLED = 'not_installed',
+  INSTALLED = 'installed',
+  UNKNOWN = 'unknown',
+}
+export interface SampleDatasetDashboardPanel {
+  sampleDataId: string;
+  dashboardId: string;
+  oldEmbeddableId: string;
+  embeddableId: string;
+  embeddableType: EmbeddableTypes;
+  embeddableConfig: object;
+}
+export enum EmbeddableTypes {
+  MAP_SAVED_OBJECT_TYPE = 'map',
+  SEARCH_EMBEDDABLE_TYPE = 'search',
+  VISUALIZE_EMBEDDABLE_TYPE = 'visualization',
+}
+export interface DataIndexSchema {
+  id: string;
+
+  // path to newline delimented JSON file containing data relative to KIBANA_HOME
+  dataPath: string;
+
+  // Object defining Elasticsearch field mappings (contents of index.mappings.type.properties)
+  fields: object;
+
+  // times fields that will be updated relative to now when data is installed
+  timeFields: string[];
+
+  // Reference to now in your test data set.
+  // When data is installed, timestamps are converted to the present time.
+  // The distance between a timestamp and currentTimeMarker is preserved but the date and time will change.
+  // For example:
+  //   sample data set:    timestamp: 2018-01-01T00:00:00Z, currentTimeMarker: 2018-01-01T12:00:00Z
+  //   installed data set: timestamp: 2018-04-18T20:33:14Z, currentTimeMarker: 2018-04-19T08:33:14Z
+  currentTimeMarker: string;
+
+  // Set to true to move timestamp to current week, preserving day of week and time of day
+  // Relative distance from timestamp to currentTimeMarker will not remain the same
+  preserveDayOfWeekTimeOfDay: boolean;
+}
+
+export interface AppLinkSchema {
+  path: string;
+  icon: string;
+  label: string;
+}
+
+export interface SampleDatasetSchema {
+  id: string;
+  name: string;
+  description: string;
+  previewImagePath: string;
+  darkPreviewImagePath: string;
+
+  // saved object id of main dashboard for sample data set
+  overviewDashboard: string;
+  appLinks: AppLinkSchema[];
+
+  // saved object id of default index-pattern for sample data set
+  defaultIndex: string;
+
+  // Kibana saved objects (index patter, visualizations, dashboard, ...)
+  // Should provide a nice demo of Kibana's functionality with the sample data set
+  savedObjects: SavedObject[];
+  dataIndices: DataIndexSchema[];
+  status?: string | undefined;
+  statusMsg?: unknown;
+}
+
+export type SampleDatasetProvider = () => SampleDatasetSchema;
diff --git a/src/legacy/server/sample_data/data_set_schema.js b/src/plugins/home/server/services/sample_data/lib/sample_dataset_schema.ts
similarity index 100%
rename from src/legacy/server/sample_data/data_set_schema.js
rename to src/plugins/home/server/services/sample_data/lib/sample_dataset_schema.ts
diff --git a/src/plugins/home/server/services/sample_data/lib/translate_timestamp.ts b/src/plugins/home/server/services/sample_data/lib/translate_timestamp.ts
new file mode 100644
index 0000000000000..b4e56cdfe7f36
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/lib/translate_timestamp.ts
@@ -0,0 +1,82 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+const MILLISECONDS_IN_DAY = 86400000;
+
+function iso8601ToDateIgnoringTime(iso8601: string) {
+  const split = iso8601.split('-');
+  if (split.length < 3) {
+    throw new Error('Unexpected timestamp format, expecting YYYY-MM-DDTHH:mm:ss');
+  }
+  const year = parseInt(split[0], 10);
+  const month = parseInt(split[1], 10) - 1; // javascript months are zero-based indexed
+  const date = parseInt(split[2], 10);
+  return new Date(year, month, date);
+}
+
+export function dateToIso8601IgnoringTime(date: Date) {
+  // not using "Date.toISOString" because only using Date methods that deal with local time
+  const dateItem = new Date(date);
+  const year = dateItem.getFullYear();
+  const month = dateItem.getMonth() + 1;
+  const monthString = month < 10 ? `0${month}` : `${month}`;
+  const dateString = dateItem.getDate() < 10 ? `0${dateItem.getDate()}` : `${dateItem.getDate()}`;
+  return `${year}-${monthString}-${dateString}`;
+}
+
+// Translate source timestamp by targetReference timestamp,
+// perserving the distance between source and sourceReference
+export function translateTimeRelativeToDifference(
+  source: string,
+  sourceReference: any,
+  targetReference: any
+) {
+  const sourceDate = iso8601ToDateIgnoringTime(source);
+  const sourceReferenceDate = iso8601ToDateIgnoringTime(sourceReference);
+  const targetReferenceDate = iso8601ToDateIgnoringTime(targetReference);
+
+  const timeDelta = sourceDate.getTime() - sourceReferenceDate.getTime();
+  const translatedDate = new Date(targetReferenceDate.getTime() + timeDelta);
+
+  return `${dateToIso8601IgnoringTime(translatedDate)}T${source.substring(11)}`;
+}
+
+// Translate source timestamp by targetReference timestamp,
+// perserving the week distance between source and sourceReference and day of week of the source timestamp
+export function translateTimeRelativeToWeek(
+  source: string,
+  sourceReference: any,
+  targetReference: any
+) {
+  const sourceReferenceDate = iso8601ToDateIgnoringTime(sourceReference);
+  const targetReferenceDate = iso8601ToDateIgnoringTime(targetReference);
+
+  // If these dates were in the same week, how many days apart would they be?
+  const dayOfWeekDelta = sourceReferenceDate.getDay() - targetReferenceDate.getDay();
+
+  // If we pretend that the targetReference is actually the same day of the week as the
+  // sourceReference, then we can translate the source to the target while preserving their
+  // days of the week.
+  const normalizationDelta = dayOfWeekDelta * MILLISECONDS_IN_DAY;
+  const normalizedTargetReference = dateToIso8601IgnoringTime(
+    new Date(targetReferenceDate.getTime() + normalizationDelta)
+  );
+
+  return translateTimeRelativeToDifference(source, sourceReference, normalizedTargetReference);
+}
diff --git a/src/plugins/home/server/services/sample_data/routes/index.ts b/src/plugins/home/server/services/sample_data/routes/index.ts
new file mode 100644
index 0000000000000..41b9458b9fbb6
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/routes/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 { createListRoute } from './list';
+export { createInstallRoute } from './install';
+export { createUninstallRoute } from './uninstall';
diff --git a/src/plugins/home/server/services/sample_data/routes/install.ts b/src/plugins/home/server/services/sample_data/routes/install.ts
new file mode 100644
index 0000000000000..e2c5ce6883230
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/routes/install.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 { schema } from '@kbn/config-schema';
+import { IRouter, Logger, RequestHandlerContext } from 'src/core/server';
+import { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
+import { createIndexName } from '../lib/create_index_name';
+import {
+  dateToIso8601IgnoringTime,
+  translateTimeRelativeToDifference,
+  translateTimeRelativeToWeek,
+} from '../lib/translate_timestamp';
+import { loadData } from '../lib/load_data';
+import { SampleDataUsageTracker } from '../usage/usage';
+
+const insertDataIntoIndex = (
+  dataIndexConfig: any,
+  index: string,
+  nowReference: string,
+  context: RequestHandlerContext,
+  logger: Logger
+) => {
+  function updateTimestamps(doc: any) {
+    dataIndexConfig.timeFields
+      .filter((timeFieldName: string) => doc[timeFieldName])
+      .forEach((timeFieldName: string) => {
+        doc[timeFieldName] = dataIndexConfig.preserveDayOfWeekTimeOfDay
+          ? translateTimeRelativeToWeek(
+              doc[timeFieldName],
+              dataIndexConfig.currentTimeMarker,
+              nowReference
+            )
+          : translateTimeRelativeToDifference(
+              doc[timeFieldName],
+              dataIndexConfig.currentTimeMarker,
+              nowReference
+            );
+      });
+    return doc;
+  }
+
+  const bulkInsert = async (docs: any) => {
+    const insertCmd = { index: { _index: index } };
+    const bulk: any[] = [];
+    docs.forEach((doc: any) => {
+      bulk.push(insertCmd);
+      bulk.push(updateTimestamps(doc));
+    });
+    const resp = await context.core.elasticsearch.adminClient.callAsCurrentUser('bulk', {
+      body: bulk,
+    });
+    if (resp.errors) {
+      const errMsg = `sample_data install errors while bulk inserting. Elasticsearch response: ${JSON.stringify(
+        resp,
+        null,
+        ''
+      )}`;
+      logger.warn(errMsg);
+      return Promise.reject(
+        new Error(`Unable to load sample data into index "${index}", see kibana logs for details`)
+      );
+    }
+  };
+  return loadData(dataIndexConfig.dataPath, bulkInsert); // this returns a Promise
+};
+
+export function createInstallRoute(
+  router: IRouter,
+  sampleDatasets: SampleDatasetSchema[],
+  logger: Logger,
+  usageTracker: SampleDataUsageTracker
+): void {
+  router.post(
+    {
+      path: '/api/sample_data/{id}',
+      validate: {
+        params: schema.object({ id: schema.string() }),
+        // TODO validate now as date
+        query: schema.object({ now: schema.maybe(schema.string()) }),
+      },
+    },
+    async (context, req, res) => {
+      const { params, query } = req;
+      const sampleDataset = sampleDatasets.find(({ id }) => id === params.id);
+      if (!sampleDataset) {
+        return res.notFound();
+      }
+      //  @ts-ignore Custom query validation used
+      const now = query.now ? new Date(query.now) : new Date();
+      const nowReference = dateToIso8601IgnoringTime(now);
+      const counts = {};
+      for (let i = 0; i < sampleDataset.dataIndices.length; i++) {
+        const dataIndexConfig = sampleDataset.dataIndices[i];
+        const index = createIndexName(sampleDataset.id, dataIndexConfig.id);
+
+        // clean up any old installation of dataset
+        try {
+          await context.core.elasticsearch.dataClient.callAsCurrentUser('indices.delete', {
+            index,
+          });
+        } catch (err) {
+          // ignore delete errors
+        }
+
+        try {
+          const createIndexParams = {
+            index,
+            body: {
+              settings: { index: { number_of_shards: 1, auto_expand_replicas: '0-1' } },
+              mappings: { properties: dataIndexConfig.fields },
+            },
+          };
+          await context.core.elasticsearch.dataClient.callAsCurrentUser(
+            'indices.create',
+            createIndexParams
+          );
+        } catch (err) {
+          const errMsg = `Unable to create sample data index "${index}", error: ${err.message}`;
+          logger.warn(errMsg);
+          return res.customError({ body: errMsg, statusCode: err.status });
+        }
+
+        try {
+          const count = await insertDataIntoIndex(
+            dataIndexConfig,
+            index,
+            nowReference,
+            context,
+            logger
+          );
+          (counts as any)[index] = count;
+        } catch (err) {
+          const errMsg = `sample_data install errors while loading data. Error: ${err}`;
+          logger.warn(errMsg);
+          return res.internalError({ body: errMsg });
+        }
+      }
+
+      let createResults;
+      try {
+        createResults = await context.core.savedObjects.client.bulkCreate(
+          sampleDataset.savedObjects,
+          { overwrite: true }
+        );
+      } catch (err) {
+        const errMsg = `bulkCreate failed, error: ${err.message}`;
+        logger.warn(errMsg);
+        return res.internalError({ body: errMsg });
+      }
+      const errors = createResults.saved_objects.filter(savedObjectCreateResult => {
+        return Boolean(savedObjectCreateResult.error);
+      });
+      if (errors.length > 0) {
+        const errMsg = `sample_data install errors while loading saved objects. Errors: ${errors.join(
+          ','
+        )}`;
+        logger.warn(errMsg);
+        return res.customError({ body: errMsg, statusCode: 403 });
+      }
+      usageTracker.addInstall(params.id);
+
+      // FINALLY
+      return res.ok({
+        body: {
+          elasticsearchIndicesCreated: counts,
+          kibanaSavedObjectsLoaded: sampleDataset.savedObjects.length,
+        },
+      });
+    }
+  );
+}
diff --git a/src/plugins/home/server/services/sample_data/routes/list.ts b/src/plugins/home/server/services/sample_data/routes/list.ts
new file mode 100644
index 0000000000000..37ebab1c168d2
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/routes/list.ts
@@ -0,0 +1,92 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { isBoom } from 'boom';
+import { IRouter } from 'src/core/server';
+import { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
+import { createIndexName } from '../lib/create_index_name';
+
+const NOT_INSTALLED = 'not_installed';
+const INSTALLED = 'installed';
+const UNKNOWN = 'unknown';
+
+export const createListRoute = (router: IRouter, sampleDatasets: SampleDatasetSchema[]) => {
+  router.get({ path: '/api/sample_data', validate: false }, async (context, req, res) => {
+    const registeredSampleDatasets = sampleDatasets.map(sampleDataset => {
+      return {
+        id: sampleDataset.id,
+        name: sampleDataset.name,
+        description: sampleDataset.description,
+        previewImagePath: sampleDataset.previewImagePath,
+        darkPreviewImagePath: sampleDataset.darkPreviewImagePath,
+        overviewDashboard: sampleDataset.overviewDashboard,
+        appLinks: sampleDataset.appLinks,
+        defaultIndex: sampleDataset.defaultIndex,
+        dataIndices: sampleDataset.dataIndices.map(({ id }) => ({ id })),
+        status: sampleDataset.status,
+        statusMsg: sampleDataset.statusMsg,
+      };
+    });
+    const isInstalledPromises = registeredSampleDatasets.map(async sampleDataset => {
+      for (let i = 0; i < sampleDataset.dataIndices.length; i++) {
+        const dataIndexConfig = sampleDataset.dataIndices[i];
+        const index = createIndexName(sampleDataset.id, dataIndexConfig.id);
+        try {
+          const indexExists = await context.core.elasticsearch.dataClient.callAsCurrentUser(
+            'indices.exists',
+            { index }
+          );
+          if (!indexExists) {
+            sampleDataset.status = NOT_INSTALLED;
+            return;
+          }
+
+          const { count } = await context.core.elasticsearch.dataClient.callAsCurrentUser('count', {
+            index,
+          });
+          if (count === 0) {
+            sampleDataset.status = NOT_INSTALLED;
+            return;
+          }
+        } catch (err) {
+          sampleDataset.status = UNKNOWN;
+          sampleDataset.statusMsg = err.message;
+          return;
+        }
+      }
+      try {
+        await context.core.savedObjects.client.get('dashboard', sampleDataset.overviewDashboard);
+      } catch (err) {
+        // savedObjectClient.get() throws an boom error when object is not found.
+        if (isBoom(err) && err.output.statusCode === 404) {
+          sampleDataset.status = NOT_INSTALLED;
+          return;
+        }
+
+        sampleDataset.status = UNKNOWN;
+        sampleDataset.statusMsg = err.message;
+        return;
+      }
+
+      sampleDataset.status = INSTALLED;
+    });
+
+    await Promise.all(isInstalledPromises);
+    return res.ok({ body: registeredSampleDatasets });
+  });
+};
diff --git a/src/plugins/home/server/services/sample_data/routes/uninstall.ts b/src/plugins/home/server/services/sample_data/routes/uninstall.ts
new file mode 100644
index 0000000000000..64fb2b8b3a547
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/routes/uninstall.ts
@@ -0,0 +1,96 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 _ from 'lodash';
+import { IRouter } from 'src/core/server';
+import { SampleDatasetSchema } from '../lib/sample_dataset_registry_types';
+import { createIndexName } from '../lib/create_index_name';
+import { SampleDataUsageTracker } from '../usage/usage';
+
+export function createUninstallRoute(
+  router: IRouter,
+  sampleDatasets: SampleDatasetSchema[],
+  usageTracker: SampleDataUsageTracker
+): void {
+  router.delete(
+    {
+      path: '/api/sample_data/{id}',
+      validate: {
+        params: schema.object({ id: schema.string() }),
+      },
+    },
+    async (
+      {
+        core: {
+          elasticsearch: {
+            dataClient: { callAsCurrentUser },
+          },
+          savedObjects: { client: savedObjectsClient },
+        },
+      },
+      request,
+      response
+    ) => {
+      const sampleDataset = sampleDatasets.find(({ id }) => id === request.params.id);
+
+      if (!sampleDataset) {
+        return response.notFound();
+      }
+
+      for (let i = 0; i < sampleDataset.dataIndices.length; i++) {
+        const dataIndexConfig = sampleDataset.dataIndices[i];
+        const index = createIndexName(sampleDataset.id, dataIndexConfig.id);
+
+        try {
+          await callAsCurrentUser('indices.delete', { index });
+        } catch (err) {
+          return response.customError({
+            statusCode: err.status,
+            body: {
+              message: `Unable to delete sample data index "${index}", error: ${err.message}`,
+            },
+          });
+        }
+      }
+
+      const deletePromises = sampleDataset.savedObjects.map(({ type, id }) =>
+        savedObjectsClient.delete(type, id)
+      );
+
+      try {
+        await Promise.all(deletePromises);
+      } catch (err) {
+        // ignore 404s since users could have deleted some of the saved objects via the UI
+        if (_.get(err, 'output.statusCode') !== 404) {
+          return response.customError({
+            statusCode: err.status,
+            body: {
+              message: `Unable to delete sample dataset saved objects, error: ${err.message}`,
+            },
+          });
+        }
+      }
+
+      // track the usage operation in a non-blocking way
+      usageTracker.addUninstall(request.params.id);
+
+      return response.noContent();
+    }
+  );
+}
diff --git a/src/plugins/home/server/services/sample_data/sample_data_registry.mock.ts b/src/plugins/home/server/services/sample_data/sample_data_registry.mock.ts
new file mode 100644
index 0000000000000..4d0fb4f96023a
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/sample_data_registry.mock.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 {
+  SampleDataRegistrySetup,
+  SampleDataRegistryStart,
+  SampleDataRegistry,
+} from './sample_data_registry';
+
+const createSetupMock = (): jest.Mocked<SampleDataRegistrySetup> => {
+  const setup = {
+    registerSampleDataset: jest.fn(),
+    getSampleDatasets: jest.fn(),
+    addSavedObjectsToSampleDataset: jest.fn(),
+    addAppLinksToSampleDataset: jest.fn(),
+    replacePanelInSampleDatasetDashboard: jest.fn(),
+  };
+  return setup;
+};
+
+const createStartMock = (): jest.Mocked<SampleDataRegistryStart> => {
+  const start = {};
+  return start;
+};
+
+const createMock = (): jest.Mocked<PublicMethodsOf<SampleDataRegistry>> => {
+  const service = {
+    setup: jest.fn(),
+    start: jest.fn(),
+  };
+  service.setup.mockImplementation(createSetupMock);
+  service.start.mockImplementation(createStartMock);
+  return service;
+};
+
+export const sampleDataRegistryMock = {
+  createSetup: createSetupMock,
+  createStart: createStartMock,
+  create: createMock,
+};
diff --git a/src/plugins/home/server/services/sample_data/sample_data_registry.ts b/src/plugins/home/server/services/sample_data/sample_data_registry.ts
new file mode 100644
index 0000000000000..7a4909668fff2
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/sample_data_registry.ts
@@ -0,0 +1,182 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Joi from 'joi';
+import { CoreSetup, PluginInitializerContext } from 'src/core/server';
+import { SavedObject } from 'src/core/public';
+import {
+  SampleDatasetProvider,
+  SampleDatasetSchema,
+  AppLinkSchema,
+  SampleDatasetDashboardPanel,
+} from './lib/sample_dataset_registry_types';
+import { sampleDataSchema } from './lib/sample_dataset_schema';
+
+import { flightsSpecProvider, logsSpecProvider, ecommerceSpecProvider } from './data_sets';
+import { createListRoute, createInstallRoute } from './routes';
+import { UsageCollectionSetup } from '../../../../usage_collection/server';
+import { makeSampleDataUsageCollector, usage } from './usage';
+import { createUninstallRoute } from './routes/uninstall';
+
+const flightsSampleDataset = flightsSpecProvider();
+const logsSampleDataset = logsSpecProvider();
+const ecommerceSampleDataset = ecommerceSpecProvider();
+
+export class SampleDataRegistry {
+  constructor(private readonly initContext: PluginInitializerContext) {}
+  private readonly sampleDatasets: SampleDatasetSchema[] = [
+    flightsSampleDataset,
+    logsSampleDataset,
+    ecommerceSampleDataset,
+  ];
+
+  public setup(core: CoreSetup, usageCollections: UsageCollectionSetup | undefined) {
+    if (usageCollections) {
+      makeSampleDataUsageCollector(usageCollections, this.initContext);
+    }
+    const usageTracker = usage(
+      core.savedObjects,
+      this.initContext.logger.get('sample_data', 'telemetry')
+    );
+    const router = core.http.createRouter();
+    createListRoute(router, this.sampleDatasets);
+    createInstallRoute(
+      router,
+      this.sampleDatasets,
+      this.initContext.logger.get('sampleData'),
+      usageTracker
+    );
+    createUninstallRoute(router, this.sampleDatasets, usageTracker);
+
+    return {
+      registerSampleDataset: (specProvider: SampleDatasetProvider) => {
+        const { error, value } = Joi.validate(specProvider(), sampleDataSchema);
+
+        if (error) {
+          throw new Error(`Unable to register sample dataset spec because it's invalid. ${error}`);
+        }
+        const defaultIndexSavedObjectJson = value.savedObjects.find((savedObjectJson: any) => {
+          return (
+            savedObjectJson.type === 'index-pattern' && savedObjectJson.id === value.defaultIndex
+          );
+        });
+        if (!defaultIndexSavedObjectJson) {
+          throw new Error(
+            `Unable to register sample dataset spec, defaultIndex: "${value.defaultIndex}" does not exist in savedObjects list.`
+          );
+        }
+
+        const dashboardSavedObjectJson = value.savedObjects.find((savedObjectJson: any) => {
+          return (
+            savedObjectJson.type === 'dashboard' && savedObjectJson.id === value.overviewDashboard
+          );
+        });
+        if (!dashboardSavedObjectJson) {
+          throw new Error(
+            `Unable to register sample dataset spec, overviewDashboard: "${value.overviewDashboard}" does not exist in savedObject list.`
+          );
+        }
+        this.sampleDatasets.push(value);
+      },
+      getSampleDatasets: () => this.sampleDatasets,
+
+      addSavedObjectsToSampleDataset: (id: string, savedObjects: SavedObject[]) => {
+        const sampleDataset = this.sampleDatasets.find(dataset => {
+          return dataset.id === id;
+        });
+
+        if (!sampleDataset) {
+          throw new Error(`Unable to find sample dataset with id: ${id}`);
+        }
+
+        sampleDataset.savedObjects = sampleDataset.savedObjects.concat(savedObjects);
+      },
+
+      addAppLinksToSampleDataset: (id: string, appLinks: AppLinkSchema[]) => {
+        const sampleDataset = this.sampleDatasets.find(dataset => {
+          return dataset.id === id;
+        });
+
+        if (!sampleDataset) {
+          throw new Error(`Unable to find sample dataset with id: ${id}`);
+        }
+
+        sampleDataset.appLinks = sampleDataset.appLinks
+          ? sampleDataset.appLinks.concat(appLinks)
+          : [];
+      },
+
+      replacePanelInSampleDatasetDashboard: ({
+        sampleDataId,
+        dashboardId,
+        oldEmbeddableId,
+        embeddableId,
+        embeddableType,
+        embeddableConfig,
+      }: SampleDatasetDashboardPanel) => {
+        const sampleDataset = this.sampleDatasets.find(dataset => {
+          return dataset.id === sampleDataId;
+        });
+        if (!sampleDataset) {
+          throw new Error(`Unable to find sample dataset with id: ${sampleDataId}`);
+        }
+
+        const dashboard = sampleDataset.savedObjects.find((savedObject: SavedObject) => {
+          return savedObject.id === dashboardId && savedObject.type === 'dashboard';
+        });
+        if (!dashboard) {
+          throw new Error(`Unable to find dashboard with id: ${dashboardId}`);
+        }
+        try {
+          const reference = dashboard.references.find((referenceItem: any) => {
+            return referenceItem.id === oldEmbeddableId;
+          });
+          if (!reference) {
+            throw new Error(`Unable to find reference for embeddable: ${oldEmbeddableId}`);
+          }
+          reference.type = embeddableType;
+          reference.id = embeddableId;
+
+          const panels = JSON.parse(dashboard.attributes.panelsJSON);
+          const panel = panels.find((panelItem: any) => {
+            return panelItem.panelRefName === reference.name;
+          });
+          if (!panel) {
+            throw new Error(`Unable to find panel for reference: ${reference.name}`);
+          }
+          panel.embeddableConfig = embeddableConfig;
+          dashboard.attributes.panelsJSON = JSON.stringify(panels);
+        } catch (error) {
+          throw new Error(
+            `Unable to replace panel with embeddable ${oldEmbeddableId}, error: ${error}`
+          );
+        }
+      },
+    };
+  }
+
+  public start() {
+    return {};
+  }
+}
+/** @public */
+export type SampleDataRegistrySetup = ReturnType<SampleDataRegistry['setup']>;
+
+/** @public */
+export type SampleDataRegistryStart = ReturnType<SampleDataRegistry['start']>;
diff --git a/src/plugins/home/server/services/sample_data/usage/collector.ts b/src/plugins/home/server/services/sample_data/usage/collector.ts
new file mode 100644
index 0000000000000..19ceceb4cba14
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/usage/collector.ts
@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from 'kibana/server';
+import { first } from 'rxjs/operators';
+import { fetchProvider } from './collector_fetch';
+import { UsageCollectionSetup } from '../../../../../usage_collection/server';
+
+export async function makeSampleDataUsageCollector(
+  usageCollection: UsageCollectionSetup,
+  context: PluginInitializerContext
+) {
+  let index: string;
+  try {
+    const config = await context.config.legacy.globalConfig$.pipe(first()).toPromise();
+    index = config.kibana.index;
+  } catch (err) {
+    return; // kibana plugin is not enabled (test environment)
+  }
+  const collector = usageCollection.makeUsageCollector({
+    type: 'sample-data',
+    fetch: fetchProvider(index),
+    isReady: () => true,
+  });
+
+  usageCollection.registerCollector(collector);
+}
diff --git a/src/legacy/server/sample_data/usage/collector_fetch.test.ts b/src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts
similarity index 100%
rename from src/legacy/server/sample_data/usage/collector_fetch.test.ts
rename to src/plugins/home/server/services/sample_data/usage/collector_fetch.test.ts
diff --git a/src/legacy/server/sample_data/usage/collector_fetch.ts b/src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
similarity index 100%
rename from src/legacy/server/sample_data/usage/collector_fetch.ts
rename to src/plugins/home/server/services/sample_data/usage/collector_fetch.ts
diff --git a/src/legacy/server/sample_data/usage/index.ts b/src/plugins/home/server/services/sample_data/usage/index.ts
similarity index 100%
rename from src/legacy/server/sample_data/usage/index.ts
rename to src/plugins/home/server/services/sample_data/usage/index.ts
diff --git a/src/plugins/home/server/services/sample_data/usage/usage.ts b/src/plugins/home/server/services/sample_data/usage/usage.ts
new file mode 100644
index 0000000000000..a06dde387bb36
--- /dev/null
+++ b/src/plugins/home/server/services/sample_data/usage/usage.ts
@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Logger, SavedObjectsServiceSetup } from 'kibana/server';
+
+const SAVED_OBJECT_ID = 'sample-data-telemetry';
+
+export interface SampleDataUsageTracker {
+  addInstall(dataSet: string): void;
+  addUninstall(dataSet: string): void;
+}
+
+export function usage(
+  savedObjects: SavedObjectsServiceSetup,
+  logger: Logger
+): SampleDataUsageTracker {
+  const handleIncrementError = (err: Error) => {
+    if (err && err.stack) {
+      logger.debug(err.stack);
+    }
+    logger.warn(`saved objects repository incrementCounter encountered an error: ${err}`);
+  };
+
+  const internalRepository = savedObjects.createInternalRepository();
+
+  return {
+    addInstall: async (dataSet: string) => {
+      try {
+        await internalRepository.incrementCounter(SAVED_OBJECT_ID, dataSet, `installCount`);
+      } catch (err) {
+        handleIncrementError(err);
+      }
+    },
+    addUninstall: async (dataSet: string) => {
+      try {
+        await internalRepository.incrementCounter(SAVED_OBJECT_ID, dataSet, `unInstallCount`);
+      } catch (err) {
+        handleIncrementError(err);
+      }
+    },
+  };
+}
diff --git a/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts b/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
index d081639e5c7e2..951ce935760a1 100644
--- a/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
+++ b/src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts
@@ -94,17 +94,5 @@ export interface TutorialSchema {
   savedObjectsInstallMsg: string;
 }
 export type TutorialProvider = (context: { [key: string]: unknown }) => TutorialSchema;
-export type TutorialContextFactory = (
-  req: KibanaRequest<
-    Readonly<{
-      [x: string]: any;
-    }>,
-    Readonly<{
-      [x: string]: any;
-    }>,
-    Readonly<{
-      [x: string]: any;
-    }>
-  >
-) => { [key: string]: unknown };
+export type TutorialContextFactory = (req: KibanaRequest) => { [key: string]: unknown };
 export type ScopedTutorialContextFactory = (...args: any[]) => any;
diff --git a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
index b865981768447..9cf725a2faa73 100644
--- a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
+++ b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
@@ -271,16 +271,18 @@ exports[`InspectorPanel should render as expected 1`] = `
                                 type="arrowDown"
                               >
                                 <EuiIconEmpty
-                                  aria-hidden="true"
+                                  aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
                                   focusable="false"
+                                  role="img"
                                   style={null}
                                 >
                                   <svg
-                                    aria-hidden="true"
+                                    aria-hidden={true}
                                     className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
                                     focusable="false"
                                     height={16}
+                                    role="img"
                                     style={null}
                                     viewBox="0 0 16 16"
                                     width={16}
diff --git a/src/plugins/inspector/public/views/data/components/download_options.tsx b/src/plugins/inspector/public/views/data/components/download_options.tsx
index 6d21dcdafa84d..e7bfbed23c074 100644
--- a/src/plugins/inspector/public/views/data/components/download_options.tsx
+++ b/src/plugins/inspector/public/views/data/components/download_options.tsx
@@ -20,6 +20,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 
 import { EuiButton, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
 import { DataViewColumn, DataViewRow } from '../types';
@@ -66,8 +67,14 @@ class DataDownloadOptions extends Component<DataDownloadOptionsProps, DataDownlo
   };
 
   exportCsv = (customParams: any = {}) => {
+    let filename = this.props.title;
+    if (!filename || filename.length === 0) {
+      filename = i18n.translate('inspector.data.downloadOptionsUnsavedFilename', {
+        defaultMessage: 'unsaved',
+      });
+    }
     exportAsCsv({
-      filename: `${this.props.title}.csv`,
+      filename: `${filename}.csv`,
       columns: this.props.columns,
       rows: this.props.rows,
       csvSeparator: this.props.csvSeparator,
diff --git a/src/plugins/inspector/public/views/data/types.ts b/src/plugins/inspector/public/views/data/types.ts
index 54371726ef86d..d867a95fe25ca 100644
--- a/src/plugins/inspector/public/views/data/types.ts
+++ b/src/plugins/inspector/public/views/data/types.ts
@@ -20,11 +20,11 @@
 export interface DataViewColumn {
   name: string;
   field: string;
-  sortable: Function;
+  sortable: (item: DataViewRow) => string | number;
   render: DataViewColumnRender;
 }
 
-type DataViewColumnRender = (value: string) => string;
+type DataViewColumnRender = (value: string, _item: DataViewRow) => string;
 
 export interface DataViewRow {
   [fields: string]: {
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap b/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
index 07e2dc7f35f80..942ca42dc6e85 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
@@ -33,14 +33,18 @@ exports[`is rendered 1`] = `
             type="arrowLeft"
           >
             <EuiIconEmpty
+              aria-hidden={true}
               className="euiIcon euiIcon--small euiIcon-isLoading"
               focusable="false"
+              role="img"
               style={null}
             >
               <svg
+                aria-hidden={true}
                 className="euiIcon euiIcon--small euiIcon-isLoading"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
diff --git a/src/plugins/kibana_react/public/index.ts b/src/plugins/kibana_react/public/index.ts
index 81ef707ed0eba..10b7dd2b4da44 100644
--- a/src/plugins/kibana_react/public/index.ts
+++ b/src/plugins/kibana_react/public/index.ts
@@ -25,4 +25,4 @@ export * from './overlays';
 export * from './ui_settings';
 export * from './field_icon';
 export * from './table_list_view';
-export { toMountPoint, useShallowCompareEffect } from './util';
+export { toMountPoint } from './util';
diff --git a/src/plugins/kibana_react/public/saved_objects/__snapshots__/saved_object_save_modal.test.tsx.snap b/src/plugins/kibana_react/public/saved_objects/__snapshots__/saved_object_save_modal.test.tsx.snap
index 3c0393b12febd..978705a3ad096 100644
--- a/src/plugins/kibana_react/public/saved_objects/__snapshots__/saved_object_save_modal.test.tsx.snap
+++ b/src/plugins/kibana_react/public/saved_objects/__snapshots__/saved_object_save_modal.test.tsx.snap
@@ -69,9 +69,7 @@ exports[`SavedObjectSaveModal should render matching snapshot 1`] = `
           >
             <EuiTextArea
               data-test-subj="viewDescription"
-              fullWidth={false}
               onChange={[Function]}
-              resize="vertical"
               value=""
             />
           </EuiFormRow>
diff --git a/src/plugins/kibana_react/public/saved_objects/saved_object_save_modal.tsx b/src/plugins/kibana_react/public/saved_objects/saved_object_save_modal.tsx
index bab710cdca595..33d4dcfd6606a 100644
--- a/src/plugins/kibana_react/public/saved_objects/saved_object_save_modal.tsx
+++ b/src/plugins/kibana_react/public/saved_objects/saved_object_save_modal.tsx
@@ -39,7 +39,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 import { EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../legacy/core_plugins/kibana/public/visualize/embeddable/constants';
+import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../legacy/core_plugins/kibana/public/visualize_embeddable/constants';
 
 export interface OnSaveProps {
   newTitle: string;
diff --git a/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx b/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx
index 4bb7ce75073ae..2e7b22a14fb0e 100644
--- a/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx
+++ b/src/plugins/kibana_react/public/table_list_view/table_list_view.tsx
@@ -23,7 +23,6 @@ import { i18n } from '@kbn/i18n';
 import { debounce, indexBy, sortBy, uniq } from 'lodash';
 import {
   EuiTitle,
-  // @ts-ignore
   EuiInMemoryTable,
   EuiPage,
   EuiPageBody,
@@ -36,6 +35,7 @@ import {
   EuiOverlayMask,
   EuiConfirmModal,
   EuiCallOut,
+  EuiBasicTableColumn,
 } from '@elastic/eui';
 import { ToastsStart, IUiSettingsClient } from 'kibana/public';
 import { toMountPoint } from '../util';
@@ -366,7 +366,7 @@ class TableListView extends React.Component<TableListViewProps, TableListViewSta
             });
           },
         }
-      : null;
+      : undefined;
 
     const actions = [
       {
@@ -416,7 +416,7 @@ class TableListView extends React.Component<TableListViewProps, TableListViewSta
       <EuiInMemoryTable
         itemId="id"
         items={this.state.items}
-        columns={columns}
+        columns={(columns as unknown) as Array<EuiBasicTableColumn<object>>} // EuiBasicTableColumn is stricter than Column
         pagination={this.pagination}
         loading={this.state.isFetchingItems}
         message={noItemsMessage}
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 0879b0cb3f36a..db6d92a12841a 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
@@ -24,10 +24,10 @@ import { useUiSetting$ } from './use_ui_setting';
 import { createKibanaReactContext } from '../context';
 import { KibanaServices } from '../context/types';
 import { Subject } from 'rxjs';
-import { useObservable } from '../util/use_observable';
 import { coreMock } from '../../../../core/public/mocks';
+import useObservable from 'react-use/lib/useObservable';
 
-jest.mock('../util/use_observable');
+jest.mock('react-use/lib/useObservable');
 const useObservableSpy = (useObservable as any) as jest.SpyInstance;
 useObservableSpy.mockImplementation((observable, def) => def);
 
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 295515bfa51af..a8bc01bb8d2c4 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
@@ -18,8 +18,8 @@
  */
 
 import { useCallback, useMemo } from 'react';
+import useObservable from 'react-use/lib/useObservable';
 import { useKibana } from '../context';
-import { useObservable } from '../util/use_observable';
 
 /**
  * Returns the current UI-settings value.
diff --git a/src/plugins/kibana_react/public/util/index.ts b/src/plugins/kibana_react/public/util/index.ts
index 4f64d6c9c81ab..71a281dbdaad3 100644
--- a/src/plugins/kibana_react/public/util/index.ts
+++ b/src/plugins/kibana_react/public/util/index.ts
@@ -17,7 +17,4 @@
  * under the License.
  */
 
-export * from './use_observable';
-export * from './use_unmount';
 export * from './react_mount';
-export * from './use_shallow_compare_effect';
diff --git a/src/plugins/kibana_react/public/util/use_observable.test.tsx b/src/plugins/kibana_react/public/util/use_observable.test.tsx
deleted file mode 100644
index 2dfbea06ecbb3..0000000000000
--- a/src/plugins/kibana_react/public/util/use_observable.test.tsx
+++ /dev/null
@@ -1,54 +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 { renderHook, act } from '@testing-library/react-hooks';
-import { Subject } from 'rxjs';
-import { useObservable } from './use_observable';
-
-test('default initial value is undefined', () => {
-  const subject$ = new Subject();
-  const { result } = renderHook(() => useObservable(subject$));
-
-  expect(result.current).toBe(undefined);
-});
-
-test('can specify initial value', () => {
-  const subject$ = new Subject();
-  const { result } = renderHook(() => useObservable(subject$, 123));
-
-  expect(result.current).toBe(123);
-});
-
-test('returns the latest value of observables', () => {
-  const subject$ = new Subject();
-  const { result } = renderHook(() => useObservable(subject$, 123));
-
-  act(() => {
-    subject$.next(125);
-  });
-  expect(result.current).toBe(125);
-
-  act(() => {
-    subject$.next(300);
-    subject$.next(400);
-  });
-  expect(result.current).toBe(400);
-});
-
-xtest('subscribes to observable only once', () => {});
diff --git a/src/plugins/kibana_react/public/util/use_observable.ts b/src/plugins/kibana_react/public/util/use_observable.ts
deleted file mode 100644
index 6a7ce1f5290d2..0000000000000
--- a/src/plugins/kibana_react/public/util/use_observable.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 { useLayoutEffect, useState } from 'react';
-import { Observable } from 'rxjs';
-
-export function useObservable<T>(observable$: Observable<T>): T | undefined;
-export function useObservable<T>(observable$: Observable<T>, initialValue: T): T;
-export function useObservable<T>(observable$: Observable<T>, initialValue?: T): T | undefined {
-  const [value, update] = useState<T | undefined>(initialValue);
-
-  useLayoutEffect(() => {
-    const s = observable$.subscribe(update);
-    return () => s.unsubscribe();
-  }, [observable$]);
-
-  return value;
-}
diff --git a/src/plugins/kibana_react/public/util/use_shallow_compare_effect.test.ts b/src/plugins/kibana_react/public/util/use_shallow_compare_effect.test.ts
deleted file mode 100644
index 810c727fcdb0b..0000000000000
--- a/src/plugins/kibana_react/public/util/use_shallow_compare_effect.test.ts
+++ /dev/null
@@ -1,86 +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 { renderHook } from '@testing-library/react-hooks';
-import { useShallowCompareEffect } from './use_shallow_compare_effect';
-
-describe('useShallowCompareEffect', () => {
-  test("doesn't run effect on shallow change", () => {
-    const callback = jest.fn();
-    let deps = [1, { a: 'b' }, true];
-    const { rerender } = renderHook(() => useShallowCompareEffect(callback, deps));
-
-    expect(callback).toHaveBeenCalledTimes(1);
-    callback.mockClear();
-
-    // no change
-    rerender();
-    expect(callback).toHaveBeenCalledTimes(0);
-    callback.mockClear();
-
-    // no-change (new object with same properties)
-    deps = [1, { a: 'b' }, true];
-    rerender();
-    expect(callback).toHaveBeenCalledTimes(0);
-    callback.mockClear();
-
-    // change (new primitive value)
-    deps = [2, { a: 'b' }, true];
-    rerender();
-    expect(callback).toHaveBeenCalledTimes(1);
-    callback.mockClear();
-
-    // no-change
-    rerender();
-    expect(callback).toHaveBeenCalledTimes(0);
-    callback.mockClear();
-
-    // change (new primitive value)
-    deps = [1, { a: 'b' }, false];
-    rerender();
-    expect(callback).toHaveBeenCalledTimes(1);
-    callback.mockClear();
-
-    // change (new properties on object)
-    deps = [1, { a: 'c' }, false];
-    rerender();
-    expect(callback).toHaveBeenCalledTimes(1);
-    callback.mockClear();
-  });
-
-  test('runs effect on deep change', () => {
-    const callback = jest.fn();
-    let deps = [1, { a: { b: 'c' } }, true];
-    const { rerender } = renderHook(() => useShallowCompareEffect(callback, deps));
-
-    expect(callback).toHaveBeenCalledTimes(1);
-    callback.mockClear();
-
-    // no change
-    rerender();
-    expect(callback).toHaveBeenCalledTimes(0);
-    callback.mockClear();
-
-    // change (new nested object )
-    deps = [1, { a: { b: 'c' } }, true];
-    rerender();
-    expect(callback).toHaveBeenCalledTimes(1);
-    callback.mockClear();
-  });
-});
diff --git a/src/plugins/kibana_react/public/util/use_shallow_compare_effect.ts b/src/plugins/kibana_react/public/util/use_shallow_compare_effect.ts
deleted file mode 100644
index dfba7b907f5fb..0000000000000
--- a/src/plugins/kibana_react/public/util/use_shallow_compare_effect.ts
+++ /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 React, { useEffect, useRef } from 'react';
-
-/**
- * Similar to https://github.com/kentcdodds/use-deep-compare-effect
- * but uses shallow compare instead of deep
- */
-export function useShallowCompareEffect(
-  callback: React.EffectCallback,
-  deps: React.DependencyList
-) {
-  useEffect(callback, useShallowCompareMemoize(deps));
-}
-function useShallowCompareMemoize(deps: React.DependencyList) {
-  const ref = useRef<React.DependencyList | undefined>(undefined);
-
-  if (!ref.current || deps.some((dep, index) => !shallowEqual(dep, ref.current![index]))) {
-    ref.current = deps;
-  }
-
-  return ref.current;
-}
-// https://github.com/facebook/fbjs/blob/master/packages/fbjs/src/core/shallowEqual.js
-function shallowEqual(objA: any, objB: any): boolean {
-  if (is(objA, objB)) {
-    return true;
-  }
-
-  if (typeof objA !== 'object' || objA === null || typeof objB !== 'object' || objB === null) {
-    return false;
-  }
-
-  const keysA = Object.keys(objA);
-  const keysB = Object.keys(objB);
-
-  if (keysA.length !== keysB.length) {
-    return false;
-  }
-
-  // Test for A's keys different from B.
-  for (let i = 0; i < keysA.length; i++) {
-    if (
-      !Object.prototype.hasOwnProperty.call(objB, keysA[i]) ||
-      !is(objA[keysA[i]], objB[keysA[i]])
-    ) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-/**
- * IE11 does not support Object.is
- */
-function is(x: any, y: any): boolean {
-  if (x === y) {
-    return x !== 0 || y !== 0 || 1 / x === 1 / y;
-  } else {
-    return x !== x && y !== y;
-  }
-}
diff --git a/src/plugins/kibana_react/public/util/use_unmount.ts b/src/plugins/kibana_react/public/util/use_unmount.ts
deleted file mode 100644
index 009bf8c4caa1c..0000000000000
--- a/src/plugins/kibana_react/public/util/use_unmount.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.
- */
-
-import { useEffect } from 'react';
-
-export function useUnmount(fn: () => void): void {
-  useEffect(() => fn, []);
-}
diff --git a/src/legacy/ui/public/field_wildcard/field_wildcard.test.ts b/src/plugins/kibana_utils/public/field_wildcard/field_wildcard.test.ts
similarity index 100%
rename from src/legacy/ui/public/field_wildcard/field_wildcard.test.ts
rename to src/plugins/kibana_utils/public/field_wildcard/field_wildcard.test.ts
diff --git a/src/legacy/ui/public/field_wildcard/field_wildcard.ts b/src/plugins/kibana_utils/public/field_wildcard/field_wildcard.ts
similarity index 100%
rename from src/legacy/ui/public/field_wildcard/field_wildcard.ts
rename to src/plugins/kibana_utils/public/field_wildcard/field_wildcard.ts
diff --git a/src/legacy/ui/public/field_wildcard/index.ts b/src/plugins/kibana_utils/public/field_wildcard/index.ts
similarity index 100%
rename from src/legacy/ui/public/field_wildcard/index.ts
rename to src/plugins/kibana_utils/public/field_wildcard/index.ts
diff --git a/src/plugins/kibana_utils/public/index.ts b/src/plugins/kibana_utils/public/index.ts
index 6e6b5c582b0eb..af2fc9e31b21b 100644
--- a/src/plugins/kibana_utils/public/index.ts
+++ b/src/plugins/kibana_utils/public/index.ts
@@ -21,6 +21,7 @@ export { defer } from '../common';
 export * from './core';
 export * from './errors';
 export * from './field_mapping';
+export * from './field_wildcard';
 export * from './parse';
 export * from './render_complete';
 export * from './resize_checker';
diff --git a/src/plugins/management/kibana.json b/src/plugins/management/kibana.json
new file mode 100644
index 0000000000000..755a387afbd05
--- /dev/null
+++ b/src/plugins/management/kibana.json
@@ -0,0 +1,7 @@
+{
+  "id": "management",
+  "version": "kibana",
+  "server": false,
+  "ui": true,
+  "requiredPlugins": []
+}
diff --git a/src/plugins/management/public/index.ts b/src/plugins/management/public/index.ts
new file mode 100644
index 0000000000000..ee3866c734f19
--- /dev/null
+++ b/src/plugins/management/public/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.
+ */
+
+import { PluginInitializerContext } from 'kibana/public';
+import { ManagementPlugin } from './plugin';
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new ManagementPlugin();
+}
+
+export { ManagementStart } from './types';
diff --git a/src/plugins/management/public/legacy/index.js b/src/plugins/management/public/legacy/index.js
new file mode 100644
index 0000000000000..63b9d2c6b27d7
--- /dev/null
+++ b/src/plugins/management/public/legacy/index.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.
+ */
+
+export { management } from './sections_register';
diff --git a/src/legacy/ui/public/management/section.js b/src/plugins/management/public/legacy/section.js
similarity index 92%
rename from src/legacy/ui/public/management/section.js
rename to src/plugins/management/public/legacy/section.js
index b6952695cd910..f269e3fe295b7 100644
--- a/src/legacy/ui/public/management/section.js
+++ b/src/plugins/management/public/legacy/section.js
@@ -18,8 +18,7 @@
  */
 
 import { assign } from 'lodash';
-import { IndexedArray } from '../indexed_array';
-import { capabilities } from '../capabilities';
+import { IndexedArray } from '../../../../legacy/ui/public/indexed_array';
 
 const listeners = [];
 
@@ -37,7 +36,7 @@ export class ManagementSection {
    * @returns {ManagementSection}
    */
 
-  constructor(id, options = {}) {
+  constructor(id, options = {}, capabilities) {
     this.display = id;
     this.id = id;
     this.items = new IndexedArray({
@@ -49,13 +48,14 @@ export class ManagementSection {
     this.tooltip = '';
     this.icon = '';
     this.url = '';
+    this.capabilities = capabilities;
 
     assign(this, options);
   }
 
   get visibleItems() {
     return this.items.inOrder.filter(item => {
-      const capabilityManagementSection = capabilities.get().management[this.id];
+      const capabilityManagementSection = this.capabilities.management[this.id];
       const itemCapability = capabilityManagementSection
         ? capabilityManagementSection[item.id]
         : null;
@@ -83,7 +83,7 @@ export class ManagementSection {
    */
 
   register(id, options = {}) {
-    const item = new ManagementSection(id, assign(options, { parent: this }));
+    const item = new ManagementSection(id, assign(options, { parent: this }), this.capabilities);
 
     if (this.hasItem(id)) {
       throw new Error(`'${id}' is already registered`);
diff --git a/src/legacy/ui/public/management/section.test.js b/src/plugins/management/public/legacy/section.test.js
similarity index 83%
rename from src/legacy/ui/public/management/section.test.js
rename to src/plugins/management/public/legacy/section.test.js
index e3e0dd3a427cb..61bafd298afb3 100644
--- a/src/legacy/ui/public/management/section.test.js
+++ b/src/plugins/management/public/legacy/section.test.js
@@ -16,62 +16,59 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-jest.mock('ui/capabilities', () => ({
-  capabilities: {
-    get: () => ({
-      navLinks: {},
-      management: {
-        kibana: {
-          sampleFeature1: true,
-          sampleFeature2: false,
-        },
-      },
-    }),
-  },
-}));
 
 import { ManagementSection } from './section';
-import { IndexedArray } from '../indexed_array';
+import { IndexedArray } from '../../../../legacy/ui/public/indexed_array';
+
+const capabilitiesMock = {
+  management: {
+    kibana: { sampleFeature2: false },
+  },
+};
 
 describe('ManagementSection', () => {
   describe('constructor', () => {
     it('defaults display to id', () => {
-      const section = new ManagementSection('kibana');
+      const section = new ManagementSection('kibana', {}, capabilitiesMock);
       expect(section.display).toBe('kibana');
     });
 
     it('defaults visible to true', () => {
-      const section = new ManagementSection('kibana');
+      const section = new ManagementSection('kibana', {}, capabilitiesMock);
       expect(section.visible).toBe(true);
     });
 
     it('defaults disabled to false', () => {
-      const section = new ManagementSection('kibana');
+      const section = new ManagementSection('kibana', {}, capabilitiesMock);
       expect(section.disabled).toBe(false);
     });
 
     it('defaults tooltip to empty string', () => {
-      const section = new ManagementSection('kibana');
+      const section = new ManagementSection('kibana', {}, capabilitiesMock);
       expect(section.tooltip).toBe('');
     });
 
     it('defaults url to empty string', () => {
-      const section = new ManagementSection('kibana');
+      const section = new ManagementSection('kibana', {}, capabilitiesMock);
       expect(section.url).toBe('');
     });
 
     it('exposes items', () => {
-      const section = new ManagementSection('kibana');
+      const section = new ManagementSection('kibana', {}, capabilitiesMock);
       expect(section.items).toHaveLength(0);
     });
 
     it('exposes visibleItems', () => {
-      const section = new ManagementSection('kibana');
+      const section = new ManagementSection('kibana', {}, capabilitiesMock);
       expect(section.visibleItems).toHaveLength(0);
     });
 
     it('assigns all options', () => {
-      const section = new ManagementSection('kibana', { description: 'test', url: 'foobar' });
+      const section = new ManagementSection(
+        'kibana',
+        { description: 'test', url: 'foobar' },
+        capabilitiesMock
+      );
       expect(section.description).toBe('test');
       expect(section.url).toBe('foobar');
     });
@@ -81,7 +78,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana');
+      section = new ManagementSection('kibana', {}, capabilitiesMock);
     });
 
     it('returns a ManagementSection', () => {
@@ -129,7 +126,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana');
+      section = new ManagementSection('kibana', {}, capabilitiesMock);
       section.register('about');
     });
 
@@ -160,7 +157,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana');
+      section = new ManagementSection('kibana', {}, capabilitiesMock);
       section.register('about');
     });
 
@@ -187,7 +184,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana');
+      section = new ManagementSection('kibana', {}, capabilitiesMock);
 
       section.register('three', { order: 3 });
       section.register('one', { order: 1 });
@@ -217,7 +214,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana');
+      section = new ManagementSection('kibana', {}, capabilitiesMock);
     });
 
     it('hide sets visible to false', () => {
@@ -236,7 +233,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana');
+      section = new ManagementSection('kibana', {}, capabilitiesMock);
     });
 
     it('disable sets disabled to true', () => {
@@ -254,7 +251,7 @@ describe('ManagementSection', () => {
     let section;
 
     beforeEach(() => {
-      section = new ManagementSection('kibana');
+      section = new ManagementSection('kibana', {}, capabilitiesMock);
 
       section.register('three', { order: 3 });
       section.register('one', { order: 1 });
diff --git a/src/plugins/management/public/legacy/sections_register.js b/src/plugins/management/public/legacy/sections_register.js
new file mode 100644
index 0000000000000..888b2c5bc3aeb
--- /dev/null
+++ b/src/plugins/management/public/legacy/sections_register.js
@@ -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 { ManagementSection } from './section';
+import { i18n } from '@kbn/i18n';
+
+export const management = capabilities => {
+  const main = new ManagementSection(
+    'management',
+    {
+      display: i18n.translate('management.displayName', {
+        defaultMessage: 'Management',
+      }),
+    },
+    capabilities
+  );
+
+  main.register('data', {
+    display: i18n.translate('management.connectDataDisplayName', {
+      defaultMessage: 'Connect Data',
+    }),
+    order: 0,
+  });
+
+  main.register('elasticsearch', {
+    display: 'Elasticsearch',
+    order: 20,
+    icon: 'logoElasticsearch',
+  });
+
+  main.register('kibana', {
+    display: 'Kibana',
+    order: 30,
+    icon: 'logoKibana',
+  });
+
+  main.register('logstash', {
+    display: 'Logstash',
+    order: 30,
+    icon: 'logoLogstash',
+  });
+
+  return main;
+};
diff --git a/src/plugins/management/public/mocks/index.ts b/src/plugins/management/public/mocks/index.ts
new file mode 100644
index 0000000000000..cc56928e8e529
--- /dev/null
+++ b/src/plugins/management/public/mocks/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.
+ */
+
+const createStartContract = () => ({
+  legacy: {},
+});
+
+export const managementPluginMock = {
+  createStartContract,
+};
diff --git a/src/plugins/management/public/plugin.ts b/src/plugins/management/public/plugin.ts
new file mode 100644
index 0000000000000..c65dfd1dc7bb4
--- /dev/null
+++ b/src/plugins/management/public/plugin.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 { CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { ManagementStart } from './types';
+// @ts-ignore
+import { management } from './legacy';
+
+export class ManagementPlugin implements Plugin<{}, ManagementStart> {
+  public setup(core: CoreSetup) {
+    return {};
+  }
+
+  public start(core: CoreStart) {
+    return {
+      legacy: management(core.application.capabilities),
+    };
+  }
+}
diff --git a/src/plugins/management/public/types.ts b/src/plugins/management/public/types.ts
new file mode 100644
index 0000000000000..6ca1faf338c39
--- /dev/null
+++ b/src/plugins/management/public/types.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 interface ManagementStart {
+  legacy: any;
+}
diff --git a/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx b/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx
index 0b3b7b5b2a272..a78c48b675911 100644
--- a/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/create_top_nav_menu.tsx
@@ -20,11 +20,14 @@
 import React from 'react';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { TopNavMenuProps, TopNavMenu } from './top_nav_menu';
-import { TopNavMenuData } from './top_nav_menu_data';
+import { RegisteredTopNavMenuData } from './top_nav_menu_data';
 
-export function createTopNav(data: DataPublicPluginStart, extraConfig: TopNavMenuData[]) {
+export function createTopNav(data: DataPublicPluginStart, extraConfig: RegisteredTopNavMenuData[]) {
   return (props: TopNavMenuProps) => {
-    const config = (props.config || []).concat(extraConfig);
+    const relevantConfig = extraConfig.filter(
+      dataItem => dataItem.appName === undefined || dataItem.appName === props.appName
+    );
+    const config = (props.config || []).concat(relevantConfig);
 
     return <TopNavMenu {...props} data={data} config={config} />;
   };
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx
index 4ab45005892e0..f709985bcf453 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_data.tsx
@@ -29,3 +29,7 @@ export interface TopNavMenuData {
   disableButton?: boolean | (() => boolean);
   tooltip?: string | (() => string);
 }
+
+export interface RegisteredTopNavMenuData extends TopNavMenuData {
+  appName?: string;
+}
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_extensions_registry.ts b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_extensions_registry.ts
index c3eab3cce18e6..a29d769a5d8a7 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_extensions_registry.ts
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_extensions_registry.ts
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import { TopNavMenuData } from './top_nav_menu_data';
+import { RegisteredTopNavMenuData } from './top_nav_menu_data';
 
 export class TopNavMenuExtensionsRegistry {
-  private menuItems: TopNavMenuData[];
+  private menuItems: RegisteredTopNavMenuData[];
 
   constructor() {
     this.menuItems = [];
@@ -28,7 +28,7 @@ export class TopNavMenuExtensionsRegistry {
 
   /** @public **/
   // Items registered into this registry will be appended to any TopNavMenu rendered in any application.
-  public register(menuItem: TopNavMenuData) {
+  public register(menuItem: RegisteredTopNavMenuData) {
     this.menuItems.push(menuItem);
   }
 
diff --git a/src/plugins/newsfeed/public/lib/api.test.ts b/src/plugins/newsfeed/public/lib/api.test.ts
index 4383b9e0f7dab..9d64dd26da047 100644
--- a/src/plugins/newsfeed/public/lib/api.test.ts
+++ b/src/plugins/newsfeed/public/lib/api.test.ts
@@ -21,7 +21,7 @@ import { take, tap, toArray } from 'rxjs/operators';
 import { interval, race } from 'rxjs';
 import sinon, { stub } from 'sinon';
 import moment from 'moment';
-import { HttpServiceBase } from 'src/core/public';
+import { HttpSetup } from 'src/core/public';
 import { NEWSFEED_HASH_SET_STORAGE_KEY, NEWSFEED_LAST_FETCH_STORAGE_KEY } from '../../constants';
 import { ApiItem, NewsfeedItem, NewsfeedPluginInjectedConfig } from '../../types';
 import { NewsfeedApiDriver, getApi } from './api';
@@ -444,7 +444,7 @@ describe('getApi', () => {
   const mockHttpGet = jest.fn();
   let httpMock = ({
     fetch: mockHttpGet,
-  } as unknown) as HttpServiceBase;
+  } as unknown) as HttpSetup;
   const getHttpMockWithItems = (mockApiItems: ApiItem[]) => (
     arg1: string,
     arg2: { method: string }
@@ -478,7 +478,7 @@ describe('getApi', () => {
     };
     httpMock = ({
       fetch: mockHttpGet,
-    } as unknown) as HttpServiceBase;
+    } as unknown) as HttpSetup;
   });
 
   it('creates a result', done => {
diff --git a/src/plugins/newsfeed/public/lib/api.ts b/src/plugins/newsfeed/public/lib/api.ts
index 6920dd9b2bccc..bfeff4aa3e37b 100644
--- a/src/plugins/newsfeed/public/lib/api.ts
+++ b/src/plugins/newsfeed/public/lib/api.ts
@@ -21,7 +21,7 @@ import * as Rx from 'rxjs';
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import { catchError, filter, mergeMap, tap } from 'rxjs/operators';
-import { HttpServiceBase } from 'src/core/public';
+import { HttpSetup } from 'src/core/public';
 import {
   NEWSFEED_FALLBACK_LANGUAGE,
   NEWSFEED_LAST_FETCH_STORAGE_KEY,
@@ -77,7 +77,7 @@ export class NewsfeedApiDriver {
     return { previous: old, current: updatedHashes };
   }
 
-  fetchNewsfeedItems(http: HttpServiceBase, config: ApiConfig): Rx.Observable<FetchResult> {
+  fetchNewsfeedItems(http: HttpSetup, config: ApiConfig): Rx.Observable<FetchResult> {
     const urlPath = config.pathTemplate.replace('{VERSION}', this.kibanaVersion);
     const fullUrl = config.urlRoot + urlPath;
 
@@ -166,7 +166,7 @@ export class NewsfeedApiDriver {
  * Computes hasNew value from new item hashes saved in localStorage
  */
 export function getApi(
-  http: HttpServiceBase,
+  http: HttpSetup,
   config: NewsfeedPluginInjectedConfig['newsfeed'],
   kibanaVersion: string
 ): Rx.Observable<void | FetchResult> {
diff --git a/src/plugins/testbed/server/index.ts b/src/plugins/testbed/server/index.ts
index 1b4de8f8f5c95..4873fe0926472 100644
--- a/src/plugins/testbed/server/index.ts
+++ b/src/plugins/testbed/server/index.ts
@@ -17,12 +17,13 @@
  * under the License.
  */
 
-import { map, mergeMap } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { schema, TypeOf } from '@kbn/config-schema';
 
 import {
   CoreSetup,
   CoreStart,
+  LegacyRenderOptions,
   Logger,
   PluginInitializerContext,
   PluginConfigDescriptor,
@@ -77,6 +78,29 @@ class Plugin {
       }
     );
 
+    router.get(
+      {
+        path: '/requestcontext/render/{id}',
+        validate: {
+          params: schema.object({
+            id: schema.maybe(schema.string()),
+          }),
+        },
+      },
+      async (context, req, res) => {
+        const { id } = req.params;
+        const options: Partial<LegacyRenderOptions> = { app: { getId: () => id! } };
+        const body = await context.core.rendering.render(options);
+
+        return res.ok({
+          body,
+          headers: {
+            'content-securty-policy': core.http.csp.header,
+          },
+        });
+      }
+    );
+
     return {
       data$: this.initializerContext.config.create<ConfigType>().pipe(
         map(configValue => {
@@ -84,9 +108,7 @@ class Plugin {
           return `Some exposed data derived from config: ${configValue.secret}`;
         })
       ),
-      pingElasticsearch$: core.elasticsearch.adminClient$.pipe(
-        mergeMap(client => client.callAsInternalUser('ping'))
-      ),
+      pingElasticsearch: () => core.elasticsearch.adminClient.callAsInternalUser('ping'),
     };
   }
 
diff --git a/src/plugins/usage_collection/public/plugin.ts b/src/plugins/usage_collection/public/plugin.ts
index 2ecc6c8bc2038..7f80076a483b4 100644
--- a/src/plugins/usage_collection/public/plugin.ts
+++ b/src/plugins/usage_collection/public/plugin.ts
@@ -25,7 +25,7 @@ import {
   Plugin,
   CoreSetup,
   CoreStart,
-  HttpServiceBase,
+  HttpSetup,
 } from '../../../core/public';
 
 interface PublicConfigType {
@@ -41,7 +41,7 @@ export interface UsageCollectionSetup {
   METRIC_TYPE: typeof METRIC_TYPE;
 }
 
-export function isUnauthenticated(http: HttpServiceBase) {
+export function isUnauthenticated(http: HttpSetup) {
   const { anonymousPaths } = http;
   return anonymousPaths.isAnonymous(window.location.pathname);
 }
diff --git a/src/plugins/usage_collection/public/services/create_reporter.ts b/src/plugins/usage_collection/public/services/create_reporter.ts
index 6bc35de8972c3..304eb639d62ca 100644
--- a/src/plugins/usage_collection/public/services/create_reporter.ts
+++ b/src/plugins/usage_collection/public/services/create_reporter.ts
@@ -18,12 +18,12 @@
  */
 
 import { Reporter, Storage } from '@kbn/analytics';
-import { HttpServiceBase } from 'kibana/public';
+import { HttpSetup } from 'kibana/public';
 
 interface AnalyicsReporterConfig {
   localStorage: Storage;
   debug: boolean;
-  fetch: HttpServiceBase;
+  fetch: HttpSetup;
 }
 
 export function createReporter(config: AnalyicsReporterConfig): Reporter {
diff --git a/src/plugins/vis_type_timeseries/kibana.json b/src/plugins/vis_type_timeseries/kibana.json
new file mode 100644
index 0000000000000..f9a368e85ed49
--- /dev/null
+++ b/src/plugins/vis_type_timeseries/kibana.json
@@ -0,0 +1,6 @@
+{
+  "id": "metrics",
+  "version": "8.0.0",
+  "kibanaVersion": "kibana",
+  "server": true
+}
\ No newline at end of file
diff --git a/src/plugins/vis_type_timeseries/server/index.ts b/src/plugins/vis_type_timeseries/server/index.ts
new file mode 100644
index 0000000000000..599726612a936
--- /dev/null
+++ b/src/plugins/vis_type_timeseries/server/index.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 { schema, TypeOf } from '@kbn/config-schema';
+import { PluginInitializerContext } from 'src/core/server';
+import { VisTypeTimeseriesPlugin } from './plugin';
+export { VisTypeTimeseriesSetup, Framework } from './plugin';
+
+export const config = {
+  schema: schema.object({
+    enabled: schema.boolean({ defaultValue: true }),
+  }),
+};
+
+export type VisTypeTimeseriesConfig = TypeOf<typeof config.schema>;
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new VisTypeTimeseriesPlugin(initializerContext);
+}
diff --git a/src/plugins/vis_type_timeseries/server/plugin.ts b/src/plugins/vis_type_timeseries/server/plugin.ts
new file mode 100644
index 0000000000000..f508aa250454f
--- /dev/null
+++ b/src/plugins/vis_type_timeseries/server/plugin.ts
@@ -0,0 +1,96 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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,
+  RequestHandlerContext,
+  Logger,
+} from 'src/core/server';
+import { Observable } from 'rxjs';
+import { Server } from 'hapi';
+import { once } from 'lodash';
+import { VisTypeTimeseriesConfig } from '.';
+import {
+  init,
+  getVisData,
+  GetVisData,
+  GetVisDataOptions,
+} from '../../../legacy/core_plugins/vis_type_timeseries/server';
+
+export interface LegacySetup {
+  server: Server;
+}
+
+export interface VisTypeTimeseriesSetup {
+  /** @deprecated */
+  __legacy: {
+    config$: Observable<VisTypeTimeseriesConfig>;
+    registerLegacyAPI: (__LEGACY: LegacySetup) => void;
+  };
+  getVisData: (
+    requestContext: RequestHandlerContext,
+    options: GetVisDataOptions
+  ) => ReturnType<GetVisData>;
+}
+
+export interface Framework {
+  core: CoreSetup;
+  plugins: any;
+  config$: Observable<VisTypeTimeseriesConfig>;
+  globalConfig$: PluginInitializerContext['config']['legacy']['globalConfig$'];
+  logger: Logger;
+}
+
+export class VisTypeTimeseriesPlugin implements Plugin<VisTypeTimeseriesSetup> {
+  constructor(private readonly initializerContext: PluginInitializerContext) {
+    this.initializerContext = initializerContext;
+  }
+
+  public setup(core: CoreSetup, plugins: any) {
+    const logger = this.initializerContext.logger.get('visTypeTimeseries');
+    const config$ = this.initializerContext.config.create<VisTypeTimeseriesConfig>();
+    // Global config contains things like the ES shard timeout
+    const globalConfig$ = this.initializerContext.config.legacy.globalConfig$;
+
+    const framework: Framework = {
+      core,
+      plugins,
+      config$,
+      globalConfig$,
+      logger,
+    };
+
+    return {
+      __legacy: {
+        config$,
+        registerLegacyAPI: once((__LEGACY: LegacySetup) => {
+          init(framework, __LEGACY);
+        }),
+      },
+      getVisData: async (requestContext: RequestHandlerContext, options: GetVisDataOptions) => {
+        return await getVisData(requestContext, options, framework);
+      },
+    };
+  }
+
+  public start(core: CoreStart) {}
+}
diff --git a/src/test_utils/kbn_server.ts b/src/test_utils/kbn_server.ts
index 40700e05bcde8..e1b4a823e7e87 100644
--- a/src/test_utils/kbn_server.ts
+++ b/src/test_utils/kbn_server.ts
@@ -37,7 +37,7 @@ 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';
+export type HttpMethod = 'delete' | 'get' | 'head' | 'post' | 'put';
 
 const DEFAULTS_SETTINGS = {
   server: {
@@ -76,6 +76,7 @@ export function createRootWithSettings(
       repl: false,
       basePath: false,
       optimize: false,
+      runExamples: false,
       oss: true,
       ...cliArgs,
     },
@@ -96,7 +97,7 @@ export function createRootWithSettings(
  * @param method
  * @param path
  */
-function getSupertest(root: Root, method: HttpMethod, path: string) {
+export function getSupertest(root: Root, method: HttpMethod, path: string) {
   const testUserCredentials = Buffer.from(`${kibanaTestUser.username}:${kibanaTestUser.password}`);
   return supertest((root as any).server.http.httpServer.server.listener)
     [method](path)
diff --git a/src/test_utils/public/simulate_keys.js b/src/test_utils/public/simulate_keys.js
index 8ee4a79e6bc7c..a876d67325c05 100644
--- a/src/test_utils/public/simulate_keys.js
+++ b/src/test_utils/public/simulate_keys.js
@@ -20,7 +20,7 @@
 import $ from 'jquery';
 import _ from 'lodash';
 import Bluebird from 'bluebird';
-import { keyMap } from 'ui/utils/key_map';
+import { keyMap } from 'ui/directives/key_map';
 const reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1));
 
 /**
diff --git a/src/test_utils/public/stub_field_formats.ts b/src/test_utils/public/stub_field_formats.ts
index da1a31f1cc7a5..ea46710c0dc84 100644
--- a/src/test_utils/public/stub_field_formats.ts
+++ b/src/test_utils/public/stub_field_formats.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IUiSettingsClient } from 'kibana/public';
+import { CoreSetup } from 'kibana/public';
 
 import {
   FieldFormatRegisty,
@@ -37,7 +37,7 @@ import {
   UrlFormat,
 } from '../../plugins/data/public/';
 
-export const getFieldFormatsRegistry = (uiSettings: IUiSettingsClient) => {
+export const getFieldFormatsRegistry = (core: CoreSetup) => {
   const fieldFormats = new FieldFormatRegisty();
 
   fieldFormats.register([
@@ -58,7 +58,7 @@ export const getFieldFormatsRegistry = (uiSettings: IUiSettingsClient) => {
     UrlFormat,
   ]);
 
-  fieldFormats.init(uiSettings);
+  fieldFormats.init(core);
 
   return fieldFormats;
 };
diff --git a/src/test_utils/public/stub_index_pattern.js b/src/test_utils/public/stub_index_pattern.js
index 14931b938732c..7807821ab09bd 100644
--- a/src/test_utils/public/stub_index_pattern.js
+++ b/src/test_utils/public/stub_index_pattern.js
@@ -40,8 +40,8 @@ setFieldFormats({
 
 import { getFieldFormatsRegistry } from './stub_field_formats';
 
-export default function StubIndexPattern(pattern, getConfig, timeField, fields, uiSettings) {
-  const registeredFieldFormats = getFieldFormatsRegistry(uiSettings);
+export default function StubIndexPattern(pattern, getConfig, timeField, fields, core) {
+  const registeredFieldFormats = getFieldFormatsRegistry(core);
 
   this.id = pattern;
   this.title = pattern;
diff --git a/tasks/config/run.js b/tasks/config/run.js
index 84b6077008ce1..a29061c9a7240 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -252,6 +252,18 @@ module.exports = function(grunt) {
       ],
     }),
 
+    exampleFunctionalTestsRelease: scriptWithGithubChecks({
+      title: 'Example functional tests',
+      cmd: NODE,
+      args: [
+        'scripts/functional_tests',
+        '--config',
+        'test/examples/config.js',
+        '--bail',
+        '--debug',
+      ],
+    }),
+
     functionalTests: scriptWithGithubChecks({
       title: 'Functional tests',
       cmd: NODE,
diff --git a/test/api_integration/apis/core/index.js b/test/api_integration/apis/core/index.js
index be1ecf9b9c497..766faf067e4ac 100644
--- a/test/api_integration/apis/core/index.js
+++ b/test/api_integration/apis/core/index.js
@@ -33,6 +33,11 @@ export default function({ getService }) {
             200,
             'SavedObjects client: {"page":1,"per_page":20,"total":0,"saved_objects":[]}'
           ));
+
+      it('provides access to application rendering client', async () => {
+        await supertest.get('/requestcontext/render/core').expect(200, /app:core/);
+        await supertest.get('/requestcontext/render/testbed').expect(200, /app:testbed/);
+      });
     });
 
     describe('compression', () => {
diff --git a/test/api_integration/apis/general/prototype_pollution.ts b/test/api_integration/apis/general/prototype_pollution.ts
index 1b732dc81afa9..3e74480ebe9eb 100644
--- a/test/api_integration/apis/general/prototype_pollution.ts
+++ b/test/api_integration/apis/general/prototype_pollution.ts
@@ -26,7 +26,7 @@ export default function({ getService }: FtrProviderContext) {
   describe('prototype pollution smoke test', () => {
     it('prevents payloads with the "constructor.prototype" pollution vector from being accepted', async () => {
       await supertest
-        .post('/api/sample_data/some_data_id')
+        .post('/api/saved_objects/_log_legacy_import')
         .send([
           {
             constructor: {
@@ -44,7 +44,7 @@ export default function({ getService }: FtrProviderContext) {
 
     it('prevents payloads with the "__proto__" pollution vector from being accepted', async () => {
       await supertest
-        .post('/api/sample_data/some_data_id')
+        .post('/api/saved_objects/_log_legacy_import')
         .send(JSON.parse(`{"foo": { "__proto__": {} } }`))
         .expect(400, {
           statusCode: 400,
diff --git a/test/api_integration/apis/home/sample_data.js b/test/api_integration/apis/home/sample_data.js
index 4aaf8c75092ae..d5f03cc714f2f 100644
--- a/test/api_integration/apis/home/sample_data.js
+++ b/test/api_integration/apis/home/sample_data.js
@@ -96,7 +96,7 @@ export default function({ getService }) {
         await supertest
           .delete(`/api/sample_data/flights`)
           .set('kbn-xsrf', 'kibana')
-          .expect(200);
+          .expect(204);
       });
 
       it('should remove elasticsearch index containing sample data', async () => {
diff --git a/test/api_integration/apis/ui_metric/ui_metric.js b/test/api_integration/apis/ui_metric/ui_metric.js
index 5b02ba7e72430..5ddbd8649589c 100644
--- a/test/api_integration/apis/ui_metric/ui_metric.js
+++ b/test/api_integration/apis/ui_metric/ui_metric.js
@@ -25,15 +25,13 @@ export default function({ getService }) {
   const es = getService('legacyEs');
 
   const createStatsMetric = eventName => ({
-    key: ReportManager.createMetricKey({ appName: 'myApp', type: METRIC_TYPE.CLICK, eventName }),
     eventName,
     appName: 'myApp',
     type: METRIC_TYPE.CLICK,
-    stats: { sum: 1, avg: 1, min: 1, max: 1 },
+    count: 1,
   });
 
   const createUserAgentMetric = appName => ({
-    key: ReportManager.createMetricKey({ appName, type: METRIC_TYPE.USER_AGENT }),
     appName,
     type: METRIC_TYPE.USER_AGENT,
     userAgent:
@@ -42,12 +40,9 @@ export default function({ getService }) {
 
   describe('ui_metric API', () => {
     it('increments the count field in the document defined by the {app}/{action_type} path', async () => {
+      const reportManager = new ReportManager();
       const uiStatsMetric = createStatsMetric('myEvent');
-      const report = {
-        uiStatsMetrics: {
-          [uiStatsMetric.key]: uiStatsMetric,
-        },
-      };
+      const { report } = reportManager.assignReports([uiStatsMetric]);
       await supertest
         .post('/api/ui_metric/report')
         .set('kbn-xsrf', 'kibana')
@@ -61,21 +56,18 @@ export default function({ getService }) {
     });
 
     it('supports multiple events', async () => {
+      const reportManager = new ReportManager();
       const userAgentMetric = createUserAgentMetric('kibana');
       const uiStatsMetric1 = createStatsMetric('myEvent');
       const hrTime = process.hrtime();
       const nano = hrTime[0] * 1000000000 + hrTime[1];
       const uniqueEventName = `myEvent${nano}`;
       const uiStatsMetric2 = createStatsMetric(uniqueEventName);
-      const report = {
-        userAgent: {
-          [userAgentMetric.key]: userAgentMetric,
-        },
-        uiStatsMetrics: {
-          [uiStatsMetric1.key]: uiStatsMetric1,
-          [uiStatsMetric2.key]: uiStatsMetric2,
-        },
-      };
+      const { report } = reportManager.assignReports([
+        userAgentMetric,
+        uiStatsMetric1,
+        uiStatsMetric2,
+      ]);
       await supertest
         .post('/api/ui_metric/report')
         .set('kbn-xsrf', 'kibana')
diff --git a/test/common/fixtures/plugins/newsfeed/newsfeed_simulation.ts b/test/common/fixtures/plugins/newsfeed/newsfeed_simulation.ts
index 2a7ea3793324d..4bf92868b0eca 100644
--- a/test/common/fixtures/plugins/newsfeed/newsfeed_simulation.ts
+++ b/test/common/fixtures/plugins/newsfeed/newsfeed_simulation.ts
@@ -88,7 +88,7 @@ const mockNewsfeed = (version: string) => ({
       badge: null,
       image_url: null,
       publish_on: '2019-06-21T00:00:00',
-      expire_on: '2019-12-31T00:00:00',
+      expire_on: '2040-01-31T00:00:00',
       hash: '39ca7d409c7eb25f4c69a5a6a11309b2f5ced7ca3f9b3a0109517126e0fd91ca',
     },
     {
@@ -100,6 +100,18 @@ const mockNewsfeed = (version: string) => ({
       badge: null,
       image_url: null,
       publish_on: '2019-06-21T00:00:00',
+      expire_on: '2040-01-31T00:00:00',
+      hash: 'db445c9443eb50ea2eb15f20edf89cf0f7dac2b058b11cafc2c8c288b6e4ce2a',
+    },
+    {
+      title: { en: 'This item is expired!' },
+      description: { en: 'This should not show up.' },
+      link_text: { en: 'Generic feed-viewer could go here' },
+      link_url: { en: 'https://feeds-staging.elastic.co' },
+      languages: null,
+      badge: null,
+      image_url: null,
+      publish_on: '2019-06-21T00:00:00',
       expire_on: '2019-12-31T00:00:00',
       hash: 'db445c9443eb50ea2eb15f20edf89cf0f7dac2b058b11cafc2c8c288b6e4ce2a',
     },
diff --git a/test/examples/config.js b/test/examples/config.js
index 750fc0f831be6..f747a7fab5bb9 100644
--- a/test/examples/config.js
+++ b/test/examples/config.js
@@ -24,7 +24,7 @@ export default async function({ readConfigFile }) {
   const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
 
   return {
-    testFiles: [require.resolve('./search')],
+    testFiles: [require.resolve('./search'), require.resolve('./embeddables')],
     services: {
       ...functionalConfig.get('services'),
       ...services,
diff --git a/test/examples/embeddables/hello_world_embeddable.ts b/test/examples/embeddables/hello_world_embeddable.ts
new file mode 100644
index 0000000000000..1d8c651ea3fe6
--- /dev/null
+++ b/test/examples/embeddables/hello_world_embeddable.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 expect from '@kbn/expect';
+
+import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService }: PluginFunctionalProviderContext) {
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+
+  describe('hello world embeddable', () => {
+    before(async () => {
+      await testSubjects.click('helloWorldEmbeddableSection');
+    });
+
+    it('hello world embeddable render', async () => {
+      await retry.try(async () => {
+        const text = await testSubjects.getVisibleText('helloWorldEmbeddable');
+        expect(text).to.be('HELLO WORLD!');
+      });
+    });
+
+    it('hello world embeddable from factory renders', async () => {
+      await retry.try(async () => {
+        const text = await testSubjects.getVisibleText('helloWorldEmbeddableFromFactory');
+        expect(text).to.be('HELLO WORLD!');
+      });
+    });
+  });
+}
diff --git a/test/examples/embeddables/index.ts b/test/examples/embeddables/index.ts
new file mode 100644
index 0000000000000..ff7997b3b01d4
--- /dev/null
+++ b/test/examples/embeddables/index.ts
@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 'test/plugin_functional/services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({
+  getService,
+  getPageObjects,
+  loadTestFile,
+}: PluginFunctionalProviderContext) {
+  const browser = getService('browser');
+  const appsMenu = getService('appsMenu');
+  const PageObjects = getPageObjects(['common', 'header']);
+
+  describe('embeddable explorer', function() {
+    before(async () => {
+      await browser.setWindowSize(1300, 900);
+      await PageObjects.common.navigateToApp('settings');
+      await appsMenu.clickLink('Embeddable explorer');
+    });
+
+    loadTestFile(require.resolve('./hello_world_embeddable'));
+    loadTestFile(require.resolve('./todo_embeddable'));
+    loadTestFile(require.resolve('./list_container'));
+  });
+}
diff --git a/test/examples/embeddables/list_container.ts b/test/examples/embeddables/list_container.ts
new file mode 100644
index 0000000000000..79e6131647900
--- /dev/null
+++ b/test/examples/embeddables/list_container.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 expect from '@kbn/expect';
+import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService }: PluginFunctionalProviderContext) {
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+
+  describe('list container', () => {
+    before(async () => {
+      await testSubjects.click('listContainerSection');
+    });
+
+    it('list containers render', async () => {
+      await retry.try(async () => {
+        const title = await testSubjects.getVisibleText('listContainerTitle');
+        expect(title).to.be('My todo list');
+
+        const titles = await testSubjects.getVisibleTextAll('todoEmbeddableTitle');
+        expect(titles).to.eql(['Take out the trash', 'Vaccum the floor', 'Take out the trash']);
+
+        const searchableTitle = await testSubjects.getVisibleText('searchableListContainerTitle');
+        expect(searchableTitle).to.be('My searchable todo list');
+
+        const text = await testSubjects.getVisibleTextAll('helloWorldEmbeddable');
+        expect(text).to.eql(['HELLO WORLD!', 'HELLO WORLD!']);
+
+        const tasks = await testSubjects.getVisibleTextAll('multiTaskTodoTask');
+        expect(tasks).to.eql(['Go to school', 'Watch planet earth', 'Read the encylopedia']);
+      });
+    });
+
+    it('searchable container deletes children', async () => {
+      await testSubjects.click('todoCheckBox-1');
+      await testSubjects.click('deleteCheckedTodos');
+
+      const text = await testSubjects.getVisibleTextAll('helloWorldEmbeddable');
+      expect(text).to.eql(['HELLO WORLD!']);
+    });
+
+    it('searchable container filters multi-task children', async () => {
+      await testSubjects.setValue('filterTodos', 'earth');
+
+      await retry.try(async () => {
+        const tasks = await testSubjects.getVisibleTextAll('multiTaskTodoTask');
+        expect(tasks).to.eql(['Watch planet earth']);
+      });
+    });
+  });
+}
diff --git a/test/examples/embeddables/todo_embeddable.ts b/test/examples/embeddables/todo_embeddable.ts
new file mode 100644
index 0000000000000..08e722911997a
--- /dev/null
+++ b/test/examples/embeddables/todo_embeddable.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 expect from '@kbn/expect';
+import { PluginFunctionalProviderContext } from 'test/plugin_functional/services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ getService }: PluginFunctionalProviderContext) {
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+
+  describe('todo embeddable', () => {
+    before(async () => {
+      await testSubjects.click('todoEmbeddableSection');
+    });
+
+    it('todo embeddable renders', async () => {
+      await retry.try(async () => {
+        const title = await testSubjects.getVisibleText('todoEmbeddableTitle');
+        expect(title).to.be('Trash');
+        const task = await testSubjects.getVisibleText('todoEmbeddableTask');
+        expect(task).to.be('Take out the trash');
+      });
+    });
+
+    it('todo embeddable updates', async () => {
+      await testSubjects.setValue('taskTodo', 'read a book');
+      await testSubjects.setValue('titleTodo', 'Learn');
+      await testSubjects.click('updateTodoButton');
+
+      await retry.try(async () => {
+        const title = await testSubjects.getVisibleText('todoEmbeddableTitle');
+        expect(title).to.be('Learn');
+        const task = await testSubjects.getVisibleText('todoEmbeddableTask');
+        expect(task).to.be('read a book');
+      });
+    });
+  });
+}
diff --git a/test/functional/apps/dashboard/create_and_add_embeddables.js b/test/functional/apps/dashboard/create_and_add_embeddables.js
index 2e0c4d449d447..90f02c36b3b7f 100644
--- a/test/functional/apps/dashboard/create_and_add_embeddables.js
+++ b/test/functional/apps/dashboard/create_and_add_embeddables.js
@@ -19,7 +19,7 @@
 
 import expect from '@kbn/expect';
 
-import { VisualizeConstants } from '../../../../src/legacy/core_plugins/kibana/public/visualize/visualize_constants';
+import { VisualizeConstants } from '../../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
 
 export default function({ getService, getPageObjects }) {
   const retry = getService('retry');
diff --git a/test/functional/apps/dashboard/dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js
index 3caab3db44cb3..3b9e404e9b94d 100644
--- a/test/functional/apps/dashboard/dashboard_state.js
+++ b/test/functional/apps/dashboard/dashboard_state.js
@@ -27,7 +27,14 @@ import {
 } from '../../../../src/plugins/dashboard_embeddable_container/public/embeddable/dashboard_constants';
 
 export default function({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['dashboard', 'visualize', 'header', 'discover']);
+  const PageObjects = getPageObjects([
+    'dashboard',
+    'visualize',
+    'header',
+    'discover',
+    'tileMap',
+    'visChart',
+  ]);
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
   const queryBar = getService('queryBar');
@@ -58,14 +65,14 @@ export default function({ getService, getPageObjects }) {
 
       await PageObjects.dashboard.switchToEditMode();
 
-      await PageObjects.visualize.openLegendOptionColors('Count');
-      await PageObjects.visualize.selectNewLegendColorChoice('#EA6460');
+      await PageObjects.visChart.openLegendOptionColors('Count');
+      await PageObjects.visChart.selectNewLegendColorChoice('#EA6460');
 
       await PageObjects.dashboard.saveDashboard('Overridden colors');
 
       await PageObjects.dashboard.gotoDashboardLandingPage();
       await PageObjects.dashboard.loadSavedDashboard('Overridden colors');
-      const colorChoiceRetained = await PageObjects.visualize.doesSelectedLegendColorExist(
+      const colorChoiceRetained = await PageObjects.visChart.doesSelectedLegendColorExist(
         '#EA6460'
       );
 
@@ -153,10 +160,10 @@ export default function({ getService, getPageObjects }) {
       await dashboardPanelActions.openContextMenu();
       await dashboardPanelActions.clickEdit();
 
-      await PageObjects.visualize.clickMapZoomIn();
-      await PageObjects.visualize.clickMapZoomIn();
-      await PageObjects.visualize.clickMapZoomIn();
-      await PageObjects.visualize.clickMapZoomIn();
+      await PageObjects.tileMap.clickMapZoomIn();
+      await PageObjects.tileMap.clickMapZoomIn();
+      await PageObjects.tileMap.clickMapZoomIn();
+      await PageObjects.tileMap.clickMapZoomIn();
 
       await PageObjects.visualize.saveVisualizationExpectSuccess('Visualization TileMap');
 
@@ -225,8 +232,8 @@ export default function({ getService, getPageObjects }) {
       describe('for embeddable config color parameters on a visualization', () => {
         it('updates a pie slice color on a soft refresh', async function() {
           await dashboardAddPanel.addVisualization(PIE_CHART_VIS_NAME);
-          await PageObjects.visualize.openLegendOptionColors('80,000');
-          await PageObjects.visualize.selectNewLegendColorChoice('#F9D9F9');
+          await PageObjects.visChart.openLegendOptionColors('80,000');
+          await PageObjects.visChart.selectNewLegendColorChoice('#F9D9F9');
           const currentUrl = await browser.getCurrentUrl();
           const newUrl = currentUrl.replace('F9D9F9', 'FFFFFF');
           await browser.get(newUrl.toString(), false);
@@ -248,7 +255,7 @@ export default function({ getService, getPageObjects }) {
         // Unskip once https://github.com/elastic/kibana/issues/15736 is fixed.
         it.skip('and updates the pie slice legend color', async function() {
           await retry.try(async () => {
-            const colorExists = await PageObjects.visualize.doesSelectedLegendColorExist('#FFFFFF');
+            const colorExists = await PageObjects.visChart.doesSelectedLegendColorExist('#FFFFFF');
             expect(colorExists).to.be(true);
           });
         });
@@ -269,7 +276,7 @@ export default function({ getService, getPageObjects }) {
         // Unskip once https://github.com/elastic/kibana/issues/15736 is fixed.
         it.skip('resets the legend color as well', async function() {
           await retry.try(async () => {
-            const colorExists = await PageObjects.visualize.doesSelectedLegendColorExist('#57c17b');
+            const colorExists = await PageObjects.visChart.doesSelectedLegendColorExist('#57c17b');
             expect(colorExists).to.be(true);
           });
         });
diff --git a/test/functional/apps/dashboard/empty_dashboard.js b/test/functional/apps/dashboard/empty_dashboard.js
index 0f10eabcba434..c91b7bd1ecee0 100644
--- a/test/functional/apps/dashboard/empty_dashboard.js
+++ b/test/functional/apps/dashboard/empty_dashboard.js
@@ -28,8 +28,7 @@ export default function({ getService, getPageObjects }) {
   const dashboardExpect = getService('dashboardExpect');
   const PageObjects = getPageObjects(['common', 'dashboard']);
 
-  // FLAKY: https://github.com/elastic/kibana/issues/48236
-  describe.skip('empty dashboard', () => {
+  describe('empty dashboard', () => {
     before(async () => {
       await esArchiver.load('dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
@@ -45,23 +44,24 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.dashboard.gotoDashboardLandingPage();
     });
 
-    it('should display add button', async () => {
-      const addButtonExists = await testSubjects.exists('emptyDashboardAddPanelButton');
-      expect(addButtonExists).to.be(true);
+    it('should display empty widget', async () => {
+      const emptyWidgetExists = await testSubjects.exists('emptyDashboardWidget');
+      expect(emptyWidgetExists).to.be(true);
     });
 
     it.skip('should open add panel when add button is clicked', async () => {
-      await testSubjects.click('emptyDashboardAddPanelButton');
+      await testSubjects.click('dashboardAddPanelButton');
       const isAddPanelOpen = await dashboardAddPanel.isAddPanelOpen();
       expect(isAddPanelOpen).to.be(true);
     });
 
     it('should add new visualization from dashboard', async () => {
+      await testSubjects.exists('addVisualizationButton');
       await testSubjects.click('addVisualizationButton');
-      await dashboardVisualizations.createAndAddMarkdown(
-        { name: 'Dashboard Test Markdown', markdown: 'Markdown text' },
-        false
-      );
+      await dashboardVisualizations.createAndAddMarkdown({
+        name: 'Dashboard Test Markdown',
+        markdown: 'Markdown text',
+      });
       await PageObjects.dashboard.waitForRenderComplete();
       await dashboardExpect.markdownWithValuesExists(['Markdown text']);
     });
diff --git a/test/functional/apps/dashboard/panel_controls.js b/test/functional/apps/dashboard/panel_controls.js
index b69e031f84667..683f3683e65e5 100644
--- a/test/functional/apps/dashboard/panel_controls.js
+++ b/test/functional/apps/dashboard/panel_controls.js
@@ -24,7 +24,7 @@ import {
   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';
+import { VisualizeConstants } from '../../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
 
 export default function({ getService, getPageObjects }) {
   const browser = getService('browser');
diff --git a/test/functional/apps/getting_started/_shakespeare.js b/test/functional/apps/getting_started/_shakespeare.js
index 04d81f4b46083..5af1676cf423f 100644
--- a/test/functional/apps/getting_started/_shakespeare.js
+++ b/test/functional/apps/getting_started/_shakespeare.js
@@ -23,7 +23,14 @@ export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const esArchiver = getService('esArchiver');
   const retry = getService('retry');
-  const PageObjects = getPageObjects(['console', 'common', 'settings', 'visualize']);
+  const PageObjects = getPageObjects([
+    'console',
+    'common',
+    'settings',
+    'visualize',
+    'visEditor',
+    'visChart',
+  ]);
 
   // https://www.elastic.co/guide/en/kibana/current/tutorial-load-dataset.html
 
@@ -63,11 +70,11 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickVerticalBarChart();
       await PageObjects.visualize.clickNewSearch('shakes*');
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
 
       const expectedChartValues = [111396];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Count');
+        const data = await PageObjects.visChart.getBarChartData('Count');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data[0] - expectedChartValues[0]).to.be.lessThan(5);
@@ -84,22 +91,22 @@ export default function({ getService, getPageObjects }) {
     it('should configure metric Unique Count Speaking Parts', async function() {
       log.debug('Metric = Unique Count, speaker, Speaking Parts');
       // this first change to the YAxis metric agg uses the default aggIndex of 1
-      await PageObjects.visualize.selectYAxisAggregation(
+      await PageObjects.visEditor.selectYAxisAggregation(
         'Unique Count',
         'speaker',
         'Speaking Parts'
       );
       // then increment the aggIndex for the next one we create
       aggIndex = aggIndex + 1;
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
       const expectedChartValues = [935];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Speaking Parts');
+        const data = await PageObjects.visChart.getBarChartData('Speaking Parts');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
       });
-      const title = await PageObjects.visualize.getYAxisTitle();
+      const title = await PageObjects.visChart.getYAxisTitle();
       expect(title).to.be('Speaking Parts');
     });
 
@@ -110,23 +117,23 @@ export default function({ getService, getPageObjects }) {
     5. Click Apply changes images/apply-changes-button.png to view the results.
     */
     it('should configure Terms aggregation on play_name', async function() {
-      await PageObjects.visualize.clickBucket('X-axis');
+      await PageObjects.visEditor.clickBucket('X-axis');
       log.debug('Aggregation = Terms');
-      await PageObjects.visualize.selectAggregation('Terms');
+      await PageObjects.visEditor.selectAggregation('Terms');
       aggIndex = aggIndex + 1;
       log.debug('Field = play_name');
-      await PageObjects.visualize.selectField('play_name');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('play_name');
+      await PageObjects.visEditor.clickGo();
 
       const expectedChartValues = [71, 65, 62, 55, 55];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Speaking Parts');
+        const data = await PageObjects.visChart.getBarChartData('Speaking Parts');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
       });
 
-      const labels = await PageObjects.visualize.getXAxisLabels();
+      const labels = await PageObjects.visChart.getXAxisLabels();
       expect(labels).to.eql([
         'Richard III',
         'Henry VI Part 2',
@@ -145,21 +152,21 @@ export default function({ getService, getPageObjects }) {
     2. Choose the Max aggregation and select the speech_number field.
     */
     it('should configure Max aggregation metric on speech_number', async function() {
-      await PageObjects.visualize.clickBucket('Y-axis', 'metrics');
+      await PageObjects.visEditor.clickBucket('Y-axis', 'metrics');
       log.debug('Aggregation = Max');
-      await PageObjects.visualize.selectYAxisAggregation(
+      await PageObjects.visEditor.selectYAxisAggregation(
         'Max',
         'speech_number',
         'Max Speaking Parts',
         aggIndex
       );
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
 
       const expectedChartValues = [71, 65, 62, 55, 55];
       const expectedChartValues2 = [177, 106, 153, 132, 162];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Speaking Parts');
-        const data2 = await PageObjects.visualize.getBarChartData('Max Speaking Parts');
+        const data = await PageObjects.visChart.getBarChartData('Speaking Parts');
+        const data2 = await PageObjects.visChart.getBarChartData('Max Speaking Parts');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         log.debug('data2=' + data2);
@@ -168,7 +175,7 @@ export default function({ getService, getPageObjects }) {
         expect(data2).to.eql(expectedChartValues2);
       });
 
-      const labels = await PageObjects.visualize.getXAxisLabels();
+      const labels = await PageObjects.visChart.getXAxisLabels();
       expect(labels).to.eql([
         'Richard III',
         'Henry VI Part 2',
@@ -184,15 +191,15 @@ export default function({ getService, getPageObjects }) {
     4. Click Apply changes images/apply-changes-button.png. Your chart should now look like this:
     */
     it('should configure change options to normal bars', async function() {
-      await PageObjects.visualize.clickMetricsAndAxes();
-      await PageObjects.visualize.selectChartMode('normal');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickMetricsAndAxes();
+      await PageObjects.visEditor.selectChartMode('normal');
+      await PageObjects.visEditor.clickGo();
 
       const expectedChartValues = [71, 65, 62, 55, 55];
       const expectedChartValues2 = [177, 106, 153, 132, 162];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Speaking Parts');
-        const data2 = await PageObjects.visualize.getBarChartData('Max Speaking Parts');
+        const data = await PageObjects.visChart.getBarChartData('Speaking Parts');
+        const data2 = await PageObjects.visChart.getBarChartData('Max Speaking Parts');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         log.debug('data2=' + data2);
@@ -210,15 +217,15 @@ export default function({ getService, getPageObjects }) {
     Save this chart with the name Bar Example.
     */
     it('should change the Y-Axis extents', async function() {
-      await PageObjects.visualize.setAxisExtents('50', '250');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setAxisExtents('50', '250');
+      await PageObjects.visEditor.clickGo();
 
       // same values as previous test except scaled down by the 50 for Y-Axis min
       const expectedChartValues = [21, 15, 12, 5, 5];
       const expectedChartValues2 = [127, 56, 103, 82, 112];
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData('Speaking Parts');
-        const data2 = await PageObjects.visualize.getBarChartData('Max Speaking Parts');
+        const data = await PageObjects.visChart.getBarChartData('Speaking Parts');
+        const data2 = await PageObjects.visChart.getBarChartData('Max Speaking Parts');
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         log.debug('data2=' + data2);
diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
index b8fa253f72104..e52cfdf478c33 100644
--- a/test/functional/apps/visualize/_area_chart.js
+++ b/test/functional/apps/visualize/_area_chart.js
@@ -24,7 +24,14 @@ export default function({ getService, getPageObjects }) {
   const inspector = getService('inspector');
   const browser = getService('browser');
   const retry = getService('retry');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'settings', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'header',
+    'timePicker',
+  ]);
 
   describe('area charts', function indexPatternCreation() {
     const vizName1 = 'Visualization AreaChart Name Test';
@@ -38,17 +45,17 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Click X-axis');
-      await PageObjects.visualize.clickBucket('X-axis');
+      await PageObjects.visEditor.clickBucket('X-axis');
       log.debug('Click Date Histogram');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
       log.debug('Check field value');
-      const fieldValues = await PageObjects.visualize.getField();
+      const fieldValues = await PageObjects.visEditor.getField();
       log.debug('fieldValue = ' + fieldValues);
       expect(fieldValues[0]).to.be('@timestamp');
-      const intervalValue = await PageObjects.visualize.getInterval();
+      const intervalValue = await PageObjects.visEditor.getInterval();
       log.debug('intervalValue = ' + intervalValue);
       expect(intervalValue[0]).to.be('Auto');
-      return PageObjects.visualize.clickGo();
+      return PageObjects.visEditor.clickGo();
     };
 
     before(initAreaChart);
@@ -70,7 +77,7 @@ export default function({ getService, getPageObjects }) {
     it('should save and load', async function() {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -113,14 +120,14 @@ export default function({ getService, getPageObjects }) {
       ];
 
       await retry.try(async function tryingForTime() {
-        const labels = await PageObjects.visualize.getXAxisLabels();
+        const labels = await PageObjects.visChart.getXAxisLabels();
         log.debug('X-Axis labels = ' + labels);
         expect(labels).to.eql(xAxisLabels);
       });
-      const labels = await PageObjects.visualize.getYAxisLabels();
+      const labels = await PageObjects.visChart.getYAxisLabels();
       log.debug('Y-Axis labels = ' + labels);
       expect(labels).to.eql(yAxisLabels);
-      const paths = await PageObjects.visualize.getAreaChartData('Count');
+      const paths = await PageObjects.visChart.getAreaChartData('Count');
       log.debug('expectedAreaChartData = ' + expectedAreaChartData);
       log.debug('actual chart data =     ' + paths);
       expect(paths).to.eql(expectedAreaChartData);
@@ -185,9 +192,9 @@ export default function({ getService, getPageObjects }) {
           ['2015-09-20 19:00', '55'],
         ];
 
-        await PageObjects.visualize.toggleOpenEditor(2);
-        await PageObjects.visualize.setInterval('Second');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleOpenEditor(2);
+        await PageObjects.visEditor.setInterval('Second');
+        await PageObjects.visEditor.clickGo();
         await inspector.open();
         await inspector.expectTableData(expectedTableData);
         await inspector.close();
@@ -217,9 +224,9 @@ export default function({ getService, getPageObjects }) {
           ['2015-09-20 19:00', '0.015'],
         ];
 
-        await PageObjects.visualize.toggleAdvancedParams('2');
-        await PageObjects.visualize.toggleScaleMetrics();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleAdvancedParams('2');
+        await PageObjects.visEditor.toggleScaleMetrics();
+        await PageObjects.visEditor.clickGo();
         await inspector.open();
         await inspector.expectTableData(expectedTableData);
         await inspector.close();
@@ -249,11 +256,11 @@ export default function({ getService, getPageObjects }) {
           ['2015-09-20 19:00', '55', '2.053KB'],
         ];
 
-        await PageObjects.visualize.clickBucket('Y-axis', 'metrics');
-        await PageObjects.visualize.selectAggregation('Top Hit', 'metrics');
-        await PageObjects.visualize.selectField('bytes', 'metrics');
-        await PageObjects.visualize.selectAggregateWith('average');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Y-axis', 'metrics');
+        await PageObjects.visEditor.selectAggregation('Top Hit', 'metrics');
+        await PageObjects.visEditor.selectField('bytes', 'metrics');
+        await PageObjects.visEditor.selectAggregateWith('average');
+        await PageObjects.visEditor.clickGo();
         await inspector.open();
         await inspector.expectTableData(expectedTableData);
         await inspector.close();
@@ -285,13 +292,13 @@ export default function({ getService, getPageObjects }) {
       const axisId = 'ValueAxis-1';
 
       it('should show ticks on selecting log scale', async () => {
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions(axisId);
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'log');
-        await PageObjects.visualize.clickYAxisAdvancedOptions(axisId);
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
+        await PageObjects.visEditor.clickYAxisAdvancedOptions(axisId);
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -317,9 +324,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting log scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -345,10 +352,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'square root');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'square root');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '0',
           '200',
@@ -364,18 +371,18 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'linear');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'linear');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         log.debug(labels);
         const expectedLabels = [
           '0',
@@ -392,9 +399,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
@@ -412,16 +419,16 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch('long-window-logstash-*');
         await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
         log.debug('Click X-axis');
-        await PageObjects.visualize.clickBucket('X-axis');
+        await PageObjects.visEditor.clickBucket('X-axis');
         log.debug('Click Date Histogram');
-        await PageObjects.visualize.selectAggregation('Date Histogram');
-        await PageObjects.visualize.selectField('@timestamp');
-        await PageObjects.visualize.setInterval('Yearly');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.selectAggregation('Date Histogram');
+        await PageObjects.visEditor.selectField('@timestamp');
+        await PageObjects.visEditor.setInterval('Yearly');
+        await PageObjects.visEditor.clickGo();
         // This svg area is composed by 7 years (2013 - 2019).
         // 7 points are used to draw the upper line (usually called y1)
         // 7 points compose the lower line (usually called y0)
-        const paths = await PageObjects.visualize.getAreaChartPaths('Count');
+        const paths = await PageObjects.visChart.getAreaChartPaths('Count');
         log.debug('actual chart data =     ' + paths);
         const numberOfSegments = 7 * 2;
         expect(paths.length).to.eql(numberOfSegments);
@@ -435,17 +442,17 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch('long-window-logstash-*');
         await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
         log.debug('Click X-axis');
-        await PageObjects.visualize.clickBucket('X-axis');
+        await PageObjects.visEditor.clickBucket('X-axis');
         log.debug('Click Date Histogram');
-        await PageObjects.visualize.selectAggregation('Date Histogram');
-        await PageObjects.visualize.selectField('@timestamp');
-        await PageObjects.visualize.setInterval('Monthly');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.selectAggregation('Date Histogram');
+        await PageObjects.visEditor.selectField('@timestamp');
+        await PageObjects.visEditor.setInterval('Monthly');
+        await PageObjects.visEditor.clickGo();
         // This svg area is composed by 67 months 3 (2013) + 5 * 12 + 4 (2019)
         // 67 points are used to draw the upper line (usually called y1)
         // 67 points compose the lower line (usually called y0)
         const numberOfSegments = 67 * 2;
-        const paths = await PageObjects.visualize.getAreaChartPaths('Count');
+        const paths = await PageObjects.visChart.getAreaChartPaths('Count');
         log.debug('actual chart data =     ' + paths);
         expect(paths.length).to.eql(numberOfSegments);
       });
diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
index e8fe8fb656877..0a9ff1e77a2ef 100644
--- a/test/functional/apps/visualize/_data_table.js
+++ b/test/functional/apps/visualize/_data_table.js
@@ -22,9 +22,10 @@ import expect from '@kbn/expect';
 export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const inspector = getService('inspector');
+  const testSubjects = getService('testSubjects');
   const retry = getService('retry');
   const filterBar = getService('filterBar');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'timePicker', 'visEditor', 'visChart']);
 
   describe('data table', function indexPatternCreation() {
     const vizName1 = 'Visualization DataTable';
@@ -38,27 +39,27 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = Split rows');
-      await PageObjects.visualize.clickBucket('Split rows');
+      await PageObjects.visEditor.clickBucket('Split rows');
       log.debug('Aggregation = Histogram');
-      await PageObjects.visualize.selectAggregation('Histogram');
+      await PageObjects.visEditor.selectAggregation('Histogram');
       log.debug('Field = bytes');
-      await PageObjects.visualize.selectField('bytes');
+      await PageObjects.visEditor.selectField('bytes');
       log.debug('Interval = 2000');
-      await PageObjects.visualize.setNumericInterval('2000');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setInterval('2000', { type: 'numeric' });
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should allow applying changed params', async () => {
-      await PageObjects.visualize.setNumericInterval('1', { append: true });
-      const interval = await PageObjects.visualize.getNumericInterval();
+      await PageObjects.visEditor.setInterval('1', { type: 'numeric', append: true });
+      const interval = await PageObjects.visEditor.getNumericInterval();
       expect(interval).to.be('20001');
-      const isApplyButtonEnabled = await PageObjects.visualize.isApplyEnabled();
+      const isApplyButtonEnabled = await PageObjects.visEditor.isApplyEnabled();
       expect(isApplyButtonEnabled).to.be(true);
     });
 
     it('should allow reseting changed params', async () => {
-      await PageObjects.visualize.clickReset();
-      const interval = await PageObjects.visualize.getNumericInterval();
+      await PageObjects.visEditor.clickReset();
+      const interval = await PageObjects.visEditor.getNumericInterval();
       expect(interval).to.be('2000');
     });
 
@@ -66,7 +67,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -96,7 +97,7 @@ export default function({ getService, getPageObjects }) {
 
     it('should show percentage columns', async () => {
       async function expectValidTableData() {
-        const data = await PageObjects.visualize.getTableVisData();
+        const data = await PageObjects.visChart.getTableVisData();
         expect(data.trim().split('\n')).to.be.eql([
           '≥ 0 and < 1000',
           '1,351 64.7%',
@@ -110,16 +111,16 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Range');
-      await PageObjects.visualize.selectField('bytes');
-      await PageObjects.visualize.clickGo();
-      await PageObjects.visualize.clickOptionsTab();
-      await PageObjects.visualize.setSelectByOptionText(
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Range');
+      await PageObjects.visEditor.selectField('bytes');
+      await PageObjects.visEditor.clickGo();
+      await PageObjects.visEditor.clickOptionsTab();
+      await PageObjects.visEditor.setSelectByOptionText(
         'datatableVisualizationPercentageCol',
         'Count'
       );
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
 
       await expectValidTableData();
 
@@ -128,20 +129,20 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(SAVE_NAME);
 
       await PageObjects.visualize.loadSavedVisualization(SAVE_NAME);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
 
       await expectValidTableData();
 
       // check that it works after selecting a column that's deleted
-      await PageObjects.visualize.clickData();
-      await PageObjects.visualize.clickBucket('Metric', 'metrics');
-      await PageObjects.visualize.selectAggregation('Average', 'metrics');
-      await PageObjects.visualize.selectField('bytes', 'metrics');
-      await PageObjects.visualize.removeDimension(1);
-      await PageObjects.visualize.clickGo();
-      await PageObjects.visualize.clickOptionsTab();
-
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickDataTab();
+      await PageObjects.visEditor.clickBucket('Metric', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Average', 'metrics');
+      await PageObjects.visEditor.selectField('bytes', 'metrics');
+      await PageObjects.visEditor.removeDimension(1);
+      await PageObjects.visEditor.clickGo();
+      await PageObjects.visEditor.clickOptionsTab();
+
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql([
         '≥ 0 and < 1000',
         '344.094B',
@@ -155,12 +156,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickBucket('Metric', 'metrics');
-      await PageObjects.visualize.selectAggregation('Average Bucket', 'metrics');
-      await PageObjects.visualize.selectAggregation('Terms', 'metrics', 'buckets');
-      await PageObjects.visualize.selectField('geo.src', 'metrics', 'buckets');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Metric', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Average Bucket', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Terms', 'metrics', 'buckets');
+      await PageObjects.visEditor.selectField('geo.src', 'metrics', 'buckets');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       log.debug(data.split('\n'));
       expect(data.trim().split('\n')).to.be.eql(['14,004 1,412.6']);
     });
@@ -170,12 +171,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
-      await PageObjects.visualize.selectField('@timestamp');
-      await PageObjects.visualize.setInterval('Daily');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectField('@timestamp');
+      await PageObjects.visEditor.setInterval('Daily');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       log.debug(data.split('\n'));
       expect(data.trim().split('\n')).to.be.eql([
         '2015-09-20',
@@ -192,12 +193,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
-      await PageObjects.visualize.selectField('@timestamp');
-      await PageObjects.visualize.setInterval('Daily');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectField('@timestamp');
+      await PageObjects.visEditor.setInterval('Daily');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql([
         '2015-09-20',
         '4,757',
@@ -210,15 +211,15 @@ export default function({ getService, getPageObjects }) {
 
     it('should correctly filter for applied time filter on the main timefield', async () => {
       await filterBar.addFilter('@timestamp', 'is between', '2015-09-19', '2015-09-21');
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql(['2015-09-20', '4,757']);
     });
 
     it('should correctly filter for pinned filters', async () => {
       await filterBar.toggleFilterPinned('@timestamp');
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql(['2015-09-20', '4,757']);
     });
 
@@ -227,11 +228,11 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickMetricEditor();
-      await PageObjects.visualize.selectAggregation('Top Hit', 'metrics');
-      await PageObjects.visualize.selectField('agent.raw', 'metrics');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickMetricEditor();
+      await PageObjects.visEditor.selectAggregation('Top Hit', 'metrics');
+      await PageObjects.visEditor.selectField('agent.raw', 'metrics');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       log.debug(data);
       expect(data.length).to.be.greaterThan(0);
     });
@@ -241,11 +242,11 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickDataTable();
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Range');
-      await PageObjects.visualize.selectField('bytes');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Range');
+      await PageObjects.visEditor.selectField('bytes');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql([
         '≥ 0 and < 1000',
         '1,351',
@@ -260,19 +261,19 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickDataTable();
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('extension.raw');
-        await PageObjects.visualize.setSize(2);
-        await PageObjects.visualize.clickGo();
-
-        await PageObjects.visualize.toggleOtherBucket();
-        await PageObjects.visualize.toggleMissingBucket();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('extension.raw');
+        await PageObjects.visEditor.setSize(2);
+        await PageObjects.visEditor.clickGo();
+
+        await PageObjects.visEditor.toggleOtherBucket();
+        await PageObjects.visEditor.toggleMissingBucket();
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should show correct data', async () => {
-        const data = await PageObjects.visualize.getTableVisContent();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['jpg', '9,109'],
           ['css', '2,159'],
@@ -281,9 +282,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should apply correct filter', async () => {
-        await PageObjects.visualize.filterOnTableCell(1, 3);
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-        const data = await PageObjects.visualize.getTableVisContent();
+        await PageObjects.visChart.filterOnTableCell(1, 3);
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['png', '1,373'],
           ['gif', '918'],
@@ -298,20 +299,20 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickDataTable();
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('extension.raw');
-        await PageObjects.visualize.setSize(2);
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('geo.dest');
-        await PageObjects.visualize.toggleOpenEditor(3, 'false');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('extension.raw');
+        await PageObjects.visEditor.setSize(2);
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('geo.dest');
+        await PageObjects.visEditor.toggleOpenEditor(3, 'false');
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should show correct data without showMetricsAtAllLevels', async () => {
-        const data = await PageObjects.visualize.getTableVisContent();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['jpg', 'CN', '1,718'],
           ['jpg', 'IN', '1,511'],
@@ -327,10 +328,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show correct data without showMetricsAtAllLevels even if showPartialRows is selected', async () => {
-        await PageObjects.visualize.clickOptionsTab();
-        await PageObjects.visualize.checkCheckbox('showPartialRows');
-        await PageObjects.visualize.clickGo();
-        const data = await PageObjects.visualize.getTableVisContent();
+        await PageObjects.visEditor.clickOptionsTab();
+        await testSubjects.setCheckbox('showPartialRows', 'check');
+        await PageObjects.visEditor.clickGo();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['jpg', 'CN', '1,718'],
           ['jpg', 'IN', '1,511'],
@@ -346,10 +347,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show metrics on each level', async () => {
-        await PageObjects.visualize.clickOptionsTab();
-        await PageObjects.visualize.checkCheckbox('showMetricsAtAllLevels');
-        await PageObjects.visualize.clickGo();
-        const data = await PageObjects.visualize.getTableVisContent();
+        await PageObjects.visEditor.clickOptionsTab();
+        await testSubjects.setCheckbox('showMetricsAtAllLevels', 'check');
+        await PageObjects.visEditor.clickGo();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['jpg', '9,109', 'CN', '1,718'],
           ['jpg', '9,109', 'IN', '1,511'],
@@ -365,12 +366,12 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show metrics other than count on each level', async () => {
-        await PageObjects.visualize.clickData();
-        await PageObjects.visualize.clickBucket('Metric', 'metrics');
-        await PageObjects.visualize.selectAggregation('Average', 'metrics');
-        await PageObjects.visualize.selectField('bytes', 'metrics');
-        await PageObjects.visualize.clickGo();
-        const data = await PageObjects.visualize.getTableVisContent();
+        await PageObjects.visEditor.clickDataTab();
+        await PageObjects.visEditor.clickBucket('Metric', 'metrics');
+        await PageObjects.visEditor.selectAggregation('Average', 'metrics');
+        await PageObjects.visEditor.selectField('bytes', 'metrics');
+        await PageObjects.visEditor.clickGo();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           ['jpg', '9,109', '5.469KB', 'CN', '1,718', '5.477KB'],
           ['jpg', '9,109', '5.469KB', 'IN', '1,511', '5.456KB'],
@@ -392,26 +393,26 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickDataTable();
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await PageObjects.visualize.clickBucket('Split table');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('extension.raw');
-        await PageObjects.visualize.setSize(2);
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('geo.dest');
-        await PageObjects.visualize.setSize(3, 3);
-        await PageObjects.visualize.toggleOpenEditor(3, 'false');
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('geo.src');
-        await PageObjects.visualize.setSize(3, 4);
-        await PageObjects.visualize.toggleOpenEditor(4, 'false');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split table');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('extension.raw');
+        await PageObjects.visEditor.setSize(2);
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('geo.dest');
+        await PageObjects.visEditor.setSize(3, 3);
+        await PageObjects.visEditor.toggleOpenEditor(3, 'false');
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('geo.src');
+        await PageObjects.visEditor.setSize(3, 4);
+        await PageObjects.visEditor.toggleOpenEditor(4, 'false');
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should have a splitted table', async () => {
-        const data = await PageObjects.visualize.getTableVisContent();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           [
             ['CN', 'CN', '330'],
@@ -439,10 +440,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show metrics for split bucket when using showMetricsAtAllLevels', async () => {
-        await PageObjects.visualize.clickOptionsTab();
-        await PageObjects.visualize.checkCheckbox('showMetricsAtAllLevels');
-        await PageObjects.visualize.clickGo();
-        const data = await PageObjects.visualize.getTableVisContent();
+        await PageObjects.visEditor.clickOptionsTab();
+        await testSubjects.setCheckbox('showMetricsAtAllLevels', 'check');
+        await PageObjects.visEditor.clickGo();
+        const data = await PageObjects.visChart.getTableVisContent();
         expect(data).to.be.eql([
           [
             ['CN', '1,718', 'CN', '330'],
diff --git a/test/functional/apps/visualize/_data_table_nontimeindex.js b/test/functional/apps/visualize/_data_table_nontimeindex.js
index 77478f5d10edc..3db3cd094a81b 100644
--- a/test/functional/apps/visualize/_data_table_nontimeindex.js
+++ b/test/functional/apps/visualize/_data_table_nontimeindex.js
@@ -25,7 +25,7 @@ export default function({ getService, getPageObjects }) {
   const retry = getService('retry');
   const filterBar = getService('filterBar');
   const renderable = getService('renderable');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'header', 'visChart']);
 
   describe.skip('data table with index without time filter', function indexPatternCreation() {
     const vizName1 = 'Visualization DataTable without time filter';
@@ -40,27 +40,27 @@ export default function({ getService, getPageObjects }) {
         PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED
       );
       log.debug('Bucket = Split Rows');
-      await PageObjects.visualize.clickBucket('Split rows');
+      await PageObjects.visEditor.clickBucket('Split rows');
       log.debug('Aggregation = Histogram');
-      await PageObjects.visualize.selectAggregation('Histogram');
+      await PageObjects.visEditor.selectAggregation('Histogram');
       log.debug('Field = bytes');
-      await PageObjects.visualize.selectField('bytes');
+      await PageObjects.visEditor.selectField('bytes');
       log.debug('Interval = 2000');
-      await PageObjects.visualize.setNumericInterval('2000');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setInterval('2000', { type: 'numeric' });
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should allow applying changed params', async () => {
-      await PageObjects.visualize.setNumericInterval('1', { append: true });
-      const interval = await PageObjects.visualize.getNumericInterval();
+      await PageObjects.visEditor.setInterval('1', { type: 'numeric', append: true });
+      const interval = await PageObjects.visEditor.getNumericInterval();
       expect(interval).to.be('20001');
-      const isApplyButtonEnabled = await PageObjects.visualize.isApplyEnabled();
+      const isApplyButtonEnabled = await PageObjects.visEditor.isApplyEnabled();
       expect(isApplyButtonEnabled).to.be(true);
     });
 
     it('should allow reseting changed params', async () => {
-      await PageObjects.visualize.clickReset();
-      const interval = await PageObjects.visualize.getNumericInterval();
+      await PageObjects.visEditor.clickReset();
+      const interval = await PageObjects.visEditor.getNumericInterval();
       expect(interval).to.be('2000');
     });
 
@@ -68,7 +68,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -102,12 +102,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch(
         PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED
       );
-      await PageObjects.visualize.clickBucket('Metric', 'metrics');
-      await PageObjects.visualize.selectAggregation('Average Bucket', 'metrics');
-      await PageObjects.visualize.selectAggregation('Terms', 'metrics', 'buckets');
-      await PageObjects.visualize.selectField('geo.src', 'metrics', 'buckets');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Metric', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Average Bucket', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Terms', 'metrics', 'buckets');
+      await PageObjects.visEditor.selectField('geo.src', 'metrics', 'buckets');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       log.debug(data.split('\n'));
       expect(data.trim().split('\n')).to.be.eql(['14,004 1,412.6']);
     });
@@ -118,12 +118,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch(
         PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED
       );
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
-      await PageObjects.visualize.selectField('@timestamp');
-      await PageObjects.visualize.setInterval('Daily');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectField('@timestamp');
+      await PageObjects.visEditor.setInterval('Daily');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       log.debug(data.split('\n'));
       expect(data.trim().split('\n')).to.be.eql([
         '2015-09-20',
@@ -141,12 +141,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch(
         PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED
       );
-      await PageObjects.visualize.clickBucket('Split rows');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
-      await PageObjects.visualize.selectField('@timestamp');
-      await PageObjects.visualize.setInterval('Daily');
-      await PageObjects.visualize.clickGo();
-      const data = await PageObjects.visualize.getTableVisData();
+      await PageObjects.visEditor.clickBucket('Split rows');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectField('@timestamp');
+      await PageObjects.visEditor.setInterval('Daily');
+      await PageObjects.visEditor.clickGo();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql([
         '2015-09-20',
         '4,757',
@@ -161,7 +161,7 @@ export default function({ getService, getPageObjects }) {
       await filterBar.addFilter('@timestamp', 'is between', '2015-09-19', '2015-09-21');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await renderable.waitForRender();
-      const data = await PageObjects.visualize.getTableVisData();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql(['2015-09-20', '4,757']);
     });
 
@@ -169,7 +169,7 @@ export default function({ getService, getPageObjects }) {
       await filterBar.toggleFilterPinned('@timestamp');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await renderable.waitForRender();
-      const data = await PageObjects.visualize.getTableVisData();
+      const data = await PageObjects.visChart.getTableVisData();
       expect(data.trim().split('\n')).to.be.eql(['2015-09-20', '4,757']);
     });
   });
diff --git a/test/functional/apps/visualize/_embedding_chart.js b/test/functional/apps/visualize/_embedding_chart.js
index c16dc3b1279ff..940aa3eb5d462 100644
--- a/test/functional/apps/visualize/_embedding_chart.js
+++ b/test/functional/apps/visualize/_embedding_chart.js
@@ -24,7 +24,13 @@ export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const renderable = getService('renderable');
   const embedding = getService('embedding');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'visualize',
+    'visEditor',
+    'visChart',
+    'header',
+    'timePicker',
+  ]);
 
   describe('embedding', () => {
     describe('a data table', () => {
@@ -33,22 +39,22 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickDataTable();
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Date Histogram');
-        await PageObjects.visualize.selectField('@timestamp');
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split rows');
-        await PageObjects.visualize.selectAggregation('Histogram');
-        await PageObjects.visualize.selectField('bytes');
-        await PageObjects.visualize.setNumericInterval('2000', undefined, 3);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Date Histogram');
+        await PageObjects.visEditor.selectField('@timestamp');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split rows');
+        await PageObjects.visEditor.selectAggregation('Histogram');
+        await PageObjects.visEditor.selectField('bytes');
+        await PageObjects.visEditor.setInterval('2000', { type: 'numeric', aggNth: 3 });
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should allow opening table vis in embedded mode', async () => {
         await embedding.openInEmbeddedMode();
         await renderable.waitForRender();
 
-        const data = await PageObjects.visualize.getTableVisData();
+        const data = await PageObjects.visChart.getTableVisData();
         log.debug(data.split('\n'));
         expect(data.trim().split('\n')).to.be.eql([
           '2015-09-20 00:00',
@@ -89,7 +95,7 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
 
-        const data = await PageObjects.visualize.getTableVisData();
+        const data = await PageObjects.visChart.getTableVisData();
         log.debug(data.split('\n'));
         expect(data.trim().split('\n')).to.be.eql([
           '2015-09-21 00:00',
@@ -126,11 +132,11 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should allow to change timerange from the visualization in embedded mode', async () => {
-        await PageObjects.visualize.filterOnTableCell(1, 7);
+        await PageObjects.visChart.filterOnTableCell(1, 7);
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
 
-        const data = await PageObjects.visualize.getTableVisData();
+        const data = await PageObjects.visChart.getTableVisData();
         log.debug(data.split('\n'));
         expect(data.trim().split('\n')).to.be.eql([
           '03:00',
diff --git a/test/functional/apps/visualize/_experimental_vis.js b/test/functional/apps/visualize/_experimental_vis.js
index ae364244b4f5c..2ce15cf913eff 100644
--- a/test/functional/apps/visualize/_experimental_vis.js
+++ b/test/functional/apps/visualize/_experimental_vis.js
@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default ({ getService, getPageObjects }) => {
   const log = getService('log');
-  const PageObjects = getPageObjects(['common', 'visualize']);
+  const PageObjects = getPageObjects(['visualize']);
 
   describe('visualize app', function() {
     this.tags('smoke');
diff --git a/test/functional/apps/visualize/_gauge_chart.js b/test/functional/apps/visualize/_gauge_chart.js
index 2b9033d1ae9d2..7ebb4548f967b 100644
--- a/test/functional/apps/visualize/_gauge_chart.js
+++ b/test/functional/apps/visualize/_gauge_chart.js
@@ -24,7 +24,7 @@ export default function({ getService, getPageObjects }) {
   const retry = getService('retry');
   const inspector = getService('inspector');
   const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   // FLAKY: https://github.com/elastic/kibana/issues/45089
   describe('gauge chart', function indexPatternCreation() {
@@ -50,24 +50,24 @@ export default function({ getService, getPageObjects }) {
 
       // initial metric of "Count" is selected by default
       return retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getGaugeValue();
+        const metricValue = await PageObjects.visChart.getGaugeValue();
         expect(expectedCount).to.eql(metricValue);
       });
     });
 
     it('should show Split Gauges', async function() {
       log.debug('Bucket = Split Group');
-      await PageObjects.visualize.clickBucket('Split group');
+      await PageObjects.visEditor.clickBucket('Split group');
       log.debug('Aggregation = Terms');
-      await PageObjects.visualize.selectAggregation('Terms');
+      await PageObjects.visEditor.selectAggregation('Terms');
       log.debug('Field = machine.os.raw');
-      await PageObjects.visualize.selectField('machine.os.raw');
+      await PageObjects.visEditor.selectField('machine.os.raw');
       log.debug('Size = 4');
-      await PageObjects.visualize.setSize('4');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setSize('4');
+      await PageObjects.visEditor.clickGo();
 
       await retry.try(async () => {
-        expect(await PageObjects.visualize.getGaugeValue()).to.eql([
+        expect(await PageObjects.visChart.getGaugeValue()).to.eql([
           '2,904',
           'win 8',
           '2,858',
@@ -83,34 +83,34 @@ export default function({ getService, getPageObjects }) {
     it('should show correct values for fields with fieldFormatters', async function() {
       const expectedTexts = ['2,904', 'win 8: Count', '0B', 'win 8: Min bytes'];
 
-      await PageObjects.visualize.selectAggregation('Terms');
-      await PageObjects.visualize.selectField('machine.os.raw');
-      await PageObjects.visualize.setSize('1');
-      await PageObjects.visualize.clickBucket('Metric', 'metrics');
-      await PageObjects.visualize.selectAggregation('Min', 'metrics');
-      await PageObjects.visualize.selectField('bytes', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectAggregation('Terms');
+      await PageObjects.visEditor.selectField('machine.os.raw');
+      await PageObjects.visEditor.setSize('1');
+      await PageObjects.visEditor.clickBucket('Metric', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Min', 'metrics');
+      await PageObjects.visEditor.selectField('bytes', 'metrics');
+      await PageObjects.visEditor.clickGo();
 
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getGaugeValue();
+        const metricValue = await PageObjects.visChart.getGaugeValue();
         expect(expectedTexts).to.eql(metricValue);
       });
     });
 
     it('should format the metric correctly in percentage mode', async function() {
       await initGaugeVis();
-      await PageObjects.visualize.clickMetricEditor();
-      await PageObjects.visualize.selectAggregation('Average', 'metrics');
-      await PageObjects.visualize.selectField('bytes', 'metrics');
-      await PageObjects.visualize.clickOptionsTab();
+      await PageObjects.visEditor.clickMetricEditor();
+      await PageObjects.visEditor.selectAggregation('Average', 'metrics');
+      await PageObjects.visEditor.selectField('bytes', 'metrics');
+      await PageObjects.visEditor.clickOptionsTab();
       await testSubjects.setValue('gaugeColorRange2__to', '10000');
       await testSubjects.click('gaugePercentageMode');
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+      await PageObjects.visEditor.clickGo();
 
       await retry.try(async function tryingForTime() {
         const expectedTexts = ['57.273%', 'Average bytes'];
-        const metricValue = await PageObjects.visualize.getGaugeValue();
+        const metricValue = await PageObjects.visChart.getGaugeValue();
         expect(expectedTexts).to.eql(metricValue);
       });
     });
diff --git a/test/functional/apps/visualize/_heatmap_chart.js b/test/functional/apps/visualize/_heatmap_chart.js
index 226e490a6b232..2cea861d0f64d 100644
--- a/test/functional/apps/visualize/_heatmap_chart.js
+++ b/test/functional/apps/visualize/_heatmap_chart.js
@@ -22,7 +22,7 @@ import expect from '@kbn/expect';
 export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const inspector = getService('inspector');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   describe('heatmap chart', function indexPatternCreation() {
     this.tags('smoke');
@@ -36,20 +36,20 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = X-Axis');
-      await PageObjects.visualize.clickBucket('X-axis');
+      await PageObjects.visEditor.clickBucket('X-axis');
       log.debug('Aggregation = Date Histogram');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
       log.debug('Field = @timestamp');
-      await PageObjects.visualize.selectField('@timestamp');
+      await PageObjects.visEditor.selectField('@timestamp');
       // leaving Interval set to Auto
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should save and load', async function() {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -87,16 +87,16 @@ export default function({ getService, getPageObjects }) {
     });
 
     it('should show 4 color ranges as default colorNumbers param', async function() {
-      const legends = await PageObjects.visualize.getLegendEntries();
+      const legends = await PageObjects.visChart.getLegendEntries();
       const expectedLegends = ['0 - 400', '400 - 800', '800 - 1,200', '1,200 - 1,600'];
       expect(legends).to.eql(expectedLegends);
     });
 
     it('should show 6 color ranges if changed on options', async function() {
-      await PageObjects.visualize.clickOptionsTab();
-      await PageObjects.visualize.changeHeatmapColorNumbers(6);
-      await PageObjects.visualize.clickGo();
-      const legends = await PageObjects.visualize.getLegendEntries();
+      await PageObjects.visEditor.clickOptionsTab();
+      await PageObjects.visEditor.changeHeatmapColorNumbers(6);
+      await PageObjects.visEditor.clickGo();
+      const legends = await PageObjects.visChart.getLegendEntries();
       const expectedLegends = [
         '0 - 267',
         '267 - 534',
@@ -108,23 +108,23 @@ export default function({ getService, getPageObjects }) {
       expect(legends).to.eql(expectedLegends);
     });
     it('should show 6 custom color ranges', async function() {
-      await PageObjects.visualize.clickOptionsTab();
-      await PageObjects.visualize.clickEnableCustomRanges();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
-      await PageObjects.visualize.clickAddRange();
+      await PageObjects.visEditor.clickOptionsTab();
+      await PageObjects.visEditor.clickEnableCustomRanges();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
+      await PageObjects.visEditor.clickAddRange();
 
       log.debug('customize 2 last ranges');
-      await PageObjects.visualize.setCustomRangeByIndex(6, '650', '720');
-      await PageObjects.visualize.setCustomRangeByIndex(7, '800', '905');
+      await PageObjects.visEditor.setCustomRangeByIndex(6, '650', '720');
+      await PageObjects.visEditor.setCustomRangeByIndex(7, '800', '905');
 
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-      await PageObjects.visualize.clickGo();
-      const legends = await PageObjects.visualize.getLegendEntries();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+      await PageObjects.visEditor.clickGo();
+      const legends = await PageObjects.visChart.getLegendEntries();
       const expectedLegends = [
         '0 - 100',
         '100 - 200',
diff --git a/test/functional/apps/visualize/_histogram_request_start.js b/test/functional/apps/visualize/_histogram_request_start.js
index a601e370a568f..a74fa8856a3b3 100644
--- a/test/functional/apps/visualize/_histogram_request_start.js
+++ b/test/functional/apps/visualize/_histogram_request_start.js
@@ -22,7 +22,13 @@ import expect from '@kbn/expect';
 export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'timePicker',
+  ]);
 
   describe('histogram agg onSearchRequestStart', function() {
     before(async function() {
@@ -33,21 +39,21 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = Split Rows');
-      await PageObjects.visualize.clickBucket('Split rows');
+      await PageObjects.visEditor.clickBucket('Split rows');
       log.debug('Aggregation = Histogram');
-      await PageObjects.visualize.selectAggregation('Histogram');
+      await PageObjects.visEditor.selectAggregation('Histogram');
       log.debug('Field = machine.ram');
-      await PageObjects.visualize.selectField('machine.ram');
+      await PageObjects.visEditor.selectField('machine.ram');
     });
 
     describe('interval parameter uses autoBounds', function() {
       it('should use provided value when number of generated buckets is less than histogram:maxBars', async function() {
         const providedInterval = 2400000000;
         log.debug(`Interval = ${providedInterval}`);
-        await PageObjects.visualize.setNumericInterval(providedInterval);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.setInterval(providedInterval, { type: 'numeric' });
+        await PageObjects.visEditor.clickGo();
         await retry.try(async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           const dataArray = data.replace(/,/g, '').split('\n');
           expect(dataArray.length).to.eql(20);
           const bucketStart = parseInt(dataArray[0], 10);
@@ -60,11 +66,11 @@ export default function({ getService, getPageObjects }) {
       it('should scale value to round number when number of generated buckets is greater than histogram:maxBars', async function() {
         const providedInterval = 100;
         log.debug(`Interval = ${providedInterval}`);
-        await PageObjects.visualize.setNumericInterval(providedInterval);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.setInterval(providedInterval, { type: 'numeric' });
+        await PageObjects.visEditor.clickGo();
         await PageObjects.common.sleep(1000); //fix this
         await retry.try(async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           const dataArray = data.replace(/,/g, '').split('\n');
           expect(dataArray.length).to.eql(20);
           const bucketStart = parseInt(dataArray[0], 10);
diff --git a/test/functional/apps/visualize/_inspector.js b/test/functional/apps/visualize/_inspector.js
index 76b75f62b5f2a..84f955d9c7879 100644
--- a/test/functional/apps/visualize/_inspector.js
+++ b/test/functional/apps/visualize/_inspector.js
@@ -21,7 +21,7 @@ export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const inspector = getService('inspector');
   const filterBar = getService('filterBar');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   describe('inspector', function describeIndexTests() {
     this.tags('smoke');
@@ -39,10 +39,10 @@ export default function({ getService, getPageObjects }) {
         await inspector.expectTableHeaders(['Count']);
 
         log.debug('Add Average Metric on machine.ram field');
-        await PageObjects.visualize.clickBucket('Y-axis', 'metrics');
-        await PageObjects.visualize.selectAggregation('Average', 'metrics');
-        await PageObjects.visualize.selectField('machine.ram', 'metrics');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Y-axis', 'metrics');
+        await PageObjects.visEditor.selectAggregation('Average', 'metrics');
+        await PageObjects.visEditor.selectField('machine.ram', 'metrics');
+        await PageObjects.visEditor.clickGo();
         await inspector.open();
         await inspector.expectTableHeaders(['Count', 'Average machine.ram']);
       });
@@ -50,23 +50,23 @@ export default function({ getService, getPageObjects }) {
       describe('filtering on inspector table values', function() {
         before(async function() {
           log.debug('Add X-axis terms agg on machine.os.raw');
-          await PageObjects.visualize.clickBucket('X-axis');
-          await PageObjects.visualize.selectAggregation('Terms');
-          await PageObjects.visualize.selectField('machine.os.raw');
-          await PageObjects.visualize.setSize(2);
-          await PageObjects.visualize.toggleOtherBucket(3);
-          await PageObjects.visualize.clickGo();
+          await PageObjects.visEditor.clickBucket('X-axis');
+          await PageObjects.visEditor.selectAggregation('Terms');
+          await PageObjects.visEditor.selectField('machine.os.raw');
+          await PageObjects.visEditor.setSize(2);
+          await PageObjects.visEditor.toggleOtherBucket(3);
+          await PageObjects.visEditor.clickGo();
         });
 
         beforeEach(async function() {
           await inspector.open();
-          await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+          await PageObjects.visChart.waitForVisualizationRenderingStabilized();
         });
 
         afterEach(async function() {
           await inspector.close();
           await filterBar.removeFilter('machine.os.raw');
-          await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+          await PageObjects.visChart.waitForVisualizationRenderingStabilized();
         });
 
         it('should allow filtering for values', async function() {
diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js
index 6a0a21e76924d..becf66f0fd5b1 100644
--- a/test/functional/apps/visualize/_line_chart.js
+++ b/test/functional/apps/visualize/_line_chart.js
@@ -24,7 +24,13 @@ export default function({ getService, getPageObjects }) {
   const inspector = getService('inspector');
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'timePicker',
+  ]);
 
   describe('line charts', function() {
     const vizName1 = 'Visualization LineChart';
@@ -37,14 +43,14 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = Split chart');
-      await PageObjects.visualize.clickBucket('Split chart');
+      await PageObjects.visEditor.clickBucket('Split chart');
       log.debug('Aggregation = Terms');
-      await PageObjects.visualize.selectAggregation('Terms');
+      await PageObjects.visEditor.selectAggregation('Terms');
       log.debug('Field = extension');
-      await PageObjects.visualize.selectField('extension.raw');
+      await PageObjects.visEditor.selectField('extension.raw');
       log.debug('switch from Rows to Columns');
-      await PageObjects.visualize.clickSplitDirection('Columns');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickSplitDirection('Columns');
+      await PageObjects.visEditor.clickGo();
     };
 
     before(initLineChart);
@@ -60,7 +66,7 @@ export default function({ getService, getPageObjects }) {
 
       // sleep a bit before trying to get the chart data
       await PageObjects.common.sleep(3000);
-      const data = await PageObjects.visualize.getLineChartData();
+      const data = await PageObjects.visChart.getLineChartData();
       log.debug('data=' + data);
       const tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
       for (let x = 0; x < data.length; x++) {
@@ -91,10 +97,10 @@ export default function({ getService, getPageObjects }) {
       const expectedChartData = ['png 1,373', 'php 445', 'jpg 9,109', 'gif 918', 'css 2,159'];
 
       log.debug('Order By = Term');
-      await PageObjects.visualize.selectOrderByMetric(2, '_key');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectOrderByMetric(2, '_key');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function() {
-        const data = await PageObjects.visualize.getLineChartData();
+        const data = await PageObjects.visChart.getLineChartData();
         log.debug('data=' + data);
         const tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
         for (let x = 0; x < data.length; x++) {
@@ -172,7 +178,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     describe.skip('switch between Y axis scale types', () => {
@@ -180,13 +186,13 @@ export default function({ getService, getPageObjects }) {
       const axisId = 'ValueAxis-1';
 
       it('should show ticks on selecting log scale', async () => {
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions(axisId);
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'log');
-        await PageObjects.visualize.clickYAxisAdvancedOptions(axisId);
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
+        await PageObjects.visEditor.clickYAxisAdvancedOptions(axisId);
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -212,9 +218,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting log scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -240,36 +246,36 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'square root');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'square root');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['0', '2,000', '4,000', '6,000', '8,000', '10,000'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show filtered ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['2,000', '4,000', '6,000', '8,000'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'linear');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'linear');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         log.debug(labels);
         const expectedLabels = ['0', '2,000', '4,000', '6,000', '8,000', '10,000'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show filtered ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['2,000', '4,000', '6,000', '8,000'];
         expect(labels).to.eql(expectedLabels);
       });
diff --git a/test/functional/apps/visualize/_linked_saved_searches.js b/test/functional/apps/visualize/_linked_saved_searches.js
index 9bbe8c9d2147c..37ec3f06f2ecd 100644
--- a/test/functional/apps/visualize/_linked_saved_searches.js
+++ b/test/functional/apps/visualize/_linked_saved_searches.js
@@ -22,7 +22,14 @@ import expect from '@kbn/expect';
 export default function({ getService, getPageObjects }) {
   const filterBar = getService('filterBar');
   const retry = getService('retry');
-  const PageObjects = getPageObjects(['common', 'discover', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'discover',
+    'visualize',
+    'header',
+    'timePicker',
+    'visChart',
+  ]);
 
   describe('visualize app', function describeIndexTests() {
     describe('linked saved searched', () => {
@@ -43,7 +50,7 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickSavedSearch(savedSearchName);
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         await retry.waitFor('wait for count to equal 9,109', async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           return data.trim() === '9,109';
         });
       });
@@ -54,7 +61,7 @@ export default function({ getService, getPageObjects }) {
           'Sep 21, 2015 @ 10:00:00.000'
         );
         await retry.waitFor('wait for count to equal 3,950', async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           return data.trim() === '3,950';
         });
       });
@@ -63,7 +70,7 @@ export default function({ getService, getPageObjects }) {
         await filterBar.addFilter('bytes', 'is between', '100', '3000');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await retry.waitFor('wait for count to equal 707', async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           return data.trim() === '707';
         });
       });
@@ -71,7 +78,7 @@ export default function({ getService, getPageObjects }) {
       it('should allow unlinking from a linked search', async () => {
         await PageObjects.visualize.clickUnlinkSavedSearch();
         await retry.waitFor('wait for count to equal 707', async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           return data.trim() === '707';
         });
         // The filter on the saved search should now be in the editor
@@ -82,7 +89,7 @@ export default function({ getService, getPageObjects }) {
         await filterBar.toggleFilterEnabled('extension.raw');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await retry.waitFor('wait for count to equal 1,293', async () => {
-          const unfilteredData = await PageObjects.visualize.getTableVisData();
+          const unfilteredData = await PageObjects.visChart.getTableVisData();
           return unfilteredData.trim() === '1,293';
         });
       });
@@ -91,7 +98,7 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.saveVisualizationExpectSuccess('Unlinked before saved');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await retry.waitFor('wait for count to equal 1,293', async () => {
-          const data = await PageObjects.visualize.getTableVisData();
+          const data = await PageObjects.visChart.getTableVisData();
           return data.trim() === '1,293';
         });
       });
diff --git a/test/functional/apps/visualize/_markdown_vis.js b/test/functional/apps/visualize/_markdown_vis.js
index 870c465f2de37..51c03c90f507b 100644
--- a/test/functional/apps/visualize/_markdown_vis.js
+++ b/test/functional/apps/visualize/_markdown_vis.js
@@ -20,7 +20,7 @@
 import expect from '@kbn/expect';
 
 export default function({ getPageObjects, getService }) {
-  const PageObjects = getPageObjects(['common', 'visualize', 'header']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'header']);
   const find = getService('find');
   const inspector = getService('inspector');
   const markdown = `
@@ -33,8 +33,8 @@ export default function({ getPageObjects, getService }) {
     before(async function() {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickMarkdownWidget();
-      await PageObjects.visualize.setMarkdownTxt(markdown);
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setMarkdownTxt(markdown);
+      await PageObjects.visEditor.clickGo();
     });
 
     describe('markdown vis', () => {
@@ -43,29 +43,29 @@ export default function({ getPageObjects, getService }) {
       });
 
       it('should render markdown as html', async function() {
-        const h1Txt = await PageObjects.visualize.getMarkdownBodyDescendentText('h1');
+        const h1Txt = await PageObjects.visChart.getMarkdownBodyDescendentText('h1');
         expect(h1Txt).to.equal('Heading 1');
       });
 
       it('should not render html in markdown as html', async function() {
         const expected = 'Heading 1\n<h3>Inline HTML that should not be rendered as html</h3>';
-        const actual = await PageObjects.visualize.getMarkdownText();
+        const actual = await PageObjects.visChart.getMarkdownText();
         expect(actual).to.equal(expected);
       });
 
       it('should auto apply changes if auto mode is turned on', async function() {
         const markdown2 = '## Heading 2';
-        await PageObjects.visualize.toggleAutoMode();
-        await PageObjects.visualize.setMarkdownTxt(markdown2);
+        await PageObjects.visEditor.toggleAutoMode();
+        await PageObjects.visEditor.setMarkdownTxt(markdown2);
         await PageObjects.header.waitUntilLoadingHasFinished();
-        const h1Txt = await PageObjects.visualize.getMarkdownBodyDescendentText('h2');
+        const h1Txt = await PageObjects.visChart.getMarkdownBodyDescendentText('h2');
         expect(h1Txt).to.equal('Heading 2');
       });
 
       it('should resize the editor', async function() {
         const editorSidebar = await find.byCssSelector('.visEditor__sidebar');
         const initialSize = await editorSidebar.getSize();
-        await PageObjects.visualize.sizeUpEditor();
+        await PageObjects.visEditor.sizeUpEditor();
         const afterSize = await editorSidebar.getSize();
         expect(afterSize.width).to.be.greaterThan(initialSize.width);
       });
diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js
index 31140a1718cfe..6a95f7553943c 100644
--- a/test/functional/apps/visualize/_metric_chart.js
+++ b/test/functional/apps/visualize/_metric_chart.js
@@ -24,7 +24,7 @@ export default function({ getService, getPageObjects }) {
   const retry = getService('retry');
   const filterBar = getService('filterBar');
   const inspector = getService('inspector');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   describe('metric chart', function() {
     before(async function() {
@@ -45,21 +45,21 @@ export default function({ getService, getPageObjects }) {
 
       // initial metric of "Count" is selected by default
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(expectedCount).to.eql(metricValue);
       });
     });
 
     it('should show Average', async function() {
       const avgMachineRam = ['13,104,036,080.615', 'Average machine.ram'];
-      await PageObjects.visualize.clickMetricEditor();
+      await PageObjects.visEditor.clickMetricEditor();
       log.debug('Aggregation = Average');
-      await PageObjects.visualize.selectAggregation('Average', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Average', 'metrics');
       log.debug('Field = machine.ram');
-      await PageObjects.visualize.selectField('machine.ram', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('machine.ram', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(avgMachineRam).to.eql(metricValue);
       });
     });
@@ -67,12 +67,12 @@ export default function({ getService, getPageObjects }) {
     it('should show Sum', async function() {
       const sumPhpMemory = ['85,865,880', 'Sum of phpmemory'];
       log.debug('Aggregation = Sum');
-      await PageObjects.visualize.selectAggregation('Sum', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Sum', 'metrics');
       log.debug('Field = phpmemory');
-      await PageObjects.visualize.selectField('phpmemory', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('phpmemory', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(sumPhpMemory).to.eql(metricValue);
       });
     });
@@ -81,12 +81,12 @@ export default function({ getService, getPageObjects }) {
       const medianBytes = ['5,565.263', '50th percentile of bytes'];
       //  For now, only comparing the text label part of the metric
       log.debug('Aggregation = Median');
-      await PageObjects.visualize.selectAggregation('Median', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Median', 'metrics');
       log.debug('Field = bytes');
-      await PageObjects.visualize.selectField('bytes', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('bytes', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         // only comparing the text label!
         expect(medianBytes[1]).to.eql(metricValue[1]);
       });
@@ -95,12 +95,12 @@ export default function({ getService, getPageObjects }) {
     it('should show Min', async function() {
       const minTimestamp = ['Sep 20, 2015 @ 00:00:00.000', 'Min @timestamp'];
       log.debug('Aggregation = Min');
-      await PageObjects.visualize.selectAggregation('Min', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Min', 'metrics');
       log.debug('Field = @timestamp');
-      await PageObjects.visualize.selectField('@timestamp', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('@timestamp', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(minTimestamp).to.eql(metricValue);
       });
     });
@@ -111,12 +111,12 @@ export default function({ getService, getPageObjects }) {
         'Max relatedContent.article:modified_time',
       ];
       log.debug('Aggregation = Max');
-      await PageObjects.visualize.selectAggregation('Max', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Max', 'metrics');
       log.debug('Field = relatedContent.article:modified_time');
-      await PageObjects.visualize.selectField('relatedContent.article:modified_time', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('relatedContent.article:modified_time', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(maxRelatedContentArticleModifiedTime).to.eql(metricValue);
       });
     });
@@ -124,12 +124,12 @@ export default function({ getService, getPageObjects }) {
     it('should show Unique Count', async function() {
       const uniqueCountClientip = ['1,000', 'Unique count of clientip'];
       log.debug('Aggregation = Unique Count');
-      await PageObjects.visualize.selectAggregation('Unique Count', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Unique Count', 'metrics');
       log.debug('Field = clientip');
-      await PageObjects.visualize.selectField('clientip', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('clientip', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(uniqueCountClientip).to.eql(metricValue);
       });
     });
@@ -153,12 +153,12 @@ export default function({ getService, getPageObjects }) {
       ];
 
       log.debug('Aggregation = Percentiles');
-      await PageObjects.visualize.selectAggregation('Percentiles', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Percentiles', 'metrics');
       log.debug('Field =  machine.ram');
-      await PageObjects.visualize.selectField('machine.ram', 'metrics');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('machine.ram', 'metrics');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(percentileMachineRam).to.eql(metricValue);
       });
     });
@@ -166,14 +166,14 @@ export default function({ getService, getPageObjects }) {
     it('should show Percentile Ranks', async function() {
       const percentileRankBytes = ['2.036%', 'Percentile rank 99 of "memory"'];
       log.debug('Aggregation = Percentile Ranks');
-      await PageObjects.visualize.selectAggregation('Percentile Ranks', 'metrics');
+      await PageObjects.visEditor.selectAggregation('Percentile Ranks', 'metrics');
       log.debug('Field =  bytes');
-      await PageObjects.visualize.selectField('memory', 'metrics');
+      await PageObjects.visEditor.selectField('memory', 'metrics');
       log.debug('Values =  99');
-      await PageObjects.visualize.setValue('99');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setValue('99');
+      await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
-        const metricValue = await PageObjects.visualize.getMetric();
+        const metricValue = await PageObjects.visChart.getMetric();
         expect(percentileRankBytes).to.eql(metricValue);
       });
     });
@@ -183,7 +183,7 @@ export default function({ getService, getPageObjects }) {
         let filterCount = 0;
         await retry.try(async function tryingForTime() {
           // click first metric bucket
-          await PageObjects.visualize.clickMetricByIndex(0);
+          await PageObjects.visEditor.clickMetricByIndex(0);
           filterCount = await filterBar.getFilterCount();
         });
         expect(filterCount).to.equal(0);
@@ -191,17 +191,17 @@ export default function({ getService, getPageObjects }) {
 
       it('should allow filtering with buckets', async function() {
         log.debug('Bucket = Split Group');
-        await PageObjects.visualize.clickBucket('Split group');
+        await PageObjects.visEditor.clickBucket('Split group');
         log.debug('Aggregation = Terms');
-        await PageObjects.visualize.selectAggregation('Terms');
+        await PageObjects.visEditor.selectAggregation('Terms');
         log.debug('Field = machine.os.raw');
-        await PageObjects.visualize.selectField('machine.os.raw');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.selectField('machine.os.raw');
+        await PageObjects.visEditor.clickGo();
 
         let filterCount = 0;
         await retry.try(async function tryingForTime() {
           // click first metric bucket
-          await PageObjects.visualize.clickMetricByIndex(0);
+          await PageObjects.visEditor.clickMetricByIndex(0);
           filterCount = await filterBar.getFilterCount();
         });
         await filterBar.removeAllFilters();
diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js
index 03067bb2182c5..313a4e39e5030 100644
--- a/test/functional/apps/visualize/_pie_chart.js
+++ b/test/functional/apps/visualize/_pie_chart.js
@@ -24,7 +24,14 @@ export default function({ getService, getPageObjects }) {
   const filterBar = getService('filterBar');
   const pieChart = getService('pieChart');
   const inspector = getService('inspector');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'settings', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'header',
+    'timePicker',
+  ]);
 
   describe('pie chart', function() {
     const vizName1 = 'Visualization PieChart';
@@ -36,24 +43,24 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('select bucket Split slices');
-      await PageObjects.visualize.clickBucket('Split slices');
+      await PageObjects.visEditor.clickBucket('Split slices');
       log.debug('Click aggregation Histogram');
-      await PageObjects.visualize.selectAggregation('Histogram');
+      await PageObjects.visEditor.selectAggregation('Histogram');
       log.debug('Click field memory');
-      await PageObjects.visualize.selectField('memory');
+      await PageObjects.visEditor.selectField('memory');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.common.sleep(1003);
       log.debug('setNumericInterval 4000');
-      await PageObjects.visualize.setNumericInterval('40000');
+      await PageObjects.visEditor.setInterval('40000', { type: 'numeric' });
       log.debug('clickGo');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should save and load', async function() {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -93,15 +100,15 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
+        await PageObjects.visEditor.clickBucket('Split slices');
         log.debug('Click aggregation Terms');
-        await PageObjects.visualize.selectAggregation('Terms');
+        await PageObjects.visEditor.selectAggregation('Terms');
         log.debug('Click field machine.os.raw');
-        await PageObjects.visualize.selectField('machine.os.raw');
-        await PageObjects.visualize.toggleOtherBucket(2);
-        await PageObjects.visualize.toggleMissingBucket(2);
+        await PageObjects.visEditor.selectField('machine.os.raw');
+        await PageObjects.visEditor.toggleOtherBucket(2);
+        await PageObjects.visEditor.toggleMissingBucket(2);
         log.debug('clickGo');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         await pieChart.expectPieChartLabels(expectedTableData);
       });
 
@@ -109,20 +116,20 @@ export default function({ getService, getPageObjects }) {
         const expectedTableData = ['Missing', 'osx'];
 
         await pieChart.filterOnPieSlice('Other');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
         await pieChart.expectPieChartLabels(expectedTableData);
         await filterBar.removeFilter('machine.os.raw');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
       });
 
       it('should apply correct filter on other bucket by clicking on a legend', async () => {
         const expectedTableData = ['Missing', 'osx'];
 
-        await PageObjects.visualize.filterLegend('Other');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.filterLegend('Other');
+        await PageObjects.visChart.waitForVisualization();
         await pieChart.expectPieChartLabels(expectedTableData);
         await filterBar.removeFilter('machine.os.raw');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
       });
 
       it('should show two levels of other buckets', async () => {
@@ -171,15 +178,15 @@ export default function({ getService, getPageObjects }) {
           'Other',
         ];
 
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split slices');
-        await PageObjects.visualize.selectAggregation('Terms');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split slices');
+        await PageObjects.visEditor.selectAggregation('Terms');
         log.debug('Click field geo.src');
-        await PageObjects.visualize.selectField('geo.src');
-        await PageObjects.visualize.toggleOtherBucket(3);
-        await PageObjects.visualize.toggleMissingBucket(3);
+        await PageObjects.visEditor.selectField('geo.src');
+        await PageObjects.visEditor.toggleOtherBucket(3);
+        await PageObjects.visEditor.toggleMissingBucket(3);
         log.debug('clickGo');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         await pieChart.expectPieChartLabels(expectedTableData);
       });
     });
@@ -187,17 +194,17 @@ export default function({ getService, getPageObjects }) {
     describe('disabled aggs', () => {
       before(async () => {
         await PageObjects.visualize.loadSavedVisualization(vizName1);
-        await PageObjects.visualize.waitForRenderingCount();
+        await PageObjects.visChart.waitForRenderingCount();
       });
 
       it('should show correct result with one agg disabled', async () => {
         const expectedTableData = ['win 8', 'win xp', 'win 7', 'ios', 'osx'];
 
-        await PageObjects.visualize.clickBucket('Split slices');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('machine.os.raw');
-        await PageObjects.visualize.toggleDisabledAgg(2);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split slices');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('machine.os.raw');
+        await PageObjects.visEditor.toggleDisabledAgg(2);
+        await PageObjects.visEditor.clickGo();
 
         await pieChart.expectPieChartLabels(expectedTableData);
       });
@@ -206,15 +213,15 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
         await PageObjects.visualize.loadSavedVisualization(vizName1);
-        await PageObjects.visualize.waitForRenderingCount();
+        await PageObjects.visChart.waitForRenderingCount();
 
         const expectedTableData = ['win 8', 'win xp', 'win 7', 'ios', 'osx'];
         await pieChart.expectPieChartLabels(expectedTableData);
       });
 
       it('should show correct result when agg is re-enabled', async () => {
-        await PageObjects.visualize.toggleDisabledAgg(2);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleDisabledAgg(2);
+        await PageObjects.visEditor.clickGo();
 
         const expectedTableData = [
           '0',
@@ -291,24 +298,24 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
+        await PageObjects.visEditor.clickBucket('Split slices');
         log.debug('Click aggregation Filters');
-        await PageObjects.visualize.selectAggregation('Filters');
+        await PageObjects.visEditor.selectAggregation('Filters');
         log.debug('Set the 1st filter value');
-        await PageObjects.visualize.setFilterAggregationValue('geo.dest:"US"');
+        await PageObjects.visEditor.setFilterAggregationValue('geo.dest:"US"');
         log.debug('Add new filter');
-        await PageObjects.visualize.addNewFilterAggregation();
+        await PageObjects.visEditor.addNewFilterAggregation();
         log.debug('Set the 2nd filter value');
-        await PageObjects.visualize.setFilterAggregationValue('geo.dest:"CN"', 1);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.setFilterAggregationValue('geo.dest:"CN"', 1);
+        await PageObjects.visEditor.clickGo();
         const emptyFromTime = 'Sep 19, 2016 @ 06:31:44.000';
         const emptyToTime = 'Sep 23, 2016 @ 18:31:44.000';
         log.debug(
           'Switch to a different time range from "' + emptyFromTime + '" to "' + emptyToTime + '"'
         );
         await PageObjects.timePicker.setAbsoluteRange(emptyFromTime, emptyToTime);
-        await PageObjects.visualize.waitForVisualization();
-        await PageObjects.visualize.expectError();
+        await PageObjects.visChart.waitForVisualization();
+        await PageObjects.visChart.expectError();
       });
     });
     describe('multi series slice', () => {
@@ -327,22 +334,22 @@ export default function({ getService, getPageObjects }) {
         );
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
+        await PageObjects.visEditor.clickBucket('Split slices');
         log.debug('Click aggregation Histogram');
-        await PageObjects.visualize.selectAggregation('Histogram');
+        await PageObjects.visEditor.selectAggregation('Histogram');
         log.debug('Click field memory');
-        await PageObjects.visualize.selectField('memory');
+        await PageObjects.visEditor.selectField('memory');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await PageObjects.common.sleep(1003);
         log.debug('setNumericInterval 4000');
-        await PageObjects.visualize.setNumericInterval('40000');
+        await PageObjects.visEditor.setInterval('40000', { type: 'numeric' });
         log.debug('Toggle previous editor');
-        await PageObjects.visualize.toggleAggregationEditor(2);
+        await PageObjects.visEditor.toggleAggregationEditor(2);
         log.debug('select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('geo.dest');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split slices');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('geo.dest');
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should show correct chart', async () => {
@@ -428,11 +435,11 @@ export default function({ getService, getPageObjects }) {
           '360,000',
           'CN',
         ];
-        await PageObjects.visualize.filterLegend('CN');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.filterLegend('CN');
+        await PageObjects.visChart.waitForVisualization();
         await pieChart.expectPieChartLabels(expectedTableData);
         await filterBar.removeFilter('geo.dest');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
       });
 
       it('should still showing pie chart when a subseries have zero data', async function() {
@@ -442,21 +449,21 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
+        await PageObjects.visEditor.clickBucket('Split slices');
         log.debug('Click aggregation Filters');
-        await PageObjects.visualize.selectAggregation('Filters');
+        await PageObjects.visEditor.selectAggregation('Filters');
         log.debug('Set the 1st filter value');
-        await PageObjects.visualize.setFilterAggregationValue('geo.dest:"US"');
+        await PageObjects.visEditor.setFilterAggregationValue('geo.dest:"US"');
         log.debug('Toggle previous editor');
-        await PageObjects.visualize.toggleAggregationEditor(2);
+        await PageObjects.visEditor.toggleAggregationEditor(2);
         log.debug('Add a new series, select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
+        await PageObjects.visEditor.clickBucket('Split slices');
         log.debug('Click aggregation Filters');
-        await PageObjects.visualize.selectAggregation('Filters');
+        await PageObjects.visEditor.selectAggregation('Filters');
         log.debug('Set the 1st filter value of the aggregation id 3');
-        await PageObjects.visualize.setFilterAggregationValue('geo.dest:"UX"', 0, 3);
-        await PageObjects.visualize.clickGo();
-        const legends = await PageObjects.visualize.getLegendEntries();
+        await PageObjects.visEditor.setFilterAggregationValue('geo.dest:"UX"', 0, 3);
+        await PageObjects.visEditor.clickGo();
+        const legends = await PageObjects.visChart.getLegendEntries();
         const expectedLegends = ['geo.dest:"US"', 'geo.dest:"UX"'];
         expect(legends).to.eql(expectedLegends);
       });
@@ -469,15 +476,15 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Split chart');
-        await PageObjects.visualize.clickBucket('Split chart');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('machine.os.raw');
-        await PageObjects.visualize.toggleAggregationEditor(2);
+        await PageObjects.visEditor.clickBucket('Split chart');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('machine.os.raw');
+        await PageObjects.visEditor.toggleAggregationEditor(2);
         log.debug('Add a new series, select bucket Split slices');
-        await PageObjects.visualize.clickBucket('Split slices');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('geo.src');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickBucket('Split slices');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('geo.src');
+        await PageObjects.visEditor.clickGo();
       });
 
       it('shows correct split chart', async () => {
@@ -522,7 +529,7 @@ export default function({ getService, getPageObjects }) {
           ['ios', '478', 'CN', '478'],
           ['osx', '228', 'CN', '228'],
         ];
-        await PageObjects.visualize.filterLegend('CN');
+        await PageObjects.visChart.filterLegend('CN');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await inspector.open();
         await inspector.setTablePageSize(50);
diff --git a/test/functional/apps/visualize/_point_series_options.js b/test/functional/apps/visualize/_point_series_options.js
index 2d496cb575db7..e7ce5808554b4 100644
--- a/test/functional/apps/visualize/_point_series_options.js
+++ b/test/functional/apps/visualize/_point_series_options.js
@@ -25,11 +25,12 @@ export default function({ getService, getPageObjects }) {
   const kibanaServer = getService('kibanaServer');
   const browser = getService('browser');
   const PageObjects = getPageObjects([
-    'common',
     'visualize',
     'header',
     'pointSeries',
     'timePicker',
+    'visEditor',
+    'visChart',
   ]);
   const pointSeriesVis = PageObjects.pointSeries;
   const inspector = getService('inspector');
@@ -42,18 +43,18 @@ export default function({ getService, getPageObjects }) {
     await PageObjects.visualize.clickNewSearch();
     await PageObjects.timePicker.setDefaultAbsoluteRange();
     log.debug('Bucket = X-axis');
-    await PageObjects.visualize.clickBucket('X-axis');
+    await PageObjects.visEditor.clickBucket('X-axis');
     log.debug('Aggregation = Date Histogram');
-    await PageObjects.visualize.selectAggregation('Date Histogram');
+    await PageObjects.visEditor.selectAggregation('Date Histogram');
     log.debug('Field = @timestamp');
-    await PageObjects.visualize.selectField('@timestamp');
+    await PageObjects.visEditor.selectField('@timestamp');
     // add another metrics
     log.debug('Metric = Value Axis');
-    await PageObjects.visualize.clickBucket('Y-axis', 'metrics');
+    await PageObjects.visEditor.clickBucket('Y-axis', 'metrics');
     log.debug('Aggregation = Average');
-    await PageObjects.visualize.selectAggregation('Average', 'metrics');
+    await PageObjects.visEditor.selectAggregation('Average', 'metrics');
     log.debug('Field = memory');
-    await PageObjects.visualize.selectField('machine.ram', 'metrics');
+    await PageObjects.visEditor.selectField('machine.ram', 'metrics');
     // go to options page
     log.debug('Going to axis options');
     await pointSeriesVis.clickAxisOptions();
@@ -61,11 +62,11 @@ export default function({ getService, getPageObjects }) {
     log.debug('adding axis');
     await pointSeriesVis.clickAddAxis();
     // set average count to use second value axis
-    await PageObjects.visualize.toggleAccordion('visEditorSeriesAccordion3');
+    await PageObjects.visEditor.toggleAccordion('visEditorSeriesAccordion3');
     log.debug('Average memory value axis - ValueAxis-2');
     await pointSeriesVis.setSeriesAxis(1, 'ValueAxis-2');
-    await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-    await PageObjects.visualize.clickGo();
+    await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+    await PageObjects.visEditor.clickGo();
   }
 
   describe('point series', function describeIndexTests() {
@@ -129,14 +130,14 @@ export default function({ getService, getPageObjects }) {
         ];
 
         await retry.try(async () => {
-          const data = await PageObjects.visualize.getLineChartData('Count');
+          const data = await PageObjects.visChart.getLineChartData('Count');
           log.debug('count data=' + data);
           log.debug('data.length=' + data.length);
           expect(data).to.eql(expectedChartValues[0]);
         });
 
         await retry.try(async () => {
-          const avgMemoryData = await PageObjects.visualize.getLineChartData(
+          const avgMemoryData = await PageObjects.visChart.getLineChartData(
             'Average machine.ram',
             'ValueAxis-2'
           );
@@ -158,7 +159,7 @@ export default function({ getService, getPageObjects }) {
     describe('multiple chart types', function() {
       it('should change average series type to histogram', async function() {
         await pointSeriesVis.setSeriesType(1, 'histogram');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         const length = await pointSeriesVis.getHistogramSeries();
         expect(length).to.be(1);
       });
@@ -166,12 +167,12 @@ export default function({ getService, getPageObjects }) {
 
     describe('grid lines', function() {
       before(async function() {
-        await pointSeriesVis.clickOptions();
+        await PageObjects.visEditor.clickOptionsTab();
       });
 
       it('should show category grid lines', async function() {
         await pointSeriesVis.toggleGridCategoryLines();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         const gridLines = await pointSeriesVis.getGridLines();
         expect(gridLines.length).to.be(9);
         gridLines.forEach(gridLine => {
@@ -182,7 +183,7 @@ export default function({ getService, getPageObjects }) {
       it('should show value axis grid lines', async function() {
         await pointSeriesVis.setGridValueAxis('ValueAxis-2');
         await pointSeriesVis.toggleGridCategoryLines();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         const gridLines = await pointSeriesVis.getGridLines();
         expect(gridLines.length).to.be(9);
         gridLines.forEach(gridLine => {
@@ -199,36 +200,36 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.navigateToNewVisualization();
         await PageObjects.visualize.clickLineChart();
         await PageObjects.visualize.clickNewSearch();
-        await PageObjects.visualize.selectYAxisAggregation('Average', 'bytes', customLabel, 1);
-        await PageObjects.visualize.clickGo();
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions('ValueAxis-1');
+        await PageObjects.visEditor.selectYAxisAggregation('Average', 'bytes', customLabel, 1);
+        await PageObjects.visEditor.clickGo();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions('ValueAxis-1');
       });
 
       it('should render a custom label when one is set', async function() {
-        const title = await PageObjects.visualize.getYAxisTitle();
+        const title = await PageObjects.visChart.getYAxisTitle();
         expect(title).to.be(customLabel);
       });
 
       it('should render a custom axis title when one is set, overriding the custom label', async function() {
         await pointSeriesVis.setAxisTitle(axisTitle);
-        await PageObjects.visualize.clickGo();
-        const title = await PageObjects.visualize.getYAxisTitle();
+        await PageObjects.visEditor.clickGo();
+        const title = await PageObjects.visChart.getYAxisTitle();
         expect(title).to.be(axisTitle);
       });
 
       it('should preserve saved axis titles after a vis is saved and reopened', async function() {
         await PageObjects.visualize.saveVisualizationExpectSuccess(visName);
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
         await PageObjects.visualize.loadSavedVisualization(visName);
-        await PageObjects.visualize.waitForRenderingCount();
-        await PageObjects.visualize.clickData();
-        await PageObjects.visualize.toggleOpenEditor(1);
-        await PageObjects.visualize.setCustomLabel('test', 1);
-        await PageObjects.visualize.clickGo();
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions('ValueAxis-1');
-        const title = await PageObjects.visualize.getYAxisTitle();
+        await PageObjects.visChart.waitForRenderingCount();
+        await PageObjects.visEditor.clickDataTab();
+        await PageObjects.visEditor.toggleOpenEditor(1);
+        await PageObjects.visEditor.setCustomLabel('test', 1);
+        await PageObjects.visEditor.clickGo();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions('ValueAxis-1');
+        const title = await PageObjects.visChart.getYAxisTitle();
         expect(title).to.be(axisTitle);
       });
     });
@@ -238,7 +239,7 @@ export default function({ getService, getPageObjects }) {
 
       it('should show round labels in default timezone', async function() {
         await initChart();
-        const labels = await PageObjects.visualize.getXAxisLabels();
+        const labels = await PageObjects.visChart.getXAxisLabels();
         expect(labels.join()).to.contain(expectedLabels.join());
       });
 
@@ -248,7 +249,7 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.header.awaitKibanaChrome();
         await initChart();
 
-        const labels = await PageObjects.visualize.getXAxisLabels();
+        const labels = await PageObjects.visChart.getXAxisLabels();
 
         expect(labels.join()).to.contain(expectedLabels.join());
       });
@@ -258,10 +259,10 @@ export default function({ getService, getPageObjects }) {
         const toTime = 'Sep 22, 2015 @ 16:08:34.554';
         // note that we're setting the absolute time range while we're in 'America/Phoenix' tz
         await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
-        await PageObjects.visualize.waitForRenderingCount();
+        await PageObjects.visChart.waitForRenderingCount();
 
         await retry.waitFor('wait for x-axis labels to match expected for Phoenix', async () => {
-          const labels = await PageObjects.visualize.getXAxisLabels();
+          const labels = await PageObjects.visChart.getXAxisLabels();
           log.debug(`Labels: ${labels}`);
           return (
             labels.toString() === ['10:00', '11:00', '12:00', '13:00', '14:00', '15:00'].toString()
@@ -303,11 +304,11 @@ export default function({ getService, getPageObjects }) {
         await browser.refresh();
         // wait some time before trying to check for rendering count
         await PageObjects.header.awaitKibanaChrome();
-        await PageObjects.visualize.waitForRenderingCount();
+        await PageObjects.visChart.waitForRenderingCount();
         log.debug('getXAxisLabels');
 
         await retry.waitFor('wait for x-axis labels to match expected for UTC', async () => {
-          const labels2 = await PageObjects.visualize.getXAxisLabels();
+          const labels2 = await PageObjects.visChart.getXAxisLabels();
           log.debug(`Labels: ${labels2}`);
           return (
             labels2.toString() === ['17:00', '18:00', '19:00', '20:00', '21:00', '22:00'].toString()
diff --git a/test/functional/apps/visualize/_region_map.js b/test/functional/apps/visualize/_region_map.js
index f6c81dab5921f..10cbd9913c70c 100644
--- a/test/functional/apps/visualize/_region_map.js
+++ b/test/functional/apps/visualize/_region_map.js
@@ -24,7 +24,7 @@ export default function({ getService, getPageObjects }) {
     const inspector = getService('inspector');
     const log = getService('log');
     const find = getService('find');
-    const PageObjects = getPageObjects(['common', 'visualize', 'timePicker', 'settings']);
+    const PageObjects = getPageObjects(['visualize', 'visEditor', 'timePicker']);
 
     before(async function() {
       log.debug('navigateToApp visualize');
@@ -34,12 +34,12 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = Shape field');
-      await PageObjects.visualize.clickBucket('Shape field');
+      await PageObjects.visEditor.clickBucket('Shape field');
       log.debug('Aggregation = Terms');
-      await PageObjects.visualize.selectAggregation('Terms');
+      await PageObjects.visEditor.selectAggregation('Terms');
       log.debug('Field = geo.src');
-      await PageObjects.visualize.selectField('geo.src');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectField('geo.src');
+      await PageObjects.visEditor.clickGo();
     });
 
     describe('vector map', function indexPatternCreation() {
@@ -60,26 +60,26 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should change results after changing layer to world', async function() {
-        await PageObjects.visualize.clickOptions();
-        await PageObjects.visualize.setSelectByOptionText(
+        await PageObjects.visEditor.clickOptionsTab();
+        await PageObjects.visEditor.setSelectByOptionText(
           'regionMapOptionsSelectLayer',
           'World Countries'
         );
 
         //ensure all fields are there
-        await PageObjects.visualize.setSelectByOptionText(
+        await PageObjects.visEditor.setSelectByOptionText(
           'regionMapOptionsSelectJoinField',
           'ISO 3166-1 alpha-2 code'
         );
-        await PageObjects.visualize.setSelectByOptionText(
+        await PageObjects.visEditor.setSelectByOptionText(
           'regionMapOptionsSelectJoinField',
           'ISO 3166-1 alpha-3 code'
         );
-        await PageObjects.visualize.setSelectByOptionText(
+        await PageObjects.visEditor.setSelectByOptionText(
           'regionMapOptionsSelectJoinField',
           'name'
         );
-        await PageObjects.visualize.setSelectByOptionText(
+        await PageObjects.visEditor.setSelectByOptionText(
           'regionMapOptionsSelectJoinField',
           'ISO 3166-1 alpha-2 code'
         );
diff --git a/test/functional/apps/visualize/_tag_cloud.js b/test/functional/apps/visualize/_tag_cloud.js
index 97b8036b30503..4f921cec1fdf1 100644
--- a/test/functional/apps/visualize/_tag_cloud.js
+++ b/test/functional/apps/visualize/_tag_cloud.js
@@ -26,7 +26,16 @@ export default function({ getService, getPageObjects }) {
   const browser = getService('browser');
   const retry = getService('retry');
   const find = getService('find');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'settings', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'header',
+    'settings',
+    'timePicker',
+    'tagCloud',
+  ]);
 
   describe('tag cloud chart', function() {
     const vizName1 = 'Visualization tagCloud';
@@ -40,15 +49,15 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('select Tags');
-      await PageObjects.visualize.clickBucket('Tags');
+      await PageObjects.visEditor.clickBucket('Tags');
       log.debug('Click aggregation Terms');
-      await PageObjects.visualize.selectAggregation('Terms');
+      await PageObjects.visEditor.selectAggregation('Terms');
       log.debug('Click field machine.ram');
       await retry.try(async function tryingForTime() {
-        await PageObjects.visualize.selectField(termsField);
+        await PageObjects.visEditor.selectField(termsField);
       });
-      await PageObjects.visualize.selectOrderByMetric(2, '_key');
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.selectOrderByMetric(2, '_key');
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should have inspector enabled', async function() {
@@ -56,7 +65,7 @@ export default function({ getService, getPageObjects }) {
     });
 
     it('should show correct tag cloud data', async function() {
-      const data = await PageObjects.visualize.getTextTag();
+      const data = await PageObjects.tagCloud.getTextTag();
       log.debug(data);
       expect(data).to.eql([
         '32,212,254,720',
@@ -69,22 +78,22 @@ export default function({ getService, getPageObjects }) {
 
     it('should collapse the sidebar', async function() {
       const editorSidebar = await find.byCssSelector('.collapsible-sidebar');
-      await PageObjects.visualize.clickEditorSidebarCollapse();
+      await PageObjects.visEditor.clickEditorSidebarCollapse();
       // Give d3 tag cloud some time to rearrange tags
       await PageObjects.common.sleep(1000);
       const afterSize = await editorSidebar.getSize();
       expect(afterSize.width).to.be(0);
-      await PageObjects.visualize.clickEditorSidebarCollapse();
+      await PageObjects.visEditor.clickEditorSidebarCollapse();
     });
 
     it('should still show all tags after sidebar has been collapsed', async function() {
-      await PageObjects.visualize.clickEditorSidebarCollapse();
+      await PageObjects.visEditor.clickEditorSidebarCollapse();
       // Give d3 tag cloud some time to rearrange tags
       await PageObjects.common.sleep(1000);
-      await PageObjects.visualize.clickEditorSidebarCollapse();
+      await PageObjects.visEditor.clickEditorSidebarCollapse();
       // Give d3 tag cloud some time to rearrange tags
       await PageObjects.common.sleep(1000);
-      const data = await PageObjects.visualize.getTextTag();
+      const data = await PageObjects.tagCloud.getTextTag();
       log.debug(data);
       expect(data).to.eql([
         '32,212,254,720',
@@ -100,7 +109,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.common.sleep(1000);
       await browser.setWindowSize(1200, 800);
       await PageObjects.common.sleep(1000);
-      const data = await PageObjects.visualize.getTextTag();
+      const data = await PageObjects.tagCloud.getTextTag();
       expect(data).to.eql([
         '32,212,254,720',
         '21,474,836,480',
@@ -114,11 +123,11 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should show the tags and relative size', function() {
-      return PageObjects.visualize.getTextSizes().then(function(results) {
+      return PageObjects.tagCloud.getTextSizes().then(function(results) {
         log.debug('results here ' + results);
         expect(results).to.eql(['72px', '63px', '25px', '32px', '18px']);
       });
@@ -153,7 +162,7 @@ export default function({ getService, getPageObjects }) {
         });
         await PageObjects.header.waitUntilLoadingHasFinished();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
       });
 
       after(async function() {
@@ -168,15 +177,15 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should format tags with field formatter', async function() {
-        const data = await PageObjects.visualize.getTextTag();
+        const data = await PageObjects.tagCloud.getTextTag();
         log.debug(data);
         expect(data).to.eql(['30GB', '20GB', '19GB', '18GB', '17GB']);
       });
 
       it('should apply filter with unformatted value', async function() {
-        await PageObjects.visualize.selectTagCloudTag('30GB');
+        await PageObjects.tagCloud.selectTagCloudTag('30GB');
         await PageObjects.header.waitUntilLoadingHasFinished();
-        const data = await PageObjects.visualize.getTextTag();
+        const data = await PageObjects.tagCloud.getTextTag();
         expect(data).to.eql(['30GB']);
       });
     });
diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js
index e2946339b1f08..397eaeb0f3013 100644
--- a/test/functional/apps/visualize/_tile_map.js
+++ b/test/functional/apps/visualize/_tile_map.js
@@ -27,7 +27,14 @@ export default function({ getService, getPageObjects }) {
   const filterBar = getService('filterBar');
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker', 'settings']);
+  const PageObjects = getPageObjects([
+    'common',
+    'visualize',
+    'visEditor',
+    'visChart',
+    'timePicker',
+    'tileMap',
+  ]);
 
   describe('tile map visualize app', function() {
     describe('incomplete config', function describeIndexTests() {
@@ -45,8 +52,8 @@ export default function({ getService, getPageObjects }) {
 
       it('should be able to zoom in twice', async () => {
         //should not throw
-        await PageObjects.visualize.clickMapZoomIn();
-        await PageObjects.visualize.clickMapZoomIn();
+        await PageObjects.tileMap.clickMapZoomIn();
+        await PageObjects.tileMap.clickMapZoomIn();
       });
     });
 
@@ -61,14 +68,14 @@ export default function({ getService, getPageObjects }) {
         await PageObjects.visualize.clickNewSearch();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         log.debug('select bucket Geo Coordinates');
-        await PageObjects.visualize.clickBucket('Geo coordinates');
+        await PageObjects.visEditor.clickBucket('Geo coordinates');
         log.debug('Click aggregation Geohash');
-        await PageObjects.visualize.selectAggregation('Geohash');
+        await PageObjects.visEditor.selectAggregation('Geohash');
         log.debug('Click field geo.coordinates');
         await retry.try(async function tryingForTime() {
-          await PageObjects.visualize.selectField('geo.coordinates');
+          await PageObjects.visEditor.selectField('geo.coordinates');
         });
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
       });
 
       /**
@@ -106,9 +113,9 @@ export default function({ getService, getPageObjects }) {
             ['-', '8', '108', { lat: 18, lon: -157 }],
           ];
           //level 1
-          await PageObjects.visualize.clickMapZoomOut();
+          await PageObjects.tileMap.clickMapZoomOut();
           //level 0
-          await PageObjects.visualize.clickMapZoomOut();
+          await PageObjects.tileMap.clickMapZoomOut();
 
           await inspector.open();
           await inspector.setTablePageSize(50);
@@ -118,8 +125,8 @@ export default function({ getService, getPageObjects }) {
         });
 
         it('should not be able to zoom out beyond 0', async function() {
-          await PageObjects.visualize.zoomAllTheWayOut();
-          const enabled = await PageObjects.visualize.getMapZoomOutEnabled();
+          await PageObjects.tileMap.zoomAllTheWayOut();
+          const enabled = await PageObjects.tileMap.getMapZoomOutEnabled();
           expect(enabled).to.be(false);
         });
 
@@ -148,7 +155,7 @@ export default function({ getService, getPageObjects }) {
             ['-', 'b7', '167', { lat: 64, lon: -163 }],
           ];
 
-          await PageObjects.visualize.clickMapFitDataBounds();
+          await PageObjects.tileMap.clickMapFitDataBounds();
           await inspector.open();
           const data = await inspector.getTableData();
           await inspector.close();
@@ -164,8 +171,8 @@ export default function({ getService, getPageObjects }) {
 
           await filterBar.addFilter('bytes', 'is between', '19980', '19990');
           await filterBar.toggleFilterPinned('bytes');
-          await PageObjects.visualize.zoomAllTheWayOut();
-          await PageObjects.visualize.clickMapFitDataBounds();
+          await PageObjects.tileMap.zoomAllTheWayOut();
+          await PageObjects.tileMap.clickMapFitDataBounds();
 
           await inspector.open();
           const data = await inspector.getTableData();
@@ -178,15 +185,15 @@ export default function({ getService, getPageObjects }) {
         it('Newly saved visualization retains map bounds', async () => {
           const vizName1 = 'Visualization TileMap';
 
-          await PageObjects.visualize.clickMapZoomIn();
-          await PageObjects.visualize.clickMapZoomIn();
+          await PageObjects.tileMap.clickMapZoomIn();
+          await PageObjects.tileMap.clickMapZoomIn();
 
-          const mapBounds = await PageObjects.visualize.getMapBounds();
+          const mapBounds = await PageObjects.tileMap.getMapBounds();
           await inspector.close();
 
           await PageObjects.visualize.saveVisualizationExpectSuccess(vizName1);
 
-          const afterSaveMapBounds = await PageObjects.visualize.getMapBounds();
+          const afterSaveMapBounds = await PageObjects.tileMap.getMapBounds();
 
           await inspector.close();
           // For some reason the values are slightly different, so we can't check that they are equal. But we did
@@ -207,17 +214,17 @@ export default function({ getService, getPageObjects }) {
         });
 
         it('when not checked does not add filters to aggregation', async () => {
-          await PageObjects.visualize.toggleOpenEditor(2);
-          await PageObjects.visualize.setIsFilteredByCollarCheckbox(false);
-          await PageObjects.visualize.clickGo();
+          await PageObjects.visEditor.toggleOpenEditor(2);
+          await PageObjects.visEditor.setIsFilteredByCollarCheckbox(false);
+          await PageObjects.visEditor.clickGo();
           await inspector.open();
           await inspector.expectTableHeaders(['geohash_grid', 'Count', 'Geo Centroid']);
           await inspector.close();
         });
 
         after(async () => {
-          await PageObjects.visualize.setIsFilteredByCollarCheckbox(true);
-          await PageObjects.visualize.clickGo();
+          await PageObjects.visEditor.setIsFilteredByCollarCheckbox(true);
+          await PageObjects.visEditor.clickGo();
         });
       });
     });
@@ -245,18 +252,18 @@ export default function({ getService, getPageObjects }) {
 
         const zoomLevel = 9;
         for (let i = 0; i < zoomLevel; i++) {
-          await PageObjects.visualize.clickMapZoomIn();
+          await PageObjects.tileMap.clickMapZoomIn();
         }
       });
 
       beforeEach(async function() {
-        await PageObjects.visualize.clickMapZoomIn(waitForLoading);
+        await PageObjects.tileMap.clickMapZoomIn(waitForLoading);
       });
 
       afterEach(async function() {
         if (!last) {
           await PageObjects.common.sleep(toastDefaultLife);
-          await PageObjects.visualize.clickMapZoomOut(waitForLoading);
+          await PageObjects.tileMap.clickMapZoomOut(waitForLoading);
         }
       });
 
@@ -270,11 +277,11 @@ export default function({ getService, getPageObjects }) {
 
       it('should suppress zoom warning if suppress warnings button clicked', async () => {
         last = true;
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
         await find.clickByCssSelector('[data-test-subj="suppressZoomWarnings"]');
-        await PageObjects.visualize.clickMapZoomOut(waitForLoading);
+        await PageObjects.tileMap.clickMapZoomOut(waitForLoading);
         await testSubjects.waitForDeleted('suppressZoomWarnings');
-        await PageObjects.visualize.clickMapZoomIn(waitForLoading);
+        await PageObjects.tileMap.clickMapZoomIn(waitForLoading);
 
         await testSubjects.missingOrFail('maxZoomWarning');
       });
diff --git a/test/functional/apps/visualize/_tsvb_chart.ts b/test/functional/apps/visualize/_tsvb_chart.ts
index dc4b9a786eaa4..8dbe356889568 100644
--- a/test/functional/apps/visualize/_tsvb_chart.ts
+++ b/test/functional/apps/visualize/_tsvb_chart.ts
@@ -25,7 +25,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const log = getService('log');
   const inspector = getService('inspector');
-  const PageObjects = getPageObjects(['visualize', 'visualBuilder', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visualBuilder', 'timePicker', 'visChart']);
 
   describe('visual builder', function describeIndexTests() {
     this.tags('smoke');
@@ -80,7 +80,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('should verify gauge label and count display', async () => {
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
         const labelString = await PageObjects.visualBuilder.getGaugeLabel();
         expect(labelString).to.be('Count');
         const gaugeCount = await PageObjects.visualBuilder.getGaugeCount();
@@ -96,7 +96,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('should verify topN label and count display', async () => {
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
         const labelString = await PageObjects.visualBuilder.getTopNLabel();
         expect(labelString).to.be('Count');
         const gaugeCount = await PageObjects.visualBuilder.getTopNCount();
diff --git a/test/functional/apps/visualize/_tsvb_table.ts b/test/functional/apps/visualize/_tsvb_table.ts
index a36b6facb3039..5808212559b18 100644
--- a/test/functional/apps/visualize/_tsvb_table.ts
+++ b/test/functional/apps/visualize/_tsvb_table.ts
@@ -21,7 +21,11 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function({ getPageObjects }: FtrProviderContext) {
-  const { visualBuilder, visualize } = getPageObjects(['visualBuilder', 'visualize']);
+  const { visualBuilder, visualize, visChart } = getPageObjects([
+    'visualBuilder',
+    'visualize',
+    'visChart',
+  ]);
 
   describe('visual builder', function describeIndexTests() {
     describe('table', () => {
@@ -32,7 +36,7 @@ export default function({ getPageObjects }: FtrProviderContext) {
         await visualBuilder.checkTableTabIsPresent();
         await visualBuilder.selectGroupByField('machine.os.raw');
         await visualBuilder.setColumnLabelValue('OS');
-        await visualize.waitForVisualizationRenderingStabilized();
+        await visChart.waitForVisualizationRenderingStabilized();
       });
 
       it('should display correct values on changing group by field and column name', async () => {
diff --git a/test/functional/apps/visualize/_vega_chart.js b/test/functional/apps/visualize/_vega_chart.js
index 224dec7ef2a71..df0603c7f95f5 100644
--- a/test/functional/apps/visualize/_vega_chart.js
+++ b/test/functional/apps/visualize/_vega_chart.js
@@ -20,7 +20,7 @@
 import expect from '@kbn/expect';
 
 export default function({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['common', 'header', 'timePicker', 'visualize']);
+  const PageObjects = getPageObjects(['timePicker', 'visualize', 'visChart', 'vegaChart']);
   const filterBar = getService('filterBar');
   const inspector = getService('inspector');
   const log = getService('log');
@@ -40,7 +40,7 @@ export default function({ getService, getPageObjects }) {
         });
 
         it.skip('should have some initial vega spec text', async function() {
-          const vegaSpec = await PageObjects.visualize.getVegaSpec();
+          const vegaSpec = await PageObjects.vegaChart.getSpec();
           expect(vegaSpec)
             .to.contain('{')
             .and.to.contain('data');
@@ -48,7 +48,7 @@ export default function({ getService, getPageObjects }) {
         });
 
         it('should have view and control containers', async function() {
-          const view = await PageObjects.visualize.getVegaViewContainer();
+          const view = await PageObjects.vegaChart.getViewContainer();
           expect(view).to.be.ok();
           const size = await view.getSize();
           expect(size)
@@ -57,7 +57,7 @@ export default function({ getService, getPageObjects }) {
           expect(size.width).to.be.above(0);
           expect(size.height).to.be.above(0);
 
-          const controls = await PageObjects.visualize.getVegaControlContainer();
+          const controls = await PageObjects.vegaChart.getControlContainer();
           expect(controls).to.be.ok();
         });
       });
@@ -73,9 +73,9 @@ export default function({ getService, getPageObjects }) {
         });
 
         it.skip('should render different data in response to filter change', async function() {
-          await PageObjects.visualize.expectVisToMatchScreenshot('vega_chart');
+          await PageObjects.vegaChart.expectVisToMatchScreenshot('vega_chart');
           await filterBar.addFilter('@tags.raw', 'is', 'error');
-          await PageObjects.visualize.expectVisToMatchScreenshot('vega_chart_filtered');
+          await PageObjects.vegaChart.expectVisToMatchScreenshot('vega_chart_filtered');
         });
       });
     });
diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js
index 1153cc12e23ed..2efa812c7a734 100644
--- a/test/functional/apps/visualize/_vertical_bar_chart.js
+++ b/test/functional/apps/visualize/_vertical_bar_chart.js
@@ -23,8 +23,9 @@ export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
   const inspector = getService('inspector');
+  const testSubjects = getService('testSubjects');
   const filterBar = getService('filterBar');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   // FLAKY: https://github.com/elastic/kibana/issues/22322
   describe('vertical bar chart', function() {
@@ -38,13 +39,13 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.clickNewSearch();
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       log.debug('Bucket = X-Axis');
-      await PageObjects.visualize.clickBucket('X-axis');
+      await PageObjects.visEditor.clickBucket('X-axis');
       log.debug('Aggregation = Date Histogram');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
       log.debug('Field = @timestamp');
-      await PageObjects.visualize.selectField('@timestamp');
+      await PageObjects.visEditor.selectField('@timestamp');
       // leaving Interval set to Auto
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
     };
 
     before(initBarChart);
@@ -53,7 +54,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -92,7 +93,7 @@ export default function({ getService, getPageObjects }) {
       // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
       // try sleeping a bit before getting that data
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData();
+        const data = await PageObjects.visChart.getBarChartData();
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
@@ -203,15 +204,15 @@ export default function({ getService, getPageObjects }) {
       // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
       // try sleeping a bit before getting that data
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData();
+        const data = await PageObjects.visChart.getBarChartData();
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
       });
 
-      await PageObjects.visualize.toggleOpenEditor(2);
-      await PageObjects.visualize.clickDropPartialBuckets();
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.toggleOpenEditor(2);
+      await PageObjects.visEditor.clickDropPartialBuckets();
+      await PageObjects.visEditor.clickGo();
 
       expectedChartValues = [
         218,
@@ -279,7 +280,7 @@ export default function({ getService, getPageObjects }) {
       // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
       // try sleeping a bit before getting that data
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData();
+        const data = await PageObjects.visChart.getBarChartData();
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
@@ -291,13 +292,13 @@ export default function({ getService, getPageObjects }) {
       const axisId = 'ValueAxis-1';
 
       it('should show ticks on selecting log scale', async () => {
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions(axisId);
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'log');
-        await PageObjects.visualize.clickYAxisAdvancedOptions(axisId);
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
+        await PageObjects.visEditor.clickYAxisAdvancedOptions(axisId);
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -323,9 +324,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting log scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -351,10 +352,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'square root');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'square root');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '0',
           '200',
@@ -370,18 +371,18 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'linear');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'linear');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         log.debug(labels);
         const expectedLabels = [
           '0',
@@ -398,9 +399,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
@@ -409,11 +410,11 @@ export default function({ getService, getPageObjects }) {
     describe('vertical bar in percent mode', async () => {
       it('should show ticks with percentage values', async function() {
         const axisId = 'ValueAxis-1';
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions(axisId);
-        await PageObjects.visualize.selectYAxisMode('percentage');
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisMode('percentage');
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         expect(labels[0]).to.eql('0%');
         expect(labels[labels.length - 1]).to.eql('100%');
       });
@@ -423,36 +424,36 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('response.raw');
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        await PageObjects.visEditor.clickGo();
 
         const expectedEntries = ['200', '404', '503'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
 
       it('should allow custom sorting of series', async () => {
-        await PageObjects.visualize.toggleOpenEditor(1, 'false');
-        await PageObjects.visualize.selectCustomSortMetric(3, 'Min', 'bytes');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleOpenEditor(1, 'false');
+        await PageObjects.visEditor.selectCustomSortMetric(3, 'Min', 'bytes');
+        await PageObjects.visEditor.clickGo();
 
         const expectedEntries = ['404', '200', '503'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
 
       it('should correctly filter by legend', async () => {
-        await PageObjects.visualize.filterLegend('200');
-        await PageObjects.visualize.waitForVisualization();
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        await PageObjects.visChart.filterLegend('200');
+        await PageObjects.visChart.waitForVisualization();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         const expectedEntries = ['200'];
         expect(legendEntries).to.eql(expectedEntries);
         await filterBar.removeFilter('response.raw');
-        await PageObjects.visualize.waitForVisualization();
+        await PageObjects.visChart.waitForVisualization();
       });
     });
 
@@ -460,18 +461,18 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('response.raw');
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-
-        await PageObjects.visualize.toggleOpenEditor(3, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('machine.os');
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+
+        await PageObjects.visEditor.toggleOpenEditor(3, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('machine.os');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        await PageObjects.visEditor.clickGo();
 
         const expectedEntries = [
           '200 - win 8',
@@ -490,18 +491,18 @@ export default function({ getService, getPageObjects }) {
           '404 - win 8',
           '404 - win xp',
         ];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
 
       it('should show correct series when disabling first agg', async function() {
         // this will avoid issues with the play tooltip covering the disable agg button
-        await PageObjects.visualize.scrollSubjectIntoView('metricsAggGroup');
-        await PageObjects.visualize.toggleDisabledAgg(3);
-        await PageObjects.visualize.clickGo();
+        await testSubjects.scrollIntoView('metricsAggGroup');
+        await PageObjects.visEditor.toggleDisabledAgg(3);
+        await PageObjects.visEditor.clickGo();
 
         const expectedEntries = ['win 8', 'win xp', 'ios', 'osx', 'win 7'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
     });
@@ -510,24 +511,24 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.toggleOpenEditor(1);
-        await PageObjects.visualize.selectAggregation('Derivative', 'metrics');
-        await PageObjects.visualize.waitForVisualizationRenderingStabilized();
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.toggleOpenEditor(1);
+        await PageObjects.visEditor.selectAggregation('Derivative', 'metrics');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        await PageObjects.visEditor.clickGo();
 
         const expectedEntries = ['Derivative of Count'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
 
       it('should show an error if last bucket aggregation is terms', async () => {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('response.raw');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
 
-        const errorMessage = await PageObjects.visualize.getBucketErrorMessage();
+        const errorMessage = await PageObjects.visEditor.getBucketErrorMessage();
         expect(errorMessage).to.contain('Last bucket aggregation must be "Date Histogram"');
       });
     });
diff --git a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js
index e796f281b0689..2371df6e92476 100644
--- a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js
+++ b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.js
@@ -23,7 +23,7 @@ export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
   const inspector = getService('inspector');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'visEditor', 'visChart']);
 
   // FLAKY: https://github.com/elastic/kibana/issues/22322
   describe.skip('vertical bar chart with index without time filter', function() {
@@ -39,13 +39,13 @@ export default function({ getService, getPageObjects }) {
       );
       await PageObjects.common.sleep(500);
       log.debug('Bucket = X-Axis');
-      await PageObjects.visualize.clickBucket('X-axis');
+      await PageObjects.visEditor.clickBucket('X-axis');
       log.debug('Aggregation = Date Histogram');
-      await PageObjects.visualize.selectAggregation('Date Histogram');
+      await PageObjects.visEditor.selectAggregation('Date Histogram');
       log.debug('Field = @timestamp');
-      await PageObjects.visualize.selectField('@timestamp');
-      await PageObjects.visualize.setCustomInterval('3h');
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visEditor.selectField('@timestamp');
+      await PageObjects.visEditor.setInterval('3h', { type: 'custom' });
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
     };
 
     before(initBarChart);
@@ -54,7 +54,7 @@ export default function({ getService, getPageObjects }) {
       await PageObjects.visualize.saveVisualizationExpectSuccessAndBreadcrumb(vizName1);
 
       await PageObjects.visualize.loadSavedVisualization(vizName1);
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
     });
 
     it('should have inspector enabled', async function() {
@@ -93,7 +93,7 @@ export default function({ getService, getPageObjects }) {
       // return arguments[0].getAttribute(arguments[1]);","args":[{"ELEMENT":"592"},"fill"]}] arguments[0].getAttribute is not a function
       // try sleeping a bit before getting that data
       await retry.try(async () => {
-        const data = await PageObjects.visualize.getBarChartData();
+        const data = await PageObjects.visChart.getBarChartData();
         log.debug('data=' + data);
         log.debug('data.length=' + data.length);
         expect(data).to.eql(expectedChartValues);
@@ -134,13 +134,13 @@ export default function({ getService, getPageObjects }) {
       const axisId = 'ValueAxis-1';
 
       it('should show ticks on selecting log scale', async () => {
-        await PageObjects.visualize.clickMetricsAndAxes();
-        await PageObjects.visualize.clickYAxisOptions(axisId);
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'log');
-        await PageObjects.visualize.clickYAxisAdvancedOptions(axisId);
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.clickMetricsAndAxes();
+        await PageObjects.visEditor.clickYAxisOptions(axisId);
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'log');
+        await PageObjects.visEditor.clickYAxisAdvancedOptions(axisId);
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -166,9 +166,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting log scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '2',
           '3',
@@ -194,10 +194,10 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'square root');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'square root');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = [
           '0',
           '200',
@@ -213,18 +213,18 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting square root scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
 
       it('should show ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.selectYAxisScaleType(axisId, 'linear');
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, false);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.selectYAxisScaleType(axisId, 'linear');
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, false);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         log.debug(labels);
         const expectedLabels = [
           '0',
@@ -241,9 +241,9 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should show filtered ticks on selecting linear scale', async () => {
-        await PageObjects.visualize.changeYAxisFilterLabelsCheckbox(axisId, true);
-        await PageObjects.visualize.clickGo();
-        const labels = await PageObjects.visualize.getYAxisLabels();
+        await PageObjects.visEditor.changeYAxisFilterLabelsCheckbox(axisId, true);
+        await PageObjects.visEditor.clickGo();
+        const labels = await PageObjects.visChart.getYAxisLabels();
         const expectedLabels = ['200', '400', '600', '800', '1,000', '1,200', '1,400'];
         expect(labels).to.eql(expectedLabels);
       });
@@ -253,18 +253,18 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('response.raw');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         await PageObjects.common.sleep(1003);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         const expectedEntries = ['200', '404', '503'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
     });
@@ -273,20 +273,20 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('response.raw');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('response.raw');
         await PageObjects.header.waitUntilLoadingHasFinished();
 
-        await PageObjects.visualize.toggleOpenEditor(3, 'false');
-        await PageObjects.visualize.clickBucket('Split series');
-        await PageObjects.visualize.selectAggregation('Terms');
-        await PageObjects.visualize.selectField('machine.os');
+        await PageObjects.visEditor.toggleOpenEditor(3, 'false');
+        await PageObjects.visEditor.clickBucket('Split series');
+        await PageObjects.visEditor.selectAggregation('Terms');
+        await PageObjects.visEditor.selectField('machine.os');
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         await PageObjects.common.sleep(1003);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         const expectedEntries = [
@@ -306,17 +306,17 @@ export default function({ getService, getPageObjects }) {
           '404 - win 8',
           '404 - win xp',
         ];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
 
       it('should show correct series when disabling first agg', async function() {
-        await PageObjects.visualize.toggleDisabledAgg(3);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.toggleDisabledAgg(3);
+        await PageObjects.visEditor.clickGo();
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         const expectedEntries = ['win 8', 'win xp', 'ios', 'osx', 'win 7'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
     });
@@ -325,17 +325,17 @@ export default function({ getService, getPageObjects }) {
       before(initBarChart);
 
       it('should show correct series', async function() {
-        await PageObjects.visualize.toggleOpenEditor(2, 'false');
-        await PageObjects.visualize.toggleOpenEditor(1);
-        await PageObjects.visualize.selectAggregation('Derivative', 'metrics');
+        await PageObjects.visEditor.toggleOpenEditor(2, 'false');
+        await PageObjects.visEditor.toggleOpenEditor(1);
+        await PageObjects.visEditor.selectAggregation('Derivative', 'metrics');
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         await PageObjects.common.sleep(1003);
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         const expectedEntries = ['Derivative of Count'];
-        const legendEntries = await PageObjects.visualize.getLegendEntries();
+        const legendEntries = await PageObjects.visChart.getLegendEntries();
         expect(legendEntries).to.eql(expectedEntries);
       });
     });
diff --git a/test/functional/apps/visualize/_visualize_listing.js b/test/functional/apps/visualize/_visualize_listing.js
index 63a8a8310d2c1..e277c3c7d104d 100644
--- a/test/functional/apps/visualize/_visualize_listing.js
+++ b/test/functional/apps/visualize/_visualize_listing.js
@@ -19,8 +19,9 @@
 
 import expect from '@kbn/expect';
 
-export default function({ getPageObjects }) {
-  const PageObjects = getPageObjects(['visualize', 'header', 'common']);
+export default function({ getService, getPageObjects }) {
+  const PageObjects = getPageObjects(['visualize', 'visEditor']);
+  const listingTable = getService('listingTable');
 
   // FLAKY: https://github.com/elastic/kibana/issues/40912
   describe.skip('visualize listing page', function describeIndexTests() {
@@ -36,7 +37,7 @@ export default function({ getPageObjects }) {
         // type markdown is used for simplicity
         await PageObjects.visualize.createSimpleMarkdownViz(vizName);
         await PageObjects.visualize.gotoVisualizationLandingPage();
-        const visCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        const visCount = await listingTable.getItemsCount('visualize');
         expect(visCount).to.equal(1);
       });
 
@@ -45,11 +46,11 @@ export default function({ getPageObjects }) {
         await PageObjects.visualize.createSimpleMarkdownViz(vizName + '2');
         await PageObjects.visualize.gotoVisualizationLandingPage();
 
-        let visCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        let visCount = await listingTable.getItemsCount('visualize');
         expect(visCount).to.equal(3);
 
         await PageObjects.visualize.deleteAllVisualizations();
-        visCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        visCount = await listingTable.getItemsCount('visualize');
         expect(visCount).to.equal(0);
       });
     });
@@ -60,45 +61,45 @@ export default function({ getPageObjects }) {
         await PageObjects.visualize.gotoVisualizationLandingPage();
         await PageObjects.visualize.navigateToNewVisualization();
         await PageObjects.visualize.clickMarkdownWidget();
-        await PageObjects.visualize.setMarkdownTxt('HELLO');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.setMarkdownTxt('HELLO');
+        await PageObjects.visEditor.clickGo();
         await PageObjects.visualize.saveVisualization('Hello World');
         await PageObjects.visualize.gotoVisualizationLandingPage();
       });
 
       it('matches on the first word', async function() {
-        await PageObjects.visualize.searchForItemWithName('Hello');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('Hello');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(1);
       });
 
       it('matches the second word', async function() {
-        await PageObjects.visualize.searchForItemWithName('World');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('World');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(1);
       });
 
       it('matches the second word prefix', async function() {
-        await PageObjects.visualize.searchForItemWithName('Wor');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('Wor');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(1);
       });
 
       it('does not match mid word', async function() {
-        await PageObjects.visualize.searchForItemWithName('orld');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('orld');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(0);
       });
 
       it('is case insensitive', async function() {
-        await PageObjects.visualize.searchForItemWithName('hello world');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('hello world');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(1);
       });
 
       it('is using AND operator', async function() {
-        await PageObjects.visualize.searchForItemWithName('hello banana');
-        const itemCount = await PageObjects.visualize.getCountOfItemsInListingTable();
+        await listingTable.searchForItemWithName('hello banana');
+        const itemCount = await listingTable.getItemsCount('visualize');
         expect(itemCount).to.equal(0);
       });
     });
diff --git a/test/functional/apps/visualize/input_control_vis/chained_controls.js b/test/functional/apps/visualize/input_control_vis/chained_controls.js
index 96d9dae519b51..b56a37218aba5 100644
--- a/test/functional/apps/visualize/input_control_vis/chained_controls.js
+++ b/test/functional/apps/visualize/input_control_vis/chained_controls.js
@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function({ getService, getPageObjects }) {
   const filterBar = getService('filterBar');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'visEditor', 'header', 'timePicker']);
   const testSubjects = getService('testSubjects');
   const find = getService('find');
   const comboBox = getService('comboBox');
@@ -65,7 +65,7 @@ export default function({ getService, getPageObjects }) {
     it('should create a seperate filter pill for parent control and child control', async () => {
       await comboBox.set('listControlSelect1', '14.61.182.136');
 
-      await PageObjects.visualize.inputControlSubmit();
+      await PageObjects.visEditor.inputControlSubmit();
 
       const hasParentControlFilter = await filterBar.hasFilter('geo.src', 'BR');
       expect(hasParentControlFilter).to.equal(true);
diff --git a/test/functional/apps/visualize/input_control_vis/dynamic_options.js b/test/functional/apps/visualize/input_control_vis/dynamic_options.js
index 2354855f12079..d78c780a728a7 100644
--- a/test/functional/apps/visualize/input_control_vis/dynamic_options.js
+++ b/test/functional/apps/visualize/input_control_vis/dynamic_options.js
@@ -20,7 +20,7 @@
 import expect from '@kbn/expect';
 
 export default function({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'visEditor', 'header', 'timePicker']);
   const comboBox = getService('comboBox');
 
   describe('dynamic options', () => {
@@ -55,7 +55,7 @@ export default function({ getService, getPageObjects }) {
 
       it('should not fetch new options when non-string is filtered', async () => {
         await comboBox.set('fieldSelect-0', 'clientip');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
 
         const initialOptions = await comboBox.getOptionsList('listControlSelect0');
         expect(
diff --git a/test/functional/apps/visualize/input_control_vis/input_control_options.js b/test/functional/apps/visualize/input_control_vis/input_control_options.js
index 1c3f63e94ae75..8e8891ac585b3 100644
--- a/test/functional/apps/visualize/input_control_vis/input_control_options.js
+++ b/test/functional/apps/visualize/input_control_vis/input_control_options.js
@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function({ getService, getPageObjects }) {
   const filterBar = getService('filterBar');
-  const PageObjects = getPageObjects(['common', 'visualize', 'header', 'timePicker']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'visEditor', 'header', 'timePicker']);
   const testSubjects = getService('testSubjects');
   const inspector = getService('inspector');
   const find = getService('find');
@@ -38,11 +38,11 @@ export default function({ getService, getPageObjects }) {
         'Jan 1, 2017 @ 00:00:00.000',
         'Jan 1, 2017 @ 00:00:00.000'
       );
-      await PageObjects.visualize.clickVisEditorTab('controls');
-      await PageObjects.visualize.addInputControl();
+      await PageObjects.visEditor.clickVisEditorTab('controls');
+      await PageObjects.visEditor.addInputControl();
       await comboBox.set('indexPatternSelect-0', 'logstash- ');
       await comboBox.set('fieldSelect-0', FIELD_NAME);
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
     });
 
     it('should not have inspector enabled', async function() {
@@ -89,7 +89,7 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should add filter pill when submit button is clicked', async () => {
-        await PageObjects.visualize.inputControlSubmit();
+        await PageObjects.visEditor.inputControlSubmit();
 
         const hasFilter = await filterBar.hasFilter(FIELD_NAME, 'ios');
         expect(hasFilter).to.equal(true);
@@ -98,7 +98,7 @@ export default function({ getService, getPageObjects }) {
       it('should replace existing filter pill(s) when new item is selected', async () => {
         await comboBox.clear('listControlSelect0');
         await comboBox.set('listControlSelect0', 'osx');
-        await PageObjects.visualize.inputControlSubmit();
+        await PageObjects.visEditor.inputControlSubmit();
         await PageObjects.common.sleep(1000);
 
         const hasOldFilter = await filterBar.hasFilter(FIELD_NAME, 'ios');
@@ -117,11 +117,11 @@ export default function({ getService, getPageObjects }) {
 
       it('should clear form when Clear button is clicked but not remove filter pill', async () => {
         await comboBox.set('listControlSelect0', 'ios');
-        await PageObjects.visualize.inputControlSubmit();
+        await PageObjects.visEditor.inputControlSubmit();
         const hasFilterBeforeClearBtnClicked = await filterBar.hasFilter(FIELD_NAME, 'ios');
         expect(hasFilterBeforeClearBtnClicked).to.equal(true);
 
-        await PageObjects.visualize.inputControlClear();
+        await PageObjects.visEditor.inputControlClear();
         const hasValue = await comboBox.doesComboBoxHaveSelectedOptions('listControlSelect0');
         expect(hasValue).to.equal(false);
 
@@ -130,7 +130,7 @@ export default function({ getService, getPageObjects }) {
       });
 
       it('should remove filter pill when cleared form is submitted', async () => {
-        await PageObjects.visualize.inputControlSubmit();
+        await PageObjects.visEditor.inputControlSubmit();
         const hasFilter = await filterBar.hasFilter(FIELD_NAME, 'ios');
         expect(hasFilter).to.equal(false);
       });
@@ -138,17 +138,17 @@ export default function({ getService, getPageObjects }) {
 
     describe('updateFiltersOnChange is true', () => {
       before(async () => {
-        await PageObjects.visualize.clickVisEditorTab('options');
-        await PageObjects.visualize.checkSwitch('inputControlEditorUpdateFiltersOnChangeCheckbox');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickVisEditorTab('options');
+        await PageObjects.visEditor.checkSwitch('inputControlEditorUpdateFiltersOnChangeCheckbox');
+        await PageObjects.visEditor.clickGo();
       });
 
       after(async () => {
-        await PageObjects.visualize.clickVisEditorTab('options');
-        await PageObjects.visualize.uncheckSwitch(
+        await PageObjects.visEditor.clickVisEditorTab('options');
+        await PageObjects.visEditor.uncheckSwitch(
           'inputControlEditorUpdateFiltersOnChangeCheckbox'
         );
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickGo();
       });
 
       it('should not display staging control buttons', async () => {
@@ -173,9 +173,9 @@ export default function({ getService, getPageObjects }) {
 
     describe('useTimeFilter', () => {
       it('should use global time filter when getting terms', async () => {
-        await PageObjects.visualize.clickVisEditorTab('options');
-        await PageObjects.visualize.checkCheckbox('inputControlEditorUseTimeFilterCheckbox');
-        await PageObjects.visualize.clickGo();
+        await PageObjects.visEditor.clickVisEditorTab('options');
+        await testSubjects.setCheckbox('inputControlEditorUseTimeFilterCheckbox', 'check');
+        await PageObjects.visEditor.clickGo();
 
         // Expect control to be disabled because no terms could be gathered with time filter applied
         const input = await find.byCssSelector('[data-test-subj="inputControl0"] input');
diff --git a/test/functional/apps/visualize/input_control_vis/input_control_range.ts b/test/functional/apps/visualize/input_control_vis/input_control_range.ts
index 2d6550de5dec9..f48ba7b54daf1 100644
--- a/test/functional/apps/visualize/input_control_vis/input_control_range.ts
+++ b/test/functional/apps/visualize/input_control_vis/input_control_range.ts
@@ -25,7 +25,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const find = getService('find');
-  const { visualize } = getPageObjects(['visualize']);
+  const { visualize, visEditor } = getPageObjects(['visualize', 'visEditor']);
 
   describe('input control range', () => {
     before(async () => {
@@ -35,36 +35,22 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it('should add filter with scripted field', async () => {
-      await visualize.addInputControl('range');
-      await visualize.setFilterParams({
-        indexPattern: 'kibana_sample_data_flights',
-        field: 'hour_of_day',
-      });
-      await visualize.clickGo();
-      await visualize.setFilterRange({
-        min: '7',
-        max: '10',
-      });
-      await visualize.inputControlSubmit();
+      await visEditor.addInputControl('range');
+      await visEditor.setFilterParams(0, 'kibana_sample_data_flights', 'hour_of_day');
+      await visEditor.clickGo();
+      await visEditor.setFilterRange(0, '7', '10');
+      await visEditor.inputControlSubmit();
       const controlFilters = await find.allByCssSelector('[data-test-subj^="filter"]');
       expect(controlFilters).to.have.length(1);
       expect(await controlFilters[0].getVisibleText()).to.equal('hour_of_day: 7 to 10');
     });
 
     it('should add filter with price field', async () => {
-      await visualize.addInputControl('range');
-      await visualize.setFilterParams({
-        aggNth: 1,
-        indexPattern: 'kibana_sample_data_flights',
-        field: 'AvgTicketPrice',
-      });
-      await visualize.clickGo();
-      await visualize.setFilterRange({
-        aggNth: 1,
-        min: '400',
-        max: '999',
-      });
-      await visualize.inputControlSubmit();
+      await visEditor.addInputControl('range');
+      await visEditor.setFilterParams(1, 'kibana_sample_data_flights', 'AvgTicketPrice');
+      await visEditor.clickGo();
+      await visEditor.setFilterRange(1, '400', '999');
+      await visEditor.inputControlSubmit();
       const controlFilters = await find.allByCssSelector('[data-test-subj^="filter"]');
       expect(controlFilters).to.have.length(2);
       expect(await controlFilters[1].getVisibleText()).to.equal('AvgTicketPrice: $400 to $999');
diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts
index ed45b3fbe069b..75a15cc16db2e 100644
--- a/test/functional/page_objects/common_page.ts
+++ b/test/functional/page_objects/common_page.ts
@@ -19,6 +19,7 @@
 
 import { delay } from 'bluebird';
 import expect from '@kbn/expect';
+import { get } from 'lodash';
 // @ts-ignore
 import fetch from 'node-fetch';
 import { FtrProviderContext } from '../ftr_provider_context';
@@ -38,6 +39,14 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
   const defaultTryTimeout = config.get('timeouts.try');
   const defaultFindTimeout = config.get('timeouts.find');
 
+  interface NavigateProps {
+    appConfig: {};
+    ensureCurrentUrl: boolean;
+    shouldLoginIfPrompted: boolean;
+    shouldAcceptAlert: boolean;
+    useActualUrl: boolean;
+  }
+
   class CommonPage {
     /**
      * Navigates the browser window to provided URL
@@ -114,6 +123,34 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
       return currentUrl;
     }
 
+    private async navigate(navigateProps: NavigateProps) {
+      const {
+        appConfig,
+        ensureCurrentUrl,
+        shouldLoginIfPrompted,
+        shouldAcceptAlert,
+        useActualUrl,
+      } = navigateProps;
+      const appUrl = getUrl.noAuth(config.get('servers.kibana'), appConfig);
+
+      await retry.try(async () => {
+        if (useActualUrl) {
+          log.debug(`navigateToActualUrl ${appUrl}`);
+          await browser.get(appUrl);
+        } else {
+          await CommonPage.navigateToUrlAndHandleAlert(appUrl, shouldAcceptAlert);
+        }
+
+        const currentUrl = shouldLoginIfPrompted
+          ? await this.loginIfPrompted(appUrl)
+          : await browser.getCurrentUrl();
+
+        if (ensureCurrentUrl && !currentUrl.includes(appUrl)) {
+          throw new Error(`expected ${currentUrl}.includes(${appUrl})`);
+        }
+      });
+    }
+
     /**
      * Navigates browser using the pathname from the appConfig and subUrl as the hash
      * @param appName As defined in the apps config, e.g. 'home'
@@ -136,23 +173,44 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
         hash: useActualUrl ? subUrl : `/${appName}/${subUrl}`,
       };
 
-      const appUrl = getUrl.noAuth(config.get('servers.kibana'), appConfig);
-
-      await retry.try(async () => {
-        if (useActualUrl) {
-          log.debug(`navigateToActualUrl ${appUrl}`);
-          await browser.get(appUrl);
-        } else {
-          await CommonPage.navigateToUrlAndHandleAlert(appUrl, shouldAcceptAlert);
-        }
+      await this.navigate({
+        appConfig,
+        ensureCurrentUrl,
+        shouldLoginIfPrompted,
+        shouldAcceptAlert,
+        useActualUrl,
+      });
+    }
 
-        const currentUrl = shouldLoginIfPrompted
-          ? await this.loginIfPrompted(appUrl)
-          : await browser.getCurrentUrl();
+    /**
+     * Navigates browser using the pathname from the appConfig and subUrl as the extended path.
+     * This was added to be able to test an application that uses browser history over hash history.
+     * @param appName As defined in the apps config, e.g. 'home'
+     * @param subUrl The route after the appUrl, e.g. 'tutorial_directory/sampleData'
+     * @param args additional arguments
+     */
+    public async navigateToUrlWithBrowserHistory(
+      appName: string,
+      subUrl?: string,
+      {
+        basePath = '',
+        ensureCurrentUrl = true,
+        shouldLoginIfPrompted = true,
+        shouldAcceptAlert = true,
+        useActualUrl = true,
+      } = {}
+    ) {
+      const appConfig = {
+        // subUrl following the basePath, assumes no hashes.  Ex: 'app/endpoint/management'
+        pathname: `${basePath}${config.get(['apps', appName]).pathname}${subUrl}`,
+      };
 
-        if (ensureCurrentUrl && !currentUrl.includes(appUrl)) {
-          throw new Error(`expected ${currentUrl}.includes(${appUrl})`);
-        }
+      await this.navigate({
+        appConfig,
+        ensureCurrentUrl,
+        shouldLoginIfPrompted,
+        shouldAcceptAlert,
+        useActualUrl,
       });
     }
 
@@ -414,6 +472,22 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
       });
       return response.status !== 200;
     }
+
+    async isCloud(): Promise<boolean> {
+      const baseUrl = this.getHostPort();
+      const username = config.get('servers.kibana.username');
+      const password = config.get('servers.kibana.password');
+      const response = await fetch(baseUrl + '/api/stats?extended', {
+        method: 'get',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: 'Basic ' + Buffer.from(username + ':' + password).toString('base64'),
+        },
+      });
+      const data = await response.json();
+      return get(data, 'usage.cloud.is_cloud_enabled', false);
+    }
+
     async waitForSaveModalToClose() {
       log.debug('Waiting for save modal to close');
       await retry.try(async () => {
diff --git a/test/functional/page_objects/dashboard_page.js b/test/functional/page_objects/dashboard_page.js
index ec258aa823405..b0f1a3304a9b8 100644
--- a/test/functional/page_objects/dashboard_page.js
+++ b/test/functional/page_objects/dashboard_page.js
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { DashboardConstants } from '../../../src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants';
+import { DashboardConstants } from '../../../src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants';
 
 export const PIE_CHART_VIS_NAME = 'Visualization PieChart';
 export const AREA_CHART_VIS_NAME = 'Visualization漢字 AreaChart';
diff --git a/test/functional/page_objects/discover_page.js b/test/functional/page_objects/discover_page.js
index 7537094bae3dd..7029fbf9e1350 100644
--- a/test/functional/page_objects/discover_page.js
+++ b/test/functional/page_objects/discover_page.js
@@ -30,7 +30,6 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
   const globalNav = getService('globalNav');
   const config = getService('config');
   const defaultFindTimeout = config.get('timeouts.find');
-  const comboBox = getService('comboBox');
   const elasticChart = getService('elasticChart');
 
   class DiscoverPage {
@@ -279,7 +278,9 @@ export function DiscoverPageProvider({ getService, getPageObjects }) {
 
     async selectIndexPattern(indexPattern) {
       await testSubjects.click('indexPattern-switch-link');
-      await comboBox.set('index-pattern-selection', indexPattern);
+      await find.clickByCssSelector(
+        `[data-test-subj="indexPattern-switcher"] [title="${indexPattern}*"]`
+      );
       await PageObjects.header.waitUntilLoadingHasFinished();
     }
 
diff --git a/test/functional/page_objects/index.ts b/test/functional/page_objects/index.ts
index 5a104c8d17bf2..5526243ea2bbd 100644
--- a/test/functional/page_objects/index.ts
+++ b/test/functional/page_objects/index.ts
@@ -39,7 +39,6 @@ import { NewsfeedPageProvider } from './newsfeed_page';
 import { PointSeriesPageProvider } from './point_series_page';
 // @ts-ignore not TS yet
 import { SettingsPageProvider } from './settings_page';
-// @ts-ignore not TS yet
 import { SharePageProvider } from './share_page';
 // @ts-ignore not TS yet
 import { ShieldPageProvider } from './shield_page';
@@ -48,8 +47,12 @@ import { TimePickerPageProvider } from './time_picker';
 // @ts-ignore not TS yet
 import { TimelionPageProvider } from './timelion_page';
 import { VisualBuilderPageProvider } from './visual_builder_page';
-// @ts-ignore not TS yet
 import { VisualizePageProvider } from './visualize_page';
+import { VisualizeEditorPageProvider } from './visualize_editor_page';
+import { VisualizeChartPageProvider } from './visualize_chart_page';
+import { TileMapPageProvider } from './tile_map_page';
+import { TagCloudPageProvider } from './tag_cloud_page';
+import { VegaChartPageProvider } from './vega_chart_page';
 
 export const pageObjects = {
   common: CommonPageProvider,
@@ -70,4 +73,9 @@ export const pageObjects = {
   timePicker: TimePickerPageProvider,
   visualBuilder: VisualBuilderPageProvider,
   visualize: VisualizePageProvider,
+  visEditor: VisualizeEditorPageProvider,
+  visChart: VisualizeChartPageProvider,
+  tileMap: TileMapPageProvider,
+  tagCloud: TagCloudPageProvider,
+  vegaChart: VegaChartPageProvider,
 };
diff --git a/test/functional/page_objects/point_series_page.js b/test/functional/page_objects/point_series_page.js
index 9172809eb73e5..74bf07b59bc38 100644
--- a/test/functional/page_objects/point_series_page.js
+++ b/test/functional/page_objects/point_series_page.js
@@ -23,10 +23,6 @@ export function PointSeriesPageProvider({ getService }) {
   const find = getService('find');
 
   class PointSeriesVis {
-    async clickOptions() {
-      return await testSubjects.click('visEditorTaboptions');
-    }
-
     async clickAxisOptions() {
       return await testSubjects.click('visEditorTabadvanced');
     }
diff --git a/test/functional/page_objects/settings_page.js b/test/functional/page_objects/settings_page.js
index a3c198b179bda..a4ae361b12ed8 100644
--- a/test/functional/page_objects/settings_page.js
+++ b/test/functional/page_objects/settings_page.js
@@ -547,7 +547,7 @@ export function SettingsPageProvider({ getService, getPageObjects }) {
 
     async setScriptedFieldScript(script) {
       log.debug('set scripted field script = ' + script);
-      const aceEditorCssSelector = '[data-test-subj="codeEditorContainer"] .ace_editor';
+      const aceEditorCssSelector = '[data-test-subj="editorFieldScript"] .ace_editor';
       await find.clickByCssSelector(aceEditorCssSelector);
       for (let i = 0; i < 1000; i++) {
         await browser.pressKeys(browser.keys.BACK_SPACE);
diff --git a/test/functional/page_objects/share_page.ts b/test/functional/page_objects/share_page.ts
index 906effcb54a26..fc8db9b78a03f 100644
--- a/test/functional/page_objects/share_page.ts
+++ b/test/functional/page_objects/share_page.ts
@@ -19,10 +19,9 @@
 
 import { FtrProviderContext } from '../ftr_provider_context';
 
-export function SharePageProvider({ getService, getPageObjects }: FtrProviderContext) {
+export function SharePageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const find = getService('find');
-  const PageObjects = getPageObjects(['visualize', 'common']);
   const log = getService('log');
 
   class SharePage {
@@ -78,7 +77,7 @@ export function SharePageProvider({ getService, getPageObjects }: FtrProviderCon
 
     async checkShortenUrl() {
       const shareForm = await testSubjects.find('shareUrlForm');
-      await PageObjects.visualize.checkCheckbox('useShortUrl');
+      await testSubjects.setCheckbox('useShortUrl', 'check');
       await shareForm.waitForDeletedByCssSelector('.euiLoadingSpinner');
     }
 
diff --git a/test/functional/page_objects/tag_cloud_page.ts b/test/functional/page_objects/tag_cloud_page.ts
new file mode 100644
index 0000000000000..7d87caa39b2fb
--- /dev/null
+++ b/test/functional/page_objects/tag_cloud_page.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 { FtrProviderContext } from '../ftr_provider_context';
+import { WebElementWrapper } from '../services/lib/web_element_wrapper';
+
+export function TagCloudPageProvider({ getService, getPageObjects }: FtrProviderContext) {
+  const find = getService('find');
+  const testSubjects = getService('testSubjects');
+  const { header, visChart } = getPageObjects(['header', 'visChart']);
+
+  class TagCloudPage {
+    public async selectTagCloudTag(tagDisplayText: string) {
+      await testSubjects.click(tagDisplayText);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async getTextTag() {
+      await visChart.waitForVisualization();
+      const elements = await find.allByCssSelector('text');
+      return await Promise.all(elements.map(async element => await element.getVisibleText()));
+    }
+
+    public async getTextSizes() {
+      const tags = await find.allByCssSelector('text');
+      async function returnTagSize(tag: WebElementWrapper) {
+        const style = await tag.getAttribute('style');
+        const fontSize = style.match(/font-size: ([^;]*);/);
+        return fontSize ? fontSize[1] : '';
+      }
+      return await Promise.all(tags.map(returnTagSize));
+    }
+  }
+
+  return new TagCloudPage();
+}
diff --git a/test/functional/page_objects/tile_map_page.ts b/test/functional/page_objects/tile_map_page.ts
new file mode 100644
index 0000000000000..b41578f782af4
--- /dev/null
+++ b/test/functional/page_objects/tile_map_page.ts
@@ -0,0 +1,102 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export function TileMapPageProvider({ getService, getPageObjects }: FtrProviderContext) {
+  const find = getService('find');
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+  const log = getService('log');
+  const inspector = getService('inspector');
+  const { header } = getPageObjects(['header']);
+
+  class TileMapPage {
+    public async getZoomSelectors(zoomSelector: string) {
+      return await find.allByCssSelector(zoomSelector);
+    }
+
+    public async clickMapButton(zoomSelector: string, waitForLoading?: boolean) {
+      await retry.try(async () => {
+        const zooms = await this.getZoomSelectors(zoomSelector);
+        await Promise.all(zooms.map(async zoom => await zoom.click()));
+        if (waitForLoading) {
+          await header.waitUntilLoadingHasFinished();
+        }
+      });
+    }
+
+    public async getVisualizationRequest() {
+      log.debug('getVisualizationRequest');
+      await inspector.open();
+      await testSubjects.click('inspectorViewChooser');
+      await testSubjects.click('inspectorViewChooserRequests');
+      await testSubjects.click('inspectorRequestDetailRequest');
+      return await testSubjects.getVisibleText('inspectorRequestBody');
+    }
+
+    public async getMapBounds(): Promise<object> {
+      const request = await this.getVisualizationRequest();
+      const requestObject = JSON.parse(request);
+      return requestObject.aggs.filter_agg.filter.geo_bounding_box['geo.coordinates'];
+    }
+
+    public async clickMapZoomIn(waitForLoading = true) {
+      await this.clickMapButton('a.leaflet-control-zoom-in', waitForLoading);
+    }
+
+    public async clickMapZoomOut(waitForLoading = true) {
+      await this.clickMapButton('a.leaflet-control-zoom-out', waitForLoading);
+    }
+
+    public async getMapZoomEnabled(zoomSelector: string): Promise<boolean> {
+      const zooms = await this.getZoomSelectors(zoomSelector);
+      const classAttributes = await Promise.all(
+        zooms.map(async zoom => await zoom.getAttribute('class'))
+      );
+      return !classAttributes.join('').includes('leaflet-disabled');
+    }
+
+    public async zoomAllTheWayOut(): Promise<void> {
+      // we can tell we're at level 1 because zoom out is disabled
+      return await retry.try(async () => {
+        await this.clickMapZoomOut();
+        const enabled = await this.getMapZoomOutEnabled();
+        // should be able to zoom more as current config has 0 as min level.
+        if (enabled) {
+          throw new Error('Not fully zoomed out yet');
+        }
+      });
+    }
+
+    public async getMapZoomInEnabled() {
+      return await this.getMapZoomEnabled('a.leaflet-control-zoom-in');
+    }
+
+    public async getMapZoomOutEnabled() {
+      return await this.getMapZoomEnabled('a.leaflet-control-zoom-out');
+    }
+
+    public async clickMapFitDataBounds() {
+      return await this.clickMapButton('a.fa-crop');
+    }
+  }
+
+  return new TileMapPage();
+}
diff --git a/test/functional/page_objects/vega_chart_page.ts b/test/functional/page_objects/vega_chart_page.ts
new file mode 100644
index 0000000000000..9931ebebef6ef
--- /dev/null
+++ b/test/functional/page_objects/vega_chart_page.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export function VegaChartPageProvider({
+  getService,
+  getPageObjects,
+  updateBaselines,
+}: FtrProviderContext & { updateBaselines: boolean }) {
+  const find = getService('find');
+  const testSubjects = getService('testSubjects');
+  const browser = getService('browser');
+  const screenshot = getService('screenshots');
+  const log = getService('log');
+  const { visEditor, visChart } = getPageObjects(['visEditor', 'visChart']);
+
+  class VegaChartPage {
+    public async getSpec() {
+      // Adapted from console_page.js:getVisibleTextFromAceEditor(). Is there a common utilities file?
+      const editor = await testSubjects.find('vega-editor');
+      const lines = await editor.findAllByClassName('ace_line_group');
+      const linesText = await Promise.all(
+        lines.map(async line => {
+          return await line.getVisibleText();
+        })
+      );
+      return linesText.join('\n');
+    }
+
+    public async getViewContainer() {
+      return await find.byCssSelector('div.vgaVis__view');
+    }
+
+    public async getControlContainer() {
+      return await find.byCssSelector('div.vgaVis__controls');
+    }
+
+    /**
+     * Removes chrome and takes a small screenshot of a vis to compare against a baseline.
+     * @param {string} name The name of the baseline image.
+     * @param {object} opts Options object.
+     * @param {number} opts.threshold Threshold for allowed variance when comparing images.
+     */
+    public async expectVisToMatchScreenshot(name: string, opts = { threshold: 0.05 }) {
+      log.debug(`expectVisToMatchScreenshot(${name})`);
+
+      // Collapse sidebar and inject some CSS to hide the nav so we have a focused screenshot
+      await visEditor.clickEditorSidebarCollapse();
+      await visChart.waitForVisualizationRenderingStabilized();
+      await browser.execute(`
+          var el = document.createElement('style');
+          el.id = '__data-test-style';
+          el.innerHTML = '[data-test-subj="headerGlobalNav"] { display: none; } ';
+          el.innerHTML += '[data-test-subj="top-nav"] { display: none; } ';
+          el.innerHTML += '[data-test-subj="experimentalVisInfo"] { display: none; } ';
+          document.body.appendChild(el);
+        `);
+
+      const percentDifference = await screenshot.compareAgainstBaseline(name, updateBaselines);
+
+      // Reset the chart to its original state
+      await browser.execute(`
+          var el = document.getElementById('__data-test-style');
+          document.body.removeChild(el);
+        `);
+      await visEditor.clickEditorSidebarCollapse();
+      await visChart.waitForVisualizationRenderingStabilized();
+      expect(percentDifference).to.be.lessThan(opts.threshold);
+    }
+  }
+
+  return new VegaChartPage();
+}
diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
index 97d5787350376..2fa59d5fd89d8 100644
--- a/test/functional/page_objects/visual_builder_page.ts
+++ b/test/functional/page_objects/visual_builder_page.ts
@@ -26,7 +26,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
   const comboBox = getService('comboBox');
-  const PageObjects = getPageObjects(['common', 'header', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['common', 'header', 'visualize', 'timePicker', 'visChart']);
 
   type Duration =
     | 'Milliseconds'
@@ -101,7 +101,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
     }
 
     public async getMetricValue() {
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
       const metricValue = await find.byCssSelector('.tvbVisMetric__value--primary');
       return metricValue.getVisibleText();
     }
@@ -110,7 +110,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
       const input = await find.byCssSelector('.tvbMarkdownEditor__editor textarea');
       await this.clearMarkdown();
       await input.type(markdown, { charByChar: true });
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
     }
 
     public async clearMarkdown() {
@@ -304,7 +304,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
     }
 
     public async getRhythmChartLegendValue(nth = 0) {
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
       const metricValue = (
         await find.allByCssSelector(`.echLegendItem .echLegendItem__displayValue`)
       )[nth];
@@ -348,7 +348,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
       const prevAggs = await testSubjects.findAll('aggSelector');
       const elements = await testSubjects.findAll('addMetricAddBtn');
       await elements[nth].click();
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
       await retry.waitFor('new agg is added', async () => {
         const currentAggs = await testSubjects.findAll('aggSelector');
         return currentAggs.length > prevAggs.length;
@@ -485,7 +485,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
       await this.checkColorPickerPopUpIsPresent();
       await find.setValue('.tvbColorPickerPopUp input', colorHex);
       await this.clickColorPicker();
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
     }
 
     public async checkColorPickerPopUpIsPresent(): Promise<void> {
@@ -494,10 +494,10 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
     }
 
     public async changePanelPreview(nth: number = 0): Promise<void> {
-      const prevRenderingCount = await PageObjects.visualize.getVisualizationRenderingCount();
+      const prevRenderingCount = await PageObjects.visChart.getVisualizationRenderingCount();
       const changePreviewBtnArray = await testSubjects.findAll('AddActivatePanelBtn');
       await changePreviewBtnArray[nth].click();
-      await PageObjects.visualize.waitForRenderingCount(prevRenderingCount + 1);
+      await PageObjects.visChart.waitForRenderingCount(prevRenderingCount + 1);
     }
 
     public async checkPreviewIsDisabled(): Promise<void> {
@@ -508,7 +508,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
     public async cloneSeries(nth: number = 0): Promise<void> {
       const cloneBtnArray = await testSubjects.findAll('AddCloneBtn');
       await cloneBtnArray[nth].click();
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
     }
 
     /**
@@ -525,10 +525,10 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
     }
 
     public async deleteSeries(nth: number = 0): Promise<void> {
-      const prevRenderingCount = await PageObjects.visualize.getVisualizationRenderingCount();
+      const prevRenderingCount = await PageObjects.visChart.getVisualizationRenderingCount();
       const cloneBtnArray = await testSubjects.findAll('AddDeleteBtn');
       await cloneBtnArray[nth].click();
-      await PageObjects.visualize.waitForRenderingCount(prevRenderingCount + 1);
+      await PageObjects.visChart.waitForRenderingCount(prevRenderingCount + 1);
     }
 
     public async getLegendItems(): Promise<WebElementWrapper[]> {
diff --git a/test/functional/page_objects/visualize_chart_page.ts b/test/functional/page_objects/visualize_chart_page.ts
new file mode 100644
index 0000000000000..138e5758ede7c
--- /dev/null
+++ b/test/functional/page_objects/visualize_chart_page.ts
@@ -0,0 +1,386 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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 function VisualizeChartPageProvider({ getService, getPageObjects }: FtrProviderContext) {
+  const testSubjects = getService('testSubjects');
+  const config = getService('config');
+  const find = getService('find');
+  const log = getService('log');
+  const retry = getService('retry');
+  const table = getService('table');
+  const defaultFindTimeout = config.get('timeouts.find');
+  const { common } = getPageObjects(['common']);
+
+  class VisualizeChart {
+    public async getYAxisTitle() {
+      const title = await find.byCssSelector('.y-axis-div .y-axis-title text');
+      return await title.getVisibleText();
+    }
+
+    public async getXAxisLabels() {
+      const xAxis = await find.byCssSelector('.visAxis--x.visAxis__column--bottom');
+      const $ = await xAxis.parseDomContent();
+      return $('.x > g > text')
+        .toArray()
+        .map(tick =>
+          $(tick)
+            .text()
+            .trim()
+        );
+    }
+
+    public async getYAxisLabels() {
+      const yAxis = await find.byCssSelector('.visAxis__column--y.visAxis__column--left');
+      const $ = await yAxis.parseDomContent();
+      return $('.y > g > text')
+        .toArray()
+        .map(tick =>
+          $(tick)
+            .text()
+            .trim()
+        );
+    }
+
+    /**
+     * Gets the chart data and scales it based on chart height and label.
+     * @param dataLabel data-label value
+     * @param axis  axis value, 'ValueAxis-1' by default
+     *
+     * Returns an array of height values
+     */
+    public async getAreaChartData(dataLabel: string, axis = 'ValueAxis-1') {
+      const yAxisRatio = await this.getChartYAxisRatio(axis);
+
+      const rectangle = await find.byCssSelector('rect.background');
+      const yAxisHeight = Number(await rectangle.getAttribute('height'));
+      log.debug(`height --------- ${yAxisHeight}`);
+
+      const path = await retry.try(
+        async () =>
+          await find.byCssSelector(`path[data-label="${dataLabel}"]`, defaultFindTimeout * 2)
+      );
+      const data = await path.getAttribute('d');
+      log.debug(data);
+      // This area chart data starts with a 'M'ove to a x,y location, followed
+      // by a bunch of 'L'ines from that point to the next.  Those points are
+      // the values we're going to use to calculate the data values we're testing.
+      // So git rid of the one 'M' and split the rest on the 'L's.
+      const tempArray = data
+        .replace('M ', '')
+        .replace('M', '')
+        .replace(/ L /g, 'L')
+        .replace(/ /g, ',')
+        .split('L');
+      const chartSections = tempArray.length / 2;
+      const chartData = [];
+      for (let i = 0; i < chartSections; i++) {
+        chartData[i] = Math.round((yAxisHeight - Number(tempArray[i].split(',')[1])) * yAxisRatio);
+        log.debug('chartData[i] =' + chartData[i]);
+      }
+      return chartData;
+    }
+
+    /**
+     * Returns the paths that compose an area chart.
+     * @param dataLabel data-label value
+     */
+    public async getAreaChartPaths(dataLabel: string) {
+      const path = await retry.try(
+        async () =>
+          await find.byCssSelector(`path[data-label="${dataLabel}"]`, defaultFindTimeout * 2)
+      );
+      const data = await path.getAttribute('d');
+      log.debug(data);
+      // This area chart data starts with a 'M'ove to a x,y location, followed
+      // by a bunch of 'L'ines from that point to the next.  Those points are
+      // the values we're going to use to calculate the data values we're testing.
+      // So git rid of the one 'M' and split the rest on the 'L's.
+      return data.split('L');
+    }
+
+    /**
+     * Gets the dots and normalizes their height.
+     * @param dataLabel data-label value
+     * @param axis axis value, 'ValueAxis-1' by default
+     */
+    public async getLineChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
+      // 1). get the range/pixel ratio
+      const yAxisRatio = await this.getChartYAxisRatio(axis);
+      // 2). find and save the y-axis pixel size (the chart height)
+      const rectangle = await find.byCssSelector('clipPath rect');
+      const yAxisHeight = Number(await rectangle.getAttribute('height'));
+      // 3). get the visWrapper__chart elements
+      const chartTypes = await retry.try(
+        async () =>
+          await find.allByCssSelector(
+            `.visWrapper__chart circle[data-label="${dataLabel}"][fill-opacity="1"]`,
+            defaultFindTimeout * 2
+          )
+      );
+      // 4). for each chart element, find the green circle, then the cy position
+      const chartData = await Promise.all(
+        chartTypes.map(async chart => {
+          const cy = Number(await chart.getAttribute('cy'));
+          // the point_series_options test has data in the billions range and
+          // getting 11 digits of precision with these calculations is very hard
+          return Math.round(Number(((yAxisHeight - cy) * yAxisRatio).toPrecision(6)));
+        })
+      );
+
+      return chartData;
+    }
+
+    /**
+     * Returns bar chart data in pixels
+     * @param dataLabel data-label value
+     * @param axis axis value, 'ValueAxis-1' by default
+     */
+    public async getBarChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
+      const yAxisRatio = await this.getChartYAxisRatio(axis);
+      const svg = await find.byCssSelector('div.chart');
+      const $ = await svg.parseDomContent();
+      const chartData = $(`g > g.series > rect[data-label="${dataLabel}"]`)
+        .toArray()
+        .map(chart => {
+          const barHeight = Number($(chart).attr('height'));
+          return Math.round(barHeight * yAxisRatio);
+        });
+
+      return chartData;
+    }
+
+    /**
+     * Returns the range/pixel ratio
+     * @param axis axis value, 'ValueAxis-1' by default
+     */
+    private async getChartYAxisRatio(axis = 'ValueAxis-1') {
+      // 1). get the maximum chart Y-Axis marker value and Y position
+      const maxYAxisChartMarker = await retry.try(
+        async () =>
+          await find.byCssSelector(
+            `div.visAxis__splitAxes--y > div > svg > g.${axis} > g:last-of-type.tick`
+          )
+      );
+      const maxYLabel = (await maxYAxisChartMarker.getVisibleText()).replace(/,/g, '');
+      const maxYLabelYPosition = (await maxYAxisChartMarker.getPosition()).y;
+      log.debug(`maxYLabel = ${maxYLabel}, maxYLabelYPosition = ${maxYLabelYPosition}`);
+
+      // 2). get the minimum chart Y-Axis marker value and Y position
+      const minYAxisChartMarker = await find.byCssSelector(
+        'div.visAxis__column--y.visAxis__column--left  > div > div > svg:nth-child(2) > g > g:nth-child(1).tick'
+      );
+      const minYLabel = (await minYAxisChartMarker.getVisibleText()).replace(',', '');
+      const minYLabelYPosition = (await minYAxisChartMarker.getPosition()).y;
+      return (Number(maxYLabel) - Number(minYLabel)) / (minYLabelYPosition - maxYLabelYPosition);
+    }
+
+    public async toggleLegend(show = true) {
+      await retry.try(async () => {
+        const isVisible = find.byCssSelector('.visLegend');
+        if ((show && !isVisible) || (!show && isVisible)) {
+          await testSubjects.click('vislibToggleLegend');
+        }
+      });
+    }
+
+    public async filterLegend(name: string) {
+      await this.toggleLegend();
+      await testSubjects.click(`legend-${name}`);
+      const filters = await testSubjects.find(`legend-${name}-filters`);
+      const [filterIn] = await filters.findAllByCssSelector(`input`);
+      await filterIn.click();
+      await this.waitForVisualizationRenderingStabilized();
+    }
+
+    public async doesLegendColorChoiceExist(color: string) {
+      return await testSubjects.exists(`legendSelectColor-${color}`);
+    }
+
+    public async selectNewLegendColorChoice(color: string) {
+      await testSubjects.click(`legendSelectColor-${color}`);
+    }
+
+    public async doesSelectedLegendColorExist(color: string) {
+      return await testSubjects.exists(`legendSelectedColor-${color}`);
+    }
+
+    public async expectError() {
+      await testSubjects.existOrFail('visLibVisualizeError');
+    }
+
+    public async getVisualizationRenderingCount() {
+      const visualizationLoader = await testSubjects.find('visualizationLoader');
+      const renderingCount = await visualizationLoader.getAttribute('data-rendering-count');
+      return Number(renderingCount);
+    }
+
+    public async waitForRenderingCount(minimumCount = 1) {
+      await retry.waitFor(
+        `rendering count to be greater than or equal to [${minimumCount}]`,
+        async () => {
+          const currentRenderingCount = await this.getVisualizationRenderingCount();
+          log.debug(`-- currentRenderingCount=${currentRenderingCount}`);
+          return currentRenderingCount >= minimumCount;
+        }
+      );
+    }
+
+    public async waitForVisualizationRenderingStabilized() {
+      // assuming rendering is done when data-rendering-count is constant within 1000 ms
+      await retry.waitFor('rendering count to stabilize', async () => {
+        const firstCount = await this.getVisualizationRenderingCount();
+        log.debug(`-- firstCount=${firstCount}`);
+
+        await common.sleep(1000);
+
+        const secondCount = await this.getVisualizationRenderingCount();
+        log.debug(`-- secondCount=${secondCount}`);
+
+        return firstCount === secondCount;
+      });
+    }
+
+    public async waitForVisualization() {
+      await this.waitForVisualizationRenderingStabilized();
+      await find.byCssSelector('.visualization');
+    }
+
+    public async getLegendEntries() {
+      const legendEntries = await find.allByCssSelector(
+        '.visLegend__button',
+        defaultFindTimeout * 2
+      );
+      return await Promise.all(
+        legendEntries.map(async chart => await chart.getAttribute('data-label'))
+      );
+    }
+
+    public async openLegendOptionColors(name: string) {
+      await this.waitForVisualizationRenderingStabilized();
+      await retry.try(async () => {
+        // This click has been flaky in opening the legend, hence the retry.  See
+        // https://github.com/elastic/kibana/issues/17468
+        await testSubjects.click(`legend-${name}`);
+        await this.waitForVisualizationRenderingStabilized();
+        // arbitrary color chosen, any available would do
+        const isOpen = await this.doesLegendColorChoiceExist('#EF843C');
+        if (!isOpen) {
+          throw new Error('legend color selector not open');
+        }
+      });
+    }
+
+    public async filterOnTableCell(column: string, row: string) {
+      await retry.try(async () => {
+        const tableVis = await testSubjects.find('tableVis');
+        const cell = await tableVis.findByCssSelector(
+          `tbody tr:nth-child(${row}) td:nth-child(${column})`
+        );
+        await cell.moveMouseTo();
+        const filterBtn = await testSubjects.findDescendant('filterForCellValue', cell);
+        await filterBtn.click();
+      });
+    }
+
+    public async getMarkdownText() {
+      const markdownContainer = await testSubjects.find('markdownBody');
+      return markdownContainer.getVisibleText();
+    }
+
+    public async getMarkdownBodyDescendentText(selector: string) {
+      const markdownContainer = await testSubjects.find('markdownBody');
+      const element = await find.descendantDisplayedByCssSelector(selector, markdownContainer);
+      return element.getVisibleText();
+    }
+
+    /**
+     * If you are writing new tests, you should rather look into getTableVisContent method instead.
+     */
+    public async getTableVisData() {
+      return await testSubjects.getVisibleText('paginated-table-body');
+    }
+
+    /**
+     * This function is the newer function to retrieve data from within a table visualization.
+     * It uses a better return format, than the old getTableVisData, by properly splitting
+     * cell values into arrays. Please use this function for newer tests.
+     */
+    public async getTableVisContent({ stripEmptyRows = true } = {}) {
+      return await retry.try(async () => {
+        const container = await testSubjects.find('tableVis');
+        const allTables = await testSubjects.findAllDescendant('paginated-table-body', container);
+
+        if (allTables.length === 0) {
+          return [];
+        }
+
+        const allData = await Promise.all(
+          allTables.map(async t => {
+            let data = await table.getDataFromElement(t);
+            if (stripEmptyRows) {
+              data = data.filter(row => row.length > 0 && row.some(cell => cell.trim().length > 0));
+            }
+            return data;
+          })
+        );
+
+        if (allTables.length === 1) {
+          // If there was only one table we return only the data for that table
+          // This prevents an unnecessary array around that single table, which
+          // is the case we have in most tests.
+          return allData[0];
+        }
+
+        return allData;
+      });
+    }
+
+    public async getMetric() {
+      const elements = await find.allByCssSelector(
+        '[data-test-subj="visualizationLoader"] .mtrVis__container'
+      );
+      const values = await Promise.all(
+        elements.map(async element => {
+          const text = await element.getVisibleText();
+          return text;
+        })
+      );
+      return values
+        .filter(item => item.length > 0)
+        .reduce((arr: string[], item) => arr.concat(item.split('\n')), []);
+    }
+
+    public async getGaugeValue() {
+      const elements = await find.allByCssSelector(
+        '[data-test-subj="visualizationLoader"] .chart svg text'
+      );
+      const values = await Promise.all(
+        elements.map(async element => {
+          const text = await element.getVisibleText();
+          return text;
+        })
+      );
+      return values.filter(item => item.length > 0);
+    }
+  }
+
+  return new VisualizeChart();
+}
diff --git a/test/functional/page_objects/visualize_editor_page.ts b/test/functional/page_objects/visualize_editor_page.ts
new file mode 100644
index 0000000000000..7e512975356f3
--- /dev/null
+++ b/test/functional/page_objects/visualize_editor_page.ts
@@ -0,0 +1,462 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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/expect.js';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export function VisualizeEditorPageProvider({ getService, getPageObjects }: FtrProviderContext) {
+  const find = getService('find');
+  const log = getService('log');
+  const retry = getService('retry');
+  const browser = getService('browser');
+  const testSubjects = getService('testSubjects');
+  const comboBox = getService('comboBox');
+  const { common, header, visChart } = getPageObjects(['common', 'header', 'visChart']);
+
+  interface IntervalOptions {
+    type?: 'default' | 'numeric' | 'custom';
+    aggNth?: number;
+    append?: boolean;
+  }
+
+  class VisualizeEditorPage {
+    public async clickDataTab() {
+      await testSubjects.click('visualizeEditDataLink');
+    }
+
+    public async clickOptionsTab() {
+      await testSubjects.click('visEditorTaboptions');
+    }
+
+    public async clickMetricsAndAxes() {
+      await testSubjects.click('visEditorTabadvanced');
+    }
+
+    public async clickVisEditorTab(tabName: string) {
+      await testSubjects.click('visEditorTab' + tabName);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async addInputControl(type?: string) {
+      if (type) {
+        const selectInput = await testSubjects.find('selectControlType');
+        await selectInput.type(type);
+      }
+      await testSubjects.click('inputControlEditorAddBtn');
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async inputControlClear() {
+      await testSubjects.click('inputControlClearBtn');
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async inputControlSubmit() {
+      await testSubjects.clickWhenNotDisabled('inputControlSubmitBtn');
+      await visChart.waitForVisualizationRenderingStabilized();
+    }
+
+    public async clickGo() {
+      const prevRenderingCount = await visChart.getVisualizationRenderingCount();
+      log.debug(`Before Rendering count ${prevRenderingCount}`);
+      await testSubjects.clickWhenNotDisabled('visualizeEditorRenderButton');
+      await visChart.waitForRenderingCount(prevRenderingCount + 1);
+    }
+
+    public async removeDimension(aggNth: number) {
+      await testSubjects.click(`visEditorAggAccordion${aggNth} > removeDimensionBtn`);
+    }
+
+    public async setFilterParams(aggNth: number, indexPattern: string, field: string) {
+      await comboBox.set(`indexPatternSelect-${aggNth}`, indexPattern);
+      await comboBox.set(`fieldSelect-${aggNth}`, field);
+    }
+
+    public async setFilterRange(aggNth: number, min: string, max: string) {
+      const control = await testSubjects.find(`inputControl${aggNth}`);
+      const inputMin = await control.findByCssSelector('[name$="minValue"]');
+      await inputMin.type(min);
+      const inputMax = await control.findByCssSelector('[name$="maxValue"]');
+      await inputMax.type(max);
+    }
+
+    public async clickSplitDirection(direction: string) {
+      const control = await testSubjects.find('visEditorSplitBy');
+      const radioBtn = await control.findByCssSelector(`[title="${direction}"]`);
+      await radioBtn.click();
+    }
+
+    /**
+     * Adds new bucket
+     * @param bucketName bucket name, like 'X-axis', 'Split rows', 'Split series'
+     * @param type aggregation type, like 'buckets', 'metrics'
+     */
+    public async clickBucket(bucketName: string, type = 'buckets') {
+      await testSubjects.click(`visEditorAdd_${type}`);
+      await find.clickByCssSelector(`[data-test-subj="visEditorAdd_${type}_${bucketName}"`);
+    }
+
+    public async clickEnableCustomRanges() {
+      await testSubjects.click('heatmapUseCustomRanges');
+    }
+
+    public async clickAddRange() {
+      await testSubjects.click(`heatmapColorRange__addRangeButton`);
+    }
+
+    public async setCustomRangeByIndex(index: string, from: string, to: string) {
+      await testSubjects.setValue(`heatmapColorRange${index}__from`, from);
+      await testSubjects.setValue(`heatmapColorRange${index}__to`, to);
+    }
+
+    public async changeHeatmapColorNumbers(value = 6) {
+      const input = await testSubjects.find(`heatmapColorsNumber`);
+      await input.clearValueWithKeyboard();
+      await input.type(`${value}`);
+    }
+
+    public async getBucketErrorMessage() {
+      const error = await find.byCssSelector(
+        '[group-name="buckets"] [data-test-subj="defaultEditorAggSelect"] + .euiFormErrorText'
+      );
+      const errorMessage = await error.getAttribute('innerText');
+      log.debug(errorMessage);
+      return errorMessage;
+    }
+
+    public async addNewFilterAggregation() {
+      await testSubjects.click('visEditorAddFilterButton');
+    }
+
+    public async selectField(
+      fieldValue: string,
+      groupName = 'buckets',
+      childAggregationType = false
+    ) {
+      log.debug(`selectField ${fieldValue}`);
+      const selector = `
+          [group-name="${groupName}"]
+          [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
+          [data-test-subj="visAggEditorParams"]
+          ${childAggregationType ? '.visEditorAgg__subAgg' : ''}
+          [data-test-subj="visDefaultEditorField"]
+        `;
+      const fieldEl = await find.byCssSelector(selector);
+      await comboBox.setElement(fieldEl, fieldValue);
+    }
+
+    public async selectOrderByMetric(aggNth: number, metric: string) {
+      const sortSelect = await testSubjects.find(`visEditorOrderBy${aggNth}`);
+      const sortMetric = await sortSelect.findByCssSelector(`option[value="${metric}"]`);
+      await sortMetric.click();
+    }
+
+    public async selectCustomSortMetric(aggNth: number, metric: string, field: string) {
+      await this.selectOrderByMetric(aggNth, 'custom');
+      await this.selectAggregation(metric, 'buckets', true);
+      await this.selectField(field, 'buckets', true);
+    }
+
+    public async selectAggregation(
+      aggValue: string,
+      groupName = 'buckets',
+      childAggregationType = false
+    ) {
+      const comboBoxElement = await find.byCssSelector(`
+          [group-name="${groupName}"]
+          [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
+          ${childAggregationType ? '.visEditorAgg__subAgg' : ''}
+          [data-test-subj="defaultEditorAggSelect"]
+        `);
+
+      await comboBox.setElement(comboBoxElement, aggValue);
+      await common.sleep(500);
+    }
+
+    /**
+     * Set the test for a filter aggregation.
+     * @param {*} filterValue the string value of the filter
+     * @param {*} filterIndex used when multiple filters are configured on the same aggregation
+     * @param {*} aggregationId the ID if the aggregation. On Tests, it start at from 2
+     */
+    public async setFilterAggregationValue(
+      filterValue: string,
+      filterIndex = 0,
+      aggregationId = 2
+    ) {
+      await testSubjects.setValue(
+        `visEditorFilterInput_${aggregationId}_${filterIndex}`,
+        filterValue
+      );
+    }
+
+    public async setValue(newValue: string) {
+      const input = await find.byCssSelector('[data-test-subj="visEditorPercentileRanks"] input');
+      await input.clearValue();
+      await input.type(newValue);
+    }
+
+    public async clickEditorSidebarCollapse() {
+      await testSubjects.click('collapseSideBarButton');
+    }
+
+    public async clickDropPartialBuckets() {
+      await testSubjects.click('dropPartialBucketsCheckbox');
+    }
+
+    public async setMarkdownTxt(markdownTxt: string) {
+      const input = await testSubjects.find('markdownTextarea');
+      await input.clearValue();
+      await input.type(markdownTxt);
+    }
+
+    public async isSwitchChecked(selector: string) {
+      const checkbox = await testSubjects.find(selector);
+      const isChecked = await checkbox.getAttribute('aria-checked');
+      return isChecked === 'true';
+    }
+
+    public async checkSwitch(selector: string) {
+      const isChecked = await this.isSwitchChecked(selector);
+      if (!isChecked) {
+        log.debug(`checking switch ${selector}`);
+        await testSubjects.click(selector);
+      }
+    }
+
+    public async uncheckSwitch(selector: string) {
+      const isChecked = await this.isSwitchChecked(selector);
+      if (isChecked) {
+        log.debug(`unchecking switch ${selector}`);
+        await testSubjects.click(selector);
+      }
+    }
+
+    public async setIsFilteredByCollarCheckbox(value = true) {
+      await retry.try(async () => {
+        const isChecked = await this.isSwitchChecked('isFilteredByCollarCheckbox');
+        if (isChecked !== value) {
+          await testSubjects.click('isFilteredByCollarCheckbox');
+          throw new Error('isFilteredByCollar not set correctly');
+        }
+      });
+    }
+
+    public async setCustomLabel(label: string, index = 1) {
+      const customLabel = await testSubjects.find(`visEditorStringInput${index}customLabel`);
+      customLabel.type(label);
+    }
+
+    public async selectYAxisAggregation(agg: string, field: string, label: string, index = 1) {
+      // index starts on the first "count" metric at 1
+      // Each new metric or aggregation added to a visualization gets the next index.
+      // So to modify a metric or aggregation tests need to keep track of the
+      // order they are added.
+      await this.toggleOpenEditor(index);
+
+      // select our agg
+      const aggSelect = await find.byCssSelector(
+        `#visEditorAggAccordion${index} [data-test-subj="defaultEditorAggSelect"]`
+      );
+      await comboBox.setElement(aggSelect, agg);
+
+      const fieldSelect = await find.byCssSelector(
+        `#visEditorAggAccordion${index} [data-test-subj="visDefaultEditorField"]`
+      );
+      // select our field
+      await comboBox.setElement(fieldSelect, field);
+      // enter custom label
+      await this.setCustomLabel(label, index);
+    }
+
+    public async getField() {
+      return await comboBox.getComboBoxSelectedOptions('visDefaultEditorField');
+    }
+
+    public async sizeUpEditor() {
+      await testSubjects.click('visualizeEditorResizer');
+      await browser.pressKeys(browser.keys.ARROW_RIGHT);
+    }
+
+    public async toggleDisabledAgg(agg: string) {
+      await testSubjects.click(`visEditorAggAccordion${agg} > ~toggleDisableAggregationBtn`);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async toggleAggregationEditor(agg: string) {
+      await find.clickByCssSelector(
+        `[data-test-subj="visEditorAggAccordion${agg}"] .euiAccordion__button`
+      );
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async toggleOtherBucket(agg = 2) {
+      await testSubjects.click(`visEditorAggAccordion${agg} > otherBucketSwitch`);
+    }
+
+    public async toggleMissingBucket(agg = 2) {
+      await testSubjects.click(`visEditorAggAccordion${agg} > missingBucketSwitch`);
+    }
+
+    public async toggleScaleMetrics() {
+      await testSubjects.click('scaleMetricsSwitch');
+    }
+
+    public async toggleAutoMode() {
+      await testSubjects.click('visualizeEditorAutoButton');
+    }
+
+    public async isApplyEnabled() {
+      const applyButton = await testSubjects.find('visualizeEditorRenderButton');
+      return await applyButton.isEnabled();
+    }
+
+    public async toggleAccordion(id: string, toState = 'true') {
+      const toggle = await find.byCssSelector(`button[aria-controls="${id}"]`);
+      const toggleOpen = await toggle.getAttribute('aria-expanded');
+      log.debug(`toggle ${id} expand = ${toggleOpen}`);
+      if (toggleOpen !== toState) {
+        log.debug(`toggle ${id} click()`);
+        await toggle.click();
+      }
+    }
+
+    public async toggleOpenEditor(index: number, toState = 'true') {
+      // index, see selectYAxisAggregation
+      await this.toggleAccordion(`visEditorAggAccordion${index}`, toState);
+    }
+
+    public async toggleAdvancedParams(aggId: string) {
+      const accordion = await testSubjects.find(`advancedParams-${aggId}`);
+      const accordionButton = await find.descendantDisplayedByCssSelector('button', accordion);
+      await accordionButton.click();
+    }
+
+    public async clickReset() {
+      await testSubjects.click('visualizeEditorResetButton');
+      await visChart.waitForVisualization();
+    }
+
+    public async clickYAxisOptions(axisId: string) {
+      await testSubjects.click(`toggleYAxisOptions-${axisId}`);
+    }
+
+    public async clickYAxisAdvancedOptions(axisId: string) {
+      await testSubjects.click(`toggleYAxisAdvancedOptions-${axisId}`);
+    }
+
+    public async changeYAxisFilterLabelsCheckbox(axisId: string, enabled: boolean) {
+      const selector = `yAxisFilterLabelsCheckbox-${axisId}`;
+      await testSubjects.setCheckbox(selector, enabled ? 'check' : 'uncheck');
+    }
+
+    public async setSize(newValue: string, aggId: string) {
+      const dataTestSubj = aggId
+        ? `visEditorAggAccordion${aggId} > sizeParamEditor`
+        : 'sizeParamEditor';
+      await testSubjects.setValue(dataTestSubj, String(newValue));
+    }
+
+    public async selectChartMode(mode: string) {
+      const selector = await find.byCssSelector(`#seriesMode0 > option[value="${mode}"]`);
+      await selector.click();
+    }
+
+    public async selectYAxisScaleType(axisId: string, scaleType: string) {
+      const selectElement = await testSubjects.find(`scaleSelectYAxis-${axisId}`);
+      const selector = await selectElement.findByCssSelector(`option[value="${scaleType}"]`);
+      await selector.click();
+    }
+
+    public async selectYAxisMode(mode: string) {
+      const selector = await find.byCssSelector(`#valueAxisMode0 > option[value="${mode}"]`);
+      await selector.click();
+    }
+
+    public async setAxisExtents(min: string, max: string, axisId = 'ValueAxis-1') {
+      await this.toggleAccordion(`yAxisAccordion${axisId}`);
+      await this.toggleAccordion(`yAxisOptionsAccordion${axisId}`);
+
+      await testSubjects.click('yAxisSetYExtents');
+      await testSubjects.setValue('yAxisYExtentsMax', max);
+      await testSubjects.setValue('yAxisYExtentsMin', min);
+    }
+
+    public async selectAggregateWith(fieldValue: string) {
+      await testSubjects.selectValue('visDefaultEditorAggregateWith', fieldValue);
+    }
+
+    public async setInterval(newValue: string, options: IntervalOptions = {}) {
+      const { type = 'default', aggNth = 2, append = false } = options;
+      log.debug(`visEditor.setInterval(${newValue}, {${type}, ${aggNth}, ${append}})`);
+      if (type === 'default') {
+        await comboBox.set('visEditorInterval', newValue);
+      } else if (type === 'custom') {
+        await comboBox.setCustom('visEditorInterval', newValue);
+      } else {
+        if (append) {
+          await testSubjects.append(`visEditorInterval${aggNth}`, String(newValue));
+        } else {
+          await testSubjects.setValue(`visEditorInterval${aggNth}`, String(newValue));
+        }
+      }
+    }
+
+    public async getInterval() {
+      return await comboBox.getComboBoxSelectedOptions('visEditorInterval');
+    }
+
+    public async getNumericInterval(agg = 2) {
+      return await testSubjects.getAttribute(`visEditorInterval${agg}`, 'value');
+    }
+
+    public async clickMetricEditor() {
+      await find.clickByCssSelector('[group-name="metrics"] .euiAccordion__button');
+    }
+
+    public async clickMetricByIndex(index: number) {
+      const metrics = await find.allByCssSelector(
+        '[data-test-subj="visualizationLoader"] .mtrVis .mtrVis__container'
+      );
+      expect(metrics.length).greaterThan(index);
+      await metrics[index].click();
+    }
+
+    public async setSelectByOptionText(selectId: string, optionText: string) {
+      const selectField = await find.byCssSelector(`#${selectId}`);
+      const options = await find.allByCssSelector(`#${selectId} > option`);
+      const $ = await selectField.parseDomContent();
+      const optionsText = $('option')
+        .toArray()
+        .map(option => $(option).text());
+      const optionIndex = optionsText.indexOf(optionText);
+
+      if (optionIndex === -1) {
+        throw new Error(
+          `Unable to find option '${optionText}' in select ${selectId}. Available options: ${optionsText.join(
+            ','
+          )}`
+        );
+      }
+      await options[optionIndex].click();
+    }
+  }
+
+  return new VisualizeEditorPage();
+}
diff --git a/test/functional/page_objects/visualize_page.js b/test/functional/page_objects/visualize_page.js
deleted file mode 100644
index 33b7515b58d2d..0000000000000
--- a/test/functional/page_objects/visualize_page.js
+++ /dev/null
@@ -1,1402 +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 { VisualizeConstants } from '../../../src/legacy/core_plugins/kibana/public/visualize/visualize_constants';
-import Bluebird from 'bluebird';
-import expect from '@kbn/expect';
-
-export function VisualizePageProvider({ getService, getPageObjects, updateBaselines }) {
-  const browser = getService('browser');
-  const config = getService('config');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const find = getService('find');
-  const log = getService('log');
-  const inspector = getService('inspector');
-  const screenshot = getService('screenshots');
-  const table = getService('table');
-  const globalNav = getService('globalNav');
-  const PageObjects = getPageObjects(['common', 'header']);
-  const defaultFindTimeout = config.get('timeouts.find');
-  const comboBox = getService('comboBox');
-
-  class VisualizePage {
-    get index() {
-      return {
-        LOGSTASH_TIME_BASED: 'logstash-*',
-        LOGSTASH_NON_TIME_BASED: 'logstash*',
-      };
-    }
-
-    async gotoVisualizationLandingPage() {
-      log.debug('gotoVisualizationLandingPage');
-      await PageObjects.common.navigateToApp('visualize');
-    }
-
-    async checkListingSelectAllCheckbox() {
-      const element = await testSubjects.find('checkboxSelectAll');
-      const isSelected = await element.isSelected();
-      if (!isSelected) {
-        log.debug(`checking checkbox "checkboxSelectAll"`);
-        await testSubjects.click('checkboxSelectAll');
-      }
-    }
-
-    async navigateToNewVisualization() {
-      log.debug('navigateToApp visualize');
-      await PageObjects.common.navigateToApp('visualize');
-      await this.clickNewVisualization();
-      await this.waitForVisualizationSelectPage();
-    }
-
-    async clickNewVisualization() {
-      // newItemButton button is only visible when there are items in the listing table is displayed.
-      let exists = await testSubjects.exists('newItemButton');
-      if (exists) {
-        return await testSubjects.click('newItemButton');
-      }
-
-      exists = await testSubjects.exists('createVisualizationPromptButton');
-      // no viz exist, click createVisualizationPromptButton to create new dashboard
-      return await this.createVisualizationPromptButton();
-    }
-
-    /*
-    This method should use retry loop to delete visualizations from multiple pages until we find the createVisualizationPromptButton.
-    Perhaps it *could* set the page size larger than the default 10, but it might still need to loop anyway.
-    */
-    async deleteAllVisualizations() {
-      await retry.try(async () => {
-        await this.checkListingSelectAllCheckbox();
-        await this.clickDeleteSelected();
-        await PageObjects.common.clickConfirmOnModal();
-        await testSubjects.find('createVisualizationPromptButton');
-      });
-    }
-
-    async createSimpleMarkdownViz(vizName) {
-      await this.gotoVisualizationLandingPage();
-      await this.navigateToNewVisualization();
-      await this.clickMarkdownWidget();
-      await this.setMarkdownTxt(vizName);
-      await this.clickGo();
-      await this.saveVisualization(vizName);
-    }
-
-    async createVisualizationPromptButton() {
-      await testSubjects.click('createVisualizationPromptButton');
-    }
-
-    async getSearchFilter() {
-      const searchFilter = await find.allByCssSelector('.euiFieldSearch');
-      return searchFilter[0];
-    }
-
-    async clearFilter() {
-      const searchFilter = await this.getSearchFilter();
-      await searchFilter.clearValue();
-      await searchFilter.click();
-    }
-
-    async searchForItemWithName(name) {
-      log.debug(`searchForItemWithName: ${name}`);
-
-      await retry.try(async () => {
-        const searchFilter = await this.getSearchFilter();
-        await searchFilter.clearValue();
-        await searchFilter.click();
-        // Note: this replacement of - to space is to preserve original logic but I'm not sure why or if it's needed.
-        await searchFilter.type(name.replace('-', ' '));
-        await PageObjects.common.pressEnterKey();
-      });
-
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async clickDeleteSelected() {
-      await testSubjects.click('deleteSelectedItems');
-    }
-
-    async getCreatePromptExists() {
-      log.debug('getCreatePromptExists');
-      return await testSubjects.exists('createVisualizationPromptButton');
-    }
-
-    async getCountOfItemsInListingTable() {
-      const elements = await find.allByCssSelector('[data-test-subj^="visListingTitleLink"]');
-      return elements.length;
-    }
-
-    async waitForVisualizationSelectPage() {
-      await retry.try(async () => {
-        const visualizeSelectTypePage = await testSubjects.find('visNewDialogTypes');
-        if (!(await visualizeSelectTypePage.isDisplayed())) {
-          throw new Error('wait for visualization select page');
-        }
-      });
-    }
-
-    async clickVisType(type) {
-      await testSubjects.click(`visType-${type}`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async clickAreaChart() {
-      await this.clickVisType('area');
-    }
-
-    async clickDataTable() {
-      await this.clickVisType('table');
-    }
-
-    async clickLineChart() {
-      await this.clickVisType('line');
-    }
-
-    async clickRegionMap() {
-      await this.clickVisType('region_map');
-    }
-
-    async clickMarkdownWidget() {
-      await this.clickVisType('markdown');
-    }
-
-    // clickBucket(bucketName) 'X-axis', 'Split area', 'Split chart'
-    async clickBucket(bucketName, type = 'buckets') {
-      await testSubjects.click(`visEditorAdd_${type}`);
-      await find.clickByCssSelector(`[data-test-subj="visEditorAdd_${type}_${bucketName}"`);
-    }
-
-    async clickMetric() {
-      await this.clickVisType('metric');
-    }
-
-    async clickGauge() {
-      await this.clickVisType('gauge');
-    }
-
-    async clickPieChart() {
-      await this.clickVisType('pie');
-    }
-
-    async clickTileMap() {
-      await this.clickVisType('tile_map');
-    }
-
-    async clickTagCloud() {
-      await this.clickVisType('tagcloud');
-    }
-
-    async clickVega() {
-      await this.clickVisType('vega');
-    }
-
-    async clickVisualBuilder() {
-      await this.clickVisType('metrics');
-    }
-
-    async clickEditorSidebarCollapse() {
-      await testSubjects.click('collapseSideBarButton');
-    }
-
-    async selectTagCloudTag(tagDisplayText) {
-      await testSubjects.click(tagDisplayText);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async getTextTag() {
-      await this.waitForVisualization();
-      const elements = await find.allByCssSelector('text');
-      return await Promise.all(elements.map(async element => await element.getVisibleText()));
-    }
-
-    async getTextSizes() {
-      const tags = await find.allByCssSelector('text');
-      async function returnTagSize(tag) {
-        const style = await tag.getAttribute('style');
-        return style.match(/font-size: ([^;]*);/)[1];
-      }
-      return await Promise.all(tags.map(returnTagSize));
-    }
-
-    async clickVerticalBarChart() {
-      await this.clickVisType('histogram');
-    }
-
-    async clickHeatmapChart() {
-      await this.clickVisType('heatmap');
-    }
-
-    async clickInputControlVis() {
-      await this.clickVisType('input_control_vis');
-    }
-
-    async getChartTypes() {
-      const chartTypeField = await testSubjects.find('visNewDialogTypes');
-      const chartTypes = await chartTypeField.findAllByTagName('button');
-      async function getChartType(chart) {
-        const label = await testSubjects.findDescendant('visTypeTitle', chart);
-        return await label.getVisibleText();
-      }
-      const getChartTypesPromises = chartTypes.map(getChartType);
-      return await Promise.all(getChartTypesPromises);
-    }
-
-    async selectVisSourceIfRequired() {
-      log.debug('selectVisSourceIfRequired');
-      const selectPage = await testSubjects.findAll('visualizeSelectSearch');
-      if (selectPage.length) {
-        log.debug('a search is required for this visualization');
-        await this.clickNewSearch();
-      }
-    }
-
-    async isBetaInfoShown() {
-      return await testSubjects.exists('betaVisInfo');
-    }
-
-    async getBetaTypeLinks() {
-      return await find.allByCssSelector('[data-vis-stage="beta"]');
-    }
-
-    async getExperimentalTypeLinks() {
-      return await find.allByCssSelector('[data-vis-stage="experimental"]');
-    }
-
-    async isExperimentalInfoShown() {
-      return await testSubjects.exists('experimentalVisInfo');
-    }
-
-    async getExperimentalInfo() {
-      return await testSubjects.find('experimentalVisInfo');
-    }
-
-    async clickAbsoluteButton() {
-      await find.clickByCssSelector(
-        'ul.nav.nav-pills.nav-stacked.kbn-timepicker-modes:contains("absolute")',
-        defaultFindTimeout * 2
-      );
-    }
-
-    async clickDropPartialBuckets() {
-      return await testSubjects.click('dropPartialBucketsCheckbox');
-    }
-
-    async setMarkdownTxt(markdownTxt) {
-      const input = await testSubjects.find('markdownTextarea');
-      await input.clearValue();
-      await input.type(markdownTxt);
-    }
-
-    async getMarkdownText() {
-      const markdownContainer = await testSubjects.find('markdownBody');
-      return markdownContainer.getVisibleText();
-    }
-
-    async getMarkdownBodyDescendentText(selector) {
-      const markdownContainer = await testSubjects.find('markdownBody');
-      const element = await find.descendantDisplayedByCssSelector(selector, markdownContainer);
-      return element.getVisibleText();
-    }
-
-    async getVegaSpec() {
-      // Adapted from console_page.js:getVisibleTextFromAceEditor(). Is there a common utilities file?
-      const editor = await testSubjects.find('vega-editor');
-      const lines = await editor.findAllByClassName('ace_line_group');
-      const linesText = await Bluebird.map(lines, l => l.getVisibleText());
-      return linesText.join('\n');
-    }
-
-    async getVegaViewContainer() {
-      return await find.byCssSelector('div.vgaVis__view');
-    }
-
-    async getVegaControlContainer() {
-      return await find.byCssSelector('div.vgaVis__controls');
-    }
-
-    async addInputControl(type) {
-      if (type) {
-        const selectInput = await testSubjects.find('selectControlType');
-        await selectInput.type(type);
-      }
-      await testSubjects.click('inputControlEditorAddBtn');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async inputControlSubmit() {
-      await testSubjects.clickWhenNotDisabled('inputControlSubmitBtn');
-      await this.waitForVisualizationRenderingStabilized();
-    }
-
-    async inputControlClear() {
-      await testSubjects.click('inputControlClearBtn');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async isChecked(selector) {
-      const checkbox = await testSubjects.find(selector);
-      return await checkbox.isSelected();
-    }
-
-    async checkCheckbox(selector) {
-      const isChecked = await this.isChecked(selector);
-      if (!isChecked) {
-        log.debug(`checking checkbox ${selector}`);
-        await testSubjects.click(selector);
-      }
-    }
-
-    async uncheckCheckbox(selector) {
-      const isChecked = await this.isChecked(selector);
-      if (isChecked) {
-        log.debug(`unchecking checkbox ${selector}`);
-        await testSubjects.click(selector);
-      }
-    }
-
-    async isSwitchChecked(selector) {
-      const checkbox = await testSubjects.find(selector);
-      const isChecked = await checkbox.getAttribute('aria-checked');
-      return isChecked === 'true';
-    }
-
-    async checkSwitch(selector) {
-      const isChecked = await this.isSwitchChecked(selector);
-      if (!isChecked) {
-        log.debug(`checking switch ${selector}`);
-        await testSubjects.click(selector);
-      }
-    }
-
-    async uncheckSwitch(selector) {
-      const isChecked = await this.isSwitchChecked(selector);
-      if (isChecked) {
-        log.debug(`unchecking switch ${selector}`);
-        await testSubjects.click(selector);
-      }
-    }
-
-    async setSelectByOptionText(selectId, optionText) {
-      const selectField = await find.byCssSelector(`#${selectId}`);
-      const options = await find.allByCssSelector(`#${selectId} > option`);
-      const $ = await selectField.parseDomContent();
-      const optionsText = $('option')
-        .toArray()
-        .map(option => $(option).text());
-      const optionIndex = optionsText.indexOf(optionText);
-
-      if (optionIndex === -1) {
-        throw new Error(
-          `Unable to find option '${optionText}' in select ${selectId}. Available options: ${optionsText.join(
-            ','
-          )}`
-        );
-      }
-      await options[optionIndex].click();
-    }
-
-    async getSideEditorExists() {
-      return await find.existsByCssSelector('.collapsible-sidebar');
-    }
-
-    async setInspectorTablePageSize(size) {
-      const panel = await testSubjects.find('inspectorPanel');
-      await find.clickByButtonText('Rows per page: 20', panel);
-      // The buttons for setting table page size are in a popover element. This popover
-      // element appears as if it's part of the inspectorPanel but it's really attached
-      // to the body element by a portal.
-      const tableSizesPopover = await find.byCssSelector('.euiPanel');
-      await find.clickByButtonText(`${size} rows`, tableSizesPopover);
-    }
-
-    async getMetric() {
-      const elements = await find.allByCssSelector(
-        '[data-test-subj="visualizationLoader"] .mtrVis__container'
-      );
-      const values = await Promise.all(
-        elements.map(async element => {
-          const text = await element.getVisibleText();
-          return text;
-        })
-      );
-      return values
-        .filter(item => item.length > 0)
-        .reduce((arr, item) => arr.concat(item.split('\n')), []);
-    }
-
-    async getGaugeValue() {
-      const elements = await find.allByCssSelector(
-        '[data-test-subj="visualizationLoader"] .chart svg text'
-      );
-      const values = await Promise.all(
-        elements.map(async element => {
-          const text = await element.getVisibleText();
-          return text;
-        })
-      );
-      return values.filter(item => item.length > 0);
-    }
-
-    async clickMetricEditor() {
-      await find.clickByCssSelector('[group-name="metrics"] .euiAccordion__button');
-    }
-
-    async clickMetricByIndex(index) {
-      log.debug(`clickMetricByIndex(${index})`);
-      const metrics = await find.allByCssSelector(
-        '[data-test-subj="visualizationLoader"] .mtrVis .mtrVis__container'
-      );
-      expect(metrics.length).greaterThan(index);
-      await metrics[index].click();
-    }
-
-    async clickNewSearch(indexPattern = this.index.LOGSTASH_TIME_BASED) {
-      await testSubjects.click(`savedObjectTitle${indexPattern.split(' ').join('-')}`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async clickSavedSearch(savedSearchName) {
-      await testSubjects.click(`savedObjectTitle${savedSearchName.split(' ').join('-')}`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async clickUnlinkSavedSearch() {
-      await testSubjects.doubleClick('unlinkSavedSearch');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async setValue(newValue) {
-      const input = await find.byCssSelector('[data-test-subj="visEditorPercentileRanks"] input');
-      await input.clearValue();
-      await input.type(newValue);
-    }
-
-    async selectSearch(searchName) {
-      await find.clickByLinkText(searchName);
-    }
-
-    async getErrorMessage() {
-      const element = await find.byCssSelector('.item>h4');
-      return await element.getVisibleText();
-    }
-
-    async selectAggregation(myString, groupName = 'buckets', childAggregationType = null) {
-      const comboBoxElement = await find.byCssSelector(`
-        [group-name="${groupName}"]
-        [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
-        ${childAggregationType ? '.visEditorAgg__subAgg' : ''}
-        [data-test-subj="defaultEditorAggSelect"]
-      `);
-
-      await comboBox.setElement(comboBoxElement, myString);
-      await PageObjects.common.sleep(500);
-    }
-
-    async applyFilters() {
-      return await testSubjects.click('filterBarApplyFilters');
-    }
-    /**
-     * Set the test for a filter aggregation.
-     * @param {*} filterValue the string value of the filter
-     * @param {*} filterIndex used when multiple filters are configured on the same aggregation
-     * @param {*} aggregationId the ID if the aggregation. On Tests, it start at from 2
-     */
-    async setFilterAggregationValue(filterValue, filterIndex = 0, aggregationId = 2) {
-      await testSubjects.setValue(
-        `visEditorFilterInput_${aggregationId}_${filterIndex}`,
-        filterValue
-      );
-    }
-
-    async addNewFilterAggregation() {
-      return await testSubjects.click('visEditorAddFilterButton');
-    }
-
-    async toggleOpenEditor(index, toState = 'true') {
-      // index, see selectYAxisAggregation
-      await this.toggleAccordion(`visEditorAggAccordion${index}`, toState);
-    }
-
-    async toggleAccordion(id, toState = 'true') {
-      const toggle = await find.byCssSelector(`button[aria-controls="${id}"]`);
-      const toggleOpen = await toggle.getAttribute('aria-expanded');
-      log.debug(`toggle ${id} expand = ${toggleOpen}`);
-      if (toggleOpen !== toState) {
-        log.debug(`toggle ${id} click()`);
-        await toggle.click();
-      }
-    }
-
-    async toggleAdvancedParams(aggId) {
-      const accordion = await testSubjects.find(`advancedParams-${aggId}`);
-      const accordionButton = await find.descendantDisplayedByCssSelector('button', accordion);
-      await accordionButton.click();
-    }
-
-    async selectYAxisAggregation(agg, field, label, index = 1) {
-      // index starts on the first "count" metric at 1
-      // Each new metric or aggregation added to a visualization gets the next index.
-      // So to modify a metric or aggregation tests need to keep track of the
-      // order they are added.
-      await this.toggleOpenEditor(index);
-
-      // select our agg
-      const aggSelect = await find.byCssSelector(
-        `#visEditorAggAccordion${index} [data-test-subj="defaultEditorAggSelect"]`
-      );
-      await comboBox.setElement(aggSelect, agg);
-
-      const fieldSelect = await find.byCssSelector(
-        `#visEditorAggAccordion${index} [data-test-subj="visDefaultEditorField"]`
-      );
-      // select our field
-      await comboBox.setElement(fieldSelect, field);
-      // enter custom label
-      await this.setCustomLabel(label, index);
-    }
-
-    async setCustomLabel(label, index = 1) {
-      const customLabel = await testSubjects.find(`visEditorStringInput${index}customLabel`);
-      customLabel.type(label);
-    }
-
-    async setAxisExtents(min, max, axisId = 'ValueAxis-1') {
-      await this.toggleAccordion(`yAxisAccordion${axisId}`);
-      await this.toggleAccordion(`yAxisOptionsAccordion${axisId}`);
-
-      await testSubjects.click('yAxisSetYExtents');
-      await testSubjects.setValue('yAxisYExtentsMax', max);
-      await testSubjects.setValue('yAxisYExtentsMin', min);
-    }
-
-    async getField() {
-      return await comboBox.getComboBoxSelectedOptions('visDefaultEditorField');
-    }
-
-    async selectField(fieldValue, groupName = 'buckets', childAggregationType = null) {
-      log.debug(`selectField ${fieldValue}`);
-      const selector = `
-        [group-name="${groupName}"]
-        [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
-        [data-test-subj="visAggEditorParams"]
-        ${childAggregationType ? '.visEditorAgg__subAgg' : ''}
-        [data-test-subj="visDefaultEditorField"]
-      `;
-      const fieldEl = await find.byCssSelector(selector);
-      await comboBox.setElement(fieldEl, fieldValue);
-    }
-
-    async selectAggregateWith(fieldValue) {
-      await testSubjects.selectValue('visDefaultEditorAggregateWith', fieldValue);
-    }
-
-    async getInterval() {
-      return await comboBox.getComboBoxSelectedOptions('visEditorInterval');
-    }
-
-    async setInterval(newValue) {
-      log.debug(`Visualize.setInterval(${newValue})`);
-      return await comboBox.set('visEditorInterval', newValue);
-    }
-
-    async setCustomInterval(newValue) {
-      log.debug(`Visualize.setCustomInterval(${newValue})`);
-      return await comboBox.setCustom('visEditorInterval', newValue);
-    }
-
-    async getNumericInterval(agg = 2) {
-      return await testSubjects.getAttribute(`visEditorInterval${agg}`, 'value');
-    }
-
-    async setNumericInterval(newValue, { append } = {}, agg = 2) {
-      if (append) {
-        await testSubjects.append(`visEditorInterval${agg}`, String(newValue));
-      } else {
-        await testSubjects.setValue(`visEditorInterval${agg}`, String(newValue));
-      }
-    }
-
-    async setSize(newValue, aggId) {
-      const dataTestSubj = aggId
-        ? `visEditorAggAccordion${aggId} > sizeParamEditor`
-        : 'sizeParamEditor';
-      await testSubjects.setValue(dataTestSubj, String(newValue));
-    }
-
-    async toggleDisabledAgg(agg) {
-      await testSubjects.click(`visEditorAggAccordion${agg} > ~toggleDisableAggregationBtn`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async toggleAggregationEditor(agg) {
-      await find.clickByCssSelector(
-        `[data-test-subj="visEditorAggAccordion${agg}"] .euiAccordion__button`
-      );
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async toggleOtherBucket(agg = 2) {
-      return await testSubjects.click(`visEditorAggAccordion${agg} > otherBucketSwitch`);
-    }
-
-    async toggleMissingBucket(agg = 2) {
-      return await testSubjects.click(`visEditorAggAccordion${agg} > missingBucketSwitch`);
-    }
-
-    async toggleScaleMetrics() {
-      return await testSubjects.click('scaleMetricsSwitch');
-    }
-
-    async isApplyEnabled() {
-      const applyButton = await testSubjects.find('visualizeEditorRenderButton');
-      return await applyButton.isEnabled();
-    }
-
-    async clickGo() {
-      const prevRenderingCount = await this.getVisualizationRenderingCount();
-      log.debug(`Before Rendering count ${prevRenderingCount}`);
-      await testSubjects.clickWhenNotDisabled('visualizeEditorRenderButton');
-      await this.waitForRenderingCount(prevRenderingCount + 1);
-    }
-
-    async clickReset() {
-      await testSubjects.click('visualizeEditorResetButton');
-      await this.waitForVisualization();
-    }
-
-    async toggleAutoMode() {
-      await testSubjects.click('visualizeEditorAutoButton');
-    }
-
-    async sizeUpEditor() {
-      await testSubjects.click('visualizeEditorResizer');
-      await browser.pressKeys(browser.keys.ARROW_RIGHT);
-    }
-
-    async clickOptions() {
-      await find.clickByPartialLinkText('Options');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async changeHeatmapColorNumbers(value = 6) {
-      const input = await testSubjects.find(`heatmapColorsNumber`);
-      await input.clearValueWithKeyboard();
-      await input.type(`${value}`);
-    }
-
-    async clickMetricsAndAxes() {
-      await testSubjects.click('visEditorTabadvanced');
-    }
-
-    async clickOptionsTab() {
-      await testSubjects.click('visEditorTaboptions');
-    }
-
-    async clickEnableCustomRanges() {
-      await testSubjects.click('heatmapUseCustomRanges');
-    }
-
-    async clickAddRange() {
-      await testSubjects.click(`heatmapColorRange__addRangeButton`);
-    }
-
-    async setCustomRangeByIndex(index, from, to) {
-      await testSubjects.setValue(`heatmapColorRange${index}__from`, from);
-      await testSubjects.setValue(`heatmapColorRange${index}__to`, to);
-    }
-
-    async clickYAxisOptions(axisId) {
-      await testSubjects.click(`toggleYAxisOptions-${axisId}`);
-    }
-
-    async clickYAxisAdvancedOptions(axisId) {
-      await testSubjects.click(`toggleYAxisAdvancedOptions-${axisId}`);
-    }
-
-    async changeYAxisFilterLabelsCheckbox(axisId, enabled) {
-      const selector = `yAxisFilterLabelsCheckbox-${axisId}`;
-      enabled ? await this.checkCheckbox(selector) : await this.uncheckCheckbox(selector);
-    }
-
-    async selectChartMode(mode) {
-      const selector = await find.byCssSelector(`#seriesMode0 > option[value="${mode}"]`);
-      await selector.click();
-    }
-
-    async selectYAxisScaleType(axisId, scaleType) {
-      const selectElement = await testSubjects.find(`scaleSelectYAxis-${axisId}`);
-      const selector = await selectElement.findByCssSelector(`option[value="${scaleType}"]`);
-      await selector.click();
-    }
-
-    async selectYAxisMode(mode) {
-      const selector = await find.byCssSelector(`#valueAxisMode0 > option[value="${mode}"]`);
-      await selector.click();
-    }
-
-    async clickData() {
-      await testSubjects.click('visualizeEditDataLink');
-    }
-
-    async clickVisEditorTab(tabName) {
-      await testSubjects.click('visEditorTab' + tabName);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async selectWMS() {
-      await find.clickByCssSelector('input[name="wms.enabled"]');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async ensureSavePanelOpen() {
-      log.debug('ensureSavePanelOpen');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      const isOpen = await testSubjects.exists('savedObjectSaveModal', { timeout: 5000 });
-      if (!isOpen) {
-        await testSubjects.click('visualizeSaveButton');
-      }
-    }
-
-    async saveVisualization(vizName, { saveAsNew = false } = {}) {
-      await this.ensureSavePanelOpen();
-      await testSubjects.setValue('savedObjectTitle', vizName);
-      if (saveAsNew) {
-        log.debug('Check save as new visualization');
-        await testSubjects.click('saveAsNewCheckbox');
-      }
-      log.debug('Click Save Visualization button');
-
-      await testSubjects.click('confirmSaveSavedObjectButton');
-
-      // Confirm that the Visualization has actually been saved
-      await testSubjects.existOrFail('saveVisualizationSuccess');
-      const message = await PageObjects.common.closeToast();
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await PageObjects.common.waitForSaveModalToClose();
-
-      return message;
-    }
-
-    async saveVisualizationExpectSuccess(vizName, { saveAsNew = false } = {}) {
-      const saveMessage = await this.saveVisualization(vizName, { saveAsNew });
-      if (!saveMessage) {
-        throw new Error(
-          `Expected saveVisualization to respond with the saveMessage from the toast, got ${saveMessage}`
-        );
-      }
-    }
-
-    async saveVisualizationExpectSuccessAndBreadcrumb(vizName, { saveAsNew = false } = {}) {
-      await this.saveVisualizationExpectSuccess(vizName, { saveAsNew });
-      await retry.waitFor(
-        'last breadcrumb to have new vis name',
-        async () => (await globalNav.getLastBreadcrumb()) === vizName
-      );
-    }
-
-    async clickLoadSavedVisButton() {
-      // TODO: Use a test subject selector once we rewrite breadcrumbs to accept each breadcrumb
-      // element as a child instead of building the breadcrumbs dynamically.
-      await find.clickByCssSelector('[href="#/visualize"]');
-    }
-
-    async filterVisByName(vizName) {
-      const input = await find.byCssSelector('input[name="filter"]');
-      await input.click();
-      // can't uses dashes in saved visualizations when filtering
-      // or extended character sets
-      // https://github.com/elastic/kibana/issues/6300
-      await input.type(vizName.replace('-', ' '));
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async clickVisualizationByName(vizName) {
-      log.debug('clickVisualizationByLinkText(' + vizName + ')');
-      return find.clickByPartialLinkText(vizName);
-    }
-
-    async loadSavedVisualization(vizName, { navigateToVisualize = true } = {}) {
-      if (navigateToVisualize) {
-        await this.clickLoadSavedVisButton();
-      }
-      await this.openSavedVisualization(vizName);
-    }
-
-    async openSavedVisualization(vizName) {
-      await this.clickVisualizationByName(vizName);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async getXAxisLabels() {
-      const xAxis = await find.byCssSelector('.visAxis--x.visAxis__column--bottom');
-      const $ = await xAxis.parseDomContent();
-      return $('.x > g > text')
-        .toArray()
-        .map(tick =>
-          $(tick)
-            .text()
-            .trim()
-        );
-    }
-
-    async getYAxisLabels() {
-      const yAxis = await find.byCssSelector('.visAxis__column--y.visAxis__column--left');
-      const $ = await yAxis.parseDomContent();
-      return $('.y > g > text')
-        .toArray()
-        .map(tick =>
-          $(tick)
-            .text()
-            .trim()
-        );
-    }
-
-    /**
-     * Removes chrome and takes a small screenshot of a vis to compare against a baseline.
-     * @param {string} name The name of the baseline image.
-     * @param {object} opts Options object.
-     * @param {number} opts.threshold Threshold for allowed variance when comparing images.
-     */
-    async expectVisToMatchScreenshot(name, opts = { threshold: 0.05 }) {
-      log.debug(`expectVisToMatchScreenshot(${name})`);
-
-      // Collapse sidebar and inject some CSS to hide the nav so we have a focused screenshot
-      await this.clickEditorSidebarCollapse();
-      await this.waitForVisualizationRenderingStabilized();
-      await browser.execute(`
-        var el = document.createElement('style');
-        el.id = '__data-test-style';
-        el.innerHTML = '[data-test-subj="headerGlobalNav"] { display: none; } ';
-        el.innerHTML += '[data-test-subj="top-nav"] { display: none; } ';
-        el.innerHTML += '[data-test-subj="experimentalVisInfo"] { display: none; } ';
-        document.body.appendChild(el);
-      `);
-
-      const percentDifference = await screenshot.compareAgainstBaseline(name, updateBaselines);
-
-      // Reset the chart to its original state
-      await browser.execute(`
-        var el = document.getElementById('__data-test-style');
-        document.body.removeChild(el);
-      `);
-      await this.clickEditorSidebarCollapse();
-      await this.waitForVisualizationRenderingStabilized();
-      expect(percentDifference).to.be.lessThan(opts.threshold);
-    }
-
-    /*
-     ** This method gets the chart data and scales it based on chart height and label.
-     ** Returns an array of height values
-     */
-    async getAreaChartData(dataLabel, axis = 'ValueAxis-1') {
-      const yAxisRatio = await this.getChartYAxisRatio(axis);
-
-      const rectangle = await find.byCssSelector('rect.background');
-      const yAxisHeight = await rectangle.getAttribute('height');
-      log.debug(`height --------- ${yAxisHeight}`);
-
-      const path = await retry.try(
-        async () =>
-          await find.byCssSelector(`path[data-label="${dataLabel}"]`, defaultFindTimeout * 2)
-      );
-      const data = await path.getAttribute('d');
-      log.debug(data);
-      // This area chart data starts with a 'M'ove to a x,y location, followed
-      // by a bunch of 'L'ines from that point to the next.  Those points are
-      // the values we're going to use to calculate the data values we're testing.
-      // So git rid of the one 'M' and split the rest on the 'L's.
-      const tempArray = data
-        .replace('M ', '')
-        .replace('M', '')
-        .replace(/ L /g, 'L')
-        .replace(/ /g, ',')
-        .split('L');
-      const chartSections = tempArray.length / 2;
-      // log.debug('chartSections = ' + chartSections + ' height = ' + yAxisHeight + ' yAxisLabel = ' + yAxisLabel);
-      const chartData = [];
-      for (let i = 0; i < chartSections; i++) {
-        chartData[i] = Math.round((yAxisHeight - tempArray[i].split(',')[1]) * yAxisRatio);
-        log.debug('chartData[i] =' + chartData[i]);
-      }
-      return chartData;
-    }
-
-    /*
-     ** This method returns the paths that compose an area chart.
-     */
-    async getAreaChartPaths(dataLabel) {
-      const path = await retry.try(
-        async () =>
-          await find.byCssSelector(`path[data-label="${dataLabel}"]`, defaultFindTimeout * 2)
-      );
-      const data = await path.getAttribute('d');
-      log.debug(data);
-      // This area chart data starts with a 'M'ove to a x,y location, followed
-      // by a bunch of 'L'ines from that point to the next.  Those points are
-      // the values we're going to use to calculate the data values we're testing.
-      // So git rid of the one 'M' and split the rest on the 'L's.
-      return data.split('L');
-    }
-
-    // The current test shows dots, not a line.  This function gets the dots and normalizes their height.
-    async getLineChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
-      // 1). get the range/pixel ratio
-      const yAxisRatio = await this.getChartYAxisRatio(axis);
-      // 2). find and save the y-axis pixel size (the chart height)
-      const rectangle = await find.byCssSelector('clipPath rect');
-      const yAxisHeight = await rectangle.getAttribute('height');
-      // 3). get the visWrapper__chart elements
-      const chartTypes = await retry.try(
-        async () =>
-          await find.allByCssSelector(
-            `.visWrapper__chart circle[data-label="${dataLabel}"][fill-opacity="1"]`,
-            defaultFindTimeout * 2
-          )
-      );
-      // 4). for each chart element, find the green circle, then the cy position
-      const chartData = await Promise.all(
-        chartTypes.map(async chart => {
-          const cy = await chart.getAttribute('cy');
-          // the point_series_options test has data in the billions range and
-          // getting 11 digits of precision with these calculations is very hard
-          return Math.round(((yAxisHeight - cy) * yAxisRatio).toPrecision(6));
-        })
-      );
-
-      return chartData;
-    }
-
-    // this is ALMOST identical to DiscoverPage.getBarChartData
-    async getBarChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
-      // 1). get the range/pixel ratio
-      const yAxisRatio = await this.getChartYAxisRatio(axis);
-      // 3). get the visWrapper__chart elements
-      const svg = await find.byCssSelector('div.chart');
-      const $ = await svg.parseDomContent();
-      const chartData = $(`g > g.series > rect[data-label="${dataLabel}"]`)
-        .toArray()
-        .map(chart => {
-          const barHeight = $(chart).attr('height');
-          return Math.round(barHeight * yAxisRatio);
-        });
-
-      return chartData;
-    }
-
-    // Returns value per pixel
-    async getChartYAxisRatio(axis = 'ValueAxis-1') {
-      // 1). get the maximum chart Y-Axis marker value and Y position
-      const maxYAxisChartMarker = await retry.try(
-        async () =>
-          await find.byCssSelector(
-            `div.visAxis__splitAxes--y > div > svg > g.${axis} > g:last-of-type.tick`
-          )
-      );
-      const maxYLabel = (await maxYAxisChartMarker.getVisibleText()).replace(/,/g, '');
-      const maxYLabelYPosition = (await maxYAxisChartMarker.getPosition()).y;
-      log.debug(`maxYLabel = ${maxYLabel}, maxYLabelYPosition = ${maxYLabelYPosition}`);
-
-      // 2). get the minimum chart Y-Axis marker value and Y position
-      const minYAxisChartMarker = await find.byCssSelector(
-        'div.visAxis__column--y.visAxis__column--left  > div > div > svg:nth-child(2) > g > g:nth-child(1).tick'
-      );
-      const minYLabel = (await minYAxisChartMarker.getVisibleText()).replace(',', '');
-      const minYLabelYPosition = (await minYAxisChartMarker.getPosition()).y;
-      return (maxYLabel - minYLabel) / (minYLabelYPosition - maxYLabelYPosition);
-    }
-
-    async getHeatmapData() {
-      const chartTypes = await retry.try(
-        async () => await find.allByCssSelector('svg > g > g.series rect', defaultFindTimeout * 2)
-      );
-      log.debug('rects=' + chartTypes);
-      async function getChartType(chart) {
-        return await chart.getAttribute('data-label');
-      }
-      const getChartTypesPromises = chartTypes.map(getChartType);
-      return await Promise.all(getChartTypesPromises);
-    }
-
-    async expectError() {
-      return await testSubjects.existOrFail('visLibVisualizeError');
-    }
-
-    async getChartAreaWidth() {
-      const rect = await retry.try(async () => find.byCssSelector('clipPath rect'));
-      return await rect.getAttribute('width');
-    }
-
-    async getChartAreaHeight() {
-      const rect = await retry.try(async () => find.byCssSelector('clipPath rect'));
-      return await rect.getAttribute('height');
-    }
-
-    /**
-     * If you are writing new tests, you should rather look into getTableVisContent method instead.
-     */
-    async getTableVisData() {
-      return await testSubjects.getVisibleText('paginated-table-body');
-    }
-
-    /**
-     * This function is the newer function to retrieve data from within a table visualization.
-     * It uses a better return format, than the old getTableVisData, by properly splitting
-     * cell values into arrays. Please use this function for newer tests.
-     */
-    async getTableVisContent({ stripEmptyRows = true } = {}) {
-      return await retry.try(async () => {
-        const container = await testSubjects.find('tableVis');
-        const allTables = await testSubjects.findAllDescendant('paginated-table-body', container);
-
-        if (allTables.length === 0) {
-          return [];
-        }
-
-        const allData = await Promise.all(
-          allTables.map(async t => {
-            let data = await table.getDataFromElement(t);
-            if (stripEmptyRows) {
-              data = data.filter(row => row.length > 0 && row.some(cell => cell.trim().length > 0));
-            }
-            return data;
-          })
-        );
-
-        if (allTables.length === 1) {
-          // If there was only one table we return only the data for that table
-          // This prevents an unnecessary array around that single table, which
-          // is the case we have in most tests.
-          return allData[0];
-        }
-
-        return allData;
-      });
-    }
-
-    async toggleIsFilteredByCollarCheckbox() {
-      await testSubjects.click('isFilteredByCollarCheckbox');
-    }
-
-    async setIsFilteredByCollarCheckbox(value = true) {
-      await retry.try(async () => {
-        const isChecked = await this.isSwitchChecked('isFilteredByCollarCheckbox');
-        if (isChecked !== value) {
-          await testSubjects.click('isFilteredByCollarCheckbox');
-          throw new Error('isFilteredByCollar not set correctly');
-        }
-      });
-    }
-
-    async getMarkdownData() {
-      const markdown = await retry.try(async () => find.byCssSelector('visualize'));
-      return await markdown.getVisibleText();
-    }
-
-    async getVisualizationRenderingCount() {
-      const visualizationLoader = await testSubjects.find('visualizationLoader');
-      const renderingCount = await visualizationLoader.getAttribute('data-rendering-count');
-      return Number(renderingCount);
-    }
-
-    async waitForRenderingCount(minimumCount = 1) {
-      await retry.waitFor(
-        `rendering count to be greater than or equal to [${minimumCount}]`,
-        async () => {
-          const currentRenderingCount = await this.getVisualizationRenderingCount();
-          log.debug(`-- currentRenderingCount=${currentRenderingCount}`);
-          return currentRenderingCount >= minimumCount;
-        }
-      );
-    }
-
-    async waitForVisualizationRenderingStabilized() {
-      //assuming rendering is done when data-rendering-count is constant within 1000 ms
-      await retry.waitFor('rendering count to stabilize', async () => {
-        const firstCount = await this.getVisualizationRenderingCount();
-        log.debug(`-- firstCount=${firstCount}`);
-
-        await PageObjects.common.sleep(1000);
-
-        const secondCount = await this.getVisualizationRenderingCount();
-        log.debug(`-- secondCount=${secondCount}`);
-
-        return firstCount === secondCount;
-      });
-    }
-
-    async waitForVisualization() {
-      await this.waitForVisualizationRenderingStabilized();
-      return await find.byCssSelector('.visualization');
-    }
-
-    async waitForVisualizationSavedToastGone() {
-      return await testSubjects.waitForDeleted('saveVisualizationSuccess');
-    }
-
-    async getZoomSelectors(zoomSelector) {
-      return await find.allByCssSelector(zoomSelector);
-    }
-
-    async clickMapButton(zoomSelector, waitForLoading) {
-      await retry.try(async () => {
-        const zooms = await this.getZoomSelectors(zoomSelector);
-        await Promise.all(zooms.map(async zoom => await zoom.click()));
-        if (waitForLoading) {
-          await PageObjects.header.waitUntilLoadingHasFinished();
-        }
-      });
-    }
-
-    async getVisualizationRequest() {
-      log.debug('getVisualizationRequest');
-      await inspector.open();
-      await testSubjects.click('inspectorViewChooser');
-      await testSubjects.click('inspectorViewChooserRequests');
-      await testSubjects.click('inspectorRequestDetailRequest');
-      return await testSubjects.getVisibleText('inspectorRequestBody');
-    }
-
-    async getVisualizationResponse() {
-      log.debug('getVisualizationResponse');
-      await inspector.open();
-      await testSubjects.click('inspectorViewChooser');
-      await testSubjects.click('inspectorViewChooserRequests');
-      await testSubjects.click('inspectorRequestDetailResponse');
-      return await testSubjects.getVisibleText('inspectorResponseBody');
-    }
-
-    async getMapBounds() {
-      const request = await this.getVisualizationRequest();
-      const requestObject = JSON.parse(request);
-      return requestObject.aggs.filter_agg.filter.geo_bounding_box['geo.coordinates'];
-    }
-
-    async clickMapZoomIn(waitForLoading = true) {
-      await this.clickMapButton('a.leaflet-control-zoom-in', waitForLoading);
-    }
-
-    async clickMapZoomOut(waitForLoading = true) {
-      await this.clickMapButton('a.leaflet-control-zoom-out', waitForLoading);
-    }
-
-    async getMapZoomEnabled(zoomSelector) {
-      const zooms = await this.getZoomSelectors(zoomSelector);
-      const classAttributes = await Promise.all(
-        zooms.map(async zoom => await zoom.getAttribute('class'))
-      );
-      return !classAttributes.join('').includes('leaflet-disabled');
-    }
-
-    async zoomAllTheWayOut() {
-      // we can tell we're at level 1 because zoom out is disabled
-      return await retry.try(async () => {
-        await this.clickMapZoomOut();
-        const enabled = await this.getMapZoomOutEnabled();
-        //should be able to zoom more as current config has 0 as min level.
-        if (enabled) {
-          throw new Error('Not fully zoomed out yet');
-        }
-      });
-    }
-
-    async getMapZoomInEnabled() {
-      return await this.getMapZoomEnabled('a.leaflet-control-zoom-in');
-    }
-
-    async getMapZoomOutEnabled() {
-      return await this.getMapZoomEnabled('a.leaflet-control-zoom-out');
-    }
-
-    async clickMapFitDataBounds() {
-      return await this.clickMapButton('a.fa-crop');
-    }
-
-    async clickLandingPageBreadcrumbLink() {
-      log.debug('clickLandingPageBreadcrumbLink');
-      await find.clickByCssSelector(`a[href="#${VisualizeConstants.LANDING_PAGE_PATH}"]`);
-    }
-
-    /**
-     * Returns true if already on the landing page (that page doesn't have a link to itself).
-     * @returns {Promise<boolean>}
-     */
-    async onLandingPage() {
-      log.debug(`VisualizePage.onLandingPage`);
-      const exists = await testSubjects.exists('visualizeLandingPage');
-      return exists;
-    }
-
-    async gotoLandingPage() {
-      log.debug('VisualizePage.gotoLandingPage');
-      const onPage = await this.onLandingPage();
-      if (!onPage) {
-        await retry.try(async () => {
-          await this.clickLandingPageBreadcrumbLink();
-          const onLandingPage = await this.onLandingPage();
-          if (!onLandingPage) throw new Error('Not on the landing page.');
-        });
-      }
-    }
-
-    async getLegendEntries() {
-      const legendEntries = await find.allByCssSelector(
-        '.visLegend__button',
-        defaultFindTimeout * 2
-      );
-      return await Promise.all(
-        legendEntries.map(async chart => await chart.getAttribute('data-label'))
-      );
-    }
-
-    async openLegendOptionColors(name) {
-      await this.waitForVisualizationRenderingStabilized();
-      await retry.try(async () => {
-        // This click has been flaky in opening the legend, hence the retry.  See
-        // https://github.com/elastic/kibana/issues/17468
-        await testSubjects.click(`legend-${name}`);
-        await this.waitForVisualizationRenderingStabilized();
-        // arbitrary color chosen, any available would do
-        const isOpen = await this.doesLegendColorChoiceExist('#EF843C');
-        if (!isOpen) {
-          throw new Error('legend color selector not open');
-        }
-      });
-    }
-
-    async filterOnTableCell(column, row) {
-      await retry.try(async () => {
-        const table = await testSubjects.find('tableVis');
-        const cell = await table.findByCssSelector(
-          `tbody tr:nth-child(${row}) td:nth-child(${column})`
-        );
-        await cell.moveMouseTo();
-        const filterBtn = await testSubjects.findDescendant('filterForCellValue', cell);
-        await filterBtn.click();
-      });
-    }
-
-    async toggleLegend(show = true) {
-      await retry.try(async () => {
-        const isVisible = find.byCssSelector('.visLegend');
-        if ((show && !isVisible) || (!show && isVisible)) {
-          await testSubjects.click('vislibToggleLegend');
-        }
-      });
-    }
-
-    async filterLegend(name) {
-      await this.toggleLegend();
-      await testSubjects.click(`legend-${name}`);
-      const filters = await testSubjects.find(`legend-${name}-filters`);
-      const [filterIn] = await filters.findAllByCssSelector(`input`);
-      await filterIn.click();
-      await this.waitForVisualizationRenderingStabilized();
-    }
-
-    async doesLegendColorChoiceExist(color) {
-      return await testSubjects.exists(`legendSelectColor-${color}`);
-    }
-
-    async selectNewLegendColorChoice(color) {
-      await testSubjects.click(`legendSelectColor-${color}`);
-    }
-
-    async doesSelectedLegendColorExist(color) {
-      return await testSubjects.exists(`legendSelectedColor-${color}`);
-    }
-
-    async getYAxisTitle() {
-      const title = await find.byCssSelector('.y-axis-div .y-axis-title text');
-      return await title.getVisibleText();
-    }
-
-    async selectBucketType(type) {
-      const bucketType = await find.byCssSelector(`[data-test-subj="${type}"]`);
-      return await bucketType.click();
-    }
-
-    async getBucketErrorMessage() {
-      const error = await find.byCssSelector(
-        '[group-name="buckets"] [data-test-subj="defaultEditorAggSelect"] + .euiFormErrorText'
-      );
-      const errorMessage = await error.getAttribute('innerText');
-      log.debug(errorMessage);
-      return errorMessage;
-    }
-
-    async selectOrderByMetric(agg, metric) {
-      const sortSelect = await testSubjects.find(`visEditorOrderBy${agg}`);
-      const sortMetric = await sortSelect.findByCssSelector(`option[value="${metric}"]`);
-      await sortMetric.click();
-    }
-
-    async selectCustomSortMetric(agg, metric, field) {
-      await this.selectOrderByMetric(agg, 'custom');
-      await this.selectAggregation(metric, 'buckets', true);
-      await this.selectField(field, 'buckets', true);
-    }
-
-    async clickSplitDirection(direction) {
-      const control = await testSubjects.find('visEditorSplitBy');
-      const radioBtn = await control.findByCssSelector(`[title="${direction}"]`);
-      await radioBtn.click();
-    }
-
-    async countNestedTables() {
-      const vis = await testSubjects.find('tableVis');
-      const result = [];
-
-      for (let i = 1; true; i++) {
-        const selector = new Array(i).fill('.kbnAggTable__group').join(' ');
-        const tables = await vis.findAllByCssSelector(selector);
-        if (tables.length === 0) {
-          break;
-        }
-        result.push(tables.length);
-      }
-
-      return result;
-    }
-
-    async removeDimension(agg) {
-      await testSubjects.click(`visEditorAggAccordion${agg} > removeDimensionBtn`);
-    }
-
-    async setFilterParams({ aggNth = 0, indexPattern, field }) {
-      await comboBox.set(`indexPatternSelect-${aggNth}`, indexPattern);
-      await comboBox.set(`fieldSelect-${aggNth}`, field);
-    }
-
-    async setFilterRange({ aggNth = 0, min, max }) {
-      const control = await testSubjects.find(`inputControl${aggNth}`);
-      const inputMin = await control.findByCssSelector('[name$="minValue"]');
-      await inputMin.type(min);
-      const inputMax = await control.findByCssSelector('[name$="maxValue"]');
-      await inputMax.type(max);
-    }
-
-    async scrollSubjectIntoView(subject) {
-      const element = await testSubjects.find(subject);
-      await element.scrollIntoViewIfNecessary();
-    }
-  }
-
-  return new VisualizePage();
-}
diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts
new file mode 100644
index 0000000000000..1562cf9745f2d
--- /dev/null
+++ b/test/functional/page_objects/visualize_page.ts
@@ -0,0 +1,328 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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';
+import { VisualizeConstants } from '../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
+
+export function VisualizePageProvider({ getService, getPageObjects }: FtrProviderContext) {
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+  const find = getService('find');
+  const log = getService('log');
+  const globalNav = getService('globalNav');
+  const listingTable = getService('listingTable');
+  const { common, header, visEditor } = getPageObjects(['common', 'header', 'visEditor']);
+
+  /**
+   * This page object contains the visualization type selection, the landing page,
+   * and the open/save dialog functions
+   */
+  class VisualizePage {
+    index = {
+      LOGSTASH_TIME_BASED: 'logstash-*',
+      LOGSTASH_NON_TIME_BASED: 'logstash*',
+    };
+
+    public async gotoVisualizationLandingPage() {
+      await common.navigateToApp('visualize');
+    }
+
+    public async clickNewVisualization() {
+      // newItemButton button is only visible when there are items in the listing table is displayed.
+      let exists = await testSubjects.exists('newItemButton');
+      if (exists) {
+        return await testSubjects.click('newItemButton');
+      }
+
+      exists = await testSubjects.exists('createVisualizationPromptButton');
+      // no viz exist, click createVisualizationPromptButton to create new dashboard
+      return await this.createVisualizationPromptButton();
+    }
+
+    public async createVisualizationPromptButton() {
+      await testSubjects.click('createVisualizationPromptButton');
+    }
+
+    public async getChartTypes() {
+      const chartTypeField = await testSubjects.find('visNewDialogTypes');
+      const $ = await chartTypeField.parseDomContent();
+      return $('button')
+        .toArray()
+        .map(chart =>
+          $(chart)
+            .findTestSubject('visTypeTitle')
+            .text()
+            .trim()
+        );
+    }
+
+    public async waitForVisualizationSelectPage() {
+      await retry.try(async () => {
+        const visualizeSelectTypePage = await testSubjects.find('visNewDialogTypes');
+        if (!(await visualizeSelectTypePage.isDisplayed())) {
+          throw new Error('wait for visualization select page');
+        }
+      });
+    }
+
+    public async navigateToNewVisualization() {
+      await common.navigateToApp('visualize');
+      await this.clickNewVisualization();
+      await this.waitForVisualizationSelectPage();
+    }
+
+    public async clickVisType(type: string) {
+      await testSubjects.click(`visType-${type}`);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async clickAreaChart() {
+      await this.clickVisType('area');
+    }
+
+    public async clickDataTable() {
+      await this.clickVisType('table');
+    }
+
+    public async clickLineChart() {
+      await this.clickVisType('line');
+    }
+
+    public async clickRegionMap() {
+      await this.clickVisType('region_map');
+    }
+
+    public async clickMarkdownWidget() {
+      await this.clickVisType('markdown');
+    }
+
+    public async clickMetric() {
+      await this.clickVisType('metric');
+    }
+
+    public async clickGauge() {
+      await this.clickVisType('gauge');
+    }
+
+    public async clickPieChart() {
+      await this.clickVisType('pie');
+    }
+
+    public async clickTileMap() {
+      await this.clickVisType('tile_map');
+    }
+
+    public async clickTagCloud() {
+      await this.clickVisType('tagcloud');
+    }
+
+    public async clickVega() {
+      await this.clickVisType('vega');
+    }
+
+    public async clickVisualBuilder() {
+      await this.clickVisType('metrics');
+    }
+
+    public async clickVerticalBarChart() {
+      await this.clickVisType('histogram');
+    }
+
+    public async clickHeatmapChart() {
+      await this.clickVisType('heatmap');
+    }
+
+    public async clickInputControlVis() {
+      await this.clickVisType('input_control_vis');
+    }
+
+    public async createSimpleMarkdownViz(vizName: string) {
+      await this.gotoVisualizationLandingPage();
+      await this.navigateToNewVisualization();
+      await this.clickMarkdownWidget();
+      await visEditor.setMarkdownTxt(vizName);
+      await visEditor.clickGo();
+      await this.saveVisualization(vizName);
+    }
+
+    public async clickNewSearch(indexPattern = this.index.LOGSTASH_TIME_BASED) {
+      await testSubjects.click(`savedObjectTitle${indexPattern.split(' ').join('-')}`);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async selectVisSourceIfRequired() {
+      log.debug('selectVisSourceIfRequired');
+      const selectPage = await testSubjects.findAll('visualizeSelectSearch');
+      if (selectPage.length) {
+        log.debug('a search is required for this visualization');
+        await this.clickNewSearch();
+      }
+    }
+
+    /**
+     * Deletes all existing visualizations
+     */
+    public async deleteAllVisualizations() {
+      await retry.try(async () => {
+        await listingTable.checkListingSelectAllCheckbox();
+        await listingTable.clickDeleteSelected();
+        await common.clickConfirmOnModal();
+        await testSubjects.find('createVisualizationPromptButton');
+      });
+    }
+
+    public async isBetaInfoShown() {
+      return await testSubjects.exists('betaVisInfo');
+    }
+
+    public async getBetaTypeLinks() {
+      return await find.allByCssSelector('[data-vis-stage="beta"]');
+    }
+
+    public async getExperimentalTypeLinks() {
+      return await find.allByCssSelector('[data-vis-stage="experimental"]');
+    }
+
+    public async isExperimentalInfoShown() {
+      return await testSubjects.exists('experimentalVisInfo');
+    }
+
+    public async getExperimentalInfo() {
+      return await testSubjects.find('experimentalVisInfo');
+    }
+
+    public async getSideEditorExists() {
+      return await find.existsByCssSelector('.collapsible-sidebar');
+    }
+
+    public async clickSavedSearch(savedSearchName: string) {
+      await testSubjects.click(`savedObjectTitle${savedSearchName.split(' ').join('-')}`);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async clickUnlinkSavedSearch() {
+      await testSubjects.doubleClick('unlinkSavedSearch');
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async ensureSavePanelOpen() {
+      log.debug('ensureSavePanelOpen');
+      await header.waitUntilLoadingHasFinished();
+      const isOpen = await testSubjects.exists('savedObjectSaveModal', { timeout: 5000 });
+      if (!isOpen) {
+        await testSubjects.click('visualizeSaveButton');
+      }
+    }
+
+    public async clickLoadSavedVisButton() {
+      // TODO: Use a test subject selector once we rewrite breadcrumbs to accept each breadcrumb
+      // element as a child instead of building the breadcrumbs dynamically.
+      await find.clickByCssSelector('[href="#/visualize"]');
+    }
+
+    public async clickVisualizationByName(vizName: string) {
+      log.debug('clickVisualizationByLinkText(' + vizName + ')');
+      await find.clickByPartialLinkText(vizName);
+    }
+
+    public async loadSavedVisualization(vizName: string, { navigateToVisualize = true } = {}) {
+      if (navigateToVisualize) {
+        await this.clickLoadSavedVisButton();
+      }
+      await this.openSavedVisualization(vizName);
+    }
+
+    public async openSavedVisualization(vizName: string) {
+      await this.clickVisualizationByName(vizName);
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async waitForVisualizationSavedToastGone() {
+      await testSubjects.waitForDeleted('saveVisualizationSuccess');
+    }
+
+    public async clickLandingPageBreadcrumbLink() {
+      log.debug('clickLandingPageBreadcrumbLink');
+      await find.clickByCssSelector(`a[href="#${VisualizeConstants.LANDING_PAGE_PATH}"]`);
+    }
+
+    /**
+     * Returns true if already on the landing page (that page doesn't have a link to itself).
+     * @returns {Promise<boolean>}
+     */
+    public async onLandingPage() {
+      log.debug(`VisualizePage.onLandingPage`);
+      return await testSubjects.exists('visualizeLandingPage');
+    }
+
+    public async gotoLandingPage() {
+      log.debug('VisualizePage.gotoLandingPage');
+      const onPage = await this.onLandingPage();
+      if (!onPage) {
+        await retry.try(async () => {
+          await this.clickLandingPageBreadcrumbLink();
+          const onLandingPage = await this.onLandingPage();
+          if (!onLandingPage) throw new Error('Not on the landing page.');
+        });
+      }
+    }
+
+    public async saveVisualization(vizName: string, { saveAsNew = false } = {}) {
+      await this.ensureSavePanelOpen();
+      await testSubjects.setValue('savedObjectTitle', vizName);
+      if (saveAsNew) {
+        log.debug('Check save as new visualization');
+        await testSubjects.click('saveAsNewCheckbox');
+      }
+      log.debug('Click Save Visualization button');
+
+      await testSubjects.click('confirmSaveSavedObjectButton');
+
+      // Confirm that the Visualization has actually been saved
+      await testSubjects.existOrFail('saveVisualizationSuccess');
+      const message = await common.closeToast();
+      await header.waitUntilLoadingHasFinished();
+      await common.waitForSaveModalToClose();
+
+      return message;
+    }
+
+    public async saveVisualizationExpectSuccess(vizName: string, { saveAsNew = false } = {}) {
+      const saveMessage = await this.saveVisualization(vizName, { saveAsNew });
+      if (!saveMessage) {
+        throw new Error(
+          `Expected saveVisualization to respond with the saveMessage from the toast, got ${saveMessage}`
+        );
+      }
+    }
+
+    public async saveVisualizationExpectSuccessAndBreadcrumb(
+      vizName: string,
+      { saveAsNew = false } = {}
+    ) {
+      await this.saveVisualizationExpectSuccess(vizName, { saveAsNew });
+      await retry.waitFor(
+        'last breadcrumb to have new vis name',
+        async () => (await globalNav.getLastBreadcrumb()) === vizName
+      );
+    }
+  }
+
+  return new VisualizePage();
+}
diff --git a/test/functional/services/browser.ts b/test/functional/services/browser.ts
index ab686f4d5ffec..72bcc07ab98cf 100644
--- a/test/functional/services/browser.ts
+++ b/test/functional/services/browser.ts
@@ -30,13 +30,7 @@ import { Browsers } from './remote/browsers';
 
 export async function BrowserProvider({ getService }: FtrProviderContext) {
   const log = getService('log');
-  const { driver, browserType, consoleLog$ } = await getService('__webdriver__').init();
-
-  consoleLog$.subscribe(({ message, level }) => {
-    log[level === 'SEVERE' || level === 'error' ? 'error' : 'debug'](
-      `browser[${level}] ${message}`
-    );
-  });
+  const { driver, browserType } = await getService('__webdriver__').init();
 
   const isW3CEnabled = (driver as any).executor_.w3c === true;
 
diff --git a/test/functional/services/dashboard/visualizations.js b/test/functional/services/dashboard/visualizations.js
index 1facf49651b19..5e722ccce8970 100644
--- a/test/functional/services/dashboard/visualizations.js
+++ b/test/functional/services/dashboard/visualizations.js
@@ -19,10 +19,12 @@
 
 export function DashboardVisualizationProvider({ getService, getPageObjects }) {
   const log = getService('log');
+  const find = getService('find');
+  const retry = getService('retry');
   const queryBar = getService('queryBar');
   const testSubjects = getService('testSubjects');
   const dashboardAddPanel = getService('dashboardAddPanel');
-  const PageObjects = getPageObjects(['dashboard', 'visualize', 'header', 'discover']);
+  const PageObjects = getPageObjects(['dashboard', 'visualize', 'visEditor', 'header', 'discover']);
 
   return new (class DashboardVisualizations {
     async createAndAddTSVBVisualization(name) {
@@ -72,19 +74,41 @@ export function DashboardVisualizationProvider({ getService, getPageObjects }) {
       await dashboardAddPanel.addSavedSearch(name);
     }
 
-    async createAndAddMarkdown({ name, markdown }, checkForAddPanel = true) {
+    async clickAddVisualizationButton() {
+      log.debug('DashboardVisualizations.clickAddVisualizationButton');
+      await testSubjects.click('addVisualizationButton');
+    }
+
+    async isNewVisDialogShowing() {
+      log.debug('DashboardVisualizations.isNewVisDialogShowing');
+      return await find.existsByCssSelector('.visNewVisDialog');
+    }
+
+    async ensureNewVisualizationDialogIsShowing() {
+      let isShowing = await this.isNewVisDialogShowing();
+      log.debug(`DashboardVisualizations.ensureNewVisualizationDialogIsShowing:${isShowing}`);
+      if (!isShowing) {
+        await retry.try(async () => {
+          await this.clickAddVisualizationButton();
+          isShowing = await this.isNewVisDialogShowing();
+          log.debug(`DashboardVisualizations.ensureNewVisualizationDialogIsShowing:${isShowing}`);
+          if (!isShowing) {
+            throw new Error('New Vis Dialog still not open, trying again.');
+          }
+        });
+      }
+    }
+
+    async createAndAddMarkdown({ name, markdown }) {
       log.debug(`createAndAddMarkdown(${markdown})`);
       const inViewMode = await PageObjects.dashboard.getIsInViewMode();
       if (inViewMode) {
         await PageObjects.dashboard.switchToEditMode();
       }
-      if (checkForAddPanel) {
-        await dashboardAddPanel.ensureAddPanelIsShowing();
-        await dashboardAddPanel.clickAddNewEmbeddableLink('visualization');
-      }
+      await this.ensureNewVisualizationDialogIsShowing();
       await PageObjects.visualize.clickMarkdownWidget();
-      await PageObjects.visualize.setMarkdownTxt(markdown);
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.setMarkdownTxt(markdown);
+      await PageObjects.visEditor.clickGo();
       await PageObjects.visualize.saveVisualizationExpectSuccess(name);
     }
   })();
diff --git a/test/functional/services/elastic_chart.ts b/test/functional/services/elastic_chart.ts
index 4f4dbcba5f0b8..afae3f830b3bf 100644
--- a/test/functional/services/elastic_chart.ts
+++ b/test/functional/services/elastic_chart.ts
@@ -37,7 +37,7 @@ export function ElasticChartProvider({ getService }: FtrProviderContext) {
 
     public async getVisualizationRenderingCount(dataTestSubj: string) {
       const chart = await testSubjects.find(dataTestSubj);
-      const visContainer = await chart.findByCssSelector('.echChart');
+      const visContainer = await chart.findByCssSelector('.echChartStatus');
       const renderingCount = await visContainer.getAttribute('data-ech-render-count');
       return Number(renderingCount);
     }
diff --git a/test/functional/services/index.ts b/test/functional/services/index.ts
index ea47ccf1d2704..a10bb013b3af4 100644
--- a/test/functional/services/index.ts
+++ b/test/functional/services/index.ts
@@ -49,7 +49,7 @@ import { TestSubjectsProvider } from './test_subjects';
 import { ToastsProvider } from './toasts';
 // @ts-ignore not TS yet
 import { PieChartProvider } from './visualizations';
-import { VisualizeListingTableProvider } from './visualize_listing_table';
+import { ListingTableProvider } from './listing_table';
 import { SavedQueryManagementComponentProvider } from './saved_query_management_component';
 
 export const services = {
@@ -66,7 +66,7 @@ export const services = {
   dashboardVisualizations: DashboardVisualizationProvider,
   dashboardExpect: DashboardExpectProvider,
   failureDebugging: FailureDebuggingProvider,
-  visualizeListingTable: VisualizeListingTableProvider,
+  listingTable: ListingTableProvider,
   dashboardAddPanel: DashboardAddPanelProvider,
   dashboardReplacePanel: DashboardReplacePanelProvider,
   dashboardPanelActions: DashboardPanelActionsProvider,
diff --git a/test/functional/services/listing_table.ts b/test/functional/services/listing_table.ts
new file mode 100644
index 0000000000000..ec886cf694f2e
--- /dev/null
+++ b/test/functional/services/listing_table.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 { FtrProviderContext } from '../ftr_provider_context';
+
+export function ListingTableProvider({ getService, getPageObjects }: FtrProviderContext) {
+  const testSubjects = getService('testSubjects');
+  const find = getService('find');
+  const log = getService('log');
+  const retry = getService('retry');
+  const { common, header } = getPageObjects(['common', 'header']);
+
+  class ListingTable {
+    public async getSearchFilter() {
+      const searchFilter = await find.allByCssSelector('.euiFieldSearch');
+      return searchFilter[0];
+    }
+
+    public async clearFilter() {
+      const searchFilter = await this.getSearchFilter();
+      await searchFilter.clearValue();
+      await searchFilter.click();
+    }
+
+    public async getAllVisualizationNamesOnCurrentPage(): Promise<string[]> {
+      const visualizationNames = [];
+      const links = await find.allByCssSelector('.kuiLink');
+      for (let i = 0; i < links.length; i++) {
+        visualizationNames.push(await links[i].getVisibleText());
+      }
+      log.debug(`Found ${visualizationNames.length} visualizations on current page`);
+      return visualizationNames;
+    }
+
+    public async getItemsCount(appName: 'visualize' | 'dashboard'): Promise<number> {
+      const prefixMap = { visualize: 'vis', dashboard: 'dashboard' };
+      const elements = await find.allByCssSelector(
+        `[data-test-subj^="${prefixMap[appName]}ListingTitleLink"]`
+      );
+      return elements.length;
+    }
+
+    public async searchForItemWithName(name: string) {
+      log.debug(`searchForItemWithName: ${name}`);
+
+      await retry.try(async () => {
+        const searchFilter = await this.getSearchFilter();
+        await searchFilter.clearValue();
+        await searchFilter.click();
+        // Note: this replacement of - to space is to preserve original logic but I'm not sure why or if it's needed.
+        await searchFilter.type(name.replace('-', ' '));
+        await common.pressEnterKey();
+      });
+
+      await header.waitUntilLoadingHasFinished();
+    }
+
+    public async clickDeleteSelected() {
+      await testSubjects.click('deleteSelectedItems');
+    }
+
+    public async checkListingSelectAllCheckbox() {
+      const element = await testSubjects.find('checkboxSelectAll');
+      const isSelected = await element.isSelected();
+      if (!isSelected) {
+        log.debug(`checking checkbox "checkboxSelectAll"`);
+        await testSubjects.click('checkboxSelectAll');
+      }
+    }
+
+    public async getAllVisualizationNames(): Promise<string[]> {
+      log.debug('ListingTable.getAllVisualizationNames');
+      let morePages = true;
+      let visualizationNames: string[] = [];
+      while (morePages) {
+        visualizationNames = visualizationNames.concat(
+          await this.getAllVisualizationNamesOnCurrentPage()
+        );
+        morePages = !((await testSubjects.getAttribute('pagerNextButton', 'disabled')) === 'true');
+        if (morePages) {
+          await testSubjects.click('pagerNextButton');
+          await header.waitUntilLoadingHasFinished();
+        }
+      }
+      return visualizationNames;
+    }
+  }
+
+  return new ListingTable();
+}
diff --git a/test/functional/services/remote/remote.ts b/test/functional/services/remote/remote.ts
index 90ff55fbebde5..69c2793621095 100644
--- a/test/functional/services/remote/remote.ts
+++ b/test/functional/services/remote/remote.ts
@@ -20,14 +20,11 @@
 import Fs from 'fs';
 import { resolve } from 'path';
 
-import * as Rx from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
-import { logging } from 'selenium-webdriver';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { initWebDriver } from './webdriver';
 import { Browsers } from './browsers';
-import { pollForLogEntry$ } from './poll_for_log_entry';
 
 export async function RemoteProvider({ getService }: FtrProviderContext) {
   const lifecycle = getService('lifecycle');
@@ -37,7 +34,7 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
   const collectCoverage: boolean = !!process.env.CODE_COVERAGE;
   const coveragePrefix = 'coveragejson:';
   const coverageDir = resolve(__dirname, '../../../../target/kibana-coverage/functional');
-  let logSubscription: undefined | Rx.Subscription;
+  let coverageCounter = 1;
   type BrowserStorage = 'sessionStorage' | 'localStorage';
 
   const clearBrowserStorage = async (storageType: BrowserStorage) => {
@@ -50,6 +47,14 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
     }
   };
 
+  const writeCoverage = (coverageJson: string) => {
+    const id = coverageCounter++;
+    const timestamp = Date.now();
+    const path = resolve(coverageDir, `${id}.${timestamp}.coverage.json`);
+    log.info('writing coverage to', path);
+    Fs.writeFileSync(path, JSON.stringify(JSON.parse(coverageJson), null, 2));
+  };
+
   const { driver, By, until, consoleLog$ } = await initWebDriver(
     log,
     browserType,
@@ -69,46 +74,35 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
         caps.get('chrome').chromedriverVersion
       }, w3c=${isW3CEnabled}, codeCoverage=${collectCoverage}`
     );
-
-    if (collectCoverage) {
-      let coverageCounter = 1;
-      // We are running xpack tests with different configs and cleanup will delete collected coverage
-      // del.sync(coverageDir);
-      Fs.mkdirSync(coverageDir, { recursive: true });
-
-      logSubscription = pollForLogEntry$(
-        driver,
-        logging.Type.BROWSER,
-        config.get('browser.logPollingMs'),
-        lifecycle.cleanup.after$
-      )
-        .pipe(
-          mergeMap(logEntry => {
-            if (logEntry.message.includes(coveragePrefix)) {
-              const id = coverageCounter++;
-              const timestamp = Date.now();
-              const path = resolve(coverageDir, `${id}.${timestamp}.coverage.json`);
-              const [, coverageJsonBase64] = logEntry.message.split(coveragePrefix);
-              const coverageJson = Buffer.from(coverageJsonBase64, 'base64').toString('utf8');
-
-              log.info('writing coverage to', path);
-              Fs.writeFileSync(path, JSON.stringify(JSON.parse(coverageJson), null, 2));
-
-              // filter out this message
-              return [];
-            }
-
-            return [logEntry];
-          })
-        )
-        .subscribe({
-          next({ message, level: { name: level } }) {
-            const msg = message.replace(/\\n/g, '\n');
-            log[level === 'SEVERE' ? 'error' : 'debug'](`browser[${level}] ${msg}`);
-          },
-        });
-    }
   }
+  // code coverage is supported only in Chrome browser
+  if (collectCoverage) {
+    // We are running xpack tests with different configs and cleanup will delete collected coverage
+    // del.sync(coverageDir);
+    Fs.mkdirSync(coverageDir, { recursive: true });
+  }
+
+  consoleLog$
+    .pipe(
+      mergeMap(logEntry => {
+        if (collectCoverage && logEntry.message.includes(coveragePrefix)) {
+          const [, coverageJsonBase64] = logEntry.message.split(coveragePrefix);
+          const coverageJson = Buffer.from(coverageJsonBase64, 'base64').toString('utf8');
+          writeCoverage(coverageJson);
+
+          // filter out this message
+          return [];
+        }
+
+        return [logEntry];
+      })
+    )
+    .subscribe({
+      next({ message, level }) {
+        const msg = message.replace(/\\n/g, '\n');
+        log[level === 'SEVERE' ? 'error' : 'debug'](`browser[${level}] ${msg}`);
+      },
+    });
 
   lifecycle.beforeTests.add(async () => {
     // hard coded default, can be overridden per suite using `browser.setWindowSize()`
@@ -144,8 +138,15 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
   });
 
   lifecycle.cleanup.add(async () => {
-    if (logSubscription) {
-      await new Promise(r => logSubscription!.add(r));
+    // Getting the last piece of code coverage before closing browser
+    if (collectCoverage) {
+      const coverageJson = await driver
+        .executeScript('return window.__coverage__')
+        .catch(() => undefined)
+        .then(coverage => coverage && JSON.stringify(coverage));
+      if (coverageJson) {
+        writeCoverage(coverageJson);
+      }
     }
 
     await driver.quit();
diff --git a/test/functional/services/screenshots.ts b/test/functional/services/screenshots.ts
index 9e673fe919a74..4c5728174cf99 100644
--- a/test/functional/services/screenshots.ts
+++ b/test/functional/services/screenshots.ts
@@ -51,7 +51,7 @@ export async function ScreenshotsProvider({ getService }: FtrProviderContext) {
      * @param updateBaselines {boolean} optional, pass true to update the baseline snapshot.
      * @return {Promise.<number>} Percentage difference between the baseline and the current snapshot.
      */
-    async compareAgainstBaseline(name: string, updateBaselines: boolean, el: WebElementWrapper) {
+    async compareAgainstBaseline(name: string, updateBaselines: boolean, el?: WebElementWrapper) {
       log.debug('compareAgainstBaseline');
       const sessionPath = resolve(SESSION_DIRECTORY, `${name}.png`);
       await this._take(sessionPath, el);
diff --git a/test/functional/services/test_subjects.ts b/test/functional/services/test_subjects.ts
index a3f64e6f96cc8..8ef008d5dee50 100644
--- a/test/functional/services/test_subjects.ts
+++ b/test/functional/services/test_subjects.ts
@@ -295,6 +295,25 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
     public getCssSelector(selector: string): string {
       return testSubjSelector(selector);
     }
+
+    public async scrollIntoView(selector: string) {
+      const element = await this.find(selector);
+      await element.scrollIntoViewIfNecessary();
+    }
+
+    public async isChecked(selector: string) {
+      const checkbox = await this.find(selector);
+      return await checkbox.isSelected();
+    }
+
+    public async setCheckbox(selector: string, state: 'check' | 'uncheck') {
+      const isChecked = await this.isChecked(selector);
+      const states = { check: true, uncheck: false };
+      if (isChecked !== states[state]) {
+        log.debug(`updating checkbox ${selector}`);
+        await this.click(selector);
+      }
+    }
   }
 
   return new TestSubjects();
diff --git a/test/functional/services/visualize_listing_table.ts b/test/functional/services/visualize_listing_table.ts
deleted file mode 100644
index 8c4640ada1c05..0000000000000
--- a/test/functional/services/visualize_listing_table.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 { FtrProviderContext } from '../ftr_provider_context';
-
-export function VisualizeListingTableProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const find = getService('find');
-  const log = getService('log');
-  const { header } = getPageObjects(['header']);
-
-  class VisualizeListingTable {
-    public async getAllVisualizationNamesOnCurrentPage(): Promise<string[]> {
-      const visualizationNames = [];
-      const links = await find.allByCssSelector('.kuiLink');
-      for (let i = 0; i < links.length; i++) {
-        visualizationNames.push(await links[i].getVisibleText());
-      }
-      log.debug(`Found ${visualizationNames.length} visualizations on current page`);
-      return visualizationNames;
-    }
-
-    public async getAllVisualizationNames(): Promise<string[]> {
-      log.debug('VisualizeListingTable.getAllVisualizationNames');
-      let morePages = true;
-      let visualizationNames: string[] = [];
-      while (morePages) {
-        visualizationNames = visualizationNames.concat(
-          await this.getAllVisualizationNamesOnCurrentPage()
-        );
-        morePages = !((await testSubjects.getAttribute('pagerNextButton', 'disabled')) === 'true');
-        if (morePages) {
-          await testSubjects.click('pagerNextButton');
-          await header.waitUntilLoadingHasFinished();
-        }
-      }
-      return visualizationNames;
-    }
-  }
-
-  return new VisualizeListingTable();
-}
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 ae4fa1578fb2b..02c507dbb3ed8 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": "17.0.0",
+    "@elastic/eui": "17.3.1",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   }
diff --git a/test/plugin_functional/config.js b/test/plugin_functional/config.js
index 172dec9a1d111..87026ce25d9aa 100644
--- a/test/plugin_functional/config.js
+++ b/test/plugin_functional/config.js
@@ -57,11 +57,12 @@ export default async function({ readConfigFile }) {
       ...functionalConfig.get('kbnTestServer'),
       serverArgs: [
         ...functionalConfig.get('kbnTestServer.serverArgs'),
+
+        // Required to load new platform plugins via `--plugin-path` flag.
+        '--env.name=development',
         ...plugins.map(
           pluginDir => `--plugin-path=${path.resolve(__dirname, 'plugins', pluginDir)}`
         ),
-        // Required to load new platform plugins via `--plugin-path` flag.
-        '--env.name=development',
       ],
     },
   };
diff --git a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
index 5c8e1d03d5a4a..bda1557bdaf91 100644
--- a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
@@ -22,9 +22,6 @@ import { CorePluginAPluginSetup } from '../../core_plugin_a/public/plugin';
 
 declare global {
   interface Window {
-    corePluginB?: string;
-    hasAccessToInjectedMetadata?: boolean;
-    receivedStartServices?: boolean;
     env?: PluginInitializerContext['env'];
   }
 }
@@ -39,12 +36,6 @@ export class CorePluginBPlugin
     window.env = pluginContext.env;
   }
   public setup(core: CoreSetup, deps: CorePluginBDeps) {
-    window.corePluginB = `Plugin A said: ${deps.core_plugin_a.getGreeting()}`;
-    window.hasAccessToInjectedMetadata = 'getInjectedVar' in core.injectedMetadata;
-    core.getStartServices().then(([coreStart, plugins]) => {
-      window.receivedStartServices = 'overlays' in coreStart;
-    });
-
     core.application.register({
       id: 'bar',
       title: 'Bar',
@@ -53,6 +44,12 @@ export class CorePluginBPlugin
         return renderApp(context, params);
       },
     });
+
+    return {
+      sayHi() {
+        return `Plugin A said: ${deps.core_plugin_a.getGreeting()}`;
+      },
+    };
   }
 
   public start() {}
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 771e50b22f66b..91a4fe89c1c57 100644
--- a/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_b/server/plugin.ts
@@ -18,6 +18,7 @@
  */
 
 import { Plugin, CoreSetup } from 'kibana/server';
+import { schema } from '@kbn/config-schema';
 import { PluginARequestContext } from '../../core_plugin_a/server';
 
 declare module 'kibana/server' {
@@ -34,6 +35,25 @@ export class CorePluginBPlugin implements Plugin {
       const response = await context.pluginA.ping();
       return res.ok({ body: `Pong via plugin A: ${response}` });
     });
+
+    router.post(
+      {
+        path: '/core_plugin_b',
+        validate: {
+          query: schema.object({ id: schema.string() }),
+          body: ({ bar, baz } = {}, { ok, badRequest }) => {
+            if (typeof bar === 'string' && bar === baz) {
+              return ok({ bar, baz });
+            } else {
+              return badRequest(`bar: ${bar} !== baz: ${baz} or they are not string`);
+            }
+          },
+        },
+      },
+      async (context, req, res) => {
+        return res.ok({ body: `ID: ${req.query.id} - ${req.body.bar.toUpperCase()}` });
+      }
+    );
   }
 
   public start() {}
diff --git a/test/plugin_functional/plugins/core_provider_plugin/index.ts b/test/plugin_functional/plugins/core_provider_plugin/index.ts
new file mode 100644
index 0000000000000..01f3a67c6b554
--- /dev/null
+++ b/test/plugin_functional/plugins/core_provider_plugin/index.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.
+ */
+
+import { resolve } from 'path';
+import { Legacy } from '../../../../kibana';
+
+// eslint-disable-next-line import/no-default-export
+export default function CoreProviderPlugin(kibana: any) {
+  const config: Legacy.PluginSpecOptions = {
+    id: 'core-provider',
+    require: [],
+    publicDir: resolve(__dirname, 'public'),
+    init: (server: Legacy.Server) => ({}),
+    uiExports: {
+      hacks: [resolve(__dirname, 'public/index')],
+    },
+  };
+
+  return new kibana.Plugin(config);
+}
diff --git a/test/plugin_functional/plugins/core_provider_plugin/package.json b/test/plugin_functional/plugins/core_provider_plugin/package.json
new file mode 100644
index 0000000000000..941503b934cbb
--- /dev/null
+++ b/test/plugin_functional/plugins/core_provider_plugin/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "core_provider_plugin",
+  "version": "1.0.0",
+  "main": "target/test/plugin_functional/plugins/core_provider_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/core_provider_plugin/public/index.ts b/test/plugin_functional/plugins/core_provider_plugin/public/index.ts
new file mode 100644
index 0000000000000..c74928203db56
--- /dev/null
+++ b/test/plugin_functional/plugins/core_provider_plugin/public/index.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 { npSetup, npStart } from 'ui/new_platform';
+import '../types';
+
+window.__coreProvider = {
+  setup: npSetup,
+  start: npStart,
+  testUtils: {
+    delay: (ms: number) => new Promise(res => setTimeout(res, ms)),
+  },
+};
diff --git a/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json b/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json
new file mode 100644
index 0000000000000..c29959197958d
--- /dev/null
+++ b/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "skipLibCheck": true
+  },
+  "include": [
+    "index.ts",
+    "types.ts",
+    "public/**/*.ts",
+    "../../../../typings/**/*",
+  ],
+  "exclude": []
+}
diff --git a/test/plugin_functional/plugins/core_provider_plugin/types.ts b/test/plugin_functional/plugins/core_provider_plugin/types.ts
new file mode 100644
index 0000000000000..bf19578c37baa
--- /dev/null
+++ b/test/plugin_functional/plugins/core_provider_plugin/types.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 { LegacyCoreSetup, LegacyCoreStart } from 'kibana/public';
+
+declare global {
+  interface Window {
+    __coreProvider: {
+      setup: {
+        core: LegacyCoreSetup;
+        plugins: Record<string, any>;
+      };
+      start: {
+        core: LegacyCoreStart;
+        plugins: Record<string, any>;
+      };
+      testUtils: {
+        delay: (ms: number) => Promise<void>;
+      };
+    };
+  }
+}
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 32da6eade2b42..67ad28c083dbc 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": "17.0.0",
+    "@elastic/eui": "17.3.1",
     "react": "^16.12.0"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
index 0ab65667d6f82..b22a1ff2d4176 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": "17.0.0",
+    "@elastic/eui": "17.3.1",
     "react": "^16.12.0"
   },
   "scripts": {
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/app.tsx b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/app.tsx
index c0ed2b027f0e4..381590af142f7 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/app.tsx
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/app.tsx
@@ -24,8 +24,6 @@ import {
   GetEmbeddableFactories,
 } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public';
 import { TGetActionsCompatibleWithTrigger } from '../../../../../../../../src/plugins/ui_actions/public';
-import { ContactCardEmbeddableExample } from './hello_world_embeddable_example';
-import { HelloWorldContainerExample } from './hello_world_container_example';
 import { DashboardContainerExample } from './dashboard_container_example';
 import { Start as InspectorStartContract } from '../../../../../../../../src/plugins/inspector/public';
 
@@ -45,14 +43,6 @@ export class App extends Component<AppProps, { selectedTabId: string }> {
   constructor(props: AppProps) {
     super(props);
     this.tabs = [
-      {
-        id: 'helloWorldContainer',
-        name: 'Hello World Container',
-      },
-      {
-        id: 'helloWorldEmbeddable',
-        name: 'Hello World Embeddable',
-      },
       {
         id: 'dashboardContainer',
         name: 'Dashboard Container',
@@ -96,32 +86,6 @@ export class App extends Component<AppProps, { selectedTabId: string }> {
 
   private getContentsForTab() {
     switch (this.state.selectedTabId) {
-      case 'helloWorldContainer': {
-        return (
-          <HelloWorldContainerExample
-            getActions={this.props.getActions}
-            getEmbeddableFactory={this.props.getEmbeddableFactory}
-            getAllEmbeddableFactories={this.props.getAllEmbeddableFactories}
-            overlays={this.props.overlays}
-            notifications={this.props.notifications}
-            inspector={this.props.inspector}
-            SavedObjectFinder={this.props.SavedObjectFinder}
-          />
-        );
-      }
-      case 'helloWorldEmbeddable': {
-        return (
-          <ContactCardEmbeddableExample
-            getActions={this.props.getActions}
-            getEmbeddableFactory={this.props.getEmbeddableFactory}
-            getAllEmbeddableFactories={this.props.getAllEmbeddableFactories}
-            overlays={this.props.overlays}
-            notifications={this.props.notifications}
-            inspector={this.props.inspector}
-            SavedObjectFinder={this.props.SavedObjectFinder}
-          />
-        );
-      }
       case 'dashboardContainer': {
         return (
           <DashboardContainerExample
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/dashboard_input.ts b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/dashboard_input.ts
index 011b322612d90..3c8468a3d8ed3 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/dashboard_input.ts
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/dashboard_input.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { ViewMode, CONTACT_CARD_EMBEDDABLE, HELLO_WORLD_EMBEDDABLE_TYPE } from '../embeddable_api';
+import { ViewMode, CONTACT_CARD_EMBEDDABLE, HELLO_WORLD_EMBEDDABLE } from '../embeddable_api';
 import { DashboardContainerInput } from '../../../../../../../../src/legacy/core_plugins/dashboard_embeddable_container/public/np_ready/public';
 
 export const dashboardInput: DashboardContainerInput = {
@@ -30,7 +30,7 @@ export const dashboardInput: DashboardContainerInput = {
         y: 15,
         i: '1',
       },
-      type: HELLO_WORLD_EMBEDDABLE_TYPE,
+      type: HELLO_WORLD_EMBEDDABLE,
       explicitInput: {
         id: '1',
       },
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/hello_world_container_example.tsx b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/hello_world_container_example.tsx
deleted file mode 100644
index efd700552ec32..0000000000000
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/hello_world_container_example.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import { Subscription } from 'rxjs';
-import { EuiFieldText, EuiFormRow } from '@elastic/eui';
-import {
-  EmbeddablePanel,
-  GetEmbeddableFactory,
-  GetEmbeddableFactories,
-} from '../../../../../../../../src/plugins/embeddable/public';
-import {
-  HelloWorldContainer,
-  CONTACT_CARD_EMBEDDABLE,
-  HELLO_WORLD_EMBEDDABLE_TYPE,
-} from '../../../../../../../../src/plugins/embeddable/public/lib/test_samples';
-import { TGetActionsCompatibleWithTrigger } from '../../../../../../../../src/plugins/ui_actions/public';
-import { CoreStart } from '../../../../../../../../src/core/public';
-import { Start as InspectorStartContract } from '../../../../../../../../src/plugins/inspector/public';
-
-interface Props {
-  getActions: TGetActionsCompatibleWithTrigger;
-  getEmbeddableFactory: GetEmbeddableFactory;
-  getAllEmbeddableFactories: GetEmbeddableFactories;
-  overlays: CoreStart['overlays'];
-  notifications: CoreStart['notifications'];
-  inspector: InspectorStartContract;
-  SavedObjectFinder: React.ComponentType<any>;
-}
-
-export class HelloWorldContainerExample extends React.Component<Props, { lastName?: string }> {
-  private container: HelloWorldContainer;
-  private mounted: boolean = false;
-  private subscription?: Subscription;
-
-  constructor(props: Props) {
-    super(props);
-
-    this.container = new HelloWorldContainer(
-      {
-        id: 'helloWorldContainerExample',
-        panels: {
-          '1': {
-            type: CONTACT_CARD_EMBEDDABLE,
-            explicitInput: {
-              firstName: 'Joe',
-              id: '1',
-            },
-          },
-          '2': {
-            type: HELLO_WORLD_EMBEDDABLE_TYPE,
-            explicitInput: { id: '2' },
-          },
-          '3': {
-            type: 'idontexist',
-            explicitInput: { id: '3' },
-          },
-        },
-      },
-      {
-        getActions: this.props.getActions,
-        getEmbeddableFactory: this.props.getEmbeddableFactory,
-        getAllEmbeddableFactories: this.props.getAllEmbeddableFactories,
-        overlays: this.props.overlays,
-        notifications: this.props.notifications,
-        inspector: this.props.inspector,
-        SavedObjectFinder: this.props.SavedObjectFinder,
-      }
-    );
-    this.state = {
-      lastName: this.container.getInput().lastName,
-    };
-  }
-
-  public componentDidMount() {
-    this.mounted = true;
-    this.subscription = this.container.getInput$().subscribe(() => {
-      const { lastName } = this.container.getInput();
-      if (this.mounted) {
-        this.setState({
-          lastName,
-        });
-      }
-    });
-  }
-
-  public componentWillUnmount() {
-    this.mounted = false;
-    if (this.subscription) {
-      this.subscription.unsubscribe();
-    }
-    this.container.destroy();
-  }
-
-  public render() {
-    return (
-      <div className="app-container dshAppContainer">
-        <h1>Hello World Container</h1>
-        <EuiFormRow label="Last name">
-          <EuiFieldText
-            name="popfirst"
-            value={this.state.lastName}
-            placeholder="optional"
-            onChange={e => this.container.updateInput({ lastName: e.target.value })}
-          />
-        </EuiFormRow>
-        <EmbeddablePanel
-          embeddable={this.container}
-          getActions={this.props.getActions}
-          getEmbeddableFactory={this.props.getEmbeddableFactory}
-          getAllEmbeddableFactories={this.props.getAllEmbeddableFactories}
-          overlays={this.props.overlays}
-          notifications={this.props.notifications}
-          inspector={this.props.inspector}
-          SavedObjectFinder={this.props.SavedObjectFinder}
-        />
-      </div>
-    );
-  }
-}
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/hello_world_embeddable_example.tsx b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/hello_world_embeddable_example.tsx
deleted file mode 100644
index 78b122cb1baf5..0000000000000
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/app/hello_world_embeddable_example.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import {
-  EmbeddablePanel,
-  GetEmbeddableFactory,
-  GetEmbeddableFactories,
-} from '../../../../../../../../src/plugins/embeddable/public';
-import { HelloWorldEmbeddable } from '../../../../../../../../src/plugins/embeddable/public/lib/test_samples';
-import { TGetActionsCompatibleWithTrigger } from '../../../../../../../../src/plugins/ui_actions/public';
-import { CoreStart } from '../../../../../../../../src/core/public';
-import { Start as InspectorStartContract } from '../../../../../../../../src/plugins/inspector/public';
-
-interface Props {
-  getActions: TGetActionsCompatibleWithTrigger;
-  getEmbeddableFactory: GetEmbeddableFactory;
-  getAllEmbeddableFactories: GetEmbeddableFactories;
-  overlays: CoreStart['overlays'];
-  notifications: CoreStart['notifications'];
-  inspector: InspectorStartContract;
-  SavedObjectFinder: React.ComponentType<any>;
-}
-
-export class ContactCardEmbeddableExample extends React.Component<Props> {
-  private embeddable: HelloWorldEmbeddable;
-
-  constructor(props: Props) {
-    super(props);
-
-    this.embeddable = new HelloWorldEmbeddable({ id: 'hello' });
-  }
-
-  public componentWillUnmount() {
-    if (this.embeddable) {
-      this.embeddable.destroy();
-    }
-  }
-
-  public render() {
-    return (
-      <div className="app-container dshAppContainer">
-        <EmbeddablePanel
-          embeddable={this.embeddable}
-          getActions={this.props.getActions}
-          getEmbeddableFactory={this.props.getEmbeddableFactory}
-          getAllEmbeddableFactories={this.props.getAllEmbeddableFactories}
-          overlays={this.props.overlays}
-          notifications={this.props.notifications}
-          inspector={this.props.inspector}
-          SavedObjectFinder={this.props.SavedObjectFinder}
-        />
-      </div>
-    );
-  }
-}
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/embeddable_api.ts b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/embeddable_api.ts
index d4a8cbabc3c2a..dd25bebf89920 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/embeddable_api.ts
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/embeddable_api.ts
@@ -19,3 +19,4 @@
 
 export * from '../../../../../../../src/plugins/embeddable/public';
 export * from '../../../../../../../src/plugins/embeddable/public/lib/test_samples';
+export { HELLO_WORLD_EMBEDDABLE } from '../../../../../../../examples/embeddable_examples/public';
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/embeddables/hello_world_embeddable_factory.ts b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/embeddables/hello_world_embeddable_factory.ts
index 3cc7b70ce4090..0c90cb3b85867 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/embeddables/hello_world_embeddable_factory.ts
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/embeddables/hello_world_embeddable_factory.ts
@@ -20,7 +20,9 @@
 // eslint-disable-next-line
 import { npSetup } from '../../../../../../../../src/legacy/ui/public/new_platform';
 // eslint-disable-next-line
-import { HelloWorldEmbeddableFactory } from '../../../../../../../../src/plugins/embeddable/public/lib/test_samples';
+import { HelloWorldEmbeddableFactory, HELLO_WORLD_EMBEDDABLE } from '../../../../../../../../examples/embeddable_examples/public';
 
-const factory = new HelloWorldEmbeddableFactory();
-npSetup.plugins.embeddable.registerEmbeddableFactory(factory.type, factory);
+npSetup.plugins.embeddable.registerEmbeddableFactory(
+  HELLO_WORLD_EMBEDDABLE,
+  new HelloWorldEmbeddableFactory()
+);
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
index adf898d9af2c7..8f22e54bac3c1 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
@@ -34,7 +34,6 @@ const REACT_ROOT_ID = 'embeddableExplorerRoot';
 import {
   SayHelloAction,
   createSendMessageAction,
-  HelloWorldEmbeddableFactory,
   ContactCardEmbeddableFactory,
 } from './embeddable_api';
 import { App } from './app';
@@ -42,6 +41,7 @@ import {
   SavedObjectFinderProps,
   SavedObjectFinderUi,
 } from '../../../../../../../src/plugins/kibana_react/public/saved_objects';
+import { HelloWorldEmbeddableFactory } from '../../../../../../../examples/embeddable_examples/public';
 import {
   IEmbeddableStart,
   IEmbeddableSetup,
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 6f661ab2a79e1..8c91826d7b450 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": "17.0.0",
+    "@elastic/eui": "17.3.1",
     "react": "^16.12.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
index de39a085bd20d..b4c3e05c28b66 100644
--- a/test/plugin_functional/plugins/kbn_tp_top_nav/index.js
+++ b/test/plugin_functional/plugins/kbn_tp_top_nav/index.js
@@ -25,6 +25,7 @@ export default function(kibana) {
         description: 'This is a sample plugin for the functional tests.',
         main: 'plugins/kbn_tp_top_nav/app',
       },
+      hacks: ['plugins/kbn_tp_top_nav/initialize'],
     },
   });
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_top_nav/public/initialize.js b/test/plugin_functional/plugins/kbn_tp_top_nav/public/initialize.js
new file mode 100644
index 0000000000000..d46e47f6d248a
--- /dev/null
+++ b/test/plugin_functional/plugins/kbn_tp_top_nav/public/initialize.js
@@ -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 { npSetup } from 'ui/new_platform';
+
+const customExtension = {
+  id: 'registered-prop',
+  label: 'Registered Button',
+  description: 'Registered Demo',
+  run() {},
+  testId: 'demoRegisteredNewButton',
+};
+
+npSetup.plugins.navigation.registerMenuItem(customExtension);
+
+const customDiscoverExtension = {
+  id: 'registered-discover-prop',
+  label: 'Registered Discover Button',
+  description: 'Registered Discover Demo',
+  run() {},
+  testId: 'demoDiscoverRegisteredNewButton',
+  appName: 'discover',
+};
+
+npSetup.plugins.navigation.registerMenuItem(customDiscoverExtension);
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
index 6a6bf9e82d5c0..f77db4fe1654e 100644
--- 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
@@ -18,17 +18,8 @@
  */
 
 import React from 'react';
-import { npSetup, npStart } from 'ui/new_platform';
-
-const customExtension = {
-  id: 'registered-prop',
-  label: 'Registered Button',
-  description: 'Registered Demo',
-  run() {},
-  testId: 'demoRegisteredNewButton',
-};
-
-npSetup.plugins.navigation.registerMenuItem(customExtension);
+import './initialize';
+import { npStart } from 'ui/new_platform';
 
 export const AppWithTopNav = () => {
   const { TopNavMenu } = npStart.plugins.navigation.ui;
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/kibana.json b/test/plugin_functional/plugins/ui_settings_plugin/kibana.json
index 05d2dca0af937..35e4c35490e2f 100644
--- a/test/plugin_functional/plugins/ui_settings_plugin/kibana.json
+++ b/test/plugin_functional/plugins/ui_settings_plugin/kibana.json
@@ -4,5 +4,5 @@
   "kibanaVersion": "kibana",
   "configPath": ["ui_settings_plugin"],
   "server": true,
-  "ui": true
+  "ui": false
 }
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/public/index.ts b/test/plugin_functional/plugins/ui_settings_plugin/public/index.ts
deleted file mode 100644
index 3c5997132d460..0000000000000
--- a/test/plugin_functional/plugins/ui_settings_plugin/public/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.
- */
-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
deleted file mode 100644
index 883d203b4c37a..0000000000000
--- a/test/plugin_functional/plugins/ui_settings_plugin/public/plugin.tsx
+++ /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 { 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/tsconfig.json b/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json
index 1ba21f11b7de2..7c170405bbfc7 100644
--- a/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json
+++ b/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json
@@ -5,9 +5,6 @@
     "skipLibCheck": true
   },
   "include": [
-    "index.ts",
-    "public/**/*.ts",
-    "public/**/*.tsx",
     "server/**/*.ts",
     "../../../../typings/**/*",
   ],
diff --git a/test/plugin_functional/test_suites/core_plugins/server_plugins.ts b/test/plugin_functional/test_suites/core_plugins/server_plugins.ts
index 3881af5642996..3f89036fc2b65 100644
--- a/test/plugin_functional/test_suites/core_plugins/server_plugins.ts
+++ b/test/plugin_functional/test_suites/core_plugins/server_plugins.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import { PluginFunctionalProviderContext } from '../../services';
 
 // eslint-disable-next-line import/no-default-export
@@ -29,5 +30,39 @@ export default function({ getService }: PluginFunctionalProviderContext) {
         .expect(200)
         .expect('Pong via plugin A: true');
     });
+
+    it('extend request handler context with validation', async () => {
+      await supertest
+        .post('/core_plugin_b')
+        .set('kbn-xsrf', 'anything')
+        .query({ id: 'TEST' })
+        .send({ bar: 'hi!', baz: 'hi!' })
+        .expect(200)
+        .expect('ID: TEST - HI!');
+    });
+
+    it('extend request handler context with validation (400)', async () => {
+      await supertest
+        .post('/core_plugin_b')
+        .set('kbn-xsrf', 'anything')
+        .query({ id: 'TEST' })
+        .send({ bar: 'hi!', baz: 1234 })
+        .expect(400)
+        .expect({
+          error: 'Bad Request',
+          message: '[request body]: bar: hi! !== baz: 1234 or they are not string',
+          statusCode: 400,
+        });
+    });
+
+    it('renders core application explicitly', async () => {
+      await supertest.get('/requestcontext/render/core').expect(200, /app:core/);
+    });
+
+    it('renders legacy application', async () => {
+      await supertest
+        .get('/requestcontext/render/core_plugin_legacy')
+        .expect(200, /app:core_plugin_legacy/);
+    });
   });
 }
diff --git a/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
index ff53583546487..b76463ee76739 100644
--- a/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
+++ b/test/plugin_functional/test_suites/core_plugins/ui_plugins.ts
@@ -19,6 +19,7 @@
 
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
+import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
 
 // eslint-disable-next-line import/no-default-export
 export default function({ getService, getPageObjects }: PluginFunctionalProviderContext) {
@@ -31,22 +32,35 @@ export default function({ getService, getPageObjects }: PluginFunctionalProvider
         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!`);
+      it('should run the new platform plugins', async () => {
+        expect(
+          await browser.execute(() => {
+            return window.__coreProvider.setup.plugins.core_plugin_b.sayHi();
+          })
+        ).to.be('Plugin A said: Hello from Plugin A!');
       });
     });
 
-    describe('have injectedMetadata service provided', function describeIndexTests() {
+    describe('should have access to the core services', function describeIndexTests() {
       before(async () => {
-        await PageObjects.common.navigateToApp('bar');
+        await PageObjects.common.navigateToApp('settings');
+      });
+
+      it('to injectedMetadata service', async () => {
+        expect(
+          await browser.execute(() => {
+            return window.__coreProvider.setup.core.injectedMetadata.getKibanaBuildNumber();
+          })
+        ).to.be.a('number');
       });
 
-      it('should attach boolean to window.hasAccessToInjectedMetadata', async () => {
-        const hasAccessToInjectedMetadata = await browser.execute(
-          'return window.hasAccessToInjectedMetadata'
-        );
-        expect(hasAccessToInjectedMetadata).to.equal(true);
+      it('to start services via coreSetup.getStartServices', async () => {
+        expect(
+          await browser.executeAsync(async cb => {
+            const [coreStart] = await window.__coreProvider.setup.core.getStartServices();
+            cb(Boolean(coreStart.overlays));
+          })
+        ).to.be(true);
       });
     });
 
@@ -61,16 +75,5 @@ export default function({ getService, getPageObjects }: PluginFunctionalProvider
         expect(envData.packageInfo.version).to.be.a('string');
       });
     });
-
-    describe('have access to start services via coreSetup.getStartServices', function describeIndexTests() {
-      before(async () => {
-        await PageObjects.common.navigateToApp('bar');
-      });
-
-      it('should attach boolean to window.receivedStartServices', async () => {
-        const receivedStartServices = await browser.execute('return window.receivedStartServices');
-        expect(receivedStartServices).to.equal(true);
-      });
-    });
   });
 }
diff --git a/test/plugin_functional/test_suites/core_plugins/ui_settings.ts b/test/plugin_functional/test_suites/core_plugins/ui_settings.ts
index 2b4227ee798e3..dec79fd15f4dd 100644
--- a/test/plugin_functional/test_suites/core_plugins/ui_settings.ts
+++ b/test/plugin_functional/test_suites/core_plugins/ui_settings.ts
@@ -18,6 +18,7 @@
  */
 import expect from '@kbn/expect';
 import { PluginFunctionalProviderContext } from '../../services';
+import '../../plugins/core_provider_plugin/types';
 
 // eslint-disable-next-line import/no-default-export
 export default function({ getService, getPageObjects }: PluginFunctionalProviderContext) {
@@ -31,15 +32,30 @@ export default function({ getService, getPageObjects }: PluginFunctionalProvider
     });
 
     it('client plugins have access to registered settings', async () => {
-      const settings = await browser.execute('return window.uiSettingsPlugin');
+      const settings = await browser.execute(() => {
+        return window.__coreProvider.setup.core.uiSettings.getAll().ui_settings_plugin;
+      });
+
       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');
+
+      const settingsValue = await browser.execute(() => {
+        return window.__coreProvider.setup.core.uiSettings.get('ui_settings_plugin');
+      });
+
       expect(settingsValue).to.be('2');
+
+      const settingsValueViaObservables = await browser.executeAsync(async (callback: Function) => {
+        window.__coreProvider.setup.core.uiSettings
+          .get$('ui_settings_plugin')
+          .subscribe(v => callback(v));
+      });
+
+      expect(settingsValueViaObservables).to.be('2');
     });
 
     it('server plugins have access to registered settings', async () => {
diff --git a/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js b/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js
index 30b9dbe0fe80a..ef6f0a626bd15 100644
--- a/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js
+++ b/test/plugin_functional/test_suites/custom_visualizations/self_changing_vis.js
@@ -22,7 +22,7 @@ import expect from '@kbn/expect';
 export default function({ getService, getPageObjects }) {
   const testSubjects = getService('testSubjects');
   const renderable = getService('renderable');
-  const PageObjects = getPageObjects(['common', 'visualize']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'visEditor']);
 
   async function getCounterValue() {
     return await testSubjects.getVisibleText('counter');
@@ -42,9 +42,9 @@ export default function({ getService, getPageObjects }) {
       const editor = await testSubjects.find('counterEditor');
       await editor.clearValue();
       await editor.type('10');
-      const isApplyEnabled = await PageObjects.visualize.isApplyEnabled();
+      const isApplyEnabled = await PageObjects.visEditor.isApplyEnabled();
       expect(isApplyEnabled).to.be(true);
-      await PageObjects.visualize.clickGo();
+      await PageObjects.visEditor.clickGo();
       const counter = await getCounterValue();
       expect(counter).to.be('10');
     });
@@ -57,7 +57,7 @@ export default function({ getService, getPageObjects }) {
       const editorValue = await getEditorValue();
       expect(editorValue).to.be('11');
       // If changing a param from within the vis it should immediately apply and not bring editor in an unchanged state
-      const isApplyEnabled = await PageObjects.visualize.isApplyEnabled();
+      const isApplyEnabled = await PageObjects.visEditor.isApplyEnabled();
       expect(isApplyEnabled).to.be(false);
     });
   });
diff --git a/test/plugin_functional/test_suites/embeddable_explorer/hello_world_container.js b/test/plugin_functional/test_suites/embeddable_explorer/hello_world_container.js
deleted file mode 100644
index eddb87e2d472a..0000000000000
--- a/test/plugin_functional/test_suites/embeddable_explorer/hello_world_container.js
+++ /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 expect from '@kbn/expect';
-
-export default function({ getService }) {
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-
-  describe('hello world container', () => {
-    before(async () => {
-      await testSubjects.click('embedExplorerTab-helloWorldContainer');
-    });
-
-    it('hello world embeddable renders', async () => {
-      await retry.try(async () => {
-        const text = await testSubjects.getVisibleText('helloWorldEmbeddable');
-        expect(text).to.be('HELLO WORLD!');
-      });
-    });
-  });
-}
diff --git a/test/plugin_functional/test_suites/embeddable_explorer/hello_world_embeddable.js b/test/plugin_functional/test_suites/embeddable_explorer/hello_world_embeddable.js
deleted file mode 100644
index 66db207147e96..0000000000000
--- a/test/plugin_functional/test_suites/embeddable_explorer/hello_world_embeddable.js
+++ /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 expect from '@kbn/expect';
-
-export default function({ getService }) {
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-
-  describe('hello world embeddable', () => {
-    before(async () => {
-      await testSubjects.click('embedExplorerTab-helloWorldEmbeddable');
-    });
-
-    it('hello world embeddable renders', async () => {
-      await retry.try(async () => {
-        const text = await testSubjects.getVisibleText('helloWorldEmbeddable');
-        expect(text).to.be('HELLO WORLD!');
-      });
-    });
-  });
-}
diff --git a/test/plugin_functional/test_suites/embeddable_explorer/index.js b/test/plugin_functional/test_suites/embeddable_explorer/index.js
index cdc97b89dce5b..e1eb4cf1185e6 100644
--- a/test/plugin_functional/test_suites/embeddable_explorer/index.js
+++ b/test/plugin_functional/test_suites/embeddable_explorer/index.js
@@ -37,8 +37,6 @@ export default function({ getService, getPageObjects, loadTestFile }) {
       await appsMenu.clickLink('Embeddable Explorer');
     });
 
-    loadTestFile(require.resolve('./hello_world_container'));
-    loadTestFile(require.resolve('./hello_world_embeddable'));
     loadTestFile(require.resolve('./dashboard_container'));
   });
 }
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
index c6bddb69aa570..1cb566c908dbf 100755
--- a/test/scripts/jenkins_ci_group.sh
+++ b/test/scripts/jenkins_ci_group.sh
@@ -18,5 +18,6 @@ checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" yarn run
 if [ "$CI_GROUP" == "1" ]; then
   source test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh
   yarn run grunt run:pluginFunctionalTestsRelease --from=source;
+  yarn run grunt run:exampleFunctionalTestsRelease --from=source;
   yarn run grunt run:interpreterFunctionalTestsRelease;
 fi
diff --git a/typings/@elastic/eui/index.d.ts b/typings/@elastic/eui/index.d.ts
index dc4d0d778fc55..716dbc075d798 100644
--- a/typings/@elastic/eui/index.d.ts
+++ b/typings/@elastic/eui/index.d.ts
@@ -25,17 +25,4 @@ declare module '@elastic/eui' {
   export const EuiDescribedFormGroup: React.FC<any>;
   export const EuiCodeEditor: React.FC<any>;
   export const Query: any;
-
-  export interface EuiTableCriteria {
-    page: { index: number; size: number };
-    sort?: {
-      field?: string;
-      direction?: Direction;
-    };
-  }
-  export const EuiBasicTable: React.ComponentClass<{
-    onTableChange?: (criteria: EuiTableCriteria) => void;
-    sorting: { sort?: EuiTableCriteria['sort'] };
-    [key: string]: any;
-  }>;
 }
diff --git a/utilities/visual_regression.js b/utilities/visual_regression.js
index f174dc4764aed..d95b3018bea96 100644
--- a/utilities/visual_regression.js
+++ b/utilities/visual_regression.js
@@ -103,8 +103,8 @@ async function compareScreenshots() {
 
     const diffImagePath = path.resolve(DIFF_SCREENSHOTS_DIR, screenshot);
 
-    const sessionImage = PNG.sync.read(await fs.promises.readFile(sessionImagePath));
-    const baselineImage = PNG.sync.read(await fs.promises.readFile(baselineImagePath));
+    const sessionImage = PNG.sync.read(await readFileAsync(sessionImagePath));
+    const baselineImage = PNG.sync.read(await readFileAsync(baselineImagePath));
     const { width, height } = sessionImage;
     const diff = new PNG({ width, height });
 
@@ -117,7 +117,7 @@ async function compareScreenshots() {
       { threshold: 0 }
     );
 
-    await fs.promises.writeFile(diffImagePath, PNG.sync.write(diff));
+    await writeFileAsync(diffImagePath, PNG.sync.write(diff));
 
     const change = numDiffPixels / (width * height);
     const changePercentage = (change * 100).toFixed(2);
diff --git a/vars/esSnapshots.groovy b/vars/esSnapshots.groovy
new file mode 100644
index 0000000000000..884fbcdb17aeb
--- /dev/null
+++ b/vars/esSnapshots.groovy
@@ -0,0 +1,50 @@
+def promote(snapshotVersion, snapshotId) {
+  def snapshotDestination = "${snapshotVersion}/archives/${snapshotId}"
+  def MANIFEST_URL = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${snapshotDestination}/manifest.json"
+
+  dir('verified-manifest') {
+    def verifiedSnapshotFilename = 'manifest-latest-verified.json'
+
+    sh """
+      curl -O '${MANIFEST_URL}'
+      mv manifest.json ${verifiedSnapshotFilename}
+    """
+
+    googleStorageUpload(
+      credentialsId: 'kibana-ci-gcs-plugin',
+      bucket: "gs://kibana-ci-es-snapshots-daily/${snapshotVersion}",
+      pattern: verifiedSnapshotFilename,
+      sharedPublicly: false,
+      showInline: false,
+    )
+  }
+
+  // This would probably be more efficient if we could just copy using gsutil and specifying buckets for src and dest
+  // But we don't currently have access to the GCS credentials in a way that can be consumed easily from here...
+  dir('transfer-to-permanent') {
+    googleStorageDownload(
+      credentialsId: 'kibana-ci-gcs-plugin',
+      bucketUri: "gs://kibana-ci-es-snapshots-daily/${snapshotDestination}/*",
+      localDirectory: '.',
+      pathPrefix: snapshotDestination,
+    )
+
+    def manifestJson = readFile file: 'manifest.json'
+    writeFile(
+      file: 'manifest.json',
+      text: manifestJson.replace("kibana-ci-es-snapshots-daily/${snapshotDestination}", "kibana-ci-es-snapshots-permanent/${snapshotVersion}")
+    )
+
+    // Ideally we would have some delete logic here before uploading,
+    // But we don't currently have access to the GCS credentials in a way that can be consumed easily from here...
+    googleStorageUpload(
+      credentialsId: 'kibana-ci-gcs-plugin',
+      bucket: "gs://kibana-ci-es-snapshots-permanent/${snapshotVersion}",
+      pattern: '*.*',
+      sharedPublicly: false,
+      showInline: false,
+    )
+  }
+}
+
+return this
diff --git a/vars/githubPr.groovy b/vars/githubPr.groovy
index 09a166192bf7a..ce164ab98ab1e 100644
--- a/vars/githubPr.groovy
+++ b/vars/githubPr.groovy
@@ -35,7 +35,7 @@ def withDefaultPrComments(closure) {
     def message = getNextCommentMessage(info)
     postComment(message)
 
-    if (lastComment) {
+    if (lastComment && lastComment.user.login == 'kibanamachine') {
       deleteComment(lastComment.id)
     }
   }
@@ -49,7 +49,7 @@ def isPr() {
 def getLatestBuildComment() {
   return getComments()
     .reverse()
-    .find { it.user.login == 'elasticmachine' && it.body =~ /<!--PIPELINE/ }
+    .find { (it.user.login == 'elasticmachine' || it.user.login == 'kibanamachine') && it.body =~ /<!--PIPELINE/ }
 }
 
 def getBuildInfoFromComment(commentText) {
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index 18f214554b444..c778dd799f6e5 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -137,13 +137,8 @@ def jobRunner(label, useRamDisk, closure) {
     def scmVars
 
     // Try to clone from Github up to 8 times, waiting 15 secs between attempts
-    retry(8) {
-      try {
-        scmVars = checkout scm
-      } catch (ex) {
-        sleep 15
-        throw ex
-      }
+    retryWithDelay(8, 15) {
+      scmVars = checkout scm
     }
 
     withEnv([
diff --git a/vars/retryWithDelay.groovy b/vars/retryWithDelay.groovy
new file mode 100644
index 0000000000000..70d6f86a63ab2
--- /dev/null
+++ b/vars/retryWithDelay.groovy
@@ -0,0 +1,16 @@
+def call(retryTimes, delaySecs, closure) {
+  retry(retryTimes) {
+    try {
+      closure()
+    } catch (ex) {
+      sleep delaySecs
+      throw ex
+    }
+  }
+}
+
+def call(retryTimes, Closure closure) {
+  call(retryTimes, 15, closure)
+}
+
+return this
diff --git a/x-pack/legacy/common/constants/index.ts b/x-pack/legacy/common/constants/index.ts
index 842b0aea91d30..4db0f994fd47e 100644
--- a/x-pack/legacy/common/constants/index.ts
+++ b/x-pack/legacy/common/constants/index.ts
@@ -16,6 +16,7 @@ export {
   LICENSE_TYPE_STANDARD,
   LICENSE_TYPE_GOLD,
   LICENSE_TYPE_PLATINUM,
+  LICENSE_TYPE_ENTERPRISE,
   LICENSE_TYPE_TRIAL,
   RANKED_LICENSE_TYPES,
   LicenseType,
diff --git a/x-pack/legacy/common/constants/license_types.ts b/x-pack/legacy/common/constants/license_types.ts
index 3971ed5e95174..8c329df2f85f7 100644
--- a/x-pack/legacy/common/constants/license_types.ts
+++ b/x-pack/legacy/common/constants/license_types.ts
@@ -8,6 +8,7 @@ export const LICENSE_TYPE_BASIC = 'basic';
 export const LICENSE_TYPE_STANDARD = 'standard';
 export const LICENSE_TYPE_GOLD = 'gold';
 export const LICENSE_TYPE_PLATINUM = 'platinum';
+export const LICENSE_TYPE_ENTERPRISE = 'enterprise';
 export const LICENSE_TYPE_TRIAL = 'trial';
 
 export type LicenseType =
@@ -15,6 +16,7 @@ export type LicenseType =
   | typeof LICENSE_TYPE_STANDARD
   | typeof LICENSE_TYPE_GOLD
   | typeof LICENSE_TYPE_PLATINUM
+  | typeof LICENSE_TYPE_ENTERPRISE
   | typeof LICENSE_TYPE_TRIAL;
 
 // These are ordered from least featureful to most featureful, so we can assume that someone holding
@@ -24,5 +26,6 @@ export const RANKED_LICENSE_TYPES = [
   LICENSE_TYPE_STANDARD,
   LICENSE_TYPE_GOLD,
   LICENSE_TYPE_PLATINUM,
+  LICENSE_TYPE_ENTERPRISE,
   LICENSE_TYPE_TRIAL,
 ];
diff --git a/x-pack/legacy/plugins/actions/README.md b/x-pack/legacy/plugins/actions/README.md
index cdeab7eb0fda1..3d7409d1613e1 100644
--- a/x-pack/legacy/plugins/actions/README.md
+++ b/x-pack/legacy/plugins/actions/README.md
@@ -32,8 +32,15 @@ Built-In-Actions are configured using the _xpack.actions_ namespoace under _kiba
 
 | Namespaced Key                       | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Type                  |
 | ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
-| _xpack.actions._**enabled**          | Feature toggle which enabled Actions in Kibana.                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | boolean               |
-| _xpack.actions._**WhitelistedHosts** | Which _hostnames_ are whitelisted for the Built-In-Action? This list should contain hostnames of every external service you wish to interact with using Webhooks, Email or any other built in Action. Note that you may use the string "\*" in place of a specific hostname to enable Kibana to target any URL, but keep in mind the potential use of such a feature to execute [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery) attacks from your server. | Array<String> |
+| _xpack.actions._**enabled**          | Feature toggle which enabled Actions in Kibana.  | boolean               |
+| _xpack.actions._**whitelistedHosts** | Which _hostnames_ are whitelisted for the Built-In-Action? This list should contain hostnames of every external service you wish to interact with using Webhooks, Email or any other built in Action. Note that you may use the string "\*" in place of a specific hostname to enable Kibana to target any URL, but keep in mind the potential use of such a feature to execute [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery) attacks from your server. | Array<String> |
+| _xpack.actions._**enabledActionTypes** | A list of _actionTypes_ id's that are enabled. A "\*" may be used as an element to indicate all registered actionTypes should be enabled. The actionTypes registered for Kibana are `.server-log`, `.slack`, `.email`, `.index`, `.pagerduty`, `.webhook`. Default: `["*"]` | Array<String> |
+
+#### Whitelisting Built-in Action Types
+It is worth noting that the **whitelistedHosts** configuation applies to built-in action types (such as Slack, or PagerDuty) as well.
+
+Uniquely, the _PagerDuty Action Type_ has been configured to support the service's Events API (at _https://events.pagerduty.com/v2/enqueue_, which you can read about [here](https://v2.developer.pagerduty.com/docs/events-api-v2)) as a default, but this too, must be included in the whitelist before the PagerDuty action can be used.
+
 
 ### Configuration Utilities
 
@@ -43,8 +50,10 @@ This module provides a Utilities for interacting with the configuration.
 | --------------------- | -------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | isWhitelistedUri | _uri_: The URI you wish to validate is whitelisted | Validates whether the URI is whitelisted. This checks the configuration and validates that the hostname of the URI is in the list of whitelisted Hosts and returns `true` if it is whitelisted. If the configuration says that all URI's are whitelisted (using an "\*") then it will always return `true`. | Boolean |
 | isWhitelistedHostname | _hostname_: The Hostname you wish to validate is whitelisted | Validates whether the Hostname is whitelisted. This checks the configuration and validates that the hostname is in the list of whitelisted Hosts and returns `true` if it is whitelisted. If the configuration says that all Hostnames are whitelisted (using an "\*") then it will always return `true`. | Boolean |
+| isActionTypeEnabled | _actionType_: The actionType to check to see if it's enabled | Returns true if the actionType is enabled, otherwise false. | Boolean |
 | ensureWhitelistedUri | _uri_: The URI you wish to validate is whitelisted | Validates whether the URI is whitelisted. This checks the configuration and validates that the hostname of the URI is in the list of whitelisted Hosts and throws an error if it is not whitelisted. If the configuration says that all URI's are whitelisted (using an "\*") then it will never throw. | No return value, throws if URI isn't whitelisted |
 | ensureWhitelistedHostname | _hostname_: The Hostname you wish to validate is whitelisted | Validates whether the Hostname is whitelisted. This checks the configuration and validates that the hostname is in the list of whitelisted Hosts and throws an error if it is not whitelisted. If the configuration says that all Hostnames are whitelisted (using an "\*") then it will never throw | No return value, throws if Hostname isn't whitelisted |
+| ensureActionTypeEnabled | _actionType_: The actionType to check to see if it's enabled | Throws an error if the actionType is not enabled | No return value, throws if actionType isn't enabled |
 
 ## Action types
 
diff --git a/x-pack/legacy/plugins/actions/index.ts b/x-pack/legacy/plugins/actions/index.ts
index 98d4d9f84a729..dd91d85cd8493 100644
--- a/x-pack/legacy/plugins/actions/index.ts
+++ b/x-pack/legacy/plugins/actions/index.ts
@@ -8,6 +8,7 @@ import { Legacy } from 'kibana';
 import { Root } from 'joi';
 import mappings from './mappings.json';
 import { init } from './server';
+import { WhitelistedHosts, EnabledActionTypes } from './server/actions_config';
 
 export {
   ActionsPlugin,
@@ -38,10 +39,14 @@ export function actions(kibana: any) {
             .items(
               Joi.string()
                 .hostname()
-                .allow('*')
+                .allow(WhitelistedHosts.Any)
             )
             .sparse(false)
-            .default([]),
+            .default([WhitelistedHosts.Any]),
+          enabledActionTypes: Joi.array()
+            .items(Joi.string())
+            .sparse(false)
+            .default([EnabledActionTypes.Any]),
         })
         .default();
     },
diff --git a/x-pack/legacy/plugins/actions/server/action_type_registry.mock.ts b/x-pack/legacy/plugins/actions/server/action_type_registry.mock.ts
index be78a4d747b85..5589a15932ecf 100644
--- a/x-pack/legacy/plugins/actions/server/action_type_registry.mock.ts
+++ b/x-pack/legacy/plugins/actions/server/action_type_registry.mock.ts
@@ -12,6 +12,7 @@ const createActionTypeRegistryMock = () => {
     register: jest.fn(),
     get: jest.fn(),
     list: jest.fn(),
+    ensureActionTypeEnabled: jest.fn(),
   };
   return mocked;
 };
diff --git a/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts b/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
index c0a01bc85e916..2f15ae1c0a2b3 100644
--- a/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
+++ b/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
@@ -4,15 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { taskManagerMock } from '../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
 import { ActionTypeRegistry } from './action_type_registry';
 import { ExecutorType } from './types';
 import { ActionExecutor, ExecutorError, TaskRunnerFactory } from './lib';
+import { configUtilsMock } from './actions_config.mock';
 
 const mockTaskManager = taskManagerMock.create();
 const actionTypeRegistryParams = {
   taskManager: mockTaskManager,
   taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()),
+  actionsConfigUtils: configUtilsMock,
 };
 
 beforeEach(() => jest.resetAllMocks());
@@ -123,6 +125,7 @@ describe('list()', () => {
       {
         id: 'my-action-type',
         name: 'My action type',
+        enabled: true,
       },
     ]);
   });
diff --git a/x-pack/legacy/plugins/actions/server/action_type_registry.ts b/x-pack/legacy/plugins/actions/server/action_type_registry.ts
index 6007851f87084..f66d1947c2b8b 100644
--- a/x-pack/legacy/plugins/actions/server/action_type_registry.ts
+++ b/x-pack/legacy/plugins/actions/server/action_type_registry.ts
@@ -7,23 +7,26 @@
 import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
 import { TaskManagerSetupContract } from './shim';
-import { RunContext } from '../../task_manager';
+import { RunContext } from '../../task_manager/server';
 import { ExecutorError, TaskRunnerFactory } from './lib';
 import { ActionType } from './types';
-
+import { ActionsConfigurationUtilities } from './actions_config';
 interface ConstructorOptions {
   taskManager: TaskManagerSetupContract;
   taskRunnerFactory: TaskRunnerFactory;
+  actionsConfigUtils: ActionsConfigurationUtilities;
 }
 
 export class ActionTypeRegistry {
   private readonly taskManager: TaskManagerSetupContract;
   private readonly actionTypes: Map<string, ActionType> = new Map();
   private readonly taskRunnerFactory: TaskRunnerFactory;
+  private readonly actionsConfigUtils: ActionsConfigurationUtilities;
 
-  constructor({ taskManager, taskRunnerFactory }: ConstructorOptions) {
-    this.taskManager = taskManager;
-    this.taskRunnerFactory = taskRunnerFactory;
+  constructor(constructorParams: ConstructorOptions) {
+    this.taskManager = constructorParams.taskManager;
+    this.taskRunnerFactory = constructorParams.taskRunnerFactory;
+    this.actionsConfigUtils = constructorParams.actionsConfigUtils;
   }
 
   /**
@@ -33,6 +36,13 @@ export class ActionTypeRegistry {
     return this.actionTypes.has(id);
   }
 
+  /**
+   * Throws error if action type is not enabled.
+   */
+  public ensureActionTypeEnabled(id: string) {
+    this.actionsConfigUtils.ensureActionTypeEnabled(id);
+  }
+
   /**
    * Registers an action type to the action type registry
    */
@@ -86,12 +96,13 @@ export class ActionTypeRegistry {
   }
 
   /**
-   * Returns a list of registered action types [{ id, name }]
+   * Returns a list of registered action types [{ id, name, enabled }]
    */
   public list() {
     return Array.from(this.actionTypes).map(([actionTypeId, actionType]) => ({
       id: actionTypeId,
       name: actionType.name,
+      enabled: this.actionsConfigUtils.isActionTypeEnabled(actionTypeId),
     }));
   }
 }
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 1cbf3949d20f8..9e75248c56cae 100644
--- a/x-pack/legacy/plugins/actions/server/actions_client.test.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_client.test.ts
@@ -10,7 +10,10 @@ import { ActionTypeRegistry } from './action_type_registry';
 import { ActionsClient } from './actions_client';
 import { ExecutorType } from './types';
 import { ActionExecutor, TaskRunnerFactory } from './lib';
-import { taskManagerMock } from '../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
+import { configUtilsMock } from './actions_config.mock';
+import { getActionsConfigurationUtilities } from './actions_config';
+
 import {
   elasticsearchServiceMock,
   savedObjectsClientMock,
@@ -25,6 +28,7 @@ const mockTaskManager = taskManagerMock.create();
 const actionTypeRegistryParams = {
   taskManager: mockTaskManager,
   taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()),
+  actionsConfigUtils: configUtilsMock,
 };
 
 let actionsClient: ActionsClient;
@@ -190,6 +194,58 @@ describe('create()', () => {
       ]
     `);
   });
+
+  test('throws error creating action with disabled actionType', async () => {
+    const localConfigUtils = getActionsConfigurationUtilities({
+      enabled: true,
+      enabledActionTypes: ['some-not-ignored-action-type'],
+      whitelistedHosts: ['*'],
+    });
+
+    const localActionTypeRegistryParams = {
+      taskManager: mockTaskManager,
+      taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()),
+      actionsConfigUtils: localConfigUtils,
+    };
+
+    actionTypeRegistry = new ActionTypeRegistry(localActionTypeRegistryParams);
+    actionsClient = new ActionsClient({
+      actionTypeRegistry,
+      savedObjectsClient,
+      scopedClusterClient,
+      defaultKibanaIndex,
+    });
+
+    const savedObjectCreateResult = {
+      id: '1',
+      type: 'type',
+      attributes: {
+        name: 'my name',
+        actionTypeId: 'my-action-type',
+        config: {},
+      },
+      references: [],
+    };
+    actionTypeRegistry.register({
+      id: 'my-action-type',
+      name: 'My action type',
+      executor,
+    });
+    savedObjectsClient.create.mockResolvedValueOnce(savedObjectCreateResult);
+
+    await expect(
+      actionsClient.create({
+        action: {
+          name: 'my name',
+          actionTypeId: 'my-action-type',
+          config: {},
+          secrets: {},
+        },
+      })
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"action type \\"my-action-type\\" is not enabled in the Kibana config xpack.actions.enabledActionTypes"`
+    );
+  });
 });
 
 describe('get()', () => {
diff --git a/x-pack/legacy/plugins/actions/server/actions_client.ts b/x-pack/legacy/plugins/actions/server/actions_client.ts
index 10713d72a3858..104439ca4401f 100644
--- a/x-pack/legacy/plugins/actions/server/actions_client.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_client.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import Boom from 'boom';
 import {
   IScopedClusterClient,
   SavedObjectsClientContract,
@@ -92,6 +93,12 @@ export class ActionsClient {
     const validatedActionTypeConfig = validateConfig(actionType, config);
     const validatedActionTypeSecrets = validateSecrets(actionType, secrets);
 
+    try {
+      this.actionTypeRegistry.ensureActionTypeEnabled(actionTypeId);
+    } catch (err) {
+      throw Boom.badRequest(err.message);
+    }
+
     const result = await this.savedObjectsClient.create('action', {
       actionTypeId,
       name,
diff --git a/x-pack/legacy/plugins/actions/server/actions_config.mock.ts b/x-pack/legacy/plugins/actions/server/actions_config.mock.ts
new file mode 100644
index 0000000000000..b4e0324f9fead
--- /dev/null
+++ b/x-pack/legacy/plugins/actions/server/actions_config.mock.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 { ActionsConfigurationUtilities } from './actions_config';
+
+export const configUtilsMock: ActionsConfigurationUtilities = {
+  isWhitelistedHostname: _ => true,
+  isWhitelistedUri: _ => true,
+  isActionTypeEnabled: _ => true,
+  ensureWhitelistedHostname: _ => {},
+  ensureWhitelistedUri: _ => {},
+  ensureActionTypeEnabled: _ => {},
+};
diff --git a/x-pack/legacy/plugins/actions/server/actions_config.test.ts b/x-pack/legacy/plugins/actions/server/actions_config.test.ts
index 7b4176fb69dbf..7d9d431d1c1be 100644
--- a/x-pack/legacy/plugins/actions/server/actions_config.test.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_config.test.ts
@@ -5,13 +5,24 @@
  */
 
 import { ActionsConfigType } from './types';
-import { getActionsConfigurationUtilities, WhitelistedHosts } from './actions_config';
+import {
+  getActionsConfigurationUtilities,
+  WhitelistedHosts,
+  EnabledActionTypes,
+} from './actions_config';
+
+const DefaultActionsConfig: ActionsConfigType = {
+  enabled: false,
+  whitelistedHosts: [],
+  enabledActionTypes: [],
+};
 
 describe('ensureWhitelistedUri', () => {
   test('returns true when "any" hostnames are allowed', () => {
     const config: ActionsConfigType = {
       enabled: false,
       whitelistedHosts: [WhitelistedHosts.Any],
+      enabledActionTypes: [],
     };
     expect(
       getActionsConfigurationUtilities(config).ensureWhitelistedUri(
@@ -21,27 +32,31 @@ describe('ensureWhitelistedUri', () => {
   });
 
   test('throws when the hostname in the requested uri is not in the whitelist', () => {
-    const config: ActionsConfigType = { enabled: false, whitelistedHosts: [] };
+    const config: ActionsConfigType = DefaultActionsConfig;
     expect(() =>
       getActionsConfigurationUtilities(config).ensureWhitelistedUri(
         'https://github.com/elastic/kibana'
       )
     ).toThrowErrorMatchingInlineSnapshot(
-      `"target url \\"https://github.com/elastic/kibana\\" is not in the Kibana whitelist"`
+      `"target url \\"https://github.com/elastic/kibana\\" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts"`
     );
   });
 
   test('throws when the uri cannot be parsed as a valid URI', () => {
-    const config: ActionsConfigType = { enabled: false, whitelistedHosts: [] };
+    const config: ActionsConfigType = DefaultActionsConfig;
     expect(() =>
       getActionsConfigurationUtilities(config).ensureWhitelistedUri('github.com/elastic')
     ).toThrowErrorMatchingInlineSnapshot(
-      `"target url \\"github.com/elastic\\" is not in the Kibana whitelist"`
+      `"target url \\"github.com/elastic\\" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts"`
     );
   });
 
   test('returns true when the hostname in the requested uri is in the whitelist', () => {
-    const config: ActionsConfigType = { enabled: false, whitelistedHosts: ['github.com'] };
+    const config: ActionsConfigType = {
+      enabled: false,
+      whitelistedHosts: ['github.com'],
+      enabledActionTypes: [],
+    };
     expect(
       getActionsConfigurationUtilities(config).ensureWhitelistedUri(
         'https://github.com/elastic/kibana'
@@ -55,6 +70,7 @@ describe('ensureWhitelistedHostname', () => {
     const config: ActionsConfigType = {
       enabled: false,
       whitelistedHosts: [WhitelistedHosts.Any],
+      enabledActionTypes: [],
     };
     expect(
       getActionsConfigurationUtilities(config).ensureWhitelistedHostname('github.com')
@@ -62,16 +78,20 @@ describe('ensureWhitelistedHostname', () => {
   });
 
   test('throws when the hostname in the requested uri is not in the whitelist', () => {
-    const config: ActionsConfigType = { enabled: false, whitelistedHosts: [] };
+    const config: ActionsConfigType = DefaultActionsConfig;
     expect(() =>
       getActionsConfigurationUtilities(config).ensureWhitelistedHostname('github.com')
     ).toThrowErrorMatchingInlineSnapshot(
-      `"target hostname \\"github.com\\" is not in the Kibana whitelist"`
+      `"target hostname \\"github.com\\" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts"`
     );
   });
 
   test('returns true when the hostname in the requested uri is in the whitelist', () => {
-    const config: ActionsConfigType = { enabled: false, whitelistedHosts: ['github.com'] };
+    const config: ActionsConfigType = {
+      enabled: false,
+      whitelistedHosts: ['github.com'],
+      enabledActionTypes: [],
+    };
     expect(
       getActionsConfigurationUtilities(config).ensureWhitelistedHostname('github.com')
     ).toBeUndefined();
@@ -83,6 +103,7 @@ describe('isWhitelistedUri', () => {
     const config: ActionsConfigType = {
       enabled: false,
       whitelistedHosts: [WhitelistedHosts.Any],
+      enabledActionTypes: [],
     };
     expect(
       getActionsConfigurationUtilities(config).isWhitelistedUri('https://github.com/elastic/kibana')
@@ -90,21 +111,25 @@ describe('isWhitelistedUri', () => {
   });
 
   test('throws when the hostname in the requested uri is not in the whitelist', () => {
-    const config: ActionsConfigType = { enabled: false, whitelistedHosts: [] };
+    const config: ActionsConfigType = DefaultActionsConfig;
     expect(
       getActionsConfigurationUtilities(config).isWhitelistedUri('https://github.com/elastic/kibana')
     ).toEqual(false);
   });
 
   test('throws when the uri cannot be parsed as a valid URI', () => {
-    const config: ActionsConfigType = { enabled: false, whitelistedHosts: [] };
+    const config: ActionsConfigType = DefaultActionsConfig;
     expect(getActionsConfigurationUtilities(config).isWhitelistedUri('github.com/elastic')).toEqual(
       false
     );
   });
 
   test('returns true when the hostname in the requested uri is in the whitelist', () => {
-    const config: ActionsConfigType = { enabled: false, whitelistedHosts: ['github.com'] };
+    const config: ActionsConfigType = {
+      enabled: false,
+      whitelistedHosts: ['github.com'],
+      enabledActionTypes: [],
+    };
     expect(
       getActionsConfigurationUtilities(config).isWhitelistedUri('https://github.com/elastic/kibana')
     ).toEqual(true);
@@ -116,6 +141,7 @@ describe('isWhitelistedHostname', () => {
     const config: ActionsConfigType = {
       enabled: false,
       whitelistedHosts: [WhitelistedHosts.Any],
+      enabledActionTypes: [],
     };
     expect(getActionsConfigurationUtilities(config).isWhitelistedHostname('github.com')).toEqual(
       true
@@ -123,16 +149,100 @@ describe('isWhitelistedHostname', () => {
   });
 
   test('throws when the hostname in the requested uri is not in the whitelist', () => {
-    const config: ActionsConfigType = { enabled: false, whitelistedHosts: [] };
+    const config: ActionsConfigType = DefaultActionsConfig;
     expect(getActionsConfigurationUtilities(config).isWhitelistedHostname('github.com')).toEqual(
       false
     );
   });
 
   test('returns true when the hostname in the requested uri is in the whitelist', () => {
-    const config: ActionsConfigType = { enabled: false, whitelistedHosts: ['github.com'] };
+    const config: ActionsConfigType = {
+      enabled: false,
+      whitelistedHosts: ['github.com'],
+      enabledActionTypes: [],
+    };
     expect(getActionsConfigurationUtilities(config).isWhitelistedHostname('github.com')).toEqual(
       true
     );
   });
 });
+
+describe('isActionTypeEnabled', () => {
+  test('returns true when "any" actionTypes are allowed', () => {
+    const config: ActionsConfigType = {
+      enabled: false,
+      whitelistedHosts: [],
+      enabledActionTypes: ['ignore', EnabledActionTypes.Any],
+    };
+    expect(getActionsConfigurationUtilities(config).isActionTypeEnabled('foo')).toEqual(true);
+  });
+
+  test('returns false when no actionType is allowed', () => {
+    const config: ActionsConfigType = {
+      enabled: false,
+      whitelistedHosts: [],
+      enabledActionTypes: [],
+    };
+    expect(getActionsConfigurationUtilities(config).isActionTypeEnabled('foo')).toEqual(false);
+  });
+
+  test('returns false when the actionType is not in the enabled list', () => {
+    const config: ActionsConfigType = {
+      enabled: false,
+      whitelistedHosts: [],
+      enabledActionTypes: ['foo'],
+    };
+    expect(getActionsConfigurationUtilities(config).isActionTypeEnabled('bar')).toEqual(false);
+  });
+
+  test('returns true when the actionType is in the enabled list', () => {
+    const config: ActionsConfigType = {
+      enabled: false,
+      whitelistedHosts: [],
+      enabledActionTypes: ['ignore', 'foo'],
+    };
+    expect(getActionsConfigurationUtilities(config).isActionTypeEnabled('foo')).toEqual(true);
+  });
+});
+
+describe('ensureActionTypeEnabled', () => {
+  test('does not throw when any actionType is allowed', () => {
+    const config: ActionsConfigType = {
+      enabled: false,
+      whitelistedHosts: [],
+      enabledActionTypes: ['ignore', EnabledActionTypes.Any],
+    };
+    expect(getActionsConfigurationUtilities(config).ensureActionTypeEnabled('foo')).toBeUndefined();
+  });
+
+  test('throws when no actionType is not allowed', () => {
+    const config: ActionsConfigType = DefaultActionsConfig;
+    expect(() =>
+      getActionsConfigurationUtilities(config).ensureActionTypeEnabled('foo')
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"action type \\"foo\\" is not enabled in the Kibana config xpack.actions.enabledActionTypes"`
+    );
+  });
+
+  test('throws when actionType is not enabled', () => {
+    const config: ActionsConfigType = {
+      enabled: false,
+      whitelistedHosts: [],
+      enabledActionTypes: ['ignore'],
+    };
+    expect(() =>
+      getActionsConfigurationUtilities(config).ensureActionTypeEnabled('foo')
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"action type \\"foo\\" is not enabled in the Kibana config xpack.actions.enabledActionTypes"`
+    );
+  });
+
+  test('does not throw when actionType is enabled', () => {
+    const config: ActionsConfigType = {
+      enabled: false,
+      whitelistedHosts: [],
+      enabledActionTypes: ['ignore', 'foo'],
+    };
+    expect(getActionsConfigurationUtilities(config).ensureActionTypeEnabled('foo')).toBeUndefined();
+  });
+});
diff --git a/x-pack/legacy/plugins/actions/server/actions_config.ts b/x-pack/legacy/plugins/actions/server/actions_config.ts
index 3053c88f1c9ef..e589969c50e54 100644
--- a/x-pack/legacy/plugins/actions/server/actions_config.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_config.ts
@@ -5,7 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { tryCatch, fromNullable, isSome, map, mapNullable, getOrElse } from 'fp-ts/lib/Option';
+import { tryCatch, map, mapNullable, getOrElse } from 'fp-ts/lib/Option';
 import { URL } from 'url';
 import { curry } from 'lodash';
 import { pipe } from 'fp-ts/lib/pipeable';
@@ -16,6 +16,10 @@ export enum WhitelistedHosts {
   Any = '*',
 }
 
+export enum EnabledActionTypes {
+  Any = '*',
+}
+
 enum WhitelistingField {
   url = 'url',
   hostname = 'hostname',
@@ -24,13 +28,16 @@ enum WhitelistingField {
 export interface ActionsConfigurationUtilities {
   isWhitelistedHostname: (hostname: string) => boolean;
   isWhitelistedUri: (uri: string) => boolean;
+  isActionTypeEnabled: (actionType: string) => boolean;
   ensureWhitelistedHostname: (hostname: string) => void;
   ensureWhitelistedUri: (uri: string) => void;
+  ensureActionTypeEnabled: (actionType: string) => void;
 }
 
 function whitelistingErrorMessage(field: WhitelistingField, value: string) {
   return i18n.translate('xpack.actions.urlWhitelistConfigurationError', {
-    defaultMessage: 'target {field} "{value}" is not in the Kibana whitelist',
+    defaultMessage:
+      'target {field} "{value}" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
     values: {
       value,
       field,
@@ -38,22 +45,21 @@ function whitelistingErrorMessage(field: WhitelistingField, value: string) {
   });
 }
 
-function doesValueWhitelistAnyHostname(whitelistedHostname: string): boolean {
-  return whitelistedHostname === WhitelistedHosts.Any;
+function disabledActionTypeErrorMessage(actionType: string) {
+  return i18n.translate('xpack.actions.disabledActionTypeError', {
+    defaultMessage:
+      'action type "{actionType}" is not enabled in the Kibana config xpack.actions.enabledActionTypes',
+    values: {
+      actionType,
+    },
+  });
 }
 
 function isWhitelisted({ whitelistedHosts }: ActionsConfigType, hostname: string): boolean {
-  return (
-    Array.isArray(whitelistedHosts) &&
-    isSome(
-      fromNullable(
-        whitelistedHosts.find(
-          whitelistedHostname =>
-            doesValueWhitelistAnyHostname(whitelistedHostname) || whitelistedHostname === hostname
-        )
-      )
-    )
-  );
+  const whitelisted = new Set(whitelistedHosts);
+  if (whitelisted.has(WhitelistedHosts.Any)) return true;
+  if (whitelisted.has(hostname)) return true;
+  return false;
 }
 
 function isWhitelistedHostnameInUri(config: ActionsConfigType, uri: string): boolean {
@@ -65,14 +71,26 @@ function isWhitelistedHostnameInUri(config: ActionsConfigType, uri: string): boo
   );
 }
 
+function isActionTypeEnabledInConfig(
+  { enabledActionTypes }: ActionsConfigType,
+  actionType: string
+): boolean {
+  const enabled = new Set(enabledActionTypes);
+  if (enabled.has(EnabledActionTypes.Any)) return true;
+  if (enabled.has(actionType)) return true;
+  return false;
+}
+
 export function getActionsConfigurationUtilities(
   config: ActionsConfigType
 ): ActionsConfigurationUtilities {
   const isWhitelistedHostname = curry(isWhitelisted)(config);
   const isWhitelistedUri = curry(isWhitelistedHostnameInUri)(config);
+  const isActionTypeEnabled = curry(isActionTypeEnabledInConfig)(config);
   return {
     isWhitelistedHostname,
     isWhitelistedUri,
+    isActionTypeEnabled,
     ensureWhitelistedUri(uri: string) {
       if (!isWhitelistedUri(uri)) {
         throw new Error(whitelistingErrorMessage(WhitelistingField.url, uri));
@@ -83,5 +101,10 @@ export function getActionsConfigurationUtilities(
         throw new Error(whitelistingErrorMessage(WhitelistingField.hostname, hostname));
       }
     },
+    ensureActionTypeEnabled(actionType: string) {
+      if (!isActionTypeEnabled(actionType)) {
+        throw new Error(disabledActionTypeErrorMessage(actionType));
+      }
+    },
   };
 }
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 513f51f644534..4aaecc8e9d7df 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
@@ -12,7 +12,7 @@ import { Logger } from '../../../../../../src/core/server';
 import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 
 import { ActionType, ActionTypeExecutorOptions } from '../types';
-import { ActionsConfigurationUtilities } from '../actions_config';
+import { configUtilsMock } from '../actions_config.mock';
 import { validateConfig, validateSecrets, validateParams } from '../lib';
 import { createActionTypeRegistry } from './index.test';
 import { sendEmail } from './lib/send_email';
@@ -25,13 +25,6 @@ import {
 
 const sendEmailMock = sendEmail as jest.Mock;
 
-const configUtilsMock: ActionsConfigurationUtilities = {
-  isWhitelistedHostname: _ => true,
-  isWhitelistedUri: _ => true,
-  ensureWhitelistedHostname: _ => {},
-  ensureWhitelistedUri: _ => {},
-};
-
 const ACTION_TYPE_ID = '.email';
 const NO_OP_FN = () => {};
 
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/index.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/index.test.ts
index 4f212e702fcff..3a0c9f415cc2b 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/index.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/index.test.ts
@@ -5,20 +5,14 @@
  */
 
 import { ActionExecutor, TaskRunnerFactory } from '../lib';
-import { ActionsConfigurationUtilities } from '../actions_config';
 import { ActionTypeRegistry } from '../action_type_registry';
-import { taskManagerMock } from '../../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../../task_manager/server/task_manager.mock';
 import { registerBuiltInActionTypes } from './index';
 import { Logger } from '../../../../../../src/core/server';
 import { loggingServiceMock } from '../../../../../../src/core/server/mocks';
+import { configUtilsMock } from '../actions_config.mock';
 
 const ACTION_TYPE_IDS = ['.index', '.email', '.pagerduty', '.server-log', '.slack', '.webhook'];
-const MOCK_KIBANA_CONFIG_UTILS: ActionsConfigurationUtilities = {
-  isWhitelistedHostname: _ => true,
-  isWhitelistedUri: _ => true,
-  ensureWhitelistedHostname: _ => {},
-  ensureWhitelistedUri: _ => {},
-};
 
 export function createActionTypeRegistry(): {
   logger: jest.Mocked<Logger>;
@@ -28,11 +22,12 @@ export function createActionTypeRegistry(): {
   const actionTypeRegistry = new ActionTypeRegistry({
     taskManager: taskManagerMock.create(),
     taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()),
+    actionsConfigUtils: configUtilsMock,
   });
   registerBuiltInActionTypes({
     logger,
     actionTypeRegistry,
-    actionsConfigUtils: MOCK_KIBANA_CONFIG_UTILS,
+    actionsConfigUtils: configUtilsMock,
   });
   return { logger, actionTypeRegistry };
 }
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/index.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/index.ts
index 0fe572bb57e41..e0568a36f8743 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/index.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/index.ts
@@ -18,20 +18,16 @@ import { getActionType as getWebhookActionType } from './webhook';
 export function registerBuiltInActionTypes({
   logger,
   actionTypeRegistry,
-  actionsConfigUtils,
+  actionsConfigUtils: configurationUtilities,
 }: {
   logger: Logger;
   actionTypeRegistry: ActionTypeRegistry;
   actionsConfigUtils: ActionsConfigurationUtilities;
 }) {
   actionTypeRegistry.register(getServerLogActionType({ logger }));
-  actionTypeRegistry.register(getSlackActionType());
-  actionTypeRegistry.register(
-    getEmailActionType({ logger, configurationUtilities: actionsConfigUtils })
-  );
+  actionTypeRegistry.register(getSlackActionType({ configurationUtilities }));
+  actionTypeRegistry.register(getEmailActionType({ logger, configurationUtilities }));
   actionTypeRegistry.register(getIndexActionType({ logger }));
-  actionTypeRegistry.register(getPagerDutyActionType({ logger }));
-  actionTypeRegistry.register(
-    getWebhookActionType({ logger, configurationUtilities: actionsConfigUtils })
-  );
+  actionTypeRegistry.register(getPagerDutyActionType({ logger, configurationUtilities }));
+  actionTypeRegistry.register(getWebhookActionType({ logger, configurationUtilities }));
 }
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/string_utils.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/string_utils.test.ts
new file mode 100644
index 0000000000000..85e002b805e46
--- /dev/null
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/string_utils.test.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { withoutControlCharacters } from './string_utils';
+
+describe('ensureSingleLineString()', () => {
+  test('works with plain ole strings', () => {
+    expect(withoutControlCharacters('')).toEqual('');
+    expect(withoutControlCharacters(' a b c ')).toEqual(' a b c ');
+  });
+
+  test('works with multiple control characters', () => {
+    expect(withoutControlCharacters(' \r \n ')).toEqual(' ; ; ');
+    expect(withoutControlCharacters('\r \n ')).toEqual('; ; ');
+    expect(withoutControlCharacters(' \r \n')).toEqual(' ; ;');
+    expect(withoutControlCharacters('\r \n')).toEqual('; ;');
+  });
+
+  test('works with /00-/1F, except tab', () => {
+    for (let c = 0; c <= 0x1f; c++) {
+      if (c === 0x09) {
+        expect(withoutControlCharacters(String.fromCharCode(c))).toEqual('\t');
+      } else {
+        expect(withoutControlCharacters(String.fromCharCode(c))).toEqual(';');
+      }
+    }
+    expect(withoutControlCharacters(String.fromCharCode(0x20))).toEqual(' ');
+  });
+
+  test('works with /7F-/9F', () => {
+    expect(withoutControlCharacters(String.fromCharCode(0x7e))).toEqual('~');
+    for (let c = 0x7f; c <= 0x9f; c++) {
+      expect(withoutControlCharacters(String.fromCharCode(c))).toEqual(';');
+    }
+    const nbsp = String.fromCharCode(0xa0);
+    expect(withoutControlCharacters(nbsp)).toEqual(nbsp);
+  });
+
+  test('works with UCS newlines', () => {
+    expect(withoutControlCharacters('\u2027')).toEqual('\u2027');
+    expect(withoutControlCharacters('\u2028')).toEqual(';');
+    expect(withoutControlCharacters('\u2029')).toEqual(';');
+    expect(withoutControlCharacters('\u202A')).toEqual('\u202A');
+  });
+});
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/string_utils.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/string_utils.ts
new file mode 100644
index 0000000000000..d0e3504677307
--- /dev/null
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/lib/string_utils.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.
+ */
+
+// see: https://en.wikipedia.org/wiki/Unicode_control_characters
+// but don't include tabs (0x09), they're fine
+const CONTROL_CHAR_PATTERN = /[\x00-\x08]|[\x0A-\x1F]|[\x7F-\x9F]|[\u2028-\u2029]/g;
+
+// replaces control characters in string with ;, but leaves tabs
+export function withoutControlCharacters(s: string): string {
+  return s.replace(CONTROL_CHAR_PATTERN, ';');
+}
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 def3b7eea21d9..cb3548524ebbb 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
@@ -8,11 +8,14 @@ jest.mock('./lib/post_pagerduty', () => ({
   postPagerduty: jest.fn(),
 }));
 
+import { getActionType } from './pagerduty';
 import { ActionType, Services, ActionTypeExecutorOptions } from '../types';
 import { validateConfig, validateSecrets, validateParams } from '../lib';
 import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 import { postPagerduty } from './lib/post_pagerduty';
 import { createActionTypeRegistry } from './index.test';
+import { Logger } from '../../../../../../src/core/server';
+import { configUtilsMock } from '../actions_config.mock';
 
 const postPagerdutyMock = postPagerduty as jest.Mock;
 
@@ -24,10 +27,12 @@ const services: Services = {
 };
 
 let actionType: ActionType;
+let mockedLogger: jest.Mocked<Logger>;
 
 beforeAll(() => {
-  const { actionTypeRegistry } = createActionTypeRegistry();
+  const { logger, actionTypeRegistry } = createActionTypeRegistry();
   actionType = actionTypeRegistry.get(ACTION_TYPE_ID);
+  mockedLogger = logger;
 });
 
 describe('get()', () => {
@@ -50,6 +55,40 @@ describe('validateConfig()', () => {
       `"error validating action type config: [shouldNotBeHere]: definition for this key is missing"`
     );
   });
+
+  test('should validate and pass when the pagerduty url is whitelisted', () => {
+    actionType = getActionType({
+      logger: mockedLogger,
+      configurationUtilities: {
+        ...configUtilsMock,
+        ensureWhitelistedUri: url => {
+          expect(url).toEqual('https://events.pagerduty.com/v2/enqueue');
+        },
+      },
+    });
+
+    expect(
+      validateConfig(actionType, { apiUrl: 'https://events.pagerduty.com/v2/enqueue' })
+    ).toEqual({ apiUrl: 'https://events.pagerduty.com/v2/enqueue' });
+  });
+
+  test('config validation returns an error if the specified URL isnt whitelisted', () => {
+    actionType = getActionType({
+      logger: mockedLogger,
+      configurationUtilities: {
+        ...configUtilsMock,
+        ensureWhitelistedUri: _ => {
+          throw new Error(`target url is not whitelisted`);
+        },
+      },
+    });
+
+    expect(() => {
+      validateConfig(actionType, { apiUrl: 'https://events.pagerduty.com/v2/enqueue' });
+    }).toThrowErrorMatchingInlineSnapshot(
+      `"error validating action type config: error configuring pagerduty action: target url is not whitelisted"`
+    );
+  });
 });
 
 describe('validateSecrets()', () => {
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts
index e1437b8eef554..250c169278c57 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts
@@ -10,6 +10,7 @@ import { schema, TypeOf } from '@kbn/config-schema';
 import { postPagerduty } from './lib/post_pagerduty';
 import { Logger } from '../../../../../../src/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
+import { ActionsConfigurationUtilities } from '../actions_config';
 
 // uses the PagerDuty Events API v2
 // https://v2.developer.pagerduty.com/docs/events-api-v2
@@ -19,10 +20,10 @@ const PAGER_DUTY_API_URL = 'https://events.pagerduty.com/v2/enqueue';
 
 export type ActionTypeConfigType = TypeOf<typeof ConfigSchema>;
 
-const ConfigSchema = schema.object({
+const configSchemaProps = {
   apiUrl: schema.nullable(schema.string()),
-});
-
+};
+const ConfigSchema = schema.object(configSchemaProps);
 // secrets definition
 
 export type ActionTypeSecretsType = TypeOf<typeof SecretsSchema>;
@@ -86,12 +87,20 @@ function validateParams(paramsObject: any): string | void {
 }
 
 // action type definition
-export function getActionType({ logger }: { logger: Logger }): ActionType {
+export function getActionType({
+  logger,
+  configurationUtilities,
+}: {
+  logger: Logger;
+  configurationUtilities: ActionsConfigurationUtilities;
+}): ActionType {
   return {
     id: '.pagerduty',
     name: 'pagerduty',
     validate: {
-      config: ConfigSchema,
+      config: schema.object(configSchemaProps, {
+        validate: curry(valdiateActionTypeConfig)(configurationUtilities),
+      }),
       secrets: SecretsSchema,
       params: ParamsSchema,
     },
@@ -99,6 +108,26 @@ export function getActionType({ logger }: { logger: Logger }): ActionType {
   };
 }
 
+function valdiateActionTypeConfig(
+  configurationUtilities: ActionsConfigurationUtilities,
+  configObject: ActionTypeConfigType
+) {
+  try {
+    configurationUtilities.ensureWhitelistedUri(getPagerDutyApiUrl(configObject));
+  } catch (whitelistError) {
+    return i18n.translate('xpack.actions.builtin.pagerduty.pagerdutyConfigurationError', {
+      defaultMessage: 'error configuring pagerduty action: {message}',
+      values: {
+        message: whitelistError.message,
+      },
+    });
+  }
+}
+
+function getPagerDutyApiUrl(config: ActionTypeConfigType): string {
+  return config.apiUrl || PAGER_DUTY_API_URL;
+}
+
 // action executor
 
 async function executor(
@@ -111,7 +140,7 @@ async function executor(
   const params = execOptions.params as ActionParamsType;
   const services = execOptions.services;
 
-  const apiUrl = config.apiUrl || PAGER_DUTY_API_URL;
+  const apiUrl = getPagerDutyApiUrl(config);
   const headers = {
     'Content-Type': 'application/json',
     'X-Routing-Key': secrets.routingKey,
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 76e639c994834..c59ddf97017fd 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
@@ -98,6 +98,6 @@ describe('execute()', () => {
       config: {},
       secrets: {},
     });
-    expect(mockedLogger.info).toHaveBeenCalledWith('message text here');
+    expect(mockedLogger.info).toHaveBeenCalledWith('server-log: message text here');
   });
 });
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
index c2af29051d8dd..0edf409e4d46c 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
@@ -10,6 +10,9 @@ import { schema, TypeOf } from '@kbn/config-schema';
 
 import { Logger } from '../../../../../../src/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
+import { withoutControlCharacters } from './lib/string_utils';
+
+const ACTION_NAME = 'server-log';
 
 // params definition
 
@@ -17,21 +20,24 @@ export type ActionParamsType = TypeOf<typeof ParamsSchema>;
 
 const ParamsSchema = schema.object({
   message: schema.string(),
-  level: schema.oneOf([
-    schema.literal('trace'),
-    schema.literal('debug'),
-    schema.literal('info'),
-    schema.literal('warn'),
-    schema.literal('error'),
-    schema.literal('fatal'),
-  ]),
+  level: schema.oneOf(
+    [
+      schema.literal('trace'),
+      schema.literal('debug'),
+      schema.literal('info'),
+      schema.literal('warn'),
+      schema.literal('error'),
+      schema.literal('fatal'),
+    ],
+    { defaultValue: 'info' }
+  ),
 });
 
 // action type definition
 export function getActionType({ logger }: { logger: Logger }): ActionType {
   return {
     id: '.server-log',
-    name: 'server-log',
+    name: ACTION_NAME,
     validate: {
       params: ParamsSchema,
     },
@@ -48,8 +54,9 @@ async function executor(
   const actionId = execOptions.actionId;
   const params = execOptions.params as ActionParamsType;
 
+  const sanitizedMessage = withoutControlCharacters(params.message);
   try {
-    logger[params.level](params.message);
+    logger[params.level](`${ACTION_NAME}: ${sanitizedMessage}`);
   } catch (err) {
     const message = i18n.translate('xpack.actions.builtin.serverLog.errorLoggingErrorMessage', {
       defaultMessage: 'error logging message',
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 f6bd2d2b254df..a2b0db8bdb70f 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
@@ -5,11 +5,10 @@
  */
 
 import { ActionType, Services, ActionTypeExecutorOptions } from '../types';
-import { ActionTypeRegistry } from '../action_type_registry';
 import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
-import { ActionExecutor, validateParams, validateSecrets, TaskRunnerFactory } from '../lib';
+import { validateParams, validateSecrets } from '../lib';
 import { getActionType } from './slack';
-import { taskManagerMock } from '../../../task_manager/task_manager.mock';
+import { configUtilsMock } from '../actions_config.mock';
 
 const ACTION_TYPE_ID = '.slack';
 
@@ -18,47 +17,19 @@ const services: Services = {
   savedObjectsClient: savedObjectsClientMock.create(),
 };
 
-let actionTypeRegistry: ActionTypeRegistry;
 let actionType: ActionType;
 
-async function mockSlackExecutor(options: ActionTypeExecutorOptions): Promise<any> {
-  const { params } = options;
-  const { message } = params;
-  if (message == null) throw new Error('message property required in parameter');
-
-  const failureMatch = message.match(/^failure: (.*)$/);
-  if (failureMatch != null) {
-    const failMessage = failureMatch[1];
-    throw new Error(`slack mockExecutor failure: ${failMessage}`);
-  }
-
-  return {
-    text: `slack mockExecutor success: ${message}`,
-  };
-}
-
 beforeAll(() => {
-  actionTypeRegistry = new ActionTypeRegistry({
-    taskManager: taskManagerMock.create(),
-    taskRunnerFactory: new TaskRunnerFactory(new ActionExecutor()),
-  });
-  actionTypeRegistry.register(getActionType({ executor: mockSlackExecutor }));
-  actionType = actionTypeRegistry.get(ACTION_TYPE_ID);
-
-  test('ensure action type is valid', () => {
-    expect(actionType).toBeTruthy();
+  actionType = getActionType({
+    async executor(options: ActionTypeExecutorOptions): Promise<any> {},
+    configurationUtilities: configUtilsMock,
   });
 });
 
-describe('action is registered', () => {
-  test('gets registered with builtin actions', () => {
-    expect(actionTypeRegistry.has(ACTION_TYPE_ID)).toEqual(true);
-  });
-
+describe('action registeration', () => {
   test('returns action type', () => {
-    const returnedActionType = actionTypeRegistry.get(ACTION_TYPE_ID);
-    expect(returnedActionType.id).toEqual(ACTION_TYPE_ID);
-    expect(returnedActionType.name).toEqual('slack');
+    expect(actionType.id).toEqual(ACTION_TYPE_ID);
+    expect(actionType.name).toEqual('slack');
   });
 });
 
@@ -104,9 +75,64 @@ describe('validateActionTypeSecrets()', () => {
       `"error validating action type secrets: [webhookUrl]: expected value of type [string] but got [number]"`
     );
   });
+
+  test('should validate and pass when the slack webhookUrl is whitelisted', () => {
+    actionType = getActionType({
+      configurationUtilities: {
+        ...configUtilsMock,
+        ensureWhitelistedUri: url => {
+          expect(url).toEqual('https://api.slack.com/');
+        },
+      },
+    });
+
+    expect(validateSecrets(actionType, { webhookUrl: 'https://api.slack.com/' })).toEqual({
+      webhookUrl: 'https://api.slack.com/',
+    });
+  });
+
+  test('config validation returns an error if the specified URL isnt whitelisted', () => {
+    actionType = getActionType({
+      configurationUtilities: {
+        ...configUtilsMock,
+        ensureWhitelistedUri: url => {
+          throw new Error(`target url is not whitelisted`);
+        },
+      },
+    });
+
+    expect(() => {
+      validateSecrets(actionType, { webhookUrl: 'https://api.slack.com/' });
+    }).toThrowErrorMatchingInlineSnapshot(
+      `"error validating action type secrets: error configuring slack action: target url is not whitelisted"`
+    );
+  });
 });
 
 describe('execute()', () => {
+  beforeAll(() => {
+    async function mockSlackExecutor(options: ActionTypeExecutorOptions): Promise<any> {
+      const { params } = options;
+      const { message } = params;
+      if (message == null) throw new Error('message property required in parameter');
+
+      const failureMatch = message.match(/^failure: (.*)$/);
+      if (failureMatch != null) {
+        const failMessage = failureMatch[1];
+        throw new Error(`slack mockExecutor failure: ${failMessage}`);
+      }
+
+      return {
+        text: `slack mockExecutor success: ${message}`,
+      };
+    }
+
+    actionType = getActionType({
+      executor: mockSlackExecutor,
+      configurationUtilities: configUtilsMock,
+    });
+  });
+
   test('calls the mock executor with success', async () => {
     const response = await actionType.executor({
       actionId: 'some-id',
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
index 29b89150e3990..92611d6f162ff 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { curry } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { schema, TypeOf } from '@kbn/config-schema';
 import { IncomingWebhook, IncomingWebhookResult } from '@slack/webhook';
@@ -17,14 +18,16 @@ import {
   ActionTypeExecutorResult,
   ExecutorType,
 } from '../types';
+import { ActionsConfigurationUtilities } from '../actions_config';
 
 // secrets definition
 
 export type ActionTypeSecretsType = TypeOf<typeof SecretsSchema>;
 
-const SecretsSchema = schema.object({
+const secretsSchemaProps = {
   webhookUrl: schema.string(),
-});
+};
+const SecretsSchema = schema.object(secretsSchemaProps);
 
 // params definition
 
@@ -37,20 +40,42 @@ const ParamsSchema = schema.object({
 // action type definition
 
 // customizing executor is only used for tests
-export function getActionType(
-  { executor }: { executor: ExecutorType } = { executor: slackExecutor }
-): ActionType {
+export function getActionType({
+  configurationUtilities,
+  executor = slackExecutor,
+}: {
+  configurationUtilities: ActionsConfigurationUtilities;
+  executor?: ExecutorType;
+}): ActionType {
   return {
     id: '.slack',
     name: 'slack',
     validate: {
-      secrets: SecretsSchema,
+      secrets: schema.object(secretsSchemaProps, {
+        validate: curry(valdiateActionTypeConfig)(configurationUtilities),
+      }),
       params: ParamsSchema,
     },
     executor,
   };
 }
 
+function valdiateActionTypeConfig(
+  configurationUtilities: ActionsConfigurationUtilities,
+  secretsObject: ActionTypeSecretsType
+) {
+  try {
+    configurationUtilities.ensureWhitelistedUri(secretsObject.webhookUrl);
+  } catch (whitelistError) {
+    return i18n.translate('xpack.actions.builtin.slack.slackConfigurationError', {
+      defaultMessage: 'error configuring slack action: {message}',
+      values: {
+        message: whitelistError.message,
+      },
+    });
+  }
+}
+
 // action executor
 
 async function slackExecutor(
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.test.ts
index 2d492eb451e80..64dd3a485f8e2 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.test.ts
@@ -6,18 +6,12 @@
 
 import { getActionType } from './webhook';
 import { validateConfig, validateSecrets, validateParams } from '../lib';
-import { ActionsConfigurationUtilities } from '../actions_config';
+import { configUtilsMock } from '../actions_config.mock';
 import { ActionType } from '../types';
 import { createActionTypeRegistry } from './index.test';
 import { Logger } from '../../../../../../src/core/server';
 
 const ACTION_TYPE_ID = '.webhook';
-const configUtilsMock: ActionsConfigurationUtilities = {
-  isWhitelistedHostname: _ => true,
-  isWhitelistedUri: _ => true,
-  ensureWhitelistedHostname: _ => {},
-  ensureWhitelistedUri: _ => {},
-};
 
 let actionType: ActionType;
 let mockedLogger: jest.Mocked<Logger>;
diff --git a/x-pack/legacy/plugins/actions/server/constants/plugin.ts b/x-pack/legacy/plugins/actions/server/constants/plugin.ts
new file mode 100644
index 0000000000000..27cf0a8d2bf88
--- /dev/null
+++ b/x-pack/legacy/plugins/actions/server/constants/plugin.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 { LICENSE_TYPE_BASIC, LicenseType } from '../../../../common/constants';
+
+export const PLUGIN = {
+  ID: 'actions',
+  MINIMUM_LICENSE_REQUIRED: LICENSE_TYPE_BASIC as LicenseType, // TODO: supposed to be changed up on requirements
+  getI18nName: (i18n: any): string =>
+    i18n.translate('xpack.actions.appName', {
+      defaultMessage: 'Actions',
+    }),
+};
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 c6817b3bc12f3..6de446ee2da76 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
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { taskManagerMock } from '../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
 import { createExecuteFunction } from './create_execute_function';
 import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
 
@@ -138,6 +138,7 @@ describe('execute()', () => {
       id: '123',
       params: { baz: false },
       spaceId: 'default',
+      apiKey: null,
     });
     expect(getScopedSavedObjectsClient).toHaveBeenCalledWith({
       getBasePath: expect.anything(),
diff --git a/x-pack/legacy/plugins/actions/server/create_execute_function.ts b/x-pack/legacy/plugins/actions/server/create_execute_function.ts
index 451be9354006e..8ff12b8c3fa4b 100644
--- a/x-pack/legacy/plugins/actions/server/create_execute_function.ts
+++ b/x-pack/legacy/plugins/actions/server/create_execute_function.ts
@@ -18,7 +18,7 @@ export interface ExecuteOptions {
   id: string;
   params: Record<string, any>;
   spaceId: string;
-  apiKey?: string;
+  apiKey: string | null;
 }
 
 export function createExecuteFunction({
diff --git a/x-pack/legacy/plugins/actions/server/extend_route_with_license_check.test.ts b/x-pack/legacy/plugins/actions/server/extend_route_with_license_check.test.ts
new file mode 100644
index 0000000000000..186c26f6100e4
--- /dev/null
+++ b/x-pack/legacy/plugins/actions/server/extend_route_with_license_check.test.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 { extendRouteWithLicenseCheck } from './extend_route_with_license_check';
+import { LicenseState } from './lib/license_state';
+jest.mock('./lib/license_state', () => ({
+  verifyApiAccessFactory: () => {},
+}));
+
+describe('extendRouteWithLicenseCheck', () => {
+  describe('#actionsextendRouteWithLicenseCheck', () => {
+    let licenseState: jest.Mocked<LicenseState>;
+
+    test('extends route object with license, if config property already exists', () => {
+      const newRoute = extendRouteWithLicenseCheck(
+        { config: { someTestProperty: 'test' } },
+        licenseState
+      );
+      expect(newRoute.config.pre.length > 0);
+    });
+    test('extends route object with license check uder options.pre', () => {
+      const newRoute = extendRouteWithLicenseCheck(
+        { options: { someProperty: 'test' } },
+        licenseState
+      );
+      expect(newRoute.options.pre.length > 0);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/actions/server/extend_route_with_license_check.ts b/x-pack/legacy/plugins/actions/server/extend_route_with_license_check.ts
new file mode 100644
index 0000000000000..f39dc125071b4
--- /dev/null
+++ b/x-pack/legacy/plugins/actions/server/extend_route_with_license_check.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { LicenseState, verifyApiAccessFactory } from './lib/license_state';
+
+export function extendRouteWithLicenseCheck(route: any, licenseState: LicenseState) {
+  const verifyApiAccessPreRouting = verifyApiAccessFactory(licenseState);
+
+  const key = route.options ? 'options' : 'config';
+  return {
+    ...route,
+    [key]: {
+      ...route[key],
+      pre: [verifyApiAccessPreRouting],
+    },
+  };
+}
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 6767468509d25..7d9bf20e22ace 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
@@ -202,3 +202,36 @@ test('throws an error when failing to load action through savedObjectsClient', a
     `"No access"`
   );
 });
+
+test('returns an error if actionType is not enabled', async () => {
+  const actionType = {
+    id: 'test',
+    name: 'Test',
+    executor: jest.fn(),
+  };
+  const actionSavedObject = {
+    id: '1',
+    type: 'action',
+    attributes: {
+      actionTypeId: 'test',
+    },
+    references: [],
+  };
+  savedObjectsClient.get.mockResolvedValueOnce(actionSavedObject);
+  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce(actionSavedObject);
+  actionTypeRegistry.get.mockReturnValueOnce(actionType);
+  actionTypeRegistry.ensureActionTypeEnabled.mockImplementationOnce(() => {
+    throw new Error('not enabled for test');
+  });
+  const result = await actionExecutor.execute(executeParams);
+
+  expect(actionTypeRegistry.ensureActionTypeEnabled).toHaveBeenCalledWith('test');
+  expect(result).toMatchInlineSnapshot(`
+    Object {
+      "actionId": "1",
+      "message": "not enabled for test",
+      "retry": false,
+      "status": "error",
+    }
+  `);
+});
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 c532b76a904d5..f0259c739654b 100644
--- a/x-pack/legacy/plugins/actions/server/lib/action_executor.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/action_executor.ts
@@ -69,6 +69,13 @@ export class ActionExecutor {
     const {
       attributes: { actionTypeId, config, name },
     } = await services.savedObjectsClient.get<RawAction>('action', actionId);
+
+    try {
+      actionTypeRegistry.ensureActionTypeEnabled(actionTypeId);
+    } catch (err) {
+      return { status: 'error', actionId, message: err.message, retry: false };
+    }
+
     // Only get encrypted attributes here, the remaining attributes can be fetched in
     // the savedObjectsClient call
     const {
diff --git a/x-pack/legacy/plugins/actions/server/lib/license_state.test.ts b/x-pack/legacy/plugins/actions/server/lib/license_state.test.ts
new file mode 100644
index 0000000000000..e58c52f63c8cb
--- /dev/null
+++ b/x-pack/legacy/plugins/actions/server/lib/license_state.test.ts
@@ -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 expect from '@kbn/expect';
+import { LicenseState } from './license_state';
+import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
+import { LICENSE_CHECK_STATE } from '../../../../../plugins/licensing/server';
+
+describe('license_state', () => {
+  let getRawLicense: any;
+
+  beforeEach(() => {
+    getRawLicense = jest.fn();
+  });
+
+  describe('status is LICENSE_STATUS_INVALID', () => {
+    beforeEach(() => {
+      const license = licensingMock.createLicense({ license: { status: 'invalid' } });
+      license.check = jest.fn(() => ({
+        state: LICENSE_CHECK_STATE.Invalid,
+      }));
+      getRawLicense.mockReturnValue(license);
+    });
+
+    it('check application link should be disabled', () => {
+      const licensing = licensingMock.createSetup();
+      const licenseState = new LicenseState(licensing.license$);
+      const actionsLicenseInfo = licenseState.checkLicense(getRawLicense());
+      expect(actionsLicenseInfo.enableAppLink).to.be(false);
+    });
+  });
+
+  describe('status is LICENSE_STATUS_VALID', () => {
+    beforeEach(() => {
+      const license = licensingMock.createLicense({ license: { status: 'active' } });
+      license.check = jest.fn(() => ({
+        state: LICENSE_CHECK_STATE.Valid,
+      }));
+      getRawLicense.mockReturnValue(license);
+    });
+
+    it('check application link should be enabled', () => {
+      const licensing = licensingMock.createSetup();
+      const licenseState = new LicenseState(licensing.license$);
+      const actionsLicenseInfo = licenseState.checkLicense(getRawLicense());
+      expect(actionsLicenseInfo.showAppLink).to.be(true);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/actions/server/lib/license_state.ts b/x-pack/legacy/plugins/actions/server/lib/license_state.ts
new file mode 100644
index 0000000000000..b4de23ef0a949
--- /dev/null
+++ b/x-pack/legacy/plugins/actions/server/lib/license_state.ts
@@ -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 Boom from 'boom';
+import { i18n } from '@kbn/i18n';
+import { Observable, Subscription } from 'rxjs';
+import { ILicense, LICENSE_CHECK_STATE } from '../../../../../plugins/licensing/common/types';
+import { assertNever } from '../../../../../../src/core/utils';
+import { PLUGIN } from '../constants/plugin';
+
+export interface ActionsLicenseInformation {
+  showAppLink: boolean;
+  enableAppLink: boolean;
+  message: string;
+}
+
+export class LicenseState {
+  private licenseInformation: ActionsLicenseInformation = this.checkLicense(undefined);
+  private subscription: Subscription;
+
+  constructor(license$: Observable<ILicense>) {
+    this.subscription = license$.subscribe(this.updateInformation.bind(this));
+  }
+
+  private updateInformation(license: ILicense | undefined) {
+    this.licenseInformation = this.checkLicense(license);
+  }
+
+  public clean() {
+    this.subscription.unsubscribe();
+  }
+
+  public getLicenseInformation() {
+    return this.licenseInformation;
+  }
+
+  public checkLicense(license: ILicense | undefined): ActionsLicenseInformation {
+    if (!license?.isAvailable) {
+      return {
+        showAppLink: true,
+        enableAppLink: false,
+        message: i18n.translate(
+          'xpack.actions.serverSideErrors.unavailableLicenseInformationErrorMessage',
+          {
+            defaultMessage:
+              'Actions is unavailable - license information is not available at this time.',
+          }
+        ),
+      };
+    }
+
+    const check = license.check(PLUGIN.ID, PLUGIN.MINIMUM_LICENSE_REQUIRED);
+
+    switch (check.state) {
+      case LICENSE_CHECK_STATE.Expired:
+        return {
+          showAppLink: true,
+          enableAppLink: false,
+          message: check.message || '',
+        };
+      case LICENSE_CHECK_STATE.Invalid:
+      case LICENSE_CHECK_STATE.Unavailable:
+        return {
+          showAppLink: false,
+          enableAppLink: false,
+          message: check.message || '',
+        };
+      case LICENSE_CHECK_STATE.Valid:
+        return {
+          showAppLink: true,
+          enableAppLink: true,
+          message: '',
+        };
+      default:
+        return assertNever(check.state);
+    }
+  }
+}
+
+export function verifyApiAccessFactory(licenseState: LicenseState) {
+  function verifyApiAccess() {
+    const licenseCheckResults = licenseState.getLicenseInformation();
+
+    if (licenseCheckResults.showAppLink && licenseCheckResults.enableAppLink) {
+      return null;
+    }
+
+    throw Boom.forbidden(licenseCheckResults.message);
+  }
+  return verifyApiAccess;
+}
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 eb183f1f1d06a..5b60696c42d52 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
@@ -7,7 +7,7 @@
 import sinon from 'sinon';
 import { ExecutorError } from './executor_error';
 import { ActionExecutor } from './action_executor';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
+import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager/server';
 import { TaskRunnerFactory } from './task_runner_factory';
 import { actionTypeRegistryMock } from '../action_type_registry.mock';
 import { actionExecutorMock } from './action_executor.mock';
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 c0cca22b2c3eb..ca6a726f40e14 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
@@ -6,7 +6,7 @@
 
 import { ActionExecutorContract } from './action_executor';
 import { ExecutorError } from './executor_error';
-import { RunContext } from '../../../task_manager';
+import { RunContext } from '../../../task_manager/server';
 import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
 import { ActionTaskParams, GetBasePathFunction, SpaceIdToNamespaceFunction } from '../types';
 
diff --git a/x-pack/legacy/plugins/actions/server/plugin.ts b/x-pack/legacy/plugins/actions/server/plugin.ts
index 510e2a3b94894..48f99ba5135b7 100644
--- a/x-pack/legacy/plugins/actions/server/plugin.ts
+++ b/x-pack/legacy/plugins/actions/server/plugin.ts
@@ -33,6 +33,8 @@ import {
   listActionTypesRoute,
   getExecuteActionRoute,
 } from './routes';
+import { extendRouteWithLicenseCheck } from './extend_route_with_license_check';
+import { LicenseState } from './lib/license_state';
 
 export interface PluginSetupContract {
   registerType: ActionTypeRegistry['register'];
@@ -54,9 +56,10 @@ export class Plugin {
   private actionTypeRegistry?: ActionTypeRegistry;
   private actionExecutor?: ActionExecutor;
   private defaultKibanaIndex?: string;
+  private licenseState: LicenseState | null = null;
 
   constructor(initializerContext: ActionsPluginInitializerContext) {
-    this.logger = initializerContext.logger.get('plugins', 'alerting');
+    this.logger = initializerContext.logger.get('plugins', 'actions');
     this.config$ = initializerContext.config.create();
     this.kibana$ = initializerContext.config.kibana$;
   }
@@ -66,9 +69,11 @@ export class Plugin {
     plugins: ActionsPluginsSetup
   ): Promise<PluginSetupContract> {
     const config = await this.config$.pipe(first()).toPromise();
-    this.adminClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();
+    this.adminClient = core.elasticsearch.adminClient;
     this.defaultKibanaIndex = (await this.kibana$.pipe(first()).toPromise()).index;
 
+    this.licenseState = new LicenseState(plugins.licensing.license$);
+
     // Encrypted attributes
     // - `secrets` properties will be encrypted
     // - `config` will be included in AAD
@@ -85,9 +90,11 @@ export class Plugin {
 
     const actionExecutor = new ActionExecutor();
     const taskRunnerFactory = new TaskRunnerFactory(actionExecutor);
+    const actionsConfigUtils = getActionsConfigurationUtilities(config as ActionsConfigType);
     const actionTypeRegistry = new ActionTypeRegistry({
       taskRunnerFactory,
       taskManager: plugins.task_manager,
+      actionsConfigUtils,
     });
     this.taskRunnerFactory = taskRunnerFactory;
     this.actionTypeRegistry = actionTypeRegistry;
@@ -97,17 +104,19 @@ export class Plugin {
     registerBuiltInActionTypes({
       logger: this.logger,
       actionTypeRegistry,
-      actionsConfigUtils: getActionsConfigurationUtilities(config as ActionsConfigType),
+      actionsConfigUtils,
     });
 
     // Routes
-    core.http.route(createActionRoute);
-    core.http.route(deleteActionRoute);
-    core.http.route(getActionRoute);
-    core.http.route(findActionRoute);
-    core.http.route(updateActionRoute);
-    core.http.route(listActionTypesRoute);
-    core.http.route(getExecuteActionRoute(actionExecutor));
+    core.http.route(extendRouteWithLicenseCheck(createActionRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(deleteActionRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(getActionRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(findActionRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(updateActionRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(listActionTypesRoute, this.licenseState));
+    core.http.route(
+      extendRouteWithLicenseCheck(getExecuteActionRoute(actionExecutor), this.licenseState)
+    );
 
     return {
       registerType: actionTypeRegistry.register.bind(actionTypeRegistry),
@@ -174,4 +183,10 @@ export class Plugin {
       },
     };
   }
+
+  public stop() {
+    if (this.licenseState) {
+      this.licenseState.clean();
+    }
+  }
 }
diff --git a/x-pack/legacy/plugins/actions/server/routes/list_action_types.test.ts b/x-pack/legacy/plugins/actions/server/routes/list_action_types.test.ts
index 3bacbe4f0911b..3bfc3d736cda6 100644
--- a/x-pack/legacy/plugins/actions/server/routes/list_action_types.test.ts
+++ b/x-pack/legacy/plugins/actions/server/routes/list_action_types.test.ts
@@ -23,6 +23,7 @@ it('calls the list function', async () => {
     {
       id: '1',
       name: 'One',
+      enabled: true,
     },
   ];
 
diff --git a/x-pack/legacy/plugins/actions/server/shim.ts b/x-pack/legacy/plugins/actions/server/shim.ts
index c40e4ea79d1c3..f8aa9b8d7a25c 100644
--- a/x-pack/legacy/plugins/actions/server/shim.ts
+++ b/x-pack/legacy/plugins/actions/server/shim.ts
@@ -8,7 +8,7 @@ import Hapi from 'hapi';
 import { Legacy } from 'kibana';
 import * as Rx from 'rxjs';
 import { ActionsConfigType } from './types';
-import { TaskManager } from '../../task_manager';
+import { TaskManager } from '../../task_manager/server';
 import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
 import KbnServer from '../../../../../src/legacy/server/kbn_server';
 import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
@@ -22,6 +22,7 @@ import {
   LoggerFactory,
   SavedObjectsLegacyService,
 } from '../../../../../src/core/server';
+import { LicensingPluginSetup } from '../../../../plugins/licensing/server';
 
 // Extend PluginProperties to indicate which plugins are guaranteed to exist
 // due to being marked as dependencies
@@ -76,6 +77,7 @@ export interface ActionsPluginsSetup {
   task_manager: TaskManagerSetupContract;
   xpack_main: XPackMainPluginSetupContract;
   encryptedSavedObjects: EncryptedSavedObjectsSetupContract;
+  licensing: LicensingPluginSetup;
 }
 export interface ActionsPluginsStart {
   security?: SecurityPluginStartContract;
@@ -110,6 +112,7 @@ export function shim(
         return Rx.of({
           enabled: server.config().get('xpack.actions.enabled') as boolean,
           whitelistedHosts: server.config().get('xpack.actions.whitelistedHosts') as string[],
+          enabledActionTypes: server.config().get('xpack.actions.enabledActionTypes') as string[],
         }) as Rx.Observable<ActionsConfigType>;
       },
     },
@@ -133,6 +136,7 @@ export function shim(
     xpack_main: server.plugins.xpack_main,
     encryptedSavedObjects: newPlatform.setup.plugins
       .encryptedSavedObjects as EncryptedSavedObjectsSetupContract,
+    licensing: newPlatform.setup.plugins.licensing as LicensingPluginSetup,
   };
 
   const pluginsStart: ActionsPluginsStart = {
diff --git a/x-pack/legacy/plugins/actions/server/types.ts b/x-pack/legacy/plugins/actions/server/types.ts
index 94b34034cd8b2..6a6fb7d660cbb 100644
--- a/x-pack/legacy/plugins/actions/server/types.ts
+++ b/x-pack/legacy/plugins/actions/server/types.ts
@@ -27,6 +27,7 @@ export interface ActionsPlugin {
 export interface ActionsConfigType {
   enabled: boolean;
   whitelistedHosts: string[];
+  enabledActionTypes: string[];
 }
 
 // the parameters passed to an action type executor function
diff --git a/x-pack/legacy/plugins/alerting/README.md b/x-pack/legacy/plugins/alerting/README.md
index 85dbd75e14174..33679cf6fa422 100644
--- a/x-pack/legacy/plugins/alerting/README.md
+++ b/x-pack/legacy/plugins/alerting/README.md
@@ -200,7 +200,7 @@ Payload:
 |name|A name to reference and search in the future.|string|
 |tags|A list of keywords 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|
+|schedule|The schedule specifying when this alert should be run, using one of the available schedule formats specified under _Schedule Formats_ below|object|
 |params|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): The 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|
 
@@ -242,7 +242,7 @@ Payload:
 
 |Property|Description|Type|
 |---|---|---|
-|interval|The interval in seconds, minutes, hours or days the alert should execute. Example: `10s`, `5m`, `1h`, `1d`.|string|
+|schedule|The schedule specifying when this alert should be run, using one of the available schedule formats specified under _Schedule Formats_ below|object|
 |name|A name to reference and search in the future.|string|
 |tags|A list of keywords to reference and search in the future.|string[]|
 |params|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|
@@ -304,6 +304,14 @@ Params:
 |---|---|---|
 |id|The id of the alert you're trying to update the API key for. System will use user in request context to generate an API key for.|string|
 
+##### Schedule Formats
+A schedule is structured such that the key specifies the format you wish to use and its value specifies the schedule.
+
+We currently support the _Interval format_ which specifies the interval in seconds, minutes, hours or days at which the alert should execute.
+Example: `{ interval: "10s" }`, `{ interval: "5m" }`, `{ interval: "1h" }`, `{ interval: "1d" }`.
+
+There are plans to support multiple other schedule formats in the near fuiture.
+
 ## Alert instance factory
 
 **alertInstanceFactory(id)**
diff --git a/x-pack/legacy/plugins/alerting/mappings.json b/x-pack/legacy/plugins/alerting/mappings.json
index 7a7446602351d..31733f44e7ce6 100644
--- a/x-pack/legacy/plugins/alerting/mappings.json
+++ b/x-pack/legacy/plugins/alerting/mappings.json
@@ -13,7 +13,14 @@
       "alertTypeId": {
         "type": "keyword"
       },
-      "interval": {
+      "schedule": {
+        "properties": {
+          "interval": {
+            "type": "keyword"
+          }
+        }
+      },
+      "consumer": {
         "type": "keyword"
       },
       "actions": {
@@ -47,6 +54,9 @@
       "updatedBy": {
         "type": "keyword"
       },
+      "createdAt": {
+        "type": "date"
+      },
       "apiKey": {
         "type": "binary"
       },
diff --git a/x-pack/legacy/plugins/alerting/server/lib/alert_instance.test.ts b/x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/alert_instance.test.ts
rename to x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.test.ts
diff --git a/x-pack/legacy/plugins/alerting/server/lib/alert_instance.ts b/x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.ts
similarity index 97%
rename from x-pack/legacy/plugins/alerting/server/lib/alert_instance.ts
rename to x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.ts
index 1e2cc26f364ad..a56e2077cdfd8 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/alert_instance.ts
+++ b/x-pack/legacy/plugins/alerting/server/alert_instance/alert_instance.ts
@@ -5,7 +5,7 @@
  */
 
 import { State, Context } from '../types';
-import { parseDuration } from './parse_duration';
+import { parseDuration } from '../lib';
 
 interface Meta {
   lastScheduledActions?: {
diff --git a/x-pack/legacy/plugins/alerting/server/lib/create_alert_instance_factory.test.ts b/x-pack/legacy/plugins/alerting/server/alert_instance/create_alert_instance_factory.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/create_alert_instance_factory.test.ts
rename to x-pack/legacy/plugins/alerting/server/alert_instance/create_alert_instance_factory.test.ts
diff --git a/x-pack/legacy/plugins/alerting/server/lib/create_alert_instance_factory.ts b/x-pack/legacy/plugins/alerting/server/alert_instance/create_alert_instance_factory.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/create_alert_instance_factory.ts
rename to x-pack/legacy/plugins/alerting/server/alert_instance/create_alert_instance_factory.ts
diff --git a/x-pack/legacy/plugins/alerting/server/alert_instance/index.ts b/x-pack/legacy/plugins/alerting/server/alert_instance/index.ts
new file mode 100644
index 0000000000000..40ee0874e805c
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/alert_instance/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 { AlertInstance } from './alert_instance';
+export { createAlertInstanceFactory } from './create_alert_instance_factory';
diff --git a/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts b/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts
index e03df364e78ce..8e96ad8dae31c 100644
--- a/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/alert_type_registry.test.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { TaskRunnerFactory } from './lib';
+import { TaskRunnerFactory } from './task_runner';
 import { AlertTypeRegistry } from './alert_type_registry';
-import { taskManagerMock } from '../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
 
 const taskManager = taskManagerMock.create();
 
diff --git a/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts b/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts
index ec875aa2181eb..2003e810a05b5 100644
--- a/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts
+++ b/x-pack/legacy/plugins/alerting/server/alert_type_registry.ts
@@ -6,7 +6,7 @@
 
 import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
-import { TaskRunnerFactory } from './lib';
+import { TaskRunnerFactory } from './task_runner';
 import { RunContext } from '../../task_manager';
 import { TaskManagerSetupContract } from './shim';
 import { AlertType } from './types';
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 37eb6a9b21d44..32293d9755a2a 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
@@ -3,32 +3,44 @@
  * 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 { schema } from '@kbn/config-schema';
 import { AlertsClient } from './alerts_client';
 import { savedObjectsClientMock, loggingServiceMock } from '../../../../../src/core/server/mocks';
-import { taskManagerMock } from '../../task_manager/task_manager.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
 import { alertTypeRegistryMock } from './alert_type_registry.mock';
-import { TaskStatus } from '../../task_manager';
+import { TaskStatus } from '../../task_manager/server';
+import { IntervalSchedule } from './types';
+import { resolvable } from './test_utils';
+import { encryptedSavedObjectsMock } from '../../../../plugins/encrypted_saved_objects/server/mocks';
 
 const taskManager = taskManagerMock.create();
 const alertTypeRegistry = alertTypeRegistryMock.create();
 const savedObjectsClient = savedObjectsClientMock.create();
+const encryptedSavedObjects = encryptedSavedObjectsMock.createStart();
 
 const alertsClientParams = {
   taskManager,
   alertTypeRegistry,
   savedObjectsClient,
   spaceId: 'default',
+  namespace: 'default',
   getUserName: jest.fn(),
   createAPIKey: jest.fn(),
+  invalidateAPIKey: jest.fn(),
   logger: loggingServiceMock.create().get(),
+  encryptedSavedObjectsPlugin: encryptedSavedObjects,
 };
 
 beforeEach(() => {
   jest.resetAllMocks();
-  alertsClientParams.createAPIKey.mockResolvedValue({ created: false });
+  alertsClientParams.createAPIKey.mockResolvedValue({ apiKeysEnabled: false });
+  alertsClientParams.invalidateAPIKey.mockResolvedValue({
+    apiKeysEnabled: true,
+    result: { error_count: 0 },
+  });
   alertsClientParams.getUserName.mockResolvedValue('elastic');
+  taskManager.runNow.mockResolvedValue({ id: '' });
 });
 
 const mockedDate = new Date('2019-02-12T21:01:22.479Z');
@@ -47,7 +59,8 @@ function getMockData(overwrites: Record<string, any> = {}) {
     name: 'abc',
     tags: ['foo'],
     alertTypeId: '123',
-    interval: '10s',
+    consumer: 'bar',
+    schedule: { interval: '10s' },
     throttle: null,
     params: {
       bar: true,
@@ -92,10 +105,11 @@ describe('create()', () => {
       type: 'alert',
       attributes: {
         alertTypeId: '123',
-        interval: '10s',
+        schedule: { interval: '10s' },
         params: {
           bar: true,
         },
+        createdAt: '2019-02-12T21:01:22.479Z',
         actions: [
           {
             group: 'default',
@@ -156,12 +170,16 @@ describe('create()', () => {
           },
         ],
         "alertTypeId": "123",
+        "createdAt": 2019-02-12T21:01:22.479Z,
         "id": "1",
-        "interval": "10s",
         "params": Object {
           "bar": true,
         },
+        "schedule": Object {
+          "interval": "10s",
+        },
         "scheduledTaskId": "task-123",
+        "updatedAt": 2019-02-12T21:01:22.479Z,
       }
     `);
     expect(savedObjectsClient.create).toHaveBeenCalledTimes(1);
@@ -180,17 +198,21 @@ describe('create()', () => {
           },
         ],
         "alertTypeId": "123",
-        "apiKey": undefined,
-        "apiKeyOwner": undefined,
+        "apiKey": null,
+        "apiKeyOwner": null,
+        "consumer": "bar",
+        "createdAt": "2019-02-12T21:01:22.479Z",
         "createdBy": "elastic",
         "enabled": true,
-        "interval": "10s",
         "muteAll": false,
         "mutedInstanceIds": Array [],
         "name": "abc",
         "params": Object {
           "bar": true,
         },
+        "schedule": Object {
+          "interval": "10s",
+        },
         "tags": Array [
           "foo",
         ],
@@ -298,10 +320,11 @@ describe('create()', () => {
       type: 'alert',
       attributes: {
         alertTypeId: '123',
-        interval: '10s',
+        schedule: { interval: '10s' },
         params: {
           bar: true,
         },
+        createdAt: new Date().toISOString(),
         actions: [
           {
             group: 'default',
@@ -398,12 +421,16 @@ describe('create()', () => {
           },
         ],
         "alertTypeId": "123",
+        "createdAt": 2019-02-12T21:01:22.479Z,
         "id": "1",
-        "interval": "10s",
         "params": Object {
           "bar": true,
         },
+        "schedule": Object {
+          "interval": "10s",
+        },
         "scheduledTaskId": "task-123",
+        "updatedAt": 2019-02-12T21:01:22.479Z,
       }
     `);
     expect(savedObjectsClient.bulkGet).toHaveBeenCalledWith([
@@ -445,10 +472,11 @@ describe('create()', () => {
       attributes: {
         enabled: false,
         alertTypeId: '123',
-        interval: 10000,
+        schedule: { interval: 10000 },
         params: {
           bar: true,
         },
+        createdAt: new Date().toISOString(),
         actions: [
           {
             group: 'default',
@@ -482,12 +510,16 @@ describe('create()', () => {
           },
         ],
         "alertTypeId": "123",
+        "createdAt": 2019-02-12T21:01:22.479Z,
         "enabled": false,
         "id": "1",
-        "interval": 10000,
         "params": Object {
           "bar": true,
         },
+        "schedule": Object {
+          "interval": 10000,
+        },
+        "updatedAt": 2019-02-12T21:01:22.479Z,
       }
     `);
     expect(savedObjectsClient.create).toHaveBeenCalledTimes(1);
@@ -585,7 +617,7 @@ describe('create()', () => {
       type: 'alert',
       attributes: {
         alertTypeId: '123',
-        interval: '10s',
+        schedule: { interval: '10s' },
         params: {
           bar: true,
         },
@@ -648,7 +680,7 @@ describe('create()', () => {
       type: 'alert',
       attributes: {
         alertTypeId: '123',
-        interval: '10s',
+        schedule: { interval: '10s' },
         params: {
           bar: true,
         },
@@ -702,7 +734,7 @@ describe('create()', () => {
       async executor() {},
     });
     alertsClientParams.createAPIKey.mockResolvedValueOnce({
-      created: true,
+      apiKeysEnabled: true,
       result: { id: '123', api_key: 'abc' },
     });
     savedObjectsClient.bulkGet.mockResolvedValueOnce({
@@ -722,7 +754,7 @@ describe('create()', () => {
       type: 'alert',
       attributes: {
         alertTypeId: '123',
-        interval: '10s',
+        schedule: { interval: '10s' },
         params: {
           bar: true,
         },
@@ -787,14 +819,16 @@ describe('create()', () => {
           },
         ],
         alertTypeId: '123',
+        consumer: 'bar',
         name: 'abc',
         params: { bar: true },
         apiKey: Buffer.from('123:abc').toString('base64'),
         apiKeyOwner: 'elastic',
         createdBy: 'elastic',
+        createdAt: '2019-02-12T21:01:22.479Z',
         updatedBy: 'elastic',
         enabled: true,
-        interval: '10s',
+        schedule: { interval: '10s' },
         throttle: null,
         muteAll: false,
         mutedInstanceIds: [],
@@ -816,11 +850,11 @@ describe('create()', () => {
 describe('enable()', () => {
   test('enables an alert', async () => {
     const alertsClient = new AlertsClient(alertsClientParams);
-    savedObjectsClient.get.mockResolvedValueOnce({
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: false,
       },
@@ -846,7 +880,7 @@ describe('enable()', () => {
       'alert',
       '1',
       {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
         scheduledTaskId: 'task-123',
@@ -875,11 +909,11 @@ describe('enable()', () => {
 
   test(`doesn't enable already enabled alerts`, async () => {
     const alertsClient = new AlertsClient(alertsClientParams);
-    savedObjectsClient.get.mockResolvedValueOnce({
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
       },
@@ -893,11 +927,11 @@ describe('enable()', () => {
 
   test('calls the API key function', async () => {
     const alertsClient = new AlertsClient(alertsClientParams);
-    savedObjectsClient.get.mockResolvedValueOnce({
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: false,
       },
@@ -918,7 +952,7 @@ describe('enable()', () => {
       ownerId: null,
     });
     alertsClientParams.createAPIKey.mockResolvedValueOnce({
-      created: true,
+      apiKeysEnabled: true,
       result: { id: '123', api_key: 'abc' },
     });
 
@@ -927,7 +961,7 @@ describe('enable()', () => {
       'alert',
       '1',
       {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
         scheduledTaskId: 'task-123',
@@ -953,6 +987,41 @@ describe('enable()', () => {
       scope: ['alerting'],
     });
   });
+
+  test('swallows error when invalidate API key throws', async () => {
+    const alertsClient = new AlertsClient(alertsClientParams);
+    alertsClientParams.invalidateAPIKey.mockRejectedValueOnce(new Error('Fail'));
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        schedule: { interval: '10s' },
+        alertTypeId: '2',
+        enabled: false,
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      version: '123',
+      references: [],
+    });
+    taskManager.schedule.mockResolvedValueOnce({
+      id: 'task-123',
+      scheduledAt: new Date(),
+      attempts: 0,
+      status: TaskStatus.Idle,
+      runAt: new Date(),
+      state: {},
+      params: {},
+      taskType: '',
+      startedAt: null,
+      retryAt: null,
+      ownerId: null,
+    });
+
+    await alertsClient.enable({ id: '1' });
+    expect(alertsClientParams.logger.error).toHaveBeenCalledWith(
+      'Failed to invalidate API Key: Fail'
+    );
+  });
 });
 
 describe('disable()', () => {
@@ -962,7 +1031,7 @@ describe('disable()', () => {
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
         scheduledTaskId: 'task-123',
@@ -976,7 +1045,7 @@ describe('disable()', () => {
       'alert',
       '1',
       {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         apiKey: null,
         apiKeyOwner: null,
@@ -997,7 +1066,7 @@ describe('disable()', () => {
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: false,
         scheduledTaskId: 'task-123',
@@ -1060,7 +1129,7 @@ describe('muteInstance()', () => {
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
         scheduledTaskId: 'task-123',
@@ -1088,7 +1157,7 @@ describe('muteInstance()', () => {
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
         scheduledTaskId: 'task-123',
@@ -1107,7 +1176,7 @@ describe('muteInstance()', () => {
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
         scheduledTaskId: 'task-123',
@@ -1129,7 +1198,7 @@ describe('unmuteInstance()', () => {
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
         scheduledTaskId: 'task-123',
@@ -1157,7 +1226,7 @@ describe('unmuteInstance()', () => {
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
         scheduledTaskId: 'task-123',
@@ -1176,7 +1245,7 @@ describe('unmuteInstance()', () => {
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
         scheduledTaskId: 'task-123',
@@ -1199,7 +1268,7 @@ describe('get()', () => {
       type: 'alert',
       attributes: {
         alertTypeId: '123',
-        interval: '10s',
+        schedule: { interval: '10s' },
         params: {
           bar: true,
         },
@@ -1234,11 +1303,15 @@ describe('get()', () => {
           },
         ],
         "alertTypeId": "123",
+        "createdAt": 2019-02-12T21:01:22.479Z,
         "id": "1",
-        "interval": "10s",
         "params": Object {
           "bar": true,
         },
+        "schedule": Object {
+          "interval": "10s",
+        },
+        "updatedAt": 2019-02-12T21:01:22.479Z,
       }
     `);
     expect(savedObjectsClient.get).toHaveBeenCalledTimes(1);
@@ -1257,7 +1330,7 @@ describe('get()', () => {
       type: 'alert',
       attributes: {
         alertTypeId: '123',
-        interval: '10s',
+        schedule: { interval: '10s' },
         params: {
           bar: true,
         },
@@ -1292,7 +1365,7 @@ describe('find()', () => {
           type: 'alert',
           attributes: {
             alertTypeId: '123',
-            interval: '10s',
+            schedule: { interval: '10s' },
             params: {
               bar: true,
             },
@@ -1331,11 +1404,15 @@ describe('find()', () => {
               },
             ],
             "alertTypeId": "123",
+            "createdAt": 2019-02-12T21:01:22.479Z,
             "id": "1",
-            "interval": "10s",
             "params": Object {
               "bar": true,
             },
+            "schedule": Object {
+              "interval": "10s",
+            },
+            "updatedAt": 2019-02-12T21:01:22.479Z,
           },
         ],
         "page": 1,
@@ -1357,12 +1434,12 @@ describe('find()', () => {
 describe('delete()', () => {
   test('successfully removes an alert', async () => {
     const alertsClient = new AlertsClient(alertsClientParams);
-    savedObjectsClient.get.mockResolvedValueOnce({
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
       id: '1',
       type: 'alert',
       attributes: {
         alertTypeId: '123',
-        interval: '10s',
+        schedule: { interval: '10s' },
         params: {
           bar: true,
         },
@@ -1404,6 +1481,48 @@ describe('delete()', () => {
                                                                                                                   ]
                                                                             `);
   });
+
+  test('swallows error when invalidate API key throws', async () => {
+    const alertsClient = new AlertsClient(alertsClientParams);
+    alertsClientParams.invalidateAPIKey.mockRejectedValueOnce(new Error('Fail'));
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        alertTypeId: '123',
+        schedule: { interval: '10s' },
+        params: {
+          bar: true,
+        },
+        apiKey: Buffer.from('123:abc').toString('base64'),
+        scheduledTaskId: 'task-123',
+        actions: [
+          {
+            group: 'default',
+            actionRef: 'action_0',
+            params: {
+              foo: true,
+            },
+          },
+        ],
+      },
+      references: [
+        {
+          name: 'action_0',
+          type: 'action',
+          id: '1',
+        },
+      ],
+    });
+    savedObjectsClient.delete.mockResolvedValueOnce({
+      success: true,
+    });
+
+    await alertsClient.delete({ id: '1' });
+    expect(alertsClientParams.logger.error).toHaveBeenCalledWith(
+      'Failed to invalidate API Key: Fail'
+    );
+  });
 });
 
 describe('update()', () => {
@@ -1415,7 +1534,7 @@ describe('update()', () => {
       actionGroups: ['default'],
       async executor() {},
     });
-    savedObjectsClient.get.mockResolvedValueOnce({
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
       id: '1',
       type: 'alert',
       attributes: {
@@ -1443,7 +1562,7 @@ describe('update()', () => {
       type: 'alert',
       attributes: {
         enabled: true,
-        interval: '10s',
+        schedule: { interval: '10s' },
         params: {
           bar: true,
         },
@@ -1458,7 +1577,9 @@ describe('update()', () => {
           },
         ],
         scheduledTaskId: 'task-123',
+        createdAt: new Date().toISOString(),
       },
+      updated_at: new Date().toISOString(),
       references: [
         {
           name: 'action_0',
@@ -1470,7 +1591,7 @@ describe('update()', () => {
     const result = await alertsClient.update({
       id: '1',
       data: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         name: 'abc',
         tags: ['foo'],
         params: {
@@ -1499,13 +1620,17 @@ describe('update()', () => {
             },
           },
         ],
+        "createdAt": 2019-02-12T21:01:22.479Z,
         "enabled": true,
         "id": "1",
-        "interval": "10s",
         "params": Object {
           "bar": true,
         },
+        "schedule": Object {
+          "interval": "10s",
+        },
         "scheduledTaskId": "task-123",
+        "updatedAt": 2019-02-12T21:01:22.479Z,
       }
     `);
     expect(savedObjectsClient.update).toHaveBeenCalledTimes(1);
@@ -1528,11 +1653,13 @@ describe('update()', () => {
         "apiKey": null,
         "apiKeyOwner": null,
         "enabled": true,
-        "interval": "10s",
         "name": "abc",
         "params": Object {
           "bar": true,
         },
+        "schedule": Object {
+          "interval": "10s",
+        },
         "scheduledTaskId": "task-123",
         "tags": Array [
           "foo",
@@ -1562,7 +1689,7 @@ describe('update()', () => {
       actionGroups: ['default'],
       async executor() {},
     });
-    savedObjectsClient.get.mockResolvedValueOnce({
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
       id: '1',
       type: 'alert',
       attributes: {
@@ -1598,10 +1725,11 @@ describe('update()', () => {
       type: 'alert',
       attributes: {
         enabled: true,
-        interval: '10s',
+        schedule: { interval: '10s' },
         params: {
           bar: true,
         },
+        createdAt: new Date().toISOString(),
         actions: [
           {
             group: 'default',
@@ -1630,6 +1758,7 @@ describe('update()', () => {
         ],
         scheduledTaskId: 'task-123',
       },
+      updated_at: new Date().toISOString(),
       references: [
         {
           name: 'action_0',
@@ -1651,7 +1780,7 @@ describe('update()', () => {
     const result = await alertsClient.update({
       id: '1',
       data: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         name: 'abc',
         tags: ['foo'],
         params: {
@@ -1710,13 +1839,17 @@ describe('update()', () => {
             },
           },
         ],
+        "createdAt": 2019-02-12T21:01:22.479Z,
         "enabled": true,
         "id": "1",
-        "interval": "10s",
         "params": Object {
           "bar": true,
         },
+        "schedule": Object {
+          "interval": "10s",
+        },
         "scheduledTaskId": "task-123",
+        "updatedAt": 2019-02-12T21:01:22.479Z,
       }
     `);
     expect(savedObjectsClient.bulkGet).toHaveBeenCalledWith([
@@ -1739,7 +1872,7 @@ describe('update()', () => {
       actionGroups: ['default'],
       async executor() {},
     });
-    savedObjectsClient.get.mockResolvedValueOnce({
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
       id: '1',
       type: 'alert',
       attributes: {
@@ -1763,7 +1896,7 @@ describe('update()', () => {
       ],
     });
     alertsClientParams.createAPIKey.mockResolvedValueOnce({
-      created: true,
+      apiKeysEnabled: true,
       result: { id: '123', api_key: 'abc' },
     });
     savedObjectsClient.update.mockResolvedValueOnce({
@@ -1771,10 +1904,11 @@ describe('update()', () => {
       type: 'alert',
       attributes: {
         enabled: true,
-        interval: '10s',
+        schedule: { interval: '10s' },
         params: {
           bar: true,
         },
+        createdAt: new Date().toISOString(),
         actions: [
           {
             group: 'default',
@@ -1788,6 +1922,7 @@ describe('update()', () => {
         apiKey: Buffer.from('123:abc').toString('base64'),
         scheduledTaskId: 'task-123',
       },
+      updated_at: new Date().toISOString(),
       references: [
         {
           name: 'action_0',
@@ -1799,7 +1934,7 @@ describe('update()', () => {
     const result = await alertsClient.update({
       id: '1',
       data: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         name: 'abc',
         tags: ['foo'],
         params: {
@@ -1829,13 +1964,17 @@ describe('update()', () => {
           },
         ],
         "apiKey": "MTIzOmFiYw==",
+        "createdAt": 2019-02-12T21:01:22.479Z,
         "enabled": true,
         "id": "1",
-        "interval": "10s",
         "params": Object {
           "bar": true,
         },
+        "schedule": Object {
+          "interval": "10s",
+        },
         "scheduledTaskId": "task-123",
+        "updatedAt": 2019-02-12T21:01:22.479Z,
       }
     `);
     expect(savedObjectsClient.update).toHaveBeenCalledTimes(1);
@@ -1858,11 +1997,13 @@ describe('update()', () => {
         "apiKey": "MTIzOmFiYw==",
         "apiKeyOwner": "elastic",
         "enabled": true,
-        "interval": "10s",
         "name": "abc",
         "params": Object {
           "bar": true,
         },
+        "schedule": Object {
+          "interval": "10s",
+        },
         "scheduledTaskId": "task-123",
         "tags": Array [
           "foo",
@@ -1897,7 +2038,7 @@ describe('update()', () => {
       },
       async executor() {},
     });
-    savedObjectsClient.get.mockResolvedValueOnce({
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
       id: '1',
       type: 'alert',
       attributes: {
@@ -1909,7 +2050,7 @@ describe('update()', () => {
       alertsClient.update({
         id: '1',
         data: {
-          interval: '10s',
+          schedule: { interval: '10s' },
           name: 'abc',
           tags: ['foo'],
           params: {
@@ -1930,16 +2071,325 @@ describe('update()', () => {
       `"params invalid: [param1]: expected value of type [string] but got [undefined]"`
     );
   });
+
+  it('swallows error when invalidate API key throws', async () => {
+    const alertsClient = new AlertsClient(alertsClientParams);
+    alertsClientParams.invalidateAPIKey.mockRejectedValueOnce(new Error('Fail'));
+    alertTypeRegistry.get.mockReturnValueOnce({
+      id: '123',
+      name: 'Test',
+      actionGroups: ['default'],
+      async executor() {},
+    });
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        enabled: true,
+        alertTypeId: '123',
+        scheduledTaskId: 'task-123',
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+      version: '123',
+    });
+    savedObjectsClient.bulkGet.mockResolvedValueOnce({
+      saved_objects: [
+        {
+          id: '1',
+          type: 'action',
+          attributes: {
+            actionTypeId: 'test',
+          },
+          references: [],
+        },
+      ],
+    });
+    savedObjectsClient.update.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        enabled: true,
+        schedule: { interval: '10s' },
+        params: {
+          bar: true,
+        },
+        actions: [
+          {
+            group: 'default',
+            actionRef: 'action_0',
+            actionTypeId: 'test',
+            params: {
+              foo: true,
+            },
+          },
+        ],
+        scheduledTaskId: 'task-123',
+      },
+      references: [
+        {
+          name: 'action_0',
+          type: 'action',
+          id: '1',
+        },
+      ],
+    });
+    await alertsClient.update({
+      id: '1',
+      data: {
+        schedule: { interval: '10s' },
+        name: 'abc',
+        tags: ['foo'],
+        params: {
+          bar: true,
+        },
+        actions: [
+          {
+            group: 'default',
+            id: '1',
+            params: {
+              foo: true,
+            },
+          },
+        ],
+      },
+    });
+    expect(alertsClientParams.logger.error).toHaveBeenCalledWith(
+      'Failed to invalidate API Key: Fail'
+    );
+  });
+
+  describe('updating an alert schedule', () => {
+    function mockApiCalls(
+      alertId: string,
+      taskId: string,
+      currentSchedule: IntervalSchedule,
+      updatedSchedule: IntervalSchedule
+    ) {
+      // mock return values from deps
+      alertTypeRegistry.get.mockReturnValueOnce({
+        id: '123',
+        name: 'Test',
+        actionGroups: ['default'],
+        async executor() {},
+      });
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({
+        saved_objects: [
+          {
+            id: '1',
+            type: 'action',
+            attributes: {
+              actionTypeId: 'test',
+            },
+            references: [],
+          },
+        ],
+      });
+      encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
+        id: alertId,
+        type: 'alert',
+        attributes: {
+          enabled: true,
+          alertTypeId: '123',
+          schedule: currentSchedule,
+          scheduledTaskId: 'task-123',
+        },
+        references: [],
+        version: '123',
+      });
+
+      taskManager.schedule.mockResolvedValueOnce({
+        id: taskId,
+        taskType: 'alerting:123',
+        scheduledAt: new Date(),
+        attempts: 1,
+        status: TaskStatus.Idle,
+        runAt: new Date(),
+        startedAt: null,
+        retryAt: null,
+        state: {},
+        params: {},
+        ownerId: null,
+      });
+      savedObjectsClient.update.mockResolvedValueOnce({
+        id: alertId,
+        type: 'alert',
+        attributes: {
+          enabled: true,
+          schedule: updatedSchedule,
+          actions: [
+            {
+              group: 'default',
+              actionRef: 'action_0',
+              actionTypeId: 'test',
+              params: {
+                foo: true,
+              },
+            },
+          ],
+          scheduledTaskId: taskId,
+        },
+        references: [
+          {
+            name: 'action_0',
+            type: 'action',
+            id: alertId,
+          },
+        ],
+      });
+
+      taskManager.runNow.mockReturnValueOnce(Promise.resolve({ id: alertId }));
+    }
+
+    test('updating the alert schedule should rerun the task immediately', async () => {
+      const alertId = uuid.v4();
+      const taskId = uuid.v4();
+      const alertsClient = new AlertsClient(alertsClientParams);
+
+      mockApiCalls(alertId, taskId, { interval: '60m' }, { interval: '10s' });
+
+      await alertsClient.update({
+        id: alertId,
+        data: {
+          schedule: { interval: '10s' },
+          name: 'abc',
+          tags: ['foo'],
+          params: {
+            bar: true,
+          },
+          actions: [
+            {
+              group: 'default',
+              id: '1',
+              params: {
+                foo: true,
+              },
+            },
+          ],
+        },
+      });
+
+      expect(taskManager.runNow).toHaveBeenCalledWith(taskId);
+    });
+
+    test('updating the alert without changing the schedule should not rerun the task', async () => {
+      const alertId = uuid.v4();
+      const taskId = uuid.v4();
+      const alertsClient = new AlertsClient(alertsClientParams);
+
+      mockApiCalls(alertId, taskId, { interval: '10s' }, { interval: '10s' });
+
+      await alertsClient.update({
+        id: alertId,
+        data: {
+          schedule: { interval: '10s' },
+          name: 'abc',
+          tags: ['foo'],
+          params: {
+            bar: true,
+          },
+          actions: [
+            {
+              group: 'default',
+              id: '1',
+              params: {
+                foo: true,
+              },
+            },
+          ],
+        },
+      });
+
+      expect(taskManager.runNow).not.toHaveBeenCalled();
+    });
+
+    test('updating the alert should not wait for the rerun the task to complete', async done => {
+      const alertId = uuid.v4();
+      const taskId = uuid.v4();
+      const alertsClient = new AlertsClient(alertsClientParams);
+
+      mockApiCalls(alertId, taskId, { interval: '10s' }, { interval: '30s' });
+
+      const resolveAfterAlertUpdatedCompletes = resolvable<{ id: string }>();
+      resolveAfterAlertUpdatedCompletes.then(() => done());
+
+      taskManager.runNow.mockReset();
+      taskManager.runNow.mockReturnValue(resolveAfterAlertUpdatedCompletes);
+
+      await alertsClient.update({
+        id: alertId,
+        data: {
+          schedule: { interval: '10s' },
+          name: 'abc',
+          tags: ['foo'],
+          params: {
+            bar: true,
+          },
+          actions: [
+            {
+              group: 'default',
+              id: '1',
+              params: {
+                foo: true,
+              },
+            },
+          ],
+        },
+      });
+
+      expect(taskManager.runNow).toHaveBeenCalled();
+
+      resolveAfterAlertUpdatedCompletes.resolve({ id: alertId });
+    });
+
+    test('logs when the rerun of an alerts underlying task fails', async () => {
+      const alertId = uuid.v4();
+      const taskId = uuid.v4();
+      const alertsClient = new AlertsClient(alertsClientParams);
+
+      mockApiCalls(alertId, taskId, { interval: '10s' }, { interval: '30s' });
+
+      taskManager.runNow.mockReset();
+      taskManager.runNow.mockRejectedValue(new Error('Failed to run alert'));
+
+      await alertsClient.update({
+        id: alertId,
+        data: {
+          schedule: { interval: '10s' },
+          name: 'abc',
+          tags: ['foo'],
+          params: {
+            bar: true,
+          },
+          actions: [
+            {
+              group: 'default',
+              id: '1',
+              params: {
+                foo: true,
+              },
+            },
+          ],
+        },
+      });
+
+      expect(taskManager.runNow).toHaveBeenCalled();
+
+      expect(alertsClientParams.logger.error).toHaveBeenCalledWith(
+        `Alert update failed to run its underlying task. TaskManager runNow failed with Error: Failed to run alert`
+      );
+    });
+  });
 });
 
 describe('updateApiKey()', () => {
   test('updates the API key for the alert', async () => {
     const alertsClient = new AlertsClient(alertsClientParams);
-    savedObjectsClient.get.mockResolvedValueOnce({
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
       id: '1',
       type: 'alert',
       attributes: {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
       },
@@ -1947,7 +2397,7 @@ describe('updateApiKey()', () => {
       references: [],
     });
     alertsClientParams.createAPIKey.mockResolvedValueOnce({
-      created: true,
+      apiKeysEnabled: true,
       result: { id: '123', api_key: 'abc' },
     });
 
@@ -1956,7 +2406,7 @@ describe('updateApiKey()', () => {
       'alert',
       '1',
       {
-        interval: '10s',
+        schedule: { interval: '10s' },
         alertTypeId: '2',
         enabled: true,
         apiKey: Buffer.from('123:abc').toString('base64'),
@@ -1966,4 +2416,30 @@ describe('updateApiKey()', () => {
       { version: '123' }
     );
   });
+
+  test('swallows error when invalidate API key throws', async () => {
+    const alertsClient = new AlertsClient(alertsClientParams);
+    alertsClientParams.invalidateAPIKey.mockRejectedValue(new Error('Fail'));
+    encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        schedule: { interval: '10s' },
+        alertTypeId: '2',
+        enabled: true,
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      version: '123',
+      references: [],
+    });
+    alertsClientParams.createAPIKey.mockResolvedValueOnce({
+      apiKeysEnabled: true,
+      result: { id: '123', api_key: 'abc' },
+    });
+
+    await alertsClient.updateApiKey({ id: '1' });
+    expect(alertsClientParams.logger.error).toHaveBeenCalledWith(
+      'Failed to invalidate API Key: Fail'
+    );
+  });
 });
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
index 27fda9871e685..33a6b716e9b8a 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
@@ -5,32 +5,51 @@
  */
 
 import Boom from 'boom';
-import { omit } from 'lodash';
+import { omit, isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { Logger, SavedObjectsClientContract, SavedObjectReference } from 'src/core/server';
-import { Alert, RawAlert, AlertTypeRegistry, AlertAction, AlertType } from './types';
+import {
+  Logger,
+  SavedObjectsClientContract,
+  SavedObjectReference,
+  SavedObject,
+} from 'src/core/server';
+import {
+  Alert,
+  PartialAlert,
+  RawAlert,
+  AlertTypeRegistry,
+  AlertAction,
+  AlertType,
+  IntervalSchedule,
+} from './types';
 import { TaskManagerStartContract } from './shim';
 import { validateAlertTypeParams } from './lib';
-import { CreateAPIKeyResult as SecurityPluginCreateAPIKeyResult } from '../../../../plugins/security/server';
+import {
+  InvalidateAPIKeyParams,
+  CreateAPIKeyResult as SecurityPluginCreateAPIKeyResult,
+  InvalidateAPIKeyResult as SecurityPluginInvalidateAPIKeyResult,
+} from '../../../../plugins/security/server';
+import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../plugins/encrypted_saved_objects/server';
 
-interface FailedCreateAPIKeyResult {
-  created: false;
-}
-interface SuccessCreateAPIKeyResult {
-  created: true;
-  result: SecurityPluginCreateAPIKeyResult;
-}
-export type CreateAPIKeyResult = FailedCreateAPIKeyResult | SuccessCreateAPIKeyResult;
 type NormalizedAlertAction = Omit<AlertAction, 'actionTypeId'>;
+export type CreateAPIKeyResult =
+  | { apiKeysEnabled: false }
+  | { apiKeysEnabled: true; result: SecurityPluginCreateAPIKeyResult };
+export type InvalidateAPIKeyResult =
+  | { apiKeysEnabled: false }
+  | { apiKeysEnabled: true; result: SecurityPluginInvalidateAPIKeyResult };
 
 interface ConstructorOptions {
   logger: Logger;
   taskManager: TaskManagerStartContract;
   savedObjectsClient: SavedObjectsClientContract;
   alertTypeRegistry: AlertTypeRegistry;
+  encryptedSavedObjectsPlugin: EncryptedSavedObjectsStartContract;
   spaceId?: string;
+  namespace?: string;
   getUserName: () => Promise<string | null>;
   createAPIKey: () => Promise<CreateAPIKeyResult>;
+  invalidateAPIKey: (params: InvalidateAPIKeyParams) => Promise<InvalidateAPIKeyResult>;
 }
 
 export interface FindOptions {
@@ -51,26 +70,26 @@ export interface FindOptions {
   };
 }
 
-interface FindResult {
+export interface FindResult {
   page: number;
   perPage: number;
   total: number;
-  data: object[];
+  data: Alert[];
 }
 
 interface CreateOptions {
-  data: Pick<
+  data: Omit<
     Alert,
-    Exclude<
-      keyof Alert,
-      | 'createdBy'
-      | 'updatedBy'
-      | 'apiKey'
-      | 'apiKeyOwner'
-      | 'muteAll'
-      | 'mutedInstanceIds'
-      | 'actions'
-    >
+    | 'id'
+    | 'createdBy'
+    | 'updatedBy'
+    | 'createdAt'
+    | 'updatedAt'
+    | 'apiKey'
+    | 'apiKeyOwner'
+    | 'muteAll'
+    | 'mutedInstanceIds'
+    | 'actions'
   > & { actions: NormalizedAlertAction[] };
   options?: {
     migrationVersion?: Record<string, string>;
@@ -82,7 +101,7 @@ interface UpdateOptions {
   data: {
     name: string;
     tags: string[];
-    interval: string;
+    schedule: IntervalSchedule;
     actions: NormalizedAlertAction[];
     params: Record<string, any>;
   };
@@ -92,10 +111,15 @@ export class AlertsClient {
   private readonly logger: Logger;
   private readonly getUserName: () => Promise<string | null>;
   private readonly spaceId?: string;
+  private readonly namespace?: string;
   private readonly taskManager: TaskManagerStartContract;
   private readonly savedObjectsClient: SavedObjectsClientContract;
   private readonly alertTypeRegistry: AlertTypeRegistry;
   private readonly createAPIKey: () => Promise<CreateAPIKeyResult>;
+  private readonly invalidateAPIKey: (
+    params: InvalidateAPIKeyParams
+  ) => Promise<InvalidateAPIKeyResult>;
+  encryptedSavedObjectsPlugin: EncryptedSavedObjectsStartContract;
 
   constructor({
     alertTypeRegistry,
@@ -103,23 +127,28 @@ export class AlertsClient {
     taskManager,
     logger,
     spaceId,
+    namespace,
     getUserName,
     createAPIKey,
+    invalidateAPIKey,
+    encryptedSavedObjectsPlugin,
   }: ConstructorOptions) {
     this.logger = logger;
     this.getUserName = getUserName;
     this.spaceId = spaceId;
+    this.namespace = namespace;
     this.taskManager = taskManager;
     this.alertTypeRegistry = alertTypeRegistry;
     this.savedObjectsClient = savedObjectsClient;
     this.createAPIKey = createAPIKey;
+    this.invalidateAPIKey = invalidateAPIKey;
+    this.encryptedSavedObjectsPlugin = encryptedSavedObjectsPlugin;
   }
 
-  public async create({ data, options }: CreateOptions) {
+  public async create({ data, options }: CreateOptions): Promise<Alert> {
     // Throws an error if alert type isn't registered
     const alertType = this.alertTypeRegistry.get(data.alertTypeId);
     const validatedAlertTypeParams = validateAlertTypeParams(alertType, data.params);
-    const apiKey = await this.createAPIKey();
     const username = await this.getUserName();
 
     this.validateActions(alertType, data.actions);
@@ -127,13 +156,11 @@ export class AlertsClient {
     const { references, actions } = await this.denormalizeActions(data.actions);
     const rawAlert: RawAlert = {
       ...data,
+      ...this.apiKeyAsAlertAttributes(await this.createAPIKey(), username),
       actions,
       createdBy: username,
       updatedBy: username,
-      apiKeyOwner: apiKey.created && username ? username : undefined,
-      apiKey: apiKey.created
-        ? Buffer.from(`${apiKey.result.id}:${apiKey.result.api_key}`).toString('base64')
-        : undefined,
+      createdAt: new Date().toISOString(),
       params: validatedAlertTypeParams,
       muteAll: false,
       mutedInstanceIds: [],
@@ -145,11 +172,7 @@ export class AlertsClient {
     if (data.enabled) {
       let scheduledTask;
       try {
-        scheduledTask = await this.scheduleAlert(
-          createdAlert.id,
-          rawAlert.alertTypeId,
-          rawAlert.interval
-        );
+        scheduledTask = await this.scheduleAlert(createdAlert.id, rawAlert.alertTypeId);
       } catch (e) {
         // Cleanup data, something went wrong scheduling the task
         try {
@@ -167,45 +190,77 @@ export class AlertsClient {
       });
       createdAlert.attributes.scheduledTaskId = scheduledTask.id;
     }
-    return this.getAlertFromRaw(createdAlert.id, createdAlert.attributes, references);
+    return this.getAlertFromRaw(
+      createdAlert.id,
+      createdAlert.attributes,
+      createdAlert.updated_at,
+      references
+    );
   }
 
-  public async get({ id }: { id: string }) {
+  public async get({ id }: { id: string }): Promise<Alert> {
     const result = await this.savedObjectsClient.get('alert', id);
-    return this.getAlertFromRaw(result.id, result.attributes, result.references);
+    return this.getAlertFromRaw(result.id, result.attributes, result.updated_at, result.references);
   }
 
   public async find({ options = {} }: FindOptions = {}): Promise<FindResult> {
-    const results = await this.savedObjectsClient.find({
+    const {
+      page,
+      per_page: perPage,
+      total,
+      saved_objects: data,
+    } = await this.savedObjectsClient.find<RawAlert>({
       ...options,
       type: 'alert',
     });
 
-    const data = results.saved_objects.map(result =>
-      this.getAlertFromRaw(result.id, result.attributes, result.references)
-    );
-
     return {
-      page: results.page,
-      perPage: results.per_page,
-      total: results.total,
-      data,
+      page,
+      perPage,
+      total,
+      data: data.map(({ id, attributes, updated_at, references }) =>
+        this.getAlertFromRaw(id, attributes, updated_at, references)
+      ),
     };
   }
 
   public async delete({ id }: { id: string }) {
-    const alertSavedObject = await this.savedObjectsClient.get('alert', id);
+    const decryptedAlertSavedObject = await this.encryptedSavedObjectsPlugin.getDecryptedAsInternalUser<
+      RawAlert
+    >('alert', id, { namespace: this.namespace });
     const removeResult = await this.savedObjectsClient.delete('alert', id);
-    if (alertSavedObject.attributes.scheduledTaskId) {
-      await this.taskManager.remove(alertSavedObject.attributes.scheduledTaskId);
+    if (decryptedAlertSavedObject.attributes.scheduledTaskId) {
+      await this.taskManager.remove(decryptedAlertSavedObject.attributes.scheduledTaskId);
     }
+    await this.invalidateApiKey({ apiKey: decryptedAlertSavedObject.attributes.apiKey });
     return removeResult;
   }
 
-  public async update({ id, data }: UpdateOptions) {
-    const { attributes, version } = await this.savedObjectsClient.get('alert', id);
+  public async update({ id, data }: UpdateOptions): Promise<PartialAlert> {
+    const decryptedAlertSavedObject = await this.encryptedSavedObjectsPlugin.getDecryptedAsInternalUser<
+      RawAlert
+    >('alert', id, { namespace: this.namespace });
+    const updateResult = await this.updateAlert({ id, data }, decryptedAlertSavedObject);
+
+    if (
+      updateResult.scheduledTaskId &&
+      !isEqual(decryptedAlertSavedObject.attributes.schedule, updateResult.schedule)
+    ) {
+      this.taskManager.runNow(updateResult.scheduledTaskId).catch((err: Error) => {
+        this.logger.error(
+          `Alert update failed to run its underlying task. TaskManager runNow failed with Error: ${err.message}`
+        );
+      });
+    }
+
+    return updateResult;
+  }
+
+  private async updateAlert(
+    { id, data }: UpdateOptions,
+    { attributes, version }: SavedObject<RawAlert>
+  ): Promise<PartialAlert> {
     const alertType = this.alertTypeRegistry.get(attributes.alertTypeId);
-    const apiKey = await this.createAPIKey();
 
     // Validate
     const validatedAlertTypeParams = validateAlertTypeParams(alertType, data.params);
@@ -213,57 +268,101 @@ export class AlertsClient {
 
     const { actions, references } = await this.denormalizeActions(data.actions);
     const username = await this.getUserName();
-    const updatedObject = await this.savedObjectsClient.update(
+    const apiKeyAttributes = this.apiKeyAsAlertAttributes(await this.createAPIKey(), username);
+
+    const updatedObject = await this.savedObjectsClient.update<RawAlert>(
       'alert',
       id,
       {
         ...attributes,
         ...data,
+        ...apiKeyAttributes,
         params: validatedAlertTypeParams,
         actions,
         updatedBy: username,
-        apiKeyOwner: apiKey.created ? username : null,
-        apiKey: apiKey.created
-          ? Buffer.from(`${apiKey.result.id}:${apiKey.result.api_key}`).toString('base64')
-          : null,
       },
       {
         version,
         references,
       }
     );
-    return this.getAlertFromRaw(id, updatedObject.attributes, updatedObject.references);
+
+    await this.invalidateApiKey({ apiKey: attributes.apiKey });
+
+    return this.getPartialAlertFromRaw(
+      id,
+      updatedObject.attributes,
+      updatedObject.updated_at,
+      updatedObject.references
+    );
+  }
+
+  private apiKeyAsAlertAttributes(
+    apiKey: CreateAPIKeyResult,
+    username: string | null
+  ): Pick<RawAlert, 'apiKey' | 'apiKeyOwner'> {
+    return apiKey.apiKeysEnabled
+      ? {
+          apiKeyOwner: username,
+          apiKey: Buffer.from(`${apiKey.result.id}:${apiKey.result.api_key}`).toString('base64'),
+        }
+      : {
+          apiKeyOwner: null,
+          apiKey: null,
+        };
   }
 
   public async updateApiKey({ id }: { id: string }) {
-    const { version, attributes } = await this.savedObjectsClient.get('alert', id);
+    const {
+      version,
+      attributes,
+    } = await this.encryptedSavedObjectsPlugin.getDecryptedAsInternalUser<RawAlert>('alert', id, {
+      namespace: this.namespace,
+    });
 
-    const apiKey = await this.createAPIKey();
     const username = await this.getUserName();
     await this.savedObjectsClient.update(
       'alert',
       id,
       {
         ...attributes,
+        ...this.apiKeyAsAlertAttributes(await this.createAPIKey(), username),
         updatedBy: username,
-        apiKeyOwner: apiKey.created ? username : null,
-        apiKey: apiKey.created
-          ? Buffer.from(`${apiKey.result.id}:${apiKey.result.api_key}`).toString('base64')
-          : null,
       },
       { version }
     );
+
+    await this.invalidateApiKey({ apiKey: attributes.apiKey });
+  }
+
+  private async invalidateApiKey({ apiKey }: { apiKey: string | null }): Promise<void> {
+    if (!apiKey) {
+      return;
+    }
+
+    try {
+      const apiKeyId = Buffer.from(apiKey, 'base64')
+        .toString()
+        .split(':')[0];
+      const response = await this.invalidateAPIKey({ id: apiKeyId });
+      if (response.apiKeysEnabled === true && response.result.error_count > 0) {
+        this.logger.error(`Failed to invalidate API Key [id="${apiKeyId}"]`);
+      }
+    } catch (e) {
+      this.logger.error(`Failed to invalidate API Key: ${e.message}`);
+    }
   }
 
   public async enable({ id }: { id: string }) {
-    const { attributes, version } = await this.savedObjectsClient.get('alert', id);
+    const {
+      version,
+      attributes,
+    } = await this.encryptedSavedObjectsPlugin.getDecryptedAsInternalUser<RawAlert>('alert', id, {
+      namespace: this.namespace,
+    });
+
     if (attributes.enabled === false) {
-      const apiKey = await this.createAPIKey();
-      const scheduledTask = await this.scheduleAlert(
-        id,
-        attributes.alertTypeId,
-        attributes.interval
-      );
+      const scheduledTask = await this.scheduleAlert(id, attributes.alertTypeId);
       const username = await this.getUserName();
       await this.savedObjectsClient.update(
         'alert',
@@ -271,15 +370,14 @@ export class AlertsClient {
         {
           ...attributes,
           enabled: true,
+          ...this.apiKeyAsAlertAttributes(await this.createAPIKey(), username),
           updatedBy: username,
-          apiKeyOwner: apiKey.created ? username : null,
+
           scheduledTaskId: scheduledTask.id,
-          apiKey: apiKey.created
-            ? Buffer.from(`${apiKey.result.id}:${apiKey.result.api_key}`).toString('base64')
-            : null,
         },
         { version }
       );
+      await this.invalidateApiKey({ apiKey: attributes.apiKey });
     }
   }
 
@@ -357,6 +455,7 @@ export class AlertsClient {
         alertId,
         {
           updatedBy: await this.getUserName(),
+
           mutedInstanceIds: mutedInstanceIds.filter((id: string) => id !== alertInstanceId),
         },
         { version }
@@ -364,7 +463,7 @@ export class AlertsClient {
     }
   }
 
-  private async scheduleAlert(id: string, alertTypeId: string, interval: string) {
+  private async scheduleAlert(id: string, alertTypeId: string) {
     return await this.taskManager.schedule({
       taskType: `alerting:${alertTypeId}`,
       params: {
@@ -397,21 +496,34 @@ export class AlertsClient {
   }
 
   private getAlertFromRaw(
+    id: string,
+    rawAlert: RawAlert,
+    updatedAt: SavedObject['updated_at'],
+    references: SavedObjectReference[] | undefined
+  ): Alert {
+    // In order to support the partial update API of Saved Objects we have to support
+    // partial updates of an Alert, but when we receive an actual RawAlert, it is safe
+    // to cast the result to an Alert
+    return this.getPartialAlertFromRaw(id, rawAlert, updatedAt, references) as Alert;
+  }
+
+  private getPartialAlertFromRaw(
     id: string,
     rawAlert: Partial<RawAlert>,
+    updatedAt: SavedObject['updated_at'],
     references: SavedObjectReference[] | undefined
-  ) {
-    if (!rawAlert.actions) {
-      return {
-        id,
-        ...rawAlert,
-      };
-    }
-    const actions = this.injectReferencesIntoActions(rawAlert.actions, references || []);
+  ): PartialAlert {
     return {
       id,
       ...rawAlert,
-      actions,
+      // we currently only support the Interval Schedule type
+      // Once we support additional types, this type signature will likely change
+      schedule: rawAlert.schedule as IntervalSchedule,
+      updatedAt: updatedAt ? new Date(updatedAt) : new Date(rawAlert.createdAt!),
+      createdAt: new Date(rawAlert.createdAt!),
+      actions: rawAlert.actions
+        ? this.injectReferencesIntoActions(rawAlert.actions, references || [])
+        : [],
     };
   }
 
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client_factory.test.ts b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.test.ts
new file mode 100644
index 0000000000000..519001d07e089
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.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 { Request } from 'hapi';
+import { AlertsClientFactory, ConstructorOpts } from './alerts_client_factory';
+import { alertTypeRegistryMock } from './alert_type_registry.mock';
+import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
+import { KibanaRequest } from '../../../../../src/core/server';
+import { loggingServiceMock } from '../../../../../src/core/server/mocks';
+import { encryptedSavedObjectsMock } from '../../../../plugins/encrypted_saved_objects/server/mocks';
+
+jest.mock('./alerts_client');
+
+const savedObjectsClient = jest.fn();
+const securityPluginSetup = {
+  authc: {
+    createAPIKey: jest.fn(),
+    getCurrentUser: jest.fn(),
+  },
+};
+const alertsClientFactoryParams: jest.Mocked<ConstructorOpts> = {
+  logger: loggingServiceMock.create().get(),
+  taskManager: taskManagerMock.create(),
+  alertTypeRegistry: alertTypeRegistryMock.create(),
+  getSpaceId: jest.fn(),
+  spaceIdToNamespace: jest.fn(),
+  encryptedSavedObjectsPlugin: encryptedSavedObjectsMock.createStart(),
+};
+const fakeRequest: Request = {
+  headers: {},
+  getBasePath: () => '',
+  path: '/',
+  route: { settings: {} },
+  url: {
+    href: '/',
+  },
+  raw: {
+    req: {
+      url: '/',
+    },
+  },
+  getSavedObjectsClient: () => savedObjectsClient,
+} as any;
+
+beforeEach(() => {
+  jest.resetAllMocks();
+  alertsClientFactoryParams.getSpaceId.mockReturnValue('default');
+  alertsClientFactoryParams.spaceIdToNamespace.mockReturnValue('default');
+});
+
+test('creates an alerts client with proper constructor arguments', async () => {
+  const factory = new AlertsClientFactory(alertsClientFactoryParams);
+  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
+
+  expect(jest.requireMock('./alerts_client').AlertsClient).toHaveBeenCalledWith({
+    savedObjectsClient,
+    logger: alertsClientFactoryParams.logger,
+    taskManager: alertsClientFactoryParams.taskManager,
+    alertTypeRegistry: alertsClientFactoryParams.alertTypeRegistry,
+    spaceId: 'default',
+    namespace: 'default',
+    getUserName: expect.any(Function),
+    createAPIKey: expect.any(Function),
+    invalidateAPIKey: expect.any(Function),
+    encryptedSavedObjectsPlugin: alertsClientFactoryParams.encryptedSavedObjectsPlugin,
+  });
+});
+
+test('getUserName() returns null when security is disabled', async () => {
+  const factory = new AlertsClientFactory(alertsClientFactoryParams);
+  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
+
+  const userNameResult = await constructorCall.getUserName();
+  expect(userNameResult).toEqual(null);
+});
+
+test('getUserName() returns a name when security is enabled', async () => {
+  const factory = new AlertsClientFactory({
+    ...alertsClientFactoryParams,
+    securityPluginSetup: securityPluginSetup as any,
+  });
+  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
+
+  securityPluginSetup.authc.getCurrentUser.mockResolvedValueOnce({ username: 'bob' });
+  const userNameResult = await constructorCall.getUserName();
+  expect(userNameResult).toEqual('bob');
+});
+
+test('createAPIKey() returns { apiKeysEnabled: false } when security is disabled', async () => {
+  const factory = new AlertsClientFactory(alertsClientFactoryParams);
+  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
+
+  const createAPIKeyResult = await constructorCall.createAPIKey();
+  expect(createAPIKeyResult).toEqual({ apiKeysEnabled: false });
+});
+
+test('createAPIKey() returns { apiKeysEnabled: false } when security is enabled but ES security is disabled', async () => {
+  const factory = new AlertsClientFactory(alertsClientFactoryParams);
+  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
+
+  securityPluginSetup.authc.createAPIKey.mockResolvedValueOnce(null);
+  const createAPIKeyResult = await constructorCall.createAPIKey();
+  expect(createAPIKeyResult).toEqual({ apiKeysEnabled: false });
+});
+
+test('createAPIKey() returns an API key when security is enabled', async () => {
+  const factory = new AlertsClientFactory({
+    ...alertsClientFactoryParams,
+    securityPluginSetup: securityPluginSetup as any,
+  });
+  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
+
+  securityPluginSetup.authc.createAPIKey.mockResolvedValueOnce({ api_key: '123', id: 'abc' });
+  const createAPIKeyResult = await constructorCall.createAPIKey();
+  expect(createAPIKeyResult).toEqual({
+    apiKeysEnabled: true,
+    result: { api_key: '123', id: 'abc' },
+  });
+});
+
+test('createAPIKey() throws when security plugin createAPIKey throws an error', async () => {
+  const factory = new AlertsClientFactory({
+    ...alertsClientFactoryParams,
+    securityPluginSetup: securityPluginSetup as any,
+  });
+  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
+  const constructorCall = jest.requireMock('./alerts_client').AlertsClient.mock.calls[0][0];
+
+  securityPluginSetup.authc.createAPIKey.mockRejectedValueOnce(new Error('TLS disabled'));
+  await expect(constructorCall.createAPIKey()).rejects.toThrowErrorMatchingInlineSnapshot(
+    `"TLS disabled"`
+  );
+});
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client_factory.ts b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.ts
new file mode 100644
index 0000000000000..94a396fbaa806
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client_factory.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Hapi from 'hapi';
+import uuid from 'uuid';
+import { AlertsClient } from './alerts_client';
+import { AlertTypeRegistry, SpaceIdToNamespaceFunction } from './types';
+import { SecurityPluginStartContract, TaskManagerStartContract } from './shim';
+import { KibanaRequest, Logger } from '../../../../../src/core/server';
+import { InvalidateAPIKeyParams } from '../../../../plugins/security/server';
+import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../plugins/encrypted_saved_objects/server';
+
+export interface ConstructorOpts {
+  logger: Logger;
+  taskManager: TaskManagerStartContract;
+  alertTypeRegistry: AlertTypeRegistry;
+  securityPluginSetup?: SecurityPluginStartContract;
+  getSpaceId: (request: Hapi.Request) => string | undefined;
+  spaceIdToNamespace: SpaceIdToNamespaceFunction;
+  encryptedSavedObjectsPlugin: EncryptedSavedObjectsStartContract;
+}
+
+export class AlertsClientFactory {
+  private readonly logger: Logger;
+  private readonly taskManager: TaskManagerStartContract;
+  private readonly alertTypeRegistry: AlertTypeRegistry;
+  private readonly securityPluginSetup?: SecurityPluginStartContract;
+  private readonly getSpaceId: (request: Hapi.Request) => string | undefined;
+  private readonly spaceIdToNamespace: SpaceIdToNamespaceFunction;
+  private readonly encryptedSavedObjectsPlugin: EncryptedSavedObjectsStartContract;
+
+  constructor(options: ConstructorOpts) {
+    this.logger = options.logger;
+    this.getSpaceId = options.getSpaceId;
+    this.taskManager = options.taskManager;
+    this.alertTypeRegistry = options.alertTypeRegistry;
+    this.securityPluginSetup = options.securityPluginSetup;
+    this.spaceIdToNamespace = options.spaceIdToNamespace;
+    this.encryptedSavedObjectsPlugin = options.encryptedSavedObjectsPlugin;
+  }
+
+  public create(request: KibanaRequest, legacyRequest: Hapi.Request): AlertsClient {
+    const { securityPluginSetup } = this;
+    const spaceId = this.getSpaceId(legacyRequest);
+    return new AlertsClient({
+      spaceId,
+      logger: this.logger,
+      taskManager: this.taskManager,
+      alertTypeRegistry: this.alertTypeRegistry,
+      savedObjectsClient: legacyRequest.getSavedObjectsClient(),
+      namespace: this.spaceIdToNamespace(spaceId),
+      encryptedSavedObjectsPlugin: this.encryptedSavedObjectsPlugin,
+      async getUserName() {
+        if (!securityPluginSetup) {
+          return null;
+        }
+        const user = await securityPluginSetup.authc.getCurrentUser(request);
+        return user ? user.username : null;
+      },
+      async createAPIKey() {
+        if (!securityPluginSetup) {
+          return { apiKeysEnabled: false };
+        }
+        const createAPIKeyResult = await securityPluginSetup.authc.createAPIKey(request, {
+          name: `source: alerting, generated uuid: "${uuid.v4()}"`,
+          role_descriptors: {},
+        });
+        if (!createAPIKeyResult) {
+          return { apiKeysEnabled: false };
+        }
+        return {
+          apiKeysEnabled: true,
+          result: createAPIKeyResult,
+        };
+      },
+      async invalidateAPIKey(params: InvalidateAPIKeyParams) {
+        if (!securityPluginSetup) {
+          return { apiKeysEnabled: false };
+        }
+        const invalidateAPIKeyResult = await securityPluginSetup.authc.invalidateAPIKey(
+          request,
+          params
+        );
+        // Null when Elasticsearch security is disabled
+        if (!invalidateAPIKeyResult) {
+          return { apiKeysEnabled: false };
+        }
+        return {
+          apiKeysEnabled: true,
+          result: invalidateAPIKeyResult,
+        };
+      },
+    });
+  }
+}
diff --git a/x-pack/legacy/plugins/alerting/server/constants/plugin.ts b/x-pack/legacy/plugins/alerting/server/constants/plugin.ts
new file mode 100644
index 0000000000000..e3435b09829c6
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/constants/plugin.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 { LICENSE_TYPE_BASIC, LicenseType } from '../../../../common/constants';
+
+export const PLUGIN = {
+  ID: 'alerting',
+  MINIMUM_LICENSE_REQUIRED: LICENSE_TYPE_BASIC as LicenseType, // TODO: supposed to be changed up on requirements
+  getI18nName: (i18n: any): string =>
+    i18n.translate('xpack.alerting.appName', {
+      defaultMessage: 'Alerting',
+    }),
+};
diff --git a/x-pack/legacy/plugins/alerting/server/extend_route_with_license_check.test.ts b/x-pack/legacy/plugins/alerting/server/extend_route_with_license_check.test.ts
new file mode 100644
index 0000000000000..05c8424881625
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/extend_route_with_license_check.test.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 { extendRouteWithLicenseCheck } from './extend_route_with_license_check';
+import { LicenseState } from './lib/license_state';
+jest.mock('./lib/license_state', () => ({
+  verifyApiAccessFactory: () => {},
+}));
+
+describe('extendRouteWithLicenseCheck', () => {
+  describe('#actionsextendRouteWithLicenseCheck', () => {
+    let licenseState: jest.Mocked<LicenseState>;
+
+    test('extends route object with license, if config property already exists', () => {
+      const newRoute = extendRouteWithLicenseCheck(
+        { config: { someTestProperty: 'test' } },
+        licenseState
+      );
+      expect(newRoute.config.pre.length > 0);
+    });
+    test('extends route object with license check under options.pre', () => {
+      const newRoute = extendRouteWithLicenseCheck(
+        { options: { someProperty: 'test' } },
+        licenseState
+      );
+      expect(newRoute.options.pre.length > 0);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/alerting/server/extend_route_with_license_check.ts b/x-pack/legacy/plugins/alerting/server/extend_route_with_license_check.ts
new file mode 100644
index 0000000000000..f39dc125071b4
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/extend_route_with_license_check.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { LicenseState, verifyApiAccessFactory } from './lib/license_state';
+
+export function extendRouteWithLicenseCheck(route: any, licenseState: LicenseState) {
+  const verifyApiAccessPreRouting = verifyApiAccessFactory(licenseState);
+
+  const key = route.options ? 'options' : 'config';
+  return {
+    ...route,
+    [key]: {
+      ...route[key],
+      pre: [verifyApiAccessPreRouting],
+    },
+  };
+}
diff --git a/x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.test.ts b/x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.test.ts
deleted file mode 100644
index a465aebc8bd86..0000000000000
--- a/x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.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 { Request } from 'hapi';
-import { AlertsClientFactory, ConstructorOpts } from './alerts_client_factory';
-import { alertTypeRegistryMock } from '../alert_type_registry.mock';
-import { taskManagerMock } from '../../../task_manager/task_manager.mock';
-import { KibanaRequest } from '../../../../../../src/core/server';
-import { loggingServiceMock } from '../../../../../../src/core/server/mocks';
-
-jest.mock('../alerts_client');
-
-const savedObjectsClient = jest.fn();
-const securityPluginSetup = {
-  authc: {
-    createAPIKey: jest.fn(),
-    getCurrentUser: jest.fn(),
-  },
-};
-const alertsClientFactoryParams: jest.Mocked<ConstructorOpts> = {
-  logger: loggingServiceMock.create().get(),
-  taskManager: taskManagerMock.create(),
-  alertTypeRegistry: alertTypeRegistryMock.create(),
-  getSpaceId: jest.fn(),
-};
-const fakeRequest: Request = {
-  headers: {},
-  getBasePath: () => '',
-  path: '/',
-  route: { settings: {} },
-  url: {
-    href: '/',
-  },
-  raw: {
-    req: {
-      url: '/',
-    },
-  },
-  getSavedObjectsClient: () => savedObjectsClient,
-} as any;
-
-beforeEach(() => {
-  jest.resetAllMocks();
-  alertsClientFactoryParams.getSpaceId.mockReturnValue('default');
-});
-
-test('creates an alerts client with proper constructor arguments', async () => {
-  const factory = new AlertsClientFactory(alertsClientFactoryParams);
-  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-
-  expect(jest.requireMock('../alerts_client').AlertsClient).toHaveBeenCalledWith({
-    savedObjectsClient,
-    logger: alertsClientFactoryParams.logger,
-    taskManager: alertsClientFactoryParams.taskManager,
-    alertTypeRegistry: alertsClientFactoryParams.alertTypeRegistry,
-    spaceId: 'default',
-    getUserName: expect.any(Function),
-    createAPIKey: expect.any(Function),
-  });
-});
-
-test('getUserName() returns null when security is disabled', async () => {
-  const factory = new AlertsClientFactory(alertsClientFactoryParams);
-  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
-
-  const userNameResult = await constructorCall.getUserName();
-  expect(userNameResult).toEqual(null);
-});
-
-test('getUserName() returns a name when security is enabled', async () => {
-  const factory = new AlertsClientFactory({
-    ...alertsClientFactoryParams,
-    securityPluginSetup: securityPluginSetup as any,
-  });
-  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
-
-  securityPluginSetup.authc.getCurrentUser.mockResolvedValueOnce({ username: 'bob' });
-  const userNameResult = await constructorCall.getUserName();
-  expect(userNameResult).toEqual('bob');
-});
-
-test('createAPIKey() returns { created: false } when security is disabled', async () => {
-  const factory = new AlertsClientFactory(alertsClientFactoryParams);
-  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
-
-  const createAPIKeyResult = await constructorCall.createAPIKey();
-  expect(createAPIKeyResult).toEqual({ created: false });
-});
-
-test('createAPIKey() returns { created: false } when security is enabled but ES security is disabled', async () => {
-  const factory = new AlertsClientFactory(alertsClientFactoryParams);
-  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
-
-  securityPluginSetup.authc.createAPIKey.mockResolvedValueOnce(null);
-  const createAPIKeyResult = await constructorCall.createAPIKey();
-  expect(createAPIKeyResult).toEqual({ created: false });
-});
-
-test('createAPIKey() returns an API key when security is enabled', async () => {
-  const factory = new AlertsClientFactory({
-    ...alertsClientFactoryParams,
-    securityPluginSetup: securityPluginSetup as any,
-  });
-  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
-
-  securityPluginSetup.authc.createAPIKey.mockResolvedValueOnce({ api_key: '123', id: 'abc' });
-  const createAPIKeyResult = await constructorCall.createAPIKey();
-  expect(createAPIKeyResult).toEqual({ created: true, result: { api_key: '123', id: 'abc' } });
-});
-
-test('createAPIKey() throws when security plugin createAPIKey throws an error', async () => {
-  const factory = new AlertsClientFactory({
-    ...alertsClientFactoryParams,
-    securityPluginSetup: securityPluginSetup as any,
-  });
-  factory.create(KibanaRequest.from(fakeRequest), fakeRequest);
-  const constructorCall = jest.requireMock('../alerts_client').AlertsClient.mock.calls[0][0];
-
-  securityPluginSetup.authc.createAPIKey.mockRejectedValueOnce(new Error('TLS disabled'));
-  await expect(constructorCall.createAPIKey()).rejects.toThrowErrorMatchingInlineSnapshot(
-    `"TLS disabled"`
-  );
-});
diff --git a/x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.ts b/x-pack/legacy/plugins/alerting/server/lib/alerts_client_factory.ts
deleted file mode 100644
index b75d681b6586a..0000000000000
--- a/x-pack/legacy/plugins/alerting/server/lib/alerts_client_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 Hapi from 'hapi';
-import uuid from 'uuid';
-import { AlertTypeRegistry } from '../types';
-import { AlertsClient } from '../alerts_client';
-import { SecurityPluginStartContract, TaskManagerStartContract } from '../shim';
-import { KibanaRequest, Logger } from '../../../../../../src/core/server';
-
-export interface ConstructorOpts {
-  logger: Logger;
-  taskManager: TaskManagerStartContract;
-  alertTypeRegistry: AlertTypeRegistry;
-  securityPluginSetup?: SecurityPluginStartContract;
-  getSpaceId: (request: Hapi.Request) => string | undefined;
-}
-
-export class AlertsClientFactory {
-  private readonly logger: Logger;
-  private readonly taskManager: TaskManagerStartContract;
-  private readonly alertTypeRegistry: AlertTypeRegistry;
-  private readonly securityPluginSetup?: SecurityPluginStartContract;
-  private readonly getSpaceId: (request: Hapi.Request) => string | undefined;
-
-  constructor(options: ConstructorOpts) {
-    this.logger = options.logger;
-    this.getSpaceId = options.getSpaceId;
-    this.taskManager = options.taskManager;
-    this.alertTypeRegistry = options.alertTypeRegistry;
-    this.securityPluginSetup = options.securityPluginSetup;
-  }
-
-  public create(request: KibanaRequest, legacyRequest: Hapi.Request): AlertsClient {
-    const { securityPluginSetup } = this;
-    return new AlertsClient({
-      logger: this.logger,
-      taskManager: this.taskManager,
-      alertTypeRegistry: this.alertTypeRegistry,
-      savedObjectsClient: legacyRequest.getSavedObjectsClient(),
-      spaceId: this.getSpaceId(legacyRequest),
-      async getUserName() {
-        if (!securityPluginSetup) {
-          return null;
-        }
-        const user = await securityPluginSetup.authc.getCurrentUser(request);
-        return user ? user.username : null;
-      },
-      async createAPIKey() {
-        if (!securityPluginSetup) {
-          return { created: false };
-        }
-        const createAPIKeyResult = await securityPluginSetup.authc.createAPIKey(request, {
-          name: `source: alerting, generated uuid: "${uuid.v4()}"`,
-          role_descriptors: {},
-        });
-        if (!createAPIKeyResult) {
-          return { created: false };
-        }
-        return {
-          created: true,
-          result: createAPIKeyResult,
-        };
-      },
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/alerting/server/lib/get_next_run_at.ts b/x-pack/legacy/plugins/alerting/server/lib/get_next_run_at.ts
deleted file mode 100644
index 901b614b4d68c..0000000000000
--- a/x-pack/legacy/plugins/alerting/server/lib/get_next_run_at.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 { parseDuration } from './parse_duration';
-
-export function getNextRunAt(currentRunAt: Date, interval: string) {
-  let nextRunAt = currentRunAt.getTime() + parseDuration(interval);
-  if (nextRunAt < Date.now()) {
-    // To prevent returning dates in the past, we'll return now instead
-    nextRunAt = Date.now();
-  }
-  return new Date(nextRunAt);
-}
diff --git a/x-pack/legacy/plugins/alerting/server/lib/index.ts b/x-pack/legacy/plugins/alerting/server/lib/index.ts
index ca4ddf9e11ad2..c41ea4a5998ff 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/index.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/index.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { AlertInstance } from './alert_instance';
-export { validateAlertTypeParams } from './validate_alert_type_params';
 export { parseDuration, getDurationSchema } from './parse_duration';
-export { AlertsClientFactory } from './alerts_client_factory';
-export { TaskRunnerFactory } from './task_runner_factory';
+export { LicenseState } from './license_state';
+export { validateAlertTypeParams } from './validate_alert_type_params';
diff --git a/x-pack/legacy/plugins/alerting/server/lib/license_state.test.ts b/x-pack/legacy/plugins/alerting/server/lib/license_state.test.ts
new file mode 100644
index 0000000000000..484dc49532567
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/lib/license_state.test.ts
@@ -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 expect from '@kbn/expect';
+import { LicenseState } from './license_state';
+import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
+import { LICENSE_CHECK_STATE } from '../../../../../plugins/licensing/server';
+
+describe('license_state', () => {
+  let getRawLicense: any;
+
+  beforeEach(() => {
+    getRawLicense = jest.fn();
+  });
+
+  describe('status is LICENSE_STATUS_INVALID', () => {
+    beforeEach(() => {
+      const license = licensingMock.createLicense({ license: { status: 'invalid' } });
+      license.check = jest.fn(() => ({
+        state: LICENSE_CHECK_STATE.Invalid,
+      }));
+      getRawLicense.mockReturnValue(license);
+    });
+
+    it('check application link should be disabled', () => {
+      const licensing = licensingMock.createSetup();
+      const licenseState = new LicenseState(licensing.license$);
+      const alertingLicenseInfo = licenseState.checkLicense(getRawLicense());
+      expect(alertingLicenseInfo.enableAppLink).to.be(false);
+    });
+  });
+
+  describe('status is LICENSE_STATUS_VALID', () => {
+    beforeEach(() => {
+      const license = licensingMock.createLicense({ license: { status: 'active' } });
+      license.check = jest.fn(() => ({
+        state: LICENSE_CHECK_STATE.Valid,
+      }));
+      getRawLicense.mockReturnValue(license);
+    });
+
+    it('check application link should be enabled', () => {
+      const licensing = licensingMock.createSetup();
+      const licenseState = new LicenseState(licensing.license$);
+      const alertingLicenseInfo = licenseState.checkLicense(getRawLicense());
+      expect(alertingLicenseInfo.enableAppLink).to.be(true);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/alerting/server/lib/license_state.ts b/x-pack/legacy/plugins/alerting/server/lib/license_state.ts
new file mode 100644
index 0000000000000..344bc9c409edf
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/lib/license_state.ts
@@ -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 Boom from 'boom';
+import { i18n } from '@kbn/i18n';
+import { Observable, Subscription } from 'rxjs';
+import { ILicense, LICENSE_CHECK_STATE } from '../../../../../plugins/licensing/common/types';
+import { assertNever } from '../../../../../../src/core/utils';
+import { PLUGIN } from '../constants/plugin';
+
+export interface AlertingLicenseInformation {
+  showAppLink: boolean;
+  enableAppLink: boolean;
+  message: string;
+}
+
+export class LicenseState {
+  private licenseInformation: AlertingLicenseInformation = this.checkLicense(undefined);
+  private subscription: Subscription;
+
+  constructor(license$: Observable<ILicense>) {
+    this.subscription = license$.subscribe(this.updateInformation.bind(this));
+  }
+
+  private updateInformation(license: ILicense | undefined) {
+    this.licenseInformation = this.checkLicense(license);
+  }
+
+  public clean() {
+    this.subscription.unsubscribe();
+  }
+
+  public getLicenseInformation() {
+    return this.licenseInformation;
+  }
+
+  public checkLicense(license: ILicense | undefined): AlertingLicenseInformation {
+    if (!license || !license.isAvailable) {
+      return {
+        showAppLink: true,
+        enableAppLink: false,
+        message: i18n.translate(
+          'xpack.alerting.serverSideErrors.unavailableLicenseInformationErrorMessage',
+          {
+            defaultMessage:
+              'Alerting is unavailable - license information is not available at this time.',
+          }
+        ),
+      };
+    }
+
+    const check = license.check(PLUGIN.ID, PLUGIN.MINIMUM_LICENSE_REQUIRED);
+
+    switch (check.state) {
+      case LICENSE_CHECK_STATE.Expired:
+        return {
+          showAppLink: true,
+          enableAppLink: false,
+          message: check.message || '',
+        };
+      case LICENSE_CHECK_STATE.Invalid:
+      case LICENSE_CHECK_STATE.Unavailable:
+        return {
+          showAppLink: false,
+          enableAppLink: false,
+          message: check.message || '',
+        };
+      case LICENSE_CHECK_STATE.Valid:
+        return {
+          showAppLink: true,
+          enableAppLink: true,
+          message: '',
+        };
+      default:
+        return assertNever(check.state);
+    }
+  }
+}
+
+export function verifyApiAccessFactory(licenseState: LicenseState) {
+  function verifyApiAccess() {
+    const licenseCheckResults = licenseState.getLicenseInformation();
+
+    if (licenseCheckResults.showAppLink && licenseCheckResults.enableAppLink) {
+      return null;
+    }
+
+    throw Boom.forbidden(licenseCheckResults.message);
+  }
+  return verifyApiAccess;
+}
diff --git a/x-pack/legacy/plugins/alerting/server/lib/result_type.ts b/x-pack/legacy/plugins/alerting/server/lib/result_type.ts
new file mode 100644
index 0000000000000..644ae51292249
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/lib/result_type.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface Ok<T> {
+  tag: 'ok';
+  value: T;
+}
+
+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> {
+  return {
+    tag: 'ok',
+    value,
+  };
+}
+
+export function asErr<T>(error: T): Err<T> {
+  return {
+    tag: 'err',
+    error,
+  };
+}
+
+export function isOk<T, E>(result: Result<T, E>): result is Ok<T> {
+  return result.tag === 'ok';
+}
+
+export function isErr<T, E>(result: Result<T, E>): result is Err<E> {
+  return !isOk(result);
+}
+
+export async function promiseResult<T, E>(future: Promise<T>): Promise<Result<T, E>> {
+  try {
+    return asOk(await future);
+  } catch (e) {
+    return asErr(e);
+  }
+}
+
+export function map<T, E, Resolution>(
+  result: Result<T, E>,
+  onOk: (value: T) => Resolution,
+  onErr: (error: E) => Resolution
+): Resolution {
+  return isOk(result) ? onOk(result.value) : onErr(result.error);
+}
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
deleted file mode 100644
index c21c419977bbe..0000000000000
--- a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.test.ts
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * 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 { schema } from '@kbn/config-schema';
-import { AlertExecutorOptions } from '../types';
-import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
-import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory';
-import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
-import {
-  savedObjectsClientMock,
-  loggingServiceMock,
-} from '../../../../../../src/core/server/mocks';
-
-const alertType = {
-  id: 'test',
-  name: 'My test alert',
-  actionGroups: ['default'],
-  executor: jest.fn(),
-};
-let fakeTimer: sinon.SinonFakeTimers;
-let taskRunnerFactory: TaskRunnerFactory;
-let mockedTaskInstance: ConcreteTaskInstance;
-
-beforeAll(() => {
-  fakeTimer = sinon.useFakeTimers();
-  mockedTaskInstance = {
-    id: '',
-    attempts: 0,
-    status: TaskStatus.Running,
-    version: '123',
-    runAt: new Date(),
-    scheduledAt: new Date(),
-    startedAt: new Date(),
-    retryAt: new Date(Date.now() + 5 * 60 * 1000),
-    state: {
-      startedAt: new Date(Date.now() - 5 * 60 * 1000),
-    },
-    taskType: 'alerting:test',
-    params: {
-      alertId: '1',
-    },
-    ownerId: null,
-  };
-  taskRunnerFactory = new TaskRunnerFactory();
-  taskRunnerFactory.initialize(taskRunnerFactoryInitializerParams);
-});
-
-afterAll(() => fakeTimer.restore());
-
-const savedObjectsClient = savedObjectsClientMock.create();
-const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
-const services = {
-  log: jest.fn(),
-  callCluster: jest.fn(),
-  savedObjectsClient,
-};
-
-const taskRunnerFactoryInitializerParams: jest.Mocked<TaskRunnerContext> = {
-  getServices: jest.fn().mockReturnValue(services),
-  executeAction: jest.fn(),
-  encryptedSavedObjectsPlugin,
-  logger: loggingServiceMock.create().get(),
-  spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
-  getBasePath: jest.fn().mockReturnValue(undefined),
-};
-
-const mockedAlertTypeSavedObject = {
-  id: '1',
-  type: 'alert',
-  attributes: {
-    enabled: true,
-    alertTypeId: '123',
-    interval: '10s',
-    mutedInstanceIds: [],
-    params: {
-      bar: true,
-    },
-    actions: [
-      {
-        group: 'default',
-        actionRef: 'action_0',
-        params: {
-          foo: true,
-        },
-      },
-    ],
-  },
-  references: [
-    {
-      name: 'action_0',
-      type: 'action',
-      id: '1',
-    },
-  ],
-};
-
-beforeEach(() => {
-  jest.resetAllMocks();
-  taskRunnerFactoryInitializerParams.getServices.mockReturnValue(services);
-});
-
-test(`throws an error if factory isn't initialized`, () => {
-  const factory = new TaskRunnerFactory();
-  expect(() =>
-    factory.create(alertType, { taskInstance: mockedTaskInstance })
-  ).toThrowErrorMatchingInlineSnapshot(`"TaskRunnerFactory not initialized"`);
-});
-
-test(`throws an error if factory is already initialized`, () => {
-  const factory = new TaskRunnerFactory();
-  factory.initialize(taskRunnerFactoryInitializerParams);
-  expect(() =>
-    factory.initialize(taskRunnerFactoryInitializerParams)
-  ).toThrowErrorMatchingInlineSnapshot(`"TaskRunnerFactory already initialized"`);
-});
-
-test('successfully executes the task', async () => {
-  const taskRunner = taskRunnerFactory.create(alertType, {
-    taskInstance: mockedTaskInstance,
-  });
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-  const runnerResult = await taskRunner.run();
-  expect(runnerResult).toMatchInlineSnapshot(`
-                                Object {
-                                  "runAt": 1970-01-01T00:00:10.000Z,
-                                  "state": Object {
-                                    "alertInstances": Object {},
-                                    "alertTypeState": undefined,
-                                    "previousStartedAt": 1970-01-01T00:00:00.000Z,
-                                  },
-                                }
-                `);
-  expect(alertType.executor).toHaveBeenCalledTimes(1);
-  const call = alertType.executor.mock.calls[0][0];
-  expect(call.params).toMatchInlineSnapshot(`
-                                    Object {
-                                      "bar": true,
-                                    }
-                  `);
-  expect(call.startedAt).toMatchInlineSnapshot(`1970-01-01T00:00:00.000Z`);
-  expect(call.state).toMatchInlineSnapshot(`Object {}`);
-  expect(call.services.alertInstanceFactory).toBeTruthy();
-  expect(call.services.callCluster).toBeTruthy();
-  expect(call.services).toBeTruthy();
-});
-
-test('executeAction is called per alert instance that is scheduled', async () => {
-  alertType.executor.mockImplementation(({ services: executorServices }: AlertExecutorOptions) => {
-    executorServices.alertInstanceFactory('1').scheduleActions('default');
-  });
-  const taskRunner = taskRunnerFactory.create(alertType, {
-    taskInstance: mockedTaskInstance,
-  });
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-  await taskRunner.run();
-  expect(taskRunnerFactoryInitializerParams.executeAction).toHaveBeenCalledTimes(1);
-  expect(taskRunnerFactoryInitializerParams.executeAction.mock.calls[0]).toMatchInlineSnapshot(`
-                Array [
-                  Object {
-                    "apiKey": "MTIzOmFiYw==",
-                    "id": "1",
-                    "params": Object {
-                      "foo": true,
-                    },
-                    "spaceId": undefined,
-                  },
-                ]
-        `);
-});
-
-test('persists alertInstances passed in from state, only if they are scheduled for execution', async () => {
-  alertType.executor.mockImplementation(({ services: executorServices }: AlertExecutorOptions) => {
-    executorServices.alertInstanceFactory('1').scheduleActions('default');
-  });
-  const taskRunner = taskRunnerFactory.create(alertType, {
-    taskInstance: {
-      ...mockedTaskInstance,
-      state: {
-        ...mockedTaskInstance.state,
-        alertInstances: {
-          '1': { meta: {}, state: { bar: false } },
-          '2': { meta: {}, state: { bar: false } },
-        },
-      },
-    },
-  });
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-  const runnerResult = await taskRunner.run();
-  expect(runnerResult.state.alertInstances).toMatchInlineSnapshot(`
-    Object {
-      "1": Object {
-        "meta": Object {
-          "lastScheduledActions": Object {
-            "date": 1970-01-01T00:00:00.000Z,
-            "group": "default",
-          },
-        },
-        "state": Object {
-          "bar": false,
-        },
-      },
-    }
-  `);
-});
-
-test('validates params before executing the alert type', async () => {
-  const taskRunner = taskRunnerFactory.create(
-    {
-      ...alertType,
-      validate: {
-        params: schema.object({
-          param1: schema.string(),
-        }),
-      },
-    },
-    { taskInstance: mockedTaskInstance }
-  );
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-  await expect(taskRunner.run()).rejects.toThrowErrorMatchingInlineSnapshot(
-    `"params invalid: [param1]: expected value of type [string] but got [undefined]"`
-  );
-});
-
-test('throws error if reference not found', async () => {
-  const taskRunner = taskRunnerFactory.create(alertType, {
-    taskInstance: mockedTaskInstance,
-  });
-  savedObjectsClient.get.mockResolvedValueOnce({
-    ...mockedAlertTypeSavedObject,
-    references: [],
-  });
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-  await expect(taskRunner.run()).rejects.toThrowErrorMatchingInlineSnapshot(
-    `"Action reference \\"action_0\\" not found in alert id: 1"`
-  );
-});
-
-test('uses API key when provided', async () => {
-  const taskRunner = taskRunnerFactory.create(alertType, {
-    taskInstance: mockedTaskInstance,
-  });
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {
-      apiKey: Buffer.from('123:abc').toString('base64'),
-    },
-    references: [],
-  });
-
-  await taskRunner.run();
-  expect(taskRunnerFactoryInitializerParams.getServices).toHaveBeenCalledWith({
-    getBasePath: expect.anything(),
-    headers: {
-      // base64 encoded "123:abc"
-      authorization: 'ApiKey MTIzOmFiYw==',
-    },
-    path: '/',
-    route: { settings: {} },
-    url: {
-      href: '/',
-    },
-    raw: {
-      req: {
-        url: '/',
-      },
-    },
-  });
-});
-
-test(`doesn't use API key when not provided`, async () => {
-  const factory = new TaskRunnerFactory();
-  factory.initialize(taskRunnerFactoryInitializerParams);
-  const taskRunner = factory.create(alertType, {
-    taskInstance: mockedTaskInstance,
-  });
-  savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
-  encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
-    id: '1',
-    type: 'alert',
-    attributes: {},
-    references: [],
-  });
-
-  await taskRunner.run();
-
-  expect(taskRunnerFactoryInitializerParams.getServices).toHaveBeenCalledWith({
-    getBasePath: expect.anything(),
-    headers: {},
-    path: '/',
-    route: { settings: {} },
-    url: {
-      href: '/',
-    },
-    raw: {
-      req: {
-        url: '/',
-      },
-    },
-  });
-});
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
deleted file mode 100644
index 051b15fc8dd8f..0000000000000
--- a/x-pack/legacy/plugins/alerting/server/lib/task_runner_factory.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Logger } from '../../../../../../src/core/server';
-import { RunContext } from '../../../task_manager';
-import { createExecutionHandler } from './create_execution_handler';
-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 { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
-import { PluginStartContract as ActionsPluginStartContract } from '../../../actions';
-import {
-  AlertType,
-  AlertServices,
-  GetBasePathFunction,
-  GetServicesFunction,
-  RawAlert,
-  SpaceIdToNamespaceFunction,
-} from '../types';
-
-export interface TaskRunnerContext {
-  logger: Logger;
-  getServices: GetServicesFunction;
-  executeAction: ActionsPluginStartContract['execute'];
-  encryptedSavedObjectsPlugin: EncryptedSavedObjectsStartContract;
-  spaceIdToNamespace: SpaceIdToNamespaceFunction;
-  getBasePath: GetBasePathFunction;
-}
-
-export class TaskRunnerFactory {
-  private isInitialized = false;
-  private taskRunnerContext?: TaskRunnerContext;
-
-  public initialize(taskRunnerContext: TaskRunnerContext) {
-    if (this.isInitialized) {
-      throw new Error('TaskRunnerFactory already initialized');
-    }
-    this.isInitialized = true;
-    this.taskRunnerContext = taskRunnerContext;
-  }
-
-  public create(alertType: AlertType, { taskInstance }: RunContext) {
-    if (!this.isInitialized) {
-      throw new Error('TaskRunnerFactory not initialized');
-    }
-
-    const {
-      logger,
-      getServices,
-      executeAction,
-      encryptedSavedObjectsPlugin,
-      spaceIdToNamespace,
-      getBasePath,
-    } = this.taskRunnerContext!;
-
-    return {
-      async run() {
-        const { alertId, spaceId } = taskInstance.params;
-        const requestHeaders: Record<string, string> = {};
-        const namespace = spaceIdToNamespace(spaceId);
-        // Only fetch encrypted attributes here, we'll create a saved objects client
-        // scoped with the API key to fetch the remaining data.
-        const {
-          attributes: { apiKey },
-        } = await encryptedSavedObjectsPlugin.getDecryptedAsInternalUser<RawAlert>(
-          'alert',
-          alertId,
-          { namespace }
-        );
-
-        if (apiKey) {
-          requestHeaders.authorization = `ApiKey ${apiKey}`;
-        }
-
-        const fakeRequest = {
-          headers: requestHeaders,
-          getBasePath: () => getBasePath(spaceId),
-          path: '/',
-          route: { settings: {} },
-          url: {
-            href: '/',
-          },
-          raw: {
-            req: {
-              url: '/',
-            },
-          },
-        };
-
-        const services = getServices(fakeRequest);
-        // Ensure API key is still valid and user has access
-        const {
-          attributes: { params, actions, interval, throttle, muteAll, mutedInstanceIds },
-          references,
-        } = await services.savedObjectsClient.get<RawAlert>('alert', alertId);
-
-        // Validate
-        const validatedAlertTypeParams = validateAlertTypeParams(alertType, params);
-
-        // Inject ids into actions
-        const actionsWithIds = actions.map(action => {
-          const actionReference = references.find(obj => obj.name === action.actionRef);
-          if (!actionReference) {
-            throw new Error(
-              `Action reference "${action.actionRef}" not found in alert id: ${alertId}`
-            );
-          }
-          return {
-            ...action,
-            id: actionReference.id,
-          };
-        });
-
-        const executionHandler = createExecutionHandler({
-          alertId,
-          logger,
-          executeAction,
-          apiKey,
-          actions: actionsWithIds,
-          spaceId,
-          alertType,
-        });
-        const alertInstances: Record<string, AlertInstance> = {};
-        const alertInstancesData = taskInstance.state.alertInstances || {};
-        for (const id of Object.keys(alertInstancesData)) {
-          alertInstances[id] = new AlertInstance(alertInstancesData[id]);
-        }
-        const alertInstanceFactory = createAlertInstanceFactory(alertInstances);
-
-        const alertTypeServices: AlertServices = {
-          ...services,
-          alertInstanceFactory,
-        };
-
-        const alertTypeState = await alertType.executor({
-          alertId,
-          services: alertTypeServices,
-          params: validatedAlertTypeParams,
-          state: taskInstance.state.alertTypeState || {},
-          startedAt: taskInstance.startedAt!,
-          previousStartedAt: taskInstance.state.previousStartedAt,
-        });
-
-        await Promise.all(
-          Object.keys(alertInstances).map(alertInstanceId => {
-            const alertInstance = alertInstances[alertInstanceId];
-            if (alertInstance.hasScheduledActions()) {
-              if (
-                alertInstance.isThrottled(throttle) ||
-                muteAll ||
-                mutedInstanceIds.includes(alertInstanceId)
-              ) {
-                return;
-              }
-              const { actionGroup, context, state } = alertInstance.getScheduledActionOptions()!;
-              alertInstance.updateLastScheduledActions(actionGroup);
-              alertInstance.unscheduleActions();
-              return executionHandler({ actionGroup, context, state, alertInstanceId });
-            } else {
-              // Cleanup alert instances that are no longer scheduling actions to avoid over populating the alertInstances object
-              delete alertInstances[alertInstanceId];
-            }
-          })
-        );
-
-        const nextRunAt = getNextRunAt(new Date(taskInstance.startedAt!), interval);
-
-        return {
-          state: {
-            alertTypeState,
-            alertInstances,
-            previousStartedAt: taskInstance.startedAt!,
-          },
-          runAt: nextRunAt,
-        };
-      },
-    };
-  }
-}
diff --git a/x-pack/legacy/plugins/alerting/server/plugin.ts b/x-pack/legacy/plugins/alerting/server/plugin.ts
index 32e5753687367..fb16f579d4c70 100644
--- a/x-pack/legacy/plugins/alerting/server/plugin.ts
+++ b/x-pack/legacy/plugins/alerting/server/plugin.ts
@@ -5,11 +5,13 @@
  */
 
 import Hapi from 'hapi';
-import { first } from 'rxjs/operators';
+
 import { Services } from './types';
 import { AlertsClient } from './alerts_client';
 import { AlertTypeRegistry } from './alert_type_registry';
-import { AlertsClientFactory, TaskRunnerFactory } from './lib';
+import { TaskRunnerFactory } from './task_runner';
+import { AlertsClientFactory } from './alerts_client_factory';
+import { LicenseState } from './lib/license_state';
 import { IClusterClient, KibanaRequest, Logger } from '../../../../../src/core/server';
 import {
   AlertingPluginInitializerContext,
@@ -33,6 +35,7 @@ import {
   muteAlertInstanceRoute,
   unmuteAlertInstanceRoute,
 } from './routes';
+import { extendRouteWithLicenseCheck } from './extend_route_with_license_check';
 
 export interface PluginSetupContract {
   registerType: AlertTypeRegistry['register'];
@@ -48,6 +51,7 @@ export class Plugin {
   private readonly taskRunnerFactory: TaskRunnerFactory;
   private adminClient?: IClusterClient;
   private serverBasePath?: string;
+  private licenseState: LicenseState | null = null;
 
   constructor(initializerContext: AlertingPluginInitializerContext) {
     this.logger = initializerContext.logger.get('plugins', 'alerting');
@@ -58,7 +62,9 @@ export class Plugin {
     core: AlertingCoreSetup,
     plugins: AlertingPluginsSetup
   ): Promise<PluginSetupContract> {
-    this.adminClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();
+    this.adminClient = core.elasticsearch.adminClient;
+
+    this.licenseState = new LicenseState(plugins.licensing.license$);
 
     // Encrypted attributes
     plugins.encryptedSavedObjects.registerType({
@@ -66,7 +72,7 @@ export class Plugin {
       attributesToEncrypt: new Set(['apiKey']),
       attributesToExcludeFromAAD: new Set([
         'scheduledTaskId',
-        'muted',
+        'muteAll',
         'mutedInstanceIds',
         'updatedBy',
       ]),
@@ -80,19 +86,19 @@ export class Plugin {
     this.serverBasePath = core.http.basePath.serverBasePath;
 
     // Register routes
-    core.http.route(createAlertRoute);
-    core.http.route(deleteAlertRoute);
-    core.http.route(findAlertRoute);
-    core.http.route(getAlertRoute);
-    core.http.route(listAlertTypesRoute);
-    core.http.route(updateAlertRoute);
-    core.http.route(enableAlertRoute);
-    core.http.route(disableAlertRoute);
-    core.http.route(updateApiKeyRoute);
-    core.http.route(muteAllAlertRoute);
-    core.http.route(unmuteAllAlertRoute);
-    core.http.route(muteAlertInstanceRoute);
-    core.http.route(unmuteAlertInstanceRoute);
+    core.http.route(extendRouteWithLicenseCheck(createAlertRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(deleteAlertRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(findAlertRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(getAlertRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(listAlertTypesRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(updateAlertRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(enableAlertRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(disableAlertRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(updateApiKeyRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(muteAllAlertRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(unmuteAllAlertRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(muteAlertInstanceRoute, this.licenseState));
+    core.http.route(extendRouteWithLicenseCheck(unmuteAlertInstanceRoute, this.licenseState));
 
     return {
       registerType: alertTypeRegistry.register.bind(alertTypeRegistry),
@@ -102,11 +108,18 @@ export class Plugin {
   public start(core: AlertingCoreStart, plugins: AlertingPluginsStart): PluginStartContract {
     const { adminClient, serverBasePath } = this;
 
+    function spaceIdToNamespace(spaceId?: string): string | undefined {
+      const spacesPlugin = plugins.spaces();
+      return spacesPlugin && spaceId ? spacesPlugin.spaceIdToNamespace(spaceId) : undefined;
+    }
+
     const alertsClientFactory = new AlertsClientFactory({
       alertTypeRegistry: this.alertTypeRegistry!,
       logger: this.logger,
       taskManager: plugins.task_manager,
       securityPluginSetup: plugins.security,
+      encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
+      spaceIdToNamespace,
       getSpaceId(request: Hapi.Request) {
         const spacesPlugin = plugins.spaces();
         return spacesPlugin ? spacesPlugin.getSpaceId(request) : undefined;
@@ -122,12 +135,9 @@ export class Plugin {
           savedObjectsClient: core.savedObjects.getScopedSavedObjectsClient(request),
         };
       },
+      spaceIdToNamespace,
       executeAction: plugins.actions.execute,
       encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
-      spaceIdToNamespace(spaceId?: string): string | undefined {
-        const spacesPlugin = plugins.spaces();
-        return spacesPlugin && spaceId ? spacesPlugin.spaceIdToNamespace(spaceId) : undefined;
-      },
       getBasePath(spaceId?: string): string {
         const spacesPlugin = plugins.spaces();
         return spacesPlugin && spaceId ? spacesPlugin.getBasePath(spaceId) : serverBasePath!;
@@ -140,4 +150,10 @@ export class Plugin {
         alertsClientFactory!.create(KibanaRequest.from(request), request),
     };
   }
+
+  public stop() {
+    if (this.licenseState) {
+      this.licenseState.clean();
+    }
+  }
 }
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 634a797880812..2a0ae78fd78b2 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/create.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/create.test.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { omit } from 'lodash';
 import { createMockServer } from './_mock_server';
 import { createAlertRoute } from './create';
 
@@ -12,12 +13,14 @@ server.route(createAlertRoute);
 
 const mockedAlert = {
   alertTypeId: '1',
+  consumer: 'bar',
   name: 'abc',
-  interval: '10s',
+  schedule: { interval: '10s' },
   tags: ['foo'],
   params: {
     bar: true,
   },
+  throttle: '30s',
   actions: [
     {
       group: 'default',
@@ -38,8 +41,19 @@ test('creates an alert with proper parameters', async () => {
     payload: mockedAlert,
   };
 
+  const createdAt = new Date();
+  const updatedAt = new Date();
   alertsClient.create.mockResolvedValueOnce({
     ...mockedAlert,
+    enabled: true,
+    muteAll: false,
+    createdBy: '',
+    updatedBy: '',
+    apiKey: '',
+    apiKeyOwner: '',
+    mutedInstanceIds: [],
+    createdAt,
+    updatedAt,
     id: '123',
     actions: [
       {
@@ -51,7 +65,8 @@ test('creates an alert with proper parameters', async () => {
   const { payload, statusCode } = await server.inject(request);
   expect(statusCode).toBe(200);
   const response = JSON.parse(payload);
-  expect(response).toMatchInlineSnapshot(`
+  expect(new Date(response.createdAt)).toEqual(createdAt);
+  expect(omit(response, 'createdAt', 'updatedAt')).toMatchInlineSnapshot(`
     Object {
       "actions": Array [
         Object {
@@ -64,15 +79,26 @@ test('creates an alert with proper parameters', async () => {
         },
       ],
       "alertTypeId": "1",
+      "apiKey": "",
+      "apiKeyOwner": "",
+      "consumer": "bar",
+      "createdBy": "",
+      "enabled": true,
       "id": "123",
-      "interval": "10s",
+      "muteAll": false,
+      "mutedInstanceIds": Array [],
       "name": "abc",
       "params": Object {
         "bar": true,
       },
+      "schedule": Object {
+        "interval": "10s",
+      },
       "tags": Array [
         "foo",
       ],
+      "throttle": "30s",
+      "updatedBy": "",
     }
   `);
   expect(alertsClient.create).toHaveBeenCalledTimes(1);
@@ -90,16 +116,19 @@ test('creates an alert with proper parameters', async () => {
             },
           ],
           "alertTypeId": "1",
+          "consumer": "bar",
           "enabled": true,
-          "interval": "10s",
           "name": "abc",
           "params": Object {
             "bar": true,
           },
+          "schedule": Object {
+            "interval": "10s",
+          },
           "tags": Array [
             "foo",
           ],
-          "throttle": null,
+          "throttle": "30s",
         },
       },
     ]
diff --git a/x-pack/legacy/plugins/alerting/server/routes/create.ts b/x-pack/legacy/plugins/alerting/server/routes/create.ts
index cb5277ae19100..362a23a3fa910 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/create.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/create.ts
@@ -7,6 +7,7 @@
 import Hapi from 'hapi';
 import Joi from 'joi';
 import { getDurationSchema } from '../lib';
+import { IntervalSchedule } from '../types';
 
 interface ScheduleRequest extends Hapi.Request {
   payload: {
@@ -14,7 +15,8 @@ interface ScheduleRequest extends Hapi.Request {
     name: string;
     tags: string[];
     alertTypeId: string;
-    interval: string;
+    consumer: string;
+    schedule: IntervalSchedule;
     actions: Array<{
       group: string;
       id: string;
@@ -42,8 +44,13 @@ export const createAlertRoute = {
             .items(Joi.string())
             .default([]),
           alertTypeId: Joi.string().required(),
+          consumer: Joi.string().required(),
           throttle: getDurationSchema().default(null),
-          interval: getDurationSchema().required(),
+          schedule: Joi.object()
+            .keys({
+              interval: getDurationSchema().required(),
+            })
+            .required(),
           params: Joi.object().required(),
           actions: Joi.array()
             .items(
diff --git a/x-pack/legacy/plugins/alerting/server/routes/get.test.ts b/x-pack/legacy/plugins/alerting/server/routes/get.test.ts
index 4d44ee9dfe6bd..320e9042d87c5 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/get.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/get.test.ts
@@ -13,10 +13,12 @@ server.route(getAlertRoute);
 const mockedAlert = {
   id: '1',
   alertTypeId: '1',
-  interval: '10s',
+  schedule: { interval: '10s' },
   params: {
     bar: true,
   },
+  createdAt: new Date(),
+  updatedAt: new Date(),
   actions: [
     {
       group: 'default',
@@ -27,6 +29,17 @@ const mockedAlert = {
       },
     },
   ],
+  consumer: 'bar',
+  name: 'abc',
+  tags: ['foo'],
+  enabled: true,
+  muteAll: false,
+  createdBy: '',
+  updatedBy: '',
+  apiKey: '',
+  apiKeyOwner: '',
+  throttle: '30s',
+  mutedInstanceIds: [],
 };
 
 beforeEach(() => jest.resetAllMocks());
@@ -40,8 +53,10 @@ test('calls get with proper parameters', async () => {
   alertsClient.get.mockResolvedValueOnce(mockedAlert);
   const { payload, statusCode } = await server.inject(request);
   expect(statusCode).toBe(200);
-  const response = JSON.parse(payload);
-  expect(response).toEqual(mockedAlert);
+  const { createdAt, updatedAt, ...response } = JSON.parse(payload);
+  expect({ createdAt: new Date(createdAt), updatedAt: new Date(updatedAt), ...response }).toEqual(
+    mockedAlert
+  );
   expect(alertsClient.get).toHaveBeenCalledTimes(1);
   expect(alertsClient.get.mock.calls[0]).toMatchInlineSnapshot(`
 Array [
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 334fb2120319d..83b70b505234f 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/update.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/update.test.ts
@@ -16,10 +16,12 @@ const mockedResponse = {
   id: '1',
   alertTypeId: '1',
   tags: ['foo'],
-  interval: '12s',
+  schedule: { interval: '12s' },
   params: {
     otherField: false,
   },
+  createdAt: new Date(),
+  updatedAt: new Date(),
   actions: [
     {
       group: 'default',
@@ -40,7 +42,7 @@ test('calls the update function with proper parameters', async () => {
       throttle: null,
       name: 'abc',
       tags: ['bar'],
-      interval: '12s',
+      schedule: { interval: '12s' },
       params: {
         otherField: false,
       },
@@ -59,8 +61,10 @@ test('calls the update function with proper parameters', async () => {
   alertsClient.update.mockResolvedValueOnce(mockedResponse);
   const { payload, statusCode } = await server.inject(request);
   expect(statusCode).toBe(200);
-  const response = JSON.parse(payload);
-  expect(response).toEqual(mockedResponse);
+  const { createdAt, updatedAt, ...response } = JSON.parse(payload);
+  expect({ createdAt: new Date(createdAt), updatedAt: new Date(updatedAt), ...response }).toEqual(
+    mockedResponse
+  );
   expect(alertsClient.update).toHaveBeenCalledTimes(1);
   expect(alertsClient.update.mock.calls[0]).toMatchInlineSnapshot(`
     Array [
@@ -75,11 +79,13 @@ test('calls the update function with proper parameters', async () => {
               },
             },
           ],
-          "interval": "12s",
           "name": "abc",
           "params": Object {
             "otherField": false,
           },
+          "schedule": Object {
+            "interval": "12s",
+          },
           "tags": Array [
             "bar",
           ],
diff --git a/x-pack/legacy/plugins/alerting/server/routes/update.ts b/x-pack/legacy/plugins/alerting/server/routes/update.ts
index 6e8f8557fb24a..bc55d48465602 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/update.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/update.ts
@@ -7,6 +7,7 @@
 import Joi from 'joi';
 import Hapi from 'hapi';
 import { getDurationSchema } from '../lib';
+import { IntervalSchedule } from '../types';
 
 interface UpdateRequest extends Hapi.Request {
   params: {
@@ -16,7 +17,7 @@ interface UpdateRequest extends Hapi.Request {
     alertTypeId: string;
     name: string;
     tags: string[];
-    interval: string;
+    schedule: IntervalSchedule;
     actions: Array<{
       group: string;
       id: string;
@@ -45,7 +46,11 @@ export const updateAlertRoute = {
           tags: Joi.array()
             .items(Joi.string())
             .required(),
-          interval: getDurationSchema().required(),
+          schedule: Joi.object()
+            .keys({
+              interval: getDurationSchema().required(),
+            })
+            .required(),
           params: Joi.object().required(),
           actions: Joi.array()
             .items(
diff --git a/x-pack/legacy/plugins/alerting/server/shim.ts b/x-pack/legacy/plugins/alerting/server/shim.ts
index ef1f1b41049e5..ae29048d83dd9 100644
--- a/x-pack/legacy/plugins/alerting/server/shim.ts
+++ b/x-pack/legacy/plugins/alerting/server/shim.ts
@@ -7,7 +7,7 @@
 import Hapi from 'hapi';
 import { Legacy } from 'kibana';
 import { LegacySpacesPlugin as SpacesPluginStartContract } from '../../spaces';
-import { TaskManager } from '../../task_manager';
+import { TaskManager } from '../../task_manager/server';
 import { XPackMainPlugin } from '../../xpack_main/server/xpack_main';
 import KbnServer from '../../../../../src/legacy/server/kbn_server';
 import {
@@ -25,6 +25,7 @@ import {
   PluginSetupContract as ActionsPluginSetupContract,
   PluginStartContract as ActionsPluginStartContract,
 } from '../../actions';
+import { LicensingPluginSetup } from '../../../../plugins/licensing/server';
 
 // Extend PluginProperties to indicate which plugins are guaranteed to exist
 // due to being marked as dependencies
@@ -40,7 +41,10 @@ export interface Server extends Legacy.Server {
 /**
  * Shim what we're thinking setup and start contracts will look like
  */
-export type TaskManagerStartContract = Pick<TaskManager, 'schedule' | 'fetch' | 'remove'>;
+export type TaskManagerStartContract = Pick<
+  TaskManager,
+  'schedule' | 'fetch' | 'remove' | 'runNow'
+>;
 export type SecurityPluginSetupContract = Pick<SecurityPlugin, '__legacyCompat'>;
 export type SecurityPluginStartContract = Pick<SecurityPlugin, 'authc'>;
 export type XPackMainPluginSetupContract = Pick<XPackMainPlugin, 'registerFeature'>;
@@ -73,6 +77,7 @@ export interface AlertingPluginsSetup {
   actions: ActionsPluginSetupContract;
   xpack_main: XPackMainPluginSetupContract;
   encryptedSavedObjects: EncryptedSavedObjectsSetupContract;
+  licensing: LicensingPluginSetup;
 }
 export interface AlertingPluginsStart {
   actions: ActionsPluginStartContract;
@@ -121,6 +126,7 @@ export function shim(
     xpack_main: server.plugins.xpack_main,
     encryptedSavedObjects: newPlatform.setup.plugins
       .encryptedSavedObjects as EncryptedSavedObjectsSetupContract,
+    licensing: newPlatform.setup.plugins.licensing as LicensingPluginSetup,
   };
 
   const pluginsStart: AlertingPluginsStart = {
diff --git a/x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/create_execution_handler.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.test.ts
rename to x-pack/legacy/plugins/alerting/server/task_runner/create_execution_handler.test.ts
diff --git a/x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.ts b/x-pack/legacy/plugins/alerting/server/task_runner/create_execution_handler.ts
similarity index 98%
rename from x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.ts
rename to x-pack/legacy/plugins/alerting/server/task_runner/create_execution_handler.ts
index 5e7c91c560a6f..3fb197ec97f4f 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.ts
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/create_execution_handler.ts
@@ -14,7 +14,7 @@ interface CreateExecutionHandlerOptions {
   executeAction: ActionsPluginStartContract['execute'];
   actions: AlertAction[];
   spaceId: string;
-  apiKey?: string;
+  apiKey: string | null;
   alertType: AlertType;
   logger: Logger;
 }
diff --git a/x-pack/legacy/plugins/alerting/server/lib/get_next_run_at.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/get_next_run_at.test.ts
similarity index 86%
rename from x-pack/legacy/plugins/alerting/server/lib/get_next_run_at.test.ts
rename to x-pack/legacy/plugins/alerting/server/task_runner/get_next_run_at.test.ts
index 852e412689b35..1c4d8a42d2830 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/get_next_run_at.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/get_next_run_at.test.ts
@@ -15,12 +15,12 @@ const mockedNow = new Date('2019-06-03T18:55:25.982Z');
 
 test('Adds interface to given date when result is > Date.now()', () => {
   const currentRunAt = new Date('2019-06-03T18:55:23.982Z');
-  const result = getNextRunAt(currentRunAt, '10s');
+  const result = getNextRunAt(currentRunAt, { interval: '10s' });
   expect(result).toEqual(new Date('2019-06-03T18:55:33.982Z'));
 });
 
 test('Uses Date.now() when the result would of been a date in the past', () => {
   const currentRunAt = new Date('2019-06-03T18:55:13.982Z');
-  const result = getNextRunAt(currentRunAt, '10s');
+  const result = getNextRunAt(currentRunAt, { interval: '10s' });
   expect(result).toEqual(mockedNow);
 });
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/get_next_run_at.ts b/x-pack/legacy/plugins/alerting/server/task_runner/get_next_run_at.ts
new file mode 100644
index 0000000000000..cea4584e1f713
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/get_next_run_at.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { parseDuration } from '../lib';
+import { IntervalSchedule } from '../types';
+
+export function getNextRunAt(currentRunAt: Date, schedule: IntervalSchedule) {
+  let nextRunAt = currentRunAt.getTime() + parseDuration(schedule.interval);
+  if (nextRunAt < Date.now()) {
+    // To prevent returning dates in the past, we'll return now instead
+    nextRunAt = Date.now();
+  }
+  return new Date(nextRunAt);
+}
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/index.ts b/x-pack/legacy/plugins/alerting/server/task_runner/index.ts
new file mode 100644
index 0000000000000..f5401fbd9cd74
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/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 { TaskRunnerFactory } from './task_runner_factory';
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.test.ts
new file mode 100644
index 0000000000000..10627c655eca8
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.test.ts
@@ -0,0 +1,400 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { schema } from '@kbn/config-schema';
+import { AlertExecutorOptions } from '../types';
+import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
+import { TaskRunnerContext } from './task_runner_factory';
+import { TaskRunner } from './task_runner';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
+import {
+  savedObjectsClientMock,
+  loggingServiceMock,
+} from '../../../../../../src/core/server/mocks';
+
+const alertType = {
+  id: 'test',
+  name: 'My test alert',
+  actionGroups: ['default'],
+  executor: jest.fn(),
+};
+let fakeTimer: sinon.SinonFakeTimers;
+
+describe('Task Runner', () => {
+  let mockedTaskInstance: ConcreteTaskInstance;
+
+  beforeAll(() => {
+    fakeTimer = sinon.useFakeTimers();
+    mockedTaskInstance = {
+      id: '',
+      attempts: 0,
+      status: TaskStatus.Running,
+      version: '123',
+      runAt: new Date(),
+      scheduledAt: new Date(),
+      startedAt: new Date(),
+      retryAt: new Date(Date.now() + 5 * 60 * 1000),
+      state: {
+        startedAt: new Date(Date.now() - 5 * 60 * 1000),
+      },
+      taskType: 'alerting:test',
+      params: {
+        alertId: '1',
+      },
+      ownerId: null,
+    };
+  });
+
+  afterAll(() => fakeTimer.restore());
+
+  const savedObjectsClient = savedObjectsClientMock.create();
+  const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
+  const services = {
+    log: jest.fn(),
+    callCluster: jest.fn(),
+    savedObjectsClient,
+  };
+
+  const taskRunnerFactoryInitializerParams: jest.Mocked<TaskRunnerContext> = {
+    getServices: jest.fn().mockReturnValue(services),
+    executeAction: jest.fn(),
+    encryptedSavedObjectsPlugin,
+    logger: loggingServiceMock.create().get(),
+    spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+    getBasePath: jest.fn().mockReturnValue(undefined),
+  };
+
+  const mockedAlertTypeSavedObject = {
+    id: '1',
+    type: 'alert',
+    attributes: {
+      enabled: true,
+      alertTypeId: '123',
+      schedule: { interval: '10s' },
+      mutedInstanceIds: [],
+      params: {
+        bar: true,
+      },
+      actions: [
+        {
+          group: 'default',
+          actionRef: 'action_0',
+          params: {
+            foo: true,
+          },
+        },
+      ],
+    },
+    references: [
+      {
+        name: 'action_0',
+        type: 'action',
+        id: '1',
+      },
+    ],
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    taskRunnerFactoryInitializerParams.getServices.mockReturnValue(services);
+  });
+
+  test('successfully executes the task', async () => {
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    const runnerResult = await taskRunner.run();
+    expect(runnerResult).toMatchInlineSnapshot(`
+                                  Object {
+                                    "runAt": 1970-01-01T00:00:10.000Z,
+                                    "state": Object {
+                                      "alertInstances": Object {},
+                                      "alertTypeState": undefined,
+                                      "previousStartedAt": 1970-01-01T00:00:00.000Z,
+                                    },
+                                  }
+                  `);
+    expect(alertType.executor).toHaveBeenCalledTimes(1);
+    const call = alertType.executor.mock.calls[0][0];
+    expect(call.params).toMatchInlineSnapshot(`
+                                      Object {
+                                        "bar": true,
+                                      }
+                    `);
+    expect(call.startedAt).toMatchInlineSnapshot(`1970-01-01T00:00:00.000Z`);
+    expect(call.state).toMatchInlineSnapshot(`Object {}`);
+    expect(call.services.alertInstanceFactory).toBeTruthy();
+    expect(call.services.callCluster).toBeTruthy();
+    expect(call.services).toBeTruthy();
+  });
+
+  test('executeAction is called per alert instance that is scheduled', async () => {
+    alertType.executor.mockImplementation(
+      ({ services: executorServices }: AlertExecutorOptions) => {
+        executorServices.alertInstanceFactory('1').scheduleActions('default');
+      }
+    );
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    await taskRunner.run();
+    expect(taskRunnerFactoryInitializerParams.executeAction).toHaveBeenCalledTimes(1);
+    expect(taskRunnerFactoryInitializerParams.executeAction.mock.calls[0]).toMatchInlineSnapshot(`
+                  Array [
+                    Object {
+                      "apiKey": "MTIzOmFiYw==",
+                      "id": "1",
+                      "params": Object {
+                        "foo": true,
+                      },
+                      "spaceId": undefined,
+                    },
+                  ]
+          `);
+  });
+
+  test('persists alertInstances passed in from state, only if they are scheduled for execution', async () => {
+    alertType.executor.mockImplementation(
+      ({ services: executorServices }: AlertExecutorOptions) => {
+        executorServices.alertInstanceFactory('1').scheduleActions('default');
+      }
+    );
+    const taskRunner = new TaskRunner(
+      alertType,
+      {
+        ...mockedTaskInstance,
+        state: {
+          ...mockedTaskInstance.state,
+          alertInstances: {
+            '1': { meta: {}, state: { bar: false } },
+            '2': { meta: {}, state: { bar: false } },
+          },
+        },
+      },
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    const runnerResult = await taskRunner.run();
+    expect(runnerResult.state.alertInstances).toMatchInlineSnapshot(`
+      Object {
+        "1": Object {
+          "meta": Object {
+            "lastScheduledActions": Object {
+              "date": 1970-01-01T00:00:00.000Z,
+              "group": "default",
+            },
+          },
+          "state": Object {
+            "bar": false,
+          },
+        },
+      }
+    `);
+  });
+
+  test('validates params before executing the alert type', async () => {
+    const taskRunner = new TaskRunner(
+      {
+        ...alertType,
+        validate: {
+          params: schema.object({
+            param1: schema.string(),
+          }),
+        },
+      },
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    expect(await taskRunner.run()).toMatchInlineSnapshot(`
+      Object {
+        "runAt": 1970-01-01T00:00:10.000Z,
+        "state": Object {
+          "previousStartedAt": 1970-01-01T00:00:00.000Z,
+          "startedAt": 1969-12-31T23:55:00.000Z,
+        },
+      }
+    `);
+    expect(taskRunnerFactoryInitializerParams.logger.error).toHaveBeenCalledWith(
+      `Executing Alert \"1\" has resulted in Error: params invalid: [param1]: expected value of type [string] but got [undefined]`
+    );
+  });
+
+  test('throws error if reference not found', async () => {
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce({
+      ...mockedAlertTypeSavedObject,
+      references: [],
+    });
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    expect(await taskRunner.run()).toMatchInlineSnapshot(`
+      Object {
+        "runAt": 1970-01-01T00:00:10.000Z,
+        "state": Object {
+          "previousStartedAt": 1970-01-01T00:00:00.000Z,
+          "startedAt": 1969-12-31T23:55:00.000Z,
+        },
+      }
+    `);
+    expect(taskRunnerFactoryInitializerParams.logger.error).toHaveBeenCalledWith(
+      `Executing Alert \"1\" has resulted in Error: Action reference \"action_0\" not found in alert id: 1`
+    );
+  });
+
+  test('uses API key when provided', async () => {
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+
+    await taskRunner.run();
+    expect(taskRunnerFactoryInitializerParams.getServices).toHaveBeenCalledWith({
+      getBasePath: expect.anything(),
+      headers: {
+        // base64 encoded "123:abc"
+        authorization: 'ApiKey MTIzOmFiYw==',
+      },
+      path: '/',
+      route: { settings: {} },
+      url: {
+        href: '/',
+      },
+      raw: {
+        req: {
+          url: '/',
+        },
+      },
+    });
+  });
+
+  test(`doesn't use API key when not provided`, async () => {
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {},
+      references: [],
+    });
+
+    await taskRunner.run();
+
+    expect(taskRunnerFactoryInitializerParams.getServices).toHaveBeenCalledWith({
+      getBasePath: expect.anything(),
+      headers: {},
+      path: '/',
+      route: { settings: {} },
+      url: {
+        href: '/',
+      },
+      raw: {
+        req: {
+          url: '/',
+        },
+      },
+    });
+  });
+
+  test('recovers gracefully when the AlertType executor throws an exception', async () => {
+    alertType.executor.mockImplementation(
+      ({ services: executorServices }: AlertExecutorOptions) => {
+        throw new Error('OMG');
+      }
+    );
+
+    const taskRunner = new TaskRunner(
+      alertType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams
+    );
+
+    savedObjectsClient.get.mockResolvedValueOnce(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+
+    const runnerResult = await taskRunner.run();
+
+    expect(runnerResult).toMatchInlineSnapshot(`
+      Object {
+        "runAt": 1970-01-01T00:00:10.000Z,
+        "state": Object {
+          "previousStartedAt": 1970-01-01T00:00:00.000Z,
+          "startedAt": 1969-12-31T23:55:00.000Z,
+        },
+      }
+    `);
+  });
+});
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts
new file mode 100644
index 0000000000000..2347e9e608ed9
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner.ts
@@ -0,0 +1,241 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { pick, mapValues, omit } from 'lodash';
+import { Logger } from '../../../../../../src/core/server';
+import { SavedObject } from '../../../../../../src/core/server';
+import { TaskRunnerContext } from './task_runner_factory';
+import { ConcreteTaskInstance } from '../../../task_manager';
+import { createExecutionHandler } from './create_execution_handler';
+import { AlertInstance, createAlertInstanceFactory } from '../alert_instance';
+import { getNextRunAt } from './get_next_run_at';
+import { validateAlertTypeParams } from '../lib';
+import { AlertType, RawAlert, IntervalSchedule, Services, State } from '../types';
+import { promiseResult, map } from '../lib/result_type';
+
+type AlertInstances = Record<string, AlertInstance>;
+
+export class TaskRunner {
+  private context: TaskRunnerContext;
+  private logger: Logger;
+  private taskInstance: ConcreteTaskInstance;
+  private alertType: AlertType;
+
+  constructor(
+    alertType: AlertType,
+    taskInstance: ConcreteTaskInstance,
+    context: TaskRunnerContext
+  ) {
+    this.context = context;
+    this.logger = context.logger;
+    this.alertType = alertType;
+    this.taskInstance = taskInstance;
+  }
+
+  async getApiKeyForAlertPermissions(alertId: string, spaceId: string) {
+    const namespace = this.context.spaceIdToNamespace(spaceId);
+    // Only fetch encrypted attributes here, we'll create a saved objects client
+    // scoped with the API key to fetch the remaining data.
+    const {
+      attributes: { apiKey },
+    } = await this.context.encryptedSavedObjectsPlugin.getDecryptedAsInternalUser<RawAlert>(
+      'alert',
+      alertId,
+      { namespace }
+    );
+
+    return apiKey;
+  }
+
+  async getServicesWithSpaceLevelPermissions(spaceId: string, apiKey: string | null) {
+    const requestHeaders: Record<string, string> = {};
+
+    if (apiKey) {
+      requestHeaders.authorization = `ApiKey ${apiKey}`;
+    }
+
+    const fakeRequest = {
+      headers: requestHeaders,
+      getBasePath: () => this.context.getBasePath(spaceId),
+      path: '/',
+      route: { settings: {} },
+      url: {
+        href: '/',
+      },
+      raw: {
+        req: {
+          url: '/',
+        },
+      },
+    };
+
+    return this.context.getServices(fakeRequest);
+  }
+
+  getExecutionHandler(
+    alertId: string,
+    spaceId: string,
+    apiKey: string | null,
+    actions: RawAlert['actions'],
+    references: SavedObject['references']
+  ) {
+    // Inject ids into actions
+    const actionsWithIds = actions.map(action => {
+      const actionReference = references.find(obj => obj.name === action.actionRef);
+      if (!actionReference) {
+        throw new Error(`Action reference "${action.actionRef}" not found in alert id: ${alertId}`);
+      }
+      return {
+        ...action,
+        id: actionReference.id,
+      };
+    });
+
+    return createExecutionHandler({
+      alertId,
+      logger: this.logger,
+      executeAction: this.context.executeAction,
+      apiKey,
+      actions: actionsWithIds,
+      spaceId,
+      alertType: this.alertType,
+    });
+  }
+
+  async executeAlertInstance(
+    alertInstanceId: string,
+    alertInstance: AlertInstance,
+    executionHandler: ReturnType<typeof createExecutionHandler>
+  ) {
+    const { actionGroup, context, state } = alertInstance.getScheduledActionOptions()!;
+    alertInstance.updateLastScheduledActions(actionGroup);
+    alertInstance.unscheduleActions();
+    return executionHandler({ actionGroup, context, state, alertInstanceId });
+  }
+
+  async executeAlertInstances(
+    services: Services,
+    { params, throttle, muteAll, mutedInstanceIds }: SavedObject['attributes'],
+    executionHandler: ReturnType<typeof createExecutionHandler>
+  ): Promise<State> {
+    const {
+      params: { alertId },
+      state: { alertInstances: alertRawInstances = {}, alertTypeState = {}, previousStartedAt },
+    } = this.taskInstance;
+
+    const alertInstances = mapValues<AlertInstances>(
+      alertRawInstances,
+      alert => new AlertInstance(alert)
+    );
+
+    const updatedAlertTypeState = await this.alertType.executor({
+      alertId,
+      services: {
+        ...services,
+        alertInstanceFactory: createAlertInstanceFactory(alertInstances),
+      },
+      params,
+      state: alertTypeState,
+      startedAt: this.taskInstance.startedAt!,
+      previousStartedAt,
+    });
+
+    // Cleanup alert instances that are no longer scheduling actions to avoid over populating the alertInstances object
+    const instancesWithScheduledActions = pick<AlertInstances, AlertInstances>(
+      alertInstances,
+      alertInstance => alertInstance.hasScheduledActions()
+    );
+
+    if (!muteAll) {
+      const enabledAlertInstances = omit<AlertInstances, AlertInstances>(
+        instancesWithScheduledActions,
+        ...mutedInstanceIds
+      );
+
+      await Promise.all(
+        Object.entries(enabledAlertInstances)
+          .filter(
+            ([, alertInstance]: [string, AlertInstance]) => !alertInstance.isThrottled(throttle)
+          )
+          .map(([id, alertInstance]: [string, AlertInstance]) =>
+            this.executeAlertInstance(id, alertInstance, executionHandler)
+          )
+      );
+    }
+
+    return {
+      alertTypeState: updatedAlertTypeState,
+      alertInstances: instancesWithScheduledActions,
+    };
+  }
+
+  async validateAndRunAlert(
+    services: Services,
+    apiKey: string | null,
+    attributes: SavedObject['attributes'],
+    references: SavedObject['references']
+  ) {
+    const {
+      params: { alertId, spaceId },
+    } = this.taskInstance;
+
+    // Validate
+    const params = validateAlertTypeParams(this.alertType, attributes.params);
+    const executionHandler = this.getExecutionHandler(
+      alertId,
+      spaceId,
+      apiKey,
+      attributes.actions,
+      references
+    );
+    return this.executeAlertInstances(services, { ...attributes, params }, executionHandler);
+  }
+
+  async run() {
+    const {
+      params: { alertId, spaceId },
+      startedAt: previousStartedAt,
+      state: originalState,
+    } = this.taskInstance;
+
+    const apiKey = await this.getApiKeyForAlertPermissions(alertId, spaceId);
+    const services = await this.getServicesWithSpaceLevelPermissions(spaceId, apiKey);
+
+    // Ensure API key is still valid and user has access
+    const { attributes, references } = await services.savedObjectsClient.get<RawAlert>(
+      'alert',
+      alertId
+    );
+
+    return {
+      state: map<State, Error, State>(
+        await promiseResult<State, Error>(
+          this.validateAndRunAlert(services, apiKey, attributes, references)
+        ),
+        (stateUpdates: State) => {
+          return {
+            ...stateUpdates,
+            previousStartedAt,
+          };
+        },
+        (err: Error) => {
+          this.logger.error(`Executing Alert "${alertId}" has resulted in Error: ${err.message}`);
+          return {
+            ...originalState,
+            previousStartedAt,
+          };
+        }
+      ),
+      runAt: getNextRunAt(
+        new Date(this.taskInstance.startedAt!),
+        // we do not currently have a good way of returning the type
+        // from SavedObjectsClient, and as we currenrtly require a schedule
+        // and we only support `interval`, we can cast this safely
+        attributes.schedule as IntervalSchedule
+      ),
+    };
+  }
+}
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.test.ts
new file mode 100644
index 0000000000000..2ea1256352bec
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.test.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import sinon from 'sinon';
+import { ConcreteTaskInstance, TaskStatus } from '../../../task_manager';
+import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory';
+import { encryptedSavedObjectsMock } from '../../../../../plugins/encrypted_saved_objects/server/mocks';
+import {
+  savedObjectsClientMock,
+  loggingServiceMock,
+} from '../../../../../../src/core/server/mocks';
+
+const alertType = {
+  id: 'test',
+  name: 'My test alert',
+  actionGroups: ['default'],
+  executor: jest.fn(),
+};
+let fakeTimer: sinon.SinonFakeTimers;
+
+describe('Task Runner Factory', () => {
+  let mockedTaskInstance: ConcreteTaskInstance;
+
+  beforeAll(() => {
+    fakeTimer = sinon.useFakeTimers();
+    mockedTaskInstance = {
+      id: '',
+      attempts: 0,
+      status: TaskStatus.Running,
+      version: '123',
+      runAt: new Date(),
+      scheduledAt: new Date(),
+      startedAt: new Date(),
+      retryAt: new Date(Date.now() + 5 * 60 * 1000),
+      state: {
+        startedAt: new Date(Date.now() - 5 * 60 * 1000),
+      },
+      taskType: 'alerting:test',
+      params: {
+        alertId: '1',
+      },
+      ownerId: null,
+    };
+  });
+
+  afterAll(() => fakeTimer.restore());
+
+  const savedObjectsClient = savedObjectsClientMock.create();
+  const encryptedSavedObjectsPlugin = encryptedSavedObjectsMock.createStart();
+  const services = {
+    log: jest.fn(),
+    callCluster: jest.fn(),
+    savedObjectsClient,
+  };
+
+  const taskRunnerFactoryInitializerParams: jest.Mocked<TaskRunnerContext> = {
+    getServices: jest.fn().mockReturnValue(services),
+    executeAction: jest.fn(),
+    encryptedSavedObjectsPlugin,
+    logger: loggingServiceMock.create().get(),
+    spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
+    getBasePath: jest.fn().mockReturnValue(undefined),
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    taskRunnerFactoryInitializerParams.getServices.mockReturnValue(services);
+  });
+
+  test(`throws an error if factory isn't initialized`, () => {
+    const factory = new TaskRunnerFactory();
+    expect(() =>
+      factory.create(alertType, { taskInstance: mockedTaskInstance })
+    ).toThrowErrorMatchingInlineSnapshot(`"TaskRunnerFactory not initialized"`);
+  });
+
+  test(`throws an error if factory is already initialized`, () => {
+    const factory = new TaskRunnerFactory();
+    factory.initialize(taskRunnerFactoryInitializerParams);
+    expect(() =>
+      factory.initialize(taskRunnerFactoryInitializerParams)
+    ).toThrowErrorMatchingInlineSnapshot(`"TaskRunnerFactory already initialized"`);
+  });
+});
diff --git a/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.ts b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.ts
new file mode 100644
index 0000000000000..7186e1e729bda
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/task_runner/task_runner_factory.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 { Logger } from '../../../../../../src/core/server';
+import { RunContext } from '../../../task_manager';
+import { PluginStartContract as EncryptedSavedObjectsStartContract } from '../../../../../plugins/encrypted_saved_objects/server';
+import { PluginStartContract as ActionsPluginStartContract } from '../../../actions';
+import {
+  AlertType,
+  GetBasePathFunction,
+  GetServicesFunction,
+  SpaceIdToNamespaceFunction,
+} from '../types';
+import { TaskRunner } from './task_runner';
+
+export interface TaskRunnerContext {
+  logger: Logger;
+  getServices: GetServicesFunction;
+  executeAction: ActionsPluginStartContract['execute'];
+  encryptedSavedObjectsPlugin: EncryptedSavedObjectsStartContract;
+  spaceIdToNamespace: SpaceIdToNamespaceFunction;
+  getBasePath: GetBasePathFunction;
+}
+
+export class TaskRunnerFactory {
+  private isInitialized = false;
+  private taskRunnerContext?: TaskRunnerContext;
+
+  public initialize(taskRunnerContext: TaskRunnerContext) {
+    if (this.isInitialized) {
+      throw new Error('TaskRunnerFactory already initialized');
+    }
+    this.isInitialized = true;
+    this.taskRunnerContext = taskRunnerContext;
+  }
+
+  public create(alertType: AlertType, { taskInstance }: RunContext) {
+    if (!this.isInitialized) {
+      throw new Error('TaskRunnerFactory not initialized');
+    }
+
+    return new TaskRunner(alertType, taskInstance, this.taskRunnerContext!);
+  }
+}
diff --git a/x-pack/legacy/plugins/alerting/server/lib/transform_action_params.test.ts b/x-pack/legacy/plugins/alerting/server/task_runner/transform_action_params.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/transform_action_params.test.ts
rename to x-pack/legacy/plugins/alerting/server/task_runner/transform_action_params.test.ts
diff --git a/x-pack/legacy/plugins/alerting/server/lib/transform_action_params.ts b/x-pack/legacy/plugins/alerting/server/task_runner/transform_action_params.ts
similarity index 100%
rename from x-pack/legacy/plugins/alerting/server/lib/transform_action_params.ts
rename to x-pack/legacy/plugins/alerting/server/task_runner/transform_action_params.ts
diff --git a/x-pack/legacy/plugins/alerting/server/test_utils/index.ts b/x-pack/legacy/plugins/alerting/server/test_utils/index.ts
new file mode 100644
index 0000000000000..be9c5493ccf2b
--- /dev/null
+++ b/x-pack/legacy/plugins/alerting/server/test_utils/index.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.
+ */
+
+interface Resolvable<T> {
+  resolve: (arg?: T) => void;
+}
+
+/**
+ * Creates a promise which can be resolved externally, useful for
+ * coordinating async tests.
+ */
+export function resolvable<T>(): Promise<T> & Resolvable<T> {
+  let resolve: (arg?: T) => void;
+  const result = new Promise<T>(r => {
+    resolve = r;
+  }) as any;
+
+  result.resolve = (arg: T) => resolve(arg);
+
+  return result;
+}
diff --git a/x-pack/legacy/plugins/alerting/server/types.ts b/x-pack/legacy/plugins/alerting/server/types.ts
index 1bec2632d8082..9b03f9b02aa0a 100644
--- a/x-pack/legacy/plugins/alerting/server/types.ts
+++ b/x-pack/legacy/plugins/alerting/server/types.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AlertInstance } from './lib';
+import { AlertInstance } from './alert_instance';
 import { AlertTypeRegistry as OrigAlertTypeRegistry } from './alert_type_registry';
 import { PluginSetupContract, PluginStartContract } from './plugin';
 import { SavedObjectAttributes, SavedObjectsClientContract } from '../../../../../src/core/server';
@@ -60,37 +60,49 @@ export interface RawAlertAction extends SavedObjectAttributes {
   params: AlertActionParams;
 }
 
+export interface IntervalSchedule extends SavedObjectAttributes {
+  interval: string;
+}
+
 export interface Alert {
+  id: string;
   enabled: boolean;
   name: string;
   tags: string[];
   alertTypeId: string;
-  interval: string;
+  consumer: string;
+  schedule: IntervalSchedule;
   actions: AlertAction[];
   params: Record<string, any>;
   scheduledTaskId?: string;
   createdBy: string | null;
   updatedBy: string | null;
-  apiKey?: string;
-  apiKeyOwner?: string;
+  createdAt: Date;
+  updatedAt: Date;
+  apiKey: string | null;
+  apiKeyOwner: string | null;
   throttle: string | null;
   muteAll: boolean;
   mutedInstanceIds: string[];
 }
 
+export type PartialAlert = Pick<Alert, 'id'> & Partial<Omit<Alert, 'id'>>;
+
 export interface RawAlert extends SavedObjectAttributes {
   enabled: boolean;
   name: string;
   tags: string[];
   alertTypeId: string;
-  interval: string;
+  consumer: string;
+  schedule: SavedObjectAttributes;
   actions: RawAlertAction[];
   params: SavedObjectAttributes;
   scheduledTaskId?: string;
   createdBy: string | null;
   updatedBy: string | null;
-  apiKey?: string;
-  apiKeyOwner?: string;
+  createdAt: string;
+  apiKey: string | null;
+  apiKeyOwner: string | null;
   throttle: string | null;
   muteAll: boolean;
   mutedInstanceIds: string[];
diff --git a/x-pack/legacy/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap b/x-pack/legacy/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
index 9d82cd6b5455c..e345ca3552e5a 100644
--- a/x-pack/legacy/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
@@ -68,6 +68,8 @@ exports[`Error SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Error SERVICE_NODE_NAME 1`] = `undefined`;
 
+exports[`Error SERVICE_VERSION 1`] = `undefined`;
+
 exports[`Error SPAN_ACTION 1`] = `undefined`;
 
 exports[`Error SPAN_DURATION 1`] = `undefined`;
@@ -174,6 +176,8 @@ exports[`Span SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Span SERVICE_NODE_NAME 1`] = `undefined`;
 
+exports[`Span SERVICE_VERSION 1`] = `undefined`;
+
 exports[`Span SPAN_ACTION 1`] = `"my action"`;
 
 exports[`Span SPAN_DURATION 1`] = `1337`;
@@ -280,6 +284,8 @@ exports[`Transaction SERVICE_NAME 1`] = `"service name"`;
 
 exports[`Transaction SERVICE_NODE_NAME 1`] = `undefined`;
 
+exports[`Transaction SERVICE_VERSION 1`] = `undefined`;
+
 exports[`Transaction SPAN_ACTION 1`] = `undefined`;
 
 exports[`Transaction SPAN_DURATION 1`] = `undefined`;
diff --git a/x-pack/legacy/plugins/apm/common/annotations.ts b/x-pack/legacy/plugins/apm/common/annotations.ts
new file mode 100644
index 0000000000000..33122f55d8800
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/common/annotations.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export enum AnnotationType {
+  VERSION = 'version'
+}
+
+export interface Annotation {
+  type: AnnotationType;
+  id: string;
+  time: number;
+  text: string;
+}
diff --git a/x-pack/legacy/plugins/apm/common/elasticsearch_fieldnames.ts b/x-pack/legacy/plugins/apm/common/elasticsearch_fieldnames.ts
index b8b35e79a9908..0d7ff3114e73f 100644
--- a/x-pack/legacy/plugins/apm/common/elasticsearch_fieldnames.ts
+++ b/x-pack/legacy/plugins/apm/common/elasticsearch_fieldnames.ts
@@ -8,6 +8,7 @@ export const SERVICE_NAME = 'service.name';
 export const SERVICE_ENVIRONMENT = 'service.environment';
 export const SERVICE_AGENT_NAME = 'agent.name';
 export const SERVICE_NODE_NAME = 'service.node.name';
+export const SERVICE_VERSION = 'service.version';
 export const URL_FULL = 'url.full';
 export const HTTP_REQUEST_METHOD = 'http.request.method';
 export const USER_ID = 'user.id';
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 522f6d39ac71a..6a5089733bb33 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
@@ -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 { merge, isPlainObject } from 'lodash';
+import { merge, isPlainObject, cloneDeep } from 'lodash';
 import { DeepPartial } from 'utility-types';
 import { AggregationInputMap } from '../../../../typings/elasticsearch/aggregations';
 import {
@@ -35,7 +35,7 @@ export function mergeProjection<
   T extends Projection,
   U extends SourceProjection
 >(target: T, source: U): DeepMerge<T, U> {
-  return merge({}, target, source, (a, b) => {
+  return merge({}, cloneDeep(target), source, (a, b) => {
     if (isPlainObject(a) && isPlainObject(b)) {
       return undefined;
     }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.test.tsx
index af4c129d61b60..7fe1386ba6414 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.test.tsx
@@ -126,4 +126,31 @@ describe('DetailView', () => {
     expect(wrapper.exists()).toBe(true);
     expect(wrapper).toMatchSnapshot();
   });
+
+  it('should render without http request info', () => {
+    const errorGroup = {
+      occurrencesCount: 10,
+      transaction: undefined,
+      error: {
+        timestamp: {
+          us: 0
+        },
+        http: { response: { status_code: 404 } },
+        url: { full: 'myUrl' },
+        service: { name: 'myService' },
+        user: { id: 'myUserId' },
+        error: { exception: { handled: true } },
+        transaction: { id: 'myTransactionId', sampled: true }
+      } as any
+    };
+    expect(() =>
+      shallow(
+        <DetailView
+          errorGroup={errorGroup}
+          urlParams={{}}
+          location={{} as Location}
+        />
+      )
+    ).not.toThrowError();
+  });
 });
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 879733685c5f7..29c5d3329d16b 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
@@ -81,7 +81,7 @@ export function DetailView({ errorGroup, urlParams, location }: Props) {
 
   const errorUrl = error.error.page?.url || error.url?.full;
 
-  const method = error.http?.request.method;
+  const method = error.http?.request?.method;
   const status = error.http?.response?.status_code;
 
   return (
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 2b053274e8afe..492d28206f3dd 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
@@ -74,7 +74,6 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               >
                 <div
                   className="euiPopover euiPopover--anchorDownRight"
-                  id="sortPopover"
                   onKeyDown={[Function]}
                   onMouseDown={[Function]}
                   onMouseUp={[Function]}
@@ -93,10 +92,11 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
                         className="euiButtonEmpty__content"
                       >
                         <svg
-                          aria-hidden="true"
+                          aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
                           focusable="false"
                           height={16}
+                          role="img"
                           style={null}
                           viewBox="0 0 16 16"
                           width={16}
@@ -251,10 +251,12 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
                     Latest occurrence
                   </span>
                   <svg
+                    aria-hidden={true}
                     aria-label="Sorted in descending order"
                     className="euiIcon euiIcon--medium euiIcon-isLoading euiTableSortIcon"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -297,29 +299,6 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
         </tbody>
       </table>
     </div>
-    <div>
-      <div
-        className="euiSpacer euiSpacer--m"
-      />
-      <EuiFlexGroup
-        alignItems="center"
-        justifyContent="spaceBetween"
-        responsive={false}
-      >
-        <div
-          className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-        >
-          <div
-            className="euiFlexItem euiFlexItem--flexGrowZero"
-          />
-          <div
-            className="euiFlexItem euiFlexItem--flexGrowZero"
-          >
-            <span />
-          </div>
-        </div>
-      </EuiFlexGroup>
-    </div>
   </div>
 </Memo(UnoptimizedManagedTable)>
 `;
@@ -453,7 +432,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               >
                 <div
                   className="euiPopover euiPopover--anchorDownRight"
-                  id="sortPopover"
                   onKeyDown={[Function]}
                   onMouseDown={[Function]}
                   onMouseUp={[Function]}
@@ -472,10 +450,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                         className="euiButtonEmpty__content"
                       >
                         <svg
-                          aria-hidden="true"
+                          aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
                           focusable="false"
                           height={16}
+                          role="img"
                           style={null}
                           viewBox="0 0 16 16"
                           width={16}
@@ -630,10 +609,12 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                     Latest occurrence
                   </span>
                   <svg
+                    aria-hidden={true}
                     aria-label="Sorted in descending order"
                     className="euiIcon euiIcon--medium euiIcon-isLoading euiTableSortIcon"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -1351,7 +1332,68 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
           <div
             className="euiFlexItem euiFlexItem--flexGrowZero"
           >
-            <span />
+            <div
+              className="euiPagination"
+              role="group"
+            >
+              <button
+                aria-label="Previous page"
+                className="euiButtonIcon euiButtonIcon--text"
+                data-test-subj="pagination-button-previous"
+                disabled={true}
+                onClick={[Function]}
+                type="button"
+              >
+                <svg
+                  aria-hidden={true}
+                  className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
+                  focusable="false"
+                  height={16}
+                  role="img"
+                  style={null}
+                  viewBox="0 0 16 16"
+                  width={16}
+                  xmlns="http://www.w3.org/2000/svg"
+                />
+              </button>
+              <button
+                aria-label="Page 1 of 1"
+                className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                data-test-subj="pagination-button-0"
+                onClick={[Function]}
+                type="button"
+              >
+                <span
+                  className="euiButtonEmpty__content"
+                >
+                  <span
+                    className="euiButtonEmpty__text"
+                  >
+                    1
+                  </span>
+                </span>
+              </button>
+              <button
+                aria-label="Next page"
+                className="euiButtonIcon euiButtonIcon--text"
+                data-test-subj="pagination-button-next"
+                disabled={true}
+                onClick={[Function]}
+                type="button"
+              >
+                <svg
+                  aria-hidden={true}
+                  className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
+                  focusable="false"
+                  height={16}
+                  role="img"
+                  style={null}
+                  viewBox="0 0 16 16"
+                  width={16}
+                  xmlns="http://www.w3.org/2000/svg"
+                />
+              </button>
+            </div>
           </div>
         </div>
       </EuiFlexGroup>
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 f2d2f28fc975a..2e1efabf47b2c 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
@@ -80,7 +80,7 @@ const ErrorGroupOverview: React.FC = () => {
 
   const localUIFiltersConfig = useMemo(() => {
     const config: React.ComponentProps<typeof LocalUIFilters> = {
-      filterNames: ['host', 'containerId', 'podName'],
+      filterNames: ['host', 'containerId', 'podName', 'serviceVersion'],
       params: {
         serviceName
       },
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 de423e967b0b3..f83daa4ea1a8a 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
@@ -10,7 +10,7 @@ import uuid from 'uuid';
 import * as rest from '../../../../../services/rest/watcher';
 import { createErrorGroupWatch } from '../createErrorGroupWatch';
 import { esResponse } from './esResponse';
-import { HttpServiceBase } from 'kibana/public';
+import { HttpSetup } from 'kibana/public';
 
 // disable html escaping since this is also disabled in watcher\s mustache implementation
 mustache.escape = value => value;
@@ -30,7 +30,7 @@ describe('createErrorGroupWatch', () => {
     jest.spyOn(uuid, 'v4').mockReturnValue(Buffer.from('mocked-uuid'));
 
     createWatchResponse = await createErrorGroupWatch({
-      http: {} as HttpServiceBase,
+      http: {} as HttpSetup,
       emails: ['my@email.dk', 'mySecond@email.dk'],
       schedule: {
         daily: {
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 1d21e35f122d9..d45453e24f1c9 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
@@ -8,7 +8,7 @@ import { i18n } from '@kbn/i18n';
 import { isEmpty } from 'lodash';
 import url from 'url';
 import uuid from 'uuid';
-import { HttpServiceBase } from 'kibana/public';
+import { HttpSetup } from 'kibana/public';
 import {
   ERROR_CULPRIT,
   ERROR_EXC_HANDLED,
@@ -35,7 +35,7 @@ export interface Schedule {
 }
 
 interface Arguments {
-  http: HttpServiceBase;
+  http: HttpSetup;
   emails: string[];
   schedule: Schedule;
   serviceName: string;
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/index.tsx
index 4158bb877e459..91483b4b52d90 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/index.tsx
@@ -148,7 +148,9 @@ export class ServiceIntegrations extends React.Component<Props, State> {
                 panels={[
                   {
                     id: 0,
-                    items: this.getPanelItems(license.features.ml?.is_available)
+                    items: this.getPanelItems(
+                      license?.getFeature('ml').isAvailable
+                    )
                   }
                 ]}
               />
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.tsx
new file mode 100644
index 0000000000000..c5771995daa24
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.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 {
+  EuiEmptyPrompt,
+  EuiButton,
+  EuiPanel,
+  EuiFlexGroup,
+  EuiFlexItem
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { useKibanaUrl } from '../../../hooks/useKibanaUrl';
+
+export function PlatinumLicensePrompt() {
+  // Set the height to give it some top margin
+  const style = { height: '60vh' };
+
+  const licensePageUrl = useKibanaUrl(
+    '/app/kibana',
+    '/management/elasticsearch/license_management/home'
+  );
+
+  return (
+    <EuiFlexGroup
+      alignItems="center"
+      justifyContent="spaceAround"
+      style={style}
+    >
+      <EuiFlexItem grow={false}>
+        <EuiPanel grow={false} hasShadow={true}>
+          <EuiEmptyPrompt
+            actions={[
+              <EuiButton fill={true} href={licensePageUrl}>
+                {i18n.translate(
+                  'xpack.apm.serviceMap.licensePromptButtonText',
+                  {
+                    defaultMessage: 'Start 30-day Platinum trial'
+                  }
+                )}
+              </EuiButton>
+            ]}
+            body={
+              <p>
+                {i18n.translate('xpack.apm.serviceMap.licensePromptBody', {
+                  defaultMessage:
+                    "In order to access Service Maps, you must be subscribed to an Elastic Platinum license. With it, you'll have the ability to visualize your entire application stack along with your APM data."
+                })}
+              </p>
+            }
+            title={
+              <h2>
+                {i18n.translate('xpack.apm.serviceMap.licensePromptTitle', {
+                  defaultMessage: 'Service maps is available in Platinum.'
+                })}
+              </h2>
+            }
+          />
+        </EuiPanel>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
index 9b0668028c42f..16a91116ae762 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
@@ -4,12 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { useUrlParams } from '../../../hooks/useUrlParams';
+import React from 'react';
 import { useFetcher } from '../../../hooks/useFetcher';
-import { Cytoscape } from './Cytoscape';
+import { useLicense } from '../../../hooks/useLicense';
+import { useUrlParams } from '../../../hooks/useUrlParams';
 import { Controls } from './Controls';
+import { Cytoscape } from './Cytoscape';
+import { PlatinumLicensePrompt } from './PlatinumLicensePrompt';
 
 interface ServiceMapProps {
   serviceName?: string;
@@ -53,8 +55,11 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
   );
 
   const elements = Array.isArray(data) ? data : [];
+  const license = useLicense();
+  const isValidPlatinumLicense =
+    license?.isActive && license?.type === 'platinum';
 
-  return (
+  return isValidPlatinumLicense ? (
     <Cytoscape
       elements={elements}
       serviceName={serviceName}
@@ -62,5 +67,7 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
     >
       <Controls />
     </Cytoscape>
+  ) : (
+    <PlatinumLicensePrompt />
   );
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMetrics/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMetrics/index.tsx
index 8005fc17f2a20..d01093be801a2 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMetrics/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMetrics/index.tsx
@@ -31,7 +31,7 @@ export function ServiceMetrics({ agentName }: ServiceMetricsProps) {
 
   const localFiltersConfig: React.ComponentProps<typeof LocalUIFilters> = useMemo(
     () => ({
-      filterNames: ['host', 'containerId', 'podName'],
+      filterNames: ['host', 'containerId', 'podName', 'serviceVersion'],
       params: {
         serviceName,
         serviceNodeName
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 489d4f2908cbe..9b2a2c8f2490a 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
@@ -111,12 +111,14 @@ NodeList [
                     class="euiIcon euiIcon--medium euiIcon-isLoaded euiButton__icon"
                     focusable="false"
                     height="16"
+                    role="img"
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
                   >
+                    <title />
                     <path
-                      d="M13.6 12.186l-1.357-1.358c-.025-.025-.058-.034-.084-.056.53-.794.84-1.746.84-2.773a4.977 4.977 0 0 0-.84-2.772c.026-.02.059-.03.084-.056L13.6 3.813a6.96 6.96 0 0 1 0 8.373zM8 15A6.956 6.956 0 0 1 3.814 13.6l1.358-1.358c.025-.025.034-.057.055-.084C6.02 12.688 6.974 13 8 13a4.978 4.978 0 0 0 2.773-.84c.02.026.03.058.056.083l1.357 1.358A6.956 6.956 0 0 1 8 15zm-5.601-2.813a6.963 6.963 0 0 1 0-8.373l1.359 1.358c.024.025.057.035.084.056A4.97 4.97 0 0 0 3 8c0 1.027.31 1.98.842 2.773-.027.022-.06.031-.084.056l-1.36 1.358zm5.6-.187A4 4 0 1 1 8 4a4 4 0 0 1 0 8zM8 1c1.573 0 3.019.525 4.187 1.4l-1.357 1.358c-.025.025-.035.057-.056.084A4.979 4.979 0 0 0 8 3a4.979 4.979 0 0 0-2.773.842c-.021-.027-.03-.059-.055-.084L3.814 2.4A6.957 6.957 0 0 1 8 1zm0-1a8.001 8.001 0 1 0 .003 16.002A8.001 8.001 0 0 0 8 0z"
+                      d="M13.6 12.186l-1.357-1.358c-.025-.025-.058-.034-.084-.056.53-.794.84-1.746.84-2.773a4.977 4.977 0 00-.84-2.772c.026-.02.059-.03.084-.056L13.6 3.813a6.96 6.96 0 010 8.373zM8 15A6.956 6.956 0 013.814 13.6l1.358-1.358c.025-.025.034-.057.055-.084C6.02 12.688 6.974 13 8 13a4.978 4.978 0 002.773-.84c.02.026.03.058.056.083l1.357 1.358A6.956 6.956 0 018 15zm-5.601-2.813a6.963 6.963 0 010-8.373l1.359 1.358c.024.025.057.035.084.056A4.97 4.97 0 003 8c0 1.027.31 1.98.842 2.773-.027.022-.06.031-.084.056l-1.36 1.358zm5.6-.187A4 4 0 118 4a4 4 0 010 8zM8 1c1.573 0 3.019.525 4.187 1.4l-1.357 1.358c-.025.025-.035.057-.056.084A4.979 4.979 0 008 3a4.979 4.979 0 00-2.773.842c-.021-.027-.03-.059-.055-.084L3.814 2.4A6.957 6.957 0 018 1zm0-1a8.001 8.001 0 10.003 16.002A8.001 8.001 0 008 0z"
                       fill-rule="evenodd"
                     />
                   </svg>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
new file mode 100644
index 0000000000000..fd71bf9709ce9
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/Settings/ApmIndices/index.test.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 { render, wait } from '@testing-library/react';
+import React from 'react';
+import { ApmIndices } from '.';
+import { MockApmPluginContextWrapper } from '../../../../utils/testHelpers';
+import * as hooks from '../../../../hooks/useFetcher';
+
+describe('ApmIndices', () => {
+  it('should not get stuck in infinite loop', async () => {
+    spyOn(hooks, 'useFetcher').and.returnValue({
+      data: undefined,
+      status: 'loading'
+    });
+    const { getByText } = render(
+      <MockApmPluginContextWrapper>
+        <ApmIndices />
+      </MockApmPluginContextWrapper>
+    );
+
+    expect(getByText('Indices')).toMatchInlineSnapshot(`
+      <h2
+        class="euiTitle euiTitle--medium"
+      >
+        Indices
+      </h2>
+    `);
+
+    await wait();
+  });
+});
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
index ba68e1726d2b4..14670fe1885f6 100644
--- 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
@@ -85,6 +85,9 @@ async function saveApmIndices({
   clearCache();
 }
 
+// avoid infinite loop by initializing the state outside the component
+const INITIAL_STATE = [] as [];
+
 export function ApmIndices() {
   const { toasts } = useApmPluginContext().core.notifications;
 
@@ -93,7 +96,7 @@ export function ApmIndices() {
 
   const callApmApiFromHook = useCallApmApi();
 
-  const { data = [], status, refetch } = useFetcher(
+  const { data = INITIAL_STATE, status, refetch } = useFetcher(
     callApmApi =>
       callApmApi({ pathname: `/api/apm/settings/apm-index-settings` }),
     []
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCount.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCount.tsx
new file mode 100644
index 0000000000000..ff2cb69d011fa
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCount.tsx
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiText, EuiTextColor } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+
+interface Props {
+  count: number;
+}
+
+export const ErrorCount = ({ count }: Props) => (
+  <EuiText size="xs">
+    <h4>
+      <EuiTextColor
+        color="danger"
+        onClick={(e: React.MouseEvent) => {
+          e.stopPropagation();
+        }}
+      >
+        {i18n.translate('xpack.apm.transactionDetails.errorCount', {
+          defaultMessage:
+            '{errorCount, number} {errorCount, plural, one {Error} other {Errors}}',
+          values: { errorCount: count }
+        })}
+      </EuiTextColor>
+    </h4>
+  </EuiText>
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCountBadge.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCountBadge.tsx
deleted file mode 100644
index 4c3ec3ca9f308..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/ErrorCountBadge.tsx
+++ /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 { EuiBadge } from '@elastic/eui';
-import euiThemeLight from '@elastic/eui/dist/eui_theme_light.json';
-import React from 'react';
-
-type Props = React.ComponentProps<typeof EuiBadge>;
-
-export const ErrorCountBadge = ({ children, ...rest }: Props) => (
-  <EuiBadge color={euiThemeLight.euiColorDanger} {...rest}>
-    {children}
-  </EuiBadge>
-);
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/MaybeViewTraceLink.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/MaybeViewTraceLink.tsx
index 39e52be34a415..322ec7c422571 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/MaybeViewTraceLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/MaybeViewTraceLink.tsx
@@ -25,8 +25,9 @@ export const MaybeViewTraceLink = ({
     }
   );
 
+  const { rootTransaction } = waterfall;
   // the traceroot cannot be found, so we cannot link to it
-  if (!waterfall.traceRoot) {
+  if (!rootTransaction) {
     return (
       <EuiFlexItem grow={false}>
         <EuiToolTip
@@ -45,8 +46,7 @@ export const MaybeViewTraceLink = ({
     );
   }
 
-  const isRoot =
-    transaction.transaction.id === waterfall.traceRoot.transaction.id;
+  const isRoot = transaction.transaction.id === rootTransaction.transaction.id;
 
   // the user is already viewing the full trace, so don't link to it
   if (isRoot) {
@@ -69,15 +69,14 @@ export const MaybeViewTraceLink = ({
 
     // the user is viewing a zoomed in version of the trace. Link to the full trace
   } else {
-    const traceRoot = waterfall.traceRoot;
     return (
       <EuiFlexItem grow={false}>
         <TransactionDetailLink
-          serviceName={traceRoot.service.name}
-          transactionId={traceRoot.transaction.id}
-          traceId={traceRoot.trace.id}
-          transactionName={traceRoot.transaction.name}
-          transactionType={traceRoot.transaction.type}
+          serviceName={rootTransaction.service.name}
+          transactionId={rootTransaction.transaction.id}
+          traceId={rootTransaction.trace.id}
+          transactionName={rootTransaction.transaction.name}
+          transactionType={rootTransaction.transaction.type}
         >
           <EuiButton iconType="apmTrace">{viewFullTraceButtonLabel}</EuiButton>
         </TransactionDetailLink>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx
index e5be12509e3c9..f8318b9ae97e6 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx
@@ -77,7 +77,6 @@ export function TransactionTabs({
 
       {currentTab.key === timelineTab.key ? (
         <WaterfallContainer
-          transaction={transaction}
           location={location}
           urlParams={urlParams}
           waterfall={waterfall}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_agent_marks.test.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_agent_marks.test.ts
new file mode 100644
index 0000000000000..784c5fbebf3c2
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_agent_marks.test.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Transaction } from '../../../../../../../../typings/es_schemas/ui/Transaction';
+import { getAgentMarks } from '../get_agent_marks';
+
+describe('getAgentMarks', () => {
+  it('should sort the marks by time', () => {
+    const transaction: Transaction = {
+      transaction: {
+        marks: {
+          agent: {
+            domInteractive: 117,
+            timeToFirstByte: 10,
+            domComplete: 118
+          }
+        }
+      }
+    } as any;
+    expect(getAgentMarks(transaction)).toEqual([
+      {
+        id: 'timeToFirstByte',
+        offset: 10000,
+        type: 'agentMark',
+        verticalLine: true
+      },
+      {
+        id: 'domInteractive',
+        offset: 117000,
+        type: 'agentMark',
+        verticalLine: true
+      },
+      {
+        id: 'domComplete',
+        offset: 118000,
+        type: 'agentMark',
+        verticalLine: true
+      }
+    ]);
+  });
+
+  it('should return empty array if marks are missing', () => {
+    const transaction: Transaction = {
+      transaction: {}
+    } as any;
+    expect(getAgentMarks(transaction)).toEqual([]);
+  });
+
+  it('should return empty array if agent marks are missing', () => {
+    const transaction: Transaction = {
+      transaction: { marks: {} }
+    } as any;
+    expect(getAgentMarks(transaction)).toEqual([]);
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_error_marks.test.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_error_marks.test.ts
new file mode 100644
index 0000000000000..8fd8edd7f8a72
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/__test__/get_error_marks.test.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 { IWaterfallItem } from '../../Waterfall/waterfall_helpers/waterfall_helpers';
+import { getErrorMarks } from '../get_error_marks';
+
+describe('getErrorMarks', () => {
+  describe('returns empty array', () => {
+    it('when items are missing', () => {
+      expect(getErrorMarks([], {})).toEqual([]);
+    });
+    it('when any error is available', () => {
+      const items = [
+        { docType: 'span' },
+        { docType: 'transaction' }
+      ] as IWaterfallItem[];
+      expect(getErrorMarks(items, {})).toEqual([]);
+    });
+  });
+
+  it('returns error marks', () => {
+    const items = [
+      {
+        docType: 'error',
+        offset: 10,
+        skew: 5,
+        doc: { error: { id: 1 }, service: { name: 'opbeans-java' } }
+      } as unknown,
+      { docType: 'transaction' },
+      {
+        docType: 'error',
+        offset: 50,
+        skew: 0,
+        doc: { error: { id: 2 }, service: { name: 'opbeans-node' } }
+      } as unknown
+    ] as IWaterfallItem[];
+    expect(
+      getErrorMarks(items, { 'opbeans-java': 'red', 'opbeans-node': 'blue' })
+    ).toEqual([
+      {
+        type: 'errorMark',
+        offset: 15,
+        verticalLine: false,
+        id: 1,
+        error: { error: { id: 1 }, service: { name: 'opbeans-java' } },
+        serviceColor: 'red'
+      },
+      {
+        type: 'errorMark',
+        offset: 50,
+        verticalLine: false,
+        id: 2,
+        error: { error: { id: 2 }, service: { name: 'opbeans-node' } },
+        serviceColor: 'blue'
+      }
+    ]);
+  });
+
+  it('returns error marks without service color', () => {
+    const items = [
+      {
+        docType: 'error',
+        offset: 10,
+        skew: 5,
+        doc: { error: { id: 1 }, service: { name: 'opbeans-java' } }
+      } as unknown,
+      { docType: 'transaction' },
+      {
+        docType: 'error',
+        offset: 50,
+        skew: 0,
+        doc: { error: { id: 2 }, service: { name: 'opbeans-node' } }
+      } as unknown
+    ] as IWaterfallItem[];
+    expect(getErrorMarks(items, {})).toEqual([
+      {
+        type: 'errorMark',
+        offset: 15,
+        verticalLine: false,
+        id: 1,
+        error: { error: { id: 1 }, service: { name: 'opbeans-java' } },
+        serviceColor: undefined
+      },
+      {
+        type: 'errorMark',
+        offset: 50,
+        verticalLine: false,
+        id: 2,
+        error: { error: { id: 2 }, service: { name: 'opbeans-node' } },
+        serviceColor: undefined
+      }
+    ]);
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.ts
new file mode 100644
index 0000000000000..7798d716cb219
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks.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 { sortBy } from 'lodash';
+import { Transaction } from '../../../../../../../typings/es_schemas/ui/Transaction';
+import { Mark } from '.';
+
+// Extends Mark without adding new properties to it.
+export interface AgentMark extends Mark {
+  type: 'agentMark';
+}
+
+export function getAgentMarks(transaction?: Transaction): AgentMark[] {
+  const agent = transaction?.transaction.marks?.agent;
+  if (!agent) {
+    return [];
+  }
+
+  return sortBy(
+    Object.entries(agent).map(([name, ms]) => ({
+      type: 'agentMark',
+      id: name,
+      offset: ms * 1000,
+      verticalLine: true
+    })),
+    'offset'
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.ts
new file mode 100644
index 0000000000000..f1f0163a49d10
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks.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 { isEmpty } from 'lodash';
+import { ErrorRaw } from '../../../../../../../typings/es_schemas/raw/ErrorRaw';
+import {
+  IWaterfallItem,
+  IWaterfallError,
+  IServiceColors
+} from '../Waterfall/waterfall_helpers/waterfall_helpers';
+import { Mark } from '.';
+
+export interface ErrorMark extends Mark {
+  type: 'errorMark';
+  error: ErrorRaw;
+  serviceColor?: string;
+}
+
+export const getErrorMarks = (
+  items: IWaterfallItem[],
+  serviceColors: IServiceColors
+): ErrorMark[] => {
+  if (isEmpty(items)) {
+    return [];
+  }
+
+  return (items.filter(
+    item => item.docType === 'error'
+  ) as IWaterfallError[]).map(error => ({
+    type: 'errorMark',
+    offset: error.offset + error.skew,
+    verticalLine: false,
+    id: error.doc.error.id,
+    error: error.doc,
+    serviceColor: serviceColors[error.doc.service.name]
+  }));
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts
new file mode 100644
index 0000000000000..52f811f5c3969
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface Mark {
+  type: string;
+  offset: number;
+  verticalLine: boolean;
+  id: string;
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx
index e4cb4ff62b36c..4e6a0eaf45585 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/ServiceLegends.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { px, unit } from '../../../../../style/variables';
 // @ts-ignore
-import Legend from '../../../../shared/charts/Legend';
+import { Legend } from '../../../../shared/charts/Legend';
 import { IServiceColors } from './Waterfall/waterfall_helpers/waterfall_helpers';
 
 const Legends = styled.div`
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 cc1f9dd529bce..4863d6519de07 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
@@ -101,7 +101,7 @@ export function SpanFlyout({
   const dbContext = span.span.db;
   const httpContext = span.span.http;
   const spanTypes = getSpanTypes(span);
-  const spanHttpStatusCode = httpContext?.response.status_code;
+  const spanHttpStatusCode = httpContext?.response?.status_code;
   const spanHttpUrl = httpContext?.url?.original;
   const spanHttpMethod = httpContext?.method;
 
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 2020b8252035b..df95577c81eff 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
@@ -27,8 +27,8 @@ import { DroppedSpansWarning } from './DroppedSpansWarning';
 interface Props {
   onClose: () => void;
   transaction?: Transaction;
-  errorCount: number;
-  traceRootDuration?: number;
+  errorCount?: number;
+  rootTransactionDuration?: number;
 }
 
 function TransactionPropertiesTable({
@@ -49,8 +49,8 @@ function TransactionPropertiesTable({
 export function TransactionFlyout({
   transaction: transactionDoc,
   onClose,
-  errorCount,
-  traceRootDuration
+  errorCount = 0,
+  rootTransactionDuration
 }: Props) {
   if (!transactionDoc) {
     return null;
@@ -84,7 +84,7 @@ export function TransactionFlyout({
           <EuiSpacer size="m" />
           <TransactionSummary
             transaction={transactionDoc}
-            totalDuration={traceRootDuration}
+            totalDuration={rootTransactionDuration}
             errorCount={errorCount}
           />
           <EuiHorizontalRule margin="m" />
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx
new file mode 100644
index 0000000000000..426088f0bb36a
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.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 { Location } from 'history';
+import React from 'react';
+import { SpanFlyout } from './SpanFlyout';
+import { TransactionFlyout } from './TransactionFlyout';
+import { IWaterfall } from './waterfall_helpers/waterfall_helpers';
+
+interface Props {
+  waterfallItemId?: string;
+  waterfall: IWaterfall;
+  location: Location;
+  toggleFlyout: ({ location }: { location: Location }) => void;
+}
+export const WaterfallFlyout: React.FC<Props> = ({
+  waterfallItemId,
+  waterfall,
+  location,
+  toggleFlyout
+}) => {
+  const currentItem = waterfall.items.find(item => item.id === waterfallItemId);
+
+  if (!currentItem) {
+    return null;
+  }
+
+  switch (currentItem.docType) {
+    case 'span':
+      const parentTransaction =
+        currentItem.parent?.docType === 'transaction'
+          ? currentItem.parent?.doc
+          : undefined;
+
+      return (
+        <SpanFlyout
+          totalDuration={waterfall.duration}
+          span={currentItem.doc}
+          parentTransaction={parentTransaction}
+          onClose={() => toggleFlyout({ location })}
+        />
+      );
+    case 'transaction':
+      return (
+        <TransactionFlyout
+          transaction={currentItem.doc}
+          onClose={() => toggleFlyout({ location })}
+          rootTransactionDuration={
+            waterfall.rootTransaction?.transaction.duration.us
+          }
+          errorCount={waterfall.errorsPerTransaction[currentItem.id]}
+        />
+      );
+    default:
+      return null;
+  }
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx
index 8d4fab4aa8dd9..8a82547d717db 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx
@@ -13,12 +13,12 @@ import { i18n } from '@kbn/i18n';
 import { isRumAgentName } from '../../../../../../../common/agent_name';
 import { px, unit, units } from '../../../../../../style/variables';
 import { asDuration } from '../../../../../../utils/formatters';
-import { ErrorCountBadge } from '../../ErrorCountBadge';
+import { ErrorCount } from '../../ErrorCount';
 import { IWaterfallItem } from './waterfall_helpers/waterfall_helpers';
 import { ErrorOverviewLink } from '../../../../../shared/Links/apm/ErrorOverviewLink';
 import { TRACE_ID } from '../../../../../../../common/elasticsearch_fieldnames';
 
-type ItemType = 'transaction' | 'span';
+type ItemType = 'transaction' | 'span' | 'error';
 
 interface IContainerStyleProps {
   type: ItemType;
@@ -89,24 +89,29 @@ interface IWaterfallItemProps {
 }
 
 function PrefixIcon({ item }: { item: IWaterfallItem }) {
-  if (item.docType === 'span') {
-    // icon for database spans
-    const isDbType = item.span.span.type.startsWith('db');
-    if (isDbType) {
-      return <EuiIcon type="database" />;
+  switch (item.docType) {
+    case 'span': {
+      // icon for database spans
+      const isDbType = item.doc.span.type.startsWith('db');
+      if (isDbType) {
+        return <EuiIcon type="database" />;
+      }
+
+      // omit icon for other spans
+      return null;
     }
-
-    // omit icon for other spans
-    return null;
-  }
-
-  // icon for RUM agent transactions
-  if (isRumAgentName(item.transaction.agent.name)) {
-    return <EuiIcon type="globe" />;
+    case 'transaction': {
+      // icon for RUM agent transactions
+      if (isRumAgentName(item.doc.agent.name)) {
+        return <EuiIcon type="globe" />;
+      }
+
+      // icon for other transactions
+      return <EuiIcon type="merge" />;
+    }
+    default:
+      return null;
   }
-
-  // icon for other transactions
-  return <EuiIcon type="merge" />;
 }
 
 interface SpanActionToolTipProps {
@@ -117,11 +122,9 @@ const SpanActionToolTip: React.FC<SpanActionToolTipProps> = ({
   item,
   children
 }) => {
-  if (item && item.docType === 'span') {
+  if (item?.docType === 'span') {
     return (
-      <EuiToolTip
-        content={`${item.span.span.subtype}.${item.span.span.action}`}
-      >
+      <EuiToolTip content={`${item.doc.span.subtype}.${item.doc.span.action}`}>
         <>{children}</>
       </EuiToolTip>
     );
@@ -140,9 +143,8 @@ function Duration({ item }: { item: IWaterfallItem }) {
 function HttpStatusCode({ item }: { item: IWaterfallItem }) {
   // http status code for transactions of type 'request'
   const httpStatusCode =
-    item.docType === 'transaction' &&
-    item.transaction.transaction.type === 'request'
-      ? item.transaction.transaction.result
+    item.docType === 'transaction' && item.doc.transaction.type === 'request'
+      ? item.doc.transaction.result
       : undefined;
 
   if (!httpStatusCode) {
@@ -153,14 +155,18 @@ function HttpStatusCode({ item }: { item: IWaterfallItem }) {
 }
 
 function NameLabel({ item }: { item: IWaterfallItem }) {
-  if (item.docType === 'span') {
-    return <EuiText size="s">{item.name}</EuiText>;
+  switch (item.docType) {
+    case 'span':
+      return <EuiText size="s">{item.doc.span.name}</EuiText>;
+    case 'transaction':
+      return (
+        <EuiTitle size="xxs">
+          <h5>{item.doc.transaction.name}</h5>
+        </EuiTitle>
+      );
+    default:
+      return null;
   }
-  return (
-    <EuiTitle size="xxs">
-      <h5>{item.name}</h5>
-    </EuiTitle>
-  );
 }
 
 export function WaterfallItem({
@@ -210,24 +216,17 @@ export function WaterfallItem({
         <NameLabel item={item} />
         {errorCount > 0 && item.docType === 'transaction' ? (
           <ErrorOverviewLink
-            serviceName={item.transaction.service.name}
+            serviceName={item.doc.service.name}
             query={{
               kuery: encodeURIComponent(
-                `${TRACE_ID} : "${item.transaction.trace.id}" and transaction.id : "${item.transaction.transaction.id}"`
+                `${TRACE_ID} : "${item.doc.trace.id}" and transaction.id : "${item.doc.transaction.id}"`
               )
             }}
             color="danger"
             style={{ textDecoration: 'none' }}
           >
             <EuiToolTip content={tooltipContent}>
-              <ErrorCountBadge
-                onClick={event => {
-                  event.stopPropagation();
-                }}
-                onClickAriaLabel={tooltipContent}
-              >
-                {errorCount}
-              </ErrorCountBadge>
+              <ErrorCount count={errorCount} />
             </EuiToolTip>
           </ErrorOverviewLink>
         ) : null}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
index d53b4077d9759..b48fc1cf7ca27 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
@@ -4,31 +4,26 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiCallOut } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
-import React, { Component } from 'react';
+import React from 'react';
 // @ts-ignore
 import { StickyContainer } from 'react-sticky';
 import styled from 'styled-components';
-import { EuiCallOut } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { IUrlParams } from '../../../../../../context/UrlParamsContext/types';
+import { px } from '../../../../../../style/variables';
+import { history } from '../../../../../../utils/history';
 // @ts-ignore
 import Timeline from '../../../../../shared/charts/Timeline';
+import { fromQuery, toQuery } from '../../../../../shared/Links/url_helpers';
+import { getAgentMarks } from '../Marks/get_agent_marks';
+import { getErrorMarks } from '../Marks/get_error_marks';
+import { WaterfallFlyout } from './WaterfallFlyout';
+import { WaterfallItem } from './WaterfallItem';
 import {
-  APMQueryParams,
-  fromQuery,
-  toQuery
-} from '../../../../../shared/Links/url_helpers';
-import { history } from '../../../../../../utils/history';
-import { AgentMark } from '../get_agent_marks';
-import { SpanFlyout } from './SpanFlyout';
-import { TransactionFlyout } from './TransactionFlyout';
-import {
-  IServiceColors,
   IWaterfall,
   IWaterfallItem
 } from './waterfall_helpers/waterfall_helpers';
-import { WaterfallItem } from './WaterfallItem';
 
 const Container = styled.div`
   transition: 0.1s padding ease;
@@ -43,138 +38,105 @@ const TIMELINE_MARGINS = {
   bottom: 0
 };
 
+const toggleFlyout = ({
+  item,
+  location
+}: {
+  item?: IWaterfallItem;
+  location: Location;
+}) => {
+  history.replace({
+    ...location,
+    search: fromQuery({
+      ...toQuery(location.search),
+      flyoutDetailTab: undefined,
+      waterfallItemId: item?.id
+    })
+  });
+};
+
+const WaterfallItemsContainer = styled.div<{
+  paddingTop: number;
+}>`
+  padding-top: ${props => px(props.paddingTop)};
+`;
+
 interface Props {
-  agentMarks: AgentMark[];
-  urlParams: IUrlParams;
+  waterfallItemId?: string;
   waterfall: IWaterfall;
   location: Location;
-  serviceColors: IServiceColors;
   exceedsMax: boolean;
 }
 
-export class Waterfall extends Component<Props> {
-  public onOpenFlyout = (item: IWaterfallItem) => {
-    this.setQueryParams({
-      flyoutDetailTab: undefined,
-      waterfallItemId: String(item.id)
-    });
-  };
+export const Waterfall: React.FC<Props> = ({
+  waterfall,
+  exceedsMax,
+  waterfallItemId,
+  location
+}) => {
+  const itemContainerHeight = 58; // TODO: This is a nasty way to calculate the height of the svg element. A better approach should be found
+  const waterfallHeight = itemContainerHeight * waterfall.items.length;
 
-  public onCloseFlyout = () => {
-    this.setQueryParams({
-      flyoutDetailTab: undefined,
-      waterfallItemId: undefined
-    });
-  };
+  const { serviceColors, duration } = waterfall;
 
-  public renderWaterfallItem = (item: IWaterfallItem) => {
-    const { serviceColors, waterfall, urlParams }: Props = this.props;
+  const agentMarks = getAgentMarks(waterfall.entryTransaction);
+  const errorMarks = getErrorMarks(waterfall.items, serviceColors);
+
+  const renderWaterfallItem = (item: IWaterfallItem) => {
+    if (item.docType === 'error') {
+      return null;
+    }
 
     const errorCount =
       item.docType === 'transaction'
-        ? waterfall.errorCountByTransactionId[item.transaction.transaction.id]
+        ? waterfall.errorsPerTransaction[item.doc.transaction.id]
         : 0;
 
     return (
       <WaterfallItem
         key={item.id}
         timelineMargins={TIMELINE_MARGINS}
-        color={serviceColors[item.serviceName]}
+        color={serviceColors[item.doc.service.name]}
         item={item}
-        totalDuration={waterfall.duration}
-        isSelected={item.id === urlParams.waterfallItemId}
+        totalDuration={duration}
+        isSelected={item.id === waterfallItemId}
         errorCount={errorCount}
-        onClick={() => this.onOpenFlyout(item)}
+        onClick={() => toggleFlyout({ item, location })}
       />
     );
   };
 
-  public getFlyOut = () => {
-    const { waterfall, urlParams } = this.props;
-
-    const currentItem =
-      urlParams.waterfallItemId &&
-      waterfall.itemsById[urlParams.waterfallItemId];
-
-    if (!currentItem) {
-      return null;
-    }
-
-    switch (currentItem.docType) {
-      case 'span':
-        const parentTransaction = waterfall.getTransactionById(
-          currentItem.parentId
-        );
-
-        return (
-          <SpanFlyout
-            totalDuration={waterfall.duration}
-            span={currentItem.span}
-            parentTransaction={parentTransaction}
-            onClose={this.onCloseFlyout}
-          />
-        );
-      case 'transaction':
-        return (
-          <TransactionFlyout
-            transaction={currentItem.transaction}
-            onClose={this.onCloseFlyout}
-            traceRootDuration={waterfall.traceRootDuration}
-            errorCount={currentItem.errorCount}
-          />
-        );
-      default:
-        return null;
-    }
-  };
-
-  public render() {
-    const { waterfall, exceedsMax } = this.props;
-    const itemContainerHeight = 58; // TODO: This is a nasty way to calculate the height of the svg element. A better approach should be found
-    const waterfallHeight = itemContainerHeight * waterfall.orderedItems.length;
-
-    return (
-      <Container>
-        {exceedsMax ? (
-          <EuiCallOut
-            color="warning"
-            size="s"
-            iconType="alert"
-            title={i18n.translate('xpack.apm.waterfall.exceedsMax', {
-              defaultMessage:
-                'Number of items in this trace exceed what is displayed'
-            })}
-          />
-        ) : null}
-        <StickyContainer>
-          <Timeline
-            agentMarks={this.props.agentMarks}
-            duration={waterfall.duration}
-            height={waterfallHeight}
-            margins={TIMELINE_MARGINS}
-          />
-          <div
-            style={{
-              paddingTop: TIMELINE_MARGINS.top
-            }}
-          >
-            {waterfall.orderedItems.map(this.renderWaterfallItem)}
-          </div>
-        </StickyContainer>
-
-        {this.getFlyOut()}
-      </Container>
-    );
-  }
-
-  private setQueryParams(params: APMQueryParams) {
-    const { location } = this.props;
-    history.replace({
-      ...location,
-      search: fromQuery({
-        ...toQuery(location.search),
-        ...params
-      })
-    });
-  }
-}
+  return (
+    <Container>
+      {exceedsMax && (
+        <EuiCallOut
+          color="warning"
+          size="s"
+          iconType="alert"
+          title={i18n.translate('xpack.apm.waterfall.exceedsMax', {
+            defaultMessage:
+              'Number of items in this trace exceed what is displayed'
+          })}
+        />
+      )}
+      <StickyContainer>
+        <Timeline
+          marks={[...agentMarks, ...errorMarks]}
+          duration={duration}
+          height={waterfallHeight}
+          margins={TIMELINE_MARGINS}
+        />
+        <WaterfallItemsContainer paddingTop={TIMELINE_MARGINS.top}>
+          {waterfall.items.map(renderWaterfallItem)}
+        </WaterfallItemsContainer>
+      </StickyContainer>
+
+      <WaterfallFlyout
+        waterfallItemId={waterfallItemId}
+        waterfall={waterfall}
+        location={location}
+        toggleFlyout={toggleFlyout}
+      />
+    </Container>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap
index 6f61f62167638..ece396bc4cfc4 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap
@@ -24,145 +24,44 @@ Object {
       "name": "GET /api",
     },
   },
-  "errorCountByTransactionId": Object {
+  "errorsCount": 1,
+  "errorsPerTransaction": Object {
     "myTransactionId1": 2,
     "myTransactionId2": 3,
   },
-  "getTransactionById": [Function],
-  "itemsById": Object {
-    "mySpanIdA": Object {
-      "childIds": Array [
-        "mySpanIdB",
-        "mySpanIdC",
-      ],
-      "docType": "span",
-      "duration": 6161,
-      "id": "mySpanIdA",
-      "name": "Api::ProductsController#index",
-      "offset": 40498,
-      "parentId": "myTransactionId2",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "myTransactionId2",
-        },
+  "items": Array [
+    Object {
+      "doc": Object {
         "processor": Object {
-          "event": "span",
+          "event": "transaction",
         },
         "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 6161,
-          },
-          "id": "mySpanIdA",
-          "name": "Api::ProductsController#index",
+          "name": "opbeans-node",
         },
         "timestamp": Object {
-          "us": 1549324795824504,
+          "us": 1549324795784006,
         },
         "trace": Object {
           "id": "myTraceId",
         },
         "transaction": Object {
-          "id": "myTransactionId2",
-        },
-      },
-      "timestamp": 1549324795824504,
-    },
-    "mySpanIdB": Object {
-      "childIds": Array [],
-      "docType": "span",
-      "duration": 481,
-      "id": "mySpanIdB",
-      "name": "SELECT FROM products",
-      "offset": 41627,
-      "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "mySpanIdA",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
           "duration": Object {
-            "us": 481,
+            "us": 49660,
           },
-          "id": "mySpanIdB",
-          "name": "SELECT FROM products",
-        },
-        "timestamp": Object {
-          "us": 1549324795825633,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
+          "id": "myTransactionId1",
+          "name": "GET /api",
         },
       },
-      "timestamp": 1549324795825633,
-    },
-    "mySpanIdC": Object {
-      "childIds": Array [],
-      "docType": "span",
-      "duration": 532,
-      "id": "mySpanIdC",
-      "name": "SELECT FROM product",
-      "offset": 43899,
-      "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
+      "docType": "transaction",
+      "duration": 49660,
+      "id": "myTransactionId1",
+      "offset": 0,
+      "parent": undefined,
+      "parentId": undefined,
       "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "mySpanIdA",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 532,
-          },
-          "id": "mySpanIdC",
-          "name": "SELECT FROM product",
-        },
-        "timestamp": Object {
-          "us": 1549324795827905,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
-        },
-      },
-      "timestamp": 1549324795827905,
     },
-    "mySpanIdD": Object {
-      "childIds": Array [
-        "myTransactionId2",
-      ],
-      "docType": "span",
-      "duration": 47557,
-      "id": "mySpanIdD",
-      "name": "GET opbeans-ruby:3000/api/products",
-      "offset": 1754,
-      "parentId": "myTransactionId1",
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "span": Object {
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "myTransactionId1",
         },
@@ -189,59 +88,45 @@ Object {
           "id": "myTransactionId1",
         },
       },
-      "timestamp": 1549324795785760,
-    },
-    "myTransactionId1": Object {
-      "childIds": Array [
-        "mySpanIdD",
-      ],
-      "docType": "transaction",
-      "duration": 49660,
-      "errorCount": 2,
-      "id": "myTransactionId1",
-      "name": "GET /api",
-      "offset": 0,
-      "parentId": undefined,
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "timestamp": 1549324795784006,
-      "transaction": Object {
-        "processor": Object {
-          "event": "transaction",
-        },
-        "service": Object {
-          "name": "opbeans-node",
-        },
-        "timestamp": Object {
-          "us": 1549324795784006,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "duration": Object {
-            "us": 49660,
+      "docType": "span",
+      "duration": 47557,
+      "id": "mySpanIdD",
+      "offset": 1754,
+      "parent": Object {
+        "doc": Object {
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-node",
+          },
+          "timestamp": Object {
+            "us": 1549324795784006,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 49660,
+            },
+            "id": "myTransactionId1",
+            "name": "GET /api",
           },
-          "id": "myTransactionId1",
-          "name": "GET /api",
         },
+        "docType": "transaction",
+        "duration": 49660,
+        "id": "myTransactionId1",
+        "offset": 0,
+        "parent": undefined,
+        "parentId": undefined,
+        "skew": 0,
       },
-    },
-    "myTransactionId2": Object {
-      "childIds": Array [
-        "mySpanIdA",
-      ],
-      "docType": "transaction",
-      "duration": 8634,
-      "errorCount": 3,
-      "id": "myTransactionId2",
-      "name": "Api::ProductsController#index",
-      "offset": 39298,
-      "parentId": "mySpanIdD",
-      "serviceName": "opbeans-ruby",
+      "parentId": "myTransactionId1",
       "skew": 0,
-      "timestamp": 1549324795823304,
-      "transaction": Object {
+    },
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "mySpanIdD",
         },
@@ -262,181 +147,403 @@ Object {
             "us": 8634,
           },
           "id": "myTransactionId2",
+          "marks": Object {
+            "agent": Object {
+              "domComplete": 383,
+              "domInteractive": 382,
+              "timeToFirstByte": 14,
+            },
+          },
           "name": "Api::ProductsController#index",
         },
       },
-    },
-  },
-  "orderedItems": Array [
-    Object {
-      "childIds": Array [
-        "mySpanIdD",
-      ],
       "docType": "transaction",
-      "duration": 49660,
-      "errorCount": 2,
-      "id": "myTransactionId1",
-      "name": "GET /api",
-      "offset": 0,
-      "parentId": undefined,
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "timestamp": 1549324795784006,
-      "transaction": Object {
-        "processor": Object {
-          "event": "transaction",
-        },
-        "service": Object {
-          "name": "opbeans-node",
-        },
-        "timestamp": Object {
-          "us": 1549324795784006,
-        },
-        "trace": Object {
-          "id": "myTraceId",
+      "duration": 8634,
+      "id": "myTransactionId2",
+      "offset": 39298,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId1",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-node",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 47557,
+            },
+            "id": "mySpanIdD",
+            "name": "GET opbeans-ruby:3000/api/products",
+          },
+          "timestamp": Object {
+            "us": 1549324795785760,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId1",
+          },
         },
-        "transaction": Object {
-          "duration": Object {
-            "us": 49660,
+        "docType": "span",
+        "duration": 47557,
+        "id": "mySpanIdD",
+        "offset": 1754,
+        "parent": Object {
+          "doc": Object {
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-node",
+            },
+            "timestamp": Object {
+              "us": 1549324795784006,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 49660,
+              },
+              "id": "myTransactionId1",
+              "name": "GET /api",
+            },
           },
+          "docType": "transaction",
+          "duration": 49660,
           "id": "myTransactionId1",
-          "name": "GET /api",
+          "offset": 0,
+          "parent": undefined,
+          "parentId": undefined,
+          "skew": 0,
         },
+        "parentId": "myTransactionId1",
+        "skew": 0,
       },
+      "parentId": "mySpanIdD",
+      "skew": 0,
     },
     Object {
-      "childIds": Array [
-        "myTransactionId2",
-      ],
-      "docType": "span",
-      "duration": 47557,
-      "id": "mySpanIdD",
-      "name": "GET opbeans-ruby:3000/api/products",
-      "offset": 1754,
-      "parentId": "myTransactionId1",
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "span": Object {
+      "doc": Object {
         "parent": Object {
-          "id": "myTransactionId1",
+          "id": "myTransactionId2",
         },
         "processor": Object {
           "event": "span",
         },
         "service": Object {
-          "name": "opbeans-node",
+          "name": "opbeans-ruby",
         },
         "span": Object {
           "duration": Object {
-            "us": 47557,
+            "us": 6161,
           },
-          "id": "mySpanIdD",
-          "name": "GET opbeans-ruby:3000/api/products",
+          "id": "mySpanIdA",
+          "name": "Api::ProductsController#index",
         },
         "timestamp": Object {
-          "us": 1549324795785760,
+          "us": 1549324795824504,
         },
         "trace": Object {
           "id": "myTraceId",
         },
         "transaction": Object {
-          "id": "myTransactionId1",
+          "id": "myTransactionId2",
+        },
+      },
+      "docType": "span",
+      "duration": 6161,
+      "id": "mySpanIdA",
+      "offset": 40498,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "mySpanIdD",
+          },
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "timestamp": Object {
+            "us": 1549324795823304,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 8634,
+            },
+            "id": "myTransactionId2",
+            "marks": Object {
+              "agent": Object {
+                "domComplete": 383,
+                "domInteractive": 382,
+                "timeToFirstByte": 14,
+              },
+            },
+            "name": "Api::ProductsController#index",
+          },
         },
+        "docType": "transaction",
+        "duration": 8634,
+        "id": "myTransactionId2",
+        "offset": 39298,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "myTransactionId1",
+            },
+            "processor": Object {
+              "event": "span",
+            },
+            "service": Object {
+              "name": "opbeans-node",
+            },
+            "span": Object {
+              "duration": Object {
+                "us": 47557,
+              },
+              "id": "mySpanIdD",
+              "name": "GET opbeans-ruby:3000/api/products",
+            },
+            "timestamp": Object {
+              "us": 1549324795785760,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "id": "myTransactionId1",
+            },
+          },
+          "docType": "span",
+          "duration": 47557,
+          "id": "mySpanIdD",
+          "offset": 1754,
+          "parent": Object {
+            "doc": Object {
+              "processor": Object {
+                "event": "transaction",
+              },
+              "service": Object {
+                "name": "opbeans-node",
+              },
+              "timestamp": Object {
+                "us": 1549324795784006,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "duration": Object {
+                  "us": 49660,
+                },
+                "id": "myTransactionId1",
+                "name": "GET /api",
+              },
+            },
+            "docType": "transaction",
+            "duration": 49660,
+            "id": "myTransactionId1",
+            "offset": 0,
+            "parent": undefined,
+            "parentId": undefined,
+            "skew": 0,
+          },
+          "parentId": "myTransactionId1",
+          "skew": 0,
+        },
+        "parentId": "mySpanIdD",
+        "skew": 0,
       },
-      "timestamp": 1549324795785760,
+      "parentId": "myTransactionId2",
+      "skew": 0,
     },
     Object {
-      "childIds": Array [
-        "mySpanIdA",
-      ],
-      "docType": "transaction",
-      "duration": 8634,
-      "errorCount": 3,
-      "id": "myTransactionId2",
-      "name": "Api::ProductsController#index",
-      "offset": 39298,
-      "parentId": "mySpanIdD",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "timestamp": 1549324795823304,
-      "transaction": Object {
+      "doc": Object {
         "parent": Object {
-          "id": "mySpanIdD",
+          "id": "mySpanIdA",
         },
         "processor": Object {
-          "event": "transaction",
+          "event": "span",
         },
         "service": Object {
           "name": "opbeans-ruby",
         },
+        "span": Object {
+          "duration": Object {
+            "us": 481,
+          },
+          "id": "mySpanIdB",
+          "name": "SELECT FROM products",
+        },
         "timestamp": Object {
-          "us": 1549324795823304,
+          "us": 1549324795825633,
         },
         "trace": Object {
           "id": "myTraceId",
         },
         "transaction": Object {
-          "duration": Object {
-            "us": 8634,
-          },
           "id": "myTransactionId2",
-          "name": "Api::ProductsController#index",
         },
       },
-    },
-    Object {
-      "childIds": Array [
-        "mySpanIdB",
-        "mySpanIdC",
-      ],
       "docType": "span",
-      "duration": 6161,
-      "id": "mySpanIdA",
-      "name": "Api::ProductsController#index",
-      "offset": 40498,
-      "parentId": "myTransactionId2",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "myTransactionId2",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 6161,
+      "duration": 481,
+      "id": "mySpanIdB",
+      "offset": 41627,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId2",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 6161,
+            },
+            "id": "mySpanIdA",
+            "name": "Api::ProductsController#index",
+          },
+          "timestamp": Object {
+            "us": 1549324795824504,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId2",
           },
-          "id": "mySpanIdA",
-          "name": "Api::ProductsController#index",
-        },
-        "timestamp": Object {
-          "us": 1549324795824504,
-        },
-        "trace": Object {
-          "id": "myTraceId",
         },
-        "transaction": Object {
+        "docType": "span",
+        "duration": 6161,
+        "id": "mySpanIdA",
+        "offset": 40498,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "mySpanIdD",
+            },
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "timestamp": Object {
+              "us": 1549324795823304,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 8634,
+              },
+              "id": "myTransactionId2",
+              "marks": Object {
+                "agent": Object {
+                  "domComplete": 383,
+                  "domInteractive": 382,
+                  "timeToFirstByte": 14,
+                },
+              },
+              "name": "Api::ProductsController#index",
+            },
+          },
+          "docType": "transaction",
+          "duration": 8634,
           "id": "myTransactionId2",
+          "offset": 39298,
+          "parent": Object {
+            "doc": Object {
+              "parent": Object {
+                "id": "myTransactionId1",
+              },
+              "processor": Object {
+                "event": "span",
+              },
+              "service": Object {
+                "name": "opbeans-node",
+              },
+              "span": Object {
+                "duration": Object {
+                  "us": 47557,
+                },
+                "id": "mySpanIdD",
+                "name": "GET opbeans-ruby:3000/api/products",
+              },
+              "timestamp": Object {
+                "us": 1549324795785760,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "id": "myTransactionId1",
+              },
+            },
+            "docType": "span",
+            "duration": 47557,
+            "id": "mySpanIdD",
+            "offset": 1754,
+            "parent": Object {
+              "doc": Object {
+                "processor": Object {
+                  "event": "transaction",
+                },
+                "service": Object {
+                  "name": "opbeans-node",
+                },
+                "timestamp": Object {
+                  "us": 1549324795784006,
+                },
+                "trace": Object {
+                  "id": "myTraceId",
+                },
+                "transaction": Object {
+                  "duration": Object {
+                    "us": 49660,
+                  },
+                  "id": "myTransactionId1",
+                  "name": "GET /api",
+                },
+              },
+              "docType": "transaction",
+              "duration": 49660,
+              "id": "myTransactionId1",
+              "offset": 0,
+              "parent": undefined,
+              "parentId": undefined,
+              "skew": 0,
+            },
+            "parentId": "myTransactionId1",
+            "skew": 0,
+          },
+          "parentId": "mySpanIdD",
+          "skew": 0,
         },
+        "parentId": "myTransactionId2",
+        "skew": 0,
       },
-      "timestamp": 1549324795824504,
-    },
-    Object {
-      "childIds": Array [],
-      "docType": "span",
-      "duration": 481,
-      "id": "mySpanIdB",
-      "name": "SELECT FROM products",
-      "offset": 41627,
       "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
       "skew": 0,
-      "span": Object {
+    },
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "mySpanIdA",
         },
@@ -448,13 +555,13 @@ Object {
         },
         "span": Object {
           "duration": Object {
-            "us": 481,
+            "us": 532,
           },
-          "id": "mySpanIdB",
-          "name": "SELECT FROM products",
+          "id": "mySpanIdC",
+          "name": "SELECT FROM product",
         },
         "timestamp": Object {
-          "us": 1549324795825633,
+          "us": 1549324795827905,
         },
         "trace": Object {
           "id": "myTraceId",
@@ -463,57 +570,223 @@ Object {
           "id": "myTransactionId2",
         },
       },
-      "timestamp": 1549324795825633,
-    },
-    Object {
-      "childIds": Array [],
       "docType": "span",
       "duration": 532,
       "id": "mySpanIdC",
-      "name": "SELECT FROM product",
       "offset": 43899,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId2",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 6161,
+            },
+            "id": "mySpanIdA",
+            "name": "Api::ProductsController#index",
+          },
+          "timestamp": Object {
+            "us": 1549324795824504,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId2",
+          },
+        },
+        "docType": "span",
+        "duration": 6161,
+        "id": "mySpanIdA",
+        "offset": 40498,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "mySpanIdD",
+            },
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "timestamp": Object {
+              "us": 1549324795823304,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 8634,
+              },
+              "id": "myTransactionId2",
+              "marks": Object {
+                "agent": Object {
+                  "domComplete": 383,
+                  "domInteractive": 382,
+                  "timeToFirstByte": 14,
+                },
+              },
+              "name": "Api::ProductsController#index",
+            },
+          },
+          "docType": "transaction",
+          "duration": 8634,
+          "id": "myTransactionId2",
+          "offset": 39298,
+          "parent": Object {
+            "doc": Object {
+              "parent": Object {
+                "id": "myTransactionId1",
+              },
+              "processor": Object {
+                "event": "span",
+              },
+              "service": Object {
+                "name": "opbeans-node",
+              },
+              "span": Object {
+                "duration": Object {
+                  "us": 47557,
+                },
+                "id": "mySpanIdD",
+                "name": "GET opbeans-ruby:3000/api/products",
+              },
+              "timestamp": Object {
+                "us": 1549324795785760,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "id": "myTransactionId1",
+              },
+            },
+            "docType": "span",
+            "duration": 47557,
+            "id": "mySpanIdD",
+            "offset": 1754,
+            "parent": Object {
+              "doc": Object {
+                "processor": Object {
+                  "event": "transaction",
+                },
+                "service": Object {
+                  "name": "opbeans-node",
+                },
+                "timestamp": Object {
+                  "us": 1549324795784006,
+                },
+                "trace": Object {
+                  "id": "myTraceId",
+                },
+                "transaction": Object {
+                  "duration": Object {
+                    "us": 49660,
+                  },
+                  "id": "myTransactionId1",
+                  "name": "GET /api",
+                },
+              },
+              "docType": "transaction",
+              "duration": 49660,
+              "id": "myTransactionId1",
+              "offset": 0,
+              "parent": undefined,
+              "parentId": undefined,
+              "skew": 0,
+            },
+            "parentId": "myTransactionId1",
+            "skew": 0,
+          },
+          "parentId": "mySpanIdD",
+          "skew": 0,
+        },
+        "parentId": "myTransactionId2",
+        "skew": 0,
+      },
       "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
       "skew": 0,
-      "span": Object {
+    },
+    Object {
+      "doc": Object {
+        "agent": Object {
+          "name": "ruby",
+          "version": "2",
+        },
+        "error": Object {
+          "grouping_key": "errorGroupingKey1",
+          "id": "error1",
+          "log": Object {
+            "message": "error message",
+          },
+        },
         "parent": Object {
-          "id": "mySpanIdA",
+          "id": "myTransactionId1",
         },
         "processor": Object {
-          "event": "span",
+          "event": "error",
         },
         "service": Object {
           "name": "opbeans-ruby",
         },
-        "span": Object {
-          "duration": Object {
-            "us": 532,
-          },
-          "id": "mySpanIdC",
-          "name": "SELECT FROM product",
-        },
         "timestamp": Object {
-          "us": 1549324795827905,
+          "us": 1549324795810000,
         },
         "trace": Object {
           "id": "myTraceId",
         },
         "transaction": Object {
-          "id": "myTransactionId2",
+          "id": "myTransactionId1",
+        },
+      },
+      "docType": "error",
+      "duration": 0,
+      "id": "error1",
+      "offset": 25994,
+      "parent": Object {
+        "doc": Object {
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-node",
+          },
+          "timestamp": Object {
+            "us": 1549324795784006,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 49660,
+            },
+            "id": "myTransactionId1",
+            "name": "GET /api",
+          },
         },
+        "docType": "transaction",
+        "duration": 49660,
+        "id": "myTransactionId1",
+        "offset": 0,
+        "parent": undefined,
+        "parentId": undefined,
+        "skew": 0,
       },
-      "timestamp": 1549324795827905,
+      "parentId": "myTransactionId1",
+      "skew": 0,
     },
   ],
-  "serviceColors": Object {
-    "opbeans-node": "#3185fc",
-    "opbeans-ruby": "#00b3a4",
-  },
-  "services": Array [
-    "opbeans-node",
-    "opbeans-ruby",
-  ],
-  "traceRoot": Object {
+  "rootTransaction": Object {
     "processor": Object {
       "event": "transaction",
     },
@@ -534,7 +807,10 @@ Object {
       "name": "GET /api",
     },
   },
-  "traceRootDuration": 49660,
+  "serviceColors": Object {
+    "opbeans-node": "#3185fc",
+    "opbeans-ruby": "#00b3a4",
+  },
 }
 `;
 
@@ -562,221 +838,24 @@ Object {
         "us": 8634,
       },
       "id": "myTransactionId2",
-      "name": "Api::ProductsController#index",
-    },
-  },
-  "errorCountByTransactionId": Object {
-    "myTransactionId1": 2,
-    "myTransactionId2": 3,
-  },
-  "getTransactionById": [Function],
-  "itemsById": Object {
-    "mySpanIdA": Object {
-      "childIds": Array [
-        "mySpanIdB",
-        "mySpanIdC",
-      ],
-      "docType": "span",
-      "duration": 6161,
-      "id": "mySpanIdA",
-      "name": "Api::ProductsController#index",
-      "offset": 1200,
-      "parentId": "myTransactionId2",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "myTransactionId2",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 6161,
-          },
-          "id": "mySpanIdA",
-          "name": "Api::ProductsController#index",
-        },
-        "timestamp": Object {
-          "us": 1549324795824504,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
-        },
-      },
-      "timestamp": 1549324795824504,
-    },
-    "mySpanIdB": Object {
-      "childIds": Array [],
-      "docType": "span",
-      "duration": 481,
-      "id": "mySpanIdB",
-      "name": "SELECT FROM products",
-      "offset": 2329,
-      "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "mySpanIdA",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 481,
-          },
-          "id": "mySpanIdB",
-          "name": "SELECT FROM products",
-        },
-        "timestamp": Object {
-          "us": 1549324795825633,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
-        },
-      },
-      "timestamp": 1549324795825633,
-    },
-    "mySpanIdC": Object {
-      "childIds": Array [],
-      "docType": "span",
-      "duration": 532,
-      "id": "mySpanIdC",
-      "name": "SELECT FROM product",
-      "offset": 4601,
-      "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "mySpanIdA",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 532,
-          },
-          "id": "mySpanIdC",
-          "name": "SELECT FROM product",
-        },
-        "timestamp": Object {
-          "us": 1549324795827905,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
-        },
-      },
-      "timestamp": 1549324795827905,
-    },
-    "mySpanIdD": Object {
-      "docType": "span",
-      "duration": 47557,
-      "id": "mySpanIdD",
-      "name": "GET opbeans-ruby:3000/api/products",
-      "offset": 0,
-      "parentId": "myTransactionId1",
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "span": Object {
-        "parent": Object {
-          "id": "myTransactionId1",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-node",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 47557,
-          },
-          "id": "mySpanIdD",
-          "name": "GET opbeans-ruby:3000/api/products",
-        },
-        "timestamp": Object {
-          "us": 1549324795785760,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId1",
-        },
-      },
-      "timestamp": 1549324795785760,
-    },
-    "myTransactionId1": Object {
-      "docType": "transaction",
-      "duration": 49660,
-      "errorCount": 2,
-      "id": "myTransactionId1",
-      "name": "GET /api",
-      "offset": 0,
-      "parentId": undefined,
-      "serviceName": "opbeans-node",
-      "skew": 0,
-      "timestamp": 1549324795784006,
-      "transaction": Object {
-        "processor": Object {
-          "event": "transaction",
-        },
-        "service": Object {
-          "name": "opbeans-node",
-        },
-        "timestamp": Object {
-          "us": 1549324795784006,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "duration": Object {
-            "us": 49660,
-          },
-          "id": "myTransactionId1",
-          "name": "GET /api",
+      "marks": Object {
+        "agent": Object {
+          "domComplete": 383,
+          "domInteractive": 382,
+          "timeToFirstByte": 14,
         },
       },
-    },
-    "myTransactionId2": Object {
-      "childIds": Array [
-        "mySpanIdA",
-      ],
-      "docType": "transaction",
-      "duration": 8634,
-      "errorCount": 3,
-      "id": "myTransactionId2",
       "name": "Api::ProductsController#index",
-      "offset": 0,
-      "parentId": "mySpanIdD",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "timestamp": 1549324795823304,
-      "transaction": Object {
+    },
+  },
+  "errorsCount": 0,
+  "errorsPerTransaction": Object {
+    "myTransactionId1": 2,
+    "myTransactionId2": 3,
+  },
+  "items": Array [
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "mySpanIdD",
         },
@@ -797,65 +876,26 @@ Object {
             "us": 8634,
           },
           "id": "myTransactionId2",
+          "marks": Object {
+            "agent": Object {
+              "domComplete": 383,
+              "domInteractive": 382,
+              "timeToFirstByte": 14,
+            },
+          },
           "name": "Api::ProductsController#index",
         },
       },
-    },
-  },
-  "orderedItems": Array [
-    Object {
-      "childIds": Array [
-        "mySpanIdA",
-      ],
       "docType": "transaction",
       "duration": 8634,
-      "errorCount": 3,
       "id": "myTransactionId2",
-      "name": "Api::ProductsController#index",
       "offset": 0,
+      "parent": undefined,
       "parentId": "mySpanIdD",
-      "serviceName": "opbeans-ruby",
       "skew": 0,
-      "timestamp": 1549324795823304,
-      "transaction": Object {
-        "parent": Object {
-          "id": "mySpanIdD",
-        },
-        "processor": Object {
-          "event": "transaction",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "timestamp": Object {
-          "us": 1549324795823304,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "duration": Object {
-            "us": 8634,
-          },
-          "id": "myTransactionId2",
-          "name": "Api::ProductsController#index",
-        },
-      },
     },
     Object {
-      "childIds": Array [
-        "mySpanIdB",
-        "mySpanIdC",
-      ],
-      "docType": "span",
-      "duration": 6161,
-      "id": "mySpanIdA",
-      "name": "Api::ProductsController#index",
-      "offset": 1200,
-      "parentId": "myTransactionId2",
-      "serviceName": "opbeans-ruby",
-      "skew": 0,
-      "span": Object {
+      "doc": Object {
         "parent": Object {
           "id": "myTransactionId2",
         },
@@ -882,19 +922,55 @@ Object {
           "id": "myTransactionId2",
         },
       },
-      "timestamp": 1549324795824504,
-    },
-    Object {
-      "childIds": Array [],
       "docType": "span",
-      "duration": 481,
-      "id": "mySpanIdB",
-      "name": "SELECT FROM products",
-      "offset": 2329,
-      "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
+      "duration": 6161,
+      "id": "mySpanIdA",
+      "offset": 1200,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "mySpanIdD",
+          },
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "timestamp": Object {
+            "us": 1549324795823304,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 8634,
+            },
+            "id": "myTransactionId2",
+            "marks": Object {
+              "agent": Object {
+                "domComplete": 383,
+                "domInteractive": 382,
+                "timeToFirstByte": 14,
+              },
+            },
+            "name": "Api::ProductsController#index",
+          },
+        },
+        "docType": "transaction",
+        "duration": 8634,
+        "id": "myTransactionId2",
+        "offset": 0,
+        "parent": undefined,
+        "parentId": "mySpanIdD",
+        "skew": 0,
+      },
+      "parentId": "myTransactionId2",
       "skew": 0,
-      "span": Object {
+    },
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "mySpanIdA",
         },
@@ -921,19 +997,90 @@ Object {
           "id": "myTransactionId2",
         },
       },
-      "timestamp": 1549324795825633,
-    },
-    Object {
-      "childIds": Array [],
       "docType": "span",
-      "duration": 532,
-      "id": "mySpanIdC",
-      "name": "SELECT FROM product",
-      "offset": 4601,
+      "duration": 481,
+      "id": "mySpanIdB",
+      "offset": 2329,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId2",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 6161,
+            },
+            "id": "mySpanIdA",
+            "name": "Api::ProductsController#index",
+          },
+          "timestamp": Object {
+            "us": 1549324795824504,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId2",
+          },
+        },
+        "docType": "span",
+        "duration": 6161,
+        "id": "mySpanIdA",
+        "offset": 1200,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "mySpanIdD",
+            },
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "timestamp": Object {
+              "us": 1549324795823304,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 8634,
+              },
+              "id": "myTransactionId2",
+              "marks": Object {
+                "agent": Object {
+                  "domComplete": 383,
+                  "domInteractive": 382,
+                  "timeToFirstByte": 14,
+                },
+              },
+              "name": "Api::ProductsController#index",
+            },
+          },
+          "docType": "transaction",
+          "duration": 8634,
+          "id": "myTransactionId2",
+          "offset": 0,
+          "parent": undefined,
+          "parentId": "mySpanIdD",
+          "skew": 0,
+        },
+        "parentId": "myTransactionId2",
+        "skew": 0,
+      },
       "parentId": "mySpanIdA",
-      "serviceName": "opbeans-ruby",
       "skew": 0,
-      "span": Object {
+    },
+    Object {
+      "doc": Object {
         "parent": Object {
           "id": "mySpanIdA",
         },
@@ -960,16 +1107,90 @@ Object {
           "id": "myTransactionId2",
         },
       },
-      "timestamp": 1549324795827905,
+      "docType": "span",
+      "duration": 532,
+      "id": "mySpanIdC",
+      "offset": 4601,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId2",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 6161,
+            },
+            "id": "mySpanIdA",
+            "name": "Api::ProductsController#index",
+          },
+          "timestamp": Object {
+            "us": 1549324795824504,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId2",
+          },
+        },
+        "docType": "span",
+        "duration": 6161,
+        "id": "mySpanIdA",
+        "offset": 1200,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "mySpanIdD",
+            },
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "timestamp": Object {
+              "us": 1549324795823304,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 8634,
+              },
+              "id": "myTransactionId2",
+              "marks": Object {
+                "agent": Object {
+                  "domComplete": 383,
+                  "domInteractive": 382,
+                  "timeToFirstByte": 14,
+                },
+              },
+              "name": "Api::ProductsController#index",
+            },
+          },
+          "docType": "transaction",
+          "duration": 8634,
+          "id": "myTransactionId2",
+          "offset": 0,
+          "parent": undefined,
+          "parentId": "mySpanIdD",
+          "skew": 0,
+        },
+        "parentId": "myTransactionId2",
+        "skew": 0,
+      },
+      "parentId": "mySpanIdA",
+      "skew": 0,
     },
   ],
-  "serviceColors": Object {
-    "opbeans-ruby": "#3185fc",
-  },
-  "services": Array [
-    "opbeans-ruby",
-  ],
-  "traceRoot": Object {
+  "rootTransaction": Object {
     "processor": Object {
       "event": "transaction",
     },
@@ -990,30 +1211,61 @@ Object {
       "name": "GET /api",
     },
   },
-  "traceRootDuration": 49660,
+  "serviceColors": Object {
+    "opbeans-ruby": "#3185fc",
+  },
 }
 `;
 
 exports[`waterfall_helpers getWaterfallItems should handle cyclic references 1`] = `
 Array [
   Object {
-    "childIds": Array [
-      "a",
-    ],
+    "doc": Object {
+      "timestamp": Object {
+        "us": 10,
+      },
+      "transaction": Object {
+        "id": "a",
+      },
+    },
+    "docType": "transaction",
     "id": "a",
     "offset": 0,
+    "parent": undefined,
     "skew": 0,
-    "timestamp": 10,
   },
   Object {
-    "childIds": Array [
-      "a",
-    ],
-    "id": "a",
+    "doc": Object {
+      "parent": Object {
+        "id": "a",
+      },
+      "span": Object {
+        "id": "b",
+      },
+      "timestamp": Object {
+        "us": 20,
+      },
+    },
+    "docType": "span",
+    "id": "b",
     "offset": 10,
+    "parent": Object {
+      "doc": Object {
+        "timestamp": Object {
+          "us": 10,
+        },
+        "transaction": Object {
+          "id": "a",
+        },
+      },
+      "docType": "transaction",
+      "id": "a",
+      "offset": 0,
+      "parent": undefined,
+      "skew": 0,
+    },
     "parentId": "a",
-    "skew": undefined,
-    "timestamp": 20,
+    "skew": 0,
   },
 ]
 `;
@@ -1021,89 +1273,280 @@ Array [
 exports[`waterfall_helpers getWaterfallItems should order items correctly 1`] = `
 Array [
   Object {
-    "childIds": Array [
-      "b2",
-      "b",
-    ],
+    "doc": Object {
+      "service": Object {
+        "name": "opbeans-java",
+      },
+      "timestamp": Object {
+        "us": 1536763736366000,
+      },
+      "transaction": Object {
+        "id": "a",
+        "name": "APIRestController#products",
+      },
+    },
     "docType": "transaction",
     "duration": 9480,
-    "errorCount": 0,
     "id": "a",
-    "name": "APIRestController#products",
     "offset": 0,
-    "serviceName": "opbeans-java",
+    "parent": undefined,
     "skew": 0,
-    "timestamp": 1536763736366000,
-    "transaction": Object {},
   },
   Object {
-    "childIds": Array [],
+    "doc": Object {
+      "parent": Object {
+        "id": "a",
+      },
+      "service": Object {
+        "name": "opbeans-java",
+      },
+      "span": Object {
+        "id": "b2",
+        "name": "GET [0:0:0:0:0:0:0:1]",
+      },
+      "timestamp": Object {
+        "us": 1536763736367000,
+      },
+      "transaction": Object {
+        "id": "a",
+      },
+    },
     "docType": "span",
     "duration": 4694,
     "id": "b2",
-    "name": "GET [0:0:0:0:0:0:0:1]",
     "offset": 1000,
+    "parent": Object {
+      "doc": Object {
+        "service": Object {
+          "name": "opbeans-java",
+        },
+        "timestamp": Object {
+          "us": 1536763736366000,
+        },
+        "transaction": Object {
+          "id": "a",
+          "name": "APIRestController#products",
+        },
+      },
+      "docType": "transaction",
+      "duration": 9480,
+      "id": "a",
+      "offset": 0,
+      "parent": undefined,
+      "skew": 0,
+    },
     "parentId": "a",
-    "serviceName": "opbeans-java",
     "skew": 0,
-    "span": Object {
+  },
+  Object {
+    "doc": Object {
+      "parent": Object {
+        "id": "a",
+      },
+      "service": Object {
+        "name": "opbeans-java",
+      },
+      "span": Object {
+        "id": "b",
+        "name": "GET [0:0:0:0:0:0:0:1]",
+      },
+      "timestamp": Object {
+        "us": 1536763736368000,
+      },
       "transaction": Object {
         "id": "a",
       },
     },
-    "timestamp": 1536763736367000,
-  },
-  Object {
-    "childIds": Array [
-      "c",
-    ],
     "docType": "span",
     "duration": 4694,
     "id": "b",
-    "name": "GET [0:0:0:0:0:0:0:1]",
     "offset": 2000,
+    "parent": Object {
+      "doc": Object {
+        "service": Object {
+          "name": "opbeans-java",
+        },
+        "timestamp": Object {
+          "us": 1536763736366000,
+        },
+        "transaction": Object {
+          "id": "a",
+          "name": "APIRestController#products",
+        },
+      },
+      "docType": "transaction",
+      "duration": 9480,
+      "id": "a",
+      "offset": 0,
+      "parent": undefined,
+      "skew": 0,
+    },
     "parentId": "a",
-    "serviceName": "opbeans-java",
     "skew": 0,
-    "span": Object {
+  },
+  Object {
+    "doc": Object {
+      "parent": Object {
+        "id": "b",
+      },
+      "service": Object {
+        "name": "opbeans-java",
+      },
+      "timestamp": Object {
+        "us": 1536763736369000,
+      },
       "transaction": Object {
-        "id": "a",
+        "id": "c",
+        "name": "APIRestController#productsRemote",
       },
     },
-    "timestamp": 1536763736368000,
-  },
-  Object {
-    "childIds": Array [
-      "d",
-    ],
     "docType": "transaction",
     "duration": 3581,
-    "errorCount": 0,
     "id": "c",
-    "name": "APIRestController#productsRemote",
     "offset": 3000,
+    "parent": Object {
+      "doc": Object {
+        "parent": Object {
+          "id": "a",
+        },
+        "service": Object {
+          "name": "opbeans-java",
+        },
+        "span": Object {
+          "id": "b",
+          "name": "GET [0:0:0:0:0:0:0:1]",
+        },
+        "timestamp": Object {
+          "us": 1536763736368000,
+        },
+        "transaction": Object {
+          "id": "a",
+        },
+      },
+      "docType": "span",
+      "duration": 4694,
+      "id": "b",
+      "offset": 2000,
+      "parent": Object {
+        "doc": Object {
+          "service": Object {
+            "name": "opbeans-java",
+          },
+          "timestamp": Object {
+            "us": 1536763736366000,
+          },
+          "transaction": Object {
+            "id": "a",
+            "name": "APIRestController#products",
+          },
+        },
+        "docType": "transaction",
+        "duration": 9480,
+        "id": "a",
+        "offset": 0,
+        "parent": undefined,
+        "skew": 0,
+      },
+      "parentId": "a",
+      "skew": 0,
+    },
     "parentId": "b",
-    "serviceName": "opbeans-java",
     "skew": 0,
-    "timestamp": 1536763736369000,
-    "transaction": Object {},
   },
   Object {
-    "childIds": Array [],
+    "doc": Object {
+      "parent": Object {
+        "id": "c",
+      },
+      "service": Object {
+        "name": "opbeans-java",
+      },
+      "span": Object {
+        "id": "d",
+        "name": "SELECT",
+      },
+      "timestamp": Object {
+        "us": 1536763736371000,
+      },
+      "transaction": Object {
+        "id": "c",
+      },
+    },
     "docType": "span",
     "duration": 210,
     "id": "d",
-    "name": "SELECT",
     "offset": 5000,
-    "parentId": "c",
-    "serviceName": "opbeans-java",
-    "skew": 0,
-    "span": Object {
-      "transaction": Object {
-        "id": "c",
+    "parent": Object {
+      "doc": Object {
+        "parent": Object {
+          "id": "b",
+        },
+        "service": Object {
+          "name": "opbeans-java",
+        },
+        "timestamp": Object {
+          "us": 1536763736369000,
+        },
+        "transaction": Object {
+          "id": "c",
+          "name": "APIRestController#productsRemote",
+        },
+      },
+      "docType": "transaction",
+      "duration": 3581,
+      "id": "c",
+      "offset": 3000,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "a",
+          },
+          "service": Object {
+            "name": "opbeans-java",
+          },
+          "span": Object {
+            "id": "b",
+            "name": "GET [0:0:0:0:0:0:0:1]",
+          },
+          "timestamp": Object {
+            "us": 1536763736368000,
+          },
+          "transaction": Object {
+            "id": "a",
+          },
+        },
+        "docType": "span",
+        "duration": 4694,
+        "id": "b",
+        "offset": 2000,
+        "parent": Object {
+          "doc": Object {
+            "service": Object {
+              "name": "opbeans-java",
+            },
+            "timestamp": Object {
+              "us": 1536763736366000,
+            },
+            "transaction": Object {
+              "id": "a",
+              "name": "APIRestController#products",
+            },
+          },
+          "docType": "transaction",
+          "duration": 9480,
+          "id": "a",
+          "offset": 0,
+          "parent": undefined,
+          "skew": 0,
+        },
+        "parentId": "a",
+        "skew": 0,
       },
+      "parentId": "b",
+      "skew": 0,
     },
-    "timestamp": 1536763736371000,
+    "parentId": "c",
+    "skew": 0,
   },
 ]
 `;
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts
index 6166515fd9d38..426842bc02f51 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts
@@ -11,8 +11,10 @@ import {
   getClockSkew,
   getOrderedWaterfallItems,
   getWaterfall,
-  IWaterfallItem
+  IWaterfallItem,
+  IWaterfallTransaction
 } from './waterfall_helpers';
+import { APMError } from '../../../../../../../../typings/es_schemas/ui/APMError';
 
 describe('waterfall_helpers', () => {
   describe('getWaterfall', () => {
@@ -80,7 +82,7 @@ describe('waterfall_helpers', () => {
         },
         timestamp: { us: 1549324795785760 }
       } as Span,
-      {
+      ({
         parent: { id: 'mySpanIdD' },
         processor: { event: 'transaction' },
         trace: { id: 'myTraceId' },
@@ -88,10 +90,36 @@ describe('waterfall_helpers', () => {
         transaction: {
           duration: { us: 8634 },
           name: 'Api::ProductsController#index',
-          id: 'myTransactionId2'
+          id: 'myTransactionId2',
+          marks: {
+            agent: {
+              domInteractive: 382,
+              domComplete: 383,
+              timeToFirstByte: 14
+            }
+          }
         },
         timestamp: { us: 1549324795823304 }
-      } as Transaction
+      } as unknown) as Transaction,
+      ({
+        processor: { event: 'error' },
+        parent: { id: 'myTransactionId1' },
+        timestamp: { us: 1549324795810000 },
+        trace: { id: 'myTraceId' },
+        transaction: { id: 'myTransactionId1' },
+        error: {
+          id: 'error1',
+          grouping_key: 'errorGroupingKey1',
+          log: {
+            message: 'error message'
+          }
+        },
+        service: { name: 'opbeans-ruby' },
+        agent: {
+          name: 'ruby',
+          version: '2'
+        }
+      } as unknown) as APMError
     ];
 
     it('should return full waterfall', () => {
@@ -107,8 +135,10 @@ describe('waterfall_helpers', () => {
         },
         entryTransactionId
       );
-      expect(waterfall.orderedItems.length).toBe(6);
-      expect(waterfall.orderedItems[0].id).toBe('myTransactionId1');
+
+      expect(waterfall.items.length).toBe(7);
+      expect(waterfall.items[0].id).toBe('myTransactionId1');
+      expect(waterfall.errorsCount).toEqual(1);
       expect(waterfall).toMatchSnapshot();
     });
 
@@ -125,26 +155,11 @@ describe('waterfall_helpers', () => {
         },
         entryTransactionId
       );
-      expect(waterfall.orderedItems.length).toBe(4);
-      expect(waterfall.orderedItems[0].id).toBe('myTransactionId2');
-      expect(waterfall).toMatchSnapshot();
-    });
 
-    it('getTransactionById', () => {
-      const entryTransactionId = 'myTransactionId1';
-      const errorsPerTransaction = {
-        myTransactionId1: 2,
-        myTransactionId2: 3
-      };
-      const waterfall = getWaterfall(
-        {
-          trace: { items: hits, exceedsMax: false },
-          errorsPerTransaction
-        },
-        entryTransactionId
-      );
-      const transaction = waterfall.getTransactionById('myTransactionId2');
-      expect(transaction!.transaction.id).toBe('myTransactionId2');
+      expect(waterfall.items.length).toBe(4);
+      expect(waterfall.items[0].id).toBe('myTransactionId2');
+      expect(waterfall.errorsCount).toEqual(0);
+      expect(waterfall).toMatchSnapshot();
     });
   });
 
@@ -152,84 +167,102 @@ describe('waterfall_helpers', () => {
     it('should order items correctly', () => {
       const items: IWaterfallItem[] = [
         {
+          docType: 'span',
+          doc: {
+            parent: { id: 'c' },
+            service: { name: 'opbeans-java' },
+            transaction: {
+              id: 'c'
+            },
+            timestamp: { us: 1536763736371000 },
+            span: {
+              id: 'd',
+              name: 'SELECT'
+            }
+          } as Span,
           id: 'd',
           parentId: 'c',
-          serviceName: 'opbeans-java',
-          name: 'SELECT',
           duration: 210,
-          timestamp: 1536763736371000,
           offset: 0,
-          skew: 0,
+          skew: 0
+        },
+        {
           docType: 'span',
-          span: {
+          doc: {
+            parent: { id: 'a' },
+            service: { name: 'opbeans-java' },
             transaction: {
-              id: 'c'
+              id: 'a'
+            },
+            timestamp: { us: 1536763736368000 },
+            span: {
+              id: 'b',
+              name: 'GET [0:0:0:0:0:0:0:1]'
             }
-          } as Span
-        },
-        {
+          } as Span,
           id: 'b',
           parentId: 'a',
-          serviceName: 'opbeans-java',
-          name: 'GET [0:0:0:0:0:0:0:1]',
           duration: 4694,
-          timestamp: 1536763736368000,
           offset: 0,
-          skew: 0,
+          skew: 0
+        },
+        {
           docType: 'span',
-          span: {
+          doc: {
+            parent: { id: 'a' },
+            service: { name: 'opbeans-java' },
             transaction: {
               id: 'a'
+            },
+            timestamp: { us: 1536763736367000 },
+            span: {
+              id: 'b2',
+              name: 'GET [0:0:0:0:0:0:0:1]'
             }
-          } as Span
-        },
-        {
+          } as Span,
           id: 'b2',
           parentId: 'a',
-          serviceName: 'opbeans-java',
-          name: 'GET [0:0:0:0:0:0:0:1]',
           duration: 4694,
-          timestamp: 1536763736367000,
           offset: 0,
-          skew: 0,
-          docType: 'span',
-          span: {
-            transaction: {
-              id: 'a'
-            }
-          } as Span
+          skew: 0
         },
         {
+          docType: 'transaction',
+          doc: {
+            parent: { id: 'b' },
+            service: { name: 'opbeans-java' },
+            timestamp: { us: 1536763736369000 },
+            transaction: { id: 'c', name: 'APIRestController#productsRemote' }
+          } as Transaction,
           id: 'c',
           parentId: 'b',
-          serviceName: 'opbeans-java',
-          name: 'APIRestController#productsRemote',
           duration: 3581,
-          timestamp: 1536763736369000,
           offset: 0,
-          skew: 0,
-          docType: 'transaction',
-          transaction: {} as Transaction,
-          errorCount: 0
+          skew: 0
         },
         {
+          docType: 'transaction',
+          doc: {
+            service: { name: 'opbeans-java' },
+            timestamp: { us: 1536763736366000 },
+            transaction: {
+              id: 'a',
+              name: 'APIRestController#products'
+            }
+          } as Transaction,
           id: 'a',
-          serviceName: 'opbeans-java',
-          name: 'APIRestController#products',
           duration: 9480,
-          timestamp: 1536763736366000,
           offset: 0,
-          skew: 0,
-          docType: 'transaction',
-          transaction: {} as Transaction,
-          errorCount: 0
+          skew: 0
         }
       ];
 
       const childrenByParentId = groupBy(items, hit =>
         hit.parentId ? hit.parentId : 'root'
       );
-      const entryTransactionItem = childrenByParentId.root[0];
+      const entryTransactionItem = childrenByParentId
+        .root[0] as IWaterfallTransaction;
+
       expect(
         getOrderedWaterfallItems(childrenByParentId, entryTransactionItem)
       ).toMatchSnapshot();
@@ -237,13 +270,32 @@ describe('waterfall_helpers', () => {
 
     it('should handle cyclic references', () => {
       const items = [
-        { id: 'a', timestamp: 10 } as IWaterfallItem,
-        { id: 'a', parentId: 'a', timestamp: 20 } as IWaterfallItem
+        {
+          docType: 'transaction',
+          id: 'a',
+          doc: ({
+            transaction: { id: 'a' },
+            timestamp: { us: 10 }
+          } as unknown) as Transaction
+        } as IWaterfallItem,
+        {
+          docType: 'span',
+          id: 'b',
+          parentId: 'a',
+          doc: ({
+            span: {
+              id: 'b'
+            },
+            parent: { id: 'a' },
+            timestamp: { us: 20 }
+          } as unknown) as Span
+        } as IWaterfallItem
       ];
       const childrenByParentId = groupBy(items, hit =>
         hit.parentId ? hit.parentId : 'root'
       );
-      const entryTransactionItem = childrenByParentId.root[0];
+      const entryTransactionItem = childrenByParentId
+        .root[0] as IWaterfallTransaction;
       expect(
         getOrderedWaterfallItems(childrenByParentId, entryTransactionItem)
       ).toMatchSnapshot();
@@ -254,12 +306,17 @@ describe('waterfall_helpers', () => {
     it('should adjust when child starts before parent', () => {
       const child = {
         docType: 'transaction',
-        timestamp: 0,
+        doc: {
+          timestamp: { us: 0 }
+        },
         duration: 50
       } as IWaterfallItem;
 
       const parent = {
-        timestamp: 100,
+        docType: 'transaction',
+        doc: {
+          timestamp: { us: 100 }
+        },
         duration: 100,
         skew: 5
       } as IWaterfallItem;
@@ -270,12 +327,17 @@ describe('waterfall_helpers', () => {
     it('should not adjust when child starts after parent has ended', () => {
       const child = {
         docType: 'transaction',
-        timestamp: 250,
+        doc: {
+          timestamp: { us: 250 }
+        },
         duration: 50
       } as IWaterfallItem;
 
       const parent = {
-        timestamp: 100,
+        docType: 'transaction',
+        doc: {
+          timestamp: { us: 100 }
+        },
         duration: 100,
         skew: 5
       } as IWaterfallItem;
@@ -286,12 +348,17 @@ describe('waterfall_helpers', () => {
     it('should not adjust when child starts within parent duration', () => {
       const child = {
         docType: 'transaction',
-        timestamp: 150,
+        doc: {
+          timestamp: { us: 150 }
+        },
         duration: 50
       } as IWaterfallItem;
 
       const parent = {
-        timestamp: 100,
+        docType: 'transaction',
+        doc: {
+          timestamp: { us: 100 }
+        },
         duration: 100,
         skew: 5
       } as IWaterfallItem;
@@ -305,7 +372,27 @@ describe('waterfall_helpers', () => {
       } as IWaterfallItem;
 
       const parent = {
-        timestamp: 100,
+        docType: 'span',
+        doc: {
+          timestamp: { us: 100 }
+        },
+        duration: 100,
+        skew: 5
+      } as IWaterfallItem;
+
+      expect(getClockSkew(child, parent)).toBe(5);
+    });
+
+    it('should return parent skew for errors', () => {
+      const child = {
+        docType: 'error'
+      } as IWaterfallItem;
+
+      const parent = {
+        docType: 'transaction',
+        doc: {
+          timestamp: { us: 100 }
+        },
         duration: 100,
         skew: 5
       } as IWaterfallItem;
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 2a69c5f51173d..1af6cddb3ba4a 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
@@ -6,60 +6,52 @@
 
 import theme from '@elastic/eui/dist/eui_theme_light.json';
 import {
+  first,
   flatten,
   groupBy,
-  indexBy,
+  isEmpty,
   sortBy,
+  sum,
   uniq,
-  zipObject,
-  isEmpty,
-  first
+  zipObject
 } from 'lodash';
 import { TraceAPIResponse } from '../../../../../../../../server/lib/traces/get_trace';
+import { APMError } from '../../../../../../../../typings/es_schemas/ui/APMError';
 import { Span } from '../../../../../../../../typings/es_schemas/ui/Span';
 import { Transaction } from '../../../../../../../../typings/es_schemas/ui/Transaction';
 
-interface IWaterfallIndex {
-  [key: string]: IWaterfallItem | undefined;
-}
-
 interface IWaterfallGroup {
   [key: string]: IWaterfallItem[];
 }
 
 export interface IWaterfall {
   entryTransaction?: Transaction;
-  traceRoot?: Transaction;
-  traceRootDuration?: number;
+  rootTransaction?: Transaction;
 
   /**
    * Duration in us
    */
   duration: number;
-  services: string[];
-  orderedItems: IWaterfallItem[];
-  itemsById: IWaterfallIndex;
-  getTransactionById: (id?: IWaterfallItem['id']) => Transaction | undefined;
-  errorCountByTransactionId: TraceAPIResponse['errorsPerTransaction'];
+  items: IWaterfallItem[];
+  errorsPerTransaction: TraceAPIResponse['errorsPerTransaction'];
+  errorsCount: number;
   serviceColors: IServiceColors;
 }
 
-interface IWaterfallItemBase {
-  id: string | number;
+interface IWaterfallItemBase<T, U> {
+  docType: U;
+  doc: T;
+
+  id: string;
+
+  parent?: IWaterfallItem;
   parentId?: string;
-  serviceName: string;
-  name: string;
 
   /**
    * Duration in us
    */
   duration: number;
 
-  /**
-   * start timestamp in us
-   */
-  timestamp: number;
-
   /**
    * offset from first item in us
    */
@@ -69,53 +61,53 @@ interface IWaterfallItemBase {
    * skew from timestamp in us
    */
   skew: number;
-  childIds?: Array<IWaterfallItemBase['id']>;
-}
-
-interface IWaterfallItemTransaction extends IWaterfallItemBase {
-  transaction: Transaction;
-  docType: 'transaction';
-  errorCount: number;
 }
 
-interface IWaterfallItemSpan extends IWaterfallItemBase {
-  span: Span;
-  docType: 'span';
-}
+export type IWaterfallTransaction = IWaterfallItemBase<
+  Transaction,
+  'transaction'
+>;
+export type IWaterfallSpan = IWaterfallItemBase<Span, 'span'>;
+export type IWaterfallError = IWaterfallItemBase<APMError, 'error'>;
 
-export type IWaterfallItem = IWaterfallItemSpan | IWaterfallItemTransaction;
+export type IWaterfallItem =
+  | IWaterfallTransaction
+  | IWaterfallSpan
+  | IWaterfallError;
 
-function getTransactionItem(
-  transaction: Transaction,
-  errorsPerTransaction: TraceAPIResponse['errorsPerTransaction']
-): IWaterfallItemTransaction {
+function getTransactionItem(transaction: Transaction): IWaterfallTransaction {
   return {
+    docType: 'transaction',
+    doc: transaction,
     id: transaction.transaction.id,
-    parentId: transaction.parent && transaction.parent.id,
-    serviceName: transaction.service.name,
-    name: transaction.transaction.name,
+    parentId: transaction.parent?.id,
     duration: transaction.transaction.duration.us,
-    timestamp: transaction.timestamp.us,
     offset: 0,
-    skew: 0,
-    docType: 'transaction',
-    transaction,
-    errorCount: errorsPerTransaction[transaction.transaction.id] || 0
+    skew: 0
   };
 }
 
-function getSpanItem(span: Span): IWaterfallItemSpan {
+function getSpanItem(span: Span): IWaterfallSpan {
   return {
+    docType: 'span',
+    doc: span,
     id: span.span.id,
-    parentId: span.parent && span.parent.id,
-    serviceName: span.service.name,
-    name: span.span.name,
+    parentId: span.parent?.id,
     duration: span.span.duration.us,
-    timestamp: span.timestamp.us,
+    offset: 0,
+    skew: 0
+  };
+}
+
+function getErrorItem(error: APMError): IWaterfallError {
+  return {
+    docType: 'error',
+    doc: error,
+    id: error.error.id,
+    parentId: error.parent?.id,
     offset: 0,
     skew: 0,
-    docType: 'span',
-    span
+    duration: 0
   };
 }
 
@@ -126,18 +118,17 @@ export function getClockSkew(
   if (!parentItem) {
     return 0;
   }
-
   switch (item.docType) {
-    // don't calculate skew for spans. Just use parent's skew
+    // don't calculate skew for spans and errors. Just use parent's skew
+    case 'error':
     case 'span':
       return parentItem.skew;
-
     // transaction is the inital entry in a service. Calculate skew for this, and it will be propogated to all child spans
     case 'transaction': {
-      const parentStart = parentItem.timestamp + parentItem.skew;
+      const parentStart = parentItem.doc.timestamp.us + parentItem.skew;
 
       // determine if child starts before the parent
-      const offsetStart = parentStart - item.timestamp;
+      const offsetStart = parentStart - item.doc.timestamp.us;
       if (offsetStart > 0) {
         const latency = Math.max(parentItem.duration - item.duration, 0) / 2;
         return offsetStart + latency;
@@ -151,9 +142,14 @@ export function getClockSkew(
 
 export function getOrderedWaterfallItems(
   childrenByParentId: IWaterfallGroup,
-  entryTransactionItem: IWaterfallItem
+  entryWaterfallTransaction?: IWaterfallTransaction
 ) {
+  if (!entryWaterfallTransaction) {
+    return [];
+  }
+  const entryTimestamp = entryWaterfallTransaction.doc.timestamp.us;
   const visitedWaterfallItemSet = new Set();
+
   function getSortedChildren(
     item: IWaterfallItem,
     parentItem?: IWaterfallItem
@@ -162,10 +158,16 @@ export function getOrderedWaterfallItems(
       return [];
     }
     visitedWaterfallItemSet.add(item);
-    const children = sortBy(childrenByParentId[item.id] || [], 'timestamp');
 
-    item.childIds = children.map(child => child.id);
-    item.offset = item.timestamp - entryTransactionItem.timestamp;
+    const children = sortBy(
+      childrenByParentId[item.id] || [],
+      'doc.timestamp.us'
+    );
+
+    item.parent = parentItem;
+    // get offset from the beginning of trace
+    item.offset = item.doc.timestamp.us - entryTimestamp;
+    // move the item to the right if it starts before its parent
     item.skew = getClockSkew(item, parentItem);
 
     const deepChildren = flatten(
@@ -174,24 +176,21 @@ export function getOrderedWaterfallItems(
     return [item, ...deepChildren];
   }
 
-  return getSortedChildren(entryTransactionItem);
+  return getSortedChildren(entryWaterfallTransaction);
 }
 
-function getTraceRoot(childrenByParentId: IWaterfallGroup) {
+function getRootTransaction(childrenByParentId: IWaterfallGroup) {
   const item = first(childrenByParentId.root);
   if (item && item.docType === 'transaction') {
-    return item.transaction;
+    return item.doc;
   }
 }
 
-function getServices(items: IWaterfallItem[]) {
-  const serviceNames = items.map(item => item.serviceName);
-  return uniq(serviceNames);
-}
-
 export type IServiceColors = Record<string, string>;
 
-function getServiceColors(services: string[]) {
+function getServiceColors(waterfallItems: IWaterfallItem[]) {
+  const services = uniq(waterfallItems.map(item => item.doc.service.name));
+
   const assignedColors = [
     theme.euiColorVis1,
     theme.euiColorVis0,
@@ -205,30 +204,35 @@ function getServiceColors(services: string[]) {
   return zipObject(services, assignedColors) as IServiceColors;
 }
 
-function getDuration(items: IWaterfallItem[]) {
-  if (items.length === 0) {
-    return 0;
-  }
-  const timestampStart = items[0].timestamp;
-  const timestampEnd = Math.max(
-    ...items.map(item => item.timestamp + item.duration + item.skew)
+const getWaterfallDuration = (waterfallItems: IWaterfallItem[]) =>
+  Math.max(
+    ...waterfallItems.map(item => item.offset + item.skew + item.duration),
+    0
   );
-  return timestampEnd - timestampStart;
-}
 
-function createGetTransactionById(itemsById: IWaterfallIndex) {
-  return (id?: IWaterfallItem['id']) => {
-    if (!id) {
-      return undefined;
+const getWaterfallItems = (items: TraceAPIResponse['trace']['items']) =>
+  items.map(item => {
+    const docType = item.processor.event;
+    switch (docType) {
+      case 'span':
+        return getSpanItem(item as Span);
+      case 'transaction':
+        return getTransactionItem(item as Transaction);
+      case 'error':
+        return getErrorItem(item as APMError);
     }
+  });
 
-    const item = itemsById[id];
-    const isTransaction = item?.docType === 'transaction';
-    if (isTransaction) {
-      return (item as IWaterfallItemTransaction).transaction;
-    }
-  };
-}
+const getChildrenGroupedByParentId = (waterfallItems: IWaterfallItem[]) =>
+  groupBy(waterfallItems, item => (item.parentId ? item.parentId : 'root'));
+
+const getEntryWaterfallTransaction = (
+  entryTransactionId: string,
+  waterfallItems: IWaterfallItem[]
+): IWaterfallTransaction | undefined =>
+  waterfallItems.find(
+    item => item.docType === 'transaction' && item.id === entryTransactionId
+  ) as IWaterfallTransaction;
 
 export function getWaterfall(
   { trace, errorsPerTransaction }: TraceAPIResponse,
@@ -236,59 +240,41 @@ export function getWaterfall(
 ): IWaterfall {
   if (isEmpty(trace.items) || !entryTransactionId) {
     return {
-      services: [],
       duration: 0,
-      orderedItems: [],
-      itemsById: {},
-      getTransactionById: () => undefined,
-      errorCountByTransactionId: errorsPerTransaction,
+      items: [],
+      errorsPerTransaction,
+      errorsCount: sum(Object.values(errorsPerTransaction)),
       serviceColors: {}
     };
   }
 
-  const waterfallItems = trace.items.map(traceItem => {
-    const docType = traceItem.processor.event;
-    switch (docType) {
-      case 'span':
-        return getSpanItem(traceItem as Span);
-      case 'transaction':
-        return getTransactionItem(
-          traceItem as Transaction,
-          errorsPerTransaction
-        );
-    }
-  });
+  const waterfallItems: IWaterfallItem[] = getWaterfallItems(trace.items);
+
+  const childrenByParentId = getChildrenGroupedByParentId(waterfallItems);
 
-  const childrenByParentId = groupBy(waterfallItems, item =>
-    item.parentId ? item.parentId : 'root'
+  const entryWaterfallTransaction = getEntryWaterfallTransaction(
+    entryTransactionId,
+    waterfallItems
   );
-  const entryTransactionItem = waterfallItems.find(
-    waterfallItem =>
-      waterfallItem.docType === 'transaction' &&
-      waterfallItem.id === entryTransactionId
+
+  const items = getOrderedWaterfallItems(
+    childrenByParentId,
+    entryWaterfallTransaction
   );
-  const itemsById: IWaterfallIndex = indexBy(waterfallItems, 'id');
-  const orderedItems = entryTransactionItem
-    ? getOrderedWaterfallItems(childrenByParentId, entryTransactionItem)
-    : [];
-  const traceRoot = getTraceRoot(childrenByParentId);
-  const duration = getDuration(orderedItems);
-  const traceRootDuration = traceRoot && traceRoot.transaction.duration.us;
-  const services = getServices(orderedItems);
-  const getTransactionById = createGetTransactionById(itemsById);
-  const serviceColors = getServiceColors(services);
-  const entryTransaction = getTransactionById(entryTransactionId);
+
+  const rootTransaction = getRootTransaction(childrenByParentId);
+  const duration = getWaterfallDuration(items);
+  const serviceColors = getServiceColors(items);
+
+  const entryTransaction = entryWaterfallTransaction?.doc;
 
   return {
     entryTransaction,
-    traceRoot,
-    traceRootDuration,
+    rootTransaction,
     duration,
-    services,
-    orderedItems,
-    itemsById,
-    getTransactionById,
-    errorCountByTransactionId: errorsPerTransaction,
+    items,
+    errorsPerTransaction,
+    errorsCount: items.filter(item => item.docType === 'error').length,
     serviceColors
   };
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.test.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.test.ts
deleted file mode 100644
index 9c805bb1cf385..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.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 { Transaction } from '../../../../../../typings/es_schemas/ui/Transaction';
-import { getAgentMarks } from './get_agent_marks';
-
-describe('getAgentMarks', () => {
-  it('should sort the marks by time', () => {
-    const transaction: Transaction = {
-      transaction: {
-        marks: {
-          agent: {
-            domInteractive: 117,
-            timeToFirstByte: 10,
-            domComplete: 118
-          }
-        }
-      }
-    } as any;
-    expect(getAgentMarks(transaction)).toEqual([
-      { name: 'timeToFirstByte', us: 10000 },
-      { name: 'domInteractive', us: 117000 },
-      { name: 'domComplete', us: 118000 }
-    ]);
-  });
-
-  it('should return empty array if marks are missing', () => {
-    const transaction: Transaction = {
-      transaction: {}
-    } as any;
-    expect(getAgentMarks(transaction)).toEqual([]);
-  });
-
-  it('should return empty array if agent marks are missing', () => {
-    const transaction: Transaction = {
-      transaction: { marks: {} }
-    } as any;
-    expect(getAgentMarks(transaction)).toEqual([]);
-  });
-});
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.ts b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.ts
deleted file mode 100644
index af76451db68b7..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/get_agent_marks.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 { sortBy } from 'lodash';
-import { Transaction } from '../../../../../../typings/es_schemas/ui/Transaction';
-
-export interface AgentMark {
-  name: string;
-  us: number;
-}
-
-export function getAgentMarks(transaction: Transaction): AgentMark[] {
-  if (!(transaction.transaction.marks && transaction.transaction.marks.agent)) {
-    return [];
-  }
-
-  return sortBy(
-    Object.entries(transaction.transaction.marks.agent).map(([name, ms]) => ({
-      name,
-      us: ms * 1000
-    })),
-    'us'
-  );
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx
index 2f34cc86c5cfc..77be5c999f7c3 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx
@@ -6,16 +6,13 @@
 
 import { Location } from 'history';
 import React from 'react';
-import { Transaction } from '../../../../../../typings/es_schemas/ui/Transaction';
 import { IUrlParams } from '../../../../../context/UrlParamsContext/types';
-import { getAgentMarks } from './get_agent_marks';
 import { ServiceLegends } from './ServiceLegends';
 import { Waterfall } from './Waterfall';
 import { IWaterfall } from './Waterfall/waterfall_helpers/waterfall_helpers';
 
 interface Props {
   urlParams: IUrlParams;
-  transaction: Transaction;
   location: Location;
   waterfall: IWaterfall;
   exceedsMax: boolean;
@@ -24,11 +21,9 @@ interface Props {
 export function WaterfallContainer({
   location,
   urlParams,
-  transaction,
   waterfall,
   exceedsMax
 }: Props) {
-  const agentMarks = getAgentMarks(transaction);
   if (!waterfall) {
     return null;
   }
@@ -37,10 +32,8 @@ export function WaterfallContainer({
     <div>
       <ServiceLegends serviceColors={waterfall.serviceColors} />
       <Waterfall
-        agentMarks={agentMarks}
         location={location}
-        serviceColors={waterfall.serviceColors}
-        urlParams={urlParams}
+        waterfallItemId={urlParams.waterfallItemId}
         waterfall={waterfall}
         exceedsMax={exceedsMax}
       />
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/__tests__/ErrorCount.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/__tests__/ErrorCount.test.tsx
new file mode 100644
index 0000000000000..62b5f7834d3a9
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/__tests__/ErrorCount.test.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { fireEvent, render } from '@testing-library/react';
+import React from 'react';
+import { expectTextsInDocument } from '../../../../../utils/testHelpers';
+import { ErrorCount } from '../ErrorCount';
+
+describe('ErrorCount', () => {
+  it('shows singular error message', () => {
+    const component = render(<ErrorCount count={1} />);
+    expectTextsInDocument(component, ['1 Error']);
+  });
+  it('shows plural error message', () => {
+    const component = render(<ErrorCount count={2} />);
+    expectTextsInDocument(component, ['2 Errors']);
+  });
+  it('prevents click propagation', () => {
+    const mock = jest.fn();
+    const { getByText } = render(
+      <button onClick={mock}>
+        <ErrorCount count={1} />
+      </button>
+    );
+    fireEvent(
+      getByText('1 Error'),
+      new MouseEvent('click', {
+        bubbles: true,
+        cancelable: true
+      })
+    );
+    expect(mock).not.toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
index b56370a59c8e2..6dcab6c6b97c1 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
@@ -5,30 +5,29 @@
  */
 
 import {
+  EuiEmptyPrompt,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiPagination,
   EuiPanel,
   EuiSpacer,
-  EuiEmptyPrompt,
-  EuiTitle,
-  EuiPagination
+  EuiTitle
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
-import React, { useState, useEffect } from 'react';
-import { sum } from 'lodash';
+import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
-import { IUrlParams } from '../../../../context/UrlParamsContext/types';
-import { TransactionActionMenu } from '../../../shared/TransactionActionMenu/TransactionActionMenu';
-import { TransactionTabs } from './TransactionTabs';
-import { IWaterfall } from './WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers';
-import { LoadingStatePrompt } from '../../../shared/LoadingStatePrompt';
-import { TransactionSummary } from '../../../shared/Summary/TransactionSummary';
 import { IBucket } from '../../../../../server/lib/transactions/distribution/get_buckets/transform';
+import { IUrlParams } from '../../../../context/UrlParamsContext/types';
+import { px, units } from '../../../../style/variables';
 import { history } from '../../../../utils/history';
 import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
+import { LoadingStatePrompt } from '../../../shared/LoadingStatePrompt';
+import { TransactionSummary } from '../../../shared/Summary/TransactionSummary';
+import { TransactionActionMenu } from '../../../shared/TransactionActionMenu/TransactionActionMenu';
 import { MaybeViewTraceLink } from './MaybeViewTraceLink';
-import { units, px } from '../../../../style/variables';
+import { TransactionTabs } from './TransactionTabs';
+import { IWaterfall } from './WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers';
 
 const PaginationContainer = styled.div`
   margin-left: ${px(units.quarter)};
@@ -140,8 +139,8 @@ export const WaterfallWithSummmary: React.FC<Props> = ({
       <EuiSpacer size="s" />
 
       <TransactionSummary
-        errorCount={sum(Object.values(waterfall.errorCountByTransactionId))}
-        totalDuration={waterfall.traceRootDuration}
+        errorCount={waterfall.errorsCount}
+        totalDuration={waterfall.rootTransaction?.transaction.duration.us}
         transaction={entryTransaction}
       />
       <EuiSpacer size="s" />
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/index.tsx
index dbd0e9d3b9d22..9d6639b000762 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionDetails/index.tsx
@@ -50,7 +50,7 @@ export function TransactionDetails() {
 
   const localUIFiltersConfig = useMemo(() => {
     const config: React.ComponentProps<typeof LocalUIFilters> = {
-      filterNames: ['transactionResult'],
+      filterNames: ['transactionResult', 'serviceVersion'],
       projection: PROJECTION.TRANSACTIONS,
       params: {
         transactionName,
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/index.tsx
index de356b5812e9a..439e3d80eef4f 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/index.tsx
@@ -96,7 +96,13 @@ export function TransactionOverview() {
 
   const localFiltersConfig: React.ComponentProps<typeof LocalUIFilters> = useMemo(
     () => ({
-      filterNames: ['transactionResult', 'host', 'containerId', 'podName'],
+      filterNames: [
+        'transactionResult',
+        'host',
+        'containerId',
+        'podName',
+        'serviceVersion'
+      ],
       params: {
         serviceName,
         transactionType
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
index 0312e94d7ee19..eba59f6e3ce44 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
@@ -18,7 +18,7 @@ interface Props extends EuiLinkAnchorProps {
   children?: React.ReactNode;
 }
 
-export type APMLinkExtendProps = Omit<Props, 'path' | 'query'>;
+export type APMLinkExtendProps = Omit<Props, 'path'>;
 
 export const PERSISTENT_APM_PARAMS = [
   'kuery',
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ErrorOverviewLink.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ErrorOverviewLink.tsx
index c99c7f12062e2..fcc0dc7d26695 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ErrorOverviewLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ErrorOverviewLink.tsx
@@ -21,7 +21,8 @@ const ErrorOverviewLink = ({ serviceName, query, ...rest }: Props) => {
     urlParams,
     'host',
     'containerId',
-    'podName'
+    'podName',
+    'serviceVersion'
   );
 
   return (
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/MetricOverviewLink.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/MetricOverviewLink.tsx
index dd988f3e3720d..7d21e1efa44f2 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/MetricOverviewLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/MetricOverviewLink.tsx
@@ -19,7 +19,8 @@ const MetricOverviewLink = ({ serviceName, ...rest }: Props) => {
     urlParams,
     'host',
     'containerId',
-    'podName'
+    'podName',
+    'serviceVersion'
   );
 
   return (
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ServiceNodeMetricOverviewLink.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ServiceNodeMetricOverviewLink.tsx
index 925d85fa0663e..527c3da9e7e1c 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ServiceNodeMetricOverviewLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ServiceNodeMetricOverviewLink.tsx
@@ -24,7 +24,8 @@ const ServiceNodeMetricOverviewLink = ({
     urlParams,
     'host',
     'containerId',
-    'podName'
+    'podName',
+    'serviceVersion'
   );
 
   return (
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ServiceNodeOverviewLink.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ServiceNodeOverviewLink.tsx
index 10e55d3382448..db1b6ec117bf4 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ServiceNodeOverviewLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/ServiceNodeOverviewLink.tsx
@@ -19,7 +19,8 @@ const ServiceNodeOverviewLink = ({ serviceName, ...rest }: Props) => {
     urlParams,
     'host',
     'containerId',
-    'podName'
+    'podName',
+    'serviceVersion'
   );
 
   return (
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/TransactionDetailLink.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/TransactionDetailLink.tsx
index a4ac05379615a..784f9b36ff621 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/TransactionDetailLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/TransactionDetailLink.tsx
@@ -27,7 +27,11 @@ export const TransactionDetailLink = ({
 }: Props) => {
   const { urlParams } = useUrlParams();
 
-  const persistedFilters = pickKeys(urlParams, 'transactionResult');
+  const persistedFilters = pickKeys(
+    urlParams,
+    'transactionResult',
+    'serviceVersion'
+  );
 
   return (
     <APMLink
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/TransactionOverviewLink.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/TransactionOverviewLink.tsx
index d300b259fccb8..af60a0a748445 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/TransactionOverviewLink.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/apm/TransactionOverviewLink.tsx
@@ -20,7 +20,8 @@ const TransactionOverviewLink = ({ serviceName, ...rest }: Props) => {
     'transactionResult',
     'host',
     'containerId',
-    'podName'
+    'podName',
+    'serviceVersion'
   );
 
   return (
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/LoadingStatePrompt.tsx b/x-pack/legacy/plugins/apm/public/components/shared/LoadingStatePrompt.tsx
index f68e2978f680f..e1cf07c03dee9 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/LoadingStatePrompt.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/LoadingStatePrompt.tsx
@@ -5,20 +5,14 @@
  */
 
 import React from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiEmptyPrompt } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
 
 export function LoadingStatePrompt() {
   return (
-    <EuiEmptyPrompt
-      title={
-        <div>
-          {i18n.translate('xpack.apm.loading.prompt', {
-            defaultMessage: 'Loading...'
-          })}
-        </div>
-      }
-      titleSize="s"
-    />
+    <EuiFlexGroup justifyContent="spaceAround">
+      <EuiFlexItem grow={false}>
+        <EuiLoadingSpinner size="l" />
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 }
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 53c66e04c468a..c8404b02afe70 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
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiBasicTable } from '@elastic/eui';
+import { EuiBasicTable, EuiBasicTableColumn } from '@elastic/eui';
 import { sortByOrder } from 'lodash';
 import React, { useMemo, useCallback, ReactNode } from 'react';
 import { useUrlParams } from '../../../hooks/useUrlParams';
@@ -69,8 +69,8 @@ function UnoptimizedManagedTable<T>(props: Props<T>) {
   const sort = useMemo(() => {
     return {
       sort: {
-        field: sortField,
-        direction: sortDirection
+        field: sortField as keyof T,
+        direction: sortDirection as 'asc' | 'desc'
       }
     };
   }, [sortField, sortDirection]);
@@ -78,7 +78,7 @@ function UnoptimizedManagedTable<T>(props: Props<T>) {
   const onTableChange = useCallback(
     (options: {
       page: { index: number; size: number };
-      sort: { field: string; direction: 'asc' | 'desc' };
+      sort?: { field: keyof T; direction: 'asc' | 'desc' };
     }) => {
       history.push({
         ...history.location,
@@ -86,8 +86,8 @@ function UnoptimizedManagedTable<T>(props: Props<T>) {
           ...toQuery(history.location.search),
           page: options.page.index,
           pageSize: options.page.size,
-          sortField: options.sort.field,
-          sortDirection: options.sort.direction
+          sortField: options.sort!.field,
+          sortDirection: options.sort!.direction
         })
       });
     },
@@ -107,7 +107,7 @@ function UnoptimizedManagedTable<T>(props: Props<T>) {
     <EuiBasicTable
       noItemsMessage={noItemsMessage}
       items={renderedItems}
-      columns={columns}
+      columns={(columns as unknown) as Array<EuiBasicTableColumn<T>>} // EuiBasicTableColumn is stricter than ITableColumn
       pagination={pagination}
       sorting={sort}
       onChange={onTableChange}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx
index 4b6355034f16a..99d8a0790a816 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/SpanMetadata/__test__/SpanMetadata.test.tsx
@@ -31,11 +31,15 @@ describe('SpanMetadata', () => {
           name: 'opbeans-java'
         },
         span: {
-          id: '7efbc7056b746fcb'
+          id: '7efbc7056b746fcb',
+          message: {
+            age: { ms: 1577958057123 },
+            queue: { name: 'queue name' }
+          }
         }
       } as unknown) as Span;
       const output = render(<SpanMetadata span={span} />, renderOptions);
-      expectTextsInDocument(output, ['Service', 'Agent']);
+      expectTextsInDocument(output, ['Service', 'Agent', 'Message']);
     });
   });
   describe('when a span is presented', () => {
@@ -55,11 +59,15 @@ describe('SpanMetadata', () => {
             response: { status_code: 200 }
           },
           subtype: 'http',
-          type: 'external'
+          type: 'external',
+          message: {
+            age: { ms: 1577958057123 },
+            queue: { name: 'queue name' }
+          }
         }
       } as unknown) as Span;
       const output = render(<SpanMetadata span={span} />, renderOptions);
-      expectTextsInDocument(output, ['Service', 'Agent', 'Span']);
+      expectTextsInDocument(output, ['Service', 'Agent', 'Span', 'Message']);
     });
   });
   describe('when there is no id inside span', () => {
@@ -83,7 +91,7 @@ describe('SpanMetadata', () => {
       } as unknown) as Span;
       const output = render(<SpanMetadata span={span} />, renderOptions);
       expectTextsInDocument(output, ['Service', 'Agent']);
-      expectTextsNotInDocument(output, ['Span']);
+      expectTextsNotInDocument(output, ['Span', 'Message']);
     });
   });
 });
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 7012bbcc8fcea..5a83a9bf4ef9e 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
@@ -11,7 +11,8 @@ import {
   SPAN,
   LABELS,
   TRANSACTION,
-  TRACE
+  TRACE,
+  MESSAGE_SPAN
 } from '../sections';
 
 export const SPAN_METADATA_SECTIONS: Section[] = [
@@ -20,5 +21,6 @@ export const SPAN_METADATA_SECTIONS: Section[] = [
   TRANSACTION,
   TRACE,
   SERVICE,
+  MESSAGE_SPAN,
   AGENT
 ];
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx
index 1fcb093fa0354..93e87e884ea76 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/TransactionMetadata/__test__/TransactionMetadata.test.tsx
@@ -35,6 +35,10 @@ function getTransaction() {
       notIncluded: 'transaction not included value',
       custom: {
         someKey: 'custom value'
+      },
+      message: {
+        age: { ms: 1577958057123 },
+        queue: { name: 'queue name' }
       }
     }
   } as unknown) as Transaction;
@@ -59,7 +63,8 @@ describe('TransactionMetadata', () => {
       'Agent',
       'URL',
       'User',
-      'Custom'
+      'Custom',
+      'Message'
     ]);
   });
 
@@ -81,7 +86,9 @@ describe('TransactionMetadata', () => {
       'agent.someKey',
       'url.someKey',
       'user.someKey',
-      'transaction.custom.someKey'
+      'transaction.custom.someKey',
+      'transaction.message.age.ms',
+      'transaction.message.queue.name'
     ]);
 
     // excluded keys
@@ -109,7 +116,9 @@ describe('TransactionMetadata', () => {
       'agent value',
       'url value',
       'user value',
-      'custom value'
+      'custom value',
+      '1577958057123',
+      'queue name'
     ]);
 
     // excluded values
@@ -138,7 +147,8 @@ describe('TransactionMetadata', () => {
       'Process',
       'Agent',
       'URL',
-      'Custom'
+      'Custom',
+      'Message'
     ]);
   });
 });
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 6b30c82bc35a0..18751efc6e1c1 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
@@ -18,7 +18,8 @@ import {
   PAGE,
   USER,
   USER_AGENT,
-  CUSTOM_TRANSACTION
+  CUSTOM_TRANSACTION,
+  MESSAGE_TRANSACTION
 } from '../sections';
 
 export const TRANSACTION_METADATA_SECTIONS: Section[] = [
@@ -29,6 +30,7 @@ export const TRANSACTION_METADATA_SECTIONS: Section[] = [
   CONTAINER,
   SERVICE,
   PROCESS,
+  MESSAGE_TRANSACTION,
   AGENT,
   URL,
   { ...PAGE, key: 'transaction.page' },
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/sections.ts b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/sections.ts
index 403663ce2095a..ac8e9559357e3 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/sections.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/MetadataTable/sections.ts
@@ -136,3 +136,20 @@ export const CUSTOM_TRANSACTION: Section = {
   key: 'transaction.custom',
   label: customLabel
 };
+
+const messageLabel = i18n.translate(
+  'xpack.apm.metadataTable.section.messageLabel',
+  {
+    defaultMessage: 'Message'
+  }
+);
+
+export const MESSAGE_TRANSACTION: Section = {
+  key: 'transaction.message',
+  label: messageLabel
+};
+
+export const MESSAGE_SPAN: Section = {
+  key: 'span.message',
+  label: messageLabel
+};
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 5b17b124a321d..ea1b825c856ad 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
@@ -185,14 +185,18 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
               type="arrowRight"
             >
               <EuiIconEmpty
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon"
                 focusable="false"
+                role="img"
                 style={null}
               >
                 <svg
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
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
deleted file mode 100644
index 964debbedb2e4..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItem.tsx
+++ /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 React from 'react';
-import { i18n } from '@kbn/i18n';
-import styled from 'styled-components';
-import { px } from '../../../../public/style/variables';
-import { ErrorCountBadge } from '../../app/TransactionDetails/WaterfallWithSummmary/ErrorCountBadge';
-import { units } from '../../../style/variables';
-
-interface Props {
-  count: number;
-}
-
-const Badge = styled(ErrorCountBadge)`
-  margin-top: ${px(units.eighth)};
-`;
-
-const ErrorCountSummaryItem = ({ count }: Props) => {
-  return (
-    <Badge>
-      {i18n.translate('xpack.apm.transactionDetails.errorCount', {
-        defaultMessage:
-          '{errorCount, number} {errorCount, plural, one {Error} other {Errors}}',
-        values: { errorCount: count }
-      })}
-    </Badge>
-  );
-};
-
-export { ErrorCountSummaryItem };
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItemBadge.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItemBadge.tsx
new file mode 100644
index 0000000000000..7558f002c0afc
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Summary/ErrorCountSummaryItemBadge.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 { i18n } from '@kbn/i18n';
+import styled from 'styled-components';
+import { EuiBadge } from '@elastic/eui';
+import euiThemeLight from '@elastic/eui/dist/eui_theme_light.json';
+import { px } from '../../../../public/style/variables';
+import { units } from '../../../style/variables';
+
+interface Props {
+  count: number;
+}
+
+const Badge = styled(EuiBadge)`
+  margin-top: ${px(units.eighth)};
+`;
+
+export const ErrorCountSummaryItemBadge = ({ count }: Props) => (
+  <Badge color={euiThemeLight.euiColorDanger}>
+    {i18n.translate('xpack.apm.transactionDetails.errorCount', {
+      defaultMessage:
+        '{errorCount, number} {errorCount, plural, one {Error} other {Errors}}',
+      values: { errorCount: count }
+    })}
+  </Badge>
+);
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.test.tsx
index 19f626187cdd1..80ecea3cf9b33 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Summary/TransactionSummary.test.tsx
@@ -7,12 +7,26 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import { TransactionSummary } from './TransactionSummary';
-import { Transaction } from '../../../../typings/es_schemas/ui/Transaction';
 import * as exampleTransactions from './__fixtures__/transactions';
 
 describe('TransactionSummary', () => {
   describe('render', () => {
-    const transaction: Transaction = exampleTransactions.httpOk;
+    const transaction = exampleTransactions.httpOk;
+
+    const props = {
+      errorCount: 0,
+      totalDuration: 0,
+      transaction
+    };
+
+    it('renders', () => {
+      expect(() =>
+        shallow(<TransactionSummary {...props} />)
+      ).not.toThrowError();
+    });
+  });
+  describe('renders RUM transaction without request info', () => {
+    const transaction = exampleTransactions.httpRumOK;
 
     const props = {
       errorCount: 0,
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 c24435d381008..51da61cd7c1a6 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
@@ -8,7 +8,7 @@ import { Transaction } from '../../../../typings/es_schemas/ui/Transaction';
 import { Summary } from './';
 import { TimestampTooltip } from '../TimestampTooltip';
 import { DurationSummaryItem } from './DurationSummaryItem';
-import { ErrorCountSummaryItem } from './ErrorCountSummaryItem';
+import { ErrorCountSummaryItemBadge } from './ErrorCountSummaryItemBadge';
 import { isRumAgentName } from '../../../../common/agent_name';
 import { HttpInfoSummaryItem } from './HttpInfoSummaryItem';
 import { TransactionResultSummaryItem } from './TransactionResultSummaryItem';
@@ -28,7 +28,7 @@ const getTransactionResultSummaryItem = (transaction: Transaction) => {
     : transaction.url?.full;
 
   if (url) {
-    const method = transaction.http?.request.method;
+    const method = transaction.http?.request?.method;
     const status = transaction.http?.response?.status_code;
 
     return <HttpInfoSummaryItem method={method} status={status} url={url} />;
@@ -54,7 +54,7 @@ const TransactionSummary = ({
       parentType="trace"
     />,
     getTransactionResultSummaryItem(transaction),
-    errorCount ? <ErrorCountSummaryItem count={errorCount} /> : null,
+    errorCount ? <ErrorCountSummaryItemBadge count={errorCount} /> : null,
     transaction.user_agent ? (
       <UserAgentSummaryItem {...transaction.user_agent} />
     ) : null
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Summary/__fixtures__/transactions.ts b/x-pack/legacy/plugins/apm/public/components/shared/Summary/__fixtures__/transactions.ts
index 59496dad16572..f4346e47f23c2 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Summary/__fixtures__/transactions.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Summary/__fixtures__/transactions.ts
@@ -25,3 +25,25 @@ export const httpOk: Transaction = {
     duration: { us: 0 }
   }
 };
+
+export const httpRumOK: Transaction = {
+  '@timestamp': '0',
+  agent: { name: 'rum-js', version: '0' },
+  http: {
+    response: { status_code: 200 }
+  },
+  processor: { event: 'transaction', name: 'transaction' },
+  service: { name: 'testServiceName' },
+  timestamp: { us: 0 },
+  trace: { id: 'testTrace' },
+  transaction: {
+    page: {
+      url: 'elastic.co'
+    },
+    name: 'testTransaction',
+    id: 'testId',
+    sampled: false,
+    type: 'testType',
+    duration: { us: 0 }
+  }
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Summary/__test__/ErrorCountSummaryItemBadge.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Summary/__test__/ErrorCountSummaryItemBadge.test.tsx
new file mode 100644
index 0000000000000..33f5752b6389b
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Summary/__test__/ErrorCountSummaryItemBadge.test.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { ErrorCountSummaryItemBadge } from '../ErrorCountSummaryItemBadge';
+import { render } from '@testing-library/react';
+import { expectTextsInDocument } from '../../../../utils/testHelpers';
+
+describe('ErrorCountSummaryItemBadge', () => {
+  it('shows singular error message', () => {
+    const component = render(<ErrorCountSummaryItemBadge count={1} />);
+    expectTextsInDocument(component, ['1 Error']);
+  });
+  it('shows plural error message', () => {
+    const component = render(<ErrorCountSummaryItemBadge count={2} />);
+    expectTextsInDocument(component, ['2 Errors']);
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
index 63f56b8db5c50..48e442ce734cf 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
@@ -21,12 +21,14 @@ exports[`TransactionActionMenu component should match the snapshot 1`] = `
             class="euiIcon euiIcon--medium euiIcon-isLoaded euiButtonEmpty__icon"
             focusable="false"
             height="16"
+            role="img"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
           >
+            <title />
             <path
-              d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
+              d="M13.069 5.157L8.384 9.768a.546.546 0 01-.768 0L2.93 5.158a.552.552 0 00-.771 0 .53.53 0 000 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 000-.76.552.552 0 00-.771 0z"
               fill-rule="non-zero"
             />
           </svg>
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/AnnotationsPlot.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/AnnotationsPlot.tsx
new file mode 100644
index 0000000000000..fb087612f8e3d
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/AnnotationsPlot.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { VerticalGridLines } from 'react-vis';
+import theme from '@elastic/eui/dist/eui_theme_light.json';
+import {
+  EuiIcon,
+  EuiToolTip,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiText
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { Maybe } from '../../../../../typings/common';
+import { Annotation } from '../../../../../common/annotations';
+import { PlotValues, SharedPlot } from './plotUtils';
+import { asAbsoluteDateTime } from '../../../../utils/formatters';
+
+interface Props {
+  annotations: Annotation[];
+  plotValues: PlotValues;
+  width: number;
+  overlay: Maybe<HTMLElement>;
+}
+
+const style = {
+  stroke: theme.euiColorSecondary,
+  strokeDasharray: 'none'
+};
+
+export function AnnotationsPlot(props: Props) {
+  const { plotValues, annotations } = props;
+
+  const tickValues = annotations.map(annotation => annotation.time);
+
+  return (
+    <>
+      <SharedPlot plotValues={plotValues}>
+        <VerticalGridLines tickValues={tickValues} style={style} />
+      </SharedPlot>
+      {annotations.map(annotation => (
+        <div
+          key={annotation.id}
+          style={{
+            position: 'absolute',
+            left: plotValues.x(annotation.time) - 8,
+            top: -2
+          }}
+        >
+          <EuiToolTip
+            title={asAbsoluteDateTime(annotation.time, 'seconds')}
+            content={
+              <EuiFlexGroup>
+                <EuiFlexItem grow={true}>
+                  <EuiText>
+                    {i18n.translate('xpack.apm.version', {
+                      defaultMessage: 'Version'
+                    })}
+                  </EuiText>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>{annotation.text}</EuiFlexItem>
+              </EuiFlexGroup>
+            }
+          >
+            <EuiIcon type="tag" color={theme.euiColorSecondary} />
+          </EuiToolTip>
+        </div>
+      ))}
+    </>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/Legends.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/Legends.js
index 11755e13bfdd6..99eb17386f847 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/Legends.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/Legends.js
@@ -7,7 +7,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import styled from 'styled-components';
-import Legend from '../Legend';
+import { Legend } from '../Legend';
 import {
   unit,
   units,
@@ -16,6 +16,8 @@ import {
   truncate
 } from '../../../../style/variables';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
+import { i18n } from '@kbn/i18n';
+import { EuiIcon } from '@elastic/eui';
 
 const Container = styled.div`
   display: flex;
@@ -73,9 +75,12 @@ export default function Legends({
   noHits,
   series,
   seriesEnabledState,
-  truncateLegends
+  truncateLegends,
+  hasAnnotations,
+  showAnnotations,
+  onAnnotationsToggle
 }) {
-  if (noHits) {
+  if (noHits && !hasAnnotations) {
     return null;
   }
 
@@ -107,6 +112,30 @@ export default function Legends({
           />
         );
       })}
+      {hasAnnotations && (
+        <Legend
+          key="annotations"
+          onClick={() => {
+            if (onAnnotationsToggle) {
+              onAnnotationsToggle();
+            }
+          }}
+          text={
+            <LegendContent>
+              {i18n.translate('xpack.apm.serviceVersion', {
+                defaultMessage: 'Service version'
+              })}
+            </LegendContent>
+          }
+          indicator={() => (
+            <div style={{ marginRight: px(units.quarter) }}>
+              <EuiIcon type="tag" color={theme.euiColorSecondary} />
+            </div>
+          )}
+          disabled={!showAnnotations}
+          color={theme.euiColorSecondary}
+        />
+      )}
       <MoreSeries hiddenSeriesCount={hiddenSeriesCount} />
     </Container>
   );
@@ -118,5 +147,8 @@ Legends.propTypes = {
   noHits: PropTypes.bool.isRequired,
   series: PropTypes.array.isRequired,
   seriesEnabledState: PropTypes.array.isRequired,
-  truncateLegends: PropTypes.bool.isRequired
+  truncateLegends: PropTypes.bool.isRequired,
+  hasAnnotations: PropTypes.bool,
+  showAnnotations: PropTypes.bool,
+  onAnnotationsToggle: PropTypes.func
 };
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/index.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/index.js
index e87d60c9b3fe8..f59c30d2f4d2f 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/index.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/index.js
@@ -13,6 +13,7 @@ import Legends from './Legends';
 import StaticPlot from './StaticPlot';
 import InteractivePlot from './InteractivePlot';
 import VoronoiPlot from './VoronoiPlot';
+import { AnnotationsPlot } from './AnnotationsPlot';
 import { createSelector } from 'reselect';
 import { getPlotValues } from './plotUtils';
 import { isValidCoordinateValue } from '../../../../utils/isValidCoordinateValue';
@@ -28,7 +29,8 @@ export class InnerCustomPlot extends PureComponent {
     seriesEnabledState: [],
     isDrawing: false,
     selectionStart: null,
-    selectionEnd: null
+    selectionEnd: null,
+    showAnnotations: true
   };
 
   getEnabledSeries = createSelector(
@@ -122,7 +124,7 @@ export class InnerCustomPlot extends PureComponent {
   }
 
   render() {
-    const { series, truncateLegends, width } = this.props;
+    const { series, truncateLegends, width, annotations } = this.props;
 
     if (!width) {
       return null;
@@ -166,6 +168,14 @@ export class InnerCustomPlot extends PureComponent {
             tickFormatX={this.props.tickFormatX}
           />
 
+          {this.state.showAnnotations && !isEmpty(annotations) && (
+            <AnnotationsPlot
+              plotValues={plotValues}
+              width={width}
+              annotations={annotations || []}
+            />
+          )}
+
           <InteractivePlot
             plotValues={plotValues}
             hoverX={this.props.hoverX}
@@ -192,6 +202,13 @@ export class InnerCustomPlot extends PureComponent {
           hiddenSeriesCount={hiddenSeriesCount}
           clickLegend={this.clickLegend}
           seriesEnabledState={this.state.seriesEnabledState}
+          hasAnnotations={!isEmpty(annotations)}
+          showAnnotations={this.state.showAnnotations}
+          onAnnotationsToggle={() => {
+            this.setState(({ showAnnotations }) => ({
+              showAnnotations: !showAnnotations
+            }));
+          }}
         />
       </Fragment>
     );
@@ -209,7 +226,14 @@ InnerCustomPlot.propTypes = {
   truncateLegends: PropTypes.bool,
   width: PropTypes.number.isRequired,
   height: PropTypes.number,
-  stackBy: PropTypes.string
+  stackBy: PropTypes.string,
+  annotations: PropTypes.arrayOf(
+    PropTypes.shape({
+      type: PropTypes.string,
+      id: PropTypes.string,
+      firstSeen: PropTypes.number
+    })
+  )
 };
 
 InnerCustomPlot.defaultProps = {
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.js
deleted file mode 100644
index 4186f6c899750..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.js
+++ /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 { isEmpty, flatten } from 'lodash';
-import { scaleLinear } from 'd3-scale';
-import { XYPlot } from 'react-vis';
-import d3 from 'd3';
-import PropTypes from 'prop-types';
-import React from 'react';
-
-import { unit } from '../../../../style/variables';
-import { getTimezoneOffsetInMs } from './getTimezoneOffsetInMs';
-
-const XY_HEIGHT = unit * 16;
-const XY_MARGIN = {
-  top: unit,
-  left: unit * 5,
-  right: 0,
-  bottom: unit * 2
-};
-
-const getXScale = (xMin, xMax, width) => {
-  return scaleLinear()
-    .domain([xMin, xMax])
-    .range([XY_MARGIN.left, width - XY_MARGIN.right]);
-};
-
-const getYScale = (yMin, yMax) => {
-  return scaleLinear()
-    .domain([yMin, yMax])
-    .range([XY_HEIGHT, 0])
-    .nice();
-};
-
-function getFlattenedCoordinates(visibleSeries, enabledSeries) {
-  const enabledCoordinates = flatten(enabledSeries.map(serie => serie.data));
-  if (!isEmpty(enabledCoordinates)) {
-    return enabledCoordinates;
-  }
-
-  return flatten(visibleSeries.map(serie => serie.data));
-}
-
-export function getPlotValues(
-  visibleSeries,
-  enabledSeries,
-  { width, yMin = 0, yMax = 'max', height, stackBy }
-) {
-  const flattenedCoordinates = getFlattenedCoordinates(
-    visibleSeries,
-    enabledSeries
-  );
-
-  const xMin = d3.min(flattenedCoordinates, d => d.x);
-
-  const xMax = d3.max(flattenedCoordinates, d => d.x);
-
-  if (yMax === 'max') {
-    yMax = d3.max(flattenedCoordinates, d => d.y);
-  }
-  if (yMin === 'min') {
-    yMin = d3.min(flattenedCoordinates, d => d.y);
-  }
-
-  const [xMinZone, xMaxZone] = [xMin, xMax].map(x => {
-    return x - getTimezoneOffsetInMs(x);
-  });
-
-  const xScale = getXScale(xMin, xMax, width);
-  const yScale = getYScale(yMin, yMax);
-
-  const yMaxNice = yScale.domain()[1];
-  const yTickValues = [0, yMaxNice / 2, yMaxNice];
-
-  // approximate number of x-axis ticks based on the width of the plot. There should by approx 1 tick per 100px
-  // d3 will determine the exact number of ticks based on the selected range
-  const xTickTotal = Math.floor(width / 100);
-
-  const xTickValues = d3.time.scale
-    .utc()
-    .domain([xMinZone, xMaxZone])
-    .range([0, width])
-    .ticks(xTickTotal)
-    .map(x => {
-      const time = x.getTime();
-      return new Date(time + getTimezoneOffsetInMs(time));
-    });
-
-  return {
-    x: xScale,
-    y: yScale,
-    xTickValues,
-    yTickValues,
-    XY_MARGIN,
-    XY_HEIGHT: height || XY_HEIGHT,
-    XY_WIDTH: width,
-    stackBy
-  };
-}
-
-export function SharedPlot({ plotValues, ...props }) {
-  const { XY_HEIGHT: height, XY_MARGIN: margin, XY_WIDTH: width } = plotValues;
-
-  return (
-    <div style={{ position: 'absolute', top: 0, left: 0 }}>
-      <XYPlot
-        dontCheckIfEmpty
-        height={height}
-        margin={margin}
-        xType="time-utc"
-        width={width}
-        xDomain={plotValues.x.domain()}
-        yDomain={plotValues.y.domain()}
-        stackBy={plotValues.stackBy}
-        {...props}
-      />
-    </div>
-  );
-}
-
-SharedPlot.propTypes = {
-  plotValues: PropTypes.shape({
-    x: PropTypes.func.isRequired,
-    y: PropTypes.func.isRequired,
-    XY_WIDTH: PropTypes.number.isRequired,
-    height: PropTypes.number
-  }).isRequired
-};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.test.ts b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.test.ts
index 55bfb490e8588..b130deed7f098 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.test.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.test.ts
@@ -6,6 +6,7 @@
 
 // @ts-ignore
 import * as plotUtils from './plotUtils';
+import { TimeSeries, Coordinate } from '../../../../../typings/timeseries';
 
 describe('plotUtils', () => {
   describe('getPlotValues', () => {
@@ -34,7 +35,10 @@ describe('plotUtils', () => {
           expect(
             plotUtils
               .getPlotValues(
-                [{ data: { x: 0, y: 200 } }, { data: { x: 0, y: 300 } }],
+                [
+                  { data: [{ x: 0, y: 200 }] },
+                  { data: [{ x: 0, y: 300 }] }
+                ] as Array<TimeSeries<Coordinate>>,
                 [],
                 {
                   height: 1,
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.tsx
new file mode 100644
index 0000000000000..10eb4659ea695
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.tsx
@@ -0,0 +1,157 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { isEmpty, flatten } from 'lodash';
+import { scaleLinear } from 'd3-scale';
+import { XYPlot } from 'react-vis';
+import d3 from 'd3';
+import PropTypes from 'prop-types';
+import React from 'react';
+
+import { TimeSeries, Coordinate } from '../../../../../typings/timeseries';
+import { unit } from '../../../../style/variables';
+import { getTimezoneOffsetInMs } from './getTimezoneOffsetInMs';
+
+const XY_HEIGHT = unit * 16;
+const XY_MARGIN = {
+  top: unit,
+  left: unit * 5,
+  right: 0,
+  bottom: unit * 2
+};
+
+const getXScale = (xMin: number, xMax: number, width: number) => {
+  return scaleLinear()
+    .domain([xMin, xMax])
+    .range([XY_MARGIN.left, width - XY_MARGIN.right]);
+};
+
+const getYScale = (yMin: number, yMax: number) => {
+  return scaleLinear()
+    .domain([yMin, yMax])
+    .range([XY_HEIGHT, 0])
+    .nice();
+};
+
+function getFlattenedCoordinates(
+  visibleSeries: Array<TimeSeries<Coordinate>>,
+  enabledSeries: Array<TimeSeries<Coordinate>>
+) {
+  const enabledCoordinates = flatten(enabledSeries.map(serie => serie.data));
+  if (!isEmpty(enabledCoordinates)) {
+    return enabledCoordinates;
+  }
+
+  return flatten(visibleSeries.map(serie => serie.data));
+}
+
+export type PlotValues = ReturnType<typeof getPlotValues>;
+
+export function getPlotValues(
+  visibleSeries: Array<TimeSeries<Coordinate>>,
+  enabledSeries: Array<TimeSeries<Coordinate>>,
+  {
+    width,
+    yMin = 0,
+    yMax = 'max',
+    height,
+    stackBy
+  }: {
+    width: number;
+    yMin?: number | 'min';
+    yMax?: number | 'max';
+    height: number;
+    stackBy?: 'x' | 'y';
+  }
+) {
+  const flattenedCoordinates = getFlattenedCoordinates(
+    visibleSeries,
+    enabledSeries
+  );
+
+  const xMin = d3.min(flattenedCoordinates, d => d.x);
+
+  const xMax = d3.max(flattenedCoordinates, d => d.x);
+
+  if (yMax === 'max') {
+    yMax = d3.max(flattenedCoordinates, d => d.y ?? 0);
+  }
+  if (yMin === 'min') {
+    yMin = d3.min(flattenedCoordinates, d => d.y ?? 0);
+  }
+
+  const [xMinZone, xMaxZone] = [xMin, xMax].map(x => {
+    return x - getTimezoneOffsetInMs(x);
+  });
+
+  const xScale = getXScale(xMin, xMax, width);
+  const yScale = getYScale(yMin, yMax);
+
+  const yMaxNice = yScale.domain()[1];
+  const yTickValues = [0, yMaxNice / 2, yMaxNice];
+
+  // approximate number of x-axis ticks based on the width of the plot. There should by approx 1 tick per 100px
+  // d3 will determine the exact number of ticks based on the selected range
+  const xTickTotal = Math.floor(width / 100);
+
+  const xTickValues = d3.time.scale
+    .utc()
+    .domain([xMinZone, xMaxZone])
+    .range([0, width])
+    .ticks(xTickTotal)
+    .map(x => {
+      const time = x.getTime();
+      return new Date(time + getTimezoneOffsetInMs(time));
+    });
+
+  return {
+    x: xScale,
+    y: yScale,
+    xTickValues,
+    yTickValues,
+    XY_MARGIN,
+    XY_HEIGHT: height || XY_HEIGHT,
+    XY_WIDTH: width,
+    stackBy
+  };
+}
+
+export function SharedPlot({
+  plotValues,
+  ...props
+}: {
+  plotValues: PlotValues;
+  children: React.ReactNode;
+}) {
+  const { XY_HEIGHT: height, XY_MARGIN: margin, XY_WIDTH: width } = plotValues;
+
+  return (
+    <div
+      style={{ position: 'absolute', top: 0, left: 0, pointerEvents: 'none' }}
+    >
+      <XYPlot
+        dontCheckIfEmpty
+        height={height}
+        margin={margin}
+        xType="time-utc"
+        width={width}
+        xDomain={plotValues.x.domain()}
+        yDomain={plotValues.y.domain()}
+        stackBy={plotValues.stackBy}
+        {...props}
+      />
+    </div>
+  );
+}
+
+SharedPlot.propTypes = {
+  plotValues: PropTypes.shape({
+    x: PropTypes.func.isRequired,
+    y: PropTypes.func.isRequired,
+    XY_WIDTH: PropTypes.number.isRequired,
+    height: PropTypes.number
+  }).isRequired
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap
index ff917dd95bf96..557751a0f0226 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap
@@ -46,6 +46,7 @@ Array [
       style={
         Object {
           "left": 0,
+          "pointerEvents": "none",
           "position": "absolute",
           "top": 0,
         }
@@ -2094,6 +2095,7 @@ Array [
       style={
         Object {
           "left": 0,
+          "pointerEvents": "none",
           "position": "absolute",
           "top": 0,
         }
@@ -2126,6 +2128,7 @@ Array [
       style={
         Object {
           "left": 0,
+          "pointerEvents": "none",
           "position": "absolute",
           "top": 0,
         }
@@ -2722,11 +2725,14 @@ Array [
           <styled.span
             color="#3185fc"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c2"
               color="#3185fc"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
@@ -2760,11 +2766,14 @@ Array [
           <styled.span
             color="#e6c220"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c5"
               color="#e6c220"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
@@ -2791,11 +2800,14 @@ Array [
           <styled.span
             color="#f98510"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c6"
               color="#f98510"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
@@ -2818,6 +2830,7 @@ Object {
   "selectionEnd": null,
   "selectionStart": null,
   "seriesEnabledState": Array [],
+  "showAnnotations": true,
 }
 `;
 
@@ -2969,6 +2982,7 @@ Array [
       style={
         Object {
           "left": 0,
+          "pointerEvents": "none",
           "position": "absolute",
           "top": 0,
         }
@@ -5017,6 +5031,7 @@ Array [
       style={
         Object {
           "left": 0,
+          "pointerEvents": "none",
           "position": "absolute",
           "top": 0,
         }
@@ -5161,11 +5176,14 @@ Array [
                             <styled.span
                               color="#3185fc"
                               radius={8}
+                              shape="circle"
+                              withMargin={true}
                             >
                               <span
                                 className="c6"
                                 color="#3185fc"
                                 radius={8}
+                                shape="circle"
                               />
                             </styled.span>
                             Avg.
@@ -5204,11 +5222,14 @@ Array [
                             <styled.span
                               color="#e6c220"
                               radius={8}
+                              shape="circle"
+                              withMargin={true}
                             >
                               <span
                                 className="c8"
                                 color="#e6c220"
                                 radius={8}
+                                shape="circle"
                               />
                             </styled.span>
                             95th
@@ -5247,11 +5268,14 @@ Array [
                             <styled.span
                               color="#f98510"
                               radius={8}
+                              shape="circle"
+                              withMargin={true}
                             >
                               <span
                                 className="c9"
                                 color="#f98510"
                                 radius={8}
+                                shape="circle"
                               />
                             </styled.span>
                             99th
@@ -5283,6 +5307,7 @@ Array [
       style={
         Object {
           "left": 0,
+          "pointerEvents": "none",
           "position": "absolute",
           "top": 0,
         }
@@ -5879,11 +5904,14 @@ Array [
           <styled.span
             color="#3185fc"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c2"
               color="#3185fc"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
@@ -5917,11 +5945,14 @@ Array [
           <styled.span
             color="#e6c220"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c5"
               color="#e6c220"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
@@ -5948,11 +5979,14 @@ Array [
           <styled.span
             color="#f98510"
             radius={11}
+            shape="circle"
+            withMargin={true}
           >
             <span
               className="c6"
               color="#f98510"
               radius={11}
+              shape="circle"
             />
           </styled.span>
           <styled.span>
@@ -5975,6 +6009,7 @@ Object {
   "selectionEnd": null,
   "selectionStart": null,
   "seriesEnabledState": Array [],
+  "showAnnotations": true,
 }
 `;
 
@@ -5992,6 +6027,7 @@ Array [
       style={
         Object {
           "left": 0,
+          "pointerEvents": "none",
           "position": "absolute",
           "top": 0,
         }
@@ -6355,6 +6391,7 @@ Array [
       style={
         Object {
           "left": 0,
+          "pointerEvents": "none",
           "position": "absolute",
           "top": 0,
         }
@@ -6394,5 +6431,6 @@ Object {
   "selectionEnd": null,
   "selectionStart": null,
   "seriesEnabledState": Array [],
+  "showAnnotations": true,
 }
 `;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.js
deleted file mode 100644
index 912859f6e0419..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { PureComponent } from 'react';
-import styled from 'styled-components';
-import { units, px, fontSizes } from '../../../../style/variables';
-import theme from '@elastic/eui/dist/eui_theme_light.json';
-
-const Container = styled.div`
-  display: flex;
-  align-items: center;
-  font-size: ${props => props.fontSize};
-  color: ${theme.euiColorDarkShade};
-  cursor: ${props => (props.clickable ? 'pointer' : 'initial')};
-  opacity: ${props => (props.disabled ? 0.4 : 1)};
-  user-select: none;
-`;
-
-export const Indicator = styled.span`
-  width: ${props => px(props.radius)};
-  height: ${props => px(props.radius)};
-  margin-right: ${props => px(props.radius / 2)};
-  background: ${props => props.color};
-  border-radius: 100%;
-`;
-
-export default class Legend extends PureComponent {
-  render() {
-    const {
-      onClick,
-      text,
-      color = theme.euiColorVis1,
-      fontSize = fontSizes.small,
-      radius = units.minus - 1,
-      disabled = false,
-      clickable = false,
-      ...rest
-    } = this.props;
-    return (
-      <Container
-        onClick={onClick}
-        disabled={disabled}
-        clickable={clickable || Boolean(onClick)}
-        fontSize={fontSize}
-        {...rest}
-      >
-        <Indicator color={color} radius={radius} />
-        {text}
-      </Container>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.tsx
new file mode 100644
index 0000000000000..436b020bc9eba
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Legend/index.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 theme from '@elastic/eui/dist/eui_theme_light.json';
+import React from 'react';
+import styled from 'styled-components';
+import { fontSizes, px, units } from '../../../../style/variables';
+
+export enum Shape {
+  circle = 'circle',
+  square = 'square'
+}
+
+interface ContainerProps {
+  onClick: (e: Event) => void;
+  fontSize?: string;
+  clickable: boolean;
+  disabled: boolean;
+}
+const Container = styled.div<ContainerProps>`
+  display: flex;
+  align-items: center;
+  font-size: ${props => props.fontSize};
+  color: ${theme.euiColorDarkShade};
+  cursor: ${props => (props.clickable ? 'pointer' : 'initial')};
+  opacity: ${props => (props.disabled ? 0.4 : 1)};
+  user-select: none;
+`;
+
+interface IndicatorProps {
+  radius: number;
+  color: string;
+  shape: Shape;
+  withMargin: boolean;
+}
+export const Indicator = styled.span<IndicatorProps>`
+  width: ${props => px(props.radius)};
+  height: ${props => px(props.radius)};
+  margin-right: ${props => (props.withMargin ? px(props.radius / 2) : 0)};
+  background: ${props => props.color};
+  border-radius: ${props => {
+    return props.shape === Shape.circle ? '100%' : '0';
+  }};
+`;
+
+interface Props {
+  onClick?: any;
+  text?: string;
+  color?: string;
+  fontSize?: string;
+  radius?: number;
+  disabled?: boolean;
+  clickable?: boolean;
+  shape?: Shape;
+  indicator?: () => React.ReactNode;
+}
+
+export const Legend: React.FC<Props> = ({
+  onClick,
+  text,
+  color = theme.euiColorVis1,
+  fontSize = fontSizes.small,
+  radius = units.minus - 1,
+  disabled = false,
+  clickable = false,
+  shape = Shape.circle,
+  indicator,
+  ...rest
+}) => {
+  return (
+    <Container
+      onClick={onClick}
+      disabled={disabled}
+      clickable={clickable || Boolean(onClick)}
+      fontSize={fontSize}
+      {...rest}
+    >
+      {indicator ? (
+        indicator()
+      ) : (
+        <Indicator
+          color={color}
+          radius={radius}
+          shape={shape}
+          withMargin={!!text}
+        />
+      )}
+      {text}
+    </Container>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/AgentMarker.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/AgentMarker.js
deleted file mode 100644
index 8ee23d61fe0eb..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/AgentMarker.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { EuiToolTip } from '@elastic/eui';
-import Legend from '../Legend';
-import { units, px } from '../../../../style/variables';
-import styled from 'styled-components';
-import { asDuration } from '../../../../utils/formatters';
-import theme from '@elastic/eui/dist/eui_theme_light.json';
-
-const NameContainer = styled.div`
-  border-bottom: 1px solid ${theme.euiColorMediumShade};
-  padding-bottom: ${px(units.half)};
-`;
-
-const TimeContainer = styled.div`
-  color: ${theme.euiColorMediumShade};
-  padding-top: ${px(units.half)};
-`;
-
-export default function AgentMarker({ agentMark, x }) {
-  const legendWidth = 11;
-  return (
-    <div
-      style={{
-        position: 'absolute',
-        left: px(x - legendWidth / 2),
-        bottom: 0
-      }}
-    >
-      <EuiToolTip
-        id={agentMark.name}
-        position="top"
-        content={
-          <div>
-            <NameContainer>{agentMark.name}</NameContainer>
-            <TimeContainer>{asDuration(agentMark.us)}</TimeContainer>
-          </div>
-        }
-      >
-        <Legend clickable color={theme.euiColorMediumShade} />
-      </EuiToolTip>
-    </div>
-  );
-}
-
-AgentMarker.propTypes = {
-  agentMark: PropTypes.object.isRequired,
-  x: PropTypes.number.isRequired
-};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.tsx
new file mode 100644
index 0000000000000..ffdbfe6cce7ec
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/AgentMarker.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 { EuiToolTip } from '@elastic/eui';
+import theme from '@elastic/eui/dist/eui_theme_light.json';
+import React from 'react';
+import styled from 'styled-components';
+import { px, units } from '../../../../../style/variables';
+import { asDuration } from '../../../../../utils/formatters';
+import { Legend } from '../../Legend';
+import { AgentMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks';
+
+const NameContainer = styled.div`
+  border-bottom: 1px solid ${theme.euiColorMediumShade};
+  padding-bottom: ${px(units.half)};
+`;
+
+const TimeContainer = styled.div`
+  color: ${theme.euiColorMediumShade};
+  padding-top: ${px(units.half)};
+`;
+
+interface Props {
+  mark: AgentMark;
+}
+
+export const AgentMarker: React.FC<Props> = ({ mark }) => {
+  return (
+    <>
+      <EuiToolTip
+        id={mark.id}
+        position="top"
+        content={
+          <div>
+            <NameContainer>{mark.id}</NameContainer>
+            <TimeContainer>{asDuration(mark.offset)}</TimeContainer>
+          </div>
+        }
+      >
+        <Legend clickable color={theme.euiColorMediumShade} />
+      </EuiToolTip>
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.tsx
new file mode 100644
index 0000000000000..51368a4fb946d
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.tsx
@@ -0,0 +1,103 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiPopover, EuiText } from '@elastic/eui';
+import theme from '@elastic/eui/dist/eui_theme_light.json';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import {
+  TRACE_ID,
+  TRANSACTION_ID
+} from '../../../../../../common/elasticsearch_fieldnames';
+import { useUrlParams } from '../../../../../hooks/useUrlParams';
+import { px, unit, units } from '../../../../../style/variables';
+import { asDuration } from '../../../../../utils/formatters';
+import { ErrorMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks';
+import { ErrorDetailLink } from '../../../Links/apm/ErrorDetailLink';
+import { Legend, Shape } from '../../Legend';
+
+interface Props {
+  mark: ErrorMark;
+}
+
+const Popover = styled.div`
+  max-width: ${px(280)};
+`;
+
+const TimeLegend = styled(Legend)`
+  margin-bottom: ${px(unit)};
+`;
+
+const ErrorLink = styled(ErrorDetailLink)`
+  display: block;
+  margin: ${px(units.half)} 0 ${px(units.half)} 0;
+`;
+
+const Button = styled(Legend)`
+  height: 20px;
+  display: flex;
+  align-items: flex-end;
+`;
+
+export const ErrorMarker: React.FC<Props> = ({ mark }) => {
+  const { urlParams } = useUrlParams();
+  const [isPopoverOpen, showPopover] = useState(false);
+
+  const togglePopover = () => showPopover(!isPopoverOpen);
+
+  const button = (
+    <Button
+      clickable
+      color={theme.euiColorDanger}
+      shape={Shape.square}
+      onClick={togglePopover}
+    />
+  );
+
+  const { error } = mark;
+
+  const { rangeTo, rangeFrom } = urlParams;
+  const query = {
+    kuery: encodeURIComponent(
+      `${TRACE_ID} : "${error.trace?.id}" and ${TRANSACTION_ID} : "${error.transaction?.id}"`
+    ),
+    rangeFrom,
+    rangeTo
+  };
+
+  return (
+    <EuiPopover
+      id="popover"
+      button={button}
+      isOpen={isPopoverOpen}
+      closePopover={togglePopover}
+      anchorPosition="upCenter"
+    >
+      <Popover>
+        <TimeLegend
+          text={asDuration(mark.offset)}
+          indicator={() => (
+            <div style={{ marginRight: px(units.quarter) }}>@</div>
+          )}
+        />
+        <Legend
+          key={mark.serviceColor}
+          color={mark.serviceColor}
+          text={error.service.name}
+        />
+        <EuiText size="s">
+          <ErrorLink
+            serviceName={error.service.name}
+            errorGroupId={error.error.grouping_key}
+            query={query}
+          >
+            {error.error.log?.message || error.error.exception?.[0]?.message}
+          </ErrorLink>
+        </EuiText>
+      </Popover>
+    </EuiPopover>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/AgentMarker.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/AgentMarker.test.tsx
new file mode 100644
index 0000000000000..718bbc5e38419
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/AgentMarker.test.tsx
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { shallow } from 'enzyme';
+import React from 'react';
+import { AgentMarker } from '../AgentMarker';
+import { AgentMark } from '../../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks';
+
+describe('AgentMarker', () => {
+  const mark = {
+    id: 'agent',
+    offset: 1000,
+    type: 'agentMark',
+    verticalLine: true
+  } as AgentMark;
+  it('renders', () => {
+    const component = shallow(<AgentMarker mark={mark} />);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/ErrorMarker.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/ErrorMarker.test.tsx
new file mode 100644
index 0000000000000..020ce63eff1fd
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/ErrorMarker.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 { shallow } from 'enzyme';
+import React from 'react';
+import { ErrorMarker } from '../ErrorMarker';
+import { ErrorMark } from '../../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks';
+
+describe('ErrorMarker', () => {
+  const mark = {
+    id: 'agent',
+    offset: 10000,
+    type: 'errorMark',
+    verticalLine: true,
+    error: {
+      trace: { id: '123' },
+      transaction: { id: '456' },
+      error: { grouping_key: '123' },
+      service: { name: 'bar' }
+    },
+    serviceColor: '#fff'
+  } as ErrorMark;
+  it('renders', () => {
+    const component = shallow(<ErrorMarker mark={mark} />);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/Marker.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/Marker.test.tsx
new file mode 100644
index 0000000000000..34ff24fea0986
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/Marker.test.tsx
@@ -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 { shallow } from 'enzyme';
+import React from 'react';
+import { Marker } from '../';
+import { AgentMark } from '../../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks';
+import { ErrorMark } from '../../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks';
+
+describe('Marker', () => {
+  it('renders agent marker', () => {
+    const mark = {
+      id: 'agent',
+      offset: 1000,
+      type: 'agentMark',
+      verticalLine: true
+    } as AgentMark;
+    const component = shallow(<Marker mark={mark} x={10} />);
+    expect(component).toMatchSnapshot();
+  });
+
+  it('renders error marker', () => {
+    const mark = {
+      id: 'agent',
+      offset: 1000,
+      type: 'errorMark',
+      verticalLine: true,
+      error: {
+        trace: { id: '123' },
+        transaction: { id: '456' },
+        error: { grouping_key: '123' },
+        service: { name: 'bar' }
+      },
+      serviceColor: '#fff'
+    } as ErrorMark;
+    const component = shallow(<Marker mark={mark} x={10} />);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/AgentMarker.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/AgentMarker.test.tsx.snap
new file mode 100644
index 0000000000000..6ef402c7481b2
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/AgentMarker.test.tsx.snap
@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AgentMarker renders 1`] = `
+<Fragment>
+  <EuiToolTip
+    content={
+      <div>
+        <ForwardRef(styled.div)>
+          agent
+        </ForwardRef(styled.div)>
+        <ForwardRef(styled.div)>
+          1,000 μs
+        </ForwardRef(styled.div)>
+      </div>
+    }
+    delay="regular"
+    id="agent"
+    position="top"
+  >
+    <Legend
+      clickable={true}
+      color="#98a2b3"
+    />
+  </EuiToolTip>
+</Fragment>
+`;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/ErrorMarker.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/ErrorMarker.test.tsx.snap
new file mode 100644
index 0000000000000..d3eedd2a9412c
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/ErrorMarker.test.tsx.snap
@@ -0,0 +1,49 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ErrorMarker renders 1`] = `
+<EuiPopover
+  anchorPosition="upCenter"
+  button={
+    <ForwardRef(Styled(Legend))
+      clickable={true}
+      color="#bd271e"
+      onClick={[Function]}
+      shape="square"
+    />
+  }
+  closePopover={[Function]}
+  display="inlineBlock"
+  hasArrow={true}
+  id="popover"
+  isOpen={false}
+  ownFocus={false}
+  panelPaddingSize="m"
+>
+  <styled.div>
+    <Styled(Legend)
+      indicator={[Function]}
+      text="10,000 μs"
+    />
+    <Legend
+      color="#fff"
+      key="#fff"
+      text="bar"
+    />
+    <EuiText
+      size="s"
+    >
+      <Styled(ErrorDetailLink)
+        errorGroupId="123"
+        query={
+          Object {
+            "kuery": "trace.id%20%3A%20%22123%22%20and%20transaction.id%20%3A%20%22456%22",
+            "rangeFrom": undefined,
+            "rangeTo": undefined,
+          }
+        }
+        serviceName="bar"
+      />
+    </EuiText>
+  </styled.div>
+</EuiPopover>
+`;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/Marker.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/Marker.test.tsx.snap
new file mode 100644
index 0000000000000..f108eb7ebf3ea
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/__test__/__snapshots__/Marker.test.tsx.snap
@@ -0,0 +1,58 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Marker renders agent marker 1`] = `
+<styled.div
+  style={
+    Object {
+      "left": "4.5px",
+    }
+  }
+>
+  <AgentMarker
+    mark={
+      Object {
+        "id": "agent",
+        "offset": 1000,
+        "type": "agentMark",
+        "verticalLine": true,
+      }
+    }
+  />
+</styled.div>
+`;
+
+exports[`Marker renders error marker 1`] = `
+<styled.div
+  style={
+    Object {
+      "left": "4.5px",
+    }
+  }
+>
+  <ErrorMarker
+    mark={
+      Object {
+        "error": Object {
+          "error": Object {
+            "grouping_key": "123",
+          },
+          "service": Object {
+            "name": "bar",
+          },
+          "trace": Object {
+            "id": "123",
+          },
+          "transaction": Object {
+            "id": "456",
+          },
+        },
+        "id": "agent",
+        "offset": 1000,
+        "serviceColor": "#fff",
+        "type": "errorMark",
+        "verticalLine": true,
+      }
+    }
+  />
+</styled.div>
+`;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/index.tsx
new file mode 100644
index 0000000000000..03124952c3f88
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/Marker/index.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import styled from 'styled-components';
+import { px } from '../../../../../style/variables';
+import { AgentMarker } from './AgentMarker';
+import { ErrorMarker } from './ErrorMarker';
+import { AgentMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_agent_marks';
+import { ErrorMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks';
+
+interface Props {
+  mark: ErrorMark | AgentMark;
+  x: number;
+}
+
+const MarkerContainer = styled.div`
+  position: absolute;
+  bottom: 0;
+`;
+
+export const Marker: React.FC<Props> = ({ mark, x }) => {
+  const legendWidth = 11;
+  return (
+    <MarkerContainer style={{ left: px(x - legendWidth / 2) }}>
+      {mark.type === 'errorMark' ? (
+        <ErrorMarker mark={mark} />
+      ) : (
+        <AgentMarker mark={mark} />
+      )}
+    </MarkerContainer>
+  );
+};
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js
index 346aec9fb080a..40df82b4cf1e0 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js
@@ -10,7 +10,7 @@ import { inRange } from 'lodash';
 import { Sticky } from 'react-sticky';
 import { XYPlot, XAxis } from 'react-vis';
 import LastTickValue from './LastTickValue';
-import AgentMarker from './AgentMarker';
+import { Marker } from './Marker';
 import { px } from '../../../../style/variables';
 import { getDurationFormatter } from '../../../../utils/formatters';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
@@ -31,7 +31,7 @@ const getXAxisTickValues = (tickValues, topTraceDuration) => {
   });
 };
 
-function TimelineAxis({ plotValues, agentMarks, topTraceDuration }) {
+function TimelineAxis({ plotValues, marks, topTraceDuration }) {
   const { margins, tickValues, width, xDomain, xMax, xScale } = plotValues;
   const tickFormatter = getDurationFormatter(xMax);
   const xAxisTickValues = getXAxisTickValues(tickValues, topTraceDuration);
@@ -82,12 +82,8 @@ function TimelineAxis({ plotValues, agentMarks, topTraceDuration }) {
                 />
               )}
 
-              {agentMarks.map(agentMark => (
-                <AgentMarker
-                  key={agentMark.name}
-                  agentMark={agentMark}
-                  x={xScale(agentMark.us)}
-                />
+              {marks.map(mark => (
+                <Marker key={mark.id} mark={mark} x={xScale(mark.offset)} />
               ))}
             </XYPlot>
           </div>
@@ -100,11 +96,11 @@ function TimelineAxis({ plotValues, agentMarks, topTraceDuration }) {
 TimelineAxis.propTypes = {
   header: PropTypes.node,
   plotValues: PropTypes.object.isRequired,
-  agentMarks: PropTypes.array
+  marks: PropTypes.array
 };
 
 TimelineAxis.defaultProps = {
-  agentMarks: []
+  marks: []
 };
 
 export default TimelineAxis;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js
index cac5af3ee1ded..baf3a26cb6cbf 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js
@@ -11,7 +11,7 @@ import theme from '@elastic/eui/dist/eui_theme_light.json';
 
 class VerticalLines extends PureComponent {
   render() {
-    const { topTraceDuration } = this.props;
+    const { topTraceDuration, marks } = this.props;
     const {
       width,
       height,
@@ -20,7 +20,9 @@ class VerticalLines extends PureComponent {
       tickValues
     } = this.props.plotValues;
 
-    const agentMarkTimes = this.props.agentMarks.map(({ us }) => us);
+    const markTimes = marks
+      .filter(mark => mark.verticalLine)
+      .map(({ offset }) => offset);
 
     return (
       <div
@@ -43,7 +45,7 @@ class VerticalLines extends PureComponent {
           />
 
           <VerticalGridLines
-            tickValues={agentMarkTimes}
+            tickValues={markTimes}
             style={{ stroke: theme.euiColorMediumShade }}
           />
 
@@ -61,11 +63,11 @@ class VerticalLines extends PureComponent {
 
 VerticalLines.propTypes = {
   plotValues: PropTypes.object.isRequired,
-  agentMarks: PropTypes.array
+  marks: PropTypes.array
 };
 
 VerticalLines.defaultProps = {
-  agentMarks: []
+  marks: []
 };
 
 export default VerticalLines;
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js
index e76401e36a568..5428dd8317f64 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js
@@ -29,10 +29,25 @@ describe('Timeline', () => {
         bottom: 0
       },
       animation: null,
-      agentMarks: [
-        { name: 'timeToFirstByte', us: 100000 },
-        { name: 'domInteractive', us: 110000 },
-        { name: 'domComplete', us: 190000 }
+      marks: [
+        {
+          id: 'timeToFirstByte',
+          offset: 100000,
+          type: 'agentMark',
+          verticalLine: true
+        },
+        {
+          id: 'domInteractive',
+          offset: 110000,
+          type: 'agentMark',
+          verticalLine: true
+        },
+        {
+          id: 'domComplete',
+          offset: 190000,
+          type: 'agentMark',
+          verticalLine: true
+        }
       ]
     };
 
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap
index 80baba28fcfdf..0cc51dda4a9b5 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Timeline should render with data 1`] = `
-.c0 {
+.c1 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -20,14 +20,19 @@ exports[`Timeline should render with data 1`] = `
   user-select: none;
 }
 
-.c1 {
+.c2 {
   width: 11px;
   height: 11px;
-  margin-right: 5.5px;
+  margin-right: 0;
   background: #98a2b3;
   border-radius: 100%;
 }
 
+.c0 {
+  position: absolute;
+  bottom: 0;
+}
+
 <div
   onScroll={[Function]}
   onTouchEnd={[Function]}
@@ -526,132 +531,162 @@ exports[`Timeline should render with data 1`] = `
                 </text>
               </g>
             </svg>
-            <div
+            <styled.div
               style={
                 Object {
-                  "bottom": 0,
                   "left": "494.5px",
-                  "position": "absolute",
                 }
               }
             >
-              <span
-                className="euiToolTipAnchor"
-                onMouseOut={[Function]}
-                onMouseOver={[Function]}
+              <div
+                className="c0"
+                style={
+                  Object {
+                    "left": "494.5px",
+                  }
+                }
               >
-                <styled.div
-                  clickable={true}
-                  disabled={false}
-                  fontSize="12px"
-                  onBlur={[Function]}
-                  onFocus={[Function]}
+                <span
+                  className="euiToolTipAnchor"
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
                 >
-                  <div
-                    className="c0"
+                  <styled.div
+                    clickable={true}
                     disabled={false}
                     fontSize="12px"
                     onBlur={[Function]}
                     onFocus={[Function]}
                   >
-                    <styled.span
-                      color="#98a2b3"
-                      radius={11}
+                    <div
+                      className="c1"
+                      disabled={false}
+                      fontSize="12px"
+                      onBlur={[Function]}
+                      onFocus={[Function]}
                     >
-                      <span
-                        className="c1"
+                      <styled.span
                         color="#98a2b3"
                         radius={11}
-                      />
-                    </styled.span>
-                  </div>
-                </styled.div>
-              </span>
-            </div>
-            <div
+                        shape="circle"
+                        withMargin={false}
+                      >
+                        <span
+                          className="c2"
+                          color="#98a2b3"
+                          radius={11}
+                          shape="circle"
+                        />
+                      </styled.span>
+                    </div>
+                  </styled.div>
+                </span>
+              </div>
+            </styled.div>
+            <styled.div
               style={
                 Object {
-                  "bottom": 0,
                   "left": "539.5px",
-                  "position": "absolute",
                 }
               }
             >
-              <span
-                className="euiToolTipAnchor"
-                onMouseOut={[Function]}
-                onMouseOver={[Function]}
+              <div
+                className="c0"
+                style={
+                  Object {
+                    "left": "539.5px",
+                  }
+                }
               >
-                <styled.div
-                  clickable={true}
-                  disabled={false}
-                  fontSize="12px"
-                  onBlur={[Function]}
-                  onFocus={[Function]}
+                <span
+                  className="euiToolTipAnchor"
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
                 >
-                  <div
-                    className="c0"
+                  <styled.div
+                    clickable={true}
                     disabled={false}
                     fontSize="12px"
                     onBlur={[Function]}
                     onFocus={[Function]}
                   >
-                    <styled.span
-                      color="#98a2b3"
-                      radius={11}
+                    <div
+                      className="c1"
+                      disabled={false}
+                      fontSize="12px"
+                      onBlur={[Function]}
+                      onFocus={[Function]}
                     >
-                      <span
-                        className="c1"
+                      <styled.span
                         color="#98a2b3"
                         radius={11}
-                      />
-                    </styled.span>
-                  </div>
-                </styled.div>
-              </span>
-            </div>
-            <div
+                        shape="circle"
+                        withMargin={false}
+                      >
+                        <span
+                          className="c2"
+                          color="#98a2b3"
+                          radius={11}
+                          shape="circle"
+                        />
+                      </styled.span>
+                    </div>
+                  </styled.div>
+                </span>
+              </div>
+            </styled.div>
+            <styled.div
               style={
                 Object {
-                  "bottom": 0,
                   "left": "899.5px",
-                  "position": "absolute",
                 }
               }
             >
-              <span
-                className="euiToolTipAnchor"
-                onMouseOut={[Function]}
-                onMouseOver={[Function]}
+              <div
+                className="c0"
+                style={
+                  Object {
+                    "left": "899.5px",
+                  }
+                }
               >
-                <styled.div
-                  clickable={true}
-                  disabled={false}
-                  fontSize="12px"
-                  onBlur={[Function]}
-                  onFocus={[Function]}
+                <span
+                  className="euiToolTipAnchor"
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
                 >
-                  <div
-                    className="c0"
+                  <styled.div
+                    clickable={true}
                     disabled={false}
                     fontSize="12px"
                     onBlur={[Function]}
                     onFocus={[Function]}
                   >
-                    <styled.span
-                      color="#98a2b3"
-                      radius={11}
+                    <div
+                      className="c1"
+                      disabled={false}
+                      fontSize="12px"
+                      onBlur={[Function]}
+                      onFocus={[Function]}
                     >
-                      <span
-                        className="c1"
+                      <styled.span
                         color="#98a2b3"
                         radius={11}
-                      />
-                    </styled.span>
-                  </div>
-                </styled.div>
-              </span>
-            </div>
+                        shape="circle"
+                        withMargin={false}
+                      >
+                        <span
+                          className="c2"
+                          color="#98a2b3"
+                          radius={11}
+                          shape="circle"
+                        />
+                      </styled.span>
+                    </div>
+                  </styled.div>
+                </span>
+              </div>
+            </styled.div>
           </div>
         </div>
       </div>
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/index.js b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/index.js
index 53b0b4eb57b3d..327049a61a1ac 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/index.js
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/Timeline/index.js
@@ -14,7 +14,7 @@ import VerticalLines from './VerticalLines';
 
 class Timeline extends PureComponent {
   render() {
-    const { width, duration, agentMarks, height, margins } = this.props;
+    const { width, duration, marks, height, margins } = this.props;
     if (duration == null || !width) {
       return null;
     }
@@ -24,12 +24,12 @@ class Timeline extends PureComponent {
       <div>
         <TimelineAxis
           plotValues={plotValues}
-          agentMarks={agentMarks}
+          marks={marks}
           topTraceDuration={duration}
         />
         <VerticalLines
           plotValues={plotValues}
-          agentMarks={agentMarks}
+          marks={marks}
           topTraceDuration={duration}
         />
       </div>
@@ -38,7 +38,7 @@ class Timeline extends PureComponent {
 }
 
 Timeline.propTypes = {
-  agentMarks: PropTypes.array,
+  marks: PropTypes.array,
   duration: PropTypes.number,
   height: PropTypes.number.isRequired,
   header: PropTypes.node,
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 239e46c25904d..0441e556c08ac 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
@@ -17,7 +17,7 @@ import {
   fontSize,
   fontSizes
 } from '../../../../style/variables';
-import Legend from '../Legend';
+import { Legend } from '../Legend';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
 import { asAbsoluteDateTime } from '../../../../utils/formatters';
 
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/charts/TransactionCharts/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/charts/TransactionCharts/index.tsx
index 97794bf66687b..b0555da705a30 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/charts/TransactionCharts/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/charts/TransactionCharts/index.tsx
@@ -170,7 +170,7 @@ export class TransactionCharts extends Component<TransactionChartProps> {
                   </EuiFlexItem>
                   <LicenseContext.Consumer>
                     {license =>
-                      this.renderMLHeader(license.features.ml?.is_available)
+                      this.renderMLHeader(license?.getFeature('ml').isAvailable)
                     }
                   </LicenseContext.Consumer>
                 </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/apm/public/context/ChartsSyncContext.tsx b/x-pack/legacy/plugins/apm/public/context/ChartsSyncContext.tsx
index c2676a35d8e78..afce0811b48f6 100644
--- a/x-pack/legacy/plugins/apm/public/context/ChartsSyncContext.tsx
+++ b/x-pack/legacy/plugins/apm/public/context/ChartsSyncContext.tsx
@@ -7,6 +7,8 @@
 import React, { useMemo, useState } from 'react';
 import { toQuery, fromQuery } from '../components/shared/Links/url_helpers';
 import { history } from '../utils/history';
+import { useUrlParams } from '../hooks/useUrlParams';
+import { useFetcher } from '../hooks/useFetcher';
 
 const ChartsSyncContext = React.createContext<{
   hoverX: number | null;
@@ -17,6 +19,31 @@ const ChartsSyncContext = React.createContext<{
 
 const ChartsSyncContextProvider: React.FC = ({ children }) => {
   const [time, setTime] = useState<number | null>(null);
+  const { urlParams, uiFilters } = useUrlParams();
+
+  const { start, end, serviceName } = urlParams;
+  const { environment } = uiFilters;
+
+  const { data = { annotations: [] } } = useFetcher(
+    callApmApi => {
+      if (start && end && serviceName) {
+        return callApmApi({
+          pathname: '/api/apm/services/{serviceName}/annotations',
+          params: {
+            path: {
+              serviceName
+            },
+            query: {
+              start,
+              end,
+              environment
+            }
+          }
+        });
+      }
+    },
+    [start, end, environment, serviceName]
+  );
 
   const value = useMemo(() => {
     const hoverXHandlers = {
@@ -43,11 +70,12 @@ const ChartsSyncContextProvider: React.FC = ({ children }) => {
           })
         });
       },
-      hoverX: time
+      hoverX: time,
+      annotations: data.annotations
     };
 
     return { ...hoverXHandlers };
-  }, [time, setTime]);
+  }, [time, data.annotations]);
 
   return <ChartsSyncContext.Provider value={value} children={children} />;
 };
diff --git a/x-pack/legacy/plugins/apm/public/context/LicenseContext/index.tsx b/x-pack/legacy/plugins/apm/public/context/LicenseContext/index.tsx
index 4bb246a2a745b..8cdb7f050027d 100644
--- a/x-pack/legacy/plugins/apm/public/context/LicenseContext/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/context/LicenseContext/index.tsx
@@ -3,33 +3,27 @@
  * 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 { FETCH_STATUS, useFetcher } from '../../hooks/useFetcher';
-import { loadLicense, LicenseApiResponse } from '../../services/rest/xpack';
-import { InvalidLicenseNotification } from './InvalidLicenseNotification';
+import useObservable from 'react-use/lib/useObservable';
+import { ILicense } from '../../../../../../plugins/licensing/public';
 import { useApmPluginContext } from '../../hooks/useApmPluginContext';
+import { InvalidLicenseNotification } from './InvalidLicenseNotification';
 
-const initialLicense: LicenseApiResponse = {
-  features: {},
-  license: {
-    is_active: false
-  }
-};
-export const LicenseContext = React.createContext(initialLicense);
+export const LicenseContext = React.createContext<ILicense | undefined>(
+  undefined
+);
 
-export const LicenseProvider: React.FC = ({ children }) => {
-  const { http } = useApmPluginContext().core;
-  const { data = initialLicense, status } = useFetcher(
-    () => loadLicense(http),
-    [http]
-  );
-  const hasValidLicense = data.license.is_active;
+export function LicenseProvider({ children }: { children: React.ReactChild }) {
+  const { license$ } = useApmPluginContext().plugins.licensing;
+  const license = useObservable(license$);
+  const hasInvalidLicense = !license?.isActive;
 
   // if license is invalid show an error message
-  if (status === FETCH_STATUS.SUCCESS && !hasValidLicense) {
+  if (hasInvalidLicense) {
     return <InvalidLicenseNotification />;
   }
 
   // render rest of application and pass down license via context
-  return <LicenseContext.Provider value={data} children={children} />;
-};
+  return <LicenseContext.Provider value={license} children={children} />;
+}
diff --git a/x-pack/legacy/plugins/apm/public/hooks/useKibanaUrl.ts b/x-pack/legacy/plugins/apm/public/hooks/useKibanaUrl.ts
new file mode 100644
index 0000000000000..0b1c416040a2f
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/hooks/useKibanaUrl.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import url from 'url';
+import { useApmPluginContext } from './useApmPluginContext';
+
+export function useKibanaUrl(
+  /** The path to the plugin */ path: string,
+  /** The hash path */ hash: string
+) {
+  const { core } = useApmPluginContext();
+  return url.format({
+    pathname: core.http.basePath.prepend(path),
+    hash
+  });
+}
diff --git a/x-pack/legacy/plugins/apm/public/hooks/useLicense.ts b/x-pack/legacy/plugins/apm/public/hooks/useLicense.ts
new file mode 100644
index 0000000000000..ca828e49706a8
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/hooks/useLicense.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 { useContext } from 'react';
+import { LicenseContext } from '../context/LicenseContext';
+
+export function useLicense() {
+  return useContext(LicenseContext);
+}
diff --git a/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx b/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
index 64784617442ef..216af91fbb591 100644
--- a/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
+++ b/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
@@ -6,35 +6,37 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Router, Route, Switch } from 'react-router-dom';
+import { Route, Router, Switch } from 'react-router-dom';
+import { ApmRoute } from '@elastic/apm-rum-react';
 import styled from 'styled-components';
 import { metadata } from 'ui/metadata';
-import { HomePublicPluginSetup } from '../../../../../../src/plugins/home/public';
 import {
+  CoreSetup,
   CoreStart,
+  PackageInfo,
   Plugin,
-  CoreSetup,
-  PluginInitializerContext,
-  PackageInfo
+  PluginInitializerContext
 } from '../../../../../../src/core/public';
 import { DataPublicPluginSetup } from '../../../../../../src/plugins/data/public';
-import { history } from '../utils/history';
-import { LocationProvider } from '../context/LocationContext';
-import { UrlParamsProvider } from '../context/UrlParamsContext';
-import { px, unit, units } from '../style/variables';
-import { LoadingIndicatorProvider } from '../context/LoadingIndicatorContext';
-import { LicenseProvider } from '../context/LicenseContext';
-import { UpdateBreadcrumbs } from '../components/app/Main/UpdateBreadcrumbs';
+import { HomePublicPluginSetup } from '../../../../../../src/plugins/home/public';
+import { LicensingPluginSetup } from '../../../../../plugins/licensing/public';
 import { routes } from '../components/app/Main/route_config';
 import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
+import { UpdateBreadcrumbs } from '../components/app/Main/UpdateBreadcrumbs';
+import { ApmPluginContext } from '../context/ApmPluginContext';
+import { LicenseProvider } from '../context/LicenseContext';
+import { LoadingIndicatorProvider } from '../context/LoadingIndicatorContext';
+import { LocationProvider } from '../context/LocationContext';
 import { MatchedRouteProvider } from '../context/MatchedRouteContext';
+import { UrlParamsProvider } from '../context/UrlParamsContext';
 import { createStaticIndexPattern } from '../services/rest/index_pattern';
-import { setHelpExtension } from './setHelpExtension';
-import { setReadonlyBadge } from './updateBadge';
+import { px, unit, units } from '../style/variables';
+import { history } from '../utils/history';
 import { featureCatalogueEntry } from './featureCatalogueEntry';
 import { getConfigFromInjectedMetadata } from './getConfigFromInjectedMetadata';
+import { setHelpExtension } from './setHelpExtension';
 import { toggleAppLinkInNav } from './toggleAppLinkInNav';
-import { ApmPluginContext } from '../context/ApmPluginContext';
+import { setReadonlyBadge } from './updateBadge';
 
 export const REACT_APP_ROOT_ID = 'react-apm-root';
 
@@ -51,7 +53,7 @@ const App = () => {
       <Route component={ScrollToTopOnPathChange} />
       <Switch>
         {routes.map((route, i) => (
-          <Route key={i} {...route} />
+          <ApmRoute key={i} {...route} />
         ))}
       </Switch>
     </MainContainer>
@@ -64,6 +66,7 @@ export type ApmPluginStart = void;
 export interface ApmPluginSetupDeps {
   data: DataPublicPluginSetup;
   home: HomePublicPluginSetup;
+  licensing: LicensingPluginSetup;
 }
 
 export interface ConfigSchema {
diff --git a/x-pack/legacy/plugins/apm/public/services/__test__/callApi.test.ts b/x-pack/legacy/plugins/apm/public/services/__test__/callApi.test.ts
index 31ba1e8d40aaa..95ebed1fcb2a6 100644
--- a/x-pack/legacy/plugins/apm/public/services/__test__/callApi.test.ts
+++ b/x-pack/legacy/plugins/apm/public/services/__test__/callApi.test.ts
@@ -7,10 +7,10 @@
 import { mockNow } from '../../utils/testHelpers';
 import { clearCache, callApi } from '../rest/callApi';
 import { SessionStorageMock } from './SessionStorageMock';
-import { HttpServiceBase } from 'kibana/public';
+import { HttpSetup } from 'kibana/public';
 
-type HttpMock = HttpServiceBase & {
-  get: jest.SpyInstance<HttpServiceBase['get']>;
+type HttpMock = HttpSetup & {
+  get: jest.SpyInstance<HttpSetup['get']>;
 };
 
 describe('callApi', () => {
diff --git a/x-pack/legacy/plugins/apm/public/services/__test__/callApmApi.test.ts b/x-pack/legacy/plugins/apm/public/services/__test__/callApmApi.test.ts
index e8a9fa74bd1da..9cca9469bba0e 100644
--- a/x-pack/legacy/plugins/apm/public/services/__test__/callApmApi.test.ts
+++ b/x-pack/legacy/plugins/apm/public/services/__test__/callApmApi.test.ts
@@ -6,7 +6,7 @@
 
 import * as callApiExports from '../rest/callApi';
 import { createCallApmApi, APMClient } from '../rest/createCallApmApi';
-import { HttpServiceBase } from 'kibana/public';
+import { HttpSetup } from 'kibana/public';
 
 const callApi = jest
   .spyOn(callApiExports, 'callApi')
@@ -15,7 +15,7 @@ const callApi = jest
 describe('callApmApi', () => {
   let callApmApi: APMClient;
   beforeEach(() => {
-    callApmApi = createCallApmApi({} as HttpServiceBase);
+    callApmApi = createCallApmApi({} as HttpSetup);
   });
 
   afterEach(() => {
diff --git a/x-pack/legacy/plugins/apm/public/services/rest/callApi.ts b/x-pack/legacy/plugins/apm/public/services/rest/callApi.ts
index 853ba5023f6fd..43ecb860a1f1a 100644
--- a/x-pack/legacy/plugins/apm/public/services/rest/callApi.ts
+++ b/x-pack/legacy/plugins/apm/public/services/rest/callApi.ts
@@ -7,7 +7,7 @@
 import { isString, startsWith } from 'lodash';
 import LRU from 'lru-cache';
 import hash from 'object-hash';
-import { HttpServiceBase, HttpFetchOptions } from 'kibana/public';
+import { HttpSetup, HttpFetchOptions } from 'kibana/public';
 
 export type FetchOptions = Omit<HttpFetchOptions, 'body'> & {
   pathname: string;
@@ -42,7 +42,7 @@ export function clearCache() {
 export type CallApi = typeof callApi;
 
 export async function callApi<T = void>(
-  http: HttpServiceBase,
+  http: HttpSetup,
   fetchOptions: FetchOptions
 ): Promise<T> {
   const cacheKey = getCacheKey(fetchOptions);
diff --git a/x-pack/legacy/plugins/apm/public/services/rest/createCallApmApi.ts b/x-pack/legacy/plugins/apm/public/services/rest/createCallApmApi.ts
index 964cc12794075..b4d060adec5a1 100644
--- a/x-pack/legacy/plugins/apm/public/services/rest/createCallApmApi.ts
+++ b/x-pack/legacy/plugins/apm/public/services/rest/createCallApmApi.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 { HttpServiceBase } from 'kibana/public';
+import { HttpSetup } from 'kibana/public';
 import { callApi, FetchOptions } from './callApi';
 import { APMAPI } from '../../../server/routes/create_apm_api';
 import { Client } from '../../../server/routes/typings';
@@ -17,7 +17,7 @@ export type APMClientOptions = Omit<FetchOptions, 'query' | 'body'> & {
   };
 };
 
-export const createCallApmApi = (http: HttpServiceBase) =>
+export const createCallApmApi = (http: HttpSetup) =>
   ((options: APMClientOptions) => {
     const { pathname, params = {}, ...opts } = options;
 
diff --git a/x-pack/legacy/plugins/apm/public/services/rest/index_pattern.ts b/x-pack/legacy/plugins/apm/public/services/rest/index_pattern.ts
index 477a9f96cc4fb..8e1234dd55e69 100644
--- a/x-pack/legacy/plugins/apm/public/services/rest/index_pattern.ts
+++ b/x-pack/legacy/plugins/apm/public/services/rest/index_pattern.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { HttpServiceBase } from 'kibana/public';
+import { HttpSetup } from 'kibana/public';
 import { createCallApmApi } from './createCallApmApi';
 
-export const createStaticIndexPattern = async (http: HttpServiceBase) => {
+export const createStaticIndexPattern = async (http: HttpSetup) => {
   const callApmApi = createCallApmApi(http);
   return await callApmApi({
     method: 'POST',
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 e495a8968a7f3..e42b9536362e0 100644
--- a/x-pack/legacy/plugins/apm/public/services/rest/ml.ts
+++ b/x-pack/legacy/plugins/apm/public/services/rest/ml.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { HttpServiceBase } from 'kibana/public';
+import { HttpSetup } from 'kibana/public';
 import {
   PROCESSOR_EVENT,
   SERVICE_NAME,
@@ -32,7 +32,7 @@ interface StartedMLJobApiResponse {
   jobs: MlResponseItem[];
 }
 
-async function getTransactionIndices(http: HttpServiceBase) {
+async function getTransactionIndices(http: HttpSetup) {
   const callApmApi: APMClient = createCallApmApi(http);
   const indices = await callApmApi({
     method: 'GET',
@@ -48,7 +48,7 @@ export async function startMLJob({
 }: {
   serviceName: string;
   transactionType: string;
-  http: HttpServiceBase;
+  http: HttpSetup;
 }) {
   const transactionIndices = await getTransactionIndices(http);
   const groups = ['apm', serviceName.toLowerCase()];
@@ -90,7 +90,7 @@ export async function getHasMLJob({
 }: {
   serviceName: string;
   transactionType: string;
-  http: HttpServiceBase;
+  http: HttpSetup;
 }) {
   try {
     await callApi<MLJobApiResponse>(http, {
diff --git a/x-pack/legacy/plugins/apm/public/services/rest/watcher.ts b/x-pack/legacy/plugins/apm/public/services/rest/watcher.ts
index dfa64b5368ee9..259f2af33ba9a 100644
--- a/x-pack/legacy/plugins/apm/public/services/rest/watcher.ts
+++ b/x-pack/legacy/plugins/apm/public/services/rest/watcher.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { HttpServiceBase } from 'kibana/public';
+import { HttpSetup } from 'kibana/public';
 import { callApi } from './callApi';
 
 export async function createWatch({
@@ -12,7 +12,7 @@ export async function createWatch({
   watch,
   http
 }: {
-  http: HttpServiceBase;
+  http: HttpSetup;
   id: string;
   watch: any;
 }) {
diff --git a/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts b/x-pack/legacy/plugins/apm/public/services/rest/xpack.ts
deleted file mode 100644
index 95e283cd67709..0000000000000
--- a/x-pack/legacy/plugins/apm/public/services/rest/xpack.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 { HttpServiceBase } from 'kibana/public';
-import { callApi } from './callApi';
-
-export interface LicenseApiResponse {
-  license: {
-    is_active: boolean;
-  };
-  features: {
-    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;
-      has_expired: boolean;
-      enable_links: boolean;
-      show_links: boolean;
-    };
-    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;
-      show_links: boolean;
-    };
-  };
-}
-
-export async function loadLicense(http: HttpServiceBase) {
-  return callApi<LicenseApiResponse>(http, {
-    pathname: `/api/xpack/v1/info`
-  });
-}
diff --git a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
index 0c8a7cbc17884..862c982d6b5ac 100644
--- a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
@@ -19,7 +19,11 @@ import { MemoryRouter } from 'react-router-dom';
 import { APMConfig } from '../../../../../plugins/apm/server';
 import { LocationProvider } from '../context/LocationContext';
 import { PromiseReturnType } from '../../typings/common';
-import { ESFilter } from '../../typings/elasticsearch';
+import {
+  ESFilter,
+  ESSearchResponse,
+  ESSearchRequest
+} from '../../typings/elasticsearch';
 import {
   ApmPluginContext,
   ApmPluginContextValue
@@ -117,29 +121,41 @@ interface MockSetup {
   };
 }
 
+interface Options {
+  mockResponse?: (
+    request: ESSearchRequest
+  ) => ESSearchResponse<unknown, ESSearchRequest>;
+}
+
 export async function inspectSearchParams(
-  fn: (mockSetup: MockSetup) => Promise<any>
+  fn: (mockSetup: MockSetup) => Promise<any>,
+  options: Options = {}
 ) {
-  const clientSpy = jest.fn().mockReturnValueOnce({
-    hits: {
-      total: 0
-    }
+  const spy = jest.fn().mockImplementation(async request => {
+    return options.mockResponse
+      ? options.mockResponse(request)
+      : {
+          hits: {
+            hits: {
+              total: {
+                value: 0
+              }
+            }
+          }
+        };
   });
 
-  const internalClientSpy = jest.fn().mockReturnValueOnce({
-    hits: {
-      total: 0
-    }
-  });
+  let response;
+  let error;
 
   const mockSetup = {
     start: 1528113600000,
     end: 1528977600000,
     client: {
-      search: clientSpy
+      search: spy
     } as any,
     internalClient: {
-      search: internalClientSpy
+      search: spy
     } as any,
     config: new Proxy(
       {},
@@ -164,21 +180,18 @@ export async function inspectSearchParams(
     dynamicIndexPattern: null as any
   };
   try {
-    await fn(mockSetup);
-  } catch {
+    response = await fn(mockSetup);
+  } catch (err) {
+    error = err;
     // we're only extracting the search params
   }
 
-  let params;
-  if (clientSpy.mock.calls.length) {
-    params = clientSpy.mock.calls[0][0];
-  } else {
-    params = internalClientSpy.mock.calls[0][0];
-  }
-
   return {
-    params,
-    teardown: () => clientSpy.mockClear()
+    params: spy.mock.calls[0][0],
+    response,
+    error,
+    spy,
+    teardown: () => spy.mockClear()
   };
 }
 
diff --git a/x-pack/legacy/plugins/apm/readme.md b/x-pack/legacy/plugins/apm/readme.md
index 0f928fe626bd3..6b21f08b7695e 100644
--- a/x-pack/legacy/plugins/apm/readme.md
+++ b/x-pack/legacy/plugins/apm/readme.md
@@ -31,11 +31,8 @@ _Docker Compose is required_
 
 ### Setup default APM users
 
-APM behaves differently depending on which the role and permissions a logged in user has. 
-For testing purposes APM has invented 4 custom users:
-
-
-**elastic**: Apps: read/write. Indices: read/write (all)
+APM behaves differently depending on which the role and permissions a logged in user has.
+For testing purposes APM uses 3 custom users:
 
 **apm_read_user**: Apps: read. Indices: read (`apm-*`)
 
@@ -44,10 +41,10 @@ For testing purposes APM has invented 4 custom users:
 **kibana_write_user** Apps: read/write. Indices: None
 
 
-To create the 4 users with the correct roles run the following script:
+To create the users with the correct roles run the following script:
 
 ```sh
-node x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js --username <github-username>
+node x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js --role-suffix <github-username-or-something-unique>
 ```
 
 The users will be created with the password specified in kibana.dev.yml for `elasticsearch.password`
diff --git a/x-pack/legacy/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts b/x-pack/legacy/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts
index 66f2a8d1ac79f..85aa43f78f7dd 100644
--- a/x-pack/legacy/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts
+++ b/x-pack/legacy/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts
@@ -20,13 +20,13 @@ const config = yaml.safeLoad(
   )
 );
 
-const GITHUB_USERNAME = argv.username as string;
 const KIBANA_INDEX = config['kibana.index'] as string;
 const TASK_MANAGER_INDEX = config['xpack.task_manager.index'] as string;
-const ELASTICSEARCH_USERNAME = (argv.esUsername as string) || 'elastic';
-const ELASTICSEARCH_PASSWORD = (argv.esPassword ||
+const KIBANA_ROLE_SUFFIX = argv.roleSuffix as string;
+const ELASTICSEARCH_USERNAME = (argv.username as string) || 'elastic';
+const ELASTICSEARCH_PASSWORD = (argv.password ||
   config['elasticsearch.password']) as string;
-const KIBANA_BASE_URL = (argv.baseUrl as string) || 'http://localhost:5601';
+const KIBANA_BASE_URL = (argv.kibanaUrl as string) || 'http://localhost:5601';
 
 interface User {
   username: string;
@@ -40,51 +40,76 @@ const getKibanaBasePath = once(async () => {
   try {
     await axios.request({ url: KIBANA_BASE_URL, maxRedirects: 0 });
   } catch (e) {
-    const err = e as AxiosError;
-    const { location } = err.response?.headers;
-    const isBasePath = RegExp(/^\/\w{3}$/).test(location);
-    return isBasePath ? location : '';
+    if (isAxiosError(e)) {
+      const location = e.response?.headers?.location;
+      const isBasePath = RegExp(/^\/\w{3}$/).test(location);
+      return isBasePath ? location : '';
+    }
+
+    throw e;
   }
   return '';
 });
 
 init().catch(e => {
-  if (e.response) {
-    console.log(
-      JSON.stringify({ request: e.config, response: e.response.data }, null, 2)
+  if (e instanceof AbortError) {
+    console.error(e.message);
+  } else if (isAxiosError(e)) {
+    console.error(
+      `${e.config.method?.toUpperCase() || 'GET'} ${e.config.url} (Code: ${
+        e.response?.status
+      })`
     );
-    return;
-  }
 
-  console.log(e);
+    if (e.response) {
+      console.error(
+        JSON.stringify(
+          { request: e.config, response: e.response.data },
+          null,
+          2
+        )
+      );
+    }
+  } else {
+    console.error(e);
+  }
 });
 
 async function init() {
+  const version = await getKibanaVersion();
+  console.log(`Connected to Kibana ${version}`);
+
+  const isKibanaLocal = KIBANA_BASE_URL.startsWith('http://localhost');
+
   // kibana.index must be different from `.kibana`
-  if (KIBANA_INDEX === '.kibana') {
+  if (isKibanaLocal && KIBANA_INDEX === '.kibana') {
     console.log(
       'kibana.dev.yml: Please use a custom "kibana.index". Example: "kibana.index: .kibana-john"'
     );
     return;
   }
 
-  if (!KIBANA_INDEX.startsWith('.kibana')) {
+  if (isKibanaLocal && !KIBANA_INDEX.startsWith('.kibana')) {
     console.log(
       'kibana.dev.yml: "kibana.index" must be prefixed with `.kibana`. Example: "kibana.index: .kibana-john"'
     );
     return;
   }
 
-  if (TASK_MANAGER_INDEX && !TASK_MANAGER_INDEX.startsWith('.kibana')) {
+  if (
+    isKibanaLocal &&
+    TASK_MANAGER_INDEX &&
+    !TASK_MANAGER_INDEX.startsWith('.kibana')
+  ) {
     console.log(
       'kibana.dev.yml: "xpack.task_manager.index" must be prefixed with `.kibana`. Example: "xpack.task_manager.index: .kibana-task-manager-john"'
     );
     return;
   }
 
-  if (!GITHUB_USERNAME) {
+  if (!KIBANA_ROLE_SUFFIX) {
     console.log(
-      'Please specify your github username with `--username <username>` '
+      'Please specify a unique suffix that will be added to your roles with `--role-suffix <suffix>` '
     );
     return;
   }
@@ -95,8 +120,8 @@ async function init() {
     return;
   }
 
-  const KIBANA_READ_ROLE = `kibana_read_${GITHUB_USERNAME}`;
-  const KIBANA_WRITE_ROLE = `kibana_write_${GITHUB_USERNAME}`;
+  const KIBANA_READ_ROLE = `kibana_read_${KIBANA_ROLE_SUFFIX}`;
+  const KIBANA_WRITE_ROLE = `kibana_write_${KIBANA_ROLE_SUFFIX}`;
 
   // create roles
   await createRole({ roleName: KIBANA_READ_ROLE, privilege: 'read' });
@@ -132,16 +157,18 @@ async function isSecurityEnabled() {
 }
 
 async function callKibana<T>(options: AxiosRequestConfig): Promise<T> {
-  const basePath = await getKibanaBasePath();
-  const { data } = await axios.request({
+  const kibanaBasePath = await getKibanaBasePath();
+  const reqOptions = {
     ...options,
-    baseURL: KIBANA_BASE_URL + basePath,
+    baseURL: KIBANA_BASE_URL + kibanaBasePath,
     auth: {
       username: ELASTICSEARCH_USERNAME,
       password: ELASTICSEARCH_PASSWORD
     },
     headers: { 'kbn-xsrf': 'true', ...options.headers }
-  });
+  };
+
+  const { data } = await axios.request(reqOptions);
   return data;
 }
 
@@ -222,10 +249,8 @@ async function getUser(username: string) {
       url: `/internal/security/users/${username}`
     });
   } catch (e) {
-    const err = e as AxiosError;
-
     // return empty if user doesn't exist
-    if (err.response?.status === 404) {
+    if (isAxiosError(e) && e.response?.status === 404) {
       return null;
     }
 
@@ -240,13 +265,51 @@ async function getRole(roleName: string) {
       url: `/api/security/role/${roleName}`
     });
   } catch (e) {
-    const err = e as AxiosError;
-
     // return empty if role doesn't exist
-    if (err.response?.status === 404) {
+    if (isAxiosError(e) && e.response?.status === 404) {
       return null;
     }
 
     throw e;
   }
 }
+
+async function getKibanaVersion() {
+  try {
+    const res: { version: { number: number } } = await callKibana({
+      method: 'GET',
+      url: `/api/status`
+    });
+    return res.version.number;
+  } catch (e) {
+    if (isAxiosError(e)) {
+      switch (e.response?.status) {
+        case 401:
+          throw new AbortError(
+            `Could not access Kibana with the provided credentials. Username: "${e.config.auth?.username}". Password: "${e.config.auth?.password}"`
+          );
+
+        case 404:
+          throw new AbortError(
+            `Could not get version on ${e.config.url} (Code: 404)`
+          );
+
+        default:
+          throw new AbortError(
+            `Cannot access Kibana on ${e.config.baseURL}. Please specify Kibana with: "--kibana-url <url>"`
+          );
+      }
+    }
+    throw e;
+  }
+}
+
+function isAxiosError(e: AxiosError | Error): e is AxiosError {
+  return 'isAxiosError' in e;
+}
+
+class AbortError extends Error {
+  constructor(message: string) {
+    super(message);
+  }
+}
diff --git a/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js b/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
index a3dc3d66f56a0..825c1a526fcc5 100644
--- a/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
+++ b/x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js
@@ -12,7 +12,7 @@
  * The two roles will be assigned to the already existing users: `apm_read_user`, `apm_write_user`, `kibana_write_user`
  *
  * This makes it possible to use the existing cloud users locally
- * Usage: node setup-kibana-security.js --username YOUR-GITHUB-USERNAME
+ * Usage: node setup-kibana-security.js --role-suffix <YOUR-GITHUB-USERNAME-OR-SOMETHING-UNIQUE>
  ******************************/
 
 // compile typescript on the fly
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap
index d56dfbec174cd..88d8edd17454a 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/__snapshots__/queries.test.ts.snap
@@ -212,6 +212,7 @@ Object {
     "aggs": Object {
       "transactions": Object {
         "terms": Object {
+          "execution_hint": "map",
           "field": "transaction.id",
         },
       },
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 acbbeed2a527d..6027693be5180 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
@@ -45,15 +45,16 @@ export async function getTraceErrorsPerTransaction(
       aggs: {
         transactions: {
           terms: {
-            field: TRANSACTION_ID
+            field: TRANSACTION_ID,
+            // high cardinality
+            execution_hint: 'map'
           }
         }
       }
     }
-  };
+  } as const;
 
   const resp = await client.search(params);
-
   return (resp.aggregations?.transactions.buckets || []).reduce(
     (acc, bucket) => ({
       ...acc,
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 c2dce4f4638ae..aeeb39733b5db 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
@@ -147,7 +147,7 @@ export function getESClient(
           `${request.url.pathname} ${JSON.stringify(context.params.query)}`
         );
         console.log(`GET ${nextParams.index}/_search`);
-        console.log(JSON.stringify(nextParams.body, null, 4));
+        console.log(JSON.stringify(nextParams.body, null, 2));
       }
 
       return (callMethod('search', nextParams) as unknown) as Promise<
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/multiple-versions.json b/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/multiple-versions.json
new file mode 100644
index 0000000000000..7e2d2405d681c
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/multiple-versions.json
@@ -0,0 +1,34 @@
+{
+  "took": 444,
+  "timed_out": false,
+  "_shards": {
+    "total": 1,
+    "successful": 1,
+    "skipped": 0,
+    "failed": 0
+  },
+  "hits": {
+    "total": {
+      "value": 10000,
+      "relation": "gte"
+    },
+    "max_score": null,
+    "hits": []
+  },
+  "aggregations": {
+    "versions": {
+      "doc_count_error_upper_bound": 0,
+      "sum_other_doc_count": 0,
+      "buckets": [
+        {
+          "key": "8.0.0",
+          "doc_count": 615285
+        },
+        {
+          "key": "7.5.0",
+          "doc_count": 615285
+        }
+      ]
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/no-versions.json b/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/no-versions.json
new file mode 100644
index 0000000000000..fa5c63f1b9a54
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/no-versions.json
@@ -0,0 +1,25 @@
+{
+  "took": 398,
+  "timed_out": false,
+  "_shards": {
+    "total": 1,
+    "successful": 1,
+    "skipped": 0,
+    "failed": 0
+  },
+  "hits": {
+    "total": {
+      "value": 10000,
+      "relation": "gte"
+    },
+    "max_score": null,
+    "hits": []
+  },
+  "aggregations": {
+    "versions": {
+      "doc_count_error_upper_bound": 0,
+      "sum_other_doc_count": 0,
+      "buckets": []
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/one-version.json b/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/one-version.json
new file mode 100644
index 0000000000000..56303909bcd6f
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/one-version.json
@@ -0,0 +1,30 @@
+{
+  "took": 444,
+  "timed_out": false,
+  "_shards": {
+    "total": 1,
+    "successful": 1,
+    "skipped": 0,
+    "failed": 0
+  },
+  "hits": {
+    "total": {
+      "value": 10000,
+      "relation": "gte"
+    },
+    "max_score": null,
+    "hits": []
+  },
+  "aggregations": {
+    "versions": {
+      "doc_count_error_upper_bound": 0,
+      "sum_other_doc_count": 0,
+      "buckets": [
+        {
+          "key": "8.0.0",
+          "doc_count": 615285
+        }
+      ]
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/versions-first-seen.json b/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/versions-first-seen.json
new file mode 100644
index 0000000000000..c53b28c8bf594
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/services/annotations/__fixtures__/versions-first-seen.json
@@ -0,0 +1,24 @@
+{
+  "took": 4750,
+  "timed_out": false,
+  "_shards": {
+    "total": 1,
+    "successful": 1,
+    "skipped": 0,
+    "failed": 0
+  },
+  "hits": {
+    "total": {
+      "value": 10000,
+      "relation": "gte"
+    },
+    "max_score": null,
+    "hits": []
+  },
+  "aggregations": {
+    "first_seen": {
+      "value": 1.5281138E12,
+      "value_as_string": "2018-06-04T12:00:00.000Z"
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/annotations/index.test.ts b/x-pack/legacy/plugins/apm/server/lib/services/annotations/index.test.ts
new file mode 100644
index 0000000000000..75ac0642a1b8c
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/services/annotations/index.test.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { getServiceAnnotations } from '.';
+import {
+  SearchParamsMock,
+  inspectSearchParams
+} from '../../../../public/utils/testHelpers';
+import noVersions from './__fixtures__/no-versions.json';
+import oneVersion from './__fixtures__/one-version.json';
+import multipleVersions from './__fixtures__/multiple-versions.json';
+import versionsFirstSeen from './__fixtures__/versions-first-seen.json';
+
+describe('getServiceAnnotations', () => {
+  let mock: SearchParamsMock;
+
+  afterEach(() => {
+    mock.teardown();
+  });
+
+  describe('with 0 versions', () => {
+    it('returns no annotations', async () => {
+      mock = await inspectSearchParams(
+        setup =>
+          getServiceAnnotations({
+            setup,
+            serviceName: 'foo',
+            environment: 'bar'
+          }),
+        {
+          mockResponse: () => noVersions
+        }
+      );
+
+      expect(mock.response).toEqual({ annotations: [] });
+    });
+  });
+
+  describe('with 1 version', () => {
+    it('returns no annotations', async () => {
+      mock = await inspectSearchParams(
+        setup =>
+          getServiceAnnotations({
+            setup,
+            serviceName: 'foo',
+            environment: 'bar'
+          }),
+        {
+          mockResponse: () => oneVersion
+        }
+      );
+
+      expect(mock.response).toEqual({ annotations: [] });
+    });
+  });
+
+  describe('with more than 1 version', () => {
+    it('returns two annotations', async () => {
+      const responses = [
+        multipleVersions,
+        versionsFirstSeen,
+        versionsFirstSeen
+      ];
+      mock = await inspectSearchParams(
+        setup =>
+          getServiceAnnotations({
+            setup,
+            serviceName: 'foo',
+            environment: 'bar'
+          }),
+        {
+          mockResponse: () => responses.shift()
+        }
+      );
+
+      expect(mock.spy.mock.calls.length).toBe(3);
+
+      expect(mock.response).toEqual({
+        annotations: [
+          {
+            id: '8.0.0',
+            text: '8.0.0',
+            time: 1.5281138e12,
+            type: 'version'
+          },
+          {
+            id: '7.5.0',
+            text: '7.5.0',
+            time: 1.5281138e12,
+            type: 'version'
+          }
+        ]
+      });
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/annotations/index.ts b/x-pack/legacy/plugins/apm/server/lib/services/annotations/index.ts
new file mode 100644
index 0000000000000..c03746ca220ee
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/services/annotations/index.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 { isNumber } from 'lodash';
+import { Annotation, AnnotationType } from '../../../../common/annotations';
+import { ESFilter } from '../../../../typings/elasticsearch';
+import {
+  SERVICE_NAME,
+  SERVICE_ENVIRONMENT,
+  PROCESSOR_EVENT
+} from '../../../../common/elasticsearch_fieldnames';
+import { Setup, SetupTimeRange } from '../../helpers/setup_request';
+import { rangeFilter } from '../../helpers/range_filter';
+import { SERVICE_VERSION } from '../../../../common/elasticsearch_fieldnames';
+
+export async function getServiceAnnotations({
+  setup,
+  serviceName,
+  environment
+}: {
+  serviceName: string;
+  environment?: string;
+  setup: Setup & SetupTimeRange;
+}) {
+  const { start, end, client, indices } = setup;
+
+  const filter: ESFilter[] = [
+    { term: { [PROCESSOR_EVENT]: 'transaction' } },
+    { range: rangeFilter(start, end) },
+    { term: { [SERVICE_NAME]: serviceName } }
+  ];
+
+  if (environment) {
+    filter.push({ term: { [SERVICE_ENVIRONMENT]: environment } });
+  }
+
+  const versions =
+    (
+      await client.search({
+        index: indices['apm_oss.transactionIndices'],
+        body: {
+          size: 0,
+          track_total_hits: false,
+          query: {
+            bool: {
+              filter
+            }
+          },
+          aggs: {
+            versions: {
+              terms: {
+                field: SERVICE_VERSION
+              }
+            }
+          }
+        }
+      })
+    ).aggregations?.versions.buckets.map(bucket => bucket.key) ?? [];
+
+  if (versions.length > 1) {
+    const annotations = await Promise.all(
+      versions.map(async version => {
+        const response = await client.search({
+          index: indices['apm_oss.transactionIndices'],
+          body: {
+            size: 0,
+            query: {
+              bool: {
+                filter: filter
+                  .filter(esFilter => !Object.keys(esFilter).includes('range'))
+                  .concat({
+                    term: {
+                      [SERVICE_VERSION]: version
+                    }
+                  })
+              }
+            },
+            aggs: {
+              first_seen: {
+                min: {
+                  field: '@timestamp'
+                }
+              }
+            },
+            track_total_hits: false
+          }
+        });
+
+        const firstSeen = response.aggregations?.first_seen.value;
+
+        if (!isNumber(firstSeen)) {
+          throw new Error(
+            'First seen for version was unexpectedly undefined or null.'
+          );
+        }
+
+        if (firstSeen < start || firstSeen > end) {
+          return null;
+        }
+
+        return {
+          type: AnnotationType.VERSION,
+          id: version,
+          time: firstSeen,
+          text: version
+        };
+      })
+    );
+    return { annotations: annotations.filter(Boolean) as Annotation[] };
+  }
+  return { annotations: [] };
+}
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
index e451f89af5620..e7b2330b472d8 100644
--- 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
@@ -54,10 +54,6 @@ export function getApmIndicesConfig(config: APMConfig): ApmIndicesConfig {
   };
 }
 
-// export async function getApmIndices(context: APMRequestHandlerContext) {
-//   return _getApmIndices(context.core, context.config);
-// }
-
 export async function getApmIndices({
   config,
   savedObjectsClient
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/save_apm_indices.test.ts b/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/save_apm_indices.test.ts
new file mode 100644
index 0000000000000..6567736996502
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/apm_indices/save_apm_indices.test.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 { saveApmIndices } from './save_apm_indices';
+
+describe('saveApmIndices', () => {
+  it('should trim and strip empty settings', async () => {
+    const context = {
+      core: {
+        savedObjects: {
+          client: {
+            create: jest.fn()
+          }
+        }
+      }
+    } as any;
+
+    const apmIndices = {
+      settingA: 'aa',
+      settingB: '',
+      settingC: undefined,
+      settingD: null,
+      settingE: ' ',
+      settingF: 'ff',
+      settingG: ' gg '
+    } as any;
+    await saveApmIndices(context, apmIndices);
+    expect(context.core.savedObjects.client.create).toHaveBeenCalledWith(
+      expect.any(String),
+      { settingA: 'aa', settingF: 'ff', settingG: 'gg' },
+      expect.any(Object)
+    );
+  });
+});
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
index 2fdfd79ce933b..4b68b248d8031 100644
--- 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
@@ -13,14 +13,23 @@ import { APMRequestHandlerContext } from '../../../routes/typings';
 
 export async function saveApmIndices(
   context: APMRequestHandlerContext,
-  apmIndicesSavedObject: Partial<ApmIndicesConfig>
+  apmIndices: Partial<ApmIndicesConfig>
 ) {
   return await context.core.savedObjects.client.create(
     APM_INDICES_SAVED_OBJECT_TYPE,
-    apmIndicesSavedObject,
+    removeEmpty(apmIndices),
     {
       id: APM_INDICES_SAVED_OBJECT_ID,
       overwrite: true
     }
   );
 }
+
+// remove empty/undefined values
+function removeEmpty(apmIndices: Partial<ApmIndicesConfig>) {
+  return Object.fromEntries(
+    Object.entries(apmIndices)
+      .map(([key, value]) => [key, value?.trim()])
+      .filter(([key, value]) => !!value)
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap
index 4484f41d06ac8..a2828e1d74920 100644
--- a/x-pack/legacy/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/traces/__snapshots__/queries.test.ts.snap
@@ -16,6 +16,7 @@ Object {
               "processor.event": Array [
                 "span",
                 "transaction",
+                "error",
               ],
             },
           },
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 8ea548ab3724b..8118b6acaee39 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
@@ -13,6 +13,7 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { Span } from '../../../typings/es_schemas/ui/Span';
 import { Transaction } from '../../../typings/es_schemas/ui/Transaction';
+import { APMError } from '../../../typings/es_schemas/ui/APMError';
 import { rangeFilter } from '../helpers/range_filter';
 import { Setup, SetupTimeRange } from '../helpers/setup_request';
 
@@ -34,7 +35,7 @@ export async function getTraceItems(
         bool: {
           filter: [
             { term: { [TRACE_ID]: traceId } },
-            { terms: { [PROCESSOR_EVENT]: ['span', 'transaction'] } },
+            { terms: { [PROCESSOR_EVENT]: ['span', 'transaction', 'error'] } },
             { range: rangeFilter(start, end) }
           ],
           should: {
@@ -51,7 +52,7 @@ export async function getTraceItems(
     }
   };
 
-  const resp = await client.search<Transaction | Span>(params);
+  const resp = await client.search<Transaction | Span | APMError>(params);
 
   return {
     items: resp.hits.hits.map(hit => hit._source),
diff --git a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap
index 594b363c1cf7b..4b5b34e8af1d2 100644
--- a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap
+++ b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/__snapshots__/queries.test.ts.snap
@@ -4,60 +4,24 @@ exports[`local ui filter queries fetches local ui filter aggregations 1`] = `
 Object {
   "body": Object {
     "aggs": Object {
-      "host": Object {
+      "by_terms": Object {
         "aggs": Object {
-          "by_terms": Object {
-            "aggs": Object {
-              "bucket_count": Object {
-                "cardinality": Object {
-                  "field": "service.name",
-                },
-              },
-            },
-            "terms": Object {
-              "field": "host.hostname",
-              "order": Object {
-                "_count": "desc",
-              },
+          "bucket_count": Object {
+            "cardinality": Object {
+              "field": "service.name",
             },
           },
         },
-        "filter": Object {
-          "bool": Object {
-            "filter": Array [
-              Object {
-                "terms": Object {
-                  "transaction.result": Array [
-                    "2xx",
-                  ],
-                },
-              },
-            ],
+        "terms": Object {
+          "field": "transaction.result",
+          "order": Object {
+            "_count": "desc",
           },
         },
       },
-      "transactionResult": Object {
-        "aggs": Object {
-          "by_terms": Object {
-            "aggs": Object {
-              "bucket_count": Object {
-                "cardinality": Object {
-                  "field": "service.name",
-                },
-              },
-            },
-            "terms": Object {
-              "field": "transaction.result",
-              "order": Object {
-                "_count": "desc",
-              },
-            },
-          },
-        },
-        "filter": Object {
-          "bool": Object {
-            "filter": Array [],
-          },
+      "services": Object {
+        "terms": Object {
+          "field": "service.name",
         },
       },
     },
diff --git a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts
index a0149bec728c5..6363b996ce5bb 100644
--- a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts
@@ -9,7 +9,8 @@ import {
   POD_NAME,
   SERVICE_AGENT_NAME,
   HOST_NAME,
-  TRANSACTION_RESULT
+  TRANSACTION_RESULT,
+  SERVICE_VERSION
 } from '../../../../common/elasticsearch_fieldnames';
 
 const filtersByName = {
@@ -42,6 +43,12 @@ const filtersByName = {
       defaultMessage: 'Transaction result'
     }),
     fieldName: TRANSACTION_RESULT
+  },
+  serviceVersion: {
+    title: i18n.translate('xpack.apm.localFilters.titles.serviceVersion', {
+      defaultMessage: 'Service version'
+    }),
+    fieldName: SERVICE_VERSION
   }
 };
 
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
deleted file mode 100644
index 859b6f1f19c22..0000000000000
--- a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/get_filter_aggregations.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 { omit } from 'lodash';
-import { IIndexPattern } from 'src/plugins/data/server';
-import { Projection } from '../../../../common/projections/typings';
-import { UIFilters } from '../../../../typings/ui-filters';
-import { getUiFiltersES } from '../../helpers/convert_ui_filters/get_ui_filters_es';
-import { localUIFilters, LocalUIFilterName } from './config';
-
-export const getFilterAggregations = ({
-  indexPattern,
-  uiFilters,
-  projection,
-  localFilterNames
-}: {
-  indexPattern: IIndexPattern | undefined;
-  uiFilters: UIFilters;
-  projection: Projection;
-  localFilterNames: LocalUIFilterName[];
-}) => {
-  const mappedFilters = localFilterNames.map(name => localUIFilters[name]);
-
-  const aggs = mappedFilters.map(field => {
-    const filter = getUiFiltersES(indexPattern, omit(uiFilters, field.name));
-
-    const bucketCountAggregation = projection.body.aggs
-      ? {
-          aggs: {
-            bucket_count: {
-              cardinality: {
-                field:
-                  projection.body.aggs[Object.keys(projection.body.aggs)[0]]
-                    .terms.field
-              }
-            }
-          }
-        }
-      : {};
-
-    return {
-      [field.name]: {
-        filter: {
-          bool: {
-            filter
-          }
-        },
-        aggs: {
-          by_terms: {
-            terms: {
-              field: field.fieldName,
-              order: {
-                _count: 'desc' as const
-              }
-            },
-            ...bucketCountAggregation
-          }
-        }
-      }
-    };
-  });
-
-  const mergedAggregations = Object.assign({}, ...aggs) as Partial<
-    Record<LocalUIFilterName, typeof aggs[0]['']>
-  >;
-
-  return mergedAggregations;
-};
diff --git a/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts
new file mode 100644
index 0000000000000..459fd05ae8176
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/server/lib/ui_filters/local_ui_filters/get_local_filter_query.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { omit } from 'lodash';
+import { IIndexPattern } from 'src/plugins/data/server';
+import { mergeProjection } from '../../../../common/projections/util/merge_projection';
+import { Projection } from '../../../../common/projections/typings';
+import { UIFilters } from '../../../../typings/ui-filters';
+import { getUiFiltersES } from '../../helpers/convert_ui_filters/get_ui_filters_es';
+import { localUIFilters, LocalUIFilterName } from './config';
+
+export const getLocalFilterQuery = ({
+  indexPattern,
+  uiFilters,
+  projection,
+  localUIFilterName
+}: {
+  indexPattern: IIndexPattern | undefined;
+  uiFilters: UIFilters;
+  projection: Projection;
+  localUIFilterName: LocalUIFilterName;
+}) => {
+  const field = localUIFilters[localUIFilterName];
+  const filter = getUiFiltersES(indexPattern, omit(uiFilters, field.name));
+
+  const bucketCountAggregation = projection.body.aggs
+    ? {
+        aggs: {
+          bucket_count: {
+            cardinality: {
+              field:
+                projection.body.aggs[Object.keys(projection.body.aggs)[0]].terms
+                  .field
+            }
+          }
+        }
+      }
+    : {};
+
+  return mergeProjection(projection, {
+    body: {
+      size: 0,
+      query: {
+        bool: {
+          filter: filter.concat(projection.body.query?.bool?.filter || [])
+        }
+      },
+      aggs: {
+        by_terms: {
+          terms: {
+            field: field.fieldName,
+            order: {
+              _count: 'desc'
+            }
+          },
+          ...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 524e6ca640f3e..39a264b89ed81 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
@@ -4,11 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { cloneDeep, sortByOrder } from 'lodash';
-import { mergeProjection } from '../../../../common/projections/util/merge_projection';
 import { UIFilters } from '../../../../typings/ui-filters';
 import { Projection } from '../../../../common/projections/typings';
 import { PromiseReturnType } from '../../../../typings/common';
-import { getFilterAggregations } from './get_filter_aggregations';
+import { getLocalFilterQuery } from './get_local_filter_query';
 import { Setup } from '../../helpers/setup_request';
 import { localUIFilters, LocalUIFilterName } from './config';
 
@@ -33,47 +32,35 @@ export async function getLocalUIFilters({
 
   delete projectionWithoutAggs.body.aggs;
 
-  const filterAggregations = getFilterAggregations({
-    indexPattern: dynamicIndexPattern,
-    uiFilters,
-    projection,
-    localFilterNames
-  });
+  return Promise.all(
+    localFilterNames.map(async name => {
+      const query = getLocalFilterQuery({
+        indexPattern: dynamicIndexPattern,
+        uiFilters,
+        projection,
+        localUIFilterName: name
+      });
 
-  const params = mergeProjection(projectionWithoutAggs, {
-    body: {
-      size: 0,
-      // help TS infer aggregations by making all aggregations required
-      aggs: filterAggregations as Required<typeof filterAggregations>
-    }
-  });
+      const response = await client.search(query);
 
-  const response = await client.search(params);
-  const { aggregations } = response;
+      const filter = localUIFilters[name];
 
-  if (!aggregations) {
-    return [];
-  }
-
-  return localFilterNames.map(key => {
-    const aggregationsForFilter = aggregations[key];
-    const filter = localUIFilters[key];
-
-    return {
-      ...filter,
-      options: sortByOrder(
-        aggregationsForFilter.by_terms.buckets.map(bucket => {
-          return {
-            name: bucket.key as string,
-            count:
-              'bucket_count' in bucket
-                ? bucket.bucket_count.value
-                : bucket.doc_count
-          };
-        }),
-        'count',
-        'desc'
-      )
-    };
-  });
+      return {
+        ...filter,
+        options: sortByOrder(
+          response.aggregations?.by_terms.buckets.map(bucket => {
+            return {
+              name: bucket.key as string,
+              count:
+                'bucket_count' in bucket
+                  ? bucket.bucket_count.value
+                  : bucket.doc_count
+            };
+          }) || [],
+          'count',
+          'desc'
+        )
+      };
+    })
+  );
 }
diff --git a/x-pack/legacy/plugins/apm/server/routes/create_api/index.ts b/x-pack/legacy/plugins/apm/server/routes/create_api/index.ts
index 3e97d851acd29..c1a9838e90406 100644
--- a/x-pack/legacy/plugins/apm/server/routes/create_api/index.ts
+++ b/x-pack/legacy/plugins/apm/server/routes/create_api/index.ts
@@ -82,7 +82,7 @@ export function createApi() {
               // if any validation is defined. Not having validation currently
               // means we don't get the payload. See
               // https://github.com/elastic/kibana/issues/50179
-              body: schema.nullable(anyObject) as typeof anyObject,
+              body: schema.nullable(anyObject),
               params: anyObject,
               query: anyObject
             }
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 95488591d4b89..e98842151da84 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
@@ -17,7 +17,8 @@ import {
   serviceAgentNameRoute,
   serviceTransactionTypesRoute,
   servicesRoute,
-  serviceNodeMetadataRoute
+  serviceNodeMetadataRoute,
+  serviceAnnotationsRoute
 } from './services';
 import {
   agentConfigurationRoute,
@@ -75,6 +76,7 @@ const createApmApi = () => {
     .add(serviceTransactionTypesRoute)
     .add(servicesRoute)
     .add(serviceNodeMetadataRoute)
+    .add(serviceAnnotationsRoute)
 
     // Agent configuration
     .add(agentConfigurationAgentNameRoute)
diff --git a/x-pack/legacy/plugins/apm/server/routes/services.ts b/x-pack/legacy/plugins/apm/server/routes/services.ts
index 91495bb96b032..78cb092b85db6 100644
--- a/x-pack/legacy/plugins/apm/server/routes/services.ts
+++ b/x-pack/legacy/plugins/apm/server/routes/services.ts
@@ -19,6 +19,7 @@ import { getServiceNodeMetadata } from '../lib/services/get_service_node_metadat
 import { createRoute } from './create_route';
 import { uiFiltersRt, rangeRt } from './default_api_types';
 import { getServiceMap } from '../lib/services/map';
+import { getServiceAnnotations } from '../lib/services/annotations';
 
 export const servicesRoute = createRoute(() => ({
   path: '/api/apm/services',
@@ -98,3 +99,29 @@ export const serviceMapRoute = createRoute(() => ({
     return new Boom('Not found', { statusCode: 404 });
   }
 }));
+
+export const serviceAnnotationsRoute = createRoute(() => ({
+  path: '/api/apm/services/{serviceName}/annotations',
+  params: {
+    path: t.type({
+      serviceName: t.string
+    }),
+    query: t.intersection([
+      rangeRt,
+      t.partial({
+        environment: t.string
+      })
+    ])
+  },
+  handler: async ({ context, request }) => {
+    const setup = await setupRequest(context, request);
+    const { serviceName } = context.params.path;
+    const { environment } = context.params.query;
+
+    return getServiceAnnotations({
+      setup,
+      serviceName,
+      environment
+    });
+  }
+}));
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
index a670911079040..ddd6a27025131 100644
--- a/x-pack/legacy/plugins/apm/server/routes/settings/agent_configuration.ts
+++ b/x-pack/legacy/plugins/apm/server/routes/settings/agent_configuration.ts
@@ -117,10 +117,19 @@ export const createAgentConfigurationRoute = createRoute(() => ({
   },
   handler: async ({ context, request }) => {
     const setup = await setupRequest(context, request);
-    return await createOrUpdateConfiguration({
-      configuration: context.params.body,
+    const configuration = context.params.body;
+
+    // TODO: Remove logger. Only added temporarily to debug flaky test (https://github.com/elastic/kibana/issues/51764)
+    context.logger.info(
+      `Hitting: /api/apm/settings/agent-configuration/new with ${configuration.service.name}/${configuration.service.environment}`
+    );
+    const res = await createOrUpdateConfiguration({
+      configuration,
       setup
     });
+    context.logger.info(`Created agent configuration`);
+
+    return res;
   }
 }));
 
@@ -161,8 +170,14 @@ export const agentConfigurationSearchRoute = createRoute(core => ({
     })
   },
   handler: async ({ context, request }) => {
-    const setup = await setupRequest(context, request);
     const { body } = context.params;
+
+    // TODO: Remove logger. Only added temporarily to debug flaky test (https://github.com/elastic/kibana/issues/51764)
+    context.logger.info(
+      `Hitting: /api/apm/settings/agent-configuration/search for ${body.service.name}/${body.service.environment}`
+    );
+
+    const setup = await setupRequest(context, request);
     const config = await searchConfigurations({
       serviceName: body.service.name,
       environment: body.service.environment,
@@ -176,6 +191,10 @@ export const agentConfigurationSearchRoute = createRoute(core => ({
       throw new Boom('Not found', { statusCode: 404 });
     }
 
+    context.logger.info(
+      `Config was found for ${body.service.name}/${body.service.environment}`
+    );
+
     // 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 });
diff --git a/x-pack/legacy/plugins/apm/typings/apm-rum-react.d.ts b/x-pack/legacy/plugins/apm/typings/apm-rum-react.d.ts
new file mode 100644
index 0000000000000..6f500caabd824
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/typings/apm-rum-react.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.
+ */
+
+declare module '@elastic/apm-rum-react';
diff --git a/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts b/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts
index b694e9526e2b8..74a9436d7a4bc 100644
--- a/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts
+++ b/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts
@@ -42,6 +42,7 @@ export interface AggregationOptionsByType {
     size?: number;
     missing?: string;
     order?: SortOptions;
+    execution_hint?: 'map' | 'global_ordinals';
   };
   date_histogram: {
     field: string;
diff --git a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/SpanRaw.ts b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/SpanRaw.ts
index 5ba480221c997..60e523f1aa043 100644
--- a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/SpanRaw.ts
+++ b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/SpanRaw.ts
@@ -40,6 +40,12 @@ export interface SpanRaw extends APMBaseDoc {
       statement?: string;
       type?: string;
     };
+    message?: {
+      queue?: { name: string };
+      age?: { ms: number };
+      body?: string;
+      headers?: Record<string, unknown>;
+    };
   };
   transaction?: {
     id: string;
diff --git a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/TransactionRaw.ts b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/TransactionRaw.ts
index ce7c11f34a220..4dc5f8c897c26 100644
--- a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/TransactionRaw.ts
+++ b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/TransactionRaw.ts
@@ -43,6 +43,12 @@ export interface TransactionRaw extends APMBaseDoc {
     };
     type: string;
     custom?: Record<string, unknown>;
+    message?: {
+      queue?: { name: string };
+      age?: { ms: number };
+      body?: string;
+      headers?: Record<string, unknown>;
+    };
   };
 
   // Shared by errors and transactions
diff --git a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/fields/Http.ts b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/fields/Http.ts
index cb63499a98186..be54e66c3d01b 100644
--- a/x-pack/legacy/plugins/apm/typings/es_schemas/raw/fields/Http.ts
+++ b/x-pack/legacy/plugins/apm/typings/es_schemas/raw/fields/Http.ts
@@ -5,7 +5,7 @@
  */
 
 export interface Http {
-  request: { method: string; [key: string]: unknown };
+  request?: { method: string; [key: string]: unknown };
   response?: { status_code: number; [key: string]: unknown };
   version?: string;
 }
diff --git a/x-pack/legacy/plugins/apm/typings/react-vis.d.ts b/x-pack/legacy/plugins/apm/typings/react-vis.d.ts
new file mode 100644
index 0000000000000..aef8efc30d555
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/typings/react-vis.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.
+ */
+
+declare module 'react-vis';
diff --git a/x-pack/legacy/plugins/apm/typings/timeseries.ts b/x-pack/legacy/plugins/apm/typings/timeseries.ts
index d64486d8e71e9..600be15ea229f 100644
--- a/x-pack/legacy/plugins/apm/typings/timeseries.ts
+++ b/x-pack/legacy/plugins/apm/typings/timeseries.ts
@@ -15,12 +15,14 @@ export interface RectCoordinate {
   x0: number;
 }
 
-export interface TimeSeries {
+export interface TimeSeries<
+  TCoordinate extends { x: number } = Coordinate | RectCoordinate
+> {
   title: string;
   titleShort?: string;
   hideLegend?: boolean;
   hideTooltipValue?: boolean;
-  data: Array<Coordinate | RectCoordinate>;
+  data: TCoordinate[];
   legendValue?: string;
   type: string;
   color: string;
diff --git a/x-pack/legacy/plugins/beats_management/common/constants/security.ts b/x-pack/legacy/plugins/beats_management/common/constants/security.ts
index c80b036dddf83..3a9858979dbb9 100644
--- a/x-pack/legacy/plugins/beats_management/common/constants/security.ts
+++ b/x-pack/legacy/plugins/beats_management/common/constants/security.ts
@@ -5,6 +5,13 @@
  */
 
 export const REQUIRED_ROLES = ['beats_admin'];
-export const REQUIRED_LICENSES = ['standard', 'gold', 'trial', 'platinum'];
-export const LICENSES = ['oss', 'basic', 'standard', 'gold', 'trial', 'platinum'];
-export type LicenseType = 'oss' | 'basic' | 'trial' | 'standard' | 'basic' | 'gold' | 'platinum';
+export const REQUIRED_LICENSES = ['standard', 'gold', 'trial', 'platinum', 'enterprise'];
+export const LICENSES = ['oss', 'basic', 'standard', 'gold', 'trial', 'platinum', 'enterprise'];
+export type LicenseType =
+  | 'oss'
+  | 'basic'
+  | 'trial'
+  | 'standard'
+  | 'gold'
+  | 'platinum'
+  | 'enterprise';
diff --git a/x-pack/legacy/plugins/beats_management/public/components/inputs/multi_input.tsx b/x-pack/legacy/plugins/beats_management/public/components/inputs/multi_input.tsx
index 155917c894f42..16bcf1b3b9a06 100644
--- a/x-pack/legacy/plugins/beats_management/public/components/inputs/multi_input.tsx
+++ b/x-pack/legacy/plugins/beats_management/public/components/inputs/multi_input.tsx
@@ -9,7 +9,10 @@ import { CommonProps } from '@elastic/eui/src/components/common';
 import { FormsyInputProps, withFormsy } from 'formsy-react';
 import React, { Component, InputHTMLAttributes } from 'react';
 
-interface ComponentProps extends FormsyInputProps, CommonProps, EuiTextAreaProps {
+interface ComponentProps
+  extends FormsyInputProps,
+    CommonProps,
+    Omit<EuiTextAreaProps, 'onChange' | 'onBlur'> {
   instantValidation: boolean;
   label: string;
   errorText: string;
diff --git a/x-pack/legacy/plugins/beats_management/public/components/inputs/password_input.tsx b/x-pack/legacy/plugins/beats_management/public/components/inputs/password_input.tsx
index 30318f76bb90f..30f4cb85fb58c 100644
--- a/x-pack/legacy/plugins/beats_management/public/components/inputs/password_input.tsx
+++ b/x-pack/legacy/plugins/beats_management/public/components/inputs/password_input.tsx
@@ -4,12 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// @ts-ignore currently no definition for EuiFieldPassword
 import { CommonProps, EuiFieldPassword, EuiFieldPasswordProps, EuiFormRow } from '@elastic/eui';
 import { FormsyInputProps, withFormsy } from 'formsy-react';
 import React, { Component, InputHTMLAttributes } from 'react';
 
-interface ComponentProps extends FormsyInputProps, CommonProps, EuiFieldPasswordProps {
+interface ComponentProps
+  extends FormsyInputProps,
+    CommonProps,
+    Omit<EuiFieldPasswordProps, 'onChange' | 'onBlur'> {
   instantValidation?: boolean;
   label: string;
   errorText: string;
diff --git a/x-pack/legacy/plugins/beats_management/public/components/layouts/walkthrough.tsx b/x-pack/legacy/plugins/beats_management/public/components/layouts/walkthrough.tsx
index bcedfc063b0e5..bf065a66eda26 100644
--- a/x-pack/legacy/plugins/beats_management/public/components/layouts/walkthrough.tsx
+++ b/x-pack/legacy/plugins/beats_management/public/components/layouts/walkthrough.tsx
@@ -6,13 +6,7 @@
 
 import React from 'react';
 
-import {
-  EuiPageContent,
-  EuiPageContentBody,
-  // @ts-ignore
-  EuiStepsHorizontal,
-  EuiTitle,
-} from '@elastic/eui';
+import { EuiPageContent, EuiPageContentBody, EuiStepsHorizontal, EuiTitle } from '@elastic/eui';
 
 interface LayoutProps {
   title: string;
diff --git a/x-pack/legacy/plugins/beats_management/public/components/table/table.tsx b/x-pack/legacy/plugins/beats_management/public/components/table/table.tsx
index 8b101196d21ee..26ddd682405cb 100644
--- a/x-pack/legacy/plugins/beats_management/public/components/table/table.tsx
+++ b/x-pack/legacy/plugins/beats_management/public/components/table/table.tsx
@@ -93,7 +93,7 @@ export class Table extends React.Component<TableProps, TableState> {
     };
 
     const selectionOptions = hideTableControls
-      ? null
+      ? undefined
       : {
           onSelectionChange: this.setSelection,
           selectable: () => true,
@@ -148,7 +148,7 @@ export class Table extends React.Component<TableProps, TableState> {
     );
   }
 
-  private onTableChange = (page: { index: number; size: number } = { index: 0, size: 50 }) => {
+  private onTableChange = ({ page }: { page: { index: number; size: number } }) => {
     if (this.props.onTableChange) {
       this.props.onTableChange(page.index, page.size);
     }
diff --git a/x-pack/legacy/plugins/beats_management/public/components/table/table_type_configs.tsx b/x-pack/legacy/plugins/beats_management/public/components/table/table_type_configs.tsx
index 6f03f884563e1..6fff7574c39e6 100644
--- a/x-pack/legacy/plugins/beats_management/public/components/table/table_type_configs.tsx
+++ b/x-pack/legacy/plugins/beats_management/public/components/table/table_type_configs.tsx
@@ -14,7 +14,7 @@ import { ConnectedLink } from '../navigation/connected_link';
 import { TagBadge } from '../tag';
 
 export interface ColumnDefinition {
-  align?: string;
+  align?: 'left' | 'right' | 'center' | undefined;
   field: string;
   name: string;
   sortable?: boolean;
diff --git a/x-pack/legacy/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/legacy/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts
index 79ffe58d419bd..b2cfd826e6207 100644
--- a/x-pack/legacy/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/legacy/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts
@@ -11,6 +11,8 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { UIRoutes } from 'ui/routes';
 import { isLeft } from 'fp-ts/lib/Either';
+import { npSetup } from 'ui/new_platform';
+import { SecurityPluginSetup } from '../../../../../../../plugins/security/public';
 import { BufferedKibanaServiceCall, KibanaAdapterServiceRefs, KibanaUIConfig } from '../../types';
 import {
   FrameworkAdapter,
@@ -58,7 +60,7 @@ export class KibanaFrameworkAdapter implements FrameworkAdapter {
   };
 
   public async waitUntilFrameworkReady(): Promise<void> {
-    const $injector = await this.onKibanaReady();
+    await this.onKibanaReady();
     const xpackInfo: any = this.xpackInfoService;
     let xpackInfoUnpacked: FrameworkInfo;
 
@@ -95,8 +97,10 @@ export class KibanaFrameworkAdapter implements FrameworkAdapter {
     }
     this.xpackInfo = xpackInfoUnpacked;
 
+    const securitySetup = ((npSetup.plugins as unknown) as { security?: SecurityPluginSetup })
+      .security;
     try {
-      this.shieldUser = await $injector.get('ShieldUser').getCurrent().$promise;
+      this.shieldUser = (await securitySetup?.authc.getCurrentUser()) || null;
       const assertUser = RuntimeFrameworkUser.decode(this.shieldUser);
 
       if (isLeft(assertUser)) {
diff --git a/x-pack/legacy/plugins/beats_management/public/pages/beat/details.tsx b/x-pack/legacy/plugins/beats_management/public/pages/beat/details.tsx
index 3eaf550cb8c77..3952b44f82561 100644
--- a/x-pack/legacy/plugins/beats_management/public/pages/beat/details.tsx
+++ b/x-pack/legacy/plugins/beats_management/public/pages/beat/details.tsx
@@ -13,6 +13,7 @@ import {
   EuiSpacer,
   EuiText,
   EuiTitle,
+  EuiBasicTableColumn,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
@@ -98,7 +99,7 @@ class BeatDetailPageUi extends React.PureComponent<PageProps, PageState> {
           ),
         }));
 
-    const columns = [
+    const columns: Array<EuiBasicTableColumn<ConfigurationBlock>> = [
       {
         field: 'displayValue',
         name: intl.formatMessage({
diff --git a/x-pack/legacy/plugins/beats_management/server/lib/adapters/framework/adapter_types.ts b/x-pack/legacy/plugins/beats_management/server/lib/adapters/framework/adapter_types.ts
index 08832772dd047..bb1f68e1c03b3 100644
--- a/x-pack/legacy/plugins/beats_management/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/legacy/plugins/beats_management/server/lib/adapters/framework/adapter_types.ts
@@ -82,6 +82,7 @@ export const RuntimeFrameworkInfo = t.interface(
         basic: null,
         gold: null,
         platinum: null,
+        enterprise: null,
       }),
       expired: t.boolean,
       expiry_date_in_millis: t.number,
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 546e8967a7439..3669bd3e08201 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 { 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';
+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/np_ready/embeddable/constants';
 
 export const EmbeddableTypes = {
   map: MAP_SAVED_OBJECT_TYPE,
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts
index 221469ad8ded1..4895571115898 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts
@@ -5,7 +5,7 @@
  */
 
 import { ExpressionFunction } from 'src/plugins/expressions/common/types';
-import { SearchInput } from 'src/legacy/core_plugins/kibana/public/discover/embeddable';
+import { SearchInput } from 'src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable';
 import {
   EmbeddableTypes,
   EmbeddableExpressionType,
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
index b00ee446a8724..f6eb377e2698b 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts
@@ -5,7 +5,7 @@
  */
 
 import { ExpressionFunction } from 'src/plugins/expressions/common/types';
-import { VisualizeInput } from 'src/legacy/core_plugins/kibana/public/visualize/embeddable';
+import { VisualizeInput } from 'src/legacy/core_plugins/kibana/public/visualize_embeddable';
 import {
   EmbeddableTypes,
   EmbeddableExpressionType,
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.examples.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.examples.storyshot
index 7d37bf184b49b..b9c6d258821f2 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.examples.storyshot
@@ -16,9 +16,11 @@ exports[`Storyshots renderers/DropdownFilter default 1`] = `
     </option>
   </select>
   <svg
+    aria-hidden={true}
     className="euiIcon euiIcon--medium euiIcon-isLoading canvasDropdownFilter__icon"
     focusable="false"
     height={16}
+    role="img"
     style={null}
     viewBox="0 0 16 16"
     width={16}
@@ -61,9 +63,11 @@ exports[`Storyshots renderers/DropdownFilter with choices 1`] = `
     </option>
   </select>
   <svg
+    aria-hidden={true}
     className="euiIcon euiIcon--medium euiIcon-isLoading canvasDropdownFilter__icon"
     focusable="false"
     height={16}
+    role="img"
     style={null}
     viewBox="0 0 16 16"
     width={16}
@@ -107,9 +111,11 @@ exports[`Storyshots renderers/DropdownFilter with choices and new value 1`] = `
     </option>
   </select>
   <svg
+    aria-hidden={true}
     className="euiIcon euiIcon--medium euiIcon-isLoading canvasDropdownFilter__icon"
     focusable="false"
     height={16}
+    role="img"
     style={null}
     viewBox="0 0 16 16"
     width={16}
@@ -153,9 +159,11 @@ exports[`Storyshots renderers/DropdownFilter with choices and value 1`] = `
     </option>
   </select>
   <svg
+    aria-hidden={true}
     className="euiIcon euiIcon--medium euiIcon-isLoading canvasDropdownFilter__icon"
     focusable="false"
     height={16}
+    role="img"
     style={null}
     viewBox="0 0 16 16"
     width={16}
@@ -181,9 +189,11 @@ exports[`Storyshots renderers/DropdownFilter with new value 1`] = `
     </option>
   </select>
   <svg
+    aria-hidden={true}
     className="euiIcon euiIcon--medium euiIcon-isLoading canvasDropdownFilter__icon"
     focusable="false"
     height={16}
+    role="img"
     style={null}
     viewBox="0 0 16 16"
     width={16}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/index.ts
index db4fd1aaf0468..ff0e52580b421 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/index.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/index.ts
@@ -21,15 +21,20 @@ export const DatetimeInput = compose<ComponentProps, Props>(
     moment ? moment.format('YYYY-MM-DD HH:mm:ss') : ''
   ),
   lifecycle<Props & ComponentProps, {}>({
-    // TODO: Refactor to no longer use componentWillReceiveProps since it is being deprecated
-    componentWillReceiveProps({ moment, setStrValue, setValid }) {
-      if (!moment) return;
+    componentDidUpdate(prevProps) {
+      const prevMoment = prevProps.moment;
 
-      if (this.props.moment && this.props.moment.isSame(moment)) {
+      // If we don't have a current moment, do nothing
+      if (!this.props.moment) return;
+
+      // If we previously had a moment and it's the same as the current moment, do nothing
+      if (prevMoment && prevMoment.isSame(this.props.moment)) {
         return;
       }
-      setStrValue(moment.format('YYYY-MM-DD HH:mm:ss'));
-      setValid(true);
+
+      // Set the string value of the current moment and mark as valid
+      this.props.setStrValue(this.props.moment.format('YYYY-MM-DD HH:mm:ss'));
+      this.props.setValid(true);
     },
   })
 )(Component);
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.tsx
index fb0baa22c16f4..a03e64ce3a02e 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.tsx
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.tsx
@@ -47,9 +47,10 @@ export class TimePicker extends Component<Props, State> {
     isDirty: false,
   };
 
-  // TODO: Refactor to no longer use componentWillReceiveProps since it is being deprecated
-  UNSAFE_componentWillReceiveProps({ from, to }: Props) {
-    if (from !== this.props.from || to !== this.props.to) {
+  componentDidUpdate(prevProps: Props) {
+    const { to, from } = this.props;
+
+    if (prevProps.from !== from || prevProps.to !== to) {
       this.setState({
         range: { from, to },
         isDirty: false,
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/extended_template.examples.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/extended_template.examples.storyshot
index 6c9d4ce4459b3..be4db66a84d83 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/extended_template.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/extended_template.examples.storyshot
@@ -60,10 +60,11 @@ exports[`Storyshots arguments/AxisConfig extended 1`] = `
               className="euiFormControlLayoutCustomIcon"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -141,10 +142,11 @@ exports[`Storyshots arguments/AxisConfig/components extended 1`] = `
               className="euiFormControlLayoutCustomIcon"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/__snapshots__/date_format.examples.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/__snapshots__/date_format.examples.storyshot
index 4bed74ddb6c60..014c365055fa3 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/__snapshots__/date_format.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/__snapshots__/date_format.examples.storyshot
@@ -43,10 +43,11 @@ Array [
           className="euiFormControlLayoutCustomIcon"
         >
           <svg
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
             focusable="false"
             height={16}
+            role="img"
             style={null}
             viewBox="0 0 16 16"
             width={16}
@@ -120,10 +121,11 @@ Array [
           className="euiFormControlLayoutCustomIcon"
         >
           <svg
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
             focusable="false"
             height={16}
+            role="img"
             style={null}
             viewBox="0 0 16 16"
             width={16}
@@ -196,10 +198,11 @@ exports[`Storyshots arguments/DateFormat with preset format 1`] = `
         className="euiFormControlLayoutCustomIcon"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/__snapshots__/number_format.examples.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/__snapshots__/number_format.examples.storyshot
index 6de7df3454dde..e93ad3be31f1d 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/__snapshots__/number_format.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/__snapshots__/number_format.examples.storyshot
@@ -53,10 +53,11 @@ Array [
           className="euiFormControlLayoutCustomIcon"
         >
           <svg
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
             focusable="false"
             height={16}
+            role="img"
             style={null}
             viewBox="0 0 16 16"
             width={16}
@@ -140,10 +141,11 @@ Array [
           className="euiFormControlLayoutCustomIcon"
         >
           <svg
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
             focusable="false"
             height={16}
+            role="img"
             style={null}
             viewBox="0 0 16 16"
             width={16}
@@ -226,10 +228,11 @@ exports[`Storyshots arguments/NumberFormat with preset format 1`] = `
         className="euiFormControlLayoutCustomIcon"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
diff --git a/x-pack/legacy/plugins/canvas/i18n/elements/element_strings.ts b/x-pack/legacy/plugins/canvas/i18n/elements/element_strings.ts
index f1df8eaec3064..df23dff1c7127 100644
--- a/x-pack/legacy/plugins/canvas/i18n/elements/element_strings.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/elements/element_strings.ts
@@ -55,7 +55,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   dropdown_filter: {
     displayName: i18n.translate('xpack.canvas.elements.dropdownFilterDisplayName', {
-      defaultMessage: 'Dropdown Filter',
+      defaultMessage: 'Dropdown filter',
     }),
     help: i18n.translate('xpack.canvas.elements.dropdownFilterHelpText', {
       defaultMessage: 'A dropdown from which you can select values for an "exactly" filter',
@@ -63,7 +63,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   horizontalBarChart: {
     displayName: i18n.translate('xpack.canvas.elements.horizontalBarChartDisplayName', {
-      defaultMessage: 'Horizontal Bar chart',
+      defaultMessage: 'Horizontal bar chart',
     }),
     help: i18n.translate('xpack.canvas.elements.horizontalBarChartHelpText', {
       defaultMessage: 'A customizable horizontal bar chart',
@@ -71,7 +71,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   horizontalProgressBar: {
     displayName: i18n.translate('xpack.canvas.elements.horizontalProgressBarDisplayName', {
-      defaultMessage: 'Horizontal Progress Bar',
+      defaultMessage: 'Horizontal progress bar',
     }),
     help: i18n.translate('xpack.canvas.elements.horizontalProgressBarHelpText', {
       defaultMessage: 'Displays progress as a portion of a horizontal bar',
@@ -79,7 +79,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   horizontalProgressPill: {
     displayName: i18n.translate('xpack.canvas.elements.horizontalProgressPillDisplayName', {
-      defaultMessage: 'Horizontal Progress Pill',
+      defaultMessage: 'Horizontal progress pill',
     }),
     help: i18n.translate('xpack.canvas.elements.horizontalProgressPillHelpText', {
       defaultMessage: 'Displays progress as a portion of a horizontal pill',
@@ -103,10 +103,10 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   markdown: {
     displayName: i18n.translate('xpack.canvas.elements.markdownDisplayName', {
-      defaultMessage: 'Markdown',
+      defaultMessage: 'Text',
     }),
     help: i18n.translate('xpack.canvas.elements.markdownHelpText', {
-      defaultMessage: 'Markup from Markdown',
+      defaultMessage: 'Add text using Markdown',
     }),
   },
   metric: {
@@ -135,7 +135,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   progressGauge: {
     displayName: i18n.translate('xpack.canvas.elements.progressGaugeDisplayName', {
-      defaultMessage: 'Progress Gauge',
+      defaultMessage: 'Progress gauge',
     }),
     help: i18n.translate('xpack.canvas.elements.progressGaugeHelpText', {
       defaultMessage: 'Displays progress as a portion of a gauge',
@@ -143,7 +143,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   progressSemicircle: {
     displayName: i18n.translate('xpack.canvas.elements.progressSemicircleDisplayName', {
-      defaultMessage: 'Progress Semicircle',
+      defaultMessage: 'Progress semicircle',
     }),
     help: i18n.translate('xpack.canvas.elements.progressSemicircleHelpText', {
       defaultMessage: 'Displays progress as a portion of a semicircle',
@@ -151,7 +151,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   progressWheel: {
     displayName: i18n.translate('xpack.canvas.elements.progressWheelDisplayName', {
-      defaultMessage: 'Progress Wheel',
+      defaultMessage: 'Progress wheel',
     }),
     help: i18n.translate('xpack.canvas.elements.progressWheelHelpText', {
       defaultMessage: 'Displays progress as a portion of a wheel',
@@ -215,7 +215,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   verticalProgressBar: {
     displayName: i18n.translate('xpack.canvas.elements.verticalProgressBarDisplayName', {
-      defaultMessage: 'Vertical Progress Bar',
+      defaultMessage: 'Vertical progress bar',
     }),
     help: i18n.translate('xpack.canvas.elements.verticalProgressBarHelpText', {
       defaultMessage: 'Displays progress as a portion of a vertical bar',
@@ -223,7 +223,7 @@ export const getElementStrings = (): ElementStringDict => ({
   },
   verticalProgressPill: {
     displayName: i18n.translate('xpack.canvas.elements.verticalProgressPillDisplayName', {
-      defaultMessage: 'Vertical Progress Pill',
+      defaultMessage: 'Vertical progress pill',
     }),
     help: i18n.translate('xpack.canvas.elements.verticalProgressPillHelpText', {
       defaultMessage: 'Displays progress as a portion of a vertical pill',
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 89ed05a1eea93..454ef0a79d10a 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
@@ -80,10 +80,11 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -113,10 +114,11 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
                 type="button"
               >
                 <svg
-                  aria-hidden="true"
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
@@ -147,10 +149,11 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
                 type="button"
               >
                 <svg
-                  aria-hidden="true"
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
@@ -177,10 +180,11 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -275,10 +279,11 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -308,10 +313,11 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
                 type="button"
               >
                 <svg
-                  aria-hidden="true"
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
@@ -342,10 +348,11 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
                 type="button"
               >
                 <svg
-                  aria-hidden="true"
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
@@ -372,10 +379,11 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/color_dot/__examples__/__snapshots__/color_dot.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/color_dot/__examples__/__snapshots__/color_dot.examples.storyshot
index 9ffc95c82531e..77359957b8443 100644
--- a/x-pack/legacy/plugins/canvas/public/components/color_dot/__examples__/__snapshots__/color_dot.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/color_dot/__examples__/__snapshots__/color_dot.examples.storyshot
@@ -127,9 +127,11 @@ Array [
       }
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--medium euiIcon-isLoading"
         focusable="false"
         height={16}
+        role="img"
         style={
           Object {
             "fill": "#000",
@@ -156,9 +158,11 @@ Array [
       }
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--medium euiIcon-isLoading"
         focusable="false"
         height={16}
+        role="img"
         style={
           Object {
             "fill": "#fff",
@@ -185,9 +189,11 @@ Array [
       }
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--medium euiIcon-isLoading"
         focusable="false"
         height={16}
+        role="img"
         style={
           Object {
             "fill": "#fff",
@@ -214,9 +220,11 @@ Array [
       }
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--medium euiIcon-isLoading"
         focusable="false"
         height={16}
+        role="img"
         style={
           Object {
             "fill": "#fff",
diff --git a/x-pack/legacy/plugins/canvas/public/components/color_manager/__examples__/__snapshots__/color_manager.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/color_manager/__examples__/__snapshots__/color_manager.examples.storyshot
index 25198ac2e79f3..5da0ea8738c37 100644
--- a/x-pack/legacy/plugins/canvas/public/components/color_manager/__examples__/__snapshots__/color_manager.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/color_manager/__examples__/__snapshots__/color_manager.examples.storyshot
@@ -389,10 +389,11 @@ exports[`Storyshots components/Color/ColorManager interactive 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -407,10 +408,11 @@ exports[`Storyshots components/Color/ColorManager interactive 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -807,10 +809,11 @@ Array [
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -825,10 +828,11 @@ Array [
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -894,10 +898,11 @@ Array [
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -912,10 +917,11 @@ Array [
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -981,10 +987,11 @@ Array [
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -999,10 +1006,11 @@ Array [
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/color_palette/__examples__/__snapshots__/color_palette.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/color_palette/__examples__/__snapshots__/color_palette.examples.storyshot
index 05dd67960db05..badbf96029f12 100644
--- a/x-pack/legacy/plugins/canvas/public/components/color_palette/__examples__/__snapshots__/color_palette.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/color_palette/__examples__/__snapshots__/color_palette.examples.storyshot
@@ -364,9 +364,11 @@ Array [
             }
           >
             <svg
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading selected-color"
               focusable="false"
               height={16}
+              role="img"
               style={
                 Object {
                   "fill": "#333",
@@ -713,9 +715,11 @@ exports[`Storyshots components/Color/ColorPalette six colors, wrap at 4 1`] = `
           }
         >
           <svg
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading selected-color"
             focusable="false"
             height={16}
+            role="img"
             style={
               Object {
                 "fill": "#333",
@@ -985,9 +989,11 @@ Array [
             }
           >
             <svg
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading selected-color"
               focusable="false"
               height={16}
+              role="img"
               style={
                 Object {
                   "fill": "#333",
diff --git a/x-pack/legacy/plugins/canvas/public/components/color_picker/__examples__/__snapshots__/color_picker.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/color_picker/__examples__/__snapshots__/color_picker.examples.storyshot
index 1af31bdef47fe..6e25ce3d4b0d4 100644
--- a/x-pack/legacy/plugins/canvas/public/components/color_picker/__examples__/__snapshots__/color_picker.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/color_picker/__examples__/__snapshots__/color_picker.examples.storyshot
@@ -220,10 +220,11 @@ exports[`Storyshots components/Color/ColorPicker interactive 1`] = `
           type="button"
         >
           <svg
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
             focusable="false"
             height={16}
+            role="img"
             style={null}
             viewBox="0 0 16 16"
             width={16}
@@ -238,10 +239,11 @@ exports[`Storyshots components/Color/ColorPicker interactive 1`] = `
           type="button"
         >
           <svg
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
             focusable="false"
             height={16}
+            role="img"
             style={null}
             viewBox="0 0 16 16"
             width={16}
@@ -307,9 +309,11 @@ exports[`Storyshots components/Color/ColorPicker six colors 1`] = `
             }
           >
             <svg
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading selected-color"
               focusable="false"
               height={16}
+              role="img"
               style={
                 Object {
                   "fill": "#333",
@@ -511,10 +515,11 @@ exports[`Storyshots components/Color/ColorPicker six colors 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -529,10 +534,11 @@ exports[`Storyshots components/Color/ColorPicker six colors 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -767,10 +773,11 @@ exports[`Storyshots components/Color/ColorPicker six colors, value missing 1`] =
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -785,10 +792,11 @@ exports[`Storyshots components/Color/ColorPicker six colors, value missing 1`] =
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -833,9 +841,11 @@ exports[`Storyshots components/Color/ColorPicker three colors 1`] = `
             }
           >
             <svg
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading selected-color"
               focusable="false"
               height={16}
+              role="img"
               style={
                 Object {
                   "fill": "#333",
@@ -959,10 +969,11 @@ exports[`Storyshots components/Color/ColorPicker three colors 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -977,10 +988,11 @@ exports[`Storyshots components/Color/ColorPicker three colors 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot
index ec282e9a44fde..efaa34001971e 100644
--- a/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot
@@ -55,10 +55,11 @@ Array [
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -209,10 +210,11 @@ Array [
                           className="euiFilePicker__prompt"
                         >
                           <svg
-                            aria-hidden="true"
+                            aria-hidden={true}
                             className="euiIcon euiIcon--large euiIcon-isLoading euiFilePicker__icon"
                             focusable="false"
                             height={16}
+                            role="img"
                             style={null}
                             viewBox="0 0 16 16"
                             width={16}
@@ -255,9 +257,11 @@ Array [
                     className="euiCard__top"
                   >
                     <svg
+                      aria-hidden={true}
                       className="euiIcon euiIcon--xxLarge euiIcon--app euiIcon-isLoading euiCard__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -412,10 +416,11 @@ Array [
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -566,10 +571,11 @@ Array [
                           className="euiFilePicker__prompt"
                         >
                           <svg
-                            aria-hidden="true"
+                            aria-hidden={true}
                             className="euiIcon euiIcon--large euiIcon-isLoading euiFilePicker__icon"
                             focusable="false"
                             height={16}
+                            role="img"
                             style={null}
                             viewBox="0 0 16 16"
                             width={16}
@@ -766,10 +772,11 @@ Array [
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -920,10 +927,11 @@ Array [
                           className="euiFilePicker__prompt"
                         >
                           <svg
-                            aria-hidden="true"
+                            aria-hidden={true}
                             className="euiIcon euiIcon--large euiIcon-isLoading euiFilePicker__icon"
                             focusable="false"
                             height={16}
+                            role="img"
                             style={null}
                             viewBox="0 0 16 16"
                             width={16}
@@ -966,9 +974,11 @@ Array [
                     className="euiCard__top"
                   >
                     <svg
+                      aria-hidden={true}
                       className="euiIcon euiIcon--xxLarge euiIcon--app euiIcon-isLoading euiCard__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -1122,10 +1132,11 @@ Array [
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -1276,10 +1287,11 @@ Array [
                           className="euiFilePicker__prompt"
                         >
                           <svg
-                            aria-hidden="true"
+                            aria-hidden={true}
                             className="euiIcon euiIcon--large euiIcon-isLoading euiFilePicker__icon"
                             focusable="false"
                             height={16}
+                            role="img"
                             style={null}
                             viewBox="0 0 16 16"
                             width={16}
@@ -1322,9 +1334,11 @@ Array [
                     className="euiCard__top"
                   >
                     <svg
+                      aria-hidden={true}
                       className="euiIcon euiIcon--xxLarge euiIcon--app euiIcon-isLoading euiCard__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot
index f09921607ef46..5eedf32020e4c 100644
--- a/x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot
@@ -16,9 +16,11 @@ exports[`Storyshots components/Elements/ElementCard with click handler 1`] = `
       className="euiCard__top"
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--xxLarge euiIcon--app euiIcon-isLoading euiCard__icon"
         focusable="false"
         height={16}
+        role="img"
         style={null}
         viewBox="0 0 16 16"
         width={16}
@@ -118,9 +120,11 @@ exports[`Storyshots components/Elements/ElementCard with tags 1`] = `
       className="euiCard__top"
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--xxLarge euiIcon--app euiIcon-isLoading euiCard__icon"
         focusable="false"
         height={16}
+        role="img"
         style={null}
         viewBox="0 0 16 16"
         width={16}
@@ -289,9 +293,11 @@ exports[`Storyshots components/Elements/ElementCard with title and description 1
       className="euiCard__top"
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--xxLarge euiIcon--app euiIcon-isLoading euiCard__icon"
         focusable="false"
         height={16}
+        role="img"
         style={null}
         viewBox="0 0 16 16"
         width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_controls.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_controls.examples.storyshot
index c88869ea22f1a..27a2a60180930 100644
--- a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_controls.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_controls.examples.storyshot
@@ -28,10 +28,11 @@ exports[`Storyshots components/Elements/ElementControls has two buttons 1`] = `
           type="button"
         >
           <svg
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
             focusable="false"
             height={16}
+            role="img"
             style={null}
             viewBox="0 0 16 16"
             width={16}
@@ -57,10 +58,11 @@ exports[`Storyshots components/Elements/ElementControls has two buttons 1`] = `
           type="button"
         >
           <svg
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
             focusable="false"
             height={16}
+            role="img"
             style={null}
             viewBox="0 0 16 16"
             width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot
index 01774f849dfe7..c9fb77061572d 100644
--- a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot
@@ -75,10 +75,11 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -104,10 +105,11 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -182,10 +184,11 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -211,10 +214,11 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -289,10 +293,11 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -318,10 +323,11 @@ exports[`Storyshots components/Elements/ElementGrid with controls 1`] = `
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -411,10 +417,11 @@ exports[`Storyshots components/Elements/ElementGrid with controls and filter 1`]
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -440,10 +447,11 @@ exports[`Storyshots components/Elements/ElementGrid with controls and filter 1`]
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/expression/index.js b/x-pack/legacy/plugins/canvas/public/components/expression/index.js
index 4bcdb547186d1..806ef388bc4f6 100644
--- a/x-pack/legacy/plugins/canvas/public/components/expression/index.js
+++ b/x-pack/legacy/plugins/canvas/public/components/expression/index.js
@@ -55,14 +55,6 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
 };
 
 const expressionLifecycle = lifecycle({
-  componentWillReceiveProps({ formState, setFormState, expression }) {
-    if (this.props.expression !== expression && expression !== formState.expression) {
-      setFormState({
-        expression,
-        dirty: false,
-      });
-    }
-  },
   componentDidMount() {
     const { functionDefinitionsPromise, setFunctionDefinitions } = this.props;
     functionDefinitionsPromise.then(defs => setFunctionDefinitions(defs));
diff --git a/x-pack/legacy/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.examples.storyshot
index 085662eeb65c7..7f18c2dc85215 100644
--- a/x-pack/legacy/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.examples.storyshot
@@ -20,10 +20,11 @@ exports[`Storyshots components/FileUpload default 1`] = `
       className="euiFilePicker__prompt"
     >
       <svg
-        aria-hidden="true"
+        aria-hidden={true}
         className="euiIcon euiIcon--large euiIcon-isLoading euiFilePicker__icon"
         focusable="false"
         height={16}
+        role="img"
         style={null}
         viewBox="0 0 16 16"
         width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.examples.storyshot
index 20996df68747c..c1cb45123f04b 100644
--- a/x-pack/legacy/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.examples.storyshot
@@ -47,10 +47,11 @@ exports[`Storyshots components/FontPicker default 1`] = `
             className="euiFormControlLayoutCustomIcon"
           >
             <svg
-              aria-hidden="true"
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
@@ -129,10 +130,11 @@ exports[`Storyshots components/FontPicker with value 1`] = `
             className="euiFormControlLayoutCustomIcon"
           >
             <svg
-              aria-hidden="true"
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/item_grid/__examples__/__snapshots__/item_grid.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/item_grid/__examples__/__snapshots__/item_grid.examples.storyshot
index 79b547102b089..5ee984885bbc0 100644
--- a/x-pack/legacy/plugins/canvas/public/components/item_grid/__examples__/__snapshots__/item_grid.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/item_grid/__examples__/__snapshots__/item_grid.examples.storyshot
@@ -71,9 +71,11 @@ exports[`Storyshots components/ItemGrid complex grid 1`] = `
       }
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--medium euiIcon-isLoading"
         focusable="false"
         height={16}
+        role="img"
         style={
           Object {
             "fill": "#333",
@@ -100,9 +102,11 @@ exports[`Storyshots components/ItemGrid complex grid 1`] = `
       }
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--medium euiIcon-isLoading"
         focusable="false"
         height={16}
+        role="img"
         style={
           Object {
             "fill": "#FFF",
@@ -129,9 +133,11 @@ exports[`Storyshots components/ItemGrid complex grid 1`] = `
       }
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--medium euiIcon-isLoading"
         focusable="false"
         height={16}
+        role="img"
         style={
           Object {
             "fill": "#FFF",
@@ -151,27 +157,33 @@ exports[`Storyshots components/ItemGrid icon grid 1`] = `
   className="item-grid-row"
 >
   <svg
+    aria-hidden={true}
     className="euiIcon euiIcon--medium euiIcon-isLoading"
     focusable="false"
     height={16}
+    role="img"
     style={null}
     viewBox="0 0 16 16"
     width={16}
     xmlns="http://www.w3.org/2000/svg"
   />
   <svg
+    aria-hidden={true}
     className="euiIcon euiIcon--medium euiIcon-isLoading"
     focusable="false"
     height={16}
+    role="img"
     style={null}
     viewBox="0 0 16 16"
     width={16}
     xmlns="http://www.w3.org/2000/svg"
   />
   <svg
+    aria-hidden={true}
     className="euiIcon euiIcon--medium euiIcon-isLoading"
     focusable="false"
     height={16}
+    role="img"
     style={null}
     viewBox="0 0 16 16"
     width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/__snapshots__/keyboard_shortcuts_doc.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/__snapshots__/keyboard_shortcuts_doc.examples.storyshot
index e02d64e3e0647..9397a67402e51 100644
--- a/x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/__snapshots__/keyboard_shortcuts_doc.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/__snapshots__/keyboard_shortcuts_doc.examples.storyshot
@@ -55,10 +55,11 @@ exports[`Storyshots components/KeyboardShortcutsDoc default 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.examples.storyshot
index 5a5472e422963..09fc81c382d11 100644
--- a/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.examples.storyshot
@@ -43,10 +43,11 @@ exports[`Storyshots components/Sidebar/SidebarHeader default 1`] = `
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -85,10 +86,11 @@ exports[`Storyshots components/Sidebar/SidebarHeader default 1`] = `
                   type="button"
                 >
                   <svg
-                    aria-hidden="true"
+                    aria-hidden={true}
                     className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -148,10 +150,11 @@ exports[`Storyshots components/Sidebar/SidebarHeader without layer controls 1`]
               type="button"
             >
               <svg
-                aria-hidden="true"
+                aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                 focusable="false"
                 height={16}
+                role="img"
                 style={null}
                 viewBox="0 0 16 16"
                 width={16}
@@ -190,10 +193,11 @@ exports[`Storyshots components/Sidebar/SidebarHeader without layer controls 1`]
                   type="button"
                 >
                   <svg
-                    aria-hidden="true"
+                    aria-hidden={true}
                     className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot
index ec6d0cbe4d1ec..562feb8111e41 100644
--- a/x-pack/legacy/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot
@@ -55,9 +55,11 @@ exports[`Storyshots components/Tags/Tag as health 1`] = `
       className="euiFlexItem euiFlexItem--flexGrowZero"
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--medium euiIcon-isLoading"
         focusable="false"
         height={16}
+        role="img"
         style={
           Object {
             "fill": "#666666",
@@ -88,9 +90,11 @@ exports[`Storyshots components/Tags/Tag as health with color 1`] = `
       className="euiFlexItem euiFlexItem--flexGrowZero"
     >
       <svg
+        aria-hidden={true}
         className="euiIcon euiIcon--medium euiIcon-isLoading"
         focusable="false"
         height={16}
+        role="img"
         style={
           Object {
             "fill": "#9b3067",
diff --git a/x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot
index 1e41a56b82f9e..9dcf55642c66f 100644
--- a/x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot
@@ -76,9 +76,11 @@ Array [
         className="euiFlexItem euiFlexItem--flexGrowZero"
       >
         <svg
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading"
           focusable="false"
           height={16}
+          role="img"
           style={
             Object {
               "fill": "#cc3b54",
@@ -106,9 +108,11 @@ Array [
         className="euiFlexItem euiFlexItem--flexGrowZero"
       >
         <svg
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading"
           focusable="false"
           height={16}
+          role="img"
           style={
             Object {
               "fill": "#9b3067",
@@ -136,9 +140,11 @@ Array [
         className="euiFlexItem euiFlexItem--flexGrowZero"
       >
         <svg
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading"
           focusable="false"
           height={16}
+          role="img"
           style={
             Object {
               "fill": "#d41e93",
diff --git a/x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.tsx b/x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.tsx
index 6d0d7be1c63be..da3475eceb18d 100644
--- a/x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.tsx
+++ b/x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.tsx
@@ -97,7 +97,7 @@ export const Toolbar = (props: Props) => {
 
   const trays = {
     pageManager: <PageManager previousPage={previousPage} />,
-    expression: !elementIsSelected ? null : <Expression done={done} />,
+    expression: !elementIsSelected ? null : <Expression key={selectedElement.id} done={done} />,
   };
 
   return (
diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/__examples__/__snapshots__/pdf_panel.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/__examples__/__snapshots__/pdf_panel.examples.storyshot
index a94f593661cf3..1888d01a3ac93 100644
--- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/__examples__/__snapshots__/pdf_panel.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/__examples__/__snapshots__/pdf_panel.examples.storyshot
@@ -71,10 +71,11 @@ exports[`Storyshots components/Export/PDFPanel default 1`] = `
           className="euiButton__content"
         >
           <svg
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
             focusable="false"
             height={16}
+            role="img"
             style={null}
             viewBox="0 0 16 16"
             width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/__examples__/__snapshots__/workpad_export.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/__examples__/__snapshots__/workpad_export.examples.storyshot
index c9f5cf67f734a..9c7fca6d78190 100644
--- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/__examples__/__snapshots__/workpad_export.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/__examples__/__snapshots__/workpad_export.examples.storyshot
@@ -28,10 +28,11 @@ exports[`Storyshots components/Export/WorkpadExport disabled 1`] = `
           type="button"
         >
           <svg
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
             focusable="false"
             height={16}
+            role="img"
             style={null}
             viewBox="0 0 16 16"
             width={16}
@@ -72,10 +73,11 @@ exports[`Storyshots components/Export/WorkpadExport enabled 1`] = `
           type="button"
         >
           <svg
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
             focusable="false"
             height={16}
+            role="img"
             style={null}
             viewBox="0 0 16 16"
             width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/extended_template.examples.storyshot b/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/extended_template.examples.storyshot
index 9e3bebbd71273..2915d3bfef57b 100644
--- a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/extended_template.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/extended_template.examples.storyshot
@@ -139,10 +139,11 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
                     className="euiFormControlLayoutCustomIcon"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -208,10 +209,11 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
                     className="euiFormControlLayoutCustomIcon"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -367,10 +369,11 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
                         className="euiFormControlLayoutCustomIcon"
                       >
                         <svg
-                          aria-hidden="true"
+                          aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                           focusable="false"
                           height={16}
+                          role="img"
                           style={null}
                           viewBox="0 0 16 16"
                           width={16}
@@ -626,10 +629,11 @@ exports[`Storyshots arguments/ContainerStyle/components appearance form 1`] = `
                   className="euiFormControlLayoutCustomIcon"
                 >
                   <svg
-                    aria-hidden="true"
+                    aria-hidden={true}
                     className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -695,10 +699,11 @@ exports[`Storyshots arguments/ContainerStyle/components appearance form 1`] = `
                   className="euiFormControlLayoutCustomIcon"
                 >
                   <svg
-                    aria-hidden="true"
+                    aria-hidden={true}
                     className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -853,10 +858,11 @@ exports[`Storyshots arguments/ContainerStyle/components border form 1`] = `
                       className="euiFormControlLayoutCustomIcon"
                     >
                       <svg
-                        aria-hidden="true"
+                        aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                         focusable="false"
                         height={16}
+                        role="img"
                         style={null}
                         viewBox="0 0 16 16"
                         width={16}
@@ -1123,10 +1129,11 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
                     className="euiFormControlLayoutCustomIcon"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -1192,10 +1199,11 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
                     className="euiFormControlLayoutCustomIcon"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -1351,10 +1359,11 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
                         className="euiFormControlLayoutCustomIcon"
                       >
                         <svg
-                          aria-hidden="true"
+                          aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                           focusable="false"
                           height={16}
+                          role="img"
                           style={null}
                           viewBox="0 0 16 16"
                           width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/extended_template.examples.storyshot b/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/extended_template.examples.storyshot
index 3b41da4cd3d54..8fa2d406831a4 100644
--- a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/extended_template.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/extended_template.examples.storyshot
@@ -66,10 +66,11 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
                 className="euiFormControlLayoutCustomIcon"
               >
                 <svg
-                  aria-hidden="true"
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
@@ -163,10 +164,11 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
                     className="euiFormControlLayoutCustomIcon"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -252,10 +254,11 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
                     className="euiFormControlLayoutCustomIcon"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -341,10 +344,11 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
                     className="euiFormControlLayoutCustomIcon"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot b/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot
index c843a62702b16..72477cec2603b 100644
--- a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot
@@ -173,12 +173,14 @@ exports[`Storyshots arguments/SeriesStyle/components simple: no series 1`] = `
         onMouseOver={[Function]}
       >
         <svg
+          aria-hidden={true}
           aria-label="Info"
           className="euiIcon euiIcon--medium euiIcon--warning euiIcon-isLoading"
           focusable="true"
           height={16}
           onBlur={[Function]}
           onFocus={[Function]}
+          role="img"
           style={null}
           tabIndex={0}
           viewBox="0 0 16 16"
diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/index.ts b/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/index.ts
index 99730f7b8fe20..c3211c27eef75 100644
--- a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/index.ts
+++ b/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/index.ts
@@ -37,9 +37,9 @@ const EnhancedExtendedTemplate = compose<ExtendedTemplateProps, Props>(
         this.props.setLabel(formatLabel(label, this.props));
       }
     },
-    componentWillReceiveProps(newProps) {
-      const newLabel = get(newProps.argValue, 'chain.0.arguments.label.0', '');
-      if (newLabel && this.props.label !== formatLabel(newLabel, this.props)) {
+    componentDidUpdate(prevProps) {
+      const newLabel = get(this.props.argValue, 'chain.0.arguments.label.0', '');
+      if (newLabel && prevProps.label !== formatLabel(newLabel, this.props)) {
         this.props.setLabel(formatLabel(newLabel, this.props));
       }
     },
diff --git a/x-pack/legacy/plugins/canvas/public/lib/loading_indicator.ts b/x-pack/legacy/plugins/canvas/public/lib/loading_indicator.ts
index a95f4278b6a69..4b9e548d5c718 100644
--- a/x-pack/legacy/plugins/canvas/public/lib/loading_indicator.ts
+++ b/x-pack/legacy/plugins/canvas/public/lib/loading_indicator.ts
@@ -16,7 +16,7 @@ export interface LoadingIndicatorInterface {
 
 const loadingCount$ = new Rx.BehaviorSubject(0);
 
-export const initLoadingIndicator = (addLoadingCount: CoreStart['http']['addLoadingCount']) =>
+export const initLoadingIndicator = (addLoadingCount: CoreStart['http']['addLoadingCountSource']) =>
   addLoadingCount(loadingCount$);
 
 export const loadingIndicator = {
diff --git a/x-pack/legacy/plugins/canvas/public/plugin.tsx b/x-pack/legacy/plugins/canvas/public/plugin.tsx
index 5190e8521101b..9828845d9ffa9 100644
--- a/x-pack/legacy/plugins/canvas/public/plugin.tsx
+++ b/x-pack/legacy/plugins/canvas/public/plugin.tsx
@@ -77,7 +77,7 @@ export class CanvasPlugin
     initLocationProvider(core, plugins);
     initStore(core, plugins);
     initClipboard(plugins.__LEGACY.storage);
-    initLoadingIndicator(core.http.addLoadingCount);
+    initLoadingIndicator(core.http.addLoadingCountSource);
 
     const CanvasRootController = CanvasRootControllerFactory(core, plugins);
     plugins.__LEGACY.setRootController('canvas', CanvasRootController);
diff --git a/x-pack/legacy/plugins/canvas/server/plugin.ts b/x-pack/legacy/plugins/canvas/server/plugin.ts
index b338971103381..07f4b7d9ac6db 100644
--- a/x-pack/legacy/plugins/canvas/server/plugin.ts
+++ b/x-pack/legacy/plugins/canvas/server/plugin.ts
@@ -7,7 +7,6 @@
 import { CoreSetup, PluginsSetup } from './shim';
 import { routes } from './routes';
 import { functions } from '../canvas_plugin_src/functions/server';
-import { registerCanvasUsageCollector } from './usage';
 import { loadSampleData } from './sample_data';
 
 export class Plugin {
@@ -61,10 +60,9 @@ export class Plugin {
       },
     });
 
-    registerCanvasUsageCollector(plugins.usageCollection, core);
     loadSampleData(
-      plugins.sampleData.addSavedObjectsToSampleDataset,
-      plugins.sampleData.addAppLinksToSampleDataset
+      plugins.home.sampleData.addSavedObjectsToSampleDataset,
+      plugins.home.sampleData.addAppLinksToSampleDataset
     );
   }
 }
diff --git a/x-pack/legacy/plugins/canvas/server/sample_data/ecommerce_saved_objects.json b/x-pack/legacy/plugins/canvas/server/sample_data/ecommerce_saved_objects.json
index 39970c6d66b7a..113fba5555376 100644
--- a/x-pack/legacy/plugins/canvas/server/sample_data/ecommerce_saved_objects.json
+++ b/x-pack/legacy/plugins/canvas/server/sample_data/ecommerce_saved_objects.json
@@ -194,7 +194,7 @@
                 "height": 56,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"FEMALE\"}} \n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#eb6c66\" weight=\"normal\" underline=false italic=false}"
+              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"femaleCount\" exp={getCell \"customer_gender\" | if {compare to=\"FEMALE\"} then=1 else=0} | math \"round(100 * sum(femaleCount) / count(femaleCount))\" | markdown {context} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#eb6c66\" weight=\"normal\" underline=false italic=false}"
             },
             {
               "id": "element-9e0b6230-2bc9-4995-8207-043e3063faeb",
@@ -205,7 +205,7 @@
                 "height": 56,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"MALE\"}} \n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#f8bd4a\" weight=\"normal\" underline=false italic=false}"
+              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"MALE\"} then=1 else=0} | math \"round(100 * sum(maleCount) / count(maleCount))\" | markdown {context} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#f8bd4a\" weight=\"normal\" underline=false italic=false}"
             },
             {
               "id": "element-2185edff-ac50-4162-b583-3bfd6469e925",
@@ -959,23 +959,23 @@
               "id": "element-b8f13a87-b781-42d5-a663-5dbd4f645d6d",
               "position": {
                 "left": 837,
-                "top": 472,
+                "top": 468,
                 "width": 91,
                 "height": 63,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"FEMALE\"}} \n| markdown {getCell \"percentage\"} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}"
+              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"femaleCount\" exp={getCell \"customer_gender\" | if {compare to=\"FEMALE\"} then=1 else=0} | math \"round(100 * sum(femaleCount) / count(femaleCount))\" | markdown {context} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}"
             },
             {
               "id": "element-86b06b67-893e-4555-ad38-7fba9ea3153b",
               "position": {
                 "left": 837,
-                "top": 219,
+                "top": 215,
                 "width": 90,
                 "height": 72,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"MALE\"}} \n| markdown {getCell \"percentage\"} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}"
+              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"MALE\"} then=1 else=0} | math \"round(100 * sum(maleCount) / count(maleCount))\" | markdown {context} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}"
             },
             {
               "id": "element-507337d9-6e0e-4752-8770-6ebe88e9b3da",
diff --git a/x-pack/legacy/plugins/canvas/server/sample_data/load_sample_data.ts b/x-pack/legacy/plugins/canvas/server/sample_data/load_sample_data.ts
index 08a71badb33ed..ed505c09cc7a4 100644
--- a/x-pack/legacy/plugins/canvas/server/sample_data/load_sample_data.ts
+++ b/x-pack/legacy/plugins/canvas/server/sample_data/load_sample_data.ts
@@ -7,9 +7,12 @@
 import { CANVAS as label } from '../../i18n';
 // @ts-ignore Untyped local
 import { ecommerceSavedObjects, flightsSavedObjects, webLogsSavedObjects } from './index';
+import { SampleDataRegistrySetup } from '../../../../../../src/plugins/home/server';
 
-// @ts-ignore: Untyped in Kibana
-export function loadSampleData(addSavedObjectsToSampleDataset, addAppLinksToSampleDataset) {
+export function loadSampleData(
+  addSavedObjectsToSampleDataset: SampleDataRegistrySetup['addSavedObjectsToSampleDataset'],
+  addAppLinksToSampleDataset: SampleDataRegistrySetup['addAppLinksToSampleDataset']
+) {
   const now = new Date();
   const nowTimestamp = now.toISOString();
 
@@ -27,23 +30,29 @@ export function loadSampleData(addSavedObjectsToSampleDataset, addAppLinksToSamp
   }
 
   addSavedObjectsToSampleDataset('ecommerce', updateCanvasWorkpadTimestamps(ecommerceSavedObjects));
-  addAppLinksToSampleDataset('ecommerce', {
-    path: '/app/canvas#/workpad/workpad-e08b9bdb-ec14-4339-94c4-063bddfd610e',
-    icon: 'canvasApp',
-    label,
-  });
+  addAppLinksToSampleDataset('ecommerce', [
+    {
+      path: '/app/canvas#/workpad/workpad-e08b9bdb-ec14-4339-94c4-063bddfd610e',
+      icon: 'canvasApp',
+      label,
+    },
+  ]);
 
   addSavedObjectsToSampleDataset('flights', updateCanvasWorkpadTimestamps(flightsSavedObjects));
-  addAppLinksToSampleDataset('flights', {
-    path: '/app/canvas#/workpad/workpad-a474e74b-aedc-47c3-894a-db77e62c41e0',
-    icon: 'canvasApp',
-    label,
-  });
+  addAppLinksToSampleDataset('flights', [
+    {
+      path: '/app/canvas#/workpad/workpad-a474e74b-aedc-47c3-894a-db77e62c41e0',
+      icon: 'canvasApp',
+      label,
+    },
+  ]);
 
   addSavedObjectsToSampleDataset('logs', updateCanvasWorkpadTimestamps(webLogsSavedObjects));
-  addAppLinksToSampleDataset('logs', {
-    path: '/app/canvas#/workpad/workpad-ad72a4e9-b422-480c-be6d-a64a0b79541d',
-    icon: 'canvasApp',
-    label,
-  });
+  addAppLinksToSampleDataset('logs', [
+    {
+      path: '/app/canvas#/workpad/workpad-ad72a4e9-b422-480c-be6d-a64a0b79541d',
+      icon: 'canvasApp',
+      label,
+    },
+  ]);
 }
diff --git a/x-pack/legacy/plugins/canvas/server/shim.ts b/x-pack/legacy/plugins/canvas/server/shim.ts
index 7641e51f14e56..1ca6e28bd347e 100644
--- a/x-pack/legacy/plugins/canvas/server/shim.ts
+++ b/x-pack/legacy/plugins/canvas/server/shim.ts
@@ -7,7 +7,7 @@
 import { ElasticsearchPlugin } from 'src/legacy/core_plugins/elasticsearch';
 import { Legacy } from 'kibana';
 
-import { CoreSetup as ExistingCoreSetup } from 'src/core/server';
+import { HomeServerPluginSetup } from 'src/plugins/home/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { PluginSetupContract } from '../../../../plugins/features/server';
 
@@ -23,6 +23,7 @@ export interface CoreSetup {
 
 export interface PluginsSetup {
   features: PluginSetupContract;
+  home: HomeServerPluginSetup;
   interpreter: {
     register: (specs: any) => any;
   };
@@ -39,9 +40,7 @@ export interface PluginsSetup {
 export async function createSetupShim(
   server: Legacy.Server
 ): Promise<{ coreSetup: CoreSetup; pluginsSetup: PluginsSetup }> {
-  // @ts-ignore: New Platform object not typed
-  const setup: ExistingCoreSetup = server.newPlatform.setup.core;
-
+  const setup = server.newPlatform.setup.core;
   return {
     coreSetup: {
       ...setup,
@@ -58,17 +57,12 @@ export async function createSetupShim(
     pluginsSetup: {
       // @ts-ignore: New Platform not typed
       features: server.newPlatform.setup.plugins.features,
+      home: server.newPlatform.setup.plugins.home,
       // @ts-ignore Interpreter plugin not typed on legacy server
       interpreter: server.plugins.interpreter,
       kibana: {
         injectedUiAppVars: await server.getInjectedUiAppVars('kibana'),
       },
-      sampleData: {
-        // @ts-ignore: Missing from Legacy Server Type
-        addSavedObjectsToSampleDataset: server.addSavedObjectsToSampleDataset,
-        // @ts-ignore: Missing from Legacy Server Type
-        addAppLinksToSampleDataset: server.addAppLinksToSampleDataset,
-      },
       usageCollection: server.newPlatform.setup.plugins.usageCollection,
     },
   };
diff --git a/x-pack/legacy/plugins/canvas/server/usage/collector.ts b/x-pack/legacy/plugins/canvas/server/usage/collector.ts
deleted file mode 100644
index ae009f9265722..0000000000000
--- a/x-pack/legacy/plugins/canvas/server/usage/collector.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 { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { CoreSetup } from '../shim';
-// @ts-ignore missing local declaration
-import { CANVAS_USAGE_TYPE } from '../../common/lib/constants';
-import { workpadCollector } from './workpad_collector';
-import { customElementCollector } from './custom_element_collector';
-import { TelemetryCollector } from '../../types';
-
-const collectors: TelemetryCollector[] = [workpadCollector, customElementCollector];
-
-/*
-  Register the canvas usage collector function
-
-  This will call all of the defined collectors and combine the individual results into a single object
-  to be returned to the caller.
-
-  A usage collector function returns an object derived from current data in the ES Cluster.
-*/
-export function registerCanvasUsageCollector(
-  usageCollection: UsageCollectionSetup,
-  core: CoreSetup
-) {
-  const kibanaIndex = core.getServerConfig().get<string>('kibana.index');
-  const canvasCollector = usageCollection.makeUsageCollector({
-    type: CANVAS_USAGE_TYPE,
-    isReady: () => true,
-    fetch: async (callCluster: CallCluster) => {
-      const collectorResults = await Promise.all(
-        collectors.map(collector => collector(kibanaIndex, callCluster))
-      );
-
-      return collectorResults.reduce(
-        (reduction, usage) => {
-          return { ...reduction, ...usage };
-        },
-
-        {}
-      );
-    },
-  });
-
-  usageCollection.registerCollector(canvasCollector);
-}
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap b/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap
index 782d5364de821..acd68622f1af0 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with default propertie
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\"><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 0 0-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 0 0-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 0 0 6.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 0 0-2.413-.815 3.978 3.978 0 0 0-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 0 0 2.4.822 3.977 3.977 0 0 0 3.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 0 0-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><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></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><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></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 0 1 1.142-1.535l2.872.313L6.099.05a8.166 8.166 0 0 1 3.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 0 1 1.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 0 1-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 0 1-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 0 1-1.899-3.293zm4.663 1.986a1 1 0 0 1 1.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 0 1 1.023-.59l2.358.256a7.23 7.23 0 0 0 1.194-2.068l-1.401-1.913a1 1 0 0 1 0-1.182l1.4-1.912a7.165 7.165 0 0 0-1.192-2.069l-2.359.257a1 1 0 0 1-1.023-.591L9.193.924a7.165 7.165 0 0 0-2.387.001L5.85 3.094a1 1 0 0 1-1.023.59l-2.358-.256a7.23 7.23 0 0 0-1.194 2.068l1.401 1.913a1 1 0 0 1 0 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-1a2 2 0 1 0 0-4 2 2 0 0 0 0 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 00-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 00-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 006.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 00-2.413-.815 3.978 3.978 0 00-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 002.4.822 3.977 3.977 0 003.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 00-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z\\"></path></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z\\"></path></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 011.142-1.535l2.872.313L6.099.05a8.166 8.166 0 013.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 011.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 01-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 01-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 01-1.899-3.293zm4.663 1.986a1 1 0 011.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 011.023-.59l2.358.256a7.23 7.23 0 001.194-2.068l-1.401-1.913a1 1 0 010-1.182l1.4-1.912a7.165 7.165 0 00-1.192-2.069l-2.359.257a1 1 0 01-1.023-.591L9.193.924a7.165 7.165 0 00-2.387.001L5.85 3.094a1 1 0 01-1.023.59l-2.358-.256a7.23 7.23 0 00-1.194 2.068l1.401 1.913a1 1 0 010 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 110-6 3 3 0 010 6zm0-1a2 2 0 100-4 2 2 0 000 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with height specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-height=\\"350\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -21,7 +21,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with height specified
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\"><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 0 0-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 0 0-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 0 0 6.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 0 0-2.413-.815 3.978 3.978 0 0 0-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 0 0 2.4.822 3.977 3.977 0 0 0 3.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 0 0-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><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></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><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></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 0 1 1.142-1.535l2.872.313L6.099.05a8.166 8.166 0 0 1 3.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 0 1 1.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 0 1-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 0 1-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 0 1-1.899-3.293zm4.663 1.986a1 1 0 0 1 1.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 0 1 1.023-.59l2.358.256a7.23 7.23 0 0 0 1.194-2.068l-1.401-1.913a1 1 0 0 1 0-1.182l1.4-1.912a7.165 7.165 0 0 0-1.192-2.069l-2.359.257a1 1 0 0 1-1.023-.591L9.193.924a7.165 7.165 0 0 0-2.387.001L5.85 3.094a1 1 0 0 1-1.023.59l-2.358-.256a7.23 7.23 0 0 0-1.194 2.068l1.401 1.913a1 1 0 0 1 0 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-1a2 2 0 1 0 0-4 2 2 0 0 0 0 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 00-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 00-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 006.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 00-2.413-.815 3.978 3.978 0 00-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 002.4.822 3.977 3.977 0 003.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 00-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z\\"></path></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z\\"></path></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 011.142-1.535l2.872.313L6.099.05a8.166 8.166 0 013.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 011.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 01-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 01-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 01-1.899-3.293zm4.663 1.986a1 1 0 011.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 011.023-.59l2.358.256a7.23 7.23 0 001.194-2.068l-1.401-1.913a1 1 0 010-1.182l1.4-1.912a7.165 7.165 0 00-1.192-2.069l-2.359.257a1 1 0 01-1.023-.591L9.193.924a7.165 7.165 0 00-2.387.001L5.85 3.094a1 1 0 01-1.023.59l-2.358-.256a7.23 7.23 0 00-1.194 2.068l1.401 1.913a1 1 0 010 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 110-6 3 3 0 010 6zm0-1a2 2 0 100-4 2 2 0 000 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with page specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-page=\\"0\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -33,7 +33,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with page specified 2`
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\"><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 0 0-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 0 0-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 0 0 6.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 0 0-2.413-.815 3.978 3.978 0 0 0-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 0 0 2.4.822 3.977 3.977 0 0 0 3.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 0 0-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><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></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><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></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 0 1 1.142-1.535l2.872.313L6.099.05a8.166 8.166 0 0 1 3.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 0 1 1.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 0 1-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 0 1-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 0 1-1.899-3.293zm4.663 1.986a1 1 0 0 1 1.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 0 1 1.023-.59l2.358.256a7.23 7.23 0 0 0 1.194-2.068l-1.401-1.913a1 1 0 0 1 0-1.182l1.4-1.912a7.165 7.165 0 0 0-1.192-2.069l-2.359.257a1 1 0 0 1-1.023-.591L9.193.924a7.165 7.165 0 0 0-2.387.001L5.85 3.094a1 1 0 0 1-1.023.59l-2.358-.256a7.23 7.23 0 0 0-1.194 2.068l1.401 1.913a1 1 0 0 1 0 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-1a2 2 0 1 0 0-4 2 2 0 0 0 0 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 00-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 00-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 006.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 00-2.413-.815 3.978 3.978 0 00-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 002.4.822 3.977 3.977 0 003.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 00-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z\\"></path></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z\\"></path></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 011.142-1.535l2.872.313L6.099.05a8.166 8.166 0 013.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 011.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 01-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 01-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 01-1.899-3.293zm4.663 1.986a1 1 0 011.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 011.023-.59l2.358.256a7.23 7.23 0 001.194-2.068l-1.401-1.913a1 1 0 010-1.182l1.4-1.912a7.165 7.165 0 00-1.192-2.069l-2.359.257a1 1 0 01-1.023-.591L9.193.924a7.165 7.165 0 00-2.387.001L5.85 3.094a1 1 0 01-1.023.59l-2.358-.256a7.23 7.23 0 00-1.194 2.068l1.401 1.913a1 1 0 010 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 110-6 3 3 0 010 6zm0-1a2 2 0 100-4 2 2 0 000 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with width and height specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-width=\\"350\\" kbn-canvas-height=\\"350\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -45,7 +45,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with width and height
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\"><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 0 0-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 0 0-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 0 0 6.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 0 0-2.413-.815 3.978 3.978 0 0 0-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 0 0 2.4.822 3.977 3.977 0 0 0 3.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 0 0-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><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></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><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></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 0 1 1.142-1.535l2.872.313L6.099.05a8.166 8.166 0 0 1 3.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 0 1 1.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 0 1-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 0 1-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 0 1-1.899-3.293zm4.663 1.986a1 1 0 0 1 1.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 0 1 1.023-.59l2.358.256a7.23 7.23 0 0 0 1.194-2.068l-1.401-1.913a1 1 0 0 1 0-1.182l1.4-1.912a7.165 7.165 0 0 0-1.192-2.069l-2.359.257a1 1 0 0 1-1.023-.591L9.193.924a7.165 7.165 0 0 0-2.387.001L5.85 3.094a1 1 0 0 1-1.023.59l-2.358-.256a7.23 7.23 0 0 0-1.194 2.068l1.401 1.913a1 1 0 0 1 0 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-1a2 2 0 1 0 0-4 2 2 0 0 0 0 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 00-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 00-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 006.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 00-2.413-.815 3.978 3.978 0 00-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 002.4.822 3.977 3.977 0 003.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 00-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z\\"></path></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z\\"></path></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 011.142-1.535l2.872.313L6.099.05a8.166 8.166 0 013.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 011.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 01-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 01-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 01-1.899-3.293zm4.663 1.986a1 1 0 011.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 011.023-.59l2.358.256a7.23 7.23 0 001.194-2.068l-1.401-1.913a1 1 0 010-1.182l1.4-1.912a7.165 7.165 0 00-1.192-2.069l-2.359.257a1 1 0 01-1.023-.591L9.193.924a7.165 7.165 0 00-2.387.001L5.85 3.094a1 1 0 01-1.023.59l-2.358-.256a7.23 7.23 0 00-1.194 2.068l1.401 1.913a1 1 0 010 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 110-6 3 3 0 010 6zm0-1a2 2 0 100-4 2 2 0 000 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with width specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-width=\\"400\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -57,5 +57,5 @@ exports[`Canvas Shareable Workpad API Placed successfully with width specified 2
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\"><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 0 0-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 0 0-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 0 0 6.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 0 0-2.413-.815 3.978 3.978 0 0 0-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 0 0 2.4.822 3.977 3.977 0 0 0 3.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 0 0-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><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></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><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></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 0 1 1.142-1.535l2.872.313L6.099.05a8.166 8.166 0 0 1 3.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 0 1 1.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 0 1-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 0 1-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 0 1-1.899-3.293zm4.663 1.986a1 1 0 0 1 1.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 0 1 1.023-.59l2.358.256a7.23 7.23 0 0 0 1.194-2.068l-1.401-1.913a1 1 0 0 1 0-1.182l1.4-1.912a7.165 7.165 0 0 0-1.192-2.069l-2.359.257a1 1 0 0 1-1.023-.591L9.193.924a7.165 7.165 0 0 0-2.387.001L5.85 3.094a1 1 0 0 1-1.023.59l-2.358-.256a7.23 7.23 0 0 0-1.194 2.068l1.401 1.913a1 1 0 0 1 0 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6zm0-1a2 2 0 1 0 0-4 2 2 0 0 0 0 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"32\\" height=\\"32\\" viewBox=\\"0 0 32 32\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoaded\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><g fill=\\"none\\"><path fill=\\"#FDD009\\" d=\\"M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 00-6.84 3.61l-1.234 6.409 1.436 3.068z\\"></path><path fill=\\"#23BAB1\\" d=\\"M4.322 20.947a8.461 8.461 0 00-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 006.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z\\"></path><path fill=\\"#EE5097\\" d=\\"M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 00-2.413-.815 3.978 3.978 0 00-3.971 3.976c0 .484.08.948.24 1.383\\"></path><path fill=\\"#17A7E0\\" d=\\"M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z\\"></path><path fill=\\"#92C73D\\" d=\\"M20.642 27.284a3.945 3.945 0 002.4.822 3.977 3.977 0 003.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z\\"></path><path fill=\\"#0678A0\\" d=\\"M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 00-3.583-5.19l-7.25 6.36 1.472 2.816z\\"></path></g></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z\\"></path></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z\\"></path></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoaded euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path d=\\"M.164 10.329L1.87 8 .163 5.67c.18-.601.43-1.19.758-1.757a8.197 8.197 0 011.142-1.535l2.872.313L6.099.05a8.166 8.166 0 013.8-.003l1.166 2.644 2.872-.313a8.166 8.166 0 011.899 3.293L14.13 8l1.706 2.33c-.18.601-.43 1.19-.758 1.757a8.197 8.197 0 01-1.142 1.535l-2.872-.313-1.164 2.641a8.166 8.166 0 01-3.8.003l-1.166-2.644-2.872.313a8.166 8.166 0 01-1.899-3.293zm4.663 1.986a1 1 0 011.023.591l.957 2.17c.79.134 1.597.132 2.387-.001l.956-2.169a1 1 0 011.023-.59l2.358.256a7.23 7.23 0 001.194-2.068l-1.401-1.913a1 1 0 010-1.182l1.4-1.912a7.165 7.165 0 00-1.192-2.069l-2.359.257a1 1 0 01-1.023-.591L9.193.924a7.165 7.165 0 00-2.387.001L5.85 3.094a1 1 0 01-1.023.59l-2.358-.256a7.23 7.23 0 00-1.194 2.068l1.401 1.913a1 1 0 010 1.182l-1.4 1.912c.28.751.681 1.45 1.192 2.069l2.359-.257zM8 11a3 3 0 110-6 3 3 0 010 6zm0-1a2 2 0 100-4 2 2 0 000 4z\\"></path></svg></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot
index c3352b52c591d..6a33dba76c126 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot
@@ -1325,9 +1325,11 @@ exports[`Storyshots shareables/Canvas component 1`] = `
                   title="Powered by Elastic.co"
                 >
                   <svg
+                    aria-hidden={true}
                     className="euiIcon euiIcon--large euiIcon-isLoading"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -1386,10 +1388,11 @@ exports[`Storyshots shareables/Canvas component 1`] = `
                     type="button"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -1439,10 +1442,11 @@ exports[`Storyshots shareables/Canvas component 1`] = `
                     type="button"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -1476,10 +1480,11 @@ exports[`Storyshots shareables/Canvas component 1`] = `
                         type="button"
                       >
                         <svg
-                          aria-hidden="true"
+                          aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
                           height={16}
+                          role="img"
                           style={null}
                           viewBox="0 0 16 16"
                           width={16}
@@ -2824,9 +2829,11 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
                   title="Powered by Elastic.co"
                 >
                   <svg
+                    aria-hidden={true}
                     className="euiIcon euiIcon--large euiIcon-isLoading"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -2885,10 +2892,11 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
                     type="button"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -2938,10 +2946,11 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
                     type="button"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -2975,10 +2984,11 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
                         type="button"
                       >
                         <svg
-                          aria-hidden="true"
+                          aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
                           height={16}
+                          role="img"
                           style={null}
                           viewBox="0 0 16 16"
                           width={16}
@@ -3139,9 +3149,11 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
                   title="Powered by Elastic.co"
                 >
                   <svg
+                    aria-hidden={true}
                     className="euiIcon euiIcon--large euiIcon-isLoading"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -3200,10 +3212,11 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
                     type="button"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -3252,10 +3265,11 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
                     type="button"
                   >
                     <svg
-                      aria-hidden="true"
+                      aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                       focusable="false"
                       height={16}
+                      role="img"
                       style={null}
                       viewBox="0 0 16 16"
                       width={16}
@@ -3289,10 +3303,11 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
                         type="button"
                       >
                         <svg
-                          aria-hidden="true"
+                          aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
                           height={16}
+                          role="img"
                           style={null}
                           viewBox="0 0 16 16"
                           width={16}
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap b/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap
index 746e1ca4f057b..052ecf95dd9ec 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap
@@ -7,5 +7,5 @@ exports[`<App /> App renders properly 1`] = `
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px;\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute;\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoading\\" focusable=\\"false\\"></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" aria-hidden=\\"true\\"></svg></button></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--large euiIcon-isLoading\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"></svg></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"></svg></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"></svg></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><svg width=\\"16\\" height=\\"16\\" viewBox=\\"0 0 16 16\\" xmlns=\\"http://www.w3.org/2000/svg\\" class=\\"euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon\\" focusable=\\"false\\" role=\\"img\\" aria-hidden=\\"true\\"></svg></button></div></div></div></div></div></div></div></div></div></div>"
 `;
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot
index 6570016336d9e..7b3ac299f80ad 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot
@@ -1278,9 +1278,11 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
                 title="Powered by Elastic.co"
               >
                 <svg
+                  aria-hidden={true}
                   className="euiIcon euiIcon--large euiIcon-isLoading"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
@@ -1339,10 +1341,11 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
                   type="button"
                 >
                   <svg
-                    aria-hidden="true"
+                    aria-hidden={true}
                     className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -1392,10 +1395,11 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
                   type="button"
                 >
                   <svg
-                    aria-hidden="true"
+                    aria-hidden={true}
                     className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -1429,10 +1433,11 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
                       type="button"
                     >
                       <svg
-                        aria-hidden="true"
+                        aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                         focusable="false"
                         height={16}
+                        role="img"
                         style={null}
                         viewBox="0 0 16 16"
                         width={16}
@@ -1547,9 +1552,11 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
                 title="Powered by Elastic.co"
               >
                 <svg
+                  aria-hidden={true}
                   className="euiIcon euiIcon--large euiIcon-isLoading"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
@@ -1608,10 +1615,11 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
                   type="button"
                 >
                   <svg
-                    aria-hidden="true"
+                    aria-hidden={true}
                     className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -1660,10 +1668,11 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
                   type="button"
                 >
                   <svg
-                    aria-hidden="true"
+                    aria-hidden={true}
                     className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                     focusable="false"
                     height={16}
+                    role="img"
                     style={null}
                     viewBox="0 0 16 16"
                     width={16}
@@ -1697,10 +1706,11 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
                       type="button"
                     >
                       <svg
-                        aria-hidden="true"
+                        aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                         focusable="false"
                         height={16}
+                        role="img"
                         style={null}
                         viewBox="0 0 16 16"
                         width={16}
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/page_controls.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/page_controls.examples.storyshot
index bb807062a6baa..cf68c7a6075d6 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/page_controls.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/page_controls.examples.storyshot
@@ -29,10 +29,11 @@ exports[`Storyshots shareables/Footer/PageControls component 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -82,10 +83,11 @@ exports[`Storyshots shareables/Footer/PageControls component 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -131,10 +133,11 @@ exports[`Storyshots shareables/Footer/PageControls contextual: austin 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -184,10 +187,11 @@ exports[`Storyshots shareables/Footer/PageControls contextual: austin 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -233,10 +237,11 @@ exports[`Storyshots shareables/Footer/PageControls contextual: hello 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -286,10 +291,11 @@ exports[`Storyshots shareables/Footer/PageControls contextual: hello 1`] = `
         type="button"
       >
         <svg
-          aria-hidden="true"
+          aria-hidden={true}
           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot
index 8d0ced56d1474..e8fb42c5921d7 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot
@@ -32,9 +32,11 @@ exports[`Storyshots shareables/Footer/Title component 1`] = `
         title="Powered by Elastic.co"
       >
         <svg
+          aria-hidden={true}
           className="euiIcon euiIcon--large euiIcon-isLoading"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -101,9 +103,11 @@ exports[`Storyshots shareables/Footer/Title contextual: austin 1`] = `
         title="Powered by Elastic.co"
       >
         <svg
+          aria-hidden={true}
           className="euiIcon euiIcon--large euiIcon-isLoading"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
@@ -170,9 +174,11 @@ exports[`Storyshots shareables/Footer/Title contextual: hello 1`] = `
         title="Powered by Elastic.co"
       >
         <svg
+          aria-hidden={true}
           className="euiIcon euiIcon--large euiIcon-isLoading"
           focusable="false"
           height={16}
+          role="img"
           style={null}
           viewBox="0 0 16 16"
           width={16}
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot
index 57641882f2d84..a90c565cd91a7 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot
@@ -45,18 +45,22 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: off,
             className="euiSwitch__track"
           >
             <svg
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             />
             <svg
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon euiSwitch__icon--checked"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
@@ -216,18 +220,22 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: on, 5
             className="euiSwitch__track"
           >
             <svg
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             />
             <svg
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon euiSwitch__icon--checked"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
@@ -387,18 +395,22 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings contextual 1`] =
             className="euiSwitch__track"
           >
             <svg
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             />
             <svg
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon euiSwitch__icon--checked"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.examples.storyshot
index 945e2c9b4ed61..d35db0f6e84e4 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.examples.storyshot
@@ -39,10 +39,11 @@ exports[`Storyshots shareables/Footer/Settings component 1`] = `
             type="button"
           >
             <svg
-              aria-hidden="true"
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
@@ -95,10 +96,11 @@ exports[`Storyshots shareables/Footer/Settings contextual 1`] = `
             type="button"
           >
             <svg
-              aria-hidden="true"
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/toolbar_settings.examples.storyshot b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/toolbar_settings.examples.storyshot
index 845a48f363790..ece411900c2ba 100644
--- a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/toolbar_settings.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/toolbar_settings.examples.storyshot
@@ -56,18 +56,22 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings component: off 1`
                 className="euiSwitch__track"
               >
                 <svg
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 />
                 <svg
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon euiSwitch__icon--checked"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
@@ -152,18 +156,22 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings component: on 1`]
                 className="euiSwitch__track"
               >
                 <svg
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 />
                 <svg
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon euiSwitch__icon--checked"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
@@ -248,18 +256,22 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings contextual 1`] =
                 className="euiSwitch__track"
               >
                 <svg
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
                 />
                 <svg
+                  aria-hidden={true}
                   className="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon euiSwitch__icon--checked"
                   focusable="false"
                   height={16}
+                  role="img"
                   style={null}
                   viewBox="0 0 16 16"
                   width={16}
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 67056c5ad716f..8a8799207ace8 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
@@ -56,15 +56,18 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
                       class="euiContextMenu__itemLayout"
                     >
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <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"
+                          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 000-.711l-7.2-4.583zm.538-.844l7.2 4.583a1.426 1.426 0 010 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"
                         />
                       </svg>
                       <span
@@ -73,15 +76,18 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
                         Auto Play
                       </span>
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
-                          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"
+                          d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
                           fill-rule="nonzero"
                         />
                       </svg>
@@ -95,13 +101,16 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
                       class="euiContextMenu__itemLayout"
                     >
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
                           d="M0 6h4v4H0V6zm1 1v2h2V7H1zm5-1h4v4H6V6zm1 1v2h2V7H7zm5-1h4v4h-4V6zm1 3h2V7h-2v2z"
                         />
@@ -112,15 +121,18 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
                         Toolbar
                       </span>
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
-                          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"
+                          d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
                           fill-rule="nonzero"
                         />
                       </svg>
@@ -198,15 +210,18 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                       class="euiContextMenu__itemLayout"
                     >
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <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"
+                          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 000-.711l-7.2-4.583zm.538-.844l7.2 4.583a1.426 1.426 0 010 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"
                         />
                       </svg>
                       <span
@@ -215,15 +230,18 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                         Auto Play
                       </span>
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
-                          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"
+                          d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
                           fill-rule="nonzero"
                         />
                       </svg>
@@ -237,13 +255,16 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                       class="euiContextMenu__itemLayout"
                     >
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
                           d="M0 6h4v4H0V6zm1 1v2h2V7H1zm5-1h4v4H6V6zm1 1v2h2V7H7zm5-1h4v4h-4V6zm1 3h2V7h-2v2z"
                         />
@@ -254,15 +275,18 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                         Toolbar
                       </span>
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
-                          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"
+                          d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
                           fill-rule="nonzero"
                         />
                       </svg>
@@ -284,15 +308,18 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                   class="euiContextMenu__itemLayout"
                 >
                   <svg
+                    aria-hidden="true"
                     class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon"
                     focusable="false"
                     height="16"
+                    role="img"
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
                   >
+                    <title />
                     <path
-                      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"
+                      d="M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z"
                       fill-rule="nonzero"
                     />
                   </svg>
@@ -330,27 +357,33 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                             class="euiSwitch__track"
                           >
                             <svg
+                              aria-hidden="true"
                               class="euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon"
                               focusable="false"
                               height="16"
+                              role="img"
                               viewBox="0 0 16 16"
                               width="16"
                               xmlns="http://www.w3.org/2000/svg"
                             >
+                              <title />
                               <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"
+                                d="M7.293 8L3.146 3.854a.5.5 0 11.708-.708L8 7.293l4.146-4.147a.5.5 0 01.708.708L8.707 8l4.147 4.146a.5.5 0 01-.708.708L8 8.707l-4.146 4.147a.5.5 0 01-.708-.708L7.293 8z"
                               />
                             </svg>
                             <svg
+                              aria-hidden="true"
                               class="euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon euiSwitch__icon--checked"
                               focusable="false"
                               height="16"
+                              role="img"
                               viewBox="0 0 16 16"
                               width="16"
                               xmlns="http://www.w3.org/2000/svg"
                             >
+                              <title />
                               <path
-                                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"
+                                d="M6.5 12a.502.502 0 01-.354-.146l-4-4a.502.502 0 01.708-.708L6.5 10.793l6.646-6.647a.502.502 0 01.708.708l-7 7A.502.502 0 016.5 12"
                                 fill-rule="evenodd"
                               />
                             </svg>
@@ -519,15 +552,18 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
                       class="euiContextMenu__itemLayout"
                     >
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <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"
+                          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 000-.711l-7.2-4.583zm.538-.844l7.2 4.583a1.426 1.426 0 010 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"
                         />
                       </svg>
                       <span
@@ -536,15 +572,18 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
                         Auto Play
                       </span>
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
-                          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"
+                          d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
                           fill-rule="nonzero"
                         />
                       </svg>
@@ -558,13 +597,16 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
                       class="euiContextMenu__itemLayout"
                     >
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
                           d="M0 6h4v4H0V6zm1 1v2h2V7H1zm5-1h4v4H6V6zm1 1v2h2V7H7zm5-1h4v4h-4V6zm1 3h2V7h-2v2z"
                         />
@@ -575,15 +617,18 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
                         Toolbar
                       </span>
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
-                          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"
+                          d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
                           fill-rule="nonzero"
                         />
                       </svg>
@@ -661,15 +706,18 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                       class="euiContextMenu__itemLayout"
                     >
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <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"
+                          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 000-.711l-7.2-4.583zm.538-.844l7.2 4.583a1.426 1.426 0 010 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"
                         />
                       </svg>
                       <span
@@ -678,15 +726,18 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                         Auto Play
                       </span>
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
-                          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"
+                          d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
                           fill-rule="nonzero"
                         />
                       </svg>
@@ -700,13 +751,16 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                       class="euiContextMenu__itemLayout"
                     >
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
                           d="M0 6h4v4H0V6zm1 1v2h2V7H1zm5-1h4v4H6V6zm1 1v2h2V7H7zm5-1h4v4h-4V6zm1 3h2V7h-2v2z"
                         />
@@ -717,15 +771,18 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                         Toolbar
                       </span>
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__arrow"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       >
+                        <title />
                         <path
-                          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"
+                          d="M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.771z"
                           fill-rule="nonzero"
                         />
                       </svg>
@@ -747,15 +804,18 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                   class="euiContextMenu__itemLayout"
                 >
                   <svg
+                    aria-hidden="true"
                     class="euiIcon euiIcon--medium euiIcon-isLoaded euiContextMenu__icon"
                     focusable="false"
                     height="16"
+                    role="img"
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
                   >
+                    <title />
                     <path
-                      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"
+                      d="M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z"
                       fill-rule="nonzero"
                     />
                   </svg>
@@ -802,27 +862,33 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                                 class="euiSwitch__track"
                               >
                                 <svg
+                                  aria-hidden="true"
                                   class="euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon"
                                   focusable="false"
                                   height="16"
+                                  role="img"
                                   viewBox="0 0 16 16"
                                   width="16"
                                   xmlns="http://www.w3.org/2000/svg"
                                 >
+                                  <title />
                                   <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"
+                                    d="M7.293 8L3.146 3.854a.5.5 0 11.708-.708L8 7.293l4.146-4.147a.5.5 0 01.708.708L8.707 8l4.147 4.146a.5.5 0 01-.708.708L8 8.707l-4.146 4.147a.5.5 0 01-.708-.708L7.293 8z"
                                   />
                                 </svg>
                                 <svg
+                                  aria-hidden="true"
                                   class="euiIcon euiIcon--medium euiIcon-isLoaded euiSwitch__icon euiSwitch__icon--checked"
                                   focusable="false"
                                   height="16"
+                                  role="img"
                                   viewBox="0 0 16 16"
                                   width="16"
                                   xmlns="http://www.w3.org/2000/svg"
                                 >
+                                  <title />
                                   <path
-                                    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"
+                                    d="M6.5 12a.502.502 0 01-.354-.146l-4-4a.502.502 0 01.708-.708L6.5 10.793l6.646-6.647a.502.502 0 01.708.708l-7 7A.502.502 0 016.5 12"
                                     fill-rule="evenodd"
                                   />
                                 </svg>
@@ -861,4 +927,4 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
 </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\\" aria-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\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" 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></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></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\\" aria-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\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><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 000-.711l-7.2-4.583zm.538-.844l7.2 4.583a1.426 1.426 0 010 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\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.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\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><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\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M5.157 13.069l4.611-4.685a.546.546 0 000-.768L5.158 2.93a.552.552 0 010-.771.53.53 0 01.759 0l4.61 4.684c.631.641.63 1.672 0 2.312l-4.61 4.684a.53.53 0 01-.76 0 .552.552 0 010-.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\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"nonzero\\" d=\\"M10.843 13.069L6.232 8.384a.546.546 0 010-.768l4.61-4.685a.552.552 0 000-.771.53.53 0 00-.759 0l-4.61 4.684a1.65 1.65 0 000 2.312l4.61 4.684a.53.53 0 00.76 0 .552.552 0 000-.771z\\"></path></svg><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" 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\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path d=\\"M7.293 8L3.146 3.854a.5.5 0 11.708-.708L8 7.293l4.146-4.147a.5.5 0 01.708.708L8.707 8l4.147 4.146a.5.5 0 01-.708.708L8 8.707l-4.146 4.147a.5.5 0 01-.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\\" role=\\"img\\" aria-hidden=\\"true\\"><title></title><path fill-rule=\\"evenodd\\" d=\\"M6.5 12a.502.502 0 01-.354-.146l-4-4a.502.502 0 01.708-.708L6.5 10.793l6.646-6.647a.502.502 0 01.708.708l-7 7A.502.502 0 016.5 12\\"></path></svg></span></span></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></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/console_extensions/spec/generated/ml.delete_trained_model.json b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_trained_model.json
new file mode 100644
index 0000000000000..343fa904c4216
--- /dev/null
+++ b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_trained_model.json
@@ -0,0 +1,11 @@
+{
+  "ml.delete_trained_model": {
+    "methods": [
+      "DELETE"
+    ],
+    "patterns": [
+      "_ml/inference/{model_id}"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-inference.html"
+  }
+}
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models.json b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models.json
new file mode 100644
index 0000000000000..cdeaca9654b77
--- /dev/null
+++ b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models.json
@@ -0,0 +1,19 @@
+{
+  "ml.get_trained_models": {
+    "url_params": {
+      "allow_no_match": "__flag__",
+      "include_model_definition": "__flag__",
+      "decompress_definition": "__flag__",
+      "from": 0,
+      "size": 0
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_ml/inference/{model_id}",
+      "_ml/inference"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-inference.html"
+  }
+}
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models_stats.json b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models_stats.json
new file mode 100644
index 0000000000000..ab05e203b3980
--- /dev/null
+++ b/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models_stats.json
@@ -0,0 +1,17 @@
+{
+  "ml.get_trained_models_stats": {
+    "url_params": {
+      "allow_no_match": "__flag__",
+      "from": 0,
+      "size": 0
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_ml/inference/{model_id}/_stats",
+      "_ml/inference/_stats"
+    ],
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-inference-stats.html"
+  }
+}
diff --git a/x-pack/legacy/plugins/console_extensions/spec/ingest/index.js b/x-pack/legacy/plugins/console_extensions/spec/ingest/index.js
index f5ca413e5e2e1..def311a6baf59 100644
--- a/x-pack/legacy/plugins/console_extensions/spec/ingest/index.js
+++ b/x-pack/legacy/plugins/console_extensions/spec/ingest/index.js
@@ -37,4 +37,33 @@ const enrichProcessorDefinition = {
   },
 };
 
-export const processors = [enrichProcessorDefinition];
+// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/inference-processor.html
+const inferenceProcessorDefinition = {
+  inference: {
+    __template: {
+      model_id: '',
+      inference_config: {},
+      field_mappings: {},
+    },
+    target_field: '',
+    model_id: '',
+    field_mappings: {
+      __template: {},
+    },
+    inference_config: {
+      regression: {
+        __template: {},
+        results_field: '',
+      },
+      classification: {
+        __template: {},
+        results_field: '',
+        num_top_classes: 2,
+        top_classes_results_field: '',
+      },
+    },
+    ...commonPipelineParams,
+  },
+};
+
+export const processors = [enrichProcessorDefinition, inferenceProcessorDefinition];
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json b/x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json
index 843fba30bb489..c78cfeea8473d 100644
--- a/x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json
+++ b/x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json
@@ -19,6 +19,7 @@
         "smile"
       ]
     },
-    "template": "_sql?format=json\n{\n  \"query\": \"\"\"\n  SELECT * FROM \"${1:TABLE}\"\n  \"\"\"\n}\n"
+    "template": "_sql?format=json\n{\n  \"query\": \"\"\"\n  SELECT * FROM \"${1:TABLE}\"\n  \"\"\"\n}\n",
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-rest-overview.html"
   }
 }
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_add.test.js b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_add.test.js
index 2e0acca5ba4a8..06a7c2f1ec45e 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_add.test.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_add.test.js
@@ -5,7 +5,7 @@
  */
 
 import { setupEnvironment, pageHelpers, nextTick, getRandomString } from './helpers';
-import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from '../../../../../../src/legacy/ui/public/index_patterns';
+import { indexPatterns } from '../../../../../../src/plugins/data/public';
 
 jest.mock('ui/new_platform');
 
@@ -203,7 +203,7 @@ describe('Create Auto-follow pattern', () => {
           );
         };
 
-        return INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.reduce((promise, char) => {
+        return indexPatterns.ILLEGAL_CHARACTERS_VISIBLE.reduce((promise, char) => {
           return promise.then(() => expectInvalidChar(char));
         }, Promise.resolve());
       });
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_add.test.js b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_add.test.js
index a1535c4560fc3..8d4523ca26de2 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_add.test.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/follower_index_add.test.js
@@ -7,7 +7,7 @@
 import { setupEnvironment, pageHelpers, nextTick } from './helpers';
 import { RemoteClustersFormField } from '../../public/app/components';
 
-import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from '../../../../../../src/legacy/ui/public/index_patterns';
+import { indexPatterns } from '../../../../../../src/plugins/data/public';
 
 jest.mock('ui/new_platform');
 
@@ -129,7 +129,7 @@ describe('Create Follower index', () => {
           );
         };
 
-        return INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.reduce((promise, char) => {
+        return indexPatterns.ILLEGAL_CHARACTERS_VISIBLE.reduce((promise, char) => {
           return promise.then(() => expectInvalidChar(char));
         }, Promise.resolve());
       });
@@ -158,7 +158,7 @@ describe('Create Follower index', () => {
           );
         };
 
-        return INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.reduce((promise, char) => {
+        return indexPatterns.ILLEGAL_CHARACTERS_VISIBLE.reduce((promise, char) => {
           return promise.then(() => expectInvalidChar(char));
         }, Promise.resolve());
       });
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js b/x-pack/legacy/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js
index e676b831e0f2e..ebb731a1b1aca 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.js
@@ -29,7 +29,6 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from 'ui/index_patterns';
 import { INDEX_ILLEGAL_CHARACTERS_VISIBLE } from 'ui/indices';
 
 import routing from '../services/routing';
@@ -45,8 +44,9 @@ import {
 } from '../services/auto_follow_pattern_validators';
 
 import { AutoFollowPatternRequestFlyout } from './auto_follow_pattern_request_flyout';
+import { indexPatterns } from '../../../../../../../src/plugins/data/public';
 
-const indexPatternIllegalCharacters = INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.join(' ');
+const indexPatternIllegalCharacters = indexPatterns.ILLEGAL_CHARACTERS_VISIBLE.join(' ');
 const indexNameIllegalCharacters = INDEX_ILLEGAL_CHARACTERS_VISIBLE.join(' ');
 
 const getEmptyAutoFollowPattern = (remoteClusterName = '') => ({
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js b/x-pack/legacy/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js
index bd51af824324b..18610c87c0a51 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.js
@@ -8,18 +8,14 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import {
-  ILLEGAL_CHARACTERS,
-  CONTAINS_SPACES,
-  validateIndexPattern as getIndexPatternErrors,
-} from 'ui/index_patterns';
-
 import {
   indexNameBeginsWithPeriod,
   findIllegalCharactersInIndexName,
   indexNameContainsSpaces,
 } from 'ui/indices';
 
+import { indexPatterns } from '../../../../../../../src/plugins/data/public';
+
 export const validateName = (name = '') => {
   let errorMsg = null;
 
@@ -57,9 +53,9 @@ export const validateName = (name = '') => {
 
 export const validateLeaderIndexPattern = indexPattern => {
   if (indexPattern) {
-    const errors = getIndexPatternErrors(indexPattern);
+    const errors = indexPatterns.validate(indexPattern);
 
-    if (errors[ILLEGAL_CHARACTERS]) {
+    if (errors[indexPatterns.ILLEGAL_CHARACTERS_KEY]) {
       return {
         message: (
           <FormattedMessage
@@ -67,15 +63,17 @@ export const validateLeaderIndexPattern = indexPattern => {
             defaultMessage="Remove the {characterListLength, plural, one {character} other {characters}}
           {characterList} from the index pattern."
             values={{
-              characterList: <strong>{errors[ILLEGAL_CHARACTERS].join(' ')}</strong>,
-              characterListLength: errors[ILLEGAL_CHARACTERS].length,
+              characterList: (
+                <strong>{errors[indexPatterns.ILLEGAL_CHARACTERS_KEY].join(' ')}</strong>
+              ),
+              characterListLength: errors[indexPatterns.ILLEGAL_CHARACTERS_KEY].length,
             }}
           />
         ),
       };
     }
 
-    if (errors[CONTAINS_SPACES]) {
+    if (errors[indexPatterns.CONTAINS_SPACES_KEY]) {
       return {
         message: (
           <FormattedMessage
diff --git a/x-pack/legacy/plugins/cross_cluster_replication/server/lib/check_license/check_license.js b/x-pack/legacy/plugins/cross_cluster_replication/server/lib/check_license/check_license.js
index 29e6f2d3f8a5b..6cf12896fa472 100644
--- a/x-pack/legacy/plugins/cross_cluster_replication/server/lib/check_license/check_license.js
+++ b/x-pack/legacy/plugins/cross_cluster_replication/server/lib/check_license/check_license.js
@@ -27,7 +27,7 @@ export function checkLicense(xpackLicenseInfo) {
     };
   }
 
-  const VALID_LICENSE_MODES = ['trial', 'platinum'];
+  const VALID_LICENSE_MODES = ['trial', 'platinum', 'enterprise'];
 
   const isLicenseModeValid = xpackLicenseInfo.license.isOneOf(VALID_LICENSE_MODES);
   const isLicenseActive = xpackLicenseInfo.license.isActive();
diff --git a/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js b/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js
index f0a0bf90d9e49..470fa00734d27 100644
--- a/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js
+++ b/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js
@@ -30,7 +30,6 @@ import 'uiExports/shareContextMenuExtensions';
 import _ from 'lodash';
 import 'ui/autoload/all';
 import 'ui/kbn_top_nav';
-import 'plugins/kibana/dashboard';
 import 'ui/vislib';
 import 'ui/agg_response';
 import 'ui/agg_types';
@@ -39,10 +38,7 @@ import { npStart } from 'ui/new_platform';
 import { localApplicationService } from 'plugins/kibana/local_application_service';
 
 import { showAppRedirectNotification } from 'ui/notify';
-import {
-  DashboardConstants,
-  createDashboardEditUrl,
-} from 'plugins/kibana/dashboard/dashboard_constants';
+import { DashboardConstants, createDashboardEditUrl } from 'plugins/kibana/dashboard';
 
 uiModules
   .get('kibana')
diff --git a/x-pack/legacy/plugins/encrypted_saved_objects/index.ts b/x-pack/legacy/plugins/encrypted_saved_objects/index.ts
index 3969959d03cff..85aa5c22135b6 100644
--- a/x-pack/legacy/plugins/encrypted_saved_objects/index.ts
+++ b/x-pack/legacy/plugins/encrypted_saved_objects/index.ts
@@ -33,7 +33,6 @@ export const encryptedSavedObjects = (kibana: {
       }
 
       encryptedSavedObjectsPlugin.__legacyCompat.registerLegacyAPI({
-        savedObjects: server.savedObjects,
         auditLogger: new AuditLogger(
           server,
           'encryptedSavedObjects',
diff --git a/x-pack/legacy/plugins/graph/public/angular/__tests__/workspace.js b/x-pack/legacy/plugins/graph/public/angular/__tests__/workspace.js
deleted file mode 100644
index a09f94ca6ce9f..0000000000000
--- a/x-pack/legacy/plugins/graph/public/angular/__tests__/workspace.js
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under 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 gws = require('../graph_client_workspace.js');
-const expect = require('@kbn/expect');
-describe('graphui-workspace', function() {
-  describe('createWorkspace()', function() {
-    // var fooResource=null;
-    let mockedResult = null;
-    let init = null;
-    beforeEach(function() {
-      //Setup logic here
-      // fooResource={"foo":"bar"};
-      init = function() {
-        const callNodeProxy = function(indexName, query, responseHandler) {
-          responseHandler(mockedResult);
-        };
-        const options = {
-          indexName: 'indexName',
-          vertex_fields: [
-            {
-              name: 'field1',
-            },
-            {
-              name: 'field2',
-            },
-          ],
-          graphExploreProxy: callNodeProxy,
-          exploreControls: {
-            useSignificance: false,
-            sampleSize: 2000,
-            timeoutMillis: 5000,
-            sampleDiversityField: null,
-            maxValuesPerDoc: 1,
-            minDocCount: 1,
-          },
-        };
-        const workspace = gws.createWorkspace(options);
-        return {
-          workspace,
-          //, get to(){}
-        };
-      };
-    });
-    it('initializeWorkspace', function() {
-      const { workspace } = init();
-      expect(workspace.nodes).to.have.length(0);
-    });
-    it('simpleSearch', function() {
-      //Test that a graph is loaded from a free-text search
-      const { workspace } = init();
-
-      mockedResult = {
-        vertices: [
-          {
-            field: 'field1',
-            term: 'a',
-            weight: 1,
-            depth: 0,
-          },
-          {
-            field: 'field1',
-            term: 'b',
-            weight: 1,
-            depth: 1,
-          },
-        ],
-        connections: [
-          {
-            source: 0,
-            target: 1,
-            weight: 1,
-            doc_count: 5,
-          },
-        ],
-      };
-      workspace.simpleSearch('myquery', {}, 2);
-
-      expect(workspace.nodes).to.have.length(2);
-      expect(workspace.edges).to.have.length(1);
-      expect(workspace.selectedNodes).to.have.length(0);
-      expect(workspace.blacklistedNodes).to.have.length(0);
-
-      const nodeA = workspace.getNode(workspace.makeNodeId('field1', 'a'));
-      expect(nodeA).to.be.an(Object);
-
-      const nodeD = workspace.getNode(workspace.makeNodeId('field1', 'd'));
-      expect(nodeD).to.be(undefined);
-    });
-
-    it('expandTest', function() {
-      //Test that a graph can be expanded
-      const { workspace } = init();
-
-      mockedResult = {
-        vertices: [
-          {
-            field: 'field1',
-            term: 'a',
-            weight: 1,
-            depth: 0,
-          },
-          {
-            field: 'field1',
-            term: 'b',
-            weight: 1,
-            depth: 1,
-          },
-        ],
-        connections: [
-          {
-            source: 0,
-            target: 1,
-            weight: 1,
-            doc_count: 5,
-          },
-        ],
-      };
-      workspace.simpleSearch('myquery', {}, 2);
-
-      expect(workspace.nodes).to.have.length(2);
-      expect(workspace.edges).to.have.length(1);
-      expect(workspace.selectedNodes).to.have.length(0);
-      expect(workspace.blacklistedNodes).to.have.length(0);
-
-      mockedResult = {
-        vertices: [
-          {
-            field: 'field1',
-            term: 'b',
-            weight: 1,
-            depth: 0,
-          },
-          {
-            field: 'field1',
-            term: 'c',
-            weight: 1,
-            depth: 1,
-          },
-        ],
-        connections: [
-          {
-            source: 0,
-            target: 1,
-            weight: 1,
-            doc_count: 5,
-          },
-        ],
-      };
-      workspace.expandGraph();
-      expect(workspace.nodes).to.have.length(3); //we already had b from initial query
-      expect(workspace.edges).to.have.length(2);
-    });
-
-    it('selectionTest', function() {
-      //Test selections on a graph
-      const { workspace } = init();
-      // graph is a1->a2 and b1->b2
-      mockedResult = {
-        vertices: [
-          {
-            field: 'field1',
-            term: 'a1',
-            weight: 1,
-            depth: 0,
-          },
-          {
-            field: 'field1',
-            term: 'a2',
-            weight: 1,
-            depth: 1,
-          },
-          {
-            field: 'field1',
-            term: 'b1',
-            weight: 1,
-            depth: 1,
-          },
-          {
-            field: 'field1',
-            term: 'b2',
-            weight: 1,
-            depth: 1,
-          },
-        ],
-        connections: [
-          {
-            source: 0,
-            target: 1,
-            weight: 1,
-            doc_count: 5,
-          },
-          {
-            source: 2,
-            target: 3,
-            weight: 1,
-            doc_count: 5,
-          },
-        ],
-      };
-      workspace.simpleSearch('myquery', {}, 2);
-
-      expect(workspace.selectedNodes).to.have.length(0);
-
-      const nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
-      expect(nodeA1).to.be.an(Object);
-      const nodeA2 = workspace.getNode(workspace.makeNodeId('field1', 'a2'));
-      expect(nodeA2).to.be.an(Object);
-      const nodeB1 = workspace.getNode(workspace.makeNodeId('field1', 'b1'));
-      expect(nodeB1).to.be.an(Object);
-      const nodeB2 = workspace.getNode(workspace.makeNodeId('field1', 'b2'));
-      expect(nodeB2).to.be.an(Object);
-
-      expect(workspace.selectedNodes).to.have.length(0);
-      workspace.selectNode(nodeA1);
-      expect(workspace.selectedNodes).to.have.length(1);
-      workspace.selectInvert();
-      expect(workspace.selectedNodes).to.have.length(3);
-      workspace.selectInvert();
-      expect(workspace.selectedNodes).to.have.length(1);
-      workspace.deselectNode(nodeA1);
-      expect(workspace.selectedNodes).to.have.length(0);
-      workspace.selectAll();
-      expect(workspace.selectedNodes).to.have.length(4);
-      workspace.selectInvert();
-      expect(workspace.selectedNodes).to.have.length(0);
-
-      workspace.selectNode(nodeA1);
-      expect(workspace.selectedNodes).to.have.length(1);
-      workspace.selectNeighbours();
-      expect(workspace.selectedNodes).to.have.length(2);
-      workspace.selectNeighbours();
-      //Should have reached full extent of a1-a2 island.
-      expect(workspace.selectedNodes).to.have.length(2);
-    });
-
-    it('undoRedoDeletes', function() {
-      const { workspace } = init();
-      // graph is a1->a2
-      mockedResult = {
-        vertices: [
-          {
-            field: 'field1',
-            term: 'a1',
-            weight: 1,
-            depth: 0,
-          },
-          {
-            field: 'field1',
-            term: 'a2',
-            weight: 1,
-            depth: 1,
-          },
-        ],
-        connections: [
-          {
-            source: 0,
-            target: 1,
-            weight: 1,
-            doc_count: 5,
-          },
-        ],
-      };
-      workspace.simpleSearch('myquery', {}, 2);
-
-      expect(workspace.nodes).to.have.length(2);
-
-      let nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
-      expect(nodeA1).to.be.an(Object);
-      const nodeA2 = workspace.getNode(workspace.makeNodeId('field1', 'a2'));
-      expect(nodeA2).to.be.an(Object);
-
-      workspace.selectNode(nodeA1);
-      workspace.deleteSelection();
-      expect(workspace.nodes).to.have.length(1);
-      nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
-      expect(nodeA1).to.be(undefined);
-
-      workspace.undo();
-      expect(workspace.nodes).to.have.length(2);
-      nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
-      expect(nodeA1).to.be.an(Object);
-
-      workspace.redo();
-      expect(workspace.nodes).to.have.length(1);
-      nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
-      expect(nodeA1).to.be(undefined);
-
-      workspace.undo();
-      expect(workspace.nodes).to.have.length(2);
-    });
-
-    it('undoRedoGroupings', function() {
-      const { workspace } = init();
-      // graph is a1->a2
-      mockedResult = {
-        vertices: [
-          {
-            field: 'field1',
-            term: 'a1',
-            weight: 1,
-            depth: 0,
-          },
-          {
-            field: 'field1',
-            term: 'a2',
-            weight: 1,
-            depth: 1,
-          },
-        ],
-        connections: [
-          {
-            source: 0,
-            target: 1,
-            weight: 1,
-            doc_count: 5,
-          },
-        ],
-      };
-      workspace.simpleSearch('myquery', {}, 2);
-
-      expect(workspace.nodes).to.have.length(2);
-
-      const nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
-      expect(nodeA1).to.be.an(Object);
-      const nodeA2 = workspace.getNode(workspace.makeNodeId('field1', 'a2'));
-      expect(nodeA2).to.be.an(Object);
-
-      workspace.selectNode(nodeA2);
-      workspace.mergeSelections(nodeA1);
-
-      let groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
-      expect(groupedItems).to.have.length(2);
-      workspace.undo();
-      groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
-      expect(groupedItems).to.have.length(1);
-      workspace.redo();
-      groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
-      expect(groupedItems).to.have.length(2);
-
-      //Grouped deletes delete all grouped items
-      workspace.selectNone();
-      workspace.selectNode(nodeA1);
-      workspace.deleteSelection();
-      expect(workspace.nodes).to.have.length(0);
-      expect(workspace.selectedNodes).to.have.length(0);
-
-      workspace.undo();
-      expect(workspace.nodes).to.have.length(2);
-      groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
-      expect(groupedItems).to.have.length(2);
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.test.js b/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.test.js
new file mode 100644
index 0000000000000..6179467966764
--- /dev/null
+++ b/x-pack/legacy/plugins/graph/public/angular/graph_client_workspace.test.js
@@ -0,0 +1,357 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import gws from './graph_client_workspace';
+
+describe('graphui-workspace', function() {
+  describe('createWorkspace()', function() {
+    // var fooResource=null;
+    let mockedResult = null;
+    let init = null;
+    beforeEach(function() {
+      //Setup logic here
+      // fooResource={"foo":"bar"};
+      init = function() {
+        const callNodeProxy = function(indexName, query, responseHandler) {
+          responseHandler(mockedResult);
+        };
+        const options = {
+          indexName: 'indexName',
+          vertex_fields: [
+            {
+              name: 'field1',
+            },
+            {
+              name: 'field2',
+            },
+          ],
+          graphExploreProxy: callNodeProxy,
+          exploreControls: {
+            useSignificance: false,
+            sampleSize: 2000,
+            timeoutMillis: 5000,
+            sampleDiversityField: null,
+            maxValuesPerDoc: 1,
+            minDocCount: 1,
+          },
+        };
+        const workspace = gws.createWorkspace(options);
+        return {
+          workspace,
+          //, get to(){}
+        };
+      };
+    });
+    it('initializeWorkspace', function() {
+      const { workspace } = init();
+      expect(workspace.nodes.length).toEqual(0);
+    });
+    it('simpleSearch', function() {
+      //Test that a graph is loaded from a free-text search
+      const { workspace } = init();
+
+      mockedResult = {
+        vertices: [
+          {
+            field: 'field1',
+            term: 'a',
+            weight: 1,
+            depth: 0,
+          },
+          {
+            field: 'field1',
+            term: 'b',
+            weight: 1,
+            depth: 1,
+          },
+        ],
+        connections: [
+          {
+            source: 0,
+            target: 1,
+            weight: 1,
+            doc_count: 5,
+          },
+        ],
+      };
+      workspace.simpleSearch('myquery', {}, 2);
+
+      expect(workspace.nodes.length).toEqual(2);
+      expect(workspace.edges.length).toEqual(1);
+      expect(workspace.selectedNodes.length).toEqual(0);
+      expect(workspace.blacklistedNodes.length).toEqual(0);
+
+      const nodeA = workspace.getNode(workspace.makeNodeId('field1', 'a'));
+      expect(typeof nodeA).toBe('object');
+
+      const nodeD = workspace.getNode(workspace.makeNodeId('field1', 'd'));
+      expect(nodeD).toBe(undefined);
+    });
+
+    it('expandTest', function() {
+      //Test that a graph can be expanded
+      const { workspace } = init();
+
+      mockedResult = {
+        vertices: [
+          {
+            field: 'field1',
+            term: 'a',
+            weight: 1,
+            depth: 0,
+          },
+          {
+            field: 'field1',
+            term: 'b',
+            weight: 1,
+            depth: 1,
+          },
+        ],
+        connections: [
+          {
+            source: 0,
+            target: 1,
+            weight: 1,
+            doc_count: 5,
+          },
+        ],
+      };
+      workspace.simpleSearch('myquery', {}, 2);
+
+      expect(workspace.nodes.length).toEqual(2);
+      expect(workspace.edges.length).toEqual(1);
+      expect(workspace.selectedNodes.length).toEqual(0);
+      expect(workspace.blacklistedNodes.length).toEqual(0);
+
+      mockedResult = {
+        vertices: [
+          {
+            field: 'field1',
+            term: 'b',
+            weight: 1,
+            depth: 0,
+          },
+          {
+            field: 'field1',
+            term: 'c',
+            weight: 1,
+            depth: 1,
+          },
+        ],
+        connections: [
+          {
+            source: 0,
+            target: 1,
+            weight: 1,
+            doc_count: 5,
+          },
+        ],
+      };
+      workspace.expandGraph();
+      expect(workspace.nodes.length).toEqual(3); //we already had b from initial query
+      expect(workspace.edges.length).toEqual(2);
+    });
+
+    it('selectionTest', function() {
+      //Test selections on a graph
+      const { workspace } = init();
+      // graph is a1->a2 and b1->b2
+      mockedResult = {
+        vertices: [
+          {
+            field: 'field1',
+            term: 'a1',
+            weight: 1,
+            depth: 0,
+          },
+          {
+            field: 'field1',
+            term: 'a2',
+            weight: 1,
+            depth: 1,
+          },
+          {
+            field: 'field1',
+            term: 'b1',
+            weight: 1,
+            depth: 1,
+          },
+          {
+            field: 'field1',
+            term: 'b2',
+            weight: 1,
+            depth: 1,
+          },
+        ],
+        connections: [
+          {
+            source: 0,
+            target: 1,
+            weight: 1,
+            doc_count: 5,
+          },
+          {
+            source: 2,
+            target: 3,
+            weight: 1,
+            doc_count: 5,
+          },
+        ],
+      };
+      workspace.simpleSearch('myquery', {}, 2);
+
+      expect(workspace.selectedNodes.length).toEqual(0);
+
+      const nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
+      expect(typeof nodeA1).toEqual('object');
+      const nodeA2 = workspace.getNode(workspace.makeNodeId('field1', 'a2'));
+      expect(typeof nodeA2).toEqual('object');
+      const nodeB1 = workspace.getNode(workspace.makeNodeId('field1', 'b1'));
+      expect(typeof nodeB1).toEqual('object');
+      const nodeB2 = workspace.getNode(workspace.makeNodeId('field1', 'b2'));
+      expect(typeof nodeB2).toEqual('object');
+
+      expect(workspace.selectedNodes.length).toEqual(0);
+      workspace.selectNode(nodeA1);
+      expect(workspace.selectedNodes.length).toEqual(1);
+      workspace.selectInvert();
+      expect(workspace.selectedNodes.length).toEqual(3);
+      workspace.selectInvert();
+      expect(workspace.selectedNodes.length).toEqual(1);
+      workspace.deselectNode(nodeA1);
+      expect(workspace.selectedNodes.length).toEqual(0);
+      workspace.selectAll();
+      expect(workspace.selectedNodes.length).toEqual(4);
+      workspace.selectInvert();
+      expect(workspace.selectedNodes.length).toEqual(0);
+
+      workspace.selectNode(nodeA1);
+      expect(workspace.selectedNodes.length).toEqual(1);
+      workspace.selectNeighbours();
+      expect(workspace.selectedNodes.length).toEqual(2);
+      workspace.selectNeighbours();
+      //Should have reached full extent of a1-a2 island.
+      expect(workspace.selectedNodes.length).toEqual(2);
+    });
+
+    it('undoRedoDeletes', function() {
+      const { workspace } = init();
+      // graph is a1->a2
+      mockedResult = {
+        vertices: [
+          {
+            field: 'field1',
+            term: 'a1',
+            weight: 1,
+            depth: 0,
+          },
+          {
+            field: 'field1',
+            term: 'a2',
+            weight: 1,
+            depth: 1,
+          },
+        ],
+        connections: [
+          {
+            source: 0,
+            target: 1,
+            weight: 1,
+            doc_count: 5,
+          },
+        ],
+      };
+      workspace.simpleSearch('myquery', {}, 2);
+
+      expect(workspace.nodes.length).toEqual(2);
+
+      let nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
+      expect(typeof nodeA1).toEqual('object');
+      const nodeA2 = workspace.getNode(workspace.makeNodeId('field1', 'a2'));
+      expect(typeof nodeA2).toEqual('object');
+
+      workspace.selectNode(nodeA1);
+      workspace.deleteSelection();
+      expect(workspace.nodes.length).toEqual(1);
+      nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
+      expect(nodeA1).toBe(undefined);
+
+      workspace.undo();
+      expect(workspace.nodes.length).toEqual(2);
+      nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
+      expect(typeof nodeA1).toEqual('object');
+
+      workspace.redo();
+      expect(workspace.nodes.length).toEqual(1);
+      nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
+      expect(nodeA1).toBe(undefined);
+
+      workspace.undo();
+      expect(workspace.nodes.length).toEqual(2);
+    });
+
+    it('undoRedoGroupings', function() {
+      const { workspace } = init();
+      // graph is a1->a2
+      mockedResult = {
+        vertices: [
+          {
+            field: 'field1',
+            term: 'a1',
+            weight: 1,
+            depth: 0,
+          },
+          {
+            field: 'field1',
+            term: 'a2',
+            weight: 1,
+            depth: 1,
+          },
+        ],
+        connections: [
+          {
+            source: 0,
+            target: 1,
+            weight: 1,
+            doc_count: 5,
+          },
+        ],
+      };
+      workspace.simpleSearch('myquery', {}, 2);
+
+      expect(workspace.nodes.length).toEqual(2);
+
+      const nodeA1 = workspace.getNode(workspace.makeNodeId('field1', 'a1'));
+      expect(typeof nodeA1).toEqual('object');
+      const nodeA2 = workspace.getNode(workspace.makeNodeId('field1', 'a2'));
+      expect(typeof nodeA2).toEqual('object');
+
+      workspace.selectNode(nodeA2);
+      workspace.mergeSelections(nodeA1);
+
+      let groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
+      expect(groupedItems.length).toEqual(2);
+      workspace.undo();
+      groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
+      expect(groupedItems.length).toEqual(1);
+      workspace.redo();
+      groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
+      expect(groupedItems.length).toEqual(2);
+
+      //Grouped deletes delete all grouped items
+      workspace.selectNone();
+      workspace.selectNode(nodeA1);
+      workspace.deleteSelection();
+      expect(workspace.nodes.length).toEqual(0);
+      expect(workspace.selectedNodes.length).toEqual(0);
+
+      workspace.undo();
+      expect(workspace.nodes.length).toEqual(2);
+      groupedItems = workspace.returnUnpackedGroupeds([nodeA1]);
+      expect(groupedItems.length).toEqual(2);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspaces.ts b/x-pack/legacy/plugins/graph/public/angular/services/saved_workspaces.ts
deleted file mode 100644
index e28bb60fb466b..0000000000000
--- a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspaces.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.
- */
-
-import { npSetup, npStart } from 'ui/new_platform';
-import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry';
-import { i18n } from '@kbn/i18n';
-
-import { createSavedWorkspaceClass } from './saved_workspace';
-
-export function SavedWorkspacesProvider() {
-  const savedObjectsClient = npStart.core.savedObjects.client;
-  const services = {
-    savedObjectsClient,
-    indexPatterns: npStart.plugins.data.indexPatterns,
-    chrome: npStart.core.chrome,
-    overlays: npStart.core.overlays,
-  };
-
-  const SavedWorkspace = createSavedWorkspaceClass(services);
-  const urlFor = (id: string) =>
-    npSetup.core.http.basePath.prepend(`/app/graph#/workspace/${encodeURIComponent(id)}`);
-  const mapHits = (hit: { id: string; attributes: Record<string, unknown> }) => {
-    const source = hit.attributes;
-    source.id = hit.id;
-    source.url = urlFor(hit.id);
-    source.icon = 'fa-share-alt'; // looks like a graph
-    return source;
-  };
-
-  return {
-    type: SavedWorkspace.type,
-    Class: SavedWorkspace,
-    loaderProperties: {
-      name: 'Graph workspace',
-      noun: i18n.translate('xpack.graph.savedWorkspaces.graphWorkspaceLabel', {
-        defaultMessage: 'Graph workspace',
-      }),
-      nouns: i18n.translate('xpack.graph.savedWorkspaces.graphWorkspacesLabel', {
-        defaultMessage: 'Graph workspaces',
-      }),
-    },
-    // Returns a single dashboard by ID, should be the name of the workspace
-    get: (id: string) => {
-      // Returns a promise that contains a workspace which is a subclass of docSource
-      // @ts-ignore
-      return new SavedWorkspace(id).init();
-    },
-    urlFor,
-    delete: (ids: string | string[]) => {
-      const idArr = Array.isArray(ids) ? ids : [ids];
-      return Promise.all(
-        idArr.map((id: string) => savedObjectsClient.delete(SavedWorkspace.type, id))
-      );
-    },
-    find: (searchString: string, size: number = 100) => {
-      return savedObjectsClient
-        .find({
-          type: SavedWorkspace.type,
-          search: searchString ? `${searchString}*` : undefined,
-          perPage: size,
-          searchFields: ['title^3', 'description'],
-        })
-        .then(resp => {
-          return {
-            total: resp.total,
-            hits: resp.savedObjects.map(hit => mapHits(hit)),
-          };
-        });
-    },
-  };
-}
-
-SavedObjectRegistryProvider.register(SavedWorkspacesProvider);
diff --git a/x-pack/legacy/plugins/graph/public/app.js b/x-pack/legacy/plugins/graph/public/app.js
index 6ada589f3740c..d0dbf34abc055 100644
--- a/x-pack/legacy/plugins/graph/public/app.js
+++ b/x-pack/legacy/plugins/graph/public/app.js
@@ -12,7 +12,7 @@ import { Provider } from 'react-redux';
 import { isColorDark, hexToRgb } from '@elastic/eui';
 
 import { toMountPoint } from '../../../../../src/plugins/kibana_react/public';
-import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
+import { showSaveModal } from './legacy_imports';
 
 import appTemplate from './angular/templates/index.html';
 import listingTemplate from './angular/templates/listing_ng_wrapper.html';
@@ -32,24 +32,21 @@ import { asAngularSyncedObservable } from './helpers/as_observable';
 import { colorChoices } from './helpers/style_choices';
 import { createGraphStore, datasourceSelector, hasFieldsSelector } from './state_management';
 import { formatHttpError } from './helpers/format_http_error';
-import { checkLicense } from '../../../../plugins/graph/common/check_license';
 
 export function initGraphApp(angularModule, deps) {
   const {
     chrome,
-    savedGraphWorkspaces,
     toastNotifications,
     savedObjectsClient,
     indexPatterns,
-    kbnBaseUrl,
     addBasePath,
     getBasePath,
     npData,
     config,
-    savedObjectRegistry,
+    savedWorkspaceLoader,
     capabilities,
     coreStart,
-    Storage,
+    storage,
     canEditDrillDownUrls,
     graphSavePolicy,
   } = deps;
@@ -110,22 +107,19 @@ export function initGraphApp(angularModule, deps) {
         template: listingTemplate,
         badge: getReadonlyBadge,
         controller($location, $scope) {
-          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);
+            return savedWorkspaceLoader.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));
+            return savedWorkspaceLoader.delete(workspaces.map(({ id }) => id));
           };
           $scope.capabilities = capabilities;
           $scope.initialFilter = $location.search().filter || '';
@@ -139,14 +133,14 @@ export function initGraphApp(angularModule, deps) {
         resolve: {
           savedWorkspace: function($route) {
             return $route.current.params.id
-              ? savedGraphWorkspaces.get($route.current.params.id).catch(function() {
+              ? savedWorkspaceLoader.get($route.current.params.id).catch(function() {
                   toastNotifications.addDanger(
                     i18n.translate('xpack.graph.missingWorkspaceErrorMessage', {
                       defaultMessage: 'Missing workspace',
                     })
                   );
                 })
-              : savedGraphWorkspaces.get();
+              : savedWorkspaceLoader.get();
           },
           indexPatterns: function() {
             return savedObjectsClient
@@ -300,7 +294,7 @@ export function initGraphApp(angularModule, deps) {
 
     // register things on scope passed down to react components
     $scope.pluginDataStart = npData;
-    $scope.storage = new Storage(window.localStorage);
+    $scope.storage = storage;
     $scope.coreStart = coreStart;
     $scope.loading = false;
     $scope.reduxStore = store;
diff --git a/x-pack/legacy/plugins/graph/public/application.ts b/x-pack/legacy/plugins/graph/public/application.ts
new file mode 100644
index 0000000000000..69bc789974632
--- /dev/null
+++ b/x-pack/legacy/plugins/graph/public/application.ts
@@ -0,0 +1,155 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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';
+
+// type imports
+import {
+  AppMountContext,
+  ChromeStart,
+  LegacyCoreStart,
+  SavedObjectsClientContract,
+  ToastsStart,
+  IUiSettingsClient,
+} from 'kibana/public';
+import {
+  configureAppAngularModule,
+  createTopNavDirective,
+  createTopNavHelper,
+  confirmModalFactory,
+  addAppRedirectMessageToUrl,
+} from './legacy_imports';
+// @ts-ignore
+import { initGraphApp } from './app';
+import {
+  Plugin as DataPlugin,
+  IndexPatternsContract,
+} from '../../../../../src/plugins/data/public';
+import { LicensingPluginSetup } from '../../../../plugins/licensing/public';
+import { checkLicense } from '../../../../plugins/graph/common/check_license';
+import { NavigationPublicPluginStart as NavigationStart } from '../../../../../src/plugins/navigation/public';
+import { createSavedWorkspacesLoader } from './services/persistence/saved_workspace_loader';
+import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+
+/**
+ * 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 {
+  element: HTMLElement;
+  appBasePath: string;
+  capabilities: Record<string, boolean | Record<string, boolean>>;
+  coreStart: AppMountContext['core'];
+  navigation: NavigationStart;
+  licensing: LicensingPluginSetup;
+  chrome: ChromeStart;
+  config: IUiSettingsClient;
+  toastNotifications: ToastsStart;
+  indexPatterns: IndexPatternsContract;
+  npData: ReturnType<DataPlugin['start']>;
+  savedObjectsClient: SavedObjectsClientContract;
+  addBasePath: (url: string) => string;
+  getBasePath: () => string;
+  storage: Storage;
+  canEditDrillDownUrls: boolean;
+  graphSavePolicy: string;
+}
+
+export const renderApp = ({ appBasePath, element, ...deps }: GraphDependencies) => {
+  const graphAngularModule = createLocalAngularModule(deps.navigation);
+  configureAppAngularModule(graphAngularModule, deps.coreStart as LegacyCoreStart, true);
+
+  const licenseSubscription = deps.licensing.license$.subscribe(license => {
+    const info = checkLicense(license);
+    const licenseAllowsToShowThisPage = info.showAppLink && info.enableAppLink;
+
+    if (!licenseAllowsToShowThisPage) {
+      const newUrl = addAppRedirectMessageToUrl(deps.addBasePath('/app/kibana'), info.message);
+      window.location.href = newUrl;
+    }
+  });
+
+  const savedWorkspaceLoader = createSavedWorkspacesLoader({
+    chrome: deps.coreStart.chrome,
+    indexPatterns: deps.npData.indexPatterns,
+    overlays: deps.coreStart.overlays,
+    savedObjectsClient: deps.coreStart.savedObjects.client,
+    basePath: deps.coreStart.http.basePath,
+  });
+
+  initGraphApp(graphAngularModule, { ...deps, savedWorkspaceLoader });
+  const $injector = mountGraphApp(appBasePath, element);
+  return () => {
+    licenseSubscription.unsubscribe();
+    $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(navigation: NavigationStart) {
+  createLocalI18nModule();
+  createLocalTopNavModule(navigation);
+  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(navigation: NavigationStart) {
+  angular
+    .module('graphTopNav', ['react'])
+    .directive('kbnTopNav', createTopNavDirective)
+    .directive('kbnTopNavHelper', createTopNavHelper(navigation.ui));
+}
+
+function createLocalI18nModule() {
+  angular
+    .module('graphI18n', [])
+    .provider('i18n', I18nProvider)
+    .filter('i18n', i18nFilter)
+    .directive('i18nId', i18nDirective);
+}
diff --git a/x-pack/legacy/plugins/graph/public/components/field_manager/field_editor.tsx b/x-pack/legacy/plugins/graph/public/components/field_manager/field_editor.tsx
index 5ece430e60c26..6152f33350917 100644
--- a/x-pack/legacy/plugins/graph/public/components/field_manager/field_editor.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/field_manager/field_editor.tsx
@@ -12,7 +12,6 @@ import {
   EuiComboBox,
   EuiColorPicker,
   EuiFieldNumber,
-  // @ts-ignore
   EuiHighlight,
   EuiContextMenu,
   EuiIcon,
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 9dec725a7a2a1..360561df71957 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
@@ -9,8 +9,7 @@ import { SearchBar, OuterSearchBarProps } from './search_bar';
 import React, { ReactElement } from 'react';
 import { CoreStart } from 'src/core/public';
 import { act } from 'react-dom/test-utils';
-import { IndexPattern } from 'src/legacy/core_plugins/data/public';
-import { QueryStringInput } from '../../../../../../src/plugins/data/public';
+import { IndexPattern, QueryStringInput } from '../../../../../../src/plugins/data/public';
 
 import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { I18nProvider } from '@kbn/i18n/react';
diff --git a/x-pack/legacy/plugins/graph/public/components/search_bar.tsx b/x-pack/legacy/plugins/graph/public/components/search_bar.tsx
index 83686d6e8f416..c7c5830cadfe1 100644
--- a/x-pack/legacy/plugins/graph/public/components/search_bar.tsx
+++ b/x-pack/legacy/plugins/graph/public/components/search_bar.tsx
@@ -10,7 +10,6 @@ import React, { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { connect } from 'react-redux';
 import { IndexPatternSavedObject, IndexPatternProvider } from '../types';
-import { IndexPattern } from '../../../../../../src/legacy/core_plugins/data/public';
 import { openSourceModal } from '../services/source_modal';
 import {
   GraphState,
@@ -21,6 +20,7 @@ import {
 
 import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import {
+  IndexPattern,
   QueryStringInput,
   IDataPluginServices,
   Query,
diff --git a/x-pack/legacy/plugins/graph/public/index.ts b/x-pack/legacy/plugins/graph/public/index.ts
index 995e261a5c7a7..d9854acb9332c 100644
--- a/x-pack/legacy/plugins/graph/public/index.ts
+++ b/x-pack/legacy/plugins/graph/public/index.ts
@@ -4,41 +4,10 @@
  * 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/savedObjectTypes';
-import 'uiExports/autocompleteProviders';
-import 'ui/autoload/all';
-import chrome from 'ui/chrome';
-import { IPrivate } from 'ui/private';
-// @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 { LicensingPluginSetup } from '../../../../plugins/licensing/public';
 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),
-  };
-}
-
 type XpackNpSetupDeps = typeof npSetup.plugins & {
   licensing: LicensingPluginSetup;
 };
@@ -46,16 +15,10 @@ type XpackNpSetupDeps = typeof npSetup.plugins & {
 (async () => {
   const instance = new GraphPlugin();
   instance.setup(npSetup.core, {
-    __LEGACY: {
-      Storage,
-    },
     ...(npSetup.plugins as XpackNpSetupDeps),
   });
   instance.start(npStart.core, {
     npData: npStart.plugins.data,
     navigation: npStart.plugins.navigation,
-    __LEGACY: {
-      angularDependencies: await getAngularInjectedDependencies(),
-    },
   });
 })();
diff --git a/x-pack/legacy/plugins/graph/public/legacy_imports.ts b/x-pack/legacy/plugins/graph/public/legacy_imports.ts
new file mode 100644
index 0000000000000..7ea2cf6dd901b
--- /dev/null
+++ b/x-pack/legacy/plugins/graph/public/legacy_imports.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 'ui/angular-bootstrap';
+import 'ace';
+
+export { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
+export { configureAppAngularModule } from 'ui/legacy_compat';
+// @ts-ignore
+export { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_top_nav';
+// @ts-ignore
+export { confirmModalFactory } from 'ui/modals/confirm_modal';
+// @ts-ignore
+export { addAppRedirectMessageToUrl } from 'ui/notify';
+export { SaveResult } from 'ui/saved_objects/show_saved_object_save_modal';
+export { createSavedObjectClass } from 'ui/saved_objects/saved_object';
+export { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
diff --git a/x-pack/legacy/plugins/graph/public/plugin.ts b/x-pack/legacy/plugins/graph/public/plugin.ts
index f30742f2c00d2..ab610d76be101 100644
--- a/x-pack/legacy/plugins/graph/public/plugin.ts
+++ b/x-pack/legacy/plugins/graph/public/plugin.ts
@@ -7,7 +7,7 @@
 // NP type imports
 import { CoreSetup, CoreStart, Plugin, SavedObjectsClientContract } from 'src/core/public';
 import { Plugin as DataPlugin } from 'src/plugins/data/public';
-import { LegacyAngularInjectedDependencies } from './render_app';
+import { Storage } from '../../../../../src/plugins/kibana_utils/public';
 import { LicensingPluginSetup } from '../../../../plugins/licensing/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../src/plugins/navigation/public';
 
@@ -17,30 +17,20 @@ export interface GraphPluginStartDependencies {
 }
 
 export interface GraphPluginSetupDependencies {
-  __LEGACY: {
-    Storage: any;
-  };
   licensing: LicensingPluginSetup;
 }
 
-export interface GraphPluginStartDependencies {
-  __LEGACY: {
-    angularDependencies: LegacyAngularInjectedDependencies;
-  };
-}
-
 export class GraphPlugin implements Plugin {
   private navigationStart: NavigationStart | null = null;
   private npDataStart: ReturnType<DataPlugin['start']> | null = null;
   private savedObjectsClient: SavedObjectsClientContract | null = null;
-  private angularDependencies: LegacyAngularInjectedDependencies | null = null;
 
-  setup(core: CoreSetup, { __LEGACY: { Storage }, licensing }: GraphPluginSetupDependencies) {
+  setup(core: CoreSetup, { licensing }: GraphPluginSetupDependencies) {
     core.application.register({
       id: 'graph',
       title: 'Graph',
       mount: async ({ core: contextCore }, params) => {
-        const { renderApp } = await import('./render_app');
+        const { renderApp } = await import('./application');
         return renderApp({
           ...params,
           licensing,
@@ -53,26 +43,21 @@ export class GraphPlugin implements Plugin {
             'canEditDrillDownUrls'
           ) as boolean,
           graphSavePolicy: core.injectedMetadata.getInjectedVar('graphSavePolicy') as string,
-          Storage,
+          storage: new Storage(window.localStorage),
           capabilities: contextCore.application.capabilities.graph,
           coreStart: contextCore,
           chrome: contextCore.chrome,
           config: contextCore.uiSettings,
           toastNotifications: contextCore.notifications.toasts,
           indexPatterns: this.npDataStart!.indexPatterns,
-          ...this.angularDependencies!,
         });
       },
     });
   }
 
-  start(
-    core: CoreStart,
-    { npData, navigation, __LEGACY: { angularDependencies } }: GraphPluginStartDependencies
-  ) {
+  start(core: CoreStart, { npData, navigation }: GraphPluginStartDependencies) {
     this.navigationStart = navigation;
     this.npDataStart = npData;
-    this.angularDependencies = angularDependencies;
     this.savedObjectsClient = core.savedObjects.client;
   }
 
diff --git a/x-pack/legacy/plugins/graph/public/render_app.ts b/x-pack/legacy/plugins/graph/public/render_app.ts
deleted file mode 100644
index e892643cf8031..0000000000000
--- a/x-pack/legacy/plugins/graph/public/render_app.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 { 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';
-// @ts-ignore
-import { addAppRedirectMessageToUrl } from 'ui/notify';
-
-// type imports
-import {
-  AppMountContext,
-  ChromeStart,
-  LegacyCoreStart,
-  SavedObjectsClientContract,
-  ToastsStart,
-  IUiSettingsClient,
-} from 'kibana/public';
-// @ts-ignore
-import { initGraphApp } from './app';
-import {
-  Plugin as DataPlugin,
-  IndexPatternsContract,
-} from '../../../../../src/plugins/data/public';
-import { LicensingPluginSetup } from '../../../../plugins/licensing/public';
-import { checkLicense } from '../../../../plugins/graph/common/check_license';
-import { NavigationPublicPluginStart as NavigationStart } from '../../../../../src/plugins/navigation/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'];
-  navigation: NavigationStart;
-  licensing: LicensingPluginSetup;
-  chrome: ChromeStart;
-  config: IUiSettingsClient;
-  toastNotifications: ToastsStart;
-  indexPatterns: IndexPatternsContract;
-  npData: ReturnType<DataPlugin['start']>;
-  savedObjectsClient: SavedObjectsClientContract;
-  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.navigation);
-  configureAppAngularModule(graphAngularModule, deps.coreStart as LegacyCoreStart, true);
-
-  const licenseSubscription = deps.licensing.license$.subscribe(license => {
-    const info = checkLicense(license);
-    const licenseAllowsToShowThisPage = info.showAppLink && info.enableAppLink;
-
-    if (!licenseAllowsToShowThisPage) {
-      const newUrl = addAppRedirectMessageToUrl(deps.addBasePath(deps.kbnBaseUrl), info.message);
-      window.location.href = newUrl;
-    }
-  });
-
-  initGraphApp(graphAngularModule, deps);
-  const $injector = mountGraphApp(appBasePath, element);
-  return () => {
-    licenseSubscription.unsubscribe();
-    $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(navigation: NavigationStart) {
-  createLocalI18nModule();
-  createLocalTopNavModule(navigation);
-  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(navigation: NavigationStart) {
-  angular
-    .module('graphTopNav', ['react'])
-    .directive('kbnTopNav', createTopNavDirective)
-    .directive('kbnTopNavHelper', createTopNavHelper(navigation.ui));
-}
-
-function createLocalI18nModule() {
-  angular
-    .module('graphI18n', [])
-    .provider('i18n', I18nProvider)
-    .filter('i18n', i18nFilter)
-    .directive('i18nId', i18nDirective);
-}
diff --git a/x-pack/legacy/plugins/graph/public/services/index_pattern_cache.ts b/x-pack/legacy/plugins/graph/public/services/index_pattern_cache.ts
index e4e02f860db14..9bbda0b551193 100644
--- a/x-pack/legacy/plugins/graph/public/services/index_pattern_cache.ts
+++ b/x-pack/legacy/plugins/graph/public/services/index_pattern_cache.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexPattern } from 'src/legacy/core_plugins/data/public';
 import { IndexPatternProvider } from '../types';
+import { IndexPattern } from '../../../../../../src/plugins/data/public';
 
 export function createCachedIndexPatternProvider(
   indexPatternGetter: (id: string) => Promise<IndexPattern>
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 c7f8b72cc1abf..d38c950a5986f 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
@@ -6,9 +6,9 @@
 
 import { GraphWorkspaceSavedObject, Workspace } from '../../types';
 import { savedWorkspaceToAppState } from './deserialize';
-import { IndexPattern } from 'src/legacy/core_plugins/data/public';
 import { createWorkspace } from '../../angular/graph_client_workspace';
 import { outlinkEncoders } from '../../helpers/outlink_encoders';
+import { IndexPattern } from '../../../../../../../src/plugins/data/public';
 
 describe('deserialize', () => {
   let savedWorkspace: GraphWorkspaceSavedObject;
diff --git a/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.ts b/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.ts
index 9a13da65e976a..af34b4f1a725b 100644
--- a/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/deserialize.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexPattern } from 'src/legacy/core_plugins/data/public/';
 import {
   SerializedNode,
   UrlTemplate,
@@ -25,6 +24,7 @@ import {
   colorChoices,
   iconChoicesByClass,
 } from '../../helpers/style_choices';
+import { IndexPattern } from '../../../../../../../src/plugins/data/public';
 
 const defaultAdvancedSettings: AdvancedSettings = {
   useSignificance: true,
diff --git a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace.ts b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace.ts
similarity index 93%
rename from x-pack/legacy/plugins/graph/public/angular/services/saved_workspace.ts
rename to x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace.ts
index bcde72a02f02e..d25fcc89d6a1f 100644
--- a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace.ts
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace.ts
@@ -3,10 +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 { SavedObject, SavedObjectKibanaServices } from 'ui/saved_objects/types';
-import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
 import { i18n } from '@kbn/i18n';
 import { extractReferences, injectReferences } from './saved_workspace_references';
+import {
+  createSavedObjectClass,
+  SavedObject,
+  SavedObjectKibanaServices,
+} from '../../legacy_imports';
 
 export interface SavedWorkspace extends SavedObject {
   wsState?: string;
diff --git a/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_loader.ts b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_loader.ts
new file mode 100644
index 0000000000000..8ddff0be0d06d
--- /dev/null
+++ b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_loader.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.
+ */
+
+import { IBasePath } from 'kibana/public';
+import { i18n } from '@kbn/i18n';
+
+import { createSavedWorkspaceClass } from './saved_workspace';
+import { SavedObjectKibanaServices } from '../../legacy_imports';
+
+export function createSavedWorkspacesLoader(
+  services: SavedObjectKibanaServices & { basePath: IBasePath }
+) {
+  const { savedObjectsClient, basePath } = services;
+  const SavedWorkspace = createSavedWorkspaceClass(services);
+  const urlFor = (id: string) =>
+    basePath.prepend(`/app/graph#/workspace/${encodeURIComponent(id)}`);
+  const mapHits = (hit: { id: string; attributes: Record<string, unknown> }) => {
+    const source = hit.attributes;
+    source.id = hit.id;
+    source.url = urlFor(hit.id);
+    source.icon = 'fa-share-alt'; // looks like a graph
+    return source;
+  };
+
+  return {
+    type: SavedWorkspace.type,
+    Class: SavedWorkspace,
+    loaderProperties: {
+      name: 'Graph workspace',
+      noun: i18n.translate('xpack.graph.savedWorkspaces.graphWorkspaceLabel', {
+        defaultMessage: 'Graph workspace',
+      }),
+      nouns: i18n.translate('xpack.graph.savedWorkspaces.graphWorkspacesLabel', {
+        defaultMessage: 'Graph workspaces',
+      }),
+    },
+    // Returns a single dashboard by ID, should be the name of the workspace
+    get: (id: string) => {
+      // Returns a promise that contains a workspace which is a subclass of docSource
+      // @ts-ignore
+      return new SavedWorkspace(id).init();
+    },
+    urlFor,
+    delete: (ids: string | string[]) => {
+      const idArr = Array.isArray(ids) ? ids : [ids];
+      return Promise.all(
+        idArr.map((id: string) => savedObjectsClient.delete(SavedWorkspace.type, id))
+      );
+    },
+    find: (searchString: string, size: number = 100) => {
+      return savedObjectsClient
+        .find({
+          type: SavedWorkspace.type,
+          search: searchString ? `${searchString}*` : undefined,
+          perPage: size,
+          searchFields: ['title^3', 'description'],
+        })
+        .then(resp => {
+          return {
+            total: resp.total,
+            hits: resp.savedObjects.map(hit => mapHits(hit)),
+          };
+        });
+    },
+  };
+}
diff --git a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace_references.test.ts b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_references.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/graph/public/angular/services/saved_workspace_references.test.ts
rename to x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_references.test.ts
diff --git a/x-pack/legacy/plugins/graph/public/angular/services/saved_workspace_references.ts b/x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_references.ts
similarity index 100%
rename from x-pack/legacy/plugins/graph/public/angular/services/saved_workspace_references.ts
rename to x-pack/legacy/plugins/graph/public/services/persistence/saved_workspace_references.ts
diff --git a/x-pack/legacy/plugins/graph/public/services/save_modal.tsx b/x-pack/legacy/plugins/graph/public/services/save_modal.tsx
index 5930d2283b7c0..d949ac1d4a600 100644
--- a/x-pack/legacy/plugins/graph/public/services/save_modal.tsx
+++ b/x-pack/legacy/plugins/graph/public/services/save_modal.tsx
@@ -5,9 +5,9 @@
  */
 
 import React from 'react';
-import { SaveResult } from 'ui/saved_objects/show_saved_object_save_modal';
 import { GraphWorkspaceSavedObject, GraphSavePolicy } from '../types';
 import { SaveModal, OnSaveGraphProps } from '../components/save_modal';
+import { SaveResult } from '../legacy_imports';
 
 export type SaveWorkspaceHandler = (
   saveOptions: {
diff --git a/x-pack/legacy/plugins/graph/public/state_management/datasource.sagas.ts b/x-pack/legacy/plugins/graph/public/state_management/datasource.sagas.ts
index 7afea3d2a765a..34d39e71dec55 100644
--- a/x-pack/legacy/plugins/graph/public/state_management/datasource.sagas.ts
+++ b/x-pack/legacy/plugins/graph/public/state_management/datasource.sagas.ts
@@ -6,7 +6,6 @@
 
 import { takeLatest, put, call, select } from 'redux-saga/effects';
 import { i18n } from '@kbn/i18n';
-import { IndexPattern } from 'src/legacy/core_plugins/data/public';
 import { Action } from 'typescript-fsa';
 import { GraphStoreDependencies } from './store';
 import { loadFields } from './fields';
@@ -18,6 +17,7 @@ import {
   setDatasource,
   requestDatasource,
 } from './datasource';
+import { IndexPattern } from '../../../../../../src/plugins/data/public';
 
 /**
  * Saga loading field information when the datasource is switched. This will overwrite current settings
diff --git a/x-pack/legacy/plugins/graph/public/state_management/datasource.test.ts b/x-pack/legacy/plugins/graph/public/state_management/datasource.test.ts
index 7e51e463f9f61..041098a9aaae5 100644
--- a/x-pack/legacy/plugins/graph/public/state_management/datasource.test.ts
+++ b/x-pack/legacy/plugins/graph/public/state_management/datasource.test.ts
@@ -10,7 +10,7 @@ import { datasourceSelector, requestDatasource } from './datasource';
 import { datasourceSaga } from './datasource.sagas';
 import { fieldsSelector } from './fields';
 import { updateSettings } from './advanced_settings';
-import { IndexPattern } from 'src/legacy/core_plugins/data/public';
+import { IndexPattern } from '../../../../../../src/plugins/data/public';
 
 const waitForPromise = () => new Promise(r => setTimeout(r));
 
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 9672edef31d6f..5a4f0d033aa42 100644
--- a/x-pack/legacy/plugins/graph/public/state_management/mocks.ts
+++ b/x-pack/legacy/plugins/graph/public/state_management/mocks.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-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';
+import { IndexPattern } from '../../../../../../src/plugins/data/public';
 
 jest.mock('ui/new_platform');
 
diff --git a/x-pack/legacy/plugins/graph/public/types/app_state.ts b/x-pack/legacy/plugins/graph/public/types/app_state.ts
index 24b1876bb713f..eef8060f07f5c 100644
--- a/x-pack/legacy/plugins/graph/public/types/app_state.ts
+++ b/x-pack/legacy/plugins/graph/public/types/app_state.ts
@@ -5,9 +5,9 @@
  */
 
 import { SimpleSavedObject } from 'src/core/public';
-import { IndexPattern } from 'src/legacy/core_plugins/data/public';
 import { FontawesomeIcon } from '../helpers/style_choices';
 import { OutlinkEncoder } from '../helpers/outlink_encoders';
+import { IndexPattern } from '../../../../../../src/plugins/data/public';
 
 export interface UrlTemplate {
   url: string;
diff --git a/x-pack/legacy/plugins/graph/public/types/persistence.ts b/x-pack/legacy/plugins/graph/public/types/persistence.ts
index 7883e81fb9b8e..7fc5e15d9ea72 100644
--- a/x-pack/legacy/plugins/graph/public/types/persistence.ts
+++ b/x-pack/legacy/plugins/graph/public/types/persistence.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObject } from 'ui/saved_objects/types';
 import { AdvancedSettings, UrlTemplate, WorkspaceField } from './app_state';
 import { WorkspaceNode, WorkspaceEdge } from './workspace_state';
+import { SavedObject } from '../legacy_imports';
 
 type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
 
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap b/x-pack/legacy/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap
index a7cc8843140c8..bd42346e36135 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap
+++ b/x-pack/legacy/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap
@@ -263,16 +263,18 @@ exports[`ilm summary extension should return extension when index has lifecycle
           type="cross"
         >
           <EuiIconEmpty
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiCallOutHeader__icon"
             focusable="false"
+            role="img"
             style={null}
           >
             <svg
-              aria-hidden="true"
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiCallOutHeader__icon"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap b/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap
index dcd0a30c98ab1..0f24674720e56 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap
+++ b/x-pack/legacy/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap
@@ -60,9 +60,11 @@ exports[`policy table should show empty state when there are not any policies 1`
         class="euiEmptyPrompt"
       >
         <svg
+          aria-hidden="true"
           class="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoading"
           focusable="false"
           height="16"
+          role="img"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
@@ -109,6 +111,7 @@ exports[`policy table should show empty state when there are not any policies 1`
               class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
               focusable="false"
               height="16"
+              role="img"
               viewBox="0 0 16 16"
               width="16"
               xmlns="http://www.w3.org/2000/svg"
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/node_attrs_details/node_attrs_details.js b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/node_attrs_details/node_attrs_details.js
index dbf1cf9e61882..67bc8f0386abf 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/node_attrs_details/node_attrs_details.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/node_attrs_details/node_attrs_details.js
@@ -49,7 +49,7 @@ export class NodeAttrsDetails extends PureComponent {
             </EuiTitle>
             <EuiSpacer size="s" />
             <EuiInMemoryTable
-              items={details}
+              items={details || []}
               columns={[
                 {
                   field: 'nodeId',
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/__tests__/check_license.js b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/__tests__/check_license.js
index 4e57bd77578e3..933fda01c055d 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/__tests__/check_license.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/__tests__/check_license.js
@@ -58,7 +58,7 @@ describe('check_license', function() {
       set(mockLicenseInfo, 'license.getType', () => 'basic');
     });
 
-    describe('& license is trial, standard, gold, platinum', () => {
+    describe('& license is > basic', () => {
       beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true));
 
       describe('& license is active', () => {
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/check_license.js b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/check_license.js
index 7df956af98c7b..e71820a346f91 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/check_license.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/server/lib/check_license/check_license.js
@@ -22,7 +22,7 @@ export function checkLicense(xpackLicenseInfo) {
     };
   }
 
-  const VALID_LICENSE_MODES = ['trial', 'basic', 'standard', 'gold', 'platinum'];
+  const VALID_LICENSE_MODES = ['basic', 'standard', 'gold', 'platinum', 'enterprise', 'trial'];
 
   const isLicenseModeValid = xpackLicenseInfo.license.isOneOf(VALID_LICENSE_MODES);
   const isLicenseActive = xpackLicenseInfo.license.isActive();
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 8f2d3978a6780..09172bf5cd0ca 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
@@ -163,6 +163,10 @@ export const StepReview: React.FunctionComponent<StepProps> = ({ template, updat
     const templateString = JSON.stringify(serializedTemplate, null, 2);
     const request = `${endpoint}\n${templateString}`;
 
+    // Beyond a certain point, highlighting the syntax will bog down performance to unacceptable
+    // levels. This way we prevent that happening for very large requests.
+    const language = request.length < 60000 ? 'json' : undefined;
+
     return (
       <div data-test-subj="requestTab">
         <EuiSpacer size="m" />
@@ -178,7 +182,7 @@ export const StepReview: React.FunctionComponent<StepProps> = ({ template, updat
 
         <EuiSpacer size="m" />
 
-        <EuiCodeBlock language="json" isCopyable>
+        <EuiCodeBlock language={language} isCopyable>
           {request}
         </EuiCodeBlock>
       </div>
diff --git a/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_table/template_table.tsx b/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_table/template_table.tsx
index 2faae50bdb489..6070b25fb1ca2 100644
--- a/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_table/template_table.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/sections/home/template_list/template_table/template_table.tsx
@@ -7,7 +7,7 @@
 import React, { useState, Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiInMemoryTable, EuiIcon, EuiButton, EuiLink } from '@elastic/eui';
+import { EuiInMemoryTable, EuiIcon, EuiButton, EuiLink, EuiBasicTableColumn } from '@elastic/eui';
 import { TemplateListItem, Template } from '../../../../../../common/types';
 import { BASE_PATH, UIM_TEMPLATE_SHOW_DETAILS_CLICK } from '../../../../../../common/constants';
 import { TemplateDeleteModal } from '../../../../components';
@@ -31,7 +31,7 @@ export const TemplateTable: React.FunctionComponent<Props> = ({
   const [selection, setSelection] = useState<TemplateListItem[]>([]);
   const [templatesToDelete, setTemplatesToDelete] = useState<Array<TemplateListItem['name']>>([]);
 
-  const columns = [
+  const columns: Array<EuiBasicTableColumn<TemplateListItem>> = [
     {
       field: 'name',
       name: i18n.translate('xpack.idxMgmt.templateList.table.nameColumnTitle', {
@@ -138,6 +138,7 @@ export const TemplateTable: React.FunctionComponent<Props> = ({
           enabled: ({ isManaged }: Template) => !isManaged,
         },
         {
+          type: 'icon',
           name: i18n.translate('xpack.idxMgmt.templateList.table.actionCloneTitle', {
             defaultMessage: 'Clone',
           }),
@@ -179,7 +180,7 @@ export const TemplateTable: React.FunctionComponent<Props> = ({
       field: 'name',
       direction: 'asc',
     },
-  };
+  } as const;
 
   const selectionConfig = {
     onSelectionChange: setSelection,
@@ -190,6 +191,7 @@ export const TemplateTable: React.FunctionComponent<Props> = ({
           defaultMessage: 'You cannot delete a managed template.',
         });
       }
+      return '';
     },
   };
 
diff --git a/x-pack/legacy/plugins/index_management/public/app/services/http.ts b/x-pack/legacy/plugins/index_management/public/app/services/http.ts
index d88bd52405495..34f5abe5983cc 100644
--- a/x-pack/legacy/plugins/index_management/public/app/services/http.ts
+++ b/x-pack/legacy/plugins/index_management/public/app/services/http.ts
@@ -4,16 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { HttpServiceBase } from '../../../../../../../src/core/public';
+import { HttpSetup } from '../../../../../../../src/core/public';
 
 class HttpService {
   private client: any;
 
-  public init(httpClient: HttpServiceBase): void {
+  public init(httpClient: HttpSetup): void {
     this.client = httpClient;
   }
 
-  public get httpClient(): HttpServiceBase {
+  public get httpClient(): HttpSetup {
     return this.client;
   }
 }
diff --git a/x-pack/legacy/plugins/infra/common/ecs_allowed_list.ts b/x-pack/legacy/plugins/infra/common/ecs_allowed_list.ts
index 1728cd1fa4b45..f1d0577b4cb19 100644
--- a/x-pack/legacy/plugins/infra/common/ecs_allowed_list.ts
+++ b/x-pack/legacy/plugins/infra/common/ecs_allowed_list.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 { first } from 'lodash';
+import { first, memoize } from 'lodash';
 
 export const ECS_ALLOWED_LIST = [
   'host',
@@ -46,8 +46,9 @@ export const DOCKER_ALLOWED_LIST = [
 ];
 
 export const AWS_S3_ALLOWED_LIST = ['aws.s3'];
+export const AWS_METRICS_ALLOWED_LIST = ['aws.cloudwatch'];
 
-export const getAllowedListForPrefix = (prefix: string) => {
+export const getAllowedListForPrefix = memoize((prefix: string) => {
   const firstPart = first(prefix.split(/\./));
   const defaultAllowedList = prefix ? [...ECS_ALLOWED_LIST, prefix] : ECS_ALLOWED_LIST;
   switch (firstPart) {
@@ -61,7 +62,10 @@ export const getAllowedListForPrefix = (prefix: string) => {
       if (prefix === 'aws.s3_daily_storage') {
         return [...defaultAllowedList, ...AWS_S3_ALLOWED_LIST];
       }
+      if (prefix === 'aws.metrics') {
+        return [...defaultAllowedList, ...AWS_METRICS_ALLOWED_LIST];
+      }
     default:
       return defaultAllowedList;
   }
-};
+});
diff --git a/x-pack/legacy/plugins/infra/common/graphql/types.ts b/x-pack/legacy/plugins/infra/common/graphql/types.ts
index 0520409800bce..bb089bf8bf8ad 100644
--- a/x-pack/legacy/plugins/infra/common/graphql/types.ts
+++ b/x-pack/legacy/plugins/infra/common/graphql/types.ts
@@ -34,12 +34,7 @@ export interface InfraSource {
   logEntriesBetween: InfraLogEntryInterval;
   /** Sequences of log entries matching sets of highlighting queries within an interval */
   logEntryHighlights: InfraLogEntryInterval[];
-  /** A consecutive span of summary buckets within an interval */
-  logSummaryBetween: InfraLogSummaryInterval;
-  /** Spans of summary highlight buckets within an interval */
-  logSummaryHighlightsBetween: InfraLogSummaryHighlightInterval[];
 
-  logItem: InfraLogItem;
   /** A snapshot of nodes */
   snapshot?: InfraSnapshotResponse | null;
 
@@ -208,68 +203,6 @@ export interface InfraLogEntryFieldColumn {
   /** A list of highlighted substrings of the value */
   highlights: string[];
 }
-/** A consecutive sequence of log summary buckets */
-export interface InfraLogSummaryInterval {
-  /** The millisecond timestamp corresponding to the start of the interval covered by the summary */
-  start?: number | null;
-  /** The millisecond timestamp corresponding to the end of the interval covered by the summary */
-  end?: number | null;
-  /** The query the log entries were filtered by */
-  filterQuery?: string | null;
-  /** A list of the log entries */
-  buckets: InfraLogSummaryBucket[];
-}
-/** A log summary bucket */
-export interface InfraLogSummaryBucket {
-  /** The start timestamp of the bucket */
-  start: number;
-  /** The end timestamp of the bucket */
-  end: number;
-  /** The number of entries inside the bucket */
-  entriesCount: number;
-}
-/** A consecutive sequence of log summary highlight buckets */
-export interface InfraLogSummaryHighlightInterval {
-  /** The millisecond timestamp corresponding to the start of the interval covered by the summary */
-  start?: number | null;
-  /** The millisecond timestamp corresponding to the end of the interval covered by the summary */
-  end?: number | null;
-  /** The query the log entries were filtered by */
-  filterQuery?: string | null;
-  /** The query the log entries were highlighted with */
-  highlightQuery?: string | null;
-  /** A list of the log entries */
-  buckets: InfraLogSummaryHighlightBucket[];
-}
-/** A log summary highlight bucket */
-export interface InfraLogSummaryHighlightBucket {
-  /** The start timestamp of the bucket */
-  start: number;
-  /** The end timestamp of the bucket */
-  end: number;
-  /** The number of highlighted entries inside the bucket */
-  entriesCount: number;
-  /** The time key of a representative of the highlighted log entries in this bucket */
-  representativeKey: InfraTimeKey;
-}
-
-export interface InfraLogItem {
-  /** The ID of the document */
-  id: string;
-  /** The index where the document was found */
-  index: string;
-  /** Time key for the document - derived from the source configuration timestamp and tiebreaker settings */
-  key: InfraTimeKey;
-  /** An array of flattened fields and values */
-  fields: InfraLogItemField[];
-}
-
-export interface InfraLogItemField {
-  /** The flattened field name */
-  field: string;
-  /** The value for the Field as a string */
-  value: string;
-}
 
 export interface InfraSnapshotResponse {
   /** Nodes of type host, container or pod grouped by 0, 1 or 2 terms */
@@ -472,31 +405,6 @@ export interface LogEntryHighlightsInfraSourceArgs {
   /** The highlighting to apply to the log entries */
   highlights: InfraLogEntryHighlightInput[];
 }
-export interface LogSummaryBetweenInfraSourceArgs {
-  /** The millisecond timestamp that corresponds to the start of the interval */
-  start: number;
-  /** The millisecond timestamp that corresponds to the end of the interval */
-  end: number;
-  /** The size of each bucket in milliseconds */
-  bucketSize: number;
-  /** The query to filter the log entries by */
-  filterQuery?: string | null;
-}
-export interface LogSummaryHighlightsBetweenInfraSourceArgs {
-  /** The millisecond timestamp that corresponds to the start of the interval */
-  start: number;
-  /** The millisecond timestamp that corresponds to the end of the interval */
-  end: number;
-  /** The size of each bucket in milliseconds */
-  bucketSize: number;
-  /** The query to filter the log entries by */
-  filterQuery?: string | null;
-  /** The highlighting to apply to the log entries */
-  highlightQueries: string[];
-}
-export interface LogItemInfraSourceArgs {
-  id: string;
-}
 export interface SnapshotInfraSourceArgs {
   timerange: InfraTimerangeInput;
 
@@ -577,7 +485,7 @@ export enum InfraSnapshotMetricType {
   rdsQueriesExecuted = 'rdsQueriesExecuted',
   rdsActiveTransactions = 'rdsActiveTransactions',
   rdsLatency = 'rdsLatency',
-  sqsMessagesVisible = 'sqsOldestMessage',
+  sqsMessagesVisible = 'sqsMessagesVisible',
   sqsMessagesDelayed = 'sqsMessagesDelayed',
   sqsMessagesSent = 'sqsMessagesSent',
   sqsMessagesEmpty = 'sqsMessagesEmpty',
@@ -670,49 +578,6 @@ export type InfraLogMessageSegment = InfraLogMessageFieldSegment | InfraLogMessa
 // Documents
 // ====================================================
 
-export namespace FlyoutItemQuery {
-  export type Variables = {
-    sourceId: string;
-    itemId: string;
-  };
-
-  export type Query = {
-    __typename?: 'Query';
-
-    source: Source;
-  };
-
-  export type Source = {
-    __typename?: 'InfraSource';
-
-    id: string;
-
-    logItem: LogItem;
-  };
-
-  export type LogItem = {
-    __typename?: 'InfraLogItem';
-
-    id: string;
-
-    index: string;
-
-    key: Key;
-
-    fields: Fields[];
-  };
-
-  export type Key = InfraTimeKeyFields.Fragment;
-
-  export type Fields = {
-    __typename?: 'InfraLogItemField';
-
-    field: string;
-
-    value: string;
-  };
-}
-
 export namespace LogEntryHighlightsQuery {
   export type Variables = {
     sourceId?: string | null;
@@ -753,99 +618,6 @@ export namespace LogEntryHighlightsQuery {
   export type Entries = InfraLogEntryHighlightFields.Fragment;
 }
 
-export namespace LogSummaryHighlightsQuery {
-  export type Variables = {
-    sourceId?: string | null;
-    start: number;
-    end: number;
-    bucketSize: number;
-    highlightQueries: string[];
-    filterQuery?: string | null;
-  };
-
-  export type Query = {
-    __typename?: 'Query';
-
-    source: Source;
-  };
-
-  export type Source = {
-    __typename?: 'InfraSource';
-
-    id: string;
-
-    logSummaryHighlightsBetween: LogSummaryHighlightsBetween[];
-  };
-
-  export type LogSummaryHighlightsBetween = {
-    __typename?: 'InfraLogSummaryHighlightInterval';
-
-    start?: number | null;
-
-    end?: number | null;
-
-    buckets: Buckets[];
-  };
-
-  export type Buckets = {
-    __typename?: 'InfraLogSummaryHighlightBucket';
-
-    start: number;
-
-    end: number;
-
-    entriesCount: number;
-
-    representativeKey: RepresentativeKey;
-  };
-
-  export type RepresentativeKey = InfraTimeKeyFields.Fragment;
-}
-
-export namespace LogSummary {
-  export type Variables = {
-    sourceId?: string | null;
-    start: number;
-    end: number;
-    bucketSize: number;
-    filterQuery?: string | null;
-  };
-
-  export type Query = {
-    __typename?: 'Query';
-
-    source: Source;
-  };
-
-  export type Source = {
-    __typename?: 'InfraSource';
-
-    id: string;
-
-    logSummaryBetween: LogSummaryBetween;
-  };
-
-  export type LogSummaryBetween = {
-    __typename?: 'InfraLogSummaryInterval';
-
-    start?: number | null;
-
-    end?: number | null;
-
-    buckets: Buckets[];
-  };
-
-  export type Buckets = {
-    __typename?: 'InfraLogSummaryBucket';
-
-    start: number;
-
-    end: number;
-
-    entriesCount: number;
-  };
-}
-
 export namespace MetricsQuery {
   export type Variables = {
     sourceId: string;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/index.ts b/x-pack/legacy/plugins/infra/common/http_api/index.ts
index 5278ae6c249c8..326daa93de33a 100644
--- a/x-pack/legacy/plugins/infra/common/http_api/index.ts
+++ b/x-pack/legacy/plugins/infra/common/http_api/index.ts
@@ -6,3 +6,5 @@
 
 export * from './log_analysis';
 export * from './metadata_api';
+export * from './log_entries';
+export * from './metrics_explorer';
diff --git a/x-pack/legacy/plugins/infra/common/http_api/inventory_meta_api.ts b/x-pack/legacy/plugins/infra/common/http_api/inventory_meta_api.ts
new file mode 100644
index 0000000000000..77de515c9cc46
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/inventory_meta_api.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+import { ItemTypeRT } from '../inventory_models/types';
+
+const CloudAccountRT = rt.type({
+  value: rt.string,
+  name: rt.string,
+});
+
+export const InventoryMetaResponseRT = rt.type({
+  accounts: rt.array(CloudAccountRT),
+  projects: rt.array(rt.string),
+  regions: rt.array(rt.string),
+});
+
+export const InventoryMetaRequestRT = rt.type({
+  sourceId: rt.string,
+  nodeType: ItemTypeRT,
+});
+
+export type InventoryMetaRequest = rt.TypeOf<typeof InventoryMetaRequestRT>;
+export type InventoryMetaResponse = rt.TypeOf<typeof InventoryMetaResponseRT>;
+export type InventoryCloudAccount = rt.TypeOf<typeof CloudAccountRT>;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_entries/common.ts b/x-pack/legacy/plugins/infra/common/http_api/log_entries/common.ts
new file mode 100644
index 0000000000000..0b31222322007
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_entries/common.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+
+export const logEntriesCursorRT = rt.type({
+  time: rt.number,
+  tiebreaker: rt.number,
+});
+export type LogEntriesCursor = rt.TypeOf<typeof logEntriesCursorRT>;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_entries/entries.ts b/x-pack/legacy/plugins/infra/common/http_api/log_entries/entries.ts
new file mode 100644
index 0000000000000..97bdad23beb24
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_entries/entries.ts
@@ -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 * as rt from 'io-ts';
+import { logEntriesCursorRT } from './common';
+
+export const LOG_ENTRIES_PATH = '/api/log_entries/entries';
+
+export const logEntriesBaseRequestRT = rt.intersection([
+  rt.type({
+    sourceId: rt.string,
+    startDate: rt.number,
+    endDate: rt.number,
+  }),
+  rt.partial({
+    query: rt.string,
+    size: rt.number,
+  }),
+]);
+
+export const logEntriesBeforeRequestRT = rt.intersection([
+  logEntriesBaseRequestRT,
+  rt.type({ before: rt.union([logEntriesCursorRT, rt.literal('last')]) }),
+]);
+
+export const logEntriesAfterRequestRT = rt.intersection([
+  logEntriesBaseRequestRT,
+  rt.type({ after: rt.union([logEntriesCursorRT, rt.literal('first')]) }),
+]);
+
+export const logEntriesCenteredRT = rt.intersection([
+  logEntriesBaseRequestRT,
+  rt.type({ center: logEntriesCursorRT }),
+]);
+
+export const logEntriesRequestRT = rt.union([
+  logEntriesBaseRequestRT,
+  logEntriesBeforeRequestRT,
+  logEntriesAfterRequestRT,
+  logEntriesCenteredRT,
+]);
+
+export type LogEntriesRequest = rt.TypeOf<typeof logEntriesRequestRT>;
+
+// JSON value
+const valueRT = rt.union([rt.string, rt.number, rt.boolean, rt.object, rt.null, rt.undefined]);
+
+export const logMessagePartRT = rt.union([
+  rt.type({
+    constant: rt.string,
+  }),
+  rt.type({
+    field: rt.string,
+    value: valueRT,
+    highlights: rt.array(rt.string),
+  }),
+]);
+
+export const logColumnRT = rt.union([
+  rt.type({ columnId: rt.string, timestamp: rt.number }),
+  rt.type({
+    columnId: rt.string,
+    field: rt.string,
+    value: rt.union([rt.string, rt.undefined]),
+    highlights: rt.array(rt.string),
+  }),
+  rt.type({
+    columnId: rt.string,
+    message: rt.array(logMessagePartRT),
+  }),
+]);
+
+export const logEntryRT = rt.type({
+  id: rt.string,
+  cursor: logEntriesCursorRT,
+  columns: rt.array(logColumnRT),
+});
+
+export type LogMessagepart = rt.TypeOf<typeof logMessagePartRT>;
+export type LogColumn = rt.TypeOf<typeof logColumnRT>;
+export type LogEntry = rt.TypeOf<typeof logEntryRT>;
+
+export const logEntriesResponseRT = rt.type({
+  data: rt.type({
+    entries: rt.array(logEntryRT),
+    topCursor: logEntriesCursorRT,
+    bottomCursor: logEntriesCursorRT,
+  }),
+});
+
+export type LogEntriesResponse = rt.TypeOf<typeof logEntriesResponseRT>;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_entries/highlights.ts b/x-pack/legacy/plugins/infra/common/http_api/log_entries/highlights.ts
new file mode 100644
index 0000000000000..516cd67f2764d
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_entries/highlights.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 * as rt from 'io-ts';
+import {
+  logEntriesBaseRequestRT,
+  logEntriesBeforeRequestRT,
+  logEntriesAfterRequestRT,
+  logEntriesCenteredRT,
+  logEntryRT,
+} from './entries';
+import { logEntriesCursorRT } from './common';
+
+export const LOG_ENTRIES_HIGHLIGHTS_PATH = '/api/log_entries/highlights';
+
+const highlightsRT = rt.type({
+  highlightTerms: rt.array(rt.string),
+});
+
+export const logEntriesHighlightsBaseRequestRT = rt.intersection([
+  logEntriesBaseRequestRT,
+  highlightsRT,
+]);
+
+export const logEntriesHighlightsBeforeRequestRT = rt.intersection([
+  logEntriesBeforeRequestRT,
+  highlightsRT,
+]);
+
+export const logEntriesHighlightsAfterRequestRT = rt.intersection([
+  logEntriesAfterRequestRT,
+  highlightsRT,
+]);
+
+export const logEntriesHighlightsCenteredRequestRT = rt.intersection([
+  logEntriesCenteredRT,
+  highlightsRT,
+]);
+
+export const logEntriesHighlightsRequestRT = rt.union([
+  logEntriesHighlightsBaseRequestRT,
+  logEntriesHighlightsBeforeRequestRT,
+  logEntriesHighlightsAfterRequestRT,
+  logEntriesHighlightsCenteredRequestRT,
+]);
+
+export type LogEntriesHighlightsRequest = rt.TypeOf<typeof logEntriesHighlightsRequestRT>;
+
+export const logEntriesHighlightsResponseRT = rt.type({
+  data: rt.array(
+    rt.type({
+      topCursor: logEntriesCursorRT,
+      bottomCursor: logEntriesCursorRT,
+      entries: rt.array(logEntryRT),
+    })
+  ),
+});
+
+export type LogEntriesHighlightsResponse = rt.TypeOf<typeof logEntriesHighlightsResponseRT>;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_entries/index.ts b/x-pack/legacy/plugins/infra/common/http_api/log_entries/index.ts
new file mode 100644
index 0000000000000..490f295cbff68
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_entries/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './common';
+export * from './entries';
+export * from './highlights';
+export * from './item';
+export * from './summary';
+export * from './summary_highlights';
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_entries/item.ts b/x-pack/legacy/plugins/infra/common/http_api/log_entries/item.ts
new file mode 100644
index 0000000000000..02335d68402c0
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_entries/item.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+import { logEntriesCursorRT } from './common';
+
+export const LOG_ENTRIES_ITEM_PATH = '/api/log_entries/item';
+
+export const logEntriesItemRequestRT = rt.type({
+  sourceId: rt.string,
+  id: rt.string,
+});
+
+export type LogEntriesItemRequest = rt.TypeOf<typeof logEntriesItemRequestRT>;
+
+const logEntriesItemFieldRT = rt.type({ field: rt.string, value: rt.string });
+const logEntriesItemRT = rt.type({
+  id: rt.string,
+  index: rt.string,
+  fields: rt.array(logEntriesItemFieldRT),
+  key: logEntriesCursorRT,
+});
+export const logEntriesItemResponseRT = rt.type({
+  data: logEntriesItemRT,
+});
+
+export type LogEntriesItemField = rt.TypeOf<typeof logEntriesItemFieldRT>;
+export type LogEntriesItem = rt.TypeOf<typeof logEntriesItemRT>;
+export type LogEntriesItemResponse = rt.TypeOf<typeof logEntriesItemResponseRT>;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_entries/summary.ts b/x-pack/legacy/plugins/infra/common/http_api/log_entries/summary.ts
new file mode 100644
index 0000000000000..4a2c0db0e995e
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_entries/summary.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 * as rt from 'io-ts';
+
+export const LOG_ENTRIES_SUMMARY_PATH = '/api/log_entries/summary';
+
+export const logEntriesSummaryRequestRT = rt.type({
+  sourceId: rt.string,
+  startDate: rt.number,
+  endDate: rt.number,
+  bucketSize: rt.number,
+  query: rt.union([rt.string, rt.undefined, rt.null]),
+});
+
+export type LogEntriesSummaryRequest = rt.TypeOf<typeof logEntriesSummaryRequestRT>;
+
+export const logEntriesSummaryBucketRT = rt.type({
+  start: rt.number,
+  end: rt.number,
+  entriesCount: rt.number,
+});
+
+export type LogEntriesSummaryBucket = rt.TypeOf<typeof logEntriesSummaryBucketRT>;
+
+export const logEntriesSummaryResponseRT = rt.type({
+  data: rt.type({
+    start: rt.number,
+    end: rt.number,
+    buckets: rt.array(logEntriesSummaryBucketRT),
+  }),
+});
+
+export type LogEntriesSummaryResponse = rt.TypeOf<typeof logEntriesSummaryResponseRT>;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/log_entries/summary_highlights.ts b/x-pack/legacy/plugins/infra/common/http_api/log_entries/summary_highlights.ts
new file mode 100644
index 0000000000000..30222cd71bbde
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/log_entries/summary_highlights.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 * as rt from 'io-ts';
+import { logEntriesSummaryRequestRT, logEntriesSummaryBucketRT } from './summary';
+import { logEntriesCursorRT } from './common';
+
+export const LOG_ENTRIES_SUMMARY_HIGHLIGHTS_PATH = '/api/log_entries/summary_highlights';
+
+export const logEntriesSummaryHighlightsRequestRT = rt.intersection([
+  logEntriesSummaryRequestRT,
+  rt.type({
+    highlightTerms: rt.array(rt.string),
+  }),
+]);
+
+export type LogEntriesSummaryHighlightsRequest = rt.TypeOf<
+  typeof logEntriesSummaryHighlightsRequestRT
+>;
+
+export const logEntriesSummaryHighlightsBucketRT = rt.intersection([
+  logEntriesSummaryBucketRT,
+  rt.type({
+    representativeKey: logEntriesCursorRT,
+  }),
+]);
+
+export type LogEntriesSummaryHighlightsBucket = rt.TypeOf<
+  typeof logEntriesSummaryHighlightsBucketRT
+>;
+
+export const logEntriesSummaryHighlightsResponseRT = rt.type({
+  data: rt.array(
+    rt.type({
+      start: rt.number,
+      end: rt.number,
+      buckets: rt.array(logEntriesSummaryHighlightsBucketRT),
+    })
+  ),
+});
+export type LogEntriesSummaryHighlightsResponse = rt.TypeOf<
+  typeof logEntriesSummaryHighlightsResponseRT
+>;
diff --git a/x-pack/legacy/plugins/infra/common/http_api/metrics_explorer/index.ts b/x-pack/legacy/plugins/infra/common/http_api/metrics_explorer/index.ts
new file mode 100644
index 0000000000000..c10f86c40ad46
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/http_api/metrics_explorer/index.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+
+export const METRIC_EXPLORER_AGGREGATIONS = [
+  'avg',
+  'max',
+  'min',
+  'cardinality',
+  'rate',
+  'count',
+] as const;
+
+type MetricExplorerAggregations = typeof METRIC_EXPLORER_AGGREGATIONS[number];
+
+const metricsExplorerAggregationKeys = METRIC_EXPLORER_AGGREGATIONS.reduce<
+  Record<MetricExplorerAggregations, null>
+>((acc, agg) => ({ ...acc, [agg]: null }), {} as Record<MetricExplorerAggregations, null>);
+
+export const metricsExplorerAggregationRT = rt.keyof(metricsExplorerAggregationKeys);
+
+export const metricsExplorerMetricRequiredFieldsRT = rt.type({
+  aggregation: metricsExplorerAggregationRT,
+});
+
+export const metricsExplorerMetricOptionalFieldsRT = rt.partial({
+  field: rt.union([rt.string, rt.undefined]),
+});
+
+export const metricsExplorerMetricRT = rt.intersection([
+  metricsExplorerMetricRequiredFieldsRT,
+  metricsExplorerMetricOptionalFieldsRT,
+]);
+
+export const timeRangeRT = rt.type({
+  field: rt.string,
+  from: rt.number,
+  to: rt.number,
+  interval: rt.string,
+});
+
+export const metricsExplorerRequestBodyRequiredFieldsRT = rt.type({
+  timerange: timeRangeRT,
+  indexPattern: rt.string,
+  metrics: rt.array(metricsExplorerMetricRT),
+});
+
+export const metricsExplorerRequestBodyOptionalFieldsRT = rt.partial({
+  groupBy: rt.union([rt.string, rt.null, rt.undefined]),
+  afterKey: rt.union([rt.string, rt.null, rt.undefined]),
+  limit: rt.union([rt.number, rt.null, rt.undefined]),
+  filterQuery: rt.union([rt.string, rt.null, rt.undefined]),
+});
+
+export const metricsExplorerRequestBodyRT = rt.intersection([
+  metricsExplorerRequestBodyRequiredFieldsRT,
+  metricsExplorerRequestBodyOptionalFieldsRT,
+]);
+
+export const metricsExplorerPageInfoRT = rt.type({
+  total: rt.number,
+  afterKey: rt.union([rt.string, rt.null]),
+});
+
+export const metricsExplorerColumnTypeRT = rt.keyof({
+  date: null,
+  number: null,
+  string: null,
+});
+
+export const metricsExplorerColumnRT = rt.type({
+  name: rt.string,
+  type: metricsExplorerColumnTypeRT,
+});
+
+export const metricsExplorerRowRT = rt.intersection([
+  rt.type({
+    timestamp: rt.number,
+  }),
+  rt.record(rt.string, rt.union([rt.string, rt.number, rt.null, rt.undefined])),
+]);
+
+export const metricsExplorerSeriesRT = rt.type({
+  id: rt.string,
+  columns: rt.array(metricsExplorerColumnRT),
+  rows: rt.array(metricsExplorerRowRT),
+});
+
+export const metricsExplorerResponseRT = rt.type({
+  series: rt.array(metricsExplorerSeriesRT),
+  pageInfo: metricsExplorerPageInfoRT,
+});
diff --git a/x-pack/legacy/plugins/infra/common/http_api/snapshot_api.ts b/x-pack/legacy/plugins/infra/common/http_api/snapshot_api.ts
index 3e6aec4bad972..4ee0c9e23b68f 100644
--- a/x-pack/legacy/plugins/infra/common/http_api/snapshot_api.ts
+++ b/x-pack/legacy/plugins/infra/common/http_api/snapshot_api.ts
@@ -34,6 +34,7 @@ export const SnapshotNodeRT = rt.type({
 
 export const SnapshotNodeResponseRT = rt.type({
   nodes: rt.array(SnapshotNodeRT),
+  interval: rt.string,
 });
 
 export const InfraTimerangeInputRT = rt.type({
@@ -58,6 +59,8 @@ export const SnapshotRequestRT = rt.intersection([
     sourceId: rt.string,
   }),
   rt.partial({
+    accountId: rt.string,
+    region: rt.string,
     filterQuery: rt.union([rt.string, rt.null]),
   }),
 ]);
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/index.ts b/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/index.ts
index ba4a6bb22c184..ccfd8cd9851eb 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/index.ts
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/index.ts
@@ -13,7 +13,7 @@ export const awsEC2: InventoryModel = {
   displayName: i18n.translate('xpack.infra.inventoryModels.awsEC2.displayName', {
     defaultMessage: 'EC2 Instances',
   }),
-  requiredModules: ['aws'],
+  requiredModule: 'aws',
   crosslinkSupport: {
     details: true,
     logs: true,
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/layout.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/layout.tsx
index 01009b478951a..a3074b78f9f3b 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/layout.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/layout.tsx
@@ -8,109 +8,123 @@ import { i18n } from '@kbn/i18n';
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/types';
 import { Section } from '../../../public/pages/metrics/components/section';
 import { SubSection } from '../../../public/pages/metrics/components/sub_section';
+import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
 import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
 import { withTheme } from '../../../../../common/eui_styled_components';
+import { MetadataDetails } from '../../../public/pages/metrics/components/metadata_details';
 
 export const Layout = withTheme(({ metrics, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>
-    <Section
-      navLabel="AWS EC2"
-      sectionLabel={i18n.translate(
-        'xpack.infra.metricDetailPage.ec2MetricsLayout.overviewSection.sectionLabel',
-        {
-          defaultMessage: 'Aws EC2 Overview',
-        }
-      )}
-      metrics={metrics}
-    >
-      <SubSection
-        id="awsEC2CpuUtilization"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.ec2MetricsLayout.cpuUsageSection.sectionLabel',
+    <MetadataDetails
+      fields={[
+        'cloud.instance.id',
+        'cloud.provider',
+        'cloud.availability_zone',
+        'cloud.machine.type',
+        'cloud.instance.name',
+        'cloud.project.id',
+      ]}
+    />
+    <LayoutContent>
+      <Section
+        navLabel="AWS EC2"
+        sectionLabel={i18n.translate(
+          'xpack.infra.metricDetailPage.ec2MetricsLayout.overviewSection.sectionLabel',
           {
-            defaultMessage: 'CPU Usage',
+            defaultMessage: 'Aws EC2 Overview',
           }
         )}
+        metrics={metrics}
       >
-        <ChartSectionVis
-          stacked={true}
-          type="area"
-          formatter="percent"
-          seriesOverrides={{
-            total: { color: theme.eui.euiColorVis1 },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsEC2NetworkTraffic"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.ec2MetricsLayout.networkTrafficSection.sectionLabel',
-          {
-            defaultMessage: 'Network Traffic',
-          }
-        )}
-      >
-        <ChartSectionVis
-          formatter="bits"
-          formatterTemplate="{{value}}/s"
-          type="area"
-          seriesOverrides={{
-            rx: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.networkTrafficSection.networkRxRateSeriesLabel',
-                {
-                  defaultMessage: 'in',
-                }
-              ),
-            },
-            tx: {
-              color: theme.eui.euiColorVis2,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.networkTrafficSection.networkTxRateSeriesLabel',
-                {
-                  defaultMessage: 'out',
-                }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsEC2DiskIOBytes"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.ec2MetricsLayout.diskIOBytesSection.sectionLabel',
-          {
-            defaultMessage: 'Disk IO (Bytes)',
-          }
-        )}
-      >
-        <ChartSectionVis
-          formatter="bytes"
-          formatterTemplate="{{value}}/s"
-          type="area"
-          seriesOverrides={{
-            write: {
-              color: theme.eui.euiColorVis2,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.ec2MetricsLayout.diskIOBytesSection.writeLabel',
-                {
-                  defaultMessage: 'writes',
-                }
-              ),
-            },
-            read: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.ec2MetricsLayout.diskIOBytesSection.readLabel',
-                {
-                  defaultMessage: 'reads',
-                }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-    </Section>
+        <SubSection
+          id="awsEC2CpuUtilization"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.ec2MetricsLayout.cpuUsageSection.sectionLabel',
+            {
+              defaultMessage: 'CPU Usage',
+            }
+          )}
+        >
+          <ChartSectionVis
+            stacked={true}
+            type="area"
+            formatter="percent"
+            seriesOverrides={{
+              total: { color: theme.eui.euiColorVis1 },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsEC2NetworkTraffic"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.ec2MetricsLayout.networkTrafficSection.sectionLabel',
+            {
+              defaultMessage: 'Network Traffic',
+            }
+          )}
+        >
+          <ChartSectionVis
+            formatter="bits"
+            formatterTemplate="{{value}}/s"
+            type="area"
+            seriesOverrides={{
+              rx: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.networkTrafficSection.networkRxRateSeriesLabel',
+                  {
+                    defaultMessage: 'in',
+                  }
+                ),
+              },
+              tx: {
+                color: theme.eui.euiColorVis2,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.networkTrafficSection.networkTxRateSeriesLabel',
+                  {
+                    defaultMessage: 'out',
+                  }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsEC2DiskIOBytes"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.ec2MetricsLayout.diskIOBytesSection.sectionLabel',
+            {
+              defaultMessage: 'Disk IO (Bytes)',
+            }
+          )}
+        >
+          <ChartSectionVis
+            formatter="bytes"
+            formatterTemplate="{{value}}/s"
+            type="area"
+            seriesOverrides={{
+              write: {
+                color: theme.eui.euiColorVis2,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.ec2MetricsLayout.diskIOBytesSection.writeLabel',
+                  {
+                    defaultMessage: 'writes',
+                  }
+                ),
+              },
+              read: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.ec2MetricsLayout.diskIOBytesSection.readLabel',
+                  {
+                    defaultMessage: 'reads',
+                  }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+      </Section>
+    </LayoutContent>
   </React.Fragment>
 ));
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx
index fc09f0761a522..490b5c552dcc3 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_ec2/toolbar_items.tsx
@@ -8,6 +8,7 @@ import React from 'react';
 import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
 import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
 import { InfraSnapshotMetricType } from '../../graphql/types';
+import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
 
 export const AwsEC2ToolbarItems = (props: ToolbarProps) => {
   const metricTypes = [
@@ -24,10 +25,13 @@ export const AwsEC2ToolbarItems = (props: ToolbarProps) => {
     'aws.ec2.instance.state.name',
   ];
   return (
-    <MetricsAndGroupByToolbarItems
-      {...props}
-      metricTypes={metricTypes}
-      groupByFields={groupByFields}
-    />
+    <>
+      <CloudToolbarItems {...props} />
+      <MetricsAndGroupByToolbarItems
+        {...props}
+        metricTypes={metricTypes}
+        groupByFields={groupByFields}
+      />
+    </>
   );
 };
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/index.ts b/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/index.ts
index e81dee504b064..f1182a942ff06 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/index.ts
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/index.ts
@@ -13,7 +13,7 @@ export const awsRDS: InventoryModel = {
   displayName: i18n.translate('xpack.infra.inventoryModels.awsRDS.displayName', {
     defaultMessage: 'RDS Databases',
   }),
-  requiredModules: ['aws'],
+  requiredModule: 'aws',
   crosslinkSupport: {
     details: true,
     logs: true,
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/layout.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/layout.tsx
index 5f1185666a35d..debb569fcd5bb 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/layout.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/layout.tsx
@@ -10,171 +10,174 @@ import { Section } from '../../../public/pages/metrics/components/section';
 import { SubSection } from '../../../public/pages/metrics/components/sub_section';
 import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
 import { withTheme } from '../../../../../common/eui_styled_components';
+import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
 
 export const Layout = withTheme(({ metrics, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>
-    <Section
-      navLabel="AWS RDS"
-      sectionLabel={i18n.translate(
-        'xpack.infra.metricDetailPage.rdsMetricsLayout.overviewSection.sectionLabel',
-        {
-          defaultMessage: 'Aws RDS Overview',
-        }
-      )}
-      metrics={metrics}
-    >
-      <SubSection
-        id="awsRDSCpuTotal"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.rdsMetricsLayout.cpuTotal.sectionLabel',
+    <LayoutContent>
+      <Section
+        navLabel="AWS RDS"
+        sectionLabel={i18n.translate(
+          'xpack.infra.metricDetailPage.rdsMetricsLayout.overviewSection.sectionLabel',
           {
-            defaultMessage: 'Total CPU Usage',
+            defaultMessage: 'Aws RDS Overview',
           }
         )}
+        metrics={metrics}
       >
-        <ChartSectionVis
-          type="area"
-          formatter="percent"
-          seriesOverrides={{
-            cpu: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.rdsMetricsLayout.cpuTotal.chartLabel',
-                { defaultMessage: 'Total' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsRDSConnections"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.rdsMetricsLayout.connections.sectionLabel',
-          {
-            defaultMessage: 'Connections',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          formatter="number"
-          seriesOverrides={{
-            connections: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.rdsMetricsLayout.connections.chartLabel',
-                { defaultMessage: 'Connections' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsRDSQueriesExecuted"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.rdsMetricsLayout.queriesExecuted.sectionLabel',
-          {
-            defaultMessage: 'Queries Executed',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          formatter="number"
-          seriesOverrides={{
-            queries: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.rdsMetricsLayout.queriesExecuted.chartLabel',
-                { defaultMessage: 'Queries' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsRDSActiveTransactions"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.rdsMetricsLayout.activeTransactions.sectionLabel',
-          {
-            defaultMessage: 'Transactions',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          formatter="number"
-          seriesOverrides={{
-            active: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.rdsMetricsLayout.active.chartLabel',
-                { defaultMessage: 'Active' }
-              ),
-            },
-            blocked: {
-              color: theme.eui.euiColorVis2,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.rdsMetricsLayout.blocked.chartLabel',
-                { defaultMessage: 'Blocked' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsRDSLatency"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.sectionLabel',
-          {
-            defaultMessage: 'Latency',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          stacked={true}
-          formatter="highPercision"
-          formatterTemplate={'{{value}} ms'}
-          seriesOverrides={{
-            read: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.read.chartLabel',
-                { defaultMessage: 'Read' }
-              ),
-            },
-            write: {
-              color: theme.eui.euiColorVis2,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.write.chartLabel',
-                { defaultMessage: 'Write' }
-              ),
-            },
-            insert: {
-              color: theme.eui.euiColorVis0,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.insert.chartLabel',
-                { defaultMessage: 'Insert' }
-              ),
-            },
-            update: {
-              color: theme.eui.euiColorVis7,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.update.chartLabel',
-                { defaultMessage: 'Update' }
-              ),
-            },
-            commit: {
-              color: theme.eui.euiColorVis3,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.commit.chartLabel',
-                { defaultMessage: 'Commit' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-    </Section>
+        <SubSection
+          id="awsRDSCpuTotal"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.rdsMetricsLayout.cpuTotal.sectionLabel',
+            {
+              defaultMessage: 'Total CPU Usage',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="area"
+            formatter="percent"
+            seriesOverrides={{
+              cpu: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.rdsMetricsLayout.cpuTotal.chartLabel',
+                  { defaultMessage: 'Total' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsRDSConnections"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.rdsMetricsLayout.connections.sectionLabel',
+            {
+              defaultMessage: 'Connections',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="number"
+            seriesOverrides={{
+              connections: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.rdsMetricsLayout.connections.chartLabel',
+                  { defaultMessage: 'Connections' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsRDSQueriesExecuted"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.rdsMetricsLayout.queriesExecuted.sectionLabel',
+            {
+              defaultMessage: 'Queries Executed',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="number"
+            seriesOverrides={{
+              queries: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.rdsMetricsLayout.queriesExecuted.chartLabel',
+                  { defaultMessage: 'Queries' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsRDSActiveTransactions"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.rdsMetricsLayout.activeTransactions.sectionLabel',
+            {
+              defaultMessage: 'Transactions',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="number"
+            seriesOverrides={{
+              active: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.rdsMetricsLayout.active.chartLabel',
+                  { defaultMessage: 'Active' }
+                ),
+              },
+              blocked: {
+                color: theme.eui.euiColorVis2,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.rdsMetricsLayout.blocked.chartLabel',
+                  { defaultMessage: 'Blocked' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsRDSLatency"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.sectionLabel',
+            {
+              defaultMessage: 'Latency',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            stacked={true}
+            formatter="highPercision"
+            formatterTemplate={'{{value}} ms'}
+            seriesOverrides={{
+              read: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.read.chartLabel',
+                  { defaultMessage: 'Read' }
+                ),
+              },
+              write: {
+                color: theme.eui.euiColorVis2,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.write.chartLabel',
+                  { defaultMessage: 'Write' }
+                ),
+              },
+              insert: {
+                color: theme.eui.euiColorVis0,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.insert.chartLabel',
+                  { defaultMessage: 'Insert' }
+                ),
+              },
+              update: {
+                color: theme.eui.euiColorVis7,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.update.chartLabel',
+                  { defaultMessage: 'Update' }
+                ),
+              },
+              commit: {
+                color: theme.eui.euiColorVis3,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.rdsMetricsLayout.latency.commit.chartLabel',
+                  { defaultMessage: 'Commit' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+      </Section>
+    </LayoutContent>
   </React.Fragment>
 ));
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx
index b60d6292c9c0f..86ed57e8f4c7f 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_rds/toolbar_items.tsx
@@ -8,6 +8,7 @@ import React from 'react';
 import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
 import { InfraSnapshotMetricType } from '../../../public/graphql/types';
 import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
+import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
 
 export const AwsRDSToolbarItems = (props: ToolbarProps) => {
   const metricTypes = [
@@ -23,10 +24,13 @@ export const AwsRDSToolbarItems = (props: ToolbarProps) => {
     'aws.rds.db_instance.status',
   ];
   return (
-    <MetricsAndGroupByToolbarItems
-      {...props}
-      metricTypes={metricTypes}
-      groupByFields={groupByFields}
-    />
+    <>
+      <CloudToolbarItems {...props} />
+      <MetricsAndGroupByToolbarItems
+        {...props}
+        metricTypes={metricTypes}
+        groupByFields={groupByFields}
+      />
+    </>
   );
 };
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/index.ts b/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/index.ts
index c5de4ed80a1cb..3bdf319f49c5f 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/index.ts
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/index.ts
@@ -13,7 +13,7 @@ export const awsS3: InventoryModel = {
   displayName: i18n.translate('xpack.infra.inventoryModels.awsS3.displayName', {
     defaultMessage: 'S3 Buckets',
   }),
-  requiredModules: ['aws'],
+  requiredModule: 'aws',
   crosslinkSupport: {
     details: true,
     logs: true,
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/layout.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/layout.tsx
index 80089f15b04b2..955960f5baeda 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/layout.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/layout.tsx
@@ -10,134 +10,137 @@ import { Section } from '../../../public/pages/metrics/components/section';
 import { SubSection } from '../../../public/pages/metrics/components/sub_section';
 import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
 import { withTheme } from '../../../../../common/eui_styled_components';
+import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
 
 export const Layout = withTheme(({ metrics, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>
-    <Section
-      navLabel="AWS S3"
-      sectionLabel={i18n.translate(
-        'xpack.infra.metricDetailPage.s3MetricsLayout.overviewSection.sectionLabel',
-        {
-          defaultMessage: 'Aws S3 Overview',
-        }
-      )}
-      metrics={metrics}
-    >
-      <SubSection
-        id="awsS3BucketSize"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.s3MetricsLayout.bucketSize.sectionLabel',
+    <LayoutContent>
+      <Section
+        navLabel="AWS S3"
+        sectionLabel={i18n.translate(
+          'xpack.infra.metricDetailPage.s3MetricsLayout.overviewSection.sectionLabel',
           {
-            defaultMessage: 'Bucket Size',
+            defaultMessage: 'Aws S3 Overview',
           }
         )}
+        metrics={metrics}
       >
-        <ChartSectionVis
-          type="bar"
-          formatter="bytes"
-          seriesOverrides={{
-            bytes: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.s3MetricsLayout.bucketSize.chartLabel',
-                { defaultMessage: 'Total Bytes' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsS3NumberOfObjects"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.s3MetricsLayout.numberOfObjects.sectionLabel',
-          {
-            defaultMessage: 'Number of Objects',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          formatter="abbreviatedNumber"
-          seriesOverrides={{
-            objects: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.s3MetricsLayout.numberOfObjects.chartLabel',
-                { defaultMessage: 'Objects' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsS3TotalRequests"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.s3MetricsLayout.totalRequests.sectionLabel',
-          {
-            defaultMessage: 'Total Requests',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          formatter="abbreviatedNumber"
-          seriesOverrides={{
-            total: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.s3MetricsLayout.totalRequests.chartLabel',
-                { defaultMessage: 'Requests' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsS3DownloadBytes"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.s3MetricsLayout.downloadBytes.sectionLabel',
-          {
-            defaultMessage: 'Downloaded Bytes',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          formatter="bytes"
-          seriesOverrides={{
-            bytes: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.s3MetricsLayout.downloadBytes.chartLabel',
-                { defaultMessage: 'Bytes' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsS3UploadBytes"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.s3MetricsLayout.uploadBytes.sectionLabel',
-          {
-            defaultMessage: 'Uploaded Bytes',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          formatter="bytes"
-          seriesOverrides={{
-            bytes: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.s3MetricsLayout.uploadBytes.chartLabel',
-                { defaultMessage: 'Bytes' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-    </Section>
+        <SubSection
+          id="awsS3BucketSize"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.s3MetricsLayout.bucketSize.sectionLabel',
+            {
+              defaultMessage: 'Bucket Size',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="bytes"
+            seriesOverrides={{
+              bytes: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.s3MetricsLayout.bucketSize.chartLabel',
+                  { defaultMessage: 'Total Bytes' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsS3NumberOfObjects"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.s3MetricsLayout.numberOfObjects.sectionLabel',
+            {
+              defaultMessage: 'Number of Objects',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="abbreviatedNumber"
+            seriesOverrides={{
+              objects: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.s3MetricsLayout.numberOfObjects.chartLabel',
+                  { defaultMessage: 'Objects' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsS3TotalRequests"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.s3MetricsLayout.totalRequests.sectionLabel',
+            {
+              defaultMessage: 'Total Requests',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="abbreviatedNumber"
+            seriesOverrides={{
+              total: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.s3MetricsLayout.totalRequests.chartLabel',
+                  { defaultMessage: 'Requests' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsS3DownloadBytes"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.s3MetricsLayout.downloadBytes.sectionLabel',
+            {
+              defaultMessage: 'Downloaded Bytes',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="bytes"
+            seriesOverrides={{
+              bytes: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.s3MetricsLayout.downloadBytes.chartLabel',
+                  { defaultMessage: 'Bytes' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsS3UploadBytes"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.s3MetricsLayout.uploadBytes.sectionLabel',
+            {
+              defaultMessage: 'Uploaded Bytes',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="bytes"
+            seriesOverrides={{
+              bytes: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.s3MetricsLayout.uploadBytes.chartLabel',
+                  { defaultMessage: 'Bytes' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+      </Section>
+    </LayoutContent>
   </React.Fragment>
 ));
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx
index 6764de237118a..276b6b83eb43d 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_s3/toolbar_items.tsx
@@ -8,6 +8,7 @@ import React from 'react';
 import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
 import { InfraSnapshotMetricType } from '../../../public/graphql/types';
 import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
+import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
 
 export const AwsS3ToolbarItems = (props: ToolbarProps) => {
   const metricTypes = [
@@ -19,10 +20,13 @@ export const AwsS3ToolbarItems = (props: ToolbarProps) => {
   ];
   const groupByFields = ['cloud.region'];
   return (
-    <MetricsAndGroupByToolbarItems
-      {...props}
-      metricTypes={metricTypes}
-      groupByFields={groupByFields}
-    />
+    <>
+      <CloudToolbarItems {...props} />
+      <MetricsAndGroupByToolbarItems
+        {...props}
+        metricTypes={metricTypes}
+        groupByFields={groupByFields}
+      />
+    </>
   );
 };
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/index.ts b/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/index.ts
index d7fb7c7a615b1..1733e995a824f 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/index.ts
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/index.ts
@@ -13,7 +13,7 @@ export const awsSQS: InventoryModel = {
   displayName: i18n.translate('xpack.infra.inventoryModels.awsSQS.displayName', {
     defaultMessage: 'SQS Queues',
   }),
-  requiredModules: ['aws'],
+  requiredModule: 'aws',
   crosslinkSupport: {
     details: true,
     logs: true,
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/layout.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/layout.tsx
index 40cb0a64d83cc..5d460c971ec3b 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/layout.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/layout.tsx
@@ -10,134 +10,137 @@ import { Section } from '../../../public/pages/metrics/components/section';
 import { SubSection } from '../../../public/pages/metrics/components/sub_section';
 import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
 import { withTheme } from '../../../../../common/eui_styled_components';
+import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
 
 export const Layout = withTheme(({ metrics, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>
-    <Section
-      navLabel="AWS SQS"
-      sectionLabel={i18n.translate(
-        'xpack.infra.metricDetailPage.sqsMetricsLayout.overviewSection.sectionLabel',
-        {
-          defaultMessage: 'Aws SQS Overview',
-        }
-      )}
-      metrics={metrics}
-    >
-      <SubSection
-        id="awsSQSMessagesVisible"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesVisible.sectionLabel',
+    <LayoutContent>
+      <Section
+        navLabel="AWS SQS"
+        sectionLabel={i18n.translate(
+          'xpack.infra.metricDetailPage.sqsMetricsLayout.overviewSection.sectionLabel',
           {
-            defaultMessage: 'Messages Available',
+            defaultMessage: 'Aws SQS Overview',
           }
         )}
+        metrics={metrics}
       >
-        <ChartSectionVis
-          type="bar"
-          formatter="abbreviatedNumber"
-          seriesOverrides={{
-            visible: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesVisible.chartLabel',
-                { defaultMessage: 'Available' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsSQSMessagesDelayed"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesDelayed.sectionLabel',
-          {
-            defaultMessage: 'Messages Delayed',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          formatter="abbreviatedNumber"
-          seriesOverrides={{
-            delayed: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesDelayed.chartLabel',
-                { defaultMessage: 'Delayed' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsSQSMessagesSent"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesSent.sectionLabel',
-          {
-            defaultMessage: 'Messages Added',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          formatter="abbreviatedNumber"
-          seriesOverrides={{
-            sent: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesSent.chartLabel',
-                { defaultMessage: 'Added' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsSQSMessagesEmpty"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesEmpty.sectionLabel',
-          {
-            defaultMessage: 'Messages Empty',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          formatter="abbreviatedNumber"
-          seriesOverrides={{
-            sent: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesEmpty.chartLabel',
-                { defaultMessage: 'Empty' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="awsSQSOldestMessage"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.sqsMetricsLayout.oldestMessage.sectionLabel',
-          {
-            defaultMessage: 'Oldest Message',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="bar"
-          formatter="abbreviatedNumber"
-          seriesOverrides={{
-            oldest: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.sqsMetricsLayout.oldestMessage.chartLabel',
-                { defaultMessage: 'Age' }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-    </Section>
+        <SubSection
+          id="awsSQSMessagesVisible"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesVisible.sectionLabel',
+            {
+              defaultMessage: 'Messages Available',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="abbreviatedNumber"
+            seriesOverrides={{
+              visible: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesVisible.chartLabel',
+                  { defaultMessage: 'Available' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsSQSMessagesDelayed"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesDelayed.sectionLabel',
+            {
+              defaultMessage: 'Messages Delayed',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="abbreviatedNumber"
+            seriesOverrides={{
+              delayed: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesDelayed.chartLabel',
+                  { defaultMessage: 'Delayed' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsSQSMessagesSent"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesSent.sectionLabel',
+            {
+              defaultMessage: 'Messages Added',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="abbreviatedNumber"
+            seriesOverrides={{
+              sent: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesSent.chartLabel',
+                  { defaultMessage: 'Added' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsSQSMessagesEmpty"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesEmpty.sectionLabel',
+            {
+              defaultMessage: 'Messages Empty',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="abbreviatedNumber"
+            seriesOverrides={{
+              sent: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.sqsMetricsLayout.messagesEmpty.chartLabel',
+                  { defaultMessage: 'Empty' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="awsSQSOldestMessage"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.sqsMetricsLayout.oldestMessage.sectionLabel',
+            {
+              defaultMessage: 'Oldest Message',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="bar"
+            formatter="abbreviatedNumber"
+            seriesOverrides={{
+              oldest: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.sqsMetricsLayout.oldestMessage.chartLabel',
+                  { defaultMessage: 'Age' }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+      </Section>
+    </LayoutContent>
   </React.Fragment>
 ));
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx
index 89d372d6ac21c..67baa22a5e6b0 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/aws_sqs/toolbar_items.tsx
@@ -8,6 +8,7 @@ import React from 'react';
 import { ToolbarProps } from '../../../public/components/inventory/toolbars/toolbar';
 import { MetricsAndGroupByToolbarItems } from '../shared/compontents/metrics_and_groupby_toolbar_items';
 import { InfraSnapshotMetricType } from '../../graphql/types';
+import { CloudToolbarItems } from '../shared/compontents/cloud_toolbar_items';
 
 export const AwsSQSToolbarItems = (props: ToolbarProps) => {
   const metricTypes = [
@@ -19,10 +20,13 @@ export const AwsSQSToolbarItems = (props: ToolbarProps) => {
   ];
   const groupByFields = ['cloud.region'];
   return (
-    <MetricsAndGroupByToolbarItems
-      {...props}
-      metricTypes={metricTypes}
-      groupByFields={groupByFields}
-    />
+    <>
+      <CloudToolbarItems {...props} />
+      <MetricsAndGroupByToolbarItems
+        {...props}
+        metricTypes={metricTypes}
+        groupByFields={groupByFields}
+      />
+    </>
   );
 };
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/container/index.ts b/x-pack/legacy/plugins/infra/common/inventory_models/container/index.ts
index af7b6058ff174..29b3cfe3af180 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/container/index.ts
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/container/index.ts
@@ -13,7 +13,7 @@ export const container: InventoryModel = {
   displayName: i18n.translate('xpack.infra.inventoryModel.container.displayName', {
     defaultMessage: 'Docker Containers',
   }),
-  requiredModules: ['docker'],
+  requiredModule: 'docker',
   crosslinkSupport: {
     details: true,
     logs: true,
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/container/layout.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/container/layout.tsx
index 00da70f1d96a5..e207687cf8643 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/container/layout.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/container/layout.tsx
@@ -11,212 +11,220 @@ import { SubSection } from '../../../public/pages/metrics/components/sub_section
 import { GaugesSectionVis } from '../../../public/pages/metrics/components/gauges_section_vis';
 import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
 import { withTheme } from '../../../../../common/eui_styled_components';
+import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
+import { MetadataDetails } from '../../../public/pages/metrics/components/metadata_details';
 
 export const Layout = withTheme(({ metrics, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>
-    <Section
-      navLabel={i18n.translate('xpack.infra.metricDetailPage.containerMetricsLayout.layoutLabel', {
-        defaultMessage: 'Container',
-      })}
-      sectionLabel={i18n.translate(
-        'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.sectionLabel',
-        {
-          defaultMessage: 'Container Overview',
-        }
-      )}
-      metrics={metrics}
-    >
-      <SubSection id="containerOverview">
-        <GaugesSectionVis
-          seriesOverrides={{
-            cpu: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.cpuUsageSeriesLabel',
-                {
-                  defaultMessage: 'CPU Usage',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'percent',
-              gaugeMax: 1,
-            },
-            memory: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.memoryUsageSeriesLabel',
-                {
-                  defaultMessage: 'Memory Usage',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'percent',
-              gaugeMax: 1,
-            },
-            rx: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.inboundRXSeriesLabel',
-                {
-                  defaultMessage: 'Inbound (RX)',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'bits',
-              formatterTemplate: '{{value}}/s',
-            },
-            tx: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.outboundTXSeriesLabel',
-                {
-                  defaultMessage: 'Outbound (TX)',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'bits',
-              formatterTemplate: '{{value}}/s',
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="containerCpuUsage"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.containerMetricsLayout.cpuUsageSection.sectionLabel',
+    <MetadataDetails />
+    <LayoutContent>
+      <Section
+        navLabel={i18n.translate(
+          'xpack.infra.metricDetailPage.containerMetricsLayout.layoutLabel',
           {
-            defaultMessage: 'CPU Usage',
+            defaultMessage: 'Container',
           }
         )}
-      >
-        <ChartSectionVis
-          stacked={true}
-          type="area"
-          formatter="percent"
-          seriesOverrides={{
-            cpu: { color: theme.eui.euiColorVis1 },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="containerMemory"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.containerMetricsLayout.memoryUsageSection.sectionLabel',
-          {
-            defaultMessage: 'Memory Usage',
-          }
-        )}
-      >
-        <ChartSectionVis
-          stacked={true}
-          type="area"
-          formatter="percent"
-          seriesOverrides={{
-            memory: { color: theme.eui.euiColorVis1 },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="containerNetworkTraffic"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.containerMetricsLayout.networkTrafficSection.sectionLabel',
-          {
-            defaultMessage: 'Network Traffic',
-          }
-        )}
-      >
-        <ChartSectionVis
-          formatter="bits"
-          formatterTemplate="{{value}}/s"
-          type="area"
-          seriesOverrides={{
-            rx: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.containerMetricsLayout.networkTrafficSection.networkRxRateSeriesLabel',
-                {
-                  defaultMessage: 'in',
-                }
-              ),
-            },
-            tx: {
-              color: theme.eui.euiColorVis2,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.containerMetricsLayout.networkTrafficSection.networkTxRateSeriesLabel',
-                {
-                  defaultMessage: 'out',
-                }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="containerDiskIOOps"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoOpsSection.sectionLabel',
-          {
-            defaultMessage: 'Disk IO (Ops)',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="area"
-          formatterTemplate="{{value}}/s"
-          formatter="number"
-          seriesOverrides={{
-            read: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoOpsSection.readRateSeriesLabel',
-                {
-                  defaultMessage: 'reads',
-                }
-              ),
-            },
-            write: {
-              color: theme.eui.euiColorVis2,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoOpsSection.writeRateSeriesLabel',
-                {
-                  defaultMessage: 'writes',
-                }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="containerDiskIOBytes"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoBytesSection.sectionLabel',
+        sectionLabel={i18n.translate(
+          'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.sectionLabel',
           {
-            defaultMessage: 'Disk IO (Bytes)',
+            defaultMessage: 'Container Overview',
           }
         )}
+        metrics={metrics}
       >
-        <ChartSectionVis
-          type="area"
-          formatter="bytes"
-          formatterTemplate="{{value}}/s"
-          seriesOverrides={{
-            read: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoBytesSection.readRateSeriesLabel',
-                {
-                  defaultMessage: 'reads',
-                }
-              ),
-            },
-            write: {
-              color: theme.eui.euiColorVis2,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoBytesSection.writeRateSeriesLabel',
-                {
-                  defaultMessage: 'writes',
-                }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-    </Section>
+        <SubSection id="containerOverview">
+          <GaugesSectionVis
+            seriesOverrides={{
+              cpu: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.cpuUsageSeriesLabel',
+                  {
+                    defaultMessage: 'CPU Usage',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'percent',
+                gaugeMax: 1,
+              },
+              memory: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.memoryUsageSeriesLabel',
+                  {
+                    defaultMessage: 'Memory Usage',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'percent',
+                gaugeMax: 1,
+              },
+              rx: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.inboundRXSeriesLabel',
+                  {
+                    defaultMessage: 'Inbound (RX)',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'bits',
+                formatterTemplate: '{{value}}/s',
+              },
+              tx: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.containerMetricsLayout.overviewSection.outboundTXSeriesLabel',
+                  {
+                    defaultMessage: 'Outbound (TX)',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'bits',
+                formatterTemplate: '{{value}}/s',
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="containerCpuUsage"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.containerMetricsLayout.cpuUsageSection.sectionLabel',
+            {
+              defaultMessage: 'CPU Usage',
+            }
+          )}
+        >
+          <ChartSectionVis
+            stacked={true}
+            type="area"
+            formatter="percent"
+            seriesOverrides={{
+              cpu: { color: theme.eui.euiColorVis1 },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="containerMemory"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.containerMetricsLayout.memoryUsageSection.sectionLabel',
+            {
+              defaultMessage: 'Memory Usage',
+            }
+          )}
+        >
+          <ChartSectionVis
+            stacked={true}
+            type="area"
+            formatter="percent"
+            seriesOverrides={{
+              memory: { color: theme.eui.euiColorVis1 },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="containerNetworkTraffic"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.containerMetricsLayout.networkTrafficSection.sectionLabel',
+            {
+              defaultMessage: 'Network Traffic',
+            }
+          )}
+        >
+          <ChartSectionVis
+            formatter="bits"
+            formatterTemplate="{{value}}/s"
+            type="area"
+            seriesOverrides={{
+              rx: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.containerMetricsLayout.networkTrafficSection.networkRxRateSeriesLabel',
+                  {
+                    defaultMessage: 'in',
+                  }
+                ),
+              },
+              tx: {
+                color: theme.eui.euiColorVis2,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.containerMetricsLayout.networkTrafficSection.networkTxRateSeriesLabel',
+                  {
+                    defaultMessage: 'out',
+                  }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="containerDiskIOOps"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoOpsSection.sectionLabel',
+            {
+              defaultMessage: 'Disk IO (Ops)',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="area"
+            formatterTemplate="{{value}}/s"
+            formatter="number"
+            seriesOverrides={{
+              read: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoOpsSection.readRateSeriesLabel',
+                  {
+                    defaultMessage: 'reads',
+                  }
+                ),
+              },
+              write: {
+                color: theme.eui.euiColorVis2,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoOpsSection.writeRateSeriesLabel',
+                  {
+                    defaultMessage: 'writes',
+                  }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="containerDiskIOBytes"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoBytesSection.sectionLabel',
+            {
+              defaultMessage: 'Disk IO (Bytes)',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="area"
+            formatter="bytes"
+            formatterTemplate="{{value}}/s"
+            seriesOverrides={{
+              read: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoBytesSection.readRateSeriesLabel',
+                  {
+                    defaultMessage: 'reads',
+                  }
+                ),
+              },
+              write: {
+                color: theme.eui.euiColorVis2,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.containerMetricsLayout.diskIoBytesSection.writeRateSeriesLabel',
+                  {
+                    defaultMessage: 'writes',
+                  }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+      </Section>
+    </LayoutContent>
   </React.Fragment>
 ));
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/host/index.ts b/x-pack/legacy/plugins/infra/common/inventory_models/host/index.ts
index 54d3267eef57a..364ef0b4c2c91 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/host/index.ts
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/host/index.ts
@@ -17,7 +17,7 @@ export const host: InventoryModel = {
   displayName: i18n.translate('xpack.infra.inventoryModel.host.displayName', {
     defaultMessage: 'Hosts',
   }),
-  requiredModules: ['system'],
+  requiredModule: 'system',
   crosslinkSupport: {
     details: true,
     logs: true,
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/host/layout.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/host/layout.tsx
index fee79d8364c42..ca53193e64ca2 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/host/layout.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/host/layout.tsx
@@ -5,348 +5,366 @@
  */
 import React from 'react';
 import { i18n } from '@kbn/i18n';
+import { withTheme } from '../../../../../common/eui_styled_components/eui_styled_components';
 import { LayoutPropsWithTheme } from '../../../public/pages/metrics/types';
 import { Section } from '../../../public/pages/metrics/components/section';
 import { SubSection } from '../../../public/pages/metrics/components/sub_section';
 import { GaugesSectionVis } from '../../../public/pages/metrics/components/gauges_section_vis';
 import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
-import { withTheme } from '../../../../../common/eui_styled_components';
 import * as Aws from '../shared/layouts/aws';
 import * as Ngnix from '../shared/layouts/nginx';
+import { MetadataDetails } from '../../../public/pages/metrics/components/metadata_details';
+import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
 
 export const Layout = withTheme(({ metrics, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>
-    <Section
-      navLabel={i18n.translate('xpack.infra.metricDetailPage.hostMetricsLayout.layoutLabel', {
-        defaultMessage: 'Host',
-      })}
-      sectionLabel={i18n.translate(
-        'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.sectionLabel',
-        {
-          defaultMessage: 'Host Overview',
-        }
-      )}
-      metrics={metrics}
-    >
-      <SubSection id="hostSystemOverview">
-        <GaugesSectionVis
-          seriesOverrides={{
-            cpu: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.cpuUsageSeriesLabel',
-                {
-                  defaultMessage: 'CPU Usage',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'percent',
-              gaugeMax: 1,
-            },
-            load: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.loadSeriesLabel',
-                {
-                  defaultMessage: 'Load (5m)',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-            },
-            memory: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.memoryCapacitySeriesLabel',
-                {
-                  defaultMessage: 'Memory Usage',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'percent',
-              gaugeMax: 1,
-            },
-            rx: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.inboundRXSeriesLabel',
-                {
-                  defaultMessage: 'Inbound (RX)',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'bits',
-              formatterTemplate: '{{value}}/s',
-            },
-            tx: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.outboundTXSeriesLabel',
-                {
-                  defaultMessage: 'Outbound (TX)',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'bits',
-              formatterTemplate: '{{value}}/s',
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="hostCpuUsage"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.hostMetricsLayout.cpuUsageSection.sectionLabel',
+    <MetadataDetails
+      fields={[
+        'host.hostname',
+        'host.os.name',
+        'host.os.kernel',
+        'host.containerized',
+        'cloud.provider',
+        'cloud.availability_zone',
+        'cloud.machine.type',
+        'cloud.project.id',
+        'cloud.instance.id',
+        'cloud.instance.name',
+      ]}
+    />
+    <LayoutContent>
+      <Section
+        navLabel={i18n.translate('xpack.infra.metricDetailPage.hostMetricsLayout.layoutLabel', {
+          defaultMessage: 'Host',
+        })}
+        sectionLabel={i18n.translate(
+          'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.sectionLabel',
           {
-            defaultMessage: 'CPU Usage',
+            defaultMessage: 'Host Overview',
           }
         )}
+        metrics={metrics}
       >
-        <ChartSectionVis
-          stacked={true}
-          type="area"
-          formatter="percent"
-          seriesOverrides={{
-            user: { color: theme.eui.euiColorVis0 },
-            system: { color: theme.eui.euiColorVis2 },
-            steal: { color: theme.eui.euiColorVis9 },
-            irq: { color: theme.eui.euiColorVis4 },
-            softirq: { color: theme.eui.euiColorVis6 },
-            iowait: { color: theme.eui.euiColorVis7 },
-            nice: { color: theme.eui.euiColorVis5 },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="hostLoad"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.hostMetricsLayout.loadSection.sectionLabel',
+        <SubSection id="hostSystemOverview">
+          <GaugesSectionVis
+            seriesOverrides={{
+              cpu: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.cpuUsageSeriesLabel',
+                  {
+                    defaultMessage: 'CPU Usage',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'percent',
+                gaugeMax: 1,
+              },
+              load: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.loadSeriesLabel',
+                  {
+                    defaultMessage: 'Load (5m)',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+              },
+              memory: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.memoryCapacitySeriesLabel',
+                  {
+                    defaultMessage: 'Memory Usage',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'percent',
+                gaugeMax: 1,
+              },
+              rx: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.inboundRXSeriesLabel',
+                  {
+                    defaultMessage: 'Inbound (RX)',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'bits',
+                formatterTemplate: '{{value}}/s',
+              },
+              tx: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.overviewSection.outboundTXSeriesLabel',
+                  {
+                    defaultMessage: 'Outbound (TX)',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'bits',
+                formatterTemplate: '{{value}}/s',
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="hostCpuUsage"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.hostMetricsLayout.cpuUsageSection.sectionLabel',
+            {
+              defaultMessage: 'CPU Usage',
+            }
+          )}
+        >
+          <ChartSectionVis
+            stacked={true}
+            type="area"
+            formatter="percent"
+            seriesOverrides={{
+              user: { color: theme.eui.euiColorVis0 },
+              system: { color: theme.eui.euiColorVis2 },
+              steal: { color: theme.eui.euiColorVis9 },
+              irq: { color: theme.eui.euiColorVis4 },
+              softirq: { color: theme.eui.euiColorVis6 },
+              iowait: { color: theme.eui.euiColorVis7 },
+              nice: { color: theme.eui.euiColorVis5 },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="hostLoad"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.hostMetricsLayout.loadSection.sectionLabel',
+            {
+              defaultMessage: 'Load',
+            }
+          )}
+        >
+          <ChartSectionVis
+            seriesOverrides={{
+              load_1m: {
+                color: theme.eui.euiColorVis0,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.loadSection.oneMinuteSeriesLabel',
+                  {
+                    defaultMessage: '1m',
+                  }
+                ),
+              },
+              load_5m: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.loadSection.fiveMinuteSeriesLabel',
+                  {
+                    defaultMessage: '5m',
+                  }
+                ),
+              },
+              load_15m: {
+                color: theme.eui.euiColorVis3,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.loadSection.fifteenMinuteSeriesLabel',
+                  {
+                    defaultMessage: '15m',
+                  }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="hostMemoryUsage"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.hostMetricsLayout.memoryUsageSection.sectionLabel',
+            {
+              defaultMessage: 'Memory Usage',
+            }
+          )}
+        >
+          <ChartSectionVis
+            stacked={true}
+            formatter="bytes"
+            type="area"
+            seriesOverrides={{
+              used: { color: theme.eui.euiColorVis2 },
+              free: { color: theme.eui.euiColorVis0 },
+              cache: { color: theme.eui.euiColorVis1 },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="hostNetworkTraffic"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.hostMetricsLayout.networkTrafficSection.sectionLabel',
+            {
+              defaultMessage: 'Network Traffic',
+            }
+          )}
+        >
+          <ChartSectionVis
+            formatter="bits"
+            formatterTemplate="{{value}}/s"
+            type="area"
+            seriesOverrides={{
+              rx: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.networkTrafficSection.networkRxRateSeriesLabel',
+                  {
+                    defaultMessage: 'in',
+                  }
+                ),
+              },
+              tx: {
+                color: theme.eui.euiColorVis2,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.hostMetricsLayout.networkTrafficSection.networkTxRateSeriesLabel',
+                  {
+                    defaultMessage: 'out',
+                  }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+      </Section>
+      <Section
+        navLabel="Kubernetes"
+        sectionLabel={i18n.translate(
+          'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.sectionLabel',
           {
-            defaultMessage: 'Load',
+            defaultMessage: 'Kubernetes Overview',
           }
         )}
+        metrics={metrics}
       >
-        <ChartSectionVis
-          seriesOverrides={{
-            load_1m: {
-              color: theme.eui.euiColorVis0,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.loadSection.oneMinuteSeriesLabel',
-                {
-                  defaultMessage: '1m',
-                }
-              ),
-            },
-            load_5m: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.loadSection.fiveMinuteSeriesLabel',
-                {
-                  defaultMessage: '5m',
-                }
-              ),
-            },
-            load_15m: {
-              color: theme.eui.euiColorVis3,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.loadSection.fifteenMinuteSeriesLabel',
-                {
-                  defaultMessage: '15m',
-                }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="hostMemoryUsage"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.hostMetricsLayout.memoryUsageSection.sectionLabel',
-          {
-            defaultMessage: 'Memory Usage',
-          }
-        )}
-      >
-        <ChartSectionVis
-          stacked={true}
-          formatter="bytes"
-          type="area"
-          seriesOverrides={{
-            used: { color: theme.eui.euiColorVis2 },
-            free: { color: theme.eui.euiColorVis0 },
-            cache: { color: theme.eui.euiColorVis1 },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="hostNetworkTraffic"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.hostMetricsLayout.networkTrafficSection.sectionLabel',
-          {
-            defaultMessage: 'Network Traffic',
-          }
-        )}
-      >
-        <ChartSectionVis
-          formatter="bits"
-          formatterTemplate="{{value}}/s"
-          type="area"
-          seriesOverrides={{
-            rx: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.networkTrafficSection.networkRxRateSeriesLabel',
-                {
-                  defaultMessage: 'in',
-                }
-              ),
-            },
-            tx: {
-              color: theme.eui.euiColorVis2,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.hostMetricsLayout.networkTrafficSection.networkTxRateSeriesLabel',
-                {
-                  defaultMessage: 'out',
-                }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-    </Section>
-    <Section
-      navLabel="Kubernetes"
-      sectionLabel={i18n.translate(
-        'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.sectionLabel',
-        {
-          defaultMessage: 'Kubernetes Overview',
-        }
-      )}
-      metrics={metrics}
-    >
-      <SubSection id="hostK8sOverview">
-        <GaugesSectionVis
-          seriesOverrides={{
-            cpucap: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.cpuUsageSeriesLabel',
-                {
-                  defaultMessage: 'CPU Capacity',
-                }
-              ),
-              color: 'secondary',
-              formatter: 'percent',
-              gaugeMax: 1,
-            },
-            load: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.loadSeriesLabel',
-                {
-                  defaultMessage: 'Load (5m)',
-                }
-              ),
-              color: 'secondary',
-            },
-            memorycap: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.memoryUsageSeriesLabel',
-                {
-                  defaultMessage: 'Memory Capacity',
-                }
-              ),
-              color: 'secondary',
-              formatter: 'percent',
-              gaugeMax: 1,
-            },
-            podcap: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.podCapacitySeriesLabel',
-                {
-                  defaultMessage: 'Pod Capacity',
-                }
-              ),
-              color: 'secondary',
-              formatter: 'percent',
-              gaugeMax: 1,
-            },
-            diskcap: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.diskCapacitySeriesLabel',
-                {
-                  defaultMessage: 'Disk Capacity',
-                }
-              ),
-              color: 'secondary',
-              formatter: 'percent',
-              gaugeMax: 1,
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="hostK8sCpuCap"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.kubernetesMetricsLayout.nodeCpuCapacitySection.sectionLabel',
-          {
-            defaultMessage: 'Node CPU Capacity',
-          }
-        )}
-      >
-        <ChartSectionVis
-          formatter="abbreviatedNumber"
-          seriesOverrides={{
-            capacity: { color: theme.eui.euiColorVis2 },
-            used: { color: theme.eui.euiColorVis1, type: 'area' },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="hostK8sMemoryCap"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.kubernetesMetricsLayout.nodeMemoryCapacitySection.sectionLabel',
-          {
-            defaultMessage: 'Node Memory Capacity',
-          }
-        )}
-      >
-        <ChartSectionVis
-          formatter="bytes"
-          seriesOverrides={{
-            capacity: { color: theme.eui.euiColorVis2 },
-            used: { color: theme.eui.euiColorVis1, type: 'area' },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="hostK8sDiskCap"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.kubernetesMetricsLayout.nodeDiskCapacitySection.sectionLabel',
-          {
-            defaultMessage: 'Node Disk Capacity',
-          }
-        )}
-      >
-        <ChartSectionVis
-          formatter="bytes"
-          seriesOverrides={{
-            capacity: { color: theme.eui.euiColorVis2 },
-            used: { color: theme.eui.euiColorVis1, type: 'area' },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="hostK8sPodCap"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.kubernetesMetricsLayout.nodePodCapacitySection.sectionLabel',
-          {
-            defaultMessage: 'Node Pod Capacity',
-          }
-        )}
-      >
-        <ChartSectionVis
-          formatter="number"
-          seriesOverrides={{
-            capacity: { color: theme.eui.euiColorVis2 },
-            used: { color: theme.eui.euiColorVis1, type: 'area' },
-          }}
-        />
-      </SubSection>
-    </Section>
-    <Aws.Layout metrics={metrics} />
-    <Ngnix.Layout metrics={metrics} />
+        <SubSection id="hostK8sOverview">
+          <GaugesSectionVis
+            seriesOverrides={{
+              cpucap: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.cpuUsageSeriesLabel',
+                  {
+                    defaultMessage: 'CPU Capacity',
+                  }
+                ),
+                color: 'secondary',
+                formatter: 'percent',
+                gaugeMax: 1,
+              },
+              load: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.loadSeriesLabel',
+                  {
+                    defaultMessage: 'Load (5m)',
+                  }
+                ),
+                color: 'secondary',
+              },
+              memorycap: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.memoryUsageSeriesLabel',
+                  {
+                    defaultMessage: 'Memory Capacity',
+                  }
+                ),
+                color: 'secondary',
+                formatter: 'percent',
+                gaugeMax: 1,
+              },
+              podcap: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.podCapacitySeriesLabel',
+                  {
+                    defaultMessage: 'Pod Capacity',
+                  }
+                ),
+                color: 'secondary',
+                formatter: 'percent',
+                gaugeMax: 1,
+              },
+              diskcap: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.kubernetesMetricsLayout.overviewSection.diskCapacitySeriesLabel',
+                  {
+                    defaultMessage: 'Disk Capacity',
+                  }
+                ),
+                color: 'secondary',
+                formatter: 'percent',
+                gaugeMax: 1,
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="hostK8sCpuCap"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.kubernetesMetricsLayout.nodeCpuCapacitySection.sectionLabel',
+            {
+              defaultMessage: 'Node CPU Capacity',
+            }
+          )}
+        >
+          <ChartSectionVis
+            formatter="abbreviatedNumber"
+            seriesOverrides={{
+              capacity: { color: theme.eui.euiColorVis2 },
+              used: { color: theme.eui.euiColorVis1, type: 'area' },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="hostK8sMemoryCap"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.kubernetesMetricsLayout.nodeMemoryCapacitySection.sectionLabel',
+            {
+              defaultMessage: 'Node Memory Capacity',
+            }
+          )}
+        >
+          <ChartSectionVis
+            formatter="bytes"
+            seriesOverrides={{
+              capacity: { color: theme.eui.euiColorVis2 },
+              used: { color: theme.eui.euiColorVis1, type: 'area' },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="hostK8sDiskCap"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.kubernetesMetricsLayout.nodeDiskCapacitySection.sectionLabel',
+            {
+              defaultMessage: 'Node Disk Capacity',
+            }
+          )}
+        >
+          <ChartSectionVis
+            formatter="bytes"
+            seriesOverrides={{
+              capacity: { color: theme.eui.euiColorVis2 },
+              used: { color: theme.eui.euiColorVis1, type: 'area' },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="hostK8sPodCap"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.kubernetesMetricsLayout.nodePodCapacitySection.sectionLabel',
+            {
+              defaultMessage: 'Node Pod Capacity',
+            }
+          )}
+        >
+          <ChartSectionVis
+            formatter="number"
+            seriesOverrides={{
+              capacity: { color: theme.eui.euiColorVis2 },
+              used: { color: theme.eui.euiColorVis1, type: 'area' },
+            }}
+          />
+        </SubSection>
+      </Section>
+      <Aws.Layout metrics={metrics} />
+      <Ngnix.Layout metrics={metrics} />
+    </LayoutContent>
   </React.Fragment>
 ));
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/pod/index.ts b/x-pack/legacy/plugins/infra/common/inventory_models/pod/index.ts
index 3efc5827b4f23..f76a0304e26c0 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/pod/index.ts
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/pod/index.ts
@@ -14,7 +14,7 @@ export const pod: InventoryModel = {
   displayName: i18n.translate('xpack.infra.inventoryModel.pod.displayName', {
     defaultMessage: 'Kubernetes Pods',
   }),
-  requiredModules: ['kubernetes'],
+  requiredModule: 'kubernetes',
   crosslinkSupport: {
     details: true,
     logs: true,
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/pod/layout.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/pod/layout.tsx
index 401e25c4defb8..f0c27ccff13b1 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/pod/layout.tsx
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/pod/layout.tsx
@@ -12,143 +12,148 @@ import { GaugesSectionVis } from '../../../public/pages/metrics/components/gauge
 import { ChartSectionVis } from '../../../public/pages/metrics/components/chart_section_vis';
 import { withTheme } from '../../../../../common/eui_styled_components';
 import * as Nginx from '../shared/layouts/nginx';
+import { MetadataDetails } from '../../../public/pages/metrics/components/metadata_details';
+import { LayoutContent } from '../../../public/pages/metrics/components/layout_content';
 
 export const Layout = withTheme(({ metrics, theme }: LayoutPropsWithTheme) => (
   <React.Fragment>
-    <Section
-      navLabel={i18n.translate('xpack.infra.metricDetailPage.podMetricsLayout.layoutLabel', {
-        defaultMessage: 'Pod',
-      })}
-      sectionLabel={i18n.translate(
-        'xpack.infra.metricDetailPage.podMetricsLayout.overviewSection.sectionLabel',
-        {
-          defaultMessage: 'Pod Overview',
-        }
-      )}
-      metrics={metrics}
-    >
-      <SubSection id="podOverview">
-        <GaugesSectionVis
-          seriesOverrides={{
-            cpu: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.podMetricsLayout.overviewSection.cpuUsageSeriesLabel',
-                {
-                  defaultMessage: 'CPU Usage',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'percent',
-              gaugeMax: 1,
-            },
-            memory: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.podMetricsLayout.overviewSection.memoryUsageSeriesLabel',
-                {
-                  defaultMessage: 'Memory Usage',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'percent',
-              gaugeMax: 1,
-            },
-            rx: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.podMetricsLayout.overviewSection.inboundRXSeriesLabel',
-                {
-                  defaultMessage: 'Inbound (RX)',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'bits',
-              formatterTemplate: '{{value}}/s',
-            },
-            tx: {
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.podMetricsLayout.overviewSection.outboundTXSeriesLabel',
-                {
-                  defaultMessage: 'Outbound (TX)',
-                }
-              ),
-              color: theme.eui.euiColorFullShade,
-              formatter: 'bits',
-              formatterTemplate: '{{value}}/s',
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="podCpuUsage"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.podMetricsLayout.cpuUsageSection.sectionLabel',
+    <MetadataDetails />
+    <LayoutContent>
+      <Section
+        navLabel={i18n.translate('xpack.infra.metricDetailPage.podMetricsLayout.layoutLabel', {
+          defaultMessage: 'Pod',
+        })}
+        sectionLabel={i18n.translate(
+          'xpack.infra.metricDetailPage.podMetricsLayout.overviewSection.sectionLabel',
           {
-            defaultMessage: 'CPU Usage',
+            defaultMessage: 'Pod Overview',
           }
         )}
+        metrics={metrics}
       >
-        <ChartSectionVis
-          formatter="percent"
-          type="area"
-          seriesOverrides={{
-            cpu: { color: theme.eui.euiColorVis1 },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="podMemoryUsage"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.podMetricsLayout.memoryUsageSection.sectionLabel',
-          {
-            defaultMessage: 'Memory Usage',
-          }
-        )}
-      >
-        <ChartSectionVis
-          type="area"
-          formatter="percent"
-          seriesOverrides={{
-            memory: {
-              color: theme.eui.euiColorVis1,
-            },
-          }}
-        />
-      </SubSection>
-      <SubSection
-        id="podNetworkTraffic"
-        label={i18n.translate(
-          'xpack.infra.metricDetailPage.podMetricsLayout.networkTrafficSection.sectionLabel',
-          {
-            defaultMessage: 'Network Traffic',
-          }
-        )}
-      >
-        <ChartSectionVis
-          formatter="bits"
-          formatterTemplate="{{value}}/s"
-          type="area"
-          seriesOverrides={{
-            rx: {
-              color: theme.eui.euiColorVis1,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.podMetricsLayout.networkTrafficSection.networkRxRateSeriesLabel',
-                {
-                  defaultMessage: 'in',
-                }
-              ),
-            },
-            tx: {
-              color: theme.eui.euiColorVis2,
-              name: i18n.translate(
-                'xpack.infra.metricDetailPage.podMetricsLayout.networkTrafficSection.networkTxRateSeriesLabel',
-                {
-                  defaultMessage: 'out',
-                }
-              ),
-            },
-          }}
-        />
-      </SubSection>
-    </Section>
-    <Nginx.Layout metrics={metrics} />
+        <SubSection id="podOverview">
+          <GaugesSectionVis
+            seriesOverrides={{
+              cpu: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.podMetricsLayout.overviewSection.cpuUsageSeriesLabel',
+                  {
+                    defaultMessage: 'CPU Usage',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'percent',
+                gaugeMax: 1,
+              },
+              memory: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.podMetricsLayout.overviewSection.memoryUsageSeriesLabel',
+                  {
+                    defaultMessage: 'Memory Usage',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'percent',
+                gaugeMax: 1,
+              },
+              rx: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.podMetricsLayout.overviewSection.inboundRXSeriesLabel',
+                  {
+                    defaultMessage: 'Inbound (RX)',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'bits',
+                formatterTemplate: '{{value}}/s',
+              },
+              tx: {
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.podMetricsLayout.overviewSection.outboundTXSeriesLabel',
+                  {
+                    defaultMessage: 'Outbound (TX)',
+                  }
+                ),
+                color: theme.eui.euiColorFullShade,
+                formatter: 'bits',
+                formatterTemplate: '{{value}}/s',
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="podCpuUsage"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.podMetricsLayout.cpuUsageSection.sectionLabel',
+            {
+              defaultMessage: 'CPU Usage',
+            }
+          )}
+        >
+          <ChartSectionVis
+            formatter="percent"
+            type="area"
+            seriesOverrides={{
+              cpu: { color: theme.eui.euiColorVis1 },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="podMemoryUsage"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.podMetricsLayout.memoryUsageSection.sectionLabel',
+            {
+              defaultMessage: 'Memory Usage',
+            }
+          )}
+        >
+          <ChartSectionVis
+            type="area"
+            formatter="percent"
+            seriesOverrides={{
+              memory: {
+                color: theme.eui.euiColorVis1,
+              },
+            }}
+          />
+        </SubSection>
+        <SubSection
+          id="podNetworkTraffic"
+          label={i18n.translate(
+            'xpack.infra.metricDetailPage.podMetricsLayout.networkTrafficSection.sectionLabel',
+            {
+              defaultMessage: 'Network Traffic',
+            }
+          )}
+        >
+          <ChartSectionVis
+            formatter="bits"
+            formatterTemplate="{{value}}/s"
+            type="area"
+            seriesOverrides={{
+              rx: {
+                color: theme.eui.euiColorVis1,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.podMetricsLayout.networkTrafficSection.networkRxRateSeriesLabel',
+                  {
+                    defaultMessage: 'in',
+                  }
+                ),
+              },
+              tx: {
+                color: theme.eui.euiColorVis2,
+                name: i18n.translate(
+                  'xpack.infra.metricDetailPage.podMetricsLayout.networkTrafficSection.networkTxRateSeriesLabel',
+                  {
+                    defaultMessage: 'out',
+                  }
+                ),
+              },
+            }}
+          />
+        </SubSection>
+      </Section>
+      <Nginx.Layout metrics={metrics} />
+    </LayoutContent>
   </React.Fragment>
 ));
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/shared/compontents/cloud_toolbar_items.tsx b/x-pack/legacy/plugins/infra/common/inventory_models/shared/compontents/cloud_toolbar_items.tsx
new file mode 100644
index 0000000000000..7150d58be4eb7
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/shared/compontents/cloud_toolbar_items.tsx
@@ -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 React from 'react';
+import { EuiFlexItem } from '@elastic/eui';
+import { ToolbarProps } from '../../../../public/components/inventory/toolbars/toolbar';
+import { WaffleAccountsControls } from '../../../../public/components/waffle/waffle_accounts_controls';
+import { WaffleRegionControls } from '../../../../public/components/waffle/waffle_region_controls';
+
+type Props = ToolbarProps;
+
+export const CloudToolbarItems = (props: Props) => {
+  return (
+    <>
+      {props.accounts.length > 0 && (
+        <EuiFlexItem grow={false}>
+          <WaffleAccountsControls
+            changeAccount={props.changeAccount}
+            accountId={props.accountId}
+            options={props.accounts}
+          />
+        </EuiFlexItem>
+      )}
+      {props.regions.length > 0 && (
+        <EuiFlexItem grow={false}>
+          <WaffleRegionControls
+            changeRegion={props.changeRegion}
+            region={props.region}
+            options={props.regions}
+          />
+        </EuiFlexItem>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/common/inventory_models/types.ts b/x-pack/legacy/plugins/infra/common/inventory_models/types.ts
index e1cbdcb52ff27..cc2396547edc4 100644
--- a/x-pack/legacy/plugins/infra/common/inventory_models/types.ts
+++ b/x-pack/legacy/plugins/infra/common/inventory_models/types.ts
@@ -320,7 +320,7 @@ export interface InventoryMetrics {
 export interface InventoryModel {
   id: string;
   displayName: string;
-  requiredModules: string[];
+  requiredModule: string;
   fields: {
     id: string;
     name: string;
diff --git a/x-pack/legacy/plugins/infra/common/log_analysis/job_parameters.ts b/x-pack/legacy/plugins/infra/common/log_analysis/job_parameters.ts
index 626e90b65a7d8..8c08e24d8665d 100644
--- a/x-pack/legacy/plugins/infra/common/log_analysis/job_parameters.ts
+++ b/x-pack/legacy/plugins/infra/common/log_analysis/job_parameters.ts
@@ -8,6 +8,8 @@ import * as rt from 'io-ts';
 
 export const bucketSpan = 900000;
 
+export const categoriesMessageField = 'message';
+
 export const partitionField = 'event.dataset';
 
 export const getJobIdPrefix = (spaceId: string, sourceId: string) =>
diff --git a/x-pack/legacy/plugins/infra/common/log_summary/index.ts b/x-pack/legacy/plugins/infra/common/log_summary/index.ts
deleted file mode 100644
index 3fb97a5cc20d0..0000000000000
--- a/x-pack/legacy/plugins/infra/common/log_summary/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 './log_summary';
diff --git a/x-pack/legacy/plugins/infra/common/log_summary/log_summary.ts b/x-pack/legacy/plugins/infra/common/log_summary/log_summary.ts
deleted file mode 100644
index 79d8fcc9fa60f..0000000000000
--- a/x-pack/legacy/plugins/infra/common/log_summary/log_summary.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 interface LogSummaryBucket {
-  count: number;
-  end: number;
-  start: number;
-}
-
-export type SummaryBucketSize = 'y' | 'M' | 'w' | 'd' | 'h' | 'm' | 's';
diff --git a/x-pack/legacy/plugins/infra/index.ts b/x-pack/legacy/plugins/infra/index.ts
index 5466f2572a48e..196950b51be3a 100644
--- a/x-pack/legacy/plugins/infra/index.ts
+++ b/x-pack/legacy/plugins/infra/index.ts
@@ -14,12 +14,12 @@ import { getConfigSchema } from './server/kibana.index';
 import { savedObjectMappings } from './server/saved_objects';
 import { plugin, InfraServerPluginDeps } from './server/new_platform_index';
 import { InfraSetup } from '../../../plugins/infra/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '../../../plugins/features/server';
+import { SpacesPluginSetup } from '../../../plugins/spaces/server';
+import { VisTypeTimeseriesSetup } from '../../../../src/plugins/vis_type_timeseries/server';
 import { APMPluginContract } from '../../../plugins/apm/server';
 
-const APP_ID = 'infra';
-const logsSampleDataLinkLabel = i18n.translate('xpack.infra.sampleDataLinkLabel', {
-  defaultMessage: 'Logs',
-});
+export const APP_ID = 'infra';
 
 export function infra(kibana: any) {
   return new kibana.Plugin({
@@ -86,23 +86,14 @@ export function infra(kibana: any) {
       } as unknown) as PluginInitializerContext;
       // NP_TODO: Use real types from the other plugins as they are migrated
       const pluginDeps: InfraServerPluginDeps = {
+        home: legacyServer.newPlatform.setup.plugins.home,
         usageCollection: plugins.usageCollection as UsageCollectionSetup,
         indexPatterns: {
           indexPatternsServiceFactory: legacyServer.indexPatternsServiceFactory,
         },
-        metrics: legacyServer.plugins.metrics,
-        spaces: plugins.spaces,
-        features: plugins.features,
-        // NP_NOTE: [TSVB_GROUP] Huge hack to make TSVB (getVisData()) work with raw requests that
-        // originate from the New Platform router (and are very different to the old request object).
-        // Once TSVB has migrated over to NP, and can work with the new raw requests, or ideally just
-        // the requestContext, this can be removed.
-        ___legacy: {
-          tsvb: {
-            elasticsearch: legacyServer.plugins.elasticsearch,
-            __internals: legacyServer.newPlatform.__internals,
-          },
-        },
+        metrics: plugins.metrics as VisTypeTimeseriesSetup,
+        spaces: plugins.spaces as SpacesPluginSetup,
+        features: plugins.features as FeaturesPluginSetup,
         apm: plugins.apm as APMPluginContract,
       };
 
@@ -113,20 +104,11 @@ export function infra(kibana: any) {
 
       const libs = infraPluginInstance.getLibs();
 
-      // NP_TODO how do we replace this? Answer: return from setup function.
+      // NP_NOTE: Left here for now for legacy plugins to consume
       legacyServer.expose(
         'defineInternalSourceConfiguration',
         libs.sources.defineInternalSourceConfiguration.bind(libs.sources)
       );
-
-      // NP_TODO: How do we move this to new platform?
-      legacyServer.addAppLinksToSampleDataset('logs', [
-        {
-          path: `/app/${APP_ID}#/logs`,
-          label: logsSampleDataLinkLabel,
-          icon: 'logsApp',
-        },
-      ]);
     },
   });
 }
diff --git a/x-pack/legacy/plugins/infra/public/app.ts b/x-pack/legacy/plugins/infra/public/app.ts
index 255c51c9e48ce..4b14e168eb768 100644
--- a/x-pack/legacy/plugins/infra/public/app.ts
+++ b/x-pack/legacy/plugins/infra/public/app.ts
@@ -4,4 +4,51 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import './apps/kibana_app';
+// NP_TODO: This app.ts layer is needed until we migrate 100% to the NP.
+// This is so other plugins can import from our public/index file without trying to
+// actually mount and run our application. Once in the NP this won't be an issue
+// as the NP will look for an export named "plugin" and run that from the index file.
+
+import { npStart } from 'ui/new_platform';
+import { PluginInitializerContext } from 'kibana/public';
+import chrome from 'ui/chrome';
+// @ts-ignore
+import { uiModules } from 'ui/modules';
+import uiRoutes from 'ui/routes';
+// @ts-ignore
+import { timezoneProvider } from 'ui/vis/lib/timezone';
+import { plugin } from './new_platform_index';
+
+const ROOT_ELEMENT_ID = 'react-infra-root';
+export { ROOT_ELEMENT_ID };
+
+const { core, plugins } = npStart;
+const __LEGACY = {
+  uiModules,
+  uiRoutes,
+  timezoneProvider,
+};
+// This will be moved to core.application.register when the new platform
+// migration is complete.
+// @ts-ignore
+chrome.setRootTemplate(`
+  <main
+    id="${ROOT_ELEMENT_ID}"
+    class="infReactRoot"
+  ></main>
+`);
+
+const checkForRoot = () => {
+  return new Promise(resolve => {
+    const ready = !!document.getElementById(ROOT_ELEMENT_ID);
+    if (ready) {
+      resolve();
+    } else {
+      setTimeout(() => resolve(checkForRoot()), 10);
+    }
+  });
+};
+
+checkForRoot().then(() => {
+  plugin({} as PluginInitializerContext).start(core, plugins, __LEGACY);
+});
diff --git a/x-pack/legacy/plugins/infra/public/apps/kibana_app.ts b/x-pack/legacy/plugins/infra/public/apps/kibana_app.ts
deleted file mode 100644
index 5c5687c6c1283..0000000000000
--- a/x-pack/legacy/plugins/infra/public/apps/kibana_app.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.
- */
-
-import { compose } from '../lib/compose/kibana_compose';
-import { startApp } from './start_app';
-startApp(compose());
diff --git a/x-pack/legacy/plugins/infra/public/apps/start_app.tsx b/x-pack/legacy/plugins/infra/public/apps/start_app.tsx
index 41479cf6351ec..8ccb051724ede 100644
--- a/x-pack/legacy/plugins/infra/public/apps/start_app.tsx
+++ b/x-pack/legacy/plugins/infra/public/apps/start_app.tsx
@@ -6,16 +6,15 @@
 
 import { createHashHistory } from 'history';
 import React from 'react';
+import ReactDOM from 'react-dom';
 import { ApolloProvider } from 'react-apollo';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 import { BehaviorSubject } from 'rxjs';
 import { pluck } from 'rxjs/operators';
+import { CoreStart } from 'kibana/public';
 
 // TODO use theme provided from parentApp when kibana supports it
 import { EuiErrorBoundary } from '@elastic/eui';
-import { UICapabilitiesProvider } from 'ui/capabilities/react';
-import { I18nContext } from 'ui/i18n';
-import { npStart } from 'ui/new_platform';
 import { EuiThemeProvider } from '../../../../common/eui_styled_components';
 import { InfraFrontendLibs } from '../lib/lib';
 import { PageRouter } from '../routes';
@@ -27,12 +26,10 @@ import {
   useUiSetting$,
   KibanaContextProvider,
 } from '../../../../../../src/plugins/kibana_react/public';
-
-const { uiSettings } = npStart.core;
-
-export async function startApp(libs: InfraFrontendLibs) {
+import { ROOT_ELEMENT_ID } from '../app';
+// NP_TODO: Type plugins
+export async function startApp(libs: InfraFrontendLibs, core: CoreStart, plugins: any) {
   const history = createHashHistory();
-
   const libs$ = new BehaviorSubject(libs);
   const store = createStore({
     apolloClient: libs$.pipe(pluck('apolloClient')),
@@ -43,31 +40,35 @@ export async function startApp(libs: InfraFrontendLibs) {
     const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
 
     return (
-      <I18nContext>
-        <UICapabilitiesProvider>
-          <EuiErrorBoundary>
-            <ReduxStoreProvider store={store}>
-              <ReduxStateContextProvider>
-                <ApolloProvider client={libs.apolloClient}>
-                  <ApolloClientContext.Provider value={libs.apolloClient}>
-                    <EuiThemeProvider darkMode={darkMode}>
-                      <HistoryContext.Provider value={history}>
-                        <PageRouter history={history} />
-                      </HistoryContext.Provider>
-                    </EuiThemeProvider>
-                  </ApolloClientContext.Provider>
-                </ApolloProvider>
-              </ReduxStateContextProvider>
-            </ReduxStoreProvider>
-          </EuiErrorBoundary>
-        </UICapabilitiesProvider>
-      </I18nContext>
+      <core.i18n.Context>
+        <EuiErrorBoundary>
+          <ReduxStoreProvider store={store}>
+            <ReduxStateContextProvider>
+              <ApolloProvider client={libs.apolloClient}>
+                <ApolloClientContext.Provider value={libs.apolloClient}>
+                  <EuiThemeProvider darkMode={darkMode}>
+                    <HistoryContext.Provider value={history}>
+                      <PageRouter history={history} />
+                    </HistoryContext.Provider>
+                  </EuiThemeProvider>
+                </ApolloClientContext.Provider>
+              </ApolloProvider>
+            </ReduxStateContextProvider>
+          </ReduxStoreProvider>
+        </EuiErrorBoundary>
+      </core.i18n.Context>
     );
   };
 
-  libs.framework.render(
-    <KibanaContextProvider services={{ uiSettings }}>
+  const node = await document.getElementById(ROOT_ELEMENT_ID);
+
+  const App = (
+    <KibanaContextProvider services={{ ...core, ...plugins }}>
       <InfraPluginRoot />
     </KibanaContextProvider>
   );
+
+  if (node) {
+    ReactDOM.render(App, node);
+  }
 }
diff --git a/x-pack/legacy/plugins/infra/public/apps/testing_app.ts b/x-pack/legacy/plugins/infra/public/apps/testing_app.ts
deleted file mode 100644
index bcd7d0e592644..0000000000000
--- a/x-pack/legacy/plugins/infra/public/apps/testing_app.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.
- */
-
-import { compose } from '../lib/compose/testing_compose';
-import { startApp } from './start_app';
-startApp(compose());
diff --git a/x-pack/legacy/plugins/infra/public/components/header/external_header.tsx b/x-pack/legacy/plugins/infra/public/components/header/external_header.tsx
deleted file mode 100644
index 4649241d2a0c8..0000000000000
--- a/x-pack/legacy/plugins/infra/public/components/header/external_header.tsx
+++ /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 isEqual from 'lodash/fp/isEqual';
-import React from 'react';
-
-import { Badge } from 'ui/chrome/api/badge';
-import { Breadcrumb } from 'ui/chrome/api/breadcrumbs';
-
-interface ExternalHeaderProps {
-  breadcrumbs?: Breadcrumb[];
-  setBreadcrumbs: (breadcrumbs: Breadcrumb[]) => void;
-  badge: Badge | undefined;
-  setBadge: (badge: Badge | undefined) => void;
-}
-
-export class ExternalHeader extends React.Component<ExternalHeaderProps> {
-  public componentDidMount() {
-    this.setBreadcrumbs();
-    this.setBadge();
-  }
-
-  public componentDidUpdate(prevProps: ExternalHeaderProps) {
-    if (!isEqual(this.props.breadcrumbs, prevProps.breadcrumbs)) {
-      this.setBreadcrumbs();
-    }
-
-    if (!isEqual(this.props.badge, prevProps.badge)) {
-      this.setBadge();
-    }
-  }
-
-  public render() {
-    return null;
-  }
-
-  private setBadge = () => {
-    this.props.setBadge(this.props.badge);
-  };
-
-  private setBreadcrumbs = () => {
-    this.props.setBreadcrumbs(this.props.breadcrumbs || []);
-  };
-}
diff --git a/x-pack/legacy/plugins/infra/public/components/header/header.tsx b/x-pack/legacy/plugins/infra/public/components/header/header.tsx
index 5ff8472e94ddc..731e62b927ae4 100644
--- a/x-pack/legacy/plugins/infra/public/components/header/header.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/header/header.tsx
@@ -4,40 +4,51 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-
+import { useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
-
-import { Breadcrumb } from 'ui/chrome/api/breadcrumbs';
-import { WithKibanaChrome } from '../../containers/with_kibana_chrome';
-import { ExternalHeader } from './external_header';
+import { ChromeBreadcrumb } from 'src/core/public';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 interface HeaderProps {
-  breadcrumbs?: Breadcrumb[];
+  breadcrumbs?: ChromeBreadcrumb[];
   readOnlyBadge?: boolean;
 }
 
-export const Header = ({ breadcrumbs = [], readOnlyBadge = false }: HeaderProps) => (
-  <WithKibanaChrome>
-    {({ setBreadcrumbs, setBadge }) => (
-      <ExternalHeader
-        breadcrumbs={breadcrumbs}
-        setBreadcrumbs={setBreadcrumbs}
-        badge={
-          readOnlyBadge
-            ? {
-                text: i18n.translate('xpack.infra.header.badge.readOnly.text', {
-                  defaultMessage: 'Read only',
-                }),
-                tooltip: i18n.translate('xpack.infra.header.badge.readOnly.tooltip', {
-                  defaultMessage: 'Unable to change source configuration',
-                }),
-                iconType: 'glasses',
-              }
-            : undefined
-        }
-        setBadge={setBadge}
-      />
-    )}
-  </WithKibanaChrome>
-);
+export const Header = ({ breadcrumbs = [], readOnlyBadge = false }: HeaderProps) => {
+  const chrome = useKibana().services.chrome;
+
+  const badge = readOnlyBadge
+    ? {
+        text: i18n.translate('xpack.infra.header.badge.readOnly.text', {
+          defaultMessage: 'Read only',
+        }),
+        tooltip: i18n.translate('xpack.infra.header.badge.readOnly.tooltip', {
+          defaultMessage: 'Unable to change source configuration',
+        }),
+        iconType: 'glasses',
+      }
+    : undefined;
+
+  const setBreadcrumbs = useCallback(() => {
+    return chrome?.setBreadcrumbs(breadcrumbs || []);
+  }, [breadcrumbs, chrome]);
+
+  const setBadge = useCallback(() => {
+    return chrome?.setBadge(badge);
+  }, [badge, chrome]);
+
+  useEffect(() => {
+    setBreadcrumbs();
+    setBadge();
+  }, [setBreadcrumbs, setBadge]);
+
+  useEffect(() => {
+    setBreadcrumbs();
+  }, [breadcrumbs, setBreadcrumbs]);
+
+  useEffect(() => {
+    setBadge();
+  }, [badge, setBadge]);
+
+  return null;
+};
diff --git a/x-pack/legacy/plugins/infra/public/components/help_center_content.tsx b/x-pack/legacy/plugins/infra/public/components/help_center_content.tsx
index 3095230ab8311..4b27c6cfce53f 100644
--- a/x-pack/legacy/plugins/infra/public/components/help_center_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/help_center_content.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { useEffect } from 'react';
-import chrome from 'ui/chrome';
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 
 interface HelpCenterContentProps {
   feedbackLink: string;
@@ -13,8 +13,10 @@ interface HelpCenterContentProps {
 }
 
 export const HelpCenterContent: React.FC<HelpCenterContentProps> = ({ feedbackLink, appName }) => {
+  const chrome = useKibana().services.chrome;
+
   useEffect(() => {
-    chrome.helpExtension.set({
+    return chrome?.setHelpExtension({
       appName,
       links: [
         {
@@ -23,7 +25,7 @@ export const HelpCenterContent: React.FC<HelpCenterContentProps> = ({ feedbackLi
         },
       ],
     });
-  }, [feedbackLink, appName]);
+  }, [feedbackLink, appName, chrome]);
 
   return null;
 };
diff --git a/x-pack/legacy/plugins/infra/public/components/inventory/layout.tsx b/x-pack/legacy/plugins/infra/public/components/inventory/layout.tsx
index cb48c99963d17..2d4205c4a3642 100644
--- a/x-pack/legacy/plugins/infra/public/components/inventory/layout.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/inventory/layout.tsx
@@ -17,6 +17,7 @@ import { NodesOverview } from '../nodes_overview';
 import { Toolbar } from './toolbars/toolbar';
 import { PageContent } from '../page';
 import { useSnapshot } from '../../containers/waffle/use_snaphot';
+import { useInventoryMeta } from '../../containers/inventory_metadata/use_inventory_meta';
 
 export interface LayoutProps {
   options: InfraWaffleMapOptions;
@@ -32,20 +33,26 @@ export interface LayoutProps {
   metric: InfraSnapshotMetricInput;
   groupBy: InfraSnapshotGroupbyInput[];
   sourceId: string;
+  accountId: string;
+  region: string;
 }
 
 export const Layout = (props: LayoutProps) => {
-  const { loading, nodes, reload } = useSnapshot(
+  const { accounts, regions } = useInventoryMeta(props.sourceId, props.nodeType);
+  const { loading, nodes, reload, interval } = useSnapshot(
     props.filterQuery,
     props.metric,
     props.groupBy,
     props.nodeType,
     props.sourceId,
-    props.currentTime
+    props.currentTime,
+    props.accountId,
+    props.region
   );
+
   return (
     <>
-      <Toolbar nodeType={props.nodeType} />
+      <Toolbar accounts={accounts} regions={regions} nodeType={props.nodeType} />
       <PageContent>
         <NodesOverview
           nodes={nodes}
@@ -59,6 +66,7 @@ export const Layout = (props: LayoutProps) => {
           view={props.view}
           autoBounds={props.autoBounds}
           boundsOverride={props.boundsOverride}
+          interval={interval}
         />
       </PageContent>
     </>
diff --git a/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar.tsx b/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar.tsx
index 7cf9b1c292409..1188e486385ea 100644
--- a/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/inventory/toolbars/toolbar.tsx
@@ -7,6 +7,7 @@
 import React, { FunctionComponent } from 'react';
 import { Action } from 'typescript-fsa';
 import { EuiFlexItem } from '@elastic/eui';
+import { InventoryCloudAccount } from '../../../../common/http_api/inventory_meta_api';
 import { findToolbar } from '../../../../common/inventory_models/toolbars';
 import {
   InfraNodeType,
@@ -27,18 +28,28 @@ export interface ToolbarProps {
   changeMetric: (payload: InfraSnapshotMetricInput) => Action<InfraSnapshotMetricInput>;
   changeGroupBy: (payload: InfraSnapshotGroupbyInput[]) => Action<InfraSnapshotGroupbyInput[]>;
   changeCustomOptions: (payload: InfraGroupByOptions[]) => Action<InfraGroupByOptions[]>;
+  changeAccount: (id: string) => Action<string>;
+  changeRegion: (name: string) => Action<string>;
   customOptions: ReturnType<typeof waffleOptionsSelectors.selectCustomOptions>;
   groupBy: ReturnType<typeof waffleOptionsSelectors.selectGroupBy>;
   metric: ReturnType<typeof waffleOptionsSelectors.selectMetric>;
   nodeType: ReturnType<typeof waffleOptionsSelectors.selectNodeType>;
+  accountId: ReturnType<typeof waffleOptionsSelectors.selectAccountId>;
+  region: ReturnType<typeof waffleOptionsSelectors.selectRegion>;
+  accounts: InventoryCloudAccount[];
+  regions: string[];
 }
 
-const wrapToolbarItems = (ToolbarItems: FunctionComponent<ToolbarProps>) => {
+const wrapToolbarItems = (
+  ToolbarItems: FunctionComponent<ToolbarProps>,
+  accounts: InventoryCloudAccount[],
+  regions: string[]
+) => {
   return (
     <ToolbarWrapper>
       {props => (
         <>
-          <ToolbarItems {...props} />
+          <ToolbarItems {...props} accounts={accounts} regions={regions} />
           <EuiFlexItem grow={true} />
           <EuiFlexItem grow={false}>
             <WithWaffleViewState indexPattern={props.createDerivedIndexPattern('metrics')}>
@@ -58,7 +69,12 @@ const wrapToolbarItems = (ToolbarItems: FunctionComponent<ToolbarProps>) => {
   );
 };
 
-export const Toolbar = ({ nodeType }: { nodeType: InfraNodeType }) => {
+interface Props {
+  nodeType: InfraNodeType;
+  regions: string[];
+  accounts: InventoryCloudAccount[];
+}
+export const Toolbar = ({ nodeType, accounts, regions }: Props) => {
   const ToolbarItems = findToolbar(nodeType);
-  return wrapToolbarItems(ToolbarItems);
+  return wrapToolbarItems(ToolbarItems, accounts, regions);
 };
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 c4721fee4b746..9a31544ce4cce 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
@@ -15,7 +15,7 @@ import { fieldToName } from '../../waffle/lib/field_to_display_name';
 import { InfraSnapshotMetricType } from '../../../graphql/types';
 
 interface Props {
-  children: (props: ToolbarProps) => React.ReactElement;
+  children: (props: Omit<ToolbarProps, 'accounts' | 'regions'>) => React.ReactElement;
 }
 
 export const ToolbarWrapper = (props: Props) => {
@@ -29,20 +29,28 @@ export const ToolbarWrapper = (props: Props) => {
                 changeMetric,
                 changeGroupBy,
                 changeCustomOptions,
+                changeAccount,
+                changeRegion,
                 customOptions,
                 groupBy,
                 metric,
                 nodeType,
+                accountId,
+                region,
               }) =>
                 props.children({
                   createDerivedIndexPattern,
                   changeMetric,
                   changeGroupBy,
+                  changeAccount,
+                  changeRegion,
                   changeCustomOptions,
                   customOptions,
                   groupBy,
                   metric,
                   nodeType,
+                  region,
+                  accountId,
                 })
               }
             </WithWaffleOptions>
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
index c5d83e1c205cc..536dd24faa7c1 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
@@ -8,10 +8,9 @@ import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 import { encode } from 'rison-node';
-import chrome from 'ui/chrome';
 import { QueryString } from 'ui/utils/query_string';
 import url from 'url';
-
+import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { TimeRange } from '../../../../common/http_api/shared/time_range';
 
 export const AnalyzeInMlButton: React.FunctionComponent<{
@@ -19,7 +18,11 @@ export const AnalyzeInMlButton: React.FunctionComponent<{
   partition?: string;
   timeRange: TimeRange;
 }> = ({ jobId, partition, timeRange }) => {
-  const pathname = chrome.addBasePath('/app/ml');
+  const prependBasePath = useKibana().services.http?.basePath?.prepend;
+  if (!prependBasePath) {
+    return null;
+  }
+  const pathname = prependBasePath('/app/ml');
   const buttonLabel = (
     <FormattedMessage
       id="xpack.infra.logs.analysis.analyzeInMlButtonLabel"
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/index.ts b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/index.ts
new file mode 100644
index 0000000000000..c7a49a90a7886
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/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 * from './setup_page';
+
+export * from './initial_configuration_step';
+export * from './process_step';
+
+export * from './ml_unavailable_prompt';
+export * from './setup_status_unknown_prompt';
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/analysis_setup_indices_form.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/analysis_setup_indices_form.tsx
similarity index 95%
rename from x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/analysis_setup_indices_form.tsx
rename to x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/analysis_setup_indices_form.tsx
index 5a4c21670191e..3334e565f70f7 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/analysis_setup_indices_form.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/analysis_setup_indices_form.tsx
@@ -8,11 +8,9 @@ import { EuiCode, EuiDescribedFormGroup, EuiFormRow, EuiCheckbox, EuiToolTip } f
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { useCallback, useMemo } from 'react';
-import {
-  ValidatedIndex,
-  ValidationIndicesUIError,
-} from '../../../../../containers/logs/log_analysis/log_analysis_setup_state';
-import { LoadingOverlayWrapper } from '../../../../../components/loading_overlay_wrapper';
+
+import { LoadingOverlayWrapper } from '../../../loading_overlay_wrapper';
+import { ValidatedIndex, ValidationIndicesUIError } from './validation';
 
 export const AnalysisSetupIndicesForm: React.FunctionComponent<{
   indices: ValidatedIndex[];
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/analysis_setup_timerange_form.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/analysis_setup_timerange_form.tsx
similarity index 98%
rename from x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/analysis_setup_timerange_form.tsx
rename to x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/analysis_setup_timerange_form.tsx
index 02a25bf134fef..f45d274169497 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/analysis_setup_timerange_form.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/analysis_setup_timerange_form.tsx
@@ -17,7 +17,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import moment, { Moment } from 'moment';
 import React, { useMemo } from 'react';
 
-import { euiStyled } from '../../../../../../../../common/eui_styled_components';
+import { euiStyled } from '../../../../../../../common/eui_styled_components';
 
 const startTimeLabel = i18n.translate('xpack.infra.analysisSetup.startTimeLabel', {
   defaultMessage: 'Start time',
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/index.ts b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/index.ts
new file mode 100644
index 0000000000000..e76bc2e34e240
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './initial_configuration_step';
+export * from './validation';
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/initial_configuration_step.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/initial_configuration_step.tsx
similarity index 85%
rename from x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/initial_configuration_step.tsx
rename to x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/initial_configuration_step.tsx
index 3b5497fb91864..2494b802cdb5b 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/initial_configuration_step.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/initial_configuration_step.tsx
@@ -5,16 +5,14 @@
  */
 
 import { EuiSpacer, EuiForm, EuiCallOut } from '@elastic/eui';
+import { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 
 import { AnalysisSetupIndicesForm } from './analysis_setup_indices_form';
 import { AnalysisSetupTimerangeForm } from './analysis_setup_timerange_form';
-import {
-  ValidatedIndex,
-  ValidationIndicesUIError,
-} from '../../../../../containers/logs/log_analysis/log_analysis_setup_state';
+import { ValidatedIndex, ValidationIndicesUIError } from './validation';
 
 interface InitialConfigurationStepProps {
   setStartTime: (startTime: number | undefined) => void;
@@ -27,6 +25,13 @@ interface InitialConfigurationStepProps {
   validationErrors?: ValidationIndicesUIError[];
 }
 
+export const createInitialConfigurationStep = (
+  props: InitialConfigurationStepProps
+): EuiContainedStepProps => ({
+  title: initialConfigurationStepTitle,
+  children: <InitialConfigurationStep {...props} />,
+});
+
 export const InitialConfigurationStep: React.FunctionComponent<InitialConfigurationStepProps> = ({
   setStartTime,
   setEndTime,
@@ -67,6 +72,13 @@ const errorCalloutTitle = i18n.translate(
   }
 );
 
+const initialConfigurationStepTitle = i18n.translate(
+  'xpack.infra.analysisSetup.configurationStepTitle',
+  {
+    defaultMessage: 'Configuration',
+  }
+);
+
 const ValidationErrors: React.FC<{ errors: ValidationIndicesUIError[] }> = ({ errors }) => {
   if (errors.length === 0) {
     return null;
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/validation.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/validation.tsx
new file mode 100644
index 0000000000000..8b733f66ef4a8
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/initial_configuration_step/validation.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 { ValidationIndicesError } from '../../../../../common/http_api';
+
+export type ValidationIndicesUIError =
+  | ValidationIndicesError
+  | { error: 'NETWORK_ERROR' }
+  | { error: 'TOO_FEW_SELECTED_INDICES' };
+
+interface ValidIndex {
+  validity: 'valid';
+  name: string;
+  isSelected: boolean;
+}
+
+interface InvalidIndex {
+  validity: 'invalid';
+  name: string;
+  errors: ValidationIndicesError[];
+}
+
+export type ValidatedIndex = ValidIndex | InvalidIndex;
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/ml_unavailable_prompt.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/ml_unavailable_prompt.tsx
new file mode 100644
index 0000000000000..63e1bb23a2d82
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/ml_unavailable_prompt.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiButton, EuiEmptyPrompt, EuiLink } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React from 'react';
+
+import euiStyled from '../../../../../../common/eui_styled_components';
+
+export const MlUnavailablePrompt: React.FunctionComponent<{}> = () => (
+  <EmptyPrompt
+    title={
+      <h2>
+        <FormattedMessage
+          id="xpack.infra.logs.analysis.mlUnavailableTitle"
+          defaultMessage="This feature requires Machine Learning"
+        />
+      </h2>
+    }
+    body={
+      <p>
+        <FormattedMessage
+          id="xpack.infra.logs.analysis.mlUnavailableBody"
+          defaultMessage="Check the {machineLearningAppLink} for more information."
+          values={{
+            machineLearningAppLink: (
+              <EuiLink href="ml" target="_blank">
+                <FormattedMessage
+                  id="xpack.infra.logs.analysisPage.unavailable.mlAppLink"
+                  defaultMessage="Machine Learning app"
+                />
+              </EuiLink>
+            ),
+          }}
+        />
+      </p>
+    }
+    actions={
+      <EuiButton target="_blank" href="ml" color="primary" fill>
+        {i18n.translate('xpack.infra.logs.analysis.mlAppButton', {
+          defaultMessage: 'Open Machine Learning',
+        })}
+      </EuiButton>
+    }
+  />
+);
+
+const EmptyPrompt = euiStyled(EuiEmptyPrompt)`
+  align-self: center;
+`;
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/process_step/create_ml_jobs_button.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/process_step/create_ml_jobs_button.tsx
similarity index 100%
rename from x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/process_step/create_ml_jobs_button.tsx
rename to x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/process_step/create_ml_jobs_button.tsx
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/process_step/index.ts b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/process_step/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/process_step/index.ts
rename to x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/process_step/index.ts
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/process_step/process_step.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/process_step/process_step.tsx
similarity index 79%
rename from x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/process_step/process_step.tsx
rename to x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/process_step/process_step.tsx
index 978e45e26b733..a15c7335b4acb 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/process_step/process_step.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/process_step/process_step.tsx
@@ -14,28 +14,42 @@ import {
   EuiCallOut,
   EuiCode,
 } from '@elastic/eui';
+import { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 
-import { SetupStatus } from '../../../../../../common/log_analysis';
+import { SetupStatus } from '../../../../../common/log_analysis';
 import { CreateMLJobsButton } from './create_ml_jobs_button';
 import { RecreateMLJobsButton } from './recreate_ml_jobs_button';
 
 interface ProcessStepProps {
-  cleanupAndSetup: () => void;
+  cleanUpAndSetUp: () => void;
   errorMessages: string[];
   isConfigurationValid: boolean;
-  setup: () => void;
+  setUp: () => void;
   setupStatus: SetupStatus;
   viewResults: () => void;
 }
 
+export const createProcessStep = (props: ProcessStepProps): EuiContainedStepProps => ({
+  title: processStepTitle,
+  children: <ProcessStep {...props} />,
+  status:
+    props.setupStatus === 'pending'
+      ? 'incomplete'
+      : props.setupStatus === 'failed'
+      ? 'danger'
+      : props.setupStatus === 'succeeded'
+      ? 'complete'
+      : undefined,
+});
+
 export const ProcessStep: React.FunctionComponent<ProcessStepProps> = ({
-  cleanupAndSetup,
+  cleanUpAndSetUp,
   errorMessages,
   isConfigurationValid,
-  setup,
+  setUp,
   setupStatus,
   viewResults,
 }) => {
@@ -66,7 +80,7 @@ export const ProcessStep: React.FunctionComponent<ProcessStepProps> = ({
             </EuiCallOut>
           ))}
           <EuiSpacer />
-          <EuiButton fill onClick={cleanupAndSetup}>
+          <EuiButton fill onClick={cleanUpAndSetUp}>
             <FormattedMessage
               id="xpack.infra.analysisSetup.steps.setupProcess.tryAgainButton"
               defaultMessage="Try again"
@@ -88,9 +102,9 @@ export const ProcessStep: React.FunctionComponent<ProcessStepProps> = ({
           </EuiButton>
         </>
       ) : setupStatus === 'requiredForUpdate' || setupStatus === 'requiredForReconfiguration' ? (
-        <RecreateMLJobsButton isDisabled={!isConfigurationValid} onClick={cleanupAndSetup} />
+        <RecreateMLJobsButton isDisabled={!isConfigurationValid} onClick={cleanUpAndSetUp} />
       ) : (
-        <CreateMLJobsButton isDisabled={!isConfigurationValid} onClick={setup} />
+        <CreateMLJobsButton isDisabled={!isConfigurationValid} onClick={setUp} />
       )}
     </EuiText>
   );
@@ -102,3 +116,7 @@ const errorCalloutTitle = i18n.translate(
     defaultMessage: 'An error occurred',
   }
 );
+
+const processStepTitle = i18n.translate('xpack.infra.analysisSetup.actionStepTitle', {
+  defaultMessage: 'Create ML job',
+});
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/process_step/recreate_ml_jobs_button.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/process_step/recreate_ml_jobs_button.tsx
similarity index 100%
rename from x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/process_step/recreate_ml_jobs_button.tsx
rename to x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/process_step/recreate_ml_jobs_button.tsx
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/setup_page.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/setup_page.tsx
new file mode 100644
index 0000000000000..a1c35aff0cf83
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/setup_page.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 {
+  CommonProps,
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPageContentBody,
+  EuiPageContentHeader,
+  EuiPageContentHeaderSection,
+  EuiTitle,
+} from '@elastic/eui';
+import React from 'react';
+
+import euiStyled from '../../../../../../common/eui_styled_components';
+
+export const LogAnalysisSetupPage: React.FunctionComponent<CommonProps> = ({
+  children,
+  ...rest
+}) => {
+  return (
+    <LogEntryRateSetupPage>
+      <EuiPageBody>
+        <LogEntryRateSetupPageContent
+          verticalPosition="center"
+          horizontalPosition="center"
+          {...rest}
+        >
+          {children}
+        </LogEntryRateSetupPageContent>
+      </EuiPageBody>
+    </LogEntryRateSetupPage>
+  );
+};
+
+export const LogAnalysisSetupPageHeader: React.FunctionComponent = ({ children }) => (
+  <EuiPageContentHeader>
+    <EuiPageContentHeaderSection>
+      <EuiTitle size="m">
+        <h3>{children}</h3>
+      </EuiTitle>
+    </EuiPageContentHeaderSection>
+  </EuiPageContentHeader>
+);
+
+export const LogAnalysisSetupPageContent = EuiPageContentBody;
+
+// !important due to https://github.com/elastic/eui/issues/2232
+const LogEntryRateSetupPageContent = euiStyled(EuiPageContent)`
+  max-width: 768px !important;
+`;
+
+const LogEntryRateSetupPage = euiStyled(EuiPage)`
+  height: 100%;
+`;
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/setup_status_unknown_prompt.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/setup_status_unknown_prompt.tsx
new file mode 100644
index 0000000000000..f65ff6a1eec78
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_analysis_setup/setup_status_unknown_prompt.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 { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
+import euiStyled from '../../../../../../common/eui_styled_components';
+
+interface Props {
+  retry: () => void;
+}
+
+export const LogAnalysisSetupStatusUnknownPrompt: React.FunctionComponent<Props> = ({
+  retry,
+}: Props) => (
+  <EmptyPrompt
+    title={
+      <h2>
+        <FormattedMessage
+          id="xpack.infra.logs.analysis.setupStatusUnknownTitle"
+          defaultMessage="We couldn't determine the status of your ML jobs."
+        />
+      </h2>
+    }
+    actions={
+      <EuiButton onClick={() => retry()} color="primary" fill>
+        {i18n.translate('xpack.infra.logs.analysis.setupStatusTryAgainButton', {
+          defaultMessage: 'Try again',
+        })}
+      </EuiButton>
+    }
+  />
+);
+
+const EmptyPrompt = euiStyled(EuiEmptyPrompt)`
+  align-self: center;
+`;
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
index 0d20e7b733dfa..4137027f35c12 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
@@ -8,22 +8,28 @@ import { EuiButtonEmpty, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } f
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { useMemo } from 'react';
 import url from 'url';
-
-import chrome from 'ui/chrome';
-import { InfraLogItem } from '../../../graphql/types';
+import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { useVisibilityState } from '../../../utils/use_visibility_state';
 import { getTraceUrl } from '../../../../../apm/public/components/shared/Links/apm/ExternalLinks';
+import { LogEntriesItem } from '../../../../common/http_api';
 
 const UPTIME_FIELDS = ['container.id', 'host.ip', 'kubernetes.pod.uid'];
 
 export const LogEntryActionsMenu: React.FunctionComponent<{
-  logItem: InfraLogItem;
+  logItem: LogEntriesItem;
 }> = ({ logItem }) => {
+  const prependBasePath = useKibana().services.http?.basePath?.prepend;
   const { hide, isVisible, show } = useVisibilityState(false);
 
-  const uptimeLink = useMemo(() => getUptimeLink(logItem), [logItem]);
+  const uptimeLink = useMemo(() => {
+    const link = getUptimeLink(logItem);
+    return prependBasePath && link ? prependBasePath(link) : link;
+  }, [logItem, prependBasePath]);
 
-  const apmLink = useMemo(() => getAPMLink(logItem), [logItem]);
+  const apmLink = useMemo(() => {
+    const link = getAPMLink(logItem);
+    return prependBasePath && link ? prependBasePath(link) : link;
+  }, [logItem, prependBasePath]);
 
   const menuItems = useMemo(
     () => [
@@ -56,7 +62,6 @@ export const LogEntryActionsMenu: React.FunctionComponent<{
   );
 
   const hasMenuItems = useMemo(() => menuItems.length > 0, [menuItems]);
-
   return (
     <EuiPopover
       anchorPosition="downRight"
@@ -84,7 +89,7 @@ export const LogEntryActionsMenu: React.FunctionComponent<{
   );
 };
 
-const getUptimeLink = (logItem: InfraLogItem) => {
+const getUptimeLink = (logItem: LogEntriesItem) => {
   const searchExpressions = logItem.fields
     .filter(({ field, value }) => value != null && UPTIME_FIELDS.includes(field))
     .map(({ field, value }) => `${field}:${value}`);
@@ -94,12 +99,12 @@ const getUptimeLink = (logItem: InfraLogItem) => {
   }
 
   return url.format({
-    pathname: chrome.addBasePath('/app/uptime'),
+    pathname: '/app/uptime',
     hash: `/?search=(${searchExpressions.join(' OR ')})`,
   });
 };
 
-const getAPMLink = (logItem: InfraLogItem) => {
+const getAPMLink = (logItem: LogEntriesItem) => {
   const traceIdEntry = logItem.fields.find(
     ({ field, value }) => value != null && field === 'trace.id'
   );
@@ -123,7 +128,7 @@ const getAPMLink = (logItem: InfraLogItem) => {
     : { rangeFrom: 'now-1y', rangeTo: 'now' };
 
   return url.format({
-    pathname: chrome.addBasePath('/app/apm'),
+    pathname: '/app/apm',
     hash: getTraceUrl({ traceId: traceIdEntry.value, rangeFrom, rangeTo }),
   });
 };
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx
index ed61c70afb73f..d2cb9cf9370dd 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx
@@ -22,12 +22,12 @@ import React, { useCallback, useMemo } from 'react';
 
 import euiStyled from '../../../../../../common/eui_styled_components';
 import { TimeKey } from '../../../../common/time';
-import { InfraLogItem, InfraLogItemField } from '../../../graphql/types';
 import { InfraLoadingPanel } from '../../loading';
 import { LogEntryActionsMenu } from './log_entry_actions_menu';
+import { LogEntriesItem, LogEntriesItemField } from '../../../../common/http_api';
 
 interface Props {
-  flyoutItem: InfraLogItem | null;
+  flyoutItem: LogEntriesItem | null;
   setFlyoutVisibility: (visible: boolean) => void;
   setFilter: (filter: string) => void;
   setTarget: (timeKey: TimeKey, flyoutItemId: string) => void;
@@ -43,7 +43,7 @@ export const LogEntryFlyout = ({
   setTarget,
 }: Props) => {
   const createFilterHandler = useCallback(
-    (field: InfraLogItemField) => () => {
+    (field: LogEntriesItemField) => () => {
       const filter = `${field.field}:"${field.value}"`;
       setFilter(filter);
 
@@ -80,7 +80,7 @@ export const LogEntryFlyout = ({
           defaultMessage: 'Value',
         }),
         sortable: true,
-        render: (_name: string, item: InfraLogItemField) => (
+        render: (_name: string, item: LogEntriesItemField) => (
           <span>
             <EuiToolTip
               content={i18n.translate('xpack.infra.logFlyout.setFilterTooltip', {
diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
index bf4a09769d254..6516993397e02 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/column_headers.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useContext } from 'react';
 import { transparentize } from 'polished';
 
 import euiStyled from '../../../../../../common/eui_styled_components';
@@ -21,28 +21,26 @@ import {
   LogEntryColumnWidths,
 } from './log_entry_column';
 import { ASSUMED_SCROLLBAR_WIDTH } from './vertical_scroll_panel';
-import { WithLogPosition } from '../../../containers/logs/with_log_position';
+import { LogPositionState } from '../../../containers/logs/log_position';
 import { localizedDate } from '../../../utils/formatters/datetime';
 
 export const LogColumnHeaders: React.FunctionComponent<{
   columnConfigurations: LogColumnConfiguration[];
   columnWidths: LogEntryColumnWidths;
 }> = ({ columnConfigurations, columnWidths }) => {
+  const { firstVisiblePosition } = useContext(LogPositionState.Context);
   return (
     <LogColumnHeadersWrapper>
       {columnConfigurations.map(columnConfiguration => {
         if (isTimestampLogColumnConfiguration(columnConfiguration)) {
           return (
-            <WithLogPosition key={columnConfiguration.timestampColumn.id}>
-              {({ firstVisiblePosition }) => (
-                <LogColumnHeader
-                  columnWidth={columnWidths[columnConfiguration.timestampColumn.id]}
-                  data-test-subj="logColumnHeader timestampLogColumnHeader"
-                >
-                  {firstVisiblePosition ? localizedDate(firstVisiblePosition.time) : 'Timestamp'}
-                </LogColumnHeader>
-              )}
-            </WithLogPosition>
+            <LogColumnHeader
+              key={columnConfiguration.timestampColumn.id}
+              columnWidth={columnWidths[columnConfiguration.timestampColumn.id]}
+              data-test-subj="logColumnHeader timestampLogColumnHeader"
+            >
+              {firstVisiblePosition ? localizedDate(firstVisiblePosition.time) : 'Timestamp'}
+            </LogColumnHeader>
           );
         } else if (isMessageLogColumnConfiguration(columnConfiguration)) {
           return (
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 a5b85788fdea9..84bcfa911125a 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
@@ -55,17 +55,13 @@ interface ScrollableLogTextStreamViewProps {
   setFlyoutVisibility: (visible: boolean) => void;
   highlightedItem: string | null;
   currentHighlightKey: UniqueTimeKey | null;
-  scrollLock: {
-    enable: () => void;
-    disable: () => void;
-    isEnabled: boolean;
-  };
 }
 
 interface ScrollableLogTextStreamViewState {
   target: TimeKey | null;
   targetId: string | null;
   items: StreamItem[];
+  isScrollLocked: boolean;
 }
 
 export class ScrollableLogTextStreamView extends React.PureComponent<
@@ -81,8 +77,7 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
 
     // Prevent new entries from being appended and moving the stream forward when
     // the user has scrolled up during live streaming
-    const nextItems =
-      hasItems && nextProps.scrollLock.isEnabled ? prevState.items : nextProps.items;
+    const nextItems = hasItems && prevState.isScrollLocked ? prevState.items : nextProps.items;
 
     if (nextProps.isStreaming && hasItems) {
       return {
@@ -121,6 +116,7 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
       target: null,
       targetId: null,
       items: props.items,
+      isScrollLocked: false,
     };
   }
 
@@ -137,9 +133,8 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
       lastLoadedTime,
       scale,
       wrap,
-      scrollLock,
     } = this.props;
-    const { targetId, items } = this.state;
+    const { targetId, items, isScrollLocked } = this.state;
     const hasItems = items.length > 0;
     return (
       <ScrollableLogTextStreamViewWrapper>
@@ -187,7 +182,7 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
                         target={targetId}
                         hideScrollbar={true}
                         data-test-subj={'logStream'}
-                        isLocked={scrollLock.isEnabled}
+                        isLocked={isScrollLocked}
                         entriesCount={items.length}
                       >
                         {registerChild => (
@@ -248,7 +243,7 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
                               lastStreamingUpdate={isStreaming ? lastLoadedTime : null}
                               onLoadMore={this.handleLoadNewerItems}
                             />
-                            {scrollLock.isEnabled && (
+                            {isScrollLocked && (
                               <LogTextStreamJumpToTail
                                 width={width}
                                 onClickJump={this.handleJumpToTail}
@@ -308,7 +303,9 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
       fromScroll: boolean;
     }) => {
       if (fromScroll && this.props.isStreaming) {
-        this.props.scrollLock[pagesBelow === 0 ? 'disable' : 'enable']();
+        this.setState({
+          isScrollLocked: pagesBelow !== 0,
+        });
       }
       this.props.reportVisibleInterval({
         endKey: parseStreamItemId(bottomChild),
@@ -322,11 +319,11 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
   );
 
   private handleJumpToTail = () => {
-    const { items, scrollLock } = this.props;
-    scrollLock.disable();
+    const { items } = this.props;
     const lastItemTarget = getStreamItemId(items[items.length - 1]);
     this.setState({
       targetId: lastItemTarget,
+      isScrollLocked: false,
     });
   };
 }
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/aggregation.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/aggregation.tsx
index d498ba1229b44..3550cfc9e03ee 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/aggregation.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/aggregation.tsx
@@ -10,6 +10,10 @@ import { i18n } from '@kbn/i18n';
 import React, { useCallback } from 'react';
 import { MetricsExplorerAggregation } from '../../../server/routes/metrics_explorer/types';
 import { MetricsExplorerOptions } from '../../containers/metrics_explorer/use_metrics_explorer_options';
+import {
+  metricsExplorerAggregationRT,
+  METRIC_EXPLORER_AGGREGATIONS,
+} from '../../../common/http_api/metrics_explorer';
 
 interface Props {
   options: MetricsExplorerOptions;
@@ -17,43 +21,32 @@ interface Props {
   onChange: (aggregation: MetricsExplorerAggregation) => void;
 }
 
-const isMetricsExplorerAggregation = (subject: any): subject is MetricsExplorerAggregation => {
-  return Object.keys(MetricsExplorerAggregation).includes(subject);
-};
-
 export const MetricsExplorerAggregationPicker = ({ options, onChange }: Props) => {
   const AGGREGATION_LABELS = {
-    [MetricsExplorerAggregation.avg]: i18n.translate(
-      'xpack.infra.metricsExplorer.aggregationLables.avg',
-      { defaultMessage: 'Average' }
-    ),
-    [MetricsExplorerAggregation.max]: i18n.translate(
-      'xpack.infra.metricsExplorer.aggregationLables.max',
-      { defaultMessage: 'Max' }
-    ),
-    [MetricsExplorerAggregation.min]: i18n.translate(
-      'xpack.infra.metricsExplorer.aggregationLables.min',
-      { defaultMessage: 'Min' }
-    ),
-    [MetricsExplorerAggregation.cardinality]: i18n.translate(
-      'xpack.infra.metricsExplorer.aggregationLables.cardinality',
-      { defaultMessage: 'Cardinality' }
-    ),
-    [MetricsExplorerAggregation.rate]: i18n.translate(
-      'xpack.infra.metricsExplorer.aggregationLables.rate',
-      { defaultMessage: 'Rate' }
-    ),
-    [MetricsExplorerAggregation.count]: i18n.translate(
-      'xpack.infra.metricsExplorer.aggregationLables.count',
-      { defaultMessage: 'Document count' }
-    ),
+    ['avg']: i18n.translate('xpack.infra.metricsExplorer.aggregationLables.avg', {
+      defaultMessage: 'Average',
+    }),
+    ['max']: i18n.translate('xpack.infra.metricsExplorer.aggregationLables.max', {
+      defaultMessage: 'Max',
+    }),
+    ['min']: i18n.translate('xpack.infra.metricsExplorer.aggregationLables.min', {
+      defaultMessage: 'Min',
+    }),
+    ['cardinality']: i18n.translate('xpack.infra.metricsExplorer.aggregationLables.cardinality', {
+      defaultMessage: 'Cardinality',
+    }),
+    ['rate']: i18n.translate('xpack.infra.metricsExplorer.aggregationLables.rate', {
+      defaultMessage: 'Rate',
+    }),
+    ['count']: i18n.translate('xpack.infra.metricsExplorer.aggregationLables.count', {
+      defaultMessage: 'Document count',
+    }),
   };
 
   const handleChange = useCallback(
     e => {
       const aggregation =
-        (isMetricsExplorerAggregation(e.target.value) && e.target.value) ||
-        MetricsExplorerAggregation.avg;
+        (metricsExplorerAggregationRT.is(e.target.value) && e.target.value) || 'avg';
       onChange(aggregation);
     },
     [onChange]
@@ -66,7 +59,7 @@ export const MetricsExplorerAggregationPicker = ({ options, onChange }: Props) =
       })}
       fullWidth
       value={options.aggregation}
-      options={Object.keys(MetricsExplorerAggregation).map(k => ({
+      options={METRIC_EXPLORER_AGGREGATIONS.map(k => ({
         text: AGGREGATION_LABELS[k as MetricsExplorerAggregation],
         value: k,
       }))}
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart.tsx
index 2759ea8124c91..9491fe3024f94 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart.tsx
@@ -7,19 +7,9 @@
 import React, { useCallback, useMemo } from 'react';
 
 import { EuiTitle, EuiToolTip, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import {
-  Axis,
-  Chart,
-  getAxisId,
-  niceTimeFormatter,
-  Position,
-  Settings,
-  TooltipValue,
-} from '@elastic/charts';
+import { Axis, Chart, niceTimeFormatter, Position, Settings, TooltipValue } from '@elastic/charts';
 import { first, last } from 'lodash';
 import moment from 'moment';
-import { UICapabilities } from 'ui/capabilities';
-import { injectUICapabilities } from 'ui/capabilities/react';
 import { MetricsExplorerSeries } from '../../../server/routes/metrics_explorer/types';
 import {
   MetricsExplorerOptions,
@@ -37,6 +27,7 @@ import { MetricsExplorerNoMetrics } from './no_metrics';
 import { getChartTheme } from './helpers/get_chart_theme';
 import { useKibanaUiSetting } from '../../utils/use_kibana_ui_setting';
 import { calculateDomain } from './helpers/calculate_domain';
+import { useKibana, useUiSetting } from '../../../../../../../src/plugins/kibana_react/public';
 
 interface Props {
   title?: string | null;
@@ -49,132 +40,130 @@ interface Props {
   source: SourceQuery.Query['source']['configuration'] | undefined;
   timeRange: MetricsExplorerTimeOptions;
   onTimeChange: (start: string, end: string) => void;
-  uiCapabilities: UICapabilities;
 }
 
-export const MetricsExplorerChart = injectUICapabilities(
-  ({
-    source,
-    options,
-    chartOptions,
-    series,
-    title,
-    onFilter,
-    height = 200,
-    width = '100%',
-    timeRange,
-    onTimeChange,
-    uiCapabilities,
-  }: Props) => {
-    const { metrics } = options;
-    const [dateFormat] = useKibanaUiSetting('dateFormat');
-    const handleTimeChange = (from: number, to: number) => {
-      onTimeChange(moment(from).toISOString(), moment(to).toISOString());
-    };
-    const dateFormatter = useMemo(
-      () =>
-        series.rows.length > 0
-          ? niceTimeFormatter([first(series.rows).timestamp, last(series.rows).timestamp])
-          : (value: number) => `${value}`,
-      [series.rows]
-    );
-    const tooltipProps = {
-      headerFormatter: useCallback(
-        (data: TooltipValue) => moment(data.value).format(dateFormat || 'Y-MM-DD HH:mm:ss.SSS'),
-        [dateFormat]
-      ),
-    };
-    const yAxisFormater = useCallback(createFormatterForMetric(first(metrics)), [options]);
-    const dataDomain = calculateDomain(series, metrics, chartOptions.stack);
-    const domain =
-      chartOptions.yAxisMode === MetricsExplorerYAxisMode.fromZero
-        ? { ...dataDomain, min: 0 }
-        : dataDomain;
-    return (
-      <div style={{ padding: 24 }}>
-        {options.groupBy ? (
-          <EuiTitle size="xs">
-            <EuiFlexGroup alignItems="center">
-              <ChartTitle>
-                <EuiToolTip content={title}>
-                  <span>{title}</span>
-                </EuiToolTip>
-              </ChartTitle>
-              <EuiFlexItem grow={false}>
-                <MetricsExplorerChartContextMenu
-                  timeRange={timeRange}
-                  options={options}
-                  chartOptions={chartOptions}
-                  series={series}
-                  onFilter={onFilter}
-                  source={source}
-                  uiCapabilities={uiCapabilities}
-                />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiTitle>
-        ) : (
-          <EuiFlexGroup justifyContent="flexEnd">
+export const MetricsExplorerChart = ({
+  source,
+  options,
+  chartOptions,
+  series,
+  title,
+  onFilter,
+  height = 200,
+  width = '100%',
+  timeRange,
+  onTimeChange,
+}: Props) => {
+  const uiCapabilities = useKibana().services.application?.capabilities;
+  const isDarkMode = useUiSetting<boolean>('theme:darkMode');
+  const { metrics } = options;
+  const [dateFormat] = useKibanaUiSetting('dateFormat');
+  const handleTimeChange = (from: number, to: number) => {
+    onTimeChange(moment(from).toISOString(), moment(to).toISOString());
+  };
+  const dateFormatter = useMemo(
+    () =>
+      series.rows.length > 0
+        ? niceTimeFormatter([first(series.rows).timestamp, last(series.rows).timestamp])
+        : (value: number) => `${value}`,
+    [series.rows]
+  );
+  const tooltipProps = {
+    headerFormatter: useCallback(
+      (data: TooltipValue) => moment(data.value).format(dateFormat || 'Y-MM-DD HH:mm:ss.SSS'),
+      [dateFormat]
+    ),
+  };
+  const yAxisFormater = useCallback(createFormatterForMetric(first(metrics)), [options]);
+  const dataDomain = calculateDomain(series, metrics, chartOptions.stack);
+  const domain =
+    chartOptions.yAxisMode === MetricsExplorerYAxisMode.fromZero
+      ? { ...dataDomain, min: 0 }
+      : dataDomain;
+  return (
+    <div style={{ padding: 24 }}>
+      {options.groupBy ? (
+        <EuiTitle size="xs">
+          <EuiFlexGroup alignItems="center">
+            <ChartTitle>
+              <EuiToolTip content={title}>
+                <span>{title}</span>
+              </EuiToolTip>
+            </ChartTitle>
             <EuiFlexItem grow={false}>
               <MetricsExplorerChartContextMenu
+                timeRange={timeRange}
                 options={options}
                 chartOptions={chartOptions}
                 series={series}
+                onFilter={onFilter}
                 source={source}
-                timeRange={timeRange}
                 uiCapabilities={uiCapabilities}
               />
             </EuiFlexItem>
           </EuiFlexGroup>
-        )}
-        <div className="infrastructureChart" style={{ height, width }}>
-          {series.rows.length > 0 ? (
-            <Chart>
-              {metrics.map((metric, id) => (
-                <MetricExplorerSeriesChart
-                  type={chartOptions.type}
-                  key={id}
-                  metric={metric}
-                  id={id}
-                  series={series}
-                  stack={chartOptions.stack}
-                />
-              ))}
-              <Axis
-                id={getAxisId('timestamp')}
-                position={Position.Bottom}
-                showOverlappingTicks={true}
-                tickFormat={dateFormatter}
-              />
-              <Axis
-                id={getAxisId('values')}
-                position={Position.Left}
-                tickFormat={yAxisFormater}
-                domain={domain}
-              />
-              <Settings
-                tooltip={tooltipProps}
-                onBrushEnd={handleTimeChange}
-                theme={getChartTheme()}
+        </EuiTitle>
+      ) : (
+        <EuiFlexGroup justifyContent="flexEnd">
+          <EuiFlexItem grow={false}>
+            <MetricsExplorerChartContextMenu
+              options={options}
+              chartOptions={chartOptions}
+              series={series}
+              source={source}
+              timeRange={timeRange}
+              uiCapabilities={uiCapabilities}
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      )}
+      <div className="infrastructureChart" style={{ height, width }}>
+        {series.rows.length > 0 ? (
+          <Chart>
+            {metrics.map((metric, id) => (
+              <MetricExplorerSeriesChart
+                type={chartOptions.type}
+                key={id}
+                metric={metric}
+                id={id}
+                series={series}
+                stack={chartOptions.stack}
               />
-            </Chart>
-          ) : options.metrics.length > 0 ? (
-            <MetricsExplorerEmptyChart />
-          ) : (
-            <MetricsExplorerNoMetrics />
-          )}
-        </div>
+            ))}
+            <Axis
+              id={'timestamp'}
+              position={Position.Bottom}
+              showOverlappingTicks={true}
+              tickFormat={dateFormatter}
+            />
+            <Axis
+              id={'values'}
+              position={Position.Left}
+              tickFormat={yAxisFormater}
+              domain={domain}
+            />
+            <Settings
+              tooltip={tooltipProps}
+              onBrushEnd={handleTimeChange}
+              theme={getChartTheme(isDarkMode)}
+            />
+          </Chart>
+        ) : options.metrics.length > 0 ? (
+          <MetricsExplorerEmptyChart />
+        ) : (
+          <MetricsExplorerNoMetrics />
+        )}
       </div>
-    );
-  }
-);
+    </div>
+  );
+};
 
 const ChartTitle = euiStyled.div`
-            width: 100%
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            text-align: left;
-            flex: 1 1 auto;
-            margin: 12px;
-          `;
+  width: 100%
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-align: left;
+  flex: 1 1 auto;
+  margin: 12px;
+`;
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx
index 2c700d4053489..6c044baa56d7c 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_context_menu.test.tsx
@@ -8,13 +8,13 @@ import React from 'react';
 import { MetricsExplorerChartContextMenu, createNodeDetailLink } from './chart_context_menu';
 import { mount } from 'enzyme';
 import { options, source, timeRange, chartOptions } from '../../utils/fixtures/metrics_explorer';
-import { UICapabilities } from 'ui/capabilities';
 import { InfraNodeType } from '../../graphql/types';
 import DateMath from '@elastic/datemath';
 import { ReactWrapper } from 'enzyme';
+import { Capabilities } from 'src/core/public';
 
 const series = { id: 'exmaple-01', rows: [], columns: [] };
-const uiCapabilities: UICapabilities = {
+const uiCapabilities: Capabilities = {
   navLinks: { show: false },
   management: { fake: { show: false } },
   catalogue: { show: false },
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 aa3616c5ecfbe..597386fc24ee8 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
@@ -12,8 +12,8 @@ import {
   EuiContextMenuPanelDescriptor,
   EuiPopover,
 } from '@elastic/eui';
-import { UICapabilities } from 'ui/capabilities';
 import DateMath from '@elastic/datemath';
+import { Capabilities } from 'src/core/public';
 import { MetricsExplorerSeries } from '../../../server/routes/metrics_explorer/types';
 import {
   MetricsExplorerOptions,
@@ -31,7 +31,7 @@ interface Props {
   series: MetricsExplorerSeries;
   source?: SourceConfiguration;
   timeRange: MetricsExplorerTimeOptions;
-  uiCapabilities: UICapabilities;
+  uiCapabilities?: Capabilities;
   chartOptions: MetricsExplorerChartOptions;
 }
 
@@ -118,7 +118,7 @@ export const MetricsExplorerChartContextMenu = ({
       ]
     : [];
 
-  const openInVisualize = uiCapabilities.visualize.show
+  const openInVisualize = uiCapabilities?.visualize?.show
     ? [
         {
           name: i18n.translate('xpack.infra.metricsExplorer.openInTSVB', {
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/group_by.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/group_by.tsx
index 568d768800259..505966e62e45f 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/group_by.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/group_by.tsx
@@ -8,14 +8,14 @@ import { EuiComboBox } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import React, { useCallback } from 'react';
-import { FieldType } from 'ui/index_patterns';
+import { IFieldType } from 'src/plugins/data/public';
 import { MetricsExplorerOptions } from '../../containers/metrics_explorer/use_metrics_explorer_options';
 import { isDisplayable } from '../../utils/is_displayable';
 
 interface Props {
   options: MetricsExplorerOptions;
   onChange: (groupBy: string | null) => void;
-  fields: FieldType[];
+  fields: IFieldType[];
 }
 
 export const MetricsExplorerGroupBy = ({ options, onChange, fields }: Props) => {
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/calculate_domian.test.ts b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/calculate_domian.test.ts
index c335b8b3c31ac..e85cd67060d2c 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/calculate_domian.test.ts
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/calculate_domian.test.ts
@@ -5,21 +5,17 @@
  */
 
 import { calculateDomain } from './calculate_domain';
-import {
-  MetricsExplorerSeries,
-  MetricsExplorerAggregation,
-  MetricsExplorerColumnType,
-} from '../../../../server/routes/metrics_explorer/types';
+import { MetricsExplorerSeries } from '../../../../server/routes/metrics_explorer/types';
 import { MetricsExplorerOptionsMetric } from '../../../containers/metrics_explorer/use_metrics_explorer_options';
 import { MetricsExplorerColor } from '../../../../common/color_palette';
 describe('calculateDomain()', () => {
   const series: MetricsExplorerSeries = {
     id: 'test-01',
     columns: [
-      { type: MetricsExplorerColumnType.date, name: 'timestamp' },
-      { type: MetricsExplorerColumnType.number, name: 'metric_0' },
-      { type: MetricsExplorerColumnType.number, name: 'metric_1' },
-      { type: MetricsExplorerColumnType.string, name: 'groupBy' },
+      { type: 'date', name: 'timestamp' },
+      { type: 'number', name: 'metric_0' },
+      { type: 'number', name: 'metric_1' },
+      { type: 'string', name: 'groupBy' },
     ],
     rows: [
       { timestamp: 1562860500000, metric_0: null, metric_1: null },
@@ -31,12 +27,12 @@ describe('calculateDomain()', () => {
   };
   const metrics: MetricsExplorerOptionsMetric[] = [
     {
-      aggregation: MetricsExplorerAggregation.avg,
+      aggregation: 'avg',
       field: 'system.memory.free',
       color: MetricsExplorerColor.color0,
     },
     {
-      aggregation: MetricsExplorerAggregation.avg,
+      aggregation: 'avg',
       field: 'system.memory.used.bytes',
       color: MetricsExplorerColor.color1,
     },
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_formatter_for_metric.ts b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_formatter_for_metric.ts
index 3451d901d4516..1e9902337e032 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_formatter_for_metric.ts
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_formatter_for_metric.ts
@@ -4,20 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  MetricsExplorerAggregation,
-  MetricsExplorerMetric,
-} from '../../../../server/routes/metrics_explorer/types';
+import { MetricsExplorerMetric } from '../../../../server/routes/metrics_explorer/types';
 import { createFormatter } from '../../../utils/formatters';
 import { InfraFormatterType } from '../../../lib/lib';
 import { metricToFormat } from './metric_to_format';
 export const createFormatterForMetric = (metric?: MetricsExplorerMetric) => {
   if (metric && metric.field) {
     const format = metricToFormat(metric);
-    if (
-      format === InfraFormatterType.bits &&
-      metric.aggregation === MetricsExplorerAggregation.rate
-    ) {
+    if (format === InfraFormatterType.bits && metric.aggregation === 'rate') {
       return createFormatter(InfraFormatterType.bits, '{{value}}/s');
     }
     return createFormatter(format);
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_formatter_for_metrics.test.ts b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_formatter_for_metrics.test.ts
index 12058f37aeb1a..592dd70345bfa 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_formatter_for_metrics.test.ts
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_formatter_for_metrics.test.ts
@@ -5,34 +5,35 @@
  */
 
 import { createFormatterForMetric } from './create_formatter_for_metric';
-import { MetricsExplorerAggregation } from '../../../../server/routes/metrics_explorer/types';
+import { MetricsExplorerMetric } from '../../../../server/routes/metrics_explorer/types';
+
 describe('createFormatterForMetric()', () => {
   it('should just work for count', () => {
-    const metric = { aggregation: MetricsExplorerAggregation.count };
+    const metric: MetricsExplorerMetric = { aggregation: 'count' };
     const format = createFormatterForMetric(metric);
     expect(format(1291929)).toBe('1,291,929');
   });
   it('should just work for numerics', () => {
-    const metric = { aggregation: MetricsExplorerAggregation.avg, field: 'system.load.1' };
+    const metric: MetricsExplorerMetric = { aggregation: 'avg', field: 'system.load.1' };
     const format = createFormatterForMetric(metric);
     expect(format(1000.2)).toBe('1,000.2');
   });
   it('should just work for percents', () => {
-    const metric = { aggregation: MetricsExplorerAggregation.avg, field: 'system.cpu.total.pct' };
+    const metric: MetricsExplorerMetric = { aggregation: 'avg', field: 'system.cpu.total.pct' };
     const format = createFormatterForMetric(metric);
     expect(format(0.349)).toBe('34.9%');
   });
   it('should just work for rates', () => {
-    const metric = {
-      aggregation: MetricsExplorerAggregation.rate,
+    const metric: MetricsExplorerMetric = {
+      aggregation: 'rate',
       field: 'system.network.out.bytes',
     };
     const format = createFormatterForMetric(metric);
     expect(format(103929292)).toBe('831.4Mbit/s');
   });
   it('should just work for bytes', () => {
-    const metric = {
-      aggregation: MetricsExplorerAggregation.avg,
+    const metric: MetricsExplorerMetric = {
+      aggregation: 'avg',
       field: 'system.network.out.bytes',
     };
     const format = createFormatterForMetric(metric);
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_metric_label.test.ts b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_metric_label.test.ts
index b148d68c71dba..0c52d8d56a6e9 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_metric_label.test.ts
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_metric_label.test.ts
@@ -5,15 +5,15 @@
  */
 
 import { createMetricLabel } from './create_metric_label';
-import { MetricsExplorerAggregation } from '../../../../server/routes/metrics_explorer/types';
+import { MetricsExplorerMetric } from '../../../../server/routes/metrics_explorer/types';
 
 describe('createMetricLabel()', () => {
   it('should work with metrics with fields', () => {
-    const metric = { aggregation: MetricsExplorerAggregation.avg, field: 'system.load.1' };
+    const metric: MetricsExplorerMetric = { aggregation: 'avg', field: 'system.load.1' };
     expect(createMetricLabel(metric)).toBe('avg(system.load.1)');
   });
   it('should work with document count', () => {
-    const metric = { aggregation: MetricsExplorerAggregation.count };
+    const metric: MetricsExplorerMetric = { aggregation: 'count' };
     expect(createMetricLabel(metric)).toBe('count()');
   });
 });
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.test.ts b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.test.ts
index d190d09da992e..860c4f1ba406c 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.test.ts
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.test.ts
@@ -8,11 +8,11 @@ import { createTSVBLink, createFilterFromOptions } from './create_tsvb_link';
 import { source, options, timeRange, chartOptions } from '../../../utils/fixtures/metrics_explorer';
 import uuid from 'uuid';
 import { OutputBuffer } from 'uuid/interfaces';
-import { MetricsExplorerAggregation } from '../../../../server/routes/metrics_explorer/types';
 import {
   MetricsExplorerYAxisMode,
   MetricsExplorerChartType,
 } from '../../../containers/metrics_explorer/use_metrics_explorer_options';
+import { MetricsExplorerOptions } from '../../../containers/metrics_explorer/use_metrics_explorer_options';
 
 jest.mock('uuid');
 const mockedUuid = uuid as jest.Mocked<typeof uuid>;
@@ -28,11 +28,9 @@ describe('createTSVBLink()', () => {
   });
 
   it('should work with rates', () => {
-    const customOptions = {
+    const customOptions: MetricsExplorerOptions = {
       ...options,
-      metrics: [
-        { aggregation: MetricsExplorerAggregation.rate, field: 'system.network.out.bytes' },
-      ],
+      metrics: [{ aggregation: 'rate', field: 'system.network.out.bytes' }],
     };
     const link = createTSVBLink(source, customOptions, series, timeRange, chartOptions);
     expect(link).toBe(
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.ts b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.ts
index 788de6a129aa9..2fe81123594e9 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.ts
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/create_tsvb_link.ts
@@ -8,10 +8,7 @@ import { encode } from 'rison-node';
 import uuid from 'uuid';
 import { set } from 'lodash';
 import { colorTransformer, MetricsExplorerColor } from '../../../../common/color_palette';
-import {
-  MetricsExplorerSeries,
-  MetricsExplorerAggregation,
-} from '../../../../server/routes/metrics_explorer/types';
+import { MetricsExplorerSeries } from '../../../../server/routes/metrics_explorer/types';
 import {
   MetricsExplorerOptions,
   MetricsExplorerOptionsMetric,
@@ -26,7 +23,7 @@ import { SourceQuery } from '../../../graphql/types';
 import { createMetricLabel } from './create_metric_label';
 
 export const metricsExplorerMetricToTSVBMetric = (metric: MetricsExplorerOptionsMetric) => {
-  if (metric.aggregation === MetricsExplorerAggregation.rate) {
+  if (metric.aggregation === 'rate') {
     const metricId = uuid.v1();
     const positiveOnlyId = uuid.v1();
     const derivativeId = uuid.v1();
@@ -73,8 +70,7 @@ const mapMetricToSeries = (chartOptions: MetricsExplorerChartOptions) => (
     ),
     fill: chartOptions.type === MetricsExplorerChartType.area ? 0.5 : 0,
     formatter: format === InfraFormatterType.bits ? InfraFormatterType.bytes : format,
-    value_template:
-      MetricsExplorerAggregation.rate === metric.aggregation ? '{{value}}/s' : '{{value}}',
+    value_template: 'rate' === metric.aggregation ? '{{value}}/s' : '{{value}}',
     id: uuid.v1(),
     line_width: 2,
     metrics: metricsExplorerMetricToTSVBMetric(metric),
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/get_chart_theme.ts b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/get_chart_theme.ts
index 7be2e54d47d75..42469ffb5ee9a 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/get_chart_theme.ts
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/get_chart_theme.ts
@@ -4,10 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import chrome from 'ui/chrome';
 import { Theme, LIGHT_THEME, DARK_THEME } from '@elastic/charts';
 
-export function getChartTheme(): Theme {
-  const isDarkMode = chrome.getUiSettingsClient().get('theme:darkMode');
+export function getChartTheme(isDarkMode: boolean): Theme {
   return isDarkMode ? DARK_THEME : LIGHT_THEME;
 }
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/metric_to_format.test.ts b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/metric_to_format.test.ts
index 9812023174a8c..a38a9ac54d828 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/metric_to_format.test.ts
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/metric_to_format.test.ts
@@ -5,37 +5,37 @@
  */
 
 import { metricToFormat } from './metric_to_format';
-import { MetricsExplorerAggregation } from '../../../../server/routes/metrics_explorer/types';
+import { MetricsExplorerMetric } from '../../../../server/routes/metrics_explorer/types';
 import { InfraFormatterType } from '../../../lib/lib';
 describe('metricToFormat()', () => {
   it('should just work for numeric metrics', () => {
-    const metric = { aggregation: MetricsExplorerAggregation.avg, field: 'system.load.1' };
+    const metric: MetricsExplorerMetric = { aggregation: 'avg', field: 'system.load.1' };
     expect(metricToFormat(metric)).toBe(InfraFormatterType.number);
   });
   it('should just work for byte metrics', () => {
-    const metric = {
-      aggregation: MetricsExplorerAggregation.avg,
+    const metric: MetricsExplorerMetric = {
+      aggregation: 'avg',
       field: 'system.network.out.bytes',
     };
     expect(metricToFormat(metric)).toBe(InfraFormatterType.bytes);
   });
   it('should just work for rate bytes metrics', () => {
-    const metric = {
-      aggregation: MetricsExplorerAggregation.rate,
+    const metric: MetricsExplorerMetric = {
+      aggregation: 'rate',
       field: 'system.network.out.bytes',
     };
     expect(metricToFormat(metric)).toBe(InfraFormatterType.bits);
   });
   it('should just work for rate metrics', () => {
-    const metric = {
-      aggregation: MetricsExplorerAggregation.rate,
+    const metric: MetricsExplorerMetric = {
+      aggregation: 'rate',
       field: 'system.cpu.user.ticks',
     };
     expect(metricToFormat(metric)).toBe(InfraFormatterType.number);
   });
   it('should just work for percent metrics', () => {
-    const metric = {
-      aggregation: MetricsExplorerAggregation.avg,
+    const metric: MetricsExplorerMetric = {
+      aggregation: 'avg',
       field: 'system.cpu.user.pct',
     };
     expect(metricToFormat(metric)).toBe(InfraFormatterType.percent);
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/metric_to_format.ts b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/metric_to_format.ts
index de6214fda2df3..69f2bd50ef42f 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/metric_to_format.ts
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/helpers/metric_to_format.ts
@@ -5,10 +5,7 @@
  */
 
 import { last } from 'lodash';
-import {
-  MetricsExplorerAggregation,
-  MetricsExplorerMetric,
-} from '../../../../server/routes/metrics_explorer/types';
+import { MetricsExplorerMetric } from '../../../../server/routes/metrics_explorer/types';
 import { InfraFormatterType } from '../../../lib/lib';
 export const metricToFormat = (metric?: MetricsExplorerMetric) => {
   if (metric && metric.field) {
@@ -16,7 +13,7 @@ export const metricToFormat = (metric?: MetricsExplorerMetric) => {
     if (suffix === 'pct') {
       return InfraFormatterType.percent;
     }
-    if (suffix === 'bytes' && metric.aggregation === MetricsExplorerAggregation.rate) {
+    if (suffix === 'bytes' && metric.aggregation === 'rate') {
       return InfraFormatterType.bits;
     }
     if (suffix === 'bytes') {
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/metrics.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/metrics.tsx
index 42df7c6915a0d..7a8b22467ccd8 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/metrics.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/metrics.tsx
@@ -8,12 +8,9 @@ import { EuiComboBox } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import React, { useCallback, useState } from 'react';
-import { FieldType } from 'ui/index_patterns';
+import { IFieldType } from 'src/plugins/data/public';
 import { colorTransformer, MetricsExplorerColor } from '../../../common/color_palette';
-import {
-  MetricsExplorerMetric,
-  MetricsExplorerAggregation,
-} from '../../../server/routes/metrics_explorer/types';
+import { MetricsExplorerMetric } from '../../../server/routes/metrics_explorer/types';
 import { MetricsExplorerOptions } from '../../containers/metrics_explorer/use_metrics_explorer_options';
 import { isDisplayable } from '../../utils/is_displayable';
 
@@ -21,7 +18,7 @@ interface Props {
   autoFocus?: boolean;
   options: MetricsExplorerOptions;
   onChange: (metrics: MetricsExplorerMetric[]) => void;
-  fields: FieldType[];
+  fields: IFieldType[];
 }
 
 interface SelectedOption {
@@ -61,7 +58,7 @@ export const MetricsExplorerMetrics = ({ options, onChange, fields, autoFocus =
     .filter(field => isDisplayable(field))
     .map(field => ({ label: field.name, value: field.name }));
   const selectedOptions = options.metrics
-    .filter(m => m.aggregation !== MetricsExplorerAggregation.count)
+    .filter(m => m.aggregation !== 'count')
     .map(metric => ({
       label: metric.field || '',
       value: metric.field || '',
@@ -74,7 +71,7 @@ export const MetricsExplorerMetrics = ({ options, onChange, fields, autoFocus =
 
   return (
     <EuiComboBox
-      isDisabled={options.aggregation === MetricsExplorerAggregation.count}
+      isDisabled={options.aggregation === 'count'}
       placeholder={placeholderText}
       fullWidth
       options={comboOptions}
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 8c3c80e0a3852..f365faa134d93 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
@@ -7,9 +7,6 @@
 import React from 'react';
 import {
   ScaleType,
-  getSpecId,
-  DataSeriesColorsValues,
-  CustomSeriesColorsMap,
   AreaSeries,
   BarSeries,
   RecursivePartial,
@@ -45,13 +42,6 @@ export const MetricsExplorerAreaChart = ({ metric, id, series, type, stack }: Pr
     colorTransformer(MetricsExplorerColor.color0);
 
   const yAccessor = `metric_${id}`;
-  const specId = getSpecId(yAccessor);
-  const colors: DataSeriesColorsValues = {
-    colorValues: [],
-    specId,
-  };
-  const customColors: CustomSeriesColorsMap = new Map();
-  customColors.set(colors, color);
   const chartId = `series-${series.id}-${yAccessor}`;
 
   const seriesAreaStyle: RecursivePartial<AreaSeriesStyle> = {
@@ -66,8 +56,8 @@ export const MetricsExplorerAreaChart = ({ metric, id, series, type, stack }: Pr
   };
   return (
     <AreaSeries
+      id={yAccessor}
       key={chartId}
-      id={specId}
       name={createMetricLabel(metric)}
       xScaleType={ScaleType.Time}
       yScaleType={ScaleType.Linear}
@@ -76,7 +66,7 @@ export const MetricsExplorerAreaChart = ({ metric, id, series, type, stack }: Pr
       data={series.rows}
       stackAccessors={stack ? ['timestamp'] : void 0}
       areaSeriesStyle={seriesAreaStyle}
-      customSeriesColors={customColors}
+      customSeriesColors={[color]}
     />
   );
 };
@@ -87,13 +77,6 @@ export const MetricsExplorerBarChart = ({ metric, id, series, stack }: Props) =>
     colorTransformer(MetricsExplorerColor.color0);
 
   const yAccessor = `metric_${id}`;
-  const specId = getSpecId(yAccessor);
-  const colors: DataSeriesColorsValues = {
-    colorValues: [],
-    specId,
-  };
-  const customColors: CustomSeriesColorsMap = new Map();
-  customColors.set(colors, color);
   const chartId = `series-${series.id}-${yAccessor}`;
 
   const seriesBarStyle: RecursivePartial<BarSeriesStyle> = {
@@ -108,8 +91,8 @@ export const MetricsExplorerBarChart = ({ metric, id, series, stack }: Props) =>
   };
   return (
     <BarSeries
+      id={yAccessor}
       key={chartId}
-      id={specId}
       name={createMetricLabel(metric)}
       xScaleType={ScaleType.Time}
       yScaleType={ScaleType.Linear}
@@ -118,7 +101,7 @@ export const MetricsExplorerBarChart = ({ metric, id, series, stack }: Props) =>
       data={series.rows}
       stackAccessors={stack ? ['timestamp'] : void 0}
       barSeriesStyle={seriesBarStyle}
-      customSeriesColors={customColors}
+      customSeriesColors={[color]}
     />
   );
 };
diff --git a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/toolbar.tsx b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/toolbar.tsx
index d2a6cec36f6df..ab6949e2f1d06 100644
--- a/x-pack/legacy/plugins/infra/public/components/metrics_explorer/toolbar.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/metrics_explorer/toolbar.tsx
@@ -58,19 +58,18 @@ export const MetricsExplorerToolbar = ({
   defaultViewState,
   onViewStateChange,
 }: Props) => {
-  const isDefaultOptions =
-    options.aggregation === MetricsExplorerAggregation.avg && options.metrics.length === 0;
+  const isDefaultOptions = options.aggregation === 'avg' && options.metrics.length === 0;
   return (
     <Toolbar>
       <EuiFlexGroup alignItems="center">
-        <EuiFlexItem grow={options.aggregation === MetricsExplorerAggregation.count ? 2 : false}>
+        <EuiFlexItem grow={options.aggregation === 'count' ? 2 : false}>
           <MetricsExplorerAggregationPicker
             fullWidth
             options={options}
             onChange={onAggregationChange}
           />
         </EuiFlexItem>
-        {options.aggregation !== MetricsExplorerAggregation.count && (
+        {options.aggregation !== 'count' && (
           <EuiText size="s" color="subdued">
             <FormattedMessage
               id="xpack.infra.metricsExplorer.aggregationLabel"
@@ -78,7 +77,7 @@ export const MetricsExplorerToolbar = ({
             />
           </EuiText>
         )}
-        {options.aggregation !== MetricsExplorerAggregation.count && (
+        {options.aggregation !== 'count' && (
           <EuiFlexItem grow={2}>
             <MetricsExplorerMetrics
               autoFocus={isDefaultOptions}
diff --git a/x-pack/legacy/plugins/infra/public/components/nodes_overview/index.tsx b/x-pack/legacy/plugins/infra/public/components/nodes_overview/index.tsx
index edf1b228b278a..21db0c73f612a 100644
--- a/x-pack/legacy/plugins/infra/public/components/nodes_overview/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/nodes_overview/index.tsx
@@ -21,6 +21,7 @@ import { Map } from '../waffle/map';
 import { ViewSwitcher } from '../waffle/view_switcher';
 import { TableView } from './table';
 import { SnapshotNode } from '../../../common/http_api/snapshot_api';
+import { convertIntervalToString } from '../../utils/convert_interval_to_string';
 
 interface Props {
   options: InfraWaffleMapOptions;
@@ -34,6 +35,7 @@ interface Props {
   view: string;
   boundsOverride: InfraWaffleMapBounds;
   autoBounds: boolean;
+  interval: string;
 }
 
 interface MetricFormatter {
@@ -121,6 +123,7 @@ export const NodesOverview = class extends React.Component<Props, {}> {
       view,
       currentTime,
       options,
+      interval,
     } = this.props;
     if (loading) {
       return (
@@ -153,6 +156,7 @@ export const NodesOverview = class extends React.Component<Props, {}> {
     }
     const dataBounds = calculateBoundsFromNodes(nodes);
     const bounds = autoBounds ? dataBounds : boundsOverride;
+    const intervalAsString = convertIntervalToString(interval);
     return (
       <MainContainer>
         <ViewSwitcherContainer>
@@ -165,7 +169,8 @@ export const NodesOverview = class extends React.Component<Props, {}> {
                 <p>
                   <FormattedMessage
                     id="xpack.infra.homePage.toolbar.showingLastOneMinuteDataText"
-                    defaultMessage="Showing the last 1 minute of data at the selected time"
+                    defaultMessage="Showing the last {duration} of data at the selected time"
+                    values={{ duration: intervalAsString }}
                   />
                 </p>
               </EuiText>
diff --git a/x-pack/legacy/plugins/infra/public/components/nodes_overview/table.tsx b/x-pack/legacy/plugins/infra/public/components/nodes_overview/table.tsx
index b4abf962bd892..8996b170f01d2 100644
--- a/x-pack/legacy/plugins/infra/public/components/nodes_overview/table.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/nodes_overview/table.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiButtonEmpty, EuiInMemoryTable, EuiToolTip } from '@elastic/eui';
+import { EuiButtonEmpty, EuiInMemoryTable, EuiToolTip, EuiBasicTableColumn } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { last } from 'lodash';
@@ -45,7 +45,7 @@ export const TableView = class extends React.PureComponent<Props, State> {
   public readonly state: State = initialState;
   public render() {
     const { nodes, options, formatter, currentTime, nodeType } = this.props;
-    const columns = [
+    const columns: Array<EuiBasicTableColumn<typeof items[number]>> = [
       {
         field: 'name',
         name: i18n.translate('xpack.infra.tableView.columnName.name', { defaultMessage: 'Name' }),
@@ -139,7 +139,7 @@ export const TableView = class extends React.PureComponent<Props, State> {
         field: 'value',
         direction: 'desc',
       },
-    };
+    } as const;
     return (
       <EuiInMemoryTable
         pagination={true}
diff --git a/x-pack/legacy/plugins/infra/public/components/saved_views/toolbar_control.tsx b/x-pack/legacy/plugins/infra/public/components/saved_views/toolbar_control.tsx
index ae04ede9fbe0c..e03b7fcc8ffa4 100644
--- a/x-pack/legacy/plugins/infra/public/components/saved_views/toolbar_control.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/saved_views/toolbar_control.tsx
@@ -7,11 +7,12 @@
 import { EuiButtonEmpty, EuiFlexGroup } from '@elastic/eui';
 import React, { useCallback, useState, useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { toastNotifications } from 'ui/notify';
 import { i18n } from '@kbn/i18n';
 import { useSavedView } from '../../hooks/use_saved_view';
 import { SavedViewCreateModal } from './create_modal';
 import { SavedViewListFlyout } from './view_list_flyout';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+
 interface Props<ViewState> {
   viewType: string;
   viewState: ViewState;
@@ -20,6 +21,7 @@ interface Props<ViewState> {
 }
 
 export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
+  const kibana = useKibana();
   const {
     views,
     saveView,
@@ -77,11 +79,11 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
 
   useEffect(() => {
     if (errorOnCreate) {
-      toastNotifications.addWarning(getErrorToast('create', errorOnCreate)!);
+      kibana.notifications.toasts.warning(getErrorToast('create', errorOnCreate)!);
     } else if (errorOnFind) {
-      toastNotifications.addWarning(getErrorToast('find', errorOnFind)!);
+      kibana.notifications.toasts.warning(getErrorToast('find', errorOnFind)!);
     }
-  }, [errorOnCreate, errorOnFind]);
+  }, [errorOnCreate, errorOnFind, kibana]);
 
   return (
     <>
@@ -119,6 +121,7 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
 const getErrorToast = (type: 'create' | 'find', msg?: string) => {
   if (type === 'create') {
     return {
+      toastLifeTimeMs: 3000,
       title:
         msg ||
         i18n.translate('xpack.infra.savedView.errorOnCreate.title', {
@@ -127,6 +130,7 @@ const getErrorToast = (type: 'create' | 'find', msg?: string) => {
     };
   } else if (type === 'find') {
     return {
+      toastLifeTimeMs: 3000,
       title:
         msg ||
         i18n.translate('xpack.infra.savedView.findError.title', {
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/custom_field_panel.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/custom_field_panel.tsx
index 1bfbf69b434bd..01bff0b4f96e1 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/custom_field_panel.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/custom_field_panel.tsx
@@ -6,12 +6,12 @@
 
 import { EuiButton, EuiComboBox, EuiForm, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-
 import React from 'react';
-import { FieldType } from 'ui/index_patterns';
+import { IFieldType } from 'src/plugins/data/public';
+
 interface Props {
   onSubmit: (field: string) => void;
-  fields: FieldType[];
+  fields: IFieldType[];
 }
 
 interface SelectedOption {
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/node_context_menu.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/node_context_menu.tsx
index 43f0afb125d2b..cb894f37c1fce 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/node_context_menu.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/node_context_menu.tsx
@@ -13,13 +13,12 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import React from 'react';
-import { UICapabilities } from 'ui/capabilities';
-import { injectUICapabilities } from 'ui/capabilities/react';
 import { InfraNodeType } from '../../graphql/types';
 import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../lib/lib';
 import { getNodeDetailUrl, getNodeLogsUrl } from '../../pages/link_to';
 import { createUptimeLink } from './lib/create_uptime_link';
 import { findInventoryModel } from '../../../common/inventory_models';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 interface Props {
   options: InfraWaffleMapOptions;
@@ -29,102 +28,99 @@ interface Props {
   nodeType: InfraNodeType;
   isPopoverOpen: boolean;
   closePopover: () => void;
-  uiCapabilities: UICapabilities;
   popoverPosition: EuiPopoverProps['anchorPosition'];
 }
 
-export const NodeContextMenu = injectUICapabilities(
-  ({
-    options,
-    currentTime,
-    children,
-    node,
-    isPopoverOpen,
-    closePopover,
-    nodeType,
-    uiCapabilities,
-    popoverPosition,
-  }: Props) => {
-    const inventoryModel = findInventoryModel(nodeType);
-    // Due to the changing nature of the fields between APM and this UI,
-    // We need to have some exceptions until 7.0 & ECS is finalized. Reference
-    // #26620 for the details for these fields.
-    // TODO: This is tech debt, remove it after 7.0 & ECS migration.
-    const apmField = nodeType === InfraNodeType.host ? 'host.hostname' : inventoryModel.fields.id;
+export const NodeContextMenu = ({
+  options,
+  currentTime,
+  children,
+  node,
+  isPopoverOpen,
+  closePopover,
+  nodeType,
+  popoverPosition,
+}: Props) => {
+  const uiCapabilities = useKibana().services.application?.capabilities;
+  const inventoryModel = findInventoryModel(nodeType);
+  // Due to the changing nature of the fields between APM and this UI,
+  // We need to have some exceptions until 7.0 & ECS is finalized. Reference
+  // #26620 for the details for these fields.
+  // TODO: This is tech debt, remove it after 7.0 & ECS migration.
+  const apmField = nodeType === InfraNodeType.host ? 'host.hostname' : inventoryModel.fields.id;
 
-    const nodeLogsMenuItem = {
-      name: i18n.translate('xpack.infra.nodeContextMenu.viewLogsName', {
-        defaultMessage: 'View logs',
-      }),
-      href: getNodeLogsUrl({
-        nodeType,
-        nodeId: node.id,
-        time: currentTime,
-      }),
-      'data-test-subj': 'viewLogsContextMenuItem',
-    };
+  const nodeLogsMenuItem = {
+    name: i18n.translate('xpack.infra.nodeContextMenu.viewLogsName', {
+      defaultMessage: 'View logs',
+    }),
+    href: getNodeLogsUrl({
+      nodeType,
+      nodeId: node.id,
+      time: currentTime,
+    }),
+    'data-test-subj': 'viewLogsContextMenuItem',
+  };
 
-    const nodeDetailFrom = currentTime - inventoryModel.metrics.defaultTimeRangeInSeconds * 1000;
-    const nodeDetailMenuItem = {
-      name: i18n.translate('xpack.infra.nodeContextMenu.viewMetricsName', {
-        defaultMessage: 'View metrics',
-      }),
-      href: getNodeDetailUrl({
-        nodeType,
-        nodeId: node.id,
-        from: nodeDetailFrom,
-        to: currentTime,
-      }),
-    };
+  const nodeDetailFrom = currentTime - inventoryModel.metrics.defaultTimeRangeInSeconds * 1000;
+  const nodeDetailMenuItem = {
+    name: i18n.translate('xpack.infra.nodeContextMenu.viewMetricsName', {
+      defaultMessage: 'View metrics',
+    }),
+    href: getNodeDetailUrl({
+      nodeType,
+      nodeId: node.id,
+      from: nodeDetailFrom,
+      to: currentTime,
+    }),
+  };
 
-    const apmTracesMenuItem = {
-      name: i18n.translate('xpack.infra.nodeContextMenu.viewAPMTraces', {
-        defaultMessage: 'View APM traces',
-      }),
-      href: `../app/apm#/traces?_g=()&kuery=${apmField}:"${node.id}"`,
-      'data-test-subj': 'viewApmTracesContextMenuItem',
-    };
+  const apmTracesMenuItem = {
+    name: i18n.translate('xpack.infra.nodeContextMenu.viewAPMTraces', {
+      defaultMessage: 'View APM traces',
+    }),
+    href: `../app/apm#/traces?_g=()&kuery=${apmField}:"${node.id}"`,
+    'data-test-subj': 'viewApmTracesContextMenuItem',
+  };
 
-    const uptimeMenuItem = {
-      name: i18n.translate('xpack.infra.nodeContextMenu.viewUptimeLink', {
-        defaultMessage: 'View in Uptime',
-      }),
-      href: createUptimeLink(options, nodeType, node),
-    };
+  const uptimeMenuItem = {
+    name: i18n.translate('xpack.infra.nodeContextMenu.viewUptimeLink', {
+      defaultMessage: 'View in Uptime',
+    }),
+    href: createUptimeLink(options, nodeType, node),
+  };
 
-    const showDetail = inventoryModel.crosslinkSupport.details;
-    const showLogsLink =
-      inventoryModel.crosslinkSupport.logs && node.id && uiCapabilities.logs.show;
-    const showAPMTraceLink =
-      inventoryModel.crosslinkSupport.apm && uiCapabilities.apm && uiCapabilities.apm.show;
-    const showUptimeLink =
-      inventoryModel.crosslinkSupport.uptime &&
-      ([InfraNodeType.pod, InfraNodeType.container].includes(nodeType) || node.ip);
+  const showDetail = inventoryModel.crosslinkSupport.details;
+  const showLogsLink =
+    inventoryModel.crosslinkSupport.logs && node.id && uiCapabilities?.logs?.show;
+  const showAPMTraceLink =
+    inventoryModel.crosslinkSupport.apm && uiCapabilities?.apm && uiCapabilities?.apm.show;
+  const showUptimeLink =
+    inventoryModel.crosslinkSupport.uptime &&
+    ([InfraNodeType.pod, InfraNodeType.container].includes(nodeType) || node.ip);
 
-    const items = [
-      ...(showLogsLink ? [nodeLogsMenuItem] : []),
-      ...(showDetail ? [nodeDetailMenuItem] : []),
-      ...(showAPMTraceLink ? [apmTracesMenuItem] : []),
-      ...(showUptimeLink ? [uptimeMenuItem] : []),
-    ];
-    const panels: EuiContextMenuPanelDescriptor[] = [{ id: 0, title: '', items }];
+  const items = [
+    ...(showLogsLink ? [nodeLogsMenuItem] : []),
+    ...(showDetail ? [nodeDetailMenuItem] : []),
+    ...(showAPMTraceLink ? [apmTracesMenuItem] : []),
+    ...(showUptimeLink ? [uptimeMenuItem] : []),
+  ];
+  const panels: EuiContextMenuPanelDescriptor[] = [{ id: 0, title: '', items }];
 
-    // If there is nothing to show then we need to return the child as is
-    if (items.length === 0) {
-      return <>{children}</>;
-    }
-
-    return (
-      <EuiPopover
-        closePopover={closePopover}
-        id={`${node.pathId}-popover`}
-        isOpen={isPopoverOpen}
-        button={children}
-        panelPaddingSize="none"
-        anchorPosition={popoverPosition}
-      >
-        <EuiContextMenu initialPanelId={0} panels={panels} data-test-subj="nodeContextMenu" />
-      </EuiPopover>
-    );
+  // If there is nothing to show then we need to return the child as is
+  if (items.length === 0) {
+    return <>{children}</>;
   }
-);
+
+  return (
+    <EuiPopover
+      closePopover={closePopover}
+      id={`${node.pathId}-popover`}
+      isOpen={isPopoverOpen}
+      button={children}
+      panelPaddingSize="none"
+      anchorPosition={popoverPosition}
+    >
+      <EuiContextMenu initialPanelId={0} panels={panels} data-test-subj="nodeContextMenu" />
+    </EuiPopover>
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_accounts_controls.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_accounts_controls.tsx
new file mode 100644
index 0000000000000..56c3a205b05d4
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_accounts_controls.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 {
+  EuiContextMenuPanelDescriptor,
+  EuiFilterButton,
+  EuiFilterGroup,
+  EuiPopover,
+  EuiContextMenu,
+} from '@elastic/eui';
+import React, { useCallback, useState, useMemo } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { InventoryCloudAccount } from '../../../common/http_api/inventory_meta_api';
+
+interface Props {
+  accountId: string;
+  options: InventoryCloudAccount[];
+  changeAccount: (id: string) => void;
+}
+
+export const WaffleAccountsControls = (props: Props) => {
+  const { accountId, options } = props;
+  const [isOpen, setIsOpen] = useState();
+
+  const showPopover = useCallback(() => {
+    setIsOpen(true);
+  }, [setIsOpen]);
+
+  const closePopover = useCallback(() => {
+    setIsOpen(false);
+  }, [setIsOpen]);
+
+  const currentLabel = options.find(o => o.value === accountId);
+
+  const changeAccount = useCallback(
+    (val: string) => {
+      if (accountId === val) {
+        props.changeAccount('');
+      } else {
+        props.changeAccount(val);
+      }
+      closePopover();
+    },
+    [accountId, closePopover, props]
+  );
+
+  const panels = useMemo<EuiContextMenuPanelDescriptor[]>(
+    () => [
+      {
+        id: 0,
+        title: '',
+        items: options.map(o => {
+          const icon = o.value === accountId ? 'check' : 'empty';
+          const panel = { name: o.name, onClick: () => changeAccount(o.value), icon };
+          return panel;
+        }),
+      },
+    ],
+    [options, accountId, changeAccount]
+  );
+
+  return (
+    <EuiFilterGroup>
+      <EuiPopover
+        isOpen={isOpen}
+        id="accontPopOver"
+        button={
+          <EuiFilterButton iconType="arrowDown" onClick={showPopover}>
+            <FormattedMessage
+              id="xpack.infra.waffle.accountLabel"
+              defaultMessage="Account: {selectedAccount}"
+              values={{
+                selectedAccount: currentLabel
+                  ? currentLabel.name
+                  : i18n.translate('xpack.infra.waffle.accountAllTitle', {
+                      defaultMessage: 'All',
+                    }),
+              }}
+            />
+          </EuiFilterButton>
+        }
+        anchorPosition="downLeft"
+        panelPaddingSize="none"
+        closePopover={closePopover}
+      >
+        <EuiContextMenu initialPanelId={0} panels={panels} />
+      </EuiPopover>
+    </EuiFilterGroup>
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
index 949896fbb6002..0a9df1f666f3d 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
@@ -16,7 +16,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
-import { FieldType } from 'ui/index_patterns';
+import { IFieldType } from 'src/plugins/data/public';
 import { InfraNodeType, InfraSnapshotGroupbyInput } from '../../graphql/types';
 import { InfraGroupByOptions } from '../../lib/lib';
 import { CustomFieldPanel } from './custom_field_panel';
@@ -28,7 +28,7 @@ interface Props {
   groupBy: InfraSnapshotGroupbyInput[];
   onChange: (groupBy: InfraSnapshotGroupbyInput[]) => void;
   onChangeCustomOptions: (options: InfraGroupByOptions[]) => void;
-  fields: FieldType[];
+  fields: IFieldType[];
   customOptions: InfraGroupByOptions[];
 }
 
diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_region_controls.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_region_controls.tsx
new file mode 100644
index 0000000000000..52377bf4b8296
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_region_controls.tsx
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EuiContextMenuPanelDescriptor,
+  EuiFilterButton,
+  EuiFilterGroup,
+  EuiPopover,
+  EuiContextMenu,
+} from '@elastic/eui';
+import React, { useCallback, useState, useMemo } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+
+interface Props {
+  region?: string;
+  options: string[];
+  changeRegion: (name: string) => void;
+}
+
+export const WaffleRegionControls = (props: Props) => {
+  const { region, options } = props;
+  const [isOpen, setIsOpen] = useState();
+
+  const showPopover = useCallback(() => {
+    setIsOpen(true);
+  }, [setIsOpen]);
+
+  const closePopover = useCallback(() => {
+    setIsOpen(false);
+  }, [setIsOpen]);
+
+  const currentLabel = options.find(o => region === o);
+
+  const changeRegion = useCallback(
+    (val: string) => {
+      if (region === val) {
+        props.changeRegion('');
+      } else {
+        props.changeRegion(val);
+      }
+      closePopover();
+    },
+    [region, closePopover, props]
+  );
+
+  const panels = useMemo<EuiContextMenuPanelDescriptor[]>(
+    () => [
+      {
+        id: 0,
+        title: '',
+        items: options.map(o => {
+          const icon = o === region ? 'check' : 'empty';
+          const panel = { name: o, onClick: () => changeRegion(o), icon };
+          return panel;
+        }),
+      },
+    ],
+    [changeRegion, options, region]
+  );
+
+  return (
+    <EuiFilterGroup>
+      <EuiPopover
+        isOpen={isOpen}
+        id="regionPanel"
+        button={
+          <EuiFilterButton iconType="arrowDown" onClick={showPopover}>
+            <FormattedMessage
+              id="xpack.infra.waffle.regionLabel"
+              defaultMessage="Region: {selectedRegion}"
+              values={{
+                selectedRegion:
+                  currentLabel ||
+                  i18n.translate('xpack.infra.waffle.region', {
+                    defaultMessage: 'All',
+                  }),
+              }}
+            />
+          </EuiFilterButton>
+        }
+        anchorPosition="downLeft"
+        panelPaddingSize="none"
+        closePopover={closePopover}
+      >
+        <EuiContextMenu initialPanelId={0} panels={panels} />
+      </EuiPopover>
+    </EuiFilterGroup>
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/containers/inventory_metadata/use_inventory_meta.ts b/x-pack/legacy/plugins/infra/public/containers/inventory_metadata/use_inventory_meta.ts
new file mode 100644
index 0000000000000..c7a7b4d61bd12
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/inventory_metadata/use_inventory_meta.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { useEffect } from 'react';
+import { throwErrors, createPlainError } from '../../../common/runtime_types';
+import { useHTTPRequest } from '../../hooks/use_http_request';
+import {
+  InventoryMetaResponseRT,
+  InventoryMetaResponse,
+} from '../../../common/http_api/inventory_meta_api';
+import { InfraNodeType } from '../../graphql/types';
+
+export function useInventoryMeta(sourceId: string, nodeType: InfraNodeType) {
+  const decodeResponse = (response: any) => {
+    return pipe(
+      InventoryMetaResponseRT.decode(response),
+      fold(throwErrors(createPlainError), identity)
+    );
+  };
+
+  const { error, loading, response, makeRequest } = useHTTPRequest<InventoryMetaResponse>(
+    '/api/infra/inventory/meta',
+    'POST',
+    JSON.stringify({
+      sourceId,
+      nodeType,
+    }),
+    decodeResponse
+  );
+
+  useEffect(() => {
+    makeRequest();
+  }, [makeRequest]);
+
+  return {
+    error,
+    loading,
+    accounts: response ? response.accounts : [],
+    regions: response ? response.regions : [],
+    makeRequest,
+  };
+}
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/flyout_item.gql_query.ts b/x-pack/legacy/plugins/infra/public/containers/logs/flyout_item.gql_query.ts
deleted file mode 100644
index 2c51bdbb46e89..0000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/flyout_item.gql_query.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 gql from 'graphql-tag';
-import { sharedFragments } from '../../../common/graphql/shared';
-
-export const flyoutItemQuery = gql`
-  query FlyoutItemQuery($sourceId: ID!, $itemId: ID!) {
-    source(id: $sourceId) {
-      id
-      logItem(id: $itemId) {
-        id
-        index
-        key {
-          ...InfraTimeKeyFields
-        }
-        fields {
-          field
-          value
-        }
-      }
-    }
-  }
-
-  ${sharedFragments.InfraTimeKey}
-`;
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts
index 5054f607fa5dc..76e5f210ca238 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_cleanup.ts
@@ -8,7 +8,7 @@ import * as rt from 'io-ts';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
-import { kfetch } from 'ui/kfetch';
+import { npStart } from 'ui/new_platform';
 
 import { getDatafeedId, getJobId } from '../../../../../common/log_analysis';
 import { throwErrors, createPlainError } from '../../../../../common/runtime_types';
@@ -19,9 +19,8 @@ export const callDeleteJobs = async <JobType extends string>(
   jobTypes: JobType[]
 ) => {
   // NOTE: Deleting the jobs via this API will delete the datafeeds at the same time
-  const deleteJobsResponse = await kfetch({
+  const deleteJobsResponse = await npStart.core.http.fetch('/api/ml/jobs/delete_jobs', {
     method: 'POST',
-    pathname: '/api/ml/jobs/delete_jobs',
     body: JSON.stringify(
       deleteJobsRequestPayloadRT.encode({
         jobIds: jobTypes.map(jobType => getJobId(spaceId, sourceId, jobType)),
@@ -36,10 +35,9 @@ export const callDeleteJobs = async <JobType extends string>(
 };
 
 export const callGetJobDeletionTasks = async () => {
-  const jobDeletionTasksResponse = await kfetch({
-    method: 'GET',
-    pathname: '/api/ml/jobs/deleting_jobs_tasks',
-  });
+  const jobDeletionTasksResponse = await npStart.core.http.fetch(
+    '/api/ml/jobs/deleting_jobs_tasks'
+  );
 
   return pipe(
     getJobDeletionTasksResponsePayloadRT.decode(jobDeletionTasksResponse),
@@ -53,9 +51,8 @@ export const callStopDatafeeds = async <JobType extends string>(
   jobTypes: JobType[]
 ) => {
   // Stop datafeed due to https://github.com/elastic/kibana/issues/44652
-  const stopDatafeedResponse = await kfetch({
+  const stopDatafeedResponse = await npStart.core.http.fetch('/api/ml/jobs/stop_datafeeds', {
     method: 'POST',
-    pathname: '/api/ml/jobs/stop_datafeeds',
     body: JSON.stringify(
       stopDatafeedsRequestPayloadRT.encode({
         datafeedIds: jobTypes.map(jobType => getDatafeedId(spaceId, sourceId, jobType)),
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts
index 91e517b0db008..41c155e185c3a 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts
@@ -8,8 +8,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 import * as rt from 'io-ts';
-import { kfetch } from 'ui/kfetch';
-
+import { npStart } from 'ui/new_platform';
 import { jobCustomSettingsRT } from './ml_api_types';
 import { throwErrors, createPlainError } from '../../../../../common/runtime_types';
 import { getJobId } from '../../../../../common/log_analysis';
@@ -19,9 +18,8 @@ export const callJobsSummaryAPI = async <JobType extends string>(
   sourceId: string,
   jobTypes: JobType[]
 ) => {
-  const response = await kfetch({
+  const response = await npStart.core.http.fetch('/api/ml/jobs/jobs_summary', {
     method: 'POST',
-    pathname: '/api/ml/jobs/jobs_summary',
     body: JSON.stringify(
       fetchJobStatusRequestPayloadRT.encode({
         jobIds: jobTypes.map(jobType => getJobId(spaceId, sourceId, jobType)),
@@ -49,6 +47,7 @@ const datafeedStateRT = rt.keyof({
 const jobStateRT = rt.keyof({
   closed: null,
   closing: null,
+  deleting: null,
   failed: null,
   opened: null,
   opening: null,
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts
index b58677ffa844e..ae90c7bb84130 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_get_module.ts
@@ -8,15 +8,13 @@ import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { identity } from 'fp-ts/lib/function';
 import * as rt from 'io-ts';
-import { kfetch } from 'ui/kfetch';
-
+import { npStart } from 'ui/new_platform';
 import { throwErrors, createPlainError } from '../../../../../common/runtime_types';
 import { jobCustomSettingsRT } from './ml_api_types';
 
 export const callGetMlModuleAPI = async (moduleId: string) => {
-  const response = await kfetch({
+  const response = await npStart.core.http.fetch(`/api/ml/modules/get_module/${moduleId}`, {
     method: 'GET',
-    pathname: `/api/ml/modules/get_module/${moduleId}`,
   });
 
   return pipe(
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts
index 80a4f975cdd57..774a521ff1d34 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/ml_setup_module_api.ts
@@ -8,8 +8,7 @@ import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { identity } from 'fp-ts/lib/function';
 import * as rt from 'io-ts';
-import { kfetch } from 'ui/kfetch';
-
+import { npStart } from 'ui/new_platform';
 import { throwErrors, createPlainError } from '../../../../../common/runtime_types';
 import { getJobIdPrefix } from '../../../../../common/log_analysis';
 
@@ -23,9 +22,8 @@ export const callSetupMlModuleAPI = async (
   jobOverrides: SetupMlModuleJobOverrides[] = [],
   datafeedOverrides: SetupMlModuleDatafeedOverrides[] = []
 ) => {
-  const response = await kfetch({
+  const response = await npStart.core.http.fetch(`/api/ml/modules/setup/${moduleId}`, {
     method: 'POST',
-    pathname: `/api/ml/modules/setup/${moduleId}`,
     body: JSON.stringify(
       setupMlModuleRequestPayloadRT.encode({
         start,
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
index 0d2e9b673488e..480e84ff53e43 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts
@@ -7,8 +7,7 @@
 import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { identity } from 'fp-ts/lib/function';
-import { kfetch } from 'ui/kfetch';
-
+import { npStart } from 'ui/new_platform';
 import {
   LOG_ANALYSIS_VALIDATE_INDICES_PATH,
   ValidationIndicesFieldSpecification,
@@ -22,9 +21,8 @@ export const callValidateIndicesAPI = async (
   indices: string[],
   fields: ValidationIndicesFieldSpecification[]
 ) => {
-  const response = await kfetch({
+  const response = await npStart.core.http.fetch(LOG_ANALYSIS_VALIDATE_INDICES_PATH, {
     method: 'POST',
-    pathname: LOG_ANALYSIS_VALIDATE_INDICES_PATH,
     body: JSON.stringify(validationIndicesRequestPayloadRT.encode({ data: { indices, fields } })),
   });
 
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/index.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/index.ts
index eb044c86e50fe..185f6936662bd 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/index.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/index.ts
@@ -9,3 +9,4 @@ export * from './log_analysis_cleanup';
 export * from './log_analysis_module';
 export * from './log_analysis_module_status';
 export * from './log_analysis_module_types';
+export * from './log_analysis_setup_state';
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_capabilities.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_capabilities.tsx
index bb01043b0db6e..bd8be6df8ea69 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_capabilities.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_capabilities.tsx
@@ -6,8 +6,7 @@
 
 import createContainer from 'constate';
 import { useMemo, useState, useEffect } from 'react';
-import { kfetch } from 'ui/kfetch';
-
+import { npStart } from 'ui/new_platform';
 import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { identity } from 'fp-ts/lib/function';
@@ -27,10 +26,7 @@ export const useLogAnalysisCapabilities = () => {
     {
       cancelPreviousOn: 'resolution',
       createPromise: async () => {
-        const rawResponse = await kfetch({
-          method: 'GET',
-          pathname: '/api/ml/ml_capabilities',
-        });
+        const rawResponse = await npStart.core.http.fetch('/api/ml/ml_capabilities');
 
         return pipe(
           getMlCapabilitiesResponsePayloadRT.decode(rawResponse),
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.tsx
index 74dbb3c7a8062..9f966ed3342e6 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.tsx
@@ -6,8 +6,11 @@
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { ValidationIndicesError } from '../../../../common/http_api';
 import { isExampleDataIndex } from '../../../../common/log_analysis';
+import {
+  ValidatedIndex,
+  ValidationIndicesUIError,
+} from '../../../components/logging/log_analysis_setup/initial_configuration_step';
 import { useTrackedPromise } from '../../../utils/use_tracked_promise';
 import { ModuleDescriptor, ModuleSourceConfiguration } from './log_analysis_module_types';
 
@@ -17,38 +20,19 @@ type SetupHandler = (
   endTime: number | undefined
 ) => void;
 
-export type ValidationIndicesUIError =
-  | ValidationIndicesError
-  | { error: 'NETWORK_ERROR' }
-  | { error: 'TOO_FEW_SELECTED_INDICES' };
-
-interface ValidIndex {
-  validity: 'valid';
-  name: string;
-  isSelected: boolean;
-}
-
-interface InvalidIndex {
-  validity: 'invalid';
-  name: string;
-  errors: ValidationIndicesError[];
-}
-
-export type ValidatedIndex = ValidIndex | InvalidIndex;
-
 interface AnalysisSetupStateArguments<JobType extends string> {
-  cleanupAndSetupModule: SetupHandler;
+  cleanUpAndSetUpModule: SetupHandler;
   moduleDescriptor: ModuleDescriptor<JobType>;
-  setupModule: SetupHandler;
+  setUpModule: SetupHandler;
   sourceConfiguration: ModuleSourceConfiguration;
 }
 
 const fourWeeksInMs = 86400000 * 7 * 4;
 
 export const useAnalysisSetupState = <JobType extends string>({
-  cleanupAndSetupModule,
+  cleanUpAndSetUpModule,
   moduleDescriptor: { validateSetupIndices },
-  setupModule,
+  setUpModule,
   sourceConfiguration,
 }: AnalysisSetupStateArguments<JobType>) => {
   const [startTime, setStartTime] = useState<number | undefined>(Date.now() - fourWeeksInMs);
@@ -107,13 +91,13 @@ export const useAnalysisSetupState = <JobType extends string>({
     [validatedIndices]
   );
 
-  const setup = useCallback(() => {
-    return setupModule(selectedIndexNames, startTime, endTime);
-  }, [setupModule, selectedIndexNames, startTime, endTime]);
+  const setUp = useCallback(() => {
+    return setUpModule(selectedIndexNames, startTime, endTime);
+  }, [setUpModule, selectedIndexNames, startTime, endTime]);
 
-  const cleanupAndSetup = useCallback(() => {
-    return cleanupAndSetupModule(selectedIndexNames, startTime, endTime);
-  }, [cleanupAndSetupModule, selectedIndexNames, startTime, endTime]);
+  const cleanUpAndSetUp = useCallback(() => {
+    return cleanUpAndSetUpModule(selectedIndexNames, startTime, endTime);
+  }, [cleanUpAndSetUpModule, selectedIndexNames, startTime, endTime]);
 
   const isValidating = useMemo(
     () =>
@@ -143,13 +127,13 @@ export const useAnalysisSetupState = <JobType extends string>({
   }, [isValidating, validateIndicesRequest.state, selectedIndexNames, validatedIndices]);
 
   return {
-    cleanupAndSetup,
+    cleanUpAndSetUp,
     endTime,
     isValidating,
     selectedIndexNames,
     setEndTime,
     setStartTime,
-    setup,
+    setUp,
     startTime,
     validatedIndices,
     setValidatedIndices,
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/api/fetch_log_entries_item.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/api/fetch_log_entries_item.ts
new file mode 100644
index 0000000000000..fd093f20dd490
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/api/fetch_log_entries_item.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { fold } from 'fp-ts/lib/Either';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { identity } from 'fp-ts/lib/function';
+import { kfetch } from 'ui/kfetch';
+
+import { throwErrors, createPlainError } from '../../../../../common/runtime_types';
+
+import {
+  LOG_ENTRIES_ITEM_PATH,
+  LogEntriesItemRequest,
+  logEntriesItemRequestRT,
+  logEntriesItemResponseRT,
+} from '../../../../../common/http_api';
+
+export const fetchLogEntriesItem = async (requestArgs: LogEntriesItemRequest) => {
+  const response = await kfetch({
+    method: 'POST',
+    pathname: LOG_ENTRIES_ITEM_PATH,
+    body: JSON.stringify(logEntriesItemRequestRT.encode(requestArgs)),
+  });
+
+  return pipe(
+    logEntriesItemResponseRT.decode(response),
+    fold(throwErrors(createPlainError), identity)
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts
index 3020ad7eb5f84..ed82c0854cdea 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts
@@ -5,7 +5,7 @@
  */
 import { useEffect, useState, useReducer, useCallback } from 'react';
 import createContainer from 'constate';
-import { pick, throttle } from 'lodash';
+import { pick, throttle, omit } from 'lodash';
 import { useGraphQLQueries } from './gql_queries';
 import { TimeKey, timeKeyIsBetween } from '../../../../common/time';
 import { InfraLogEntry } from './types';
@@ -45,6 +45,7 @@ interface LogEntriesProps {
   pagesAfterEnd: number | null;
   sourceId: string;
   isAutoReloading: boolean;
+  jumpToTargetPosition: (position: TimeKey) => void;
 }
 
 type FetchEntriesParams = Omit<LogEntriesProps, 'isAutoReloading'>;
@@ -65,7 +66,7 @@ export type LogEntriesStateParams = {
 } & LogEntriesResponse;
 
 export interface LogEntriesCallbacks {
-  fetchNewerEntries: () => Promise<void>;
+  fetchNewerEntries: () => Promise<TimeKey | null | undefined>;
 }
 export const logEntriesInitialCallbacks = {
   fetchNewerEntries: async () => {},
@@ -127,10 +128,13 @@ const useFetchEntriesEffect = (
   const [prevParams, cachePrevParams] = useState(props);
   const [startedStreaming, setStartedStreaming] = useState(false);
 
-  const runFetchNewEntriesRequest = async () => {
+  const runFetchNewEntriesRequest = async (override = {}) => {
     dispatch({ type: Action.FetchingNewEntries });
     try {
-      const payload = await getLogEntriesAround(props);
+      const payload = await getLogEntriesAround({
+        ...omit(props, 'jumpToTargetPosition'),
+        ...override,
+      });
       dispatch({ type: Action.ReceiveNewEntries, payload });
     } catch (e) {
       dispatch({ type: Action.ErrorOnNewEntries });
@@ -150,6 +154,7 @@ const useFetchEntriesEffect = (
         type: getEntriesBefore ? Action.ReceiveEntriesBefore : Action.ReceiveEntriesAfter,
         payload,
       });
+      return payload.entriesEnd;
     } catch (e) {
       dispatch({ type: Action.ErrorOnMoreEntries });
     }
@@ -185,19 +190,37 @@ const useFetchEntriesEffect = (
 
   const fetchNewerEntries = useCallback(
     throttle(() => runFetchMoreEntriesRequest(ShouldFetchMoreEntries.After), 500),
-    [props]
+    [props, state.entriesEnd]
   );
 
-  const streamEntriesEffectDependencies = [props.isAutoReloading, state.isLoadingMore];
+  const streamEntriesEffectDependencies = [
+    props.isAutoReloading,
+    state.isLoadingMore,
+    state.isReloading,
+  ];
   const streamEntriesEffect = () => {
     (async () => {
-      if (props.isAutoReloading && !state.isLoadingMore) {
+      if (props.isAutoReloading && !state.isLoadingMore && !state.isReloading) {
         if (startedStreaming) {
           await new Promise(res => setTimeout(res, 5000));
         } else {
+          const nowKey = {
+            tiebreaker: 0,
+            time: Date.now(),
+          };
+          props.jumpToTargetPosition(nowKey);
           setStartedStreaming(true);
+          if (state.hasMoreAfterEnd) {
+            runFetchNewEntriesRequest({
+              timeKey: nowKey,
+            });
+            return;
+          }
+        }
+        const newEntriesEnd = await runFetchMoreEntriesRequest(ShouldFetchMoreEntries.After);
+        if (newEntriesEnd) {
+          props.jumpToTargetPosition(newEntriesEnd);
         }
-        fetchNewerEntries();
       } else if (!props.isAutoReloading) {
         setStartedStreaming(false);
       }
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/index.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/index.ts
index a737d19a5923d..4c4c317759bb3 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/index.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/index.ts
@@ -4,23 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useContext } from 'react';
-import createContainer from 'constate';
-import { ReduxStateContext } from '../../../utils/redux_context';
-import { logFilterSelectors as logFilterReduxSelectors } from '../../../store/local/selectors';
-
-export const useLogFilterState = () => {
-  const { local: state } = useContext(ReduxStateContext);
-  const filterQuery = logFilterReduxSelectors.selectLogFilterQueryAsJson(state);
-  return { filterQuery };
-};
-
-export interface LogFilterStateParams {
-  filterQuery: string | null;
-}
-
-export const logFilterInitialState = {
-  filterQuery: null,
-};
-
-export const LogFilterState = createContainer(useLogFilterState);
+export * from './log_filter_state';
+export * from './with_log_filter_url_state';
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/log_filter_state.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/log_filter_state.ts
new file mode 100644
index 0000000000000..2911ee729638a
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/log_filter_state.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 { useState, useMemo } from 'react';
+import createContainer from 'constate';
+import { IIndexPattern } from 'src/plugins/data/public';
+import { esKuery } from '../../../../../../../../src/plugins/data/public';
+import { convertKueryToElasticSearchQuery } from '../../../utils/kuery';
+
+export interface KueryFilterQuery {
+  kind: 'kuery';
+  expression: string;
+}
+
+export interface SerializedFilterQuery {
+  query: KueryFilterQuery;
+  serializedQuery: string;
+}
+
+interface LogFilterInternalStateParams {
+  filterQuery: SerializedFilterQuery | null;
+  filterQueryDraft: KueryFilterQuery | null;
+}
+
+export const logFilterInitialState: LogFilterInternalStateParams = {
+  filterQuery: null,
+  filterQueryDraft: null,
+};
+
+export type LogFilterStateParams = Omit<LogFilterInternalStateParams, 'filterQuery'> & {
+  filterQuery: SerializedFilterQuery['serializedQuery'] | null;
+  filterQueryAsKuery: SerializedFilterQuery['query'] | null;
+  isFilterQueryDraftValid: boolean;
+};
+export interface LogFilterCallbacks {
+  setLogFilterQueryDraft: (expression: string) => void;
+  applyLogFilterQuery: (expression: string) => void;
+}
+
+export const useLogFilterState: (props: {
+  indexPattern: IIndexPattern;
+}) => LogFilterStateParams & LogFilterCallbacks = ({ indexPattern }) => {
+  const [state, setState] = useState(logFilterInitialState);
+  const { filterQuery, filterQueryDraft } = state;
+
+  const setLogFilterQueryDraft = useMemo(() => {
+    const setDraft = (payload: KueryFilterQuery) =>
+      setState(prevState => ({ ...prevState, filterQueryDraft: payload }));
+    return (expression: string) =>
+      setDraft({
+        kind: 'kuery',
+        expression,
+      });
+  }, []);
+  const applyLogFilterQuery = useMemo(() => {
+    const applyQuery = (payload: SerializedFilterQuery) =>
+      setState(prevState => ({
+        ...prevState,
+        filterQueryDraft: payload.query,
+        filterQuery: payload,
+      }));
+    return (expression: string) =>
+      applyQuery({
+        query: {
+          kind: 'kuery',
+          expression,
+        },
+        serializedQuery: convertKueryToElasticSearchQuery(expression, indexPattern),
+      });
+  }, [indexPattern]);
+
+  const isFilterQueryDraftValid = useMemo(() => {
+    if (filterQueryDraft?.kind === 'kuery') {
+      try {
+        esKuery.fromKueryExpression(filterQueryDraft.expression);
+      } catch (err) {
+        return false;
+      }
+    }
+
+    return true;
+  }, [filterQueryDraft]);
+
+  const serializedFilterQuery = useMemo(() => (filterQuery ? filterQuery.serializedQuery : null), [
+    filterQuery,
+  ]);
+
+  return {
+    ...state,
+    filterQueryAsKuery: state.filterQuery ? state.filterQuery.query : null,
+    filterQuery: serializedFilterQuery,
+    isFilterQueryDraftValid,
+    setLogFilterQueryDraft,
+    applyLogFilterQuery,
+  };
+};
+
+export const LogFilterState = createContainer(useLogFilterState);
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/with_log_filter_url_state.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/with_log_filter_url_state.tsx
new file mode 100644
index 0000000000000..d1da6c715cfc5
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/with_log_filter_url_state.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, { useContext } from 'react';
+import { LogFilterState, LogFilterStateParams } from './log_filter_state';
+import { replaceStateKeyInQueryString, UrlStateContainer } from '../../../utils/url_state';
+
+type LogFilterUrlState = LogFilterStateParams['filterQueryAsKuery'];
+
+export const WithLogFilterUrlState: React.FC = () => {
+  const { filterQueryAsKuery, applyLogFilterQuery } = useContext(LogFilterState.Context);
+  return (
+    <UrlStateContainer
+      urlState={filterQueryAsKuery}
+      urlStateKey="logFilter"
+      mapToUrlState={mapToFilterQuery}
+      onChange={urlState => {
+        if (urlState) {
+          applyLogFilterQuery(urlState.expression);
+        }
+      }}
+      onInitialize={urlState => {
+        if (urlState) {
+          applyLogFilterQuery(urlState.expression);
+        }
+      }}
+    />
+  );
+};
+
+const mapToFilterQuery = (value: any): LogFilterUrlState | undefined =>
+  value?.kind === 'kuery' && typeof value.expression === 'string'
+    ? {
+        kind: value.kind,
+        expression: value.expression,
+      }
+    : undefined;
+
+export const replaceLogFilterInQueryString = (expression: string) =>
+  replaceStateKeyInQueryString<LogFilterUrlState>('logFilter', {
+    kind: 'kuery',
+    expression,
+  });
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_flyout.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_flyout.tsx
index 53b962c7de5a7..5c1667a4b7680 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_flyout.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_flyout.tsx
@@ -8,12 +8,11 @@ import createContainer from 'constate';
 import { isString } from 'lodash';
 import React, { useContext, useEffect, useMemo, useState } from 'react';
 
-import { FlyoutItemQuery, InfraLogItem } from '../../graphql/types';
-import { useApolloClient } from '../../utils/apollo_context';
 import { UrlStateContainer } from '../../utils/url_state';
 import { useTrackedPromise } from '../../utils/use_tracked_promise';
 import { Source } from '../source';
-import { flyoutItemQuery } from './flyout_item.gql_query';
+import { fetchLogEntriesItem } from './log_entries/api/fetch_log_entries_item';
+import { LogEntriesItem } from '../../../common/http_api';
 
 export enum FlyoutVisibility {
   hidden = 'hidden',
@@ -30,40 +29,26 @@ export const useLogFlyout = () => {
   const { sourceId } = useContext(Source.Context);
   const [flyoutVisible, setFlyoutVisibility] = useState<boolean>(false);
   const [flyoutId, setFlyoutId] = useState<string | null>(null);
-  const [flyoutItem, setFlyoutItem] = useState<InfraLogItem | null>(null);
+  const [flyoutItem, setFlyoutItem] = useState<LogEntriesItem | null>(null);
   const [surroundingLogsId, setSurroundingLogsId] = useState<string | null>(null);
 
-  const apolloClient = useApolloClient();
-
   const [loadFlyoutItemRequest, loadFlyoutItem] = useTrackedPromise(
     {
       cancelPreviousOn: 'creation',
       createPromise: async () => {
-        if (!apolloClient) {
-          throw new Error('Failed to load flyout item: No apollo client available.');
-        }
-
         if (!flyoutId) {
           return;
         }
-
-        return await apolloClient.query<FlyoutItemQuery.Query, FlyoutItemQuery.Variables>({
-          fetchPolicy: 'no-cache',
-          query: flyoutItemQuery,
-          variables: {
-            itemId: flyoutId,
-            sourceId,
-          },
-        });
+        return await fetchLogEntriesItem({ sourceId, id: flyoutId });
       },
       onResolve: response => {
         if (response) {
           const { data } = response;
-          setFlyoutItem((data && data.source && data.source.logItem) || null);
+          setFlyoutItem(data || null);
         }
       },
     },
-    [apolloClient, sourceId, flyoutId]
+    [sourceId, flyoutId]
   );
 
   const isLoading = useMemo(() => {
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_summary_highlights.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_summary_highlights.ts
new file mode 100644
index 0000000000000..781e8401cf881
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/api/fetch_log_summary_highlights.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 { fold } from 'fp-ts/lib/Either';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { identity } from 'fp-ts/lib/function';
+import { kfetch } from 'ui/kfetch';
+
+import { throwErrors, createPlainError } from '../../../../../common/runtime_types';
+
+import {
+  LOG_ENTRIES_SUMMARY_HIGHLIGHTS_PATH,
+  LogEntriesSummaryHighlightsRequest,
+  logEntriesSummaryHighlightsRequestRT,
+  logEntriesSummaryHighlightsResponseRT,
+} from '../../../../../common/http_api';
+
+export const fetchLogSummaryHighlights = async (
+  requestArgs: LogEntriesSummaryHighlightsRequest
+) => {
+  const response = await kfetch({
+    method: 'POST',
+    pathname: LOG_ENTRIES_SUMMARY_HIGHLIGHTS_PATH,
+    body: JSON.stringify(logEntriesSummaryHighlightsRequestRT.encode(requestArgs)),
+  });
+
+  return pipe(
+    logEntriesSummaryHighlightsResponseRT.decode(response),
+    fold(throwErrors(createPlainError), identity)
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/index.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/index.ts
index 605e90914b174..0d548a6a78b1c 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/index.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/index.ts
@@ -5,4 +5,3 @@
  */
 
 export * from './log_highlights';
-export * from './redux_bridges';
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_highlights.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_highlights.tsx
index fa1ccb4efa4bb..a4a94851ad383 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_highlights.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_highlights.tsx
@@ -9,9 +9,9 @@ import { useState, useContext } from 'react';
 import { useLogEntryHighlights } from './log_entry_highlights';
 import { useLogSummaryHighlights } from './log_summary_highlights';
 import { useNextAndPrevious } from './next_and_previous';
-import { useReduxBridgeSetters } from './redux_bridge_setters';
 import { useLogSummaryBufferInterval } from '../log_summary';
 import { LogViewConfiguration } from '../log_view_configuration';
+import { LogPositionState } from '../log_position';
 import { TimeKey } from '../../../../common/time';
 
 export const useLogHighlightsState = ({
@@ -28,14 +28,7 @@ export const useLogHighlightsState = ({
   filterQuery: string | null;
 }) => {
   const [highlightTerms, setHighlightTerms] = useState<string[]>([]);
-  const {
-    visibleMidpoint,
-    setFilterQuery,
-    setVisibleMidpoint,
-    jumpToTarget,
-    setJumpToTarget,
-  } = useReduxBridgeSetters();
-
+  const { visibleMidpoint, jumpToTargetPosition } = useContext(LogPositionState.Context);
   const { intervalSize: summaryIntervalSize } = useContext(LogViewConfiguration.Context);
   const {
     start: summaryStart,
@@ -79,25 +72,22 @@ export const useLogHighlightsState = ({
     visibleMidpoint,
     logEntryHighlights,
     highlightTerms,
-    jumpToTarget,
+    jumpToTargetPosition,
   });
 
   return {
     highlightTerms,
     setHighlightTerms,
-    setFilterQuery,
     logEntryHighlights,
     logEntryHighlightsById,
     logSummaryHighlights,
     loadLogEntryHighlightsRequest,
     loadLogSummaryHighlightsRequest,
-    setVisibleMidpoint,
     currentHighlightKey,
     hasPreviousHighlight,
     hasNextHighlight,
     goToPreviousHighlight,
     goToNextHighlight,
-    setJumpToTarget,
   };
 };
 
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_summary_highlights.gql_query.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_summary_highlights.gql_query.ts
deleted file mode 100644
index 4d2c4075b50e7..0000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_summary_highlights.gql_query.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 gql from 'graphql-tag';
-
-import { sharedFragments } from '../../../../common/graphql/shared';
-
-export const logSummaryHighlightsQuery = gql`
-  query LogSummaryHighlightsQuery(
-    $sourceId: ID = "default"
-    $start: Float!
-    $end: Float!
-    $bucketSize: Float!
-    $highlightQueries: [String!]!
-    $filterQuery: String
-  ) {
-    source(id: $sourceId) {
-      id
-      logSummaryHighlightsBetween(
-        start: $start
-        end: $end
-        bucketSize: $bucketSize
-        highlightQueries: $highlightQueries
-        filterQuery: $filterQuery
-      ) {
-        start
-        end
-        buckets {
-          start
-          end
-          entriesCount
-          representativeKey {
-            ...InfraTimeKeyFields
-          }
-        }
-      }
-    }
-  }
-
-  ${sharedFragments.InfraTimeKey}
-`;
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_summary_highlights.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_summary_highlights.ts
index 874c70e016496..81639aba411ef 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_summary_highlights.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/log_summary_highlights.ts
@@ -7,12 +7,9 @@
 import { useEffect, useMemo, useState } from 'react';
 import { debounce } from 'lodash';
 
-import { LogSummaryHighlightsQuery } from '../../../graphql/types';
-import { DependencyError, useApolloClient } from '../../../utils/apollo_context';
 import { useTrackedPromise } from '../../../utils/use_tracked_promise';
-import { logSummaryHighlightsQuery } from './log_summary_highlights.gql_query';
-
-export type LogSummaryHighlights = LogSummaryHighlightsQuery.Query['source']['logSummaryHighlightsBetween'];
+import { fetchLogSummaryHighlights } from './api/fetch_log_summary_highlights';
+import { LogEntriesSummaryHighlightsResponse } from '../../../../common/http_api';
 
 export const useLogSummaryHighlights = (
   sourceId: string,
@@ -23,41 +20,32 @@ export const useLogSummaryHighlights = (
   filterQuery: string | null,
   highlightTerms: string[]
 ) => {
-  const apolloClient = useApolloClient();
-  const [logSummaryHighlights, setLogSummaryHighlights] = useState<LogSummaryHighlights>([]);
+  const [logSummaryHighlights, setLogSummaryHighlights] = useState<
+    LogEntriesSummaryHighlightsResponse['data']
+  >([]);
 
   const [loadLogSummaryHighlightsRequest, loadLogSummaryHighlights] = useTrackedPromise(
     {
       cancelPreviousOn: 'resolution',
       createPromise: async () => {
-        if (!apolloClient) {
-          throw new DependencyError('Failed to load source: No apollo client available.');
-        }
         if (!start || !end || !highlightTerms.length) {
           throw new Error('Skipping request: Insufficient parameters');
         }
 
-        return await apolloClient.query<
-          LogSummaryHighlightsQuery.Query,
-          LogSummaryHighlightsQuery.Variables
-        >({
-          fetchPolicy: 'no-cache',
-          query: logSummaryHighlightsQuery,
-          variables: {
-            sourceId,
-            start,
-            end,
-            bucketSize,
-            highlightQueries: [highlightTerms[0]],
-            filterQuery,
-          },
+        return await fetchLogSummaryHighlights({
+          sourceId,
+          startDate: start,
+          endDate: end,
+          bucketSize,
+          query: filterQuery,
+          highlightTerms,
         });
       },
       onResolve: response => {
-        setLogSummaryHighlights(response.data.source.logSummaryHighlightsBetween);
+        setLogSummaryHighlights(response.data);
       },
     },
-    [apolloClient, sourceId, start, end, bucketSize, filterQuery, highlightTerms]
+    [sourceId, start, end, bucketSize, filterQuery, highlightTerms]
   );
 
   const debouncedLoadSummaryHighlights = useMemo(() => debounce(loadLogSummaryHighlights, 275), [
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/next_and_previous.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/next_and_previous.tsx
index 62a43a5412825..7557550883f11 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/next_and_previous.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/next_and_previous.tsx
@@ -17,12 +17,12 @@ import { LogEntryHighlights } from './log_entry_highlights';
 
 export const useNextAndPrevious = ({
   highlightTerms,
-  jumpToTarget,
+  jumpToTargetPosition,
   logEntryHighlights,
   visibleMidpoint,
 }: {
   highlightTerms: string[];
-  jumpToTarget: (target: TimeKey) => void;
+  jumpToTargetPosition: (target: TimeKey) => void;
   logEntryHighlights: LogEntryHighlights | undefined;
   visibleMidpoint: TimeKey | null;
 }) => {
@@ -41,9 +41,9 @@ export const useNextAndPrevious = ({
 
   useEffect(() => {
     if (currentTimeKey) {
-      jumpToTarget(currentTimeKey);
+      jumpToTargetPosition(currentTimeKey);
     }
-  }, [currentTimeKey, jumpToTarget]);
+  }, [currentTimeKey, jumpToTargetPosition]);
 
   useEffect(() => {
     if (currentTimeKey === null && entries.length > 0) {
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridge_setters.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridge_setters.tsx
deleted file mode 100644
index 0e778f35188f0..0000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridge_setters.tsx
+++ /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 { useState } from 'react';
-import { TimeKey } from '../../../../common/time';
-
-export const useReduxBridgeSetters = () => {
-  const [filterQuery, setFilterQuery] = useState<string | null>(null);
-  const [visibleMidpoint, setVisibleMidpoint] = useState<TimeKey | null>(null);
-  const [jumpToTarget, setJumpToTarget] = useState<(target: TimeKey) => void>(() => undefined);
-
-  return {
-    filterQuery,
-    visibleMidpoint,
-    setFilterQuery,
-    setVisibleMidpoint,
-    jumpToTarget,
-    setJumpToTarget,
-  };
-};
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridges.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridges.tsx
deleted file mode 100644
index 9ea8987d4f326..0000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_highlights/redux_bridges.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { useEffect, useContext } from 'react';
-
-import { TimeKey } from '../../../../common/time';
-import { withLogFilter } from '../with_log_filter';
-import { withLogPosition } from '../with_log_position';
-import { LogHighlightsState } from './log_highlights';
-
-// Bridges Redux container state with Hooks state. Once state is moved fully from
-// Redux to Hooks this can be removed.
-
-export const LogHighlightsPositionBridge = withLogPosition(
-  ({
-    visibleMidpoint,
-    jumpToTargetPosition,
-  }: {
-    visibleMidpoint: TimeKey | null;
-    jumpToTargetPosition: (target: TimeKey) => void;
-  }) => {
-    const { setJumpToTarget, setVisibleMidpoint } = useContext(LogHighlightsState.Context);
-    useEffect(() => {
-      setVisibleMidpoint(visibleMidpoint);
-    }, [setVisibleMidpoint, visibleMidpoint]);
-
-    useEffect(() => {
-      setJumpToTarget(() => jumpToTargetPosition);
-    }, [jumpToTargetPosition, setJumpToTarget]);
-
-    return null;
-  }
-);
-
-export const LogHighlightsFilterQueryBridge = withLogFilter(
-  ({ serializedFilterQuery }: { serializedFilterQuery: string | null }) => {
-    const { setFilterQuery } = useContext(LogHighlightsState.Context);
-
-    useEffect(() => {
-      setFilterQuery(serializedFilterQuery);
-    }, [serializedFilterQuery, setFilterQuery]);
-
-    return null;
-  }
-);
-
-export const LogHighlightsBridge = ({ indexPattern }: { indexPattern: any }) => (
-  <>
-    <LogHighlightsPositionBridge />
-    <LogHighlightsFilterQueryBridge indexPattern={indexPattern} />
-  </>
-);
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_position/index.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/index.ts
index 7cc8050aafd14..54a2bc88ad3d0 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_position/index.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/index.ts
@@ -4,32 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useContext } from 'react';
-import createContainer from 'constate';
-import { ReduxStateContext } from '../../../utils/redux_context';
-import { logPositionSelectors as logPositionReduxSelectors } from '../../../store/local/selectors';
-import { TimeKey } from '../../../../common/time';
-
-export const useLogPositionState = () => {
-  const { local: state } = useContext(ReduxStateContext);
-  const timeKey = logPositionReduxSelectors.selectVisibleMidpointOrTarget(state);
-  const pages = logPositionReduxSelectors.selectPagesBeforeAndAfter(state);
-  const isAutoReloading = logPositionReduxSelectors.selectIsAutoReloading(state);
-  return { timeKey, isAutoReloading, ...pages };
-};
-
-export interface LogPositionStateParams {
-  timeKey: TimeKey | null;
-  pagesAfterEnd: number | null;
-  pagesBeforeStart: number | null;
-  isAutoReloading: boolean;
-}
-
-export const logPositionInitialState = {
-  timeKey: null,
-  pagesAfterEnd: null,
-  pagesBeforeStart: null,
-  isAutoReloading: false,
-};
-
-export const LogPositionState = createContainer(useLogPositionState);
+export * from './log_position_state';
+export * from './with_log_position_url_state';
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_position/log_position_state.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/log_position_state.ts
new file mode 100644
index 0000000000000..1a8274024bd26
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/log_position_state.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 { useState, useMemo, useEffect, useCallback } from 'react';
+import createContainer from 'constate';
+import { TimeKey } from '../../../../common/time';
+
+type TimeKeyOrNull = TimeKey | null;
+
+interface VisiblePositions {
+  startKey: TimeKeyOrNull;
+  middleKey: TimeKeyOrNull;
+  endKey: TimeKeyOrNull;
+  pagesAfterEnd: number;
+  pagesBeforeStart: number;
+}
+
+export interface LogPositionStateParams {
+  targetPosition: TimeKeyOrNull;
+  isAutoReloading: boolean;
+  firstVisiblePosition: TimeKeyOrNull;
+  pagesBeforeStart: number;
+  pagesAfterEnd: number;
+  visibleMidpoint: TimeKeyOrNull;
+  visibleMidpointTime: number | null;
+  visibleTimeInterval: { start: number; end: number } | null;
+}
+
+export interface LogPositionCallbacks {
+  jumpToTargetPosition: (pos: TimeKeyOrNull) => void;
+  jumpToTargetPositionTime: (time: number) => void;
+  reportVisiblePositions: (visPos: VisiblePositions) => void;
+  startLiveStreaming: () => void;
+  stopLiveStreaming: () => void;
+}
+
+const useVisibleMidpoint = (middleKey: TimeKeyOrNull, targetPosition: TimeKeyOrNull) => {
+  // Of the two dependencies `middleKey` and `targetPosition`, return
+  // whichever one was the most recently updated. This allows the UI controls
+  // to display a newly-selected `targetPosition` before loading new data;
+  // otherwise the previous `middleKey` would linger in the UI for the entirety
+  // of the loading operation, which the user could perceive as unresponsiveness
+  const [store, update] = useState({
+    middleKey,
+    targetPosition,
+    currentValue: middleKey || targetPosition,
+  });
+  useEffect(() => {
+    if (middleKey !== store.middleKey) {
+      update({ targetPosition, middleKey, currentValue: middleKey });
+    } else if (targetPosition !== store.targetPosition) {
+      update({ targetPosition, middleKey, currentValue: targetPosition });
+    }
+  }, [middleKey, targetPosition]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  return store.currentValue;
+};
+
+export const useLogPositionState: () => LogPositionStateParams & LogPositionCallbacks = () => {
+  const [targetPosition, jumpToTargetPosition] = useState<TimeKey | null>(null);
+  const [isAutoReloading, setIsAutoReloading] = useState(false);
+  const [visiblePositions, reportVisiblePositions] = useState<VisiblePositions>({
+    endKey: null,
+    middleKey: null,
+    startKey: null,
+    pagesBeforeStart: Infinity,
+    pagesAfterEnd: Infinity,
+  });
+
+  const { startKey, middleKey, endKey, pagesBeforeStart, pagesAfterEnd } = visiblePositions;
+
+  const visibleMidpoint = useVisibleMidpoint(middleKey, targetPosition);
+
+  const visibleTimeInterval = useMemo(
+    () => (startKey && endKey ? { start: startKey.time, end: endKey.time } : null),
+    [startKey, endKey]
+  );
+
+  const state = {
+    targetPosition,
+    isAutoReloading,
+    firstVisiblePosition: startKey,
+    pagesBeforeStart,
+    pagesAfterEnd,
+    visibleMidpoint,
+    visibleMidpointTime: visibleMidpoint ? visibleMidpoint.time : null,
+    visibleTimeInterval,
+  };
+
+  const callbacks = {
+    jumpToTargetPosition,
+    jumpToTargetPositionTime: useCallback(
+      (time: number) => jumpToTargetPosition({ tiebreaker: 0, time }),
+      [jumpToTargetPosition]
+    ),
+    reportVisiblePositions,
+    startLiveStreaming: useCallback(() => setIsAutoReloading(true), [setIsAutoReloading]),
+    stopLiveStreaming: useCallback(() => setIsAutoReloading(false), [setIsAutoReloading]),
+  };
+
+  return { ...state, ...callbacks };
+};
+
+export const LogPositionState = createContainer(useLogPositionState);
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx
new file mode 100644
index 0000000000000..a877750587be4
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_position/with_log_position_url_state.tsx
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext, useMemo } from 'react';
+
+import { pickTimeKey } from '../../../../common/time';
+import { replaceStateKeyInQueryString, UrlStateContainer } from '../../../utils/url_state';
+import { LogPositionState, LogPositionStateParams } from './log_position_state';
+
+/**
+ * Url State
+ */
+
+interface LogPositionUrlState {
+  position: LogPositionStateParams['visibleMidpoint'] | undefined;
+  streamLive?: boolean | undefined;
+}
+
+export const WithLogPositionUrlState = () => {
+  const {
+    visibleMidpoint,
+    isAutoReloading,
+    jumpToTargetPosition,
+    jumpToTargetPositionTime,
+    startLiveStreaming,
+    stopLiveStreaming,
+  } = useContext(LogPositionState.Context);
+  const urlState = useMemo(
+    () => ({
+      position: visibleMidpoint ? pickTimeKey(visibleMidpoint) : null,
+      streamLive: isAutoReloading,
+    }),
+    [visibleMidpoint, isAutoReloading]
+  );
+  return (
+    <UrlStateContainer
+      urlState={urlState}
+      urlStateKey="logPosition"
+      mapToUrlState={mapToUrlState}
+      onChange={(newUrlState: LogPositionUrlState | undefined) => {
+        if (newUrlState && newUrlState.position) {
+          jumpToTargetPosition(newUrlState.position);
+        }
+        if (newUrlState && newUrlState.streamLive) {
+          startLiveStreaming();
+        } else if (
+          newUrlState &&
+          typeof newUrlState.streamLive !== 'undefined' &&
+          !newUrlState.streamLive
+        ) {
+          stopLiveStreaming();
+        }
+      }}
+      onInitialize={(initialUrlState: LogPositionUrlState | undefined) => {
+        if (initialUrlState && initialUrlState.position) {
+          jumpToTargetPosition(initialUrlState.position);
+        } else {
+          jumpToTargetPositionTime(Date.now());
+        }
+        if (initialUrlState && initialUrlState.streamLive) {
+          startLiveStreaming();
+        }
+      }}
+    />
+  );
+};
+
+const mapToUrlState = (value: any): LogPositionUrlState | undefined =>
+  value
+    ? {
+        position: mapToPositionUrlState(value.position),
+        streamLive: mapToStreamLiveUrlState(value.streamLive),
+      }
+    : undefined;
+
+const mapToPositionUrlState = (value: any) =>
+  value && typeof value.time === 'number' && typeof value.tiebreaker === 'number'
+    ? pickTimeKey(value)
+    : undefined;
+
+const mapToStreamLiveUrlState = (value: any) => (typeof value === 'boolean' ? value : undefined);
+
+export const replaceLogPositionInQueryString = (time: number) =>
+  Number.isNaN(time)
+    ? (value: string) => value
+    : replaceStateKeyInQueryString<LogPositionUrlState>('logPosition', {
+        position: {
+          time,
+          tiebreaker: 0,
+        },
+      });
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/api/fetch_log_summary.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/api/fetch_log_summary.ts
new file mode 100644
index 0000000000000..5dabb8ebf0179
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/api/fetch_log_summary.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { fold } from 'fp-ts/lib/Either';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { identity } from 'fp-ts/lib/function';
+import { kfetch } from 'ui/kfetch';
+
+import { throwErrors, createPlainError } from '../../../../../common/runtime_types';
+
+import {
+  LOG_ENTRIES_SUMMARY_PATH,
+  LogEntriesSummaryRequest,
+  logEntriesSummaryRequestRT,
+  logEntriesSummaryResponseRT,
+} from '../../../../../common/http_api';
+
+export const fetchLogSummary = async (requestArgs: LogEntriesSummaryRequest) => {
+  const response = await kfetch({
+    method: 'POST',
+    pathname: LOG_ENTRIES_SUMMARY_PATH,
+    body: JSON.stringify(logEntriesSummaryRequestRT.encode(requestArgs)),
+  });
+
+  return pipe(
+    logEntriesSummaryResponseRT.decode(response),
+    fold(throwErrors(createPlainError), identity)
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/log_summary.gql_query.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/log_summary.gql_query.ts
deleted file mode 100644
index a8bd808e51947..0000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/log_summary.gql_query.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 gql from 'graphql-tag';
-
-export const logSummaryQuery = gql`
-  query LogSummary(
-    $sourceId: ID = "default"
-    $start: Float!
-    $end: Float!
-    $bucketSize: Float!
-    $filterQuery: String
-  ) {
-    source(id: $sourceId) {
-      id
-      logSummaryBetween(
-        start: $start
-        end: $end
-        bucketSize: $bucketSize
-        filterQuery: $filterQuery
-      ) {
-        start
-        end
-        buckets {
-          start
-          end
-          entriesCount
-        }
-      }
-    }
-  }
-`;
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx
index b65bf011422d2..2bbcc22b150e4 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/log_summary.test.tsx
@@ -4,271 +4,170 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import { mountHook } from 'test_utils/enzyme_helpers';
+import { renderHook } from '@testing-library/react-hooks';
 
-import { ApolloClientContext } from '../../../utils/apollo_context';
 import { useLogSummary } from './log_summary';
 
-describe('useLogSummary hook', () => {
-  it('provides an empty list of buckets by default', () => {
-    const mockApolloClient = {
-      query: jest.fn(),
-    };
+import { fetchLogSummary } from './api/fetch_log_summary';
 
-    const { getLastHookValue } = mountHook(
-      () => useLogSummary('SOURCE_ID', null, 1000, null),
-      createMockApolloProvider(mockApolloClient)
-    );
+// Typescript doesn't know that `fetchLogSummary` is a jest mock.
+// We use a second variable with a type cast to help the compiler further down the line.
+jest.mock('./api/fetch_log_summary', () => ({ fetchLogSummary: jest.fn() }));
+const fetchLogSummaryMock = fetchLogSummary as jest.MockedFunction<typeof fetchLogSummary>;
 
-    expect(getLastHookValue().buckets).toEqual([]);
+describe('useLogSummary hook', () => {
+  beforeEach(() => {
+    fetchLogSummaryMock.mockClear();
   });
 
-  /**
-   * This is skipped until `act` can deal with async operations, see comment
-   * below.
-   *
-   * The test cases below this are a temporary alternative until the
-   * shortcomings of the `act` function have been overcome.
-   */
-  it.skip('queries for new summary buckets when the source id changes', async () => {
-    const firstMockResponse = createMockResponse([{ start: 99000, end: 101000, entriesCount: 1 }]);
-    const secondMockResponse = createMockResponse([{ start: 99000, end: 101000, entriesCount: 2 }]);
-    const mockApolloClient = {
-      query: jest
-        .fn()
-        .mockResolvedValueOnce(firstMockResponse)
-        .mockResolvedValueOnce(secondMockResponse),
-    };
-
-    const { act, getLastHookValue } = mountHook(
-      ({ sourceId }) => useLogSummary(sourceId, 100000, 1000, null),
-      createMockApolloProvider(mockApolloClient),
-      { sourceId: 'INITIAL_SOURCE_ID' }
-    );
-
-    expect(mockApolloClient.query).toHaveBeenCalledTimes(1);
-    expect(mockApolloClient.query).toHaveBeenLastCalledWith(
-      expect.objectContaining({
-        variables: expect.objectContaining({
-          sourceId: 'INITIAL_SOURCE_ID',
-        }),
-      })
-    );
-    expect(getLastHookValue().buckets).toEqual(
-      firstMockResponse.data.source.logSummaryBetween.buckets
-    );
-
-    // DOESN'T WORK YET until https://github.com/facebook/react/pull/14853 has been merged
-    await act(async (_, setArgs) => {
-      setArgs({ sourceId: 'CHANGED_SOURCE_ID' });
-
-      // wait for the promise queue to be processed
-      await mockApolloClient.query();
-    });
-
-    expect(mockApolloClient.query).toHaveBeenCalledTimes(2);
-    expect(mockApolloClient.query).toHaveBeenLastCalledWith(
-      expect.objectContaining({
-        variables: expect.objectContaining({
-          sourceId: 'CHANGED_SOURCE_ID',
-        }),
-      })
-    );
-    expect(getLastHookValue().buckets).toEqual(
-      secondMockResponse.data.source.logSummaryBetween.buckets
-    );
+  it('provides an empty list of buckets by default', () => {
+    const { result } = renderHook(() => useLogSummary('SOURCE_ID', null, 1000, null));
+    expect(result.current.buckets).toEqual([]);
   });
 
-  /**
-   * The following test cases use a bad workaround to avoid the problems
-   * exhibited by the skipped test case above. Instead of a real Promise we
-   * fake a synchronously resolving promise-like return value to avoid any
-   * async behavior.
-   *
-   * They should be rewritten to the cleaner async/await style shown in the
-   * test case above once `act` is capable of dealing with it.
-   */
-
-  it('queries for new summary buckets when the source id changes - workaround', () => {
+  it('queries for new summary buckets when the source id changes', async () => {
     const firstMockResponse = createMockResponse([{ start: 99000, end: 101000, entriesCount: 1 }]);
     const secondMockResponse = createMockResponse([{ start: 99000, end: 101000, entriesCount: 2 }]);
-    const mockApolloClient = {
-      query: jest
-        .fn()
-        .mockReturnValueOnce(createSyncMockPromise(firstMockResponse))
-        .mockReturnValueOnce(createSyncMockPromise(secondMockResponse)),
-    };
 
-    const { act, getLastHookValue } = mountHook(
+    fetchLogSummaryMock
+      .mockResolvedValueOnce(firstMockResponse)
+      .mockResolvedValueOnce(secondMockResponse);
+
+    const { result, waitForNextUpdate, rerender } = renderHook(
       ({ sourceId }) => useLogSummary(sourceId, 100000, 1000, null),
-      createMockApolloProvider(mockApolloClient),
-      { sourceId: 'INITIAL_SOURCE_ID' }
+      {
+        initialProps: { sourceId: 'INITIAL_SOURCE_ID' },
+      }
     );
 
-    expect(mockApolloClient.query).toHaveBeenCalledTimes(1);
-    expect(mockApolloClient.query).toHaveBeenLastCalledWith(
+    await waitForNextUpdate();
+
+    expect(fetchLogSummaryMock).toHaveBeenCalledTimes(1);
+    expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        variables: expect.objectContaining({
-          sourceId: 'INITIAL_SOURCE_ID',
-        }),
+        sourceId: 'INITIAL_SOURCE_ID',
       })
     );
-    expect(getLastHookValue().buckets).toEqual(
-      firstMockResponse.data.source.logSummaryBetween.buckets
-    );
+    expect(result.current.buckets).toEqual(firstMockResponse.data.buckets);
 
-    act((_, setArgs) => {
-      setArgs({ sourceId: 'CHANGED_SOURCE_ID' });
-    });
+    rerender({ sourceId: 'CHANGED_SOURCE_ID' });
+    await waitForNextUpdate();
 
-    expect(mockApolloClient.query).toHaveBeenCalledTimes(2);
-    expect(mockApolloClient.query).toHaveBeenLastCalledWith(
+    expect(fetchLogSummaryMock).toHaveBeenCalledTimes(2);
+    expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        variables: expect.objectContaining({
-          sourceId: 'CHANGED_SOURCE_ID',
-        }),
+        sourceId: 'CHANGED_SOURCE_ID',
       })
     );
-    expect(getLastHookValue().buckets).toEqual(
-      secondMockResponse.data.source.logSummaryBetween.buckets
-    );
+    expect(result.current.buckets).toEqual(secondMockResponse.data.buckets);
   });
 
-  it('queries for new summary buckets when the filter query changes', () => {
+  it('queries for new summary buckets when the filter query changes', async () => {
     const firstMockResponse = createMockResponse([{ start: 99000, end: 101000, entriesCount: 1 }]);
     const secondMockResponse = createMockResponse([{ start: 99000, end: 101000, entriesCount: 2 }]);
-    const mockApolloClient = {
-      query: jest
-        .fn()
-        .mockReturnValueOnce(createSyncMockPromise(firstMockResponse))
-        .mockReturnValueOnce(createSyncMockPromise(secondMockResponse)),
-    };
 
-    const { act, getLastHookValue } = mountHook(
+    fetchLogSummaryMock
+      .mockResolvedValueOnce(firstMockResponse)
+      .mockResolvedValueOnce(secondMockResponse);
+
+    const { result, waitForNextUpdate, rerender } = renderHook(
       ({ filterQuery }) => useLogSummary('SOURCE_ID', 100000, 1000, filterQuery),
-      createMockApolloProvider(mockApolloClient),
-      { filterQuery: 'INITIAL_FILTER_QUERY' }
+      {
+        initialProps: { filterQuery: 'INITIAL_FILTER_QUERY' },
+      }
     );
 
-    expect(mockApolloClient.query).toHaveBeenCalledTimes(1);
-    expect(mockApolloClient.query).toHaveBeenLastCalledWith(
+    await waitForNextUpdate();
+
+    expect(fetchLogSummaryMock).toHaveBeenCalledTimes(1);
+    expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        variables: expect.objectContaining({
-          filterQuery: 'INITIAL_FILTER_QUERY',
-        }),
+        query: 'INITIAL_FILTER_QUERY',
       })
     );
-    expect(getLastHookValue().buckets).toEqual(
-      firstMockResponse.data.source.logSummaryBetween.buckets
-    );
+    expect(result.current.buckets).toEqual(firstMockResponse.data.buckets);
 
-    act((_, setArgs) => {
-      setArgs({ filterQuery: 'CHANGED_FILTER_QUERY' });
-    });
+    rerender({ filterQuery: 'CHANGED_FILTER_QUERY' });
+    await waitForNextUpdate();
 
-    expect(mockApolloClient.query).toHaveBeenCalledTimes(2);
-    expect(mockApolloClient.query).toHaveBeenLastCalledWith(
+    expect(fetchLogSummaryMock).toHaveBeenCalledTimes(2);
+    expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        variables: expect.objectContaining({
-          filterQuery: 'CHANGED_FILTER_QUERY',
-        }),
+        query: 'CHANGED_FILTER_QUERY',
       })
     );
-    expect(getLastHookValue().buckets).toEqual(
-      secondMockResponse.data.source.logSummaryBetween.buckets
-    );
+    expect(result.current.buckets).toEqual(secondMockResponse.data.buckets);
   });
 
-  it('queries for new summary buckets when the midpoint time changes', () => {
-    const mockApolloClient = {
-      query: jest
-        .fn()
-        .mockReturnValueOnce(createSyncMockPromise(createMockResponse([])))
-        .mockReturnValueOnce(createSyncMockPromise(createMockResponse([]))),
-    };
+  it('queries for new summary buckets when the midpoint time changes', async () => {
+    fetchLogSummaryMock
+      .mockResolvedValueOnce(createMockResponse([]))
+      .mockResolvedValueOnce(createMockResponse([]));
 
-    const { act } = mountHook(
+    const { waitForNextUpdate, rerender } = renderHook(
       ({ midpointTime }) => useLogSummary('SOURCE_ID', midpointTime, 1000, null),
-      createMockApolloProvider(mockApolloClient),
-      { midpointTime: 100000 }
+      {
+        initialProps: { midpointTime: 100000 },
+      }
     );
 
-    expect(mockApolloClient.query).toHaveBeenCalledTimes(1);
-    expect(mockApolloClient.query).toHaveBeenLastCalledWith(
+    await waitForNextUpdate();
+    expect(fetchLogSummaryMock).toHaveBeenCalledTimes(1);
+    expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        variables: expect.objectContaining({
-          start: 98500,
-          end: 101500,
-        }),
+        startDate: 98500,
+        endDate: 101500,
       })
     );
 
-    act((_, setArgs) => {
-      setArgs({ midpointTime: 200000 });
-    });
+    rerender({ midpointTime: 200000 });
+    await waitForNextUpdate();
 
-    expect(mockApolloClient.query).toHaveBeenCalledTimes(2);
-    expect(mockApolloClient.query).toHaveBeenLastCalledWith(
+    expect(fetchLogSummaryMock).toHaveBeenCalledTimes(2);
+    expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        variables: expect.objectContaining({
-          start: 198500,
-          end: 201500,
-        }),
+        startDate: 198500,
+        endDate: 201500,
       })
     );
   });
 
-  it('queries for new summary buckets when the interval size changes', () => {
-    const mockApolloClient = {
-      query: jest
-        .fn()
-        .mockReturnValueOnce(createSyncMockPromise(createMockResponse([])))
-        .mockReturnValueOnce(createSyncMockPromise(createMockResponse([]))),
-    };
+  it('queries for new summary buckets when the interval size changes', async () => {
+    fetchLogSummaryMock
+      .mockResolvedValueOnce(createMockResponse([]))
+      .mockResolvedValueOnce(createMockResponse([]));
 
-    const { act } = mountHook(
+    const { waitForNextUpdate, rerender } = renderHook(
       ({ intervalSize }) => useLogSummary('SOURCE_ID', 100000, intervalSize, null),
-      createMockApolloProvider(mockApolloClient),
-      { intervalSize: 1000 }
+      {
+        initialProps: { intervalSize: 1000 },
+      }
     );
 
-    expect(mockApolloClient.query).toHaveBeenCalledTimes(1);
-    expect(mockApolloClient.query).toHaveBeenLastCalledWith(
+    await waitForNextUpdate();
+    expect(fetchLogSummaryMock).toHaveBeenCalledTimes(1);
+    expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        variables: expect.objectContaining({
-          bucketSize: 10,
-          start: 98500,
-          end: 101500,
-        }),
+        bucketSize: 10,
+        startDate: 98500,
+        endDate: 101500,
       })
     );
 
-    act((_, setArgs) => {
-      setArgs({ intervalSize: 2000 });
-    });
+    rerender({ intervalSize: 2000 });
+    await waitForNextUpdate();
 
-    expect(mockApolloClient.query).toHaveBeenCalledTimes(2);
-    expect(mockApolloClient.query).toHaveBeenLastCalledWith(
+    expect(fetchLogSummaryMock).toHaveBeenCalledTimes(2);
+    expect(fetchLogSummaryMock).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        variables: expect.objectContaining({
-          bucketSize: 20,
-          start: 97000,
-          end: 103000,
-        }),
+        bucketSize: 20,
+        startDate: 97000,
+        endDate: 103000,
       })
     );
   });
 });
 
-const createMockApolloProvider = (mockClient: any): React.FunctionComponent => ({ children }) => (
-  <ApolloClientContext.Provider value={mockClient}>{children}</ApolloClientContext.Provider>
-);
-
 const createMockResponse = (
   buckets: Array<{ start: number; end: number; entriesCount: number }>
-) => ({ data: { source: { logSummaryBetween: { buckets } } } });
-
-const createSyncMockPromise = <Value extends any>(value: Value) => ({
-  then: (callback: (value: Value) => any) => callback(value),
-});
+) => ({ data: { buckets, start: Number.NEGATIVE_INFINITY, end: Number.POSITIVE_INFINITY } });
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/log_summary.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/log_summary.tsx
index a188e698991a0..c39b7075af325 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/log_summary.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/log_summary.tsx
@@ -6,14 +6,12 @@
 
 import { useState } from 'react';
 
-import { LogSummary as LogSummaryQuery } from '../../../graphql/types';
-import { useApolloClient } from '../../../utils/apollo_context';
 import { useCancellableEffect } from '../../../utils/cancellable_effect';
-import { logSummaryQuery } from './log_summary.gql_query';
 import { useLogSummaryBufferInterval } from './use_log_summary_buffer_interval';
+import { fetchLogSummary } from './api/fetch_log_summary';
+import { LogEntriesSummaryResponse } from '../../../../common/http_api';
 
-export type LogSummaryBetween = LogSummaryQuery.Query['source']['logSummaryBetween'];
-export type LogSummaryBuckets = LogSummaryBetween['buckets'];
+export type LogSummaryBuckets = LogEntriesSummaryResponse['data']['buckets'];
 
 export const useLogSummary = (
   sourceId: string,
@@ -21,9 +19,7 @@ export const useLogSummary = (
   intervalSize: number,
   filterQuery: string | null
 ) => {
-  const [logSummaryBetween, setLogSummaryBetween] = useState<LogSummaryBetween>({ buckets: [] });
-  const apolloClient = useApolloClient();
-
+  const [logSummaryBuckets, setLogSummaryBuckets] = useState<LogSummaryBuckets>([]);
   const { start: bufferStart, end: bufferEnd, bucketSize } = useLogSummaryBufferInterval(
     midpointTime,
     intervalSize
@@ -31,33 +27,27 @@ export const useLogSummary = (
 
   useCancellableEffect(
     getIsCancelled => {
-      if (!apolloClient || bufferStart === null || bufferEnd === null) {
+      if (bufferStart === null || bufferEnd === null) {
         return;
       }
 
-      apolloClient
-        .query<LogSummaryQuery.Query, LogSummaryQuery.Variables>({
-          fetchPolicy: 'no-cache',
-          query: logSummaryQuery,
-          variables: {
-            filterQuery,
-            sourceId,
-            start: bufferStart,
-            end: bufferEnd,
-            bucketSize,
-          },
-        })
-        .then(response => {
-          if (!getIsCancelled()) {
-            setLogSummaryBetween(response.data.source.logSummaryBetween);
-          }
-        });
+      fetchLogSummary({
+        sourceId,
+        startDate: bufferStart,
+        endDate: bufferEnd,
+        bucketSize,
+        query: filterQuery,
+      }).then(response => {
+        if (!getIsCancelled()) {
+          setLogSummaryBuckets(response.data.buckets);
+        }
+      });
     },
-    [apolloClient, sourceId, filterQuery, bufferStart, bufferEnd, bucketSize]
+    [sourceId, filterQuery, bufferStart, bufferEnd, bucketSize]
   );
 
   return {
-    buckets: logSummaryBetween.buckets,
+    buckets: logSummaryBuckets,
     start: bufferStart,
     end: bufferEnd,
   };
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/with_summary.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/with_summary.ts
index 61c603130df52..4db0d2e645448 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/with_summary.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_summary/with_summary.ts
@@ -5,41 +5,34 @@
  */
 
 import { useContext } from 'react';
-import { connect } from 'react-redux';
 
-import { logFilterSelectors, logPositionSelectors, State } from '../../../store';
 import { RendererFunction } from '../../../utils/typed_react';
 import { Source } from '../../source';
 import { LogViewConfiguration } from '../log_view_configuration';
 import { LogSummaryBuckets, useLogSummary } from './log_summary';
+import { LogFilterState } from '../log_filter';
+import { LogPositionState } from '../log_position';
 
-export const WithSummary = connect((state: State) => ({
-  visibleMidpointTime: logPositionSelectors.selectVisibleMidpointOrTargetTime(state),
-  filterQuery: logFilterSelectors.selectLogFilterQueryAsJson(state),
-}))(
-  ({
-    children,
-    filterQuery,
-    visibleMidpointTime,
-  }: {
-    children: RendererFunction<{
-      buckets: LogSummaryBuckets;
-      start: number | null;
-      end: number | null;
-    }>;
-    filterQuery: string | null;
-    visibleMidpointTime: number | null;
-  }) => {
-    const { intervalSize } = useContext(LogViewConfiguration.Context);
-    const { sourceId } = useContext(Source.Context);
+export const WithSummary = ({
+  children,
+}: {
+  children: RendererFunction<{
+    buckets: LogSummaryBuckets;
+    start: number | null;
+    end: number | null;
+  }>;
+}) => {
+  const { intervalSize } = useContext(LogViewConfiguration.Context);
+  const { sourceId } = useContext(Source.Context);
+  const { filterQuery } = useContext(LogFilterState.Context);
+  const { visibleMidpointTime } = useContext(LogPositionState.Context);
 
-    const { buckets, start, end } = useLogSummary(
-      sourceId,
-      visibleMidpointTime,
-      intervalSize,
-      filterQuery
-    );
+  const { buckets, start, end } = useLogSummary(
+    sourceId,
+    visibleMidpointTime,
+    intervalSize,
+    filterQuery
+  );
 
-    return children({ buckets, start, end });
-  }
-);
+  return children({ buckets, start, end });
+};
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/with_log_filter.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/with_log_filter.tsx
deleted file mode 100644
index 60261fc728ebb..0000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/with_log_filter.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 from 'react';
-import { connect } from 'react-redux';
-
-import { IIndexPattern } from 'src/plugins/data/public';
-import { logFilterActions, logFilterSelectors, State } from '../../store';
-import { FilterQuery } from '../../store/local/log_filter';
-import { convertKueryToElasticSearchQuery } from '../../utils/kuery';
-import { asChildFunctionRenderer } from '../../utils/typed_react';
-import { bindPlainActionCreators } from '../../utils/typed_redux';
-import { replaceStateKeyInQueryString, UrlStateContainer } from '../../utils/url_state';
-
-interface WithLogFilterProps {
-  indexPattern: IIndexPattern;
-}
-
-export const withLogFilter = connect(
-  (state: State) => ({
-    filterQuery: logFilterSelectors.selectLogFilterQuery(state),
-    serializedFilterQuery: logFilterSelectors.selectLogFilterQueryAsJson(state),
-    filterQueryDraft: logFilterSelectors.selectLogFilterQueryDraft(state),
-    isFilterQueryDraftValid: logFilterSelectors.selectIsLogFilterQueryDraftValid(state),
-  }),
-  (dispatch, ownProps: WithLogFilterProps) =>
-    bindPlainActionCreators({
-      applyFilterQuery: (query: FilterQuery) =>
-        logFilterActions.applyLogFilterQuery({
-          query,
-          serializedQuery: convertKueryToElasticSearchQuery(
-            query.expression,
-            ownProps.indexPattern
-          ),
-        }),
-      applyFilterQueryFromKueryExpression: (expression: string) =>
-        logFilterActions.applyLogFilterQuery({
-          query: {
-            kind: 'kuery',
-            expression,
-          },
-          serializedQuery: convertKueryToElasticSearchQuery(expression, ownProps.indexPattern),
-        }),
-      setFilterQueryDraft: logFilterActions.setLogFilterQueryDraft,
-      setFilterQueryDraftFromKueryExpression: (expression: string) =>
-        logFilterActions.setLogFilterQueryDraft({
-          kind: 'kuery',
-          expression,
-        }),
-    })(dispatch)
-);
-
-export const WithLogFilter = asChildFunctionRenderer(withLogFilter);
-
-/**
- * Url State
- */
-
-type LogFilterUrlState = ReturnType<typeof logFilterSelectors.selectLogFilterQuery>;
-
-type WithLogFilterUrlStateProps = WithLogFilterProps;
-
-export const WithLogFilterUrlState: React.FC<WithLogFilterUrlStateProps> = ({ indexPattern }) => (
-  <WithLogFilter indexPattern={indexPattern}>
-    {({ applyFilterQuery, filterQuery }) => (
-      <UrlStateContainer
-        urlState={filterQuery}
-        urlStateKey="logFilter"
-        mapToUrlState={mapToFilterQuery}
-        onChange={urlState => {
-          if (urlState) {
-            applyFilterQuery(urlState);
-          }
-        }}
-        onInitialize={urlState => {
-          if (urlState) {
-            applyFilterQuery(urlState);
-          }
-        }}
-      />
-    )}
-  </WithLogFilter>
-);
-
-const mapToFilterQuery = (value: any): LogFilterUrlState | undefined =>
-  value && value.kind === 'kuery' && typeof value.expression === 'string'
-    ? {
-        kind: value.kind,
-        expression: value.expression,
-      }
-    : undefined;
-
-export const replaceLogFilterInQueryString = (expression: string) =>
-  replaceStateKeyInQueryString<LogFilterUrlState>('logFilter', {
-    kind: 'kuery',
-    expression,
-  });
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/with_log_position.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/with_log_position.tsx
deleted file mode 100644
index 075f3904d994c..0000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/with_log_position.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * 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 { createSelector } from 'reselect';
-
-import { pickTimeKey } from '../../../common/time';
-import { logPositionActions, logPositionSelectors, State } from '../../store';
-import { asChildFunctionRenderer } from '../../utils/typed_react';
-import { bindPlainActionCreators } from '../../utils/typed_redux';
-import { replaceStateKeyInQueryString, UrlStateContainer } from '../../utils/url_state';
-
-export const withLogPosition = connect(
-  (state: State) => ({
-    firstVisiblePosition: logPositionSelectors.selectFirstVisiblePosition(state),
-    isAutoReloading: logPositionSelectors.selectIsAutoReloading(state),
-    isScrollLocked: logPositionSelectors.selectAutoReloadScrollLock(state),
-    lastVisiblePosition: logPositionSelectors.selectFirstVisiblePosition(state),
-    targetPosition: logPositionSelectors.selectTargetPosition(state),
-    urlState: selectPositionUrlState(state),
-    visibleTimeInterval: logPositionSelectors.selectVisibleTimeInterval(state),
-    visibleMidpoint: logPositionSelectors.selectVisibleMidpointOrTarget(state),
-    visibleMidpointTime: logPositionSelectors.selectVisibleMidpointOrTargetTime(state),
-  }),
-  bindPlainActionCreators({
-    jumpToTargetPosition: logPositionActions.jumpToTargetPosition,
-    jumpToTargetPositionTime: logPositionActions.jumpToTargetPositionTime,
-    reportVisiblePositions: logPositionActions.reportVisiblePositions,
-    startLiveStreaming: logPositionActions.startAutoReload,
-    stopLiveStreaming: logPositionActions.stopAutoReload,
-    scrollLockLiveStreaming: logPositionActions.lockAutoReloadScroll,
-    scrollUnlockLiveStreaming: logPositionActions.unlockAutoReloadScroll,
-  })
-);
-
-export const WithLogPosition = asChildFunctionRenderer(withLogPosition, {
-  onCleanup: ({ stopLiveStreaming }) => stopLiveStreaming(),
-});
-
-/**
- * Url State
- */
-
-interface LogPositionUrlState {
-  position?: ReturnType<typeof logPositionSelectors.selectVisibleMidpointOrTarget>;
-  streamLive?: ReturnType<typeof logPositionSelectors.selectIsAutoReloading>;
-}
-
-export const WithLogPositionUrlState = () => (
-  <WithLogPosition>
-    {({
-      jumpToTargetPosition,
-      jumpToTargetPositionTime,
-      startLiveStreaming,
-      stopLiveStreaming,
-      urlState,
-    }) => (
-      <UrlStateContainer
-        urlState={urlState}
-        urlStateKey="logPosition"
-        mapToUrlState={mapToUrlState}
-        onChange={newUrlState => {
-          if (newUrlState && newUrlState.position) {
-            jumpToTargetPosition(newUrlState.position);
-          }
-          if (newUrlState && newUrlState.streamLive) {
-            startLiveStreaming();
-          } else if (
-            newUrlState &&
-            typeof newUrlState.streamLive !== 'undefined' &&
-            !newUrlState.streamLive
-          ) {
-            stopLiveStreaming();
-          }
-        }}
-        onInitialize={initialUrlState => {
-          if (initialUrlState && initialUrlState.position) {
-            jumpToTargetPosition(initialUrlState.position);
-          } else {
-            jumpToTargetPositionTime(Date.now());
-          }
-          if (initialUrlState && initialUrlState.streamLive) {
-            startLiveStreaming();
-          }
-        }}
-      />
-    )}
-  </WithLogPosition>
-);
-
-const selectPositionUrlState = createSelector(
-  logPositionSelectors.selectVisibleMidpointOrTarget,
-  logPositionSelectors.selectIsAutoReloading,
-  (position, streamLive) => ({
-    position: position ? pickTimeKey(position) : null,
-    streamLive,
-  })
-);
-
-const mapToUrlState = (value: any): LogPositionUrlState | undefined =>
-  value
-    ? {
-        position: mapToPositionUrlState(value.position),
-        streamLive: mapToStreamLiveUrlState(value.streamLive),
-      }
-    : undefined;
-
-const mapToPositionUrlState = (value: any) =>
-  value && typeof value.time === 'number' && typeof value.tiebreaker === 'number'
-    ? pickTimeKey(value)
-    : undefined;
-
-const mapToStreamLiveUrlState = (value: any) => (typeof value === 'boolean' ? value : undefined);
-
-export const replaceLogPositionInQueryString = (time: number) =>
-  Number.isNaN(time)
-    ? (value: string) => value
-    : replaceStateKeyInQueryString<LogPositionUrlState>('logPosition', {
-        position: {
-          time,
-          tiebreaker: 0,
-        },
-      });
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/with_log_search_controls_props.ts b/x-pack/legacy/plugins/infra/public/containers/logs/with_log_search_controls_props.ts
deleted file mode 100644
index e387da9575426..0000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/logs/with_log_search_controls_props.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.
- */
-
-/**
- * Temporary Workaround
- * This is not a well-designed container. It only exists to enable quick
- * migration of the redux-based logging ui into the infra-ui codebase. It will
- * be removed during the refactoring to graphql/apollo.
- */
-import { connect } from 'react-redux';
-import { bindPlainActionCreators } from '../../utils/typed_redux';
-
-import {
-  // searchActions,
-  // searchResultsSelectors,
-  // sharedSelectors,
-  logPositionActions,
-  State,
-} from '../../store';
-
-export const withLogSearchControlsProps = connect(
-  (state: State) => ({
-    // isLoadingSearchResults: searchResultsSelectors.selectIsLoadingSearchResults(state),
-    // nextSearchResult: sharedSelectors.selectNextSearchResultKey(state),
-    // previousSearchResult: sharedSelectors.selectPreviousSearchResultKey(state),
-  }),
-  bindPlainActionCreators({
-    // clearSearch: searchActions.clearSearch,
-    jumpToTarget: logPositionActions.jumpToTargetPosition,
-    // search: searchActions.search,
-  })
-);
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/with_stream_items.ts b/x-pack/legacy/plugins/infra/public/containers/logs/with_stream_items.ts
index 9b20676486af2..6da9cd7513cba 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/with_stream_items.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/with_stream_items.ts
@@ -10,7 +10,6 @@ import { LogEntry, LogEntryHighlight } from '../../utils/log_entry';
 import { RendererFunction } from '../../utils/typed_react';
 // deep inporting to avoid a circular import problem
 import { LogHighlightsState } from './log_highlights/log_highlights';
-import { LogPositionState } from './log_position';
 import { LogEntriesState, LogEntriesStateParams, LogEntriesCallbacks } from './log_entries';
 import { UniqueTimeKey } from '../../../common/time';
 
@@ -24,18 +23,17 @@ export const WithStreamItems: React.FunctionComponent<{
   >;
 }> = ({ children }) => {
   const [logEntries, logEntriesCallbacks] = useContext(LogEntriesState.Context);
-  const { isAutoReloading } = useContext(LogPositionState.Context);
   const { currentHighlightKey, logEntryHighlightsById } = useContext(LogHighlightsState.Context);
 
   const items = useMemo(
     () =>
-      logEntries.isReloading && !isAutoReloading
+      logEntries.isReloading
         ? []
         : logEntries.entries.map(logEntry =>
             createLogEntryStreamItem(logEntry, logEntryHighlightsById[logEntry.gid] || [])
           ),
 
-    [isAutoReloading, logEntries.entries, logEntries.isReloading, logEntryHighlightsById]
+    [logEntries.entries, logEntries.isReloading, logEntryHighlightsById]
   );
 
   return children({
diff --git a/x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.ts b/x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.ts
index e04aafee56fd2..83e176aea1039 100644
--- a/x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/metadata/use_metadata.ts
@@ -32,8 +32,8 @@ export function useMetadata(
       nodeId,
       nodeType,
       sourceId,
-      decodeResponse,
-    })
+    }),
+    decodeResponse
   );
 
   useEffect(() => {
diff --git a/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_data.test.tsx b/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_data.test.tsx
index c43e2f5a544cf..4baa93f93753c 100644
--- a/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_data.test.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_data.test.tsx
@@ -6,7 +6,6 @@
 
 import { fetch } from '../../utils/fetch';
 import { useMetricsExplorerData } from './use_metrics_explorer_data';
-import { MetricsExplorerAggregation } from '../../../server/routes/metrics_explorer/types';
 
 import { renderHook } from '@testing-library/react-hooks';
 
@@ -132,8 +131,8 @@ describe('useMetricsExplorerData Hook', () => {
     rerender({
       options: {
         ...options,
-        aggregation: MetricsExplorerAggregation.count,
-        metrics: [{ aggregation: MetricsExplorerAggregation.count }],
+        aggregation: 'count',
+        metrics: [{ aggregation: 'count' }],
       },
       source,
       derivedIndexPattern,
diff --git a/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_data.ts b/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_data.ts
index c2a599ea1ae78..1bca733a6e02a 100644
--- a/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_data.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_data.ts
@@ -9,10 +9,7 @@ import { isEqual } from 'lodash';
 import { useEffect, useState } from 'react';
 import { IIndexPattern } from 'src/plugins/data/public';
 import { SourceQuery } from '../../../common/graphql/types';
-import {
-  MetricsExplorerAggregation,
-  MetricsExplorerResponse,
-} from '../../../server/routes/metrics_explorer/types';
+import { MetricsExplorerResponse } from '../../../server/routes/metrics_explorer/types';
 import { fetch } from '../../utils/fetch';
 import { convertKueryToElasticSearchQuery } from '../../utils/kuery';
 import { MetricsExplorerOptions, MetricsExplorerTimeOptions } from './use_metrics_explorer_options';
@@ -48,8 +45,8 @@ export function useMetricsExplorerData(
           '../api/infra/metrics_explorer',
           {
             metrics:
-              options.aggregation === MetricsExplorerAggregation.count
-                ? [{ aggregation: MetricsExplorerAggregation.count }]
+              options.aggregation === 'count'
+                ? [{ aggregation: 'count' }]
                 : options.metrics.map(metric => ({
                     aggregation: metric.aggregation,
                     field: metric.field,
diff --git a/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_options.test.tsx b/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_options.test.tsx
index e58184c78b4b8..1381ed9da656a 100644
--- a/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_options.test.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_options.test.tsx
@@ -14,7 +14,6 @@ import {
   DEFAULT_OPTIONS,
   DEFAULT_TIMERANGE,
 } from './use_metrics_explorer_options';
-import { MetricsExplorerAggregation } from '../../../server/routes/metrics_explorer/types';
 
 const renderUseMetricsExplorerOptionsHook = () =>
   renderHook(() => useMetricsExplorerOptions(), {
@@ -68,7 +67,7 @@ describe('useMetricExplorerOptions', () => {
     const { result, rerender } = renderUseMetricsExplorerOptionsHook();
     const newOptions: MetricsExplorerOptions = {
       ...DEFAULT_OPTIONS,
-      metrics: [{ aggregation: MetricsExplorerAggregation.count }],
+      metrics: [{ aggregation: 'count' }],
     };
     act(() => {
       result.current.setOptions(newOptions);
@@ -95,7 +94,7 @@ describe('useMetricExplorerOptions', () => {
   it('should load from store when available', () => {
     const newOptions: MetricsExplorerOptions = {
       ...DEFAULT_OPTIONS,
-      metrics: [{ aggregation: MetricsExplorerAggregation.avg, field: 'system.load.1' }],
+      metrics: [{ aggregation: 'avg', field: 'system.load.1' }],
     };
     STORE.MetricsExplorerOptions = JSON.stringify(newOptions);
     const { result } = renderUseMetricsExplorerOptionsHook();
diff --git a/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_options.ts b/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_options.ts
index de7a8d5805ecc..076a9159940e2 100644
--- a/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_options.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/metrics_explorer/use_metrics_explorer_options.ts
@@ -62,24 +62,24 @@ export const DEFAULT_CHART_OPTIONS: MetricsExplorerChartOptions = {
 
 export const DEFAULT_METRICS: MetricsExplorerOptionsMetric[] = [
   {
-    aggregation: MetricsExplorerAggregation.avg,
+    aggregation: 'avg',
     field: 'system.cpu.user.pct',
     color: MetricsExplorerColor.color0,
   },
   {
-    aggregation: MetricsExplorerAggregation.avg,
+    aggregation: 'avg',
     field: 'kubernetes.pod.cpu.usage.node.pct',
     color: MetricsExplorerColor.color1,
   },
   {
-    aggregation: MetricsExplorerAggregation.avg,
+    aggregation: 'avg',
     field: 'docker.cpu.total.pct',
     color: MetricsExplorerColor.color2,
   },
 ];
 
 export const DEFAULT_OPTIONS: MetricsExplorerOptions = {
-  aggregation: MetricsExplorerAggregation.avg,
+  aggregation: 'avg',
   metrics: DEFAULT_METRICS,
 };
 
diff --git a/x-pack/legacy/plugins/infra/public/containers/node_details/use_node_details.ts b/x-pack/legacy/plugins/infra/public/containers/node_details/use_node_details.ts
index 526faef462624..e86e56a591199 100644
--- a/x-pack/legacy/plugins/infra/public/containers/node_details/use_node_details.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/node_details/use_node_details.ts
@@ -40,8 +40,8 @@ export function useNodeDetails(
       timerange,
       cloudId,
       sourceId,
-      decodeResponse,
-    })
+    }),
+    decodeResponse
   );
 
   return {
diff --git a/x-pack/legacy/plugins/infra/public/containers/waffle/use_snaphot.ts b/x-pack/legacy/plugins/infra/public/containers/waffle/use_snaphot.ts
index 63b91bd97776a..d318d81235309 100644
--- a/x-pack/legacy/plugins/infra/public/containers/waffle/use_snaphot.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/waffle/use_snaphot.ts
@@ -26,7 +26,9 @@ export function useSnapshot(
   groupBy: InfraSnapshotGroupbyInput[],
   nodeType: InfraNodeType,
   sourceId: string,
-  currentTime: number
+  currentTime: number,
+  accountId: string,
+  region: string
 ) {
   const decodeResponse = (response: any) => {
     return pipe(
@@ -51,8 +53,10 @@ export function useSnapshot(
       timerange,
       filterQuery,
       sourceId,
-      decodeResponse,
-    })
+      accountId,
+      region,
+    }),
+    decodeResponse
   );
 
   useEffect(() => {
@@ -65,6 +69,7 @@ export function useSnapshot(
     error: (error && error.message) || null,
     loading,
     nodes: response ? response.nodes : [],
+    interval: response ? response.interval : '60s',
     reload: makeRequest,
   };
 }
diff --git a/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_options.tsx b/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_options.tsx
index 2e3e1078e1f62..6d10a753f9ed0 100644
--- a/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_options.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/waffle/with_waffle_options.tsx
@@ -29,7 +29,19 @@ const selectOptionsUrlState = createSelector(
   waffleOptionsSelectors.selectCustomOptions,
   waffleOptionsSelectors.selectBoundsOverride,
   waffleOptionsSelectors.selectAutoBounds,
-  (metric, view, groupBy, nodeType, customOptions, boundsOverride, autoBounds) => ({
+  waffleOptionsSelectors.selectAccountId,
+  waffleOptionsSelectors.selectRegion,
+  (
+    metric,
+    view,
+    groupBy,
+    nodeType,
+    customOptions,
+    boundsOverride,
+    autoBounds,
+    accountId,
+    region
+  ) => ({
     metric,
     groupBy,
     nodeType,
@@ -37,6 +49,8 @@ const selectOptionsUrlState = createSelector(
     customOptions,
     boundsOverride,
     autoBounds,
+    accountId,
+    region,
   })
 );
 
@@ -49,6 +63,8 @@ export const withWaffleOptions = connect(
     customOptions: waffleOptionsSelectors.selectCustomOptions(state),
     boundsOverride: waffleOptionsSelectors.selectBoundsOverride(state),
     autoBounds: waffleOptionsSelectors.selectAutoBounds(state),
+    accountId: waffleOptionsSelectors.selectAccountId(state),
+    region: waffleOptionsSelectors.selectRegion(state),
     urlState: selectOptionsUrlState(state),
   }),
   bindPlainActionCreators({
@@ -59,6 +75,8 @@ export const withWaffleOptions = connect(
     changeCustomOptions: waffleOptionsActions.changeCustomOptions,
     changeBoundsOverride: waffleOptionsActions.changeBoundsOverride,
     changeAutoBounds: waffleOptionsActions.changeAutoBounds,
+    changeAccount: waffleOptionsActions.changeAccount,
+    changeRegion: waffleOptionsActions.changeRegion,
   })
 );
 
@@ -76,6 +94,8 @@ interface WaffleOptionsUrlState {
   customOptions?: ReturnType<typeof waffleOptionsSelectors.selectCustomOptions>;
   bounds?: ReturnType<typeof waffleOptionsSelectors.selectBoundsOverride>;
   auto?: ReturnType<typeof waffleOptionsSelectors.selectAutoBounds>;
+  accountId?: ReturnType<typeof waffleOptionsSelectors.selectAccountId>;
+  region?: ReturnType<typeof waffleOptionsSelectors.selectRegion>;
 }
 
 export const WithWaffleOptionsUrlState = () => (
@@ -89,6 +109,8 @@ export const WithWaffleOptionsUrlState = () => (
       changeCustomOptions,
       changeAutoBounds,
       changeBoundsOverride,
+      changeAccount,
+      changeRegion,
     }) => (
       <UrlStateContainer<WaffleOptionsUrlState>
         urlState={urlState}
@@ -116,6 +138,12 @@ export const WithWaffleOptionsUrlState = () => (
           if (newUrlState && newUrlState.auto) {
             changeAutoBounds(newUrlState.auto);
           }
+          if (newUrlState && newUrlState.accountId) {
+            changeAccount(newUrlState.accountId);
+          }
+          if (newUrlState && newUrlState.region) {
+            changeRegion(newUrlState.region);
+          }
         }}
         onInitialize={initialUrlState => {
           if (initialUrlState && initialUrlState.metric) {
@@ -139,6 +167,12 @@ export const WithWaffleOptionsUrlState = () => (
           if (initialUrlState && initialUrlState.auto) {
             changeAutoBounds(initialUrlState.auto);
           }
+          if (initialUrlState && initialUrlState.accountId) {
+            changeAccount(initialUrlState.accountId);
+          }
+          if (initialUrlState && initialUrlState.region) {
+            changeRegion(initialUrlState.region);
+          }
         }}
       />
     )}
@@ -155,6 +189,8 @@ const mapToUrlState = (value: any): WaffleOptionsUrlState | undefined =>
         customOptions: mapToCustomOptionsUrlState(value.customOptions),
         bounds: mapToBoundsOverideUrlState(value.boundsOverride),
         auto: mapToAutoBoundsUrlState(value.autoBounds),
+        accountId: value.accountId,
+        region: value.region,
       }
     : undefined;
 
diff --git a/x-pack/legacy/plugins/infra/public/containers/with_kibana_chrome.tsx b/x-pack/legacy/plugins/infra/public/containers/with_kibana_chrome.tsx
deleted file mode 100644
index 5fc83315d3dfd..0000000000000
--- a/x-pack/legacy/plugins/infra/public/containers/with_kibana_chrome.tsx
+++ /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 React from 'react';
-
-import chrome from 'ui/chrome';
-import { Badge } from 'ui/chrome/api/badge';
-import { Breadcrumb } from 'ui/chrome/api/breadcrumbs';
-import { RendererFunction } from '../utils/typed_react';
-
-interface WithKibanaChromeProps {
-  children: RendererFunction<
-    {
-      setBreadcrumbs: (newBreadcrumbs: Breadcrumb[]) => void;
-      setBadge: (badge: Badge | undefined) => void;
-    } & WithKibanaChromeState
-  >;
-}
-
-interface WithKibanaChromeState {
-  basePath: string;
-}
-
-export class WithKibanaChrome extends React.Component<
-  WithKibanaChromeProps,
-  WithKibanaChromeState
-> {
-  public state: WithKibanaChromeState = {
-    basePath: chrome.getBasePath(),
-  };
-
-  public render() {
-    return this.props.children({
-      ...this.state,
-      setBreadcrumbs: chrome.breadcrumbs.set,
-      setBadge: chrome.badge.set,
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/infra/public/graphql/introspection.json b/x-pack/legacy/plugins/infra/public/graphql/introspection.json
index ae8d3dcdd5bec..5d351f3259ac5 100644
--- a/x-pack/legacy/plugins/infra/public/graphql/introspection.json
+++ b/x-pack/legacy/plugins/infra/public/graphql/introspection.json
@@ -286,157 +286,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "logSummaryBetween",
-            "description": "A consecutive span of summary buckets within an interval",
-            "args": [
-              {
-                "name": "start",
-                "description": "The millisecond timestamp that corresponds to the start of the interval",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
-                },
-                "defaultValue": null
-              },
-              {
-                "name": "end",
-                "description": "The millisecond timestamp that corresponds to the end of the interval",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
-                },
-                "defaultValue": null
-              },
-              {
-                "name": "bucketSize",
-                "description": "The size of each bucket in milliseconds",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
-                },
-                "defaultValue": null
-              },
-              {
-                "name": "filterQuery",
-                "description": "The query to filter the log entries by",
-                "type": { "kind": "SCALAR", "name": "String", "ofType": null },
-                "defaultValue": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "OBJECT", "name": "InfraLogSummaryInterval", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "logSummaryHighlightsBetween",
-            "description": "Spans of summary highlight buckets within an interval",
-            "args": [
-              {
-                "name": "start",
-                "description": "The millisecond timestamp that corresponds to the start of the interval",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
-                },
-                "defaultValue": null
-              },
-              {
-                "name": "end",
-                "description": "The millisecond timestamp that corresponds to the end of the interval",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
-                },
-                "defaultValue": null
-              },
-              {
-                "name": "bucketSize",
-                "description": "The size of each bucket in milliseconds",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
-                },
-                "defaultValue": null
-              },
-              {
-                "name": "filterQuery",
-                "description": "The query to filter the log entries by",
-                "type": { "kind": "SCALAR", "name": "String", "ofType": null },
-                "defaultValue": null
-              },
-              {
-                "name": "highlightQueries",
-                "description": "The highlighting to apply to the log entries",
-                "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": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "InfraLogSummaryHighlightInterval",
-                    "ofType": null
-                  }
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "logItem",
-            "description": "",
-            "args": [
-              {
-                "name": "id",
-                "description": "",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
-                },
-                "defaultValue": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "OBJECT", "name": "InfraLogItem", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "snapshot",
             "description": "A snapshot of nodes",
@@ -1665,336 +1514,6 @@
         "enumValues": null,
         "possibleTypes": null
       },
-      {
-        "kind": "OBJECT",
-        "name": "InfraLogSummaryInterval",
-        "description": "A consecutive sequence of log summary buckets",
-        "fields": [
-          {
-            "name": "start",
-            "description": "The millisecond timestamp corresponding to the start of the interval covered by the summary",
-            "args": [],
-            "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "end",
-            "description": "The millisecond timestamp corresponding to the end of the interval covered by the summary",
-            "args": [],
-            "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "filterQuery",
-            "description": "The query the log entries were filtered by",
-            "args": [],
-            "type": { "kind": "SCALAR", "name": "String", "ofType": null },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "buckets",
-            "description": "A list of the log entries",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "OBJECT", "name": "InfraLogSummaryBucket", "ofType": null }
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "InfraLogSummaryBucket",
-        "description": "A log summary bucket",
-        "fields": [
-          {
-            "name": "start",
-            "description": "The start timestamp of the bucket",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "end",
-            "description": "The end timestamp of the bucket",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "entriesCount",
-            "description": "The number of entries inside the bucket",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "InfraLogSummaryHighlightInterval",
-        "description": "A consecutive sequence of log summary highlight buckets",
-        "fields": [
-          {
-            "name": "start",
-            "description": "The millisecond timestamp corresponding to the start of the interval covered by the summary",
-            "args": [],
-            "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "end",
-            "description": "The millisecond timestamp corresponding to the end of the interval covered by the summary",
-            "args": [],
-            "type": { "kind": "SCALAR", "name": "Float", "ofType": null },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "filterQuery",
-            "description": "The query the log entries were filtered by",
-            "args": [],
-            "type": { "kind": "SCALAR", "name": "String", "ofType": null },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "highlightQuery",
-            "description": "The query the log entries were highlighted with",
-            "args": [],
-            "type": { "kind": "SCALAR", "name": "String", "ofType": null },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "buckets",
-            "description": "A list of the log entries",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "InfraLogSummaryHighlightBucket",
-                    "ofType": null
-                  }
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "InfraLogSummaryHighlightBucket",
-        "description": "A log summary highlight bucket",
-        "fields": [
-          {
-            "name": "start",
-            "description": "The start timestamp of the bucket",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "end",
-            "description": "The end timestamp of the bucket",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "entriesCount",
-            "description": "The number of highlighted entries inside the bucket",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "representativeKey",
-            "description": "The time key of a representative of the highlighted log entries in this bucket",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "OBJECT", "name": "InfraTimeKey", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "InfraLogItem",
-        "description": "",
-        "fields": [
-          {
-            "name": "id",
-            "description": "The ID of the document",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "index",
-            "description": "The index where the document was found",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "key",
-            "description": "Time key for the document - derived from the source configuration timestamp and tiebreaker settings",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "OBJECT", "name": "InfraTimeKey", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "fields",
-            "description": "An array of flattened fields and values",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": { "kind": "OBJECT", "name": "InfraLogItemField", "ofType": null }
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "InfraLogItemField",
-        "description": "",
-        "fields": [
-          {
-            "name": "field",
-            "description": "The flattened field name",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "SCALAR", "name": "String", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "value",
-            "description": "The value for the Field as a string",
-            "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": "InfraTimerangeInput",
@@ -2192,9 +1711,24 @@
           { "name": "memory", "description": "", "isDeprecated": false, "deprecationReason": null },
           { "name": "tx", "description": "", "isDeprecated": false, "deprecationReason": null },
           { "name": "rx", "description": "", "isDeprecated": false, "deprecationReason": null },
-          { "name": "logRate", "description": "", "isDeprecated": false, "deprecationReason": null },
-          { "name": "diskIOReadBytes", "description": "", "isDeprecated": false, "deprecationReason": null },
-          { "name": "diskIOWriteBytes", "description": "", "isDeprecated": false, "deprecationReason": null }
+          {
+            "name": "logRate",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "diskIOReadBytes",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "diskIOWriteBytes",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
         ],
         "possibleTypes": null
       },
diff --git a/x-pack/legacy/plugins/infra/public/graphql/types.ts b/x-pack/legacy/plugins/infra/public/graphql/types.ts
index 3715f02bb252e..79351d8dc16cd 100644
--- a/x-pack/legacy/plugins/infra/public/graphql/types.ts
+++ b/x-pack/legacy/plugins/infra/public/graphql/types.ts
@@ -36,12 +36,7 @@ export interface InfraSource {
   logEntriesBetween: InfraLogEntryInterval;
   /** Sequences of log entries matching sets of highlighting queries within an interval */
   logEntryHighlights: InfraLogEntryInterval[];
-  /** A consecutive span of summary buckets within an interval */
-  logSummaryBetween: InfraLogSummaryInterval;
-  /** Spans of summary highlight buckets within an interval */
-  logSummaryHighlightsBetween: InfraLogSummaryHighlightInterval[];
 
-  logItem: InfraLogItem;
   /** A snapshot of nodes */
   snapshot?: InfraSnapshotResponse | null;
 
@@ -210,68 +205,6 @@ export interface InfraLogEntryFieldColumn {
   /** A list of highlighted substrings of the value */
   highlights: string[];
 }
-/** A consecutive sequence of log summary buckets */
-export interface InfraLogSummaryInterval {
-  /** The millisecond timestamp corresponding to the start of the interval covered by the summary */
-  start?: number | null;
-  /** The millisecond timestamp corresponding to the end of the interval covered by the summary */
-  end?: number | null;
-  /** The query the log entries were filtered by */
-  filterQuery?: string | null;
-  /** A list of the log entries */
-  buckets: InfraLogSummaryBucket[];
-}
-/** A log summary bucket */
-export interface InfraLogSummaryBucket {
-  /** The start timestamp of the bucket */
-  start: number;
-  /** The end timestamp of the bucket */
-  end: number;
-  /** The number of entries inside the bucket */
-  entriesCount: number;
-}
-/** A consecutive sequence of log summary highlight buckets */
-export interface InfraLogSummaryHighlightInterval {
-  /** The millisecond timestamp corresponding to the start of the interval covered by the summary */
-  start?: number | null;
-  /** The millisecond timestamp corresponding to the end of the interval covered by the summary */
-  end?: number | null;
-  /** The query the log entries were filtered by */
-  filterQuery?: string | null;
-  /** The query the log entries were highlighted with */
-  highlightQuery?: string | null;
-  /** A list of the log entries */
-  buckets: InfraLogSummaryHighlightBucket[];
-}
-/** A log summary highlight bucket */
-export interface InfraLogSummaryHighlightBucket {
-  /** The start timestamp of the bucket */
-  start: number;
-  /** The end timestamp of the bucket */
-  end: number;
-  /** The number of highlighted entries inside the bucket */
-  entriesCount: number;
-  /** The time key of a representative of the highlighted log entries in this bucket */
-  representativeKey: InfraTimeKey;
-}
-
-export interface InfraLogItem {
-  /** The ID of the document */
-  id: string;
-  /** The index where the document was found */
-  index: string;
-  /** Time key for the document - derived from the source configuration timestamp and tiebreaker settings */
-  key: InfraTimeKey;
-  /** An array of flattened fields and values */
-  fields: InfraLogItemField[];
-}
-
-export interface InfraLogItemField {
-  /** The flattened field name */
-  field: string;
-  /** The value for the Field as a string */
-  value: string;
-}
 
 export interface InfraSnapshotResponse {
   /** Nodes of type host, container or pod grouped by 0, 1 or 2 terms */
@@ -474,31 +407,6 @@ export interface LogEntryHighlightsInfraSourceArgs {
   /** The highlighting to apply to the log entries */
   highlights: InfraLogEntryHighlightInput[];
 }
-export interface LogSummaryBetweenInfraSourceArgs {
-  /** The millisecond timestamp that corresponds to the start of the interval */
-  start: number;
-  /** The millisecond timestamp that corresponds to the end of the interval */
-  end: number;
-  /** The size of each bucket in milliseconds */
-  bucketSize: number;
-  /** The query to filter the log entries by */
-  filterQuery?: string | null;
-}
-export interface LogSummaryHighlightsBetweenInfraSourceArgs {
-  /** The millisecond timestamp that corresponds to the start of the interval */
-  start: number;
-  /** The millisecond timestamp that corresponds to the end of the interval */
-  end: number;
-  /** The size of each bucket in milliseconds */
-  bucketSize: number;
-  /** The query to filter the log entries by */
-  filterQuery?: string | null;
-  /** The highlighting to apply to the log entries */
-  highlightQueries: string[];
-}
-export interface LogItemInfraSourceArgs {
-  id: string;
-}
 export interface SnapshotInfraSourceArgs {
   timerange: InfraTimerangeInput;
 
@@ -672,49 +580,6 @@ export type InfraLogMessageSegment = InfraLogMessageFieldSegment | InfraLogMessa
 // Documents
 // ====================================================
 
-export namespace FlyoutItemQuery {
-  export type Variables = {
-    sourceId: string;
-    itemId: string;
-  };
-
-  export type Query = {
-    __typename?: 'Query';
-
-    source: Source;
-  };
-
-  export type Source = {
-    __typename?: 'InfraSource';
-
-    id: string;
-
-    logItem: LogItem;
-  };
-
-  export type LogItem = {
-    __typename?: 'InfraLogItem';
-
-    id: string;
-
-    index: string;
-
-    key: Key;
-
-    fields: Fields[];
-  };
-
-  export type Key = InfraTimeKeyFields.Fragment;
-
-  export type Fields = {
-    __typename?: 'InfraLogItemField';
-
-    field: string;
-
-    value: string;
-  };
-}
-
 export namespace LogEntryHighlightsQuery {
   export type Variables = {
     sourceId?: string | null;
@@ -755,99 +620,6 @@ export namespace LogEntryHighlightsQuery {
   export type Entries = InfraLogEntryHighlightFields.Fragment;
 }
 
-export namespace LogSummaryHighlightsQuery {
-  export type Variables = {
-    sourceId?: string | null;
-    start: number;
-    end: number;
-    bucketSize: number;
-    highlightQueries: string[];
-    filterQuery?: string | null;
-  };
-
-  export type Query = {
-    __typename?: 'Query';
-
-    source: Source;
-  };
-
-  export type Source = {
-    __typename?: 'InfraSource';
-
-    id: string;
-
-    logSummaryHighlightsBetween: LogSummaryHighlightsBetween[];
-  };
-
-  export type LogSummaryHighlightsBetween = {
-    __typename?: 'InfraLogSummaryHighlightInterval';
-
-    start?: number | null;
-
-    end?: number | null;
-
-    buckets: Buckets[];
-  };
-
-  export type Buckets = {
-    __typename?: 'InfraLogSummaryHighlightBucket';
-
-    start: number;
-
-    end: number;
-
-    entriesCount: number;
-
-    representativeKey: RepresentativeKey;
-  };
-
-  export type RepresentativeKey = InfraTimeKeyFields.Fragment;
-}
-
-export namespace LogSummary {
-  export type Variables = {
-    sourceId?: string | null;
-    start: number;
-    end: number;
-    bucketSize: number;
-    filterQuery?: string | null;
-  };
-
-  export type Query = {
-    __typename?: 'Query';
-
-    source: Source;
-  };
-
-  export type Source = {
-    __typename?: 'InfraSource';
-
-    id: string;
-
-    logSummaryBetween: LogSummaryBetween;
-  };
-
-  export type LogSummaryBetween = {
-    __typename?: 'InfraLogSummaryInterval';
-
-    start?: number | null;
-
-    end?: number | null;
-
-    buckets: Buckets[];
-  };
-
-  export type Buckets = {
-    __typename?: 'InfraLogSummaryBucket';
-
-    start: number;
-
-    end: number;
-
-    entriesCount: number;
-  };
-}
-
 export namespace MetricsQuery {
   export type Variables = {
     sourceId: string;
diff --git a/x-pack/legacy/plugins/infra/public/hooks/use_http_request.tsx b/x-pack/legacy/plugins/infra/public/hooks/use_http_request.tsx
index a7dff2f11f232..2078c4bdc151d 100644
--- a/x-pack/legacy/plugins/infra/public/hooks/use_http_request.tsx
+++ b/x-pack/legacy/plugins/infra/public/hooks/use_http_request.tsx
@@ -5,57 +5,69 @@
  */
 
 import React, { useMemo, useState } from 'react';
-import { kfetch } from 'ui/kfetch';
-import { toastNotifications } from 'ui/notify';
+import { IHttpFetchError } from 'src/core/public';
 import { i18n } from '@kbn/i18n';
-import { KFetchError } from 'ui/kfetch/kfetch_error';
-import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
 import { useTrackedPromise } from '../utils/use_tracked_promise';
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+
 export function useHTTPRequest<Response>(
   pathname: string,
   method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD',
   body?: string,
   decode: (response: any) => Response = response => response
 ) {
+  const kibana = useKibana();
+  const fetch = kibana.services.http?.fetch;
+  const toasts = kibana.notifications.toasts;
   const [response, setResponse] = useState<Response | null>(null);
-  const [error, setError] = useState<KFetchError | null>(null);
+  const [error, setError] = useState<IHttpFetchError | null>(null);
   const [request, makeRequest] = useTrackedPromise(
     {
       cancelPreviousOn: 'resolution',
-      createPromise: () =>
-        kfetch({
+      createPromise: () => {
+        if (!fetch) {
+          throw new Error('HTTP service is unavailable');
+        }
+        return fetch(pathname, {
           method,
-          pathname,
           body,
-        }),
+        });
+      },
       onResolve: resp => setResponse(decode(resp)),
       onReject: (e: unknown) => {
-        const err = e as KFetchError;
+        const err = e as IHttpFetchError;
         setError(err);
-        toastNotifications.addWarning({
+        toasts.warning({
+          toastLifeTimeMs: 3000,
           title: i18n.translate('xpack.infra.useHTTPRequest.error.title', {
             defaultMessage: `Error while fetching resource`,
           }),
-          text: toMountPoint(
+          body: (
             <div>
-              <h5>
-                {i18n.translate('xpack.infra.useHTTPRequest.error.status', {
-                  defaultMessage: `Error`,
-                })}
-              </h5>
-              {err.res?.statusText} ({err.res?.status})
-              <h5>
-                {i18n.translate('xpack.infra.useHTTPRequest.error.url', {
-                  defaultMessage: `URL`,
-                })}
-              </h5>
-              {err.res?.url}
+              {err.response ? (
+                <>
+                  <h5>
+                    {i18n.translate('xpack.infra.useHTTPRequest.error.status', {
+                      defaultMessage: `Error`,
+                    })}
+                  </h5>
+                  {err.response?.statusText} ({err.response?.status})
+                  <h5>
+                    {i18n.translate('xpack.infra.useHTTPRequest.error.url', {
+                      defaultMessage: `URL`,
+                    })}
+                  </h5>
+                  {err.response?.url}
+                </>
+              ) : (
+                <h5>{err.message}</h5>
+              )}
             </div>
           ),
         });
       },
     },
-    [pathname, body, method]
+    [pathname, body, method, fetch, toasts]
   );
 
   const loading = useMemo(() => {
diff --git a/x-pack/legacy/plugins/infra/public/index.ts b/x-pack/legacy/plugins/infra/public/index.ts
index 7967e640ee9d3..5e68ca85681fe 100644
--- a/x-pack/legacy/plugins/infra/public/index.ts
+++ b/x-pack/legacy/plugins/infra/public/index.ts
@@ -4,4 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+// NP_NOTE: Whilst we are in the transition period of the NP migration, this index file
+// is exclusively for our static code exports that other plugins (e.g. APM) use.
+// When we switch over to the real NP, and an export of "plugin" is expected and called,
+// we can do away with the middle "app.ts" layer. The "app.ts" layer is needed for now,
+// and needs to be situated differently to this index file, so that our code for setting the root template
+// and attempting to start the app doesn't try to run just because another plugin is importing from this file.
+
 export { useTrackPageview } from './hooks/use_track_metric';
diff --git a/x-pack/legacy/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/legacy/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts
deleted file mode 100644
index f91b40815a3ae..0000000000000
--- a/x-pack/legacy/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under 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 max-classes-per-file */
-
-import { IModule, IScope } from 'angular';
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-
-import { UIRoutes as KibanaUIRoutes } from 'ui/routes';
-
-import {
-  InfraBufferedKibanaServiceCall,
-  InfraFrameworkAdapter,
-  InfraKibanaAdapterServiceRefs,
-  InfraKibanaUIConfig,
-  InfraTimezoneProvider,
-  InfraUiKibanaAdapterScope,
-} from '../../lib';
-
-const ROOT_ELEMENT_ID = 'react-infra-root';
-const BREADCRUMBS_ELEMENT_ID = 'react-infra-breadcrumbs';
-
-export class KibanaFramework implements InfraFrameworkAdapter {
-  public appState: object;
-  public kbnVersion?: string;
-  public timezone?: string;
-
-  private adapterService: KibanaAdapterServiceProvider;
-  private timezoneProvider: InfraTimezoneProvider;
-  private rootComponent: React.ReactElement<any> | null = null;
-  private breadcrumbsComponent: React.ReactElement<any> | null = null;
-
-  constructor(
-    uiModule: IModule,
-    uiRoutes: KibanaUIRoutes,
-    timezoneProvider: InfraTimezoneProvider
-  ) {
-    this.adapterService = new KibanaAdapterServiceProvider();
-    this.timezoneProvider = timezoneProvider;
-    this.appState = {};
-    this.register(uiModule, uiRoutes);
-  }
-
-  public setUISettings = (key: string, value: any) => {
-    this.adapterService.callOrBuffer(({ config }) => {
-      config.set(key, value);
-    });
-  };
-
-  public render = (component: React.ReactElement<any>) => {
-    this.adapterService.callOrBuffer(() => (this.rootComponent = component));
-  };
-
-  public renderBreadcrumbs = (component: React.ReactElement<any>) => {
-    this.adapterService.callOrBuffer(() => (this.breadcrumbsComponent = component));
-  };
-
-  private register = (adapterModule: IModule, uiRoutes: KibanaUIRoutes) => {
-    adapterModule.provider('kibanaAdapter', this.adapterService);
-
-    adapterModule.directive('infraUiKibanaAdapter', () => ({
-      controller: ($scope: InfraUiKibanaAdapterScope, $element: JQLite) => ({
-        $onDestroy: () => {
-          const targetRootElement = $element[0].querySelector(`#${ROOT_ELEMENT_ID}`);
-          const targetBreadcrumbsElement = $element[0].querySelector(`#${ROOT_ELEMENT_ID}`);
-
-          if (targetRootElement) {
-            ReactDOM.unmountComponentAtNode(targetRootElement);
-          }
-
-          if (targetBreadcrumbsElement) {
-            ReactDOM.unmountComponentAtNode(targetBreadcrumbsElement);
-          }
-        },
-        $onInit: () => {
-          $scope.topNavMenu = [];
-        },
-        $postLink: () => {
-          $scope.$watchGroup(
-            [
-              () => this.breadcrumbsComponent,
-              () => $element[0].querySelector(`#${BREADCRUMBS_ELEMENT_ID}`),
-            ],
-            ([breadcrumbsComponent, targetElement]) => {
-              if (!targetElement) {
-                return;
-              }
-
-              if (breadcrumbsComponent) {
-                ReactDOM.render(breadcrumbsComponent, targetElement);
-              } else {
-                ReactDOM.unmountComponentAtNode(targetElement);
-              }
-            }
-          );
-          $scope.$watchGroup(
-            [() => this.rootComponent, () => $element[0].querySelector(`#${ROOT_ELEMENT_ID}`)],
-            ([rootComponent, targetElement]) => {
-              if (!targetElement) {
-                return;
-              }
-
-              if (rootComponent) {
-                ReactDOM.render(rootComponent, targetElement);
-              } else {
-                ReactDOM.unmountComponentAtNode(targetElement);
-              }
-            }
-          );
-        },
-      }),
-      scope: true,
-      template: `
-        <main
-          id="${ROOT_ELEMENT_ID}"
-          class="infReactRoot"
-        ></main>
-      `,
-    }));
-
-    adapterModule.run(
-      (
-        config: InfraKibanaUIConfig,
-        kbnVersion: string,
-        Private: <Provider>(provider: Provider) => Provider,
-        // @ts-ignore: inject kibanaAdapter to force eager instatiation
-        kibanaAdapter: any
-      ) => {
-        this.timezone = Private(this.timezoneProvider)();
-        this.kbnVersion = kbnVersion;
-      }
-    );
-
-    uiRoutes.enable();
-
-    uiRoutes.otherwise({
-      reloadOnSearch: false,
-      template:
-        '<infra-ui-kibana-adapter style="display: flex; align-items: stretch; flex: 1 0 0%;"></infra-ui-kibana-adapter>',
-    });
-  };
-}
-
-class KibanaAdapterServiceProvider {
-  public serviceRefs: InfraKibanaAdapterServiceRefs | null = null;
-  public bufferedCalls: Array<InfraBufferedKibanaServiceCall<InfraKibanaAdapterServiceRefs>> = [];
-
-  public $get($rootScope: IScope, config: InfraKibanaUIConfig) {
-    this.serviceRefs = {
-      config,
-      rootScope: $rootScope,
-    };
-
-    this.applyBufferedCalls(this.bufferedCalls);
-
-    return this;
-  }
-
-  public callOrBuffer(serviceCall: (serviceRefs: InfraKibanaAdapterServiceRefs) => void) {
-    if (this.serviceRefs !== null) {
-      this.applyBufferedCalls([serviceCall]);
-    } else {
-      this.bufferedCalls.push(serviceCall);
-    }
-  }
-
-  public applyBufferedCalls(
-    bufferedCalls: Array<InfraBufferedKibanaServiceCall<InfraKibanaAdapterServiceRefs>>
-  ) {
-    if (!this.serviceRefs) {
-      return;
-    }
-
-    this.serviceRefs.rootScope.$apply(() => {
-      bufferedCalls.forEach(serviceCall => {
-        if (!this.serviceRefs) {
-          return;
-        }
-        return serviceCall(this.serviceRefs);
-      });
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/infra/public/lib/adapters/framework/testing_framework_adapter.ts b/x-pack/legacy/plugins/infra/public/lib/adapters/framework/testing_framework_adapter.ts
deleted file mode 100644
index f1f08f6ffbf34..0000000000000
--- a/x-pack/legacy/plugins/infra/public/lib/adapters/framework/testing_framework_adapter.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 { InfraFrameworkAdapter } from '../../lib';
-
-export class InfraTestingFrameworkAdapter implements InfraFrameworkAdapter {
-  public appState?: object;
-  public kbnVersion?: string;
-  public timezone?: string;
-
-  constructor() {
-    this.appState = {};
-  }
-
-  public render() {
-    return;
-  }
-  public renderBreadcrumbs() {
-    return;
-  }
-  public setUISettings() {
-    return;
-  }
-}
diff --git a/x-pack/legacy/plugins/infra/public/lib/adapters/observable_api/kibana_observable_api.ts b/x-pack/legacy/plugins/infra/public/lib/adapters/observable_api/kibana_observable_api.ts
index 157a7ebe9fedf..9ae21d96886f3 100644
--- a/x-pack/legacy/plugins/infra/public/lib/adapters/observable_api/kibana_observable_api.ts
+++ b/x-pack/legacy/plugins/infra/public/lib/adapters/observable_api/kibana_observable_api.ts
@@ -16,13 +16,13 @@ import {
 export class InfraKibanaObservableApiAdapter implements InfraObservableApi {
   private basePath: string;
   private defaultHeaders: {
-    [headerName: string]: string;
+    [headerName: string]: boolean | string;
   };
 
-  constructor({ basePath, xsrfToken }: { basePath: string; xsrfToken: string }) {
+  constructor({ basePath }: { basePath: string }) {
     this.basePath = basePath;
     this.defaultHeaders = {
-      'kbn-version': xsrfToken,
+      'kbn-xsrf': true,
     };
   }
 
diff --git a/x-pack/legacy/plugins/infra/public/lib/compose/kibana_compose.ts b/x-pack/legacy/plugins/infra/public/lib/compose/kibana_compose.ts
deleted file mode 100644
index 9b0beb3ad519c..0000000000000
--- a/x-pack/legacy/plugins/infra/public/lib/compose/kibana_compose.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import 'ui/autoload/all';
-// @ts-ignore: path dynamic for kibana
-import chrome from 'ui/chrome';
-// @ts-ignore: path dynamic for kibana
-import { uiModules } from 'ui/modules';
-import uiRoutes from 'ui/routes';
-// @ts-ignore: path dynamic for kibana
-import { timezoneProvider } from 'ui/vis/lib/timezone';
-
-import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemory';
-import ApolloClient from 'apollo-client';
-import { ApolloLink } from 'apollo-link';
-import { HttpLink } from 'apollo-link-http';
-import { withClientState } from 'apollo-link-state';
-import { InfraFrontendLibs } from '../lib';
-import introspectionQueryResultData from '../../graphql/introspection.json';
-import { KibanaFramework } from '../adapters/framework/kibana_framework_adapter';
-import { InfraKibanaObservableApiAdapter } from '../adapters/observable_api/kibana_observable_api';
-
-export function compose(): InfraFrontendLibs {
-  const cache = new InMemoryCache({
-    addTypename: false,
-    fragmentMatcher: new IntrospectionFragmentMatcher({
-      introspectionQueryResultData,
-    }),
-  });
-
-  const observableApi = new InfraKibanaObservableApiAdapter({
-    basePath: chrome.getBasePath(),
-    xsrfToken: chrome.getXsrfToken(),
-  });
-
-  const graphQLOptions = {
-    cache,
-    link: ApolloLink.from([
-      withClientState({
-        cache,
-        resolvers: {},
-      }),
-      new HttpLink({
-        credentials: 'same-origin',
-        headers: {
-          'kbn-xsrf': chrome.getXsrfToken(),
-        },
-        uri: `${chrome.getBasePath()}/api/infra/graphql`,
-      }),
-    ]),
-  };
-
-  const apolloClient = new ApolloClient(graphQLOptions);
-
-  const infraModule = uiModules.get('app/infa');
-
-  const framework = new KibanaFramework(infraModule, uiRoutes, timezoneProvider);
-
-  const libs: InfraFrontendLibs = {
-    apolloClient,
-    framework,
-    observableApi,
-  };
-  return libs;
-}
diff --git a/x-pack/legacy/plugins/infra/public/lib/compose/testing_compose.ts b/x-pack/legacy/plugins/infra/public/lib/compose/testing_compose.ts
deleted file mode 100644
index 1e0b2f079497d..0000000000000
--- a/x-pack/legacy/plugins/infra/public/lib/compose/testing_compose.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 'ui/autoload/all';
-// @ts-ignore: path dynamic for kibana
-import chrome from 'ui/chrome';
-// @ts-ignore: path dynamic for kibana
-import { uiModules } from 'ui/modules';
-import uiRoutes from 'ui/routes';
-// @ts-ignore: path dynamic for kibana
-import { timezoneProvider } from 'ui/vis/lib/timezone';
-
-import { InMemoryCache } from 'apollo-cache-inmemory';
-import ApolloClient from 'apollo-client';
-import { SchemaLink } from 'apollo-link-schema';
-import { addMockFunctionsToSchema, makeExecutableSchema } from 'graphql-tools';
-import { KibanaFramework } from '../adapters/framework/kibana_framework_adapter';
-import { InfraKibanaObservableApiAdapter } from '../adapters/observable_api/kibana_observable_api';
-import { InfraFrontendLibs } from '../lib';
-
-export function compose(): InfraFrontendLibs {
-  const infraModule = uiModules.get('app/infa');
-  const observableApi = new InfraKibanaObservableApiAdapter({
-    basePath: chrome.getBasePath(),
-    xsrfToken: chrome.getXsrfToken(),
-  });
-  const framework = new KibanaFramework(infraModule, uiRoutes, timezoneProvider);
-  const typeDefs = `
-  Query {}
-`;
-
-  const mocks = {
-    Mutation: () => undefined,
-    Query: () => undefined,
-  };
-
-  const schema = makeExecutableSchema({ typeDefs });
-  addMockFunctionsToSchema({
-    mocks,
-    schema,
-  });
-
-  const cache = new InMemoryCache((window as any).__APOLLO_CLIENT__);
-
-  const apolloClient = new ApolloClient({
-    cache,
-    link: new SchemaLink({ schema }),
-  });
-
-  const libs: InfraFrontendLibs = {
-    apolloClient,
-    framework,
-    observableApi,
-  };
-  return libs;
-}
diff --git a/x-pack/legacy/plugins/infra/public/lib/lib.ts b/x-pack/legacy/plugins/infra/public/lib/lib.ts
index 3a9c12f9680e3..4b402ce6beafe 100644
--- a/x-pack/legacy/plugins/infra/public/lib/lib.ts
+++ b/x-pack/legacy/plugins/infra/public/lib/lib.ts
@@ -20,7 +20,6 @@ import {
 } from '../graphql/types';
 
 export interface InfraFrontendLibs {
-  framework: InfraFrameworkAdapter;
   apolloClient: InfraApolloClient;
   observableApi: InfraObservableApi;
 }
diff --git a/x-pack/legacy/plugins/infra/public/new_platform_index.ts b/x-pack/legacy/plugins/infra/public/new_platform_index.ts
new file mode 100644
index 0000000000000..33b40da236145
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/new_platform_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 'kibana/public';
+import { Plugin } from './new_platform_plugin';
+
+export function plugin(context: PluginInitializerContext) {
+  return new Plugin(context);
+}
diff --git a/x-pack/legacy/plugins/infra/public/new_platform_plugin.ts b/x-pack/legacy/plugins/infra/public/new_platform_plugin.ts
new file mode 100644
index 0000000000000..78594afcc8ada
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/new_platform_plugin.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 { CoreStart, PluginInitializerContext } from 'kibana/public';
+import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemory';
+import ApolloClient from 'apollo-client';
+import { ApolloLink } from 'apollo-link';
+import { HttpLink } from 'apollo-link-http';
+import { withClientState } from 'apollo-link-state';
+import { startApp } from './apps/start_app';
+import { InfraFrontendLibs } from './lib/lib';
+import introspectionQueryResultData from './graphql/introspection.json';
+import { InfraKibanaObservableApiAdapter } from './lib/adapters/observable_api/kibana_observable_api';
+
+type ClientPlugins = any;
+type LegacyDeps = any;
+
+export class Plugin {
+  constructor(context: PluginInitializerContext) {}
+  start(core: CoreStart, plugins: ClientPlugins, __LEGACY: LegacyDeps) {
+    startApp(this.composeLibs(core, plugins, __LEGACY), core, plugins);
+  }
+
+  composeLibs(core: CoreStart, plugins: ClientPlugins, legacy: LegacyDeps) {
+    const cache = new InMemoryCache({
+      addTypename: false,
+      fragmentMatcher: new IntrospectionFragmentMatcher({
+        introspectionQueryResultData,
+      }),
+    });
+
+    const observableApi = new InfraKibanaObservableApiAdapter({
+      basePath: core.http.basePath.get(),
+    });
+
+    const graphQLOptions = {
+      cache,
+      link: ApolloLink.from([
+        withClientState({
+          cache,
+          resolvers: {},
+        }),
+        new HttpLink({
+          credentials: 'same-origin',
+          headers: {
+            'kbn-xsrf': true,
+          },
+          uri: `${core.http.basePath.get()}/api/infra/graphql`,
+        }),
+      ]),
+    };
+
+    const apolloClient = new ApolloClient(graphQLOptions);
+
+    const libs: InfraFrontendLibs = {
+      apolloClient,
+      observableApi,
+    };
+    return libs;
+  }
+}
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx
index 9efbbe790abc1..dfe4fb05d669a 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/index.tsx
@@ -8,8 +8,6 @@ import { i18n } from '@kbn/i18n';
 
 import React from 'react';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
-import { UICapabilities } from 'ui/capabilities';
-import { injectUICapabilities } from 'ui/capabilities/react';
 
 import { DocumentTitle } from '../../components/document_title';
 import { HelpCenterContent } from '../../components/help_center_content';
@@ -25,13 +23,11 @@ import { SnapshotPage } from './snapshot';
 import { SettingsPage } from '../shared/settings';
 import { AppNavigation } from '../../components/navigation/app_navigation';
 import { SourceLoadingPage } from '../../components/source_loading_page';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
-interface InfrastructurePageProps extends RouteComponentProps {
-  uiCapabilities: UICapabilities;
-}
-
-export const InfrastructurePage = injectUICapabilities(
-  ({ match, uiCapabilities }: InfrastructurePageProps) => (
+export const InfrastructurePage = ({ match }: RouteComponentProps) => {
+  const uiCapabilities = useKibana().services.application?.capabilities;
+  return (
     <Source.Provider sourceId="default">
       <ColumnarPage>
         <DocumentTitle
@@ -55,7 +51,7 @@ export const InfrastructurePage = injectUICapabilities(
               }),
             },
           ]}
-          readOnlyBadge={!uiCapabilities.infrastructure.save}
+          readOnlyBadge={!uiCapabilities?.infrastructure?.save}
         />
 
         <AppNavigation
@@ -114,5 +110,5 @@ export const InfrastructurePage = injectUICapabilities(
         </Switch>
       </ColumnarPage>
     </Source.Provider>
-  )
-);
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/metrics_explorer/use_metric_explorer_state.test.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/metrics_explorer/use_metric_explorer_state.test.tsx
index 0512fb0a46b90..14533d46aaef8 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/metrics_explorer/use_metric_explorer_state.test.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/metrics_explorer/use_metric_explorer_state.test.tsx
@@ -15,7 +15,6 @@ import {
   resp,
   createSeries,
 } from '../../../utils/fixtures/metrics_explorer';
-import { MetricsExplorerAggregation } from '../../../../server/routes/metrics_explorer/types';
 
 const renderUseMetricsExplorerStateHook = () =>
   renderHook(props => useMetricsExplorerState(props.source, props.derivedIndexPattern), {
@@ -89,11 +88,9 @@ describe('useMetricsExplorerState', () => {
     it('should change the metric', async () => {
       const { result } = renderUseMetricsExplorerStateHook();
       const { handleMetricsChange } = result.current;
-      handleMetricsChange([
-        { aggregation: MetricsExplorerAggregation.max, field: 'system.load.1' },
-      ]);
+      handleMetricsChange([{ aggregation: 'max', field: 'system.load.1' }]);
       expect(result.current.options.metrics).toEqual([
-        { aggregation: MetricsExplorerAggregation.max, field: 'system.load.1' },
+        { aggregation: 'max', field: 'system.load.1' },
       ]);
     });
   });
@@ -134,38 +131,32 @@ describe('useMetricsExplorerState', () => {
     it('should set the metrics to only count when selecting count', async () => {
       const { result, waitForNextUpdate } = renderUseMetricsExplorerStateHook();
       const { handleMetricsChange } = result.current;
-      handleMetricsChange([
-        { aggregation: MetricsExplorerAggregation.avg, field: 'system.load.1' },
-      ]);
+      handleMetricsChange([{ aggregation: 'avg', field: 'system.load.1' }]);
       expect(result.current.options.metrics).toEqual([
-        { aggregation: MetricsExplorerAggregation.avg, field: 'system.load.1' },
+        { aggregation: 'avg', field: 'system.load.1' },
       ]);
       await waitForNextUpdate();
       const { handleAggregationChange } = result.current;
-      handleAggregationChange(MetricsExplorerAggregation.count);
+      handleAggregationChange('count');
       await waitForNextUpdate();
-      expect(result.current.options.aggregation).toBe(MetricsExplorerAggregation.count);
-      expect(result.current.options.metrics).toEqual([
-        { aggregation: MetricsExplorerAggregation.count },
-      ]);
+      expect(result.current.options.aggregation).toBe('count');
+      expect(result.current.options.metrics).toEqual([{ aggregation: 'count' }]);
     });
 
     it('should change aggregation for metrics', async () => {
       const { result, waitForNextUpdate } = renderUseMetricsExplorerStateHook();
       const { handleMetricsChange } = result.current;
-      handleMetricsChange([
-        { aggregation: MetricsExplorerAggregation.avg, field: 'system.load.1' },
-      ]);
+      handleMetricsChange([{ aggregation: 'avg', field: 'system.load.1' }]);
       expect(result.current.options.metrics).toEqual([
-        { aggregation: MetricsExplorerAggregation.avg, field: 'system.load.1' },
+        { aggregation: 'avg', field: 'system.load.1' },
       ]);
       await waitForNextUpdate();
       const { handleAggregationChange } = result.current;
-      handleAggregationChange(MetricsExplorerAggregation.max);
+      handleAggregationChange('max');
       await waitForNextUpdate();
-      expect(result.current.options.aggregation).toBe(MetricsExplorerAggregation.max);
+      expect(result.current.options.aggregation).toBe('max');
       expect(result.current.options.metrics).toEqual([
-        { aggregation: MetricsExplorerAggregation.max, field: 'system.load.1' },
+        { aggregation: 'max', field: 'system.load.1' },
       ]);
     });
   });
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/metrics_explorer/use_metric_explorer_state.ts b/x-pack/legacy/plugins/infra/public/pages/infrastructure/metrics_explorer/use_metric_explorer_state.ts
index 57ea886169701..22d18234197b6 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/metrics_explorer/use_metric_explorer_state.ts
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/metrics_explorer/use_metric_explorer_state.ts
@@ -99,10 +99,10 @@ export const useMetricsExplorerState = (
     (aggregation: MetricsExplorerAggregation) => {
       setAfterKey(null);
       const metrics =
-        aggregation === MetricsExplorerAggregation.count
+        aggregation === 'count'
           ? [{ aggregation }]
           : options.metrics
-              .filter(metric => metric.aggregation !== MetricsExplorerAggregation.count)
+              .filter(metric => metric.aggregation !== 'count')
               .map(metric => ({
                 ...metric,
                 aggregation,
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/index.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/index.tsx
index 612b4a6d91e7f..b9651763e43c0 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/index.tsx
@@ -8,8 +8,6 @@ import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import React, { useContext } from 'react';
-import { UICapabilities } from 'ui/capabilities';
-import { injectUICapabilities } from 'ui/capabilities/react';
 import { SnapshotPageContent } from './page_content';
 import { SnapshotToolbar } from './toolbar';
 
@@ -27,15 +25,11 @@ import { Source } from '../../../containers/source';
 import { WithWaffleFilterUrlState } from '../../../containers/waffle/with_waffle_filters';
 import { WithWaffleOptionsUrlState } from '../../../containers/waffle/with_waffle_options';
 import { WithWaffleTimeUrlState } from '../../../containers/waffle/with_waffle_time';
-import { WithKibanaChrome } from '../../../containers/with_kibana_chrome';
 import { useTrackPageview } from '../../../hooks/use_track_metric';
+import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 
-interface SnapshotPageProps {
-  uiCapabilities: UICapabilities;
-}
-
-export const SnapshotPage = injectUICapabilities((props: SnapshotPageProps) => {
-  const { uiCapabilities } = props;
+export const SnapshotPage = () => {
+  const uiCapabilities = useKibana().services.application?.capabilities;
   const {
     createDerivedIndexPattern,
     hasFailedLoadingSource,
@@ -44,7 +38,7 @@ export const SnapshotPage = injectUICapabilities((props: SnapshotPageProps) => {
     loadSource,
     metricIndicesExist,
   } = useContext(Source.Context);
-
+  const basePath = useKibana().services.http?.basePath || '';
   useTrackPageview({ app: 'infra_metrics', path: 'inventory' });
   useTrackPageview({ app: 'infra_metrics', path: 'inventory', delay: 15000 });
 
@@ -73,49 +67,44 @@ export const SnapshotPage = injectUICapabilities((props: SnapshotPageProps) => {
       ) : hasFailedLoadingSource ? (
         <SourceErrorPage errorMessage={loadSourceFailureMessage || ''} retry={loadSource} />
       ) : (
-        <WithKibanaChrome>
-          {({ basePath }) => (
-            <NoIndices
-              title={i18n.translate('xpack.infra.homePage.noMetricsIndicesTitle', {
-                defaultMessage: "Looks like you don't have any metrics indices.",
-              })}
-              message={i18n.translate('xpack.infra.homePage.noMetricsIndicesDescription', {
-                defaultMessage: "Let's add some!",
-              })}
-              actions={
-                <EuiFlexGroup>
-                  <EuiFlexItem>
-                    <EuiButton
-                      href={`${basePath}/app/kibana#/home/tutorial_directory/metrics`}
-                      color="primary"
-                      fill
-                      data-test-subj="infrastructureViewSetupInstructionsButton"
-                    >
-                      {i18n.translate(
-                        'xpack.infra.homePage.noMetricsIndicesInstructionsActionLabel',
-                        { defaultMessage: 'View setup instructions' }
-                      )}
-                    </EuiButton>
-                  </EuiFlexItem>
-                  {uiCapabilities.infrastructure.configureSource ? (
-                    <EuiFlexItem>
-                      <ViewSourceConfigurationButton
-                        data-test-subj="configureSourceButton"
-                        hrefBase={ViewSourceConfigurationButtonHrefBase.infrastructure}
-                      >
-                        {i18n.translate('xpack.infra.configureSourceActionLabel', {
-                          defaultMessage: 'Change source configuration',
-                        })}
-                      </ViewSourceConfigurationButton>
-                    </EuiFlexItem>
-                  ) : null}
-                </EuiFlexGroup>
-              }
-              data-test-subj="noMetricsIndicesPrompt"
-            />
-          )}
-        </WithKibanaChrome>
+        <NoIndices
+          title={i18n.translate('xpack.infra.homePage.noMetricsIndicesTitle', {
+            defaultMessage: "Looks like you don't have any metrics indices.",
+          })}
+          message={i18n.translate('xpack.infra.homePage.noMetricsIndicesDescription', {
+            defaultMessage: "Let's add some!",
+          })}
+          actions={
+            <EuiFlexGroup>
+              <EuiFlexItem>
+                <EuiButton
+                  href={`${basePath}/app/kibana#/home/tutorial_directory/metrics`}
+                  color="primary"
+                  fill
+                  data-test-subj="infrastructureViewSetupInstructionsButton"
+                >
+                  {i18n.translate('xpack.infra.homePage.noMetricsIndicesInstructionsActionLabel', {
+                    defaultMessage: 'View setup instructions',
+                  })}
+                </EuiButton>
+              </EuiFlexItem>
+              {uiCapabilities?.infrastructure?.configureSource ? (
+                <EuiFlexItem>
+                  <ViewSourceConfigurationButton
+                    data-test-subj="configureSourceButton"
+                    hrefBase={ViewSourceConfigurationButtonHrefBase.infrastructure}
+                  >
+                    {i18n.translate('xpack.infra.configureSourceActionLabel', {
+                      defaultMessage: 'Change source configuration',
+                    })}
+                  </ViewSourceConfigurationButton>
+                </EuiFlexItem>
+              ) : null}
+            </EuiFlexGroup>
+          }
+          data-test-subj="noMetricsIndicesPrompt"
+        />
       )}
     </ColumnarPage>
   );
-});
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/page_content.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/page_content.tsx
index 85b551a448d0e..83a4c8d3a497f 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/page_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/page_content.tsx
@@ -31,6 +31,8 @@ export const SnapshotPageContent: React.FC = () => (
                       changeView,
                       autoBounds,
                       boundsOverride,
+                      accountId,
+                      region,
                     }) => (
                       <Layout
                         currentTime={currentTime}
@@ -50,6 +52,8 @@ export const SnapshotPageContent: React.FC = () => (
                         onViewChange={changeView}
                         autoBounds={autoBounds}
                         boundsOverride={boundsOverride}
+                        accountId={accountId}
+                        region={region}
                       />
                     )}
                   </WithWaffleOptions>
diff --git a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_logs.tsx b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_logs.tsx
index c409470eb24c7..b3fcaff75aafd 100644
--- a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_logs.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_logs.tsx
@@ -8,8 +8,8 @@ import compose from 'lodash/fp/compose';
 import React from 'react';
 import { match as RouteMatch, Redirect, RouteComponentProps } from 'react-router-dom';
 
-import { replaceLogFilterInQueryString } from '../../containers/logs/with_log_filter';
-import { replaceLogPositionInQueryString } from '../../containers/logs/with_log_position';
+import { replaceLogFilterInQueryString } from '../../containers/logs/log_filter';
+import { replaceLogPositionInQueryString } from '../../containers/logs/log_position';
 import { replaceSourceIdInQueryString } from '../../containers/source_id';
 import { getFilterFromLocation, getTimeFromLocation } from './query_params';
 
diff --git a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
index 4af50df343859..99b558cf1cafa 100644
--- a/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
@@ -11,8 +11,8 @@ import React from 'react';
 import { Redirect, RouteComponentProps } from 'react-router-dom';
 
 import { LoadingPage } from '../../components/loading_page';
-import { replaceLogFilterInQueryString } from '../../containers/logs/with_log_filter';
-import { replaceLogPositionInQueryString } from '../../containers/logs/with_log_position';
+import { replaceLogFilterInQueryString } from '../../containers/logs/log_filter';
+import { replaceLogPositionInQueryString } from '../../containers/logs/log_position';
 import { replaceSourceIdInQueryString } from '../../containers/source_id';
 import { InfraNodeType, SourceConfigurationFields } from '../../graphql/types';
 import { getFilterFromLocation, getTimeFromLocation } from './query_params';
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 4eddecf732f75..a8a75f99253c2 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/index.tsx
@@ -7,8 +7,6 @@
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
-import { UICapabilities } from 'ui/capabilities';
-import { injectUICapabilities } from 'ui/capabilities/react';
 
 import { DocumentTitle } from '../../components/document_title';
 import { HelpCenterContent } from '../../components/help_center_content';
@@ -21,19 +19,18 @@ import { Source, useSource } from '../../containers/source';
 import { StreamPage } from './stream';
 import { SettingsPage } from '../shared/settings';
 import { AppNavigation } from '../../components/navigation/app_navigation';
-import { LogEntryRatePage } from './log_entry_rate';
 import {
   useLogAnalysisCapabilities,
   LogAnalysisCapabilities,
 } from '../../containers/logs/log_analysis';
 import { useSourceId } from '../../containers/source_id';
 import { RedirectWithQueryParams } from '../../utils/redirect_with_query_params';
+import { useKibana } from '../../../../../../..//src/plugins/kibana_react/public';
+import { LogEntryCategoriesPage } from './log_entry_categories';
+import { LogEntryRatePage } from './log_entry_rate';
 
-interface LogsPageProps extends RouteComponentProps {
-  uiCapabilities: UICapabilities;
-}
-
-export const LogsPage = injectUICapabilities(({ match, uiCapabilities }: LogsPageProps) => {
+export const LogsPage = ({ match }: RouteComponentProps) => {
+  const uiCapabilities = useKibana().services.application?.capabilities;
   const [sourceId] = useSourceId();
   const source = useSource({ sourceId });
   const logAnalysisCapabilities = useLogAnalysisCapabilities();
@@ -53,6 +50,16 @@ export const LogsPage = injectUICapabilities(({ match, uiCapabilities }: LogsPag
     path: `${match.path}/log-rate`,
   };
 
+  const logCategoriesTab = {
+    title: (
+      <>
+        {logCategoriesTabTitle}
+        <TabBetaBadge title={logCategoriesTabTitle} />
+      </>
+    ),
+    path: `${match.path}/log-categories`,
+  };
+
   const settingsTab = {
     title: settingsTabTitle,
     path: `${match.path}/settings`,
@@ -72,7 +79,7 @@ export const LogsPage = injectUICapabilities(({ match, uiCapabilities }: LogsPag
                 text: pageTitle,
               },
             ]}
-            readOnlyBadge={!uiCapabilities.logs.save}
+            readOnlyBadge={!uiCapabilities?.logs?.save}
           />
           {source.isLoadingSource ||
           (!source.isLoadingSource &&
@@ -90,7 +97,7 @@ export const LogsPage = injectUICapabilities(({ match, uiCapabilities }: LogsPag
                 <RoutedTabs
                   tabs={
                     logAnalysisCapabilities.hasLogAnalysisCapabilites
-                      ? [streamTab, logRateTab, settingsTab]
+                      ? [streamTab, logRateTab, logCategoriesTab, settingsTab]
                       : [streamTab, settingsTab]
                   }
                 />
@@ -99,6 +106,7 @@ export const LogsPage = injectUICapabilities(({ match, uiCapabilities }: LogsPag
               <Switch>
                 <Route path={streamTab.path} component={StreamPage} />
                 <Route path={logRateTab.path} component={LogEntryRatePage} />
+                <Route path={logCategoriesTab.path} component={LogEntryCategoriesPage} />
                 <Route path={settingsTab.path} component={SettingsPage} />
                 <RedirectWithQueryParams
                   from={`${match.path}/analysis`}
@@ -112,7 +120,7 @@ export const LogsPage = injectUICapabilities(({ match, uiCapabilities }: LogsPag
       </LogAnalysisCapabilities.Context.Provider>
     </Source.Context.Provider>
   );
-});
+};
 
 const pageTitle = i18n.translate('xpack.infra.header.logsTitle', {
   defaultMessage: 'Logs',
@@ -122,10 +130,14 @@ const streamTabTitle = i18n.translate('xpack.infra.logs.index.streamTabTitle', {
   defaultMessage: 'Stream',
 });
 
-const logRateTabTitle = i18n.translate('xpack.infra.logs.index.analysisBetaBadgeTitle', {
+const logRateTabTitle = i18n.translate('xpack.infra.logs.index.logRateBetaBadgeTitle', {
   defaultMessage: 'Log Rate',
 });
 
+const logCategoriesTabTitle = i18n.translate('xpack.infra.logs.index.logCategoriesBetaBadgeTitle', {
+  defaultMessage: 'Categories',
+});
+
 const settingsTabTitle = i18n.translate('xpack.infra.logs.index.settingsTabTitle', {
   defaultMessage: 'Settings',
 });
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/index.ts b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/index.ts
new file mode 100644
index 0000000000000..224217e860e94
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './page';
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/module_descriptor.ts b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/module_descriptor.ts
new file mode 100644
index 0000000000000..5910dc54dfc90
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/module_descriptor.ts
@@ -0,0 +1,116 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  bucketSpan,
+  categoriesMessageField,
+  getJobId,
+  partitionField,
+} from '../../../../common/log_analysis';
+
+import {
+  ModuleDescriptor,
+  ModuleSourceConfiguration,
+  cleanUpJobsAndDatafeeds,
+} from '../../../containers/logs/log_analysis';
+import { callJobsSummaryAPI } from '../../../containers/logs/log_analysis/api/ml_get_jobs_summary_api';
+import { callGetMlModuleAPI } from '../../../containers/logs/log_analysis/api/ml_get_module';
+import { callSetupMlModuleAPI } from '../../../containers/logs/log_analysis/api/ml_setup_module_api';
+import { callValidateIndicesAPI } from '../../../containers/logs/log_analysis/api/validate_indices';
+
+const jobTypes = ['log-entry-categories-count'];
+const moduleId = 'logs_ui_categories';
+
+type JobType = typeof jobTypes[0];
+
+const getJobIds = (spaceId: string, sourceId: string) =>
+  jobTypes.reduce(
+    (accumulatedJobIds, jobType) => ({
+      ...accumulatedJobIds,
+      [jobType]: getJobId(spaceId, sourceId, jobType),
+    }),
+    {} as Record<JobType, string>
+  );
+
+const getJobSummary = async (spaceId: string, sourceId: string) => {
+  const response = await callJobsSummaryAPI(spaceId, sourceId, jobTypes);
+  const jobIds = Object.values(getJobIds(spaceId, sourceId));
+
+  return response.filter(jobSummary => jobIds.includes(jobSummary.id));
+};
+
+const getModuleDefinition = async () => {
+  return await callGetMlModuleAPI(moduleId);
+};
+
+const setUpModule = async (
+  start: number | undefined,
+  end: number | undefined,
+  { spaceId, sourceId, indices, timestampField }: ModuleSourceConfiguration
+) => {
+  const indexNamePattern = indices.join(',');
+  const jobOverrides = [
+    {
+      job_id: 'log-entry-categories-count' as const,
+      analysis_config: {
+        bucket_span: `${bucketSpan}ms`,
+      },
+      data_description: {
+        time_field: timestampField,
+      },
+      custom_settings: {
+        logs_source_config: {
+          indexPattern: indexNamePattern,
+          timestampField,
+          bucketSpan,
+        },
+      },
+    },
+  ];
+
+  return callSetupMlModuleAPI(
+    moduleId,
+    start,
+    end,
+    spaceId,
+    sourceId,
+    indexNamePattern,
+    jobOverrides
+  );
+};
+
+const cleanUpModule = async (spaceId: string, sourceId: string) => {
+  return await cleanUpJobsAndDatafeeds(spaceId, sourceId, jobTypes);
+};
+
+const validateSetupIndices = async ({ indices, timestampField }: ModuleSourceConfiguration) => {
+  return await callValidateIndicesAPI(indices, [
+    {
+      name: timestampField,
+      validTypes: ['date'],
+    },
+    {
+      name: partitionField,
+      validTypes: ['keyword'],
+    },
+    {
+      name: categoriesMessageField,
+      validTypes: ['text'],
+    },
+  ]);
+};
+
+export const logEntryCategoriesModule: ModuleDescriptor<JobType> = {
+  moduleId,
+  jobTypes,
+  bucketSpan,
+  getJobIds,
+  getJobSummary,
+  getModuleDefinition,
+  setUpModule,
+  cleanUpModule,
+  validateSetupIndices,
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page.tsx
new file mode 100644
index 0000000000000..64e83a6eaa497
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import { ColumnarPage } from '../../../components/page';
+import { LogEntryCategoriesPageContent } from './page_content';
+import { LogEntryCategoriesPageProviders } from './page_providers';
+
+export const LogEntryCategoriesPage = () => {
+  return (
+    <LogEntryCategoriesPageProviders>
+      <ColumnarPage data-test-subj="logsLogEntryCategoriesPage">
+        <LogEntryCategoriesPageContent />
+      </ColumnarPage>
+    </LogEntryCategoriesPageProviders>
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx
new file mode 100644
index 0000000000000..9a50acf622ee1
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page_content.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 { i18n } from '@kbn/i18n';
+import React, { useContext, useEffect } from 'react';
+
+import { isSetupStatusWithResults } from '../../../../common/log_analysis';
+import { LoadingPage } from '../../../components/loading_page';
+import {
+  LogAnalysisSetupStatusUnknownPrompt,
+  MlUnavailablePrompt,
+} from '../../../components/logging/log_analysis_setup';
+import { LogAnalysisCapabilities } from '../../../containers/logs/log_analysis';
+import { LogEntryCategoriesSetupContent } from './page_setup_content';
+import { useLogEntryCategoriesModuleContext } from './use_log_entry_categories_module';
+
+export const LogEntryCategoriesPageContent = () => {
+  const { hasLogAnalysisCapabilites } = useContext(LogAnalysisCapabilities.Context);
+
+  const {
+    fetchJobStatus,
+    fetchModuleDefinition,
+    setupStatus,
+  } = useLogEntryCategoriesModuleContext();
+
+  useEffect(() => {
+    fetchModuleDefinition();
+    fetchJobStatus();
+  }, [fetchJobStatus, fetchModuleDefinition]);
+
+  if (!hasLogAnalysisCapabilites) {
+    return <MlUnavailablePrompt />;
+  } else if (setupStatus === 'initializing') {
+    return (
+      <LoadingPage
+        message={i18n.translate('xpack.infra.logs.logEntryCategories.jobStatusLoadingMessage', {
+          defaultMessage: 'Checking status of categorization jobs...',
+        })}
+      />
+    );
+  } else if (setupStatus === 'unknown') {
+    return <LogAnalysisSetupStatusUnknownPrompt retry={fetchJobStatus} />;
+  } else if (isSetupStatusWithResults(setupStatus)) {
+    return null;
+    // return <LogEntryCategoriesResultsContent />;
+  } else {
+    return <LogEntryCategoriesSetupContent />;
+  }
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx
new file mode 100644
index 0000000000000..619cea6eda8b7
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page_providers.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 React from 'react';
+
+import { useSourceContext } from '../../../containers/source';
+import { useKibanaSpaceId } from '../../../utils/use_kibana_space_id';
+import { LogEntryCategoriesModuleProvider } from './use_log_entry_categories_module';
+
+export const LogEntryCategoriesPageProviders: React.FunctionComponent = ({ children }) => {
+  const { sourceId, source } = useSourceContext();
+  const spaceId = useKibanaSpaceId();
+
+  return (
+    <LogEntryCategoriesModuleProvider
+      indexPattern={source ? source.configuration.logAlias : ''}
+      sourceId={sourceId}
+      spaceId={spaceId}
+      timestampField={source ? source.configuration.fields.timestamp : ''}
+    >
+      {children}
+    </LogEntryCategoriesModuleProvider>
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page_setup_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page_setup_content.tsx
new file mode 100644
index 0000000000000..f0e90cb7ccc05
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/page_setup_content.tsx
@@ -0,0 +1,99 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiSpacer, EuiSteps, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React, { useMemo } from 'react';
+
+import {
+  createInitialConfigurationStep,
+  createProcessStep,
+  LogAnalysisSetupPage,
+  LogAnalysisSetupPageContent,
+  LogAnalysisSetupPageHeader,
+} from '../../../components/logging/log_analysis_setup';
+import { useTrackPageview } from '../../../hooks/use_track_metric';
+import { useLogEntryCategoriesSetup } from './use_log_entry_categories_setup';
+
+export const LogEntryCategoriesSetupContent: React.FunctionComponent = () => {
+  useTrackPageview({ app: 'infra_logs', path: 'log_entry_categories_setup' });
+  useTrackPageview({ app: 'infra_logs', path: 'log_entry_categories_setup', delay: 15000 });
+
+  const {
+    cleanUpAndSetUp,
+    endTime,
+    isValidating,
+    lastSetupErrorMessages,
+    setEndTime,
+    setStartTime,
+    setValidatedIndices,
+    setUp,
+    setupStatus,
+    startTime,
+    validatedIndices,
+    validationErrors,
+    viewResults,
+  } = useLogEntryCategoriesSetup();
+
+  const steps = useMemo(
+    () => [
+      createInitialConfigurationStep({
+        setStartTime,
+        setEndTime,
+        startTime,
+        endTime,
+        isValidating,
+        validatedIndices,
+        setValidatedIndices,
+        validationErrors,
+      }),
+      createProcessStep({
+        cleanUpAndSetUp,
+        errorMessages: lastSetupErrorMessages,
+        isConfigurationValid: validationErrors.length <= 0,
+        setUp,
+        setupStatus,
+        viewResults,
+      }),
+    ],
+    [
+      cleanUpAndSetUp,
+      endTime,
+      isValidating,
+      lastSetupErrorMessages,
+      setEndTime,
+      setStartTime,
+      setUp,
+      setValidatedIndices,
+      setupStatus,
+      startTime,
+      validatedIndices,
+      validationErrors,
+      viewResults,
+    ]
+  );
+
+  return (
+    <LogAnalysisSetupPage data-test-subj="logEntryCategoriesSetupPage">
+      <LogAnalysisSetupPageHeader>
+        <FormattedMessage
+          id="xpack.infra.logs.logEntryCategories.setupTitle"
+          defaultMessage="Enable Machine Learning analysis"
+        />
+      </LogAnalysisSetupPageHeader>
+      <LogAnalysisSetupPageContent>
+        <EuiText size="s">
+          <FormattedMessage
+            id="xpack.infra.logs.logEntryCategories.setupDescription"
+            defaultMessage="Use Machine Learning to automatically categorize log messages."
+          />
+        </EuiText>
+        <EuiSpacer />
+        <EuiSteps steps={steps} />
+      </LogAnalysisSetupPageContent>
+    </LogAnalysisSetupPage>
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/use_log_entry_categories_module.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/use_log_entry_categories_module.tsx
new file mode 100644
index 0000000000000..918c252f6350c
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/use_log_entry_categories_module.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 createContainer from 'constate';
+import { useMemo } from 'react';
+
+import {
+  useLogAnalysisModule,
+  ModuleSourceConfiguration,
+} from '../../../containers/logs/log_analysis';
+import { logEntryCategoriesModule } from './module_descriptor';
+
+export const useLogEntryCategoriesModule = ({
+  indexPattern,
+  sourceId,
+  spaceId,
+  timestampField,
+}: {
+  indexPattern: string;
+  sourceId: string;
+  spaceId: string;
+  timestampField: string;
+}) => {
+  const sourceConfiguration: ModuleSourceConfiguration = useMemo(
+    () => ({
+      indices: indexPattern.split(','),
+      sourceId,
+      spaceId,
+      timestampField,
+    }),
+    [indexPattern, sourceId, spaceId, timestampField]
+  );
+
+  return useLogAnalysisModule({
+    moduleDescriptor: logEntryCategoriesModule,
+    sourceConfiguration,
+  });
+};
+
+export const [
+  LogEntryCategoriesModuleProvider,
+  useLogEntryCategoriesModuleContext,
+] = createContainer(useLogEntryCategoriesModule);
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/use_log_entry_categories_setup.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/use_log_entry_categories_setup.tsx
new file mode 100644
index 0000000000000..c011230942d7c
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_categories/use_log_entry_categories_setup.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useAnalysisSetupState } from '../../../containers/logs/log_analysis';
+import { useLogEntryCategoriesModuleContext } from './use_log_entry_categories_module';
+
+export const useLogEntryCategoriesSetup = () => {
+  const {
+    cleanUpAndSetUpModule,
+    lastSetupErrorMessages,
+    moduleDescriptor,
+    setUpModule,
+    setupStatus,
+    sourceConfiguration,
+    viewResults,
+  } = useLogEntryCategoriesModuleContext();
+
+  const {
+    cleanUpAndSetUp,
+    endTime,
+    isValidating,
+    setEndTime,
+    setStartTime,
+    setValidatedIndices,
+    setUp,
+    startTime,
+    validatedIndices,
+    validationErrors,
+  } = useAnalysisSetupState({
+    cleanUpAndSetUpModule,
+    moduleDescriptor,
+    setUpModule,
+    sourceConfiguration,
+  });
+
+  return {
+    cleanUpAndSetUp,
+    endTime,
+    isValidating,
+    lastSetupErrorMessages,
+    setEndTime,
+    setStartTime,
+    setValidatedIndices,
+    setUp,
+    setupStatus,
+    startTime,
+    validatedIndices,
+    validationErrors,
+    viewResults,
+  };
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
index e71985f73fbb8..a80464ed42cb2 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
@@ -9,29 +9,19 @@ import React, { useContext, useEffect } from 'react';
 
 import { isSetupStatusWithResults } from '../../../../common/log_analysis';
 import { LoadingPage } from '../../../components/loading_page';
+import {
+  LogAnalysisSetupStatusUnknownPrompt,
+  MlUnavailablePrompt,
+} from '../../../components/logging/log_analysis_setup';
 import { LogAnalysisCapabilities } from '../../../containers/logs/log_analysis';
-import { Source } from '../../../containers/source';
 import { LogEntryRateResultsContent } from './page_results_content';
 import { LogEntryRateSetupContent } from './page_setup_content';
-import { LogEntryRateUnavailableContent } from './page_unavailable_content';
-import { LogEntryRateSetupStatusUnknownContent } from './page_setup_status_unknown';
 import { useLogEntryRateModuleContext } from './use_log_entry_rate_module';
 
 export const LogEntryRatePageContent = () => {
-  const { sourceId } = useContext(Source.Context);
   const { hasLogAnalysisCapabilites } = useContext(LogAnalysisCapabilities.Context);
 
-  const {
-    cleanUpAndSetUpModule: cleanupAndSetup,
-    fetchJobStatus,
-    fetchModuleDefinition,
-    lastSetupErrorMessages,
-    moduleDescriptor,
-    setUpModule,
-    setupStatus,
-    sourceConfiguration,
-    viewResults,
-  } = useLogEntryRateModuleContext();
+  const { fetchJobStatus, fetchModuleDefinition, setupStatus } = useLogEntryRateModuleContext();
 
   useEffect(() => {
     fetchModuleDefinition();
@@ -39,7 +29,7 @@ export const LogEntryRatePageContent = () => {
   }, [fetchJobStatus, fetchModuleDefinition]);
 
   if (!hasLogAnalysisCapabilites) {
-    return <LogEntryRateUnavailableContent />;
+    return <MlUnavailablePrompt />;
   } else if (setupStatus === 'initializing') {
     return (
       <LoadingPage
@@ -49,25 +39,10 @@ export const LogEntryRatePageContent = () => {
       />
     );
   } else if (setupStatus === 'unknown') {
-    return <LogEntryRateSetupStatusUnknownContent retry={fetchJobStatus} />;
+    return <LogAnalysisSetupStatusUnknownPrompt retry={fetchJobStatus} />;
   } else if (isSetupStatusWithResults(setupStatus)) {
-    return (
-      <LogEntryRateResultsContent
-        sourceId={sourceId}
-        isFirstUse={setupStatus === 'hiddenAfterSuccess'}
-      />
-    );
+    return <LogEntryRateResultsContent />;
   } else {
-    return (
-      <LogEntryRateSetupContent
-        cleanupAndSetup={cleanupAndSetup}
-        errorMessages={lastSetupErrorMessages}
-        moduleDescriptor={moduleDescriptor}
-        setup={setUpModule}
-        setupStatus={setupStatus}
-        sourceConfiguration={sourceConfiguration}
-        viewResults={viewResults}
-      />
-    );
+    return <LogEntryRateSetupContent />;
   }
 };
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
index be637bc29a0db..b6ab8acdea5b2 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
@@ -38,18 +38,22 @@ import {
 
 const JOB_STATUS_POLLING_INTERVAL = 30000;
 
-export const LogEntryRateResultsContent = ({
-  sourceId,
-  isFirstUse,
-}: {
-  sourceId: string;
-  isFirstUse: boolean;
-}) => {
+export const LogEntryRateResultsContent: React.FunctionComponent = () => {
   useTrackPageview({ app: 'infra_logs', path: 'log_entry_rate_results' });
   useTrackPageview({ app: 'infra_logs', path: 'log_entry_rate_results', delay: 15000 });
 
   const [dateFormat] = useKibanaUiSetting('dateFormat', 'MMMM D, YYYY h:mm A');
 
+  const {
+    fetchJobStatus,
+    jobStatus,
+    setupStatus,
+    viewSetupForReconfiguration,
+    viewSetupForUpdate,
+    jobIds,
+    sourceConfiguration: { sourceId },
+  } = useLogEntryRateModuleContext();
+
   const {
     timeRange: selectedTimeRange,
     setTimeRange: setSelectedTimeRange,
@@ -126,14 +130,7 @@ export const LogEntryRateResultsContent = ({
     [setAutoRefresh]
   );
 
-  const {
-    fetchJobStatus,
-    jobStatus,
-    setupStatus,
-    viewSetupForReconfiguration,
-    viewSetupForUpdate,
-    jobIds,
-  } = useLogEntryRateModuleContext();
+  const isFirstUse = useMemo(() => setupStatus === 'hiddenAfterSuccess', [setupStatus]);
 
   useEffect(() => {
     getLogEntryRate();
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx
index 6c04404b91231..7e90cf29072e1 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_setup_content.tsx
@@ -4,103 +4,96 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  EuiPage,
-  EuiPageBody,
-  EuiPageContent,
-  EuiPageContentBody,
-  EuiPageContentHeader,
-  EuiPageContentHeaderSection,
-  EuiSpacer,
-  EuiText,
-  EuiTitle,
-} from '@elastic/eui';
+import { EuiSpacer, EuiSteps, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import React from 'react';
+import React, { useMemo } from 'react';
 
-import euiStyled from '../../../../../../common/eui_styled_components';
-import { SetupStatus } from '../../../../common/log_analysis';
-import { ModuleDescriptor, ModuleSourceConfiguration } from '../../../containers/logs/log_analysis';
+import {
+  createInitialConfigurationStep,
+  createProcessStep,
+  LogAnalysisSetupPage,
+  LogAnalysisSetupPageContent,
+  LogAnalysisSetupPageHeader,
+} from '../../../components/logging/log_analysis_setup';
 import { useTrackPageview } from '../../../hooks/use_track_metric';
-import { LogEntryRateSetupSteps } from './setup';
-
-type SetupHandler = (
-  indices: string[],
-  startTime: number | undefined,
-  endTime: number | undefined
-) => void;
+import { useLogEntryRateSetup } from './use_log_entry_rate_setup';
 
-interface LogEntryRateSetupContentProps<JobType extends string> {
-  cleanupAndSetup: SetupHandler;
-  errorMessages: string[];
-  moduleDescriptor: ModuleDescriptor<JobType>;
-  setup: SetupHandler;
-  setupStatus: SetupStatus;
-  sourceConfiguration: ModuleSourceConfiguration;
-  viewResults: () => void;
-}
-
-export const LogEntryRateSetupContent = <JobType extends string>({
-  cleanupAndSetup,
-  errorMessages,
-  setup,
-  setupStatus,
-  viewResults,
-  moduleDescriptor,
-  sourceConfiguration,
-}: LogEntryRateSetupContentProps<JobType>) => {
+export const LogEntryRateSetupContent: React.FunctionComponent = () => {
   useTrackPageview({ app: 'infra_logs', path: 'log_entry_rate_setup' });
   useTrackPageview({ app: 'infra_logs', path: 'log_entry_rate_setup', delay: 15000 });
 
+  const {
+    cleanUpAndSetUp,
+    endTime,
+    isValidating,
+    lastSetupErrorMessages,
+    setEndTime,
+    setStartTime,
+    setValidatedIndices,
+    setUp,
+    setupStatus,
+    startTime,
+    validatedIndices,
+    validationErrors,
+    viewResults,
+  } = useLogEntryRateSetup();
+
+  const steps = useMemo(
+    () => [
+      createInitialConfigurationStep({
+        setStartTime,
+        setEndTime,
+        startTime,
+        endTime,
+        isValidating,
+        validatedIndices,
+        setValidatedIndices,
+        validationErrors,
+      }),
+      createProcessStep({
+        cleanUpAndSetUp,
+        errorMessages: lastSetupErrorMessages,
+        isConfigurationValid: validationErrors.length <= 0,
+        setUp,
+        setupStatus,
+        viewResults,
+      }),
+    ],
+    [
+      cleanUpAndSetUp,
+      endTime,
+      isValidating,
+      lastSetupErrorMessages,
+      setEndTime,
+      setStartTime,
+      setUp,
+      setValidatedIndices,
+      setupStatus,
+      startTime,
+      validatedIndices,
+      validationErrors,
+      viewResults,
+    ]
+  );
+
   return (
-    <LogEntryRateSetupPage>
-      <EuiPageBody>
-        <LogEntryRateSetupPageContent
-          verticalPosition="center"
-          horizontalPosition="center"
-          data-test-subj="analysisSetupContent"
-        >
-          <EuiPageContentHeader>
-            <EuiPageContentHeaderSection>
-              <EuiTitle size="m">
-                <h3>
-                  <FormattedMessage
-                    id="xpack.infra.analysisSetup.analysisSetupTitle"
-                    defaultMessage="Enable Machine Learning analysis"
-                  />
-                </h3>
-              </EuiTitle>
-            </EuiPageContentHeaderSection>
-          </EuiPageContentHeader>
-          <EuiPageContentBody>
-            <EuiText size="s">
-              <FormattedMessage
-                id="xpack.infra.analysisSetup.analysisSetupDescription"
-                defaultMessage="Use Machine Learning to automatically detect anomalous log rate counts."
-              />
-            </EuiText>
-            <EuiSpacer />
-            <LogEntryRateSetupSteps
-              cleanupAndSetup={cleanupAndSetup}
-              errorMessages={errorMessages}
-              setup={setup}
-              setupStatus={setupStatus}
-              viewResults={viewResults}
-              moduleDescriptor={moduleDescriptor}
-              sourceConfiguration={sourceConfiguration}
-            />
-          </EuiPageContentBody>
-        </LogEntryRateSetupPageContent>
-      </EuiPageBody>
-    </LogEntryRateSetupPage>
+    <LogAnalysisSetupPage data-test-subj="logEntryRateSetupPage">
+      <LogAnalysisSetupPageHeader>
+        <FormattedMessage
+          id="xpack.infra.analysisSetup.analysisSetupTitle"
+          defaultMessage="Enable Machine Learning analysis"
+        />
+      </LogAnalysisSetupPageHeader>
+      <LogAnalysisSetupPageContent>
+        <EuiText size="s">
+          <FormattedMessage
+            id="xpack.infra.analysisSetup.analysisSetupDescription"
+            defaultMessage="Use Machine Learning to automatically detect anomalous log rate counts."
+          />
+        </EuiText>
+        <EuiSpacer />
+        <EuiSteps steps={steps} />
+      </LogAnalysisSetupPageContent>
+    </LogAnalysisSetupPage>
   );
 };
-
-// !important due to https://github.com/elastic/eui/issues/2232
-const LogEntryRateSetupPageContent = euiStyled(EuiPageContent)`
-  max-width: 768px !important;
-`;
-
-const LogEntryRateSetupPage = euiStyled(EuiPage)`
-  height: 100%;
-`;
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_setup_status_unknown.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_setup_status_unknown.tsx
deleted file mode 100644
index 4c685bd42b937..0000000000000
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_setup_status_unknown.tsx
+++ /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 React from 'react';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
-import euiStyled from '../../../../../../common/eui_styled_components';
-
-interface Props {
-  retry: () => void;
-}
-
-export const LogEntryRateSetupStatusUnknownContent: React.FunctionComponent<Props> = ({
-  retry,
-}: Props) => (
-  <EmptyPrompt
-    title={
-      <h2>
-        <FormattedMessage
-          id="xpack.infra.logs.analysisPage.setupStatusUnknown.title"
-          defaultMessage="We couldn't determine the status of your ML jobs."
-        />
-      </h2>
-    }
-    actions={
-      <EuiButton onClick={() => retry()} color="primary" fill>
-        {i18n.translate('xpack.infra.logs.analysisPage.setupStatusUnknown.tryAgainButton', {
-          defaultMessage: 'Try again',
-        })}
-      </EuiButton>
-    }
-  />
-);
-
-const EmptyPrompt = euiStyled(EuiEmptyPrompt)`
-  align-self: center;
-`;
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_unavailable_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_unavailable_content.tsx
deleted file mode 100644
index c77e5d408fe5f..0000000000000
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/page_unavailable_content.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 { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiEmptyPrompt, EuiLink, EuiButton } from '@elastic/eui';
-import euiStyled from '../../../../../../common/eui_styled_components';
-
-export const LogEntryRateUnavailableContent: React.FunctionComponent<{}> = () => (
-  <EmptyPrompt
-    title={
-      <h2>
-        <FormattedMessage
-          id="xpack.infra.logs.analysisPage.unavailable.mLDisabledTitle"
-          defaultMessage="The Analysis feature requires Machine Learning"
-        />
-      </h2>
-    }
-    body={
-      <p>
-        <FormattedMessage
-          id="xpack.infra.logs.analysisPage.unavailable.mlDisabledBody"
-          defaultMessage="Check the {machineLearningAppLink} for more information."
-          values={{
-            machineLearningAppLink: (
-              <EuiLink href="ml" target="_blank">
-                <FormattedMessage
-                  id="xpack.infra.logs.analysisPage.unavailable.mlAppLink"
-                  defaultMessage="Machine Learning app"
-                />
-              </EuiLink>
-            ),
-          }}
-        />
-      </p>
-    }
-    actions={
-      <EuiButton target="_blank" href="ml" color="primary" fill>
-        {i18n.translate('xpack.infra.logs.analysisPage.unavailable.mlAppButton', {
-          defaultMessage: 'Open Machine Learning',
-        })}
-      </EuiButton>
-    }
-  />
-);
-
-const EmptyPrompt = euiStyled(EuiEmptyPrompt)`
-  align-self: center;
-`;
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/chart.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/chart.tsx
index e4100c6d774b1..a75e6c50ab03f 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/chart.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/chart.tsx
@@ -9,14 +9,11 @@ import {
   Axis,
   BarSeries,
   Chart,
-  getAxisId,
-  getSpecId,
   niceTimeFormatter,
   Settings,
   TooltipValue,
   LIGHT_THEME,
   DARK_THEME,
-  getAnnotationId,
   RectAnnotation,
 } from '@elastic/charts';
 import numeral from '@elastic/numeral';
@@ -44,7 +41,7 @@ export const AnomaliesChart: React.FunctionComponent<{
     [timeRange]
   );
 
-  const logEntryRateSpecId = getSpecId('averageValues');
+  const logEntryRateSpecId = 'averageValues';
 
   const tooltipProps = useMemo(
     () => ({
@@ -67,13 +64,13 @@ export const AnomaliesChart: React.FunctionComponent<{
     <div style={{ height: 160, width: '100%' }}>
       <Chart className="log-entry-rate-chart">
         <Axis
-          id={getAxisId('timestamp')}
+          id="timestamp"
           position="bottom"
           showOverlappingTicks
           tickFormat={chartDateFormatter}
         />
         <Axis
-          id={getAxisId('values')}
+          id="values"
           position="left"
           tickFormat={value => numeral(value.toPrecision(3)).format('0[.][00]a')} // https://github.com/adamwdraper/Numeral-js/issues/194
         />
@@ -102,7 +99,7 @@ export const AnomaliesChart: React.FunctionComponent<{
 };
 
 interface SeverityConfig {
-  annotationId: AnnotationId;
+  id: AnnotationId;
   style: {
     fill: string;
     opacity: number;
@@ -111,19 +108,19 @@ interface SeverityConfig {
 
 const severityConfigs: Record<string, SeverityConfig> = {
   warning: {
-    annotationId: getAnnotationId(`anomalies-warning`),
+    id: `anomalies-warning`,
     style: { fill: 'rgb(125, 180, 226)', opacity: 0.7 },
   },
   minor: {
-    annotationId: getAnnotationId(`anomalies-minor`),
+    id: `anomalies-minor`,
     style: { fill: 'rgb(255, 221, 0)', opacity: 0.7 },
   },
   major: {
-    annotationId: getAnnotationId(`anomalies-major`),
+    id: `anomalies-major`,
     style: { fill: 'rgb(229, 113, 0)', opacity: 0.7 },
   },
   critical: {
-    annotationId: getAnnotationId(`anomalies-critical`),
+    id: `anomalies-critical`,
     style: { fill: 'rgb(228, 72, 72)', opacity: 0.7 },
   },
 };
@@ -138,7 +135,7 @@ const renderAnnotations = (
       <RectAnnotation
         key={`${chartId}:${entry[0]}`}
         dataValues={entry[1]}
-        annotationId={severityConfigs[entry[0]].annotationId}
+        id={severityConfigs[entry[0]].id}
         style={severityConfigs[entry[0]].style}
         renderTooltip={renderAnnotationTooltip}
       />
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/index.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/index.tsx
index 38aa4b068c9e9..e5e719c2d69f6 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/index.tsx
@@ -12,6 +12,7 @@ import {
   EuiStat,
   EuiTitle,
   EuiLoadingSpinner,
+  EuiButton,
 } from '@elastic/eui';
 import numeral from '@elastic/numeral';
 import { i18n } from '@kbn/i18n';
@@ -97,6 +98,11 @@ export const AnomaliesResults: React.FunctionComponent<{
             <h2>{title}</h2>
           </EuiTitle>
         </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButton onClick={viewSetupForUpdate} size="s">
+            Recreate jobs
+          </EuiButton>
+        </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <AnalyzeInMlButton jobId={jobId} timeRange={timeRange} />
         </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/table.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/table.tsx
index 86760cf2da7d6..45893315c7361 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/table.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/table.tsx
@@ -22,8 +22,8 @@ interface TableItem {
 
 interface SortingOptions {
   sort: {
-    field: string;
-    direction: string;
+    field: keyof TableItem;
+    direction: 'asc' | 'desc';
   };
 }
 
@@ -139,7 +139,7 @@ export const AnomaliesTable: React.FunctionComponent<{
       name: maxAnomalyScoreColumnName,
       sortable: true,
       truncateText: true,
-      dataType: 'number',
+      dataType: 'number' as const,
     },
     {
       align: RIGHT_ALIGNMENT,
@@ -169,8 +169,8 @@ export const AnomaliesTable: React.FunctionComponent<{
   );
 };
 
-const StyledEuiBasicTable = euiStyled(EuiBasicTable)`
+const StyledEuiBasicTable: typeof EuiBasicTable = euiStyled(EuiBasicTable as any)`
   & .euiTable {
     table-layout: auto;
   }
-`;
+` as any; // eslint-disable-line @typescript-eslint/no-explicit-any
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/log_rate/bar_chart.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/log_rate/bar_chart.tsx
index 5055e3fc08239..7969c61bc9f34 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/log_rate/bar_chart.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/sections/log_rate/bar_chart.tsx
@@ -8,8 +8,6 @@ import {
   Axis,
   BarSeries,
   Chart,
-  getAxisId,
-  getSpecId,
   niceTimeFormatter,
   Settings,
   TooltipValue,
@@ -37,8 +35,6 @@ export const LogEntryRateBarChart: React.FunctionComponent<{
     [timeRange]
   );
 
-  const logEntryRateSpecId = getSpecId('averageValues');
-
   const tooltipProps = useMemo(
     () => ({
       headerFormatter: (tooltipData: TooltipValue) =>
@@ -61,18 +57,18 @@ export const LogEntryRateBarChart: React.FunctionComponent<{
     <div style={{ height: 200, width: '100%' }}>
       <Chart className="log-entry-rate-chart">
         <Axis
-          id={getAxisId('timestamp')}
+          id="timestamp"
           position="bottom"
           showOverlappingTicks
           tickFormat={chartDateFormatter}
         />
         <Axis
-          id={getAxisId('values')}
+          id="values"
           position="left"
           tickFormat={value => numeral(value.toPrecision(3)).format('0[.][00]a')} // https://github.com/adamwdraper/Numeral-js/issues/194
         />
         <BarSeries
-          id={logEntryRateSpecId}
+          id="averageValues"
           name={i18n.translate('xpack.infra.logs.analysis.logRateSectionLineSeriesName', {
             defaultMessage: 'Log entries per 15 minutes (avg)',
           })}
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_rate.ts b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_rate.ts
index 471a00d40984c..1df7ef06b9d46 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_rate.ts
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/service_calls/get_log_entry_rate.ts
@@ -7,8 +7,7 @@
 import { fold } from 'fp-ts/lib/Either';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { identity } from 'fp-ts/lib/function';
-import { kfetch } from 'ui/kfetch';
-
+import { npStart } from 'ui/new_platform';
 import {
   getLogEntryRateRequestPayloadRT,
   getLogEntryRateSuccessReponsePayloadRT,
@@ -22,9 +21,8 @@ export const callGetLogEntryRateAPI = async (
   endTime: number,
   bucketDuration: number
 ) => {
-  const response = await kfetch({
+  const response = await npStart.core.http.fetch(LOG_ANALYSIS_GET_LOG_ENTRY_RATE_PATH, {
     method: 'POST',
-    pathname: LOG_ANALYSIS_GET_LOG_ENTRY_RATE_PATH,
     body: JSON.stringify(
       getLogEntryRateRequestPayloadRT.encode({
         data: {
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/index.ts b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/index.ts
deleted file mode 100644
index eba07aaa17fd2..0000000000000
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/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 './setup_steps';
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/index.ts b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/index.ts
deleted file mode 100644
index c44079f0e19df..0000000000000
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/initial_configuration_step/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 './initial_configuration_step';
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/setup_steps.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/setup_steps.tsx
deleted file mode 100644
index 967c69dfae950..0000000000000
--- a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/setup/setup_steps.tsx
+++ /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 { EuiSteps, EuiStepStatus } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import React from 'react';
-
-import { SetupStatus } from '../../../../../common/log_analysis';
-import { useAnalysisSetupState } from '../../../../containers/logs/log_analysis/log_analysis_setup_state';
-import { InitialConfigurationStep } from './initial_configuration_step';
-import { ProcessStep } from './process_step';
-import {
-  ModuleDescriptor,
-  ModuleSourceConfiguration,
-} from '../../../../containers/logs/log_analysis';
-
-type SetupHandler = (
-  indices: string[],
-  startTime: number | undefined,
-  endTime: number | undefined
-) => void;
-
-interface LogEntryRateSetupStepsProps<JobType extends string> {
-  cleanupAndSetup: SetupHandler;
-  errorMessages: string[];
-  setup: SetupHandler;
-  setupStatus: SetupStatus;
-  viewResults: () => void;
-  moduleDescriptor: ModuleDescriptor<JobType>;
-  sourceConfiguration: ModuleSourceConfiguration;
-}
-
-export const LogEntryRateSetupSteps = <JobType extends string>({
-  cleanupAndSetup: cleanupAndSetupModule,
-  errorMessages,
-  setup: setupModule,
-  setupStatus,
-  viewResults,
-  moduleDescriptor,
-  sourceConfiguration,
-}: LogEntryRateSetupStepsProps<JobType>) => {
-  const {
-    setup,
-    cleanupAndSetup,
-    setStartTime,
-    setEndTime,
-    startTime,
-    endTime,
-    isValidating,
-    validationErrors,
-    validatedIndices,
-    setValidatedIndices,
-  } = useAnalysisSetupState({
-    cleanupAndSetupModule,
-    moduleDescriptor,
-    setupModule,
-    sourceConfiguration,
-  });
-
-  const steps = [
-    {
-      title: i18n.translate('xpack.infra.analysisSetup.configurationStepTitle', {
-        defaultMessage: 'Configuration',
-      }),
-      children: (
-        <InitialConfigurationStep
-          setStartTime={setStartTime}
-          setEndTime={setEndTime}
-          startTime={startTime}
-          endTime={endTime}
-          isValidating={isValidating}
-          validatedIndices={validatedIndices}
-          setValidatedIndices={setValidatedIndices}
-          validationErrors={validationErrors}
-        />
-      ),
-    },
-    {
-      title: i18n.translate('xpack.infra.analysisSetup.actionStepTitle', {
-        defaultMessage: 'Create ML job',
-      }),
-      children: (
-        <ProcessStep
-          cleanupAndSetup={cleanupAndSetup}
-          errorMessages={errorMessages}
-          isConfigurationValid={validationErrors.length <= 0}
-          setup={setup}
-          setupStatus={setupStatus}
-          viewResults={viewResults}
-        />
-      ),
-      status:
-        setupStatus === 'pending'
-          ? ('incomplete' as EuiStepStatus)
-          : setupStatus === 'failed'
-          ? ('danger' as EuiStepStatus)
-          : setupStatus === 'succeeded'
-          ? ('complete' as EuiStepStatus)
-          : undefined,
-    },
-  ];
-
-  return <EuiSteps steps={steps} />;
-};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_rate_setup.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_rate_setup.tsx
new file mode 100644
index 0000000000000..3595b6bf830fc
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/log_entry_rate/use_log_entry_rate_setup.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useAnalysisSetupState } from '../../../containers/logs/log_analysis';
+import { useLogEntryRateModuleContext } from './use_log_entry_rate_module';
+
+export const useLogEntryRateSetup = () => {
+  const {
+    cleanUpAndSetUpModule,
+    lastSetupErrorMessages,
+    moduleDescriptor,
+    setUpModule,
+    setupStatus,
+    sourceConfiguration,
+    viewResults,
+  } = useLogEntryRateModuleContext();
+
+  const {
+    cleanUpAndSetUp,
+    endTime,
+    isValidating,
+    setEndTime,
+    setStartTime,
+    setValidatedIndices,
+    setUp,
+    startTime,
+    validatedIndices,
+    validationErrors,
+  } = useAnalysisSetupState({
+    cleanUpAndSetUpModule,
+    moduleDescriptor,
+    setUpModule,
+    sourceConfiguration,
+  });
+
+  return {
+    cleanUpAndSetUp,
+    endTime,
+    isValidating,
+    lastSetupErrorMessages,
+    setEndTime,
+    setStartTime,
+    setValidatedIndices,
+    setUp,
+    setupStatus,
+    startTime,
+    validatedIndices,
+    validationErrors,
+    viewResults,
+  };
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
index 88212849d4594..f789c16b67d9c 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
@@ -15,23 +15,22 @@ import { PageContent } from '../../../components/page';
 
 import { WithSummary } from '../../../containers/logs/log_summary';
 import { LogViewConfiguration } from '../../../containers/logs/log_view_configuration';
-import { WithLogFilter, WithLogFilterUrlState } from '../../../containers/logs/with_log_filter';
+import { LogFilterState } from '../../../containers/logs/log_filter';
 import {
   LogFlyout as LogFlyoutState,
   WithFlyoutOptionsUrlState,
 } from '../../../containers/logs/log_flyout';
 import { WithLogMinimapUrlState } from '../../../containers/logs/with_log_minimap';
-import { WithLogPositionUrlState } from '../../../containers/logs/with_log_position';
-import { WithLogPosition } from '../../../containers/logs/with_log_position';
+import { LogPositionState } from '../../../containers/logs/log_position';
 import { WithLogTextviewUrlState } from '../../../containers/logs/with_log_textview';
 import { WithStreamItems } from '../../../containers/logs/with_stream_items';
 import { Source } from '../../../containers/source';
 
 import { LogsToolbar } from './page_toolbar';
-import { LogHighlightsBridge, LogHighlightsState } from '../../../containers/logs/log_highlights';
+import { LogHighlightsState } from '../../../containers/logs/log_highlights';
 
 export const LogsPageLogsContent: React.FunctionComponent = () => {
-  const { createDerivedIndexPattern, source, sourceId, version } = useContext(Source.Context);
+  const { source, sourceId, version } = useContext(Source.Context);
   const { intervalSize, textScale, textWrap } = useContext(LogViewConfiguration.Context);
   const {
     setFlyoutVisibility,
@@ -43,121 +42,92 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
     isLoading,
   } = useContext(LogFlyoutState.Context);
   const { logSummaryHighlights } = useContext(LogHighlightsState.Context);
-  const derivedIndexPattern = createDerivedIndexPattern('logs');
+  const { applyLogFilterQuery } = useContext(LogFilterState.Context);
+  const {
+    isAutoReloading,
+    targetPosition,
+    visibleMidpointTime,
+    visibleTimeInterval,
+    reportVisiblePositions,
+    jumpToTargetPosition,
+    stopLiveStreaming,
+  } = useContext(LogPositionState.Context);
   return (
     <>
-      <LogHighlightsBridge indexPattern={derivedIndexPattern} />
-      <WithLogFilterUrlState indexPattern={derivedIndexPattern} />
-      <WithLogPositionUrlState />
       <WithLogMinimapUrlState />
       <WithLogTextviewUrlState />
       <WithFlyoutOptionsUrlState />
       <LogsToolbar />
-      <WithLogFilter indexPattern={derivedIndexPattern}>
-        {({ applyFilterQueryFromKueryExpression }) => (
-          <WithLogPosition>
-            {({ jumpToTargetPosition, stopLiveStreaming }) =>
-              flyoutVisible ? (
-                <LogEntryFlyout
-                  setFilter={applyFilterQueryFromKueryExpression}
-                  setTarget={(timeKey, flyoutItemId) => {
-                    jumpToTargetPosition(timeKey);
-                    setSurroundingLogsId(flyoutItemId);
-                    stopLiveStreaming();
-                  }}
-                  setFlyoutVisibility={setFlyoutVisibility}
-                  flyoutItem={flyoutItem}
-                  loading={isLoading}
-                />
-              ) : null
-            }
-          </WithLogPosition>
-        )}
-      </WithLogFilter>
+      {flyoutVisible ? (
+        <LogEntryFlyout
+          setFilter={applyLogFilterQuery}
+          setTarget={(timeKey, flyoutItemId) => {
+            jumpToTargetPosition(timeKey);
+            setSurroundingLogsId(flyoutItemId);
+            stopLiveStreaming();
+          }}
+          setFlyoutVisibility={setFlyoutVisibility}
+          flyoutItem={flyoutItem}
+          loading={isLoading}
+        />
+      ) : null}
       <PageContent key={`${sourceId}-${version}`}>
-        <WithLogPosition>
+        <WithStreamItems>
           {({
-            isAutoReloading,
-            jumpToTargetPosition,
-            reportVisiblePositions,
-            targetPosition,
-            scrollLockLiveStreaming,
-            scrollUnlockLiveStreaming,
-            isScrollLocked,
+            currentHighlightKey,
+            hasMoreAfterEnd,
+            hasMoreBeforeStart,
+            isLoadingMore,
+            isReloading,
+            items,
+            lastLoadedTime,
+            fetchNewerEntries,
           }) => (
-            <WithStreamItems>
-              {({
-                currentHighlightKey,
-                hasMoreAfterEnd,
-                hasMoreBeforeStart,
-                isLoadingMore,
-                isReloading,
-                items,
-                lastLoadedTime,
-                fetchNewerEntries,
-              }) => (
-                <ScrollableLogTextStreamView
-                  columnConfigurations={(source && source.configuration.logColumns) || []}
-                  hasMoreAfterEnd={hasMoreAfterEnd}
-                  hasMoreBeforeStart={hasMoreBeforeStart}
-                  isLoadingMore={isLoadingMore}
-                  isReloading={isReloading}
-                  isStreaming={isAutoReloading}
-                  items={items}
-                  jumpToTarget={jumpToTargetPosition}
-                  lastLoadedTime={lastLoadedTime}
-                  loadNewerItems={fetchNewerEntries}
-                  reportVisibleInterval={reportVisiblePositions}
-                  scale={textScale}
-                  target={targetPosition}
-                  wrap={textWrap}
-                  setFlyoutItem={setFlyoutId}
-                  setFlyoutVisibility={setFlyoutVisibility}
-                  highlightedItem={surroundingLogsId ? surroundingLogsId : null}
-                  currentHighlightKey={currentHighlightKey}
-                  scrollLock={{
-                    enable: scrollLockLiveStreaming,
-                    disable: scrollUnlockLiveStreaming,
-                    isEnabled: isScrollLocked,
-                  }}
-                />
-              )}
-            </WithStreamItems>
+            <ScrollableLogTextStreamView
+              columnConfigurations={(source && source.configuration.logColumns) || []}
+              hasMoreAfterEnd={hasMoreAfterEnd}
+              hasMoreBeforeStart={hasMoreBeforeStart}
+              isLoadingMore={isLoadingMore}
+              isReloading={isReloading}
+              isStreaming={isAutoReloading}
+              items={items}
+              jumpToTarget={jumpToTargetPosition}
+              lastLoadedTime={lastLoadedTime}
+              loadNewerItems={fetchNewerEntries}
+              reportVisibleInterval={reportVisiblePositions}
+              scale={textScale}
+              target={targetPosition}
+              wrap={textWrap}
+              setFlyoutItem={setFlyoutId}
+              setFlyoutVisibility={setFlyoutVisibility}
+              highlightedItem={surroundingLogsId ? surroundingLogsId : null}
+              currentHighlightKey={currentHighlightKey}
+            />
           )}
-        </WithLogPosition>
+        </WithStreamItems>
+
         <AutoSizer content bounds detectAnyWindowResize="height">
           {({ measureRef, bounds: { height = 0 }, content: { width = 0 } }) => {
             return (
               <LogPageMinimapColumn ref={measureRef}>
                 <WithSummary>
                   {({ buckets }) => (
-                    <WithLogPosition>
-                      {({
-                        isAutoReloading,
-                        jumpToTargetPosition,
-                        visibleMidpointTime,
-                        visibleTimeInterval,
-                      }) => (
-                        <WithStreamItems>
-                          {({ isReloading }) => (
-                            <LogMinimap
-                              height={height}
-                              width={width}
-                              highlightedInterval={isReloading ? null : visibleTimeInterval}
-                              intervalSize={intervalSize}
-                              jumpToTarget={jumpToTargetPosition}
-                              summaryBuckets={buckets}
-                              summaryHighlightBuckets={
-                                logSummaryHighlights.length > 0
-                                  ? logSummaryHighlights[0].buckets
-                                  : []
-                              }
-                              target={visibleMidpointTime}
-                            />
-                          )}
-                        </WithStreamItems>
+                    <WithStreamItems>
+                      {({ isReloading }) => (
+                        <LogMinimap
+                          height={height}
+                          width={width}
+                          highlightedInterval={isReloading ? null : visibleTimeInterval}
+                          intervalSize={intervalSize}
+                          jumpToTarget={jumpToTargetPosition}
+                          summaryBuckets={buckets}
+                          summaryHighlightBuckets={
+                            logSummaryHighlights.length > 0 ? logSummaryHighlights[0].buckets : []
+                          }
+                          target={visibleMidpointTime}
+                        />
                       )}
-                    </WithLogPosition>
+                    </WithStreamItems>
                   )}
                 </WithSummary>
               </LogPageMinimapColumn>
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
index f1bce3da6c876..0fe382bae03b9 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_no_indices_content.tsx
@@ -9,66 +9,53 @@ import { i18n } from '@kbn/i18n';
 
 import React from 'react';
 
-import { UICapabilities } from 'ui/capabilities';
-import { injectUICapabilities } from 'ui/capabilities/react';
 import { NoIndices } from '../../../components/empty_states/no_indices';
-import { WithKibanaChrome } from '../../../containers/with_kibana_chrome';
 import {
   ViewSourceConfigurationButton,
   ViewSourceConfigurationButtonHrefBase,
 } from '../../../components/source_configuration';
+import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 
-interface LogsPageNoIndicesContentProps {
-  uiCapabilities: UICapabilities;
-}
-
-export const LogsPageNoIndicesContent = injectUICapabilities(
-  (props: LogsPageNoIndicesContentProps) => {
-    const { uiCapabilities } = props;
-
-    return (
-      <WithKibanaChrome>
-        {({ basePath }) => (
-          <NoIndices
-            data-test-subj="noLogsIndicesPrompt"
-            title={i18n.translate('xpack.infra.logsPage.noLoggingIndicesTitle', {
-              defaultMessage: "Looks like you don't have any logging indices.",
-            })}
-            message={i18n.translate('xpack.infra.logsPage.noLoggingIndicesDescription', {
-              defaultMessage: "Let's add some!",
-            })}
-            actions={
-              <EuiFlexGroup>
-                <EuiFlexItem>
-                  <EuiButton
-                    href={`${basePath}/app/kibana#/home/tutorial_directory/logging`}
-                    color="primary"
-                    fill
-                    data-test-subj="logsViewSetupInstructionsButton"
-                  >
-                    {i18n.translate(
-                      'xpack.infra.logsPage.noLoggingIndicesInstructionsActionLabel',
-                      { defaultMessage: 'View setup instructions' }
-                    )}
-                  </EuiButton>
-                </EuiFlexItem>
-                {uiCapabilities.logs.configureSource ? (
-                  <EuiFlexItem>
-                    <ViewSourceConfigurationButton
-                      data-test-subj="configureSourceButton"
-                      hrefBase={ViewSourceConfigurationButtonHrefBase.logs}
-                    >
-                      {i18n.translate('xpack.infra.configureSourceActionLabel', {
-                        defaultMessage: 'Change source configuration',
-                      })}
-                    </ViewSourceConfigurationButton>
-                  </EuiFlexItem>
-                ) : null}
-              </EuiFlexGroup>
-            }
-          />
-        )}
-      </WithKibanaChrome>
-    );
-  }
-);
+export const LogsPageNoIndicesContent = () => {
+  const basePath = useKibana().services.http?.basePath || '';
+  const uiCapabilities = useKibana().services.application?.capabilities;
+  return (
+    <NoIndices
+      data-test-subj="noLogsIndicesPrompt"
+      title={i18n.translate('xpack.infra.logsPage.noLoggingIndicesTitle', {
+        defaultMessage: "Looks like you don't have any logging indices.",
+      })}
+      message={i18n.translate('xpack.infra.logsPage.noLoggingIndicesDescription', {
+        defaultMessage: "Let's add some!",
+      })}
+      actions={
+        <EuiFlexGroup>
+          <EuiFlexItem>
+            <EuiButton
+              href={`${basePath}/app/kibana#/home/tutorial_directory/logging`}
+              color="primary"
+              fill
+              data-test-subj="logsViewSetupInstructionsButton"
+            >
+              {i18n.translate('xpack.infra.logsPage.noLoggingIndicesInstructionsActionLabel', {
+                defaultMessage: 'View setup instructions',
+              })}
+            </EuiButton>
+          </EuiFlexItem>
+          {uiCapabilities?.logs?.configureSource ? (
+            <EuiFlexItem>
+              <ViewSourceConfigurationButton
+                data-test-subj="configureSourceButton"
+                hrefBase={ViewSourceConfigurationButtonHrefBase.logs}
+              >
+                {i18n.translate('xpack.infra.configureSourceActionLabel', {
+                  defaultMessage: 'Change source configuration',
+                })}
+              </ViewSourceConfigurationButton>
+            </EuiFlexItem>
+          ) : null}
+        </EuiFlexGroup>
+      }
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_providers.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_providers.tsx
index 3613c000c9d23..d19f27bf1286e 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_providers.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_providers.tsx
@@ -9,25 +9,42 @@ import React, { useContext } from 'react';
 import { LogFlyout } from '../../../containers/logs/log_flyout';
 import { LogViewConfiguration } from '../../../containers/logs/log_view_configuration';
 import { LogHighlightsState } from '../../../containers/logs/log_highlights/log_highlights';
-import { LogPositionState } from '../../../containers/logs/log_position';
-import { LogFilterState } from '../../../containers/logs/log_filter';
+import { LogPositionState, WithLogPositionUrlState } from '../../../containers/logs/log_position';
+import { LogFilterState, WithLogFilterUrlState } from '../../../containers/logs/log_filter';
 import { LogEntriesState } from '../../../containers/logs/log_entries';
 
 import { Source } from '../../../containers/source';
 
+const LogFilterStateProvider: React.FC = ({ children }) => {
+  const { createDerivedIndexPattern } = useContext(Source.Context);
+  const derivedIndexPattern = createDerivedIndexPattern('logs');
+  return (
+    <LogFilterState.Provider indexPattern={derivedIndexPattern}>
+      <WithLogFilterUrlState />
+      {children}
+    </LogFilterState.Provider>
+  );
+};
+
 const LogEntriesStateProvider: React.FC = ({ children }) => {
   const { sourceId } = useContext(Source.Context);
-  const { timeKey, pagesBeforeStart, pagesAfterEnd, isAutoReloading } = useContext(
-    LogPositionState.Context
-  );
+  const {
+    targetPosition,
+    pagesBeforeStart,
+    pagesAfterEnd,
+    isAutoReloading,
+    jumpToTargetPosition,
+  } = useContext(LogPositionState.Context);
   const { filterQuery } = useContext(LogFilterState.Context);
+
   const entriesProps = {
-    timeKey,
+    timeKey: targetPosition,
     pagesBeforeStart,
     pagesAfterEnd,
     filterQuery,
     sourceId,
     isAutoReloading,
+    jumpToTargetPosition,
   };
   return <LogEntriesState.Provider {...entriesProps}>{children}</LogEntriesState.Provider>;
 };
@@ -51,11 +68,12 @@ export const LogsPageProviders: React.FunctionComponent = ({ children }) => {
     <LogViewConfiguration.Provider>
       <LogFlyout.Provider>
         <LogPositionState.Provider>
-          <LogFilterState.Provider>
+          <WithLogPositionUrlState />
+          <LogFilterStateProvider>
             <LogEntriesStateProvider>
               <LogHighlightsStateProvider>{children}</LogHighlightsStateProvider>
             </LogEntriesStateProvider>
-          </LogFilterState.Provider>
+          </LogFilterStateProvider>
         </LogPositionState.Provider>
       </LogFlyout.Provider>
     </LogViewConfiguration.Provider>
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_toolbar.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
index 60c0ebdfc349a..000dfd1065f12 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
@@ -19,8 +19,8 @@ import { LogTextWrapControls } from '../../../components/logging/log_text_wrap_c
 import { LogTimeControls } from '../../../components/logging/log_time_controls';
 import { LogFlyout } from '../../../containers/logs/log_flyout';
 import { LogViewConfiguration } from '../../../containers/logs/log_view_configuration';
-import { WithLogFilter } from '../../../containers/logs/with_log_filter';
-import { WithLogPosition } from '../../../containers/logs/with_log_position';
+import { LogFilterState } from '../../../containers/logs/log_filter';
+import { LogPositionState } from '../../../containers/logs/log_position';
 import { Source } from '../../../containers/source';
 import { WithKueryAutocompletion } from '../../../containers/with_kuery_autocompletion';
 
@@ -37,7 +37,12 @@ export const LogsToolbar = () => {
     textScale,
     textWrap,
   } = useContext(LogViewConfiguration.Context);
-
+  const {
+    filterQueryDraft,
+    isFilterQueryDraftValid,
+    applyLogFilterQuery,
+    setLogFilterQueryDraft,
+  } = useContext(LogFilterState.Context);
   const { setSurroundingLogsId } = useContext(LogFlyout.Context);
 
   const {
@@ -49,44 +54,41 @@ export const LogsToolbar = () => {
     goToPreviousHighlight,
     goToNextHighlight,
   } = useContext(LogHighlightsState.Context);
+  const {
+    visibleMidpointTime,
+    isAutoReloading,
+    jumpToTargetPositionTime,
+    startLiveStreaming,
+    stopLiveStreaming,
+  } = useContext(LogPositionState.Context);
   return (
     <Toolbar>
       <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="s">
         <EuiFlexItem>
           <WithKueryAutocompletion indexPattern={derivedIndexPattern}>
             {({ isLoadingSuggestions, loadSuggestions, suggestions }) => (
-              <WithLogFilter indexPattern={derivedIndexPattern}>
-                {({
-                  applyFilterQueryFromKueryExpression,
-                  filterQueryDraft,
-                  isFilterQueryDraftValid,
-                  setFilterQueryDraftFromKueryExpression,
-                }) => (
-                  <AutocompleteField
-                    isLoadingSuggestions={isLoadingSuggestions}
-                    isValid={isFilterQueryDraftValid}
-                    loadSuggestions={loadSuggestions}
-                    onChange={(expression: string) => {
-                      setSurroundingLogsId(null);
-                      setFilterQueryDraftFromKueryExpression(expression);
-                    }}
-                    onSubmit={(expression: string) => {
-                      setSurroundingLogsId(null);
-                      applyFilterQueryFromKueryExpression(expression);
-                    }}
-                    placeholder={i18n.translate(
-                      'xpack.infra.logsPage.toolbar.kqlSearchFieldPlaceholder',
-                      { defaultMessage: 'Search for log entries… (e.g. host.name:host-1)' }
-                    )}
-                    suggestions={suggestions}
-                    value={filterQueryDraft ? filterQueryDraft.expression : ''}
-                    aria-label={i18n.translate(
-                      'xpack.infra.logsPage.toolbar.kqlSearchFieldAriaLabel',
-                      { defaultMessage: 'Search for log entries' }
-                    )}
-                  />
+              <AutocompleteField
+                isLoadingSuggestions={isLoadingSuggestions}
+                isValid={isFilterQueryDraftValid}
+                loadSuggestions={loadSuggestions}
+                onChange={(expression: string) => {
+                  setSurroundingLogsId(null);
+                  setLogFilterQueryDraft(expression);
+                }}
+                onSubmit={(expression: string) => {
+                  setSurroundingLogsId(null);
+                  applyLogFilterQuery(expression);
+                }}
+                placeholder={i18n.translate(
+                  'xpack.infra.logsPage.toolbar.kqlSearchFieldPlaceholder',
+                  { defaultMessage: 'Search for log entries… (e.g. host.name:host-1)' }
                 )}
-              </WithLogFilter>
+                suggestions={suggestions}
+                value={filterQueryDraft ? filterQueryDraft.expression : ''}
+                aria-label={i18n.translate('xpack.infra.logsPage.toolbar.kqlSearchFieldAriaLabel', {
+                  defaultMessage: 'Search for log entries',
+                })}
+              />
             )}
           </WithKueryAutocompletion>
         </EuiFlexItem>
@@ -119,26 +121,16 @@ export const LogsToolbar = () => {
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <WithLogPosition resetOnUnmount>
-            {({
-              visibleMidpointTime,
-              isAutoReloading,
-              jumpToTargetPositionTime,
-              startLiveStreaming,
-              stopLiveStreaming,
-            }) => (
-              <LogTimeControls
-                currentTime={visibleMidpointTime}
-                isLiveStreaming={isAutoReloading}
-                jumpToTime={jumpToTargetPositionTime}
-                startLiveStreaming={() => {
-                  startLiveStreaming();
-                  setSurroundingLogsId(null);
-                }}
-                stopLiveStreaming={stopLiveStreaming}
-              />
-            )}
-          </WithLogPosition>
+          <LogTimeControls
+            currentTime={visibleMidpointTime}
+            isLiveStreaming={isAutoReloading}
+            jumpToTime={jumpToTargetPositionTime}
+            startLiveStreaming={() => {
+              startLiveStreaming();
+              setSurroundingLogsId(null);
+            }}
+            stopLiveStreaming={stopLiveStreaming}
+          />
         </EuiFlexItem>
       </EuiFlexGroup>
     </Toolbar>
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/components/chart_section_vis.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/components/chart_section_vis.tsx
index 309961cc39025..1731e9aa62cda 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/components/chart_section_vis.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/components/chart_section_vis.tsx
@@ -6,15 +6,7 @@
 import React, { useCallback, useMemo } from 'react';
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
-import {
-  Axis,
-  Chart,
-  getAxisId,
-  niceTimeFormatter,
-  Position,
-  Settings,
-  TooltipValue,
-} from '@elastic/charts';
+import { Axis, Chart, niceTimeFormatter, Position, Settings, TooltipValue } from '@elastic/charts';
 import { EuiPageContentBody } from '@elastic/eui';
 import { getChartTheme } from '../../../components/metrics_explorer/helpers/get_chart_theme';
 import { SeriesChart } from './series_chart';
@@ -28,6 +20,7 @@ import {
 } from './helpers';
 import { ErrorMessage } from './error_message';
 import { useKibanaUiSetting } from '../../../utils/use_kibana_ui_setting';
+import { useUiSetting } from '../../../../../../../../src/plugins/kibana_react/public';
 import { VisSectionProps } from '../types';
 
 export const ChartSectionVis = ({
@@ -42,6 +35,7 @@ export const ChartSectionVis = ({
   seriesOverrides,
   type,
 }: VisSectionProps) => {
+  const isDarkMode = useUiSetting<boolean>('theme:darkMode');
   const [dateFormat] = useKibanaUiSetting('dateFormat');
   const valueFormatter = useCallback(getFormatter(formatter, formatterTemplate), [
     formatter,
@@ -104,12 +98,12 @@ export const ChartSectionVis = ({
       <div className="infrastructureChart" style={{ height: 250, marginBottom: 16 }}>
         <Chart>
           <Axis
-            id={getAxisId('timestamp')}
+            id="timestamp"
             position={Position.Bottom}
             showOverlappingTicks={true}
             tickFormat={dateFormatter}
           />
-          <Axis id={getAxisId('values')} position={Position.Left} tickFormat={valueFormatter} />
+          <Axis id="values" position={Position.Left} tickFormat={valueFormatter} />
           {metric &&
             metric.series.map(series => (
               <SeriesChart
@@ -125,7 +119,7 @@ export const ChartSectionVis = ({
           <Settings
             tooltip={tooltipProps}
             onBrushEnd={handleTimeChange}
-            theme={getChartTheme()}
+            theme={getChartTheme(isDarkMode)}
             showLegend={true}
             legendPosition="right"
           />
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/components/invalid_node.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/components/invalid_node.tsx
index f9e56791746f5..6bda7b7a7cd08 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/components/invalid_node.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/components/invalid_node.tsx
@@ -9,70 +9,67 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 
 import euiStyled from '../../../../../../common/eui_styled_components';
-import { WithKibanaChrome } from '../../../containers/with_kibana_chrome';
 import {
   ViewSourceConfigurationButton,
   ViewSourceConfigurationButtonHrefBase,
 } from '../../../components/source_configuration';
+import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 
 interface InvalidNodeErrorProps {
   nodeName: string;
 }
 
 export const InvalidNodeError: React.FunctionComponent<InvalidNodeErrorProps> = ({ nodeName }) => {
+  const basePath = useKibana().services.http?.basePath || '';
   return (
-    <WithKibanaChrome>
-      {({ basePath }) => (
-        <CenteredEmptyPrompt
-          title={
-            <h2>
+    <CenteredEmptyPrompt
+      title={
+        <h2>
+          <FormattedMessage
+            id="xpack.infra.metrics.invalidNodeErrorTitle"
+            defaultMessage="Looks like {nodeName} isn't collecting any metrics data"
+            values={{
+              nodeName,
+            }}
+          />
+        </h2>
+      }
+      body={
+        <p>
+          <FormattedMessage
+            id="xpack.infra.metrics.invalidNodeErrorDescription"
+            defaultMessage="Double check your configuration"
+          />
+        </p>
+      }
+      actions={
+        <EuiFlexGroup>
+          <EuiFlexItem>
+            <EuiButton
+              href={`${basePath}/app/kibana#/home/tutorial_directory/metrics`}
+              color="primary"
+              fill
+            >
               <FormattedMessage
-                id="xpack.infra.metrics.invalidNodeErrorTitle"
-                defaultMessage="Looks like {nodeName} isn't collecting any metrics data"
-                values={{
-                  nodeName,
-                }}
+                id="xpack.infra.homePage.noMetricsIndicesInstructionsActionLabel"
+                defaultMessage="View setup instructions"
               />
-            </h2>
-          }
-          body={
-            <p>
+            </EuiButton>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <ViewSourceConfigurationButton
+              data-test-subj="configureSourceButton"
+              hrefBase={ViewSourceConfigurationButtonHrefBase.infrastructure}
+            >
               <FormattedMessage
-                id="xpack.infra.metrics.invalidNodeErrorDescription"
-                defaultMessage="Double check your configuration"
+                id="xpack.infra.configureSourceActionLabel"
+                defaultMessage="Change source configuration"
               />
-            </p>
-          }
-          actions={
-            <EuiFlexGroup>
-              <EuiFlexItem>
-                <EuiButton
-                  href={`${basePath}/app/kibana#/home/tutorial_directory/metrics`}
-                  color="primary"
-                  fill
-                >
-                  <FormattedMessage
-                    id="xpack.infra.homePage.noMetricsIndicesInstructionsActionLabel"
-                    defaultMessage="View setup instructions"
-                  />
-                </EuiButton>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <ViewSourceConfigurationButton
-                  data-test-subj="configureSourceButton"
-                  hrefBase={ViewSourceConfigurationButtonHrefBase.infrastructure}
-                >
-                  <FormattedMessage
-                    id="xpack.infra.configureSourceActionLabel"
-                    defaultMessage="Change source configuration"
-                  />
-                </ViewSourceConfigurationButton>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          }
-        />
-      )}
-    </WithKibanaChrome>
+            </ViewSourceConfigurationButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      }
+    />
   );
 };
 
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/components/layout_content.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/components/layout_content.tsx
new file mode 100644
index 0000000000000..a2bd9cdc13179
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/components/layout_content.tsx
@@ -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 { EuiPageContent } from '@elastic/eui';
+import { euiStyled } from '../../../../../../common/eui_styled_components';
+
+export const LayoutContent = euiStyled(EuiPageContent)`
+  position: relative;
+`;
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/components/metadata_details.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/components/metadata_details.tsx
new file mode 100644
index 0000000000000..c43f2d10d7163
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/components/metadata_details.tsx
@@ -0,0 +1,180 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext, useState, useCallback, useMemo } from 'react';
+import { EuiButtonIcon, EuiFlexGrid, EuiFlexItem, EuiTitle, EuiText } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { get } from 'lodash';
+import { InfraMetadata } from '../../../../common/http_api';
+import euiStyled from '../../../../../../common/eui_styled_components';
+import { MetadataContext } from '../containers/metadata_context';
+
+interface FieldDef {
+  field: string;
+  label: string;
+  isBoolean?: boolean;
+}
+
+const FIELDS = [
+  {
+    field: 'cloud.instance.id',
+    label: i18n.translate('xpack.infra.nodeDetails.labels.instanceId', {
+      defaultMessage: 'Instance ID',
+    }),
+  },
+  {
+    field: 'cloud.provider',
+    label: i18n.translate('xpack.infra.nodeDetails.labels.cloudProvider', {
+      defaultMessage: 'Cloud Provider',
+    }),
+  },
+  {
+    field: 'host.os.name',
+    label: i18n.translate('xpack.infra.nodeDetails.labels.operatinSystem', {
+      defaultMessage: 'Operating System',
+    }),
+  },
+  {
+    field: 'host.os.kernel',
+    label: i18n.translate('xpack.infra.nodeDetails.labels.kernelVersion', {
+      defaultMessage: 'Kernel Version',
+    }),
+  },
+  {
+    field: 'host.hostname',
+    label: i18n.translate('xpack.infra.nodeDetails.labels.hostname', {
+      defaultMessage: 'Hostname',
+    }),
+  },
+  {
+    field: 'host.containerized',
+    label: i18n.translate('xpack.infra.nodeDetails.labels.containerized', {
+      defaultMessage: 'Containerized',
+    }),
+    isBoolean: true,
+  },
+  {
+    field: 'cloud.project.id',
+    label: i18n.translate('xpack.infra.nodeDetails.labels.projectId', {
+      defaultMessage: 'Project ID',
+    }),
+  },
+  {
+    field: 'cloud.availability_zone',
+    label: i18n.translate('xpack.infra.nodeDetails.labels.availabilityZone', {
+      defaultMessage: 'Availability Zone',
+    }),
+  },
+  {
+    field: 'cloud.machine.type',
+    label: i18n.translate('xpack.infra.nodeDetails.labels.machineType', {
+      defaultMessage: 'Machine Type',
+    }),
+  },
+  {
+    field: 'cloud.instance.name',
+    label: i18n.translate('xpack.infra.nodeDetails.labels.instanceName', {
+      defaultMessage: 'Instance Name',
+    }),
+  },
+] as FieldDef[];
+
+const getLabelForField = ({ field }: FieldDef) => {
+  const fieldDef = FIELDS.find(f => f.field === field);
+  if (!fieldDef) return field;
+  return fieldDef.label;
+};
+
+const getValueForField = (metadata: InfraMetadata, { field, isBoolean }: FieldDef) => {
+  if (isBoolean) {
+    return get(metadata.info, field, false)
+      ? i18n.translate('xpack.infra.nodeDetails.yes', { defaultMessage: 'Yes' })
+      : i18n.translate('xpack.infra.nodeDetails.no', { defaultMessage: 'No' });
+  }
+  const value = get(metadata.info, field, '--');
+  return value;
+};
+
+interface Props {
+  fields?: string[];
+}
+
+const NUMBER_OF_COLUMNS = 4;
+
+export const MetadataDetails = (props: Props) => {
+  const [isOpen, setControlState] = useState<boolean>(false);
+
+  const toggleIsOpen = useCallback(
+    () => (isOpen ? setControlState(false) : setControlState(true)),
+    [isOpen]
+  );
+
+  const filteredFields = useMemo(() => {
+    if (props.fields && props.fields.length) {
+      return props.fields
+        .map(field => {
+          const fieldDef = FIELDS.find(f => f.field === field);
+          if (fieldDef) {
+            return fieldDef;
+          }
+        })
+        .filter(f => f) as FieldDef[];
+    } else {
+      return FIELDS;
+    }
+  }, [props.fields]);
+  const fields = useMemo(
+    () => (isOpen ? filteredFields : filteredFields.slice(0, NUMBER_OF_COLUMNS)),
+    [filteredFields, isOpen]
+  );
+  const metadata = useContext(MetadataContext);
+
+  if (!metadata) {
+    return null;
+  }
+
+  return (
+    <MetadataContainer>
+      {filteredFields.length > NUMBER_OF_COLUMNS ? (
+        <Controls>
+          <EuiButtonIcon
+            iconType={isOpen ? 'arrowUp' : 'arrowDown'}
+            onClick={toggleIsOpen}
+            aria-label={i18n.translate('xpack.infra.nodeDetails.labels.showMoreDetails', {
+              defaultMessage: 'Show more details',
+            })}
+          />
+        </Controls>
+      ) : null}
+      <EuiFlexGrid columns={NUMBER_OF_COLUMNS} style={{ flexGrow: 1 }} gutterSize="s">
+        {fields.map(field => (
+          <EuiFlexItem key={field.field} style={{ minWidth: 0 }}>
+            <EuiTitle size="xs">
+              <h5>{getLabelForField(field)}</h5>
+            </EuiTitle>
+            <EuiText>{getValueForField(metadata, field)}</EuiText>
+          </EuiFlexItem>
+        ))}
+      </EuiFlexGrid>
+    </MetadataContainer>
+  );
+};
+
+const MetadataContainer = euiStyled.div`
+border-top: ${props => props.theme.eui.euiBorderWidthThin} solid ${props =>
+  props.theme.eui.euiBorderColor};
+border-bottom: ${props => props.theme.eui.euiBorderWidthThin} solid ${props =>
+  props.theme.eui.euiBorderColor};
+padding: ${props => props.theme.eui.paddingSizes.m} 0;
+margin-bottom: ${props => props.theme.eui.paddingSizes.m};
+display: flex;
+`;
+
+const Controls = euiStyled.div`
+flex-grow: 0;
+margin-right: ${props => props.theme.eui.paddingSizes.m};
+min-width: 0px;
+`;
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/components/node_details.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/components/node_details.tsx
deleted file mode 100644
index 5329ea992c493..0000000000000
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/components/node_details.tsx
+++ /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 React, { useState, useCallback, useMemo } from 'react';
-import { EuiButtonIcon, EuiFlexGrid, EuiFlexItem, EuiTitle, EuiText } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { get } from 'lodash';
-import { InfraMetadata } from '../../../../common/http_api';
-import euiStyled from '../../../../../../common/eui_styled_components';
-
-interface Props {
-  metadata?: InfraMetadata | null;
-}
-
-interface FieldDef {
-  field: string;
-  label: string;
-  isBoolean?: boolean;
-}
-
-const FIELDS = [
-  {
-    field: 'cloud.instance.id',
-    label: i18n.translate('xpack.infra.nodeDetails.labels.instanceId', {
-      defaultMessage: 'Instance ID',
-    }),
-  },
-  {
-    field: 'cloud.provider',
-    label: i18n.translate('xpack.infra.nodeDetails.labels.cloudProvider', {
-      defaultMessage: 'Cloud Provider',
-    }),
-  },
-  {
-    field: 'host.os.name',
-    label: i18n.translate('xpack.infra.nodeDetails.labels.operatinSystem', {
-      defaultMessage: 'Operating System',
-    }),
-  },
-  {
-    field: 'host.os.kernel',
-    label: i18n.translate('xpack.infra.nodeDetails.labels.kernelVersion', {
-      defaultMessage: 'Kernel Version',
-    }),
-  },
-  {
-    field: 'host.hostname',
-    label: i18n.translate('xpack.infra.nodeDetails.labels.hostname', {
-      defaultMessage: 'Hostname',
-    }),
-  },
-  {
-    field: 'host.containerized',
-    label: i18n.translate('xpack.infra.nodeDetails.labels.containerized', {
-      defaultMessage: 'Containerized',
-    }),
-    isBoolean: true,
-  },
-  {
-    field: 'cloud.project.id',
-    label: i18n.translate('xpack.infra.nodeDetails.labels.projectId', {
-      defaultMessage: 'Project ID',
-    }),
-  },
-  {
-    field: 'cloud.availability_zone',
-    label: i18n.translate('xpack.infra.nodeDetails.labels.availabilityZone', {
-      defaultMessage: 'Availability Zone',
-    }),
-  },
-  {
-    field: 'cloud.machine.type',
-    label: i18n.translate('xpack.infra.nodeDetails.labels.machineType', {
-      defaultMessage: 'Machine Type',
-    }),
-  },
-  {
-    field: 'cloud.instance.name',
-    label: i18n.translate('xpack.infra.nodeDetails.labels.instanceName', {
-      defaultMessage: 'Instance Name',
-    }),
-  },
-] as FieldDef[];
-
-const getLabelForField = ({ field }: FieldDef) => {
-  const fieldDef = FIELDS.find(f => f.field === field);
-  if (!fieldDef) return field;
-  return fieldDef.label;
-};
-
-const getValueForField = (metadata: InfraMetadata, { field, isBoolean }: FieldDef) => {
-  if (isBoolean) {
-    return get(metadata.info, field, false)
-      ? i18n.translate('xpack.infra.nodeDetails.yes', { defaultMessage: 'Yes' })
-      : i18n.translate('xpack.infra.nodeDetails.no', { defaultMessage: 'No' });
-  }
-  const value = get(metadata.info, field, '--');
-  return value;
-};
-
-export const NodeDetails = ({ metadata }: Props) => {
-  const [isOpen, setControlState] = useState<boolean>(false);
-
-  const toggleIsOpen = useCallback(
-    () => (isOpen ? setControlState(false) : setControlState(true)),
-    [isOpen]
-  );
-
-  const fields = useMemo(() => (isOpen ? FIELDS : FIELDS.slice(0, 4)), [isOpen]);
-
-  if (!metadata) {
-    return null;
-  }
-
-  return (
-    <NodeDetailsContainer>
-      <Controls>
-        <EuiButtonIcon
-          iconType={isOpen ? 'arrowUp' : 'arrowDown'}
-          onClick={toggleIsOpen}
-          aria-label={i18n.translate('xpack.infra.nodeDetails.labels.showMoreDetails', {
-            defaultMessage: 'Show more details',
-          })}
-        />
-      </Controls>
-      <EuiFlexGrid columns={4} style={{ flexGrow: 1 }}>
-        {fields.map(field => (
-          <EuiFlexItem key={field.field} style={{ minWidth: 0 }}>
-            <EuiTitle size="xs">
-              <h4>{getLabelForField(field)}</h4>
-            </EuiTitle>
-            <EuiText>{getValueForField(metadata, field)}</EuiText>
-          </EuiFlexItem>
-        ))}
-      </EuiFlexGrid>
-    </NodeDetailsContainer>
-  );
-};
-
-const NodeDetailsContainer = euiStyled.div`
-border-top: ${props => props.theme.eui.euiBorderWidthThin} solid ${props =>
-  props.theme.eui.euiBorderColor};
-border-bottom: ${props => props.theme.eui.euiBorderWidthThin} solid ${props =>
-  props.theme.eui.euiBorderColor};
-padding: ${props => props.theme.eui.paddingSizes.m} 0;
-margin-bottom: ${props => props.theme.eui.paddingSizes.m};
-display: flex;
-`;
-
-const Controls = euiStyled.div`
-flex-grow: 0;
-margin-right: ${props => props.theme.eui.paddingSizes.m};
-`;
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/components/node_details_page.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/components/node_details_page.tsx
index 933831c6ec87d..2f4eb57cd5161 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/components/node_details_page.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/components/node_details_page.tsx
@@ -12,7 +12,6 @@ import {
   EuiPageHeaderSection,
   EuiHideFor,
   EuiTitle,
-  EuiPageContent,
 } from '@elastic/eui';
 import { InventoryMetric } from '../../../../common/inventory_models/types';
 import { useNodeDetails } from '../../../containers/node_details/use_node_details';
@@ -20,13 +19,13 @@ import { InfraNodeType, InfraTimerangeInput } from '../../../graphql/types';
 import { MetricsSideNav } from './side_nav';
 import { AutoSizer } from '../../../components/auto_sizer';
 import { MetricsTimeControls } from './time_controls';
-import { NodeDetails } from './node_details';
 import { SideNavContext, NavItem } from '../lib/side_nav_context';
 import { PageBody } from './page_body';
 import euiStyled from '../../../../../../common/eui_styled_components';
 import { MetricsTimeInput } from '../containers/with_metrics_time';
 import { InfraMetadata } from '../../../../common/http_api/metadata_api';
 import { PageError } from './page_error';
+import { MetadataContext } from '../../../pages/metrics/containers/metadata_context';
 
 interface Props {
   name: string;
@@ -100,14 +99,13 @@ export const NodeDetailsPage = (props: Props) => {
                     </MetricsTitleTimeRangeContainer>
                   </EuiPageHeaderSection>
                 </EuiPageHeader>
-                <NodeDetails metadata={props.metadata} />
-                <EuiPageContentWithRelative>
-                  <SideNavContext.Provider
-                    value={{
-                      items: props.sideNav,
-                      addNavItem: props.addNavItem,
-                    }}
-                  >
+                <SideNavContext.Provider
+                  value={{
+                    items: props.sideNav,
+                    addNavItem: props.addNavItem,
+                  }}
+                >
+                  <MetadataContext.Provider value={props.metadata}>
                     <PageBody
                       loading={metrics.length > 0 && props.isAutoReloading ? false : loading}
                       refetch={refetch}
@@ -117,8 +115,8 @@ export const NodeDetailsPage = (props: Props) => {
                       isLiveStreaming={props.isAutoReloading}
                       stopLiveStreaming={() => props.setAutoReload(false)}
                     />
-                  </SideNavContext.Provider>
-                </EuiPageContentWithRelative>
+                  </MetadataContext.Provider>
+                </SideNavContext.Provider>
               </EuiPageBody>
             </MetricsDetailsPageColumn>
           );
@@ -128,10 +126,6 @@ export const NodeDetailsPage = (props: Props) => {
   );
 };
 
-const EuiPageContentWithRelative = euiStyled(EuiPageContent)`
-  position: relative;
-`;
-
 const MetricsDetailsPageColumn = euiStyled.div`
   flex: 1 0 0%;
   display: flex;
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/components/page_error.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/components/page_error.tsx
index c893d3079364d..e54cdcd151f6f 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/components/page_error.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/components/page_error.tsx
@@ -7,7 +7,7 @@
 // import { GraphQLFormattedError } from 'graphql';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { KFetchError } from 'ui/kfetch/kfetch_error';
+import { IHttpFetchError } from 'src/core/public';
 import { InvalidNodeError } from './invalid_node';
 // import { InfraMetricsErrorCodes } from '../../../../common/errors';
 import { DocumentTitle } from '../../../components/document_title';
@@ -15,7 +15,7 @@ import { ErrorPageBody } from '../../error';
 
 interface Props {
   name: string;
-  error: KFetchError;
+  error: IHttpFetchError;
 }
 
 export const PageError = ({ error, name }: Props) => {
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/components/series_chart.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/components/series_chart.tsx
index b75f669a6d1ec..4ab45d5f46233 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/components/series_chart.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/components/series_chart.tsx
@@ -9,9 +9,6 @@ import {
   AreaSeries,
   BarSeries,
   ScaleType,
-  getSpecId,
-  DataSeriesColorsValues,
-  CustomSeriesColorsMap,
   RecursivePartial,
   BarSeriesStyle,
   AreaSeriesStyle,
@@ -46,15 +43,9 @@ export const AreaChart = ({ id, color, series, name, type, stack }: Props) => {
       visible: true,
     },
   };
-  const colors: DataSeriesColorsValues = {
-    colorValues: [],
-    specId: getSpecId(id),
-  };
-  const customColors: CustomSeriesColorsMap = new Map();
-  customColors.set(colors, color || '#999');
   return (
     <AreaSeries
-      id={getSpecId(id)}
+      id={id}
       name={name}
       xScaleType={ScaleType.Time}
       yScaleType={ScaleType.Linear}
@@ -62,7 +53,7 @@ export const AreaChart = ({ id, color, series, name, type, stack }: Props) => {
       yAccessors={['value']}
       data={series.data}
       areaSeriesStyle={style}
-      customSeriesColors={color ? customColors : void 0}
+      customSeriesColors={color ? [color] : void 0}
       stackAccessors={stack ? ['timestamp'] : void 0}
     />
   );
@@ -79,15 +70,9 @@ export const BarChart = ({ id, color, series, name, type, stack }: Props) => {
       opacity: 1,
     },
   };
-  const colors: DataSeriesColorsValues = {
-    colorValues: [],
-    specId: getSpecId(id),
-  };
-  const customColors: CustomSeriesColorsMap = new Map();
-  customColors.set(colors, color || '#999');
   return (
     <BarSeries
-      id={getSpecId(id)}
+      id={id}
       name={name}
       xScaleType={ScaleType.Time}
       yScaleType={ScaleType.Linear}
@@ -95,7 +80,7 @@ export const BarChart = ({ id, color, series, name, type, stack }: Props) => {
       yAccessors={['value']}
       data={series.data}
       barSeriesStyle={style}
-      customSeriesColors={customColors}
+      customSeriesColors={color ? [color] : void 0}
       stackAccessors={stack ? ['timestamp'] : void 0}
     />
   );
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/containers/metadata_context.ts b/x-pack/legacy/plugins/infra/public/pages/metrics/containers/metadata_context.ts
new file mode 100644
index 0000000000000..4ecf7fa15548c
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/containers/metadata_context.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 React from 'react';
+import { InfraMetadata } from '../../../../common/http_api';
+export const MetadataContext = React.createContext<InfraMetadata | null>(null);
diff --git a/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx b/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx
index b330ad02f1022..b7e8274802555 100644
--- a/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/metrics/index.tsx
@@ -5,8 +5,6 @@
  */
 import { i18n } from '@kbn/i18n';
 import React, { useContext, useState } from 'react';
-import { UICapabilities } from 'ui/capabilities';
-import { injectUICapabilities } from 'ui/capabilities/react';
 import euiStyled, { EuiTheme, withTheme } from '../../../../../common/eui_styled_components';
 import { DocumentTitle } from '../../components/document_title';
 import { Header } from '../../components/header';
@@ -20,6 +18,7 @@ import { InfraLoadingPanel } from '../../components/loading';
 import { findInventoryModel } from '../../../common/inventory_models';
 import { NavItem } from './lib/side_nav_context';
 import { NodeDetailsPage } from './components/node_details_page';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 const DetailPageContent = euiStyled(PageContent)`
   overflow: auto;
@@ -34,111 +33,109 @@ interface Props {
       node: string;
     };
   };
-  uiCapabilities: UICapabilities;
 }
 
 export const MetricDetail = withMetricPageProviders(
-  injectUICapabilities(
-    withTheme(({ uiCapabilities, match, theme }: Props) => {
-      const nodeId = match.params.node;
-      const nodeType = match.params.type as InfraNodeType;
-      const inventoryModel = findInventoryModel(nodeType);
-      const { sourceId } = useContext(Source.Context);
-      const {
-        name,
-        filteredRequiredMetrics,
-        loading: metadataLoading,
-        cloudId,
-        metadata,
-      } = useMetadata(nodeId, nodeType, inventoryModel.requiredMetrics, sourceId);
+  withTheme(({ match, theme }: Props) => {
+    const uiCapabilities = useKibana().services.application?.capabilities;
+    const nodeId = match.params.node;
+    const nodeType = match.params.type as InfraNodeType;
+    const inventoryModel = findInventoryModel(nodeType);
+    const { sourceId } = useContext(Source.Context);
+    const {
+      name,
+      filteredRequiredMetrics,
+      loading: metadataLoading,
+      cloudId,
+      metadata,
+    } = useMetadata(nodeId, nodeType, inventoryModel.requiredMetrics, sourceId);
 
-      const [sideNav, setSideNav] = useState<NavItem[]>([]);
+    const [sideNav, setSideNav] = useState<NavItem[]>([]);
 
-      const addNavItem = React.useCallback(
-        (item: NavItem) => {
-          if (!sideNav.some(n => n.id === item.id)) {
-            setSideNav([item, ...sideNav]);
-          }
-        },
-        [sideNav]
-      );
-
-      const breadcrumbs = [
-        {
-          href: '#/',
-          text: i18n.translate('xpack.infra.header.infrastructureTitle', {
-            defaultMessage: 'Metrics',
-          }),
-        },
-        { text: name },
-      ];
+    const addNavItem = React.useCallback(
+      (item: NavItem) => {
+        if (!sideNav.some(n => n.id === item.id)) {
+          setSideNav([item, ...sideNav]);
+        }
+      },
+      [sideNav]
+    );
 
-      if (metadataLoading && !filteredRequiredMetrics.length) {
-        return (
-          <InfraLoadingPanel
-            height="100vh"
-            width="100%"
-            text={i18n.translate('xpack.infra.metrics.loadingNodeDataText', {
-              defaultMessage: 'Loading data',
-            })}
-          />
-        );
-      }
+    const breadcrumbs = [
+      {
+        href: '#/',
+        text: i18n.translate('xpack.infra.header.infrastructureTitle', {
+          defaultMessage: 'Metrics',
+        }),
+      },
+      { text: name },
+    ];
 
+    if (metadataLoading && !filteredRequiredMetrics.length) {
       return (
-        <WithMetricsTime>
-          {({
-            timeRange,
-            parsedTimeRange,
-            setTimeRange,
-            refreshInterval,
-            setRefreshInterval,
-            isAutoReloading,
-            setAutoReload,
-            triggerRefresh,
-          }) => (
-            <ColumnarPage>
-              <Header
-                breadcrumbs={breadcrumbs}
-                readOnlyBadge={!uiCapabilities.infrastructure.save}
-              />
-              <WithMetricsTimeUrlState />
-              <DocumentTitle
-                title={i18n.translate('xpack.infra.metricDetailPage.documentTitle', {
-                  defaultMessage: 'Infrastructure | Metrics | {name}',
-                  values: {
-                    name,
-                  },
-                })}
-              />
-              <DetailPageContent data-test-subj="infraMetricsPage">
-                {metadata ? (
-                  <NodeDetailsPage
-                    name={name}
-                    requiredMetrics={filteredRequiredMetrics}
-                    sourceId={sourceId}
-                    timeRange={timeRange}
-                    parsedTimeRange={parsedTimeRange}
-                    nodeType={nodeType}
-                    nodeId={nodeId}
-                    cloudId={cloudId}
-                    metadataLoading={metadataLoading}
-                    isAutoReloading={isAutoReloading}
-                    refreshInterval={refreshInterval}
-                    sideNav={sideNav}
-                    metadata={metadata}
-                    addNavItem={addNavItem}
-                    setRefreshInterval={setRefreshInterval}
-                    setAutoReload={setAutoReload}
-                    triggerRefresh={triggerRefresh}
-                    setTimeRange={setTimeRange}
-                  />
-                ) : null}
-              </DetailPageContent>
-            </ColumnarPage>
-          )}
-        </WithMetricsTime>
+        <InfraLoadingPanel
+          height="100vh"
+          width="100%"
+          text={i18n.translate('xpack.infra.metrics.loadingNodeDataText', {
+            defaultMessage: 'Loading data',
+          })}
+        />
       );
-    })
-  )
+    }
+
+    return (
+      <WithMetricsTime>
+        {({
+          timeRange,
+          parsedTimeRange,
+          setTimeRange,
+          refreshInterval,
+          setRefreshInterval,
+          isAutoReloading,
+          setAutoReload,
+          triggerRefresh,
+        }) => (
+          <ColumnarPage>
+            <Header
+              breadcrumbs={breadcrumbs}
+              readOnlyBadge={!uiCapabilities?.infrastructure?.save}
+            />
+            <WithMetricsTimeUrlState />
+            <DocumentTitle
+              title={i18n.translate('xpack.infra.metricDetailPage.documentTitle', {
+                defaultMessage: 'Infrastructure | Metrics | {name}',
+                values: {
+                  name,
+                },
+              })}
+            />
+            <DetailPageContent data-test-subj="infraMetricsPage">
+              {metadata ? (
+                <NodeDetailsPage
+                  name={name}
+                  requiredMetrics={filteredRequiredMetrics}
+                  sourceId={sourceId}
+                  timeRange={timeRange}
+                  parsedTimeRange={parsedTimeRange}
+                  nodeType={nodeType}
+                  nodeId={nodeId}
+                  cloudId={cloudId}
+                  metadataLoading={metadataLoading}
+                  isAutoReloading={isAutoReloading}
+                  refreshInterval={refreshInterval}
+                  sideNav={sideNav}
+                  metadata={metadata}
+                  addNavItem={addNavItem}
+                  setRefreshInterval={setRefreshInterval}
+                  setAutoReload={setAutoReload}
+                  triggerRefresh={triggerRefresh}
+                  setTimeRange={setTimeRange}
+                />
+              ) : null}
+            </DetailPageContent>
+          </ColumnarPage>
+        )}
+      </WithMetricsTime>
+    );
+  })
 );
diff --git a/x-pack/legacy/plugins/infra/public/pages/shared/settings/index.tsx b/x-pack/legacy/plugins/infra/public/pages/shared/settings/index.tsx
index daea6cfabdc2a..23ed1b273aa0e 100644
--- a/x-pack/legacy/plugins/infra/public/pages/shared/settings/index.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/shared/settings/index.tsx
@@ -5,14 +5,14 @@
  */
 
 import React from 'react';
-import { UICapabilities } from 'ui/capabilities';
-import { injectUICapabilities } from 'ui/capabilities/react';
 import { SourceConfigurationSettings } from '../../../components/source_configuration/source_configuration_settings';
+import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 
-interface SettingsPageProps {
-  uiCapabilities: UICapabilities;
-}
-
-export const SettingsPage = injectUICapabilities(({ uiCapabilities }: SettingsPageProps) => (
-  <SourceConfigurationSettings shouldAllowEdit={uiCapabilities.logs.configureSource as boolean} />
-));
+export const SettingsPage = () => {
+  const uiCapabilities = useKibana().services.application?.capabilities;
+  return (
+    <SourceConfigurationSettings
+      shouldAllowEdit={uiCapabilities?.logs?.configureSource as boolean}
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/public/routes.tsx b/x-pack/legacy/plugins/infra/public/routes.tsx
index 9dedc612bbe54..fd69c6e842448 100644
--- a/x-pack/legacy/plugins/infra/public/routes.tsx
+++ b/x-pack/legacy/plugins/infra/public/routes.tsx
@@ -8,55 +8,54 @@ import { History } from 'history';
 import React from 'react';
 import { Route, Router, Switch } from 'react-router-dom';
 
-import { UICapabilities } from 'ui/capabilities';
-import { injectUICapabilities } from 'ui/capabilities/react';
 import { NotFoundPage } from './pages/404';
 import { InfrastructurePage } from './pages/infrastructure';
 import { LinkToPage } from './pages/link_to';
 import { LogsPage } from './pages/logs';
 import { MetricDetail } from './pages/metrics';
 import { RedirectWithQueryParams } from './utils/redirect_with_query_params';
+import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 
 interface RouterProps {
   history: History;
-  uiCapabilities: UICapabilities;
 }
 
-const PageRouterComponent: React.FC<RouterProps> = ({ history, uiCapabilities }) => {
+export const PageRouter: React.FC<RouterProps> = ({ history }) => {
+  const uiCapabilities = useKibana().services.application?.capabilities;
   return (
     <Router history={history}>
       <Switch>
-        {uiCapabilities.infrastructure.show && (
+        {uiCapabilities?.infrastructure?.show && (
           <RedirectWithQueryParams from="/" exact={true} to="/infrastructure/inventory" />
         )}
-        {uiCapabilities.infrastructure.show && (
+        {uiCapabilities?.infrastructure?.show && (
           <RedirectWithQueryParams
             from="/infrastructure"
             exact={true}
             to="/infrastructure/inventory"
           />
         )}
-        {uiCapabilities.infrastructure.show && (
+        {uiCapabilities?.infrastructure?.show && (
           <RedirectWithQueryParams
             from="/infrastructure/snapshot"
             exact={true}
             to="/infrastructure/inventory"
           />
         )}
-        {uiCapabilities.infrastructure.show && (
+        {uiCapabilities?.infrastructure?.show && (
           <RedirectWithQueryParams from="/home" exact={true} to="/infrastructure/inventory" />
         )}
-        {uiCapabilities.infrastructure.show && (
+        {uiCapabilities?.infrastructure?.show && (
           <Route path="/infrastructure/metrics/:type/:node" component={MetricDetail} />
         )}
-        {uiCapabilities.infrastructure.show && (
+        {uiCapabilities?.infrastructure?.show && (
           <RedirectWithQueryParams from="/metrics" to="/infrastructure/metrics" />
         )}
-        {uiCapabilities.logs.show && (
+        {uiCapabilities?.logs?.show && (
           <RedirectWithQueryParams from="/logs" exact={true} to="/logs/stream" />
         )}
-        {uiCapabilities.logs.show && <Route path="/logs" component={LogsPage} />}
-        {uiCapabilities.infrastructure.show && (
+        {uiCapabilities?.logs?.show && <Route path="/logs" component={LogsPage} />}
+        {uiCapabilities?.infrastructure?.show && (
           <Route path="/infrastructure" component={InfrastructurePage} />
         )}
         <Route path="/link-to" component={LinkToPage} />
@@ -65,5 +64,3 @@ const PageRouterComponent: React.FC<RouterProps> = ({ history, uiCapabilities })
     </Router>
   );
 };
-
-export const PageRouter = injectUICapabilities(PageRouterComponent);
diff --git a/x-pack/legacy/plugins/infra/public/store/actions.ts b/x-pack/legacy/plugins/infra/public/store/actions.ts
index e2be0d64b8f1e..8a5d1f6c668d0 100644
--- a/x-pack/legacy/plugins/infra/public/store/actions.ts
+++ b/x-pack/legacy/plugins/infra/public/store/actions.ts
@@ -4,10 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export {
-  logFilterActions,
-  logPositionActions,
-  waffleFilterActions,
-  waffleTimeActions,
-  waffleOptionsActions,
-} from './local';
+export { waffleFilterActions, waffleTimeActions, waffleOptionsActions } from './local';
diff --git a/x-pack/legacy/plugins/infra/public/store/local/actions.ts b/x-pack/legacy/plugins/infra/public/store/local/actions.ts
index 1c6918ea4dc12..1c79d5a515cd4 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/actions.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/actions.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { logFilterActions } from './log_filter';
-export { logPositionActions } from './log_position';
 export { waffleFilterActions } from './waffle_filter';
 export { waffleTimeActions } from './waffle_time';
 export { waffleOptionsActions } from './waffle_options';
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_filter/actions.ts b/x-pack/legacy/plugins/infra/public/store/local/log_filter/actions.ts
deleted file mode 100644
index 32da478c61969..0000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_filter/actions.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 actionCreatorFactory from 'typescript-fsa';
-
-import { FilterQuery, SerializedFilterQuery } from './reducer';
-
-const actionCreator = actionCreatorFactory('x-pack/infra/local/log_filter');
-
-export const setLogFilterQueryDraft = actionCreator<FilterQuery>('SET_LOG_FILTER_QUERY_DRAFT');
-
-export const applyLogFilterQuery = actionCreator<SerializedFilterQuery>('APPLY_LOG_FILTER_QUERY');
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_filter/index.ts b/x-pack/legacy/plugins/infra/public/store/local/log_filter/index.ts
deleted file mode 100644
index 369f5f013d669..0000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_filter/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.
- */
-
-import * as logFilterActions from './actions';
-import * as logFilterSelectors from './selectors';
-
-export { logFilterActions, logFilterSelectors };
-export * from './reducer';
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_filter/reducer.ts b/x-pack/legacy/plugins/infra/public/store/local/log_filter/reducer.ts
deleted file mode 100644
index afb77dd9ddc6a..0000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_filter/reducer.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 { reducerWithInitialState } from 'typescript-fsa-reducers/dist';
-
-import { applyLogFilterQuery, setLogFilterQueryDraft } from './actions';
-
-export interface KueryFilterQuery {
-  kind: 'kuery';
-  expression: string;
-}
-
-export type FilterQuery = KueryFilterQuery;
-
-export interface SerializedFilterQuery {
-  query: FilterQuery;
-  serializedQuery: string;
-}
-
-export interface LogFilterState {
-  filterQuery: SerializedFilterQuery | null;
-  filterQueryDraft: KueryFilterQuery | null;
-}
-
-export const initialLogFilterState: LogFilterState = {
-  filterQuery: null,
-  filterQueryDraft: null,
-};
-
-export const logFilterReducer = reducerWithInitialState(initialLogFilterState)
-  .case(setLogFilterQueryDraft, (state, filterQueryDraft) => ({
-    ...state,
-    filterQueryDraft,
-  }))
-  .case(applyLogFilterQuery, (state, filterQuery) => ({
-    ...state,
-    filterQuery,
-    filterQueryDraft: filterQuery.query,
-  }))
-  .build();
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_filter/selectors.ts b/x-pack/legacy/plugins/infra/public/store/local/log_filter/selectors.ts
deleted file mode 100644
index f17f7be4defe9..0000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_filter/selectors.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createSelector } from 'reselect';
-import { LogFilterState } from './reducer';
-import { esKuery } from '../../../../../../../../src/plugins/data/public';
-
-export const selectLogFilterQuery = (state: LogFilterState) =>
-  state.filterQuery ? state.filterQuery.query : null;
-
-export const selectLogFilterQueryAsJson = (state: LogFilterState) =>
-  state.filterQuery ? state.filterQuery.serializedQuery : null;
-
-export const selectLogFilterQueryDraft = (state: LogFilterState) => state.filterQueryDraft;
-
-export const selectIsLogFilterQueryDraftValid = createSelector(
-  selectLogFilterQueryDraft,
-  filterQueryDraft => {
-    if (filterQueryDraft && filterQueryDraft.kind === 'kuery') {
-      try {
-        esKuery.fromKueryExpression(filterQueryDraft.expression);
-      } catch (err) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-);
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_position/actions.ts b/x-pack/legacy/plugins/infra/public/store/local/log_position/actions.ts
deleted file mode 100644
index ad83b6fda1b04..0000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_position/actions.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 actionCreatorFactory from 'typescript-fsa';
-
-import { TimeKey } from '../../../../common/time';
-
-const actionCreator = actionCreatorFactory('x-pack/infra/local/log_position');
-
-export const jumpToTargetPosition = actionCreator<TimeKey>('JUMP_TO_TARGET_POSITION');
-
-export const jumpToTargetPositionTime = (time: number, fromAutoReload: boolean = false) =>
-  jumpToTargetPosition({
-    tiebreaker: 0,
-    time,
-    fromAutoReload,
-  });
-
-export interface ReportVisiblePositionsPayload {
-  pagesAfterEnd: number;
-  pagesBeforeStart: number;
-  endKey: TimeKey | null;
-  middleKey: TimeKey | null;
-  startKey: TimeKey | null;
-  fromScroll: boolean;
-}
-
-export const reportVisiblePositions = actionCreator<ReportVisiblePositionsPayload>(
-  'REPORT_VISIBLE_POSITIONS'
-);
-
-export const startAutoReload = actionCreator('START_AUTO_RELOAD');
-export const stopAutoReload = actionCreator('STOP_AUTO_RELOAD');
-
-export const lockAutoReloadScroll = actionCreator('LOCK_AUTO_RELOAD_SCROLL');
-export const unlockAutoReloadScroll = actionCreator('UNLOCK_AUTO_RELOAD_SCROLL');
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_position/epic.ts b/x-pack/legacy/plugins/infra/public/store/local/log_position/epic.ts
deleted file mode 100644
index de9e806469b06..0000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_position/epic.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Action } from 'redux';
-import { Epic, combineEpics } from 'redux-observable';
-import { timer } from 'rxjs';
-import { exhaustMap, filter, map, takeUntil, mapTo, withLatestFrom } from 'rxjs/operators';
-
-import {
-  jumpToTargetPosition,
-  jumpToTargetPositionTime,
-  startAutoReload,
-  stopAutoReload,
-} from './actions';
-
-const LIVE_STREAM_INTERVAL = 5000;
-
-const createLiveStreamEpic = <State>(): Epic<
-  Action,
-  Action,
-  State,
-  { selectIsAutoReloadingScrollLocked: (state: State) => boolean }
-> => (action$, state$, { selectIsAutoReloadingScrollLocked }) =>
-  action$.pipe(
-    filter(startAutoReload.match),
-    exhaustMap(() =>
-      timer(0, LIVE_STREAM_INTERVAL).pipe(
-        withLatestFrom(state$),
-        filter(([, state]) => selectIsAutoReloadingScrollLocked(state) === false),
-        map(() => jumpToTargetPositionTime(Date.now(), true)),
-        takeUntil(action$.pipe(filter(stopAutoReload.match)))
-      )
-    )
-  );
-
-const createLiveStreamScrollCancelEpic = <State>(): Epic<
-  Action,
-  Action,
-  State,
-  { selectIsAutoReloadingLogEntries: (state: State) => boolean }
-> => (action$, state$, { selectIsAutoReloadingLogEntries }) =>
-  action$.pipe(
-    filter(action => jumpToTargetPosition.match(action) && !action.payload.fromAutoReload),
-    withLatestFrom(state$),
-    filter(([, state]) => selectIsAutoReloadingLogEntries(state)),
-    mapTo(stopAutoReload())
-  );
-
-export const createLogPositionEpic = <State>() =>
-  combineEpics(createLiveStreamEpic<State>(), createLiveStreamScrollCancelEpic<State>());
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_position/index.ts b/x-pack/legacy/plugins/infra/public/store/local/log_position/index.ts
deleted file mode 100644
index 3edb289985d55..0000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_position/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.
- */
-
-import * as logPositionActions from './actions';
-import * as logPositionSelectors from './selectors';
-
-export { logPositionActions, logPositionSelectors };
-export * from './reducer';
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_position/reducer.ts b/x-pack/legacy/plugins/infra/public/store/local/log_position/reducer.ts
deleted file mode 100644
index 2ca8be8e40d86..0000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_position/reducer.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 { combineReducers } from 'redux';
-import { reducerWithInitialState } from 'typescript-fsa-reducers/dist';
-
-import { TimeKey } from '../../../../common/time';
-import {
-  jumpToTargetPosition,
-  reportVisiblePositions,
-  startAutoReload,
-  stopAutoReload,
-  lockAutoReloadScroll,
-  unlockAutoReloadScroll,
-} from './actions';
-
-interface ManualTargetPositionUpdatePolicy {
-  policy: 'manual';
-}
-
-interface IntervalTargetPositionUpdatePolicy {
-  policy: 'interval';
-}
-
-type TargetPositionUpdatePolicy =
-  | ManualTargetPositionUpdatePolicy
-  | IntervalTargetPositionUpdatePolicy;
-
-export interface LogPositionState {
-  targetPosition: TimeKey | null;
-  updatePolicy: TargetPositionUpdatePolicy;
-  visiblePositions: {
-    startKey: TimeKey | null;
-    middleKey: TimeKey | null;
-    endKey: TimeKey | null;
-    pagesAfterEnd: number;
-    pagesBeforeStart: number;
-  };
-  controlsShouldDisplayTargetPosition: boolean;
-  autoReloadScrollLock: boolean;
-}
-
-export const initialLogPositionState: LogPositionState = {
-  targetPosition: null,
-  updatePolicy: {
-    policy: 'manual',
-  },
-  visiblePositions: {
-    endKey: null,
-    middleKey: null,
-    startKey: null,
-    pagesBeforeStart: Infinity,
-    pagesAfterEnd: Infinity,
-  },
-  controlsShouldDisplayTargetPosition: false,
-  autoReloadScrollLock: false,
-};
-
-const targetPositionReducer = reducerWithInitialState(initialLogPositionState.targetPosition).case(
-  jumpToTargetPosition,
-  (state, target) => target
-);
-
-const targetPositionUpdatePolicyReducer = reducerWithInitialState(
-  initialLogPositionState.updatePolicy
-)
-  .case(startAutoReload, () => ({
-    policy: 'interval',
-  }))
-  .case(stopAutoReload, () => ({
-    policy: 'manual',
-  }));
-
-const visiblePositionReducer = reducerWithInitialState(
-  initialLogPositionState.visiblePositions
-).case(
-  reportVisiblePositions,
-  (state, { startKey, middleKey, endKey, pagesBeforeStart, pagesAfterEnd }) => ({
-    endKey,
-    middleKey,
-    startKey,
-    pagesBeforeStart,
-    pagesAfterEnd,
-  })
-);
-
-// Determines whether to use the target position or the visible midpoint when
-// displaying a timestamp or time range in the toolbar and log minimap. When the
-// user jumps to a new target, the final visible midpoint is indeterminate until
-// all the new data has finished loading, so using this flag reduces the perception
-// that the UI is jumping around inaccurately
-const controlsShouldDisplayTargetPositionReducer = reducerWithInitialState(
-  initialLogPositionState.controlsShouldDisplayTargetPosition
-)
-  .case(jumpToTargetPosition, () => true)
-  .case(stopAutoReload, () => false)
-  .case(startAutoReload, () => true)
-  .case(reportVisiblePositions, (state, { fromScroll }) => {
-    if (fromScroll) return false;
-    return state;
-  });
-
-const autoReloadScrollLockReducer = reducerWithInitialState(
-  initialLogPositionState.autoReloadScrollLock
-)
-  .case(startAutoReload, () => false)
-  .case(stopAutoReload, () => false)
-  .case(lockAutoReloadScroll, () => true)
-  .case(unlockAutoReloadScroll, () => false);
-
-export const logPositionReducer = combineReducers<LogPositionState>({
-  targetPosition: targetPositionReducer,
-  updatePolicy: targetPositionUpdatePolicyReducer,
-  visiblePositions: visiblePositionReducer,
-  controlsShouldDisplayTargetPosition: controlsShouldDisplayTargetPositionReducer,
-  autoReloadScrollLock: autoReloadScrollLockReducer,
-});
diff --git a/x-pack/legacy/plugins/infra/public/store/local/log_position/selectors.ts b/x-pack/legacy/plugins/infra/public/store/local/log_position/selectors.ts
deleted file mode 100644
index 30fd4d3f77b5c..0000000000000
--- a/x-pack/legacy/plugins/infra/public/store/local/log_position/selectors.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 { createSelector } from 'reselect';
-
-import { LogPositionState } from './reducer';
-
-export const selectTargetPosition = (state: LogPositionState) => state.targetPosition;
-
-export const selectIsAutoReloading = (state: LogPositionState) =>
-  state.updatePolicy.policy === 'interval';
-
-export const selectAutoReloadScrollLock = (state: LogPositionState) => state.autoReloadScrollLock;
-
-export const selectFirstVisiblePosition = (state: LogPositionState) =>
-  state.visiblePositions.startKey ? state.visiblePositions.startKey : null;
-
-export const selectMiddleVisiblePosition = (state: LogPositionState) =>
-  state.visiblePositions.middleKey ? state.visiblePositions.middleKey : null;
-
-export const selectLastVisiblePosition = (state: LogPositionState) =>
-  state.visiblePositions.endKey ? state.visiblePositions.endKey : null;
-
-export const selectPagesBeforeAndAfter = (state: LogPositionState) =>
-  state.visiblePositions
-    ? {
-        pagesBeforeStart: state.visiblePositions.pagesBeforeStart,
-        pagesAfterEnd: state.visiblePositions.pagesAfterEnd,
-      }
-    : { pagesBeforeStart: null, pagesAfterEnd: null };
-export const selectControlsShouldDisplayTargetPosition = (state: LogPositionState) =>
-  state.controlsShouldDisplayTargetPosition;
-
-export const selectVisibleMidpointOrTarget = createSelector(
-  selectMiddleVisiblePosition,
-  selectTargetPosition,
-  selectControlsShouldDisplayTargetPosition,
-  (middleVisiblePosition, targetPosition, displayTargetPosition) => {
-    if (displayTargetPosition) {
-      return targetPosition;
-    } else if (middleVisiblePosition) {
-      return middleVisiblePosition;
-    } else if (targetPosition) {
-      return targetPosition;
-    } else {
-      return null;
-    }
-  }
-);
-
-export const selectVisibleMidpointOrTargetTime = createSelector(
-  selectVisibleMidpointOrTarget,
-  visibleMidpointOrTarget => (visibleMidpointOrTarget ? visibleMidpointOrTarget.time : null)
-);
-
-export const selectVisibleTimeInterval = createSelector(
-  selectFirstVisiblePosition,
-  selectLastVisiblePosition,
-  (firstVisiblePosition, lastVisiblePosition) =>
-    firstVisiblePosition && lastVisiblePosition
-      ? {
-          start: firstVisiblePosition.time,
-          end: lastVisiblePosition.time,
-        }
-      : null
-);
diff --git a/x-pack/legacy/plugins/infra/public/store/local/reducer.ts b/x-pack/legacy/plugins/infra/public/store/local/reducer.ts
index 6308f1bc75427..9e194a5d37f49 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/reducer.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/reducer.ts
@@ -6,8 +6,6 @@
 
 import { combineReducers } from 'redux';
 
-import { initialLogFilterState, logFilterReducer, LogFilterState } from './log_filter';
-import { initialLogPositionState, logPositionReducer, LogPositionState } from './log_position';
 import { initialWaffleFilterState, waffleFilterReducer, WaffleFilterState } from './waffle_filter';
 import {
   initialWaffleOptionsState,
@@ -17,24 +15,18 @@ import {
 import { initialWaffleTimeState, waffleTimeReducer, WaffleTimeState } from './waffle_time';
 
 export interface LocalState {
-  logFilter: LogFilterState;
-  logPosition: LogPositionState;
   waffleFilter: WaffleFilterState;
   waffleTime: WaffleTimeState;
   waffleMetrics: WaffleOptionsState;
 }
 
 export const initialLocalState: LocalState = {
-  logFilter: initialLogFilterState,
-  logPosition: initialLogPositionState,
   waffleFilter: initialWaffleFilterState,
   waffleTime: initialWaffleTimeState,
   waffleMetrics: initialWaffleOptionsState,
 };
 
 export const localReducer = combineReducers<LocalState>({
-  logFilter: logFilterReducer,
-  logPosition: logPositionReducer,
   waffleFilter: waffleFilterReducer,
   waffleTime: waffleTimeReducer,
   waffleMetrics: waffleOptionsReducer,
diff --git a/x-pack/legacy/plugins/infra/public/store/local/selectors.ts b/x-pack/legacy/plugins/infra/public/store/local/selectors.ts
index ef57835496f60..56ffc53c2bc72 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/selectors.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/selectors.ts
@@ -5,23 +5,11 @@
  */
 
 import { globalizeSelectors } from '../../utils/typed_redux';
-import { logFilterSelectors as innerLogFilterSelectors } from './log_filter';
-import { logPositionSelectors as innerLogPositionSelectors } from './log_position';
 import { LocalState } from './reducer';
 import { waffleFilterSelectors as innerWaffleFilterSelectors } from './waffle_filter';
 import { waffleOptionsSelectors as innerWaffleOptionsSelectors } from './waffle_options';
 import { waffleTimeSelectors as innerWaffleTimeSelectors } from './waffle_time';
 
-export const logFilterSelectors = globalizeSelectors(
-  (state: LocalState) => state.logFilter,
-  innerLogFilterSelectors
-);
-
-export const logPositionSelectors = globalizeSelectors(
-  (state: LocalState) => state.logPosition,
-  innerLogPositionSelectors
-);
-
 export const waffleFilterSelectors = globalizeSelectors(
   (state: LocalState) => state.waffleFilter,
   innerWaffleFilterSelectors
diff --git a/x-pack/legacy/plugins/infra/public/store/local/waffle_options/actions.ts b/x-pack/legacy/plugins/infra/public/store/local/waffle_options/actions.ts
index 95511c785ffed..d72e9e05f2aea 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/waffle_options/actions.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/waffle_options/actions.ts
@@ -21,3 +21,5 @@ export const changeNodeType = actionCreator<InfraNodeType>('CHANGE_NODE_TYPE');
 export const changeView = actionCreator<string>('CHANGE_VIEW');
 export const changeBoundsOverride = actionCreator<InfraWaffleMapBounds>('CHANGE_BOUNDS_OVERRIDE');
 export const changeAutoBounds = actionCreator<boolean>('CHANGE_AUTO_BOUNDS');
+export const changeAccount = actionCreator<string>('CHANGE_ACCOUNT');
+export const changeRegion = actionCreator<string>('CHANGE_REGION');
diff --git a/x-pack/legacy/plugins/infra/public/store/local/waffle_options/reducer.ts b/x-pack/legacy/plugins/infra/public/store/local/waffle_options/reducer.ts
index a995de6a263e8..a8aa91695b3a5 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/waffle_options/reducer.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/waffle_options/reducer.ts
@@ -22,6 +22,8 @@ import {
   changeMetric,
   changeNodeType,
   changeView,
+  changeAccount,
+  changeRegion,
 } from './actions';
 
 export interface WaffleOptionsState {
@@ -32,6 +34,8 @@ export interface WaffleOptionsState {
   customOptions: InfraGroupByOptions[];
   boundsOverride: InfraWaffleMapBounds;
   autoBounds: boolean;
+  accountId: string;
+  region: string;
 }
 
 export const initialWaffleOptionsState: WaffleOptionsState = {
@@ -42,6 +46,8 @@ export const initialWaffleOptionsState: WaffleOptionsState = {
   customOptions: [],
   boundsOverride: { max: 1, min: 0 },
   autoBounds: true,
+  accountId: '',
+  region: '',
 };
 
 const currentMetricReducer = reducerWithInitialState(initialWaffleOptionsState.metric).case(
@@ -77,6 +83,16 @@ const currentAutoBoundsReducer = reducerWithInitialState(initialWaffleOptionsSta
   (current, target) => target
 );
 
+const currentAccountIdReducer = reducerWithInitialState(initialWaffleOptionsState.accountId).case(
+  changeAccount,
+  (current, target) => target
+);
+
+const currentRegionReducer = reducerWithInitialState(initialWaffleOptionsState.region).case(
+  changeRegion,
+  (current, target) => target
+);
+
 export const waffleOptionsReducer = combineReducers<WaffleOptionsState>({
   metric: currentMetricReducer,
   groupBy: currentGroupByReducer,
@@ -85,4 +101,6 @@ export const waffleOptionsReducer = combineReducers<WaffleOptionsState>({
   customOptions: currentCustomOptionsReducer,
   boundsOverride: currentBoundsOverrideReducer,
   autoBounds: currentAutoBoundsReducer,
+  accountId: currentAccountIdReducer,
+  region: currentRegionReducer,
 });
diff --git a/x-pack/legacy/plugins/infra/public/store/local/waffle_options/selector.ts b/x-pack/legacy/plugins/infra/public/store/local/waffle_options/selector.ts
index a556cb277777e..255fbd5ec4266 100644
--- a/x-pack/legacy/plugins/infra/public/store/local/waffle_options/selector.ts
+++ b/x-pack/legacy/plugins/infra/public/store/local/waffle_options/selector.ts
@@ -13,3 +13,5 @@ export const selectNodeType = (state: WaffleOptionsState) => state.nodeType;
 export const selectView = (state: WaffleOptionsState) => state.view;
 export const selectBoundsOverride = (state: WaffleOptionsState) => state.boundsOverride;
 export const selectAutoBounds = (state: WaffleOptionsState) => state.autoBounds;
+export const selectAccountId = (state: WaffleOptionsState) => state.accountId;
+export const selectRegion = (state: WaffleOptionsState) => state.region;
diff --git a/x-pack/legacy/plugins/infra/public/store/selectors.ts b/x-pack/legacy/plugins/infra/public/store/selectors.ts
index aecba1779d036..f4011c232cba4 100644
--- a/x-pack/legacy/plugins/infra/public/store/selectors.ts
+++ b/x-pack/legacy/plugins/infra/public/store/selectors.ts
@@ -6,8 +6,6 @@
 
 import { globalizeSelectors } from '../utils/typed_redux';
 import {
-  logFilterSelectors as localLogFilterSelectors,
-  logPositionSelectors as localLogPositionSelectors,
   waffleFilterSelectors as localWaffleFilterSelectors,
   waffleOptionsSelectors as localWaffleOptionsSelectors,
   waffleTimeSelectors as localWaffleTimeSelectors,
@@ -19,8 +17,6 @@ import { State } from './reducer';
 
 const selectLocal = (state: State) => state.local;
 
-export const logFilterSelectors = globalizeSelectors(selectLocal, localLogFilterSelectors);
-export const logPositionSelectors = globalizeSelectors(selectLocal, localLogPositionSelectors);
 export const waffleFilterSelectors = globalizeSelectors(selectLocal, localWaffleFilterSelectors);
 export const waffleTimeSelectors = globalizeSelectors(selectLocal, localWaffleTimeSelectors);
 export const waffleOptionsSelectors = globalizeSelectors(selectLocal, localWaffleOptionsSelectors);
diff --git a/x-pack/legacy/plugins/infra/public/store/store.ts b/x-pack/legacy/plugins/infra/public/store/store.ts
index 601db0f56a693..cae0622c5e4a1 100644
--- a/x-pack/legacy/plugins/infra/public/store/store.ts
+++ b/x-pack/legacy/plugins/infra/public/store/store.ts
@@ -9,15 +9,7 @@ import { createEpicMiddleware } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import {
-  createRootEpic,
-  initialState,
-  logFilterSelectors,
-  logPositionSelectors,
-  reducer,
-  State,
-  waffleTimeSelectors,
-} from '.';
+import { createRootEpic, initialState, reducer, State, waffleTimeSelectors } from '.';
 import { InfraApolloClient, InfraObservableApi } from '../lib/lib';
 
 declare global {
@@ -37,11 +29,6 @@ export function createStore({ apolloClient, observableApi }: StoreDependencies)
   const middlewareDependencies = {
     postToApi$: observableApi.pipe(map(({ post }) => post)),
     apolloClient$: apolloClient,
-    selectIsAutoReloadingLogEntries: logPositionSelectors.selectIsAutoReloading,
-    selectIsAutoReloadingScrollLocked: logPositionSelectors.selectAutoReloadScrollLock,
-    selectLogFilterQueryAsJson: logFilterSelectors.selectLogFilterQueryAsJson,
-    selectLogTargetPosition: logPositionSelectors.selectTargetPosition,
-    selectVisibleLogMidpointOrTarget: logPositionSelectors.selectVisibleMidpointOrTarget,
     selectWaffleTimeUpdatePolicyInterval: waffleTimeSelectors.selectTimeUpdatePolicyInterval,
   };
 
diff --git a/x-pack/legacy/plugins/infra/public/utils/convert_interval_to_string.ts b/x-pack/legacy/plugins/infra/public/utils/convert_interval_to_string.ts
new file mode 100644
index 0000000000000..a125360235755
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/public/utils/convert_interval_to_string.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 dateMath from '@elastic/datemath';
+import moment from 'moment';
+import { i18n } from '@kbn/i18n';
+import * as rt from 'io-ts';
+
+export const INTERVAL_STRING_RE = new RegExp(`^([\\d\\.]+)\\s*(${dateMath.units.join('|')})$`);
+
+export const parseInterval = (intervalString: string) => {
+  if (intervalString) {
+    const matches = intervalString.match(INTERVAL_STRING_RE);
+    if (matches) {
+      const value = Number(matches[1]);
+      const unit = matches[2];
+      return { value, unit };
+    }
+  }
+  throw new Error(
+    i18n.translate('xpack.infra.parseInterval.errorMessage', {
+      defaultMessage: '{value} is not an interval string',
+      values: {
+        value: intervalString,
+      },
+    })
+  );
+};
+
+const ValidUnitRT = rt.keyof({
+  seconds: null,
+  minutes: null,
+  hours: null,
+  days: null,
+  weeks: null,
+  months: null,
+  years: null,
+});
+type ValidUnit = rt.TypeOf<typeof ValidUnitRT>;
+const UNITS = ['seconds', 'minutes', 'hours', 'days', 'weeks', 'months', 'years'] as ValidUnit[];
+
+const DISPLAY_STRINGS_FOR_UNITS_PLURAL = {
+  seconds: i18n.translate('xpack.infra.durationUnits.seconds.plural', {
+    defaultMessage: 'seconds',
+  }),
+  minutes: i18n.translate('xpack.infra.durationUnits.minutes.plural', {
+    defaultMessage: 'minutes',
+  }),
+  hours: i18n.translate('xpack.infra.durationUnits.hours.plural', {
+    defaultMessage: 'hours',
+  }),
+  days: i18n.translate('xpack.infra.durationUnits.days.plural', {
+    defaultMessage: 'days',
+  }),
+  weeks: i18n.translate('xpack.infra.durationUnits.weeks.plural', {
+    defaultMessage: 'weeks',
+  }),
+  months: i18n.translate('xpack.infra.durationUnits.months.plural', {
+    defaultMessage: 'months',
+  }),
+  years: i18n.translate('xpack.infra.durationUnits.years.plural', {
+    defaultMessage: 'years',
+  }),
+};
+
+const DISPLAY_STRINGS_FOR_UNITS_SINGULAR = {
+  seconds: i18n.translate('xpack.infra.durationUnits.seconds.singular', {
+    defaultMessage: 'second',
+  }),
+  minutes: i18n.translate('xpack.infra.durationUnits.minutes.singular', {
+    defaultMessage: 'minute',
+  }),
+  hours: i18n.translate('xpack.infra.durationUnits.hours.singular', {
+    defaultMessage: 'hour',
+  }),
+  days: i18n.translate('xpack.infra.durationUnits.days.singular', {
+    defaultMessage: 'day',
+  }),
+  weeks: i18n.translate('xpack.infra.durationUnits.weeks.singular', {
+    defaultMessage: 'week',
+  }),
+  months: i18n.translate('xpack.infra.durationUnits.months.singular', {
+    defaultMessage: 'month',
+  }),
+  years: i18n.translate('xpack.infra.durationUnits.years.singular', {
+    defaultMessage: 'year',
+  }),
+};
+
+const getDisplayableUnit = (value: number, unit: ValidUnit) => {
+  return Math.floor(value) === 1
+    ? DISPLAY_STRINGS_FOR_UNITS_SINGULAR[unit]
+    : DISPLAY_STRINGS_FOR_UNITS_PLURAL[unit];
+};
+
+export const convertIntervalToString = (input: string) => {
+  const interval = parseInterval(input);
+  if (interval?.unit === 's') {
+    const duration = moment.duration(interval.value, interval.unit);
+    const targetUnit = UNITS.reduce((answer, unit) => {
+      if (duration.as(unit) >= 1) {
+        return unit;
+      }
+      return answer;
+    }, 'seconds');
+    const durationAsUnit = duration.as(targetUnit);
+    return `${Math.floor(durationAsUnit)} ${getDisplayableUnit(durationAsUnit, targetUnit)}`;
+  }
+};
diff --git a/x-pack/legacy/plugins/infra/public/utils/fixtures/metrics_explorer.ts b/x-pack/legacy/plugins/infra/public/utils/fixtures/metrics_explorer.ts
index d553f03c4ed34..3d5198f2d379b 100644
--- a/x-pack/legacy/plugins/infra/public/utils/fixtures/metrics_explorer.ts
+++ b/x-pack/legacy/plugins/infra/public/utils/fixtures/metrics_explorer.ts
@@ -5,10 +5,8 @@
  */
 
 import {
-  MetricsExplorerAggregation,
   MetricsExplorerResponse,
   MetricsExplorerSeries,
-  MetricsExplorerColumnType,
 } from '../../../server/routes/metrics_explorer/types';
 import {
   MetricsExplorerOptions,
@@ -21,8 +19,8 @@ import {
 export const options: MetricsExplorerOptions = {
   limit: 3,
   groupBy: 'host.name',
-  aggregation: MetricsExplorerAggregation.avg,
-  metrics: [{ aggregation: MetricsExplorerAggregation.avg, field: 'system.cpu.user.pct' }],
+  aggregation: 'avg',
+  metrics: [{ aggregation: 'avg', field: 'system.cpu.user.pct' }],
 };
 
 export const source = {
@@ -58,9 +56,9 @@ export const timeRange: MetricsExplorerTimeOptions = {
 export const createSeries = (id: string): MetricsExplorerSeries => ({
   id,
   columns: [
-    { name: 'timestamp', type: MetricsExplorerColumnType.date },
-    { name: 'metric_0', type: MetricsExplorerColumnType.number },
-    { name: 'groupBy', type: MetricsExplorerColumnType.string },
+    { name: 'timestamp', type: 'date' },
+    { name: 'metric_0', type: 'number' },
+    { name: 'groupBy', type: 'string' },
   ],
   rows: [
     { timestamp: 1, metric_0: 0.5, groupBy: id },
diff --git a/x-pack/legacy/plugins/infra/public/utils/is_displayable.ts b/x-pack/legacy/plugins/infra/public/utils/is_displayable.ts
index 6af6bce315599..534282e807036 100644
--- a/x-pack/legacy/plugins/infra/public/utils/is_displayable.ts
+++ b/x-pack/legacy/plugins/infra/public/utils/is_displayable.ts
@@ -4,11 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { FieldType } from 'ui/index_patterns';
+import { IFieldType } from 'src/plugins/data/public';
 import { startsWith, uniq } from 'lodash';
 import { getAllowedListForPrefix } from '../../common/ecs_allowed_list';
 
-interface DisplayableFieldType extends FieldType {
+interface DisplayableFieldType extends IFieldType {
   displayable?: boolean;
 }
 
diff --git a/x-pack/legacy/plugins/infra/public/utils/use_kibana_ui_setting.ts b/x-pack/legacy/plugins/infra/public/utils/use_kibana_ui_setting.ts
index 1b08fb4231243..ce39a31c0fc3f 100644
--- a/x-pack/legacy/plugins/infra/public/utils/use_kibana_ui_setting.ts
+++ b/x-pack/legacy/plugins/infra/public/utils/use_kibana_ui_setting.ts
@@ -7,7 +7,7 @@
 import { useCallback, useMemo } from 'react';
 
 import { npSetup } from 'ui/new_platform';
-import { useObservable } from './use_observable';
+import useObservable from 'react-use/lib/useObservable';
 
 /**
  * This hook behaves like a `useState` hook in that it provides a requested
diff --git a/x-pack/legacy/plugins/infra/public/utils/use_observable.ts b/x-pack/legacy/plugins/infra/public/utils/use_observable.ts
deleted file mode 100644
index 536b6b2723ae0..0000000000000
--- a/x-pack/legacy/plugins/infra/public/utils/use_observable.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 { useEffect, useState } from 'react';
-import { Observable } from 'rxjs';
-
-export function useObservable<T>(observable$: Observable<T>): T | undefined;
-export function useObservable<T>(observable$: Observable<T>, initialValue: T): T;
-export function useObservable<T>(observable$: Observable<T>, initialValue?: T): T | undefined {
-  const [value, update] = useState<T | undefined>(initialValue);
-
-  useEffect(() => {
-    const s = observable$.subscribe(update);
-    return () => s.unsubscribe();
-  }, [observable$]);
-
-  return value;
-}
diff --git a/x-pack/legacy/plugins/infra/server/graphql/log_entries/resolvers.ts b/x-pack/legacy/plugins/infra/server/graphql/log_entries/resolvers.ts
index b97b482d8424d..edbb736b2c4fd 100644
--- a/x-pack/legacy/plugins/infra/server/graphql/log_entries/resolvers.ts
+++ b/x-pack/legacy/plugins/infra/server/graphql/log_entries/resolvers.ts
@@ -4,11 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { failure } from 'io-ts/lib/PathReporter';
-
-import { pipe } from 'fp-ts/lib/pipeable';
-import { fold } from 'fp-ts/lib/Either';
-import { identity } from 'fp-ts/lib/function';
 import {
   InfraLogEntryColumn,
   InfraLogEntryFieldColumn,
@@ -20,8 +15,6 @@ import {
   InfraSourceResolvers,
 } from '../../graphql/types';
 import { InfraLogEntriesDomain } from '../../lib/domains/log_entries_domain';
-import { SourceConfigurationRuntimeType } from '../../lib/sources';
-import { UsageCollector } from '../../usage/usage_collector';
 import { parseFilterQuery } from '../../utils/serialized_query';
 import { ChildResolverOf, InfraResolverOf } from '../../utils/typed_resolvers';
 import { QuerySourceResolver } from '../sources/resolvers';
@@ -41,21 +34,6 @@ export type InfraSourceLogEntryHighlightsResolver = ChildResolverOf<
   QuerySourceResolver
 >;
 
-export type InfraSourceLogSummaryBetweenResolver = ChildResolverOf<
-  InfraResolverOf<InfraSourceResolvers.LogSummaryBetweenResolver>,
-  QuerySourceResolver
->;
-
-export type InfraSourceLogSummaryHighlightsBetweenResolver = ChildResolverOf<
-  InfraResolverOf<InfraSourceResolvers.LogSummaryHighlightsBetweenResolver>,
-  QuerySourceResolver
->;
-
-export type InfraSourceLogItem = ChildResolverOf<
-  InfraResolverOf<InfraSourceResolvers.LogItemResolver>,
-  QuerySourceResolver
->;
-
 export const createLogEntriesResolvers = (libs: {
   logEntries: InfraLogEntriesDomain;
 }): {
@@ -63,9 +41,6 @@ export const createLogEntriesResolvers = (libs: {
     logEntriesAround: InfraSourceLogEntriesAroundResolver;
     logEntriesBetween: InfraSourceLogEntriesBetweenResolver;
     logEntryHighlights: InfraSourceLogEntryHighlightsResolver;
-    logSummaryBetween: InfraSourceLogSummaryBetweenResolver;
-    logSummaryHighlightsBetween: InfraSourceLogSummaryHighlightsBetweenResolver;
-    logItem: InfraSourceLogItem;
   };
   InfraLogEntryColumn: {
     __resolveType(
@@ -150,50 +125,6 @@ export const createLogEntriesResolvers = (libs: {
         entries,
       }));
     },
-    async logSummaryBetween(source, args, { req }) {
-      UsageCollector.countLogs();
-      const buckets = await libs.logEntries.getLogSummaryBucketsBetween(
-        req,
-        source.id,
-        args.start,
-        args.end,
-        args.bucketSize,
-        parseFilterQuery(args.filterQuery)
-      );
-
-      return {
-        start: buckets.length > 0 ? buckets[0].start : null,
-        end: buckets.length > 0 ? buckets[buckets.length - 1].end : null,
-        buckets,
-      };
-    },
-    async logSummaryHighlightsBetween(source, args, { req }) {
-      const summaryHighlightSets = await libs.logEntries.getLogSummaryHighlightBucketsBetween(
-        req,
-        source.id,
-        args.start,
-        args.end,
-        args.bucketSize,
-        args.highlightQueries.filter(highlightQuery => !!highlightQuery),
-        parseFilterQuery(args.filterQuery)
-      );
-
-      return summaryHighlightSets.map(buckets => ({
-        start: buckets.length > 0 ? buckets[0].start : null,
-        end: buckets.length > 0 ? buckets[buckets.length - 1].end : null,
-        buckets,
-      }));
-    },
-    async logItem(source, args, { req }) {
-      const sourceConfiguration = pipe(
-        SourceConfigurationRuntimeType.decode(source.configuration),
-        fold(errors => {
-          throw new Error(failure(errors).join('\n'));
-        }, identity)
-      );
-
-      return await libs.logEntries.getLogItem(req, args.id, sourceConfiguration);
-    },
   },
   InfraLogEntryColumn: {
     __resolveType(logEntryColumn) {
diff --git a/x-pack/legacy/plugins/infra/server/graphql/log_entries/schema.gql.ts b/x-pack/legacy/plugins/infra/server/graphql/log_entries/schema.gql.ts
index 0ef896e8edfa4..945f2f85435e5 100644
--- a/x-pack/legacy/plugins/infra/server/graphql/log_entries/schema.gql.ts
+++ b/x-pack/legacy/plugins/infra/server/graphql/log_entries/schema.gql.ts
@@ -82,28 +82,6 @@ export const logEntriesSchema = gql`
     countAfter: Int!
   }
 
-  "A log summary bucket"
-  type InfraLogSummaryBucket {
-    "The start timestamp of the bucket"
-    start: Float!
-    "The end timestamp of the bucket"
-    end: Float!
-    "The number of entries inside the bucket"
-    entriesCount: Int!
-  }
-
-  "A log summary highlight bucket"
-  type InfraLogSummaryHighlightBucket {
-    "The start timestamp of the bucket"
-    start: Float!
-    "The end timestamp of the bucket"
-    end: Float!
-    "The number of highlighted entries inside the bucket"
-    entriesCount: Int!
-    "The time key of a representative of the highlighted log entries in this bucket"
-    representativeKey: InfraTimeKey!
-  }
-
   "A consecutive sequence of log entries"
   type InfraLogEntryInterval {
     "The key corresponding to the start of the interval covered by the entries"
@@ -122,50 +100,6 @@ export const logEntriesSchema = gql`
     entries: [InfraLogEntry!]!
   }
 
-  "A consecutive sequence of log summary buckets"
-  type InfraLogSummaryInterval {
-    "The millisecond timestamp corresponding to the start of the interval covered by the summary"
-    start: Float
-    "The millisecond timestamp corresponding to the end of the interval covered by the summary"
-    end: Float
-    "The query the log entries were filtered by"
-    filterQuery: String
-    "A list of the log entries"
-    buckets: [InfraLogSummaryBucket!]!
-  }
-
-  "A consecutive sequence of log summary highlight buckets"
-  type InfraLogSummaryHighlightInterval {
-    "The millisecond timestamp corresponding to the start of the interval covered by the summary"
-    start: Float
-    "The millisecond timestamp corresponding to the end of the interval covered by the summary"
-    end: Float
-    "The query the log entries were filtered by"
-    filterQuery: String
-    "The query the log entries were highlighted with"
-    highlightQuery: String
-    "A list of the log entries"
-    buckets: [InfraLogSummaryHighlightBucket!]!
-  }
-
-  type InfraLogItemField {
-    "The flattened field name"
-    field: String!
-    "The value for the Field as a string"
-    value: String!
-  }
-
-  type InfraLogItem {
-    "The ID of the document"
-    id: ID!
-    "The index where the document was found"
-    index: String!
-    "Time key for the document - derived from the source configuration timestamp and tiebreaker settings"
-    key: InfraTimeKey!
-    "An array of flattened fields and values"
-    fields: [InfraLogItemField!]!
-  }
-
   extend type InfraSource {
     "A consecutive span of log entries surrounding a point in time"
     logEntriesAround(
@@ -198,30 +132,5 @@ export const logEntriesSchema = gql`
       "The highlighting to apply to the log entries"
       highlights: [InfraLogEntryHighlightInput!]!
     ): [InfraLogEntryInterval!]!
-    "A consecutive span of summary buckets within an interval"
-    logSummaryBetween(
-      "The millisecond timestamp that corresponds to the start of the interval"
-      start: Float!
-      "The millisecond timestamp that corresponds to the end of the interval"
-      end: Float!
-      "The size of each bucket in milliseconds"
-      bucketSize: Float!
-      "The query to filter the log entries by"
-      filterQuery: String
-    ): InfraLogSummaryInterval!
-    "Spans of summary highlight buckets within an interval"
-    logSummaryHighlightsBetween(
-      "The millisecond timestamp that corresponds to the start of the interval"
-      start: Float!
-      "The millisecond timestamp that corresponds to the end of the interval"
-      end: Float!
-      "The size of each bucket in milliseconds"
-      bucketSize: Float!
-      "The query to filter the log entries by"
-      filterQuery: String
-      "The highlighting to apply to the log entries"
-      highlightQueries: [String!]!
-    ): [InfraLogSummaryHighlightInterval!]!
-    logItem(id: ID!): InfraLogItem!
   }
 `;
diff --git a/x-pack/legacy/plugins/infra/server/graphql/types.ts b/x-pack/legacy/plugins/infra/server/graphql/types.ts
index 88ad5b2f58f23..1d6b03ac7bffb 100644
--- a/x-pack/legacy/plugins/infra/server/graphql/types.ts
+++ b/x-pack/legacy/plugins/infra/server/graphql/types.ts
@@ -62,12 +62,7 @@ export interface InfraSource {
   logEntriesBetween: InfraLogEntryInterval;
   /** Sequences of log entries matching sets of highlighting queries within an interval */
   logEntryHighlights: InfraLogEntryInterval[];
-  /** A consecutive span of summary buckets within an interval */
-  logSummaryBetween: InfraLogSummaryInterval;
-  /** Spans of summary highlight buckets within an interval */
-  logSummaryHighlightsBetween: InfraLogSummaryHighlightInterval[];
 
-  logItem: InfraLogItem;
   /** A snapshot of nodes */
   snapshot?: InfraSnapshotResponse | null;
 
@@ -236,68 +231,6 @@ export interface InfraLogEntryFieldColumn {
   /** A list of highlighted substrings of the value */
   highlights: string[];
 }
-/** A consecutive sequence of log summary buckets */
-export interface InfraLogSummaryInterval {
-  /** The millisecond timestamp corresponding to the start of the interval covered by the summary */
-  start?: number | null;
-  /** The millisecond timestamp corresponding to the end of the interval covered by the summary */
-  end?: number | null;
-  /** The query the log entries were filtered by */
-  filterQuery?: string | null;
-  /** A list of the log entries */
-  buckets: InfraLogSummaryBucket[];
-}
-/** A log summary bucket */
-export interface InfraLogSummaryBucket {
-  /** The start timestamp of the bucket */
-  start: number;
-  /** The end timestamp of the bucket */
-  end: number;
-  /** The number of entries inside the bucket */
-  entriesCount: number;
-}
-/** A consecutive sequence of log summary highlight buckets */
-export interface InfraLogSummaryHighlightInterval {
-  /** The millisecond timestamp corresponding to the start of the interval covered by the summary */
-  start?: number | null;
-  /** The millisecond timestamp corresponding to the end of the interval covered by the summary */
-  end?: number | null;
-  /** The query the log entries were filtered by */
-  filterQuery?: string | null;
-  /** The query the log entries were highlighted with */
-  highlightQuery?: string | null;
-  /** A list of the log entries */
-  buckets: InfraLogSummaryHighlightBucket[];
-}
-/** A log summary highlight bucket */
-export interface InfraLogSummaryHighlightBucket {
-  /** The start timestamp of the bucket */
-  start: number;
-  /** The end timestamp of the bucket */
-  end: number;
-  /** The number of highlighted entries inside the bucket */
-  entriesCount: number;
-  /** The time key of a representative of the highlighted log entries in this bucket */
-  representativeKey: InfraTimeKey;
-}
-
-export interface InfraLogItem {
-  /** The ID of the document */
-  id: string;
-  /** The index where the document was found */
-  index: string;
-  /** Time key for the document - derived from the source configuration timestamp and tiebreaker settings */
-  key: InfraTimeKey;
-  /** An array of flattened fields and values */
-  fields: InfraLogItemField[];
-}
-
-export interface InfraLogItemField {
-  /** The flattened field name */
-  field: string;
-  /** The value for the Field as a string */
-  value: string;
-}
 
 export interface InfraSnapshotResponse {
   /** Nodes of type host, container or pod grouped by 0, 1 or 2 terms */
@@ -500,31 +433,6 @@ export interface LogEntryHighlightsInfraSourceArgs {
   /** The highlighting to apply to the log entries */
   highlights: InfraLogEntryHighlightInput[];
 }
-export interface LogSummaryBetweenInfraSourceArgs {
-  /** The millisecond timestamp that corresponds to the start of the interval */
-  start: number;
-  /** The millisecond timestamp that corresponds to the end of the interval */
-  end: number;
-  /** The size of each bucket in milliseconds */
-  bucketSize: number;
-  /** The query to filter the log entries by */
-  filterQuery?: string | null;
-}
-export interface LogSummaryHighlightsBetweenInfraSourceArgs {
-  /** The millisecond timestamp that corresponds to the start of the interval */
-  start: number;
-  /** The millisecond timestamp that corresponds to the end of the interval */
-  end: number;
-  /** The size of each bucket in milliseconds */
-  bucketSize: number;
-  /** The query to filter the log entries by */
-  filterQuery?: string | null;
-  /** The highlighting to apply to the log entries */
-  highlightQueries: string[];
-}
-export interface LogItemInfraSourceArgs {
-  id: string;
-}
 export interface SnapshotInfraSourceArgs {
   timerange: InfraTimerangeInput;
 
@@ -583,7 +491,7 @@ export enum InfraNodeType {
   awsEC2 = 'awsEC2',
   awsS3 = 'awsS3',
   awsRDS = 'awsRDS',
-  awsSQS = 'awsSQS'
+  awsSQS = 'awsSQS',
 }
 
 export enum InfraSnapshotMetricType {
@@ -605,7 +513,7 @@ export enum InfraSnapshotMetricType {
   rdsQueriesExecuted = 'rdsQueriesExecuted',
   rdsActiveTransactions = 'rdsActiveTransactions',
   rdsLatency = 'rdsLatency',
-  sqsMessagesVisible = 'sqsOldestMessage',
+  sqsMessagesVisible = 'sqsMessagesVisible',
   sqsMessagesDelayed = 'sqsMessagesDelayed',
   sqsMessagesSent = 'sqsMessagesSent',
   sqsMessagesEmpty = 'sqsMessagesEmpty',
@@ -744,16 +652,7 @@ export namespace InfraSourceResolvers {
     logEntriesBetween?: LogEntriesBetweenResolver<InfraLogEntryInterval, TypeParent, Context>;
     /** Sequences of log entries matching sets of highlighting queries within an interval */
     logEntryHighlights?: LogEntryHighlightsResolver<InfraLogEntryInterval[], TypeParent, Context>;
-    /** A consecutive span of summary buckets within an interval */
-    logSummaryBetween?: LogSummaryBetweenResolver<InfraLogSummaryInterval, TypeParent, Context>;
-    /** Spans of summary highlight buckets within an interval */
-    logSummaryHighlightsBetween?: LogSummaryHighlightsBetweenResolver<
-      InfraLogSummaryHighlightInterval[],
-      TypeParent,
-      Context
-    >;
 
-    logItem?: LogItemResolver<InfraLogItem, TypeParent, Context>;
     /** A snapshot of nodes */
     snapshot?: SnapshotResolver<InfraSnapshotResponse | null, TypeParent, Context>;
 
@@ -836,49 +735,6 @@ export namespace InfraSourceResolvers {
     highlights: InfraLogEntryHighlightInput[];
   }
 
-  export type LogSummaryBetweenResolver<
-    R = InfraLogSummaryInterval,
-    Parent = InfraSource,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context, LogSummaryBetweenArgs>;
-  export interface LogSummaryBetweenArgs {
-    /** The millisecond timestamp that corresponds to the start of the interval */
-    start: number;
-    /** The millisecond timestamp that corresponds to the end of the interval */
-    end: number;
-    /** The size of each bucket in milliseconds */
-    bucketSize: number;
-    /** The query to filter the log entries by */
-    filterQuery?: string | null;
-  }
-
-  export type LogSummaryHighlightsBetweenResolver<
-    R = InfraLogSummaryHighlightInterval[],
-    Parent = InfraSource,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context, LogSummaryHighlightsBetweenArgs>;
-  export interface LogSummaryHighlightsBetweenArgs {
-    /** The millisecond timestamp that corresponds to the start of the interval */
-    start: number;
-    /** The millisecond timestamp that corresponds to the end of the interval */
-    end: number;
-    /** The size of each bucket in milliseconds */
-    bucketSize: number;
-    /** The query to filter the log entries by */
-    filterQuery?: string | null;
-    /** The highlighting to apply to the log entries */
-    highlightQueries: string[];
-  }
-
-  export type LogItemResolver<
-    R = InfraLogItem,
-    Parent = InfraSource,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context, LogItemArgs>;
-  export interface LogItemArgs {
-    id: string;
-  }
-
   export type SnapshotResolver<
     R = InfraSnapshotResponse | null,
     Parent = InfraSource,
@@ -1422,199 +1278,6 @@ export namespace InfraLogEntryFieldColumnResolvers {
     Context = InfraContext
   > = Resolver<R, Parent, Context>;
 }
-/** A consecutive sequence of log summary buckets */
-export namespace InfraLogSummaryIntervalResolvers {
-  export interface Resolvers<Context = InfraContext, TypeParent = InfraLogSummaryInterval> {
-    /** The millisecond timestamp corresponding to the start of the interval covered by the summary */
-    start?: StartResolver<number | null, TypeParent, Context>;
-    /** The millisecond timestamp corresponding to the end of the interval covered by the summary */
-    end?: EndResolver<number | null, TypeParent, Context>;
-    /** The query the log entries were filtered by */
-    filterQuery?: FilterQueryResolver<string | null, TypeParent, Context>;
-    /** A list of the log entries */
-    buckets?: BucketsResolver<InfraLogSummaryBucket[], TypeParent, Context>;
-  }
-
-  export type StartResolver<
-    R = number | null,
-    Parent = InfraLogSummaryInterval,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type EndResolver<
-    R = number | null,
-    Parent = InfraLogSummaryInterval,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type FilterQueryResolver<
-    R = string | null,
-    Parent = InfraLogSummaryInterval,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type BucketsResolver<
-    R = InfraLogSummaryBucket[],
-    Parent = InfraLogSummaryInterval,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-}
-/** A log summary bucket */
-export namespace InfraLogSummaryBucketResolvers {
-  export interface Resolvers<Context = InfraContext, TypeParent = InfraLogSummaryBucket> {
-    /** The start timestamp of the bucket */
-    start?: StartResolver<number, TypeParent, Context>;
-    /** The end timestamp of the bucket */
-    end?: EndResolver<number, TypeParent, Context>;
-    /** The number of entries inside the bucket */
-    entriesCount?: EntriesCountResolver<number, TypeParent, Context>;
-  }
-
-  export type StartResolver<
-    R = number,
-    Parent = InfraLogSummaryBucket,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type EndResolver<
-    R = number,
-    Parent = InfraLogSummaryBucket,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type EntriesCountResolver<
-    R = number,
-    Parent = InfraLogSummaryBucket,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-}
-/** A consecutive sequence of log summary highlight buckets */
-export namespace InfraLogSummaryHighlightIntervalResolvers {
-  export interface Resolvers<
-    Context = InfraContext,
-    TypeParent = InfraLogSummaryHighlightInterval
-  > {
-    /** The millisecond timestamp corresponding to the start of the interval covered by the summary */
-    start?: StartResolver<number | null, TypeParent, Context>;
-    /** The millisecond timestamp corresponding to the end of the interval covered by the summary */
-    end?: EndResolver<number | null, TypeParent, Context>;
-    /** The query the log entries were filtered by */
-    filterQuery?: FilterQueryResolver<string | null, TypeParent, Context>;
-    /** The query the log entries were highlighted with */
-    highlightQuery?: HighlightQueryResolver<string | null, TypeParent, Context>;
-    /** A list of the log entries */
-    buckets?: BucketsResolver<InfraLogSummaryHighlightBucket[], TypeParent, Context>;
-  }
-
-  export type StartResolver<
-    R = number | null,
-    Parent = InfraLogSummaryHighlightInterval,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type EndResolver<
-    R = number | null,
-    Parent = InfraLogSummaryHighlightInterval,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type FilterQueryResolver<
-    R = string | null,
-    Parent = InfraLogSummaryHighlightInterval,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type HighlightQueryResolver<
-    R = string | null,
-    Parent = InfraLogSummaryHighlightInterval,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type BucketsResolver<
-    R = InfraLogSummaryHighlightBucket[],
-    Parent = InfraLogSummaryHighlightInterval,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-}
-/** A log summary highlight bucket */
-export namespace InfraLogSummaryHighlightBucketResolvers {
-  export interface Resolvers<Context = InfraContext, TypeParent = InfraLogSummaryHighlightBucket> {
-    /** The start timestamp of the bucket */
-    start?: StartResolver<number, TypeParent, Context>;
-    /** The end timestamp of the bucket */
-    end?: EndResolver<number, TypeParent, Context>;
-    /** The number of highlighted entries inside the bucket */
-    entriesCount?: EntriesCountResolver<number, TypeParent, Context>;
-    /** The time key of a representative of the highlighted log entries in this bucket */
-    representativeKey?: RepresentativeKeyResolver<InfraTimeKey, TypeParent, Context>;
-  }
-
-  export type StartResolver<
-    R = number,
-    Parent = InfraLogSummaryHighlightBucket,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type EndResolver<
-    R = number,
-    Parent = InfraLogSummaryHighlightBucket,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type EntriesCountResolver<
-    R = number,
-    Parent = InfraLogSummaryHighlightBucket,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type RepresentativeKeyResolver<
-    R = InfraTimeKey,
-    Parent = InfraLogSummaryHighlightBucket,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-}
-
-export namespace InfraLogItemResolvers {
-  export interface Resolvers<Context = InfraContext, TypeParent = InfraLogItem> {
-    /** The ID of the document */
-    id?: IdResolver<string, TypeParent, Context>;
-    /** The index where the document was found */
-    index?: IndexResolver<string, TypeParent, Context>;
-    /** Time key for the document - derived from the source configuration timestamp and tiebreaker settings */
-    key?: KeyResolver<InfraTimeKey, TypeParent, Context>;
-    /** An array of flattened fields and values */
-    fields?: FieldsResolver<InfraLogItemField[], TypeParent, Context>;
-  }
-
-  export type IdResolver<R = string, Parent = InfraLogItem, Context = InfraContext> = Resolver<
-    R,
-    Parent,
-    Context
-  >;
-  export type IndexResolver<R = string, Parent = InfraLogItem, Context = InfraContext> = Resolver<
-    R,
-    Parent,
-    Context
-  >;
-  export type KeyResolver<
-    R = InfraTimeKey,
-    Parent = InfraLogItem,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type FieldsResolver<
-    R = InfraLogItemField[],
-    Parent = InfraLogItem,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-}
-
-export namespace InfraLogItemFieldResolvers {
-  export interface Resolvers<Context = InfraContext, TypeParent = InfraLogItemField> {
-    /** The flattened field name */
-    field?: FieldResolver<string, TypeParent, Context>;
-    /** The value for the Field as a string */
-    value?: ValueResolver<string, TypeParent, Context>;
-  }
-
-  export type FieldResolver<
-    R = string,
-    Parent = InfraLogItemField,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-  export type ValueResolver<
-    R = string,
-    Parent = InfraLogItemField,
-    Context = InfraContext
-  > = Resolver<R, Parent, Context>;
-}
 
 export namespace InfraSnapshotResponseResolvers {
   export interface Resolvers<Context = InfraContext, TypeParent = InfraSnapshotResponse> {
diff --git a/x-pack/legacy/plugins/infra/server/infra_server.ts b/x-pack/legacy/plugins/infra/server/infra_server.ts
index e0c8f607daa93..f99589e1b52bd 100644
--- a/x-pack/legacy/plugins/infra/server/infra_server.ts
+++ b/x-pack/legacy/plugins/infra/server/infra_server.ts
@@ -19,6 +19,14 @@ import { initMetricExplorerRoute } from './routes/metrics_explorer';
 import { initMetadataRoute } from './routes/metadata';
 import { initSnapshotRoute } from './routes/snapshot';
 import { initNodeDetailsRoute } from './routes/node_details';
+import {
+  initLogEntriesRoute,
+  initLogEntriesHighlightsRoute,
+  initLogEntriesSummaryRoute,
+  initLogEntriesSummaryHighlightsRoute,
+  initLogEntriesItemRoute,
+} from './routes/log_entries';
+import { initInventoryMetaRoute } from './routes/inventory_metadata';
 
 export const initInfraServer = (libs: InfraBackendLibs) => {
   const schema = makeExecutableSchema({
@@ -37,6 +45,12 @@ export const initInfraServer = (libs: InfraBackendLibs) => {
   initSnapshotRoute(libs);
   initNodeDetailsRoute(libs);
   initValidateLogAnalysisIndicesRoute(libs);
+  initLogEntriesRoute(libs);
+  initLogEntriesHighlightsRoute(libs);
+  initLogEntriesSummaryRoute(libs);
+  initLogEntriesSummaryHighlightsRoute(libs);
+  initLogEntriesItemRoute(libs);
   initMetricExplorerRoute(libs);
   initMetadataRoute(libs);
+  initInventoryMetaRoute(libs);
 };
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/framework/adapter_types.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/framework/adapter_types.ts
index a0fd6d3e951bf..b14536275cec3 100644
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/adapters/framework/adapter_types.ts
@@ -6,24 +6,25 @@
 
 import { SearchResponse, GenericParams } from 'elasticsearch';
 import { Lifecycle } from 'hapi';
-import { ObjectType } from '@kbn/config-schema';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { RouteMethod, RouteConfig } from '../../../../../../../../src/core/server';
+import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
+import { SpacesPluginSetup } from '../../../../../../../plugins/spaces/server';
+import { VisTypeTimeseriesSetup } from '../../../../../../../../src/plugins/vis_type_timeseries/server';
 import { APMPluginContract } from '../../../../../../../plugins/apm/server';
+import { HomeServerPluginSetup } from '../../../../../../../../src/plugins/home/server';
 
 // NP_TODO: Compose real types from plugins we depend on, no "any"
 export interface InfraServerPluginDeps {
+  home: HomeServerPluginSetup;
+  spaces: SpacesPluginSetup;
   usageCollection: UsageCollectionSetup;
-  spaces: any;
-  metrics: {
-    getVisData: any;
-  };
+  metrics: VisTypeTimeseriesSetup;
   indexPatterns: {
     indexPatternsServiceFactory: any;
   };
-  features: any;
+  features: FeaturesPluginSetup;
   apm: APMPluginContract;
-  ___legacy: any;
 }
 
 export interface CallWithRequestParams extends GenericParams {
@@ -166,11 +167,6 @@ export interface InfraTSVBSeries {
 
 export type InfraTSVBDataPoint = [number, number];
 
-export type InfraRouteConfig<
-  params extends ObjectType,
-  query extends ObjectType,
-  body extends ObjectType,
-  method extends RouteMethod
-> = {
+export type InfraRouteConfig<params, query, body, method extends RouteMethod> = {
   method: RouteMethod;
 } & RouteConfig<params, query, body, method>;
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
index 19121d92f02c9..4409667d8390a 100644
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -10,7 +10,7 @@ import { GenericParams } from 'elasticsearch';
 import { GraphQLSchema } from 'graphql';
 import { Legacy } from 'kibana';
 import { runHttpQuery } from 'apollo-server-core';
-import { schema, TypeOf, ObjectType } from '@kbn/config-schema';
+import { schema, TypeOf } from '@kbn/config-schema';
 import {
   InfraRouteConfig,
   InfraTSVBResponse,
@@ -36,21 +36,14 @@ import { InfraConfig } from '../../../../../../../plugins/infra/server';
 
 export class KibanaFramework {
   public router: IRouter;
-  private core: CoreSetup;
   public plugins: InfraServerPluginDeps;
 
   constructor(core: CoreSetup, config: InfraConfig, plugins: InfraServerPluginDeps) {
     this.router = core.http.createRouter();
-    this.core = core;
     this.plugins = plugins;
   }
 
-  public registerRoute<
-    params extends ObjectType = any,
-    query extends ObjectType = any,
-    body extends ObjectType = any,
-    method extends RouteMethod = any
-  >(
+  public registerRoute<params = any, query = any, body = any, method extends RouteMethod = any>(
     config: InfraRouteConfig<params, query, body, method>,
     handler: RequestHandler<params, query, body>
   ) {
@@ -147,10 +140,6 @@ export class KibanaFramework {
           headers,
           body: errorBody,
         });
-
-        // NP_TODO: Do we still need to re-throw this error in this case? if we do, can we
-        // still call the response.customError method to control the HTTP response?
-        // throw error;
       }
     }
     this.router.post(routeOptions, handler);
@@ -250,45 +239,21 @@ export class KibanaFramework {
     }
   }
 
-  // NP_TODO: This method needs to no longer require full KibanaRequest
   public async makeTSVBRequest(
-    request: KibanaRequest,
+    requestContext: RequestHandlerContext,
     model: TSVBMetricModel,
     timerange: { min: number; max: number },
-    filters: any[],
-    requestContext: RequestHandlerContext
+    filters: any[]
   ): Promise<InfraTSVBResponse> {
     const { getVisData } = this.plugins.metrics;
     if (typeof getVisData !== 'function') {
       throw new Error('TSVB is not available');
     }
-    const url = this.core.http.basePath.prepend('/api/metrics/vis/data');
-    // For the following request we need a copy of the instnace of the internal request
-    // but modified for our TSVB request. This will ensure all the instance methods
-    // are available along with our overriden values
-    const requestCopy = Object.assign({}, request, {
-      url,
-      method: 'POST',
-      payload: {
-        timerange,
-        panels: [model],
-        filters,
-      },
-      // NP_NOTE: [TSVB_GROUP] Huge hack to make TSVB (getVisData()) work with raw requests that
-      // originate from the New Platform router (and are very different to the old request object).
-      // Once TSVB has migrated over to NP, and can work with the new raw requests, or ideally just
-      // the requestContext, this can be removed.
-      server: {
-        plugins: {
-          elasticsearch: this.plugins.___legacy.tsvb.elasticsearch,
-        },
-        newPlatform: {
-          __internals: this.plugins.___legacy.tsvb.__internals,
-        },
-      },
-      getUiSettingsService: () => requestContext.core.uiSettings.client,
-      getSavedObjectsClient: () => requestContext.core.savedObjects.client,
-    });
-    return getVisData(requestCopy);
+    const options = {
+      timerange,
+      panels: [model],
+      filters,
+    };
+    return getVisData(requestContext, options);
   }
 }
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts
index ec45171baa7b0..b936d79a8edcd 100644
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts
@@ -8,6 +8,7 @@
 
 import { timeMilliseconds } from 'd3-time';
 import * as runtimeTypes from 'io-ts';
+import { compact } from 'lodash';
 import first from 'lodash/fp/first';
 import get from 'lodash/fp/get';
 import has from 'lodash/fp/has';
@@ -17,12 +18,14 @@ import { map, fold } from 'fp-ts/lib/Either';
 import { identity, constant } from 'fp-ts/lib/function';
 import { RequestHandlerContext } from 'src/core/server';
 import { compareTimeKeys, isTimeKey, TimeKey } from '../../../../common/time';
-import { JsonObject } from '../../../../common/typed_json';
+import { JsonObject, JsonValue } from '../../../../common/typed_json';
 import {
   LogEntriesAdapter,
+  LogEntriesParams,
   LogEntryDocument,
   LogEntryQuery,
   LogSummaryBucket,
+  LOG_ENTRIES_PAGE_SIZE,
 } from '../../domains/log_entries_domain';
 import { InfraSourceConfiguration } from '../../sources';
 import { SortedSearchHit } from '../framework';
@@ -82,6 +85,84 @@ export class InfraKibanaLogEntriesAdapter implements LogEntriesAdapter {
     return direction === 'asc' ? documents : documents.reverse();
   }
 
+  public async getLogEntries(
+    requestContext: RequestHandlerContext,
+    sourceConfiguration: InfraSourceConfiguration,
+    fields: string[],
+    params: LogEntriesParams
+  ): Promise<LogEntryDocument[]> {
+    const { startDate, endDate, query, cursor, size, highlightTerm } = params;
+
+    const { sortDirection, searchAfterClause } = processCursor(cursor);
+
+    const highlightQuery = createHighlightQuery(highlightTerm, fields);
+
+    const highlightClause = highlightQuery
+      ? {
+          highlight: {
+            boundary_scanner: 'word',
+            fields: fields.reduce(
+              (highlightFieldConfigs, fieldName) => ({
+                ...highlightFieldConfigs,
+                [fieldName]: {},
+              }),
+              {}
+            ),
+            fragment_size: 1,
+            number_of_fragments: 100,
+            post_tags: [''],
+            pre_tags: [''],
+            highlight_query: highlightQuery,
+          },
+        }
+      : {};
+
+    const sort = {
+      [sourceConfiguration.fields.timestamp]: sortDirection,
+      [sourceConfiguration.fields.tiebreaker]: sortDirection,
+    };
+
+    const esQuery = {
+      allowNoIndices: true,
+      index: sourceConfiguration.logAlias,
+      ignoreUnavailable: true,
+      body: {
+        size: typeof size !== 'undefined' ? size : LOG_ENTRIES_PAGE_SIZE,
+        track_total_hits: false,
+        _source: fields,
+        query: {
+          bool: {
+            filter: [
+              ...createFilterClauses(query, highlightQuery),
+              {
+                range: {
+                  [sourceConfiguration.fields.timestamp]: {
+                    gte: startDate,
+                    lte: endDate,
+                    format: TIMESTAMP_FORMAT,
+                  },
+                },
+              },
+            ],
+          },
+        },
+        sort,
+        ...highlightClause,
+        ...searchAfterClause,
+      },
+    };
+
+    const esResult = await this.framework.callWithRequest<SortedSearchHit>(
+      requestContext,
+      'search',
+      esQuery
+    );
+
+    const hits = sortDirection === 'asc' ? esResult.hits.hits : esResult.hits.hits.reverse();
+    return mapHitsToLogEntryDocuments(hits, sourceConfiguration.fields.timestamp, fields);
+  }
+
+  /** @deprecated */
   public async getContainedLogEntryDocuments(
     requestContext: RequestHandlerContext,
     sourceConfiguration: InfraSourceConfiguration,
@@ -319,6 +400,34 @@ function getLookupIntervals(start: number, direction: 'asc' | 'desc'): Array<[nu
   return intervals;
 }
 
+function mapHitsToLogEntryDocuments(
+  hits: SortedSearchHit[],
+  timestampField: string,
+  fields: string[]
+): LogEntryDocument[] {
+  return hits.map(hit => {
+    const logFields = fields.reduce<{ [fieldName: string]: JsonValue }>(
+      (flattenedFields, field) => {
+        if (has(field, hit._source)) {
+          flattenedFields[field] = get(field, hit._source);
+        }
+        return flattenedFields;
+      },
+      {}
+    );
+
+    return {
+      gid: hit._id,
+      // timestamp: hit._source[timestampField],
+      // FIXME s/key/cursor/g
+      key: { time: hit.sort[0], tiebreaker: hit.sort[1] },
+      fields: logFields,
+      highlights: hit.highlight || {},
+    };
+  });
+}
+
+/** @deprecated */
 const convertHitToLogEntryDocument = (fields: string[]) => (
   hit: SortedSearchHit
 ): LogEntryDocument => ({
@@ -352,9 +461,62 @@ const convertDateRangeBucketToSummaryBucket = (
   })),
 });
 
+const createHighlightQuery = (
+  highlightTerm: string | undefined,
+  fields: string[]
+): LogEntryQuery | undefined => {
+  if (highlightTerm) {
+    return {
+      multi_match: {
+        fields,
+        lenient: true,
+        query: highlightTerm,
+        type: 'phrase',
+      },
+    };
+  }
+};
+
+const createFilterClauses = (
+  filterQuery?: LogEntryQuery,
+  highlightQuery?: LogEntryQuery
+): LogEntryQuery[] => {
+  if (filterQuery && highlightQuery) {
+    return [{ bool: { filter: [filterQuery, highlightQuery] } }];
+  }
+
+  return compact([filterQuery, highlightQuery]) as LogEntryQuery[];
+};
+
 const createQueryFilterClauses = (filterQuery: LogEntryQuery | undefined) =>
   filterQuery ? [filterQuery] : [];
 
+function processCursor(
+  cursor: LogEntriesParams['cursor']
+): {
+  sortDirection: 'asc' | 'desc';
+  searchAfterClause: { search_after?: readonly [number, number] };
+} {
+  if (cursor) {
+    if ('before' in cursor) {
+      return {
+        sortDirection: 'desc',
+        searchAfterClause:
+          cursor.before !== 'last'
+            ? { search_after: [cursor.before.time, cursor.before.tiebreaker] as const }
+            : {},
+      };
+    } else if (cursor.after !== 'first') {
+      return {
+        sortDirection: 'asc',
+        searchAfterClause: { search_after: [cursor.after.time, cursor.after.tiebreaker] as const },
+      };
+    }
+  }
+
+  return { sortDirection: 'asc', searchAfterClause: {} };
+}
+
 const LogSummaryDateRangeBucketRuntimeType = runtimeTypes.intersection([
   runtimeTypes.type({
     doc_count: runtimeTypes.number,
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/adapter_types.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
index acd7a2528bb42..844eaf7604927 100644
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/adapter_types.ts
@@ -28,7 +28,7 @@ export interface InfraMetricsAdapter {
   getMetrics(
     requestContext: RequestHandlerContext,
     options: InfraMetricsRequestOptions,
-    request: KibanaRequest // NP_TODO: temporarily needed until metrics getVisData no longer needs full request
+    request: KibanaRequest
   ): Promise<InfraMetricData[]>;
 }
 
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
index c4146f5758d80..6acb8afbfb249 100644
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
@@ -25,7 +25,7 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
   public async getMetrics(
     requestContext: RequestHandlerContext,
     options: InfraMetricsRequestOptions,
-    rawRequest: KibanaRequest // NP_TODO: Temporarily needed until metrics getVisData no longer needs full request
+    rawRequest: KibanaRequest
   ): Promise<InfraMetricData[]> {
     const indexPattern = `${options.sourceConfiguration.metricAlias},${options.sourceConfiguration.logAlias}`;
     const fields = findInventoryFields(options.nodeType, options.sourceConfiguration.fields);
@@ -47,7 +47,7 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
     }
 
     const requests = options.metrics.map(metricId =>
-      this.makeTSVBRequest(metricId, options, rawRequest, nodeField, requestContext)
+      this.makeTSVBRequest(metricId, options, nodeField, requestContext)
     );
 
     return Promise.all(requests)
@@ -89,7 +89,6 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
   async makeTSVBRequest(
     metricId: InfraMetric,
     options: InfraMetricsRequestOptions,
-    req: KibanaRequest,
     nodeField: string,
     requestContext: RequestHandlerContext
   ) {
@@ -150,6 +149,6 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
       ? [{ match: { [model.map_field_to]: id } }]
       : [{ match: { [nodeField]: id } }];
 
-    return this.framework.makeTSVBRequest(req, model, timerange, filters, requestContext);
+    return this.framework.makeTSVBRequest(requestContext, model, timerange, filters);
   }
 }
diff --git a/x-pack/legacy/plugins/infra/server/lib/domains/log_entries_domain/convert_document_source_to_log_item_fields.ts b/x-pack/legacy/plugins/infra/server/lib/domains/log_entries_domain/convert_document_source_to_log_item_fields.ts
index 37d7a5bd7465c..099e7c3b5038c 100644
--- a/x-pack/legacy/plugins/infra/server/lib/domains/log_entries_domain/convert_document_source_to_log_item_fields.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/domains/log_entries_domain/convert_document_source_to_log_item_fields.ts
@@ -8,7 +8,7 @@ import stringify from 'json-stable-stringify';
 import { isArray, isPlainObject } from 'lodash';
 
 import { JsonObject } from '../../../../common/typed_json';
-import { InfraLogItemField } from '../../../graphql/types';
+import { LogEntriesItemField } from '../../../../common/http_api';
 
 const isJsonObject = (subject: any): subject is JsonObject => {
   return isPlainObject(subject);
@@ -24,8 +24,8 @@ const serializeValue = (value: any): string => {
 export const convertDocumentSourceToLogItemFields = (
   source: JsonObject,
   path: string[] = [],
-  fields: InfraLogItemField[] = []
-): InfraLogItemField[] => {
+  fields: LogEntriesItemField[] = []
+): LogEntriesItemField[] => {
   return Object.keys(source).reduce((acc, key) => {
     const value = source[key];
     const nextPath = [...path, key];
diff --git a/x-pack/legacy/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts b/x-pack/legacy/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts
index 597073b1e901f..2f71d56e1e0e3 100644
--- a/x-pack/legacy/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts
@@ -11,12 +11,14 @@ import { RequestHandlerContext } from 'src/core/server';
 import { TimeKey } from '../../../../common/time';
 import { JsonObject } from '../../../../common/typed_json';
 import {
-  InfraLogEntry,
-  InfraLogItem,
-  InfraLogMessageSegment,
-  InfraLogSummaryBucket,
-  InfraLogSummaryHighlightBucket,
-} from '../../../graphql/types';
+  LogEntriesSummaryBucket,
+  LogEntriesSummaryHighlightsBucket,
+  LogEntry,
+  LogEntriesItem,
+  LogEntriesCursor,
+  LogColumn,
+} from '../../../../common/http_api';
+import { InfraLogEntry, InfraLogMessageSegment } from '../../../graphql/types';
 import {
   InfraSourceConfiguration,
   InfraSources,
@@ -33,12 +35,84 @@ import {
   compileFormattingRules,
 } from './message';
 
+export interface LogEntriesParams {
+  startDate: number;
+  endDate: number;
+  size?: number;
+  query?: JsonObject;
+  cursor?: { before: LogEntriesCursor | 'last' } | { after: LogEntriesCursor | 'first' };
+  highlightTerm?: string;
+}
+export interface LogEntriesAroundParams {
+  startDate: number;
+  endDate: number;
+  size?: number;
+  center: LogEntriesCursor;
+  query?: JsonObject;
+  highlightTerm?: string;
+}
+
+export const LOG_ENTRIES_PAGE_SIZE = 200;
+
 export class InfraLogEntriesDomain {
   constructor(
     private readonly adapter: LogEntriesAdapter,
     private readonly libs: { sources: InfraSources }
   ) {}
 
+  /* Name is temporary until we can clean up the GraphQL implementation */
+  /* eslint-disable-next-line @typescript-eslint/camelcase */
+  public async getLogEntriesAround__new(
+    requestContext: RequestHandlerContext,
+    sourceId: string,
+    params: LogEntriesAroundParams
+  ) {
+    const { startDate, endDate, center, query, size, highlightTerm } = params;
+
+    /*
+     * For odd sizes we will round this value down for the first half, and up
+     * for the second. This keeps the center cursor right in the center.
+     *
+     * For even sizes the half before is one entry bigger than the half after.
+     * [1, 2, 3, 4, 5, *6*, 7, 8, 9, 10]
+     *  | 5 entries |       |4 entries|
+     */
+    const halfSize = (size || LOG_ENTRIES_PAGE_SIZE) / 2;
+
+    const entriesBefore = await this.getLogEntries(requestContext, sourceId, {
+      startDate,
+      endDate,
+      query,
+      cursor: { before: center },
+      size: Math.floor(halfSize),
+      highlightTerm,
+    });
+
+    /*
+     * Elasticsearch's `search_after` returns documents after the specified cursor.
+     * - If we have documents before the center, we search after the last of
+     *   those. The first document of the new group is the center.
+     * - If there were no documents, we search one milisecond before the
+     *   center. It then becomes the first document.
+     */
+    const cursorAfter =
+      entriesBefore.length > 0
+        ? entriesBefore[entriesBefore.length - 1].cursor
+        : { time: center.time - 1, tiebreaker: 0 };
+
+    const entriesAfter = await this.getLogEntries(requestContext, sourceId, {
+      startDate,
+      endDate,
+      query,
+      cursor: { after: cursorAfter },
+      size: Math.ceil(halfSize),
+      highlightTerm,
+    });
+
+    return [...entriesBefore, ...entriesAfter];
+  }
+
+  /** @deprecated */
   public async getLogEntriesAround(
     requestContext: RequestHandlerContext,
     sourceId: string,
@@ -103,6 +177,62 @@ export class InfraLogEntriesDomain {
     };
   }
 
+  public async getLogEntries(
+    requestContext: RequestHandlerContext,
+    sourceId: string,
+    params: LogEntriesParams
+  ): Promise<LogEntry[]> {
+    const { configuration } = await this.libs.sources.getSourceConfiguration(
+      requestContext,
+      sourceId
+    );
+
+    const messageFormattingRules = compileFormattingRules(
+      getBuiltinRules(configuration.fields.message)
+    );
+
+    const requiredFields = getRequiredFields(configuration, messageFormattingRules);
+
+    const documents = await this.adapter.getLogEntries(
+      requestContext,
+      configuration,
+      requiredFields,
+      params
+    );
+
+    const entries = documents.map(doc => {
+      return {
+        id: doc.gid,
+        cursor: doc.key,
+        columns: configuration.logColumns.map(
+          (column): LogColumn => {
+            if ('timestampColumn' in column) {
+              return {
+                columnId: column.timestampColumn.id,
+                timestamp: doc.key.time,
+              };
+            } else if ('messageColumn' in column) {
+              return {
+                columnId: column.messageColumn.id,
+                message: messageFormattingRules.format(doc.fields, doc.highlights),
+              };
+            } else {
+              return {
+                columnId: column.fieldColumn.id,
+                field: column.fieldColumn.field,
+                value: stringify(doc.fields[column.fieldColumn.field]),
+                highlights: doc.highlights[column.fieldColumn.field] || [],
+              };
+            }
+          }
+        ),
+      };
+    });
+
+    return entries;
+  }
+
+  /** @deprecated */
   public async getLogEntriesBetween(
     requestContext: RequestHandlerContext,
     sourceId: string,
@@ -134,6 +264,7 @@ export class InfraLogEntriesDomain {
     return entries;
   }
 
+  /** @deprecated */
   public async getLogEntryHighlights(
     requestContext: RequestHandlerContext,
     sourceId: string,
@@ -218,7 +349,7 @@ export class InfraLogEntriesDomain {
     end: number,
     bucketSize: number,
     filterQuery?: LogEntryQuery
-  ): Promise<InfraLogSummaryBucket[]> {
+  ): Promise<LogEntriesSummaryBucket[]> {
     const { configuration } = await this.libs.sources.getSourceConfiguration(
       requestContext,
       sourceId
@@ -242,7 +373,7 @@ export class InfraLogEntriesDomain {
     bucketSize: number,
     highlightQueries: string[],
     filterQuery?: LogEntryQuery
-  ): Promise<InfraLogSummaryHighlightBucket[][]> {
+  ): Promise<LogEntriesSummaryHighlightsBucket[][]> {
     const { configuration } = await this.libs.sources.getSourceConfiguration(
       requestContext,
       sourceId
@@ -284,7 +415,7 @@ export class InfraLogEntriesDomain {
     requestContext: RequestHandlerContext,
     id: string,
     sourceConfiguration: InfraSourceConfiguration
-  ): Promise<InfraLogItem> {
+  ): Promise<LogEntriesItem> {
     const document = await this.adapter.getLogItem(requestContext, id, sourceConfiguration);
     const defaultFields = [
       { field: '_index', value: document._index },
@@ -325,6 +456,13 @@ export interface LogEntriesAdapter {
     highlightQuery?: LogEntryQuery
   ): Promise<LogEntryDocument[]>;
 
+  getLogEntries(
+    requestContext: RequestHandlerContext,
+    sourceConfiguration: InfraSourceConfiguration,
+    fields: string[],
+    params: LogEntriesParams
+  ): Promise<LogEntryDocument[]>;
+
   getContainedLogEntryDocuments(
     requestContext: RequestHandlerContext,
     sourceConfiguration: InfraSourceConfiguration,
@@ -367,6 +505,7 @@ export interface LogSummaryBucket {
   topEntryKeys: TimeKey[];
 }
 
+/** @deprecated */
 const convertLogDocumentToEntry = (
   sourceId: string,
   logColumns: InfraSourceConfiguration['logColumns'],
@@ -402,7 +541,7 @@ const logSummaryBucketHasEntries = (bucket: LogSummaryBucket) =>
 
 const convertLogSummaryBucketToSummaryHighlightBucket = (
   bucket: LogSummaryBucket
-): InfraLogSummaryHighlightBucket => ({
+): LogEntriesSummaryHighlightsBucket => ({
   entriesCount: bucket.entriesCount,
   start: bucket.start,
   end: bucket.end,
diff --git a/x-pack/legacy/plugins/infra/server/lib/domains/metrics_domain.ts b/x-pack/legacy/plugins/infra/server/lib/domains/metrics_domain.ts
index 5d7d54a6a2e50..e53e45afae5c4 100644
--- a/x-pack/legacy/plugins/infra/server/lib/domains/metrics_domain.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/domains/metrics_domain.ts
@@ -18,7 +18,7 @@ export class InfraMetricsDomain {
   public async getMetrics(
     requestContext: RequestHandlerContext,
     options: InfraMetricsRequestOptions,
-    rawRequest: KibanaRequest // NP_TODO: temporarily needed until metrics getVisData no longer needs full request
+    rawRequest: KibanaRequest
   ): Promise<InfraMetricData[]> {
     return await this.adapter.getMetrics(requestContext, options, rawRequest);
   }
diff --git a/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts b/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
index 6c27e54a78bee..4bb1aefb5b2c7 100644
--- a/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
@@ -12,6 +12,7 @@ import { getMetricsAggregations } from './query_helpers';
 import { calculateMetricInterval } from '../../utils/calculate_metric_interval';
 import { SnapshotModel, SnapshotModelMetricAggRT } from '../../../common/inventory_models/types';
 import { KibanaFramework } from '../adapters/framework/kibana_framework_adapter';
+import { getDatasetForField } from '../../routes/metrics_explorer/lib/get_dataset_for_field';
 
 export const createTimeRangeWithInterval = async (
   framework: KibanaFramework,
@@ -19,7 +20,7 @@ export const createTimeRangeWithInterval = async (
   options: InfraSnapshotRequestOptions
 ): Promise<InfraTimerangeInput> => {
   const aggregations = getMetricsAggregations(options);
-  const modules = aggregationsToModules(aggregations);
+  const modules = await aggregationsToModules(framework, requestContext, aggregations, options);
   const interval =
     (await calculateMetricInterval(
       framework,
@@ -39,21 +40,30 @@ export const createTimeRangeWithInterval = async (
   };
 };
 
-const aggregationsToModules = (aggregations: SnapshotModel): string[] => {
-  return uniq(
-    Object.values(aggregations)
-      .reduce((modules, agg) => {
-        if (SnapshotModelMetricAggRT.is(agg)) {
-          return modules.concat(Object.values(agg).map(a => a?.field));
-        }
-        return modules;
-      }, [] as Array<string | undefined>)
-      .filter(v => v)
-      .map(field =>
-        field!
-          .split(/\./)
-          .slice(0, 2)
-          .join('.')
-      )
-  ) as string[];
+const aggregationsToModules = async (
+  framework: KibanaFramework,
+  requestContext: RequestHandlerContext,
+  aggregations: SnapshotModel,
+  options: InfraSnapshotRequestOptions
+): Promise<string[]> => {
+  const uniqueFields = Object.values(aggregations)
+    .reduce<Array<string | undefined>>((fields, agg) => {
+      if (SnapshotModelMetricAggRT.is(agg)) {
+        return uniq(fields.concat(Object.values(agg).map(a => a?.field)));
+      }
+      return fields;
+    }, [])
+    .filter(v => v) as string[];
+  const fields = await Promise.all(
+    uniqueFields.map(
+      async field =>
+        await getDatasetForField(
+          framework,
+          requestContext,
+          field as string,
+          options.sourceConfiguration.metricAlias
+        )
+    )
+  );
+  return fields.filter(f => f) as string[];
 };
diff --git a/x-pack/legacy/plugins/infra/server/lib/snapshot/snapshot.ts b/x-pack/legacy/plugins/infra/server/lib/snapshot/snapshot.ts
index d1db0ef07b338..1a724673608a2 100644
--- a/x-pack/legacy/plugins/infra/server/lib/snapshot/snapshot.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/snapshot/snapshot.ts
@@ -37,7 +37,7 @@ export class InfraSnapshot {
   public async getNodes(
     requestContext: RequestHandlerContext,
     options: InfraSnapshotRequestOptions
-  ): Promise<InfraSnapshotNode[]> {
+  ): Promise<{ nodes: InfraSnapshotNode[]; interval: string }> {
     // Both requestGroupedNodes and requestNodeMetrics may send several requests to elasticsearch
     // in order to page through the results of their respective composite aggregations.
     // Both chains of requests are supposed to run in parallel, and their results be merged
@@ -61,7 +61,10 @@ export class InfraSnapshot {
 
     const groupedNodeBuckets = await groupedNodesPromise;
     const nodeMetricBuckets = await nodeMetricsPromise;
-    return mergeNodeBuckets(groupedNodeBuckets, nodeMetricBuckets, options);
+    return {
+      nodes: mergeNodeBuckets(groupedNodeBuckets, nodeMetricBuckets, options),
+      interval: timeRangeWithIntervalApplied.interval,
+    };
   }
 }
 
@@ -87,18 +90,7 @@ const requestGroupedNodes = async (
     body: {
       query: {
         bool: {
-          filter: [
-            ...createQueryFilterClauses(options.filterQuery),
-            {
-              range: {
-                [options.sourceConfiguration.fields.timestamp]: {
-                  gte: options.timerange.from,
-                  lte: options.timerange.to,
-                  format: 'epoch_millis',
-                },
-              },
-            },
-          ],
+          filter: buildFilters(options),
         },
       },
       size: 0,
@@ -147,17 +139,7 @@ const requestNodeMetrics = async (
     body: {
       query: {
         bool: {
-          filter: [
-            {
-              range: {
-                [options.sourceConfiguration.fields.timestamp]: {
-                  gte: options.timerange.from,
-                  lte: options.timerange.to,
-                  format: 'epoch_millis',
-                },
-              },
-            },
-          ],
+          filter: buildFilters(options, false),
         },
       },
       size: 0,
@@ -217,3 +199,39 @@ const mergeNodeBuckets = (
 
 const createQueryFilterClauses = (filterQuery: JsonObject | undefined) =>
   filterQuery ? [filterQuery] : [];
+
+const buildFilters = (options: InfraSnapshotRequestOptions, withQuery = true) => {
+  let filters: any = [
+    {
+      range: {
+        [options.sourceConfiguration.fields.timestamp]: {
+          gte: options.timerange.from,
+          lte: options.timerange.to,
+          format: 'epoch_millis',
+        },
+      },
+    },
+  ];
+
+  if (withQuery) {
+    filters = [...createQueryFilterClauses(options.filterQuery), ...filters];
+  }
+
+  if (options.accountId) {
+    filters.push({
+      term: {
+        'cloud.account.id': options.accountId,
+      },
+    });
+  }
+
+  if (options.region) {
+    filters.push({
+      term: {
+        'cloud.region': options.region,
+      },
+    });
+  }
+
+  return filters;
+};
diff --git a/x-pack/legacy/plugins/infra/server/lib/snapshot/types.ts b/x-pack/legacy/plugins/infra/server/lib/snapshot/types.ts
index 778f5045894a9..31823b2811121 100644
--- a/x-pack/legacy/plugins/infra/server/lib/snapshot/types.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/snapshot/types.ts
@@ -20,4 +20,6 @@ export interface InfraSnapshotRequestOptions {
   groupBy: InfraSnapshotGroupbyInput[];
   metric: InfraSnapshotMetricInput;
   filterQuery: JsonObject | undefined;
+  accountId?: string;
+  region?: string;
 }
diff --git a/x-pack/legacy/plugins/infra/server/new_platform_index.ts b/x-pack/legacy/plugins/infra/server/new_platform_index.ts
index 6b759ecfe9fde..e59897a6b241d 100644
--- a/x-pack/legacy/plugins/infra/server/new_platform_index.ts
+++ b/x-pack/legacy/plugins/infra/server/new_platform_index.ts
@@ -5,11 +5,10 @@
  */
 
 import { PluginInitializerContext } from 'src/core/server';
-import { InfraServerPlugin } from './new_platform_plugin';
+import { InfraServerPlugin, InfraPluginSetup } from './new_platform_plugin';
 import { config, InfraConfig } from '../../../../plugins/infra/server';
 import { InfraServerPluginDeps } from './lib/adapters/framework';
-
-export { config, InfraConfig, InfraServerPluginDeps };
+export { config, InfraConfig, InfraServerPluginDeps, InfraPluginSetup };
 
 export function plugin(context: PluginInitializerContext) {
   return new InfraServerPlugin(context);
diff --git a/x-pack/legacy/plugins/infra/server/new_platform_plugin.ts b/x-pack/legacy/plugins/infra/server/new_platform_plugin.ts
index 462a07574b2dd..147729a1d0b3e 100644
--- a/x-pack/legacy/plugins/infra/server/new_platform_plugin.ts
+++ b/x-pack/legacy/plugins/infra/server/new_platform_plugin.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { CoreSetup, PluginInitializerContext } from 'src/core/server';
+import { i18n } from '@kbn/i18n';
 import { Server } from 'hapi';
 import { InfraConfig } from '../../../../plugins/infra/server';
 import { initInfraServer } from './infra_server';
@@ -23,11 +24,24 @@ import { InfraSources } from './lib/sources';
 import { InfraServerPluginDeps } from './lib/adapters/framework';
 import { METRICS_FEATURE, LOGS_FEATURE } from './features';
 import { UsageCollector } from './usage/usage_collector';
+import { APP_ID } from '../index';
+import { InfraStaticSourceConfiguration } from './lib/sources/types';
 
 export interface KbnServer extends Server {
   usage: any;
 }
 
+const logsSampleDataLinkLabel = i18n.translate('xpack.infra.sampleDataLinkLabel', {
+  defaultMessage: 'Logs',
+});
+
+export interface InfraPluginSetup {
+  defineInternalSourceConfiguration: (
+    sourceId: string,
+    sourceProperties: InfraStaticSourceConfiguration
+  ) => void;
+}
+
 const DEFAULT_CONFIG: InfraConfig = {
   enabled: true,
   query: {
@@ -99,9 +113,23 @@ export class InfraServerPlugin {
     plugins.features.registerFeature(METRICS_FEATURE);
     plugins.features.registerFeature(LOGS_FEATURE);
 
+    plugins.home.sampleData.addAppLinksToSampleDataset('logs', [
+      {
+        path: `/app/${APP_ID}#/logs`,
+        label: logsSampleDataLinkLabel,
+        icon: 'logsApp',
+      },
+    ]);
+
     initInfraServer(this.libs);
 
     // Telemetry
     UsageCollector.registerUsageCollector(plugins.usageCollection);
+
+    return {
+      defineInternalSourceConfiguration(sourceId, sourceProperties) {
+        sources.defineInternalSourceConfiguration(sourceId, sourceProperties);
+      },
+    } as InfraPluginSetup;
   }
 }
diff --git a/x-pack/legacy/plugins/infra/server/routes/inventory_metadata/index.ts b/x-pack/legacy/plugins/infra/server/routes/inventory_metadata/index.ts
new file mode 100644
index 0000000000000..33328bdfebaf4
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/inventory_metadata/index.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 { schema } from '@kbn/config-schema';
+import Boom from 'boom';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { InfraBackendLibs } from '../../lib/infra_types';
+import { throwErrors } from '../../../common/runtime_types';
+
+import {
+  InventoryMetaRequestRT,
+  InventoryMetaResponseRT,
+} from '../../../common/http_api/inventory_meta_api';
+import { getCloudMetadata } from './lib/get_cloud_metadata';
+
+const escapeHatch = schema.object({}, { allowUnknowns: true });
+
+export const initInventoryMetaRoute = (libs: InfraBackendLibs) => {
+  const { framework } = libs;
+
+  framework.registerRoute(
+    {
+      method: 'post',
+      path: '/api/infra/inventory/meta',
+      validate: {
+        body: escapeHatch,
+      },
+    },
+    async (requestContext, request, response) => {
+      try {
+        const { sourceId, nodeType } = pipe(
+          InventoryMetaRequestRT.decode(request.body),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+
+        const { configuration } = await libs.sources.getSourceConfiguration(
+          requestContext,
+          sourceId
+        );
+        const awsMetadata = await getCloudMetadata(
+          framework,
+          requestContext,
+          configuration,
+          nodeType
+        );
+
+        return response.ok({
+          body: InventoryMetaResponseRT.encode(awsMetadata),
+        });
+      } catch (error) {
+        return response.internalError({
+          body: error.message,
+        });
+      }
+    }
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/inventory_metadata/lib/get_cloud_metadata.ts b/x-pack/legacy/plugins/infra/server/routes/inventory_metadata/lib/get_cloud_metadata.ts
new file mode 100644
index 0000000000000..dcac23d1a3d9d
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/inventory_metadata/lib/get_cloud_metadata.ts
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { RequestHandlerContext } from 'kibana/server';
+import { InventoryCloudAccount } from '../../../../common/http_api/inventory_meta_api';
+import {
+  InfraMetadataAggregationResponse,
+  InfraMetadataAggregationBucket,
+} from '../../../lib/adapters/framework';
+import { InfraSourceConfiguration } from '../../../lib/sources';
+import { KibanaFramework } from '../../../lib/adapters/framework/kibana_framework_adapter';
+import { InventoryItemType } from '../../../../common/inventory_models/types';
+import { findInventoryModel } from '../../../../common/inventory_models';
+
+export interface CloudMetaData {
+  accounts: InventoryCloudAccount[];
+  projects: string[];
+  regions: string[];
+}
+
+export const getCloudMetadata = async (
+  framework: KibanaFramework,
+  req: RequestHandlerContext,
+  sourceConfiguration: InfraSourceConfiguration,
+  nodeType: InventoryItemType
+): Promise<CloudMetaData> => {
+  const model = findInventoryModel(nodeType);
+
+  const metricQuery = {
+    allowNoIndices: true,
+    ignoreUnavailable: true,
+    index: sourceConfiguration.metricAlias,
+    body: {
+      query: {
+        bool: {
+          must: [{ match: { 'event.module': model.requiredModule } }],
+        },
+      },
+      size: 0,
+      aggs: {
+        accounts: {
+          terms: {
+            field: 'cloud.account.id',
+            size: 1000,
+          },
+          aggs: {
+            accountNames: {
+              terms: {
+                field: 'cloud.account.name',
+                size: 1000,
+              },
+            },
+          },
+        },
+        regions: {
+          terms: {
+            field: 'cloud.region',
+            size: 1000,
+          },
+        },
+      },
+    },
+  };
+
+  const response = await framework.callWithRequest<
+    {},
+    {
+      accounts?: {
+        buckets: Array<
+          InfraMetadataAggregationBucket & { accountNames: InfraMetadataAggregationResponse }
+        >;
+      };
+      projects?: InfraMetadataAggregationResponse;
+      regions?: InfraMetadataAggregationResponse;
+    }
+  >(req, 'search', metricQuery);
+
+  const projectBuckets =
+    response.aggregations && response.aggregations.projects
+      ? response.aggregations.projects.buckets
+      : [];
+
+  const regionBuckets =
+    response.aggregations && response.aggregations.regions
+      ? response.aggregations.regions.buckets
+      : [];
+
+  const accounts: InventoryCloudAccount[] = [];
+  if (response.aggregations && response.aggregations.accounts) {
+    response.aggregations.accounts.buckets.forEach(b => {
+      if (b.accountNames.buckets.length) {
+        accounts.push({
+          value: b.key,
+          // There should only be one account name for each account id.
+          name: b.accountNames.buckets[0].key,
+        });
+      }
+    });
+  }
+  return {
+    accounts,
+    projects: projectBuckets.map(b => b.key),
+    regions: regionBuckets.map(b => b.key),
+  };
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/log_analysis/results/log_entry_rate.ts b/x-pack/legacy/plugins/infra/server/routes/log_analysis/results/log_entry_rate.ts
index 02866e797e305..9778311bd8e58 100644
--- a/x-pack/legacy/plugins/infra/server/routes/log_analysis/results/log_entry_rate.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/log_analysis/results/log_entry_rate.ts
@@ -33,12 +33,12 @@ export const initGetLogEntryRateRoute = ({ framework, logAnalysis }: InfraBacken
       },
     },
     async (requestContext, request, response) => {
-      const payload = pipe(
-        getLogEntryRateRequestPayloadRT.decode(request.body),
-        fold(throwErrors(Boom.badRequest), identity)
-      );
-
       try {
+        const payload = pipe(
+          getLogEntryRateRequestPayloadRT.decode(request.body),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+
         const logEntryRateBuckets = await logAnalysis.getLogEntryRateBuckets(
           requestContext,
           payload.data.sourceId,
diff --git a/x-pack/legacy/plugins/infra/server/routes/log_analysis/validation/indices.ts b/x-pack/legacy/plugins/infra/server/routes/log_analysis/validation/indices.ts
index ba143a597b66d..fe579124cfe10 100644
--- a/x-pack/legacy/plugins/infra/server/routes/log_analysis/validation/indices.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/log_analysis/validation/indices.ts
@@ -42,8 +42,10 @@ export const initValidateLogAnalysisIndicesRoute = ({ framework }: InfraBackendL
         await Promise.all(
           indices.map(async index => {
             const fieldCaps = await framework.callWithRequest(requestContext, 'fieldCaps', {
-              index,
+              allow_no_indices: true,
               fields: fields.map(field => field.name),
+              ignore_unavailable: true,
+              index,
             });
 
             if (fieldCaps.indices.length === 0) {
diff --git a/x-pack/legacy/plugins/infra/server/routes/log_entries/entries.ts b/x-pack/legacy/plugins/infra/server/routes/log_entries/entries.ts
new file mode 100644
index 0000000000000..361535886ab22
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/log_entries/entries.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 Boom from 'boom';
+
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { schema } from '@kbn/config-schema';
+
+import { throwErrors } from '../../../common/runtime_types';
+
+import { InfraBackendLibs } from '../../lib/infra_types';
+import {
+  LOG_ENTRIES_PATH,
+  logEntriesRequestRT,
+  logEntriesResponseRT,
+} from '../../../common/http_api/log_entries';
+import { parseFilterQuery } from '../../utils/serialized_query';
+import { LogEntriesParams } from '../../lib/domains/log_entries_domain';
+
+const escapeHatch = schema.object({}, { allowUnknowns: true });
+
+export const initLogEntriesRoute = ({ framework, logEntries }: InfraBackendLibs) => {
+  framework.registerRoute(
+    {
+      method: 'post',
+      path: LOG_ENTRIES_PATH,
+      validate: { body: escapeHatch },
+    },
+    async (requestContext, request, response) => {
+      try {
+        const payload = pipe(
+          logEntriesRequestRT.decode(request.body),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+
+        const { startDate, endDate, sourceId, query, size } = payload;
+
+        let entries;
+        if ('center' in payload) {
+          entries = await logEntries.getLogEntriesAround__new(requestContext, sourceId, {
+            startDate,
+            endDate,
+            query: parseFilterQuery(query),
+            center: payload.center,
+            size,
+          });
+        } else {
+          let cursor: LogEntriesParams['cursor'];
+          if ('before' in payload) {
+            cursor = { before: payload.before };
+          } else if ('after' in payload) {
+            cursor = { after: payload.after };
+          }
+
+          entries = await logEntries.getLogEntries(requestContext, sourceId, {
+            startDate,
+            endDate,
+            query: parseFilterQuery(query),
+            cursor,
+            size,
+          });
+        }
+
+        return response.ok({
+          body: logEntriesResponseRT.encode({
+            data: {
+              entries,
+              topCursor: entries[0].cursor,
+              bottomCursor: entries[entries.length - 1].cursor,
+            },
+          }),
+        });
+      } catch (error) {
+        return response.internalError({
+          body: error.message,
+        });
+      }
+    }
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/log_entries/highlights.ts b/x-pack/legacy/plugins/infra/server/routes/log_entries/highlights.ts
new file mode 100644
index 0000000000000..8af81a6ee313d
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/log_entries/highlights.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Boom from 'boom';
+
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { schema } from '@kbn/config-schema';
+
+import { throwErrors } from '../../../common/runtime_types';
+
+import { InfraBackendLibs } from '../../lib/infra_types';
+import {
+  LOG_ENTRIES_HIGHLIGHTS_PATH,
+  logEntriesHighlightsRequestRT,
+  logEntriesHighlightsResponseRT,
+} from '../../../common/http_api/log_entries';
+import { parseFilterQuery } from '../../utils/serialized_query';
+import { LogEntriesParams } from '../../lib/domains/log_entries_domain';
+
+const escapeHatch = schema.object({}, { allowUnknowns: true });
+
+export const initLogEntriesHighlightsRoute = ({ framework, logEntries }: InfraBackendLibs) => {
+  framework.registerRoute(
+    {
+      method: 'post',
+      path: LOG_ENTRIES_HIGHLIGHTS_PATH,
+      validate: { body: escapeHatch },
+    },
+    async (requestContext, request, response) => {
+      try {
+        const payload = pipe(
+          logEntriesHighlightsRequestRT.decode(request.body),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+
+        const { startDate, endDate, sourceId, query, size, highlightTerms } = payload;
+
+        let entriesPerHighlightTerm;
+
+        if ('center' in payload) {
+          entriesPerHighlightTerm = await Promise.all(
+            highlightTerms.map(highlightTerm =>
+              logEntries.getLogEntriesAround__new(requestContext, sourceId, {
+                startDate,
+                endDate,
+                query: parseFilterQuery(query),
+                center: payload.center,
+                size,
+                highlightTerm,
+              })
+            )
+          );
+        } else {
+          let cursor: LogEntriesParams['cursor'];
+          if ('before' in payload) {
+            cursor = { before: payload.before };
+          } else if ('after' in payload) {
+            cursor = { after: payload.after };
+          }
+
+          entriesPerHighlightTerm = await Promise.all(
+            highlightTerms.map(highlightTerm =>
+              logEntries.getLogEntries(requestContext, sourceId, {
+                startDate,
+                endDate,
+                query: parseFilterQuery(query),
+                cursor,
+                size,
+                highlightTerm,
+              })
+            )
+          );
+        }
+
+        return response.ok({
+          body: logEntriesHighlightsResponseRT.encode({
+            data: entriesPerHighlightTerm.map(entries => ({
+              entries,
+              topCursor: entries[0].cursor,
+              bottomCursor: entries[entries.length - 1].cursor,
+            })),
+          }),
+        });
+      } catch (error) {
+        return response.internalError({
+          body: error.message,
+        });
+      }
+    }
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/log_entries/index.ts b/x-pack/legacy/plugins/infra/server/routes/log_entries/index.ts
new file mode 100644
index 0000000000000..1090d35d89b85
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/log_entries/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './entries';
+export * from './highlights';
+export * from './item';
+export * from './summary';
+export * from './summary_highlights';
diff --git a/x-pack/legacy/plugins/infra/server/routes/log_entries/item.ts b/x-pack/legacy/plugins/infra/server/routes/log_entries/item.ts
new file mode 100644
index 0000000000000..22663cb2001f0
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/log_entries/item.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 Boom from 'boom';
+
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { schema } from '@kbn/config-schema';
+
+import { throwErrors } from '../../../common/runtime_types';
+
+import { InfraBackendLibs } from '../../lib/infra_types';
+import {
+  LOG_ENTRIES_ITEM_PATH,
+  logEntriesItemRequestRT,
+  logEntriesItemResponseRT,
+} from '../../../common/http_api';
+
+const escapeHatch = schema.object({}, { allowUnknowns: true });
+
+export const initLogEntriesItemRoute = ({ framework, sources, logEntries }: InfraBackendLibs) => {
+  framework.registerRoute(
+    {
+      method: 'post',
+      path: LOG_ENTRIES_ITEM_PATH,
+      validate: { body: escapeHatch },
+    },
+    async (requestContext, request, response) => {
+      try {
+        const payload = pipe(
+          logEntriesItemRequestRT.decode(request.body),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+
+        const { id, sourceId } = payload;
+        const sourceConfiguration = (await sources.getSourceConfiguration(requestContext, sourceId))
+          .configuration;
+
+        const logEntry = await logEntries.getLogItem(requestContext, id, sourceConfiguration);
+
+        return response.ok({
+          body: logEntriesItemResponseRT.encode({
+            data: logEntry,
+          }),
+        });
+      } catch (error) {
+        return response.internalError({ body: error.message });
+      }
+    }
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/log_entries/summary.ts b/x-pack/legacy/plugins/infra/server/routes/log_entries/summary.ts
new file mode 100644
index 0000000000000..05643adbe781f
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/log_entries/summary.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Boom from 'boom';
+
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { schema } from '@kbn/config-schema';
+
+import { throwErrors } from '../../../common/runtime_types';
+
+import { InfraBackendLibs } from '../../lib/infra_types';
+import {
+  LOG_ENTRIES_SUMMARY_PATH,
+  logEntriesSummaryRequestRT,
+  logEntriesSummaryResponseRT,
+} from '../../../common/http_api/log_entries';
+import { parseFilterQuery } from '../../utils/serialized_query';
+
+const escapeHatch = schema.object({}, { allowUnknowns: true });
+
+export const initLogEntriesSummaryRoute = ({ framework, logEntries }: InfraBackendLibs) => {
+  framework.registerRoute(
+    {
+      method: 'post',
+      path: LOG_ENTRIES_SUMMARY_PATH,
+      validate: { body: escapeHatch },
+    },
+    async (requestContext, request, response) => {
+      try {
+        const payload = pipe(
+          logEntriesSummaryRequestRT.decode(request.body),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+        const { sourceId, startDate, endDate, bucketSize, query } = payload;
+
+        const buckets = await logEntries.getLogSummaryBucketsBetween(
+          requestContext,
+          sourceId,
+          startDate,
+          endDate,
+          bucketSize,
+          parseFilterQuery(query)
+        );
+
+        return response.ok({
+          body: logEntriesSummaryResponseRT.encode({
+            data: {
+              start: startDate,
+              end: endDate,
+              buckets,
+            },
+          }),
+        });
+      } catch (error) {
+        return response.internalError({
+          body: error.message,
+        });
+      }
+    }
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/log_entries/summary_highlights.ts b/x-pack/legacy/plugins/infra/server/routes/log_entries/summary_highlights.ts
new file mode 100644
index 0000000000000..ecccd931bb371
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/log_entries/summary_highlights.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.
+ */
+
+import Boom from 'boom';
+
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { schema } from '@kbn/config-schema';
+
+import { throwErrors } from '../../../common/runtime_types';
+
+import { InfraBackendLibs } from '../../lib/infra_types';
+import {
+  LOG_ENTRIES_SUMMARY_HIGHLIGHTS_PATH,
+  logEntriesSummaryHighlightsRequestRT,
+  logEntriesSummaryHighlightsResponseRT,
+} from '../../../common/http_api/log_entries';
+import { parseFilterQuery } from '../../utils/serialized_query';
+
+const escapeHatch = schema.object({}, { allowUnknowns: true });
+
+export const initLogEntriesSummaryHighlightsRoute = ({
+  framework,
+  logEntries,
+}: InfraBackendLibs) => {
+  framework.registerRoute(
+    {
+      method: 'post',
+      path: LOG_ENTRIES_SUMMARY_HIGHLIGHTS_PATH,
+      validate: { body: escapeHatch },
+    },
+    async (requestContext, request, response) => {
+      try {
+        const payload = pipe(
+          logEntriesSummaryHighlightsRequestRT.decode(request.body),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+        const { sourceId, startDate, endDate, bucketSize, query, highlightTerms } = payload;
+
+        const bucketsPerHighlightTerm = await logEntries.getLogSummaryHighlightBucketsBetween(
+          requestContext,
+          sourceId,
+          startDate,
+          endDate,
+          bucketSize,
+          highlightTerms,
+          parseFilterQuery(query)
+        );
+
+        return response.ok({
+          body: logEntriesSummaryHighlightsResponseRT.encode({
+            data: bucketsPerHighlightTerm.map(buckets => ({
+              start: startDate,
+              end: endDate,
+              buckets,
+            })),
+          }),
+        });
+      } catch (error) {
+        return response.internalError({
+          body: error.message,
+        });
+      }
+    }
+  );
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/index.ts b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/index.ts
index 0c69034c66940..64cdb9318b6e1 100644
--- a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/index.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/index.ts
@@ -4,15 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import Boom from 'boom';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
 import { schema } from '@kbn/config-schema';
 import { InfraBackendLibs } from '../../lib/infra_types';
 import { getGroupings } from './lib/get_groupings';
 import { populateSeriesWithTSVBData } from './lib/populate_series_with_tsvb_data';
-import { MetricsExplorerRequestBody } from './types';
-// import { metricsExplorerSchema } from './schema';
-// import { MetricsExplorerResponse, MetricsExplorerRequestBody } from './types';
+import { metricsExplorerRequestBodyRT, metricsExplorerResponseRT } from '../../../common/http_api';
+import { throwErrors } from '../../../common/runtime_types';
 
-// NP_TODO: need to replace all of this with real types or io-ts or something?
 const escapeHatch = schema.object({}, { allowUnknowns: true });
 
 export const initMetricExplorerRoute = (libs: InfraBackendLibs) => {
@@ -29,20 +31,27 @@ export const initMetricExplorerRoute = (libs: InfraBackendLibs) => {
     },
     async (requestContext, request, response) => {
       try {
+        const payload = pipe(
+          metricsExplorerRequestBodyRT.decode(request.body),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+
         const search = <Aggregation>(searchOptions: object) =>
           callWithRequest<{}, Aggregation>(requestContext, 'search', searchOptions);
-        const options = request.body as MetricsExplorerRequestBody; // Need to remove this casting and swap in config-schema demands :(
+
         // First we get the groupings from a composite aggregation
-        const groupings = await getGroupings(search, options);
+        const groupings = await getGroupings(search, payload);
 
         // Then we take the results and fill in the data from TSVB with the
         // user's custom metrics
         const seriesWithMetrics = await Promise.all(
           groupings.series.map(
-            populateSeriesWithTSVBData(request, options, framework, requestContext)
+            populateSeriesWithTSVBData(request, payload, framework, requestContext)
           )
         );
-        return response.ok({ body: { ...groupings, series: seriesWithMetrics } });
+        return response.ok({
+          body: metricsExplorerResponseRT.encode({ ...groupings, series: seriesWithMetrics }),
+        });
       } catch (error) {
         return response.internalError({
           body: error.message,
diff --git a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/create_metrics_model.ts b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/create_metrics_model.ts
index 64b9fba0e7aa2..9e5fe16d482b2 100644
--- a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/create_metrics_model.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/create_metrics_model.ts
@@ -5,7 +5,7 @@
  */
 
 import { InfraMetricModelMetricType } from '../../../lib/adapters/metrics';
-import { MetricsExplorerAggregation, MetricsExplorerRequestBody } from '../types';
+import { MetricsExplorerRequestBody } from '../types';
 import { InfraMetric } from '../../../graphql/types';
 import { TSVBMetricModel } from '../../../../common/inventory_models/types';
 export const createMetricModel = (options: MetricsExplorerRequestBody): TSVBMetricModel => {
@@ -20,7 +20,7 @@ export const createMetricModel = (options: MetricsExplorerRequestBody): TSVBMetr
     // when the responses are processed and combined with the grouping request.
     series: options.metrics.map((metric, index) => {
       // If the metric is a rate then we need to add TSVB metrics for calculating the derivative
-      if (metric.aggregation === MetricsExplorerAggregation.rate) {
+      if (metric.aggregation === 'rate') {
         const aggType = 'max';
         return {
           id: `metric_${index}`,
@@ -49,8 +49,7 @@ export const createMetricModel = (options: MetricsExplorerRequestBody): TSVBMetr
         };
       }
       // Create a basic TSVB series with a single metric
-      const aggregation =
-        MetricsExplorerAggregation[metric.aggregation] || MetricsExplorerAggregation.avg;
+      const aggregation = metric.aggregation || 'avg';
 
       return {
         id: `metric_${index}`,
diff --git a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/get_dataset_for_field.ts b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/get_dataset_for_field.ts
new file mode 100644
index 0000000000000..66f0ca8fc706a
--- /dev/null
+++ b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/get_dataset_for_field.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 { RequestHandlerContext } from 'kibana/server';
+import { KibanaFramework } from '../../../lib/adapters/framework/kibana_framework_adapter';
+
+interface EventDatasetHit {
+  _source: {
+    event?: {
+      dataset?: string;
+    };
+  };
+}
+
+export const getDatasetForField = async (
+  framework: KibanaFramework,
+  requestContext: RequestHandlerContext,
+  field: string,
+  indexPattern: string
+) => {
+  const params = {
+    allowNoIndices: true,
+    ignoreUnavailable: true,
+    terminateAfter: 1,
+    index: indexPattern,
+    body: {
+      query: { exists: { field } },
+      size: 1,
+      _source: ['event.dataset'],
+    },
+  };
+
+  const response = await framework.callWithRequest<EventDatasetHit>(
+    requestContext,
+    'search',
+    params
+  );
+  if (response.hits.total.value === 0) {
+    return null;
+  }
+
+  return response.hits.hits?.[0]._source.event?.dataset;
+};
diff --git a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts
index 1a0edb1053730..8ab3fdccbe72b 100644
--- a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts
@@ -4,18 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { union } from 'lodash';
+import { union, uniq } from 'lodash';
 import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
 import { KibanaFramework } from '../../../lib/adapters/framework/kibana_framework_adapter';
 import {
-  MetricsExplorerColumnType,
   MetricsExplorerRow,
   MetricsExplorerSeries,
   MetricsExplorerRequestBody,
+  MetricsExplorerColumn,
 } from '../types';
 import { createMetricModel } from './create_metrics_model';
 import { JsonObject } from '../../../../common/typed_json';
 import { calculateMetricInterval } from '../../../utils/calculate_metric_interval';
+import { getDatasetForField } from './get_dataset_for_field';
 
 export const populateSeriesWithTSVBData = (
   request: KibanaRequest,
@@ -53,6 +54,12 @@ export const populateSeriesWithTSVBData = (
 
   // Create the TSVB model based on the request options
   const model = createMetricModel(options);
+  const modules = await Promise.all(
+    uniq(options.metrics.filter(m => m.field)).map(
+      async m =>
+        await getDatasetForField(framework, requestContext, m.field as string, options.indexPattern)
+    )
+  );
   const calculatedInterval = await calculateMetricInterval(
     framework,
     requestContext,
@@ -61,14 +68,7 @@ export const populateSeriesWithTSVBData = (
       timestampField: options.timerange.field,
       timerange: options.timerange,
     },
-    options.metrics
-      .filter(metric => metric.field)
-      .map(metric => {
-        return metric
-          .field!.split(/\./)
-          .slice(0, 2)
-          .join('.');
-      })
+    modules.filter(m => m) as string[]
   );
 
   if (calculatedInterval) {
@@ -76,13 +76,7 @@ export const populateSeriesWithTSVBData = (
   }
 
   // Get TSVB results using the model, timerange and filters
-  const tsvbResults = await framework.makeTSVBRequest(
-    request,
-    model,
-    timerange,
-    filters,
-    requestContext
-  );
+  const tsvbResults = await framework.makeTSVBRequest(requestContext, model, timerange, filters);
 
   // If there is no data `custom` will not exist.
   if (!tsvbResults.custom) {
@@ -95,11 +89,11 @@ export const populateSeriesWithTSVBData = (
 
   // Setup the dynamic columns and row attributes depending on if the user is doing a group by
   // and multiple metrics
-  const attributeColumns =
-    options.groupBy != null ? [{ name: 'groupBy', type: MetricsExplorerColumnType.string }] : [];
-  const metricColumns = options.metrics.map((m, i) => ({
+  const attributeColumns: MetricsExplorerColumn[] =
+    options.groupBy != null ? [{ name: 'groupBy', type: 'string' }] : [];
+  const metricColumns: MetricsExplorerColumn[] = options.metrics.map((m, i) => ({
     name: `metric_${i}`,
-    type: MetricsExplorerColumnType.number,
+    type: 'number',
   }));
   const rowAttributes = options.groupBy != null ? { groupBy: series.id } : {};
 
@@ -132,7 +126,7 @@ export const populateSeriesWithTSVBData = (
     ...series,
     rows,
     columns: [
-      { name: 'timestamp', type: MetricsExplorerColumnType.date },
+      { name: 'timestamp', type: 'date' } as MetricsExplorerColumn,
       ...metricColumns,
       ...attributeColumns,
     ],
diff --git a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/schema.ts b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/schema.ts
deleted file mode 100644
index 00231bc2a7938..0000000000000
--- a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/schema.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 * as Joi from 'joi';
-import { values } from 'lodash';
-import { MetricsExplorerColor } from '../../../common/color_palette';
-import { MetricsExplorerAggregation } from './types';
-
-export const metricsExplorerSchema = Joi.object({
-  limit: Joi.number()
-    .min(1)
-    .default(9),
-  afterKey: Joi.string().allow(null),
-  groupBy: Joi.string().allow(null),
-  indexPattern: Joi.string().required(),
-  metrics: Joi.array()
-    .items(
-      Joi.object().keys({
-        aggregation: Joi.string()
-          .valid(values(MetricsExplorerAggregation))
-          .required(),
-        field: Joi.string(),
-        rate: Joi.bool().default(false),
-        color: Joi.string().valid(values(MetricsExplorerColor)),
-        label: Joi.string(),
-      })
-    )
-    .required(),
-  filterQuery: Joi.string(),
-  timerange: Joi.object()
-    .keys({
-      field: Joi.string().required(),
-      from: Joi.number().required(),
-      to: Joi.number().required(),
-      interval: Joi.string().required(),
-    })
-    .required(),
-});
diff --git a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/types.ts b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/types.ts
index a43e3adbdd184..f4c5e26c5c6d1 100644
--- a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/types.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/types.ts
@@ -4,65 +4,33 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export interface InfraTimerange {
-  field: string;
-  from: number;
-  to: number;
-  interval: string;
-}
+import * as rt from 'io-ts';
+import {
+  metricsExplorerMetricRT,
+  metricsExplorerPageInfoRT,
+  metricsExplorerColumnRT,
+  metricsExplorerRowRT,
+  metricsExplorerSeriesRT,
+  metricsExplorerRequestBodyRT,
+  metricsExplorerResponseRT,
+  metricsExplorerAggregationRT,
+  metricsExplorerColumnTypeRT,
+} from '../../../common/http_api';
 
-export enum MetricsExplorerAggregation {
-  avg = 'avg',
-  max = 'max',
-  min = 'min',
-  cardinality = 'cardinality',
-  rate = 'rate',
-  count = 'count',
-}
+export type MetricsExplorerAggregation = rt.TypeOf<typeof metricsExplorerAggregationRT>;
 
-export interface MetricsExplorerMetric {
-  aggregation: MetricsExplorerAggregation;
-  field?: string | undefined;
-}
+export type MetricsExplorerColumnType = rt.TypeOf<typeof metricsExplorerColumnTypeRT>;
 
-export interface MetricsExplorerRequestBody {
-  timerange: InfraTimerange;
-  indexPattern: string;
-  metrics: MetricsExplorerMetric[];
-  groupBy?: string;
-  afterKey?: string;
-  limit?: number;
-  filterQuery?: string;
-}
+export type MetricsExplorerMetric = rt.TypeOf<typeof metricsExplorerMetricRT>;
 
-export interface MetricsExplorerPageInfo {
-  total: number;
-  afterKey?: string | null;
-}
+export type MetricsExplorerPageInfo = rt.TypeOf<typeof metricsExplorerPageInfoRT>;
 
-export enum MetricsExplorerColumnType {
-  date = 'date',
-  number = 'number',
-  string = 'string',
-}
+export type MetricsExplorerColumn = rt.TypeOf<typeof metricsExplorerColumnRT>;
 
-export interface MetricsExplorerColumn {
-  name: string;
-  type: MetricsExplorerColumnType;
-}
+export type MetricsExplorerRow = rt.TypeOf<typeof metricsExplorerRowRT>;
 
-export interface MetricsExplorerRow {
-  timestamp: number;
-  [key: string]: string | number | null | undefined;
-}
+export type MetricsExplorerSeries = rt.TypeOf<typeof metricsExplorerSeriesRT>;
 
-export interface MetricsExplorerSeries {
-  id: string;
-  columns: MetricsExplorerColumn[];
-  rows: MetricsExplorerRow[];
-}
+export type MetricsExplorerRequestBody = rt.TypeOf<typeof metricsExplorerRequestBodyRT>;
 
-export interface MetricsExplorerResponse {
-  series: MetricsExplorerSeries[];
-  pageInfo: MetricsExplorerPageInfo;
-}
+export type MetricsExplorerResponse = rt.TypeOf<typeof metricsExplorerResponseRT>;
diff --git a/x-pack/legacy/plugins/infra/server/routes/snapshot/index.ts b/x-pack/legacy/plugins/infra/server/routes/snapshot/index.ts
index ae707bae79b9e..ba7f52e9ec1e7 100644
--- a/x-pack/legacy/plugins/infra/server/routes/snapshot/index.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/snapshot/index.ts
@@ -31,7 +31,16 @@ export const initSnapshotRoute = (libs: InfraBackendLibs) => {
     },
     async (requestContext, request, response) => {
       try {
-        const { filterQuery, nodeType, groupBy, sourceId, metric, timerange } = pipe(
+        const {
+          filterQuery,
+          nodeType,
+          groupBy,
+          sourceId,
+          metric,
+          timerange,
+          accountId,
+          region,
+        } = pipe(
           SnapshotRequestRT.decode(request.body),
           fold(throwErrors(Boom.badRequest), identity)
         );
@@ -39,6 +48,8 @@ export const initSnapshotRoute = (libs: InfraBackendLibs) => {
         UsageCollector.countNode(nodeType);
         const options: InfraSnapshotRequestOptions = {
           filterQuery: parseFilterQuery(filterQuery),
+          accountId,
+          region,
           // TODO: Use common infra metric and replace graphql type
           nodeType: nodeType as InfraNodeType,
           groupBy,
@@ -47,10 +58,9 @@ export const initSnapshotRoute = (libs: InfraBackendLibs) => {
           metric: metric as InfraSnapshotMetricInput,
           timerange,
         };
+        const nodesWithInterval = await libs.snapshot.getNodes(requestContext, options);
         return response.ok({
-          body: SnapshotNodeResponseRT.encode({
-            nodes: await libs.snapshot.getNodes(requestContext, options),
-          }),
+          body: SnapshotNodeResponseRT.encode(nodesWithInterval),
         });
       } catch (error) {
         return response.internalError({
diff --git a/x-pack/legacy/plugins/infra/server/utils/calculate_metric_interval.ts b/x-pack/legacy/plugins/infra/server/utils/calculate_metric_interval.ts
index 6247c0f0298a0..586193a3c242d 100644
--- a/x-pack/legacy/plugins/infra/server/utils/calculate_metric_interval.ts
+++ b/x-pack/legacy/plugins/infra/server/utils/calculate_metric_interval.ts
@@ -26,7 +26,7 @@ export const calculateMetricInterval = async (
   framework: KibanaFramework,
   requestContext: RequestHandlerContext,
   options: Options,
-  modules: string[],
+  modules?: string[],
   nodeType?: InfraNodeType // TODO: check that this type still makes sense
 ) => {
   let from = options.timerange.from;
diff --git a/x-pack/legacy/plugins/infra/types/eui.d.ts b/x-pack/legacy/plugins/infra/types/eui.d.ts
index 7cf0a91e88c1f..afcb445a66adb 100644
--- a/x-pack/legacy/plugins/infra/types/eui.d.ts
+++ b/x-pack/legacy/plugins/infra/types/eui.d.ts
@@ -43,32 +43,9 @@ declare module '@elastic/eui' {
   };
   export const EuiSideNav: React.FC<EuiSideNavProps>;
 
-  type EuiErrorBoundaryProps = CommonProps & {
-    children: React.ReactNode;
-  };
-
   type EuiSizesResponsive = 'xs' | 's' | 'm' | 'l' | 'xl';
   type EuiResponsiveProps = CommonProps & {
     children: React.ReactNode;
     sizes: EuiSizesResponsive[];
   };
-
-  type EuiInMemoryTableProps = CommonProps & {
-    items?: any;
-    columns?: any;
-    sorting?: any;
-    search?: any;
-    selection?: any;
-    pagination?: any;
-    itemId?: any;
-    isSelectable?: any;
-    loading?: any;
-    hasActions?: any;
-    message?: any;
-    rowProps?: any;
-    cellProps?: any;
-    responsive?: boolean;
-    itemIdToExpandedRowMap?: any;
-  };
-  export const EuiInMemoryTable: React.FC<EuiInMemoryTableProps>;
 }
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 82e8c602a7a3e..3e5c92dfc007f 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
@@ -6,7 +6,7 @@
 import React from 'react';
 import { flatten } from 'lodash';
 import { escapeKuery } from './escape_kuery';
-import { sortPrefixFirst } from 'ui/utils/sort_prefix_first';
+import { sortPrefixFirst } from './sort_prefix_first';
 import { isFilterable } from '../../../../../../src/plugins/data/public';
 import { FormattedMessage } from '@kbn/i18n/react';
 
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.test.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.test.ts
new file mode 100644
index 0000000000000..7db05a60377da
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.test.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 { sortPrefixFirst } from './sort_prefix_first';
+
+describe('sortPrefixFirst', () => {
+  test('should return the original unmodified array if no prefix is provided', () => {
+    const array = ['foo', 'bar', 'baz'];
+    const result = sortPrefixFirst(array);
+
+    expect(result).toBe(array);
+    expect(result).toEqual(['foo', 'bar', 'baz']);
+  });
+
+  test('should sort items that match the prefix first without modifying the original array', () => {
+    const array = ['foo', 'bar', 'baz'];
+    const result = sortPrefixFirst(array, 'b');
+
+    expect(result).not.toBe(array);
+    expect(result).toEqual(['bar', 'baz', 'foo']);
+    expect(array).toEqual(['foo', 'bar', 'baz']);
+  });
+
+  test('should not modify the order of the array other than matching prefix without modifying the original array', () => {
+    const array = ['foo', 'bar', 'baz', 'qux', 'quux'];
+    const result = sortPrefixFirst(array, 'b');
+
+    expect(result).not.toBe(array);
+    expect(result).toEqual(['bar', 'baz', 'foo', 'qux', 'quux']);
+    expect(array).toEqual(['foo', 'bar', 'baz', 'qux', 'quux']);
+  });
+
+  test('should sort objects by property if provided', () => {
+    const array = [
+      { name: 'foo' },
+      { name: 'bar' },
+      { name: 'baz' },
+      { name: 'qux' },
+      { name: 'quux' },
+    ];
+    const result = sortPrefixFirst(array, 'b', 'name');
+
+    expect(result).not.toBe(array);
+    expect(result).toEqual([
+      { name: 'bar' },
+      { name: 'baz' },
+      { name: 'foo' },
+      { name: 'qux' },
+      { name: 'quux' },
+    ]);
+    expect(array).toEqual([
+      { name: 'foo' },
+      { name: 'bar' },
+      { name: 'baz' },
+      { name: 'qux' },
+      { name: 'quux' },
+    ]);
+  });
+
+  test('should handle numbers', () => {
+    const array = [1, 50, 5];
+    const result = sortPrefixFirst(array, 5);
+
+    expect(result).not.toBe(array);
+    expect(result).toEqual([50, 5, 1]);
+  });
+
+  test('should handle mixed case', () => {
+    const array = ['Date Histogram', 'Histogram'];
+    const prefix = 'histo';
+    const result = sortPrefixFirst(array, prefix);
+
+    expect(result).not.toBe(array);
+    expect(result).toEqual(['Histogram', 'Date Histogram']);
+  });
+});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.ts
new file mode 100644
index 0000000000000..123e440b75231
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/autocomplete_providers/sort_prefix_first.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 { partition } from 'lodash';
+
+export function sortPrefixFirst(array: any[], prefix?: string | number, property?: string): any[] {
+  if (!prefix) {
+    return array;
+  }
+  const lowerCasePrefix = ('' + prefix).toLowerCase();
+
+  const partitions = partition(array, entry => {
+    const value = ('' + (property ? entry[property] : entry)).toLowerCase();
+    return value.startsWith(lowerCasePrefix);
+  });
+  return [...partitions[0], ...partitions[1]];
+}
diff --git a/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/legacy/plugins/lens/public/app_plugin/app.test.tsx
index b8176cdb14c12..1cdae05833b98 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
@@ -190,6 +190,7 @@ describe('Lens App', () => {
     (defaultArgs.docStorage.load as jest.Mock).mockResolvedValue({
       id: '1234',
       title: 'Daaaaaaadaumching!',
+      expression: 'valid expression',
       state: {
         query: 'fake query',
         datasourceMetaData: { filterableIndexPatterns: [{ id: '1', title: 'saved' }] },
@@ -219,6 +220,7 @@ describe('Lens App', () => {
       args.editorFrame = frame;
       (args.docStorage.load as jest.Mock).mockResolvedValue({
         id: '1234',
+        expression: 'valid expression',
         state: {
           query: 'fake query',
           datasourceMetaData: { filterableIndexPatterns: [{ id: '1', title: 'saved' }] },
@@ -244,6 +246,7 @@ describe('Lens App', () => {
         expect.objectContaining({
           doc: {
             id: '1234',
+            expression: 'valid expression',
             state: {
               query: 'fake query',
               datasourceMetaData: { filterableIndexPatterns: [{ id: '1', title: 'saved' }] },
@@ -294,6 +297,30 @@ describe('Lens App', () => {
         newTitle: string;
       }
 
+      let defaultArgs: jest.Mocked<{
+        editorFrame: EditorFrameInstance;
+        data: typeof dataStartMock;
+        core: typeof core;
+        dataShim: DataStart;
+        storage: Storage;
+        docId?: string;
+        docStorage: SavedObjectStore;
+        redirectTo: (id?: string) => void;
+      }>;
+
+      beforeEach(() => {
+        defaultArgs = makeDefaultArgs();
+        (defaultArgs.docStorage.load as jest.Mock).mockResolvedValue({
+          id: '1234',
+          title: 'My cool doc',
+          expression: 'valid expression',
+          state: {
+            query: 'kuery',
+            datasourceMetaData: { filterableIndexPatterns: [{ id: '1', title: 'saved' }] },
+          },
+        } as jest.ResolvedValue<Document>);
+      });
+
       function getButton(instance: ReactWrapper): TopNavMenuData {
         return (instance
           .find('[data-test-subj="lnsApp_topNav"]')
@@ -322,12 +349,13 @@ describe('Lens App', () => {
         initialDocId?: string;
       }) {
         const args = {
-          ...makeDefaultArgs(),
+          ...defaultArgs,
           docId: initialDocId,
         };
         args.editorFrame = frame;
         (args.docStorage.load as jest.Mock).mockResolvedValue({
           id: '1234',
+          expression: 'kibana',
           state: {
             query: 'fake query',
             datasourceMetaData: { filterableIndexPatterns: [{ id: '1', title: 'saved' }] },
@@ -335,6 +363,7 @@ describe('Lens App', () => {
         });
         (args.docStorage.save as jest.Mock).mockImplementation(async ({ id }) => ({
           id: id || 'aaa',
+          expression: 'kibana 2',
         }));
 
         const instance = mount(<App {...args} />);
@@ -350,13 +379,12 @@ describe('Lens App', () => {
         const onChange = frame.mount.mock.calls[0][1].onChange;
         onChange({
           filterableIndexPatterns: [],
-          doc: ({ id: initialDocId } as unknown) as Document,
+          doc: ({ id: initialDocId, expression: 'kibana 3' } as unknown) as Document,
         });
 
         instance.update();
 
         expect(getButton(instance).disableButton).toEqual(false);
-
         testSave(instance, saveProps);
 
         await waitForPromises();
@@ -365,7 +393,7 @@ describe('Lens App', () => {
       }
 
       it('shows a disabled save button when the user does not have permissions', async () => {
-        const args = makeDefaultArgs();
+        const args = defaultArgs;
         args.core.application = {
           ...args.core.application,
           capabilities: {
@@ -380,15 +408,40 @@ describe('Lens App', () => {
         expect(getButton(instance).disableButton).toEqual(true);
 
         const onChange = frame.mount.mock.calls[0][1].onChange;
-        onChange({ filterableIndexPatterns: [], doc: ('will save this' as unknown) as Document });
-
+        onChange({
+          filterableIndexPatterns: [],
+          doc: ({ id: 'will save this', expression: 'valid expression' } as unknown) as Document,
+        });
         instance.update();
+        expect(getButton(instance).disableButton).toEqual(true);
+      });
 
+      it('shows a disabled save button when there are no changes to the document', async () => {
+        const args = defaultArgs;
+        (args.docStorage.load as jest.Mock).mockResolvedValue({
+          id: '1234',
+          title: 'My cool doc',
+          expression: '',
+        } as jest.ResolvedValue<Document>);
+        args.editorFrame = frame;
+
+        const instance = mount(<App {...args} />);
         expect(getButton(instance).disableButton).toEqual(true);
+
+        const onChange = frame.mount.mock.calls[0][1].onChange;
+
+        act(() => {
+          onChange({
+            filterableIndexPatterns: [],
+            doc: ({ id: '1234', expression: 'valid expression' } as unknown) as Document,
+          });
+        });
+        instance.update();
+        expect(getButton(instance).disableButton).toEqual(false);
       });
 
       it('shows a save button that is enabled when the frame has provided its state', async () => {
-        const args = makeDefaultArgs();
+        const args = defaultArgs;
         args.editorFrame = frame;
 
         const instance = mount(<App {...args} />);
@@ -396,8 +449,10 @@ describe('Lens App', () => {
         expect(getButton(instance).disableButton).toEqual(true);
 
         const onChange = frame.mount.mock.calls[0][1].onChange;
-        onChange({ filterableIndexPatterns: [], doc: ('will save this' as unknown) as Document });
-
+        onChange({
+          filterableIndexPatterns: [],
+          doc: ({ id: 'will save this', expression: 'valid expression' } as unknown) as Document,
+        });
         instance.update();
 
         expect(getButton(instance).disableButton).toEqual(false);
@@ -413,6 +468,7 @@ describe('Lens App', () => {
         expect(args.docStorage.save).toHaveBeenCalledWith({
           id: undefined,
           title: 'hello there',
+          expression: 'kibana 3',
         });
 
         expect(args.redirectTo).toHaveBeenCalledWith('aaa');
@@ -432,6 +488,7 @@ describe('Lens App', () => {
         expect(args.docStorage.save).toHaveBeenCalledWith({
           id: undefined,
           title: 'hello there',
+          expression: 'kibana 3',
         });
 
         expect(args.redirectTo).toHaveBeenCalledWith('aaa');
@@ -451,6 +508,7 @@ describe('Lens App', () => {
         expect(args.docStorage.save).toHaveBeenCalledWith({
           id: '1234',
           title: 'hello there',
+          expression: 'kibana 3',
         });
 
         expect(args.redirectTo).not.toHaveBeenCalled();
@@ -461,14 +519,17 @@ describe('Lens App', () => {
       });
 
       it('handles save failure by showing a warning, but still allows another save', async () => {
-        const args = makeDefaultArgs();
+        const args = defaultArgs;
         args.editorFrame = frame;
         (args.docStorage.save as jest.Mock).mockRejectedValue({ message: 'failed' });
 
         const instance = mount(<App {...args} />);
 
         const onChange = frame.mount.mock.calls[0][1].onChange;
-        onChange({ filterableIndexPatterns: [], doc: ({ id: undefined } as unknown) as Document });
+        onChange({
+          filterableIndexPatterns: [],
+          doc: ({ id: undefined, expression: 'new expression' } as unknown) as Document,
+        });
 
         instance.update();
 
@@ -486,8 +547,32 @@ describe('Lens App', () => {
   });
 
   describe('query bar state management', () => {
+    let defaultArgs: jest.Mocked<{
+      editorFrame: EditorFrameInstance;
+      data: typeof dataStartMock;
+      core: typeof core;
+      dataShim: DataStart;
+      storage: Storage;
+      docId?: string;
+      docStorage: SavedObjectStore;
+      redirectTo: (id?: string) => void;
+    }>;
+
+    beforeEach(() => {
+      defaultArgs = makeDefaultArgs();
+      (defaultArgs.docStorage.load as jest.Mock).mockResolvedValue({
+        id: '1234',
+        title: 'My cool doc',
+        expression: 'valid expression',
+        state: {
+          query: 'kuery',
+          datasourceMetaData: { filterableIndexPatterns: [{ id: '1', title: 'saved' }] },
+        },
+      } as jest.ResolvedValue<Document>);
+    });
+
     it('uses the default time and query language settings', () => {
-      const args = makeDefaultArgs();
+      const args = defaultArgs;
       args.editorFrame = frame;
 
       mount(<App {...args} />);
@@ -510,7 +595,7 @@ describe('Lens App', () => {
     });
 
     it('updates the index patterns when the editor frame is changed', async () => {
-      const args = makeDefaultArgs();
+      const args = defaultArgs;
       args.editorFrame = frame;
 
       const instance = mount(<App {...args} />);
@@ -525,7 +610,7 @@ describe('Lens App', () => {
       const onChange = frame.mount.mock.calls[0][1].onChange;
       onChange({
         filterableIndexPatterns: [{ id: '1', title: 'newIndex' }],
-        doc: ({ id: undefined } as unknown) as Document,
+        doc: ({ id: undefined, expression: 'valid expression' } as unknown) as Document,
       });
 
       await waitForPromises();
@@ -541,7 +626,7 @@ describe('Lens App', () => {
       // Do it again to verify that the dirty checking is done right
       onChange({
         filterableIndexPatterns: [{ id: '2', title: 'second index' }],
-        doc: ({ id: undefined } as unknown) as Document,
+        doc: ({ id: undefined, expression: 'valid expression' } as unknown) as Document,
       });
 
       await waitForPromises();
@@ -556,7 +641,7 @@ describe('Lens App', () => {
     });
 
     it('updates the editor frame when the user changes query or time in the search bar', () => {
-      const args = makeDefaultArgs();
+      const args = defaultArgs;
       args.editorFrame = frame;
 
       const instance = mount(<App {...args} />);
@@ -586,7 +671,7 @@ describe('Lens App', () => {
     });
 
     it('updates the filters when the user changes them', () => {
-      const args = makeDefaultArgs();
+      const args = defaultArgs;
       args.editorFrame = frame;
 
       const instance = mount(<App {...args} />);
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 d3f2ac624a692..cb57f2c884e38 100644
--- a/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
+++ b/x-pack/legacy/plugins/lens/public/app_plugin/app.tsx
@@ -150,7 +150,11 @@ export function App({
     }
   }, [docId]);
 
-  const isSaveable = lastKnownDoc && core.application.capabilities.visualize.save;
+  const isSaveable =
+    lastKnownDoc &&
+    lastKnownDoc.expression &&
+    lastKnownDoc.expression.length > 0 &&
+    core.application.capabilities.visualize.save;
 
   const onError = useCallback(
     (e: { message: string }) =>
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 3dd4373347129..9b85e89cd80eb 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
@@ -13,7 +13,7 @@ import { ExpressionRenderer } from 'src/plugins/expressions/public';
 
 export interface ExpressionWrapperProps {
   ExpressionRenderer: ExpressionRenderer;
-  expression: string;
+  expression: string | null;
   context: {
     timeRange?: TimeRange;
     query?: Query;
@@ -29,7 +29,7 @@ export function ExpressionWrapper({
 }: ExpressionWrapperProps) {
   return (
     <I18nProvider>
-      {expression === '' ? (
+      {expression === null || expression === '' ? (
         <EuiFlexGroup direction="column" alignItems="center" justifyContent="center">
           <EuiFlexItem>
             <EuiIcon type="alert" color="danger" />
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/merge_tables.test.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/merge_tables.test.ts
index 8f124c25542c7..ffb8be1deaa9e 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/merge_tables.test.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/merge_tables.test.ts
@@ -8,6 +8,8 @@ import moment from 'moment';
 import { mergeTables } from './merge_tables';
 import { KibanaDatatable } from 'src/plugins/expressions/public';
 
+jest.mock('ui/new_platform');
+
 describe('lens_merge_tables', () => {
   it('should produce a row with the nested table as defined', () => {
     const sampleTable1: KibanaDatatable = {
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 f3e86c5b59214..626ef99ac13aa 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
@@ -17,7 +17,7 @@ import {
 import { DropHandler, DragContextState } from '../../drag_drop';
 import { createMockedDragDropContext } from '../mocks';
 import { mountWithIntl as mount, shallowWithIntl as shallow } from 'test_utils/enzyme_helpers';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpServiceBase } from 'src/core/public';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'src/core/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { IndexPatternPrivateState } from '../types';
 import { documentField } from '../document_field';
@@ -138,7 +138,7 @@ describe('IndexPatternDimensionPanel', () => {
       storage: {} as IStorageWrapper,
       uiSettings: {} as IUiSettingsClient,
       savedObjectsClient: {} as SavedObjectsClientContract,
-      http: {} as HttpServiceBase,
+      http: {} as HttpSetup,
     };
 
     jest.clearAllMocks();
@@ -610,7 +610,7 @@ describe('IndexPatternDimensionPanel', () => {
       });
     });
 
-    it('should indicate document compatibility with selected field operation', () => {
+    it('should select the Records field when count is selected', () => {
       const initialState: IndexPatternPrivateState = {
         ...state,
         layers: {
@@ -639,12 +639,9 @@ describe('IndexPatternDimensionPanel', () => {
         .find('button[data-test-subj="lns-indexPatternDimensionIncompatible-count"]')
         .simulate('click');
 
-      const options = wrapper.find(EuiComboBox).prop('options');
-
-      expect(options![0]['data-test-subj']).not.toContain('Incompatible');
-      options![1].options!.map(option =>
-        expect(option['data-test-subj']).toContain('Incompatible')
-      );
+      const newColumnState = setState.mock.calls[0][0].layers.first.columns.col2;
+      expect(newColumnState.operationType).toEqual('count');
+      expect(newColumnState.sourceField).toEqual('Records');
     });
 
     it('should indicate document and field compatibility with selected document operation', () => {
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 fded53cd35f59..dfeb8632d096e 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
@@ -8,7 +8,7 @@ import _ from 'lodash';
 import React, { memo, useMemo } from 'react';
 import { EuiButtonIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpServiceBase } from 'src/core/public';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'src/core/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { DatasourceDimensionPanelProps, StateSetter } from '../../types';
 import { IndexPatternColumn, OperationType } from '../indexpattern';
@@ -29,7 +29,7 @@ export type IndexPatternDimensionPanelProps = DatasourceDimensionPanelProps & {
   storage: IStorageWrapper;
   savedObjectsClient: SavedObjectsClientContract;
   layerId: string;
-  http: HttpServiceBase;
+  http: HttpSetup;
   uniqueLabel: string;
   dateRange: DateRange;
 };
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 ba18cd150c7a5..46d7233ba9587 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
@@ -9,10 +9,7 @@ import React, { useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiComboBox, EuiFlexGroup, EuiFlexItem, EuiComboBoxOptionProps } from '@elastic/eui';
 import classNames from 'classnames';
-import {
-  // @ts-ignore
-  EuiHighlight,
-} from '@elastic/eui';
+import { EuiHighlight } from '@elastic/eui';
 import { OperationType } from '../indexpattern';
 import { LensFieldIcon } from '../lens_field_icon';
 import { DataType } from '../../types';
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 c44d63b01c1b3..98773c04db4a6 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
@@ -127,7 +127,7 @@ export function PopoverEditor(props: PopoverEditorProps) {
             compatibleWithCurrentField ? '' : 'Incompatible'
           }-${operationType}`,
           onClick() {
-            if (!selectedColumn) {
+            if (!selectedColumn || !compatibleWithCurrentField) {
               const possibleFields = fieldByOperation[operationType] || [];
 
               if (possibleFields.length === 1) {
@@ -152,11 +152,6 @@ export function PopoverEditor(props: PopoverEditorProps) {
               trackUiEvent(`indexpattern_dimension_operation_${operationType}`);
               return;
             }
-            if (!compatibleWithCurrentField) {
-              setInvalidOperationType(operationType);
-              trackUiEvent(`indexpattern_dimension_operation_${operationType}`);
-              return;
-            }
             if (incompatibleSelectedOperationType) {
               setInvalidOperationType(null);
             }
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 20505107be122..4a58f0354882a 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
@@ -26,9 +26,6 @@ import {
   Axis,
   BarSeries,
   Chart,
-  DataSeriesColorsValues,
-  getAxisId,
-  getSpecId,
   niceTimeFormatter,
   Position,
   ScaleType,
@@ -391,18 +388,11 @@ function FieldItemPopoverContents(props: State & FieldItemProps) {
   }
 
   if (histogram && histogram.buckets.length) {
-    const specId = getSpecId(
-      i18n.translate('xpack.lens.indexPattern.fieldStatsCountLabel', {
-        defaultMessage: 'Count',
-      })
-    );
-    const colors: DataSeriesColorsValues = {
-      colorValues: [],
-      specId,
-    };
+    const specId = i18n.translate('xpack.lens.indexPattern.fieldStatsCountLabel', {
+      defaultMessage: 'Count',
+    });
     const expectedColor = getColorForDataType(field.type);
-
-    const seriesColors = new Map([[colors, expectedColor]]);
+    const seriesColors = expectedColor ? [expectedColor] : undefined;
 
     if (field.type === 'date') {
       return wrapInPopover(
@@ -422,7 +412,7 @@ function FieldItemPopoverContents(props: State & FieldItemProps) {
           />
 
           <Axis
-            id={getAxisId('key')}
+            id="key"
             position={Position.Bottom}
             tickFormat={
               fromDate && toDate
@@ -450,7 +440,7 @@ function FieldItemPopoverContents(props: State & FieldItemProps) {
           <Settings rotation={90} tooltip={{ type: TooltipType.None }} theme={chartTheme} />
 
           <Axis
-            id={getAxisId('key')}
+            id="key"
             position={Position.Left}
             showOverlappingTicks={true}
             tickFormat={d => formatter.convert(d)}
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 15f19bb9d97e6..b58a2d8ca52c7 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/indexpattern.tsx
@@ -115,8 +115,12 @@ export function getIndexPatternDatasource({
   const indexPatternDatasource: Datasource<IndexPatternPrivateState, IndexPatternPersistedState> = {
     id: 'indexpattern',
 
-    initialize(state?: IndexPatternPersistedState) {
-      return loadInitialState({ state, savedObjectsClient });
+    async initialize(state?: IndexPatternPersistedState) {
+      return loadInitialState({
+        state,
+        savedObjectsClient,
+        defaultIndexPatternId: core.uiSettings.get('defaultIndex'),
+      });
     },
 
     getPersistableState({ currentIndexPatternId, layers }: IndexPatternPrivateState) {
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 2fb678aed5a54..e180ab690d418 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
@@ -114,8 +114,9 @@ const sampleIndexPatterns = {
       {
         name: 'source',
         type: 'string',
-        aggregatable: true,
-        searchable: true,
+        aggregatable: false,
+        searchable: false,
+        scripted: true,
         aggregationRestrictions: {
           terms: {
             agg: 'terms',
@@ -196,7 +197,7 @@ describe('loader', () => {
       expect(cache).toMatchObject(sampleIndexPatterns);
     });
 
-    it('should not allow full text fields', async () => {
+    it('should allow scripted, but not full text fields', async () => {
       const cache = await loadIndexPatterns({
         cache: {},
         patterns: ['a', 'b'],
@@ -286,6 +287,26 @@ describe('loader', () => {
       });
     });
 
+    it('should use the default index pattern id, if provided', async () => {
+      const state = await loadInitialState({
+        defaultIndexPatternId: 'b',
+        savedObjectsClient: mockClient(),
+      });
+
+      expect(state).toMatchObject({
+        currentIndexPatternId: 'b',
+        indexPatternRefs: [
+          { id: 'a', title: sampleIndexPatterns.a.title },
+          { id: 'b', title: sampleIndexPatterns.b.title },
+        ],
+        indexPatterns: {
+          b: sampleIndexPatterns.b,
+        },
+        layers: {},
+        showEmptyFields: false,
+      });
+    });
+
     it('should initialize from saved state', async () => {
       const savedState: IndexPatternPersistedState = {
         currentIndexPatternId: 'b',
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 89d4224a7df14..7f46f50786cf4 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
@@ -6,11 +6,7 @@
 
 import _ from 'lodash';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import {
-  SavedObjectsClientContract,
-  SavedObjectAttributes,
-  HttpServiceBase,
-} from 'src/core/public';
+import { SavedObjectsClientContract, SavedObjectAttributes, HttpSetup } from 'src/core/public';
 import { SimpleSavedObject } from 'src/core/public';
 import { StateSetter } from '../types';
 import {
@@ -88,9 +84,11 @@ export async function loadIndexPatterns({
 export async function loadInitialState({
   state,
   savedObjectsClient,
+  defaultIndexPatternId,
 }: {
   state?: IndexPatternPersistedState;
   savedObjectsClient: SavedObjectsClient;
+  defaultIndexPatternId?: string;
 }): Promise<IndexPatternPrivateState> {
   const indexPatternRefs = await loadIndexPatternRefs(savedObjectsClient);
   const requiredPatterns = _.unique(
@@ -98,7 +96,7 @@ export async function loadInitialState({
       ? Object.values(state.layers)
           .map(l => l.indexPatternId)
           .concat(state.currentIndexPatternId)
-      : [indexPatternRefs[0].id]
+      : [defaultIndexPatternId || indexPatternRefs[0].id]
   );
 
   const currentIndexPatternId = requiredPatterns[0];
@@ -233,7 +231,7 @@ export async function syncExistingFields({
 }: {
   dateRange: DateRange;
   indexPatterns: Array<{ title: string; timeFieldName?: string | null }>;
-  fetchJson: HttpServiceBase['get'];
+  fetchJson: HttpSetup['get'];
   setState: SetState;
 }) {
   const emptinessInfo = await Promise.all(
@@ -284,7 +282,7 @@ function fromSavedObject(
     type,
     title: attributes.title,
     fields: (JSON.parse(attributes.fields) as IndexPatternField[])
-      .filter(({ aggregatable }) => !!aggregatable)
+      .filter(({ aggregatable, scripted }) => !!aggregatable || !!scripted)
       .concat(documentField),
     typeMeta: attributes.typeMeta
       ? (JSON.parse(attributes.typeMeta) as SavedRestrictionsInfo)
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 f7125a1adae52..2bd6c7106a952 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
@@ -9,24 +9,40 @@ import { DateHistogramIndexPatternColumn } from './date_histogram';
 import { dateHistogramOperation } from '.';
 import { shallow } from 'enzyme';
 import { EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpServiceBase } from 'src/core/public';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'src/core/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { createMockedIndexPattern } from '../../mocks';
 import { IndexPatternPrivateState } from '../../types';
 
-jest.mock('ui/new_platform', () => ({
-  npStart: {
-    core: {
-      uiSettings: {
-        get: (path: string) => {
-          if (path === 'histogram:maxBars') {
-            return 10;
-          }
+jest.mock('ui/new_platform', () => {
+  // Due to the way we are handling shims in the NP migration, we need
+  // to mock core here so that upstream services don't cause these
+  // tests to fail. Ordinarly `jest.mock('ui/new_platform')` would be
+  // sufficient, however we need to mock one of the `uiSettings` return
+  // values for this suite, so we must manually assemble the mock.
+  // Because babel hoists `jest` we must use an inline `require`
+  // to ensure the core mocks are available (`jest.doMock` doesn't
+  // work in this case). This mock should be able to be replaced
+  // altogether once Lens has migrated to the new platform.
+  const { coreMock } = require('src/core/public/mocks'); // eslint-disable-line @typescript-eslint/no-var-requires
+  return {
+    npSetup: {
+      core: coreMock.createSetup(),
+    },
+    npStart: {
+      core: {
+        ...coreMock.createStart(),
+        uiSettings: {
+          get: (path: string) => {
+            if (path === 'histogram:maxBars') {
+              return 10;
+            }
+          },
         },
       },
     },
-  },
-}));
+  };
+});
 
 const defaultOptions = {
   storage: {} as IStorageWrapper,
@@ -36,7 +52,7 @@ const defaultOptions = {
     fromDate: 'now-1y',
     toDate: 'now',
   },
-  http: {} as HttpServiceBase,
+  http: {} as HttpSetup,
 };
 
 describe('date_histogram', () => {
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 944a23c9af193..0bb653ac1e0c2 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
@@ -208,7 +208,11 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
                   <EuiFlexItem>
                     <EuiFieldNumber
                       data-test-subj="lensDateHistogramValue"
-                      value={interval.value}
+                      value={
+                        typeof interval.value === 'number' || interval.value === ''
+                          ? interval.value
+                          : parseInt(interval.value, 10)
+                      }
                       disabled={calendarOnlyIntervals.has(interval.unit)}
                       isInvalid={!isValid}
                       onChange={e => {
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 252a3d788fd30..63e4564878e31 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,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IUiSettingsClient, SavedObjectsClientContract, HttpServiceBase } from 'src/core/public';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'src/core/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { termsOperation } from './terms';
 import { cardinalityOperation } from './cardinality';
@@ -47,7 +47,7 @@ export interface ParamEditorProps<C extends BaseIndexPatternColumn> {
   uiSettings: IUiSettingsClient;
   storage: IStorageWrapper;
   savedObjectsClient: SavedObjectsClientContract;
-  http: HttpServiceBase;
+  http: HttpSetup;
   dateRange: DateRange;
 }
 
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 c0d995d420760..a891814bb0496 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
@@ -7,7 +7,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { EuiRange, EuiSelect } from '@elastic/eui';
-import { IUiSettingsClient, SavedObjectsClientContract, HttpServiceBase } from 'src/core/public';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'src/core/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { createMockedIndexPattern } from '../../mocks';
 import { TermsIndexPatternColumn } from './terms';
@@ -21,7 +21,7 @@ const defaultProps = {
   uiSettings: {} as IUiSettingsClient,
   savedObjectsClient: {} as SavedObjectsClientContract,
   dateRange: { fromDate: 'now-1d', toDate: 'now' },
-  http: {} as HttpServiceBase,
+  http: {} as HttpSetup,
 };
 
 describe('terms', () => {
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 9ed5083633314..50478515d19ce 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/types.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/types.ts
@@ -39,6 +39,7 @@ export interface IndexPatternField {
   type: string;
   esTypes?: string[];
   aggregatable: boolean;
+  scripted?: boolean;
   searchable: boolean;
   aggregationRestrictions?: AggregationRestrictions;
 }
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 15d36a7c31169..8bb1e086a37c2 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
@@ -12,7 +12,7 @@ import {
   trackSuggestionEvent,
 } from './factory';
 import { coreMock } from 'src/core/public/mocks';
-import { HttpServiceBase } from 'kibana/public';
+import { HttpSetup } from 'kibana/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 
 jest.useFakeTimers();
@@ -31,7 +31,7 @@ const createMockStorage = () => {
 
 describe('Lens UI telemetry', () => {
   let storage: jest.Mocked<IStorageWrapper>;
-  let http: jest.Mocked<HttpServiceBase>;
+  let http: jest.Mocked<HttpSetup>;
   let dateSpy: jest.SpyInstance;
 
   beforeEach(() => {
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 1a8ec604eda54..babc65969afb5 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
@@ -5,7 +5,7 @@
  */
 
 import moment from 'moment';
-import { HttpServiceBase } from 'src/core/public';
+import { HttpSetup } from 'src/core/public';
 
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { BASE_API_URL } from '../../common';
@@ -44,10 +44,10 @@ export class LensReportManager {
   private suggestionEvents: Record<string, Record<string, number>> = {};
 
   private storage: IStorageWrapper;
-  private http: HttpServiceBase;
+  private http: HttpSetup;
   private timer: ReturnType<typeof setInterval>;
 
-  constructor({ storage, http }: { storage: IStorageWrapper; http: HttpServiceBase }) {
+  constructor({ storage, http }: { storage: IStorageWrapper; http: HttpSetup }) {
     this.storage = storage;
     this.http = http;
 
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 4337482663a9c..1d36e18c726ec 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
@@ -13,7 +13,7 @@ export interface Document {
   type?: string;
   visualizationType: string | null;
   title: string;
-  expression: string;
+  expression: string | null;
   state: {
     datasourceMetaData: {
       filterableIndexPatterns: Array<{ id: string; title: 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 5089a3b8a3a22..8df2d764c0208 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
@@ -4,7 +4,7 @@ exports[`xy_expression XYChart component it renders area 1`] = `
 <Chart
   renderer="canvas"
 >
-  <inject-SettingsComponent-with-chartStore
+  <Connect(spec)
     legendPosition="top"
     rotation={0}
     showLegend={false}
@@ -130,21 +130,21 @@ exports[`xy_expression XYChart component it renders area 1`] = `
       }
     }
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="x"
     position="bottom"
     showGridLines={false}
     tickFormat={[Function]}
     title="c"
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="y"
     position="left"
     showGridLines={false}
     tickFormat={[Function]}
     title=""
   />
-  <inject-AreaSeriesSpecComponent-with-chartStore
+  <Connect(spec)
     data={
       Array [
         Object {
@@ -190,7 +190,7 @@ exports[`xy_expression XYChart component it renders bar 1`] = `
 <Chart
   renderer="canvas"
 >
-  <inject-SettingsComponent-with-chartStore
+  <Connect(spec)
     legendPosition="top"
     rotation={0}
     showLegend={false}
@@ -316,21 +316,21 @@ exports[`xy_expression XYChart component it renders bar 1`] = `
       }
     }
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="x"
     position="bottom"
     showGridLines={false}
     tickFormat={[Function]}
     title="c"
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="y"
     position="left"
     showGridLines={false}
     tickFormat={[Function]}
     title=""
   />
-  <inject-BarSeriesSpecComponent-with-chartStore
+  <Connect(spec)
     data={
       Array [
         Object {
@@ -376,7 +376,7 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = `
 <Chart
   renderer="canvas"
 >
-  <inject-SettingsComponent-with-chartStore
+  <Connect(spec)
     legendPosition="top"
     rotation={90}
     showLegend={false}
@@ -502,21 +502,21 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = `
       }
     }
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="x"
     position="left"
     showGridLines={false}
     tickFormat={[Function]}
     title="c"
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="y"
     position="bottom"
     showGridLines={false}
     tickFormat={[Function]}
     title=""
   />
-  <inject-BarSeriesSpecComponent-with-chartStore
+  <Connect(spec)
     data={
       Array [
         Object {
@@ -562,7 +562,7 @@ exports[`xy_expression XYChart component it renders line 1`] = `
 <Chart
   renderer="canvas"
 >
-  <inject-SettingsComponent-with-chartStore
+  <Connect(spec)
     legendPosition="top"
     rotation={0}
     showLegend={false}
@@ -688,21 +688,21 @@ exports[`xy_expression XYChart component it renders line 1`] = `
       }
     }
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="x"
     position="bottom"
     showGridLines={false}
     tickFormat={[Function]}
     title="c"
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="y"
     position="left"
     showGridLines={false}
     tickFormat={[Function]}
     title=""
   />
-  <inject-LineSeriesSpecComponent-with-chartStore
+  <Connect(spec)
     data={
       Array [
         Object {
@@ -748,7 +748,7 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
 <Chart
   renderer="canvas"
 >
-  <inject-SettingsComponent-with-chartStore
+  <Connect(spec)
     legendPosition="top"
     rotation={0}
     showLegend={false}
@@ -874,21 +874,21 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
       }
     }
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="x"
     position="bottom"
     showGridLines={false}
     tickFormat={[Function]}
     title="c"
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="y"
     position="left"
     showGridLines={false}
     tickFormat={[Function]}
     title=""
   />
-  <inject-AreaSeriesSpecComponent-with-chartStore
+  <Connect(spec)
     data={
       Array [
         Object {
@@ -938,7 +938,7 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = `
 <Chart
   renderer="canvas"
 >
-  <inject-SettingsComponent-with-chartStore
+  <Connect(spec)
     legendPosition="top"
     rotation={0}
     showLegend={false}
@@ -1064,21 +1064,21 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = `
       }
     }
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="x"
     position="bottom"
     showGridLines={false}
     tickFormat={[Function]}
     title="c"
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="y"
     position="left"
     showGridLines={false}
     tickFormat={[Function]}
     title=""
   />
-  <inject-BarSeriesSpecComponent-with-chartStore
+  <Connect(spec)
     data={
       Array [
         Object {
@@ -1128,7 +1128,7 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] =
 <Chart
   renderer="canvas"
 >
-  <inject-SettingsComponent-with-chartStore
+  <Connect(spec)
     legendPosition="top"
     rotation={90}
     showLegend={false}
@@ -1254,21 +1254,21 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] =
       }
     }
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="x"
     position="left"
     showGridLines={false}
     tickFormat={[Function]}
     title="c"
   />
-  <inject-AxisSpec-with-chartStore
+  <Connect(spec)
     id="y"
     position="bottom"
     showGridLines={false}
     tickFormat={[Function]}
     title=""
   />
-  <inject-BarSeriesSpecComponent-with-chartStore
+  <Connect(spec)
     data={
       Array [
         Object {
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 9b6dcfa8d0f56..878db1fe9a458 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
@@ -447,6 +447,11 @@ describe('xy_expression', () => {
         .find(Axis)
         .first()
         .prop('tickFormat');
+
+      if (!tickFormatter) {
+        throw new Error('tickFormatter prop not found');
+      }
+
       tickFormatter('I');
 
       expect(convertSpy).toHaveBeenCalledWith('I');
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 3c113eaca7ed1..32c1ace5b1770 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
@@ -12,8 +12,6 @@ import {
   Settings,
   Axis,
   LineSeries,
-  getAxisId,
-  getSpecId,
   AreaSeries,
   BarSeries,
   Position,
@@ -205,7 +203,7 @@ export function XYChart({ data, args, formatFactory, timeZone }: XYChartRenderPr
       />
 
       <Axis
-        id={getAxisId('x')}
+        id="x"
         position={shouldRotate ? Position.Left : Position.Bottom}
         title={xTitle}
         showGridLines={false}
@@ -214,7 +212,7 @@ export function XYChart({ data, args, formatFactory, timeZone }: XYChartRenderPr
       />
 
       <Axis
-        id={getAxisId('y')}
+        id="y"
         position={shouldRotate ? Position.Bottom : Position.Left}
         title={args.yTitle}
         showGridLines={false}
@@ -260,7 +258,7 @@ export function XYChart({ data, args, formatFactory, timeZone }: XYChartRenderPr
             key: index,
             splitSeriesAccessors: sanitized.splitAccessor ? [sanitized.splitAccessor] : [],
             stackAccessors: seriesType.includes('stacked') ? [xAccessor] : [],
-            id: getSpecId(idForLegend),
+            id: idForLegend,
             xAccessor,
             yAccessors,
             data: sanitized.rows,
diff --git a/x-pack/legacy/plugins/lens/server/usage/task.ts b/x-pack/legacy/plugins/lens/server/usage/task.ts
index 64bc37ce909a2..9d0ec725800cd 100644
--- a/x-pack/legacy/plugins/lens/server/usage/task.ts
+++ b/x-pack/legacy/plugins/lens/server/usage/task.ts
@@ -16,7 +16,7 @@ import {
 } from 'elasticsearch';
 import { ESSearchResponse } from '../../../apm/typings/elasticsearch';
 import { XPackMainPlugin } from '../../../xpack_main/server/xpack_main';
-import { RunContext } from '../../../task_manager';
+import { RunContext } from '../../../task_manager/server';
 import { getVisualizationCounts } from './visualization_counts';
 
 // This task is responsible for running daily and aggregating all the Lens click event objects
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 b0bd05349a50c..9736a9bd9fb9b 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\\"><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 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\\" role=\\"img\\" aria-hidden=\\"true\\"></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\\"><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>"`;
+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\\" role=\\"img\\" aria-hidden=\\"true\\"></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__/request_trial_extension.test.js.snap b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap
index 8670b2c378dca..0f4e8f9b63aa0 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap
+++ b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap
@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`RequestTrialExtension component should display when enterprise license is not active and trial has been used 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Extend your trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>If you’d like to continue using machine learning, advanced security, and our other awesome <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a>, request an extension now.</span></p></div></div><div class=\\"euiCard__footer\\"><a class=\\"euiButton euiButton--primary\\" href=\\"https://www.elastic.co/trialextension\\" target=\\"_blank\\" rel=\\"noopener\\" data-test-subj=\\"extendTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Extend trial</span></span></a></div></div></div>"`;
+
 exports[`RequestTrialExtension component should display when license is active and trial has been used 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Extend your trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>If you’d like to continue using machine learning, advanced security, and our other awesome <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a>, request an extension now.</span></p></div></div><div class=\\"euiCard__footer\\"><a class=\\"euiButton euiButton--primary\\" href=\\"https://www.elastic.co/trialextension\\" target=\\"_blank\\" rel=\\"noopener\\" data-test-subj=\\"extendTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Extend trial</span></span></a></div></div></div>"`;
 
 exports[`RequestTrialExtension component should display when license is not active and trial has been used 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Extend your trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>If you’d like to continue using machine learning, advanced security, and our other awesome <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a>, request an extension now.</span></p></div></div><div class=\\"euiCard__footer\\"><a class=\\"euiButton euiButton--primary\\" href=\\"https://www.elastic.co/trialextension\\" target=\\"_blank\\" rel=\\"noopener\\" data-test-subj=\\"extendTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Extend trial</span></span></a></div></div></div>"`;
diff --git a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap
index df82a820e9513..9370b77e29560 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap
+++ b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/start_trial.test.js.snap
@@ -2,6 +2,8 @@
 
 exports[`StartTrial component when trial is allowed display for basic license 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Start a 30-day trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>Experience what machine learning, advanced security, and all our other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a> have to offer.</span></p></div></div><div class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\" data-test-subj=\\"startTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Start trial</span></span></button></div></div></div>"`;
 
+exports[`StartTrial component when trial is allowed should display for expired enterprise license 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Start a 30-day trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>Experience what machine learning, advanced security, and all our other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a> have to offer.</span></p></div></div><div class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\" data-test-subj=\\"startTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Start trial</span></span></button></div></div></div>"`;
+
 exports[`StartTrial component when trial is allowed should display for expired platinum license 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Start a 30-day trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>Experience what machine learning, advanced security, and all our other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a> have to offer.</span></p></div></div><div class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\" data-test-subj=\\"startTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Start trial</span></span></button></div></div></div>"`;
 
 exports[`StartTrial component when trial is allowed should display for gold license 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Start a 30-day trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>Experience what machine learning, advanced security, and all our other <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a> have to offer.</span></p></div></div><div class=\\"euiCard__footer\\"><button class=\\"euiButton euiButton--primary\\" type=\\"button\\" data-test-subj=\\"startTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Start trial</span></span></button></div></div></div>"`;
diff --git a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
index 5d6f10b1bda3e..9256bee4e756b 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
+++ b/x-pack/legacy/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
@@ -136,7 +136,6 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
     >
       <EuiPageContent
         horizontalPosition="center"
-        panelPaddingSize="l"
         verticalPosition="center"
       >
         <EuiPanel
@@ -203,6 +202,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                 class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                                 focusable="false"
                                 height="16"
+                                role="img"
                                 viewBox="0 0 16 16"
                                 width="16"
                                 xmlns="http://www.w3.org/2000/svg"
@@ -398,6 +398,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                           class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
                                           height="16"
+                                          role="img"
                                           viewBox="0 0 16 16"
                                           width="16"
                                           xmlns="http://www.w3.org/2000/svg"
@@ -508,6 +509,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                             class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                                             focusable="false"
                                             height="16"
+                                            role="img"
                                             viewBox="0 0 16 16"
                                             width="16"
                                             xmlns="http://www.w3.org/2000/svg"
@@ -627,16 +629,18 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                         type="cross"
                                       >
                                         <EuiIconEmpty
-                                          aria-hidden="true"
+                                          aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
+                                          role="img"
                                           style={null}
                                         >
                                           <svg
-                                            aria-hidden="true"
+                                            aria-hidden={true}
                                             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                                             focusable="false"
                                             height={16}
+                                            role="img"
                                             style={null}
                                             viewBox="0 0 16 16"
                                             width={16}
@@ -915,16 +919,18 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                             type="importAction"
                                           >
                                             <EuiIconEmpty
-                                              aria-hidden="true"
+                                              aria-hidden={true}
                                               className="euiIcon euiIcon--large euiIcon-isLoading euiFilePicker__icon"
                                               focusable="false"
+                                              role="img"
                                               style={null}
                                             >
                                               <svg
-                                                aria-hidden="true"
+                                                aria-hidden={true}
                                                 className="euiIcon euiIcon--large euiIcon-isLoading euiFilePicker__icon"
                                                 focusable="false"
                                                 height={16}
+                                                role="img"
                                                 style={null}
                                                 viewBox="0 0 16 16"
                                                 width={16}
@@ -1187,7 +1193,6 @@ exports[`UploadLicense should display an error when ES says license is expired 1
     >
       <EuiPageContent
         horizontalPosition="center"
-        panelPaddingSize="l"
         verticalPosition="center"
       >
         <EuiPanel
@@ -1379,23 +1384,26 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                                             type="importAction"
                                           >
                                             <EuiIconImport
-                                              aria-hidden="true"
+                                              aria-hidden={true}
                                               className="euiIcon euiIcon--large euiIcon-isLoaded euiFilePicker__icon"
                                               focusable="false"
+                                              role="img"
                                               style={null}
                                             >
                                               <svg
-                                                aria-hidden="true"
+                                                aria-hidden={true}
                                                 className="euiIcon euiIcon--large euiIcon-isLoaded euiFilePicker__icon"
                                                 focusable="false"
                                                 height={16}
+                                                role="img"
                                                 style={null}
                                                 viewBox="0 0 16 16"
                                                 width={16}
                                                 xmlns="http://www.w3.org/2000/svg"
                                               >
+                                                <title />
                                                 <path
-                                                  d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
+                                                  d="M9 10.114l1.85-1.943a.52.52 0 01.77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 01-2.31 0L5.41 9a.617.617 0 010-.829.52.52 0 01.77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 00-.972.804l-1.189 6A.995.995 0 002.991 14h11.018a1 1 0 00.972-1.196l-1.19-6a.993.993 0 00-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0114.016 15H2.984a1.992 1.992 0 01-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
                                                 />
                                               </svg>
                                             </EuiIconImport>
@@ -1655,7 +1663,6 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
     >
       <EuiPageContent
         horizontalPosition="center"
-        panelPaddingSize="l"
         verticalPosition="center"
       >
         <EuiPanel
@@ -1847,23 +1854,26 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                                             type="importAction"
                                           >
                                             <EuiIconImport
-                                              aria-hidden="true"
+                                              aria-hidden={true}
                                               className="euiIcon euiIcon--large euiIcon-isLoaded euiFilePicker__icon"
                                               focusable="false"
+                                              role="img"
                                               style={null}
                                             >
                                               <svg
-                                                aria-hidden="true"
+                                                aria-hidden={true}
                                                 className="euiIcon euiIcon--large euiIcon-isLoaded euiFilePicker__icon"
                                                 focusable="false"
                                                 height={16}
+                                                role="img"
                                                 style={null}
                                                 viewBox="0 0 16 16"
                                                 width={16}
                                                 xmlns="http://www.w3.org/2000/svg"
                                               >
+                                                <title />
                                                 <path
-                                                  d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
+                                                  d="M9 10.114l1.85-1.943a.52.52 0 01.77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 01-2.31 0L5.41 9a.617.617 0 010-.829.52.52 0 01.77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 00-.972.804l-1.189 6A.995.995 0 002.991 14h11.018a1 1 0 00.972-1.196l-1.19-6a.993.993 0 00-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0114.016 15H2.984a1.992 1.992 0 01-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
                                                 />
                                               </svg>
                                             </EuiIconImport>
@@ -2123,7 +2133,6 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
     >
       <EuiPageContent
         horizontalPosition="center"
-        panelPaddingSize="l"
         verticalPosition="center"
       >
         <EuiPanel
@@ -2315,16 +2324,18 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                                             type="importAction"
                                           >
                                             <EuiIconEmpty
-                                              aria-hidden="true"
+                                              aria-hidden={true}
                                               className="euiIcon euiIcon--large euiIcon-isLoading euiFilePicker__icon"
                                               focusable="false"
+                                              role="img"
                                               style={null}
                                             >
                                               <svg
-                                                aria-hidden="true"
+                                                aria-hidden={true}
                                                 className="euiIcon euiIcon--large euiIcon-isLoading euiFilePicker__icon"
                                                 focusable="false"
                                                 height={16}
+                                                role="img"
                                                 style={null}
                                                 viewBox="0 0 16 16"
                                                 width={16}
@@ -2587,7 +2598,6 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
     >
       <EuiPageContent
         horizontalPosition="center"
-        panelPaddingSize="l"
         verticalPosition="center"
       >
         <EuiPanel
@@ -2779,23 +2789,26 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                                             type="importAction"
                                           >
                                             <EuiIconImport
-                                              aria-hidden="true"
+                                              aria-hidden={true}
                                               className="euiIcon euiIcon--large euiIcon-isLoaded euiFilePicker__icon"
                                               focusable="false"
+                                              role="img"
                                               style={null}
                                             >
                                               <svg
-                                                aria-hidden="true"
+                                                aria-hidden={true}
                                                 className="euiIcon euiIcon--large euiIcon-isLoaded euiFilePicker__icon"
                                                 focusable="false"
                                                 height={16}
+                                                role="img"
                                                 style={null}
                                                 viewBox="0 0 16 16"
                                                 width={16}
                                                 xmlns="http://www.w3.org/2000/svg"
                                               >
+                                                <title />
                                                 <path
-                                                  d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
+                                                  d="M9 10.114l1.85-1.943a.52.52 0 01.77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 01-2.31 0L5.41 9a.617.617 0 010-.829.52.52 0 01.77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 00-.972.804l-1.189 6A.995.995 0 002.991 14h11.018a1 1 0 00.972-1.196l-1.19-6a.993.993 0 00-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0114.016 15H2.984a1.992 1.992 0 01-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
                                                 />
                                               </svg>
                                             </EuiIconImport>
diff --git a/x-pack/legacy/plugins/license_management/__jest__/request_trial_extension.test.js b/x-pack/legacy/plugins/license_management/__jest__/request_trial_extension.test.js
index 4de8f6ea6efd2..a74a7b16185c6 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/request_trial_extension.test.js
+++ b/x-pack/legacy/plugins/license_management/__jest__/request_trial_extension.test.js
@@ -75,6 +75,20 @@ describe('RequestTrialExtension component', () => {
     expect(html).not.toBeNull();
     expect(html).toMatchSnapshot();
   });
+  test('should display when enterprise license is not active and trial has been used', () => {
+    const rendered = getComponent(
+      {
+        trialStatus: {
+          canStartTrial: false,
+        },
+        license: createMockLicense('enterprise', 0),
+      },
+      RequestTrialExtension
+    );
+    const html = rendered.html();
+    expect(html).not.toBeNull();
+    expect(html).toMatchSnapshot();
+  });
   test('should not display when platinum license is active and trial has been used', () => {
     const rendered = getComponent(
       {
diff --git a/x-pack/legacy/plugins/license_management/__jest__/start_trial.test.js b/x-pack/legacy/plugins/license_management/__jest__/start_trial.test.js
index c37c56aa7a1ad..5436a51a2632b 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/start_trial.test.js
+++ b/x-pack/legacy/plugins/license_management/__jest__/start_trial.test.js
@@ -6,6 +6,7 @@
 
 import { StartTrial } from '../public/np_ready/application/sections/license_dashboard/start_trial';
 import { createMockLicense, getComponent } from './util';
+jest.mock('ui/new_platform');
 jest.mock(`@elastic/eui/lib/components/form/form_row/make_id`, () => () => `generated-id`);
 
 describe('StartTrial component when trial is allowed', () => {
@@ -60,6 +61,26 @@ describe('StartTrial component when trial is allowed', () => {
     );
     expect(rendered.html()).toMatchSnapshot();
   });
+  test('should not display for active enterprise license', () => {
+    const rendered = getComponent(
+      {
+        license: createMockLicense('enterprise'),
+        trialStatus: { canStartTrial: true },
+      },
+      StartTrial
+    );
+    expect(rendered.isEmptyRender()).toBeTruthy();
+  });
+  test('should display for expired enterprise license', () => {
+    const rendered = getComponent(
+      {
+        license: createMockLicense('enterprise', 0),
+        trialStatus: { canStartTrial: true },
+      },
+      StartTrial
+    );
+    expect(rendered.html()).toMatchSnapshot();
+  });
 });
 
 describe('StartTrial component when trial is not available', () => {
@@ -93,6 +114,16 @@ describe('StartTrial component when trial is not available', () => {
     );
     expect(rendered.isEmptyRender()).toBeTruthy();
   });
+  test('should not display for enterprise license', () => {
+    const rendered = getComponent(
+      {
+        license: createMockLicense('enterprise'),
+        trialStatus: { canStartTrial: false },
+      },
+      StartTrial
+    );
+    expect(rendered.isEmptyRender()).toBeTruthy();
+  });
 
   test('should not display for trial license', () => {
     const rendered = getComponent(
diff --git a/x-pack/legacy/plugins/license_management/__jest__/telemetry_opt_in.test.js b/x-pack/legacy/plugins/license_management/__jest__/telemetry_opt_in.test.js
index 8df35b797bf45..1b03ce869e52b 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/telemetry_opt_in.test.js
+++ b/x-pack/legacy/plugins/license_management/__jest__/telemetry_opt_in.test.js
@@ -11,9 +11,7 @@ import {
 import { TelemetryOptIn } from '../public/np_ready/application/components/telemetry_opt_in';
 import { mountWithIntl } from '../../../../test_utils/enzyme_helpers';
 
-jest.mock('ui/capabilities', () => ({
-  get: jest.fn(),
-}));
+jest.mock('ui/new_platform');
 
 setTelemetryEnabled(true);
 
diff --git a/x-pack/legacy/plugins/license_management/__jest__/upload_license.test.tsx b/x-pack/legacy/plugins/license_management/__jest__/upload_license.test.tsx
index b852daf78ca15..ca9b5b0db9ca1 100644
--- a/x-pack/legacy/plugins/license_management/__jest__/upload_license.test.tsx
+++ b/x-pack/legacy/plugins/license_management/__jest__/upload_license.test.tsx
@@ -9,6 +9,8 @@ import { mountWithIntl } from '../../../../test_utils/enzyme_helpers';
 import React from 'react';
 import { Provider } from 'react-redux';
 
+jest.mock('ui/new_platform');
+
 // @ts-ignore
 import { uploadLicense } from '../public/np_ready/application/store/actions/upload_license';
 
diff --git a/x-pack/legacy/plugins/license_management/index.ts b/x-pack/legacy/plugins/license_management/index.ts
index c621a96945c41..e9fbb56e9d6ac 100644
--- a/x-pack/legacy/plugins/license_management/index.ts
+++ b/x-pack/legacy/plugins/license_management/index.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Legacy } from 'kibana';
 import { resolve } from 'path';
 import { PLUGIN } from './common/constants';
-import { Legacy } from '../../../../kibana';
 import { plugin } from './server/np_ready';
 
 export function licenseManagement(kibana: any) {
@@ -18,6 +18,23 @@ export function licenseManagement(kibana: any) {
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/np_ready/application/index.scss'),
       managementSections: ['plugins/license_management/legacy'],
+      injectDefaultVars(server: Legacy.Server) {
+        const config = server.config();
+        return {
+          licenseManagementUiEnabled: config.get('xpack.license_management.ui.enabled'),
+        };
+      },
+    },
+    config(Joi: any) {
+      return Joi.object({
+        // display menu item
+        ui: Joi.object({
+          enabled: Joi.boolean().default(true),
+        }).default(),
+
+        // enable plugin
+        enabled: Joi.boolean().default(true),
+      }).default();
     },
     init: (server: Legacy.Server) => {
       plugin({} as any).setup(server.newPlatform.setup.core, {
diff --git a/x-pack/legacy/plugins/license_management/public/management_section.ts b/x-pack/legacy/plugins/license_management/public/management_section.ts
index 4f69581fff0df..c7232649857e3 100644
--- a/x-pack/legacy/plugins/license_management/public/management_section.ts
+++ b/x-pack/legacy/plugins/license_management/public/management_section.ts
@@ -5,11 +5,16 @@
  */
 
 import { management } from 'ui/management';
+import chrome from 'ui/chrome';
 import { BASE_PATH, PLUGIN } from '../common/constants';
 
-management.getSection('elasticsearch').register('license_management', {
-  visible: true,
-  display: PLUGIN.TITLE,
-  order: 99,
-  url: `#${BASE_PATH}home`,
-});
+const licenseManagementUiEnabled = chrome.getInjected('licenseManagementUiEnabled');
+
+if (licenseManagementUiEnabled) {
+  management.getSection('elasticsearch').register('license_management', {
+    visible: true,
+    display: PLUGIN.TITLE,
+    order: 99,
+    url: `#${BASE_PATH}home`,
+  });
+}
diff --git a/x-pack/legacy/plugins/license_management/public/np_ready/application/store/reducers/license_management.js b/x-pack/legacy/plugins/license_management/public/np_ready/application/store/reducers/license_management.js
index 3023a12101c5d..c821b7bb294f9 100644
--- a/x-pack/legacy/plugins/license_management/public/np_ready/application/store/reducers/license_management.js
+++ b/x-pack/legacy/plugins/license_management/public/np_ready/application/store/reducers/license_management.js
@@ -110,8 +110,8 @@ export const shouldShowStartTrial = state => {
   return (
     state.trialStatus.canStartTrial &&
     licenseType !== 'trial' &&
-    //don't show for platinum unless it is expired
-    (licenseType !== 'platinum' || isExpired(state))
+    //don't show for platinum & enterprise unless it is expired
+    ((licenseType !== 'platinum' && licenseType !== 'enterprise') || isExpired(state))
   );
 };
 
@@ -120,7 +120,7 @@ export const shouldShowRequestTrialExtension = state => {
     return false;
   }
   const { type } = getLicense(state);
-  return type !== 'platinum' || isExpired(state);
+  return (type !== 'platinum' && type !== 'enterprise') || isExpired(state);
 };
 
 export const startTrialError = state => {
diff --git a/x-pack/legacy/plugins/license_management/public/register_route.ts b/x-pack/legacy/plugins/license_management/public/register_route.ts
index ad84f28c6b6d7..0fe29b543be5b 100644
--- a/x-pack/legacy/plugins/license_management/public/register_route.ts
+++ b/x-pack/legacy/plugins/license_management/public/register_route.ts
@@ -9,6 +9,7 @@ import { App } from 'src/core/public';
 /* Legacy Imports */
 import { npSetup, npStart } from 'ui/new_platform';
 import { MANAGEMENT_BREADCRUMB } from 'ui/management';
+import chrome from 'ui/chrome';
 import routes from 'ui/routes';
 // @ts-ignore
 import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
@@ -25,74 +26,78 @@ import {
 
 import { BASE_PATH } from '../common/constants';
 
-/*
-  This method handles the cleanup needed when route is scope is destroyed.  It also prevents Angular
-  from destroying scope when route changes and both old route and new route are this same route.
-*/
-const manageAngularLifecycle = ($scope: any, $route: any, unmount: () => void) => {
-  const lastRoute = $route.current;
-  const deregister = $scope.$on('$locationChangeSuccess', () => {
-    const currentRoute = $route.current;
-    // if templates are the same we are on the same route
-    if (lastRoute.$$route.template === currentRoute.$$route.template) {
-      // this prevents angular from destroying scope
-      $route.current = lastRoute;
-    }
-  });
-  $scope.$on('$destroy', () => {
-    if (deregister) {
-      deregister();
-    }
-    unmount();
-  });
-};
+const licenseManagementUiEnabled = chrome.getInjected('licenseManagementUiEnabled');
+
+if (licenseManagementUiEnabled) {
+  /*
+    This method handles the cleanup needed when route is scope is destroyed.  It also prevents Angular
+    from destroying scope when route changes and both old route and new route are this same route.
+  */
+  const manageAngularLifecycle = ($scope: any, $route: any, unmount: () => void) => {
+    const lastRoute = $route.current;
+    const deregister = $scope.$on('$locationChangeSuccess', () => {
+      const currentRoute = $route.current;
+      // if templates are the same we are on the same route
+      if (lastRoute.$$route.template === currentRoute.$$route.template) {
+        // this prevents angular from destroying scope
+        $route.current = lastRoute;
+      }
+    });
+    $scope.$on('$destroy', () => {
+      if (deregister) {
+        deregister();
+      }
+      unmount();
+    });
+  };
 
-const initializeTelemetry = ($injector: any) => {
-  const telemetryEnabled = $injector.get('telemetryEnabled');
-  const Private = $injector.get('Private');
-  const telemetryOptInProvider = Private(TelemetryOptInProvider);
-  setTelemetryOptInService(telemetryOptInProvider);
-  setTelemetryEnabled(telemetryEnabled);
-  setHttpClient($injector.get('$http'));
-};
+  const initializeTelemetry = ($injector: any) => {
+    const telemetryEnabled = npStart.core.injectedMetadata.getInjectedVar('telemetryEnabled');
+    const Private = $injector.get('Private');
+    const telemetryOptInProvider = Private(TelemetryOptInProvider);
+    setTelemetryOptInService(telemetryOptInProvider);
+    setTelemetryEnabled(telemetryEnabled);
+    setHttpClient($injector.get('$http'));
+  };
 
-const template = `<kbn-management-app section="elasticsearch/license_management">
-  <div id="licenseReactRoot"></div>
-</kbn-management-app>`;
+  const template = `<kbn-management-app section="elasticsearch/license_management">
+    <div id="licenseReactRoot"></div>
+  </kbn-management-app>`;
 
-routes.when(`${BASE_PATH}:view?`, {
-  template,
-  controllerAs: 'licenseManagement',
-  controller: class LicenseManagementController {
-    constructor($injector: any, $rootScope: any, $scope: any, $route: any) {
-      initializeTelemetry($injector);
+  routes.when(`${BASE_PATH}:view?`, {
+    template,
+    controllerAs: 'licenseManagement',
+    controller: class LicenseManagementController {
+      constructor($injector: any, $rootScope: any, $scope: any, $route: any) {
+        initializeTelemetry($injector);
 
-      $scope.$$postDigest(() => {
-        const element = document.getElementById('licenseReactRoot')!;
+        $scope.$$postDigest(() => {
+          const element = document.getElementById('licenseReactRoot')!;
 
-        const refreshXpack = async () => {
-          await xpackInfo.refresh($injector);
-        };
+          const refreshXpack = async () => {
+            await xpackInfo.refresh($injector);
+          };
 
-        plugin({} as any).setup(
-          {
-            ...npSetup.core,
-            application: {
-              ...npSetup.core.application,
-              async register(app: App) {
-                const unmountApp = await app.mount({ ...npStart } as any, {
-                  element,
-                  appBasePath: '',
-                });
-                manageAngularLifecycle($scope, $route, unmountApp as any);
+          plugin({} as any).setup(
+            {
+              ...npSetup.core,
+              application: {
+                ...npSetup.core.application,
+                async register(app: App) {
+                  const unmountApp = await app.mount({ ...npStart } as any, {
+                    element,
+                    appBasePath: '',
+                  });
+                  manageAngularLifecycle($scope, $route, unmountApp as any);
+                },
               },
             },
-          },
-          {
-            __LEGACY: { xpackInfo, refreshXpack, MANAGEMENT_BREADCRUMB },
-          }
-        );
-      });
-    }
-  } as any,
-} as any);
+            {
+              __LEGACY: { xpackInfo, refreshXpack, MANAGEMENT_BREADCRUMB },
+            }
+          );
+        });
+      }
+    } as any,
+  } as any);
+}
diff --git a/x-pack/legacy/plugins/logstash/public/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap b/x-pack/legacy/plugins/logstash/public/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap
index 6ff1307d43693..dc51c066a8cb9 100644
--- a/x-pack/legacy/plugins/logstash/public/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap
+++ b/x-pack/legacy/plugins/logstash/public/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap
@@ -6,7 +6,6 @@ exports[`PipelineEditor component includes required error message for falsy pipe
 >
   <EuiPageContent
     horizontalPosition="center"
-    panelPaddingSize="l"
     style={
       Object {
         "width": 1100,
@@ -136,10 +135,7 @@ Default value: Number of the host’s CPU cores"
         labelType="label"
       >
         <EuiFieldNumber
-          compressed={false}
           data-test-subj="inputWorkers"
-          fullWidth={false}
-          isLoading={false}
           onChange={[Function]}
           value={1}
         />
@@ -153,10 +149,7 @@ Default value: Number of the host’s CPU cores"
 Default value: 125"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchSize"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={256}
           />
@@ -168,10 +161,7 @@ Default value: 125"
 Default value: 50ms"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchDelay"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={10}
           />
@@ -215,10 +205,7 @@ Default value: memory"
 Default value: 1024mb (1g)"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueMaxBytesNumber"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
           />
         </FlexItemSetting>
@@ -273,10 +260,7 @@ Default value: 1024mb (1g)"
 Default value: 1024"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueCheckpointWrites"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={100}
           />
@@ -330,7 +314,6 @@ exports[`PipelineEditor component invalidates form for invalid pipeline id input
 >
   <EuiPageContent
     horizontalPosition="center"
-    panelPaddingSize="l"
     style={
       Object {
         "width": 1100,
@@ -459,10 +442,7 @@ Default value: Number of the host’s CPU cores"
         labelType="label"
       >
         <EuiFieldNumber
-          compressed={false}
           data-test-subj="inputWorkers"
-          fullWidth={false}
-          isLoading={false}
           onChange={[Function]}
           value={1}
         />
@@ -476,10 +456,7 @@ Default value: Number of the host’s CPU cores"
 Default value: 125"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchSize"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={256}
           />
@@ -491,10 +468,7 @@ Default value: 125"
 Default value: 50ms"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchDelay"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={10}
           />
@@ -538,10 +512,7 @@ Default value: memory"
 Default value: 1024mb (1g)"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueMaxBytesNumber"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
           />
         </FlexItemSetting>
@@ -596,10 +567,7 @@ Default value: 1024mb (1g)"
 Default value: 1024"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueCheckpointWrites"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={100}
           />
@@ -653,7 +621,6 @@ exports[`PipelineEditor component invalidates form for pipeline id with spaces 1
 >
   <EuiPageContent
     horizontalPosition="center"
-    panelPaddingSize="l"
     style={
       Object {
         "width": 1100,
@@ -782,10 +749,7 @@ Default value: Number of the host’s CPU cores"
         labelType="label"
       >
         <EuiFieldNumber
-          compressed={false}
           data-test-subj="inputWorkers"
-          fullWidth={false}
-          isLoading={false}
           onChange={[Function]}
           value={1}
         />
@@ -799,10 +763,7 @@ Default value: Number of the host’s CPU cores"
 Default value: 125"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchSize"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={256}
           />
@@ -814,10 +775,7 @@ Default value: 125"
 Default value: 50ms"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchDelay"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={10}
           />
@@ -861,10 +819,7 @@ Default value: memory"
 Default value: 1024mb (1g)"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueMaxBytesNumber"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
           />
         </FlexItemSetting>
@@ -919,10 +874,7 @@ Default value: 1024mb (1g)"
 Default value: 1024"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueCheckpointWrites"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={100}
           />
@@ -976,7 +928,6 @@ exports[`PipelineEditor component matches snapshot for clone pipeline 1`] = `
 >
   <EuiPageContent
     horizontalPosition="center"
-    panelPaddingSize="l"
     style={
       Object {
         "width": 1100,
@@ -1074,10 +1025,7 @@ Default value: Number of the host’s CPU cores"
         labelType="label"
       >
         <EuiFieldNumber
-          compressed={false}
           data-test-subj="inputWorkers"
-          fullWidth={false}
-          isLoading={false}
           onChange={[Function]}
           value={1}
         />
@@ -1091,10 +1039,7 @@ Default value: Number of the host’s CPU cores"
 Default value: 125"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchSize"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={256}
           />
@@ -1106,10 +1051,7 @@ Default value: 125"
 Default value: 50ms"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchDelay"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={10}
           />
@@ -1153,10 +1095,7 @@ Default value: memory"
 Default value: 1024mb (1g)"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueMaxBytesNumber"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
           />
         </FlexItemSetting>
@@ -1211,10 +1150,7 @@ Default value: 1024mb (1g)"
 Default value: 1024"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueCheckpointWrites"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={100}
           />
@@ -1283,7 +1219,6 @@ exports[`PipelineEditor component matches snapshot for create pipeline 1`] = `
 >
   <EuiPageContent
     horizontalPosition="center"
-    panelPaddingSize="l"
     style={
       Object {
         "width": 1100,
@@ -1408,10 +1343,7 @@ Default value: Number of the host’s CPU cores"
         labelType="label"
       >
         <EuiFieldNumber
-          compressed={false}
           data-test-subj="inputWorkers"
-          fullWidth={false}
-          isLoading={false}
           onChange={[Function]}
           value={1}
         />
@@ -1425,10 +1357,7 @@ Default value: Number of the host’s CPU cores"
 Default value: 125"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchSize"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={256}
           />
@@ -1440,10 +1369,7 @@ Default value: 125"
 Default value: 50ms"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchDelay"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={10}
           />
@@ -1487,10 +1413,7 @@ Default value: memory"
 Default value: 1024mb (1g)"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueMaxBytesNumber"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
           />
         </FlexItemSetting>
@@ -1545,10 +1468,7 @@ Default value: 1024mb (1g)"
 Default value: 1024"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueCheckpointWrites"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={100}
           />
@@ -1602,7 +1522,6 @@ exports[`PipelineEditor component matches snapshot for edit pipeline 1`] = `
 >
   <EuiPageContent
     horizontalPosition="center"
-    panelPaddingSize="l"
     style={
       Object {
         "width": 1100,
@@ -1700,10 +1619,7 @@ Default value: Number of the host’s CPU cores"
         labelType="label"
       >
         <EuiFieldNumber
-          compressed={false}
           data-test-subj="inputWorkers"
-          fullWidth={false}
-          isLoading={false}
           onChange={[Function]}
           value={1}
         />
@@ -1717,10 +1633,7 @@ Default value: Number of the host’s CPU cores"
 Default value: 125"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchSize"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={256}
           />
@@ -1732,10 +1645,7 @@ Default value: 125"
 Default value: 50ms"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputBatchDelay"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={10}
           />
@@ -1779,10 +1689,7 @@ Default value: memory"
 Default value: 1024mb (1g)"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueMaxBytesNumber"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
           />
         </FlexItemSetting>
@@ -1837,10 +1744,7 @@ Default value: 1024mb (1g)"
 Default value: 1024"
         >
           <EuiFieldNumber
-            compressed={false}
             data-test-subj="inputQueueCheckpointWrites"
-            fullWidth={false}
-            isLoading={false}
             onChange={[Function]}
             value={100}
           />
diff --git a/x-pack/legacy/plugins/logstash/public/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap b/x-pack/legacy/plugins/logstash/public/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap
index bea9014c28d67..e45815579d734 100644
--- a/x-pack/legacy/plugins/logstash/public/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap
+++ b/x-pack/legacy/plugins/logstash/public/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap
@@ -39,7 +39,6 @@ exports[`PipelinesTable component renders component as expected 1`] = `
     ]
   }
   data-test-subj="pipelineTable"
-  executeQueryOptions={Object {}}
   isSelectable={true}
   itemId="id"
   items={
diff --git a/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap b/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap
index 4d752888d3df4..07ae9fb2e06c7 100644
--- a/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap
+++ b/x-pack/legacy/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap
@@ -117,9 +117,7 @@ exports[`UpgradeFailure component passes expected text for new pipeline 1`] = `
       }
     }
   >
-    <EuiPageContent
-      panelPaddingSize="l"
-    >
+    <EuiPageContent>
       <EuiPanel
         className="euiPageContent"
         paddingSize="l"
@@ -181,14 +179,18 @@ exports[`UpgradeFailure component passes expected text for new pipeline 1`] = `
                                 type="alert"
                               >
                                 <EuiIconEmpty
+                                  aria-hidden={true}
                                   className="euiIcon euiIcon--xLarge euiIcon-isLoading"
                                   focusable="false"
+                                  role="img"
                                   style={null}
                                 >
                                   <svg
+                                    aria-hidden={true}
                                     className="euiIcon euiIcon--xLarge euiIcon-isLoading"
                                     focusable="false"
                                     height={16}
+                                    role="img"
                                     style={null}
                                     viewBox="0 0 16 16"
                                     width={16}
@@ -457,9 +459,7 @@ exports[`UpgradeFailure component passes expected text for not manual upgrade 1`
       }
     }
   >
-    <EuiPageContent
-      panelPaddingSize="l"
-    >
+    <EuiPageContent>
       <EuiPanel
         className="euiPageContent"
         paddingSize="l"
@@ -521,14 +521,18 @@ exports[`UpgradeFailure component passes expected text for not manual upgrade 1`
                                 type="alert"
                               >
                                 <EuiIconEmpty
+                                  aria-hidden={true}
                                   className="euiIcon euiIcon--xLarge euiIcon-isLoading"
                                   focusable="false"
+                                  role="img"
                                   style={null}
                                 >
                                   <svg
+                                    aria-hidden={true}
                                     className="euiIcon euiIcon--xLarge euiIcon-isLoading"
                                     focusable="false"
                                     height={16}
+                                    role="img"
                                     style={null}
                                     viewBox="0 0 16 16"
                                     width={16}
@@ -797,9 +801,7 @@ exports[`UpgradeFailure component passes expected text for not new pipeline 1`]
       }
     }
   >
-    <EuiPageContent
-      panelPaddingSize="l"
-    >
+    <EuiPageContent>
       <EuiPanel
         className="euiPageContent"
         paddingSize="l"
@@ -861,14 +863,18 @@ exports[`UpgradeFailure component passes expected text for not new pipeline 1`]
                                 type="alert"
                               >
                                 <EuiIconEmpty
+                                  aria-hidden={true}
                                   className="euiIcon euiIcon--xLarge euiIcon-isLoading"
                                   focusable="false"
+                                  role="img"
                                   style={null}
                                 >
                                   <svg
+                                    aria-hidden={true}
                                     className="euiIcon euiIcon--xLarge euiIcon-isLoading"
                                     focusable="false"
                                     height={16}
+                                    role="img"
                                     style={null}
                                     viewBox="0 0 16 16"
                                     width={16}
@@ -1029,9 +1035,7 @@ exports[`UpgradeFailure component renders component as expected 1`] = `
     }
   }
 >
-  <EuiPageContent
-    panelPaddingSize="l"
-  >
+  <EuiPageContent>
     <EuiEmptyPrompt
       actions={
         <UpgradeFailureActions
diff --git a/x-pack/legacy/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js b/x-pack/legacy/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js
index aa7f88a62397c..83446278fdeca 100755
--- a/x-pack/legacy/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js
+++ b/x-pack/legacy/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js
@@ -8,6 +8,7 @@ import React from 'react';
 import { render } from 'react-dom';
 import { isEmpty } from 'lodash';
 import { uiModules } from 'ui/modules';
+import { npSetup } from 'ui/new_platform';
 import { toastNotifications } from 'ui/notify';
 import { I18nContext } from 'ui/i18n';
 import { PipelineEditor } from '../../../../components/pipeline_editor';
@@ -21,7 +22,6 @@ app.directive('pipelineEdit', function($injector) {
   const pipelineService = $injector.get('pipelineService');
   const licenseService = $injector.get('logstashLicenseService');
   const kbnUrl = $injector.get('kbnUrl');
-  const shieldUser = $injector.get('ShieldUser');
   const $route = $injector.get('$route');
 
   return {
@@ -32,7 +32,7 @@ app.directive('pipelineEdit', function($injector) {
         scope.$evalAsync(kbnUrl.change(`/management/logstash/pipelines/${id}/edit`));
 
       const userResource = logstashSecurity.isSecurityEnabled()
-        ? await shieldUser.getCurrent().$promise
+        ? await npSetup.plugins.security.authc.getCurrentUser()
         : null;
 
       render(
diff --git a/x-pack/legacy/plugins/logstash/server/lib/check_license/__tests__/check_license.js b/x-pack/legacy/plugins/logstash/server/lib/check_license/__tests__/check_license.js
index 51d2d7198234f..5fcce0aaa1219 100755
--- a/x-pack/legacy/plugins/logstash/server/lib/check_license/__tests__/check_license.js
+++ b/x-pack/legacy/plugins/logstash/server/lib/check_license/__tests__/check_license.js
@@ -58,7 +58,7 @@ describe('check_license', function() {
       set(mockLicenseInfo, 'license.getType', () => 'basic');
     });
 
-    describe('& license is trial, standard, gold, platinum', () => {
+    describe('& license is > basic', () => {
       beforeEach(() => {
         set(mockLicenseInfo, 'license.isOneOf', () => true);
         mockLicenseInfo.feature = () => ({ isEnabled: () => true }); // Security feature is enabled
diff --git a/x-pack/legacy/plugins/logstash/server/lib/check_license/check_license.js b/x-pack/legacy/plugins/logstash/server/lib/check_license/check_license.js
index fe68d37e0f496..31136ae1c72a5 100755
--- a/x-pack/legacy/plugins/logstash/server/lib/check_license/check_license.js
+++ b/x-pack/legacy/plugins/logstash/server/lib/check_license/check_license.js
@@ -24,7 +24,7 @@ export function checkLicense(xpackLicenseInfo) {
     };
   }
 
-  const VALID_LICENSE_MODES = ['trial', 'standard', 'gold', 'platinum'];
+  const VALID_LICENSE_MODES = ['trial', 'standard', 'gold', 'platinum', 'enterprise'];
 
   const isLicenseModeValid = xpackLicenseInfo.license.isOneOf(VALID_LICENSE_MODES);
   const isLicenseActive = xpackLicenseInfo.license.isActive();
diff --git a/x-pack/legacy/plugins/maps/check_license.js b/x-pack/legacy/plugins/maps/check_license.js
index 54c423220b68a..9e5397ee5dc75 100644
--- a/x-pack/legacy/plugins/maps/check_license.js
+++ b/x-pack/legacy/plugins/maps/check_license.js
@@ -21,6 +21,7 @@ export function checkLicense(xPackInfo) {
     'standard',
     'gold',
     'platinum',
+    'enterprise',
     'trial',
   ]);
 
diff --git a/x-pack/legacy/plugins/maps/common/constants.js b/x-pack/legacy/plugins/maps/common/constants.js
index afe30f3492147..6e7776d43f4d4 100644
--- a/x-pack/legacy/plugins/maps/common/constants.js
+++ b/x-pack/legacy/plugins/maps/common/constants.js
@@ -23,9 +23,11 @@ export const EMS_TILES_VECTOR_TILE_PATH = 'ems/tiles/vector/tile';
 export const MAP_SAVED_OBJECT_TYPE = 'map';
 export const APP_ID = 'maps';
 export const APP_ICON = 'gisApp';
+export const TELEMETRY_TYPE = 'maps-telemetry';
 
 export const MAP_APP_PATH = `app/${APP_ID}`;
 export const GIS_API_PATH = `api/${APP_ID}`;
+export const INDEX_SETTINGS_API_PATH = `${GIS_API_PATH}/indexSettings`;
 
 export const MAP_BASE_URL = `/${MAP_APP_PATH}#/${MAP_SAVED_OBJECT_TYPE}`;
 
@@ -59,6 +61,8 @@ export const FIELD_ORIGIN = {
 export const SOURCE_DATA_ID_ORIGIN = 'source';
 export const META_ID_ORIGIN_SUFFIX = 'meta';
 export const SOURCE_META_ID_ORIGIN = `${SOURCE_DATA_ID_ORIGIN}_${META_ID_ORIGIN_SUFFIX}`;
+export const FORMATTERS_ID_ORIGIN_SUFFIX = 'formatters';
+export const SOURCE_FORMATTERS_ID_ORIGIN = `${SOURCE_DATA_ID_ORIGIN}_${FORMATTERS_ID_ORIGIN_SUFFIX}`;
 
 export const GEOJSON_FILE = 'GEOJSON_FILE';
 
@@ -67,7 +71,9 @@ export const MAX_ZOOM = 24;
 
 export const DECIMAL_DEGREES_PRECISION = 5; // meters precision
 export const ZOOM_PRECISION = 2;
-export const ES_SIZE_LIMIT = 10000;
+export const DEFAULT_MAX_RESULT_WINDOW = 10000;
+export const DEFAULT_MAX_INNER_RESULT_WINDOW = 100;
+export const DEFAULT_MAX_BUCKETS_LIMIT = 10000;
 
 export const FEATURE_ID_PROPERTY_NAME = '__kbn__feature_id__';
 export const FEATURE_VISIBLE_PROPERTY_NAME = '__kbn_isvisibleduetojoin__';
diff --git a/x-pack/legacy/plugins/maps/index.js b/x-pack/legacy/plugins/maps/index.js
index 77755459ca5cf..83362e73fb314 100644
--- a/x-pack/legacy/plugins/maps/index.js
+++ b/x-pack/legacy/plugins/maps/index.js
@@ -102,11 +102,11 @@ export function maps(kibana) {
       const pluginsSetup = {
         featuresPlugin: newPlatformPlugins.features,
         licensing: newPlatformPlugins.licensing,
+        home: newPlatformPlugins.home,
       };
 
       // legacy dependencies
       const __LEGACY = {
-        pluginRef: this,
         config: server.config,
         mapConfig() {
           return server.config().get('map');
@@ -114,14 +114,10 @@ export function maps(kibana) {
         route: server.route.bind(server),
         plugins: {
           elasticsearch: server.plugins.elasticsearch,
-          xpackMainPlugin: server.plugins.xpack_main,
         },
         savedObjects: {
           getSavedObjectsRepository: server.savedObjects.getSavedObjectsRepository,
         },
-        addSavedObjectsToSampleDataset: server.addSavedObjectsToSampleDataset,
-        addAppLinksToSampleDataset: server.addAppLinksToSampleDataset,
-        replacePanelInSampleDatasetDashboard: server.replacePanelInSampleDatasetDashboard,
         injectUiAppVars: server.injectUiAppVars,
         getInjectedUiAppVars: server.getInjectedUiAppVars,
       };
diff --git a/x-pack/legacy/plugins/maps/mappings.json b/x-pack/legacy/plugins/maps/mappings.json
index 7f80512980f0a..5e2e8c2c7e6e5 100644
--- a/x-pack/legacy/plugins/maps/mappings.json
+++ b/x-pack/legacy/plugins/maps/mappings.json
@@ -26,6 +26,16 @@
   },
   "maps-telemetry": {
     "properties": {
+      "settings": {
+        "properties": {
+          "showMapVisualizationTypes": {
+            "type": "boolean"
+          }
+        }
+      },
+      "indexPatternsWithGeoFieldCount": {
+        "type": "long"
+      },
       "mapsTotalCount": {
         "type": "long"
       },
@@ -72,4 +82,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
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 eab1df0c3fec7..053b389a59011 100644
--- a/x-pack/legacy/plugins/maps/public/actions/map_actions.js
+++ b/x-pack/legacy/plugins/maps/public/actions/map_actions.js
@@ -70,6 +70,8 @@ export const SET_MAP_INIT_ERROR = 'SET_MAP_INIT_ERROR';
 export const SET_INTERACTIVE = 'SET_INTERACTIVE';
 export const DISABLE_TOOLTIP_CONTROL = 'DISABLE_TOOLTIP_CONTROL';
 export const HIDE_TOOLBAR_OVERLAY = 'HIDE_TOOLBAR_OVERLAY';
+export const HIDE_LAYER_CONTROL = 'HIDE_LAYER_CONTROL';
+export const HIDE_VIEW_CONTROL = 'HIDE_VIEW_CONTROL';
 
 function getLayerLoadingCallbacks(dispatch, layerId) {
   return {
@@ -831,3 +833,10 @@ export function disableTooltipControl() {
 export function hideToolbarOverlay() {
   return { type: HIDE_TOOLBAR_OVERLAY, hideToolbarOverlay: true };
 }
+
+export function hideLayerControl() {
+  return { type: HIDE_LAYER_CONTROL, hideLayerControl: true };
+}
+export function hideViewControl() {
+  return { type: HIDE_VIEW_CONTROL, hideViewControl: true };
+}
diff --git a/x-pack/legacy/plugins/maps/public/angular/services/gis_map_saved_object_loader.js b/x-pack/legacy/plugins/maps/public/angular/services/gis_map_saved_object_loader.js
index 0eba30e0c4e9b..bd496f44aa8ac 100644
--- a/x-pack/legacy/plugins/maps/public/angular/services/gis_map_saved_object_loader.js
+++ b/x-pack/legacy/plugins/maps/public/angular/services/gis_map_saved_object_loader.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import './saved_gis_map';
+import { createSavedGisMapClass } from './saved_gis_map';
 import { uiModules } from 'ui/modules';
 import { SavedObjectLoader } from 'ui/saved_objects';
 import { npStart } from '../../../../../../../src/legacy/ui/public/new_platform';
@@ -12,6 +12,15 @@ import { npStart } from '../../../../../../../src/legacy/ui/public/new_platform'
 const module = uiModules.get('app/maps');
 
 // This is the only thing that gets injected into controllers
-module.service('gisMapSavedObjectLoader', function(SavedGisMap) {
+module.service('gisMapSavedObjectLoader', function() {
+  const savedObjectsClient = npStart.core.savedObjects.client;
+  const services = {
+    savedObjectsClient,
+    indexPatterns: npStart.plugins.data.indexPatterns,
+    chrome: npStart.core.chrome,
+    overlays: npStart.core.overlays,
+  };
+  const SavedGisMap = createSavedGisMapClass(services);
+
   return new SavedObjectLoader(SavedGisMap, npStart.core.savedObjects.client, npStart.core.chrome);
 });
diff --git a/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js b/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js
index b846bb5b77543..035ae4886920c 100644
--- a/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js
+++ b/x-pack/legacy/plugins/maps/public/angular/services/saved_gis_map.js
@@ -5,9 +5,7 @@
  */
 
 import _ from 'lodash';
-import { uiModules } from 'ui/modules';
-import { createLegacyClass } from 'ui/utils/legacy_class';
-import { SavedObjectProvider } from 'ui/saved_objects/saved_object';
+import { createSavedObjectClass } from 'ui/saved_objects/saved_object';
 import {
   getTimeFilters,
   getMapZoom,
@@ -24,95 +22,89 @@ import { copyPersistentState } from '../../reducers/util';
 import { extractReferences, injectReferences } from '../../../common/migrations/references';
 import { MAP_SAVED_OBJECT_TYPE } from '../../../common/constants';
 
-const module = uiModules.get('app/maps');
-
-module.factory('SavedGisMap', function(Private) {
-  const SavedObject = Private(SavedObjectProvider);
-  createLegacyClass(SavedGisMap).inherits(SavedObject);
-  function SavedGisMap(id) {
-    SavedGisMap.Super.call(this, {
-      type: SavedGisMap.type,
-      mapping: SavedGisMap.mapping,
-      searchSource: SavedGisMap.searchsource,
-      extractReferences,
-      injectReferences: (savedObject, references) => {
-        const { attributes } = injectReferences({
-          attributes: { layerListJSON: savedObject.layerListJSON },
-          references,
-        });
-
-        savedObject.layerListJSON = attributes.layerListJSON;
-
-        const indexPatternIds = references
-          .filter(reference => {
-            return reference.type === 'index-pattern';
-          })
-          .map(reference => {
-            return reference.id;
-          });
-        savedObject.indexPatternIds = _.uniq(indexPatternIds);
-      },
-
-      // if this is null/undefined then the SavedObject will be assigned the defaults
-      id: id,
-
-      // default values that will get assigned if the doc is new
-      defaults: {
-        title: 'New Map',
-        description: '',
+export function createSavedGisMapClass(services) {
+  const SavedObjectClass = createSavedObjectClass(services);
+
+  class SavedGisMap extends SavedObjectClass {
+    static type = MAP_SAVED_OBJECT_TYPE;
+
+    // Mappings are used to place object properties into saved object _source
+    static mapping = {
+      title: 'text',
+      description: 'text',
+      mapStateJSON: 'text',
+      layerListJSON: 'text',
+      uiStateJSON: 'text',
+      bounds: {
+        type: 'object',
       },
-    });
+    };
+    static fieldOrder = ['title', 'description'];
+    static searchSource = false;
+
+    constructor(id) {
+      super({
+        type: SavedGisMap.type,
+        mapping: SavedGisMap.mapping,
+        searchSource: SavedGisMap.searchSource,
+        extractReferences,
+        injectReferences: (savedObject, references) => {
+          const { attributes } = injectReferences({
+            attributes: { layerListJSON: savedObject.layerListJSON },
+            references,
+          });
 
-    this.showInRecentlyAccessed = true;
+          savedObject.layerListJSON = attributes.layerListJSON;
+
+          const indexPatternIds = references
+            .filter(reference => {
+              return reference.type === 'index-pattern';
+            })
+            .map(reference => {
+              return reference.id;
+            });
+          savedObject.indexPatternIds = _.uniq(indexPatternIds);
+        },
+
+        // if this is null/undefined then the SavedObject will be assigned the defaults
+        id: id,
+
+        // default values that will get assigned if the doc is new
+        defaults: {
+          title: 'New Map',
+          description: '',
+        },
+      });
+      this.showInRecentlyAccessed = true;
+    }
+    getFullPath() {
+      return `/app/maps#map/${this.id}`;
+    }
+    getLayerList() {
+      return this.layerListJSON ? JSON.parse(this.layerListJSON) : null;
+    }
+
+    syncWithStore(state) {
+      const layerList = getLayerListRaw(state);
+      const layerListConfigOnly = copyPersistentState(layerList);
+      this.layerListJSON = JSON.stringify(layerListConfigOnly);
+
+      this.mapStateJSON = JSON.stringify({
+        zoom: getMapZoom(state),
+        center: getMapCenter(state),
+        timeFilters: getTimeFilters(state),
+        refreshConfig: getRefreshConfig(state),
+        query: _.omit(getQuery(state), 'queryLastTriggeredAt'),
+        filters: getFilters(state),
+      });
+
+      this.uiStateJSON = JSON.stringify({
+        isLayerTOCOpen: getIsLayerTOCOpen(state),
+        openTOCDetails: getOpenTOCDetails(state),
+      });
+
+      this.bounds = convertMapExtentToPolygon(getMapExtent(state));
+    }
   }
-
-  SavedGisMap.type = MAP_SAVED_OBJECT_TYPE;
-
-  // Mappings are used to place object properties into saved object _source
-  SavedGisMap.mapping = {
-    title: 'text',
-    description: 'text',
-    mapStateJSON: 'text',
-    layerListJSON: 'text',
-    uiStateJSON: 'text',
-    bounds: {
-      type: 'object',
-    },
-  };
-
-  SavedGisMap.fieldOrder = ['title', 'description'];
-
-  SavedGisMap.searchsource = false;
-
-  SavedGisMap.prototype.getFullPath = function() {
-    return `/app/maps#map/${this.id}`;
-  };
-
-  SavedGisMap.prototype.getLayerList = function() {
-    return this.layerListJSON ? JSON.parse(this.layerListJSON) : null;
-  };
-
-  SavedGisMap.prototype.syncWithStore = function(state) {
-    const layerList = getLayerListRaw(state);
-    const layerListConfigOnly = copyPersistentState(layerList);
-    this.layerListJSON = JSON.stringify(layerListConfigOnly);
-
-    this.mapStateJSON = JSON.stringify({
-      zoom: getMapZoom(state),
-      center: getMapCenter(state),
-      timeFilters: getTimeFilters(state),
-      refreshConfig: getRefreshConfig(state),
-      query: _.omit(getQuery(state), 'queryLastTriggeredAt'),
-      filters: getFilters(state),
-    });
-
-    this.uiStateJSON = JSON.stringify({
-      isLayerTOCOpen: getIsLayerTOCOpen(state),
-      openTOCDetails: getOpenTOCDetails(state),
-    });
-
-    this.bounds = convertMapExtentToPolygon(getMapExtent(state));
-  };
-
   return SavedGisMap;
-});
+}
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/index.js b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/index.js
index aad8c79f3a628..0274f849daf3d 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/index.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/index.js
@@ -23,6 +23,7 @@ import {
   getScrollZoom,
   isInteractiveDisabled,
   isTooltipControlDisabled,
+  isViewControlHidden,
 } from '../../../selectors/map_selectors';
 import { getInspectorAdapters } from '../../../reducers/non_serializable_instances';
 
@@ -36,6 +37,8 @@ function mapStateToProps(state = {}) {
     scrollZoom: getScrollZoom(state),
     disableInteractive: isInteractiveDisabled(state),
     disableTooltipControl: isTooltipControlDisabled(state),
+    disableTooltipControl: isTooltipControlDisabled(state),
+    hideViewControl: isViewControlHidden(state),
   };
 }
 
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js
index 83cebc9e83520..5470d6624916a 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/map/mb/view.js
@@ -188,18 +188,20 @@ export class MBMapContainer extends React.Component {
         this.props.extentChanged(this._getMapState());
       }, 100)
     );
-
-    const throttledSetMouseCoordinates = _.throttle(e => {
-      this.props.setMouseCoordinates({
-        lat: e.lngLat.lat,
-        lon: e.lngLat.lng,
+    // Attach event only if view control is visible, which shows lat/lon
+    if (!this.props.hideViewControl) {
+      const throttledSetMouseCoordinates = _.throttle(e => {
+        this.props.setMouseCoordinates({
+          lat: e.lngLat.lat,
+          lon: e.lngLat.lng,
+        });
+      }, 100);
+      this.state.mbMap.on('mousemove', throttledSetMouseCoordinates);
+      this.state.mbMap.on('mouseout', () => {
+        throttledSetMouseCoordinates.cancel(); // cancel any delayed setMouseCoordinates invocations
+        this.props.clearMouseCoordinates();
       });
-    }, 100);
-    this.state.mbMap.on('mousemove', throttledSetMouseCoordinates);
-    this.state.mbMap.on('mouseout', () => {
-      throttledSetMouseCoordinates.cancel(); // cancel any delayed setMouseCoordinates invocations
-      this.props.clearMouseCoordinates();
-    });
+    }
   }
 
   _initResizerChecker() {
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/index.js b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/index.js
index f610070880fc8..ebf9b8a609d2a 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/index.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/index.js
@@ -7,5 +7,14 @@
 import { connect } from 'react-redux';
 import { WidgetOverlay } from './widget_overlay';
 
-const connectedWidgetOverlay = connect(null, null)(WidgetOverlay);
+import { isLayerControlHidden, isViewControlHidden } from '../../selectors/map_selectors';
+
+function mapStateToProps(state = {}) {
+  return {
+    hideLayerControl: isLayerControlHidden(state),
+    hideViewControl: isViewControlHidden(state),
+  };
+}
+
+const connectedWidgetOverlay = connect(mapStateToProps, null)(WidgetOverlay);
 export { connectedWidgetOverlay as WidgetOverlay };
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/view.js b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/view.js
index b843d2d4758d4..c9f115c1ba4cc 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/view.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/view.js
@@ -46,7 +46,10 @@ export class TOCEntry extends React.Component {
   };
 
   async _loadHasLegendDetails() {
-    const hasLegendDetails = await this.props.layer.hasLegendDetails();
+    const hasLegendDetails =
+      (await this.props.layer.hasLegendDetails()) &&
+      this.props.layer.isVisible() &&
+      this.props.layer.showAtZoomLevel(this.props.zoom);
     if (this._isMounted && hasLegendDetails !== this.state.hasLegendDetails) {
       this.setState({ hasLegendDetails });
     }
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/widget_overlay.js b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/widget_overlay.js
index ae3deca7a1be4..a37f837874f8f 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/widget_overlay.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/widget_overlay.js
@@ -10,7 +10,7 @@ import { LayerControl } from './layer_control';
 import { ViewControl } from './view_control';
 import { AttributionControl } from './attribution_control';
 
-export function WidgetOverlay() {
+export function WidgetOverlay({ hideLayerControl, hideViewControl }) {
   return (
     <EuiFlexGroup
       className="mapWidgetOverlay"
@@ -20,11 +20,9 @@ export function WidgetOverlay() {
       gutterSize="s"
     >
       <EuiFlexItem className="mapWidgetOverlay__layerWrapper">
-        <LayerControl />
-      </EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <ViewControl />
+        {!hideLayerControl && <LayerControl />}
       </EuiFlexItem>
+      <EuiFlexItem grow={false}>{!hideViewControl && <ViewControl />}</EuiFlexItem>
       <EuiFlexItem grow={false}>
         <AttributionControl />
       </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.test.js b/x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.test.js
index 170ede9f2bb26..fb4b0a6e29e6c 100644
--- a/x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.test.js
+++ b/x-pack/legacy/plugins/maps/public/elasticsearch_geo_utils.test.js
@@ -5,7 +5,7 @@
  */
 
 jest.mock('ui/new_platform');
-jest.mock('ui/index_patterns');
+
 jest.mock('./kibana_services', () => {
   return {
     SPATIAL_FILTER_TYPE: 'spatial_filter',
@@ -20,7 +20,7 @@ import {
   convertMapExtentToPolygon,
   roundCoordinates,
 } from './elasticsearch_geo_utils';
-import { flattenHitWrapper } from 'ui/index_patterns';
+import { indexPatterns } from '../../../../../src/plugins/data/public';
 
 const geoFieldName = 'location';
 const mapExtent = {
@@ -172,7 +172,7 @@ describe('hitsToGeoJson', () => {
         },
       },
     };
-    const indexPatternFlattenHit = flattenHitWrapper(indexPatternMock);
+    const indexPatternFlattenHit = indexPatterns.flattenHitWrapper(indexPatternMock);
 
     it('Should handle geoField being an object', () => {
       const hits = [
diff --git a/x-pack/legacy/plugins/maps/public/embeddable/README.md b/x-pack/legacy/plugins/maps/public/embeddable/README.md
index 82f83f1bfcf4a..eb6571a96016c 100644
--- a/x-pack/legacy/plugins/maps/public/embeddable/README.md
+++ b/x-pack/legacy/plugins/maps/public/embeddable/README.md
@@ -7,6 +7,8 @@
 - **disableInteractive:** (Boolean) Will disable map interactions, panning, zooming in the map.
 - **disableTooltipControl:** (Boolean) Will disable tooltip which shows relevant information on hover, like Continent name etc
 - **hideToolbarOverlay:** (Boolean) Will disable toolbar, which can be used to navigate to coordinate by entering lat/long and zoom values.
+- **hideLayerControl:** (Boolean) Will hide useful layer control, which can be used to hide/show a layer to get a refined view of the map.
+- **hideViewControl:** (Boolean) Will hide view control at bottom right of the map, which shows lat/lon values based on mouse hover in the map, this is useful to get coordinate value from a particular point in map.
 
 ### Creating a Map embeddable from saved object
 ```
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 2c203ffc8fc63..2ee766f91fbca 100644
--- a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.js
+++ b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.js
@@ -30,6 +30,8 @@ import {
   disableInteractive,
   disableTooltipControl,
   hideToolbarOverlay,
+  hideLayerControl,
+  hideViewControl,
 } from '../actions/map_actions';
 import { setReadOnly, setIsLayerTOCOpen, setOpenTOCDetails } from '../actions/ui_actions';
 import { getIsLayerTOCOpen, getOpenTOCDetails } from '../selectors/ui_selectors';
@@ -132,6 +134,14 @@ export class MapEmbeddable extends Embeddable {
       this._store.dispatch(hideToolbarOverlay(this.input.hideToolbarOverlay));
     }
 
+    if (_.has(this.input, 'hideLayerControl') && this.input.hideLayerControl) {
+      this._store.dispatch(hideLayerControl(this.input.hideLayerControl));
+    }
+
+    if (_.has(this.input, 'hideViewControl') && this.input.hideViewControl) {
+      this._store.dispatch(hideViewControl(this.input.hideViewControl));
+    }
+
     if (this.input.mapCenter) {
       this._store.dispatch(
         setGotoWithCenter({
diff --git a/x-pack/legacy/plugins/maps/public/kibana_services.js b/x-pack/legacy/plugins/maps/public/kibana_services.js
index 7e63866877903..1ec7565df6f26 100644
--- a/x-pack/legacy/plugins/maps/public/kibana_services.js
+++ b/x-pack/legacy/plugins/maps/public/kibana_services.js
@@ -8,7 +8,6 @@ import {
   getRequestInspectorStats,
   getResponseInspectorStats,
 } from '../../../../../src/legacy/ui/public/courier';
-export { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
 import { esFilters } from '../../../../../src/plugins/data/public';
 import { npStart } from 'ui/new_platform';
 
@@ -16,6 +15,12 @@ export const SPATIAL_FILTER_TYPE = esFilters.FILTERS.SPATIAL_FILTER;
 export { SearchSource } from '../../../../../src/legacy/ui/public/courier';
 export const indexPatternService = npStart.plugins.data.indexPatterns;
 
+let licenseId;
+export const setLicenseId = latestLicenseId => (licenseId = latestLicenseId);
+export const getLicenseId = () => {
+  return licenseId;
+};
+
 export async function fetchSearchSourceAndRecordWithInspector({
   searchSource,
   requestId,
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 6671914bce74f..13a2e05ab8eeb 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 { getComputedFieldNamePrefix } from '../styles/vector/style_util';
-import { META_ID_ORIGIN_SUFFIX } from '../../../common/constants';
+import { META_ID_ORIGIN_SUFFIX, FORMATTERS_ID_ORIGIN_SUFFIX } from '../../../common/constants';
 
 export class InnerJoin {
   constructor(joinDescriptor, leftSource) {
@@ -45,6 +45,10 @@ export class InnerJoin {
     return `${this.getSourceDataRequestId()}_${META_ID_ORIGIN_SUFFIX}`;
   }
 
+  getSourceFormattersDataRequestId() {
+    return `${this.getSourceDataRequestId()}_${FORMATTERS_ID_ORIGIN_SUFFIX}`;
+  }
+
   getLeftField() {
     return this._leftField;
   }
diff --git a/x-pack/legacy/plugins/maps/public/layers/layer.js b/x-pack/legacy/plugins/maps/public/layers/layer.js
index 2890b75172fb0..21c5f15fb6122 100644
--- a/x-pack/legacy/plugins/maps/public/layers/layer.js
+++ b/x-pack/legacy/plugins/maps/public/layers/layer.js
@@ -344,6 +344,10 @@ export class AbstractLayer {
     return [];
   }
 
+  async getFields() {
+    return [];
+  }
+
   syncVisibilityWithMb(mbMap, mbLayerId) {
     mbMap.setLayoutProperty(mbLayerId, 'visibility', this.isVisible() ? 'visible' : 'none');
   }
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 bd7f5f634ad20..a38669fcd1d1a 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
@@ -6,7 +6,11 @@
 
 import { AbstractVectorSource } from '../vector_source';
 import React from 'react';
-import { ES_GEO_FIELD_TYPE, GEOJSON_FILE, ES_SIZE_LIMIT } from '../../../../common/constants';
+import {
+  ES_GEO_FIELD_TYPE,
+  GEOJSON_FILE,
+  DEFAULT_MAX_RESULT_WINDOW,
+} from '../../../../common/constants';
 import { ClientFileCreateSourceEditor } from './create_client_file_source_editor';
 import { ESSearchSource } from '../es_search_source';
 import uuid from 'uuid/v4';
@@ -82,7 +86,7 @@ export class GeojsonFileSource extends AbstractVectorSource {
         addAndViewSource(null);
       } else {
         // Only turn on bounds filter for large doc counts
-        const filterByMapBounds = indexDataResp.docCount > ES_SIZE_LIMIT;
+        const filterByMapBounds = indexDataResp.docCount > DEFAULT_MAX_RESULT_WINDOW;
         const source = new ESSearchSource(
           {
             id: uuid(),
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/create_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/create_source_editor.js
deleted file mode 100644
index 65986d5bc93df..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/create_source_editor.js
+++ /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 React from 'react';
-import { EuiSelect, EuiFormRow } from '@elastic/eui';
-
-import { getEMSClient } from '../../../meta';
-import { getEmsUnavailableMessage } from '../ems_unavailable_message';
-import { i18n } from '@kbn/i18n';
-
-export const AUTO_SELECT = 'auto_select';
-
-export class EMSTMSCreateSourceEditor extends React.Component {
-  state = {
-    emsTmsOptionsRaw: null,
-  };
-
-  _loadTmsOptions = async () => {
-    const emsClient = getEMSClient();
-    const emsTMSServices = await emsClient.getTMSServices();
-    const options = emsTMSServices.map(tmsService => {
-      return {
-        id: tmsService.getId(),
-        name: tmsService.getDisplayName(),
-      };
-    });
-    options.unshift({
-      id: AUTO_SELECT,
-      name: i18n.translate('xpack.maps.source.emsTile.autoLabel', {
-        defaultMessage: 'Autoselect based on Kibana theme',
-      }),
-    });
-    if (this._isMounted) {
-      this.setState({
-        emsTmsOptionsRaw: options,
-      });
-    }
-  };
-
-  _onEmsTileServiceChange = e => {
-    const value = e.target.value;
-    const isAutoSelect = value === AUTO_SELECT;
-    this.props.onSourceConfigChange({
-      id: isAutoSelect ? null : value,
-      isAutoSelect,
-    });
-  };
-
-  componentWillUnmount() {
-    this._isMounted = false;
-  }
-
-  componentDidMount() {
-    this._isMounted = true;
-    this._loadTmsOptions();
-  }
-
-  render() {
-    if (!this.state.emsTmsOptionsRaw) {
-      // TODO display loading message
-      return null;
-    }
-
-    const emsTileOptions = this.state.emsTmsOptionsRaw.map(service => ({
-      value: service.id,
-      text: service.name || service.id,
-    }));
-
-    return (
-      <EuiFormRow
-        label={i18n.translate('xpack.maps.source.emsTile.label', {
-          defaultMessage: 'Tile service',
-        })}
-        helpText={this.state.emsTmsOptionsRaw.length === 0 ? getEmsUnavailableMessage() : null}
-      >
-        <EuiSelect
-          hasNoInitialSelection
-          options={emsTileOptions}
-          onChange={this._onEmsTileServiceChange}
-          disabled={this.state.emsTmsOptionsRaw.length === 0}
-        />
-      </EuiFormRow>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
index 8850c4c07ab73..76ecc18f2f7d7 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
@@ -11,7 +11,8 @@ import { AbstractTMSSource } from '../tms_source';
 import { VectorTileLayer } from '../../vector_tile_layer';
 
 import { getEMSClient } from '../../../meta';
-import { EMSTMSCreateSourceEditor } from './create_source_editor';
+import { TileServiceSelect } from './tile_service_select';
+import { UpdateSourceEditor } from './update_source_editor';
 import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
 import { EMS_TMS } from '../../../../common/constants';
@@ -41,7 +42,7 @@ export class EMSTMSSource extends AbstractTMSSource {
       onPreviewSource(source);
     };
 
-    return <EMSTMSCreateSourceEditor onSourceConfigChange={onSourceConfigChange} />;
+    return <TileServiceSelect onTileSelect={onSourceConfigChange} />;
   }
 
   constructor(descriptor, inspectorAdapters) {
@@ -55,6 +56,10 @@ export class EMSTMSSource extends AbstractTMSSource {
     );
   }
 
+  renderSourceSettingsEditor({ onChange }) {
+    return <UpdateSourceEditor onChange={onChange} config={this._descriptor} />;
+  }
+
   async getImmutableProperties() {
     const displayName = await this.getDisplayName();
     const autoSelectMsg = i18n.translate('xpack.maps.source.emsTile.isAutoSelectLabel', {
@@ -78,7 +83,7 @@ export class EMSTMSSource extends AbstractTMSSource {
   async _getEMSTMSService() {
     const emsClient = getEMSClient();
     const emsTMSServices = await emsClient.getTMSServices();
-    const emsTileLayerId = this._getEmsTileLayerId();
+    const emsTileLayerId = this.getTileLayerId();
     const tmsService = emsTMSServices.find(tmsService => tmsService.getId() === emsTileLayerId);
     if (!tmsService) {
       throw new Error(
@@ -110,7 +115,7 @@ export class EMSTMSSource extends AbstractTMSSource {
       const emsTMSService = await this._getEMSTMSService();
       return emsTMSService.getDisplayName();
     } catch (error) {
-      return this._getEmsTileLayerId();
+      return this.getTileLayerId();
     }
   }
 
@@ -129,7 +134,7 @@ export class EMSTMSSource extends AbstractTMSSource {
   }
 
   getSpriteNamespacePrefix() {
-    return 'ems/' + this._getEmsTileLayerId();
+    return 'ems/' + this.getTileLayerId();
   }
 
   async getVectorStyleSheetAndSpriteMeta(isRetina) {
@@ -142,7 +147,7 @@ export class EMSTMSSource extends AbstractTMSSource {
     };
   }
 
-  _getEmsTileLayerId() {
+  getTileLayerId() {
     if (!this._descriptor.isAutoSelect) {
       return this._descriptor.id;
     }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js
new file mode 100644
index 0000000000000..337fc7aa46693
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiSelect, EuiFormRow } from '@elastic/eui';
+
+import { getEMSClient } from '../../../meta';
+import { getEmsUnavailableMessage } from '../ems_unavailable_message';
+import { i18n } from '@kbn/i18n';
+
+export const AUTO_SELECT = 'auto_select';
+
+export class TileServiceSelect extends React.Component {
+  state = {
+    emsTmsOptions: [],
+    hasLoaded: false,
+  };
+
+  componentWillUnmount() {
+    this._isMounted = false;
+  }
+
+  componentDidMount() {
+    this._isMounted = true;
+    this._loadTmsOptions();
+  }
+
+  _loadTmsOptions = async () => {
+    const emsClient = getEMSClient();
+    const emsTMSServices = await emsClient.getTMSServices();
+
+    if (!this._isMounted) {
+      return;
+    }
+
+    const emsTmsOptions = emsTMSServices.map(tmsService => {
+      return {
+        value: tmsService.getId(),
+        text: tmsService.getDisplayName() ? tmsService.getDisplayName() : tmsService.getId(),
+      };
+    });
+    emsTmsOptions.unshift({
+      value: AUTO_SELECT,
+      text: i18n.translate('xpack.maps.source.emsTile.autoLabel', {
+        defaultMessage: 'Autoselect based on Kibana theme',
+      }),
+    });
+    this.setState({ emsTmsOptions, hasLoaded: true });
+  };
+
+  _onChange = e => {
+    const value = e.target.value;
+    const isAutoSelect = value === AUTO_SELECT;
+    this.props.onTileSelect({
+      id: isAutoSelect ? null : value,
+      isAutoSelect,
+    });
+  };
+
+  render() {
+    const helpText =
+      this.state.hasLoaded && this.state.emsTmsOptions.length === 0
+        ? getEmsUnavailableMessage()
+        : null;
+
+    let selectedId;
+    if (this.props.config) {
+      selectedId = this.props.config.isAutoSelect ? AUTO_SELECT : this.props.config.id;
+    }
+
+    return (
+      <EuiFormRow
+        label={i18n.translate('xpack.maps.source.emsTile.label', {
+          defaultMessage: 'Tile service',
+        })}
+        helpText={helpText}
+        display="columnCompressed"
+      >
+        <EuiSelect
+          hasNoInitialSelection={!selectedId}
+          value={selectedId}
+          options={this.state.emsTmsOptions}
+          onChange={this._onChange}
+          isLoading={!this.state.hasLoaded}
+          disabled={this.state.hasLoaded && this.state.emsTmsOptions.length === 0}
+          compressed
+        />
+      </EuiFormRow>
+    );
+  }
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js
new file mode 100644
index 0000000000000..4d567b8dbb32a
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js
@@ -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 React, { Fragment } from 'react';
+import { EuiTitle, EuiPanel, EuiSpacer } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { TileServiceSelect } from './tile_service_select';
+
+export function UpdateSourceEditor({ onChange, config }) {
+  const _onTileSelect = ({ id, isAutoSelect }) => {
+    onChange({ propName: 'id', value: id });
+    onChange({ propName: 'isAutoSelect', value: isAutoSelect });
+  };
+
+  return (
+    <Fragment>
+      <EuiPanel>
+        <EuiTitle size="xs">
+          <h5>
+            <FormattedMessage
+              id="xpack.maps.source.emsTile.settingsTitle"
+              defaultMessage="Basemap"
+            />
+          </h5>
+        </EuiTitle>
+
+        <EuiSpacer size="m" />
+
+        <TileServiceSelect onTileSelect={_onTileSelect} config={config} />
+      </EuiPanel>
+
+      <EuiSpacer size="s" />
+    </Fragment>
+  );
+}
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
index c07b51c20ab85..fd3ae8f0ab7e3 100644
--- 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
@@ -82,6 +82,11 @@ export class AbstractESAggSource extends AbstractESSource {
     });
   }
 
+  hasMatchingMetricField(fieldName) {
+    const matchingField = this.getMetricFieldForName(fieldName);
+    return !!matchingField;
+  }
+
   getMetricFieldForName(fieldName) {
     return this.getMetricFields().find(metricField => {
       return metricField.getName() === fieldName;
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js
index 11506d74505ba..28045eeb5e9b5 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js
@@ -15,7 +15,11 @@ import { NoIndexPatternCallout } from '../../../components/no_index_pattern_call
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { kfetch } from 'ui/kfetch';
-import { ES_GEO_FIELD_TYPE, GIS_API_PATH, ES_SIZE_LIMIT } from '../../../../common/constants';
+import {
+  ES_GEO_FIELD_TYPE,
+  GIS_API_PATH,
+  DEFAULT_MAX_RESULT_WINDOW,
+} from '../../../../common/constants';
 import { DEFAULT_FILTER_BY_MAP_BOUNDS } from './constants';
 
 import { npStart } from 'ui/new_platform';
@@ -96,7 +100,7 @@ export class CreateSourceEditor extends Component {
     let indexHasSmallDocCount = false;
     try {
       const indexDocCount = await this.loadIndexDocCount(indexPattern.title);
-      indexHasSmallDocCount = indexDocCount <= ES_SIZE_LIMIT;
+      indexHasSmallDocCount = indexDocCount <= DEFAULT_MAX_RESULT_WINDOW;
     } catch (error) {
       // retrieving index count is a nice to have and is not essential
       // do not interrupt user flow if unable to retrieve count
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 d8960ae1f6a04..8ef4966e03c1b 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
@@ -17,12 +17,13 @@ import { UpdateSourceEditor } from './update_source_editor';
 import {
   ES_SEARCH,
   ES_GEO_FIELD_TYPE,
-  ES_SIZE_LIMIT,
+  DEFAULT_MAX_BUCKETS_LIMIT,
   SORT_ORDER,
 } from '../../../../common/constants';
 import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
 import { getSourceFields } from '../../../index_pattern_util';
+import { loadIndexSettings } from './load_index_settings';
 
 import { DEFAULT_FILTER_BY_MAP_BOUNDS } from './constants';
 import { ESDocField } from '../../fields/es_doc_field';
@@ -124,6 +125,24 @@ export class ESSearchSource extends AbstractESSource {
     }
   }
 
+  async getFields() {
+    try {
+      const indexPattern = await this.getIndexPattern();
+      return indexPattern.fields
+        .filter(field => {
+          // Ensure fielddata is enabled for field.
+          // Search does not request _source
+          return field.aggregatable;
+        })
+        .map(field => {
+          return this.createField({ fieldName: field.name });
+        });
+    } catch (error) {
+      // failed index-pattern retrieval will show up as error-message in the layer-toc-entry
+      return [];
+    }
+  }
+
   getFieldNames() {
     return [this._descriptor.geoField];
   }
@@ -249,8 +268,8 @@ export class ESSearchSource extends AbstractESSource {
       entitySplit: {
         terms: {
           field: topHitsSplitField,
-          size: ES_SIZE_LIMIT,
-          shard_size: ES_SIZE_LIMIT,
+          size: DEFAULT_MAX_BUCKETS_LIMIT,
+          shard_size: DEFAULT_MAX_BUCKETS_LIMIT,
         },
         aggs: {
           entityHits: {
@@ -272,7 +291,7 @@ export class ESSearchSource extends AbstractESSource {
     const entityBuckets = _.get(resp, 'aggregations.entitySplit.buckets', []);
     const totalEntities = _.get(resp, 'aggregations.totalEntities.value', 0);
     // can not compare entityBuckets.length to totalEntities because totalEntities is an approximate
-    const areEntitiesTrimmed = entityBuckets.length >= ES_SIZE_LIMIT;
+    const areEntitiesTrimmed = entityBuckets.length >= DEFAULT_MAX_BUCKETS_LIMIT;
     let areTopHitsTrimmed = false;
     entityBuckets.forEach(entityBucket => {
       const total = _.get(entityBucket, 'entityHits.hits.total', 0);
@@ -297,7 +316,7 @@ export class ESSearchSource extends AbstractESSource {
 
   // searchFilters.fieldNames contains geo field and any fields needed for styling features
   // Performs Elasticsearch search request being careful to pull back only required fields to minimize response size
-  async _getSearchHits(layerName, searchFilters, registerCancelCallback) {
+  async _getSearchHits(layerName, searchFilters, maxResultWindow, registerCancelCallback) {
     const initialSearchContext = {
       docvalue_fields: await this._getDateDocvalueFields(searchFilters.fieldNames),
     };
@@ -313,7 +332,7 @@ export class ESSearchSource extends AbstractESSource {
       );
       searchSource = await this._makeSearchSource(
         searchFilters,
-        ES_SIZE_LIMIT,
+        maxResultWindow,
         initialSearchContext
       );
       searchSource.setField('source', false); // do not need anything from _source
@@ -322,7 +341,7 @@ export class ESSearchSource extends AbstractESSource {
       // geo_shape fields do not support docvalue_fields yet, so still have to be pulled from _source
       searchSource = await this._makeSearchSource(
         searchFilters,
-        ES_SIZE_LIMIT,
+        maxResultWindow,
         initialSearchContext
       );
       // Setting "fields" instead of "source: { includes: []}"
@@ -364,11 +383,19 @@ export class ESSearchSource extends AbstractESSource {
   }
 
   async getGeoJsonWithMeta(layerName, searchFilters, registerCancelCallback) {
+    const indexPattern = await this.getIndexPattern();
+
+    const indexSettings = await loadIndexSettings(indexPattern.title);
+
     const { hits, meta } = this._isTopHits()
       ? await this._getTopHits(layerName, searchFilters, registerCancelCallback)
-      : await this._getSearchHits(layerName, searchFilters, registerCancelCallback);
+      : await this._getSearchHits(
+          layerName,
+          searchFilters,
+          indexSettings.maxResultWindow,
+          registerCancelCallback
+        );
 
-    const indexPattern = await this.getIndexPattern();
     const unusedMetaFields = indexPattern.metaFields.filter(metaField => {
       return !['_id', '_index'].includes(metaField);
     });
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js
new file mode 100644
index 0000000000000..1a58b5b073b08
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  DEFAULT_MAX_RESULT_WINDOW,
+  DEFAULT_MAX_INNER_RESULT_WINDOW,
+  INDEX_SETTINGS_API_PATH,
+} from '../../../../common/constants';
+import { kfetch } from 'ui/kfetch';
+import { toastNotifications } from 'ui/notify';
+import { i18n } from '@kbn/i18n';
+
+let toastDisplayed = false;
+const indexSettings = new Map();
+
+export async function loadIndexSettings(indexPatternTitle) {
+  if (indexSettings.has(indexPatternTitle)) {
+    return indexSettings.get(indexPatternTitle);
+  }
+
+  const fetchPromise = fetchIndexSettings(indexPatternTitle);
+  indexSettings.set(indexPatternTitle, fetchPromise);
+  return fetchPromise;
+}
+
+async function fetchIndexSettings(indexPatternTitle) {
+  try {
+    const indexSettings = await kfetch({
+      pathname: `../${INDEX_SETTINGS_API_PATH}`,
+      query: {
+        indexPatternTitle,
+      },
+    });
+    return indexSettings;
+  } catch (err) {
+    const warningMsg = i18n.translate('xpack.maps.indexSettings.fetchErrorMsg', {
+      defaultMessage: `Unable to fetch index settings for index pattern '{indexPatternTitle}'.
+      Ensure you have '{viewIndexMetaRole}' role.`,
+      values: {
+        indexPatternTitle,
+        viewIndexMetaRole: 'view_index_metadata',
+      },
+    });
+    if (!toastDisplayed) {
+      // Only show toast for first failure to avoid flooding user with warnings
+      toastDisplayed = true;
+      toastNotifications.addWarning(warningMsg);
+    }
+    console.warn(warningMsg);
+    return {
+      maxResultWindow: DEFAULT_MAX_RESULT_WINDOW,
+      maxInnerResultWindow: DEFAULT_MAX_INNER_RESULT_WINDOW,
+    };
+  }
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js
index 595e1d0c755cf..4503856829ef2 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js
@@ -22,9 +22,10 @@ import { indexPatternService } from '../../../kibana_services';
 import { i18n } from '@kbn/i18n';
 import { getTermsFields, getSourceFields } from '../../../index_pattern_util';
 import { ValidatedRange } from '../../../components/validated_range';
-import { SORT_ORDER } from '../../../../common/constants';
+import { DEFAULT_MAX_INNER_RESULT_WINDOW, SORT_ORDER } from '../../../../common/constants';
 import { ESDocField } from '../../fields/es_doc_field';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { loadIndexSettings } from './load_index_settings';
 
 export class UpdateSourceEditor extends Component {
   static propTypes = {
@@ -43,17 +44,31 @@ export class UpdateSourceEditor extends Component {
     sourceFields: null,
     termFields: null,
     sortFields: null,
+    maxInnerResultWindow: DEFAULT_MAX_INNER_RESULT_WINDOW,
   };
 
   componentDidMount() {
     this._isMounted = true;
     this.loadFields();
+    this.loadIndexSettings();
   }
 
   componentWillUnmount() {
     this._isMounted = false;
   }
 
+  async loadIndexSettings() {
+    try {
+      const indexPattern = await indexPatternService.get(this.props.indexPatternId);
+      const { maxInnerResultWindow } = await loadIndexSettings(indexPattern.title);
+      if (this._isMounted) {
+        this.setState({ maxInnerResultWindow });
+      }
+    } catch (err) {
+      return;
+    }
+  }
+
   async loadFields() {
     let indexPattern;
     try {
@@ -149,7 +164,7 @@ export class UpdateSourceEditor extends Component {
         >
           <ValidatedRange
             min={1}
-            max={100}
+            max={this.state.maxInnerResultWindow}
             step={1}
             value={this.props.topHitsSize}
             onChange={this.onTopHitsSizeChange}
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js
index 8f0a147f2a684..badfba7665dfd 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js
@@ -6,6 +6,12 @@
 
 jest.mock('../../../kibana_services', () => ({}));
 
+jest.mock('./load_index_settings', () => ({
+  loadIndexSettings: async () => {
+    return { maxInnerResultWindow: 100 };
+  },
+}));
+
 import React from 'react';
 import { shallow } from 'enzyme';
 
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 42d07b8d45acd..6e8b2e1e7c6f5 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
@@ -9,7 +9,7 @@ import _ from 'lodash';
 import { Schemas } from 'ui/vis/editors/default/schemas';
 import { AggConfigs } from 'ui/agg_types';
 import { i18n } from '@kbn/i18n';
-import { ES_SIZE_LIMIT, FIELD_ORIGIN, METRIC_TYPE } from '../../../common/constants';
+import { DEFAULT_MAX_BUCKETS_LIMIT, FIELD_ORIGIN, METRIC_TYPE } from '../../../common/constants';
 import { ESDocField } from '../fields/es_doc_field';
 import { AbstractESAggSource } from './es_agg_source';
 
@@ -170,7 +170,7 @@ export class ESTermSource extends AbstractESAggSource {
         schema: 'segment',
         params: {
           field: this._termField.getName(),
-          size: ES_SIZE_LIMIT,
+          size: DEFAULT_MAX_BUCKETS_LIMIT,
         },
       },
     ];
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 814cbffc7bfe3..bf7267e9c5858 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
@@ -103,6 +103,10 @@ export class AbstractVectorSource extends AbstractSource {
     return [];
   }
 
+  async getFields() {
+    return [...(await this.getDateFields()), ...(await this.getNumberFields())];
+  }
+
   async getLeftJoinFields() {
     return [];
   }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.test.js
index 1ea065c7e9e67..8826c771fab19 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.test.js
@@ -92,7 +92,6 @@ describe('getLinearGradient', () => {
       'rgb(32,112,180)',
       'rgb(7,47,107)',
     ];
-
     expect(getLinearGradient(colorRamp)).toBe(
       'linear-gradient(to right, rgb(247,250,255) 0%, rgb(221,234,247)       14%, rgb(197,218,238)       28%, rgb(157,201,224)       42%, rgb(106,173,213)       57%, rgb(65,145,197)       71%, rgb(32,112,180)       85%, rgb(7,47,107) 100%)'
     );
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/ranged_style_legend_row.js b/x-pack/legacy/plugins/maps/public/layers/styles/components/ranged_style_legend_row.js
new file mode 100644
index 0000000000000..3eb34ec1406d2
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/components/ranged_style_legend_row.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { EuiFlexGroup, EuiFlexItem, EuiText, EuiSpacer, EuiToolTip } from '@elastic/eui';
+
+export function RangedStyleLegendRow({ header, minLabel, maxLabel, propertyLabel, fieldLabel }) {
+  return (
+    <div>
+      <EuiSpacer size="xs" />
+      {header}
+      <EuiFlexGroup gutterSize="xs" justifyContent="spaceBetween">
+        <EuiFlexItem grow={true}>
+          <EuiText size="xs">
+            <small>{minLabel}</small>
+          </EuiText>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiToolTip position="top" title={propertyLabel} content={fieldLabel}>
+            <EuiText className="eui-textTruncate" size="xs" style={{ maxWidth: '180px' }}>
+              <small>
+                <strong>{fieldLabel}</strong>
+              </small>
+            </EuiText>
+          </EuiToolTip>
+        </EuiFlexItem>
+        <EuiFlexItem grow={true}>
+          <EuiText textAlign="right" size="xs">
+            <small>{maxLabel}</small>
+          </EuiText>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  );
+}
+
+RangedStyleLegendRow.propTypes = {
+  header: PropTypes.node.isRequired,
+  minLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  maxLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  propertyLabel: PropTypes.string.isRequired,
+  fieldLabel: PropTypes.string.isRequired,
+};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/components/style_legend_row.js b/x-pack/legacy/plugins/maps/public/layers/styles/components/style_legend_row.js
deleted file mode 100644
index 38ffed308a0d1..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/components/style_legend_row.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { EuiFlexGroup, EuiFlexItem, EuiText, EuiSpacer, EuiToolTip } from '@elastic/eui';
-
-export function StyleLegendRow({ header, minLabel, maxLabel, propertyLabel, fieldLabel }) {
-  return (
-    <div>
-      <EuiSpacer size="xs" />
-      {header}
-      <EuiFlexGroup gutterSize="xs" justifyContent="spaceBetween">
-        <EuiFlexItem grow={true}>
-          <EuiText size="xs">
-            <small>{minLabel}</small>
-          </EuiText>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiToolTip position="top" title={propertyLabel} content={fieldLabel}>
-            <EuiText className="eui-textTruncate" size="xs" style={{ maxWidth: '180px' }}>
-              <small>
-                <strong>{fieldLabel}</strong>
-              </small>
-            </EuiText>
-          </EuiToolTip>
-        </EuiFlexItem>
-        <EuiFlexItem grow={true}>
-          <EuiText textAlign="right" size="xs">
-            <small>{maxLabel}</small>
-          </EuiText>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </div>
-  );
-}
-
-StyleLegendRow.propTypes = {
-  header: PropTypes.node.isRequired,
-  minLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-  maxLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-  propertyLabel: PropTypes.string.isRequired,
-  fieldLabel: PropTypes.string.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js
index ce514734b6606..1d8dfe9c7bdbf 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js
@@ -8,7 +8,7 @@ import React from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { ColorGradient } from '../../../components/color_gradient';
-import { StyleLegendRow } from '../../../components/style_legend_row';
+import { RangedStyleLegendRow } from '../../../components/ranged_style_legend_row';
 import {
   DEFAULT_RGB_HEATMAP_COLOR_RAMP,
   DEFAULT_HEATMAP_COLOR_RAMP_NAME,
@@ -50,7 +50,7 @@ export class HeatmapLegend extends React.Component {
       );
 
     return (
-      <StyleLegendRow
+      <RangedStyleLegendRow
         header={header}
         minLabel={i18n.translate('xpack.maps.heatmapLegend.coldLabel', {
           defaultMessage: 'cold',
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
index df8464d141b5a..d523cf5870912 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_stops.js
@@ -113,7 +113,7 @@ export const ColorStops = ({ colorStops = [{ stop: 0, color: DEFAULT_COLOR }], o
         display="rowCompressed"
       >
         <div>
-          <EuiFlexGroup responsive={false} alignItems="center" gutterSize="s">
+          <EuiFlexGroup responsive={false} alignItems="center" gutterSize="xs">
             <EuiFlexItem>{stopInput}</EuiFlexItem>
             <EuiFlexItem>{colorInput}</EuiFlexItem>
           </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
new file mode 100644
index 0000000000000..5e0f7434b04d0
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
@@ -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 _ from 'lodash';
+import React, { Fragment } from 'react';
+import { FieldSelect } from '../field_select';
+import { ColorRampSelect } from './color_ramp_select';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+
+export function DynamicColorForm({
+  fields,
+  onDynamicStyleChange,
+  staticDynamicSelect,
+  styleProperty,
+}) {
+  const styleOptions = styleProperty.getOptions();
+
+  const onFieldChange = ({ field }) => {
+    onDynamicStyleChange(styleProperty.getStyleName(), { ...styleOptions, field });
+  };
+
+  const onColorChange = colorOptions => {
+    onDynamicStyleChange(styleProperty.getStyleName(), {
+      ...styleOptions,
+      ...colorOptions,
+    });
+  };
+
+  let colorRampSelect;
+  if (styleOptions.field && styleOptions.field.name) {
+    colorRampSelect = (
+      <ColorRampSelect
+        onChange={onColorChange}
+        color={styleOptions.color}
+        customColorRamp={styleOptions.customColorRamp}
+        useCustomColorRamp={_.get(styleOptions, 'useCustomColorRamp', false)}
+        compressed
+      />
+    );
+  }
+
+  return (
+    <Fragment>
+      <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+        <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+        <EuiFlexItem>
+          <FieldSelect
+            fields={fields}
+            selectedFieldName={_.get(styleOptions, 'field.name')}
+            onChange={onFieldChange}
+            compressed
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="s" />
+      {colorRampSelect}
+    </Fragment>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_selection.js
deleted file mode 100644
index 2db92ba7f9337..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_selection.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
-import { dynamicColorShape } from '../style_option_shapes';
-import { FieldSelect, fieldShape } from '../field_select';
-import { ColorRampSelect } from './color_ramp_select';
-import { EuiSpacer } from '@elastic/eui';
-
-export function DynamicColorSelection({ ordinalFields, onChange, styleOptions }) {
-  const onFieldChange = ({ field }) => {
-    onChange({ ...styleOptions, field });
-  };
-
-  const onColorChange = colorOptions => {
-    onChange({ ...styleOptions, ...colorOptions });
-  };
-
-  return (
-    <Fragment>
-      <ColorRampSelect
-        onChange={onColorChange}
-        color={styleOptions.color}
-        customColorRamp={styleOptions.customColorRamp}
-        useCustomColorRamp={_.get(styleOptions, 'useCustomColorRamp', false)}
-        compressed
-      />
-      <EuiSpacer size="s" />
-      <FieldSelect
-        fields={ordinalFields}
-        selectedFieldName={_.get(styleOptions, 'field.name')}
-        onChange={onFieldChange}
-        compressed
-      />
-    </Fragment>
-  );
-}
-
-DynamicColorSelection.propTypes = {
-  ordinalFields: PropTypes.arrayOf(fieldShape).isRequired,
-  styleOptions: dynamicColorShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js
new file mode 100644
index 0000000000000..48befa1ca74c0
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EuiColorPicker, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+export function StaticColorForm({
+  onStaticStyleChange,
+  staticDynamicSelect,
+  styleProperty,
+  swatches,
+}) {
+  const onColorChange = color => {
+    onStaticStyleChange(styleProperty.getStyleName(), { color });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <EuiColorPicker
+          onChange={onColorChange}
+          color={styleProperty.getOptions().color}
+          swatches={swatches}
+          compressed
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_selection.js
deleted file mode 100644
index e42b582dc3929..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/static_color_selection.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { EuiColorPicker } from '@elastic/eui';
-import { staticColorShape } from '../style_option_shapes';
-
-export function StaticColorSelection({ onChange, styleOptions, swatches }) {
-  const onColorChange = color => {
-    onChange({ color });
-  };
-
-  return (
-    <EuiColorPicker
-      onChange={onColorChange}
-      color={styleOptions.color}
-      swatches={swatches}
-      compressed
-    />
-  );
-}
-
-StaticColorSelection.propTypes = {
-  styleOptions: staticColorShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
index 98b20cb3ad62e..43e7050b3d1d2 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js
@@ -6,21 +6,29 @@
 
 import React from 'react';
 
-import { StaticDynamicStyleRow } from '../static_dynamic_style_row';
-import { DynamicColorSelection } from './dynamic_color_selection';
-import { StaticColorSelection } from './static_color_selection';
+import { StylePropEditor } from '../style_prop_editor';
+import { DynamicColorForm } from './dynamic_color_form';
+import { StaticColorForm } from './static_color_form';
+import { i18n } from '@kbn/i18n';
 
 export function VectorStyleColorEditor(props) {
+  const colorForm = props.styleProperty.isDynamic() ? (
+    <DynamicColorForm {...props} />
+  ) : (
+    <StaticColorForm {...props} />
+  );
+
   return (
-    <StaticDynamicStyleRow
-      ordinalFields={props.ordinalFields}
-      styleProperty={props.styleProperty}
-      handlePropertyChange={props.handlePropertyChange}
-      swatches={props.swatches}
-      DynamicSelector={DynamicColorSelection}
-      StaticSelector={StaticColorSelection}
-      defaultDynamicStyleOptions={props.defaultDynamicStyleOptions}
-      defaultStaticStyleOptions={props.defaultStaticStyleOptions}
-    />
+    <StylePropEditor
+      {...props}
+      customStaticOptionLabel={i18n.translate(
+        'xpack.maps.styles.color.staticDynamicSelect.staticLabel',
+        {
+          defaultMessage: 'Solid',
+        }
+      )}
+    >
+      {colorForm}
+    </StylePropEditor>
   );
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
index d47bd8234319d..325fc28f92051 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js
@@ -30,6 +30,18 @@ export function getVectorStyleLabel(styleName) {
       return i18n.translate('xpack.maps.styles.vector.orientationLabel', {
         defaultMessage: 'Symbol orientation',
       });
+    case VECTOR_STYLES.LABEL_TEXT:
+      return i18n.translate('xpack.maps.styles.vector.labelLabel', {
+        defaultMessage: 'Label',
+      });
+    case VECTOR_STYLES.LABEL_COLOR:
+      return i18n.translate('xpack.maps.styles.vector.labelColorLabel', {
+        defaultMessage: 'Label color',
+      });
+    case VECTOR_STYLES.LABEL_SIZE:
+      return i18n.translate('xpack.maps.styles.vector.labelSizeLabel', {
+        defaultMessage: 'Label size',
+      });
     default:
       return styleName;
   }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js
new file mode 100644
index 0000000000000..bad13b487cc29
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js
@@ -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 _ from 'lodash';
+import React from 'react';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { FieldSelect } from '../field_select';
+
+export function DynamicLabelForm({
+  fields,
+  onDynamicStyleChange,
+  staticDynamicSelect,
+  styleProperty,
+}) {
+  const styleOptions = styleProperty.getOptions();
+
+  const onFieldChange = ({ field }) => {
+    onDynamicStyleChange(styleProperty.getStyleName(), { ...styleOptions, field });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <FieldSelect
+          fields={fields}
+          selectedFieldName={_.get(styleOptions, 'field.name')}
+          onChange={onFieldChange}
+          compressed
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js
new file mode 100644
index 0000000000000..721487b5d8ff0
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiFieldText, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+export function StaticLabelForm({ onStaticStyleChange, staticDynamicSelect, styleProperty }) {
+  const onValueChange = event => {
+    onStaticStyleChange(styleProperty.getStyleName(), { value: event.target.value });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <EuiFieldText
+          placeholder={i18n.translate('xpack.maps.styles.staticLabel.valuePlaceholder', {
+            defaultMessage: 'symbol label',
+          })}
+          value={styleProperty.getOptions().value}
+          onChange={onValueChange}
+          aria-label={i18n.translate('xpack.maps.styles.staticLabel.valueAriaLabel', {
+            defaultMessage: 'symbol label',
+          })}
+          compressed
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js
new file mode 100644
index 0000000000000..aaa21ea315f36
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import { StylePropEditor } from '../style_prop_editor';
+import { DynamicLabelForm } from './dynamic_label_form';
+import { StaticLabelForm } from './static_label_form';
+
+export function VectorStyleLabelEditor(props) {
+  const labelForm = props.styleProperty.isDynamic() ? (
+    <DynamicLabelForm {...props} />
+  ) : (
+    <StaticLabelForm {...props} />
+  );
+
+  return <StylePropEditor {...props}>{labelForm}</StylePropEditor>;
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js
new file mode 100644
index 0000000000000..157b863ac4986
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { VectorStyle } from '../../vector_style';
+import { getColorRampCenterColor } from '../../../color_utils';
+
+export function extractColorFromStyleProperty(colorStyleProperty, defaultColor) {
+  if (!colorStyleProperty) {
+    return defaultColor;
+  }
+
+  if (colorStyleProperty.type === VectorStyle.STYLE_TYPE.STATIC) {
+    return colorStyleProperty.options.color;
+  }
+
+  // Do not use dynamic color unless configuration is complete
+  if (!colorStyleProperty.options.field || !colorStyleProperty.options.field.name) {
+    return defaultColor;
+  }
+
+  // return middle of gradient for dynamic style property
+
+  if (colorStyleProperty.options.useCustomColorRamp) {
+    if (
+      !colorStyleProperty.options.customColorRamp ||
+      !colorStyleProperty.options.customColorRamp.length
+    ) {
+      return defaultColor;
+    }
+    // favor the lowest color in even arrays
+    const middleIndex = Math.floor((colorStyleProperty.options.customColorRamp.length - 1) / 2);
+    return colorStyleProperty.options.customColorRamp[middleIndex].color;
+  }
+
+  return getColorRampCenterColor(colorStyleProperty.options.color);
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/style_property_legend_row.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/style_property_legend_row.js
deleted file mode 100644
index 6b31bba85867b..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/style_property_legend_row.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
-import { getVectorStyleLabel } from '../get_vector_style_label';
-import { StyleLegendRow } from '../../../components/style_legend_row';
-
-const EMPTY_VALUE = '';
-
-export class StylePropertyLegendRow extends Component {
-  _formatValue = value => {
-    if (!this.props.fieldFormatter || value === EMPTY_VALUE) {
-      return value;
-    }
-
-    return this.props.fieldFormatter(value);
-  };
-
-  render() {
-    const { meta: range, style } = this.props;
-
-    const min = this._formatValue(_.get(range, 'min', EMPTY_VALUE));
-    const minLabel =
-      this.props.style.isFieldMetaEnabled() && range && range.isMinOutsideStdRange
-        ? `< ${min}`
-        : min;
-
-    const max = this._formatValue(_.get(range, 'max', EMPTY_VALUE));
-    const maxLabel =
-      this.props.style.isFieldMetaEnabled() && range && range.isMaxOutsideStdRange
-        ? `> ${max}`
-        : max;
-
-    return (
-      <StyleLegendRow
-        header={style.renderHeader()}
-        minLabel={minLabel}
-        maxLabel={maxLabel}
-        propertyLabel={getVectorStyleLabel(style.getStyleName())}
-        fieldLabel={this.props.label}
-      />
-    );
-  }
-}
-
-StylePropertyLegendRow.propTypes = {
-  label: PropTypes.string,
-  fieldFormatter: PropTypes.func,
-  meta: PropTypes.object,
-  style: PropTypes.object,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js
index c9d31b7c22c19..1ce12a5f75bb6 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js
@@ -7,13 +7,11 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
-import { dynamicColorShape, staticColorShape } from '../style_option_shapes';
 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 { getColorRampCenterColor } from '../../../color_utils';
+import { VECTOR_STYLES } from '../../vector_style_defaults';
 
 export class VectorIcon extends Component {
   state = {
@@ -48,16 +46,16 @@ export class VectorIcon extends Component {
 
     if (this.state.isLinesOnly) {
       const style = {
-        stroke: extractColorFromStyleProperty(this.props.lineColor, 'grey'),
+        stroke: this.props.getColorForProperty(VECTOR_STYLES.LINE_COLOR, true),
         strokeWidth: '4px',
       };
       return <LineIcon style={style} />;
     }
 
     const style = {
-      stroke: extractColorFromStyleProperty(this.props.lineColor, 'none'),
+      stroke: this.props.getColorForProperty(VECTOR_STYLES.LINE_COLOR, false),
       strokeWidth: '1px',
-      fill: extractColorFromStyleProperty(this.props.fillColor, 'grey'),
+      fill: this.props.getColorForProperty(VECTOR_STYLES.FILL_COLOR, false),
     };
 
     if (!this.state.isPointsOnly) {
@@ -79,45 +77,8 @@ export class VectorIcon extends Component {
   }
 }
 
-function extractColorFromStyleProperty(colorStyleProperty, defaultColor) {
-  if (!colorStyleProperty) {
-    return defaultColor;
-  }
-
-  if (colorStyleProperty.type === VectorStyle.STYLE_TYPE.STATIC) {
-    return colorStyleProperty.options.color;
-  }
-
-  // Do not use dynamic color unless configuration is complete
-  if (!colorStyleProperty.options.field || !colorStyleProperty.options.field.name) {
-    return defaultColor;
-  }
-
-  // return middle of gradient for dynamic style property
-
-  if (colorStyleProperty.options.useCustomColorRamp) {
-    if (
-      !colorStyleProperty.options.customColorRamp ||
-      !colorStyleProperty.options.customColorRamp.length
-    ) {
-      return defaultColor;
-    }
-    // favor the lowest color in even arrays
-    const middleIndex = Math.floor((colorStyleProperty.options.customColorRamp.length - 1) / 2);
-    return colorStyleProperty.options.customColorRamp[middleIndex].color;
-  }
-
-  return getColorRampCenterColor(colorStyleProperty.options.color);
-}
-
-const colorStylePropertyShape = PropTypes.shape({
-  type: PropTypes.string.isRequired,
-  options: PropTypes.oneOfType([dynamicColorShape, staticColorShape]).isRequired,
-});
-
 VectorIcon.propTypes = {
-  fillColor: colorStylePropertyShape,
-  lineColor: colorStylePropertyShape,
+  getColorForProperty: PropTypes.func.isRequired,
   symbolId: PropTypes.string,
   loadIsPointsOnly: PropTypes.func.isRequired,
   loadIsLinesOnly: PropTypes.func.isRequired,
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js
index 0341f1f22ca0a..ee0058a6ef1aa 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js
@@ -9,16 +9,12 @@ import { shallow } from 'enzyme';
 
 import { VectorIcon } from './vector_icon';
 import { VectorStyle } from '../../vector_style';
+import { extractColorFromStyleProperty } from './extract_color_from_style_property';
+import { VECTOR_STYLES } from '../../vector_style_defaults';
 
 let isPointsOnly = false;
 let isLinesOnly = false;
-const defaultProps = {
-  loadIsPointsOnly: () => {
-    return isPointsOnly;
-  },
-  loadIsLinesOnly: () => {
-    return isLinesOnly;
-  },
+const styles = {
   fillColor: {
     type: VectorStyle.STYLE_TYPE.STATIC,
     options: {
@@ -36,6 +32,30 @@ const defaultProps = {
   },
 };
 
+const defaultProps = {
+  getColorForProperty: (styleProperty, isLinesOnly) => {
+    if (isLinesOnly) {
+      return extractColorFromStyleProperty(styles[VECTOR_STYLES.LINE_COLOR], 'grey');
+    }
+
+    if (styleProperty === VECTOR_STYLES.LINE_COLOR) {
+      return extractColorFromStyleProperty(styles[VECTOR_STYLES.LINE_COLOR], 'none');
+    } else if (styleProperty === VECTOR_STYLES.FILL_COLOR) {
+      return extractColorFromStyleProperty(styles[VECTOR_STYLES.FILL_COLOR], 'grey');
+    } else {
+      //unexpected
+      console.error('Cannot return color for properties other then line or fill color');
+    }
+  },
+
+  loadIsPointsOnly: () => {
+    return isPointsOnly;
+  },
+  loadIsLinesOnly: () => {
+    return isLinesOnly;
+  },
+};
+
 function configureIsLinesOnly() {
   isLinesOnly = true;
   isPointsOnly = false;
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js
index 7ea9b2b04bcfe..df302c42d48ed 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js
@@ -5,19 +5,16 @@
  */
 
 import _ from 'lodash';
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-
-import { StylePropertyLegendRow } from './style_property_legend_row';
+import React, { Component, Fragment } from 'react';
 
 export class VectorStyleLegend extends Component {
   state = {
-    rows: [],
+    styles: [],
   };
 
   componentDidMount() {
     this._isMounted = true;
-    this._prevRowDescriptors = undefined;
+    this._prevStyleDescriptors = undefined;
     this._loadRows();
   }
 
@@ -30,27 +27,34 @@ export class VectorStyleLegend extends Component {
   }
 
   _loadRows = _.debounce(async () => {
-    const rows = await this.props.loadRows();
-    const rowDescriptors = rows.map(row => {
+    const styles = await this.props.getLegendDetailStyleProperties();
+    const styleDescriptorPromises = styles.map(async style => {
       return {
-        label: row.label,
-        range: row.meta,
-        styleOptions: row.style.getOptions(),
+        type: style.getStyleName(),
+        options: style.getOptions(),
+        fieldMeta: style.getFieldMeta(),
+        label: await style.getField().getLabel(),
       };
     });
-    if (this._isMounted && !_.isEqual(rowDescriptors, this._prevRowDescriptors)) {
-      this._prevRowDescriptors = rowDescriptors;
-      this.setState({ rows });
+
+    const styleDescriptors = await Promise.all(styleDescriptorPromises);
+    if (this._isMounted && !_.isEqual(styleDescriptors, this._prevStyleDescriptors)) {
+      this._prevStyleDescriptors = styleDescriptors;
+      this.setState({ styles: styles });
     }
   }, 100);
 
   render() {
-    return this.state.rows.map(rowProps => {
-      return <StylePropertyLegendRow key={rowProps.style.getStyleName()} {...rowProps} />;
+    return this.state.styles.map(style => {
+      return (
+        <Fragment key={style.getStyleName()}>
+          {style.renderLegendDetailRow({
+            loadIsLinesOnly: this.props.loadIsLinesOnly,
+            loadIsPointsOnly: this.props.loadIsPointsOnly,
+            symbolId: this.props.symbolId,
+          })}
+        </Fragment>
+      );
     });
   }
 }
-
-VectorStyleLegend.propTypes = {
-  loadRows: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js
new file mode 100644
index 0000000000000..e0b7e7b2865a2
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import _ from 'lodash';
+import React from 'react';
+import { FieldSelect } from '../field_select';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+export function DynamicOrientationForm({
+  fields,
+  onDynamicStyleChange,
+  staticDynamicSelect,
+  styleProperty,
+}) {
+  const styleOptions = styleProperty.getOptions();
+
+  const onFieldChange = ({ field }) => {
+    onDynamicStyleChange(styleProperty.getStyleName(), {
+      ...styleOptions,
+      field,
+    });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <FieldSelect
+          fields={fields}
+          selectedFieldName={_.get(styleOptions, 'field.name')}
+          onChange={onFieldChange}
+          compressed
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_selection.js
deleted file mode 100644
index 6df3283737c73..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_selection.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import React from 'react';
-import PropTypes from 'prop-types';
-import { dynamicOrientationShape } from '../style_option_shapes';
-import { FieldSelect, fieldShape } from '../field_select';
-
-export function DynamicOrientationSelection({ ordinalFields, styleOptions, onChange }) {
-  const onFieldChange = ({ field }) => {
-    onChange({ ...styleOptions, field });
-  };
-
-  return (
-    <FieldSelect
-      fields={ordinalFields}
-      selectedFieldName={_.get(styleOptions, 'field.name')}
-      onChange={onFieldChange}
-      compressed
-    />
-  );
-}
-
-DynamicOrientationSelection.propTypes = {
-  ordinalFields: PropTypes.arrayOf(fieldShape).isRequired,
-  styleOptions: dynamicOrientationShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
index 72fb218113159..915fc92c9fb38 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js
@@ -6,20 +6,16 @@
 
 import React from 'react';
 
-import { StaticDynamicStyleRow } from '../static_dynamic_style_row';
-import { DynamicOrientationSelection } from './dynamic_orientation_selection';
-import { StaticOrientationSelection } from './static_orientation_selection';
+import { StylePropEditor } from '../style_prop_editor';
+import { DynamicOrientationForm } from './dynamic_orientation_form';
+import { StaticOrientationForm } from './static_orientation_form';
 
 export function OrientationEditor(props) {
-  return (
-    <StaticDynamicStyleRow
-      ordinalFields={props.ordinalFields}
-      styleProperty={props.styleProperty}
-      handlePropertyChange={props.handlePropertyChange}
-      DynamicSelector={DynamicOrientationSelection}
-      StaticSelector={StaticOrientationSelection}
-      defaultDynamicStyleOptions={props.defaultDynamicStyleOptions}
-      defaultStaticStyleOptions={props.defaultStaticStyleOptions}
-    />
+  const orientationForm = props.styleProperty.isDynamic() ? (
+    <DynamicOrientationForm {...props} />
+  ) : (
+    <StaticOrientationForm {...props} />
   );
+
+  return <StylePropEditor {...props}>{orientationForm}</StylePropEditor>;
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js
new file mode 100644
index 0000000000000..8c4418f95e1d2
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { ValidatedRange } from '../../../../../components/validated_range';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+export function StaticOrientationForm({ onStaticStyleChange, staticDynamicSelect, styleProperty }) {
+  const onOrientationChange = orientation => {
+    onStaticStyleChange(styleProperty.getStyleName(), { orientation });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <ValidatedRange
+          min={0}
+          max={360}
+          value={styleProperty.getOptions().orientation}
+          onChange={onOrientationChange}
+          showInput="inputWithPopover"
+          showLabels
+          compressed
+          append="°"
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_selection.js
deleted file mode 100644
index b5529c6987459..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_selection.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { staticOrientationShape } from '../style_option_shapes';
-import { ValidatedRange } from '../../../../../components/validated_range';
-
-export function StaticOrientationSelection({ onChange, styleOptions }) {
-  const onOrientationChange = orientation => {
-    onChange({ orientation });
-  };
-
-  return (
-    <ValidatedRange
-      min={0}
-      max={360}
-      value={styleOptions.orientation}
-      onChange={onOrientationChange}
-      showInput
-      showLabels
-      compressed
-      append="°"
-    />
-  );
-}
-
-StaticOrientationSelection.propTypes = {
-  styleOptions: staticOrientationShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js
new file mode 100644
index 0000000000000..8b069cd53b731
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js
@@ -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 _ from 'lodash';
+import React, { Fragment } from 'react';
+import { FieldSelect } from '../field_select';
+import { SizeRangeSelector } from './size_range_selector';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+
+export function DynamicSizeForm({
+  fields,
+  onDynamicStyleChange,
+  staticDynamicSelect,
+  styleProperty,
+}) {
+  const styleOptions = styleProperty.getOptions();
+
+  const onFieldChange = ({ field }) => {
+    onDynamicStyleChange(styleProperty.getStyleName(), { ...styleOptions, field });
+  };
+
+  const onSizeRangeChange = ({ minSize, maxSize }) => {
+    onDynamicStyleChange(styleProperty.getStyleName(), {
+      ...styleOptions,
+      minSize,
+      maxSize,
+    });
+  };
+
+  let sizeRange;
+  if (styleOptions.field && styleOptions.field.name) {
+    sizeRange = (
+      <SizeRangeSelector
+        onChange={onSizeRangeChange}
+        minSize={styleOptions.minSize}
+        maxSize={styleOptions.maxSize}
+        showLabels
+        compressed
+      />
+    );
+  }
+
+  return (
+    <Fragment>
+      <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+        <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+        <EuiFlexItem>
+          <FieldSelect
+            fields={fields}
+            selectedFieldName={_.get(styleOptions, 'field.name')}
+            onChange={onFieldChange}
+            compressed
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="s" />
+      {sizeRange}
+    </Fragment>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_selection.js
deleted file mode 100644
index 6f8161d26cd6c..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_selection.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
-import { dynamicSizeShape } from '../style_option_shapes';
-import { FieldSelect, fieldShape } from '../field_select';
-import { SizeRangeSelector } from './size_range_selector';
-import { EuiSpacer } from '@elastic/eui';
-
-export function DynamicSizeSelection({ ordinalFields, styleOptions, onChange }) {
-  const onFieldChange = ({ field }) => {
-    onChange({ ...styleOptions, field });
-  };
-
-  const onSizeRangeChange = ({ minSize, maxSize }) => {
-    onChange({ ...styleOptions, minSize, maxSize });
-  };
-
-  return (
-    <Fragment>
-      <SizeRangeSelector
-        onChange={onSizeRangeChange}
-        minSize={styleOptions.minSize}
-        maxSize={styleOptions.maxSize}
-        showLabels
-        compressed
-      />
-      <EuiSpacer size="s" />
-      <FieldSelect
-        fields={ordinalFields}
-        selectedFieldName={_.get(styleOptions, 'field.name')}
-        onChange={onFieldChange}
-        compressed
-      />
-    </Fragment>
-  );
-}
-
-DynamicSizeSelection.propTypes = {
-  ordinalFields: PropTypes.arrayOf(fieldShape).isRequired,
-  styleOptions: dynamicSizeShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js
new file mode 100644
index 0000000000000..d8fe1322db3e3
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js
@@ -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 { ValidatedRange } from '../../../../../components/validated_range';
+import { i18n } from '@kbn/i18n';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+export function StaticSizeForm({ onStaticStyleChange, staticDynamicSelect, styleProperty }) {
+  const onSizeChange = size => {
+    onStaticStyleChange(styleProperty.getStyleName(), { size });
+  };
+
+  return (
+    <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
+      <EuiFlexItem grow={false}>{staticDynamicSelect}</EuiFlexItem>
+      <EuiFlexItem>
+        <ValidatedRange
+          min={0}
+          max={100}
+          value={styleProperty.getOptions().size}
+          onChange={onSizeChange}
+          showInput="inputWithPopover"
+          showLabels
+          compressed
+          append={i18n.translate('xpack.maps.vector.size.unitLabel', {
+            defaultMessage: 'px',
+            description: 'Shorthand for pixel',
+          })}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_selection.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_selection.js
deleted file mode 100644
index 38f8fe53d1748..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/static_size_selection.js
+++ /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 React from 'react';
-import PropTypes from 'prop-types';
-import { staticSizeShape } from '../style_option_shapes';
-import { ValidatedRange } from '../../../../../components/validated_range';
-import { i18n } from '@kbn/i18n';
-
-export function StaticSizeSelection({ onChange, styleOptions }) {
-  const onSizeChange = size => {
-    onChange({ size });
-  };
-
-  return (
-    <ValidatedRange
-      min={0}
-      max={100}
-      value={styleOptions.size}
-      onChange={onSizeChange}
-      showInput
-      showLabels
-      compressed
-      append={i18n.translate('xpack.maps.vector.size.unitLabel', {
-        defaultMessage: 'px',
-        description: 'Shorthand for pixel',
-      })}
-    />
-  );
-}
-
-StaticSizeSelection.propTypes = {
-  styleOptions: staticSizeShape.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
index 0b81e440926ec..e344f72bd429a 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js
@@ -6,20 +6,16 @@
 
 import React from 'react';
 
-import { StaticDynamicStyleRow } from '../static_dynamic_style_row';
-import { DynamicSizeSelection } from './dynamic_size_selection';
-import { StaticSizeSelection } from './static_size_selection';
+import { StylePropEditor } from '../style_prop_editor';
+import { DynamicSizeForm } from './dynamic_size_form';
+import { StaticSizeForm } from './static_size_form';
 
 export function VectorStyleSizeEditor(props) {
-  return (
-    <StaticDynamicStyleRow
-      ordinalFields={props.ordinalFields}
-      styleProperty={props.styleProperty}
-      handlePropertyChange={props.handlePropertyChange}
-      DynamicSelector={DynamicSizeSelection}
-      StaticSelector={StaticSizeSelection}
-      defaultDynamicStyleOptions={props.defaultDynamicStyleOptions}
-      defaultStaticStyleOptions={props.defaultStaticStyleOptions}
-    />
+  const sizeForm = props.styleProperty.isDynamic() ? (
+    <DynamicSizeForm {...props} />
+  ) : (
+    <StaticSizeForm {...props} />
   );
+
+  return <StylePropEditor {...props}>{sizeForm}</StylePropEditor>;
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/static_dynamic_style_row.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/static_dynamic_style_row.js
deleted file mode 100644
index 933b1cce8d28c..0000000000000
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/static_dynamic_style_row.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { Component, Fragment } from 'react';
-import { VectorStyle } from '../vector_style';
-import { i18n } from '@kbn/i18n';
-import { FieldMetaOptionsPopover } from './field_meta_options_popover';
-import { getVectorStyleLabel } from './get_vector_style_label';
-
-import { EuiFlexGroup, EuiFlexItem, EuiToolTip, EuiFormRow, EuiButtonToggle } from '@elastic/eui';
-
-export class StaticDynamicStyleRow extends Component {
-  // Store previous options locally so when type is toggled,
-  // previous style options can be used.
-  prevStaticStyleOptions = this.props.defaultStaticStyleOptions;
-  prevDynamicStyleOptions = this.props.defaultDynamicStyleOptions;
-
-  _canBeDynamic() {
-    return this.props.ordinalFields.length > 0;
-  }
-
-  _isDynamic() {
-    return this.props.styleProperty.isDynamic();
-  }
-
-  _getStyleOptions() {
-    return this.props.styleProperty.getOptions();
-  }
-
-  _onFieldMetaOptionsChange = fieldMetaOptions => {
-    const styleDescriptor = {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
-      options: {
-        ...this._getStyleOptions(),
-        fieldMetaOptions,
-      },
-    };
-    this.props.handlePropertyChange(this.props.styleProperty.getStyleName(), styleDescriptor);
-  };
-
-  _onStaticStyleChange = options => {
-    const styleDescriptor = {
-      type: VectorStyle.STYLE_TYPE.STATIC,
-      options,
-    };
-    this.props.handlePropertyChange(this.props.styleProperty.getStyleName(), styleDescriptor);
-  };
-
-  _onDynamicStyleChange = options => {
-    const styleDescriptor = {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
-      options,
-    };
-    this.props.handlePropertyChange(this.props.styleProperty.getStyleName(), styleDescriptor);
-  };
-
-  _onTypeToggle = () => {
-    if (this._isDynamic()) {
-      // preserve current dynmaic style
-      this.prevDynamicStyleOptions = this._getStyleOptions();
-      // toggle to static style
-      this._onStaticStyleChange(this.prevStaticStyleOptions);
-      return;
-    }
-
-    // preserve current static style
-    this.prevStaticStyleOptions = this._getStyleOptions();
-    // toggle to dynamic style
-    this._onDynamicStyleChange(this.prevDynamicStyleOptions);
-  };
-
-  _renderStyleSelector() {
-    if (this._isDynamic()) {
-      const DynamicSelector = this.props.DynamicSelector;
-      return (
-        <Fragment>
-          <DynamicSelector
-            ordinalFields={this.props.ordinalFields}
-            onChange={this._onDynamicStyleChange}
-            styleOptions={this._getStyleOptions()}
-          />
-          <FieldMetaOptionsPopover
-            styleProperty={this.props.styleProperty}
-            onChange={this._onFieldMetaOptionsChange}
-          />
-        </Fragment>
-      );
-    }
-
-    const StaticSelector = this.props.StaticSelector;
-    return (
-      <StaticSelector
-        onChange={this._onStaticStyleChange}
-        styleOptions={this._getStyleOptions()}
-        swatches={this.props.swatches}
-      />
-    );
-  }
-
-  render() {
-    const isDynamic = this._isDynamic();
-    const dynamicTooltipContent = isDynamic
-      ? i18n.translate('xpack.maps.styles.staticDynamic.staticDescription', {
-          defaultMessage: 'Use static styling properties to symbolize features.',
-        })
-      : i18n.translate('xpack.maps.styles.staticDynamic.dynamicDescription', {
-          defaultMessage: 'Use property values to symbolize features.',
-        });
-
-    return (
-      <EuiFlexGroup gutterSize="s">
-        <EuiFlexItem
-          className={isDynamic ? 'mapStaticDynamicSylingOption__dynamicSizeHack' : undefined}
-        >
-          <EuiFormRow
-            label={getVectorStyleLabel(this.props.styleProperty.getStyleName())}
-            display="rowCompressed"
-          >
-            {this._renderStyleSelector()}
-          </EuiFormRow>
-        </EuiFlexItem>
-        {this._canBeDynamic() && (
-          <EuiFlexItem grow={false}>
-            <EuiFormRow hasEmptyLabelSpace display="centerCompressed">
-              <EuiToolTip content={dynamicTooltipContent} delay="long">
-                <EuiButtonToggle
-                  size="s"
-                  label={dynamicTooltipContent}
-                  iconType="link"
-                  onChange={this._onTypeToggle}
-                  isEmpty={!isDynamic}
-                  fill={isDynamic}
-                  isIconOnly
-                />
-              </EuiToolTip>
-            </EuiFormRow>
-          </EuiFlexItem>
-        )}
-      </EuiFlexGroup>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js
new file mode 100644
index 0000000000000..1ac8edfb2cc69
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js
@@ -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 React, { Component, Fragment } from 'react';
+import { FieldMetaOptionsPopover } from './field_meta_options_popover';
+import { getVectorStyleLabel } from './get_vector_style_label';
+import { EuiFormRow, EuiSelect } from '@elastic/eui';
+import { VectorStyle } from '../vector_style';
+import { i18n } from '@kbn/i18n';
+
+export class StylePropEditor extends Component {
+  _prevStaticStyleOptions = this.props.defaultStaticStyleOptions;
+  _prevDynamicStyleOptions = this.props.defaultDynamicStyleOptions;
+
+  _onTypeToggle = () => {
+    if (this.props.styleProperty.isDynamic()) {
+      // preserve current dynmaic style
+      this._prevDynamicStyleOptions = this.props.styleProperty.getOptions();
+      // toggle to static style
+      this.props.onStaticStyleChange(
+        this.props.styleProperty.getStyleName(),
+        this._prevStaticStyleOptions
+      );
+    } else {
+      // preserve current static style
+      this._prevStaticStyleOptions = this.props.styleProperty.getOptions();
+      // toggle to dynamic style
+      this.props.onDynamicStyleChange(
+        this.props.styleProperty.getStyleName(),
+        this._prevDynamicStyleOptions
+      );
+    }
+  };
+
+  _onFieldMetaOptionsChange = fieldMetaOptions => {
+    const options = {
+      ...this.props.styleProperty.getOptions(),
+      fieldMetaOptions,
+    };
+    this.props.onDynamicStyleChange(this.props.styleProperty.getStyleName(), options);
+  };
+
+  renderStaticDynamicSelect() {
+    const options = [
+      {
+        value: VectorStyle.STYLE_TYPE.STATIC,
+        text: this.props.customStaticOptionLabel
+          ? this.props.customStaticOptionLabel
+          : i18n.translate('xpack.maps.styles.staticDynamicSelect.staticLabel', {
+              defaultMessage: 'Fixed',
+            }),
+      },
+      {
+        value: VectorStyle.STYLE_TYPE.DYNAMIC,
+        text: i18n.translate('xpack.maps.styles.staticDynamicSelect.dynamicLabel', {
+          defaultMessage: 'By value',
+        }),
+      },
+    ];
+
+    return (
+      <EuiSelect
+        options={options}
+        value={
+          this.props.styleProperty.isDynamic()
+            ? VectorStyle.STYLE_TYPE.DYNAMIC
+            : VectorStyle.STYLE_TYPE.STATIC
+        }
+        onChange={this._onTypeToggle}
+        disabled={this.props.fields.length === 0}
+        aria-label={i18n.translate('xpack.maps.styles.staticDynamicSelect.ariaLabel', {
+          defaultMessage: 'Select to style by fixed value or by data value',
+        })}
+        compressed
+      />
+    );
+  }
+
+  render() {
+    const fieldMetaOptionsPopover = this.props.styleProperty.isDynamic() ? (
+      <FieldMetaOptionsPopover
+        styleProperty={this.props.styleProperty}
+        onChange={this._onFieldMetaOptionsChange}
+      />
+    ) : null;
+
+    return (
+      <EuiFormRow
+        label={getVectorStyleLabel(this.props.styleProperty.getStyleName())}
+        display="rowCompressed"
+      >
+        <Fragment>
+          {React.cloneElement(this.props.children, {
+            staticDynamicSelect: this.renderStaticDynamicSelect(),
+          })}
+          {fieldMetaOptionsPopover}
+        </Fragment>
+      </EuiFormRow>
+    );
+  }
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
index 43dd7b1b2d032..8e80e036dbb8b 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js
@@ -11,8 +11,14 @@ import chrome from 'ui/chrome';
 import { VectorStyleColorEditor } from './color/vector_style_color_editor';
 import { VectorStyleSizeEditor } from './size/vector_style_size_editor';
 import { VectorStyleSymbolEditor } from './vector_style_symbol_editor';
+import { VectorStyleLabelEditor } from './label/vector_style_label_editor';
+import { VectorStyle } from '../vector_style';
 import { OrientationEditor } from './orientation/orientation_editor';
-import { getDefaultDynamicProperties, getDefaultStaticProperties } from '../vector_style_defaults';
+import {
+  getDefaultDynamicProperties,
+  getDefaultStaticProperties,
+  VECTOR_STYLES,
+} 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';
@@ -25,6 +31,7 @@ export class VectorStyleEditor extends Component {
   state = {
     dateFields: [],
     numberFields: [],
+    fields: [],
     defaultDynamicProperties: getDefaultDynamicProperties(),
     defaultStaticProperties: getDefaultStaticProperties(),
     supportedFeatures: undefined,
@@ -37,16 +44,16 @@ export class VectorStyleEditor extends Component {
 
   componentDidMount() {
     this._isMounted = true;
-    this._loadOrdinalFields();
+    this._loadFields();
     this._loadSupportedFeatures();
   }
 
   componentDidUpdate() {
-    this._loadOrdinalFields();
+    this._loadFields();
     this._loadSupportedFeatures();
   }
 
-  async _loadOrdinalFields() {
+  async _loadFields() {
     const getFieldMeta = async field => {
       return {
         label: await field.getLabel(),
@@ -54,21 +61,27 @@ export class VectorStyleEditor extends Component {
         origin: field.getOrigin(),
       };
     };
+
     const dateFields = await this.props.layer.getDateFields();
     const dateFieldPromises = dateFields.map(getFieldMeta);
     const dateFieldsArray = await Promise.all(dateFieldPromises);
-
     if (this._isMounted && !_.isEqual(dateFieldsArray, this.state.dateFields)) {
       this.setState({ dateFields: dateFieldsArray });
     }
 
     const numberFields = await this.props.layer.getNumberFields();
     const numberFieldPromises = numberFields.map(getFieldMeta);
-
     const numberFieldsArray = await Promise.all(numberFieldPromises);
     if (this._isMounted && !_.isEqual(numberFieldsArray, this.state.numberFields)) {
       this.setState({ numberFields: numberFieldsArray });
     }
+
+    const fields = await this.props.layer.getFields();
+    const fieldPromises = fields.map(getFieldMeta);
+    const fieldsArray = await Promise.all(fieldPromises);
+    if (this._isMounted && !_.isEqual(fieldsArray, this.state.fields)) {
+      this.setState({ fields: fieldsArray });
+    }
   }
 
   async _loadSupportedFeatures() {
@@ -120,15 +133,36 @@ export class VectorStyleEditor extends Component {
     this.props.onIsTimeAwareChange(event.target.checked);
   };
 
+  _onStaticStyleChange = (propertyName, options) => {
+    const styleDescriptor = {
+      type: VectorStyle.STYLE_TYPE.STATIC,
+      options,
+    };
+    this.props.handlePropertyChange(propertyName, styleDescriptor);
+  };
+
+  _onDynamicStyleChange = (propertyName, options) => {
+    const styleDescriptor = {
+      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      options,
+    };
+    this.props.handlePropertyChange(propertyName, styleDescriptor);
+  };
+
   _renderFillColor() {
     return (
       <VectorStyleColorEditor
         swatches={DEFAULT_FILL_COLORS}
-        handlePropertyChange={this.props.handlePropertyChange}
-        styleProperty={this.props.styleProperties.fillColor}
-        ordinalFields={this._getOrdinalFields()}
-        defaultStaticStyleOptions={this.state.defaultStaticProperties.fillColor.options}
-        defaultDynamicStyleOptions={this.state.defaultDynamicProperties.fillColor.options}
+        onStaticStyleChange={this._onStaticStyleChange}
+        onDynamicStyleChange={this._onDynamicStyleChange}
+        styleProperty={this.props.styleProperties[VECTOR_STYLES.FILL_COLOR]}
+        fields={this._getOrdinalFields()}
+        defaultStaticStyleOptions={
+          this.state.defaultStaticProperties[VECTOR_STYLES.FILL_COLOR].options
+        }
+        defaultDynamicStyleOptions={
+          this.state.defaultDynamicProperties[VECTOR_STYLES.FILL_COLOR].options
+        }
       />
     );
   }
@@ -137,11 +171,16 @@ export class VectorStyleEditor extends Component {
     return (
       <VectorStyleColorEditor
         swatches={DEFAULT_LINE_COLORS}
-        handlePropertyChange={this.props.handlePropertyChange}
-        styleProperty={this.props.styleProperties.lineColor}
-        ordinalFields={this._getOrdinalFields()}
-        defaultStaticStyleOptions={this.state.defaultStaticProperties.lineColor.options}
-        defaultDynamicStyleOptions={this.state.defaultDynamicProperties.lineColor.options}
+        onStaticStyleChange={this._onStaticStyleChange}
+        onDynamicStyleChange={this._onDynamicStyleChange}
+        styleProperty={this.props.styleProperties[VECTOR_STYLES.LINE_COLOR]}
+        fields={this._getOrdinalFields()}
+        defaultStaticStyleOptions={
+          this.state.defaultStaticProperties[VECTOR_STYLES.LINE_COLOR].options
+        }
+        defaultDynamicStyleOptions={
+          this.state.defaultDynamicProperties[VECTOR_STYLES.LINE_COLOR].options
+        }
       />
     );
   }
@@ -149,11 +188,16 @@ export class VectorStyleEditor extends Component {
   _renderLineWidth() {
     return (
       <VectorStyleSizeEditor
-        handlePropertyChange={this.props.handlePropertyChange}
-        styleProperty={this.props.styleProperties.lineWidth}
-        ordinalFields={this._getOrdinalFields()}
-        defaultStaticStyleOptions={this.state.defaultStaticProperties.lineWidth.options}
-        defaultDynamicStyleOptions={this.state.defaultDynamicProperties.lineWidth.options}
+        onStaticStyleChange={this._onStaticStyleChange}
+        onDynamicStyleChange={this._onDynamicStyleChange}
+        styleProperty={this.props.styleProperties[VECTOR_STYLES.LINE_WIDTH]}
+        fields={this._getOrdinalFields()}
+        defaultStaticStyleOptions={
+          this.state.defaultStaticProperties[VECTOR_STYLES.LINE_WIDTH].options
+        }
+        defaultDynamicStyleOptions={
+          this.state.defaultDynamicProperties[VECTOR_STYLES.LINE_WIDTH].options
+        }
       />
     );
   }
@@ -161,29 +205,85 @@ export class VectorStyleEditor extends Component {
   _renderSymbolSize() {
     return (
       <VectorStyleSizeEditor
-        handlePropertyChange={this.props.handlePropertyChange}
-        styleProperty={this.props.styleProperties.iconSize}
-        ordinalFields={this._getOrdinalFields()}
-        defaultStaticStyleOptions={this.state.defaultStaticProperties.iconSize.options}
-        defaultDynamicStyleOptions={this.state.defaultDynamicProperties.iconSize.options}
+        onStaticStyleChange={this._onStaticStyleChange}
+        onDynamicStyleChange={this._onDynamicStyleChange}
+        styleProperty={this.props.styleProperties[VECTOR_STYLES.ICON_SIZE]}
+        fields={this._getOrdinalFields()}
+        defaultStaticStyleOptions={
+          this.state.defaultStaticProperties[VECTOR_STYLES.ICON_SIZE].options
+        }
+        defaultDynamicStyleOptions={
+          this.state.defaultDynamicProperties[VECTOR_STYLES.ICON_SIZE].options
+        }
       />
     );
   }
 
+  _renderLabelProperties() {
+    return (
+      <Fragment>
+        <VectorStyleLabelEditor
+          onStaticStyleChange={this._onStaticStyleChange}
+          onDynamicStyleChange={this._onDynamicStyleChange}
+          styleProperty={this.props.styleProperties[VECTOR_STYLES.LABEL_TEXT]}
+          fields={this.state.fields}
+          defaultStaticStyleOptions={
+            this.state.defaultStaticProperties[VECTOR_STYLES.LABEL_TEXT].options
+          }
+          defaultDynamicStyleOptions={
+            this.state.defaultDynamicProperties[VECTOR_STYLES.LABEL_TEXT].options
+          }
+        />
+        <EuiSpacer size="m" />
+
+        <VectorStyleColorEditor
+          swatches={DEFAULT_LINE_COLORS}
+          onStaticStyleChange={this._onStaticStyleChange}
+          onDynamicStyleChange={this._onDynamicStyleChange}
+          styleProperty={this.props.styleProperties[VECTOR_STYLES.LABEL_COLOR]}
+          fields={this._getOrdinalFields()}
+          defaultStaticStyleOptions={
+            this.state.defaultStaticProperties[VECTOR_STYLES.LABEL_COLOR].options
+          }
+          defaultDynamicStyleOptions={
+            this.state.defaultDynamicProperties[VECTOR_STYLES.LABEL_COLOR].options
+          }
+        />
+        <EuiSpacer size="m" />
+
+        <VectorStyleSizeEditor
+          onStaticStyleChange={this._onStaticStyleChange}
+          onDynamicStyleChange={this._onDynamicStyleChange}
+          styleProperty={this.props.styleProperties[VECTOR_STYLES.LABEL_SIZE]}
+          fields={this._getOrdinalFields()}
+          defaultStaticStyleOptions={
+            this.state.defaultStaticProperties[VECTOR_STYLES.LABEL_SIZE].options
+          }
+          defaultDynamicStyleOptions={
+            this.state.defaultDynamicProperties[VECTOR_STYLES.LABEL_SIZE].options
+          }
+        />
+        <EuiSpacer size="m" />
+      </Fragment>
+    );
+  }
+
   _renderPointProperties() {
     let iconOrientation;
     if (this.props.symbolDescriptor.options.symbolizeAs === SYMBOLIZE_AS_ICON) {
       iconOrientation = (
-        <Fragment>
-          <OrientationEditor
-            handlePropertyChange={this.props.handlePropertyChange}
-            styleProperty={this.props.styleProperties.iconOrientation}
-            ordinalFields={this.state.numberFields}
-            defaultStaticStyleOptions={this.state.defaultStaticProperties.iconOrientation.options}
-            defaultDynamicStyleOptions={this.state.defaultDynamicProperties.iconOrientation.options}
-          />
-          <EuiSpacer size="m" />
-        </Fragment>
+        <OrientationEditor
+          onStaticStyleChange={this._onStaticStyleChange}
+          onDynamicStyleChange={this._onDynamicStyleChange}
+          styleProperty={this.props.styleProperties[VECTOR_STYLES.ICON_ORIENTATION]}
+          fields={this.state.numberFields}
+          defaultStaticStyleOptions={
+            this.state.defaultStaticProperties[VECTOR_STYLES.ICON_ORIENTATION].options
+          }
+          defaultDynamicStyleOptions={
+            this.state.defaultDynamicProperties[VECTOR_STYLES.ICON_ORIENTATION].options
+          }
+        />
       );
     }
 
@@ -207,8 +307,12 @@ export class VectorStyleEditor extends Component {
         <EuiSpacer size="m" />
 
         {iconOrientation}
+        <EuiSpacer size="m" />
 
         {this._renderSymbolSize()}
+        <EuiSpacer size="m" />
+
+        {this._renderLabelProperties()}
       </Fragment>
     );
   }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap
new file mode 100644
index 0000000000000..26e36cb97a791
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap
@@ -0,0 +1,105 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Should render categorical legend 1`] = `
+<div>
+  <EuiSpacer
+    size="s"
+  />
+  <EuiFlexGroup
+    direction="column"
+    gutterSize="none"
+  >
+    <EuiFlexItem
+      key="0"
+    >
+      <EuiFlexGroup
+        direction="row"
+        gutterSize="none"
+      >
+        <EuiFlexItem>
+          <EuiText
+            size="xs"
+          >
+            0_format
+          </EuiText>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <VectorIcon
+            getColorForProperty={[Function]}
+            loadIsLinesOnly={[Function]}
+            loadIsPointsOnly={[Function]}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiFlexItem>
+    <EuiFlexItem
+      key="1"
+    >
+      <EuiFlexGroup
+        direction="row"
+        gutterSize="none"
+      >
+        <EuiFlexItem>
+          <EuiText
+            size="xs"
+          >
+            10_format
+          </EuiText>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <VectorIcon
+            getColorForProperty={[Function]}
+            loadIsLinesOnly={[Function]}
+            loadIsPointsOnly={[Function]}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiFlexGroup
+    gutterSize="xs"
+    justifyContent="spaceAround"
+  >
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiToolTip
+        content="foobar_label"
+        delay="regular"
+        position="top"
+        title="Border color"
+      >
+        <EuiText
+          className="eui-textTruncate"
+          size="xs"
+          style={
+            Object {
+              "maxWidth": "180px",
+            }
+          }
+        >
+          <small>
+            <strong>
+              foobar_label
+            </strong>
+          </small>
+        </EuiText>
+      </EuiToolTip>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+</div>
+`;
+
+exports[`Should render ranged legend 1`] = `
+<RangedStyleLegendRow
+  fieldLabel="foobar_label"
+  header={
+    <ColorGradient
+      colorRampName="Blues"
+    />
+  }
+  maxLabel="100_format"
+  minLabel="0_format"
+  propertyLabel="Border color"
+/>
+`;
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/components/categorical_legend.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/components/categorical_legend.js
new file mode 100644
index 0000000000000..8f8ad4d24e715
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/components/categorical_legend.js
@@ -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 _ from 'lodash';
+const EMPTY_VALUE = '';
+
+export class CategoricalLegend extends React.Component {
+  constructor() {
+    super();
+    this._isMounted = false;
+    this.state = {
+      label: EMPTY_VALUE,
+      isPointsOnly: null,
+      isLinesOnly: null,
+    };
+  }
+
+  async _loadParams() {
+    const label = await this.props.style.getField().getLabel();
+    const isLinesOnly = await this.props.loadIsLinesOnly();
+    const isPointsOnly = await this.props.loadIsPointsOnly();
+    const newState = { label, isLinesOnly, isPointsOnly };
+    if (this._isMounted && !_.isEqual(this.state, newState)) {
+      this.setState(newState);
+    }
+  }
+
+  componentDidUpdate() {
+    this._loadParams();
+  }
+
+  componentWillUnmount() {
+    this._isMounted = false;
+  }
+
+  componentDidMount() {
+    this._isMounted = true;
+    this._loadParams();
+  }
+
+  render() {
+    if (this.state.label === EMPTY_VALUE) {
+      return null;
+    }
+    return this.props.style.renderBreakedLegend({
+      fieldLabel: this.state.label,
+      isLinesOnly: this.state.isLinesOnly,
+      isPointsOnly: this.state.isPointsOnly,
+      symbolId: this.props.symbolId,
+    });
+  }
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/components/ordinal_legend.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/components/ordinal_legend.js
new file mode 100644
index 0000000000000..564bae3ef3f72
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/components/ordinal_legend.js
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import _ from 'lodash';
+import { RangedStyleLegendRow } from '../../../components/ranged_style_legend_row';
+const EMPTY_VALUE = '';
+
+export class OrdinalLegend extends React.Component {
+  constructor() {
+    super();
+    this._isMounted = false;
+    this.state = {
+      label: EMPTY_VALUE,
+    };
+  }
+
+  async _loadParams() {
+    const label = await this.props.style.getField().getLabel();
+    const newState = { label };
+    if (this._isMounted && !_.isEqual(this.state, newState)) {
+      this.setState(newState);
+    }
+  }
+
+  _formatValue(value) {
+    if (value === EMPTY_VALUE) {
+      return value;
+    }
+    return this.props.style.formatField(value);
+  }
+
+  componentDidUpdate() {
+    this._loadParams();
+  }
+
+  componentWillUnmount() {
+    this._isMounted = false;
+  }
+
+  componentDidMount() {
+    this._isMounted = true;
+    this._loadParams();
+  }
+  render() {
+    const fieldMeta = this.props.style.getFieldMeta();
+
+    let minLabel = EMPTY_VALUE;
+    let maxLabel = EMPTY_VALUE;
+    if (fieldMeta) {
+      const range = { min: fieldMeta.min, max: fieldMeta.max };
+      const min = this._formatValue(_.get(range, 'min', EMPTY_VALUE));
+      minLabel =
+        this.props.style.isFieldMetaEnabled() && range && range.isMinOutsideStdRange
+          ? `< ${min}`
+          : min;
+
+      const max = this._formatValue(_.get(range, 'max', EMPTY_VALUE));
+      maxLabel =
+        this.props.style.isFieldMetaEnabled() && range && range.isMaxOutsideStdRange
+          ? `> ${max}`
+          : max;
+    }
+
+    return (
+      <RangedStyleLegendRow
+        header={this.props.style.renderRangeLegendHeader()}
+        minLabel={minLabel}
+        maxLabel={maxLabel}
+        propertyLabel={this.props.style.getDisplayStyleName()}
+        fieldLabel={this.state.label}
+      />
+    );
+  }
+}
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js
index fdbb19a60d2e6..200df9e5cc33d 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js
@@ -10,6 +10,9 @@ import { getComputedFieldName } from '../style_util';
 import { getColorRampStops } from '../../color_utils';
 import { ColorGradient } from '../../components/color_gradient';
 import React from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText, EuiToolTip } from '@elastic/eui';
+import { VectorIcon } from '../components/legend/vector_icon';
+import { VECTOR_STYLES } from '../vector_style_defaults';
 
 export class DynamicColorProperty extends DynamicStyleProperty {
   syncCircleColorWithMb(mbLayerId, mbMap, alpha) {
@@ -46,6 +49,12 @@ export class DynamicColorProperty extends DynamicStyleProperty {
     mbMap.setPaintProperty(mbLayerId, 'line-opacity', alpha);
   }
 
+  syncLabelColorWithMb(mbLayerId, mbMap, alpha) {
+    const color = this._getMbColor();
+    mbMap.setPaintProperty(mbLayerId, 'text-color', color);
+    mbMap.setPaintProperty(mbLayerId, 'text-opacity', alpha);
+  }
+
   isCustomColorRamp() {
     return this._options.useCustomColorRamp;
   }
@@ -58,6 +67,14 @@ export class DynamicColorProperty extends DynamicStyleProperty {
     return !this.isCustomColorRamp();
   }
 
+  isRanged() {
+    return !this.isCustomColorRamp();
+  }
+
+  hasBreaks() {
+    return this.isCustomColorRamp();
+  }
+
   _getMbColor() {
     const isDynamicConfigComplete =
       _.has(this._options, 'field.name') && _.has(this._options, 'color');
@@ -111,11 +128,95 @@ export class DynamicColorProperty extends DynamicStyleProperty {
     return getColorRampStops(this._options.color);
   }
 
-  renderHeader() {
+  renderRangeLegendHeader() {
     if (this._options.color) {
       return <ColorGradient colorRampName={this._options.color} />;
     } else {
       return null;
     }
   }
+
+  _renderStopIcon(color, isLinesOnly, isPointsOnly, symbolId) {
+    if (this.getStyleName() === VECTOR_STYLES.LABEL_COLOR) {
+      const style = { color: color };
+      return (
+        <EuiText size={'xs'} style={style}>
+          Tx
+        </EuiText>
+      );
+    }
+
+    const loadIsLinesOnly = () => {
+      return isLinesOnly;
+    };
+
+    const loadIsPointsOnly = () => {
+      return isPointsOnly;
+    };
+
+    const getColorForProperty = (styleProperty, isLinesOnly) => {
+      if (isLinesOnly) {
+        return color;
+      }
+
+      return this.getStyleName() === styleProperty ? color : 'none';
+    };
+
+    return (
+      <VectorIcon
+        symbolId={symbolId}
+        loadIsPointsOnly={loadIsPointsOnly}
+        loadIsLinesOnly={loadIsLinesOnly}
+        getColorForProperty={getColorForProperty}
+      />
+    );
+  }
+
+  _renderColorbreaks({ isLinesOnly, isPointsOnly, symbolId }) {
+    if (!this._options.customColorRamp) {
+      return null;
+    }
+
+    return this._options.customColorRamp.map((config, index) => {
+      const value = this.formatField(config.stop);
+      return (
+        <EuiFlexItem key={index}>
+          <EuiFlexGroup direction={'row'} gutterSize={'none'}>
+            <EuiFlexItem>
+              <EuiText size={'xs'}>{value}</EuiText>
+            </EuiFlexItem>
+            <EuiFlexItem>
+              {this._renderStopIcon(config.color, isLinesOnly, isPointsOnly, symbolId)}
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      );
+    });
+  }
+
+  renderBreakedLegend({ fieldLabel, isPointsOnly, isLinesOnly, symbolId }) {
+    return (
+      <div>
+        <EuiSpacer size="s" />
+        <EuiFlexGroup direction={'column'} gutterSize={'none'}>
+          {this._renderColorbreaks({
+            isPointsOnly,
+            isLinesOnly,
+            symbolId,
+          })}
+        </EuiFlexGroup>
+        <EuiFlexGroup gutterSize="xs" justifyContent="spaceAround">
+          <EuiFlexItem grow={false}>
+            <EuiToolTip position="top" title={this.getDisplayStyleName()} content={fieldLabel}>
+              <EuiText className="eui-textTruncate" size="xs" style={{ maxWidth: '180px' }}>
+                <small>
+                  <strong>{fieldLabel}</strong>
+                </small>
+              </EuiText>
+            </EuiToolTip>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </div>
+    );
+  }
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js
new file mode 100644
index 0000000000000..dbf704c9cbe4c
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js
@@ -0,0 +1,103 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// eslint-disable-next-line no-unused-vars
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import { VECTOR_STYLES } from '../vector_style_defaults';
+import { DynamicColorProperty } from './dynamic_color_property';
+
+const mockField = {
+  async getLabel() {
+    return 'foobar_label';
+  },
+
+  getName() {
+    return 'foobar';
+  },
+  supportsFieldMeta() {
+    return true;
+  },
+};
+
+test('Should render ranged legend', async () => {
+  const colorStyle = new DynamicColorProperty(
+    {
+      color: 'Blues',
+    },
+    VECTOR_STYLES.LINE_COLOR,
+    mockField,
+    () => {
+      return { min: 0, max: 100 };
+    },
+    () => {
+      return x => x + '_format';
+    }
+  );
+
+  const legendRow = colorStyle.renderLegendDetailRow({
+    loadIsPointsOnly: () => {
+      return true;
+    },
+    loadIsLinesOnly: () => {
+      return false;
+    },
+  });
+
+  const component = shallow(legendRow);
+
+  // Ensure all promises resolve
+  await new Promise(resolve => process.nextTick(resolve));
+  // Ensure the state changes are reflected
+  component.update();
+
+  expect(component).toMatchSnapshot();
+});
+
+test('Should render categorical legend', async () => {
+  const colorStyle = new DynamicColorProperty(
+    {
+      useCustomColorRamp: true,
+      customColorRamp: [
+        {
+          stop: 0,
+          color: '#FF0000',
+        },
+        {
+          stop: 10,
+          color: '#00FF00',
+        },
+      ],
+    },
+    VECTOR_STYLES.LINE_COLOR,
+    mockField,
+    () => {
+      return { min: 0, max: 100 };
+    },
+    () => {
+      return x => x + '_format';
+    }
+  );
+
+  const legendRow = colorStyle.renderLegendDetailRow({
+    loadIsPointsOnly: () => {
+      return true;
+    },
+    loadIsLinesOnly: () => {
+      return false;
+    },
+  });
+
+  const component = shallow(legendRow);
+
+  // Ensure all promises resolve
+  await new Promise(resolve => process.nextTick(resolve));
+  // Ensure the state changes are reflected
+  component.update();
+
+  expect(component).toMatchSnapshot();
+});
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
index 78409ef0d488f..f2e5672226814 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
@@ -43,6 +43,25 @@ function getSymbolSizeIcons() {
 }
 
 export class DynamicSizeProperty extends DynamicStyleProperty {
+  constructor(options, styleName, field, getFieldMeta, getFieldFormatter, isSymbolizedAsIcon) {
+    super(options, styleName, field, getFieldMeta, getFieldFormatter);
+    this._isSymbolizedAsIcon = isSymbolizedAsIcon;
+  }
+
+  supportsFeatureState() {
+    // mb style "icon-size" does not support feature state
+    if (this.getStyleName() === VECTOR_STYLES.ICON_SIZE && this._isSymbolizedAsIcon) {
+      return false;
+    }
+
+    // mb style "text-size" does not support feature state
+    if (this.getStyleName() === VECTOR_STYLES.LABEL_SIZE) {
+      return false;
+    }
+
+    return true;
+  }
+
   syncHaloWidthWithMb(mbLayerId, mbMap) {
     const haloWidth = this._getMbSize();
     mbMap.setPaintProperty(mbLayerId, 'icon-halo-width', haloWidth);
@@ -89,6 +108,11 @@ export class DynamicSizeProperty extends DynamicStyleProperty {
     mbMap.setPaintProperty(mbLayerId, 'line-width', lineWidth);
   }
 
+  syncLabelSizeWithMb(mbLayerId, mbMap) {
+    const lineWidth = this._getMbSize();
+    mbMap.setLayoutProperty(mbLayerId, 'text-size', lineWidth);
+  }
+
   _getMbSize() {
     if (this._isSizeDynamicConfigComplete(this._options)) {
       return this._getMbDataDrivenSize({
@@ -101,10 +125,11 @@ export class DynamicSizeProperty extends DynamicStyleProperty {
   }
 
   _getMbDataDrivenSize({ targetName, minSize, maxSize }) {
+    const lookup = this.supportsFeatureState() ? 'feature-state' : 'get';
     return [
       'interpolate',
       ['linear'],
-      ['coalesce', ['feature-state', targetName], 0],
+      ['coalesce', [lookup, targetName], 0],
       0,
       minSize,
       1,
@@ -121,7 +146,7 @@ export class DynamicSizeProperty extends DynamicStyleProperty {
     );
   }
 
-  renderHeader() {
+  renderRangeLegendHeader() {
     let icons;
     if (this.getStyleName() === VECTOR_STYLES.LINE_WIDTH) {
       icons = getLineWidthIcons();
@@ -132,7 +157,7 @@ export class DynamicSizeProperty extends DynamicStyleProperty {
     }
 
     return (
-      <EuiFlexGroup gutterSize="s" justifyContent="spaceBetween" alignItems="center">
+      <EuiFlexGroup gutterSize="xs" justifyContent="spaceBetween" alignItems="center">
         {icons.map((icon, index) => {
           const isLast = index === icons.length - 1;
           let spacer;
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
index 3b25746717088..bac3c96581967 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js
@@ -8,13 +8,23 @@ import _ from 'lodash';
 import { AbstractStyleProperty } from './style_property';
 import { DEFAULT_SIGMA } from '../vector_style_defaults';
 import { STYLE_TYPE } from '../../../../../common/constants';
+import { scaleValue } from '../style_util';
+import React from 'react';
+import { OrdinalLegend } from './components/ordinal_legend';
+import { CategoricalLegend } from './components/categorical_legend';
 
 export class DynamicStyleProperty extends AbstractStyleProperty {
   static type = STYLE_TYPE.DYNAMIC;
 
-  constructor(options, styleName, field) {
+  constructor(options, styleName, field, getFieldMeta, getFieldFormatter) {
     super(options, styleName);
     this._field = field;
+    this._getFieldMeta = getFieldMeta;
+    this._getFieldFormatter = getFieldFormatter;
+  }
+
+  getFieldMeta() {
+    return this._getFieldMeta && this._field ? this._getFieldMeta(this._field.getName()) : null;
   }
 
   getField() {
@@ -25,6 +35,18 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
     return true;
   }
 
+  isOrdinal() {
+    return true;
+  }
+
+  hasBreaks() {
+    return false;
+  }
+
+  isRanged() {
+    return true;
+  }
+
   isComplete() {
     return !!this._field;
   }
@@ -62,6 +84,10 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
   }
 
   pluckStyleMetaFromFeatures(features) {
+    if (!this.isOrdinal()) {
+      return null;
+    }
+
     const name = this.getField().getName();
     let min = Infinity;
     let max = -Infinity;
@@ -84,6 +110,10 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
   }
 
   pluckStyleMetaFromFieldMetaData(fieldMetaData) {
+    if (!this.isOrdinal()) {
+      return null;
+    }
+
     const realFieldName = this._field.getESDocFieldName
       ? this._field.getESDocFieldName()
       : this._field.getName();
@@ -105,4 +135,58 @@ export class DynamicStyleProperty extends AbstractStyleProperty {
       isMaxOutsideStdRange: stats.max > stdUpperBounds,
     };
   }
+
+  formatField(value) {
+    if (this.getField()) {
+      const fieldName = this.getField().getName();
+      const fieldFormatter = this._getFieldFormatter(fieldName);
+      return fieldFormatter ? fieldFormatter(value) : value;
+    } else {
+      return value;
+    }
+  }
+
+  getMbValue(value) {
+    if (!this.isOrdinal()) {
+      return this.formatField(value);
+    }
+
+    const valueAsFloat = parseFloat(value);
+    if (this.isScaled()) {
+      return scaleValue(valueAsFloat, this.getFieldMeta());
+    }
+    if (isNaN(valueAsFloat)) {
+      return 0;
+    }
+    return valueAsFloat;
+  }
+
+  renderBreakedLegend() {
+    return null;
+  }
+
+  _renderCategoricalLegend({ loadIsPointsOnly, loadIsLinesOnly, symbolId }) {
+    return (
+      <CategoricalLegend
+        style={this}
+        loadIsLinesOnly={loadIsLinesOnly}
+        loadIsPointsOnly={loadIsPointsOnly}
+        symbolId={symbolId}
+      />
+    );
+  }
+
+  _renderRangeLegend() {
+    return <OrdinalLegend style={this} />;
+  }
+
+  renderLegendDetailRow({ loadIsPointsOnly, loadIsLinesOnly, symbolId }) {
+    if (this.isRanged()) {
+      return this._renderRangeLegend();
+    } else if (this.hasBreaks()) {
+      return this._renderCategoricalLegend({ loadIsPointsOnly, loadIsLinesOnly, symbolId });
+    } else {
+      return null;
+    }
+  }
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js
new file mode 100644
index 0000000000000..fbc4c3af78f98
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js
@@ -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 { DynamicStyleProperty } from './dynamic_style_property';
+import { getComputedFieldName } from '../style_util';
+
+export class DynamicTextProperty extends DynamicStyleProperty {
+  syncTextFieldWithMb(mbLayerId, mbMap) {
+    if (this._field && this._field.isValid()) {
+      const targetName = getComputedFieldName(this._styleName, this._options.field.name);
+      mbMap.setLayoutProperty(mbLayerId, 'text-field', ['coalesce', ['get', targetName], '']);
+    } else {
+      mbMap.setLayoutProperty(mbLayerId, 'text-field', null);
+    }
+  }
+
+  isOrdinal() {
+    return false;
+  }
+
+  supportsFieldMeta() {
+    return false;
+  }
+
+  supportsFeatureState() {
+    return false;
+  }
+
+  isScaled() {
+    return false;
+  }
+}
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
index a32b17af0be9e..658eb6a164556 100644
--- 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
@@ -30,8 +30,13 @@ export class StaticColorProperty extends StaticStyleProperty {
     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);
+  syncCircleStrokeWithMb(mbLayerId, mbMap, alpha) {
+    mbMap.setPaintProperty(mbLayerId, 'circle-stroke-color', this._options.color);
+    mbMap.setPaintProperty(mbLayerId, 'circle-stroke-opacity', alpha);
+  }
+
+  syncLabelColorWithMb(mbLayerId, mbMap, alpha) {
+    mbMap.setPaintProperty(mbLayerId, 'text-color', this._options.color);
+    mbMap.setPaintProperty(mbLayerId, 'text-opacity', alpha);
   }
 }
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
index d2682a07def62..1584dec998986 100644
--- 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
@@ -43,4 +43,8 @@ export class StaticSizeProperty extends StaticStyleProperty {
   syncLineWidthWithMb(mbLayerId, mbMap) {
     mbMap.setPaintProperty(mbLayerId, 'line-width', this._options.size);
   }
+
+  syncLabelSizeWithMb(mbLayerId, mbMap) {
+    mbMap.setLayoutProperty(mbLayerId, 'text-size', this._options.size);
+  }
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_text_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_text_property.js
new file mode 100644
index 0000000000000..7a4a4672152c0
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_text_property.js
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { StaticStyleProperty } from './static_style_property';
+
+export class StaticTextProperty extends StaticStyleProperty {
+  isComplete() {
+    return this.getOptions().value.length > 0;
+  }
+
+  syncTextFieldWithMb(mbLayerId, mbMap) {
+    if (this.getOptions().value.length) {
+      mbMap.setLayoutProperty(mbLayerId, 'text-field', this.getOptions().value);
+    } else {
+      mbMap.setLayoutProperty(mbLayerId, 'text-field', null);
+    }
+  }
+}
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
index b0b4bcefd7d2f..52e1a46a18e94 100644
--- 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
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { getVectorStyleLabel } from '../components/get_vector_style_label';
 export class AbstractStyleProperty {
   constructor(options, styleName) {
     this._options = options;
@@ -24,6 +25,10 @@ export class AbstractStyleProperty {
     return true;
   }
 
+  formatField(value) {
+    return value;
+  }
+
   getStyleName() {
     return this._styleName;
   }
@@ -32,7 +37,15 @@ export class AbstractStyleProperty {
     return this._options || {};
   }
 
-  renderHeader() {
+  renderRangeLegendHeader() {
     return null;
   }
+
+  renderLegendDetailRow() {
+    return null;
+  }
+
+  getDisplayStyleName() {
+    return getVectorStyleLabel(this.getStyleName());
+  }
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.test.js
index fd4794b385bd2..ed59b1d5513a0 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/symbol_utils.test.js
@@ -27,7 +27,6 @@ describe('styleSvg', () => {
     const unstyledSvgString =
       '<svg version="1.1" width="11px" height="11px" viewBox="0 0 11 11"><path/></svg>';
     const styledSvg = await styleSvg(unstyledSvgString, 'red');
-
     expect(styledSvg.split('\n')[1]).toBe(
       '<svg version="1.1" width="11px" height="11px" viewBox="0 0 11 11" style="fill:red;">'
     );
@@ -37,7 +36,6 @@ describe('styleSvg', () => {
     const unstyledSvgString =
       '<svg version="1.1" width="11px" height="11px" viewBox="0 0 11 11"><path/></svg>';
     const styledSvg = await styleSvg(unstyledSvgString, 'red', 'white');
-
     expect(styledSvg.split('\n')[1]).toBe(
       '<svg version="1.1" width="11px" height="11px" viewBox="0 0 11 11" style="fill:red;stroke:white;">'
     );
@@ -47,7 +45,6 @@ describe('styleSvg', () => {
     const unstyledSvgString =
       '<svg version="1.1" width="11px" height="11px" viewBox="0 0 11 11"><path/></svg>';
     const styledSvg = await styleSvg(unstyledSvgString, 'red', 'white', '2px');
-
     expect(styledSvg.split('\n')[1]).toBe(
       '<svg version="1.1" width="11px" height="11px" viewBox="0 0 11 11" style="fill:red;stroke:white;stroke-width:2px;">'
     );
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
index d386c0ad4a5e0..ea80b188e1646 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
@@ -19,6 +19,7 @@ import {
   FIELD_ORIGIN,
   STYLE_TYPE,
   SOURCE_META_ID_ORIGIN,
+  SOURCE_FORMATTERS_ID_ORIGIN,
   LAYER_STYLE_TYPE,
 } from '../../../../common/constants';
 import { VectorIcon } from './components/legend/vector_icon';
@@ -26,7 +27,7 @@ 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, isOnlySingleFeatureType, scaleValue } from './style_util';
+import { getComputedFieldName, isOnlySingleFeatureType } from './style_util';
 import { StaticStyleProperty } from './properties/static_style_property';
 import { DynamicStyleProperty } from './properties/dynamic_style_property';
 import { DynamicSizeProperty } from './properties/dynamic_size_property';
@@ -35,6 +36,9 @@ 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';
+import { StaticTextProperty } from './properties/static_text_property';
+import { DynamicTextProperty } from './properties/dynamic_text_property';
+import { extractColorFromStyleProperty } from './components/legend/extract_color_from_style_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];
@@ -78,13 +82,24 @@ export class VectorStyle extends AbstractStyle {
     );
     this._iconSizeStyleProperty = this._makeSizeProperty(
       this._descriptor.properties[VECTOR_STYLES.ICON_SIZE],
-      VECTOR_STYLES.ICON_SIZE
+      VECTOR_STYLES.ICON_SIZE,
+      this._descriptor.properties[VECTOR_STYLES.SYMBOL].options.symbolizeAs === SYMBOLIZE_AS_ICON
     );
-
     this._iconOrientationProperty = this._makeOrientationProperty(
       this._descriptor.properties[VECTOR_STYLES.ICON_ORIENTATION],
       VECTOR_STYLES.ICON_ORIENTATION
     );
+    this._labelStyleProperty = this._makeLabelProperty(
+      this._descriptor.properties[VECTOR_STYLES.LABEL_TEXT]
+    );
+    this._labelSizeStyleProperty = this._makeSizeProperty(
+      this._descriptor.properties[VECTOR_STYLES.LABEL_SIZE],
+      VECTOR_STYLES.LABEL_SIZE
+    );
+    this._labelColorStyleProperty = this._makeColorProperty(
+      this._descriptor.properties[VECTOR_STYLES.LABEL_COLOR],
+      VECTOR_STYLES.LABEL_COLOR
+    );
   }
 
   _getAllStyleProperties() {
@@ -94,6 +109,9 @@ export class VectorStyle extends AbstractStyle {
       this._lineWidthStyleProperty,
       this._iconSizeStyleProperty,
       this._iconOrientationProperty,
+      this._labelStyleProperty,
+      this._labelSizeStyleProperty,
+      this._labelColorStyleProperty,
     ];
   }
 
@@ -114,16 +132,15 @@ export class VectorStyle extends AbstractStyle {
       return dynamicStyleProp.isFieldMetaEnabled();
     });
 
+    const styleProperties = {};
+    this._getAllStyleProperties().forEach(styleProperty => {
+      styleProperties[styleProperty.getStyleName()] = styleProperty;
+    });
+
     return (
       <VectorStyleEditor
         handlePropertyChange={handlePropertyChange}
-        styleProperties={{
-          lineColor: this._lineColorStyleProperty,
-          fillColor: this._fillColorStyleProperty,
-          lineWidth: this._lineWidthStyleProperty,
-          iconSize: this._iconSizeStyleProperty,
-          iconOrientation: this._iconOrientationProperty,
-        }}
+        styleProperties={styleProperties}
         symbolDescriptor={this._descriptor.properties[VECTOR_STYLES.SYMBOL]}
         layer={layer}
         loadIsPointsOnly={this._getIsPointsOnly}
@@ -294,14 +311,17 @@ export class VectorStyle extends AbstractStyle {
     return this._isOnlySingleFeatureType(VECTOR_SHAPE_TYPES.POLYGON);
   };
 
-  _getFieldMeta = fieldName => {
-    const fieldMetaFromLocalFeatures = _.get(this._descriptor, ['__styleMeta', fieldName]);
-
+  _getDynamicPropertyByFieldName(fieldName) {
     const dynamicProps = this.getDynamicPropertiesArray();
-    const dynamicProp = dynamicProps.find(dynamicProp => {
+    return dynamicProps.find(dynamicProp => {
       return fieldName === dynamicProp.getField().getName();
     });
+  }
 
+  _getFieldMeta = fieldName => {
+    const fieldMetaFromLocalFeatures = _.get(this._descriptor, ['__styleMeta', fieldName]);
+
+    const dynamicProp = this._getDynamicPropertyByFieldName(fieldName);
     if (!dynamicProp || !dynamicProp.isFieldMetaEnabled()) {
       return fieldMetaFromLocalFeatures;
     }
@@ -311,8 +331,7 @@ export class VectorStyle extends AbstractStyle {
       dataRequestId = SOURCE_META_ID_ORIGIN;
     } else {
       const join = this._layer.getValidJoins().find(join => {
-        const matchingField = join.getRightJoinSource().getMetricFieldForName(fieldName);
-        return !!matchingField;
+        return join.getRightJoinSource().hasMatchingMetricField(fieldName);
       });
       if (join) {
         dataRequestId = join.getSourceMetaDataRequestId();
@@ -323,53 +342,107 @@ export class VectorStyle extends AbstractStyle {
       return fieldMetaFromLocalFeatures;
     }
 
-    const styleMetaDataRequest = this._layer._findDataRequestForSource(dataRequestId);
+    const styleMetaDataRequest = this._layer._findDataRequestById(dataRequestId);
     if (!styleMetaDataRequest || !styleMetaDataRequest.hasData()) {
       return fieldMetaFromLocalFeatures;
     }
 
     const data = styleMetaDataRequest.getData();
     const fieldMeta = dynamicProp.pluckStyleMetaFromFieldMetaData(data);
-
     return fieldMeta ? fieldMeta : fieldMetaFromLocalFeatures;
   };
 
+  _getFieldFormatter = fieldName => {
+    const dynamicProp = this._getDynamicPropertyByFieldName(fieldName);
+    if (!dynamicProp) {
+      return null;
+    }
+
+    let dataRequestId;
+    if (dynamicProp.getFieldOrigin() === FIELD_ORIGIN.SOURCE) {
+      dataRequestId = SOURCE_FORMATTERS_ID_ORIGIN;
+    } else {
+      const join = this._layer.getValidJoins().find(join => {
+        return join.getRightJoinSource().hasMatchingMetricField(fieldName);
+      });
+      if (join) {
+        dataRequestId = join.getSourceFormattersDataRequestId();
+      }
+    }
+
+    if (!dataRequestId) {
+      return null;
+    }
+
+    const formattersDataRequest = this._layer._findDataRequestById(dataRequestId);
+    if (!formattersDataRequest || !formattersDataRequest.hasData()) {
+      return null;
+    }
+
+    const formatters = formattersDataRequest.getData();
+    return formatters[fieldName];
+  };
+
   _getStyleMeta = () => {
     return _.get(this._descriptor, '__styleMeta', {});
   };
 
-  getIcon = () => {
-    const styles = this.getRawProperties();
-    const symbolId = this.arePointsSymbolizedAsCircles()
+  _getSymbolId() {
+    return this.arePointsSymbolizedAsCircles()
       ? undefined
       : this._descriptor.properties.symbol.options.symbolId;
+  }
+
+  _getColorForProperty = (styleProperty, isLinesOnly) => {
+    const styles = this.getRawProperties();
+    if (isLinesOnly) {
+      return extractColorFromStyleProperty(styles[VECTOR_STYLES.LINE_COLOR], 'grey');
+    }
+
+    if (styleProperty === VECTOR_STYLES.LINE_COLOR) {
+      return extractColorFromStyleProperty(styles[VECTOR_STYLES.LINE_COLOR], 'none');
+    } else if (styleProperty === VECTOR_STYLES.FILL_COLOR) {
+      return extractColorFromStyleProperty(styles[VECTOR_STYLES.FILL_COLOR], 'grey');
+    } else {
+      //unexpected
+      console.error('Cannot return color for properties other then line or fill color');
+    }
+  };
+
+  getIcon = () => {
+    const symbolId = this._getSymbolId();
+
     return (
       <VectorIcon
         loadIsPointsOnly={this._getIsPointsOnly}
         loadIsLinesOnly={this._getIsLinesOnly}
-        fillColor={styles[VECTOR_STYLES.FILL_COLOR]}
-        lineColor={styles[VECTOR_STYLES.LINE_COLOR]}
         symbolId={symbolId}
+        getColorForProperty={this._getColorForProperty}
       />
     );
   };
 
-  async _getLegendDetailStyleProperties() {
+  _getLegendDetailStyleProperties = async () => {
     const isLinesOnly = await this._getIsLinesOnly();
     const isPolygonsOnly = await this._getIsPolygonsOnly();
 
     return this.getDynamicPropertiesArray().filter(styleProperty => {
+      const styleName = styleProperty.getStyleName();
+      if ([VECTOR_STYLES.ICON_ORIENTATION, VECTOR_STYLES.LABEL_TEXT].includes(styleName)) {
+        return false;
+      }
+
       if (isLinesOnly) {
-        return LINE_STYLES.includes(styleProperty.getStyleName());
+        return LINE_STYLES.includes(styleName);
       }
 
       if (isPolygonsOnly) {
-        return POLYGON_STYLES.includes(styleProperty.getStyleName());
+        return POLYGON_STYLES.includes(styleName);
       }
 
       return true;
     });
-  }
+  };
 
   async hasLegendDetails() {
     const styles = await this._getLegendDetailStyleProperties();
@@ -377,48 +450,14 @@ export class VectorStyle extends AbstractStyle {
   }
 
   renderLegendDetails() {
-    const loadRows = async () => {
-      const styles = await this._getLegendDetailStyleProperties();
-      const promises = styles.map(async style => {
-        return {
-          label: await style.getField().getLabel(),
-          fieldFormatter: await this._source.getFieldFormatter(style.getField().getName()),
-          meta: this._getFieldMeta(style.getField().getName()),
-          style,
-        };
-      });
-      return await Promise.all(promises);
-    };
-
-    return <VectorStyleLegend loadRows={loadRows} />;
-  }
-
-  _getFeatureStyleParams() {
-    return this.getDynamicPropertiesArray().map(styleProperty => {
-      // "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 (
-        styleProperty.getStyleName() === VECTOR_STYLES.ICON_SIZE &&
-        this._descriptor.properties.symbol.options.symbolizeAs === SYMBOLIZE_AS_ICON
-      ) {
-        supportsFeatureState = false;
-        isScaled = true;
-      } else {
-        supportsFeatureState = styleProperty.supportsFeatureState();
-        isScaled = styleProperty.isScaled();
-      }
-
-      const field = styleProperty.getField();
-      return {
-        supportsFeatureState,
-        isScaled,
-        name: field.getName(),
-        meta: this._getFieldMeta(field.getName()),
-        computedName: getComputedFieldName(styleProperty.getStyleName(), field.getName()),
-      };
-    });
+    return (
+      <VectorStyleLegend
+        getLegendDetailStyleProperties={this._getLegendDetailStyleProperties}
+        loadIsPointsOnly={this._getIsPointsOnly}
+        loadIsLinesOnly={this._getIsLinesOnly}
+        symbolId={this._getSymbolId()}
+      />
+    );
   }
 
   clearFeatureState(featureCollection, mbMap, sourceId) {
@@ -439,8 +478,8 @@ export class VectorStyle extends AbstractStyle {
       return;
     }
 
-    const featureStateParams = this._getFeatureStyleParams();
-    if (featureStateParams.length === 0) {
+    const dynamicStyleProps = this.getDynamicPropertiesArray();
+    if (dynamicStyleProps.length === 0) {
       return;
     }
 
@@ -450,31 +489,15 @@ export class VectorStyle extends AbstractStyle {
     };
     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 < featureStateParams.length; j++) {
-        const {
-          supportsFeatureState,
-          isScaled,
-          name,
-          meta: range,
-          computedName,
-        } = featureStateParams[j];
-        const value = parseFloat(feature.properties[name]);
-        let styleValue;
-        if (isScaled) {
-          styleValue = scaleValue(value, range);
-        } else {
-          if (isNaN(value)) {
-            styleValue = 0;
-          } else {
-            styleValue = value;
-          }
-        }
-
-        if (supportsFeatureState) {
+      for (let j = 0; j < dynamicStyleProps.length; j++) {
+        const dynamicStyleProp = dynamicStyleProps[j];
+        const name = dynamicStyleProp.getField().getName();
+        const computedName = getComputedFieldName(dynamicStyleProp.getStyleName(), name);
+        const styleValue = dynamicStyleProp.getMbValue(feature.properties[name]);
+        if (dynamicStyleProp.supportsFeatureState()) {
           tmpFeatureState[computedName] = styleValue;
         } else {
           feature.properties[computedName] = styleValue;
@@ -489,7 +512,7 @@ export class VectorStyle extends AbstractStyle {
     //this return-value is used in an optimization for style-updates with mapbox-gl.
     //`true` indicates the entire data needs to reset on the source (otherwise the style-rules will not be reapplied)
     //`false` indicates the data does not need to be reset on the store, because styles are re-evaluated if they use featureState
-    return featureStateParams.some(({ supportsFeatureState }) => !supportsFeatureState);
+    return dynamicStyleProps.some(dynamicStyleProp => !dynamicStyleProp.supportsFeatureState());
   }
 
   arePointsSymbolizedAsCircles() {
@@ -509,6 +532,14 @@ export class VectorStyle extends AbstractStyle {
     this._iconSizeStyleProperty.syncCircleRadiusWithMb(pointLayerId, mbMap);
   }
 
+  setMBPropertiesForLabelText({ alpha, mbMap, textLayerId }) {
+    mbMap.setLayoutProperty(textLayerId, 'icon-allow-overlap', true);
+    mbMap.setLayoutProperty(textLayerId, 'text-allow-overlap', true);
+    this._labelStyleProperty.syncTextFieldWithMb(textLayerId, mbMap);
+    this._labelColorStyleProperty.syncLabelColorWithMb(textLayerId, mbMap, alpha);
+    this._labelSizeStyleProperty.syncLabelSizeWithMb(textLayerId, mbMap);
+  }
+
   setMBSymbolPropertiesForPoints({ mbMap, symbolLayerId, alpha }) {
     const symbolId = this._descriptor.properties.symbol.options.symbolId;
     mbMap.setLayoutProperty(symbolLayerId, 'icon-ignore-placement', true);
@@ -539,27 +570,30 @@ export class VectorStyle extends AbstractStyle {
         fieldName: fieldDescriptor.name,
       });
     } else if (fieldDescriptor.origin === FIELD_ORIGIN.JOIN) {
-      let matchingField = null;
-      const joins = this._layer.getValidJoins();
-      joins.find(join => {
-        const aggSource = join.getRightJoinSource();
-        matchingField = aggSource.getMetricFieldForName(fieldDescriptor.name);
-        return !!matchingField;
+      const join = this._layer.getValidJoins().find(join => {
+        return join.getRightJoinSource().hasMatchingMetricField(fieldDescriptor.name);
       });
-      return matchingField;
+      return join ? join.getRightJoinSource().getMetricFieldForName(fieldDescriptor.name) : null;
     } else {
       throw new Error(`Unknown origin-type ${fieldDescriptor.origin}`);
     }
   }
 
-  _makeSizeProperty(descriptor, styleName) {
+  _makeSizeProperty(descriptor, styleName, isSymbolizedAsIcon) {
     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) {
       const field = this._makeField(descriptor.options.field);
-      return new DynamicSizeProperty(descriptor.options, styleName, field);
+      return new DynamicSizeProperty(
+        descriptor.options,
+        styleName,
+        field,
+        this._getFieldMeta,
+        this._getFieldFormatter,
+        isSymbolizedAsIcon
+      );
     } else {
       throw new Error(`${descriptor} not implemented`);
     }
@@ -572,7 +606,13 @@ export class VectorStyle extends AbstractStyle {
       return new StaticColorProperty(descriptor.options, styleName);
     } else if (descriptor.type === DynamicStyleProperty.type) {
       const field = this._makeField(descriptor.options.field);
-      return new DynamicColorProperty(descriptor.options, styleName, field);
+      return new DynamicColorProperty(
+        descriptor.options,
+        styleName,
+        field,
+        this._getFieldMeta,
+        this._getFieldFormatter
+      );
     } else {
       throw new Error(`${descriptor} not implemented`);
     }
@@ -590,4 +630,23 @@ export class VectorStyle extends AbstractStyle {
       throw new Error(`${descriptor} not implemented`);
     }
   }
+
+  _makeLabelProperty(descriptor) {
+    if (!descriptor || !descriptor.options) {
+      return new StaticTextProperty({ value: '' }, VECTOR_STYLES.LABEL_TEXT);
+    } else if (descriptor.type === StaticStyleProperty.type) {
+      return new StaticTextProperty(descriptor.options, VECTOR_STYLES.LABEL_TEXT);
+    } else if (descriptor.type === DynamicStyleProperty.type) {
+      const field = this._makeField(descriptor.options.field);
+      return new DynamicTextProperty(
+        descriptor.options,
+        VECTOR_STYLES.LABEL_TEXT,
+        field,
+        this._getFieldMeta,
+        this._getFieldFormatter
+      );
+    } else {
+      throw new Error(`${descriptor} not implemented`);
+    }
+  }
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
index 1242d7307dc48..aa0badd5583d5 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
@@ -96,6 +96,24 @@ describe('getDescriptorWithMissingStylePropsRemoved', () => {
         },
         type: 'DYNAMIC',
       },
+      labelText: {
+        options: {
+          value: '',
+        },
+        type: 'STATIC',
+      },
+      labelColor: {
+        options: {
+          color: '#000000',
+        },
+        type: 'STATIC',
+      },
+      labelSize: {
+        options: {
+          size: 14,
+        },
+        type: 'STATIC',
+      },
       lineColor: {
         options: {},
         type: 'DYNAMIC',
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js
index 3f2851fa092cd..4bae90c3165f2 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js
@@ -7,11 +7,14 @@
 import { VectorStyle } from './vector_style';
 import { SYMBOLIZE_AS_CIRCLE, DEFAULT_ICON_SIZE } from './vector_constants';
 import { COLOR_GRADIENTS, DEFAULT_FILL_COLORS, DEFAULT_LINE_COLORS } from '../color_utils';
+import chrome from 'ui/chrome';
 
 const DEFAULT_ICON = 'airfield';
 
 export const MIN_SIZE = 1;
 export const MAX_SIZE = 64;
+export const DEFAULT_MIN_SIZE = 4;
+export const DEFAULT_MAX_SIZE = 32;
 export const DEFAULT_SIGMA = 3;
 
 export const VECTOR_STYLES = {
@@ -21,6 +24,9 @@ export const VECTOR_STYLES = {
   LINE_WIDTH: 'lineWidth',
   ICON_SIZE: 'iconSize',
   ICON_ORIENTATION: 'iconOrientation',
+  LABEL_TEXT: 'labelText',
+  LABEL_COLOR: 'labelColor',
+  LABEL_SIZE: 'labelSize',
 };
 
 export const LINE_STYLES = [VECTOR_STYLES.LINE_COLOR, VECTOR_STYLES.LINE_WIDTH];
@@ -49,6 +55,8 @@ export function getDefaultStaticProperties(mapColors = []) {
   const nextFillColor = DEFAULT_FILL_COLORS[nextColorIndex];
   const nextLineColor = DEFAULT_LINE_COLORS[nextColorIndex];
 
+  const isDarkMode = chrome.getUiSettingsClient().get('theme:darkMode', false);
+
   return {
     [VECTOR_STYLES.FILL_COLOR]: {
       type: VectorStyle.STYLE_TYPE.STATIC,
@@ -80,6 +88,24 @@ export function getDefaultStaticProperties(mapColors = []) {
         orientation: 0,
       },
     },
+    [VECTOR_STYLES.LABEL_TEXT]: {
+      type: VectorStyle.STYLE_TYPE.STATIC,
+      options: {
+        value: '',
+      },
+    },
+    [VECTOR_STYLES.LABEL_COLOR]: {
+      type: VectorStyle.STYLE_TYPE.STATIC,
+      options: {
+        color: isDarkMode ? '#FFFFFF' : '#000000',
+      },
+    },
+    [VECTOR_STYLES.LABEL_SIZE]: {
+      type: VectorStyle.STYLE_TYPE.STATIC,
+      options: {
+        size: 14,
+      },
+    },
   };
 }
 
@@ -122,8 +148,8 @@ export function getDefaultDynamicProperties() {
     [VECTOR_STYLES.ICON_SIZE]: {
       type: VectorStyle.STYLE_TYPE.DYNAMIC,
       options: {
-        minSize: 4,
-        maxSize: 32,
+        minSize: DEFAULT_MIN_SIZE,
+        maxSize: DEFAULT_MAX_SIZE,
         field: undefined,
         fieldMetaOptions: {
           isEnabled: true,
@@ -141,5 +167,34 @@ export function getDefaultDynamicProperties() {
         },
       },
     },
+    [VECTOR_STYLES.LABEL_TEXT]: {
+      type: VectorStyle.STYLE_TYPE.STATIC,
+      options: {
+        field: undefined,
+      },
+    },
+    [VECTOR_STYLES.LABEL_COLOR]: {
+      type: VectorStyle.STYLE_TYPE.STATIC,
+      options: {
+        color: COLOR_GRADIENTS[0].value,
+        field: undefined,
+        fieldMetaOptions: {
+          isEnabled: true,
+          sigma: DEFAULT_SIGMA,
+        },
+      },
+    },
+    [VECTOR_STYLES.LABEL_SIZE]: {
+      type: VectorStyle.STYLE_TYPE.STATIC,
+      options: {
+        minSize: DEFAULT_MIN_SIZE,
+        maxSize: DEFAULT_MAX_SIZE,
+        field: undefined,
+        fieldMetaOptions: {
+          isEnabled: true,
+          sigma: DEFAULT_SIGMA,
+        },
+      },
+    },
   };
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.js b/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.js
index 41f6de65e4032..7abfee1b184f0 100644
--- a/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.js
+++ b/x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.js
@@ -158,3 +158,15 @@ export function canSkipStyleMetaUpdate({ prevDataRequest, nextMeta }) {
     !updateDueToFields && !updateDueToSourceQuery && !updateDueToIsTimeAware && !updateDueToTime
   );
 }
+
+export function canSkipFormattersUpdate({ prevDataRequest, nextMeta }) {
+  if (!prevDataRequest) {
+    return false;
+  }
+  const prevMeta = prevDataRequest.getMeta();
+  if (!prevMeta) {
+    return false;
+  }
+
+  return _.isEqual(prevMeta.fieldNames, nextMeta.fieldNames);
+}
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 16129087de1f8..dd9a1b7a14c10 100644
--- a/x-pack/legacy/plugins/maps/public/layers/vector_layer.js
+++ b/x-pack/legacy/plugins/maps/public/layers/vector_layer.js
@@ -13,6 +13,7 @@ import {
   FEATURE_ID_PROPERTY_NAME,
   SOURCE_DATA_ID_ORIGIN,
   SOURCE_META_ID_ORIGIN,
+  SOURCE_FORMATTERS_ID_ORIGIN,
   FEATURE_VISIBLE_PROPERTY_NAME,
   EMPTY_FEATURE_COLLECTION,
   LAYER_TYPE,
@@ -24,7 +25,11 @@ import { JoinTooltipProperty } from './tooltips/join_tooltip_property';
 import { EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { DataRequestAbortError } from './util/data_request';
-import { canSkipSourceUpdate, canSkipStyleMetaUpdate } from './util/can_skip_fetch';
+import {
+  canSkipSourceUpdate,
+  canSkipStyleMetaUpdate,
+  canSkipFormattersUpdate,
+} from './util/can_skip_fetch';
 import { assignFeatureIds } from './util/assign_feature_ids';
 import {
   getFillFilterExpression,
@@ -186,24 +191,33 @@ export class VectorLayer extends AbstractLayer {
     return this._source.getDisplayName();
   }
 
+  _getJoinFields() {
+    const joinFields = [];
+    this.getValidJoins().forEach(join => {
+      const fields = join.getJoinFields();
+      joinFields.push(...fields);
+    });
+    return joinFields;
+  }
+
   async getDateFields() {
     return await this._source.getDateFields();
   }
 
   async getNumberFields() {
     const numberFieldOptions = await this._source.getNumberFields();
-    const joinFields = [];
-    this.getValidJoins().forEach(join => {
-      const fields = join.getJoinFields();
-      joinFields.push(...fields);
-    });
-    return [...numberFieldOptions, ...joinFields];
+    return [...numberFieldOptions, ...this._getJoinFields()];
   }
 
   async getOrdinalFields() {
     return [...(await this.getDateFields()), ...(await this.getNumberFields())];
   }
 
+  async getFields() {
+    const sourceFields = await this._source.getFields();
+    return [...sourceFields, ...this._getJoinFields()];
+  }
+
   getIndexPatternIds() {
     const indexPatternIds = this._source.getIndexPatternIds();
     this.getValidJoins().forEach(join => {
@@ -220,7 +234,7 @@ export class VectorLayer extends AbstractLayer {
     return indexPatternIds;
   }
 
-  _findDataRequestForSource(sourceDataId) {
+  _findDataRequestById(sourceDataId) {
     return this._dataRequests.find(dataRequest => dataRequest.getDataId() === sourceDataId);
   }
 
@@ -241,7 +255,7 @@ export class VectorLayer extends AbstractLayer {
       sourceQuery: joinSource.getWhereQuery(),
       applyGlobalQuery: joinSource.getApplyGlobalQuery(),
     };
-    const prevDataRequest = this._findDataRequestForSource(sourceDataId);
+    const prevDataRequest = this._findDataRequestById(sourceDataId);
 
     const canSkipFetch = await canSkipSourceUpdate({
       source: joinSource,
@@ -286,6 +300,7 @@ export class VectorLayer extends AbstractLayer {
   async _syncJoins(syncContext) {
     const joinSyncs = this.getValidJoins().map(async join => {
       await this._syncJoinStyleMeta(syncContext, join);
+      await this._syncJoinFormatters(syncContext, join);
       return this._syncJoin({ join, ...syncContext });
     });
 
@@ -355,10 +370,9 @@ export class VectorLayer extends AbstractLayer {
     registerCancelCallback,
     dataFilters,
   }) {
-    const requestToken = Symbol(`layer-source-data:${this.getId()}`);
+    const requestToken = Symbol(`layer-${this.getId()}-${SOURCE_DATA_ID_ORIGIN}`);
     const searchFilters = this._getSearchFilters(dataFilters);
     const prevDataRequest = this.getSourceDataRequest();
-
     const canSkipFetch = await canSkipSourceUpdate({
       source: this._source,
       prevDataRequest,
@@ -459,13 +473,13 @@ export class VectorLayer extends AbstractLayer {
       isTimeAware: this._style.isTimeAware() && (await source.isTimeAware()),
       timeFilters: dataFilters.timeFilters,
     };
-    const prevDataRequest = this._findDataRequestForSource(dataRequestId);
+    const prevDataRequest = this._findDataRequestById(dataRequestId);
     const canSkipFetch = canSkipStyleMetaUpdate({ prevDataRequest, nextMeta });
     if (canSkipFetch) {
       return;
     }
 
-    const requestToken = Symbol(`layer-${this.getId()}-style-meta`);
+    const requestToken = Symbol(`layer-${this.getId()}-${dataRequestId}`);
     try {
       startLoading(dataRequestId, requestToken, nextMeta);
       const layerName = await this.getDisplayName();
@@ -484,12 +498,87 @@ export class VectorLayer extends AbstractLayer {
     }
   }
 
+  async _syncSourceFormatters(syncContext) {
+    if (this._style.constructor.type !== LAYER_STYLE_TYPE.VECTOR) {
+      return;
+    }
+
+    return this._syncFormatters({
+      source: this._source,
+      dataRequestId: SOURCE_FORMATTERS_ID_ORIGIN,
+      fields: this._style
+        .getDynamicPropertiesArray()
+        .filter(dynamicStyleProp => {
+          return dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.SOURCE;
+        })
+        .map(dynamicStyleProp => {
+          return dynamicStyleProp.getField();
+        }),
+      ...syncContext,
+    });
+  }
+
+  async _syncJoinFormatters(syncContext, join) {
+    const joinSource = join.getRightJoinSource();
+    return this._syncFormatters({
+      source: joinSource,
+      dataRequestId: join.getSourceFormattersDataRequestId(),
+      fields: this._style
+        .getDynamicPropertiesArray()
+        .filter(dynamicStyleProp => {
+          const matchingField = joinSource.getMetricFieldForName(
+            dynamicStyleProp.getField().getName()
+          );
+          return dynamicStyleProp.getFieldOrigin() === FIELD_ORIGIN.JOIN && !!matchingField;
+        })
+        .map(dynamicStyleProp => {
+          return dynamicStyleProp.getField();
+        }),
+      ...syncContext,
+    });
+  }
+
+  async _syncFormatters({ source, dataRequestId, fields, startLoading, stopLoading, onLoadError }) {
+    if (fields.length === 0) {
+      return;
+    }
+
+    const fieldNames = fields.map(field => {
+      return field.getName();
+    });
+    const nextMeta = {
+      fieldNames: _.uniq(fieldNames).sort(),
+    };
+    const prevDataRequest = this._findDataRequestById(dataRequestId);
+    const canSkipUpdate = canSkipFormattersUpdate({ prevDataRequest, nextMeta });
+    if (canSkipUpdate) {
+      return;
+    }
+
+    const requestToken = Symbol(`layer-${this.getId()}-${dataRequestId}`);
+    try {
+      startLoading(dataRequestId, requestToken, nextMeta);
+
+      const formatters = {};
+      const promises = fields.map(async field => {
+        const fieldName = field.getName();
+        formatters[fieldName] = await source.getFieldFormatter(fieldName);
+      });
+      await Promise.all(promises);
+
+      stopLoading(dataRequestId, requestToken, formatters, nextMeta);
+    } catch (error) {
+      onLoadError(dataRequestId, requestToken, error.message);
+    }
+  }
+
   async syncData(syncContext) {
     if (!this.isVisible() || !this.showAtZoomLevel(syncContext.dataFilters.zoom)) {
       return;
     }
 
     await this._syncSourceStyleMeta(syncContext);
+    await this._syncSourceFormatters(syncContext);
     const sourceResult = await this._syncSource(syncContext);
     if (
       !sourceResult.featureCollection ||
@@ -540,30 +629,40 @@ export class VectorLayer extends AbstractLayer {
     const pointLayer = mbMap.getLayer(pointLayerId);
     const symbolLayer = mbMap.getLayer(symbolLayerId);
 
-    let mbLayerId;
+    // Point layers symbolized as circles require 2 mapbox layers because
+    // "circle" layers do not support "text" style properties
+    // Point layers symbolized as icons only contain a single mapbox layer.
+    let markerLayerId;
+    let textLayerId;
     if (this._style.arePointsSymbolizedAsCircles()) {
-      mbLayerId = pointLayerId;
+      markerLayerId = pointLayerId;
+      textLayerId = this._getMbTextLayerId();
       if (symbolLayer) {
         mbMap.setLayoutProperty(symbolLayerId, 'visibility', 'none');
       }
       this._setMbCircleProperties(mbMap);
     } else {
-      mbLayerId = symbolLayerId;
+      markerLayerId = symbolLayerId;
+      textLayerId = symbolLayerId;
       if (pointLayer) {
         mbMap.setLayoutProperty(pointLayerId, 'visibility', 'none');
+        mbMap.setLayoutProperty(this._getMbTextLayerId(), 'visibility', 'none');
       }
       this._setMbSymbolProperties(mbMap);
     }
 
-    this.syncVisibilityWithMb(mbMap, mbLayerId);
-    mbMap.setLayerZoomRange(mbLayerId, this._descriptor.minZoom, this._descriptor.maxZoom);
+    this.syncVisibilityWithMb(mbMap, markerLayerId);
+    mbMap.setLayerZoomRange(markerLayerId, this._descriptor.minZoom, this._descriptor.maxZoom);
+    if (markerLayerId !== textLayerId) {
+      this.syncVisibilityWithMb(mbMap, textLayerId);
+      mbMap.setLayerZoomRange(textLayerId, this._descriptor.minZoom, this._descriptor.maxZoom);
+    }
   }
 
   _setMbCircleProperties(mbMap) {
     const sourceId = this.getId();
     const pointLayerId = this._getMbPointLayerId();
     const pointLayer = mbMap.getLayer(pointLayerId);
-
     if (!pointLayer) {
       mbMap.addLayer({
         id: pointLayerId,
@@ -573,15 +672,32 @@ export class VectorLayer extends AbstractLayer {
       });
     }
 
+    const textLayerId = this._getMbTextLayerId();
+    const textLayer = mbMap.getLayer(textLayerId);
+    if (!textLayer) {
+      mbMap.addLayer({
+        id: textLayerId,
+        type: 'symbol',
+        source: sourceId,
+      });
+    }
+
     const filterExpr = getPointFilterExpression(this._hasJoins());
     if (filterExpr !== mbMap.getFilter(pointLayerId)) {
       mbMap.setFilter(pointLayerId, filterExpr);
+      mbMap.setFilter(textLayerId, filterExpr);
     }
 
     this._style.setMBPaintPropertiesForPoints({
       alpha: this.getAlpha(),
       mbMap,
-      pointLayerId: pointLayerId,
+      pointLayerId,
+    });
+
+    this._style.setMBPropertiesForLabelText({
+      alpha: this.getAlpha(),
+      mbMap,
+      textLayerId,
     });
   }
 
@@ -606,7 +722,13 @@ export class VectorLayer extends AbstractLayer {
     this._style.setMBSymbolPropertiesForPoints({
       alpha: this.getAlpha(),
       mbMap,
-      symbolLayerId: symbolLayerId,
+      symbolLayerId,
+    });
+
+    this._style.setMBPropertiesForLabelText({
+      alpha: this.getAlpha(),
+      mbMap,
+      textLayerId: symbolLayerId,
     });
   }
 
@@ -678,6 +800,10 @@ export class VectorLayer extends AbstractLayer {
     return this.makeMbLayerId('circle');
   }
 
+  _getMbTextLayerId() {
+    return this.makeMbLayerId('text');
+  }
+
   _getMbSymbolLayerId() {
     return this.makeMbLayerId('symbol');
   }
@@ -693,6 +819,7 @@ export class VectorLayer extends AbstractLayer {
   getMbLayerIds() {
     return [
       this._getMbPointLayerId(),
+      this._getMbTextLayerId(),
       this._getMbSymbolLayerId(),
       this._getMbLineLayerId(),
       this._getMbPolygonLayerId(),
@@ -700,12 +827,7 @@ export class VectorLayer extends AbstractLayer {
   }
 
   ownsMbLayerId(mbLayerId) {
-    return (
-      this._getMbPointLayerId() === mbLayerId ||
-      this._getMbLineLayerId() === mbLayerId ||
-      this._getMbPolygonLayerId() === mbLayerId ||
-      this._getMbSymbolLayerId() === mbLayerId
-    );
+    return this.getMbLayerIds().includes(mbLayerId);
   }
 
   ownsMbSourceId(mbSourceId) {
diff --git a/x-pack/legacy/plugins/maps/public/layers/vector_tile_layer.js b/x-pack/legacy/plugins/maps/public/layers/vector_tile_layer.js
index c1b590f56ae52..b09ccdc3af8ba 100644
--- a/x-pack/legacy/plugins/maps/public/layers/vector_tile_layer.js
+++ b/x-pack/legacy/plugins/maps/public/layers/vector_tile_layer.js
@@ -31,32 +31,58 @@ export class VectorTileLayer extends TileLayer {
     return tileLayerDescriptor;
   }
 
+  _canSkipSync({ prevDataRequest, nextMeta }) {
+    if (!prevDataRequest) {
+      return false;
+    }
+    const prevMeta = prevDataRequest.getMeta();
+    if (!prevMeta) {
+      return false;
+    }
+
+    return prevMeta.tileLayerId === nextMeta.tileLayerId;
+  }
+
   async syncData({ startLoading, stopLoading, onLoadError, dataFilters }) {
     if (!this.isVisible() || !this.showAtZoomLevel(dataFilters.zoom)) {
       return;
     }
-    const sourceDataRequest = this.getSourceDataRequest();
-    if (sourceDataRequest) {
-      //data is immmutable
+
+    const nextMeta = { tileLayerId: this._source.getTileLayerId() };
+    const canSkipSync = this._canSkipSync({
+      prevDataRequest: this.getSourceDataRequest(),
+      nextMeta,
+    });
+    if (canSkipSync) {
       return;
     }
+
     const requestToken = Symbol(`layer-source-refresh:${this.getId()} - source`);
-    startLoading(SOURCE_DATA_ID_ORIGIN, requestToken, dataFilters);
     try {
+      startLoading(SOURCE_DATA_ID_ORIGIN, requestToken, dataFilters);
       const styleAndSprites = await this._source.getVectorStyleSheetAndSpriteMeta(isRetina());
       const spriteSheetImageData = await loadSpriteSheetImageData(styleAndSprites.spriteMeta.png);
       const data = {
         ...styleAndSprites,
         spriteSheetImageData,
       };
-      stopLoading(SOURCE_DATA_ID_ORIGIN, requestToken, data, {});
+      stopLoading(SOURCE_DATA_ID_ORIGIN, requestToken, data, nextMeta);
     } catch (error) {
       onLoadError(SOURCE_DATA_ID_ORIGIN, requestToken, error.message);
     }
   }
 
   _generateMbId(name) {
-    return this.getId() + '_' + name;
+    return `${this.getId()}_${name}`;
+  }
+
+  _generateMbSourceIdPrefix() {
+    const DELIMITTER = '___';
+    return `${this.getId()}${DELIMITTER}${this._source.getTileLayerId()}${DELIMITTER}`;
+  }
+
+  _generateMbSourceId(name) {
+    return `${this._generateMbSourceIdPrefix()}${name}`;
   }
 
   _getVectorStyle() {
@@ -103,19 +129,15 @@ export class VectorTileLayer extends TileLayer {
       return [];
     }
     const sourceIds = Object.keys(vectorStyle.sources);
-    return sourceIds.map(sourceId => this._generateMbId(sourceId));
+    return sourceIds.map(sourceId => this._generateMbSourceId(sourceId));
   }
 
   ownsMbLayerId(mbLayerId) {
-    //todo optimize: do not create temp array
-    const mbLayerIds = this.getMbLayerIds();
-    return mbLayerIds.indexOf(mbLayerId) >= 0;
+    return mbLayerId.startsWith(this.getId());
   }
 
   ownsMbSourceId(mbSourceId) {
-    //todo optimize: do not create temp array
-    const mbSourceIds = this.getMbSourceIds();
-    return mbSourceIds.indexOf(mbSourceId) >= 0;
+    return mbSourceId.startsWith(this.getId());
   }
 
   _makeNamespacedImageId(imageId) {
@@ -123,19 +145,43 @@ export class VectorTileLayer extends TileLayer {
     return prefix + imageId;
   }
 
+  _requiresPrevSourceCleanup(mbMap) {
+    const sourceIdPrefix = this._generateMbSourceIdPrefix();
+    const mbStyle = mbMap.getStyle();
+    return Object.keys(mbStyle.sources).some(mbSourceId => {
+      const doesMbSourceBelongToLayer = this.ownsMbSourceId(mbSourceId);
+      const doesMbSourceBelongToSource = mbSourceId.startsWith(sourceIdPrefix);
+      return doesMbSourceBelongToLayer && !doesMbSourceBelongToSource;
+    });
+  }
+
   syncLayerWithMB(mbMap) {
     const vectorStyle = this._getVectorStyle();
     if (!vectorStyle) {
       return;
     }
 
+    if (this._requiresPrevSourceCleanup(mbMap)) {
+      const mbStyle = mbMap.getStyle();
+      mbStyle.layers.forEach(mbLayer => {
+        if (this.ownsMbLayerId(mbLayer.id)) {
+          mbMap.removeLayer(mbLayer.id);
+        }
+      });
+      Object.keys(mbStyle.sources).some(mbSourceId => {
+        if (this.ownsMbSourceId(mbSourceId)) {
+          mbMap.removeSource(mbSourceId);
+        }
+      });
+    }
+
     let initialBootstrapCompleted = false;
     const sourceIds = Object.keys(vectorStyle.sources);
     sourceIds.forEach(sourceId => {
       if (initialBootstrapCompleted) {
         return;
       }
-      const mbSourceId = this._generateMbId(sourceId);
+      const mbSourceId = this._generateMbSourceId(sourceId);
       const mbSource = mbMap.getSource(mbSourceId);
       if (mbSource) {
         //if a single source is present, the layer already has bootstrapped with the mbMap
@@ -174,7 +220,7 @@ export class VectorTileLayer extends TileLayer {
         }
         const newLayerObject = {
           ...layer,
-          source: this._generateMbId(layer.source),
+          source: this._generateMbSourceId(layer.source),
           id: mbLayerId,
         };
 
diff --git a/x-pack/legacy/plugins/maps/public/legacy.ts b/x-pack/legacy/plugins/maps/public/legacy.ts
index 684d7b16fbb3b..6adab529daf86 100644
--- a/x-pack/legacy/plugins/maps/public/legacy.ts
+++ b/x-pack/legacy/plugins/maps/public/legacy.ts
@@ -16,11 +16,11 @@ const setupPlugins = {
   __LEGACY: {
     uiModules,
   },
-  plugins: npSetup.plugins,
+  np: npSetup.plugins,
 };
 
 const startPlugins = {
-  plugins: npStart.plugins,
+  np: npStart.plugins,
 };
 
 export const setup = pluginInstance.setup(npSetup.core, setupPlugins);
diff --git a/x-pack/legacy/plugins/maps/public/meta.js b/x-pack/legacy/plugins/maps/public/meta.js
index c47c2847ffd14..7cdb8d67c057b 100644
--- a/x-pack/legacy/plugins/maps/public/meta.js
+++ b/x-pack/legacy/plugins/maps/public/meta.js
@@ -8,7 +8,7 @@ import { GIS_API_PATH, EMS_CATALOGUE_PATH, EMS_GLYPHS_PATH } from '../common/con
 import chrome from 'ui/chrome';
 import { i18n } from '@kbn/i18n';
 import { EMSClient } from '@elastic/ems-client';
-import { xpackInfo } from './kibana_services';
+import { getLicenseId } from './kibana_services';
 import fetch from 'node-fetch';
 
 const GIS_API_RELATIVE = `../${GIS_API_PATH}`;
@@ -42,7 +42,6 @@ export function getEMSClient() {
         false
       );
       const proxyPath = proxyElasticMapsServiceInMaps ? relativeToAbsolute('..') : '';
-
       const manifestServiceUrl = proxyElasticMapsServiceInMaps
         ? relativeToAbsolute(`${GIS_API_RELATIVE}/${EMS_CATALOGUE_PATH}`)
         : chrome.getInjected('emsManifestServiceUrl');
@@ -68,9 +67,7 @@ export function getEMSClient() {
       };
     }
   }
-  const xpackMapsFeature = xpackInfo.get('features.maps');
-  const licenseId =
-    xpackMapsFeature && xpackMapsFeature.maps && xpackMapsFeature.uid ? xpackMapsFeature.uid : '';
+  const licenseId = getLicenseId();
   if (latestLicenseId !== licenseId) {
     latestLicenseId = licenseId;
     emsClient.addQueryParams({ license: licenseId });
diff --git a/x-pack/legacy/plugins/maps/public/meta.test.js b/x-pack/legacy/plugins/maps/public/meta.test.js
index 07cf4a37b07cd..06f4071e3444b 100644
--- a/x-pack/legacy/plugins/maps/public/meta.test.js
+++ b/x-pack/legacy/plugins/maps/public/meta.test.js
@@ -33,10 +33,8 @@ jest.mock('ui/chrome', () => ({
 
 jest.mock('./kibana_services', () => {
   return {
-    xpackInfo: {
-      get() {
-        return 'foobarlicenseid';
-      },
+    getLicenseId() {
+      return 'foobarlicenseid';
     },
   };
 });
diff --git a/x-pack/legacy/plugins/maps/public/plugin.ts b/x-pack/legacy/plugins/maps/public/plugin.ts
index 4e6d52d20db64..0df7109852486 100644
--- a/x-pack/legacy/plugins/maps/public/plugin.ts
+++ b/x-pack/legacy/plugins/maps/public/plugin.ts
@@ -9,6 +9,8 @@ import { Plugin, CoreStart } from 'src/core/public';
 import { wrapInI18nContext } from 'ui/i18n';
 // @ts-ignore
 import { MapListing } from './components/map_listing';
+// @ts-ignore
+import { setLicenseId } from './kibana_services';
 
 /**
  * These are the interfaces with your public contracts. You should export these
@@ -21,10 +23,20 @@ export type MapsPluginStart = ReturnType<MapsPlugin['start']>;
 /** @internal */
 export class MapsPlugin implements Plugin<MapsPluginSetup, MapsPluginStart> {
   public setup(core: any, plugins: any) {
-    const app = plugins.__LEGACY.uiModules.get('app/maps', ['ngRoute', 'react']);
-    app.directive('mapListing', function(reactDirective: any) {
-      return reactDirective(wrapInI18nContext(MapListing));
-    });
+    const {
+      __LEGACY: { uiModules },
+      np: { licensing },
+    } = plugins;
+
+    uiModules
+      .get('app/maps', ['ngRoute', 'react'])
+      .directive('mapListing', function(reactDirective: any) {
+        return reactDirective(wrapInI18nContext(MapListing));
+      });
+
+    if (licensing) {
+      licensing.license$.subscribe(({ uid }: { uid: string }) => setLicenseId(uid));
+    }
   }
 
   public start(core: CoreStart, plugins: any) {}
diff --git a/x-pack/legacy/plugins/maps/public/reducers/map.js b/x-pack/legacy/plugins/maps/public/reducers/map.js
index dc4a56ea91251..7dd60f013cefd 100644
--- a/x-pack/legacy/plugins/maps/public/reducers/map.js
+++ b/x-pack/legacy/plugins/maps/public/reducers/map.js
@@ -44,6 +44,8 @@ import {
   SET_INTERACTIVE,
   DISABLE_TOOLTIP_CONTROL,
   HIDE_TOOLBAR_OVERLAY,
+  HIDE_LAYER_CONTROL,
+  HIDE_VIEW_CONTROL,
 } from '../actions/map_actions';
 
 import { copyPersistentState, TRACKED_LAYER_DESCRIPTOR } from './util';
@@ -113,6 +115,8 @@ const INITIAL_STATE = {
     disableInteractive: false,
     disableTooltipControl: false,
     hideToolbarOverlay: false,
+    hideLayerControl: false,
+    hideViewControl: false,
   },
   selectedLayerId: null,
   __transientLayerId: null,
@@ -356,6 +360,22 @@ export function map(state = INITIAL_STATE, action) {
           hideToolbarOverlay: action.hideToolbarOverlay,
         },
       };
+    case HIDE_LAYER_CONTROL:
+      return {
+        ...state,
+        mapState: {
+          ...state.mapState,
+          hideLayerControl: action.hideLayerControl,
+        },
+      };
+    case HIDE_VIEW_CONTROL:
+      return {
+        ...state,
+        mapState: {
+          ...state.mapState,
+          hideViewControl: action.hideViewControl,
+        },
+      };
     default:
       return state;
   }
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 072ca26c9633e..3d8e6f97ef077 100644
--- a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
+++ b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
@@ -71,6 +71,10 @@ export const isTooltipControlDisabled = ({ map }) => map.mapState.disableTooltip
 
 export const isToolbarOverlayHidden = ({ map }) => map.mapState.hideToolbarOverlay;
 
+export const isLayerControlHidden = ({ map }) => map.mapState.hideLayerControl;
+
+export const isViewControlHidden = ({ map }) => map.mapState.hideViewControl;
+
 export const getMapExtent = ({ map }) => (map.mapState.extent ? map.mapState.extent : {});
 
 export const getMapBuffer = ({ map }) => (map.mapState.buffer ? map.mapState.buffer : {});
diff --git a/x-pack/legacy/plugins/maps/server/lib/get_index_pattern_settings.js b/x-pack/legacy/plugins/maps/server/lib/get_index_pattern_settings.js
new file mode 100644
index 0000000000000..c5522b7ba21c5
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/server/lib/get_index_pattern_settings.js
@@ -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 _ from 'lodash';
+import { DEFAULT_MAX_RESULT_WINDOW, DEFAULT_MAX_INNER_RESULT_WINDOW } from '../../common/constants';
+
+export function getIndexPatternSettings(indicesSettingsResp) {
+  let maxResultWindow = Infinity;
+  let maxInnerResultWindow = Infinity;
+  Object.values(indicesSettingsResp).forEach(indexSettings => {
+    const indexMaxResultWindow = _.get(
+      indexSettings,
+      'settings.index.max_result_window',
+      DEFAULT_MAX_RESULT_WINDOW
+    );
+    maxResultWindow = Math.min(maxResultWindow, indexMaxResultWindow);
+
+    const indexMaxInnerResultWindow = _.get(
+      indexSettings,
+      'settings.index.max_inner_result_window',
+      DEFAULT_MAX_INNER_RESULT_WINDOW
+    );
+    maxInnerResultWindow = Math.min(indexMaxInnerResultWindow, indexMaxResultWindow);
+  });
+
+  return { maxResultWindow, maxInnerResultWindow };
+}
diff --git a/x-pack/legacy/plugins/maps/server/lib/get_index_pattern_settings.test.js b/x-pack/legacy/plugins/maps/server/lib/get_index_pattern_settings.test.js
new file mode 100644
index 0000000000000..01a1ba2703cba
--- /dev/null
+++ b/x-pack/legacy/plugins/maps/server/lib/get_index_pattern_settings.test.js
@@ -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 { getIndexPatternSettings } from './get_index_pattern_settings';
+import { DEFAULT_MAX_RESULT_WINDOW, DEFAULT_MAX_INNER_RESULT_WINDOW } from '../../common/constants';
+
+describe('max_result_window and max_inner_result_window are not set', () => {
+  test('Should provide default values when values not set', () => {
+    const indicesSettingsResp = {
+      kibana_sample_data_logs: {
+        settings: {
+          index: {},
+        },
+      },
+    };
+    const { maxResultWindow, maxInnerResultWindow } = getIndexPatternSettings(indicesSettingsResp);
+    expect(maxResultWindow).toBe(DEFAULT_MAX_RESULT_WINDOW);
+    expect(maxInnerResultWindow).toBe(DEFAULT_MAX_INNER_RESULT_WINDOW);
+  });
+
+  test('Should include default values when providing minimum values for indices in index pattern', () => {
+    const indicesSettingsResp = {
+      kibana_sample_data_logs: {
+        settings: {
+          index: {
+            max_result_window: '15000',
+            max_inner_result_window: '200',
+          },
+        },
+      },
+      kibana_sample_data_flights: {
+        settings: {
+          index: {},
+        },
+      },
+    };
+    const { maxResultWindow, maxInnerResultWindow } = getIndexPatternSettings(indicesSettingsResp);
+    expect(maxResultWindow).toBe(DEFAULT_MAX_RESULT_WINDOW);
+    expect(maxInnerResultWindow).toBe(DEFAULT_MAX_INNER_RESULT_WINDOW);
+  });
+});
+
+describe('max_result_window and max_inner_result_window are set', () => {
+  test('Should provide values from settings', () => {
+    const indicesSettingsResp = {
+      kibana_sample_data_logs: {
+        settings: {
+          index: {
+            max_result_window: '15000', // value is returned as string API
+            max_inner_result_window: '200',
+          },
+        },
+      },
+    };
+    const { maxResultWindow, maxInnerResultWindow } = getIndexPatternSettings(indicesSettingsResp);
+    expect(maxResultWindow).toBe(15000);
+    expect(maxInnerResultWindow).toBe(200);
+  });
+
+  test('Should provide minimum values for indices in index pattern', () => {
+    const indicesSettingsResp = {
+      kibana_sample_data_logs: {
+        settings: {
+          index: {
+            max_result_window: '15000',
+            max_inner_result_window: '200',
+          },
+        },
+      },
+      kibana_sample_data_flights: {
+        settings: {
+          index: {
+            max_result_window: '7000',
+            max_inner_result_window: '75',
+          },
+        },
+      },
+    };
+    const { maxResultWindow, maxInnerResultWindow } = getIndexPatternSettings(indicesSettingsResp);
+    expect(maxResultWindow).toBe(7000);
+    expect(maxInnerResultWindow).toBe(75);
+  });
+});
diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.js b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.js
index 6d078ae35ef85..848c964f4b6d4 100644
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.js
+++ b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.js
@@ -5,10 +5,16 @@
  */
 
 import _ from 'lodash';
-import { EMS_FILE, ES_GEO_FIELD_TYPE, MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
+import {
+  EMS_FILE,
+  ES_GEO_FIELD_TYPE,
+  MAP_SAVED_OBJECT_TYPE,
+  TELEMETRY_TYPE,
+} from '../../common/constants';
 
-function getSavedObjectsClient(server, callCluster) {
+function getSavedObjectsClient(server) {
   const { SavedObjectsClient, getSavedObjectsRepository } = server.savedObjects;
+  const callCluster = server.plugins.elasticsearch.getCluster('admin').callWithInternalUser;
   const internalRepository = getSavedObjectsRepository(callCluster);
   return new SavedObjectsClient(internalRepository);
 }
@@ -79,7 +85,7 @@ export function buildMapsTelemetry({ mapSavedObjects, indexPatternSavedObjects,
     // Total count of maps
     mapsTotalCount: mapsCount,
     // Time of capture
-    timeCaptured: new Date(),
+    timeCaptured: new Date().toISOString(),
     attributesPerMap: {
       // Count of data sources per map
       dataSourcesCount: {
@@ -115,16 +121,16 @@ async function getIndexPatternSavedObjects(savedObjectsClient) {
   return _.get(indexPatternSavedObjects, 'saved_objects', []);
 }
 
-export async function getMapsTelemetry(server, callCluster) {
-  const savedObjectsClient = getSavedObjectsClient(server, callCluster);
+export async function getMapsTelemetry(server) {
+  const savedObjectsClient = getSavedObjectsClient(server);
   const mapSavedObjects = await getMapSavedObjects(savedObjectsClient);
   const indexPatternSavedObjects = await getIndexPatternSavedObjects(savedObjectsClient);
   const settings = {
     showMapVisualizationTypes: server.config().get('xpack.maps.showMapVisualizationTypes'),
   };
   const mapsTelemetry = buildMapsTelemetry({ mapSavedObjects, indexPatternSavedObjects, settings });
-  return await savedObjectsClient.create('maps-telemetry', mapsTelemetry, {
-    id: 'maps-telemetry',
+  return await savedObjectsClient.create(TELEMETRY_TYPE, mapsTelemetry, {
+    id: TELEMETRY_TYPE,
     overwrite: true,
   });
 }
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 d1011736e77f8..9c575e66f7556 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
@@ -4,85 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import _ from 'lodash';
-import { TASK_ID, scheduleTask, registerMapsTelemetryTask } from './telemetry_task';
+import { getMapsTelemetry } from './maps_telemetry';
+import { TELEMETRY_TYPE } from '../../common/constants';
 
 export function initTelemetryCollection(usageCollection, server) {
-  registerMapsTelemetryTask(server);
-  scheduleTask(server);
-  registerMapsUsageCollector(usageCollection, server);
-}
-
-async function isTaskManagerReady(server) {
-  const result = await fetch(server);
-  return result !== null;
-}
-
-async function fetch(server) {
-  let docs;
-  const taskManager = server.plugins.task_manager;
-
-  if (!taskManager) {
-    return null;
-  }
-
-  try {
-    ({ docs } = await taskManager.fetch({
-      query: {
-        bool: {
-          filter: {
-            term: {
-              _id: `task:${TASK_ID}`,
-            },
-          },
-        },
-      },
-    }));
-  } catch (err) {
-    const errMessage = err && err.message ? err.message : err.toString();
-    /*
-     * The usage service WILL to try to fetch from this collector before the task manager has been initialized, because the task manager
-     * has to wait for all plugins to initialize first.
-     * It's fine to ignore it as next time around it will be initialized (or it will throw a different type of error)
-     */
-    if (errMessage.indexOf('NotInitialized') >= 0) {
-      return null;
-    } else {
-      throw err;
-    }
+  if (!usageCollection) {
+    return;
   }
 
-  return docs;
-}
-
-export function buildCollectorObj(server) {
-  let isCollectorReady = false;
-  async function determineIfTaskManagerIsReady() {
-    let isReady = false;
-    try {
-      isReady = await isTaskManagerReady(server);
-    } catch (err) {} // eslint-disable-line
-
-    if (isReady) {
-      isCollectorReady = true;
-    } else {
-      setTimeout(determineIfTaskManagerIsReady, 500);
-    }
-  }
-  determineIfTaskManagerIsReady();
-
-  return {
-    type: 'maps',
-    isReady: () => isCollectorReady,
-    fetch: async () => {
-      const docs = await fetch(server);
-      return _.get(docs, '[0].state.stats');
-    },
-  };
-}
+  const mapsUsageCollector = usageCollection.makeUsageCollector({
+    type: TELEMETRY_TYPE,
+    isReady: () => true,
+    fetch: async () => await getMapsTelemetry(server),
+  });
 
-export function registerMapsUsageCollector(usageCollection, server) {
-  const collectorObj = buildCollectorObj(server);
-  const mapsUsageCollector = usageCollection.makeUsageCollector(collectorObj);
   usageCollection.registerCollector(mapsUsageCollector);
 }
diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.test.js b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.test.js
index 727d60b5088aa..c5a3fca89b560 100644
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.test.js
+++ b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_usage_collector.test.js
@@ -4,60 +4,32 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import sinon from 'sinon';
-import { getMockCallWithInternal, getMockKbnServer, getMockTaskFetch } from '../test_utils';
-import { buildCollectorObj } from './maps_usage_collector';
+import { initTelemetryCollection } from './maps_usage_collector';
 
 describe('buildCollectorObj#fetch', () => {
-  let mockKbnServer;
+  let makeUsageCollectorStub;
+  let registerStub;
+  let usageCollection;
 
   beforeEach(() => {
-    mockKbnServer = getMockKbnServer();
+    makeUsageCollectorStub = jest.fn();
+    registerStub = jest.fn();
+    usageCollection = {
+      makeUsageCollector: makeUsageCollectorStub,
+      registerCollector: registerStub,
+    };
   });
 
-  test('can return empty stats', async () => {
-    const { type, fetch } = buildCollectorObj(mockKbnServer);
-    expect(type).toBe('maps');
-    const fetchResult = await fetch();
-    expect(fetchResult).toEqual({});
-  });
-
-  test('provides known stats', async () => {
-    const mockTaskFetch = getMockTaskFetch([
-      {
-        state: {
-          runs: 2,
-          stats: { wombat_sightings: { total: 712, max: 84, min: 7, avg: 63 } },
-        },
-      },
-    ]);
-    mockKbnServer = getMockKbnServer(getMockCallWithInternal(), mockTaskFetch);
-
-    const { type, fetch } = buildCollectorObj(mockKbnServer);
-    expect(type).toBe('maps');
-    const fetchResult = await fetch();
-    expect(fetchResult).toEqual({ wombat_sightings: { total: 712, max: 84, min: 7, avg: 63 } });
-  });
-
-  describe('Error handling', () => {
-    test('Silently handles Task Manager NotInitialized', async () => {
-      const mockTaskFetch = sinon.stub();
-      mockTaskFetch.rejects(
-        new Error('NotInitialized taskManager is still waiting for plugins to load')
-      );
-      mockKbnServer = getMockKbnServer(getMockCallWithInternal(), mockTaskFetch);
-
-      const { fetch } = buildCollectorObj(mockKbnServer);
-      await expect(fetch()).resolves.toBe(undefined);
-    });
-    // In real life, the CollectorSet calls fetch and handles errors
-    test('defers the errors', async () => {
-      const mockTaskFetch = sinon.stub();
-      mockTaskFetch.rejects(new Error('Sad violin'));
-      mockKbnServer = getMockKbnServer(getMockCallWithInternal(), mockTaskFetch);
+  test('makes and registers maps usage collector', async () => {
+    const serverPlaceholder = {};
+    initTelemetryCollection(usageCollection, serverPlaceholder);
 
-      const { fetch } = buildCollectorObj(mockKbnServer);
-      await expect(fetch()).rejects.toMatchObject(new Error('Sad violin'));
+    expect(registerStub).toHaveBeenCalledTimes(1);
+    expect(makeUsageCollectorStub).toHaveBeenCalledTimes(1);
+    expect(makeUsageCollectorStub).toHaveBeenCalledWith({
+      type: expect.any(String),
+      isReady: expect.any(Function),
+      fetch: expect.any(Function),
     });
   });
 });
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
deleted file mode 100644
index db5df358abc39..0000000000000
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { getMapsTelemetry } from './maps_telemetry';
-
-const TELEMETRY_TASK_TYPE = 'maps_telemetry';
-
-export const TASK_ID = `Maps-${TELEMETRY_TASK_TYPE}`;
-
-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(() => {
-    // The code block below can't await directly within "afterPluginsInit"
-    // callback due to circular dependency. The server isn't "ready" until
-    // this code block finishes. Migrations wait for server to be ready before
-    // executing. Saved objects repository waits for migrations to finish before
-    // finishing the request. To avoid this, we'll await within a separate
-    // function block.
-    (async () => {
-      try {
-        await taskManager.ensureScheduled({
-          id: TASK_ID,
-          taskType: TELEMETRY_TASK_TYPE,
-          state: { stats: {}, runs: 0 },
-        });
-      } catch (e) {
-        server.log(['warning', 'maps'], `Error scheduling telemetry task, received ${e.message}`);
-      }
-    })();
-  });
-}
-
-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',
-      type: TELEMETRY_TASK_TYPE,
-      timeout: '1m',
-      createTaskRunner: telemetryTaskRunner(server),
-    },
-  });
-}
-
-export function telemetryTaskRunner(server) {
-  return ({ taskInstance }) => {
-    const { state } = taskInstance;
-    const prevState = state;
-
-    const callCluster = server.plugins.elasticsearch.getCluster('admin').callWithInternalUser;
-
-    let mapsTelemetryTask;
-
-    return {
-      async run({ taskCanceled = false } = {}) {
-        try {
-          mapsTelemetryTask = makeCancelable(getMapsTelemetry(server, callCluster), taskCanceled);
-        } catch (err) {
-          server.log(['warning'], `Error loading maps telemetry: ${err}`);
-        } finally {
-          return mapsTelemetryTask.promise
-            .then((mapsTelemetry = {}) => {
-              return {
-                state: {
-                  runs: state.runs || 0 + 1,
-                  stats: mapsTelemetry.attributes || prevState.stats || {},
-                },
-                runAt: getNextMidnight(),
-              };
-            })
-            .catch(errMsg =>
-              server.log(['warning'], `Error executing maps telemetry task: ${errMsg}`)
-            );
-        }
-      },
-      async cancel() {
-        if (mapsTelemetryTask) {
-          mapsTelemetryTask.cancel();
-        } else {
-          server.log(['warning'], `Can not cancel "mapsTelemetryTask", it has not been defined`);
-        }
-      },
-    };
-  };
-}
-
-function makeCancelable(promise, isCanceled) {
-  const logMsg = 'Maps telemetry task has been cancelled';
-  const wrappedPromise = new Promise((resolve, reject) => {
-    promise
-      .then(val => (isCanceled ? reject(logMsg) : resolve(val)))
-      .catch(err => (isCanceled ? reject(logMsg) : reject(err.message)));
-  });
-
-  return {
-    promise: wrappedPromise,
-    cancel() {
-      isCanceled = true;
-    },
-  };
-}
-
-function getNextMidnight() {
-  const nextMidnight = new Date();
-  nextMidnight.setHours(0, 0, 0, 0);
-  nextMidnight.setDate(nextMidnight.getDate() + 1);
-  return nextMidnight;
-}
diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.test.js b/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.test.js
deleted file mode 100644
index ad23ed1634204..0000000000000
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/telemetry_task.test.js
+++ /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 { getMockKbnServer, getMockTaskInstance } from '../test_utils';
-import { telemetryTaskRunner } from './telemetry_task';
-import * as mapsTelemetry from './maps_telemetry';
-jest.mock('./maps_telemetry');
-
-const expectedAttributes = {
-  expect: 'values',
-  toBe: 'populated',
-};
-
-const generateTelemetry = ({ includeAttributes = true } = {}) => {
-  mapsTelemetry.getMapsTelemetry = async () => ({ // eslint-disable-line
-    attributes: includeAttributes ? expectedAttributes : {},
-  });
-};
-
-describe('telemetryTaskRunner', () => {
-  let mockTaskInstance;
-  let mockKbnServer;
-  let taskRunner;
-
-  beforeEach(() => {
-    mockTaskInstance = getMockTaskInstance();
-    mockKbnServer = getMockKbnServer();
-    taskRunner = telemetryTaskRunner(mockKbnServer)({ taskInstance: mockTaskInstance });
-  });
-
-  test('returns empty stats as default', async () => {
-    generateTelemetry({ includeAttributes: false });
-
-    const runResult = await taskRunner.run();
-
-    expect(runResult).toMatchObject({
-      state: {
-        runs: 1,
-        stats: {},
-      },
-    });
-  });
-
-  // Return stats when run normally
-  test('returns stats normally', async () => {
-    generateTelemetry();
-
-    const runResult = await taskRunner.run();
-
-    expect(runResult).toMatchObject({
-      state: {
-        runs: 1,
-        stats: expectedAttributes,
-      },
-    });
-  });
-
-  test('cancels when cancel flag set to "true", returns undefined', async () => {
-    generateTelemetry();
-
-    const runResult = await taskRunner.run({ taskCanceled: true });
-
-    expect(runResult).toBe(undefined);
-  });
-});
diff --git a/x-pack/legacy/plugins/maps/server/plugin.js b/x-pack/legacy/plugins/maps/server/plugin.js
index 080796fd25d82..6009cea330ab0 100644
--- a/x-pack/legacy/plugins/maps/server/plugin.js
+++ b/x-pack/legacy/plugins/maps/server/plugin.js
@@ -5,16 +5,15 @@
  */
 import { i18n } from '@kbn/i18n';
 import { APP_ID, APP_ICON, createMapPath, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
-import { initRoutes } from './routes';
 import { getEcommerceSavedObjects } from './sample_data/ecommerce_saved_objects';
 import { getFlightsSavedObjects } from './sample_data/flights_saved_objects.js';
 import { getWebLogsSavedObjects } from './sample_data/web_logs_saved_objects.js';
-import { checkLicense } from '../check_license';
-import { watchStatusAndLicenseToInitialize } from '../../../server/lib/watch_status_and_license_to_initialize';
+import { LICENSE_CHECK_STATE } from '../../../../plugins/licensing/server';
+import { initRoutes } from './routes';
 
 export class MapPlugin {
   setup(core, plugins, __LEGACY) {
-    const { featuresPlugin } = plugins;
+    const { featuresPlugin, home, licensing } = plugins;
     let routesInitialized = false;
 
     featuresPlugin.registerFeature({
@@ -44,84 +43,79 @@ export class MapPlugin {
       },
     });
 
-    watchStatusAndLicenseToInitialize(
-      __LEGACY.plugins.xpackMainPlugin,
-      __LEGACY.pluginRef,
-      async license => {
-        if (license && license.maps && !routesInitialized) {
-          routesInitialized = true;
-          initRoutes(__LEGACY, license.uid);
-        }
+    licensing.license$.subscribe(license => {
+      const { state } = license.check('maps', 'basic');
+      if (state === LICENSE_CHECK_STATE.Valid && !routesInitialized) {
+        routesInitialized = true;
+        initRoutes(__LEGACY, license.uid);
       }
-    );
-
-    __LEGACY.plugins.xpackMainPlugin.info
-      .feature(APP_ID)
-      .registerLicenseCheckResultsGenerator(checkLicense);
+    });
 
     const sampleDataLinkLabel = i18n.translate('xpack.maps.sampleDataLinkLabel', {
       defaultMessage: 'Map',
     });
-    __LEGACY.addSavedObjectsToSampleDataset('ecommerce', getEcommerceSavedObjects());
+    if (home) {
+      home.sampleData.addSavedObjectsToSampleDataset('ecommerce', getEcommerceSavedObjects());
 
-    __LEGACY.addAppLinksToSampleDataset('ecommerce', [
-      {
-        path: createMapPath('2c9c1f60-1909-11e9-919b-ffe5949a18d2'),
-        label: sampleDataLinkLabel,
-        icon: APP_ICON,
-      },
-    ]);
+      home.sampleData.addAppLinksToSampleDataset('ecommerce', [
+        {
+          path: createMapPath('2c9c1f60-1909-11e9-919b-ffe5949a18d2'),
+          label: sampleDataLinkLabel,
+          icon: APP_ICON,
+        },
+      ]);
 
-    __LEGACY.replacePanelInSampleDatasetDashboard({
-      sampleDataId: 'ecommerce',
-      dashboardId: '722b74f0-b882-11e8-a6d9-e546fe2bba5f',
-      oldEmbeddableId: '9c6f83f0-bb4d-11e8-9c84-77068524bcab',
-      embeddableId: '2c9c1f60-1909-11e9-919b-ffe5949a18d2',
-      embeddableType: 'map',
-      embeddableConfig: {
-        isLayerTOCOpen: false,
-      },
-    });
+      home.sampleData.replacePanelInSampleDatasetDashboard({
+        sampleDataId: 'ecommerce',
+        dashboardId: '722b74f0-b882-11e8-a6d9-e546fe2bba5f',
+        oldEmbeddableId: '9c6f83f0-bb4d-11e8-9c84-77068524bcab',
+        embeddableId: '2c9c1f60-1909-11e9-919b-ffe5949a18d2',
+        embeddableType: 'map',
+        embeddableConfig: {
+          isLayerTOCOpen: false,
+        },
+      });
 
-    __LEGACY.addSavedObjectsToSampleDataset('flights', getFlightsSavedObjects());
+      home.sampleData.addSavedObjectsToSampleDataset('flights', getFlightsSavedObjects());
 
-    __LEGACY.addAppLinksToSampleDataset('flights', [
-      {
-        path: createMapPath('5dd88580-1906-11e9-919b-ffe5949a18d2'),
-        label: sampleDataLinkLabel,
-        icon: APP_ICON,
-      },
-    ]);
+      home.sampleData.addAppLinksToSampleDataset('flights', [
+        {
+          path: createMapPath('5dd88580-1906-11e9-919b-ffe5949a18d2'),
+          label: sampleDataLinkLabel,
+          icon: APP_ICON,
+        },
+      ]);
 
-    __LEGACY.replacePanelInSampleDatasetDashboard({
-      sampleDataId: 'flights',
-      dashboardId: '7adfa750-4c81-11e8-b3d7-01146121b73d',
-      oldEmbeddableId: '334084f0-52fd-11e8-a160-89cc2ad9e8e2',
-      embeddableId: '5dd88580-1906-11e9-919b-ffe5949a18d2',
-      embeddableType: MAP_SAVED_OBJECT_TYPE,
-      embeddableConfig: {
-        isLayerTOCOpen: true,
-      },
-    });
+      home.sampleData.replacePanelInSampleDatasetDashboard({
+        sampleDataId: 'flights',
+        dashboardId: '7adfa750-4c81-11e8-b3d7-01146121b73d',
+        oldEmbeddableId: '334084f0-52fd-11e8-a160-89cc2ad9e8e2',
+        embeddableId: '5dd88580-1906-11e9-919b-ffe5949a18d2',
+        embeddableType: MAP_SAVED_OBJECT_TYPE,
+        embeddableConfig: {
+          isLayerTOCOpen: true,
+        },
+      });
 
-    __LEGACY.addSavedObjectsToSampleDataset('logs', getWebLogsSavedObjects());
-    __LEGACY.addAppLinksToSampleDataset('logs', [
-      {
-        path: createMapPath('de71f4f0-1902-11e9-919b-ffe5949a18d2'),
-        label: sampleDataLinkLabel,
-        icon: APP_ICON,
-      },
-    ]);
-    __LEGACY.replacePanelInSampleDatasetDashboard({
-      sampleDataId: 'logs',
-      dashboardId: 'edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b',
-      oldEmbeddableId: '06cf9c40-9ee8-11e7-8711-e7a007dcef99',
-      embeddableId: 'de71f4f0-1902-11e9-919b-ffe5949a18d2',
-      embeddableType: MAP_SAVED_OBJECT_TYPE,
-      embeddableConfig: {
-        isLayerTOCOpen: false,
-      },
-    });
+      home.sampleData.addSavedObjectsToSampleDataset('logs', getWebLogsSavedObjects());
+      home.sampleData.addAppLinksToSampleDataset('logs', [
+        {
+          path: createMapPath('de71f4f0-1902-11e9-919b-ffe5949a18d2'),
+          label: sampleDataLinkLabel,
+          icon: APP_ICON,
+        },
+      ]);
+      home.sampleData.replacePanelInSampleDatasetDashboard({
+        sampleDataId: 'logs',
+        dashboardId: 'edf84fe0-e1a0-11e7-b6d5-4dc382ef7f5b',
+        oldEmbeddableId: '06cf9c40-9ee8-11e7-8711-e7a007dcef99',
+        embeddableId: 'de71f4f0-1902-11e9-919b-ffe5949a18d2',
+        embeddableType: MAP_SAVED_OBJECT_TYPE,
+        embeddableConfig: {
+          isLayerTOCOpen: false,
+        },
+      });
+    }
 
     __LEGACY.injectUiAppVars(APP_ID, async () => {
       return await __LEGACY.getInjectedUiAppVars('kibana');
diff --git a/x-pack/legacy/plugins/maps/server/routes.js b/x-pack/legacy/plugins/maps/server/routes.js
index e8c8c23ae2ca1..5e9cd3cfa87bd 100644
--- a/x-pack/legacy/plugins/maps/server/routes.js
+++ b/x-pack/legacy/plugins/maps/server/routes.js
@@ -17,10 +17,12 @@ import {
   EMS_TILES_VECTOR_TILE_PATH,
   GIS_API_PATH,
   EMS_SPRITES_PATH,
+  INDEX_SETTINGS_API_PATH,
 } from '../common/constants';
 import { EMSClient } from '@elastic/ems-client';
 import fetch from 'node-fetch';
 import { i18n } from '@kbn/i18n';
+import { getIndexPatternSettings } from './lib/get_index_pattern_settings';
 
 import Boom from 'boom';
 
@@ -414,6 +416,33 @@ export function initRoutes(server, licenseUid) {
     },
   });
 
+  server.route({
+    method: 'GET',
+    path: `/${INDEX_SETTINGS_API_PATH}`,
+    handler: async (request, h) => {
+      const { server, query } = request;
+
+      if (!query.indexPatternTitle) {
+        server.log('warning', `Required query parameter 'indexPatternTitle' not provided.`);
+        return h.response().code(400);
+      }
+
+      const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
+      try {
+        const resp = await callWithRequest(request, 'indices.getSettings', {
+          index: query.indexPatternTitle,
+        });
+        return getIndexPatternSettings(resp);
+      } catch (error) {
+        server.log(
+          'warning',
+          `Cannot load index settings for index pattern '${query.indexPatternTitle}', error: ${error.message}.`
+        );
+        return h.response().code(400);
+      }
+    },
+  });
+
   function checkEMSProxyConfig() {
     if (!mapConfig.proxyElasticMapsServiceInMaps) {
       server.log(
diff --git a/x-pack/legacy/plugins/ml/common/constants/license.ts b/x-pack/legacy/plugins/ml/common/constants/license.ts
index 23663db69b050..2027e2c8b1865 100644
--- a/x-pack/legacy/plugins/ml/common/constants/license.ts
+++ b/x-pack/legacy/plugins/ml/common/constants/license.ts
@@ -6,5 +6,5 @@
 
 export enum LICENSE_TYPE {
   BASIC,
-  FULL, // platinum or trial
+  FULL, // >= platinum
 }
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 757dfbd7a9a77..8982cebed522e 100644
--- a/x-pack/legacy/plugins/ml/common/util/job_utils.js
+++ b/x-pack/legacy/plugins/ml/common/util/job_utils.js
@@ -521,7 +521,7 @@ export function validateModelMemoryLimitUnits(modelMemoryLimit) {
   let valid = true;
 
   if (modelMemoryLimit !== undefined) {
-    const mml = modelMemoryLimit.toUpperCase();
+    const mml = String(modelMemoryLimit).toUpperCase();
     const mmlSplit = mml.match(/\d+(\w+)$/);
     const unit = mmlSplit && mmlSplit.length === 2 ? mmlSplit[1] : null;
 
diff --git a/x-pack/legacy/plugins/ml/index.ts b/x-pack/legacy/plugins/ml/index.ts
index 3078a0c812ff1..c4289389b0d56 100755
--- a/x-pack/legacy/plugins/ml/index.ts
+++ b/x-pack/legacy/plugins/ml/index.ts
@@ -78,17 +78,18 @@ export const ml = (kibana: any) => {
       };
 
       const core: MlCoreSetup = {
-        addAppLinksToSampleDataset: server.addAppLinksToSampleDataset,
         injectUiAppVars: server.injectUiAppVars,
         http: mlHttpService,
         savedObjects: server.savedObjects,
+        elasticsearch: kbnServer.newPlatform.setup.core.elasticsearch, // NP
       };
-      const { usageCollection, cloud } = kbnServer.newPlatform.setup.plugins;
+      const { usageCollection, cloud, home } = kbnServer.newPlatform.setup.plugins;
       const plugins = {
-        elasticsearch: server.plugins.elasticsearch,
+        elasticsearch: server.plugins.elasticsearch, // legacy
         security: server.plugins.security,
         xpackMain: server.plugins.xpack_main,
         spaces: server.plugins.spaces,
+        home,
         usageCollection: usageCollection as UsageCollectionSetup,
         cloud: cloud as CloudSetup,
         ml: this,
diff --git a/x-pack/legacy/plugins/ml/public/application/components/annotations/annotations_table/__snapshots__/annotations_table.test.js.snap b/x-pack/legacy/plugins/ml/public/application/components/annotations/annotations_table/__snapshots__/annotations_table.test.js.snap
index dc280184cb8e2..1d95c217e10f7 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/annotations/annotations_table/__snapshots__/annotations_table.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/components/annotations/annotations_table/__snapshots__/annotations_table.test.js.snap
@@ -54,7 +54,6 @@ exports[`AnnotationsTable Initialization with annotations prop. 1`] = `
       ]
     }
     compressed={true}
-    executeQueryOptions={Object {}}
     items={
       Array [
         Object {
diff --git a/x-pack/legacy/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx b/x-pack/legacy/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
index 42a3e97509452..aa28831e8d807 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
@@ -7,10 +7,7 @@
 import classNames from 'classnames';
 import React, { useRef, FC } from 'react';
 import { TooltipValueFormatter } from '@elastic/charts';
-
-// TODO: Below import is temporary, use `react-use` lib instead.
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { useObservable } from '../../../../../../../../src/plugins/kibana_react/public/util/use_observable';
+import useObservable from 'react-use/lib/useObservable';
 
 import { chartTooltip$, ChartTooltipValue } from './chart_tooltip_service';
 
diff --git a/x-pack/legacy/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts b/x-pack/legacy/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
index 94a502e6eadde..4258b3761f72c 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
+++ b/x-pack/legacy/plugins/ml/public/application/components/data_recognizer/data_recognizer.d.ts
@@ -5,13 +5,12 @@
  */
 
 import { FC } from 'react';
-
-import { IndexPattern } from 'ui/index_patterns';
 import { SavedSearchSavedObject } from '../../../../common/types/kibana';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/public';
 
 declare const DataRecognizer: FC<{
   indexPattern: IndexPattern;
-  savedSearch?: SavedSearchSavedObject | null;
+  savedSearch: SavedSearchSavedObject | null;
   results: {
     count: number;
     onChange?: Function;
diff --git a/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx b/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
index 38e4a3fc24278..a4e2ebe6784d8 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
@@ -6,9 +6,9 @@
 
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { IndexPattern } from 'ui/index_patterns';
 import { FullTimeRangeSelector } from './index';
 import { Query } from 'src/plugins/data/public';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/public';
 
 // Create a mock for the setFullTimeRange function in the service.
 // The mock is hoisted to the top, so need to prefix the mock function
diff --git a/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
index f637ffb9beea0..ef2a4c28a570d 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
@@ -8,9 +8,9 @@ import React, { FC } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Query } from 'src/plugins/data/public';
-import { IndexPattern } from 'ui/index_patterns';
 import { EuiButton } from '@elastic/eui';
 import { setFullTimeRange } from './full_time_range_selector_service';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/public';
 
 interface Props {
   indexPattern: IndexPattern;
diff --git a/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts b/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
index bd31ccf7eca3d..e69aaf2ede037 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
+++ b/x-pack/legacy/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector_service.ts
@@ -7,12 +7,12 @@
 import moment from 'moment';
 
 import { i18n } from '@kbn/i18n';
-import { IndexPattern } from 'ui/index_patterns';
 import { toastNotifications } from 'ui/notify';
 import { timefilter } from 'ui/timefilter';
 import { Query } from 'src/plugins/data/public';
 import dateMath from '@elastic/datemath';
 import { ml, GetTimeFieldRangeResponse } from '../../services/ml_api_service';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/public';
 
 export interface TimeRange {
   from: number;
diff --git a/x-pack/legacy/plugins/ml/public/application/components/job_messages/job_messages.tsx b/x-pack/legacy/plugins/ml/public/application/components/job_messages/job_messages.tsx
index 5fb3ab95e4ea0..9cea47ded09b4 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/job_messages/job_messages.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/components/job_messages/job_messages.tsx
@@ -61,8 +61,8 @@ export const JobMessages: FC<JobMessagesProps> = ({ messages, loading, error })
 
   const defaultSorting = {
     sort: {
-      field: 'timestamp',
-      direction: 'asc',
+      field: 'timestamp' as const,
+      direction: 'asc' as const,
     },
   };
 
@@ -74,7 +74,6 @@ export const JobMessages: FC<JobMessagesProps> = ({ messages, loading, error })
         items={messages}
         columns={columns}
         sorting={defaultSorting}
-        // @ts-ignore
         compressed={true}
         loading={loading}
         error={error}
diff --git a/x-pack/legacy/plugins/ml/public/application/components/ml_in_memory_table/types.ts b/x-pack/legacy/plugins/ml/public/application/components/ml_in_memory_table/types.ts
index 49d831de47387..ee0540f6d5825 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/ml_in_memory_table/types.ts
+++ b/x-pack/legacy/plugins/ml/public/application/components/ml_in_memory_table/types.ts
@@ -6,7 +6,7 @@
 
 import { Component, HTMLAttributes, ReactElement, ReactNode } from 'react';
 
-import { CommonProps, EuiInMemoryTable } from '@elastic/eui';
+import { Direction, CommonProps, EuiInMemoryTable } from '@elastic/eui';
 
 // Not using an enum here because the original HorizontalAlignment is also a union type of string.
 type HorizontalAlignment = 'left' | 'center' | 'right';
@@ -66,11 +66,9 @@ interface CustomItemActionType<T> {
   isPrimary?: boolean;
 }
 
-export interface ExpanderColumnType {
+export interface ExpanderColumnType<T> extends ComputedColumnType<T> {
   align?: HorizontalAlignment;
-  width?: string;
-  isExpander: boolean;
-  render: RenderFunc;
+  isExpander: true;
 }
 
 type SupportedItemActionType<T> = DefaultItemActionType<T> | CustomItemActionType<T>;
@@ -85,7 +83,7 @@ export interface ActionsColumnType<T> {
 export type ColumnType<T> =
   | ActionsColumnType<T>
   | ComputedColumnType<T>
-  | ExpanderColumnType
+  | ExpanderColumnType<T>
   | FieldDataColumnType<T>;
 
 type QueryType = any;
@@ -143,19 +141,24 @@ export enum SORT_DIRECTION {
   ASC = 'asc',
   DESC = 'desc',
 }
-export type SortDirection = SORT_DIRECTION.ASC | SORT_DIRECTION.DESC;
+export type SortDirection = SORT_DIRECTION.ASC | SORT_DIRECTION.DESC | 'asc' | 'desc';
+interface SortFields {
+  field: string;
+  direction: SortDirection | Direction;
+}
 export interface Sorting {
-  sort: {
-    field: string;
-    direction: SortDirection;
-  };
+  sort?: SortFields;
 }
-export type SortingPropType = boolean | Sorting;
+export type SortingPropType =
+  | boolean
+  | {
+      sort: SortFields;
+    };
 
 type SelectionType = any;
 
 export interface OnTableChangeArg extends Sorting {
-  page: { index: number; size: number };
+  page?: { index: number; size: number };
 }
 
 type ItemIdTypeFunc = <T>(item: T) => string;
diff --git a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/condition_expression.test.js.snap b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/condition_expression.test.js.snap
index d11234001a664..177ba5019fbe3 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/condition_expression.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/condition_expression.test.js.snap
@@ -184,9 +184,6 @@ exports[`ConditionExpression renders with appliesTo, operator and value supplied
               }
             >
               <EuiFieldNumber
-                compressed={false}
-                fullWidth={false}
-                isLoading={false}
                 onChange={[Function]}
                 value={123}
               />
@@ -392,9 +389,6 @@ exports[`ConditionExpression renders with only value supplied 1`] = `
               }
             >
               <EuiFieldNumber
-                compressed={false}
-                fullWidth={false}
-                isLoading={false}
                 onChange={[Function]}
                 value={123}
               />
diff --git a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
index 11dca03c938a2..3b14025e9cb7b 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap
@@ -26,7 +26,7 @@ exports[`RuleEditorFlyout renders the flyout after adding a condition to a rule
           id="flyoutTitle"
         >
           <FormattedMessage
-            defaultMessage="Create Rule"
+            defaultMessage="Create rule"
             id="xpack.ml.ruleEditor.ruleEditorFlyout.createRuleTitle"
             values={Object {}}
           />
@@ -101,7 +101,7 @@ exports[`RuleEditorFlyout renders the flyout after adding a condition to a rule
             values={
               Object {
                 "learnMoreLink": <ForwardRef
-                  href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/ml-rules.html"
+                  href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-rules.html"
                   target="_blank"
                 >
                   <FormattedMessage
@@ -276,7 +276,7 @@ exports[`RuleEditorFlyout renders the flyout after setting the rule to edit 1`]
           id="flyoutTitle"
         >
           <FormattedMessage
-            defaultMessage="Edit Rule"
+            defaultMessage="Edit rule"
             id="xpack.ml.ruleEditor.ruleEditorFlyout.editRuleTitle"
             values={Object {}}
           />
@@ -365,7 +365,7 @@ exports[`RuleEditorFlyout renders the flyout after setting the rule to edit 1`]
             values={
               Object {
                 "learnMoreLink": <ForwardRef
-                  href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/ml-rules.html"
+                  href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-rules.html"
                   target="_blank"
                 >
                   <FormattedMessage
@@ -540,7 +540,7 @@ exports[`RuleEditorFlyout renders the flyout for creating a rule with conditions
           id="flyoutTitle"
         >
           <FormattedMessage
-            defaultMessage="Create Rule"
+            defaultMessage="Create rule"
             id="xpack.ml.ruleEditor.ruleEditorFlyout.createRuleTitle"
             values={Object {}}
           />
@@ -615,7 +615,7 @@ exports[`RuleEditorFlyout renders the flyout for creating a rule with conditions
             values={
               Object {
                 "learnMoreLink": <ForwardRef
-                  href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/ml-rules.html"
+                  href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-rules.html"
                   target="_blank"
                 >
                   <FormattedMessage
@@ -782,7 +782,7 @@ exports[`RuleEditorFlyout renders the select action component for a detector wit
           id="flyoutTitle"
         >
           <FormattedMessage
-            defaultMessage="Edit Rules"
+            defaultMessage="Edit rules"
             id="xpack.ml.ruleEditor.ruleEditorFlyout.editRulesTitle"
             values={Object {}}
           />
diff --git a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
index 032bb92418c12..1f66cf95553b9 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
+++ b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
@@ -56,7 +56,7 @@ import { metadata } from 'ui/metadata';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
 
 // metadata.branch corresponds to the version used in documentation links.
-const docsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-rules.html`;
+const docsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-rules.html`;
 
 export const RuleEditorFlyout = injectI18n(
   class RuleEditorFlyout extends Component {
@@ -510,7 +510,7 @@ export const RuleEditorFlyout = injectI18n(
                 <h1 id="flyoutTitle">
                   <FormattedMessage
                     id="xpack.ml.ruleEditor.ruleEditorFlyout.editRulesTitle"
-                    defaultMessage="Edit Rules"
+                    defaultMessage="Edit rules"
                   />
                 </h1>
               </EuiTitle>
@@ -569,12 +569,12 @@ export const RuleEditorFlyout = injectI18n(
                   {isCreate === true ? (
                     <FormattedMessage
                       id="xpack.ml.ruleEditor.ruleEditorFlyout.createRuleTitle"
-                      defaultMessage="Create Rule"
+                      defaultMessage="Create rule"
                     />
                   ) : (
                     <FormattedMessage
                       id="xpack.ml.ruleEditor.ruleEditorFlyout.editRuleTitle"
-                      defaultMessage="Edit Rule"
+                      defaultMessage="Edit rule"
                     />
                   )}
                 </h1>
diff --git a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/edit_condition_link.test.js.snap b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/edit_condition_link.test.js.snap
index ba44032afb3c2..a367dd82a91ab 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/edit_condition_link.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/edit_condition_link.test.js.snap
@@ -27,8 +27,6 @@ exports[`EditConditionLink renders for a condition using actual 1`] = `
     <EuiFieldNumber
       aria-label="Enter numeric value for condition"
       compressed={true}
-      fullWidth={false}
-      isLoading={false}
       onChange={[Function]}
       placeholder="Enter value"
       value={210}
@@ -78,8 +76,6 @@ exports[`EditConditionLink renders for a condition using diff from typical 1`] =
     <EuiFieldNumber
       aria-label="Enter numeric value for condition"
       compressed={true}
-      fullWidth={false}
-      isLoading={false}
       onChange={[Function]}
       placeholder="Enter value"
       value={208.8}
@@ -129,8 +125,6 @@ exports[`EditConditionLink renders for a condition using typical 1`] = `
     <EuiFieldNumber
       aria-label="Enter numeric value for condition"
       compressed={true}
-      fullWidth={false}
-      isLoading={false}
       onChange={[Function]}
       placeholder="Enter value"
       value={1.23}
diff --git a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/rule_action_panel.test.js.snap b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/rule_action_panel.test.js.snap
index 463d0b5dbed53..d82f78cbc4e1a 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/rule_action_panel.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/rule_action_panel.test.js.snap
@@ -11,7 +11,7 @@ exports[`RuleActionPanel renders panel for rule with a condition 1`] = `
         Object {
           "description": "skip result when actual is less than 1",
           "title": <FormattedMessage
-            defaultMessage="rule"
+            defaultMessage="Rule"
             id="xpack.ml.ruleEditor.ruleActionPanel.ruleTitle"
             values={Object {}}
           />,
@@ -40,7 +40,11 @@ exports[`RuleActionPanel renders panel for rule with a condition 1`] = `
             conditionValue={1}
             updateConditionValue={[Function]}
           />,
-          "title": "actions",
+          "title": <FormattedMessage
+            defaultMessage="Actions"
+            id="xpack.ml.ruleEditor.ruleActionPanel.actionsTitle"
+            values={Object {}}
+          />,
         },
         Object {
           "description": <ForwardRef
@@ -79,7 +83,7 @@ exports[`RuleActionPanel renders panel for rule with a condition and scope, valu
         Object {
           "description": "skip model update when airline is not in eu-airlines",
           "title": <FormattedMessage
-            defaultMessage="rule"
+            defaultMessage="Rule"
             id="xpack.ml.ruleEditor.ruleActionPanel.ruleTitle"
             values={Object {}}
           />,
@@ -90,7 +94,11 @@ exports[`RuleActionPanel renders panel for rule with a condition and scope, valu
             fieldValue="AAL"
             filterId="eu-airlines"
           />,
-          "title": "actions",
+          "title": <FormattedMessage
+            defaultMessage="Actions"
+            id="xpack.ml.ruleEditor.ruleActionPanel.actionsTitle"
+            values={Object {}}
+          />,
         },
         Object {
           "description": <ForwardRef
@@ -129,7 +137,7 @@ exports[`RuleActionPanel renders panel for rule with scope, value in filter list
         Object {
           "description": "skip model update when airline is not in eu-airlines",
           "title": <FormattedMessage
-            defaultMessage="rule"
+            defaultMessage="Rule"
             id="xpack.ml.ruleEditor.ruleActionPanel.ruleTitle"
             values={Object {}}
           />,
@@ -144,7 +152,11 @@ exports[`RuleActionPanel renders panel for rule with scope, value in filter list
               values={Object {}}
             />
           </ForwardRef>,
-          "title": "actions",
+          "title": <FormattedMessage
+            defaultMessage="Actions"
+            id="xpack.ml.ruleEditor.ruleActionPanel.actionsTitle"
+            values={Object {}}
+          />,
         },
         Object {
           "description": <DeleteRuleModal
diff --git a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.js b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.js
index 793f4e1772a1b..ec966ec8bcded 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.js
+++ b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.js
@@ -153,7 +153,7 @@ export class RuleActionPanel extends Component {
         title: (
           <FormattedMessage
             id="xpack.ml.ruleEditor.ruleActionPanel.ruleTitle"
-            defaultMessage="rule"
+            defaultMessage="Rule"
           />
         ),
         description: buildRuleDescription(this.rule, this.props.anomaly),
@@ -186,7 +186,12 @@ export class RuleActionPanel extends Component {
       });
     }
 
-    descriptionListItems[1].title = 'actions';
+    descriptionListItems[1].title = (
+      <FormattedMessage
+        id="xpack.ml.ruleEditor.ruleActionPanel.actionsTitle"
+        defaultMessage="Actions"
+      />
+    );
 
     return (
       <EuiPanel paddingSize="m" className="select-rule-action-panel">
diff --git a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/select_rule_action.js b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/select_rule_action.js
index 4d7a8f1b67b74..309e271ad26a4 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/select_rule_action.js
+++ b/x-pack/legacy/plugins/ml/public/application/components/rule_editor/select_rule_action/select_rule_action.js
@@ -59,7 +59,7 @@ export function SelectRuleAction({
           <EuiText style={{ display: 'inline' }}>
             <FormattedMessage
               id="xpack.ml.ruleEditor.selectRuleAction.orText"
-              defaultMessage="or&nbsp;"
+              defaultMessage="Or&nbsp;"
             />
           </EuiText>
         </React.Fragment>
diff --git a/x-pack/legacy/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap b/x-pack/legacy/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap
index 9ba92a3aa1677..fb6b9c7c9db66 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/components/validate_job/__snapshots__/validate_job_view.test.js.snap
@@ -60,7 +60,7 @@ exports[`ValidateJob renders button and modal with a message 1`] = `
           values={
             Object {
               "mlJobTipsLink": <ForwardRef
-                href="https://www.elastic.co/guide/en/kibana/jest-metadata-mock-branch/job-tips.html"
+                href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/create-jobs.html#job-tips"
                 target="_blank"
               >
                 <FormattedMessage
@@ -150,7 +150,7 @@ exports[`ValidateJob renders the button and modal with a success message 1`] = `
           values={
             Object {
               "mlJobTipsLink": <ForwardRef
-                href="https://www.elastic.co/guide/en/kibana/jest-metadata-mock-branch/job-tips.html"
+                href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/create-jobs.html#job-tips"
                 target="_blank"
               >
                 <FormattedMessage
diff --git a/x-pack/legacy/plugins/ml/public/application/components/validate_job/validate_job_view.js b/x-pack/legacy/plugins/ml/public/application/components/validate_job/validate_job_view.js
index fc78eed60a7a0..9b92265c4034b 100644
--- a/x-pack/legacy/plugins/ml/public/application/components/validate_job/validate_job_view.js
+++ b/x-pack/legacy/plugins/ml/public/application/components/validate_job/validate_job_view.js
@@ -27,7 +27,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { metadata } from 'ui/metadata';
 // metadata.branch corresponds to the version used in documentation links.
-const jobTipsUrl = `https://www.elastic.co/guide/en/kibana/${metadata.branch}/job-tips.html`;
+const jobTipsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/create-jobs.html#job-tips`;
 
 // don't use something like plugins/ml/../common
 // because it won't work with the jest tests
diff --git a/x-pack/legacy/plugins/ml/public/application/contexts/kibana/__mocks__/index_pattern.ts b/x-pack/legacy/plugins/ml/public/application/contexts/kibana/__mocks__/index_pattern.ts
index a9f30a904d54b..6a85c18de6d31 100644
--- a/x-pack/legacy/plugins/ml/public/application/contexts/kibana/__mocks__/index_pattern.ts
+++ b/x-pack/legacy/plugins/ml/public/application/contexts/kibana/__mocks__/index_pattern.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
 
 export const indexPatternMock = ({
   id: 'the-index-pattern-id',
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/common/analytics.ts b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
index cadc1f01c6dda..3dd98395ef701 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
@@ -58,6 +58,23 @@ export enum INDEX_STATUS {
   ERROR,
 }
 
+export interface FieldSelectionItem {
+  name: string;
+  mappings_types: string[];
+  is_included: boolean;
+  is_required: boolean;
+  feature_type?: string;
+  reason?: string;
+}
+
+export interface DfAnalyticsExplainResponse {
+  field_selection: FieldSelectionItem[];
+  memory_estimation: {
+    expected_memory_without_disk: string;
+    expected_memory_with_disk: string;
+  };
+}
+
 export interface Eval {
   meanSquaredError: number | string;
   rSquared: number | string;
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_button/create_analytics_button.test.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_button/create_analytics_button.test.tsx
index 15f30b6cca6c4..abb35e50ec2a2 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_button/create_analytics_button.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_button/create_analytics_button.test.tsx
@@ -15,11 +15,6 @@ import { kibanaContextValueMock } from '../../../../../contexts/kibana/__mocks__
 
 import { useCreateAnalyticsForm } from '../../hooks/use_create_analytics_form';
 
-jest.mock('ui/index_patterns', () => ({
-  validateIndexPattern: () => true,
-  INDEX_PATTERN_ILLEGAL_CHARACTERS: [],
-}));
-
 const getMountedHook = () =>
   mountHook(
     () => useCreateAnalyticsForm(),
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_flyout/create_analytics_flyout.test.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_flyout/create_analytics_flyout.test.tsx
index 880a1354e7a64..d5d509826667c 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_flyout/create_analytics_flyout.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_flyout/create_analytics_flyout.test.tsx
@@ -15,11 +15,6 @@ import { kibanaContextValueMock } from '../../../../../contexts/kibana/__mocks__
 
 import { useCreateAnalyticsForm } from '../../hooks/use_create_analytics_form';
 
-jest.mock('ui/index_patterns', () => ({
-  validateIndexPattern: () => true,
-  INDEX_PATTERN_ILLEGAL_CHARACTERS: [],
-}));
-
 const getMountedHook = () =>
   mountHook(
     () => useCreateAnalyticsForm(),
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.test.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.test.tsx
index 49381e3b1c031..d01bae9616708 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.test.tsx
@@ -15,11 +15,6 @@ import { kibanaContextValueMock } from '../../../../../contexts/kibana/__mocks__
 
 import { useCreateAnalyticsForm } from '../../hooks/use_create_analytics_form';
 
-jest.mock('ui/index_patterns', () => ({
-  validateIndexPattern: () => true,
-  INDEX_PATTERN_ILLEGAL_CHARACTERS: [],
-}));
-
 const getMountedHook = () =>
   mountHook(
     () => useCreateAnalyticsForm(),
@@ -45,7 +40,7 @@ describe('Data Frame Analytics: <CreateAnalyticsForm />', () => {
     );
 
     const euiFormRows = wrapper.find('EuiFormRow');
-    expect(euiFormRows.length).toBe(8);
+    expect(euiFormRows.length).toBe(9);
 
     const row1 = euiFormRows.at(0);
     expect(row1.find('label').text()).toBe('Job type');
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx
index e2106e56e0346..e68523733254e 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/create_analytics_form.tsx
@@ -8,6 +8,7 @@ import React, { Fragment, FC, useEffect } from 'react';
 
 import {
   EuiComboBox,
+  EuiComboBoxOptionProps,
   EuiForm,
   EuiFieldText,
   EuiFormRow,
@@ -21,10 +22,8 @@ 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';
 import { ml } from '../../../../../services/ml_api_service';
-import { Field, EVENT_RATE_FIELD_ID } from '../../../../../../../common/types/fields';
-
+import { Field } from '../../../../../../../common/types/fields';
 import { newJobCapsService } from '../../../../../services/new_job_capabilities_service';
 import { useKibanaContext } from '../../../../../contexts/kibana';
 import { CreateAnalyticsFormProps } from '../../hooks/use_create_analytics_form';
@@ -38,32 +37,16 @@ import { Messages } from './messages';
 import { JobType } from './job_type';
 import { JobDescriptionInput } from './job_description';
 import { mmlUnitInvalidErrorMessage } from '../../hooks/use_create_analytics_form/reducer';
-
-// based on code used by `ui/index_patterns` internally
-// remove the space character from the list of illegal characters
-INDEX_PATTERN_ILLEGAL_CHARACTERS.pop();
-const characterList = INDEX_PATTERN_ILLEGAL_CHARACTERS.join(', ');
-
-const NUMERICAL_FIELD_TYPES = new Set([
-  'long',
-  'integer',
-  'short',
-  'byte',
-  'double',
-  'float',
-  'half_float',
-  'scaled_float',
-]);
-
-const SUPPORTED_CLASSIFICATION_FIELD_TYPES = new Set(['boolean', 'text', 'keyword', 'ip']);
-
-// List of system fields we want to ignore for the numeric field check.
-const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score'];
+import {
+  IndexPattern,
+  indexPatterns,
+} from '../../../../../../../../../../../src/plugins/data/public';
+import { DfAnalyticsExplainResponse, FieldSelectionItem } from '../../../../common/analytics';
+import { shouldAddAsDepVarOption, OMIT_FIELDS } from './form_options_validation';
 
 export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, state }) => {
   const { setFormState } = actions;
   const kibanaContext = useKibanaContext();
-
   const { form, indexPatternsMap, isAdvancedEditorEnabled, isJobCreated, requestMessages } = state;
 
   const {
@@ -77,15 +60,22 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
     destinationIndexNameExists,
     destinationIndexNameValid,
     destinationIndexPatternTitleExists,
+    excludes,
+    excludesOptions,
+    fieldOptionsFetchFail,
     jobId,
     jobIdEmpty,
     jobIdExists,
     jobIdValid,
     jobIdInvalidMaxLength,
     jobType,
-    loadingDepFieldOptions,
+    loadingDepVarOptions,
+    loadingFieldOptions,
+    maxDistinctValuesError,
     modelMemoryLimit,
     modelMemoryLimitUnitValid,
+    previousJobType,
+    previousSourceIndex,
     sourceIndex,
     sourceIndexNameEmpty,
     sourceIndexNameValid,
@@ -93,6 +83,10 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
     sourceIndexFieldsCheckFailed,
     trainingPercent,
   } = form;
+  const characterList = indexPatterns.ILLEGAL_CHARACTERS_VISIBLE.join(', ');
+
+  const isJobTypeWithDepVar =
+    jobType === JOB_TYPES.REGRESSION || jobType === JOB_TYPES.CLASSIFICATION;
 
   // 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.
@@ -116,42 +110,99 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
     }
   };
 
-  // Regression supports numeric fields. Classification supports numeric, boolean, text, keyword and ip.
-  const shouldAddFieldOption = (field: Field) => {
-    if (field.id === EVENT_RATE_FIELD_ID) return false;
+  const onCreateOption = (searchValue: string, flattenedOptions: EuiComboBoxOptionProps[]) => {
+    const normalizedSearchValue = searchValue.trim().toLowerCase();
 
-    const isNumerical = NUMERICAL_FIELD_TYPES.has(field.type);
-    const isSupportedByClassification =
-      isNumerical || SUPPORTED_CLASSIFICATION_FIELD_TYPES.has(field.type);
+    if (!normalizedSearchValue) {
+      return;
+    }
+
+    const newOption = {
+      label: searchValue,
+    };
 
-    if (jobType === JOB_TYPES.REGRESSION) return isNumerical;
-    if (jobType === JOB_TYPES.CLASSIFICATION) return isNumerical || isSupportedByClassification;
+    // Create the option if it doesn't exist.
+    if (
+      !flattenedOptions.some(
+        (option: EuiComboBoxOptionProps) =>
+          option.label.trim().toLowerCase() === normalizedSearchValue
+      )
+    ) {
+      excludesOptions.push(newOption);
+      setFormState({ excludes: [...excludes, newOption.label] });
+    }
   };
 
-  const debouncedMmlEstimateLoad = debounce(async () => {
+  const debouncedGetExplainData = debounce(async () => {
+    // Reset if sourceIndex or jobType changes (jobType requires dependent_variable to be set -
+    // which won't be the case if switching from outlier detection)
+    if (previousSourceIndex !== sourceIndex || previousJobType !== jobType) {
+      setFormState({
+        loadingFieldOptions: true,
+      });
+    }
+
     try {
       const jobConfig = getJobConfigFromFormState(form);
       delete jobConfig.dest;
       delete jobConfig.model_memory_limit;
-      const resp = await ml.dataFrameAnalytics.estimateDataFrameAnalyticsMemoryUsage(jobConfig);
-      setFormState({
-        modelMemoryLimit: resp.memory_estimation?.expected_memory_without_disk,
-      });
+      delete jobConfig.analyzed_fields;
+      const resp: DfAnalyticsExplainResponse = await ml.dataFrameAnalytics.explainDataFrameAnalytics(
+        jobConfig
+      );
+
+      // If sourceIndex has changed load analysis field options again
+      if (previousSourceIndex !== sourceIndex || previousJobType !== jobType) {
+        const analyzedFieldsOptions: EuiComboBoxOptionProps[] = [];
+
+        if (resp.field_selection) {
+          resp.field_selection.forEach((selectedField: FieldSelectionItem) => {
+            if (selectedField.is_included === true && selectedField.name !== dependentVariable) {
+              analyzedFieldsOptions.push({ label: selectedField.name });
+            }
+          });
+        }
+
+        setFormState({
+          modelMemoryLimit: resp.memory_estimation?.expected_memory_without_disk,
+          excludesOptions: analyzedFieldsOptions,
+          loadingFieldOptions: false,
+          fieldOptionsFetchFail: false,
+          maxDistinctValuesError: undefined,
+        });
+      } else {
+        setFormState({
+          modelMemoryLimit: resp.memory_estimation?.expected_memory_without_disk,
+        });
+      }
     } catch (e) {
+      let errorMessage;
+      if (
+        jobType === JOB_TYPES.CLASSIFICATION &&
+        e.message !== undefined &&
+        e.message.includes('status_exception') &&
+        e.message.includes('must have at most')
+      ) {
+        errorMessage = e.message;
+      }
       setFormState({
+        fieldOptionsFetchFail: true,
+        maxDistinctValuesError: errorMessage,
+        loadingFieldOptions: false,
         modelMemoryLimit:
           jobType !== undefined
             ? DEFAULT_MODEL_MEMORY_LIMIT[jobType]
             : DEFAULT_MODEL_MEMORY_LIMIT.outlier_detection,
       });
     }
-  }, 500);
+  }, 400);
 
-  const loadDependentFieldOptions = async () => {
+  const loadDepVarOptions = async () => {
     setFormState({
-      loadingDepFieldOptions: true,
+      loadingDepVarOptions: true,
+      // clear when the source index changes
       dependentVariable: '',
-      // Reset outlier detection sourceIndex checks to default values if we've switched to regression
+      maxDistinctValuesError: undefined,
       sourceIndexFieldsCheckFailed: false,
       sourceIndexContainsNumericalFields: true,
     });
@@ -164,22 +215,23 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
         await newJobCapsService.initializeFromIndexPattern(indexPattern);
         // Get fields and filter for supported types for job type
         const { fields } = newJobCapsService;
-        const options: Array<{ label: string }> = [];
+
+        const depVarOptions: EuiComboBoxOptionProps[] = [];
 
         fields.forEach((field: Field) => {
-          if (shouldAddFieldOption(field)) {
-            options.push({ label: field.id });
+          if (shouldAddAsDepVarOption(field, jobType)) {
+            depVarOptions.push({ label: field.id });
           }
         });
 
         setFormState({
-          dependentVariableOptions: options,
-          loadingDepFieldOptions: false,
+          dependentVariableOptions: depVarOptions,
+          loadingDepVarOptions: false,
           dependentVariableFetchFail: false,
         });
       }
     } catch (e) {
-      setFormState({ loadingDepFieldOptions: false, dependentVariableFetchFail: true });
+      setFormState({ loadingDepVarOptions: false, dependentVariableFetchFail: true });
     }
   };
 
@@ -211,13 +263,21 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
     return errors;
   };
 
+  const onSourceIndexChange = (selectedOptions: EuiComboBoxOptionProps[]) => {
+    setFormState({
+      excludes: [],
+      excludesOptions: [],
+      previousSourceIndex: sourceIndex,
+      sourceIndex: selectedOptions[0].label || '',
+    });
+  };
+
   useEffect(() => {
-    if (
-      (jobType === JOB_TYPES.REGRESSION || jobType === JOB_TYPES.CLASSIFICATION) &&
-      sourceIndexNameEmpty === false
-    ) {
-      loadDependentFieldOptions();
-    } else if (jobType === JOB_TYPES.OUTLIER_DETECTION && sourceIndexNameEmpty === false) {
+    if (isJobTypeWithDepVar && sourceIndexNameEmpty === false) {
+      loadDepVarOptions();
+    }
+
+    if (jobType === JOB_TYPES.OUTLIER_DETECTION && sourceIndexNameEmpty === false) {
       validateSourceIndexFields();
     }
   }, [sourceIndex, jobType, sourceIndexNameEmpty]);
@@ -225,21 +285,18 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
   useEffect(() => {
     const hasBasicRequiredFields =
       jobType !== undefined && sourceIndex !== '' && sourceIndexNameValid === true;
-    const jobTypesWithDepVar =
-      jobType === JOB_TYPES.REGRESSION || jobType === JOB_TYPES.CLASSIFICATION;
 
     const hasRequiredAnalysisFields =
-      (jobTypesWithDepVar && dependentVariable !== '' && trainingPercent !== undefined) ||
-      jobType === JOB_TYPES.OUTLIER_DETECTION;
+      (isJobTypeWithDepVar && dependentVariable !== '') || jobType === JOB_TYPES.OUTLIER_DETECTION;
 
     if (hasBasicRequiredFields && hasRequiredAnalysisFields) {
-      debouncedMmlEstimateLoad();
+      debouncedGetExplainData();
     }
 
     return () => {
-      debouncedMmlEstimateLoad.cancel();
+      debouncedGetExplainData.cancel();
     };
-  }, [jobType, sourceIndex, dependentVariable, trainingPercent]);
+  }, [jobType, sourceIndex, sourceIndexNameEmpty, dependentVariable, trainingPercent]);
 
   return (
     <EuiForm className="mlDataFrameAnalyticsCreateForm">
@@ -356,9 +413,7 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
                   selectedOptions={
                     indexPatternsMap[sourceIndex] !== undefined ? [{ label: sourceIndex }] : []
                   }
-                  onChange={selectedOptions =>
-                    setFormState({ sourceIndex: selectedOptions[0].label || '' })
-                  }
+                  onChange={onSourceIndexChange}
                   isClearable={false}
                   data-test-subj="mlAnalyticsCreateJobFlyoutSourceIndexSelect"
                 />
@@ -432,6 +487,27 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
           </EuiFormRow>
           {(jobType === JOB_TYPES.REGRESSION || jobType === JOB_TYPES.CLASSIFICATION) && (
             <Fragment>
+              <EuiFormRow
+                fullWidth
+                isInvalid={maxDistinctValuesError !== undefined}
+                error={[
+                  ...(fieldOptionsFetchFail === true && maxDistinctValuesError !== undefined
+                    ? [
+                        <Fragment>
+                          {i18n.translate(
+                            'xpack.ml.dataframe.analytics.create.dependentVariableMaxDistictValuesError',
+                            {
+                              defaultMessage: 'Invalid. {message}',
+                              values: { message: maxDistinctValuesError },
+                            }
+                          )}
+                        </Fragment>,
+                      ]
+                    : []),
+                ]}
+              >
+                <Fragment />
+              </EuiFormRow>
               <EuiFormRow
                 label={i18n.translate(
                   'xpack.ml.dataframe.analytics.create.dependentVariableLabel',
@@ -450,19 +526,22 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
                     }
                   )
                 }
-                error={
-                  dependentVariableFetchFail === true && [
-                    <Fragment>
-                      {i18n.translate(
-                        'xpack.ml.dataframe.analytics.create.dependentVariableOptionsFetchError',
-                        {
-                          defaultMessage:
-                            'There was a problem fetching fields. Please refresh the page and try again.',
-                        }
-                      )}
-                    </Fragment>,
-                  ]
-                }
+                isInvalid={maxDistinctValuesError !== undefined}
+                error={[
+                  ...(dependentVariableFetchFail === true
+                    ? [
+                        <Fragment>
+                          {i18n.translate(
+                            'xpack.ml.dataframe.analytics.create.dependentVariableOptionsFetchError',
+                            {
+                              defaultMessage:
+                                'There was a problem fetching fields. Please refresh the page and try again.',
+                            }
+                          )}
+                        </Fragment>,
+                      ]
+                    : []),
+                ]}
               >
                 <EuiComboBox
                   aria-label={i18n.translate(
@@ -478,12 +557,14 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
                     }
                   )}
                   isDisabled={isJobCreated}
-                  isLoading={loadingDepFieldOptions}
+                  isLoading={loadingDepVarOptions}
                   singleSelection={true}
                   options={dependentVariableOptions}
                   selectedOptions={dependentVariable ? [{ label: dependentVariable }] : []}
                   onChange={selectedOptions =>
-                    setFormState({ dependentVariable: selectedOptions[0].label || '' })
+                    setFormState({
+                      dependentVariable: selectedOptions[0].label || '',
+                    })
                   }
                   isClearable={false}
                   isInvalid={dependentVariable === ''}
@@ -510,6 +591,49 @@ export const CreateAnalyticsForm: FC<CreateAnalyticsFormProps> = ({ actions, sta
               </EuiFormRow>
             </Fragment>
           )}
+          <EuiFormRow
+            label={i18n.translate('xpack.ml.dataframe.analytics.create.excludedFieldsLabel', {
+              defaultMessage: 'Excluded fields',
+            })}
+            helpText={i18n.translate('xpack.ml.dataframe.analytics.create.excludedFieldsHelpText', {
+              defaultMessage:
+                'Optionally select fields to be excluded from analysis. All other supported fields will be included',
+            })}
+            error={
+              excludesOptions.length === 0 &&
+              fieldOptionsFetchFail === false &&
+              !sourceIndexNameEmpty && [
+                i18n.translate(
+                  'xpack.ml.dataframe.analytics.create.excludesOptionsNoSupportedFields',
+                  {
+                    defaultMessage:
+                      'No supported analysis fields were found for this index pattern.',
+                  }
+                ),
+              ]
+            }
+          >
+            <EuiComboBox
+              aria-label={i18n.translate(
+                'xpack.ml.dataframe.analytics.create.excludesInputAriaLabel',
+                {
+                  defaultMessage: 'Optional. Enter or select field to be excluded.',
+                }
+              )}
+              isDisabled={isJobCreated}
+              isLoading={loadingFieldOptions}
+              options={excludesOptions}
+              selectedOptions={excludes.map(field => ({
+                label: field,
+              }))}
+              onCreateOption={onCreateOption}
+              onChange={selectedOptions =>
+                setFormState({ excludes: selectedOptions.map(option => option.label) })
+              }
+              isClearable={true}
+              data-test-subj="mlAnalyticsCreateJobFlyoutExcludesSelect"
+            />
+          </EuiFormRow>
           <EuiFormRow
             label={i18n.translate('xpack.ml.dataframe.analytics.create.modelMemoryLimitLabel', {
               defaultMessage: 'Model memory limit',
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/form_options_validation.ts b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/form_options_validation.ts
new file mode 100644
index 0000000000000..337d3768f2408
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/form_options_validation.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 { ES_FIELD_TYPES } from '../../../../../../../../../../../src/plugins/data/public';
+import { Field, EVENT_RATE_FIELD_ID } from '../../../../../../../common/types/fields';
+import { JOB_TYPES, AnalyticsJobType } from '../../hooks/use_create_analytics_form/state';
+
+const BASIC_NUMERICAL_TYPES = new Set([
+  ES_FIELD_TYPES.LONG,
+  ES_FIELD_TYPES.INTEGER,
+  ES_FIELD_TYPES.SHORT,
+  ES_FIELD_TYPES.BYTE,
+]);
+
+const EXTENDED_NUMERICAL_TYPES = new Set([
+  ES_FIELD_TYPES.DOUBLE,
+  ES_FIELD_TYPES.FLOAT,
+  ES_FIELD_TYPES.HALF_FLOAT,
+  ES_FIELD_TYPES.SCALED_FLOAT,
+]);
+
+const CATEGORICAL_TYPES = new Set(['ip', 'keyword', 'text']);
+
+// List of system fields we want to ignore for the numeric field check.
+export const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score'];
+
+// Regression supports numeric fields. Classification supports categorical, numeric, and boolean.
+export const shouldAddAsDepVarOption = (field: Field, jobType: AnalyticsJobType) => {
+  if (field.id === EVENT_RATE_FIELD_ID) return false;
+
+  const isBasicNumerical = BASIC_NUMERICAL_TYPES.has(field.type);
+
+  const isSupportedByClassification =
+    isBasicNumerical || CATEGORICAL_TYPES.has(field.type) || field.type === ES_FIELD_TYPES.BOOLEAN;
+
+  if (jobType === JOB_TYPES.REGRESSION) {
+    return isBasicNumerical || EXTENDED_NUMERICAL_TYPES.has(field.type);
+  }
+  if (jobType === JOB_TYPES.CLASSIFICATION) return isSupportedByClassification;
+};
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/job_type.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/job_type.tsx
index 5d8a74bd10ab6..988daac528fd7 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/job_type.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/create_analytics_form/job_type.tsx
@@ -64,7 +64,11 @@ export const JobType: FC<Props> = ({ type, setFormState }) => {
           hasNoInitialSelection={true}
           onChange={e => {
             const value = e.target.value as AnalyticsJobType;
-            setFormState({ jobType: value });
+            setFormState({
+              previousJobType: type,
+              jobType: value,
+              excludes: [],
+            });
           }}
           data-test-subj="mlAnalyticsCreateJobFlyoutJobTypeSelect"
         />
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts
index 754f7a1136a97..7ea2f74908e0e 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts
@@ -12,10 +12,6 @@ import { ACTION } from './actions';
 import { reducer, validateAdvancedEditor } from './reducer';
 import { getInitialState, JOB_TYPES } from './state';
 
-jest.mock('ui/index_patterns', () => ({
-  validateIndexPattern: () => true,
-}));
-
 type SourceIndex = DataFrameAnalyticsConfig['source']['index'];
 
 const getMockState = ({
@@ -142,5 +138,11 @@ describe('useCreateAnalyticsForm', () => {
       validateAdvancedEditor(getMockState({ index: 'the-source-index', modelMemoryLimit: '' }))
         .isValid
     ).toBe(false);
+    // can still run validation check on model_memory_limit if number type
+    expect(
+      // @ts-ignore number is not assignable to type string - mml gets converted to string prior to creation
+      validateAdvancedEditor(getMockState({ index: 'the-source-index', modelMemoryLimit: 100 }))
+        .isValid
+    ).toBe(false);
   });
 });
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
index 06c8a6c6a8846..f35fa6aa2f451 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts
@@ -5,9 +5,6 @@
  */
 
 import { i18n } from '@kbn/i18n';
-
-import { validateIndexPattern } from 'ui/index_patterns';
-
 import { isValidIndexName } from '../../../../../../../common/util/es_utils';
 
 import { Action, ACTION } from './actions';
@@ -26,6 +23,7 @@ import {
   isRegressionAnalysis,
   isClassificationAnalysis,
 } from '../../../../common/analytics';
+import { indexPatterns } from '../../../../../../../../../../../src/plugins/data/public';
 
 const mmlAllowedUnitsStr = `${ALLOWED_DATA_UNITS.slice(0, ALLOWED_DATA_UNITS.length - 1).join(
   ', '
@@ -56,7 +54,15 @@ const getSourceIndexString = (state: State) => {
 };
 
 export const validateAdvancedEditor = (state: State): State => {
-  const { jobIdEmpty, jobIdValid, jobIdExists, jobType, createIndexPattern } = state.form;
+  const {
+    jobIdEmpty,
+    jobIdValid,
+    jobIdExists,
+    jobType,
+    createIndexPattern,
+    excludes,
+    maxDistinctValuesError,
+  } = state.form;
   const { jobConfig } = state;
 
   state.advancedEditorMessages = [];
@@ -66,9 +72,9 @@ export const validateAdvancedEditor = (state: State): State => {
   // general check against Kibana index pattern names, but since this is about the advanced editor
   // with support for arrays in the job config, we also need to check that each individual name
   // doesn't include a comma if index names are supplied as an array.
-  // `validateIndexPattern()` returns a map of messages, we're only interested here if it's valid or not.
+  // `indexPatterns.validate()` returns a map of messages, we're only interested here if it's valid or not.
   // If there are no messages, it means the index pattern is valid.
-  let sourceIndexNameValid = Object.keys(validateIndexPattern(sourceIndexName)).length === 0;
+  let sourceIndexNameValid = Object.keys(indexPatterns.validate(sourceIndexName)).length === 0;
   const sourceIndex = jobConfig?.source?.index;
   if (sourceIndexNameValid) {
     if (typeof sourceIndex === 'string') {
@@ -92,6 +98,7 @@ export const validateAdvancedEditor = (state: State): State => {
   }
 
   let dependentVariableEmpty = false;
+  let excludesValid = true;
 
   if (
     jobConfig.analysis === undefined &&
@@ -106,6 +113,20 @@ export const validateAdvancedEditor = (state: State): State => {
   ) {
     const dependentVariableName = getDependentVar(jobConfig.analysis) || '';
     dependentVariableEmpty = dependentVariableName === '';
+
+    if (!dependentVariableEmpty && excludes.includes(dependentVariableName)) {
+      excludesValid = false;
+
+      state.advancedEditorMessages.push({
+        error: i18n.translate(
+          'xpack.ml.dataframe.analytics.create.advancedEditorMessage.excludesInvalid',
+          {
+            defaultMessage: 'The dependent variable cannot be excluded.',
+          }
+        ),
+        message: '',
+      });
+    }
   }
 
   if (sourceIndexNameEmpty) {
@@ -184,6 +205,8 @@ export const validateAdvancedEditor = (state: State): State => {
   }
 
   state.isValid =
+    maxDistinctValuesError === undefined &&
+    excludesValid &&
     state.form.modelMemoryLimitUnitValid &&
     !jobIdEmpty &&
     jobIdValid &&
@@ -212,6 +235,7 @@ const validateForm = (state: State): State => {
     destinationIndexPatternTitleExists,
     createIndexPattern,
     dependentVariable,
+    maxDistinctValuesError,
     modelMemoryLimit,
   } = state.form;
 
@@ -227,6 +251,7 @@ const validateForm = (state: State): State => {
   }
 
   state.isValid =
+    maxDistinctValuesError === undefined &&
     !jobTypeEmpty &&
     state.form.modelMemoryLimitUnitValid &&
     !jobIdEmpty &&
@@ -293,7 +318,7 @@ export function reducer(state: State, action: Action): State {
 
       if (action.payload.sourceIndex !== undefined) {
         newFormState.sourceIndexNameEmpty = newFormState.sourceIndex === '';
-        const validationMessages = validateIndexPattern(newFormState.sourceIndex);
+        const validationMessages = indexPatterns.validate(newFormState.sourceIndex);
         newFormState.sourceIndexNameValid = Object.keys(validationMessages).length === 0;
       }
 
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
index d29291f8795af..282f9ff45d0ee 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiComboBoxOptionProps } from '@elastic/eui';
 import { DeepPartial } from '../../../../../../../common/types/common';
 import { checkPermission } from '../../../../../privilege/check_privilege';
 import { mlNodesAvailable } from '../../../../../ml_nodes_check/check_ml_nodes';
@@ -45,22 +46,29 @@ export interface State {
     createIndexPattern: boolean;
     dependentVariable: DependentVariable;
     dependentVariableFetchFail: boolean;
-    dependentVariableOptions: Array<{ label: DependentVariable }> | [];
+    dependentVariableOptions: EuiComboBoxOptionProps[] | [];
     description: string;
     destinationIndex: EsIndexName;
     destinationIndexNameExists: boolean;
     destinationIndexNameEmpty: boolean;
     destinationIndexNameValid: boolean;
     destinationIndexPatternTitleExists: boolean;
+    excludes: string[];
+    excludesOptions: EuiComboBoxOptionProps[];
+    fieldOptionsFetchFail: boolean;
     jobId: DataFrameAnalyticsId;
     jobIdExists: boolean;
     jobIdEmpty: boolean;
     jobIdInvalidMaxLength: boolean;
     jobIdValid: boolean;
     jobType: AnalyticsJobType;
-    loadingDepFieldOptions: boolean;
+    loadingDepVarOptions: boolean;
+    loadingFieldOptions: boolean;
+    maxDistinctValuesError: string | undefined;
     modelMemoryLimit: string | undefined;
     modelMemoryLimitUnitValid: boolean;
+    previousJobType: null | AnalyticsJobType;
+    previousSourceIndex: EsIndexName | undefined;
     sourceIndex: EsIndexName;
     sourceIndexNameEmpty: boolean;
     sourceIndexNameValid: boolean;
@@ -96,15 +104,22 @@ export const getInitialState = (): State => ({
     destinationIndexNameEmpty: true,
     destinationIndexNameValid: false,
     destinationIndexPatternTitleExists: false,
+    excludes: [],
+    fieldOptionsFetchFail: false,
+    excludesOptions: [],
     jobId: '',
     jobIdExists: false,
     jobIdEmpty: true,
     jobIdInvalidMaxLength: false,
     jobIdValid: false,
     jobType: undefined,
-    loadingDepFieldOptions: false,
+    loadingDepVarOptions: false,
+    loadingFieldOptions: false,
+    maxDistinctValuesError: undefined,
     modelMemoryLimit: undefined,
     modelMemoryLimitUnitValid: true,
+    previousJobType: null,
+    previousSourceIndex: undefined,
     sourceIndex: '',
     sourceIndexNameEmpty: true,
     sourceIndexNameValid: false,
@@ -146,7 +161,7 @@ export const getJobConfigFromFormState = (
       index: formState.destinationIndex,
     },
     analyzed_fields: {
-      excludes: [],
+      excludes: formState.excludes,
     },
     analysis: {
       outlier_detection: {},
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.test.tsx b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.test.tsx
index 6854b439d7382..3298a7d00253f 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.test.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.test.tsx
@@ -12,10 +12,6 @@ import { kibanaContextValueMock } from '../../../../../contexts/kibana/__mocks__
 
 import { getErrorMessage, useCreateAnalyticsForm } from './use_create_analytics_form';
 
-jest.mock('ui/index_patterns', () => ({
-  validateIndexPattern: () => true,
-}));
-
 const getMountedHook = () =>
   mountHook(
     () => useCreateAnalyticsForm(),
diff --git a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/get_analytics.test.ts b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/get_analytics.test.ts
index 33a073d7a686e..1aaddda358082 100644
--- a/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/get_analytics.test.ts
+++ b/x-pack/legacy/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/get_analytics.test.ts
@@ -8,10 +8,6 @@ import { GetDataFrameAnalyticsStatsResponseOk } from '../../../../../services/ml
 import { getAnalyticsJobsStats } from './get_analytics';
 import { DATA_FRAME_TASK_STATE } from '../../components/analytics_list/common';
 
-jest.mock('ui/index_patterns', () => ({
-  validateIndexPattern: () => true,
-}));
-
 describe('get_analytics', () => {
   test('should get analytics jobs stats', () => {
     // arrange
diff --git a/x-pack/legacy/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/__snapshots__/overrides.test.js.snap b/x-pack/legacy/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/__snapshots__/overrides.test.js.snap
index 77b3222c33dd8..997b437508c34 100644
--- a/x-pack/legacy/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/__snapshots__/overrides.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/__snapshots__/overrides.test.js.snap
@@ -20,10 +20,7 @@ exports[`Overrides render overrides 1`] = `
     labelType="label"
   >
     <EuiFieldNumber
-      compressed={false}
-      fullWidth={false}
       isInvalid={false}
-      isLoading={false}
       onChange={[Function]}
     />
   </EuiFormRow>
diff --git a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
index 0b68f7e096d85..f291118140b9a 100644
--- a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
@@ -8,11 +8,9 @@ import React, { FC, useState } from 'react';
 
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-
-import { IndexPattern } from 'ui/index_patterns';
-
 import { EuiPanel, EuiSpacer, EuiText, EuiTitle, EuiFlexGroup } from '@elastic/eui';
 
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 import { CreateJobLinkCard } from '../../../../components/create_job_link_card';
 import { DataRecognizer } from '../../../../components/data_recognizer';
 
@@ -61,7 +59,11 @@ export const ActionsPanel: FC<Props> = ({ indexPattern }) => {
         </EuiText>
         <EuiSpacer size="m" />
         <EuiFlexGroup gutterSize="l" responsive={true} wrap={true}>
-          <DataRecognizer indexPattern={indexPattern} results={recognizerResults} />
+          <DataRecognizer
+            indexPattern={indexPattern}
+            savedSearch={null}
+            results={recognizerResults}
+          />
         </EuiFlexGroup>
         <EuiSpacer size="l" />
       </div>
diff --git a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/document_count_chart/document_count_chart.tsx b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/document_count_chart/document_count_chart.tsx
index dfe9eb3fe17b8..9da1235a6becd 100644
--- a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/document_count_chart/document_count_chart.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/document_count_chart/document_count_chart.tsx
@@ -12,8 +12,6 @@ import {
   Axis,
   BarSeries,
   Chart,
-  getAxisId,
-  getSpecId,
   niceTimeFormatter,
   Position,
   ScaleType,
@@ -76,14 +74,14 @@ export const DocumentCountChart: FC<Props> = ({
           }}
         />
         <Axis
-          id={getAxisId('bottom')}
+          id="bottom"
           position={Position.Bottom}
           showOverlappingTicks={true}
           tickFormat={dateFormatter}
         />
-        <Axis id={getAxisId('left')} position={Position.Left} />
+        <Axis id="left" position={Position.Left} />
         <BarSeries
-          id={getSpecId(SPEC_ID)}
+          id={SPEC_ID}
           name={seriesName}
           xScaleType={ScaleType.Time}
           yScaleType={ScaleType.Linear}
diff --git a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/metric_distribution_chart/metric_distribution_chart.tsx b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/metric_distribution_chart/metric_distribution_chart.tsx
index 5a7dc060a3b16..a7ad315dd968f 100644
--- a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/metric_distribution_chart/metric_distribution_chart.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/metric_distribution_chart/metric_distribution_chart.tsx
@@ -13,8 +13,6 @@ import {
   Axis,
   Chart,
   CurveType,
-  getAxisId,
-  getSpecId,
   Position,
   ScaleType,
   Settings,
@@ -99,18 +97,13 @@ export const MetricDistributionChart: FC<Props> = ({ width, height, chartData, f
           tooltip={{ headerFormatter }}
         />
         <Axis
-          id={getAxisId('bottom')}
+          id="bottom"
           position={Position.Bottom}
           tickFormat={d => kibanaFieldFormat(d, fieldFormat)}
         />
-        <Axis
-          id={getAxisId('left')}
-          position={Position.Left}
-          tickFormat={d => d.toFixed(3)}
-          hide={true}
-        />
+        <Axis id="left" position={Position.Left} tickFormat={d => d.toFixed(3)} hide={true} />
         <AreaSeries
-          id={getSpecId(SPEC_ID)}
+          id={SPEC_ID}
           name={seriesName}
           xScaleType={ScaleType.Linear}
           yScaleType={ScaleType.Linear}
diff --git a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx
index 4dd1593a14da5..180fd2f103f2c 100644
--- a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx
@@ -21,7 +21,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 
 import { SEARCH_QUERY_LANGUAGE } from '../../../../../../common/constants/search';
 import { SavedSearchQuery } from '../../../../contexts/kibana';
diff --git a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
index fe0d69fdeec6b..983908e2eb7f7 100644
--- a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
+++ b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts
@@ -7,7 +7,7 @@
 import { i18n } from '@kbn/i18n';
 
 import { toastNotifications } from 'ui/notify';
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
 
 import { SavedSearchQuery } from '../../../contexts/kibana';
 import { IndexPatternTitle } from '../../../../../common/types/kibana';
diff --git a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/page.tsx b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/page.tsx
index 898c852fe50a5..99df9fcdb60a2 100644
--- a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/page.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/page.tsx
@@ -8,7 +8,6 @@ import React, { FC, Fragment, useEffect, useState } from 'react';
 import { merge } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 
-import { FieldType } from 'ui/index_patterns';
 import { timefilter } from 'ui/timefilter';
 
 import {
@@ -22,7 +21,12 @@ import {
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
-import { KBN_FIELD_TYPES, esQuery, esKuery } from '../../../../../../../../src/plugins/data/public';
+import {
+  IFieldType,
+  KBN_FIELD_TYPES,
+  esQuery,
+  esKuery,
+} from '../../../../../../../../src/plugins/data/public';
 import { NavigationMenu } from '../../components/navigation_menu';
 import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types';
 import { SEARCH_QUERY_LANGUAGE } from '../../../../common/constants/search';
@@ -107,7 +111,7 @@ export const Page: FC = () => {
 
   // Obtain the list of non metric field types which appear in the index pattern.
   let indexedFieldTypes: ML_JOB_FIELD_TYPES[] = [];
-  const indexPatternFields: FieldType[] = currentIndexPattern.fields;
+  const indexPatternFields: IFieldType[] = currentIndexPattern.fields;
   indexPatternFields.forEach(field => {
     if (field.scripted !== true) {
       const dataVisualizerType: ML_JOB_FIELD_TYPES | undefined = kbnTypeToMLJobType(field);
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap b/x-pack/legacy/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap
index d98dcb26ee238..c5fd0ea63c71d 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap
@@ -1019,7 +1019,6 @@ exports[`CustomUrlEditor renders the editor for other type of URL with duplicate
         compressed={true}
         fullWidth={true}
         onChange={[Function]}
-        resize="vertical"
         rows={2}
         value="https://www.google.co.uk/search?q=airline+code+$airline$"
       />
@@ -1135,7 +1134,6 @@ exports[`CustomUrlEditor renders the editor for other type of URL with unique la
         compressed={true}
         fullWidth={true}
         onChange={[Function]}
-        resize="vertical"
         rows={2}
         value="https://www.google.co.uk/search?q=airline+code+$airline$"
       />
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
index 502a88ecf6004..5e92ab67fcc79 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
@@ -6,13 +6,13 @@
 
 import memoizeOne from 'memoize-one';
 import { isEqual } from 'lodash';
-import { IndexPattern } from 'ui/index_patterns';
 import { IndexPatternTitle } from '../../../../../../common/types/kibana';
 import { Field, SplitField, AggFieldPair } from '../../../../../../common/types/fields';
 import { ml } from '../../../../services/ml_api_service';
 import { mlResultsService } from '../../../../services/results_service';
 import { getCategoryFields as getCategoryFieldsOrig } from './searches';
 import { aggFieldPairsCanBeCharted } from '../job_creator/util/general';
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 
 type DetectorIndex = number;
 export interface LineChartPoint {
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
index d8917db7a33ff..b0eb1b98cd02b 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/advanced_job_creator.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexPattern } from 'ui/index_patterns';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 
 import { JobCreator } from './job_creator';
@@ -15,6 +14,7 @@ import { JOB_TYPE } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
 import { isValidJson } from '../../../../../../common/util/validation_utils';
 import { ml } from '../../../../services/ml_api_service';
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 
 export interface RichDetector {
   agg: Aggregation | null;
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
index 4707eff8d844e..513c8239db01e 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexPattern } from 'ui/index_patterns';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { UrlConfig } from '../../../../../../common/types/custom_urls';
 import { IndexPatternTitle } from '../../../../../../common/types/kibana';
@@ -24,6 +23,7 @@ import { isSparseDataJob } from './util/general';
 import { parseInterval } from '../../../../../../common/util/parse_interval';
 import { Calendar } from '../../../../../../common/types/calendars';
 import { mlCalendarService } from '../../../../services/calendar_service';
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 
 export class JobCreator {
   protected _type: JOB_TYPE = JOB_TYPE.SINGLE_METRIC;
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
index 4ffcd1b06ca47..868346d0188ea 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator_factory.ts
@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexPattern } from 'ui/index_patterns';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { SingleMetricJobCreator } from './single_metric_job_creator';
 import { MultiMetricJobCreator } from './multi_metric_job_creator';
 import { PopulationJobCreator } from './population_job_creator';
 import { AdvancedJobCreator } from './advanced_job_creator';
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 
 import { JOB_TYPE } from '../../../../../../common/constants/new_job';
 
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
index e86ee09d234f1..947c1bcf6c1a4 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/multi_metric_job_creator.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexPattern } from 'ui/index_patterns';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { JobCreator } from './job_creator';
 import {
@@ -22,6 +21,7 @@ import {
 } from '../../../../../../common/constants/new_job';
 import { ml } from '../../../../services/ml_api_service';
 import { getRichDetectors } from './util/general';
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 
 export class MultiMetricJobCreator extends JobCreator {
   // a multi metric job has one optional overall partition field
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
index 8fcd03982424d..9300e53c578e1 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/population_job_creator.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexPattern } from 'ui/index_patterns';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { JobCreator } from './job_creator';
 import {
@@ -17,6 +16,7 @@ import { Job, Datafeed, Detector } from './configs';
 import { createBasicDetector } from './util/default_configs';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 
 export class PopulationJobCreator extends JobCreator {
   // a population job has one overall over (split) field, which is the same for all detectors
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
index cb8a46ade513c..f98fd4dbe970a 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/common/job_creator/single_metric_job_creator.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexPattern } from 'ui/index_patterns';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
 import { parseInterval } from '../../../../../../common/util/parse_interval';
 import { JobCreator } from './job_creator';
@@ -17,6 +16,7 @@ import {
 } from '../../../../../../common/constants/aggregation_types';
 import { JOB_TYPE, CREATED_BY_LABEL } from '../../../../../../common/constants/new_job';
 import { getRichDetectors } from './util/general';
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 
 export class SingleMetricJobCreator extends JobCreator {
   protected _type: JOB_TYPE = JOB_TYPE.SINGLE_METRIC;
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/anomalies.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/anomalies.tsx
index c5188d045d84f..1596177daaf03 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/anomalies.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/anomalies.tsx
@@ -11,7 +11,7 @@
  */
 
 import React, { Fragment, FC } from 'react';
-import { AnnotationDomainTypes, getAnnotationId, LineAnnotation } from '@elastic/charts';
+import { AnnotationDomainTypes, LineAnnotation } from '@elastic/charts';
 import { Anomaly } from '../../../../common/results_loader';
 import { getSeverityColor } from '../../../../../../../../common/util/anomaly_utils';
 import { ANOMALY_THRESHOLD } from '../../../../../../../../common/constants/anomalies';
@@ -63,35 +63,35 @@ export const Anomalies: FC<Props> = ({ anomalyData }) => {
   return (
     <Fragment>
       <LineAnnotation
-        annotationId={getAnnotationId('low')}
+        id="low"
         domainType={AnnotationDomainTypes.XDomain}
         dataValues={severities.low}
         style={getAnomalyStyle(ANOMALY_THRESHOLD.LOW)}
         hideTooltips={true}
       />
       <LineAnnotation
-        annotationId={getAnnotationId('warning')}
+        id="warning"
         domainType={AnnotationDomainTypes.XDomain}
         dataValues={severities.warning}
         style={getAnomalyStyle(ANOMALY_THRESHOLD.WARNING)}
         hideTooltips={true}
       />
       <LineAnnotation
-        annotationId={getAnnotationId('minor')}
+        id="minor"
         domainType={AnnotationDomainTypes.XDomain}
         dataValues={severities.minor}
         style={getAnomalyStyle(ANOMALY_THRESHOLD.MINOR)}
         hideTooltips={true}
       />
       <LineAnnotation
-        annotationId={getAnnotationId('major')}
+        id="major"
         domainType={AnnotationDomainTypes.XDomain}
         dataValues={severities.major}
         style={getAnomalyStyle(ANOMALY_THRESHOLD.MAJOR)}
         hideTooltips={true}
       />
       <LineAnnotation
-        annotationId={getAnnotationId('critical')}
+        id="critical"
         domainType={AnnotationDomainTypes.XDomain}
         dataValues={severities.critical}
         style={getAnomalyStyle(ANOMALY_THRESHOLD.CRITICAL)}
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx
index 3da84da900a2d..ed4f7729ccb26 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx
@@ -5,8 +5,7 @@
  */
 
 import React, { FC } from 'react';
-import { LineSeries, getSpecId, ScaleType, CurveType } from '@elastic/charts';
-import { getCustomColor } from '../common/utils';
+import { LineSeries, ScaleType, CurveType } from '@elastic/charts';
 import { seriesStyle, LINE_COLOR } from '../common/settings';
 
 interface Props {
@@ -22,7 +21,7 @@ const lineSeriesStyle = {
 export const Line: FC<Props> = ({ chartData }) => {
   return (
     <LineSeries
-      id={getSpecId(SPEC_ID)}
+      id={SPEC_ID}
       xScaleType={ScaleType.Time}
       yScaleType={ScaleType.Linear}
       xAccessor={'time'}
@@ -31,7 +30,7 @@ export const Line: FC<Props> = ({ chartData }) => {
       yScaleToDataExtent={false}
       curve={CurveType.CURVE_MONOTONE_X}
       lineSeriesStyle={lineSeriesStyle}
-      customSeriesColors={getCustomColor(SPEC_ID, LINE_COLOR)}
+      customSeriesColors={[LINE_COLOR]}
     />
   );
 };
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx
index 0d76b50b80b97..588bb58135643 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx
@@ -5,9 +5,8 @@
  */
 
 import React, { FC } from 'react';
-import { getSpecId, ScaleType, AreaSeries, CurveType } from '@elastic/charts';
+import { ScaleType, AreaSeries, CurveType } from '@elastic/charts';
 import { ModelItem } from '../../../../common/results_loader';
-import { getCustomColor } from '../common/utils';
 import { seriesStyle, MODEL_COLOR } from '../common/settings';
 
 interface Props {
@@ -33,7 +32,7 @@ export const ModelBounds: FC<Props> = ({ modelData }) => {
   const model = modelData === undefined ? [] : modelData;
   return (
     <AreaSeries
-      id={getSpecId(SPEC_ID)}
+      id={SPEC_ID}
       xScaleType={ScaleType.Time}
       yScaleType={ScaleType.Linear}
       xAccessor={'time'}
@@ -44,7 +43,7 @@ export const ModelBounds: FC<Props> = ({ modelData }) => {
       yScaleToDataExtent={false}
       curve={CurveType.CURVE_MONOTONE_X}
       areaSeriesStyle={areaSeriesStyle}
-      customSeriesColors={getCustomColor(SPEC_ID, MODEL_COLOR)}
+      customSeriesColors={[MODEL_COLOR]}
     />
   );
 };
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx
index 3a8fb9dbfb4d7..30148be62b835 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx
@@ -5,8 +5,7 @@
  */
 
 import React, { FC } from 'react';
-import { LineSeries, getSpecId, ScaleType, CurveType } from '@elastic/charts';
-import { getCustomColor } from '../common/utils';
+import { LineSeries, ScaleType, CurveType } from '@elastic/charts';
 import { seriesStyle, LINE_COLOR } from '../common/settings';
 
 interface Props {
@@ -30,7 +29,7 @@ const scatterSeriesStyle = {
 export const Scatter: FC<Props> = ({ chartData }) => {
   return (
     <LineSeries
-      id={getSpecId(SPEC_ID)}
+      id={SPEC_ID}
       xScaleType={ScaleType.Time}
       yScaleType={ScaleType.Linear}
       xAccessor={'time'}
@@ -39,7 +38,7 @@ export const Scatter: FC<Props> = ({ chartData }) => {
       yScaleToDataExtent={false}
       curve={CurveType.CURVE_MONOTONE_X}
       lineSeriesStyle={scatterSeriesStyle}
-      customSeriesColors={getCustomColor(SPEC_ID, LINE_COLOR)}
+      customSeriesColors={[LINE_COLOR]}
     />
   );
 };
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/axes.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/axes.tsx
index d068609760da8..02e62a0dfcc96 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/axes.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/axes.tsx
@@ -5,7 +5,7 @@
  */
 
 import React, { FC, Fragment } from 'react';
-import { Axis, getAxisId, Position, timeFormatter, niceTimeFormatByDay } from '@elastic/charts';
+import { Axis, Position, timeFormatter, niceTimeFormatByDay } from '@elastic/charts';
 import { getYRange } from './utils';
 import { LineChartPoint } from '../../../../common/chart_loader';
 
@@ -26,17 +26,12 @@ export const Axes: FC<Props> = ({ chartData }) => {
   return (
     <Fragment>
       <Axis
-        id={getAxisId('bottom')}
+        id="bottom"
         position={Position.Bottom}
         showOverlappingTicks={true}
         tickFormat={dateFormatter}
       />
-      <Axis
-        id={getAxisId('left')}
-        position={Position.Left}
-        tickFormat={tickFormatter}
-        domain={yDomain}
-      />
+      <Axis id="left" position={Position.Left} tickFormat={tickFormatter} domain={yDomain} />
     </Fragment>
   );
 };
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/utils.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/utils.ts
index 91f4c08c72f7a..4103c1520b5b1 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/utils.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/utils.ts
@@ -3,17 +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 { getSpecId, CustomSeriesColorsMap, DataSeriesColorsValues } from '@elastic/charts';
-
-export function getCustomColor(specId: string, color: string): CustomSeriesColorsMap {
-  const lineDataSeriesColorValues: DataSeriesColorsValues = {
-    colorValues: [],
-    specId: getSpecId(specId),
-  };
-  return new Map([[lineDataSeriesColorValues, color]]);
-}
-
 export function getYRange(chartData: any[]) {
   if (chartData.length === 0) {
     return { min: 0, max: 0 };
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx
index 7130a24cffb7d..5423e80a82f15 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx
@@ -5,9 +5,8 @@
  */
 
 import React, { FC } from 'react';
-import { BarSeries, Chart, getSpecId, ScaleType, Settings, TooltipType } from '@elastic/charts';
+import { BarSeries, Chart, ScaleType, Settings, TooltipType } from '@elastic/charts';
 import { Axes } from '../common/axes';
-import { getCustomColor } from '../common/utils';
 import { LineChartPoint } from '../../../../common/chart_loader';
 import { EVENT_RATE_COLOR } from '../common/settings';
 import { LoadingWrapper } from '../loading_wrapper';
@@ -20,8 +19,6 @@ interface Props {
   loading?: boolean;
 }
 
-const SPEC_ID = 'event_rate';
-
 export const EventRateChart: FC<Props> = ({
   eventRateChartData,
   height,
@@ -40,13 +37,13 @@ export const EventRateChart: FC<Props> = ({
 
           <Settings tooltip={TooltipType.None} />
           <BarSeries
-            id={getSpecId('event_rate')}
+            id="event_rate"
             xScaleType={ScaleType.Time}
             yScaleType={ScaleType.Linear}
             xAccessor={'time'}
             yAccessors={['value']}
             data={eventRateChartData}
-            customSeriesColors={getCustomColor(SPEC_ID, EVENT_RATE_COLOR)}
+            customSeriesColors={[EVENT_RATE_COLOR]}
           />
         </Chart>
       </LoadingWrapper>
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/calendars/description.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/calendars/description.tsx
index e11fb615efd70..828c91052b30b 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/calendars/description.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/calendars/description.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiDescribedFormGroup, EuiFormRow, EuiLink } from '@elastic/eui';
 import { metadata } from 'ui/metadata';
 
-const docsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-calendars.html`;
+const docsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-calendars.html`;
 
 export const Description: FC = memo(({ children }) => {
   const title = i18n.translate(
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/description.tsx b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/description.tsx
index 89cd5c252c3d6..566bd313dbc6e 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/description.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/description.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiDescribedFormGroup, EuiFormRow, EuiLink } from '@elastic/eui';
 import { metadata } from 'ui/metadata';
 
-const docsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-configuring-url.html`;
+const docsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-configuring-url.html`;
 
 export const Description: FC = memo(({ children }) => {
   const title = i18n.translate(
diff --git a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
index 050387e6de263..d1e81c1c344de 100644
--- a/x-pack/legacy/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
+++ b/x-pack/legacy/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.ts
@@ -4,8 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexPattern } from 'ui/index_patterns';
-import { esQuery, Query, esKuery } from '../../../../../../../../../src/plugins/data/public';
+import {
+  IndexPattern,
+  esQuery,
+  Query,
+  esKuery,
+} from '../../../../../../../../../src/plugins/data/public';
 import { KibanaConfigTypeFix } from '../../../contexts/kibana';
 import { SEARCH_QUERY_LANGUAGE } from '../../../../../common/constants/search';
 import { SavedSearchSavedObject } from '../../../../../common/types/kibana';
diff --git a/x-pack/legacy/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx b/x-pack/legacy/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
index a19a27d00e9b0..1591dbcbad6bf 100644
--- a/x-pack/legacy/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx
@@ -70,8 +70,8 @@ export const JobsListPage: FC<Props> = ({ isMlEnabledInSpace }) => {
   const [currentTabId, setCurrentTabId] = useState(tabs[0].id);
 
   // metadata.branch corresponds to the version used in documentation links.
-  const anomalyDetectionJobsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-jobs.html`;
-  const anomalyJobsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-dfanalytics.html`;
+  const anomalyDetectionJobsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-jobs.html`;
+  const anomalyJobsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-dfanalytics.html`;
 
   const anomalyDetectionDocsLabel = i18n.translate(
     'xpack.ml.management.jobsList.anomalyDetectionDocsLabel',
diff --git a/x-pack/legacy/plugins/ml/public/application/overview/components/analytics_panel/analytics_panel.tsx b/x-pack/legacy/plugins/ml/public/application/overview/components/analytics_panel/analytics_panel.tsx
index 72f4332728e94..b2eda12abc578 100644
--- a/x-pack/legacy/plugins/ml/public/application/overview/components/analytics_panel/analytics_panel.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/overview/components/analytics_panel/analytics_panel.tsx
@@ -76,7 +76,7 @@ export const AnalyticsPanel: FC<Props> = ({ jobCreationDisabled }) => {
         <EuiLoadingSpinner className="mlOverviewPanel__spinner" size="xl" />
       )}
           
-      {isInitialized === true && analytics.length === 0 && (
+      {errorMessage === undefined && isInitialized === true && analytics.length === 0 && (
         <EuiEmptyPrompt
           iconType="createAdvancedJob"
           title={
diff --git a/x-pack/legacy/plugins/ml/public/application/services/field_format_service.ts b/x-pack/legacy/plugins/ml/public/application/services/field_format_service.ts
index a9ecf56c58ea7..11f0d59e04545 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/field_format_service.ts
+++ b/x-pack/legacy/plugins/ml/public/application/services/field_format_service.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexPattern } from 'ui/index_patterns';
 import { mlFunctionToESAggregation } from '../../../common/util/job_utils';
 import { getIndexPatternById, getIndexPatternIdFromName } from '../util/index_utils';
 import { mlJobService } from './job_service';
+import { IndexPattern } from '../../../../../../../src/plugins/data/public';
 
 type FormatsByJobId = Record<string, any>;
 type IndexPatternIdsByJob = Record<string, any>;
diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.js b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.js
index 2645e0e3f9c42..6ff0b45454abf 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.js
+++ b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/data_frame_analytics.js
@@ -45,7 +45,7 @@ export const dataFrameAnalytics = {
       data: evaluateConfig,
     });
   },
-  estimateDataFrameAnalyticsMemoryUsage(jobConfig) {
+  explainDataFrameAnalytics(jobConfig) {
     return http({
       url: `${basePath}/data_frame/analytics/_explain`,
       method: 'POST',
diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.d.ts b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.d.ts
index ad600ad2cbd71..58692754d95d7 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.d.ts
+++ b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/index.d.ts
@@ -16,9 +16,10 @@ import { DataFrameAnalyticsStats } from '../../data_frame_analytics/pages/analyt
 import { JobMessage } from '../../../../common/types/audit_message';
 import { DataFrameAnalyticsConfig } from '../../data_frame_analytics/common/analytics';
 import { DeepPartial } from '../../../../common/types/common';
+import { PartitionFieldsDefinition } from '../results_service/result_service_rx';
 import { annotations } from './annotations';
 import { Calendar, CalendarId, UpdateCalendar } from '../../../../common/types/calendars';
-import { CombinedJob } from '../../jobs/new_job/common/job_creator/configs';
+import { CombinedJob, JobId } from '../../jobs/new_job/common/job_creator/configs';
 
 // TODO This is not a complete representation of all methods of `ml.*`.
 // It just satisfies needs for other parts of the code area which use
@@ -89,9 +90,7 @@ declare interface Ml {
     getDataFrameAnalyticsStats(analyticsId?: string): Promise<GetDataFrameAnalyticsStatsResponse>;
     createDataFrameAnalytics(analyticsId: string, analyticsConfig: any): Promise<any>;
     evaluateDataFrameAnalytics(evaluateConfig: any): Promise<any>;
-    estimateDataFrameAnalyticsMemoryUsage(
-      jobConfig: DeepPartial<DataFrameAnalyticsConfig>
-    ): Promise<any>;
+    explainDataFrameAnalytics(jobConfig: DeepPartial<DataFrameAnalyticsConfig>): Promise<any>;
     deleteDataFrameAnalytics(analyticsId: string): Promise<any>;
     startDataFrameAnalytics(analyticsId: string): Promise<any>;
     stopDataFrameAnalytics(
@@ -124,6 +123,13 @@ declare interface Ml {
 
   results: {
     getMaxAnomalyScore: (jobIds: string[], earliestMs: number, latestMs: number) => Promise<any>;
+    fetchPartitionFieldsValues: (
+      jobId: JobId,
+      searchTerm: Record<string, string>,
+      criteriaFields: Array<{ fieldName: string; fieldValue: any }>,
+      earliestMs: number,
+      latestMs: number
+    ) => Observable<PartitionFieldsDefinition>;
   };
 
   jobs: {
diff --git a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/results.js b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/results.js
index ed01fa268500f..38ae777106680 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/results.js
+++ b/x-pack/legacy/plugins/ml/public/application/services/ml_api_service/results.js
@@ -75,4 +75,17 @@ export const results = {
       },
     });
   },
+
+  fetchPartitionFieldsValues(jobId, searchTerm, criteriaFields, earliestMs, latestMs) {
+    return http$(`${basePath}/results/partition_fields_values`, {
+      method: 'POST',
+      body: {
+        jobId,
+        searchTerm,
+        criteriaFields,
+        earliestMs,
+        latestMs,
+      },
+    });
+  },
 };
diff --git a/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities._service.test.ts b/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities._service.test.ts
index 91c945ea8ff29..5aeed3587b5a0 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities._service.test.ts
+++ b/x-pack/legacy/plugins/ml/public/application/services/new_job_capabilities._service.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { newJobCapsService } from './new_job_capabilities_service';
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../../../../src/plugins/data/public';
 
 // there is magic happening here. starting the include name with `mock..`
 // ensures it can be lazily loaded by the jest.mock function below.
diff --git a/x-pack/legacy/plugins/ml/public/application/services/results_service/index.ts b/x-pack/legacy/plugins/ml/public/application/services/results_service/index.ts
index 9ab14aa7495a7..9d21cbc76ba3a 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/results_service/index.ts
+++ b/x-pack/legacy/plugins/ml/public/application/services/results_service/index.ts
@@ -9,6 +9,7 @@ import {
   getModelPlotOutput,
   getRecordsForCriteria,
   getScheduledEventsByBucket,
+  fetchPartitionFieldsValues,
 } from './result_service_rx';
 import {
   getEventDistributionData,
@@ -42,6 +43,7 @@ export const mlResultsService = {
   getEventDistributionData,
   getModelPlotOutput,
   getRecordMaxScoreByTime,
+  fetchPartitionFieldsValues,
 };
 
 type time = string;
diff --git a/x-pack/legacy/plugins/ml/public/application/services/results_service/result_service_rx.ts b/x-pack/legacy/plugins/ml/public/application/services/results_service/result_service_rx.ts
index 2341ae15a3378..299dfe0167694 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/results_service/result_service_rx.ts
+++ b/x-pack/legacy/plugins/ml/public/application/services/results_service/result_service_rx.ts
@@ -14,7 +14,9 @@
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import _ from 'lodash';
+import { Dictionary } from '../../../../common/types/common';
 import { ML_MEDIAN_PERCENTS } from '../../../../common/util/job_utils';
+import { JobId } from '../../jobs/new_job/common/job_creator/configs';
 import { ml } from '../ml_api_service';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../../common/constants/index_patterns';
 import { CriteriaField } from './index';
@@ -27,6 +29,23 @@ export interface MetricData extends ResultResponse {
   results: Record<string, any>;
 }
 
+export interface FieldDefinition {
+  /**
+   * Partition field name.
+   */
+  name: string | number;
+  /**
+   * Partitions field distinct values.
+   */
+  values: any[];
+}
+
+type FieldTypes = 'partition_field' | 'over_field' | 'by_field';
+
+export type PartitionFieldsDefinition = {
+  [field in FieldTypes]: FieldDefinition;
+};
+
 export function getMetricData(
   index: string,
   entityFields: any[],
@@ -532,3 +551,19 @@ export function getScheduledEventsByBucket(
       })
     );
 }
+
+export function fetchPartitionFieldsValues(
+  jobId: JobId,
+  searchTerm: Dictionary<string>,
+  criteriaFields: Array<{ fieldName: string; fieldValue: any }>,
+  earliestMs: number,
+  latestMs: number
+) {
+  return ml.results.fetchPartitionFieldsValues(
+    jobId,
+    searchTerm,
+    criteriaFields,
+    earliestMs,
+    latestMs
+  );
+}
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/calendars/edit/__snapshots__/new_calendar.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/calendars/edit/__snapshots__/new_calendar.test.js.snap
index 9a48bb551dcde..e8219f5fa6f94 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/calendars/edit/__snapshots__/new_calendar.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/calendars/edit/__snapshots__/new_calendar.test.js.snap
@@ -7,12 +7,10 @@ exports[`NewCalendar Renders new calendar form 1`] = `
   />
   <EuiPage
     className="mlCalendarEditForm"
-    restrictWidth={false}
   >
     <EuiPageContent
       className="mlCalendarEditForm__content"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <InjectIntl(CalendarForm)
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap
index 605602053582f..f7d6908f04492 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/calendars/edit/events_table/__snapshots__/events_table.test.js.snap
@@ -33,7 +33,6 @@ exports[`EventsTable Renders events table with no search bar 1`] = `
         },
       ]
     }
-    executeQueryOptions={Object {}}
     itemId="event_id"
     items={
       Array [
@@ -101,7 +100,6 @@ exports[`EventsTable Renders events table with search bar 1`] = `
         },
       ]
     }
-    executeQueryOptions={Object {}}
     itemId="event_id"
     items={
       Array [
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/calendars_list.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/calendars_list.test.js.snap
index 40f67b5043c86..fc011a77bb082 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/calendars_list.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/calendars_list.test.js.snap
@@ -7,12 +7,10 @@ exports[`CalendarsList Renders calendar list with calendars 1`] = `
   />
   <EuiPage
     className="mlCalendarList"
-    restrictWidth={false}
   >
     <EuiPageContent
       className="mlCalendarList__content"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <CalendarsListHeader
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap
index 2d32650a4b788..0b39841ed61e4 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/__snapshots__/header.test.js.snap
@@ -89,7 +89,7 @@ exports[`CalendarListsHeader renders header 1`] = `
             Object {
               "br": <br />,
               "learnMoreLink": <ForwardRef
-                href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/ml-calendars.html"
+                href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-calendars.html"
                 target="_blank"
               >
                 <FormattedMessage
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/header.js b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/header.js
index 9f1229d28f0aa..58f0ac268fdb2 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/header.js
+++ b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/header.js
@@ -26,7 +26,7 @@ import {
 import { metadata } from 'ui/metadata';
 
 // metadata.branch corresponds to the version used in documentation links.
-const docsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-calendars.html`;
+const docsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-calendars.html`;
 
 export function CalendarsListHeader({ totalCount, refreshCalendars }) {
   return (
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/table/__snapshots__/table.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/table/__snapshots__/table.test.js.snap
index 7958546f3a0cf..d689d1b874462 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/table/__snapshots__/table.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/calendars/list/table/__snapshots__/table.test.js.snap
@@ -27,7 +27,6 @@ exports[`CalendarsListTable renders the table with all calendars 1`] = `
       ]
     }
     data-test-subj="mlCalendarTable"
-    executeQueryOptions={Object {}}
     isSelectable={true}
     itemId="calendar_id"
     items={
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
index 73cc5142bd073..0ce19b8fa3d57 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/components/add_item_popover/__snapshots__/add_item_popover.test.js.snap
@@ -46,9 +46,7 @@ exports[`AddItemPopover calls addItems with multiple items on clicking Add butto
         labelType="label"
       >
         <EuiTextArea
-          fullWidth={false}
           onChange={[Function]}
-          resize="vertical"
           value=""
         />
       </EuiFormRow>
@@ -133,9 +131,7 @@ exports[`AddItemPopover opens the popover onButtonClick 1`] = `
         labelType="label"
       >
         <EuiTextArea
-          fullWidth={false}
           onChange={[Function]}
-          resize="vertical"
           value=""
         />
       </EuiFormRow>
@@ -220,9 +216,7 @@ exports[`AddItemPopover renders the popover 1`] = `
         labelType="label"
       >
         <EuiTextArea
-          fullWidth={false}
           onChange={[Function]}
-          resize="vertical"
           value=""
         />
       </EuiFormRow>
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap
index f5149bf857adc..17986d838ec5e 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/edit/__snapshots__/edit_filter_list.test.js.snap
@@ -7,12 +7,10 @@ exports[`EditFilterList adds new items to filter list 1`] = `
   />
   <EuiPage
     className="ml-edit-filter-lists"
-    restrictWidth={false}
   >
     <EuiPageContent
       className="ml-edit-filter-lists-content"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <EditFilterListHeader
@@ -117,12 +115,10 @@ exports[`EditFilterList renders after selecting an item and deleting it 1`] = `
   />
   <EuiPage
     className="ml-edit-filter-lists"
-    restrictWidth={false}
   >
     <EuiPageContent
       className="ml-edit-filter-lists-content"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <EditFilterListHeader
@@ -229,12 +225,10 @@ exports[`EditFilterList renders after selecting an item and deleting it 2`] = `
   />
   <EuiPage
     className="ml-edit-filter-lists"
-    restrictWidth={false}
   >
     <EuiPageContent
       className="ml-edit-filter-lists-content"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <EditFilterListHeader
@@ -336,12 +330,10 @@ exports[`EditFilterList renders the edit page for a new filter list and updates
   />
   <EuiPage
     className="ml-edit-filter-lists"
-    restrictWidth={false}
   >
     <EuiPageContent
       className="ml-edit-filter-lists-content"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <EditFilterListHeader
@@ -427,12 +419,10 @@ exports[`EditFilterList renders the edit page for a new filter list and updates
   />
   <EuiPage
     className="ml-edit-filter-lists"
-    restrictWidth={false}
   >
     <EuiPageContent
       className="ml-edit-filter-lists-content"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <EditFilterListHeader
@@ -518,12 +508,10 @@ exports[`EditFilterList renders the edit page for an existing filter list and up
   />
   <EuiPage
     className="ml-edit-filter-lists"
-    restrictWidth={false}
   >
     <EuiPageContent
       className="ml-edit-filter-lists-content"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <EditFilterListHeader
@@ -626,12 +614,10 @@ exports[`EditFilterList renders the edit page for an existing filter list and up
   />
   <EuiPage
     className="ml-edit-filter-lists"
-    restrictWidth={false}
   >
     <EuiPageContent
       className="ml-edit-filter-lists-content"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <EditFilterListHeader
@@ -734,12 +720,10 @@ exports[`EditFilterList updates the items per page 1`] = `
   />
   <EuiPage
     className="ml-edit-filter-lists"
-    restrictWidth={false}
   >
     <EuiPageContent
       className="ml-edit-filter-lists-content"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <EditFilterListHeader
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/filter_lists.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/filter_lists.test.js.snap
index 129e9a0f83caa..b58dcfe7d8f1f 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/filter_lists.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/filter_lists.test.js.snap
@@ -7,12 +7,10 @@ exports[`Filter Lists renders a list of filters 1`] = `
   />
   <EuiPage
     className="ml-list-filter-lists"
-    restrictWidth={false}
   >
     <EuiPageContent
       className="ml-list-filter-lists-content"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <FilterListsHeader
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/header.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/header.test.js.snap
index 7e658fde9f1cf..77936b16667b1 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/header.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/header.test.js.snap
@@ -90,7 +90,7 @@ You can use the same filter list in multiple jobs.{br}{learnMoreLink}"
             Object {
               "br": <br />,
               "learnMoreLink": <ForwardRef
-                href="https://www.elastic.co/guide/en/elastic-stack-overview/jest-metadata-mock-branch/ml-rules.html"
+                href="https://www.elastic.co/guide/en/machine-learning/jest-metadata-mock-branch/ml-rules.html"
                 target="_blank"
               >
                 <FormattedMessage
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/table.test.js.snap b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/table.test.js.snap
index ea8099b3453c8..bd7ce3e74bdf3 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/table.test.js.snap
+++ b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/__snapshots__/table.test.js.snap
@@ -31,7 +31,6 @@ exports[`Filter Lists Table renders with filter lists and selection supplied 1`]
       ]
     }
     data-test-subj="mlFilterListsTable"
-    executeQueryOptions={Object {}}
     isSelectable={true}
     itemId="filter_id"
     items={
@@ -139,7 +138,6 @@ exports[`Filter Lists Table renders with filter lists supplied 1`] = `
       ]
     }
     data-test-subj="mlFilterListsTable"
-    executeQueryOptions={Object {}}
     isSelectable={true}
     itemId="filter_id"
     items={
diff --git a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/header.js b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/header.js
index aed643165bd64..ae0c2ef4338ec 100644
--- a/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/header.js
+++ b/x-pack/legacy/plugins/ml/public/application/settings/filter_lists/list/header.js
@@ -26,7 +26,7 @@ import {
 import { metadata } from 'ui/metadata';
 
 // metadata.branch corresponds to the version used in documentation links.
-const docsUrl = `https://www.elastic.co/guide/en/elastic-stack-overview/${metadata.branch}/ml-rules.html`;
+const docsUrl = `https://www.elastic.co/guide/en/machine-learning/${metadata.branch}/ml-rules.html`;
 
 export function FilterListsHeader({ totalCount, refreshFilterLists }) {
   return (
diff --git a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.js b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.js
deleted file mode 100644
index 97d6e41792787..0000000000000
--- a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.js
+++ /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 PropTypes from 'prop-types';
-import React from 'react';
-import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
-
-import { EuiComboBox, EuiFlexItem, EuiFormRow, EuiToolTip } from '@elastic/eui';
-
-function getEntityControlOptions(entity) {
-  if (!Array.isArray(entity.fieldValues)) {
-    return [];
-  }
-
-  return entity.fieldValues.map(value => {
-    return { label: value };
-  });
-}
-
-export const EntityControl = injectI18n(
-  class EntityControl extends React.Component {
-    static propTypes = {
-      entity: PropTypes.object.isRequired,
-      entityFieldValueChanged: PropTypes.func.isRequired,
-      forceSelection: PropTypes.bool.isRequired,
-    };
-
-    state = {
-      selectedOptions: undefined,
-    };
-
-    constructor(props) {
-      super(props);
-    }
-
-    componentDidUpdate() {
-      const { entity, forceSelection } = this.props;
-      const { selectedOptions } = this.state;
-
-      const fieldValue = entity.fieldValue;
-
-      if (
-        (selectedOptions === undefined && fieldValue.length > 0) ||
-        (Array.isArray(selectedOptions) &&
-          fieldValue.length > 0 &&
-          selectedOptions[0].label !== fieldValue)
-      ) {
-        this.setState({
-          selectedOptions: [{ label: fieldValue }],
-        });
-      } else if (Array.isArray(selectedOptions) && fieldValue.length === 0) {
-        this.setState({
-          selectedOptions: undefined,
-        });
-      }
-
-      if (forceSelection && this.inputRef) {
-        this.inputRef.focus();
-      }
-    }
-
-    onChange = selectedOptions => {
-      const options = selectedOptions.length > 0 ? selectedOptions : undefined;
-      this.setState({
-        selectedOptions: options,
-      });
-
-      const fieldValue =
-        Array.isArray(options) && options[0].label.length > 0 ? options[0].label : '';
-      this.props.entityFieldValueChanged(this.props.entity, fieldValue);
-    };
-
-    render() {
-      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} helpText={forceSelection ? selectMessage : null}>
-            <EuiToolTip position="right" content={forceSelection ? selectMessage : null}>
-              {control}
-            </EuiToolTip>
-          </EuiFormRow>
-        </EuiFlexItem>
-      );
-    }
-  }
-);
diff --git a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.tsx b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.tsx
new file mode 100644
index 0000000000000..bc6896a1a66ba
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.tsx
@@ -0,0 +1,156 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Component } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+
+import {
+  EuiComboBox,
+  EuiComboBoxOptionProps,
+  EuiFlexItem,
+  EuiFormRow,
+  EuiToolTip,
+} from '@elastic/eui';
+
+export interface Entity {
+  fieldName: string;
+  fieldValue: any;
+  fieldValues: any;
+}
+
+function getEntityControlOptions(entity: Entity): EuiComboBoxOptionProps[] {
+  if (!Array.isArray(entity.fieldValues)) {
+    return [];
+  }
+
+  return entity.fieldValues.map(value => {
+    return { label: value };
+  });
+}
+
+interface EntityControlProps {
+  entity: Entity;
+  entityFieldValueChanged: (entity: Entity, fieldValue: any) => void;
+  onSearchChange: (entity: Entity, queryTerm: string) => void;
+  forceSelection: boolean;
+}
+
+interface EntityControlState {
+  selectedOptions: EuiComboBoxOptionProps[] | undefined;
+  isLoading: boolean;
+  options: EuiComboBoxOptionProps[] | undefined;
+}
+
+export class EntityControl extends Component<EntityControlProps, EntityControlState> {
+  inputRef: any;
+
+  state = {
+    selectedOptions: undefined,
+    options: undefined,
+    isLoading: false,
+  };
+
+  componentDidUpdate(prevProps: EntityControlProps) {
+    const { entity, forceSelection } = this.props;
+    const { selectedOptions } = this.state;
+
+    if (prevProps.entity === entity) {
+      return;
+    }
+
+    const { fieldValue } = entity;
+
+    const options = getEntityControlOptions(entity);
+
+    let selectedOptionsUpdate: EuiComboBoxOptionProps[] | undefined = selectedOptions;
+    if (
+      (selectedOptions === undefined && fieldValue.length > 0) ||
+      (Array.isArray(selectedOptions) &&
+        // @ts-ignore
+        selectedOptions[0].label !== fieldValue &&
+        fieldValue.length > 0)
+    ) {
+      selectedOptionsUpdate = [{ label: fieldValue }];
+    } else if (Array.isArray(selectedOptions) && fieldValue.length === 0) {
+      selectedOptionsUpdate = undefined;
+    }
+
+    this.setState({
+      options,
+      isLoading: false,
+      selectedOptions: selectedOptionsUpdate,
+    });
+
+    if (forceSelection && this.inputRef) {
+      this.inputRef.focus();
+    }
+  }
+
+  onChange = (selectedOptions: EuiComboBoxOptionProps[]) => {
+    const options = selectedOptions.length > 0 ? selectedOptions : undefined;
+    this.setState({
+      selectedOptions: options,
+    });
+
+    const fieldValue =
+      Array.isArray(options) && options[0].label.length > 0 ? options[0].label : '';
+    this.props.entityFieldValueChanged(this.props.entity, fieldValue);
+  };
+
+  onSearchChange = (searchValue: string) => {
+    this.setState({
+      isLoading: true,
+      options: [],
+    });
+    this.props.onSearchChange(this.props.entity, searchValue);
+  };
+
+  render() {
+    const { entity, forceSelection } = this.props;
+    const { selectedOptions, isLoading, options } = this.state;
+
+    const control = (
+      <EuiComboBox
+        async
+        isLoading={isLoading}
+        inputRef={input => {
+          if (input) {
+            this.inputRef = input;
+          }
+        }}
+        style={{ minWidth: '300px' }}
+        placeholder={i18n.translate('xpack.ml.timeSeriesExplorer.enterValuePlaceholder', {
+          defaultMessage: 'Enter value',
+        })}
+        singleSelection={{ asPlainText: true }}
+        options={options}
+        selectedOptions={selectedOptions}
+        onChange={this.onChange}
+        onSearchChange={this.onSearchChange}
+        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} helpText={forceSelection ? selectMessage : null}>
+          <EuiToolTip position="right" content={forceSelection ? selectMessage : null}>
+            {control}
+          </EuiToolTip>
+        </EuiFormRow>
+      </EuiFlexItem>
+    );
+  }
+}
diff --git a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/index.js b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/index.js
rename to x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/entity_control/index.ts
diff --git a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
index 2e0fc44a158ea..9db6f8f0a1c35 100644
--- a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
+++ b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
@@ -445,8 +445,6 @@ const TimeseriesChartIntl = injectI18n(
         };
         this.selectedBounds = newSelectedBounds;
       } else {
-        // Don't set the brush if the selection is the full context chart domain.
-        this.setBrushVisibility(false);
         const contextXScaleDomain = this.contextXScale.domain();
         const newSelectedBounds = {
           min: moment(new Date(contextXScaleDomain[0])),
diff --git a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
index 62bb2de3fcb31..202448340f526 100644
--- a/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
+++ b/x-pack/legacy/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
@@ -8,7 +8,7 @@
  * React component for rendering Single Metric Viewer.
  */
 
-import { chain, difference, each, find, first, get, has, isEqual, without } from 'lodash';
+import { debounce, difference, each, find, first, get, has, isEqual, without } from 'lodash';
 import moment from 'moment-timezone';
 import { Subject, Subscription, forkJoin } from 'rxjs';
 import { map, debounceTime, switchMap, tap, withLatestFrom } from 'rxjs/operators';
@@ -362,6 +362,12 @@ export class TimeSeriesExplorer extends React.Component {
     });
   };
 
+  entityFieldSearchChanged = debounce((entity, queryTerm) => {
+    this.loadEntityValues({
+      [entity.fieldType]: queryTerm,
+    });
+  }, 500);
+
   loadAnomaliesTableData = (earliestMs, latestMs) => {
     const { dateFormatTz } = this.props;
     const { selectedJob } = this.state;
@@ -419,58 +425,56 @@ export class TimeSeriesExplorer extends React.Component {
       );
   };
 
-  loadEntityValues = (callback = () => {}) => {
+  /**
+   * Loads available entity values.
+   * @param {Object} searchTerm - Search term for partition, e.g. { partition_field: 'partition' }
+   * @param callback - Callback to execute after component state update.
+   */
+  loadEntityValues = async (searchTerm = {}, callback = () => {}) => {
     const { timefilter } = this.props;
     const { detectorId, entities, selectedJob } = this.state;
 
-    // Populate the entity input datalists with the values from the top records by score
-    // for the selected detector across the full time range. No need to pass through finish().
+    // Populate the entity input datalists with aggregated values. No need to pass through finish().
     const bounds = timefilter.getActiveBounds();
     const detectorIndex = +detectorId;
 
-    mlResultsService
-      .getRecordsForCriteria(
-        [selectedJob.job_id],
-        [{ fieldName: 'detector_index', fieldValue: detectorIndex }],
-        0,
+    const {
+      partition_field: partitionField,
+      over_field: overField,
+      by_field: byField,
+    } = await mlResultsService
+      .fetchPartitionFieldsValues(
+        selectedJob.job_id,
+        searchTerm,
+        [
+          {
+            fieldName: 'detector_index',
+            fieldValue: detectorIndex,
+          },
+        ],
         bounds.min.valueOf(),
-        bounds.max.valueOf(),
-        ANOMALIES_TABLE_DEFAULT_QUERY_SIZE
+        bounds.max.valueOf()
       )
-      .toPromise()
-      .then(resp => {
-        if (resp.records && resp.records.length > 0) {
-          const firstRec = resp.records[0];
+      .toPromise();
 
-          this.setState(
-            {
-              entities: entities.map(entity => {
-                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 === newEntity.fieldName) {
-                  newEntity.fieldValues = chain(resp.records)
-                    .pluck('over_field_value')
-                    .uniq()
-                    .value();
-                }
-                if (firstRec.by_field_name === newEntity.fieldName) {
-                  newEntity.fieldValues = chain(resp.records)
-                    .pluck('by_field_value')
-                    .uniq()
-                    .value();
-                }
-                return newEntity;
-              }),
-            },
-            callback
-          );
-        }
-      });
+    this.setState(
+      {
+        entities: entities.map(entity => {
+          const newEntity = { ...entity };
+          if (partitionField?.name === entity.fieldName) {
+            newEntity.fieldValues = partitionField.values;
+          }
+          if (overField?.name === entity.fieldName) {
+            newEntity.fieldValues = overField.values;
+          }
+          if (byField?.name === entity.fieldName) {
+            newEntity.fieldValues = byField.values;
+          }
+          return newEntity;
+        }),
+      },
+      callback
+    );
   };
 
   loadForForecastId = forecastId => {
@@ -796,11 +800,19 @@ export class TimeSeriesExplorer extends React.Component {
     const byFieldName = get(detector, 'by_field_name');
     if (partitionFieldName !== undefined) {
       const partitionFieldValue = get(entitiesState, partitionFieldName, '');
-      entities.push({ fieldName: partitionFieldName, fieldValue: partitionFieldValue });
+      entities.push({
+        fieldType: 'partition_field',
+        fieldName: partitionFieldName,
+        fieldValue: partitionFieldValue,
+      });
     }
     if (overFieldName !== undefined) {
       const overFieldValue = get(entitiesState, overFieldName, '');
-      entities.push({ fieldName: overFieldName, fieldValue: overFieldValue });
+      entities.push({
+        fieldType: 'over_field',
+        fieldName: overFieldName,
+        fieldValue: overFieldValue,
+      });
     }
 
     // For jobs with by and over fields, don't add the 'by' field as this
@@ -810,7 +822,7 @@ export class TimeSeriesExplorer extends React.Component {
     // from filter for the anomaly records.
     if (byFieldName !== undefined && overFieldName === undefined) {
       const byFieldValue = get(entitiesState, byFieldName, '');
-      entities.push({ fieldName: byFieldName, fieldValue: byFieldValue });
+      entities.push({ fieldType: 'by_field', fieldName: byFieldName, fieldValue: byFieldValue });
     }
 
     this.updateCriteriaFields(detectorIndex, entities);
@@ -1338,6 +1350,7 @@ export class TimeSeriesExplorer extends React.Component {
                 <EntityControl
                   entity={entity}
                   entityFieldValueChanged={this.entityFieldValueChanged}
+                  onSearchChange={this.entityFieldSearchChanged}
                   forceSelection={forceSelection}
                   key={entityKey}
                 />
@@ -1530,13 +1543,11 @@ export class TimeSeriesExplorer extends React.Component {
                 </EuiFlexItem>
               </EuiFlexGroup>
               <EuiSpacer size="m" />
-              <AnomaliesTable
-                tableData={tableData}
-                filter={this.tableFilter}
-                timefilter={timefilter}
-              />
             </EuiText>
           )}
+        {arePartitioningFieldsProvided && jobs.length > 0 && (
+          <AnomaliesTable tableData={tableData} filter={this.tableFilter} timefilter={timefilter} />
+        )}
       </TimeSeriesExplorerPage>
     );
   }
diff --git a/x-pack/legacy/plugins/ml/public/application/util/field_types_utils.test.ts b/x-pack/legacy/plugins/ml/public/application/util/field_types_utils.test.ts
index 2abb8097598d2..14150edb977bd 100644
--- a/x-pack/legacy/plugins/ml/public/application/util/field_types_utils.test.ts
+++ b/x-pack/legacy/plugins/ml/public/application/util/field_types_utils.test.ts
@@ -4,8 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { FieldType } from 'ui/index_patterns';
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { IFieldType, KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
 import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 import {
   kbnTypeToMLJobType,
@@ -16,7 +15,7 @@ import {
 describe('ML - field type utils', () => {
   describe('kbnTypeToMLJobType', () => {
     test('returns correct ML_JOB_FIELD_TYPES for KBN_FIELD_TYPES', () => {
-      const field: FieldType = {
+      const field: IFieldType = {
         type: KBN_FIELD_TYPES.NUMBER,
         name: KBN_FIELD_TYPES.NUMBER,
         aggregatable: true,
@@ -37,7 +36,7 @@ describe('ML - field type utils', () => {
     });
 
     test('returns ML_JOB_FIELD_TYPES.KEYWORD for aggregatable KBN_FIELD_TYPES.STRING', () => {
-      const field: FieldType = {
+      const field: IFieldType = {
         type: KBN_FIELD_TYPES.STRING,
         name: KBN_FIELD_TYPES.STRING,
         aggregatable: true,
@@ -46,7 +45,7 @@ describe('ML - field type utils', () => {
     });
 
     test('returns ML_JOB_FIELD_TYPES.TEXT for non-aggregatable KBN_FIELD_TYPES.STRING', () => {
-      const field: FieldType = {
+      const field: IFieldType = {
         type: KBN_FIELD_TYPES.STRING,
         name: KBN_FIELD_TYPES.STRING,
         aggregatable: false,
@@ -55,7 +54,7 @@ describe('ML - field type utils', () => {
     });
 
     test('returns undefined for non-aggregatable "foo"', () => {
-      const field: FieldType = {
+      const field: IFieldType = {
         type: 'foo',
         name: 'foo',
         aggregatable: false,
diff --git a/x-pack/legacy/plugins/ml/public/application/util/field_types_utils.ts b/x-pack/legacy/plugins/ml/public/application/util/field_types_utils.ts
index e2b876aa8dbcd..e8fe2ffb1fed9 100644
--- a/x-pack/legacy/plugins/ml/public/application/util/field_types_utils.ts
+++ b/x-pack/legacy/plugins/ml/public/application/util/field_types_utils.ts
@@ -5,15 +5,14 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { FieldType } from 'ui/index_patterns';
 import { ML_JOB_FIELD_TYPES } from '../../../common/constants/field_types';
 
-import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
+import { IFieldType, KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/public';
 
 // convert kibana types to ML Job types
 // this is needed because kibana types only have string and not text and keyword.
 // and we can't use ES_FIELD_TYPES because it has no NUMBER type
-export function kbnTypeToMLJobType(field: FieldType) {
+export function kbnTypeToMLJobType(field: IFieldType) {
   // Return undefined if not one of the supported data visualizer field types.
   let type;
   switch (field.type) {
diff --git a/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js b/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js
index 5d38de4a6ba87..2ca21efb0bd6a 100644
--- a/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js
+++ b/x-pack/legacy/plugins/ml/server/client/elasticsearch_ml.js
@@ -168,7 +168,7 @@ export const elasticsearchJsPlugin = (Client, config, components) => {
     method: 'POST',
   });
 
-  ml.estimateDataFrameAnalyticsMemoryUsage = ca({
+  ml.explainDataFrameAnalytics = ca({
     urls: [
       {
         fmt: '/_ml/data_frame/analytics/_explain',
diff --git a/x-pack/legacy/plugins/ml/server/client/error_wrapper.ts b/x-pack/legacy/plugins/ml/server/client/error_wrapper.ts
new file mode 100644
index 0000000000000..6ab31d11f4b32
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/client/error_wrapper.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { boomify, isBoom } from 'boom';
+import { ResponseError, CustomHttpResponseOptions } from 'src/core/server';
+
+export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
+  const boom = isBoom(error) ? error : boomify(error, { statusCode: error.status });
+  return {
+    body: boom,
+    headers: boom.output.headers,
+    statusCode: boom.output.statusCode,
+  };
+}
diff --git a/x-pack/legacy/plugins/ml/server/lib/check_license/__tests__/check_license.ts b/x-pack/legacy/plugins/ml/server/lib/check_license/__tests__/check_license.ts
deleted file mode 100644
index 5a8b4fdcc76db..0000000000000
--- a/x-pack/legacy/plugins/ml/server/lib/check_license/__tests__/check_license.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * 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 { set } from 'lodash';
-import { XPackInfo } from '../../../../../../../legacy/plugins/xpack_main/server/lib/xpack_info';
-import { checkLicense } from '../check_license';
-
-describe('check_license', () => {
-  let mockLicenseInfo: XPackInfo;
-  beforeEach(() => (mockLicenseInfo = {} as XPackInfo));
-
-  describe('license information is undefined', () => {
-    beforeEach(() => (mockLicenseInfo = {} as XPackInfo));
-
-    it('should set isAvailable to false', () => {
-      expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false);
-    });
-
-    it('should set showLinks to true', () => {
-      expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
-    });
-
-    it('should set enableLinks to false', () => {
-      expect(checkLicense(mockLicenseInfo).enableLinks).to.be(false);
-    });
-
-    it('should set a message', () => {
-      expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined);
-    });
-  });
-
-  describe('license information is not available', () => {
-    beforeEach(() => (mockLicenseInfo.isAvailable = () => false));
-
-    it('should set isAvailable to false', () => {
-      expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false);
-    });
-
-    it('should set showLinks to true', () => {
-      expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
-    });
-
-    it('should set enableLinks to false', () => {
-      expect(checkLicense(mockLicenseInfo).enableLinks).to.be(false);
-    });
-
-    it('should set a message', () => {
-      expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined);
-    });
-  });
-
-  describe('license information is available', () => {
-    beforeEach(() => {
-      mockLicenseInfo.isAvailable = () => true;
-      set(mockLicenseInfo, 'license.getType', () => 'basic');
-    });
-
-    describe('& ML is disabled in Elasticsearch', () => {
-      beforeEach(() => {
-        set(
-          mockLicenseInfo,
-          'feature',
-          sinon
-            .stub()
-            .withArgs('ml')
-            .returns({ isEnabled: () => false })
-        );
-      });
-
-      it('should set showLinks to false', () => {
-        expect(checkLicense(mockLicenseInfo).showLinks).to.be(false);
-      });
-
-      it('should set isAvailable to false', () => {
-        expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false);
-      });
-
-      it('should set enableLinks to false', () => {
-        expect(checkLicense(mockLicenseInfo).enableLinks).to.be(false);
-      });
-
-      it('should set a message', () => {
-        expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined);
-      });
-    });
-
-    describe('& ML is enabled in Elasticsearch', () => {
-      beforeEach(() => {
-        set(
-          mockLicenseInfo,
-          'feature',
-          sinon
-            .stub()
-            .withArgs('ml')
-            .returns({ isEnabled: () => true })
-        );
-      });
-
-      describe('& license is trial or platinum', () => {
-        beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true));
-
-        describe('& license is active', () => {
-          beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true));
-
-          it('should set isAvailable to true', () => {
-            expect(checkLicense(mockLicenseInfo).isAvailable).to.be(true);
-          });
-
-          it('should set showLinks to true', () => {
-            expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
-          });
-
-          it('should set enableLinks to true', () => {
-            expect(checkLicense(mockLicenseInfo).enableLinks).to.be(true);
-          });
-
-          it('should not set a message', () => {
-            expect(checkLicense(mockLicenseInfo).message).to.be(undefined);
-          });
-        });
-
-        describe('& license is expired', () => {
-          beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => false));
-
-          it('should set isAvailable to true', () => {
-            expect(checkLicense(mockLicenseInfo).isAvailable).to.be(true);
-          });
-
-          it('should set showLinks to true', () => {
-            expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
-          });
-
-          it('should set enableLinks to true', () => {
-            expect(checkLicense(mockLicenseInfo).enableLinks).to.be(true);
-          });
-
-          it('should set a message', () => {
-            expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined);
-          });
-        });
-      });
-
-      describe('& license is basic', () => {
-        beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => false));
-
-        describe('& license is active', () => {
-          beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true));
-
-          it('should set isAvailable to true', () => {
-            expect(checkLicense(mockLicenseInfo).isAvailable).to.be(true);
-          });
-
-          it('should set showLinks to true', () => {
-            expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/ml/server/lib/check_license/check_license.test.ts b/x-pack/legacy/plugins/ml/server/lib/check_license/check_license.test.ts
new file mode 100644
index 0000000000000..1d80a226486bb
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/lib/check_license/check_license.test.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.
+ */
+
+import expect from '@kbn/expect';
+import sinon from 'sinon';
+import { set } from 'lodash';
+import { XPackInfo } from '../../../../xpack_main/server/lib/xpack_info';
+import { checkLicense } from './check_license';
+
+describe('check_license', () => {
+  let mockLicenseInfo: XPackInfo;
+  beforeEach(() => (mockLicenseInfo = {} as XPackInfo));
+
+  describe('license information is undefined', () => {
+    it('should set isAvailable to false', () => {
+      expect(checkLicense(undefined as any).isAvailable).to.be(false);
+    });
+
+    it('should set showLinks to true', () => {
+      expect(checkLicense(undefined as any).showLinks).to.be(true);
+    });
+
+    it('should set enableLinks to false', () => {
+      expect(checkLicense(undefined as any).enableLinks).to.be(false);
+    });
+
+    it('should set a message', () => {
+      expect(checkLicense(undefined as any).message).to.not.be(undefined);
+    });
+  });
+
+  describe('license information is not available', () => {
+    beforeEach(() => (mockLicenseInfo.isAvailable = () => false));
+
+    it('should set isAvailable to false', () => {
+      expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false);
+    });
+
+    it('should set showLinks to true', () => {
+      expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
+    });
+
+    it('should set enableLinks to false', () => {
+      expect(checkLicense(mockLicenseInfo).enableLinks).to.be(false);
+    });
+
+    it('should set a message', () => {
+      expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined);
+    });
+  });
+
+  describe('license information is available', () => {
+    beforeEach(() => {
+      mockLicenseInfo.isAvailable = () => true;
+      set(mockLicenseInfo, 'license.getType', () => 'basic');
+    });
+
+    describe('& ML is disabled in Elasticsearch', () => {
+      beforeEach(() => {
+        set(
+          mockLicenseInfo,
+          'feature',
+          sinon
+            .stub()
+            .withArgs('ml')
+            .returns({ isEnabled: () => false })
+        );
+      });
+
+      it('should set showLinks to false', () => {
+        expect(checkLicense(mockLicenseInfo).showLinks).to.be(false);
+      });
+
+      it('should set isAvailable to false', () => {
+        expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false);
+      });
+
+      it('should set enableLinks to false', () => {
+        expect(checkLicense(mockLicenseInfo).enableLinks).to.be(false);
+      });
+
+      it('should set a message', () => {
+        expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined);
+      });
+    });
+
+    describe('& ML is enabled in Elasticsearch', () => {
+      beforeEach(() => {
+        set(
+          mockLicenseInfo,
+          'feature',
+          sinon
+            .stub()
+            .withArgs('ml')
+            .returns({ isEnabled: () => true })
+        );
+      });
+
+      describe('& license is >= platinum', () => {
+        beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true));
+
+        describe('& license is active', () => {
+          beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true));
+
+          it('should set isAvailable to true', () => {
+            expect(checkLicense(mockLicenseInfo).isAvailable).to.be(true);
+          });
+
+          it('should set showLinks to true', () => {
+            expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
+          });
+
+          it('should set enableLinks to true', () => {
+            expect(checkLicense(mockLicenseInfo).enableLinks).to.be(true);
+          });
+
+          it('should not set a message', () => {
+            expect(checkLicense(mockLicenseInfo).message).to.be(undefined);
+          });
+        });
+
+        describe('& license is expired', () => {
+          beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => false));
+
+          it('should set isAvailable to true', () => {
+            expect(checkLicense(mockLicenseInfo).isAvailable).to.be(true);
+          });
+
+          it('should set showLinks to true', () => {
+            expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
+          });
+
+          it('should set enableLinks to true', () => {
+            expect(checkLicense(mockLicenseInfo).enableLinks).to.be(true);
+          });
+
+          it('should set a message', () => {
+            expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined);
+          });
+        });
+      });
+
+      describe('& license is basic', () => {
+        beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => false));
+
+        describe('& license is active', () => {
+          beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true));
+
+          it('should set isAvailable to true', () => {
+            expect(checkLicense(mockLicenseInfo).isAvailable).to.be(true);
+          });
+
+          it('should set showLinks to true', () => {
+            expect(checkLicense(mockLicenseInfo).showLinks).to.be(true);
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/ml/server/lib/check_license/check_license.ts b/x-pack/legacy/plugins/ml/server/lib/check_license/check_license.ts
index bb92705880dde..c88ab087a8198 100644
--- a/x-pack/legacy/plugins/ml/server/lib/check_license/check_license.ts
+++ b/x-pack/legacy/plugins/ml/server/lib/check_license/check_license.ts
@@ -47,7 +47,7 @@ export function checkLicense(xpackLicenseInfo: XPackInfo): Response {
     };
   }
 
-  const VALID_FULL_LICENSE_MODES = ['trial', 'platinum'];
+  const VALID_FULL_LICENSE_MODES = ['platinum', 'enterprise', 'trial'];
 
   const isLicenseModeValid = xpackLicenseInfo.license.isOneOf(VALID_FULL_LICENSE_MODES);
   const licenseType = isLicenseModeValid === true ? LICENSE_TYPE.FULL : LICENSE_TYPE.BASIC;
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 8da91822fcd59..cb268ffede7fa 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
@@ -16,6 +16,7 @@ describe('ML - data recognizer', () => {
     'auditbeat_process_docker_ecs',
     'auditbeat_process_hosts_ecs',
     'logs_ui_analysis',
+    'logs_ui_categories',
     'metricbeat_system_ecs',
     'nginx_ecs',
     'sample_data_ecommerce',
diff --git a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/ml/log_entry_rate.json b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/ml/log_entry_rate.json
index 5279b18fb03b3..42ba15591e5c4 100644
--- a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/ml/log_entry_rate.json
+++ b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/ml/log_entry_rate.json
@@ -1,6 +1,6 @@
 {
   "job_type": "anomaly_detector",
-  "description": "Detect anomalies in the log entry ingestion rate",
+  "description": "Logs UI: Detects anomalies in the log entry ingestion rate",
   "groups": ["logs-ui"],
   "analysis_config": {
     "bucket_span": "15m",
diff --git a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/logo.json b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/logo.json
new file mode 100644
index 0000000000000..26b404ff331c6
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/logo.json
@@ -0,0 +1,3 @@
+{
+  "icon": "logsApp"
+}
diff --git a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/manifest.json b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/manifest.json
new file mode 100644
index 0000000000000..b31ddacde8b6d
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/manifest.json
@@ -0,0 +1,20 @@
+{
+  "id": "logs_ui_categories",
+  "title": "Log entry categories",
+  "description": "Detect anomalies in count of log entries by category",
+  "type": "Logs",
+  "logoFile": "logo.json",
+  "jobs": [
+    {
+      "id": "log-entry-categories-count",
+      "file": "log_entry_categories_count.json"
+    }
+  ],
+  "datafeeds": [
+    {
+      "id": "datafeed-log-entry-categories-count",
+      "file": "datafeed_log_entry_categories_count.json",
+      "job_id": "log-entry-categories-count"
+    }
+  ]
+}
diff --git a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/ml/datafeed_log_entry_categories_count.json b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/ml/datafeed_log_entry_categories_count.json
new file mode 100644
index 0000000000000..6e117b4de87ea
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/ml/datafeed_log_entry_categories_count.json
@@ -0,0 +1,15 @@
+{
+  "job_id": "JOB_ID",
+  "indices": ["INDEX_PATTERN_NAME"],
+  "query": {
+    "bool": {
+      "filter": [
+        {
+          "exists": {
+            "field": "message"
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/ml/log_entry_categories_count.json b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/ml/log_entry_categories_count.json
new file mode 100644
index 0000000000000..b4fb242f16522
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_categories/ml/log_entry_categories_count.json
@@ -0,0 +1,34 @@
+{
+  "job_type": "anomaly_detector",
+  "description": "Logs UI: Detects anomalies in count of log entries by category",
+  "groups": ["logs-ui"],
+  "analysis_config": {
+    "bucket_span": "15m",
+    "categorization_field_name": "message",
+    "detectors": [
+      {
+        "by_field_name": "mlcategory",
+        "detector_description": "count by learned log entry category",
+        "function": "count",
+        "partition_field_name": "event.dataset",
+        "use_null": true
+      }
+    ],
+    "influencers": ["event.dataset", "mlcategory"]
+  },
+  "analysis_limits": {
+    "model_memory_limit": "100mb",
+    "categorization_examples_limit": 1
+  },
+  "data_description": {
+    "time_field": "@timestamp",
+    "time_format": "epoch_ms"
+  },
+  "model_plot_config": {
+    "enabled": true
+  },
+  "custom_settings": {
+    "created_by": "ml-module-logs-ui-categories",
+    "job_revision": 0
+  }
+}
diff --git a/x-pack/legacy/plugins/ml/server/models/job_validation/messages.js b/x-pack/legacy/plugins/ml/server/models/job_validation/messages.js
index 35e80e14009b0..2c0c218bf86b5 100644
--- a/x-pack/legacy/plugins/ml/server/models/job_validation/messages.js
+++ b/x-pack/legacy/plugins/ml/server/models/job_validation/messages.js
@@ -14,6 +14,8 @@ export const getMessages = () => {
     return messages;
   }
 
+  const createJobsDocsUrl = `https://www.elastic.co/guide/en/machine-learning/{{version}}/create-jobs.html`;
+
   return (messages = {
     field_not_aggregatable: {
       status: 'ERROR',
@@ -24,7 +26,7 @@ export const getMessages = () => {
         },
       }),
       url:
-        'https://www.elastic.co/guide/en/elastic-stack-overview/{{version}}/ml-configuring-aggregation.html',
+        'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-configuring-aggregation.html',
     },
     fields_not_aggregatable: {
       status: 'ERROR',
@@ -32,7 +34,7 @@ export const getMessages = () => {
         defaultMessage: 'One of the detector fields is not an aggregatable field.',
       }),
       url:
-        'https://www.elastic.co/guide/en/elastic-stack-overview/{{version}}/ml-configuring-aggregation.html',
+        'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-configuring-aggregation.html',
     },
     cardinality_by_field: {
       status: 'WARNING',
@@ -43,7 +45,7 @@ export const getMessages = () => {
           fieldName: 'by_field "{{fieldName}}"',
         },
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#cardinality',
+      url: `${createJobsDocsUrl}#cardinality`,
     },
     cardinality_over_field_low: {
       status: 'WARNING',
@@ -57,7 +59,7 @@ export const getMessages = () => {
           },
         }
       ),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#cardinality',
+      url: `${createJobsDocsUrl}#cardinality`,
     },
     cardinality_over_field_high: {
       status: 'WARNING',
@@ -71,7 +73,7 @@ export const getMessages = () => {
           },
         }
       ),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#cardinality',
+      url: `${createJobsDocsUrl}#cardinality`,
     },
     cardinality_partition_field: {
       status: 'WARNING',
@@ -85,7 +87,7 @@ export const getMessages = () => {
           },
         }
       ),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#cardinality',
+      url: `${createJobsDocsUrl}#cardinality`,
     },
     cardinality_model_plot_high: {
       status: 'WARNING',
@@ -110,7 +112,7 @@ export const getMessages = () => {
         }
       ),
       url:
-        'https://www.elastic.co/guide/en/elastic-stack-overview/{{version}}/ml-configuring-categories.html',
+        'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-configuring-categories.html',
     },
     categorization_filters_invalid: {
       status: 'ERROR',
@@ -155,7 +157,7 @@ export const getMessages = () => {
           },
         }
       ),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#bucket-span',
+      url: `${createJobsDocsUrl}#bucket-span`,
     },
     bucket_span_high: {
       status: 'INFO',
@@ -166,7 +168,7 @@ export const getMessages = () => {
         defaultMessage:
           'Bucket span is 1 day or more. Be aware that days are considered as UTC days, not local days.',
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#bucket-span',
+      url: `${createJobsDocsUrl}#bucket-span`,
     },
     bucket_span_valid: {
       status: 'SUCCESS',
@@ -209,21 +211,21 @@ export const getMessages = () => {
           partitionFieldNameParam: `'partition_field_name'`,
         },
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#detectors',
+      url: `${createJobsDocsUrl}#detectors`,
     },
     detectors_empty: {
       status: 'ERROR',
       text: i18n.translate('xpack.ml.models.jobValidation.messages.detectorsEmptyMessage', {
         defaultMessage: 'No detectors were found. At least one detector must be specified.',
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#detectors',
+      url: `${createJobsDocsUrl}#detectors`,
     },
     detectors_function_empty: {
       status: 'ERROR',
       text: i18n.translate('xpack.ml.models.jobValidation.messages.detectorsFunctionEmptyMessage', {
         defaultMessage: 'One of the detector functions is empty.',
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#detectors',
+      url: `${createJobsDocsUrl}#detectors`,
     },
     detectors_function_not_empty: {
       status: 'SUCCESS',
@@ -239,7 +241,7 @@ export const getMessages = () => {
           defaultMessage: 'Presence of detector functions validated in all detectors.',
         }
       ),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#detectors',
+      url: `${createJobsDocsUrl}#detectors`,
     },
     index_fields_invalid: {
       status: 'ERROR',
@@ -260,7 +262,7 @@ export const getMessages = () => {
           'The job configuration includes more than 3 influencers. ' +
           'Consider using fewer influencers or creating multiple jobs.',
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#influencers',
+      url: 'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-influencers.html',
     },
     influencer_low: {
       status: 'WARNING',
@@ -268,7 +270,7 @@ export const getMessages = () => {
         defaultMessage:
           'No influencers have been configured. Picking an influencer is strongly recommended.',
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#influencers',
+      url: 'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-influencers.html',
     },
     influencer_low_suggestion: {
       status: 'WARNING',
@@ -280,7 +282,7 @@ export const getMessages = () => {
           values: { influencerSuggestion: '{{influencerSuggestion}}' },
         }
       ),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#influencers',
+      url: 'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-influencers.html',
     },
     influencer_low_suggestions: {
       status: 'WARNING',
@@ -292,7 +294,7 @@ export const getMessages = () => {
           values: { influencerSuggestion: '{{influencerSuggestion}}' },
         }
       ),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#influencers',
+      url: 'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-influencers.html',
     },
     job_id_empty: {
       status: 'ERROR',
@@ -401,7 +403,7 @@ export const getMessages = () => {
       text: i18n.translate('xpack.ml.models.jobValidation.messages.successCardinalityMessage', {
         defaultMessage: 'Cardinality of detector fields is within recommended bounds.',
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#cardinality',
+      url: `${createJobsDocsUrl}#cardinality`,
     },
     success_bucket_span: {
       status: 'SUCCESS',
@@ -412,14 +414,14 @@ export const getMessages = () => {
         defaultMessage: 'Format of {bucketSpan} is valid and passed validation checks.',
         values: { bucketSpan: '"{{bucketSpan}}"' },
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#bucket-span',
+      url: `${createJobsDocsUrl}#bucket-span`,
     },
     success_influencers: {
       status: 'SUCCESS',
       text: i18n.translate('xpack.ml.models.jobValidation.messages.successInfluencersMessage', {
         defaultMessage: 'Influencer configuration passed the validation checks.',
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#influencers',
+      url: 'https://www.elastic.co/guide/en/machine-learning/{{version}}/ml-influencers.html',
     },
     estimated_mml_greater_than_max_mml: {
       status: 'WARNING',
@@ -446,7 +448,7 @@ export const getMessages = () => {
           '1MB and should be specified in bytes e.g. 10MB.',
         values: { mml: '{{mml}}' },
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#model-memory-limits',
+      url: `${createJobsDocsUrl}#model-memory-limits`,
     },
     half_estimated_mml_greater_than_mml: {
       status: 'WARNING',
@@ -458,7 +460,7 @@ export const getMessages = () => {
             'memory limit and will likely hit the hard limit.',
         }
       ),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#model-memory-limits',
+      url: `${createJobsDocsUrl}#model-memory-limits`,
     },
     estimated_mml_greater_than_mml: {
       status: 'INFO',
@@ -469,7 +471,7 @@ export const getMessages = () => {
             'The estimated model memory limit is greater than the model memory limit you have configured.',
         }
       ),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#model-memory-limits',
+      url: `${createJobsDocsUrl}#model-memory-limits`,
     },
     success_mml: {
       status: 'SUCCESS',
@@ -479,7 +481,7 @@ export const getMessages = () => {
       text: i18n.translate('xpack.ml.models.jobValidation.messages.successMmlMessage', {
         defaultMessage: 'Valid and within the estimated model memory limit.',
       }),
-      url: 'https://www.elastic.co/guide/en/kibana/{{version}}/job-tips.html#model-memory-limits',
+      url: `${createJobsDocsUrl}#model-memory-limits`,
     },
     success_time_range: {
       status: 'SUCCESS',
diff --git a/x-pack/legacy/plugins/ml/server/models/results_service/get_partition_fields_values.ts b/x-pack/legacy/plugins/ml/server/models/results_service/get_partition_fields_values.ts
new file mode 100644
index 0000000000000..00e3002a7fc71
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/models/results_service/get_partition_fields_values.ts
@@ -0,0 +1,161 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { ML_RESULTS_INDEX_PATTERN } from '../../../common/constants/index_patterns';
+import { callWithRequestType } from '../../../common/types/kibana';
+
+interface CriteriaField {
+  fieldName: string;
+  fieldValue: any;
+}
+
+const PARTITION_FIELDS = ['partition_field', 'over_field', 'by_field'] as const;
+
+type PartitionFieldsType = typeof PARTITION_FIELDS[number];
+
+type SearchTerm =
+  | {
+      [key in PartitionFieldsType]?: string;
+    }
+  | undefined;
+
+/**
+ * Gets an object for aggregation query to retrieve field name and values.
+ * @param fieldType - Field type
+ * @param query - Optional query string for partition value
+ * @returns {Object}
+ */
+function getFieldAgg(fieldType: PartitionFieldsType, query?: string) {
+  const AGG_SIZE = 100;
+
+  const fieldNameKey = `${fieldType}_name`;
+  const fieldValueKey = `${fieldType}_value`;
+
+  return {
+    [fieldNameKey]: {
+      terms: {
+        field: fieldNameKey,
+      },
+    },
+    [fieldValueKey]: {
+      filter: {
+        wildcard: {
+          [fieldValueKey]: {
+            value: query ? `*${query}*` : '*',
+          },
+        },
+      },
+      aggs: {
+        values: {
+          terms: {
+            size: AGG_SIZE,
+            field: fieldValueKey,
+          },
+        },
+      },
+    },
+  };
+}
+
+/**
+ * Gets formatted result for particular field from aggregation response.
+ * @param fieldType - Field type
+ * @param aggs - Aggregation response
+ */
+function getFieldObject(fieldType: PartitionFieldsType, aggs: any) {
+  const fieldNameKey = `${fieldType}_name`;
+  const fieldValueKey = `${fieldType}_value`;
+
+  return aggs[fieldNameKey].buckets.length > 0
+    ? {
+        [fieldType]: {
+          name: aggs[fieldNameKey].buckets[0].key,
+          values: aggs[fieldValueKey].values.buckets.map(({ key }: any) => key),
+        },
+      }
+    : {};
+}
+
+export const getPartitionFieldsValuesFactory = (callWithRequest: callWithRequestType) =>
+  /**
+   * Gets the record of partition fields with possible values that fit the provided queries.
+   * @param jobId - Job ID
+   * @param searchTerm - object of queries for partition fields, e.g. { partition_field: 'query' }
+   * @param criteriaFields - key - value pairs of the term field, e.g. { detector_index: 0 }
+   * @param earliestMs
+   * @param latestMs
+   */
+  async function getPartitionFieldsValues(
+    jobId: string,
+    searchTerm: SearchTerm = {},
+    criteriaFields: CriteriaField[],
+    earliestMs: number,
+    latestMs: number
+  ) {
+    const jobsResponse = await callWithRequest('ml.jobs', { jobId: [jobId] });
+    if (jobsResponse.count === 0 || jobsResponse.jobs === undefined) {
+      throw Boom.notFound(`Job with the id "${jobId}" not found`);
+    }
+
+    const job = jobsResponse.jobs[0];
+
+    const isModelPlotEnabled = job?.model_plot_config?.enabled;
+
+    const resp = await callWithRequest('search', {
+      index: ML_RESULTS_INDEX_PATTERN,
+      size: 0,
+      body: {
+        query: {
+          bool: {
+            filter: [
+              ...criteriaFields.map(({ fieldName, fieldValue }) => {
+                return {
+                  term: {
+                    [fieldName]: fieldValue,
+                  },
+                };
+              }),
+              {
+                term: {
+                  job_id: jobId,
+                },
+              },
+              {
+                range: {
+                  timestamp: {
+                    gte: earliestMs,
+                    lte: latestMs,
+                    format: 'epoch_millis',
+                  },
+                },
+              },
+              {
+                term: {
+                  result_type: isModelPlotEnabled ? 'model_plot' : 'record',
+                },
+              },
+            ],
+          },
+        },
+        aggs: {
+          ...PARTITION_FIELDS.reduce((acc, key) => {
+            return {
+              ...acc,
+              ...getFieldAgg(key, searchTerm[key]),
+            };
+          }, {}),
+        },
+      },
+    });
+
+    return PARTITION_FIELDS.reduce((acc, key) => {
+      return {
+        ...acc,
+        ...getFieldObject(key, resp.aggregations),
+      };
+    }, {});
+  };
diff --git a/x-pack/legacy/plugins/ml/server/models/results_service/results_service.js b/x-pack/legacy/plugins/ml/server/models/results_service/results_service.js
index c779664978f63..3ee5d04186ff1 100644
--- a/x-pack/legacy/plugins/ml/server/models/results_service/results_service.js
+++ b/x-pack/legacy/plugins/ml/server/models/results_service/results_service.js
@@ -10,6 +10,7 @@ import moment from 'moment';
 import { buildAnomalyTableItems } from './build_anomaly_table_items';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../common/constants/index_patterns';
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
+import { getPartitionFieldsValuesFactory } from './get_partition_fields_values';
 
 // Service for carrying out Elasticsearch queries to obtain data for the
 // ML Results dashboards.
@@ -408,5 +409,6 @@ export function resultsServiceProvider(callWithRequest) {
     getCategoryExamples,
     getLatestBucketTimestampByJob,
     getMaxAnomalyScore,
+    getPartitionFieldsValues: getPartitionFieldsValuesFactory(callWithRequest),
   };
 }
diff --git a/x-pack/legacy/plugins/ml/server/new_platform/data_analytics_schema.ts b/x-pack/legacy/plugins/ml/server/new_platform/data_analytics_schema.ts
new file mode 100644
index 0000000000000..f5d72c51dc070
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/new_platform/data_analytics_schema.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 { schema } from '@kbn/config-schema';
+
+export const dataAnalyticsJobConfigSchema = {
+  description: schema.maybe(schema.string()),
+  dest: schema.object({
+    index: schema.string(),
+    results_field: schema.maybe(schema.string()),
+  }),
+  source: schema.object({
+    index: schema.string(),
+  }),
+  analysis: schema.any(),
+  analyzed_fields: schema.any(),
+  model_memory_limit: schema.string(),
+};
+
+export const dataAnalyticsEvaluateSchema = {
+  index: schema.string(),
+  query: schema.maybe(schema.any()),
+  evaluation: schema.maybe(
+    schema.object({
+      regression: schema.maybe(schema.any()),
+      classification: schema.maybe(schema.any()),
+    })
+  ),
+};
+
+export const dataAnalyticsExplainSchema = {
+  description: schema.maybe(schema.string()),
+  dest: schema.maybe(schema.any()),
+  source: schema.object({
+    index: schema.string(),
+  }),
+  analysis: schema.any(),
+  analyzed_fields: schema.maybe(schema.any()),
+  model_memory_limit: schema.maybe(schema.string()),
+};
diff --git a/x-pack/legacy/plugins/ml/server/new_platform/licence_check_pre_routing_factory.ts b/x-pack/legacy/plugins/ml/server/new_platform/licence_check_pre_routing_factory.ts
new file mode 100644
index 0000000000000..cc77d2872fb90
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/new_platform/licence_check_pre_routing_factory.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 {
+  KibanaRequest,
+  KibanaResponseFactory,
+  RequestHandler,
+  RequestHandlerContext,
+} from 'src/core/server';
+import { PLUGIN_ID, MlXpackMainPlugin } from './plugin';
+
+export const licensePreRoutingFactory = (
+  xpackMainPlugin: MlXpackMainPlugin,
+  handler: RequestHandler<any, any, any>
+): RequestHandler<any, any, any> => {
+  // License checking and enable/disable logic
+  return function licensePreRouting(
+    ctx: RequestHandlerContext,
+    request: KibanaRequest,
+    response: KibanaResponseFactory
+  ) {
+    const licenseCheckResults = xpackMainPlugin.info.feature(PLUGIN_ID).getLicenseCheckResults();
+
+    if (!licenseCheckResults.isAvailable) {
+      return response.forbidden({
+        body: {
+          message: licenseCheckResults.message,
+        },
+      });
+    }
+
+    return handler(ctx, request, response);
+  };
+};
diff --git a/x-pack/legacy/plugins/ml/server/new_platform/plugin.ts b/x-pack/legacy/plugins/ml/server/new_platform/plugin.ts
index c468c87d7abc8..681b2ff20c8aa 100644
--- a/x-pack/legacy/plugins/ml/server/new_platform/plugin.ts
+++ b/x-pack/legacy/plugins/ml/server/new_platform/plugin.ts
@@ -8,9 +8,16 @@ import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
 import { ServerRoute } from 'hapi';
 import { KibanaConfig, SavedObjectsLegacyService } from 'src/legacy/server/kbn_server';
-import { Logger, PluginInitializerContext, CoreSetup } from 'src/core/server';
+import {
+  Logger,
+  PluginInitializerContext,
+  CoreSetup,
+  IRouter,
+  IScopedClusterClient,
+} from 'src/core/server';
 import { ElasticsearchPlugin } from 'src/legacy/core_plugins/elasticsearch';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { ElasticsearchServiceSetup } from 'src/core/server';
 import { CloudSetup } from '../../../../../plugins/cloud/server';
 import { XPackMainPlugin } from '../../../xpack_main/server/xpack_main';
 import { addLinksToSampleDatasets } from '../lib/sample_data_sets';
@@ -55,6 +62,11 @@ import { jobAuditMessagesRoutes } from '../routes/job_audit_messages';
 // @ts-ignore: could not find declaration file for module
 import { fileDataVisualizerRoutes } from '../routes/file_data_visualizer';
 import { initMlServerLog, LogInitialization } from '../client/log';
+import { HomeServerPluginSetup } from '../../../../../../src/plugins/home/server';
+// @ts-ignore: could not find declaration file for module
+import { elasticsearchJsPlugin } from '../client/elasticsearch_ml';
+
+export const PLUGIN_ID = 'ml';
 
 type CoreHttpSetup = CoreSetup['http'];
 export interface MlHttpServiceSetup extends CoreHttpSetup {
@@ -66,10 +78,10 @@ export interface MlXpackMainPlugin extends XPackMainPlugin {
 }
 
 export interface MlCoreSetup {
-  addAppLinksToSampleDataset: () => any;
   injectUiAppVars: (id: string, callback: () => {}) => any;
   http: MlHttpServiceSetup;
   savedObjects: SavedObjectsLegacyService;
+  elasticsearch: ElasticsearchServiceSetup;
 }
 export interface MlInitializerContext extends PluginInitializerContext {
   legacyConfig: KibanaConfig;
@@ -82,15 +94,19 @@ export interface PluginsSetup {
   spaces: any;
   usageCollection?: UsageCollectionSetup;
   cloud?: CloudSetup;
+  home?: HomeServerPluginSetup;
   // TODO: this is temporary for `mirrorPluginStatus`
   ml: any;
 }
+
 export interface RouteInitialization {
   commonRouteConfig: any;
   config?: any;
   elasticsearchPlugin: ElasticsearchPlugin;
+  elasticsearchService: ElasticsearchServiceSetup;
   route(route: ServerRoute | ServerRoute[]): void;
-  xpackMainPlugin?: MlXpackMainPlugin;
+  router: IRouter;
+  xpackMainPlugin: MlXpackMainPlugin;
   savedObjects?: SavedObjectsLegacyService;
   spacesPlugin: any;
   cloud?: CloudSetup;
@@ -100,8 +116,16 @@ export interface UsageInitialization {
   savedObjects: SavedObjectsLegacyService;
 }
 
+declare module 'kibana/server' {
+  interface RequestHandlerContext {
+    ml?: {
+      mlClient: IScopedClusterClient;
+    };
+  }
+}
+
 export class Plugin {
-  private readonly pluginId: string = 'ml';
+  private readonly pluginId: string = PLUGIN_ID;
   private config: any;
   private log: Logger;
 
@@ -112,7 +136,7 @@ export class Plugin {
 
   public setup(core: MlCoreSetup, plugins: PluginsSetup) {
     const xpackMainPlugin: MlXpackMainPlugin = plugins.xpackMain;
-    const { addAppLinksToSampleDataset, http, injectUiAppVars } = core;
+    const { http, injectUiAppVars } = core;
     const pluginId = this.pluginId;
 
     mirrorPluginStatus(xpackMainPlugin, plugins.ml);
@@ -124,10 +148,12 @@ export class Plugin {
 
       // Add links to the Kibana sample data sets if ml is enabled
       // and there is a full license (trial or platinum).
-      if (mlFeature.isEnabled() === true) {
+      if (mlFeature.isEnabled() === true && plugins.home) {
         const licenseCheckResults = mlFeature.getLicenseCheckResults();
         if (licenseCheckResults.licenseType === LICENSE_TYPE.FULL) {
-          addLinksToSampleDatasets({ addAppLinksToSampleDataset });
+          addLinksToSampleDatasets({
+            addAppLinksToSampleDataset: plugins.home.sampleData.addAppLinksToSampleDataset,
+          });
         }
       }
     });
@@ -180,17 +206,27 @@ export class Plugin {
       };
     });
 
+    // Can access via new platform router's handler function 'context' parameter - context.ml.mlClient
+    const mlClient = core.elasticsearch.createClient('ml', { plugins: [elasticsearchJsPlugin] });
+    http.registerRouteHandlerContext('ml', (context, request) => {
+      return {
+        mlClient: mlClient.asScoped(request),
+      };
+    });
+
     const routeInitializationDeps: RouteInitialization = {
       commonRouteConfig,
       route: http.route,
+      router: http.createRouter(),
       elasticsearchPlugin: plugins.elasticsearch,
+      elasticsearchService: core.elasticsearch,
+      xpackMainPlugin: plugins.xpackMain,
       spacesPlugin: plugins.spaces,
     };
 
     const extendedRouteInitializationDeps: RouteInitialization = {
       ...routeInitializationDeps,
       config: this.config,
-      xpackMainPlugin: plugins.xpackMain,
       savedObjects: core.savedObjects,
       spacesPlugin: plugins.spaces,
       cloud: plugins.cloud,
diff --git a/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.js b/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.js
deleted file mode 100644
index 567d7e1856a85..0000000000000
--- a/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.js
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { callWithRequestFactory } from '../client/call_with_request_factory';
-import { wrapError } from '../client/errors';
-import { analyticsAuditMessagesProvider } from '../models/data_frame_analytics/analytics_audit_messages';
-
-export function dataFrameAnalyticsRoutes({ commonRouteConfig, elasticsearchPlugin, route }) {
-  route({
-    method: 'GET',
-    path: '/api/ml/data_frame/analytics',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      return callWithRequest('ml.getDataFrameAnalytics').catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'GET',
-    path: '/api/ml/data_frame/analytics/{analyticsId}',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const { analyticsId } = request.params;
-      return callWithRequest('ml.getDataFrameAnalytics', { analyticsId }).catch(resp =>
-        wrapError(resp)
-      );
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'GET',
-    path: '/api/ml/data_frame/analytics/_stats',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      return callWithRequest('ml.getDataFrameAnalyticsStats').catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'GET',
-    path: '/api/ml/data_frame/analytics/{analyticsId}/_stats',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const { analyticsId } = request.params;
-      return callWithRequest('ml.getDataFrameAnalyticsStats', { analyticsId }).catch(resp =>
-        wrapError(resp)
-      );
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'PUT',
-    path: '/api/ml/data_frame/analytics/{analyticsId}',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const { analyticsId } = request.params;
-      return callWithRequest('ml.createDataFrameAnalytics', {
-        body: request.payload,
-        analyticsId,
-      }).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'POST',
-    path: '/api/ml/data_frame/_evaluate',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      return callWithRequest('ml.evaluateDataFrameAnalytics', {
-        body: request.payload,
-      }).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'POST',
-    path: '/api/ml/data_frame/analytics/_explain',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      return callWithRequest('ml.estimateDataFrameAnalyticsMemoryUsage', {
-        body: request.payload,
-      }).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'DELETE',
-    path: '/api/ml/data_frame/analytics/{analyticsId}',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const { analyticsId } = request.params;
-      return callWithRequest('ml.deleteDataFrameAnalytics', { analyticsId }).catch(resp =>
-        wrapError(resp)
-      );
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'POST',
-    path: '/api/ml/data_frame/analytics/{analyticsId}/_start',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const options = {
-        analyticsId: request.params.analyticsId,
-      };
-
-      return callWithRequest('ml.startDataFrameAnalytics', options).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'POST',
-    path: '/api/ml/data_frame/analytics/{analyticsId}/_stop',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const options = {
-        analyticsId: request.params.analyticsId,
-      };
-
-      if (request.query.force !== undefined) {
-        options.force = request.query.force;
-      }
-
-      return callWithRequest('ml.stopDataFrameAnalytics', options).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'GET',
-    path: '/api/ml/data_frame/analytics/{analyticsId}/messages',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const { getAnalyticsAuditMessages } = analyticsAuditMessagesProvider(callWithRequest);
-      const { analyticsId } = request.params;
-      return getAnalyticsAuditMessages(analyticsId).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.ts
new file mode 100644
index 0000000000000..7b855e5f87cbf
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.ts
@@ -0,0 +1,289 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { wrapError } from '../client/error_wrapper';
+import { analyticsAuditMessagesProvider } from '../models/data_frame_analytics/analytics_audit_messages';
+import { licensePreRoutingFactory } from '../new_platform/licence_check_pre_routing_factory';
+import { RouteInitialization } from '../new_platform/plugin';
+import {
+  dataAnalyticsJobConfigSchema,
+  dataAnalyticsEvaluateSchema,
+  dataAnalyticsExplainSchema,
+} from '../new_platform/data_analytics_schema';
+
+export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteInitialization) {
+  router.get(
+    {
+      path: '/api/ml/data_frame/analytics',
+      validate: {
+        params: schema.object({ analyticsId: schema.maybe(schema.string()) }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.getDataFrameAnalytics');
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.get(
+    {
+      path: '/api/ml/data_frame/analytics/{analyticsId}',
+      validate: {
+        params: schema.object({ analyticsId: schema.string() }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { analyticsId } = request.params;
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.getDataFrameAnalytics', {
+          analyticsId,
+        });
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.get(
+    {
+      path: '/api/ml/data_frame/analytics/_stats',
+      validate: false,
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const results = await context.ml!.mlClient.callAsCurrentUser(
+          'ml.getDataFrameAnalyticsStats'
+        );
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.get(
+    {
+      path: '/api/ml/data_frame/analytics/{analyticsId}/_stats',
+      validate: {
+        params: schema.object({ analyticsId: schema.string() }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { analyticsId } = request.params;
+        const results = await context.ml!.mlClient.callAsCurrentUser(
+          'ml.getDataFrameAnalyticsStats',
+          {
+            analyticsId,
+          }
+        );
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.put(
+    {
+      path: '/api/ml/data_frame/analytics/{analyticsId}',
+      validate: {
+        params: schema.object({
+          analyticsId: schema.string(),
+        }),
+        body: schema.object({ ...dataAnalyticsJobConfigSchema }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { analyticsId } = request.params;
+        const results = await context.ml!.mlClient.callAsCurrentUser(
+          'ml.createDataFrameAnalytics',
+          {
+            body: request.body,
+            analyticsId,
+          }
+        );
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.post(
+    {
+      path: '/api/ml/data_frame/_evaluate',
+      validate: {
+        body: schema.object({ ...dataAnalyticsEvaluateSchema }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const results = await context.ml!.mlClient.callAsCurrentUser(
+          'ml.evaluateDataFrameAnalytics',
+          {
+            body: request.body,
+          }
+        );
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.post(
+    {
+      path: '/api/ml/data_frame/analytics/_explain',
+      validate: {
+        body: schema.object({ ...dataAnalyticsExplainSchema }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const results = await context.ml!.mlClient.callAsCurrentUser(
+          'ml.explainDataFrameAnalytics',
+          {
+            body: request.body,
+          }
+        );
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.delete(
+    {
+      path: '/api/ml/data_frame/analytics/{analyticsId}',
+      validate: {
+        params: schema.object({
+          analyticsId: schema.string(),
+        }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { analyticsId } = request.params;
+        const results = await context.ml!.mlClient.callAsCurrentUser(
+          'ml.deleteDataFrameAnalytics',
+          {
+            analyticsId,
+          }
+        );
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.post(
+    {
+      path: '/api/ml/data_frame/analytics/{analyticsId}/_start',
+      validate: {
+        params: schema.object({
+          analyticsId: schema.string(),
+        }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { analyticsId } = request.params;
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.startDataFrameAnalytics', {
+          analyticsId,
+        });
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.post(
+    {
+      path: '/api/ml/data_frame/analytics/{analyticsId}/_stop',
+      validate: {
+        params: schema.object({
+          analyticsId: schema.string(),
+          force: schema.maybe(schema.boolean()),
+        }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const options: { analyticsId: string; force?: boolean | undefined } = {
+          analyticsId: request.params.analyticsId,
+        };
+        // @ts-ignore TODO: update types
+        if (request.url?.query?.force !== undefined) {
+          // @ts-ignore TODO: update types
+          options.force = request.url.query.force;
+        }
+
+        const results = await context.ml!.mlClient.callAsCurrentUser(
+          'ml.stopDataFrameAnalytics',
+          options
+        );
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.get(
+    {
+      path: '/api/ml/data_frame/analytics/{analyticsId}/messages',
+      validate: {
+        params: schema.object({ analyticsId: schema.string() }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { analyticsId } = request.params;
+        const { getAnalyticsAuditMessages } = analyticsAuditMessagesProvider(
+          context.ml!.mlClient.callAsCurrentUser
+        );
+
+        const results = await getAnalyticsAuditMessages(analyticsId);
+        return response.ok({
+          body: results,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+}
diff --git a/x-pack/legacy/plugins/ml/server/routes/results_service.js b/x-pack/legacy/plugins/ml/server/routes/results_service.js
index 6d456e6a0412e..a658729e85083 100644
--- a/x-pack/legacy/plugins/ml/server/routes/results_service.js
+++ b/x-pack/legacy/plugins/ml/server/routes/results_service.js
@@ -55,6 +55,12 @@ function getMaxAnomalyScore(callWithRequest, payload) {
   return rs.getMaxAnomalyScore(jobIds, earliestMs, latestMs);
 }
 
+function getPartitionFieldsValues(callWithRequest, payload) {
+  const rs = resultsServiceProvider(callWithRequest);
+  const { jobId, searchTerm, criteriaFields, earliestMs, latestMs } = payload;
+  return rs.getPartitionFieldsValues(jobId, searchTerm, criteriaFields, earliestMs, latestMs);
+}
+
 export function resultsServiceRoutes({ commonRouteConfig, elasticsearchPlugin, route }) {
   route({
     method: 'POST',
@@ -103,4 +109,18 @@ export function resultsServiceRoutes({ commonRouteConfig, elasticsearchPlugin, r
       ...commonRouteConfig,
     },
   });
+
+  route({
+    method: 'POST',
+    path: '/api/ml/results/partition_fields_values',
+    handler(request) {
+      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
+      return getPartitionFieldsValues(callWithRequest, request.payload).catch(resp =>
+        wrapError(resp)
+      );
+    },
+    config: {
+      ...commonRouteConfig,
+    },
+  });
 }
diff --git a/x-pack/legacy/plugins/monitoring/common/constants.js b/x-pack/legacy/plugins/monitoring/common/constants.js
index e4936d8003552..917f7fab1ed30 100644
--- a/x-pack/legacy/plugins/monitoring/common/constants.js
+++ b/x-pack/legacy/plugins/monitoring/common/constants.js
@@ -96,7 +96,7 @@ export const CALCULATE_DURATION_UNTIL = 'until';
 /**
  * In order to show ML Jobs tab in the Elasticsearch section / tab navigation, license must be supported
  */
-export const ML_SUPPORTED_LICENSES = ['trial', 'platinum'];
+export const ML_SUPPORTED_LICENSES = ['trial', 'platinum', 'enterprise'];
 
 /**
  * Metadata service URLs for the different cloud services that have constant URLs (e.g., unlike GCP, which is a constant prefix).
diff --git a/x-pack/legacy/plugins/monitoring/index.js b/x-pack/legacy/plugins/monitoring/index.js
index f78f8d45d6440..8e0201bea710b 100644
--- a/x-pack/legacy/plugins/monitoring/index.js
+++ b/x-pack/legacy/plugins/monitoring/index.js
@@ -22,7 +22,7 @@ export const monitoring = kibana =>
     id: 'monitoring',
     configPrefix: 'xpack.monitoring',
     publicDir: resolve(__dirname, 'public'),
-    init(server, _options) {
+    init(server) {
       const configs = [
         'xpack.monitoring.ui.enabled',
         'xpack.monitoring.kibana.collection.enabled',
@@ -68,12 +68,13 @@ export const monitoring = kibana =>
         _hapi: server,
         _kbnServer: this.kbnServer,
       };
-      const { usageCollection } = server.newPlatform.setup.plugins;
+      const { usageCollection, licensing } = server.newPlatform.setup.plugins;
       const plugins = {
         xpack_main: server.plugins.xpack_main,
         elasticsearch: server.plugins.elasticsearch,
         infra: server.plugins.infra,
         usageCollection,
+        licensing,
       };
 
       new Plugin().setup(serverFacade, plugins);
diff --git a/x-pack/legacy/plugins/monitoring/public/components/alerts/alerts.js b/x-pack/legacy/plugins/monitoring/public/components/alerts/alerts.js
index 908e369ec0386..4c2f3b027bc8a 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/alerts/alerts.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/alerts/alerts.js
@@ -29,7 +29,16 @@ const getColumns = (kbnUrl, scope) => [
     field: 'status',
     sortable: true,
     render: severity => {
-      const severityIcon = mapSeverity(severity);
+      const severityIconDefaults = {
+        title: i18n.translate('xpack.monitoring.alerts.severityTitle.unknown', {
+          defaultMessage: 'Unknown',
+        }),
+        color: 'subdued',
+        value: i18n.translate('xpack.monitoring.alerts.severityValue.unknown', {
+          defaultMessage: 'N/A',
+        }),
+      };
+      const severityIcon = { ...severityIconDefaults, ...mapSeverity(severity) };
 
       return (
         <EuiToolTip content={severityIcon.title} position="bottom">
diff --git a/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap
index 352f156bcf8e5..8065cb8a3fa30 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/beats/overview/__snapshots__/overview.test.js.snap
@@ -1,16 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Overview that overview page renders normally 1`] = `
-<EuiPage
-  restrictWidth={false}
->
-  <EuiPageBody
-    component="main"
-    restrictWidth={false}
-  >
-    <EuiPageContent
-      panelPaddingSize="l"
-    >
+<EuiPage>
+  <EuiPageBody>
+    <EuiPageContent>
       <Stats
         stats={Array []}
       />
@@ -199,16 +192,9 @@ exports[`Overview that overview page renders normally 1`] = `
 `;
 
 exports[`Overview that overview page shows a message if there is no beats data 1`] = `
-<EuiPage
-  restrictWidth={false}
->
-  <EuiPageBody
-    component="main"
-    restrictWidth={false}
-  >
-    <EuiPageContent
-      panelPaddingSize="l"
-    >
+<EuiPage>
+  <EuiPageBody>
+    <EuiPageContent>
       <Stats
         stats={Array []}
       />
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 c3ca241c73cc0..5c9cddf9c2902 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
@@ -46,7 +46,7 @@ export class ChartTarget extends React.Component {
         return seriesToShow.some(id => id.toLowerCase() === metric.id.toLowerCase());
       };
     }
-    return _metric => true;
+    return () => true;
   }
 
   UNSAFE_componentWillReceiveProps(newProps) {
diff --git a/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.test.js b/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.test.js
index bf0d5fdd24879..56eb52fa86235 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.test.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/chart/chart_target.test.js
@@ -38,8 +38,8 @@ const props = {
     max: 1562962539851,
   },
   hasLegend: true,
-  onBrush: _ => void 0,
-  tickFormatter: _ => void 0,
+  onBrush: () => void 0,
+  tickFormatter: () => void 0,
   updateLegend: () => void 0,
 };
 
diff --git a/x-pack/legacy/plugins/monitoring/public/components/cluster/listing/listing.js b/x-pack/legacy/plugins/monitoring/public/components/cluster/listing/listing.js
index 432aa124e6069..7e88890ea9316 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/cluster/listing/listing.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/cluster/listing/listing.js
@@ -45,7 +45,13 @@ const IsAlertsSupported = props => {
     return <span>{props.children}</span>;
   }
 
-  const message = alertsMeta.message || clusterMeta.message;
+  const message =
+    alertsMeta.message ||
+    clusterMeta.message ||
+    i18n.translate('xpack.monitoring.cluster.listing.unknownHealthMessage', {
+      defaultMessage: 'Unknown',
+    });
+
   return (
     <EuiToolTip content={message} position="bottom">
       <EuiHealth color="subdued" data-test-subj="alertIcon">
diff --git a/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js b/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js
index 7ce3e890cdeaf..fc23110f940e8 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js
@@ -117,6 +117,9 @@ const logLevelText = {
   fatal: i18n.translate('xpack.monitoring.cluster.overview.esPanel.fatalLogsTooltipText', {
     defaultMessage: 'The number of fatal logs',
   }),
+  unknown: i18n.translate('xpack.monitoring.cluster.overview.esPanel.unknownLogsTooltipText', {
+    defaultMessage: 'Unknown',
+  }),
 };
 
 function renderLog(log) {
@@ -124,7 +127,7 @@ function renderLog(log) {
     <EuiFlexGroup wrap responsive={false} gutterSize="xs">
       {log.levels.map((level, index) => (
         <EuiFlexItem grow={false} key={index}>
-          <EuiToolTip position="top" content={logLevelText[level.level]}>
+          <EuiToolTip position="top" content={logLevelText[level.level] || logLevelText.unknown}>
             <EuiBadge color={getBadgeColorFromLogLevel(level.level)}>
               {formatNumber(level.count, 'int_commas')}
             </EuiBadge>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap
index da83a4d7def14..bb765d0ab7b4e 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr/__snapshots__/ccr.test.js.snap
@@ -1,16 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Ccr that it renders normally 1`] = `
-<EuiPage
-  restrictWidth={false}
->
-  <EuiPageBody
-    component="main"
-    restrictWidth={false}
-  >
-    <EuiPageContent
-      panelPaddingSize="l"
-    >
+<EuiPage>
+  <EuiPageBody>
+    <EuiPageContent>
       <EuiPageContentBody>
         <EuiInMemoryTable
           className="monitoringElasticsearchCcrListingTable"
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
index a980a3b04684d..3d03d13dde1e1 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
@@ -51,17 +51,13 @@ exports[`CcrShard that is renders an exception properly 1`] = `
 
 exports[`CcrShard that it renders normally 1`] = `
 <EuiPage
-  restrictWidth={false}
   style={
     Object {
       "backgroundColor": "white",
     }
   }
 >
-  <EuiPageBody
-    component="main"
-    restrictWidth={false}
-  >
+  <EuiPageBody>
     <Status
       formattedLeader="leader on remote"
       oldestStat={
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
index 74aea88e812f6..428da4ca913aa 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/nodes/nodes.js
@@ -29,6 +29,29 @@ import _ from 'lodash';
 import { ELASTICSEARCH_SYSTEM_ID } from '../../../../common/constants';
 import { ListingCallOut } from '../../setup_mode/listing_callout';
 
+const getNodeTooltip = node => {
+  const { nodeTypeLabel, nodeTypeClass } = node;
+
+  const nodeTypeLabelContent =
+    nodeTypeLabel ||
+    i18n.translate('xpack.monitoring.elasticsearch.nodes.unknownNodeTypeLabel', {
+      defaultMessage: 'Unknown',
+    });
+  const nodeTypeClassIcon = nodeTypeClass || 'empty';
+
+  if (nodeTypeLabel) {
+    return (
+      <>
+        <EuiToolTip position="bottom" content={nodeTypeLabelContent}>
+          <EuiIcon type={nodeTypeClassIcon} />
+        </EuiToolTip>{' '}
+        &nbsp;
+      </>
+    );
+  }
+  return null;
+};
+
 const getSortHandler = type => item => _.get(item, [type, 'summary', 'lastVal']);
 const getColumns = (showCgroupMetricsElasticsearch, setupMode, clusterUuid) => {
   const cols = [];
@@ -86,10 +109,7 @@ const getColumns = (showCgroupMetricsElasticsearch, setupMode, clusterUuid) => {
         <div>
           <div className="monTableCell__name">
             <EuiText size="m">
-              <EuiToolTip position="bottom" content={node.nodeTypeLabel}>
-                {node.nodeTypeClass && <EuiIcon type={node.nodeTypeClass} />}
-              </EuiToolTip>
-              &nbsp;
+              {getNodeTooltip(node)}
               <span data-test-subj="name">{nameLink}</span>
             </EuiText>
           </div>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_activity/source_destination.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_activity/source_destination.js
index febdf1835faf5..e389e7655bcd0 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_activity/source_destination.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_activity/source_destination.js
@@ -7,9 +7,15 @@
 import React from 'react';
 import { EuiIcon, EuiLink, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { SourceTooltip } from './source_tooltip';
+import { i18n } from '@kbn/i18n';
 
 export const SourceDestination = props => {
   const { sourceName, targetName, targetTransportAddress } = props;
+  const targetTransportAddressContent =
+    targetTransportAddress ||
+    i18n.translate('xpack.monitoring.elasticsearch.shardActivity.unknownTargetAddressContent', {
+      defaultMessage: 'Unknown',
+    });
   return (
     <EuiFlexGroup gutterSize="s" alignItems="center" wrap>
       <EuiFlexItem grow={false}>
@@ -19,7 +25,7 @@ export const SourceDestination = props => {
         <EuiIcon type="arrowRight" size="s" />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
-        <EuiToolTip content={targetTransportAddress} position="bottom">
+        <EuiToolTip content={targetTransportAddressContent} position="bottom">
           <EuiLink>{targetName}</EuiLink>
         </EuiToolTip>
       </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js
index 012bc81135e34..897c20edc3f74 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/assigned.js
@@ -46,6 +46,8 @@ export class Assigned extends React.Component {
 
     // TODO: redesign for shard allocation, possibly giving shard display the
     // ability to use the euiLink CSS class (blue link text instead of white link text)
+    // Disabling eslint because EuiKeyboardAccessible does it for us
+    /* eslint-disable jsx-a11y/click-events-have-key-events */
     const name = (
       <EuiKeyboardAccessible>
         <a onClick={changeUrl}>
@@ -53,6 +55,7 @@ export class Assigned extends React.Component {
         </a>
       </EuiKeyboardAccessible>
     );
+    /* eslint-enable jsx-a11y/click-events-have-key-events */
     const master =
       data.node_type === 'master' ? <EuiIcon type="starFilledSpace" color="primary" /> : null;
     const shards = sortBy(data.children, 'shard').map(this.createShard);
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/shard.js b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/shard.js
index ac70f952008c5..1a1e8e3f02912 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/shard.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/shard_allocation/components/shard.js
@@ -95,14 +95,14 @@ export class Shard extends React.Component {
     const classification = classes + ' ' + shard.shard;
 
     let shardUi = <EuiBadge color={color}>{shard.shard}</EuiBadge>;
-
+    const tooltipContent =
+      shard.tooltip_message ||
+      i18n.translate('xpack.monitoring.elasticsearch.shardAllocation.shardDisplayName', {
+        defaultMessage: 'Shard',
+      });
     if (this.state.tooltipVisible) {
       shardUi = (
-        <EuiToolTip
-          content={this.props.shard.tooltip_message}
-          position="bottom"
-          data-test-subj="shardTooltip"
-        >
+        <EuiToolTip content={tooltipContent} position="bottom" data-test-subj="shardTooltip">
           <p>{shardUi}</p>
         </EuiToolTip>
       );
@@ -114,7 +114,7 @@ export class Shard extends React.Component {
         onMouseEnter={this.toggle}
         onMouseLeave={this.toggle}
         className={classes}
-        data-shard-tooltip={this.props.shard.tooltip_message}
+        data-shard-tooltip={tooltipContent}
         data-shard-classification={classification}
         data-test-subj="shardIcon"
       >
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/reason.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/reason.test.js.snap
index cd317dee65c33..de4b888a48545 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/reason.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/reason.test.js.snap
@@ -67,7 +67,7 @@ exports[`Logs should render with a no cluster found reason 1`] = `
       values={
         Object {
           "link": <ForwardRef
-            href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-installation.html"
+            href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-elasticsearch.html"
             target="_blank"
           >
             setup
@@ -92,7 +92,7 @@ exports[`Logs should render with a no index found reason 1`] = `
       values={
         Object {
           "link": <ForwardRef
-            href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-installation.html"
+            href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-elasticsearch.html"
             target="_blank"
           >
             setup
@@ -142,7 +142,7 @@ exports[`Logs should render with a no node found reason 1`] = `
       values={
         Object {
           "link": <ForwardRef
-            href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-installation.html"
+            href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-elasticsearch.html"
             target="_blank"
           >
             setup
@@ -154,6 +154,34 @@ exports[`Logs should render with a no node found reason 1`] = `
 </EuiCallOut>
 `;
 
+exports[`Logs should render with a no structured logs reason 1`] = `
+<EuiCallOut
+  color="warning"
+  iconType="help"
+  title="No structured logs found"
+>
+  <p>
+    <FormattedMessage
+      defaultMessage="Check if the {varPaths} setting {link}."
+      id="xpack.monitoring.logs.reason.notUsingStructuredLogsMessage"
+      values={
+        Object {
+          "link": <ForwardRef
+            href="https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-module-elasticsearch.html"
+            target="_blank"
+          >
+            points to JSON logs
+          </ForwardRef>,
+          "varPaths": <Monospace>
+            var.paths
+          </Monospace>,
+        }
+      }
+    />
+  </p>
+</EuiCallOut>
+`;
+
 exports[`Logs should render with a no type found reason 1`] = `
 <EuiCallOut
   color="warning"
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logs/reason.js b/x-pack/legacy/plugins/monitoring/public/components/logs/reason.js
index 098f2a79a3782..91c62ae53a1ca 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logs/reason.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/logs/reason.js
@@ -9,6 +9,7 @@ import { EuiCallOut, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
+import { Monospace } from '../metricbeat_migration/instruction_steps/components/monospace/monospace';
 
 export const Reason = ({ reason }) => {
   let title = i18n.translate('xpack.monitoring.logs.reason.defaultTitle', {
@@ -91,6 +92,29 @@ export const Reason = ({ reason }) => {
         }}
       />
     );
+  } else if (false === reason.usingStructuredLogs) {
+    title = i18n.translate('xpack.monitoring.logs.reason.notUsingStructuredLogsTitle', {
+      defaultMessage: 'No structured logs found',
+    });
+    message = (
+      <FormattedMessage
+        id="xpack.monitoring.logs.reason.notUsingStructuredLogsMessage"
+        defaultMessage="Check if the {varPaths} setting {link}."
+        values={{
+          varPaths: <Monospace>var.paths</Monospace>,
+          link: (
+            <EuiLink
+              target="_blank"
+              href={`${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/filebeat-module-elasticsearch.html`}
+            >
+              {i18n.translate('xpack.monitoring.logs.reason.notUsingStructuredLogsLink', {
+                defaultMessage: 'points to JSON logs',
+              })}
+            </EuiLink>
+          ),
+        }}
+      />
+    );
   } else if (false === reason.clusterExists) {
     title = i18n.translate('xpack.monitoring.logs.reason.noClusterTitle', {
       defaultMessage: 'No logs for this cluster',
@@ -103,7 +127,7 @@ export const Reason = ({ reason }) => {
           link: (
             <EuiLink
               target="_blank"
-              href={`${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/filebeat-installation.html`}
+              href={`${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/filebeat-module-elasticsearch.html`}
             >
               {i18n.translate('xpack.monitoring.logs.reason.noClusterLink', {
                 defaultMessage: 'setup',
@@ -125,7 +149,7 @@ export const Reason = ({ reason }) => {
           link: (
             <EuiLink
               target="_blank"
-              href={`${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/filebeat-installation.html`}
+              href={`${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/filebeat-module-elasticsearch.html`}
             >
               {i18n.translate('xpack.monitoring.logs.reason.noNodeLink', {
                 defaultMessage: 'setup',
@@ -147,7 +171,7 @@ export const Reason = ({ reason }) => {
           link: (
             <EuiLink
               target="_blank"
-              href={`${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/filebeat-installation.html`}
+              href={`${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}/filebeat-module-elasticsearch.html`}
             >
               {i18n.translate('xpack.monitoring.logs.reason.noIndexLink', {
                 defaultMessage: 'setup',
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logs/reason.test.js b/x-pack/legacy/plugins/monitoring/public/components/logs/reason.test.js
index 2957de26f7189..c8ed05bd73ade 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logs/reason.test.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/logs/reason.test.js
@@ -29,6 +29,13 @@ describe('Logs', () => {
     expect(component).toMatchSnapshot();
   });
 
+  it('should render with a no structured logs reason', () => {
+    const component = shallow(
+      <Reason reason={{ indexPatternExists: true, typeExists: true, usingStructuredLogs: false }} />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
   it('should render with a no cluster found reason', () => {
     const component = shallow(
       <Reason reason={{ indexPatternExists: true, typeExists: true, clusterExists: false }} />
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/pipeline_viewer.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/pipeline_viewer.test.js.snap
index 11d938e23543c..b19560df7e951 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/pipeline_viewer.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/__test__/__snapshots__/pipeline_viewer.test.js.snap
@@ -1,17 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`PipelineViewer component passes expected props 1`] = `
-<EuiPage
-  restrictWidth={false}
->
-  <EuiPageBody
-    component="main"
-    restrictWidth={false}
-  >
+<EuiPage>
+  <EuiPageBody>
     <EuiPageContent
       className="monPipelineViewer"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <StatementSection
@@ -75,17 +69,11 @@ exports[`PipelineViewer component passes expected props 1`] = `
 `;
 
 exports[`PipelineViewer component renders DetailDrawer when selected vertex is not null 1`] = `
-<EuiPage
-  restrictWidth={false}
->
-  <EuiPageBody
-    component="main"
-    restrictWidth={false}
-  >
+<EuiPage>
+  <EuiPageBody>
     <EuiPageContent
       className="monPipelineViewer"
       horizontalPosition="center"
-      panelPaddingSize="l"
       verticalPosition="center"
     >
       <StatementSection
diff --git a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js
index cd9fe5229b640..73faa81af7b55 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/logstash/pipeline_viewer/views/detail_drawer.js
@@ -164,7 +164,7 @@ function renderPluginBasicStats(vertex, timeseriesTooltipXValueFormatter) {
   );
 }
 
-function renderIfBasicStats(_vertex) {
+function renderIfBasicStats() {
   return (
     <p>
       <FormattedMessage
@@ -175,7 +175,7 @@ function renderIfBasicStats(_vertex) {
   );
 }
 
-function renderQueueBasicStats(_vertex) {
+function renderQueueBasicStats() {
   return (
     <p>
       <FormattedMessage
@@ -253,7 +253,7 @@ function renderIfBasicInfo(vertex) {
   );
 }
 
-function renderQueueBasicInfo(_vertex) {
+function renderQueueBasicInfo() {
   return (
     <p>
       <FormattedMessage
diff --git a/x-pack/legacy/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
index 0aae86ac44ba2..cf096ed1f7914 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
@@ -12,9 +12,11 @@ exports[`NoData should show a default message if reason is unknown 1`] = `
       class="euiPanel euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-textCenter"
     >
       <svg
+        aria-hidden="true"
         class="euiIcon euiIcon--xxLarge euiIcon--app euiIcon-isLoading"
         focusable="false"
         height="16"
+        role="img"
         viewBox="0 0 16 16"
         width="16"
         xmlns="http://www.w3.org/2000/svg"
@@ -102,9 +104,11 @@ exports[`NoData should show text next to the spinner while checking a setting 1`
       class="euiPanel euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-textCenter"
     >
       <svg
+        aria-hidden="true"
         class="euiIcon euiIcon--xxLarge euiIcon--app euiIcon-isLoading"
         focusable="false"
         height="16"
+        role="img"
         viewBox="0 0 16 16"
         width="16"
         xmlns="http://www.w3.org/2000/svg"
diff --git a/x-pack/legacy/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
index a3d321f9e39b6..27af92ef1de88 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
@@ -30,10 +30,12 @@ exports[`Summary Status Component should allow label to be optional 1`] = `
           Status: 
           <svg
             alt="Status: yellow"
+            aria-hidden="true"
             class="euiIcon euiIcon--large euiIcon--warning euiIcon-isLoading"
             data-test-subj="statusIcon"
             focusable="false"
             height="16"
+            role="img"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
@@ -207,10 +209,12 @@ exports[`Summary Status Component should render metrics in a summary bar 1`] = `
           Status: 
           <svg
             alt="Status: green"
+            aria-hidden="true"
             class="euiIcon euiIcon--large euiIcon--success euiIcon-isLoading"
             data-test-subj="statusIcon"
             focusable="false"
             height="16"
+            role="img"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
diff --git a/x-pack/legacy/plugins/monitoring/public/components/table/eui_table_ssp.js b/x-pack/legacy/plugins/monitoring/public/components/table/eui_table_ssp.js
index 4d87548cb8ddd..78e5917c5d9af 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/table/eui_table_ssp.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/table/eui_table_ssp.js
@@ -26,6 +26,11 @@ export function EuiMonitoringSSPTable({
     index: pagination.pageIndex,
     size: pagination.pageSize,
   });
+
+  if (!pagination.totalItemCount) {
+    pagination.totalItemCount = (items && items.length) || 0;
+  }
+
   const [sort, setSort] = React.useState(props.sorting);
 
   if (search.box && !search.box['data-test-subj']) {
diff --git a/x-pack/legacy/plugins/monitoring/public/services/executor_provider.js b/x-pack/legacy/plugins/monitoring/public/services/executor_provider.js
index cb176917ff025..b2192496ed272 100644
--- a/x-pack/legacy/plugins/monitoring/public/services/executor_provider.js
+++ b/x-pack/legacy/plugins/monitoring/public/services/executor_provider.js
@@ -72,7 +72,7 @@ export function executorProvider(Promise, $timeout) {
     ).finally(reset);
   }
 
-  function reFetch(_changes) {
+  function reFetch() {
     cancel();
     run();
   }
diff --git a/x-pack/legacy/plugins/monitoring/public/views/elasticsearch/nodes/index.js b/x-pack/legacy/plugins/monitoring/public/views/elasticsearch/nodes/index.js
index 4b3c961b15583..d201e2cc8b5e9 100644
--- a/x-pack/legacy/plugins/monitoring/public/views/elasticsearch/nodes/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/views/elasticsearch/nodes/index.js
@@ -39,6 +39,7 @@ uiRoutes.when('/elasticsearch/nodes', {
         }) || {};
 
       const getPageData = ($injector, _api = undefined, routeOptions = {}) => {
+        _api; // to fix eslint
         const $http = $injector.get('$http');
         const globalState = $injector.get('globalState');
         const timeBounds = timefilter.getBounds();
diff --git a/x-pack/legacy/plugins/monitoring/public/views/logstash/node/pipelines/index.js b/x-pack/legacy/plugins/monitoring/public/views/logstash/node/pipelines/index.js
index bc5ac75931fce..7bfcddf8f283a 100644
--- a/x-pack/legacy/plugins/monitoring/public/views/logstash/node/pipelines/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/views/logstash/node/pipelines/index.js
@@ -23,6 +23,7 @@ import { DetailStatus } from '../../../../components/logstash/detail_status';
 import { CODE_PATH_LOGSTASH } from '../../../../../common/constants';
 
 const getPageData = ($injector, _api = undefined, routeOptions = {}) => {
+  _api; // fixing eslint
   const $route = $injector.get('$route');
   const $http = $injector.get('$http');
   const globalState = $injector.get('globalState');
diff --git a/x-pack/legacy/plugins/monitoring/public/views/logstash/pipelines/index.js b/x-pack/legacy/plugins/monitoring/public/views/logstash/pipelines/index.js
index ce49fc2fac97b..03cf7383d1d02 100644
--- a/x-pack/legacy/plugins/monitoring/public/views/logstash/pipelines/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/views/logstash/pipelines/index.js
@@ -23,6 +23,7 @@ import { CODE_PATH_LOGSTASH } from '../../../../common/constants';
  */
 
 const getPageData = ($injector, _api = undefined, routeOptions = {}) => {
+  _api; // to fix eslint
   const $http = $injector.get('$http');
   const globalState = $injector.get('globalState');
   const Private = $injector.get('Private');
diff --git a/x-pack/legacy/plugins/monitoring/server/__tests__/check_license.js b/x-pack/legacy/plugins/monitoring/server/__tests__/check_license.js
new file mode 100644
index 0000000000000..60b27cae30878
--- /dev/null
+++ b/x-pack/legacy/plugins/monitoring/server/__tests__/check_license.js
@@ -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 { BehaviorSubject } from 'rxjs';
+import expect from '@kbn/expect';
+import sinon from 'sinon';
+
+import { XPackInfo } from '../../../xpack_main/server/lib/xpack_info';
+import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
+
+const createLicense = (type = 'basic') => {
+  return licensingMock.createLicense({
+    license: {
+      uid: 'custom-uid',
+      type,
+      mode: 'basic',
+      status: 'active',
+      expiryDateInMillis: 1286575200000,
+    },
+    features: {
+      monitoring: {
+        description: '...',
+        isAvailable: true,
+        isEnabled: true,
+      },
+    },
+  });
+};
+
+describe('XPackInfo', () => {
+  let mockServer;
+  let mockElasticsearchPlugin;
+
+  beforeEach(() => {
+    mockServer = sinon.stub({
+      plugins: { elasticsearch: mockElasticsearchPlugin },
+      events: { on() {} },
+      newPlatform: {
+        setup: {
+          plugins: {
+            licensing: {},
+          },
+        },
+      },
+    });
+  });
+
+  describe('refreshNow()', () => {
+    it('check new platform licensing plugin', async () => {
+      const refresh = sinon.spy();
+      const license$ = new BehaviorSubject(createLicense());
+      const xPackInfo = new XPackInfo(mockServer, {
+        licensing: {
+          license$,
+          refresh,
+        },
+      });
+
+      let changed = false;
+      license$.subscribe(() => (changed = true));
+      await xPackInfo.refreshNow();
+      expect(changed).to.be(true);
+      sinon.assert.calledOnce(refresh);
+    });
+  });
+
+  describe('Change type', () => {
+    it('trigger event when license type changes', async () => {
+      const license$ = new BehaviorSubject(createLicense());
+      const refresh = () => void 0;
+      const xPackInfo = new XPackInfo(mockServer, {
+        licensing: {
+          license$,
+          refresh,
+        },
+      });
+      let changed = false;
+      license$.subscribe(() => (changed = true));
+      await license$.next(createLicense('gold'));
+      expect(xPackInfo.license.getType()).to.be('gold');
+      expect(changed).to.be(true);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/cloud_service.js b/x-pack/legacy/plugins/monitoring/server/cloud/cloud_service.js
index dcc8ad8fc8b64..2a408f5295aef 100644
--- a/x-pack/legacy/plugins/monitoring/server/cloud/cloud_service.js
+++ b/x-pack/legacy/plugins/monitoring/server/cloud/cloud_service.js
@@ -48,7 +48,7 @@ export class CloudService {
    * @param {Object} _request 'request' HTTP handler.
    * @return {Promise} Never {@code null} {@code CloudServiceResponse}.
    */
-  _checkIfService(_request) {
+  _checkIfService() {
     return Promise.reject(new Error('not implemented'));
   }
 
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js b/x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js
index d7b524c9d5c82..e0528209c50ae 100644
--- a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js
+++ b/x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js
@@ -62,6 +62,13 @@ describe('Monitoring Check License', () => {
         });
       });
 
+      it('enterprise active license - results true with no message', () => {
+        const result = checkLicense('enterprise', true, 'test-cluster-pqr');
+        expect(result).to.eql({
+          clusterAlerts: { enabled: true },
+        });
+      });
+
       describe('Watcher is not enabled', () => {
         it('platinum active license - watcher disabled - results false with message', () => {
           const result = checkLicense('platinum', true, 'test-cluster-pqr', false);
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/check_license.js b/x-pack/legacy/plugins/monitoring/server/cluster_alerts/check_license.js
index fe9c5de7e5a85..a6c033b6b1f13 100644
--- a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/check_license.js
+++ b/x-pack/legacy/plugins/monitoring/server/cluster_alerts/check_license.js
@@ -38,7 +38,7 @@ export function checkLicense(type, active, clusterSource, watcher = true) {
   }
 
   // Disabled because the license type is not valid (basic)
-  if (!includes(['trial', 'standard', 'gold', 'platinum'], type)) {
+  if (!includes(['trial', 'standard', 'gold', 'platinum', 'enterprise'], type)) {
     return Object.assign(licenseInfo, {
       message: i18n.translate(
         'xpack.monitoring.clusterAlerts.checkLicense.licenseIsBasicDescription',
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logs/detect_reason.js b/x-pack/legacy/plugins/monitoring/server/lib/logs/detect_reason.js
index 16bd9d506dd0f..b3b835d6ba987 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/logs/detect_reason.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/logs/detect_reason.js
@@ -16,6 +16,7 @@ async function doesFilebeatIndexExist(
   const filter = [createTimeFilter({ start, end, metric })];
 
   const typeFilter = { term: { 'service.type': 'elasticsearch' } };
+  const structuredLogsFilter = { exists: { field: 'elasticsearch.cluster' } };
   const clusterFilter = { term: { 'elasticsearch.cluster.uuid': clusterUuid } };
   const nodeFilter = { term: { 'elasticsearch.node.id': nodeUuid } };
   const indexFilter = { term: { 'elasticsearch.index.name': indexUuid } };
@@ -44,6 +45,14 @@ async function doesFilebeatIndexExist(
     },
   };
 
+  const usingStructuredLogsQuery = {
+    query: {
+      bool: {
+        filter: [...filter, typeFilter, structuredLogsFilter],
+      },
+    },
+  };
+
   const clusterExistsQuery = {
     query: {
       bool: {
@@ -81,6 +90,8 @@ async function doesFilebeatIndexExist(
     { ...defaultParams, ...typeExistsAtAnyTimeQuery },
     { index: filebeatIndexPattern },
     { ...defaultParams, ...typeExistsQuery },
+    { index: filebeatIndexPattern },
+    { ...defaultParams, ...usingStructuredLogsQuery },
   ];
 
   if (clusterUuid) {
@@ -102,6 +113,7 @@ async function doesFilebeatIndexExist(
       indexPatternExistsInTimeRangeResponse,
       typeExistsAtAnyTimeResponse,
       typeExistsResponse,
+      usingStructuredLogsResponse,
       clusterExistsResponse,
       nodeExistsResponse,
       indexExistsResponse,
@@ -114,6 +126,7 @@ async function doesFilebeatIndexExist(
       get(indexPatternExistsInTimeRangeResponse, 'hits.total.value', 0) > 0,
     typeExistsAtAnyTime: get(typeExistsAtAnyTimeResponse, 'hits.total.value', 0) > 0,
     typeExists: get(typeExistsResponse, 'hits.total.value', 0) > 0,
+    usingStructuredLogs: get(usingStructuredLogsResponse, 'hits.total.value', 0) > 0,
     clusterExists: clusterUuid ? get(clusterExistsResponse, 'hits.total.value', 0) > 0 : null,
     nodeExists: nodeUuid ? get(nodeExistsResponse, 'hits.total.value', 0) > 0 : null,
     indexExists: indexUuid ? get(indexExistsResponse, 'hits.total.value', 0) > 0 : null,
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js
index 755b89a0409d0..d3a43ed651827 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js
@@ -116,7 +116,7 @@ export class LatencyMetric extends ElasticsearchMetric {
       },
     };
 
-    this.calculation = (bucket, _key, _metric, _bucketSizeInSeconds) => {
+    this.calculation = bucket => {
       const timeInMillisDeriv = _.get(bucket, 'event_time_in_millis_deriv.normalized_value', null);
       const totalEventsDeriv = _.get(bucket, 'event_total_deriv.normalized_value', null);
 
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/classes.js b/x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/classes.js
index c76edf9061396..eddcfabe83b1b 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/classes.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/classes.js
@@ -90,7 +90,7 @@ export class LogstashEventsLatencyClusterMetric extends LogstashClusterMetric {
       },
     };
 
-    this.calculation = (bucket, _key, _metric, _bucketSizeInSeconds) => {
+    this.calculation = bucket => {
       const timeInMillisDeriv = _.get(bucket, 'events_time_in_millis_deriv.normalized_value', null);
       const totalEventsDeriv = _.get(bucket, 'events_total_deriv.normalized_value', null);
 
@@ -189,7 +189,7 @@ export class LogstashEventsLatencyMetric extends LogstashMetric {
       },
     };
 
-    this.calculation = (bucket, _key, _metric, _bucketSizeInSeconds) => {
+    this.calculation = bucket => {
       const timeInMillisDeriv = _.get(bucket, 'events_time_in_millis_deriv.normalized_value', null);
       const totalEventsDeriv = _.get(bucket, 'events_total_deriv.normalized_value', null);
 
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 695e23b022b49..73c37dc7f3f28 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
@@ -348,7 +348,7 @@ export const getCollectionStatus = async (
       },
     };
   }
-  console.log('OKOKOKOK');
+
   const liveClusterUuid = skipLiveData ? null : await getLiveElasticsearchClusterUuid(req);
   const isLiveCluster = !clusterUuid || liveClusterUuid === clusterUuid;
 
diff --git a/x-pack/legacy/plugins/monitoring/server/plugin.js b/x-pack/legacy/plugins/monitoring/server/plugin.js
index 013f8ae681bad..e26dd96dde1bf 100644
--- a/x-pack/legacy/plugins/monitoring/server/plugin.js
+++ b/x-pack/legacy/plugins/monitoring/server/plugin.js
@@ -17,6 +17,7 @@ export class Plugin {
     const kbnServer = core._kbnServer;
     const config = core.config();
     const usageCollection = plugins.usageCollection;
+    const licensing = plugins.licensing;
     registerMonitoringCollection();
     /*
      * Register collector objects for stats to show up in the APIs
@@ -91,17 +92,16 @@ export class Plugin {
       kbnServerVersion: kbnServer.version,
     });
     const kibanaCollectionEnabled = config.get('xpack.monitoring.kibana.collection.enabled');
-    const { info: xpackMainInfo } = xpackMainPlugin;
 
     if (kibanaCollectionEnabled) {
       /*
        * Bulk uploading of Kibana stats
        */
-      xpackMainInfo.onLicenseInfoChange(() => {
+      licensing.license$.subscribe(license => {
         // use updated xpack license info to start/stop bulk upload
-        const mainMonitoring = xpackMainInfo.feature('monitoring');
+        const mainMonitoring = license.getFeature('monitoring');
         const monitoringBulkEnabled =
-          mainMonitoring && mainMonitoring.isAvailable() && mainMonitoring.isEnabled();
+          mainMonitoring && mainMonitoring.isAvailable && mainMonitoring.isEnabled;
         if (monitoringBulkEnabled) {
           bulkUploader.start(usageCollection);
         } else {
@@ -115,7 +115,7 @@ export class Plugin {
       );
     }
 
-    core.injectUiAppVars('monitoring', core => {
+    core.injectUiAppVars('monitoring', () => {
       const config = core.config();
       return {
         maxBucketSize: config.get('xpack.monitoring.max_bucket_size'),
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 680cb97e0fda3..11dbddc00f830 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
@@ -5,7 +5,7 @@
  */
 
 import { get } from 'lodash';
-import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../../task_manager/plugin';
+import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../../task_manager/server/plugin';
 import { PLUGIN_ID, VIS_TELEMETRY_TASK, VIS_USAGE_TYPE } from '../../../../constants';
 
 async function isTaskManagerReady(taskManager: TaskManagerPluginSetupContract | undefined) {
diff --git a/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/register_usage_collector.ts b/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/register_usage_collector.ts
index 1a47f68adcc58..46b86091c9db1 100644
--- a/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/register_usage_collector.ts
+++ b/x-pack/legacy/plugins/oss_telemetry/server/lib/collectors/visualizations/register_usage_collector.ts
@@ -5,7 +5,7 @@
  */
 
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../../task_manager/plugin';
+import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../../task_manager/server/plugin';
 import { getUsageCollector } from './get_usage_collector';
 
 export function registerVisualizationsCollector(
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 cb6b4eab09741..c9714306d73c5 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
@@ -5,12 +5,12 @@
  */
 
 import { CoreSetup, Logger } from 'kibana/server';
-import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../task_manager/plugin';
+import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../../../task_manager/server/plugin';
 import { PLUGIN_ID, VIS_TELEMETRY_TASK } from '../../../constants';
 import { visualizationsTaskRunner } from './visualizations/task_runner';
 import KbnServer from '../../../../../../../src/legacy/server/kbn_server';
 import { LegacyConfig } from '../../plugin';
-import { TaskInstance } from '../../../../task_manager';
+import { TaskInstance } from '../../../../task_manager/server';
 
 export function registerTasks({
   taskManager,
diff --git a/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.test.ts b/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.test.ts
index 0663a5bd330ca..af3eed2496f5d 100644
--- a/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.test.ts
+++ b/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.test.ts
@@ -12,7 +12,7 @@ import {
   getMockTaskInstance,
 } from '../../../../test_utils';
 import { visualizationsTaskRunner } from './task_runner';
-import { TaskInstance } from '../../../../../task_manager';
+import { TaskInstance } from '../../../../../task_manager/server';
 
 describe('visualizationsTaskRunner', () => {
   let mockTaskInstance: TaskInstance;
diff --git a/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts b/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts
index 9d8f76f6a10dc..8fb2da5627ee8 100644
--- a/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts
+++ b/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts
@@ -8,7 +8,7 @@ import _, { countBy, groupBy, mapValues } from 'lodash';
 import { APICaller, CoreSetup } from 'kibana/server';
 import { getNextMidnight } from '../../get_next_midnight';
 import { VisState } from '../../../../../../../../src/legacy/core_plugins/visualizations/public';
-import { TaskInstance } from '../../../../../task_manager';
+import { TaskInstance } from '../../../../../task_manager/server';
 import { ESSearchHit } from '../../../../../apm/typings/elasticsearch';
 import { LegacyConfig } from '../../../plugin';
 
diff --git a/x-pack/legacy/plugins/oss_telemetry/server/plugin.ts b/x-pack/legacy/plugins/oss_telemetry/server/plugin.ts
index f661311fc24b8..209c73eb0eb62 100644
--- a/x-pack/legacy/plugins/oss_telemetry/server/plugin.ts
+++ b/x-pack/legacy/plugins/oss_telemetry/server/plugin.ts
@@ -5,7 +5,7 @@
  */
 
 import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
-import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../task_manager/plugin';
+import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../task_manager/server/plugin';
 import { registerCollectors } from './lib/collectors';
 import { registerTasks, scheduleTasks } from './lib/tasks';
 import KbnServer from '../../../../../src/legacy/server/kbn_server';
diff --git a/x-pack/legacy/plugins/oss_telemetry/test_utils/index.ts b/x-pack/legacy/plugins/oss_telemetry/test_utils/index.ts
index 04e248d28b577..c6046eb648bf4 100644
--- a/x-pack/legacy/plugins/oss_telemetry/test_utils/index.ts
+++ b/x-pack/legacy/plugins/oss_telemetry/test_utils/index.ts
@@ -6,8 +6,8 @@
 
 import { APICaller, CoreSetup } from 'kibana/server';
 
-import { TaskInstance } from '../../task_manager';
-import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../task_manager/plugin';
+import { TaskInstance } from '../../task_manager/server';
+import { PluginSetupContract as TaskManagerPluginSetupContract } from '../../task_manager/server/plugin';
 
 export const getMockTaskInstance = (): TaskInstance => ({
   state: { runs: 0, stats: {} },
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_add.test.js b/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_add.test.js
index c1ef7db2efc5c..8f34e7d84a08b 100644
--- a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_add.test.js
+++ b/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_add.test.js
@@ -7,6 +7,8 @@
 import { pageHelpers, nextTick, setupEnvironment } from './helpers';
 import { NON_ALPHA_NUMERIC_CHARS, ACCENTED_CHARS } from './helpers/constants';
 
+jest.mock('ui/new_platform');
+
 const { setup } = pageHelpers.remoteClustersAdd;
 
 describe('Create Remote cluster', () => {
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_edit.test.js b/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_edit.test.js
index c380eaadd8e64..95dc65a96e30a 100644
--- a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_edit.test.js
+++ b/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_edit.test.js
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+jest.mock('ui/new_platform');
 import { RemoteClusterForm } from '../../public/app/sections/components/remote_cluster_form';
 import { pageHelpers, setupEnvironment, nextTick } from './helpers';
 import { REMOTE_CLUSTER_EDIT, REMOTE_CLUSTER_EDIT_NAME } from './helpers/constants';
diff --git a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_list.test.js b/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_list.test.js
index 178dd341a75a7..699c00e450a1f 100644
--- a/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_list.test.js
+++ b/x-pack/legacy/plugins/remote_clusters/__jest__/client_integration/remote_clusters_list.test.js
@@ -15,6 +15,8 @@ import {
 import { getRouter } from '../../public/app/services';
 import { getRemoteClusterMock } from '../../fixtures/remote_cluster';
 
+jest.mock('ui/new_platform');
+
 const { setup } = pageHelpers.remoteClustersList;
 
 describe('<RemoteClusterList />', () => {
diff --git a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap b/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
index 6ebc43bb92737..65fc455417fe3 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
+++ b/x-pack/legacy/plugins/remote_clusters/public/app/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
@@ -269,17 +269,21 @@ Array [
                       class="euiSwitch__track"
                     >
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
                       />
                       <svg
+                        aria-hidden="true"
                         class="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon euiSwitch__icon--checked"
                         focusable="false"
                         height="16"
+                        role="img"
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
@@ -329,6 +333,7 @@ Array [
                 class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
                 focusable="false"
                 height="16"
+                role="img"
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
@@ -531,17 +536,21 @@ Array [
               class="euiSwitch__track"
             >
               <svg
+                aria-hidden="true"
                 class="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon"
                 focusable="false"
                 height="16"
+                role="img"
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
               />
               <svg
+                aria-hidden="true"
                 class="euiIcon euiIcon--medium euiIcon-isLoading euiSwitch__icon euiSwitch__icon--checked"
                 focusable="false"
                 height="16"
+                role="img"
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
diff --git a/x-pack/legacy/plugins/reporting/common/constants.ts b/x-pack/legacy/plugins/reporting/common/constants.ts
index 03b2d51c7b396..e602d5fc608d3 100644
--- a/x-pack/legacy/plugins/reporting/common/constants.ts
+++ b/x-pack/legacy/plugins/reporting/common/constants.ts
@@ -56,3 +56,4 @@ export const LICENSE_TYPE_BASIC = 'basic';
 export const LICENSE_TYPE_STANDARD = 'standard';
 export const LICENSE_TYPE_GOLD = 'gold';
 export const LICENSE_TYPE_PLATINUM = 'platinum';
+export const LICENSE_TYPE_ENTERPRISE = 'enterprise';
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
index 9ba7cfbcac1d8..1b7ba3c90bab1 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.test.ts
@@ -43,7 +43,7 @@ describe('headers', () => {
     };
 
     const encryptedHeaders = await encryptHeaders(headers);
-    const { decryptedHeaders } = await decryptJobHeaders({
+    const decryptedHeaders = await decryptJobHeaders({
       job: {
         title: 'cool-job-bro',
         type: 'csv',
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 486181117bbfb..436b2c2dab1ad 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/decrypt_job_headers.ts
@@ -17,22 +17,18 @@ export const decryptJobHeaders = async <
   JobParamsType,
   JobDocPayloadType extends HasEncryptedHeaders
 >({
-  job,
   server,
+  job,
   logger,
 }: {
-  job: JobDocPayloadType;
   server: ServerFacade;
-  logger: Logger;
-}): Promise<{
   job: JobDocPayloadType;
-  server: ServerFacade;
-  decryptedHeaders: Record<string, string>;
-}> => {
+  logger: Logger;
+}): Promise<Record<string, string>> => {
   const crypto: CryptoFactory = cryptoFactory(server);
   try {
     const decryptedHeaders: Record<string, string> = await crypto.decrypt(job.headers);
-    return { job, decryptedHeaders, server };
+    return decryptedHeaders;
   } catch (err) {
     logger.error(err);
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
index 66990c1f37df4..070bdb4314af9 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.test.ts
@@ -27,7 +27,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -44,7 +44,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -65,7 +65,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -82,7 +82,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -97,7 +97,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -120,7 +120,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -137,7 +137,7 @@ describe('conditions', () => {
       baz: 'quix',
     };
 
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: permittedHeaders,
       server: mockServer,
@@ -153,7 +153,7 @@ test('uses basePath from job when creating saved object service', async () => {
     baz: 'quix',
   };
 
-  const { conditionalHeaders } = await getConditionalHeaders({
+  const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayload<any>,
     filteredHeaders: permittedHeaders,
     server: mockServer,
@@ -180,7 +180,7 @@ test(`uses basePath from server if job doesn't have a basePath when creating sav
     baz: 'quix',
   };
 
-  const { conditionalHeaders } = await getConditionalHeaders({
+  const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayload<any>,
     filteredHeaders: permittedHeaders,
     server: mockServer,
@@ -203,7 +203,7 @@ test(`uses basePath from server if job doesn't have a basePath when creating sav
 describe('config formatting', () => {
   test(`lowercases server.host`, async () => {
     mockServer = createMockServer({ settings: { 'server.host': 'COOL-HOSTNAME' } });
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {} as JobDocPayload<any>,
       filteredHeaders: {},
       server: mockServer,
@@ -215,7 +215,7 @@ describe('config formatting', () => {
     mockServer = createMockServer({
       settings: { 'xpack.reporting.kibanaServer.hostname': 'GREAT-HOSTNAME' },
     });
-    const { conditionalHeaders } = await getConditionalHeaders({
+    const conditionalHeaders = await getConditionalHeaders({
       job: {
         title: 'cool-job-bro',
         type: 'csv',
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 14c092ccfb4a6..975060a8052f0 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_conditional_headers.ts
@@ -6,13 +6,13 @@
 import { ConditionalHeaders, ServerFacade } from '../../../types';
 
 export const getConditionalHeaders = <JobDocPayloadType>({
+  server,
   job,
   filteredHeaders,
-  server,
 }: {
+  server: ServerFacade;
   job: JobDocPayloadType;
   filteredHeaders: Record<string, string>;
-  server: ServerFacade;
 }) => {
   const config = server.config();
   const [hostname, port, basePath, protocol] = [
@@ -32,5 +32,5 @@ export const getConditionalHeaders = <JobDocPayloadType>({
     },
   };
 
-  return { job, conditionalHeaders, server };
+  return conditionalHeaders;
 };
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
index 4fca05337ea0c..ff2c44026315d 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_custom_logo.test.ts
@@ -19,7 +19,7 @@ test(`gets logo from uiSettings`, async () => {
     baz: 'quix',
   };
 
-  const { conditionalHeaders } = await getConditionalHeaders({
+  const conditionalHeaders = await getConditionalHeaders({
     job: {} as JobDocPayloadPDF,
     filteredHeaders: permittedHeaders,
     server: mockServer,
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 9b64e896dad18..0059276f6df71 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
@@ -9,13 +9,13 @@ import { ConditionalHeaders, ServerFacade } from '../../../types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types'; // Logo is PDF only
 
 export const getCustomLogo = async ({
+  server,
   job,
   conditionalHeaders,
-  server,
 }: {
+  server: ServerFacade;
   job: JobDocPayloadPDF;
   conditionalHeaders: ConditionalHeaders;
-  server: ServerFacade;
 }) => {
   const serverBasePath: string = server.config().get('server.basePath');
 
@@ -38,12 +38,8 @@ export const getCustomLogo = async ({
   };
 
   const savedObjects = server.savedObjects;
-
   const savedObjectsClient = savedObjects.getScopedSavedObjectsClient(fakeRequest);
-
   const uiSettings = server.uiSettingsServiceFactory({ savedObjectsClient });
-
-  const logo = await uiSettings.get(UI_SETTINGS_CUSTOM_PDF_LOGO);
-
-  return { job, conditionalHeaders, logo, server };
+  const logo: string = await uiSettings.get(UI_SETTINGS_CUSTOM_PDF_LOGO);
+  return { conditionalHeaders, logo };
 };
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
index 60735b4abd446..9b2a065427f70 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
@@ -22,29 +22,26 @@ beforeEach(() => {
 });
 
 test(`fails if no URL is passed`, async () => {
-  await expect(
+  const fn = () =>
     getFullUrls({
       job: {},
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: No valid URL fields found in Job Params! Expected \`job.relativeUrl\` or \`job.objects[{ relativeUrl }]\`]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"No valid URL fields found in Job Params! Expected \`job.relativeUrl: string\` or \`job.relativeUrls: string[]\`"`
   );
 });
 
 test(`fails if URLs are file-protocols for PNGs`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const relativeUrl = 'file://etc/passwd/#/something';
-  await expect(
+  const fn = () =>
     getFullUrls({
-      job: {
-        relativeUrl,
-        forceNow,
-      },
+      job: { relativeUrl, forceNow },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: Found invalid URL(s), all URLs must be relative: ${relativeUrl}]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"Found invalid URL(s), all URLs must be relative: file://etc/passwd/#/something"`
   );
 });
 
@@ -52,36 +49,29 @@ test(`fails if URLs are absolute for PNGs`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const relativeUrl =
     'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something';
-  await expect(
+  const fn = () =>
     getFullUrls({
-      job: {
-        relativeUrl,
-        forceNow,
-      },
+      job: { relativeUrl, forceNow },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: Found invalid URL(s), all URLs must be relative: ${relativeUrl}]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something"`
   );
 });
 
 test(`fails if URLs are file-protocols for PDF`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const relativeUrl = 'file://etc/passwd/#/something';
-  await expect(
+  const fn = () =>
     getFullUrls({
       job: {
-        objects: [
-          {
-            relativeUrl,
-          },
-        ],
+        relativeUrls: [relativeUrl],
         forceNow,
       },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: Found invalid URL(s), all URLs must be relative: ${relativeUrl}]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"Found invalid URL(s), all URLs must be relative: file://etc/passwd/#/something"`
   );
 });
 
@@ -89,70 +79,52 @@ test(`fails if URLs are absolute for PDF`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const relativeUrl =
     'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something';
-  await expect(
+  const fn = () =>
     getFullUrls({
       job: {
-        objects: [
-          {
-            relativeUrl,
-          },
-        ],
+        relativeUrls: [relativeUrl],
         forceNow,
       },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: Found invalid URL(s), all URLs must be relative: ${relativeUrl}]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something"`
   );
 });
 
 test(`fails if any URLs are absolute or file's for PDF`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
-  const objects = [
-    {
-      relativeUrl: '/app/kibana#/something_aaa',
-    },
-    {
-      relativeUrl:
-        'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something',
-    },
-    {
-      relativeUrl: 'file://etc/passwd/#/something',
-    },
+  const relativeUrls = [
+    '/app/kibana#/something_aaa',
+    'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something',
+    'file://etc/passwd/#/something',
   ];
-  await expect(
+
+  const fn = () =>
     getFullUrls({
-      job: {
-        objects,
-        forceNow,
-      },
+      job: { relativeUrls, forceNow },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: Found invalid URL(s), all URLs must be relative: ${objects[1].relativeUrl} ${objects[2].relativeUrl}]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"Found invalid URL(s), all URLs must be relative: http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something file://etc/passwd/#/something"`
   );
 });
 
 test(`fails if URL does not route to a visualization`, async () => {
-  await expect(
+  const fn = () =>
     getFullUrls({
-      job: {
-        relativeUrl: '/app/phoney',
-      },
+      job: { relativeUrl: '/app/phoney' },
       server: mockServer,
-    } as FullUrlsOpts)
-  ).rejects.toMatchInlineSnapshot(
-    `[Error: No valid hash in the URL! A hash is expected for the application to route to the intended visualization.]`
+    } as FullUrlsOpts);
+  expect(fn).toThrowErrorMatchingInlineSnapshot(
+    `"No valid hash in the URL! A hash is expected for the application to route to the intended visualization."`
   );
 });
 
 test(`adds forceNow to hash's query, if it exists`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
-  const { urls } = await getFullUrls({
-    job: {
-      relativeUrl: '/app/kibana#/something',
-      forceNow,
-    },
+  const urls = await getFullUrls({
+    job: { relativeUrl: '/app/kibana#/something', forceNow },
     server: mockServer,
   } as FullUrlsOpts);
 
@@ -164,11 +136,8 @@ test(`adds forceNow to hash's query, if it exists`, async () => {
 test(`appends forceNow to hash's query, if it exists`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
 
-  const { urls } = await getFullUrls({
-    job: {
-      relativeUrl: '/app/kibana#/something?_g=something',
-      forceNow,
-    },
+  const urls = await getFullUrls({
+    job: { relativeUrl: '/app/kibana#/something?_g=something', forceNow },
     server: mockServer,
   } as FullUrlsOpts);
 
@@ -178,10 +147,8 @@ test(`appends forceNow to hash's query, if it exists`, async () => {
 });
 
 test(`doesn't append forceNow query to url, if it doesn't exists`, async () => {
-  const { urls } = await getFullUrls({
-    job: {
-      relativeUrl: '/app/kibana#/something',
-    },
+  const urls = await getFullUrls({
+    job: { relativeUrl: '/app/kibana#/something' },
     server: mockServer,
   } as FullUrlsOpts);
 
@@ -190,13 +157,13 @@ test(`doesn't append forceNow query to url, if it doesn't exists`, async () => {
 
 test(`adds forceNow to each of multiple urls`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
-  const { urls } = await getFullUrls({
+  const urls = await getFullUrls({
     job: {
-      objects: [
-        { relativeUrl: '/app/kibana#/something_aaa' },
-        { relativeUrl: '/app/kibana#/something_bbb' },
-        { relativeUrl: '/app/kibana#/something_ccc' },
-        { relativeUrl: '/app/kibana#/something_ddd' },
+      relativeUrls: [
+        '/app/kibana#/something_aaa',
+        '/app/kibana#/something_bbb',
+        '/app/kibana#/something_ccc',
+        '/app/kibana#/something_ddd',
       ],
       forceNow,
     },
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 59c748aba9662..ca64d8632dbfe 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
@@ -12,7 +12,7 @@ import {
 } from 'url';
 import { getAbsoluteUrlFactory } from '../../../common/get_absolute_url';
 import { validateUrls } from '../../../common/validate_urls';
-import { ServerFacade, ConditionalHeaders } from '../../../types';
+import { ServerFacade } from '../../../types';
 import { JobDocPayloadPNG } from '../../png/types';
 import { JobDocPayloadPDF } from '../../printable_pdf/types';
 
@@ -20,18 +20,15 @@ function isPngJob(job: JobDocPayloadPNG | JobDocPayloadPDF): job is JobDocPayloa
   return (job as JobDocPayloadPNG).relativeUrl !== undefined;
 }
 function isPdfJob(job: JobDocPayloadPNG | JobDocPayloadPDF): job is JobDocPayloadPDF {
-  return (job as JobDocPayloadPDF).objects !== undefined;
+  return (job as JobDocPayloadPDF).relativeUrls !== undefined;
 }
 
-export async function getFullUrls<JobDocPayloadType>({
-  job,
+export function getFullUrls<JobDocPayloadType>({
   server,
-  ...mergeValues // pass-throughs
+  job,
 }: {
-  job: JobDocPayloadPDF | JobDocPayloadPNG;
   server: ServerFacade;
-  conditionalHeaders: ConditionalHeaders;
-  logo?: string;
+  job: JobDocPayloadPDF | JobDocPayloadPNG;
 }) {
   const config = server.config();
 
@@ -48,10 +45,10 @@ export async function getFullUrls<JobDocPayloadType>({
   if (isPngJob(job)) {
     relativeUrls = [job.relativeUrl];
   } else if (isPdfJob(job)) {
-    relativeUrls = job.objects.map(obj => obj.relativeUrl);
+    relativeUrls = job.relativeUrls;
   } else {
     throw new Error(
-      `No valid URL fields found in Job Params! Expected \`job.relativeUrl\` or \`job.objects[{ relativeUrl }]\``
+      `No valid URL fields found in Job Params! Expected \`job.relativeUrl: string\` or \`job.relativeUrls: string[]\``
     );
   }
 
@@ -96,5 +93,5 @@ export async function getFullUrls<JobDocPayloadType>({
     });
   });
 
-  return { job, server, urls, ...mergeValues };
+  return urls;
 }
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.test.ts
index 4d4b0c8ade3f6..f446369fec78c 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.test.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/omit_blacklisted_headers.test.ts
@@ -4,14 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { createMockServer } from '../../../test_helpers/create_mock_server';
 import { omitBlacklistedHeaders } from './index';
 
-let mockServer: any;
-beforeEach(() => {
-  mockServer = createMockServer('');
-});
-
 test(`omits blacklisted headers`, async () => {
   const permittedHeaders = {
     foo: 'bar',
@@ -27,7 +21,7 @@ test(`omits blacklisted headers`, async () => {
     'transfer-encoding': '',
   };
 
-  const { filteredHeaders } = await omitBlacklistedHeaders({
+  const filteredHeaders = await omitBlacklistedHeaders({
     job: {
       title: 'cool-job-bro',
       type: 'csv',
@@ -41,7 +35,6 @@ test(`omits blacklisted headers`, async () => {
       ...permittedHeaders,
       ...blacklistedHeaders,
     },
-    server: mockServer,
   });
 
   expect(filteredHeaders).toEqual(permittedHeaders);
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 1bd52a0f1b2d2..cbebd6bc21b0e 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,20 +5,17 @@
  */
 import { omit } from 'lodash';
 import { KBN_SCREENSHOT_HEADER_BLACKLIST } from '../../../common/constants';
-import { ServerFacade } from '../../../types';
 
 export const omitBlacklistedHeaders = <JobDocPayloadType>({
   job,
   decryptedHeaders,
-  server,
 }: {
   job: JobDocPayloadType;
   decryptedHeaders: Record<string, string>;
-  server: ServerFacade;
 }) => {
   const filteredHeaders: Record<string, string> = omit(
     decryptedHeaders,
     KBN_SCREENSHOT_HEADER_BLACKLIST
   );
-  return { job, filteredHeaders, server };
+  return filteredHeaders;
 };
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 152ef32e331b9..b83021d5e38dd 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
@@ -5,21 +5,9 @@
  */
 
 import * as Rx from 'rxjs';
-import { first, mergeMap } from 'rxjs/operators';
-import {
-  ServerFacade,
-  CaptureConfig,
-  HeadlessChromiumDriverFactory,
-  HeadlessChromiumDriver as HeadlessBrowser,
-} from '../../../../types';
-import {
-  ElementsPositionAndAttribute,
-  ScreenshotResults,
-  ScreenshotObservableOpts,
-  TimeRange,
-} from './types';
-
-import { checkForToastMessage } from './check_for_toast';
+import { first, mergeMap, toArray } from 'rxjs/operators';
+import { ServerFacade, CaptureConfig, HeadlessChromiumDriverFactory } from '../../../../types';
+import { ScreenshotResults, ScreenshotObservableOpts } from './types';
 import { injectCustomCss } from './inject_css';
 import { openUrl } from './open_url';
 import { waitForRenderComplete } from './wait_for_render';
@@ -28,6 +16,7 @@ import { waitForElementsToBeInDOM } from './wait_for_dom_elements';
 import { getTimeRange } from './get_time_range';
 import { getElementPositionAndAttributes } from './get_element_position_data';
 import { getScreenshots } from './get_screenshots';
+import { scanPage } from './scan_page';
 import { skipTelemetry } from './skip_telemetry';
 
 export function screenshotsObservableFactory(
@@ -39,108 +28,68 @@ export function screenshotsObservableFactory(
 
   return function screenshotsObservable({
     logger,
-    url,
+    urls,
     conditionalHeaders,
     layout,
     browserTimezone,
-  }: ScreenshotObservableOpts): Rx.Observable<ScreenshotResults> {
-    const create$ = browserDriverFactory.create({
-      viewport: layout.getBrowserViewport(),
-      browserTimezone,
-    });
+  }: ScreenshotObservableOpts): Rx.Observable<ScreenshotResults[]> {
+    const create$ = browserDriverFactory.createPage(
+      { viewport: layout.getBrowserViewport(), browserTimezone },
+      logger
+    );
 
-    // @ts-ignore this needs to be refactored to use less random type declaration and instead rely on structures that work with inference TODO
-    return create$.pipe(
-      mergeMap(({ driver$, exit$ }) => {
-        const screenshot$ = driver$.pipe(
-          mergeMap(
-            (browser: HeadlessBrowser) => openUrl(browser, url, conditionalHeaders, logger),
-            browser => browser
-          ),
-          mergeMap(
-            (browser: HeadlessBrowser) => skipTelemetry(browser, logger),
-            browser => browser
-          ),
-          mergeMap(
-            (browser: HeadlessBrowser) => {
-              logger.debug(
-                'waiting for elements or items count attribute; or not found to interrupt'
-              );
+    return Rx.from(urls).pipe(
+      mergeMap(url => {
+        return create$.pipe(
+          mergeMap(({ driver, exit$ }) => {
+            const screenshot$ = Rx.of(driver).pipe(
+              mergeMap(() => openUrl(driver, url, conditionalHeaders, logger)),
+              mergeMap(() => skipTelemetry(driver, logger)),
+              mergeMap(() => scanPage(driver, layout, logger)),
+              mergeMap(() => getNumberOfItems(driver, layout, logger)),
+              mergeMap(async itemsCount => {
+                const viewport = layout.getViewport(itemsCount);
+                await Promise.all([
+                  driver.setViewport(viewport, logger),
+                  waitForElementsToBeInDOM(driver, itemsCount, layout, logger),
+                ]);
+              }),
+              mergeMap(async () => {
+                // Waiting till _after_ elements have rendered before injecting our CSS
+                // allows for them to be displayed properly in many cases
+                await injectCustomCss(driver, layout, logger);
 
-              // the dashboard is using the `itemsCountAttribute` attribute to let us
-              // know how many items to expect since gridster incrementally adds panels
-              // we have to use this hint to wait for all of them
-              const renderSuccess = browser.waitForSelector(
-                `${layout.selectors.renderComplete},[${layout.selectors.itemsCountAttribute}]`,
-                {},
-                logger
-              );
-              const renderError = checkForToastMessage(browser, layout, logger);
-              return Rx.race(Rx.from(renderSuccess), Rx.from(renderError));
-            },
-            browser => browser
-          ),
-          mergeMap(
-            (browser: HeadlessBrowser) => getNumberOfItems(browser, layout, logger),
-            (browser, itemsCount: number) => ({ browser, itemsCount })
-          ),
-          mergeMap(
-            async ({ browser, itemsCount }) => {
-              logger.debug('setting viewport');
-              const viewport = layout.getViewport(itemsCount);
-              return await browser.setViewport(viewport, logger);
-            },
-            ({ browser, itemsCount }) => ({ browser, itemsCount })
-          ),
-          mergeMap(
-            ({ browser, itemsCount }) =>
-              waitForElementsToBeInDOM(browser, itemsCount, layout, logger),
-            ({ browser }) => browser
-          ),
-          mergeMap(
-            browser => {
-              // Waiting till _after_ elements have rendered before injecting our CSS
-              // allows for them to be displayed properly in many cases
-              return injectCustomCss(browser, layout, logger);
-            },
-            browser => browser
-          ),
-          mergeMap(
-            async browser => {
-              if (layout.positionElements) {
-                // position panel elements for print layout
-                return await layout.positionElements(browser, logger);
-              }
-            },
-            browser => browser
-          ),
-          mergeMap(
-            (browser: HeadlessBrowser) => {
-              return waitForRenderComplete(captureConfig, browser, layout, logger);
-            },
-            browser => browser
-          ),
-          mergeMap(
-            browser => getTimeRange(browser, layout, logger),
-            (browser, timeRange: TimeRange | null) => ({ browser, timeRange })
-          ),
-          mergeMap(
-            ({ browser }) => getElementPositionAndAttributes(browser, layout),
-            ({ browser, timeRange }, elementsPositionAndAttributes: ElementsPositionAndAttribute[]) => {
-              return { browser, timeRange, elementsPositionAndAttributes };
-            } // prettier-ignore
-          ),
-          mergeMap(
-            ({ browser, elementsPositionAndAttributes }) => {
-              return getScreenshots({ browser, elementsPositionAndAttributes, logger });
-            },
-            ({ timeRange }, screenshots) => ({ timeRange, screenshots })
-          )
-        );
+                if (layout.positionElements) {
+                  // position panel elements for print layout
+                  await layout.positionElements(driver, logger);
+                }
 
-        return Rx.race(screenshot$, exit$);
+                await waitForRenderComplete(captureConfig, driver, layout, logger);
+              }),
+              mergeMap(() => getTimeRange(driver, layout, logger)),
+              mergeMap(
+                async (timeRange): Promise<ScreenshotResults> => {
+                  const elementsPositionAndAttributes = await getElementPositionAndAttributes(
+                    driver,
+                    layout
+                  );
+                  const screenshots = await getScreenshots({
+                    browser: driver,
+                    elementsPositionAndAttributes,
+                    logger,
+                  });
+
+                  return { timeRange, screenshots };
+                }
+              )
+            );
+
+            return Rx.race(screenshot$, exit$);
+          })
+        );
       }),
-      first()
+      first(),
+      toArray()
     );
   };
 }
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/scan_page.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/scan_page.ts
new file mode 100644
index 0000000000000..81ff01bb204b8
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/scan_page.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as Rx from 'rxjs';
+import { HeadlessChromiumDriver } from '../../../../server/browsers/chromium/driver';
+import { LevelLogger } from '../../../../server/lib';
+import { LayoutInstance } from '../../layouts/layout';
+import { checkForToastMessage } from './check_for_toast';
+
+export function scanPage(
+  browser: HeadlessChromiumDriver,
+  layout: LayoutInstance,
+  logger: LevelLogger
+) {
+  logger.debug('waiting for elements or items count attribute; or not found to interrupt');
+
+  // the dashboard is using the `itemsCountAttribute` attribute to let us
+  // know how many items to expect since gridster incrementally adds panels
+  // we have to use this hint to wait for all of them
+  const renderSuccess = browser.waitForSelector(
+    `${layout.selectors.renderComplete},[${layout.selectors.itemsCountAttribute}]`,
+    {},
+    logger
+  );
+  const renderError = checkForToastMessage(browser, layout, logger);
+  return Rx.race(Rx.from(renderSuccess), Rx.from(renderError));
+}
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
index 4f461ef4ec5f9..78cd42f0cae2f 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/types.ts
@@ -10,7 +10,7 @@ import { LayoutInstance } from '../../layouts/layout';
 
 export interface ScreenshotObservableOpts {
   logger: LevelLogger;
-  url: string;
+  urls: string[];
   conditionalHeaders: ConditionalHeaders;
   layout: LayoutInstance;
   browserTimezone: string;
@@ -36,6 +36,6 @@ export interface Screenshot {
 }
 
 export interface ScreenshotResults {
-  timeRange: TimeRange;
+  timeRange: TimeRange | null;
   screenshots: Screenshot[];
 }
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv/index.ts b/x-pack/legacy/plugins/reporting/export_types/csv/index.ts
index 4f8aeb2be0c99..942cb954785ac 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv/index.ts
@@ -11,6 +11,7 @@ import {
   LICENSE_TYPE_STANDARD,
   LICENSE_TYPE_GOLD,
   LICENSE_TYPE_PLATINUM,
+  LICENSE_TYPE_ENTERPRISE,
 } from '../../common/constants';
 import { ExportTypeDefinition, ESQueueCreateJobFn, ESQueueWorkerExecuteFn } from '../../types';
 import { metadata } from './metadata';
@@ -35,5 +36,6 @@ export const getExportType = (): ExportTypeDefinition<
     LICENSE_TYPE_STANDARD,
     LICENSE_TYPE_GOLD,
     LICENSE_TYPE_PLATINUM,
+    LICENSE_TYPE_ENTERPRISE,
   ],
 });
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 5070c69553cfa..9d1eb9cc1bd4d 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
@@ -6,10 +6,21 @@
 
 import { JobDocPayload, JobParamPostPayload, ConditionalHeaders, RequestFacade } from '../../types';
 
+interface DocValueField {
+  field: string;
+  format: string;
+}
+
+interface SortOptions {
+  order: string;
+  unmapped_type: string;
+}
+
 export interface JobParamPostPayloadDiscoverCsv extends JobParamPostPayload {
   state?: {
     query: any;
-    sort: any[];
+    sort: Array<Record<string, SortOptions>>;
+    docvalue_fields: DocValueField[];
   };
 }
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/index.ts b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/index.ts
index 4876cea0b1b28..606630944c604 100644
--- a/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/csv_from_savedobject/index.ts
@@ -11,6 +11,7 @@ import {
   LICENSE_TYPE_STANDARD,
   LICENSE_TYPE_GOLD,
   LICENSE_TYPE_PLATINUM,
+  LICENSE_TYPE_ENTERPRISE,
 } from '../../common/constants';
 import { ExportTypeDefinition, ImmediateCreateJobFn, ImmediateExecuteFn } from '../../types';
 import { createJobFactory } from './server/create_job';
@@ -42,5 +43,6 @@ export const getExportType = (): ExportTypeDefinition<
     LICENSE_TYPE_STANDARD,
     LICENSE_TYPE_GOLD,
     LICENSE_TYPE_PLATINUM,
+    LICENSE_TYPE_ENTERPRISE,
   ],
 });
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 ba29c3ef1ec3f..7e12adefca38d 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
@@ -84,10 +84,11 @@ export async function generateCsvSearch(
 
   let payloadQuery: QueryFilter | undefined;
   let payloadSort: any[] = [];
+  let docValueFields: any[] | undefined;
   if (jobParams.post && jobParams.post.state) {
     ({
       post: {
-        state: { query: payloadQuery, sort: payloadSort = [] },
+        state: { query: payloadQuery, sort: payloadSort = [], docvalue_fields: docValueFields },
       },
     } = jobParams);
   }
@@ -119,7 +120,15 @@ export async function generateCsvSearch(
         },
       };
     }, {});
-  const docValueFields = indexPatternTimeField ? [indexPatternTimeField] : undefined;
+
+  if (indexPatternTimeField) {
+    if (docValueFields) {
+      docValueFields = [indexPatternTimeField].concat(docValueFields);
+    } else {
+      docValueFields = [indexPatternTimeField];
+    }
+  }
+
   const searchRequest: SearchRequest = {
     index: esIndex,
     body: {
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/index.ts b/x-pack/legacy/plugins/reporting/export_types/png/index.ts
index bc00bc428f306..b6206a8bf9599 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/index.ts
@@ -10,6 +10,7 @@ import {
   LICENSE_TYPE_STANDARD,
   LICENSE_TYPE_GOLD,
   LICENSE_TYPE_PLATINUM,
+  LICENSE_TYPE_ENTERPRISE,
 } from '../../common/constants';
 import { ExportTypeDefinition, ESQueueCreateJobFn, ESQueueWorkerExecuteFn } from '../../types';
 import { createJobFactory } from './server/create_job';
@@ -34,5 +35,6 @@ export const getExportType = (): ExportTypeDefinition<
     LICENSE_TYPE_STANDARD,
     LICENSE_TYPE_GOLD,
     LICENSE_TYPE_PLATINUM,
+    LICENSE_TYPE_ENTERPRISE,
   ],
 });
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
index 0888d287af07c..1be65722fa668 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.test.js
@@ -27,7 +27,7 @@ beforeEach(() => {
     'server.port': 5601,
   };
   mockServer = {
-    expose: () => {},
+    expose: () => {}, // NOTE: this is for oncePerServer
     config: memoize(() => ({ get: jest.fn() })),
     info: {
       protocol: 'http',
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
index b289ae45dde67..c2fda05fbe3e9 100644
--- a/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/png/server/execute_job/index.ts
@@ -5,7 +5,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { mergeMap, catchError, map, takeUntil } from 'rxjs/operators';
+import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import { PLUGIN_ID, PNG_JOB_TYPE } from '../../../../common/constants';
 import {
   ServerFacade,
@@ -32,18 +32,14 @@ export const executeJobFactory: QueuedPngExecutorFactory = function executeJobFa
   const generatePngObservable = generatePngObservableFactory(server, browserDriverFactory);
   const logger = LevelLogger.createForServer(server, [PLUGIN_ID, PNG_JOB_TYPE, 'execute']);
 
-  return function executeJob(
-    jobId: string,
-    jobToExecute: JobDocPayloadPNG,
-    cancellationToken: any
-  ) {
+  return function executeJob(jobId: string, job: JobDocPayloadPNG, cancellationToken: any) {
     const jobLogger = logger.clone([jobId]);
-    const process$ = Rx.of({ job: jobToExecute, server, logger }).pipe(
-      mergeMap(decryptJobHeaders),
-      map(omitBlacklistedHeaders),
-      map(getConditionalHeaders),
-      mergeMap(getFullUrls),
-      mergeMap(({ job, conditionalHeaders, urls }) => {
+    const process$ = Rx.of(1).pipe(
+      mergeMap(() => decryptJobHeaders({ server, job, logger })),
+      map(decryptedHeaders => omitBlacklistedHeaders({ job, decryptedHeaders })),
+      map(filteredHeaders => getConditionalHeaders({ server, job, filteredHeaders })),
+      mergeMap(conditionalHeaders => {
+        const urls = getFullUrls({ server, job });
         const hashUrl = urls[0];
         return generatePngObservable(
           jobLogger,
diff --git a/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts b/x-pack/legacy/plugins/reporting/export_types/png/server/lib/generate_png.ts
index e2b1474515786..600762c451a79 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
@@ -32,19 +32,17 @@ export function generatePngObservableFactory(
     const layout = new PreserveLayout(layoutParams.dimensions);
     const screenshots$ = screenshotsObservable({
       logger,
-      url,
+      urls: [url],
       conditionalHeaders,
       layout,
       browserTimezone,
     }).pipe(
-      map(urlScreenshots => {
-        if (urlScreenshots.screenshots.length !== 1) {
-          throw new Error(
-            `Expected there to be 1 screenshot, but there are ${urlScreenshots.screenshots.length}`
-          );
+      map(([{ screenshots }]) => {
+        if (screenshots.length !== 1) {
+          throw new Error(`Expected there to be 1 screenshot, but there are ${screenshots.length}`);
         }
 
-        return urlScreenshots.screenshots[0].base64EncodedData;
+        return screenshots[0].base64EncodedData;
       })
     );
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/index.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/index.ts
index 99880c1237a7a..b7b71ff5c5741 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/index.ts
@@ -10,6 +10,7 @@ import {
   LICENSE_TYPE_STANDARD,
   LICENSE_TYPE_GOLD,
   LICENSE_TYPE_PLATINUM,
+  LICENSE_TYPE_ENTERPRISE,
 } from '../../common/constants';
 import { ExportTypeDefinition, ESQueueCreateJobFn, ESQueueWorkerExecuteFn } from '../../types';
 import { createJobFactory } from './server/create_job';
@@ -34,5 +35,6 @@ export const getExportType = (): ExportTypeDefinition<
     LICENSE_TYPE_STANDARD,
     LICENSE_TYPE_GOLD,
     LICENSE_TYPE_PLATINUM,
+    LICENSE_TYPE_ENTERPRISE,
   ],
 });
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.js b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.js
deleted file mode 100644
index a3afd070603b0..0000000000000
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.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.
- */
-
-import { uriEncode } from '../lib/uri_encode';
-
-/*
- * TODO: Kibana 8.0:
- * Remove support for parsing Saved Object details from objectType / savedObjectId
- * Including support for determining the Report title from objectType / savedObjectId
- *
- * - `objectType` is optional, but helps differentiate the type of report in the job listing
- * - `title` must be explicitly passed
- * - `relativeUrls` array OR `relativeUrl` string must be passed
- */
-
-const getSavedObjectTitle = async (objectType, savedObjectId, savedObjectsClient) => {
-  const savedObject = await savedObjectsClient.get(objectType, savedObjectId);
-  return savedObject.attributes.title;
-};
-
-const getSavedObjectRelativeUrl = (objectType, savedObjectId, queryString) => {
-  const appPrefixes = {
-    dashboard: '/dashboard/',
-    visualization: '/visualize/edit/',
-    search: '/discover/',
-  };
-
-  const appPrefix = appPrefixes[objectType];
-  if (!appPrefix) throw new Error('Unexpected app type: ' + objectType);
-
-  const hash = appPrefix + uriEncode.string(savedObjectId, true);
-
-  return `/app/kibana#${hash}?${queryString || ''}`;
-};
-
-export function compatibilityShimFactory(server, logger) {
-  return function compatibilityShimFactory(createJobFn) {
-    return async function(
-      {
-        savedObjectId, // deprecating
-        queryString, // deprecating
-        browserTimezone,
-        objectType,
-        title,
-        relativeUrls,
-        layout,
-      },
-      headers,
-      request
-    ) {
-      // input validation and deprecation logging
-      if (savedObjectId) {
-        if (typeof savedObjectId !== 'string') {
-          throw new Error('Invalid savedObjectId (deprecated). String is expected.');
-        }
-        if (relativeUrls) {
-          throw new Error(`savedObjectId should not be provided if relativeUrls are provided`);
-        }
-      } else {
-        if (!relativeUrls) {
-          throw new Error(`Either relativeUrls or savedObjectId must be provided`);
-        }
-        if (!Array.isArray(relativeUrls)) {
-          throw new Error('Invalid relativeUrls. String[] is expected.');
-        }
-        relativeUrls.forEach(url => {
-          if (typeof url !== 'string') {
-            throw new Error('Invalid Relative URL in relativeUrls. String is expected.');
-          }
-        });
-      }
-
-      let kibanaRelativeUrls;
-      if (relativeUrls) {
-        kibanaRelativeUrls = relativeUrls;
-      } else {
-        kibanaRelativeUrls = [getSavedObjectRelativeUrl(objectType, savedObjectId, queryString)];
-        logger.warning(
-          `The relativeUrls have been derived from saved object parameters. ` +
-            `This functionality will be removed with the next major version.`
-        );
-      }
-
-      let reportTitle;
-      try {
-        if (title) {
-          reportTitle = title;
-        } else {
-          if (objectType && savedObjectId) {
-            reportTitle = await getSavedObjectTitle(
-              objectType,
-              savedObjectId,
-              request.getSavedObjectsClient()
-            );
-            logger.warning(
-              `The title has been derived from saved object parameters. This ` +
-                `functionality will be removed with the next major version.`
-            );
-          } else {
-            logger.warning(
-              `A title parameter should be provided with the job generation ` +
-                `request. Please use Kibana to regenerate your POST URL to have a ` +
-                `title included in the PDF.`
-            );
-          }
-        }
-      } catch (err) {
-        logger.error(err); // 404 for the savedObjectId, etc
-        throw err;
-      }
-
-      const transformedJobParams = {
-        objectType,
-        title: reportTitle,
-        relativeUrls: kibanaRelativeUrls,
-        browserTimezone,
-        layout,
-      };
-
-      return await createJobFn(transformedJobParams, headers, request);
-    };
-  };
-}
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.test.js b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.test.js
deleted file mode 100644
index b3b8bca1d8955..0000000000000
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.test.js
+++ /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 { once } from 'lodash';
-import { compatibilityShimFactory } from './compatibility_shim';
-
-const createMockServer = () => {
-  return {
-    expose: jest.fn(), //fool once_per_server
-    log: jest.fn(),
-  };
-};
-
-const createMockLogger = () => ({
-  warning: jest.fn(),
-  error: jest.fn(),
-});
-
-const createMockRequest = () => {
-  return {
-    getSavedObjectsClient: once(function() {
-      return {
-        get: jest.fn(),
-      };
-    }),
-  };
-};
-
-test(`passes title through if provided`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-  const title = 'test title';
-
-  const createJobMock = jest.fn();
-  await compatibilityShim(createJobMock)(
-    { title, relativeUrls: ['/something'] },
-    null,
-    createMockRequest()
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(0);
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][0].title).toBe(title);
-});
-
-test(`gets the title from the savedObject`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-  const title = 'savedTitle';
-  mockRequest.getSavedObjectsClient().get.mockReturnValue({
-    attributes: {
-      title,
-    },
-  });
-
-  await compatibilityShim(createJobMock)(
-    { objectType: 'search', savedObjectId: 'abc' },
-    null,
-    mockRequest
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(2);
-  expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-    'The relativeUrls have been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][0].title).toBe(title);
-});
-
-test(`passes the objectType and savedObjectId to the savedObjectsClient`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-  mockRequest.getSavedObjectsClient().get.mockReturnValue({
-    attributes: {
-      title: '',
-    },
-  });
-
-  const objectType = 'search';
-  const savedObjectId = 'abc';
-  await compatibilityShim(createJobMock)({ objectType, savedObjectId }, null, mockRequest);
-
-  expect(mockLogger.warning.mock.calls.length).toBe(2);
-  expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-    'The relativeUrls have been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-  expect(mockLogger.warning.mock.calls[1][0]).toEqual(
-    'The title has been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  const getMock = mockRequest.getSavedObjectsClient().get.mock;
-  expect(getMock.calls.length).toBe(1);
-  expect(getMock.calls[0][0]).toBe(objectType);
-  expect(getMock.calls[0][1]).toBe(savedObjectId);
-});
-
-test(`logs no warnings when title and relativeUrls is passed`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-
-  await compatibilityShim(createJobMock)(
-    { title: 'Phenomenal Dashboard', relativeUrls: ['/abc', '/def'] },
-    null,
-    mockRequest
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(0);
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-});
-
-test(`logs warning if title can not be provided`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-  await compatibilityShim(createJobMock)({ relativeUrls: ['/abc'] }, null, mockRequest);
-
-  expect(mockLogger.warning.mock.calls.length).toBe(1);
-  expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-    `A title parameter should be provided with the job generation request. Please ` +
-      `use Kibana to regenerate your POST URL to have a title included in the PDF.`
-  );
-});
-
-test(`logs deprecations when generating the title/relativeUrl using the savedObject`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-  mockRequest.getSavedObjectsClient().get.mockReturnValue({
-    attributes: {
-      title: '',
-    },
-  });
-
-  await compatibilityShim(createJobMock)(
-    { objectType: 'search', savedObjectId: 'abc' },
-    null,
-    mockRequest
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(2);
-  expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-    'The relativeUrls have been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-  expect(mockLogger.warning.mock.calls[1][0]).toEqual(
-    'The title has been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-});
-
-test(`passes objectType through`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-  const mockRequest = createMockRequest();
-
-  const objectType = 'foo';
-  await compatibilityShim(createJobMock)(
-    { title: 'test', relativeUrls: ['/something'], objectType },
-    null,
-    mockRequest
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(0);
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][0].objectType).toBe(objectType);
-});
-
-test(`passes the relativeUrls through`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-
-  const relativeUrls = ['/app/kibana#something', '/app/kibana#something-else'];
-  await compatibilityShim(createJobMock)({ title: 'test', relativeUrls }, null, null);
-
-  expect(mockLogger.warning.mock.calls.length).toBe(0);
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][0].relativeUrls).toBe(relativeUrls);
-});
-
-const testSavedObjectRelativeUrl = (objectType, expectedUrl) => {
-  test(`generates the saved object relativeUrl for ${objectType}`, async () => {
-    const mockLogger = createMockLogger();
-    const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-    const createJobMock = jest.fn();
-
-    await compatibilityShim(createJobMock)(
-      { title: 'test', objectType, savedObjectId: 'abc' },
-      null,
-      null
-    );
-
-    expect(mockLogger.warning.mock.calls.length).toBe(1);
-    expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-      'The relativeUrls have been derived from saved object parameters. This functionality will be removed with the next major version.'
-    );
-    expect(mockLogger.error.mock.calls.length).toBe(0);
-
-    expect(createJobMock.mock.calls.length).toBe(1);
-    expect(createJobMock.mock.calls[0][0].relativeUrls).toEqual([expectedUrl]);
-  });
-};
-
-testSavedObjectRelativeUrl('search', '/app/kibana#/discover/abc?');
-testSavedObjectRelativeUrl('visualization', '/app/kibana#/visualize/edit/abc?');
-testSavedObjectRelativeUrl('dashboard', '/app/kibana#/dashboard/abc?');
-
-test(`appends the queryString to the relativeUrl when generating from the savedObject`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-  const createJobMock = jest.fn();
-
-  await compatibilityShim(createJobMock)(
-    { title: 'test', objectType: 'search', savedObjectId: 'abc', queryString: 'foo=bar' },
-    null,
-    null
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(1);
-  expect(mockLogger.warning.mock.calls[0][0]).toEqual(
-    'The relativeUrls have been derived from saved object parameters. This functionality will be removed with the next major version.'
-  );
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][0].relativeUrls).toEqual([
-    '/app/kibana#/discover/abc?foo=bar',
-  ]);
-});
-
-test(`throw an Error if the objectType, savedObjectId and relativeUrls are provided`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-  const createJobMock = jest.fn();
-
-  const promise = compatibilityShim(createJobMock)(
-    {
-      title: 'test',
-      objectType: 'something',
-      relativeUrls: ['/something'],
-      savedObjectId: 'abc',
-    },
-    null,
-    null
-  );
-
-  await expect(promise).rejects.toBeDefined();
-});
-
-test(`passes headers and request through`, async () => {
-  const mockLogger = createMockLogger();
-  const compatibilityShim = compatibilityShimFactory(createMockServer(), mockLogger);
-
-  const createJobMock = jest.fn();
-
-  const headers = {};
-  const request = createMockRequest();
-
-  await compatibilityShim(createJobMock)(
-    { title: 'test', relativeUrls: ['/something'] },
-    headers,
-    request
-  );
-
-  expect(mockLogger.warning.mock.calls.length).toBe(0);
-  expect(mockLogger.error.mock.calls.length).toBe(0);
-
-  expect(createJobMock.mock.calls.length).toBe(1);
-  expect(createJobMock.mock.calls[0][1]).toBe(headers);
-  expect(createJobMock.mock.calls[0][2]).toBe(request);
-});
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
index d17713057abc1..a8cc71175cffe 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/create_job/index.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PLUGIN_ID, PDF_JOB_TYPE } from '../../../../common/constants';
 import {
   CreateJobFactory,
   ESQueueCreateJobFn,
@@ -13,29 +12,16 @@ import {
   ConditionalHeaders,
 } from '../../../../types';
 import { validateUrls } from '../../../../common/validate_urls';
-import { LevelLogger } from '../../../../server/lib';
 import { cryptoFactory } from '../../../../server/lib/crypto';
 import { JobParamsPDF } from '../../types';
-// @ts-ignore untyped module
-import { compatibilityShimFactory } from './compatibility_shim';
-
-interface CreateJobFnOpts {
-  objectType: any;
-  title: string;
-  relativeUrls: string[];
-  browserTimezone: string;
-  layout: any;
-}
 
 export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
   JobParamsPDF
 >> = function createJobFactoryFn(server: ServerFacade) {
-  const logger = LevelLogger.createForServer(server, [PLUGIN_ID, PDF_JOB_TYPE, 'create']);
-  const compatibilityShim = compatibilityShimFactory(server, logger);
   const crypto = cryptoFactory(server);
 
-  return compatibilityShim(async function createJobFn(
-    { objectType, title, relativeUrls, browserTimezone, layout }: CreateJobFnOpts,
+  return async function createJobFn(
+    { title, relativeUrls, browserTimezone, layout, objectType }: JobParamsPDF,
     headers: ConditionalHeaders['headers'],
     request: RequestFacade
   ) {
@@ -44,14 +30,14 @@ export const createJobFactory: CreateJobFactory<ESQueueCreateJobFn<
     validateUrls(relativeUrls);
 
     return {
-      type: objectType, // Note: this changes the shape of the job params object
-      title,
-      objects: relativeUrls.map(u => ({ relativeUrl: u })),
-      headers: serializedEncryptedHeaders,
-      browserTimezone,
-      layout,
       basePath: request.getBasePath(),
+      browserTimezone,
       forceNow: new Date().toISOString(),
+      headers: serializedEncryptedHeaders,
+      layout,
+      relativeUrls,
+      title,
+      objectType,
     };
-  });
+  };
 };
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
index db7b599a1aaab..ddbee6e9d54a4 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.test.js
@@ -27,7 +27,8 @@ beforeEach(() => {
     'server.port': 5601,
   };
   mockServer = {
-    expose: () => {},
+    expose: jest.fn(),
+    log: jest.fn(),
     config: memoize(() => ({ get: jest.fn() })),
     info: {
       protocol: 'http',
@@ -71,7 +72,7 @@ test(`passes browserTimezone to generatePdf`, async () => {
   const browserTimezone = 'UTC';
   await executeJob(
     'pdfJobId',
-    { objects: [], browserTimezone, headers: encryptedHeaders },
+    { relativeUrls: [], browserTimezone, headers: encryptedHeaders },
     cancellationToken
   );
 
@@ -96,7 +97,7 @@ test(`returns content_type of application/pdf`, async () => {
 
   const { content_type: contentType } = await executeJob(
     'pdfJobId',
-    { objects: [], timeRange: {}, headers: encryptedHeaders },
+    { relativeUrls: [], timeRange: {}, headers: encryptedHeaders },
     cancellationToken
   );
   expect(contentType).toBe('application/pdf');
@@ -112,7 +113,7 @@ test(`returns content of generatePdf getBuffer base64 encoded`, async () => {
   const encryptedHeaders = await encryptHeaders({});
   const { content } = await executeJob(
     'pdfJobId',
-    { objects: [], timeRange: {}, headers: encryptedHeaders },
+    { relativeUrls: [], timeRange: {}, headers: encryptedHeaders },
     cancellationToken
   );
 
diff --git a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
index e2b3183464cf2..d85207e671212 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/server/execute_job/index.ts
@@ -5,7 +5,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { mergeMap, catchError, map, takeUntil } from 'rxjs/operators';
+import { catchError, map, mergeMap, takeUntil } from 'rxjs/operators';
 import {
   ServerFacade,
   ExecuteJobFactory,
@@ -33,33 +33,28 @@ export const executeJobFactory: QueuedPdfExecutorFactory = function executeJobFa
   const generatePdfObservable = generatePdfObservableFactory(server, browserDriverFactory);
   const logger = LevelLogger.createForServer(server, [PLUGIN_ID, PDF_JOB_TYPE, 'execute']);
 
-  return function executeJob(
-    jobId: string,
-    jobToExecute: JobDocPayloadPDF,
-    cancellationToken: any
-  ) {
+  return function executeJob(jobId: string, job: JobDocPayloadPDF, cancellationToken: any) {
     const jobLogger = logger.clone([jobId]);
 
-    const process$ = Rx.of({ job: jobToExecute, server, logger }).pipe(
-      mergeMap(decryptJobHeaders),
-      map(omitBlacklistedHeaders),
-      map(getConditionalHeaders),
-      mergeMap(getCustomLogo),
-      mergeMap(getFullUrls),
-      mergeMap(
-        ({ job, conditionalHeaders, logo, urls }): Rx.Observable<Buffer> => {
-          const { browserTimezone, layout } = jobToExecute;
-          return generatePdfObservable(
-            jobLogger,
-            job.title,
-            urls,
-            browserTimezone,
-            conditionalHeaders,
-            layout,
-            logo
-          );
-        }
-      ),
+    const process$ = Rx.of(1).pipe(
+      mergeMap(() => decryptJobHeaders({ server, job, logger })),
+      map(decryptedHeaders => omitBlacklistedHeaders({ job, decryptedHeaders })),
+      map(filteredHeaders => getConditionalHeaders({ server, job, filteredHeaders })),
+      mergeMap(conditionalHeaders => getCustomLogo({ server, job, conditionalHeaders })),
+      mergeMap(({ logo, conditionalHeaders }) => {
+        const urls = getFullUrls({ server, job });
+
+        const { browserTimezone, layout, title } = job;
+        return generatePdfObservable(
+          jobLogger,
+          title,
+          urls,
+          browserTimezone,
+          conditionalHeaders,
+          layout,
+          logo
+        );
+      }),
       map((buffer: Buffer) => ({
         content_type: 'application/pdf',
         content: buffer.toString('base64'),
@@ -72,7 +67,6 @@ export const executeJobFactory: QueuedPdfExecutorFactory = function executeJobFa
     );
 
     const stop$ = Rx.fromEventPattern(cancellationToken.on);
-
     return process$.pipe(takeUntil(stop$)).toPromise();
   };
 };
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 898a13a2dfe80..9a8db308bea79 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
@@ -5,7 +5,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { toArray, mergeMap } from 'rxjs/operators';
+import { mergeMap } from 'rxjs/operators';
 import { groupBy } from 'lodash';
 import { LevelLogger } from '../../../../server/lib';
 import { ServerFacade, HeadlessChromiumDriverFactory, ConditionalHeaders } from '../../../../types';
@@ -31,7 +31,6 @@ export function generatePdfObservableFactory(
   browserDriverFactory: HeadlessChromiumDriverFactory
 ) {
   const screenshotsObservable = screenshotsObservableFactory(server, browserDriverFactory);
-  const captureConcurrency = 1;
 
   return function generatePdfObservable(
     logger: LevelLogger,
@@ -41,15 +40,16 @@ export function generatePdfObservableFactory(
     conditionalHeaders: ConditionalHeaders,
     layoutParams: LayoutParams,
     logo?: string
-  ) {
+  ): Rx.Observable<Buffer> {
     const layout = createLayout(server, layoutParams) as LayoutInstance;
-    const screenshots$ = Rx.from(urls).pipe(
-      mergeMap(
-        url => screenshotsObservable({ logger, url, conditionalHeaders, layout, browserTimezone }),
-        captureConcurrency
-      ),
-      toArray(),
-      mergeMap(async (urlScreenshots: ScreenshotResults[]) => {
+    const screenshots$ = screenshotsObservable({
+      logger,
+      urls,
+      conditionalHeaders,
+      layout,
+      browserTimezone,
+    }).pipe(
+      mergeMap(async urlScreenshots => {
         const pdfOutput = pdf.create(layout, logo);
 
         if (title) {
@@ -68,8 +68,7 @@ export function generatePdfObservableFactory(
         });
 
         pdfOutput.generate();
-        const buffer = await pdfOutput.getBuffer();
-        return buffer;
+        return await pdfOutput.getBuffer();
       })
     );
 
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 b51a2d4d5711c..0a9dcfe986ca6 100644
--- a/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/printable_pdf/types.d.ts
@@ -9,7 +9,7 @@ import { JobDocPayload, ServerFacade, RequestFacade } from '../../types';
 
 // Job params: structure of incoming user request data, after being parsed from RISON
 export interface JobParamsPDF {
-  objectType: string;
+  objectType: string; // visualization, dashboard, etc. Used for job info & telemetry
   title: string;
   relativeUrls: string[];
   browserTimezone: string;
@@ -22,7 +22,5 @@ export interface JobDocPayloadPDF extends JobDocPayload<JobParamsPDF> {
   browserTimezone: string;
   forceNow?: string;
   layout: LayoutParams;
-  objects: Array<{
-    relativeUrl: string;
-  }>;
+  relativeUrls: string[];
 }
diff --git a/x-pack/legacy/plugins/reporting/index.test.js b/x-pack/legacy/plugins/reporting/index.test.js
index f1b471071153c..0d9a717bd7d81 100644
--- a/x-pack/legacy/plugins/reporting/index.test.js
+++ b/x-pack/legacy/plugins/reporting/index.test.js
@@ -16,6 +16,7 @@ jest.mock('os', () => {
   return os;
 });
 
+// eslint-disable-next-line jest/valid-describe
 const describeWithContext = describe.each([
   [{ dev: false, dist: false }],
   [{ dev: true, dist: false }],
diff --git a/x-pack/legacy/plugins/reporting/index.ts b/x-pack/legacy/plugins/reporting/index.ts
index c0c9e458132f0..faa27bfb2d6ea 100644
--- a/x-pack/legacy/plugins/reporting/index.ts
+++ b/x-pack/legacy/plugins/reporting/index.ts
@@ -94,7 +94,7 @@ export const reporting = (kibana: any) => {
       const { xpack_main: xpackMainPlugin } = server.plugins;
       mirrorPluginStatus(xpackMainPlugin, this);
       const checkLicense = checkLicenseFactory(exportTypesRegistry);
-      xpackMainPlugin.status.once('green', () => {
+      (xpackMainPlugin 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
         xpackMainPlugin.info.feature(this.id).registerLicenseCheckResultsGenerator(checkLicense);
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 f511d9a88a30b..2055afdcf2bfe 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
@@ -15,16 +15,18 @@ exports[`ReportInfoButton handles button click flyout on click 1`] = `
     type="iInCircle"
   >
     <EuiIconEmpty
-      aria-hidden="true"
+      aria-hidden={true}
       className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
       focusable="false"
+      role="img"
       style={null}
     >
       <svg
-        aria-hidden="true"
+        aria-hidden={true}
         className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
         focusable="false"
         height={16}
+        role="img"
         style={null}
         viewBox="0 0 16 16"
         width={16}
@@ -157,6 +159,7 @@ Array [
                             class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                             focusable="false"
                             height="16"
+                            role="img"
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
@@ -217,6 +220,7 @@ Array [
                               class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                               focusable="false"
                               height="16"
+                              role="img"
                               viewBox="0 0 16 16"
                               width="16"
                               xmlns="http://www.w3.org/2000/svg"
@@ -282,16 +286,18 @@ Array [
                         type="cross"
                       >
                         <EuiIconEmpty
-                          aria-hidden="true"
+                          aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
+                          role="img"
                           style={null}
                         >
                           <svg
-                            aria-hidden="true"
+                            aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                             focusable="false"
                             height={16}
+                            role="img"
                             style={null}
                             viewBox="0 0 16 16"
                             width={16}
@@ -388,16 +394,18 @@ Array [
           type="cross"
         >
           <EuiIconEmpty
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
             focusable="false"
+            role="img"
             style={null}
           >
             <svg
-              aria-hidden="true"
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
@@ -568,6 +576,7 @@ Array [
                             class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                             focusable="false"
                             height="16"
+                            role="img"
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
@@ -626,6 +635,7 @@ Array [
                               class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                               focusable="false"
                               height="16"
+                              role="img"
                               viewBox="0 0 16 16"
                               width="16"
                               xmlns="http://www.w3.org/2000/svg"
@@ -689,16 +699,18 @@ Array [
                         type="cross"
                       >
                         <EuiIconEmpty
-                          aria-hidden="true"
+                          aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
+                          role="img"
                           style={null}
                         >
                           <svg
-                            aria-hidden="true"
+                            aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                             focusable="false"
                             height={16}
+                            role="img"
                             style={null}
                             viewBox="0 0 16 16"
                             width={16}
@@ -793,16 +805,18 @@ Array [
           type="cross"
         >
           <EuiIconEmpty
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
             focusable="false"
+            role="img"
             style={null}
           >
             <svg
-              aria-hidden="true"
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
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 f76cacb1d3b53..fe5625fa0dfa6 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
@@ -249,76 +249,6 @@ Array [
           </table>
         </EuiTable>
       </div>
-      <PaginationBar
-        onPageChange={[Function]}
-        onPageSizeChange={[Function]}
-        pagination={
-          Object {
-            "hidePerPageOptions": true,
-            "pageIndex": 0,
-            "pageSize": 10,
-            "totalItemCount": 0,
-          }
-        }
-      >
-        <div>
-          <EuiSpacer
-            size="m"
-          >
-            <div
-              className="euiSpacer euiSpacer--m"
-            />
-          </EuiSpacer>
-          <EuiTablePagination
-            activePage={0}
-            hidePerPageOptions={true}
-            itemsPerPage={10}
-            itemsPerPageOptions={
-              Array [
-                10,
-                25,
-                50,
-              ]
-            }
-            onChangeItemsPerPage={[Function]}
-            onChangePage={[Function]}
-            pageCount={0}
-          >
-            <EuiFlexGroup
-              alignItems="center"
-              justifyContent="spaceBetween"
-              responsive={false}
-            >
-              <div
-                className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-              >
-                <EuiFlexItem
-                  grow={false}
-                >
-                  <div
-                    className="euiFlexItem euiFlexItem--flexGrowZero"
-                  />
-                </EuiFlexItem>
-                <EuiFlexItem
-                  grow={false}
-                >
-                  <div
-                    className="euiFlexItem euiFlexItem--flexGrowZero"
-                  >
-                    <EuiPagination
-                      activePage={0}
-                      onPageClick={[Function]}
-                      pageCount={0}
-                    >
-                      <span />
-                    </EuiPagination>
-                  </div>
-                </EuiFlexItem>
-              </div>
-            </EuiFlexGroup>
-          </EuiTablePagination>
-        </div>
-      </PaginationBar>
     </div>
   </EuiBasicTable>,
   <div
@@ -524,76 +454,6 @@ Array [
         </table>
       </EuiTable>
     </div>
-    <PaginationBar
-      onPageChange={[Function]}
-      onPageSizeChange={[Function]}
-      pagination={
-        Object {
-          "hidePerPageOptions": true,
-          "pageIndex": 0,
-          "pageSize": 10,
-          "totalItemCount": 0,
-        }
-      }
-    >
-      <div>
-        <EuiSpacer
-          size="m"
-        >
-          <div
-            className="euiSpacer euiSpacer--m"
-          />
-        </EuiSpacer>
-        <EuiTablePagination
-          activePage={0}
-          hidePerPageOptions={true}
-          itemsPerPage={10}
-          itemsPerPageOptions={
-            Array [
-              10,
-              25,
-              50,
-            ]
-          }
-          onChangeItemsPerPage={[Function]}
-          onChangePage={[Function]}
-          pageCount={0}
-        >
-          <EuiFlexGroup
-            alignItems="center"
-            justifyContent="spaceBetween"
-            responsive={false}
-          >
-            <div
-              className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
-            >
-              <EuiFlexItem
-                grow={false}
-              >
-                <div
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                />
-              </EuiFlexItem>
-              <EuiFlexItem
-                grow={false}
-              >
-                <div
-                  className="euiFlexItem euiFlexItem--flexGrowZero"
-                >
-                  <EuiPagination
-                    activePage={0}
-                    onPageClick={[Function]}
-                    pageCount={0}
-                  >
-                    <span />
-                  </EuiPagination>
-                </div>
-              </EuiFlexItem>
-            </div>
-          </EuiFlexGroup>
-        </EuiTablePagination>
-      </div>
-    </PaginationBar>
   </div>,
 ]
 `;
diff --git a/x-pack/legacy/plugins/reporting/public/components/report_listing.tsx b/x-pack/legacy/plugins/reporting/public/components/report_listing.tsx
index 34de855bacbb9..320f6220aa996 100644
--- a/x-pack/legacy/plugins/reporting/public/components/report_listing.tsx
+++ b/x-pack/legacy/plugins/reporting/public/components/report_listing.tsx
@@ -4,11 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// TODO: Remove once typescript definitions are in EUI
-declare module '@elastic/eui' {
-  export const EuiBasicTable: React.FC<any>;
-}
-
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import moment from 'moment';
@@ -17,7 +12,7 @@ import React, { Component } from 'react';
 import chrome from 'ui/chrome';
 import { toastNotifications } from 'ui/notify';
 import {
-  EuiBasicTable as EuiBasicTableTyped,
+  EuiBasicTable,
   EuiButtonIcon,
   EuiPageContent,
   EuiSpacer,
@@ -297,7 +292,7 @@ class ReportListingUi extends Component<Props, State> {
     };
 
     return (
-      <EuiBasicTableTyped
+      <EuiBasicTable
         itemId={'id'}
         items={this.state.jobs}
         loading={this.state.isLoading}
@@ -430,7 +425,7 @@ class ReportListingUi extends Component<Props, State> {
             return {
               id: job._id,
               type: source.jobtype,
-              object_type: source.payload.type,
+              object_type: source.payload.objectType,
               object_title: source.payload.title,
               created_by: source.created_by,
               created_at: source.created_at,
diff --git a/x-pack/legacy/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx b/x-pack/legacy/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
index ebb57d34c01a1..95ca1792a7eb1 100644
--- a/x-pack/legacy/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
+++ b/x-pack/legacy/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
@@ -19,8 +19,8 @@ import {
   IEmbeddable,
   CONTEXT_MENU_TRIGGER,
 } from '../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
-import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/embeddable/constants';
-import { ISearchEmbeddable } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/embeddable/types';
+import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/constants';
+import { ISearchEmbeddable } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/np_ready/embeddable/types';
 
 import { API_BASE_URL_V1 } from '../../common/constants';
 
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 daa7df343f8aa..6fa46b893de8c 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
@@ -31,10 +31,11 @@ type queueTimeout = number;
 
 export class HeadlessChromiumDriverFactory {
   private binaryPath: binaryPath;
-  private logger: Logger;
   private browserConfig: BrowserConfig;
   private queueTimeout: queueTimeout;
   private networkPolicy: NetworkPolicy;
+  private userDataDir: string;
+  private getChromiumArgs: (viewport: BrowserConfig['viewport']) => string[];
 
   constructor(
     binaryPath: binaryPath,
@@ -46,23 +47,30 @@ export class HeadlessChromiumDriverFactory {
     this.binaryPath = binaryPath;
     this.browserConfig = browserConfig;
     this.queueTimeout = queueTimeout;
-    this.logger = logger;
     this.networkPolicy = networkPolicy;
+
+    this.userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'chromium-'));
+    this.getChromiumArgs = (viewport: BrowserConfig['viewport']) =>
+      args({
+        userDataDir: this.userDataDir,
+        viewport,
+        disableSandbox: this.browserConfig.disableSandbox,
+        proxy: this.browserConfig.proxy,
+      });
   }
 
   type = 'chromium';
 
-  test({ viewport }: { viewport: BrowserConfig['viewport'] }, logger: Logger) {
-    const userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'chromium-'));
+  test(logger: Logger) {
     const chromiumArgs = args({
-      userDataDir,
-      viewport,
+      userDataDir: this.userDataDir,
+      viewport: { width: 800, height: 600 },
       disableSandbox: this.browserConfig.disableSandbox,
       proxy: this.browserConfig.proxy,
     });
 
     return puppeteerLaunch({
-      userDataDir,
+      userDataDir: this.userDataDir,
       executablePath: this.binaryPath,
       ignoreHTTPSErrors: true,
       args: chromiumArgs,
@@ -76,33 +84,25 @@ export class HeadlessChromiumDriverFactory {
     });
   }
 
-  create({
-    viewport,
-    browserTimezone,
-  }: {
-    viewport: BrowserConfig['viewport'];
-    browserTimezone: string;
-  }): Rx.Observable<{
-    driver$: Rx.Observable<HeadlessChromiumDriver>;
-    exit$: Rx.Observable<never>;
-  }> {
+  /*
+   * Return an observable to objects which will drive screenshot capture for a page
+   */
+  createPage(
+    { viewport, browserTimezone }: { viewport: BrowserConfig['viewport']; browserTimezone: string },
+    pLogger: Logger
+  ): Rx.Observable<{ driver: HeadlessChromiumDriver; exit$: Rx.Observable<never> }> {
     return Rx.Observable.create(async (observer: InnerSubscriber<any, any>) => {
-      this.logger.debug(`Creating browser driver factory`);
+      const logger = pLogger.clone(['browser-driver']);
+      logger.info(`Creating browser page driver`);
 
-      const userDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'chromium-'));
-      const chromiumArgs = args({
-        userDataDir,
-        viewport,
-        disableSandbox: this.browserConfig.disableSandbox,
-        proxy: this.browserConfig.proxy,
-      });
+      const chromiumArgs = this.getChromiumArgs(viewport);
 
       let browser: Browser;
       let page: Page;
       try {
         browser = await puppeteerLaunch({
           pipe: !this.browserConfig.inspect,
-          userDataDir,
+          userDataDir: this.userDataDir,
           executablePath: this.binaryPath,
           ignoreHTTPSErrors: true,
           args: chromiumArgs,
@@ -119,7 +119,7 @@ export class HeadlessChromiumDriverFactory {
         // "TimeoutError: waiting for selector ".application" failed: timeout 30000ms exceeded"
         page.setDefaultTimeout(this.queueTimeout);
 
-        this.logger.debug(`Browser driver factory created`);
+        logger.debug(`Browser page driver created`);
       } catch (err) {
         observer.error(new Error(`Error spawning Chromium browser: [${err}]`));
         throw err;
@@ -130,12 +130,12 @@ export class HeadlessChromiumDriverFactory {
           await browser.close();
         },
       };
-      const { terminate$ } = safeChildProcess(this.logger, childProcess);
+      const { terminate$ } = safeChildProcess(logger, childProcess);
 
       // this is adding unsubscribe logic to our observer
       // so that if our observer unsubscribes, we terminate our child-process
       observer.add(() => {
-        this.logger.debug(`The browser process observer has unsubscribed. Closing the browser...`);
+        logger.debug(`The browser process observer has unsubscribed. Closing the browser...`);
         childProcess.kill(); // ignore async
       });
 
@@ -144,7 +144,7 @@ export class HeadlessChromiumDriverFactory {
         terminate$
           .pipe(
             tap(signal => {
-              this.logger.debug(`Termination signal received: ${signal}`);
+              logger.debug(`Termination signal received: ${signal}`);
             }),
             ignoreElements()
           )
@@ -152,33 +152,40 @@ export class HeadlessChromiumDriverFactory {
       );
 
       // taps the browser log streams and combine them to Kibana logs
-      this.getBrowserLogger(page).subscribe();
-      this.getProcessLogger(browser).subscribe();
+      this.getBrowserLogger(page, logger).subscribe();
+      this.getProcessLogger(browser, logger).subscribe();
+
+      // HeadlessChromiumDriver: object to "drive" a browser page
+      const driver = new HeadlessChromiumDriver(page, {
+        inspect: this.browserConfig.inspect,
+        networkPolicy: this.networkPolicy,
+      });
 
-      const driver$ = Rx.of(new HeadlessChromiumDriver(page, { inspect: this.browserConfig.inspect, networkPolicy: this.networkPolicy })); //  prettier-ignore
+      // Rx.Observable<never>: stream to interrupt page capture
       const exit$ = this.getPageExit(browser, page);
 
-      observer.next({ driver$, exit$ });
+      observer.next({ driver, exit$ });
 
       // unsubscribe logic makes a best-effort attempt to delete the user data directory used by chromium
       observer.add(() => {
-        this.logger.debug(`deleting chromium user data directory at [${userDataDir}]`);
+        const userDataDir = this.userDataDir;
+        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.
         del(userDataDir).catch(error => {
-          this.logger.error(`error deleting user data directory at [${userDataDir}]: [${error}]`);
+          logger.error(`error deleting user data directory at [${userDataDir}]: [${error}]`);
         });
       });
     });
   }
 
-  getBrowserLogger(page: Page): Rx.Observable<void> {
+  getBrowserLogger(page: Page, logger: Logger): Rx.Observable<void> {
     const consoleMessages$ = Rx.fromEvent<ConsoleMessage>(page, 'console').pipe(
       map(line => {
         if (line.type() === 'error') {
-          this.logger.error(line.text(), ['headless-browser-console']);
+          logger.error(line.text(), ['headless-browser-console']);
         } else {
-          this.logger.debug(line.text(), [`headless-browser-console:${line.type()}`]);
+          logger.debug(line.text(), [`headless-browser-console:${line.type()}`]);
         }
       })
     );
@@ -187,7 +194,7 @@ export class HeadlessChromiumDriverFactory {
       map(req => {
         const failure = req.failure && req.failure();
         if (failure) {
-          this.logger.warning(
+          logger.warning(
             `Request to [${req.url()}] failed! [${failure.errorText}]. This error will be ignored.`
           );
         }
@@ -197,7 +204,7 @@ export class HeadlessChromiumDriverFactory {
     return Rx.merge(consoleMessages$, pageRequestFailed$);
   }
 
-  getProcessLogger(browser: Browser) {
+  getProcessLogger(browser: Browser, logger: Logger): Rx.Observable<void> {
     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
@@ -206,7 +213,7 @@ export class HeadlessChromiumDriverFactory {
     // just log closing of the process
     const processClose$ = Rx.fromEvent<void>(childProcess, 'close').pipe(
       tap(() => {
-        this.logger.debug('child process closed', ['headless-browser-process']);
+        logger.debug('child process closed', ['headless-browser-process']);
       })
     );
 
diff --git a/x-pack/legacy/plugins/reporting/server/browsers/index.ts b/x-pack/legacy/plugins/reporting/server/browsers/index.ts
index a5ecc405bf9c5..402fabea56c84 100644
--- a/x-pack/legacy/plugins/reporting/server/browsers/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/browsers/index.ts
@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import * as chromiumDefinition from './chromium';
 
 export { ensureAllBrowsersDownloaded } from './download';
diff --git a/x-pack/legacy/plugins/reporting/server/lib/__tests__/check_license.js b/x-pack/legacy/plugins/reporting/server/lib/__tests__/check_license.js
index 19af54f98236a..394f88c37087c 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/__tests__/check_license.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/__tests__/check_license.js
@@ -55,7 +55,7 @@ describe('check_license', function() {
       set(mockLicenseInfo, 'license.getType', () => 'basic');
     });
 
-    describe('& license is trial, standard, gold, platinum', () => {
+    describe('& license is > basic', () => {
       beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true));
 
       describe('& license is active', () => {
diff --git a/x-pack/legacy/plugins/reporting/server/lib/check_license.js b/x-pack/legacy/plugins/reporting/server/lib/check_license.js
deleted file mode 100644
index 5a784f9913352..0000000000000
--- a/x-pack/legacy/plugins/reporting/server/lib/check_license.js
+++ /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.
- */
-
-const messages = {
-  getUnavailable: () => {
-    return 'You cannot use Reporting because license information is not available at this time.';
-  },
-  getExpired: license => {
-    return `You cannot use Reporting because your ${license.getType()} license has expired.`;
-  },
-};
-
-const makeManagementFeature = exportTypes => {
-  return {
-    id: 'management',
-    checkLicense: license => {
-      if (!license) {
-        return {
-          showLinks: true,
-          enableLinks: false,
-          message: messages.getUnavailable(),
-        };
-      }
-
-      if (!license.isActive()) {
-        return {
-          showLinks: true,
-          enableLinks: false,
-          message: messages.getExpired(license),
-        };
-      }
-
-      const validJobTypes = exportTypes
-        .filter(exportType => license.isOneOf(exportType.validLicenses))
-        .map(exportType => exportType.jobType);
-
-      return {
-        showLinks: validJobTypes.length > 0,
-        enableLinks: validJobTypes.length > 0,
-        jobTypes: validJobTypes,
-      };
-    },
-  };
-};
-
-const makeExportTypeFeature = exportType => {
-  return {
-    id: exportType.id,
-    checkLicense: license => {
-      if (!license) {
-        return {
-          showLinks: true,
-          enableLinks: false,
-          message: messages.getUnavailable(),
-        };
-      }
-
-      if (!license.isOneOf(exportType.validLicenses)) {
-        return {
-          showLinks: false,
-          enableLinks: false,
-          message: `Your ${license.getType()} license does not support ${
-            exportType.name
-          } Reporting. Please upgrade your license.`,
-        };
-      }
-
-      if (!license.isActive()) {
-        return {
-          showLinks: true,
-          enableLinks: false,
-          message: messages.getExpired(license),
-        };
-      }
-
-      return {
-        showLinks: true,
-        enableLinks: true,
-      };
-    },
-  };
-};
-
-export function checkLicenseFactory(exportTypesRegistry) {
-  return function checkLicense(xpackLicenseInfo) {
-    const license =
-      xpackLicenseInfo === null || !xpackLicenseInfo.isAvailable()
-        ? null
-        : xpackLicenseInfo.license;
-
-    const exportTypes = Array.from(exportTypesRegistry.getAll());
-    const reportingFeatures = [
-      ...exportTypes.map(makeExportTypeFeature),
-      makeManagementFeature(exportTypes),
-    ];
-
-    return reportingFeatures.reduce((result, feature) => {
-      result[feature.id] = feature.checkLicense(license);
-      return result;
-    }, {});
-  };
-}
diff --git a/x-pack/legacy/plugins/reporting/server/lib/check_license.ts b/x-pack/legacy/plugins/reporting/server/lib/check_license.ts
new file mode 100644
index 0000000000000..02e1196f1d00d
--- /dev/null
+++ b/x-pack/legacy/plugins/reporting/server/lib/check_license.ts
@@ -0,0 +1,115 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { XPackInfo } from '../../../xpack_main/server/lib/xpack_info';
+import { XPackInfoLicense } from '../../../xpack_main/server/lib/xpack_info_license';
+import { ExportTypesRegistry, ExportTypeDefinition } from '../../types';
+
+interface LicenseCheckResult {
+  showLinks: boolean;
+  enableLinks: boolean;
+  message?: string;
+}
+
+const messages = {
+  getUnavailable: () => {
+    return 'You cannot use Reporting because license information is not available at this time.';
+  },
+  getExpired: (license: XPackInfoLicense) => {
+    return `You cannot use Reporting because your ${license.getType()} license has expired.`;
+  },
+};
+
+const makeManagementFeature = (
+  exportTypes: Array<ExportTypeDefinition<unknown, unknown, unknown, unknown>>
+) => {
+  return {
+    id: 'management',
+    checkLicense: (license: XPackInfoLicense | null) => {
+      if (!license) {
+        return {
+          showLinks: true,
+          enableLinks: false,
+          message: messages.getUnavailable(),
+        };
+      }
+
+      if (!license.isActive()) {
+        return {
+          showLinks: true,
+          enableLinks: false,
+          message: messages.getExpired(license),
+        };
+      }
+
+      const validJobTypes = exportTypes
+        .filter(exportType => license.isOneOf(exportType.validLicenses))
+        .map(exportType => exportType.jobType);
+
+      return {
+        showLinks: validJobTypes.length > 0,
+        enableLinks: validJobTypes.length > 0,
+        jobTypes: validJobTypes,
+      };
+    },
+  };
+};
+
+const makeExportTypeFeature = (
+  exportType: ExportTypeDefinition<unknown, unknown, unknown, unknown>
+) => {
+  return {
+    id: exportType.id,
+    checkLicense: (license: XPackInfoLicense | null) => {
+      if (!license) {
+        return {
+          showLinks: true,
+          enableLinks: false,
+          message: messages.getUnavailable(),
+        };
+      }
+
+      if (!license.isOneOf(exportType.validLicenses)) {
+        return {
+          showLinks: false,
+          enableLinks: false,
+          message: `Your ${license.getType()} license does not support ${
+            exportType.name
+          } Reporting. Please upgrade your license.`,
+        };
+      }
+
+      if (!license.isActive()) {
+        return {
+          showLinks: true,
+          enableLinks: false,
+          message: messages.getExpired(license),
+        };
+      }
+
+      return {
+        showLinks: true,
+        enableLinks: true,
+      };
+    },
+  };
+};
+
+export function checkLicenseFactory(exportTypesRegistry: ExportTypesRegistry) {
+  return function checkLicense(xpackInfo: XPackInfo) {
+    const license = xpackInfo === null || !xpackInfo.isAvailable() ? null : xpackInfo.license;
+    const exportTypes = Array.from(exportTypesRegistry.getAll());
+    const reportingFeatures = [
+      ...exportTypes.map(makeExportTypeFeature),
+      makeManagementFeature(exportTypes),
+    ];
+
+    return reportingFeatures.reduce((result, feature) => {
+      result[feature.id] = feature.checkLicense(license);
+      return result;
+    }, {} as Record<string, LicenseCheckResult>);
+  };
+}
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/create_index.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/create_index.js
index 9e00f0447e99e..670c2907fb832 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/create_index.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/helpers/create_index.js
@@ -15,7 +15,7 @@ const schema = {
     properties: {
       /**
        * Type of object that is triggering this report. Should be either search, visualization or dashboard.
-       * Used for phone home stats only.
+       * Used for job listing and telemetry stats only.
        */
       objectType: {
         type: 'text',
diff --git a/x-pack/legacy/plugins/reporting/server/lib/esqueue/job.js b/x-pack/legacy/plugins/reporting/server/lib/esqueue/job.js
index cded6d2ce89a8..a7d8f4df3fd54 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/esqueue/job.js
+++ b/x-pack/legacy/plugins/reporting/server/lib/esqueue/job.js
@@ -57,7 +57,7 @@ export class Job extends events.EventEmitter {
         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,
+          objectType: payload.objectType,
           layout: payload.layout ? payload.layout.id : 'none',
         },
         payload: this.payload,
diff --git a/x-pack/legacy/plugins/reporting/server/lib/index.ts b/x-pack/legacy/plugins/reporting/server/lib/index.ts
index 50d1a276b6b5d..0a2db749cb954 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/index.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/index.ts
@@ -5,7 +5,6 @@
  */
 
 export { getExportTypesRegistry } from './export_types_registry';
-// @ts-ignore untyped module
 export { checkLicenseFactory } from './check_license';
 export { LevelLogger } from './level_logger';
 export { cryptoFactory } from './crypto';
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 031709c85284c..89c49123e85bf 100644
--- a/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
+++ b/x-pack/legacy/plugins/reporting/server/lib/validate/validate_browser.ts
@@ -18,14 +18,12 @@ export const validateBrowser = async (
   logger: Logger
 ) => {
   if (browserFactory.type === BROWSER_TYPE) {
-    return browserFactory
-      .test({ viewport: { width: 800, height: 600 } }, logger)
-      .then((browser: Browser | null) => {
-        if (browser && browser.close) {
-          browser.close();
-        } else {
-          throw new Error('Could not close browser client handle!');
-        }
-      });
+    return browserFactory.test(logger).then((browser: Browser | null) => {
+      if (browser && browser.close) {
+        browser.close();
+      } else {
+        throw new Error('Could not close browser client handle!');
+      }
+    });
   }
 };
diff --git a/x-pack/legacy/plugins/reporting/server/routes/generation.ts b/x-pack/legacy/plugins/reporting/server/routes/generation.ts
index 7bed7bc5773e4..73450b7641c8e 100644
--- a/x-pack/legacy/plugins/reporting/server/routes/generation.ts
+++ b/x-pack/legacy/plugins/reporting/server/routes/generation.ts
@@ -17,7 +17,6 @@ import {
 import { registerGenerateFromJobParams } from './generate_from_jobparams';
 import { registerGenerateCsvFromSavedObject } from './generate_from_savedobject';
 import { registerGenerateCsvFromSavedObjectImmediate } from './generate_from_savedobject_immediate';
-import { registerLegacy } from './legacy';
 import { createQueueFactory, enqueueJobFactory } from '../lib';
 
 export function registerJobGenerationRoutes(
@@ -73,7 +72,6 @@ export function registerJobGenerationRoutes(
   }
 
   registerGenerateFromJobParams(server, handler, handleError);
-  registerLegacy(server, handler, handleError);
 
   // Register beta panel-action download-related API's
   if (config.get('xpack.reporting.csv.enablePanelActionDownload')) {
diff --git a/x-pack/legacy/plugins/reporting/server/routes/legacy.ts b/x-pack/legacy/plugins/reporting/server/routes/legacy.ts
deleted file mode 100644
index 011ac4a02bbf9..0000000000000
--- a/x-pack/legacy/plugins/reporting/server/routes/legacy.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 querystring from 'querystring';
-import { API_BASE_URL } from '../../common/constants';
-import { ServerFacade, RequestFacade, ReportingResponseToolkit } from '../../types';
-import {
-  getRouteConfigFactoryReportingPre,
-  GetRouteConfigFactoryFn,
-} from './lib/route_config_factories';
-import { HandlerErrorFunction, HandlerFunction } from './types';
-
-const getStaticFeatureConfig = (getRouteConfig: GetRouteConfigFactoryFn, featureId: string) =>
-  getRouteConfig(() => featureId);
-
-const BASE_GENERATE = `${API_BASE_URL}/generate`;
-
-export function registerLegacy(
-  server: ServerFacade,
-  handler: HandlerFunction,
-  handleError: HandlerErrorFunction
-) {
-  const getRouteConfig = getRouteConfigFactoryReportingPre(server);
-
-  function createLegacyPdfRoute({ path, objectType }: { path: string; objectType: string }) {
-    const exportTypeId = 'printablePdf';
-    server.route({
-      path,
-      method: 'POST',
-      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);
-
-        try {
-          const savedObjectId = request.params.savedId;
-          const queryString = querystring.stringify(request.query);
-
-          return await handler(
-            exportTypeId,
-            {
-              objectType,
-              savedObjectId,
-              queryString,
-            },
-            request,
-            h
-          );
-        } catch (err) {
-          throw handleError(exportTypeId, err);
-        }
-      },
-    });
-  }
-
-  createLegacyPdfRoute({
-    path: `${BASE_GENERATE}/visualization/{savedId}`,
-    objectType: 'visualization',
-  });
-
-  createLegacyPdfRoute({
-    path: `${BASE_GENERATE}/search/{savedId}`,
-    objectType: 'search',
-  });
-
-  createLegacyPdfRoute({
-    path: `${BASE_GENERATE}/dashboard/{savedId}`,
-    objectType: 'dashboard',
-  });
-}
diff --git a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_logistics.test.js b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_logistics.test.js
index 063f48dce337d..c960eabb37dcb 100644
--- a/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_logistics.test.js
+++ b/x-pack/legacy/plugins/rollup/__jest__/client_integration/job_create_logistics.test.js
@@ -12,7 +12,7 @@ import {
   MONTH,
   YEAR,
 } from '../../../../../../src/plugins/es_ui_shared/public/components/cron_editor';
-import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from '../../../../../../src/legacy/ui/public/index_patterns';
+import { indexPatterns } from '../../../../../../src/plugins/data/public';
 import { setupEnvironment, pageHelpers } from './helpers';
 
 jest.mock('ui/new_platform');
@@ -154,7 +154,7 @@ describe('Create Rollup Job, step 1: Logistics', () => {
           );
         };
 
-        [...INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE, ','].reduce((promise, char) => {
+        [...indexPatterns.ILLEGAL_CHARACTERS_VISIBLE, ','].reduce((promise, char) => {
           return promise.then(() => expectInvalidChar(char));
         }, Promise.resolve());
       });
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 75c70ab6ce20a..8cba18804b1c6 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
@@ -26,12 +26,13 @@ import {
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { CronEditor } from '../../../../../../../../../src/plugins/es_ui_shared/public/components/cron_editor';
-import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from 'ui/index_patterns';
 import { INDEX_ILLEGAL_CHARACTERS_VISIBLE } from 'ui/indices';
 import { logisticalDetailsUrl, cronUrl } from '../../../services';
 import { StepError } from './components';
 
-const indexPatternIllegalCharacters = INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.join(' ');
+import { indexPatterns } from '../../../../../../../../../src/plugins/data/public';
+
+const indexPatternIllegalCharacters = indexPatterns.ILLEGAL_CHARACTERS_VISIBLE.join(' ');
 const indexIllegalCharacters = INDEX_ILLEGAL_CHARACTERS_VISIBLE.join(' ');
 
 export class StepLogisticsUi extends Component {
diff --git a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js
index 8082814abba51..206cc325813c0 100644
--- a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js
+++ b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps_config/validate_index_pattern.js
@@ -7,8 +7,7 @@
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE } from 'ui/index_patterns';
-
+import { indexPatterns } from '../../../../../../../../../src/plugins/data/public';
 export function validateIndexPattern(indexPattern, rollupIndex) {
   if (!indexPattern || !indexPattern.trim()) {
     return [
@@ -28,7 +27,7 @@ export function validateIndexPattern(indexPattern, rollupIndex) {
     ];
   }
 
-  const illegalCharacters = INDEX_PATTERN_ILLEGAL_CHARACTERS_VISIBLE.reduce((chars, char) => {
+  const illegalCharacters = indexPatterns.ILLEGAL_CHARACTERS_VISIBLE.reduce((chars, char) => {
     if (indexPattern.includes(char)) {
       chars.push(char);
     }
diff --git a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js
index 627091e0cf749..5c7d53efbd62c 100644
--- a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js
+++ b/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_list/job_list.test.js
@@ -9,7 +9,6 @@ import { rollupJobsStore } from '../../store';
 import { JobList } from './job_list';
 
 jest.mock('ui/new_platform');
-
 jest.mock('ui/chrome', () => ({
   addBasePath: () => {},
   breadcrumbs: { set: () => {} },
diff --git a/x-pack/legacy/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js b/x-pack/legacy/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js
index 3cf50c358b3e6..07f2a674decc5 100644
--- a/x-pack/legacy/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js
+++ b/x-pack/legacy/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js
@@ -5,11 +5,12 @@
  */
 
 import React from 'react';
-import { IndexPatternCreationConfig } from '../../../../../../src/legacy/core_plugins/management/public';
+import { i18n } from '@kbn/i18n';
+import { npSetup } from 'ui/new_platform';
 
 import { RollupPrompt } from './components/rollup_prompt';
 import { setHttpClient, getRollupIndices } from '../services/api';
-import { i18n } from '@kbn/i18n';
+import { IndexPatternCreationConfig } from '../../../../../../src/legacy/core_plugins/management/public';
 
 const rollupIndexPatternTypeName = i18n.translate(
   'xpack.rollupJobs.editRollupIndexPattern.createIndex.defaultTypeName',
@@ -63,7 +64,14 @@ export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig
 
   async setRollupIndices() {
     try {
-      this.rollupIndicesCapabilities = await getRollupIndices();
+      // This is a hack intended to prevent the getRollupIndices() request from being sent if
+      // we're on /logout. There is a race condition that can arise on that page, whereby this
+      // request resolves after the logout request resolves, and un-clears the session ID.
+      const isAnonymous = npSetup.core.http.anonymousPaths.isAnonymous(window.location.pathname);
+      if (!isAnonymous) {
+        this.rollupIndicesCapabilities = await getRollupIndices();
+      }
+
       this.rollupIndices = Object.keys(this.rollupIndicesCapabilities);
     } catch (e) {
       // Silently swallow failure responses such as expired trials
diff --git a/x-pack/legacy/plugins/rollup/server/lib/check_license/__tests__/check_license.js b/x-pack/legacy/plugins/rollup/server/lib/check_license/__tests__/check_license.js
index 4e57bd77578e3..933fda01c055d 100644
--- a/x-pack/legacy/plugins/rollup/server/lib/check_license/__tests__/check_license.js
+++ b/x-pack/legacy/plugins/rollup/server/lib/check_license/__tests__/check_license.js
@@ -58,7 +58,7 @@ describe('check_license', function() {
       set(mockLicenseInfo, 'license.getType', () => 'basic');
     });
 
-    describe('& license is trial, standard, gold, platinum', () => {
+    describe('& license is > basic', () => {
       beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true));
 
       describe('& license is active', () => {
diff --git a/x-pack/legacy/plugins/rollup/server/lib/check_license/check_license.js b/x-pack/legacy/plugins/rollup/server/lib/check_license/check_license.js
index ba59c5e4e4443..3885a20a1f358 100644
--- a/x-pack/legacy/plugins/rollup/server/lib/check_license/check_license.js
+++ b/x-pack/legacy/plugins/rollup/server/lib/check_license/check_license.js
@@ -24,7 +24,7 @@ export function checkLicense(xpackLicenseInfo) {
     };
   }
 
-  const VALID_LICENSE_MODES = ['trial', 'basic', 'standard', 'gold', 'platinum'];
+  const VALID_LICENSE_MODES = ['trial', 'basic', 'standard', 'gold', 'platinum', 'enterprise'];
 
   const isLicenseModeValid = xpackLicenseInfo.license.isOneOf(VALID_LICENSE_MODES);
   const isLicenseActive = xpackLicenseInfo.license.isActive();
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
index f473533fbd48a..1b8155221cb9d 100644
--- 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
@@ -30,7 +30,7 @@ describe('check_license', () => {
       set(mockLicenseInfo, 'license.getType', () => 'basic');
     });
 
-    describe('& license is trial, standard, gold, platinum', () => {
+    describe('& license is > basic', () => {
       beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true));
 
       describe('& license is active', () => {
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
index e41925da3e268..2a22d615ca6e5 100644
--- 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
@@ -29,7 +29,16 @@ export function checkLicense(
     });
   }
 
-  if (xpackLicenseInfo.license.isOneOf(['trial', 'basic', 'standard', 'gold', 'platinum'])) {
+  if (
+    xpackLicenseInfo.license.isOneOf([
+      'trial',
+      'basic',
+      'standard',
+      'gold',
+      'platinum',
+      'enterprise',
+    ])
+  ) {
     return {
       showAppLink: true,
       enableAppLink: isLicenseActive,
diff --git a/x-pack/legacy/plugins/security/index.js b/x-pack/legacy/plugins/security/index.js
index a061424c62973..bc403b803b8df 100644
--- a/x-pack/legacy/plugins/security/index.js
+++ b/x-pack/legacy/plugins/security/index.js
@@ -28,17 +28,10 @@ export const security = kibana =>
         enabled: Joi.boolean().default(true),
         cookieName: HANDLED_IN_NEW_PLATFORM,
         encryptionKey: HANDLED_IN_NEW_PLATFORM,
-        session: Joi.object({
-          idleTimeout: HANDLED_IN_NEW_PLATFORM,
-          lifespan: HANDLED_IN_NEW_PLATFORM,
-        }).default(),
+        session: HANDLED_IN_NEW_PLATFORM,
         secureCookies: HANDLED_IN_NEW_PLATFORM,
         loginAssistanceMessage: HANDLED_IN_NEW_PLATFORM,
-        authorization: Joi.object({
-          legacyFallback: Joi.object({
-            enabled: Joi.boolean().default(true), // deprecated
-          }).default(),
-        }).default(),
+        authorization: HANDLED_IN_NEW_PLATFORM,
         audit: Joi.object({
           enabled: Joi.boolean().default(false),
         }).default(),
@@ -46,15 +39,8 @@ export const security = kibana =>
       }).default();
     },
 
-    deprecations: function({ rename, unused }) {
-      return [
-        unused('authorization.legacyFallback.enabled'),
-        rename('sessionTimeout', 'session.idleTimeout'),
-      ];
-    },
-
     uiExports: {
-      chromeNavControls: ['plugins/security/views/nav_control'],
+      chromeNavControls: [],
       managementSections: ['plugins/security/views/management'],
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       apps: [
@@ -88,6 +74,7 @@ export const security = kibana =>
       hacks: [
         'plugins/security/hacks/on_session_timeout',
         'plugins/security/hacks/on_unauthorized_response',
+        'plugins/security/hacks/register_account_management_app',
       ],
       home: ['plugins/security/register_feature'],
       injectDefaultVars: server => {
@@ -129,7 +116,6 @@ export const security = kibana =>
       const config = server.config();
       const xpackInfo = server.plugins.xpack_main.info;
       securityPlugin.__legacyCompat.registerLegacyAPI({
-        savedObjects: server.savedObjects,
         auditLogger: new AuditLogger(server, 'security', config, xpackInfo),
         isSystemAPIRequest: server.plugins.kibana.systemApi.isSystemApiRequest.bind(
           server.plugins.kibana.systemApi
diff --git a/x-pack/legacy/plugins/security/public/hacks/register_account_management_app.ts b/x-pack/legacy/plugins/security/public/hacks/register_account_management_app.ts
new file mode 100644
index 0000000000000..4fdc2358246b9
--- /dev/null
+++ b/x-pack/legacy/plugins/security/public/hacks/register_account_management_app.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.
+ */
+
+import '../views/account/account';
diff --git a/x-pack/legacy/plugins/security/public/lib/api.ts b/x-pack/legacy/plugins/security/public/lib/api.ts
index ffa08ca44f376..c5c6994bf4be3 100644
--- a/x-pack/legacy/plugins/security/public/lib/api.ts
+++ b/x-pack/legacy/plugins/security/public/lib/api.ts
@@ -5,16 +5,12 @@
  */
 
 import { kfetch } from 'ui/kfetch';
-import { AuthenticatedUser, Role, User, EditUser } from '../../common/model';
+import { Role, User, EditUser } from '../../common/model';
 
 const usersUrl = '/internal/security/users';
 const rolesUrl = '/api/security/role';
 
 export class UserAPIClient {
-  public async getCurrentUser(): Promise<AuthenticatedUser> {
-    return await kfetch({ pathname: `/internal/security/me` });
-  }
-
   public async getUsers(): Promise<User[]> {
     return await kfetch({ pathname: usersUrl });
   }
diff --git a/x-pack/legacy/plugins/security/public/services/shield_user.js b/x-pack/legacy/plugins/security/public/services/shield_user.js
deleted file mode 100644
index 14a79f267ca75..0000000000000
--- a/x-pack/legacy/plugins/security/public/services/shield_user.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import 'angular-resource';
-import angular from 'angular';
-import { uiModules } from 'ui/modules';
-
-const module = uiModules.get('security', ['ngResource']);
-module.service('ShieldUser', ($resource, chrome) => {
-  const baseUrl = chrome.addBasePath('/internal/security/users/:username');
-  const ShieldUser = $resource(
-    baseUrl,
-    {
-      username: '@username',
-    },
-    {
-      changePassword: {
-        method: 'POST',
-        url: `${baseUrl}/password`,
-        transformRequest: ({ password, newPassword }) => angular.toJson({ password, newPassword }),
-      },
-      getCurrent: {
-        method: 'GET',
-        url: chrome.addBasePath('/internal/security/me'),
-      },
-    }
-  );
-
-  return ShieldUser;
-});
diff --git a/x-pack/legacy/plugins/security/public/views/account/account.js b/x-pack/legacy/plugins/security/public/views/account/account.js
index db971bd97eab7..70a7b8dce727e 100644
--- a/x-pack/legacy/plugins/security/public/views/account/account.js
+++ b/x-pack/legacy/plugins/security/public/views/account/account.js
@@ -6,22 +6,13 @@
 
 import routes from 'ui/routes';
 import template from './account.html';
-import '../../services/shield_user';
 import { i18n } from '@kbn/i18n';
 import { I18nContext } from 'ui/i18n';
+import { npSetup } from 'ui/new_platform';
 import { AccountManagementPage } from './components';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 
-const renderReact = (elem, user) => {
-  render(
-    <I18nContext>
-      <AccountManagementPage user={user} />
-    </I18nContext>,
-    elem
-  );
-};
-
 routes.when('/account', {
   template,
   k7Breadcrumbs: () => [
@@ -31,13 +22,8 @@ routes.when('/account', {
       }),
     },
   ],
-  resolve: {
-    user(ShieldUser) {
-      return ShieldUser.getCurrent().$promise;
-    },
-  },
   controllerAs: 'accountController',
-  controller($scope, $route) {
+  controller($scope) {
     $scope.$on('$destroy', () => {
       const elem = document.getElementById('userProfileReactRoot');
       if (elem) {
@@ -45,8 +31,12 @@ routes.when('/account', {
       }
     });
     $scope.$$postDigest(() => {
-      const elem = document.getElementById('userProfileReactRoot');
-      renderReact(elem, $route.current.locals.user);
+      render(
+        <I18nContext>
+          <AccountManagementPage securitySetup={npSetup.plugins.security} />
+        </I18nContext>,
+        document.getElementById('userProfileReactRoot')
+      );
     });
   },
 });
diff --git a/x-pack/legacy/plugins/security/public/views/account/components/account_management_page.test.tsx b/x-pack/legacy/plugins/security/public/views/account/components/account_management_page.test.tsx
index 176b05f455439..366842e58e9e4 100644
--- a/x-pack/legacy/plugins/security/public/views/account/components/account_management_page.test.tsx
+++ b/x-pack/legacy/plugins/security/public/views/account/components/account_management_page.test.tsx
@@ -4,8 +4,11 @@
  * 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 { act } from '@testing-library/react';
+import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
+import { securityMock } from '../../../../../../../plugins/security/public/mocks';
 import { AccountManagementPage } from './account_management_page';
+import { AuthenticatedUser } from '../../../../common/model';
 
 jest.mock('ui/kfetch');
 
@@ -32,10 +35,24 @@ const createUser = ({ withFullName = true, withEmail = true, realm = 'native' }:
   };
 };
 
+function getSecuritySetupMock({ currentUser }: { currentUser: AuthenticatedUser }) {
+  const securitySetupMock = securityMock.createSetup();
+  securitySetupMock.authc.getCurrentUser.mockResolvedValue(currentUser);
+  return securitySetupMock;
+}
+
 describe('<AccountManagementPage>', () => {
-  it(`displays users full name, username, and email address`, () => {
+  it(`displays users full name, username, and email address`, async () => {
     const user = createUser();
-    const wrapper = mountWithIntl(<AccountManagementPage user={user} />);
+    const wrapper = mountWithIntl(
+      <AccountManagementPage securitySetup={getSecuritySetupMock({ currentUser: user })} />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
     expect(wrapper.find('EuiText[data-test-subj="userDisplayName"]').text()).toEqual(
       user.full_name
     );
@@ -43,28 +60,60 @@ describe('<AccountManagementPage>', () => {
     expect(wrapper.find('[data-test-subj="email"]').text()).toEqual(user.email);
   });
 
-  it(`displays username when full_name is not provided`, () => {
+  it(`displays username when full_name is not provided`, async () => {
     const user = createUser({ withFullName: false });
-    const wrapper = mountWithIntl(<AccountManagementPage user={user} />);
+    const wrapper = mountWithIntl(
+      <AccountManagementPage securitySetup={getSecuritySetupMock({ currentUser: user })} />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
     expect(wrapper.find('EuiText[data-test-subj="userDisplayName"]').text()).toEqual(user.username);
   });
 
-  it(`displays a placeholder when no email address is provided`, () => {
+  it(`displays a placeholder when no email address is provided`, async () => {
     const user = createUser({ withEmail: false });
-    const wrapper = mountWithIntl(<AccountManagementPage user={user} />);
+    const wrapper = mountWithIntl(
+      <AccountManagementPage securitySetup={getSecuritySetupMock({ currentUser: user })} />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
     expect(wrapper.find('[data-test-subj="email"]').text()).toEqual('no email address');
   });
 
-  it(`displays change password form for users in the native realm`, () => {
+  it(`displays change password form for users in the native realm`, async () => {
     const user = createUser();
-    const wrapper = mountWithIntl(<AccountManagementPage user={user} />);
+    const wrapper = mountWithIntl(
+      <AccountManagementPage securitySetup={getSecuritySetupMock({ currentUser: user })} />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
     expect(wrapper.find('EuiFieldText[data-test-subj="currentPassword"]')).toHaveLength(1);
     expect(wrapper.find('EuiFieldText[data-test-subj="newPassword"]')).toHaveLength(1);
   });
 
-  it(`does not display change password form for users in the saml realm`, () => {
+  it(`does not display change password form for users in the saml realm`, async () => {
     const user = createUser({ realm: 'saml' });
-    const wrapper = mountWithIntl(<AccountManagementPage user={user} />);
+    const wrapper = mountWithIntl(
+      <AccountManagementPage securitySetup={getSecuritySetupMock({ currentUser: user })} />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
     expect(wrapper.find('EuiFieldText[data-test-subj="currentPassword"]')).toHaveLength(0);
     expect(wrapper.find('EuiFieldText[data-test-subj="newPassword"]')).toHaveLength(0);
   });
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 2ed057ad73a12..6abee73e0b353 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,29 +4,41 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { EuiPage, EuiPageBody, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
-import React from 'react';
+import React, { useEffect, useState } from 'react';
+import { SecurityPluginSetup } from '../../../../../../../plugins/security/public';
 import { getUserDisplayName, AuthenticatedUser } from '../../../../common/model';
 import { ChangePassword } from './change_password';
 import { PersonalInfo } from './personal_info';
 
 interface Props {
-  user: AuthenticatedUser;
+  securitySetup: SecurityPluginSetup;
 }
 
-export const AccountManagementPage: React.FC<Props> = props => (
-  <EuiPage>
-    <EuiPageBody restrictWidth>
-      <EuiPanel>
-        <EuiText data-test-subj={'userDisplayName'}>
-          <h1>{getUserDisplayName(props.user)}</h1>
-        </EuiText>
+export const AccountManagementPage = (props: Props) => {
+  const [currentUser, setCurrentUser] = useState<AuthenticatedUser | null>(null);
+  useEffect(() => {
+    props.securitySetup.authc.getCurrentUser().then(setCurrentUser);
+  }, [props]);
 
-        <EuiSpacer size="xl" />
+  if (!currentUser) {
+    return null;
+  }
 
-        <PersonalInfo user={props.user} />
+  return (
+    <EuiPage>
+      <EuiPageBody restrictWidth>
+        <EuiPanel>
+          <EuiText data-test-subj={'userDisplayName'}>
+            <h1>{getUserDisplayName(currentUser)}</h1>
+          </EuiText>
 
-        <ChangePassword user={props.user} />
-      </EuiPanel>
-    </EuiPageBody>
-  </EuiPage>
-);
+          <EuiSpacer size="xl" />
+
+          <PersonalInfo user={currentUser} />
+
+          <ChangePassword user={currentUser} />
+        </EuiPanel>
+      </EuiPageBody>
+    </EuiPage>
+  );
+};
diff --git a/x-pack/legacy/plugins/security/public/views/management/api_keys_grid/components/__snapshots__/api_keys_grid_page.test.tsx.snap b/x-pack/legacy/plugins/security/public/views/management/api_keys_grid/components/__snapshots__/api_keys_grid_page.test.tsx.snap
index 350e28123c29b..c2537235c99f6 100644
--- a/x-pack/legacy/plugins/security/public/views/management/api_keys_grid/components/__snapshots__/api_keys_grid_page.test.tsx.snap
+++ b/x-pack/legacy/plugins/security/public/views/management/api_keys_grid/components/__snapshots__/api_keys_grid_page.test.tsx.snap
@@ -26,23 +26,26 @@ exports[`ApiKeysGridPage renders a callout when API keys are not enabled 1`] = `
           type="alert"
         >
           <EuiIconAlert
-            aria-hidden="true"
+            aria-hidden={true}
             className="euiIcon euiIcon--medium euiIcon-isLoaded euiCallOutHeader__icon"
             focusable="false"
+            role="img"
             style={null}
           >
             <svg
-              aria-hidden="true"
+              aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon-isLoaded euiCallOutHeader__icon"
               focusable="false"
               height={16}
+              role="img"
               style={null}
               viewBox="0 0 16 16"
               width={16}
               xmlns="http://www.w3.org/2000/svg"
             >
+              <title />
               <path
-                d="M7.59 10.059L7.35 5.18h1.3L8.4 10.06h-.81zm.394 1.901a.61.61 0 0 1-.448-.186.606.606 0 0 1-.186-.444c0-.174.062-.323.186-.446a.614.614 0 0 1 .448-.184c.169 0 .315.06.44.182.124.122.186.27.186.448a.6.6 0 0 1-.189.446.607.607 0 0 1-.437.184zM2 14a1 1 0 0 1-.878-1.479l6-11a1 1 0 0 1 1.756 0l6 11A1 1 0 0 1 14 14H2zm0-1h12L8 2 2 13z"
+                d="M7.59 10.059L7.35 5.18h1.3L8.4 10.06h-.81zm.394 1.901a.61.61 0 01-.448-.186.606.606 0 01-.186-.444c0-.174.062-.323.186-.446a.614.614 0 01.448-.184c.169 0 .315.06.44.182.124.122.186.27.186.448a.6.6 0 01-.189.446.607.607 0 01-.437.184zM2 14a1 1 0 01-.878-1.479l6-11a1 1 0 011.756 0l6 11A1 1 0 0114 14H2zm0-1h12L8 2 2 13z"
                 fillRule="evenodd"
               />
             </svg>
@@ -123,7 +126,6 @@ exports[`ApiKeysGridPage renders permission denied if user does not have require
     >
       <EuiPageContent
         horizontalPosition="center"
-        panelPaddingSize="l"
       >
         <EuiPanel
           className="euiPageContent euiPageContent--horizontalCenter"
@@ -164,25 +166,30 @@ exports[`ApiKeysGridPage renders permission denied if user does not have require
                   type="securityApp"
                 >
                   <EuiIconAppSecurity
+                    aria-hidden={true}
                     className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoaded"
                     focusable="false"
+                    role="img"
                     style={null}
                   >
                     <svg
+                      aria-hidden={true}
                       className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoaded"
                       focusable="false"
                       height={32}
+                      role="img"
                       style={null}
                       viewBox="0 0 32 32"
                       width={32}
                       xmlns="http://www.w3.org/2000/svg"
                     >
+                      <title />
                       <path
-                        d="M14 32l-.36-.14A21.07 21.07 0 0 1 0 12.07V5.44L14 .06l14 5.38v6.63a21.07 21.07 0 0 1-13.64 19.78L14 32zM2 6.82v5.25a19.08 19.08 0 0 0 12 17.77 19.08 19.08 0 0 0 12-17.77V6.82L14 2.2 2 6.82z"
+                        d="M14 32l-.36-.14A21.07 21.07 0 010 12.07V5.44L14 .06l14 5.38v6.63a21.07 21.07 0 01-13.64 19.78L14 32zM2 6.82v5.25a19.08 19.08 0 0012 17.77 19.08 19.08 0 0012-17.77V6.82L14 2.2 2 6.82z"
                       />
                       <path
                         className="euiIcon__fillSecondary"
-                        d="M9 17.83h2V23H9zM11 10.18V7H9v3.18a3 3 0 1 0 2 0zM10 14a1 1 0 1 1 0-2 1 1 0 0 1 0 2zM17 7h2v5.17h-2zM21 17a3 3 0 1 0-4 2.82V23h2v-3.18A3 3 0 0 0 21 17zm-3 1a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"
+                        d="M9 17.83h2V23H9zM11 10.18V7H9v3.18a3 3 0 102 0zM10 14a1 1 0 110-2 1 1 0 010 2zM17 7h2v5.17h-2zM21 17a3 3 0 10-4 2.82V23h2v-3.18A3 3 0 0021 17zm-3 1a1 1 0 110-2 1 1 0 010 2z"
                       />
                     </svg>
                   </EuiIconAppSecurity>
diff --git a/x-pack/legacy/plugins/security/public/views/management/api_keys_grid/components/api_keys_grid_page.tsx b/x-pack/legacy/plugins/security/public/views/management/api_keys_grid/components/api_keys_grid_page.tsx
index 1613e3804c31d..92633a4b0ef57 100644
--- a/x-pack/legacy/plugins/security/public/views/management/api_keys_grid/components/api_keys_grid_page.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/api_keys_grid/components/api_keys_grid_page.tsx
@@ -21,6 +21,7 @@ import {
   EuiText,
   EuiTitle,
   EuiToolTip,
+  EuiInMemoryTableProps,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -192,7 +193,7 @@ export class ApiKeysGridPage extends Component<any, State> {
         field: 'expiration',
         direction: 'asc',
       },
-    };
+    } as const;
 
     const pagination = {
       initialPageSize: 20,
@@ -207,7 +208,7 @@ export class ApiKeysGridPage extends Component<any, State> {
       },
     };
 
-    const search = {
+    const search: EuiInMemoryTableProps<ApiKey>['search'] = {
       toolsLeft: selectedItems.length ? (
         <InvalidateProvider isAdmin={isAdmin}>
           {invalidateApiKeyPrompt => {
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/edit_role_page.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/edit_role_page.tsx
index 7637d28dd4229..2ba012afa689d 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/edit_role_page.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/edit_role_page.tsx
@@ -86,7 +86,7 @@ class EditRolePageUI extends Component<Props, State> {
     };
   }
 
-  public UNSAFE_componentWillMount() {
+  public componentDidMount() {
     if (this.props.action === 'clone' && isReservedRole(this.props.role)) {
       this.backToRoleList();
     }
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/feature_table/__snapshots__/feature_table.test.tsx.snap b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/feature_table/__snapshots__/feature_table.test.tsx.snap
index 9929121c561e2..b7d91126b8e32 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/feature_table/__snapshots__/feature_table.test.tsx.snap
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/feature_table/__snapshots__/feature_table.test.tsx.snap
@@ -32,10 +32,7 @@ exports[`FeatureTable can render without spaces 1`] = `
       },
     ]
   }
-  executeQueryOptions={Object {}}
   items={Array []}
-  pagination={false}
   responsive={false}
-  sorting={false}
 />
 `;
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx
index 1f29f774fd6cc..f97fa93294ff5 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/simple_privilege_section/simple_privilege_section.test.tsx
@@ -46,6 +46,7 @@ const buildProps = (customProps: any = {}) => {
         id: 'feature1',
         name: 'Feature 1',
         app: ['app'],
+        icon: 'spacesApp',
         privileges: {
           all: {
             app: ['app'],
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
index 92dace65d466c..962487312c83d 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_matrix.tsx
@@ -23,7 +23,7 @@ import {
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
-import { SpaceAvatar } from '../../../../../../../../../spaces/public/components';
+import { SpaceAvatar } from '../../../../../../../../../spaces/public/space_avatar';
 import { Feature } from '../../../../../../../../../../../plugins/features/public';
 import { FeaturesPrivileges, Role } from '../../../../../../../../common/model';
 import { CalculatedPrivilege } from '../../../../../../../lib/kibana_privilege_calculator';
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
index 3c49e5717ba42..65a3df9fb47a1 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/privilege_space_table.tsx
@@ -8,13 +8,13 @@ import {
   EuiBadgeProps,
   EuiButtonEmpty,
   EuiButtonIcon,
-  // @ts-ignore
   EuiInMemoryTable,
+  EuiBasicTableColumn,
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { Component } from 'react';
-import { getSpaceColor } from '../../../../../../../../../spaces/public/lib/space_attributes';
+import { getSpaceColor } from '../../../../../../../../../spaces/public/space_avatar';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
 import {
   FeaturesPrivileges,
@@ -113,7 +113,7 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
       return {};
     };
 
-    const columns: Record<string, any> = [
+    const columns: Array<EuiBasicTableColumn<TableRow>> = [
       {
         field: 'spaces',
         name: 'Spaces',
@@ -274,12 +274,10 @@ export class PrivilegeSpaceTable extends Component<Props, State> {
     }
 
     return (
-      // @ts-ignore missing rowProps from typedef
       <EuiInMemoryTable
         columns={columns}
         items={rows}
         hasActions
-        // @ts-ignore missing rowProps from typedef
         rowProps={(item: TableRow) => {
           return {
             className: isGlobalPrivilegeDefinition(item.privileges)
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
index 75211498c57b8..0eb9cf0b0ee9d 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/privileges/kibana/space_aware_privilege_section/space_selector.tsx
@@ -4,17 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  EuiComboBox,
-  EuiComboBoxOptionProps,
-  EuiHealth,
-  // @ts-ignore
-  EuiHighlight,
-} from '@elastic/eui';
+import { EuiComboBox, EuiComboBoxOptionProps, EuiHealth, EuiHighlight } from '@elastic/eui';
 import { InjectedIntl } from '@kbn/i18n/react';
 import React, { Component } from 'react';
 import { Space } from '../../../../../../../../../spaces/common/model/space';
-import { getSpaceColor } from '../../../../../../../../../spaces/public/lib/space_attributes';
+import { getSpaceColor } from '../../../../../../../../../spaces/public/space_avatar';
 
 const spaceToOption = (space?: Space, currentSelection?: 'global' | 'spaces') => {
   if (!space) {
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx
index 1ab2a27220eee..a99e389044eaa 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/components/spaces_popover_list/spaces_popover_list.tsx
@@ -14,9 +14,9 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { Component } from 'react';
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../../../../spaces/common/constants';
-import { Space } from '../../../../../../../spaces/common/model/space';
-import { SpaceAvatar } from '../../../../../../../spaces/public/components';
+import { SpaceAvatar } from '../../../../../../../spaces/public/space_avatar';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../../../../../../plugins/spaces/common/constants';
+import { Space } from '../../../../../../../../../plugins/spaces/common/model/space';
 
 interface Props {
   spaces: Space[];
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_role/index.js b/x-pack/legacy/plugins/security/public/views/management/edit_role/index.js
index 09c612526918f..27c9beb4ba828 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_role/index.js
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_role/index.js
@@ -11,10 +11,10 @@ import { kfetch } from 'ui/kfetch';
 import { fatalError, toastNotifications } from 'ui/notify';
 import { npStart } from 'ui/new_platform';
 import template from 'plugins/security/views/management/edit_role/edit_role.html';
-import 'plugins/security/services/shield_user';
 import 'plugins/security/services/shield_role';
 import 'plugins/security/services/shield_indices';
 import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
+import { UserAPIClient } from '../../../lib/api';
 import { ROLES_PATH, CLONE_ROLES_PATH, EDIT_ROLES_PATH } from '../management_urls';
 import { getEditRoleBreadcrumbs, getCreateRoleBreadcrumbs } from '../breadcrumbs';
 
@@ -69,9 +69,8 @@ const routeDefinition = action => ({
 
       return role.then(res => res.toJSON());
     },
-    users(ShieldUser) {
-      // $promise is used here because the result is an ngResource, not a promise itself
-      return ShieldUser.query().$promise.then(users => _.map(users, 'username'));
+    users() {
+      return new UserAPIClient().getUsers().then(users => _.map(users, 'username'));
     },
     indexPatterns() {
       return npStart.plugins.data.indexPatterns.getTitles();
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_user/components/edit_user_page.test.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_user/components/edit_user_page.test.tsx
index 5c71d0da3954a..639646ce48e22 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_user/components/edit_user_page.test.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_user/components/edit_user_page.test.tsx
@@ -4,38 +4,42 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { act } from '@testing-library/react';
+import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
 import { EditUserPage } from './edit_user_page';
 import React from 'react';
+import { securityMock } from '../../../../../../../../plugins/security/public/mocks';
 import { UserAPIClient } from '../../../../lib/api';
 import { User, Role } from '../../../../../common/model';
 import { ReactWrapper } from 'enzyme';
+import { mockAuthenticatedUser } from '../../../../../../../../plugins/security/common/model/authenticated_user.mock';
 
 jest.mock('ui/kfetch');
 
-const buildClient = () => {
-  const apiClient = new UserAPIClient();
+const createUser = (username: string) => {
+  const user: User = {
+    username,
+    full_name: 'my full name',
+    email: 'foo@bar.com',
+    roles: ['idk', 'something'],
+    enabled: true,
+  };
 
-  const createUser = (username: string) => {
-    const user: User = {
-      username,
-      full_name: 'my full name',
-      email: 'foo@bar.com',
-      roles: ['idk', 'something'],
-      enabled: true,
+  if (username === 'reserved_user') {
+    user.metadata = {
+      _reserved: true,
     };
+  }
 
-    if (username === 'reserved_user') {
-      user.metadata = {
-        _reserved: true,
-      };
-    }
+  return user;
+};
 
-    return Promise.resolve(user);
-  };
+const buildClient = () => {
+  const apiClient = new UserAPIClient();
 
-  apiClient.getUser = jest.fn().mockImplementation(createUser);
-  apiClient.getCurrentUser = jest.fn().mockImplementation(() => createUser('current_user'));
+  apiClient.getUser = jest
+    .fn()
+    .mockImplementation(async (username: string) => createUser(username));
 
   apiClient.getRoles = jest.fn().mockImplementation(() => {
     return Promise.resolve([
@@ -63,6 +67,14 @@ const buildClient = () => {
   return apiClient;
 };
 
+function buildSecuritySetup() {
+  const securitySetupMock = securityMock.createSetup();
+  securitySetupMock.authc.getCurrentUser.mockResolvedValue(
+    mockAuthenticatedUser(createUser('current_user'))
+  );
+  return securitySetupMock;
+}
+
 function expectSaveButton(wrapper: ReactWrapper<any, any>) {
   expect(wrapper.find('EuiButton[data-test-subj="userFormSaveButton"]')).toHaveLength(1);
 }
@@ -74,10 +86,12 @@ function expectMissingSaveButton(wrapper: ReactWrapper<any, any>) {
 describe('EditUserPage', () => {
   it('allows reserved users to be viewed', async () => {
     const apiClient = buildClient();
+    const securitySetup = buildSecuritySetup();
     const wrapper = mountWithIntl(
       <EditUserPage.WrappedComponent
         username={'reserved_user'}
         apiClient={apiClient}
+        securitySetup={securitySetup}
         changeUrl={path => path}
         intl={null as any}
       />
@@ -86,17 +100,19 @@ describe('EditUserPage', () => {
     await waitForRender(wrapper);
 
     expect(apiClient.getUser).toBeCalledTimes(1);
-    expect(apiClient.getCurrentUser).toBeCalledTimes(1);
+    expect(securitySetup.authc.getCurrentUser).toBeCalledTimes(1);
 
     expectMissingSaveButton(wrapper);
   });
 
   it('allows new users to be created', async () => {
     const apiClient = buildClient();
+    const securitySetup = buildSecuritySetup();
     const wrapper = mountWithIntl(
       <EditUserPage.WrappedComponent
         username={''}
         apiClient={apiClient}
+        securitySetup={securitySetup}
         changeUrl={path => path}
         intl={null as any}
       />
@@ -105,17 +121,19 @@ describe('EditUserPage', () => {
     await waitForRender(wrapper);
 
     expect(apiClient.getUser).toBeCalledTimes(0);
-    expect(apiClient.getCurrentUser).toBeCalledTimes(0);
+    expect(securitySetup.authc.getCurrentUser).toBeCalledTimes(0);
 
     expectSaveButton(wrapper);
   });
 
   it('allows existing users to be edited', async () => {
     const apiClient = buildClient();
+    const securitySetup = buildSecuritySetup();
     const wrapper = mountWithIntl(
       <EditUserPage.WrappedComponent
         username={'existing_user'}
         apiClient={apiClient}
+        securitySetup={securitySetup}
         changeUrl={path => path}
         intl={null as any}
       />
@@ -124,16 +142,15 @@ describe('EditUserPage', () => {
     await waitForRender(wrapper);
 
     expect(apiClient.getUser).toBeCalledTimes(1);
-    expect(apiClient.getCurrentUser).toBeCalledTimes(1);
+    expect(securitySetup.authc.getCurrentUser).toBeCalledTimes(1);
 
     expectSaveButton(wrapper);
   });
 });
 
 async function waitForRender(wrapper: ReactWrapper<any, any>) {
-  await Promise.resolve();
-  await Promise.resolve();
-  await Promise.resolve();
-  await Promise.resolve();
-  wrapper.update();
+  await act(async () => {
+    await nextTick();
+    wrapper.update();
+  });
 }
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_user/components/edit_user_page.tsx b/x-pack/legacy/plugins/security/public/views/management/edit_user/components/edit_user_page.tsx
index 91f5f048adc6d..bbffe07485f8d 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_user/components/edit_user_page.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_user/components/edit_user_page.tsx
@@ -28,6 +28,7 @@ import {
 } from '@elastic/eui';
 import { toastNotifications } from 'ui/notify';
 import { FormattedMessage, injectI18n, InjectedIntl } from '@kbn/i18n/react';
+import { SecurityPluginSetup } from '../../../../../../../../plugins/security/public';
 import { UserValidator, UserValidationResult } from '../../../../lib/validate_user';
 import { User, EditUser, Role } from '../../../../../common/model';
 import { USERS_PATH } from '../../../../views/management/management_urls';
@@ -40,6 +41,7 @@ interface Props {
   intl: InjectedIntl;
   changeUrl: (path: string) => void;
   apiClient: UserAPIClient;
+  securitySetup: SecurityPluginSetup;
 }
 
 interface State {
@@ -82,7 +84,7 @@ class EditUserPageUI extends Component<Props, State> {
   }
 
   public async componentDidMount() {
-    const { username, apiClient } = this.props;
+    const { username, apiClient, securitySetup } = this.props;
     let { user, currentUser } = this.state;
     if (username) {
       try {
@@ -91,7 +93,7 @@ class EditUserPageUI extends Component<Props, State> {
           password: '',
           confirmPassword: '',
         };
-        currentUser = await apiClient.getCurrentUser();
+        currentUser = await securitySetup.authc.getCurrentUser();
       } catch (err) {
         toastNotifications.addDanger({
           title: this.props.intl.formatMessage({
diff --git a/x-pack/legacy/plugins/security/public/views/management/edit_user/edit_user.js b/x-pack/legacy/plugins/security/public/views/management/edit_user/edit_user.js
index bd9d6f2b1ca35..ab218022c6ee6 100644
--- a/x-pack/legacy/plugins/security/public/views/management/edit_user/edit_user.js
+++ b/x-pack/legacy/plugins/security/public/views/management/edit_user/edit_user.js
@@ -7,7 +7,6 @@ import routes from 'ui/routes';
 import template from 'plugins/security/views/management/edit_user/edit_user.html';
 import 'angular-resource';
 import 'ui/angular_ui_select';
-import 'plugins/security/services/shield_user';
 import 'plugins/security/services/shield_role';
 import { EDIT_USERS_PATH } from '../management_urls';
 import { EditUserPage } from './components';
@@ -15,12 +14,18 @@ import { UserAPIClient } from '../../../lib/api';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nContext } from 'ui/i18n';
+import { npSetup } from 'ui/new_platform';
 import { getEditUserBreadcrumbs, getCreateUserBreadcrumbs } from '../breadcrumbs';
 
 const renderReact = (elem, changeUrl, username) => {
   render(
     <I18nContext>
-      <EditUserPage changeUrl={changeUrl} username={username} apiClient={new UserAPIClient()} />
+      <EditUserPage
+        changeUrl={changeUrl}
+        username={username}
+        apiClient={new UserAPIClient()}
+        securitySetup={npSetup.plugins.security}
+      />
     </I18nContext>,
     elem
   );
diff --git a/x-pack/legacy/plugins/security/public/views/management/management.js b/x-pack/legacy/plugins/security/public/views/management/management.js
index db2175e91c5de..59da63abbb83f 100644
--- a/x-pack/legacy/plugins/security/public/views/management/management.js
+++ b/x-pack/legacy/plugins/security/public/views/management/management.js
@@ -13,10 +13,10 @@ import 'plugins/security/views/management/edit_user/edit_user';
 import 'plugins/security/views/management/edit_role/index';
 import routes from 'ui/routes';
 import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
-import '../../services/shield_user';
 import { ROLES_PATH, USERS_PATH, API_KEYS_PATH } from './management_urls';
 
 import { management } from 'ui/management';
+import { npSetup } from 'ui/new_platform';
 import { i18n } from '@kbn/i18n';
 import { toastNotifications } from 'ui/notify';
 
@@ -36,7 +36,7 @@ routes
   })
   .defaults(/\/management/, {
     resolve: {
-      securityManagementSection: function(ShieldUser) {
+      securityManagementSection: function() {
         const showSecurityLinks = xpackInfo.get('features.security.showLinks');
 
         function deregisterSecurity() {
@@ -93,12 +93,11 @@ routes
         if (!showSecurityLinks) {
           deregisterSecurity();
         } else {
-          // getCurrent will reject if there is no authenticated user, so we prevent them from seeing the security
-          // management screens
-          //
-          // $promise is used here because the result is an ngResource, not a promise itself
-          return ShieldUser.getCurrent()
-            .$promise.then(ensureSecurityRegistered)
+          // getCurrentUser will reject if there is no authenticated user, so we prevent them from
+          // seeing the security management screens.
+          return npSetup.plugins.security.authc
+            .getCurrentUser()
+            .then(ensureSecurityRegistered)
             .catch(deregisterSecurity);
         }
       },
diff --git a/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/__snapshots__/roles_grid_page.test.tsx.snap b/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/__snapshots__/roles_grid_page.test.tsx.snap
index 048fa74a72818..970cbfd03954a 100644
--- a/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/__snapshots__/roles_grid_page.test.tsx.snap
+++ b/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/__snapshots__/roles_grid_page.test.tsx.snap
@@ -10,7 +10,6 @@ exports[`<RolesGridPage /> renders permission denied if required 1`] = `
     >
       <EuiPageContent
         horizontalPosition="center"
-        panelPaddingSize="l"
       >
         <EuiPanel
           className="euiPageContent euiPageContent--horizontalCenter"
@@ -51,25 +50,30 @@ exports[`<RolesGridPage /> renders permission denied if required 1`] = `
                   type="securityApp"
                 >
                   <EuiIconAppSecurity
+                    aria-hidden={true}
                     className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoaded"
                     focusable="false"
+                    role="img"
                     style={null}
                   >
                     <svg
+                      aria-hidden={true}
                       className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoaded"
                       focusable="false"
                       height={32}
+                      role="img"
                       style={null}
                       viewBox="0 0 32 32"
                       width={32}
                       xmlns="http://www.w3.org/2000/svg"
                     >
+                      <title />
                       <path
-                        d="M14 32l-.36-.14A21.07 21.07 0 0 1 0 12.07V5.44L14 .06l14 5.38v6.63a21.07 21.07 0 0 1-13.64 19.78L14 32zM2 6.82v5.25a19.08 19.08 0 0 0 12 17.77 19.08 19.08 0 0 0 12-17.77V6.82L14 2.2 2 6.82z"
+                        d="M14 32l-.36-.14A21.07 21.07 0 010 12.07V5.44L14 .06l14 5.38v6.63a21.07 21.07 0 01-13.64 19.78L14 32zM2 6.82v5.25a19.08 19.08 0 0012 17.77 19.08 19.08 0 0012-17.77V6.82L14 2.2 2 6.82z"
                       />
                       <path
                         className="euiIcon__fillSecondary"
-                        d="M9 17.83h2V23H9zM11 10.18V7H9v3.18a3 3 0 1 0 2 0zM10 14a1 1 0 1 1 0-2 1 1 0 0 1 0 2zM17 7h2v5.17h-2zM21 17a3 3 0 1 0-4 2.82V23h2v-3.18A3 3 0 0 0 21 17zm-3 1a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"
+                        d="M9 17.83h2V23H9zM11 10.18V7H9v3.18a3 3 0 102 0zM10 14a1 1 0 110-2 1 1 0 010 2zM17 7h2v5.17h-2zM21 17a3 3 0 10-4 2.82V23h2v-3.18A3 3 0 0021 17zm-3 1a1 1 0 110-2 1 1 0 010 2z"
                       />
                     </svg>
                   </EuiIconAppSecurity>
diff --git a/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/roles_grid_page.tsx b/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/roles_grid_page.tsx
index d0645f85946db..2083a93f4b33c 100644
--- a/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/roles_grid_page.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/roles_grid/components/roles_grid_page.tsx
@@ -16,6 +16,7 @@ import {
   EuiText,
   EuiTitle,
   EuiButtonIcon,
+  EuiBasicTableColumn,
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import _ from 'lodash';
@@ -108,17 +109,14 @@ class RolesGridPageUI extends Component<Props, State> {
           ) : null}
 
           {
-            // @ts-ignore missing rowProps typedef
             <EuiInMemoryTable
               itemId="name"
               responsive={false}
               columns={this.getColumnConfig(intl)}
               hasActions={true}
               selection={{
-                itemId: 'name',
                 selectable: (role: Role) => !role.metadata || !role.metadata._reserved,
-                selectableMessage: (selectable: boolean) =>
-                  !selectable ? 'Role is reserved' : undefined,
+                selectableMessage: (selectable: boolean) => (!selectable ? 'Role is reserved' : ''),
                 onSelectionChange: (selection: Role[]) => this.setState({ selection }),
               }}
               pagination={{
@@ -144,7 +142,6 @@ class RolesGridPageUI extends Component<Props, State> {
                   direction: 'asc',
                 },
               }}
-              // @ts-ignore missing rowProps typedef
               rowProps={() => {
                 return {
                   'data-test-subj': 'roleRow',
@@ -271,7 +268,7 @@ class RolesGridPageUI extends Component<Props, State> {
           },
         ],
       },
-    ];
+    ] as Array<EuiBasicTableColumn<Role>>;
   };
 
   private getVisibleRoles = () => {
diff --git a/x-pack/legacy/plugins/security/public/views/management/users_grid/components/users_list_page.tsx b/x-pack/legacy/plugins/security/public/views/management/users_grid/components/users_list_page.tsx
index 651b073cb114e..df8522e5f32f9 100644
--- a/x-pack/legacy/plugins/security/public/views/management/users_grid/components/users_list_page.tsx
+++ b/x-pack/legacy/plugins/security/public/views/management/users_grid/components/users_list_page.tsx
@@ -17,6 +17,7 @@ import {
   EuiPageContentHeaderSection,
   EuiPageContentBody,
   EuiEmptyPrompt,
+  EuiBasicTableColumn,
 } from '@elastic/eui';
 import { toastNotifications } from 'ui/notify';
 import { injectI18n, FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
@@ -84,7 +85,7 @@ class UsersListPageUI extends Component<Props, State> {
       );
     }
     const path = '#/management/security/';
-    const columns = [
+    const columns: Array<EuiBasicTableColumn<User>> = [
       {
         field: 'full_name',
         name: intl.formatMessage({
@@ -169,8 +170,7 @@ class UsersListPageUI extends Component<Props, State> {
     const selectionConfig = {
       itemId: 'username',
       selectable: (user: User) => !(user.metadata && user.metadata._reserved),
-      selectableMessage: (selectable: boolean) =>
-        !selectable ? 'User is a system user' : undefined,
+      selectableMessage: (selectable: boolean) => (!selectable ? 'User is a system user' : ''),
       onSelectionChange: (updatedSelection: User[]) =>
         this.setState({ selection: updatedSelection }),
     };
@@ -190,7 +190,7 @@ class UsersListPageUI extends Component<Props, State> {
         field: 'full_name',
         direction: 'asc',
       },
-    };
+    } as const;
     const rowProps = () => {
       return {
         'data-test-subj': 'userRow',
@@ -237,7 +237,6 @@ class UsersListPageUI extends Component<Props, State> {
             ) : null}
 
             {
-              // @ts-ignore missing responsive from typedef
               <EuiInMemoryTable
                 itemId="username"
                 columns={columns}
@@ -247,7 +246,6 @@ class UsersListPageUI extends Component<Props, State> {
                 loading={users.length === 0}
                 search={search}
                 sorting={sorting}
-                // @ts-ignore missing responsive from typedef
                 rowProps={rowProps}
                 isSelectable
               />
diff --git a/x-pack/legacy/plugins/security/public/views/management/users_grid/users.js b/x-pack/legacy/plugins/security/public/views/management/users_grid/users.js
index a7115f449ebfd..8d4e0526251d7 100644
--- a/x-pack/legacy/plugins/security/public/views/management/users_grid/users.js
+++ b/x-pack/legacy/plugins/security/public/views/management/users_grid/users.js
@@ -8,7 +8,6 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import routes from 'ui/routes';
 import template from 'plugins/security/views/management/users_grid/users.html';
-import 'plugins/security/services/shield_user';
 import { SECURITY_PATH, USERS_PATH } from '../management_urls';
 import { UsersListPage } from './components';
 import { UserAPIClient } from '../../../lib/api';
diff --git a/x-pack/legacy/plugins/security/public/views/nav_control/index.js b/x-pack/legacy/plugins/security/public/views/nav_control/index.js
deleted file mode 100644
index 475360ac74a3b..0000000000000
--- a/x-pack/legacy/plugins/security/public/views/nav_control/index.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.
- */
-
-import './nav_control';
diff --git a/x-pack/legacy/plugins/security/public/views/nav_control/nav_control.js b/x-pack/legacy/plugins/security/public/views/nav_control/nav_control.js
deleted file mode 100644
index 3cf89a9aa7944..0000000000000
--- a/x-pack/legacy/plugins/security/public/views/nav_control/nav_control.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 { I18nContext } from 'ui/i18n';
-import React from 'react';
-import ReactDOM from 'react-dom';
-
-import chrome from 'ui/chrome';
-
-import 'plugins/security/services/shield_user';
-import '../account/account';
-import { Path } from 'plugins/xpack_main/services/path';
-import { xpackInfo } from 'plugins/xpack_main/services/xpack_info';
-
-import {
-  chromeHeaderNavControlsRegistry,
-  NavControlSide,
-} from 'ui/registry/chrome_header_nav_controls';
-import { SecurityNavControl } from './nav_control_component';
-
-chromeHeaderNavControlsRegistry.register((ShieldUser, kbnBaseUrl) => ({
-  name: 'security',
-  order: 1000,
-  side: NavControlSide.Right,
-  render(el) {
-    const showSecurityLinks = xpackInfo.get('features.security.showLinks');
-    if (Path.isUnauthenticated() || !showSecurityLinks) return null;
-
-    const props = {
-      user: ShieldUser.getCurrent(),
-      editProfileUrl: chrome.addBasePath(`${kbnBaseUrl}#/account`),
-      logoutUrl: chrome.addBasePath(`/logout`),
-    };
-
-    props.user.$promise.then(() => {
-      // Wait for the user to be propogated before rendering into the DOM.
-      ReactDOM.render(
-        <I18nContext>
-          <SecurityNavControl {...props} />
-        </I18nContext>,
-        el
-      );
-    });
-
-    return () => ReactDOM.unmountComponentAtNode(el);
-  },
-}));
diff --git a/x-pack/legacy/plugins/security/public/views/nav_control/nav_control_component.js b/x-pack/legacy/plugins/security/public/views/nav_control/nav_control_component.js
deleted file mode 100644
index 3968913b8dc19..0000000000000
--- a/x-pack/legacy/plugins/security/public/views/nav_control/nav_control_component.js
+++ /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 { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React, { Component } from 'react';
-
-import {
-  EuiAvatar,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiHeaderSectionItemButton,
-  EuiLink,
-  EuiText,
-  EuiSpacer,
-  EuiPopover,
-} from '@elastic/eui';
-
-/**
- * Placeholder for now from eui demo. Will need to be populated by Security plugin
- */
-export class SecurityNavControl extends Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      isOpen: false,
-    };
-  }
-
-  onMenuButtonClick = () => {
-    this.setState({
-      isOpen: !this.state.isOpen,
-    });
-  };
-
-  closeMenu = () => {
-    this.setState({
-      isOpen: false,
-    });
-  };
-
-  render() {
-    const { user, editProfileUrl, logoutUrl } = this.props;
-    const name = user.full_name || user.username || '';
-    const button = (
-      <EuiHeaderSectionItemButton
-        aria-controls="headerUserMenu"
-        aria-expanded={this.state.isOpen}
-        aria-haspopup="true"
-        aria-label={i18n.translate('xpack.security.navControlComponent.accountMenuAriaLabel', {
-          defaultMessage: 'Account menu',
-        })}
-        onClick={this.onMenuButtonClick}
-        data-test-subj="userMenuButton"
-      >
-        <EuiAvatar name={name} size="s" />
-      </EuiHeaderSectionItemButton>
-    );
-
-    return (
-      <EuiPopover
-        id="headerUserMenu"
-        ownFocus
-        button={button}
-        isOpen={this.state.isOpen}
-        anchorPosition="downRight"
-        repositionOnScroll
-        closePopover={this.closeMenu}
-        panelPaddingSize="none"
-      >
-        <div style={{ width: 320 }} data-test-subj="userMenu">
-          <EuiFlexGroup gutterSize="m" className="euiHeaderProfile" responsive={false}>
-            <EuiFlexItem grow={false}>
-              <EuiAvatar name={name} size="xl" />
-            </EuiFlexItem>
-
-            <EuiFlexItem>
-              <EuiText>
-                <p className="eui-textBreakWord">{name}</p>
-              </EuiText>
-
-              <EuiSpacer size="m" />
-
-              <EuiFlexGroup>
-                <EuiFlexItem>
-                  <EuiFlexGroup justifyContent="spaceBetween">
-                    <EuiFlexItem grow={false}>
-                      <EuiLink href={editProfileUrl} data-test-subj="profileLink">
-                        <FormattedMessage
-                          id="xpack.security.navControlComponent.editProfileLinkText"
-                          defaultMessage="Edit profile"
-                        />
-                      </EuiLink>
-                    </EuiFlexItem>
-
-                    <EuiFlexItem grow={false}>
-                      <EuiLink href={logoutUrl} data-test-subj="logoutLink">
-                        <FormattedMessage
-                          id="xpack.security.navControlComponent.logoutLinkText"
-                          defaultMessage="Log out"
-                        />
-                      </EuiLink>
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </div>
-      </EuiPopover>
-    );
-  }
-}
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 76088443212b2..fb39c517e1c2c 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
@@ -10,36 +10,40 @@ import React from 'react';
 import { render } from 'react-dom';
 import chrome from 'ui/chrome';
 import { I18nContext } from 'ui/i18n';
+import { npSetup } from 'ui/new_platform';
+import { SecurityPluginSetup } from '../../../../../../plugins/security/public';
 import { AuthenticatedUser } from '../../../common/model';
 import { AuthenticationStatePage } from '../../components/authentication_state_page';
 
 chrome
   .setVisible(false)
   .setRootTemplate('<div id="reactOverwrittenSessionRoot" />')
-  .setRootController('overwritten_session', ($scope: any, ShieldUser: any) => {
+  .setRootController('overwritten_session', ($scope: any) => {
     $scope.$$postDigest(() => {
-      ShieldUser.getCurrent().$promise.then((user: AuthenticatedUser) => {
-        const overwrittenSessionPage = (
-          <I18nContext>
-            <AuthenticationStatePage
-              title={
-                <FormattedMessage
-                  id="xpack.security.overwrittenSession.title"
-                  defaultMessage="You previously logged in as a different user."
-                />
-              }
-            >
-              <EuiButton href={chrome.addBasePath('/')}>
-                <FormattedMessage
-                  id="xpack.security.overwrittenSession.continueAsUserText"
-                  defaultMessage="Continue as {username}"
-                  values={{ username: user.username }}
-                />
-              </EuiButton>
-            </AuthenticationStatePage>
-          </I18nContext>
-        );
-        render(overwrittenSessionPage, document.getElementById('reactOverwrittenSessionRoot'));
-      });
+      ((npSetup.plugins as unknown) as { security: SecurityPluginSetup }).security.authc
+        .getCurrentUser()
+        .then((user: AuthenticatedUser) => {
+          const overwrittenSessionPage = (
+            <I18nContext>
+              <AuthenticationStatePage
+                title={
+                  <FormattedMessage
+                    id="xpack.security.overwrittenSession.title"
+                    defaultMessage="You previously logged in as a different user."
+                  />
+                }
+              >
+                <EuiButton href={chrome.addBasePath('/')}>
+                  <FormattedMessage
+                    id="xpack.security.overwrittenSession.continueAsUserText"
+                    defaultMessage="Continue as {username}"
+                    values={{ username: user.username }}
+                  />
+                </EuiButton>
+              </AuthenticationStatePage>
+            </I18nContext>
+          );
+          render(overwrittenSessionPage, document.getElementById('reactOverwrittenSessionRoot'));
+        });
     });
   });
diff --git a/x-pack/legacy/plugins/siem/common/constants.ts b/x-pack/legacy/plugins/siem/common/constants.ts
index 7b5015c34de14..5116416b527a5 100644
--- a/x-pack/legacy/plugins/siem/common/constants.ts
+++ b/x-pack/legacy/plugins/siem/common/constants.ts
@@ -11,6 +11,7 @@ export const DEFAULT_DATE_FORMAT = 'dateFormat';
 export const DEFAULT_DATE_FORMAT_TZ = 'dateFormat:tz';
 export const DEFAULT_DARK_MODE = 'theme:darkMode';
 export const DEFAULT_INDEX_KEY = 'siem:defaultIndex';
+export const DEFAULT_NUMBER_FORMAT = 'format:number:defaultPattern';
 export const DEFAULT_TIME_RANGE = 'timepicker:timeDefaults';
 export const DEFAULT_REFRESH_RATE_INTERVAL = 'timepicker:refreshIntervalDefaults';
 export const DEFAULT_SIEM_TIME_RANGE = 'siem:timeDefaults';
@@ -26,8 +27,6 @@ export const DEFAULT_SEARCH_AFTER_PAGE_SIZE = 100;
 export const DEFAULT_ANOMALY_SCORE = 'siem:defaultAnomalyScore';
 export const DEFAULT_MAX_TABLE_QUERY_SIZE = 10000;
 export const DEFAULT_SCALE_DATE_FORMAT = 'dateFormat:scaled';
-export const DEFAULT_KBN_VERSION = 'kbnVersion';
-export const DEFAULT_TIMEZONE_BROWSER = 'timezoneBrowser';
 export const DEFAULT_FROM = 'now-24h';
 export const DEFAULT_TO = 'now';
 export const DEFAULT_INTERVAL_PAUSE = true;
@@ -46,12 +45,14 @@ export const SIGNALS_ID = `${APP_ID}.signals`;
  */
 export const INTERNAL_IDENTIFIER = '__internal';
 export const INTERNAL_RULE_ID_KEY = `${INTERNAL_IDENTIFIER}_rule_id`;
+export const INTERNAL_IMMUTABLE_KEY = `${INTERNAL_IDENTIFIER}_immutable`;
 
 /**
  * Detection engine routes
  */
 export const DETECTION_ENGINE_URL = '/api/detection_engine';
 export const DETECTION_ENGINE_RULES_URL = `${DETECTION_ENGINE_URL}/rules`;
+export const DETECTION_ENGINE_PREPACKAGED_URL = `${DETECTION_ENGINE_RULES_URL}/prepackaged`;
 export const DETECTION_ENGINE_PRIVILEGES_URL = `${DETECTION_ENGINE_URL}/privileges`;
 export const DETECTION_ENGINE_INDEX_URL = `${DETECTION_ENGINE_URL}/index`;
 export const DETECTION_ENGINE_TAGS_URL = `${DETECTION_ENGINE_URL}/tags`;
@@ -63,3 +64,8 @@ export const SIGNALS_INDEX_KEY = 'signalsIndex';
 export const DETECTION_ENGINE_SIGNALS_URL = `${DETECTION_ENGINE_URL}/signals`;
 export const DETECTION_ENGINE_SIGNALS_STATUS_URL = `${DETECTION_ENGINE_SIGNALS_URL}/status`;
 export const DETECTION_ENGINE_QUERY_SIGNALS_URL = `${DETECTION_ENGINE_SIGNALS_URL}/search`;
+
+/**
+ * Common naming convention for an unauthenticated user
+ */
+export const UNAUTHENTICATED_USER = 'Unauthenticated';
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/lib/fields_browser/selectors.ts b/x-pack/legacy/plugins/siem/cypress/integration/lib/fields_browser/selectors.ts
index 08ac78f73603f..039e38aaf3ee7 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/lib/fields_browser/selectors.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/lib/fields_browser/selectors.ts
@@ -30,6 +30,10 @@ export const FIELDS_BROWSER_FILTER_INPUT = '[data-test-subj="field-search"]';
  */
 export const FIELDS_BROWSER_CATEGORIES_COUNT = '[data-test-subj="categories-count"]';
 
+export const FIELDS_BROWSER_HOST_CATEGORIES_COUNT = '[data-test-subj="host-category-count"]';
+
+export const FIELDS_BROWSER_SYSTEM_CATEGORIES_COUNT = '[data-test-subj="system-category-count"]';
+
 /**
  * This label displays a count of the fields that match the filter criteria
  */
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/index.ts b/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/index.ts
deleted file mode 100644
index 7a6c7f71bc98c..0000000000000
--- a/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/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 const logout = (): null => {
-  cy.request({
-    method: 'GET',
-    url: `${Cypress.config().baseUrl}/logout`,
-  }).then(response => {
-    expect(response.status).to.eq(200);
-  });
-  return null;
-};
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/selectors.ts b/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/selectors.ts
deleted file mode 100644
index 8cf015619f4c1..0000000000000
--- a/x-pack/legacy/plugins/siem/cypress/integration/lib/logout/selectors.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.
- */
-
-/** The avatar / button that represents the logged-in Kibana user */
-export const USER_MENU = '[data-test-subj="userMenuButton"]';
-
-/** Clicking this link logs out the currently logged-in Kibana user */
-export const LOGOUT_LINK = '[data-test-subj="logoutLink"]';
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/lib/ml_conditional_links/index.ts b/x-pack/legacy/plugins/siem/cypress/integration/lib/ml_conditional_links/index.ts
index 8ba20b3ec0048..655418fc98bf8 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/lib/ml_conditional_links/index.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/lib/ml_conditional_links/index.ts
@@ -49,28 +49,28 @@ export const mlNetworkKqlQuery =
 
 // Single host name with a null for the Query:
 export const mlHostSingleHostNullKqlQuery =
-  "/app/siem#/ml-hosts/siem-windows?_g=()&query=!n&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
+  "/app/siem#/ml-hosts/siem-windows?query=!n&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
 
 // Single host name with a variable in the Query:
 export const mlHostSingleHostKqlQueryVariable =
-  "/app/siem#/ml-hosts/siem-windows?_g=()&query=(language:kuery,query:'process.name%20:%20%22$process.name$%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
+  "/app/siem#/ml-hosts/siem-windows?query=(language:kuery,query:'process.name%20:%20%22$process.name$%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
 
 // Single host name with a value for Query:
 export const mlHostSingleHostKqlQuery =
-  "/app/siem#/ml-hosts/siem-windows?_g=()&query=(language:kuery,query:'process.name%20:%20%22conhost.exe,sc.exe%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
+  "/app/siem#/ml-hosts/siem-windows?query=(language:kuery,query:'process.name%20:%20%22conhost.exe,sc.exe%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
 
 // Multiple host names with null for Query:
 export const mlHostMultiHostNullKqlQuery =
-  "/app/siem#/ml-hosts/siem-windows,siem-suricata?_g=()&query=!n&&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
+  "/app/siem#/ml-hosts/siem-windows,siem-suricata?query=!n&&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
 
 // Multiple host names with a value for Query:
 export const mlHostMultiHostKqlQuery =
-  "/app/siem#/ml-hosts/siem-windows,siem-suricata?_g=()&query=(language:kuery,query:'process.name%20:%20%22conhost.exe,sc.exe%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
+  "/app/siem#/ml-hosts/siem-windows,siem-suricata?query=(language:kuery,query:'process.name%20:%20%22conhost.exe,sc.exe%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
 
 // Undefined/null host name with a null for the KQL:
 export const mlHostVariableHostNullKqlQuery =
-  "/app/siem#/ml-hosts/$host.name$?_g=()&query=!n&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
+  "/app/siem#/ml-hosts/$host.name$?query=!n&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
 
 // Undefined/null host name but with a value for Query:
 export const mlHostVariableHostKqlQuery =
-  "/app/siem#/ml-hosts/$host.name$?_g=()&query=(language:kuery,query:'process.name%20:%20%22conhost.exe,sc.exe%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
+  "/app/siem#/ml-hosts/$host.name$?query=(language:kuery,query:'process.name%20:%20%22conhost.exe,sc.exe%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')),timeline:(linkTo:!(global),timerange:(from:'2019-06-06T06:00:00.000Z',kind:absolute,to:'2019-06-07T05:59:59.999Z')))";
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/lib/url_state/index.ts b/x-pack/legacy/plugins/siem/cypress/integration/lib/url_state/index.ts
index ef1892b3d382c..99d90e3c42aca 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/lib/url_state/index.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/lib/url_state/index.ts
@@ -35,10 +35,10 @@ export const ABSOLUTE_DATE_RANGE = {
 
   urlUnlinked:
     '/app/siem#/network/?timerange=(global:(linkTo:!(),timerange:(from:1564689809186,kind:absolute,to:1564691609186)),timeline:(linkTo:!(),timerange:(from:1564776209186,kind:absolute,to:1564779809186)))',
-  urlKqlNetworkNetwork: `/app/siem#/network/?_g=()&query=(language:kuery,query:'source.ip:%20"10.142.0.9"')&timerange=(global:(linkTo:!(timeline),timerange:(from:1564689809186,kind:absolute,to:1564691609186)),timeline:(linkTo:!(global),timerange:(from:1564689809186,kind:absolute,to:1564691609186)))`,
-  urlKqlNetworkHosts: `/app/siem#/network/?_g=()&query=(language:kuery,query:'source.ip:%20"10.142.0.9"')&timerange=(global:(linkTo:!(timeline),timerange:(from:1564689809186,kind:absolute,to:1564691609186)),timeline:(linkTo:!(global),timerange:(from:1564689809186,kind:absolute,to:1564691609186)))`,
-  urlKqlHostsNetwork: `/app/siem#/hosts/allHosts?_g=()&query=(language:kuery,query:'source.ip:%20"10.142.0.9"')&timerange=(global:(linkTo:!(timeline),timerange:(from:1564689809186,kind:absolute,to:1564691609186)),timeline:(linkTo:!(global),timerange:(from:1564689809186,kind:absolute,to:1564691609186)))`,
-  urlKqlHostsHosts: `/app/siem#/hosts/allHosts?_g=()&query=(language:kuery,query:'source.ip:%20"10.142.0.9"')&timerange=(global:(linkTo:!(timeline),timerange:(from:1564689809186,kind:absolute,to:1564691609186)),timeline:(linkTo:!(global),timerange:(from:1564689809186,kind:absolute,to:1564691609186)))`,
+  urlKqlNetworkNetwork: `/app/siem#/network/?query=(language:kuery,query:'source.ip:%20"10.142.0.9"')&timerange=(global:(linkTo:!(timeline),timerange:(from:1564689809186,kind:absolute,to:1564691609186)),timeline:(linkTo:!(global),timerange:(from:1564689809186,kind:absolute,to:1564691609186)))`,
+  urlKqlNetworkHosts: `/app/siem#/network/?query=(language:kuery,query:'source.ip:%20"10.142.0.9"')&timerange=(global:(linkTo:!(timeline),timerange:(from:1564689809186,kind:absolute,to:1564691609186)),timeline:(linkTo:!(global),timerange:(from:1564689809186,kind:absolute,to:1564691609186)))`,
+  urlKqlHostsNetwork: `/app/siem#/hosts/allHosts?query=(language:kuery,query:'source.ip:%20"10.142.0.9"')&timerange=(global:(linkTo:!(timeline),timerange:(from:1564689809186,kind:absolute,to:1564691609186)),timeline:(linkTo:!(global),timerange:(from:1564689809186,kind:absolute,to:1564691609186)))`,
+  urlKqlHostsHosts: `/app/siem#/hosts/allHosts?query=(language:kuery,query:'source.ip:%20"10.142.0.9"')&timerange=(global:(linkTo:!(timeline),timerange:(from:1564689809186,kind:absolute,to:1564691609186)),timeline:(linkTo:!(global),timerange:(from:1564689809186,kind:absolute,to:1564691609186)))`,
   urlHost:
     '/app/siem#/hosts/authentications?timerange=(global:(linkTo:!(timeline),timerange:(from:1564689809186,kind:absolute,to:1564691609186)),timeline:(linkTo:!(global),timerange:(from:1564689809186,kind:absolute,to:1564691609186)))',
 };
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/events_viewer/events_viewer.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/events_viewer/events_viewer.spec.ts
index 57a1f318a7e31..79169d3769a78 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/events_viewer/events_viewer.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/events_viewer/events_viewer.spec.ts
@@ -10,7 +10,6 @@ import {
   FIELDS_BROWSER_SELECTED_CATEGORY_TITLE,
   FIELDS_BROWSER_TITLE,
 } from '../../lib/fields_browser/selectors';
-import { logout } from '../../lib/logout';
 import { HOSTS_PAGE } from '../../lib/urls';
 import { loginAndWaitForPage, DEFAULT_TIMEOUT } from '../../lib/util/helpers';
 import {
@@ -26,6 +25,7 @@ import {
   LOAD_MORE,
   LOCAL_EVENTS_COUNT,
 } from '../../lib/events_viewer/selectors';
+import { SERVER_SIDE_EVENT_COUNT } from '../../lib/timeline/selectors';
 import { clickEventsTab } from '../../lib/hosts/helpers';
 
 const defaultHeadersInDefaultEcsCategory = [
@@ -45,10 +45,6 @@ describe('Events Viewer', () => {
     clickEventsTab();
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('renders the fields browser with the expected title when the Events Viewer Fields Browser button is clicked', () => {
     openEventsViewerFieldsBrowser();
 
@@ -106,7 +102,7 @@ describe('Events Viewer', () => {
       .invoke('text')
       .then(text1 => {
         cy.get(HEADER_SUBTITLE)
-          .invoke('text')
+          .invoke('text', { timeout: DEFAULT_TIMEOUT })
           .should('not.equal', 'Showing: 0 events');
 
         filterSearchBar(filterInput);
@@ -141,7 +137,7 @@ describe('Events Viewer', () => {
   });
 
   it('loads more events when the load more button is clicked', () => {
-    cy.get(LOCAL_EVENTS_COUNT)
+    cy.get(LOCAL_EVENTS_COUNT, { timeout: DEFAULT_TIMEOUT })
       .invoke('text')
       .then(text1 => {
         cy.get(LOCAL_EVENTS_COUNT)
@@ -160,11 +156,13 @@ describe('Events Viewer', () => {
 
   it('launches the inspect query modal when the inspect button is clicked', () => {
     // wait for data to load
-    cy.get(HEADER_SUBTITLE)
-      .invoke('text')
-      .should('not.equal', 'Showing: 0 events');
+    cy.get(SERVER_SIDE_EVENT_COUNT, { timeout: DEFAULT_TIMEOUT })
+      .should('exist')
+      .invoke('text', { timeout: DEFAULT_TIMEOUT })
+      .should('not.equal', '0');
 
-    cy.get(INSPECT_QUERY)
+    cy.get(INSPECT_QUERY, { timeout: DEFAULT_TIMEOUT })
+      .should('exist')
       .trigger('mousemove', { force: true })
       .click({ force: true });
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/fields_browser/fields_browser.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/fields_browser/fields_browser.spec.ts
index 8f5c6e6f660cc..95df907893fc7 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/fields_browser/fields_browser.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/fields_browser/fields_browser.spec.ts
@@ -15,11 +15,13 @@ import {
   FIELDS_BROWSER_CATEGORIES_COUNT,
   FIELDS_BROWSER_CONTAINER,
   FIELDS_BROWSER_FIELDS_COUNT,
+  FIELDS_BROWSER_FILTER_INPUT,
+  FIELDS_BROWSER_HOST_CATEGORIES_COUNT,
   FIELDS_BROWSER_SELECTED_CATEGORY_COUNT,
   FIELDS_BROWSER_SELECTED_CATEGORY_TITLE,
+  FIELDS_BROWSER_SYSTEM_CATEGORIES_COUNT,
   FIELDS_BROWSER_TITLE,
 } from '../../lib/fields_browser/selectors';
-import { logout } from '../../lib/logout';
 import { HOSTS_PAGE } from '../../lib/urls';
 import { loginAndWaitForPage, DEFAULT_TIMEOUT } from '../../lib/util/helpers';
 
@@ -39,10 +41,6 @@ describe('Fields Browser', () => {
     loginAndWaitForPage(HOSTS_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('renders the fields browser with the expected title when the Fields button is clicked', () => {
     populateTimeline();
 
@@ -138,9 +136,22 @@ describe('Fields Browser', () => {
 
     filterFieldsBrowser(filterInput);
 
-    cy.get(FIELDS_BROWSER_FIELDS_COUNT)
+    cy.get(FIELDS_BROWSER_FILTER_INPUT, { timeout: DEFAULT_TIMEOUT }).should(
+      'not.have.class',
+      'euiFieldSearch-isLoading'
+    );
+
+    cy.get(FIELDS_BROWSER_HOST_CATEGORIES_COUNT)
       .invoke('text')
-      .should('eq', '2 fields');
+      .then(hostCategoriesCount => {
+        cy.get(FIELDS_BROWSER_SYSTEM_CATEGORIES_COUNT)
+          .invoke('text')
+          .then(systemCategoriesCount => {
+            cy.get(FIELDS_BROWSER_FIELDS_COUNT)
+              .invoke('text')
+              .should('eq', `${+hostCategoriesCount + +systemCategoriesCount} fields`);
+          });
+      });
   });
 
   it('selects a search results label with the expected count of categories matching the filter input', () => {
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/inspect/inspect.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/inspect/inspect.spec.ts
index eca1887ddaf9b..ee25705a83989 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/inspect/inspect.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/inspect/inspect.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import { HOSTS_PAGE } from '../../lib/urls';
 import {
   INSPECT_BUTTON_ICON,
@@ -18,9 +17,6 @@ import { executeKQL, hostExistsQuery, toggleTimelineVisibility } from '../../lib
 
 describe('Inspect', () => {
   describe('Hosts and network stats and tables', () => {
-    afterEach(() => {
-      return logout();
-    });
     INSPECT_BUTTONS_IN_SIEM.map(table =>
       it(`inspects the ${table.title}`, () => {
         loginAndWaitForPage(table.url);
@@ -36,16 +32,12 @@ describe('Inspect', () => {
   });
 
   describe('Timeline', () => {
-    afterEach(() => {
-      return logout();
-    });
-
     it('inspects the timeline', () => {
       loginAndWaitForPage(HOSTS_PAGE);
       toggleTimelineVisibility();
       executeKQL(hostExistsQuery);
       cy.get(TIMELINE_SETTINGS_ICON).trigger('click', { force: true });
-      cy.get(TIMELINE_INSPECT_BUTTON).should('not.be.disabled', { timeout: DEFAULT_TIMEOUT });
+      cy.get(TIMELINE_INSPECT_BUTTON, { timeout: DEFAULT_TIMEOUT }).should('not.be.disabled');
       cy.get(TIMELINE_INSPECT_BUTTON).trigger('click', { force: true });
       cy.get(INSPECT_MODAL, { timeout: DEFAULT_TIMEOUT }).should('be.visible');
     });
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/ml_conditional_links/ml_conditional_links.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/ml_conditional_links/ml_conditional_links.spec.ts
index a03ff0c1845f8..afeb8c3c13a4f 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/ml_conditional_links/ml_conditional_links.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/ml_conditional_links/ml_conditional_links.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import {
   mlNetworkSingleIpNullKqlQuery,
   mlNetworkSingleIpKqlQuery,
@@ -24,10 +23,6 @@ import { loginAndWaitForPage } from '../../lib/util/helpers';
 import { KQL_INPUT } from '../../lib/url_state';
 
 describe('ml conditional links', () => {
-  afterEach(() => {
-    return logout();
-  });
-
   it('sets the KQL from a single IP with a value for the query', () => {
     loginAndWaitForPage(mlNetworkSingleIpKqlQuery);
     cy.get(KQL_INPUT, { timeout: 5000 }).should(
@@ -104,7 +99,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlNetworkSingleIpNullKqlQuery);
     cy.url().should(
       'include',
-      '/app/siem#/network/ip/127.0.0.1?_g=()&timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999)))'
+      '/app/siem#/network/ip/127.0.0.1?timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999)))'
     );
   });
 
@@ -112,7 +107,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlNetworkSingleIpKqlQuery);
     cy.url().should(
       'include',
-      "/app/siem#/network/ip/127.0.0.1?_g=()&query=(language:kuery,query:'(process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22)')&timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999)))"
+      "/app/siem#/network/ip/127.0.0.1?query=(language:kuery,query:'(process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22)')&timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999)))"
     );
   });
 
@@ -120,7 +115,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlNetworkMultipleIpNullKqlQuery);
     cy.url().should(
       'include',
-      "app/siem#/network/flows?_g=()&query=(language:kuery,query:'((source.ip:%20%22127.0.0.1%22%20or%20destination.ip:%20%22127.0.0.1%22)%20or%20(source.ip:%20%22127.0.0.2%22%20or%20destination.ip:%20%22127.0.0.2%22))')&timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999))"
+      "app/siem#/network/flows?query=(language:kuery,query:'((source.ip:%20%22127.0.0.1%22%20or%20destination.ip:%20%22127.0.0.1%22)%20or%20(source.ip:%20%22127.0.0.2%22%20or%20destination.ip:%20%22127.0.0.2%22))')&timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999))"
     );
   });
 
@@ -128,7 +123,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlNetworkMultipleIpKqlQuery);
     cy.url().should(
       'include',
-      "/app/siem#/network/flows?_g=()&query=(language:kuery,query:'((source.ip:%20%22127.0.0.1%22%20or%20destination.ip:%20%22127.0.0.1%22)%20or%20(source.ip:%20%22127.0.0.2%22%20or%20destination.ip:%20%22127.0.0.2%22))%20and%20((process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22))')&timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999)))"
+      "/app/siem#/network/flows?query=(language:kuery,query:'((source.ip:%20%22127.0.0.1%22%20or%20destination.ip:%20%22127.0.0.1%22)%20or%20(source.ip:%20%22127.0.0.2%22%20or%20destination.ip:%20%22127.0.0.2%22))%20and%20((process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22))')&timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999)))"
     );
   });
 
@@ -136,7 +131,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlNetworkNullKqlQuery);
     cy.url().should(
       'include',
-      '/app/siem#/network/flows?_g=()&timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999)))'
+      '/app/siem#/network/flows?timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999)))'
     );
   });
 
@@ -144,7 +139,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlNetworkKqlQuery);
     cy.url().should(
       'include',
-      "/app/siem#/network/flows?_g=()&query=(language:kuery,query:'(process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22)')&timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999)))"
+      "/app/siem#/network/flows?query=(language:kuery,query:'(process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22)')&timerange=(global:(linkTo:!(timeline),timerange:(from:1566990000000,kind:absolute,to:1567000799999)),timeline:(linkTo:!(global),timerange:(from:1566990000000,kind:absolute,to:1567000799999)))"
     );
   });
 
@@ -152,7 +147,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlHostSingleHostNullKqlQuery);
     cy.url().should(
       'include',
-      '/app/siem#/hosts/siem-windows/anomalies?_g=()&timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))'
+      '/app/siem#/hosts/siem-windows/anomalies?timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))'
     );
   });
 
@@ -160,7 +155,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlHostSingleHostKqlQueryVariable);
     cy.url().should(
       'include',
-      '/app/siem#/hosts/siem-windows/anomalies?_g=()&timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))'
+      '/app/siem#/hosts/siem-windows/anomalies?timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))'
     );
   });
 
@@ -168,7 +163,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlHostSingleHostKqlQuery);
     cy.url().should(
       'include',
-      "/app/siem#/hosts/siem-windows/anomalies?_g=()&query=(language:kuery,query:'(process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22)')&timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))"
+      "/app/siem#/hosts/siem-windows/anomalies?query=(language:kuery,query:'(process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22)')&timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))"
     );
   });
 
@@ -176,7 +171,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlHostMultiHostNullKqlQuery);
     cy.url().should(
       'include',
-      "/app/siem#/hosts/anomalies?_g=()&query=(language:kuery,query:'(host.name:%20%22siem-windows%22%20or%20host.name:%20%22siem-suricata%22)')&timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))"
+      "/app/siem#/hosts/anomalies?query=(language:kuery,query:'(host.name:%20%22siem-windows%22%20or%20host.name:%20%22siem-suricata%22)')&timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))"
     );
   });
 
@@ -184,7 +179,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlHostMultiHostKqlQuery);
     cy.url().should(
       'include',
-      "/app/siem#/hosts/anomalies?_g=()&query=(language:kuery,query:'(host.name:%20%22siem-windows%22%20or%20host.name:%20%22siem-suricata%22)%20and%20((process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22))')&timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))"
+      "/app/siem#/hosts/anomalies?query=(language:kuery,query:'(host.name:%20%22siem-windows%22%20or%20host.name:%20%22siem-suricata%22)%20and%20((process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22))')&timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))"
     );
   });
 
@@ -192,7 +187,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlHostVariableHostNullKqlQuery);
     cy.url().should(
       'include',
-      '/app/siem#/hosts/anomalies?_g=()&timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))'
+      '/app/siem#/hosts/anomalies?timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))'
     );
   });
 
@@ -200,7 +195,7 @@ describe('ml conditional links', () => {
     loginAndWaitForPage(mlHostVariableHostKqlQuery);
     cy.url().should(
       'include',
-      "/app/siem#/hosts/anomalies?_g=()&query=(language:kuery,query:'(process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22)')&timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))"
+      "/app/siem#/hosts/anomalies?query=(language:kuery,query:'(process.name:%20%22conhost.exe%22%20or%20process.name:%20%22sc.exe%22)')&timerange=(global:(linkTo:!(timeline),timerange:(from:1559800800000,kind:absolute,to:1559887199999)),timeline:(linkTo:!(global),timerange:(from:1559800800000,kind:absolute,to:1559887199999)))"
     );
   });
 });
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/navigation/navigation.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/navigation/navigation.spec.ts
index f4beba7cbb72d..bb1a0379ce0ea 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/navigation/navigation.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/navigation/navigation.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import { OVERVIEW_PAGE, TIMELINES_PAGE } from '../../lib/urls';
 import {
   NAVIGATION_HOSTS,
@@ -15,10 +14,6 @@ import {
 import { loginAndWaitForPage } from '../../lib/util/helpers';
 
 describe('top-level navigation common to all pages in the SIEM app', () => {
-  afterEach(() => {
-    return logout();
-  });
-
   it('navigates to the Overview page', () => {
     loginAndWaitForPage(TIMELINES_PAGE);
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/overview/overview.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/overview/overview.spec.ts
index 2ea8b5e8bc5ce..4ef3eb67cafc9 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/overview/overview.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/overview/overview.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import { OVERVIEW_PAGE } from '../../lib/urls';
 import { clearFetch, stubApi } from '../../lib/fixtures/helpers';
 import { HOST_STATS, NETWORK_STATS, STAT_AUDITD } from '../../lib/overview/selectors';
@@ -17,10 +16,6 @@ describe('Overview Page', () => {
     loginAndWaitForPage(OVERVIEW_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('Host and Network stats render with correct values', () => {
     cy.get(STAT_AUDITD.domId);
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/pagination/pagination.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/pagination/pagination.spec.ts
index ebd0ad0125efb..73711f1434d5f 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/pagination/pagination.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/pagination/pagination.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import { HOSTS_PAGE_TAB_URLS } from '../../lib/urls';
 import {
   AUTHENTICATIONS_TABLE,
@@ -19,10 +18,6 @@ import {
 import { DEFAULT_TIMEOUT, loginAndWaitForPage, waitForTableLoad } from '../../lib/util/helpers';
 
 describe('Pagination', () => {
-  afterEach(() => {
-    return logout();
-  });
-
   it('pagination updates results and page number', () => {
     loginAndWaitForPage(HOSTS_PAGE_TAB_URLS.uncommonProcesses);
     waitForTableLoad(UNCOMMON_PROCCESSES_TABLE);
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/data_providers.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/data_providers.spec.ts
index 236d5a53481b7..824e403185238 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/data_providers.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/data_providers.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import {
   TIMELINE_DATA_PROVIDERS,
   TIMELINE_DROPPED_DATA_PROVIDERS,
@@ -22,10 +21,6 @@ describe('timeline data providers', () => {
     loginAndWaitForPage(HOSTS_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('renders the data provider of a host dragged from the All Hosts widget on the hosts page', () => {
     waitForAllHostsWidget();
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/flyout_button.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/flyout_button.spec.ts
index c1c35e497d081..5b0ac03ae87dc 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/flyout_button.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/flyout_button.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import {
   TIMELINE_FLYOUT_BODY,
   TIMELINE_NOT_READY_TO_DROP_BUTTON,
@@ -21,10 +20,6 @@ describe('timeline flyout button', () => {
     loginAndWaitForPage(HOSTS_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('toggles open the timeline', () => {
     toggleTimelineVisibility();
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/search_or_filter.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/search_or_filter.spec.ts
index 0c9aed33d47ad..9f21b4e3d53a1 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/search_or_filter.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/search_or_filter.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import {
   assertAtLeastOneEventMatchesSearch,
   executeKQL,
@@ -19,10 +18,6 @@ describe('timeline search or filter KQL bar', () => {
     loginAndWaitForPage(HOSTS_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   it('executes a KQL query', () => {
     toggleTimelineVisibility();
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/toggle_column.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/toggle_column.spec.ts
index 8197f77db9a08..9a915b0e77d44 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/toggle_column.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/timeline/toggle_column.spec.ts
@@ -6,7 +6,6 @@
 
 import { drag, drop } from '../../lib/drag_n_drop/helpers';
 import { populateTimeline } from '../../lib/fields_browser/helpers';
-import { logout } from '../../lib/logout';
 import { toggleFirstTimelineEventDetails } from '../../lib/timeline/helpers';
 import { HOSTS_PAGE } from '../../lib/urls';
 import { loginAndWaitForPage, DEFAULT_TIMEOUT } from '../../lib/util/helpers';
@@ -16,10 +15,6 @@ describe('toggle column in timeline', () => {
     loginAndWaitForPage(HOSTS_PAGE);
   });
 
-  afterEach(() => {
-    return logout();
-  });
-
   const timestampField = '@timestamp';
   const idField = '_id';
 
diff --git a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/url_state/url_state.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/url_state/url_state.spec.ts
index 21829a0c20228..33ee2cb1cb302 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/url_state/url_state.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/smoke_tests/url_state/url_state.spec.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { logout } from '../../lib/logout';
 import {
   ABSOLUTE_DATE_RANGE,
   DATE_PICKER_ABSOLUTE_INPUT,
@@ -33,10 +32,6 @@ import { waitForAllHostsWidget } from '../../lib/hosts/helpers';
 import { NAVIGATION_HOSTS_ALL_HOSTS, NAVIGATION_HOSTS_ANOMALIES } from '../../lib/hosts/selectors';
 
 describe('url state', () => {
-  afterEach(() => {
-    return logout();
-  });
-
   it('sets the global start and end dates from the url', () => {
     loginAndWaitForPage(ABSOLUTE_DATE_RANGE.url);
     cy.get(DATE_PICKER_START_DATE_POPOVER_BUTTON).should(
@@ -60,11 +55,14 @@ describe('url state', () => {
       .first()
       .click({ force: true });
 
-    cy.get(DATE_PICKER_ABSOLUTE_INPUT, { timeout: 5000 }).type(
+    cy.get(DATE_PICKER_ABSOLUTE_INPUT, { timeout: DEFAULT_TIMEOUT }).type(
       `{selectall}{backspace}${ABSOLUTE_DATE_RANGE.newStartTimeTyped}`
     );
 
-    cy.get(DATE_PICKER_APPLY_BUTTON, { timeout: 5000 }).click();
+    cy.get(DATE_PICKER_APPLY_BUTTON, { timeout: DEFAULT_TIMEOUT })
+      .click({ force: true })
+      .invoke('text')
+      .should('not.equal', 'Updating');
 
     cy.get(DATE_PICKER_END_DATE_POPOVER_BUTTON).click({ force: true });
 
@@ -72,11 +70,14 @@ describe('url state', () => {
       .first()
       .click({ force: true });
 
-    cy.get(DATE_PICKER_ABSOLUTE_INPUT, { timeout: 5000 }).type(
+    cy.get(DATE_PICKER_ABSOLUTE_INPUT, { timeout: DEFAULT_TIMEOUT }).type(
       `{selectall}{backspace}${ABSOLUTE_DATE_RANGE.newEndTimeTyped}`
     );
 
-    cy.get(DATE_PICKER_APPLY_BUTTON, { timeout: 5000 }).click();
+    cy.get(DATE_PICKER_APPLY_BUTTON, { timeout: DEFAULT_TIMEOUT })
+      .click({ force: true })
+      .invoke('text')
+      .should('not.equal', 'Updating');
 
     cy.url().should(
       'include',
diff --git a/x-pack/legacy/plugins/siem/dev_tools/circular_deps/run_check_circular_deps_cli.js b/x-pack/legacy/plugins/siem/dev_tools/circular_deps/run_check_circular_deps_cli.js
index a4a9532f0e8e4..7d76b1dd921aa 100644
--- a/x-pack/legacy/plugins/siem/dev_tools/circular_deps/run_check_circular_deps_cli.js
+++ b/x-pack/legacy/plugins/siem/dev_tools/circular_deps/run_check_circular_deps_cli.js
@@ -24,9 +24,7 @@ run(
     // We can only care about SIEM code, we should not be penalyze for others
     if (circularFound.filter(cf => cf.includes('siem')).length !== 0) {
       throw createFailError(
-        'SIEM circular dependencies of imports has been found:' +
-          '\n - ' +
-          circularFound.join('\n - ')
+        `SIEM circular dependencies of imports has been found:\n - ${circularFound.join('\n - ')}`
       );
     } else {
       log.success('No circular deps 👍');
diff --git a/x-pack/legacy/plugins/siem/index.ts b/x-pack/legacy/plugins/siem/index.ts
index cf9fffc6a1455..c5038626fdfc2 100644
--- a/x-pack/legacy/plugins/siem/index.ts
+++ b/x-pack/legacy/plugins/siem/index.ts
@@ -9,7 +9,7 @@ import { resolve } from 'path';
 import { Server } from 'hapi';
 import { Root } from 'joi';
 
-import { PluginInitializerContext } from 'src/core/server';
+import { PluginInitializerContext } from '../../../../src/core/server';
 import { plugin } from './server';
 import { savedObjectMappings } from './server/saved_objects';
 
@@ -43,7 +43,7 @@ export const siem = (kibana: any) => {
         description: i18n.translate('xpack.siem.securityDescription', {
           defaultMessage: 'Explore your SIEM App',
         }),
-        main: 'plugins/siem/app',
+        main: 'plugins/siem/legacy',
         euiIconType: 'securityAnalyticsApp',
         title: APP_NAME,
         listed: false,
diff --git a/x-pack/legacy/plugins/siem/public/app.ts b/x-pack/legacy/plugins/siem/public/app.ts
deleted file mode 100644
index b068f8a9becda..0000000000000
--- a/x-pack/legacy/plugins/siem/public/app.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.
- */
-
-import './apps/index';
diff --git a/x-pack/legacy/plugins/siem/public/app/app.tsx b/x-pack/legacy/plugins/siem/public/app/app.tsx
new file mode 100644
index 0000000000000..5f9199735d8c0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/app/app.tsx
@@ -0,0 +1,110 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createHashHistory, History } from 'history';
+import React, { memo, useMemo, FC } from 'react';
+import { ApolloProvider } from 'react-apollo';
+import { Store } from 'redux';
+import { Provider as ReduxStoreProvider } from 'react-redux';
+import { ThemeProvider } from 'styled-components';
+
+import { EuiErrorBoundary } from '@elastic/eui';
+import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
+import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+import { BehaviorSubject } from 'rxjs';
+import { pluck } from 'rxjs/operators';
+import { I18nContext } from 'ui/i18n';
+
+import { KibanaContextProvider, useUiSetting$ } from '../lib/kibana';
+import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+
+import { DEFAULT_DARK_MODE } from '../../common/constants';
+import { ErrorToastDispatcher } from '../components/error_toast_dispatcher';
+import { compose } from '../lib/compose/kibana_compose';
+import { AppFrontendLibs, AppApolloClient } from '../lib/lib';
+import { CoreStart, StartPlugins } from '../plugin';
+import { PageRouter } from '../routes';
+import { createStore } from '../store';
+import { GlobalToaster, ManageGlobalToaster } from '../components/toasters';
+import { MlCapabilitiesProvider } from '../components/ml/permissions/ml_capabilities_provider';
+
+import { ApolloClientContext } from '../utils/apollo_context';
+
+interface AppPluginRootComponentProps {
+  apolloClient: AppApolloClient;
+  history: History;
+  store: Store;
+  theme: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+}
+
+const AppPluginRootComponent: React.FC<AppPluginRootComponentProps> = ({
+  theme,
+  store,
+  apolloClient,
+  history,
+}) => (
+  <EuiErrorBoundary>
+    <I18nContext>
+      <ManageGlobalToaster>
+        <ReduxStoreProvider store={store}>
+          <ApolloProvider client={apolloClient}>
+            <ApolloClientContext.Provider value={apolloClient}>
+              <ThemeProvider theme={theme}>
+                <MlCapabilitiesProvider>
+                  <PageRouter history={history} />
+                </MlCapabilitiesProvider>
+              </ThemeProvider>
+              <ErrorToastDispatcher />
+              <GlobalToaster />
+            </ApolloClientContext.Provider>
+          </ApolloProvider>
+        </ReduxStoreProvider>
+      </ManageGlobalToaster>
+    </I18nContext>
+  </EuiErrorBoundary>
+);
+
+const AppPluginRoot = memo(AppPluginRootComponent);
+
+const StartAppComponent: FC<AppFrontendLibs> = libs => {
+  const history = createHashHistory();
+  const libs$ = new BehaviorSubject(libs);
+  const store = createStore(undefined, libs$.pipe(pluck('apolloClient')));
+  const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
+  const theme = useMemo(
+    () => ({
+      eui: darkMode ? euiDarkVars : euiLightVars,
+      darkMode,
+    }),
+    [darkMode]
+  );
+
+  return (
+    <AppPluginRoot store={store} apolloClient={libs.apolloClient} history={history} theme={theme} />
+  );
+};
+
+const StartApp = memo(StartAppComponent);
+
+interface SiemAppComponentProps {
+  core: CoreStart;
+  plugins: StartPlugins;
+}
+
+const SiemAppComponent: React.FC<SiemAppComponentProps> = ({ core, plugins }) => (
+  <KibanaContextProvider
+    services={{
+      appName: 'siem',
+      storage: new Storage(localStorage),
+      ...core,
+      ...plugins,
+    }}
+  >
+    <StartApp {...compose()} />
+  </KibanaContextProvider>
+);
+
+export const SiemApp = memo(SiemAppComponent);
diff --git a/x-pack/legacy/plugins/siem/public/app/index.tsx b/x-pack/legacy/plugins/siem/public/app/index.tsx
new file mode 100644
index 0000000000000..01175a98d1e44
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/app/index.tsx
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { render, unmountComponentAtNode } from 'react-dom';
+
+import { CoreStart, StartPlugins, AppMountParameters } from '../plugin';
+import { SiemApp } from './app';
+
+export const renderApp = (
+  core: CoreStart,
+  plugins: StartPlugins,
+  { element }: AppMountParameters
+) => {
+  render(<SiemApp core={core} plugins={plugins} />, element);
+  return () => unmountComponentAtNode(element);
+};
diff --git a/x-pack/legacy/plugins/siem/public/apps/index.ts b/x-pack/legacy/plugins/siem/public/apps/index.ts
deleted file mode 100644
index 73f9b65ba3546..0000000000000
--- a/x-pack/legacy/plugins/siem/public/apps/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.
- */
-
-import chrome from 'ui/chrome';
-import { npStart } from 'ui/new_platform';
-import { Plugin } from './plugin';
-
-new Plugin(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  { opaqueId: Symbol('siem'), env: {} as any, config: { get: () => ({} as any) } },
-  chrome
-).start(npStart.core, npStart.plugins);
diff --git a/x-pack/legacy/plugins/siem/public/apps/plugin.tsx b/x-pack/legacy/plugins/siem/public/apps/plugin.tsx
deleted file mode 100644
index 1f19841788ddb..0000000000000
--- a/x-pack/legacy/plugins/siem/public/apps/plugin.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 { render } from 'react-dom';
-import { LegacyCoreStart, PluginInitializerContext } from 'src/core/public';
-import { PluginsStart } from 'ui/new_platform/new_platform';
-import { Chrome } from 'ui/chrome';
-
-import { SiemApp } from './start_app';
-import template from './template.html';
-
-export const ROOT_ELEMENT_ID = 'react-siem-root';
-
-export class Plugin {
-  constructor(
-    // @ts-ignore this is added to satisfy the New Platform typing constraint,
-    // but we're not leveraging any of its functionality yet.
-    private readonly initializerContext: PluginInitializerContext,
-    private readonly chrome: Chrome
-  ) {
-    this.chrome = chrome;
-  }
-
-  public start(core: LegacyCoreStart, plugins: PluginsStart) {
-    // @ts-ignore improper type description
-    this.chrome.setRootTemplate(template);
-    const checkForRoot = () => {
-      return new Promise(resolve => {
-        const ready = !!document.getElementById(ROOT_ELEMENT_ID);
-        if (ready) {
-          resolve();
-        } else {
-          setTimeout(() => resolve(checkForRoot()), 10);
-        }
-      });
-    };
-    checkForRoot().then(() => {
-      const node = document.getElementById(ROOT_ELEMENT_ID);
-      if (node) {
-        render(<SiemApp core={core} plugins={plugins} />, node);
-      }
-    });
-  }
-}
diff --git a/x-pack/legacy/plugins/siem/public/apps/start_app.tsx b/x-pack/legacy/plugins/siem/public/apps/start_app.tsx
deleted file mode 100644
index 4549db946b815..0000000000000
--- a/x-pack/legacy/plugins/siem/public/apps/start_app.tsx
+++ /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 { createHashHistory } from 'history';
-import React, { memo, FC } from 'react';
-import { ApolloProvider } from 'react-apollo';
-import { Provider as ReduxStoreProvider } from 'react-redux';
-import { ThemeProvider } from 'styled-components';
-import { LegacyCoreStart } from 'kibana/public';
-import { PluginsStart } from 'ui/new_platform/new_platform';
-
-import { EuiErrorBoundary } from '@elastic/eui';
-import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
-import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
-import { BehaviorSubject } from 'rxjs';
-import { pluck } from 'rxjs/operators';
-import { I18nContext } from 'ui/i18n';
-
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
-import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
-
-import { DEFAULT_DARK_MODE } from '../../common/constants';
-import { ErrorToastDispatcher } from '../components/error_toast_dispatcher';
-import { compose } from '../lib/compose/kibana_compose';
-import { AppFrontendLibs } from '../lib/lib';
-import { KibanaCoreContextProvider } from '../lib/compose/kibana_core';
-import { KibanaPluginsContextProvider } from '../lib/compose/kibana_plugins';
-import { useKibanaUiSetting } from '../lib/settings/use_kibana_ui_setting';
-import { PageRouter } from '../routes';
-import { createStore } from '../store';
-import { GlobalToaster, ManageGlobalToaster } from '../components/toasters';
-import { MlCapabilitiesProvider } from '../components/ml/permissions/ml_capabilities_provider';
-
-import { ApolloClientContext } from '../utils/apollo_context';
-
-const StartApp: FC<AppFrontendLibs> = memo(libs => {
-  const history = createHashHistory();
-
-  const libs$ = new BehaviorSubject(libs);
-
-  const store = createStore(undefined, libs$.pipe(pluck('apolloClient')));
-
-  const AppPluginRoot = memo(() => {
-    const [darkMode] = useKibanaUiSetting(DEFAULT_DARK_MODE);
-    return (
-      <EuiErrorBoundary>
-        <I18nContext>
-          <ManageGlobalToaster>
-            <ReduxStoreProvider store={store}>
-              <ApolloProvider client={libs.apolloClient}>
-                <ApolloClientContext.Provider value={libs.apolloClient}>
-                  <ThemeProvider
-                    theme={() => ({
-                      eui: darkMode ? euiDarkVars : euiLightVars,
-                      darkMode,
-                    })}
-                  >
-                    <MlCapabilitiesProvider>
-                      <PageRouter history={history} />
-                    </MlCapabilitiesProvider>
-                  </ThemeProvider>
-                  <ErrorToastDispatcher />
-                  <GlobalToaster />
-                </ApolloClientContext.Provider>
-              </ApolloProvider>
-            </ReduxStoreProvider>
-          </ManageGlobalToaster>
-        </I18nContext>
-      </EuiErrorBoundary>
-    );
-  });
-  return <AppPluginRoot />;
-});
-
-export const ROOT_ELEMENT_ID = 'react-siem-root';
-
-export const SiemApp = memo<{ core: LegacyCoreStart; plugins: PluginsStart }>(
-  ({ core, plugins }) => (
-    <KibanaContextProvider
-      services={{
-        appName: 'siem',
-        data: plugins.data,
-        storage: new Storage(localStorage),
-        ...core,
-      }}
-    >
-      <KibanaCoreContextProvider core={core}>
-        <KibanaPluginsContextProvider plugins={plugins}>
-          <StartApp {...compose()} />
-        </KibanaPluginsContextProvider>
-      </KibanaCoreContextProvider>
-    </KibanaContextProvider>
-  )
-);
diff --git a/x-pack/legacy/plugins/siem/public/apps/template.html b/x-pack/legacy/plugins/siem/public/apps/template.html
deleted file mode 100644
index 9f757b25ccecb..0000000000000
--- a/x-pack/legacy/plugins/siem/public/apps/template.html
+++ /dev/null
@@ -1 +0,0 @@
-<div id="react-siem-root"></div>
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/siem/public/components/alerts_viewer/alerts_table.tsx b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/alerts_table.tsx
new file mode 100644
index 0000000000000..179474ee6e9d4
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/alerts_table.tsx
@@ -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 React, { useMemo } from 'react';
+
+import { esFilters } from '../../../../../../../src/plugins/data/common/es_query';
+import { StatefulEventsViewer } from '../events_viewer';
+import * as i18n from './translations';
+import { alertsDefaultModel } from './default_headers';
+
+export interface OwnProps {
+  end: number;
+  id: string;
+  start: number;
+}
+
+const ALERTS_TABLE_ID = 'timeline-alerts-table';
+const defaultAlertsFilters: esFilters.Filter[] = [
+  {
+    meta: {
+      alias: null,
+      negate: false,
+      disabled: false,
+      type: 'phrase',
+      key: 'event.kind',
+      params: {
+        query: 'alert',
+      },
+    },
+    query: {
+      bool: {
+        filter: [
+          {
+            bool: {
+              should: [
+                {
+                  match: {
+                    'event.kind': 'alert',
+                  },
+                },
+              ],
+              minimum_should_match: 1,
+            },
+          },
+        ],
+      },
+    },
+  },
+];
+
+interface Props {
+  endDate: number;
+  startDate: number;
+  pageFilters?: esFilters.Filter[];
+}
+
+const AlertsTableComponent: React.FC<Props> = ({ endDate, startDate, pageFilters = [] }) => {
+  const alertsFilter = useMemo(() => [...defaultAlertsFilters, ...pageFilters], [pageFilters]);
+  return (
+    <StatefulEventsViewer
+      pageFilters={alertsFilter}
+      defaultModel={alertsDefaultModel}
+      end={endDate}
+      id={ALERTS_TABLE_ID}
+      start={startDate}
+      timelineTypeContext={useMemo(
+        () => ({
+          documentType: i18n.ALERTS_DOCUMENT_TYPE,
+          footerText: i18n.TOTAL_COUNT_OF_ALERTS,
+          title: i18n.ALERTS_TABLE_TITLE,
+        }),
+        []
+      )}
+    />
+  );
+};
+
+export const AlertsTable = React.memo(AlertsTableComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/alerts_viewer/default_headers.ts b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/default_headers.ts
new file mode 100644
index 0000000000000..936d43fff0b48
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/default_headers.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.
+ */
+
+import { ColumnHeader } from '../timeline/body/column_headers/column_header';
+import { defaultColumnHeaderType } from '../timeline/body/column_headers/default_headers';
+import { DEFAULT_COLUMN_MIN_WIDTH, DEFAULT_DATE_COLUMN_MIN_WIDTH } from '../timeline/body/helpers';
+import { timelineDefaults, SubsetTimelineModel } from '../../store/timeline/model';
+
+export const alertsHeaders: ColumnHeader[] = [
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: '@timestamp',
+    width: DEFAULT_DATE_COLUMN_MIN_WIDTH,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'event.module',
+    width: DEFAULT_COLUMN_MIN_WIDTH,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'event.dataset',
+    width: DEFAULT_COLUMN_MIN_WIDTH,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'event.category',
+    width: DEFAULT_COLUMN_MIN_WIDTH,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'event.severity',
+    width: DEFAULT_COLUMN_MIN_WIDTH,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'observer.name',
+    width: DEFAULT_COLUMN_MIN_WIDTH,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'host.name',
+    width: DEFAULT_COLUMN_MIN_WIDTH,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'message',
+    width: DEFAULT_COLUMN_MIN_WIDTH,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'agent.id',
+    width: DEFAULT_COLUMN_MIN_WIDTH,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'agent.type',
+    width: DEFAULT_COLUMN_MIN_WIDTH,
+  },
+];
+
+export const alertsDefaultModel: SubsetTimelineModel = {
+  ...timelineDefaults,
+  columns: alertsHeaders,
+  showRowRenderers: false,
+};
diff --git a/x-pack/legacy/plugins/siem/public/components/alerts_viewer/index.tsx b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/index.tsx
new file mode 100644
index 0000000000000..c8f1bb2278917
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/index.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 { noop } from 'lodash/fp';
+import React from 'react';
+
+import { EuiSpacer } from '@elastic/eui';
+import { manageQuery } from '../page/manage_query';
+import { AlertsOverTimeHistogram } from '../page/hosts/alerts_over_time';
+import { AlertsComponentsQueryProps } from './types';
+import { AlertsOverTimeQuery } from '../../containers/alerts/alerts_over_time';
+import { hostsModel } from '../../store/model';
+import { AlertsTable } from './alerts_table';
+
+const AlertsOverTimeManage = manageQuery(AlertsOverTimeHistogram);
+export const AlertsView = ({
+  defaultFilters,
+  deleteQuery,
+  endDate,
+  filterQuery,
+  pageFilters,
+  skip,
+  setQuery,
+  startDate,
+  type,
+  updateDateRange = noop,
+}: AlertsComponentsQueryProps) => (
+  <>
+    <AlertsOverTimeQuery
+      endDate={endDate}
+      filterQuery={filterQuery}
+      sourceId="default"
+      startDate={startDate}
+      type={hostsModel.HostsType.page}
+    >
+      {({ alertsOverTime, loading, id, inspect, refetch, totalCount }) => (
+        <AlertsOverTimeManage
+          data={alertsOverTime!}
+          endDate={endDate}
+          id={id}
+          inspect={inspect}
+          loading={loading}
+          refetch={refetch}
+          setQuery={setQuery}
+          startDate={startDate}
+          totalCount={totalCount}
+          updateDateRange={updateDateRange}
+        />
+      )}
+    </AlertsOverTimeQuery>
+    <EuiSpacer size="l" />
+    <AlertsTable endDate={endDate} startDate={startDate} pageFilters={pageFilters} />
+  </>
+);
+
+AlertsView.displayName = 'AlertsView';
diff --git a/x-pack/legacy/plugins/siem/public/components/alerts_viewer/translations.ts b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/translations.ts
new file mode 100644
index 0000000000000..987665c9413e3
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/translations.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const ALERTS_DOCUMENT_TYPE = i18n.translate('xpack.siem.hosts.alertsDocumentType', {
+  defaultMessage: 'Alerts',
+});
+
+export const TOTAL_COUNT_OF_ALERTS = i18n.translate('xpack.siem.hosts.totalCountOfAlerts', {
+  defaultMessage: 'alerts match the search criteria',
+});
+
+export const ALERTS_TABLE_TITLE = i18n.translate('xpack.siem.hosts.alertsDocumentType', {
+  defaultMessage: 'Alerts',
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/alerts_viewer/types.ts b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/types.ts
new file mode 100644
index 0000000000000..8a17c1102e776
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/alerts_viewer/types.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 { esFilters } from '../../../../../../../src/plugins/data/common';
+import { HostsComponentsQueryProps } from '../../pages/hosts/navigation/types';
+import { NetworkComponentQueryProps } from '../../pages/network/navigation/types';
+
+type CommonQueryProps = HostsComponentsQueryProps | NetworkComponentQueryProps;
+export interface AlertsComponentsQueryProps
+  extends Pick<
+    CommonQueryProps,
+    | 'deleteQuery'
+    | 'endDate'
+    | 'filterQuery'
+    | 'skip'
+    | 'setQuery'
+    | 'startDate'
+    | 'type'
+    | 'updateDateRange'
+  > {
+  pageFilters: esFilters.Filter[];
+  defaultFilters?: esFilters.Filter[];
+}
diff --git a/x-pack/legacy/plugins/siem/public/components/and_or_badge/index.tsx b/x-pack/legacy/plugins/siem/public/components/and_or_badge/index.tsx
index be449e3d422d9..2fb270c284000 100644
--- a/x-pack/legacy/plugins/siem/public/components/and_or_badge/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/and_or_badge/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiBadge } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import * as i18n from './translations';
diff --git a/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx
index 10d3c899562e8..5404a1ac43844 100644
--- a/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/arrows/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock';
 
@@ -20,7 +19,7 @@ describe('arrows', () => {
           <ArrowBody height={3} />
         </TestProviders>
       );
-      expect(toJson(wrapper.find('ArrowBody'))).toMatchSnapshot();
+      expect(wrapper.find('ArrowBody')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/arrows/index.tsx b/x-pack/legacy/plugins/siem/public/components/arrows/index.tsx
index dfc7645c564d2..97b5eb04ac7bb 100644
--- a/x-pack/legacy/plugins/siem/public/components/arrows/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/arrows/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiIcon } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 /** Renders the body (non-pointy part) of an arrow */
diff --git a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
index 77a7296e368cf..27e87d25e286f 100644
--- a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
@@ -7,9 +7,8 @@
 import { EuiFieldSearch } from '@elastic/eui';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { AutocompleteSuggestion } from '../../../../../../../src/plugins/data/public';
 
@@ -117,7 +116,7 @@ describe('Autocomplete', () => {
           value={''}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it is rendering with placeholder', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/bytes/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/bytes/index.test.tsx
index 2321b06c07cc0..d99a909efad10 100644
--- a/x-pack/legacy/plugins/siem/public/components/bytes/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/bytes/index.test.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 { TestProviders } from '../../mock';
 import { PreferenceFormattedBytes } from '../formatted_bytes';
@@ -12,8 +12,6 @@ import { useMountAppended } from '../../utils/use_mount_appended';
 
 import { Bytes } from '.';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('Bytes', () => {
   const mount = useMountAppended();
 
diff --git a/x-pack/legacy/plugins/siem/public/components/bytes/index.tsx b/x-pack/legacy/plugins/siem/public/components/bytes/index.tsx
index fbe83623211b1..94c6ecba68be5 100644
--- a/x-pack/legacy/plugins/siem/public/components/bytes/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/bytes/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 { DefaultDraggable } from '../draggables';
 import { PreferenceFormattedBytes } from '../formatted_bytes';
diff --git a/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.test.tsx
index b0c165fedfffc..9cd0af062c54a 100644
--- a/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.test.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 { TestProviders } from '../../mock';
 import { useMountAppended } from '../../utils/use_mount_appended';
diff --git a/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.tsx b/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.tsx
index f8db7d754aab1..181d92dce06f9 100644
--- a/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/certificate_fingerprint/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DraggableBadge } from '../draggables';
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/areachart.test.tsx b/x-pack/legacy/plugins/siem/public/components/charts/areachart.test.tsx
index 25bd2a9d56059..ac283790671d3 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/areachart.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/areachart.test.tsx
@@ -5,12 +5,14 @@
  */
 
 import { ShallowWrapper, shallow } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { AreaChartBaseComponent, AreaChartComponent } from './areachart';
 import { ChartSeriesData } from './common';
 import { ScaleType, AreaSeries, Axis } from '@elastic/charts';
 
+jest.mock('../../lib/kibana');
+
 const customHeight = '100px';
 const customWidth = '120px';
 const chartDataSets = [
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx b/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
index c644d148cc1c3..71f22efadc6ed 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
@@ -9,8 +9,6 @@ import {
   Axis,
   AreaSeries,
   Chart,
-  getAxisId,
-  getSpecId,
   Position,
   ScaleType,
   Settings,
@@ -20,15 +18,15 @@ import {
 import { getOr, get, isNull, isNumber } from 'lodash/fp';
 import { AutoSizer } from '../auto_sizer';
 import { ChartPlaceHolder } from './chart_place_holder';
+import { useTimeZone } from '../../hooks';
 import {
-  browserTimezone,
   chartDefaultSettings,
   ChartSeriesConfigs,
   ChartSeriesData,
   getChartHeight,
   getChartWidth,
-  getSeriesStyle,
   WrappedByAutoSizer,
+  useTheme,
 } from './common';
 
 // custom series styles: https://ela.st/areachart-styling
@@ -72,12 +70,15 @@ export const AreaChartBaseComponent = ({
   height: string | null | undefined;
   configs?: ChartSeriesConfigs | undefined;
 }) => {
+  const theme = useTheme();
+  const timeZone = useTimeZone();
   const xTickFormatter = get('configs.axis.xTickFormatter', chartConfigs);
   const yTickFormatter = get('configs.axis.yTickFormatter', chartConfigs);
-  const xAxisId = getAxisId(`group-${data[0].key}-x`);
-  const yAxisId = getAxisId(`group-${data[0].key}-y`);
+  const xAxisId = `group-${data[0].key}-x`;
+  const yAxisId = `group-${data[0].key}-y`;
   const settings = {
     ...chartDefaultSettings,
+    theme,
     ...get('configs.settings', chartConfigs),
   };
   return chartConfigs.width && chartConfigs.height ? (
@@ -86,20 +87,19 @@ export const AreaChartBaseComponent = ({
         <Settings {...settings} />
         {data.map(series => {
           const seriesKey = series.key;
-          const seriesSpecId = getSpecId(seriesKey);
           return checkIfAllTheDataInTheSeriesAreValid(series) ? (
             <AreaSeries
-              id={seriesSpecId}
+              id={seriesKey}
               key={seriesKey}
               name={series.key.replace('Histogram', '')}
-              data={series.value || undefined}
+              data={series.value || []}
               xScaleType={getOr(ScaleType.Linear, 'configs.series.xScaleType', chartConfigs)}
               yScaleType={getOr(ScaleType.Linear, 'configs.series.yScaleType', chartConfigs)}
-              timeZone={browserTimezone}
+              timeZone={timeZone}
               xAccessor="x"
               yAccessors={['y']}
               areaSeriesStyle={getSeriesLineStyle()}
-              customSeriesColors={getSeriesStyle(seriesKey, series.color)}
+              customSeriesColors={series.color ? [series.color] : undefined}
             />
           ) : null;
         })}
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx b/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx
index e28d330d31ba9..ac9c4d591232a 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/barchart.test.tsx
@@ -5,12 +5,14 @@
  */
 
 import { shallow, ShallowWrapper } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { BarChartBaseComponent, BarChartComponent } from './barchart';
 import { ChartSeriesData } from './common';
 import { BarSeries, ScaleType, Axis } from '@elastic/charts';
 
+jest.mock('../../lib/kibana');
+
 const customHeight = '100px';
 const customWidth = '120px';
 const chartDataSets = [
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx b/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
index 99ad995e48852..415cbeb7c2440 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
@@ -5,30 +5,20 @@
  */
 
 import React from 'react';
-import {
-  Chart,
-  BarSeries,
-  Axis,
-  Position,
-  getAxisId,
-  getSpecId,
-  ScaleType,
-  Settings,
-} from '@elastic/charts';
+import { Chart, BarSeries, Axis, Position, ScaleType, Settings } from '@elastic/charts';
 import { getOr, get, isNumber } from 'lodash/fp';
+import { useTimeZone } from '../../hooks';
 import { AutoSizer } from '../auto_sizer';
 import { ChartPlaceHolder } from './chart_place_holder';
 import {
-  browserTimezone,
   chartDefaultSettings,
   ChartSeriesConfigs,
   ChartSeriesData,
   checkIfAllValuesAreZero,
-  getSeriesStyle,
   getChartHeight,
   getChartWidth,
-  SeriesType,
   WrappedByAutoSizer,
+  useTheme,
 } from './common';
 
 const checkIfAllTheDataInTheSeriesAreValid = (series: ChartSeriesData): series is ChartSeriesData =>
@@ -53,13 +43,16 @@ export const BarChartBaseComponent = ({
   height: string | null | undefined;
   configs?: ChartSeriesConfigs | undefined;
 }) => {
+  const theme = useTheme();
+  const timeZone = useTimeZone();
   const xTickFormatter = get('configs.axis.xTickFormatter', chartConfigs);
   const yTickFormatter = get('configs.axis.yTickFormatter', chartConfigs);
   const tickSize = getOr(0, 'configs.axis.tickSize', chartConfigs);
-  const xAxisId = getAxisId(`stat-items-barchart-${data[0].key}-x`);
-  const yAxisId = getAxisId(`stat-items-barchart-${data[0].key}-y`);
+  const xAxisId = `stat-items-barchart-${data[0].key}-x`;
+  const yAxisId = `stat-items-barchart-${data[0].key}-y`;
   const settings = {
     ...chartDefaultSettings,
+    theme,
     ...get('configs.settings', chartConfigs),
   };
 
@@ -68,22 +61,20 @@ export const BarChartBaseComponent = ({
       <Settings {...settings} />
       {data.map(series => {
         const barSeriesKey = series.key;
-        const barSeriesSpecId = getSpecId(barSeriesKey);
-        const seriesType = SeriesType.BAR;
         return checkIfAllTheDataInTheSeriesAreValid ? (
           <BarSeries
-            id={barSeriesSpecId}
+            id={barSeriesKey}
             key={barSeriesKey}
             name={series.key}
             xScaleType={getOr(ScaleType.Linear, 'configs.series.xScaleType', chartConfigs)}
             yScaleType={getOr(ScaleType.Linear, 'configs.series.yScaleType', chartConfigs)}
             xAccessor="x"
             yAccessors={['y']}
-            timeZone={browserTimezone}
+            timeZone={timeZone}
             splitSeriesAccessors={['g']}
             data={series.value!}
             stackAccessors={get('configs.series.stackAccessors', chartConfigs)}
-            customSeriesColors={getSeriesStyle(barSeriesKey, series.color, seriesType)}
+            customSeriesColors={series.color ? [series.color] : undefined}
           />
         ) : null;
       })}
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/common.test.tsx b/x-pack/legacy/plugins/siem/public/components/charts/common.test.tsx
index 0bb4da69a978a..3748a2505c115 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/common.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/common.test.tsx
@@ -5,23 +5,25 @@
  */
 import { shallow } from 'enzyme';
 import React from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+
+import { useUiSetting } from '../../lib/kibana';
 import {
   checkIfAllValuesAreZero,
   defaultChartHeight,
   getChartHeight,
   getChartWidth,
-  getSeriesStyle,
-  getTheme,
-  SeriesType,
   WrappedByAutoSizer,
   ChartSeriesData,
+  useTheme,
 } from './common';
-import { mergeWithDefaultTheme, LIGHT_THEME } from '@elastic/charts';
+
+jest.mock('../../lib/kibana');
 
 jest.mock('@elastic/charts', () => {
   return {
+    ...jest.requireActual('@elastic/charts'),
     getSpecId: jest.fn(() => {}),
-    mergeWithDefaultTheme: jest.fn(),
   };
 });
 
@@ -37,41 +39,6 @@ describe('WrappedByAutoSizer', () => {
   });
 });
 
-describe('getSeriesStyle', () => {
-  it('should not create style mapping if color is not given', () => {
-    const mockSeriesKey = 'mockSeriesKey';
-    const color = '';
-    const customSeriesColors = getSeriesStyle(mockSeriesKey, color, SeriesType.BAR);
-    expect(customSeriesColors).toBeUndefined();
-  });
-
-  it('should create correct style mapping for series of a chart', () => {
-    const mockSeriesKey = 'mockSeriesKey';
-    const color = 'red';
-    const customSeriesColors = getSeriesStyle(mockSeriesKey, color, SeriesType.BAR);
-    const expectedKey = { colorValues: [mockSeriesKey] };
-    customSeriesColors!.forEach((value, key) => {
-      expect(JSON.stringify(key)).toEqual(JSON.stringify(expectedKey));
-      expect(value).toEqual(color);
-    });
-  });
-});
-
-describe('getTheme', () => {
-  it('should merge custom theme with default theme', () => {
-    const defaultTheme = {
-      chartMargins: { bottom: 0, left: 0, right: 0, top: 4 },
-      chartPaddings: { bottom: 0, left: 0, right: 0, top: 0 },
-      scales: {
-        barsPadding: 0.05,
-      },
-    };
-    getTheme();
-    expect((mergeWithDefaultTheme as jest.Mock).mock.calls[0][0]).toMatchObject(defaultTheme);
-    expect((mergeWithDefaultTheme as jest.Mock).mock.calls[0][1]).toEqual(LIGHT_THEME);
-  });
-});
-
 describe('getChartHeight', () => {
   it('should render customHeight', () => {
     const height = getChartHeight(10, 100);
@@ -197,4 +164,23 @@ describe('checkIfAllValuesAreZero', () => {
       expect(result).toBeTruthy();
     });
   });
+
+  describe('useTheme', () => {
+    it('merges our spacing with the default theme', () => {
+      const { result } = renderHook(() => useTheme());
+
+      expect(result.current).toEqual(
+        expect.objectContaining({ chartMargins: expect.objectContaining({ top: 4, bottom: 0 }) })
+      );
+    });
+
+    it('returns a different theme depending on user settings', () => {
+      const { result: defaultResult } = renderHook(() => useTheme());
+      (useUiSetting as jest.Mock).mockImplementation(() => true);
+
+      const { result: darkResult } = renderHook(() => useTheme());
+
+      expect(defaultResult.current).not.toMatchObject(darkResult.current);
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/common.tsx b/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
index 7ac91437920e5..78cce72f0a0d3 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
@@ -4,24 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import chrome from 'ui/chrome';
 import {
-  CustomSeriesColorsMap,
   DARK_THEME,
-  DataSeriesColorsValues,
-  getSpecId,
   LIGHT_THEME,
   mergeWithDefaultTheme,
   PartialTheme,
   Rendering,
   Rotation,
   ScaleType,
-  SettingSpecProps,
+  SettingsSpecProps,
   TickFormatter,
 } from '@elastic/charts';
-import moment from 'moment-timezone';
 import styled from 'styled-components';
-import { DEFAULT_DATE_FORMAT_TZ, DEFAULT_DARK_MODE } from '../../../common/constants';
+import { useUiSetting } from '../../lib/kibana';
+import { DEFAULT_DARK_MODE } from '../../../common/constants';
 
 export const defaultChartHeight = '100%';
 export const defaultChartWidth = '100%';
@@ -47,7 +43,7 @@ export interface ChartSeriesConfigs {
     xTickFormatter?: TickFormatter | undefined;
     yTickFormatter?: TickFormatter | undefined;
   };
-  settings?: Partial<SettingSpecProps>;
+  settings?: Partial<SettingsSpecProps>;
 }
 
 export interface ChartSeriesData {
@@ -76,46 +72,29 @@ export enum SeriesType {
   LINE = 'line',
 }
 
-// Customize colors: https://ela.st/custom-colors
-export const getSeriesStyle = (
-  seriesKey: string,
-  color: string | undefined,
-  seriesType?: SeriesType
-) => {
-  if (!color) return undefined;
-  const customSeriesColors: CustomSeriesColorsMap = new Map();
-  const dataSeriesColorValues: DataSeriesColorsValues = {
-    colorValues: seriesType === SeriesType.BAR ? [seriesKey] : [],
-    specId: getSpecId(seriesKey),
-  };
-
-  customSeriesColors.set(dataSeriesColorValues, color);
-
-  return customSeriesColors;
-};
-
 // Apply margins and paddings: https://ela.st/charts-spacing
-export const getTheme = () => {
-  const theme: PartialTheme = {
-    chartMargins: {
-      left: 0,
-      right: 0,
-      // Apply some paddings to the top to avoid chopping the y tick https://ela.st/chopping-edge
-      top: 4,
-      bottom: 0,
-    },
-    chartPaddings: {
-      left: 0,
-      right: 0,
-      top: 0,
-      bottom: 0,
-    },
-    scales: {
-      barsPadding: 0.05,
-    },
-  };
-  const isDarkMode: boolean = chrome.getUiSettingsClient().get(DEFAULT_DARK_MODE);
+const theme: PartialTheme = {
+  chartMargins: {
+    left: 0,
+    right: 0,
+    // Apply some paddings to the top to avoid chopping the y tick https://ela.st/chopping-edge
+    top: 4,
+    bottom: 0,
+  },
+  chartPaddings: {
+    left: 0,
+    right: 0,
+    top: 0,
+    bottom: 0,
+  },
+  scales: {
+    barsPadding: 0.05,
+  },
+};
+export const useTheme = () => {
+  const isDarkMode = useUiSetting<boolean>(DEFAULT_DARK_MODE);
   const defaultTheme = isDarkMode ? DARK_THEME : LIGHT_THEME;
+
   return mergeWithDefaultTheme(theme, defaultTheme);
 };
 
@@ -126,12 +105,8 @@ export const chartDefaultSettings = {
   showLegend: false,
   showLegendDisplayValue: false,
   debug: false,
-  theme: getTheme(),
 };
 
-const kibanaTimezone: string = chrome.getUiSettingsClient().get(DEFAULT_DATE_FORMAT_TZ);
-export const browserTimezone = kibanaTimezone === 'Browser' ? moment.tz.guess() : kibanaTimezone;
-
 export const getChartHeight = (customHeight?: number, autoSizerHeight?: number): string => {
   const height = customHeight || autoSizerHeight;
   return height ? `${height}px` : defaultChartHeight;
diff --git a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar.test.tsx b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar.test.tsx
index 68522377bd847..eae0fc4ff422b 100644
--- a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar.test.tsx
@@ -6,10 +6,8 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
-import '../../../mock/ui_settings';
 import { TestProviders } from '../../../mock';
 import {
   UtilityBar,
@@ -19,8 +17,6 @@ import {
   UtilityBarText,
 } from './index';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
-
 describe('UtilityBar', () => {
   test('it renders', () => {
     const wrapper = shallow(
@@ -47,7 +43,7 @@ describe('UtilityBar', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('UtilityBar'))).toMatchSnapshot();
+    expect(wrapper.find('UtilityBar')).toMatchSnapshot();
   });
 
   test('it applies border styles when border is true', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_action.test.tsx b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_action.test.tsx
index 7921c1ef42200..2a8a71955a986 100644
--- a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_action.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_action.test.tsx
@@ -5,15 +5,11 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
-import '../../../mock/ui_settings';
 import { TestProviders } from '../../../mock';
 import { UtilityBarAction } from './index';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
-
 describe('UtilityBarAction', () => {
   test('it renders', () => {
     const wrapper = shallow(
@@ -22,7 +18,7 @@ describe('UtilityBarAction', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('UtilityBarAction'))).toMatchSnapshot();
+    expect(wrapper.find('UtilityBarAction')).toMatchSnapshot();
   });
 
   test('it renders a popover', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_group.test.tsx b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_group.test.tsx
index 294d27fa95b3d..e18e7d5e0b524 100644
--- a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_group.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_group.test.tsx
@@ -5,15 +5,11 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
-import '../../../mock/ui_settings';
 import { TestProviders } from '../../../mock';
 import { UtilityBarGroup, UtilityBarText } from './index';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
-
 describe('UtilityBarGroup', () => {
   test('it renders', () => {
     const wrapper = shallow(
@@ -24,6 +20,6 @@ describe('UtilityBarGroup', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('UtilityBarGroup'))).toMatchSnapshot();
+    expect(wrapper.find('UtilityBarGroup')).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_section.test.tsx b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_section.test.tsx
index e0e0acc3a71c9..f849fa4b4ee46 100644
--- a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_section.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_section.test.tsx
@@ -5,15 +5,11 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
-import '../../../mock/ui_settings';
 import { TestProviders } from '../../../mock';
 import { UtilityBarGroup, UtilityBarSection, UtilityBarText } from './index';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
-
 describe('UtilityBarSection', () => {
   test('it renders', () => {
     const wrapper = shallow(
@@ -26,6 +22,6 @@ describe('UtilityBarSection', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('UtilityBarSection'))).toMatchSnapshot();
+    expect(wrapper.find('UtilityBarSection')).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_text.test.tsx b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_text.test.tsx
index 29e1844bb2d4f..230dd80b1a86b 100644
--- a/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_text.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/detection_engine/utility_bar/utility_bar_text.test.tsx
@@ -5,15 +5,11 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
-import '../../../mock/ui_settings';
 import { TestProviders } from '../../../mock';
 import { UtilityBarText } from './index';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
-
 describe('UtilityBarText', () => {
   test('it renders', () => {
     const wrapper = shallow(
@@ -22,6 +18,6 @@ describe('UtilityBarText', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('UtilityBarText'))).toMatchSnapshot();
+    expect(wrapper.find('UtilityBarText')).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/direction/index.tsx b/x-pack/legacy/plugins/siem/public/components/direction/index.tsx
index 9295e055f918d..ad1e63dbd7e6a 100644
--- a/x-pack/legacy/plugins/siem/public/components/direction/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/direction/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 { NetworkDirectionEcs } from '../../graphql/types';
 import { DraggableBadge } from '../draggables';
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx
index 1a8af9d99193a..9e8bde8d9ff92 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import { mockBrowserFields, mocksSource } from '../../containers/source/mock';
@@ -28,7 +27,7 @@ describe('DragDropContextWrapper', () => {
           </MockedProvider>
         </TestProviders>
       );
-      expect(toJson(wrapper.find('DragDropContextWrapper'))).toMatchSnapshot();
+      expect(wrapper.find('DragDropContextWrapper')).toMatchSnapshot();
     });
 
     test('it renders the children', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
index 4b546bca1f72e..e846c923c5cbe 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import { mockBrowserFields, mocksSource } from '../../containers/source/mock';
@@ -33,7 +32,7 @@ describe('DraggableWrapper', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('DraggableWrapper'))).toMatchSnapshot();
+      expect(wrapper.find('DraggableWrapper')).toMatchSnapshot();
     });
 
     test('it renders the children passed to the render prop', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx
index 809c46f7b53bb..9672097713a9b 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx
@@ -13,15 +13,15 @@ import {
   Droppable,
 } from 'react-beautiful-dnd';
 import { connect } from 'react-redux';
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
 import { ActionCreator } from 'typescript-fsa';
 
 import { EuiPortal } from '@elastic/eui';
 import { dragAndDropActions } from '../../store/drag_and_drop';
 import { DataProvider } from '../timeline/data_providers/data_provider';
-import { STATEFUL_EVENT_CSS_CLASS_NAME } from '../timeline/helpers';
 import { TruncatableText } from '../truncatable_text';
 import { getDraggableId, getDroppableId } from './helpers';
+import { ProviderContainer } from './provider_container';
 
 // As right now, we do not know what we want there, we will keep it as a placeholder
 export const DragEffects = styled.div``;
@@ -42,143 +42,12 @@ const Wrapper = styled.div`
 
 Wrapper.displayName = 'Wrapper';
 
-const ProviderContainer = styled.div<{ isDragging: boolean }>`
-  &,
-  &::before,
-  &::after {
-    transition: background ${({ theme }) => theme.eui.euiAnimSpeedFast} ease,
-      color ${({ theme }) => theme.eui.euiAnimSpeedFast} ease;
+const ProviderContentWrapper = styled.span`
+  > span.euiToolTipAnchor {
+    display: block; /* allow EuiTooltip content to be truncatable */
   }
-
-  ${({ isDragging }) =>
-    !isDragging &&
-    css`
-      & {
-        border-radius: 2px;
-        padding: 0 4px 0 8px;
-        position: relative;
-        z-index: ${({ theme }) => theme.eui.euiZLevel0} !important;
-
-        &::before {
-          background-image: linear-gradient(
-              135deg,
-              ${({ theme }) => theme.eui.euiColorMediumShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              -135deg,
-              ${({ theme }) => theme.eui.euiColorMediumShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorMediumShade} 75%
-            ),
-            linear-gradient(
-              -135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorMediumShade} 75%
-            );
-          background-position: 0 0, 1px 0, 1px -1px, 0px 1px;
-          background-size: 2px 2px;
-          bottom: 2px;
-          content: '';
-          display: block;
-          left: 2px;
-          position: absolute;
-          top: 2px;
-          width: 4px;
-        }
-      }
-
-      &:hover {
-        &,
-        & .euiBadge,
-        & .euiBadge__text {
-          cursor: move; //Fallback for IE11
-          cursor: grab;
-        }
-      }
-
-      .${STATEFUL_EVENT_CSS_CLASS_NAME}:hover &,
-      tr:hover & {
-        background-color: ${({ theme }) => theme.eui.euiColorLightShade};
-
-        &::before {
-          background-image: linear-gradient(
-              135deg,
-              ${({ theme }) => theme.eui.euiColorDarkShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              -135deg,
-              ${({ theme }) => theme.eui.euiColorDarkShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorDarkShade} 75%
-            ),
-            linear-gradient(
-              -135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorDarkShade} 75%
-            );
-        }
-      }
-
-      &:hover,
-      &:focus,
-      .${STATEFUL_EVENT_CSS_CLASS_NAME}:hover &:hover,
-      .${STATEFUL_EVENT_CSS_CLASS_NAME}:focus &:focus,
-      tr:hover &:hover,
-      tr:hover &:focus {
-        background-color: ${({ theme }) => theme.eui.euiColorPrimary};
-
-        &,
-        & a,
-        & a:hover {
-          color: ${({ theme }) => theme.eui.euiColorEmptyShade};
-        }
-
-        &::before {
-          background-image: linear-gradient(
-              135deg,
-              ${({ theme }) => theme.eui.euiColorEmptyShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              -135deg,
-              ${({ theme }) => theme.eui.euiColorEmptyShade} 25%,
-              transparent 25%
-            ),
-            linear-gradient(
-              135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorEmptyShade} 75%
-            ),
-            linear-gradient(
-              -135deg,
-              transparent 75%,
-              ${({ theme }) => theme.eui.euiColorEmptyShade} 75%
-            );
-        }
-      }
-    `}
-
-  ${({ isDragging }) =>
-    isDragging &&
-    css`
-      & {
-        z-index: 9999 !important;
-      }
-    `}
 `;
 
-ProviderContainer.displayName = 'ProviderContainer';
-
 interface OwnProps {
   dataProvider: DataProvider;
   inline?: boolean;
@@ -244,9 +113,11 @@ const DraggableWrapperComponent = React.memo<Props>(
                           {render(dataProvider, provided, snapshot)}
                         </TruncatableText>
                       ) : (
-                        <span data-test-subj={`draggable-content-${dataProvider.queryMatch.field}`}>
+                        <ProviderContentWrapper
+                          data-test-subj={`draggable-content-${dataProvider.queryMatch.field}`}
+                        >
                           {render(dataProvider, provided, snapshot)}
-                        </span>
+                        </ProviderContentWrapper>
                       )}
                     </ProviderContainer>
                   </ConditionalPortal>
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx
index 056669673bb9e..bd2f01721290f 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import { mockBrowserFields, mocksSource } from '../../containers/source/mock';
@@ -33,7 +32,7 @@ describe('DroppableWrapper', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('DroppableWrapper'))).toMatchSnapshot();
+      expect(wrapper.find('DroppableWrapper')).toMatchSnapshot();
     });
 
     test('it renders the children when a render prop is not provided', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.tsx
index 2b013a665af16..821ef9be10e8d 100644
--- a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/droppable_wrapper.tsx
@@ -5,7 +5,7 @@
  */
 
 import { rgba } from 'polished';
-import * as React from 'react';
+import React from 'react';
 import { Droppable } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 
@@ -49,7 +49,7 @@ const ReactDndDropTarget = styled.div<{ isDraggingOver: boolean; height: string
   > div.timeline-drop-area {
     background-color: ${rgba(props.theme.eui.euiColorSuccess, 0.2)};
     .provider-item-filter-container div:first-child{
-      // Override dragNdrop beautiful so we do not have our droppable moving around for no good reason
+      /* Override dragNdrop beautiful so we do not have our droppable moving around for no good reason */
       transform: none !important;
     }
     .drop-and-provider-timeline {
@@ -68,7 +68,7 @@ const ReactDndDropTarget = styled.div<{ isDraggingOver: boolean; height: string
       background-color: ${props.theme.eui.euiColorLightShade};
     }
     + div {
-      // Override dragNdrop beautiful so we do not have our droppable moving around for no good reason
+      /* Override dragNdrop beautiful so we do not have our droppable moving around for no good reason */
       display: none !important;
     }
   }
@@ -79,7 +79,7 @@ const ReactDndDropTarget = styled.div<{ isDraggingOver: boolean; height: string
       display: none;
     }
     & + div {
-      // Override dragNdrop beautiful so we do not have our droppable moving around for no good reason
+      /* Override dragNdrop beautiful so we do not have our droppable moving around for no good reason */
       display: none !important;
     }
   }
diff --git a/x-pack/legacy/plugins/siem/public/components/drag_and_drop/provider_container.tsx b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/provider_container.tsx
new file mode 100644
index 0000000000000..c1f029086aa35
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/drag_and_drop/provider_container.tsx
@@ -0,0 +1,154 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import styled, { css } from 'styled-components';
+import { STATEFUL_EVENT_CSS_CLASS_NAME } from '../timeline/helpers';
+
+interface ProviderContainerProps {
+  isDragging: boolean;
+}
+
+const ProviderContainerComponent = styled.div<ProviderContainerProps>`
+  &,
+  &::before,
+  &::after {
+    transition: background ${({ theme }) => theme.eui.euiAnimSpeedFast} ease,
+      color ${({ theme }) => theme.eui.euiAnimSpeedFast} ease;
+  }
+
+  ${({ isDragging }) =>
+    !isDragging &&
+    css`
+      & {
+        border-radius: 2px;
+        padding: 0 4px 0 8px;
+        position: relative;
+        z-index: ${({ theme }) => theme.eui.euiZLevel0} !important;
+
+        &::before {
+          background-image: linear-gradient(
+              135deg,
+              ${({ theme }) => theme.eui.euiColorMediumShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              -135deg,
+              ${({ theme }) => theme.eui.euiColorMediumShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorMediumShade} 75%
+            ),
+            linear-gradient(
+              -135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorMediumShade} 75%
+            );
+          background-position: 0 0, 1px 0, 1px -1px, 0px 1px;
+          background-size: 2px 2px;
+          bottom: 2px;
+          content: '';
+          display: block;
+          left: 2px;
+          position: absolute;
+          top: 2px;
+          width: 4px;
+        }
+      }
+
+      &:hover {
+        &,
+        & .euiBadge,
+        & .euiBadge__text {
+          cursor: move; /* Fallback for IE11 */
+          cursor: grab;
+        }
+      }
+
+      .${STATEFUL_EVENT_CSS_CLASS_NAME}:hover &,
+      tr:hover & {
+        background-color: ${({ theme }) => theme.eui.euiColorLightShade};
+
+        &::before {
+          background-image: linear-gradient(
+              135deg,
+              ${({ theme }) => theme.eui.euiColorDarkShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              -135deg,
+              ${({ theme }) => theme.eui.euiColorDarkShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorDarkShade} 75%
+            ),
+            linear-gradient(
+              -135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorDarkShade} 75%
+            );
+        }
+      }
+
+      &:hover,
+      &:focus,
+      .${STATEFUL_EVENT_CSS_CLASS_NAME}:hover &:hover,
+      .${STATEFUL_EVENT_CSS_CLASS_NAME}:focus &:focus,
+      tr:hover &:hover,
+      tr:hover &:focus {
+        background-color: ${({ theme }) => theme.eui.euiColorPrimary};
+
+        &,
+        & a,
+        & a:hover {
+          color: ${({ theme }) => theme.eui.euiColorEmptyShade};
+        }
+
+        &::before {
+          background-image: linear-gradient(
+              135deg,
+              ${({ theme }) => theme.eui.euiColorEmptyShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              -135deg,
+              ${({ theme }) => theme.eui.euiColorEmptyShade} 25%,
+              transparent 25%
+            ),
+            linear-gradient(
+              135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorEmptyShade} 75%
+            ),
+            linear-gradient(
+              -135deg,
+              transparent 75%,
+              ${({ theme }) => theme.eui.euiColorEmptyShade} 75%
+            );
+        }
+      }
+    `}
+
+  ${({ isDragging }) =>
+    isDragging &&
+    css`
+      & {
+        z-index: 9999 !important;
+      }
+    `}
+`;
+
+ProviderContainerComponent.displayName = 'ProviderContainerComponent';
+
+export const ProviderContainer = React.memo(ProviderContainerComponent);
+
+ProviderContainer.displayName = 'ProviderContainer';
diff --git a/x-pack/legacy/plugins/siem/public/components/draggables/field_badge/index.tsx b/x-pack/legacy/plugins/siem/public/components/draggables/field_badge/index.tsx
index 90d8ad463b476..ba0d53210bace 100644
--- a/x-pack/legacy/plugins/siem/public/components/draggables/field_badge/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/draggables/field_badge/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { rgba } from 'polished';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 const Field = styled.div`
diff --git a/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx
index f1ed533bef545..76335e3c72306 100644
--- a/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/draggables/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock';
 import { getEmptyString } from '../empty_value';
@@ -34,7 +33,7 @@ describe('draggables', () => {
           <span>{'A child of this'}</span>
         </DefaultDraggable>
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the default Badge', () => {
@@ -50,7 +49,7 @@ describe('draggables', () => {
           <span>{'A child of this'}</span>
         </DraggableBadge>
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/draggables/index.tsx b/x-pack/legacy/plugins/siem/public/components/draggables/index.tsx
index 5b219dad9c841..57f047416ec1c 100644
--- a/x-pack/legacy/plugins/siem/public/components/draggables/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/draggables/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiBadge, EuiBadgeProps, EuiToolTip, IconType } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { Omit } from '../../../common/utility_types';
 import { DragEffects, DraggableWrapper } from '../drag_and_drop/draggable_wrapper';
@@ -105,12 +105,9 @@ export const DefaultDraggable = React.memo<DefaultDraggableType>(
               <Provider dataProvider={dataProvider} />
             </DragEffects>
           ) : (
-            <Content
-              children={children}
-              field={field}
-              tooltipContent={tooltipContent}
-              value={value}
-            />
+            <Content field={field} tooltipContent={tooltipContent} value={value}>
+              {children}
+            </Content>
           )
         }
       />
diff --git a/x-pack/legacy/plugins/siem/public/components/duration/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/duration/index.test.tsx
index 140a625bc53fe..0dbc60ad9ae52 100644
--- a/x-pack/legacy/plugins/siem/public/components/duration/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/duration/index.test.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 { TestProviders } from '../../mock';
 import { ONE_MILLISECOND_AS_NANOSECONDS } from '../formatted_duration/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/duration/index.tsx b/x-pack/legacy/plugins/siem/public/components/duration/index.tsx
index 15e6246f1f1ad..76712b789ffbe 100644
--- a/x-pack/legacy/plugins/siem/public/components/duration/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/duration/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 { DefaultDraggable } from '../draggables';
 import { FormattedDuration } from '../formatted_duration';
diff --git a/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.test.tsx
index 7c515862b0d92..1786905a4bb48 100644
--- a/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/edit_data_provider/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
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 18b271a3abc29..87e83e0c47b6d 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
@@ -18,7 +18,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 import React, { useEffect, useState, useCallback } from 'react';
-import styled, { createGlobalStyle } from 'styled-components';
+import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
 import { OnDataProviderEdited } from '../timeline/events';
@@ -46,15 +46,6 @@ export const HeaderContainer = styled.div`
 
 HeaderContainer.displayName = 'HeaderContainer';
 
-// SIDE EFFECT: the following `createGlobalStyle` overrides the default styling
-// of euiComboBoxOptionsList because it's implemented as a popover, so it's
-// not selectable as a child of the styled component
-const StatefulEditDataProviderGlobalStyle = createGlobalStyle`
-  .euiComboBoxOptionsList {
-    z-index: 9999;
-  }
-`;
-
 interface Props {
   andProviderId?: string;
   browserFields: BrowserFields;
@@ -157,107 +148,104 @@ export const StatefulEditDataProvider = React.memo<Props>(
     }, []);
 
     return (
-      <>
-        <EuiPanel paddingSize="s">
-          <EuiFlexGroup direction="column" gutterSize="none">
-            <EuiFlexItem grow={false}>
-              <EuiFlexGroup direction="row" gutterSize="none" justifyContent="spaceBetween">
-                <EuiFlexItem grow={false}>
-                  <EuiFormRow label={i18n.FIELD}>
-                    <EuiToolTip content={updatedField.length > 0 ? updatedField[0].label : null}>
-                      <EuiComboBox
-                        data-test-subj="field"
-                        isClearable={false}
-                        onChange={onFieldSelected}
-                        options={getCategorizedFieldNames(browserFields)}
-                        placeholder={i18n.FIELD_PLACEHOLDER}
-                        selectedOptions={updatedField}
-                        singleSelection={{ asPlainText: true }}
-                        style={{ width: `${FIELD_COMBO_BOX_WIDTH}px` }}
-                      />
-                    </EuiToolTip>
-                  </EuiFormRow>
-                </EuiFlexItem>
-
-                <EuiFlexItem grow={false}>
-                  <EuiFormRow label={i18n.OPERATOR}>
+      <EuiPanel paddingSize="s">
+        <EuiFlexGroup direction="column" gutterSize="none">
+          <EuiFlexItem grow={false}>
+            <EuiFlexGroup direction="row" gutterSize="none" justifyContent="spaceBetween">
+              <EuiFlexItem grow={false}>
+                <EuiFormRow label={i18n.FIELD}>
+                  <EuiToolTip content={updatedField.length > 0 ? updatedField[0].label : null}>
                     <EuiComboBox
-                      data-test-subj="operator"
+                      data-test-subj="field"
                       isClearable={false}
-                      onChange={onOperatorSelected}
-                      options={operatorLabels}
-                      placeholder={i18n.SELECT_AN_OPERATOR}
-                      selectedOptions={updatedOperator}
+                      onChange={onFieldSelected}
+                      options={getCategorizedFieldNames(browserFields)}
+                      placeholder={i18n.FIELD_PLACEHOLDER}
+                      selectedOptions={updatedField}
                       singleSelection={{ asPlainText: true }}
-                      style={{ width: `${OPERATOR_COMBO_BOX_WIDTH}px` }}
+                      style={{ width: `${FIELD_COMBO_BOX_WIDTH}px` }}
                     />
-                  </EuiFormRow>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </EuiFlexItem>
-
-            <EuiFlexItem grow={false}>
-              <EuiSpacer />
-            </EuiFlexItem>
+                  </EuiToolTip>
+                </EuiFormRow>
+              </EuiFlexItem>
 
-            {updatedOperator.length > 0 &&
-            updatedOperator[0].label !== i18n.EXISTS &&
-            updatedOperator[0].label !== i18n.DOES_NOT_EXIST ? (
               <EuiFlexItem grow={false}>
-                <EuiFormRow label={i18n.VALUE_LABEL}>
-                  <EuiFieldText
-                    className={VALUE_INPUT_CLASS_NAME}
-                    data-test-subj="value"
-                    onChange={onValueChange}
-                    placeholder={i18n.VALUE}
-                    value={sanatizeValue(updatedValue)}
+                <EuiFormRow label={i18n.OPERATOR}>
+                  <EuiComboBox
+                    data-test-subj="operator"
+                    isClearable={false}
+                    onChange={onOperatorSelected}
+                    options={operatorLabels}
+                    placeholder={i18n.SELECT_AN_OPERATOR}
+                    selectedOptions={updatedOperator}
+                    singleSelection={{ asPlainText: true }}
+                    style={{ width: `${OPERATOR_COMBO_BOX_WIDTH}px` }}
                   />
                 </EuiFormRow>
               </EuiFlexItem>
-            ) : null}
+            </EuiFlexGroup>
+          </EuiFlexItem>
 
-            <EuiFlexItem grow={false}>
-              <EuiSpacer />
-            </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiSpacer />
+          </EuiFlexItem>
 
+          {updatedOperator.length > 0 &&
+          updatedOperator[0].label !== i18n.EXISTS &&
+          updatedOperator[0].label !== i18n.DOES_NOT_EXIST ? (
             <EuiFlexItem grow={false}>
-              <EuiFlexGroup justifyContent="flexEnd" gutterSize="none">
-                <EuiFlexItem grow={false}>
-                  <EuiButton
-                    autoFocus
-                    className={SAVE_CLASS_NAME}
-                    color="primary"
-                    data-test-subj="save"
-                    fill={true}
-                    isDisabled={
-                      !selectionsAreValid({
-                        browserFields,
-                        selectedField: updatedField,
-                        selectedOperator: updatedOperator,
-                      })
-                    }
-                    onClick={() => {
-                      onDataProviderEdited({
-                        andProviderId,
-                        excluded: getExcludedFromSelection(updatedOperator),
-                        field: updatedField.length > 0 ? updatedField[0].label : '',
-                        id: timelineId,
-                        operator: getQueryOperatorFromSelection(updatedOperator),
-                        providerId,
-                        value: updatedValue,
-                      });
-                    }}
-                    size="s"
-                  >
-                    {i18n.SAVE}
-                  </EuiButton>
-                </EuiFlexItem>
-              </EuiFlexGroup>
+              <EuiFormRow label={i18n.VALUE_LABEL}>
+                <EuiFieldText
+                  className={VALUE_INPUT_CLASS_NAME}
+                  data-test-subj="value"
+                  onChange={onValueChange}
+                  placeholder={i18n.VALUE}
+                  value={sanatizeValue(updatedValue)}
+                />
+              </EuiFormRow>
             </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiPanel>
-        <StatefulEditDataProviderGlobalStyle />
-      </>
+          ) : null}
+
+          <EuiFlexItem grow={false}>
+            <EuiSpacer />
+          </EuiFlexItem>
+
+          <EuiFlexItem grow={false}>
+            <EuiFlexGroup justifyContent="flexEnd" gutterSize="none">
+              <EuiFlexItem grow={false}>
+                <EuiButton
+                  autoFocus
+                  className={SAVE_CLASS_NAME}
+                  color="primary"
+                  data-test-subj="save"
+                  fill={true}
+                  isDisabled={
+                    !selectionsAreValid({
+                      browserFields,
+                      selectedField: updatedField,
+                      selectedOperator: updatedOperator,
+                    })
+                  }
+                  onClick={() => {
+                    onDataProviderEdited({
+                      andProviderId,
+                      excluded: getExcludedFromSelection(updatedOperator),
+                      field: updatedField.length > 0 ? updatedField[0].label : '',
+                      id: timelineId,
+                      operator: getQueryOperatorFromSelection(updatedOperator),
+                      providerId,
+                      value: updatedValue,
+                    });
+                  }}
+                  size="s"
+                >
+                  {i18n.SAVE}
+                </EuiButton>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiPanel>
     );
   }
 );
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 2444fd0bc2b7d..d5de7ab508a73 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
@@ -9,7 +9,7 @@ exports[`EmbeddedMapComponent renders correctly against snapshot 1`] = `
       size="xs"
     >
       <EuiLink
-        href="undefinedguide/en/siem/guide/undefined/conf-map-ui.html"
+        href="https://www.elastic.co/guide/en/siem/guide/mocked-test-branch/conf-map-ui.html"
         target="_blank"
       >
         Map configuration help
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 6794aab205703..2eefdf767dce1 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
@@ -21,7 +21,7 @@ exports[`IndexPatternsMissingPrompt renders correctly against snapshot 1`] = `
           values={
             Object {
               "beats": <a
-                href="https://www.elastic.coguide/en/beats/libbeat/current/getting-started.html"
+                href="https://www.elastic.co/guide/en/beats/libbeat/mocked-test-branch/getting-started.html"
                 rel="noopener noreferrer"
                 target="_blank"
               >
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
index c0d70754e78bd..2dc3d8828675f 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embeddable.test.tsx
@@ -5,14 +5,10 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
-import '../../mock/ui_settings';
 import { Embeddable } from './embeddable';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('Embeddable', () => {
   test('it renders', () => {
     const wrapper = shallow(
@@ -21,6 +17,6 @@ describe('Embeddable', () => {
       </Embeddable>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
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
index 6387de30aa265..3b8e137618ab0 100644
--- 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
@@ -5,20 +5,16 @@
  */
 
 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(<EmbeddableHeader title="Test title" />);
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the title', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx
index 1ed1075542f71..c752273777d2f 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/embedded_map.test.tsx
@@ -5,12 +5,11 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
+
+import { useIndexPatterns } from '../../hooks/use_index_patterns';
 import { EmbeddedMapComponent } from './embedded_map';
 import { SetQuery } from './types';
-import { useKibanaCore } from '../../lib/compose/kibana_core';
-import { useIndexPatterns } from '../../hooks/use_index_patterns';
 
 jest.mock('../search_bar', () => ({
   siemFilterManager: {
@@ -22,22 +21,7 @@ const mockUseIndexPatterns = useIndexPatterns as jest.Mock;
 jest.mock('../../hooks/use_index_patterns');
 mockUseIndexPatterns.mockImplementation(() => [true, []]);
 
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: {
-    get$: () => 'world',
-  },
-  injectedMetadata: {
-    getKibanaVersion: () => '8.0.0',
-  },
-}));
-
-jest.mock('../../lib/compose/kibana_plugins');
-
-jest.mock('ui/vis/lib/timezone', () => ({
-  timezoneProvider: () => () => 'America/New_York',
-}));
+jest.mock('../../lib/kibana');
 
 describe('EmbeddedMapComponent', () => {
   let setQuery: SetQuery;
@@ -56,6 +40,6 @@ describe('EmbeddedMapComponent', () => {
         startDate={new Date('2019-08-28T05:50:47.877Z').getTime()}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
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 1658002408fb0..b39d43cc01b42 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
@@ -8,16 +8,12 @@ import { EuiLink, EuiText } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
 import { createPortalNode, InPortal } from 'react-reverse-portal';
 import styled, { css } from 'styled-components';
-import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
 
 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 { useKibanaCore } from '../../lib/compose/kibana_core';
-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';
@@ -28,6 +24,7 @@ import { MapToolTip } from './map_tool_tip/map_tool_tip';
 import * as i18n from './translations';
 import { MapEmbeddable, SetQuery } from './types';
 import { Query, esFilters } from '../../../../../../../src/plugins/data/public';
+import { useKibana, useUiSetting$ } from '../../lib/kibana';
 import {
   SavedObjectFinderProps,
   SavedObjectFinderUi,
@@ -52,15 +49,15 @@ const EmbeddableMap = styled.div.attrs(() => ({
   ${({ maintainRatio }) =>
     maintainRatio &&
     css`
-      padding-top: calc(3 / 4 * 100%); //4:3 (standard) ratio
+      padding-top: calc(3 / 4 * 100%); /* 4:3 (standard) ratio */
       position: relative;
 
       @media only screen and (min-width: ${({ theme }) => theme.eui.euiBreakpoints.m}) {
-        padding-top: calc(9 / 32 * 100%); //32:9 (ultra widescreen) ratio
+        padding-top: calc(9 / 32 * 100%); /* 32:9 (ultra widescreen) ratio */
       }
 
       @media only screen and (min-width: 1441px) and (min-height: 901px) {
-        padding-top: calc(9 / 21 * 100%); //21:9 (ultrawide) ratio
+        padding-top: calc(9 / 21 * 100%); /* 21:9 (ultrawide) ratio */
       }
 
       .embPanel {
@@ -96,7 +93,7 @@ export const EmbeddedMapComponent = ({
 
   const [, dispatchToaster] = useStateToaster();
   const [loadingKibanaIndexPatterns, kibanaIndexPatterns] = useIndexPatterns();
-  const [siemDefaultIndices] = useKibanaUiSetting(DEFAULT_INDEX_KEY);
+  const [siemDefaultIndices] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
 
   // This portalNode provided by react-reverse-portal allows us re-parent the MapToolTip within our
   // own component tree instead of the embeddables (default). This is necessary to have access to
@@ -104,8 +101,7 @@ export const EmbeddedMapComponent = ({
   // Search InPortal/OutPortal for implementation touch points
   const portalNode = React.useMemo(() => createPortalNode(), []);
 
-  const plugins = useKibanaPlugins();
-  const core = useKibanaCore();
+  const { services } = useKibana();
 
   // Initial Load useEffect
   useEffect(() => {
@@ -131,7 +127,7 @@ export const EmbeddedMapComponent = ({
           endDate,
           setQuery,
           portalNode,
-          plugins.embeddable
+          services.embeddable
         );
         if (isSubscribed) {
           setEmbeddable(embeddableObject);
@@ -180,7 +176,11 @@ export const EmbeddedMapComponent = ({
   }, [startDate, endDate]);
 
   const SavedObjectFinder = (props: SavedObjectFinderProps) => (
-    <SavedObjectFinderUi {...props} savedObjects={core.savedObjects} uiSettings={core.uiSettings} />
+    <SavedObjectFinderUi
+      {...props}
+      savedObjects={services.savedObjects}
+      uiSettings={services.uiSettings}
+    />
   );
 
   return isError ? null : (
@@ -188,7 +188,7 @@ export const EmbeddedMapComponent = ({
       <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`}
+            href={`${services.docLinks.ELASTIC_WEBSITE_URL}guide/en/siem/guide/${services.docLinks.DOC_LINK_VERSION}/conf-map-ui.html`}
             target="_blank"
           >
             {i18n.EMBEDDABLE_HEADER_HELP}
@@ -205,12 +205,12 @@ export const EmbeddedMapComponent = ({
           <EmbeddablePanel
             data-test-subj="embeddable-panel"
             embeddable={embeddable}
-            getActions={plugins.uiActions.getTriggerCompatibleActions}
+            getActions={services.uiActions.getTriggerCompatibleActions}
             getEmbeddableFactory={start.getEmbeddableFactory}
             getAllEmbeddableFactories={start.getEmbeddableFactories}
-            notifications={core.notifications}
-            overlays={core.overlays}
-            inspector={plugins.inspector}
+            notifications={services.notifications}
+            overlays={services.overlays}
+            inspector={services.inspector}
             SavedObjectFinder={SavedObjectFinder}
           />
         ) : !isLoading && isIndexError ? (
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 b4b2b98ddb8d6..4e5fcee439827 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
@@ -9,7 +9,6 @@ import { createUiNewPlatformMock } from 'ui/new_platform/__mocks__/helpers';
 import { createPortalNode } from 'react-reverse-portal';
 
 jest.mock('ui/new_platform');
-jest.mock('../../lib/settings/use_kibana_ui_setting');
 
 jest.mock('uuid', () => {
   return {
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx
index d32b62900431c..4f617644a1fe1 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx
@@ -5,18 +5,15 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
+
 import { IndexPatternsMissingPromptComponent } from './index_patterns_missing_prompt';
 
-jest.mock('ui/documentation_links', () => ({
-  ELASTIC_WEBSITE_URL: 'https://www.elastic.co',
-  DOC_LINK_VERSION: 'current',
-}));
+jest.mock('../../lib/kibana');
 
 describe('IndexPatternsMissingPrompt', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<IndexPatternsMissingPromptComponent />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
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 6533be49c3430..a4f95d2e299ad 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
@@ -6,68 +6,72 @@
 
 import { EuiButton, EuiCode, EuiEmptyPrompt } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import * as React from 'react';
+import React from 'react';
 import chrome from 'ui/chrome';
-import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
 
+import { useKibana } from '../../lib/kibana';
 import * as i18n from './translations';
 
-export const IndexPatternsMissingPromptComponent = () => (
-  <EuiEmptyPrompt
-    iconType="gisApp"
-    title={<h2>{i18n.ERROR_TITLE}</h2>}
-    titleSize="xs"
-    body={
-      <>
-        <p>
-          <FormattedMessage
-            defaultMessage="To display map data, you must define SIEM indices ({defaultIndex}) and Kibana index patterns with identical names or glob patterns. 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={{
-              defaultIndex: (
-                <a
-                  href={`${chrome.getBasePath()}/app/kibana#/management/kibana/settings`}
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  {'siem:defaultIndex'}
-                </a>
-              ),
-              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>
+export const IndexPatternsMissingPromptComponent = () => {
+  const docLinks = useKibana().services.docLinks;
 
-        <p>
-          <FormattedMessage
-            defaultMessage="You can also configure index patterns 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>
-    }
-  />
-);
+  return (
+    <EuiEmptyPrompt
+      iconType="gisApp"
+      title={<h2>{i18n.ERROR_TITLE}</h2>}
+      titleSize="xs"
+      body={
+        <>
+          <p>
+            <FormattedMessage
+              defaultMessage="To display map data, you must define SIEM indices ({defaultIndex}) and Kibana index patterns with identical names or glob patterns. 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={{
+                defaultIndex: (
+                  <a
+                    href={`${chrome.getBasePath()}/app/kibana#/management/kibana/settings`}
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    {'siem:defaultIndex'}
+                  </a>
+                ),
+                beats: (
+                  <a
+                    href={`${docLinks.ELASTIC_WEBSITE_URL}guide/en/beats/libbeat/${docLinks.DOC_LINK_VERSION}/getting-started.html`}
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    {'beats'}
+                  </a>
+                ),
+                setup: <EuiCode>{'setup'}</EuiCode>,
+                example: <EuiCode>{'./packetbeat setup'}</EuiCode>,
+              }}
+            />
+          </p>
+
+          <p>
+            <FormattedMessage
+              defaultMessage="You can also configure index patterns 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>
+      }
+    />
+  );
+};
 
 IndexPatternsMissingPromptComponent.displayName = 'IndexPatternsMissingPromptComponent';
 
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 c43ab1ff4a036..824c717427763 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
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { LineToolTipContentComponent } from './line_tool_tip_content';
 import { FeatureProperty } from '../types';
 import { SUM_OF_DESTINATION_BYTES, SUM_OF_SOURCE_BYTES } from '../map_config';
@@ -27,6 +26,6 @@ describe('LineToolTipContent', () => {
     const wrapper = shallow(
       <LineToolTipContentComponent contextId={'contextId'} featureProps={mockFeatureProps} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
index 13eefb252fb04..2daaeb53e45f2 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { MapToolTipComponent } from './map_tool_tip';
 import { MapFeature } from '../types';
 
@@ -19,7 +18,7 @@ jest.mock('../../search_bar', () => ({
 describe('MapToolTip', () => {
   test('placeholder component renders correctly against snapshot', () => {
     const wrapper = shallow(<MapToolTipComponent />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('full component renders correctly against snapshot', () => {
@@ -46,6 +45,6 @@ describe('MapToolTip', () => {
         loadFeatureGeometry={loadFeatureGeometry}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
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 929b4983b5fd7..8741cfaa26ca6 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
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { FeatureProperty } from '../types';
 import { getRenderedFieldValue, PointToolTipContentComponent } from './point_tool_tip_content';
 import { TestProviders } from '../../../mock';
@@ -49,7 +48,7 @@ describe('PointToolTipContent', () => {
         />
       </TestProviders>
     );
-    expect(toJson(wrapper.find('PointToolTipContentComponent'))).toMatchSnapshot();
+    expect(wrapper.find('PointToolTipContentComponent')).toMatchSnapshot();
   });
 
   test('renders array filter correctly', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx
index 4c77570cfbc9f..7351ea0a183c3 100644
--- a/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ToolTipFooterComponent } from './tooltip_footer';
 
 describe('ToolTipFilter', () => {
@@ -27,7 +26,7 @@ describe('ToolTipFilter', () => {
         totalFeatures={100}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('Lower bounds', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/empty_page/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/empty_page/__snapshots__/index.test.tsx.snap
index 9b6bfb1752a20..87409c5fdebe0 100644
--- a/x-pack/legacy/plugins/siem/public/components/empty_page/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/empty_page/__snapshots__/index.test.tsx.snap
@@ -3,8 +3,12 @@
 exports[`renders correctly 1`] = `
 <EmptyPrompt
   actions={
-    <ForwardRef>
-      <EuiFlexItem>
+    <ForwardRef
+      justifyContent="center"
+    >
+      <EuiFlexItem
+        grow={false}
+      >
         <EuiButton
           fill={true}
           href="my/url/from/nowwhere"
diff --git a/x-pack/legacy/plugins/siem/public/components/empty_page/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/empty_page/index.test.tsx
index 67b0c5ea64b51..6a14c12cee0f8 100644
--- a/x-pack/legacy/plugins/siem/public/components/empty_page/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/empty_page/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { EmptyPage } from './index';
@@ -18,5 +17,5 @@ test('renders correctly', () => {
       title="My Super Title"
     />
   );
-  expect(toJson(EmptyComponent)).toMatchSnapshot();
+  expect(EmptyComponent).toMatchSnapshot();
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/empty_page/index.tsx b/x-pack/legacy/plugins/siem/public/components/empty_page/index.tsx
index ef2b76c9aad1c..f2b0ec1ab5e60 100644
--- a/x-pack/legacy/plugins/siem/public/components/empty_page/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/empty_page/index.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 const EmptyPrompt = styled(EuiEmptyPrompt)`
-  align-self: center; // Corrects horizontal centering in IE11
+  align-self: center; /* Corrects horizontal centering in IE11 */
 `;
 
 EmptyPrompt.displayName = 'EmptyPrompt';
@@ -46,8 +46,8 @@ export const EmptyPage = React.memo<EmptyPageProps>(
       title={<h2>{title}</h2>}
       body={message && <p>{message}</p>}
       actions={
-        <EuiFlexGroup>
-          <EuiFlexItem>
+        <EuiFlexGroup justifyContent="center">
+          <EuiFlexItem grow={false}>
             <EuiButton
               fill
               href={actionPrimaryUrl}
@@ -59,7 +59,7 @@ export const EmptyPage = React.memo<EmptyPageProps>(
           </EuiFlexItem>
 
           {actionSecondaryLabel && actionSecondaryUrl && (
-            <EuiFlexItem>
+            <EuiFlexItem grow={false}>
               <EuiButton
                 href={actionSecondaryUrl}
                 iconType={actionSecondaryIcon}
diff --git a/x-pack/legacy/plugins/siem/public/components/empty_value/empty_value.test.tsx b/x-pack/legacy/plugins/siem/public/components/empty_value/empty_value.test.tsx
index bd056c04acc89..fc1d30907ab09 100644
--- a/x-pack/legacy/plugins/siem/public/components/empty_value/empty_value.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/empty_value/empty_value.test.tsx
@@ -6,7 +6,6 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
@@ -25,7 +24,7 @@ describe('EmptyValue', () => {
 
   test('it renders against snapshot', () => {
     const wrapper = shallow(<p>{getEmptyString()}</p>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('#getEmptyValue', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx
index 6233fcfe7c823..6b90d9ccd08c4 100644
--- a/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { Provider } from 'react-redux';
 
 import { apolloClientObservable, mockGlobalState } from '../../mock';
@@ -30,7 +29,7 @@ describe('Error Toast Dispatcher', () => {
           <ErrorToastDispatcher toastLifeTimeMs={9999999999} />
         </Provider>
       );
-      expect(toJson(wrapper.find('Connect(ErrorToastDispatcherComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(ErrorToastDispatcherComponent)')).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/columns.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/columns.tsx
index d835d2c621931..1962850425baa 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import {
   EuiCheckbox,
   EuiFlexGroup,
@@ -13,7 +15,7 @@ import {
   EuiText,
   EuiToolTip,
 } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import { Draggable } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 
@@ -23,16 +25,14 @@ import { WithCopyToClipboard } from '../../lib/clipboard/with_copy_to_clipboard'
 import { DragEffects } from '../drag_and_drop/draggable_wrapper';
 import { DroppableWrapper } from '../drag_and_drop/droppable_wrapper';
 import { getDroppableId, getDraggableFieldId, DRAG_TYPE_FIELD } from '../drag_and_drop/helpers';
-import { DefaultDraggable } from '../draggables';
 import { DraggableFieldBadge } from '../draggables/field_badge';
-import { EVENT_DURATION_FIELD_NAME } from '../duration';
 import { FieldName } from '../fields_browser/field_name';
 import { SelectableText } from '../selectable_text';
 import { OverflowField } from '../tables/helpers';
 import { ColumnHeader } from '../timeline/body/column_headers/column_header';
 import { defaultColumnHeaderType } from '../timeline/body/column_headers/default_headers';
 import { DEFAULT_COLUMN_MIN_WIDTH } from '../timeline/body/helpers';
-import { DATE_FIELD_TYPE, MESSAGE_FIELD_NAME } from '../timeline/body/renderers/constants';
+import { MESSAGE_FIELD_NAME } from '../timeline/body/renderers/constants';
 import { FormattedFieldValue } from '../timeline/body/renderers/formatted_field';
 import { OnUpdateColumns } from '../timeline/events';
 import { WithHoverActions } from '../with_hover_actions';
@@ -180,28 +180,14 @@ export const getColumns = ({
                   data.field === MESSAGE_FIELD_NAME ? (
                     <OverflowField value={value} />
                   ) : (
-                    <DefaultDraggable
-                      data-test-subj="ip"
-                      field={data.field}
-                      id={`event-details-value-default-draggable-${contextId}-${eventId}-${data.field}-${i}-${value}`}
-                      tooltipContent={
-                        data.type === DATE_FIELD_TYPE || data.field === EVENT_DURATION_FIELD_NAME
-                          ? null
-                          : data.field
-                      }
+                    <FormattedFieldValue
+                      contextId={`event-details-value-formatted-field-value-${contextId}-${eventId}-${data.field}-${i}-${value}`}
+                      eventId={eventId}
+                      fieldFormat={data.format}
+                      fieldName={data.field}
+                      fieldType={data.type}
                       value={value}
-                    >
-                      <EuiText size="xs">
-                        <FormattedFieldValue
-                          contextId={`event-details-value-formatted-field-value-${contextId}-${eventId}-${data.field}-${i}-${value}`}
-                          eventId={eventId}
-                          fieldFormat={data.format}
-                          fieldName={data.field}
-                          fieldType={data.type}
-                          value={value}
-                        />
-                      </EuiText>
-                    </DefaultDraggable>
+                    />
                   )
                 }
               />
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx
index f1e96392d6afc..162fc8fd8bb34 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/event_details.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { mockDetailItemData, mockDetailItemDataId } from '../../mock/mock_detail_item';
 import { TestProviders } from '../../mock/test_providers';
@@ -16,8 +15,6 @@ import { mockBrowserFields } from '../../containers/source/mock';
 import { defaultHeaders } from '../../mock/header';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('EventDetails', () => {
   const mount = useMountAppended();
 
@@ -36,7 +33,7 @@ describe('EventDetails', () => {
           toggleColumn={jest.fn()}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.tsx
index 2c28ab8696f0e..5b18e2d9b1fbc 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.test.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 { mockDetailItemData, mockDetailItemDataId } from '../../mock/mock_detail_item';
 import { TestProviders } from '../../mock/test_providers';
@@ -14,8 +14,6 @@ import { mockBrowserFields } from '../../containers/source/mock';
 import { defaultHeaders } from '../../mock/header';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('EventFieldsBrowser', () => {
   const mount = useMountAppended();
 
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.tsx
index 41e920643b1b9..f4e9a2b789d71 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/event_fields_browser.tsx
@@ -6,7 +6,7 @@
 
 import { sortBy } from 'lodash';
 import { EuiInMemoryTable } from '@elastic/eui';
-import * as React from 'react';
+import React, { useMemo } from 'react';
 
 import { ColumnHeader } from '../timeline/body/column_headers/column_header';
 import { BrowserFields, getAllFieldsByName } from '../../containers/source';
@@ -29,25 +29,35 @@ interface Props {
 /** Renders a table view or JSON view of the `ECS` `data` */
 export const EventFieldsBrowser = React.memo<Props>(
   ({ browserFields, columnHeaders, data, eventId, onUpdateColumns, timelineId, toggleColumn }) => {
-    const fieldsByName = getAllFieldsByName(browserFields);
+    const fieldsByName = useMemo(() => getAllFieldsByName(browserFields), [browserFields]);
+    const items = useMemo(
+      () =>
+        sortBy(data, ['field']).map(item => ({
+          ...item,
+          ...fieldsByName[item.field],
+          valuesConcatenated: item.values != null ? item.values.join() : '',
+        })),
+      [data, fieldsByName]
+    );
+    const columns = useMemo(
+      () =>
+        getColumns({
+          browserFields,
+          columnHeaders,
+          eventId,
+          onUpdateColumns,
+          contextId: timelineId,
+          toggleColumn,
+        }),
+      [browserFields, columnHeaders, eventId, onUpdateColumns, timelineId, toggleColumn]
+    );
+
     return (
       <div className="euiTable--compressed">
         <EuiInMemoryTable
-          items={sortBy(data, ['field']).map(item => {
-            return {
-              ...item,
-              ...fieldsByName[item.field],
-              valuesConcatenated: item.values != null ? item.values.join() : '',
-            };
-          })}
-          columns={getColumns({
-            browserFields,
-            columnHeaders,
-            eventId,
-            onUpdateColumns,
-            contextId: timelineId,
-            toggleColumn,
-          })}
+          // @ts-ignore items going in match Partial<BrowserField>, column `render` callbacks expect complete BrowserField
+          items={items}
+          columns={columns}
           pagination={false}
           search={search}
           sorting={true}
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/helpers.tsx
index 49486ea032481..a4ec8ff2c4907 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/helpers.tsx
@@ -20,17 +20,7 @@ export const search = {
   box: {
     incremental: true,
     placeholder: i18n.PLACEHOLDER,
-    schema: {
-      fieldId: {
-        type: 'string',
-      },
-      valuesFlattened: {
-        type: 'string',
-      },
-      description: {
-        type: 'string',
-      },
-    },
+    schema: true,
   },
 };
 
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx
index 429fc94b2f2d3..0cf158c8ea90b 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/json_view.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { mockDetailItemData } from '../../mock';
 
@@ -16,7 +15,7 @@ describe('JSON View', () => {
   describe('rendering', () => {
     test('should match snapshot', () => {
       const wrapper = shallow(<JsonView data={mockDetailItemData} />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/event_details/json_view.tsx b/x-pack/legacy/plugins/siem/public/components/event_details/json_view.tsx
index 519f56adff2d2..9897e319e0487 100644
--- a/x-pack/legacy/plugins/siem/public/components/event_details/json_view.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/event_details/json_view.tsx
@@ -6,7 +6,7 @@
 
 import { EuiCodeEditor } from '@elastic/eui';
 import { set } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DetailItem } from '../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.test.tsx b/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.test.tsx
index 5ddf17bd77d74..3cef3e98c2f0a 100644
--- a/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/events_viewer/events_viewer.test.tsx
@@ -8,26 +8,16 @@ import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import { mockIndexPattern, TestProviders } from '../../mock';
-import { mockUiSettings } from '../../mock/ui_settings';
 import { wait } from '../../lib/helpers';
 
 import { mockEventViewerResponse } from './mock';
 import { StatefulEventsViewer } from '.';
 import { defaultHeaders } from './default_headers';
-import { useKibanaCore } from '../../lib/compose/kibana_core';
 import { useFetchIndexPatterns } from '../../containers/detection_engine/rules/fetch_index_patterns';
 import { mockBrowserFields } from '../../containers/source/mock';
 import { eventsDefaultModel } from './default_model';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-}));
-
 const mockUseFetchIndexPatterns: jest.Mock = useFetchIndexPatterns as jest.Mock;
 jest.mock('../../containers/detection_engine/rules/fetch_index_patterns');
 mockUseFetchIndexPatterns.mockImplementation(() => [
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 9878194a17826..aaf88e68684ca 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,14 +5,14 @@
  */
 
 import { EuiPanel } from '@elastic/eui';
-import { getOr, isEmpty, isEqual } from 'lodash/fp';
-import React from 'react';
+import { getOr, isEmpty, isEqual, union } from 'lodash/fp';
+import React, { useMemo } from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
 import { TimelineQuery } from '../../containers/timeline';
 import { Direction } from '../../graphql/types';
-import { useKibanaCore } from '../../lib/compose/kibana_core';
+import { useKibana } from '../../lib/kibana';
 import { KqlMode } from '../../store/timeline/model';
 import { AutoSizer } from '../auto_sizer';
 import { HeaderSection } from '../header_section';
@@ -46,6 +46,7 @@ interface Props {
   browserFields: BrowserFields;
   columns: ColumnHeader[];
   dataProviders: DataProvider[];
+  deletedEventIds: Readonly<string[]>;
   end: number;
   filters: esFilters.Filter[];
   headerFilterGroup?: React.ReactNode;
@@ -71,6 +72,7 @@ export const EventsViewer = React.memo<Props>(
     browserFields,
     columns,
     dataProviders,
+    deletedEventIds,
     end,
     filters,
     headerFilterGroup,
@@ -91,9 +93,9 @@ export const EventsViewer = React.memo<Props>(
     utilityBar,
   }) => {
     const columnsHeader = isEmpty(columns) ? defaultHeaders : columns;
-    const core = useKibanaCore();
+    const kibana = useKibana();
     const combinedQueries = combineQueries({
-      config: esQuery.getEsQueryConfig(core.uiSettings),
+      config: esQuery.getEsQueryConfig(kibana.services.uiSettings),
       dataProviders,
       indexPattern,
       browserFields,
@@ -104,6 +106,14 @@ export const EventsViewer = React.memo<Props>(
       end,
       isEventViewer: true,
     });
+    const queryFields = useMemo(
+      () =>
+        union(
+          columnsHeader.map(c => c.id),
+          timelineTypeContext.queryFields ?? []
+        ),
+      [columnsHeader, timelineTypeContext.queryFields]
+    );
 
     return (
       <EuiPanel data-test-subj="events-viewer-panel" grow={false}>
@@ -119,7 +129,7 @@ export const EventsViewer = React.memo<Props>(
 
               {combinedQueries != null ? (
                 <TimelineQuery
-                  fields={columnsHeader.map(c => c.id)}
+                  fields={queryFields}
                   filterQuery={combinedQueries.filterQuery}
                   id={id}
                   indexPattern={indexPattern}
@@ -139,73 +149,81 @@ export const EventsViewer = React.memo<Props>(
                     pageInfo,
                     refetch,
                     totalCount = 0,
-                  }) => (
-                    <>
-                      <HeaderSection
-                        id={id}
-                        showInspect={showInspect}
-                        subtitle={
-                          utilityBar
-                            ? undefined
-                            : `${i18n.SHOWING}: ${totalCount.toLocaleString()} ${i18n.UNIT(
-                                totalCount
-                              )}`
-                        }
-                        title={timelineTypeContext?.title ?? i18n.EVENTS}
-                      >
-                        {headerFilterGroup}
-                      </HeaderSection>
+                  }) => {
+                    const totalCountMinusDeleted =
+                      totalCount > 0 ? totalCount - deletedEventIds.length : 0;
+
+                    // TODO: Reset eventDeletedIds/eventLoadingIds on refresh/loadmore (getUpdatedAt)
+                    return (
+                      <>
+                        <HeaderSection
+                          id={id}
+                          showInspect={showInspect}
+                          subtitle={
+                            utilityBar
+                              ? undefined
+                              : `${
+                                  i18n.SHOWING
+                                }: ${totalCountMinusDeleted.toLocaleString()} ${i18n.UNIT(
+                                  totalCountMinusDeleted
+                                )}`
+                          }
+                          title={timelineTypeContext?.title ?? i18n.EVENTS}
+                        >
+                          {headerFilterGroup}
+                        </HeaderSection>
 
-                      {utilityBar?.(totalCount)}
+                        {utilityBar?.(totalCountMinusDeleted)}
 
-                      <div
-                        data-test-subj={`events-container-loading-${loading}`}
-                        style={{ width: `${width}px` }}
-                      >
-                        <ManageTimelineContext
-                          loading={loading}
-                          width={width}
-                          type={timelineTypeContext}
+                        <div
+                          data-test-subj={`events-container-loading-${loading}`}
+                          style={{ width: `${width}px` }}
                         >
-                          <TimelineRefetch
-                            id={id}
-                            inputId="global"
-                            inspect={inspect}
+                          <ManageTimelineContext
                             loading={loading}
-                            refetch={refetch}
-                          />
+                            width={width}
+                            type={timelineTypeContext}
+                          >
+                            <TimelineRefetch
+                              id={id}
+                              inputId="global"
+                              inspect={inspect}
+                              loading={loading}
+                              refetch={refetch}
+                            />
 
-                          <StatefulBody
-                            browserFields={browserFields}
-                            data={events}
-                            id={id}
-                            isEventViewer={true}
-                            height={height}
-                            sort={sort}
-                            toggleColumn={toggleColumn}
-                          />
+                            <StatefulBody
+                              browserFields={browserFields}
+                              data={events.filter(e => !deletedEventIds.includes(e._id))}
+                              id={id}
+                              isEventViewer={true}
+                              height={height}
+                              sort={sort}
+                              toggleColumn={toggleColumn}
+                            />
 
-                          <Footer
-                            compact={isCompactFooter(width)}
-                            getUpdatedAt={getUpdatedAt}
-                            hasNextPage={getOr(false, 'hasNextPage', pageInfo)!}
-                            height={footerHeight}
-                            isEventViewer={true}
-                            isLive={isLive}
-                            isLoading={loading}
-                            itemsCount={events.length}
-                            itemsPerPage={itemsPerPage}
-                            itemsPerPageOptions={itemsPerPageOptions}
-                            onChangeItemsPerPage={onChangeItemsPerPage}
-                            onLoadMore={loadMore}
-                            nextCursor={getOr(null, 'endCursor.value', pageInfo)!}
-                            serverSideEventCount={totalCount}
-                            tieBreaker={getOr(null, 'endCursor.tiebreaker', pageInfo)}
-                          />
-                        </ManageTimelineContext>
-                      </div>
-                    </>
-                  )}
+                            <Footer
+                              compact={isCompactFooter(width)}
+                              getUpdatedAt={getUpdatedAt}
+                              hasNextPage={getOr(false, 'hasNextPage', pageInfo)!}
+                              height={footerHeight}
+                              isEventViewer={true}
+                              isLive={isLive}
+                              isLoading={loading}
+                              itemsCount={events.length}
+                              itemsPerPage={itemsPerPage}
+                              itemsPerPageOptions={itemsPerPageOptions}
+                              onChangeItemsPerPage={onChangeItemsPerPage}
+                              onLoadMore={loadMore}
+                              nextCursor={getOr(null, 'endCursor.value', pageInfo)!}
+                              serverSideEventCount={totalCountMinusDeleted}
+                              tieBreaker={getOr(null, 'endCursor.tiebreaker', pageInfo)}
+                            />
+                          </ManageTimelineContext>
+                        </div>
+                      </>
+                    );
+                  }}
                 </TimelineQuery>
               ) : null}
             </>
@@ -218,6 +236,7 @@ export const EventsViewer = React.memo<Props>(
     prevProps.browserFields === nextProps.browserFields &&
     prevProps.columns === nextProps.columns &&
     prevProps.dataProviders === nextProps.dataProviders &&
+    prevProps.deletedEventIds === nextProps.deletedEventIds &&
     prevProps.end === nextProps.end &&
     isEqual(prevProps.filters, nextProps.filters) &&
     prevProps.height === nextProps.height &&
@@ -230,6 +249,8 @@ export const EventsViewer = React.memo<Props>(
     isEqual(prevProps.query, nextProps.query) &&
     prevProps.showInspect === nextProps.showInspect &&
     prevProps.start === nextProps.start &&
-    prevProps.sort === nextProps.sort
+    prevProps.sort === nextProps.sort &&
+    isEqual(prevProps.timelineTypeContext, nextProps.timelineTypeContext) &&
+    prevProps.utilityBar === nextProps.utilityBar
 );
 EventsViewer.displayName = 'EventsViewer';
diff --git a/x-pack/legacy/plugins/siem/public/components/events_viewer/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/events_viewer/index.test.tsx
index e46153c18c2b5..1e225dabb2541 100644
--- a/x-pack/legacy/plugins/siem/public/components/events_viewer/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/events_viewer/index.test.tsx
@@ -7,10 +7,8 @@
 import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
-import { useKibanaCore } from '../../lib/compose/kibana_core';
 import { wait } from '../../lib/helpers';
 import { mockIndexPattern, TestProviders } from '../../mock';
-import { mockUiSettings } from '../../mock/ui_settings';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
 import { mockEventViewerResponse } from './mock';
@@ -19,14 +17,6 @@ import { useFetchIndexPatterns } from '../../containers/detection_engine/rules/f
 import { mockBrowserFields } from '../../containers/source/mock';
 import { eventsDefaultModel } from './default_model';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-}));
-
 const mockUseFetchIndexPatterns: jest.Mock = useFetchIndexPatterns as jest.Mock;
 jest.mock('../../containers/detection_engine/rules/fetch_index_patterns');
 mockUseFetchIndexPatterns.mockImplementation(() => [
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 21292e4ac3254..9b8ec243d5f38 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
@@ -8,7 +8,6 @@ import { isEqual } from 'lodash/fp';
 import React, { useCallback, useEffect, useState } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
-import chrome from 'ui/chrome';
 import { inputsModel, inputsSelectors, State, timelineSelectors } from '../../store';
 import { inputsActions, timelineActions } from '../../store/actions';
 import { KqlMode, SubsetTimelineModel, TimelineModel } from '../../store/timeline/model';
@@ -18,26 +17,27 @@ import { Sort } from '../timeline/body/sort';
 import { OnChangeItemsPerPage } from '../timeline/events';
 import { esFilters, Query } from '../../../../../../../src/plugins/data/public';
 
+import { useUiSetting } from '../../lib/kibana';
 import { EventsViewer } from './events_viewer';
 import { InputsModelId } from '../../store/inputs/constants';
 import { useFetchIndexPatterns } from '../../containers/detection_engine/rules/fetch_index_patterns';
 import { TimelineTypeContextProps } from '../timeline/timeline_context';
 import { DEFAULT_INDEX_KEY } from '../../../common/constants';
+import * as i18n from './translations';
 
 export interface OwnProps {
   defaultIndices?: string[];
-  defaultFilters?: esFilters.Filter[];
   defaultModel: SubsetTimelineModel;
   end: number;
   id: string;
   start: number;
   headerFilterGroup?: React.ReactNode;
+  pageFilters?: esFilters.Filter[];
   timelineTypeContext?: TimelineTypeContextProps;
   utilityBar?: (totalCount: number) => React.ReactNode;
 }
 
 interface StateReduxProps {
-  activePage?: number;
   columns: ColumnHeader[];
   dataProviders?: DataProvider[];
   filters: esFilters.Filter[];
@@ -45,9 +45,12 @@ interface StateReduxProps {
   itemsPerPage?: number;
   itemsPerPageOptions?: number[];
   kqlMode: KqlMode;
+  deletedEventIds: Readonly<string[]>;
   query: Query;
   pageCount?: number;
   sort?: Sort;
+  showCheckboxes: boolean;
+  showRowRenderers: boolean;
 }
 
 interface DispatchProps {
@@ -56,6 +59,8 @@ interface DispatchProps {
     columns: ColumnHeader[];
     itemsPerPage?: number;
     sort?: Sort;
+    showCheckboxes?: boolean;
+    showRowRenderers?: boolean;
   }>;
   deleteEventQuery: ActionCreator<{
     id: string;
@@ -83,8 +88,8 @@ const StatefulEventsViewerComponent = React.memo<Props>(
     createTimeline,
     columns,
     dataProviders,
-    defaultFilters = [],
     defaultModel,
+    deletedEventIds,
     defaultIndices,
     deleteEventQuery,
     end,
@@ -95,13 +100,15 @@ const StatefulEventsViewerComponent = React.memo<Props>(
     itemsPerPage,
     itemsPerPageOptions,
     kqlMode,
+    pageFilters = [],
     query,
     removeColumn,
     start,
+    showCheckboxes,
+    showRowRenderers,
     sort,
     timelineTypeContext = {
-      showCheckboxes: false,
-      showRowRenderers: true,
+      loadingText: i18n.LOADING_EVENTS,
     },
     updateItemsPerPage,
     upsertColumn,
@@ -109,12 +116,12 @@ const StatefulEventsViewerComponent = React.memo<Props>(
   }) => {
     const [showInspect, setShowInspect] = useState(false);
     const [{ browserFields, indexPatterns }] = useFetchIndexPatterns(
-      defaultIndices ?? chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY)
+      defaultIndices ?? useUiSetting<string[]>(DEFAULT_INDEX_KEY)
     );
 
     useEffect(() => {
       if (createTimeline != null) {
-        createTimeline({ id, columns, sort, itemsPerPage });
+        createTimeline({ id, columns, sort, itemsPerPage, showCheckboxes, showRowRenderers });
       }
       return () => {
         deleteEventQuery({ id, inputId: 'global' });
@@ -158,8 +165,9 @@ const StatefulEventsViewerComponent = React.memo<Props>(
           columns={columns}
           id={id}
           dataProviders={dataProviders!}
+          deletedEventIds={deletedEventIds}
           end={end}
-          filters={[...filters, ...defaultFilters]}
+          filters={filters}
           headerFilterGroup={headerFilterGroup}
           indexPattern={indexPatterns ?? { fields: [], title: '' }}
           isLive={isLive}
@@ -180,9 +188,9 @@ const StatefulEventsViewerComponent = React.memo<Props>(
   },
   (prevProps, nextProps) =>
     prevProps.id === nextProps.id &&
-    prevProps.activePage === nextProps.activePage &&
     isEqual(prevProps.columns, nextProps.columns) &&
     isEqual(prevProps.dataProviders, nextProps.dataProviders) &&
+    prevProps.deletedEventIds === nextProps.deletedEventIds &&
     prevProps.end === nextProps.end &&
     isEqual(prevProps.filters, nextProps.filters) &&
     prevProps.isLive === nextProps.isLive &&
@@ -192,7 +200,13 @@ const StatefulEventsViewerComponent = React.memo<Props>(
     isEqual(prevProps.query, nextProps.query) &&
     prevProps.pageCount === nextProps.pageCount &&
     isEqual(prevProps.sort, nextProps.sort) &&
-    prevProps.start === nextProps.start
+    prevProps.start === nextProps.start &&
+    isEqual(prevProps.pageFilters, nextProps.pageFilters) &&
+    prevProps.showCheckboxes === nextProps.showCheckboxes &&
+    prevProps.showRowRenderers === nextProps.showRowRenderers &&
+    prevProps.start === nextProps.start &&
+    isEqual(prevProps.timelineTypeContext, nextProps.timelineTypeContext) &&
+    prevProps.utilityBar === nextProps.utilityBar
 );
 
 StatefulEventsViewerComponent.displayName = 'StatefulEventsViewerComponent';
@@ -202,15 +216,26 @@ const makeMapStateToProps = () => {
   const getGlobalQuerySelector = inputsSelectors.globalQuerySelector();
   const getGlobalFiltersQuerySelector = inputsSelectors.globalFiltersQuerySelector();
   const getEvents = timelineSelectors.getEventsByIdSelector();
-  const mapStateToProps = (state: State, { id, defaultFilters = [], defaultModel }: OwnProps) => {
+  const mapStateToProps = (state: State, { id, pageFilters = [], defaultModel }: OwnProps) => {
     const input: inputsModel.InputsRange = getInputsTimeline(state);
     const events: TimelineModel = getEvents(state, id) ?? defaultModel;
-    const { columns, dataProviders, itemsPerPage, itemsPerPageOptions, kqlMode, sort } = events;
+    const {
+      columns,
+      dataProviders,
+      deletedEventIds,
+      itemsPerPage,
+      itemsPerPageOptions,
+      kqlMode,
+      sort,
+      showCheckboxes,
+      showRowRenderers,
+    } = events;
 
     return {
       columns,
       dataProviders,
-      filters: [...getGlobalFiltersQuerySelector(state), ...defaultFilters],
+      deletedEventIds,
+      filters: [...getGlobalFiltersQuerySelector(state), ...pageFilters],
       id,
       isLive: input.policy.kind === 'interval',
       itemsPerPage,
@@ -218,6 +243,8 @@ const makeMapStateToProps = () => {
       kqlMode,
       query: getGlobalQuerySelector(state),
       sort,
+      showCheckboxes,
+      showRowRenderers,
     };
   };
   return mapStateToProps;
@@ -227,7 +254,6 @@ export const StatefulEventsViewer = connect(makeMapStateToProps, {
   createTimeline: timelineActions.createTimeline,
   deleteEventQuery: inputsActions.deleteOneQuery,
   updateItemsPerPage: timelineActions.updateItemsPerPage,
-  updateSort: timelineActions.updateSort,
   removeColumn: timelineActions.removeColumn,
   upsertColumn: timelineActions.upsertColumn,
 })(StatefulEventsViewerComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/events_viewer/translations.ts b/x-pack/legacy/plugins/siem/public/components/events_viewer/translations.ts
index f1a844f84ada1..6e6be02a6085d 100644
--- a/x-pack/legacy/plugins/siem/public/components/events_viewer/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/components/events_viewer/translations.ts
@@ -14,6 +14,13 @@ export const EVENTS = i18n.translate('xpack.siem.eventsViewer.eventsLabel', {
   defaultMessage: 'Events',
 });
 
+export const LOADING_EVENTS = i18n.translate(
+  'xpack.siem.eventsViewer.footer.loadingEventsDataLabel',
+  {
+    defaultMessage: 'Loading Events',
+  }
+);
+
 export const UNIT = (totalCount: number) =>
   i18n.translate('xpack.siem.eventsViewer.unit', {
     values: { totalCount },
diff --git a/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.test.tsx
index 01317e754ad35..24118ace6796f 100644
--- a/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.tsx b/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.tsx
index bba32e72abc37..147d2e2d541f5 100644
--- a/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/external_link_icon/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiIcon } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 const LinkIcon = styled(EuiIcon)`
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 e45f5dacb36a2..88d03d8db6761 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
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { FlowTarget, GetIpOverviewQuery, HostEcsFields } from '../../graphql/types';
 import { TestProviders } from '../../mock';
@@ -37,7 +36,7 @@ describe('Field Renderers', () => {
         locationRenderer(['source.geo.city_name', 'source.geo.region_name'], mockData.complete)
       );
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders emptyTagValue when no fields provided', () => {
@@ -61,7 +60,7 @@ describe('Field Renderers', () => {
     test('it renders correctly against snapshot', () => {
       const wrapper = shallow(dateRenderer(mockData.complete.source!.firstSeen));
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders emptyTagValue when invalid field provided', () => {
@@ -79,7 +78,7 @@ describe('Field Renderers', () => {
         autonomousSystemRenderer(mockData.complete.source!.autonomousSystem!, FlowTarget.source)
       );
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders emptyTagValue when non-string field provided', () => {
@@ -111,7 +110,7 @@ describe('Field Renderers', () => {
     test('it renders correctly against snapshot', () => {
       const wrapper = shallow(hostNameRenderer(mockData.complete.host, '10.10.10.10'));
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders emptyTagValue when non-matching IP is provided', () => {
@@ -154,7 +153,7 @@ describe('Field Renderers', () => {
     test('it renders correctly against snapshot', () => {
       const wrapper = shallow(hostNameRenderer(mockData.complete.host, '10.10.10.10'));
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders emptyTagValue when non-matching IP is provided', () => {
@@ -188,7 +187,7 @@ describe('Field Renderers', () => {
     test('it renders correctly against snapshot', () => {
       const wrapper = shallow(whoisRenderer('10.10.10.10'));
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
@@ -196,7 +195,7 @@ describe('Field Renderers', () => {
     test('it renders correctly against snapshot', () => {
       const wrapper = shallow(<TestProviders>{reputationRenderer('10.10.10.10')}</TestProviders>);
 
-      expect(toJson(wrapper.find('DragDropContext'))).toMatchSnapshot();
+      expect(wrapper.find('DragDropContext')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.test.tsx
index 2d3accbcb55c8..361a0789135e4 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.tsx
index 3165580f435a2..d6972625821cf 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/categories_pane.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiInMemoryTable, EuiTitle } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category.test.tsx
index 4e16997ba92f6..38eaf43977fa2 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category.test.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 { mockBrowserFields } from '../../containers/source/mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category.tsx
index 7b8451db2212f..9d2a7da9b2d00 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiInMemoryTable } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
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 ce66a2d8d7919..cbead878f525d 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
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 
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 1845a0bae88d5..0c7dd7e908ce3 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
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import {
   EuiIcon,
   EuiFlexGroup,
@@ -118,7 +120,7 @@ export const getCategoryColumns = ({
     name: '',
     sortable: true,
     truncateText: false,
-    render: (categoryId: string) => (
+    render: (categoryId: string, _: { categoryId: string }) => (
       <LinkContainer>
         <EuiLink data-test-subj="category-link" onClick={() => onCategorySelected(categoryId)}>
           <EuiFlexGroup alignItems="center" gutterSize="none" justifyContent="spaceBetween">
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.test.tsx
index e0628a410921e..792e0342a6d59 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.tsx
index 49255abc83dd5..cd14cef328a7e 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/category_title.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.test.tsx
index c43d5833fe1da..9214fd5f2540c 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_browser.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
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 c23908c396386..c8a0eb9da688b 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
@@ -102,138 +102,138 @@ type Props = Pick<
  * This component has no internal state, but it uses lifecycle methods to
  * set focus to the search input, scroll to the selected category, etc
  */
-export const FieldsBrowser = React.memo<Props>(
-  ({
-    browserFields,
-    columnHeaders,
-    filteredBrowserFields,
-    isEventViewer,
-    isSearching,
-    onCategorySelected,
-    onFieldSelected,
-    onHideFieldBrowser,
-    onSearchInputChange,
-    onOutsideClick,
-    onUpdateColumns,
-    searchInput,
-    selectedCategoryId,
-    timelineId,
-    toggleColumn,
-    width,
-  }) => {
-    /** Focuses the input that filters the field browser */
-    const focusInput = () => {
-      const elements = document.getElementsByClassName(
-        getFieldBrowserSearchInputClassName(timelineId)
-      );
+const FieldsBrowserComponent: React.FC<Props> = ({
+  browserFields,
+  columnHeaders,
+  filteredBrowserFields,
+  isEventViewer,
+  isSearching,
+  onCategorySelected,
+  onFieldSelected,
+  onHideFieldBrowser,
+  onSearchInputChange,
+  onOutsideClick,
+  onUpdateColumns,
+  searchInput,
+  selectedCategoryId,
+  timelineId,
+  toggleColumn,
+  width,
+}) => {
+  /** Focuses the input that filters the field browser */
+  const focusInput = () => {
+    const elements = document.getElementsByClassName(
+      getFieldBrowserSearchInputClassName(timelineId)
+    );
 
-      if (elements.length > 0) {
-        (elements[0] as HTMLElement).focus(); // this cast is required because focus() does not exist on every `Element` returned by `getElementsByClassName`
+    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 */
+  const onInputChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      onSearchInputChange(event.target.value);
+    },
+    [onSearchInputChange]
+  );
+
+  const selectFieldAndHide = useCallback(
+    (fieldId: string) => {
+      if (onFieldSelected != null) {
+        onFieldSelected(fieldId);
       }
-    };
-
-    /** Invoked when the user types in the input to filter the field browser */
-    const onInputChange = useCallback(
-      (event: React.ChangeEvent<HTMLInputElement>) => {
-        onSearchInputChange(event.target.value);
-      },
-      [onSearchInputChange]
-    );
 
-    const selectFieldAndHide = useCallback(
-      (fieldId: string) => {
-        if (onFieldSelected != null) {
-          onFieldSelected(fieldId);
-        }
+      onHideFieldBrowser();
+    },
+    [onFieldSelected, onHideFieldBrowser]
+  );
+
+  const scrollViews = () => {
+    if (selectedCategoryId !== '') {
+      const categoryPaneTitles = document.getElementsByClassName(
+        getCategoryPaneCategoryClassName({
+          categoryId: selectedCategoryId,
+          timelineId,
+        })
+      );
 
-        onHideFieldBrowser();
-      },
-      [onFieldSelected, onHideFieldBrowser]
-    );
+      if (categoryPaneTitles.length > 0) {
+        categoryPaneTitles[0].scrollIntoView();
+      }
+
+      const fieldPaneTitles = document.getElementsByClassName(
+        getFieldBrowserCategoryTitleClassName({
+          categoryId: selectedCategoryId,
+          timelineId,
+        })
+      );
 
-    const scrollViews = () => {
-      if (selectedCategoryId !== '') {
-        const categoryPaneTitles = document.getElementsByClassName(
-          getCategoryPaneCategoryClassName({
-            categoryId: selectedCategoryId,
-            timelineId,
-          })
-        );
-
-        if (categoryPaneTitles.length > 0) {
-          categoryPaneTitles[0].scrollIntoView();
-        }
-
-        const fieldPaneTitles = document.getElementsByClassName(
-          getFieldBrowserCategoryTitleClassName({
-            categoryId: selectedCategoryId,
-            timelineId,
-          })
-        );
-
-        if (fieldPaneTitles.length > 0) {
-          fieldPaneTitles[0].scrollIntoView();
-        }
+      if (fieldPaneTitles.length > 0) {
+        fieldPaneTitles[0].scrollIntoView();
       }
+    }
+
+    focusInput(); // always re-focus the input to enable additional filtering
+  };
+
+  useEffect(() => {
+    scrollViews();
+  }, [selectedCategoryId, timelineId]);
+
+  return (
+    <EuiOutsideClickDetector
+      data-test-subj="outside-click-detector"
+      onOutsideClick={onFieldSelected != null ? noop : onOutsideClick}
+      isDisabled={false}
+    >
+      <FieldsBrowserContainer data-test-subj="fields-browser-container" width={width}>
+        <Header
+          data-test-subj="header"
+          filteredBrowserFields={filteredBrowserFields}
+          isEventViewer={isEventViewer}
+          isSearching={isSearching}
+          onOutsideClick={onOutsideClick}
+          onSearchInputChange={onInputChange}
+          onUpdateColumns={onUpdateColumns}
+          searchInput={searchInput}
+          timelineId={timelineId}
+        />
+
+        <PanesFlexGroup alignItems="flexStart" gutterSize="none" justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <CategoriesPane
+              browserFields={browserFields}
+              data-test-subj="left-categories-pane"
+              filteredBrowserFields={filteredBrowserFields}
+              width={CATEGORY_PANE_WIDTH}
+              onCategorySelected={onCategorySelected}
+              onUpdateColumns={onUpdateColumns}
+              selectedCategoryId={selectedCategoryId}
+              timelineId={timelineId}
+            />
+          </EuiFlexItem>
+
+          <EuiFlexItem grow={false}>
+            <FieldsPane
+              columnHeaders={columnHeaders}
+              data-test-subj="fields-pane"
+              filteredBrowserFields={filteredBrowserFields}
+              onCategorySelected={onCategorySelected}
+              onFieldSelected={selectFieldAndHide}
+              onUpdateColumns={onUpdateColumns}
+              searchInput={searchInput}
+              selectedCategoryId={selectedCategoryId}
+              timelineId={timelineId}
+              toggleColumn={toggleColumn}
+              width={FIELDS_PANE_WIDTH}
+            />
+          </EuiFlexItem>
+        </PanesFlexGroup>
+      </FieldsBrowserContainer>
+    </EuiOutsideClickDetector>
+  );
+};
 
-      focusInput(); // always re-focus the input to enable additional filtering
-    };
-
-    useEffect(() => {
-      scrollViews();
-    }, [selectedCategoryId, timelineId]);
-
-    return (
-      <EuiOutsideClickDetector
-        data-test-subj="outside-click-detector"
-        onOutsideClick={onFieldSelected != null ? noop : onOutsideClick}
-        isDisabled={false}
-      >
-        <FieldsBrowserContainer data-test-subj="fields-browser-container" width={width}>
-          <Header
-            data-test-subj="header"
-            filteredBrowserFields={filteredBrowserFields}
-            isEventViewer={isEventViewer}
-            isSearching={isSearching}
-            onOutsideClick={onOutsideClick}
-            onSearchInputChange={onInputChange}
-            onUpdateColumns={onUpdateColumns}
-            searchInput={searchInput}
-            timelineId={timelineId}
-          />
-
-          <PanesFlexGroup alignItems="flexStart" gutterSize="none" justifyContent="spaceBetween">
-            <EuiFlexItem grow={false}>
-              <CategoriesPane
-                browserFields={browserFields}
-                data-test-subj="left-categories-pane"
-                filteredBrowserFields={filteredBrowserFields}
-                width={CATEGORY_PANE_WIDTH}
-                onCategorySelected={onCategorySelected}
-                onUpdateColumns={onUpdateColumns}
-                selectedCategoryId={selectedCategoryId}
-                timelineId={timelineId}
-              />
-            </EuiFlexItem>
-
-            <EuiFlexItem grow={false}>
-              <FieldsPane
-                columnHeaders={columnHeaders}
-                data-test-subj="fields-pane"
-                filteredBrowserFields={filteredBrowserFields}
-                onCategorySelected={onCategorySelected}
-                onFieldSelected={selectFieldAndHide}
-                onUpdateColumns={onUpdateColumns}
-                searchInput={searchInput}
-                selectedCategoryId={selectedCategoryId}
-                timelineId={timelineId}
-                toggleColumn={toggleColumn}
-                width={FIELDS_PANE_WIDTH}
-              />
-            </EuiFlexItem>
-          </PanesFlexGroup>
-        </FieldsBrowserContainer>
-      </EuiOutsideClickDetector>
-    );
-  }
-);
+export const FieldsBrowser = React.memo(FieldsBrowserComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.test.tsx
index 6034f5a476443..4d0c707c46910 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { omit } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx
index e909a983deedb..778e9d3d3c744 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_items.tsx
@@ -4,9 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { EuiCheckbox, EuiIcon, EuiToolTip, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { uniqBy } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Draggable } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 
@@ -170,13 +172,13 @@ export const getFieldColumns = () => [
     field: 'field',
     name: i18n.FIELD,
     sortable: true,
-    render: (field: React.ReactNode) => <>{field}</>,
+    render: (field: React.ReactNode, _: FieldItem) => <>{field}</>,
     width: '250px',
   },
   {
     field: 'description',
     name: i18n.DESCRIPTION,
-    render: (description: string) => (
+    render: (description: string, _: FieldItem) => (
       <TruncatableText>
         <EuiToolTip position="top" content={description}>
           <>{description}</>
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.test.tsx
index 59ee2efa1f006..1437af7a30adb 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.tsx
index d5d8c54775566..b8fbe46baa9c5 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/field_name.tsx
@@ -6,7 +6,6 @@
 
 import {
   EuiButtonIcon,
-  // @ts-ignore
   EuiHighlight,
   EuiIcon,
   EuiFlexGroup,
@@ -30,55 +29,55 @@ import * as i18n from './translations';
  * The name of a (draggable) field
  */
 export const FieldNameContainer = styled.span`
-  padding: 5px;
-  {
-    border-radius: 4px;
-    padding: 0 4px 0 8px;
-    position: relative;
+  border-radius: 4px;
+  padding: 0 4px 0 8px;
+  position: relative;
+
+  &::before {
+    background-image: linear-gradient(
+        135deg,
+        ${({ theme }) => theme.eui.euiColorMediumShade} 25%,
+        transparent 25%
+      ),
+      linear-gradient(-135deg, ${({ theme }) => theme.eui.euiColorMediumShade} 25%, transparent 25%),
+      linear-gradient(135deg, transparent 75%, ${({ theme }) => theme.eui.euiColorMediumShade} 75%),
+      linear-gradient(-135deg, transparent 75%, ${({ theme }) => theme.eui.euiColorMediumShade} 75%);
+    background-position: 0 0, 1px 0, 1px -1px, 0px 1px;
+    background-size: 2px 2px;
+    bottom: 2px;
+    content: '';
+    display: block;
+    left: 2px;
+    position: absolute;
+    top: 2px;
+    width: 4px;
+  }
+
+  &:hover,
+  &:focus {
+    transition: background-color 0.7s ease;
+    background-color: #000;
+    color: #fff;
 
     &::before {
-      background-image: linear-gradient(
-          135deg,
-          ${({ theme }) => theme.eui.euiColorMediumShade} 25%,
+      background-image: linear-gradient(135deg, #fff 25%, transparent 25%),
+        linear-gradient(
+          -135deg,
+          ${({ theme }) => theme.eui.euiColorLightestShade} 25%,
           transparent 25%
         ),
-        linear-gradient(-135deg, ${({ theme }) =>
-          theme.eui.euiColorMediumShade} 25%, transparent 25%),
-        linear-gradient(135deg, transparent 75%, ${({ theme }) =>
-          theme.eui.euiColorMediumShade} 75%),
-        linear-gradient(-135deg, transparent 75%, ${({ theme }) =>
-          theme.eui.euiColorMediumShade} 75%);
-      background-position: 0 0, 1px 0, 1px -1px, 0px 1px;
-      background-size: 2px 2px;
-      bottom: 2px;
-      content: '';
-      display: block;
-      left: 2px;
-      position: absolute;
-      top: 2px;
-      width: 4px;
-    }
-
-    &:hover,
-    &:focus {
-      transition: background-color 0.7s ease;
-      background-color: #000;
-      color: #fff;
-
-      &::before {
-        background-image: linear-gradient(
-            135deg,
-            #fff 25%,
-            transparent 25%
-          ),
-          linear-gradient(-135deg, ${({ theme }) =>
-            theme.eui.euiColorLightestShade} 25%, transparent 25%),
-          linear-gradient(135deg, transparent 75%, ${({ theme }) =>
-            theme.eui.euiColorLightestShade} 75%),
-          linear-gradient(-135deg, transparent 75%, ${({ theme }) =>
-            theme.eui.euiColorLightestShade} 75%);
-      }
+        linear-gradient(
+          135deg,
+          transparent 75%,
+          ${({ theme }) => theme.eui.euiColorLightestShade} 75%
+        ),
+        linear-gradient(
+          -135deg,
+          transparent 75%,
+          ${({ theme }) => theme.eui.euiColorLightestShade} 75%
+        );
     }
+  }
 `;
 
 FieldNameContainer.displayName = 'FieldNameContainer';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.test.tsx
index 68ba2e2774314..f3ec87a96d46b 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.test.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 { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.tsx
index 170cf324ca6d8..fba6e22e4b21f 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/fields_pane.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/header.test.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/header.test.tsx
index 7e36a028961c4..42689065354d0 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/header.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/header.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/fields_browser/header.tsx b/x-pack/legacy/plugins/siem/public/components/fields_browser/header.tsx
index 8acb19970c268..45b331f133e85 100644
--- a/x-pack/legacy/plugins/siem/public/components/fields_browser/header.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/fields_browser/header.tsx
@@ -12,7 +12,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
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 8a01a01b1daae..24e4cd77b20d3 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
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.test.tsx b/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.test.tsx
index 7f377a57c3e9b..ffac0496e9f1a 100644
--- a/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import '../../mock/match_media';
@@ -19,6 +18,6 @@ describe('rendering', () => {
       </FiltersGlobal>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.tsx b/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.tsx
index edf6f7f01ab2e..b4d8c790002b2 100644
--- a/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/filters_global/filters_global.tsx
@@ -13,7 +13,7 @@ import { gutterTimeline } from '../../lib/helpers';
 
 const offsetChrome = 49;
 
-const disableSticky = 'screen and (max-width: ' + euiLightVars.euiBreakpoints.s + ')';
+const disableSticky = `screen and (max-width: ${euiLightVars.euiBreakpoints.s})`;
 const disableStickyMq = window.matchMedia(disableSticky);
 
 const Wrapper = styled.aside<{ isSticky?: boolean }>`
diff --git a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx
index 47f0aef4b4806..f984b534c188d 100644
--- a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { FlowDirection } from '../../graphql/types';
 
@@ -25,7 +24,7 @@ describe('Select Flow Direction', () => {
         />
       );
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx
index b1f757841e54b..373cc3cdc4a92 100644
--- a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { clone } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { ActionCreator } from 'typescript-fsa';
 
 import { FlowDirection, FlowTarget } from '../../graphql/types';
@@ -31,7 +30,7 @@ describe('FlowTargetSelect Component', () => {
     test('it renders the FlowTargetSelect', () => {
       const wrapper = shallow(<FlowTargetSelect {...mockProps} />);
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.tsx b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.tsx
index b1c463fdc32f4..f5dd4650159cd 100644
--- a/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flow_controls/flow_target_select.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiSuperSelect } from '@elastic/eui';
-import React from 'react';
+import React, { useCallback } from 'react';
 import { ActionCreator } from 'typescript-fsa';
 
 import { FlowDirection, FlowTarget } from '../../graphql/types';
@@ -65,22 +65,27 @@ export const FlowTargetSelect = React.memo<FlowTargetSelectProps>(
     selectedTarget,
     displayTextOverride = [],
     updateFlowTargetAction,
-  }) => (
-    <EuiSuperSelect
-      options={
-        selectedDirection
-          ? toggleTargetOptions(id, displayTextOverride).filter(option =>
-              option.directions.includes(selectedDirection)
-            )
-          : toggleTargetOptions(id, displayTextOverride)
-      }
-      valueOfSelected={selectedTarget}
-      onChange={(newFlowTarget: FlowTarget) =>
-        onChangeTarget(newFlowTarget, updateFlowTargetAction)
-      }
-      isLoading={isLoading}
-    />
-  )
+  }) => {
+    const handleChange = useCallback(
+      (newFlowTarget: FlowTarget) => onChangeTarget(newFlowTarget, updateFlowTargetAction),
+      [updateFlowTargetAction]
+    );
+
+    return (
+      <EuiSuperSelect
+        options={
+          selectedDirection
+            ? toggleTargetOptions(id, displayTextOverride).filter(option =>
+                option.directions.includes(selectedDirection)
+              )
+            : toggleTargetOptions(id, displayTextOverride)
+        }
+        valueOfSelected={selectedTarget}
+        onChange={handleChange}
+        isLoading={isLoading}
+      />
+    );
+  }
 );
 
 FlowTargetSelect.displayName = 'FlowTargetSelect';
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/button/index.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/button/index.tsx
index fee4f25f9e255..6ec5912872467 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/button/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/button/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiNotificationBadge, EuiIcon, EuiButton } from '@elastic/eui';
 import { rgba } from 'polished';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DroppableWrapper } from '../../drag_and_drop/droppable_wrapper';
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx
index 86a8952a10efa..83b842956e10e 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { set } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { ActionCreator } from 'typescript-fsa';
 
 import { apolloClientObservable, mockGlobalState, TestProviders } from '../../mock';
@@ -20,8 +19,6 @@ import { FlyoutButton } from './button';
 const testFlyoutHeight = 980;
 const usersViewing = ['elastic'];
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('Flyout', () => {
   const state: State = mockGlobalState;
 
@@ -37,7 +34,7 @@ describe('Flyout', () => {
           />
         </TestProviders>
       );
-      expect(toJson(wrapper.find('Flyout'))).toMatchSnapshot();
+      expect(wrapper.find('Flyout')).toMatchSnapshot();
     });
 
     test('it renders the default flyout state as a button', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/index.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/index.tsx
index 2d347830d5b1b..528f02f0a845b 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiBadge } from '@elastic/eui';
 import { defaultTo, getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
 import styled from 'styled-components';
 import { ActionCreator } from 'typescript-fsa';
diff --git a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
index 66e9bc700b3a1..c1c890c586576 100644
--- a/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/flyout/pane/index.test.tsx
@@ -5,30 +5,16 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
-import { flyoutHeaderHeight } from '../';
-import { useKibanaCore } from '../../../lib/compose/kibana_core';
 import { TestProviders } from '../../../mock';
-import { mockUiSettings } from '../../../mock/ui_settings';
+import { flyoutHeaderHeight } from '..';
 import { Pane } from '.';
 
 const testFlyoutHeight = 980;
 const testWidth = 640;
 const usersViewing = ['elastic'];
 
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('ui/new_platform');
-jest.mock('../../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-}));
-
-jest.mock('ui/vis/lib/timezone', () => ({
-  timezoneProvider: () => () => 'America/New_York',
-}));
-
 describe('Pane', () => {
   test('renders correctly against snapshot', () => {
     const EmptyComponent = shallow(
@@ -45,7 +31,7 @@ describe('Pane', () => {
         </Pane>
       </TestProviders>
     );
-    expect(toJson(EmptyComponent.find('Pane'))).toMatchSnapshot();
+    expect(EmptyComponent.find('Pane')).toMatchSnapshot();
   });
 
   test('it should NOT let the flyout expand to take up the full width of the element that contains it', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/__snapshots__/index.test.tsx.snap
index d23b1c61f7aee..ae30325f2a93b 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/__snapshots__/index.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`formatted_bytes PreferenceFormattedBytes rendering renders correctly against snapshot 1`] = `
+exports[`PreferenceFormattedBytes renders correctly against snapshot 1`] = `
 <Fragment>
   2.7MB
 </Fragment>
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
index a517820361f9f..914d233bccc1f 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.test.tsx
@@ -5,65 +5,51 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
-import { useKibanaUiSetting } from '../../lib/settings/use_kibana_ui_setting';
-import { mockFrameworks, getMockKibanaUiSetting } from '../../mock';
+import { useUiSetting$ } from '../../lib/kibana';
 
 import { PreferenceFormattedBytesComponent } from '.';
 
-const mockUseKibanaUiSetting: jest.Mock = useKibanaUiSetting as jest.Mock;
-jest.mock('../../lib/settings/use_kibana_ui_setting', () => ({
-  useKibanaUiSetting: jest.fn(),
-}));
+jest.mock('../../lib/kibana');
+const mockUseUiSetting$ = useUiSetting$ as jest.Mock;
 
-describe('formatted_bytes', () => {
-  describe('PreferenceFormattedBytes', () => {
-    describe('rendering', () => {
-      beforeEach(() => {
-        mockUseKibanaUiSetting.mockClear();
-      });
+const DEFAULT_BYTES_FORMAT_VALUE = '0,0.[0]b'; // kibana's default for this setting
+const bytes = '2806422';
 
-      const bytes = '2806422';
+describe('PreferenceFormattedBytes', () => {
+  test('renders correctly against snapshot', () => {
+    mockUseUiSetting$.mockImplementation(() => [DEFAULT_BYTES_FORMAT_VALUE]);
+    const wrapper = shallow(<PreferenceFormattedBytesComponent value={bytes} />);
 
-      test('renders correctly against snapshot', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_browser)
-        );
-        const wrapper = shallow(<PreferenceFormattedBytesComponent value={bytes} />);
-        expect(toJson(wrapper)).toMatchSnapshot();
-      });
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  test('it renders bytes to Numeral formatting when no format setting exists', () => {
+    mockUseUiSetting$.mockImplementation(() => [null]);
+    const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
+
+    expect(wrapper.text()).toEqual('2,806,422');
+  });
 
-      test('it renders bytes to hardcoded format when no configuration exists', () => {
-        mockUseKibanaUiSetting.mockImplementation(() => [null]);
-        const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
-        expect(wrapper.text()).toEqual('2.7MB');
-      });
+  test('it renders bytes according to the default format', () => {
+    mockUseUiSetting$.mockImplementation(() => [DEFAULT_BYTES_FORMAT_VALUE]);
+    const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
 
-      test('it renders bytes according to the default format', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_browser)
-        );
-        const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
-        expect(wrapper.text()).toEqual('2.7MB');
-      });
+    expect(wrapper.text()).toEqual('2.7MB');
+  });
+
+  test('it renders bytes supplied as a number according to the default format', () => {
+    mockUseUiSetting$.mockImplementation(() => [DEFAULT_BYTES_FORMAT_VALUE]);
+    const wrapper = mount(<PreferenceFormattedBytesComponent value={+bytes} />);
+
+    expect(wrapper.text()).toEqual('2.7MB');
+  });
 
-      test('it renders bytes supplied as a number according to the default format', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_browser)
-        );
-        const wrapper = mount(<PreferenceFormattedBytesComponent value={+bytes} />);
-        expect(wrapper.text()).toEqual('2.7MB');
-      });
+  test('it renders bytes according to new format', () => {
+    mockUseUiSetting$.mockImplementation(() => ['0b']);
+    const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
 
-      test('it renders bytes according to new format', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.bytes_short)
-        );
-        const wrapper = mount(<PreferenceFormattedBytesComponent value={bytes} />);
-        expect(wrapper.text()).toEqual('3MB');
-      });
-    });
+    expect(wrapper.text()).toEqual('3MB');
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx
index 408e8d7ad4d80..98a1acf471629 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_bytes/index.tsx
@@ -4,19 +4,28 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import numeral from '@elastic/numeral';
 
 import { DEFAULT_BYTES_FORMAT } from '../../../common/constants';
-import { useKibanaUiSetting } from '../../lib/settings/use_kibana_ui_setting';
+import { useUiSetting$ } from '../../lib/kibana';
 
-export const PreferenceFormattedBytesComponent = ({ value }: { value: string | number }) => {
-  const [bytesFormat] = useKibanaUiSetting(DEFAULT_BYTES_FORMAT);
-  return (
-    <>{bytesFormat ? numeral(value).format(bytesFormat) : numeral(value).format('0,0.[0]b')}</>
-  );
+type Bytes = string | number;
+
+export const formatBytes = (value: Bytes, format: string) => {
+  return numeral(value).format(format);
 };
 
+export const useFormatBytes = () => {
+  const [bytesFormat] = useUiSetting$<string>(DEFAULT_BYTES_FORMAT);
+
+  return (value: Bytes) => formatBytes(value, bytesFormat);
+};
+
+export const PreferenceFormattedBytesComponent = ({ value }: { value: Bytes }) => (
+  <>{useFormatBytes()(value)}</>
+);
+
 PreferenceFormattedBytesComponent.displayName = 'PreferenceFormattedBytesComponent';
 
 export const PreferenceFormattedBytes = React.memo(PreferenceFormattedBytesComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_date/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/formatted_date/__snapshots__/index.test.tsx.snap
index d196a23bff5bf..9e851ddcd7d0f 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_date/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_date/__snapshots__/index.test.tsx.snap
@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`formatted_date PreferenceFormattedDate rendering renders correctly against snapshot 1`] = `
+exports[`formatted_date PreferenceFormattedDate renders correctly against snapshot 1`] = `
 <PreferenceFormattedDate
   value={2019-02-25T22:27:05.000Z}
 >
-  2019-02-25T22:27:05.000Z
+  2019-02-25T22:27:05Z
 </PreferenceFormattedDate>
 `;
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 df361a06d3805..0d8222ce85e1b 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
@@ -5,203 +5,165 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 
-import { useKibanaUiSetting } from '../../lib/settings/use_kibana_ui_setting';
+import { useDateFormat, useTimeZone } from '../../hooks';
 
-import { mockFrameworks, TestProviders, MockFrameworks, getMockKibanaUiSetting } from '../../mock';
-
-import { PreferenceFormattedDate, FormattedDate, FormattedRelativePreferenceDate } from '.';
+import { TestProviders } from '../../mock';
 import { getEmptyString, getEmptyValue } from '../empty_value';
+import { PreferenceFormattedDate, FormattedDate, FormattedRelativePreferenceDate } from '.';
 
-const mockUseKibanaUiSetting: jest.Mock = useKibanaUiSetting as jest.Mock;
-jest.mock('../../lib/settings/use_kibana_ui_setting', () => ({
-  useKibanaUiSetting: jest.fn(),
-}));
+jest.mock('../../hooks');
+const mockUseDateFormat = useDateFormat as jest.Mock;
+const mockUseTimeZone = useTimeZone as jest.Mock;
+
+const isoDateString = '2019-02-25T22:27:05.000Z';
 
 describe('formatted_date', () => {
+  let isoDate: Date;
+
+  beforeEach(() => {
+    isoDate = new Date(isoDateString);
+    mockUseDateFormat.mockImplementation(() => 'MMM D, YYYY @ HH:mm:ss.SSS');
+    mockUseTimeZone.mockImplementation(() => 'UTC');
+  });
+
   describe('PreferenceFormattedDate', () => {
-    describe('rendering', () => {
-      beforeEach(() => {
-        mockUseKibanaUiSetting.mockClear();
-      });
-      const isoDateString = '2019-02-25T22:27:05.000Z';
-      const isoDate = new Date(isoDateString);
-      const configFormattedDateString = (dateString: string, config: MockFrameworks): string =>
-        moment
-          .tz(
-            dateString,
-            config.dateFormatTz! === 'Browser' ? config.timezone! : config.dateFormatTz!
-          )
-          .format(config.dateFormat);
-
-      test('renders correctly against snapshot', () => {
-        mockUseKibanaUiSetting.mockImplementation(() => [null]);
-        const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
-        expect(toJson(wrapper)).toMatchSnapshot();
-      });
-
-      test('it renders the UTC ISO8601 date string supplied when no configuration exists', () => {
-        mockUseKibanaUiSetting.mockImplementation(() => [null]);
-        const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
-        expect(wrapper.text()).toEqual(isoDateString);
-      });
-
-      test('it renders the UTC ISO8601 date supplied when the default configuration exists', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_UTC)
-        );
-
-        const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
-        expect(wrapper.text()).toEqual(
-          configFormattedDateString(isoDateString, mockFrameworks.default_UTC)
-        );
-      });
-
-      test('it renders the correct tz when the default browser configuration exists', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_browser)
-        );
-        const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
-        expect(wrapper.text()).toEqual(
-          configFormattedDateString(isoDateString, mockFrameworks.default_browser)
-        );
-      });
-
-      test('it renders the correct tz when a non-UTC configuration exists', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_MT)
-        );
-        const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
-        expect(wrapper.text()).toEqual(
-          configFormattedDateString(isoDateString, mockFrameworks.default_MT)
-        );
-      });
+    test('renders correctly against snapshot', () => {
+      mockUseDateFormat.mockImplementation(() => '');
+      const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
+
+      expect(wrapper).toMatchSnapshot();
+    });
+
+    test('it renders the date with the default configuration', () => {
+      const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
+
+      expect(wrapper.text()).toEqual('Feb 25, 2019 @ 22:27:05.000');
+    });
+
+    test('it renders a UTC ISO8601 date string supplied when no date format configuration exists', () => {
+      mockUseDateFormat.mockImplementation(() => '');
+      const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
+
+      expect(wrapper.text()).toEqual('2019-02-25T22:27:05Z');
+    });
+
+    test('it renders the correct timezone when a non-UTC configuration exists', () => {
+      mockUseTimeZone.mockImplementation(() => 'America/Denver');
+      const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
+
+      expect(wrapper.text()).toEqual('Feb 25, 2019 @ 15:27:05.000');
+    });
+
+    test('it renders the date with a user-defined format', () => {
+      mockUseDateFormat.mockImplementation(() => 'MMM-DD-YYYY');
+      const wrapper = mount(<PreferenceFormattedDate value={isoDate} />);
+
+      expect(wrapper.text()).toEqual('Feb-25-2019');
     });
   });
 
   describe('FormattedDate', () => {
-    describe('rendering', () => {
-      beforeEach(() => {
-        mockUseKibanaUiSetting.mockClear();
-      });
-
-      test('it renders against a numeric epoch', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_UTC)
-        );
-        const wrapper = mount(<FormattedDate fieldName="@timestamp" value={1559079339000} />);
-        expect(wrapper.text()).toEqual('May 28, 2019 @ 21:35:39.000');
-      });
-
-      test('it renders against a string epoch', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_UTC)
-        );
-        const wrapper = mount(<FormattedDate fieldName="@timestamp" value={'1559079339000'} />);
-        expect(wrapper.text()).toEqual('May 28, 2019 @ 21:35:39.000');
-      });
-
-      test('it renders against a ISO string', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_UTC)
-        );
-        const wrapper = mount(
-          <FormattedDate fieldName="@timestamp" value={'2019-05-28T22:04:49.957Z'} />
-        );
-        expect(wrapper.text()).toEqual('May 28, 2019 @ 22:04:49.957');
-      });
-
-      test('it renders against an empty string as an empty string placeholder', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_UTC)
-        );
-        const wrapper = mount(
-          <TestProviders>
-            <FormattedDate fieldName="@timestamp" value={''} />
-          </TestProviders>
-        );
-        expect(wrapper.text()).toEqual('(Empty String)');
-      });
-
-      test('it renders against an null as a EMPTY_VALUE', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_UTC)
-        );
-        const wrapper = mount(
-          <TestProviders>
-            <FormattedDate fieldName="@timestamp" value={null} />
-          </TestProviders>
-        );
-        expect(wrapper.text()).toEqual(getEmptyValue());
-      });
-
-      test('it renders against an undefined as a EMPTY_VALUE', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_UTC)
-        );
-        const wrapper = mount(
-          <TestProviders>
-            <FormattedDate fieldName="@timestamp" value={undefined} />
-          </TestProviders>
-        );
-        expect(wrapper.text()).toEqual(getEmptyValue());
-      });
-
-      test('it renders against an invalid date time as just the string its self', () => {
-        mockUseKibanaUiSetting.mockImplementation(
-          getMockKibanaUiSetting(mockFrameworks.default_UTC)
-        );
-        const wrapper = mount(
-          <TestProviders>
-            <FormattedDate fieldName="@timestamp" value={'Rebecca Evan Braden'} />
-          </TestProviders>
-        );
-        expect(wrapper.text()).toEqual('Rebecca Evan Braden');
-      });
+    test('it renders against a numeric epoch', () => {
+      const wrapper = mount(<FormattedDate fieldName="@timestamp" value={1559079339000} />);
+      expect(wrapper.text()).toEqual('May 28, 2019 @ 21:35:39.000');
+    });
+
+    test('it renders against a string epoch', () => {
+      const wrapper = mount(<FormattedDate fieldName="@timestamp" value={'1559079339000'} />);
+      expect(wrapper.text()).toEqual('May 28, 2019 @ 21:35:39.000');
+    });
+
+    test('it renders against a ISO string', () => {
+      const wrapper = mount(
+        <FormattedDate fieldName="@timestamp" value={'2019-05-28T22:04:49.957Z'} />
+      );
+      expect(wrapper.text()).toEqual('May 28, 2019 @ 22:04:49.957');
+    });
+
+    test('it renders against an empty string as an empty string placeholder', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <FormattedDate fieldName="@timestamp" value={''} />
+        </TestProviders>
+      );
+
+      expect(wrapper.text()).toEqual(getEmptyString());
+    });
+
+    test('it renders against an null as a EMPTY_VALUE', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <FormattedDate fieldName="@timestamp" value={null} />
+        </TestProviders>
+      );
+
+      expect(wrapper.text()).toEqual(getEmptyValue());
+    });
+
+    test('it renders against an undefined as a EMPTY_VALUE', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <FormattedDate fieldName="@timestamp" value={undefined} />
+        </TestProviders>
+      );
+
+      expect(wrapper.text()).toEqual(getEmptyValue());
+    });
+
+    test('it renders against an invalid date time as just the string its self', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <FormattedDate fieldName="@timestamp" value={'Rebecca Evan Braden'} />
+        </TestProviders>
+      );
+
+      expect(wrapper.text()).toEqual('Rebecca Evan Braden');
     });
   });
 
   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());
-      });
+    test('renders time over an hour correctly against snapshot', () => {
+      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 37bf3653f3b62..4e5903c02abf7 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
@@ -5,31 +5,19 @@
  */
 
 import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 import { FormattedRelative } from '@kbn/i18n/react';
 
-import {
-  DEFAULT_DATE_FORMAT,
-  DEFAULT_DATE_FORMAT_TZ,
-  DEFAULT_TIMEZONE_BROWSER,
-} from '../../../common/constants';
-import { useKibanaUiSetting } from '../../lib/settings/use_kibana_ui_setting';
+import { useDateFormat, useTimeZone } from '../../hooks';
 import { getOrEmptyTagFromValue } from '../empty_value';
 import { LocalizedDateTooltip } from '../localized_date_tooltip';
 import { getMaybeDate } from './maybe_date';
 
 export const PreferenceFormattedDate = React.memo<{ value: Date }>(({ value }) => {
-  const [dateFormat] = useKibanaUiSetting(DEFAULT_DATE_FORMAT);
-  const [dateFormatTz] = useKibanaUiSetting(DEFAULT_DATE_FORMAT_TZ);
-  const [timezone] = useKibanaUiSetting(DEFAULT_TIMEZONE_BROWSER);
+  const dateFormat = useDateFormat();
+  const timeZone = useTimeZone();
 
-  return (
-    <>
-      {dateFormat && dateFormatTz && timezone
-        ? moment.tz(value, dateFormatTz === 'Browser' ? timezone : dateFormatTz).format(dateFormat)
-        : moment.utc(value).toISOString()}
-    </>
-  );
+  return <>{moment.tz(value, timeZone).format(dateFormat)}</>;
 });
 
 PreferenceFormattedDate.displayName = 'PreferenceFormattedDate';
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_duration/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_duration/index.tsx
index 8afbafe57af4a..fa8d87cf4e82d 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_duration/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_duration/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 { getFormattedDurationString } from './helpers';
 import { FormattedDurationTooltip } from './tooltip';
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_duration/tooltip/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_duration/tooltip/index.tsx
index 1372b3ef10920..6c11a7aad7ad2 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_duration/tooltip/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_duration/tooltip/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import styled from 'styled-components';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/formatted_ip/index.tsx b/x-pack/legacy/plugins/siem/public/components/formatted_ip/index.tsx
index 8dcb558122d01..48d34451404be 100644
--- a/x-pack/legacy/plugins/siem/public/components/formatted_ip/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/formatted_ip/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { isArray, isEmpty, isString, uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { DragEffects, DraggableWrapper } from '../drag_and_drop/draggable_wrapper';
 import { escapeDataProviderId } from '../drag_and_drop/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/header_global/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/header_global/index.test.tsx
index b3eb599af9407..098de39bbfef5 100644
--- a/x-pack/legacy/plugins/siem/public/components/header_global/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/header_global/index.test.tsx
@@ -5,14 +5,12 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import '../../mock/match_media';
-import '../../mock/ui_settings';
 import { HeaderGlobal } from './index';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
+jest.mock('ui/new_platform');
 
 // 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
@@ -24,6 +22,6 @@ describe('HeaderGlobal', () => {
   test('it renders', () => {
     const wrapper = shallow(<HeaderGlobal />);
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/header_page/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/header_page/index.test.tsx
index 5644a344f91d6..83a70fd90d82b 100644
--- a/x-pack/legacy/plugins/siem/public/components/header_page/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/header_page/index.test.tsx
@@ -6,16 +6,12 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import '../../mock/ui_settings';
 import { HeaderPage } from './index';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('HeaderPage', () => {
   const mount = useMountAppended();
 
@@ -32,7 +28,7 @@ describe('HeaderPage', () => {
       </HeaderPage>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the title', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx
index 8606758c68d2c..2bc80be20e42d 100644
--- a/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/header_section/index.test.tsx
@@ -6,20 +6,16 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import '../../mock/ui_settings';
 import { HeaderSection } from './index';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('HeaderSection', () => {
   test('it renders', () => {
     const wrapper = shallow(<HeaderSection title="Test title" />);
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the title', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/inspect/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/inspect/index.test.tsx
index 3a2e516fffb7e..26c5f499717e9 100644
--- a/x-pack/legacy/plugins/siem/public/components/inspect/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/inspect/index.test.tsx
@@ -6,7 +6,7 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import {
diff --git a/x-pack/legacy/plugins/siem/public/components/inspect/index.tsx b/x-pack/legacy/plugins/siem/public/components/inspect/index.tsx
index 6908aba542e4c..04d6d94d6624d 100644
--- a/x-pack/legacy/plugins/siem/public/components/inspect/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/inspect/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
 import { getOr } from 'lodash/fp';
-import React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 import styled from 'styled-components';
@@ -72,72 +72,71 @@ const InspectButtonComponent = React.memo<InspectButtonProps>(
     setIsInspected,
     show,
     title = '',
-  }: InspectButtonProps) => (
-    <InspectContainer
-      data-test-subj={`${show ? 'opaque' : 'transparent'}-inspect-container`}
-      showInspect={show}
-    >
-      {inputId === 'timeline' && !compact && (
-        <EuiButtonEmpty
-          aria-label={i18n.INSPECT}
-          data-test-subj="inspect-empty-button"
-          color="text"
-          iconSide="left"
-          iconType="inspect"
-          isDisabled={loading || isDisabled}
-          isLoading={loading}
-          onClick={() => {
-            setIsInspected({
-              id: queryId,
-              inputId,
-              isInspected: true,
-              selectedInspectIndex: inspectIndex,
-            });
-          }}
-        >
-          {i18n.INSPECT}
-        </EuiButtonEmpty>
-      )}
-      {(inputId === 'global' || compact) && (
-        <EuiButtonIcon
-          aria-label={i18n.INSPECT}
-          data-test-subj="inspect-icon-button"
-          iconSize="m"
-          iconType="inspect"
-          isDisabled={loading || isDisabled}
-          title={i18n.INSPECT}
-          onClick={() => {
-            setIsInspected({
-              id: queryId,
-              inputId,
-              isInspected: true,
-              selectedInspectIndex: inspectIndex,
-            });
-          }}
-        />
-      )}
-      <ModalInspectQuery
-        closeModal={() => {
-          if (onCloseInspect != null) {
-            onCloseInspect();
+  }: InspectButtonProps) => {
+    const handleClick = useCallback(() => {
+      setIsInspected({
+        id: queryId,
+        inputId,
+        isInspected: true,
+        selectedInspectIndex: inspectIndex,
+      });
+    }, [setIsInspected, queryId, inputId, inspectIndex]);
+
+    const handleCloseModal = useCallback(() => {
+      if (onCloseInspect != null) {
+        onCloseInspect();
+      }
+      setIsInspected({
+        id: queryId,
+        inputId,
+        isInspected: false,
+        selectedInspectIndex: inspectIndex,
+      });
+    }, [onCloseInspect, setIsInspected, queryId, inputId, inspectIndex]);
+
+    return (
+      <InspectContainer
+        data-test-subj={`${show ? 'opaque' : 'transparent'}-inspect-container`}
+        showInspect={show}
+      >
+        {inputId === 'timeline' && !compact && (
+          <EuiButtonEmpty
+            aria-label={i18n.INSPECT}
+            data-test-subj="inspect-empty-button"
+            color="text"
+            iconSide="left"
+            iconType="inspect"
+            isDisabled={loading || isDisabled}
+            isLoading={loading}
+            onClick={handleClick}
+          >
+            {i18n.INSPECT}
+          </EuiButtonEmpty>
+        )}
+        {(inputId === 'global' || compact) && (
+          <EuiButtonIcon
+            aria-label={i18n.INSPECT}
+            data-test-subj="inspect-icon-button"
+            iconSize="m"
+            iconType="inspect"
+            isDisabled={loading || isDisabled}
+            title={i18n.INSPECT}
+            onClick={handleClick}
+          />
+        )}
+        <ModalInspectQuery
+          closeModal={handleCloseModal}
+          isShowing={!loading && selectedInspectIndex === inspectIndex && isInspected}
+          request={inspect != null && inspect.dsl.length > 0 ? inspect.dsl[inspectIndex] : null}
+          response={
+            inspect != null && inspect.response.length > 0 ? inspect.response[inspectIndex] : null
           }
-          setIsInspected({
-            id: queryId,
-            inputId,
-            isInspected: false,
-            selectedInspectIndex: inspectIndex,
-          });
-        }}
-        isShowing={!loading && selectedInspectIndex === inspectIndex && isInspected}
-        request={inspect != null && inspect.dsl.length > 0 ? inspect.dsl[inspectIndex] : null}
-        response={
-          inspect != null && inspect.response.length > 0 ? inspect.response[inspectIndex] : null
-        }
-        title={title}
-        data-test-subj="inspect-modal"
-      />
-    </InspectContainer>
-  )
+          title={title}
+          data-test-subj="inspect-modal"
+        />
+      </InspectContainer>
+    );
+  }
 );
 
 InspectButtonComponent.displayName = 'InspectButtonComponent';
diff --git a/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx
index 2dda3eca563fe..cac372a27180e 100644
--- a/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ip/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock/test_providers';
 import { useMountAppended } from '../../utils/use_mount_appended';
@@ -20,7 +19,7 @@ describe('Port', () => {
     const wrapper = shallow(
       <Ip contextId="test" eventId="abcd" fieldName="destination.ip" value="10.1.2.3" />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the the ip address', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ip/index.tsx b/x-pack/legacy/plugins/siem/public/components/ip/index.tsx
index 8c327989963b4..49237c3bb1bb9 100644
--- a/x-pack/legacy/plugins/siem/public/components/ip/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ip/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 { FormattedFieldValue } from '../timeline/body/renderers/formatted_field';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.test.tsx
index 3842b7be67876..c4ea6ff63a0a7 100644
--- a/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.test.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 { TestProviders } from '../../mock';
 import { useMountAppended } from '../../utils/use_mount_appended';
diff --git a/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.tsx b/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.tsx
index 950ab252ad0bd..955a57576dc8e 100644
--- a/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ja3_fingerprint/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 styled from 'styled-components';
 
 import { DraggableBadge } from '../draggables';
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 e2ada4682fdec..69a795d0c8db7 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
@@ -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 { getEmptyValue } from '../empty_value';
 import { LastEventIndexKey } from '../../graphql/types';
@@ -13,7 +13,6 @@ import { mockLastEventTimeQuery } from '../../containers/events/last_event_time/
 import { useMountAppended } from '../../utils/use_mount_appended';
 import { useLastEventTimeQuery } from '../../containers/events/last_event_time';
 import { TestProviders } from '../../mock';
-import '../../mock/ui_settings';
 
 import { LastEventTime } from '.';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/link_icon/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/link_icon/index.test.tsx
index 7f9133a0de7c0..59f2acba4121b 100644
--- a/x-pack/legacy/plugins/siem/public/components/link_icon/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/link_icon/index.test.tsx
@@ -5,15 +5,11 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import '../../mock/ui_settings';
 import { LinkIcon } from './index';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('LinkIcon', () => {
   test('it renders', () => {
     const wrapper = shallow(
@@ -22,7 +18,7 @@ describe('LinkIcon', () => {
       </LinkIcon>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders an action button when onClick is provided', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx
index 21580a0ac8664..dd5c3bf8bb5d5 100644
--- a/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/links/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
 import { encodeIpv6 } from '../../lib/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/links/index.tsx b/x-pack/legacy/plugins/siem/public/components/links/index.tsx
index 9d8d01d2bb49a..f63d13fcda7f0 100644
--- a/x-pack/legacy/plugins/siem/public/components/links/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/links/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiLink } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { encodeIpv6 } from '../../lib/helpers';
 import { getHostDetailsUrl, getIPDetailsUrl } from '../link_to';
diff --git a/x-pack/legacy/plugins/siem/public/components/loader/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/loader/index.test.tsx
index 1c97e766345aa..48dd91922583f 100644
--- a/x-pack/legacy/plugins/siem/public/components/loader/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/loader/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { Loader } from './index';
@@ -17,6 +16,6 @@ describe('rendering', () => {
         {'Loading'}
       </Loader>
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/loading/index.tsx b/x-pack/legacy/plugins/siem/public/components/loading/index.tsx
index 1a3c2fefbf47f..8c39a3d6ffcbe 100644
--- a/x-pack/legacy/plugins/siem/public/components/loading/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/loading/index.tsx
@@ -5,15 +5,8 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiPanel, EuiText } from '@elastic/eui';
-import * as React from 'react';
-import styled, { createGlobalStyle } from 'styled-components';
-
-// SIDE EFFECT: the following `createGlobalStyle` overrides default styling in angular code that was not theme-friendly
-const LoadingPanelGlobalStyle = createGlobalStyle`
-  .euiPanel-loading-hide-border {
-    border: none;
-  }
-`;
+import React from 'react';
+import styled from 'styled-components';
 
 const SpinnerFlexItem = styled(EuiFlexItem)`
   margin-right: 5px;
@@ -39,30 +32,27 @@ export const LoadingPanel = React.memo<LoadingProps>(
     position = 'relative',
     zIndex = 'inherit',
   }) => (
-    <>
-      <LoadingStaticPanel
-        className="app-loading"
-        height={height}
-        width={width}
-        position={position}
-        zIndex={zIndex}
-      >
-        <LoadingStaticContentPanel>
-          <EuiPanel className={showBorder ? '' : 'euiPanel-loading-hide-border'}>
-            <EuiFlexGroup alignItems="center" direction="row" gutterSize="none">
-              <SpinnerFlexItem grow={false}>
-                <EuiLoadingSpinner size="m" />
-              </SpinnerFlexItem>
+    <LoadingStaticPanel
+      className="app-loading"
+      height={height}
+      width={width}
+      position={position}
+      zIndex={zIndex}
+    >
+      <LoadingStaticContentPanel>
+        <EuiPanel className={showBorder ? '' : 'euiPanel-loading-hide-border'}>
+          <EuiFlexGroup alignItems="center" direction="row" gutterSize="none">
+            <SpinnerFlexItem grow={false}>
+              <EuiLoadingSpinner size="m" />
+            </SpinnerFlexItem>
 
-              <EuiFlexItem grow={false}>
-                <EuiText>{text}</EuiText>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiPanel>
-        </LoadingStaticContentPanel>
-      </LoadingStaticPanel>
-      <LoadingPanelGlobalStyle />
-    </>
+            <EuiFlexItem grow={false}>
+              <EuiText>{text}</EuiText>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiPanel>
+      </LoadingStaticContentPanel>
+    </LoadingStaticPanel>
   )
 );
 
diff --git a/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.test.tsx
index 5feb70edffb9a..c25f0d71833c0 100644
--- a/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.test.tsx
@@ -5,7 +5,7 @@
  */
 import { mount } from 'enzyme';
 import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 
 import { LocalizedDateTooltip } from '.';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.tsx b/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.tsx
index 82520ce2745c0..ed0b1b1689218 100644
--- a/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/localized_date_tooltip/index.tsx
@@ -7,7 +7,7 @@
 import { EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { FormattedRelative } from '@kbn/i18n/react';
 import moment from 'moment';
-import * as React from 'react';
+import React from 'react';
 
 export const LocalizedDateTooltip = React.memo<{
   children: React.ReactNode;
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
index 56c215218ad5e..de662c162fc0a 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/index.test.tsx
@@ -4,8 +4,7 @@
  * 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 React from 'react';
 
 import { Markdown } from '.';
 
@@ -98,7 +97,7 @@ describe('Markdown', () => {
     test('it renders the expected table content', () => {
       const wrapper = shallow(<Markdown raw={rawTable} />);
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
@@ -152,7 +151,7 @@ describe('Markdown', () => {
     test('it renders the expected content containing a link', () => {
       const wrapper = shallow(<Markdown raw={markdownWithLink} />);
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
index 16e065ae721c9..30695c9d0c7e2 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/index.tsx
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { EuiLink, EuiTableRow, EuiTableRowCell, EuiText, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import ReactMarkdown from 'react-markdown';
 import styled from 'styled-components';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx
index 80ccd07c30249..59aae5abce5c4 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { MarkdownHintComponent } from './markdown_hint';
 
@@ -89,7 +88,7 @@ describe('MarkdownHintComponent ', () => {
     test('it renders the expected hints', () => {
       const wrapper = shallow(<MarkdownHintComponent show={true} />);
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.tsx b/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.tsx
index 5ecd1d4c9d2ad..199059670e4bd 100644
--- a/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/markdown/markdown_hint.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import * as i18n from './translations';
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
index bdd8a0c544ed8..78a4c967ee0bb 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.test.tsx
@@ -4,17 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { shallow } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { MatrixHistogram } from '.';
 
-jest.mock('@elastic/eui', () => {
-  return {
-    EuiPanel: (children: JSX.Element) => <>{children}</>,
-    EuiLoadingContent: () => <div className="euiLoadingContent" />,
-  };
-});
+jest.mock('../../lib/kibana');
 
 jest.mock('../loader', () => {
   return {
@@ -22,10 +19,6 @@ jest.mock('../loader', () => {
   };
 });
 
-jest.mock('../../lib/settings/use_kibana_ui_setting', () => {
-  return { useKibanaUiSetting: () => [false] };
-});
-
 jest.mock('../header_section', () => {
   return {
     HeaderSection: () => <div className="headerSection" />,
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx
index f79c61a29c26b..c29b5282e13af 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import { ScaleType } from '@elastic/charts';
 
 import darkTheme from '@elastic/eui/dist/eui_theme_dark.json';
@@ -14,7 +14,7 @@ import { BarChart } from '../charts/barchart';
 import { HeaderSection } from '../header_section';
 import { ChartSeriesData } from '../charts/common';
 import { DEFAULT_DARK_MODE } from '../../../common/constants';
-import { useKibanaUiSetting } from '../../lib/settings/use_kibana_ui_setting';
+import { useUiSetting$ } from '../../lib/kibana';
 import { Loader } from '../loader';
 import { Panel } from '../panel';
 import { getBarchartConfigs, getCustomChartData } from './utils';
@@ -45,7 +45,7 @@ export const MatrixHistogram = ({
     showLegend,
   });
   const [showInspect, setShowInspect] = useState(false);
-  const [darkMode] = useKibanaUiSetting(DEFAULT_DARK_MODE);
+  const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
   const [loadingInitial, setLoadingInitial] = useState(false);
 
   const barChartData: ChartSeriesData[] = getCustomChartData(data, mapping);
@@ -54,14 +54,17 @@ export const MatrixHistogram = ({
     if (totalCount >= 0 && loadingInitial) {
       setLoadingInitial(false);
     }
-  }, [loading]);
+  }, [loading, loadingInitial, totalCount]);
+
+  const handleOnMouseEnter = useCallback(() => setShowInspect(true), []);
+  const handleOnMouseLeave = useCallback(() => setShowInspect(false), []);
 
   return (
     <Panel
       data-test-subj={`${dataKey}Panel`}
       loading={loading}
-      onMouseEnter={() => setShowInspect(true)}
-      onMouseLeave={() => setShowInspect(false)}
+      onMouseEnter={handleOnMouseEnter}
+      onMouseLeave={handleOnMouseLeave}
     >
       <HeaderSection
         id={id}
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
index 1eb5e96b86857..a7ef71f7a6a0d 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
@@ -6,7 +6,7 @@
 
 import { ScaleType, niceTimeFormatter, Position } from '@elastic/charts';
 import { get, groupBy, map, toPairs } from 'lodash/fp';
-import numeral from '@elastic/numeral';
+
 import { UpdateDateRange, ChartSeriesData } from '../charts/common';
 import { MatrixHistogramDataTypes, MatrixHistogramMappingTypes } from './types';
 
@@ -87,7 +87,3 @@ export const getCustomChartData = (
     }, formattedChartData);
   else return formattedChartData;
 };
-
-export const bytesFormatter = (value: number) => {
-  return numeral(value).format('0,0.[0]b');
-};
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/anomaly_table_provider.tsx b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/anomaly_table_provider.tsx
index 3966448f84df0..6ccc41546e558 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/anomaly_table_provider.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/anomaly_table_provider.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 { InfluencerInput, Anomalies, CriteriaFields } from '../types';
 import { useAnomaliesTableData } from './use_anomalies_table_data';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
index 130c326339b1b..48277b0b6fa52 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts
@@ -14,12 +14,9 @@ import { useStateToaster } from '../../toasters';
 import { errorToToaster } from '../api/error_to_toaster';
 
 import * as i18n from './translations';
-import { useKibanaUiSetting } from '../../../lib/settings/use_kibana_ui_setting';
-import {
-  DEFAULT_ANOMALY_SCORE,
-  DEFAULT_TIMEZONE_BROWSER,
-  DEFAULT_KBN_VERSION,
-} from '../../../../common/constants';
+import { useUiSetting$ } from '../../../lib/kibana';
+import { DEFAULT_ANOMALY_SCORE } from '../../../../common/constants';
+import { useTimeZone } from '../../../hooks';
 
 interface Args {
   influencers?: InfluencerInput[];
@@ -67,9 +64,8 @@ export const useAnomaliesTableData = ({
   const capabilities = useContext(MlCapabilitiesContext);
   const userPermissions = hasMlUserPermissions(capabilities);
   const [, dispatchToaster] = useStateToaster();
-  const [timezone] = useKibanaUiSetting(DEFAULT_TIMEZONE_BROWSER);
-  const [anomalyScore] = useKibanaUiSetting(DEFAULT_ANOMALY_SCORE);
-  const [kbnVersion] = useKibanaUiSetting(DEFAULT_KBN_VERSION);
+  const timeZone = useTimeZone();
+  const [anomalyScore] = useUiSetting$<number>(DEFAULT_ANOMALY_SCORE);
 
   const siemJobIds = siemJobs.filter(job => job.isInstalled).map(job => job.id);
 
@@ -95,11 +91,10 @@ export const useAnomaliesTableData = ({
               earliestMs,
               latestMs,
               influencers: influencersInput,
-              dateFormatTz: timezone,
+              dateFormatTz: timeZone,
               maxRecords: 500,
               maxExamples: 10,
             },
-            kbnVersion,
             abortCtrl.signal
           );
           if (isSubscribed) {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/api/anomalies_table_data.ts b/x-pack/legacy/plugins/siem/public/components/ml/api/anomalies_table_data.ts
index e66d984a15294..10b2538d1e785 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/api/anomalies_table_data.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml/api/anomalies_table_data.ts
@@ -21,20 +21,15 @@ export interface Body {
   maxExamples: number;
 }
 
-export const anomaliesTableData = async (
-  body: Body,
-  kbnVersion: string,
-  signal: AbortSignal
-): Promise<Anomalies> => {
+export const anomaliesTableData = async (body: Body, signal: AbortSignal): Promise<Anomalies> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/results/anomalies_table_data`, {
     method: 'POST',
     credentials: 'same-origin',
     body: JSON.stringify(body),
     headers: {
-      'kbn-system-api': 'true',
       'content-Type': 'application/json',
-      'kbn-xsrf': kbnVersion,
-      'kbn-version': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
     signal,
   });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/api/get_ml_capabilities.ts b/x-pack/legacy/plugins/siem/public/components/ml/api/get_ml_capabilities.ts
index c1654a1648f2b..1333951028494 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/api/get_ml_capabilities.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml/api/get_ml_capabilities.ts
@@ -22,18 +22,14 @@ export interface Body {
   maxExamples: number;
 }
 
-export const getMlCapabilities = async (
-  kbnVersion: string,
-  signal: AbortSignal
-): Promise<MlCapabilities> => {
+export const getMlCapabilities = async (signal: AbortSignal): Promise<MlCapabilities> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/ml_capabilities`, {
     method: 'GET',
     credentials: 'same-origin',
     headers: {
-      'kbn-system-api': 'true',
       'content-Type': 'application/json',
-      'kbn-xsrf': kbnVersion,
-      'kbn-version': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
     signal,
   });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/api/throw_if_not_ok.test.ts b/x-pack/legacy/plugins/siem/public/components/ml/api/throw_if_not_ok.test.ts
index cb1ed1bfe8e84..9fd0010535203 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/api/throw_if_not_ok.test.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml/api/throw_if_not_ok.test.ts
@@ -230,7 +230,7 @@ describe('throw_if_not_ok', () => {
               path: '/_ml/anomaly_detectors/siem-api-suspicious_login_activity_ecs',
               query: {},
               body:
-                '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Detect unusually high number of authentication attempts (beta)","groups":["siem"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"high number of authentication attempts","function":"high_non_zero_count","partition_field_name":"host.name"}],"influencers":["host.name","user.name","source.ip"]},"analysis_limits":{"model_memory_limit":"256mb"},"data_description":{"time_field":"@timestamp","time_format":"epoch_ms"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"IP Address Details","url_value":"siem#/ml-network/ip/$source.ip$?_g=()&query=!n&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]}}',
+                '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Detect unusually high number of authentication attempts (beta)","groups":["siem"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"high number of authentication attempts","function":"high_non_zero_count","partition_field_name":"host.name"}],"influencers":["host.name","user.name","source.ip"]},"analysis_limits":{"model_memory_limit":"256mb"},"data_description":{"time_field":"@timestamp","time_format":"epoch_ms"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"IP Address Details","url_value":"siem#/ml-network/ip/$source.ip$?query=!n&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]}}',
               statusCode: 400,
               response:
                 '{"error":{"root_cause":[{"type":"status_exception","reason":"This job would cause a mapping clash with existing field [multi_bucket_impact] - avoid the clash by assigning a dedicated results index"}],"type":"status_exception","reason":"This job would cause a mapping clash with existing field [multi_bucket_impact] - avoid the clash by assigning a dedicated results index","caused_by":{"type":"illegal_argument_exception","reason":"mapper [multi_bucket_impact] of different type, current_type [keyword], merged_type [double]"}},"status":400}',
@@ -245,7 +245,7 @@ describe('throw_if_not_ok', () => {
               path: '/_ml/anomaly_detectors/siem-api-rare_process_linux_ecs',
               query: {},
               body:
-                '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Detect unusually rare processes on Linux (beta)","groups":["siem"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"rare process executions on Linux","function":"rare","by_field_name":"process.name","partition_field_name":"host.name"}],"influencers":["host.name","process.name","user.name"]},"analysis_limits":{"model_memory_limit":"256mb"},"data_description":{"time_field":"@timestamp","time_format":"epoch_ms"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"Host Details by process name","url_value":"siem#/ml-hosts/$host.name$?_g=()&query=(query:\'process.name%20:%20%22$process.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Host Details by user name","url_value":"siem#/ml-hosts/$host.name$?_g=()&query=(query:\'user.name%20:%20%22$user.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by process name","url_value":"siem#/ml-hosts?_g=()&query=(query:\'process.name%20:%20%22$process.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by user name","url_value":"siem#/ml-hosts?_g=()&query=(query:\'user.name%20:%20%22$user.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]}}',
+                '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Detect unusually rare processes on Linux (beta)","groups":["siem"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"rare process executions on Linux","function":"rare","by_field_name":"process.name","partition_field_name":"host.name"}],"influencers":["host.name","process.name","user.name"]},"analysis_limits":{"model_memory_limit":"256mb"},"data_description":{"time_field":"@timestamp","time_format":"epoch_ms"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"Host Details by process name","url_value":"siem#/ml-hosts/$host.name$?query=(query:\'process.name%20:%20%22$process.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Host Details by user name","url_value":"siem#/ml-hosts/$host.name$?query=(query:\'user.name%20:%20%22$user.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by process name","url_value":"siem#/ml-hosts?query=(query:\'process.name%20:%20%22$process.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by user name","url_value":"siem#/ml-hosts?query=(query:\'user.name%20:%20%22$user.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]}}',
               statusCode: 400,
               response:
                 '{"error":{"root_cause":[{"type":"status_exception","reason":"This job would cause a mapping clash with existing field [multi_bucket_impact] - avoid the clash by assigning a dedicated results index"}],"type":"status_exception","reason":"This job would cause a mapping clash with existing field [multi_bucket_impact] - avoid the clash by assigning a dedicated results index","caused_by":{"type":"illegal_argument_exception","reason":"mapper [multi_bucket_impact] of different type, current_type [keyword], merged_type [double]"}},"status":400}',
@@ -320,7 +320,7 @@ describe('throw_if_not_ok', () => {
               path: '/_ml/anomaly_detectors/siem-api-suspicious_login_activity_ecs',
               query: {},
               body:
-                '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Detect unusually high number of authentication attempts (beta)","groups":["siem"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"high number of authentication attempts","function":"high_non_zero_count","partition_field_name":"host.name"}],"influencers":["host.name","user.name","source.ip"]},"analysis_limits":{"model_memory_limit":"256mb"},"data_description":{"time_field":"@timestamp","time_format":"epoch_ms"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"IP Address Details","url_value":"siem#/ml-network/ip/$source.ip$?_g=()&query=!n,queryLocation:network.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]}}',
+                '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Detect unusually high number of authentication attempts (beta)","groups":["siem"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"high number of authentication attempts","function":"high_non_zero_count","partition_field_name":"host.name"}],"influencers":["host.name","user.name","source.ip"]},"analysis_limits":{"model_memory_limit":"256mb"},"data_description":{"time_field":"@timestamp","time_format":"epoch_ms"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"IP Address Details","url_value":"siem#/ml-network/ip/$source.ip$?query=!n,queryLocation:network.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]}}',
               statusCode: 400,
               response:
                 '{"error":{"root_cause":[{"type":"status_exception","reason":"This job would cause a mapping clash with existing field [multi_bucket_impact] - avoid the clash by assigning a dedicated results index"}],"type":"status_exception","reason":"This job would cause a mapping clash with existing field [multi_bucket_impact] - avoid the clash by assigning a dedicated results index","caused_by":{"type":"illegal_argument_exception","reason":"mapper [multi_bucket_impact] of different type, current_type [keyword], merged_type [double]"}},"status":400}',
@@ -335,7 +335,7 @@ describe('throw_if_not_ok', () => {
               path: '/_ml/anomaly_detectors/siem-api-rare_process_linux_ecs',
               query: {},
               body:
-                '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Detect unusually rare processes on Linux (beta)","groups":["siem"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"rare process executions on Linux","function":"rare","by_field_name":"process.name","partition_field_name":"host.name"}],"influencers":["host.name","process.name","user.name"]},"analysis_limits":{"model_memory_limit":"256mb"},"data_description":{"time_field":"@timestamp","time_format":"epoch_ms"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"Host Details by process name","url_value":"siem#/ml-hosts/$host.name$?_g=()&query=(query:\'process.name%20:%20%22$process.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Host Details by user name","url_value":"siem#/ml-hosts/$host.name$?_g=()&query=(query:\'user.name%20:%20%22$user.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by process name","url_value":"siem#/ml-hosts?_g=()&query=(query:\'process.name%20:%20%22$process.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by user name","url_value":"siem#/ml-hosts?_g=()&query=(query:\'user.name%20:%20%22$user.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]}}',
+                '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Detect unusually rare processes on Linux (beta)","groups":["siem"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"rare process executions on Linux","function":"rare","by_field_name":"process.name","partition_field_name":"host.name"}],"influencers":["host.name","process.name","user.name"]},"analysis_limits":{"model_memory_limit":"256mb"},"data_description":{"time_field":"@timestamp","time_format":"epoch_ms"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"Host Details by process name","url_value":"siem#/ml-hosts/$host.name$?query=(query:\'process.name%20:%20%22$process.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Host Details by user name","url_value":"siem#/ml-hosts/$host.name$?query=(query:\'user.name%20:%20%22$user.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by process name","url_value":"siem#/ml-hosts?query=(query:\'process.name%20:%20%22$process.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by user name","url_value":"siem#/ml-hosts?query=(query:\'user.name%20:%20%22$user.name$%22\',language:kuery)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]}}',
               statusCode: 400,
               response:
                 '{"error":{"root_cause":[{"type":"status_exception","reason":"This job would cause a mapping clash with existing field [multi_bucket_impact] - avoid the clash by assigning a dedicated results index"}],"type":"status_exception","reason":"This job would cause a mapping clash with existing field [multi_bucket_impact] - avoid the clash by assigning a dedicated results index","caused_by":{"type":"illegal_argument_exception","reason":"mapper [multi_bucket_impact] of different type, current_type [keyword], merged_type [double]"}},"status":400}',
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/api/throw_if_not_ok.ts b/x-pack/legacy/plugins/siem/public/components/ml/api/throw_if_not_ok.ts
index 5d28f4b40ab60..6ca843207a15e 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/api/throw_if_not_ok.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml/api/throw_if_not_ok.ts
@@ -10,11 +10,7 @@ import * as i18n from './translations';
 import { MlError } from '../types';
 import { SetupMlResponse } from '../../ml_popover/types';
 
-export interface MessageBody {
-  error?: string;
-  message?: string;
-  statusCode?: number;
-}
+export { MessageBody, parseJsonFromBody } from '../../../utils/api';
 
 export interface MlStartJobError {
   error: MlError;
@@ -35,15 +31,6 @@ export class ToasterErrors extends Error implements ToasterErrorsType {
   }
 }
 
-export const parseJsonFromBody = async (response: Response): Promise<MessageBody | null> => {
-  try {
-    const text = await response.text();
-    return JSON.parse(text);
-  } catch (error) {
-    return null;
-  }
-};
-
 export const tryParseResponse = (response: string): string => {
   try {
     return JSON.stringify(JSON.parse(response), null, 2);
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/entity_draggable.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/entity_draggable.test.tsx
index 562e3c15675a7..c48a5590b49cf 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/entity_draggable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/entity_draggable.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import React from 'react';
-import toJson from 'enzyme-to-json';
 import { shallow } from 'enzyme';
 import { EntityDraggableComponent } from './entity_draggable';
 import { TestProviders } from '../../mock/test_providers';
@@ -22,7 +21,7 @@ describe('entity_draggable', () => {
         entityValue="entity-value"
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('renders with entity name with entity value as text', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/influencers/create_influencers.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/influencers/create_influencers.test.tsx
index 615e83d208dd6..d49c3008b696c 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/influencers/create_influencers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/influencers/create_influencers.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import React from 'react';
-import toJson from 'enzyme-to-json';
 import { mockAnomalies } from '../mock';
 import { cloneDeep } from 'lodash/fp';
 import { shallow, mount } from 'enzyme';
@@ -20,7 +19,7 @@ describe('create_influencers', () => {
 
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<span>{createInfluencers(anomalies.anomalies[0].influencers)}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it returns an empty string when influencers is undefined', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx b/x-pack/legacy/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx
index 352f39a75ded1..cae05e26b115b 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx
@@ -11,8 +11,6 @@ import { getMlCapabilities } from '../api/get_ml_capabilities';
 import { emptyMlCapabilities } from '../empty_ml_capabilities';
 import { errorToToaster } from '../api/error_to_toaster';
 import { useStateToaster } from '../../toasters';
-import { useKibanaUiSetting } from '../../../lib/settings/use_kibana_ui_setting';
-import { DEFAULT_KBN_VERSION } from '../../../../common/constants';
 
 import * as i18n from './translations';
 
@@ -36,7 +34,6 @@ export const MlCapabilitiesProvider = React.memo<{ children: JSX.Element }>(({ c
     emptyMlCapabilitiesProvider
   );
   const [, dispatchToaster] = useStateToaster();
-  const [kbnVersion] = useKibanaUiSetting(DEFAULT_KBN_VERSION);
 
   useEffect(() => {
     let isSubscribed = true;
@@ -44,7 +41,7 @@ export const MlCapabilitiesProvider = React.memo<{ children: JSX.Element }>(({ c
 
     async function fetchMlCapabilities() {
       try {
-        const mlCapabilities = await getMlCapabilities(kbnVersion, abortCtrl.signal);
+        const mlCapabilities = await getMlCapabilities(abortCtrl.signal);
         if (isSubscribed) {
           setCapabilities({ ...mlCapabilities, capabilitiesFetched: true });
         }
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx
index f7d9052b19a2f..9ff0081f4359f 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_score.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { AnomalyScoreComponent } from './anomaly_score';
 import { mockAnomalies } from '../mock';
 import { TestProviders } from '../../../mock/test_providers';
@@ -17,8 +16,6 @@ import { Anomalies } from '../types';
 const endDate: number = new Date('3000-01-01T00:00:00.000Z').valueOf();
 const narrowDateRange = jest.fn();
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
-
 describe('anomaly_scores', () => {
   let anomalies: Anomalies = cloneDeep(mockAnomalies);
   const mount = useMountAppended();
@@ -38,7 +35,7 @@ describe('anomaly_scores', () => {
         narrowDateRange={narrowDateRange}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should not show a popover on initial render', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx
index f01df38138456..3041134f669ee 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { AnomalyScoresComponent, createJobKey } from './anomaly_scores';
 import { mockAnomalies } from '../mock';
 import { TestProviders } from '../../../mock/test_providers';
@@ -18,8 +17,6 @@ import { useMountAppended } from '../../../utils/use_mount_appended';
 const endDate: number = new Date('3000-01-01T00:00:00.000Z').valueOf();
 const narrowDateRange = jest.fn();
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
-
 describe('anomaly_scores', () => {
   let anomalies: Anomalies = cloneDeep(mockAnomalies);
   const mount = useMountAppended();
@@ -38,7 +35,7 @@ describe('anomaly_scores', () => {
         narrowDateRange={narrowDateRange}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('renders spinner when isLoading is true is passed', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx
index d55c6972d5cac..7c8900bf77d95 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx
@@ -5,14 +5,13 @@
  */
 
 import { shallow, mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { mockAnomalies } from '../mock';
 import { createDescriptionList } from './create_description_list';
 import { EuiDescriptionList } from '@elastic/eui';
 import { Anomaly } from '../types';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
+jest.mock('../../../lib/kibana');
 
 const endDate: number = new Date('3000-01-01T00:00:00.000Z').valueOf();
 
@@ -35,7 +34,7 @@ describe('create_description_list', () => {
         )}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it calls the narrow date range function on click', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.test.tsx
index 0d389ae14a825..f7759bb74c3ab 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import React from 'react';
-import toJson from 'enzyme-to-json';
 import { mockAnomalies } from '../mock';
 import { cloneDeep } from 'lodash/fp';
 import { shallow } from 'enzyme';
@@ -22,13 +21,13 @@ describe('draggable_score', () => {
     const wrapper = shallow(
       <DraggableScoreComponent id="some-id" index={0} score={anomalies.anomalies[0]} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('renders correctly against snapshot when the index is not included', () => {
     const wrapper = shallow(
       <DraggableScoreComponent id="some-id" score={anomalies.anomalies[0]} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.tsx b/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.tsx
index 6ae31c0ac1fb9..732eaf4bc5e78 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/score/draggable_score.tsx
@@ -20,41 +20,45 @@ export const DraggableScoreComponent = ({
   id: string;
   index?: number;
   score: Anomaly;
-}): JSX.Element => (
-  <DraggableWrapper
-    key={`draggable-score-draggable-wrapper-${id}`}
-    dataProvider={{
-      and: [],
-      enabled: true,
-      id,
-      name: score.entityName,
-      excluded: false,
-      kqlQuery: '',
-      queryMatch: {
-        field: score.entityName,
-        value: score.entityValue,
-        operator: IS_OPERATOR,
-      },
-    }}
-    render={(dataProvider, _, snapshot) =>
-      snapshot.isDragging ? (
-        <DragEffects>
-          <Provider dataProvider={dataProvider} />
-        </DragEffects>
-      ) : (
-        <>
-          {index !== 0 && (
-            <>
-              {','}
-              <Spacer />
-            </>
-          )}
-          {getScoreString(score.severity)}
-        </>
-      )
-    }
-  />
-);
+}): JSX.Element => {
+  const scoreString = getScoreString(score.severity);
+
+  return (
+    <DraggableWrapper
+      key={`draggable-score-draggable-wrapper-${id}`}
+      dataProvider={{
+        and: [],
+        enabled: true,
+        id,
+        name: score.entityName,
+        excluded: false,
+        kqlQuery: '',
+        queryMatch: {
+          field: score.entityName,
+          value: score.entityValue,
+          operator: IS_OPERATOR,
+        },
+      }}
+      render={(dataProvider, _, snapshot) =>
+        snapshot.isDragging ? (
+          <DragEffects>
+            <Provider dataProvider={dataProvider} />
+          </DragEffects>
+        ) : (
+          <>
+            {index !== 0 && (
+              <>
+                {','}
+                <Spacer />
+              </>
+            )}
+            {scoreString}
+          </>
+        )
+      }
+    />
+  );
+};
 
 DraggableScoreComponent.displayName = 'DraggableScoreComponent';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx b/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx
index 05f9683a79c97..7afcca47a8765 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx
@@ -27,7 +27,7 @@ const sorting = {
     field: 'anomaly.severity',
     direction: 'desc',
   },
-};
+} as const;
 
 export const AnomaliesHostTable = React.memo<AnomaliesHostTableProps>(
   ({ startDate, endDate, narrowDateRange, hostName, skip, type }): JSX.Element | null => {
@@ -71,8 +71,10 @@ export const AnomaliesHostTable = React.memo<AnomaliesHostTableProps>(
           />
 
           <BasicTable
+            // @ts-ignore the Columns<T, U> type is not as specific as EUI's...
             columns={columns}
             compressed
+            // @ts-ignore ...which leads to `networks` not "matching" the columns
             items={hosts}
             pagination={pagination}
             sorting={sorting}
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx b/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx
index 24baa7505d00b..341e1c6e49235 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx
@@ -26,7 +26,7 @@ const sorting = {
     field: 'anomaly.severity',
     direction: 'desc',
   },
-};
+} as const;
 
 export const AnomaliesNetworkTable = React.memo<AnomaliesNetworkTableProps>(
   ({ startDate, endDate, narrowDateRange, skip, ip, type, flowTarget }): JSX.Element | null => {
@@ -69,8 +69,10 @@ export const AnomaliesNetworkTable = React.memo<AnomaliesNetworkTableProps>(
           />
 
           <BasicTable
+            // @ts-ignore the Columns<T, U> type is not as specific as EUI's...
             columns={columns}
             compressed
+            // @ts-ignore ...which leads to `networks` not "matching" the columns
             items={networks}
             pagination={pagination}
             sorting={sorting}
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/tables/basic_table.tsx b/x-pack/legacy/plugins/siem/public/components/ml/tables/basic_table.tsx
index 537519e5c9d2e..ab05561e73176 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml/tables/basic_table.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml/tables/basic_table.tsx
@@ -7,11 +7,10 @@
 import styled from 'styled-components';
 import { EuiInMemoryTable, EuiInMemoryTableProps } from '@elastic/eui';
 
-// TODO: Remove this once EuiBasicTable supports in its table props the boolean of compressed
-type ExtendedInMemoryTable = EuiInMemoryTableProps & { compressed: boolean };
-const Extended: React.FunctionComponent<ExtendedInMemoryTable> = EuiInMemoryTable;
-
-export const BasicTable = styled(Extended)`
+type BasicTableType<T> = React.ComponentType<EuiInMemoryTableProps<T>>;
+export const BasicTable: typeof EuiInMemoryTable & { displayName: string } = styled(
+  EuiInMemoryTable as BasicTableType<any> // eslint-disable-line @typescript-eslint/no-explicit-any
+)`
   tbody {
     th,
     td {
@@ -22,6 +21,6 @@ export const BasicTable = styled(Extended)`
       display: block;
     }
   }
-`;
+` as any; // eslint-disable-line @typescript-eslint/no-explicit-any
 
 BasicTable.displayName = 'BasicTable';
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 daac4835adb28..4e6484c23613f 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
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 import { Columns } from '../../paginated_table';
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 2113d3b82f52e..0c823ef75cf26 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
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/__mocks__/api.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/__mocks__/api.tsx
index 76c276cf69b63..54bb0a96207e1 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/__mocks__/api.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/__mocks__/api.tsx
@@ -145,22 +145,22 @@ export const mockGetModuleResponse: Module[] = [
               {
                 url_name: 'Host Details by process name',
                 url_value:
-                  "siem#/ml-hosts/$host.name$?_g=()&kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts/$host.name$?kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
               {
                 url_name: 'Host Details by user name',
                 url_value:
-                  "siem#/ml-hosts/$host.name$?_g=()&kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts/$host.name$?kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
               {
                 url_name: 'Hosts Overview by process name',
                 url_value:
-                  "siem#/ml-hosts?_g=()&kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts?kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
               {
                 url_name: 'Hosts Overview by user name',
                 url_value:
-                  "siem#/ml-hosts?_g=()&kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts?kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
             ],
           },
@@ -221,22 +221,22 @@ export const mockGetModuleResponse: Module[] = [
               {
                 url_name: 'Host Details by process name',
                 url_value:
-                  "siem#/ml-hosts/$host.name$?_g=()&kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts/$host.name$?kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
               {
                 url_name: 'Host Details by user name',
                 url_value:
-                  "siem#/ml-hosts/$host.name$?_g=()&kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts/$host.name$?kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
               {
                 url_name: 'Hosts Overview by process name',
                 url_value:
-                  "siem#/ml-hosts?_g=()&kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts?kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
               {
                 url_name: 'Hosts Overview by user name',
                 url_value:
-                  "siem#/ml-hosts?_g=()&kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts?kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
             ],
           },
@@ -268,22 +268,22 @@ export const mockGetModuleResponse: Module[] = [
               {
                 url_name: 'Host Details by process name',
                 url_value:
-                  "siem#/ml-hosts/$host.name$?_g=()&kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts/$host.name$?kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
               {
                 url_name: 'Host Details by user name',
                 url_value:
-                  "siem#/ml-hosts/$host.name$?_g=()&kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts/$host.name$?kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
               {
                 url_name: 'Hosts Overview by process name',
                 url_value:
-                  "siem#/ml-hosts?_g=()&kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts?kqlQuery=(filterQuery:(expression:'process.name%20:%20%22$process.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
               {
                 url_name: 'Hosts Overview by user name',
                 url_value:
-                  "siem#/ml-hosts?_g=()&kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
+                  "siem#/ml-hosts?kqlQuery=(filterQuery:(expression:'user.name%20:%20%22$user.name$%22',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')),timeline:(linkTo:!(global),timerange:(from:'$earliest$',kind:absolute,to:'$latest$')))",
               },
             ],
           },
@@ -360,7 +360,7 @@ export const mockSetupMlJobAllError: SetupMlResponse = {
         path: '/_ml/anomaly_detectors/linux_anomalous_network_url_activity_ecs',
         query: {},
         body:
-          '{"job_type":"anomaly_detector","groups":["siem","auditbeat","process"],"description":"SIEM Auditbeat: Looks for an unusual web URL request from a Linux instance. Curl and wget web request activity is very common but unusual web requests from a Linux server can sometimes be malware delivery or execution (beta)","analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"rare by \\"process.title\\"","function":"rare","by_field_name":"process.title"}],"influencers":["host.name","destination.ip","destination.port"]},"analysis_limits":{"model_memory_limit":"32mb"},"data_description":{"time_field":"@timestamp"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"Host Details","url_value":"siem#/ml-hosts/$host.name$?_g=()&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]},"results_index_name":"linux_anomalous_network_url_activity_ecs"}',
+          '{"job_type":"anomaly_detector","groups":["siem","auditbeat","process"],"description":"SIEM Auditbeat: Looks for an unusual web URL request from a Linux instance. Curl and wget web request activity is very common but unusual web requests from a Linux server can sometimes be malware delivery or execution (beta)","analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"rare by \\"process.title\\"","function":"rare","by_field_name":"process.title"}],"influencers":["host.name","destination.ip","destination.port"]},"analysis_limits":{"model_memory_limit":"32mb"},"data_description":{"time_field":"@timestamp"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"Host Details","url_value":"siem#/ml-hosts/$host.name$?timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]},"results_index_name":"linux_anomalous_network_url_activity_ecs"}',
         statusCode: 400,
         response:
           '{"error":{"root_cause":[{"type":"resource_already_exists_exception","reason":"The job cannot be created with the Id \'linux_anomalous_network_url_activity_ecs\'. The Id is already used."}],"type":"resource_already_exists_exception","reason":"The job cannot be created with the Id \'linux_anomalous_network_url_activity_ecs\'. The Id is already used."},"status":400}',
@@ -375,7 +375,7 @@ export const mockSetupMlJobAllError: SetupMlResponse = {
         path: '/_ml/anomaly_detectors/linux_anomalous_network_port_activity_ecs',
         query: {},
         body:
-          '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Looks for unusual destination port activity that could indicate command-and-control, persistence mechanism, or data exfiltration activity (beta)","groups":["siem","auditbeat","process"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"rare by \\"destination.port\\"","function":"rare","by_field_name":"destination.port"}],"influencers":["host.name","process.name","user.name","destination.ip"]},"analysis_limits":{"model_memory_limit":"32mb"},"data_description":{"time_field":"@timestamp"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"Host Details by process name","url_value":"siem#/ml-hosts/$host.name$?_g=()&kqlQuery=(filterQuery:(expression:\'process.name%20:%20%22$process.name$%22\',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Host Details by user name","url_value":"siem#/ml-hosts/$host.name$?_g=()&kqlQuery=(filterQuery:(expression:\'user.name%20:%20%22$user.name$%22\',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by process name","url_value":"siem#/ml-hosts?_g=()&kqlQuery=(filterQuery:(expression:\'process.name%20:%20%22$process.name$%22\',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by user name","url_value":"siem#/ml-hosts?_g=()&kqlQuery=(filterQuery:(expression:\'user.name%20:%20%22$user.name$%22\',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]},"results_index_name":"linux_anomalous_network_port_activity_ecs"}',
+          '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Looks for unusual destination port activity that could indicate command-and-control, persistence mechanism, or data exfiltration activity (beta)","groups":["siem","auditbeat","process"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"rare by \\"destination.port\\"","function":"rare","by_field_name":"destination.port"}],"influencers":["host.name","process.name","user.name","destination.ip"]},"analysis_limits":{"model_memory_limit":"32mb"},"data_description":{"time_field":"@timestamp"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"Host Details by process name","url_value":"siem#/ml-hosts/$host.name$?kqlQuery=(filterQuery:(expression:\'process.name%20:%20%22$process.name$%22\',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Host Details by user name","url_value":"siem#/ml-hosts/$host.name$?kqlQuery=(filterQuery:(expression:\'user.name%20:%20%22$user.name$%22\',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by process name","url_value":"siem#/ml-hosts?kqlQuery=(filterQuery:(expression:\'process.name%20:%20%22$process.name$%22\',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by user name","url_value":"siem#/ml-hosts?kqlQuery=(filterQuery:(expression:\'user.name%20:%20%22$user.name$%22\',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]},"results_index_name":"linux_anomalous_network_port_activity_ecs"}',
         statusCode: 400,
         response:
           '{"error":{"root_cause":[{"type":"resource_already_exists_exception","reason":"The job cannot be created with the Id \'linux_anomalous_network_port_activity_ecs\'. The Id is already used."}],"type":"resource_already_exists_exception","reason":"The job cannot be created with the Id \'linux_anomalous_network_port_activity_ecs\'. The Id is already used."},"status":400}',
@@ -430,7 +430,7 @@ export const mockSetupMlJobSingleErrorSingleSuccess: SetupMlResponse = {
         path: '/_ml/anomaly_detectors/linux_anomalous_network_activity_ecs',
         query: {},
         body:
-          '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Looks for unusual processes using the network which could indicate command-and-control, lateral movement, persistence, or data exfiltration activity (beta)","groups":["siem","auditbeat","network"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"rare by \\"process.name\\"","function":"rare","by_field_name":"process.name"}],"influencers":["host.name","process.name","user.name","destination.ip"]},"analysis_limits":{"model_memory_limit":"64mb"},"data_description":{"time_field":"@timestamp"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"Host Details by process name","url_value":"siem#/ml-hosts/$host.name$?_g=()&kqlQuery=(filterQuery:(expression:\'process.name%20:%20%22$process.name$%22\',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Host Details by user name","url_value":"siem#/ml-hosts/$host.name$?_g=()&kqlQuery=(filterQuery:(expression:\'user.name%20:%20%22$user.name$%22\',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by process name","url_value":"siem#/ml-hosts?_g=()&kqlQuery=(filterQuery:(expression:\'process.name%20:%20%22$process.name$%22\',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by user name","url_value":"siem#/ml-hosts?_g=()&kqlQuery=(filterQuery:(expression:\'user.name%20:%20%22$user.name$%22\',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]},"results_index_name":"linux_anomalous_network_activity_ecs"}',
+          '{"job_type":"anomaly_detector","description":"SIEM Auditbeat: Looks for unusual processes using the network which could indicate command-and-control, lateral movement, persistence, or data exfiltration activity (beta)","groups":["siem","auditbeat","network"],"analysis_config":{"bucket_span":"15m","detectors":[{"detector_description":"rare by \\"process.name\\"","function":"rare","by_field_name":"process.name"}],"influencers":["host.name","process.name","user.name","destination.ip"]},"analysis_limits":{"model_memory_limit":"64mb"},"data_description":{"time_field":"@timestamp"},"custom_settings":{"created_by":"ml-module-siem-auditbeat","custom_urls":[{"url_name":"Host Details by process name","url_value":"siem#/ml-hosts/$host.name$?kqlQuery=(filterQuery:(expression:\'process.name%20:%20%22$process.name$%22\',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Host Details by user name","url_value":"siem#/ml-hosts/$host.name$?kqlQuery=(filterQuery:(expression:\'user.name%20:%20%22$user.name$%22\',kind:kuery),queryLocation:hosts.details,type:details)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by process name","url_value":"siem#/ml-hosts?kqlQuery=(filterQuery:(expression:\'process.name%20:%20%22$process.name$%22\',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"},{"url_name":"Hosts Overview by user name","url_value":"siem#/ml-hosts?kqlQuery=(filterQuery:(expression:\'user.name%20:%20%22$user.name$%22\',kind:kuery),queryLocation:hosts.page,type:page)&timerange=(global:(linkTo:!(timeline),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')),timeline:(linkTo:!(global),timerange:(from:\'$earliest$\',kind:absolute,to:\'$latest$\')))"}]},"results_index_name":"linux_anomalous_network_activity_ecs"}',
         statusCode: 400,
         response:
           '{"error":{"root_cause":[{"type":"resource_already_exists_exception","reason":"The job cannot be created with the Id \'linux_anomalous_network_activity_ecs\'. The Id is already used."}],"type":"resource_already_exists_exception","reason":"The job cannot be created with the Id \'linux_anomalous_network_activity_ecs\'. The Id is already used."},"status":400}',
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/api.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/api.tsx
index 8e7bedd8f872a..a04b8f4b99653 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/api.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/api.tsx
@@ -25,12 +25,10 @@ import { throwIfNotOk } from '../../hooks/api/api';
  * Checks the ML Recognizer API to see if a given indexPattern has any compatible modules
  *
  * @param indexPatternName ES index pattern to check for compatible modules
- * @param headers optional headers to add
  * @param signal to cancel request
  */
 export const checkRecognizer = async ({
   indexPatternName,
-  kbnVersion,
   signal,
 }: CheckRecognizerProps): Promise<RecognizerModule[]> => {
   const response = await fetch(
@@ -39,10 +37,9 @@ export const checkRecognizer = async ({
       method: 'GET',
       credentials: 'same-origin',
       headers: {
-        'kbn-system-api': 'true',
         'content-type': 'application/json',
-        'kbn-version': kbnVersion,
-        'kbn-xsrf': kbnVersion,
+        'kbn-system-api': 'true',
+        'kbn-xsrf': 'true',
       },
       signal,
     }
@@ -55,22 +52,16 @@ export const checkRecognizer = async ({
  * Returns ML Module for given moduleId. Returns all modules if no moduleId specified
  *
  * @param moduleId id of the module to retrieve
- * @param headers optional headers to add optional headers to add
  * @param signal to cancel request
  */
-export const getModules = async ({
-  moduleId = '',
-  kbnVersion,
-  signal,
-}: GetModulesProps): Promise<Module[]> => {
+export const getModules = async ({ moduleId = '', signal }: GetModulesProps): Promise<Module[]> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/modules/get_module/${moduleId}`, {
     method: 'GET',
     credentials: 'same-origin',
     headers: {
-      'kbn-system-api': 'true',
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
     signal,
   });
@@ -93,7 +84,6 @@ export const setupMlJob = async ({
   indexPatternName = 'auditbeat-*',
   jobIdErrorFilter = [],
   groups = ['siem'],
-  kbnVersion,
   prefix = '',
 }: MlSetupArgs): Promise<SetupMlResponse> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/modules/setup/${configTemplate}`, {
@@ -107,10 +97,9 @@ export const setupMlJob = async ({
       useDedicatedIndex: true,
     }),
     headers: {
-      'kbn-system-api': 'true',
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
   });
   await throwIfNotOk(response);
@@ -124,16 +113,13 @@ export const setupMlJob = async ({
  *
  * @param datafeedIds
  * @param start
- * @param headers optional headers to add
  */
 export const startDatafeeds = async ({
   datafeedIds,
-  kbnVersion,
   start = 0,
 }: {
   datafeedIds: string[];
   start: number;
-  kbnVersion: string;
 }): Promise<StartDatafeedResponse> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/jobs/force_start_datafeeds`, {
     method: 'POST',
@@ -143,10 +129,9 @@ export const startDatafeeds = async ({
       ...(start !== 0 && { start }),
     }),
     headers: {
-      'kbn-system-api': 'true',
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
   });
   await throwIfNotOk(response);
@@ -163,10 +148,8 @@ export const startDatafeeds = async ({
  */
 export const stopDatafeeds = async ({
   datafeedIds,
-  kbnVersion,
 }: {
   datafeedIds: string[];
-  kbnVersion: string;
 }): Promise<[StopDatafeedResponse | ErrorResponse, CloseJobsResponse]> => {
   const stopDatafeedsResponse = await fetch(`${chrome.getBasePath()}/api/ml/jobs/stop_datafeeds`, {
     method: 'POST',
@@ -175,9 +158,9 @@ export const stopDatafeeds = async ({
       datafeedIds,
     }),
     headers: {
-      'kbn-system-api': 'true',
       'content-type': 'application/json',
-      'kbn-xsrf': kbnVersion,
+      'kbn-system-api': 'true',
+      'kbn-xsrf': 'true',
     },
   });
 
@@ -198,7 +181,7 @@ export const stopDatafeeds = async ({
     headers: {
       'content-type': 'application/json',
       'kbn-system-api': 'true',
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
   });
 
@@ -214,10 +197,7 @@ export const stopDatafeeds = async ({
  *
  * @param signal to cancel request
  */
-export const getJobsSummary = async (
-  signal: AbortSignal,
-  kbnVersion: string
-): Promise<JobSummary[]> => {
+export const getJobsSummary = async (signal: AbortSignal): Promise<JobSummary[]> => {
   const response = await fetch(`${chrome.getBasePath()}/api/ml/jobs/jobs_summary`, {
     method: 'POST',
     credentials: 'same-origin',
@@ -225,8 +205,7 @@ export const getJobsSummary = async (
     headers: {
       'content-type': 'application/json',
       'kbn-system-api': 'true',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
     signal,
   });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
index 0bef34a7edc44..9df93d087e166 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx
@@ -12,8 +12,8 @@ import { hasMlUserPermissions } from '../../ml/permissions/has_ml_user_permissio
 import { MlCapabilitiesContext } from '../../ml/permissions/ml_capabilities_provider';
 import { useStateToaster } from '../../toasters';
 import { errorToToaster } from '../../ml/api/error_to_toaster';
-import { useKibanaUiSetting } from '../../../lib/settings/use_kibana_ui_setting';
-import { DEFAULT_INDEX_KEY, DEFAULT_KBN_VERSION } from '../../../../common/constants';
+import { useUiSetting$ } from '../../../lib/kibana';
+import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
 
 import * as i18n from './translations';
 import { createSiemJobs } from './use_siem_jobs_helpers';
@@ -33,8 +33,7 @@ export const useSiemJobs = (refetchData: boolean): Return => {
   const [loading, setLoading] = useState(true);
   const capabilities = useContext(MlCapabilitiesContext);
   const userPermissions = hasMlUserPermissions(capabilities);
-  const [siemDefaultIndex] = useKibanaUiSetting(DEFAULT_INDEX_KEY);
-  const [kbnVersion] = useKibanaUiSetting(DEFAULT_KBN_VERSION);
+  const [siemDefaultIndex] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
   const [, dispatchToaster] = useStateToaster();
 
   useEffect(() => {
@@ -47,11 +46,10 @@ export const useSiemJobs = (refetchData: boolean): Return => {
         try {
           // Batch fetch all installed jobs, ML modules, and check which modules are compatible with siemDefaultIndex
           const [jobSummaryData, modulesData, compatibleModules] = await Promise.all([
-            getJobsSummary(abortCtrl.signal, kbnVersion),
-            getModules({ signal: abortCtrl.signal, kbnVersion }),
+            getJobsSummary(abortCtrl.signal),
+            getModules({ signal: abortCtrl.signal }),
             checkRecognizer({
               indexPatternName: siemDefaultIndex,
-              kbnVersion,
               signal: abortCtrl.signal,
             }),
           ]);
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx
index 542529c628b72..a14ff789f1078 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { GroupsFilterPopoverComponent } from './groups_filter_popover';
 import { mockSiemJobs } from '../../__mocks__/api';
 import { SiemJob } from '../../types';
@@ -23,7 +22,7 @@ describe('GroupsFilterPopover', () => {
     const wrapper = shallow(
       <GroupsFilterPopoverComponent siemJobs={siemJobs} onSelectedGroupsChanged={jest.fn()} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('when a filter is clicked, it becomes checked ', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx
index 0711cc1c87966..cbee724802156 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { JobsTableFiltersComponent } from './jobs_table_filters';
 import { SiemJob } from '../../types';
 import { cloneDeep } from 'lodash/fp';
@@ -23,7 +22,7 @@ describe('JobsTableFilters', () => {
     const wrapper = shallow(
       <JobsTableFiltersComponent siemJobs={siemJobs} onFilterChanged={jest.fn()} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('when you click Elastic Jobs filter, state is updated and it is selected', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.tsx
index 74e61f27fb2d1..551ed5f08bd76 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Dispatch, SetStateAction, useEffect, useState } from 'react';
+import React, { Dispatch, SetStateAction, useEffect, useState, useCallback } from 'react';
 
 import {
   EuiFilterButton,
@@ -40,7 +40,22 @@ export const JobsTableFiltersComponent = ({ siemJobs, onFilterChanged }: JobsTab
   // Propagate filter changes to parent
   useEffect(() => {
     onFilterChanged({ filterQuery, showCustomJobs, showElasticJobs, selectedGroups });
-  }, [filterQuery, selectedGroups.sort().join(), showCustomJobs, showElasticJobs]);
+  }, [filterQuery, selectedGroups, showCustomJobs, showElasticJobs, onFilterChanged]);
+
+  const handleChange = useCallback(
+    (query: EuiSearchBarQuery) => setFilterQuery(query.queryText.trim()),
+    [setFilterQuery]
+  );
+
+  const handleElasticJobsClick = useCallback(() => {
+    setShowElasticJobs(!showElasticJobs);
+    setShowCustomJobs(false);
+  }, [setShowElasticJobs, showElasticJobs, setShowCustomJobs]);
+
+  const handleCustomJobsClick = useCallback(() => {
+    setShowCustomJobs(!showCustomJobs);
+    setShowElasticJobs(false);
+  }, [setShowElasticJobs, showCustomJobs, setShowCustomJobs]);
 
   return (
     <EuiFlexGroup gutterSize="m" justifyContent="flexEnd">
@@ -51,7 +66,7 @@ export const JobsTableFiltersComponent = ({ siemJobs, onFilterChanged }: JobsTab
             placeholder: i18n.FILTER_PLACEHOLDER,
             incremental: true,
           }}
-          onChange={(query: EuiSearchBarQuery) => setFilterQuery(query.queryText.trim())}
+          onChange={handleChange}
         />
       </EuiFlexItem>
 
@@ -65,10 +80,7 @@ export const JobsTableFiltersComponent = ({ siemJobs, onFilterChanged }: JobsTab
         <EuiFilterGroup>
           <EuiFilterButton
             hasActiveFilters={showElasticJobs}
-            onClick={() => {
-              setShowElasticJobs(!showElasticJobs);
-              setShowCustomJobs(false);
-            }}
+            onClick={handleElasticJobsClick}
             data-test-subj="show-elastic-jobs-filter-button"
             withNext
           >
@@ -76,10 +88,7 @@ export const JobsTableFiltersComponent = ({ siemJobs, onFilterChanged }: JobsTab
           </EuiFilterButton>
           <EuiFilterButton
             hasActiveFilters={showCustomJobs}
-            onClick={() => {
-              setShowCustomJobs(!showCustomJobs);
-              setShowElasticJobs(false);
-            }}
+            onClick={handleCustomJobsClick}
             data-test-subj="show-custom-jobs-filter-button"
           >
             {i18n.SHOW_CUSTOM_JOBS}
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
index 91e5510f4938d..1186573e3e209 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow, mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { isChecked, isFailure, isJobLoading, JobSwitchComponent } from './job_switch';
 import { cloneDeep } from 'lodash/fp';
@@ -29,7 +28,7 @@ describe('JobSwitch', () => {
         onJobStateChange={onJobStateChangeMock}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should call onJobStateChange when the switch is clicked to be true/open', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx
index c915bf04126ec..0d503e2db3d9d 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx
@@ -5,7 +5,7 @@
  */
 
 import styled from 'styled-components';
-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiSwitch } from '@elastic/eui';
 import { SiemJob } from '../types';
 
@@ -47,6 +47,13 @@ export const JobSwitchComponent = ({
   onJobStateChange,
 }: JobSwitchProps) => {
   const [isLoading, setIsLoading] = useState(false);
+  const handleChange = useCallback(
+    e => {
+      setIsLoading(true);
+      onJobStateChange(job, job.latestTimestampMs || 0, e.target.checked);
+    },
+    [job, setIsLoading, onJobStateChange]
+  );
 
   return (
     <EuiFlexGroup justifyContent="spaceAround">
@@ -58,10 +65,7 @@ export const JobSwitchComponent = ({
             data-test-subj="job-switch"
             disabled={isFailure(job.jobState, job.datafeedState)}
             checked={isChecked(job.jobState, job.datafeedState)}
-            onChange={e => {
-              setIsLoading(true);
-              onJobStateChange(job, job.latestTimestampMs || 0, e.target.checked);
-            }}
+            onChange={handleChange}
             showLabel={false}
             label=""
           />
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx
index 691d43a8b18b3..fa524d8ff3dbc 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow, mount } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { JobsTableComponent } from './jobs_table';
 import { mockSiemJobs } from '../__mocks__/api';
 import { cloneDeep } from 'lodash/fp';
@@ -28,7 +27,7 @@ describe('JobsTableComponent', () => {
         onJobStateChange={onJobStateChangeMock}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should render the hyperlink which points specifically to the job id', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.tsx
index 86f28ebda2086..0d243a84aa192 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import chrome from 'ui/chrome';
 import React, { useEffect, useState } from 'react';
 
@@ -81,7 +83,7 @@ const getJobsTableColumns = (
       ),
     align: CENTER_ALIGNMENT,
     width: '80px',
-  },
+  } as const,
 ];
 
 const getPaginatedItems = (items: SiemJob[], pageIndex: number, pageSize: number): SiemJob[] =>
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx
index 2e2445fe933bb..bf1802f42084e 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx
@@ -5,13 +5,12 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ShowingCountComponent } from './showing_count';
 
 describe('ShowingCount', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<ShowingCountComponent filterResultsLength={2} />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.test.tsx
index 1a8360fe82c58..bd7d696757ca6 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/ml_popover.test.tsx
@@ -4,12 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
 import { MlPopover } from './ml_popover';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
+jest.mock('ui/new_platform');
+jest.mock('../../lib/kibana');
 
 jest.mock('../ml/permissions/has_ml_admin_permissions', () => ({
   hasMlAdminPermissions: () => true,
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 0b33ab83d2a47..307be06424ee3 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
@@ -9,10 +9,8 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import moment from 'moment';
 import React, { useContext, useReducer, useState } from 'react';
 import styled from 'styled-components';
-import { DOC_LINK_VERSION, ELASTIC_WEBSITE_URL } from 'ui/documentation_links';
 
-import { DEFAULT_KBN_VERSION } from '../../../common/constants';
-import { useKibanaUiSetting } from '../../lib/settings/use_kibana_ui_setting';
+import { useKibana } from '../../lib/kibana';
 import { METRIC_TYPE, TELEMETRY_EVENT, trackUiAction as track } from '../../lib/track_usage';
 import { errorToToaster } from '../ml/api/error_to_toaster';
 import { hasMlAdminPermissions } from '../ml/permissions/has_ml_admin_permissions';
@@ -98,10 +96,10 @@ export const MlPopover = React.memo(() => {
 
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
   const [filterProperties, setFilterProperties] = useState(defaultFilterProps);
-  const [kbnVersion] = useKibanaUiSetting(DEFAULT_KBN_VERSION);
   const [isLoadingSiemJobs, siemJobs] = useSiemJobs(refreshToggle);
   const [, dispatchToaster] = useStateToaster();
   const capabilities = useContext(MlCapabilitiesContext);
+  const docLinks = useKibana().services.docLinks;
 
   // Enable/Disable Job & Datafeed -- passed to JobsTable for use as callback on JobSwitch
   const enableDatafeed = async (job: SiemJob, latestTimestampMs: number, enable: boolean) => {
@@ -114,7 +112,6 @@ export const MlPopover = React.memo(() => {
           indexPatternName: job.defaultIndexPattern,
           jobIdErrorFilter: [job.id],
           groups: job.groups,
-          kbnVersion,
         });
       } catch (error) {
         errorToToaster({ title: i18n.CREATE_JOB_FAILURE, error, dispatchToaster });
@@ -132,14 +129,14 @@ export const MlPopover = React.memo(() => {
     if (enable) {
       const startTime = Math.max(latestTimestampMs, maxStartTime);
       try {
-        await startDatafeeds({ datafeedIds: [`datafeed-${job.id}`], kbnVersion, start: startTime });
+        await startDatafeeds({ datafeedIds: [`datafeed-${job.id}`], start: startTime });
       } catch (error) {
         track(METRIC_TYPE.COUNT, TELEMETRY_EVENT.JOB_ENABLE_FAILURE);
         errorToToaster({ title: i18n.START_JOB_FAILURE, error, dispatchToaster });
       }
     } else {
       try {
-        await stopDatafeeds({ datafeedIds: [`datafeed-${job.id}`], kbnVersion });
+        await stopDatafeeds({ datafeedIds: [`datafeed-${job.id}`] });
       } catch (error) {
         track(METRIC_TYPE.COUNT, TELEMETRY_EVENT.JOB_DISABLE_FAILURE);
         errorToToaster({ title: i18n.STOP_JOB_FAILURE, error, dispatchToaster });
@@ -226,7 +223,7 @@ export const MlPopover = React.memo(() => {
                     values={{
                       mlDocs: (
                         <a
-                          href={`${ELASTIC_WEBSITE_URL}guide/en/siem/guide/${DOC_LINK_VERSION}/machine-learning.html`}
+                          href={`${docLinks.ELASTIC_WEBSITE_URL}guide/en/siem/guide/${docLinks.DOC_LINK_VERSION}/machine-learning.html`}
                           rel="noopener noreferrer"
                           target="_blank"
                         >
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx
index d409f5de200a4..e611a5234da5e 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/popover_description.test.tsx
@@ -5,13 +5,12 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { PopoverDescriptionComponent } from './popover_description';
 
 describe('JobsTableFilters', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<PopoverDescriptionComponent />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts b/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts
index 88481e140cb03..964ae8c8242d4 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/types.ts
@@ -13,8 +13,7 @@ export interface Group {
 }
 
 export interface CheckRecognizerProps {
-  indexPatternName: string;
-  kbnVersion: string;
+  indexPatternName: string[];
   signal: AbortSignal;
 }
 
@@ -30,7 +29,6 @@ export interface RecognizerModule {
 
 export interface GetModulesProps {
   moduleId?: string;
-  kbnVersion: string;
   signal: AbortSignal;
 }
 
@@ -97,7 +95,6 @@ export interface MlSetupArgs {
   jobIdErrorFilter: string[];
   groups: string[];
   prefix?: string;
-  kbnVersion: string;
 }
 
 /**
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx
index c522b7750c414..2ba08073b25b9 100644
--- a/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx
@@ -5,13 +5,12 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { UpgradeContentsComponent } from './upgrade_contents';
 
 describe('JobsTableFilters', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<UpgradeContentsComponent />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.test.ts b/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.test.ts
index 02135348957ff..f9d63a8594180 100644
--- a/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.test.ts
+++ b/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.test.ts
@@ -9,8 +9,9 @@ import { encodeIpv6 } from '../../../lib/helpers';
 
 import { getBreadcrumbsForRoute, setBreadcrumbs } from '.';
 import { HostsTableType } from '../../../store/hosts/model';
-import { RouteSpyState } from '../../../utils/route/types';
+import { RouteSpyState, SiemRouteType } from '../../../utils/route/types';
 import { TabNavigationProps } from '../tab_navigation/types';
+import { NetworkRouteType } from '../../../pages/network/navigation/types';
 
 jest.mock('ui/chrome', () => ({
   getBasePath: () => {
@@ -30,6 +31,17 @@ jest.mock('../../search_bar', () => ({
   },
 }));
 
+const mockDefaultTab = (pageName: string): SiemRouteType | undefined => {
+  switch (pageName) {
+    case 'hosts':
+      return HostsTableType.authentications;
+    case 'network':
+      return NetworkRouteType.flows;
+    default:
+      return undefined;
+  }
+};
+
 const getMockObject = (
   pageName: string,
   pathName: string,
@@ -69,7 +81,7 @@ const getMockObject = (
   pageName,
   pathName,
   search: '',
-  tabName: HostsTableType.authentications,
+  tabName: mockDefaultTab(pageName) as HostsTableType,
   query: { query: '', language: 'kuery' },
   filters: [],
   timeline: {
@@ -136,6 +148,10 @@ describe('Navigation Breadcrumbs', () => {
           href:
             '#/link-to/network?timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))',
         },
+        {
+          text: 'Flows',
+          href: '',
+        },
       ]);
     });
 
@@ -176,7 +192,11 @@ describe('Navigation Breadcrumbs', () => {
           href:
             '#/link-to/network?timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))',
         },
-        { text: '192.0.2.255', href: '' },
+        {
+          text: ipv4,
+          href: `#/link-to/network/ip/${ipv4}?timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))`,
+        },
+        { text: 'Flows', href: '' },
       ]);
     });
 
@@ -189,7 +209,11 @@ describe('Navigation Breadcrumbs', () => {
           href:
             '#/link-to/network?timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))',
         },
-        { text: '2001:db8:ffff:ffff:ffff:ffff:ffff:ffff', href: '' },
+        {
+          text: ipv6,
+          href: `#/link-to/network/ip/${ipv6Encoded}?timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))`,
+        },
+        { text: 'Flows', href: '' },
       ]);
     });
   });
diff --git a/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts b/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts
index 8d9ebb964ce63..9eee5b21e83f3 100644
--- a/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts
+++ b/x-pack/legacy/plugins/siem/public/components/navigation/breadcrumbs/index.ts
@@ -6,20 +6,20 @@
 
 import chrome, { Breadcrumb } from 'ui/chrome';
 
-import { getOr } from 'lodash/fp';
+import { getOr, omit } from 'lodash/fp';
 import { APP_NAME } from '../../../../common/constants';
 import { getBreadcrumbs as getHostDetailsBreadcrumbs } from '../../../pages/hosts/details/utils';
 import { getBreadcrumbs as getIPDetailsBreadcrumbs } from '../../../pages/network/ip_details';
 import { SiemPageName } from '../../../pages/home/types';
-import { RouteSpyState } from '../../../utils/route/types';
+import { RouteSpyState, HostRouteSpyState, NetworkRouteSpyState } from '../../../utils/route/types';
 import { getOverviewUrl } from '../../link_to';
 
 import { TabNavigationProps } from '../tab_navigation/types';
 import { getSearch } from '../helpers';
 import { SearchNavTab } from '../types';
 
-export const setBreadcrumbs = (object: RouteSpyState & TabNavigationProps) => {
-  const breadcrumbs = getBreadcrumbsForRoute(object);
+export const setBreadcrumbs = (spyState: RouteSpyState & TabNavigationProps) => {
+  const breadcrumbs = getBreadcrumbsForRoute(spyState);
   if (breadcrumbs) {
     chrome.breadcrumbs.set(breadcrumbs);
   }
@@ -32,19 +32,26 @@ export const siemRootBreadcrumb: Breadcrumb[] = [
   },
 ];
 
+const isNetworkRoutes = (spyState: RouteSpyState): spyState is NetworkRouteSpyState =>
+  spyState != null && spyState.pageName === SiemPageName.network;
+
+const isHostsRoutes = (spyState: RouteSpyState): spyState is HostRouteSpyState =>
+  spyState != null && spyState.pageName === SiemPageName.hosts;
+
 export const getBreadcrumbsForRoute = (
   object: RouteSpyState & TabNavigationProps
 ): Breadcrumb[] | null => {
-  if (object != null && object.navTabs && object.pageName === SiemPageName.hosts) {
+  const spyState: RouteSpyState = omit('navTabs', object);
+  if (isHostsRoutes(spyState) && object.navTabs) {
     const tempNav: SearchNavTab = { urlKey: 'host', isDetailPage: false };
-    let urlStateKeys = [getOr(tempNav, object.pageName, object.navTabs)];
-    if (object.tabName != null) {
-      urlStateKeys = [...urlStateKeys, getOr(tempNav, object.tabName, object.navTabs)];
+    let urlStateKeys = [getOr(tempNav, spyState.pageName, object.navTabs)];
+    if (spyState.tabName != null) {
+      urlStateKeys = [...urlStateKeys, getOr(tempNav, spyState.tabName, object.navTabs)];
     }
     return [
       ...siemRootBreadcrumb,
       ...getHostDetailsBreadcrumbs(
-        object,
+        spyState,
         urlStateKeys.reduce(
           (acc: string[], item: SearchNavTab) => [...acc, getSearch(item, object)],
           []
@@ -52,22 +59,33 @@ export const getBreadcrumbsForRoute = (
       ),
     ];
   }
-  if (object != null && object.navTabs && object.pageName === SiemPageName.network) {
+  if (isNetworkRoutes(spyState) && object.navTabs) {
     const tempNav: SearchNavTab = { urlKey: 'network', isDetailPage: false };
-    const urlStateKeys = [getOr(tempNav, object.pageName, object.navTabs)];
+    let urlStateKeys = [getOr(tempNav, spyState.pageName, object.navTabs)];
+    if (spyState.tabName != null) {
+      urlStateKeys = [...urlStateKeys, getOr(tempNav, spyState.tabName, object.navTabs)];
+    }
     return [
       ...siemRootBreadcrumb,
       ...getIPDetailsBreadcrumbs(
-        object.detailName,
-        urlStateKeys.reduce((acc: string[], item) => [...acc, getSearch(item, object)], [])
+        spyState,
+        urlStateKeys.reduce(
+          (acc: string[], item: SearchNavTab) => [...acc, getSearch(item, object)],
+          []
+        )
       ),
     ];
   }
-  if (object != null && object.navTabs && object.pageName && object.navTabs[object.pageName]) {
+  if (
+    spyState != null &&
+    object.navTabs &&
+    spyState.pageName &&
+    object.navTabs[spyState.pageName]
+  ) {
     return [
       ...siemRootBreadcrumb,
       {
-        text: object.navTabs[object.pageName].name,
+        text: object.navTabs[spyState.pageName].name,
         href: '',
       },
     ];
diff --git a/x-pack/legacy/plugins/siem/public/components/navigation/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/navigation/index.test.tsx
index d7061ba4efd9c..cae209a76fc1c 100644
--- a/x-pack/legacy/plugins/siem/public/components/navigation/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/navigation/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { CONSTANTS } from '../url_state/constants';
 import { SiemNavigationComponent } from './';
diff --git a/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.test.tsx
index 00b1d4c066d4a..b9563b60f301b 100644
--- a/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.test.tsx
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { mount, shallow } from 'enzyme';
-import * as React from 'react';
+import { mount } from 'enzyme';
+import React from 'react';
 
 import { navTabs } from '../../../pages/home/home_navigations';
 import { SiemPageName } from '../../../pages/home/types';
@@ -62,13 +62,13 @@ describe('Tab Navigation', () => {
       },
     };
     test('it mounts with correct tab highlighted', () => {
-      const wrapper = shallow(<TabNavigationComponent {...mockProps} />);
-      const hostsTab = wrapper.find('[data-test-subj="navigation-hosts"]');
+      const wrapper = mount(<TabNavigationComponent {...mockProps} />);
+      const hostsTab = wrapper.find('EuiTab[data-test-subj="navigation-hosts"]');
       expect(hostsTab.prop('isSelected')).toBeTruthy();
     });
     test('it changes active tab when nav changes by props', () => {
       const wrapper = mount(<TabNavigationComponent {...mockProps} />);
-      const networkTab = () => wrapper.find('[data-test-subj="navigation-network"]').first();
+      const networkTab = () => wrapper.find('EuiTab[data-test-subj="navigation-network"]').first();
       expect(networkTab().prop('isSelected')).toBeFalsy();
       wrapper.setProps({
         pageName: 'network',
@@ -79,8 +79,8 @@ describe('Tab Navigation', () => {
       expect(networkTab().prop('isSelected')).toBeTruthy();
     });
     test('it carries the url state in the link', () => {
-      const wrapper = shallow(<TabNavigationComponent {...mockProps} />);
-      const firstTab = wrapper.find('[data-test-subj="navigation-network"]');
+      const wrapper = mount(<TabNavigationComponent {...mockProps} />);
+      const firstTab = wrapper.find('EuiTab[data-test-subj="navigation-network"]');
       expect(firstTab.props().href).toBe(
         "#/link-to/network?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))"
       );
@@ -126,9 +126,9 @@ describe('Tab Navigation', () => {
       },
     };
     test('it mounts with correct tab highlighted', () => {
-      const wrapper = shallow(<TabNavigationComponent {...mockProps} />);
+      const wrapper = mount(<TabNavigationComponent {...mockProps} />);
       const tableNavigationTab = wrapper.find(
-        `[data-test-subj="navigation-${HostsTableType.authentications}"]`
+        `EuiTab[data-test-subj="navigation-${HostsTableType.authentications}"]`
       );
 
       expect(tableNavigationTab.prop('isSelected')).toBeTruthy();
@@ -147,9 +147,9 @@ describe('Tab Navigation', () => {
       expect(tableNavigationTab().prop('isSelected')).toBeTruthy();
     });
     test('it carries the url state in the link', () => {
-      const wrapper = shallow(<TabNavigationComponent {...mockProps} />);
+      const wrapper = mount(<TabNavigationComponent {...mockProps} />);
       const firstTab = wrapper.find(
-        `[data-test-subj="navigation-${HostsTableType.authentications}"]`
+        `EuiTab[data-test-subj="navigation-${HostsTableType.authentications}"]`
       );
       expect(firstTab.props().href).toBe(
         `#/${pageName}/${hostName}/${HostsTableType.authentications}?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))`
diff --git a/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.tsx b/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.tsx
index d405ec404b111..b653624ec1f67 100644
--- a/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/navigation/tab_navigation/index.tsx
@@ -5,23 +5,52 @@
  */
 import { EuiTab, EuiTabs } from '@elastic/eui';
 import { getOr } from 'lodash/fp';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useCallback, useMemo } from 'react';
 
 import { trackUiAction as track, METRIC_TYPE, TELEMETRY_EVENT } from '../../../lib/track_usage';
 import { getSearch } from '../helpers';
-import { TabNavigationProps } from './types';
+import { TabNavigationProps, TabNavigationItemProps } from './types';
+
+const TabNavigationItemComponent = ({
+  href,
+  hrefWithSearch,
+  id,
+  disabled,
+  name,
+  isSelected,
+}: TabNavigationItemProps) => {
+  const handleClick = useCallback(() => {
+    track(METRIC_TYPE.CLICK, `${TELEMETRY_EVENT.TAB_CLICKED}${id}`);
+  }, [id]);
+
+  return (
+    <EuiTab
+      data-href={href}
+      data-test-subj={`navigation-${id}`}
+      disabled={disabled}
+      href={hrefWithSearch}
+      isSelected={isSelected}
+      onClick={handleClick}
+    >
+      {name}
+    </EuiTab>
+  );
+};
+
+const TabNavigationItem = React.memo(TabNavigationItemComponent);
 
 export const TabNavigationComponent = (props: TabNavigationProps) => {
   const { display, navTabs, pageName, tabName } = props;
 
-  const mapLocationToTab = (): string => {
-    return getOr(
-      '',
-      'id',
-      Object.values(navTabs).find(item => tabName === item.id || pageName === item.id)
-    );
-  };
-
+  const mapLocationToTab = useCallback(
+    (): string =>
+      getOr(
+        '',
+        'id',
+        Object.values(navTabs).find(item => tabName === item.id || pageName === item.id)
+      ),
+    [pageName, tabName, navTabs]
+  );
   const [selectedTabId, setSelectedTabId] = useState(mapLocationToTab());
   useEffect(() => {
     const currentTabSelected = mapLocationToTab();
@@ -31,26 +60,30 @@ export const TabNavigationComponent = (props: TabNavigationProps) => {
     }
 
     // we do need navTabs in case the selectedTabId appears after initial load (ex. checking permissions for anomalies)
-  }, [pageName, tabName, navTabs]);
-
-  const renderTabs = (): JSX.Element[] =>
-    Object.values(navTabs).map(tab => (
-      <EuiTab
-        data-href={tab.href}
-        data-test-subj={`navigation-${tab.id}`}
-        disabled={tab.disabled}
-        href={tab.href + getSearch(tab, props)}
-        isSelected={selectedTabId === tab.id}
-        key={`navigation-${tab.id}`}
-        onClick={() => {
-          track(METRIC_TYPE.CLICK, `${TELEMETRY_EVENT.TAB_CLICKED}${tab.id}`);
-        }}
-      >
-        {tab.name}
-      </EuiTab>
-    ));
-
-  return <EuiTabs display={display}>{renderTabs()}</EuiTabs>;
+  }, [pageName, tabName, navTabs, mapLocationToTab, selectedTabId]);
+
+  const renderTabs = useMemo(
+    () =>
+      Object.values(navTabs).map(tab => {
+        const isSelected = selectedTabId === tab.id;
+        const hrefWithSearch = tab.href + getSearch(tab, props);
+
+        return (
+          <TabNavigationItem
+            key={`navigation-${tab.id}`}
+            id={tab.id}
+            href={tab.href}
+            name={tab.name}
+            disabled={tab.disabled}
+            hrefWithSearch={hrefWithSearch}
+            isSelected={isSelected}
+          />
+        );
+      }),
+    [navTabs, selectedTabId, props]
+  );
+
+  return <EuiTabs display={display}>{renderTabs}</EuiTabs>;
 };
 
 TabNavigationComponent.displayName = 'TabNavigationComponent';
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 1283691e65806..3fac783b55047 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
@@ -22,3 +22,12 @@ export interface TabNavigationProps extends SiemNavigationProps {
   [CONSTANTS.timerange]: UrlInputsModel;
   [CONSTANTS.timeline]: Timeline;
 }
+
+export interface TabNavigationItemProps {
+  href: string;
+  hrefWithSearch: string;
+  id: string;
+  disabled: boolean;
+  name: string;
+  isSelected: boolean;
+}
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/fingerprints/index.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/fingerprints/index.tsx
index 6b29068f3cd2d..f0dc67a5ff4c3 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/fingerprints/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/fingerprints/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import {
   CertificateFingerprint,
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx
index 2d8c201e41462..ecf162ebf2739 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/index.test.tsx
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import toJson from 'enzyme-to-json';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { shallow } from 'enzyme';
 
 import { asArrayIfExists } from '../../lib/helpers';
@@ -57,8 +56,6 @@ import {
 } from '../source_destination/field_names';
 import { useMountAppended } from '../../utils/use_mount_appended';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 const getNetflowInstance = () => (
   <Netflow
     contextId="test"
@@ -125,7 +122,7 @@ describe('Netflow', () => {
 
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(getNetflowInstance());
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders a destination label', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/index.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/index.tsx
index 26e6986c386be..3d6c2a7b767cb 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { Fingerprints } from './fingerprints';
 import { NetflowColumns } from './netflow_columns';
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/duration_event_start_end.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/duration_event_start_end.tsx
index f006ec0f003c1..09fa5d9fe1596 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/duration_event_start_end.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/duration_event_start_end.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui';
 import { uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DefaultDraggable } from '../../draggables';
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/index.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/index.tsx
index 0dc4a2271e207..f8a0256ff4d43 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { SourceDestination } from '../../source_destination';
diff --git a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/user_process.tsx b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/user_process.tsx
index adac7dede1f85..ab71dc301156f 100644
--- a/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/user_process.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/netflow/netflow_columns/user_process.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx
index fc76780ef80c7..ca6abc90d317b 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { AddNote } from '.';
 
@@ -24,7 +23,7 @@ describe('AddNote', () => {
         updateNote={jest.fn()}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the Cancel button when onCancelAddNote is provided', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.tsx b/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.tsx
index 6e13538cf9bea..28cab2b46755f 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/add_note/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiButton, EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React, { useCallback } from 'react';
 import styled from 'styled-components';
 
 import { MarkdownHint } from '../../markdown/markdown_hint';
@@ -49,38 +49,44 @@ export const AddNote = React.memo<{
   onCancelAddNote?: () => void;
   updateNewNote: UpdateInternalNewNote;
   updateNote: UpdateNote;
-}>(({ associateNote, getNewNoteId, newNote, onCancelAddNote, updateNewNote, updateNote }) => (
-  <AddNotesContainer alignItems="flexEnd" direction="column" gutterSize="none">
-    <NewNote note={newNote} noteInputHeight={200} updateNewNote={updateNewNote} />
-    <EuiFlexItem grow={true}>
-      <MarkdownHint show={newNote.trim().length > 0} />
-    </EuiFlexItem>
-    <ButtonsContainer gutterSize="none">
-      {onCancelAddNote != null ? (
+}>(({ associateNote, getNewNoteId, newNote, onCancelAddNote, updateNewNote, updateNote }) => {
+  const handleClick = useCallback(
+    () =>
+      updateAndAssociateNode({
+        associateNote,
+        getNewNoteId,
+        newNote,
+        updateNewNote,
+        updateNote,
+      }),
+    [associateNote, getNewNoteId, newNote, updateNewNote, updateNote]
+  );
+
+  return (
+    <AddNotesContainer alignItems="flexEnd" direction="column" gutterSize="none">
+      <NewNote note={newNote} noteInputHeight={200} updateNewNote={updateNewNote} />
+      <EuiFlexItem grow={true}>
+        <MarkdownHint show={newNote.trim().length > 0} />
+      </EuiFlexItem>
+      <ButtonsContainer gutterSize="none">
+        {onCancelAddNote != null ? (
+          <EuiFlexItem grow={false}>
+            <CancelButton onCancelAddNote={onCancelAddNote} />
+          </EuiFlexItem>
+        ) : null}
         <EuiFlexItem grow={false}>
-          <CancelButton onCancelAddNote={onCancelAddNote} />
+          <EuiButton
+            data-test-subj="add-note"
+            isDisabled={newNote.trim().length === 0}
+            fill={true}
+            onClick={handleClick}
+          >
+            {i18n.ADD_NOTE}
+          </EuiButton>
         </EuiFlexItem>
-      ) : null}
-      <EuiFlexItem grow={false}>
-        <EuiButton
-          data-test-subj="add-note"
-          isDisabled={newNote.trim().length === 0}
-          fill={true}
-          onClick={() =>
-            updateAndAssociateNode({
-              associateNote,
-              getNewNoteId,
-              newNote,
-              updateNewNote,
-              updateNote,
-            })
-          }
-        >
-          {i18n.ADD_NOTE}
-        </EuiButton>
-      </EuiFlexItem>
-    </ButtonsContainer>
-  </AddNotesContainer>
-));
+      </ButtonsContainer>
+    </AddNotesContainer>
+  );
+});
 
 AddNote.displayName = 'AddNote';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx
index 3ab556a4e5dc4..24db5c5ec8125 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import * as i18n from '../translations';
 
@@ -19,7 +18,7 @@ describe('NewNote', () => {
     const wrapper = shallow(
       <NewNote noteInputHeight={200} note={note} updateNewNote={jest.fn()} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders a tab labeled "Note"', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.tsx b/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.tsx
index 64cbdf1c678c5..5a3439d53dd89 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/add_note/new_note.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiPanel, EuiTabbedContent, EuiTextArea } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Markdown } from '../../markdown';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx b/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx
index e25f57f329bb2..32e10ac3eb77d 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/columns.tsx
@@ -4,8 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+/* eslint-disable react/display-name */
 
+import React from 'react';
+
+import { EuiTableDataType } from '@elastic/eui';
 import { NoteCard } from './note_card';
 import * as i18n from './translations';
 
@@ -20,6 +23,7 @@ interface Item {
 
 interface Column {
   field: string;
+  dataType?: EuiTableDataType;
   name: string;
   sortable: boolean;
   truncateText: boolean;
@@ -29,6 +33,7 @@ interface Column {
 export const columns: Column[] = [
   {
     field: 'note',
+    dataType: 'string',
     name: i18n.NOTE,
     sortable: true,
     truncateText: false,
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/notes/helpers.tsx
index 51e433f0717d6..c933055186e07 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/helpers.tsx
@@ -6,7 +6,7 @@
 
 import { EuiIcon, EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 import moment from 'moment';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Note } from '../../lib/note';
@@ -35,11 +35,9 @@ export const search = {
     incremental: true,
     placeholder: i18n.SEARCH_PLACEHOLDER,
     schema: {
-      user: {
-        type: 'string',
-      },
-      note: {
-        type: 'string',
+      fields: {
+        user: 'string',
+        note: 'string',
       },
     },
   },
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/index.tsx b/x-pack/legacy/plugins/siem/public/components/notes/index.tsx
index 29f7686ade88b..b5fef9a5e4d41 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/index.tsx
@@ -4,7 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiInMemoryTable, EuiModalBody, EuiModalHeader, EuiPanel, EuiSpacer } from '@elastic/eui';
+import {
+  EuiInMemoryTable,
+  EuiInMemoryTableProps,
+  EuiModalBody,
+  EuiModalHeader,
+  EuiPanel,
+  EuiSpacer,
+} from '@elastic/eui';
 import React, { useState } from 'react';
 import styled from 'styled-components';
 
@@ -34,11 +41,13 @@ const NotesPanel = styled(EuiPanel)`
 
 NotesPanel.displayName = 'NotesPanel';
 
-const InMemoryTable = styled(EuiInMemoryTable)`
+const InMemoryTable: typeof EuiInMemoryTable & { displayName: string } = styled(
+  EuiInMemoryTable as React.ComponentType<EuiInMemoryTableProps<Note>>
+)`
   overflow-x: hidden;
   overflow-y: auto;
   height: 220px;
-`;
+` as any; // eslint-disable-line @typescript-eslint/no-explicit-any
 
 InMemoryTable.displayName = 'InMemoryTable';
 
@@ -66,7 +75,6 @@ export const Notes = React.memo<Props>(
             data-test-subj="notes-table"
             items={getNotesByIds(noteIds)}
             columns={columns}
-            pagination={false}
             search={search}
             sorting={true}
           />
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap
index d149a33d3b20d..e8ed09658c788 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap
@@ -194,7 +194,7 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
         "euiDataGridCellPaddingS": "4px",
         "euiDataGridColumnResizerWidth": "3px",
         "euiDataGridPrefix": ".euiDataGrid--",
-        "euiDataGridStyles": "'bordersAll', 'bordersNone', 'bordersHorizontal', 'paddingSmall', 'paddingMedium', 'paddingLarge', 'stripes', 'rowHoverNone', 'rowHoverHighlight', 'headerShade', 'headerUnderline', 'fontSizeSmall', 'fontSizeLarge'",
+        "euiDataGridStyles": "'bordersAll', 'bordersNone', 'bordersHorizontal', 'paddingSmall', 'paddingMedium', 'paddingLarge', 'stripes', 'rowHoverNone', 'rowHoverHighlight', 'headerShade', 'headerUnderline', 'fontSizeSmall', 'fontSizeLarge', 'noControls'",
         "euiDataGridVerticalBorder": "solid 1px #24272e",
         "euiDatePickerCalendarWidth": "284px",
         "euiDragAndDropSpacing": Object {
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.test.tsx
index 2c16f85c78076..a927627353f69 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.test.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 { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { ThemeProvider } from 'styled-components';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.tsx
index 88e59ddd1419b..e02ebc2a25fd0 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiPanel } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { NoteCardBody } from './note_card_body';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx
index b6cd23496b190..46e1bab37495a 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 
@@ -24,7 +23,7 @@ describe('NoteCardBody', () => {
         <NoteCardBody rawNote={rawNote} />
       </ThemeProvider>
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the text of the note in an h1', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx
index 94ea0a6ee3129..11761c8fd39b0 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_body.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiPanel, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { WithCopyToClipboard } from '../../../lib/clipboard/with_copy_to_clipboard';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.test.tsx
index 0511ad264647a..3525a88fc2ddd 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
 import * as i18n from '../translations';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.tsx
index a227b5af38e85..e6aa0542df4b3 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_card_header.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiAvatar, EuiPanel } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import * as i18n from '../translations';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.test.tsx
index 9c41d9d52a755..5d99375c38217 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
 import { NoteCreated } from './note_created';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.tsx
index c94f4021e1a4a..cdd0406c71450 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/note_created.tsx
@@ -5,7 +5,7 @@
  */
 
 import { FormattedRelative } from '@kbn/i18n/react';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { LocalizedDateTooltip } from '../../localized_date_tooltip';
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.test.tsx
index dc52822eaff77..f70e841d1eefd 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_cards/index.test.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 { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { ThemeProvider } from 'styled-components';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx
index 917ec3f1bf0b8..e061141bf43e7 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 
 import { DeleteTimelineModal } from './delete_timeline_modal';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx
index 1163fbba1572a..82fe0d1d162a4 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx
@@ -6,7 +6,7 @@
 
 import { EuiConfirmModal, EUI_MODAL_CONFIRM_BUTTON } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import * as React from 'react';
+import React from 'react';
 
 import * as i18n from '../translations';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.test.tsx
index 561eac000bbf7..a3c5371435e52 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.test.tsx
@@ -6,7 +6,7 @@
 
 import { EuiButtonIconProps } from '@elastic/eui';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 
 import { DeleteTimelineModalButton } from '.';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/helpers.test.ts b/x-pack/legacy/plugins/siem/public/components/open_timeline/helpers.test.ts
index 840d8c0a48124..b56fae320df1a 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/helpers.test.ts
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/helpers.test.ts
@@ -234,6 +234,7 @@ describe('helpers', () => {
           start: 0,
         },
         description: '',
+        deletedEventIds: [],
         eventIdToNoteIds: {},
         filters: [],
         highlightedDropAndProviderId: '',
@@ -241,6 +242,7 @@ describe('helpers', () => {
         id: 'savedObject-1',
         isFavorite: false,
         isLive: false,
+        isSelectAllChecked: false,
         isLoading: false,
         isSaving: false,
         itemsPerPage: 25,
@@ -250,11 +252,15 @@ describe('helpers', () => {
           filterQuery: null,
           filterQueryDraft: null,
         },
+        loadingEventIds: [],
         noteIds: [],
         pinnedEventIds: {},
         pinnedEventsSaveObject: {},
         savedObjectId: 'savedObject-1',
+        selectedEventIds: {},
         show: false,
+        showCheckboxes: false,
+        showRowRenderers: true,
         sort: {
           columnId: '@timestamp',
           sortDirection: 'desc',
@@ -321,6 +327,7 @@ describe('helpers', () => {
           start: 0,
         },
         description: '',
+        deletedEventIds: [],
         eventIdToNoteIds: {},
         filters: [],
         highlightedDropAndProviderId: '',
@@ -328,6 +335,7 @@ describe('helpers', () => {
         id: 'savedObject-1',
         isFavorite: false,
         isLive: false,
+        isSelectAllChecked: false,
         isLoading: false,
         isSaving: false,
         itemsPerPage: 25,
@@ -337,11 +345,15 @@ describe('helpers', () => {
           filterQuery: null,
           filterQueryDraft: null,
         },
+        loadingEventIds: [],
         noteIds: [],
         pinnedEventIds: {},
         pinnedEventsSaveObject: {},
         savedObjectId: 'savedObject-1',
+        selectedEventIds: {},
         show: false,
+        showCheckboxes: false,
+        showRowRenderers: true,
         sort: {
           columnId: '@timestamp',
           sortDirection: 'desc',
@@ -401,12 +413,14 @@ describe('helpers', () => {
         version: '1',
         dataProviders: [],
         description: '',
+        deletedEventIds: [],
         eventIdToNoteIds: {},
         filters: [],
         highlightedDropAndProviderId: '',
         historyIds: [],
         isFavorite: false,
         isLive: false,
+        isSelectAllChecked: false,
         isLoading: false,
         isSaving: false,
         itemsPerPage: 25,
@@ -416,6 +430,7 @@ describe('helpers', () => {
           filterQuery: null,
           filterQueryDraft: null,
         },
+        loadingEventIds: [],
         title: '',
         noteIds: [],
         pinnedEventIds: {},
@@ -424,7 +439,10 @@ describe('helpers', () => {
           start: 0,
           end: 0,
         },
+        selectedEventIds: {},
         show: false,
+        showCheckboxes: false,
+        showRowRenderers: true,
         sort: {
           columnId: '@timestamp',
           sortDirection: 'desc',
@@ -516,6 +534,7 @@ describe('helpers', () => {
         version: '1',
         dataProviders: [],
         description: '',
+        deletedEventIds: [],
         eventIdToNoteIds: {},
         filters: [
           {
@@ -565,6 +584,7 @@ describe('helpers', () => {
         historyIds: [],
         isFavorite: false,
         isLive: false,
+        isSelectAllChecked: false,
         isLoading: false,
         isSaving: false,
         itemsPerPage: 25,
@@ -574,6 +594,7 @@ describe('helpers', () => {
           filterQuery: null,
           filterQueryDraft: null,
         },
+        loadingEventIds: [],
         title: '',
         noteIds: [],
         pinnedEventIds: {},
@@ -582,7 +603,10 @@ describe('helpers', () => {
           start: 0,
           end: 0,
         },
+        selectedEventIds: {},
         show: false,
+        showCheckboxes: false,
+        showRowRenderers: true,
         sort: {
           columnId: '@timestamp',
           sortDirection: 'desc',
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/index.test.tsx
index 0f5aafe661d0e..520e2094fb336 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/index.test.tsx
@@ -7,7 +7,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount } from 'enzyme';
 import { MockedProvider } from 'react-apollo/test-utils';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { wait } from '../../lib/helpers';
@@ -19,7 +19,7 @@ import { StatefulOpenTimeline } from '.';
 import { NotePreviews } from './note_previews';
 import { OPEN_TIMELINE_CLASS_NAME } from './helpers';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
+jest.mock('../../lib/kibana');
 
 describe('StatefulOpenTimeline', () => {
   const theme = () => ({ eui: euiDarkVars, darkMode: true });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.test.tsx
index 70bf7d2cbeb52..463111bd9735f 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.test.tsx
@@ -8,7 +8,7 @@ import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep } from 'lodash/fp';
 import moment from 'moment';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { mockTimelineResults } from '../../../mock/timeline_results';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.tsx
index 2c35d5d8254cd..e0507c2370831 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { uniqBy } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { NotePreview } from './note_preview';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.test.tsx
index 8092172a29cef..7cefaf08d76cb 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.test.tsx
@@ -6,7 +6,7 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { getEmptyValue } from '../../empty_value';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.tsx
index 126a14f1f8e32..bb4a032734b5b 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/note_previews/note_preview.tsx
@@ -6,7 +6,7 @@
 
 import { EuiAvatar, EuiFlexGroup, EuiFlexItem, EuiText, EuiTitle, EuiToolTip } from '@elastic/eui';
 import { FormattedRelative } from '@kbn/i18n/react';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { getEmptyValue, defaultToEmptyTag } from '../../empty_value';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx
index 690e8877b5019..1ed08eee633ab 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.test.tsx
@@ -7,7 +7,7 @@
 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 React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../pages/timelines/timelines_page';
@@ -17,7 +17,7 @@ import { mockTimelineResults } from '../../mock/timeline_results';
 import { OpenTimeline } from './open_timeline';
 import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from './constants';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
+jest.mock('../../lib/kibana');
 
 describe('OpenTimeline', () => {
   const theme = () => ({ eui: euiDarkVars, darkMode: true });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
index 3b4057c69a696..59ccfc8b250aa 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/open_timeline.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiPanel } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { OPEN_TIMELINE_CLASS_NAME } from './helpers';
 import { OpenTimelineProps } from './types';
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 03383a6cb6612..ca8fa50c572fe 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
@@ -6,7 +6,7 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { ThemeProvider } from 'styled-components';
 
@@ -16,7 +16,7 @@ import { mockOpenTimelineQueryResults } from '../../../mock/timeline_results';
 
 import { OpenTimelineModal } from '.';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
+jest.mock('../../../lib/kibana');
 jest.mock('../../../utils/apollo_context', () => ({
   useApolloClient: () => ({}),
 }));
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
index 4237caf8f3c51..1010504c0acac 100644
--- 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
@@ -7,7 +7,7 @@
 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 React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
@@ -17,7 +17,7 @@ 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');
+jest.mock('../../../lib/kibana');
 
 describe('OpenTimelineModal', () => {
   const theme = () => ({ eui: euiDarkVars, darkMode: true });
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
index b097d2e0d01eb..e28725973aff2 100644
--- 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
@@ -5,7 +5,7 @@
  */
 
 import { EuiModalBody, EuiModalHeader } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { OpenTimelineProps } from '../types';
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
index a5e436c73f93b..66947a313f5e5 100644
--- 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
@@ -6,7 +6,7 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { ThemeProvider } from 'styled-components';
 
@@ -17,8 +17,6 @@ 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 });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.test.tsx
index c25bba7b6b041..1a4708ed5af08 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.test.tsx
@@ -7,7 +7,7 @@
 import { EuiFilterButtonProps } from '@elastic/eui';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { SearchRow } from '.';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.tsx
index fa16c8cfb7035..5765d31078bcf 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/search_row/index.tsx
@@ -14,7 +14,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import * as i18n from '../translations';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx
index 30a02a974ba92..89d6b4befa787 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx
@@ -8,7 +8,7 @@ import { EuiButtonIconProps } from '@elastic/eui';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep, omit } from 'lodash/fp';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
@@ -17,7 +17,7 @@ import { OpenTimelineResult } from '../types';
 import { TimelinesTable } from '.';
 import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from '../constants';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
+jest.mock('../../../lib/kibana');
 
 describe('#getActionsColumns', () => {
   const theme = () => ({ eui: euiDarkVars, darkMode: true });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
index 3a8bc83fdc98a..51dba21ac225c 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { ACTION_COLUMN_WIDTH } from './common_styles';
 import { DeleteTimelineModalButton } from '../delete_timeline_modal';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
index ae68019c2fe69..559ee4a7bb494 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
@@ -7,7 +7,7 @@
 import { EuiButtonIconProps } from '@elastic/eui';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep, omit } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 
@@ -21,7 +21,7 @@ import { TimelinesTable } from '.';
 import * as i18n from '../translations';
 import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from '../constants';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
+jest.mock('../../../lib/kibana');
 
 describe('#getCommonColumns', () => {
   const theme = () => ({ eui: euiDarkVars, darkMode: true });
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 e4ab42bb37c55..0b51bd78283c5 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
@@ -4,9 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { EuiButtonIcon, EuiLink } from '@elastic/eui';
 import { omit } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { ACTION_COLUMN_WIDTH } from './common_styles';
 import { isUntitled } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
index bf5adc8aca533..bc88603721e8a 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
@@ -7,7 +7,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep, omit } from 'lodash/fp';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
@@ -20,7 +20,7 @@ import { TimelinesTable } from '.';
 import * as i18n from '../translations';
 import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from '../constants';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
+jest.mock('../../../lib/kibana');
 
 describe('#getExtendedColumns', () => {
   const theme = () => ({ eui: euiDarkVars, darkMode: true });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx
index 63f6b8b674a3d..b6d874fa0c4d1 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx
@@ -4,7 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+/* eslint-disable react/display-name */
+
+import React from 'react';
 
 import { defaultToEmptyTag } from '../../empty_value';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx
index e5047662eef67..26836787efab1 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx
@@ -7,7 +7,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { cloneDeep, omit } from 'lodash/fp';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
@@ -16,7 +16,7 @@ import { TimelinesTable } from '.';
 import { OpenTimelineResult } from '../types';
 import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from '../constants';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
+jest.mock('../../../lib/kibana');
 
 describe('#getActionsColumns', () => {
   const theme = () => ({ eui: euiDarkVars, darkMode: true });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx
index 6d8a792e91b02..5b0f3ded7d71b 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { EuiIcon, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { ACTION_COLUMN_WIDTH } from './common_styles';
 import { getNotesCount, getPinnedEventCount } from '../helpers';
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 6cf56ad6a770f..7d947cb28e9ec 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
@@ -7,7 +7,7 @@
 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 React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page';
@@ -18,7 +18,7 @@ import { TimelinesTable, TimelinesTableProps } from '.';
 import * as i18n from '../translations';
 import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from '../constants';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
+jest.mock('../../../lib/kibana');
 
 describe('TimelinesTable', () => {
   const theme = () => ({ eui: euiDarkVars, darkMode: true });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx
index b2a8353b640d5..ce88ade01d2ef 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.tsx
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiBasicTable } from '@elastic/eui';
-import * as React from 'react';
+import { EuiBasicTable as _EuiBasicTable } from '@elastic/eui';
+import React from 'react';
 import styled from 'styled-components';
 
 import * as i18n from '../translations';
@@ -22,13 +22,16 @@ import { getCommonColumns } from './common_columns';
 import { getExtendedColumns } from './extended_columns';
 import { getIconHeaderColumns } from './icon_header_columns';
 
+// there are a number of type mismatches across this file
+const EuiBasicTable: any = _EuiBasicTable; // eslint-disable-line @typescript-eslint/no-explicit-any
+
 const BasicTable = styled(EuiBasicTable)`
   .euiTableCellContent {
-    animation: none; //Prevents applying max-height from animation
+    animation: none; /* Prevents applying max-height from animation */
   }
 
   .euiTableRow-isExpandedRow .euiTableCellContent__text {
-    width: 100%; //Fixes collapsing nested flex content in IE11
+    width: 100%; /* Fixes collapsing nested flex content in IE11 */
   }
 `;
 BasicTable.displayName = 'BasicTable';
@@ -124,7 +127,7 @@ export const TimelinesTable = React.memo<TimelinesTableProps>(
 
     const sorting = {
       sort: {
-        field: sortField,
+        field: sortField as keyof OpenTimelineResult,
         direction: sortDirection,
       },
     };
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.test.tsx
index 9303c09c994aa..88dfab470ac96 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.test.tsx
@@ -7,7 +7,7 @@
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { EuiButtonProps } from '@elastic/eui';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import { TitleRow } from '.';
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.tsx
index 2e82c4979f41d..c7de367e04364 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/title_row/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import * as i18n from '../translations';
 import { OpenTimelineProps } from '../types';
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
index 70e75cb54671a..345701c97901f 100644
--- 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
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../mock';
 import { createStore, State } from '../../../store';
@@ -63,7 +62,7 @@ describe('AddFilterToGlobalSearchBar Component', () => {
       </AddFilterToGlobalSearchBar>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('Rendering tooltip', async () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.test.tsx
index c0d0feca5d53c..5d2f3256ef509 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.test.tsx
@@ -5,15 +5,11 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
-import '../../../../mock/ui_settings';
 import { TestProviders } from '../../../../mock';
 import { HistogramSignals } from './index';
 
-jest.mock('../../../../lib/settings/use_kibana_ui_setting');
-
 describe('HistogramSignals', () => {
   test('it renders', () => {
     const wrapper = shallow(
@@ -22,6 +18,6 @@ describe('HistogramSignals', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('HistogramSignals'))).toMatchSnapshot();
+    expect(wrapper.find('HistogramSignals')).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.tsx
index fa26664930fe5..35fe8a2d90509 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/detection_engine/histogram_signals/index.tsx
@@ -9,8 +9,6 @@ import {
   Chart,
   HistogramBarSeries,
   Settings,
-  getAxisId,
-  getSpecId,
   niceTimeFormatByDay,
   timeFormatter,
 } from '@elastic/charts';
@@ -62,16 +60,12 @@ export const HistogramSignals = React.memo(() => {
         theme={npStart.plugins.eui_utils.useChartsTheme()}
       />
 
-      <Axis
-        id={getAxisId('signalAxisX')}
-        position="bottom"
-        tickFormat={timeFormatter(niceTimeFormatByDay(1))}
-      />
+      <Axis id="signalAxisX" position="bottom" tickFormat={timeFormatter(niceTimeFormatByDay(1))} />
 
-      <Axis id={getAxisId('signalAxisY')} position="left" />
+      <Axis id="signalAxisY" position="left" />
 
       <HistogramBarSeries
-        id={getSpecId('signalBar')}
+        id="signalBar"
         xScaleType="time"
         yScaleType="linear"
         xAccessor="x"
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/alerts_over_time/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/alerts_over_time/index.tsx
new file mode 100644
index 0000000000000..031e1cd767be8
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/alerts_over_time/index.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import * as i18n from './translation';
+import { MatrixHistogram } from '../../../matrix_histogram';
+import { MatrixHistogramBasicProps } from '../../../matrix_histogram/types';
+import { MatrixOverTimeHistogramData } from '../../../../graphql/types';
+
+export const AlertsOverTimeHistogram = (
+  props: MatrixHistogramBasicProps<MatrixOverTimeHistogramData>
+) => {
+  const dataKey = 'alertsOverTime';
+  const { totalCount } = props;
+  const subtitle = `${i18n.SHOWING}: ${totalCount.toLocaleString()} ${i18n.UNIT(totalCount)}`;
+  const { ...matrixOverTimeProps } = props;
+
+  return (
+    <MatrixHistogram
+      title={i18n.ALERTS_COUNT_FREQUENCY_BY_MODULE}
+      subtitle={subtitle}
+      dataKey={dataKey}
+      {...matrixOverTimeProps}
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/alerts_over_time/translation.ts b/x-pack/legacy/plugins/siem/public/components/page/hosts/alerts_over_time/translation.ts
new file mode 100644
index 0000000000000..380ca0cd3baaf
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/alerts_over_time/translation.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const ALERTS_COUNT_FREQUENCY_BY_MODULE = i18n.translate(
+  'xpack.siem.alertsOverTime.alertsCountFrequencyByModuleTitle',
+  {
+    defaultMessage: 'Alerts count by module',
+  }
+);
+
+export const SHOWING = i18n.translate('xpack.siem.alertsOverTime.showing', {
+  defaultMessage: 'Showing',
+});
+
+export const UNIT = (totalCount: number) =>
+  i18n.translate('xpack.siem.alertsOverTime.unit', {
+    values: { totalCount },
+    defaultMessage: `{totalCount, plural, =1 {alert} other {alerts}}`,
+  });
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx
index 71e61e2425373..d7c25e97b3838 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
 import { apolloClientObservable, mockGlobalState } from '../../../../mock';
@@ -49,7 +48,7 @@ describe('Authentication Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(AuthenticationTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(AuthenticationTableComponent)')).toMatchSnapshot();
     });
   });
 
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 7efcde5b89c67..f5485922647ca 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,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { has } from 'lodash/fp';
-import React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
@@ -98,39 +100,49 @@ const AuthenticationTableComponent = React.memo<AuthenticationTableProps>(
     type,
     updateTableActivePage,
     updateTableLimit,
-  }) => (
-    <PaginatedTable
-      activePage={activePage}
-      columns={getAuthenticationColumnsCurated(type)}
-      dataTestSubj={`table-${tableType}`}
-      headerCount={totalCount}
-      headerTitle={i18n.AUTHENTICATIONS}
-      headerUnit={i18n.UNIT(totalCount)}
-      id={id}
-      isInspect={isInspect}
-      itemsPerRow={rowItems}
-      limit={limit}
-      loading={loading}
-      loadPage={newActivePage => loadPage(newActivePage)}
-      pageOfItems={data}
-      showMorePagesIndicator={showMorePagesIndicator}
-      totalCount={fakeTotalCount}
-      updateLimitPagination={newLimit =>
+  }) => {
+    const updateLimitPagination = useCallback(
+      newLimit =>
         updateTableLimit({
           hostsType: type,
           limit: newLimit,
           tableType,
-        })
-      }
-      updateActivePage={newPage =>
+        }),
+      [type, updateTableLimit]
+    );
+
+    const updateActivePage = useCallback(
+      newPage =>
         updateTableActivePage({
           activePage: newPage,
           hostsType: type,
           tableType,
-        })
-      }
-    />
-  )
+        }),
+      [type, updateTableActivePage]
+    );
+
+    return (
+      <PaginatedTable
+        activePage={activePage}
+        columns={getAuthenticationColumnsCurated(type)}
+        dataTestSubj={`table-${tableType}`}
+        headerCount={totalCount}
+        headerTitle={i18n.AUTHENTICATIONS}
+        headerUnit={i18n.UNIT(totalCount)}
+        id={id}
+        isInspect={isInspect}
+        itemsPerRow={rowItems}
+        limit={limit}
+        loading={loading}
+        loadPage={loadPage}
+        pageOfItems={data}
+        showMorePagesIndicator={showMorePagesIndicator}
+        totalCount={fakeTotalCount}
+        updateLimitPagination={updateLimitPagination}
+        updateActivePage={updateActivePage}
+      />
+    );
+  }
 );
 
 AuthenticationTableComponent.displayName = 'AuthenticationTableComponent';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx
index 6c3ab04849236..4a836333f3311 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx
@@ -5,33 +5,30 @@
  */
 
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { render, act } from '@testing-library/react';
 
 import { mockFirstLastSeenHostQuery } from '../../../../containers/hosts/first_last_seen/mock';
 import { wait } from '../../../../lib/helpers';
 import { TestProviders } from '../../../../mock';
-import '../../../../mock/ui_settings';
 
 import { FirstLastSeenHost, FirstLastSeenHostType } from '.';
 
-jest.mock('../../../../lib/settings/use_kibana_ui_setting');
-
-// Suppress warnings about "react-apollo" until we migrate to apollo@3
-/* eslint-disable no-console */
-const originalError = console.error;
-beforeAll(() => {
-  console.error = jest.fn();
-});
-afterAll(() => {
-  console.error = originalError;
-});
-
 describe('FirstLastSeen Component', () => {
   const firstSeen = 'Apr 8, 2019 @ 16:09:40.692';
   const lastSeen = 'Apr 8, 2019 @ 18:35:45.064';
 
+  // Suppress warnings about "react-apollo" until we migrate to apollo@3
+  /* eslint-disable no-console */
+  const originalError = console.error;
+  beforeAll(() => {
+    console.error = jest.fn();
+  });
+  afterAll(() => {
+    console.error = originalError;
+  });
+
   test('Loading', async () => {
     const { container } = render(
       <TestProviders>
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx
index 830665f827301..90cfe696610d9 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { TestProviders } from '../../../../mock';
 
 import { HostOverview } from './index';
@@ -31,7 +30,7 @@ describe('Host Summary Component', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('HostOverview'))).toMatchSnapshot();
+      expect(wrapper.find('HostOverview')).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx
index ba953d8e74b29..9e3f8f91d5cf7 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/host_overview/index.tsx
@@ -8,11 +8,11 @@ import { EuiFlexItem } from '@elastic/eui';
 import darkTheme from '@elastic/eui/dist/eui_theme_dark.json';
 import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
 import { getOr } from 'lodash/fp';
-import React, { useContext, useState } from 'react';
+import React, { useContext, useState, useCallback } from 'react';
 
 import { DEFAULT_DARK_MODE } from '../../../../../common/constants';
 import { DescriptionList } from '../../../../../common/utility_types';
-import { useKibanaUiSetting } from '../../../../lib/settings/use_kibana_ui_setting';
+import { useUiSetting$ } from '../../../../lib/kibana';
 import { getEmptyTagValue } from '../../../empty_value';
 import { DefaultFieldRenderer, hostIdRenderer } from '../../../field_renderers/field_renderers';
 import { InspectButton } from '../../../inspect';
@@ -59,7 +59,7 @@ export const HostOverview = React.memo<HostSummaryProps>(
     const [showInspect, setShowInspect] = useState(false);
     const capabilities = useContext(MlCapabilitiesContext);
     const userPermissions = hasMlUserPermissions(capabilities);
-    const [darkMode] = useKibanaUiSetting(DEFAULT_DARK_MODE);
+    const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
 
     const getDefaultRenderer = (fieldName: string, fieldData: HostItem) => (
       <DefaultFieldRenderer
@@ -165,11 +165,11 @@ export const HostOverview = React.memo<HostSummaryProps>(
       ],
     ];
 
+    const handleOnMouseEnter = useCallback(() => setShowInspect(true), []);
+    const handleOnMouseLeave = useCallback(() => setShowInspect(false), []);
+
     return (
-      <OverviewWrapper
-        onMouseEnter={() => setShowInspect(true)}
-        onMouseLeave={() => setShowInspect(false)}
-      >
+      <OverviewWrapper onMouseEnter={handleOnMouseEnter} onMouseLeave={handleOnMouseLeave}>
         <InspectButton
           queryId={id}
           show={showInspect}
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx
index 8c27f86d78884..e561594013dea 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import {
@@ -17,19 +16,11 @@ import {
   TestProviders,
 } from '../../../../mock';
 import { useMountAppended } from '../../../../utils/use_mount_appended';
-import { mockUiSettings } from '../../../../mock/ui_settings';
-import { useKibanaCore } from '../../../../lib/compose/kibana_core';
 import { createStore, hostsModel, State } from '../../../../store';
 import { HostsTableType } from '../../../../store/hosts/model';
 import { HostsTable } from './index';
 import { mockData } from './mock';
 
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../../../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-}));
-
 // 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 and QueryBar
 jest.mock('../../../search_bar', () => ({
@@ -69,7 +60,7 @@ describe('Hosts Table', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('HostsTable'))).toMatchSnapshot();
+      expect(wrapper.find('HostsTable')).toMatchSnapshot();
     });
 
     describe('Sorting on Table', () => {
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 faf1832bc4848..79bdf5c4b8315 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
@@ -115,12 +115,32 @@ const HostsTableComponent = React.memo<HostsTableProps>(
     updateTableActivePage,
     updateTableLimit,
   }) => {
+    const updateLimitPagination = useCallback(
+      newLimit =>
+        updateTableLimit({
+          hostsType: type,
+          limit: newLimit,
+          tableType,
+        }),
+      [type, updateTableLimit]
+    );
+
+    const updateActivePage = useCallback(
+      newPage =>
+        updateTableActivePage({
+          activePage: newPage,
+          hostsType: type,
+          tableType,
+        }),
+      [type, updateTableActivePage]
+    );
+
     const onChange = useCallback(
       (criteria: Criteria) => {
         if (criteria.sort != null) {
           const sort: HostsSortField = {
             field: getSortField(criteria.sort.field),
-            direction: criteria.sort.direction,
+            direction: criteria.sort.direction as Direction,
           };
           if (sort.direction !== direction || sort.field !== sortField) {
             updateHostsSort({
@@ -130,7 +150,7 @@ const HostsTableComponent = React.memo<HostsTableProps>(
           }
         }
       },
-      [direction, sortField, type]
+      [direction, sortField, type, updateHostsSort]
     );
 
     const hostsColumns = useMemo(() => getHostsColumns(), []);
@@ -153,26 +173,14 @@ const HostsTableComponent = React.memo<HostsTableProps>(
         itemsPerRow={rowItems}
         limit={limit}
         loading={loading}
-        loadPage={newActivePage => loadPage(newActivePage)}
+        loadPage={loadPage}
         onChange={onChange}
         pageOfItems={data}
         showMorePagesIndicator={showMorePagesIndicator}
         sorting={sorting}
         totalCount={fakeTotalCount}
-        updateLimitPagination={newLimit =>
-          updateTableLimit({
-            hostsType: type,
-            limit: newLimit,
-            tableType,
-          })
-        }
-        updateActivePage={newPage =>
-          updateTableActivePage({
-            activePage: newPage,
-            hostsType: type,
-            tableType,
-          })
-        }
+        updateLimitPagination={updateLimitPagination}
+        updateActivePage={updateActivePage}
       />
     );
   }
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx
index 577ec5ff51470..dc2340d42ebd9 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx
@@ -7,7 +7,6 @@
 import { mockKpiHostsData, mockKpiHostDetailsData } from './mock';
 import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { KpiHostsComponentBase } from '.';
 import * as statItems from '../../../stat_items';
 import { kpiHostsMapping } from './kpi_hosts_mapping';
@@ -30,7 +29,7 @@ describe('kpiHostsComponent', () => {
           narrowDateRange={narrowDateRange}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it should render KpiHostsData', () => {
@@ -44,7 +43,7 @@ describe('kpiHostsComponent', () => {
           narrowDateRange={narrowDateRange}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it should render KpiHostDetailsData', () => {
@@ -58,7 +57,7 @@ describe('kpiHostsComponent', () => {
           narrowDateRange={narrowDateRange}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx
index 28ddb1df12c3a..76fc2a0c389c3 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../mock';
 import { hostsModel } from '../../../../store';
@@ -45,7 +44,7 @@ describe('Uncommon Process Table Component', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('UncommonProcessTable'))).toMatchSnapshot();
+      expect(wrapper.find('UncommonProcessTable')).toMatchSnapshot();
     });
 
     test('it has a double dash (empty value) without any hosts at all', () => {
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 a4fd4d636b35e..b4c01053f0e9c 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
@@ -4,7 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+/* eslint-disable react/display-name */
+
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
@@ -96,39 +98,49 @@ const UncommonProcessTableComponent = React.memo<UncommonProcessTableProps>(
     updateTableActivePage,
     updateTableLimit,
     type,
-  }) => (
-    <PaginatedTable
-      activePage={activePage}
-      columns={getUncommonColumnsCurated(type)}
-      dataTestSubj={`table-${tableType}`}
-      headerCount={totalCount}
-      headerTitle={i18n.UNCOMMON_PROCESSES}
-      headerUnit={i18n.UNIT(totalCount)}
-      id={id}
-      isInspect={isInspect}
-      itemsPerRow={rowItems}
-      limit={limit}
-      loading={loading}
-      loadPage={newActivePage => loadPage(newActivePage)}
-      pageOfItems={data}
-      showMorePagesIndicator={showMorePagesIndicator}
-      totalCount={fakeTotalCount}
-      updateLimitPagination={newLimit =>
+  }) => {
+    const updateLimitPagination = useCallback(
+      newLimit =>
         updateTableLimit({
           hostsType: type,
           limit: newLimit,
           tableType,
-        })
-      }
-      updateActivePage={newPage =>
+        }),
+      [type, updateTableLimit]
+    );
+
+    const updateActivePage = useCallback(
+      newPage =>
         updateTableActivePage({
           activePage: newPage,
           hostsType: type,
           tableType,
-        })
-      }
-    />
-  )
+        }),
+      [type, updateTableActivePage]
+    );
+
+    return (
+      <PaginatedTable
+        activePage={activePage}
+        columns={getUncommonColumnsCurated(type)}
+        dataTestSubj={`table-${tableType}`}
+        headerCount={totalCount}
+        headerTitle={i18n.UNCOMMON_PROCESSES}
+        headerUnit={i18n.UNIT(totalCount)}
+        id={id}
+        isInspect={isInspect}
+        itemsPerRow={rowItems}
+        limit={limit}
+        loading={loading}
+        loadPage={loadPage}
+        pageOfItems={data}
+        showMorePagesIndicator={showMorePagesIndicator}
+        totalCount={fakeTotalCount}
+        updateLimitPagination={updateLimitPagination}
+        updateActivePage={updateActivePage}
+      />
+    );
+  }
 );
 
 UncommonProcessTableComponent.displayName = 'UncommonProcessTableComponent';
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 582ef2d01fb7e..781155c3ddc38 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/index.tsx
@@ -34,6 +34,19 @@ export const AppGlobalStyle = createGlobalStyle`
   .euiToolTip {
     z-index: 9950 !important;
   }
+
+  /* 
+    overrides the default styling of euiComboBoxOptionsList because it's implemented
+    as a popover, so it's not selectable as a child of the styled component
+  */
+  .euiComboBoxOptionsList {
+    z-index: 9999;
+  }
+
+  /* overrides default styling in angular code that was not theme-friendly */
+  .euiPanel-loading-hide-border {
+    border: none;
+  }
 `;
 
 export const DescriptionListStyled = styled(EuiDescriptionList)`
@@ -97,7 +110,6 @@ export const FooterContainer = styled.div`
   bottom: 0;
   color: #666;
   left: 0;
-  padding: 8px;
   position: fixed;
   text-align: left;
   user-select: none;
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/dns_histogram/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/dns_histogram/index.tsx
index 490efd08f0aa7..e7b0d8e7d00d5 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/dns_histogram/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/dns_histogram/index.tsx
@@ -9,22 +9,23 @@ import React from 'react';
 import { ScaleType } from '@elastic/charts';
 import * as i18n from './translation';
 import { MatrixHistogram } from '../../../matrix_histogram';
-import { bytesFormatter } from '../../../matrix_histogram/utils';
 import { MatrixOverOrdinalHistogramData } from '../../../../graphql/types';
 import { MatrixHistogramBasicProps } from '../../../matrix_histogram/types';
+import { useFormatBytes } from '../../../formatted_bytes';
 
 export const NetworkDnsHistogram = (
   props: MatrixHistogramBasicProps<MatrixOverOrdinalHistogramData>
 ) => {
   const dataKey = 'histogram';
   const { ...matrixOverTimeProps } = props;
+  const formatBytes = useFormatBytes();
 
   return (
     <MatrixHistogram
       title={i18n.NETWORK_DNS_HISTOGRAM}
       dataKey={dataKey}
       scaleType={ScaleType.Ordinal}
-      yTickFormatter={bytesFormatter}
+      yTickFormatter={formatBytes}
       showLegend={false}
       {...matrixOverTimeProps}
     />
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/flow_target_select_connected/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/flow_target_select_connected/index.test.tsx
index c9d18d5f996f3..8c744c6573ee8 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/flow_target_select_connected/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/flow_target_select_connected/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../../mock';
 import { createStore, State } from '../../../../store';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx
index 6c2edd764855c..3038d7f41c632 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ActionCreator } from 'typescript-fsa';
 
 import { FlowTarget } from '../../../../graphql/types';
@@ -52,7 +51,7 @@ describe('IP Overview Component', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('IpOverview'))).toMatchSnapshot();
+      expect(wrapper.find('IpOverview')).toMatchSnapshot();
     });
   });
 });
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 70b4d03362438..0c4e594399517 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/ip_overview/index.tsx
@@ -7,11 +7,11 @@
 import { EuiFlexItem } from '@elastic/eui';
 import darkTheme from '@elastic/eui/dist/eui_theme_dark.json';
 import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
-import React, { useContext, useState } from 'react';
+import React, { useContext, useState, useCallback } from 'react';
 
 import { DEFAULT_DARK_MODE } from '../../../../../common/constants';
 import { DescriptionList } from '../../../../../common/utility_types';
-import { useKibanaUiSetting } from '../../../../lib/settings/use_kibana_ui_setting';
+import { useUiSetting$ } from '../../../../lib/kibana';
 import { FlowTarget, IpOverviewData, Overview } from '../../../../graphql/types';
 import { networkModel } from '../../../../store';
 import { getEmptyTagValue } from '../../../empty_value';
@@ -74,7 +74,7 @@ export const IpOverview = React.memo<IpOverviewProps>(
     const [showInspect, setShowInspect] = useState(false);
     const capabilities = useContext(MlCapabilitiesContext);
     const userPermissions = hasMlUserPermissions(capabilities);
-    const [darkMode] = useKibanaUiSetting(DEFAULT_DARK_MODE);
+    const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
     const typeData: Overview = data[flowTarget]!;
     const column: DescriptionList[] = [
       {
@@ -139,11 +139,12 @@ export const IpOverview = React.memo<IpOverviewProps>(
         { title: i18n.REPUTATION, description: reputationRenderer(ip) },
       ],
     ];
+
+    const handleOnMouseEnter = useCallback(() => setShowInspect(true), []);
+    const handleOnMouseLeave = useCallback(() => setShowInspect(false), []);
+
     return (
-      <OverviewWrapper
-        onMouseEnter={() => setShowInspect(true)}
-        onMouseLeave={() => setShowInspect(false)}
-      >
+      <OverviewWrapper onMouseEnter={handleOnMouseEnter} onMouseLeave={handleOnMouseLeave}>
         <InspectButton
           queryId={id}
           show={showInspect}
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
index 964617c4c85b1..48d3b25f59e4a 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/kpi_network/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
 import { apolloClientObservable, mockGlobalState } from '../../../../mock';
@@ -42,7 +41,7 @@ describe('KpiNetwork Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('KpiNetworkComponent'))).toMatchSnapshot();
+      expect(wrapper.find('KpiNetworkComponent')).toMatchSnapshot();
     });
 
     test('it renders the default widget', () => {
@@ -59,7 +58,7 @@ describe('KpiNetwork Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('KpiNetworkComponent'))).toMatchSnapshot();
+      expect(wrapper.find('KpiNetworkComponent')).toMatchSnapshot();
     });
   });
 });
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 d59d4ccd60c60..73602fe3400a9 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
@@ -146,6 +146,8 @@ export const KpiNetworkBaseComponent = React.memo<{
   );
 });
 
+KpiNetworkBaseComponent.displayName = 'KpiNetworkBaseComponent';
+
 export const KpiNetworkComponent = React.memo<KpiNetworkProps>(
   ({ data, from, id, loading, to, narrowDateRange }) => {
     return loading ? (
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx
index 0537b95ca6cf7..e425057dd0f75 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
@@ -18,8 +17,6 @@ import { useMountAppended } from '../../../../utils/use_mount_appended';
 import { NetworkDnsTable } from '.';
 import { mockData } from './mock';
 
-jest.mock('../../../../lib/settings/use_kibana_ui_setting');
-
 describe('NetworkTopNFlow Table Component', () => {
   const loadPage = jest.fn();
   const state: State = mockGlobalState;
@@ -52,7 +49,7 @@ describe('NetworkTopNFlow Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkDnsTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkDnsTableComponent)')).toMatchSnapshot();
     });
   });
 
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 cc7a895623303..e316f951a0363 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
@@ -10,7 +10,12 @@ import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
 import { networkActions } from '../../../../store/actions';
-import { NetworkDnsEdges, NetworkDnsFields, NetworkDnsSortField } from '../../../../graphql/types';
+import {
+  Direction,
+  NetworkDnsEdges,
+  NetworkDnsFields,
+  NetworkDnsSortField,
+} from '../../../../graphql/types';
 import { networkModel, networkSelectors, State } from '../../../../store';
 import { Criteria, ItemsPerRow, PaginatedTable } from '../../../paginated_table';
 
@@ -77,12 +82,32 @@ export const NetworkDnsTableComponent = React.memo<NetworkDnsTableProps>(
     type,
     updateNetworkTable,
   }) => {
+    const updateLimitPagination = useCallback(
+      newLimit =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { limit: newLimit },
+        }),
+      [type, updateNetworkTable]
+    );
+
+    const updateActivePage = useCallback(
+      newPage =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { activePage: newPage },
+        }),
+      [type, updateNetworkTable]
+    );
+
     const onChange = useCallback(
       (criteria: Criteria) => {
         if (criteria.sort != null) {
           const newDnsSortField: NetworkDnsSortField = {
             field: criteria.sort.field.split('.')[1] as NetworkDnsFields,
-            direction: criteria.sort.direction,
+            direction: criteria.sort.direction as Direction,
           };
           if (!isEqual(newDnsSortField, sort)) {
             updateNetworkTable({
@@ -93,7 +118,7 @@ export const NetworkDnsTableComponent = React.memo<NetworkDnsTableProps>(
           }
         }
       },
-      [sort, type]
+      [sort, type, updateNetworkTable]
     );
 
     const onChangePtrIncluded = useCallback(
@@ -103,7 +128,7 @@ export const NetworkDnsTableComponent = React.memo<NetworkDnsTableProps>(
           tableType,
           updates: { isPtrIncluded: !isPtrIncluded },
         }),
-      [type, isPtrIncluded]
+      [type, updateNetworkTable, isPtrIncluded]
     );
 
     return (
@@ -123,7 +148,7 @@ export const NetworkDnsTableComponent = React.memo<NetworkDnsTableProps>(
         isInspect={isInspect}
         limit={limit}
         loading={loading}
-        loadPage={newActivePage => loadPage(newActivePage)}
+        loadPage={loadPage}
         onChange={onChange}
         pageOfItems={data}
         showMorePagesIndicator={showMorePagesIndicator}
@@ -132,20 +157,8 @@ export const NetworkDnsTableComponent = React.memo<NetworkDnsTableProps>(
           direction: sort.direction,
         }}
         totalCount={fakeTotalCount}
-        updateActivePage={newPage =>
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { activePage: newPage },
-          })
-        }
-        updateLimitPagination={newLimit =>
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { limit: newLimit },
-          })
-        }
+        updateActivePage={updateActivePage}
+        updateLimitPagination={updateLimitPagination}
       />
     );
   }
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx
index e39723f57f0b0..31a1b1667087a 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { FlowDirection } from '../../../../graphql/types';
 
@@ -19,7 +18,7 @@ describe('NetworkTopNFlow Select direction', () => {
     test('it renders the basic switch to include PTR in table', () => {
       const wrapper = shallow(<IsPtrIncluded isPtrIncluded={true} onChange={mockOnChange} />);
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
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
index 6a47a58c85f31..bffc7235b6804 100644
--- 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
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React from 'react';
 import numeral from '@elastic/numeral';
 import { NetworkHttpEdges, NetworkHttpFields, NetworkHttpItem } from '../../../../graphql/types';
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
index 50d64817f81f8..6ce87728ebff7 100644
--- 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
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
@@ -18,8 +17,6 @@ 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;
@@ -53,7 +50,7 @@ describe('NetworkHttp Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkHttpTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkHttpTableComponent)')).toMatchSnapshot();
     });
   });
 
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
index e5ad39b814caa..58adc971b0101 100644
--- 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
@@ -4,13 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { ActionCreator } from 'typescript-fsa';
 
 import { networkActions } from '../../../../store/actions';
 import {
+  Direction,
   NetworkHttpEdges,
   NetworkHttpFields,
   NetworkHttpSortField,
@@ -76,23 +77,50 @@ const NetworkHttpTableComponent = React.memo<NetworkHttpTableProps>(
     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;
+
+    const updateLimitPagination = useCallback(
+      newLimit =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { limit: newLimit },
+        }),
+      [type, updateNetworkTable, tableType]
+    );
+
+    const updateActivePage = useCallback(
+      newPage =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { activePage: newPage },
+        }),
+      [type, updateNetworkTable, tableType]
+    );
+
+    const onChange = useCallback(
+      (criteria: Criteria) => {
+        if (criteria.sort != null && criteria.sort.direction !== sort.direction) {
+          updateNetworkTable({
+            networkType: type,
+            tableType,
+            updates: {
+              sort: {
+                direction: criteria.sort.direction as Direction,
+              },
+            },
+          });
+        }
+      },
+      [tableType, sort.direction, type, updateNetworkTable]
+    );
+
+    const sorting = { field: `node.${NetworkHttpFields.requestCount}`, direction: sort.direction };
+
     return (
       <PaginatedTable
         activePage={activePage}
@@ -106,26 +134,14 @@ const NetworkHttpTableComponent = React.memo<NetworkHttpTableProps>(
         isInspect={isInspect}
         limit={limit}
         loading={loading}
-        loadPage={newActivePage => loadPage(newActivePage)}
-        onChange={criteria => onChange(criteria, tableType)}
+        loadPage={loadPage}
+        onChange={onChange}
         pageOfItems={data}
         showMorePagesIndicator={showMorePagesIndicator}
-        sorting={{ field: `node.${NetworkHttpFields.requestCount}`, direction: sort.direction }}
+        sorting={sorting}
         totalCount={fakeTotalCount}
-        updateActivePage={newPage =>
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { activePage: newPage },
-          })
-        }
-        updateLimitPagination={newLimit =>
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { limit: newLimit },
-          })
-        }
+        updateActivePage={updateActivePage}
+        updateLimitPagination={updateLimitPagination}
       />
     );
   }
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx
index eb4179a040431..764e440a5a4be 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
@@ -24,7 +23,6 @@ import { createStore, networkModel, State } from '../../../../store';
 import { NetworkTopCountriesTable } from '.';
 import { mockData } from './mock';
 
-jest.mock('../../../../lib/settings/use_kibana_ui_setting');
 describe('NetworkTopCountries Table Component', () => {
   const loadPage = jest.fn();
   const state: State = mockGlobalState;
@@ -60,7 +58,7 @@ describe('NetworkTopCountries Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkTopCountriesTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkTopCountriesTableComponent)')).toMatchSnapshot();
     });
     test('it renders the IP Details NetworkTopCountries table', () => {
       const wrapper = shallow(
@@ -85,7 +83,7 @@ describe('NetworkTopCountries Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkTopCountriesTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkTopCountriesTableComponent)')).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.tsx
index 81a48ca162e15..6d14b52d3586d 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_countries_table/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { isEqual, last } from 'lodash/fp';
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { ActionCreator } from 'typescript-fsa';
@@ -88,27 +88,6 @@ const NetworkTopCountriesTableComponent = React.memo<NetworkTopCountriesTablePro
     type,
     updateNetworkTable,
   }) => {
-    const onChange = (criteria: Criteria, tableType: networkModel.TopCountriesTableType) => {
-      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 newTopCountriesSort: NetworkTopTablesSortField = {
-          field: field as NetworkTopTablesFields,
-          direction: newSortDirection,
-        };
-        if (!isEqual(newTopCountriesSort, sort)) {
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: {
-              sort: newTopCountriesSort,
-            },
-          });
-        }
-      }
-    };
-
     let tableType: networkModel.TopCountriesTableType;
     const headerTitle: string =
       flowTargeted === FlowTargetSourceDest.source
@@ -133,15 +112,61 @@ const NetworkTopCountriesTableComponent = React.memo<NetworkTopCountriesTablePro
         ? `node.network.${sort.field}`
         : `node.${flowTargeted}.${sort.field}`;
 
+    const updateLimitPagination = useCallback(
+      newLimit =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { limit: newLimit },
+        }),
+      [type, updateNetworkTable, tableType]
+    );
+
+    const updateActivePage = useCallback(
+      newPage =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { activePage: newPage },
+        }),
+      [type, updateNetworkTable, tableType]
+    );
+
+    const onChange = useCallback(
+      (criteria: Criteria) => {
+        if (criteria.sort != null) {
+          const splitField = criteria.sort.field.split('.');
+          const lastField = last(splitField);
+          const newSortDirection =
+            lastField !== sort.field ? Direction.desc : criteria.sort.direction; // sort by desc on init click
+          const newTopCountriesSort: NetworkTopTablesSortField = {
+            field: lastField as NetworkTopTablesFields,
+            direction: newSortDirection as Direction,
+          };
+          if (!isEqual(newTopCountriesSort, sort)) {
+            updateNetworkTable({
+              networkType: type,
+              tableType,
+              updates: {
+                sort: newTopCountriesSort,
+              },
+            });
+          }
+        }
+      },
+      [type, sort, tableType, updateNetworkTable]
+    );
+
+    const columns = useMemo(
+      () =>
+        getCountriesColumnsCurated(indexPattern, flowTargeted, type, NetworkTopCountriesTableId),
+      [indexPattern, flowTargeted, type]
+    );
+
     return (
       <PaginatedTable
         activePage={activePage}
-        columns={getCountriesColumnsCurated(
-          indexPattern,
-          flowTargeted,
-          type,
-          NetworkTopCountriesTableId
-        )}
+        columns={columns}
         dataTestSubj={`table-${tableType}`}
         headerCount={totalCount}
         headerTitle={headerTitle}
@@ -151,26 +176,14 @@ const NetworkTopCountriesTableComponent = React.memo<NetworkTopCountriesTablePro
         itemsPerRow={rowItems}
         limit={limit}
         loading={loading}
-        loadPage={newActivePage => loadPage(newActivePage)}
-        onChange={criteria => onChange(criteria, tableType)}
+        loadPage={loadPage}
+        onChange={onChange}
         pageOfItems={data}
         showMorePagesIndicator={showMorePagesIndicator}
         sorting={{ field, direction: sort.direction }}
         totalCount={fakeTotalCount}
-        updateActivePage={newPage =>
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { activePage: newPage },
-          })
-        }
-        updateLimitPagination={newLimit =>
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { limit: newLimit },
-          })
-        }
+        updateActivePage={updateActivePage}
+        updateLimitPagination={updateLimitPagination}
       />
     );
   }
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx
index 3157847b32376..24f68ef03d891 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
@@ -24,8 +23,6 @@ import { createStore, networkModel, State } from '../../../../store';
 import { NetworkTopNFlowTable } from '.';
 import { mockData } from './mock';
 
-jest.mock('../../../../lib/settings/use_kibana_ui_setting');
-
 describe('NetworkTopNFlow Table Component', () => {
   const loadPage = jest.fn();
   const state: State = mockGlobalState;
@@ -61,7 +58,7 @@ describe('NetworkTopNFlow Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkTopNFlowTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkTopNFlowTableComponent)')).toMatchSnapshot();
     });
 
     test('it renders the default NetworkTopNFlow table on the IP Details page', () => {
@@ -87,7 +84,7 @@ describe('NetworkTopNFlow Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(NetworkTopNFlowTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(NetworkTopNFlowTableComponent)')).toMatchSnapshot();
     });
   });
 
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 12b87a517b4f7..6cf3401031fa7 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, { useCallback } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { ActionCreator } from 'typescript-fsa';
@@ -87,15 +87,36 @@ const NetworkTopNFlowTableComponent = React.memo<NetworkTopNFlowTableProps>(
     type,
     updateNetworkTable,
   }) => {
+    const columns = useMemo(
+      () => getNFlowColumnsCurated(indexPattern, flowTargeted, type, NetworkTopNFlowTableId),
+      [indexPattern, flowTargeted, type]
+    );
+
+    let tableType: networkModel.TopNTableType;
+    const headerTitle: string =
+      flowTargeted === FlowTargetSourceDest.source ? i18n.SOURCE_IP : i18n.DESTINATION_IP;
+
+    if (type === networkModel.NetworkType.page) {
+      tableType =
+        flowTargeted === FlowTargetSourceDest.source
+          ? networkModel.NetworkTableType.topNFlowSource
+          : networkModel.NetworkTableType.topNFlowDestination;
+    } else {
+      tableType =
+        flowTargeted === FlowTargetSourceDest.source
+          ? networkModel.IpDetailsTableType.topNFlowSource
+          : networkModel.IpDetailsTableType.topNFlowDestination;
+    }
+
     const onChange = useCallback(
-      (criteria: Criteria, tableType: networkModel.TopNTableType) => {
+      (criteria: Criteria) => {
         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,
+            direction: newSortDirection as Direction,
           };
           if (!isEqual(newTopNFlowSort, sort)) {
             updateNetworkTable({
@@ -108,35 +129,35 @@ const NetworkTopNFlowTableComponent = React.memo<NetworkTopNFlowTableProps>(
           }
         }
       },
-      [sort, type]
+      [sort, type, tableType, updateNetworkTable]
     );
 
-    let tableType: networkModel.TopNTableType;
-    const headerTitle: string =
-      flowTargeted === FlowTargetSourceDest.source ? i18n.SOURCE_IP : i18n.DESTINATION_IP;
-
-    if (type === networkModel.NetworkType.page) {
-      tableType =
-        flowTargeted === FlowTargetSourceDest.source
-          ? networkModel.NetworkTableType.topNFlowSource
-          : networkModel.NetworkTableType.topNFlowDestination;
-    } else {
-      tableType =
-        flowTargeted === FlowTargetSourceDest.source
-          ? networkModel.IpDetailsTableType.topNFlowSource
-          : networkModel.IpDetailsTableType.topNFlowDestination;
-    }
-
     const field =
       sort.field === NetworkTopTablesFields.bytes_out ||
       sort.field === NetworkTopTablesFields.bytes_in
         ? `node.network.${sort.field}`
         : `node.${flowTargeted}.${sort.field}`;
 
+    const updateActivePage = useCallback(
+      newPage =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { activePage: newPage },
+        }),
+      [updateNetworkTable, type, tableType]
+    );
+
+    const updateLimitPagination = useCallback(
+      newLimit =>
+        updateNetworkTable({ networkType: type, tableType, updates: { limit: newLimit } }),
+      [updateNetworkTable, type, tableType]
+    );
+
     return (
       <PaginatedTable
         activePage={activePage}
-        columns={getNFlowColumnsCurated(indexPattern, flowTargeted, type, NetworkTopNFlowTableId)}
+        columns={columns}
         dataTestSubj={`table-${tableType}`}
         headerCount={totalCount}
         headerTitle={headerTitle}
@@ -146,22 +167,14 @@ const NetworkTopNFlowTableComponent = React.memo<NetworkTopNFlowTableProps>(
         itemsPerRow={rowItems}
         limit={limit}
         loading={loading}
-        loadPage={newActivePage => loadPage(newActivePage)}
-        onChange={criteria => onChange(criteria, tableType)}
+        loadPage={loadPage}
+        onChange={onChange}
         pageOfItems={data}
         showMorePagesIndicator={showMorePagesIndicator}
         sorting={{ field, direction: sort.direction }}
         totalCount={fakeTotalCount}
-        updateActivePage={newPage =>
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { activePage: newPage },
-          })
-        }
-        updateLimitPagination={newLimit =>
-          updateNetworkTable({ networkType: type, tableType, updates: { limit: newLimit } })
-        }
+        updateActivePage={updateActivePage}
+        updateLimitPagination={updateLimitPagination}
       />
     );
   }
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx
index aea8ee9e6b9e1..44a538871d951 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/columns.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React from 'react';
 import moment from 'moment';
 import { TlsNode } from '../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx
index 4313c455a0df1..81a472f3175e5 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/tls_table/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
@@ -18,8 +17,6 @@ import { createStore, networkModel, State } from '../../../../store';
 import { TlsTable } from '.';
 import { mockTlsData } from './mock';
 
-jest.mock('../../../../lib/settings/use_kibana_ui_setting');
-
 describe('Tls Table Component', () => {
   const loadPage = jest.fn();
   const state: State = mockGlobalState;
@@ -49,7 +46,7 @@ describe('Tls Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(TlsTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(TlsTableComponent)')).toMatchSnapshot();
     });
   });
 
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 7dd9ca0273c5b..95c0fff054440 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
@@ -11,7 +11,7 @@ import { compose } from 'redux';
 import { ActionCreator } from 'typescript-fsa';
 
 import { networkActions } from '../../../../store/network';
-import { TlsEdges, TlsSortField, TlsFields } from '../../../../graphql/types';
+import { TlsEdges, TlsSortField, TlsFields, Direction } from '../../../../graphql/types';
 import { networkModel, networkSelectors, State } from '../../../../store';
 import { Criteria, ItemsPerRow, PaginatedTable, SortingBasicTable } from '../../../paginated_table';
 import { getTlsColumns } from './columns';
@@ -79,13 +79,33 @@ const TlsTableComponent = React.memo<TlsTableProps>(
         ? networkModel.NetworkTableType.tls
         : networkModel.IpDetailsTableType.tls;
 
+    const updateLimitPagination = useCallback(
+      newLimit =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { limit: newLimit },
+        }),
+      [type, updateNetworkTable, tableType]
+    );
+
+    const updateActivePage = useCallback(
+      newPage =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { activePage: newPage },
+        }),
+      [type, updateNetworkTable, tableType]
+    );
+
     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,
+            direction: criteria.sort.direction as Direction,
           };
           if (!isEqual(newTlsSort, sort)) {
             updateNetworkTable({
@@ -96,8 +116,9 @@ const TlsTableComponent = React.memo<TlsTableProps>(
           }
         }
       },
-      [sort, type]
+      [sort, type, tableType, updateNetworkTable]
     );
+
     return (
       <PaginatedTable
         activePage={activePage}
@@ -112,25 +133,13 @@ const TlsTableComponent = React.memo<TlsTableProps>(
         itemsPerRow={rowItems}
         limit={limit}
         loading={loading}
-        loadPage={newActivePage => loadPage(newActivePage)}
+        loadPage={loadPage}
         onChange={onChange}
         pageOfItems={data}
         sorting={getSortField(sort)}
         totalCount={fakeTotalCount}
-        updateActivePage={newPage =>
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { activePage: newPage },
-          })
-        }
-        updateLimitPagination={newLimit =>
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { limit: newLimit },
-          })
-        }
+        updateActivePage={updateActivePage}
+        updateLimitPagination={updateLimitPagination}
       />
     );
   }
diff --git a/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx
index d6b9ec24de0aa..b23c7bd504fb7 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/network/users_table/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
@@ -19,8 +18,6 @@ import { createStore, networkModel, State } from '../../../../store';
 import { UsersTable } from '.';
 import { mockUsersData } from './mock';
 
-jest.mock('../../../../lib/settings/use_kibana_ui_setting');
-
 jest.mock('../../../search_bar', () => ({
   siemFilterManager: {
     addFilters: jest.fn(),
@@ -57,7 +54,7 @@ describe('Users Table Component', () => {
         </ReduxStoreProvider>
       );
 
-      expect(toJson(wrapper.find('Connect(UsersTableComponent)'))).toMatchSnapshot();
+      expect(wrapper.find('Connect(UsersTableComponent)')).toMatchSnapshot();
     });
   });
 
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 8da41fca8f384..f4f14c7c009dc 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
@@ -10,7 +10,13 @@ import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
 import { networkActions } from '../../../../store/network';
-import { FlowTarget, UsersEdges, UsersFields, UsersSortField } from '../../../../graphql/types';
+import {
+  Direction,
+  FlowTarget,
+  UsersEdges,
+  UsersFields,
+  UsersSortField,
+} from '../../../../graphql/types';
 import { networkModel, networkSelectors, State } from '../../../../store';
 import { Criteria, ItemsPerRow, PaginatedTable, SortingBasicTable } from '../../../paginated_table';
 
@@ -78,13 +84,33 @@ const UsersTableComponent = React.memo<UsersTableProps>(
     updateNetworkTable,
     sort,
   }) => {
+    const updateLimitPagination = useCallback(
+      newLimit =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { limit: newLimit },
+        }),
+      [type, updateNetworkTable]
+    );
+
+    const updateActivePage = useCallback(
+      newPage =>
+        updateNetworkTable({
+          networkType: type,
+          tableType,
+          updates: { activePage: newPage },
+        }),
+      [type, updateNetworkTable]
+    );
+
     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,
+            direction: criteria.sort.direction as Direction,
           };
           if (!isEqual(newUsersSort, sort)) {
             updateNetworkTable({
@@ -95,7 +121,7 @@ const UsersTableComponent = React.memo<UsersTableProps>(
           }
         }
       },
-      [sort, type]
+      [sort, type, updateNetworkTable]
     );
 
     return (
@@ -112,25 +138,13 @@ const UsersTableComponent = React.memo<UsersTableProps>(
         itemsPerRow={rowItems}
         limit={limit}
         loading={loading}
-        loadPage={newActivePage => loadPage(newActivePage)}
+        loadPage={loadPage}
         onChange={onChange}
         pageOfItems={data}
         sorting={getSortField(sort)}
         totalCount={fakeTotalCount}
-        updateActivePage={newPage =>
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { activePage: newPage },
-          })
-        }
-        updateLimitPagination={newLimit =>
-          updateNetworkTable({
-            networkType: type,
-            tableType,
-            updates: { limit: newLimit },
-          })
-        }
+        updateActivePage={updateActivePage}
+        updateLimitPagination={updateLimitPagination}
       />
     );
   }
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host/index.tsx
index 077a2d9aebe52..302917c3de93e 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiButton, EuiFlexItem, EuiPanel } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 
 import { HeaderSection } from '../../../header_section';
 import { manageQuery } from '../../../page/manage_query';
@@ -38,9 +38,12 @@ const OverviewHostStatsManage = manageQuery(OverviewHostStats);
 type OverviewHostProps = OwnProps;
 export const OverviewHost = React.memo<OverviewHostProps>(({ endDate, startDate, setQuery }) => {
   const [isHover, setIsHover] = useState(false);
+  const handleMouseEnter = useCallback(() => setIsHover(true), [setIsHover]);
+  const handleMouseLeave = useCallback(() => setIsHover(false), [setIsHover]);
+
   return (
     <EuiFlexItem>
-      <EuiPanel onMouseEnter={() => setIsHover(true)} onMouseLeave={() => setIsHover(false)}>
+      <EuiPanel onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
         <HeaderSection
           border
           id={OverviewHostQueryId}
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx
index d324df2ecb0c1..f99b2687d7072 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { OverviewHostStats } from '.';
 import { mockData } from './mock';
@@ -15,7 +14,7 @@ describe('Overview Host Stat Data', () => {
   describe('rendering', () => {
     test('it renders the default OverviewHostStats', () => {
       const wrapper = shallow(<OverviewHostStats data={mockData.OverviewHost} loading={false} />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
   describe('loading', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network/index.tsx b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network/index.tsx
index b84f2b61a0ce8..f60957cf7b485 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiButton, EuiFlexItem, EuiPanel } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 
 import { HeaderSection } from '../../../header_section';
 import { manageQuery } from '../../../page/manage_query';
@@ -38,9 +38,12 @@ const OverviewNetworkStatsManage = manageQuery(OverviewNetworkStats);
 
 export const OverviewNetwork = React.memo<OwnProps>(({ endDate, startDate, setQuery }) => {
   const [isHover, setIsHover] = useState(false);
+  const handleMouseEnter = useCallback(() => setIsHover(true), [setIsHover]);
+  const handleMouseLeave = useCallback(() => setIsHover(false), [setIsHover]);
+
   return (
     <EuiFlexItem>
-      <EuiPanel onMouseEnter={() => setIsHover(true)} onMouseLeave={() => setIsHover(false)}>
+      <EuiPanel onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
         <HeaderSection
           border
           id={OverviewNetworkQueryId}
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx
index 1b28c032221ab..08093c5d38c15 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { OverviewNetworkStats } from '.';
 import { mockData } from './mock';
@@ -17,7 +16,7 @@ describe('Overview Network Stat Data', () => {
       const wrapper = shallow(
         <OverviewNetworkStats data={mockData.OverviewNetwork} loading={false} />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
   describe('loading', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap
index f637c15553823..9c3bf7b11e3ed 100644
--- a/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap
@@ -194,7 +194,7 @@ exports[`Paginated Table Component rendering it renders the default load more ta
         "euiDataGridCellPaddingS": "4px",
         "euiDataGridColumnResizerWidth": "3px",
         "euiDataGridPrefix": ".euiDataGrid--",
-        "euiDataGridStyles": "'bordersAll', 'bordersNone', 'bordersHorizontal', 'paddingSmall', 'paddingMedium', 'paddingLarge', 'stripes', 'rowHoverNone', 'rowHoverHighlight', 'headerShade', 'headerUnderline', 'fontSizeSmall', 'fontSizeLarge'",
+        "euiDataGridStyles": "'bordersAll', 'bordersNone', 'bordersHorizontal', 'paddingSmall', 'paddingMedium', 'paddingLarge', 'stripes', 'rowHoverNone', 'rowHoverHighlight', 'headerShade', 'headerUnderline', 'fontSizeSmall', 'fontSizeLarge', 'noControls'",
         "euiDataGridVerticalBorder": "solid 1px #24272e",
         "euiDatePickerCalendarWidth": "284px",
         "euiDragAndDropSpacing": Object {
@@ -588,7 +588,7 @@ exports[`Paginated Table Component rendering it renders the default load more ta
       ]
     }
     limit={1}
-    loadPage={[Function]}
+    loadPage={[MockFunction]}
     loading={false}
     pageOfItems={
       Array [
@@ -620,7 +620,7 @@ exports[`Paginated Table Component rendering it renders the default load more ta
     }
     showMorePagesIndicator={true}
     totalCount={10}
-    updateActivePage={[Function]}
+    updateActivePage={[MockFunction]}
     updateLimitPagination={[Function]}
   />
 </ContextProvider>
diff --git a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
index 91ae271d1ccac..947bdee6a5cd2 100644
--- a/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/paginated_table/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { Direction } from '../../graphql/types';
 
@@ -48,17 +47,17 @@ describe('Paginated Table Component', () => {
             itemsPerRow={rowItems}
             limit={1}
             loading={false}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={mockData.Hosts.edges}
             showMorePagesIndicator={true}
             totalCount={10}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
       );
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the loading panel at the beginning ', () => {
@@ -75,11 +74,11 @@ describe('Paginated Table Component', () => {
             itemsPerRow={rowItems}
             limit={1}
             loading={true}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={[]}
             showMorePagesIndicator={true}
             totalCount={10}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
@@ -104,11 +103,11 @@ describe('Paginated Table Component', () => {
             itemsPerRow={rowItems}
             limit={1}
             loading={true}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={mockData.Hosts.edges}
             showMorePagesIndicator={true}
             totalCount={10}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
@@ -131,7 +130,7 @@ describe('Paginated Table Component', () => {
             itemsPerRow={rowItems}
             limit={1}
             loading={false}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={mockData.Hosts.edges}
             showMorePagesIndicator={true}
             totalCount={10}
@@ -168,11 +167,11 @@ describe('Paginated Table Component', () => {
             itemsPerRow={rowItems}
             limit={2}
             loading={false}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={mockData.Hosts.edges}
             showMorePagesIndicator={true}
             totalCount={10}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
@@ -199,11 +198,11 @@ describe('Paginated Table Component', () => {
             itemsPerRow={[]}
             limit={2}
             loading={false}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={mockData.Hosts.edges}
             showMorePagesIndicator={true}
             totalCount={10}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
@@ -233,7 +232,7 @@ describe('Paginated Table Component', () => {
             showMorePagesIndicator={true}
             sorting={{ direction: Direction.asc, field: 'node.host.name' }}
             totalCount={10}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
@@ -256,11 +255,11 @@ describe('Paginated Table Component', () => {
             itemsPerRow={rowItems}
             limit={DEFAULT_MAX_TABLE_QUERY_SIZE}
             loading={false}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={mockData.Hosts.edges}
             showMorePagesIndicator={true}
             totalCount={DEFAULT_MAX_TABLE_QUERY_SIZE * 3}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
@@ -286,11 +285,11 @@ describe('Paginated Table Component', () => {
             itemsPerRow={rowItems}
             limit={DEFAULT_MAX_TABLE_QUERY_SIZE}
             loading={false}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={mockData.Hosts.edges}
             showMorePagesIndicator={true}
             totalCount={30}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
@@ -312,11 +311,11 @@ describe('Paginated Table Component', () => {
             itemsPerRow={rowItems}
             limit={DEFAULT_MAX_TABLE_QUERY_SIZE}
             loading={false}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={mockData.Hosts.edges}
             showMorePagesIndicator={true}
             totalCount={1}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
@@ -340,11 +339,11 @@ describe('Paginated Table Component', () => {
             itemsPerRow={rowItems}
             limit={1}
             loading={false}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={mockData.Hosts.edges}
             showMorePagesIndicator={true}
             totalCount={10}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
@@ -370,11 +369,11 @@ describe('Paginated Table Component', () => {
             itemsPerRow={rowItems}
             limit={2}
             loading={false}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={mockData.Hosts.edges}
             showMorePagesIndicator={true}
             totalCount={10}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
@@ -408,11 +407,11 @@ describe('Paginated Table Component', () => {
         itemsPerRow: rowItems,
         limit: 1,
         loading: false,
-        loadPage: newActivePage => loadPage(newActivePage),
+        loadPage,
         pageOfItems: mockData.Hosts.edges,
         showMorePagesIndicator: true,
         totalCount: 10,
-        updateActivePage: activePage => updateActivePage(activePage),
+        updateActivePage,
         updateLimitPagination: limit => updateLimitPagination({ limit }),
       };
 
@@ -460,11 +459,11 @@ describe('Paginated Table Component', () => {
             itemsPerRow={rowItems}
             limit={2}
             loading={false}
-            loadPage={newActivePage => loadPage(newActivePage)}
+            loadPage={loadPage}
             pageOfItems={mockData.Hosts.edges}
             showMorePagesIndicator={true}
             totalCount={10}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
@@ -503,7 +502,7 @@ describe('Paginated Table Component', () => {
             showMorePagesIndicator={true}
             sorting={{ direction: Direction.asc, field: 'node.host.name' }}
             totalCount={10}
-            updateActivePage={activePage => updateActivePage(activePage)}
+            updateActivePage={updateActivePage}
             updateLimitPagination={limit => updateLimitPagination({ limit })}
           />
         </ThemeProvider>
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 aedec1a340bfd..a552ac270a6fe 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
@@ -5,6 +5,7 @@
  */
 import {
   EuiBasicTable,
+  EuiBasicTableProps,
   EuiButtonEmpty,
   EuiContextMenuItem,
   EuiContextMenuPanel,
@@ -14,12 +15,12 @@ import {
   EuiLoadingContent,
   EuiPagination,
   EuiPopover,
+  Direction,
 } from '@elastic/eui';
 import { noop } from 'lodash/fp';
-import React, { memo, useState, useEffect } from 'react';
+import React, { memo, useState, useEffect, useCallback, ComponentType } from 'react';
 import styled from 'styled-components';
 
-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';
@@ -226,13 +227,15 @@ export const PaginatedTable = memo<SiemTables>(
         </EuiContextMenuItem>
       ));
     const PaginationWrapper = showMorePagesIndicator ? PaginationEuiFlexItem : EuiFlexItem;
+    const handleOnMouseEnter = useCallback(() => setShowInspect(true), []);
+    const handleOnMouseLeave = useCallback(() => setShowInspect(false), []);
 
     return (
       <Panel
         data-test-subj={`${dataTestSubj}-loading-${loading}`}
         loading={loading}
-        onMouseEnter={() => setShowInspect(true)}
-        onMouseLeave={() => setShowInspect(false)}
+        onMouseEnter={handleOnMouseEnter}
+        onMouseLeave={handleOnMouseLeave}
       >
         <HeaderSection
           id={id}
@@ -251,20 +254,25 @@ export const PaginatedTable = memo<SiemTables>(
           <EuiLoadingContent data-test-subj="initialLoadingPanelPaginatedTable" lines={10} />
         ) : (
           <>
+            {
+              // @ts-ignore avoid some type mismatches
+            }
             <BasicTable
+              // @ts-ignore `Columns` interface differs from EUI's `column` type and is used all over this plugin, so ignore the differences instead of refactoring a lot of code
               columns={columns}
               compressed
               items={pageOfItems}
               onChange={onChange}
+              // @ts-ignore TS complains sorting.field is type `never`
               sorting={
                 sorting
                   ? {
                       sort: {
-                        field: sorting.field,
+                        field: sorting.field as any, // eslint-disable-line @typescript-eslint/no-explicit-any
                         direction: sorting.direction,
                       },
                     }
-                  : null
+                  : undefined
               }
             />
             <FooterAction>
@@ -304,7 +312,10 @@ export const PaginatedTable = memo<SiemTables>(
 
 PaginatedTable.displayName = 'PaginatedTable';
 
-const BasicTable = styled(EuiBasicTable)`
+type BasicTableType = ComponentType<EuiBasicTableProps<any>>; // eslint-disable-line @typescript-eslint/no-explicit-any
+const BasicTable: typeof EuiBasicTable & { displayName: string } = styled(
+  EuiBasicTable as BasicTableType
+)`
   tbody {
     th,
     td {
@@ -315,7 +326,7 @@ const BasicTable = styled(EuiBasicTable)`
       display: block;
     }
   }
-`;
+` as any; // eslint-disable-line @typescript-eslint/no-explicit-any
 
 BasicTable.displayName = 'BasicTable';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/pin/index.tsx b/x-pack/legacy/plugins/siem/public/components/pin/index.tsx
index 8aec3a60cbc37..9f898f9acaf2e 100644
--- a/x-pack/legacy/plugins/siem/public/components/pin/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/pin/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiButtonIcon, IconSize } from '@elastic/eui';
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import * as i18n from '../../components/timeline/body/translations';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx
index 330385e39ca79..6ab587f266a8a 100644
--- a/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/port/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock/test_providers';
 import { useMountAppended } from '../../utils/use_mount_appended';
@@ -20,7 +19,7 @@ describe('Port', () => {
     const wrapper = shallow(
       <Port contextId="test" eventId="abcd" fieldName="destination.port" value="443" />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the port', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/port/index.tsx b/x-pack/legacy/plugins/siem/public/components/port/index.tsx
index a8961a92f24cf..bd6289547d0dc 100644
--- a/x-pack/legacy/plugins/siem/public/components/port/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/port/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 { DefaultDraggable } from '../draggables';
 import { getEmptyValue } from '../empty_value';
diff --git a/x-pack/legacy/plugins/siem/public/components/progress_inline/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/progress_inline/index.test.tsx
index d99a4201c4c72..e5c39b365d979 100644
--- a/x-pack/legacy/plugins/siem/public/components/progress_inline/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/progress_inline/index.test.tsx
@@ -5,14 +5,10 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
-import '../../mock/ui_settings';
 import { ProgressInline } from './index';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('ProgressInline', () => {
   test('it renders', () => {
     const wrapper = shallow(
@@ -21,6 +17,6 @@ describe('ProgressInline', () => {
       </ProgressInline>
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx
index 10b769e2a791c..870d0b40d8cd4 100644
--- a/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/query_bar/index.test.tsx
@@ -7,23 +7,14 @@
 import { mount } from 'enzyme';
 import React from 'react';
 
-import { FilterManager, SearchBar } from '../../../../../../../src/plugins/data/public';
-import { uiSettingsServiceMock } from '../../../../../../../src/core/public/ui_settings/ui_settings_service.mock';
-import { useKibanaCore } from '../../lib/compose/kibana_core';
 import { TestProviders, mockIndexPattern } from '../../mock';
-import { QueryBar, QueryBarComponentProps } from '.';
+import { createKibanaCoreStartMock } from '../../mock/kibana_core';
 import { DEFAULT_FROM, DEFAULT_TO } from '../../../common/constants';
-import { mockUiSettings } from '../../mock/ui_settings';
-
-jest.mock('ui/new_platform');
+import { FilterManager, SearchBar } from '../../../../../../../src/plugins/data/public';
+import { QueryBar, QueryBarComponentProps } from '.';
+import { createKibanaContextProviderMock } from '../../mock/kibana_react';
 
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-const mockUiSettingsForFilterManager = uiSettingsServiceMock.createSetupContract();
-jest.mock('../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-  savedObjects: {},
-}));
+const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
 
 describe('QueryBar ', () => {
   // We are doing that because we need to wrapped this component with redux
@@ -196,9 +187,13 @@ describe('QueryBar ', () => {
 
   describe('#onQueryChange', () => {
     test(' is the only reference that changed when filterQueryDraft props get updated', () => {
+      const KibanaWithStorageProvider = createKibanaContextProviderMock();
+
       const Proxy = (props: QueryBarComponentProps) => (
         <TestProviders>
-          <QueryBar {...props} />
+          <KibanaWithStorageProvider services={{ storage: { get: jest.fn() } }}>
+            <QueryBar {...props} />
+          </KibanaWithStorageProvider>
         </TestProviders>
       );
 
diff --git a/x-pack/legacy/plugins/siem/public/components/query_bar/index.tsx b/x-pack/legacy/plugins/siem/public/components/query_bar/index.tsx
index 9f706790bec67..b2843348cc2e3 100644
--- a/x-pack/legacy/plugins/siem/public/components/query_bar/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/query_bar/index.tsx
@@ -6,7 +6,6 @@
 
 import { isEqual } from 'lodash/fp';
 import React, { memo, useState, useEffect, useMemo, useCallback } from 'react';
-import { IndexPattern } from 'ui/index_patterns';
 
 import {
   esFilters,
@@ -118,7 +117,7 @@ export const QueryBar = memo<QueryBarComponentProps>(
     );
 
     const CustomButton = <>{null}</>;
-    const indexPatterns = useMemo(() => [indexPattern as IndexPattern], [indexPattern]);
+    const indexPatterns = useMemo(() => [indexPattern], [indexPattern]);
 
     const searchBarProps = savedQuery != null ? { savedQuery } : {};
 
diff --git a/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
index f1580b59362bf..1237a6538a4c1 100644
--- a/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/resize_handle/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../mock/test_providers';
 
@@ -107,7 +106,7 @@ describe('Resizeable', () => {
       />
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('resize cursor styling', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/scroll_to_top/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/scroll_to_top/index.test.tsx
index 988bb13841fa5..1804093732861 100644
--- a/x-pack/legacy/plugins/siem/public/components/scroll_to_top/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/scroll_to_top/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { globalNode, HookWrapper } from '../../mock';
 import { useScrollToTop } from '.';
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 3d02cff7b72e8..089bade4a4144 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
@@ -10,7 +10,6 @@ import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 import { Subscription } from 'rxjs';
 import styled from 'styled-components';
-import { IndexPattern } from 'ui/index_patterns';
 import { IIndexPattern } from 'src/plugins/data/public';
 import { SavedQuery } from 'src/legacy/core_plugins/data/public';
 
@@ -254,7 +253,7 @@ const SearchBarComponent = memo<SiemSearchBarProps & SiemSearchBarRedux & SiemSe
         subscriptions.unsubscribe();
       };
     }, []);
-    const indexPatterns = useMemo(() => [indexPattern as IndexPattern], [indexPattern]);
+    const indexPatterns = useMemo(() => [indexPattern], [indexPattern]);
     return (
       <SearchBarContainer data-test-subj={`${id}DatePicker`}>
         <SearchBar
diff --git a/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx
index 95c68d0233c69..430cffa520c00 100644
--- a/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/selectable_text/index.test.tsx
@@ -5,15 +5,14 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { SelectableText } from '.';
 
 describe('SelectableText', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<SelectableText>{'You may select this text'}</SelectableText>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it applies the user-select: text style', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.test.tsx
index de463f8e29f91..1fdcd8eee941f 100644
--- a/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/skeleton_row/index.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
@@ -14,7 +13,7 @@ import { SkeletonRow } from './index';
 describe('SkeletonRow', () => {
   test('it renders', () => {
     const wrapper = shallow(<SkeletonRow />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders the correct number of cells if cellCount is specified', () => {
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 20aea3251d838..dce360877130e 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
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import styled from 'styled-components';
 
 interface RowProps {
@@ -12,7 +12,7 @@ interface RowProps {
   rowPadding?: string;
 }
 
-const Row = styled.div.attrs<RowProps>(({ rowHeight, rowPadding, theme }) => ({
+const RowComponent = styled.div.attrs<RowProps>(({ rowHeight, rowPadding, theme }) => ({
   className: 'siemSkeletonRow',
   rowHeight: rowHeight || theme.eui.euiSizeXL,
   rowPadding: rowPadding || `${theme.eui.paddingSizes.s} ${theme.eui.paddingSizes.xs}`,
@@ -22,6 +22,10 @@ const Row = styled.div.attrs<RowProps>(({ rowHeight, rowPadding, theme }) => ({
   height: ${({ rowHeight }) => rowHeight};
   padding: ${({ rowPadding }) => rowPadding};
 `;
+RowComponent.displayName = 'RowComponent';
+
+const Row = React.memo(RowComponent);
+
 Row.displayName = 'Row';
 
 interface CellProps {
@@ -29,7 +33,7 @@ interface CellProps {
   cellMargin?: string;
 }
 
-const Cell = styled.div.attrs<CellProps>(({ cellColor, cellMargin, theme }) => ({
+const CellComponent = styled.div.attrs<CellProps>(({ cellColor, cellMargin, theme }) => ({
   className: 'siemSkeletonRow__cell',
   cellColor: cellColor || theme.eui.euiColorLightestShade,
   cellMargin: cellMargin || theme.eui.gutterTypes.gutterSmall,
@@ -42,6 +46,10 @@ const Cell = styled.div.attrs<CellProps>(({ cellColor, cellMargin, theme }) => (
     margin-left: ${({ cellMargin }) => cellMargin};
   }
 `;
+CellComponent.displayName = 'CellComponent';
+
+const Cell = React.memo(CellComponent);
+
 Cell.displayName = 'Cell';
 
 export interface SkeletonRowProps extends CellProps, RowProps {
@@ -51,9 +59,14 @@ 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} />
-    ));
+    const cells = useMemo(
+      () =>
+        [...Array(cellCount)].map(
+          (_, i) => <Cell cellColor={cellColor} cellMargin={cellMargin} key={i} />,
+          [cellCount]
+        ),
+      [cellCount, cellColor, cellMargin]
+    );
 
     return (
       <Row rowHeight={rowHeight} rowPadding={rowPadding} style={style}>
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/geo_fields.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/geo_fields.tsx
index edf3dc08c7282..baeca10ee0fae 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/geo_fields.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/geo_fields.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { get, uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DefaultDraggable } from '../draggables';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx
index 1679795951a56..3dee668d66a70 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/index.test.tsx
@@ -6,9 +6,8 @@
 
 import numeral from '@elastic/numeral';
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { asArrayIfExists } from '../../lib/helpers';
 import { getMockNetflowData } from '../../mock';
@@ -47,8 +46,6 @@ import {
   NETWORK_TRANSPORT_FIELD_NAME,
 } from './field_names';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 const getSourceDestinationInstance = () => (
   <SourceDestination
     contextId="test"
@@ -103,7 +100,7 @@ describe('SourceDestination', () => {
 
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<div>{getSourceDestinationInstance()}</div>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders a destination label', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/index.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/index.tsx
index 0333181c3521c..c994c4b2cd519 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Network } from './network';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/ip_with_port.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/ip_with_port.tsx
index 4ec317737e72d..ea6ce4caa7270 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/ip_with_port.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/ip_with_port.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Ip } from '../ip';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/network.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/network.tsx
index cfacbb077856c..a0b86b3e9a133 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/network.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/network.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import { uniq } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DirectionBadge } from '../direction';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_arrows.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_arrows.tsx
index 0675212591a66..005ebc14dcdcc 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_arrows.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_arrows.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import numeral from '@elastic/numeral';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { ArrowBody, ArrowHead } from '../arrows';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.test.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.test.tsx
index d42d34c85a4da..60ab59c3796ff 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { asArrayIfExists } from '../../lib/helpers';
 import { getMockNetflowData } from '../../mock';
@@ -35,8 +35,6 @@ import {
   SOURCE_GEO_REGION_NAME_FIELD_NAME,
 } from './geo_fields';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('SourceDestinationIp', () => {
   const mount = useMountAppended();
 
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx
index ebc5beaa4e354..33159387214e4 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_ip.tsx
@@ -6,7 +6,7 @@
 
 import { EuiBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { isEmpty, isEqual, uniqWith } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../ip';
 import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME, Port } from '../port';
diff --git a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_with_arrows.tsx b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_with_arrows.tsx
index 53dade22351bf..d6a3ce4158734 100644
--- a/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_with_arrows.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/source_destination/source_destination_with_arrows.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { SourceDestinationArrows } from './source_destination_arrows';
 import { SourceDestinationIp } from './source_destination_ip';
diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap
index 4e14942b7f0db..098f54640e4b2 100644
--- a/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap
@@ -131,16 +131,18 @@ exports[`Stat Items Component disable charts it renders the default widget 1`] =
                                       type="inspect"
                                     >
                                       <EuiIconEmpty
-                                        aria-hidden="true"
+                                        aria-hidden={true}
                                         className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                                         focusable="false"
+                                        role="img"
                                         style={null}
                                       >
                                         <svg
-                                          aria-hidden="true"
+                                          aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
                                           height={16}
+                                          role="img"
                                           style={null}
                                           viewBox="0 0 16 16"
                                           width={16}
@@ -371,16 +373,18 @@ exports[`Stat Items Component disable charts it renders the default widget 2`] =
                                       type="inspect"
                                     >
                                       <EuiIconEmpty
-                                        aria-hidden="true"
+                                        aria-hidden={true}
                                         className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                                         focusable="false"
+                                        role="img"
                                         style={null}
                                       >
                                         <svg
-                                          aria-hidden="true"
+                                          aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
                                           height={16}
+                                          role="img"
                                           style={null}
                                           viewBox="0 0 16 16"
                                           width={16}
@@ -681,16 +685,18 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                                     type="inspect"
                                   >
                                     <EuiIconEmpty
-                                      aria-hidden="true"
+                                      aria-hidden={true}
                                       className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                                       focusable="false"
+                                      role="img"
                                       style={null}
                                     >
                                       <svg
-                                        aria-hidden="true"
+                                        aria-hidden={true}
                                         className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
                                         focusable="false"
                                         height={16}
+                                        role="img"
                                         style={null}
                                         viewBox="0 0 16 16"
                                         width={16}
@@ -754,9 +760,11 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                                     type="cross"
                                   >
                                     <EuiIconEmpty
+                                      aria-hidden={true}
                                       className="euiIcon euiIcon--large euiIcon-isLoading"
                                       data-test-subj="stat-icon"
                                       focusable="false"
+                                      role="img"
                                       style={
                                         Object {
                                           "fill": "#DB1374",
@@ -764,10 +772,12 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                                       }
                                     >
                                       <svg
+                                        aria-hidden={true}
                                         className="euiIcon euiIcon--large euiIcon-isLoading"
                                         data-test-subj="stat-icon"
                                         focusable="false"
                                         height={16}
+                                        role="img"
                                         style={
                                           Object {
                                             "fill": "#DB1374",
@@ -845,9 +855,11 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                                     type="cross"
                                   >
                                     <EuiIconEmpty
+                                      aria-hidden={true}
                                       className="euiIcon euiIcon--large euiIcon-isLoading"
                                       data-test-subj="stat-icon"
                                       focusable="false"
+                                      role="img"
                                       style={
                                         Object {
                                           "fill": "#490092",
@@ -855,10 +867,12 @@ exports[`Stat Items Component rendering kpis with charts it renders the default
                                       }
                                     >
                                       <svg
+                                        aria-hidden={true}
                                         className="euiIcon euiIcon--large euiIcon-isLoading"
                                         data-test-subj="stat-icon"
                                         focusable="false"
                                         height={16}
+                                        role="img"
                                         style={
                                           Object {
                                             "fill": "#490092",
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 ed3eaa6cf1e91..e68cf47500555 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
@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, ReactWrapper } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import {
@@ -91,7 +92,7 @@ describe('Stat Items Component', () => {
     ],
   ])('disable charts', wrapper => {
     test('it renders the default widget', () => {
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should render titles', () => {
@@ -180,7 +181,7 @@ describe('Stat Items Component', () => {
       );
     });
     test('it renders the default widget', () => {
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should handle multiple titles', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/stat_items/index.tsx b/x-pack/legacy/plugins/siem/public/components/stat_items/index.tsx
index c206a4d33270b..2d081468599a2 100644
--- a/x-pack/legacy/plugins/siem/public/components/stat_items/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/stat_items/index.tsx
@@ -21,7 +21,7 @@ import {
   IconType,
 } from '@elastic/eui';
 import { get, getOr } from 'lodash/fp';
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import styled from 'styled-components';
 
 import { KpiHostsData, KpiNetworkData } from '../../graphql/types';
@@ -210,6 +210,8 @@ export const StatItemsComponent = React.memo<StatItemsProps>(
     to,
   }) => {
     const [isHover, setIsHover] = useState(false);
+    const handleMouseEnter = useCallback(() => setIsHover(true), [setIsHover]);
+    const handleMouseLeave = useCallback(() => setIsHover(false), [setIsHover]);
     const isBarChartDataAvailable =
       barChart &&
       barChart.length &&
@@ -218,9 +220,10 @@ export const StatItemsComponent = React.memo<StatItemsProps>(
       areaChart &&
       areaChart.length &&
       areaChart.every(item => item.value != null && item.value.length > 0);
+
     return (
       <FlexItem grow={grow} data-test-subj={`stat-${statKey}`}>
-        <EuiPanel onMouseEnter={() => setIsHover(true)} onMouseLeave={() => setIsHover(false)}>
+        <EuiPanel onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
           <EuiFlexGroup gutterSize={'none'}>
             <EuiFlexItem>
               <EuiTitle size="xxxs">
diff --git a/x-pack/legacy/plugins/siem/public/components/subtitle/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/subtitle/index.test.tsx
index b54f3133de472..155b219c04b92 100644
--- a/x-pack/legacy/plugins/siem/public/components/subtitle/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/subtitle/index.test.tsx
@@ -5,20 +5,16 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
-import '../../mock/ui_settings';
 import { TestProviders } from '../../mock';
 import { Subtitle } from './index';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('Subtitle', () => {
   test('it renders', () => {
     const wrapper = shallow(<Subtitle items="Test subtitle" />);
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders one subtitle string item', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.test.tsx
index 011e2ddcdbde7..c5838fa283e17 100644
--- a/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/super_date_picker/index.test.tsx
@@ -5,16 +5,72 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
+import { useUiSetting$ } from '../../lib/kibana';
 import { apolloClientObservable, mockGlobalState } from '../../mock';
+import { createUseUiSetting$Mock } from '../../mock/kibana_react';
 import { createStore, State } from '../../store';
 
 import { SuperDatePicker, makeMapStateToProps } from '.';
 import { cloneDeep } from 'lodash/fp';
-
-jest.mock('../../lib/settings/use_kibana_ui_setting');
+import { DEFAULT_TIMEPICKER_QUICK_RANGES } from '../../../common/constants';
+
+jest.mock('../../lib/kibana');
+const mockUseUiSetting$ = useUiSetting$ as jest.Mock;
+const timepickerRanges = [
+  {
+    from: 'now/d',
+    to: 'now/d',
+    display: 'Today',
+  },
+  {
+    from: 'now/w',
+    to: 'now/w',
+    display: 'This week',
+  },
+  {
+    from: 'now-15m',
+    to: 'now',
+    display: 'Last 15 minutes',
+  },
+  {
+    from: 'now-30m',
+    to: 'now',
+    display: 'Last 30 minutes',
+  },
+  {
+    from: 'now-1h',
+    to: 'now',
+    display: 'Last 1 hour',
+  },
+  {
+    from: 'now-24h',
+    to: 'now',
+    display: 'Last 24 hours',
+  },
+  {
+    from: 'now-7d',
+    to: 'now',
+    display: 'Last 7 days',
+  },
+  {
+    from: 'now-30d',
+    to: 'now',
+    display: 'Last 30 days',
+  },
+  {
+    from: 'now-90d',
+    to: 'now',
+    display: 'Last 90 days',
+  },
+  {
+    from: 'now-1y',
+    to: 'now',
+    display: 'Last 1 year',
+  },
+];
 
 describe('SIEM Super Date Picker', () => {
   describe('#SuperDatePicker', () => {
@@ -24,6 +80,13 @@ describe('SIEM Super Date Picker', () => {
     beforeEach(() => {
       jest.clearAllMocks();
       store = createStore(state, apolloClientObservable);
+      mockUseUiSetting$.mockImplementation((key, defaultValue) => {
+        const useUiSetting$Mock = createUseUiSetting$Mock();
+
+        return key === DEFAULT_TIMEPICKER_QUICK_RANGES
+          ? [timepickerRanges, jest.fn()]
+          : useUiSetting$Mock(key, defaultValue);
+      });
     });
 
     describe('Pick Relative Date', () => {
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 a2e190da0f7bc..0877906c721ce 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
@@ -18,7 +18,7 @@ import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 
 import { DEFAULT_TIMEPICKER_QUICK_RANGES } from '../../../common/constants';
-import { useKibanaUiSetting } from '../../lib/settings/use_kibana_ui_setting';
+import { useUiSetting$ } from '../../lib/kibana';
 import { inputsModel, State } from '../../store';
 import { inputsActions, timelineActions } from '../../store/actions';
 import { InputsModelId } from '../../store/inputs/constants';
@@ -38,6 +38,12 @@ import { InputsRange, Policy } from '../../store/inputs/model';
 
 const MAX_RECENTLY_USED_RANGES = 9;
 
+interface Range {
+  from: string;
+  to: string;
+  display: string;
+}
+
 interface SuperDatePickerStateRedux {
   duration: number;
   end: number;
@@ -196,10 +202,10 @@ export const SuperDatePickerComponent = React.memo<SuperDatePickerProps>(
     const endDate = kind === 'relative' ? toStr : new Date(end).toISOString();
     const startDate = kind === 'relative' ? fromStr : new Date(start).toISOString();
 
-    const [quickRanges] = useKibanaUiSetting(DEFAULT_TIMEPICKER_QUICK_RANGES);
+    const [quickRanges] = useUiSetting$<Range[]>(DEFAULT_TIMEPICKER_QUICK_RANGES);
     const commonlyUsedRanges = isEmpty(quickRanges)
       ? []
-      : quickRanges.map(({ from, to, display }: { from: string; to: string; display: string }) => ({
+      : quickRanges.map(({ from, to, display }) => ({
           start: from,
           end: to,
           label: display,
diff --git a/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx
index d864d4306b8ef..17c7c0bac8fa2 100644
--- a/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/tables/helpers.test.tsx
@@ -10,9 +10,8 @@ import {
   getRowItemDraggable,
   OverflowFieldComponent,
 } from './helpers';
-import * as React from 'react';
+import React from 'react';
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { TestProviders } from '../../mock';
 import { getEmptyValue } from '../empty_value';
 import { useMountAppended } from '../../utils/use_mount_appended';
@@ -29,7 +28,7 @@ describe('Table Helpers', () => {
         idPrefix: 'idPrefix',
       });
       const wrapper = shallow(<TestProviders>{rowItem}</TestProviders>);
-      expect(toJson(wrapper.find('DraggableWrapper'))).toMatchSnapshot();
+      expect(wrapper.find('DraggableWrapper')).toMatchSnapshot();
     });
 
     test('it returns empty value when rowItem is undefined', () => {
@@ -97,7 +96,7 @@ describe('Table Helpers', () => {
         idPrefix: 'idPrefix',
       });
       const wrapper = shallow(<TestProviders>{rowItems}</TestProviders>);
-      expect(toJson(wrapper.find('DragDropContext'))).toMatchSnapshot();
+      expect(wrapper.find('DragDropContext')).toMatchSnapshot();
     });
 
     test('it returns empty value when rowItems is undefined', () => {
@@ -193,7 +192,7 @@ describe('Table Helpers', () => {
     test('it returns correctly against snapshot', () => {
       const rowItemOverflow = getRowItemOverflow(items, 'attrName', 1, 1);
       const wrapper = shallow(<div>{rowItemOverflow}</div>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it does not show "more not shown" when maxOverflowItems are not exceeded', () => {
@@ -215,7 +214,7 @@ describe('Table Helpers', () => {
       const wrapper = shallow(
         <OverflowFieldComponent value={overflowString} showToolTip={false} />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it does not truncates as per custom overflowLength value', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/auto_save_warning/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/auto_save_warning/index.tsx
index 6c793126efa72..c2dfda6a81ce4 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/auto_save_warning/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/auto_save_warning/index.tsx
@@ -11,7 +11,7 @@ import {
   EuiGlobalToastListToast as Toast,
 } from '@elastic/eui';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.test.tsx
index 12141d0b5555b..9351fddd90dd5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.test.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../mock';
 import { DEFAULT_ACTIONS_COLUMN_WIDTH } from '../helpers';
@@ -24,9 +24,11 @@ describe('Actions', () => {
           eventIsPinned={false}
           getNotesByIds={jest.fn()}
           loading={false}
+          loadingEventIds={[]}
           noteIds={[]}
           onEventToggled={jest.fn()}
           onPinClicked={jest.fn()}
+          onRowSelected={jest.fn()}
           showCheckboxes={true}
           showNotes={false}
           toggleShowNotes={jest.fn()}
@@ -50,9 +52,11 @@ describe('Actions', () => {
           eventIsPinned={false}
           getNotesByIds={jest.fn()}
           loading={false}
+          loadingEventIds={[]}
           noteIds={[]}
           onEventToggled={jest.fn()}
           onPinClicked={jest.fn()}
+          onRowSelected={jest.fn()}
           showCheckboxes={false}
           showNotes={false}
           toggleShowNotes={jest.fn()}
@@ -76,9 +80,11 @@ describe('Actions', () => {
           eventIsPinned={false}
           getNotesByIds={jest.fn()}
           loading={false}
+          loadingEventIds={[]}
           noteIds={[]}
           onEventToggled={jest.fn()}
           onPinClicked={jest.fn()}
+          onRowSelected={jest.fn()}
           showCheckboxes={false}
           showNotes={false}
           toggleShowNotes={jest.fn()}
@@ -104,9 +110,11 @@ describe('Actions', () => {
           eventIsPinned={false}
           getNotesByIds={jest.fn()}
           loading={false}
+          loadingEventIds={[]}
           noteIds={[]}
           onEventToggled={onEventToggled}
           onPinClicked={jest.fn()}
+          onRowSelected={jest.fn()}
           showCheckboxes={false}
           showNotes={false}
           toggleShowNotes={jest.fn()}
@@ -138,9 +146,11 @@ describe('Actions', () => {
           getNotesByIds={jest.fn()}
           isEventViewer={true}
           loading={false}
+          loadingEventIds={[]}
           noteIds={[]}
           onEventToggled={jest.fn()}
           onPinClicked={jest.fn()}
+          onRowSelected={jest.fn()}
           showCheckboxes={false}
           showNotes={false}
           toggleShowNotes={toggleShowNotes}
@@ -166,9 +176,11 @@ describe('Actions', () => {
           eventIsPinned={false}
           getNotesByIds={jest.fn()}
           loading={false}
+          loadingEventIds={[]}
           noteIds={[]}
           onEventToggled={jest.fn()}
           onPinClicked={jest.fn()}
+          onRowSelected={jest.fn()}
           showCheckboxes={false}
           showNotes={false}
           toggleShowNotes={toggleShowNotes}
@@ -200,9 +212,11 @@ describe('Actions', () => {
           getNotesByIds={jest.fn()}
           isEventViewer={true}
           loading={false}
+          loadingEventIds={[]}
           noteIds={[]}
           onEventToggled={jest.fn()}
           onPinClicked={onPinClicked}
+          onRowSelected={jest.fn()}
           showCheckboxes={false}
           showNotes={false}
           toggleShowNotes={jest.fn()}
@@ -228,9 +242,11 @@ describe('Actions', () => {
           eventIsPinned={false}
           getNotesByIds={jest.fn()}
           loading={false}
+          loadingEventIds={[]}
           noteIds={[]}
           onEventToggled={jest.fn()}
           onPinClicked={onPinClicked}
+          onRowSelected={jest.fn()}
           showCheckboxes={false}
           showNotes={false}
           toggleShowNotes={jest.fn()}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.tsx
index 2de60fdf548b1..6cf14cd972d3e 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/actions/index.tsx
@@ -3,9 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { EuiButtonIcon, EuiCheckbox, EuiToolTip } from '@elastic/eui';
-import { noop } from 'lodash/fp';
-import * as React from 'react';
+import { EuiButtonIcon, EuiCheckbox, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui';
+import React from 'react';
 
 import { Note } from '../../../../lib/note';
 import { AssociateNote, UpdateNote } from '../../../notes/helpers';
@@ -14,17 +13,33 @@ import { NotesButton } from '../../properties/helpers';
 import { EventsLoading, EventsTd, EventsTdContent, EventsTdGroupActions } from '../../styles';
 import { eventHasNotes, getPinTooltip } from '../helpers';
 import * as i18n from '../translations';
+import { OnRowSelected } from '../../events';
+import { TimelineNonEcsData } from '../../../../graphql/types';
+
+export interface TimelineActionProps {
+  eventId: string;
+  data: TimelineNonEcsData[];
+}
+
+export interface TimelineAction {
+  getAction: ({ eventId, data }: TimelineActionProps) => JSX.Element;
+  width: number;
+  id: string;
+}
 
 interface Props {
   actionsColumnWidth: number;
+  additionalActions?: JSX.Element[];
   associateNote: AssociateNote;
   checked: boolean;
+  onRowSelected: OnRowSelected;
   expanded: boolean;
   eventId: string;
   eventIsPinned: boolean;
   getNotesByIds: (noteIds: string[]) => Note[];
   isEventViewer?: boolean;
   loading: boolean;
+  loadingEventIds: Readonly<string[]>;
   noteIds: string[];
   onEventToggled: () => void;
   onPinClicked: () => void;
@@ -39,6 +54,7 @@ const emptyNotes: string[] = [];
 export const Actions = React.memo<Props>(
   ({
     actionsColumnWidth,
+    additionalActions,
     associateNote,
     checked,
     expanded,
@@ -47,9 +63,11 @@ export const Actions = React.memo<Props>(
     getNotesByIds,
     isEventViewer = false,
     loading = false,
+    loadingEventIds,
     noteIds,
     onEventToggled,
     onPinClicked,
+    onRowSelected,
     showCheckboxes,
     showNotes,
     toggleShowNotes,
@@ -62,16 +80,27 @@ export const Actions = React.memo<Props>(
       {showCheckboxes && (
         <EventsTd data-test-subj="select-event-container">
           <EventsTdContent textAlign="center">
-            <EuiCheckbox
-              data-test-subj="select-event"
-              id={eventId}
-              checked={checked}
-              onChange={noop}
-            />
+            {loadingEventIds.includes(eventId) ? (
+              <EuiLoadingSpinner size="m" data-test-subj="event-loader" />
+            ) : (
+              <EuiCheckbox
+                data-test-subj="select-event"
+                id={eventId}
+                checked={checked}
+                onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                  onRowSelected({
+                    eventIds: [eventId],
+                    isSelected: event.currentTarget.checked,
+                  });
+                }}
+              />
+            )}
           </EventsTdContent>
         </EventsTd>
       )}
 
+      <>{additionalActions}</>
+
       <EventsTd>
         <EventsTdContent textAlign="center">
           {loading && <EventsLoading />}
@@ -137,7 +166,9 @@ export const Actions = React.memo<Props>(
       prevProps.eventId === nextProps.eventId &&
       prevProps.eventIsPinned === nextProps.eventIsPinned &&
       prevProps.loading === nextProps.loading &&
+      prevProps.loadingEventIds === nextProps.loadingEventIds &&
       prevProps.noteIds === nextProps.noteIds &&
+      prevProps.onRowSelected === nextProps.onRowSelected &&
       prevProps.showCheckboxes === nextProps.showCheckboxes &&
       prevProps.showNotes === nextProps.showNotes
     );
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
index 65818b697e0b3..1b66a130c3550 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
     <EventsThGroupActions
       actionsColumnWidth={115}
       data-test-subj="actions-container"
+      justifyContent="space-between"
     >
       <EventsTh>
         <EventsThContent
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/actions/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/actions/index.tsx
index b57b343d614a8..64e8aa3c7e7b7 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/actions/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/actions/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiButtonIcon } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { OnColumnRemoved } from '../../../events';
 import { EventsHeadingExtra, EventsLoading } from '../../../styles';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/helpers.tsx
index 057f751f451ac..853c1ec24b703 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/helpers.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Pin } from '../../../../pin';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/index.tsx
index 634db2dc52676..87a1035fc0739 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/events_select/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiCheckbox, EuiSuperSelect } from '@elastic/eui';
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled, { createGlobalStyle } from 'styled-components';
 
 import { getEventsSelectOptions } from './helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx
index d93983d7d4054..b9cfee395bafb 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { ColumnHeaderType } from '../column_header';
 import { defaultHeaders } from '../default_headers';
@@ -24,7 +23,7 @@ describe('Filter', () => {
     };
 
     const wrapper = shallow(<Filter header={textFilterColumnHeader} />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('rendering', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.tsx
index c56322cc69e0c..0b5247e7da678 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/filter/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { OnFilterChange } from '../../../events';
 import { ColumnHeader } from '../column_header';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
index bfcf3cd639799..64f32674cd042 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { Direction } from '../../../../../graphql/types';
 import { TestProviders } from '../../../../../mock';
@@ -40,7 +39,7 @@ describe('Header', () => {
         timelineId={timelineId}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('rendering', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx
index da348590bd044..20c139ae1d050 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { defaultHeaders } from '../../../../../mock';
 import { ColumnHeader } from '../column_header';
@@ -89,6 +88,6 @@ describe('HeaderToolTipContent', () => {
   test('it renders the expected table content', () => {
     const wrapper = shallow(<HeaderToolTipContent header={header} />);
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.tsx
index a63ec2bf840a6..5deb2c3e66376 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiIcon } from '@elastic/eui';
 import { isEmpty } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { getIconFromType } from '../../../../event_details/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
index b537499739d58..0fdd7d78ae253 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { DEFAULT_ACTIONS_COLUMN_WIDTH } from '../helpers';
 import { defaultHeaders } from './default_headers';
@@ -41,17 +40,20 @@ describe('ColumnHeaders', () => {
           actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
           browserFields={mockBrowserFields}
           columnHeaders={defaultHeaders}
+          isSelectAllChecked={false}
           onColumnSorted={jest.fn()}
           onColumnRemoved={jest.fn()}
           onColumnResized={jest.fn()}
+          onSelectAll={jest.fn}
           onUpdateColumns={jest.fn()}
           showEventsSelect={false}
+          showSelectAllCheckbox={false}
           sort={sort}
           timelineId={'test'}
           toggleColumn={jest.fn()}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the field browser', () => {
@@ -61,11 +63,14 @@ describe('ColumnHeaders', () => {
             actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
             browserFields={mockBrowserFields}
             columnHeaders={defaultHeaders}
+            isSelectAllChecked={false}
             onColumnSorted={jest.fn()}
             onColumnRemoved={jest.fn()}
             onColumnResized={jest.fn()}
+            onSelectAll={jest.fn}
             onUpdateColumns={jest.fn()}
             showEventsSelect={false}
+            showSelectAllCheckbox={false}
             sort={sort}
             timelineId={'test'}
             toggleColumn={jest.fn()}
@@ -88,11 +93,14 @@ describe('ColumnHeaders', () => {
             actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
             browserFields={mockBrowserFields}
             columnHeaders={defaultHeaders}
+            isSelectAllChecked={false}
             onColumnSorted={jest.fn()}
             onColumnRemoved={jest.fn()}
             onColumnResized={jest.fn()}
+            onSelectAll={jest.fn}
             onUpdateColumns={jest.fn()}
             showEventsSelect={false}
+            showSelectAllCheckbox={false}
             sort={sort}
             timelineId={'test'}
             toggleColumn={jest.fn()}
@@ -117,11 +125,14 @@ describe('ColumnHeaders', () => {
             actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
             browserFields={mockBrowserFields}
             columnHeaders={defaultHeaders}
+            isSelectAllChecked={false}
             onColumnSorted={jest.fn()}
             onColumnRemoved={jest.fn()}
             onColumnResized={jest.fn()}
+            onSelectAll={jest.fn}
             onUpdateColumns={jest.fn()}
             showEventsSelect={false}
+            showSelectAllCheckbox={false}
             sort={sort}
             timelineId={'test'}
             toggleColumn={jest.fn()}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
index f6562b4db064d..52495c2e3c816 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/index.tsx
@@ -4,16 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiCheckbox } from '@elastic/eui';
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Draggable, Droppable } from 'react-beautiful-dnd';
 
 import { BrowserFields } from '../../../../containers/source';
 import { DragEffects } from '../../../drag_and_drop/draggable_wrapper';
 import {
+  DRAG_TYPE_FIELD,
   droppableTimelineColumnsPrefix,
   getDraggableFieldId,
-  DRAG_TYPE_FIELD,
 } from '../../../drag_and_drop/helpers';
 import { DraggableFieldBadge } from '../../../draggables/field_badge';
 import { StatefulFieldsBrowser } from '../../../fields_browser';
@@ -24,6 +25,7 @@ import {
   OnColumnResized,
   OnColumnSorted,
   OnFilterChange,
+  OnSelectAll,
   OnUpdateColumns,
 } from '../../events';
 import {
@@ -44,12 +46,15 @@ interface Props {
   browserFields: BrowserFields;
   columnHeaders: ColumnHeader[];
   isEventViewer?: boolean;
+  isSelectAllChecked: boolean;
   onColumnRemoved: OnColumnRemoved;
   onColumnResized: OnColumnResized;
   onColumnSorted: OnColumnSorted;
   onFilterChange?: OnFilterChange;
+  onSelectAll: OnSelectAll;
   onUpdateColumns: OnUpdateColumns;
   showEventsSelect: boolean;
+  showSelectAllCheckbox: boolean;
   sort: Sort;
   timelineId: string;
   toggleColumn: (column: ColumnHeader) => void;
@@ -61,12 +66,15 @@ export const ColumnHeadersComponent = ({
   browserFields,
   columnHeaders,
   isEventViewer = false,
+  isSelectAllChecked,
   onColumnRemoved,
   onColumnResized,
   onColumnSorted,
+  onSelectAll,
   onUpdateColumns,
   onFilterChange = noop,
   showEventsSelect,
+  showSelectAllCheckbox,
   sort,
   timelineId,
   toggleColumn,
@@ -78,6 +86,7 @@ export const ColumnHeadersComponent = ({
       <EventsTrHeader>
         <EventsThGroupActions
           actionsColumnWidth={actionsColumnWidth}
+          justifyContent={showSelectAllCheckbox ? 'flexStart' : 'space-between'}
           data-test-subj="actions-container"
         >
           {showEventsSelect && (
@@ -88,8 +97,23 @@ export const ColumnHeadersComponent = ({
             </EventsTh>
           )}
 
+          {showSelectAllCheckbox && (
+            <EventsTh>
+              <EventsThContent textAlign="center">
+                <EuiCheckbox
+                  data-test-subj="select-all-events"
+                  id={'select-all-events'}
+                  checked={isSelectAllChecked}
+                  onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                    onSelectAll({ isSelected: event.currentTarget.checked });
+                  }}
+                />
+              </EventsThContent>
+            </EventsTh>
+          )}
+
           <EventsTh>
-            <EventsThContent textAlign="center">
+            <EventsThContent textAlign={showSelectAllCheckbox ? 'left' : 'center'}>
               <StatefulFieldsBrowser
                 browserFields={browserFields}
                 columnHeaders={columnHeaders}
@@ -141,7 +165,7 @@ export const ColumnHeadersComponent = ({
                       position="relative"
                       // Passing the styles directly to the component because the width is being calculated and is recommended by Styled Components for performance: https://github.com/styled-components/styled-components/issues/134#issuecomment-312415291
                       style={{
-                        flexBasis: header.width + 'px',
+                        flexBasis: `${header.width}px`,
                         ...dragProvided.draggableProps.style,
                       }}
                     >
@@ -162,7 +186,7 @@ export const ColumnHeadersComponent = ({
                         <DragEffects>
                           <DraggableFieldBadge
                             fieldId={header.id}
-                            fieldWidth={header.width + 'px'}
+                            fieldWidth={`${header.width}px`}
                           />
                         </DragEffects>
                       )}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.test.tsx
index d919bdb0788a6..12ce3bb709242 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { RangePicker } from '.';
 import { Ranges } from './ranges';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.tsx
index c221829f92d04..de21fdac6434a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiSelect } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { OnRangeSelected } from '../../../events';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx
index c6b1ee056ebcc..4378a96b2919a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { DEFAULT_PLACEHOLDER, TextFilter } from '.';
 
@@ -14,7 +13,7 @@ describe('TextFilter', () => {
   describe('rendering', () => {
     test('renders correctly against snapshot', () => {
       const wrapper = shallow(<TextFilter columnId="foo" minWidth={100} />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     describe('placeholder', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.tsx
index 09672eb9a38fe..fcc23314a1813 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFieldText } from '@elastic/eui';
 import { noop } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { OnFilterChange } from '../../../events';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap
index d370a24cc1d4d..a168f8d48fa33 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap
@@ -49,25 +49,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-event_category-1-event_category-Access",
-            "kqlQuery": "",
-            "name": "event.category: Access",
-            "queryMatch": Object {
-              "field": "event.category",
-              "operator": ":",
-              "value": "Access",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-event.category-1-event.category-Access"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="event.category"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-event.category-1-event.category-Access"
         truncate={true}
+        value="Access"
       />
     </EventsTdContent>
   </EventsTd>
@@ -82,25 +72,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-event_action-1-event_action-Action",
-            "kqlQuery": "",
-            "name": "event.action: Action",
-            "queryMatch": Object {
-              "field": "event.action",
-              "operator": ":",
-              "value": "Action",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-event.action-1-event.action-Action"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="event.action"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-event.action-1-event.action-Action"
         truncate={true}
+        value="Action"
       />
     </EventsTdContent>
   </EventsTd>
@@ -115,25 +95,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-host_name-1-host_name-apache",
-            "kqlQuery": "",
-            "name": "host.name: apache",
-            "queryMatch": Object {
-              "field": "host.name",
-              "operator": ":",
-              "value": "apache",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-host.name-1-host.name-apache"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="host.name"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-host.name-1-host.name-apache"
         truncate={true}
+        value="apache"
       />
     </EventsTdContent>
   </EventsTd>
@@ -148,25 +118,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-source_ip-1-source_ip-192_168_0_1",
-            "kqlQuery": "",
-            "name": "source.ip: 192.168.0.1",
-            "queryMatch": Object {
-              "field": "source.ip",
-              "operator": ":",
-              "value": "192.168.0.1",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-source.ip-1-source.ip-192.168.0.1"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="source.ip"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-source.ip-1-source.ip-192.168.0.1"
         truncate={true}
+        value="192.168.0.1"
       />
     </EventsTdContent>
   </EventsTd>
@@ -181,25 +141,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-destination_ip-1-destination_ip-192_168_0_3",
-            "kqlQuery": "",
-            "name": "destination.ip: 192.168.0.3",
-            "queryMatch": Object {
-              "field": "destination.ip",
-              "operator": ":",
-              "value": "192.168.0.3",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-destination.ip-1-destination.ip-192.168.0.3"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="destination.ip"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-destination.ip-1-destination.ip-192.168.0.3"
         truncate={true}
+        value="192.168.0.3"
       />
     </EventsTdContent>
   </EventsTd>
@@ -214,25 +164,15 @@ exports[`Columns it renders the expected columns 1`] = `
     <EventsTdContent
       data-test-subj="cell-container"
     >
-      <DraggableWrapper
-        dataProvider={
-          Object {
-            "and": Array [],
-            "enabled": true,
-            "excluded": false,
-            "id": "plain-column-renderer-data-provider-test-user_name-1-user_name-john_dee",
-            "kqlQuery": "",
-            "name": "user.name: john.dee",
-            "queryMatch": Object {
-              "field": "user.name",
-              "operator": ":",
-              "value": "john.dee",
-            },
-          }
-        }
-        key="plain-column-renderer-draggable-wrapper-test-user.name-1-user.name-john.dee"
-        render={[Function]}
+      <FormattedFieldValue
+        contextId="plain-column-renderer-formatted-field-value-test"
+        eventId="1"
+        fieldFormat=""
+        fieldName="user.name"
+        fieldType=""
+        key="plain-column-renderer-formatted-field-value-test-user.name-1-user.name-john.dee"
         truncate={true}
+        value="john.dee"
       />
     </EventsTdContent>
   </EventsTd>
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx
index f5b33296561c7..36427015260a7 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 
-import * as React from 'react';
+import React from 'react';
 
 import { mockTimelineData } from '../../../../mock';
 import { defaultHeaders } from '../column_headers/default_headers';
@@ -29,6 +28,6 @@ describe('Columns', () => {
       />
     );
 
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx
index 2b2401519eb32..37b6e30215056 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/data_driven_columns/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 { TimelineNonEcsData } from '../../../../graphql/types';
 import { OnColumnResized } from '../../events';
@@ -30,7 +30,7 @@ export const DataDrivenColumns = React.memo<Props>(
     return (
       <EventsTdGroupData data-test-subj="data-driven-columns">
         {columnHeaders.map((header, index) => (
-          <EventsTd key={header.id} style={{ flexBasis: header.width + 'px' }}>
+          <EventsTd key={header.id} style={{ flexBasis: `${header.width}px` }}>
             <EventsTdContent data-test-subj="cell-container">
               {getColumnRenderer(header.id, columnRenderers, data).renderColumn({
                 columnName: header.id,
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 72f45bdb27fae..9af860072ec1c 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
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React, { useMemo } from 'react';
 import uuid from 'uuid';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
 import { Note } from '../../../../lib/note';
 import { AssociateNote, UpdateNote } from '../../../notes/helpers';
-import { OnColumnResized, OnPinEvent, OnUnPinEvent } from '../../events';
-import { EventsTrData } from '../../styles';
+import { OnColumnResized, OnPinEvent, OnRowSelected, OnUnPinEvent } from '../../events';
+import { EventsTdContent, EventsTrData } from '../../styles';
 import { Actions } from '../actions';
 import { ColumnHeader } from '../column_headers/column_header';
 import { DataDrivenColumns } from '../data_driven_columns';
@@ -32,10 +32,14 @@ interface Props {
   isEventPinned: boolean;
   isEventViewer?: boolean;
   loading: boolean;
+  loadingEventIds: Readonly<string[]>;
   onColumnResized: OnColumnResized;
   onEventToggled: () => void;
   onPinEvent: OnPinEvent;
+  onRowSelected: OnRowSelected;
   onUnPinEvent: OnUnPinEvent;
+  selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
+  showCheckboxes: boolean;
   showNotes: boolean;
   timelineId: string;
   toggleShowNotes: () => void;
@@ -60,10 +64,14 @@ export const EventColumnView = React.memo<Props>(
     isEventPinned = false,
     isEventViewer = false,
     loading,
+    loadingEventIds,
     onColumnResized,
     onEventToggled,
     onPinEvent,
+    onRowSelected,
     onUnPinEvent,
+    selectedEventIds,
+    showCheckboxes,
     showNotes,
     timelineId,
     toggleShowNotes,
@@ -71,12 +79,24 @@ export const EventColumnView = React.memo<Props>(
   }) => {
     const timelineTypeContext = useTimelineTypeContext();
 
+    const additionalActions = useMemo<JSX.Element[]>(() => {
+      return (
+        timelineTypeContext.timelineActions?.map(action => (
+          <EventsTdContent key={action.id} textAlign="center">
+            {action.getAction({ eventId: id, data })}
+          </EventsTdContent>
+        )) ?? []
+      );
+    }, [data, timelineTypeContext.timelineActions]);
+
     return (
       <EventsTrData data-test-subj="event-column-view">
         <Actions
           actionsColumnWidth={actionsColumnWidth}
+          additionalActions={additionalActions}
           associateNote={associateNote}
-          checked={false}
+          checked={Object.keys(selectedEventIds).includes(id)}
+          onRowSelected={onRowSelected}
           expanded={expanded}
           data-test-subj="actions"
           eventId={id}
@@ -84,6 +104,7 @@ export const EventColumnView = React.memo<Props>(
           getNotesByIds={getNotesByIds}
           isEventViewer={isEventViewer}
           loading={loading}
+          loadingEventIds={loadingEventIds}
           noteIds={eventIdToNoteIds[id] || emptyNotes}
           onEventToggled={onEventToggled}
           onPinClicked={getPinOnClick({
@@ -93,7 +114,7 @@ export const EventColumnView = React.memo<Props>(
             onUnPinEvent,
             isEventPinned,
           })}
-          showCheckboxes={timelineTypeContext.showCheckboxes}
+          showCheckboxes={showCheckboxes}
           showNotes={showNotes}
           toggleShowNotes={toggleShowNotes}
           updateNote={updateNote}
@@ -120,7 +141,11 @@ export const EventColumnView = React.memo<Props>(
       prevProps.eventIdToNoteIds === nextProps.eventIdToNoteIds &&
       prevProps.expanded === nextProps.expanded &&
       prevProps.loading === nextProps.loading &&
+      prevProps.loadingEventIds === nextProps.loadingEventIds &&
       prevProps.isEventPinned === nextProps.isEventPinned &&
+      prevProps.onRowSelected === nextProps.onRowSelected &&
+      prevProps.selectedEventIds === nextProps.selectedEventIds &&
+      prevProps.showCheckboxes === nextProps.showCheckboxes &&
       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 34281219bcc0c..9361a46dddff4 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
@@ -7,11 +7,17 @@
 import React from 'react';
 
 import { BrowserFields } from '../../../../containers/source';
-import { TimelineItem } from '../../../../graphql/types';
+import { TimelineItem, TimelineNonEcsData } from '../../../../graphql/types';
 import { maxDelay } from '../../../../lib/helpers/scheduler';
 import { Note } from '../../../../lib/note';
 import { AddNoteToEvent, UpdateNote } from '../../../notes/helpers';
-import { OnColumnResized, OnPinEvent, OnUnPinEvent, OnUpdateColumns } from '../../events';
+import {
+  OnColumnResized,
+  OnPinEvent,
+  OnRowSelected,
+  OnUnPinEvent,
+  OnUpdateColumns,
+} from '../../events';
 import { EventsTbody } from '../../styles';
 import { ColumnHeader } from '../column_headers/column_header';
 import { ColumnRenderer } from '../renderers/column_renderer';
@@ -30,12 +36,16 @@ interface Props {
   getNotesByIds: (noteIds: string[]) => Note[];
   id: string;
   isEventViewer?: boolean;
+  loadingEventIds: Readonly<string[]>;
   onColumnResized: OnColumnResized;
   onPinEvent: OnPinEvent;
+  onRowSelected: OnRowSelected;
   onUpdateColumns: OnUpdateColumns;
   onUnPinEvent: OnUnPinEvent;
   pinnedEventIds: Readonly<Record<string, boolean>>;
   rowRenderers: RowRenderer[];
+  selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
+  showCheckboxes: boolean;
   toggleColumn: (column: ColumnHeader) => void;
   updateNote: UpdateNote;
 }
@@ -55,12 +65,16 @@ export const Events = React.memo<Props>(
     getNotesByIds,
     id,
     isEventViewer = false,
+    loadingEventIds,
     onColumnResized,
     onPinEvent,
+    onRowSelected,
     onUpdateColumns,
     onUnPinEvent,
     pinnedEventIds,
     rowRenderers,
+    selectedEventIds,
+    showCheckboxes,
     toggleColumn,
     updateNote,
   }) => (
@@ -78,12 +92,16 @@ export const Events = React.memo<Props>(
           isEventPinned={eventIsPinned({ eventId: event._id, pinnedEventIds })}
           isEventViewer={isEventViewer}
           key={event._id}
+          loadingEventIds={loadingEventIds}
           maxDelay={maxDelay(i)}
           onColumnResized={onColumnResized}
           onPinEvent={onPinEvent}
+          onRowSelected={onRowSelected}
           onUnPinEvent={onUnPinEvent}
           onUpdateColumns={onUpdateColumns}
           rowRenderers={rowRenderers}
+          selectedEventIds={selectedEventIds}
+          showCheckboxes={showCheckboxes}
           timelineId={id}
           toggleColumn={toggleColumn}
           updateNote={updateNote}
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 b3ef4b7b39466..b93b0531c740f 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
@@ -9,13 +9,19 @@ import uuid from 'uuid';
 import VisibilitySensor from 'react-visibility-sensor';
 
 import { BrowserFields } from '../../../../containers/source';
-import { TimelineDetailsComponentQuery } from '../../../../containers/timeline/details';
-import { TimelineItem, DetailItem } from '../../../../graphql/types';
+import { TimelineDetailsQuery } from '../../../../containers/timeline/details';
+import { TimelineItem, DetailItem, TimelineNonEcsData } from '../../../../graphql/types';
 import { requestIdleCallbackViaScheduler } from '../../../../lib/helpers/scheduler';
 import { Note } from '../../../../lib/note';
 import { AddNoteToEvent, UpdateNote } from '../../../notes/helpers';
 import { SkeletonRow } from '../../../skeleton_row';
-import { OnColumnResized, OnPinEvent, OnUnPinEvent, OnUpdateColumns } from '../../events';
+import {
+  OnColumnResized,
+  OnPinEvent,
+  OnRowSelected,
+  OnUnPinEvent,
+  OnUpdateColumns,
+} from '../../events';
 import { ExpandableEvent } from '../../expandable_event';
 import { STATEFUL_EVENT_CSS_CLASS_NAME } from '../../helpers';
 import { EventsTrGroup, EventsTrSupplement, OFFSET_SCROLLBAR } from '../../styles';
@@ -36,13 +42,17 @@ interface Props {
   eventIdToNoteIds: Readonly<Record<string, string[]>>;
   getNotesByIds: (noteIds: string[]) => Note[];
   isEventViewer?: boolean;
+  loadingEventIds: Readonly<string[]>;
   maxDelay?: number;
   onColumnResized: OnColumnResized;
   onPinEvent: OnPinEvent;
+  onRowSelected: OnRowSelected;
   onUnPinEvent: OnUnPinEvent;
   onUpdateColumns: OnUpdateColumns;
   isEventPinned: boolean;
   rowRenderers: RowRenderer[];
+  selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
+  showCheckboxes: boolean;
   timelineId: string;
   toggleColumn: (column: ColumnHeader) => void;
   updateNote: UpdateNote;
@@ -81,7 +91,7 @@ interface AttributesProps {
   children: React.ReactNode;
 }
 
-const Attributes = React.memo<AttributesProps>(({ children }) => {
+const AttributesComponent: React.FC<AttributesProps> = ({ children }) => {
   const width = useTimelineWidthContext();
 
   // Passing the styles directly to the component because the width is
@@ -96,179 +106,187 @@ const Attributes = React.memo<AttributesProps>(({ children }) => {
       {children}
     </EventsTrSupplement>
   );
-});
+};
 
-export const StatefulEvent = React.memo<Props>(
-  ({
-    actionsColumnWidth,
-    addNoteToEvent,
-    browserFields,
-    columnHeaders,
-    columnRenderers,
-    event,
-    eventIdToNoteIds,
-    getNotesByIds,
-    isEventViewer = false,
-    isEventPinned = false,
-    maxDelay = 0,
-    onColumnResized,
-    onPinEvent,
-    onUnPinEvent,
-    onUpdateColumns,
-    rowRenderers,
-    timelineId,
-    toggleColumn,
-    updateNote,
-  }) => {
-    const [expanded, setExpanded] = useState<{ [eventId: string]: boolean }>({});
-    const [initialRender, setInitialRender] = useState(false);
-    const [showNotes, setShowNotes] = useState<{ [eventId: string]: boolean }>({});
+const Attributes = React.memo(AttributesComponent);
 
-    const divElement = useRef<HTMLDivElement | null>(null);
+const StatefulEventComponent: React.FC<Props> = ({
+  actionsColumnWidth,
+  addNoteToEvent,
+  browserFields,
+  columnHeaders,
+  columnRenderers,
+  event,
+  eventIdToNoteIds,
+  getNotesByIds,
+  isEventViewer = false,
+  isEventPinned = false,
+  loadingEventIds,
+  maxDelay = 0,
+  onColumnResized,
+  onPinEvent,
+  onRowSelected,
+  onUnPinEvent,
+  onUpdateColumns,
+  rowRenderers,
+  selectedEventIds,
+  showCheckboxes,
+  timelineId,
+  toggleColumn,
+  updateNote,
+}) => {
+  const [expanded, setExpanded] = useState<{ [eventId: string]: boolean }>({});
+  const [initialRender, setInitialRender] = useState(false);
+  const [showNotes, setShowNotes] = useState<{ [eventId: string]: boolean }>({});
 
-    const onToggleShowNotes = useCallback(() => {
-      const eventId = event._id;
-      setShowNotes({ ...showNotes, [eventId]: !showNotes[eventId] });
-    }, [event, showNotes]);
+  const divElement = useRef<HTMLDivElement | null>(null);
 
-    const onToggleExpanded = useCallback(() => {
-      const eventId = event._id;
-      setExpanded({
-        ...expanded,
-        [eventId]: !expanded[eventId],
-      });
-    }, [event, expanded]);
+  const onToggleShowNotes = useCallback(() => {
+    const eventId = event._id;
+    setShowNotes({ ...showNotes, [eventId]: !showNotes[eventId] });
+  }, [event, showNotes]);
 
-    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]
-    );
+  const onToggleExpanded = useCallback(() => {
+    const eventId = event._id;
+    setExpanded({
+      ...expanded,
+      [eventId]: !expanded[eventId],
+    });
+  }, [event, expanded]);
 
-    /**
-     * Incrementally loads the events when it mounts by trying to
-     * see if it resides within a window frame and if it is it will
-     * indicate to React that it should render its self by setting
-     * its initialRender to true.
-     */
-    useEffect(() => {
-      let _isMounted = true;
+  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]
+  );
 
-      requestIdleCallbackViaScheduler(
-        () => {
-          if (!initialRender && _isMounted) {
-            setInitialRender(true);
-          }
-        },
-        { timeout: maxDelay }
-      );
-      return () => {
-        _isMounted = false;
-      };
-    }, []);
+  /**
+   * Incrementally loads the events when it mounts by trying to
+   * see if it resides within a window frame and if it is it will
+   * indicate to React that it should render its self by setting
+   * its initialRender to true.
+   */
+  useEffect(() => {
+    let _isMounted = true;
 
-    // Number of current columns plus one for actions.
-    const columnCount = columnHeaders.length + 1;
+    requestIdleCallbackViaScheduler(
+      () => {
+        if (!initialRender && _isMounted) {
+          setInitialRender(true);
+        }
+      },
+      { timeout: maxDelay }
+    );
+    return () => {
+      _isMounted = false;
+    };
+  }, []);
 
-    // If we are not ready to render yet, just return null
-    // see useEffect() for when it schedules the first
-    // time this stateful component should be rendered.
-    if (!initialRender) {
-      return <SkeletonRow cellCount={columnCount} />;
-    }
+  // Number of current columns plus one for actions.
+  const columnCount = columnHeaders.length + 1;
 
-    return (
-      <VisibilitySensor
-        partialVisibility={true}
-        scrollCheck={true}
-        offset={{ top: TOP_OFFSET, bottom: BOTTOM_OFFSET }}
-      >
-        {({ isVisible }) => {
-          if (isVisible) {
-            return (
-              <TimelineDetailsComponentQuery
-                sourceId="default"
-                indexName={event._index!}
-                eventId={event._id}
-                executeQuery={!!expanded[event._id]}
-              >
-                {({ detailsData, loading }) => (
-                  <EventsTrGroup
-                    className={STATEFUL_EVENT_CSS_CLASS_NAME}
-                    data-test-subj="event"
-                    ref={c => {
-                      if (c != null) {
-                        divElement.current = c;
-                      }
-                    }}
-                  >
-                    {getRowRenderer(event.ecs, rowRenderers).renderRow({
-                      browserFields,
-                      data: event.ecs,
-                      children: (
-                        <StatefulEventChild
-                          actionsColumnWidth={actionsColumnWidth}
-                          addNoteToEvent={addNoteToEvent}
-                          associateNote={associateNote}
-                          columnHeaders={columnHeaders}
-                          columnRenderers={columnRenderers}
-                          data={event.data}
-                          eventIdToNoteIds={eventIdToNoteIds}
-                          expanded={!!expanded[event._id]}
-                          getNotesByIds={getNotesByIds}
-                          id={event._id}
-                          isEventPinned={isEventPinned}
-                          isEventViewer={isEventViewer}
-                          loading={loading}
-                          onColumnResized={onColumnResized}
-                          onPinEvent={onPinEvent}
-                          onToggleExpanded={onToggleExpanded}
-                          onToggleShowNotes={onToggleShowNotes}
-                          onUnPinEvent={onUnPinEvent}
-                          showNotes={!!showNotes[event._id]}
-                          timelineId={timelineId}
-                          updateNote={updateNote}
-                        />
-                      ),
-                      timelineId,
-                    })}
+  // If we are not ready to render yet, just return null
+  // see useEffect() for when it schedules the first
+  // time this stateful component should be rendered.
+  if (!initialRender) {
+    return <SkeletonRow cellCount={columnCount} />;
+  }
 
-                    <Attributes>
-                      <ExpandableEvent
-                        browserFields={browserFields}
+  return (
+    <VisibilitySensor
+      partialVisibility={true}
+      scrollCheck={true}
+      offset={{ top: TOP_OFFSET, bottom: BOTTOM_OFFSET }}
+    >
+      {({ isVisible }) => {
+        if (isVisible) {
+          return (
+            <TimelineDetailsQuery
+              sourceId="default"
+              indexName={event._index!}
+              eventId={event._id}
+              executeQuery={!!expanded[event._id]}
+            >
+              {({ detailsData, loading }) => (
+                <EventsTrGroup
+                  className={STATEFUL_EVENT_CSS_CLASS_NAME}
+                  data-test-subj="event"
+                  ref={c => {
+                    if (c != null) {
+                      divElement.current = c;
+                    }
+                  }}
+                >
+                  {getRowRenderer(event.ecs, rowRenderers).renderRow({
+                    browserFields,
+                    data: event.ecs,
+                    children: (
+                      <StatefulEventChild
+                        actionsColumnWidth={actionsColumnWidth}
+                        addNoteToEvent={addNoteToEvent}
+                        associateNote={associateNote}
                         columnHeaders={columnHeaders}
-                        event={detailsData || emptyDetails}
-                        forceExpand={!!expanded[event._id] && !loading}
+                        columnRenderers={columnRenderers}
+                        data={event.data}
+                        eventIdToNoteIds={eventIdToNoteIds}
+                        expanded={!!expanded[event._id]}
+                        getNotesByIds={getNotesByIds}
                         id={event._id}
-                        onUpdateColumns={onUpdateColumns}
+                        isEventPinned={isEventPinned}
+                        isEventViewer={isEventViewer}
+                        loading={loading}
+                        loadingEventIds={loadingEventIds}
+                        onColumnResized={onColumnResized}
+                        onPinEvent={onPinEvent}
+                        onRowSelected={onRowSelected}
+                        onToggleExpanded={onToggleExpanded}
+                        onToggleShowNotes={onToggleShowNotes}
+                        onUnPinEvent={onUnPinEvent}
+                        selectedEventIds={selectedEventIds}
+                        showCheckboxes={showCheckboxes}
+                        showNotes={!!showNotes[event._id]}
                         timelineId={timelineId}
-                        toggleColumn={toggleColumn}
+                        updateNote={updateNote}
                       />
-                    </Attributes>
-                  </EventsTrGroup>
-                )}
-              </TimelineDetailsComponentQuery>
-            );
-          } else {
-            // Height place holder for visibility detection as well as re-rendering sections.
-            const height =
-              divElement.current != null
-                ? `${divElement.current.clientHeight}px`
-                : DEFAULT_ROW_HEIGHT;
+                    ),
+                    timelineId,
+                  })}
 
-            // height is being inlined directly in here because of performance with StyledComponents
-            // involving quick and constant changes to the DOM.
-            // https://github.com/styled-components/styled-components/issues/134#issuecomment-312415291
-            return <SkeletonRow cellCount={columnCount} style={{ height }} />;
-          }
-        }}
-      </VisibilitySensor>
-    );
-  }
-);
+                  <Attributes>
+                    <ExpandableEvent
+                      browserFields={browserFields}
+                      columnHeaders={columnHeaders}
+                      event={detailsData || emptyDetails}
+                      forceExpand={!!expanded[event._id] && !loading}
+                      id={event._id}
+                      onUpdateColumns={onUpdateColumns}
+                      timelineId={timelineId}
+                      toggleColumn={toggleColumn}
+                    />
+                  </Attributes>
+                </EventsTrGroup>
+              )}
+            </TimelineDetailsQuery>
+          );
+        } else {
+          // Height place holder for visibility detection as well as re-rendering sections.
+          const height =
+            divElement.current != null
+              ? `${divElement.current.clientHeight}px`
+              : DEFAULT_ROW_HEIGHT;
+
+          // height is being inlined directly in here because of performance with StyledComponents
+          // involving quick and constant changes to the DOM.
+          // https://github.com/styled-components/styled-components/issues/134#issuecomment-312415291
+          return <SkeletonRow cellCount={columnCount} style={{ height }} />;
+        }
+      }}
+    </VisibilitySensor>
+  );
+};
 
-StatefulEvent.displayName = 'StatefulEvent';
+export const StatefulEvent = React.memo(StatefulEventComponent);
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 668139349a377..a39c254c61126 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
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 import uuid from 'uuid';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
 import { Note } from '../../../../lib/note';
 import { AddNoteToEvent, UpdateNote } from '../../../notes/helpers';
 import { NoteCards } from '../../../notes/note_cards';
-import { OnPinEvent, OnColumnResized, OnUnPinEvent } from '../../events';
+import { OnPinEvent, OnColumnResized, OnUnPinEvent, OnRowSelected } from '../../events';
 import { EventsTrSupplement, OFFSET_SCROLLBAR } from '../../styles';
 import { useTimelineWidthContext } from '../../timeline_context';
 import { ColumnHeader } from '../column_headers/column_header';
@@ -31,8 +31,12 @@ interface Props {
   isEventViewer?: boolean;
   isEventPinned: boolean;
   loading: boolean;
+  loadingEventIds: Readonly<string[]>;
   onColumnResized: OnColumnResized;
+  onRowSelected: OnRowSelected;
   onUnPinEvent: OnUnPinEvent;
+  selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
+  showCheckboxes: boolean;
   showNotes: boolean;
   timelineId: string;
   updateNote: UpdateNote;
@@ -62,9 +66,13 @@ export const StatefulEventChild = React.memo<Props>(
     isEventViewer = false,
     isEventPinned = false,
     loading,
+    loadingEventIds,
     onColumnResized,
+    onRowSelected,
     onToggleExpanded,
     onUnPinEvent,
+    selectedEventIds,
+    showCheckboxes,
     showNotes,
     timelineId,
     onToggleShowNotes,
@@ -90,10 +98,14 @@ export const StatefulEventChild = React.memo<Props>(
           isEventPinned={isEventPinned}
           isEventViewer={isEventViewer}
           loading={loading}
+          loadingEventIds={loadingEventIds}
           onColumnResized={onColumnResized}
           onEventToggled={onToggleExpanded}
           onPinEvent={onPinEvent}
+          onRowSelected={onRowSelected}
           onUnPinEvent={onUnPinEvent}
+          selectedEventIds={selectedEventIds}
+          showCheckboxes={showCheckboxes}
           showNotes={showNotes}
           timelineId={timelineId}
           toggleShowNotes={onToggleShowNotes}
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 5fdc2fddfbfb1..c11b884f8a80a 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
@@ -6,7 +6,7 @@
 import { get, isEmpty, noop } from 'lodash/fp';
 
 import { BrowserFields } from '../../../containers/source';
-import { Ecs } from '../../../graphql/types';
+import { Ecs, TimelineItem, TimelineNonEcsData } from '../../../graphql/types';
 import { OnPinEvent, OnUnPinEvent } from '../events';
 import { ColumnHeader } from './column_headers/column_header';
 import * as i18n from './translations';
@@ -95,6 +95,34 @@ export const getColumnHeaders = (
 };
 
 /** Returns the (fixed) width of the Actions column */
-export const getActionsColumnWidth = (isEventViewer: boolean, showCheckboxes = false): number =>
+export const getActionsColumnWidth = (
+  isEventViewer: boolean,
+  showCheckboxes = false,
+  additionalActionWidth = 0
+): number =>
   (showCheckboxes ? SHOW_CHECK_BOXES_COLUMN_WIDTH : 0) +
-  (isEventViewer ? EVENTS_VIEWER_ACTIONS_COLUMN_WIDTH : DEFAULT_ACTIONS_COLUMN_WIDTH);
+  (isEventViewer ? EVENTS_VIEWER_ACTIONS_COLUMN_WIDTH : DEFAULT_ACTIONS_COLUMN_WIDTH) +
+  additionalActionWidth;
+
+/**
+ * Creates mapping of eventID -> fieldData for given fieldsToKeep. Used to store additional field
+ * data necessary for custom timeline actions in conjunction with selection state
+ * @param timelineData
+ * @param eventIds
+ * @param fieldsToKeep
+ */
+export const getEventIdToDataMapping = (
+  timelineData: TimelineItem[],
+  eventIds: string[],
+  fieldsToKeep: string[]
+): Record<string, TimelineNonEcsData[]> => {
+  return timelineData.reduce((acc, v) => {
+    const fvm = eventIds.includes(v._id)
+      ? { [v._id]: v.data.filter(ti => fieldsToKeep.includes(ti.field)) }
+      : {};
+    return {
+      ...acc,
+      ...fvm,
+    };
+  }, {});
+};
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 a4ed5571bb0da..239d8a9d77916 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
@@ -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 { mockBrowserFields } from '../../../containers/source/mock';
 import { Direction } from '../../../graphql/types';
@@ -17,8 +17,6 @@ import { Sort } from './sort';
 import { wait } from '../../../lib/helpers';
 import { useMountAppended } from '../../../utils/use_mount_appended';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
-
 const testBodyHeight = 700;
 const mockGetNotesByIds = (eventId: string[]) => [];
 const mockSort: Sort = {
@@ -55,18 +53,24 @@ describe('Body', () => {
             eventIdToNoteIds={{}}
             height={testBodyHeight}
             id={'timeline-test'}
+            isSelectAllChecked={false}
             getNotesByIds={mockGetNotesByIds}
+            loadingEventIds={[]}
             onColumnRemoved={jest.fn()}
             onColumnResized={jest.fn()}
             onColumnSorted={jest.fn()}
             onFilterChange={jest.fn()}
             onPinEvent={jest.fn()}
+            onRowSelected={jest.fn()}
+            onSelectAll={jest.fn()}
             onUnPinEvent={jest.fn()}
             onUpdateColumns={jest.fn()}
             pinnedEventIds={{}}
             range={'1 Day'}
             rowRenderers={rowRenderers}
+            selectedEventIds={{}}
             sort={mockSort}
+            showCheckboxes={false}
             toggleColumn={jest.fn()}
             updateNote={jest.fn()}
           />
@@ -93,18 +97,24 @@ describe('Body', () => {
             eventIdToNoteIds={{}}
             height={testBodyHeight}
             id={'timeline-test'}
+            isSelectAllChecked={false}
             getNotesByIds={mockGetNotesByIds}
+            loadingEventIds={[]}
             onColumnRemoved={jest.fn()}
             onColumnResized={jest.fn()}
             onColumnSorted={jest.fn()}
             onFilterChange={jest.fn()}
             onPinEvent={jest.fn()}
+            onRowSelected={jest.fn()}
+            onSelectAll={jest.fn()}
             onUnPinEvent={jest.fn()}
             onUpdateColumns={jest.fn()}
             pinnedEventIds={{}}
             range={'1 Day'}
             rowRenderers={rowRenderers}
+            selectedEventIds={{}}
             sort={mockSort}
+            showCheckboxes={false}
             toggleColumn={jest.fn()}
             updateNote={jest.fn()}
           />
@@ -131,18 +141,24 @@ describe('Body', () => {
             eventIdToNoteIds={{}}
             height={testBodyHeight}
             id={'timeline-test'}
+            isSelectAllChecked={false}
             getNotesByIds={mockGetNotesByIds}
+            loadingEventIds={[]}
             onColumnRemoved={jest.fn()}
             onColumnResized={jest.fn()}
             onColumnSorted={jest.fn()}
             onFilterChange={jest.fn()}
             onPinEvent={jest.fn()}
+            onRowSelected={jest.fn()}
+            onSelectAll={jest.fn()}
             onUnPinEvent={jest.fn()}
             onUpdateColumns={jest.fn()}
             pinnedEventIds={{}}
             range={'1 Day'}
             rowRenderers={rowRenderers}
+            selectedEventIds={{}}
             sort={mockSort}
+            showCheckboxes={false}
             toggleColumn={jest.fn()}
             updateNote={jest.fn()}
           />
@@ -171,18 +187,24 @@ describe('Body', () => {
             eventIdToNoteIds={{}}
             height={testBodyHeight}
             id={'timeline-test'}
+            isSelectAllChecked={false}
             getNotesByIds={mockGetNotesByIds}
+            loadingEventIds={[]}
             onColumnRemoved={jest.fn()}
             onColumnResized={jest.fn()}
             onColumnSorted={jest.fn()}
             onFilterChange={jest.fn()}
             onPinEvent={jest.fn()}
+            onRowSelected={jest.fn()}
+            onSelectAll={jest.fn()}
             onUnPinEvent={jest.fn()}
             onUpdateColumns={jest.fn()}
             pinnedEventIds={{}}
             range={'1 Day'}
             rowRenderers={rowRenderers}
+            selectedEventIds={{}}
             sort={mockSort}
+            showCheckboxes={false}
             toggleColumn={jest.fn()}
             updateNote={jest.fn()}
           />
@@ -258,18 +280,24 @@ describe('Body', () => {
             eventIdToNoteIds={{}}
             height={testBodyHeight}
             id={'timeline-test'}
+            isSelectAllChecked={false}
             getNotesByIds={mockGetNotesByIds}
+            loadingEventIds={[]}
             onColumnRemoved={jest.fn()}
             onColumnResized={jest.fn()}
             onColumnSorted={jest.fn()}
             onFilterChange={jest.fn()}
             onPinEvent={dispatchOnPinEvent}
+            onRowSelected={jest.fn()}
+            onSelectAll={jest.fn()}
             onUnPinEvent={jest.fn()}
             onUpdateColumns={jest.fn()}
             pinnedEventIds={{}}
             range={'1 Day'}
             rowRenderers={rowRenderers}
+            selectedEventIds={{}}
             sort={mockSort}
+            showCheckboxes={false}
             toggleColumn={jest.fn()}
             updateNote={jest.fn()}
           />
@@ -298,18 +326,24 @@ describe('Body', () => {
           eventIdToNoteIds={{}}
           height={testBodyHeight}
           id={'timeline-test'}
+          isSelectAllChecked={false}
           getNotesByIds={mockGetNotesByIds}
+          loadingEventIds={[]}
           onColumnRemoved={jest.fn()}
           onColumnResized={jest.fn()}
           onColumnSorted={jest.fn()}
           onFilterChange={jest.fn()}
           onPinEvent={dispatchOnPinEvent}
+          onRowSelected={jest.fn()}
+          onSelectAll={jest.fn()}
           onUnPinEvent={jest.fn()}
           onUpdateColumns={jest.fn()}
           pinnedEventIds={{}}
           range={'1 Day'}
           rowRenderers={rowRenderers}
+          selectedEventIds={{}}
           sort={mockSort}
+          showCheckboxes={false}
           toggleColumn={jest.fn()}
           updateNote={jest.fn()}
         />
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/index.tsx
index 0aed68a0e4ad7..c4ad532f76fc4 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/index.tsx
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React, { useMemo } from 'react';
 
 import { BrowserFields } from '../../../containers/source';
-import { TimelineItem } from '../../../graphql/types';
+import { TimelineItem, TimelineNonEcsData } from '../../../graphql/types';
 import { Note } from '../../../lib/note';
 import { AddNoteToEvent, UpdateNote } from '../../notes/helpers';
 import {
@@ -16,6 +16,8 @@ import {
   OnColumnSorted,
   OnFilterChange,
   OnPinEvent,
+  OnRowSelected,
+  OnSelectAll,
   OnUnPinEvent,
   OnUpdateColumns,
 } from '../events';
@@ -39,10 +41,14 @@ export interface BodyProps {
   height: number;
   id: string;
   isEventViewer?: boolean;
+  isSelectAllChecked: boolean;
   eventIdToNoteIds: Readonly<Record<string, string[]>>;
+  loadingEventIds: Readonly<string[]>;
   onColumnRemoved: OnColumnRemoved;
   onColumnResized: OnColumnResized;
   onColumnSorted: OnColumnSorted;
+  onRowSelected: OnRowSelected;
+  onSelectAll: OnSelectAll;
   onFilterChange: OnFilterChange;
   onPinEvent: OnPinEvent;
   onUpdateColumns: OnUpdateColumns;
@@ -50,6 +56,8 @@ export interface BodyProps {
   pinnedEventIds: Readonly<Record<string, boolean>>;
   range: string;
   rowRenderers: RowRenderer[];
+  selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
+  showCheckboxes: boolean;
   sort: Sort;
   toggleColumn: (column: ColumnHeader) => void;
   updateNote: UpdateNote;
@@ -68,24 +76,38 @@ export const Body = React.memo<BodyProps>(
     height,
     id,
     isEventViewer = false,
+    isSelectAllChecked,
+    loadingEventIds,
     onColumnRemoved,
     onColumnResized,
     onColumnSorted,
+    onRowSelected,
+    onSelectAll,
     onFilterChange,
     onPinEvent,
     onUpdateColumns,
     onUnPinEvent,
     pinnedEventIds,
     rowRenderers,
+    selectedEventIds,
+    showCheckboxes,
     sort,
     toggleColumn,
     updateNote,
   }) => {
     const timelineTypeContext = useTimelineTypeContext();
+    const additionalActionWidth =
+      timelineTypeContext.timelineActions?.reduce((acc, v) => acc + v.width, 0) ?? 0;
 
-    const columnWidths = columnHeaders.reduce(
-      (totalWidth, header) => totalWidth + header.width,
-      getActionsColumnWidth(isEventViewer, timelineTypeContext.showCheckboxes)
+    const actionsColumnWidth = useMemo(
+      () => getActionsColumnWidth(isEventViewer, showCheckboxes, additionalActionWidth),
+      [isEventViewer, showCheckboxes, additionalActionWidth]
+    );
+
+    const columnWidths = useMemo(
+      () =>
+        columnHeaders.reduce((totalWidth, header) => totalWidth + header.width, actionsColumnWidth),
+      [actionsColumnWidth, columnHeaders]
     );
 
     return (
@@ -94,32 +116,29 @@ export const Body = React.memo<BodyProps>(
           <EventsTable
             data-test-subj="events-table"
             // Passing the styles directly to the component because the width is being calculated and is recommended by Styled Components for performance: https://github.com/styled-components/styled-components/issues/134#issuecomment-312415291
-            style={{ minWidth: columnWidths + 'px' }}
+            style={{ minWidth: `${columnWidths}px` }}
           >
             <ColumnHeaders
-              actionsColumnWidth={getActionsColumnWidth(
-                isEventViewer,
-                timelineTypeContext.showCheckboxes
-              )}
+              actionsColumnWidth={actionsColumnWidth}
               browserFields={browserFields}
               columnHeaders={columnHeaders}
               isEventViewer={isEventViewer}
+              isSelectAllChecked={isSelectAllChecked}
               onColumnRemoved={onColumnRemoved}
               onColumnResized={onColumnResized}
               onColumnSorted={onColumnSorted}
               onFilterChange={onFilterChange}
+              onSelectAll={onSelectAll}
               onUpdateColumns={onUpdateColumns}
               showEventsSelect={false}
+              showSelectAllCheckbox={showCheckboxes}
               sort={sort}
               timelineId={id}
               toggleColumn={toggleColumn}
             />
 
             <Events
-              actionsColumnWidth={getActionsColumnWidth(
-                isEventViewer,
-                timelineTypeContext.showCheckboxes
-              )}
+              actionsColumnWidth={actionsColumnWidth}
               addNoteToEvent={addNoteToEvent}
               browserFields={browserFields}
               columnHeaders={columnHeaders}
@@ -129,12 +148,16 @@ export const Body = React.memo<BodyProps>(
               getNotesByIds={getNotesByIds}
               id={id}
               isEventViewer={isEventViewer}
+              loadingEventIds={loadingEventIds}
               onColumnResized={onColumnResized}
               onPinEvent={onPinEvent}
+              onRowSelected={onRowSelected}
               onUpdateColumns={onUpdateColumns}
               onUnPinEvent={onUnPinEvent}
               pinnedEventIds={pinnedEventIds}
               rowRenderers={rowRenderers}
+              selectedEventIds={selectedEventIds}
+              showCheckboxes={showCheckboxes}
               toggleColumn={toggleColumn}
               updateNote={updateNote}
             />
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap
index 1fe02f6f35d06..83a241b628edb 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap
@@ -1,8 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Events renders correctly against snapshot 1`] = `
-<FormattedDate
+<FormattedFieldValue
+  contextId="test"
+  eventId="1"
   fieldName="timestamp"
+  fieldType="date"
   value="2018-11-05T19:03:25.937Z"
 />
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap
index b867e0a788449..a79a7ed23e3d1 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap
@@ -2,24 +2,14 @@
 
 exports[`get_column_renderer renders correctly against snapshot 1`] = `
 <span>
-  <DraggableWrapper
-    dataProvider={
-      Object {
-        "and": Array [],
-        "enabled": true,
-        "excluded": false,
-        "id": "plain-column-renderer-data-provider-test-event_severity-1-message-3",
-        "kqlQuery": "",
-        "name": "event.severity: 3",
-        "queryMatch": Object {
-          "field": "message",
-          "operator": ":",
-          "value": "3",
-        },
-      }
-    }
-    key="plain-column-renderer-draggable-wrapper-test-event.severity-1-message-3"
-    render={[Function]}
+  <FormattedFieldValue
+    contextId="plain-column-renderer-formatted-field-value-test"
+    eventId="1"
+    fieldFormat=""
+    fieldName="event.severity"
+    fieldType=""
+    key="plain-column-renderer-formatted-field-value-test-event.severity-1-message-3"
+    value="3"
   />
 </span>
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap
index e2eaf1d872b26..563e356a689c8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap
@@ -2,24 +2,14 @@
 
 exports[`plain_column_renderer rendering renders correctly against snapshot 1`] = `
 <span>
-  <DraggableWrapper
-    dataProvider={
-      Object {
-        "and": Array [],
-        "enabled": true,
-        "excluded": false,
-        "id": "plain-column-renderer-data-provider-test-event_category-1-event_category-Access",
-        "kqlQuery": "",
-        "name": "event.category: Access",
-        "queryMatch": Object {
-          "field": "event.category",
-          "operator": ":",
-          "value": "Access",
-        },
-      }
-    }
-    key="plain-column-renderer-draggable-wrapper-test-event.category-1-event.category-Access"
-    render={[Function]}
+  <FormattedFieldValue
+    contextId="plain-column-renderer-formatted-field-value-test"
+    eventId="1"
+    fieldFormat=""
+    fieldName="event.category"
+    fieldType="keyword"
+    key="plain-column-renderer-formatted-field-value-test-event.category-1-event.category-Access"
+    value="Access"
   />
 </span>
 `;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx
index ad904554e33ad..53a2054412440 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { useMountAppended } from '../../../../utils/use_mount_appended';
 import { TestProviders } from '../../../../mock';
@@ -25,7 +24,7 @@ describe('Args', () => {
           processTitle="process-title-1"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns an empty string when both args and process title are undefined', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.tsx
index 8282931aa0579..22367ec879851 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/args.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 { DraggableBadge } from '../../../draggables';
 import { isNillEmptyOrNotFinite, TokensFlexItem } from './helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx
index 8d3a713369031..21cccc88f4fbc 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
@@ -30,7 +29,7 @@ describe('GenericDetails', () => {
           timelineId="test"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns auditd if the data does contain auditd data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.tsx
index b60d89c857421..c25c656b75e41 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
index af4971faae295..fce0e1d645e16 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
@@ -31,7 +30,7 @@ describe('GenericFileDetails', () => {
           timelineId="test"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns auditd if the data does contain auditd data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.tsx
index be84696033d69..797361878e6c5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiSpacer, IconType } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
index f2cce8b16b5d6..b78d9261849cb 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
@@ -46,7 +45,7 @@ describe('GenericRowRenderer', () => {
       });
 
       const wrapper = shallow(<span>{children}</span>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should return false if not a auditd datum', () => {
@@ -125,7 +124,7 @@ describe('GenericRowRenderer', () => {
       });
 
       const wrapper = shallow(<span>{children}</span>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should return false if not a auditd datum', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
index 71d56d641037d..bcf464ab6da15 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { IconType } from '@elastic/eui';
 import { get } from 'lodash/fp';
 import React from 'react';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx
index a5b861be08e56..598769e854b42 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { PrimarySecondaryUserInfo, nilOrUnSet } from './primary_secondary_user_info';
@@ -26,7 +25,7 @@ describe('UserPrimarySecondary', () => {
           secondary="secondary-1"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should render user name only if that is all that is present', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx
index bd350a599bb47..a54042d3de9d8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx
index 2240d83169e0d..a0a9977f5765e 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx
@@ -6,8 +6,7 @@
 
 import { EuiFlexItem } from '@elastic/eui';
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { SessionUserHostWorkingDir } from './session_user_host_working_dir';
@@ -32,7 +31,7 @@ describe('SessionUserHostWorkingDir', () => {
           />
         </EuiFlexItem>
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders with just eventId and contextId', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx
index 3c825e6c931be..6a6b55bb817c8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.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 { DraggableBadge } from '../../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
index 07207c822ad29..a7c9d10e82a2f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx
@@ -9,7 +9,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { mockBrowserFields } from '../../../../../../public/containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.tsx
index 752163901de2e..824e8c00de307 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Details } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx
index d6c50460194a7..e12eacd73559d 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx
@@ -9,7 +9,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx
index fd49395379e24..c7a08620bebbb 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../../draggables';
 import { isNillEmptyOrNotFinite, TokensFlexItem } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.test.tsx
index 04f7cd9b560a6..b31d01b8e94a0 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
 import React from 'react';
 
@@ -36,7 +35,7 @@ describe('empty_column_renderer', () => {
       timelineId: 'test',
     });
     const wrapper = shallow(<span>{emptyColumn}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should return isInstance true if source is empty', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx
index 67554cc764486..7e2346ced8785 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx
@@ -4,7 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+/* eslint-disable react/display-name */
+
+import React from 'react';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
 import { DraggableWrapper, DragEffects } from '../../../drag_and_drop/draggable_wrapper';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
index 77569f07a23c2..72b879d4ade78 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx
@@ -9,7 +9,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { mockBrowserFields } from '../../../../../../public/containers/source/mock';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
index 10f9c4ad9e545..35a88f52f05a3 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx
index 45a824e034b15..4e522f6ed5c94 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx
@@ -9,7 +9,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx
index 185e9c9a8287a..c2c42ba0e4ddc 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { DraggableBadge } from '../../../../draggables';
 import { isNillEmptyOrNotFinite, TokensFlexItem } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.test.tsx
index 21fbafb64d57f..4da236bfa34c3 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.test.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 { TestProviders } from '../../../../mock';
 import { useMountAppended } from '../../../../utils/use_mount_appended';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.tsx
index 9ea5f2cdd99fa..7671e3f0509a5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.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 { DraggableBadge } from '../../../draggables';
 
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 ff63d02acc37c..d800821f8d8a5 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
@@ -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 { TestProviders } from '../../../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.tsx
index a1c43f3ecb163..e4871c6479c6b 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/file_draggable.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 { DraggableBadge } from '../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.test.tsx
index 3f27abfd2176c..73f7b004ca3f7 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.test.tsx
@@ -4,12 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { get } from 'lodash/fp';
-import * as React from 'react';
-import { ThemeProvider } from 'styled-components';
+import React from 'react';
 
 import { mockTimelineData, TestProviders } from '../../../../mock';
 import { getEmptyValue } from '../../../empty_value';
@@ -18,34 +15,37 @@ import { useMountAppended } from '../../../../utils/use_mount_appended';
 import { FormattedFieldValue } from './formatted_field';
 import { HOST_NAME_FIELD_NAME } from './constants';
 
-jest.mock('../../../../lib/settings/use_kibana_ui_setting');
+jest.mock('../../../../lib/kibana');
 
 describe('Events', () => {
-  const theme = () => ({ eui: euiDarkVars, darkMode: true });
   const mount = useMountAppended();
 
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="timestamp"
-        fieldType="date"
-        value={get('timestamp', mockTimelineData[0].ecs)}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="timestamp"
+          fieldType="date"
+          value={get('timestamp', mockTimelineData[0].ecs)}
+        />
+      </TestProviders>
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper.find('FormattedFieldValue')).toMatchSnapshot();
   });
 
   test('it renders a localized date tooltip for a field type of date that has a valid timestamp', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="timestamp"
-        fieldType="date"
-        value={get('timestamp', mockTimelineData[0].ecs)}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="timestamp"
+          fieldType="date"
+          value={get('timestamp', mockTimelineData[0].ecs)}
+        />
+      </TestProviders>
     );
 
     expect(wrapper.find('[data-test-subj="localized-date-tool-tip"]').exists()).toEqual(true);
@@ -53,13 +53,15 @@ describe('Events', () => {
 
   test('it does NOT render a localized date tooltip when field type is NOT date, even if it contains valid timestamp', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="timestamp"
-        fieldType="text"
-        value={get('timestamp', mockTimelineData[0].ecs)}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="timestamp"
+          fieldType="text"
+          value={get('timestamp', mockTimelineData[0].ecs)}
+        />
+      </TestProviders>
     );
 
     expect(wrapper.find('[data-test-subj="localized-date-tool-tip"]').exists()).toEqual(false);
@@ -72,13 +74,15 @@ describe('Events', () => {
     };
 
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="timestamp"
-        fieldType="date"
-        value={get('timestamp', hasBadDate)}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="timestamp"
+          fieldType="date"
+          value={get('timestamp', hasBadDate)}
+        />
+      </TestProviders>
     );
 
     expect(wrapper.find('[data-test-subj="localized-date-tool-tip"]').exists()).toEqual(false);
@@ -86,13 +90,15 @@ describe('Events', () => {
 
   test('it renders the value for a non-date field when the field is populated', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="event.module"
-        fieldType="text"
-        value={get('event.module[0]', mockTimelineData[0].ecs)}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="event.module"
+          fieldType="text"
+          value={get('event.module[0]', mockTimelineData[0].ecs)}
+        />
+      </TestProviders>
     );
 
     expect(wrapper.text()).toEqual('nginx');
@@ -100,7 +106,7 @@ describe('Events', () => {
 
   test('it renders placeholder text for a non-date field when the field is NOT populated', () => {
     const wrapper = mount(
-      <ThemeProvider theme={theme}>
+      <TestProviders>
         <FormattedFieldValue
           eventId={mockTimelineData[0].ecs._id}
           contextId="test"
@@ -108,7 +114,7 @@ describe('Events', () => {
           fieldType="text"
           value={get('fake.field', mockTimelineData[0].ecs)}
         />
-      </ThemeProvider>
+      </TestProviders>
     );
 
     expect(wrapper.text()).toEqual(getEmptyValue());
@@ -116,14 +122,16 @@ describe('Events', () => {
 
   test('it renders tooltip for truncatable message when it exists', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        contextId="test"
-        eventId={mockTimelineData[0].ecs._id}
-        fieldName="message"
-        fieldType="text"
-        truncate
-        value={'some message'}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          contextId="test"
+          eventId={mockTimelineData[0].ecs._id}
+          fieldName="message"
+          fieldType="text"
+          truncate
+          value={'some message'}
+        />
+      </TestProviders>
     );
 
     expect(wrapper.find('[data-test-subj="message-tool-tip"]').exists()).toEqual(true);
@@ -179,53 +187,61 @@ describe('Events', () => {
 
   test('it renders a message text string', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="message"
-        fieldType="text"
-        value={'some message'}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="message"
+          fieldType="text"
+          value={'some message'}
+        />
+      </TestProviders>
     );
     expect(wrapper.text()).toEqual('some message');
   });
 
   test('it renders truncatable message text when fieldName is message with truncate prop', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        contextId="test"
-        eventId={mockTimelineData[0].ecs._id}
-        fieldName="message"
-        fieldType="text"
-        truncate
-        value={'some message'}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          contextId="test"
+          eventId={mockTimelineData[0].ecs._id}
+          fieldName="message"
+          fieldType="text"
+          truncate
+          value={'some message'}
+        />
+      </TestProviders>
     );
     expect(wrapper.find('[data-test-subj="truncatable-message"]').exists()).toEqual(true);
   });
 
   test('it does NOT render the truncatable message style when fieldName is NOT message', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName="NOT-message"
-        fieldType="text"
-        value={'a NON-message value'}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName="NOT-message"
+          fieldType="text"
+          value={'a NON-message value'}
+        />
+      </TestProviders>
     );
     expect(wrapper.find('[data-test-subj="truncatable-message"]').exists()).toEqual(false);
   });
 
   test('it renders a hyperlink to the hosts details page when fieldName is host.name, and a hostname is provided', () => {
     const wrapper = mount(
-      <FormattedFieldValue
-        eventId={mockTimelineData[0].ecs._id}
-        contextId="test"
-        fieldName={HOST_NAME_FIELD_NAME}
-        fieldType="text"
-        value={'some-hostname'}
-      />
+      <TestProviders>
+        <FormattedFieldValue
+          eventId={mockTimelineData[0].ecs._id}
+          contextId="test"
+          fieldName={HOST_NAME_FIELD_NAME}
+          fieldType="text"
+          value={'some-hostname'}
+        />
+      </TestProviders>
     );
     expect(wrapper.find('[data-test-subj="host-details-link"]').exists()).toEqual(true);
   });
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.tsx
index 7529c0623ef47..280de3683a11f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/formatted_field.tsx
@@ -5,9 +5,10 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
-import { isNumber, isString } from 'lodash/fp';
-import * as React from 'react';
+import { isNumber, isString, isEmpty } from 'lodash/fp';
+import React from 'react';
 
+import { DefaultDraggable } from '../../../draggables';
 import { Bytes, BYTES_FORMAT } from '../../../bytes';
 import { Duration, EVENT_DURATION_FIELD_NAME } from '../../../duration';
 import { getOrEmptyTagFromValue, getEmptyTagValue } from '../../../empty_value';
@@ -23,6 +24,9 @@ import {
   MESSAGE_FIELD_NAME,
 } from './constants';
 
+// simple black-list to prevent dragging and dropping fields such as message name
+const columnNamesNotDraggable = [MESSAGE_FIELD_NAME];
+
 export const FormattedFieldValue = React.memo<{
   contextId: string;
   eventId: string;
@@ -42,7 +46,16 @@ export const FormattedFieldValue = React.memo<{
       />
     );
   } else if (fieldType === DATE_FIELD_TYPE) {
-    return <FormattedDate fieldName={fieldName} value={value} />;
+    return (
+      <DefaultDraggable
+        field={fieldName}
+        id={`event-details-value-default-draggable-${contextId}-${eventId}-${fieldName}-${value}`}
+        tooltipContent={null}
+        value={`${value}`}
+      >
+        <FormattedDate fieldName={fieldName} value={value} />
+      </DefaultDraggable>
+    );
   } else if (PORT_NAMES.some(portName => fieldName === portName)) {
     return (
       <Port contextId={contextId} eventId={eventId} fieldName={fieldName} value={`${value}`} />
@@ -55,11 +68,16 @@ export const FormattedFieldValue = React.memo<{
     const hostname = `${value}`;
 
     return isString(value) && hostname.length > 0 ? (
-      <EuiToolTip content={value}>
+      <DefaultDraggable
+        field={fieldName}
+        id={`event-details-value-default-draggable-${contextId}-${eventId}-${fieldName}-${value}`}
+        tooltipContent={value}
+        value={value}
+      >
         <HostDetailsLink data-test-subj="host-details-link" hostName={hostname}>
-          {value}
+          <TruncatableText data-test-subj="draggable-truncatable-content">{value}</TruncatableText>
         </HostDetailsLink>
-      </EuiToolTip>
+      </DefaultDraggable>
     ) : (
       getEmptyTagValue()
     );
@@ -67,34 +85,46 @@ export const FormattedFieldValue = React.memo<{
     return (
       <Bytes contextId={contextId} eventId={eventId} fieldName={fieldName} value={`${value}`} />
     );
-  } else if (fieldName === MESSAGE_FIELD_NAME && value != null && value !== '') {
-    return (
-      <>
-        {truncate ? (
-          <TruncatableText data-test-subj="truncatable-message">
-            <EuiToolTip
-              data-test-subj="message-tool-tip"
-              content={
-                <EuiFlexGroup direction="column" gutterSize="none">
-                  <EuiFlexItem grow={false}>
-                    <span>{fieldName}</span>
-                  </EuiFlexItem>
-                  <EuiFlexItem grow={false}>
-                    <span>{value}</span>
-                  </EuiFlexItem>
-                </EuiFlexGroup>
-              }
-            >
-              <>{value}</>
-            </EuiToolTip>
-          </TruncatableText>
-        ) : (
+  } else if (columnNamesNotDraggable.includes(fieldName)) {
+    return truncate && !isEmpty(value) ? (
+      <TruncatableText data-test-subj="truncatable-message">
+        <EuiToolTip
+          data-test-subj="message-tool-tip"
+          content={
+            <EuiFlexGroup direction="column" gutterSize="none">
+              <EuiFlexItem grow={false}>
+                <span>{fieldName}</span>
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <span>{value}</span>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          }
+        >
           <>{value}</>
-        )}
-      </>
+        </EuiToolTip>
+      </TruncatableText>
+    ) : (
+      <>{value}</>
     );
   } else {
-    return getOrEmptyTagFromValue(value);
+    const contentValue = getOrEmptyTagFromValue(value);
+    const content = truncate ? <TruncatableText>{contentValue}</TruncatableText> : contentValue;
+
+    return (
+      <DefaultDraggable
+        field={fieldName}
+        id={`event-details-value-default-draggable-${contextId}-${eventId}-${fieldName}-${value}`}
+        value={`${value}`}
+        tooltipContent={
+          fieldType === DATE_FIELD_TYPE || fieldType === EVENT_DURATION_FIELD_NAME
+            ? null
+            : fieldName
+        }
+      >
+        {content}
+      </DefaultDraggable>
+    );
   }
 });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx
index d445ec2859e2c..25d5c71caf48a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
 import { mockTimelineData } from '../../../../mock';
@@ -41,7 +40,7 @@ describe('get_column_renderer', () => {
     });
 
     const wrapper = shallow(<span>{column}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should render event severity when dealing with data that is not suricata', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx
index bea525116021d..f367769b78f40 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../../../containers/source/mock';
 import { Ecs } from '../../../../graphql/types';
@@ -44,7 +43,7 @@ describe('get_column_renderer', () => {
     });
 
     const wrapper = shallow(<span>{row}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should render plain row data when it is a non suricata row', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.test.tsx
index 6c58b1ec6f35c..d84dfcc561882 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.test.tsx
@@ -5,7 +5,6 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { mockTimelineData, TestProviders } from '../../../../mock';
@@ -24,7 +23,7 @@ describe('HostWorkingDir', () => {
         workingDirectory="[working-directory-123]"
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders a hostname without a workingDirectory', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.tsx
index 0bdecfecd6c59..db49df30be473 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/host_working_dir.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 { DraggableBadge } from '../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow.tsx
index 0904c836c2f30..0990301b6e2b9 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow.tsx
@@ -5,7 +5,7 @@
  */
 
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { Ecs } from '../../../../graphql/types';
 import { asArrayIfExists } from '../../../../lib/helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
index 9f73d86dec402..68629a9a70058 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
@@ -25,8 +24,6 @@ export const justIdAndTimestamp: Ecs = {
   timestamp: '2018-11-12T19:03:25.936Z',
 };
 
-jest.mock('../../../../../lib/settings/use_kibana_ui_setting');
-
 describe('netflowRowRenderer', () => {
   const mount = useMountAppended();
 
@@ -40,7 +37,7 @@ describe('netflowRowRenderer', () => {
     });
 
     const wrapper = shallow(<span>{children}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('#isInstance', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx
index 3ae154a14aaf5..754d6ad99b7fe 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { get } from 'lodash/fp';
 import React from 'react';
 import styled from 'styled-components';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.test.tsx
index 80ae10a48415c..684def7386da0 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.test.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 { TestProviders } from '../../../../mock';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.tsx
index 7cb6c3704a238..1402743ef8a51 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.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 { DraggableBadge } from '../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
index 96865fd928216..8a22307767a40 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx
@@ -5,23 +5,17 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import moment from 'moment-timezone';
-import * as React from 'react';
+import React from 'react';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
-import { defaultHeaders, mockFrameworks, mockTimelineData, TestProviders } from '../../../../mock';
+import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../mock';
 import { getEmptyValue } from '../../../empty_value';
 import { useMountAppended } from '../../../../utils/use_mount_appended';
 
 import { plainColumnRenderer } from './plain_column_renderer';
 import { getValues, deleteItemIdx, findItem } from './helpers';
 
-jest.mock('../../../../lib/settings/use_kibana_ui_setting');
-
-const mockFramework = mockFrameworks.default_UTC;
-
 describe('plain_column_renderer', () => {
   const mount = useMountAppended();
 
@@ -41,7 +35,7 @@ describe('plain_column_renderer', () => {
         timelineId: 'test',
       });
       const wrapper = shallow(<span>{column}</span>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should return isInstance false if source is empty', () => {
@@ -134,11 +128,7 @@ describe('plain_column_renderer', () => {
           <span>{column}</span>
         </TestProviders>
       );
-      expect(wrapper.text()).toEqual(
-        moment
-          .tz(getValues('@timestamp', mockDatum)![0], mockFramework.dateFormatTz!)
-          .format(mockFramework.dateFormat)
-      );
+      expect(wrapper.text()).toEqual('Nov 5, 2018 @ 19:03:25.937');
     });
 
     test('should return an empty value if destination ip is empty', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.tsx
index 25a70502e3e45..70485c41f3b88 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.tsx
@@ -4,29 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { isNumber } from 'lodash/fp';
 import React from 'react';
 
 import { TimelineNonEcsData } from '../../../../graphql/types';
-import { DragEffects, DraggableWrapper } from '../../../drag_and_drop/draggable_wrapper';
-import { escapeDataProviderId } from '../../../drag_and_drop/helpers';
 import { getEmptyTagValue } from '../../../empty_value';
-import { FormattedIp } from '../../../formatted_ip';
-import { IS_OPERATOR, DataProvider } from '../../data_providers/data_provider';
-import { Provider } from '../../data_providers/provider';
 import { ColumnHeader } from '../column_headers/column_header';
 import { ColumnRenderer } from './column_renderer';
-import { IP_FIELD_TYPE, MESSAGE_FIELD_NAME } from './constants';
 import { FormattedFieldValue } from './formatted_field';
-import { parseQueryValue } from './parse_query_value';
 import { parseValue } from './parse_value';
 
 export const dataExistsAtColumn = (columnName: string, data: TimelineNonEcsData[]): boolean =>
   data.findIndex(item => item.field === columnName) !== -1;
 
-// simple black-list to prevent dragging and dropping fields such as message name
-const columnNamesNotDraggable = [MESSAGE_FIELD_NAME];
-
 export const plainColumnRenderer: ColumnRenderer = {
   isInstance: (columnName: string, data: TimelineNonEcsData[]) =>
     dataExistsAtColumn(columnName, data),
@@ -47,91 +36,17 @@ export const plainColumnRenderer: ColumnRenderer = {
     values: string[] | undefined | null;
   }) =>
     values != null
-      ? values.map(value => {
-          const itemDataProvider: DataProvider = {
-            enabled: true,
-            id: escapeDataProviderId(
-              `plain-column-renderer-data-provider-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`
-            ),
-            name: `${columnName}: ${parseQueryValue(value)}`,
-            queryMatch: {
-              field: field.id,
-              value: parseQueryValue(value),
-              operator: IS_OPERATOR,
-            },
-            excluded: false,
-            kqlQuery: '',
-            and: [],
-          };
-          if (field.type === IP_FIELD_TYPE) {
-            // since ip fields may contain multiple IP addresses, return a FormattedIp here to avoid a "draggable of draggables"
-            return (
-              <FormattedIp
-                contextId={`plain-column-renderer-formatted-ip-${timelineId}`}
-                eventId={eventId}
-                fieldName={field.id}
-                key={`plain-column-renderer-formatted-ip-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`}
-                value={!isNumber(value) ? value : String(value)}
-                truncate={truncate}
-              />
-            );
-          }
-
-          if (columnNamesNotDraggable.includes(columnName)) {
-            if (truncate) {
-              return (
-                <FormattedFieldValue
-                  contextId={`plain-column-renderer-truncatable-formatted-field-value-${timelineId}`}
-                  eventId={eventId}
-                  fieldFormat={field.format || ''}
-                  fieldName={columnName}
-                  fieldType={field.type || ''}
-                  key={`plain-column-renderer-truncatable-formatted-field-value-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`}
-                  truncate={truncate}
-                  value={parseValue(value)}
-                />
-              );
-            } else {
-              return (
-                <FormattedFieldValue
-                  contextId={`plain-column-renderer-text-formatted-field-value-${timelineId}`}
-                  data-test-subj="draggable-content"
-                  eventId={eventId}
-                  fieldFormat={field.format || ''}
-                  fieldName={columnName}
-                  fieldType={field.type || ''}
-                  key={`plain-column-renderer-text-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`}
-                  truncate={truncate}
-                  value={parseValue(value)}
-                />
-              );
-            }
-          }
-          // note: we use a raw DraggableWrapper here instead of a DefaultDraggable,
-          // because we pass a width to enable text truncation, and we will show empty values
-          return (
-            <DraggableWrapper
-              dataProvider={itemDataProvider}
-              key={`plain-column-renderer-draggable-wrapper-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`}
-              render={(dataProvider, _, snapshot) =>
-                snapshot.isDragging ? (
-                  <DragEffects>
-                    <Provider dataProvider={dataProvider} />
-                  </DragEffects>
-                ) : (
-                  <FormattedFieldValue
-                    contextId={`plain-column-renderer-formatted-field-value-${timelineId}`}
-                    eventId={eventId}
-                    fieldFormat={field.format || ''}
-                    fieldName={columnName}
-                    fieldType={field.type || ''}
-                    value={parseValue(value)}
-                  />
-                )
-              }
-              truncate={truncate}
-            />
-          );
-        })
+      ? values.map(value => (
+          <FormattedFieldValue
+            key={`plain-column-renderer-formatted-field-value-${timelineId}-${columnName}-${eventId}-${field.id}-${value}`}
+            contextId={`plain-column-renderer-formatted-field-value-${timelineId}`}
+            eventId={eventId}
+            fieldFormat={field.format || ''}
+            fieldName={columnName}
+            fieldType={field.type || ''}
+            value={parseValue(value)}
+            truncate={truncate}
+          />
+        ))
       : getEmptyTagValue(),
 };
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.test.tsx
index 355f3fb248238..50ea7ca05b921 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.test.tsx
@@ -6,7 +6,6 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash';
 import React from 'react';
 import { ThemeProvider } from 'styled-components';
@@ -30,7 +29,7 @@ describe('plain_row_renderer', () => {
       timelineId: 'test',
     });
     const wrapper = shallow(<span>{children}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should always return isInstance true', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.tsx
index 1eed05e6d2a7e..6725830c97d0a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import React from 'react';
 
 import { RowRenderer } from './row_renderer';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx
index ff1cb60db0d93..8cc7323ed358f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../mock';
 import { ProcessDraggable, ProcessDraggableWithNonExistentProcess } from './process_draggable';
@@ -28,7 +27,7 @@ describe('ProcessDraggable', () => {
           processPid={123}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns null if everything is null', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.tsx
index 29d6c0e7d59c2..35512c60629dd 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_draggable.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 { DraggableBadge } from '../../../draggables';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_hash.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_hash.tsx
index cb0b40bdd8fca..b6696d38dc1c5 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_hash.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/process_hash.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DraggableBadge } from '../../../draggables';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx
index 3f77726474c56..027aa0df8bcdd 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../../../../containers/source/mock';
 import { mockTimelineData } from '../../../../../mock';
@@ -26,7 +25,7 @@ describe('SuricataDetails', () => {
           timelineId="test"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns text if the data does contain suricata data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.tsx
index 35733e5e0b31b..17f5f236265ed 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../../../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_refs.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_refs.tsx
index 6fe6523180e58..dd773bb88ef68 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_refs.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_refs.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { ExternalLinkIcon } from '../../../../external_link_icon';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
index 66c9613c02995..170d17e8e279e 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../../../../containers/source/mock';
 import { Ecs } from '../../../../../graphql/types';
@@ -35,7 +34,7 @@ describe('suricata_row_renderer', () => {
     });
 
     const wrapper = shallow(<span>{children}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should return false if not a suricata datum', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
index 0bafe54b715fd..b227326551e01 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { get } from 'lodash/fp';
 import React from 'react';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx
index 4eefb4b0bc8b9..beae16af558ed 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { useMountAppended } from '../../../../../utils/use_mount_appended';
@@ -30,7 +29,7 @@ describe('SuricataSignature', () => {
           signature="ET SCAN ATTACK Hello"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx
index 632e8ff35950e..2b9adfe21b120 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiBadge, EuiBadgeProps, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { DragEffects, DraggableWrapper } from '../../../../drag_and_drop/draggable_wrapper';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx
index e42a91b7d7972..4e4e1a0b7bf6f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { AuthSsh } from './auth_ssh';
 
@@ -21,7 +20,7 @@ describe('AuthSsh', () => {
           sshMethod="[ssh-method]"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns null if sshSignature and sshMethod are both null', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.tsx
index 60eab8381e98d..0ff2eec35314d 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.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 { DraggableBadge } from '../../../../draggables';
 import { TokensFlexItem } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx
index 54f5b2f165287..19113d93f7cb0 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
@@ -30,7 +29,7 @@ describe('SystemGenericDetails', () => {
           timelineId="test"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns system rendering if the data does contain system data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx
index e3627d0ec918a..e1524c8e5aecb 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx
index d4260d9bd183a..cab7191c13aef 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
@@ -30,7 +29,7 @@ describe('SystemGenericFileDetails', () => {
           timelineId="test"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns system rendering if the data does contain system data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx
index 401c1c522ca60..c47d9603cbea2 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx
@@ -6,7 +6,7 @@
 
 import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
index 3727e82c1d2a0..5f809d595f1b0 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { BrowserFields } from '../../../../../containers/source';
 import { mockBrowserFields } from '../../../../../containers/source/mock';
@@ -49,8 +48,6 @@ import {
 } from './generic_row_renderer';
 import * as i18n from './translations';
 
-jest.mock('../../../../../lib/settings/use_kibana_ui_setting');
-
 describe('GenericRowRenderer', () => {
   const mount = useMountAppended();
 
@@ -77,7 +74,7 @@ describe('GenericRowRenderer', () => {
       });
 
       const wrapper = shallow(<span>{children}</span>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should return false if not a system datum', () => {
@@ -141,7 +138,7 @@ describe('GenericRowRenderer', () => {
       });
 
       const wrapper = shallow(<span>{children}</span>);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('should return false if not a auditd datum', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.tsx
index f8930fdca7ba2..3e64248d39876 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { get } from 'lodash/fp';
 import React from 'react';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx
index 167abe2185bcc..100c8fbe5a988 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../../mock';
 import { useMountAppended } from '../../../../../utils/use_mount_appended';
@@ -26,7 +25,7 @@ describe('Package', () => {
           packageVersion="package-version-123"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns null if all of the package information is null ', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.tsx
index d87639d2b8d6e..a28e850e2af96 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/system/package.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 { DraggableBadge } from '../../../../draggables';
 import { TokensFlexItem } from '../helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.test.tsx
index 41a71f55cae19..73d1d5cb441ef 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.test.tsx
@@ -6,7 +6,6 @@
 
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash';
 import React from 'react';
 import { ThemeProvider } from 'styled-components';
@@ -34,7 +33,7 @@ describe('unknown_column_renderer', () => {
       timelineId: 'test',
     });
     const wrapper = shallow(<span>{emptyColumn}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should return isInstance true with a made up column name', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx
index 662392078f38a..45b670acb569a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../../mock';
 import { UserHostWorkingDir } from './user_host_working_dir';
@@ -27,7 +26,7 @@ describe('UserHostWorkingDir', () => {
           workingDirectory="[working-directory-123]"
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it returns null if userDomain, userName, hostName, and workingDirectory are all null', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.tsx
index 281cfd39bd9d2..d370afee2585f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.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 { DraggableBadge } from '../../../draggables';
 import { TokensFlexItem } from './helpers';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx
index 73b90410bc803..7617a01acf1d9 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx
@@ -4,8 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../../../../containers/source/mock';
 import { mockTimelineData, TestProviders } from '../../../../../mock';
@@ -26,7 +25,7 @@ describe('ZeekDetails', () => {
           />
         </TestProviders>
       );
-      expect(toJson(wrapper.find('ZeekDetails'))).toMatchSnapshot();
+      expect(wrapper.find('ZeekDetails')).toMatchSnapshot();
     });
 
     test('it returns zeek.connection if the data does contain zeek.connection data', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.tsx
index 1a31e560d7810..d8561186b4546 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiSpacer } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../../../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
index b4fd9a978b7d8..4242308a55a64 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { mockBrowserFields } from '../../../../../containers/source/mock';
 import { Ecs } from '../../../../../graphql/types';
@@ -34,7 +33,7 @@ describe('zeek_row_renderer', () => {
     });
 
     const wrapper = shallow(<span>{children}</span>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('should return false if not a zeek datum', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
index 83d1c4347f57c..fc528e33b5ab6 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable react/display-name */
+
 import { get } from 'lodash/fp';
 import React from 'react';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx
index 4ef2bb89e05ca..c09bd6b7a356d 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { Ecs } from '../../../../../graphql/types';
 import { mockTimelineData, TestProviders } from '../../../../../mock';
@@ -37,7 +36,7 @@ describe('ZeekSignature', () => {
   describe('rendering', () => {
     test('it renders the default Zeek', () => {
       const wrapper = shallow(<ZeekSignature data={zeek} timelineId="test" />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
   });
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx
index 6a6ae4e4e7da5..72f58df5677e4 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx
@@ -6,7 +6,7 @@
 
 import { EuiBadge, EuiBadgeProps, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { get } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { Ecs } from '../../../../../graphql/types';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx
index cda1fe0844e00..db3e96a4e2650 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { Direction } from '../../../../graphql/types';
 
@@ -16,7 +15,7 @@ describe('SortIndicator', () => {
   describe('rendering', () => {
     test('renders correctly against snapshot', () => {
       const wrapper = shallow(<SortIndicator sortDirection={Direction.desc} />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the sort indicator', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.tsx
index fc77bbd725704..74fb1e5e4034c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/body/sort/sort_indicator.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiIcon } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { Direction } from '../../../../graphql/types';
 
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 cd5a677dbb393..8fe6759acf52d 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,12 +6,12 @@
 
 import { noop } from 'lodash/fp';
 import memoizeOne from 'memoize-one';
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { ActionCreator } from 'typescript-fsa';
 
 import { BrowserFields } from '../../../containers/source';
-import { TimelineItem } from '../../../graphql/types';
+import { TimelineItem, TimelineNonEcsData } from '../../../graphql/types';
 import { Note } from '../../../lib/note';
 import { appModel, appSelectors, State, timelineSelectors } from '../../../store';
 import { AddNoteToEvent, UpdateNote } from '../../notes/helpers';
@@ -20,12 +20,14 @@ import {
   OnColumnResized,
   OnColumnSorted,
   OnPinEvent,
+  OnRowSelected,
+  OnSelectAll,
   OnUnPinEvent,
   OnUpdateColumns,
 } from '../events';
 
 import { ColumnHeader } from './column_headers/column_header';
-import { getColumnHeaders } from './helpers';
+import { getColumnHeaders, getEventIdToDataMapping } from './helpers';
 import { Body } from './index';
 import { columnRenderers, rowRenderers } from './renderers';
 import { Sort } from './sort';
@@ -47,9 +49,14 @@ interface OwnProps {
 interface ReduxProps {
   columnHeaders: ColumnHeader[];
   eventIdToNoteIds: Readonly<Record<string, string[]>>;
+  isSelectAllChecked: boolean;
+  loadingEventIds: Readonly<string[]>;
   notesById: appModel.NotesById;
   pinnedEventIds: Readonly<Record<string, boolean>>;
   range?: string;
+  selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
+  showCheckboxes: boolean;
+  showRowRenderers: boolean;
 }
 
 interface DispatchProps {
@@ -59,6 +66,9 @@ interface DispatchProps {
     columnId: string;
     delta: number;
   }>;
+  clearSelected?: ActionCreator<{
+    id: string;
+  }>;
   pinEvent?: ActionCreator<{
     id: string;
     eventId: string;
@@ -67,6 +77,12 @@ interface DispatchProps {
     id: string;
     columnId: string;
   }>;
+  setSelected?: ActionCreator<{
+    id: string;
+    eventIds: Record<string, TimelineNonEcsData[]>;
+    isSelected: boolean;
+    isSelectAllChecked: boolean;
+  }>;
   unPinEvent?: ActionCreator<{
     id: string;
     eventId: string;
@@ -97,11 +113,18 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
     height,
     id,
     isEventViewer = false,
+    isSelectAllChecked,
+    loadingEventIds,
     notesById,
     pinEvent,
     pinnedEventIds,
     range,
     removeColumn,
+    selectedEventIds,
+    setSelected,
+    clearSelected,
+    showCheckboxes,
+    showRowRenderers,
     sort,
     toggleColumn,
     unPinEvent,
@@ -122,6 +145,36 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
       [id]
     );
 
+    const onRowSelected: OnRowSelected = useCallback(
+      ({ eventIds, isSelected }: { eventIds: string[]; isSelected: boolean }) => {
+        setSelected!({
+          id,
+          eventIds: getEventIdToDataMapping(data, eventIds, timelineTypeContext.queryFields ?? []),
+          isSelected,
+          isSelectAllChecked:
+            isSelected && Object.keys(selectedEventIds).length + 1 === data.length,
+        });
+      },
+      [id, data, selectedEventIds, timelineTypeContext.queryFields]
+    );
+
+    const onSelectAll: OnSelectAll = useCallback(
+      ({ isSelected }: { isSelected: boolean }) =>
+        isSelected
+          ? setSelected!({
+              id,
+              eventIds: getEventIdToDataMapping(
+                data,
+                data.map(event => event._id),
+                timelineTypeContext.queryFields ?? []
+              ),
+              isSelected,
+              isSelectAllChecked: isSelected,
+            })
+          : clearSelected!({ id }),
+      [id, data, timelineTypeContext.queryFields]
+    );
+
     const onColumnSorted: OnColumnSorted = useCallback(
       sorted => {
         updateSort!({ id, sort: sorted });
@@ -150,6 +203,13 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
       [id]
     );
 
+    // Sync to timelineTypeContext.selectAll so parent components can select all events
+    useEffect(() => {
+      if (timelineTypeContext.selectAll) {
+        onSelectAll({ isSelected: true });
+      }
+    }, [timelineTypeContext.selectAll]); // onSelectAll dependency not necessary
+
     return (
       <Body
         addNoteToEvent={onAddNoteToEvent}
@@ -162,16 +222,22 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
         height={height}
         id={id}
         isEventViewer={isEventViewer}
+        isSelectAllChecked={isSelectAllChecked}
+        loadingEventIds={loadingEventIds}
         onColumnRemoved={onColumnRemoved}
         onColumnResized={onColumnResized}
         onColumnSorted={onColumnSorted}
+        onRowSelected={onRowSelected}
+        onSelectAll={onSelectAll}
         onFilterChange={noop} // TODO: this is the callback for column filters, which is out scope for this phase of delivery
         onPinEvent={onPinEvent}
         onUnPinEvent={onUnPinEvent}
         onUpdateColumns={onUpdateColumns}
         pinnedEventIds={pinnedEventIds}
         range={range!}
-        rowRenderers={timelineTypeContext.showRowRenderers ? rowRenderers : [plainRowRenderer]}
+        rowRenderers={showRowRenderers ? rowRenderers : [plainRowRenderer]}
+        selectedEventIds={selectedEventIds}
+        showCheckboxes={showCheckboxes}
         sort={sort}
         toggleColumn={toggleColumn}
         updateNote={onUpdateNote}
@@ -188,7 +254,12 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
       prevProps.height === nextProps.height &&
       prevProps.id === nextProps.id &&
       prevProps.isEventViewer === nextProps.isEventViewer &&
+      prevProps.isSelectAllChecked === nextProps.isSelectAllChecked &&
+      prevProps.loadingEventIds === nextProps.loadingEventIds &&
       prevProps.pinnedEventIds === nextProps.pinnedEventIds &&
+      prevProps.selectedEventIds === nextProps.selectedEventIds &&
+      prevProps.showCheckboxes === nextProps.showCheckboxes &&
+      prevProps.showRowRenderers === nextProps.showRowRenderers &&
       prevProps.range === nextProps.range &&
       prevProps.sort === nextProps.sort
     );
@@ -207,14 +278,28 @@ const makeMapStateToProps = () => {
   const getNotesByIds = appSelectors.notesByIdsSelector();
   const mapStateToProps = (state: State, { browserFields, id }: OwnProps) => {
     const timeline: TimelineModel = getTimeline(state, id) ?? timelineDefaults;
-    const { columns, eventIdToNoteIds, pinnedEventIds } = timeline;
+    const {
+      columns,
+      eventIdToNoteIds,
+      isSelectAllChecked,
+      loadingEventIds,
+      pinnedEventIds,
+      selectedEventIds,
+      showCheckboxes,
+      showRowRenderers,
+    } = timeline;
 
     return {
       columnHeaders: memoizedColumnHeaders(columns, browserFields),
       eventIdToNoteIds,
+      isSelectAllChecked,
+      loadingEventIds,
       notesById: getNotesByIds(state),
       id,
       pinnedEventIds,
+      selectedEventIds,
+      showCheckboxes,
+      showRowRenderers,
     };
   };
   return mapStateToProps;
@@ -223,9 +308,11 @@ const makeMapStateToProps = () => {
 export const StatefulBody = connect(makeMapStateToProps, {
   addNoteToEvent: timelineActions.addNoteToEvent,
   applyDeltaToColumnWidth: timelineActions.applyDeltaToColumnWidth,
+  clearSelected: timelineActions.clearSelected,
   pinEvent: timelineActions.pinEvent,
   removeColumn: timelineActions.removeColumn,
   removeProvider: timelineActions.removeProvider,
+  setSelected: timelineActions.setSelected,
   unPinEvent: timelineActions.unPinEvent,
   updateColumns: timelineActions.updateColumns,
   updateNote: appActions.updateNote,
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx
index d67c6c9648a15..a88062d9093d7 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
 import { useMountAppended } from '../../../utils/use_mount_appended';
@@ -36,7 +35,7 @@ describe('DataProviders', () => {
           show={true}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it should render a placeholder when there are zero data providers', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx
index c249e263d1205..10586657b52a3 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { Empty } from './empty';
 import { TestProviders } from '../../../mock/test_providers';
@@ -15,7 +14,7 @@ describe('Empty', () => {
   describe('rendering', () => {
     test('renders correctly against snapshot', () => {
       const wrapper = shallow(<Empty />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     const dropMessage = ['Drop', 'anything', 'highlighted', 'here'];
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.tsx
index 87d45f6d3db17..a47fb932ed26c 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/empty.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiBadge, EuiBadgeProps, EuiText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { AndOrBadge } from '../../and_or_badge';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx
index cce6dfc140375..525cc8e301d11 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { rgba } from 'polished';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx
index aa3f07cb1b17a..f0d7ca83fb391 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
 
@@ -17,7 +16,7 @@ describe('Provider', () => {
   describe('rendering', () => {
     test('renders correctly against snapshot', () => {
       const wrapper = shallow(<Provider dataProvider={mockDataProviders[0]} />);
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the data provider', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and.tsx
index 05dc7b7b84587..badc92d00c174 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexItem } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 
 import { AndOrBadge } from '../../and_or_badge';
 import { BrowserFields } from '../../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and_drag_drop.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and_drag_drop.tsx
index 17457b900f3a9..1a1e8292b7e02 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and_drag_drop.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/provider_item_and_drag_drop.tsx
@@ -6,7 +6,7 @@
 
 import { EuiBadge, EuiBadgeProps, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import { rgba } from 'polished';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { AndOrBadge } from '../../and_or_badge';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx
index c9454846c5548..d8076ac90e6b2 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
 import { DroppableWrapper } from '../../drag_and_drop/droppable_wrapper';
@@ -36,7 +35,7 @@ describe('Providers', () => {
           onToggleDataProviderExcluded={jest.fn()}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the data providers', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.tsx
index 4d095485ef69d..bfe99f6920e66 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/data_providers/providers.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiFormHelpText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import { Draggable } from 'react-beautiful-dnd';
 import styled from 'styled-components';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/events.ts b/x-pack/legacy/plugins/siem/public/components/timeline/events.ts
index 253be41a009c8..b54ed52bb9f18 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/events.ts
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/events.ts
@@ -72,6 +72,18 @@ export type OnChangeDroppableAndProvider = (providerId: string) => void;
 /** Invoked when a user pins an event */
 export type OnPinEvent = (eventId: string) => void;
 
+/** Invoked when a user checks/un-checks a row */
+export type OnRowSelected = ({
+  eventIds,
+  isSelected,
+}: {
+  eventIds: string[];
+  isSelected: boolean;
+}) => void;
+
+/** Invoked when a user checks/un-checks the select all checkbox  */
+export type OnSelectAll = ({ isSelected }: { isSelected: boolean }) => void;
+
 /** Invoked when columns are updated */
 export type OnUpdateColumns = (columns: ColumnHeader[]) => void;
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/expandable_event/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/expandable_event/index.tsx
index 8f5d91d8ce11f..1c5df9d220a62 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/expandable_event/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/expandable_event/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 styled from 'styled-components';
 
 import { BrowserFields } from '../../../containers/source';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx
index 07b7741e5c152..b6ca4fe125c69 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/footer/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { getOr } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 
 import { TestProviders } from '../../../mock/test_providers';
 
@@ -41,7 +40,7 @@ describe('Footer Timeline Component', () => {
         />
       );
 
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the loading panel at the beginning ', () => {
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 978386e611808..1fcc4382c1798 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
@@ -211,6 +211,7 @@ export const FooterComponent = ({
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
   const [paginationLoading, setPaginationLoading] = useState(false);
   const [updatedAt, setUpdatedAt] = useState<number | null>(null);
+  const timelineTypeContext = useTimelineTypeContext();
 
   const loadMore = useCallback(() => {
     setPaginationLoading(true);
@@ -239,7 +240,7 @@ export const FooterComponent = ({
           data-test-subj="LoadingPanelTimeline"
           height="35px"
           showBorder={false}
-          text={isEventViewer ? `${i18n.LOADING_EVENTS}...` : `${i18n.LOADING_TIMELINE_DATA}...`}
+          text={`${timelineTypeContext.loadingText ?? i18n.LOADING_TIMELINE_DATA}...`}
           width="100%"
         />
       </LoadingPanelContainer>
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/footer/translations.ts b/x-pack/legacy/plugins/siem/public/components/timeline/footer/translations.ts
index e7f5ba4026ac7..886866ce1b0c2 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/footer/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/footer/translations.ts
@@ -6,10 +6,6 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const LOADING_EVENTS = i18n.translate('xpack.siem.footer.loadingEventsData', {
-  defaultMessage: 'Loading Events',
-});
-
 export const LOADING_TIMELINE_DATA = i18n.translate('xpack.siem.footer.loadingTimelineData', {
   defaultMessage: 'Loading Timeline data',
 });
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx
index 977764803acbb..5af7aff4f8795 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/header/index.test.tsx
@@ -5,25 +5,17 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { Direction } from '../../../graphql/types';
-import { useKibanaCore } from '../../../lib/compose/kibana_core';
 import { mockIndexPattern } from '../../../mock';
 import { TestProviders } from '../../../mock/test_providers';
-import { mockUiSettings } from '../../../mock/ui_settings';
 import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
 import { useMountAppended } from '../../../utils/use_mount_appended';
 
 import { TimelineHeaderComponent } from '.';
 
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-  savedObjects: {},
-}));
+jest.mock('../../../lib/kibana');
 
 describe('Header', () => {
   const indexPattern = mockIndexPattern;
@@ -51,7 +43,7 @@ describe('Header', () => {
           }}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the data providers', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/header/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/header/index.tsx
index 814d25d9c718d..7e570d613ca5a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/header/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/header/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiCallOut } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 import { IIndexPattern } from 'src/plugins/data/public';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
index 0e222f470f0d7..ae139c24d0176 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
@@ -18,7 +18,7 @@ import {
   EuiOverlayMask,
   EuiToolTip,
 } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import uuid from 'uuid';
 
 import { Note } from '../../../lib/note';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.test.tsx
index eb82241b04124..495b94f8c02e7 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.test.tsx
@@ -5,25 +5,15 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 import { Provider as ReduxStoreProvider } from 'react-redux';
 
-import { useKibanaCore } from '../../../lib/compose/kibana_core';
 import { mockGlobalState, apolloClientObservable } from '../../../mock';
-import { mockUiSettings } from '../../../mock/ui_settings';
 import { createStore, State } from '../../../store';
 
 import { Properties, showDescriptionThreshold, showNotesThreshold } from '.';
 
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-}));
-
-jest.mock('ui/vis/lib/timezone', () => ({
-  timezoneProvider: () => () => 'America/New_York',
-}));
+jest.mock('../../../lib/kibana');
 
 describe('Properties', () => {
   const usersViewing = ['elastic'];
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.test.tsx
index b78691fabdcbf..b978ef3d478d8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.test.tsx
@@ -9,22 +9,15 @@ import React from 'react';
 
 import { DEFAULT_FROM, DEFAULT_TO } from '../../../../common/constants';
 import { mockBrowserFields } from '../../../containers/source/mock';
-import { useKibanaCore } from '../../../lib/compose/kibana_core';
 import { convertKueryToElasticSearchQuery } from '../../../lib/keury';
 import { mockIndexPattern, TestProviders } from '../../../mock';
-import { mockUiSettings } from '../../../mock/ui_settings';
 import { QueryBar } from '../../query_bar';
 import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
 import { buildGlobalQuery } from '../helpers';
 
 import { QueryBarTimeline, QueryBarTimelineComponentProps, getDataProviderFilter } from './index';
 
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-  savedObjects: {},
-}));
+jest.mock('../../../lib/kibana');
 
 describe('Timeline QueryBar ', () => {
   // We are doing that because we need to wrapped this component with redux
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.tsx
index c55ead5e2d5d5..c3b46c6cd0f72 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.tsx
@@ -19,7 +19,7 @@ import {
 
 import { BrowserFields } from '../../../containers/source';
 import { convertKueryToElasticSearchQuery } from '../../../lib/keury';
-import { useKibanaCore } from '../../../lib/compose/kibana_core';
+import { useKibana } from '../../../lib/kibana';
 import { KueryFilterQuery, KueryFilterQueryKind } from '../../../store';
 import { KqlMode } from '../../../store/timeline/model';
 import { useSavedQueryServices } from '../../../utils/saved_query_services';
@@ -92,8 +92,8 @@ export const QueryBarTimeline = memo<QueryBarTimelineComponentProps>(
     const [dataProvidersDsl, setDataProvidersDsl] = useState<string>(
       convertKueryToElasticSearchQuery(buildGlobalQuery(dataProviders, browserFields), indexPattern)
     );
-    const core = useKibanaCore();
-    const [filterManager] = useState<FilterManager>(new FilterManager(core.uiSettings));
+    const kibana = useKibana();
+    const [filterManager] = useState<FilterManager>(new FilterManager(kibana.services.uiSettings));
 
     const savedQueryServices = useSavedQueryServices();
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/refetch_timeline.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/refetch_timeline.tsx
index 8a78d04c88311..c804ccf658296 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/refetch_timeline.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/refetch_timeline.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { memo, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { ActionCreator } from 'typescript-fsa';
@@ -33,18 +33,23 @@ export interface TimelineRefetchProps {
 
 type OwnProps = TimelineRefetchProps & TimelineRefetchDispatch;
 
-const TimelineRefetchComponent = memo<OwnProps>(
-  ({ id, inputId, inspect, loading, refetch, setTimelineQuery }) => {
-    useEffect(() => {
-      setTimelineQuery({ id, inputId, inspect, loading, refetch });
-    }, [id, inputId, loading, refetch, inspect]);
-
-    return null;
-  }
-);
+const TimelineRefetchComponent: React.FC<OwnProps> = ({
+  id,
+  inputId,
+  inspect,
+  loading,
+  refetch,
+  setTimelineQuery,
+}) => {
+  useEffect(() => {
+    setTimelineQuery({ id, inputId, inspect, loading, refetch });
+  }, [id, inputId, loading, refetch, inspect]);
+
+  return null;
+};
 
 export const TimelineRefetch = compose<React.ComponentClass<TimelineRefetchProps>>(
   connect(null, {
     setTimelineQuery: inputsActions.setQuery,
   })
-)(TimelineRefetchComponent);
+)(React.memo(TimelineRefetchComponent));
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/helpers.tsx
index c9b1a3ced6e93..5db453988cbb8 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/helpers.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiSpacer, EuiText } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { AndOrBadge } from '../../and_or_badge';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx
index b645202ab4c54..45eb7f85c809f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiSuperSelect, EuiToolTip } from '@elastic/eui';
-import * as React from 'react';
+import React from 'react';
 import styled, { createGlobalStyle } from 'styled-components';
 
 import { esFilters, IIndexPattern } from '../../../../../../../../src/plugins/data/public';
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx
index 1c1c8fac75cdc..f0f41fc1f674f 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/styles.tsx
@@ -30,7 +30,7 @@ export const TimelineBodyGlobalStyle = createGlobalStyle`
 export const TimelineBody = styled.div.attrs(({ className }) => ({
   className: `siemTimeline__body ${className}`,
 }))<{ bodyHeight: number }>`
-  height: ${({ bodyHeight }) => bodyHeight + 'px'};
+  height: ${({ bodyHeight }) => `${bodyHeight}px`};
   overflow: auto;
   scrollbar-width: thin;
 
@@ -87,10 +87,10 @@ EventsTrHeader.displayName = 'EventsTrHeader';
 
 export const EventsThGroupActions = styled.div.attrs(({ className }) => ({
   className: `siemEventsTable__thGroupActions ${className}`,
-}))<{ actionsColumnWidth: number }>`
+}))<{ actionsColumnWidth: number; justifyContent: string }>`
   display: flex;
-  flex: 0 0 ${({ actionsColumnWidth }) => actionsColumnWidth + 'px'};
-  justify-content: space-between;
+  flex: 0 0 ${({ actionsColumnWidth }) => `${actionsColumnWidth}px`};
+  justify-content: ${({ justifyContent }) => justifyContent};
   min-width: 0;
 `;
 EventsThGroupActions.displayName = 'EventsThGroupActions';
@@ -118,7 +118,7 @@ export const EventsTh = styled.div.attrs(({ className }) => ({
 
   .siemEventsTable__thGroupData &:hover {
     background-color: ${({ theme }) => theme.eui.euiTableHoverColor};
-    cursor: move; //Fallback for IE11
+    cursor: move; /* Fallback for IE11 */
     cursor: grab;
   }
 `;
@@ -129,11 +129,11 @@ export const EventsThContent = styled.div.attrs(({ className }) => ({
 }))<{ textAlign?: string }>`
   font-size: ${({ theme }) => theme.eui.euiFontSizeXS};
   font-weight: ${({ theme }) => theme.eui.euiFontWeightSemiBold};
-  line-height: $({ theme }) =>theme.eui.euiLineHeight};
+  line-height: ${({ theme }) => theme.eui.euiLineHeight};
   min-width: 0;
   padding: ${({ theme }) => theme.eui.paddingSizes.xs};
   text-align: ${({ textAlign }) => textAlign};
-  width: 100%; //Using width: 100% instead of flex: 1 and max-width: 100% for IE11
+  width: 100%; /* Using width: 100% instead of flex: 1 and max-width: 100% for IE11 */
 `;
 EventsThContent.displayName = 'EventsThContent';
 
@@ -182,7 +182,7 @@ export const EventsTdGroupActions = styled.div.attrs(({ className }) => ({
 }))<{ actionsColumnWidth: number }>`
   display: flex;
   justify-content: space-between;
-  flex: 0 0 ${({ actionsColumnWidth }) => actionsColumnWidth + 'px'};
+  flex: 0 0 ${({ actionsColumnWidth }) => `${actionsColumnWidth}px`};
   min-width: 0;
 `;
 EventsTdGroupActions.displayName = 'EventsTdGroupActions';
@@ -217,7 +217,7 @@ export const EventsTdContent = styled.div.attrs(({ className }) => ({
   min-width: 0;
   padding: ${({ theme }) => theme.eui.paddingSizes.xs};
   text-align: ${({ textAlign }) => textAlign};
-  width: 100%; //Using width: 100% instead of flex: 1 and max-width: 100% for IE11
+  width: 100%; /* Using width: 100% instead of flex: 1 and max-width: 100% for IE11 */
 `;
 EventsTdContent.displayName = 'EventsTdContent';
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
index 180af88f21e4d..2971053bc5252 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
@@ -5,17 +5,14 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import { timelineQuery } from '../../containers/timeline/index.gql_query';
 import { mockBrowserFields } from '../../containers/source/mock';
 import { Direction } from '../../graphql/types';
-import { useKibanaCore } from '../../lib/compose/kibana_core';
 import { defaultHeaders, mockTimelineData, mockIndexPattern } from '../../mock';
 import { TestProviders } from '../../mock/test_providers';
-import { mockUiSettings } from '../../mock/ui_settings';
 import { flyoutHeaderHeight } from '../flyout';
 
 import {
@@ -30,12 +27,7 @@ import { useMountAppended } from '../../utils/use_mount_appended';
 
 const testFlyoutHeight = 980;
 
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-  savedObjects: {},
-}));
+jest.mock('../../lib/kibana');
 
 describe('Timeline', () => {
   const sort: Sort = {
@@ -85,7 +77,7 @@ describe('Timeline', () => {
           toggleColumn={jest.fn()}
         />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders the timeline header', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx
index ec7d10d2373d4..e15c58d32425a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.tsx
@@ -6,13 +6,13 @@
 
 import { EuiFlexGroup } from '@elastic/eui';
 import { getOr, isEmpty } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import styled from 'styled-components';
 
 import { BrowserFields } from '../../containers/source';
 import { TimelineQuery } from '../../containers/timeline';
 import { Direction } from '../../graphql/types';
-import { useKibanaCore } from '../../lib/compose/kibana_core';
+import { useKibana } from '../../lib/kibana';
 import { KqlMode } from '../../store/timeline/model';
 import { AutoSizer } from '../auto_sizer';
 import { ColumnHeader } from './body/column_headers/column_header';
@@ -113,9 +113,9 @@ export const TimelineComponent = ({
   sort,
   toggleColumn,
 }: Props) => {
-  const core = useKibanaCore();
+  const kibana = useKibana();
   const combinedQueries = combineQueries({
-    config: esQuery.getEsQueryConfig(core.uiSettings),
+    config: esQuery.getEsQueryConfig(kibana.services.uiSettings),
     dataProviders,
     indexPattern,
     browserFields,
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/timeline_context.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/timeline_context.tsx
index 584fe03d2149b..611452cc7ccd1 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/timeline_context.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/timeline_context.tsx
@@ -5,6 +5,7 @@
  */
 
 import React, { createContext, memo, useContext, useEffect, useState } from 'react';
+import { TimelineAction } from './body/actions';
 
 const initTimelineContext = false;
 export const TimelineContext = createContext<boolean>(initTimelineContext);
@@ -17,15 +18,19 @@ export const useTimelineWidthContext = () => useContext(TimelineWidthContext);
 export interface TimelineTypeContextProps {
   documentType?: string;
   footerText?: string;
-  showCheckboxes: boolean;
-  showRowRenderers: boolean;
+  loadingText?: string;
+  queryFields?: string[];
+  selectAll?: boolean;
+  timelineActions?: TimelineAction[];
   title?: string;
 }
 const initTimelineType: TimelineTypeContextProps = {
   documentType: undefined,
   footerText: undefined,
-  showCheckboxes: false,
-  showRowRenderers: true,
+  loadingText: undefined,
+  queryFields: [],
+  selectAll: false,
+  timelineActions: [],
   title: undefined,
 };
 export const TimelineTypeContext = createContext<TimelineTypeContextProps>(initTimelineType);
@@ -40,30 +45,35 @@ interface ManageTimelineContextProps {
 
 // todo we need to refactor this as more complex context/reducer with useReducer
 // to avoid so many Context, at least the separation of code is there now
-export const ManageTimelineContext = memo<ManageTimelineContextProps>(
-  ({ children, loading, width, type = initTimelineType }) => {
-    const [myLoading, setLoading] = useState(initTimelineContext);
-    const [myWidth, setWidth] = useState(initTimelineWidth);
-    const [myType, setType] = useState(initTimelineType);
+const ManageTimelineContextComponent: React.FC<ManageTimelineContextProps> = ({
+  children,
+  loading,
+  width,
+  type = initTimelineType,
+}) => {
+  const [myLoading, setLoading] = useState(initTimelineContext);
+  const [myWidth, setWidth] = useState(initTimelineWidth);
+  const [myType, setType] = useState(initTimelineType);
 
-    useEffect(() => {
-      setLoading(loading);
-    }, [loading]);
+  useEffect(() => {
+    setLoading(loading);
+  }, [loading]);
 
-    useEffect(() => {
-      setType(type);
-    }, [type]);
+  useEffect(() => {
+    setType(type);
+  }, [type]);
 
-    useEffect(() => {
-      setWidth(width);
-    }, [width]);
+  useEffect(() => {
+    setWidth(width);
+  }, [width]);
 
-    return (
-      <TimelineContext.Provider value={myLoading}>
-        <TimelineWidthContext.Provider value={myWidth}>
-          <TimelineTypeContext.Provider value={myType}>{children}</TimelineTypeContext.Provider>
-        </TimelineWidthContext.Provider>
-      </TimelineContext.Provider>
-    );
-  }
-);
+  return (
+    <TimelineContext.Provider value={myLoading}>
+      <TimelineWidthContext.Provider value={myWidth}>
+        <TimelineTypeContext.Provider value={myType}>{children}</TimelineTypeContext.Provider>
+      </TimelineWidthContext.Provider>
+    </TimelineContext.Provider>
+  );
+};
+
+export const ManageTimelineContext = memo(ManageTimelineContextComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx b/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx
index 3a7774298f6af..bfca035e891e8 100644
--- a/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/toasters/modal_all_errors.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 
-import * as React from 'react';
+import React from 'react';
 
 import { ModalAllErrors } from './modal_all_errors';
 import { AppToast } from '.';
@@ -30,7 +29,7 @@ describe('Modal all errors', () => {
       const wrapper = shallow(
         <ModalAllErrors isShowing={true} toast={mockToast} toggle={toggle} />
       );
-      expect(toJson(wrapper)).toMatchSnapshot();
+      expect(wrapper).toMatchSnapshot();
     });
 
     test('it renders null when isShowing is negative', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx
index 8c5a08fdf5e21..92868b23a3ccd 100644
--- a/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/truncatable_text/index.test.tsx
@@ -5,15 +5,14 @@
  */
 
 import { mount, shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 
 import { TruncatableText } from '.';
 
 describe('TruncatableText', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(<TruncatableText>{'Hiding in plain sight'}</TruncatableText>);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it adds the hidden overflow style', () => {
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
index 5697a8c3a0e59..67823bea9e170 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/index.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { HookWrapper } from '../../mock';
 import { SiemPageName } from '../../pages/home/types';
@@ -146,8 +146,8 @@ describe('UrlStateContainer', () => {
               hash: '',
               pathname: examplePath,
               search: [CONSTANTS.overviewPage, CONSTANTS.timelinePage].includes(page)
-                ? '?_g=()&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))'
-                : `?_g=()&query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))`,
+                ? '?timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))'
+                : `?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))`,
               state: '',
             });
           }
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/index.tsx b/x-pack/legacy/plugins/siem/public/components/url_state/index.tsx
index 8164348620b50..e656ec3496d8d 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/index.tsx
@@ -19,16 +19,12 @@ import { dispatchUpdateTimeline } from '../open_timeline/helpers';
 import { dispatchSetInitialStateFromUrl } from './initialize_redux_by_url';
 import { makeMapStateToProps } from './helpers';
 
-export const UrlStateContainer = React.memo<UrlStateContainerPropTypes>(
-  (props: UrlStateContainerPropTypes) => {
-    useUrlStateHooks(props);
-    return null;
-  },
-  (prevProps, nextProps) =>
-    prevProps.pathName === nextProps.pathName && isEqual(prevProps.urlState, nextProps.urlState)
-);
-
-UrlStateContainer.displayName = 'UrlStateContainer';
+export const UrlStateContainer: React.FC<UrlStateContainerPropTypes> = (
+  props: UrlStateContainerPropTypes
+) => {
+  useUrlStateHooks(props);
+  return null;
+};
 
 const mapDispatchToProps = (dispatch: Dispatch) => ({
   setInitialStateFromUrl: dispatchSetInitialStateFromUrl(dispatch),
@@ -39,10 +35,21 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({
 
 export const UrlStateRedux = compose<React.ComponentClass<UrlStateProps & RouteSpyState>>(
   connect(makeMapStateToProps, mapDispatchToProps)
-)(UrlStateContainer);
+)(
+  React.memo(
+    UrlStateContainer,
+    (prevProps, nextProps) =>
+      prevProps.pathName === nextProps.pathName && isEqual(prevProps.urlState, nextProps.urlState)
+  )
+);
 
-export const UseUrlState = React.memo<UrlStateProps>(props => {
+const UseUrlStateComponent: React.FC<UrlStateProps> = props => {
   const [routeProps] = useRouteSpy();
-  const urlStateReduxProps: RouteSpyState & UrlStateProps = { ...routeProps, ...props };
+  const urlStateReduxProps: RouteSpyState & UrlStateProps = {
+    ...routeProps,
+    ...props,
+  };
   return <UrlStateRedux {...urlStateReduxProps} />;
-});
+};
+
+export const UseUrlState = React.memo(UseUrlStateComponent);
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/index_mocked.test.tsx b/x-pack/legacy/plugins/siem/public/components/url_state/index_mocked.test.tsx
index d20a4257a4472..f673b77ea13c5 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/index_mocked.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/index_mocked.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import { mount } from 'enzyme';
-import * as React from 'react';
+import React from 'react';
 
 import { HookWrapper } from '../../mock/hook_wrapper';
 import { SiemPageName } from '../../pages/home/types';
@@ -76,7 +76,7 @@ describe('UrlStateContainer - lodash.throttle mocked to test update url', () =>
         hash: '',
         pathname: '/network',
         search:
-          "?_g=()&query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:0,fromStr:now-24h,kind:relative,to:1,toStr:now)),timeline:(linkTo:!(global),timerange:(from:0,fromStr:now-24h,kind:relative,to:1,toStr:now)))",
+          "?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:0,fromStr:now-24h,kind:relative,to:1,toStr:now)),timeline:(linkTo:!(global),timerange:(from:0,fromStr:now-24h,kind:relative,to:1,toStr:now)))",
         state: '',
       });
     });
@@ -107,7 +107,7 @@ describe('UrlStateContainer - lodash.throttle mocked to test update url', () =>
         hash: '',
         pathname: '/network',
         search:
-          "?_g=()&query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))",
+          "?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))",
         state: '',
       });
     });
@@ -140,7 +140,7 @@ describe('UrlStateContainer - lodash.throttle mocked to test update url', () =>
         hash: '',
         pathname: '/network',
         search:
-          '?_g=()&timeline=(id:hello_timeline_id,isOpen:!t)&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))',
+          '?timeline=(id:hello_timeline_id,isOpen:!t)&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))',
         state: '',
       });
     });
@@ -159,7 +159,7 @@ describe('UrlStateContainer - lodash.throttle mocked to test update url', () =>
             expect(mockHistory.replace.mock.calls[0][0]).toEqual({
               hash: '',
               pathname: examplePath,
-              search: '?_g=()',
+              search: '?',
               state: '',
             });
 
@@ -169,7 +169,7 @@ describe('UrlStateContainer - lodash.throttle mocked to test update url', () =>
               hash: '',
               pathname: examplePath,
               search:
-                '?_g=()&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))',
+                '?timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))',
               state: '',
             });
           }
@@ -197,7 +197,7 @@ describe('UrlStateContainer - lodash.throttle mocked to test update url', () =>
           expect(
             mockHistory.replace.mock.calls[mockHistory.replace.mock.calls.length - 1][0].search
           ).toEqual(
-            '?_g=()&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))'
+            '?timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))'
           );
 
           wrapper.setProps({ hookProps: updatedProps });
@@ -206,7 +206,7 @@ describe('UrlStateContainer - lodash.throttle mocked to test update url', () =>
           expect(
             mockHistory.replace.mock.calls[mockHistory.replace.mock.calls.length - 1][0].search
           ).toEqual(
-            "?_g=()&query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))"
+            "?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(timeline),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1558048243696,fromStr:now-24h,kind:relative,to:1558134643697,toStr:now)))"
           );
         });
       });
diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/test_dependencies.ts b/x-pack/legacy/plugins/siem/public/components/url_state/test_dependencies.ts
index d58295de5ce9d..4dd92ac58b0a3 100644
--- a/x-pack/legacy/plugins/siem/public/components/url_state/test_dependencies.ts
+++ b/x-pack/legacy/plugins/siem/public/components/url_state/test_dependencies.ts
@@ -171,7 +171,7 @@ export const getMockPropsObj = ({
       {
         hash: '',
         pathname: examplePath,
-        search: '?_g=()',
+        search: '?',
         state: '',
       },
       page,
@@ -183,7 +183,7 @@ export const getMockPropsObj = ({
       {
         hash: '',
         pathname: examplePath,
-        search: '?_g=()',
+        search: '?',
         state: '',
       },
       page,
@@ -197,7 +197,7 @@ export const getMockPropsObj = ({
       {
         hash: '',
         pathname: examplePath,
-        search: `?_g=()&query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(),timerange:(from:1558591200000,fromStr:now-1d%2Fd,kind:relative,to:1558677599999,toStr:now-1d%2Fd)),timeline:(linkTo:!(),timerange:(from:1558732849370,fromStr:now-15m,kind:relative,to:1558733749370,toStr:now)))`,
+        search: `?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(),timerange:(from:1558591200000,fromStr:now-1d%2Fd,kind:relative,to:1558677599999,toStr:now-1d%2Fd)),timeline:(linkTo:!(),timerange:(from:1558732849370,fromStr:now-15m,kind:relative,to:1558733749370,toStr:now)))`,
         state: '',
       },
       page,
@@ -209,7 +209,7 @@ export const getMockPropsObj = ({
       {
         hash: '',
         pathname: examplePath,
-        search: `?_g=()&query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(),timerange:(from:1558591200000,fromStr:now-1d%2Fd,kind:relative,to:1558677599999,toStr:now-1d%2Fd)),timeline:(linkTo:!(),timerange:(from:1558732849370,fromStr:now-15m,kind:relative,to:1558733749370,toStr:now)))`,
+        search: `?query=(language:kuery,query:'host.name:%22siem-es%22')&timerange=(global:(linkTo:!(),timerange:(from:1558591200000,fromStr:now-1d%2Fd,kind:relative,to:1558677599999,toStr:now-1d%2Fd)),timeline:(linkTo:!(),timerange:(from:1558732849370,fromStr:now-15m,kind:relative,to:1558733749370,toStr:now)))`,
         state: '',
       },
       page,
@@ -224,7 +224,7 @@ export const getMockPropsObj = ({
         hash: '',
         pathname: examplePath,
         search:
-          '?_g=()&timerange=(global:(linkTo:!(timeline),timerange:(from:1556736012685,kind:absolute,to:1556822416082)),timeline:(linkTo:!(global),timerange:(from:1556736012685,kind:absolute,to:1556822416082)))',
+          '?timerange=(global:(linkTo:!(timeline),timerange:(from:1556736012685,kind:absolute,to:1556822416082)),timeline:(linkTo:!(global),timerange:(from:1556736012685,kind:absolute,to:1556822416082)))',
         state: '',
       },
       page,
@@ -237,7 +237,7 @@ export const getMockPropsObj = ({
         hash: '',
         pathname: examplePath,
         search:
-          '?_g=()&timerange=(global:(linkTo:!(timeline),timerange:(from:1556736012685,kind:absolute,to:1556822416082)),timeline:(linkTo:!(global),timerange:(from:1556736012685,kind:absolute,to:1556822416082)))',
+          '?timerange=(global:(linkTo:!(timeline),timerange:(from:1556736012685,kind:absolute,to:1556822416082)),timeline:(linkTo:!(global),timerange:(from:1556736012685,kind:absolute,to:1556822416082)))',
         state: '',
       },
       page,
@@ -251,7 +251,7 @@ export const getMockPropsObj = ({
       {
         hash: '',
         pathname: examplePath,
-        search: `?_g=()&query=(query:'host.name:%22siem-es%22',language:kuery)&timerange=(global:(linkTo:!(),timerange:(from:1558591200000,fromStr:now-1d%2Fd,kind:relative,to:1558677599999,toStr:now-1d%2Fd)),timeline:(linkTo:!(),timerange:(from:1558732849370,fromStr:now-15m,kind:relative,to:1558733749370,toStr:now)))`,
+        search: `?query=(query:'host.name:%22siem-es%22',language:kuery)&timerange=(global:(linkTo:!(),timerange:(from:1558591200000,fromStr:now-1d%2Fd,kind:relative,to:1558677599999,toStr:now-1d%2Fd)),timeline:(linkTo:!(),timerange:(from:1558732849370,fromStr:now-15m,kind:relative,to:1558733749370,toStr:now)))`,
         state: '',
       },
       page,
diff --git a/x-pack/legacy/plugins/siem/public/components/wrapper_page/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/wrapper_page/index.test.tsx
index 3ea243fe5cfe7..788ea14f4bd22 100644
--- a/x-pack/legacy/plugins/siem/public/components/wrapper_page/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/wrapper_page/index.test.tsx
@@ -5,15 +5,11 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import React from 'react';
 
 import { TestProviders } from '../../mock';
-import '../../mock/ui_settings';
 import { WrapperPage } from './index';
 
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
 describe('WrapperPage', () => {
   test('it renders', () => {
     const wrapper = shallow(
@@ -24,7 +20,7 @@ describe('WrapperPage', () => {
       </TestProviders>
     );
 
-    expect(toJson(wrapper.find('WrapperPage'))).toMatchSnapshot();
+    expect(wrapper.find('WrapperPage')).toMatchSnapshot();
   });
 
   describe('restrict width', () => {
@@ -37,7 +33,7 @@ describe('WrapperPage', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('WrapperPage'))).toMatchSnapshot();
+      expect(wrapper.find('WrapperPage')).toMatchSnapshot();
     });
 
     test('custom max width when restrictWidth is number', () => {
@@ -49,7 +45,7 @@ describe('WrapperPage', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('WrapperPage'))).toMatchSnapshot();
+      expect(wrapper.find('WrapperPage')).toMatchSnapshot();
     });
 
     test('custom max width when restrictWidth is string', () => {
@@ -61,7 +57,7 @@ describe('WrapperPage', () => {
         </TestProviders>
       );
 
-      expect(toJson(wrapper.find('WrapperPage'))).toMatchSnapshot();
+      expect(wrapper.find('WrapperPage')).toMatchSnapshot();
     });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/containers/alerts/alerts_over_time/alerts_over_time.gql_query.ts b/x-pack/legacy/plugins/siem/public/containers/alerts/alerts_over_time/alerts_over_time.gql_query.ts
new file mode 100644
index 0000000000000..428cf25ea1b8e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/alerts/alerts_over_time/alerts_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 AlertsOverTimeGqlQuery = gql`
+  query GetAlertsOverTimeQuery(
+    $sourceId: ID!
+    $timerange: TimerangeInput!
+    $defaultIndex: [String!]!
+    $filterQuery: String
+    $inspect: Boolean!
+  ) {
+    source(id: $sourceId) {
+      id
+      AlertsHistogram(
+        timerange: $timerange
+        filterQuery: $filterQuery
+        defaultIndex: $defaultIndex
+      ) {
+        alertsOverTimeByModule {
+          x
+          y
+          g
+        }
+        totalCount
+        inspect @include(if: $inspect) {
+          dsl
+          response
+        }
+      }
+    }
+  }
+`;
diff --git a/x-pack/legacy/plugins/siem/public/containers/alerts/alerts_over_time/index.tsx b/x-pack/legacy/plugins/siem/public/containers/alerts/alerts_over_time/index.tsx
new file mode 100644
index 0000000000000..9541e6d39d669
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/alerts/alerts_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 { compose } from 'redux';
+
+import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
+import { inputsModel, State, inputsSelectors, hostsModel } from '../../../store';
+import { withKibana, WithKibanaProps } from '../../../lib/kibana';
+import { createFilter, getDefaultFetchPolicy } from '../../helpers';
+import { QueryTemplate, QueryTemplateProps } from '../../query_template';
+
+import { AlertsOverTimeGqlQuery } from './alerts_over_time.gql_query';
+import { MatrixOverTimeHistogramData, GetAlertsOverTimeQuery } from '../../../graphql/types';
+
+const ID = 'alertsOverTimeQuery';
+
+export interface AlertsArgs {
+  endDate: number;
+  alertsOverTime: MatrixOverTimeHistogramData[];
+  id: string;
+  inspect: inputsModel.InspectQuery;
+  loading: boolean;
+  refetch: inputsModel.Refetch;
+  startDate: number;
+  totalCount: number;
+}
+
+export interface OwnProps extends QueryTemplateProps {
+  children?: (args: AlertsArgs) => React.ReactNode;
+  type: hostsModel.HostsType;
+}
+
+export interface AlertsOverTimeComponentReduxProps {
+  isInspected: boolean;
+}
+
+type AlertsOverTimeProps = OwnProps & AlertsOverTimeComponentReduxProps & WithKibanaProps;
+
+class AlertsOverTimeComponentQuery extends QueryTemplate<
+  AlertsOverTimeProps,
+  GetAlertsOverTimeQuery.Query,
+  GetAlertsOverTimeQuery.Variables
+> {
+  public render() {
+    const {
+      children,
+      endDate,
+      filterQuery,
+      id = ID,
+      isInspected,
+      kibana,
+      sourceId,
+      startDate,
+    } = this.props;
+    return (
+      <Query<GetAlertsOverTimeQuery.Query, GetAlertsOverTimeQuery.Variables>
+        query={AlertsOverTimeGqlQuery}
+        fetchPolicy={getDefaultFetchPolicy()}
+        notifyOnNetworkStatusChange
+        variables={{
+          filterQuery: createFilter(filterQuery),
+          sourceId,
+          timerange: {
+            interval: '12h',
+            from: startDate!,
+            to: endDate!,
+          },
+          defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
+          inspect: isInspected,
+        }}
+      >
+        {({ data, loading, refetch }) => {
+          const source = getOr({}, `source.AlertsHistogram`, data);
+          const alertsOverTime = getOr([], `alertsOverTimeByModule`, source);
+          const totalCount = getOr(-1, 'totalCount', source);
+          return children!({
+            endDate: endDate!,
+            alertsOverTime,
+            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 AlertsOverTimeQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps),
+  withKibana
+)(AlertsOverTimeComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/index.tsx b/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/index.tsx
index 917f4dbcc211b..f2c00cbae1a74 100644
--- a/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/index.tsx
@@ -12,7 +12,7 @@ import { AnomaliesOverTimeHistogram } from '../../../components/anomalies_over_t
 import { AnomaliesOverTimeQuery } from '../anomalies_over_time';
 import { getAnomaliesFilterQuery } from './utils';
 import { useSiemJobs } from '../../../components/ml_popover/hooks/use_siem_jobs';
-import { useKibanaUiSetting } from '../../../lib/settings/use_kibana_ui_setting';
+import { useUiSetting$ } from '../../../lib/kibana';
 import { DEFAULT_ANOMALY_SCORE } from '../../../../common/constants';
 
 const AnomaliesOverTimeManage = manageQuery(AnomaliesOverTimeHistogram);
@@ -33,7 +33,7 @@ export const AnomaliesQueryTabBody = ({
   ip,
 }: AnomaliesQueryTabBodyProps) => {
   const [siemJobsLoading, siemJobs] = useSiemJobs(true);
-  const [anomalyScore] = useKibanaUiSetting(DEFAULT_ANOMALY_SCORE);
+  const [anomalyScore] = useUiSetting$<number>(DEFAULT_ANOMALY_SCORE);
 
   const mergedFilterQuery = getAnomaliesFilterQuery(
     filterQuery,
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
index 1d6d96869b6a9..8f363d49f1851 100644
--- 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
@@ -8,10 +8,11 @@ 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 { inputsModel, State, inputsSelectors, hostsModel } from '../../../store';
+import { withKibana, WithKibanaProps } from '../../../lib/kibana';
 import { createFilter, getDefaultFetchPolicy } from '../../helpers';
 import { QueryTemplate, QueryTemplateProps } from '../../query_template';
 
@@ -43,7 +44,9 @@ export interface AuthenticationsOverTimeComponentReduxProps {
   isInspected: boolean;
 }
 
-type AuthenticationsOverTimeProps = OwnProps & AuthenticationsOverTimeComponentReduxProps;
+type AuthenticationsOverTimeProps = OwnProps &
+  AuthenticationsOverTimeComponentReduxProps &
+  WithKibanaProps;
 
 class AuthenticationsOverTimeComponentQuery extends QueryTemplate<
   AuthenticationsOverTimeProps,
@@ -56,6 +59,7 @@ class AuthenticationsOverTimeComponentQuery extends QueryTemplate<
       filterQuery,
       id = ID,
       isInspected,
+      kibana,
       sourceId,
       startDate,
       endDate,
@@ -73,7 +77,7 @@ class AuthenticationsOverTimeComponentQuery extends QueryTemplate<
             from: startDate!,
             to: endDate!,
           },
-          defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+          defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
           inspect: isInspected,
         }}
       >
@@ -108,6 +112,7 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-export const AuthenticationsOverTimeQuery = connect(makeMapStateToProps)(
-  AuthenticationsOverTimeComponentQuery
-);
+export const AuthenticationsOverTimeQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps),
+  withKibana
+)(AuthenticationsOverTimeComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/authentications/index.tsx b/x-pack/legacy/plugins/siem/public/containers/authentications/index.tsx
index 6f896cfd95901..6d4a88c45a768 100644
--- a/x-pack/legacy/plugins/siem/public/containers/authentications/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/authentications/index.tsx
@@ -8,8 +8,8 @@ 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 {
   AuthenticationsEdges,
@@ -19,6 +19,7 @@ import {
 import { hostsModel, hostsSelectors, inputsModel, State, inputsSelectors } from '../../store';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
+import { withKibana, WithKibanaProps } from '../../lib/kibana';
 import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated';
 
 import { authenticationsQuery } from './index.gql_query';
@@ -48,7 +49,7 @@ export interface AuthenticationsComponentReduxProps {
   limit: number;
 }
 
-type AuthenticationsProps = OwnProps & AuthenticationsComponentReduxProps;
+type AuthenticationsProps = OwnProps & AuthenticationsComponentReduxProps & WithKibanaProps;
 
 class AuthenticationsComponentQuery extends QueryTemplatePaginated<
   AuthenticationsProps,
@@ -63,6 +64,7 @@ class AuthenticationsComponentQuery extends QueryTemplatePaginated<
       filterQuery,
       id = ID,
       isInspected,
+      kibana,
       limit,
       skip,
       sourceId,
@@ -77,7 +79,7 @@ class AuthenticationsComponentQuery extends QueryTemplatePaginated<
       },
       pagination: generateTablePaginationOptions(activePage, limit),
       filterQuery: createFilter(filterQuery),
-      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+      defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
       inspect: isInspected,
     };
     return (
@@ -142,4 +144,7 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-export const AuthenticationsQuery = connect(makeMapStateToProps)(AuthenticationsComponentQuery);
+export const AuthenticationsQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps),
+  withKibana
+)(AuthenticationsComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
index a26f376f962d7..f9611995cdb04 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
@@ -14,6 +14,7 @@ import {
   FetchRulesResponse,
   NewRule,
   Rule,
+  FetchRuleProps,
 } from './types';
 import { throwIfNotOk } from '../../../hooks/api/api';
 import { DETECTION_ENGINE_RULES_URL } from '../../../../common/constants';
@@ -22,17 +23,15 @@ import { DETECTION_ENGINE_RULES_URL } from '../../../../common/constants';
  * Add provided Rule
  *
  * @param rule to add
- * @param kbnVersion current Kibana Version to use for headers
  * @param signal to cancel request
  */
-export const addRule = async ({ rule, kbnVersion, signal }: AddRulesProps): Promise<NewRule> => {
+export const addRule = async ({ rule, signal }: AddRulesProps): Promise<NewRule> => {
   const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_RULES_URL}`, {
-    method: 'POST',
+    method: rule.id != null ? 'PUT' : 'POST',
     credentials: 'same-origin',
     headers: {
       'content-type': 'application/json',
-      'kbn-version': kbnVersion,
-      'kbn-xsrf': kbnVersion,
+      'kbn-xsrf': 'true',
     },
     body: JSON.stringify(rule),
     signal,
@@ -48,7 +47,6 @@ export const addRule = async ({ rule, kbnVersion, signal }: AddRulesProps): Prom
  * @param filterOptions desired filters (e.g. filter/sortField/sortOrder)
  * @param pagination desired pagination options (e.g. page/perPage)
  * @param id if specified, will return specific rule if exists
- * @param kbnVersion current Kibana Version to use for headers
  * @param signal to cancel request
  */
 export const fetchRules = async ({
@@ -63,7 +61,6 @@ export const fetchRules = async ({
     total: 0,
   },
   id,
-  kbnVersion,
   signal,
 }: FetchRulesProps): Promise<FetchRulesResponse> => {
   const queryParams = [
@@ -96,26 +93,40 @@ export const fetchRules = async ({
     : response.json();
 };
 
+/**
+ * Fetch a Rule by providing a Rule ID
+ *
+ * @param id Rule ID's (not rule_id)
+ */
+export const fetchRuleById = async ({ id, signal }: FetchRuleProps): Promise<Rule> => {
+  const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_RULES_URL}?id=${id}`, {
+    method: 'GET',
+    credentials: 'same-origin',
+    headers: {
+      'content-type': 'application/json',
+      'kbn-xsrf': 'true',
+    },
+    signal,
+  });
+  await throwIfNotOk(response);
+  const rule: Rule = await response.json();
+  return rule;
+};
+
 /**
  * Enables/Disables provided Rule ID's
  *
  * @param ids array of Rule ID's (not rule_id) to enable/disable
  * @param enabled to enable or disable
- * @param kbnVersion current Kibana Version to use for headers
  */
-export const enableRules = async ({
-  ids,
-  enabled,
-  kbnVersion,
-}: EnableRulesProps): Promise<Rule[]> => {
+export const enableRules = async ({ ids, enabled }: EnableRulesProps): Promise<Rule[]> => {
   const requests = ids.map(id =>
     fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_RULES_URL}`, {
       method: 'PUT',
       credentials: 'same-origin',
       headers: {
         'content-type': 'application/json',
-        'kbn-version': kbnVersion,
-        'kbn-xsrf': kbnVersion,
+        'kbn-xsrf': 'true',
       },
       body: JSON.stringify({ id, enabled }),
     })
@@ -132,9 +143,8 @@ export const enableRules = async ({
  * Deletes provided Rule ID's
  *
  * @param ids array of Rule ID's (not rule_id) to delete
- * @param kbnVersion current Kibana Version to use for headers
  */
-export const deleteRules = async ({ ids, kbnVersion }: DeleteRulesProps): Promise<Rule[]> => {
+export const deleteRules = async ({ ids }: DeleteRulesProps): Promise<Rule[]> => {
   // TODO: Don't delete if immutable!
   const requests = ids.map(id =>
     fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_RULES_URL}?id=${id}`, {
@@ -142,8 +152,7 @@ export const deleteRules = async ({ ids, kbnVersion }: DeleteRulesProps): Promis
       credentials: 'same-origin',
       headers: {
         'content-type': 'application/json',
-        'kbn-version': kbnVersion,
-        'kbn-xsrf': kbnVersion,
+        'kbn-xsrf': 'true',
       },
     })
   );
@@ -159,29 +168,27 @@ export const deleteRules = async ({ ids, kbnVersion }: DeleteRulesProps): Promis
  * Duplicates provided Rules
  *
  * @param rule to duplicate
- * @param kbnVersion current Kibana Version to use for headers
  */
-export const duplicateRules = async ({
-  rules,
-  kbnVersion,
-}: DuplicateRulesProps): Promise<Rule[]> => {
+export const duplicateRules = async ({ rules }: DuplicateRulesProps): Promise<Rule[]> => {
   const requests = rules.map(rule =>
     fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_RULES_URL}`, {
       method: 'POST',
       credentials: 'same-origin',
       headers: {
         'content-type': 'application/json',
-        'kbn-version': kbnVersion,
-        'kbn-xsrf': kbnVersion,
+        'kbn-xsrf': 'true',
       },
       body: JSON.stringify({
         ...rule,
         name: `${rule.name} [Duplicate]`,
+        created_at: undefined,
         created_by: undefined,
         id: undefined,
         rule_id: undefined,
+        updated_at: undefined,
         updated_by: undefined,
         enabled: rule.enabled,
+        immutable: false,
       }),
     })
   );
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.tsx
index dd744f4d7ecd5..88a1333c82a45 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.tsx
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { isEmpty, get } from 'lodash/fp';
+import { isEmpty, isEqual, get } from 'lodash/fp';
 import { useEffect, useState, Dispatch, SetStateAction } from 'react';
-import { IIndexPattern } from 'src/plugins/data/public';
 
+import { IIndexPattern } from '../../../../../../../../src/plugins/data/public';
 import {
   BrowserFields,
   getBrowserFields,
@@ -40,6 +40,12 @@ export const useFetchIndexPatterns = (defaultIndices: string[] = []): Return =>
   const [isLoading, setIsLoading] = useState(false);
   const [, dispatchToaster] = useStateToaster();
 
+  useEffect(() => {
+    if (!isEqual(defaultIndices, indices)) {
+      setIndices(defaultIndices);
+    }
+  }, [defaultIndices, indices]);
+
   useEffect(() => {
     let isSubscribed = true;
     const abortCtrl = new AbortController();
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/index.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/index.ts
new file mode 100644
index 0000000000000..a61cbabd80626
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './api';
+export * from './fetch_index_patterns';
+export * from './persist_rule';
+export * from './types';
+export * from './use_rule';
+export * from './use_rules';
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/persist_rule.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/persist_rule.tsx
index 371d28aebf7f7..ea03c34ec31ba 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/persist_rule.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/persist_rule.tsx
@@ -6,8 +6,6 @@
 
 import { useEffect, useState, Dispatch } from 'react';
 
-import { useKibanaUiSetting } from '../../../lib/settings/use_kibana_ui_setting';
-import { DEFAULT_KBN_VERSION } from '../../../../common/constants';
 import { useStateToaster } from '../../../components/toasters';
 import { errorToToaster } from '../../../components/ml/api/error_to_toaster';
 
@@ -26,7 +24,6 @@ export const usePersistRule = (): Return => {
   const [rule, setRule] = useState<NewRule | null>(null);
   const [isSaved, setIsSaved] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
-  const [kbnVersion] = useKibanaUiSetting(DEFAULT_KBN_VERSION);
   const [, dispatchToaster] = useStateToaster();
 
   useEffect(() => {
@@ -37,7 +34,7 @@ export const usePersistRule = (): Return => {
       if (rule != null) {
         try {
           setIsLoading(true);
-          await persistRule({ rule, kbnVersion, signal: abortCtrl.signal });
+          await persistRule({ rule, signal: abortCtrl.signal });
 
           if (isSubscribed) {
             setIsSaved(true);
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
index fe6fb04800adc..9f3cba7189fb1 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/types.ts
@@ -10,11 +10,13 @@ export const NewRuleSchema = t.intersection([
   t.type({
     description: t.string,
     enabled: t.boolean,
+    filters: t.array(t.unknown),
     index: t.array(t.string),
     interval: t.string,
     language: t.string,
     name: t.string,
     query: t.string,
+    risk_score: t.number,
     severity: t.string,
     type: t.union([t.literal('query'), t.literal('saved_query')]),
   }),
@@ -26,7 +28,9 @@ export const NewRuleSchema = t.intersection([
     max_signals: t.number,
     references: t.array(t.string),
     rule_id: t.string,
+    saved_id: t.string,
     tags: t.array(t.string),
+    threats: t.array(t.unknown),
     to: t.string,
     updated_by: t.string,
   }),
@@ -37,33 +41,44 @@ export type NewRule = t.TypeOf<typeof NewRuleSchema>;
 
 export interface AddRulesProps {
   rule: NewRule;
-  kbnVersion: string;
   signal: AbortSignal;
 }
 
+const MetaRule = t.type({
+  from: t.string,
+});
+
 export const RuleSchema = t.intersection([
   t.type({
+    created_at: t.string,
     created_by: t.string,
     description: t.string,
     enabled: t.boolean,
+    false_positives: t.array(t.string),
+    filters: t.array(t.unknown),
+    from: t.string,
     id: t.string,
     index: t.array(t.string),
     interval: t.string,
+    immutable: t.boolean,
     language: t.string,
     name: t.string,
+    max_signals: t.number,
+    meta: MetaRule,
     query: t.string,
+    references: t.array(t.string),
+    risk_score: t.number,
     rule_id: t.string,
     severity: t.string,
     type: t.string,
+    tags: t.array(t.string),
+    to: t.string,
+    threats: t.array(t.unknown),
+    updated_at: t.string,
     updated_by: t.string,
   }),
   t.partial({
-    false_positives: t.array(t.string),
-    from: t.string,
-    max_signals: t.number,
-    references: t.array(t.string),
-    tags: t.array(t.string),
-    to: t.string,
+    saved_id: t.string,
   }),
 ]);
 
@@ -82,7 +97,6 @@ export interface FetchRulesProps {
   pagination?: PaginationOptions;
   filterOptions?: FilterOptions;
   id?: string;
-  kbnVersion: string;
   signal: AbortSignal;
 }
 
@@ -99,18 +113,20 @@ export interface FetchRulesResponse {
   data: Rule[];
 }
 
+export interface FetchRuleProps {
+  id: string;
+  signal: AbortSignal;
+}
+
 export interface EnableRulesProps {
   ids: string[];
   enabled: boolean;
-  kbnVersion: string;
 }
 
 export interface DeleteRulesProps {
   ids: string[];
-  kbnVersion: string;
 }
 
 export interface DuplicateRulesProps {
   rules: Rules;
-  kbnVersion: string;
 }
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule.tsx
new file mode 100644
index 0000000000000..22ba86cd09f74
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule.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 { useEffect, useState } from 'react';
+
+import { useStateToaster } from '../../../components/toasters';
+import { errorToToaster } from '../../../components/ml/api/error_to_toaster';
+import { fetchRuleById } from './api';
+import * as i18n from './translations';
+import { Rule } from './types';
+
+type Return = [boolean, Rule | null];
+
+/**
+ * Hook for using to get a Rule from the Detection Engine API
+ *
+ * @param id desired Rule ID's (not rule_id)
+ *
+ */
+export const useRule = (id: string | undefined): Return => {
+  const [rule, setRule] = useState<Rule | null>(null);
+  const [loading, setLoading] = useState(true);
+  const [, dispatchToaster] = useStateToaster();
+
+  useEffect(() => {
+    let isSubscribed = true;
+    const abortCtrl = new AbortController();
+
+    async function fetchData(idToFetch: string) {
+      try {
+        setLoading(true);
+        const ruleResponse = await fetchRuleById({
+          id: idToFetch,
+          signal: abortCtrl.signal,
+        });
+
+        if (isSubscribed) {
+          setRule(ruleResponse);
+        }
+      } catch (error) {
+        if (isSubscribed) {
+          setRule(null);
+          errorToToaster({ title: i18n.RULE_FETCH_FAILURE, error, dispatchToaster });
+        }
+      }
+      if (isSubscribed) {
+        setLoading(false);
+      }
+    }
+    if (id != null) {
+      fetchData(id);
+    }
+    return () => {
+      isSubscribed = false;
+      abortCtrl.abort();
+    };
+  }, [id]);
+
+  return [loading, rule];
+};
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.tsx
index 2b8bb986a296a..b49dd8d51d4f7 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rules.tsx
@@ -6,8 +6,6 @@
 
 import { useEffect, useState } from 'react';
 
-import { useKibanaUiSetting } from '../../../lib/settings/use_kibana_ui_setting';
-import { DEFAULT_KBN_VERSION } from '../../../../common/constants';
 import { FetchRulesResponse, FilterOptions, PaginationOptions } from './types';
 import { useStateToaster } from '../../../components/toasters';
 import { fetchRules } from './api';
@@ -35,7 +33,6 @@ export const useRules = (
     data: [],
   });
   const [loading, setLoading] = useState(true);
-  const [kbnVersion] = useKibanaUiSetting(DEFAULT_KBN_VERSION);
   const [, dispatchToaster] = useStateToaster();
 
   useEffect(() => {
@@ -48,7 +45,6 @@ export const useRules = (
         const fetchRulesResult = await fetchRules({
           filterOptions,
           pagination,
-          kbnVersion,
           signal: abortCtrl.signal,
         });
 
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/api.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/api.ts
new file mode 100644
index 0000000000000..e7641fd37678e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/api.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 chrome from 'ui/chrome';
+
+import { throwIfNotOk } from '../../../hooks/api/api';
+import {
+  DETECTION_ENGINE_QUERY_SIGNALS_URL,
+  DETECTION_ENGINE_SIGNALS_STATUS_URL,
+  DETECTION_ENGINE_INDEX_URL,
+  DETECTION_ENGINE_PRIVILEGES_URL,
+} from '../../../../common/constants';
+import {
+  QuerySignals,
+  SignalSearchResponse,
+  UpdateSignalStatusProps,
+  SignalsIndex,
+  SignalIndexError,
+  Privilege,
+  PostSignalError,
+  BasicSignals,
+} from './types';
+import { parseJsonFromBody } from '../../../utils/api';
+
+/**
+ * Fetch Signals by providing a query
+ *
+ * @param query String to match a dsl
+ * @param signal AbortSignal for cancelling request
+ */
+export const fetchQuerySignals = async <Hit, Aggregations>({
+  query,
+  signal,
+}: QuerySignals): Promise<SignalSearchResponse<Hit, Aggregations>> => {
+  const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_QUERY_SIGNALS_URL}`, {
+    method: 'POST',
+    credentials: 'same-origin',
+    headers: {
+      'content-type': 'application/json',
+      'kbn-xsrf': 'true',
+    },
+    body: query,
+    signal,
+  });
+  await throwIfNotOk(response);
+  const signals = await response.json();
+  return signals;
+};
+
+/**
+ * Update signal status by query
+ *
+ * @param query of signals to update
+ * @param status to update to('open' / 'closed')
+ * @param signal AbortSignal for cancelling request
+ */
+export const updateSignalStatus = async ({
+  query,
+  status,
+  signal,
+}: UpdateSignalStatusProps): Promise<unknown> => {
+  const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_SIGNALS_STATUS_URL}`, {
+    method: 'POST',
+    credentials: 'same-origin',
+    headers: {
+      'content-type': 'application/json',
+      'kbn-xsrf': 'true',
+    },
+    body: JSON.stringify({ status, ...query }),
+    signal,
+  });
+
+  await throwIfNotOk(response);
+  return response.json();
+};
+
+/**
+ * Fetch Signal Index
+ *
+ * @param signal AbortSignal for cancelling request
+ */
+export const getSignalIndex = async ({ signal }: BasicSignals): Promise<SignalsIndex | null> => {
+  const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_INDEX_URL}`, {
+    method: 'GET',
+    credentials: 'same-origin',
+    headers: {
+      'content-type': 'application/json',
+      'kbn-xsrf': 'true',
+    },
+    signal,
+  });
+  if (response.ok) {
+    const signalIndex = await response.json();
+    return signalIndex;
+  }
+  const error = await parseJsonFromBody(response);
+  if (error != null) {
+    throw new SignalIndexError(error);
+  }
+  return null;
+};
+
+/**
+ * Get User Privileges
+ *
+ * @param signal AbortSignal for cancelling request
+ */
+export const getUserPrivilege = async ({ signal }: BasicSignals): Promise<Privilege | null> => {
+  const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_PRIVILEGES_URL}`, {
+    method: 'GET',
+    credentials: 'same-origin',
+    headers: {
+      'content-type': 'application/json',
+      'kbn-xsrf': 'true',
+    },
+    signal,
+  });
+
+  await throwIfNotOk(response);
+  return response.json();
+};
+
+/**
+ * Create Signal Index if needed it
+ *
+ * @param signal AbortSignal for cancelling request
+ */
+export const createSignalIndex = async ({ signal }: BasicSignals): Promise<SignalsIndex | null> => {
+  const response = await fetch(`${chrome.getBasePath()}${DETECTION_ENGINE_INDEX_URL}`, {
+    method: 'POST',
+    credentials: 'same-origin',
+    headers: {
+      'content-type': 'application/json',
+      'kbn-xsrf': 'true',
+    },
+    signal,
+  });
+  if (response.ok) {
+    const signalIndex = await response.json();
+    return signalIndex;
+  }
+  const error = await parseJsonFromBody(response);
+  if (error != null) {
+    throw new PostSignalError(error);
+  }
+  return null;
+};
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/get_index_error.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/get_index_error.ts
new file mode 100644
index 0000000000000..e4f2a658b7362
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/get_index_error.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 { MessageBody } from '../../../../components/ml/api/throw_if_not_ok';
+
+export class SignalIndexError extends Error {
+  message: string = '';
+  statusCode: number = -1;
+  error: string = '';
+
+  constructor(errObj: MessageBody) {
+    super(errObj.message);
+    this.message = errObj.message ?? '';
+    this.statusCode = errObj.statusCode ?? -1;
+    this.error = errObj.error ?? '';
+    this.name = 'SignalIndexError';
+
+    // Set the prototype explicitly.
+    Object.setPrototypeOf(this, SignalIndexError.prototype);
+  }
+}
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/index.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/index.ts
new file mode 100644
index 0000000000000..4ce8e6ba89183
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/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 * from './get_index_error';
+export * from './post_index_error';
+export * from './privilege_user_error';
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/post_index_error.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/post_index_error.ts
new file mode 100644
index 0000000000000..d6d8cccfb4540
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/post_index_error.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 { MessageBody } from '../../../../components/ml/api/throw_if_not_ok';
+
+export class PostSignalError extends Error {
+  message: string = '';
+  statusCode: number = -1;
+  error: string = '';
+
+  constructor(errObj: MessageBody) {
+    super(errObj.message);
+    this.message = errObj.message ?? '';
+    this.statusCode = errObj.statusCode ?? -1;
+    this.error = errObj.error ?? '';
+    this.name = 'PostSignalError';
+
+    // Set the prototype explicitly.
+    Object.setPrototypeOf(this, PostSignalError.prototype);
+  }
+}
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/privilege_user_error.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/privilege_user_error.ts
new file mode 100644
index 0000000000000..5cd458a7fe9aa
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/errors_types/privilege_user_error.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 { MessageBody } from '../../../../components/ml/api/throw_if_not_ok';
+
+export class PrivilegeUserError extends Error {
+  message: string = '';
+  statusCode: number = -1;
+  error: string = '';
+
+  constructor(errObj: MessageBody) {
+    super(errObj.message);
+    this.message = errObj.message ?? '';
+    this.statusCode = errObj.statusCode ?? -1;
+    this.error = errObj.error ?? '';
+    this.name = 'PrivilegeUserError';
+
+    // Set the prototype explicitly.
+    Object.setPrototypeOf(this, PrivilegeUserError.prototype);
+  }
+}
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/translations.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/translations.ts
new file mode 100644
index 0000000000000..5b5dc9e9699fe
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/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 SIGNAL_FETCH_FAILURE = i18n.translate(
+  'xpack.siem.containers.detectionEngine.signals.errorFetchingSignalsDescription',
+  {
+    defaultMessage: 'Failed to query signals',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/types.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/types.ts
new file mode 100644
index 0000000000000..32f53691bae87
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/types.ts
@@ -0,0 +1,99 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under 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 './errors_types';
+
+export interface BasicSignals {
+  signal: AbortSignal;
+}
+export interface QuerySignals extends BasicSignals {
+  query: string;
+}
+
+export interface SignalsResponse {
+  took: number;
+  timeout: boolean;
+}
+
+export interface SignalSearchResponse<Hit = {}, Aggregations = undefined> extends SignalsResponse {
+  _shards: {
+    total: number;
+    successful: number;
+    skipped: number;
+    failed: number;
+  };
+  aggregations?: Aggregations;
+  hits: {
+    total: {
+      value: number;
+      relation: string;
+    };
+    hits: Hit[];
+  };
+}
+
+export interface UpdateSignalStatusProps {
+  query: object;
+  status: 'open' | 'closed';
+  signal?: AbortSignal; // TODO: implement cancelling
+}
+
+export interface SignalsIndex {
+  name: string;
+}
+
+export interface Privilege {
+  username: string;
+  has_all_requested: boolean;
+  cluster: {
+    monitor_ml: boolean;
+    manage_ccr: boolean;
+    manage_index_templates: boolean;
+    monitor_watcher: boolean;
+    monitor_transform: boolean;
+    read_ilm: boolean;
+    manage_api_key: boolean;
+    manage_security: boolean;
+    manage_own_api_key: boolean;
+    manage_saml: boolean;
+    all: boolean;
+    manage_ilm: boolean;
+    manage_ingest_pipelines: boolean;
+    read_ccr: boolean;
+    manage_rollup: boolean;
+    monitor: boolean;
+    manage_watcher: boolean;
+    manage: boolean;
+    manage_transform: boolean;
+    manage_token: boolean;
+    manage_ml: boolean;
+    manage_pipeline: boolean;
+    monitor_rollup: boolean;
+    transport_client: boolean;
+    create_snapshot: boolean;
+  };
+  index: {
+    [indexName: string]: {
+      all: boolean;
+      manage_ilm: boolean;
+      read: boolean;
+      create_index: boolean;
+      read_cross_cluster: boolean;
+      index: boolean;
+      monitor: boolean;
+      delete: boolean;
+      manage: boolean;
+      delete_index: boolean;
+      create_doc: boolean;
+      view_index_metadata: boolean;
+      create: boolean;
+      manage_follow_index: boolean;
+      manage_leader_index: boolean;
+      write: boolean;
+    };
+  };
+  isAuthenticated: boolean;
+}
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.tsx
new file mode 100644
index 0000000000000..aa66df53d9fd9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.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 { useEffect, useState } from 'react';
+
+import { getUserPrivilege } from './api';
+
+type Return = [boolean, boolean | null, boolean | null];
+
+/**
+ * Hook to get user privilege from
+ *
+ */
+export const usePrivilegeUser = (): Return => {
+  const [loading, setLoading] = useState(true);
+  const [isAuthenticated, setAuthenticated] = useState<boolean | null>(null);
+  const [hasWrite, setHasWrite] = useState<boolean | null>(null);
+
+  useEffect(() => {
+    let isSubscribed = true;
+    const abortCtrl = new AbortController();
+    setLoading(true);
+
+    async function fetchData() {
+      try {
+        const privilege = await getUserPrivilege({
+          signal: abortCtrl.signal,
+        });
+
+        if (isSubscribed && privilege != null) {
+          setAuthenticated(privilege.isAuthenticated);
+          if (privilege.index != null && Object.keys(privilege.index).length > 0) {
+            const indexName = Object.keys(privilege.index)[0];
+            setHasWrite(privilege.index[indexName].create_index);
+          }
+        }
+      } catch (error) {
+        if (isSubscribed) {
+          setAuthenticated(false);
+          setHasWrite(false);
+        }
+      }
+      if (isSubscribed) {
+        setLoading(false);
+      }
+    }
+
+    fetchData();
+    return () => {
+      isSubscribed = false;
+      abortCtrl.abort();
+    };
+  }, []);
+
+  return [loading, isAuthenticated, hasWrite];
+};
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_query.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_query.tsx
new file mode 100644
index 0000000000000..65a5ac866e68d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_query.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 { useEffect, useState } from 'react';
+
+import { fetchQuerySignals } from './api';
+import { SignalSearchResponse } from './types';
+
+type Return<Hit, Aggs> = [boolean, SignalSearchResponse<Hit, Aggs> | null];
+
+/**
+ * Hook for using to get a Signals from the Detection Engine API
+ *
+ * @param query convert a dsl into string
+ *
+ */
+export const useQuerySignals = <Hit, Aggs>(query: string): Return<Hit, Aggs> => {
+  const [signals, setSignals] = useState<SignalSearchResponse<Hit, Aggs> | null>(null);
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    let isSubscribed = true;
+    const abortCtrl = new AbortController();
+    setLoading(true);
+
+    async function fetchData() {
+      try {
+        const signalResponse = await fetchQuerySignals<Hit, Aggs>({
+          query,
+          signal: abortCtrl.signal,
+        });
+
+        if (isSubscribed) {
+          setSignals(signalResponse);
+        }
+      } catch (error) {
+        if (isSubscribed) {
+          setSignals(null);
+        }
+      }
+      if (isSubscribed) {
+        setLoading(false);
+      }
+    }
+
+    fetchData();
+    return () => {
+      isSubscribed = false;
+      abortCtrl.abort();
+    };
+  }, [query]);
+
+  return [loading, signals];
+};
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_signal_index.tsx b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_signal_index.tsx
new file mode 100644
index 0000000000000..1ff4422cf6411
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/signals/use_signal_index.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useEffect, useState, useRef } from 'react';
+
+import { errorToToaster } from '../../../components/ml/api/error_to_toaster';
+import { useStateToaster } from '../../../components/toasters';
+import { createSignalIndex, getSignalIndex } from './api';
+import * as i18n from './translations';
+import { PostSignalError } from './types';
+
+type Func = () => void;
+
+type Return = [boolean, boolean | null, string | null, Func | null];
+
+/**
+ * Hook for managing signal index
+ *
+ *
+ */
+export const useSignalIndex = (): Return => {
+  const [loading, setLoading] = useState(true);
+  const [signalIndexName, setSignalIndexName] = useState<string | null>(null);
+  const [signalIndexExists, setSignalIndexExists] = useState<boolean | null>(null);
+  const createDeSignalIndex = useRef<Func | null>(null);
+  const [, dispatchToaster] = useStateToaster();
+
+  useEffect(() => {
+    let isSubscribed = true;
+    const abortCtrl = new AbortController();
+
+    const fetchData = async () => {
+      try {
+        setLoading(true);
+        const signal = await getSignalIndex({ signal: abortCtrl.signal });
+
+        if (isSubscribed && signal != null) {
+          setSignalIndexName(signal.name);
+          setSignalIndexExists(true);
+        }
+      } catch (error) {
+        if (isSubscribed) {
+          setSignalIndexName(null);
+          setSignalIndexExists(false);
+        }
+      }
+      if (isSubscribed) {
+        setLoading(false);
+      }
+    };
+
+    const createIndex = async () => {
+      let isFetchingData = false;
+      try {
+        setLoading(true);
+        await createSignalIndex({ signal: abortCtrl.signal });
+
+        if (isSubscribed) {
+          isFetchingData = true;
+          fetchData();
+        }
+      } catch (error) {
+        if (isSubscribed) {
+          if (error instanceof PostSignalError && error.statusCode === 409) {
+            fetchData();
+          } else {
+            setSignalIndexName(null);
+            setSignalIndexExists(false);
+            errorToToaster({ title: i18n.SIGNAL_FETCH_FAILURE, error, dispatchToaster });
+          }
+        }
+      }
+      if (isSubscribed && !isFetchingData) {
+        setLoading(false);
+      }
+    };
+
+    fetchData();
+    createDeSignalIndex.current = createIndex;
+    return () => {
+      isSubscribed = false;
+      abortCtrl.abort();
+    };
+  }, []);
+
+  return [loading, signalIndexExists, signalIndexName, createDeSignalIndex.current];
+};
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 77ce98e180ab0..e102cd11f108e 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
@@ -8,12 +8,13 @@ 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 { inputsModel, State, inputsSelectors, hostsModel } from '../../../store';
 import { createFilter, getDefaultFetchPolicy } from '../../helpers';
 import { QueryTemplate, QueryTemplateProps } from '../../query_template';
+import { withKibana, WithKibanaProps } from '../../../lib/kibana';
 
 import { EventsOverTimeGqlQuery } from './events_over_time.gql_query';
 import { GetEventsOverTimeQuery, MatrixOverTimeHistogramData } from '../../../graphql/types';
@@ -40,7 +41,7 @@ export interface EventsOverTimeComponentReduxProps {
   isInspected: boolean;
 }
 
-type EventsOverTimeProps = OwnProps & EventsOverTimeComponentReduxProps;
+type EventsOverTimeProps = OwnProps & EventsOverTimeComponentReduxProps & WithKibanaProps;
 
 class EventsOverTimeComponentQuery extends QueryTemplate<
   EventsOverTimeProps,
@@ -54,6 +55,7 @@ class EventsOverTimeComponentQuery extends QueryTemplate<
       filterQuery,
       id = ID,
       isInspected,
+      kibana,
       sourceId,
       startDate,
     } = this.props;
@@ -70,7 +72,7 @@ class EventsOverTimeComponentQuery extends QueryTemplate<
             from: startDate!,
             to: endDate!,
           },
-          defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+          defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
           inspect: isInspected,
         }}
       >
@@ -105,4 +107,7 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-export const EventsOverTimeQuery = connect(makeMapStateToProps)(EventsOverTimeComponentQuery);
+export const EventsOverTimeQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps),
+  withKibana
+)(EventsOverTimeComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/index.ts b/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/index.ts
index 3bfdbae8d30f7..9cae503d30940 100644
--- a/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/index.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/events/last_event_time/index.ts
@@ -7,11 +7,11 @@
 import { get } from 'lodash/fp';
 import React, { useEffect, useState } from 'react';
 
-import chrome from 'ui/chrome';
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
 import { GetLastEventTimeQuery, LastEventIndexKey, LastTimeDetails } from '../../../graphql/types';
 import { inputsModel } from '../../../store';
 import { QueryTemplateProps } from '../../query_template';
+import { useUiSetting$ } from '../../../lib/kibana';
 
 import { LastEventTimeGqlQuery } from './last_event_time.gql_query';
 import { useApolloClient } from '../../../utils/apollo_context';
@@ -38,6 +38,7 @@ export function useLastEventTimeQuery<TCache = object>(
   const [lastSeen, updateLastSeen] = useState<number | null>(null);
   const [errorMessage, updateErrorMessage] = useState<string | null>(null);
   const [currentIndexKey, updateCurrentIndexKey] = useState<LastEventIndexKey | null>(null);
+  const [defaultIndex] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
   const apolloClient = useApolloClient();
   async function fetchLastEventTime(signal: AbortSignal) {
     updateLoading(true);
@@ -50,7 +51,7 @@ export function useLastEventTimeQuery<TCache = object>(
             sourceId,
             indexKey,
             details,
-            defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+            defaultIndex,
           },
           context: {
             fetchOptions: {
diff --git a/x-pack/legacy/plugins/siem/public/containers/global_time/index.tsx b/x-pack/legacy/plugins/siem/public/containers/global_time/index.tsx
index 665148b7ad650..d77e0215f8353 100644
--- a/x-pack/legacy/plugins/siem/public/containers/global_time/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/global_time/index.tsx
@@ -47,33 +47,38 @@ interface OwnProps {
 
 type GlobalTimeProps = OwnProps & GlobalTimeReduxState & GlobalTimeDispatch;
 
-export const GlobalTimeComponent = React.memo(
-  ({ children, deleteAllQuery, deleteOneQuery, from, to, setGlobalQuery }: GlobalTimeProps) => {
-    const [isInitializing, setIsInitializing] = useState(true);
+export const GlobalTimeComponent: React.FC<GlobalTimeProps> = ({
+  children,
+  deleteAllQuery,
+  deleteOneQuery,
+  from,
+  to,
+  setGlobalQuery,
+}) => {
+  const [isInitializing, setIsInitializing] = useState(true);
 
-    useEffect(() => {
-      if (isInitializing) {
-        setIsInitializing(false);
-      }
-      return () => {
-        deleteAllQuery({ id: 'global' });
-      };
-    }, []);
+  useEffect(() => {
+    if (isInitializing) {
+      setIsInitializing(false);
+    }
+    return () => {
+      deleteAllQuery({ id: 'global' });
+    };
+  }, []);
 
-    return (
-      <>
-        {children({
-          isInitializing,
-          from,
-          to,
-          setQuery: ({ id, inspect, loading, refetch }: SetQuery) =>
-            setGlobalQuery({ inputId: 'global', id, inspect, loading, refetch }),
-          deleteQuery: ({ id }: { id: string }) => deleteOneQuery({ inputId: 'global', id }),
-        })}
-      </>
-    );
-  }
-);
+  return (
+    <>
+      {children({
+        isInitializing,
+        from,
+        to,
+        setQuery: ({ id, inspect, loading, refetch }: SetQuery) =>
+          setGlobalQuery({ inputId: 'global', id, inspect, loading, refetch }),
+        deleteQuery: ({ id }: { id: string }) => deleteOneQuery({ inputId: 'global', id }),
+      })}
+    </>
+  );
+};
 
 const mapStateToProps = (state: State) => {
   const timerange: inputsModel.TimeRange = inputsSelectors.globalTimeRangeSelector(state);
@@ -87,4 +92,4 @@ export const GlobalTime = connect(mapStateToProps, {
   deleteAllQuery: inputsActions.deleteAllQuery,
   deleteOneQuery: inputsActions.deleteOneQuery,
   setGlobalQuery: inputsActions.setQuery,
-})(GlobalTimeComponent);
+})(React.memo(GlobalTimeComponent));
diff --git a/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/index.ts b/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/index.ts
index 042de56fbd99d..e36da5bfbe4ee 100644
--- a/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/index.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/hosts/first_last_seen/index.ts
@@ -8,7 +8,7 @@ import ApolloClient from 'apollo-client';
 import { get } from 'lodash/fp';
 import React, { useEffect, useState } from 'react';
 
-import chrome from 'ui/chrome';
+import { useUiSetting$ } from '../../../lib/kibana';
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
 import { GetHostFirstLastSeenQuery } from '../../../graphql/types';
 import { inputsModel } from '../../../store';
@@ -39,6 +39,7 @@ export function useFirstLastSeenHostQuery<TCache = object>(
   const [firstSeen, updateFirstSeen] = useState<Date | null>(null);
   const [lastSeen, updateLastSeen] = useState<Date | null>(null);
   const [errorMessage, updateErrorMessage] = useState<string | null>(null);
+  const [defaultIndex] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
 
   async function fetchFirstLastSeenHost(signal: AbortSignal) {
     updateLoading(true);
@@ -49,7 +50,7 @@ export function useFirstLastSeenHostQuery<TCache = object>(
         variables: {
           sourceId,
           hostName,
-          defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+          defaultIndex,
         },
         context: {
           fetchOptions: {
diff --git a/x-pack/legacy/plugins/siem/public/containers/hosts/index.tsx b/x-pack/legacy/plugins/siem/public/containers/hosts/index.tsx
index d2be29e3e9e29..733c2224d840a 100644
--- a/x-pack/legacy/plugins/siem/public/containers/hosts/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/hosts/index.tsx
@@ -9,8 +9,8 @@ import memoizeOne from 'memoize-one';
 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 {
   Direction,
@@ -22,6 +22,7 @@ import {
 import { hostsModel, hostsSelectors, inputsModel, State, inputsSelectors } from '../../store';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated';
+import { withKibana, WithKibanaProps } from '../../lib/kibana';
 
 import { HostsTableQuery } from './hosts_table.gql_query';
 import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
@@ -57,7 +58,7 @@ export interface HostsComponentReduxProps {
   direction: Direction;
 }
 
-type HostsProps = OwnProps & HostsComponentReduxProps;
+type HostsProps = OwnProps & HostsComponentReduxProps & WithKibanaProps;
 
 class HostsComponentQuery extends QueryTemplatePaginated<
   HostsProps,
@@ -83,12 +84,14 @@ class HostsComponentQuery extends QueryTemplatePaginated<
       direction,
       filterQuery,
       endDate,
+      kibana,
       limit,
       startDate,
       skip,
       sourceId,
       sortField,
     } = this.props;
+    const defaultIndex = kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY);
 
     const variables: GetHostsTableQuery.Variables = {
       sourceId,
@@ -103,7 +106,7 @@ class HostsComponentQuery extends QueryTemplatePaginated<
       },
       pagination: generateTablePaginationOptions(activePage, limit),
       filterQuery: createFilter(filterQuery),
-      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+      defaultIndex,
       inspect: isInspected,
     };
     return (
@@ -174,4 +177,7 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-export const HostsQuery = connect(makeMapStateToProps)(HostsComponentQuery);
+export const HostsQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps),
+  withKibana
+)(HostsComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/hosts/overview/index.tsx b/x-pack/legacy/plugins/siem/public/containers/hosts/overview/index.tsx
index a9223143462fd..5057e872b5313 100644
--- a/x-pack/legacy/plugins/siem/public/containers/hosts/overview/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/hosts/overview/index.tsx
@@ -7,12 +7,14 @@
 import { getOr } from 'lodash/fp';
 import React from 'react';
 import { Query } from 'react-apollo';
-import chrome from 'ui/chrome';
 import { connect } from 'react-redux';
+import { compose } from 'redux';
+
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
 import { inputsModel, inputsSelectors, State } from '../../../store';
 import { getDefaultFetchPolicy } from '../../helpers';
 import { QueryTemplate, QueryTemplateProps } from '../../query_template';
+import { withKibana, WithKibanaProps } from '../../../lib/kibana';
 
 import { HostOverviewQuery } from './host_overview.gql_query';
 import { GetHostOverviewQuery, HostItem } from '../../../graphql/types';
@@ -40,8 +42,10 @@ export interface OwnProps extends QueryTemplateProps {
   endDate: number;
 }
 
+type HostsOverViewProps = OwnProps & HostOverviewReduxProps & WithKibanaProps;
+
 class HostOverviewByNameComponentQuery extends QueryTemplate<
-  OwnProps & HostOverviewReduxProps,
+  HostsOverViewProps,
   GetHostOverviewQuery.Query,
   GetHostOverviewQuery.Variables
 > {
@@ -51,6 +55,7 @@ class HostOverviewByNameComponentQuery extends QueryTemplate<
       isInspected,
       children,
       hostName,
+      kibana,
       skip,
       sourceId,
       startDate,
@@ -70,7 +75,7 @@ class HostOverviewByNameComponentQuery extends QueryTemplate<
             from: startDate,
             to: endDate,
           },
-          defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+          defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
           inspect: isInspected,
         }}
       >
@@ -102,6 +107,7 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-export const HostOverviewByNameQuery = connect(makeMapStateToProps)(
-  HostOverviewByNameComponentQuery
-);
+export const HostOverviewByNameQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps),
+  withKibana
+)(HostOverviewByNameComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/ip_overview/index.tsx b/x-pack/legacy/plugins/siem/public/containers/ip_overview/index.tsx
index 003032493fca2..9576c66c4c9a5 100644
--- a/x-pack/legacy/plugins/siem/public/containers/ip_overview/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/ip_overview/index.tsx
@@ -9,10 +9,10 @@ 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 { GetIpOverviewQuery, IpOverviewData } from '../../graphql/types';
 import { networkModel, inputsModel, inputsSelectors, State } from '../../store';
+import { useUiSetting } from '../../lib/kibana';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { QueryTemplateProps } from '../query_template';
 
@@ -49,7 +49,7 @@ const IpOverviewComponentQuery = React.memo<IpOverviewProps & IpOverviewReduxPro
         sourceId,
         filterQuery: createFilter(filterQuery),
         ip,
-        defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+        defaultIndex: useUiSetting<string[]>(DEFAULT_INDEX_KEY),
         inspect: isInspected,
       }}
     >
diff --git a/x-pack/legacy/plugins/siem/public/containers/kpi_host_details/index.tsx b/x-pack/legacy/plugins/siem/public/containers/kpi_host_details/index.tsx
index 20ed7fa991d15..501bc8472b5e2 100644
--- a/x-pack/legacy/plugins/siem/public/containers/kpi_host_details/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/kpi_host_details/index.tsx
@@ -8,11 +8,11 @@ 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 { KpiHostDetailsData, GetKpiHostDetailsQuery } from '../../graphql/types';
 import { inputsModel, inputsSelectors, State } from '../../store';
+import { useUiSetting } from '../../lib/kibana';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { QueryTemplateProps } from '../query_template';
 
@@ -51,7 +51,7 @@ const KpiHostDetailsComponentQuery = React.memo<QueryKpiHostDetailsProps & KpiHo
           to: endDate!,
         },
         filterQuery: createFilter(filterQuery),
-        defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+        defaultIndex: useUiSetting<string[]>(DEFAULT_INDEX_KEY),
         inspect: isInspected,
       }}
     >
diff --git a/x-pack/legacy/plugins/siem/public/containers/kpi_hosts/index.tsx b/x-pack/legacy/plugins/siem/public/containers/kpi_hosts/index.tsx
index f8aa8aa38e8e1..32472ba6deedf 100644
--- a/x-pack/legacy/plugins/siem/public/containers/kpi_hosts/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/kpi_hosts/index.tsx
@@ -8,11 +8,11 @@ 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 { GetKpiHostsQuery, KpiHostsData } from '../../graphql/types';
 import { inputsModel, inputsSelectors, State } from '../../store';
+import { useUiSetting } from '../../lib/kibana';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { QueryTemplateProps } from '../query_template';
 
@@ -51,7 +51,7 @@ const KpiHostsComponentQuery = React.memo<KpiHostsProps & KpiHostsReducer>(
           to: endDate!,
         },
         filterQuery: createFilter(filterQuery),
-        defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+        defaultIndex: useUiSetting<string[]>(DEFAULT_INDEX_KEY),
         inspect: isInspected,
       }}
     >
diff --git a/x-pack/legacy/plugins/siem/public/containers/kpi_network/index.tsx b/x-pack/legacy/plugins/siem/public/containers/kpi_network/index.tsx
index 269c3593d4d73..52b8814958ba0 100644
--- a/x-pack/legacy/plugins/siem/public/containers/kpi_network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/kpi_network/index.tsx
@@ -8,11 +8,11 @@ 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 { GetKpiNetworkQuery, KpiNetworkData } from '../../graphql/types';
 import { inputsModel, inputsSelectors, State } from '../../store';
+import { useUiSetting } from '../../lib/kibana';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { QueryTemplateProps } from '../query_template';
 
@@ -51,7 +51,7 @@ const KpiNetworkComponentQuery = React.memo<KpiNetworkProps & KpiNetworkReducer>
           to: endDate!,
         },
         filterQuery: createFilter(filterQuery),
-        defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+        defaultIndex: useUiSetting<string[]>(DEFAULT_INDEX_KEY),
         inspect: isInspected,
       }}
     >
diff --git a/x-pack/legacy/plugins/siem/public/containers/kuery_autocompletion/index.tsx b/x-pack/legacy/plugins/siem/public/containers/kuery_autocompletion/index.tsx
index d06f4f6fbbbfa..6361f7abcf977 100644
--- a/x-pack/legacy/plugins/siem/public/containers/kuery_autocompletion/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/kuery_autocompletion/index.tsx
@@ -9,7 +9,7 @@ import {
   AutocompleteSuggestion,
   IIndexPattern,
 } from '../../../../../../../src/plugins/data/public';
-import { useKibanaPlugins } from '../../lib/compose/kibana_plugins';
+import { useKibana } from '../../lib/kibana';
 
 type RendererResult = React.ReactElement<JSX.Element> | null;
 type RendererFunction<RenderArgs, Result = RendererResult> = (args: RenderArgs) => Result;
@@ -34,13 +34,13 @@ export const KueryAutocompletion = React.memo<KueryAutocompletionLifecycleProps>
       null
     );
     const [suggestions, setSuggestions] = useState<AutocompleteSuggestion[]>([]);
-    const plugins = useKibanaPlugins();
+    const kibana = useKibana();
     const loadSuggestions = async (
       expression: string,
       cursorPosition: number,
       maxSuggestions?: number
     ) => {
-      const autocompletionProvider = plugins.data.autocomplete.getProvider('kuery');
+      const autocompletionProvider = kibana.services.data.autocomplete.getProvider('kuery');
       const config = {
         get: () => true,
       };
diff --git a/x-pack/legacy/plugins/siem/public/containers/network_dns/index.tsx b/x-pack/legacy/plugins/siem/public/containers/network_dns/index.tsx
index 592fe43b9873f..b5ebf3deacd0a 100644
--- a/x-pack/legacy/plugins/siem/public/containers/network_dns/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/network_dns/index.tsx
@@ -8,8 +8,8 @@ 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 {
   GetNetworkDnsQuery,
@@ -19,6 +19,7 @@ import {
   MatrixOverOrdinalHistogramData,
 } from '../../graphql/types';
 import { inputsModel, networkModel, networkSelectors, State, inputsSelectors } from '../../store';
+import { withKibana, WithKibanaProps } from '../../lib/kibana';
 import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated';
@@ -53,7 +54,7 @@ export interface NetworkDnsComponentReduxProps {
   limit: number;
 }
 
-type NetworkDnsProps = OwnProps & NetworkDnsComponentReduxProps;
+type NetworkDnsProps = OwnProps & NetworkDnsComponentReduxProps & WithKibanaProps;
 
 export class NetworkDnsComponentQuery extends QueryTemplatePaginated<
   NetworkDnsProps,
@@ -70,13 +71,14 @@ export class NetworkDnsComponentQuery extends QueryTemplatePaginated<
       id = ID,
       isInspected,
       isPtrIncluded,
+      kibana,
       limit,
       skip,
       sourceId,
       startDate,
     } = this.props;
     const variables: GetNetworkDnsQuery.Variables = {
-      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+      defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
       filterQuery: createFilter(filterQuery),
       inspect: isInspected,
       isPtrIncluded,
@@ -172,7 +174,12 @@ const makeMapHistogramStateToProps = () => {
   return mapStateToProps;
 };
 
-export const NetworkDnsQuery = connect(makeMapStateToProps)(NetworkDnsComponentQuery);
-export const NetworkDnsHistogramQuery = connect(makeMapHistogramStateToProps)(
-  NetworkDnsComponentQuery
-);
+export const NetworkDnsQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps),
+  withKibana
+)(NetworkDnsComponentQuery);
+
+export const NetworkDnsHistogramQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapHistogramStateToProps),
+  withKibana
+)(NetworkDnsComponentQuery);
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
index d76ab53b2de3a..bf4e64f63d559 100644
--- a/x-pack/legacy/plugins/siem/public/containers/network_http/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/network_http/index.tsx
@@ -9,7 +9,6 @@ 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 {
@@ -19,6 +18,7 @@ import {
   PageInfoPaginated,
 } from '../../graphql/types';
 import { inputsModel, inputsSelectors, networkModel, networkSelectors, State } from '../../store';
+import { withKibana, WithKibanaProps } from '../../lib/kibana';
 import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated';
@@ -52,7 +52,7 @@ export interface NetworkHttpComponentReduxProps {
   sort: NetworkHttpSortField;
 }
 
-type NetworkHttpProps = OwnProps & NetworkHttpComponentReduxProps;
+type NetworkHttpProps = OwnProps & NetworkHttpComponentReduxProps & WithKibanaProps;
 
 class NetworkHttpComponentQuery extends QueryTemplatePaginated<
   NetworkHttpProps,
@@ -68,6 +68,7 @@ class NetworkHttpComponentQuery extends QueryTemplatePaginated<
       id = ID,
       ip,
       isInspected,
+      kibana,
       limit,
       skip,
       sourceId,
@@ -75,7 +76,7 @@ class NetworkHttpComponentQuery extends QueryTemplatePaginated<
       startDate,
     } = this.props;
     const variables: GetNetworkHttpQuery.Variables = {
-      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+      defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
       filterQuery: createFilter(filterQuery),
       inspect: isInspected,
       ip,
@@ -150,5 +151,6 @@ const makeMapStateToProps = () => {
 };
 
 export const NetworkHttpQuery = compose<React.ComponentClass<OwnProps>>(
-  connect(makeMapStateToProps)
+  connect(makeMapStateToProps),
+  withKibana
 )(NetworkHttpComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/network_top_countries/index.tsx b/x-pack/legacy/plugins/siem/public/containers/network_top_countries/index.tsx
index b179745dafa51..bd1e1a002bbcd 100644
--- a/x-pack/legacy/plugins/siem/public/containers/network_top_countries/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/network_top_countries/index.tsx
@@ -10,7 +10,6 @@ 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 {
   FlowTargetSourceDest,
@@ -20,6 +19,7 @@ import {
   PageInfoPaginated,
 } from '../../graphql/types';
 import { inputsModel, inputsSelectors, networkModel, networkSelectors, State } from '../../store';
+import { withKibana, WithKibanaProps } from '../../lib/kibana';
 import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated';
@@ -54,7 +54,7 @@ export interface NetworkTopCountriesComponentReduxProps {
   sort: NetworkTopTablesSortField;
 }
 
-type NetworkTopCountriesProps = OwnProps & NetworkTopCountriesComponentReduxProps;
+type NetworkTopCountriesProps = OwnProps & NetworkTopCountriesComponentReduxProps & WithKibanaProps;
 
 class NetworkTopCountriesComponentQuery extends QueryTemplatePaginated<
   NetworkTopCountriesProps,
@@ -68,6 +68,7 @@ class NetworkTopCountriesComponentQuery extends QueryTemplatePaginated<
       endDate,
       flowTarget,
       filterQuery,
+      kibana,
       id = `${ID}-${flowTarget}`,
       ip,
       isInspected,
@@ -78,7 +79,7 @@ class NetworkTopCountriesComponentQuery extends QueryTemplatePaginated<
       sort,
     } = this.props;
     const variables: GetNetworkTopCountriesQuery.Variables = {
-      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+      defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
       filterQuery: createFilter(filterQuery),
       flowTarget,
       inspect: isInspected,
@@ -154,5 +155,6 @@ const makeMapStateToProps = () => {
 };
 
 export const NetworkTopCountriesQuery = compose<React.ComponentClass<OwnProps>>(
-  connect(makeMapStateToProps)
+  connect(makeMapStateToProps),
+  withKibana
 )(NetworkTopCountriesComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/network_top_n_flow/index.tsx b/x-pack/legacy/plugins/siem/public/containers/network_top_n_flow/index.tsx
index 239576a48c49f..f0f1f8257f29f 100644
--- a/x-pack/legacy/plugins/siem/public/containers/network_top_n_flow/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/network_top_n_flow/index.tsx
@@ -9,7 +9,6 @@ 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 {
@@ -19,6 +18,7 @@ import {
   NetworkTopTablesSortField,
   PageInfoPaginated,
 } from '../../graphql/types';
+import { withKibana, WithKibanaProps } from '../../lib/kibana';
 import { inputsModel, inputsSelectors, networkModel, networkSelectors, State } from '../../store';
 import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
@@ -54,7 +54,7 @@ export interface NetworkTopNFlowComponentReduxProps {
   sort: NetworkTopTablesSortField;
 }
 
-type NetworkTopNFlowProps = OwnProps & NetworkTopNFlowComponentReduxProps;
+type NetworkTopNFlowProps = OwnProps & NetworkTopNFlowComponentReduxProps & WithKibanaProps;
 
 class NetworkTopNFlowComponentQuery extends QueryTemplatePaginated<
   NetworkTopNFlowProps,
@@ -68,6 +68,7 @@ class NetworkTopNFlowComponentQuery extends QueryTemplatePaginated<
       endDate,
       flowTarget,
       filterQuery,
+      kibana,
       id = `${ID}-${flowTarget}`,
       ip,
       isInspected,
@@ -78,7 +79,7 @@ class NetworkTopNFlowComponentQuery extends QueryTemplatePaginated<
       sort,
     } = this.props;
     const variables: GetNetworkTopNFlowQuery.Variables = {
-      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+      defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
       filterQuery: createFilter(filterQuery),
       flowTarget,
       inspect: isInspected,
@@ -154,5 +155,6 @@ const makeMapStateToProps = () => {
 };
 
 export const NetworkTopNFlowQuery = compose<React.ComponentClass<OwnProps>>(
-  connect(makeMapStateToProps)
+  connect(makeMapStateToProps),
+  withKibana
 )(NetworkTopNFlowComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/overview/overview_host/index.tsx b/x-pack/legacy/plugins/siem/public/containers/overview/overview_host/index.tsx
index 6ef0ee7b33589..36cadd7872cc8 100644
--- a/x-pack/legacy/plugins/siem/public/containers/overview/overview_host/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/overview/overview_host/index.tsx
@@ -8,10 +8,10 @@ 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 { GetOverviewHostQuery, OverviewHostData } from '../../../graphql/types';
+import { useUiSetting } from '../../../lib/kibana';
 import { inputsModel, inputsSelectors } from '../../../store/inputs';
 import { State } from '../../../store';
 import { createFilter, getDefaultFetchPolicy } from '../../helpers';
@@ -53,7 +53,7 @@ const OverviewHostComponentQuery = React.memo<OverviewHostProps & OverviewHostRe
           to: endDate,
         },
         filterQuery: createFilter(filterQuery),
-        defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+        defaultIndex: useUiSetting<string[]>(DEFAULT_INDEX_KEY),
         inspect: isInspected,
       }}
     >
diff --git a/x-pack/legacy/plugins/siem/public/containers/overview/overview_network/index.tsx b/x-pack/legacy/plugins/siem/public/containers/overview/overview_network/index.tsx
index 677d96c10eee2..9e7d59de0e546 100644
--- a/x-pack/legacy/plugins/siem/public/containers/overview/overview_network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/overview/overview_network/index.tsx
@@ -9,9 +9,9 @@ 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 { GetOverviewNetworkQuery, OverviewNetworkData } from '../../../graphql/types';
+import { useUiSetting } from '../../../lib/kibana';
 import { State } from '../../../store';
 import { inputsModel, inputsSelectors } from '../../../store/inputs';
 import { createFilter, getDefaultFetchPolicy } from '../../helpers';
@@ -55,7 +55,7 @@ export const OverviewNetworkComponentQuery = React.memo<
         to: endDate,
       },
       filterQuery: createFilter(filterQuery),
-      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+      defaultIndex: useUiSetting<string[]>(DEFAULT_INDEX_KEY),
       inspect: isInspected,
     }}
   >
diff --git a/x-pack/legacy/plugins/siem/public/containers/source/index.test.tsx b/x-pack/legacy/plugins/siem/public/containers/source/index.test.tsx
index 7d6ac73357b15..d1a183a402e37 100644
--- a/x-pack/legacy/plugins/siem/public/containers/source/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/source/index.test.tsx
@@ -11,11 +11,11 @@ import { MockedProvider } from 'react-apollo/test-utils';
 
 import { wait } from '../../lib/helpers';
 
-import '../../mock/ui_settings';
-
 import { WithSource, indicesExistOrDataTemporarilyUnavailable } from '.';
 import { mockBrowserFields, mockIndexFields, mocksSource } from './mock';
 
+jest.mock('../../lib/kibana');
+
 describe('Index Fields & Browser Fields', () => {
   test('Index Fields', async () => {
     mount(
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 8bddbd14a367c..94524dedbcd59 100644
--- a/x-pack/legacy/plugins/siem/public/containers/source/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/source/index.tsx
@@ -10,7 +10,7 @@ import { Query } from 'react-apollo';
 import React, { useEffect, useState } from 'react';
 import memoizeOne from 'memoize-one';
 import { IIndexPattern } from 'src/plugins/data/public';
-import chrome from 'ui/chrome';
+import { useUiSetting$ } from '../../lib/kibana';
 
 import { DEFAULT_INDEX_KEY } from '../../../common/constants';
 import { IndexField, SourceQuery } from '../../graphql/types';
@@ -82,6 +82,7 @@ export const getBrowserFields = memoizeOne(
 );
 
 export const WithSource = React.memo<WithSourceProps>(({ children, sourceId }) => {
+  const [defaultIndex] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
   return (
     <Query<SourceQuery.Query, SourceQuery.Variables>
       query={sourceQuery}
@@ -89,20 +90,14 @@ export const WithSource = React.memo<WithSourceProps>(({ children, sourceId }) =
       notifyOnNetworkStatusChange
       variables={{
         sourceId,
-        defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+        defaultIndex,
       }}
     >
       {({ data }) =>
         children({
           indicesExist: get('source.status.indicesExist', data),
           browserFields: getBrowserFields(get('source.status.indexFields', data)),
-          indexPattern: getIndexFields(
-            chrome
-              .getUiSettingsClient()
-              .get(DEFAULT_INDEX_KEY)
-              .join(),
-            get('source.status.indexFields', data)
-          ),
+          indexPattern: getIndexFields(defaultIndex.join(), get('source.status.indexFields', data)),
         })
       }
     </Query>
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 5ff28480f1b3f..22c7b03f34dd5 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
@@ -71,32 +71,38 @@ const getAllTimeline = memoizeOne(
     }))
 );
 
-export const AllTimelinesQuery = React.memo<OwnProps>(
-  ({ children, onlyUserFavorite, pageInfo, search, sort }) => {
-    const variables: GetAllTimeline.Variables = {
-      onlyUserFavorite,
-      pageInfo,
-      search,
-      sort,
-    };
-    return (
-      <Query<GetAllTimeline.Query, GetAllTimeline.Variables>
-        query={allTimelinesQuery}
-        fetchPolicy="network-only"
-        notifyOnNetworkStatusChange
-        variables={variables}
-      >
-        {({ data, loading }) => {
-          return children!({
-            loading,
-            totalCount: getOr(0, 'getAllTimeline.totalCount', data),
-            timelines: getAllTimeline(
-              JSON.stringify(variables),
-              getOr([], 'getAllTimeline.timeline', data)
-            ),
-          });
-        }}
-      </Query>
-    );
-  }
-);
+const AllTimelinesQueryComponent: React.FC<OwnProps> = ({
+  children,
+  onlyUserFavorite,
+  pageInfo,
+  search,
+  sort,
+}) => {
+  const variables: GetAllTimeline.Variables = {
+    onlyUserFavorite,
+    pageInfo,
+    search,
+    sort,
+  };
+  return (
+    <Query<GetAllTimeline.Query, GetAllTimeline.Variables>
+      query={allTimelinesQuery}
+      fetchPolicy="network-only"
+      notifyOnNetworkStatusChange
+      variables={variables}
+    >
+      {({ data, loading }) =>
+        children!({
+          loading,
+          totalCount: getOr(0, 'getAllTimeline.totalCount', data),
+          timelines: getAllTimeline(
+            JSON.stringify(variables),
+            getOr([], 'getAllTimeline.timeline', data)
+          ),
+        })
+      }
+    </Query>
+  );
+};
+
+export const AllTimelinesQuery = React.memo(AllTimelinesQueryComponent);
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 cfb3f8bd8dc77..cf1b8954307e7 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
@@ -8,10 +8,10 @@ import { getOr } from 'lodash/fp';
 import memoizeOne from 'memoize-one';
 import React from 'react';
 import { Query } from 'react-apollo';
-import chrome from 'ui/chrome';
 
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
 import { DetailItem, GetTimelineDetailsQuery } from '../../../graphql/types';
+import { useUiSetting } from '../../../lib/kibana';
 
 import { timelineDetailsQuery } from './index.gql_query';
 
@@ -32,33 +32,39 @@ const getDetailsEvent = memoizeOne(
   (variables: string, detail: DetailItem[]): DetailItem[] => detail
 );
 
-export const TimelineDetailsComponentQuery = React.memo<TimelineDetailsProps>(
-  ({ children, indexName, eventId, executeQuery, sourceId }) => {
-    const variables: GetTimelineDetailsQuery.Variables = {
-      sourceId,
-      indexName,
-      eventId,
-      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
-    };
-    return executeQuery ? (
-      <Query<GetTimelineDetailsQuery.Query, GetTimelineDetailsQuery.Variables>
-        query={timelineDetailsQuery}
-        fetchPolicy="network-only"
-        notifyOnNetworkStatusChange
-        variables={variables}
-      >
-        {({ data, loading, refetch }) => {
-          return children!({
-            loading,
-            detailsData: getDetailsEvent(
-              JSON.stringify(variables),
-              getOr([], 'source.TimelineDetails.data', data)
-            ),
-          });
-        }}
-      </Query>
-    ) : (
-      children!({ loading: false, detailsData: null })
-    );
-  }
-);
+const TimelineDetailsQueryComponent: React.FC<TimelineDetailsProps> = ({
+  children,
+  indexName,
+  eventId,
+  executeQuery,
+  sourceId,
+}) => {
+  const variables: GetTimelineDetailsQuery.Variables = {
+    sourceId,
+    indexName,
+    eventId,
+    defaultIndex: useUiSetting<string[]>(DEFAULT_INDEX_KEY),
+  };
+  return executeQuery ? (
+    <Query<GetTimelineDetailsQuery.Query, GetTimelineDetailsQuery.Variables>
+      query={timelineDetailsQuery}
+      fetchPolicy="network-only"
+      notifyOnNetworkStatusChange
+      variables={variables}
+    >
+      {({ data, loading, refetch }) =>
+        children!({
+          loading,
+          detailsData: getDetailsEvent(
+            JSON.stringify(variables),
+            getOr([], 'source.TimelineDetails.data', data)
+          ),
+        })
+      }
+    </Query>
+  ) : (
+    children!({ loading: false, detailsData: null })
+  );
+};
+
+export const TimelineDetailsQuery = React.memo(TimelineDetailsQueryComponent);
diff --git a/x-pack/legacy/plugins/siem/public/containers/timeline/index.tsx b/x-pack/legacy/plugins/siem/public/containers/timeline/index.tsx
index 40ed3b3747c10..f7c2d067a29f5 100644
--- a/x-pack/legacy/plugins/siem/public/containers/timeline/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/timeline/index.tsx
@@ -8,9 +8,9 @@ import { getOr } from 'lodash/fp';
 import memoizeOne from 'memoize-one';
 import React from 'react';
 import { Query } from 'react-apollo';
-
-import chrome from 'ui/chrome';
+import { compose } from 'redux';
 import { connect } from 'react-redux';
+
 import { DEFAULT_INDEX_KEY } from '../../../common/constants';
 import {
   GetTimelineQuery,
@@ -20,6 +20,7 @@ import {
   TimelineItem,
 } from '../../graphql/types';
 import { inputsModel, inputsSelectors, State } from '../../store';
+import { withKibana, WithKibanaProps } from '../../lib/kibana';
 import { createFilter } from '../helpers';
 import { QueryTemplate, QueryTemplateProps } from '../query_template';
 
@@ -50,7 +51,7 @@ export interface OwnProps extends QueryTemplateProps {
   sortField: SortField;
   fields: string[];
 }
-type TimelineQueryProps = OwnProps & TimelineQueryReduxProps;
+type TimelineQueryProps = OwnProps & TimelineQueryReduxProps & WithKibanaProps;
 
 class TimelineQueryComponent extends QueryTemplate<
   TimelineQueryProps,
@@ -71,6 +72,7 @@ class TimelineQueryComponent extends QueryTemplate<
       id,
       indexPattern,
       isInspected,
+      kibana,
       limit,
       fields,
       filterQuery,
@@ -84,7 +86,8 @@ class TimelineQueryComponent extends QueryTemplate<
       pagination: { limit, cursor: null, tiebreaker: null },
       sortField,
       defaultIndex:
-        indexPattern?.title.split(',') ?? chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+        indexPattern?.title.split(',') ??
+        kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
       inspect: isInspected,
     };
     return (
@@ -158,4 +161,7 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-export const TimelineQuery = connect(makeMapStateToProps)(TimelineQueryComponent);
+export const TimelineQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps),
+  withKibana
+)(TimelineQueryComponent);
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 7abe14ae745c5..3738355c8846e 100644
--- a/x-pack/legacy/plugins/siem/public/containers/tls/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/tls/index.tsx
@@ -10,7 +10,6 @@ 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 {
   PageInfoPaginated,
@@ -20,6 +19,7 @@ import {
   FlowTargetSourceDest,
 } from '../../graphql/types';
 import { inputsModel, networkModel, networkSelectors, State, inputsSelectors } from '../../store';
+import { withKibana, WithKibanaProps } from '../../lib/kibana';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
 import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated';
@@ -53,7 +53,7 @@ export interface TlsComponentReduxProps {
   sort: TlsSortField;
 }
 
-type TlsProps = OwnProps & TlsComponentReduxProps;
+type TlsProps = OwnProps & TlsComponentReduxProps & WithKibanaProps;
 
 class TlsComponentQuery extends QueryTemplatePaginated<
   TlsProps,
@@ -70,6 +70,7 @@ class TlsComponentQuery extends QueryTemplatePaginated<
       id = ID,
       ip,
       isInspected,
+      kibana,
       limit,
       skip,
       sourceId,
@@ -77,7 +78,7 @@ class TlsComponentQuery extends QueryTemplatePaginated<
       sort,
     } = this.props;
     const variables: GetTlsQuery.Variables = {
-      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+      defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
       filterQuery: createFilter(filterQuery),
       flowTarget,
       inspect: isInspected,
@@ -152,6 +153,7 @@ const makeMapStateToProps = () => {
   };
 };
 
-export const TlsQuery = compose<React.ComponentClass<OwnProps>>(connect(makeMapStateToProps))(
-  TlsComponentQuery
-);
+export const TlsQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps),
+  withKibana
+)(TlsComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/uncommon_processes/index.tsx b/x-pack/legacy/plugins/siem/public/containers/uncommon_processes/index.tsx
index e623110fb7178..520ade954eb5c 100644
--- a/x-pack/legacy/plugins/siem/public/containers/uncommon_processes/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/uncommon_processes/index.tsx
@@ -8,8 +8,8 @@ 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 {
   GetUncommonProcessesQuery,
@@ -17,6 +17,7 @@ import {
   UncommonProcessesEdges,
 } from '../../graphql/types';
 import { hostsModel, hostsSelectors, inputsModel, State, inputsSelectors } from '../../store';
+import { withKibana, WithKibanaProps } from '../../lib/kibana';
 import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated';
@@ -48,7 +49,7 @@ export interface UncommonProcessesComponentReduxProps {
   limit: number;
 }
 
-type UncommonProcessesProps = OwnProps & UncommonProcessesComponentReduxProps;
+type UncommonProcessesProps = OwnProps & UncommonProcessesComponentReduxProps & WithKibanaProps;
 
 class UncommonProcessesComponentQuery extends QueryTemplatePaginated<
   UncommonProcessesProps,
@@ -63,13 +64,14 @@ class UncommonProcessesComponentQuery extends QueryTemplatePaginated<
       filterQuery,
       id = ID,
       isInspected,
+      kibana,
       limit,
       skip,
       sourceId,
       startDate,
     } = this.props;
     const variables: GetUncommonProcessesQuery.Variables = {
-      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+      defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
       filterQuery: createFilter(filterQuery),
       inspect: isInspected,
       pagination: generateTablePaginationOptions(activePage, limit),
@@ -142,4 +144,7 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-export const UncommonProcessesQuery = connect(makeMapStateToProps)(UncommonProcessesComponentQuery);
+export const UncommonProcessesQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps),
+  withKibana
+)(UncommonProcessesComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/containers/users/index.tsx b/x-pack/legacy/plugins/siem/public/containers/users/index.tsx
index ea6453b5c5dd4..ece73b7b10ff0 100644
--- a/x-pack/legacy/plugins/siem/public/containers/users/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/containers/users/index.tsx
@@ -8,8 +8,8 @@ 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 {
   GetUsersQuery,
@@ -19,6 +19,7 @@ import {
   UsersSortField,
 } from '../../graphql/types';
 import { inputsModel, networkModel, networkSelectors, State, inputsSelectors } from '../../store';
+import { withKibana, WithKibanaProps } from '../../lib/kibana';
 import { createFilter, getDefaultFetchPolicy } from '../helpers';
 import { generateTablePaginationOptions } from '../../components/paginated_table/helpers';
 import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated';
@@ -53,7 +54,7 @@ export interface UsersComponentReduxProps {
   sort: UsersSortField;
 }
 
-type UsersProps = OwnProps & UsersComponentReduxProps;
+type UsersProps = OwnProps & UsersComponentReduxProps & WithKibanaProps;
 
 class UsersComponentQuery extends QueryTemplatePaginated<
   UsersProps,
@@ -70,6 +71,7 @@ class UsersComponentQuery extends QueryTemplatePaginated<
       id = ID,
       ip,
       isInspected,
+      kibana,
       limit,
       skip,
       sourceId,
@@ -77,7 +79,7 @@ class UsersComponentQuery extends QueryTemplatePaginated<
       sort,
     } = this.props;
     const variables: GetUsersQuery.Variables = {
-      defaultIndex: chrome.getUiSettingsClient().get(DEFAULT_INDEX_KEY),
+      defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
       filterQuery: createFilter(filterQuery),
       flowTarget,
       inspect: isInspected,
@@ -154,4 +156,7 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-export const UsersQuery = connect(makeMapStateToProps)(UsersComponentQuery);
+export const UsersQuery = compose<React.ComponentClass<OwnProps>>(
+  connect(makeMapStateToProps),
+  withKibana
+)(UsersComponentQuery);
diff --git a/x-pack/legacy/plugins/siem/public/graphql/introspection.json b/x-pack/legacy/plugins/siem/public/graphql/introspection.json
index 7c173a9a90626..8ebc66b7f38a7 100644
--- a/x-pack/legacy/plugins/siem/public/graphql/introspection.json
+++ b/x-pack/legacy/plugins/siem/public/graphql/introspection.json
@@ -666,6 +666,53 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "AlertsHistogram",
+            "description": "",
+            "args": [
+              {
+                "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
+              },
+              {
+                "name": "timerange",
+                "description": "",
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": { "kind": "INPUT_OBJECT", "name": "TimerangeInput", "ofType": null }
+                },
+                "defaultValue": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": { "kind": "OBJECT", "name": "AlertsOverTimeData", "ofType": null }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "AnomaliesOverTime",
             "description": "",
@@ -2540,7 +2587,7 @@
       },
       {
         "kind": "OBJECT",
-        "name": "AnomaliesOverTimeData",
+        "name": "AlertsOverTimeData",
         "description": "",
         "fields": [
           {
@@ -2552,7 +2599,7 @@
             "deprecationReason": null
           },
           {
-            "name": "anomaliesOverTime",
+            "name": "alertsOverTimeByModule",
             "description": "",
             "args": [],
             "type": {
@@ -2691,6 +2738,61 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "AnomaliesOverTimeData",
+        "description": "",
+        "fields": [
+          {
+            "name": "inspect",
+            "description": "",
+            "args": [],
+            "type": { "kind": "OBJECT", "name": "Inspect", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "anomaliesOverTime",
+            "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": "INPUT_OBJECT",
         "name": "PaginationInputPaginated",
diff --git a/x-pack/legacy/plugins/siem/public/graphql/types.ts b/x-pack/legacy/plugins/siem/public/graphql/types.ts
index 1464b55648035..6dfde08058f7c 100644
--- a/x-pack/legacy/plugins/siem/public/graphql/types.ts
+++ b/x-pack/legacy/plugins/siem/public/graphql/types.ts
@@ -457,6 +457,8 @@ export interface Source {
   /** The status of the source */
   status: SourceStatus;
 
+  AlertsHistogram: AlertsOverTimeData;
+
   AnomaliesOverTime: AnomaliesOverTimeData;
   /** Gets Authentication success and failures based on a timerange */
   Authentications: AuthenticationsData;
@@ -558,10 +560,10 @@ export interface IndexField {
   format?: Maybe<string>;
 }
 
-export interface AnomaliesOverTimeData {
+export interface AlertsOverTimeData {
   inspect?: Maybe<Inspect>;
 
-  anomaliesOverTime: MatrixOverTimeHistogramData[];
+  alertsOverTimeByModule: MatrixOverTimeHistogramData[];
 
   totalCount: number;
 }
@@ -580,6 +582,14 @@ export interface MatrixOverTimeHistogramData {
   g: string;
 }
 
+export interface AnomaliesOverTimeData {
+  inspect?: Maybe<Inspect>;
+
+  anomaliesOverTime: MatrixOverTimeHistogramData[];
+
+  totalCount: number;
+}
+
 export interface AuthenticationsData {
   edges: AuthenticationsEdges[];
 
@@ -2137,6 +2147,13 @@ export interface GetAllTimelineQueryArgs {
 
   onlyUserFavorite?: Maybe<boolean>;
 }
+export interface AlertsHistogramSourceArgs {
+  filterQuery?: Maybe<string>;
+
+  defaultIndex: string[];
+
+  timerange: TimerangeInput;
+}
 export interface AnomaliesOverTimeSourceArgs {
   timerange: TimerangeInput;
 
@@ -2438,6 +2455,58 @@ export interface DeleteTimelineMutationArgs {
 // Documents
 // ====================================================
 
+export namespace GetAlertsOverTimeQuery {
+  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;
+
+    AlertsHistogram: AlertsHistogram;
+  };
+
+  export type AlertsHistogram = {
+    __typename?: 'AlertsOverTimeData';
+
+    alertsOverTimeByModule: AlertsOverTimeByModule[];
+
+    totalCount: number;
+
+    inspect: Maybe<Inspect>;
+  };
+
+  export type AlertsOverTimeByModule = {
+    __typename?: 'MatrixOverTimeHistogramData';
+
+    x: number;
+
+    y: number;
+
+    g: string;
+  };
+
+  export type Inspect = {
+    __typename?: 'Inspect';
+
+    dsl: string[];
+
+    response: string[];
+  };
+}
+
 export namespace GetAnomaliesOverTimeQuery {
   export type Variables = {
     sourceId: string;
diff --git a/x-pack/legacy/plugins/siem/public/hooks/api/api.tsx b/x-pack/legacy/plugins/siem/public/hooks/api/api.tsx
index 12282241247cb..8d319ffe23902 100644
--- a/x-pack/legacy/plugins/siem/public/hooks/api/api.tsx
+++ b/x-pack/legacy/plugins/siem/public/hooks/api/api.tsx
@@ -17,13 +17,9 @@ const emptyIndexPattern: IndexPatternSavedObject[] = [];
  *
  * TODO: Refactor to context provider: https://github.com/elastic/siem-team/issues/448
  *
- * @param headers
  * @param signal
  */
-export const getIndexPatterns = async (
-  signal: AbortSignal,
-  kbnVersion: string
-): Promise<IndexPatternSavedObject[]> => {
+export const getIndexPatterns = async (signal: AbortSignal): Promise<IndexPatternSavedObject[]> => {
   const response = await fetch(
     `${chrome.getBasePath()}/api/saved_objects/_find?type=index-pattern&fields=title&fields=type&per_page=10000`,
     {
@@ -31,9 +27,8 @@ export const getIndexPatterns = async (
       credentials: 'same-origin',
       headers: {
         'content-type': 'application/json',
-        'kbn-xsrf': kbnVersion,
-        'kbn-version': kbnVersion,
         'kbn-system-api': 'true',
+        'kbn-xsrf': 'true',
       },
       signal,
     }
diff --git a/x-pack/legacy/plugins/siem/public/hooks/index.ts b/x-pack/legacy/plugins/siem/public/hooks/index.ts
new file mode 100644
index 0000000000000..5049e4587d383
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/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 { useDateFormat, useTimeZone } from './use_ui_settings';
diff --git a/x-pack/legacy/plugins/siem/public/hooks/use_index_patterns.tsx b/x-pack/legacy/plugins/siem/public/hooks/use_index_patterns.tsx
index 091315df314d9..7abe88402096c 100644
--- a/x-pack/legacy/plugins/siem/public/hooks/use_index_patterns.tsx
+++ b/x-pack/legacy/plugins/siem/public/hooks/use_index_patterns.tsx
@@ -6,11 +6,9 @@
 
 import { useEffect, useState } from 'react';
 
-import { DEFAULT_KBN_VERSION } from '../../common/constants';
 import { useStateToaster } from '../components/toasters';
 import { errorToToaster } from '../components/ml/api/error_to_toaster';
 import { IndexPatternSavedObject } from '../components/ml_popover/types';
-import { useKibanaUiSetting } from '../lib/settings/use_kibana_ui_setting';
 
 import { getIndexPatterns } from './api/api';
 import * as i18n from './translations';
@@ -21,7 +19,6 @@ export const useIndexPatterns = (refreshToggle = false): Return => {
   const [indexPatterns, setIndexPatterns] = useState<IndexPatternSavedObject[]>([]);
   const [isLoading, setIsLoading] = useState(true);
   const [, dispatchToaster] = useStateToaster();
-  const [kbnVersion] = useKibanaUiSetting(DEFAULT_KBN_VERSION);
 
   useEffect(() => {
     let isSubscribed = true;
@@ -30,7 +27,7 @@ export const useIndexPatterns = (refreshToggle = false): Return => {
 
     async function fetchIndexPatterns() {
       try {
-        const data = await getIndexPatterns(abortCtrl.signal, kbnVersion);
+        const data = await getIndexPatterns(abortCtrl.signal);
 
         if (isSubscribed) {
           setIndexPatterns(data);
diff --git a/x-pack/legacy/plugins/siem/public/hooks/use_ui_settings.ts b/x-pack/legacy/plugins/siem/public/hooks/use_ui_settings.ts
new file mode 100644
index 0000000000000..7eb0242e8e116
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/hooks/use_ui_settings.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import moment from 'moment-timezone';
+
+import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_FORMAT_TZ } from '../../common/constants';
+import { useUiSetting } from '../lib/kibana';
+
+export const useDateFormat = (): string => useUiSetting<string>(DEFAULT_DATE_FORMAT);
+
+export const useTimeZone = (): string => {
+  const timeZone = useUiSetting<string>(DEFAULT_DATE_FORMAT_TZ);
+  return timeZone === 'Browser' ? moment.tz.guess() : timeZone;
+};
diff --git a/x-pack/legacy/plugins/siem/public/index.ts b/x-pack/legacy/plugins/siem/public/index.ts
new file mode 100644
index 0000000000000..3a396a0637ea1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/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.
+ */
+
+import { Plugin, PluginInitializerContext } from './plugin';
+
+export const plugin = (context: PluginInitializerContext): Plugin => new Plugin(context);
diff --git a/x-pack/legacy/plugins/siem/public/legacy.ts b/x-pack/legacy/plugins/siem/public/legacy.ts
new file mode 100644
index 0000000000000..49a03c93120d4
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/legacy.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { npSetup, npStart } from 'ui/new_platform';
+
+import { PluginInitializerContext } from '../../../../../src/core/public';
+import { plugin } from './';
+
+const pluginInstance = plugin({} as PluginInitializerContext);
+
+pluginInstance.setup(npSetup.core, npSetup.plugins);
+pluginInstance.start(npStart.core, npStart.plugins);
diff --git a/x-pack/legacy/plugins/siem/public/lib/clipboard/clipboard.tsx b/x-pack/legacy/plugins/siem/public/lib/clipboard/clipboard.tsx
index 44cf7502f3c5e..fdb6ed130a525 100644
--- a/x-pack/legacy/plugins/siem/public/lib/clipboard/clipboard.tsx
+++ b/x-pack/legacy/plugins/siem/public/lib/clipboard/clipboard.tsx
@@ -6,7 +6,7 @@
 
 import { EuiGlobalToastListToast as Toast, EuiButtonIcon } from '@elastic/eui';
 import copy from 'copy-to-clipboard';
-import * as React from 'react';
+import React from 'react';
 import uuid from 'uuid';
 
 import * as i18n from './translations';
diff --git a/x-pack/legacy/plugins/siem/public/lib/clipboard/with_copy_to_clipboard.tsx b/x-pack/legacy/plugins/siem/public/lib/clipboard/with_copy_to_clipboard.tsx
index c392c2511551f..ee94c2daa3fc4 100644
--- a/x-pack/legacy/plugins/siem/public/lib/clipboard/with_copy_to_clipboard.tsx
+++ b/x-pack/legacy/plugins/siem/public/lib/clipboard/with_copy_to_clipboard.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 styled from 'styled-components';
 
 import { Clipboard } from './clipboard';
diff --git a/x-pack/legacy/plugins/siem/public/lib/compose/__mocks__/kibana_core.ts b/x-pack/legacy/plugins/siem/public/lib/compose/__mocks__/kibana_core.ts
deleted file mode 100644
index 7511f65dfb309..0000000000000
--- a/x-pack/legacy/plugins/siem/public/lib/compose/__mocks__/kibana_core.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 { createUiNewPlatformMock } from 'ui/new_platform/__mocks__/helpers';
-
-const npStart = createUiNewPlatformMock().npStart;
-
-export function useKibanaCore() {
-  return npStart.core;
-}
diff --git a/x-pack/legacy/plugins/siem/public/lib/compose/__mocks__/kibana_plugins.ts b/x-pack/legacy/plugins/siem/public/lib/compose/__mocks__/kibana_plugins.ts
deleted file mode 100644
index ab255f7c73a06..0000000000000
--- a/x-pack/legacy/plugins/siem/public/lib/compose/__mocks__/kibana_plugins.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 { createUiNewPlatformMock } from 'ui/new_platform/__mocks__/helpers';
-
-const npStart = createUiNewPlatformMock().npStart;
-
-export function useKibanaPlugins() {
-  return npStart.plugins;
-}
diff --git a/x-pack/legacy/plugins/siem/public/lib/compose/helpers.ts b/x-pack/legacy/plugins/siem/public/lib/compose/helpers.ts
index 80a42b91dbd32..9cdd4148134ad 100644
--- a/x-pack/legacy/plugins/siem/public/lib/compose/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/lib/compose/helpers.ts
@@ -20,9 +20,7 @@ export const getLinks = (cache: InMemoryCache) => [
   }),
   new HttpLink({
     credentials: 'same-origin',
-    headers: {
-      'kbn-xsrf': chrome.getXsrfToken(),
-    },
+    headers: { 'kbn-xsrf': 'true' },
     uri: `${chrome.getBasePath()}/api/siem/graphql`,
   }),
 ];
diff --git a/x-pack/legacy/plugins/siem/public/lib/compose/kibana_core.tsx b/x-pack/legacy/plugins/siem/public/lib/compose/kibana_core.tsx
deleted file mode 100644
index f2fa261bf3eb4..0000000000000
--- a/x-pack/legacy/plugins/siem/public/lib/compose/kibana_core.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { createContext, useContext } from 'react';
-import { LegacyCoreStart } from 'src/core/public';
-
-interface CoreMountContext {
-  core: LegacyCoreStart;
-}
-
-// TODO: Replace CoreStart/CoreSetup with AppMountContext
-// see: https://github.com/elastic/kibana/pull/41007
-
-export const KibanaCoreContext = createContext({} as CoreMountContext['core']);
-
-export const KibanaCoreContextProvider: React.FC<{ core: CoreMountContext['core'] }> = props => (
-  <KibanaCoreContext.Provider {...props} value={props.core} children={props.children} />
-);
-
-export function useKibanaCore() {
-  return useContext(KibanaCoreContext);
-}
diff --git a/x-pack/legacy/plugins/siem/public/lib/compose/kibana_plugins.tsx b/x-pack/legacy/plugins/siem/public/lib/compose/kibana_plugins.tsx
deleted file mode 100644
index 7d1f1bc01edd3..0000000000000
--- a/x-pack/legacy/plugins/siem/public/lib/compose/kibana_plugins.tsx
+++ /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 React, { createContext, useContext } from 'react';
-import { PluginsStart } from 'ui/new_platform/new_platform';
-
-interface PluginsMountContext {
-  plugins: PluginsStart;
-}
-
-// TODO: Replace CoreStart/CoreSetup with AppMountContext
-// see: https://github.com/elastic/kibana/pull/41007
-
-export const KibanaPluginsContext = createContext({} as PluginsMountContext['plugins']);
-
-export const KibanaPluginsContextProvider: React.FC<{
-  plugins: PluginsMountContext['plugins'];
-}> = props => (
-  <KibanaPluginsContext.Provider {...props} value={props.plugins} children={props.children} />
-);
-
-export function useKibanaPlugins() {
-  return useContext(KibanaPluginsContext);
-}
diff --git a/x-pack/legacy/plugins/siem/public/lib/kibana/__mocks__/index.ts b/x-pack/legacy/plugins/siem/public/lib/kibana/__mocks__/index.ts
new file mode 100644
index 0000000000000..93fd37c4d14cb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/lib/kibana/__mocks__/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  createKibanaContextProviderMock,
+  createUseUiSettingMock,
+  createUseUiSetting$Mock,
+  createUseKibanaMock,
+  createWithKibanaMock,
+} from '../../../mock/kibana_react';
+
+export const useKibana = jest.fn(createUseKibanaMock());
+export const useUiSetting = jest.fn(createUseUiSettingMock());
+export const useUiSetting$ = jest.fn(createUseUiSetting$Mock());
+export const withKibana = jest.fn(createWithKibanaMock());
+export const KibanaContextProvider = jest.fn(createKibanaContextProviderMock());
diff --git a/x-pack/legacy/plugins/siem/public/lib/kibana/index.ts b/x-pack/legacy/plugins/siem/public/lib/kibana/index.ts
new file mode 100644
index 0000000000000..012a1cfef5da2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/lib/kibana/index.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 {
+  KibanaContextProvider,
+  KibanaReactContextValue,
+  useKibana,
+  useUiSetting,
+  useUiSetting$,
+  withKibana,
+} from '../../../../../../../src/plugins/kibana_react/public';
+import { StartServices } from '../../plugin';
+
+export type KibanaContext = KibanaReactContextValue<StartServices>;
+export interface WithKibanaProps {
+  kibana: KibanaContext;
+}
+
+// eslint-disable-next-line react-hooks/rules-of-hooks
+const typedUseKibana = () => useKibana<StartServices>();
+
+export {
+  KibanaContextProvider,
+  typedUseKibana as useKibana,
+  useUiSetting,
+  useUiSetting$,
+  withKibana,
+};
diff --git a/x-pack/legacy/plugins/siem/public/lib/lib.ts b/x-pack/legacy/plugins/siem/public/lib/lib.ts
index 7a6cd32aa8864..e7b39d2ea50f9 100644
--- a/x-pack/legacy/plugins/siem/public/lib/lib.ts
+++ b/x-pack/legacy/plugins/siem/public/lib/lib.ts
@@ -24,7 +24,6 @@ export interface AppFrameworkAdapter {
   darkMode?: boolean;
   indexPattern?: string;
   anomalyScore?: number;
-  kbnVersion?: string;
   scaledDateFormat?: string;
   timezone?: string;
 
diff --git a/x-pack/legacy/plugins/siem/public/lib/settings/__mocks__/use_kibana_ui_setting.ts b/x-pack/legacy/plugins/siem/public/lib/settings/__mocks__/use_kibana_ui_setting.ts
deleted file mode 100644
index 9f5639ce19997..0000000000000
--- a/x-pack/legacy/plugins/siem/public/lib/settings/__mocks__/use_kibana_ui_setting.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 { mockFrameworks, getMockKibanaUiSetting } from '../../../mock';
-
-type GenericValue = string | boolean | number;
-
-export const useKibanaUiSetting = (key: string, defaultValue?: GenericValue) => {
-  return getMockKibanaUiSetting(mockFrameworks.default_UTC)(key);
-};
diff --git a/x-pack/legacy/plugins/siem/public/lib/settings/use_kibana_ui_setting.ts b/x-pack/legacy/plugins/siem/public/lib/settings/use_kibana_ui_setting.ts
deleted file mode 100644
index 0a89edb85e6ea..0000000000000
--- a/x-pack/legacy/plugins/siem/public/lib/settings/use_kibana_ui_setting.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 { useCallback, useMemo } from 'react';
-// @ts-ignore: path dynamic for kibana
-import { timezoneProvider } from 'ui/vis/lib/timezone';
-
-import { DEFAULT_KBN_VERSION, DEFAULT_TIMEZONE_BROWSER } from '../../../common/constants';
-import { useKibanaCore } from '../compose/kibana_core';
-import { useObservable } from './use_observable';
-
-type GenericValue = string | boolean | number;
-
-/**
- * This hook behaves like a `useState` hook in that it provides a requested
- * setting value (with an optional default) from the Kibana UI settings (also
- * known as "advanced settings") and a setter to change that setting:
- *
- * ```
- * const [darkMode, setDarkMode] = useKibanaUiSetting('theme:darkMode');
- * ```
- *
- * This is not just a static consumption of the value, but will reactively
- * update when the underlying setting subscription of the `UiSettingsClient`
- * notifies of a change.
- *
- * Unlike the `useState`, it doesn't give type guarantees for the value,
- * because the underlying `UiSettingsClient` doesn't support that.
- */
-export const useKibanaUiSetting = (key: string, defaultValue?: GenericValue) => {
-  const core = useKibanaCore();
-  const uiSettingsClient = core.uiSettings;
-  const uiInjectedMetadata = core.injectedMetadata;
-
-  if (key === DEFAULT_KBN_VERSION) {
-    return [uiInjectedMetadata.getKibanaVersion()];
-  }
-
-  /* eslint-disable react-hooks/rules-of-hooks */
-  if (key === DEFAULT_TIMEZONE_BROWSER) {
-    return [useMemo(() => timezoneProvider(uiSettingsClient)(), [uiSettingsClient])];
-  }
-
-  const uiSetting$ = useMemo(() => uiSettingsClient.get$(key, defaultValue), [uiSettingsClient]);
-  const uiSetting = useObservable(uiSetting$);
-  const setUiSetting = useCallback((value: GenericValue) => uiSettingsClient.set(key, value), [
-    uiSettingsClient,
-  ]);
-  /* eslint-enable react-hooks/rules-of-hooks */
-
-  return [uiSetting, setUiSetting];
-};
diff --git a/x-pack/legacy/plugins/siem/public/lib/settings/use_kibana_ui_settings.test.tsx b/x-pack/legacy/plugins/siem/public/lib/settings/use_kibana_ui_settings.test.tsx
deleted file mode 100644
index 9af4759b25608..0000000000000
--- a/x-pack/legacy/plugins/siem/public/lib/settings/use_kibana_ui_settings.test.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 * as React from 'react';
-
-import { DEFAULT_KBN_VERSION, DEFAULT_TIMEZONE_BROWSER } from '../../../common/constants';
-import { HookWrapper } from '../../mock/hook_wrapper';
-import { useKibanaCore } from '../compose/kibana_core';
-import { useKibanaUiSetting } from './use_kibana_ui_setting';
-import { mount } from 'enzyme';
-
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  injectedMetadata: {
-    getKibanaVersion: () => '8.0.0',
-  },
-  uiSettings: {
-    get$: () => 'world',
-  },
-}));
-
-jest.mock('ui/vis/lib/timezone', () => ({
-  timezoneProvider: () => () => 'America/New_York',
-}));
-
-jest.mock('./use_observable', () => ({
-  useObservable: (val: string) => val,
-}));
-
-describe('useKibanaUiSetting', () => {
-  test('getKibanaVersion', () => {
-    const wrapper = mount(<HookWrapper hook={() => useKibanaUiSetting(DEFAULT_KBN_VERSION)} />);
-    expect(wrapper.text()).toEqual('["8.0.0"]');
-  });
-
-  test('getTimezone', () => {
-    const wrapper = mount(
-      <HookWrapper hook={() => useKibanaUiSetting(DEFAULT_TIMEZONE_BROWSER)} />
-    );
-    expect(wrapper.text()).toEqual('["America/New_York"]');
-  });
-
-  test('get any ui settings', () => {
-    const wrapper = mount(<HookWrapper hook={() => useKibanaUiSetting('hello')} />);
-    expect(wrapper.text()).toEqual('["world",null]');
-  });
-});
diff --git a/x-pack/legacy/plugins/siem/public/lib/settings/use_observable.ts b/x-pack/legacy/plugins/siem/public/lib/settings/use_observable.ts
deleted file mode 100644
index 536b6b2723ae0..0000000000000
--- a/x-pack/legacy/plugins/siem/public/lib/settings/use_observable.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 { useEffect, useState } from 'react';
-import { Observable } from 'rxjs';
-
-export function useObservable<T>(observable$: Observable<T>): T | undefined;
-export function useObservable<T>(observable$: Observable<T>, initialValue: T): T;
-export function useObservable<T>(observable$: Observable<T>, initialValue?: T): T | undefined {
-  const [value, update] = useState<T | undefined>(initialValue);
-
-  useEffect(() => {
-    const s = observable$.subscribe(update);
-    return () => s.unsubscribe();
-  }, [observable$]);
-
-  return value;
-}
diff --git a/x-pack/legacy/plugins/siem/public/lib/theme/use_eui_theme.tsx b/x-pack/legacy/plugins/siem/public/lib/theme/use_eui_theme.tsx
index b1defcb34066d..1696001203bc8 100644
--- a/x-pack/legacy/plugins/siem/public/lib/theme/use_eui_theme.tsx
+++ b/x-pack/legacy/plugins/siem/public/lib/theme/use_eui_theme.tsx
@@ -8,9 +8,9 @@ import darkTheme from '@elastic/eui/dist/eui_theme_dark.json';
 import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
 
 import { DEFAULT_DARK_MODE } from '../../../common/constants';
-import { useKibanaUiSetting } from '../settings/use_kibana_ui_setting';
+import { useUiSetting$ } from '../kibana';
 
 export const useEuiTheme = () => {
-  const [darkMode] = useKibanaUiSetting(DEFAULT_DARK_MODE);
+  const [darkMode] = useUiSetting$<boolean>(DEFAULT_DARK_MODE);
   return darkMode ? darkTheme : lightTheme;
 };
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 ada34acbc1946..31e203d080322 100644
--- a/x-pack/legacy/plugins/siem/public/mock/global_state.ts
+++ b/x-pack/legacy/plugins/siem/public/mock/global_state.ts
@@ -45,6 +45,7 @@ export const mockGlobalState: State = {
         events: { activePage: 0, limit: 10 },
         uncommonProcesses: { activePage: 0, limit: 10 },
         anomalies: null,
+        alerts: { activePage: 0, limit: 10 },
       },
     },
     details: {
@@ -59,6 +60,7 @@ export const mockGlobalState: State = {
         events: { activePage: 0, limit: 10 },
         uncommonProcesses: { activePage: 0, limit: 10 },
         anomalies: null,
+        alerts: { activePage: 0, limit: 10 },
       },
     },
   },
@@ -101,6 +103,10 @@ export const mockGlobalState: State = {
           limit: 10,
           sort: { direction: Direction.desc },
         },
+        [networkModel.NetworkTableType.alerts]: {
+          activePage: 0,
+          limit: 10,
+        },
       },
     },
     details: {
@@ -177,6 +183,7 @@ export const mockGlobalState: State = {
     },
     timelineById: {
       test: {
+        deletedEventIds: [],
         id: 'test',
         savedObjectId: null,
         columns: defaultHeaders,
@@ -188,16 +195,21 @@ export const mockGlobalState: State = {
         historyIds: [],
         isFavorite: false,
         isLive: false,
+        isSelectAllChecked: false,
         isLoading: false,
         kqlMode: 'filter',
         kqlQuery: { filterQuery: null, filterQueryDraft: null },
+        loadingEventIds: [],
         title: '',
         noteIds: [],
         dateRange: {
           start: 0,
           end: 0,
         },
+        selectedEventIds: {},
         show: false,
+        showRowRenderers: true,
+        showCheckboxes: false,
         pinnedEventIds: {},
         pinnedEventsSaveObject: {},
         itemsPerPageOptions: [5, 10, 20],
diff --git a/x-pack/legacy/plugins/siem/public/mock/hook_wrapper.tsx b/x-pack/legacy/plugins/siem/public/mock/hook_wrapper.tsx
index 4f1c2049c0027..292ddc036dcaf 100644
--- a/x-pack/legacy/plugins/siem/public/mock/hook_wrapper.tsx
+++ b/x-pack/legacy/plugins/siem/public/mock/hook_wrapper.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';
 
 interface HookWrapperProps {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/x-pack/legacy/plugins/siem/public/mock/index.ts b/x-pack/legacy/plugins/siem/public/mock/index.ts
index 620e266618c5c..dbf5f2e55e713 100644
--- a/x-pack/legacy/plugins/siem/public/mock/index.ts
+++ b/x-pack/legacy/plugins/siem/public/mock/index.ts
@@ -8,7 +8,6 @@ export * from './global_state';
 export * from './header';
 export * from './hook_wrapper';
 export * from './index_pattern';
-export * from './kibana_config';
 export * from './mock_timeline_data';
 export * from './mock_detail_item';
 export * from './netflow';
diff --git a/x-pack/legacy/plugins/siem/public/mock/kibana_config.ts b/x-pack/legacy/plugins/siem/public/mock/kibana_config.ts
deleted file mode 100644
index 23f1f0e86dd6a..0000000000000
--- a/x-pack/legacy/plugins/siem/public/mock/kibana_config.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 {
-  DEFAULT_DATE_FORMAT,
-  DEFAULT_DATE_FORMAT_TZ,
-  DEFAULT_BYTES_FORMAT,
-  DEFAULT_KBN_VERSION,
-  DEFAULT_TIMEZONE_BROWSER,
-  DEFAULT_TIMEPICKER_QUICK_RANGES,
-} from '../../common/constants';
-
-export interface MockFrameworks {
-  bytesFormat: string;
-  dateFormat: string;
-  dateFormatTz: string;
-  timezone: string;
-}
-
-export const getMockKibanaUiSetting = (config: MockFrameworks) => (key: string) => {
-  if (key === DEFAULT_DATE_FORMAT) {
-    return [config.dateFormat];
-  } else if (key === DEFAULT_DATE_FORMAT_TZ) {
-    return [config.dateFormatTz];
-  } else if (key === DEFAULT_BYTES_FORMAT) {
-    return [config.bytesFormat];
-  } else if (key === DEFAULT_KBN_VERSION) {
-    return ['8.0.0'];
-  } else if (key === DEFAULT_TIMEZONE_BROWSER) {
-    return config && config.timezone ? [config.timezone] : ['America/New_York'];
-  } else if (key === DEFAULT_TIMEPICKER_QUICK_RANGES) {
-    return [
-      [
-        {
-          from: 'now/d',
-          to: 'now/d',
-          display: 'Today',
-        },
-        {
-          from: 'now/w',
-          to: 'now/w',
-          display: 'This week',
-        },
-        {
-          from: 'now-15m',
-          to: 'now',
-          display: 'Last 15 minutes',
-        },
-        {
-          from: 'now-30m',
-          to: 'now',
-          display: 'Last 30 minutes',
-        },
-        {
-          from: 'now-1h',
-          to: 'now',
-          display: 'Last 1 hour',
-        },
-        {
-          from: 'now-24h',
-          to: 'now',
-          display: 'Last 24 hours',
-        },
-        {
-          from: 'now-7d',
-          to: 'now',
-          display: 'Last 7 days',
-        },
-        {
-          from: 'now-30d',
-          to: 'now',
-          display: 'Last 30 days',
-        },
-        {
-          from: 'now-90d',
-          to: 'now',
-          display: 'Last 90 days',
-        },
-        {
-          from: 'now-1y',
-          to: 'now',
-          display: 'Last 1 year',
-        },
-      ],
-    ];
-  }
-  return [null];
-};
-
-export const mockFrameworks: Readonly<Record<string, MockFrameworks>> = {
-  bytes_short: {
-    bytesFormat: '0b',
-    dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
-    dateFormatTz: 'Browser',
-    timezone: 'America/Denver',
-  },
-  default_browser: {
-    bytesFormat: '0,0.[0]b',
-    dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
-    dateFormatTz: 'Browser',
-    timezone: 'America/Denver',
-  },
-  default_ET: {
-    bytesFormat: '0,0.[0]b',
-    dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
-    dateFormatTz: 'America/New_York',
-    timezone: 'America/New_York',
-  },
-  default_MT: {
-    bytesFormat: '0,0.[0]b',
-    dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
-    dateFormatTz: 'America/Denver',
-    timezone: 'America/Denver',
-  },
-  default_UTC: {
-    bytesFormat: '0,0.[0]b',
-    dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
-    dateFormatTz: 'UTC',
-    timezone: 'UTC',
-  },
-};
diff --git a/x-pack/legacy/plugins/siem/public/mock/kibana_core.ts b/x-pack/legacy/plugins/siem/public/mock/kibana_core.ts
new file mode 100644
index 0000000000000..cf3523a6260bb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/mock/kibana_core.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 { createUiNewPlatformMock } from 'ui/new_platform/__mocks__/helpers';
+
+export const createKibanaCoreSetupMock = () => createUiNewPlatformMock().npSetup.core;
+export const createKibanaPluginsSetupMock = () => createUiNewPlatformMock().npSetup.plugins;
+
+export const createKibanaCoreStartMock = () => createUiNewPlatformMock().npStart.core;
+export const createKibanaPluginsStartMock = () => createUiNewPlatformMock().npStart.plugins;
diff --git a/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts b/x-pack/legacy/plugins/siem/public/mock/kibana_react.ts
new file mode 100644
index 0000000000000..7d843977d1f32
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/mock/kibana_react.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.
+ */
+
+/* eslint-disable react/display-name */
+
+import React from 'react';
+import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
+
+import {
+  DEFAULT_SIEM_TIME_RANGE,
+  DEFAULT_SIEM_REFRESH_INTERVAL,
+  DEFAULT_INDEX_KEY,
+  DEFAULT_DATE_FORMAT,
+  DEFAULT_DATE_FORMAT_TZ,
+  DEFAULT_DARK_MODE,
+  DEFAULT_TIME_RANGE,
+  DEFAULT_REFRESH_RATE_INTERVAL,
+  DEFAULT_FROM,
+  DEFAULT_TO,
+  DEFAULT_INTERVAL_PAUSE,
+  DEFAULT_INTERVAL_VALUE,
+  DEFAULT_BYTES_FORMAT,
+} from '../../common/constants';
+import { defaultIndexPattern } from '../../default_index_pattern';
+import { createKibanaCoreStartMock, createKibanaPluginsStartMock } from './kibana_core';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const mockUiSettings: Record<string, any> = {
+  [DEFAULT_TIME_RANGE]: { from: 'now-15m', to: 'now', mode: 'quick' },
+  [DEFAULT_REFRESH_RATE_INTERVAL]: { pause: false, value: 0 },
+  [DEFAULT_SIEM_TIME_RANGE]: {
+    from: DEFAULT_FROM,
+    to: DEFAULT_TO,
+  },
+  [DEFAULT_SIEM_REFRESH_INTERVAL]: {
+    pause: DEFAULT_INTERVAL_PAUSE,
+    value: DEFAULT_INTERVAL_VALUE,
+  },
+  [DEFAULT_INDEX_KEY]: defaultIndexPattern,
+  [DEFAULT_BYTES_FORMAT]: '0,0.[0]b',
+  [DEFAULT_DATE_FORMAT_TZ]: 'UTC',
+  [DEFAULT_DATE_FORMAT]: 'MMM D, YYYY @ HH:mm:ss.SSS',
+  [DEFAULT_DARK_MODE]: false,
+};
+
+export const createUseUiSettingMock = () => <T extends unknown = string>(
+  key: string,
+  defaultValue?: T
+): T => {
+  const result = mockUiSettings[key];
+
+  if (typeof result != null) return result;
+
+  if (defaultValue != null) {
+    return defaultValue;
+  }
+
+  throw new Error(`Unexpected config key: ${key}`);
+};
+
+export const createUseUiSetting$Mock = () => {
+  const useUiSettingMock = createUseUiSettingMock();
+
+  return <T extends unknown = string>(
+    key: string,
+    defaultValue?: T
+  ): [T, () => void] | undefined => [useUiSettingMock(key, defaultValue), jest.fn()];
+};
+
+export const createUseKibanaMock = () => {
+  const services = { ...createKibanaCoreStartMock(), ...createKibanaPluginsStartMock() };
+
+  return () => ({ services });
+};
+
+export const createWithKibanaMock = () => {
+  const kibana = createUseKibanaMock()();
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return (Component: any) => (props: any) => {
+    return React.createElement(Component, { ...props, kibana });
+  };
+};
+
+export const createKibanaContextProviderMock = () => {
+  const kibana = createUseKibanaMock()();
+  const uiSettings = {
+    ...kibana.services.uiSettings,
+    get: createUseUiSettingMock(),
+  };
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return ({ services, ...rest }: any) =>
+    React.createElement(KibanaContextProvider, {
+      ...rest,
+      services: { ...kibana.services, uiSettings, ...services },
+    });
+};
diff --git a/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx b/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx
index d4c06d998c5a2..c7692755c1330 100644
--- a/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx
+++ b/x-pack/legacy/plugins/siem/public/mock/test_providers.tsx
@@ -9,7 +9,7 @@ import { I18nProvider } from '@kbn/i18n/react';
 import { InMemoryCache as Cache } from 'apollo-cache-inmemory';
 import ApolloClient from 'apollo-client';
 import { ApolloLink } from 'apollo-link';
-import * as React from 'react';
+import React from 'react';
 import { ApolloProvider } from 'react-apollo';
 import { DragDropContext, DropResult, ResponderProvided } from 'react-beautiful-dnd';
 import { Provider as ReduxStoreProvider } from 'react-redux';
@@ -17,12 +17,9 @@ import { Store } from 'redux';
 import { BehaviorSubject } from 'rxjs';
 import { ThemeProvider } from 'styled-components';
 
-import { CoreStart } from 'src/core/public';
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
-
 import { createStore, State } from '../store';
 import { mockGlobalState } from './global_state';
-import { mockUiSettings } from './ui_settings';
+import { createKibanaContextProviderMock } from './kibana_react';
 
 jest.mock('ui/new_platform');
 
@@ -41,29 +38,6 @@ export const apolloClient = new ApolloClient({
 
 export const apolloClientObservable = new BehaviorSubject(apolloClient);
 
-const services = {
-  uiSettings: mockUiSettings,
-  savedObjects: {} as CoreStart['savedObjects'],
-  notifications: {} as CoreStart['notifications'],
-  docLinks: {
-    links: {
-      query: {
-        kueryQuerySyntax: '',
-      },
-    },
-  } as CoreStart['docLinks'],
-  http: {} as CoreStart['http'],
-  overlays: {} as CoreStart['overlays'],
-  storage: {
-    get: () => {},
-  },
-  data: {
-    query: {
-      savedQueries: {},
-    },
-  },
-};
-
 const localStorageMock = () => {
   let store: Record<string, unknown> = {};
 
@@ -84,27 +58,36 @@ Object.defineProperty(window, 'localStorage', {
   value: localStorageMock(),
 });
 
+const MockKibanaContextProvider = createKibanaContextProviderMock();
+
 /** A utility for wrapping children in the providers required to run most tests */
-export const TestProviders = React.memo<Props>(
-  ({ children, store = createStore(state, apolloClientObservable), onDragEnd = jest.fn() }) => (
-    <I18nProvider>
-      <KibanaContextProvider services={services}>
-        <ApolloProvider client={apolloClient}>
-          <ReduxStoreProvider store={store}>
-            <ThemeProvider theme={() => ({ eui: euiDarkVars, darkMode: true })}>
-              <DragDropContext onDragEnd={onDragEnd}>{children}</DragDropContext>
-            </ThemeProvider>
-          </ReduxStoreProvider>
-        </ApolloProvider>
-      </KibanaContextProvider>
-    </I18nProvider>
-  )
+const TestProvidersComponent: React.FC<Props> = ({
+  children,
+  store = createStore(state, apolloClientObservable),
+  onDragEnd = jest.fn(),
+}) => (
+  <I18nProvider>
+    <MockKibanaContextProvider>
+      <ApolloProvider client={apolloClient}>
+        <ReduxStoreProvider store={store}>
+          <ThemeProvider theme={() => ({ eui: euiDarkVars, darkMode: true })}>
+            <DragDropContext onDragEnd={onDragEnd}>{children}</DragDropContext>
+          </ThemeProvider>
+        </ReduxStoreProvider>
+      </ApolloProvider>
+    </MockKibanaContextProvider>
+  </I18nProvider>
 );
 
-export const TestProviderWithoutDragAndDrop = React.memo<Props>(
-  ({ children, store = createStore(state, apolloClientObservable) }) => (
-    <I18nProvider>
-      <ReduxStoreProvider store={store}>{children}</ReduxStoreProvider>
-    </I18nProvider>
-  )
+export const TestProviders = React.memo(TestProvidersComponent);
+
+const TestProviderWithoutDragAndDropComponent: React.FC<Props> = ({
+  children,
+  store = createStore(state, apolloClientObservable),
+}) => (
+  <I18nProvider>
+    <ReduxStoreProvider store={store}>{children}</ReduxStoreProvider>
+  </I18nProvider>
 );
+
+export const TestProviderWithoutDragAndDrop = React.memo(TestProviderWithoutDragAndDropComponent);
diff --git a/x-pack/legacy/plugins/siem/public/mock/ui_settings.ts b/x-pack/legacy/plugins/siem/public/mock/ui_settings.ts
deleted file mode 100644
index 6c6411c6bda53..0000000000000
--- a/x-pack/legacy/plugins/siem/public/mock/ui_settings.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 chrome from 'ui/chrome';
-import {
-  DEFAULT_SIEM_TIME_RANGE,
-  DEFAULT_SIEM_REFRESH_INTERVAL,
-  DEFAULT_INDEX_KEY,
-  DEFAULT_DATE_FORMAT,
-  DEFAULT_DATE_FORMAT_TZ,
-  DEFAULT_DARK_MODE,
-  DEFAULT_TIME_RANGE,
-  DEFAULT_REFRESH_RATE_INTERVAL,
-  DEFAULT_FROM,
-  DEFAULT_TO,
-  DEFAULT_INTERVAL_PAUSE,
-  DEFAULT_INTERVAL_VALUE,
-} from '../../common/constants';
-import { defaultIndexPattern } from '../../default_index_pattern';
-
-chrome.getUiSettingsClient().get.mockImplementation((key: string) => {
-  switch (key) {
-    case DEFAULT_TIME_RANGE:
-      return { from: 'now-15m', to: 'now', mode: 'quick' };
-    case DEFAULT_REFRESH_RATE_INTERVAL:
-      return { pause: false, value: 0 };
-    case DEFAULT_SIEM_TIME_RANGE:
-      return {
-        from: DEFAULT_FROM,
-        to: DEFAULT_TO,
-      };
-    case DEFAULT_SIEM_REFRESH_INTERVAL:
-      return {
-        pause: DEFAULT_INTERVAL_PAUSE,
-        value: DEFAULT_INTERVAL_VALUE,
-      };
-    case DEFAULT_INDEX_KEY:
-      return defaultIndexPattern;
-    case DEFAULT_DATE_FORMAT_TZ:
-      return 'Asia/Taipei';
-    case DEFAULT_DATE_FORMAT:
-      return 'MMM D, YYYY @ HH:mm:ss.SSS';
-    case DEFAULT_DARK_MODE:
-      return false;
-    default:
-      throw new Error(`Unexpected config key: ${key}`);
-  }
-});
-
-export interface MockNpSetUp {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  core: { uiSettings: any };
-}
-
-type Config =
-  | 'query:allowLeadingWildcards'
-  | 'query:queryString:options'
-  | 'courier:ignoreFilterIfFieldNotInIndex'
-  | 'dateFormat:tz';
-
-export const mockUiSettings = {
-  get: (item: Config) => {
-    return mockUiSettings[item];
-  },
-  get$: () => ({
-    subscribe: jest.fn(),
-  }),
-  'query:allowLeadingWildcards': true,
-  'query:queryString:options': {},
-  'courier:ignoreFilterIfFieldNotInIndex': true,
-  'dateFormat:tz': 'Browser',
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/activity_monitor/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/activity_monitor/columns.tsx
new file mode 100644
index 0000000000000..2ad37960d0423
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/activity_monitor/columns.tsx
@@ -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.
+ */
+
+/* eslint-disable react/display-name */
+
+import {
+  EuiIconTip,
+  EuiLink,
+  EuiTextColor,
+  EuiBasicTableColumn,
+  EuiTableActionsColumnType,
+} from '@elastic/eui';
+import React from 'react';
+import { getEmptyTagValue } from '../../../../components/empty_value';
+import { ColumnTypes } from './index';
+
+const actions: EuiTableActionsColumnType<ColumnTypes>['actions'] = [
+  {
+    available: (item: ColumnTypes) => item.status === 'Running',
+    description: 'Stop',
+    icon: 'stop',
+    isPrimary: true,
+    name: 'Stop',
+    onClick: () => {},
+    type: 'icon',
+  },
+  {
+    available: (item: ColumnTypes) => item.status === 'Stopped',
+    description: 'Resume',
+    icon: 'play',
+    isPrimary: true,
+    name: 'Resume',
+    onClick: () => {},
+    type: 'icon',
+  },
+];
+
+// Michael: Are we able to do custom, in-table-header filters, as shown in my wireframes?
+export const columns: Array<EuiBasicTableColumn<ColumnTypes>> = [
+  {
+    field: 'rule' as const,
+    name: 'Rule',
+    render: (value: ColumnTypes['rule'], _: ColumnTypes) => (
+      <EuiLink href={value.href}>{value.name}</EuiLink>
+    ),
+    sortable: true,
+    truncateText: true,
+  },
+  {
+    field: 'ran' as const,
+    name: 'Ran',
+    render: (value: ColumnTypes['ran'], _: ColumnTypes) => '--',
+    sortable: true,
+    truncateText: true,
+  },
+  {
+    field: 'lookedBackTo' as const,
+    name: 'Looked back to',
+    render: (value: ColumnTypes['lookedBackTo'], _: ColumnTypes) => '--',
+    sortable: true,
+    truncateText: true,
+  },
+  {
+    field: 'status' as const,
+    name: 'Status',
+    sortable: true,
+    truncateText: true,
+  },
+  {
+    field: 'response' as const,
+    name: 'Response',
+    render: (value: ColumnTypes['response'], _: ColumnTypes) => {
+      return value === undefined ? (
+        getEmptyTagValue()
+      ) : (
+        <>
+          {value === 'Fail' ? (
+            <EuiTextColor color="danger">
+              {value} <EuiIconTip content="Full fail message here." type="iInCircle" />
+            </EuiTextColor>
+          ) : (
+            <EuiTextColor color="secondary">{value}</EuiTextColor>
+          )}
+        </>
+      );
+    },
+    sortable: true,
+    truncateText: true,
+  },
+  {
+    actions,
+    width: '40px',
+  },
+];
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/activity_monitor/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/activity_monitor/index.tsx
new file mode 100644
index 0000000000000..8290da1ba3220
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/activity_monitor/index.tsx
@@ -0,0 +1,343 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiBasicTable, EuiPanel, EuiSpacer } from '@elastic/eui';
+import React, { useState, useCallback } from 'react';
+import { HeaderSection } from '../../../../components/header_section';
+import {
+  UtilityBar,
+  UtilityBarAction,
+  UtilityBarGroup,
+  UtilityBarSection,
+  UtilityBarText,
+} from '../../../../components/detection_engine/utility_bar';
+import { columns } from './columns';
+
+export interface RuleTypes {
+  href: string;
+  name: string;
+}
+
+export interface ColumnTypes {
+  id: number;
+  rule: RuleTypes;
+  ran: string;
+  lookedBackTo: string;
+  status: string;
+  response?: string | undefined;
+}
+
+export interface PageTypes {
+  index: number;
+  size: number;
+}
+
+export interface SortTypes {
+  field: keyof ColumnTypes;
+  direction: 'asc' | 'desc';
+}
+
+export const ActivityMonitor = React.memo(() => {
+  const sampleTableData: ColumnTypes[] = [
+    {
+      id: 1,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Running',
+    },
+    {
+      id: 2,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Stopped',
+    },
+    {
+      id: 3,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Fail',
+    },
+    {
+      id: 4,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 5,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 6,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 7,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 8,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 9,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 10,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 11,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 12,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 13,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 14,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 15,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 16,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 17,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 18,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 19,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 20,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+    {
+      id: 21,
+      rule: {
+        href: '#/detection-engine/rules/rule-details',
+        name: 'Automated exfiltration',
+      },
+      ran: '2019-12-28 00:00:00.000-05:00',
+      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
+      status: 'Completed',
+      response: 'Success',
+    },
+  ];
+
+  const [itemsTotalState] = useState<number>(sampleTableData.length);
+  const [pageState, setPageState] = useState<PageTypes>({ index: 0, size: 20 });
+  // const [selectedState, setSelectedState] = useState<ColumnTypes[]>([]);
+  const [sortState, setSortState] = useState<SortTypes>({ field: 'ran', direction: 'desc' });
+
+  const handleChange = useCallback(
+    ({ page, sort }: { page?: PageTypes; sort?: SortTypes }) => {
+      setPageState(page!);
+      setSortState(sort!);
+    },
+    [setPageState, setSortState]
+  );
+
+  return (
+    <>
+      <EuiSpacer />
+
+      <EuiPanel>
+        <HeaderSection title="Activity monitor" />
+        <UtilityBar border>
+          <UtilityBarSection>
+            <UtilityBarGroup>
+              <UtilityBarText>{'Showing: 39 activites'}</UtilityBarText>
+            </UtilityBarGroup>
+
+            <UtilityBarGroup>
+              <UtilityBarText>{'Selected: 2 activities'}</UtilityBarText>
+
+              <UtilityBarAction iconType="stop">{'Stop selected'}</UtilityBarAction>
+            </UtilityBarGroup>
+
+            <UtilityBarGroup>
+              <UtilityBarAction iconType="cross">{'Clear 7 filters'}</UtilityBarAction>
+            </UtilityBarGroup>
+          </UtilityBarSection>
+        </UtilityBar>
+        {
+          // @ts-ignore `Columns` interface differs from EUI's `column` type and is used all over this plugin, so ignore the differences instead of refactoring a lot of code
+        }
+        <EuiBasicTable
+          columns={columns}
+          isSelectable
+          itemId="id"
+          items={sampleTableData}
+          onChange={handleChange}
+          pagination={{
+            pageIndex: pageState.index,
+            pageSize: pageState.size,
+            totalItemCount: itemsTotalState,
+            pageSizeOptions: [5, 10, 20],
+          }}
+          selection={{
+            selectable: (item: ColumnTypes) => item.status !== 'Completed',
+            selectableMessage: (selectable: boolean) =>
+              selectable ? '' : 'Completed runs cannot be acted upon',
+            onSelectionChange: (selectedItems: ColumnTypes[]) => {
+              // setSelectedState(selectedItems);
+            },
+          }}
+          sorting={{
+            sort: sortState,
+          }}
+        />
+      </EuiPanel>
+    </>
+  );
+});
+ActivityMonitor.displayName = 'ActivityMonitor';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/actions.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/actions.tsx
new file mode 100644
index 0000000000000..d08e282a4c399
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/actions.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 moment from 'moment';
+
+import { updateSignalStatus } from '../../../../containers/detection_engine/signals/api';
+import { SendSignalsToTimelineActionProps, UpdateSignalStatusActionProps } from './types';
+import { TimelineNonEcsData } from '../../../../graphql/types';
+
+export const getUpdateSignalsQuery = (eventIds: Readonly<string[]>) => {
+  return {
+    query: {
+      bool: {
+        filter: {
+          terms: {
+            _id: [...eventIds],
+          },
+        },
+      },
+    },
+  };
+};
+
+export const getFilterAndRuleBounds = (
+  data: TimelineNonEcsData[][]
+): [string[], number, number] => {
+  const stringFilter = data?.[0].filter(d => d.field === 'signal.rule.filters')?.[0]?.value ?? [];
+
+  const eventTimes = data
+    .flatMap(signal => signal.filter(d => d.field === 'signal.original_time')?.[0]?.value ?? [])
+    .map(d => moment(d));
+
+  return [stringFilter, moment.min(eventTimes).valueOf(), moment.max(eventTimes).valueOf()];
+};
+
+export const updateSignalStatusAction = async ({
+  query,
+  signalIds,
+  status,
+  setEventsLoading,
+  setEventsDeleted,
+}: UpdateSignalStatusActionProps) => {
+  try {
+    setEventsLoading({ eventIds: signalIds, isLoading: true });
+
+    const queryObject = query ? { query: JSON.parse(query) } : getUpdateSignalsQuery(signalIds);
+
+    await updateSignalStatus({ query: queryObject, status });
+    // TODO: Only delete those that were successfully updated from updatedRules
+    setEventsDeleted({ eventIds: signalIds, isDeleted: true });
+  } catch (e) {
+    // TODO: Show error toasts
+  } finally {
+    setEventsLoading({ eventIds: signalIds, isLoading: false });
+  }
+};
+
+export const sendSignalsToTimelineAction = async ({
+  createTimeline,
+  data,
+}: SendSignalsToTimelineActionProps) => {
+  const stringFilter = data[0].filter(d => d.field === 'signal.rule.filters')?.[0]?.value ?? [];
+
+  // TODO: Switch to using from/to when adding dateRange
+  // const [stringFilters, from, to] = getFilterAndRuleBounds(data);
+  const parsedFilter = stringFilter.map(sf => JSON.parse(sf));
+  createTimeline({
+    id: 'timeline-1',
+    filters: parsedFilter,
+    dateRange: undefined, // TODO
+    kqlQuery: undefined, // TODO
+  });
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx
new file mode 100644
index 0000000000000..1a7ad5822a246
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx
@@ -0,0 +1,222 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under 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 react/display-name */
+
+import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
+import React from 'react';
+
+import { esFilters } from '../../../../../../../../../src/plugins/data/common/es_query';
+import { ColumnHeader } from '../../../../components/timeline/body/column_headers/column_header';
+import { TimelineAction, TimelineActionProps } from '../../../../components/timeline/body/actions';
+import { defaultColumnHeaderType } from '../../../../components/timeline/body/column_headers/default_headers';
+import {
+  DEFAULT_COLUMN_MIN_WIDTH,
+  DEFAULT_DATE_COLUMN_MIN_WIDTH,
+} from '../../../../components/timeline/body/helpers';
+import { SubsetTimelineModel, timelineDefaults } from '../../../../store/timeline/model';
+
+import { FILTER_OPEN } from './signals_filter_group';
+import { sendSignalsToTimelineAction, updateSignalStatusAction } from './actions';
+import * as i18n from './translations';
+import { CreateTimeline, SetEventsDeletedProps, SetEventsLoadingProps } from './types';
+
+export const signalsOpenFilters: esFilters.Filter[] = [
+  {
+    meta: {
+      alias: null,
+      negate: false,
+      disabled: false,
+      type: 'phrase',
+      key: 'signal.status',
+      params: {
+        query: 'open',
+      },
+    },
+    query: {
+      match_phrase: {
+        'signal.status': 'open',
+      },
+    },
+  },
+];
+
+export const signalsClosedFilters: esFilters.Filter[] = [
+  {
+    meta: {
+      alias: null,
+      negate: false,
+      disabled: false,
+      type: 'phrase',
+      key: 'signal.status',
+      params: {
+        query: 'closed',
+      },
+    },
+    query: {
+      match_phrase: {
+        'signal.status': 'closed',
+      },
+    },
+  },
+];
+
+export const buildSignalsRuleIdFilter = (ruleId: string): esFilters.Filter[] => [
+  {
+    meta: {
+      alias: null,
+      negate: false,
+      disabled: false,
+      type: 'phrase',
+      key: 'signal.rule.id',
+      params: {
+        query: ruleId,
+      },
+    },
+    query: {
+      match_phrase: {
+        'signal.rule.id': ruleId,
+      },
+    },
+  },
+];
+
+export const signalsHeaders: ColumnHeader[] = [
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'signal.rule.name',
+    label: i18n.SIGNALS_HEADERS_RULE,
+    width: DEFAULT_COLUMN_MIN_WIDTH,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'signal.rule.type',
+    label: i18n.SIGNALS_HEADERS_METHOD,
+    width: 80,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'signal.rule.severity',
+    label: i18n.SIGNALS_HEADERS_SEVERITY,
+    width: 80,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'signal.rule.risk_score',
+    label: i18n.SIGNALS_HEADERS_RISK_SCORE,
+    width: 120,
+  },
+  {
+    category: 'event',
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'event.action',
+    type: 'string',
+    aggregatable: true,
+    width: 140,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'event.category',
+    width: 150,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'host.name',
+    width: 120,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'user.name',
+    width: 120,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'source.ip',
+    width: 120,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'destination.ip',
+    width: 120,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: '@timestamp',
+    width: DEFAULT_DATE_COLUMN_MIN_WIDTH,
+  },
+];
+
+export const signalsDefaultModel: SubsetTimelineModel = {
+  ...timelineDefaults,
+  columns: signalsHeaders,
+  showCheckboxes: true,
+  showRowRenderers: false,
+};
+
+export const requiredFieldsForActions = [
+  '@timestamp',
+  'signal.original_time',
+  'signal.rule.filters',
+  'signal.rule.from',
+  'signal.rule.language',
+  'signal.rule.query',
+  'signal.rule.to',
+  'signal.rule.id',
+];
+
+export const getSignalsActions = ({
+  setEventsLoading,
+  setEventsDeleted,
+  createTimeline,
+  status,
+}: {
+  setEventsLoading: ({ eventIds, isLoading }: SetEventsLoadingProps) => void;
+  setEventsDeleted: ({ eventIds, isDeleted }: SetEventsDeletedProps) => void;
+  createTimeline: CreateTimeline;
+  status: 'open' | 'closed';
+}): TimelineAction[] => [
+  {
+    getAction: ({ eventId, data }: TimelineActionProps): JSX.Element => (
+      <EuiToolTip
+        data-test-subj="send-signal-to-timeline-tool-tip"
+        content={i18n.ACTION_VIEW_IN_TIMELINE}
+      >
+        <EuiButtonIcon
+          data-test-subj={'send-signal-to-timeline-tool-tip'}
+          onClick={() => sendSignalsToTimelineAction({ createTimeline, data: [data] })}
+          iconType="tableDensityNormal"
+          aria-label="Next"
+        />
+      </EuiToolTip>
+    ),
+    id: 'sendSignalToTimeline',
+    width: 26,
+  },
+  {
+    getAction: ({ eventId, data }: TimelineActionProps): JSX.Element => (
+      <EuiToolTip
+        data-test-subj="update-signal-status-tool-tip"
+        content={status === FILTER_OPEN ? i18n.ACTION_OPEN_SIGNAL : i18n.ACTION_CLOSE_SIGNAL}
+      >
+        <EuiButtonIcon
+          data-test-subj={'update-signal-status-button'}
+          onClick={() =>
+            updateSignalStatusAction({
+              signalIds: [eventId],
+              status,
+              setEventsLoading,
+              setEventsDeleted,
+            })
+          }
+          iconType={status === FILTER_OPEN ? 'indexOpen' : 'indexClose'}
+          aria-label="Next"
+        />
+      </EuiToolTip>
+    ),
+    id: 'updateSignalStatus',
+    width: 26,
+  },
+];
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/index.tsx
new file mode 100644
index 0000000000000..47a78482cfb6e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/index.tsx
@@ -0,0 +1,338 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { connect } from 'react-redux';
+import { ActionCreator } from 'typescript-fsa';
+import { SignalsUtilityBar } from './signals_utility_bar';
+import { StatefulEventsViewer } from '../../../../components/events_viewer';
+import * as i18n from './translations';
+import {
+  getSignalsActions,
+  requiredFieldsForActions,
+  signalsClosedFilters,
+  signalsDefaultModel,
+  signalsOpenFilters,
+} from './default_config';
+import { timelineActions, timelineSelectors } from '../../../../store/timeline';
+import { timelineDefaults, TimelineModel } from '../../../../store/timeline/model';
+import {
+  FILTER_CLOSED,
+  FILTER_OPEN,
+  SignalFilterOption,
+  SignalsTableFilterGroup,
+} from './signals_filter_group';
+import { useKibana } from '../../../../lib/kibana';
+import { defaultHeaders } from '../../../../components/timeline/body/column_headers/default_headers';
+import { ColumnHeader } from '../../../../components/timeline/body/column_headers/column_header';
+import { esFilters, esQuery } from '../../../../../../../../../src/plugins/data/common/es_query';
+import { TimelineNonEcsData } from '../../../../graphql/types';
+import { inputsSelectors, SerializedFilterQuery, State } from '../../../../store';
+import { sendSignalsToTimelineAction, updateSignalStatusAction } from './actions';
+import {
+  CreateTimelineProps,
+  SendSignalsToTimeline,
+  SetEventsDeletedProps,
+  SetEventsLoadingProps,
+  UpdateSignalsStatus,
+  UpdateSignalsStatusProps,
+} from './types';
+import { inputsActions } from '../../../../store/inputs';
+import { combineQueries } from '../../../../components/timeline/helpers';
+import { useFetchIndexPatterns } from '../../../../containers/detection_engine/rules/fetch_index_patterns';
+import { InputsRange } from '../../../../store/inputs/model';
+import { Query } from '../../../../../../../../../src/plugins/data/common/query';
+
+const SIGNALS_PAGE_TIMELINE_ID = 'signals-page';
+
+interface ReduxProps {
+  globalQuery: Query;
+  globalFilters: esFilters.Filter[];
+  deletedEventIds: string[];
+  isSelectAllChecked: boolean;
+  loadingEventIds: string[];
+  selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
+}
+
+interface DispatchProps {
+  createTimeline: ActionCreator<{
+    dateRange?: {
+      start: number;
+      end: number;
+    };
+    filters?: esFilters.Filter[];
+    id: string;
+    kqlQuery?: {
+      filterQuery: SerializedFilterQuery | null;
+    };
+    columns: ColumnHeader[];
+    show?: boolean;
+  }>;
+  clearEventsDeleted?: ActionCreator<{ id: string }>;
+  clearEventsLoading?: ActionCreator<{ id: string }>;
+  clearSelected?: ActionCreator<{ id: string }>;
+  removeTimelineLinkTo: ActionCreator<{}>;
+  setEventsDeleted?: ActionCreator<{
+    id: string;
+    eventIds: string[];
+    isDeleted: boolean;
+  }>;
+  setEventsLoading?: ActionCreator<{
+    id: string;
+    eventIds: string[];
+    isLoading: boolean;
+  }>;
+}
+
+interface OwnProps {
+  defaultFilters?: esFilters.Filter[];
+  from: number;
+  signalsIndex: string;
+  to: number;
+}
+
+type SignalsTableComponentProps = OwnProps & ReduxProps & DispatchProps;
+
+export const SignalsTableComponent = React.memo<SignalsTableComponentProps>(
+  ({
+    createTimeline,
+    clearEventsDeleted,
+    clearEventsLoading,
+    clearSelected,
+    defaultFilters = [],
+    from,
+    globalFilters,
+    globalQuery,
+    isSelectAllChecked,
+    loadingEventIds,
+    removeTimelineLinkTo,
+    selectedEventIds,
+    setEventsDeleted,
+    setEventsLoading,
+    signalsIndex,
+    to,
+  }) => {
+    const [selectAll, setSelectAll] = useState(false);
+
+    const [showClearSelectionAction, setShowClearSelectionAction] = useState(false);
+    const [filterGroup, setFilterGroup] = useState<SignalFilterOption>(FILTER_OPEN);
+    const [{ browserFields, indexPatterns }] = useFetchIndexPatterns([signalsIndex]);
+    const kibana = useKibana();
+
+    const getGlobalQuery = useCallback(() => {
+      if (browserFields != null && indexPatterns != null) {
+        return combineQueries({
+          config: esQuery.getEsQueryConfig(kibana.services.uiSettings),
+          dataProviders: [],
+          indexPattern: indexPatterns,
+          browserFields,
+          filters: globalFilters,
+          kqlQuery: globalQuery,
+          kqlMode: globalQuery.language,
+          start: from,
+          end: to,
+          isEventViewer: true,
+        });
+      }
+      return null;
+    }, [browserFields, globalFilters, globalQuery, indexPatterns, to, from]);
+
+    // Callback for creating a new timeline -- utilized by row/batch actions
+    const createTimelineCallback = useCallback(
+      ({ id, kqlQuery, filters, dateRange }: CreateTimelineProps) => {
+        removeTimelineLinkTo({});
+        createTimeline({ id, columns: defaultHeaders, show: true, filters, dateRange, kqlQuery });
+      },
+      [createTimeline, removeTimelineLinkTo]
+    );
+
+    const setEventsLoadingCallback = useCallback(
+      ({ eventIds, isLoading }: SetEventsLoadingProps) => {
+        setEventsLoading!({ id: SIGNALS_PAGE_TIMELINE_ID, eventIds, isLoading });
+      },
+      [setEventsLoading, SIGNALS_PAGE_TIMELINE_ID]
+    );
+
+    const setEventsDeletedCallback = useCallback(
+      ({ eventIds, isDeleted }: SetEventsDeletedProps) => {
+        setEventsDeleted!({ id: SIGNALS_PAGE_TIMELINE_ID, eventIds, isDeleted });
+      },
+      [setEventsDeleted, SIGNALS_PAGE_TIMELINE_ID]
+    );
+
+    // Catches state change isSelectAllChecked->false upon user selection change to reset utility bar
+    useEffect(() => {
+      if (!isSelectAllChecked) {
+        setShowClearSelectionAction(false);
+      } else {
+        setSelectAll(false);
+      }
+    }, [isSelectAllChecked]);
+
+    // Callback for when open/closed filter changes
+    const onFilterGroupChangedCallback = useCallback(
+      (newFilterGroup: SignalFilterOption) => {
+        clearEventsLoading!({ id: SIGNALS_PAGE_TIMELINE_ID });
+        clearEventsDeleted!({ id: SIGNALS_PAGE_TIMELINE_ID });
+        clearSelected!({ id: SIGNALS_PAGE_TIMELINE_ID });
+        setFilterGroup(newFilterGroup);
+      },
+      [setFilterGroup]
+    );
+
+    // Callback for clearing entire selection from utility bar
+    const clearSelectionCallback = useCallback(() => {
+      clearSelected!({ id: SIGNALS_PAGE_TIMELINE_ID });
+      setSelectAll(false);
+      setShowClearSelectionAction(false);
+    }, [clearSelected, setShowClearSelectionAction]);
+
+    // Callback for selecting all events on all pages from utility bar
+    // Dispatches to stateful_body's selectAll via TimelineTypeContext props
+    // as scope of response data required to actually set selectedEvents
+    const selectAllCallback = useCallback(() => {
+      setSelectAll(true);
+      setShowClearSelectionAction(true);
+    }, [setShowClearSelectionAction]);
+
+    const updateSignalsStatusCallback: UpdateSignalsStatus = useCallback(
+      async ({ signalIds, status }: UpdateSignalsStatusProps) => {
+        await updateSignalStatusAction({
+          query: showClearSelectionAction ? getGlobalQuery()?.filterQuery : undefined,
+          signalIds: Object.keys(selectedEventIds),
+          status,
+          setEventsDeleted: setEventsDeletedCallback,
+          setEventsLoading: setEventsLoadingCallback,
+        });
+      },
+      [
+        getGlobalQuery,
+        selectedEventIds,
+        setEventsDeletedCallback,
+        setEventsLoadingCallback,
+        showClearSelectionAction,
+      ]
+    );
+    const sendSignalsToTimelineCallback: SendSignalsToTimeline = useCallback(async () => {
+      await sendSignalsToTimelineAction({
+        createTimeline: createTimelineCallback,
+        data: Object.values(selectedEventIds),
+      });
+    }, [selectedEventIds, setEventsDeletedCallback, setEventsLoadingCallback]);
+
+    // Callback for creating the SignalUtilityBar which receives totalCount from EventsViewer component
+    const utilityBarCallback = useCallback(
+      (totalCount: number) => {
+        return (
+          <SignalsUtilityBar
+            areEventsLoading={loadingEventIds.length > 0}
+            clearSelection={clearSelectionCallback}
+            isFilteredToOpen={filterGroup === FILTER_OPEN}
+            selectAll={selectAllCallback}
+            selectedEventIds={selectedEventIds}
+            sendSignalsToTimeline={sendSignalsToTimelineCallback}
+            showClearSelection={showClearSelectionAction}
+            totalCount={totalCount}
+            updateSignalsStatus={updateSignalsStatusCallback}
+          />
+        );
+      },
+      [
+        clearSelectionCallback,
+        filterGroup,
+        loadingEventIds.length,
+        selectAllCallback,
+        selectedEventIds,
+        showClearSelectionAction,
+      ]
+    );
+
+    // Send to Timeline / Update Signal Status Actions for each table row
+    const additionalActions = useMemo(
+      () =>
+        getSignalsActions({
+          createTimeline: createTimelineCallback,
+          setEventsLoading: setEventsLoadingCallback,
+          setEventsDeleted: setEventsDeletedCallback,
+          status: filterGroup === FILTER_OPEN ? FILTER_CLOSED : FILTER_OPEN,
+        }),
+      [createTimelineCallback, filterGroup]
+    );
+
+    const defaultIndices = useMemo(() => [signalsIndex], [signalsIndex]);
+    const defaultFiltersMemo = useMemo(
+      () => [
+        ...defaultFilters,
+        ...(filterGroup === FILTER_OPEN ? signalsOpenFilters : signalsClosedFilters),
+      ],
+      [defaultFilters, filterGroup]
+    );
+
+    const timelineTypeContext = useMemo(
+      () => ({
+        documentType: i18n.SIGNALS_DOCUMENT_TYPE,
+        footerText: i18n.TOTAL_COUNT_OF_SIGNALS,
+        loadingText: i18n.LOADING_SIGNALS,
+        queryFields: requiredFieldsForActions,
+        timelineActions: additionalActions,
+        title: i18n.SIGNALS_TABLE_TITLE,
+        selectAll,
+      }),
+      [additionalActions, selectAll]
+    );
+
+    return (
+      <StatefulEventsViewer
+        defaultIndices={defaultIndices}
+        pageFilters={defaultFiltersMemo}
+        defaultModel={signalsDefaultModel}
+        end={to}
+        headerFilterGroup={
+          <SignalsTableFilterGroup onFilterGroupChanged={onFilterGroupChangedCallback} />
+        }
+        id={SIGNALS_PAGE_TIMELINE_ID}
+        start={from}
+        timelineTypeContext={timelineTypeContext}
+        utilityBar={utilityBarCallback}
+      />
+    );
+  }
+);
+
+SignalsTableComponent.displayName = 'SignalsTableComponent';
+
+const makeMapStateToProps = () => {
+  const getTimeline = timelineSelectors.getTimelineByIdSelector();
+  const getGlobalInputs = inputsSelectors.globalSelector();
+  const mapStateToProps = (state: State) => {
+    const timeline: TimelineModel =
+      getTimeline(state, SIGNALS_PAGE_TIMELINE_ID) ?? timelineDefaults;
+    const { deletedEventIds, isSelectAllChecked, loadingEventIds, selectedEventIds } = timeline;
+
+    const globalInputs: InputsRange = getGlobalInputs(state);
+    const { query, filters } = globalInputs;
+
+    return {
+      globalQuery: query,
+      globalFilters: filters,
+      deletedEventIds,
+      isSelectAllChecked,
+      loadingEventIds,
+      selectedEventIds,
+    };
+  };
+  return mapStateToProps;
+};
+
+export const SignalsTable = connect(makeMapStateToProps, {
+  removeTimelineLinkTo: inputsActions.removeTimelineLinkTo,
+  clearSelected: timelineActions.clearSelected,
+  setEventsLoading: timelineActions.setEventsLoading,
+  clearEventsLoading: timelineActions.clearEventsLoading,
+  setEventsDeleted: timelineActions.setEventsDeleted,
+  clearEventsDeleted: timelineActions.clearEventsDeleted,
+  createTimeline: timelineActions.createTimeline,
+})(SignalsTableComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_filter_group/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_filter_group/index.tsx
new file mode 100644
index 0000000000000..3c1317d463f8e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_filter_group/index.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiFilterButton, EuiFilterGroup } from '@elastic/eui';
+import React, { useCallback, useState } from 'react';
+import * as i18n from '../translations';
+
+export const FILTER_OPEN = 'open';
+export const FILTER_CLOSED = 'closed';
+export type SignalFilterOption = typeof FILTER_OPEN | typeof FILTER_CLOSED;
+
+interface Props {
+  onFilterGroupChanged: (filterGroup: SignalFilterOption) => void;
+}
+
+const SignalsTableFilterGroupComponent: React.FC<Props> = ({ onFilterGroupChanged }) => {
+  const [filterGroup, setFilterGroup] = useState(FILTER_OPEN);
+
+  const onClickOpenFilterCallback = useCallback(() => {
+    setFilterGroup(FILTER_OPEN);
+    onFilterGroupChanged(FILTER_OPEN);
+  }, [setFilterGroup, onFilterGroupChanged]);
+
+  const onClickCloseFilterCallback = useCallback(() => {
+    setFilterGroup(FILTER_CLOSED);
+    onFilterGroupChanged(FILTER_CLOSED);
+  }, [setFilterGroup, onFilterGroupChanged]);
+
+  return (
+    <EuiFilterGroup>
+      <EuiFilterButton
+        hasActiveFilters={filterGroup === FILTER_OPEN}
+        onClick={onClickOpenFilterCallback}
+        withNext
+      >
+        {i18n.OPEN_SIGNALS}
+      </EuiFilterButton>
+
+      <EuiFilterButton
+        hasActiveFilters={filterGroup === FILTER_CLOSED}
+        onClick={onClickCloseFilterCallback}
+      >
+        {i18n.CLOSED_SIGNALS}
+      </EuiFilterButton>
+    </EuiFilterGroup>
+  );
+};
+
+export const SignalsTableFilterGroup = React.memo(SignalsTableFilterGroupComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/batch_actions.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/batch_actions.tsx
new file mode 100644
index 0000000000000..bbbc7728e36a5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/batch_actions.tsx
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiContextMenuItem } from '@elastic/eui';
+import React from 'react';
+import * as i18n from './translations';
+import { TimelineNonEcsData } from '../../../../../graphql/types';
+import { SendSignalsToTimeline, UpdateSignalsStatus } from '../types';
+import { FILTER_CLOSED, FILTER_OPEN } from '../signals_filter_group';
+
+/**
+ * Returns ViewInTimeline / UpdateSignalStatus actions to be display within an EuiContextMenuPanel
+ *
+ * @param areEventsLoading are any events loading
+ * @param allEventsSelected are all events on all pages selected
+ * @param selectedEventIds
+ * @param updateSignalsStatus function for updating signal status
+ * @param sendSignalsToTimeline function for sending signals to timeline
+ * @param closePopover
+ * @param isFilteredToOpen currently selected filter options
+ */
+export const getBatchItems = (
+  areEventsLoading: boolean,
+  allEventsSelected: boolean,
+  selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>,
+  updateSignalsStatus: UpdateSignalsStatus,
+  sendSignalsToTimeline: SendSignalsToTimeline,
+  closePopover: () => void,
+  isFilteredToOpen: boolean
+) => {
+  const allDisabled = areEventsLoading || Object.keys(selectedEventIds).length === 0;
+  const sendToTimelineDisabled = allEventsSelected || uniqueRuleCount(selectedEventIds) > 1;
+  const filterString = isFilteredToOpen
+    ? i18n.BATCH_ACTION_CLOSE_SELECTED
+    : i18n.BATCH_ACTION_OPEN_SELECTED;
+
+  return [
+    <EuiContextMenuItem
+      key={i18n.BATCH_ACTION_VIEW_SELECTED_IN_TIMELINE}
+      icon="editorUnorderedList"
+      disabled={allDisabled || sendToTimelineDisabled}
+      onClick={async () => {
+        closePopover();
+        sendSignalsToTimeline();
+      }}
+    >
+      {i18n.BATCH_ACTION_VIEW_SELECTED_IN_TIMELINE}
+    </EuiContextMenuItem>,
+
+    <EuiContextMenuItem
+      key={filterString}
+      icon={isFilteredToOpen ? 'indexClose' : 'indexOpen'}
+      disabled={allDisabled}
+      onClick={async () => {
+        closePopover();
+        await updateSignalsStatus({
+          signalIds: Object.keys(selectedEventIds),
+          status: isFilteredToOpen ? FILTER_CLOSED : FILTER_OPEN,
+        });
+      }}
+    >
+      {filterString}
+    </EuiContextMenuItem>,
+  ];
+};
+
+/**
+ * Returns the number of unique rules for a given list of signals
+ *
+ * @param signals
+ */
+export const uniqueRuleCount = (
+  signals: Readonly<Record<string, TimelineNonEcsData[]>>
+): number => {
+  const ruleIds = Object.values(signals).flatMap(
+    data => data.find(d => d.field === 'signal.rule.id')?.value
+  );
+
+  return Array.from(new Set(ruleIds)).length;
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx
new file mode 100644
index 0000000000000..f80de053b59bd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx
@@ -0,0 +1,132 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useCallback } from 'react';
+import { EuiContextMenuPanel } from '@elastic/eui';
+import numeral from '@elastic/numeral';
+import {
+  UtilityBar,
+  UtilityBarAction,
+  UtilityBarGroup,
+  UtilityBarSection,
+  UtilityBarText,
+} from '../../../../../components/detection_engine/utility_bar';
+import * as i18n from './translations';
+import { getBatchItems } from './batch_actions';
+import { useUiSetting$ } from '../../../../../lib/kibana';
+import { DEFAULT_NUMBER_FORMAT } from '../../../../../../common/constants';
+import { TimelineNonEcsData } from '../../../../../graphql/types';
+import { SendSignalsToTimeline, UpdateSignalsStatus } from '../types';
+
+interface SignalsUtilityBarProps {
+  areEventsLoading: boolean;
+  clearSelection: () => void;
+  isFilteredToOpen: boolean;
+  selectAll: () => void;
+  selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
+  sendSignalsToTimeline: SendSignalsToTimeline;
+  showClearSelection: boolean;
+  totalCount: number;
+  updateSignalsStatus: UpdateSignalsStatus;
+}
+
+const SignalsUtilityBarComponent: React.FC<SignalsUtilityBarProps> = ({
+  areEventsLoading,
+  clearSelection,
+  totalCount,
+  selectedEventIds,
+  isFilteredToOpen,
+  selectAll,
+  showClearSelection,
+  updateSignalsStatus,
+  sendSignalsToTimeline,
+}) => {
+  const [defaultNumberFormat] = useUiSetting$<string>(DEFAULT_NUMBER_FORMAT);
+
+  const getBatchItemsPopoverContent = useCallback(
+    (closePopover: () => void) => (
+      <EuiContextMenuPanel
+        items={getBatchItems(
+          areEventsLoading,
+          showClearSelection,
+          selectedEventIds,
+          updateSignalsStatus,
+          sendSignalsToTimeline,
+          closePopover,
+          isFilteredToOpen
+        )}
+      />
+    ),
+    [
+      areEventsLoading,
+      selectedEventIds,
+      updateSignalsStatus,
+      sendSignalsToTimeline,
+      isFilteredToOpen,
+    ]
+  );
+
+  const formattedTotalCount = numeral(totalCount).format(defaultNumberFormat);
+  const formattedSelectedEventsCount = numeral(Object.keys(selectedEventIds).length).format(
+    defaultNumberFormat
+  );
+
+  return (
+    <>
+      <UtilityBar>
+        <UtilityBarSection>
+          <UtilityBarGroup>
+            <UtilityBarText>{i18n.SHOWING_SIGNALS(formattedTotalCount, totalCount)}</UtilityBarText>
+          </UtilityBarGroup>
+
+          <UtilityBarGroup>
+            {totalCount > 0 && (
+              <>
+                <UtilityBarText>
+                  {i18n.SELECTED_SIGNALS(
+                    showClearSelection ? formattedTotalCount : formattedSelectedEventsCount,
+                    showClearSelection ? totalCount : Object.keys(selectedEventIds).length
+                  )}
+                </UtilityBarText>
+
+                <UtilityBarAction
+                  iconSide="right"
+                  iconType="arrowDown"
+                  popoverContent={getBatchItemsPopoverContent}
+                >
+                  {i18n.BATCH_ACTIONS}
+                </UtilityBarAction>
+
+                <UtilityBarAction
+                  iconType="listAdd"
+                  onClick={() => {
+                    if (!showClearSelection) {
+                      selectAll();
+                    } else {
+                      clearSelection();
+                    }
+                  }}
+                >
+                  {showClearSelection
+                    ? i18n.CLEAR_SELECTION
+                    : i18n.SELECT_ALL_SIGNALS(formattedTotalCount, totalCount)}
+                </UtilityBarAction>
+              </>
+            )}
+          </UtilityBarGroup>
+        </UtilityBarSection>
+      </UtilityBar>
+    </>
+  );
+};
+
+export const SignalsUtilityBar = React.memo(
+  SignalsUtilityBarComponent,
+  (prevProps, nextProps) =>
+    prevProps.selectedEventIds === nextProps.selectedEventIds &&
+    prevProps.totalCount === nextProps.totalCount &&
+    prevProps.showClearSelection === nextProps.showClearSelection
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/translations.ts
new file mode 100644
index 0000000000000..b876177d5e4d1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/translations.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';
+
+export const SHOWING_SIGNALS = (totalSignalsFormatted: string, totalSignals: number) =>
+  i18n.translate('xpack.siem.detectionEngine.signals.utilityBar.showingSignalsTitle', {
+    values: { totalSignalsFormatted, totalSignals },
+    defaultMessage:
+      'Showing {totalSignalsFormatted} {totalSignals, plural, =1 {signal} other {signals}}',
+  });
+
+export const SELECTED_SIGNALS = (selectedSignalsFormatted: string, selectedSignals: number) =>
+  i18n.translate('xpack.siem.detectionEngine.signals.utilityBar.selectedSignalsTitle', {
+    values: { selectedSignalsFormatted, selectedSignals },
+    defaultMessage:
+      'Selected {selectedSignalsFormatted} {selectedSignals, plural, =1 {signal} other {signals}}',
+  });
+
+export const SELECT_ALL_SIGNALS = (totalSignalsFormatted: string, totalSignals: number) =>
+  i18n.translate('xpack.siem.detectionEngine.signals.utilityBar.selectAllSignalsTitle', {
+    values: { totalSignalsFormatted, totalSignals },
+    defaultMessage:
+      'Select all {totalSignalsFormatted} {totalSignals, plural, =1 {signal} other {signals}}',
+  });
+
+export const CLEAR_SELECTION = i18n.translate(
+  'xpack.siem.detectionEngine.signals.utilityBar.clearSelectionTitle',
+  {
+    defaultMessage: 'Clear selection',
+  }
+);
+
+export const BATCH_ACTIONS = i18n.translate(
+  'xpack.siem.detectionEngine.signals.utilityBar.batchActionsTitle',
+  {
+    defaultMessage: 'Batch actions',
+  }
+);
+
+export const BATCH_ACTION_VIEW_SELECTED_IN_HOSTS = i18n.translate(
+  'xpack.siem.detectionEngine.signals.utilityBar.batchActions.viewSelectedInHostsTitle',
+  {
+    defaultMessage: 'View selected in hosts',
+  }
+);
+
+export const BATCH_ACTION_VIEW_SELECTED_IN_NETWORK = i18n.translate(
+  'xpack.siem.detectionEngine.signals.utilityBar.batchActions.viewSelectedInNetworkTitle',
+  {
+    defaultMessage: 'View selected in network',
+  }
+);
+
+export const BATCH_ACTION_VIEW_SELECTED_IN_TIMELINE = i18n.translate(
+  'xpack.siem.detectionEngine.signals.utilityBar.batchActions.viewSelectedInTimelineTitle',
+  {
+    defaultMessage: 'View selected in timeline',
+  }
+);
+
+export const BATCH_ACTION_OPEN_SELECTED = i18n.translate(
+  'xpack.siem.detectionEngine.signals.utilityBar.batchActions.openSelectedTitle',
+  {
+    defaultMessage: 'Open selected',
+  }
+);
+
+export const BATCH_ACTION_CLOSE_SELECTED = i18n.translate(
+  'xpack.siem.detectionEngine.signals.utilityBar.batchActions.closeSelectedTitle',
+  {
+    defaultMessage: 'Close selected',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/translations.ts
new file mode 100644
index 0000000000000..d1ba946be41de
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/translations.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const PAGE_TITLE = i18n.translate('xpack.siem.detectionEngine.pageTitle', {
+  defaultMessage: 'Detection engine',
+});
+
+export const SIGNALS_TABLE_TITLE = i18n.translate('xpack.siem.detectionEngine.signals.tableTitle', {
+  defaultMessage: 'All signals',
+});
+
+export const SIGNALS_DOCUMENT_TYPE = i18n.translate(
+  'xpack.siem.detectionEngine.signals.documentTypeTitle',
+  {
+    defaultMessage: 'Signals',
+  }
+);
+
+export const OPEN_SIGNALS = i18n.translate('xpack.siem.detectionEngine.signals.openSignalsTitle', {
+  defaultMessage: 'Open signals',
+});
+
+export const CLOSED_SIGNALS = i18n.translate(
+  'xpack.siem.detectionEngine.signals.closedSignalsTitle',
+  {
+    defaultMessage: 'Closed signals',
+  }
+);
+
+export const LOADING_SIGNALS = i18n.translate(
+  'xpack.siem.detectionEngine.signals.loadingSignalsTitle',
+  {
+    defaultMessage: 'Loading Signals',
+  }
+);
+
+export const TOTAL_COUNT_OF_SIGNALS = i18n.translate(
+  'xpack.siem.detectionEngine.signals.totalCountOfSignalsTitle',
+  {
+    defaultMessage: 'signals match the search criteria',
+  }
+);
+
+export const SIGNALS_HEADERS_RULE = i18n.translate(
+  'xpack.siem.eventsViewer.signals.defaultHeaders.ruleTitle',
+  {
+    defaultMessage: 'Rule',
+  }
+);
+
+export const SIGNALS_HEADERS_METHOD = i18n.translate(
+  'xpack.siem.eventsViewer.signals.defaultHeaders.methodTitle',
+  {
+    defaultMessage: 'Method',
+  }
+);
+
+export const SIGNALS_HEADERS_SEVERITY = i18n.translate(
+  'xpack.siem.eventsViewer.signals.defaultHeaders.severityTitle',
+  {
+    defaultMessage: 'Severity',
+  }
+);
+
+export const SIGNALS_HEADERS_RISK_SCORE = i18n.translate(
+  'xpack.siem.eventsViewer.signals.defaultHeaders.riskScoreTitle',
+  {
+    defaultMessage: 'Risk Score',
+  }
+);
+
+export const ACTION_OPEN_SIGNAL = i18n.translate(
+  'xpack.siem.detectionEngine.signals.actions.openSignalTitle',
+  {
+    defaultMessage: 'Open signal',
+  }
+);
+
+export const ACTION_CLOSE_SIGNAL = i18n.translate(
+  'xpack.siem.detectionEngine.signals.actions.closeSignalTitle',
+  {
+    defaultMessage: 'Close signal',
+  }
+);
+
+export const ACTION_VIEW_IN_TIMELINE = i18n.translate(
+  'xpack.siem.detectionEngine.signals.actions.viewInTimelineTitle',
+  {
+    defaultMessage: 'View in timeline',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/types.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/types.ts
new file mode 100644
index 0000000000000..51bea27ec6a4b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals/types.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 { esFilters } from '../../../../../../../../../src/plugins/data/common/es_query';
+import { TimelineNonEcsData } from '../../../../graphql/types';
+import { KueryFilterQuery, SerializedFilterQuery } from '../../../../store';
+
+export interface SetEventsLoadingProps {
+  eventIds: string[];
+  isLoading: boolean;
+}
+
+export interface SetEventsDeletedProps {
+  eventIds: string[];
+  isDeleted: boolean;
+}
+
+export interface UpdateSignalsStatusProps {
+  signalIds: string[];
+  status: 'open' | 'closed';
+}
+
+export type UpdateSignalsStatus = ({ signalIds, status }: UpdateSignalsStatusProps) => void;
+
+export interface UpdateSignalStatusActionProps {
+  query?: string;
+  signalIds: string[];
+  status: 'open' | 'closed';
+  setEventsLoading: ({ eventIds, isLoading }: SetEventsLoadingProps) => void;
+  setEventsDeleted: ({ eventIds, isDeleted }: SetEventsDeletedProps) => void;
+}
+
+export type SendSignalsToTimeline = () => void;
+
+export interface SendSignalsToTimelineActionProps {
+  createTimeline: CreateTimeline;
+  data: TimelineNonEcsData[][];
+}
+
+export interface CreateTimelineProps {
+  id: string;
+  kqlQuery?: {
+    filterQuery: SerializedFilterQuery | null;
+    filterQueryDraft: KueryFilterQuery | null;
+  };
+  filters?: esFilters.Filter[];
+  dateRange?: { start: number; end: number };
+}
+
+export type CreateTimeline = ({ id, kqlQuery, filters, dateRange }: CreateTimelineProps) => void;
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_chart/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_chart/index.tsx
new file mode 100644
index 0000000000000..01ebafdccfefd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_chart/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 { EuiPanel, EuiSelect } from '@elastic/eui';
+import { noop } from 'lodash/fp';
+import React, { memo } from 'react';
+
+import { HeaderSection } from '../../../../components/header_section';
+import { HistogramSignals } from '../../../../components/page/detection_engine/histogram_signals';
+
+export const sampleChartOptions = [
+  { text: 'Risk scores', value: 'risk_scores' },
+  { text: 'Severities', value: 'severities' },
+  { text: 'Top destination IPs', value: 'destination_ips' },
+  { text: 'Top event actions', value: 'event_actions' },
+  { text: 'Top event categories', value: 'event_categories' },
+  { text: 'Top host names', value: 'host_names' },
+  { text: 'Top rule types', value: 'rule_types' },
+  { text: 'Top rules', value: 'rules' },
+  { text: 'Top source IPs', value: 'source_ips' },
+  { text: 'Top users', value: 'users' },
+];
+
+const SignalsChartsComponent = () => (
+  <EuiPanel>
+    <HeaderSection title="Signal detection frequency">
+      <EuiSelect
+        options={sampleChartOptions}
+        onChange={() => noop}
+        prepend="Stack by"
+        value={sampleChartOptions[0].value}
+      />
+    </HeaderSection>
+
+    <HistogramSignals />
+  </EuiPanel>
+);
+
+export const SignalsCharts = memo(SignalsChartsComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_info/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_info/index.tsx
new file mode 100644
index 0000000000000..a90022d4a34ce
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_info/index.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 { EuiLoadingSpinner } from '@elastic/eui';
+import { FormattedRelative } from '@kbn/i18n/react';
+import React, { useState, useEffect } from 'react';
+
+import { useQuerySignals } from '../../../../containers/detection_engine/signals/use_query';
+import { buildlastSignalsQuery } from './query.dsl';
+import { Aggs } from './types';
+
+interface SignalInfo {
+  ruleId?: string | null;
+}
+
+type Return = [React.ReactNode, React.ReactNode];
+
+export const useSignalInfo = ({ ruleId = null }: SignalInfo): Return => {
+  const [lastSignals, setLastSignals] = useState<React.ReactElement | null>(
+    <EuiLoadingSpinner size="m" />
+  );
+  const [totalSignals, setTotalSignals] = useState<React.ReactElement | null>(
+    <EuiLoadingSpinner size="m" />
+  );
+
+  let query = '';
+  try {
+    query = JSON.stringify(buildlastSignalsQuery(ruleId));
+  } catch {
+    query = '';
+  }
+
+  const [loading, signals] = useQuerySignals<unknown, Aggs>(query);
+
+  useEffect(() => {
+    if (signals != null) {
+      const mySignals = signals;
+      setLastSignals(
+        mySignals.aggregations?.lastSeen.value != null ? (
+          <FormattedRelative
+            value={new Date(mySignals.aggregations?.lastSeen.value_as_string ?? '')}
+          />
+        ) : null
+      );
+      setTotalSignals(<>{mySignals.hits.total.value}</>);
+    } else {
+      setLastSignals(null);
+      setTotalSignals(null);
+    }
+  }, [loading, signals]);
+
+  return [lastSignals, totalSignals];
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_info/query.dsl.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_info/query.dsl.ts
new file mode 100644
index 0000000000000..0b14aa17a9450
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_info/query.dsl.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const buildlastSignalsQuery = (ruleId: string | undefined | null) => {
+  const queryFilter = [
+    {
+      bool: { should: [{ match: { 'signal.status': 'open' } }], minimum_should_match: 1 },
+    },
+  ];
+  return {
+    aggs: {
+      lastSeen: { max: { field: '@timestamp' } },
+    },
+    query: {
+      bool: {
+        filter:
+          ruleId != null
+            ? [
+                ...queryFilter,
+                {
+                  bool: {
+                    should: [{ match: { 'signal.rule.id': ruleId } }],
+                    minimum_should_match: 1,
+                  },
+                },
+              ]
+            : queryFilter,
+      },
+    },
+    size: 0,
+    track_total_hits: true,
+  };
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_info/types.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_info/types.ts
new file mode 100644
index 0000000000000..68bc8dc3eed59
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_info/types.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface Aggs {
+  lastSeen: {
+    value: number;
+    value_as_string: string;
+  };
+}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/accordion_title/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/accordion_title/index.tsx
deleted file mode 100644
index 66353a9613650..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/accordion_title/index.tsx
+++ /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 { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
-import React, { memo } from 'react';
-
-import { RuleStatusIcon, RuleStatusIconProps } from '../status_icon';
-
-interface AccordionTitleProps extends RuleStatusIconProps {
-  title: string;
-}
-
-export const AccordionTitle = memo<AccordionTitleProps>(({ name, title, type }) => (
-  <EuiFlexGroup alignItems="center" gutterSize="m" responsive={false}>
-    <EuiFlexItem grow={false}>
-      <RuleStatusIcon name={name} type={type} />
-    </EuiFlexItem>
-    <EuiFlexItem>
-      <EuiTitle size="s" className="euiAccordionForm__title">
-        <h6>{title}</h6>
-      </EuiTitle>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-));
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/add_item_form/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/add_item_form/index.tsx
deleted file mode 100644
index e972cd21b6be9..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/add_item_form/index.tsx
+++ /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 { EuiButtonEmpty, EuiButtonIcon, EuiFormRow, EuiFieldText, EuiSpacer } from '@elastic/eui';
-import { isEmpty } from 'lodash/fp';
-import React, { ChangeEvent, useCallback, useEffect, useState, useRef } from 'react';
-
-import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
-import * as CreateRuleI18n from '../../translations';
-
-interface AddItemProps {
-  addText: string;
-  field: FieldHook;
-  dataTestSubj: string;
-  idAria: string;
-  isDisabled: boolean;
-}
-
-export const AddItem = ({ addText, dataTestSubj, field, idAria, isDisabled }: AddItemProps) => {
-  const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
-  // const [items, setItems] = useState(['']);
-  const [haveBeenKeyboardDeleted, setHaveBeenKeyboardDeleted] = useState(-1);
-
-  const inputsRef = useRef<HTMLInputElement[]>([]);
-
-  const removeItem = useCallback(
-    (index: number) => {
-      const values = field.value as string[];
-      field.setValue([...values.slice(0, index), ...values.slice(index + 1)]);
-      inputsRef.current = [
-        ...inputsRef.current.slice(0, index),
-        ...inputsRef.current.slice(index + 1),
-      ];
-      inputsRef.current = inputsRef.current.map((ref, i) => {
-        if (i >= index && inputsRef.current[index] != null) {
-          ref.value = 're-render';
-        }
-        return ref;
-      });
-    },
-    [field]
-  );
-
-  const addItem = useCallback(() => {
-    const values = field.value as string[];
-    if (!isEmpty(values) && values[values.length - 1]) {
-      field.setValue([...values, '']);
-    } else if (isEmpty(values)) {
-      field.setValue(['']);
-    }
-  }, [field]);
-
-  const updateItem = useCallback(
-    (event: ChangeEvent<HTMLInputElement>, index: number) => {
-      event.persist();
-      const values = field.value as string[];
-      const value = event.target.value;
-      if (isEmpty(value)) {
-        field.setValue([...values.slice(0, index), ...values.slice(index + 1)]);
-        inputsRef.current = [
-          ...inputsRef.current.slice(0, index),
-          ...inputsRef.current.slice(index + 1),
-        ];
-        setHaveBeenKeyboardDeleted(inputsRef.current.length - 1);
-        inputsRef.current = inputsRef.current.map((ref, i) => {
-          if (i >= index && inputsRef.current[index] != null) {
-            ref.value = 're-render';
-          }
-          return ref;
-        });
-      } else {
-        field.setValue([...values.slice(0, index), value, ...values.slice(index + 1)]);
-      }
-    },
-    [field]
-  );
-
-  const handleLastInputRef = useCallback(
-    (index: number, element: HTMLInputElement | null) => {
-      if (element != null) {
-        inputsRef.current = [
-          ...inputsRef.current.slice(0, index),
-          element,
-          ...inputsRef.current.slice(index + 1),
-        ];
-      }
-    },
-    [inputsRef]
-  );
-
-  useEffect(() => {
-    if (
-      haveBeenKeyboardDeleted !== -1 &&
-      !isEmpty(inputsRef.current) &&
-      inputsRef.current[haveBeenKeyboardDeleted] != null
-    ) {
-      inputsRef.current[haveBeenKeyboardDeleted].focus();
-      setHaveBeenKeyboardDeleted(-1);
-    }
-  }, [haveBeenKeyboardDeleted, inputsRef.current]);
-
-  const values = field.value as string[];
-  return (
-    <EuiFormRow
-      label={field.label}
-      labelAppend={field.labelAppend}
-      error={errorMessage}
-      isInvalid={isInvalid}
-      fullWidth
-      data-test-subj={dataTestSubj}
-      describedByIds={idAria ? [idAria] : undefined}
-    >
-      <>
-        {values.map((item, index) => {
-          const euiFieldProps = {
-            disabled: isDisabled,
-            ...(index === values.length - 1
-              ? { inputRef: handleLastInputRef.bind(null, index) }
-              : {}),
-            ...((inputsRef.current[index] != null && inputsRef.current[index].value !== item) ||
-            inputsRef.current[index] == null
-              ? { value: item }
-              : {}),
-          };
-          return (
-            <div key={index}>
-              <EuiFieldText
-                append={
-                  <EuiButtonIcon
-                    color="danger"
-                    iconType="trash"
-                    isDisabled={isDisabled}
-                    onClick={() => removeItem(index)}
-                    aria-label={CreateRuleI18n.DELETE}
-                  />
-                }
-                onChange={e => updateItem(e, index)}
-                compressed
-                fullWidth
-                {...euiFieldProps}
-              />
-              {values.length - 1 !== index && <EuiSpacer size="s" />}
-            </div>
-          );
-        })}
-
-        <EuiButtonEmpty size="xs" onClick={addItem} isDisabled={isDisabled}>
-          {addText}
-        </EuiButtonEmpty>
-      </>
-    </EuiFormRow>
-  );
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/index.tsx
deleted file mode 100644
index e6fec597ed8ea..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/index.tsx
+++ /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 {
-  EuiBadge,
-  EuiDescriptionList,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiTextArea,
-  EuiLink,
-  EuiText,
-  EuiListGroup,
-} from '@elastic/eui';
-import { isEmpty, chunk, get, pick } from 'lodash/fp';
-import React, { memo, ReactNode } from 'react';
-import styled from 'styled-components';
-
-import {
-  IIndexPattern,
-  esFilters,
-  Query,
-} from '../../../../../../../../../../src/plugins/data/public';
-
-import { FilterLabel } from './filter_label';
-import { FormSchema } from '../shared_imports';
-import * as I18n from './translations';
-
-import { IMitreEnterpriseAttack } from '../../types';
-import { tacticsOptions, techniquesOptions } from '../../../mitre/mitre_tactics_techniques';
-
-interface StepRuleDescriptionProps {
-  data: unknown;
-  indexPatterns?: IIndexPattern;
-  schema: FormSchema;
-}
-
-const EuiBadgeWrap = styled(EuiBadge)`
-  .euiBadge__text {
-    white-space: pre-wrap !important;
-  }
-`;
-
-const EuiFlexItemWidth = styled(EuiFlexItem)`
-  width: 50%;
-`;
-
-const MyEuiListGroup = styled(EuiListGroup)`
-  padding: 0px;
-  .euiListGroupItem__button {
-    padding: 0px;
-  }
-`;
-
-const ThreatsEuiFlexGroup = styled(EuiFlexGroup)`
-  .euiFlexItem {
-    margin-bottom: 0px;
-  }
-`;
-
-export const StepRuleDescription = memo<StepRuleDescriptionProps>(
-  ({ data, indexPatterns, schema }) => {
-    const keys = Object.keys(schema);
-    const listItems = keys.reduce(
-      (acc: ListItems[], key: string) => [
-        ...acc,
-        ...buildListItems(data, pick(key, schema), indexPatterns),
-      ],
-      []
-    );
-    return (
-      <EuiFlexGroup gutterSize="none" direction="row" justifyContent="spaceAround">
-        {chunk(Math.ceil(listItems.length / 2), listItems).map((chunckListItems, index) => (
-          <EuiFlexItemWidth key={`description-step-rule-${index}`} grow={false}>
-            <EuiDescriptionList listItems={chunckListItems} />
-          </EuiFlexItemWidth>
-        ))}
-      </EuiFlexGroup>
-    );
-  }
-);
-
-interface ListItems {
-  title: NonNullable<ReactNode>;
-  description: NonNullable<ReactNode>;
-}
-
-const buildListItems = (
-  data: unknown,
-  schema: FormSchema,
-  indexPatterns?: IIndexPattern
-): ListItems[] =>
-  Object.keys(schema).reduce<ListItems[]>(
-    (acc, field) => [
-      ...acc,
-      ...getDescriptionItem(field, get([field, 'label'], schema), data, indexPatterns),
-    ],
-    []
-  );
-
-const getDescriptionItem = (
-  field: string,
-  label: string,
-  value: unknown,
-  indexPatterns?: IIndexPattern
-): ListItems[] => {
-  if (field === 'useIndicesConfig') {
-    return [];
-  } else if (field === 'queryBar' && indexPatterns != null) {
-    const filters = get('queryBar.filters', value) as esFilters.Filter[];
-    const query = get('queryBar.query', value) as Query;
-    const savedId = get('queryBar.saved_id', value);
-    let items: ListItems[] = [];
-    if (!isEmpty(filters)) {
-      items = [
-        ...items,
-        {
-          title: <>{I18n.FILTERS_LABEL}</>,
-          description: (
-            <EuiFlexGroup wrap responsive={false} gutterSize="xs">
-              {filters.map((filter, index) => (
-                <EuiFlexItem grow={false} key={`${field}-filter-${index}`}>
-                  <EuiBadgeWrap color="hollow">
-                    <FilterLabel
-                      filter={filter}
-                      valueLabel={esFilters.getDisplayValueFromFilter(filter, [indexPatterns])}
-                    />
-                  </EuiBadgeWrap>
-                </EuiFlexItem>
-              ))}
-            </EuiFlexGroup>
-          ),
-        },
-      ];
-    }
-    if (!isEmpty(query.query)) {
-      items = [
-        ...items,
-        {
-          title: <>{I18n.QUERY_LABEL}</>,
-          description: <>{query.query}</>,
-        },
-      ];
-    }
-    if (!isEmpty(savedId)) {
-      items = [
-        ...items,
-        {
-          title: <>{I18n.SAVED_ID_LABEL}</>,
-          description: <>{savedId}</>,
-        },
-      ];
-    }
-    return items;
-  } else if (field === 'threats') {
-    const threats: IMitreEnterpriseAttack[] = get(field, value).filter(
-      (threat: IMitreEnterpriseAttack) => threat.tactic.name !== 'none'
-    );
-    if (threats.length > 0) {
-      return [
-        {
-          title: label,
-          description: (
-            <ThreatsEuiFlexGroup direction="column">
-              {threats.map((threat, index) => {
-                const tactic = tacticsOptions.find(t => t.name === threat.tactic.name);
-                return (
-                  <EuiFlexItem key={`${threat.tactic.name}-${index}`}>
-                    <EuiText grow={false} size="s">
-                      <h5>
-                        <EuiLink href={threat.tactic.reference} target="_blank">
-                          {tactic != null ? tactic.text : ''}
-                        </EuiLink>
-                      </h5>
-                      <MyEuiListGroup
-                        flush={false}
-                        bordered={false}
-                        listItems={threat.techniques.map(technique => {
-                          const myTechnique = techniquesOptions.find(
-                            t => t.name === technique.name
-                          );
-                          return {
-                            label: myTechnique != null ? myTechnique.label : '',
-                            href: technique.reference,
-                            target: '_blank',
-                          };
-                        })}
-                      />
-                    </EuiText>
-                  </EuiFlexItem>
-                );
-              })}
-            </ThreatsEuiFlexGroup>
-          ),
-        },
-      ];
-    }
-    return [];
-  } else if (field === 'description') {
-    return [
-      {
-        title: label,
-        description: <EuiTextArea value={get(field, value)} readOnly={true} />,
-      },
-    ];
-  } else if (Array.isArray(get(field, value))) {
-    const values: string[] = get(field, value);
-    if (!isEmpty(values) && values.filter(val => !isEmpty(val)).length > 0) {
-      return [
-        {
-          title: label,
-          description: (
-            <EuiFlexGroup responsive={false} gutterSize="xs">
-              {values.map((val: string) =>
-                isEmpty(val) ? null : (
-                  <EuiFlexItem grow={false} key={`${field}-${val}`}>
-                    <EuiBadgeWrap color="hollow">{val}</EuiBadgeWrap>
-                  </EuiFlexItem>
-                )
-              )}
-            </EuiFlexGroup>
-          ),
-        },
-      ];
-    }
-    return [];
-  }
-  return [
-    {
-      title: label,
-      description: get(field, value),
-    },
-  ];
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/mitre/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/mitre/index.tsx
deleted file mode 100644
index 6ab4ca4b51447..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/mitre/index.tsx
+++ /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 {
-  EuiButtonEmpty,
-  EuiButtonIcon,
-  EuiFormRow,
-  EuiSelect,
-  EuiSpacer,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiComboBox,
-  EuiFormControlLayout,
-} from '@elastic/eui';
-import { isEmpty, kebabCase, camelCase } from 'lodash/fp';
-import React, { ChangeEvent, useCallback } from 'react';
-import styled from 'styled-components';
-
-import { tacticsOptions, techniquesOptions } from '../../../mitre/mitre_tactics_techniques';
-import * as CreateRuleI18n from '../../translations';
-import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
-import * as I18n from './translations';
-import { IMitreEnterpriseAttack } from '../../types';
-
-const MyEuiFormControlLayout = styled(EuiFormControlLayout)`
-  &.euiFormControlLayout--compressed {
-    height: fit-content !important;
-  }
-`;
-interface AddItemProps {
-  field: FieldHook;
-  dataTestSubj: string;
-  idAria: string;
-  isDisabled: boolean;
-}
-
-export const AddMitreThreat = ({ dataTestSubj, field, idAria, isDisabled }: AddItemProps) => {
-  const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
-
-  const removeItem = useCallback(
-    (index: number) => {
-      const values = field.value as string[];
-      field.setValue([...values.slice(0, index), ...values.slice(index + 1)]);
-    },
-    [field]
-  );
-
-  const addItem = useCallback(() => {
-    const values = field.value as IMitreEnterpriseAttack[];
-    if (!isEmpty(values[values.length - 1])) {
-      field.setValue([
-        ...values,
-        { tactic: { id: 'none', name: 'none', reference: 'none' }, techniques: [] },
-      ]);
-    } else {
-      field.setValue([{ tactic: { id: 'none', name: 'none', reference: 'none' }, techniques: [] }]);
-    }
-  }, [field]);
-
-  const updateTactic = useCallback(
-    (index: number, event: ChangeEvent<HTMLSelectElement>) => {
-      const values = field.value as IMitreEnterpriseAttack[];
-      const { id, reference, name } = tacticsOptions.find(t => t.value === event.target.value) || {
-        id: '',
-        name: '',
-        reference: '',
-      };
-      field.setValue([
-        ...values.slice(0, index),
-        {
-          ...values[index],
-          tactic: { id, reference, name },
-          techniques: [],
-        },
-        ...values.slice(index + 1),
-      ]);
-    },
-    [field]
-  );
-
-  const updateTechniques = useCallback(
-    (index: number, selectedOptions: unknown[]) => {
-      field.setValue([
-        ...values.slice(0, index),
-        {
-          ...values[index],
-          techniques: selectedOptions,
-        },
-        ...values.slice(index + 1),
-      ]);
-    },
-    [field]
-  );
-
-  const values = field.value as IMitreEnterpriseAttack[];
-
-  return (
-    <EuiFormRow
-      label={field.label}
-      labelAppend={field.labelAppend}
-      error={errorMessage}
-      isInvalid={isInvalid}
-      fullWidth
-      data-test-subj={dataTestSubj}
-      describedByIds={idAria ? [idAria] : undefined}
-    >
-      <>
-        {values.map((item, index) => {
-          const euiSelectFieldProps = {
-            disabled: isDisabled,
-          };
-          return (
-            <div key={index}>
-              <EuiFlexGroup gutterSize="xs" justifyContent="spaceBetween" alignItems="center">
-                <EuiFlexItem grow={false}>
-                  <EuiSelect
-                    id="selectDocExample"
-                    options={[
-                      ...(item.tactic.name === 'none'
-                        ? [{ text: I18n.TACTIC_PLACEHOLDER, value: 'none' }]
-                        : []),
-                      ...tacticsOptions.map(t => ({ text: t.text, value: t.value })),
-                    ]}
-                    aria-label=""
-                    onChange={updateTactic.bind(null, index)}
-                    prepend={I18n.TACTIC}
-                    compressed
-                    fullWidth={false}
-                    value={camelCase(item.tactic.name)}
-                    {...euiSelectFieldProps}
-                  />
-                </EuiFlexItem>
-                <EuiFlexItem grow={true}>
-                  <MyEuiFormControlLayout compressed fullWidth prepend={I18n.TECHNIQUES}>
-                    <EuiComboBox
-                      compressed
-                      placeholder={I18n.TECHNIQUES_PLACEHOLDER}
-                      options={techniquesOptions.filter(t =>
-                        t.tactics.includes(kebabCase(item.tactic.name))
-                      )}
-                      selectedOptions={item.techniques}
-                      onChange={updateTechniques.bind(null, index)}
-                      isDisabled={isDisabled}
-                      fullWidth={true}
-                    />
-                  </MyEuiFormControlLayout>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiButtonIcon
-                    color="danger"
-                    iconType="trash"
-                    isDisabled={isDisabled}
-                    onClick={() => removeItem(index)}
-                    aria-label={CreateRuleI18n.DELETE}
-                  />
-                </EuiFlexItem>
-              </EuiFlexGroup>
-              {values.length - 1 !== index && <EuiSpacer size="s" />}
-            </div>
-          );
-        })}
-        <EuiButtonEmpty size="xs" onClick={addItem} isDisabled={isDisabled}>
-          {I18n.ADD_MITRE_ATTACK}
-        </EuiButtonEmpty>
-      </>
-    </EuiFormRow>
-  );
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/query_bar/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/query_bar/index.tsx
deleted file mode 100644
index 8dc402f00e621..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/query_bar/index.tsx
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiFormRow, EuiMutationObserver } from '@elastic/eui';
-import { isEqual } from 'lodash/fp';
-import React, { useCallback, useEffect, useState } from 'react';
-import { Subscription } from 'rxjs';
-import styled from 'styled-components';
-
-import {
-  esFilters,
-  IIndexPattern,
-  Query,
-  FilterManager,
-  SavedQuery,
-  SavedQueryTimeFilter,
-} from '../../../../../../../../../../src/plugins/data/public';
-
-import { QueryBar } from '../../../../../components/query_bar';
-import { useKibanaCore } from '../../../../../lib/compose/kibana_core';
-import { useSavedQueryServices } from '../../../../../utils/saved_query_services';
-
-import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
-
-export interface FieldValueQueryBar {
-  filters: esFilters.Filter[];
-  query: Query;
-  saved_id: string | null;
-}
-interface QueryBarDefineRuleProps {
-  dataTestSubj: string;
-  field: FieldHook;
-  idAria: string;
-  isLoading: boolean;
-  indexPattern: IIndexPattern;
-  resizeParentContainer?: (height: number) => void;
-}
-
-const StyledEuiFormRow = styled(EuiFormRow)`
-  .kbnTypeahead__items {
-    max-height: 14vh !important;
-  }
-  .globalQueryBar {
-    padding: 4px 0px 0px 0px;
-    .kbnQueryBar {
-      & > div:first-child {
-        margin: 0px 0px 0px 4px;
-      }
-    }
-  }
-`;
-
-// TODO need to add disabled in the SearchBar
-
-export const QueryBarDefineRule = ({
-  dataTestSubj,
-  field,
-  idAria,
-  indexPattern,
-  isLoading = false,
-  resizeParentContainer,
-}: QueryBarDefineRuleProps) => {
-  const [originalHeight, setOriginalHeight] = useState(-1);
-  const [savedQuery, setSavedQuery] = useState<SavedQuery | null>(null);
-  const [queryDraft, setQueryDraft] = useState<Query>({ query: '', language: 'kuery' });
-  const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
-
-  const core = useKibanaCore();
-  const [filterManager] = useState<FilterManager>(new FilterManager(core.uiSettings));
-
-  const savedQueryServices = useSavedQueryServices();
-
-  useEffect(() => {
-    let isSubscribed = true;
-    const subscriptions = new Subscription();
-    filterManager.setFilters([]);
-
-    subscriptions.add(
-      filterManager.getUpdates$().subscribe({
-        next: () => {
-          if (isSubscribed) {
-            const newFilters = filterManager.getFilters();
-            const { filters } = field.value as FieldValueQueryBar;
-
-            if (!isEqual(filters, newFilters)) {
-              field.setValue({ ...(field.value as FieldValueQueryBar), filters: newFilters });
-            }
-          }
-        },
-      })
-    );
-
-    return () => {
-      isSubscribed = false;
-      subscriptions.unsubscribe();
-    };
-  }, [field.value]);
-
-  useEffect(() => {
-    let isSubscribed = true;
-    async function updateFilterQueryFromValue() {
-      const { filters, query, saved_id: savedId } = field.value as FieldValueQueryBar;
-      if (!isEqual(query, queryDraft)) {
-        setQueryDraft(query);
-      }
-      if (!isEqual(filters, filterManager.getFilters())) {
-        filterManager.setFilters(filters);
-      }
-      if (
-        (savedId != null && savedQuery != null && savedId !== savedQuery.id) ||
-        (savedId != null && savedQuery == null)
-      ) {
-        try {
-          const mySavedQuery = await savedQueryServices.getSavedQuery(savedId);
-          if (isSubscribed && mySavedQuery != null) {
-            setSavedQuery(mySavedQuery);
-          }
-        } catch {
-          setSavedQuery(null);
-        }
-      } else if (savedId == null && savedQuery != null) {
-        setSavedQuery(null);
-      }
-    }
-    updateFilterQueryFromValue();
-    return () => {
-      isSubscribed = false;
-    };
-  }, [field.value]);
-
-  const onSubmitQuery = useCallback(
-    (newQuery: Query, timefilter?: SavedQueryTimeFilter) => {
-      const { query } = field.value as FieldValueQueryBar;
-      if (!isEqual(query, newQuery)) {
-        field.setValue({ ...(field.value as FieldValueQueryBar), query: newQuery });
-      }
-    },
-    [field]
-  );
-
-  const onChangedQuery = useCallback(
-    (newQuery: Query) => {
-      const { query } = field.value as FieldValueQueryBar;
-      if (!isEqual(query, newQuery)) {
-        field.setValue({ ...(field.value as FieldValueQueryBar), query: newQuery });
-      }
-    },
-    [field]
-  );
-
-  const onSavedQuery = useCallback(
-    (newSavedQuery: SavedQuery | null) => {
-      if (newSavedQuery != null) {
-        const { saved_id: savedId } = field.value as FieldValueQueryBar;
-        if (newSavedQuery.id !== savedId) {
-          setSavedQuery(newSavedQuery);
-          field.setValue({
-            filters: newSavedQuery.attributes.filters,
-            query: newSavedQuery.attributes.query,
-            saved_id: newSavedQuery.id,
-          });
-        }
-      }
-    },
-    [field.value]
-  );
-
-  const onMutation = (event: unknown, observer: unknown) => {
-    if (resizeParentContainer != null) {
-      const suggestionContainer = document.getElementById('kbnTypeahead__items');
-      if (suggestionContainer != null) {
-        const box = suggestionContainer.getBoundingClientRect();
-        const accordionContainer = document.getElementById('define-rule');
-        if (accordionContainer != null) {
-          const accordionBox = accordionContainer.getBoundingClientRect();
-          if (originalHeight === -1 || accordionBox.height < originalHeight + box.height) {
-            resizeParentContainer(originalHeight + box.height - 100);
-          }
-          if (originalHeight === -1) {
-            setOriginalHeight(accordionBox.height);
-          }
-        }
-      } else {
-        resizeParentContainer(-1);
-      }
-    }
-  };
-
-  return (
-    <StyledEuiFormRow
-      label={field.label}
-      labelAppend={field.labelAppend}
-      helpText={field.helpText}
-      error={errorMessage}
-      isInvalid={isInvalid}
-      fullWidth
-      data-test-subj={dataTestSubj}
-      describedByIds={idAria ? [idAria] : undefined}
-    >
-      <EuiMutationObserver
-        observerOptions={{ subtree: true, attributes: true, childList: true }}
-        onMutation={onMutation}
-      >
-        {mutationRef => (
-          <div ref={mutationRef}>
-            <QueryBar
-              indexPattern={indexPattern}
-              isLoading={isLoading}
-              isRefreshPaused={false}
-              filterQuery={queryDraft}
-              filterManager={filterManager}
-              filters={filterManager.getFilters() || []}
-              onChangedQuery={onChangedQuery}
-              onSubmitQuery={onSubmitQuery}
-              savedQuery={savedQuery}
-              onSavedQuery={onSavedQuery}
-            />
-          </div>
-        )}
-      </EuiMutationObserver>
-    </StyledEuiFormRow>
-  );
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/schedule_item_form/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/schedule_item_form/index.tsx
deleted file mode 100644
index ebb365f6087a9..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/schedule_item_form/index.tsx
+++ /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 { EuiFieldNumber, EuiFormRow, EuiSelect } from '@elastic/eui';
-import { isEmpty } from 'lodash/fp';
-import React, { useCallback, useEffect, useState } from 'react';
-import styled from 'styled-components';
-
-import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
-
-import * as I18n from './translations';
-
-interface ScheduleItemProps {
-  field: FieldHook;
-  dataTestSubj: string;
-  idAria: string;
-  isDisabled: boolean;
-}
-
-const timeTypeOptions = [
-  { value: 's', text: I18n.SECONDS },
-  { value: 'm', text: I18n.MINUTES },
-  { value: 'h', text: I18n.HOURS },
-];
-
-const StyledEuiFormRow = styled(EuiFormRow)`
-  .euiFormControlLayout {
-    max-width: 200px !important;
-  }
-`;
-
-export const ScheduleItem = ({ dataTestSubj, field, idAria, isDisabled }: ScheduleItemProps) => {
-  const [timeType, setTimeType] = useState('s');
-  const [timeVal, setTimeVal] = useState<number>(0);
-  const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
-
-  const onChangeTimeType = useCallback(e => {
-    setTimeType(e.target.value);
-  }, []);
-
-  const onChangeTimeVal = useCallback(e => {
-    const sanitizedValue: number = parseInt(e.target.value, 10);
-    setTimeVal(isNaN(sanitizedValue) ? 0 : sanitizedValue);
-  }, []);
-
-  useEffect(() => {
-    if (!isEmpty(timeVal) && Number(timeVal) >= 0 && field.value !== `${timeVal}${timeType}`) {
-      field.setValue(`${timeVal}${timeType}`);
-    }
-  }, [field.value, timeType, timeVal]);
-
-  useEffect(() => {
-    if (!isEmpty(field.value)) {
-      const filterTimeVal = (field.value as string).match(/\d+/g);
-      const filterTimeType = (field.value as string).match(/[a-zA-Z]+/g);
-      if (
-        !isEmpty(filterTimeVal) &&
-        filterTimeVal != null &&
-        !isNaN(Number(filterTimeVal[0])) &&
-        Number(filterTimeVal[0]) !== Number(timeVal)
-      ) {
-        setTimeVal(Number(filterTimeVal[0]));
-      }
-      if (
-        !isEmpty(filterTimeType) &&
-        filterTimeType != null &&
-        ['s', 'm', 'h'].includes(filterTimeType[0]) &&
-        filterTimeType[0] !== timeType
-      ) {
-        setTimeType(filterTimeType[0]);
-      }
-    }
-  }, [field.value]);
-
-  // EUI missing some props
-  const rest = { disabled: isDisabled };
-
-  return (
-    <StyledEuiFormRow
-      label={field.label}
-      labelAppend={field.labelAppend}
-      helpText={field.helpText}
-      error={errorMessage}
-      isInvalid={isInvalid}
-      fullWidth
-      data-test-subj={dataTestSubj}
-      describedByIds={idAria ? [idAria] : undefined}
-    >
-      <EuiFieldNumber
-        append={
-          <EuiSelect
-            compressed={true}
-            fullWidth={false}
-            options={timeTypeOptions}
-            onChange={onChangeTimeType}
-            value={timeType}
-            {...rest}
-          />
-        }
-        compressed
-        fullWidth
-        min={0}
-        onChange={onChangeTimeVal}
-        value={timeVal}
-        {...rest}
-      />
-    </StyledEuiFormRow>
-  );
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/status_icon/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/status_icon/index.tsx
deleted file mode 100644
index 22b116557ae6e..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/status_icon/index.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 { EuiAvatar, EuiIcon } from '@elastic/eui';
-import React, { memo } from 'react';
-import styled from 'styled-components';
-
-import { useEuiTheme } from '../../../../../lib/theme/use_eui_theme';
-import { RuleStatusType } from '../../types';
-
-export interface RuleStatusIconProps {
-  name: string;
-  type: RuleStatusType;
-}
-
-const RuleStatusIconStyled = styled.div`
-  position: relative;
-  svg {
-    position: absolute;
-    top: 8px;
-    left: 9px;
-  }
-`;
-
-export const RuleStatusIcon = memo<RuleStatusIconProps>(({ name, type }) => {
-  const theme = useEuiTheme();
-  const color = type === 'passive' ? theme.euiColorLightestShade : theme.euiColorDarkestShade;
-  return (
-    <RuleStatusIconStyled>
-      <EuiAvatar color={color} name={type === 'valid' ? '' : name} size="l" />
-      {type === 'valid' ? <EuiIcon type="check" color={theme.euiColorEmptyShade} size="l" /> : null}
-    </RuleStatusIconStyled>
-  );
-});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/index.tsx
deleted file mode 100644
index aeb70061c44bf..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/index.tsx
+++ /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 { EuiButton, EuiHorizontalRule, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import React, { memo, useCallback, useState } from 'react';
-
-import { RuleStepProps, RuleStep, AboutStepRule } from '../../types';
-import * as CreateRuleI18n from '../../translations';
-import { Field, Form, FormDataProvider, getUseField, UseField, useForm } from '../shared_imports';
-import { AddItem } from '../add_item_form';
-import { defaultRiskScoreBySeverity, severityOptions, SeverityValue } from './data';
-import { defaultValue } from './default_value';
-import { schema } from './schema';
-import * as I18n from './translations';
-import { StepRuleDescription } from '../description_step';
-import { AddMitreThreat } from '../mitre';
-
-const CommonUseField = getUseField({ component: Field });
-
-export const StepAboutRule = memo<RuleStepProps>(({ isEditView, isLoading, setStepData }) => {
-  const [myStepData, setMyStepData] = useState<AboutStepRule>(defaultValue);
-  const { form } = useForm({
-    defaultValue: myStepData,
-    options: { stripEmptyFields: false },
-    schema,
-  });
-
-  const onSubmit = useCallback(async () => {
-    const { isValid, data } = await form.submit();
-    if (isValid) {
-      setStepData(RuleStep.aboutRule, data, isValid);
-      setMyStepData({ ...data, isNew: false } as AboutStepRule);
-    }
-  }, [form]);
-
-  return isEditView && myStepData != null ? (
-    <StepRuleDescription schema={schema} data={myStepData} />
-  ) : (
-    <>
-      <Form form={form} data-test-subj="stepAboutRule">
-        <CommonUseField
-          path="name"
-          componentProps={{
-            idAria: 'detectionEngineStepAboutRuleName',
-            'data-test-subj': 'detectionEngineStepAboutRuleName',
-            euiFieldProps: {
-              compressed: true,
-              fullWidth: false,
-              disabled: isLoading,
-            },
-          }}
-        />
-        <CommonUseField
-          path="description"
-          componentProps={{
-            compressed: true,
-            idAria: 'detectionEngineStepAboutRuleDescription',
-            'data-test-subj': 'detectionEngineStepAboutRuleDescription',
-            euiFieldProps: {
-              compressed: true,
-              disabled: isLoading,
-            },
-          }}
-        />
-        <CommonUseField
-          path="severity"
-          componentProps={{
-            idAria: 'detectionEngineStepAboutRuleSeverity',
-            'data-test-subj': 'detectionEngineStepAboutRuleSeverity',
-            euiFieldProps: {
-              compressed: true,
-              fullWidth: false,
-              disabled: isLoading,
-              options: severityOptions,
-            },
-          }}
-        />
-        <CommonUseField
-          path="riskScore"
-          componentProps={{
-            idAria: 'detectionEngineStepAboutRuleRiskScore',
-            'data-test-subj': 'detectionEngineStepAboutRuleRiskScore',
-            euiFieldProps: {
-              max: 100,
-              min: 0,
-              compressed: true,
-              fullWidth: false,
-              disabled: isLoading,
-              options: severityOptions,
-            },
-          }}
-        />
-        <UseField
-          path="references"
-          component={AddItem}
-          componentProps={{
-            compressed: true,
-            addText: I18n.ADD_REFERENCE,
-            idAria: 'detectionEngineStepAboutRuleReferenceUrls',
-            isDisabled: isLoading,
-            dataTestSubj: 'detectionEngineStepAboutRuleReferenceUrls',
-          }}
-        />
-        <UseField
-          path="falsePositives"
-          component={AddItem}
-          componentProps={{
-            compressed: true,
-            addText: I18n.ADD_FALSE_POSITIVE,
-            idAria: 'detectionEngineStepAboutRuleFalsePositives',
-            isDisabled: isLoading,
-            dataTestSubj: 'detectionEngineStepAboutRuleFalsePositives',
-          }}
-        />
-        <UseField
-          path="threats"
-          component={AddMitreThreat}
-          componentProps={{
-            compressed: true,
-            idAria: 'detectionEngineStepAboutRuleMitreThreats',
-            isDisabled: isLoading,
-            dataTestSubj: 'detectionEngineStepAboutRuleMitreThreats',
-          }}
-        />
-        <CommonUseField
-          path="tags"
-          componentProps={{
-            idAria: 'detectionEngineStepAboutRuleTags',
-            'data-test-subj': 'detectionEngineStepAboutRuleTags',
-            euiFieldProps: {
-              compressed: true,
-              fullWidth: true,
-              isDisabled: isLoading,
-            },
-          }}
-        />
-        <FormDataProvider pathsToWatch="severity">
-          {({ severity }) => {
-            const newRiskScore = defaultRiskScoreBySeverity[severity as SeverityValue];
-            const riskScoreField = form.getFields().riskScore;
-            if (newRiskScore != null && riskScoreField.value !== newRiskScore) {
-              riskScoreField.setValue(newRiskScore);
-            }
-            return null;
-          }}
-        </FormDataProvider>
-      </Form>
-      <EuiHorizontalRule margin="m" />
-      <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="xs" responsive={false}>
-        <EuiFlexItem grow={false}>
-          <EuiButton fill onClick={onSubmit} isDisabled={isLoading}>
-            {myStepData.isNew ? CreateRuleI18n.CONTINUE : CreateRuleI18n.UPDATE}
-          </EuiButton>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </>
-  );
-});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/schema.tsx
deleted file mode 100644
index 534c3142335c5..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/schema.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * 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 } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { isEmpty } from 'lodash/fp';
-import React from 'react';
-
-import * as CreateRuleI18n from '../../translations';
-import { IMitreEnterpriseAttack } from '../../types';
-import {
-  FIELD_TYPES,
-  fieldValidators,
-  FormSchema,
-  ValidationFunc,
-  ERROR_CODE,
-} from '../shared_imports';
-import * as I18n from './translations';
-
-const { emptyField } = fieldValidators;
-
-export const schema: FormSchema = {
-  name: {
-    type: FIELD_TYPES.TEXT,
-    label: i18n.translate('xpack.siem.detectionEngine.createRule.stepAboutRule.fieldNameLabel', {
-      defaultMessage: 'Name',
-    }),
-    validations: [
-      {
-        validator: emptyField(
-          i18n.translate(
-            'xpack.siem.detectionEngine.createRule.stepAboutRule.nameFieldRequiredError',
-            {
-              defaultMessage: 'A name is required.',
-            }
-          )
-        ),
-      },
-    ],
-  },
-  description: {
-    type: FIELD_TYPES.TEXTAREA,
-    label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldDescriptionLabel',
-      {
-        defaultMessage: 'Description',
-      }
-    ),
-    validations: [
-      {
-        validator: emptyField(
-          i18n.translate(
-            'xpack.siem.detectionEngine.createRule.stepAboutRule.descriptionFieldRequiredError',
-            {
-              defaultMessage: 'A description is required.',
-            }
-          )
-        ),
-      },
-    ],
-  },
-  severity: {
-    type: FIELD_TYPES.SELECT,
-    label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldSeverityLabel',
-      {
-        defaultMessage: 'Severity',
-      }
-    ),
-    validations: [
-      {
-        validator: emptyField(
-          i18n.translate(
-            'xpack.siem.detectionEngine.createRule.stepAboutRule.severityFieldRequiredError',
-            {
-              defaultMessage: 'A severity is required.',
-            }
-          )
-        ),
-      },
-    ],
-  },
-  riskScore: {
-    type: FIELD_TYPES.RANGE,
-    label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldRiskScoreLabel',
-      {
-        defaultMessage: 'Risk score',
-      }
-    ),
-  },
-  references: {
-    label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldReferenceUrlsLabel',
-      {
-        defaultMessage: 'Reference URLs',
-      }
-    ),
-    labelAppend: <EuiText size="xs">{CreateRuleI18n.OPTIONAL_FIELD}</EuiText>,
-  },
-  falsePositives: {
-    label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldFalsePositiveLabel',
-      {
-        defaultMessage: 'False positives',
-      }
-    ),
-    labelAppend: <EuiText size="xs">{CreateRuleI18n.OPTIONAL_FIELD}</EuiText>,
-  },
-  threats: {
-    label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldMitreThreatLabel',
-      {
-        defaultMessage: 'MITRE ATT&CK',
-      }
-    ),
-    labelAppend: <EuiText size="xs">{CreateRuleI18n.OPTIONAL_FIELD}</EuiText>,
-    validations: [
-      {
-        validator: (
-          ...args: Parameters<ValidationFunc>
-        ): ReturnType<ValidationFunc<{}, ERROR_CODE>> | undefined => {
-          const [{ value, path }] = args;
-          let hasError = false;
-          (value as IMitreEnterpriseAttack[]).forEach(v => {
-            if (isEmpty(v.tactic.name) || (v.tactic.name !== 'none' && isEmpty(v.techniques))) {
-              hasError = true;
-            }
-          });
-          return hasError
-            ? {
-                code: 'ERR_FIELD_MISSING',
-                path,
-                message: I18n.CUSTOM_MITRE_ATTACK_TECHNIQUES_REQUIRED,
-              }
-            : undefined;
-        },
-      },
-    ],
-  },
-  tags: {
-    type: FIELD_TYPES.COMBO_BOX,
-    label: i18n.translate('xpack.siem.detectionEngine.createRule.stepAboutRule.fieldTagsLabel', {
-      defaultMessage: 'Tags',
-    }),
-    labelAppend: <EuiText size="xs">{CreateRuleI18n.OPTIONAL_FIELD}</EuiText>,
-  },
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_define_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_define_rule/index.tsx
deleted file mode 100644
index 6954bd6bf733f..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_define_rule/index.tsx
+++ /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 { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui';
-import { isEqual } from 'lodash/fp';
-import React, { memo, useCallback, useState } from 'react';
-
-import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/public';
-import { useFetchIndexPatterns } from '../../../../../containers/detection_engine/rules/fetch_index_patterns';
-import { DEFAULT_INDEX_KEY } from '../../../../../../common/constants';
-import { useKibanaUiSetting } from '../../../../../lib/settings/use_kibana_ui_setting';
-import * as CreateRuleI18n from '../../translations';
-import { DefineStepRule, RuleStep, RuleStepProps } from '../../types';
-import { StepRuleDescription } from '../description_step';
-import { QueryBarDefineRule } from '../query_bar';
-import { Field, Form, FormDataProvider, getUseField, UseField, useForm } from '../shared_imports';
-import { schema } from './schema';
-import * as I18n from './translations';
-
-const CommonUseField = getUseField({ component: Field });
-
-export const StepDefineRule = memo<RuleStepProps>(
-  ({ isEditView, isLoading, resizeParentContainer, setStepData }) => {
-    const [localUseIndicesConfig, setLocalUseIndicesConfig] = useState('');
-    const [
-      { indexPatterns: indexPatternQueryBar, isLoading: indexPatternLoadingQueryBar },
-      setIndices,
-    ] = useFetchIndexPatterns();
-    const [indicesConfig] = useKibanaUiSetting(DEFAULT_INDEX_KEY);
-    const [myStepData, setMyStepData] = useState<DefineStepRule>({
-      index: indicesConfig || [],
-      isNew: true,
-      queryBar: {
-        query: { query: '', language: 'kuery' },
-        filters: [],
-        saved_id: null,
-      },
-      useIndicesConfig: 'true',
-    });
-    const { form } = useForm({
-      schema,
-      defaultValue: myStepData,
-      options: { stripEmptyFields: false },
-    });
-
-    const onSubmit = useCallback(async () => {
-      const { isValid, data } = await form.submit();
-      if (isValid) {
-        setStepData(RuleStep.defineRule, data, isValid);
-        setMyStepData({ ...data, isNew: false } as DefineStepRule);
-      }
-    }, [form]);
-
-    return isEditView && myStepData != null ? (
-      <StepRuleDescription
-        indexPatterns={indexPatternQueryBar as IIndexPattern}
-        schema={schema}
-        data={myStepData}
-      />
-    ) : (
-      <>
-        <Form form={form} data-test-subj="stepDefineRule">
-          <CommonUseField
-            path="useIndicesConfig"
-            componentProps={{
-              idAria: 'detectionEngineStepDefineRuleUseIndicesConfig',
-              'data-test-subj': 'detectionEngineStepDefineRuleUseIndicesConfig',
-              euiFieldProps: {
-                disabled: isLoading,
-                options: [
-                  {
-                    id: 'true',
-                    label: I18n.CONFIG_INDICES,
-                  },
-                  {
-                    id: 'false',
-                    label: I18n.CUSTOM_INDICES,
-                  },
-                ],
-              },
-            }}
-          />
-          <CommonUseField
-            path="index"
-            componentProps={{
-              idAria: 'detectionEngineStepDefineRuleIndices',
-              'data-test-subj': 'detectionEngineStepDefineRuleIndices',
-              euiFieldProps: {
-                compressed: true,
-                fullWidth: true,
-                isDisabled: isLoading,
-              },
-            }}
-          />
-          <UseField
-            path="queryBar"
-            component={QueryBarDefineRule}
-            componentProps={{
-              compressed: true,
-              loading: indexPatternLoadingQueryBar,
-              idAria: 'detectionEngineStepDefineRuleQueryBar',
-              indexPattern: indexPatternQueryBar,
-              isDisabled: isLoading,
-              isLoading: indexPatternLoadingQueryBar,
-              dataTestSubj: 'detectionEngineStepDefineRuleQueryBar',
-              resizeParentContainer,
-            }}
-          />
-          <FormDataProvider pathsToWatch="useIndicesConfig">
-            {({ useIndicesConfig }) => {
-              if (localUseIndicesConfig !== useIndicesConfig) {
-                const indexField = form.getFields().index;
-                if (
-                  indexField != null &&
-                  useIndicesConfig === 'true' &&
-                  !isEqual(indexField.value, indicesConfig)
-                ) {
-                  indexField.setValue(indicesConfig);
-                  setIndices(indicesConfig);
-                } else if (
-                  indexField != null &&
-                  useIndicesConfig === 'false' &&
-                  isEqual(indexField.value, indicesConfig)
-                ) {
-                  indexField.setValue([]);
-                  setIndices([]);
-                }
-                setLocalUseIndicesConfig(useIndicesConfig);
-              }
-
-              return null;
-            }}
-          </FormDataProvider>
-        </Form>
-        <EuiHorizontalRule margin="m" />
-        <EuiFlexGroup
-          alignItems="center"
-          justifyContent="flexEnd"
-          gutterSize="xs"
-          responsive={false}
-        >
-          <EuiFlexItem grow={false}>
-            <EuiButton fill onClick={onSubmit} isDisabled={isLoading}>
-              {myStepData.isNew ? CreateRuleI18n.CONTINUE : CreateRuleI18n.UPDATE}
-            </EuiButton>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </>
-    );
-  }
-);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_define_rule/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_define_rule/schema.tsx
deleted file mode 100644
index 0f6c5f72e1683..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_define_rule/schema.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-import { EuiText } from '@elastic/eui';
-import { isEmpty } from 'lodash/fp';
-import React from 'react';
-
-import { esKuery } from '../../../../../../../../../../src/plugins/data/public';
-
-import * as CreateRuleI18n from '../../translations';
-
-import { FieldValueQueryBar } from '../query_bar';
-import {
-  ERROR_CODE,
-  FIELD_TYPES,
-  fieldValidators,
-  FormSchema,
-  ValidationFunc,
-} from '../shared_imports';
-import { CUSTOM_QUERY_REQUIRED, INVALID_CUSTOM_QUERY } from './translations';
-
-const { emptyField } = fieldValidators;
-
-export const schema: FormSchema = {
-  useIndicesConfig: {
-    type: FIELD_TYPES.RADIO_GROUP,
-    label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepDefineRule.fieldIndicesTypeLabel',
-      {
-        defaultMessage: 'Indices type',
-      }
-    ),
-  },
-  index: {
-    type: FIELD_TYPES.COMBO_BOX,
-    label: i18n.translate('xpack.siem.detectionEngine.createRule.stepAboutRule.fiedIndicesLabel', {
-      defaultMessage: 'Indices',
-    }),
-    labelAppend: <EuiText size="xs">{CreateRuleI18n.OPTIONAL_FIELD}</EuiText>,
-    validations: [
-      {
-        validator: emptyField(
-          i18n.translate(
-            'xpack.siem.detectionEngine.createRule.stepDefineRule.outputIndiceNameFieldRequiredError',
-            {
-              defaultMessage: 'An output indice name for signals is required.',
-            }
-          )
-        ),
-      },
-    ],
-  },
-  queryBar: {
-    label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepDefineRule.fieldQuerBarLabel',
-      {
-        defaultMessage: 'Custom query',
-      }
-    ),
-    validations: [
-      {
-        validator: (
-          ...args: Parameters<ValidationFunc>
-        ): ReturnType<ValidationFunc<{}, ERROR_CODE>> | undefined => {
-          const [{ value, path }] = args;
-          const { query, filters } = value as FieldValueQueryBar;
-          return isEmpty(query.query as string) && isEmpty(filters)
-            ? {
-                code: 'ERR_FIELD_MISSING',
-                path,
-                message: CUSTOM_QUERY_REQUIRED,
-              }
-            : undefined;
-        },
-      },
-      {
-        validator: (
-          ...args: Parameters<ValidationFunc>
-        ): ReturnType<ValidationFunc<{}, ERROR_CODE>> | undefined => {
-          const [{ value, path }] = args;
-          const { query } = value as FieldValueQueryBar;
-          if (!isEmpty(query.query as string) && query.language === 'kuery') {
-            try {
-              esKuery.fromKueryExpression(query.query);
-            } catch (err) {
-              return {
-                code: 'ERR_FIELD_FORMAT',
-                path,
-                message: INVALID_CUSTOM_QUERY,
-              };
-            }
-          }
-          return undefined;
-        },
-      },
-    ],
-  },
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_schedule_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_schedule_rule/index.tsx
deleted file mode 100644
index bd4d5aa4f8ca1..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_schedule_rule/index.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 { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui';
-import React, { memo, useCallback, useState } from 'react';
-
-import { RuleStep, RuleStepProps, ScheduleStepRule } from '../../types';
-import { StepRuleDescription } from '../description_step';
-import { ScheduleItem } from '../schedule_item_form';
-import { Form, UseField, useForm } from '../shared_imports';
-import { schema } from './schema';
-import * as I18n from './translations';
-
-export const StepScheduleRule = memo<RuleStepProps>(({ isEditView, isLoading, setStepData }) => {
-  const [myStepData, setMyStepData] = useState<ScheduleStepRule>({
-    enabled: true,
-    interval: '5m',
-    isNew: true,
-    from: '0m',
-  });
-  const { form } = useForm({
-    schema,
-    defaultValue: myStepData,
-    options: { stripEmptyFields: false },
-  });
-
-  const onSubmit = useCallback(
-    async (enabled: boolean) => {
-      const { isValid: newIsValid, data } = await form.submit();
-      if (newIsValid) {
-        setStepData(RuleStep.scheduleRule, { ...data, enabled }, newIsValid);
-        setMyStepData({ ...data, isNew: false } as ScheduleStepRule);
-      }
-    },
-    [form]
-  );
-
-  return isEditView && myStepData != null ? (
-    <StepRuleDescription schema={schema} data={myStepData} />
-  ) : (
-    <>
-      <Form form={form} data-test-subj="stepScheduleRule">
-        <UseField
-          path="interval"
-          component={ScheduleItem}
-          componentProps={{
-            compressed: true,
-            idAria: 'detectionEngineStepScheduleRuleInterval',
-            isDisabled: isLoading,
-            dataTestSubj: 'detectionEngineStepScheduleRuleInterval',
-          }}
-        />
-        <UseField
-          path="from"
-          component={ScheduleItem}
-          componentProps={{
-            compressed: true,
-            idAria: 'detectionEngineStepScheduleRuleFrom',
-            isDisabled: isLoading,
-            dataTestSubj: 'detectionEngineStepScheduleRuleFrom',
-          }}
-        />
-      </Form>
-      <EuiHorizontalRule margin="s" />
-      <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="xs" responsive={false}>
-        <EuiFlexItem grow={false}>
-          <EuiButton
-            fill={false}
-            isDisabled={isLoading}
-            isLoading={isLoading}
-            onClick={onSubmit.bind(null, false)}
-          >
-            {I18n.COMPLETE_WITHOUT_ACTIVATING}
-          </EuiButton>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiButton
-            fill
-            isDisabled={isLoading}
-            isLoading={isLoading}
-            onClick={onSubmit.bind(null, true)}
-          >
-            {I18n.COMPLETE_WITH_ACTIVATING}
-          </EuiButton>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </>
-  );
-});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_schedule_rule/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_schedule_rule/schema.tsx
deleted file mode 100644
index 7e7bd541bdb0b..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_schedule_rule/schema.tsx
+++ /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 { EuiText } from '@elastic/eui';
-import React from 'react';
-import { i18n } from '@kbn/i18n';
-
-import * as CreateRuleI18n from '../../translations';
-import { FormSchema } from '../shared_imports';
-
-export const schema: FormSchema = {
-  interval: {
-    label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepScheduleRule.fieldIntervalLabel',
-      {
-        defaultMessage: 'Rule run interval & look-back',
-      }
-    ),
-    helpText: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepScheduleRule.fieldIntervalHelpText',
-      {
-        defaultMessage: 'How often and how far back this rule will search specified indices.',
-      }
-    ),
-  },
-  from: {
-    label: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepScheduleRule.fieldAdditionalLookBackLabel',
-      {
-        defaultMessage: 'Additional look-back',
-      }
-    ),
-    labelAppend: <EuiText size="xs">{CreateRuleI18n.OPTIONAL_FIELD}</EuiText>,
-    helpText: i18n.translate(
-      'xpack.siem.detectionEngine.createRule.stepScheduleRule.fieldAdditionalLookBackHelpText',
-      {
-        defaultMessage:
-          'Add more time to the look-back range in order to prevent potential gaps in signal reporting.',
-      }
-    ),
-  },
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/helpers.ts
deleted file mode 100644
index f6546a680ad81..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/helpers.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { isEmpty } from 'lodash/fp';
-import moment from 'moment';
-
-import { NewRule } from '../../../containers/detection_engine/rules/types';
-
-import {
-  AboutStepRule,
-  DefineStepRule,
-  ScheduleStepRule,
-  DefineStepRuleJson,
-  ScheduleStepRuleJson,
-  AboutStepRuleJson,
-  FormatRuleType,
-} from './types';
-
-const getTimeTypeValue = (time: string): { unit: string; value: number } => {
-  const timeObj = {
-    unit: '',
-    value: 0,
-  };
-  const filterTimeVal = (time as string).match(/\d+/g);
-  const filterTimeType = (time as string).match(/[a-zA-Z]+/g);
-  if (!isEmpty(filterTimeVal) && filterTimeVal != null && !isNaN(Number(filterTimeVal[0]))) {
-    timeObj.value = Number(filterTimeVal[0]);
-  }
-  if (
-    !isEmpty(filterTimeType) &&
-    filterTimeType != null &&
-    ['s', 'm', 'h'].includes(filterTimeType[0])
-  ) {
-    timeObj.unit = filterTimeType[0];
-  }
-  return timeObj;
-};
-
-const formatDefineStepData = (defineStepData: DefineStepRule): DefineStepRuleJson => {
-  const { queryBar, useIndicesConfig, ...rest } = defineStepData;
-  const { filters, query, saved_id: savedId } = queryBar;
-  return {
-    ...rest,
-    language: query.language,
-    filters,
-    query: query.query as string,
-    ...(savedId != null ? { saved_id: savedId } : {}),
-  };
-};
-
-const formatScheduleStepData = (scheduleData: ScheduleStepRule): ScheduleStepRuleJson => {
-  const formatScheduleData = scheduleData;
-
-  if (!isEmpty(formatScheduleData.interval) && !isEmpty(formatScheduleData.from)) {
-    const { unit: intervalUnit, value: intervalValue } = getTimeTypeValue(
-      formatScheduleData.interval
-    );
-    const { unit: fromUnit, value: fromValue } = getTimeTypeValue(formatScheduleData.from);
-    const duration = moment.duration(intervalValue, intervalUnit as 's' | 'm' | 'h');
-    duration.add(fromValue, fromUnit as 's' | 'm' | 'h');
-    formatScheduleData.from = `now-${duration.asSeconds()}s`;
-    formatScheduleData.to = 'now';
-  }
-  return formatScheduleData;
-};
-
-const formatAboutStepData = (aboutStepData: AboutStepRule): AboutStepRuleJson => {
-  const { falsePositives, references, riskScore, threats, ...rest } = aboutStepData;
-
-  return {
-    false_positives: falsePositives.filter(item => !isEmpty(item)),
-    references: references.filter(item => !isEmpty(item)),
-    risk_score: riskScore,
-    threats: threats
-      .filter(threat => threat.tactic.name !== 'none')
-      .map(threat => ({
-        ...threat,
-        framework: 'MITRE ATT&CK',
-        techniques: threat.techniques.map(technique => {
-          const { id, name, reference } = technique;
-          return { id, name, reference };
-        }),
-      })),
-    ...rest,
-  };
-};
-
-export const formatRule = (
-  defineStepData: DefineStepRule,
-  aboutStepData: AboutStepRule,
-  scheduleData: ScheduleStepRule
-): NewRule => {
-  const type: FormatRuleType = defineStepData.queryBar.saved_id != null ? 'saved_query' : 'query';
-  const persistData = {
-    type,
-    ...formatDefineStepData(defineStepData),
-    ...formatAboutStepData(aboutStepData),
-    ...formatScheduleStepData(scheduleData),
-    meta: {
-      from: scheduleData.from,
-    },
-  };
-
-  return persistData;
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/index.tsx
deleted file mode 100644
index 393b72d16b0a4..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/index.tsx
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * 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, EuiAccordion, EuiHorizontalRule, EuiPanel, EuiSpacer } from '@elastic/eui';
-import React, { useCallback, useRef, useState } from 'react';
-import { Redirect } from 'react-router-dom';
-import styled from 'styled-components';
-
-import { HeaderPage } from '../../../components/header_page';
-import { WrapperPage } from '../../../components/wrapper_page';
-import { AccordionTitle } from './components/accordion_title';
-import { StepAboutRule } from './components/step_about_rule';
-import { StepDefineRule } from './components/step_define_rule';
-import { StepScheduleRule } from './components/step_schedule_rule';
-import { usePersistRule } from '../../../containers/detection_engine/rules/persist_rule';
-import { SpyRoute } from '../../../utils/route/spy_routes';
-
-import { formatRule } from './helpers';
-import * as i18n from './translations';
-import { AboutStepRule, DefineStepRule, RuleStep, RuleStepData, ScheduleStepRule } from './types';
-import { DETECTION_ENGINE_PAGE_NAME } from '../../../components/link_to/redirect_to_detection_engine';
-
-const stepsRuleOrder = [RuleStep.defineRule, RuleStep.aboutRule, RuleStep.scheduleRule];
-
-const ResizeEuiPanel = styled(EuiPanel)<{
-  height?: number;
-}>`
-  .euiAccordion__childWrapper {
-    height: ${props => (props.height !== -1 ? `${props.height}px !important` : 'auto')};
-  }
-`;
-
-export const CreateRuleComponent = React.memo(() => {
-  const [heightAccordion, setHeightAccordion] = useState(-1);
-  const [openAccordionId, setOpenAccordionId] = useState<RuleStep | null>(RuleStep.defineRule);
-  const defineRuleRef = useRef<EuiAccordion | null>(null);
-  const aboutRuleRef = useRef<EuiAccordion | null>(null);
-  const scheduleRuleRef = useRef<EuiAccordion | null>(null);
-  const stepsData = useRef<Record<RuleStep, RuleStepData>>({
-    [RuleStep.defineRule]: { isValid: false, data: {} },
-    [RuleStep.aboutRule]: { isValid: false, data: {} },
-    [RuleStep.scheduleRule]: { isValid: false, data: {} },
-  });
-  const [isStepRuleInEditView, setIsStepRuleInEditView] = useState<Record<RuleStep, boolean>>({
-    [RuleStep.defineRule]: false,
-    [RuleStep.aboutRule]: false,
-    [RuleStep.scheduleRule]: false,
-  });
-  const [{ isLoading, isSaved }, setRule] = usePersistRule();
-
-  const setStepData = (step: RuleStep, data: unknown, isValid: boolean) => {
-    stepsData.current[step] = { ...stepsData.current[step], data, isValid };
-    if (isValid) {
-      const stepRuleIdx = stepsRuleOrder.findIndex(item => step === item);
-      if ([0, 1].includes(stepRuleIdx)) {
-        setIsStepRuleInEditView({
-          ...isStepRuleInEditView,
-          [step]: true,
-        });
-        if (openAccordionId !== stepsRuleOrder[stepRuleIdx + 1]) {
-          openCloseAccordion(stepsRuleOrder[stepRuleIdx + 1]);
-          setOpenAccordionId(stepsRuleOrder[stepRuleIdx + 1]);
-        }
-      } else if (
-        stepRuleIdx === 2 &&
-        stepsData.current[RuleStep.defineRule].isValid &&
-        stepsData.current[RuleStep.aboutRule].isValid
-      ) {
-        setRule(
-          formatRule(
-            stepsData.current[RuleStep.defineRule].data as DefineStepRule,
-            stepsData.current[RuleStep.aboutRule].data as AboutStepRule,
-            stepsData.current[RuleStep.scheduleRule].data as ScheduleStepRule
-          )
-        );
-      }
-    }
-  };
-
-  const getAccordionType = useCallback(
-    (accordionId: RuleStep) => {
-      if (accordionId === openAccordionId) {
-        return 'active';
-      } else if (stepsData.current[accordionId].isValid) {
-        return 'valid';
-      }
-      return 'passive';
-    },
-    [openAccordionId, stepsData.current]
-  );
-
-  const defineRuleButton = (
-    <AccordionTitle
-      name="1"
-      title={i18n.DEFINE_RULE}
-      type={getAccordionType(RuleStep.defineRule)}
-    />
-  );
-
-  const aboutRuleButton = (
-    <AccordionTitle name="2" title={i18n.ABOUT_RULE} type={getAccordionType(RuleStep.aboutRule)} />
-  );
-
-  const scheduleRuleButton = (
-    <AccordionTitle
-      name="3"
-      title={i18n.SCHEDULE_RULE}
-      type={getAccordionType(RuleStep.scheduleRule)}
-    />
-  );
-
-  const openCloseAccordion = (accordionId: RuleStep | null) => {
-    if (accordionId != null) {
-      if (accordionId === RuleStep.defineRule && defineRuleRef.current != null) {
-        defineRuleRef.current.onToggle();
-      } else if (accordionId === RuleStep.aboutRule && aboutRuleRef.current != null) {
-        aboutRuleRef.current.onToggle();
-      } else if (accordionId === RuleStep.scheduleRule && scheduleRuleRef.current != null) {
-        scheduleRuleRef.current.onToggle();
-      }
-    }
-  };
-
-  const manageAccordions = useCallback(
-    (id: RuleStep, isOpen: boolean) => {
-      const activeRuleIdx = stepsRuleOrder.findIndex(step => step === openAccordionId);
-      const stepRuleIdx = stepsRuleOrder.findIndex(step => step === id);
-      const isLatestStepsRuleValid =
-        stepRuleIdx === 0
-          ? true
-          : stepsRuleOrder
-              .filter((stepRule, index) => index < stepRuleIdx)
-              .every(stepRule => stepsData.current[stepRule].isValid);
-
-      if (stepRuleIdx < activeRuleIdx && !isOpen) {
-        openCloseAccordion(id);
-      } else if (stepRuleIdx >= activeRuleIdx) {
-        if (
-          openAccordionId != null &&
-          openAccordionId !== id &&
-          !stepsData.current[openAccordionId].isValid &&
-          !isStepRuleInEditView[id] &&
-          isOpen
-        ) {
-          openCloseAccordion(id);
-        } else if (!isLatestStepsRuleValid && isOpen) {
-          openCloseAccordion(id);
-        } else if (id !== openAccordionId && isOpen) {
-          setOpenAccordionId(id);
-        }
-      }
-    },
-    [isStepRuleInEditView, openAccordionId]
-  );
-
-  const manageIsEditable = useCallback(
-    (id: RuleStep) => {
-      setIsStepRuleInEditView({
-        ...isStepRuleInEditView,
-        [id]: false,
-      });
-    },
-    [isStepRuleInEditView]
-  );
-
-  if (isSaved && stepsData.current[RuleStep.scheduleRule].isValid) {
-    return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}/rules`} />;
-  }
-
-  return (
-    <>
-      <WrapperPage restrictWidth>
-        <HeaderPage
-          backOptions={{ href: '#detection-engine/rules', text: 'Back to rules' }}
-          border
-          isLoading={isLoading}
-          title={i18n.PAGE_TITLE}
-        />
-        <ResizeEuiPanel height={heightAccordion}>
-          <EuiAccordion
-            initialIsOpen={true}
-            id={RuleStep.defineRule}
-            buttonContent={defineRuleButton}
-            paddingSize="xs"
-            ref={defineRuleRef}
-            onToggle={manageAccordions.bind(null, RuleStep.defineRule)}
-            extraAction={
-              stepsData.current[RuleStep.defineRule].isValid && (
-                <EuiButtonEmpty
-                  iconType="pencil"
-                  size="xs"
-                  onClick={manageIsEditable.bind(null, RuleStep.defineRule)}
-                >
-                  {`Edit`}
-                </EuiButtonEmpty>
-              )
-            }
-          >
-            <EuiHorizontalRule margin="xs" />
-            <StepDefineRule
-              isEditView={isStepRuleInEditView[RuleStep.defineRule]}
-              isLoading={isLoading}
-              setStepData={setStepData}
-              resizeParentContainer={height => setHeightAccordion(height)}
-            />
-          </EuiAccordion>
-        </ResizeEuiPanel>
-        <EuiSpacer size="s" />
-        <EuiPanel>
-          <EuiAccordion
-            initialIsOpen={false}
-            id={RuleStep.aboutRule}
-            buttonContent={aboutRuleButton}
-            paddingSize="xs"
-            ref={aboutRuleRef}
-            onToggle={manageAccordions.bind(null, RuleStep.aboutRule)}
-            extraAction={
-              stepsData.current[RuleStep.aboutRule].isValid && (
-                <EuiButtonEmpty
-                  iconType="pencil"
-                  size="xs"
-                  onClick={manageIsEditable.bind(null, RuleStep.aboutRule)}
-                >
-                  {`Edit`}
-                </EuiButtonEmpty>
-              )
-            }
-          >
-            <EuiHorizontalRule margin="xs" />
-            <StepAboutRule
-              isEditView={isStepRuleInEditView[RuleStep.aboutRule]}
-              isLoading={isLoading}
-              setStepData={setStepData}
-            />
-          </EuiAccordion>
-        </EuiPanel>
-        <EuiSpacer size="s" />
-        <EuiPanel>
-          <EuiAccordion
-            initialIsOpen={false}
-            id={RuleStep.scheduleRule}
-            buttonContent={scheduleRuleButton}
-            paddingSize="xs"
-            ref={scheduleRuleRef}
-            onToggle={manageAccordions.bind(null, RuleStep.scheduleRule)}
-            extraAction={
-              stepsData.current[RuleStep.scheduleRule].isValid && (
-                <EuiButtonEmpty
-                  iconType="pencil"
-                  size="xs"
-                  onClick={manageIsEditable.bind(null, RuleStep.scheduleRule)}
-                >
-                  {`Edit`}
-                </EuiButtonEmpty>
-              )
-            }
-          >
-            <EuiHorizontalRule margin="xs" />
-            <StepScheduleRule
-              isEditView={isStepRuleInEditView[RuleStep.scheduleRule]}
-              isLoading={isLoading}
-              setStepData={setStepData}
-            />
-          </EuiAccordion>
-        </EuiPanel>
-      </WrapperPage>
-
-      <SpyRoute />
-    </>
-  );
-});
-CreateRuleComponent.displayName = 'CreateRuleComponent';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/translations.ts
deleted file mode 100644
index 5ff9dffb658ab..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/translations.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 { i18n } from '@kbn/i18n';
-
-export const PAGE_TITLE = i18n.translate('xpack.siem.detectionEngine.createRule.pageTitle', {
-  defaultMessage: 'Create new rule',
-});
-
-export const DEFINE_RULE = i18n.translate('xpack.siem.detectionEngine.createRule.defineRuleTitle', {
-  defaultMessage: 'Define Rule',
-});
-
-export const ABOUT_RULE = i18n.translate('xpack.siem.detectionEngine.createRule.aboutRuleTitle', {
-  defaultMessage: 'About Rule',
-});
-
-export const SCHEDULE_RULE = i18n.translate(
-  'xpack.siem.detectionEngine.createRule.scheduleRuleTitle',
-  {
-    defaultMessage: 'Schedule Rule',
-  }
-);
-
-export const OPTIONAL_FIELD = i18n.translate(
-  'xpack.siem.detectionEngine.createRule.optionalFieldDescription',
-  {
-    defaultMessage: 'Optional',
-  }
-);
-
-export const CONTINUE = i18n.translate(
-  'xpack.siem.detectionEngine.createRule.continueButtonTitle',
-  {
-    defaultMessage: 'Continue',
-  }
-);
-
-export const UPDATE = i18n.translate('xpack.siem.detectionEngine.createRule.updateButtonTitle', {
-  defaultMessage: 'Update',
-});
-
-export const DELETE = i18n.translate('xpack.siem.detectionEngine.createRule.deleteDescription', {
-  defaultMessage: 'Delete',
-});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/types.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/types.ts
deleted file mode 100644
index 241e4530b4b57..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/types.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 { FieldValueQueryBar } from './components/query_bar';
-import { esFilters } from '../../../../../../../../src/plugins/data/common';
-
-export enum RuleStep {
-  defineRule = 'define-rule',
-  aboutRule = 'about-rule',
-  scheduleRule = 'schedule-rule',
-}
-export type RuleStatusType = 'passive' | 'active' | 'valid';
-
-export interface RuleStepData {
-  data: unknown;
-  isValid: boolean;
-}
-
-export interface RuleStepProps {
-  setStepData: (step: RuleStep, data: unknown, isValid: boolean) => void;
-  isEditView: boolean;
-  isLoading: boolean;
-  resizeParentContainer?: (height: number) => void;
-}
-
-interface StepRuleData {
-  isNew: boolean;
-}
-export interface AboutStepRule extends StepRuleData {
-  name: string;
-  description: string;
-  severity: string;
-  riskScore: number;
-  references: string[];
-  falsePositives: string[];
-  tags: string[];
-  threats: IMitreEnterpriseAttack[];
-}
-
-export interface DefineStepRule extends StepRuleData {
-  useIndicesConfig: string;
-  index: string[];
-  queryBar: FieldValueQueryBar;
-}
-
-export interface ScheduleStepRule extends StepRuleData {
-  enabled: boolean;
-  interval: string;
-  from: string;
-  to?: string;
-}
-
-export interface DefineStepRuleJson {
-  index: string[];
-  filters: esFilters.Filter[];
-  saved_id?: string;
-  query: string;
-  language: string;
-}
-
-export interface AboutStepRuleJson {
-  name: string;
-  description: string;
-  severity: string;
-  risk_score: number;
-  references: string[];
-  false_positives: string[];
-  tags: string[];
-  threats: IMitreEnterpriseAttack[];
-}
-
-export type ScheduleStepRuleJson = ScheduleStepRule;
-
-export type FormatRuleType = 'query' | 'saved_query';
-
-export interface IMitreAttack {
-  id: string;
-  name: string;
-  reference: string;
-}
-export interface IMitreEnterpriseAttack {
-  framework: string;
-  tactic: IMitreAttack;
-  techniques: IMitreAttack[];
-}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx
index e1373c8b18bb7..8e5c3e9f13118 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine.tsx
@@ -4,83 +4,114 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiButton, EuiPanel, EuiSelect, EuiSpacer } from '@elastic/eui';
+import { EuiButton, EuiSpacer, EuiPanel, EuiLoadingContent } from '@elastic/eui';
 import React from 'react';
 import { StickyContainer } from 'react-sticky';
 
 import { FiltersGlobal } from '../../components/filters_global';
 import { HeaderPage } from '../../components/header_page';
-import { HeaderSection } from '../../components/header_section';
-import { HistogramSignals } from '../../components/page/detection_engine/histogram_signals';
 import { SiemSearchBar } from '../../components/search_bar';
 import { WrapperPage } from '../../components/wrapper_page';
+import { GlobalTime } from '../../containers/global_time';
 import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../containers/source';
 import { SpyRoute } from '../../utils/route/spy_routes';
+
+import { SignalsTable } from './components/signals';
+import * as signalsI18n from './components/signals/translations';
+import { SignalsCharts } from './components/signals_chart';
+import { useSignalInfo } from './components/signals_info';
 import { DetectionEngineEmptyPage } from './detection_engine_empty_page';
+import { DetectionEngineNoIndex } from './detection_engine_no_signal_index';
+import { DetectionEngineUserUnauthenticated } from './detection_engine_user_unauthenticated';
 import * as i18n from './translations';
-import { SignalsTable } from './signals';
-
-export const DetectionEngineComponent = React.memo(() => {
-  const sampleChartOptions = [
-    { text: 'Risk scores', value: 'risk_scores' },
-    { text: 'Severities', value: 'severities' },
-    { text: 'Top destination IPs', value: 'destination_ips' },
-    { text: 'Top event actions', value: 'event_actions' },
-    { text: 'Top event categories', value: 'event_categories' },
-    { text: 'Top host names', value: 'host_names' },
-    { text: 'Top rule types', value: 'rule_types' },
-    { text: 'Top rules', value: 'rules' },
-    { text: 'Top source IPs', value: 'source_ips' },
-    { text: 'Top users', value: 'users' },
-  ];
-
-  return (
-    <>
-      <WithSource sourceId="default">
-        {({ indicesExist, indexPattern }) => {
-          return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
-            <StickyContainer>
-              <FiltersGlobal>
-                <SiemSearchBar id="global" indexPattern={indexPattern} />
-              </FiltersGlobal>
+import { HeaderSection } from '../../components/header_section';
 
-              <WrapperPage>
-                <HeaderPage border subtitle={i18n.PAGE_SUBTITLE} title={i18n.PAGE_TITLE}>
-                  <EuiButton fill href="#/detection-engine/rules" iconType="gear">
-                    {i18n.BUTTON_MANAGE_RULES}
-                  </EuiButton>
-                </HeaderPage>
+interface DetectionEngineComponentProps {
+  loading: boolean;
+  isSignalIndexExists: boolean | null;
+  isUserAuthenticated: boolean | null;
+  signalsIndex: string | null;
+}
 
-                <EuiPanel>
-                  <HeaderSection title="Signal detection frequency">
-                    <EuiSelect
-                      options={sampleChartOptions}
-                      onChange={() => {}}
-                      prepend="Stack by"
-                      value={sampleChartOptions[0].value}
-                    />
-                  </HeaderSection>
+export const DetectionEngineComponent = React.memo<DetectionEngineComponentProps>(
+  ({ loading, isSignalIndexExists, isUserAuthenticated, signalsIndex }) => {
+    const [lastSignals] = useSignalInfo({});
+    if (isUserAuthenticated != null && !isUserAuthenticated && !loading) {
+      return (
+        <WrapperPage>
+          <HeaderPage border title={i18n.PAGE_TITLE} />
+          <DetectionEngineUserUnauthenticated />
+        </WrapperPage>
+      );
+    }
+    if (isSignalIndexExists != null && !isSignalIndexExists && !loading) {
+      return (
+        <WrapperPage>
+          <HeaderPage border title={i18n.PAGE_TITLE} />
+          <DetectionEngineNoIndex />
+        </WrapperPage>
+      );
+    }
+    return (
+      <>
+        <WithSource sourceId="default">
+          {({ indicesExist, indexPattern }) => {
+            return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
+              <StickyContainer>
+                <FiltersGlobal>
+                  <SiemSearchBar id="global" indexPattern={indexPattern} />
+                </FiltersGlobal>
 
-                  <HistogramSignals />
-                </EuiPanel>
+                <WrapperPage>
+                  <HeaderPage
+                    border
+                    subtitle={
+                      lastSignals != null && (
+                        <>
+                          {i18n.LAST_SIGNAL}
+                          {': '}
+                          {lastSignals}
+                        </>
+                      )
+                    }
+                    title={i18n.PAGE_TITLE}
+                  >
+                    <EuiButton fill href="#/detection-engine/rules" iconType="gear">
+                      {i18n.BUTTON_MANAGE_RULES}
+                    </EuiButton>
+                  </HeaderPage>
 
-                <EuiSpacer />
+                  <SignalsCharts />
 
-                <SignalsTable />
+                  <EuiSpacer />
+                  <GlobalTime>
+                    {({ to, from }) =>
+                      !loading ? (
+                        isSignalIndexExists && (
+                          <SignalsTable from={from} signalsIndex={signalsIndex ?? ''} to={to} />
+                        )
+                      ) : (
+                        <EuiPanel>
+                          <HeaderSection title={signalsI18n.SIGNALS_TABLE_TITLE} />
+                          <EuiLoadingContent />
+                        </EuiPanel>
+                      )
+                    }
+                  </GlobalTime>
+                </WrapperPage>
+              </StickyContainer>
+            ) : (
+              <WrapperPage>
+                <HeaderPage border title={i18n.PAGE_TITLE} />
+                <DetectionEngineEmptyPage />
               </WrapperPage>
-            </StickyContainer>
-          ) : (
-            <WrapperPage>
-              <HeaderPage border title={i18n.PAGE_TITLE} />
-
-              <DetectionEngineEmptyPage />
-            </WrapperPage>
-          );
-        }}
-      </WithSource>
+            );
+          }}
+        </WithSource>
 
-      <SpyRoute />
-    </>
-  );
-});
+        <SpyRoute />
+      </>
+    );
+  }
+);
 DetectionEngineComponent.displayName = 'DetectionEngineComponent';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine_empty_page.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine_empty_page.tsx
index cb3e690615395..a217fd6a737e7 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine_empty_page.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine_empty_page.tsx
@@ -6,8 +6,8 @@
 
 import React from 'react';
 import chrome from 'ui/chrome';
-import { documentationLinks } from 'ui/documentation_links';
 
+import { useKibana } from '../../lib/kibana';
 import { EmptyPage } from '../../components/empty_page';
 import * as i18n from './translations';
 
@@ -21,7 +21,7 @@ export const DetectionEngineEmptyPage = React.memo(() => (
     actionSecondaryIcon="popout"
     actionSecondaryLabel={i18n.EMPTY_ACTION_SECONDARY}
     actionSecondaryTarget="_blank"
-    actionSecondaryUrl={documentationLinks.siem}
+    actionSecondaryUrl={useKibana().services.docLinks.links.siem}
     data-test-subj="empty-page"
     title={i18n.EMPTY_TITLE}
   />
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine_no_signal_index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine_no_signal_index.tsx
new file mode 100644
index 0000000000000..713bd6239d80e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine_no_signal_index.tsx
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { documentationLinks } from 'ui/documentation_links';
+
+import { EmptyPage } from '../../components/empty_page';
+import * as i18n from './translations';
+
+export const DetectionEngineNoIndex = React.memo(() => (
+  <EmptyPage
+    actionPrimaryIcon="documents"
+    actionPrimaryLabel={i18n.GO_TO_DOCUMENTATION}
+    actionPrimaryUrl={documentationLinks.siem}
+    actionPrimaryTarget="_blank"
+    message={i18n.NO_INDEX_MSG_BODY}
+    data-test-subj="no_index"
+    title={i18n.NO_INDEX_TITLE}
+  />
+));
+
+DetectionEngineNoIndex.displayName = 'DetectionEngineNoIndex';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine_user_unauthenticated.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine_user_unauthenticated.tsx
new file mode 100644
index 0000000000000..bd3876b810a73
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/detection_engine_user_unauthenticated.tsx
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { documentationLinks } from 'ui/documentation_links';
+
+import { EmptyPage } from '../../components/empty_page';
+import * as i18n from './translations';
+
+export const DetectionEngineUserUnauthenticated = React.memo(() => (
+  <EmptyPage
+    actionPrimaryIcon="documents"
+    actionPrimaryLabel={i18n.GO_TO_DOCUMENTATION}
+    actionPrimaryUrl={documentationLinks.siem}
+    actionPrimaryTarget="_blank"
+    message={i18n.USER_UNAUTHENTICATED_MSG_BODY}
+    data-test-subj="no_index"
+    title={i18n.USER_UNAUTHENTICATED_TITLE}
+  />
+));
+
+DetectionEngineUserUnauthenticated.displayName = 'DetectionEngineUserUnauthenticated';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/edit_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/edit_rule/index.tsx
deleted file mode 100644
index 9b8607fdc7685..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/edit_rule/index.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  EuiButton,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPanel,
-  EuiSpacer,
-  EuiTabbedContent,
-} from '@elastic/eui';
-import React from 'react';
-
-import { HeaderPage } from '../../../components/header_page';
-import { HeaderSection } from '../../../components/header_section';
-import { WrapperPage } from '../../../components/wrapper_page';
-import { SpyRoute } from '../../../utils/route/spy_routes';
-import * as i18n from './translations';
-
-const Define = React.memo(() => (
-  <>
-    <EuiSpacer />
-
-    <EuiPanel>
-      <HeaderSection title="Define rule" />
-    </EuiPanel>
-  </>
-));
-Define.displayName = 'Define';
-
-const About = React.memo(() => (
-  <>
-    <EuiSpacer />
-
-    <EuiPanel>
-      <HeaderSection title="About rule" />
-    </EuiPanel>
-  </>
-));
-About.displayName = 'About';
-
-const Schedule = React.memo(() => (
-  <>
-    <EuiSpacer />
-
-    <EuiPanel>
-      <HeaderSection title="Schedule rule" />
-    </EuiPanel>
-  </>
-));
-Schedule.displayName = 'Schedule';
-
-export const EditRuleComponent = React.memo(() => {
-  return (
-    <>
-      <WrapperPage restrictWidth>
-        <HeaderPage
-          backOptions={{
-            href: '#detection-engine/rules/rule-details',
-            text: 'Back to automated exfiltration',
-          }}
-          title={i18n.PAGE_TITLE}
-        >
-          <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
-            <EuiFlexItem grow={false}>
-              <EuiButton href="#/detection-engine/rules/rule-details" iconType="cross">
-                {'Cancel'}
-              </EuiButton>
-            </EuiFlexItem>
-
-            <EuiFlexItem grow={false}>
-              <EuiButton fill href="#/detection-engine/rules/rule-details" iconType="save">
-                {'Save changes'}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </HeaderPage>
-
-        <EuiTabbedContent
-          tabs={[
-            {
-              id: 'tabDefine',
-              name: 'Define',
-              content: <Define />,
-            },
-            {
-              id: 'tabAbout',
-              name: 'About',
-              content: <About />,
-            },
-            {
-              id: 'tabSchedule',
-              name: 'Schedule',
-              content: <Schedule />,
-            },
-          ]}
-        />
-
-        <EuiSpacer />
-
-        <EuiFlexGroup
-          alignItems="center"
-          gutterSize="s"
-          justifyContent="flexEnd"
-          responsive={false}
-        >
-          <EuiFlexItem grow={false}>
-            <EuiButton href="#/detection-engine/rules/rule-details" iconType="cross">
-              {'Cancel'}
-            </EuiButton>
-          </EuiFlexItem>
-
-          <EuiFlexItem grow={false}>
-            <EuiButton fill href="#/detection-engine/rules/rule-details" iconType="save">
-              {'Save changes'}
-            </EuiButton>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </WrapperPage>
-
-      <SpyRoute />
-    </>
-  );
-});
-EditRuleComponent.displayName = 'EditRuleComponent';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/edit_rule/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/edit_rule/translations.ts
deleted file mode 100644
index cc2e2565eb8d0..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/edit_rule/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 PAGE_TITLE = i18n.translate('xpack.siem.detectionEngine.editRule.pageTitle', {
-  defaultMessage: 'Edit rule settings',
-});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/helpers.ts
new file mode 100644
index 0000000000000..1399df0fcf6d1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/helpers.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export const sampleChartOptions = [
+  { text: 'Risk scores', value: 'risk_scores' },
+  { text: 'Severities', value: 'severities' },
+  { text: 'Top destination IPs', value: 'destination_ips' },
+  { text: 'Top event actions', value: 'event_actions' },
+  { text: 'Top event categories', value: 'event_categories' },
+  { text: 'Top host names', value: 'host_names' },
+  { text: 'Top rule types', value: 'rule_types' },
+  { text: 'Top rules', value: 'rules' },
+  { text: 'Top source IPs', value: 'source_ips' },
+  { text: 'Top users', value: 'users' },
+];
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/index.tsx
index 90524b4da0af4..e8a2c98a94a56 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/index.tsx
@@ -4,42 +4,77 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Redirect, Route, Switch, RouteComponentProps } from 'react-router-dom';
 
-import { CreateRuleComponent } from './create_rule';
+import { useSignalIndex } from '../../containers/detection_engine/signals/use_signal_index';
+import { usePrivilegeUser } from '../../containers/detection_engine/signals/use_privilege_user';
+
+import { CreateRuleComponent } from './rules/create';
 import { DetectionEngineComponent } from './detection_engine';
-import { EditRuleComponent } from './edit_rule';
-import { RuleDetailsComponent } from './rule_details';
+import { EditRuleComponent } from './rules/edit';
+import { RuleDetailsComponent } from './rules/details';
 import { RulesComponent } from './rules';
 
 const detectionEnginePath = `/:pageName(detection-engine)`;
 
 type Props = Partial<RouteComponentProps<{}>> & { url: string };
 
-export const DetectionEngineContainer = React.memo<Props>(() => (
-  <Switch>
-    <Route exact path={detectionEnginePath} render={() => <DetectionEngineComponent />} strict />
-    <Route exact path={`${detectionEnginePath}/rules`} render={() => <RulesComponent />} />
-    <Route
-      path={`${detectionEnginePath}/rules/create-rule`}
-      render={() => <CreateRuleComponent />}
-    />
-    <Route
-      exact
-      path={`${detectionEnginePath}/rules/rule-details`}
-      render={() => <RuleDetailsComponent />}
-    />
-    <Route
-      path={`${detectionEnginePath}/rules/rule-details/edit-rule`}
-      render={() => <EditRuleComponent />}
-    />
-    <Route
-      path="/detection-engine/"
-      render={({ location: { search = '' } }) => (
-        <Redirect from="/detection-engine/" to={`/detection-engine${search}`} />
+export const DetectionEngineContainer = React.memo<Props>(() => {
+  const [privilegeLoading, isAuthenticated, hasWrite] = usePrivilegeUser();
+  const [
+    indexNameLoading,
+    isSignalIndexExists,
+    signalIndexName,
+    createSignalIndex,
+  ] = useSignalIndex();
+
+  useEffect(() => {
+    if (
+      isAuthenticated &&
+      hasWrite &&
+      isSignalIndexExists != null &&
+      !isSignalIndexExists &&
+      createSignalIndex != null
+    ) {
+      createSignalIndex();
+    }
+  }, [createSignalIndex, isAuthenticated, isSignalIndexExists, hasWrite]);
+
+  return (
+    <Switch>
+      <Route exact path={detectionEnginePath} strict>
+        <DetectionEngineComponent
+          loading={indexNameLoading || privilegeLoading}
+          isSignalIndexExists={isSignalIndexExists}
+          isUserAuthenticated={isAuthenticated}
+          signalsIndex={signalIndexName}
+        />
+      </Route>
+      {isSignalIndexExists && isAuthenticated && (
+        <>
+          <Route exact path={`${detectionEnginePath}/rules`}>
+            <RulesComponent />
+          </Route>
+          <Route path={`${detectionEnginePath}/rules/create`}>
+            <CreateRuleComponent />
+          </Route>
+          <Route exact path={`${detectionEnginePath}/rules/:ruleId`}>
+            <RuleDetailsComponent signalsIndex={signalIndexName} />
+          </Route>
+          <Route path={`${detectionEnginePath}/rules/:ruleId/edit`}>
+            <EditRuleComponent />
+          </Route>
+        </>
       )}
-    />
-  </Switch>
-));
+
+      <Route
+        path="/detection-engine/"
+        render={({ location: { search = '' } }) => (
+          <Redirect from="/detection-engine/" to={`/detection-engine${search}`} />
+        )}
+      />
+    </Switch>
+  );
+});
 DetectionEngineContainer.displayName = 'DetectionEngineContainer';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rule_details/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rule_details/index.tsx
deleted file mode 100644
index b16036e3142fc..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rule_details/index.tsx
+++ /dev/null
@@ -1,660 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  EuiBasicTable,
-  EuiButton,
-  EuiButtonIcon,
-  EuiCallOut,
-  EuiFilterButton,
-  EuiFilterGroup,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIconTip,
-  EuiPanel,
-  EuiPopover,
-  EuiSelect,
-  EuiSpacer,
-  EuiSwitch,
-  EuiTabbedContent,
-  EuiTextColor,
-} from '@elastic/eui';
-import moment from 'moment';
-import React, { useState } from 'react';
-import { StickyContainer } from 'react-sticky';
-
-import { getEmptyTagValue } from '../../../components/empty_value';
-import { FiltersGlobal } from '../../../components/filters_global';
-import { HeaderPage } from '../../../components/header_page';
-import { HeaderSection } from '../../../components/header_section';
-import { HistogramSignals } from '../../../components/page/detection_engine/histogram_signals';
-import { ProgressInline } from '../../../components/progress_inline';
-import { SiemSearchBar } from '../../../components/search_bar';
-import {
-  UtilityBar,
-  UtilityBarAction,
-  UtilityBarGroup,
-  UtilityBarSection,
-  UtilityBarText,
-} from '../../../components/detection_engine/utility_bar';
-import { WrapperPage } from '../../../components/wrapper_page';
-import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../../containers/source';
-import { SpyRoute } from '../../../utils/route/spy_routes';
-import { DetectionEngineEmptyPage } from '../detection_engine_empty_page';
-import * as i18n from './translations';
-
-// Michael: Will need to change this to get the current datetime format from Kibana settings.
-const dateTimeFormat = (value: string) => {
-  return moment(value).format('M/D/YYYY, h:mm A');
-};
-
-const OpenSignals = React.memo(() => {
-  return (
-    <>
-      <UtilityBar>
-        <UtilityBarSection>
-          <UtilityBarGroup>
-            <UtilityBarText>{'Showing: 439 signals'}</UtilityBarText>
-          </UtilityBarGroup>
-
-          <UtilityBarGroup>
-            <UtilityBarText>{'Selected: 20 signals'}</UtilityBarText>
-
-            <UtilityBarAction
-              iconSide="right"
-              iconType="arrowDown"
-              popoverContent={() => <p>{'Batch actions context menu here.'}</p>}
-            >
-              {'Batch actions'}
-            </UtilityBarAction>
-
-            <UtilityBarAction iconType="listAdd">
-              {'Select all signals on all pages'}
-            </UtilityBarAction>
-          </UtilityBarGroup>
-
-          <UtilityBarGroup>
-            <UtilityBarAction iconType="cross">{'Clear 7 filters'}</UtilityBarAction>
-
-            <UtilityBarAction iconType="cross">{'Clear aggregation'}</UtilityBarAction>
-          </UtilityBarGroup>
-        </UtilityBarSection>
-
-        <UtilityBarSection>
-          <UtilityBarGroup>
-            <UtilityBarAction
-              iconSide="right"
-              iconType="arrowDown"
-              popoverContent={() => <p>{'Customize columns context menu here.'}</p>}
-            >
-              {'Customize columns'}
-            </UtilityBarAction>
-
-            <UtilityBarAction iconType="indexMapping">{'Aggregate data'}</UtilityBarAction>
-          </UtilityBarGroup>
-        </UtilityBarSection>
-      </UtilityBar>
-
-      {/* Michael: Open signals datagrid here. Talk to Chandler Prall about possibility of early access. If not possible, use basic table. */}
-    </>
-  );
-});
-
-const ClosedSignals = React.memo(() => {
-  return (
-    <>
-      <UtilityBar>
-        <UtilityBarSection>
-          <UtilityBarGroup>
-            <UtilityBarText>{'Showing: 439 signals'}</UtilityBarText>
-          </UtilityBarGroup>
-        </UtilityBarSection>
-
-        <UtilityBarSection>
-          <UtilityBarGroup>
-            <UtilityBarAction
-              iconSide="right"
-              iconType="arrowDown"
-              popoverContent={() => <p>{'Customize columns context menu here.'}</p>}
-            >
-              {'Customize columns'}
-            </UtilityBarAction>
-
-            <UtilityBarAction iconType="indexMapping">{'Aggregate data'}</UtilityBarAction>
-          </UtilityBarGroup>
-        </UtilityBarSection>
-      </UtilityBar>
-
-      {/* Michael: Closed signals datagrid here. Talk to Chandler Prall about possibility of early access. If not possible, use basic table. */}
-    </>
-  );
-});
-
-const Signals = React.memo(() => {
-  const sampleChartOptions = [
-    { text: 'Risk scores', value: 'risk_scores' },
-    { text: 'Severities', value: 'severities' },
-    { text: 'Top destination IPs', value: 'destination_ips' },
-    { text: 'Top event actions', value: 'event_actions' },
-    { text: 'Top event categories', value: 'event_categories' },
-    { text: 'Top host names', value: 'host_names' },
-    { text: 'Top source IPs', value: 'source_ips' },
-    { text: 'Top users', value: 'users' },
-  ];
-
-  const filterGroupOptions = ['open', 'closed'];
-  const [filterGroupState, setFilterGroupState] = useState(filterGroupOptions[0]);
-
-  return (
-    <>
-      <EuiSpacer />
-
-      <EuiPanel>
-        <HeaderSection title="Signal detection frequency">
-          <EuiSelect
-            options={sampleChartOptions}
-            onChange={() => {}}
-            prepend="Stack by"
-            value={sampleChartOptions[0].value}
-          />
-        </HeaderSection>
-
-        <HistogramSignals />
-      </EuiPanel>
-
-      <EuiSpacer />
-
-      <EuiPanel>
-        <HeaderSection title="Signals">
-          <EuiFilterGroup>
-            <EuiFilterButton
-              hasActiveFilters={filterGroupState === filterGroupOptions[0]}
-              onClick={() => setFilterGroupState(filterGroupOptions[0])}
-              withNext
-            >
-              {'Open signals'}
-            </EuiFilterButton>
-
-            <EuiFilterButton
-              hasActiveFilters={filterGroupState === filterGroupOptions[1]}
-              onClick={() => setFilterGroupState(filterGroupOptions[1])}
-            >
-              {'Closed signals'}
-            </EuiFilterButton>
-          </EuiFilterGroup>
-        </HeaderSection>
-
-        {filterGroupState === filterGroupOptions[0] ? <OpenSignals /> : <ClosedSignals />}
-      </EuiPanel>
-    </>
-  );
-});
-Signals.displayName = 'Signals';
-
-const ActivityMonitor = React.memo(() => {
-  interface ColumnTypes {
-    id: number;
-    ran: string;
-    lookedBackTo: string;
-    status: string;
-    response: string | undefined;
-  }
-
-  interface PageTypes {
-    index: number;
-    size: number;
-  }
-
-  interface SortTypes {
-    field: string;
-    direction: string;
-  }
-
-  const actions = [
-    {
-      available: (item: ColumnTypes) => item.status === 'Running',
-      description: 'Stop',
-      icon: 'stop',
-      isPrimary: true,
-      name: 'Stop',
-      onClick: () => {},
-      type: 'icon',
-    },
-    {
-      available: (item: ColumnTypes) => item.status === 'Stopped',
-      description: 'Resume',
-      icon: 'play',
-      isPrimary: true,
-      name: 'Resume',
-      onClick: () => {},
-      type: 'icon',
-    },
-  ];
-
-  // Michael: Are we able to do custom, in-table-header filters, as shown in my wireframes?
-  const columns = [
-    {
-      field: 'ran',
-      name: 'Ran',
-      render: (value: ColumnTypes['ran']) => <time dateTime={value}>{dateTimeFormat(value)}</time>,
-      sortable: true,
-      truncateText: true,
-    },
-    {
-      field: 'lookedBackTo',
-      name: 'Looked back to',
-      render: (value: ColumnTypes['lookedBackTo']) => (
-        <time dateTime={value}>{dateTimeFormat(value)}</time>
-      ),
-      sortable: true,
-      truncateText: true,
-    },
-    {
-      field: 'status',
-      name: 'Status',
-      sortable: true,
-      truncateText: true,
-    },
-    {
-      field: 'response',
-      name: 'Response',
-      render: (value: ColumnTypes['response']) => {
-        return value === undefined ? (
-          getEmptyTagValue()
-        ) : (
-          <>
-            {value === 'Fail' ? (
-              <EuiTextColor color="danger">
-                {value} <EuiIconTip content="Full fail message here." type="iInCircle" />
-              </EuiTextColor>
-            ) : (
-              <EuiTextColor color="secondary">{value}</EuiTextColor>
-            )}
-          </>
-        );
-      },
-      sortable: true,
-      truncateText: true,
-    },
-    {
-      actions,
-      width: '40px',
-    },
-  ];
-
-  const sampleTableData = [
-    {
-      id: 1,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Running',
-    },
-    {
-      id: 2,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Stopped',
-    },
-    {
-      id: 3,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Fail',
-    },
-    {
-      id: 4,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 5,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 6,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 7,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 8,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 9,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 10,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 11,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 12,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 13,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 14,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 15,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 16,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 17,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 18,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 19,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 20,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 21,
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-  ];
-
-  const [itemsTotalState] = useState<number>(sampleTableData.length);
-  const [pageState, setPageState] = useState<PageTypes>({ index: 0, size: 20 });
-  // const [selectedState, setSelectedState] = useState<ColumnTypes[]>([]);
-  const [sortState, setSortState] = useState<SortTypes>({ field: 'ran', direction: 'desc' });
-
-  return (
-    <>
-      <EuiSpacer />
-
-      <EuiPanel>
-        <HeaderSection title="Activity monitor" />
-
-        <UtilityBar border>
-          <UtilityBarSection>
-            <UtilityBarGroup>
-              <UtilityBarText>{'Showing: 39 activites'}</UtilityBarText>
-            </UtilityBarGroup>
-
-            <UtilityBarGroup>
-              <UtilityBarText>{'Selected: 2 activities'}</UtilityBarText>
-
-              <UtilityBarAction iconType="stop">{'Stop selected'}</UtilityBarAction>
-            </UtilityBarGroup>
-
-            <UtilityBarGroup>
-              <UtilityBarAction iconType="cross">{'Clear 7 filters'}</UtilityBarAction>
-            </UtilityBarGroup>
-          </UtilityBarSection>
-        </UtilityBar>
-
-        <EuiBasicTable
-          columns={columns}
-          isSelectable
-          itemId="id"
-          items={sampleTableData}
-          onChange={({ page, sort }: { page: PageTypes; sort: SortTypes }) => {
-            setPageState(page);
-            setSortState(sort);
-          }}
-          pagination={{
-            pageIndex: pageState.index,
-            pageSize: pageState.size,
-            totalItemCount: itemsTotalState,
-            pageSizeOptions: [5, 10, 20],
-          }}
-          selection={{
-            selectable: (item: ColumnTypes) => item.status !== 'Completed',
-            selectableMessage: (selectable: boolean) =>
-              selectable ? undefined : 'Completed runs cannot be acted upon',
-            onSelectionChange: (selectedItems: ColumnTypes[]) => {
-              // setSelectedState(selectedItems);
-            },
-          }}
-          sorting={{
-            sort: sortState,
-          }}
-        />
-      </EuiPanel>
-    </>
-  );
-});
-ActivityMonitor.displayName = 'ActivityMonitor';
-
-export const RuleDetailsComponent = React.memo(() => {
-  const [popoverState, setPopoverState] = useState(false);
-
-  return (
-    <>
-      <WithSource sourceId="default">
-        {({ indicesExist, indexPattern }) => {
-          return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
-            <StickyContainer>
-              <FiltersGlobal>
-                <SiemSearchBar id="global" indexPattern={indexPattern} />
-              </FiltersGlobal>
-
-              <WrapperPage>
-                <HeaderPage
-                  backOptions={{ href: '#detection-engine/rules', text: 'Back to rules' }}
-                  badgeOptions={{ text: 'Experimental' }}
-                  border
-                  subtitle={[
-                    'Created by: mmarcialis on 12/28/2019, 12:00 PM',
-                    'Updated by: agoldstein on 12/28/2019, 12:00 PM',
-                  ]}
-                  subtitle2={[
-                    'Last signal: 23 minutes ago',
-                    <ProgressInline current={95000} max={105000} unit="events">
-                      {'Status: Running'}
-                    </ProgressInline>,
-                  ]}
-                  title="Automated exfiltration"
-                >
-                  <EuiFlexGroup alignItems="center">
-                    <EuiFlexItem grow={false}>
-                      <EuiSwitch checked={true} label="Activate rule" onChange={() => {}} />
-                    </EuiFlexItem>
-
-                    <EuiFlexItem grow={false}>
-                      <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
-                        <EuiFlexItem grow={false}>
-                          <EuiButton
-                            href="#detection-engine/rules/rule-details/edit-rule"
-                            iconType="visControls"
-                          >
-                            {'Edit rule settings'}
-                          </EuiButton>
-                        </EuiFlexItem>
-
-                        <EuiFlexItem grow={false}>
-                          <EuiPopover
-                            button={
-                              <EuiButtonIcon
-                                aria-label="Additional actions"
-                                iconType="boxesHorizontal"
-                                onClick={() => setPopoverState(!popoverState)}
-                              />
-                            }
-                            closePopover={() => setPopoverState(false)}
-                            isOpen={popoverState}
-                          >
-                            <p>{'Overflow context menu here.'}</p>
-                          </EuiPopover>
-                        </EuiFlexItem>
-                      </EuiFlexGroup>
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
-                </HeaderPage>
-
-                <EuiCallOut
-                  color="danger"
-                  iconType="alert"
-                  size="s"
-                  title="Rule failed to run on 12/28/2019, 12:00 PM"
-                >
-                  <p>{'Full fail message here.'}</p>
-                </EuiCallOut>
-
-                <EuiSpacer />
-
-                <EuiFlexGroup>
-                  <EuiFlexItem component="section" grow={1}>
-                    <EuiPanel>
-                      <HeaderSection title="Definition" />
-                    </EuiPanel>
-                  </EuiFlexItem>
-
-                  <EuiFlexItem component="section" grow={2}>
-                    <EuiPanel>
-                      <HeaderSection title="About" />
-
-                      {/* <p>{'Description'}</p> */}
-
-                      {/* <EuiFlexGrid columns={2}>
-                      <EuiFlexItem style={{ flex: '0 0 calc(100% - 24px)' }}>
-                        <p>{'Description'}</p>
-                      </EuiFlexItem>
-
-                      <EuiFlexItem>
-                        <p>{'Severity'}</p>
-                      </EuiFlexItem>
-
-                      <EuiFlexItem>
-                        <p>{'Risk score boost'}</p>
-                      </EuiFlexItem>
-
-                      <EuiFlexItem>
-                        <p>{'References'}</p>
-                      </EuiFlexItem>
-
-                      <EuiFlexItem>
-                        <p>{'False positives'}</p>
-                      </EuiFlexItem>
-
-                      <EuiFlexItem>
-                        <p>{'Mitre ATT&CK types'}</p>
-                      </EuiFlexItem>
-
-                      <EuiFlexItem>
-                        <p>{'Tags'}</p>
-                      </EuiFlexItem>
-                    </EuiFlexGrid> */}
-                    </EuiPanel>
-                  </EuiFlexItem>
-
-                  <EuiFlexItem component="section" grow={1}>
-                    <EuiPanel>
-                      <HeaderSection title="Schedule" />
-                    </EuiPanel>
-                  </EuiFlexItem>
-                </EuiFlexGroup>
-
-                <EuiSpacer />
-
-                <EuiTabbedContent
-                  tabs={[
-                    {
-                      id: 'tabSignals',
-                      name: 'Signals',
-                      content: <Signals />,
-                    },
-                    {
-                      id: 'tabActivityMonitor',
-                      name: 'Activity monitor',
-                      content: <ActivityMonitor />,
-                    },
-                  ]}
-                />
-              </WrapperPage>
-            </StickyContainer>
-          ) : (
-            <WrapperPage>
-              <HeaderPage border title={i18n.PAGE_TITLE} />
-
-              <DetectionEngineEmptyPage />
-            </WrapperPage>
-          );
-        }}
-      </WithSource>
-
-      <SpyRoute />
-    </>
-  );
-});
-RuleDetailsComponent.displayName = 'RuleDetailsComponent';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rule_details/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rule_details/translations.ts
deleted file mode 100644
index 3dd5945ff597c..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rule_details/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 PAGE_TITLE = i18n.translate('xpack.siem.detectionEngine.ruleDetails.pageTitle', {
-  defaultMessage: 'Rule details',
-});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/activity_monitor/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/activity_monitor/columns.tsx
deleted file mode 100644
index 58e2b9f0cabc7..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/activity_monitor/columns.tsx
+++ /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 { EuiIconTip, EuiLink, EuiTextColor } from '@elastic/eui';
-import React from 'react';
-import { getEmptyTagValue } from '../../../../components/empty_value';
-import { ColumnTypes } from './index';
-
-const actions = [
-  {
-    available: (item: ColumnTypes) => item.status === 'Running',
-    description: 'Stop',
-    icon: 'stop',
-    isPrimary: true,
-    name: 'Stop',
-    onClick: () => {},
-    type: 'icon',
-  },
-  {
-    available: (item: ColumnTypes) => item.status === 'Stopped',
-    description: 'Resume',
-    icon: 'play',
-    isPrimary: true,
-    name: 'Resume',
-    onClick: () => {},
-    type: 'icon',
-  },
-];
-
-// Michael: Are we able to do custom, in-table-header filters, as shown in my wireframes?
-export const columns = [
-  {
-    field: 'rule',
-    name: 'Rule',
-    render: (value: ColumnTypes['rule']) => <EuiLink href={value.href}>{value.name}</EuiLink>,
-    sortable: true,
-    truncateText: true,
-  },
-  {
-    field: 'ran',
-    name: 'Ran',
-    render: (value: ColumnTypes['ran']) => '--',
-    sortable: true,
-    truncateText: true,
-  },
-  {
-    field: 'lookedBackTo',
-    name: 'Looked back to',
-    render: (value: ColumnTypes['lookedBackTo']) => '--',
-    sortable: true,
-    truncateText: true,
-  },
-  {
-    field: 'status',
-    name: 'Status',
-    sortable: true,
-    truncateText: true,
-  },
-  {
-    field: 'response',
-    name: 'Response',
-    render: (value: ColumnTypes['response']) => {
-      return value === undefined ? (
-        getEmptyTagValue()
-      ) : (
-        <>
-          {value === 'Fail' ? (
-            <EuiTextColor color="danger">
-              {value} <EuiIconTip content="Full fail message here." type="iInCircle" />
-            </EuiTextColor>
-          ) : (
-            <EuiTextColor color="secondary">{value}</EuiTextColor>
-          )}
-        </>
-      );
-    },
-    sortable: true,
-    truncateText: true,
-  },
-  {
-    actions,
-    width: '40px',
-  },
-];
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/activity_monitor/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/activity_monitor/index.tsx
deleted file mode 100644
index d7306b8630bc2..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/activity_monitor/index.tsx
+++ /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 { EuiBasicTable, EuiPanel, EuiSpacer } from '@elastic/eui';
-import React, { useState } from 'react';
-import { HeaderSection } from '../../../../components/header_section';
-import {
-  UtilityBar,
-  UtilityBarAction,
-  UtilityBarGroup,
-  UtilityBarSection,
-  UtilityBarText,
-} from '../../../../components/detection_engine/utility_bar';
-import { columns } from './columns';
-
-export interface RuleTypes {
-  href: string;
-  name: string;
-}
-
-export interface ColumnTypes {
-  id: number;
-  rule: RuleTypes;
-  ran: string;
-  lookedBackTo: string;
-  status: string;
-  response: string | undefined;
-}
-
-export interface PageTypes {
-  index: number;
-  size: number;
-}
-
-export interface SortTypes {
-  field: string;
-  direction: string;
-}
-
-export const ActivityMonitor = React.memo(() => {
-  const sampleTableData = [
-    {
-      id: 1,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Running',
-    },
-    {
-      id: 2,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Stopped',
-    },
-    {
-      id: 3,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Fail',
-    },
-    {
-      id: 4,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 5,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 6,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 7,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 8,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 9,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 10,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 11,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 12,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 13,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 14,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 15,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 16,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 17,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 18,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 19,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 20,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-    {
-      id: 21,
-      rule: {
-        href: '#/detection-engine/rules/rule-details',
-        name: 'Automated exfiltration',
-      },
-      ran: '2019-12-28 00:00:00.000-05:00',
-      lookedBackTo: '2019-12-28 00:00:00.000-05:00',
-      status: 'Completed',
-      response: 'Success',
-    },
-  ];
-
-  const [itemsTotalState] = useState<number>(sampleTableData.length);
-  const [pageState, setPageState] = useState<PageTypes>({ index: 0, size: 20 });
-  // const [selectedState, setSelectedState] = useState<ColumnTypes[]>([]);
-  const [sortState, setSortState] = useState<SortTypes>({ field: 'ran', direction: 'desc' });
-
-  return (
-    <>
-      <EuiSpacer />
-
-      <EuiPanel>
-        <HeaderSection title="Activity monitor" />
-
-        <UtilityBar border>
-          <UtilityBarSection>
-            <UtilityBarGroup>
-              <UtilityBarText>{'Showing: 39 activites'}</UtilityBarText>
-            </UtilityBarGroup>
-
-            <UtilityBarGroup>
-              <UtilityBarText>{'Selected: 2 activities'}</UtilityBarText>
-
-              <UtilityBarAction iconType="stop">{'Stop selected'}</UtilityBarAction>
-            </UtilityBarGroup>
-
-            <UtilityBarGroup>
-              <UtilityBarAction iconType="cross">{'Clear 7 filters'}</UtilityBarAction>
-            </UtilityBarGroup>
-          </UtilityBarSection>
-        </UtilityBar>
-
-        <EuiBasicTable
-          columns={columns}
-          isSelectable
-          itemId="id"
-          items={sampleTableData}
-          onChange={({ page, sort }: { page: PageTypes; sort: SortTypes }) => {
-            setPageState(page);
-            setSortState(sort);
-          }}
-          pagination={{
-            pageIndex: pageState.index,
-            pageSize: pageState.size,
-            totalItemCount: itemsTotalState,
-            pageSizeOptions: [5, 10, 20],
-          }}
-          selection={{
-            selectable: (item: ColumnTypes) => item.status !== 'Completed',
-            selectableMessage: (selectable: boolean) =>
-              selectable ? undefined : 'Completed runs cannot be acted upon',
-            onSelectionChange: (selectedItems: ColumnTypes[]) => {
-              // setSelectedState(selectedItems);
-            },
-          }}
-          sorting={{
-            sort: sortState,
-          }}
-        />
-      </EuiPanel>
-    </>
-  );
-});
-ActivityMonitor.displayName = 'ActivityMonitor';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx
new file mode 100644
index 0000000000000..f176109b1d7a5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/actions.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 * as H from 'history';
+import React from 'react';
+
+import { DETECTION_ENGINE_PAGE_NAME } from '../../../../components/link_to/redirect_to_detection_engine';
+import {
+  deleteRules,
+  duplicateRules,
+  enableRules,
+  Rule,
+} from '../../../../containers/detection_engine/rules';
+import { Action } from './reducer';
+
+export const editRuleAction = (rule: Rule, history: H.History) => {
+  history.push(`/${DETECTION_ENGINE_PAGE_NAME}/rules/${rule.id}/edit`);
+};
+
+export const runRuleAction = () => {};
+
+export const duplicateRuleAction = async (rule: Rule, dispatch: React.Dispatch<Action>) => {
+  dispatch({ type: 'updateLoading', ids: [rule.id], isLoading: true });
+  const duplicatedRule = await duplicateRules({ rules: [rule] });
+  dispatch({ type: 'updateLoading', ids: [rule.id], isLoading: false });
+  dispatch({ type: 'updateRules', rules: duplicatedRule, appendRuleId: rule.id });
+};
+
+export const exportRulesAction = async (rules: Rule[], dispatch: React.Dispatch<Action>) => {
+  dispatch({ type: 'setExportPayload', exportPayload: rules });
+};
+
+export const deleteRulesAction = async (ids: string[], dispatch: React.Dispatch<Action>) => {
+  dispatch({ type: 'updateLoading', ids, isLoading: true });
+  const deletedRules = await deleteRules({ ids });
+  dispatch({ type: 'deleteRules', rules: deletedRules });
+};
+
+export const enableRulesAction = async (
+  ids: string[],
+  enabled: boolean,
+  dispatch: React.Dispatch<Action>
+) => {
+  try {
+    dispatch({ type: 'updateLoading', ids, isLoading: true });
+    const updatedRules = await enableRules({ ids, enabled });
+    dispatch({ type: 'updateRules', rules: updatedRules });
+  } catch {
+    // TODO Add error toast support to actions (and @throw jsdoc to api calls)
+    dispatch({ type: 'updateLoading', ids, isLoading: false });
+  }
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/batch_actions.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/batch_actions.tsx
new file mode 100644
index 0000000000000..72d38454ad9bc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/batch_actions.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 { EuiContextMenuItem } from '@elastic/eui';
+import React from 'react';
+import * as i18n from '../translations';
+import { TableData } from '../types';
+import { Action } from './reducer';
+import { deleteRulesAction, enableRulesAction, exportRulesAction } from './actions';
+
+export const getBatchItems = (
+  selectedState: TableData[],
+  dispatch: React.Dispatch<Action>,
+  closePopover: () => void
+) => {
+  const containsEnabled = selectedState.some(v => v.activate);
+  const containsDisabled = selectedState.some(v => !v.activate);
+  const containsLoading = selectedState.some(v => v.isLoading);
+
+  return [
+    <EuiContextMenuItem
+      key={i18n.BATCH_ACTION_ACTIVATE_SELECTED}
+      icon="checkInCircleFilled"
+      disabled={containsLoading || !containsDisabled}
+      onClick={async () => {
+        closePopover();
+        const deactivatedIds = selectedState.filter(s => !s.activate).map(s => s.id);
+        await enableRulesAction(deactivatedIds, true, dispatch);
+      }}
+    >
+      {i18n.BATCH_ACTION_ACTIVATE_SELECTED}
+    </EuiContextMenuItem>,
+    <EuiContextMenuItem
+      key={i18n.BATCH_ACTION_DEACTIVATE_SELECTED}
+      icon="crossInACircleFilled"
+      disabled={containsLoading || !containsEnabled}
+      onClick={async () => {
+        closePopover();
+        const activatedIds = selectedState.filter(s => s.activate).map(s => s.id);
+        await enableRulesAction(activatedIds, false, dispatch);
+      }}
+    >
+      {i18n.BATCH_ACTION_DEACTIVATE_SELECTED}
+    </EuiContextMenuItem>,
+    <EuiContextMenuItem
+      key={i18n.BATCH_ACTION_EXPORT_SELECTED}
+      icon="exportAction"
+      disabled={containsLoading || selectedState.length === 0}
+      onClick={async () => {
+        closePopover();
+        await exportRulesAction(
+          selectedState.map(s => s.sourceRule),
+          dispatch
+        );
+      }}
+    >
+      {i18n.BATCH_ACTION_EXPORT_SELECTED}
+    </EuiContextMenuItem>,
+    <EuiContextMenuItem
+      key={i18n.BATCH_ACTION_EDIT_INDEX_PATTERNS}
+      icon="indexEdit"
+      disabled={true}
+      onClick={async () => {
+        closePopover();
+      }}
+    >
+      {i18n.BATCH_ACTION_EDIT_INDEX_PATTERNS}
+    </EuiContextMenuItem>,
+    <EuiContextMenuItem
+      key={i18n.BATCH_ACTION_DELETE_SELECTED}
+      icon="trash"
+      disabled={containsLoading || selectedState.length === 0}
+      onClick={async () => {
+        closePopover();
+        await deleteRulesAction(
+          selectedState.map(({ sourceRule: { id } }) => id),
+          dispatch
+        );
+      }}
+    >
+      {i18n.BATCH_ACTION_DELETE_SELECTED}
+    </EuiContextMenuItem>,
+  ];
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
new file mode 100644
index 0000000000000..42c4bb1d0ef95
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
@@ -0,0 +1,178 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable react/display-name */
+
+import {
+  EuiBadge,
+  EuiHealth,
+  EuiIconTip,
+  EuiLink,
+  EuiTextColor,
+  EuiBasicTableColumn,
+  EuiTableActionsColumnType,
+} from '@elastic/eui';
+import * as H from 'history';
+import React from 'react';
+import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+import { getEmptyTagValue } from '../../../../components/empty_value';
+import {
+  deleteRulesAction,
+  duplicateRuleAction,
+  editRuleAction,
+  exportRulesAction,
+  runRuleAction,
+} from './actions';
+
+import { Action } from './reducer';
+import { TableData } from '../types';
+import * as i18n from '../translations';
+import { PreferenceFormattedDate } from '../../../../components/formatted_date';
+import { RuleSwitch } from '../components/rule_switch';
+
+const getActions = (dispatch: React.Dispatch<Action>, history: H.History) => [
+  {
+    description: i18n.EDIT_RULE_SETTINGS,
+    icon: 'visControls',
+    name: i18n.EDIT_RULE_SETTINGS,
+    onClick: (rowItem: TableData) => editRuleAction(rowItem.sourceRule, history),
+    enabled: (rowItem: TableData) => !rowItem.sourceRule.immutable,
+  },
+  {
+    description: i18n.RUN_RULE_MANUALLY,
+    icon: 'play',
+    name: i18n.RUN_RULE_MANUALLY,
+    onClick: runRuleAction,
+    enabled: () => false,
+  },
+  {
+    description: i18n.DUPLICATE_RULE,
+    icon: 'copy',
+    name: i18n.DUPLICATE_RULE,
+    onClick: (rowItem: TableData) => duplicateRuleAction(rowItem.sourceRule, dispatch),
+  },
+  {
+    description: i18n.EXPORT_RULE,
+    icon: 'exportAction',
+    name: i18n.EXPORT_RULE,
+    onClick: (rowItem: TableData) => exportRulesAction([rowItem.sourceRule], dispatch),
+  },
+  {
+    description: i18n.DELETE_RULE,
+    icon: 'trash',
+    name: i18n.DELETE_RULE,
+    onClick: (rowItem: TableData) => deleteRulesAction([rowItem.id], dispatch),
+  },
+];
+
+// Michael: Are we able to do custom, in-table-header filters, as shown in my wireframes?
+export const getColumns = (
+  dispatch: React.Dispatch<Action>,
+  history: H.History
+): Array<EuiBasicTableColumn<TableData> | EuiTableActionsColumnType<TableData>> => [
+  {
+    field: 'rule',
+    name: i18n.COLUMN_RULE,
+    render: (value: TableData['rule']) => <EuiLink href={value.href}>{value.name}</EuiLink>,
+    truncateText: true,
+    width: '24%',
+  },
+  {
+    field: 'method',
+    name: i18n.COLUMN_METHOD,
+    truncateText: true,
+  },
+  {
+    field: 'severity',
+    name: i18n.COLUMN_SEVERITY,
+    render: (value: TableData['severity']) => (
+      <EuiHealth
+        color={
+          value === 'low'
+            ? euiLightVars.euiColorVis0
+            : value === 'medium'
+            ? euiLightVars.euiColorVis5
+            : value === 'high'
+            ? euiLightVars.euiColorVis7
+            : euiLightVars.euiColorVis9
+        }
+      >
+        {value}
+      </EuiHealth>
+    ),
+    truncateText: true,
+  },
+  {
+    field: 'lastCompletedRun',
+    name: i18n.COLUMN_LAST_COMPLETE_RUN,
+    render: (value: TableData['lastCompletedRun']) => {
+      return value == null ? (
+        getEmptyTagValue()
+      ) : (
+        <PreferenceFormattedDate value={new Date(value)} />
+      );
+    },
+    sortable: true,
+    truncateText: true,
+    width: '16%',
+  },
+  {
+    field: 'lastResponse',
+    name: i18n.COLUMN_LAST_RESPONSE,
+    render: (value: TableData['lastResponse']) => {
+      return value == null ? (
+        getEmptyTagValue()
+      ) : (
+        <>
+          {value.type === 'Fail' ? (
+            <EuiTextColor color="danger">
+              {value.type} <EuiIconTip content={value.message} type="iInCircle" />
+            </EuiTextColor>
+          ) : (
+            <EuiTextColor color="secondary">{value.type}</EuiTextColor>
+          )}
+        </>
+      );
+    },
+    truncateText: true,
+  },
+  {
+    field: 'tags',
+    name: i18n.COLUMN_TAGS,
+    render: (value: TableData['tags']) => (
+      <div>
+        <>
+          {value.map((tag, i) => (
+            <EuiBadge color="hollow" key={i}>
+              {tag}
+            </EuiBadge>
+          ))}
+        </>
+      </div>
+    ),
+    truncateText: true,
+    width: '20%',
+  },
+  {
+    align: 'center',
+    field: 'activate',
+    name: i18n.COLUMN_ACTIVATE,
+    render: (value: TableData['activate'], item: TableData) => (
+      <RuleSwitch
+        dispatch={dispatch}
+        id={item.id}
+        enabled={item.activate}
+        isLoading={item.isLoading}
+      />
+    ),
+    sortable: true,
+    width: '85px',
+  },
+  {
+    actions: getActions(dispatch, history),
+    width: '40px',
+  } as EuiTableActionsColumnType<TableData>,
+];
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/helpers.ts
new file mode 100644
index 0000000000000..1909b75a85835
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/helpers.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Rule } from '../../../../containers/detection_engine/rules';
+import { TableData } from '../types';
+import { getEmptyValue } from '../../../../components/empty_value';
+
+export const formatRules = (rules: Rule[], selectedIds?: string[]): TableData[] =>
+  rules.map(rule => ({
+    id: rule.id,
+    rule_id: rule.rule_id,
+    rule: {
+      href: `#/detection-engine/rules/${encodeURIComponent(rule.id)}`,
+      name: rule.name,
+      status: 'Status Placeholder',
+    },
+    method: rule.type, // TODO: Map to i18n?
+    severity: rule.severity,
+    lastCompletedRun: undefined, // TODO: Not available yet
+    lastResponse: {
+      type: getEmptyValue(), // TODO: Not available yet
+    },
+    tags: rule.tags ?? [],
+    activate: rule.enabled,
+    sourceRule: rule,
+    isLoading: selectedIds?.includes(rule.id) ?? false,
+  }));
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx
new file mode 100644
index 0000000000000..060f8baccc3b7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx
@@ -0,0 +1,222 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EuiBasicTable,
+  EuiContextMenuPanel,
+  EuiFieldSearch,
+  EuiLoadingContent,
+  EuiSpacer,
+} from '@elastic/eui';
+import React, { useCallback, useEffect, useReducer, useState } from 'react';
+import { useHistory } from 'react-router-dom';
+
+import uuid from 'uuid';
+import { HeaderSection } from '../../../../components/header_section';
+import {
+  UtilityBar,
+  UtilityBarAction,
+  UtilityBarGroup,
+  UtilityBarSection,
+  UtilityBarText,
+} from '../../../../components/detection_engine/utility_bar';
+import { getColumns } from './columns';
+import { useRules } from '../../../../containers/detection_engine/rules';
+import { Loader } from '../../../../components/loader';
+import { Panel } from '../../../../components/panel';
+import { getBatchItems } from './batch_actions';
+import { EuiBasicTableOnChange, TableData } from '../types';
+import { allRulesReducer, State } from './reducer';
+import * as i18n from '../translations';
+import { JSONDownloader } from '../components/json_downloader';
+import { useStateToaster } from '../../../../components/toasters';
+
+const initialState: State = {
+  isLoading: true,
+  rules: [],
+  tableData: [],
+  selectedItems: [],
+  refreshToggle: true,
+  pagination: {
+    page: 1,
+    perPage: 20,
+    total: 0,
+  },
+  filterOptions: {
+    filter: '',
+    sortField: 'enabled',
+    sortOrder: 'desc',
+  },
+};
+
+/**
+ * Table Component for displaying all Rules for a given cluster. Provides the ability to filter
+ * by name, sort by enabled, and perform the following actions:
+ *   * Enable/Disable
+ *   * Duplicate
+ *   * Delete
+ *   * Import/Export
+ */
+export const AllRules = React.memo<{ importCompleteToggle: boolean }>(importCompleteToggle => {
+  const [
+    {
+      exportPayload,
+      filterOptions,
+      isLoading,
+      refreshToggle,
+      selectedItems,
+      tableData,
+      pagination,
+    },
+    dispatch,
+  ] = useReducer(allRulesReducer, initialState);
+  const history = useHistory();
+  const [isInitialLoad, setIsInitialLoad] = useState(true);
+  const [isLoadingRules, rulesData] = useRules(pagination, filterOptions, refreshToggle);
+  const [, dispatchToaster] = useStateToaster();
+
+  const getBatchItemsPopoverContent = useCallback(
+    (closePopover: () => void) => (
+      <EuiContextMenuPanel items={getBatchItems(selectedItems, dispatch, closePopover)} />
+    ),
+    [selectedItems, dispatch]
+  );
+
+  useEffect(() => {
+    dispatch({ type: 'loading', isLoading: isLoadingRules });
+
+    if (!isLoadingRules) {
+      setIsInitialLoad(false);
+    }
+  }, [isLoadingRules]);
+
+  useEffect(() => {
+    if (!isInitialLoad) {
+      dispatch({ type: 'refresh' });
+    }
+  }, [importCompleteToggle]);
+
+  useEffect(() => {
+    dispatch({
+      type: 'updateRules',
+      rules: rulesData.data,
+      pagination: {
+        page: rulesData.page,
+        perPage: rulesData.perPage,
+        total: rulesData.total,
+      },
+    });
+  }, [rulesData]);
+
+  return (
+    <>
+      <JSONDownloader
+        filename={`${i18n.EXPORT_FILENAME}.ndjson`}
+        payload={exportPayload}
+        onExportComplete={exportCount => {
+          dispatchToaster({
+            type: 'addToaster',
+            toast: {
+              id: uuid.v4(),
+              title: i18n.SUCCESSFULLY_EXPORTED_RULES(exportCount),
+              color: 'success',
+              iconType: 'check',
+            },
+          });
+        }}
+      />
+      <EuiSpacer />
+
+      <Panel loading={isLoading}>
+        {isInitialLoad ? (
+          <EuiLoadingContent data-test-subj="initialLoadingPanelAllRulesTable" lines={10} />
+        ) : (
+          <>
+            <HeaderSection split title={i18n.ALL_RULES}>
+              <EuiFieldSearch
+                aria-label={i18n.SEARCH_RULES}
+                fullWidth
+                incremental={false}
+                placeholder={i18n.SEARCH_PLACEHOLDER}
+                onSearch={filterString => {
+                  dispatch({
+                    type: 'updateFilterOptions',
+                    filterOptions: {
+                      ...filterOptions,
+                      filter: filterString,
+                    },
+                  });
+                }}
+              />
+            </HeaderSection>
+
+            <UtilityBar border>
+              <UtilityBarSection>
+                <UtilityBarGroup>
+                  <UtilityBarText>{i18n.SHOWING_RULES(pagination.total ?? 0)}</UtilityBarText>
+                </UtilityBarGroup>
+
+                <UtilityBarGroup>
+                  <UtilityBarText>{i18n.SELECTED_RULES(selectedItems.length)}</UtilityBarText>
+                  <UtilityBarAction
+                    iconSide="right"
+                    iconType="arrowDown"
+                    popoverContent={getBatchItemsPopoverContent}
+                  >
+                    {i18n.BATCH_ACTIONS}
+                  </UtilityBarAction>
+                  <UtilityBarAction
+                    iconSide="right"
+                    iconType="refresh"
+                    onClick={() => dispatch({ type: 'refresh' })}
+                  >
+                    {i18n.REFRESH}
+                  </UtilityBarAction>
+                </UtilityBarGroup>
+              </UtilityBarSection>
+            </UtilityBar>
+
+            <EuiBasicTable
+              columns={getColumns(dispatch, history)}
+              isSelectable
+              itemId="rule_id"
+              items={tableData}
+              onChange={({ page, sort }: EuiBasicTableOnChange) => {
+                dispatch({
+                  type: 'updatePagination',
+                  pagination: { ...pagination, page: page.index + 1, perPage: page.size },
+                });
+                dispatch({
+                  type: 'updateFilterOptions',
+                  filterOptions: {
+                    ...filterOptions,
+                    sortField: 'enabled', // Only enabled is supported for sorting currently
+                    sortOrder: sort!.direction,
+                  },
+                });
+              }}
+              pagination={{
+                pageIndex: pagination.page - 1,
+                pageSize: pagination.perPage,
+                totalItemCount: pagination.total,
+                pageSizeOptions: [5, 10, 20],
+              }}
+              selection={{
+                selectable: (item: TableData) => !item.isLoading,
+                onSelectionChange: (selected: TableData[]) =>
+                  dispatch({ type: 'setSelected', selectedItems: selected }),
+              }}
+              sorting={{ sort: { field: 'activate', direction: filterOptions.sortOrder } }}
+            />
+            {isLoading && <Loader data-test-subj="loadingPanelAllRulesTable" overlay size="xl" />}
+          </>
+        )}
+      </Panel>
+    </>
+  );
+});
+
+AllRules.displayName = 'AllRules';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/reducer.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/reducer.ts
new file mode 100644
index 0000000000000..4a6be1a7e4da7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/reducer.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  FilterOptions,
+  PaginationOptions,
+  Rule,
+} from '../../../../containers/detection_engine/rules';
+import { TableData } from '../types';
+import { formatRules } from './helpers';
+
+export interface State {
+  isLoading: boolean;
+  rules: Rule[];
+  selectedItems: TableData[];
+  pagination: PaginationOptions;
+  filterOptions: FilterOptions;
+  refreshToggle: boolean;
+  tableData: TableData[];
+  exportPayload?: object[];
+}
+
+export type Action =
+  | { type: 'refresh' }
+  | { type: 'loading'; isLoading: boolean }
+  | { type: 'deleteRules'; rules: Rule[] }
+  | { type: 'duplicate'; rule: Rule }
+  | { type: 'setExportPayload'; exportPayload?: object[] }
+  | { type: 'setSelected'; selectedItems: TableData[] }
+  | { type: 'updateLoading'; ids: string[]; isLoading: boolean }
+  | { type: 'updateRules'; rules: Rule[]; appendRuleId?: string; pagination?: PaginationOptions }
+  | { type: 'updatePagination'; pagination: PaginationOptions }
+  | { type: 'updateFilterOptions'; filterOptions: FilterOptions }
+  | { type: 'failure' };
+
+export const allRulesReducer = (state: State, action: Action): State => {
+  switch (action.type) {
+    case 'refresh': {
+      return {
+        ...state,
+        refreshToggle: !state.refreshToggle,
+      };
+    }
+    case 'updateRules': {
+      // If pagination included, this was a hard refresh
+      if (action.pagination) {
+        return {
+          ...state,
+          rules: action.rules,
+          pagination: action.pagination,
+          tableData: formatRules(action.rules),
+        };
+      }
+
+      const ruleIds = state.rules.map(r => r.rule_id);
+      const appendIdx =
+        action.appendRuleId != null ? state.rules.findIndex(r => r.id === action.appendRuleId) : -1;
+      const updatedRules = action.rules.reduce(
+        (rules, updatedRule) =>
+          ruleIds.includes(updatedRule.rule_id)
+            ? rules.map(r => (updatedRule.rule_id === r.rule_id ? updatedRule : r))
+            : appendIdx !== -1
+            ? [
+                ...rules.slice(0, appendIdx + 1),
+                updatedRule,
+                ...rules.slice(appendIdx + 1, rules.length - 1),
+              ]
+            : [...rules, updatedRule],
+        [...state.rules]
+      );
+
+      // Update enabled on selectedItems so that batch actions show correct available actions
+      const updatedRuleIdToState = action.rules.reduce<Record<string, boolean>>(
+        (acc, r) => ({ ...acc, [r.id]: r.enabled }),
+        {}
+      );
+      const updatedSelectedItems = state.selectedItems.map(selectedItem =>
+        Object.keys(updatedRuleIdToState).includes(selectedItem.id)
+          ? { ...selectedItem, activate: updatedRuleIdToState[selectedItem.id] }
+          : selectedItem
+      );
+
+      return {
+        ...state,
+        rules: updatedRules,
+        tableData: formatRules(updatedRules),
+        selectedItems: updatedSelectedItems,
+      };
+    }
+    case 'updatePagination': {
+      return {
+        ...state,
+        pagination: action.pagination,
+      };
+    }
+    case 'updateFilterOptions': {
+      return {
+        ...state,
+        filterOptions: action.filterOptions,
+      };
+    }
+    case 'deleteRules': {
+      const deletedRuleIds = action.rules.map(r => r.rule_id);
+      const updatedRules = state.rules.reduce<Rule[]>(
+        (rules, rule) => (deletedRuleIds.includes(rule.rule_id) ? rules : [...rules, rule]),
+        []
+      );
+      return {
+        ...state,
+        rules: updatedRules,
+        tableData: formatRules(updatedRules),
+      };
+    }
+    case 'setSelected': {
+      return {
+        ...state,
+        selectedItems: action.selectedItems,
+      };
+    }
+    case 'updateLoading': {
+      return {
+        ...state,
+        rules: state.rules,
+        tableData: formatRules(state.rules, action.ids),
+      };
+    }
+    case 'loading': {
+      return {
+        ...state,
+        isLoading: action.isLoading,
+      };
+    }
+    case 'failure': {
+      return {
+        ...state,
+        isLoading: false,
+        rules: [],
+      };
+    }
+    case 'setExportPayload': {
+      return {
+        ...state,
+        exportPayload: action.exportPayload,
+      };
+    }
+    default:
+      return state;
+  }
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/actions.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/actions.tsx
deleted file mode 100644
index a54296f65a382..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/actions.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 {
-  deleteRules,
-  duplicateRules,
-  enableRules,
-} from '../../../../containers/detection_engine/rules/api';
-import { Action } from './reducer';
-import { Rule } from '../../../../containers/detection_engine/rules/types';
-
-export const editRuleAction = () => {};
-
-export const runRuleAction = () => {};
-
-export const duplicateRuleAction = async (
-  rule: Rule,
-  dispatch: React.Dispatch<Action>,
-  kbnVersion: string
-) => {
-  dispatch({ type: 'updateLoading', ids: [rule.id], isLoading: true });
-  const duplicatedRule = await duplicateRules({ rules: [rule], kbnVersion });
-  dispatch({ type: 'updateLoading', ids: [rule.id], isLoading: false });
-  dispatch({ type: 'updateRules', rules: duplicatedRule });
-};
-
-export const exportRulesAction = async (rules: Rule[], dispatch: React.Dispatch<Action>) => {
-  dispatch({ type: 'setExportPayload', exportPayload: rules });
-};
-
-export const deleteRulesAction = async (
-  ids: string[],
-  dispatch: React.Dispatch<Action>,
-  kbnVersion: string
-) => {
-  dispatch({ type: 'updateLoading', ids, isLoading: true });
-  const deletedRules = await deleteRules({ ids, kbnVersion });
-  dispatch({ type: 'deleteRules', rules: deletedRules });
-};
-
-export const enableRulesAction = async (
-  ids: string[],
-  enabled: boolean,
-  dispatch: React.Dispatch<Action>,
-  kbnVersion: string
-) => {
-  try {
-    dispatch({ type: 'updateLoading', ids, isLoading: true });
-    const updatedRules = await enableRules({ ids, enabled, kbnVersion });
-    dispatch({ type: 'updateRules', rules: updatedRules });
-  } catch {
-    // TODO Add error toast support to actions (and @throw jsdoc to api calls)
-    dispatch({ type: 'updateLoading', ids, isLoading: false });
-  }
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/batch_actions.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/batch_actions.tsx
deleted file mode 100644
index c8fb9d98fde6a..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/batch_actions.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 { EuiContextMenuItem } from '@elastic/eui';
-import React from 'react';
-import * as i18n from '../translations';
-import { TableData } from '../types';
-import { Action } from './reducer';
-import { deleteRulesAction, enableRulesAction, exportRulesAction } from './actions';
-
-export const getBatchItems = (
-  selectedState: TableData[],
-  dispatch: React.Dispatch<Action>,
-  closePopover: () => void,
-  kbnVersion: string
-) => {
-  const containsEnabled = selectedState.some(v => v.activate);
-  const containsDisabled = selectedState.some(v => !v.activate);
-  const containsLoading = selectedState.some(v => v.isLoading);
-
-  return [
-    <EuiContextMenuItem
-      key={i18n.BATCH_ACTION_ACTIVATE_SELECTED}
-      icon="checkInCircleFilled"
-      disabled={containsLoading || !containsDisabled}
-      onClick={async () => {
-        closePopover();
-        const deactivatedIds = selectedState.filter(s => !s.activate).map(s => s.id);
-        await enableRulesAction(deactivatedIds, true, dispatch, kbnVersion);
-      }}
-    >
-      {i18n.BATCH_ACTION_ACTIVATE_SELECTED}
-    </EuiContextMenuItem>,
-    <EuiContextMenuItem
-      key={i18n.BATCH_ACTION_DEACTIVATE_SELECTED}
-      icon="crossInACircleFilled"
-      disabled={containsLoading || !containsEnabled}
-      onClick={async () => {
-        closePopover();
-        const activatedIds = selectedState.filter(s => s.activate).map(s => s.id);
-        await enableRulesAction(activatedIds, false, dispatch, kbnVersion);
-      }}
-    >
-      {i18n.BATCH_ACTION_DEACTIVATE_SELECTED}
-    </EuiContextMenuItem>,
-    <EuiContextMenuItem
-      key={i18n.BATCH_ACTION_EXPORT_SELECTED}
-      icon="exportAction"
-      disabled={containsLoading || selectedState.length === 0}
-      onClick={async () => {
-        closePopover();
-        await exportRulesAction(
-          selectedState.map(s => s.sourceRule),
-          dispatch
-        );
-      }}
-    >
-      {i18n.BATCH_ACTION_EXPORT_SELECTED}
-    </EuiContextMenuItem>,
-    <EuiContextMenuItem
-      key={i18n.BATCH_ACTION_EDIT_INDEX_PATTERNS}
-      icon="indexEdit"
-      disabled={true}
-      onClick={async () => {
-        closePopover();
-      }}
-    >
-      {i18n.BATCH_ACTION_EDIT_INDEX_PATTERNS}
-    </EuiContextMenuItem>,
-    <EuiContextMenuItem
-      key={i18n.BATCH_ACTION_DELETE_SELECTED}
-      icon="trash"
-      disabled={containsLoading || selectedState.length === 0}
-      onClick={async () => {
-        closePopover();
-        await deleteRulesAction(
-          selectedState.map(({ sourceRule: { id } }) => id),
-          dispatch,
-          kbnVersion
-        );
-      }}
-    >
-      {i18n.BATCH_ACTION_DELETE_SELECTED}
-    </EuiContextMenuItem>,
-  ];
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/columns.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/columns.tsx
deleted file mode 100644
index cae0fb3eaf906..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/columns.tsx
+++ /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 { EuiBadge, EuiHealth, EuiIconTip, EuiLink, EuiTextColor } from '@elastic/eui';
-import React from 'react';
-import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
-import { getEmptyTagValue } from '../../../../components/empty_value';
-import {
-  deleteRulesAction,
-  duplicateRuleAction,
-  editRuleAction,
-  enableRulesAction,
-  exportRulesAction,
-  runRuleAction,
-} from './actions';
-
-import { Action } from './reducer';
-import { TableData } from '../types';
-import * as i18n from '../translations';
-import { PreferenceFormattedDate } from '../../../../components/formatted_date';
-import { RuleSwitch } from '../components/rule_switch';
-
-const getActions = (dispatch: React.Dispatch<Action>, kbnVersion: string) => [
-  {
-    description: i18n.EDIT_RULE_SETTINGS,
-    icon: 'visControls',
-    name: i18n.EDIT_RULE_SETTINGS,
-    onClick: editRuleAction,
-    enabled: () => false,
-  },
-  {
-    description: i18n.RUN_RULE_MANUALLY,
-    icon: 'play',
-    name: i18n.RUN_RULE_MANUALLY,
-    onClick: runRuleAction,
-    enabled: () => false,
-  },
-  {
-    description: i18n.DUPLICATE_RULE,
-    icon: 'copy',
-    name: i18n.DUPLICATE_RULE,
-    onClick: (rowItem: TableData) => duplicateRuleAction(rowItem.sourceRule, dispatch, kbnVersion),
-  },
-  {
-    description: i18n.EXPORT_RULE,
-    icon: 'exportAction',
-    name: i18n.EXPORT_RULE,
-    onClick: (rowItem: TableData) => exportRulesAction([rowItem.sourceRule], dispatch),
-  },
-  {
-    description: i18n.DELETE_RULE,
-    icon: 'trash',
-    name: i18n.DELETE_RULE,
-    onClick: (rowItem: TableData) => deleteRulesAction([rowItem.id], dispatch, kbnVersion),
-  },
-];
-
-// Michael: Are we able to do custom, in-table-header filters, as shown in my wireframes?
-export const getColumns = (dispatch: React.Dispatch<Action>, kbnVersion: string) => [
-  {
-    field: 'rule',
-    name: i18n.COLUMN_RULE,
-    render: (value: TableData['rule']) => <EuiLink href={value.href}>{value.name}</EuiLink>,
-    truncateText: true,
-    width: '24%',
-  },
-  {
-    field: 'method',
-    name: i18n.COLUMN_METHOD,
-    truncateText: true,
-  },
-  {
-    field: 'severity',
-    name: i18n.COLUMN_SEVERITY,
-    render: (value: TableData['severity']) => (
-      <EuiHealth
-        color={
-          value === 'low'
-            ? euiLightVars.euiColorVis0
-            : value === 'medium'
-            ? euiLightVars.euiColorVis5
-            : value === 'high'
-            ? euiLightVars.euiColorVis7
-            : euiLightVars.euiColorVis9
-        }
-      >
-        {value}
-      </EuiHealth>
-    ),
-    truncateText: true,
-  },
-  {
-    field: 'lastCompletedRun',
-    name: i18n.COLUMN_LAST_COMPLETE_RUN,
-    render: (value: TableData['lastCompletedRun']) => {
-      return value == null ? (
-        getEmptyTagValue()
-      ) : (
-        <PreferenceFormattedDate value={new Date(value)} />
-      );
-    },
-    sortable: true,
-    truncateText: true,
-    width: '16%',
-  },
-  {
-    field: 'lastResponse',
-    name: i18n.COLUMN_LAST_RESPONSE,
-    render: (value: TableData['lastResponse']) => {
-      return value == null ? (
-        getEmptyTagValue()
-      ) : (
-        <>
-          {value.type === 'Fail' ? (
-            <EuiTextColor color="danger">
-              {value.type} <EuiIconTip content={value.message} type="iInCircle" />
-            </EuiTextColor>
-          ) : (
-            <EuiTextColor color="secondary">{value.type}</EuiTextColor>
-          )}
-        </>
-      );
-    },
-    truncateText: true,
-  },
-  {
-    field: 'tags',
-    name: i18n.COLUMN_TAGS,
-    render: (value: TableData['tags']) => (
-      <div>
-        <>
-          {value.map((tag, i) => (
-            <EuiBadge color="hollow" key={i}>
-              {tag}
-            </EuiBadge>
-          ))}
-        </>
-      </div>
-    ),
-    truncateText: true,
-    width: '20%',
-  },
-  {
-    align: 'center',
-    field: 'activate',
-    name: i18n.COLUMN_ACTIVATE,
-    render: (value: TableData['activate'], item: TableData) => (
-      <RuleSwitch
-        id={item.id}
-        enabled={item.activate}
-        isLoading={item.isLoading}
-        onRuleStateChange={async (enabled, id) => {
-          await enableRulesAction([id], enabled, dispatch, kbnVersion);
-        }}
-      />
-    ),
-    sortable: true,
-    width: '85px',
-  },
-  {
-    actions: getActions(dispatch, kbnVersion),
-    width: '40px',
-  },
-];
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/helpers.ts
deleted file mode 100644
index db02d41771f68..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/helpers.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 { Rule } from '../../../../containers/detection_engine/rules/types';
-import { TableData } from '../types';
-import { getEmptyValue } from '../../../../components/empty_value';
-
-export const formatRules = (rules: Rule[], selectedIds?: string[]): TableData[] =>
-  rules.map(rule => ({
-    id: rule.id,
-    rule_id: rule.rule_id,
-    rule: {
-      href: `#/detection-engine/rules/rule-details/${encodeURIComponent(rule.id)}`,
-      name: rule.name,
-      status: 'Status Placeholder',
-    },
-    method: rule.type, // TODO: Map to i18n?
-    severity: rule.severity,
-    lastCompletedRun: undefined, // TODO: Not available yet
-    lastResponse: {
-      type: getEmptyValue(), // TODO: Not available yet
-    },
-    tags: rule.tags ?? [],
-    activate: rule.enabled,
-    sourceRule: rule,
-    isLoading: selectedIds?.includes(rule.id) ?? false,
-  }));
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/index.tsx
deleted file mode 100644
index a73ebeb61db3c..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/index.tsx
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import {
-  EuiBasicTable,
-  EuiContextMenuPanel,
-  EuiFieldSearch,
-  EuiLoadingContent,
-  EuiSpacer,
-} from '@elastic/eui';
-import React, { useCallback, useEffect, useReducer, useState } from 'react';
-
-import uuid from 'uuid';
-import { HeaderSection } from '../../../../components/header_section';
-import {
-  UtilityBar,
-  UtilityBarAction,
-  UtilityBarGroup,
-  UtilityBarSection,
-  UtilityBarText,
-} from '../../../../components/detection_engine/utility_bar';
-import { getColumns } from './columns';
-import { useRules } from '../../../../containers/detection_engine/rules/use_rules';
-import { Loader } from '../../../../components/loader';
-import { Panel } from '../../../../components/panel';
-import { getBatchItems } from './batch_actions';
-import { EuiBasicTableOnChange, TableData } from '../types';
-import { allRulesReducer, State } from './reducer';
-import * as i18n from '../translations';
-import { useKibanaUiSetting } from '../../../../lib/settings/use_kibana_ui_setting';
-import { DEFAULT_KBN_VERSION } from '../../../../../common/constants';
-import { JSONDownloader } from '../components/json_downloader';
-import { useStateToaster } from '../../../../components/toasters';
-
-const initialState: State = {
-  isLoading: true,
-  rules: [],
-  tableData: [],
-  selectedItems: [],
-  refreshToggle: true,
-  pagination: {
-    page: 1,
-    perPage: 20,
-    total: 0,
-  },
-  filterOptions: {
-    filter: '',
-    sortField: 'enabled',
-    sortOrder: 'desc',
-  },
-};
-
-/**
- * Table Component for displaying all Rules for a given cluster. Provides the ability to filter
- * by name, sort by enabled, and perform the following actions:
- *   * Enable/Disable
- *   * Duplicate
- *   * Delete
- *   * Import/Export
- */
-export const AllRules = React.memo<{ importCompleteToggle: boolean }>(importCompleteToggle => {
-  const [
-    {
-      exportPayload,
-      filterOptions,
-      isLoading,
-      refreshToggle,
-      selectedItems,
-      tableData,
-      pagination,
-    },
-    dispatch,
-  ] = useReducer(allRulesReducer, initialState);
-
-  const [isInitialLoad, setIsInitialLoad] = useState(true);
-  const [isLoadingRules, rulesData] = useRules(pagination, filterOptions, refreshToggle);
-  const [kbnVersion] = useKibanaUiSetting(DEFAULT_KBN_VERSION);
-  const [, dispatchToaster] = useStateToaster();
-
-  const getBatchItemsPopoverContent = useCallback(
-    (closePopover: () => void) => (
-      <EuiContextMenuPanel
-        items={getBatchItems(selectedItems, dispatch, closePopover, kbnVersion)}
-      />
-    ),
-    [selectedItems, dispatch, kbnVersion]
-  );
-
-  useEffect(() => {
-    dispatch({ type: 'loading', isLoading: isLoadingRules });
-
-    if (!isLoadingRules) {
-      setIsInitialLoad(false);
-    }
-  }, [isLoadingRules]);
-
-  useEffect(() => {
-    if (!isInitialLoad) {
-      dispatch({ type: 'refresh' });
-    }
-  }, [importCompleteToggle]);
-
-  useEffect(() => {
-    dispatch({
-      type: 'updateRules',
-      rules: rulesData.data,
-      pagination: {
-        page: rulesData.page,
-        perPage: rulesData.perPage,
-        total: rulesData.total,
-      },
-    });
-  }, [rulesData]);
-
-  return (
-    <>
-      <JSONDownloader
-        filename={`${i18n.EXPORT_FILENAME}.ndjson`}
-        payload={exportPayload}
-        onExportComplete={exportCount => {
-          dispatchToaster({
-            type: 'addToaster',
-            toast: {
-              id: uuid.v4(),
-              title: i18n.SUCCESSFULLY_EXPORTED_RULES(exportCount),
-              color: 'success',
-              iconType: 'check',
-            },
-          });
-        }}
-      />
-      <EuiSpacer />
-
-      <Panel loading={isLoading}>
-        {isInitialLoad ? (
-          <EuiLoadingContent data-test-subj="initialLoadingPanelAllRulesTable" lines={10} />
-        ) : (
-          <>
-            <HeaderSection split title={i18n.ALL_RULES}>
-              <EuiFieldSearch
-                aria-label={i18n.SEARCH_RULES}
-                fullWidth
-                incremental={false}
-                placeholder={i18n.SEARCH_PLACEHOLDER}
-                onSearch={filterString => {
-                  dispatch({
-                    type: 'updateFilterOptions',
-                    filterOptions: {
-                      ...filterOptions,
-                      filter: filterString,
-                    },
-                  });
-                }}
-              />
-            </HeaderSection>
-
-            <UtilityBar border>
-              <UtilityBarSection>
-                <UtilityBarGroup>
-                  <UtilityBarText>{i18n.SHOWING_RULES(pagination.total ?? 0)}</UtilityBarText>
-                </UtilityBarGroup>
-
-                <UtilityBarGroup>
-                  <UtilityBarText>{i18n.SELECTED_RULES(selectedItems.length)}</UtilityBarText>
-                  <UtilityBarAction
-                    iconSide="right"
-                    iconType="arrowDown"
-                    popoverContent={getBatchItemsPopoverContent}
-                  >
-                    {i18n.BATCH_ACTIONS}
-                  </UtilityBarAction>
-                  <UtilityBarAction
-                    iconSide="right"
-                    iconType="refresh"
-                    onClick={() => dispatch({ type: 'refresh' })}
-                  >
-                    {i18n.REFRESH}
-                  </UtilityBarAction>
-                </UtilityBarGroup>
-              </UtilityBarSection>
-            </UtilityBar>
-
-            <EuiBasicTable
-              columns={getColumns(dispatch, kbnVersion)}
-              isSelectable
-              itemId="rule_id"
-              items={tableData}
-              onChange={({ page, sort }: EuiBasicTableOnChange) => {
-                dispatch({
-                  type: 'updatePagination',
-                  pagination: { ...pagination, page: page.index + 1, perPage: page.size },
-                });
-                dispatch({
-                  type: 'updateFilterOptions',
-                  filterOptions: {
-                    ...filterOptions,
-                    sortField: 'enabled', // Only enabled is supported for sorting currently
-                    sortOrder: sort.direction,
-                  },
-                });
-              }}
-              pagination={{
-                pageIndex: pagination.page - 1,
-                pageSize: pagination.perPage,
-                totalItemCount: pagination.total,
-                pageSizeOptions: [5, 10, 20],
-              }}
-              selection={{
-                selectable: (item: TableData) => !item.isLoading,
-                onSelectionChange: (selected: TableData[]) =>
-                  dispatch({ type: 'setSelected', selectedItems: selected }),
-              }}
-              sorting={{ sort: { field: 'activate', direction: filterOptions.sortOrder } }}
-            />
-            {isLoading && <Loader data-test-subj="loadingPanelAllRulesTable" overlay size="xl" />}
-          </>
-        )}
-      </Panel>
-    </>
-  );
-});
-
-AllRules.displayName = 'AllRules';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/reducer.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/reducer.ts
deleted file mode 100644
index c59c5687c10c9..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all_rules/reducer.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 {
-  FilterOptions,
-  PaginationOptions,
-  Rule,
-} from '../../../../containers/detection_engine/rules/types';
-import { TableData } from '../types';
-import { formatRules } from './helpers';
-
-export interface State {
-  isLoading: boolean;
-  rules: Rule[];
-  selectedItems: TableData[];
-  pagination: PaginationOptions;
-  filterOptions: FilterOptions;
-  refreshToggle: boolean;
-  tableData: TableData[];
-  exportPayload?: object[];
-}
-
-export type Action =
-  | { type: 'refresh' }
-  | { type: 'loading'; isLoading: boolean }
-  | { type: 'deleteRules'; rules: Rule[] }
-  | { type: 'duplicate'; rule: Rule }
-  | { type: 'setExportPayload'; exportPayload?: object[] }
-  | { type: 'setSelected'; selectedItems: TableData[] }
-  | { type: 'updateLoading'; ids: string[]; isLoading: boolean }
-  | { type: 'updateRules'; rules: Rule[]; pagination?: PaginationOptions }
-  | { type: 'updatePagination'; pagination: PaginationOptions }
-  | { type: 'updateFilterOptions'; filterOptions: FilterOptions }
-  | { type: 'failure' };
-
-export const allRulesReducer = (state: State, action: Action): State => {
-  switch (action.type) {
-    case 'refresh': {
-      return {
-        ...state,
-        refreshToggle: !state.refreshToggle,
-      };
-    }
-    case 'updateRules': {
-      // If pagination included, this was a hard refresh
-      if (action.pagination) {
-        return {
-          ...state,
-          rules: action.rules,
-          pagination: action.pagination,
-          tableData: formatRules(action.rules),
-        };
-      }
-
-      const ruleIds = state.rules.map(r => r.rule_id);
-      const updatedRules = action.rules.reduce(
-        (rules, updatedRule) =>
-          ruleIds.includes(updatedRule.rule_id)
-            ? rules.map(r => (updatedRule.rule_id === r.rule_id ? updatedRule : r))
-            : [...rules, updatedRule],
-        [...state.rules]
-      );
-
-      // Update enabled on selectedItems so that batch actions show correct available actions
-      const updatedRuleIdToState = action.rules.reduce<Record<string, boolean>>(
-        (acc, r) => ({ ...acc, [r.id]: r.enabled }),
-        {}
-      );
-      const updatedSelectedItems = state.selectedItems.map(selectedItem =>
-        Object.keys(updatedRuleIdToState).includes(selectedItem.id)
-          ? { ...selectedItem, activate: updatedRuleIdToState[selectedItem.id] }
-          : selectedItem
-      );
-
-      return {
-        ...state,
-        rules: updatedRules,
-        tableData: formatRules(updatedRules),
-        selectedItems: updatedSelectedItems,
-      };
-    }
-    case 'updatePagination': {
-      return {
-        ...state,
-        pagination: action.pagination,
-      };
-    }
-    case 'updateFilterOptions': {
-      return {
-        ...state,
-        filterOptions: action.filterOptions,
-      };
-    }
-    case 'deleteRules': {
-      const deletedRuleIds = action.rules.map(r => r.rule_id);
-      const updatedRules = state.rules.reduce<Rule[]>(
-        (rules, rule) => (deletedRuleIds.includes(rule.rule_id) ? rules : [...rules, rule]),
-        []
-      );
-      return {
-        ...state,
-        rules: updatedRules,
-        tableData: formatRules(updatedRules),
-      };
-    }
-    case 'setSelected': {
-      return {
-        ...state,
-        selectedItems: action.selectedItems,
-      };
-    }
-    case 'updateLoading': {
-      return {
-        ...state,
-        rules: state.rules,
-        tableData: formatRules(state.rules, action.ids),
-      };
-    }
-    case 'loading': {
-      return {
-        ...state,
-        isLoading: action.isLoading,
-      };
-    }
-    case 'failure': {
-      return {
-        ...state,
-        isLoading: false,
-        rules: [],
-      };
-    }
-    case 'setExportPayload': {
-      return {
-        ...state,
-        exportPayload: action.exportPayload,
-      };
-    }
-    default:
-      return state;
-  }
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/accordion_title/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/accordion_title/index.tsx
new file mode 100644
index 0000000000000..77a30b70705ff
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/accordion_title/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 { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
+import React from 'react';
+
+import { RuleStatusIcon, RuleStatusIconProps } from '../status_icon';
+
+interface AccordionTitleProps extends RuleStatusIconProps {
+  title: string;
+}
+
+const AccordionTitleComponent: React.FC<AccordionTitleProps> = ({ name, title, type }) => (
+  <EuiFlexGroup alignItems="center" gutterSize="m" responsive={false}>
+    <EuiFlexItem grow={false}>
+      <RuleStatusIcon name={name} type={type} />
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <EuiTitle size="s" className="euiAccordionForm__title">
+        <h6>{title}</h6>
+      </EuiTitle>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
+
+export const AccordionTitle = React.memo(AccordionTitleComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.tsx
new file mode 100644
index 0000000000000..f090f6d97eaf9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.tsx
@@ -0,0 +1,156 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiButtonEmpty, EuiButtonIcon, EuiFormRow, EuiFieldText, EuiSpacer } from '@elastic/eui';
+import { isEmpty } from 'lodash/fp';
+import React, { ChangeEvent, useCallback, useEffect, useState, useRef } from 'react';
+
+import * as RuleI18n from '../../translations';
+import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
+
+interface AddItemProps {
+  addText: string;
+  field: FieldHook;
+  dataTestSubj: string;
+  idAria: string;
+  isDisabled: boolean;
+}
+
+export const AddItem = ({ addText, dataTestSubj, field, idAria, isDisabled }: AddItemProps) => {
+  const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
+  // const [items, setItems] = useState(['']);
+  const [haveBeenKeyboardDeleted, setHaveBeenKeyboardDeleted] = useState(-1);
+
+  const inputsRef = useRef<HTMLInputElement[]>([]);
+
+  const removeItem = useCallback(
+    (index: number) => {
+      const values = field.value as string[];
+      field.setValue([...values.slice(0, index), ...values.slice(index + 1)]);
+      inputsRef.current = [
+        ...inputsRef.current.slice(0, index),
+        ...inputsRef.current.slice(index + 1),
+      ];
+      inputsRef.current = inputsRef.current.map((ref, i) => {
+        if (i >= index && inputsRef.current[index] != null) {
+          ref.value = 're-render';
+        }
+        return ref;
+      });
+    },
+    [field]
+  );
+
+  const addItem = useCallback(() => {
+    const values = field.value as string[];
+    if (!isEmpty(values) && values[values.length - 1]) {
+      field.setValue([...values, '']);
+    } else if (isEmpty(values)) {
+      field.setValue(['']);
+    }
+  }, [field]);
+
+  const updateItem = useCallback(
+    (event: ChangeEvent<HTMLInputElement>, index: number) => {
+      event.persist();
+      const values = field.value as string[];
+      const value = event.target.value;
+      if (isEmpty(value)) {
+        field.setValue([...values.slice(0, index), ...values.slice(index + 1)]);
+        inputsRef.current = [
+          ...inputsRef.current.slice(0, index),
+          ...inputsRef.current.slice(index + 1),
+        ];
+        setHaveBeenKeyboardDeleted(inputsRef.current.length - 1);
+        inputsRef.current = inputsRef.current.map((ref, i) => {
+          if (i >= index && inputsRef.current[index] != null) {
+            ref.value = 're-render';
+          }
+          return ref;
+        });
+      } else {
+        field.setValue([...values.slice(0, index), value, ...values.slice(index + 1)]);
+      }
+    },
+    [field]
+  );
+
+  const handleLastInputRef = useCallback(
+    (index: number, element: HTMLInputElement | null) => {
+      if (element != null) {
+        inputsRef.current = [
+          ...inputsRef.current.slice(0, index),
+          element,
+          ...inputsRef.current.slice(index + 1),
+        ];
+      }
+    },
+    [inputsRef]
+  );
+
+  useEffect(() => {
+    if (
+      haveBeenKeyboardDeleted !== -1 &&
+      !isEmpty(inputsRef.current) &&
+      inputsRef.current[haveBeenKeyboardDeleted] != null
+    ) {
+      inputsRef.current[haveBeenKeyboardDeleted].focus();
+      setHaveBeenKeyboardDeleted(-1);
+    }
+  }, [haveBeenKeyboardDeleted, inputsRef.current]);
+
+  const values = field.value as string[];
+  return (
+    <EuiFormRow
+      label={field.label}
+      labelAppend={field.labelAppend}
+      error={errorMessage}
+      isInvalid={isInvalid}
+      fullWidth
+      data-test-subj={dataTestSubj}
+      describedByIds={idAria ? [idAria] : undefined}
+    >
+      <>
+        {values.map((item, index) => {
+          const euiFieldProps = {
+            disabled: isDisabled,
+            ...(index === values.length - 1
+              ? { inputRef: handleLastInputRef.bind(null, index) }
+              : {}),
+            ...((inputsRef.current[index] != null && inputsRef.current[index].value !== item) ||
+            inputsRef.current[index] == null
+              ? { value: item }
+              : {}),
+          };
+          return (
+            <div key={index}>
+              <EuiFieldText
+                append={
+                  <EuiButtonIcon
+                    color="danger"
+                    iconType="trash"
+                    isDisabled={isDisabled}
+                    onClick={() => removeItem(index)}
+                    aria-label={RuleI18n.DELETE}
+                  />
+                }
+                onChange={e => updateItem(e, index)}
+                compressed
+                fullWidth
+                {...euiFieldProps}
+              />
+              {values.length - 1 !== index && <EuiSpacer size="s" />}
+            </div>
+          );
+        })}
+
+        <EuiButtonEmpty size="xs" onClick={addItem} isDisabled={isDisabled}>
+          {addText}
+        </EuiButtonEmpty>
+      </>
+    </EuiFormRow>
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/filter_label.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/filter_label.tsx
similarity index 94%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/filter_label.tsx
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/filter_label.tsx
index 15844f5012291..bc2cd39da44be 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/filter_label.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/filter_label.tsx
@@ -16,7 +16,7 @@ interface Props {
   valueLabel?: string;
 }
 
-export const FilterLabel = memo<Props>(({ filter, valueLabel }) => {
+const FilterLabelComponent: React.FC<Props> = ({ filter, valueLabel }) => {
   const prefixText = filter.meta.negate
     ? ` ${i18n.translate('xpack.siem.detectionEngine.createRule.filterLabel.negatedFilterPrefix', {
         defaultMessage: 'NOT ',
@@ -90,4 +90,6 @@ export const FilterLabel = memo<Props>(({ filter, valueLabel }) => {
         </>
       );
   }
-});
+};
+
+export const FilterLabel = memo(FilterLabelComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/filter_operator.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/filter_operator.tsx
similarity index 100%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/filter_operator.tsx
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/filter_operator.tsx
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
new file mode 100644
index 0000000000000..a05f43579e669
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
@@ -0,0 +1,269 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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,
+  EuiDescriptionList,
+  EuiLoadingSpinner,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiTextArea,
+  EuiLink,
+  EuiText,
+  EuiListGroup,
+} from '@elastic/eui';
+import { isEmpty, chunk, get, pick } from 'lodash/fp';
+import React, { memo, ReactNode, useState } from 'react';
+import styled from 'styled-components';
+
+import {
+  IIndexPattern,
+  esFilters,
+  FilterManager,
+  Query,
+} from '../../../../../../../../../../src/plugins/data/public';
+import { useKibana } from '../../../../../lib/kibana';
+import { FilterLabel } from './filter_label';
+import { FormSchema } from '../shared_imports';
+import * as I18n from './translations';
+
+import { IMitreEnterpriseAttack } from '../../types';
+import { tacticsOptions, techniquesOptions } from '../../../mitre/mitre_tactics_techniques';
+
+interface StepRuleDescriptionProps {
+  direction?: 'row' | 'column';
+  data: unknown;
+  indexPatterns?: IIndexPattern;
+  schema: FormSchema;
+}
+
+const EuiBadgeWrap = styled(EuiBadge)`
+  .euiBadge__text {
+    white-space: pre-wrap !important;
+  }
+`;
+
+const EuiFlexItemWidth = styled(EuiFlexItem)<{ direction: string }>`
+  ${props => (props.direction === 'row' ? 'width : 50%;' : 'width: 100%;')};
+`;
+
+const MyEuiListGroup = styled(EuiListGroup)`
+  padding: 0px;
+  .euiListGroupItem__button {
+    padding: 0px;
+  }
+`;
+
+const ThreatsEuiFlexGroup = styled(EuiFlexGroup)`
+  .euiFlexItem {
+    margin-bottom: 0px;
+  }
+`;
+
+const MyEuiTextArea = styled(EuiTextArea)`
+  max-width: 100%;
+  height: 80px;
+`;
+
+const StepRuleDescriptionComponent: React.FC<StepRuleDescriptionProps> = ({
+  data,
+  direction = 'row',
+  indexPatterns,
+  schema,
+}) => {
+  const kibana = useKibana();
+  const [filterManager] = useState<FilterManager>(new FilterManager(kibana.services.uiSettings));
+
+  const keys = Object.keys(schema);
+  const listItems = keys.reduce(
+    (acc: ListItems[], key: string) => [
+      ...acc,
+      ...buildListItems(data, pick(key, schema), filterManager, indexPatterns),
+    ],
+    []
+  );
+  return (
+    <EuiFlexGroup gutterSize="none" direction={direction} justifyContent="spaceAround">
+      {chunk(Math.ceil(listItems.length / 2), listItems).map((chunckListItems, index) => (
+        <EuiFlexItemWidth direction={direction} key={`description-step-rule-${index}`} grow={false}>
+          <EuiDescriptionList listItems={chunckListItems} compressed />
+        </EuiFlexItemWidth>
+      ))}
+    </EuiFlexGroup>
+  );
+};
+
+export const StepRuleDescription = memo(StepRuleDescriptionComponent);
+
+interface ListItems {
+  title: NonNullable<ReactNode>;
+  description: NonNullable<ReactNode>;
+}
+
+const buildListItems = (
+  data: unknown,
+  schema: FormSchema,
+  filterManager: FilterManager,
+  indexPatterns?: IIndexPattern
+): ListItems[] =>
+  Object.keys(schema).reduce<ListItems[]>(
+    (acc, field) => [
+      ...acc,
+      ...getDescriptionItem(
+        field,
+        get([field, 'label'], schema),
+        data,
+        filterManager,
+        indexPatterns
+      ),
+    ],
+    []
+  );
+
+const getDescriptionItem = (
+  field: string,
+  label: string,
+  value: unknown,
+  filterManager: FilterManager,
+  indexPatterns?: IIndexPattern
+): ListItems[] => {
+  if (field === 'useIndicesConfig') {
+    return [];
+  } else if (field === 'queryBar') {
+    const filters = get('queryBar.filters', value) as esFilters.Filter[];
+    const query = get('queryBar.query', value) as Query;
+    const savedId = get('queryBar.saved_id', value);
+    let items: ListItems[] = [];
+    if (!isEmpty(filters)) {
+      filterManager.setFilters(filters);
+      items = [
+        ...items,
+        {
+          title: <>{I18n.FILTERS_LABEL}</>,
+          description: (
+            <EuiFlexGroup wrap responsive={false} gutterSize="xs">
+              {filterManager.getFilters().map((filter, index) => (
+                <EuiFlexItem grow={false} key={`${field}-filter-${index}`}>
+                  <EuiBadgeWrap color="hollow">
+                    {indexPatterns != null ? (
+                      <FilterLabel
+                        filter={filter}
+                        valueLabel={esFilters.getDisplayValueFromFilter(filter, [indexPatterns])}
+                      />
+                    ) : (
+                      <EuiLoadingSpinner size="m" />
+                    )}
+                  </EuiBadgeWrap>
+                </EuiFlexItem>
+              ))}
+            </EuiFlexGroup>
+          ),
+        },
+      ];
+    }
+    if (!isEmpty(query.query)) {
+      items = [
+        ...items,
+        {
+          title: <>{I18n.QUERY_LABEL}</>,
+          description: <>{query.query}</>,
+        },
+      ];
+    }
+    if (!isEmpty(savedId)) {
+      items = [
+        ...items,
+        {
+          title: <>{I18n.SAVED_ID_LABEL}</>,
+          description: <>{savedId}</>,
+        },
+      ];
+    }
+    return items;
+  } else if (field === 'threats') {
+    const threats: IMitreEnterpriseAttack[] = get(field, value).filter(
+      (threat: IMitreEnterpriseAttack) => threat.tactic.name !== 'none'
+    );
+    if (threats.length > 0) {
+      return [
+        {
+          title: label,
+          description: (
+            <ThreatsEuiFlexGroup direction="column">
+              {threats.map((threat, index) => {
+                const tactic = tacticsOptions.find(t => t.name === threat.tactic.name);
+                return (
+                  <EuiFlexItem key={`${threat.tactic.name}-${index}`}>
+                    <EuiText grow={false} size="s">
+                      <h5>
+                        <EuiLink href={threat.tactic.reference} target="_blank">
+                          {tactic != null ? tactic.text : ''}
+                        </EuiLink>
+                      </h5>
+                      <MyEuiListGroup
+                        flush={false}
+                        bordered={false}
+                        listItems={threat.techniques.map(technique => {
+                          const myTechnique = techniquesOptions.find(
+                            t => t.name === technique.name
+                          );
+                          return {
+                            label: myTechnique != null ? myTechnique.label : '',
+                            href: technique.reference,
+                            target: '_blank',
+                          };
+                        })}
+                      />
+                    </EuiText>
+                  </EuiFlexItem>
+                );
+              })}
+            </ThreatsEuiFlexGroup>
+          ),
+        },
+      ];
+    }
+    return [];
+  } else if (field === 'description') {
+    return [
+      {
+        title: label,
+        description: <MyEuiTextArea value={get(field, value)} readOnly={true} />,
+      },
+    ];
+  } else if (Array.isArray(get(field, value))) {
+    const values: string[] = get(field, value);
+    if (!isEmpty(values) && values.filter(val => !isEmpty(val)).length > 0) {
+      return [
+        {
+          title: label,
+          description: (
+            <EuiFlexGroup responsive={false} gutterSize="xs" wrap>
+              {values.map((val: string) =>
+                isEmpty(val) ? null : (
+                  <EuiFlexItem grow={false} key={`${field}-${val}`}>
+                    <EuiBadgeWrap color="hollow">{val}</EuiBadgeWrap>
+                  </EuiFlexItem>
+                )
+              )}
+            </EuiFlexGroup>
+          ),
+        },
+      ];
+    }
+    return [];
+  }
+  const description: string = get(field, value);
+  if (!isEmpty(description)) {
+    return [
+      {
+        title: label,
+        description,
+      },
+    ];
+  }
+  return [];
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/translations.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/translations.tsx
similarity index 100%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/description_step/translations.tsx
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/translations.tsx
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx
index 8dcce36e1a409..e10194853e7f9 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.test.tsx
@@ -5,23 +5,13 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { ImportRuleModalComponent } from './index';
-import { useKibanaUiSetting } from '../../../../../lib/settings/use_kibana_ui_setting';
-import { getMockKibanaUiSetting, MockFrameworks } from '../../../../../mock';
-import { DEFAULT_KBN_VERSION } from '../../../../../../common/constants';
 
-const mockUseKibanaUiSetting: jest.Mock = useKibanaUiSetting as jest.Mock;
-jest.mock('../../../../../lib/settings/use_kibana_ui_setting', () => ({
-  useKibanaUiSetting: jest.fn(),
-}));
+jest.mock('../../../../../lib/kibana');
 
 describe('ImportRuleModal', () => {
   test('renders correctly against snapshot', () => {
-    mockUseKibanaUiSetting.mockImplementation(
-      getMockKibanaUiSetting((DEFAULT_KBN_VERSION as unknown) as MockFrameworks)
-    );
     const wrapper = shallow(
       <ImportRuleModalComponent
         showModal={true}
@@ -29,6 +19,6 @@ describe('ImportRuleModal', () => {
         importComplete={jest.fn()}
       />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx
index 4c0f477ab525e..75be92f2fe846 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/import_rule_modal/index.tsx
@@ -19,20 +19,18 @@ import {
   EuiSpacer,
   EuiText,
 } from '@elastic/eui';
-
+import { noop } from 'lodash/fp';
 import React, { useCallback, useState } from 'react';
 import { failure } from 'io-ts/lib/PathReporter';
 import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import uuid from 'uuid';
-import * as i18n from './translations';
-import { duplicateRules } from '../../../../../containers/detection_engine/rules/api';
-import { useKibanaUiSetting } from '../../../../../lib/settings/use_kibana_ui_setting';
-import { DEFAULT_KBN_VERSION } from '../../../../../../common/constants';
-import { ndjsonToJSON } from '../json_downloader';
-import { RulesSchema } from '../../../../../containers/detection_engine/rules/types';
+
+import { duplicateRules, RulesSchema } from '../../../../../containers/detection_engine/rules';
 import { useStateToaster } from '../../../../../components/toasters';
+import { ndjsonToJSON } from '../json_downloader';
+import * as i18n from './translations';
 
 interface ImportRuleModalProps {
   showModal: boolean;
@@ -54,7 +52,6 @@ export const ImportRuleModalComponent = ({
 }: ImportRuleModalProps) => {
   const [selectedFiles, setSelectedFiles] = useState<FileList | null>(null);
   const [isImporting, setIsImporting] = useState(false);
-  const [kbnVersion] = useKibanaUiSetting(DEFAULT_KBN_VERSION);
   const [, dispatchToaster] = useStateToaster();
 
   const cleanupAndCloseModal = () => {
@@ -89,7 +86,7 @@ export const ImportRuleModalComponent = ({
           }, identity)
         );
 
-        const duplicatedRules = await duplicateRules({ rules: decodedRules, kbnVersion });
+        const duplicatedRules = await duplicateRules({ rules: decodedRules });
         importComplete();
         cleanupAndCloseModal();
 
@@ -138,7 +135,7 @@ export const ImportRuleModalComponent = ({
                 id="rule-overwrite-saved-object"
                 label={i18n.OVERWRITE_WITH_SAME_NAME}
                 disabled={true}
-                onChange={() => {}}
+                onChange={() => noop}
               />
             </EuiModalBody>
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx
index d7a508e2c53e3..859918cdc8e60 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/json_downloader/index.test.tsx
@@ -5,8 +5,7 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
 import { JSONDownloaderComponent, jsonToNDJSON, ndjsonToJSON } from './index';
 
 const jsonArray = [
@@ -37,7 +36,7 @@ describe('JSONDownloader', () => {
     const wrapper = shallow(
       <JSONDownloaderComponent filename={'export_rules.ndjson'} onExportComplete={jest.fn()} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   describe('jsonToNDJSON', () => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.tsx
new file mode 100644
index 0000000000000..a777506ee12ae
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.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 {
+  EuiButtonEmpty,
+  EuiButtonIcon,
+  EuiFormRow,
+  EuiSelect,
+  EuiSpacer,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiComboBox,
+  EuiFormControlLayout,
+} from '@elastic/eui';
+import { isEmpty, kebabCase, camelCase } from 'lodash/fp';
+import React, { ChangeEvent, useCallback } from 'react';
+import styled from 'styled-components';
+
+import { tacticsOptions, techniquesOptions } from '../../../mitre/mitre_tactics_techniques';
+import * as RuleI18n from '../../translations';
+import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
+import * as I18n from './translations';
+import { IMitreEnterpriseAttack } from '../../types';
+
+const MyEuiFormControlLayout = styled(EuiFormControlLayout)`
+  &.euiFormControlLayout--compressed {
+    height: fit-content !important;
+  }
+`;
+interface AddItemProps {
+  field: FieldHook;
+  dataTestSubj: string;
+  idAria: string;
+  isDisabled: boolean;
+}
+
+export const AddMitreThreat = ({ dataTestSubj, field, idAria, isDisabled }: AddItemProps) => {
+  const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
+
+  const removeItem = useCallback(
+    (index: number) => {
+      const values = field.value as string[];
+      field.setValue([...values.slice(0, index), ...values.slice(index + 1)]);
+    },
+    [field]
+  );
+
+  const addItem = useCallback(() => {
+    const values = field.value as IMitreEnterpriseAttack[];
+    if (!isEmpty(values[values.length - 1])) {
+      field.setValue([
+        ...values,
+        { tactic: { id: 'none', name: 'none', reference: 'none' }, techniques: [] },
+      ]);
+    } else {
+      field.setValue([{ tactic: { id: 'none', name: 'none', reference: 'none' }, techniques: [] }]);
+    }
+  }, [field]);
+
+  const updateTactic = useCallback(
+    (index: number, event: ChangeEvent<HTMLSelectElement>) => {
+      const values = field.value as IMitreEnterpriseAttack[];
+      const { id, reference, name } = tacticsOptions.find(t => t.value === event.target.value) || {
+        id: '',
+        name: '',
+        reference: '',
+      };
+      field.setValue([
+        ...values.slice(0, index),
+        {
+          ...values[index],
+          tactic: { id, reference, name },
+          techniques: [],
+        },
+        ...values.slice(index + 1),
+      ]);
+    },
+    [field]
+  );
+
+  const updateTechniques = useCallback(
+    (index: number, selectedOptions: unknown[]) => {
+      field.setValue([
+        ...values.slice(0, index),
+        {
+          ...values[index],
+          techniques: selectedOptions,
+        },
+        ...values.slice(index + 1),
+      ]);
+    },
+    [field]
+  );
+
+  const values = field.value as IMitreEnterpriseAttack[];
+
+  return (
+    <EuiFormRow
+      label={field.label}
+      labelAppend={field.labelAppend}
+      error={errorMessage}
+      isInvalid={isInvalid}
+      fullWidth
+      data-test-subj={dataTestSubj}
+      describedByIds={idAria ? [idAria] : undefined}
+    >
+      <>
+        {values.map((item, index) => {
+          const euiSelectFieldProps = {
+            disabled: isDisabled,
+          };
+          return (
+            <div key={index}>
+              <EuiFlexGroup gutterSize="xs" justifyContent="spaceBetween" alignItems="center">
+                <EuiFlexItem grow={false}>
+                  <EuiSelect
+                    id="selectDocExample"
+                    options={[
+                      ...(item.tactic.name === 'none'
+                        ? [{ text: I18n.TACTIC_PLACEHOLDER, value: 'none' }]
+                        : []),
+                      ...tacticsOptions.map(t => ({ text: t.text, value: t.value })),
+                    ]}
+                    aria-label=""
+                    onChange={updateTactic.bind(null, index)}
+                    prepend={I18n.TACTIC}
+                    compressed
+                    fullWidth={false}
+                    value={camelCase(item.tactic.name)}
+                    {...euiSelectFieldProps}
+                  />
+                </EuiFlexItem>
+                <EuiFlexItem grow={true}>
+                  <MyEuiFormControlLayout compressed fullWidth prepend={I18n.TECHNIQUES}>
+                    <EuiComboBox
+                      compressed
+                      placeholder={I18n.TECHNIQUES_PLACEHOLDER}
+                      options={techniquesOptions.filter(t =>
+                        t.tactics.includes(kebabCase(item.tactic.name))
+                      )}
+                      selectedOptions={item.techniques}
+                      onChange={updateTechniques.bind(null, index)}
+                      isDisabled={isDisabled}
+                      fullWidth={true}
+                    />
+                  </MyEuiFormControlLayout>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiButtonIcon
+                    color="danger"
+                    iconType="trash"
+                    isDisabled={isDisabled}
+                    onClick={() => removeItem(index)}
+                    aria-label={RuleI18n.DELETE}
+                  />
+                </EuiFlexItem>
+              </EuiFlexGroup>
+              {values.length - 1 !== index && <EuiSpacer size="s" />}
+            </div>
+          );
+        })}
+        <EuiButtonEmpty size="xs" onClick={addItem} isDisabled={isDisabled}>
+          {I18n.ADD_MITRE_ATTACK}
+        </EuiButtonEmpty>
+      </>
+    </EuiFormRow>
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/mitre/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/translations.ts
similarity index 100%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/mitre/translations.ts
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/mitre/translations.ts
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.tsx
new file mode 100644
index 0000000000000..c294ec24c4cb7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.tsx
@@ -0,0 +1,227 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiFormRow, EuiMutationObserver } from '@elastic/eui';
+import { isEqual } from 'lodash/fp';
+import React, { useCallback, useEffect, useState } from 'react';
+import { Subscription } from 'rxjs';
+import styled from 'styled-components';
+
+import {
+  esFilters,
+  IIndexPattern,
+  Query,
+  FilterManager,
+  SavedQuery,
+  SavedQueryTimeFilter,
+} from '../../../../../../../../../../src/plugins/data/public';
+
+import { QueryBar } from '../../../../../components/query_bar';
+import { useKibana } from '../../../../../lib/kibana';
+import { useSavedQueryServices } from '../../../../../utils/saved_query_services';
+
+import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
+
+export interface FieldValueQueryBar {
+  filters: esFilters.Filter[];
+  query: Query;
+  saved_id: string | null;
+}
+interface QueryBarDefineRuleProps {
+  dataTestSubj: string;
+  field: FieldHook;
+  idAria: string;
+  isLoading: boolean;
+  indexPattern: IIndexPattern;
+  resizeParentContainer?: (height: number) => void;
+}
+
+const StyledEuiFormRow = styled(EuiFormRow)`
+  .kbnTypeahead__items {
+    max-height: 14vh !important;
+  }
+  .globalQueryBar {
+    padding: 4px 0px 0px 0px;
+    .kbnQueryBar {
+      & > div:first-child {
+        margin: 0px 0px 0px 4px;
+      }
+    }
+  }
+`;
+
+// TODO need to add disabled in the SearchBar
+
+export const QueryBarDefineRule = ({
+  dataTestSubj,
+  field,
+  idAria,
+  indexPattern,
+  isLoading = false,
+  resizeParentContainer,
+}: QueryBarDefineRuleProps) => {
+  const [originalHeight, setOriginalHeight] = useState(-1);
+  const [savedQuery, setSavedQuery] = useState<SavedQuery | null>(null);
+  const [queryDraft, setQueryDraft] = useState<Query>({ query: '', language: 'kuery' });
+  const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
+
+  const kibana = useKibana();
+  const [filterManager] = useState<FilterManager>(new FilterManager(kibana.services.uiSettings));
+
+  const savedQueryServices = useSavedQueryServices();
+
+  useEffect(() => {
+    let isSubscribed = true;
+    const subscriptions = new Subscription();
+    filterManager.setFilters([]);
+
+    subscriptions.add(
+      filterManager.getUpdates$().subscribe({
+        next: () => {
+          if (isSubscribed) {
+            const newFilters = filterManager.getFilters();
+            const { filters } = field.value as FieldValueQueryBar;
+
+            if (!isEqual(filters, newFilters)) {
+              field.setValue({ ...(field.value as FieldValueQueryBar), filters: newFilters });
+            }
+          }
+        },
+      })
+    );
+
+    return () => {
+      isSubscribed = false;
+      subscriptions.unsubscribe();
+    };
+  }, [field.value]);
+
+  useEffect(() => {
+    let isSubscribed = true;
+    async function updateFilterQueryFromValue() {
+      const { filters, query, saved_id: savedId } = field.value as FieldValueQueryBar;
+      if (!isEqual(query, queryDraft)) {
+        setQueryDraft(query);
+      }
+      if (!isEqual(filters, filterManager.getFilters())) {
+        filterManager.setFilters(filters);
+      }
+      if (
+        (savedId != null && savedQuery != null && savedId !== savedQuery.id) ||
+        (savedId != null && savedQuery == null)
+      ) {
+        try {
+          const mySavedQuery = await savedQueryServices.getSavedQuery(savedId);
+          if (isSubscribed && mySavedQuery != null) {
+            setSavedQuery(mySavedQuery);
+          }
+        } catch {
+          setSavedQuery(null);
+        }
+      } else if (savedId == null && savedQuery != null) {
+        setSavedQuery(null);
+      }
+    }
+    updateFilterQueryFromValue();
+    return () => {
+      isSubscribed = false;
+    };
+  }, [field.value]);
+
+  const onSubmitQuery = useCallback(
+    (newQuery: Query, timefilter?: SavedQueryTimeFilter) => {
+      const { query } = field.value as FieldValueQueryBar;
+      if (!isEqual(query, newQuery)) {
+        field.setValue({ ...(field.value as FieldValueQueryBar), query: newQuery });
+      }
+    },
+    [field]
+  );
+
+  const onChangedQuery = useCallback(
+    (newQuery: Query) => {
+      const { query } = field.value as FieldValueQueryBar;
+      if (!isEqual(query, newQuery)) {
+        field.setValue({ ...(field.value as FieldValueQueryBar), query: newQuery });
+      }
+    },
+    [field]
+  );
+
+  const onSavedQuery = useCallback(
+    (newSavedQuery: SavedQuery | null) => {
+      if (newSavedQuery != null) {
+        const { saved_id: savedId } = field.value as FieldValueQueryBar;
+        if (newSavedQuery.id !== savedId) {
+          setSavedQuery(newSavedQuery);
+          field.setValue({
+            filters: newSavedQuery.attributes.filters,
+            query: newSavedQuery.attributes.query,
+            saved_id: newSavedQuery.id,
+          });
+        }
+      }
+    },
+    [field.value]
+  );
+
+  const onMutation = (event: unknown, observer: unknown) => {
+    if (resizeParentContainer != null) {
+      const suggestionContainer = document.getElementById('kbnTypeahead__items');
+      if (suggestionContainer != null) {
+        const box = suggestionContainer.getBoundingClientRect();
+        const accordionContainer = document.getElementById('define-rule');
+        if (accordionContainer != null) {
+          const accordionBox = accordionContainer.getBoundingClientRect();
+          if (originalHeight === -1 || accordionBox.height < originalHeight + box.height) {
+            resizeParentContainer(originalHeight + box.height - 100);
+          }
+          if (originalHeight === -1) {
+            setOriginalHeight(accordionBox.height);
+          }
+        }
+      } else {
+        resizeParentContainer(-1);
+      }
+    }
+  };
+
+  return (
+    <StyledEuiFormRow
+      label={field.label}
+      labelAppend={field.labelAppend}
+      helpText={field.helpText}
+      error={errorMessage}
+      isInvalid={isInvalid}
+      fullWidth
+      data-test-subj={dataTestSubj}
+      describedByIds={idAria ? [idAria] : undefined}
+    >
+      <EuiMutationObserver
+        observerOptions={{ subtree: true, attributes: true, childList: true }}
+        onMutation={onMutation}
+      >
+        {mutationRef => (
+          <div ref={mutationRef}>
+            <QueryBar
+              indexPattern={indexPattern}
+              isLoading={isLoading}
+              isRefreshPaused={false}
+              filterQuery={queryDraft}
+              filterManager={filterManager}
+              filters={filterManager.getFilters() || []}
+              onChangedQuery={onChangedQuery}
+              onSubmitQuery={onSubmitQuery}
+              savedQuery={savedQuery}
+              onSavedQuery={onSavedQuery}
+              hideSavedQuery={false}
+            />
+          </div>
+        )}
+      </EuiMutationObserver>
+    </StyledEuiFormRow>
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/__snapshots__/index.test.tsx.snap
index 98f8ae6a80e07..f264dde07c594 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/__snapshots__/index.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`RuleSwitch renders correctly against snapshot 1`] = `
       disabled={false}
       label="rule-switch"
       onChange={[Function]}
-      showLabel={false}
+      showLabel={true}
     />
   </EuiFlexItem>
 </EuiFlexGroup>
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
index fcea7101ba54b..104eff34c91b3 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx
@@ -5,20 +5,15 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
-import * as React from 'react';
+import React from 'react';
+
 import { RuleSwitchComponent } from './index';
 
 describe('RuleSwitch', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(
-      <RuleSwitchComponent
-        enabled={true}
-        id={'7'}
-        isLoading={false}
-        onRuleStateChange={jest.fn()}
-      />
+      <RuleSwitchComponent optionLabel="rule-switch" enabled={true} id={'7'} isLoading={false} />
     );
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.tsx
index 19523752f4f4a..a1fa4770a41ac 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.tsx
@@ -4,9 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLoadingSpinner,
+  EuiSwitch,
+  EuiSwitchEvent,
+} from '@elastic/eui';
+import { isEmpty } from 'lodash/fp';
 import styled from 'styled-components';
-import React from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiSwitch } from '@elastic/eui';
+import React, { useCallback, useState, useEffect } from 'react';
+
+import { enableRules } from '../../../../../containers/detection_engine/rules';
+import { enableRulesAction } from '../../all/actions';
+import { Action } from '../../all/reducer';
 
 const StaticSwitch = styled(EuiSwitch)`
   .euiSwitch__thumb,
@@ -18,40 +29,78 @@ const StaticSwitch = styled(EuiSwitch)`
 StaticSwitch.displayName = 'StaticSwitch';
 
 export interface RuleSwitchProps {
+  dispatch?: React.Dispatch<Action>;
   id: string;
   enabled: boolean;
-  isLoading: boolean;
-  onRuleStateChange: (isEnabled: boolean, id: string) => void;
+  isLoading?: boolean;
+  optionLabel?: string;
 }
 
 /**
  * Basic switch component for displaying loader when enabled/disabled
  */
 export const RuleSwitchComponent = ({
+  dispatch,
   id,
-  enabled,
   isLoading,
-  onRuleStateChange,
-}: RuleSwitchProps) => (
-  <EuiFlexGroup alignItems="center" justifyContent="spaceAround">
-    <EuiFlexItem grow={false}>
-      {isLoading ? (
-        <EuiLoadingSpinner size="m" data-test-subj="rule-switch-loader" />
-      ) : (
-        <StaticSwitch
-          data-test-subj="rule-switch"
-          label="rule-switch"
-          showLabel={false}
-          disabled={false}
-          checked={enabled ?? false}
-          onChange={e => {
-            onRuleStateChange(e.target.checked!, id);
-          }}
-        />
-      )}
-    </EuiFlexItem>
-  </EuiFlexGroup>
-);
+  enabled,
+  optionLabel,
+}: RuleSwitchProps) => {
+  const [myIsLoading, setMyIsLoading] = useState(false);
+  const [myEnabled, setMyEnabled] = useState(enabled ?? false);
+
+  const onRuleStateChange = useCallback(
+    async (event: EuiSwitchEvent) => {
+      setMyIsLoading(true);
+      if (dispatch != null) {
+        await enableRulesAction([id], event.target.checked!, dispatch);
+      } else {
+        try {
+          const updatedRules = await enableRules({
+            ids: [id],
+            enabled: event.target.checked!,
+          });
+          setMyEnabled(updatedRules[0].enabled);
+        } catch {
+          setMyIsLoading(false);
+        }
+      }
+      setMyIsLoading(false);
+    },
+    [dispatch, id]
+  );
+
+  useEffect(() => {
+    if (myEnabled !== enabled) {
+      setMyEnabled(enabled);
+    }
+  }, [enabled]);
+
+  useEffect(() => {
+    if (myIsLoading !== isLoading) {
+      setMyIsLoading(isLoading ?? false);
+    }
+  }, [isLoading]);
+
+  return (
+    <EuiFlexGroup alignItems="center" justifyContent="spaceAround">
+      <EuiFlexItem grow={false}>
+        {myIsLoading ? (
+          <EuiLoadingSpinner size="m" data-test-subj="rule-switch-loader" />
+        ) : (
+          <StaticSwitch
+            data-test-subj="rule-switch"
+            label={optionLabel ?? ''}
+            showLabel={!isEmpty(optionLabel)}
+            disabled={false}
+            checked={myEnabled}
+            onChange={onRuleStateChange}
+          />
+        )}
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
 
 export const RuleSwitch = React.memo(RuleSwitchComponent);
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.tsx
new file mode 100644
index 0000000000000..2e57ff8ba2c4f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.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 { EuiFieldNumber, EuiFormRow, EuiSelect } from '@elastic/eui';
+import { isEmpty } from 'lodash/fp';
+import React, { useCallback, useEffect, useState } from 'react';
+import styled from 'styled-components';
+
+import { FieldHook, getFieldValidityAndErrorMessage } from '../shared_imports';
+
+import * as I18n from './translations';
+
+interface ScheduleItemProps {
+  field: FieldHook;
+  dataTestSubj: string;
+  idAria: string;
+  isDisabled: boolean;
+}
+
+const timeTypeOptions = [
+  { value: 's', text: I18n.SECONDS },
+  { value: 'm', text: I18n.MINUTES },
+  { value: 'h', text: I18n.HOURS },
+];
+
+const StyledEuiFormRow = styled(EuiFormRow)`
+  .euiFormControlLayout {
+    max-width: 200px !important;
+  }
+`;
+
+export const ScheduleItem = ({ dataTestSubj, field, idAria, isDisabled }: ScheduleItemProps) => {
+  const [timeType, setTimeType] = useState('s');
+  const [timeVal, setTimeVal] = useState<number>(0);
+  const { isInvalid, errorMessage } = getFieldValidityAndErrorMessage(field);
+
+  const onChangeTimeType = useCallback(
+    e => {
+      setTimeType(e.target.value);
+      field.setValue(`${timeVal}${e.target.value}`);
+    },
+    [timeVal]
+  );
+
+  const onChangeTimeVal = useCallback(
+    e => {
+      const sanitizedValue: number = parseInt(e.target.value, 10);
+      setTimeVal(sanitizedValue);
+      field.setValue(`${sanitizedValue}${timeType}`);
+    },
+    [timeType]
+  );
+
+  useEffect(() => {
+    if (field.value !== `${timeVal}${timeType}`) {
+      const filterTimeVal = (field.value as string).match(/\d+/g);
+      const filterTimeType = (field.value as string).match(/[a-zA-Z]+/g);
+      if (
+        !isEmpty(filterTimeVal) &&
+        filterTimeVal != null &&
+        !isNaN(Number(filterTimeVal[0])) &&
+        Number(filterTimeVal[0]) !== Number(timeVal)
+      ) {
+        setTimeVal(Number(filterTimeVal[0]));
+      }
+      if (
+        !isEmpty(filterTimeType) &&
+        filterTimeType != null &&
+        ['s', 'm', 'h'].includes(filterTimeType[0]) &&
+        filterTimeType[0] !== timeType
+      ) {
+        setTimeType(filterTimeType[0]);
+      }
+    }
+  }, [field.value]);
+
+  // EUI missing some props
+  const rest = { disabled: isDisabled };
+
+  return (
+    <StyledEuiFormRow
+      label={field.label}
+      labelAppend={field.labelAppend}
+      helpText={field.helpText}
+      error={errorMessage}
+      isInvalid={isInvalid}
+      fullWidth
+      data-test-subj={dataTestSubj}
+      describedByIds={idAria ? [idAria] : undefined}
+    >
+      <EuiFieldNumber
+        append={
+          <EuiSelect
+            compressed={true}
+            fullWidth={false}
+            options={timeTypeOptions}
+            onChange={onChangeTimeType}
+            value={timeType}
+            {...rest}
+          />
+        }
+        compressed
+        fullWidth
+        min={0}
+        onChange={onChangeTimeVal}
+        value={timeVal}
+        {...rest}
+      />
+    </StyledEuiFormRow>
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/schedule_item_form/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/translations.ts
similarity index 100%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/schedule_item_form/translations.ts
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/translations.ts
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/shared_imports.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/shared_imports.ts
similarity index 97%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/shared_imports.ts
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/shared_imports.ts
index 8eb85c9fe3fae..494da24be706a 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/shared_imports.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/shared_imports.ts
@@ -10,7 +10,9 @@ export {
   FieldHook,
   FIELD_TYPES,
   Form,
+  FormData,
   FormDataProvider,
+  FormHook,
   FormSchema,
   UseField,
   useForm,
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx
new file mode 100644
index 0000000000000..48ff0d80d0398
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiAvatar, EuiIcon } from '@elastic/eui';
+import React, { memo } from 'react';
+import styled from 'styled-components';
+
+import { useEuiTheme } from '../../../../../lib/theme/use_eui_theme';
+import { RuleStatusType } from '../../types';
+
+export interface RuleStatusIconProps {
+  name: string;
+  type: RuleStatusType;
+}
+
+const RuleStatusIconStyled = styled.div`
+  position: relative;
+  svg {
+    position: absolute;
+    top: 8px;
+    left: 9px;
+  }
+`;
+
+const RuleStatusIconComponent: React.FC<RuleStatusIconProps> = ({ name, type }) => {
+  const theme = useEuiTheme();
+  const color = type === 'passive' ? theme.euiColorLightestShade : theme.euiColorDarkestShade;
+  return (
+    <RuleStatusIconStyled>
+      <EuiAvatar color={color} name={type === 'valid' ? '' : name} size="l" />
+      {type === 'valid' ? <EuiIcon type="check" color={theme.euiColorEmptyShade} size="l" /> : null}
+    </RuleStatusIconStyled>
+  );
+};
+
+export const RuleStatusIcon = memo(RuleStatusIconComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/data.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.ts
similarity index 100%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/data.ts
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.ts
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/default_value.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts
similarity index 91%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/default_value.ts
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts
index 504b5ca85a3ab..c0c5ae77a1960 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/default_value.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts
@@ -6,7 +6,7 @@
 
 import { AboutStepRule } from '../../types';
 
-export const defaultValue: AboutStepRule = {
+export const stepAboutDefaultValue: AboutStepRule = {
   name: '',
   description: '',
   isNew: true,
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx
new file mode 100644
index 0000000000000..e266c0b9ab47d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx
@@ -0,0 +1,214 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, EuiHorizontalRule, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { isEqual, get } from 'lodash/fp';
+import React, { memo, useCallback, useEffect, useState } from 'react';
+
+import { RuleStepProps, RuleStep, AboutStepRule } from '../../types';
+import * as RuleI18n from '../../translations';
+import { Field, Form, FormDataProvider, getUseField, UseField, useForm } from '../shared_imports';
+import { AddItem } from '../add_item_form';
+import { defaultRiskScoreBySeverity, severityOptions, SeverityValue } from './data';
+import { stepAboutDefaultValue } from './default_value';
+import { schema } from './schema';
+import * as I18n from './translations';
+import { StepRuleDescription } from '../description_step';
+import { AddMitreThreat } from '../mitre';
+
+const CommonUseField = getUseField({ component: Field });
+
+interface StepAboutRuleProps extends RuleStepProps {
+  defaultValues?: AboutStepRule | null;
+}
+
+export const StepAboutRule = memo<StepAboutRuleProps>(
+  ({
+    defaultValues,
+    descriptionDirection = 'row',
+    isReadOnlyView,
+    isUpdateView = false,
+    isLoading,
+    setForm,
+    setStepData,
+  }) => {
+    const [myStepData, setMyStepData] = useState<AboutStepRule>(stepAboutDefaultValue);
+
+    const { form } = useForm({
+      defaultValue: myStepData,
+      options: { stripEmptyFields: false },
+      schema,
+    });
+
+    const onSubmit = useCallback(async () => {
+      if (setStepData) {
+        setStepData(RuleStep.aboutRule, null, false);
+        const { isValid, data } = await form.submit();
+        if (isValid) {
+          setStepData(RuleStep.aboutRule, data, isValid);
+          setMyStepData({ ...data, isNew: false } as AboutStepRule);
+        }
+      }
+    }, [form]);
+
+    useEffect(() => {
+      const { isNew, ...initDefaultValue } = myStepData;
+      if (defaultValues != null && !isEqual(initDefaultValue, defaultValues)) {
+        const myDefaultValues = {
+          ...defaultValues,
+          isNew: false,
+        };
+        setMyStepData(myDefaultValues);
+        if (!isReadOnlyView) {
+          Object.keys(schema).forEach(key => {
+            const val = get(key, myDefaultValues);
+            if (val != null) {
+              form.setFieldValue(key, val);
+            }
+          });
+        }
+      }
+    }, [defaultValues]);
+
+    useEffect(() => {
+      if (setForm != null) {
+        setForm(RuleStep.aboutRule, form);
+      }
+    }, [form]);
+
+    return isReadOnlyView && myStepData != null ? (
+      <StepRuleDescription direction={descriptionDirection} schema={schema} data={myStepData} />
+    ) : (
+      <>
+        <Form form={form} data-test-subj="stepAboutRule">
+          <CommonUseField
+            path="name"
+            componentProps={{
+              idAria: 'detectionEngineStepAboutRuleName',
+              'data-test-subj': 'detectionEngineStepAboutRuleName',
+              euiFieldProps: {
+                compressed: true,
+                fullWidth: false,
+                disabled: isLoading,
+              },
+            }}
+          />
+          <CommonUseField
+            path="description"
+            componentProps={{
+              compressed: true,
+              idAria: 'detectionEngineStepAboutRuleDescription',
+              'data-test-subj': 'detectionEngineStepAboutRuleDescription',
+              euiFieldProps: {
+                compressed: true,
+                disabled: isLoading,
+              },
+            }}
+          />
+          <CommonUseField
+            path="severity"
+            componentProps={{
+              idAria: 'detectionEngineStepAboutRuleSeverity',
+              'data-test-subj': 'detectionEngineStepAboutRuleSeverity',
+              euiFieldProps: {
+                compressed: true,
+                fullWidth: false,
+                disabled: isLoading,
+                options: severityOptions,
+              },
+            }}
+          />
+          <CommonUseField
+            path="riskScore"
+            componentProps={{
+              idAria: 'detectionEngineStepAboutRuleRiskScore',
+              'data-test-subj': 'detectionEngineStepAboutRuleRiskScore',
+              euiFieldProps: {
+                max: 100,
+                min: 0,
+                compressed: true,
+                fullWidth: false,
+                disabled: isLoading,
+                options: severityOptions,
+              },
+            }}
+          />
+          <UseField
+            path="references"
+            component={AddItem}
+            componentProps={{
+              compressed: true,
+              addText: I18n.ADD_REFERENCE,
+              idAria: 'detectionEngineStepAboutRuleReferenceUrls',
+              isDisabled: isLoading,
+              dataTestSubj: 'detectionEngineStepAboutRuleReferenceUrls',
+            }}
+          />
+          <UseField
+            path="falsePositives"
+            component={AddItem}
+            componentProps={{
+              compressed: true,
+              addText: I18n.ADD_FALSE_POSITIVE,
+              idAria: 'detectionEngineStepAboutRuleFalsePositives',
+              isDisabled: isLoading,
+              dataTestSubj: 'detectionEngineStepAboutRuleFalsePositives',
+            }}
+          />
+          <UseField
+            path="threats"
+            component={AddMitreThreat}
+            componentProps={{
+              compressed: true,
+              idAria: 'detectionEngineStepAboutRuleMitreThreats',
+              isDisabled: isLoading,
+              dataTestSubj: 'detectionEngineStepAboutRuleMitreThreats',
+            }}
+          />
+          <CommonUseField
+            path="tags"
+            componentProps={{
+              idAria: 'detectionEngineStepAboutRuleTags',
+              'data-test-subj': 'detectionEngineStepAboutRuleTags',
+              euiFieldProps: {
+                compressed: true,
+                fullWidth: true,
+                isDisabled: isLoading,
+              },
+            }}
+          />
+          <FormDataProvider pathsToWatch="severity">
+            {({ severity }) => {
+              const newRiskScore = defaultRiskScoreBySeverity[severity as SeverityValue];
+              const riskScoreField = form.getFields().riskScore;
+              if (newRiskScore != null && riskScoreField.value !== newRiskScore) {
+                riskScoreField.setValue(newRiskScore);
+              }
+              return null;
+            }}
+          </FormDataProvider>
+        </Form>
+        {!isUpdateView && (
+          <>
+            <EuiHorizontalRule margin="m" />
+            <EuiFlexGroup
+              alignItems="center"
+              justifyContent="flexEnd"
+              gutterSize="xs"
+              responsive={false}
+            >
+              <EuiFlexItem grow={false}>
+                <EuiButton fill onClick={onSubmit} isDisabled={isLoading}>
+                  {myStepData.isNew ? RuleI18n.CONTINUE : RuleI18n.UPDATE}
+                </EuiButton>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </>
+        )}
+      </>
+    );
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx
new file mode 100644
index 0000000000000..c72312bb90836
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx
@@ -0,0 +1,151 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { isEmpty } from 'lodash/fp';
+import React from 'react';
+
+import * as RuleI18n from '../../translations';
+import { IMitreEnterpriseAttack } from '../../types';
+import {
+  FIELD_TYPES,
+  fieldValidators,
+  FormSchema,
+  ValidationFunc,
+  ERROR_CODE,
+} from '../shared_imports';
+import * as I18n from './translations';
+
+const { emptyField } = fieldValidators;
+
+export const schema: FormSchema = {
+  name: {
+    type: FIELD_TYPES.TEXT,
+    label: i18n.translate('xpack.siem.detectionEngine.createRule.stepAboutRule.fieldNameLabel', {
+      defaultMessage: 'Name',
+    }),
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate(
+            'xpack.siem.detectionEngine.createRule.stepAboutRule.nameFieldRequiredError',
+            {
+              defaultMessage: 'A name is required.',
+            }
+          )
+        ),
+      },
+    ],
+  },
+  description: {
+    type: FIELD_TYPES.TEXTAREA,
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldDescriptionLabel',
+      {
+        defaultMessage: 'Description',
+      }
+    ),
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate(
+            'xpack.siem.detectionEngine.createRule.stepAboutRule.descriptionFieldRequiredError',
+            {
+              defaultMessage: 'A description is required.',
+            }
+          )
+        ),
+      },
+    ],
+  },
+  severity: {
+    type: FIELD_TYPES.SELECT,
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldSeverityLabel',
+      {
+        defaultMessage: 'Severity',
+      }
+    ),
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate(
+            'xpack.siem.detectionEngine.createRule.stepAboutRule.severityFieldRequiredError',
+            {
+              defaultMessage: 'A severity is required.',
+            }
+          )
+        ),
+      },
+    ],
+  },
+  riskScore: {
+    type: FIELD_TYPES.RANGE,
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldRiskScoreLabel',
+      {
+        defaultMessage: 'Risk score',
+      }
+    ),
+  },
+  references: {
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldReferenceUrlsLabel',
+      {
+        defaultMessage: 'Reference URLs',
+      }
+    ),
+    labelAppend: <EuiText size="xs">{RuleI18n.OPTIONAL_FIELD}</EuiText>,
+  },
+  falsePositives: {
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldFalsePositiveLabel',
+      {
+        defaultMessage: 'False positives',
+      }
+    ),
+    labelAppend: <EuiText size="xs">{RuleI18n.OPTIONAL_FIELD}</EuiText>,
+  },
+  threats: {
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepAboutRule.fieldMitreThreatLabel',
+      {
+        defaultMessage: 'MITRE ATT&CK',
+      }
+    ),
+    labelAppend: <EuiText size="xs">{RuleI18n.OPTIONAL_FIELD}</EuiText>,
+    validations: [
+      {
+        validator: (
+          ...args: Parameters<ValidationFunc>
+        ): ReturnType<ValidationFunc<{}, ERROR_CODE>> | undefined => {
+          const [{ value, path }] = args;
+          let hasError = false;
+          (value as IMitreEnterpriseAttack[]).forEach(v => {
+            if (isEmpty(v.tactic.name) || (v.tactic.name !== 'none' && isEmpty(v.techniques))) {
+              hasError = true;
+            }
+          });
+          return hasError
+            ? {
+                code: 'ERR_FIELD_MISSING',
+                path,
+                message: I18n.CUSTOM_MITRE_ATTACK_TECHNIQUES_REQUIRED,
+              }
+            : undefined;
+        },
+      },
+    ],
+  },
+  tags: {
+    type: FIELD_TYPES.COMBO_BOX,
+    label: i18n.translate('xpack.siem.detectionEngine.createRule.stepAboutRule.fieldTagsLabel', {
+      defaultMessage: 'Tags',
+    }),
+    labelAppend: <EuiText size="xs">{RuleI18n.OPTIONAL_FIELD}</EuiText>,
+  },
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/translations.ts
similarity index 100%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_about_rule/translations.ts
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/translations.ts
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
new file mode 100644
index 0000000000000..cc4e959cc9c78
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx
@@ -0,0 +1,220 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui';
+import { isEqual, get } from 'lodash/fp';
+import React, { memo, useCallback, useState, useEffect } from 'react';
+
+import { IIndexPattern } from '../../../../../../../../../../src/plugins/data/public';
+import { useFetchIndexPatterns } from '../../../../../containers/detection_engine/rules';
+import { DEFAULT_INDEX_KEY } from '../../../../../../common/constants';
+import { useUiSetting$ } from '../../../../../lib/kibana';
+import * as RuleI18n from '../../translations';
+import { DefineStepRule, RuleStep, RuleStepProps } from '../../types';
+import { StepRuleDescription } from '../description_step';
+import { QueryBarDefineRule } from '../query_bar';
+import { Field, Form, FormDataProvider, getUseField, UseField, useForm } from '../shared_imports';
+import { schema } from './schema';
+import * as I18n from './translations';
+
+const CommonUseField = getUseField({ component: Field });
+
+interface StepDefineRuleProps extends RuleStepProps {
+  defaultValues?: DefineStepRule | null;
+}
+
+const stepDefineDefaultValue = {
+  index: [],
+  isNew: true,
+  queryBar: {
+    query: { query: '', language: 'kuery' },
+    filters: [],
+    saved_id: null,
+  },
+  useIndicesConfig: 'true',
+};
+
+const getStepDefaultValue = (
+  indicesConfig: string[],
+  defaultValues: DefineStepRule | null
+): DefineStepRule => {
+  if (defaultValues != null) {
+    return {
+      ...defaultValues,
+      isNew: false,
+      useIndicesConfig: `${isEqual(defaultValues.index, indicesConfig)}`,
+    };
+  } else {
+    return {
+      ...stepDefineDefaultValue,
+      index: indicesConfig != null ? indicesConfig : [],
+    };
+  }
+};
+
+export const StepDefineRule = memo<StepDefineRuleProps>(
+  ({
+    defaultValues,
+    descriptionDirection = 'row',
+    isReadOnlyView,
+    isLoading,
+    isUpdateView = false,
+    resizeParentContainer,
+    setForm,
+    setStepData,
+  }) => {
+    const [localUseIndicesConfig, setLocalUseIndicesConfig] = useState('');
+    const [indicesConfig] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
+    const [
+      { indexPatterns: indexPatternQueryBar, isLoading: indexPatternLoadingQueryBar },
+      setIndices,
+    ] = useFetchIndexPatterns(defaultValues != null ? defaultValues.index : indicesConfig ?? []);
+    const [myStepData, setMyStepData] = useState<DefineStepRule>(stepDefineDefaultValue);
+
+    const { form } = useForm({
+      defaultValue: myStepData,
+      options: { stripEmptyFields: false },
+      schema,
+    });
+
+    const onSubmit = useCallback(async () => {
+      if (setStepData) {
+        setStepData(RuleStep.defineRule, null, false);
+        const { isValid, data } = await form.submit();
+        if (isValid && setStepData) {
+          setStepData(RuleStep.defineRule, data, isValid);
+          setMyStepData({ ...data, isNew: false } as DefineStepRule);
+        }
+      }
+    }, [form]);
+
+    useEffect(() => {
+      if (indicesConfig != null && defaultValues != null) {
+        const myDefaultValues = getStepDefaultValue(indicesConfig, defaultValues);
+        if (!isEqual(myDefaultValues, myStepData)) {
+          setMyStepData(myDefaultValues);
+          setLocalUseIndicesConfig(myDefaultValues.useIndicesConfig);
+          if (!isReadOnlyView) {
+            Object.keys(schema).forEach(key => {
+              const val = get(key, myDefaultValues);
+              if (val != null) {
+                form.setFieldValue(key, val);
+              }
+            });
+          }
+        }
+      }
+    }, [defaultValues, indicesConfig]);
+
+    useEffect(() => {
+      if (setForm != null) {
+        setForm(RuleStep.defineRule, form);
+      }
+    }, [form]);
+
+    return isReadOnlyView && myStepData != null ? (
+      <StepRuleDescription
+        direction={descriptionDirection}
+        indexPatterns={indexPatternQueryBar as IIndexPattern}
+        schema={schema}
+        data={myStepData}
+      />
+    ) : (
+      <>
+        <Form form={form} data-test-subj="stepDefineRule">
+          <CommonUseField
+            path="useIndicesConfig"
+            componentProps={{
+              idAria: 'detectionEngineStepDefineRuleUseIndicesConfig',
+              'data-test-subj': 'detectionEngineStepDefineRuleUseIndicesConfig',
+              euiFieldProps: {
+                disabled: isLoading,
+                options: [
+                  {
+                    id: 'true',
+                    label: I18n.CONFIG_INDICES,
+                  },
+                  {
+                    id: 'false',
+                    label: I18n.CUSTOM_INDICES,
+                  },
+                ],
+              },
+            }}
+          />
+          <CommonUseField
+            path="index"
+            componentProps={{
+              idAria: 'detectionEngineStepDefineRuleIndices',
+              'data-test-subj': 'detectionEngineStepDefineRuleIndices',
+              euiFieldProps: {
+                compressed: true,
+                fullWidth: true,
+                isDisabled: isLoading,
+              },
+            }}
+          />
+          <UseField
+            path="queryBar"
+            component={QueryBarDefineRule}
+            componentProps={{
+              compressed: true,
+              loading: indexPatternLoadingQueryBar,
+              idAria: 'detectionEngineStepDefineRuleQueryBar',
+              indexPattern: indexPatternQueryBar,
+              isDisabled: isLoading,
+              isLoading: indexPatternLoadingQueryBar,
+              dataTestSubj: 'detectionEngineStepDefineRuleQueryBar',
+              resizeParentContainer,
+            }}
+          />
+          <FormDataProvider pathsToWatch="useIndicesConfig">
+            {({ useIndicesConfig }) => {
+              if (localUseIndicesConfig !== useIndicesConfig) {
+                const indexField = form.getFields().index;
+                if (
+                  indexField != null &&
+                  useIndicesConfig === 'true' &&
+                  !isEqual(indexField.value, indicesConfig)
+                ) {
+                  indexField.setValue(indicesConfig);
+                  setIndices(indicesConfig);
+                } else if (
+                  indexField != null &&
+                  useIndicesConfig === 'false' &&
+                  isEqual(indexField.value, indicesConfig)
+                ) {
+                  indexField.setValue([]);
+                  setIndices([]);
+                }
+                setLocalUseIndicesConfig(useIndicesConfig);
+              }
+
+              return null;
+            }}
+          </FormDataProvider>
+        </Form>
+        {!isUpdateView && (
+          <>
+            <EuiHorizontalRule margin="m" />
+            <EuiFlexGroup
+              alignItems="center"
+              justifyContent="flexEnd"
+              gutterSize="xs"
+              responsive={false}
+            >
+              <EuiFlexItem grow={false}>
+                <EuiButton fill onClick={onSubmit} isDisabled={isLoading}>
+                  {myStepData.isNew ? RuleI18n.CONTINUE : RuleI18n.UPDATE}
+                </EuiButton>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </>
+        )}
+      </>
+    );
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx
new file mode 100644
index 0000000000000..9b54ada8227c6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.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 { i18n } from '@kbn/i18n';
+import { EuiText } from '@elastic/eui';
+import { isEmpty } from 'lodash/fp';
+import React from 'react';
+
+import { esKuery } from '../../../../../../../../../../src/plugins/data/public';
+import * as RuleI18n from '../../translations';
+import { FieldValueQueryBar } from '../query_bar';
+import {
+  ERROR_CODE,
+  FIELD_TYPES,
+  fieldValidators,
+  FormSchema,
+  ValidationFunc,
+} from '../shared_imports';
+import { CUSTOM_QUERY_REQUIRED, INVALID_CUSTOM_QUERY } from './translations';
+
+const { emptyField } = fieldValidators;
+
+export const schema: FormSchema = {
+  useIndicesConfig: {
+    type: FIELD_TYPES.RADIO_GROUP,
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepDefineRule.fieldIndicesTypeLabel',
+      {
+        defaultMessage: 'Indices type',
+      }
+    ),
+  },
+  index: {
+    type: FIELD_TYPES.COMBO_BOX,
+    label: i18n.translate('xpack.siem.detectionEngine.createRule.stepAboutRule.fiedIndicesLabel', {
+      defaultMessage: 'Indices',
+    }),
+    labelAppend: <EuiText size="xs">{RuleI18n.OPTIONAL_FIELD}</EuiText>,
+    validations: [
+      {
+        validator: emptyField(
+          i18n.translate(
+            'xpack.siem.detectionEngine.createRule.stepDefineRule.outputIndiceNameFieldRequiredError',
+            {
+              defaultMessage: 'An output indice name for signals is required.',
+            }
+          )
+        ),
+      },
+    ],
+  },
+  queryBar: {
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepDefineRule.fieldQuerBarLabel',
+      {
+        defaultMessage: 'Custom query',
+      }
+    ),
+    validations: [
+      {
+        validator: (
+          ...args: Parameters<ValidationFunc>
+        ): ReturnType<ValidationFunc<{}, ERROR_CODE>> | undefined => {
+          const [{ value, path }] = args;
+          const { query, filters } = value as FieldValueQueryBar;
+          return isEmpty(query.query as string) && isEmpty(filters)
+            ? {
+                code: 'ERR_FIELD_MISSING',
+                path,
+                message: CUSTOM_QUERY_REQUIRED,
+              }
+            : undefined;
+        },
+      },
+      {
+        validator: (
+          ...args: Parameters<ValidationFunc>
+        ): ReturnType<ValidationFunc<{}, ERROR_CODE>> | undefined => {
+          const [{ value, path }] = args;
+          const { query } = value as FieldValueQueryBar;
+          if (!isEmpty(query.query as string) && query.language === 'kuery') {
+            try {
+              esKuery.fromKueryExpression(query.query);
+            } catch (err) {
+              return {
+                code: 'ERR_FIELD_FORMAT',
+                path,
+                message: INVALID_CUSTOM_QUERY,
+              };
+            }
+          }
+          return undefined;
+        },
+      },
+    ],
+  },
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_define_rule/translations.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx
similarity index 100%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_define_rule/translations.tsx
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_define_rule/types.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/types.ts
similarity index 100%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_define_rule/types.ts
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/types.ts
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.tsx
new file mode 100644
index 0000000000000..88cecadb8b137
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.tsx
@@ -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 { EuiPanel, EuiProgress } from '@elastic/eui';
+import React, { memo } from 'react';
+import styled from 'styled-components';
+
+import { HeaderSection } from '../../../../../components/header_section';
+
+interface StepPanelProps {
+  children: React.ReactNode;
+  loading: boolean;
+  title: string;
+}
+
+const MyPanel = styled(EuiPanel)`
+  position: relative;
+`;
+
+const StepPanelComponent: React.FC<StepPanelProps> = ({ children, loading, title }) => (
+  <MyPanel>
+    {loading && <EuiProgress size="xs" color="accent" position="absolute" />}
+    <HeaderSection title={title} />
+    {children}
+  </MyPanel>
+);
+
+export const StepPanel = memo(StepPanelComponent);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx
new file mode 100644
index 0000000000000..6f7e49bc8ab9a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx
@@ -0,0 +1,148 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui';
+import { isEqual, get } from 'lodash/fp';
+import React, { memo, useCallback, useEffect, useState } from 'react';
+
+import { RuleStep, RuleStepProps, ScheduleStepRule } from '../../types';
+import { StepRuleDescription } from '../description_step';
+import { ScheduleItem } from '../schedule_item_form';
+import { Form, UseField, useForm } from '../shared_imports';
+import { schema } from './schema';
+import * as I18n from './translations';
+
+interface StepScheduleRuleProps extends RuleStepProps {
+  defaultValues?: ScheduleStepRule | null;
+}
+
+const stepScheduleDefaultValue = {
+  enabled: true,
+  interval: '5m',
+  isNew: true,
+  from: '0m',
+};
+
+export const StepScheduleRule = memo<StepScheduleRuleProps>(
+  ({
+    defaultValues,
+    descriptionDirection = 'row',
+    isReadOnlyView,
+    isLoading,
+    isUpdateView = false,
+    setStepData,
+    setForm,
+  }) => {
+    const [myStepData, setMyStepData] = useState<ScheduleStepRule>(stepScheduleDefaultValue);
+
+    const { form } = useForm({
+      defaultValue: myStepData,
+      options: { stripEmptyFields: false },
+      schema,
+    });
+
+    const onSubmit = useCallback(
+      async (enabled: boolean) => {
+        if (setStepData) {
+          setStepData(RuleStep.scheduleRule, null, false);
+          const { isValid: newIsValid, data } = await form.submit();
+          if (newIsValid) {
+            setStepData(RuleStep.scheduleRule, { ...data, enabled }, newIsValid);
+            setMyStepData({ ...data, isNew: false } as ScheduleStepRule);
+          }
+        }
+      },
+      [form]
+    );
+
+    useEffect(() => {
+      const { isNew, ...initDefaultValue } = myStepData;
+      if (defaultValues != null && !isEqual(initDefaultValue, defaultValues)) {
+        const myDefaultValues = {
+          ...defaultValues,
+          isNew: false,
+        };
+        setMyStepData(myDefaultValues);
+        if (!isReadOnlyView) {
+          Object.keys(schema).forEach(key => {
+            const val = get(key, myDefaultValues);
+            if (val != null) {
+              form.setFieldValue(key, val);
+            }
+          });
+        }
+      }
+    }, [defaultValues]);
+
+    useEffect(() => {
+      if (setForm != null) {
+        setForm(RuleStep.scheduleRule, form);
+      }
+    }, [form]);
+
+    return isReadOnlyView && myStepData != null ? (
+      <StepRuleDescription direction={descriptionDirection} schema={schema} data={myStepData} />
+    ) : (
+      <>
+        <Form form={form} data-test-subj="stepScheduleRule">
+          <UseField
+            path="interval"
+            component={ScheduleItem}
+            componentProps={{
+              compressed: true,
+              idAria: 'detectionEngineStepScheduleRuleInterval',
+              isDisabled: isLoading,
+              dataTestSubj: 'detectionEngineStepScheduleRuleInterval',
+            }}
+          />
+          <UseField
+            path="from"
+            component={ScheduleItem}
+            componentProps={{
+              compressed: true,
+              idAria: 'detectionEngineStepScheduleRuleFrom',
+              isDisabled: isLoading,
+              dataTestSubj: 'detectionEngineStepScheduleRuleFrom',
+            }}
+          />
+        </Form>
+
+        {!isUpdateView && (
+          <>
+            <EuiHorizontalRule margin="s" />
+            <EuiFlexGroup
+              alignItems="center"
+              justifyContent="flexEnd"
+              gutterSize="xs"
+              responsive={false}
+            >
+              <EuiFlexItem grow={false}>
+                <EuiButton
+                  fill={false}
+                  isDisabled={isLoading}
+                  isLoading={isLoading}
+                  onClick={onSubmit.bind(null, false)}
+                >
+                  {I18n.COMPLETE_WITHOUT_ACTIVATING}
+                </EuiButton>
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <EuiButton
+                  fill
+                  isDisabled={isLoading}
+                  isLoading={isLoading}
+                  onClick={onSubmit.bind(null, true)}
+                >
+                  {I18n.COMPLETE_WITH_ACTIVATING}
+                </EuiButton>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </>
+        )}
+      </>
+    );
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/schema.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/schema.tsx
new file mode 100644
index 0000000000000..31e56265dec42
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/schema.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 { EuiText } from '@elastic/eui';
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+
+import * as RuleI18n from '../../translations';
+import { FormSchema } from '../shared_imports';
+
+export const schema: FormSchema = {
+  interval: {
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepScheduleRule.fieldIntervalLabel',
+      {
+        defaultMessage: 'Rule run interval & look-back',
+      }
+    ),
+    helpText: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepScheduleRule.fieldIntervalHelpText',
+      {
+        defaultMessage: 'How often and how far back this rule will search specified indices.',
+      }
+    ),
+  },
+  from: {
+    label: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepScheduleRule.fieldAdditionalLookBackLabel',
+      {
+        defaultMessage: 'Additional look-back',
+      }
+    ),
+    labelAppend: <EuiText size="xs">{RuleI18n.OPTIONAL_FIELD}</EuiText>,
+    helpText: i18n.translate(
+      'xpack.siem.detectionEngine.createRule.stepScheduleRule.fieldAdditionalLookBackHelpText',
+      {
+        defaultMessage:
+          'Add more time to the look-back range in order to prevent potential gaps in signal reporting.',
+      }
+    ),
+  },
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_schedule_rule/translations.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/translations.tsx
similarity index 100%
rename from x-pack/legacy/plugins/siem/public/pages/detection_engine/create_rule/components/step_schedule_rule/translations.tsx
rename to x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/translations.tsx
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
new file mode 100644
index 0000000000000..a25ccce569dd4
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { isEmpty } from 'lodash/fp';
+import moment from 'moment';
+
+import { NewRule } from '../../../../containers/detection_engine/rules';
+
+import {
+  AboutStepRule,
+  DefineStepRule,
+  ScheduleStepRule,
+  DefineStepRuleJson,
+  ScheduleStepRuleJson,
+  AboutStepRuleJson,
+  FormatRuleType,
+} from '../types';
+
+const getTimeTypeValue = (time: string): { unit: string; value: number } => {
+  const timeObj = {
+    unit: '',
+    value: 0,
+  };
+  const filterTimeVal = (time as string).match(/\d+/g);
+  const filterTimeType = (time as string).match(/[a-zA-Z]+/g);
+  if (!isEmpty(filterTimeVal) && filterTimeVal != null && !isNaN(Number(filterTimeVal[0]))) {
+    timeObj.value = Number(filterTimeVal[0]);
+  }
+  if (
+    !isEmpty(filterTimeType) &&
+    filterTimeType != null &&
+    ['s', 'm', 'h'].includes(filterTimeType[0])
+  ) {
+    timeObj.unit = filterTimeType[0];
+  }
+  return timeObj;
+};
+
+const formatDefineStepData = (defineStepData: DefineStepRule): DefineStepRuleJson => {
+  const { queryBar, useIndicesConfig, isNew, ...rest } = defineStepData;
+  const { filters, query, saved_id: savedId } = queryBar;
+  return {
+    ...rest,
+    language: query.language,
+    filters,
+    query: query.query as string,
+    ...(savedId != null ? { saved_id: savedId } : {}),
+  };
+};
+
+const formatScheduleStepData = (scheduleData: ScheduleStepRule): ScheduleStepRuleJson => {
+  const { isNew, ...formatScheduleData } = scheduleData;
+  if (!isEmpty(formatScheduleData.interval) && !isEmpty(formatScheduleData.from)) {
+    const { unit: intervalUnit, value: intervalValue } = getTimeTypeValue(
+      formatScheduleData.interval
+    );
+    const { unit: fromUnit, value: fromValue } = getTimeTypeValue(formatScheduleData.from);
+    const duration = moment.duration(intervalValue, intervalUnit as 's' | 'm' | 'h');
+    duration.add(fromValue, fromUnit as 's' | 'm' | 'h');
+    formatScheduleData.from = `now-${duration.asSeconds()}s`;
+    formatScheduleData.to = 'now';
+  }
+  return {
+    ...formatScheduleData,
+    meta: {
+      from: scheduleData.from,
+    },
+  };
+};
+
+const formatAboutStepData = (aboutStepData: AboutStepRule): AboutStepRuleJson => {
+  const { falsePositives, references, riskScore, threats, isNew, ...rest } = aboutStepData;
+  return {
+    false_positives: falsePositives.filter(item => !isEmpty(item)),
+    references: references.filter(item => !isEmpty(item)),
+    risk_score: riskScore,
+    threats: threats
+      .filter(threat => threat.tactic.name !== 'none')
+      .map(threat => ({
+        ...threat,
+        framework: 'MITRE ATT&CK',
+        techniques: threat.techniques.map(technique => {
+          const { id, name, reference } = technique;
+          return { id, name, reference };
+        }),
+      })),
+    ...rest,
+  };
+};
+
+export const formatRule = (
+  defineStepData: DefineStepRule,
+  aboutStepData: AboutStepRule,
+  scheduleData: ScheduleStepRule,
+  ruleId?: string
+): NewRule => {
+  const type: FormatRuleType = defineStepData.queryBar.saved_id != null ? 'saved_query' : 'query';
+  const persistData = {
+    type,
+    ...formatDefineStepData(defineStepData),
+    ...formatAboutStepData(aboutStepData),
+    ...formatScheduleStepData(scheduleData),
+  };
+  return ruleId != null ? { id: ruleId, ...persistData } : persistData;
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx
new file mode 100644
index 0000000000000..3e8dbeba89546
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx
@@ -0,0 +1,282 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, EuiAccordion, EuiHorizontalRule, EuiPanel, EuiSpacer } from '@elastic/eui';
+import React, { useCallback, useRef, useState } from 'react';
+import { Redirect } from 'react-router-dom';
+import styled from 'styled-components';
+
+import { HeaderPage } from '../../../../components/header_page';
+import { DETECTION_ENGINE_PAGE_NAME } from '../../../../components/link_to/redirect_to_detection_engine';
+import { WrapperPage } from '../../../../components/wrapper_page';
+import { AccordionTitle } from '../components/accordion_title';
+import { StepAboutRule } from '../components/step_about_rule';
+import { StepDefineRule } from '../components/step_define_rule';
+import { StepScheduleRule } from '../components/step_schedule_rule';
+import { usePersistRule } from '../../../../containers/detection_engine/rules';
+import { SpyRoute } from '../../../../utils/route/spy_routes';
+import * as RuleI18n from '../translations';
+import { AboutStepRule, DefineStepRule, RuleStep, RuleStepData, ScheduleStepRule } from '../types';
+import { formatRule } from './helpers';
+import * as i18n from './translations';
+
+const stepsRuleOrder = [RuleStep.defineRule, RuleStep.aboutRule, RuleStep.scheduleRule];
+
+const ResizeEuiPanel = styled(EuiPanel)<{
+  height?: number;
+}>`
+  .euiAccordion__childWrapper {
+    height: ${props => (props.height !== -1 ? `${props.height}px !important` : 'auto')};
+  }
+`;
+
+export const CreateRuleComponent = React.memo(() => {
+  const [heightAccordion, setHeightAccordion] = useState(-1);
+  const [openAccordionId, setOpenAccordionId] = useState<RuleStep | null>(RuleStep.defineRule);
+  const defineRuleRef = useRef<EuiAccordion | null>(null);
+  const aboutRuleRef = useRef<EuiAccordion | null>(null);
+  const scheduleRuleRef = useRef<EuiAccordion | null>(null);
+  const stepsData = useRef<Record<RuleStep, RuleStepData>>({
+    [RuleStep.defineRule]: { isValid: false, data: {} },
+    [RuleStep.aboutRule]: { isValid: false, data: {} },
+    [RuleStep.scheduleRule]: { isValid: false, data: {} },
+  });
+  const [isStepRuleInReadOnlyView, setIsStepRuleInEditView] = useState<Record<RuleStep, boolean>>({
+    [RuleStep.defineRule]: false,
+    [RuleStep.aboutRule]: false,
+    [RuleStep.scheduleRule]: false,
+  });
+  const [{ isLoading, isSaved }, setRule] = usePersistRule();
+
+  const setStepData = useCallback(
+    (step: RuleStep, data: unknown, isValid: boolean) => {
+      stepsData.current[step] = { ...stepsData.current[step], data, isValid };
+      if (isValid) {
+        const stepRuleIdx = stepsRuleOrder.findIndex(item => step === item);
+        if ([0, 1].includes(stepRuleIdx)) {
+          setIsStepRuleInEditView({
+            ...isStepRuleInReadOnlyView,
+            [step]: true,
+          });
+          if (openAccordionId !== stepsRuleOrder[stepRuleIdx + 1]) {
+            openCloseAccordion(stepsRuleOrder[stepRuleIdx + 1]);
+            setOpenAccordionId(stepsRuleOrder[stepRuleIdx + 1]);
+          }
+        } else if (
+          stepRuleIdx === 2 &&
+          stepsData.current[RuleStep.defineRule].isValid &&
+          stepsData.current[RuleStep.aboutRule].isValid
+        ) {
+          setRule(
+            formatRule(
+              stepsData.current[RuleStep.defineRule].data as DefineStepRule,
+              stepsData.current[RuleStep.aboutRule].data as AboutStepRule,
+              stepsData.current[RuleStep.scheduleRule].data as ScheduleStepRule
+            )
+          );
+        }
+      }
+    },
+    [openAccordionId, stepsData.current, setRule]
+  );
+
+  const getAccordionType = useCallback(
+    (accordionId: RuleStep) => {
+      if (accordionId === openAccordionId) {
+        return 'active';
+      } else if (stepsData.current[accordionId].isValid) {
+        return 'valid';
+      }
+      return 'passive';
+    },
+    [openAccordionId, stepsData.current]
+  );
+
+  const defineRuleButton = (
+    <AccordionTitle
+      name="1"
+      title={RuleI18n.DEFINE_RULE}
+      type={getAccordionType(RuleStep.defineRule)}
+    />
+  );
+
+  const aboutRuleButton = (
+    <AccordionTitle
+      name="2"
+      title={RuleI18n.ABOUT_RULE}
+      type={getAccordionType(RuleStep.aboutRule)}
+    />
+  );
+
+  const scheduleRuleButton = (
+    <AccordionTitle
+      name="3"
+      title={RuleI18n.SCHEDULE_RULE}
+      type={getAccordionType(RuleStep.scheduleRule)}
+    />
+  );
+
+  const openCloseAccordion = (accordionId: RuleStep | null) => {
+    if (accordionId != null) {
+      if (accordionId === RuleStep.defineRule && defineRuleRef.current != null) {
+        defineRuleRef.current.onToggle();
+      } else if (accordionId === RuleStep.aboutRule && aboutRuleRef.current != null) {
+        aboutRuleRef.current.onToggle();
+      } else if (accordionId === RuleStep.scheduleRule && scheduleRuleRef.current != null) {
+        scheduleRuleRef.current.onToggle();
+      }
+    }
+  };
+
+  const manageAccordions = useCallback(
+    (id: RuleStep, isOpen: boolean) => {
+      const activeRuleIdx = stepsRuleOrder.findIndex(step => step === openAccordionId);
+      const stepRuleIdx = stepsRuleOrder.findIndex(step => step === id);
+      const isLatestStepsRuleValid =
+        stepRuleIdx === 0
+          ? true
+          : stepsRuleOrder
+              .filter((stepRule, index) => index < stepRuleIdx)
+              .every(stepRule => stepsData.current[stepRule].isValid);
+
+      if (stepRuleIdx < activeRuleIdx && !isOpen) {
+        openCloseAccordion(id);
+      } else if (stepRuleIdx >= activeRuleIdx) {
+        if (
+          openAccordionId != null &&
+          openAccordionId !== id &&
+          !stepsData.current[openAccordionId].isValid &&
+          !isStepRuleInReadOnlyView[id] &&
+          isOpen
+        ) {
+          openCloseAccordion(id);
+        } else if (!isLatestStepsRuleValid && isOpen) {
+          openCloseAccordion(id);
+        } else if (id !== openAccordionId && isOpen) {
+          setOpenAccordionId(id);
+        }
+      }
+    },
+    [isStepRuleInReadOnlyView, openAccordionId]
+  );
+
+  const manageIsEditable = useCallback(
+    (id: RuleStep) => {
+      setIsStepRuleInEditView({
+        ...isStepRuleInReadOnlyView,
+        [id]: false,
+      });
+    },
+    [isStepRuleInReadOnlyView]
+  );
+
+  if (isSaved) {
+    return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}/rules`} />;
+  }
+
+  return (
+    <>
+      <WrapperPage restrictWidth>
+        <HeaderPage
+          backOptions={{ href: '#detection-engine/rules', text: 'Back to rules' }}
+          border
+          isLoading={isLoading}
+          title={i18n.PAGE_TITLE}
+        />
+        <ResizeEuiPanel height={heightAccordion}>
+          <EuiAccordion
+            initialIsOpen={true}
+            id={RuleStep.defineRule}
+            buttonContent={defineRuleButton}
+            paddingSize="xs"
+            ref={defineRuleRef}
+            onToggle={manageAccordions.bind(null, RuleStep.defineRule)}
+            extraAction={
+              stepsData.current[RuleStep.defineRule].isValid && (
+                <EuiButtonEmpty
+                  iconType="pencil"
+                  size="xs"
+                  onClick={manageIsEditable.bind(null, RuleStep.defineRule)}
+                >
+                  {`Edit`}
+                </EuiButtonEmpty>
+              )
+            }
+          >
+            <EuiHorizontalRule margin="xs" />
+            <StepDefineRule
+              isReadOnlyView={isStepRuleInReadOnlyView[RuleStep.defineRule]}
+              isLoading={isLoading}
+              setStepData={setStepData}
+              resizeParentContainer={height => setHeightAccordion(height)}
+            />
+          </EuiAccordion>
+        </ResizeEuiPanel>
+        <EuiSpacer size="s" />
+        <EuiPanel>
+          <EuiAccordion
+            initialIsOpen={false}
+            id={RuleStep.aboutRule}
+            buttonContent={aboutRuleButton}
+            paddingSize="xs"
+            ref={aboutRuleRef}
+            onToggle={manageAccordions.bind(null, RuleStep.aboutRule)}
+            extraAction={
+              stepsData.current[RuleStep.aboutRule].isValid && (
+                <EuiButtonEmpty
+                  iconType="pencil"
+                  size="xs"
+                  onClick={manageIsEditable.bind(null, RuleStep.aboutRule)}
+                >
+                  {`Edit`}
+                </EuiButtonEmpty>
+              )
+            }
+          >
+            <EuiHorizontalRule margin="xs" />
+            <StepAboutRule
+              isReadOnlyView={isStepRuleInReadOnlyView[RuleStep.aboutRule]}
+              isLoading={isLoading}
+              setStepData={setStepData}
+            />
+          </EuiAccordion>
+        </EuiPanel>
+        <EuiSpacer size="s" />
+        <EuiPanel>
+          <EuiAccordion
+            initialIsOpen={false}
+            id={RuleStep.scheduleRule}
+            buttonContent={scheduleRuleButton}
+            paddingSize="xs"
+            ref={scheduleRuleRef}
+            onToggle={manageAccordions.bind(null, RuleStep.scheduleRule)}
+            extraAction={
+              stepsData.current[RuleStep.scheduleRule].isValid && (
+                <EuiButtonEmpty
+                  iconType="pencil"
+                  size="xs"
+                  onClick={manageIsEditable.bind(null, RuleStep.scheduleRule)}
+                >
+                  {`Edit`}
+                </EuiButtonEmpty>
+              )
+            }
+          >
+            <EuiHorizontalRule margin="xs" />
+            <StepScheduleRule
+              isReadOnlyView={isStepRuleInReadOnlyView[RuleStep.scheduleRule]}
+              isLoading={isLoading}
+              setStepData={setStepData}
+            />
+          </EuiAccordion>
+        </EuiPanel>
+      </WrapperPage>
+
+      <SpyRoute />
+    </>
+  );
+});
+CreateRuleComponent.displayName = 'CreateRuleComponent';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/translations.ts
new file mode 100644
index 0000000000000..884f3f3741228
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/translations.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const PAGE_TITLE = i18n.translate('xpack.siem.detectionEngine.createRule.pageTitle', {
+  defaultMessage: 'Create new rule',
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/index.tsx
new file mode 100644
index 0000000000000..1bc2bc24517e3
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/index.tsx
@@ -0,0 +1,233 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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, EuiLoadingSpinner, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React, { memo, useMemo } from 'react';
+import { useParams } from 'react-router-dom';
+import { StickyContainer } from 'react-sticky';
+
+import { FiltersGlobal } from '../../../../components/filters_global';
+import { FormattedDate } from '../../../../components/formatted_date';
+import { HeaderPage } from '../../../../components/header_page';
+import { DETECTION_ENGINE_PAGE_NAME } from '../../../../components/link_to/redirect_to_detection_engine';
+import { SiemSearchBar } from '../../../../components/search_bar';
+import { WrapperPage } from '../../../../components/wrapper_page';
+import { useRule } from '../../../../containers/detection_engine/rules';
+
+import {
+  indicesExistOrDataTemporarilyUnavailable,
+  WithSource,
+} from '../../../../containers/source';
+import { SpyRoute } from '../../../../utils/route/spy_routes';
+
+import { SignalsCharts } from '../../components/signals_chart';
+import { SignalsTable } from '../../components/signals';
+import { DetectionEngineEmptyPage } from '../../detection_engine_empty_page';
+import { useSignalInfo } from '../../components/signals_info';
+import { StepAboutRule } from '../components/step_about_rule';
+import { StepDefineRule } from '../components/step_define_rule';
+import { StepScheduleRule } from '../components/step_schedule_rule';
+import { buildSignalsRuleIdFilter } from '../../components/signals/default_config';
+import * as detectionI18n from '../../translations';
+import { RuleSwitch } from '../components/rule_switch';
+import { StepPanel } from '../components/step_panel';
+import { getStepsData } from '../helpers';
+import * as ruleI18n from '../translations';
+import * as i18n from './translations';
+import { GlobalTime } from '../../../../containers/global_time';
+
+interface RuleDetailsComponentProps {
+  signalsIndex: string | null;
+}
+
+export const RuleDetailsComponent = memo<RuleDetailsComponentProps>(({ signalsIndex }) => {
+  const { ruleId } = useParams();
+  const [loading, rule] = useRule(ruleId);
+  const { aboutRuleData, defineRuleData, scheduleRuleData } = getStepsData({
+    rule,
+    detailsView: true,
+  });
+  const [lastSignals] = useSignalInfo({ ruleId });
+
+  const title = loading === true || rule === null ? <EuiLoadingSpinner size="m" /> : rule.name;
+  const subTitle = useMemo(
+    () =>
+      loading === true || rule === null ? (
+        <EuiLoadingSpinner size="m" />
+      ) : (
+        [
+          <FormattedMessage
+            id="xpack.siem.detectionEngine.ruleDetails.ruleCreationDescription"
+            defaultMessage="Created by: {by} on {date}"
+            values={{
+              by: rule?.created_by ?? i18n.UNKNOWN,
+              date: (
+                <FormattedDate
+                  value={rule?.created_at ?? new Date().toISOString()}
+                  fieldName="createdAt"
+                />
+              ),
+            }}
+          />,
+          rule?.updated_by != null ? (
+            <FormattedMessage
+              id="xpack.siem.detectionEngine.ruleDetails.ruleUpdateDescription"
+              defaultMessage="Updated by: {by} on {date}"
+              values={{
+                by: rule?.updated_by ?? i18n.UNKNOWN,
+                date: (
+                  <FormattedDate
+                    value={rule?.updated_at ?? new Date().toISOString()}
+                    fieldName="updatedAt"
+                  />
+                ),
+              }}
+            />
+          ) : (
+            ''
+          ),
+        ]
+      ),
+    [loading, rule]
+  );
+
+  const signalDefaultFilters = useMemo(
+    () => (ruleId != null ? buildSignalsRuleIdFilter(ruleId) : []),
+    [ruleId]
+  );
+  return (
+    <>
+      <WithSource sourceId="default">
+        {({ indicesExist, indexPattern }) => {
+          return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
+            <GlobalTime>
+              {({ to, from }) => (
+                <StickyContainer>
+                  <FiltersGlobal>
+                    <SiemSearchBar id="global" indexPattern={indexPattern} />
+                  </FiltersGlobal>
+
+                  <WrapperPage>
+                    <HeaderPage
+                      backOptions={{ href: '#detection-engine/rules', text: i18n.BACK_TO_RULES }}
+                      badgeOptions={{ text: i18n.EXPERIMENTAL }}
+                      border
+                      subtitle={subTitle}
+                      subtitle2={[
+                        lastSignals != null ? (
+                          <>
+                            {detectionI18n.LAST_SIGNAL}
+                            {': '}
+                            {lastSignals}
+                          </>
+                        ) : null,
+                        'Status: Comming Soon',
+                      ]}
+                      title={title}
+                    >
+                      <EuiFlexGroup alignItems="center">
+                        <EuiFlexItem grow={false}>
+                          <RuleSwitch
+                            id={rule?.id ?? '-1'}
+                            enabled={rule?.enabled ?? false}
+                            optionLabel={i18n.ACTIVATE_RULE}
+                          />
+                        </EuiFlexItem>
+
+                        <EuiFlexItem grow={false}>
+                          <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+                            <EuiFlexItem grow={false}>
+                              <EuiButton
+                                href={`#${DETECTION_ENGINE_PAGE_NAME}/rules/${ruleId}/edit`}
+                                iconType="visControls"
+                                isDisabled={rule?.immutable ?? true}
+                              >
+                                {ruleI18n.EDIT_RULE_SETTINGS}
+                              </EuiButton>
+                            </EuiFlexItem>
+                          </EuiFlexGroup>
+                        </EuiFlexItem>
+                      </EuiFlexGroup>
+                    </HeaderPage>
+
+                    <EuiSpacer />
+
+                    <EuiFlexGroup>
+                      <EuiFlexItem component="section" grow={1}>
+                        <StepPanel loading={loading} title={ruleI18n.DEFINITION}>
+                          {defineRuleData != null && (
+                            <StepDefineRule
+                              descriptionDirection="column"
+                              isReadOnlyView={true}
+                              isLoading={false}
+                              defaultValues={defineRuleData}
+                            />
+                          )}
+                        </StepPanel>
+                      </EuiFlexItem>
+
+                      <EuiFlexItem component="section" grow={2}>
+                        <StepPanel loading={loading} title={ruleI18n.ABOUT}>
+                          {aboutRuleData != null && (
+                            <StepAboutRule
+                              descriptionDirection="column"
+                              isReadOnlyView={true}
+                              isLoading={false}
+                              defaultValues={aboutRuleData}
+                            />
+                          )}
+                        </StepPanel>
+                      </EuiFlexItem>
+
+                      <EuiFlexItem component="section" grow={1}>
+                        <StepPanel loading={loading} title={ruleI18n.SCHEDULE}>
+                          {scheduleRuleData != null && (
+                            <StepScheduleRule
+                              descriptionDirection="column"
+                              isReadOnlyView={true}
+                              isLoading={false}
+                              defaultValues={scheduleRuleData}
+                            />
+                          )}
+                        </StepPanel>
+                      </EuiFlexItem>
+                    </EuiFlexGroup>
+
+                    <EuiSpacer />
+
+                    <SignalsCharts />
+
+                    <EuiSpacer />
+
+                    {ruleId != null && (
+                      <SignalsTable
+                        defaultFilters={signalDefaultFilters}
+                        from={from}
+                        signalsIndex={signalsIndex ?? ''}
+                        to={to}
+                      />
+                    )}
+                  </WrapperPage>
+                </StickyContainer>
+              )}
+            </GlobalTime>
+          ) : (
+            <WrapperPage>
+              <HeaderPage border title={i18n.PAGE_TITLE} />
+
+              <DetectionEngineEmptyPage />
+            </WrapperPage>
+          );
+        }}
+      </WithSource>
+
+      <SpyRoute />
+    </>
+  );
+});
+
+RuleDetailsComponent.displayName = 'RuleDetailsComponent';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/translations.ts
new file mode 100644
index 0000000000000..9dbb3b0079b0b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/translations.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const PAGE_TITLE = i18n.translate('xpack.siem.detectionEngine.ruleDetails.pageTitle', {
+  defaultMessage: 'Rule details',
+});
+
+export const BACK_TO_RULES = i18n.translate(
+  'xpack.siem.detectionEngine.ruleDetails.backToRulesDescription',
+  {
+    defaultMessage: 'Back to rules',
+  }
+);
+
+export const EXPERIMENTAL = i18n.translate(
+  'xpack.siem.detectionEngine.ruleDetails.experimentalDescription',
+  {
+    defaultMessage: 'Experimental',
+  }
+);
+
+export const ACTIVATE_RULE = i18n.translate(
+  'xpack.siem.detectionEngine.ruleDetails.activateRuleLabel',
+  {
+    defaultMessage: 'Activate',
+  }
+);
+
+export const UNKNOWN = i18n.translate('xpack.siem.detectionEngine.ruleDetails.unknownDescription', {
+  defaultMessage: 'Unknown',
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx
new file mode 100644
index 0000000000000..8e32f82dff0b1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx
@@ -0,0 +1,323 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+  EuiTabbedContent,
+  EuiTabbedContentTab,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Redirect, useParams } from 'react-router-dom';
+
+import { HeaderPage } from '../../../../components/header_page';
+import { WrapperPage } from '../../../../components/wrapper_page';
+import { SpyRoute } from '../../../../utils/route/spy_routes';
+import { DETECTION_ENGINE_PAGE_NAME } from '../../../../components/link_to/redirect_to_detection_engine';
+import { useRule, usePersistRule } from '../../../../containers/detection_engine/rules';
+import { FormHook, FormData } from '../components/shared_imports';
+import { StepPanel } from '../components/step_panel';
+import { StepAboutRule } from '../components/step_about_rule';
+import { StepDefineRule } from '../components/step_define_rule';
+import { StepScheduleRule } from '../components/step_schedule_rule';
+import { formatRule } from '../create/helpers';
+import { getStepsData } from '../helpers';
+import * as ruleI18n from '../translations';
+import { RuleStep, DefineStepRule, AboutStepRule, ScheduleStepRule } from '../types';
+import * as i18n from './translations';
+
+interface StepRuleForm {
+  isValid: boolean;
+}
+interface AboutStepRuleForm extends StepRuleForm {
+  data: AboutStepRule | null;
+}
+interface DefineStepRuleForm extends StepRuleForm {
+  data: DefineStepRule | null;
+}
+interface ScheduleStepRuleForm extends StepRuleForm {
+  data: ScheduleStepRule | null;
+}
+
+export const EditRuleComponent = memo(() => {
+  const { ruleId } = useParams();
+  const [loading, rule] = useRule(ruleId);
+  const [initForm, setInitForm] = useState(false);
+  const [myAboutRuleForm, setMyAboutRuleForm] = useState<AboutStepRuleForm>({
+    data: null,
+    isValid: false,
+  });
+  const [myDefineRuleForm, setMyDefineRuleForm] = useState<DefineStepRuleForm>({
+    data: null,
+    isValid: false,
+  });
+  const [myScheduleRuleForm, setMyScheduleRuleForm] = useState<ScheduleStepRuleForm>({
+    data: null,
+    isValid: false,
+  });
+  const [selectedTab, setSelectedTab] = useState<EuiTabbedContentTab>();
+  const stepsForm = useRef<Record<RuleStep, FormHook<FormData> | null>>({
+    [RuleStep.defineRule]: null,
+    [RuleStep.aboutRule]: null,
+    [RuleStep.scheduleRule]: null,
+  });
+  const [{ isLoading, isSaved }, setRule] = usePersistRule();
+  const [tabHasError, setTabHasError] = useState<RuleStep[]>([]);
+  const setStepsForm = useCallback(
+    (step: RuleStep, form: FormHook<FormData>) => {
+      stepsForm.current[step] = form;
+      if (initForm && step === (selectedTab?.id as RuleStep) && form.isSubmitted === false) {
+        setInitForm(false);
+        form.submit();
+      }
+    },
+    [initForm, selectedTab]
+  );
+  const tabs = useMemo(
+    () => [
+      {
+        id: RuleStep.defineRule,
+        name: ruleI18n.DEFINITION,
+        content: (
+          <>
+            <EuiSpacer />
+            <StepPanel loading={loading} title={ruleI18n.DEFINITION}>
+              {myDefineRuleForm.data != null && (
+                <StepDefineRule
+                  isReadOnlyView={false}
+                  isLoading={isLoading}
+                  isUpdateView
+                  defaultValues={myDefineRuleForm.data}
+                  setForm={setStepsForm}
+                />
+              )}
+              <EuiSpacer />
+            </StepPanel>
+          </>
+        ),
+      },
+      {
+        id: RuleStep.aboutRule,
+        name: ruleI18n.ABOUT,
+        content: (
+          <>
+            <EuiSpacer />
+            <StepPanel loading={loading} title={ruleI18n.ABOUT}>
+              {myAboutRuleForm.data != null && (
+                <StepAboutRule
+                  isReadOnlyView={false}
+                  isLoading={isLoading}
+                  isUpdateView
+                  defaultValues={myAboutRuleForm.data}
+                  setForm={setStepsForm}
+                />
+              )}
+              <EuiSpacer />
+            </StepPanel>
+          </>
+        ),
+      },
+      {
+        id: RuleStep.scheduleRule,
+        name: ruleI18n.SCHEDULE,
+        content: (
+          <>
+            <EuiSpacer />
+            <StepPanel loading={loading} title={ruleI18n.SCHEDULE}>
+              {myScheduleRuleForm.data != null && (
+                <StepScheduleRule
+                  isReadOnlyView={false}
+                  isLoading={isLoading}
+                  isUpdateView
+                  defaultValues={myScheduleRuleForm.data}
+                  setForm={setStepsForm}
+                />
+              )}
+              <EuiSpacer />
+            </StepPanel>
+          </>
+        ),
+      },
+    ],
+    [
+      loading,
+      isLoading,
+      myAboutRuleForm,
+      myDefineRuleForm,
+      myScheduleRuleForm,
+      setStepsForm,
+      stepsForm,
+    ]
+  );
+
+  const onSubmit = useCallback(async () => {
+    const activeFormId = selectedTab?.id as RuleStep;
+    const activeForm = await stepsForm.current[activeFormId]?.submit();
+
+    const invalidForms = [RuleStep.aboutRule, RuleStep.defineRule, RuleStep.scheduleRule].reduce<
+      RuleStep[]
+    >((acc, step) => {
+      if (
+        (step === activeFormId && activeForm != null && !activeForm?.isValid) ||
+        (step === RuleStep.aboutRule && !myAboutRuleForm.isValid) ||
+        (step === RuleStep.defineRule && !myDefineRuleForm.isValid) ||
+        (step === RuleStep.scheduleRule && !myScheduleRuleForm.isValid)
+      ) {
+        return [...acc, step];
+      }
+      return acc;
+    }, []);
+
+    if (invalidForms.length === 0 && activeForm != null) {
+      setTabHasError([]);
+      setRule(
+        formatRule(
+          (activeFormId === RuleStep.defineRule
+            ? activeForm.data
+            : myDefineRuleForm.data) as DefineStepRule,
+          (activeFormId === RuleStep.aboutRule
+            ? activeForm.data
+            : myAboutRuleForm.data) as AboutStepRule,
+          (activeFormId === RuleStep.scheduleRule
+            ? activeForm.data
+            : myScheduleRuleForm.data) as ScheduleStepRule,
+          ruleId
+        )
+      );
+    } else {
+      setTabHasError(invalidForms);
+    }
+  }, [stepsForm, myAboutRuleForm, myDefineRuleForm, myScheduleRuleForm, selectedTab, ruleId]);
+
+  useEffect(() => {
+    if (rule != null) {
+      const { aboutRuleData, defineRuleData, scheduleRuleData } = getStepsData({ rule });
+      setMyAboutRuleForm({ data: aboutRuleData, isValid: true });
+      setMyDefineRuleForm({ data: defineRuleData, isValid: true });
+      setMyScheduleRuleForm({ data: scheduleRuleData, isValid: true });
+    }
+  }, [rule]);
+
+  const onTabClick = useCallback(
+    async (tab: EuiTabbedContentTab) => {
+      if (selectedTab != null) {
+        const ruleStep = selectedTab.id as RuleStep;
+        const respForm = await stepsForm.current[ruleStep]?.submit();
+        if (respForm != null) {
+          if (ruleStep === RuleStep.aboutRule) {
+            setMyAboutRuleForm({
+              data: respForm.data as AboutStepRule,
+              isValid: respForm.isValid,
+            });
+          } else if (ruleStep === RuleStep.defineRule) {
+            setMyDefineRuleForm({
+              data: respForm.data as DefineStepRule,
+              isValid: respForm.isValid,
+            });
+          } else if (ruleStep === RuleStep.scheduleRule) {
+            setMyScheduleRuleForm({
+              data: respForm.data as ScheduleStepRule,
+              isValid: respForm.isValid,
+            });
+          }
+        }
+      }
+      setInitForm(true);
+      setSelectedTab(tab);
+    },
+    [selectedTab, stepsForm.current]
+  );
+
+  useEffect(() => {
+    if (rule != null) {
+      const { aboutRuleData, defineRuleData, scheduleRuleData } = getStepsData({ rule });
+      setMyAboutRuleForm({ data: aboutRuleData, isValid: true });
+      setMyDefineRuleForm({ data: defineRuleData, isValid: true });
+      setMyScheduleRuleForm({ data: scheduleRuleData, isValid: true });
+    }
+  }, [rule]);
+
+  useEffect(() => {
+    setSelectedTab(tabs[0]);
+  }, []);
+
+  if (isSaved || (rule != null && rule.immutable)) {
+    return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}/rules/${ruleId}`} />;
+  }
+
+  return (
+    <>
+      <WrapperPage restrictWidth>
+        <HeaderPage
+          backOptions={{
+            href: `#/${DETECTION_ENGINE_PAGE_NAME}/rules/${ruleId}`,
+            text: `${i18n.BACK_TO} ${rule?.name ?? ''}`,
+          }}
+          isLoading={isLoading}
+          title={i18n.PAGE_TITLE}
+        />
+        {tabHasError.length > 0 && (
+          <EuiCallOut title={i18n.SORRY_ERRORS} color="danger" iconType="alert">
+            <FormattedMessage
+              id="xpack.siem.detectionEngine.rule.editRule.errorMsgDescription"
+              defaultMessage="You have an invalid input in {countError, plural, one {this tab} other {these tabs}}: {tabHasError}"
+              values={{
+                countError: tabHasError.length,
+                tabHasError: tabHasError
+                  .map(t => {
+                    if (t === RuleStep.aboutRule) {
+                      return ruleI18n.ABOUT;
+                    } else if (t === RuleStep.defineRule) {
+                      return ruleI18n.DEFINITION;
+                    } else if (t === RuleStep.scheduleRule) {
+                      return ruleI18n.SCHEDULE;
+                    }
+                    return t;
+                  })
+                  .join(', '),
+              }}
+            />
+          </EuiCallOut>
+        )}
+
+        <EuiTabbedContent
+          initialSelectedTab={tabs[0]}
+          selectedTab={tabs.find(t => t.id === selectedTab?.id)}
+          onTabClick={onTabClick}
+          tabs={tabs}
+        />
+
+        <EuiSpacer />
+
+        <EuiFlexGroup
+          alignItems="center"
+          gutterSize="s"
+          justifyContent="flexEnd"
+          responsive={false}
+        >
+          <EuiFlexItem grow={false}>
+            <EuiButton iconType="cross" href={`#/${DETECTION_ENGINE_PAGE_NAME}/rules/${ruleId}`}>
+              {i18n.CANCEL}
+            </EuiButton>
+          </EuiFlexItem>
+
+          <EuiFlexItem grow={false}>
+            <EuiButton fill onClick={onSubmit} iconType="save" isLoading={isLoading}>
+              {i18n.SAVE_CHANGES}
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </WrapperPage>
+
+      <SpyRoute />
+    </>
+  );
+});
+EditRuleComponent.displayName = 'EditRuleComponent';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/translations.ts
new file mode 100644
index 0000000000000..b81ae58e565f0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/translations.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const PAGE_TITLE = i18n.translate('xpack.siem.detectionEngine.editRule.pageTitle', {
+  defaultMessage: 'Edit rule settings',
+});
+
+export const CANCEL = i18n.translate('xpack.siem.detectionEngine.editRule.cancelTitle', {
+  defaultMessage: 'Cancel',
+});
+
+export const SAVE_CHANGES = i18n.translate('xpack.siem.detectionEngine.editRule.saveChangeTitle', {
+  defaultMessage: 'Save changes',
+});
+
+export const SORRY_ERRORS = i18n.translate(
+  'xpack.siem.detectionEngine.editRule.errorMsgDescription',
+  {
+    defaultMessage: 'Sorry',
+  }
+);
+
+export const BACK_TO = i18n.translate('xpack.siem.detectionEngine.editRule.backToDescription', {
+  defaultMessage: 'Back to',
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx
new file mode 100644
index 0000000000000..46301ae808919
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.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 { pick } from 'lodash/fp';
+
+import { esFilters } from '../../../../../../../../src/plugins/data/public';
+import { Rule } from '../../../containers/detection_engine/rules';
+import { AboutStepRule, DefineStepRule, IMitreEnterpriseAttack, ScheduleStepRule } from './types';
+
+interface GetStepsData {
+  aboutRuleData: AboutStepRule | null;
+  defineRuleData: DefineStepRule | null;
+  scheduleRuleData: ScheduleStepRule | null;
+}
+
+export const getStepsData = ({
+  rule,
+  detailsView = false,
+}: {
+  rule: Rule | null;
+  detailsView?: boolean;
+}): GetStepsData => {
+  const defineRuleData: DefineStepRule | null =
+    rule != null
+      ? {
+          isNew: false,
+          index: rule.index,
+          queryBar: {
+            query: { query: rule.query as string, language: rule.language },
+            filters: rule.filters as esFilters.Filter[],
+            saved_id: rule.saved_id ?? null,
+          },
+          useIndicesConfig: 'true',
+        }
+      : null;
+  const aboutRuleData: AboutStepRule | null =
+    rule != null
+      ? {
+          isNew: false,
+          ...pick(['description', 'name', 'references', 'severity', 'tags', 'threats'], rule),
+          ...(detailsView ? { name: '' } : {}),
+          threats: rule.threats as IMitreEnterpriseAttack[],
+          falsePositives: rule.false_positives,
+          riskScore: rule.risk_score,
+        }
+      : null;
+  const scheduleRuleData: ScheduleStepRule | null =
+    rule != null
+      ? {
+          isNew: false,
+          ...pick(['enabled', 'interval'], rule),
+          from:
+            rule?.meta?.from != null
+              ? rule.meta.from.replace('now-', '')
+              : rule.from.replace('now-', ''),
+        }
+      : null;
+
+  return { aboutRuleData, defineRuleData, scheduleRuleData };
+};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx
index afff0f07dfac4..8b4cc2a213589 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx
@@ -4,20 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiTabbedContent } from '@elastic/eui';
+import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import React, { useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 
+import { FormattedRelativePreferenceDate } from '../../../components/formatted_date';
+import { getEmptyTagValue } from '../../../components/empty_value';
 import { HeaderPage } from '../../../components/header_page';
-
 import { WrapperPage } from '../../../components/wrapper_page';
 import { SpyRoute } from '../../../utils/route/spy_routes';
-import * as i18n from './translations';
-import { AllRules } from './all_rules';
-import { ActivityMonitor } from './activity_monitor';
-import { FormattedRelativePreferenceDate } from '../../../components/formatted_date';
-import { getEmptyTagValue } from '../../../components/empty_value';
+
+import { AllRules } from './all';
 import { ImportRuleModal } from './components/import_rule_modal';
+import * as i18n from './translations';
 
 export const RulesComponent = React.memo(() => {
   const [showImportModal, setShowImportModal] = useState(false);
@@ -62,27 +61,14 @@ export const RulesComponent = React.memo(() => {
             </EuiFlexItem>
 
             <EuiFlexItem grow={false}>
-              <EuiButton fill href="#/detection-engine/rules/create-rule" iconType="plusInCircle">
+              <EuiButton fill href="#/detection-engine/rules/create" iconType="plusInCircle">
                 {i18n.ADD_NEW_RULE}
               </EuiButton>
             </EuiFlexItem>
           </EuiFlexGroup>
         </HeaderPage>
 
-        <EuiTabbedContent
-          tabs={[
-            {
-              id: 'tabAllRules',
-              name: i18n.ALL_RULES,
-              content: <AllRules importCompleteToggle={importCompleteToggle} />,
-            },
-            {
-              id: 'tabActivityMonitor',
-              name: i18n.ACTIVITY_MONITOR,
-              content: <ActivityMonitor />,
-            },
-          ]}
-        />
+        <AllRules importCompleteToggle={importCompleteToggle} />
       </WrapperPage>
 
       <SpyRoute />
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
index 9ae266e396f6d..ecd6bef942bfb 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/translations.ts
@@ -205,3 +205,46 @@ export const COLUMN_ACTIVATE = i18n.translate(
     defaultMessage: 'Activate',
   }
 );
+
+export const DEFINE_RULE = i18n.translate('xpack.siem.detectionEngine.rules.defineRuleTitle', {
+  defaultMessage: 'Define Rule',
+});
+
+export const ABOUT_RULE = i18n.translate('xpack.siem.detectionEngine.rules.aboutRuleTitle', {
+  defaultMessage: 'About Rule',
+});
+
+export const SCHEDULE_RULE = i18n.translate('xpack.siem.detectionEngine.rules.scheduleRuleTitle', {
+  defaultMessage: 'Schedule Rule',
+});
+
+export const DEFINITION = i18n.translate('xpack.siem.detectionEngine.rules.stepDefinitionTitle', {
+  defaultMessage: 'Definition',
+});
+
+export const ABOUT = i18n.translate('xpack.siem.detectionEngine.rules.stepAboutTitle', {
+  defaultMessage: 'About',
+});
+
+export const SCHEDULE = i18n.translate('xpack.siem.detectionEngine.rules.stepScheduleTitle', {
+  defaultMessage: 'Schedule',
+});
+
+export const OPTIONAL_FIELD = i18n.translate(
+  'xpack.siem.detectionEngine.rules.optionalFieldDescription',
+  {
+    defaultMessage: 'Optional',
+  }
+);
+
+export const CONTINUE = i18n.translate('xpack.siem.detectionEngine.rules.continueButtonTitle', {
+  defaultMessage: 'Continue',
+});
+
+export const UPDATE = i18n.translate('xpack.siem.detectionEngine.rules.updateButtonTitle', {
+  defaultMessage: 'Update',
+});
+
+export const DELETE = i18n.translate('xpack.siem.detectionEngine.rules.deleteDescription', {
+  defaultMessage: 'Delete',
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
index 8cbc61e677f8c..9b535034810bd 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/types.ts
@@ -4,7 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Rule } from '../../../containers/detection_engine/rules/types';
+import { esFilters } from '../../../../../../../../src/plugins/data/common';
+import { Rule } from '../../../containers/detection_engine/rules';
+import { FieldValueQueryBar } from './components/query_bar';
+import { FormData, FormHook } from './components/shared_imports';
 
 export interface EuiBasicTableSortTypes {
   field: string;
@@ -16,7 +19,7 @@ export interface EuiBasicTableOnChange {
     index: number;
     size: number;
   };
-  sort: EuiBasicTableSortTypes;
+  sort?: EuiBasicTableSortTypes;
 }
 
 export interface TableData {
@@ -39,3 +42,96 @@ export interface TableData {
   isLoading: boolean;
   sourceRule: Rule;
 }
+
+export enum RuleStep {
+  defineRule = 'define-rule',
+  aboutRule = 'about-rule',
+  scheduleRule = 'schedule-rule',
+}
+export type RuleStatusType = 'passive' | 'active' | 'valid';
+
+export interface RuleStepData {
+  data: unknown;
+  isValid: boolean;
+}
+
+export interface RuleStepProps {
+  descriptionDirection?: 'row' | 'column';
+  setStepData?: (step: RuleStep, data: unknown, isValid: boolean) => void;
+  isReadOnlyView: boolean;
+  isUpdateView?: boolean;
+  isLoading: boolean;
+  resizeParentContainer?: (height: number) => void;
+  setForm?: (step: RuleStep, form: FormHook<FormData>) => void;
+}
+
+interface StepRuleData {
+  isNew: boolean;
+}
+export interface AboutStepRule extends StepRuleData {
+  name: string;
+  description: string;
+  severity: string;
+  riskScore: number;
+  references: string[];
+  falsePositives: string[];
+  tags: string[];
+  threats: IMitreEnterpriseAttack[];
+}
+
+export interface DefineStepRule extends StepRuleData {
+  useIndicesConfig: string;
+  index: string[];
+  queryBar: FieldValueQueryBar;
+}
+
+export interface ScheduleStepRule extends StepRuleData {
+  enabled: boolean;
+  interval: string;
+  from: string;
+  to?: string;
+}
+
+export interface DefineStepRuleJson {
+  index: string[];
+  filters: esFilters.Filter[];
+  saved_id?: string;
+  query: string;
+  language: string;
+}
+
+export interface AboutStepRuleJson {
+  name: string;
+  description: string;
+  severity: string;
+  risk_score: number;
+  references: string[];
+  false_positives: string[];
+  tags: string[];
+  threats: IMitreEnterpriseAttack[];
+}
+
+export interface ScheduleStepRuleJson {
+  enabled: boolean;
+  interval: string;
+  from: string;
+  to?: string;
+  meta?: unknown;
+}
+
+export type MyRule = Omit<DefineStepRule & ScheduleStepRule & AboutStepRule, 'isNew'> & {
+  immutable: boolean;
+};
+
+export type FormatRuleType = 'query' | 'saved_query';
+
+export interface IMitreAttack {
+  id: string;
+  name: string;
+  reference: string;
+}
+export interface IMitreEnterpriseAttack {
+  framework: string;
+  tactic: IMitreAttack;
+  techniques: IMitreAttack[];
+}
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/components/closed_signals/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/components/closed_signals/index.tsx
deleted file mode 100644
index 7ccc95a1d7083..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/components/closed_signals/index.tsx
+++ /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 React from 'react';
-import {
-  UtilityBar,
-  UtilityBarAction,
-  UtilityBarGroup,
-  UtilityBarSection,
-  UtilityBarText,
-} from '../../../../../components/detection_engine/utility_bar';
-import * as i18n from '../../translations';
-
-export const ClosedSignals = React.memo<{ totalCount: number }>(({ totalCount }) => {
-  return (
-    <>
-      <UtilityBar>
-        <UtilityBarSection>
-          <UtilityBarGroup>
-            <UtilityBarText>{`${i18n.PANEL_SUBTITLE_SHOWING}: ${totalCount} signals`}</UtilityBarText>
-          </UtilityBarGroup>
-        </UtilityBarSection>
-
-        <UtilityBarSection>
-          <UtilityBarGroup>
-            <UtilityBarAction
-              iconSide="right"
-              iconType="arrowDown"
-              popoverContent={() => <p>{'Customize columns context menu here.'}</p>}
-            >
-              {'Customize columns'}
-            </UtilityBarAction>
-
-            <UtilityBarAction iconType="indexMapping">{'Aggregate data'}</UtilityBarAction>
-          </UtilityBarGroup>
-        </UtilityBarSection>
-      </UtilityBar>
-
-      {/* Michael: Closed signals datagrid here. Talk to Chandler Prall about possibility of early access. If not possible, use basic table. */}
-    </>
-  );
-});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/components/open_signals/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/components/open_signals/index.tsx
deleted file mode 100644
index f65f511ab33a9..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/components/open_signals/index.tsx
+++ /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 React from 'react';
-import {
-  UtilityBar,
-  UtilityBarAction,
-  UtilityBarGroup,
-  UtilityBarSection,
-  UtilityBarText,
-} from '../../../../../components/detection_engine/utility_bar';
-import * as i18n from '../../translations';
-
-export const OpenSignals = React.memo<{ totalCount: number }>(({ totalCount }) => {
-  return (
-    <>
-      <UtilityBar>
-        <UtilityBarSection>
-          <UtilityBarGroup>
-            <UtilityBarText>{`${i18n.PANEL_SUBTITLE_SHOWING}: ${totalCount} signals`}</UtilityBarText>
-          </UtilityBarGroup>
-
-          <UtilityBarGroup>
-            <UtilityBarText>{'Selected: 20 signals'}</UtilityBarText>
-
-            <UtilityBarAction
-              iconSide="right"
-              iconType="arrowDown"
-              popoverContent={() => <p>{'Batch actions context menu here.'}</p>}
-            >
-              {'Batch actions'}
-            </UtilityBarAction>
-
-            <UtilityBarAction iconType="listAdd">
-              {'Select all signals on all pages'}
-            </UtilityBarAction>
-          </UtilityBarGroup>
-        </UtilityBarSection>
-      </UtilityBar>
-
-      {/* Michael: Open signals datagrid here. Talk to Chandler Prall about possibility of early access. If not possible, use basic table. */}
-    </>
-  );
-});
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/default_config.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/default_config.tsx
deleted file mode 100644
index e90487a3b023c..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/default_config.tsx
+++ /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.
- */
-
-import { ColumnHeader } from '../../../components/timeline/body/column_headers/column_header';
-import { defaultColumnHeaderType } from '../../../components/timeline/body/column_headers/default_headers';
-import {
-  DEFAULT_COLUMN_MIN_WIDTH,
-  DEFAULT_DATE_COLUMN_MIN_WIDTH,
-} from '../../../components/timeline/body/helpers';
-
-import * as i18n from './translations';
-import { SubsetTimelineModel, timelineDefaults } from '../../../store/timeline/model';
-import { esFilters } from '../../../../../../../../src/plugins/data/common/es_query';
-
-export const signalsOpenFilters: esFilters.Filter[] = [
-  {
-    meta: {
-      alias: null,
-      negate: false,
-      disabled: false,
-      type: 'phrase',
-      key: 'signal.status',
-      params: {
-        query: 'open',
-      },
-    },
-    query: {
-      match_phrase: {
-        'signal.status': 'open',
-      },
-    },
-  },
-];
-
-export const signalsClosedFilters: esFilters.Filter[] = [
-  {
-    meta: {
-      alias: null,
-      negate: false,
-      disabled: false,
-      type: 'phrase',
-      key: 'signal.status',
-      params: {
-        query: 'closed',
-      },
-    },
-    query: {
-      match_phrase: {
-        'signal.status': 'closed',
-      },
-    },
-  },
-];
-
-export const signalsHeaders: ColumnHeader[] = [
-  {
-    columnHeaderType: defaultColumnHeaderType,
-    id: 'signal.rule.name',
-    label: i18n.SIGNALS_HEADERS_RULE,
-    width: DEFAULT_COLUMN_MIN_WIDTH,
-  },
-  {
-    columnHeaderType: defaultColumnHeaderType,
-    id: 'signal.rule.type',
-    label: i18n.SIGNALS_HEADERS_METHOD,
-    width: 80,
-  },
-  {
-    columnHeaderType: defaultColumnHeaderType,
-    id: 'signal.rule.severity',
-    label: i18n.SIGNALS_HEADERS_SEVERITY,
-    width: 80,
-  },
-  {
-    columnHeaderType: defaultColumnHeaderType,
-    id: 'signal.rule.risk_score',
-    label: i18n.SIGNALS_HEADERS_RISK_SCORE,
-    width: 120,
-  },
-  {
-    category: 'event',
-    columnHeaderType: defaultColumnHeaderType,
-    id: 'event.action',
-    type: 'string',
-    aggregatable: true,
-    width: 140,
-  },
-  {
-    columnHeaderType: defaultColumnHeaderType,
-    id: 'event.category',
-    width: 150,
-  },
-  {
-    columnHeaderType: defaultColumnHeaderType,
-    id: 'host.name',
-    width: 120,
-  },
-  {
-    columnHeaderType: defaultColumnHeaderType,
-    id: 'user.name',
-    width: 120,
-  },
-  {
-    columnHeaderType: defaultColumnHeaderType,
-    id: 'source.ip',
-    width: 120,
-  },
-  {
-    columnHeaderType: defaultColumnHeaderType,
-    id: 'destination.ip',
-    width: 120,
-  },
-  {
-    columnHeaderType: defaultColumnHeaderType,
-    id: '@timestamp',
-    width: DEFAULT_DATE_COLUMN_MIN_WIDTH,
-  },
-];
-
-export const signalsDefaultModel: SubsetTimelineModel = {
-  ...timelineDefaults,
-  columns: signalsHeaders,
-};
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/index.tsx
deleted file mode 100644
index 74b7b9349c2cb..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/index.tsx
+++ /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 { EuiFilterButton, EuiFilterGroup } from '@elastic/eui';
-import React, { useCallback, useState } from 'react';
-import { OpenSignals } from './components/open_signals';
-import { ClosedSignals } from './components/closed_signals';
-import { GlobalTime } from '../../../containers/global_time';
-import { StatefulEventsViewer } from '../../../components/events_viewer';
-import * as i18n from './translations';
-import { DEFAULT_SIGNALS_INDEX } from '../../../../common/constants';
-import { signalsClosedFilters, signalsDefaultModel, signalsOpenFilters } from './default_config';
-
-const SIGNALS_PAGE_TIMELINE_ID = 'signals-page';
-const FILTER_OPEN = 'open';
-const FILTER_CLOSED = 'closed';
-
-export const SignalsTableFilterGroup = React.memo(
-  ({ onFilterGroupChanged }: { onFilterGroupChanged: (filterGroup: string) => void }) => {
-    const [filterGroup, setFilterGroup] = useState(FILTER_OPEN);
-
-    return (
-      <EuiFilterGroup>
-        <EuiFilterButton
-          hasActiveFilters={filterGroup === FILTER_OPEN}
-          onClick={() => {
-            setFilterGroup(FILTER_OPEN);
-            onFilterGroupChanged(FILTER_OPEN);
-          }}
-          withNext
-        >
-          {'Open signals'}
-        </EuiFilterButton>
-
-        <EuiFilterButton
-          hasActiveFilters={filterGroup === FILTER_CLOSED}
-          onClick={() => {
-            setFilterGroup(FILTER_CLOSED);
-            onFilterGroupChanged(FILTER_CLOSED);
-          }}
-        >
-          {'Closed signals'}
-        </EuiFilterButton>
-      </EuiFilterGroup>
-    );
-  }
-);
-
-export const SignalsTable = React.memo(() => {
-  const [filterGroup, setFilterGroup] = useState(FILTER_OPEN);
-
-  const onFilterGroupChangedCallback = useCallback(
-    (newFilterGroup: string) => {
-      setFilterGroup(newFilterGroup);
-    },
-    [setFilterGroup]
-  );
-
-  return (
-    <>
-      <GlobalTime>
-        {({ to, from, setQuery, deleteQuery, isInitializing }) => (
-          <StatefulEventsViewer
-            defaultIndices={[`${DEFAULT_SIGNALS_INDEX}-default`]}
-            defaultFilters={filterGroup === FILTER_OPEN ? signalsOpenFilters : signalsClosedFilters}
-            defaultModel={signalsDefaultModel}
-            end={to}
-            headerFilterGroup={
-              <SignalsTableFilterGroup onFilterGroupChanged={onFilterGroupChangedCallback} />
-            }
-            id={SIGNALS_PAGE_TIMELINE_ID}
-            start={from}
-            timelineTypeContext={{
-              documentType: i18n.SIGNALS_DOCUMENT_TYPE,
-              footerText: i18n.TOTAL_COUNT_OF_SIGNALS,
-              showCheckboxes: true,
-              showRowRenderers: false,
-              title: i18n.SIGNALS_TABLE_TITLE,
-            }}
-            utilityBar={(totalCount: number) =>
-              filterGroup === FILTER_OPEN ? (
-                <OpenSignals totalCount={totalCount} />
-              ) : (
-                <ClosedSignals totalCount={totalCount} />
-              )
-            }
-          />
-        )}
-      </GlobalTime>
-    </>
-  );
-});
-
-SignalsTable.displayName = 'SignalsTable';
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/translations.ts
deleted file mode 100644
index 1806ba85f8b55..0000000000000
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/signals/translations.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 { i18n } from '@kbn/i18n';
-
-export const PAGE_TITLE = i18n.translate('xpack.siem.detectionEngine.pageTitle', {
-  defaultMessage: 'Detection engine',
-});
-
-export const PANEL_SUBTITLE_SHOWING = i18n.translate(
-  'xpack.siem.detectionEngine.panelSubtitleShowing',
-  {
-    defaultMessage: 'Showing',
-  }
-);
-
-export const SIGNALS_TABLE_TITLE = i18n.translate('xpack.siem.detectionEngine.signals.tableTitle', {
-  defaultMessage: 'All signals',
-});
-
-export const SIGNALS_DOCUMENT_TYPE = i18n.translate(
-  'xpack.siem.detectionEngine.signals.documentTypeTitle',
-  {
-    defaultMessage: 'Signals',
-  }
-);
-
-export const TOTAL_COUNT_OF_SIGNALS = i18n.translate(
-  'xpack.siem.detectionEngine.signals.totalCountOfSignalsTitle',
-  {
-    defaultMessage: 'signals match the search criteria',
-  }
-);
-
-export const SIGNALS_HEADERS_RULE = i18n.translate(
-  'xpack.siem.eventsViewer.signals.defaultHeaders.ruleTitle',
-  {
-    defaultMessage: 'Rule',
-  }
-);
-
-export const SIGNALS_HEADERS_METHOD = i18n.translate(
-  'xpack.siem.eventsViewer.signals.defaultHeaders.methodTitle',
-  {
-    defaultMessage: 'Method',
-  }
-);
-
-export const SIGNALS_HEADERS_SEVERITY = i18n.translate(
-  'xpack.siem.eventsViewer.signals.defaultHeaders.severityTitle',
-  {
-    defaultMessage: 'Severity',
-  }
-);
-
-export const SIGNALS_HEADERS_RISK_SCORE = i18n.translate(
-  'xpack.siem.eventsViewer.signals.defaultHeaders.riskScoreTitle',
-  {
-    defaultMessage: 'Risk Score',
-  }
-);
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/translations.ts b/x-pack/legacy/plugins/siem/public/pages/detection_engine/translations.ts
index a7e7fa5133a64..e5f830d3a49b0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/translations.ts
@@ -10,8 +10,16 @@ export const PAGE_TITLE = i18n.translate('xpack.siem.detectionEngine.pageTitle',
   defaultMessage: 'Detection engine',
 });
 
-export const PAGE_SUBTITLE = i18n.translate('xpack.siem.detectionEngine.pageSubtitle', {
-  defaultMessage: 'Last signal: X minutes ago',
+export const LAST_SIGNAL = i18n.translate('xpack.siem.detectionEngine.lastSignalTitle', {
+  defaultMessage: 'Last signal',
+});
+
+export const TOTAL_SIGNAL = i18n.translate('xpack.siem.detectionEngine.totalSignalTitle', {
+  defaultMessage: 'Total',
+});
+
+export const SIGNAL = i18n.translate('xpack.siem.detectionEngine.signalTitle', {
+  defaultMessage: 'Signals',
 });
 
 export const BUTTON_MANAGE_RULES = i18n.translate('xpack.siem.detectionEngine.buttonManageRules', {
@@ -27,7 +35,7 @@ export const PANEL_SUBTITLE_SHOWING = i18n.translate(
 
 export const EMPTY_TITLE = i18n.translate('xpack.siem.detectionEngine.emptyTitle', {
   defaultMessage:
-    'It looks like you don’t have any indices relevant to the detction engine in the SIEM application',
+    'It looks like you don’t have any indices relevant to the detection engine in the SIEM application',
 });
 
 export const EMPTY_ACTION_PRIMARY = i18n.translate(
@@ -43,3 +51,34 @@ export const EMPTY_ACTION_SECONDARY = i18n.translate(
     defaultMessage: 'Go to documentation',
   }
 );
+
+export const NO_INDEX_TITLE = i18n.translate('xpack.siem.detectionEngine.noIndexTitle', {
+  defaultMessage: 'Let’s set up your detection engine',
+});
+
+export const NO_INDEX_MSG_BODY = i18n.translate('xpack.siem.detectionEngine.noIndexMsgBody', {
+  defaultMessage:
+    'To use the detection engine, a user with the required cluster and index privileges must first access this page. For more help, contact your administrator.',
+});
+
+export const GO_TO_DOCUMENTATION = i18n.translate(
+  'xpack.siem.detectionEngine.goToDocumentationButton',
+  {
+    defaultMessage: 'View documentation',
+  }
+);
+
+export const USER_UNAUTHENTICATED_TITLE = i18n.translate(
+  'xpack.siem.detectionEngine.userUnauthenticatedTitle',
+  {
+    defaultMessage: 'Detection engine permissions required',
+  }
+);
+
+export const USER_UNAUTHENTICATED_MSG_BODY = i18n.translate(
+  'xpack.siem.detectionEngine.userUnauthenticatedMsgBody',
+  {
+    defaultMessage:
+      'You do not have the required permissions for viewing the detection engine. For more help, contact your administrator.',
+  }
+);
diff --git a/x-pack/legacy/plugins/siem/public/pages/home/index.tsx b/x-pack/legacy/plugins/siem/public/pages/home/index.tsx
index 97f0a21928a8a..a545be447796d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/home/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/home/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 { Redirect, Route, Switch } from 'react-router-dom';
 import styled from 'styled-components';
 
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
index febf9630e968a..aafeea6465fb3 100644
--- 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
@@ -10,22 +10,12 @@ 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';
 import { useMountAppended } from '../../../utils/use_mount_appended';
 
-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: ({
@@ -63,7 +53,7 @@ describe('body', () => {
               from={0}
               isInitializing={false}
               detailName={'host-1'}
-              setQuery={() => {}}
+              setQuery={jest.fn()}
               to={0}
               setAbsoluteRangeDatePicker={(jest.fn() as unknown) as SetAbsoluteRangeDatePicker}
               hostDetailsPagePath={hostDetailsPagePath}
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
index 1252c7031e8a5..5774feb46240d 100644
--- 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
@@ -21,10 +21,12 @@ import {
   AuthenticationsQueryTabBody,
   UncommonProcessQueryTabBody,
   EventsQueryTabBody,
+  HostAlertsQueryTabBody,
 } from '../navigation';
 
 const HostDetailsTabs = React.memo<HostDetailsTabsProps>(
   ({
+    pageFilters,
     deleteQuery,
     filterQuery,
     from,
@@ -45,14 +47,14 @@ const HostDetailsTabs = React.memo<HostDetailsTabsProps>(
           to: fromTo.to,
         });
       },
-      [setAbsoluteRangeDatePicker, scoreIntervalToDateTime]
+      [setAbsoluteRangeDatePicker]
     );
 
     const updateDateRange = useCallback(
       (min: number, max: number) => {
         setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
       },
-      [setAbsoluteRangeDatePicker, scoreIntervalToDateTime]
+      [setAbsoluteRangeDatePicker]
     );
 
     const tabProps = {
@@ -93,6 +95,10 @@ const HostDetailsTabs = React.memo<HostDetailsTabsProps>(
           path={`${hostDetailsPagePath}/:tabName(${HostsTableType.events})`}
           render={() => <EventsQueryTabBody {...tabProps} />}
         />
+        <Route
+          path={`${hostDetailsPagePath}/:tabName(${HostsTableType.alerts})`}
+          render={() => <HostAlertsQueryTabBody {...tabProps} pageFilters={pageFilters} />}
+        />
       </Switch>
     );
   }
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 d30665c5a2142..b548d91615d19 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/details/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/details/index.tsx
@@ -5,7 +5,7 @@
  */
 
 import { EuiHorizontalRule, EuiSpacer } from '@elastic/eui';
-import React, { useContext, useEffect } from 'react';
+import React, { useContext, useEffect, useCallback } from 'react';
 import { connect } from 'react-redux';
 import { StickyContainer } from 'react-sticky';
 import { compose } from 'redux';
@@ -28,13 +28,13 @@ import { HostOverviewByNameQuery } from '../../../containers/hosts/overview';
 import { KpiHostDetailsQuery } from '../../../containers/kpi_host_details';
 import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../../containers/source';
 import { LastEventIndexKey } from '../../../graphql/types';
-import { useKibanaCore } from '../../../lib/compose/kibana_core';
+import { useKibana } from '../../../lib/kibana';
 import { convertToBuildEsQuery } from '../../../lib/keury';
 import { inputsSelectors, State } from '../../../store';
 import { setHostDetailsTablesActivePageToZero as dispatchHostDetailsTablesActivePageToZero } from '../../../store/hosts/actions';
 import { setAbsoluteRangeDatePicker as dispatchAbsoluteRangeDatePicker } from '../../../store/inputs/actions';
 import { SpyRoute } from '../../../utils/route/spy_routes';
-import { esQuery } from '../../../../../../../../src/plugins/data/public';
+import { esQuery, esFilters } from '../../../../../../../../src/plugins/data/public';
 
 import { HostsEmptyPage } from '../hosts_empty_page';
 import { HostDetailsTabs } from './details_tabs';
@@ -61,44 +61,50 @@ const HostDetailsComponent = React.memo<HostDetailsComponentProps>(
   }) => {
     useEffect(() => {
       setHostDetailsTablesActivePageToZero(null);
-    }, [detailName]);
+    }, [setHostDetailsTablesActivePageToZero, detailName]);
     const capabilities = useContext(MlCapabilitiesContext);
-    const core = useKibanaCore();
+    const kibana = useKibana();
+    const hostDetailsPageFilters: esFilters.Filter[] = [
+      {
+        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',
+            },
+          },
+        },
+      },
+    ];
+    const getFilters = () => [...hostDetailsPageFilters, ...filters];
+    const narrowDateRange = useCallback(
+      (min: number, max: number) => {
+        setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
+      },
+      [setAbsoluteRangeDatePicker]
+    );
 
     return (
       <>
         <WithSource sourceId="default">
           {({ indicesExist, indexPattern }) => {
             const filterQuery = convertToBuildEsQuery({
-              config: esQuery.getEsQueryConfig(core.uiSettings),
+              config: esQuery.getEsQueryConfig(kibana.services.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,
-              ],
+              filters: getFilters(),
             });
-
             return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
               <StickyContainer>
                 <FiltersGlobal>
@@ -176,9 +182,7 @@ const HostDetailsComponent = React.memo<HostDetailsComponentProps>(
                         refetch={refetch}
                         setQuery={setQuery}
                         to={to}
-                        narrowDateRange={(min: number, max: number) => {
-                          setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
-                        }}
+                        narrowDateRange={narrowDateRange}
                       />
                     )}
                   </KpiHostDetailsQuery>
@@ -194,6 +198,7 @@ const HostDetailsComponent = React.memo<HostDetailsComponentProps>(
                   <HostDetailsTabs
                     isInitializing={isInitializing}
                     deleteQuery={deleteQuery}
+                    pageFilters={hostDetailsPageFilters}
                     to={to}
                     from={from}
                     detailName={detailName}
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/details/nav_tabs.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/details/nav_tabs.tsx
index 9867e745c3190..f828dc250f0d3 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/details/nav_tabs.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/details/nav_tabs.tsx
@@ -50,6 +50,13 @@ export const navTabsHostDetails = (
       urlKey: 'host',
       isDetailPage: true,
     },
+    [HostsTableType.alerts]: {
+      id: HostsTableType.alerts,
+      name: i18n.NAVIGATION_ALERTS_TITLE,
+      href: getTabsOnHostDetailsUrl(hostName, HostsTableType.alerts),
+      disabled: false,
+      urlKey: 'host',
+    },
   };
 
   return hasMlUserPermissions
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 091f0173635af..81bc7999bcb9f 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
@@ -6,7 +6,6 @@
 
 import { ActionCreator } from 'typescript-fsa';
 import { Query, IIndexPattern, 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';
@@ -59,9 +58,10 @@ export type HostDetailsNavTab = Record<KeyHostDetailsNavTab, NavTab>;
 
 export type HostDetailsTabsProps = HostBodyComponentDispatchProps &
   HostsQueryProps & {
+    pageFilters?: esFilters.Filter[];
+    filterQuery: string;
     indexPattern: IIndexPattern;
     type: hostsModel.HostsType;
-    filterQuery: string;
   };
 
 export type SetAbsoluteRangeDatePicker = ActionCreator<{
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 7483636cfe03d..52e016502940b 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,30 +6,33 @@
 
 import { Breadcrumb } from 'ui/chrome';
 
+import { get } from 'lodash/fp';
 import { hostsModel } from '../../../store';
 import { HostsTableType } from '../../../store/hosts/model';
 import { getHostsUrl, getHostDetailsUrl } from '../../../components/link_to/redirect_to_hosts';
 
 import * as i18n from '../translations';
-import { RouteSpyState } from '../../../utils/route/types';
+import { HostRouteSpyState } from '../../../utils/route/types';
 
 export const type = hostsModel.HostsType.details;
 
-const TabNameMappedToI18nKey = {
+const TabNameMappedToI18nKey: Record<HostsTableType, string> = {
   [HostsTableType.hosts]: i18n.NAVIGATION_ALL_HOSTS_TITLE,
   [HostsTableType.authentications]: i18n.NAVIGATION_AUTHENTICATIONS_TITLE,
   [HostsTableType.uncommonProcesses]: i18n.NAVIGATION_UNCOMMON_PROCESSES_TITLE,
   [HostsTableType.anomalies]: i18n.NAVIGATION_ANOMALIES_TITLE,
   [HostsTableType.events]: i18n.NAVIGATION_EVENTS_TITLE,
+  [HostsTableType.alerts]: i18n.NAVIGATION_ALERTS_TITLE,
 };
 
-export const getBreadcrumbs = (params: RouteSpyState, search: string[]): Breadcrumb[] => {
+export const getBreadcrumbs = (params: HostRouteSpyState, search: string[]): Breadcrumb[] => {
   let breadcrumb = [
     {
       text: i18n.PAGE_TITLE,
       href: `${getHostsUrl()}${search && search[0] ? search[0] : ''}`,
     },
   ];
+
   if (params.detailName != null) {
     breadcrumb = [
       ...breadcrumb,
@@ -40,10 +43,13 @@ export const getBreadcrumbs = (params: RouteSpyState, search: string[]): Breadcr
     ];
   }
   if (params.tabName != null) {
+    const tabName = get('tabName', params);
+    if (!tabName) return breadcrumb;
+
     breadcrumb = [
       ...breadcrumb,
       {
-        text: TabNameMappedToI18nKey[params.tabName],
+        text: TabNameMappedToI18nKey[tabName],
         href: '',
       },
     ];
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 f08cee824afa7..065d91b3fc2fa 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
@@ -6,36 +6,23 @@
 
 import { mount } from 'enzyme';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Router } from 'react-router-dom';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { ActionCreator } from 'typescript-fsa';
 
+import { esFilters } from '../../../../../../../src/plugins/data/common/es_query';
 import '../../mock/match_media';
-
-import { SiemNavigation } from '../../components/navigation';
 import { mocksSource } from '../../containers/source/mock';
 import { wait } from '../../lib/helpers';
-import { TestProviders } from '../../mock';
-import { mockUiSettings } from '../../mock/ui_settings';
+import { apolloClientObservable, TestProviders, mockGlobalState } from '../../mock';
 import { InputsModelId } from '../../store/inputs/constants';
+import { SiemNavigation } from '../../components/navigation';
+import { inputsActions } from '../../store/inputs';
+import { State, createStore } from '../../store';
 import { HostsComponentProps } from './types';
 import { Hosts } from './hosts';
-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('ui/documentation_links', () => ({
-  documentationLinks: {
-    kibana: 'http://www.example.com',
-  },
-}));
+import { HostsTabs } from './hosts_tabs';
 
 // 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 and QueryBar
@@ -153,4 +140,58 @@ describe('Hosts - rendering', () => {
     wrapper.update();
     expect(wrapper.find(SiemNavigation).exists()).toBe(true);
   });
+
+  test('it should add the new filters after init', async () => {
+    const newFilters: esFilters.Filter[] = [
+      {
+        query: {
+          bool: {
+            filter: [
+              {
+                bool: {
+                  should: [
+                    {
+                      match_phrase: {
+                        'host.name': 'ItRocks',
+                      },
+                    },
+                  ],
+                  minimum_should_match: 1,
+                },
+              },
+            ],
+          },
+        },
+        meta: {
+          alias: '',
+          disabled: false,
+          key: 'bool',
+          negate: false,
+          type: 'custom',
+          value:
+            '{"query": {"bool": {"filter": [{"bool": {"should": [{"match_phrase": {"host.name": "ItRocks"}}],"minimum_should_match": 1}}]}}}',
+        },
+      },
+    ];
+    localSource[0].result.data.source.status.indicesExist = true;
+    const myState: State = mockGlobalState;
+    const myStore = createStore(myState, apolloClientObservable);
+    const wrapper = mount(
+      <TestProviders store={myStore}>
+        <MockedProvider mocks={localSource} addTypename={false}>
+          <Router history={mockHistory}>
+            <Hosts {...hostProps} />
+          </Router>
+        </MockedProvider>
+      </TestProviders>
+    );
+    await wait();
+    wrapper.update();
+
+    myStore.dispatch(inputsActions.setSearchBarFilter({ id: 'global', filters: newFilters }));
+    wrapper.update();
+    expect(wrapper.find(HostsTabs).props().filterQuery).toEqual(
+      '{"bool":{"must":[],"filter":[{"match_all":{}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"host.name":"ItRocks"}}],"minimum_should_match":1}}]}}],"should":[],"must_not":[]}}'
+    );
+  });
 });
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 4ff666464404e..2c475e4ba6ac5 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts.tsx
@@ -5,11 +5,12 @@
  */
 
 import { EuiSpacer } from '@elastic/eui';
-import * as React from 'react';
+import React, { useCallback } from 'react';
 import { connect } from 'react-redux';
 import { StickyContainer } from 'react-sticky';
 import { compose } from 'redux';
 
+import { useParams } from 'react-router-dom';
 import { FiltersGlobal } from '../../components/filters_global';
 import { HeaderPage } from '../../components/header_page';
 import { LastEventTime } from '../../components/last_event_time';
@@ -24,7 +25,7 @@ import { GlobalTimeArgs } from '../../containers/global_time';
 import { KpiHostsQuery } from '../../containers/kpi_hosts';
 import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../containers/source';
 import { LastEventIndexKey } from '../../graphql/types';
-import { useKibanaCore } from '../../lib/compose/kibana_core';
+import { useKibana } from '../../lib/kibana';
 import { convertToBuildEsQuery } from '../../lib/keury';
 import { inputsSelectors, State, hostsModel } from '../../store';
 import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../store/inputs/actions';
@@ -35,10 +36,12 @@ import { HostsTabs } from './hosts_tabs';
 import { navTabsHosts } from './nav_tabs';
 import * as i18n from './translations';
 import { HostsComponentProps, HostsComponentReduxProps } from './types';
+import { filterAlertsHosts } from './navigation';
+import { HostsTableType } from '../../store/hosts/model';
 
 const KpiHostsComponentManage = manageQuery(KpiHostsComponent);
 
-const HostsComponent = React.memo<HostsComponentProps>(
+export const HostsComponent = React.memo<HostsComponentProps>(
   ({
     deleteQuery,
     isInitializing,
@@ -51,17 +54,30 @@ const HostsComponent = React.memo<HostsComponentProps>(
     hostsPagePath,
   }) => {
     const capabilities = React.useContext(MlCapabilitiesContext);
-    const core = useKibanaCore();
+    const kibana = useKibana();
+    const { tabName } = useParams();
+    const hostsFilters = React.useMemo(() => {
+      if (tabName === HostsTableType.alerts) {
+        return filters.length > 0 ? [...filters, ...filterAlertsHosts] : filterAlertsHosts;
+      }
+      return filters;
+    }, [tabName, filters]);
+    const narrowDateRange = useCallback(
+      (min: number, max: number) => {
+        setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
+      },
+      [setAbsoluteRangeDatePicker]
+    );
 
     return (
       <>
         <WithSource sourceId="default">
           {({ indicesExist, indexPattern }) => {
             const filterQuery = convertToBuildEsQuery({
-              config: esQuery.getEsQueryConfig(core.uiSettings),
+              config: esQuery.getEsQueryConfig(kibana.services.uiSettings),
               indexPattern,
               queries: [query],
-              filters,
+              filters: hostsFilters,
             });
             return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
               <StickyContainer>
@@ -93,9 +109,7 @@ const HostsComponent = React.memo<HostsComponentProps>(
                         refetch={refetch}
                         setQuery={setQuery}
                         to={to}
-                        narrowDateRange={(min: number, max: number) => {
-                          setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
-                        }}
+                        narrowDateRange={narrowDateRange}
                       />
                     )}
                   </KpiHostsQuery>
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_empty_page.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_empty_page.tsx
index ecd1e4f378cc5..1d2a3f83e8808 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_empty_page.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_empty_page.tsx
@@ -6,26 +6,30 @@
 
 import React from 'react';
 import chrome from 'ui/chrome';
-import { documentationLinks } from 'ui/documentation_links';
 
 import { EmptyPage } from '../../components/empty_page';
+import { useKibana } from '../../lib/kibana';
 
 import * as i18n from './translations';
 
 const basePath = chrome.getBasePath();
 
-export const HostsEmptyPage = React.memo(() => (
-  <EmptyPage
-    actionPrimaryIcon="gear"
-    actionPrimaryLabel={i18n.EMPTY_ACTION_PRIMARY}
-    actionPrimaryUrl={`${basePath}/app/kibana#/home/tutorial_directory/siem`}
-    actionSecondaryIcon="popout"
-    actionSecondaryLabel={i18n.EMPTY_ACTION_SECONDARY}
-    actionSecondaryTarget="_blank"
-    actionSecondaryUrl={documentationLinks.siem}
-    data-test-subj="empty-page"
-    title={i18n.EMPTY_TITLE}
-  />
-));
+export const HostsEmptyPage = React.memo(() => {
+  const docLinks = useKibana().services.docLinks;
+
+  return (
+    <EmptyPage
+      actionPrimaryIcon="gear"
+      actionPrimaryLabel={i18n.EMPTY_ACTION_PRIMARY}
+      actionPrimaryUrl={`${basePath}/app/kibana#/home/tutorial_directory/siem`}
+      actionSecondaryIcon="popout"
+      actionSecondaryLabel={i18n.EMPTY_ACTION_SECONDARY}
+      actionSecondaryTarget="_blank"
+      actionSecondaryUrl={docLinks.links.siem}
+      data-test-subj="empty-page"
+      title={i18n.EMPTY_TITLE}
+    />
+  );
+});
 
 HostsEmptyPage.displayName = 'HostsEmptyPage';
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
index d6e76deb276bd..9c13fc4ac386e 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_tabs.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/hosts_tabs.tsx
@@ -20,6 +20,7 @@ import {
   UncommonProcessQueryTabBody,
   EventsQueryTabBody,
 } from './navigation';
+import { HostAlertsQueryTabBody } from './navigation/alerts_query_tab_body';
 
 const HostsTabs = memo<HostsTabsProps>(
   ({
@@ -80,6 +81,10 @@ const HostsTabs = memo<HostsTabsProps>(
           path={`${hostsPagePath}/:tabName(${HostsTableType.events})`}
           render={() => <EventsQueryTabBody {...tabProps} />}
         />
+        <Route
+          path={`${hostsPagePath}/:tabName(${HostsTableType.alerts})`}
+          render={() => <HostAlertsQueryTabBody {...tabProps} />}
+        />
       </Switch>
     );
   }
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 c8d450a62cc57..fff5c5218c003 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/index.tsx
@@ -21,14 +21,16 @@ const getHostsTabPath = (pagePath: string) =>
   `${HostsTableType.authentications}|` +
   `${HostsTableType.uncommonProcesses}|` +
   `${HostsTableType.anomalies}|` +
-  `${HostsTableType.events})`;
+  `${HostsTableType.events}|` +
+  `${HostsTableType.alerts})`;
 
 const getHostDetailsTabPath = (pagePath: string) =>
   `${hostDetailsPagePath}/:tabName(` +
   `${HostsTableType.authentications}|` +
   `${HostsTableType.uncommonProcesses}|` +
   `${HostsTableType.anomalies}|` +
-  `${HostsTableType.events})`;
+  `${HostsTableType.events}|` +
+  `${HostsTableType.alerts})`;
 
 type Props = Partial<RouteComponentProps<{}>> & { url: string };
 
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/nav_tabs.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/nav_tabs.tsx
index 0756efe1f9b6e..4109feff099e0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/nav_tabs.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/nav_tabs.tsx
@@ -49,6 +49,13 @@ export const navTabsHosts = (hasMlUserPermissions: boolean): HostsNavTab => {
       disabled: false,
       urlKey: 'host',
     },
+    [HostsTableType.alerts]: {
+      id: HostsTableType.alerts,
+      name: i18n.NAVIGATION_ALERTS_TITLE,
+      href: getTabsOnHostsUrl(HostsTableType.alerts),
+      disabled: false,
+      urlKey: 'host',
+    },
   };
 
   return hasMlUserPermissions ? hostsNavTabs : omit([HostsTableType.anomalies], hostsNavTabs);
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/alerts_query_tab_body.tsx b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/alerts_query_tab_body.tsx
new file mode 100644
index 0000000000000..b893acd4dbb3b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/alerts_query_tab_body.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useMemo } from 'react';
+
+import { esFilters } from '../../../../../../../../src/plugins/data/common/es_query';
+import { AlertsView } from '../../../components/alerts_viewer';
+import { AlertsComponentQueryProps } from './types';
+
+export const filterAlertsHosts: esFilters.Filter[] = [
+  {
+    query: {
+      bool: {
+        filter: [
+          {
+            bool: {
+              should: [
+                {
+                  exists: {
+                    field: 'host.name',
+                  },
+                },
+              ],
+              minimum_should_match: 1,
+            },
+          },
+        ],
+      },
+    },
+    meta: {
+      alias: '',
+      disabled: false,
+      key: 'bool',
+      negate: false,
+      type: 'custom',
+      value:
+        '{"query": {"bool": {"filter": [{"bool": {"should": [{"exists": {"field": "host.name"}}],"minimum_should_match": 1}}]}}}',
+    },
+  },
+];
+export const HostAlertsQueryTabBody = React.memo((alertsProps: AlertsComponentQueryProps) => {
+  const { pageFilters, ...rest } = alertsProps;
+  const hostPageFilters = useMemo(
+    () => (pageFilters != null ? [...filterAlertsHosts, ...pageFilters] : filterAlertsHosts),
+    [pageFilters]
+  );
+
+  return <AlertsView {...rest} pageFilters={hostPageFilters} />;
+});
+
+HostAlertsQueryTabBody.displayName = 'HostAlertsQueryTabBody';
diff --git a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/index.ts b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/index.ts
index f20138f520620..a93c4dfcbcef4 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/index.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/navigation/index.ts
@@ -8,3 +8,4 @@ export * from './authentications_query_tab_body';
 export * from './events_query_tab_body';
 export * from './hosts_query_tab_body';
 export * from './uncommon_process_query_tab_body';
+export * from './alerts_query_tab_body';
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 cfe7953f16cee..107b35edc7f7a 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
@@ -4,15 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IIndexPattern } from 'src/plugins/data/public';
+import { IIndexPattern } from '../../../../../../../../src/plugins/data/common/';
 import { NarrowDateRange } from '../../../components/ml/types';
-import { hostsModel } from '../../../store';
 import { ESTermQuery } from '../../../../common/typed_json';
 import { InspectQuery, Refetch } from '../../../store/inputs/model';
 
-import { HostsTableType } from '../../../store/hosts/model';
+import { HostsTableType, HostsType } from '../../../store/hosts/model';
 import { NavTab } from '../../../components/navigation/types';
 import { UpdateDateRange } from '../../../components/charts/common';
+import { esFilters } from '../../../../../../../../src/plugins/data/common/es_query';
 
 export type KeyHostsNavTabWithoutMlPermission = HostsTableType.hosts &
   HostsTableType.authentications &
@@ -37,8 +37,8 @@ export type SetQuery = ({
   refetch: Refetch;
 }) => void;
 
-interface QueryTabBodyProps {
-  type: hostsModel.HostsType;
+export interface QueryTabBodyProps {
+  type: HostsType;
   startDate: number;
   endDate: number;
   filterQuery?: string | ESTermQuery;
@@ -53,4 +53,9 @@ export type HostsComponentsQueryProps = QueryTabBodyProps & {
   narrowDateRange?: NarrowDateRange;
 };
 
+export type AlertsComponentQueryProps = HostsComponentsQueryProps & {
+  filterQuery: string;
+  pageFilters?: esFilters.Filter[];
+};
+
 export type CommonChildren = (args: HostsComponentsQueryProps) => JSX.Element;
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 1c95cbed71a4a..87617f6bc5f7f 100644
--- a/x-pack/legacy/plugins/siem/public/pages/hosts/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/hosts/translations.ts
@@ -46,6 +46,10 @@ export const NAVIGATION_EVENTS_TITLE = i18n.translate('xpack.siem.hosts.navigati
   defaultMessage: 'Events',
 });
 
+export const NAVIGATION_ALERTS_TITLE = i18n.translate('xpack.siem.hosts.navigation.alertsTitle', {
+  defaultMessage: 'Alerts',
+});
+
 export const EMPTY_TITLE = i18n.translate('xpack.siem.hosts.emptyTitle', {
   defaultMessage:
     'It looks like you don’t have any indices relevant to hosts in the SIEM application',
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/index.tsx b/x-pack/legacy/plugins/siem/public/pages/network/index.tsx
index 009a89bb3889f..1bc3d9a054bb8 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useContext } from 'react';
+import React, { useContext, useMemo } from 'react';
 import { Redirect, Route, Switch, RouteComponentProps } from 'react-router-dom';
 
 import { MlCapabilitiesContext } from '../../components/ml/permissions/ml_capabilities_provider';
@@ -24,6 +24,14 @@ const ipDetailsPagePath = `${networkPagePath}/ip/:detailName`;
 
 export const NetworkContainer = React.memo<Props>(() => {
   const capabilities = useContext(MlCapabilitiesContext);
+  const capabilitiesFetched = capabilities.capabilitiesFetched;
+  const userHasMlUserPermissions = useMemo(() => hasMlUserPermissions(capabilities), [
+    capabilities,
+  ]);
+  const networkRoutePath = useMemo(
+    () => getNetworkRoutePath(networkPagePath, capabilitiesFetched, userHasMlUserPermissions),
+    [capabilitiesFetched, userHasMlUserPermissions]
+  );
 
   return (
     <GlobalTime>
@@ -31,11 +39,7 @@ export const NetworkContainer = React.memo<Props>(() => {
         <Switch>
           <Route
             strict
-            path={getNetworkRoutePath(
-              networkPagePath,
-              capabilities.capabilitiesFetched,
-              hasMlUserPermissions(capabilities)
-            )}
+            path={networkRoutePath}
             render={() => (
               <Network
                 networkPagePath={networkPagePath}
@@ -45,7 +49,7 @@ export const NetworkContainer = React.memo<Props>(() => {
                 deleteQuery={deleteQuery}
                 isInitializing={isInitializing}
                 capabilitiesFetched={capabilities.capabilitiesFetched}
-                hasMlUserPermissions={hasMlUserPermissions(capabilities)}
+                hasMlUserPermissions={userHasMlUserPermissions}
               />
             )}
           />
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
index 72f7858847649..9a9d1cf085eb9 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/index.test.tsx
@@ -5,9 +5,8 @@
  */
 
 import { shallow } from 'enzyme';
-import toJson from 'enzyme-to-json';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Router } from 'react-router-dom';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { ActionCreator } from 'typescript-fsa';
@@ -16,28 +15,18 @@ import '../../../mock/match_media';
 
 import { mocksSource } from '../../../containers/source/mock';
 import { FlowTarget } from '../../../graphql/types';
-import { useKibanaCore } from '../../../lib/compose/kibana_core';
 import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../mock';
 import { useMountAppended } from '../../../utils/use_mount_appended';
-import { mockUiSettings } from '../../../mock/ui_settings';
 import { createStore, State } from '../../../store';
 import { InputsModelId } from '../../../store/inputs/constants';
 
 import { IPDetailsComponent, IPDetails } from './index';
 
-jest.mock('../../../lib/settings/use_kibana_ui_setting');
-
 type Action = 'PUSH' | 'POP' | 'REPLACE';
 const pop: Action = 'POP';
 
 type GlobalWithFetch = NodeJS.Global & { fetch: jest.Mock };
 
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-}));
-
 // 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 and QueryBar
 jest.mock('../../../components/search_bar', () => ({
@@ -106,12 +95,6 @@ const getMockProps = (ip: string) => ({
   setIpDetailsTablesActivePageToZero: (jest.fn() as unknown) as ActionCreator<null>,
 });
 
-jest.mock('ui/documentation_links', () => ({
-  documentationLinks: {
-    siem: 'http://www.example.com',
-  },
-}));
-
 describe('Ip Details', () => {
   const mount = useMountAppended();
 
@@ -145,7 +128,7 @@ describe('Ip Details', () => {
 
   test('it matches the snapshot', () => {
     const wrapper = shallow(<IPDetailsComponent {...getMockProps('123.456.78.90')} />);
-    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper).toMatchSnapshot();
   });
 
   test('it renders ipv6 headline', async () => {
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 75ca5a5dfe1a6..99ca12292a52c 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
@@ -24,7 +24,7 @@ import { WrapperPage } from '../../../components/wrapper_page';
 import { IpOverviewQuery } from '../../../containers/ip_overview';
 import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../../containers/source';
 import { FlowTargetSourceDest, LastEventIndexKey } from '../../../graphql/types';
-import { useKibanaCore } from '../../../lib/compose/kibana_core';
+import { useKibana } from '../../../lib/kibana';
 import { decodeIpv6 } from '../../../lib/helpers';
 import { convertToBuildEsQuery } from '../../../lib/keury';
 import { ConditionalFlexGroup } from '../../../pages/network/navigation/conditional_flex_group';
@@ -68,13 +68,13 @@ export const IPDetailsComponent = ({
         to: fromTo.to,
       });
     },
-    [scoreIntervalToDateTime, setAbsoluteRangeDatePicker]
+    [setAbsoluteRangeDatePicker]
   );
-  const core = useKibanaCore();
+  const kibana = useKibana();
 
   useEffect(() => {
     setIpDetailsTablesActivePageToZero(null);
-  }, [detailName]);
+  }, [detailName, setIpDetailsTablesActivePageToZero]);
 
   return (
     <>
@@ -82,7 +82,7 @@ export const IPDetailsComponent = ({
         {({ indicesExist, indexPattern }) => {
           const ip = decodeIpv6(detailName);
           const filterQuery = convertToBuildEsQuery({
-            config: esQuery.getEsQueryConfig(core.uiSettings),
+            config: esQuery.getEsQueryConfig(kibana.services.uiSettings),
             indexPattern,
             queries: [query],
             filters,
@@ -134,14 +134,7 @@ export const IPDetailsComponent = ({
                           setQuery={setQuery}
                           startDate={from}
                           endDate={to}
-                          narrowDateRange={(score, interval) => {
-                            const fromTo = scoreIntervalToDateTime(score, interval);
-                            setAbsoluteRangeDatePicker({
-                              id: 'global',
-                              from: fromTo.from,
-                              to: fromTo.to,
-                            });
-                          }}
+                          narrowDateRange={narrowDateRange}
                         />
                       )}
                     </AnomalyTableProvider>
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/utils.ts b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/utils.ts
index 222bf108b4fad..c265fb30a2439 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/ip_details/utils.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/network/ip_details/utils.ts
@@ -6,30 +6,50 @@
 
 import { Breadcrumb } from 'ui/chrome';
 
+import { get } from 'lodash/fp';
 import { decodeIpv6 } from '../../../lib/helpers';
-import { getNetworkUrl } from '../../../components/link_to/redirect_to_network';
+import { getNetworkUrl, getIPDetailsUrl } from '../../../components/link_to/redirect_to_network';
 import { networkModel } from '../../../store/network';
 import * as i18n from '../translations';
+import { NetworkRouteType } from '../navigation/types';
+import { NetworkRouteSpyState } from '../../../utils/route/types';
 
 export const type = networkModel.NetworkType.details;
+const TabNameMappedToI18nKey: Record<NetworkRouteType, string> = {
+  [NetworkRouteType.alerts]: i18n.NAVIGATION_ALERTS_TITLE,
+  [NetworkRouteType.anomalies]: i18n.NAVIGATION_ANOMALIES_TITLE,
+  [NetworkRouteType.flows]: i18n.NAVIGATION_FLOWS_TITLE,
+  [NetworkRouteType.dns]: i18n.NAVIGATION_DNS_TITLE,
+  [NetworkRouteType.http]: i18n.NAVIGATION_HTTP_TITLE,
+  [NetworkRouteType.tls]: i18n.NAVIGATION_TLS_TITLE,
+};
 
-export const getBreadcrumbs = (ip: string | undefined, search: string[]): Breadcrumb[] => {
-  const breadcrumbs = [
+export const getBreadcrumbs = (params: NetworkRouteSpyState, search: string[]): Breadcrumb[] => {
+  let breadcrumb = [
     {
       text: i18n.PAGE_TITLE,
       href: `${getNetworkUrl()}${search && search[0] ? search[0] : ''}`,
     },
   ];
-
-  if (ip) {
-    return [
-      ...breadcrumbs,
+  if (params.detailName != null) {
+    breadcrumb = [
+      ...breadcrumb,
       {
-        text: decodeIpv6(ip),
-        href: '',
+        text: decodeIpv6(params.detailName),
+        href: `${getIPDetailsUrl(params.detailName)}${search && search[1] ? search[1] : ''}`,
       },
     ];
-  } else {
-    return breadcrumbs;
   }
+
+  const tabName = get('tabName', params);
+  if (!tabName) return breadcrumb;
+
+  breadcrumb = [
+    ...breadcrumb,
+    {
+      text: TabNameMappedToI18nKey[tabName],
+      href: '',
+    },
+  ];
+  return breadcrumb;
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/navigation/alerts_query_tab_body.tsx b/x-pack/legacy/plugins/siem/public/pages/network/navigation/alerts_query_tab_body.tsx
new file mode 100644
index 0000000000000..3eeabd3007afa
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/pages/network/navigation/alerts_query_tab_body.tsx
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import { esFilters } from '../../../../../../../../src/plugins/data/common/es_query';
+import { AlertsView } from '../../../components/alerts_viewer';
+import { NetworkComponentQueryProps } from './types';
+
+export const filterAlertsNetwork: esFilters.Filter[] = [
+  {
+    query: {
+      bool: {
+        filter: [
+          {
+            bool: {
+              should: [
+                {
+                  bool: {
+                    should: [
+                      {
+                        exists: {
+                          field: 'source.ip',
+                        },
+                      },
+                    ],
+                    minimum_should_match: 1,
+                  },
+                },
+                {
+                  bool: {
+                    should: [
+                      {
+                        exists: {
+                          field: 'destination.ip',
+                        },
+                      },
+                    ],
+                    minimum_should_match: 1,
+                  },
+                },
+              ],
+              minimum_should_match: 1,
+            },
+          },
+        ],
+      },
+    },
+    meta: {
+      alias: '',
+      disabled: false,
+      key: 'bool',
+      negate: false,
+      type: 'custom',
+      value:
+        '{"bool":{"filter":[{"bool":{"should":[{"bool":{"should":[{"exists":{"field": "source.ip"}}],"minimum_should_match":1}},{"bool":{"should":[{"exists":{"field": "destination.ip"}}],"minimum_should_match":1}}],"minimum_should_match":1}}]}}',
+    },
+  },
+];
+
+export const NetworkAlertsQueryTabBody = React.memo((alertsProps: NetworkComponentQueryProps) => (
+  <AlertsView {...alertsProps} pageFilters={filterAlertsNetwork} />
+));
+
+NetworkAlertsQueryTabBody.displayName = 'NetworkAlertsQueryTabBody';
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 fbf137df39872..61f1a5aacb9c0 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
@@ -47,6 +47,13 @@ export const navTabsNetwork = (hasMlUserPermissions: boolean): NetworkNavTab =>
       disabled: false,
       urlKey: 'network',
     },
+    [NetworkRouteType.alerts]: {
+      id: NetworkRouteType.alerts,
+      name: i18n.NAVIGATION_ALERTS_TITLE,
+      href: getTabsOnNetworkUrl(NetworkRouteType.alerts),
+      disabled: false,
+      urlKey: 'network',
+    },
   };
 
   return hasMlUserPermissions ? networkNavTabs : omit([NetworkRouteType.anomalies], networkNavTabs);
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 681e1f8e1e34d..acc5d02299f1f 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
@@ -21,6 +21,7 @@ import { ConditionalFlexGroup } from './conditional_flex_group';
 import { NetworkRoutesProps, NetworkRouteType } from './types';
 import { TlsQueryTabBody } from './tls_query_tab_body';
 import { Anomaly } from '../../../components/ml/types';
+import { NetworkAlertsQueryTabBody } from './alerts_query_tab_body';
 
 export const NetworkRoutes = ({
   networkPagePath,
@@ -42,13 +43,13 @@ export const NetworkRoutes = ({
         to: fromTo.to,
       });
     },
-    [scoreIntervalToDateTime, setAbsoluteRangeDatePicker]
+    [setAbsoluteRangeDatePicker]
   );
   const updateDateRange = useCallback(
     (min: number, max: number) => {
       setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
     },
-    [from, to]
+    [setAbsoluteRangeDatePicker]
   );
 
   const networkAnomaliesFilterQuery = {
@@ -143,6 +144,10 @@ export const NetworkRoutes = ({
           />
         )}
       />
+      <Route
+        path={`${networkPagePath}/:tabName(${NetworkRouteType.alerts})`}
+        render={() => <NetworkAlertsQueryTabBody {...tabProps} />}
+      />
     </Switch>
   );
 };
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 b8ad8877bf3c1..b6063a81f31f6 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
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IIndexPattern } from 'src/plugins/data/public';
+import { IIndexPattern } from '../../../../../../../../src/plugins/data/common/';
 
 import { NavTab } from '../../../components/navigation/types';
 import { FlowTargetSourceDest } from '../../../graphql/types';
@@ -52,7 +52,9 @@ export type NetworkRoutesProps = GlobalTimeArgs & {
 
 export type KeyNetworkNavTabWithoutMlPermission = NetworkRouteType.dns &
   NetworkRouteType.flows &
-  NetworkRouteType.tls;
+  NetworkRouteType.http &
+  NetworkRouteType.tls &
+  NetworkRouteType.alerts;
 
 type KeyNetworkNavTabWithMlPermission = KeyNetworkNavTabWithoutMlPermission &
   NetworkRouteType.anomalies;
@@ -67,6 +69,7 @@ export enum NetworkRouteType {
   anomalies = 'anomalies',
   tls = 'tls',
   http = 'http',
+  alerts = 'alerts',
 }
 
 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 059949bf51837..24c2011fd3800 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.http}|${NetworkRouteType.tls})`;
+    return `${pagePath}/:tabName(${NetworkRouteType.flows}|${NetworkRouteType.dns}|${NetworkRouteType.http}|${NetworkRouteType.tls}|${NetworkRouteType.alerts})`;
   }
 
   return (
@@ -21,6 +21,7 @@ export const getNetworkRoutePath: GetNetworkRoutePath = (
     `${NetworkRouteType.dns}|` +
     `${NetworkRouteType.anomalies}|` +
     `${NetworkRouteType.http}|` +
-    `${NetworkRouteType.tls})`
+    `${NetworkRouteType.tls}|` +
+    `${NetworkRouteType.alerts})`
   );
 };
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx b/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
index 327b0fb4c1e5b..3a22e800d893f 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/network.test.tsx
@@ -6,31 +6,18 @@
 
 import { mount } from 'enzyme';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { Router } from 'react-router-dom';
 import { MockedProvider } from 'react-apollo/test-utils';
 
 import '../../mock/match_media';
-
+import { esFilters } from '../../../../../../../src/plugins/data/common/es_query';
 import { mocksSource } from '../../containers/source/mock';
-import { useKibanaCore } from '../../lib/compose/kibana_core';
-import { TestProviders } from '../../mock';
-import { mockUiSettings } from '../../mock/ui_settings';
+import { TestProviders, mockGlobalState, apolloClientObservable } from '../../mock';
+import { State, createStore } from '../../store';
+import { inputsActions } from '../../store/inputs';
 import { Network } from './network';
-
-jest.mock('../../lib/settings/use_kibana_ui_setting');
-
-jest.mock('ui/documentation_links', () => ({
-  documentationLinks: {
-    kibana: 'http://www.example.com',
-  },
-}));
-
-const mockUseKibanaCore = useKibanaCore as jest.Mock;
-jest.mock('../../lib/compose/kibana_core');
-mockUseKibanaCore.mockImplementation(() => ({
-  uiSettings: mockUiSettings,
-}));
+import { NetworkRoutes } from './navigation';
 
 // 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 and QueryBar
@@ -127,4 +114,58 @@ describe('rendering - rendering', () => {
     wrapper.update();
     expect(wrapper.find('[data-test-subj="empty-page"]').exists()).toBe(false);
   });
+
+  test('it should add the new filters after init', async () => {
+    const newFilters: esFilters.Filter[] = [
+      {
+        query: {
+          bool: {
+            filter: [
+              {
+                bool: {
+                  should: [
+                    {
+                      match_phrase: {
+                        'host.name': 'ItRocks',
+                      },
+                    },
+                  ],
+                  minimum_should_match: 1,
+                },
+              },
+            ],
+          },
+        },
+        meta: {
+          alias: '',
+          disabled: false,
+          key: 'bool',
+          negate: false,
+          type: 'custom',
+          value:
+            '{"query": {"bool": {"filter": [{"bool": {"should": [{"match_phrase": {"host.name": "ItRocks"}}],"minimum_should_match": 1}}]}}}',
+        },
+      },
+    ];
+    localSource[0].result.data.source.status.indicesExist = true;
+    const myState: State = mockGlobalState;
+    const myStore = createStore(myState, apolloClientObservable);
+    const wrapper = mount(
+      <TestProviders store={myStore}>
+        <MockedProvider mocks={localSource} addTypename={false}>
+          <Router history={mockHistory}>
+            <Network {...getMockProps()} />
+          </Router>
+        </MockedProvider>
+      </TestProviders>
+    );
+    await new Promise(resolve => setTimeout(resolve));
+    wrapper.update();
+
+    myStore.dispatch(inputsActions.setSearchBarFilter({ id: 'global', filters: newFilters }));
+    wrapper.update();
+    expect(wrapper.find(NetworkRoutes).props().filterQuery).toEqual(
+      '{"bool":{"must":[],"filter":[{"match_all":{}},{"bool":{"filter":[{"bool":{"should":[{"match_phrase":{"host.name":"ItRocks"}}],"minimum_should_match":1}}]}}],"should":[],"must_not":[]}}'
+    );
+  });
 });
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 aa7572e5741bd..ad3513a6f529e 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/network.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/network.tsx
@@ -5,10 +5,12 @@
  */
 
 import { EuiSpacer } from '@elastic/eui';
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { connect } from 'react-redux';
+import { useParams } from 'react-router-dom';
 import { StickyContainer } from 'react-sticky';
 
+import { esQuery } from '../../../../../../../src/plugins/data/public';
 import { EmbeddedMap } from '../../components/embeddables/embedded_map';
 import { FiltersGlobal } from '../../components/filters_global';
 import { HeaderPage } from '../../components/header_page';
@@ -21,16 +23,17 @@ import { WrapperPage } from '../../components/wrapper_page';
 import { KpiNetworkQuery } from '../../containers/kpi_network';
 import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../containers/source';
 import { LastEventIndexKey } from '../../graphql/types';
-import { useKibanaCore } from '../../lib/compose/kibana_core';
+import { useKibana } from '../../lib/kibana';
 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 { filterAlertsNetwork } from './navigation/alerts_query_tab_body';
 import { NetworkEmptyPage } from './network_empty_page';
 import * as i18n from './translations';
 import { NetworkComponentProps } from './types';
-import { esQuery } from '../../../../../../../src/plugins/data/public';
+import { NetworkRouteType } from './navigation/types';
 
 const KpiNetworkComponentManage = manageQuery(KpiNetworkComponent);
 const sourceId = 'default';
@@ -48,17 +51,32 @@ const NetworkComponent = React.memo<NetworkComponentProps>(
     hasMlUserPermissions,
     capabilitiesFetched,
   }) => {
-    const core = useKibanaCore();
+    const kibana = useKibana();
+    const { tabName } = useParams();
+
+    const networkFilters = useMemo(() => {
+      if (tabName === NetworkRouteType.alerts) {
+        return filters.length > 0 ? [...filters, ...filterAlertsNetwork] : filterAlertsNetwork;
+      }
+      return filters;
+    }, [tabName, filters]);
+
+    const narrowDateRange = useCallback(
+      (min: number, max: number) => {
+        setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
+      },
+      [setAbsoluteRangeDatePicker]
+    );
 
     return (
       <>
         <WithSource sourceId={sourceId}>
           {({ indicesExist, indexPattern }) => {
             const filterQuery = convertToBuildEsQuery({
-              config: esQuery.getEsQueryConfig(core.uiSettings),
+              config: esQuery.getEsQueryConfig(kibana.services.uiSettings),
               indexPattern,
               queries: [query],
-              filters,
+              filters: networkFilters,
             });
 
             return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
@@ -101,9 +119,7 @@ const NetworkComponent = React.memo<NetworkComponentProps>(
                         loading={loading}
                         from={from}
                         to={to}
-                        narrowDateRange={(min: number, max: number) => {
-                          setAbsoluteRangeDatePicker({ id: 'global', from: min, to: max });
-                        }}
+                        narrowDateRange={narrowDateRange}
                       />
                     )}
                   </KpiNetworkQuery>
diff --git a/x-pack/legacy/plugins/siem/public/pages/network/network_empty_page.tsx b/x-pack/legacy/plugins/siem/public/pages/network/network_empty_page.tsx
index 34e7f49bd9bd5..e22802fd29d49 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/network_empty_page.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/network/network_empty_page.tsx
@@ -6,26 +6,29 @@
 
 import React from 'react';
 import chrome from 'ui/chrome';
-import { documentationLinks } from 'ui/documentation_links';
 
+import { useKibana } from '../../lib/kibana';
 import { EmptyPage } from '../../components/empty_page';
-
 import * as i18n from './translations';
 
 const basePath = chrome.getBasePath();
 
-export const NetworkEmptyPage = React.memo(() => (
-  <EmptyPage
-    actionPrimaryIcon="gear"
-    actionPrimaryLabel={i18n.EMPTY_ACTION_PRIMARY}
-    actionPrimaryUrl={`${basePath}/app/kibana#/home/tutorial_directory/siem`}
-    actionSecondaryIcon="popout"
-    actionSecondaryLabel={i18n.EMPTY_ACTION_SECONDARY}
-    actionSecondaryTarget="_blank"
-    actionSecondaryUrl={documentationLinks.siem}
-    data-test-subj="empty-page"
-    title={i18n.EMPTY_TITLE}
-  />
-));
+export const NetworkEmptyPage = React.memo(() => {
+  const docLinks = useKibana().services.docLinks;
+
+  return (
+    <EmptyPage
+      actionPrimaryIcon="gear"
+      actionPrimaryLabel={i18n.EMPTY_ACTION_PRIMARY}
+      actionPrimaryUrl={`${basePath}/app/kibana#/home/tutorial_directory/siem`}
+      actionSecondaryIcon="popout"
+      actionSecondaryLabel={i18n.EMPTY_ACTION_SECONDARY}
+      actionSecondaryTarget="_blank"
+      actionSecondaryUrl={docLinks.links.siem}
+      data-test-subj="empty-page"
+      title={i18n.EMPTY_TITLE}
+    />
+  );
+});
 
 NetworkEmptyPage.displayName = 'NetworkEmptyPage';
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 be222bf5f2531..91c3338ff7903 100644
--- a/x-pack/legacy/plugins/siem/public/pages/network/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/network/translations.ts
@@ -49,3 +49,7 @@ export const NAVIGATION_ANOMALIES_TITLE = i18n.translate(
     defaultMessage: 'Anomalies',
   }
 );
+
+export const NAVIGATION_ALERTS_TITLE = i18n.translate('xpack.siem.network.navigation.alertsTitle', {
+  defaultMessage: 'Alerts',
+});
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx
index 833030e0dc8a1..eff61bf6a9710 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/overview.test.tsx
@@ -6,21 +6,13 @@
 
 import { mount } from 'enzyme';
 import { cloneDeep } from 'lodash/fp';
-import * as React from 'react';
+import React from 'react';
 import { MockedProvider } from 'react-apollo/test-utils';
 import { MemoryRouter } from 'react-router-dom';
 
-import { Overview } from './index';
-
-import '../../mock/ui_settings';
-import { mocksSource } from '../../containers/source/mock';
 import { TestProviders } from '../../mock';
-
-jest.mock('ui/documentation_links', () => ({
-  documentationLinks: {
-    kibana: 'http://www.example.com',
-  },
-}));
+import { mocksSource } from '../../containers/source/mock';
+import { Overview } from './index';
 
 let localSource: Array<{
   request: {};
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/overview.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/overview.tsx
index de976b1a5c5a3..a0e94431054cc 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/overview.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/overview.tsx
@@ -8,8 +8,8 @@ import { EuiFlexGroup } from '@elastic/eui';
 import moment from 'moment';
 import React from 'react';
 import chrome from 'ui/chrome';
-import { documentationLinks } from 'ui/documentation_links';
 
+import { useKibana } from '../../lib/kibana';
 import { EmptyPage } from '../../components/empty_page';
 import { HeaderPage } from '../../components/header_page';
 import { OverviewHost } from '../../components/page/overview/overview_host';
@@ -24,6 +24,7 @@ import * as i18n from './translations';
 const basePath = chrome.getBasePath();
 
 export const OverviewComponent = React.memo(() => {
+  const docLinks = useKibana().services.docLinks;
   const dateEnd = Date.now();
   const dateRange = moment.duration(24, 'hours').asMilliseconds();
   const dateStart = dateEnd - dateRange;
@@ -62,7 +63,7 @@ export const OverviewComponent = React.memo(() => {
                 actionSecondaryIcon="popout"
                 actionSecondaryLabel={i18n.EMPTY_ACTION_SECONDARY}
                 actionSecondaryTarget="_blank"
-                actionSecondaryUrl={documentationLinks.siem}
+                actionSecondaryUrl={docLinks.links.siem}
                 data-test-subj="empty-page"
                 title={i18n.EMPTY_TITLE}
               />
diff --git a/x-pack/legacy/plugins/siem/public/pages/overview/summary.tsx b/x-pack/legacy/plugins/siem/public/pages/overview/summary.tsx
index 7fd8f84129d89..51cfcbe9374ab 100644
--- a/x-pack/legacy/plugins/siem/public/pages/overview/summary.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/overview/summary.tsx
@@ -4,73 +4,81 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import React from 'react';
 import { EuiFlexItem, EuiLink, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import React from 'react';
-import { documentationLinks } from 'ui/documentation_links';
 
-export const Summary = React.memo(() => (
-  <EuiFlexItem>
-    <EuiText>
-      <h2>
-        <FormattedMessage id="xpack.siem.overview.startedTitle" defaultMessage="Getting started" />
-      </h2>
+import { useKibana } from '../../lib/kibana';
+
+export const Summary = React.memo(() => {
+  const docLinks = useKibana().services.docLinks;
+
+  return (
+    <EuiFlexItem>
+      <EuiText>
+        <h2>
+          <FormattedMessage
+            id="xpack.siem.overview.startedTitle"
+            defaultMessage="Getting started"
+          />
+        </h2>
 
-      <p>
-        <FormattedMessage
-          id="xpack.siem.overview.startedText"
-          defaultMessage="Welcome to Security Information &amp; Event Management (SIEM). Get started by reviewing our {docs} or {data}. For information about upcoming features and tutorials, be sure to check out our {siemSolution} page."
-          values={{
-            docs: (
-              <EuiLink href={documentationLinks.siem} target="blank">
-                <FormattedMessage
-                  id="xpack.siem.overview.startedText.docsLinkText"
-                  defaultMessage="documentation"
-                />
-              </EuiLink>
-            ),
-            data: (
-              <EuiLink href="kibana#home/tutorial_directory/siem">
-                <FormattedMessage
-                  id="xpack.siem.overview.startedText.dataLinkText"
-                  defaultMessage="ingesting data"
-                />
-              </EuiLink>
-            ),
-            siemSolution: (
-              <EuiLink href="https://www.elastic.co/solutions/siem" target="blank">
-                <FormattedMessage
-                  id="xpack.siem.overview.startedText.siemSolutionLinkText"
-                  defaultMessage="SIEM solution"
-                />
-              </EuiLink>
-            ),
-          }}
-        />
-      </p>
+        <p>
+          <FormattedMessage
+            id="xpack.siem.overview.startedText"
+            defaultMessage="Welcome to Security Information &amp; Event Management (SIEM). Get started by reviewing our {docs} or {data}. For information about upcoming features and tutorials, be sure to check out our {siemSolution} page."
+            values={{
+              docs: (
+                <EuiLink href={docLinks.links.siem} target="blank">
+                  <FormattedMessage
+                    id="xpack.siem.overview.startedText.docsLinkText"
+                    defaultMessage="documentation"
+                  />
+                </EuiLink>
+              ),
+              data: (
+                <EuiLink href="kibana#home/tutorial_directory/siem">
+                  <FormattedMessage
+                    id="xpack.siem.overview.startedText.dataLinkText"
+                    defaultMessage="ingesting data"
+                  />
+                </EuiLink>
+              ),
+              siemSolution: (
+                <EuiLink href="https://www.elastic.co/solutions/siem" target="blank">
+                  <FormattedMessage
+                    id="xpack.siem.overview.startedText.siemSolutionLinkText"
+                    defaultMessage="SIEM solution"
+                  />
+                </EuiLink>
+              ),
+            }}
+          />
+        </p>
 
-      <h2>
-        <FormattedMessage id="xpack.siem.overview.feedbackTitle" defaultMessage="Feedback" />
-      </h2>
+        <h2>
+          <FormattedMessage id="xpack.siem.overview.feedbackTitle" defaultMessage="Feedback" />
+        </h2>
 
-      <p>
-        <FormattedMessage
-          id="xpack.siem.overview.feedbackText"
-          defaultMessage="If you have input or suggestions regarding your experience with Elastic SIEM, please feel free to {feedback}."
-          values={{
-            feedback: (
-              <EuiLink href="https://discuss.elastic.co/c/siem" target="blank">
-                <FormattedMessage
-                  id="xpack.siem.overview.feedbackText.feedbackLinkText"
-                  defaultMessage="submit feedback online"
-                />
-              </EuiLink>
-            ),
-          }}
-        />
-      </p>
-    </EuiText>
-  </EuiFlexItem>
-));
+        <p>
+          <FormattedMessage
+            id="xpack.siem.overview.feedbackText"
+            defaultMessage="If you have input or suggestions regarding your experience with Elastic SIEM, please feel free to {feedback}."
+            values={{
+              feedback: (
+                <EuiLink href="https://discuss.elastic.co/c/siem" target="blank">
+                  <FormattedMessage
+                    id="xpack.siem.overview.feedbackText.feedbackLinkText"
+                    defaultMessage="submit feedback online"
+                  />
+                </EuiLink>
+              ),
+            }}
+          />
+        </p>
+      </EuiText>
+    </EuiFlexItem>
+  );
+});
 
 Summary.displayName = 'Summary';
diff --git a/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx b/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx
index 93c8397e21431..86f702a8ad8a4 100644
--- a/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/timelines/timelines_page.tsx
@@ -15,9 +15,8 @@ import { SpyRoute } from '../../utils/route/spy_routes';
 import * as i18n from './translations';
 
 const TimelinesContainer = styled.div`
-  width: 100%:
+  width: 100%;
 `;
-TimelinesContainer.displayName = 'TimelinesContainer';
 
 interface TimelinesProps<TCache = object> {
   apolloClient: ApolloClient<TCache>;
@@ -27,7 +26,7 @@ type OwnProps = TimelinesProps;
 
 export const DEFAULT_SEARCH_RESULTS_PER_PAGE = 10;
 
-export const TimelinesPage = React.memo<OwnProps>(({ apolloClient }) => (
+const TimelinesPageComponent: React.FC<OwnProps> = ({ apolloClient }) => (
   <>
     <WrapperPage>
       <HeaderPage border title={i18n.PAGE_TITLE} />
@@ -44,4 +43,6 @@ export const TimelinesPage = React.memo<OwnProps>(({ apolloClient }) => (
 
     <SpyRoute />
   </>
-));
+);
+
+export const TimelinesPage = React.memo(TimelinesPageComponent);
diff --git a/x-pack/legacy/plugins/siem/public/plugin.tsx b/x-pack/legacy/plugins/siem/public/plugin.tsx
new file mode 100644
index 0000000000000..44624f497a91b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/plugin.tsx
@@ -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 {
+  AppMountParameters,
+  CoreSetup,
+  CoreStart,
+  PluginInitializerContext,
+  Plugin as IPlugin,
+} from '../../../../../src/core/public';
+import { HomePublicPluginSetup } from '../../../../../src/plugins/home/public';
+import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+import { IEmbeddableStart } from '../../../../../src/plugins/embeddable/public';
+import { Start as InspectorStart } from '../../../../../src/plugins/inspector/public';
+import { IUiActionsStart } from '../../../../../src/plugins/ui_actions/public';
+
+export { AppMountParameters, CoreSetup, CoreStart, PluginInitializerContext };
+
+export interface SetupPlugins {
+  home: HomePublicPluginSetup;
+}
+export interface StartPlugins {
+  data: DataPublicPluginStart;
+  embeddable: IEmbeddableStart;
+  inspector: InspectorStart;
+  uiActions: IUiActionsStart;
+}
+export type StartServices = CoreStart & StartPlugins;
+
+export type Setup = ReturnType<Plugin['setup']>;
+export type Start = ReturnType<Plugin['start']>;
+
+export class Plugin implements IPlugin<Setup, Start> {
+  public id = 'siem';
+  public name = 'SIEM';
+  constructor(
+    // @ts-ignore this is added to satisfy the New Platform typing constraint,
+    // but we're not leveraging any of its functionality yet.
+    private readonly initializerContext: PluginInitializerContext
+  ) {}
+
+  public setup(core: CoreSetup, plugins: SetupPlugins) {
+    core.application.register({
+      id: this.id,
+      title: this.name,
+      async mount(context, params) {
+        const [coreStart, pluginsStart] = await core.getStartServices();
+        const { renderApp } = await import('./app');
+
+        return renderApp(coreStart, pluginsStart as StartPlugins, params);
+      },
+    });
+
+    return {};
+  }
+
+  public start(core: CoreStart, plugins: StartPlugins) {
+    return {};
+  }
+
+  public stop() {
+    return {};
+  }
+}
diff --git a/x-pack/legacy/plugins/siem/public/register_feature.ts b/x-pack/legacy/plugins/siem/public/register_feature.ts
index 36c4e28dbd874..ca7a22408b6ff 100644
--- a/x-pack/legacy/plugins/siem/public/register_feature.ts
+++ b/x-pack/legacy/plugins/siem/public/register_feature.ts
@@ -4,19 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  FeatureCatalogueCategory,
-  FeatureCatalogueRegistryProvider,
-} from 'ui/registry/feature_catalogue';
+import { npSetup } from 'ui/new_platform';
+import { FeatureCatalogueCategory } from '../../../../../src/plugins/home/public';
+import { APP_ID } from '../common/constants';
 
-const APP_ID = 'siem';
-
-FeatureCatalogueRegistryProvider.register(() => ({
-  id: 'siem',
+// TODO(rylnd): move this into Plugin.setup once we're on NP
+npSetup.plugins.home.featureCatalogue.register({
+  id: APP_ID,
   title: 'SIEM',
   description: 'Explore security metrics and logs for events and alerts',
   icon: 'securityAnalyticsApp',
   path: `/app/${APP_ID}`,
   showOnHomePage: true,
   category: FeatureCatalogueCategory.DATA,
-}));
+});
diff --git a/x-pack/legacy/plugins/siem/public/routes.tsx b/x-pack/legacy/plugins/siem/public/routes.tsx
index 0e9bcf5dc5bfa..cbb58a473e8ea 100644
--- a/x-pack/legacy/plugins/siem/public/routes.tsx
+++ b/x-pack/legacy/plugins/siem/public/routes.tsx
@@ -16,7 +16,7 @@ interface RouterProps {
   history: History;
 }
 
-export const PageRouter: FC<RouterProps> = memo(({ history }) => (
+const PageRouterComponent: FC<RouterProps> = ({ history }) => (
   <ManageRoutesSpy>
     <Router history={history}>
       <Switch>
@@ -25,4 +25,6 @@ export const PageRouter: FC<RouterProps> = memo(({ history }) => (
       </Switch>
     </Router>
   </ManageRoutesSpy>
-));
+);
+
+export const PageRouter = memo(PageRouterComponent);
diff --git a/x-pack/legacy/plugins/siem/public/store/hosts/helpers.test.ts b/x-pack/legacy/plugins/siem/public/store/hosts/helpers.test.ts
index 8721121295aad..a4eddb31b3e31 100644
--- a/x-pack/legacy/plugins/siem/public/store/hosts/helpers.test.ts
+++ b/x-pack/legacy/plugins/siem/public/store/hosts/helpers.test.ts
@@ -31,6 +31,10 @@ export const mockHostsState: HostsModel = {
         limit: DEFAULT_TABLE_LIMIT,
       },
       [HostsTableType.anomalies]: null,
+      [HostsTableType.alerts]: {
+        activePage: 4,
+        limit: DEFAULT_TABLE_LIMIT,
+      },
     },
   },
   details: {
@@ -54,6 +58,10 @@ export const mockHostsState: HostsModel = {
         limit: DEFAULT_TABLE_LIMIT,
       },
       [HostsTableType.anomalies]: null,
+      [HostsTableType.alerts]: {
+        activePage: 4,
+        limit: DEFAULT_TABLE_LIMIT,
+      },
     },
   },
 };
@@ -81,6 +89,10 @@ describe('Hosts redux store', () => {
           activePage: 0,
           limit: 10,
         },
+        alerts: {
+          activePage: 0,
+          limit: 10,
+        },
       });
     });
 
@@ -105,6 +117,10 @@ describe('Hosts redux store', () => {
           activePage: 0,
           limit: 10,
         },
+        alerts: {
+          activePage: 0,
+          limit: 10,
+        },
       });
     });
   });
diff --git a/x-pack/legacy/plugins/siem/public/store/hosts/helpers.ts b/x-pack/legacy/plugins/siem/public/store/hosts/helpers.ts
index 3e32dde465401..f6b5596b382f6 100644
--- a/x-pack/legacy/plugins/siem/public/store/hosts/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/store/hosts/helpers.ts
@@ -26,6 +26,10 @@ export const setHostPageQueriesActivePageToZero = (state: HostsModel): Queries =
     ...state.page.queries[HostsTableType.uncommonProcesses],
     activePage: DEFAULT_TABLE_ACTIVE_PAGE,
   },
+  [HostsTableType.alerts]: {
+    ...state.page.queries[HostsTableType.alerts],
+    activePage: DEFAULT_TABLE_ACTIVE_PAGE,
+  },
 });
 
 export const setHostDetailsQueriesActivePageToZero = (state: HostsModel): Queries => ({
@@ -46,6 +50,10 @@ export const setHostDetailsQueriesActivePageToZero = (state: HostsModel): Querie
     ...state.details.queries[HostsTableType.uncommonProcesses],
     activePage: DEFAULT_TABLE_ACTIVE_PAGE,
   },
+  [HostsTableType.alerts]: {
+    ...state.page.queries[HostsTableType.alerts],
+    activePage: DEFAULT_TABLE_ACTIVE_PAGE,
+  },
 });
 
 export const setHostsQueriesActivePageToZero = (state: HostsModel, type: HostsType): Queries => {
diff --git a/x-pack/legacy/plugins/siem/public/store/hosts/model.ts b/x-pack/legacy/plugins/siem/public/store/hosts/model.ts
index 8b21537292207..b3764224633b8 100644
--- a/x-pack/legacy/plugins/siem/public/store/hosts/model.ts
+++ b/x-pack/legacy/plugins/siem/public/store/hosts/model.ts
@@ -17,6 +17,7 @@ export enum HostsTableType {
   events = 'events',
   uncommonProcesses = 'uncommonProcesses',
   anomalies = 'anomalies',
+  alerts = 'alerts',
 }
 
 export interface BasicQueryPaginated {
@@ -35,6 +36,7 @@ export interface Queries {
   [HostsTableType.events]: BasicQueryPaginated;
   [HostsTableType.uncommonProcesses]: BasicQueryPaginated;
   [HostsTableType.anomalies]: null | undefined;
+  [HostsTableType.alerts]: BasicQueryPaginated;
 }
 
 export interface GenericHostsModel {
diff --git a/x-pack/legacy/plugins/siem/public/store/hosts/reducer.ts b/x-pack/legacy/plugins/siem/public/store/hosts/reducer.ts
index 11b0a985c5762..53fe9a3ea6a2c 100644
--- a/x-pack/legacy/plugins/siem/public/store/hosts/reducer.ts
+++ b/x-pack/legacy/plugins/siem/public/store/hosts/reducer.ts
@@ -46,6 +46,10 @@ export const initialHostsState: HostsState = {
         limit: DEFAULT_TABLE_LIMIT,
       },
       [HostsTableType.anomalies]: null,
+      [HostsTableType.alerts]: {
+        activePage: DEFAULT_TABLE_ACTIVE_PAGE,
+        limit: DEFAULT_TABLE_LIMIT,
+      },
     },
   },
   details: {
@@ -69,6 +73,10 @@ export const initialHostsState: HostsState = {
         limit: DEFAULT_TABLE_LIMIT,
       },
       [HostsTableType.anomalies]: null,
+      [HostsTableType.alerts]: {
+        activePage: DEFAULT_TABLE_ACTIVE_PAGE,
+        limit: DEFAULT_TABLE_LIMIT,
+      },
     },
   },
 };
diff --git a/x-pack/legacy/plugins/siem/public/store/hosts/selectors.ts b/x-pack/legacy/plugins/siem/public/store/hosts/selectors.ts
index 8ebeae4bba392..e50968db31f60 100644
--- a/x-pack/legacy/plugins/siem/public/store/hosts/selectors.ts
+++ b/x-pack/legacy/plugins/siem/public/store/hosts/selectors.ts
@@ -24,3 +24,6 @@ export const eventsSelector = () => createSelector(selectHosts, hosts => hosts.q
 
 export const uncommonProcessesSelector = () =>
   createSelector(selectHosts, hosts => hosts.queries.uncommonProcesses);
+
+export const alertsSelector = () =>
+  createSelector(selectHosts, hosts => hosts.queries[HostsTableType.alerts]);
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 a15e187b95e60..933c2f05a57ba 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
@@ -73,6 +73,10 @@ export const mockNetworkState: NetworkModel = {
         limit: DEFAULT_TABLE_LIMIT,
         sort: { direction: Direction.desc },
       },
+      [NetworkTableType.alerts]: {
+        activePage: 0,
+        limit: DEFAULT_TABLE_LIMIT,
+      },
     },
   },
   details: {
@@ -186,6 +190,10 @@ describe('Network redux store', () => {
             field: 'bytes_out',
           },
         },
+        [NetworkTableType.alerts]: {
+          activePage: 0,
+          limit: 10,
+        },
       });
     });
 
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 45c49d6598881..4ddfb84024970 100644
--- a/x-pack/legacy/plugins/siem/public/store/network/model.ts
+++ b/x-pack/legacy/plugins/siem/public/store/network/model.ts
@@ -19,6 +19,7 @@ export enum NetworkType {
 }
 
 export enum NetworkTableType {
+  alerts = 'alerts',
   dns = 'dns',
   http = 'http',
   topCountriesDestination = 'topCountriesDestination',
@@ -103,6 +104,7 @@ export interface NetworkQueries {
   [NetworkTableType.topNFlowDestination]: TopNFlowQuery;
   [NetworkTableType.topNFlowSource]: TopNFlowQuery;
   [NetworkTableType.tls]: TlsQuery;
+  [NetworkTableType.alerts]: BasicQueryPaginated;
 }
 
 export interface NetworkPageModel {
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 373bedb63c3e7..8e4d4555d3bd9 100644
--- a/x-pack/legacy/plugins/siem/public/store/network/reducer.ts
+++ b/x-pack/legacy/plugins/siem/public/store/network/reducer.ts
@@ -89,6 +89,10 @@ export const initialNetworkState: NetworkState = {
           direction: Direction.desc,
         },
       },
+      [NetworkTableType.alerts]: {
+        activePage: DEFAULT_TABLE_ACTIVE_PAGE,
+        limit: DEFAULT_TABLE_LIMIT,
+      },
     },
   },
   details: {
diff --git a/x-pack/legacy/plugins/siem/public/store/timeline/actions.ts b/x-pack/legacy/plugins/siem/public/store/timeline/actions.ts
index 931d3e26172cd..f8d23ac72e202 100644
--- a/x-pack/legacy/plugins/siem/public/store/timeline/actions.ts
+++ b/x-pack/legacy/plugins/siem/public/store/timeline/actions.ts
@@ -16,6 +16,7 @@ import {
 import { KueryFilterQuery, SerializedFilterQuery } from '../model';
 
 import { KqlMode, TimelineModel } from './model';
+import { TimelineNonEcsData } from '../../graphql/types';
 
 const actionCreator = actionCreatorFactory('x-pack/siem/local/timeline');
 
@@ -49,10 +50,21 @@ export const applyDeltaToColumnWidth = actionCreator<{
 
 export const createTimeline = actionCreator<{
   id: string;
+  dateRange?: {
+    start: number;
+    end: number;
+  };
+  filters?: esFilters.Filter[];
   columns: ColumnHeader[];
   itemsPerPage?: number;
+  kqlQuery?: {
+    filterQuery: SerializedFilterQuery | null;
+    filterQueryDraft: KueryFilterQuery | null;
+  };
   show?: boolean;
   sort?: Sort;
+  showCheckboxes?: boolean;
+  showRowRenderers?: boolean;
 }>('CREATE_TIMELINE');
 
 export const pinEvent = actionCreator<{ id: string; eventId: string }>('PIN_EVENT');
@@ -198,3 +210,34 @@ export const setFilters = actionCreator<{
   id: string;
   filters: esFilters.Filter[];
 }>('SET_TIMELINE_FILTERS');
+
+export const setSelected = actionCreator<{
+  id: string;
+  eventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
+  isSelected: boolean;
+  isSelectAllChecked: boolean;
+}>('SET_TIMELINE_SELECTED');
+
+export const clearSelected = actionCreator<{
+  id: string;
+}>('CLEAR_TIMELINE_SELECTED');
+
+export const setEventsLoading = actionCreator<{
+  id: string;
+  eventIds: string[];
+  isLoading: boolean;
+}>('SET_TIMELINE_EVENTS_LOADING');
+
+export const clearEventsLoading = actionCreator<{
+  id: string;
+}>('CLEAR_TIMELINE_EVENTS_LOADING');
+
+export const setEventsDeleted = actionCreator<{
+  id: string;
+  eventIds: string[];
+  isDeleted: boolean;
+}>('SET_TIMELINE_EVENTS_DELETED');
+
+export const clearEventsDeleted = actionCreator<{
+  id: string;
+}>('CLEAR_TIMELINE_EVENTS_DELETED');
diff --git a/x-pack/legacy/plugins/siem/public/store/timeline/epic.test.ts b/x-pack/legacy/plugins/siem/public/store/timeline/epic.test.ts
index c04da21e6bb23..6e62ce8cb8b06 100644
--- a/x-pack/legacy/plugins/siem/public/store/timeline/epic.test.ts
+++ b/x-pack/legacy/plugins/siem/public/store/timeline/epic.test.ts
@@ -85,6 +85,7 @@ describe('Epic Timeline', () => {
             ],
           },
         ],
+        deletedEventIds: [],
         description: '',
         eventIdToNoteIds: {},
         highlightedDropAndProviderId: '',
@@ -117,6 +118,7 @@ describe('Epic Timeline', () => {
         ],
         isFavorite: false,
         isLive: false,
+        isSelectAllChecked: false,
         isLoading: false,
         isSaving: false,
         itemsPerPage: 25,
@@ -130,13 +132,17 @@ describe('Epic Timeline', () => {
           },
           filterQueryDraft: { kind: 'kuery', expression: 'endgame.user_name : "zeus" ' },
         },
+        loadingEventIds: [],
         title: 'saved',
         noteIds: [],
         pinnedEventIds: {},
         pinnedEventsSaveObject: {},
         dateRange: { start: 1572469587644, end: 1572555987644 },
         savedObjectId: '11169110-fc22-11e9-8ca9-072f15ce2685',
+        selectedEventIds: {},
         show: true,
+        showCheckboxes: false,
+        showRowRenderers: true,
         sort: { columnId: '@timestamp', sortDirection: Direction.desc },
         width: 1100,
         version: 'WzM4LDFd',
diff --git a/x-pack/legacy/plugins/siem/public/store/timeline/helpers.ts b/x-pack/legacy/plugins/siem/public/store/timeline/helpers.ts
index 16ae53ade7969..1f79a38b9f5b7 100644
--- a/x-pack/legacy/plugins/siem/public/store/timeline/helpers.ts
+++ b/x-pack/legacy/plugins/siem/public/store/timeline/helpers.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getOr, omit, uniq, isEmpty, isEqualWith } from 'lodash/fp';
+import { getOr, omit, uniq, isEmpty, isEqualWith, union } from 'lodash/fp';
 
 import { esFilters } from '../../../../../../../src/plugins/data/public';
 import { ColumnHeader } from '../../components/timeline/body/column_headers/column_header';
@@ -19,6 +19,7 @@ import { KueryFilterQuery, SerializedFilterQuery } from '../model';
 
 import { KqlMode, timelineDefaults, TimelineModel } from './model';
 import { TimelineById, TimelineState } from './types';
+import { TimelineNonEcsData } from '../../graphql/types';
 
 const EMPTY_TIMELINE_BY_ID: TimelineById = {}; // stable reference
 
@@ -129,20 +130,36 @@ export const addTimelineToStore = ({
 
 interface AddNewTimelineParams {
   columns: ColumnHeader[];
+  dateRange?: {
+    start: number;
+    end: number;
+  };
+  filters?: esFilters.Filter[];
   id: string;
   itemsPerPage?: number;
+  kqlQuery?: {
+    filterQuery: SerializedFilterQuery | null;
+    filterQueryDraft: KueryFilterQuery | null;
+  };
   show?: boolean;
   sort?: Sort;
+  showCheckboxes?: boolean;
+  showRowRenderers?: boolean;
   timelineById: TimelineById;
 }
 
 /** Adds a new `Timeline` to the provided collection of `TimelineById` */
 export const addNewTimeline = ({
   columns,
+  dateRange = { start: 0, end: 0 },
+  filters = timelineDefaults.filters,
   id,
   itemsPerPage = timelineDefaults.itemsPerPage,
+  kqlQuery = { filterQuery: null, filterQueryDraft: null },
   sort = timelineDefaults.sort,
   show = false,
+  showCheckboxes = false,
+  showRowRenderers = true,
   timelineById,
 }: AddNewTimelineParams): TimelineById => ({
   ...timelineById,
@@ -150,13 +167,18 @@ export const addNewTimeline = ({
     id,
     ...timelineDefaults,
     columns,
+    dateRange,
+    filters,
     itemsPerPage,
+    kqlQuery,
     sort,
     show,
     savedObjectId: null,
     version: null,
     isSaving: false,
     isLoading: false,
+    showCheckboxes,
+    showRowRenderers,
   },
 });
 
@@ -1095,6 +1117,93 @@ export const removeTimelineProvider = ({
   };
 };
 
+interface SetDeletedTimelineEventsParams {
+  id: string;
+  eventIds: string[];
+  isDeleted: boolean;
+  timelineById: TimelineById;
+}
+
+export const setDeletedTimelineEvents = ({
+  id,
+  eventIds,
+  isDeleted,
+  timelineById,
+}: SetDeletedTimelineEventsParams): TimelineById => {
+  const timeline = timelineById[id];
+
+  const deletedEventIds = isDeleted
+    ? union(timeline.deletedEventIds, eventIds)
+    : timeline.deletedEventIds.filter(currentEventId => !eventIds.includes(currentEventId));
+
+  return {
+    ...timelineById,
+    [id]: {
+      ...timeline,
+      deletedEventIds,
+    },
+  };
+};
+
+interface SetLoadingTimelineEventsParams {
+  id: string;
+  eventIds: string[];
+  isLoading: boolean;
+  timelineById: TimelineById;
+}
+
+export const setLoadingTimelineEvents = ({
+  id,
+  eventIds,
+  isLoading,
+  timelineById,
+}: SetLoadingTimelineEventsParams): TimelineById => {
+  const timeline = timelineById[id];
+
+  const loadingEventIds = isLoading
+    ? union(timeline.loadingEventIds, eventIds)
+    : timeline.loadingEventIds.filter(currentEventId => !eventIds.includes(currentEventId));
+
+  return {
+    ...timelineById,
+    [id]: {
+      ...timeline,
+      loadingEventIds,
+    },
+  };
+};
+
+interface SetSelectedTimelineEventsParams {
+  id: string;
+  eventIds: Record<string, TimelineNonEcsData[]>;
+  isSelectAllChecked: boolean;
+  isSelected: boolean;
+  timelineById: TimelineById;
+}
+
+export const setSelectedTimelineEvents = ({
+  id,
+  eventIds,
+  isSelectAllChecked = false,
+  isSelected,
+  timelineById,
+}: SetSelectedTimelineEventsParams): TimelineById => {
+  const timeline = timelineById[id];
+
+  const selectedEventIds = isSelected
+    ? { ...timeline.selectedEventIds, ...eventIds }
+    : omit(Object.keys(eventIds), timeline.selectedEventIds);
+
+  return {
+    ...timelineById,
+    [id]: {
+      ...timeline,
+      selectedEventIds,
+      isSelectAllChecked,
+    },
+  };
+};
+
 interface UnPinTimelineEventParams {
   id: string;
   eventId: string;
diff --git a/x-pack/legacy/plugins/siem/public/store/timeline/model.ts b/x-pack/legacy/plugins/siem/public/store/timeline/model.ts
index 401edb73a0de8..517392857e4a6 100644
--- a/x-pack/legacy/plugins/siem/public/store/timeline/model.ts
+++ b/x-pack/legacy/plugins/siem/public/store/timeline/model.ts
@@ -10,7 +10,7 @@ import { DataProvider } from '../../components/timeline/data_providers/data_prov
 import { DEFAULT_TIMELINE_WIDTH } from '../../components/timeline/body/helpers';
 import { defaultHeaders } from '../../components/timeline/body/column_headers/default_headers';
 import { Sort } from '../../components/timeline/body/sort';
-import { Direction, PinnedEvent } from '../../graphql/types';
+import { Direction, PinnedEvent, TimelineNonEcsData } from '../../graphql/types';
 import { KueryFilterQuery, SerializedFilterQuery } from '../model';
 
 export const DEFAULT_PAGE_COUNT = 2; // Eui Pager will not render unless this is a minimum of 2 pages
@@ -21,6 +21,8 @@ export interface TimelineModel {
   columns: ColumnHeader[];
   /** The sources of the event data shown in the timeline */
   dataProviders: DataProvider[];
+  /** Events to not be rendered **/
+  deletedEventIds: string[];
   /** A summary of the events and notes in this timeline */
   description: string;
   /** A map of events in this timeline to the chronologically ordered notes (in this timeline) associated with the event */
@@ -32,6 +34,10 @@ export interface TimelineModel {
   highlightedDropAndProviderId: string;
   /** Uniquely identifies the timeline */
   id: string;
+  /** If selectAll checkbox in header is checked **/
+  isSelectAllChecked: boolean;
+  /** Events to be rendered as loading **/
+  loadingEventIds: string[];
   savedObjectId: string | null;
   /** When true, this timeline was marked as "favorite" by the user */
   isFavorite: boolean;
@@ -61,8 +67,14 @@ export interface TimelineModel {
     end: number;
   };
   savedQueryId?: string | null;
+  /** Events selected on this timeline -- eventId to TimelineNonEcsData[] mapping of data required for batch actions **/
+  selectedEventIds: Record<string, TimelineNonEcsData[]>;
   /** When true, show the timeline flyover */
   show: boolean;
+  /** When true, shows checkboxes enabling selection. Selected events store in selectedEventIds **/
+  showCheckboxes: boolean;
+  /** When true, shows additional rowRenderers below the PlainRowRenderer **/
+  showRowRenderers: boolean;
   /**  Specifies which column the timeline is sorted on, and the direction (ascending / descending) */
   sort: Sort;
   /** Persists the UI state (width) of the timeline flyover */
@@ -78,22 +90,28 @@ export type SubsetTimelineModel = Readonly<
     TimelineModel,
     | 'columns'
     | 'dataProviders'
+    | 'deletedEventIds'
     | 'description'
     | 'eventIdToNoteIds'
     | 'highlightedDropAndProviderId'
     | 'historyIds'
     | 'isFavorite'
     | 'isLive'
+    | 'isSelectAllChecked'
     | 'itemsPerPage'
     | 'itemsPerPageOptions'
     | 'kqlMode'
     | 'kqlQuery'
     | 'title'
+    | 'loadingEventIds'
     | 'noteIds'
     | 'pinnedEventIds'
     | 'pinnedEventsSaveObject'
     | 'dateRange'
+    | 'selectedEventIds'
     | 'show'
+    | 'showCheckboxes'
+    | 'showRowRenderers'
     | 'sort'
     | 'width'
     | 'isSaving'
@@ -106,6 +124,7 @@ export type SubsetTimelineModel = Readonly<
 export const timelineDefaults: SubsetTimelineModel & Pick<TimelineModel, 'filters'> = {
   columns: defaultHeaders,
   dataProviders: [],
+  deletedEventIds: [],
   description: '',
   eventIdToNoteIds: {},
   highlightedDropAndProviderId: '',
@@ -113,6 +132,7 @@ export const timelineDefaults: SubsetTimelineModel & Pick<TimelineModel, 'filter
   filters: [],
   isFavorite: false,
   isLive: false,
+  isSelectAllChecked: false,
   isLoading: false,
   isSaving: false,
   itemsPerPage: 25,
@@ -122,6 +142,7 @@ export const timelineDefaults: SubsetTimelineModel & Pick<TimelineModel, 'filter
     filterQuery: null,
     filterQueryDraft: null,
   },
+  loadingEventIds: [],
   title: '',
   noteIds: [],
   pinnedEventIds: {},
@@ -131,7 +152,10 @@ export const timelineDefaults: SubsetTimelineModel & Pick<TimelineModel, 'filter
     end: 0,
   },
   savedObjectId: null,
+  selectedEventIds: {},
   show: false,
+  showCheckboxes: false,
+  showRowRenderers: true,
   sort: {
     columnId: '@timestamp',
     sortDirection: Direction.desc,
diff --git a/x-pack/legacy/plugins/siem/public/store/timeline/reducer.test.ts b/x-pack/legacy/plugins/siem/public/store/timeline/reducer.test.ts
index 03c3393fc68bd..0b82bab3dbb8e 100644
--- a/x-pack/legacy/plugins/siem/public/store/timeline/reducer.test.ts
+++ b/x-pack/legacy/plugins/siem/public/store/timeline/reducer.test.ts
@@ -64,6 +64,7 @@ const timelineByIdMock: TimelineById = {
     ],
     columns: [],
     description: '',
+    deletedEventIds: [],
     eventIdToNoteIds: {},
     highlightedDropAndProviderId: '',
     historyIds: [],
@@ -71,11 +72,13 @@ const timelineByIdMock: TimelineById = {
     savedObjectId: null,
     isFavorite: false,
     isLive: false,
+    isSelectAllChecked: false,
     isLoading: false,
     itemsPerPage: 25,
     itemsPerPageOptions: [10, 25, 50],
     kqlMode: 'filter',
     kqlQuery: { filterQuery: null, filterQueryDraft: null },
+    loadingEventIds: [],
     title: '',
     noteIds: [],
     pinnedEventIds: {},
@@ -84,7 +87,10 @@ const timelineByIdMock: TimelineById = {
       start: 0,
       end: 0,
     },
+    selectedEventIds: {},
     show: true,
+    showCheckboxes: false,
+    showRowRenderers: true,
     sort: {
       columnId: '@timestamp',
       sortDirection: Direction.desc,
@@ -1087,22 +1093,28 @@ describe('Timeline', () => {
               },
             },
           ],
+          deletedEventIds: [],
           description: '',
           eventIdToNoteIds: {},
           highlightedDropAndProviderId: '',
           historyIds: [],
           isFavorite: false,
           isLive: false,
+          isSelectAllChecked: false,
           isLoading: false,
           kqlMode: 'filter',
           kqlQuery: { filterQuery: null, filterQueryDraft: null },
+          loadingEventIds: [],
           title: '',
           noteIds: [],
           dateRange: {
             start: 0,
             end: 0,
           },
+          selectedEventIds: {},
           show: true,
+          showRowRenderers: true,
+          showCheckboxes: false,
           sort: {
             columnId: '@timestamp',
             sortDirection: Direction.desc,
@@ -1174,21 +1186,27 @@ describe('Timeline', () => {
             },
           ],
           description: '',
+          deletedEventIds: [],
           eventIdToNoteIds: {},
           highlightedDropAndProviderId: '',
           historyIds: [],
           isFavorite: false,
           isLive: false,
+          isSelectAllChecked: false,
           isLoading: false,
           kqlMode: 'filter',
           kqlQuery: { filterQuery: null, filterQueryDraft: null },
+          loadingEventIds: [],
           title: '',
           noteIds: [],
           dateRange: {
             start: 0,
             end: 0,
           },
+          selectedEventIds: {},
           show: true,
+          showRowRenderers: true,
+          showCheckboxes: false,
           sort: {
             columnId: '@timestamp',
             sortDirection: Direction.desc,
@@ -1366,21 +1384,27 @@ describe('Timeline', () => {
             },
           ],
           description: '',
+          deletedEventIds: [],
           eventIdToNoteIds: {},
           highlightedDropAndProviderId: '',
           historyIds: [],
           isFavorite: false,
           isLive: false,
+          isSelectAllChecked: false,
           isLoading: false,
           kqlMode: 'filter',
           kqlQuery: { filterQuery: null, filterQueryDraft: null },
+          loadingEventIds: [],
           title: '',
           noteIds: [],
           dateRange: {
             start: 0,
             end: 0,
           },
+          selectedEventIds: {},
           show: true,
+          showRowRenderers: true,
+          showCheckboxes: false,
           sort: {
             columnId: '@timestamp',
             sortDirection: Direction.desc,
@@ -1452,21 +1476,27 @@ describe('Timeline', () => {
             },
           ],
           description: '',
+          deletedEventIds: [],
           eventIdToNoteIds: {},
           highlightedDropAndProviderId: '',
           historyIds: [],
           isFavorite: false,
           isLive: false,
+          isSelectAllChecked: false,
           isLoading: false,
           kqlMode: 'filter',
           kqlQuery: { filterQuery: null, filterQueryDraft: null },
+          loadingEventIds: [],
           title: '',
           noteIds: [],
           dateRange: {
             start: 0,
             end: 0,
           },
+          selectedEventIds: {},
           show: true,
+          showRowRenderers: true,
+          showCheckboxes: false,
           sort: {
             columnId: '@timestamp',
             sortDirection: Direction.desc,
@@ -1633,21 +1663,27 @@ describe('Timeline', () => {
             },
           ],
           description: '',
+          deletedEventIds: [],
           eventIdToNoteIds: {},
           highlightedDropAndProviderId: '',
           historyIds: [],
           isFavorite: false,
           isLive: false,
+          isSelectAllChecked: false,
           isLoading: false,
           kqlMode: 'filter',
           kqlQuery: { filterQuery: null, filterQueryDraft: null },
+          loadingEventIds: [],
           title: '',
           noteIds: [],
           dateRange: {
             start: 0,
             end: 0,
           },
+          selectedEventIds: {},
           show: true,
+          showRowRenderers: true,
+          showCheckboxes: false,
           sort: {
             columnId: '@timestamp',
             sortDirection: Direction.desc,
@@ -1701,23 +1737,29 @@ describe('Timeline', () => {
             },
           ],
           description: '',
+          deletedEventIds: [],
           eventIdToNoteIds: {},
           highlightedDropAndProviderId: '',
           historyIds: [],
           isFavorite: false,
           isLive: false,
+          isSelectAllChecked: false,
           isLoading: false,
           id: 'foo',
           savedObjectId: null,
           kqlMode: 'filter',
           kqlQuery: { filterQuery: null, filterQueryDraft: null },
+          loadingEventIds: [],
           title: '',
           noteIds: [],
           dateRange: {
             start: 0,
             end: 0,
           },
+          selectedEventIds: {},
           show: true,
+          showRowRenderers: true,
+          showCheckboxes: false,
           sort: {
             columnId: '@timestamp',
             sortDirection: Direction.desc,
@@ -1795,6 +1837,7 @@ describe('Timeline', () => {
             },
           ],
           description: '',
+          deletedEventIds: [],
           eventIdToNoteIds: {},
           highlightedDropAndProviderId: '',
           historyIds: [],
@@ -1802,16 +1845,21 @@ describe('Timeline', () => {
           savedObjectId: null,
           isFavorite: false,
           isLive: false,
+          isSelectAllChecked: false,
           isLoading: false,
           kqlMode: 'filter',
           kqlQuery: { filterQuery: null, filterQueryDraft: null },
+          loadingEventIds: [],
           title: '',
           noteIds: [],
           dateRange: {
             start: 0,
             end: 0,
           },
+          selectedEventIds: {},
           show: true,
+          showRowRenderers: true,
+          showCheckboxes: false,
           sort: {
             columnId: '@timestamp',
             sortDirection: Direction.desc,
diff --git a/x-pack/legacy/plugins/siem/public/store/timeline/reducer.ts b/x-pack/legacy/plugins/siem/public/store/timeline/reducer.ts
index 3b88785fa9061..f66638d644608 100644
--- a/x-pack/legacy/plugins/siem/public/store/timeline/reducer.ts
+++ b/x-pack/legacy/plugins/siem/public/store/timeline/reducer.ts
@@ -20,7 +20,13 @@ import {
   pinEvent,
   removeColumn,
   removeProvider,
+  setEventsDeleted,
+  clearEventsDeleted,
+  setEventsLoading,
+  clearEventsLoading,
   setKqlFilterQueryDraft,
+  setSelected,
+  clearSelected,
   showCallOutUnauthorizedMsg,
   showTimeline,
   startTimelineSaving,
@@ -61,6 +67,9 @@ import {
   pinTimelineEvent,
   removeTimelineColumn,
   removeTimelineProvider,
+  setDeletedTimelineEvents,
+  setLoadingTimelineEvents,
+  setSelectedTimelineEvents,
   unPinTimelineEvent,
   updateHighlightedDropAndProvider,
   updateKqlFilterQueryDraft,
@@ -103,17 +112,39 @@ export const timelineReducer = reducerWithInitialState(initialTimelineState)
     ...state,
     timelineById: addTimelineToStore({ id, timeline, timelineById: state.timelineById }),
   }))
-  .case(createTimeline, (state, { id, show, columns, itemsPerPage, sort }) => ({
-    ...state,
-    timelineById: addNewTimeline({
-      columns,
-      id,
-      itemsPerPage,
-      sort,
-      show,
-      timelineById: state.timelineById,
-    }),
-  }))
+  .case(
+    createTimeline,
+    (
+      state,
+      {
+        id,
+        dateRange,
+        show,
+        columns,
+        itemsPerPage,
+        kqlQuery,
+        sort,
+        showCheckboxes,
+        showRowRenderers,
+        filters,
+      }
+    ) => ({
+      ...state,
+      timelineById: addNewTimeline({
+        columns,
+        dateRange,
+        filters,
+        id,
+        itemsPerPage,
+        kqlQuery,
+        sort,
+        show,
+        showCheckboxes,
+        showRowRenderers,
+        timelineById: state.timelineById,
+      }),
+    })
+  )
   .case(upsertColumn, (state, { column, id, index }) => ({
     ...state,
     timelineById: upsertTimelineColumn({ column, id, index, timelineById: state.timelineById }),
@@ -218,6 +249,65 @@ export const timelineReducer = reducerWithInitialState(initialTimelineState)
       },
     },
   }))
+  .case(setEventsDeleted, (state, { id, eventIds, isDeleted }) => ({
+    ...state,
+    timelineById: setDeletedTimelineEvents({
+      id,
+      eventIds,
+      timelineById: state.timelineById,
+      isDeleted,
+    }),
+  }))
+  .case(clearEventsDeleted, (state, { id }) => ({
+    ...state,
+    timelineById: {
+      ...state.timelineById,
+      [id]: {
+        ...state.timelineById[id],
+        deletedEventIds: [],
+      },
+    },
+  }))
+  .case(setEventsLoading, (state, { id, eventIds, isLoading }) => ({
+    ...state,
+    timelineById: setLoadingTimelineEvents({
+      id,
+      eventIds,
+      timelineById: state.timelineById,
+      isLoading,
+    }),
+  }))
+  .case(clearEventsLoading, (state, { id }) => ({
+    ...state,
+    timelineById: {
+      ...state.timelineById,
+      [id]: {
+        ...state.timelineById[id],
+        loadingEventIds: [],
+      },
+    },
+  }))
+  .case(setSelected, (state, { id, eventIds, isSelected, isSelectAllChecked }) => ({
+    ...state,
+    timelineById: setSelectedTimelineEvents({
+      id,
+      eventIds,
+      timelineById: state.timelineById,
+      isSelected,
+      isSelectAllChecked,
+    }),
+  }))
+  .case(clearSelected, (state, { id }) => ({
+    ...state,
+    timelineById: {
+      ...state.timelineById,
+      [id]: {
+        ...state.timelineById[id],
+        selectedEventIds: {},
+        isSelectAllChecked: false,
+      },
+    },
+  }))
   .case(updateIsLoading, (state, { id, isLoading }) => ({
     ...state,
     timelineById: {
diff --git a/x-pack/legacy/plugins/siem/public/utils/api/index.ts b/x-pack/legacy/plugins/siem/public/utils/api/index.ts
new file mode 100644
index 0000000000000..1dc14413b04d2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/utils/api/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface MessageBody {
+  error?: string;
+  message?: string;
+  statusCode?: number;
+}
+
+export const parseJsonFromBody = async (response: Response): Promise<MessageBody | null> => {
+  try {
+    const text = await response.text();
+    return JSON.parse(text);
+  } catch (error) {
+    return null;
+  }
+};
diff --git a/x-pack/legacy/plugins/siem/public/utils/route/manage_spy_routes.tsx b/x-pack/legacy/plugins/siem/public/utils/route/manage_spy_routes.tsx
index 87b40c565c758..d1e76f75fca81 100644
--- a/x-pack/legacy/plugins/siem/public/utils/route/manage_spy_routes.tsx
+++ b/x-pack/legacy/plugins/siem/public/utils/route/manage_spy_routes.tsx
@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { memo, useReducer } from 'react';
+import React, { FC, memo, useReducer } from 'react';
 
 import { ManageRoutesSpyProps, RouteSpyState, RouteSpyAction } from './types';
 import { RouterSpyStateContext, initRouteSpy } from './helpers';
 
-export const ManageRoutesSpy = memo(({ children }: ManageRoutesSpyProps) => {
+const ManageRoutesSpyComponent: FC<ManageRoutesSpyProps> = ({ children }) => {
   const reducerSpyRoute = (state: RouteSpyState, action: RouteSpyAction) => {
     switch (action.type) {
       case 'updateRoute':
@@ -28,4 +28,6 @@ export const ManageRoutesSpy = memo(({ children }: ManageRoutesSpyProps) => {
       {children}
     </RouterSpyStateContext.Provider>
   );
-});
+};
+
+export const ManageRoutesSpy = memo(ManageRoutesSpyComponent);
diff --git a/x-pack/legacy/plugins/siem/public/utils/route/types.ts b/x-pack/legacy/plugins/siem/public/utils/route/types.ts
index 62f6b67df245f..002cd4d23786d 100644
--- a/x-pack/legacy/plugins/siem/public/utils/route/types.ts
+++ b/x-pack/legacy/plugins/siem/public/utils/route/types.ts
@@ -9,16 +9,26 @@ import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 
 import { HostsTableType } from '../../store/hosts/model';
+import { NetworkRouteType } from '../../pages/network/navigation/types';
 
+export type SiemRouteType = HostsTableType | NetworkRouteType;
 export interface RouteSpyState {
   pageName: string;
   detailName: string | undefined;
-  tabName: HostsTableType | undefined;
+  tabName: SiemRouteType | undefined;
   search: string;
   pathName: string;
   history?: H.History;
 }
 
+export interface HostRouteSpyState extends RouteSpyState {
+  tabName: HostsTableType | undefined;
+}
+
+export interface NetworkRouteSpyState extends RouteSpyState {
+  tabName: NetworkRouteType | undefined;
+}
+
 export type RouteSpyAction =
   | {
       type: 'updateSearch';
diff --git a/x-pack/legacy/plugins/siem/public/utils/saved_query_services/index.tsx b/x-pack/legacy/plugins/siem/public/utils/saved_query_services/index.tsx
index cda6882fe1714..a8ee10ba2b801 100644
--- a/x-pack/legacy/plugins/siem/public/utils/saved_query_services/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/utils/saved_query_services/index.tsx
@@ -10,16 +10,18 @@ import {
   createSavedQueryService,
 } from '../../../../../../../src/plugins/data/public';
 
-import { useKibanaCore } from '../../lib/compose/kibana_core';
+import { useKibana } from '../../lib/kibana';
 
 export const useSavedQueryServices = () => {
-  const core = useKibanaCore();
+  const kibana = useKibana();
+  const client = kibana.services.savedObjects.client;
+
   const [savedQueryService, setSavedQueryService] = useState<SavedQueryService>(
-    createSavedQueryService(core.savedObjects.client)
+    createSavedQueryService(client)
   );
 
   useEffect(() => {
-    setSavedQueryService(createSavedQueryService(core.savedObjects.client));
-  }, [core.savedObjects.client]);
+    setSavedQueryService(createSavedQueryService(client));
+  }, [client]);
   return savedQueryService;
 };
diff --git a/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_rules.js b/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_rules.js
index b282a8bf1e861..0da44eec3aaa3 100644
--- a/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_rules.js
+++ b/x-pack/legacy/plugins/siem/scripts/convert_saved_search_to_rules.js
@@ -8,6 +8,8 @@ require('../../../../../src/setup_node_env');
 
 const fs = require('fs');
 const path = require('path');
+// eslint-disable-next-line import/no-extraneous-dependencies
+const uuid = require('uuid');
 
 /*
  * This script is used to parse a set of saved searches on a file system
@@ -36,8 +38,17 @@ const TO = 'now';
 const IMMUTABLE = true;
 const RISK_SCORE = 50;
 const ENABLED = false;
-let allRules = '';
-const allRulesNdJson = 'all_rules.ndjson';
+let allRules = `/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// Auto generated file from scripts/convert_saved_search_rules.js
+// Do not hand edit. Run the script against a set of saved searches instead
+
+`;
+const allRulesNdJson = 'index.ts';
 
 // For converting, if you want to use these instead of rely on the defaults then
 // comment these in and use them for the script. Otherwise this is commented out
@@ -50,7 +61,7 @@ const allRulesNdJson = 'all_rules.ndjson';
 const walk = dir => {
   const list = fs.readdirSync(dir);
   return list.reduce((accum, file) => {
-    const fileWithDir = dir + '/' + file;
+    const fileWithDir = `${dir}/${file}`;
     const stat = fs.statSync(fileWithDir);
     if (stat && stat.isDirectory()) {
       return [...accum, ...walk(fileWithDir)];
@@ -62,14 +73,26 @@ const walk = dir => {
 
 //clean up the file system characters
 const cleanupFileName = file => {
-  return path
-    .basename(file, path.extname(file))
+  const fileWithoutSpecialChars = file
+    .trim()
+    .replace(/\./g, '')
+    .replace(/\//g, '')
     .replace(/\s+/g, '_')
     .replace(/,/g, '')
+    .replace(/\[/g, '')
+    .replace(/\]/g, '')
+    .replace(/\(/g, '')
+    .replace(/\)/g, '')
+    .replace(/\@/g, '')
+    .replace(/\:/g, '')
     .replace(/\+s/g, '')
     .replace(/-/g, '')
     .replace(/__/g, '_')
     .toLowerCase();
+  return path.basename(
+    fileWithoutSpecialChars.trim(),
+    path.extname(fileWithoutSpecialChars.trim())
+  );
 };
 
 async function main() {
@@ -89,22 +112,20 @@ async function main() {
   const savedSearchesParsed = savedSearchesJson.reduce((accum, json) => {
     const jsonFile = fs.readFileSync(json, 'utf8');
     const jsonLines = jsonFile.split(/\r{0,1}\n/);
-    const parsedLines = jsonLines.reduce((accum, line, index) => {
+    const parsedLines = jsonLines.reduce((accum, line) => {
       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;
+        // don't try to parse out any exported count records
+        if (parsedLine.exportedCount != null) {
+          return accum;
         }
+        parsedLine._file = parsedLine.attributes.title;
         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);
+        console.log('error parsing a line in this file:', json, line);
         return accum;
       }
     }, []);
@@ -112,51 +133,64 @@ async function main() {
   }, []);
 
   savedSearchesParsed.forEach(
-    ({
-      _file,
-      attributes: {
-        description,
-        title,
-        kibanaSavedObjectMeta: {
-          searchSourceJSON: {
-            query: { query, language },
-            filter,
+    (
+      {
+        _file,
+        attributes: {
+          description,
+          title,
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: {
+              query: { query, language },
+              filter,
+            },
           },
         },
       },
-    }) => {
+      index
+    ) => {
       const fileToWrite = cleanupFileName(_file);
 
-      if (query != null && query.trim() !== '') {
-        const outputMessage = {
-          rule_id: fileToWrite,
-          risk_score: RISK_SCORE,
-          description: description || title,
-          immutable: IMMUTABLE,
-          interval: INTERVAL,
-          name: title,
-          severity: SEVERITY,
-          type: TYPE,
-          from: FROM,
-          to: TO,
-          query,
-          language,
-          filters: filter,
-          enabled: ENABLED,
-          // comment these in if you want to use these for input output, otherwise
-          // with these two commented out, we will use the default saved objects from spaces.
-          // index: INDEX,
-          // output_index: OUTPUT_INDEX,
-        };
-
-        fs.writeFileSync(
-          `${outputDir}/${fileToWrite}.json`,
-          JSON.stringify(outputMessage, null, 2)
-        );
-        allRules += `${JSON.stringify(outputMessage)}\n`;
-      }
+      // remove meta value from the filter
+      const filterWithoutMeta = filter.map(filterValue => {
+        filterValue.$state;
+        return filterValue;
+      });
+      const outputMessage = {
+        rule_id: uuid.v4(),
+        risk_score: RISK_SCORE,
+        description: description || title,
+        immutable: IMMUTABLE,
+        interval: INTERVAL,
+        name: title,
+        severity: SEVERITY,
+        type: TYPE,
+        from: FROM,
+        to: TO,
+        query,
+        language,
+        filters: filterWithoutMeta,
+        enabled: ENABLED,
+        version: 1,
+        // comment these in if you want to use these for input output, otherwise
+        // with these two commented out, we will use the default saved objects from spaces.
+        // index: INDEX,
+        // output_index: OUTPUT_INDEX,
+      };
+
+      fs.writeFileSync(
+        `${outputDir}/${fileToWrite}.json`,
+        `${JSON.stringify(outputMessage, null, 2)}\n`
+      );
+      allRules += `import rule${index + 1} from './${fileToWrite}.json';\n`;
     }
   );
+  allRules += '\n';
+  allRules += 'export const rawRules = [\n';
+  savedSearchesParsed.forEach((_, index) => {
+    allRules += `  rule${index + 1},\n`;
+  });
+  allRules += '];\n';
   fs.writeFileSync(`${outputDir}/${allRulesNdJson}`, allRules);
 }
 
diff --git a/x-pack/legacy/plugins/siem/server/graphql/alerts/index.ts b/x-pack/legacy/plugins/siem/server/graphql/alerts/index.ts
new file mode 100644
index 0000000000000..f2beae525ed6b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/graphql/alerts/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 { createAlertsResolvers } from './resolvers';
+export { alertsSchema } from './schema.gql';
diff --git a/x-pack/legacy/plugins/siem/server/graphql/alerts/resolvers.ts b/x-pack/legacy/plugins/siem/server/graphql/alerts/resolvers.ts
new file mode 100644
index 0000000000000..3becaa4d169d9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/graphql/alerts/resolvers.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 { Alerts } from '../../lib/alerts';
+import { AppResolverOf, ChildResolverOf } from '../../lib/framework';
+import { createOptions } from '../../utils/build_query/create_options';
+import { QuerySourceResolver } from '../sources/resolvers';
+import { SourceResolvers } from '../types';
+
+export interface AlertsResolversDeps {
+  alerts: Alerts;
+}
+
+type QueryAlertsHistogramResolver = ChildResolverOf<
+  AppResolverOf<SourceResolvers.AlertsHistogramResolver>,
+  QuerySourceResolver
+>;
+
+export const createAlertsResolvers = (
+  libs: AlertsResolversDeps
+): {
+  Source: {
+    AlertsHistogram: QueryAlertsHistogramResolver;
+  };
+} => ({
+  Source: {
+    async AlertsHistogram(source, args, { req }, info) {
+      const options = {
+        ...createOptions(source, args, info),
+        defaultIndex: args.defaultIndex,
+      };
+      return libs.alerts.getAlertsHistogramData(req, options);
+    },
+  },
+});
diff --git a/x-pack/legacy/plugins/siem/server/graphql/alerts/schema.gql.ts b/x-pack/legacy/plugins/siem/server/graphql/alerts/schema.gql.ts
new file mode 100644
index 0000000000000..f29b64772b8f6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/graphql/alerts/schema.gql.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import gql from 'graphql-tag';
+
+export const alertsSchema = gql`
+  type AlertsOverTimeData {
+    inspect: Inspect
+    alertsOverTimeByModule: [MatrixOverTimeHistogramData!]!
+    totalCount: Float!
+  }
+
+  extend type Source {
+    AlertsHistogram(
+      filterQuery: String
+      defaultIndex: [String!]!
+      timerange: TimerangeInput!
+    ): AlertsOverTimeData!
+  }
+`;
diff --git a/x-pack/legacy/plugins/siem/server/graphql/index.ts b/x-pack/legacy/plugins/siem/server/graphql/index.ts
index 4e28605f6c0b2..762b9002a466d 100644
--- a/x-pack/legacy/plugins/siem/server/graphql/index.ts
+++ b/x-pack/legacy/plugins/siem/server/graphql/index.ts
@@ -29,7 +29,9 @@ import { timelineSchema } from './timeline';
 import { tlsSchema } from './tls';
 import { uncommonProcessesSchema } from './uncommon_processes';
 import { whoAmISchema } from './who_am_i';
+import { alertsSchema } from './alerts';
 export const schemas = [
+  alertsSchema,
   anomaliesSchema,
   authenticationsSchema,
   ecsSchema,
diff --git a/x-pack/legacy/plugins/siem/server/graphql/types.ts b/x-pack/legacy/plugins/siem/server/graphql/types.ts
index fda79ad543bf6..776444b1502b1 100644
--- a/x-pack/legacy/plugins/siem/server/graphql/types.ts
+++ b/x-pack/legacy/plugins/siem/server/graphql/types.ts
@@ -459,6 +459,8 @@ export interface Source {
   /** The status of the source */
   status: SourceStatus;
 
+  AlertsHistogram: AlertsOverTimeData;
+
   AnomaliesOverTime: AnomaliesOverTimeData;
   /** Gets Authentication success and failures based on a timerange */
   Authentications: AuthenticationsData;
@@ -560,10 +562,10 @@ export interface IndexField {
   format?: Maybe<string>;
 }
 
-export interface AnomaliesOverTimeData {
+export interface AlertsOverTimeData {
   inspect?: Maybe<Inspect>;
 
-  anomaliesOverTime: MatrixOverTimeHistogramData[];
+  alertsOverTimeByModule: MatrixOverTimeHistogramData[];
 
   totalCount: number;
 }
@@ -582,6 +584,14 @@ export interface MatrixOverTimeHistogramData {
   g: string;
 }
 
+export interface AnomaliesOverTimeData {
+  inspect?: Maybe<Inspect>;
+
+  anomaliesOverTime: MatrixOverTimeHistogramData[];
+
+  totalCount: number;
+}
+
 export interface AuthenticationsData {
   edges: AuthenticationsEdges[];
 
@@ -2139,6 +2149,13 @@ export interface GetAllTimelineQueryArgs {
 
   onlyUserFavorite?: Maybe<boolean>;
 }
+export interface AlertsHistogramSourceArgs {
+  filterQuery?: Maybe<string>;
+
+  defaultIndex: string[];
+
+  timerange: TimerangeInput;
+}
 export interface AnomaliesOverTimeSourceArgs {
   timerange: TimerangeInput;
 
@@ -2781,6 +2798,8 @@ export namespace SourceResolvers {
     /** The status of the source */
     status?: StatusResolver<SourceStatus, TypeParent, TContext>;
 
+    AlertsHistogram?: AlertsHistogramResolver<AlertsOverTimeData, TypeParent, TContext>;
+
     AnomaliesOverTime?: AnomaliesOverTimeResolver<AnomaliesOverTimeData, TypeParent, TContext>;
     /** Gets Authentication success and failures based on a timerange */
     Authentications?: AuthenticationsResolver<AuthenticationsData, TypeParent, TContext>;
@@ -2853,6 +2872,19 @@ export namespace SourceResolvers {
     Parent,
     TContext
   >;
+  export type AlertsHistogramResolver<
+    R = AlertsOverTimeData,
+    Parent = Source,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext, AlertsHistogramArgs>;
+  export interface AlertsHistogramArgs {
+    filterQuery?: Maybe<string>;
+
+    defaultIndex: string[];
+
+    timerange: TimerangeInput;
+  }
+
   export type AnomaliesOverTimeResolver<
     R = AnomaliesOverTimeData,
     Parent = Source,
@@ -3407,11 +3439,11 @@ export namespace IndexFieldResolvers {
   > = Resolver<R, Parent, TContext>;
 }
 
-export namespace AnomaliesOverTimeDataResolvers {
-  export interface Resolvers<TContext = SiemContext, TypeParent = AnomaliesOverTimeData> {
+export namespace AlertsOverTimeDataResolvers {
+  export interface Resolvers<TContext = SiemContext, TypeParent = AlertsOverTimeData> {
     inspect?: InspectResolver<Maybe<Inspect>, TypeParent, TContext>;
 
-    anomaliesOverTime?: AnomaliesOverTimeResolver<
+    alertsOverTimeByModule?: AlertsOverTimeByModuleResolver<
       MatrixOverTimeHistogramData[],
       TypeParent,
       TContext
@@ -3422,17 +3454,17 @@ export namespace AnomaliesOverTimeDataResolvers {
 
   export type InspectResolver<
     R = Maybe<Inspect>,
-    Parent = AnomaliesOverTimeData,
+    Parent = AlertsOverTimeData,
     TContext = SiemContext
   > = Resolver<R, Parent, TContext>;
-  export type AnomaliesOverTimeResolver<
+  export type AlertsOverTimeByModuleResolver<
     R = MatrixOverTimeHistogramData[],
-    Parent = AnomaliesOverTimeData,
+    Parent = AlertsOverTimeData,
     TContext = SiemContext
   > = Resolver<R, Parent, TContext>;
   export type TotalCountResolver<
     R = number,
-    Parent = AnomaliesOverTimeData,
+    Parent = AlertsOverTimeData,
     TContext = SiemContext
   > = Resolver<R, Parent, TContext>;
 }
@@ -3482,6 +3514,36 @@ export namespace MatrixOverTimeHistogramDataResolvers {
   > = Resolver<R, Parent, TContext>;
 }
 
+export namespace AnomaliesOverTimeDataResolvers {
+  export interface Resolvers<TContext = SiemContext, TypeParent = AnomaliesOverTimeData> {
+    inspect?: InspectResolver<Maybe<Inspect>, TypeParent, TContext>;
+
+    anomaliesOverTime?: AnomaliesOverTimeResolver<
+      MatrixOverTimeHistogramData[],
+      TypeParent,
+      TContext
+    >;
+
+    totalCount?: TotalCountResolver<number, TypeParent, TContext>;
+  }
+
+  export type InspectResolver<
+    R = Maybe<Inspect>,
+    Parent = AnomaliesOverTimeData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type AnomaliesOverTimeResolver<
+    R = MatrixOverTimeHistogramData[],
+    Parent = AnomaliesOverTimeData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+  export type TotalCountResolver<
+    R = number,
+    Parent = AnomaliesOverTimeData,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
+}
+
 export namespace AuthenticationsDataResolvers {
   export interface Resolvers<TContext = SiemContext, TypeParent = AuthenticationsData> {
     edges?: EdgesResolver<AuthenticationsEdges[], TypeParent, TContext>;
@@ -8707,9 +8769,10 @@ export type IResolvers<TContext = SiemContext> = {
   SourceFields?: SourceFieldsResolvers.Resolvers<TContext>;
   SourceStatus?: SourceStatusResolvers.Resolvers<TContext>;
   IndexField?: IndexFieldResolvers.Resolvers<TContext>;
-  AnomaliesOverTimeData?: AnomaliesOverTimeDataResolvers.Resolvers<TContext>;
+  AlertsOverTimeData?: AlertsOverTimeDataResolvers.Resolvers<TContext>;
   Inspect?: InspectResolvers.Resolvers<TContext>;
   MatrixOverTimeHistogramData?: MatrixOverTimeHistogramDataResolvers.Resolvers<TContext>;
+  AnomaliesOverTimeData?: AnomaliesOverTimeDataResolvers.Resolvers<TContext>;
   AuthenticationsData?: AuthenticationsDataResolvers.Resolvers<TContext>;
   AuthenticationsEdges?: AuthenticationsEdgesResolvers.Resolvers<TContext>;
   AuthenticationItem?: AuthenticationItemResolvers.Resolvers<TContext>;
diff --git a/x-pack/legacy/plugins/siem/server/init_server.ts b/x-pack/legacy/plugins/siem/server/init_server.ts
index 08c481164d539..5ecbb51c6770d 100644
--- a/x-pack/legacy/plugins/siem/server/init_server.ts
+++ b/x-pack/legacy/plugins/siem/server/init_server.ts
@@ -29,10 +29,12 @@ import { createUncommonProcessesResolvers } from './graphql/uncommon_processes';
 import { createWhoAmIResolvers } from './graphql/who_am_i';
 import { AppBackendLibs } from './lib/types';
 import { createTlsResolvers } from './graphql/tls';
+import { createAlertsResolvers } from './graphql/alerts';
 
 export const initServer = (libs: AppBackendLibs) => {
   const schema = makeExecutableSchema({
     resolvers: [
+      createAlertsResolvers(libs) as IResolvers,
       createAnomaliesResolvers(libs) as IResolvers,
       createAuthenticationsResolvers(libs) as IResolvers,
       createEsValueResolvers() as IResolvers,
diff --git a/x-pack/legacy/plugins/siem/server/kibana.index.ts b/x-pack/legacy/plugins/siem/server/kibana.index.ts
index e90e6366dd9ec..59df643246835 100644
--- a/x-pack/legacy/plugins/siem/server/kibana.index.ts
+++ b/x-pack/legacy/plugins/siem/server/kibana.index.ts
@@ -21,6 +21,10 @@ import { deleteIndexRoute } from './lib/detection_engine/routes/index/delete_ind
 import { isAlertExecutor } from './lib/detection_engine/signals/types';
 import { readTagsRoute } from './lib/detection_engine/routes/tags/read_tags_route';
 import { readPrivilegesRoute } from './lib/detection_engine/routes/privileges/read_privileges_route';
+import { addPrepackedRulesRoute } from './lib/detection_engine/routes/rules/add_prepackaged_rules_route';
+import { createRulesBulkRoute } from './lib/detection_engine/routes/rules/create_rules_bulk_route';
+import { updateRulesBulkRoute } from './lib/detection_engine/routes/rules/update_rules_bulk_route';
+import { deleteRulesBulkRoute } from './lib/detection_engine/routes/rules/delete_rules_bulk_route';
 
 const APP_ID = 'siem';
 
@@ -42,6 +46,10 @@ export const initServerWithKibana = (context: PluginInitializerContext, __legacy
   updateRulesRoute(__legacy);
   deleteRulesRoute(__legacy);
   findRulesRoute(__legacy);
+  addPrepackedRulesRoute(__legacy);
+  createRulesBulkRoute(__legacy);
+  updateRulesBulkRoute(__legacy);
+  deleteRulesBulkRoute(__legacy);
 
   // Detection Engine Signals routes that have the REST endpoints of /api/detection_engine/signals
   // POST /api/detection_engine/signals/status
@@ -57,6 +65,7 @@ export const initServerWithKibana = (context: PluginInitializerContext, __legacy
 
   // Detection Engine tags routes that have the REST endpoints of /api/detection_engine/tags
   readTagsRoute(__legacy);
+
   // Privileges API to get the generic user privileges
   readPrivilegesRoute(__legacy);
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/alerts/elasticsearch_adapter.ts b/x-pack/legacy/plugins/siem/server/lib/alerts/elasticsearch_adapter.ts
new file mode 100644
index 0000000000000..6667f34b1b738
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/alerts/elasticsearch_adapter.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 { get, getOr } from 'lodash/fp';
+
+import { AlertsOverTimeData, MatrixOverTimeHistogramData } from '../../graphql/types';
+
+import { inspectStringifyObject } from '../../utils/build_query';
+
+import { FrameworkAdapter, FrameworkRequest, RequestBasicOptions } from '../framework';
+import { buildAlertsHistogramQuery } from './query.dsl';
+
+import { AlertsAdapter, AlertsGroupData, AlertsBucket } from './types';
+import { TermAggregation } from '../types';
+import { EventHit } from '../events/types';
+
+export class ElasticsearchAlertsAdapter implements AlertsAdapter {
+  constructor(private readonly framework: FrameworkAdapter) {}
+
+  public async getAlertsHistogramData(
+    request: FrameworkRequest,
+    options: RequestBasicOptions
+  ): Promise<AlertsOverTimeData> {
+    const dsl = buildAlertsHistogramQuery(options);
+    const response = await this.framework.callWithRequest<EventHit, TermAggregation>(
+      request,
+      'search',
+      dsl
+    );
+    const totalCount = getOr(0, 'hits.total.value', response);
+    const alertsOverTimeByModule = getOr([], 'aggregations.alertsByModuleGroup.buckets', response);
+    const inspect = {
+      dsl: [inspectStringifyObject(dsl)],
+      response: [inspectStringifyObject(response)],
+    };
+    return {
+      inspect,
+      alertsOverTimeByModule: getAlertsOverTimeByModule(alertsOverTimeByModule),
+      totalCount,
+    };
+  }
+}
+
+const getAlertsOverTimeByModule = (data: AlertsGroupData[]): MatrixOverTimeHistogramData[] => {
+  let result: MatrixOverTimeHistogramData[] = [];
+  data.forEach(({ key: group, alerts }) => {
+    const alertsData: AlertsBucket[] = get('buckets', alerts);
+
+    result = [
+      ...result,
+      ...alertsData.map(({ key, doc_count }: AlertsBucket) => ({
+        x: key,
+        y: doc_count,
+        g: group,
+      })),
+    ];
+  });
+
+  return result;
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/alerts/elasticseatch_adapter.test.ts b/x-pack/legacy/plugins/siem/server/lib/alerts/elasticseatch_adapter.test.ts
new file mode 100644
index 0000000000000..a24fb5f511d24
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/alerts/elasticseatch_adapter.test.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { FrameworkAdapter, FrameworkRequest, RequestBasicOptions } from '../framework';
+
+import expect from '@kbn/expect';
+import { ElasticsearchAlertsAdapter } from './elasticsearch_adapter';
+import {
+  mockRequest,
+  mockOptions,
+  mockAlertsHistogramDataResponse,
+  mockAlertsHistogramQueryDsl,
+  mockAlertsHistogramDataFormattedResponse,
+} from './mock';
+
+jest.mock('./query.dsl', () => {
+  return {
+    buildAlertsHistogramQuery: jest.fn(() => mockAlertsHistogramQueryDsl),
+  };
+});
+
+describe('alerts elasticsearch_adapter', () => {
+  describe('getAlertsHistogramData', () => {
+    test('Happy Path ', async () => {
+      const mockCallWithRequest = jest.fn();
+      mockCallWithRequest.mockImplementation((req: FrameworkRequest, method: string) => {
+        return mockAlertsHistogramDataResponse;
+      });
+      const mockFramework: FrameworkAdapter = {
+        version: 'mock',
+        callWithRequest: mockCallWithRequest,
+        registerGraphQLEndpoint: jest.fn(),
+        getIndexPatternsService: jest.fn(),
+      };
+      jest.doMock('../framework', () => ({
+        callWithRequest: mockCallWithRequest,
+      }));
+
+      const EsNetworkTimelineAlerts = new ElasticsearchAlertsAdapter(mockFramework);
+      const data = await EsNetworkTimelineAlerts.getAlertsHistogramData(
+        (mockRequest as unknown) as FrameworkRequest,
+        (mockOptions as unknown) as RequestBasicOptions
+      );
+
+      expect(data).to.eql({
+        alertsOverTimeByModule: mockAlertsHistogramDataFormattedResponse,
+        inspect: {
+          dsl: ['"mockAlertsHistogramQueryDsl"'],
+          response: [JSON.stringify(mockAlertsHistogramDataResponse, null, 2)],
+        },
+        totalCount: 1599508,
+      });
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/alerts/index.ts b/x-pack/legacy/plugins/siem/server/lib/alerts/index.ts
new file mode 100644
index 0000000000000..13a693a6e1fbb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/alerts/index.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 { FrameworkRequest, RequestBasicOptions } from '../framework';
+export * from './elasticsearch_adapter';
+import { AlertsAdapter } from './types';
+import { AlertsOverTimeData } from '../../graphql/types';
+
+export class Alerts {
+  constructor(private readonly adapter: AlertsAdapter) {}
+
+  public async getAlertsHistogramData(
+    req: FrameworkRequest,
+    options: RequestBasicOptions
+  ): Promise<AlertsOverTimeData> {
+    return this.adapter.getAlertsHistogramData(req, options);
+  }
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/alerts/mock.ts b/x-pack/legacy/plugins/siem/server/lib/alerts/mock.ts
new file mode 100644
index 0000000000000..fe0b6673f3191
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/alerts/mock.ts
@@ -0,0 +1,115 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { defaultIndexPattern } from '../../../default_index_pattern';
+
+export const mockAlertsHistogramDataResponse = {
+  took: 513,
+  timed_out: false,
+  _shards: {
+    total: 62,
+    successful: 61,
+    skipped: 0,
+    failed: 1,
+    failures: [
+      {
+        shard: 0,
+        index: 'auditbeat-7.2.0',
+        node: 'jBC5kcOeT1exvECDMrk5Ug',
+        reason: {
+          type: 'illegal_argument_exception',
+          reason:
+            'Fielddata is disabled on text fields by default. Set fielddata=true on [event.module] in order to load fielddata in memory by uninverting the inverted index. Note that this can however use significant memory. Alternatively use a keyword field instead.',
+        },
+      },
+    ],
+  },
+  hits: {
+    total: {
+      value: 1599508,
+      relation: 'eq',
+    },
+    max_score: null,
+    hits: [],
+  },
+  aggregations: {
+    alertsByModuleGroup: {
+      doc_count_error_upper_bound: 0,
+      sum_other_doc_count: 802087,
+      buckets: [
+        {
+          key: 'All others',
+          doc_count: 451519,
+          alerts: {
+            buckets: [
+              {
+                key_as_string: '2019-12-15T09:30:00.000Z',
+                key: 1576402200000,
+                doc_count: 3008,
+              },
+              {
+                key_as_string: '2019-12-15T10:00:00.000Z',
+                key: 1576404000000,
+                doc_count: 8671,
+              },
+            ],
+          },
+        },
+        {
+          key: 'suricata',
+          doc_count: 345902,
+          alerts: {
+            buckets: [
+              {
+                key_as_string: '2019-12-15T09:30:00.000Z',
+                key: 1576402200000,
+                doc_count: 1785,
+              },
+              {
+                key_as_string: '2019-12-15T10:00:00.000Z',
+                key: 1576404000000,
+                doc_count: 5342,
+              },
+            ],
+          },
+        },
+      ],
+    },
+  },
+};
+export const mockAlertsHistogramDataFormattedResponse = [
+  {
+    x: 1576402200000,
+    y: 3008,
+    g: 'All others',
+  },
+  {
+    x: 1576404000000,
+    y: 8671,
+    g: 'All others',
+  },
+  {
+    x: 1576402200000,
+    y: 1785,
+    g: 'suricata',
+  },
+  {
+    x: 1576404000000,
+    y: 5342,
+    g: 'suricata',
+  },
+];
+export const mockAlertsHistogramQueryDsl = 'mockAlertsHistogramQueryDsl';
+export const mockRequest = 'mockRequest';
+export const mockOptions = {
+  sourceConfiguration: { field: {} },
+  timerange: {
+    to: 9999,
+    from: 1234,
+  },
+  defaultIndex: defaultIndexPattern,
+  filterQuery: '',
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/alerts/query.dsl.ts b/x-pack/legacy/plugins/siem/server/lib/alerts/query.dsl.ts
new file mode 100644
index 0000000000000..efa6ee01f2124
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/alerts/query.dsl.ts
@@ -0,0 +1,118 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createQueryFilterClauses, calculateTimeseriesInterval } from '../../utils/build_query';
+import { buildTimelineQuery } from '../events/query.dsl';
+import { RequestOptions, RequestBasicOptions } from '../framework';
+
+export const buildAlertsQuery = (options: RequestOptions) => {
+  const eventsQuery = buildTimelineQuery(options);
+  const eventsFilter = eventsQuery.body.query.bool.filter;
+  const alertsFilter = [
+    ...createQueryFilterClauses({ match: { 'event.kind': { query: 'alert' } } }),
+  ];
+
+  return {
+    ...eventsQuery,
+    body: {
+      ...eventsQuery.body,
+      query: {
+        bool: {
+          filter: [...eventsFilter, ...alertsFilter],
+        },
+      },
+    },
+  };
+};
+
+export const buildAlertsHistogramQuery = ({
+  filterQuery,
+  timerange: { from, to },
+  defaultIndex,
+  sourceConfiguration: {
+    fields: { timestamp },
+  },
+}: RequestBasicOptions) => {
+  const filter = [
+    ...createQueryFilterClauses(filterQuery),
+    {
+      bool: {
+        filter: [
+          {
+            bool: {
+              should: [
+                {
+                  match: {
+                    'event.kind': 'alert',
+                  },
+                },
+              ],
+              minimum_should_match: 1,
+            },
+          },
+        ],
+      },
+    },
+    {
+      range: {
+        [timestamp]: {
+          gte: from,
+          lte: to,
+        },
+      },
+    },
+  ];
+
+  const getHistogramAggregation = () => {
+    const interval = calculateTimeseriesInterval(from, to);
+    const histogramTimestampField = '@timestamp';
+    const dateHistogram = {
+      date_histogram: {
+        field: histogramTimestampField,
+        fixed_interval: `${interval}s`,
+      },
+    };
+    const autoDateHistogram = {
+      auto_date_histogram: {
+        field: histogramTimestampField,
+        buckets: 36,
+      },
+    };
+    return {
+      alertsByModuleGroup: {
+        terms: {
+          field: 'event.module',
+          missing: 'All others',
+          order: {
+            _count: 'desc',
+          },
+          size: 10,
+        },
+        aggs: {
+          alerts: 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/alerts/types.ts b/x-pack/legacy/plugins/siem/server/lib/alerts/types.ts
new file mode 100644
index 0000000000000..e6a4ff4b7c9d1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/alerts/types.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 { AlertsOverTimeData } from '../../graphql/types';
+import { FrameworkRequest, RequestBasicOptions } from '../framework';
+
+export interface AlertsBucket {
+  key: number;
+  doc_count: number;
+}
+
+export interface AlertsGroupData {
+  key: string;
+  doc_count: number;
+  alerts: {
+    buckets: AlertsBucket[];
+  };
+}
+export interface AlertsAdapter {
+  getAlertsHistogramData(
+    request: FrameworkRequest,
+    options: RequestBasicOptions
+  ): Promise<AlertsOverTimeData>;
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/compose/kibana.ts b/x-pack/legacy/plugins/siem/server/lib/compose/kibana.ts
index 9d5ac6db7bbb7..30fdf7520a3ed 100644
--- a/x-pack/legacy/plugins/siem/server/lib/compose/kibana.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/compose/kibana.ts
@@ -4,7 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CoreSetup, PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, PluginInitializerContext } from '../../../../../../../src/core/server';
+import { PluginsSetup } from '../../plugin';
+
 import { Anomalies } from '../anomalies';
 import { ElasticsearchAnomaliesAdapter } from '../anomalies/elasticsearch_adapter';
 import { Authentications } from '../authentications';
@@ -31,9 +33,14 @@ import { ElasticsearchUncommonProcessesAdapter, UncommonProcesses } from '../unc
 import { Note } from '../note/saved_object';
 import { PinnedEvent } from '../pinned_event/saved_object';
 import { Timeline } from '../timeline/saved_object';
+import { Alerts, ElasticsearchAlertsAdapter } from '../alerts';
 
-export function compose(core: CoreSetup, env: PluginInitializerContext['env']): AppBackendLibs {
-  const framework = new KibanaBackendFrameworkAdapter(core, env);
+export function compose(
+  core: CoreSetup,
+  plugins: PluginsSetup,
+  env: PluginInitializerContext['env']
+): AppBackendLibs {
+  const framework = new KibanaBackendFrameworkAdapter(core, plugins, env);
   const sources = new Sources(new ConfigurationSourcesAdapter());
   const sourceStatus = new SourceStatus(new ElasticsearchSourceStatusAdapter(framework));
 
@@ -42,6 +49,7 @@ export function compose(core: CoreSetup, env: PluginInitializerContext['env']):
   const pinnedEvent = new PinnedEvent();
 
   const domainLibs: AppDomainLibs = {
+    alerts: new Alerts(new ElasticsearchAlertsAdapter(framework)),
     anomalies: new Anomalies(new ElasticsearchAnomaliesAdapter(framework)),
     authentications: new Authentications(new ElasticsearchAuthenticationAdapter(framework)),
     events: new Events(new ElasticsearchEventsAdapter(framework)),
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 d9dd7bb1ff7d0..edf196b96f5d0 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
@@ -13,14 +13,48 @@ import {
   DETECTION_ENGINE_PRIVILEGES_URL,
   DETECTION_ENGINE_QUERY_SIGNALS_URL,
   INTERNAL_RULE_ID_KEY,
+  INTERNAL_IMMUTABLE_KEY,
 } from '../../../../../common/constants';
 import { RuleAlertType } from '../../rules/types';
 import { RuleAlertParamsRest } from '../../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<RuleAlertParamsRest, 'filter'>> => ({
+export const fullRuleAlertParamsRest = (): RuleAlertParamsRest => ({
+  rule_id: 'rule-1',
+  description: 'Detecting root and admin users',
+  index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
+  interval: '5m',
+  name: 'Detect Root/Admin Users',
+  output_index: '.siem-signals',
+  risk_score: 50,
+  type: 'query',
+  from: 'now-6m',
+  to: 'now',
+  severity: 'high',
+  query: 'user.name: root or user.name: admin',
+  language: 'kuery',
+  threats: [
+    {
+      framework: 'fake',
+      tactic: { id: 'fakeId', name: 'fakeName', reference: 'fakeRef' },
+      techniques: [{ id: 'techniqueId', name: 'techniqueName', reference: 'techniqueRef' }],
+    },
+  ],
+  enabled: true,
+  filters: [],
+  immutable: false,
+  references: [],
+  meta: {},
+  tags: [],
+  version: 1,
+  false_positives: [],
+  saved_id: 'some-id',
+  max_signals: 100,
+  created_at: '2019-12-13T16:40:33.400Z',
+  updated_at: '2019-12-13T16:40:33.400Z',
+  timeline_id: 'timeline-id',
+});
+
+export const typicalPayload = (): Partial<RuleAlertParamsRest> => ({
   rule_id: 'rule-1',
   description: 'Detecting root and admin users',
   index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
@@ -83,6 +117,42 @@ export const getFindRequest = (): ServerInjectOptions => ({
   url: `${DETECTION_ENGINE_RULES_URL}/_find`,
 });
 
+export const getReadBulkRequest = (): ServerInjectOptions => ({
+  method: 'POST',
+  url: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+  payload: [typicalPayload()],
+});
+
+export const getUpdateBulkRequest = (): ServerInjectOptions => ({
+  method: 'PUT',
+  url: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+  payload: [typicalPayload()],
+});
+
+export const getDeleteBulkRequest = (): ServerInjectOptions => ({
+  method: 'DELETE',
+  url: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+  payload: [{ rule_id: 'rule-1' }],
+});
+
+export const getDeleteBulkRequestById = (): ServerInjectOptions => ({
+  method: 'DELETE',
+  url: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+  payload: [{ id: 'rule-04128c15-0d1b-4716-a4c5-46997ac7f3bd' }],
+});
+
+export const getDeleteAsPostBulkRequestById = (): ServerInjectOptions => ({
+  method: 'POST',
+  url: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+  payload: [{ id: 'rule-04128c15-0d1b-4716-a4c5-46997ac7f3bd' }],
+});
+
+export const getDeleteAsPostBulkRequest = (): ServerInjectOptions => ({
+  method: 'POST',
+  url: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+  payload: [{ rule_id: 'rule-1' }],
+});
+
 export const getPrivilegeRequest = (): ServerInjectOptions => ({
   method: 'GET',
   url: `${DETECTION_ENGINE_PRIVILEGES_URL}`,
@@ -109,12 +179,24 @@ export const getFindResultWithSingleHit = (): FindHit => ({
   data: [getResult()],
 });
 
-export const getFindResultWithMultiHits = (data: RuleAlertType[]): FindHit => ({
-  page: 1,
-  perPage: 1,
-  total: 2,
+export const getFindResultWithMultiHits = ({
   data,
-});
+  page = 1,
+  perPage = 1,
+  total,
+}: {
+  data: RuleAlertType[];
+  page?: number;
+  perPage?: number;
+  total?: number;
+}) => {
+  return {
+    page,
+    perPage,
+    total: total != null ? total : data.length,
+    data,
+  };
+};
 
 export const getDeleteRequest = (): ServerInjectOptions => ({
   method: 'DELETE',
@@ -172,27 +254,36 @@ export const createActionResult = (): ActionResult => ({
 export const getResult = (): RuleAlertType => ({
   id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
   name: 'Detect Root/Admin Users',
-  tags: [`${INTERNAL_RULE_ID_KEY}:rule-1`],
+  tags: [`${INTERNAL_RULE_ID_KEY}:rule-1`, `${INTERNAL_IMMUTABLE_KEY}:false`],
   alertTypeId: 'siem.signals',
+  consumer: 'siem',
   params: {
+    createdAt: '2019-12-13T16:40:33.400Z',
+    updatedAt: '2019-12-13T16:40:33.400Z',
     description: 'Detecting root and admin users',
     ruleId: 'rule-1',
     index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
     falsePositives: [],
     from: 'now-6m',
-    filter: null,
     immutable: false,
     query: 'user.name: root or user.name: admin',
     language: 'kuery',
     outputIndex: '.siem-signals',
-    savedId: null,
-    meta: null,
-    filters: null,
+    savedId: 'some-id',
+    timelineId: 'some-timeline-id',
+    meta: { someMeta: 'someField' },
+    filters: [
+      {
+        query: {
+          match_phrase: {
+            'host.name': 'some-host',
+          },
+        },
+      },
+    ],
     riskScore: 50,
     maxSignals: 100,
-    size: 1,
     severity: 'high',
-    tags: [],
     to: 'now',
     type: 'query',
     threats: [
@@ -213,13 +304,17 @@ export const getResult = (): RuleAlertType => ({
       },
     ],
     references: ['http://www.example.com', 'https://ww.example.com'],
+    version: 1,
   },
-  interval: '5m',
+  createdAt: new Date('2019-12-13T16:40:33.400Z'),
+  updatedAt: new Date('2019-12-13T16:40:33.400Z'),
+  schedule: { interval: '5m' },
   enabled: true,
   actions: [],
   throttle: null,
   createdBy: 'elastic',
   updatedBy: 'elastic',
+  apiKey: null,
   apiKeyOwner: 'elastic',
   muteAll: false,
   mutedInstanceIds: [],
@@ -284,4 +379,5 @@ export const getMockPrivileges = () => ({
     },
   },
   application: {},
+  isAuthenticated: false,
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/index/signals_mapping.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/index/signals_mapping.json
index 501522105bdbc..afe9bac9d87fe 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/index/signals_mapping.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/index/signals_mapping.json
@@ -33,6 +33,9 @@
               "saved_id": {
                 "type": "keyword"
               },
+              "timeline_id": {
+                "type": "keyword"
+              },
               "max_signals": {
                 "type": "keyword"
               },
@@ -96,11 +99,20 @@
               "filters": {
                 "type": "object"
               },
+              "created_at": {
+                "type": "date"
+              },
+              "updated_at": {
+                "type": "date"
+              },
               "created_by": {
                 "type": "keyword"
               },
               "updated_by": {
                 "type": "keyword"
+              },
+              "version": {
+                "type": "keyword"
               }
             }
           },
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
index 457de05674f66..240200af8b585 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/privileges/read_privileges_route.ts
@@ -5,6 +5,7 @@
  */
 
 import Hapi from 'hapi';
+import { merge } from 'lodash/fp';
 import { DETECTION_ENGINE_PRIVILEGES_URL } from '../../../../../common/constants';
 import { RulesRequest } from '../../rules/types';
 import { ServerFacade } from '../../../../types';
@@ -28,7 +29,9 @@ export const createReadPrivilegesRulesRoute = (server: ServerFacade): Hapi.Serve
         const callWithRequest = callWithRequestFactory(request, server);
         const index = getIndex(request, server);
         const permissions = await readPrivileges(callWithRequest, index);
-        return permissions;
+        return merge(permissions, {
+          isAuthenticated: request?.auth?.isAuthenticated ?? false,
+        });
       } catch (err) {
         return transformError(err);
       }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
new file mode 100644
index 0000000000000..922b70e87467e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.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 Hapi from 'hapi';
+import { isFunction } from 'lodash/fp';
+import Boom from 'boom';
+
+import { DETECTION_ENGINE_PREPACKAGED_URL } from '../../../../../common/constants';
+import { ServerFacade, RequestFacade } from '../../../../types';
+import { getIndexExists } from '../../index/get_index_exists';
+import { callWithRequestFactory, getIndex, transformError } from '../utils';
+import { getPrepackagedRules } from '../../rules/get_prepackaged_rules';
+import { installPrepackagedRules } from '../../rules/install_prepacked_rules';
+import { updatePrepackagedRules } from '../../rules/update_prepacked_rules';
+import { getRulesToInstall } from '../../rules/get_rules_to_install';
+import { getRulesToUpdate } from '../../rules/get_rules_to_update';
+import { getExistingPrepackagedRules } from '../../rules/get_existing_prepackaged_rules';
+
+export const createAddPrepackedRulesRoute = (server: ServerFacade): Hapi.ServerRoute => {
+  return {
+    method: 'PUT',
+    path: DETECTION_ENGINE_PREPACKAGED_URL,
+    options: {
+      tags: ['access:siem'],
+      validate: {
+        options: {
+          abortEarly: false,
+        },
+      },
+    },
+    async handler(request: RequestFacade, headers) {
+      const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
+      const actionsClient = isFunction(request.getActionsClient)
+        ? request.getActionsClient()
+        : null;
+
+      if (!alertsClient || !actionsClient) {
+        return headers.response().code(404);
+      }
+
+      try {
+        const callWithRequest = callWithRequestFactory(request, server);
+        const rulesFromFileSystem = getPrepackagedRules();
+
+        const prepackedRules = await getExistingPrepackagedRules({ alertsClient });
+        const rulesToInstall = getRulesToInstall(rulesFromFileSystem, prepackedRules);
+        const rulesToUpdate = getRulesToUpdate(rulesFromFileSystem, prepackedRules);
+
+        const spaceIndex = getIndex(request, server);
+        if (rulesToInstall.length !== 0 || rulesToUpdate.length !== 0) {
+          const spaceIndexExists = await getIndexExists(callWithRequest, spaceIndex);
+          if (!spaceIndexExists) {
+            throw new Boom(
+              `Pre-packaged rules cannot be installed until the space index is created: ${spaceIndex}`
+            );
+          }
+        }
+        await installPrepackagedRules(alertsClient, actionsClient, rulesToInstall, spaceIndex);
+        await updatePrepackagedRules(alertsClient, actionsClient, rulesToUpdate, spaceIndex);
+        return {
+          rules_installed: rulesToInstall.length,
+          rules_updated: rulesToUpdate.length,
+        };
+      } catch (err) {
+        return transformError(err);
+      }
+    },
+  };
+};
+
+export const addPrepackedRulesRoute = (server: ServerFacade): void => {
+  server.route(createAddPrepackedRulesRoute(server));
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
new file mode 100644
index 0000000000000..d3890f82c8abf
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
@@ -0,0 +1,129 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  createMockServer,
+  createMockServerWithoutActionClientDecoration,
+  createMockServerWithoutAlertClientDecoration,
+  createMockServerWithoutActionOrAlertClientDecoration,
+} from '../__mocks__/_mock_server';
+import { createRulesRoute } from './create_rules_route';
+import { ServerInjectOptions } from 'hapi';
+import {
+  getFindResult,
+  getResult,
+  createActionResult,
+  typicalPayload,
+  getReadBulkRequest,
+} from '../__mocks__/request_responses';
+import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import { createRulesBulkRoute } from './create_rules_bulk_route';
+
+describe('create_rules_bulk', () => {
+  let { server, alertsClient, actionsClient, elasticsearch } = createMockServer();
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    ({ server, alertsClient, actionsClient, elasticsearch } = createMockServer());
+    elasticsearch.getCluster = jest.fn().mockImplementation(() => ({
+      callWithRequest: jest.fn().mockImplementation(() => true),
+    }));
+
+    createRulesBulkRoute(server);
+  });
+
+  describe('status codes with actionClient and alertClient', () => {
+    test('returns 200 when creating a single rule with a valid actionClient and alertClient', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.create.mockResolvedValue(createActionResult());
+      alertsClient.create.mockResolvedValue(getResult());
+      const { statusCode } = await server.inject(getReadBulkRequest());
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 404 if actionClient is not available on the route', async () => {
+      const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
+      createRulesRoute(serverWithoutActionClient);
+      const { statusCode } = await serverWithoutActionClient.inject(getReadBulkRequest());
+      expect(statusCode).toBe(404);
+    });
+
+    test('returns 404 if alertClient is not available on the route', async () => {
+      const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
+      createRulesRoute(serverWithoutAlertClient);
+      const { statusCode } = await serverWithoutAlertClient.inject(getReadBulkRequest());
+      expect(statusCode).toBe(404);
+    });
+
+    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
+      const {
+        serverWithoutActionOrAlertClient,
+      } = createMockServerWithoutActionOrAlertClientDecoration();
+      createRulesRoute(serverWithoutActionOrAlertClient);
+      const { statusCode } = await serverWithoutActionOrAlertClient.inject(getReadBulkRequest());
+      expect(statusCode).toBe(404);
+    });
+  });
+
+  describe('validation', () => {
+    test('returns 200 if rule_id is not given as the id is auto generated from the alert framework', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.create.mockResolvedValue(createActionResult());
+      alertsClient.create.mockResolvedValue(getResult());
+      // missing rule_id should return 200 as it will be auto generated if not given
+      const { rule_id, ...noRuleId } = typicalPayload();
+      const request: ServerInjectOptions = {
+        method: 'POST',
+        url: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+        payload: [noRuleId],
+      };
+      const { statusCode } = await server.inject(request);
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 200 if type is query', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.create.mockResolvedValue(createActionResult());
+      alertsClient.create.mockResolvedValue(getResult());
+      const { type, ...noType } = typicalPayload();
+      const request: ServerInjectOptions = {
+        method: 'POST',
+        url: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+        payload: [
+          {
+            ...noType,
+            type: 'query',
+          },
+        ],
+      };
+      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(getResult());
+      const { type, ...noType } = typicalPayload();
+      const request: ServerInjectOptions = {
+        method: 'POST',
+        url: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+        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/rules/create_rules_bulk_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
new file mode 100644
index 0000000000000..256b341fca656
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
@@ -0,0 +1,145 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Hapi from 'hapi';
+import { isFunction } from 'lodash/fp';
+import uuid from 'uuid';
+import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import { createRules } from '../../rules/create_rules';
+import { BulkRulesRequest } from '../../rules/types';
+import { ServerFacade } from '../../../../types';
+import { readRules } from '../../rules/read_rules';
+import { transformOrBulkError } from './utils';
+import { getIndexExists } from '../../index/get_index_exists';
+import {
+  callWithRequestFactory,
+  getIndex,
+  transformBulkError,
+  createBulkErrorObject,
+} from '../utils';
+import { createRulesBulkSchema } from '../schemas/create_rules_bulk_schema';
+
+export const createCreateRulesBulkRoute = (server: ServerFacade): Hapi.ServerRoute => {
+  return {
+    method: 'POST',
+    path: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+    options: {
+      tags: ['access:siem'],
+      validate: {
+        options: {
+          abortEarly: false,
+        },
+        payload: createRulesBulkSchema,
+      },
+    },
+    async handler(request: BulkRulesRequest, headers) {
+      const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
+      const actionsClient = isFunction(request.getActionsClient)
+        ? request.getActionsClient()
+        : null;
+
+      if (!alertsClient || !actionsClient) {
+        return headers.response().code(404);
+      }
+
+      const rules = Promise.all(
+        request.payload.map(async payloadRule => {
+          const {
+            created_at: createdAt,
+            description,
+            enabled,
+            false_positives: falsePositives,
+            from,
+            immutable,
+            query,
+            language,
+            output_index: outputIndex,
+            saved_id: savedId,
+            meta,
+            filters,
+            rule_id: ruleId,
+            index,
+            interval,
+            max_signals: maxSignals,
+            risk_score: riskScore,
+            name,
+            severity,
+            tags,
+            threats,
+            to,
+            type,
+            updated_at: updatedAt,
+            references,
+            timeline_id: timelineId,
+            version,
+          } = payloadRule;
+          const ruleIdOrUuid = ruleId ?? uuid.v4();
+          try {
+            const finalIndex = outputIndex != null ? outputIndex : getIndex(request, server);
+            const callWithRequest = callWithRequestFactory(request, server);
+            const indexExists = await getIndexExists(callWithRequest, finalIndex);
+            if (!indexExists) {
+              return createBulkErrorObject({
+                ruleId: ruleIdOrUuid,
+                statusCode: 409,
+                message: `To create a rule, the index must exist first. Index ${finalIndex} does not exist`,
+              });
+            }
+            if (ruleId != null) {
+              const rule = await readRules({ alertsClient, ruleId });
+              if (rule != null) {
+                return createBulkErrorObject({
+                  ruleId,
+                  statusCode: 409,
+                  message: `rule_id: "${ruleId}" already exists`,
+                });
+              }
+            }
+            const createdRule = await createRules({
+              alertsClient,
+              actionsClient,
+              createdAt,
+              description,
+              enabled,
+              falsePositives,
+              from,
+              immutable,
+              query,
+              language,
+              outputIndex: finalIndex,
+              savedId,
+              timelineId,
+              meta,
+              filters,
+              ruleId: ruleIdOrUuid,
+              index,
+              interval,
+              maxSignals,
+              riskScore,
+              name,
+              severity,
+              tags,
+              to,
+              type,
+              threats,
+              updatedAt,
+              references,
+              version,
+            });
+            return transformOrBulkError(ruleIdOrUuid, createdRule);
+          } catch (err) {
+            return transformBulkError(ruleIdOrUuid, err);
+          }
+        })
+      );
+      return rules;
+    },
+  };
+};
+
+export const createRulesBulkRoute = (server: ServerFacade): void => {
+  server.route(createCreateRulesBulkRoute(server));
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
index 0dc213e9e2173..476d5b8a49ba2 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
@@ -33,6 +33,7 @@ export const createCreateRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
     },
     async handler(request: RulesRequest, headers) {
       const {
+        created_at: createdAt,
         description,
         enabled,
         false_positives: falsePositives,
@@ -42,6 +43,7 @@ export const createCreateRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
         language,
         output_index: outputIndex,
         saved_id: savedId,
+        timeline_id: timelineId,
         meta,
         filters,
         rule_id: ruleId,
@@ -55,6 +57,7 @@ export const createCreateRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
         threats,
         to,
         type,
+        updated_at: updatedAt,
         references,
       } = request.payload;
       const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
@@ -87,6 +90,7 @@ export const createCreateRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
         const createdRule = await createRules({
           alertsClient,
           actionsClient,
+          createdAt,
           description,
           enabled,
           falsePositives,
@@ -96,6 +100,7 @@ export const createCreateRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
           language,
           outputIndex: finalIndex,
           savedId,
+          timelineId,
           meta,
           filters,
           ruleId: ruleId != null ? ruleId : uuid.v4(),
@@ -109,7 +114,9 @@ export const createCreateRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
           to,
           type,
           threats,
+          updatedAt,
           references,
+          version: 1,
         });
         return transformOrError(createdRule);
       } catch (err) {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
new file mode 100644
index 0000000000000..11a076951fd8c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
@@ -0,0 +1,129 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  createMockServer,
+  createMockServerWithoutActionClientDecoration,
+  createMockServerWithoutAlertClientDecoration,
+  createMockServerWithoutActionOrAlertClientDecoration,
+} from '../__mocks__/_mock_server';
+
+import { ServerInjectOptions } from 'hapi';
+import {
+  getFindResult,
+  getResult,
+  getFindResultWithSingleHit,
+  getDeleteBulkRequest,
+  getDeleteBulkRequestById,
+  getDeleteAsPostBulkRequest,
+  getDeleteAsPostBulkRequestById,
+} from '../__mocks__/request_responses';
+import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+
+import { deleteRulesBulkRoute } from './delete_rules_bulk_route';
+
+describe('delete_rules', () => {
+  let { server, alertsClient } = createMockServer();
+
+  beforeEach(() => {
+    ({ server, alertsClient } = createMockServer());
+    deleteRulesBulkRoute(server);
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('status codes with actionClient and alertClient', () => {
+    test('returns 200 when deleting a single rule with a valid actionClient and alertClient by alertId', async () => {
+      alertsClient.find.mockResolvedValue(getFindResultWithSingleHit());
+      alertsClient.get.mockResolvedValue(getResult());
+      alertsClient.delete.mockResolvedValue({});
+      const { statusCode } = await server.inject(getDeleteBulkRequest());
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 200 when deleting a single rule with a valid actionClient and alertClient by alertId using POST', async () => {
+      alertsClient.find.mockResolvedValue(getFindResultWithSingleHit());
+      alertsClient.get.mockResolvedValue(getResult());
+      alertsClient.delete.mockResolvedValue({});
+      const { statusCode } = await server.inject(getDeleteAsPostBulkRequest());
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 200 when deleting a single rule with a valid actionClient and alertClient by id', async () => {
+      alertsClient.find.mockResolvedValue(getFindResultWithSingleHit());
+      alertsClient.get.mockResolvedValue(getResult());
+      alertsClient.delete.mockResolvedValue({});
+      const { statusCode } = await server.inject(getDeleteBulkRequestById());
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 200 when deleting a single rule with a valid actionClient and alertClient by id using POST', async () => {
+      alertsClient.find.mockResolvedValue(getFindResultWithSingleHit());
+      alertsClient.get.mockResolvedValue(getResult());
+      alertsClient.delete.mockResolvedValue({});
+      const { statusCode } = await server.inject(getDeleteAsPostBulkRequestById());
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 200 because the error is in the payload when deleting a single rule that does not exist with a valid actionClient and alertClient', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      alertsClient.delete.mockResolvedValue({});
+      const { statusCode } = await server.inject(getDeleteBulkRequest());
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 404 in the payload when deleting a single rule that does not exist with a valid actionClient and alertClient', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      alertsClient.delete.mockResolvedValue({});
+      const { payload } = await server.inject(getDeleteBulkRequest());
+      const parsed = JSON.parse(payload);
+      expect(parsed).toEqual([
+        { error: { message: 'rule_id: "rule-1" not found', statusCode: 404 }, id: 'rule-1' },
+      ]);
+    });
+
+    test('returns 404 if actionClient is not available on the route', async () => {
+      const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
+      deleteRulesBulkRoute(serverWithoutActionClient);
+      const { statusCode } = await serverWithoutActionClient.inject(getDeleteBulkRequest());
+      expect(statusCode).toBe(404);
+    });
+
+    test('returns 404 if alertClient is not available on the route', async () => {
+      const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
+      deleteRulesBulkRoute(serverWithoutAlertClient);
+      const { statusCode } = await serverWithoutAlertClient.inject(getDeleteBulkRequest());
+      expect(statusCode).toBe(404);
+    });
+
+    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
+      const {
+        serverWithoutActionOrAlertClient,
+      } = createMockServerWithoutActionOrAlertClientDecoration();
+      deleteRulesBulkRoute(serverWithoutActionOrAlertClient);
+      const { statusCode } = await serverWithoutActionOrAlertClient.inject(getDeleteBulkRequest());
+      expect(statusCode).toBe(404);
+    });
+  });
+
+  describe('validation', () => {
+    test('returns 400 if given a non-existent id in the payload', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      alertsClient.delete.mockResolvedValue({});
+      const request: ServerInjectOptions = {
+        method: 'DELETE',
+        url: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+      };
+      const { statusCode } = await server.inject(request);
+      expect(statusCode).toBe(400);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.ts
new file mode 100644
index 0000000000000..a0801930f879a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.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 Hapi from 'hapi';
+import { isFunction } from 'lodash/fp';
+
+import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import { deleteRules } from '../../rules/delete_rules';
+import { ServerFacade } from '../../../../types';
+import { queryRulesBulkSchema } from '../schemas/query_rules_bulk_schema';
+import { transformOrBulkError, getIdBulkError } from './utils';
+import { transformBulkError } from '../utils';
+import { QueryBulkRequest } from '../../rules/types';
+
+export const createDeleteRulesBulkRoute: Hapi.ServerRoute = {
+  method: ['POST', 'DELETE'], // allow both POST and DELETE in case their client does not support bodies in DELETE
+  path: `${DETECTION_ENGINE_RULES_URL}/_bulk_delete`,
+  options: {
+    tags: ['access:siem'],
+    validate: {
+      options: {
+        abortEarly: false,
+      },
+      payload: queryRulesBulkSchema,
+    },
+  },
+  async handler(request: QueryBulkRequest, headers) {
+    const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
+    const actionsClient = isFunction(request.getActionsClient) ? request.getActionsClient() : null;
+
+    if (alertsClient == null || actionsClient == null) {
+      return headers.response().code(404);
+    }
+    const rules = Promise.all(
+      request.payload.map(async payloadRule => {
+        const { id, rule_id: ruleId } = payloadRule;
+        const idOrRuleIdOrUnknown = id ?? ruleId ?? '(unknown id)';
+        try {
+          const rule = await deleteRules({
+            actionsClient,
+            alertsClient,
+            id,
+            ruleId,
+          });
+
+          if (rule != null) {
+            return transformOrBulkError(idOrRuleIdOrUnknown, rule);
+          } else {
+            return getIdBulkError({ id, ruleId });
+          }
+        } catch (err) {
+          return transformBulkError(idOrRuleIdOrUnknown, err);
+        }
+      })
+    );
+    return rules;
+  },
+};
+
+export const deleteRulesBulkRoute = (server: ServerFacade): void => {
+  server.route(createDeleteRulesBulkRoute);
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.ts
index c2b2e2fdbbaef..8f771236269d9 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_route.ts
@@ -13,7 +13,7 @@ import { ServerFacade } from '../../../../types';
 import { queryRulesSchema } from '../schemas/query_rules_schema';
 import { getIdError, transformOrError } from './utils';
 import { transformError } from '../utils';
-import { QueryRequest } from './types';
+import { QueryRequest } from '../../rules/types';
 
 export const createDeleteRulesRoute: Hapi.ServerRoute = {
   method: 'DELETE',
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/read_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/read_rules_route.ts
index a842e68b6b7fe..4ff26ae99bd13 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/read_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/read_rules_route.ts
@@ -13,7 +13,7 @@ import { transformError } from '../utils';
 import { readRules } from '../../rules/read_rules';
 import { ServerFacade } from '../../../../types';
 import { queryRulesSchema } from '../schemas/query_rules_schema';
-import { QueryRequest } from './types';
+import { QueryRequest } from '../../rules/types';
 
 export const createReadRulesRoute: Hapi.ServerRoute = {
   method: 'GET',
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/types.ts
deleted file mode 100644
index f6878c9edc9b8..0000000000000
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/types.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 { RequestFacade } from '../../../../types';
-
-export type QueryRequest = Omit<RequestFacade, 'query'> & {
-  query: { id: string | undefined; rule_id: string | undefined };
-};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk.test.ts
new file mode 100644
index 0000000000000..9ae2941e6e5f2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk.test.ts
@@ -0,0 +1,168 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { updateRulesRoute } from './update_rules_route';
+import { ServerInjectOptions } from 'hapi';
+import {
+  getFindResult,
+  getResult,
+  updateActionResult,
+  typicalPayload,
+  getFindResultWithSingleHit,
+  getUpdateBulkRequest,
+} from '../__mocks__/request_responses';
+import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import { updateRulesBulkRoute } from './update_rules_bulk_route';
+
+describe('update_rules_bulk', () => {
+  let { server, alertsClient, actionsClient } = createMockServer();
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    ({ server, alertsClient, actionsClient } = createMockServer());
+    updateRulesBulkRoute(server);
+  });
+
+  describe('status codes with actionClient and alertClient', () => {
+    test('returns 200 when updating a single rule with a valid actionClient and alertClient', async () => {
+      alertsClient.find.mockResolvedValue(getFindResultWithSingleHit());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.update.mockResolvedValue(updateActionResult());
+      alertsClient.update.mockResolvedValue(getResult());
+      const { statusCode } = await server.inject(getUpdateBulkRequest());
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 200 as a response when updating a single rule that does not exist', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.update.mockResolvedValue(updateActionResult());
+      alertsClient.update.mockResolvedValue(getResult());
+      const { statusCode } = await server.inject(getUpdateBulkRequest());
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 404 within the payload when updating a single rule that does not exist', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.update.mockResolvedValue(updateActionResult());
+      alertsClient.update.mockResolvedValue(getResult());
+      const { payload } = await server.inject(getUpdateBulkRequest());
+      const parsed = JSON.parse(payload);
+      expect(parsed).toEqual([
+        { error: { message: 'rule_id: "rule-1" not found', statusCode: 404 }, id: 'rule-1' },
+      ]);
+    });
+
+    test('returns 404 if actionClient is not available on the route', async () => {
+      const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
+      updateRulesRoute(serverWithoutActionClient);
+      const { statusCode } = await serverWithoutActionClient.inject(getUpdateBulkRequest());
+      expect(statusCode).toBe(404);
+    });
+
+    test('returns 404 if alertClient is not available on the route', async () => {
+      const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
+      updateRulesRoute(serverWithoutAlertClient);
+      const { statusCode } = await serverWithoutAlertClient.inject(getUpdateBulkRequest());
+      expect(statusCode).toBe(404);
+    });
+
+    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
+      const {
+        serverWithoutActionOrAlertClient,
+      } = createMockServerWithoutActionOrAlertClientDecoration();
+      updateRulesRoute(serverWithoutActionOrAlertClient);
+      const { statusCode } = await serverWithoutActionOrAlertClient.inject(getUpdateBulkRequest());
+      expect(statusCode).toBe(404);
+    });
+  });
+
+  describe('validation', () => {
+    test('returns 400 if id is not given in either the body or the url', async () => {
+      alertsClient.find.mockResolvedValue(getFindResultWithSingleHit());
+      alertsClient.get.mockResolvedValue(getResult());
+      const { rule_id, ...noId } = typicalPayload();
+      const request: ServerInjectOptions = {
+        method: 'PUT',
+        url: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        payload: [noId],
+      };
+      const { statusCode } = await server.inject(request);
+      expect(statusCode).toBe(400);
+    });
+
+    test('returns errors as 200 to just indicate ok something happened', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      actionsClient.update.mockResolvedValue(updateActionResult());
+      alertsClient.update.mockResolvedValue(getResult());
+      const request: ServerInjectOptions = {
+        method: 'PUT',
+        url: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        payload: [typicalPayload()],
+      };
+      const { statusCode } = await server.inject(request);
+      expect(statusCode).toEqual(200);
+    });
+
+    test('returns 404 in the payload if the record does not exist yet', async () => {
+      alertsClient.find.mockResolvedValue(getFindResult());
+      actionsClient.update.mockResolvedValue(updateActionResult());
+      alertsClient.update.mockResolvedValue(getResult());
+      const request: ServerInjectOptions = {
+        method: 'PUT',
+        url: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        payload: [typicalPayload()],
+      };
+      const { payload } = await server.inject(request);
+      const parsed = JSON.parse(payload);
+      expect(parsed).toEqual([
+        { error: { message: 'rule_id: "rule-1" not found', statusCode: 404 }, id: 'rule-1' },
+      ]);
+    });
+
+    test('returns 200 if type is query', async () => {
+      alertsClient.find.mockResolvedValue(getFindResultWithSingleHit());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.update.mockResolvedValue(updateActionResult());
+      alertsClient.update.mockResolvedValue(getResult());
+      const request: ServerInjectOptions = {
+        method: 'PUT',
+        url: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        payload: [typicalPayload()],
+      };
+      const { statusCode } = await server.inject(request);
+      expect(statusCode).toBe(200);
+    });
+
+    test('returns 400 if type is not filter or kql', async () => {
+      alertsClient.find.mockResolvedValue(getFindResultWithSingleHit());
+      alertsClient.get.mockResolvedValue(getResult());
+      actionsClient.update.mockResolvedValue(updateActionResult());
+      alertsClient.update.mockResolvedValue(getResult());
+      const { type, ...noType } = typicalPayload();
+      const request: ServerInjectOptions = {
+        method: 'PUT',
+        url: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        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/rules/update_rules_bulk_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
new file mode 100644
index 0000000000000..b30b6c791522b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts
@@ -0,0 +1,119 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Hapi from 'hapi';
+import { isFunction } from 'lodash/fp';
+import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
+import { BulkUpdateRulesRequest } from '../../rules/types';
+import { ServerFacade } from '../../../../types';
+import { transformOrBulkError, getIdBulkError } from './utils';
+import { transformBulkError } from '../utils';
+import { updateRulesBulkSchema } from '../schemas/update_rules_bulk_schema';
+import { updateRules } from '../../rules/update_rules';
+
+export const createUpdateRulesBulkRoute = (server: ServerFacade): Hapi.ServerRoute => {
+  return {
+    method: 'PUT',
+    path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+    options: {
+      tags: ['access:siem'],
+      validate: {
+        options: {
+          abortEarly: false,
+        },
+        payload: updateRulesBulkSchema,
+      },
+    },
+    async handler(request: BulkUpdateRulesRequest, headers) {
+      const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
+      const actionsClient = isFunction(request.getActionsClient)
+        ? request.getActionsClient()
+        : null;
+
+      if (!alertsClient || !actionsClient) {
+        return headers.response().code(404);
+      }
+
+      const rules = Promise.all(
+        request.payload.map(async payloadRule => {
+          const {
+            description,
+            enabled,
+            false_positives: falsePositives,
+            from,
+            immutable,
+            query,
+            language,
+            output_index: outputIndex,
+            saved_id: savedId,
+            timeline_id: timelineId,
+            meta,
+            filters,
+            rule_id: ruleId,
+            id,
+            index,
+            interval,
+            max_signals: maxSignals,
+            risk_score: riskScore,
+            name,
+            severity,
+            tags,
+            to,
+            type,
+            threats,
+            references,
+            version,
+          } = payloadRule;
+          const idOrRuleIdOrUnknown = id ?? ruleId ?? '(unknown id)';
+          try {
+            const rule = await updateRules({
+              alertsClient,
+              actionsClient,
+              description,
+              enabled,
+              falsePositives,
+              from,
+              immutable,
+              query,
+              language,
+              outputIndex,
+              savedId,
+              timelineId,
+              meta,
+              filters,
+              id,
+              ruleId,
+              index,
+              interval,
+              maxSignals,
+              riskScore,
+              name,
+              severity,
+              tags,
+              to,
+              type,
+              threats,
+              references,
+              version,
+            });
+            if (rule != null) {
+              return transformOrBulkError(rule.id, rule);
+            } else {
+              return getIdBulkError({ id, ruleId });
+            }
+          } catch (err) {
+            return transformBulkError(idOrRuleIdOrUnknown, err);
+          }
+        })
+      );
+      return rules;
+    },
+  };
+};
+
+export const updateRulesBulkRoute = (server: ServerFacade): void => {
+  server.route(createUpdateRulesBulkRoute(server));
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
index 2e7b48afbb5d9..ec3d9514fa5db 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts
@@ -37,6 +37,7 @@ export const createUpdateRulesRoute: Hapi.ServerRoute = {
       language,
       output_index: outputIndex,
       saved_id: savedId,
+      timeline_id: timelineId,
       meta,
       filters,
       rule_id: ruleId,
@@ -52,6 +53,7 @@ export const createUpdateRulesRoute: Hapi.ServerRoute = {
       type,
       threats,
       references,
+      version,
     } = request.payload;
 
     const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
@@ -74,6 +76,7 @@ export const createUpdateRulesRoute: Hapi.ServerRoute = {
         language,
         outputIndex,
         savedId,
+        timelineId,
         meta,
         filters,
         id,
@@ -89,6 +92,7 @@ export const createUpdateRulesRoute: Hapi.ServerRoute = {
         type,
         threats,
         references,
+        version,
       });
       if (rule != null) {
         return transformOrError(rule);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.test.ts
index a2312ce25e72a..b1f61d11458fe 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.test.ts
@@ -12,17 +12,23 @@ import {
   transformFindAlertsOrError,
   transformOrError,
   transformTags,
+  getIdBulkError,
+  transformOrBulkError,
 } from './utils';
 import { getResult } from '../__mocks__/request_responses';
 import { INTERNAL_IDENTIFIER } from '../../../../../common/constants';
+import { OutputRuleAlertRest } from '../../types';
+import { BulkError } from '../utils';
 
 describe('utils', () => {
   describe('transformAlertToRule', () => {
     test('should work with a full data set', () => {
       const fullRule = getResult();
       const rule = transformAlertToRule(fullRule);
-      expect(rule).toEqual({
+      const expected: OutputRuleAlertRest = {
         created_by: 'elastic',
+        created_at: '2019-12-13T16:40:33.400Z',
+        updated_at: '2019-12-13T16:40:33.400Z',
         description: 'Detecting root and admin users',
         enabled: true,
         false_positives: [],
@@ -59,16 +65,34 @@ describe('utils', () => {
             ],
           },
         ],
+        filters: [
+          {
+            query: {
+              match_phrase: {
+                'host.name': 'some-host',
+              },
+            },
+          },
+        ],
+        meta: {
+          someMeta: 'someField',
+        },
+        saved_id: 'some-id',
+        timeline_id: 'some-timeline-id',
         to: 'now',
         type: 'query',
-      });
+        version: 1,
+      };
+      expect(rule).toEqual(expected);
     });
 
     test('should work with a partial data set missing data', () => {
       const fullRule = getResult();
       const { from, language, ...omitData } = transformAlertToRule(fullRule);
-      expect(omitData).toEqual({
+      const expected: Partial<OutputRuleAlertRest> = {
         created_by: 'elastic',
+        created_at: '2019-12-13T16:40:33.400Z',
+        updated_at: '2019-12-13T16:40:33.400Z',
         description: 'Detecting root and admin users',
         enabled: true,
         false_positives: [],
@@ -103,17 +127,35 @@ describe('utils', () => {
             ],
           },
         ],
+        filters: [
+          {
+            query: {
+              match_phrase: {
+                'host.name': 'some-host',
+              },
+            },
+          },
+        ],
+        meta: {
+          someMeta: 'someField',
+        },
+        saved_id: 'some-id',
+        timeline_id: 'some-timeline-id',
         to: 'now',
         type: 'query',
-      });
+        version: 1,
+      };
+      expect(omitData).toEqual(expected);
     });
 
     test('should omit query if query is null', () => {
       const fullRule = getResult();
       fullRule.params.query = null;
       const rule = transformAlertToRule(fullRule);
-      expect(rule).toEqual({
+      const expected: Partial<OutputRuleAlertRest> = {
         created_by: 'elastic',
+        created_at: '2019-12-13T16:40:33.400Z',
+        updated_at: '2019-12-13T16:40:33.400Z',
         description: 'Detecting root and admin users',
         enabled: true,
         false_positives: [],
@@ -149,17 +191,35 @@ describe('utils', () => {
             ],
           },
         ],
+        filters: [
+          {
+            query: {
+              match_phrase: {
+                'host.name': 'some-host',
+              },
+            },
+          },
+        ],
+        meta: {
+          someMeta: 'someField',
+        },
+        saved_id: 'some-id',
+        timeline_id: 'some-timeline-id',
         to: 'now',
         type: 'query',
-      });
+        version: 1,
+      };
+      expect(rule).toEqual(expected);
     });
 
     test('should omit query if query is undefined', () => {
       const fullRule = getResult();
       fullRule.params.query = undefined;
       const rule = transformAlertToRule(fullRule);
-      expect(rule).toEqual({
+      const expected: Partial<OutputRuleAlertRest> = {
         created_by: 'elastic',
+        created_at: '2019-12-13T16:40:33.400Z',
+        updated_at: '2019-12-13T16:40:33.400Z',
         description: 'Detecting root and admin users',
         enabled: true,
         false_positives: [],
@@ -195,9 +255,25 @@ describe('utils', () => {
             ],
           },
         ],
+        filters: [
+          {
+            query: {
+              match_phrase: {
+                'host.name': 'some-host',
+              },
+            },
+          },
+        ],
+        meta: {
+          someMeta: 'someField',
+        },
+        saved_id: 'some-id',
+        timeline_id: 'some-timeline-id',
         to: 'now',
         type: 'query',
-      });
+        version: 1,
+      };
+      expect(rule).toEqual(expected);
     });
 
     test('should omit a mix of undefined, null, and missing fields', () => {
@@ -205,8 +281,10 @@ describe('utils', () => {
       fullRule.params.query = undefined;
       fullRule.params.language = null;
       const { from, enabled, ...omitData } = transformAlertToRule(fullRule);
-      expect(omitData).toEqual({
+      const expected: Partial<OutputRuleAlertRest> = {
         created_by: 'elastic',
+        created_at: '2019-12-13T16:40:33.400Z',
+        updated_at: '2019-12-13T16:40:33.400Z',
         description: 'Detecting root and admin users',
         false_positives: [],
         id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
@@ -239,17 +317,35 @@ describe('utils', () => {
             ],
           },
         ],
+        filters: [
+          {
+            query: {
+              match_phrase: {
+                'host.name': 'some-host',
+              },
+            },
+          },
+        ],
+        meta: {
+          someMeta: 'someField',
+        },
+        saved_id: 'some-id',
+        timeline_id: 'some-timeline-id',
         to: 'now',
         type: 'query',
-      });
+        version: 1,
+      };
+      expect(omitData).toEqual(expected);
     });
 
     test('should return enabled is equal to false', () => {
       const fullRule = getResult();
       fullRule.enabled = false;
       const ruleWithEnabledFalse = transformAlertToRule(fullRule);
-      expect(ruleWithEnabledFalse).toEqual({
+      const expected: OutputRuleAlertRest = {
         created_by: 'elastic',
+        created_at: '2019-12-13T16:40:33.400Z',
+        updated_at: '2019-12-13T16:40:33.400Z',
         description: 'Detecting root and admin users',
         enabled: false,
         from: 'now-6m',
@@ -286,17 +382,35 @@ describe('utils', () => {
             ],
           },
         ],
+        filters: [
+          {
+            query: {
+              match_phrase: {
+                'host.name': 'some-host',
+              },
+            },
+          },
+        ],
+        meta: {
+          someMeta: 'someField',
+        },
+        saved_id: 'some-id',
+        timeline_id: 'some-timeline-id',
         to: 'now',
         type: 'query',
-      });
+        version: 1,
+      };
+      expect(ruleWithEnabledFalse).toEqual(expected);
     });
 
     test('should return immutable is equal to false', () => {
       const fullRule = getResult();
       fullRule.params.immutable = false;
       const ruleWithEnabledFalse = transformAlertToRule(fullRule);
-      expect(ruleWithEnabledFalse).toEqual({
+      const expected: OutputRuleAlertRest = {
         created_by: 'elastic',
+        created_at: '2019-12-13T16:40:33.400Z',
+        updated_at: '2019-12-13T16:40:33.400Z',
         description: 'Detecting root and admin users',
         enabled: true,
         from: 'now-6m',
@@ -333,16 +447,34 @@ describe('utils', () => {
             ],
           },
         ],
+        filters: [
+          {
+            query: {
+              match_phrase: {
+                'host.name': 'some-host',
+              },
+            },
+          },
+        ],
+        meta: {
+          someMeta: 'someField',
+        },
+        saved_id: 'some-id',
+        timeline_id: 'some-timeline-id',
         to: 'now',
         type: 'query',
-      });
+        version: 1,
+      };
+      expect(ruleWithEnabledFalse).toEqual(expected);
     });
 
     test('should work with tags but filter out any internal tags', () => {
       const fullRule = getResult();
       fullRule.tags = ['tag 1', 'tag 2', `${INTERNAL_IDENTIFIER}_some_other_value`];
       const rule = transformAlertToRule(fullRule);
-      expect(rule).toEqual({
+      const expected: OutputRuleAlertRest = {
+        created_at: '2019-12-13T16:40:33.400Z',
+        updated_at: '2019-12-13T16:40:33.400Z',
         created_by: 'elastic',
         description: 'Detecting root and admin users',
         enabled: true,
@@ -380,9 +512,25 @@ describe('utils', () => {
             ],
           },
         ],
+        filters: [
+          {
+            query: {
+              match_phrase: {
+                'host.name': 'some-host',
+              },
+            },
+          },
+        ],
+        meta: {
+          someMeta: 'someField',
+        },
+        saved_id: 'some-id',
+        timeline_id: 'some-timeline-id',
         to: 'now',
         type: 'query',
-      });
+        version: 1,
+      };
+      expect(rule).toEqual(expected);
     });
   });
 
@@ -438,50 +586,66 @@ describe('utils', () => {
       const output = transformFindAlertsOrError({
         data: [getResult()],
       });
-      expect(output).toEqual({
-        data: [
+      const expected: OutputRuleAlertRest = {
+        created_by: 'elastic',
+        created_at: '2019-12-13T16:40:33.400Z',
+        updated_at: '2019-12-13T16:40:33.400Z',
+        description: 'Detecting root and admin users',
+        enabled: true,
+        false_positives: [],
+        from: 'now-6m',
+        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+        immutable: false,
+        output_index: '.siem-signals',
+        index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
+        interval: '5m',
+        risk_score: 50,
+        rule_id: 'rule-1',
+        language: 'kuery',
+        max_signals: 100,
+        name: 'Detect Root/Admin Users',
+        query: 'user.name: root or user.name: admin',
+        references: ['http://www.example.com', 'https://ww.example.com'],
+        severity: 'high',
+        updated_by: 'elastic',
+        tags: [],
+        to: 'now',
+        type: 'query',
+        threats: [
           {
-            created_by: 'elastic',
-            description: 'Detecting root and admin users',
-            enabled: true,
-            false_positives: [],
-            from: 'now-6m',
-            id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
-            immutable: false,
-            output_index: '.siem-signals',
-            index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
-            interval: '5m',
-            risk_score: 50,
-            rule_id: 'rule-1',
-            language: 'kuery',
-            max_signals: 100,
-            name: 'Detect Root/Admin Users',
-            query: 'user.name: root or user.name: admin',
-            references: ['http://www.example.com', 'https://ww.example.com'],
-            severity: 'high',
-            updated_by: 'elastic',
-            tags: [],
-            to: 'now',
-            type: 'query',
-            threats: [
+            framework: 'MITRE ATT&CK',
+            tactic: {
+              id: 'TA0040',
+              name: 'impact',
+              reference: 'https://attack.mitre.org/tactics/TA0040/',
+            },
+            techniques: [
               {
-                framework: 'MITRE ATT&CK',
-                tactic: {
-                  id: 'TA0040',
-                  name: 'impact',
-                  reference: 'https://attack.mitre.org/tactics/TA0040/',
-                },
-                techniques: [
-                  {
-                    id: 'T1499',
-                    name: 'endpoint denial of service',
-                    reference: 'https://attack.mitre.org/techniques/T1499/',
-                  },
-                ],
+                id: 'T1499',
+                name: 'endpoint denial of service',
+                reference: 'https://attack.mitre.org/techniques/T1499/',
               },
             ],
           },
         ],
+        filters: [
+          {
+            query: {
+              match_phrase: {
+                'host.name': 'some-host',
+              },
+            },
+          },
+        ],
+        meta: {
+          someMeta: 'someField',
+        },
+        saved_id: 'some-id',
+        timeline_id: 'some-timeline-id',
+        version: 1,
+      };
+      expect(output).toEqual({
+        data: [expected],
       });
     });
 
@@ -494,8 +658,10 @@ describe('utils', () => {
   describe('transformOrError', () => {
     test('outputs 200 if the data is of type siem alert', () => {
       const output = transformOrError(getResult());
-      expect(output).toEqual({
+      const expected: OutputRuleAlertRest = {
         created_by: 'elastic',
+        created_at: '2019-12-13T16:40:33.400Z',
+        updated_at: '2019-12-13T16:40:33.400Z',
         description: 'Detecting root and admin users',
         enabled: true,
         false_positives: [],
@@ -534,7 +700,23 @@ describe('utils', () => {
             ],
           },
         ],
-      });
+        filters: [
+          {
+            query: {
+              match_phrase: {
+                'host.name': 'some-host',
+              },
+            },
+          },
+        ],
+        meta: {
+          someMeta: 'someField',
+        },
+        saved_id: 'some-id',
+        timeline_id: 'some-timeline-id',
+        version: 1,
+      };
+      expect(output).toEqual(expected);
     });
 
     test('returns 500 if the data is not of type siem alert', () => {
@@ -559,4 +741,151 @@ describe('utils', () => {
       ]);
     });
   });
+
+  describe('getIdBulkError', () => {
+    test('outputs message about id not being found if only id is defined and ruleId is undefined', () => {
+      const error = getIdBulkError({ id: '123', ruleId: undefined });
+      const expected: BulkError = {
+        id: '123',
+        error: { message: 'id: "123" not found', statusCode: 404 },
+      };
+      expect(error).toEqual(expected);
+    });
+
+    test('outputs message about id not being found if only id is defined and ruleId is null', () => {
+      const error = getIdBulkError({ id: '123', ruleId: null });
+      const expected: BulkError = {
+        id: '123',
+        error: { message: 'id: "123" not found', statusCode: 404 },
+      };
+      expect(error).toEqual(expected);
+    });
+
+    test('outputs message about ruleId not being found if only ruleId is defined and id is undefined', () => {
+      const error = getIdBulkError({ id: undefined, ruleId: 'rule-id-123' });
+      const expected: BulkError = {
+        id: 'rule-id-123',
+        error: { message: 'rule_id: "rule-id-123" not found', statusCode: 404 },
+      };
+      expect(error).toEqual(expected);
+    });
+
+    test('outputs message about ruleId not being found if only ruleId is defined and id is null', () => {
+      const error = getIdBulkError({ id: null, ruleId: 'rule-id-123' });
+      const expected: BulkError = {
+        id: 'rule-id-123',
+        error: { message: 'rule_id: "rule-id-123" not found', statusCode: 404 },
+      };
+      expect(error).toEqual(expected);
+    });
+
+    test('outputs message about both being not defined when both are undefined', () => {
+      const error = getIdBulkError({ id: undefined, ruleId: undefined });
+      const expected: BulkError = {
+        id: '(unknown id)',
+        error: { message: 'id or rule_id should have been defined', statusCode: 404 },
+      };
+      expect(error).toEqual(expected);
+    });
+
+    test('outputs message about both being not defined when both are null', () => {
+      const error = getIdBulkError({ id: null, ruleId: null });
+      const expected: BulkError = {
+        id: '(unknown id)',
+        error: { message: 'id or rule_id should have been defined', statusCode: 404 },
+      };
+      expect(error).toEqual(expected);
+    });
+
+    test('outputs message about both being not defined when id is null and ruleId is undefined', () => {
+      const error = getIdBulkError({ id: null, ruleId: undefined });
+      const expected: BulkError = {
+        id: '(unknown id)',
+        error: { message: 'id or rule_id should have been defined', statusCode: 404 },
+      };
+      expect(error).toEqual(expected);
+    });
+
+    test('outputs message about both being not defined when id is undefined and ruleId is null', () => {
+      const error = getIdBulkError({ id: undefined, ruleId: null });
+      const expected: BulkError = {
+        id: '(unknown id)',
+        error: { message: 'id or rule_id should have been defined', statusCode: 404 },
+      };
+      expect(error).toEqual(expected);
+    });
+  });
+
+  describe('transformOrBulkError', () => {
+    test('outputs 200 if the data is of type siem alert', () => {
+      const output = transformOrBulkError('rule-1', getResult());
+      const expected: OutputRuleAlertRest = {
+        created_by: 'elastic',
+        created_at: '2019-12-13T16:40:33.400Z',
+        updated_at: '2019-12-13T16:40:33.400Z',
+        description: 'Detecting root and admin users',
+        enabled: true,
+        false_positives: [],
+        from: 'now-6m',
+        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+        immutable: false,
+        output_index: '.siem-signals',
+        index: ['auditbeat-*', 'filebeat-*', 'packetbeat-*', 'winlogbeat-*'],
+        interval: '5m',
+        rule_id: 'rule-1',
+        risk_score: 50,
+        language: 'kuery',
+        max_signals: 100,
+        name: 'Detect Root/Admin Users',
+        query: 'user.name: root or user.name: admin',
+        references: ['http://www.example.com', 'https://ww.example.com'],
+        severity: 'high',
+        updated_by: 'elastic',
+        tags: [],
+        to: 'now',
+        type: 'query',
+        threats: [
+          {
+            framework: 'MITRE ATT&CK',
+            tactic: {
+              id: 'TA0040',
+              name: 'impact',
+              reference: 'https://attack.mitre.org/tactics/TA0040/',
+            },
+            techniques: [
+              {
+                id: 'T1499',
+                name: 'endpoint denial of service',
+                reference: 'https://attack.mitre.org/techniques/T1499/',
+              },
+            ],
+          },
+        ],
+        filters: [
+          {
+            query: {
+              match_phrase: {
+                'host.name': 'some-host',
+              },
+            },
+          },
+        ],
+        meta: {
+          someMeta: 'someField',
+        },
+        saved_id: 'some-id',
+        timeline_id: 'some-timeline-id',
+        version: 1,
+      };
+      expect(output).toEqual(expected);
+    });
+
+    test('returns 500 if the data is not of type siem alert', () => {
+      const output = transformOrBulkError('rule-1', { data: [{ random: 1 }] });
+      expect(output).toEqual({
+        id: 'rule-1',
+        error: { message: 'Internal error transforming', statusCode: 500 },
+      });
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
index ff06b63a034b8..b9bf3f8a942fc 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/utils.ts
@@ -9,6 +9,7 @@ import { pickBy } from 'lodash/fp';
 import { INTERNAL_IDENTIFIER } from '../../../../../common/constants';
 import { RuleAlertType, isAlertType, isAlertTypes } from '../../rules/types';
 import { OutputRuleAlertRest } from '../../types';
+import { createBulkErrorObject, BulkError } from '../utils';
 
 export const getIdError = ({
   id,
@@ -26,6 +27,34 @@ export const getIdError = ({
   }
 };
 
+export const getIdBulkError = ({
+  id,
+  ruleId,
+}: {
+  id: string | undefined | null;
+  ruleId: string | undefined | null;
+}): BulkError => {
+  if (id != null) {
+    return createBulkErrorObject({
+      ruleId: id,
+      statusCode: 404,
+      message: `id: "${id}" not found`,
+    });
+  } else if (ruleId != null) {
+    return createBulkErrorObject({
+      ruleId,
+      statusCode: 404,
+      message: `rule_id: "${ruleId}" not found`,
+    });
+  } else {
+    return createBulkErrorObject({
+      ruleId: '(unknown id)',
+      statusCode: 404,
+      message: `id or rule_id should have been defined`,
+    });
+  }
+};
+
 export const transformTags = (tags: string[]): string[] => {
   return tags.filter(tag => !tag.startsWith(INTERNAL_IDENTIFIER));
 };
@@ -34,6 +63,8 @@ export const transformTags = (tags: string[]): string[] => {
 // those on the export
 export const transformAlertToRule = (alert: RuleAlertType): Partial<OutputRuleAlertRest> => {
   return pickBy<OutputRuleAlertRest>((value: unknown) => value != null, {
+    created_at: alert.params.createdAt,
+    updated_at: alert.params.updatedAt,
     created_by: alert.createdBy,
     description: alert.params.description,
     enabled: alert.enabled,
@@ -43,7 +74,7 @@ export const transformAlertToRule = (alert: RuleAlertType): Partial<OutputRuleAl
     id: alert.id,
     immutable: alert.params.immutable,
     index: alert.params.index,
-    interval: alert.interval,
+    interval: alert.schedule.interval,
     rule_id: alert.params.ruleId,
     language: alert.params.language,
     output_index: alert.params.outputIndex,
@@ -53,6 +84,7 @@ export const transformAlertToRule = (alert: RuleAlertType): Partial<OutputRuleAl
     query: alert.params.query,
     references: alert.params.references,
     saved_id: alert.params.savedId,
+    timeline_id: alert.params.timelineId,
     meta: alert.params.meta,
     severity: alert.params.severity,
     updated_by: alert.updatedBy,
@@ -60,6 +92,7 @@ export const transformAlertToRule = (alert: RuleAlertType): Partial<OutputRuleAl
     to: alert.params.to,
     type: alert.params.type,
     threats: alert.params.threats,
+    version: alert.params.version,
   });
 };
 
@@ -79,3 +112,18 @@ export const transformOrError = (alert: unknown): Partial<OutputRuleAlertRest> |
     return new Boom('Internal error transforming', { statusCode: 500 });
   }
 };
+
+export const transformOrBulkError = (
+  ruleId: string,
+  alert: unknown
+): Partial<OutputRuleAlertRest> | BulkError => {
+  if (isAlertType(alert)) {
+    return transformAlertToRule(alert);
+  } else {
+    return createBulkErrorObject({
+      ruleId,
+      statusCode: 500,
+      message: 'Internal error transforming',
+    });
+  }
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts
new file mode 100644
index 0000000000000..04a72135d3f00
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.test.ts
@@ -0,0 +1,1123 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UpdateRuleAlertParamsRest } from '../../rules/types';
+import { ThreatParams, RuleAlertParamsRest } from '../../types';
+import { addPrepackagedRulesSchema } from './add_prepackaged_rules_schema';
+
+describe('add prepackaged rules schema', () => {
+  test('empty objects do not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<UpdateRuleAlertParamsRest>>({}).error
+    ).toBeTruthy();
+  });
+
+  test('made up values do not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest & { madeUp: string }>>({
+        madeUp: 'hi',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('[rule_id] does not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('[rule_id, description] does not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        description: 'some description',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('[rule_id, description, from] does not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('[rule_id, description, from, to] does not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('[rule_id, description, from, to, name] does not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        name: 'some-name',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('[rule_id, description, from, to, name, severity] does not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        name: 'some-name',
+        severity: 'severity',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('[rule_id, description, from, to, name, severity, type] does not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        name: 'some-name',
+        severity: 'severity',
+        type: 'query',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('[rule_id, description, from, to, name, severity, type, interval] does not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('[rule_id, description, from, to, name, severity, type, interval, index] does not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_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('[rule_id, description, from, to, name, severity, type, query, index, interval, version] does validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        name: 'some-name',
+        severity: 'severity',
+        type: 'query',
+        query: 'some query',
+        index: ['index-1'],
+        interval: '5m',
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('[rule_id, description, from, to, index, name, severity, interval, type, query, language] does not validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_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
+    ).toBeTruthy();
+  });
+
+  test('[rule_id, description, from, to, index, name, severity, interval, type, query, language, risk_score, version] does validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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',
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('[rule_id, description, from, to, index, name, severity, interval, type, query, language, risk_score, output_index] does not validate because output_index is not allowed', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        output_index: '.siem-signals',
+        risk_score: 50,
+        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',
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('[rule_id, description, from, to, index, name, severity, interval, type, filter, risk_score, version] does validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        risk_score: 50,
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('You can send in an empty array to threats', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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,
+        threats: [],
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+  test('[rule_id, description, from, to, index, name, severity, interval, type, filter, risk_score, version, threats] does validate', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        threats: [
+          {
+            framework: 'someFramework',
+            tactic: {
+              id: 'fakeId',
+              name: 'fakeName',
+              reference: 'fakeRef',
+            },
+            techniques: [
+              {
+                id: 'techniqueId',
+                name: 'techniqueName',
+                reference: 'techniqueRef',
+              },
+            ],
+          },
+        ],
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('allows references to be sent as valid', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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',
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('defaults references to an array', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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',
+        version: 1,
+      }).value.references
+    ).toEqual([]);
+  });
+
+  test('defaults immutable to true', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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',
+        version: 1,
+      }).value.immutable
+    ).toEqual(true);
+  });
+
+  test('defaults enabled to false', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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',
+        version: 1,
+      }).value.enabled
+    ).toEqual(false);
+  });
+
+  test('rule_id is required', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        risk_score: 50,
+        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',
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('references cannot be numbers', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<
+        Partial<Omit<RuleAlertParamsRest, 'references'>> & { references: number[] }
+      >({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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],
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('indexes cannot be numbers', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<
+        Partial<Omit<RuleAlertParamsRest, 'index'>> & { index: number[] }
+      >({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: [5],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        query: 'some-query',
+        language: 'kuery',
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('defaults interval to 5 min', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        type: 'query',
+        version: 1,
+      }).value.interval
+    ).toEqual('5m');
+  });
+
+  test('defaults max signals to 100', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        version: 1,
+      }).value.max_signals
+    ).toEqual(100);
+  });
+
+  test('saved_id is required when type is saved_query and will not validate without out', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'saved_query',
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('saved_id is required when type is saved_query and validates with it', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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',
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('saved_query type can have filters with it', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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: [],
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('filters cannot be a string', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<
+        Partial<Omit<RuleAlertParamsRest, 'filters'> & { filters: string }>
+      >({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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: 'some string',
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('language validates with kuery', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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',
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('language validates with lucene', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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',
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('language does not validate with something made up', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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',
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('max_signals cannot be negative', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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,
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('max_signals cannot be zero', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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,
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('max_signals can be 1', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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,
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('You can optionally send in an array of tags', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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,
+        tags: ['tag_1', 'tag_2'],
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('You cannot send in an array of tags that are numbers', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<
+        Partial<Omit<RuleAlertParamsRest, 'tags'>> & { tags: number[] }
+      >({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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,
+        tags: [0, 1, 2],
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot send in an array of threats that are missing "framework"', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<
+        Partial<Omit<RuleAlertParamsRest, 'threats'>> & {
+          threats: Array<Partial<Omit<ThreatParams, 'framework'>>>;
+        }
+      >({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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,
+        threats: [
+          {
+            tactic: {
+              id: 'fakeId',
+              name: 'fakeName',
+              reference: 'fakeRef',
+            },
+            techniques: [
+              {
+                id: 'techniqueId',
+                name: 'techniqueName',
+                reference: 'techniqueRef',
+              },
+            ],
+          },
+        ],
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+  test('You cannot send in an array of threats that are missing "tactic"', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<
+        Partial<Omit<RuleAlertParamsRest, 'threats'>> & {
+          threats: Array<Partial<Omit<ThreatParams, 'tactic'>>>;
+        }
+      >({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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,
+        threats: [
+          {
+            framework: 'fake',
+            techniques: [
+              {
+                id: 'techniqueId',
+                name: 'techniqueName',
+                reference: 'techniqueRef',
+              },
+            ],
+          },
+        ],
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+  test('You cannot send in an array of threats that are missing "techniques"', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<
+        Partial<Omit<RuleAlertParamsRest, 'threats'>> & {
+          threats: Array<Partial<Omit<ThreatParams, 'technique'>>>;
+        }
+      >({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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,
+        threats: [
+          {
+            framework: 'fake',
+            tactic: {
+              id: 'fakeId',
+              name: 'fakeName',
+              reference: 'fakeRef',
+            },
+          },
+        ],
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You can optionally send in an array of false positives', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        false_positives: ['false_1', 'false_2'],
+        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,
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('You cannot send in an array of false positives that are numbers', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<
+        Partial<Omit<RuleAlertParamsRest, 'false_positives'>> & { false_positives: number[] }
+      >({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        false_positives: [5, 4],
+        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,
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You can optionally set the immutable to be true', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        max_signals: 1,
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('You cannot set the immutable to be a number', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<
+        Partial<Omit<RuleAlertParamsRest, 'immutable'>> & { immutable: number }
+      >({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: 5,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        max_signals: 1,
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot set the risk_score to 101', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 101,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        max_signals: 1,
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You cannot set the risk_score to -1', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: -1,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        max_signals: 1,
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You can set the risk_score to 0', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 0,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        max_signals: 1,
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('You can set the risk_score to 100', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 100,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        max_signals: 1,
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('You can set meta to any object you want', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        max_signals: 1,
+        meta: {
+          somethingMadeUp: { somethingElse: true },
+        },
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('You cannot create meta as a string', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<
+        Partial<Omit<RuleAlertParamsRest, 'meta'> & { meta: string }>
+      >({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        query: 'some query',
+        language: 'kuery',
+        max_signals: 1,
+        meta: 'should not work',
+        version: 1,
+      }).error
+    ).toBeTruthy();
+  });
+
+  test('You can omit the query string when filters are present', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<
+        Partial<Omit<RuleAlertParamsRest, 'meta'> & { meta: string }>
+      >({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        description: 'some description',
+        from: 'now-5m',
+        to: 'now',
+        immutable: true,
+        index: ['index-1'],
+        name: 'some-name',
+        severity: 'severity',
+        interval: '5m',
+        type: 'query',
+        references: ['index-1'],
+        language: 'kuery',
+        filters: [],
+        max_signals: 1,
+        version: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('validates with timeline_id', () => {
+    expect(
+      addPrepackagedRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        risk_score: 50,
+        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',
+        version: 1,
+        timeline_id: 'timeline-id',
+      }).error
+    ).toBeFalsy();
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.ts
new file mode 100644
index 0000000000000..c993b05cb5f29
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/add_prepackaged_rules_schema.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Joi from 'joi';
+
+/* eslint-disable @typescript-eslint/camelcase */
+import {
+  enabled,
+  description,
+  false_positives,
+  filters,
+  from,
+  immutable,
+  index,
+  rule_id,
+  interval,
+  query,
+  language,
+  saved_id,
+  timeline_id,
+  meta,
+  risk_score,
+  max_signals,
+  name,
+  severity,
+  tags,
+  to,
+  type,
+  threats,
+  references,
+  version,
+} from './schemas';
+/* eslint-enable @typescript-eslint/camelcase */
+
+import { DEFAULT_MAX_SIGNALS } from '../../../../../common/constants';
+
+/**
+ * Big differences between this schema and the createRulesSchema
+ *  - rule_id is required here
+ *  - output_index is not allowed (and instead the space index must be used)
+ *  - immutable defaults to true instead of to false
+ *  - enabled defaults to false instead of true
+ *  - version is a required field that must exist
+ */
+export const addPrepackagedRulesSchema = Joi.object({
+  description: description.required(),
+  enabled: enabled.default(false),
+  false_positives: false_positives.default([]),
+  filters,
+  from: from.required(),
+  rule_id: rule_id.required(),
+  immutable: immutable.default(true),
+  index,
+  interval: interval.default('5m'),
+  query: query.allow('').default(''),
+  language: language.default('kuery'),
+  saved_id: saved_id.when('type', {
+    is: 'saved_query',
+    then: Joi.required(),
+    otherwise: Joi.forbidden(),
+  }),
+  timeline_id,
+  meta,
+  risk_score: risk_score.required(),
+  max_signals: max_signals.default(DEFAULT_MAX_SIGNALS),
+  name: name.required(),
+  severity: severity.required(),
+  tags: tags.default([]),
+  to: to.required(),
+  type: type.required(),
+  threats: threats.default([]),
+  references: references.default([]),
+  version: version.required(),
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_bulk_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_bulk_schema.test.ts
new file mode 100644
index 0000000000000..17fb5320daa01
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_bulk_schema.test.ts
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createRulesBulkSchema } from './create_rules_bulk_schema';
+import { UpdateRuleAlertParamsRest } from '../../rules/types';
+
+// only the basics of testing are here.
+// see: create_rules_schema.test.ts for the bulk of the validation tests
+// this just wraps createRulesSchema in an array
+describe('create_rules_bulk_schema', () => {
+  test('can take an empty array and validate it', () => {
+    expect(
+      createRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([]).error
+    ).toBeFalsy();
+  });
+
+  test('made up values do not validate', () => {
+    expect(
+      createRulesBulkSchema.validate<[{ madeUp: string }]>([
+        {
+          madeUp: 'hi',
+        },
+      ]).error
+    ).toBeTruthy();
+  });
+
+  test('single array of [id] does validate', () => {
+    expect(
+      createRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([
+        {
+          rule_id: 'rule-1',
+          risk_score: 50,
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+          severity: 'severity',
+          type: 'query',
+          query: 'some query',
+          index: ['index-1'],
+          interval: '5m',
+        },
+      ]).error
+    ).toBeFalsy();
+  });
+
+  test('two values of [id] does validate', () => {
+    expect(
+      createRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([
+        {
+          rule_id: 'rule-1',
+          risk_score: 50,
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+          severity: 'severity',
+          type: 'query',
+          query: 'some query',
+          index: ['index-1'],
+          interval: '5m',
+        },
+        {
+          rule_id: 'rule-2',
+          risk_score: 50,
+          description: 'some description',
+          from: 'now-5m',
+          to: 'now',
+          name: 'some-name',
+          severity: 'severity',
+          type: 'query',
+          query: 'some query',
+          index: ['index-1'],
+          interval: '5m',
+        },
+      ]).error
+    ).toBeFalsy();
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_bulk_schema.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_bulk_schema.ts
new file mode 100644
index 0000000000000..bcc4475f2d9f0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_bulk_schema.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 Joi from 'joi';
+
+import { createRulesSchema } from './create_rules_schema';
+
+export const createRulesBulkSchema = Joi.array().items(createRulesSchema);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts
index 4efea69db1f41..8dc00b66e97a3 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.test.ts
@@ -1044,4 +1044,26 @@ describe('create rules schema', () => {
       }).error
     ).toBeFalsy();
   });
+
+  test('timeline_id validates', () => {
+    expect(
+      createRulesSchema.validate<Partial<RuleAlertParamsRest>>({
+        rule_id: 'rule-1',
+        output_index: '.siem-signals',
+        risk_score: 50,
+        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',
+        timeline_id: 'some_id',
+      }).error
+    ).toBeFalsy();
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.ts
index ccda7256d2eeb..614451312d04d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/create_rules_schema.ts
@@ -21,6 +21,7 @@ import {
   language,
   output_index,
   saved_id,
+  timeline_id,
   meta,
   risk_score,
   max_signals,
@@ -31,6 +32,7 @@ import {
   type,
   threats,
   references,
+  version,
 } from './schemas';
 /* eslint-enable @typescript-eslint/camelcase */
 
@@ -54,6 +56,7 @@ export const createRulesSchema = Joi.object({
     then: Joi.required(),
     otherwise: Joi.forbidden(),
   }),
+  timeline_id,
   meta,
   risk_score: risk_score.required(),
   max_signals: max_signals.default(DEFAULT_MAX_SIGNALS),
@@ -64,4 +67,5 @@ export const createRulesSchema = Joi.object({
   type: type.required(),
   threats: threats.default([]),
   references: references.default([]),
+  version: version.default(1),
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_rules_bulk_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_rules_bulk_schema.test.ts
new file mode 100644
index 0000000000000..6450da37699d8
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_rules_bulk_schema.test.ts
@@ -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 { queryRulesBulkSchema } from './query_rules_bulk_schema';
+import { UpdateRuleAlertParamsRest } from '../../rules/types';
+
+// only the basics of testing are here.
+// see: query_rules_bulk_schema.test.ts for the bulk of the validation tests
+// this just wraps queryRulesSchema in an array
+describe('query_rules_bulk_schema', () => {
+  test('can take an empty array and validate it', () => {
+    expect(
+      queryRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([]).error
+    ).toBeFalsy();
+  });
+
+  test('both rule_id and id being supplied do not validate', () => {
+    expect(
+      queryRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([
+        {
+          rule_id: '1',
+          id: '1',
+        },
+      ]).error
+    ).toBeTruthy();
+  });
+
+  test('both rule_id and id being supplied do not validate if one array element works but the second does not', () => {
+    expect(
+      queryRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([
+        {
+          id: '1',
+        },
+        {
+          rule_id: '1',
+          id: '1',
+        },
+      ]).error
+    ).toBeTruthy();
+  });
+
+  test('only id validates', () => {
+    expect(
+      queryRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([{ id: '1' }]).error
+    ).toBeFalsy();
+  });
+
+  test('only id validates with two elements', () => {
+    expect(
+      queryRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([
+        { id: '1' },
+        { id: '2' },
+      ]).error
+    ).toBeFalsy();
+  });
+
+  test('only rule_id validates', () => {
+    expect(
+      queryRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([{ rule_id: '1' }])
+        .error
+    ).toBeFalsy();
+  });
+
+  test('only rule_id validates with two elements', () => {
+    expect(
+      queryRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([
+        { rule_id: '1' },
+        { rule_id: '2' },
+      ]).error
+    ).toBeFalsy();
+  });
+
+  test('both id and rule_id validates with two separate elements', () => {
+    expect(
+      queryRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([
+        { id: '1' },
+        { rule_id: '2' },
+      ]).error
+    ).toBeFalsy();
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_rules_bulk_schema.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_rules_bulk_schema.ts
new file mode 100644
index 0000000000000..13ccac282281d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_rules_bulk_schema.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 Joi from 'joi';
+
+import { queryRulesSchema } from './query_rules_schema';
+
+export const queryRulesBulkSchema = Joi.array().items(queryRulesSchema);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_signals_index_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_signals_index_schema.test.ts
index 4f0dbf10f4559..5c293f4825b95 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_signals_index_schema.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_signals_index_schema.test.ts
@@ -7,12 +7,15 @@
 import { querySignalsSchema } from './query_signals_index_schema';
 import { SignalsQueryRestParams } from '../../signals/types';
 
-describe('query and aggs on signals index', () => {
-  test('query and aggs simultaneously', () => {
+describe('query, aggs, size, _source and track_total_hits on signals index', () => {
+  test('query, aggs, size, _source and track_total_hits simultaneously', () => {
     expect(
       querySignalsSchema.validate<Partial<SignalsQueryRestParams>>({
         query: {},
         aggs: {},
+        size: 1,
+        track_total_hits: true,
+        _source: ['field'],
       }).error
     ).toBeFalsy();
   });
@@ -33,7 +36,31 @@ describe('query and aggs on signals index', () => {
     ).toBeFalsy();
   });
 
-  test('missing query and aggs is invalid', () => {
+  test('size only', () => {
+    expect(
+      querySignalsSchema.validate<Partial<SignalsQueryRestParams>>({
+        size: 1,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('track_total_hits only', () => {
+    expect(
+      querySignalsSchema.validate<Partial<SignalsQueryRestParams>>({
+        track_total_hits: true,
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('_source only', () => {
+    expect(
+      querySignalsSchema.validate<Partial<SignalsQueryRestParams>>({
+        _source: ['field'],
+      }).error
+    ).toBeFalsy();
+  });
+
+  test('missing query, aggs, size, _source and track_total_hits is invalid', () => {
     expect(querySignalsSchema.validate<Partial<SignalsQueryRestParams>>({}).error).toBeTruthy();
   });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_signals_index_schema.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_signals_index_schema.ts
index 53ce50692e84a..0a6fceb44f845 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_signals_index_schema.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/query_signals_index_schema.ts
@@ -9,4 +9,7 @@ import Joi from 'joi';
 export const querySignalsSchema = Joi.object({
   query: Joi.object(),
   aggs: Joi.object(),
+  size: Joi.number(),
+  track_total_hits: Joi.boolean(),
+  _source: Joi.array().items(Joi.string()),
 }).min(1);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/schemas.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/schemas.ts
index 5ab8ea3b8af3e..68d3166c74d6d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/schemas.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/schemas.ts
@@ -23,6 +23,7 @@ export const query = Joi.string();
 export const language = Joi.string().valid('kuery', 'lucene');
 export const output_index = Joi.string();
 export const saved_id = Joi.string();
+export const timeline_id = Joi.string();
 export const meta = Joi.object();
 export const max_signals = Joi.number().greater(0);
 export const name = Joi.string();
@@ -77,3 +78,5 @@ export const threats = Joi.array().items(
     techniques: threat_techniques.required(),
   })
 );
+
+export const version = Joi.number().min(1);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_bulk_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_bulk_schema.test.ts
new file mode 100644
index 0000000000000..2b1bad39eb686
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_bulk_schema.test.ts
@@ -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 { updateRulesBulkSchema } from './update_rules_bulk_schema';
+import { UpdateRuleAlertParamsRest } from '../../rules/types';
+
+// only the basics of testing are here.
+// see: update_rules_schema.test.ts for the bulk of the validation tests
+// this just wraps updateRulesSchema in an array
+describe('update_rules_bulk_schema', () => {
+  test('can take an empty array and validate it', () => {
+    expect(
+      updateRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([]).error
+    ).toBeFalsy();
+  });
+
+  test('made up values do not validate', () => {
+    expect(
+      updateRulesBulkSchema.validate<[{ madeUp: string }]>([
+        {
+          madeUp: 'hi',
+        },
+      ]).error
+    ).toBeTruthy();
+  });
+
+  test('single array of [id] does validate', () => {
+    expect(
+      updateRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([
+        {
+          id: 'rule-1',
+        },
+      ]).error
+    ).toBeFalsy();
+  });
+
+  test('two values of [id] does validate', () => {
+    expect(
+      updateRulesBulkSchema.validate<Array<Partial<UpdateRuleAlertParamsRest>>>([
+        {
+          id: 'rule-1',
+        },
+        {
+          id: 'rule-2',
+        },
+      ]).error
+    ).toBeFalsy();
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_bulk_schema.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_bulk_schema.ts
new file mode 100644
index 0000000000000..123ec2d5b7e15
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_bulk_schema.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 Joi from 'joi';
+
+import { updateRulesSchema } from './update_rules_schema';
+
+export const updateRulesBulkSchema = Joi.array().items(updateRulesSchema);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts
index 606a30309b2ab..1f00e0a13866a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.test.ts
@@ -866,4 +866,22 @@ describe('update rules schema', () => {
       }).error
     ).toBeTruthy();
   });
+
+  test('timeline_id validates', () => {
+    expect(
+      updateRulesSchema.validate<Partial<UpdateRuleAlertParamsRest>>({
+        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',
+        timeline_id: 'some-id',
+      }).error
+    ).toBeFalsy();
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.ts
index 244d8d1f5cc77..afd8a5fce4833 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/schemas/update_rules_schema.ts
@@ -21,6 +21,7 @@ import {
   language,
   output_index,
   saved_id,
+  timeline_id,
   meta,
   risk_score,
   max_signals,
@@ -32,6 +33,7 @@ import {
   threats,
   references,
   id,
+  version,
 } from './schemas';
 /* eslint-enable @typescript-eslint/camelcase */
 
@@ -50,6 +52,7 @@ export const updateRulesSchema = Joi.object({
   language,
   output_index,
   saved_id,
+  timeline_id,
   meta,
   risk_score,
   max_signals,
@@ -60,4 +63,5 @@ export const updateRulesSchema = Joi.object({
   type,
   threats,
   references,
+  version,
 }).xor('id', 'rule_id');
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/query_signals_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/query_signals_route.ts
index 89ffed259cf77..6d1896b1a8171 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/query_signals_route.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/signals/query_signals_route.ts
@@ -25,14 +25,14 @@ export const querySignalsRouteDef = (server: ServerFacade): Hapi.ServerRoute =>
       },
     },
     async handler(request: SignalsQueryRequest) {
-      const { query, aggs } = request.payload;
-      const body = { query, aggs };
+      const { query, aggs, _source, track_total_hits, size } = request.payload;
       const index = getIndex(request, server);
       const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
+
       try {
         return callWithRequest(request, 'search', {
           index,
-          body,
+          body: { query, aggs, _source, track_total_hits, size },
         });
       } catch (exc) {
         // error while getting or updating signal with id: id in signal index .siem-signals
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.test.ts
index 8ca5c24d88100..fa95c77f646d6 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.test.ts
@@ -6,7 +6,7 @@
 
 import Boom from 'boom';
 
-import { transformError } from './utils';
+import { transformError, transformBulkError, BulkError } from './utils';
 
 describe('utils', () => {
   describe('transformError', () => {
@@ -44,5 +44,66 @@ describe('utils', () => {
       const transformed = transformError(error);
       expect(Boom.isBoom(transformed)).toBe(false);
     });
+
+    test('it detects a TypeError and returns a Boom', () => {
+      const error: TypeError = new TypeError('I have a type error');
+      const transformed = transformError(error);
+      expect(Boom.isBoom(transformed)).toBe(true);
+    });
+
+    test('it detects a TypeError and returns a Boom status of 400', () => {
+      const error: TypeError = new TypeError('I have a type error');
+      const transformed = transformError(error) as Boom;
+      expect(transformed.output.statusCode).toBe(400);
+    });
+  });
+
+  describe('transformBulkError', () => {
+    test('returns transformed object if it is a boom object', () => {
+      const boom = new Boom('some boom message', { statusCode: 400 });
+      const transformed = transformBulkError('rule-1', boom);
+      const expected: BulkError = {
+        id: 'rule-1',
+        error: { message: 'some boom message', statusCode: 400 },
+      };
+      expect(transformed).toEqual(expected);
+    });
+
+    test('returns a normal error if it is some non boom object that has a statusCode', () => {
+      const error: Error & { statusCode?: number } = {
+        statusCode: 403,
+        name: 'some name',
+        message: 'some message',
+      };
+      const transformed = transformBulkError('rule-1', error);
+      const expected: BulkError = {
+        id: 'rule-1',
+        error: { message: 'some message', statusCode: 403 },
+      };
+      expect(transformed).toEqual(expected);
+    });
+
+    test('returns a 500 if the status code is not set', () => {
+      const error: Error & { statusCode?: number } = {
+        name: 'some name',
+        message: 'some message',
+      };
+      const transformed = transformBulkError('rule-1', error);
+      const expected: BulkError = {
+        id: 'rule-1',
+        error: { message: 'some message', statusCode: 500 },
+      };
+      expect(transformed).toEqual(expected);
+    });
+
+    test('it detects a TypeError and returns a Boom status of 400', () => {
+      const error: TypeError = new TypeError('I have a type error');
+      const transformed = transformBulkError('rule-1', error);
+      const expected: BulkError = {
+        id: 'rule-1',
+        error: { message: 'I have a type error', statusCode: 400 },
+      };
+      expect(transformed).toEqual(expected);
+    });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts
index aed0ced5cdeb5..d9a8efd673883 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/utils.ts
@@ -14,6 +14,10 @@ export const transformError = (err: Error & { statusCode?: number }) => {
   } else {
     if (err.statusCode != null) {
       return new Boom(err.message, { statusCode: err.statusCode });
+    } else if (err instanceof TypeError) {
+      // allows us to throw type errors instead of booms in some conditions
+      // where we don't want to mingle Boom with the rest of the code
+      return new Boom(err.message, { statusCode: 400 });
     } else {
       // natively return the err and allow the regular framework
       // to deal with the error when it is a non Boom
@@ -22,6 +26,56 @@ export const transformError = (err: Error & { statusCode?: number }) => {
   }
 };
 
+export interface BulkError {
+  id: string;
+  error: {
+    statusCode: number;
+    message: string;
+  };
+}
+export const createBulkErrorObject = ({
+  ruleId,
+  statusCode,
+  message,
+}: {
+  ruleId: string;
+  statusCode: number;
+  message: string;
+}): BulkError => {
+  return {
+    id: ruleId,
+    error: {
+      statusCode,
+      message,
+    },
+  };
+};
+
+export const transformBulkError = (
+  ruleId: string,
+  err: Error & { statusCode?: number }
+): BulkError => {
+  if (Boom.isBoom(err)) {
+    return createBulkErrorObject({
+      ruleId,
+      statusCode: err.output.statusCode,
+      message: err.message,
+    });
+  } else if (err instanceof TypeError) {
+    return createBulkErrorObject({
+      ruleId,
+      statusCode: 400,
+      message: err.message,
+    });
+  } else {
+    return createBulkErrorObject({
+      ruleId,
+      statusCode: err.statusCode ?? 500,
+      message: err.message,
+    });
+  }
+};
+
 export const getIndex = (request: RequestFacade, server: ServerFacade): string => {
   const spaceId = server.plugins.spaces.getSpaceId(request);
   const signalsIndex = server.config().get(`xpack.${APP_ID}.${SIGNALS_INDEX_KEY}`);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_rule_id_to_tags.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_rule_id_to_tags.test.ts
deleted file mode 100644
index 5a92c8ef42ed7..0000000000000
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_rule_id_to_tags.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 { addRuleIdToTags } from './add_rule_id_to_tags';
-import { INTERNAL_RULE_ID_KEY } from '../../../../common/constants';
-
-describe('add_rule_id_to_tags', () => {
-  test('it should add a rule id as an internal structure to a single tag', () => {
-    const tags = addRuleIdToTags(['tag 1'], 'rule-1');
-    expect(tags).toEqual(['tag 1', `${INTERNAL_RULE_ID_KEY}:rule-1`]);
-  });
-
-  test('it should add a rule id as an internal structure to two tags', () => {
-    const tags = addRuleIdToTags(['tag 1', 'tag 2'], 'rule-1');
-    expect(tags).toEqual(['tag 1', 'tag 2', `${INTERNAL_RULE_ID_KEY}:rule-1`]);
-  });
-
-  test('it should add a rule id as an internal structure with empty tags', () => {
-    const tags = addRuleIdToTags([], 'rule-1');
-    expect(tags).toEqual([`${INTERNAL_RULE_ID_KEY}:rule-1`]);
-  });
-
-  test('it should add not add an internal structure if rule id is undefined', () => {
-    const tags = addRuleIdToTags(['tag 1'], undefined);
-    expect(tags).toEqual(['tag 1']);
-  });
-
-  test('it should add not add an internal structure if rule id is null', () => {
-    const tags = addRuleIdToTags(['tag 1'], null);
-    expect(tags).toEqual(['tag 1']);
-  });
-});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_rule_id_to_tags.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_rule_id_to_tags.ts
deleted file mode 100644
index 1cf97881d514b..0000000000000
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_rule_id_to_tags.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 { INTERNAL_RULE_ID_KEY } from '../../../../common/constants';
-
-export const addRuleIdToTags = (tags: string[], ruleId: string | null | undefined): string[] => {
-  if (ruleId == null) {
-    return tags;
-  } else {
-    return [...tags, `${INTERNAL_RULE_ID_KEY}:${ruleId}`];
-  }
-};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_tags.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_tags.test.ts
new file mode 100644
index 0000000000000..8bfd9bef63733
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_tags.test.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { addTags } from './add_tags';
+import { INTERNAL_RULE_ID_KEY, INTERNAL_IMMUTABLE_KEY } from '../../../../common/constants';
+
+describe('add_tags', () => {
+  test('if given a null everything this returns a new array for tags', () => {
+    const tags = addTags(null, null, null);
+    expect(tags).toEqual([]);
+  });
+
+  test('if given a undefined everything this returns a new array for tags', () => {
+    const tags = addTags(undefined, undefined, undefined);
+    expect(tags).toEqual([]);
+  });
+
+  test('it should add a rule id as an internal structure to a single tag', () => {
+    const tags = addTags(['tag 1'], 'rule-1', null);
+    expect(tags).toEqual(['tag 1', `${INTERNAL_RULE_ID_KEY}:rule-1`]);
+  });
+
+  test('it should add a rule id as an internal structure to a single tag if the input tags is null', () => {
+    const tags = addTags(null, 'rule-1', null);
+    expect(tags).toEqual([`${INTERNAL_RULE_ID_KEY}:rule-1`]);
+  });
+
+  test('it should add a rule id as an internal structure to two tags', () => {
+    const tags = addTags(['tag 1', 'tag 2'], 'rule-1', null);
+    expect(tags).toEqual(['tag 1', 'tag 2', `${INTERNAL_RULE_ID_KEY}:rule-1`]);
+  });
+
+  test('it should add a rule id as an internal structure with empty tags', () => {
+    const tags = addTags([], 'rule-1', null);
+    expect(tags).toEqual([`${INTERNAL_RULE_ID_KEY}:rule-1`]);
+  });
+
+  test('it should add a immutable true as an internal structure with empty tags', () => {
+    const tags = addTags([], null, true);
+    expect(tags).toEqual([`${INTERNAL_IMMUTABLE_KEY}:true`]);
+  });
+
+  test('it should add a immutable false as an internal structure with empty tags', () => {
+    const tags = addTags([], null, false);
+    expect(tags).toEqual([`${INTERNAL_IMMUTABLE_KEY}:false`]);
+  });
+
+  test('it should add a rule id as an internal structure with immutable true', () => {
+    const tags = addTags([], 'rule-1', true);
+    expect(tags).toEqual([`${INTERNAL_RULE_ID_KEY}:rule-1`, `${INTERNAL_IMMUTABLE_KEY}:true`]);
+  });
+
+  test('it should add a rule id as an internal structure with immutable false', () => {
+    const tags = addTags([], 'rule-1', false);
+    expect(tags).toEqual([`${INTERNAL_RULE_ID_KEY}:rule-1`, `${INTERNAL_IMMUTABLE_KEY}:false`]);
+  });
+
+  test('it should add not add an internal structure if only a tag is given', () => {
+    const tags = addTags(['tag 1'], undefined, null);
+    expect(tags).toEqual(['tag 1']);
+  });
+
+  test('it should add not add an internal structure if everything is null', () => {
+    const tags = addTags(['tag 1'], null, null);
+    expect(tags).toEqual(['tag 1']);
+  });
+
+  test('it should add not add an internal structure if everything is undefined', () => {
+    const tags = addTags(['tag 1'], undefined, undefined);
+    expect(tags).toEqual(['tag 1']);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_tags.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_tags.ts
new file mode 100644
index 0000000000000..f33f6ada83190
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/add_tags.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 { INTERNAL_RULE_ID_KEY, INTERNAL_IMMUTABLE_KEY } from '../../../../common/constants';
+
+export const addTags = (
+  tags: string[] | null | undefined,
+  ruleId: string | null | undefined,
+  immutable: boolean | null | undefined
+): string[] => {
+  const defaultedTags = tags != null ? tags : [];
+  if (ruleId != null && immutable != null) {
+    return [
+      ...defaultedTags,
+      `${INTERNAL_RULE_ID_KEY}:${ruleId}`,
+      `${INTERNAL_IMMUTABLE_KEY}:${immutable}`,
+    ];
+  } else if (ruleId != null && immutable == null) {
+    return [...defaultedTags, `${INTERNAL_RULE_ID_KEY}:${ruleId}`];
+  } else if (ruleId == null && immutable != null) {
+    return [...defaultedTags, `${INTERNAL_IMMUTABLE_KEY}:${immutable}`];
+  } else {
+    return defaultedTags;
+  }
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts
index c4c31190e1e83..07cf0b0c716cc 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SIGNALS_ID } from '../../../../common/constants';
+import { APP_ID, SIGNALS_ID } from '../../../../common/constants';
 import { RuleParams } from './types';
-import { addRuleIdToTags } from './add_rule_id_to_tags';
+import { addTags } from './add_tags';
 
 export const createRules = async ({
   alertsClient,
@@ -18,6 +18,7 @@ export const createRules = async ({
   query,
   language,
   savedId,
+  timelineId,
   meta,
   filters,
   ruleId,
@@ -34,13 +35,16 @@ export const createRules = async ({
   to,
   type,
   references,
+  version,
 }: RuleParams) => {
   return alertsClient.create({
     data: {
       name,
-      tags: addRuleIdToTags(tags, ruleId),
+      tags: addTags(tags, ruleId, immutable),
       alertTypeId: SIGNALS_ID,
+      consumer: APP_ID,
       params: {
+        createdAt: new Date().toISOString(),
         description,
         ruleId,
         index,
@@ -51,6 +55,7 @@ export const createRules = async ({
         language,
         outputIndex,
         savedId,
+        timelineId,
         meta,
         filters,
         maxSignals,
@@ -59,9 +64,11 @@ export const createRules = async ({
         threats,
         to,
         type,
+        updatedAt: new Date().toISOString(),
         references,
+        version,
       },
-      interval,
+      schedule: { interval },
       enabled,
       actions: [], // TODO: Create and add actions here once we have email, etc...
       throttle: null,
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/find_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/find_rules.ts
index c1058bd353e8c..5f69082e3fc71 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/find_rules.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/find_rules.ts
@@ -5,7 +5,7 @@
  */
 
 import { SIGNALS_ID } from '../../../../common/constants';
-import { FindRuleParams } from './types';
+import { FindRuleParams, RuleAlertType } from './types';
 
 export const getFilter = (filter: string | null | undefined) => {
   if (filter == null) {
@@ -33,5 +33,10 @@ export const findRules = async ({
       sortOrder,
       sortField,
     },
-  });
+  }) as Promise<{
+    page: number;
+    perPage: number;
+    total: number;
+    data: RuleAlertType[];
+  }>;
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_existing_prepackaged_rules.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_existing_prepackaged_rules.test.ts
new file mode 100644
index 0000000000000..bb28a5575f51e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_existing_prepackaged_rules.test.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 { alertsClientMock } from '../../../../../alerting/server/alerts_client.mock';
+import { AlertsClient } from '../../../../../alerting';
+import {
+  getResult,
+  getFindResultWithSingleHit,
+  getFindResultWithMultiHits,
+} from '../routes/__mocks__/request_responses';
+import { getExistingPrepackagedRules } from './get_existing_prepackaged_rules';
+
+describe('get_existing_prepackaged_rules', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('getExistingPrepackagedRules', () => {
+    test('should return a single item in a single page', async () => {
+      const alertsClient = alertsClientMock.create();
+      alertsClient.find.mockResolvedValue(getFindResultWithSingleHit());
+      const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
+      const rules = await getExistingPrepackagedRules({
+        alertsClient: unsafeCast,
+      });
+      expect(rules).toEqual([getResult()]);
+    });
+
+    test('should return 2 items over two pages, one per page', async () => {
+      const alertsClient = alertsClientMock.create();
+
+      const result1 = getResult();
+      result1.id = '4baa53f8-96da-44ee-ad58-41bccb7f9f3d';
+
+      const result2 = getResult();
+      result2.id = '5baa53f8-96da-44ee-ad58-41bccb7f9f3d';
+
+      alertsClient.find.mockResolvedValueOnce(
+        getFindResultWithMultiHits({ data: [result1], perPage: 1, page: 1, total: 2 })
+      );
+      alertsClient.find.mockResolvedValueOnce(
+        getFindResultWithMultiHits({ data: [result2], perPage: 1, page: 2, total: 2 })
+      );
+
+      const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
+      const rules = await getExistingPrepackagedRules({
+        alertsClient: unsafeCast,
+      });
+      expect(rules).toEqual([result1, result2]);
+    });
+
+    test('should return 3 items with over 3 pages one per page', async () => {
+      const alertsClient = alertsClientMock.create();
+
+      const result1 = getResult();
+      result1.id = '4baa53f8-96da-44ee-ad58-41bccb7f9f3d';
+
+      const result2 = getResult();
+      result2.id = '5baa53f8-96da-44ee-ad58-41bccb7f9f3d';
+
+      const result3 = getResult();
+      result3.id = 'f3e1bf0b-b95f-43da-b1de-5d2f0af2287a';
+
+      alertsClient.find.mockResolvedValueOnce(
+        getFindResultWithMultiHits({ data: [result1], perPage: 1, page: 1, total: 3 })
+      );
+
+      alertsClient.find.mockResolvedValueOnce(
+        getFindResultWithMultiHits({ data: [result2], perPage: 1, page: 2, total: 3 })
+      );
+
+      alertsClient.find.mockResolvedValueOnce(
+        getFindResultWithMultiHits({ data: [result3], perPage: 1, page: 2, total: 3 })
+      );
+
+      const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
+      const rules = await getExistingPrepackagedRules({
+        alertsClient: unsafeCast,
+      });
+      expect(rules).toEqual([result1, result2, result3]);
+    });
+
+    test('should return 3 items over 1 pages with all on one page', async () => {
+      const alertsClient = alertsClientMock.create();
+
+      const result1 = getResult();
+      result1.id = '4baa53f8-96da-44ee-ad58-41bccb7f9f3d';
+
+      const result2 = getResult();
+      result2.id = '5baa53f8-96da-44ee-ad58-41bccb7f9f3d';
+
+      const result3 = getResult();
+      result3.id = 'f3e1bf0b-b95f-43da-b1de-5d2f0af2287a';
+
+      alertsClient.find.mockResolvedValueOnce(
+        getFindResultWithMultiHits({
+          data: [result1, result2, result3],
+          perPage: 3,
+          page: 1,
+          total: 3,
+        })
+      );
+
+      const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
+      const rules = await getExistingPrepackagedRules({
+        alertsClient: unsafeCast,
+      });
+      expect(rules).toEqual([result1, result2, result3]);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_existing_prepackaged_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_existing_prepackaged_rules.ts
new file mode 100644
index 0000000000000..fa2e2124d0539
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_existing_prepackaged_rules.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { INTERNAL_IMMUTABLE_KEY } from '../../../../common/constants';
+import { AlertsClient } from '../../../../../alerting';
+import { RuleAlertType, isAlertTypes } from './types';
+import { findRules } from './find_rules';
+
+export const DEFAULT_PER_PAGE: number = 100;
+
+export const getExistingPrepackagedRules = async ({
+  alertsClient,
+  perPage = DEFAULT_PER_PAGE,
+}: {
+  alertsClient: AlertsClient;
+  perPage?: number;
+}): Promise<RuleAlertType[]> => {
+  const firstPrepackedRules = await findRules({
+    alertsClient,
+    filter: `alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:true"`,
+    perPage,
+    page: 1,
+  });
+  const totalPages = Math.ceil(firstPrepackedRules.total / firstPrepackedRules.perPage);
+  if (totalPages <= 1) {
+    if (isAlertTypes(firstPrepackedRules.data)) {
+      return firstPrepackedRules.data;
+    } else {
+      // If this was ever true, you have a really messed up system.
+      // This is keep typescript happy since we have an unknown with data
+      return [];
+    }
+  } else {
+    const returnPrepackagedRules = await Array(totalPages - 1)
+      .fill({})
+      .map((_, page) => {
+        // page index starts at 2 as we already got the first page and we have more pages to go
+        return findRules({
+          alertsClient,
+          filter: `alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:true"`,
+          perPage,
+          page: page + 2,
+        });
+      })
+      .reduce<Promise<object[]>>(async (accum, nextPage) => {
+        return [...(await accum), ...(await nextPage).data];
+      }, Promise.resolve(firstPrepackedRules.data));
+
+    if (isAlertTypes(returnPrepackagedRules)) {
+      return returnPrepackagedRules;
+    } else {
+      // If this was ever true, you have a really messed up system.
+      // This is keep typescript happy since we have an unknown with data
+      return [];
+    }
+  }
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_prepackaged_rules.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_prepackaged_rules.test.ts
new file mode 100644
index 0000000000000..24184b023bee3
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_prepackaged_rules.test.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getPrepackagedRules } from './get_prepackaged_rules';
+
+describe('get_existing_prepackaged_rules', () => {
+  test('should not throw any errors with the existing checked in pre-packaged rules', () => {
+    expect(() => getPrepackagedRules()).not.toThrow();
+  });
+
+  test('should throw an exception if a pre-packaged rule is not valid', () => {
+    expect(() => getPrepackagedRules([{ not_valid_made_up_key: true }])).toThrow(
+      'name: "(rule_name unknown)", rule_id: "(rule_id unknown)" within the folder rules/prepackaged_rules is not a valid detection engine rule. Expect the system to not work with pre-packaged rules until this rule is fixed or the file is removed. Error is: child "description" fails because ["description" is required]'
+    );
+  });
+
+  test('should throw an exception with a message having rule_id and name in it', () => {
+    expect(() => getPrepackagedRules([{ name: 'rule name', rule_id: 'id-123' }])).toThrow(
+      'name: "rule name", rule_id: "id-123" within the folder rules/prepackaged_rules is not a valid detection engine rule. Expect the system to not work with pre-packaged rules until this rule is fixed or the file is removed. Error is: child "description" fails because ["description" is required]'
+    );
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_prepackaged_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_prepackaged_rules.ts
new file mode 100644
index 0000000000000..376ad4eb287d5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_prepackaged_rules.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 { RuleAlertParamsRest } from '../types';
+import { addPrepackagedRulesSchema } from '../routes/schemas/add_prepackaged_rules_schema';
+import { rawRules } from './prepackaged_rules';
+
+/**
+ * Validate the rules from the file system and throw any errors indicating to the developer
+ * that they are adding incorrect schema rules. Also this will auto-flush in all the default
+ * aspects such as default interval of 5 minutes, default arrays, etc...
+ */
+export const validateAllPrepackagedRules = (
+  rules: RuleAlertParamsRest[]
+): RuleAlertParamsRest[] => {
+  return rules.map(rule => {
+    const validatedRule = addPrepackagedRulesSchema.validate(rule);
+    if (validatedRule.error != null) {
+      const ruleName = rule.name ? rule.name : '(rule_name unknown)';
+      const ruleId = rule.rule_id ? rule.rule_id : '(rule_id unknown)';
+      throw new TypeError(
+        `name: "${ruleName}", rule_id: "${ruleId}" within the folder rules/prepackaged_rules ` +
+          `is not a valid detection engine rule. Expect the system ` +
+          `to not work with pre-packaged rules until this rule is fixed ` +
+          `or the file is removed. Error is: ${validatedRule.error.message}`
+      );
+    } else {
+      return validatedRule.value;
+    }
+  });
+};
+
+export const getPrepackagedRules = (rules = rawRules): RuleAlertParamsRest[] => {
+  return validateAllPrepackagedRules(rules);
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_install.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_install.test.ts
new file mode 100644
index 0000000000000..1a2bd4a10ac2d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_install.test.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getRulesToInstall } from './get_rules_to_install';
+import { getResult, fullRuleAlertParamsRest } from '../routes/__mocks__/request_responses';
+
+describe('get_rules_to_install', () => {
+  test('should return empty array if both rule sets are empty', () => {
+    const update = getRulesToInstall([], []);
+    expect(update).toEqual([]);
+  });
+
+  test('should return empty array if the two rule ids match', () => {
+    const ruleFromFileSystem = fullRuleAlertParamsRest();
+    ruleFromFileSystem.rule_id = 'rule-1';
+
+    const installedRule = getResult();
+    installedRule.params.ruleId = 'rule-1';
+    const update = getRulesToInstall([ruleFromFileSystem], [installedRule]);
+    expect(update).toEqual([]);
+  });
+
+  test('should return the rule to install if the id of the two rules do not match', () => {
+    const ruleFromFileSystem = fullRuleAlertParamsRest();
+    ruleFromFileSystem.rule_id = 'rule-1';
+
+    const installedRule = getResult();
+    installedRule.params.ruleId = 'rule-2';
+    const update = getRulesToInstall([ruleFromFileSystem], [installedRule]);
+    expect(update).toEqual([ruleFromFileSystem]);
+  });
+
+  test('should return two rules to install if both the ids of the two rules do not match', () => {
+    const ruleFromFileSystem1 = fullRuleAlertParamsRest();
+    ruleFromFileSystem1.rule_id = 'rule-1';
+
+    const ruleFromFileSystem2 = fullRuleAlertParamsRest();
+    ruleFromFileSystem2.rule_id = 'rule-2';
+
+    const installedRule = getResult();
+    installedRule.params.ruleId = 'rule-3';
+    const update = getRulesToInstall([ruleFromFileSystem1, ruleFromFileSystem2], [installedRule]);
+    expect(update).toEqual([ruleFromFileSystem1, ruleFromFileSystem2]);
+  });
+
+  test('should return two rules of three to install if both the ids of the two rules do not match but the third does', () => {
+    const ruleFromFileSystem1 = fullRuleAlertParamsRest();
+    ruleFromFileSystem1.rule_id = 'rule-1';
+
+    const ruleFromFileSystem2 = fullRuleAlertParamsRest();
+    ruleFromFileSystem2.rule_id = 'rule-2';
+
+    const ruleFromFileSystem3 = fullRuleAlertParamsRest();
+    ruleFromFileSystem3.rule_id = 'rule-3';
+
+    const installedRule = getResult();
+    installedRule.params.ruleId = 'rule-3';
+    const update = getRulesToInstall(
+      [ruleFromFileSystem1, ruleFromFileSystem2, ruleFromFileSystem3],
+      [installedRule]
+    );
+    expect(update).toEqual([ruleFromFileSystem1, ruleFromFileSystem2]);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_install.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_install.ts
new file mode 100644
index 0000000000000..1c795941cbb83
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_install.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { RuleAlertParamsRest } from '../types';
+import { RuleAlertType } from './types';
+
+export const getRulesToInstall = (
+  rulesFromFileSystem: RuleAlertParamsRest[],
+  installedRules: RuleAlertType[]
+): RuleAlertParamsRest[] => {
+  return rulesFromFileSystem.filter(
+    rule => !installedRules.some(installedRule => installedRule.params.ruleId === rule.rule_id)
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_update.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_update.test.ts
new file mode 100644
index 0000000000000..7f1b64d33cd9b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_update.test.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 { getRulesToUpdate } from './get_rules_to_update';
+import { getResult, fullRuleAlertParamsRest } from '../routes/__mocks__/request_responses';
+
+describe('get_rules_to_update', () => {
+  test('should return empty array if both rule sets are empty', () => {
+    const update = getRulesToUpdate([], []);
+    expect(update).toEqual([]);
+  });
+
+  test('should return empty array if the id of the two rules do not match', () => {
+    const ruleFromFileSystem = fullRuleAlertParamsRest();
+    ruleFromFileSystem.rule_id = 'rule-1';
+    ruleFromFileSystem.version = 2;
+
+    const installedRule = getResult();
+    installedRule.params.ruleId = 'rule-2';
+    installedRule.params.version = 1;
+    const update = getRulesToUpdate([ruleFromFileSystem], [installedRule]);
+    expect(update).toEqual([]);
+  });
+
+  test('should return empty array if the id of file system rule is less than the installed version', () => {
+    const ruleFromFileSystem = fullRuleAlertParamsRest();
+    ruleFromFileSystem.rule_id = 'rule-1';
+    ruleFromFileSystem.version = 1;
+
+    const installedRule = getResult();
+    installedRule.params.ruleId = 'rule-1';
+    installedRule.params.version = 2;
+    const update = getRulesToUpdate([ruleFromFileSystem], [installedRule]);
+    expect(update).toEqual([]);
+  });
+
+  test('should return empty array if the id of file system rule is the same as the installed version', () => {
+    const ruleFromFileSystem = fullRuleAlertParamsRest();
+    ruleFromFileSystem.rule_id = 'rule-1';
+    ruleFromFileSystem.version = 1;
+
+    const installedRule = getResult();
+    installedRule.params.ruleId = 'rule-1';
+    installedRule.params.version = 1;
+    const update = getRulesToUpdate([ruleFromFileSystem], [installedRule]);
+    expect(update).toEqual([]);
+  });
+
+  test('should return the rule to update if the id of file system rule is greater than the installed version', () => {
+    const ruleFromFileSystem = fullRuleAlertParamsRest();
+    ruleFromFileSystem.rule_id = 'rule-1';
+    ruleFromFileSystem.version = 2;
+
+    const installedRule = getResult();
+    installedRule.params.ruleId = 'rule-1';
+    installedRule.params.version = 1;
+    const update = getRulesToUpdate([ruleFromFileSystem], [installedRule]);
+    expect(update).toEqual([ruleFromFileSystem]);
+  });
+
+  test('should return 1 rule out of 2 to update if the id of file system rule is greater than the installed version of just one', () => {
+    const ruleFromFileSystem = fullRuleAlertParamsRest();
+    ruleFromFileSystem.rule_id = 'rule-1';
+    ruleFromFileSystem.version = 2;
+
+    const installedRule1 = getResult();
+    installedRule1.params.ruleId = 'rule-1';
+    installedRule1.params.version = 1;
+
+    const installedRule2 = getResult();
+    installedRule2.params.ruleId = 'rule-2';
+    installedRule2.params.version = 1;
+
+    const update = getRulesToUpdate([ruleFromFileSystem], [installedRule1, installedRule2]);
+    expect(update).toEqual([ruleFromFileSystem]);
+  });
+
+  test('should return 2 rules out of 2 to update if the id of file system rule is greater than the installed version of both', () => {
+    const ruleFromFileSystem1 = fullRuleAlertParamsRest();
+    ruleFromFileSystem1.rule_id = 'rule-1';
+    ruleFromFileSystem1.version = 2;
+
+    const ruleFromFileSystem2 = fullRuleAlertParamsRest();
+    ruleFromFileSystem2.rule_id = 'rule-2';
+    ruleFromFileSystem2.version = 2;
+
+    const installedRule1 = getResult();
+    installedRule1.params.ruleId = 'rule-1';
+    installedRule1.params.version = 1;
+
+    const installedRule2 = getResult();
+    installedRule2.params.ruleId = 'rule-2';
+    installedRule2.params.version = 1;
+
+    const update = getRulesToUpdate(
+      [ruleFromFileSystem1, ruleFromFileSystem2],
+      [installedRule1, installedRule2]
+    );
+    expect(update).toEqual([ruleFromFileSystem1, ruleFromFileSystem2]);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_update.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_update.ts
new file mode 100644
index 0000000000000..10b849493858a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/get_rules_to_update.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 { RuleAlertParamsRest } from '../types';
+import { RuleAlertType } from './types';
+
+export const getRulesToUpdate = (
+  rulesFromFileSystem: RuleAlertParamsRest[],
+  installedRules: RuleAlertType[]
+): RuleAlertParamsRest[] => {
+  return rulesFromFileSystem.filter(rule =>
+    installedRules.some(installedRule => {
+      return (
+        rule.rule_id === installedRule.params.ruleId && rule.version > installedRule.params.version
+      );
+    })
+  );
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/install_prepacked_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/install_prepacked_rules.ts
new file mode 100644
index 0000000000000..9acfbf8c43221
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/install_prepacked_rules.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 { ActionsClient } from '../../../../../actions';
+import { AlertsClient } from '../../../../../alerting';
+import { createRules } from './create_rules';
+import { RuleAlertParamsRest } from '../types';
+
+export const installPrepackagedRules = async (
+  alertsClient: AlertsClient,
+  actionsClient: ActionsClient,
+  rules: RuleAlertParamsRest[],
+  outputIndex: string
+): Promise<void> => {
+  await rules.forEach(async rule => {
+    const {
+      description,
+      enabled,
+      false_positives: falsePositives,
+      from,
+      immutable,
+      query,
+      language,
+      saved_id: savedId,
+      timeline_id: timelineId,
+      meta,
+      filters,
+      rule_id: ruleId,
+      index,
+      interval,
+      max_signals: maxSignals,
+      risk_score: riskScore,
+      name,
+      severity,
+      tags,
+      to,
+      type,
+      threats,
+      references,
+      version,
+    } = rule;
+    createRules({
+      alertsClient,
+      actionsClient,
+      description,
+      enabled,
+      falsePositives,
+      from,
+      immutable,
+      query,
+      language,
+      outputIndex,
+      savedId,
+      timelineId,
+      meta,
+      filters,
+      ruleId,
+      index,
+      interval,
+      maxSignals,
+      riskScore,
+      name,
+      severity,
+      tags,
+      to,
+      type,
+      threats,
+      references,
+      version,
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    });
+  });
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/command_shell_started_by_internet_explorer.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/command_shell_started_by_internet_explorer.json
new file mode 100644
index 0000000000000..1fd9fc0bb0d32
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/command_shell_started_by_internet_explorer.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "a0b554d2-85ed-4998-ada3-4ca58b508b35",
+  "risk_score": 50,
+  "description": "Command shell started by Internet Explorer",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Command shell started by Internet Explorer",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.parent.name:iexplore.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "process.name",
+        "value": "cmd.exe",
+        "params": {
+          "query": "cmd.exe"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "process.name": {
+            "query": "cmd.exe",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/command_shell_started_by_powershell.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/command_shell_started_by_powershell.json
new file mode 100644
index 0000000000000..594e3d5f650f9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/command_shell_started_by_powershell.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "ab4bbfa5-4127-40bf-852f-bdc6afdb2a06",
+  "risk_score": 50,
+  "description": "Command shell started by Powershell",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Command shell started by Powershell",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.parent.name:powershell.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "process.name",
+        "value": "cmd.exe",
+        "params": {
+          "query": "cmd.exe"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "process.name": {
+            "query": "cmd.exe",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/command_shell_started_by_svchost.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/command_shell_started_by_svchost.json
new file mode 100644
index 0000000000000..02f7516d5cd79
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/command_shell_started_by_svchost.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "2e4f8a5e-ce68-44e0-9243-1f57d44c4f30",
+  "risk_score": 50,
+  "description": "Command shell started by Svchost",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Command shell started by Svchost",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.parent.name:svchost.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "process.name",
+        "value": "cmd.exe",
+        "params": {
+          "query": "cmd.exe"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "process.name": {
+            "query": "cmd.exe",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_adding_the_hidden_file_attribute_with_via_attribexe.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_adding_the_hidden_file_attribute_with_via_attribexe.json
new file mode 100644
index 0000000000000..7bddffb4734ef
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_adding_the_hidden_file_attribute_with_via_attribexe.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "4630d948-40d4-4cef-ac69-4002e29bc3db",
+  "risk_score": 50,
+  "description": "EQL - Adding the Hidden File Attribute with via attrib.exe",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Adding the Hidden File Attribute with via attrib.exe",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "    event.action:\"Process Create (rule: ProcessCreate)\" and process.name:\"attrib.exe\" and process.args:\"+h\"",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_adobe_hijack_persistence.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_adobe_hijack_persistence.json
new file mode 100644
index 0000000000000..d57e5c7709b24
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_adobe_hijack_persistence.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "2bf78aa2-9c56-48de-b139-f169bf99cf86",
+  "risk_score": 50,
+  "description": "EQL - Adobe Hijack Persistence",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Adobe Hijack Persistence",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "file.path:(\"C:\\Program Files (x86)\\Adobe\\Acrobat Reader DC\\Reader\\AcroCEF\\RdrCEF.exe\" or \"C:\\Program Files\\Adobe\\Acrobat Reader DC\\Reader\\AcroCEF\\RdrCEF.exe\") and event.action:\"File created (rule: FileCreate)\" and not process.name:msiexeec.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_audio_capture_via_powershell.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_audio_capture_via_powershell.json
new file mode 100644
index 0000000000000..da3cf0fb46025
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_audio_capture_via_powershell.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b27b9f47-0a20-4807-8377-7f899b4fbada",
+  "risk_score": 50,
+  "description": "EQL - Audio Capture via PowerShell",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Audio Capture via PowerShell",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\" and process.name:\"SoundRecorder.exe\" and process.args:\"/FILE\"",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_audio_capture_via_soundrecorder.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_audio_capture_via_soundrecorder.json
new file mode 100644
index 0000000000000..cc0091feb290d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_audio_capture_via_soundrecorder.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f8e06892-ed10-4452-892e-2c5a38d552f1",
+  "risk_score": 50,
+  "description": "EQL - Audio Capture via SoundRecorder",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Audio Capture via SoundRecorder",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\" and process.name:\"SoundRecorder.exe\" and process.args:\"/FILE\"",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_bypass_uac_event_viewer.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_bypass_uac_event_viewer.json
new file mode 100644
index 0000000000000..bdc85045009cb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_bypass_uac_event_viewer.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "59547add-a400-4baa-aa0c-66c72efdb77f",
+  "risk_score": 50,
+  "description": "EQL -Bypass UAC Event Viewer",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL -Bypass UAC Event Viewer",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.parent.name:eventvwr.exe and event.action:\"Process Create (rule: ProcessCreate)\" and not process.executable:(\"C:\\Windows\\System32\\mmc.exe\" or \"C:\\Windows\\SysWOW64\\mmc.exe\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_bypass_uac_via_cmstp.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_bypass_uac_via_cmstp.json
new file mode 100644
index 0000000000000..c3b28e6dce849
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_bypass_uac_via_cmstp.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "2f7403da-1a4c-46bb-8ecc-c1a596e10cd0",
+  "risk_score": 50,
+  "description": "EQL - Bypass UAC via CMSTP",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Bypass UAC via CMSTP",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\" and process.parent.name:\"cmstp.exe\" and process.parent.args:(\"/s\" and \"/au\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_bypass_uac_via_sdclt.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_bypass_uac_via_sdclt.json
new file mode 100644
index 0000000000000..d79c551ffb9cb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_bypass_uac_via_sdclt.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f68d83a1-24cb-4b8d-825b-e8af400b9670",
+  "risk_score": 50,
+  "description": "EQL -Bypass UAC Via sdclt",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL -Bypass UAC Via sdclt",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.action:\"Process Create (rule: ProcessCreate)\" and process.name:\"sdclt.exe\" and process.args:\"/kickoffelev\" and not process.executable:(\"C:\\Windows\\System32\\sdclt.exe\" or \"C:\\Windows\\System32\\control.exe\" or \"C:\\Windows\\SysWOW64\\sdclt.exe\" or \"C:\\Windows\\SysWOW64\\control.exe\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_clearing_windows_event_logs.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_clearing_windows_event_logs.json
new file mode 100644
index 0000000000000..d7eb663297a63
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_clearing_windows_event_logs.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d331bbe2-6db4-4941-80a5-8270db72eb61",
+  "risk_score": 50,
+  "description": "EQL - Clearing Windows Event Logs",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Clearing Windows Event Logs",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\" and (process.name:\"wevtutil.exe\" and process.args:\"cl\") or (process.name:\"powershell.exe\" and process.args:\"Clear-EventLog\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_delete_volume_usn_journal_with_fsutil.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_delete_volume_usn_journal_with_fsutil.json
new file mode 100644
index 0000000000000..2155c2fa12913
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_delete_volume_usn_journal_with_fsutil.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f675872f-6d85-40a3-b502-c0d2ef101e92",
+  "risk_score": 50,
+  "description": "EQL - Delete Volume USN Journal with fsutil",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Delete Volume USN Journal with fsutil",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\"  and   process.name:\"fsutil.exe\" and    process.args:(\"usn\" and \"deletejournal\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_deleting_backup_catalogs_with_wbadmin.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_deleting_backup_catalogs_with_wbadmin.json
new file mode 100644
index 0000000000000..4bf7ae5ee1a5a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_deleting_backup_catalogs_with_wbadmin.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "581add16-df76-42bb-af8e-c979bfb39a59",
+  "risk_score": 50,
+  "description": "EQL - Deleting Backup Catalogs with wbadmin",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Deleting Backup Catalogs with wbadmin",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\"  and process.name:\"wbadmin.exe\" and  process.args:(\"delete\" and \"catalog\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_direct_outbound_smb_connection.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_direct_outbound_smb_connection.json
new file mode 100644
index 0000000000000..8a7733d069154
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_direct_outbound_smb_connection.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "c82c7d8f-fb9e-4874-a4bd-fd9e3f9becf1",
+  "risk_score": 50,
+  "description": "EQL - Direct Outbound SMB Connection",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Direct Outbound SMB Connection",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.action:\"Network connection detected (rule: NetworkConnect)\" and destination.port:445 and   not process.pid:4 and not destination.ip:(\"127.0.0.1\" or \"::1\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_disable_windows_firewall_rules_with_netsh.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_disable_windows_firewall_rules_with_netsh.json
new file mode 100644
index 0000000000000..2ed22ed4e59a0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_disable_windows_firewall_rules_with_netsh.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "4b438734-3793-4fda-bd42-ceeada0be8f9",
+  "risk_score": 50,
+  "description": "EQL - Disable Windows Firewall Rules with Netsh",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Disable Windows Firewall Rules with Netsh",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\" and process.name:\"netsh.exe\" and process.args:(\"firewall\" and \"set\" and \"disable\") or process.args:(\"advfirewall\" and \"state\" and \"off\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_dll_search_order_hijack.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_dll_search_order_hijack.json
new file mode 100644
index 0000000000000..e59286339290a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_dll_search_order_hijack.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "73fbc44c-c3cd-48a8-a473-f4eb2065c716",
+  "risk_score": 50,
+  "description": "EQL - DLL Search Order Hijack",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - DLL Search Order Hijack",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.action:\"File created (rule: FileCreate)\"  and    not winlog.user.identifier:(\"S-1-5-18\" or \"S-1-5-19\" or \"S-1-5-20\") and    file.path:(\"C\\Windows\\ehome\\cryptbase.dll\" or               \"C\\Windows\\System32\\Sysprep\\cryptbase.dll\" or               \"C\\Windows\\System32\\Sysprep\\cryptsp.dll\" or               \"C\\Windows\\System32\\Sysprep\\rpcrtremote.dll\" or               \"C\\Windows\\System32\\Sysprep\\uxtheme.dll\" or               \"C\\Windows\\System32\\Sysprep\\dwmapi.dll\" or               \"C\\Windows\\System32\\Sysprep\\shcore.dll\" or               \"C\\Windows\\System32\\Sysprep\\oleacc.dll\" or               \"C\\Windows\\System32\\ntwdblib.dll\") ",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_encoding_or_decoding_files_via_certutil.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_encoding_or_decoding_files_via_certutil.json
new file mode 100644
index 0000000000000..2ad0a53b6c9b4
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_encoding_or_decoding_files_via_certutil.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "fd70c98a-c410-42dc-a2e3-761c71848acf",
+  "risk_score": 50,
+  "description": "EQL - Encoding or Decoding Files via CertUtil",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Encoding or Decoding Files via CertUtil",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\" and    process.name:\"certutil.exe\" and    process.args:(\"-encode\" or \"/encode\" or \"-decode\" or \"/decode\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_local_scheduled_task_commands.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_local_scheduled_task_commands.json
new file mode 100644
index 0000000000000..bb005643031bd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_local_scheduled_task_commands.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "afcce5ad-65de-4ed2-8516-5e093d3ac99a",
+  "risk_score": 50,
+  "description": "EQL - Local Scheduled Task Commands",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Local Scheduled Task Commands",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.action:\"Process Create (rule: ProcessCreate)\" and process.name:schtasks.exe and process.args:(\"/create\" or \"-create\" or \"/S\" or \"-s\" or \"/run\" or \"-run\" or \"/change\" or \"-change\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_local_service_commands.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_local_service_commands.json
new file mode 100644
index 0000000000000..1254d0971f108
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_local_service_commands.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "e8571d5f-bea1-46c2-9f56-998de2d3ed95",
+  "risk_score": 50,
+  "description": "EQL - Local Service Commands",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Local Service Commands",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\" and  process.name:sc.exe and process.args:(\"create\" or \"config\" or \"failure\" or \"start\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_modification_of_boot_configuration.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_modification_of_boot_configuration.json
new file mode 100644
index 0000000000000..62b07f1f4ed37
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_modification_of_boot_configuration.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b9ab2f7f-f719-4417-9599-e0252fffe2d8",
+  "risk_score": 50,
+  "description": "EQL - Modification of Boot Configuration",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Modification of Boot Configuration",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\" and   process.name:\"bcdedit.exe\" and    process.args:\"set\" and    process.args:(     (\"bootstatuspolicy\" and \"ignoreallfailures\") or      (\"recoveryenabled\" and \"no\")   ) ",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_msbuild_making_network_connections.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_msbuild_making_network_connections.json
new file mode 100644
index 0000000000000..a3c0a8c0960ef
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_msbuild_making_network_connections.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "0e79980b-4250-4a50-a509-69294c14e84b",
+  "risk_score": 50,
+  "description": "EQL -  MsBuild Making Network Connections",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL -  MsBuild Making Network Connections",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.action:\"Network connection detected (rule: NetworkConnect)\" and process.name:msbuild.exe and not destination.ip:(\"127.0.0.1\" or \"::1\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_mshta_making_network_connections.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_mshta_making_network_connections.json
new file mode 100644
index 0000000000000..2d5e73c50a73c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_mshta_making_network_connections.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "a4ec1382-4557-452b-89ba-e413b22ed4b8",
+  "risk_score": 50,
+  "description": "EQL - Mshta Making Network Connections",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Mshta Making Network Connections",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "  event.action:\"Network connection detected (rule: NetworkConnect)\" and process.name:\"mshta.exe\" and not process.name:\"mshta.exe\" and not parent.process.name:\"Microsoft.ConfigurationManagement.exe\"",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_msxsl_making_network_connections.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_msxsl_making_network_connections.json
new file mode 100644
index 0000000000000..04c88def26d61
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_msxsl_making_network_connections.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d7351b03-135d-43ba-8b36-cc9b07854525",
+  "risk_score": 50,
+  "description": "EQL - MsXsl Making Network Connections",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - MsXsl Making Network Connections",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:msxml.exe and event.action:\"Network connection detected (rule: NetworkConnect)\" and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_psexec_lateral_movement_command.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_psexec_lateral_movement_command.json
new file mode 100644
index 0000000000000..fe87c83c0403c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_psexec_lateral_movement_command.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "55d551c6-333b-4665-ab7e-5d14a59715ce",
+  "risk_score": 50,
+  "description": "EQL - PsExec Lateral Movement Command",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - PsExec Lateral Movement Command",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:psexec.exe and event.action:\"Network connection detected (rule: NetworkConnect)\" ",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_suspicious_ms_office_child_process.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_suspicious_ms_office_child_process.json
new file mode 100644
index 0000000000000..41deb57145abc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_suspicious_ms_office_child_process.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "a624863f-a70d-417f-a7d2-7a404638d47f",
+  "risk_score": 50,
+  "description": "EQL - Suspicious MS Office Child Process",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Suspicious MS Office Child Process",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.action:\"Process Create (rule: ProcessCreate)\" and    process.parent.name:(\"winword.exe\" or \"excel.exe\" or \"powerpnt.exe\" or \"eqnedt32.exe\" or \"fltldr.exe\" or \"mspub.exe\" or \"msaccess.exe\") and process.name:(\"arp.exe\" or \"dsquery.exe\" or \"dsget.exe\" or \"gpresult.exe\" or \"hostname.exe\" or \"ipconfig.exe\" or \"nbtstat.exe\" or \"net.exe\" or \"net1.exe\" or \"netsh.exe\" or \"netstat.exe\" or \"nltest.exe\" or \"ping.exe\" or \"qprocess.exe\" or \"quser.exe\" or \"qwinsta.exe\" or \"reg.exe\" or \"sc.exe\" or \"systeminfo.exe\" or \"tasklist.exe\" or \"tracert.exe\" or \"whoami.exe\" or \"bginfo.exe\" or \"cdb.exe\" or \"cmstp.exe\" or \"csi.exe\" or \"dnx.exe\" or \"fsi.exe\" or \"ieexec.exe\" or \"iexpress.exe\" or \"installutil.exe\" or \"Microsoft.Workflow.Compiler.exe\" or \"msbuild.exe\" or \"mshta.exe\" or \"msxsl.exe\" or \"odbcconf.exe\" or \"rcsi.exe\" or \"regsvr32.exe\" or \"xwizard.exe\" or \"atbroker.exe\" or \"forfiles.exe\" or \"schtasks.exe\" or \"regasm.exe\" or \"regsvcs.exe\" or \"cmd.exe\" or \"cscript.exe\" or \"powershell.exe\" or \"pwsh.exe\" or \"wmic.exe\" or \"wscript.exe\" or \"bitsadmin.exe\" or \"certutil.exe\" or \"ftp.exe\") ",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_suspicious_ms_outlook_child_process.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_suspicious_ms_outlook_child_process.json
new file mode 100644
index 0000000000000..bbcc987c3b6ae
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_suspicious_ms_outlook_child_process.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "32f4675e-6c49-4ace-80f9-97c9259dca2e",
+  "risk_score": 50,
+  "description": "EQL - Suspicious MS Outlook Child Process",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Suspicious MS Outlook Child Process",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "  event.action:\"Process Create (rule: ProcessCreate)\" and  process.parent.name:\"outlook.exe\" and    process.name:(\"arp.exe\" or \"dsquery.exe\" or \"dsget.exe\" or \"gpresult.exe\" or \"hostname.exe\" or \"ipconfig.exe\" or \"nbtstat.exe\" or \"net.exe\" or \"net1.exe\" or \"netsh.exe\" or \"netstat.exe\" or \"nltest.exe\" or \"ping.exe\" or \"qprocess.exe\" or \"quser.exe\" or \"qwinsta.exe\" or \"reg.exe\" or \"sc.exe\" or \"systeminfo.exe\" or \"tasklist.exe\" or \"tracert.exe\" or \"whoami.exe\" or \"bginfo.exe\" or \"cdb.exe\" or \"cmstp.exe\" or \"csi.exe\" or \"dnx.exe\" or \"fsi.exe\" or \"ieexec.exe\" or \"iexpress.exe\" or \"installutil.exe\" or \"Microsoft.Workflow.Compiler.exe\" or \"msbuild.exe\" or \"mshta.exe\" or \"msxsl.exe\" or \"odbcconf.exe\" or \"rcsi.exe\" or \"regsvr32.exe\" or \"xwizard.exe\" or \"atbroker.exe\" or \"forfiles.exe\" or \"schtasks.exe\" or \"regasm.exe\" or \"regsvcs.exe\" or \"cmd.exe\" or \"cscript.exe\" or \"powershell.exe\" or \"pwsh.exe\" or \"wmic.exe\" or \"wscript.exe\" or \"bitsadmin.exe\" or \"certutil.exe\" or \"ftp.exe\") ",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_suspicious_pdf_reader_child_process.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_suspicious_pdf_reader_child_process.json
new file mode 100644
index 0000000000000..488dc04a3b02e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_suspicious_pdf_reader_child_process.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "afcac7b1-d092-43ff-a136-aa7accbda38f",
+  "risk_score": 50,
+  "description": "EQL - Suspicious PDF Reader Child Process",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Suspicious PDF Reader Child Process",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.action:\"Process Create (rule: ProcessCreate)\" and process.parent.name:(\"acrord32.exe\" or \"rdrcef.exe\" or \"foxitphantomPDF.exe\" or \"foxitreader.exe\") and    process.name:(\"arp.exe\" or \"dsquery.exe\" or \"dsget.exe\" or \"gpresult.exe\" or \"hostname.exe\" or \"ipconfig.exe\" or \"nbtstat.exe\" or \"net.exe\" or \"net1.exe\" or \"netsh.exe\" or \"netstat.exe\" or \"nltest.exe\" or \"ping.exe\" or \"qprocess.exe\" or \"quser.exe\" or \"qwinsta.exe\" or \"reg.exe\" or \"sc.exe\" or \"systeminfo.exe\" or \"tasklist.exe\" or \"tracert.exe\" or \"whoami.exe\" or \"bginfo.exe\" or \"cdb.exe\" or \"cmstp.exe\" or \"csi.exe\" or \"dnx.exe\" or \"fsi.exe\" or \"ieexec.exe\" or \"iexpress.exe\" or \"installutil.exe\" or \"Microsoft.Workflow.Compiler.exe\" or \"msbuild.exe\" or \"mshta.exe\" or \"msxsl.exe\" or \"odbcconf.exe\" or \"rcsi.exe\" or \"regsvr32.exe\" or \"xwizard.exe\" or \"atbroker.exe\" or \"forfiles.exe\" or \"schtasks.exe\" or \"regasm.exe\" or \"regsvcs.exe\" or \"cmd.exe\" or \"cscript.exe\" or \"powershell.exe\" or \"pwsh.exe\" or \"wmic.exe\" or \"wscript.exe\" or \"bitsadmin.exe\" or \"certutil.exe\" or \"ftp.exe\") ",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_system_shells_via_services.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_system_shells_via_services.json
new file mode 100644
index 0000000000000..810aa79ce25af
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_system_shells_via_services.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "0022d47d-39c7-4f69-a232-4fe9dc7a3acd",
+  "risk_score": 50,
+  "description": "EQL - System Shells via Services",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - System Shells via Services",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.action:\"Process Create (rule: ProcessCreate)\" and    process.parent.name:\"services.exe\" and    process.name:(\"cmd.exe\" or \"powershell.exe\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_unusual_network_connection_via_rundll32.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_unusual_network_connection_via_rundll32.json
new file mode 100644
index 0000000000000..6918d996256c0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_unusual_network_connection_via_rundll32.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "52aaab7b-b51c-441a-89ce-4387b3aea886",
+  "risk_score": 50,
+  "description": "EQL -  Unusual Network Connection via RunDLL32",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL -  Unusual Network Connection via RunDLL32",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:rundll32.exe and event.action:\"Network connection detected (rule: NetworkConnect)\" and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_unusual_parentchild_relationship.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_unusual_parentchild_relationship.json
new file mode 100644
index 0000000000000..007487ec91eed
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_unusual_parentchild_relationship.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "35df0dd8-092d-4a83-88c1-5151a804f31b",
+  "risk_score": 50,
+  "description": "EQL - Unusual Parent-Child Relationship ",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Unusual Parent-Child Relationship ",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "   event.action:\"Process Create (rule: ProcessCreate)\" and process.parent.executable:* and   (      (process.name:\"smss.exe\" and not process.parent.name:(\"System\" or \"smss.exe\")) or       (process.name:\"csrss.exe\" and not process.parent.name:(\"smss.exe\" or \"svchost.exe\")) or       (process.name:\"wininit.exe\" and not process.parent.name:\"smss.exe\") or       (process.name:\"winlogon.exe\" and not process.parent.name:\"smss.exe\") or       (process.name:\"lsass.exe\" and not process.parent.name:\"wininit.exe\") or       (process.name:\"LogonUI.exe\" and not process.parent.name:(\"winlogon.exe\" or \"wininit.exe\")) or       (process.name:\"services.exe\" and not process.parent.name:\"wininit.exe\") or       (process.name:\"svchost.exe\" and not process.parent.name:(\"services.exe\" or \"MsMpEng.exe\")) or      (process.name:\"spoolsv.exe\" and not process.parent.name:\"services.exe\") or       (process.name:\"taskhost.exe\" and not process.parent.name:(\"services.exe\" or \"svchost.exe\")) or       (process.name:\"taskhostw.exe\" and not process.parent.name:(\"services.exe\" or \"svchost.exe\")) or       (process.name:\"userinit.exe\" and not process.parent.name:(\"dwm.exe\" or \"winlogon.exe\"))    )",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_unusual_process_network_connection.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_unusual_process_network_connection.json
new file mode 100644
index 0000000000000..7aabc9ed60416
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_unusual_process_network_connection.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "610949a1-312f-4e04-bb55-3a79b8c95267",
+  "risk_score": 50,
+  "description": "EQL -  Unusual Process Network Connection",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL -  Unusual Process Network Connection",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.action:\"Network connection detected (rule: NetworkConnect)\" and process.name:(bginfo.exe or cdb.exe or cmstp.exe or csi.exe or dnx.exe or fsi.exe or ieexec.exe or iexpress.exe or Microsoft.Workflow.Compiler.exe or odbcconf.exe or rcsi.exe or xwizard.exe)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_user_account_creation.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_user_account_creation.json
new file mode 100644
index 0000000000000..cbe1b7fb7af4f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_user_account_creation.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "1aa9181a-492b-4c01-8b16-fa0735786b2b",
+  "risk_score": 50,
+  "description": "EQL - User Account Creation",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - User Account Creation",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.action:\"Process Create (rule: ProcessCreate)\" and process.name:(\"net.exe\" or \"net1.exe\") and not process.parent.name:\"net.exe\" and process.args:(\"user\" and (\"/add\" or \"/ad\")) ",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_user_added_to_administrator_group.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_user_added_to_administrator_group.json
new file mode 100644
index 0000000000000..ed8fa5276ef34
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_user_added_to_administrator_group.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "4426de6f-6103-44aa-a77e-49d672836c27",
+  "risk_score": 50,
+  "description": "EQL - User Added to Administrator Group",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - User Added to Administrator Group",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.action:\"Process Create (rule: ProcessCreate)\" and process.name:(\"net.exe\" or \"net1.exe\") and not process.parent.name:\"net.exe\" and process.args:(\"group\" and \"admin\" and \"/add\") ",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_volume_shadow_copy_deletion_via_vssadmin.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_volume_shadow_copy_deletion_via_vssadmin.json
new file mode 100644
index 0000000000000..186c688d21d8f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_volume_shadow_copy_deletion_via_vssadmin.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b5ea4bfe-a1b2-421f-9d47-22a75a6f2921",
+  "risk_score": 50,
+  "description": "EQL - Volume Shadow Copy Deletion via VssAdmin",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Volume Shadow Copy Deletion via VssAdmin",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "  event.action:\"Process Create (rule: ProcessCreate)\"  and process.name:\"vssadmin.exe\" and process.args:(\"delete\" and \"shadows\") ",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_volume_shadow_copy_deletion_via_wmic.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_volume_shadow_copy_deletion_via_wmic.json
new file mode 100644
index 0000000000000..9f75cb3ab26a8
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_volume_shadow_copy_deletion_via_wmic.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "dc9c1f74-dac3-48e3-b47f-eb79db358f57",
+  "risk_score": 50,
+  "description": "EQL - Volume Shadow Copy Deletion via WMIC",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Volume Shadow Copy Deletion via WMIC",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "  event.action:\"Process Create (rule: ProcessCreate)\" and process.name:\"wmic.exe\" and process.args:(\"shadowcopy\" and \"delete\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_windows_script_executing_powershell.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_windows_script_executing_powershell.json
new file mode 100644
index 0000000000000..034651d94d0ea
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_windows_script_executing_powershell.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f545ff26-3c94-4fd0-bd33-3c7f95a3a0fc",
+  "risk_score": 50,
+  "description": "EQL - Windows Script Executing PowerShell",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - Windows Script Executing PowerShell",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\" and process.parent.name:(\"wscript.exe\" or \"cscript.exe\") and process.name:\"powershell.exe\"",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_wmic_command_lateral_movement.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_wmic_command_lateral_movement.json
new file mode 100644
index 0000000000000..eb1f3f4dca08e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/eql_wmic_command_lateral_movement.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "9616587f-6396-42d0-bd31-ef8dbd806210",
+  "risk_score": 50,
+  "description": "EQL - WMIC Command Lateral Movement",
+  "immutable": true,
+  "interval": "5m",
+  "name": "EQL - WMIC Command Lateral Movement",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "   event.action:\"Process Create (rule: ProcessCreate)\" and  process.name:\"wmic.exe\" and process.args:(\"/node\" or \"-node\") and process.args:(\"call\" or \"set\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/index.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/index.ts
new file mode 100644
index 0000000000000..4e370bfdc5bc9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/index.ts
@@ -0,0 +1,564 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// Auto generated file from scripts/convert_saved_search_rules.js
+// Do not hand edit. Run the script against a set of saved searches instead
+
+import rule1 from './eql_bypass_uac_via_sdclt.json';
+import rule2 from './eql_clearing_windows_event_logs.json';
+import rule3 from './eql_suspicious_ms_office_child_process.json';
+import rule4 from './eql_bypass_uac_event_viewer.json';
+import rule5 from './eql_volume_shadow_copy_deletion_via_wmic.json';
+import rule6 from './eql_adobe_hijack_persistence.json';
+import rule7 from './eql_unusual_network_connection_via_rundll32.json';
+import rule8 from './eql_delete_volume_usn_journal_with_fsutil.json';
+import rule9 from './eql_mshta_making_network_connections.json';
+import rule10 from './eql_unusual_process_network_connection.json';
+import rule11 from './eql_suspicious_ms_outlook_child_process.json';
+import rule12 from './eql_audio_capture_via_soundrecorder.json';
+import rule13 from './eql_direct_outbound_smb_connection.json';
+import rule14 from './eql_windows_script_executing_powershell.json';
+import rule15 from './eql_deleting_backup_catalogs_with_wbadmin.json';
+import rule16 from './eql_suspicious_pdf_reader_child_process.json';
+import rule17 from './eql_local_service_commands.json';
+import rule18 from './eql_dll_search_order_hijack.json';
+import rule19 from './eql_bypass_uac_via_cmstp.json';
+import rule20 from './eql_user_account_creation.json';
+import rule21 from './eql_wmic_command_lateral_movement.json';
+import rule22 from './eql_system_shells_via_services.json';
+import rule23 from './eql_msxsl_making_network_connections.json';
+import rule24 from './eql_local_scheduled_task_commands.json';
+import rule25 from './eql_msbuild_making_network_connections.json';
+import rule26 from './eql_encoding_or_decoding_files_via_certutil.json';
+import rule27 from './eql_disable_windows_firewall_rules_with_netsh.json';
+import rule28 from './eql_adding_the_hidden_file_attribute_with_via_attribexe.json';
+import rule29 from './eql_psexec_lateral_movement_command.json';
+import rule30 from './eql_user_added_to_administrator_group.json';
+import rule31 from './eql_audio_capture_via_powershell.json';
+import rule32 from './eql_unusual_parentchild_relationship.json';
+import rule33 from './eql_modification_of_boot_configuration.json';
+import rule34 from './eql_volume_shadow_copy_deletion_via_vssadmin.json';
+import rule35 from './zeek_notice_signaturesmultiple_sig_responders.json';
+import rule36 from './zeek_notice_packetfiltercompile_failure.json';
+import rule37 from './zeek_notice_signaturescount_signature.json';
+import rule38 from './zeek_notice_signaturesmultiple_signatures.json';
+import rule39 from './zeek_notice_signaturessignature_summary.json';
+import rule40 from './zeek_notice_signaturessensitive_signature.json';
+import rule41 from './zeek_notice_packetfilterinstall_failure.json';
+import rule42 from './zeek_notice_weirdactivity.json';
+import rule43 from './zeek_notice_noticetally.json';
+import rule44 from './zeek_notice_packetfilterno_more_conn_shunts_available.json';
+import rule45 from './zeek_notice_packetfiltercannot_bpf_shunt_conn.json';
+import rule46 from './zeek_notice_teamcymrumalwarehashregistrymatch.json';
+import rule47 from './zeek_notice_softwaresoftware_version_change.json';
+import rule48 from './zeek_notice_protocoldetectorserver_found.json';
+import rule49 from './zeek_notice_packetfiltertoo_long_to_compile_filter.json';
+import rule50 from './zeek_notice_protocoldetectorprotocol_found.json';
+import rule51 from './zeek_notice_intelnotice.json';
+import rule52 from './zeek_notice_packetfilterdropped_packets.json';
+import rule53 from './zeek_notice_scanaddress_scan.json';
+import rule54 from './zeek_notice_ftpbruteforcing.json';
+import rule55 from './zeek_notice_scanport_scan.json';
+import rule56 from './zeek_notice_dnsexternal_name.json';
+import rule57 from './zeek_notice_capturelosstoo_much_loss.json';
+import rule58 from './zeek_notice_softwarevulnerable_version.json';
+import rule59 from './zeek_notice_connretransmission_inconsistency.json';
+import rule60 from './zeek_notice_traceroutedetected.json';
+import rule61 from './zeek_notice_conncontent_gap.json';
+import rule62 from './zeek_notice_smtpblocklist_blocked_host.json';
+import rule63 from './zeek_notice_httpsql_injection_victim.json';
+import rule64 from './zeek_notice_sshlogin_by_password_guesser.json';
+import rule65 from './zeek_notice_sshpassword_guessing.json';
+import rule66 from './zeek_notice_sshwatched_country_login.json';
+import rule67 from './zeek_notice_ftpsite_exec_success.json';
+import rule68 from './zeek_notice_smtpsuspicious_origination.json';
+import rule69 from './zeek_notice_httpsql_injection_attacker.json';
+import rule70 from './zeek_notice_smtpblocklist_error_message.json';
+import rule71 from './zeek_notice_sshinteresting_hostname_login.json';
+import rule72 from './zeek_notice_sslinvalid_server_cert.json';
+import rule73 from './zeek_notice_heartbleedssl_heartbeat_many_requests.json';
+import rule74 from './zeek_notice_heartbleedssl_heartbeat_odd_length.json';
+import rule75 from './zeek_notice_sslcertificate_expired.json';
+import rule76 from './zeek_notice_sslcertificate_expires_soon.json';
+import rule77 from './zeek_notice_heartbleedssl_heartbeat_attack_success.json';
+import rule78 from './zeek_notice_sslcertificate_not_valid_yet.json';
+import rule79 from './zeek_notice_heartbleedssl_heartbeat_attack.json';
+import rule80 from './zeek_notice_sslinvalid_ocsp_response.json';
+import rule81 from './zeek_notice_sslweak_key.json';
+import rule82 from './zeek_notice_sslold_version.json';
+import rule83 from './zeek_notice_sslweak_cipher.json';
+import rule84 from './suricata_category_large_scale_information_leak.json';
+import rule85 from './suricata_category_attempted_information_leak.json';
+import rule86 from './suricata_category_not_suspicious_traffic.json';
+import rule87 from './suricata_category_potentially_bad_traffic.json';
+import rule88 from './suricata_category_information_leak.json';
+import rule89 from './suricata_category_unknown_traffic.json';
+import rule90 from './suricata_category_successful_administrator_privilege_gain.json';
+import rule91 from './suricata_category_attempted_administrator_privilege_gain.json';
+import rule92 from './suricata_category_unsuccessful_user_privilege_gain.json';
+import rule93 from './suricata_category_successful_user_privilege_gain.json';
+import rule94 from './suricata_category_attempted_user_privilege_gain.json';
+import rule95 from './suricata_category_attempted_denial_of_service.json';
+import rule96 from './suricata_category_decode_of_an_rpc_query.json';
+import rule97 from './suricata_category_denial_of_service.json';
+import rule98 from './suricata_category_attempted_login_with_suspicious_username.json';
+import rule99 from './suricata_category_client_using_unusual_port.json';
+import rule100 from './suricata_category_suspicious_filename_detected.json';
+import rule101 from './suricata_category_a_suspicious_string_was_detected.json';
+import rule102 from './suricata_category_tcp_connection_detected.json';
+import rule103 from './suricata_category_executable_code_was_detected.json';
+import rule104 from './suricata_category_network_trojan_detected.json';
+import rule105 from './suricata_category_system_call_detected.json';
+import rule106 from './suricata_category_potentially_vulnerable_web_application_access.json';
+import rule107 from './suricata_category_nonstandard_protocol_or_event.json';
+import rule108 from './suricata_category_denial_of_service_attack.json';
+import rule109 from './suricata_category_generic_protocol_command_decode.json';
+import rule110 from './suricata_category_network_scan_detected.json';
+import rule111 from './suricata_category_web_application_attack.json';
+import rule112 from './suricata_category_generic_icmp_event.json';
+import rule113 from './suricata_category_misc_attack.json';
+import rule114 from './suricata_category_default_username_and_password_login_attempt.json';
+import rule115 from './suricata_category_external_ip_address_retrieval.json';
+import rule116 from './suricata_category_potential_corporate_privacy_violation.json';
+import rule117 from './suricata_category_targeted_malicious_activity.json';
+import rule118 from './suricata_category_observed_c2_domain.json';
+import rule119 from './suricata_category_exploit_kit_activity.json';
+import rule120 from './suricata_category_possibly_unwanted_program.json';
+import rule121 from './suricata_category_successful_credential_theft.json';
+import rule122 from './suricata_category_possible_social_engineering_attempted.json';
+import rule123 from './suricata_category_crypto_currency_mining_activity.json';
+import rule124 from './suricata_category_malware_command_and_control_activity.json';
+import rule125 from './suricata_category_misc_activity.json';
+import rule126 from './windows_powershell_connecting_to_the_internet.json';
+import rule127 from './windows_net_user_command_activity.json';
+import rule128 from './windows_image_load_from_a_temp_directory.json';
+import rule129 from './network_ssh_secure_shell_to_the_internet.json';
+import rule130 from './suricata_nonhttp_traffic_on_tcp_port_80.json';
+import rule131 from './windows_misc_lolbin_connecting_to_the_internet.json';
+import rule132 from './linux_strace_activity.json';
+import rule133 from './suricata_directory_reversal_characters_in_an_http_request.json';
+import rule134 from './suricata_dns_traffic_on_unusual_udp_port.json';
+import rule135 from './network_telnet_port_activity.json';
+import rule136 from './suricata_directory_traversal_in_downloaded_zip_file.json';
+import rule137 from './windows_execution_via_microsoft_html_application_hta.json';
+import rule138 from './windows_credential_dumping_commands.json';
+import rule139 from './windows_net_command_activity_by_the_system_account.json';
+import rule140 from './windows_register_server_program_connecting_to_the_internet.json';
+import rule141 from './linux_java_process_connecting_to_the_internet.json';
+import rule142 from './suricata_imap_traffic_on_unusual_port_internet_destination.json';
+import rule143 from './suricata_double_encoded_characters_in_a_uri.json';
+import rule144 from './network_tor_activity_to_the_internet.json';
+import rule145 from './windows_registry_query_local.json';
+import rule146 from './linux_netcat_network_connection.json';
+import rule147 from './windows_defense_evasion_via_filter_manager.json';
+import rule148 from './suricata_nondns_traffic_on_udp_port_53.json';
+import rule149 from './suricata_double_encoded_characters_in_an_http_post.json';
+import rule150 from './command_shell_started_by_internet_explorer.json';
+import rule151 from './network_vnc_virtual_network_computing_from_the_internet.json';
+import rule152 from './windows_nmap_activity.json';
+import rule153 from './suspicious_process_started_by_a_script.json';
+import rule154 from './windows_network_anomalous_windows_process_using_https_ports.json';
+import rule155 from './powershell_network_connection.json';
+import rule156 from './windows_signed_binary_proxy_execution.json';
+import rule157 from './linux_kernel_module_activity.json';
+import rule158 from './network_vnc_virtual_network_computing_to_the_internet.json';
+import rule159 from './suricata_mimikatz_string_detected_in_http_response.json';
+import rule160 from './command_shell_started_by_svchost.json';
+import rule161 from './linux_tcpdump_activity.json';
+import rule162 from './process_started_by_ms_office_program_possible_payload.json';
+import rule163 from './windows_signed_binary_proxy_execution_download.json';
+import rule164 from './suricata_base64_encoded_startprocess_powershell_execution.json';
+import rule165 from './suricata_base64_encoded_invokecommand_powershell_execution.json';
+import rule166 from './suricata_directory_traversal_characters_in_http_response.json';
+import rule167 from './windows_microsoft_html_application_hta_connecting_to_the_internet.json';
+import rule168 from './suricata_tls_traffic_on_unusual_port_internet_destination.json';
+import rule169 from './process_started_by_acrobat_reader_possible_payload.json';
+import rule170 from './suricata_http_traffic_on_unusual_port_internet_destination.json';
+import rule171 from './windows_persistence_via_modification_of_existing_service.json';
+import rule172 from './windows_defense_evasion_or_persistence_via_hidden_files.json';
+import rule173 from './windows_execution_via_compiled_html_file.json';
+import rule174 from './linux_ptrace_activity.json';
+import rule175 from './suricata_nonimap_traffic_on_port_1443_imap.json';
+import rule176 from './windows_scheduled_task_activity.json';
+import rule177 from './suricata_ftp_traffic_on_unusual_port_internet_destination.json';
+import rule178 from './windows_wireshark_activity.json';
+import rule179 from './windows_execution_via_trusted_developer_utilities.json';
+import rule180 from './suricata_rpc_traffic_on_http_ports.json';
+import rule181 from './windows_process_discovery_via_tasklist_command.json';
+import rule182 from './suricata_cobaltstrike_artifact_in_an_dns_request.json';
+import rule183 from './suricata_serialized_php_detected.json';
+import rule184 from './windows_background_intelligent_transfer_service_bits_connecting_to_the_internet.json';
+import rule185 from './windows_registry_query_network.json';
+import rule186 from './windows_persistence_via_application_shimming.json';
+import rule187 from './network_proxy_port_activity_to_the_internet.json';
+import rule188 from './windows_whoami_command_activity.json';
+import rule189 from './suricata_shell_exec_php_function_in_an_http_post.json';
+import rule190 from './windump_activity.json';
+import rule191 from './windows_management_instrumentation_wmi_execution.json';
+import rule192 from './network_rdp_remote_desktop_protocol_from_the_internet.json';
+import rule193 from './windows_priv_escalation_via_accessibility_features.json';
+import rule194 from './psexec_activity.json';
+import rule195 from './linux_rawshark_activity.json';
+import rule196 from './suricata_nonftp_traffic_on_port_21.json';
+import rule197 from './network_ftp_file_transfer_protocol_activity_to_the_internet.json';
+import rule198 from './windows_certutil_connecting_to_the_internet.json';
+import rule199 from './suricata_nonsmb_traffic_on_tcp_port_139_smb.json';
+import rule200 from './network_rdp_remote_desktop_protocol_to_the_internet.json';
+import rule201 from './linux_whoami_commmand.json';
+import rule202 from './windows_persistence_or_priv_escalation_via_hooking.json';
+import rule203 from './linux_lzop_activity_possible_julianrunnels.json';
+import rule204 from './suricata_nontls_on_tls_port.json';
+import rule205 from './network_irc_internet_relay_chat_protocol_activity_to_the_internet.json';
+import rule206 from './linux_network_anomalous_process_using_https_ports.json';
+import rule207 from './windows_credential_dumping_via_registry_save.json';
+import rule208 from './network_rpc_remote_procedure_call_from_the_internet.json';
+import rule209 from './windows_credential_dumping_via_imageload.json';
+import rule210 from './windows_burp_ce_activity.json';
+import rule211 from './linux_hping_activity.json';
+import rule212 from './windows_command_prompt_connecting_to_the_internet.json';
+import rule213 from './network_nat_traversal_port_activity.json';
+import rule214 from './network_rpc_remote_procedure_call_to_the_internet.json';
+import rule215 from './suricata_possible_cobalt_strike_malleable_c2_null_response.json';
+import rule216 from './windows_remote_management_execution.json';
+import rule217 from './suricata_lazagne_artifact_in_an_http_post.json';
+import rule218 from './windows_netcat_network_activity.json';
+import rule219 from './windows_iodine_activity.json';
+import rule220 from './network_port_26_activity.json';
+import rule221 from './windows_execution_via_connection_manager.json';
+import rule222 from './linux_process_started_in_temp_directory.json';
+import rule223 from './suricata_eval_php_function_in_an_http_request.json';
+import rule224 from './linux_web_download.json';
+import rule225 from './suricata_ssh_traffic_not_on_port_22_internet_destination.json';
+import rule226 from './network_port_8000_activity.json';
+import rule227 from './windows_process_started_by_the_java_runtime.json';
+import rule228 from './suricata_possible_sql_injection_sql_commands_in_http_transactions.json';
+import rule229 from './network_smb_windows_file_sharing_activity_to_the_internet.json';
+import rule230 from './network_port_8000_activity_to_the_internet.json';
+import rule231 from './command_shell_started_by_powershell.json';
+import rule232 from './linux_nmap_activity.json';
+import rule233 from './search_windows_10.json';
+import rule234 from './network_smtp_to_the_internet.json';
+import rule235 from './windows_payload_obfuscation_via_certutil.json';
+import rule236 from './network_pptp_point_to_point_tunneling_protocol_activity.json';
+import rule237 from './linux_unusual_shell_activity.json';
+import rule238 from './linux_mknod_activity.json';
+import rule239 from './network_sql_server_port_activity_to_the_internet.json';
+import rule240 from './suricata_commonly_abused_dns_domain_detected.json';
+import rule241 from './linux_iodine_activity.json';
+import rule242 from './suricata_mimikatz_artifacts_in_an_http_post.json';
+import rule243 from './windows_execution_via_net_com_assemblies.json';
+import rule244 from './suricata_dns_traffic_on_unusual_tcp_port.json';
+import rule245 from './suricata_base64_encoded_newobject_powershell_execution.json';
+import rule246 from './windows_netcat_activity.json';
+import rule247 from './windows_persistence_via_bits_jobs.json';
+import rule248 from './linux_nping_activity.json';
+import rule249 from './windows_execution_via_regsvr32.json';
+import rule250 from './process_started_by_windows_defender.json';
+import rule251 from './windows_indirect_command_execution.json';
+import rule252 from './network_ssh_secure_shell_from_the_internet.json';
+import rule253 from './windows_html_help_executable_program_connecting_to_the_internet.json';
+import rule254 from './suricata_windows_executable_served_by_jpeg_web_content.json';
+import rule255 from './network_dns_directly_to_the_internet.json';
+import rule256 from './windows_defense_evasion_via_windows_event_log_tools.json';
+import rule257 from './suricata_nondns_traffic_on_tcp_port_53.json';
+import rule258 from './windows_persistence_via_netshell_helper_dll.json';
+import rule259 from './windows_script_interpreter_connecting_to_the_internet.json';
+import rule260 from './windows_defense_evasion_decoding_using_certutil.json';
+import rule261 from './linux_shell_activity_by_web_server.json';
+import rule262 from './linux_ldso_process_activity.json';
+import rule263 from './windows_mimikatz_activity.json';
+import rule264 from './suricata_nonssh_traffic_on_port_22.json';
+import rule265 from './windows_data_compression_using_powershell.json';
+import rule266 from './windows_nmap_scan_activity.json';
+import rule267 from './splunk_windows_event_log_cleared.json';
+import rule268 from './splunk_detect_long_dns_txt_record_response.json';
+import rule269 from './splunk_processes_launching_netsh.json';
+import rule270 from './splunk_detect_large_outbound_icmp_packets.json';
+import rule271 from './splunk_detect_new_local_admin_account.json';
+import rule272 from './splunk_protocols_passing_authentication_in_cleartext.json';
+import rule273 from './splunk_detect_use_of_cmdexe_to_launch_script_interpreters.json';
+import rule274 from './splunk_child_processes_of_spoolsvexe.json';
+import rule275 from './splunk_detect_psexec_with_accepteula_flag.json';
+import rule276 from './splunk_processes_created_by_netsh.json';
+
+export const rawRules = [
+  rule1,
+  rule2,
+  rule3,
+  rule4,
+  rule5,
+  rule6,
+  rule7,
+  rule8,
+  rule9,
+  rule10,
+  rule11,
+  rule12,
+  rule13,
+  rule14,
+  rule15,
+  rule16,
+  rule17,
+  rule18,
+  rule19,
+  rule20,
+  rule21,
+  rule22,
+  rule23,
+  rule24,
+  rule25,
+  rule26,
+  rule27,
+  rule28,
+  rule29,
+  rule30,
+  rule31,
+  rule32,
+  rule33,
+  rule34,
+  rule35,
+  rule36,
+  rule37,
+  rule38,
+  rule39,
+  rule40,
+  rule41,
+  rule42,
+  rule43,
+  rule44,
+  rule45,
+  rule46,
+  rule47,
+  rule48,
+  rule49,
+  rule50,
+  rule51,
+  rule52,
+  rule53,
+  rule54,
+  rule55,
+  rule56,
+  rule57,
+  rule58,
+  rule59,
+  rule60,
+  rule61,
+  rule62,
+  rule63,
+  rule64,
+  rule65,
+  rule66,
+  rule67,
+  rule68,
+  rule69,
+  rule70,
+  rule71,
+  rule72,
+  rule73,
+  rule74,
+  rule75,
+  rule76,
+  rule77,
+  rule78,
+  rule79,
+  rule80,
+  rule81,
+  rule82,
+  rule83,
+  rule84,
+  rule85,
+  rule86,
+  rule87,
+  rule88,
+  rule89,
+  rule90,
+  rule91,
+  rule92,
+  rule93,
+  rule94,
+  rule95,
+  rule96,
+  rule97,
+  rule98,
+  rule99,
+  rule100,
+  rule101,
+  rule102,
+  rule103,
+  rule104,
+  rule105,
+  rule106,
+  rule107,
+  rule108,
+  rule109,
+  rule110,
+  rule111,
+  rule112,
+  rule113,
+  rule114,
+  rule115,
+  rule116,
+  rule117,
+  rule118,
+  rule119,
+  rule120,
+  rule121,
+  rule122,
+  rule123,
+  rule124,
+  rule125,
+  rule126,
+  rule127,
+  rule128,
+  rule129,
+  rule130,
+  rule131,
+  rule132,
+  rule133,
+  rule134,
+  rule135,
+  rule136,
+  rule137,
+  rule138,
+  rule139,
+  rule140,
+  rule141,
+  rule142,
+  rule143,
+  rule144,
+  rule145,
+  rule146,
+  rule147,
+  rule148,
+  rule149,
+  rule150,
+  rule151,
+  rule152,
+  rule153,
+  rule154,
+  rule155,
+  rule156,
+  rule157,
+  rule158,
+  rule159,
+  rule160,
+  rule161,
+  rule162,
+  rule163,
+  rule164,
+  rule165,
+  rule166,
+  rule167,
+  rule168,
+  rule169,
+  rule170,
+  rule171,
+  rule172,
+  rule173,
+  rule174,
+  rule175,
+  rule176,
+  rule177,
+  rule178,
+  rule179,
+  rule180,
+  rule181,
+  rule182,
+  rule183,
+  rule184,
+  rule185,
+  rule186,
+  rule187,
+  rule188,
+  rule189,
+  rule190,
+  rule191,
+  rule192,
+  rule193,
+  rule194,
+  rule195,
+  rule196,
+  rule197,
+  rule198,
+  rule199,
+  rule200,
+  rule201,
+  rule202,
+  rule203,
+  rule204,
+  rule205,
+  rule206,
+  rule207,
+  rule208,
+  rule209,
+  rule210,
+  rule211,
+  rule212,
+  rule213,
+  rule214,
+  rule215,
+  rule216,
+  rule217,
+  rule218,
+  rule219,
+  rule220,
+  rule221,
+  rule222,
+  rule223,
+  rule224,
+  rule225,
+  rule226,
+  rule227,
+  rule228,
+  rule229,
+  rule230,
+  rule231,
+  rule232,
+  rule233,
+  rule234,
+  rule235,
+  rule236,
+  rule237,
+  rule238,
+  rule239,
+  rule240,
+  rule241,
+  rule242,
+  rule243,
+  rule244,
+  rule245,
+  rule246,
+  rule247,
+  rule248,
+  rule249,
+  rule250,
+  rule251,
+  rule252,
+  rule253,
+  rule254,
+  rule255,
+  rule256,
+  rule257,
+  rule258,
+  rule259,
+  rule260,
+  rule261,
+  rule262,
+  rule263,
+  rule264,
+  rule265,
+  rule266,
+  rule267,
+  rule268,
+  rule269,
+  rule270,
+  rule271,
+  rule272,
+  rule273,
+  rule274,
+  rule275,
+  rule276,
+];
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_hping_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_hping_activity.json
new file mode 100644
index 0000000000000..92308283717a5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_hping_activity.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "90169566-2260-4824-b8e4-8615c3b4ed52",
+  "risk_score": 50,
+  "description": "Linux: Hping Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Hping Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: hping",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.dataset",
+        "value": "process",
+        "params": {
+          "query": "process"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.dataset": {
+            "query": "process",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_iodine_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_iodine_activity.json
new file mode 100644
index 0000000000000..ded4b72fcbfc4
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_iodine_activity.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "041d4d41-9589-43e2-ba13-5680af75ebc2",
+  "risk_score": 50,
+  "description": "Linux: Iodine Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Iodine Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: (iodine or iodined)",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.dataset",
+        "value": "process",
+        "params": {
+          "query": "process"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.dataset": {
+            "query": "process",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_java_process_connecting_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_java_process_connecting_to_the_internet.json
new file mode 100644
index 0000000000000..aba4954e3552a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_java_process_connecting_to_the_internet.json
@@ -0,0 +1,118 @@
+{
+  "rule_id": "7f65b8c5-27ed-4cf6-a088-3a20d2f84bf5",
+  "risk_score": 50,
+  "description": "Linux: Java Process Connecting to the Internet",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Java Process Connecting to the Internet",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "not destination.ip: 10.0.0.0/8 and not 172.16.0.0/12",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "process.name",
+        "value": "java",
+        "params": {
+          "query": "java"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "process.name": {
+            "query": "java",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "socket_opened",
+        "params": {
+          "query": "socket_opened"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "socket_opened",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": true,
+        "type": "phrase",
+        "key": "destination.ip",
+        "value": "127.0.0.1",
+        "params": {
+          "query": "127.0.0.1"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[2].meta.index"
+      },
+      "query": {
+        "match": {
+          "destination.ip": {
+            "query": "127.0.0.1",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": true,
+        "type": "phrase",
+        "key": "destination.ip",
+        "value": "::1",
+        "params": {
+          "query": "::1"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[3].meta.index"
+      },
+      "query": {
+        "match": {
+          "destination.ip": {
+            "query": "::1",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_kernel_module_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_kernel_module_activity.json
new file mode 100644
index 0000000000000..4564d1afccf79
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_kernel_module_activity.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "81cc58f5-8062-49a2-ba84-5cc4b4d31c40",
+  "risk_score": 50,
+  "description": "Linux: Kernel Module Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Kernel Module Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: (insmod or kmod or modprobe or rmod)",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.dataset",
+        "value": "process",
+        "params": {
+          "query": "process"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.dataset": {
+            "query": "process",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_ldso_process_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_ldso_process_activity.json
new file mode 100644
index 0000000000000..2db76834061b9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_ldso_process_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "3f31a31c-f7cf-4268-a0df-ec1a98099e7f",
+  "risk_score": 50,
+  "description": "Linux ld.so process activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux ld.so process activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:ld.so",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_lzop_activity_possible_julianrunnels.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_lzop_activity_possible_julianrunnels.json
new file mode 100644
index 0000000000000..5b3a978813b79
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_lzop_activity_possible_julianrunnels.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d89b05b1-9b2b-45ea-9876-4a74550af6a6",
+  "risk_score": 50,
+  "description": "Linux lzop activity - possible @JulianRunnels",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux lzop activity - possible @JulianRunnels",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:lzop",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_mknod_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_mknod_activity.json
new file mode 100644
index 0000000000000..04ddc409c1efe
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_mknod_activity.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "61c31c14-507f-4627-8c31-072556b89a9c",
+  "risk_score": 50,
+  "description": "Linux: Mknod Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Mknod Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: mknod",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.dataset",
+        "value": "process",
+        "params": {
+          "query": "process"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.dataset": {
+            "query": "process",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_netcat_network_connection.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_netcat_network_connection.json
new file mode 100644
index 0000000000000..1ba35bec8f517
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_netcat_network_connection.json
@@ -0,0 +1,93 @@
+{
+  "rule_id": "adb961e0-cb74-42a0-af9e-29fc41f88f5f",
+  "risk_score": 50,
+  "description": "Linux: Netcat Network Connection",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Netcat Network Connection",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: (nc or ncat or netcat or netcat.openbsd or netcat.traditional)",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "socket_opened",
+        "params": {
+          "query": "socket_opened"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "socket_opened",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": true,
+        "type": "phrase",
+        "key": "destination.ip",
+        "value": "127.0.0.1",
+        "params": {
+          "query": "127.0.0.1"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "destination.ip": {
+            "query": "127.0.0.1",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": true,
+        "type": "phrase",
+        "key": "destination.ip",
+        "value": "::1",
+        "params": {
+          "query": "::1"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[2].meta.index"
+      },
+      "query": {
+        "match": {
+          "destination.ip": {
+            "query": "::1",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_network_anomalous_process_using_https_ports.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_network_anomalous_process_using_https_ports.json
new file mode 100644
index 0000000000000..d5bf37daab0f4
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_network_anomalous_process_using_https_ports.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "be40c674-1799-4a00-934d-0b2d54495913",
+  "risk_score": 50,
+  "description": "Linux Network - Anomalous Process Using HTTP/S Ports",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux Network - Anomalous Process Using HTTP/S Ports",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(destination.port:443 or destination.port:80) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16 and not process.name:curl and not process.name:http and not process.name:https and not process.name:nginx and not process.name:packetbeat and not process.name:python2 and not process.name:snapd and not process.name:wget",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_nmap_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_nmap_activity.json
new file mode 100644
index 0000000000000..430d6b6984d6c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_nmap_activity.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "c87fca17-b3a9-4e83-b545-f30746c53920",
+  "risk_score": 50,
+  "description": "Linux: Nmap Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Nmap Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: nmap",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.dataset",
+        "value": "process",
+        "params": {
+          "query": "process"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.dataset": {
+            "query": "process",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_nping_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_nping_activity.json
new file mode 100644
index 0000000000000..a87f42f1774bf
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_nping_activity.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "0d69150b-96f8-467c-a86d-a67a3378ce77",
+  "risk_score": 50,
+  "description": "Linux: Nping Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Nping Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: nmap",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.dataset",
+        "value": "process",
+        "params": {
+          "query": "process"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.dataset": {
+            "query": "process",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_process_started_in_temp_directory.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_process_started_in_temp_directory.json
new file mode 100644
index 0000000000000..2a83ff8c5d2c6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_process_started_in_temp_directory.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "df959768-b0c9-4d45-988c-5606a2be8e5a",
+  "risk_score": 50,
+  "description": "Linux: Process Started in Temp Directory",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Process Started in Temp Directory",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.working_directory: /tmp",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.dataset",
+        "value": "process",
+        "params": {
+          "query": "process"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.dataset": {
+            "query": "process",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_ptrace_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_ptrace_activity.json
new file mode 100644
index 0000000000000..0ac4365ae8b7e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_ptrace_activity.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "1bff9259-e160-4920-bf72-4c96b6dbb7af",
+  "risk_score": 50,
+  "description": "Linux: Ptrace Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Ptrace Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: ptrace",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_rawshark_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_rawshark_activity.json
new file mode 100644
index 0000000000000..ff74ba8e51b87
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_rawshark_activity.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "30eb2b9d-b53b-4ba5-bfab-7119a8b84029",
+  "risk_score": 50,
+  "description": "Linux: Rawshark Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Rawshark Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: rawshark",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.dataset",
+        "value": "process",
+        "params": {
+          "query": "process"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.dataset": {
+            "query": "process",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_shell_activity_by_web_server.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_shell_activity_by_web_server.json
new file mode 100644
index 0000000000000..7499f6bc17ac1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_shell_activity_by_web_server.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "231876e7-4d1f-4d63-a47c-47dd1acdc1cb",
+  "risk_score": 50,
+  "description": "Linux: Shell Activity By Web Server",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Shell Activity By Web Server",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: bash and (user.name: apache or www)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_strace_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_strace_activity.json
new file mode 100644
index 0000000000000..5c813fbb62eb7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_strace_activity.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "d6450d4e-81c6-46a3-bd94-079886318ed5",
+  "risk_score": 50,
+  "description": "Linux: Strace Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Strace Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: strace",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.dataset",
+        "value": "process",
+        "params": {
+          "query": "process"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.dataset": {
+            "query": "process",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_tcpdump_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_tcpdump_activity.json
new file mode 100644
index 0000000000000..1df4ad8b469b9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_tcpdump_activity.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "7a137d76-ce3d-48e2-947d-2747796a78c0",
+  "risk_score": 50,
+  "description": "Linux: Tcpdump Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Tcpdump Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: tcpdump",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_unusual_shell_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_unusual_shell_activity.json
new file mode 100644
index 0000000000000..efa84c22f928c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_unusual_shell_activity.json
@@ -0,0 +1,93 @@
+{
+  "rule_id": "4cc78842-f8a9-4a20-b703-a596c4f24e4f",
+  "risk_score": 50,
+  "description": "Linux unusual shell activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux unusual shell activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:*sh",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": true,
+        "type": "phrase",
+        "key": "process.name",
+        "value": "bash",
+        "params": {
+          "query": "bash"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "process.name": {
+            "query": "bash",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": true,
+        "type": "phrase",
+        "key": "process.executable",
+        "value": "/bin/dash",
+        "params": {
+          "query": "/bin/dash"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "process.executable": {
+            "query": "/bin/dash",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": true,
+        "type": "phrase",
+        "key": "process.name",
+        "value": "ReportCrash",
+        "params": {
+          "query": "ReportCrash"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[2].meta.index"
+      },
+      "query": {
+        "match": {
+          "process.name": {
+            "query": "ReportCrash",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_web_download.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_web_download.json
new file mode 100644
index 0000000000000..d9ee2ccc98f10
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_web_download.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "e8ec93a6-49d2-4467-8c12-81c435fcc519",
+  "risk_score": 50,
+  "description": "Linux: Web Download",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Web Download",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: curl or wget",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "socket_opened",
+        "params": {
+          "query": "socket_opened"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "socket_opened",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_whoami_commmand.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_whoami_commmand.json
new file mode 100644
index 0000000000000..47c01778786c2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/linux_whoami_commmand.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "120559c6-5e24-49f4-9e30-8ffe697df6b9",
+  "risk_score": 50,
+  "description": "Linux: Whoami Commmand",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Linux: Whoami Commmand",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name: whoami",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "process_started",
+        "params": {
+          "query": "process_started"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "process_started",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.dataset",
+        "value": "process",
+        "params": {
+          "query": "process"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.dataset": {
+            "query": "process",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_dns_directly_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_dns_directly_to_the_internet.json
new file mode 100644
index 0000000000000..3dfbb508b897f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_dns_directly_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "6ea71ff0-9e95-475b-9506-2580d1ce6154",
+  "risk_score": 50,
+  "description": "Network - DNS Directly to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - DNS Directly to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:53 and not destination.ip: 169.254.169.254/32 and not destination.ip:127.0.0.53/32 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_ftp_file_transfer_protocol_activity_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_ftp_file_transfer_protocol_activity_to_the_internet.json
new file mode 100644
index 0000000000000..7462fd445d1ec
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_ftp_file_transfer_protocol_activity_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "87ec6396-9ac4-4706-bcf0-2ebb22002f43",
+  "risk_score": 50,
+  "description": "Network - FTP (File Transfer Protocol) Activity to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - FTP (File Transfer Protocol) Activity to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(destination.port:20 or destination.port:21) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_irc_internet_relay_chat_protocol_activity_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_irc_internet_relay_chat_protocol_activity_to_the_internet.json
new file mode 100644
index 0000000000000..dee04ee4fea8a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_irc_internet_relay_chat_protocol_activity_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "c6474c34-4953-447a-903e-9fcb7b6661aa",
+  "risk_score": 50,
+  "description": "Network - IRC (Internet Relay Chat) Protocol Activity to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - IRC (Internet Relay Chat) Protocol Activity to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(destination.port:6665 or destination.port:6666 or destination.port:6667 or destination.port:6668 or destination.port:6669) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_nat_traversal_port_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_nat_traversal_port_activity.json
new file mode 100644
index 0000000000000..6363dd7529cd6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_nat_traversal_port_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "a9cb3641-ff4b-4cdc-a063-b4b8d02a67c7",
+  "risk_score": 50,
+  "description": "Network - NAT Traversal Port Activity\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - NAT Traversal Port Activity\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:4500",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_port_26_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_port_26_activity.json
new file mode 100644
index 0000000000000..bda9984167718
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_port_26_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d7e62693-aab9-4f66-a21a-3d79ecdd603d",
+  "risk_score": 50,
+  "description": "Network - Port 26 Activity\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - Port 26 Activity\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:26",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_port_8000_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_port_8000_activity.json
new file mode 100644
index 0000000000000..efd92f988fd2b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_port_8000_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "9c5f8092-e3f7-4eda-b9d3-56eed28fb157",
+  "risk_score": 50,
+  "description": "Network - Port 8000 Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - Port 8000 Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:8000",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_port_8000_activity_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_port_8000_activity_to_the_internet.json
new file mode 100644
index 0000000000000..790773f5308bb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_port_8000_activity_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "08d5d7e2-740f-44d8-aeda-e41f4263efaf",
+  "risk_score": 50,
+  "description": "Network - Port 8000 Activity to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - Port 8000 Activity to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:8000 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_pptp_point_to_point_tunneling_protocol_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_pptp_point_to_point_tunneling_protocol_activity.json
new file mode 100644
index 0000000000000..f22a23648a7fa
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_pptp_point_to_point_tunneling_protocol_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d2053495-8fe7-4168-b3df-dad844046be3",
+  "risk_score": 50,
+  "description": "Network - PPTP (Point to Point Tunneling Protocol) Activity\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - PPTP (Point to Point Tunneling Protocol) Activity\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:1723",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_proxy_port_activity_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_proxy_port_activity_to_the_internet.json
new file mode 100644
index 0000000000000..e7cc9b2b07cfd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_proxy_port_activity_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ad0e5e75-dd89-4875-8d0a-dfdc1828b5f3",
+  "risk_score": 50,
+  "description": "Network - Proxy Port Activity to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - Proxy Port Activity to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(destination.port:8080 or destination.port:3128) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rdp_remote_desktop_protocol_from_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rdp_remote_desktop_protocol_from_the_internet.json
new file mode 100644
index 0000000000000..c5a16bfef7248
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rdp_remote_desktop_protocol_from_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "8c1bdde8-4204-45c0-9e0c-c85ca3902488",
+  "risk_score": 50,
+  "description": "Network - RDP (Remote Desktop Protocol) from the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - RDP (Remote Desktop Protocol) from the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:3389 and not source.ip:10.0.0.0/8 and not source.ip:172.16.0.0/12 and not source.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rdp_remote_desktop_protocol_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rdp_remote_desktop_protocol_to_the_internet.json
new file mode 100644
index 0000000000000..b069bd5e3ca67
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rdp_remote_desktop_protocol_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "e56993d2-759c-4120-984c-9ec9bb940fd5",
+  "risk_score": 50,
+  "description": "Network - RDP (Remote Desktop Protocol) to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - RDP (Remote Desktop Protocol) to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:3389 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rpc_remote_procedure_call_from_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rpc_remote_procedure_call_from_the_internet.json
new file mode 100644
index 0000000000000..bef842ec2adc3
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rpc_remote_procedure_call_from_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "143cb236-0956-4f42-a706-814bcaa0cf5a",
+  "risk_score": 50,
+  "description": "Network - RPC (Remote Procedure Call) from the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - RPC (Remote Procedure Call) from the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:3389 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rpc_remote_procedure_call_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rpc_remote_procedure_call_to_the_internet.json
new file mode 100644
index 0000000000000..15184aee86edb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_rpc_remote_procedure_call_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "32923416-763a-4531-bb35-f33b9232ecdb",
+  "risk_score": 50,
+  "description": "Network - RPC (Remote Procedure Call) to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - RPC (Remote Procedure Call) to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:135 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_smb_windows_file_sharing_activity_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_smb_windows_file_sharing_activity_to_the_internet.json
new file mode 100644
index 0000000000000..365490792ed37
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_smb_windows_file_sharing_activity_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "c82b2bd8-d701-420c-ba43-f11a155b681a",
+  "risk_score": 50,
+  "description": "Network - SMB (Windows File Sharing) Activity to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - SMB (Windows File Sharing) Activity to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(destination.port:139 or destination.port:445) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_smtp_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_smtp_to_the_internet.json
new file mode 100644
index 0000000000000..b16e84e8cea74
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_smtp_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "67a9beba-830d-4035-bfe8-40b7e28f8ac4",
+  "risk_score": 50,
+  "description": "Network - SMTP to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - SMTP to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:25 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_sql_server_port_activity_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_sql_server_port_activity_to_the_internet.json
new file mode 100644
index 0000000000000..4e884f0de1167
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_sql_server_port_activity_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "139c7458-566a-410c-a5cd-f80238d6a5cd",
+  "risk_score": 50,
+  "description": "Network - SQL Server Port Activity to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - SQL Server Port Activity to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:1433 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_ssh_secure_shell_from_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_ssh_secure_shell_from_the_internet.json
new file mode 100644
index 0000000000000..f7340b710be35
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_ssh_secure_shell_from_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ea0784f0-a4d7-4fea-ae86-4baaf27a6f17",
+  "risk_score": 50,
+  "description": "Network - SSH (Secure Shell) from the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - SSH (Secure Shell) from the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:22 and not source.ip:10.0.0.0/8 and not source.ip:172.16.0.0/12 and not source.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_ssh_secure_shell_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_ssh_secure_shell_to_the_internet.json
new file mode 100644
index 0000000000000..21877b9716aae
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_ssh_secure_shell_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "6f1500bc-62d7-4eb9-8601-7485e87da2f4",
+  "risk_score": 50,
+  "description": "Network - SSH (Secure Shell) to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - SSH (Secure Shell) to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:22 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_telnet_port_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_telnet_port_activity.json
new file mode 100644
index 0000000000000..2d917277bcb85
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_telnet_port_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "34fde489-94b0-4500-a76f-b8a157cf9269",
+  "risk_score": 50,
+  "description": "Network - Telnet Port Activity\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - Telnet Port Activity\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:23",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_tor_activity_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_tor_activity_to_the_internet.json
new file mode 100644
index 0000000000000..991cc02a2123f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_tor_activity_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "7d2c38d7-ede7-4bdf-b140-445906e6c540",
+  "risk_score": 50,
+  "description": "Network - Tor Activity to the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - Tor Activity to the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(destination.port:9001 or destination.port:9030) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_vnc_virtual_network_computing_from_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_vnc_virtual_network_computing_from_the_internet.json
new file mode 100644
index 0000000000000..5fbffa0149783
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_vnc_virtual_network_computing_from_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "5700cb81-df44-46aa-a5d7-337798f53eb8",
+  "risk_score": 50,
+  "description": "Network - VNC (Virtual Network Computing) From the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - VNC (Virtual Network Computing) From the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:5800 and not source.ip:10.0.0.0/8 and not source.ip:172.16.0.0/12 and not source.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_vnc_virtual_network_computing_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_vnc_virtual_network_computing_to_the_internet.json
new file mode 100644
index 0000000000000..9d3608cb9e05d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/network_vnc_virtual_network_computing_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "3ad49c61-7adc-42c1-b788-732eda2f5abf",
+  "risk_score": 50,
+  "description": "Network - VNC (Virtual Network Computing) To the Internet\t",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Network - VNC (Virtual Network Computing) To the Internet\t",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:5800 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/powershell_network_connection.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/powershell_network_connection.json
new file mode 100644
index 0000000000000..ba86dd5bdf1db
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/powershell_network_connection.json
@@ -0,0 +1,68 @@
+{
+  "rule_id": "8e792144-39a6-4a63-9779-2f12719dc132",
+  "risk_score": 50,
+  "description": "Powershell network connection",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Powershell network connection",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:powershell.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Network connection detected (rule: NetworkConnect)",
+        "params": {
+          "query": "Network connection detected (rule: NetworkConnect)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Network connection detected (rule: NetworkConnect)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    },
+    {
+      "meta": {
+        "negate": true,
+        "type": "phrase",
+        "key": "destination.ip",
+        "value": "169.254.169.254",
+        "params": {
+          "query": "169.254.169.254"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "destination.ip": {
+            "query": "169.254.169.254",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/process_started_by_acrobat_reader_possible_payload.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/process_started_by_acrobat_reader_possible_payload.json
new file mode 100644
index 0000000000000..99968dbdcc00d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/process_started_by_acrobat_reader_possible_payload.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "c359628d-d5af-4a20-99df-aeeea109b690",
+  "risk_score": 50,
+  "description": "Process started by Acrobat reader - possible payload",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Process started by Acrobat reader - possible payload",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.parent.name:AcroRd32.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/process_started_by_ms_office_program_possible_payload.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/process_started_by_ms_office_program_possible_payload.json
new file mode 100644
index 0000000000000..9241a2a44eb06
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/process_started_by_ms_office_program_possible_payload.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "3181b814-08e3-43f9-b77a-a2530603b131",
+  "risk_score": 50,
+  "description": "Process started by MS Office program - possible payload",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Process started by MS Office program - possible payload",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "        process.parent.name:EXCEL.EXE or process.parent.name:MSPUB.EXE or process.parent.name:OUTLOOK.EXE or process.parent.name:POWERPNT.EXE or process.parent.name:VISIO.EXE or process.parent.name:WINWORD.EXE",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/process_started_by_windows_defender.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/process_started_by_windows_defender.json
new file mode 100644
index 0000000000000..3f1dc90c99c97
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/process_started_by_windows_defender.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b3da3321-417d-494b-854c-b40369e063f0",
+  "risk_score": 50,
+  "description": "Process started by Windows Defender",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Process started by Windows Defender",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "parent.process.name:MsMpEng.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/psexec_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/psexec_activity.json
new file mode 100644
index 0000000000000..3797b44c6d967
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/psexec_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "9511b7f4-3898-4813-8bd3-d810b03148ab",
+  "risk_score": 50,
+  "description": "PSexec activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "PSexec activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:PsExec.exe or process.name:PsExec64.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/search_windows_10.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/search_windows_10.json
new file mode 100644
index 0000000000000..86c1c36f4b832
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/search_windows_10.json
@@ -0,0 +1,66 @@
+{
+  "rule_id": "5d00c579-794c-4f64-be52-1ed8cae2b11e",
+  "risk_score": 50,
+  "description": "(Search) Windows 10",
+  "immutable": true,
+  "interval": "5m",
+  "name": "(Search) Windows 10",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "",
+  "language": "kuery",
+  "filters": [
+    {
+      "$state": {
+        "store": "appState"
+      },
+      "meta": {
+        "alias": null,
+        "disabled": false,
+        "key": "agent.hostname",
+        "negate": false,
+        "params": {
+          "query": "LAPTOP-CQNI37L2"
+        },
+        "type": "phrase",
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "agent.hostname": {
+            "query": "LAPTOP-CQNI37L2",
+            "type": "phrase"
+          }
+        }
+      }
+    },
+    {
+      "meta": {
+        "alias": null,
+        "negate": false,
+        "disabled": false,
+        "type": "phrase",
+        "key": "event.provider",
+        "params": {
+          "query": "Microsoft-Windows-Sysmon"
+        },
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.provider": {
+            "query": "Microsoft-Windows-Sysmon",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_child_processes_of_spoolsvexe.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_child_processes_of_spoolsvexe.json
new file mode 100644
index 0000000000000..554ddb1468d0b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_child_processes_of_spoolsvexe.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "2f026c73-bb63-455e-abdf-f11f463acf0d",
+  "risk_score": 50,
+  "description": "Splunk - Child Processes of Spoolsv.exe",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Splunk - Child Processes of Spoolsv.exe",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.parent.name:spoolsv.exe and not process.name:regsvr32.exe ",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_large_outbound_icmp_packets.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_large_outbound_icmp_packets.json
new file mode 100644
index 0000000000000..30dd0023b4491
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_large_outbound_icmp_packets.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "e108c0c6-5ee8-47a0-8c23-ec47ba3a9b00",
+  "risk_score": 50,
+  "description": "Splunk - Detect Large Outbound ICMP Packets",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Splunk - Detect Large Outbound ICMP Packets",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "network.transport:icmp and network.bytes>1000 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_long_dns_txt_record_response.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_long_dns_txt_record_response.json
new file mode 100644
index 0000000000000..8ae0c57d6aeaa
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_long_dns_txt_record_response.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "2cdf84be-1c9c-4184-9880-75b9a6ddeaba",
+  "risk_score": 50,
+  "description": "Splunk - Detect Long DNS TXT Record Response",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Splunk - Detect Long DNS TXT Record Response",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "network.protocol:dns and server.bytes>100 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16 and not destination.ip:169.254.169.254 and not destination.ip:127.0.0.53",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_new_local_admin_account.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_new_local_admin_account.json
new file mode 100644
index 0000000000000..39cb60d130a69
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_new_local_admin_account.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "030fc8e4-2c5f-4cc9-a6bd-2b6b7b98ae16",
+  "risk_score": 50,
+  "description": "Splunk - Detect New Local Admin account",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Splunk - Detect New Local Admin account",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:(4720 or 4732) and winlog.event_data.TargetUserName:Administrators",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_psexec_with_accepteula_flag.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_psexec_with_accepteula_flag.json
new file mode 100644
index 0000000000000..b8b4d5f34037d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_psexec_with_accepteula_flag.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "4b63cf13-9043-41e3-84ec-6e39eb0d407e",
+  "risk_score": 50,
+  "description": "Splunk - Detect PsExec With accepteula Flag",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Splunk - Detect PsExec With accepteula Flag",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:PsExec.exe and process.args:\"-accepteula\"",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_use_of_cmdexe_to_launch_script_interpreters.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_use_of_cmdexe_to_launch_script_interpreters.json
new file mode 100644
index 0000000000000..1cd29886f3cd0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_detect_use_of_cmdexe_to_launch_script_interpreters.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f4388e4c-ec3d-41b3-be5c-27c11f61473c",
+  "risk_score": 50,
+  "description": "Splunk - Detect Use of cmd.exe to Launch Script Interpreters",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Splunk - Detect Use of cmd.exe to Launch Script Interpreters",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.action:\"Process Create (rule: ProcessCreate)\" and process.name:(\"wscript.exe\" or \"cscript.exe\") and process.parent.name:\"cmd.exe\"",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_processes_created_by_netsh.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_processes_created_by_netsh.json
new file mode 100644
index 0000000000000..cbedcb655990f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_processes_created_by_netsh.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ce7a0bde-7406-4729-a075-a215f4571ff6",
+  "risk_score": 50,
+  "description": "Splunk - Processes created by netsh",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Splunk - Processes created by netsh",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.parent.name:netsh.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_processes_launching_netsh.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_processes_launching_netsh.json
new file mode 100644
index 0000000000000..c25e6211a3bb9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_processes_launching_netsh.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "600dba95-f1c6-4a4d-aae1-c79cbd8a5ddd",
+  "risk_score": 50,
+  "description": "Splunk - Processes launching netsh",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Splunk - Processes launching netsh",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:netsh.exe and event.action:\"Process Create (rule: ProcessCreate)\" ",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_protocols_passing_authentication_in_cleartext.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_protocols_passing_authentication_in_cleartext.json
new file mode 100644
index 0000000000000..12eafea8d88c9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_protocols_passing_authentication_in_cleartext.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f4442e7f-856a-4a4a-851b-c1f9b97b0d39",
+  "risk_score": 50,
+  "description": "Splunk - Protocols passing authentication in cleartext",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Splunk - Protocols passing authentication in cleartext",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "destination.port:(21 or 23 or 110 or 143) and network.transport:tcp",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_windows_event_log_cleared.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_windows_event_log_cleared.json
new file mode 100644
index 0000000000000..7317f491d1a9d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/splunk_windows_event_log_cleared.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "c0747553-4652-4e74-bc86-898f2daa2bde",
+  "risk_score": 50,
+  "description": "Splunk - Windows Event Log Cleared",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Splunk - Windows Event Log Cleared",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:(1102 or 1100)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_base64_encoded_invokecommand_powershell_execution.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_base64_encoded_invokecommand_powershell_execution.json
new file mode 100644
index 0000000000000..332f174cad2cf
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_base64_encoded_invokecommand_powershell_execution.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "6ff01a30-95dd-471c-b61d-0fd9ee2d0a20",
+  "risk_score": 50,
+  "description": "Suricata Base64 Encoded Invoke-Command Powershell Execution",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Base64 Encoded Invoke-Command Powershell Execution",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610182 or 2610183 or 2610184 or 2610185 or 2610186 or 2610187)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_base64_encoded_newobject_powershell_execution.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_base64_encoded_newobject_powershell_execution.json
new file mode 100644
index 0000000000000..a86f7fa07e7d9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_base64_encoded_newobject_powershell_execution.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d14d5401-0f7a-4933-b816-1b8f823e3d84",
+  "risk_score": 50,
+  "description": "Suricata Base64 Encoded New-Object Powershell Execution",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Base64 Encoded New-Object Powershell Execution",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610188 or 2610189 or 2610190 or 2610191 or 2610192 or 2610193)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_base64_encoded_startprocess_powershell_execution.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_base64_encoded_startprocess_powershell_execution.json
new file mode 100644
index 0000000000000..722ce65dd83e8
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_base64_encoded_startprocess_powershell_execution.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "372dce88-003d-4bcf-8c95-34ea8be180a1",
+  "risk_score": 50,
+  "description": "Suricata Base64 Encoded Start-Process Powershell Execution",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Base64 Encoded Start-Process Powershell Execution",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610194 or 2610195 or 2610196 or 2610197 or 2610198 or 2610199)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_a_suspicious_string_was_detected.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_a_suspicious_string_was_detected.json
new file mode 100644
index 0000000000000..eb4fa0fe411a9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_a_suspicious_string_was_detected.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "2a3d91c1-5065-46ab-bed0-93f80835b1d5",
+  "risk_score": 50,
+  "description": "Suricata Category - A suspicious string was detected",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - A suspicious string was detected",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"A suspicious string was detected\" or rule.category: \"A suspicious string was detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_administrator_privilege_gain.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_administrator_privilege_gain.json
new file mode 100644
index 0000000000000..3fc61c50927c7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_administrator_privilege_gain.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f840129e-9089-4f46-8af1-0745e8f54713",
+  "risk_score": 50,
+  "description": "Suricata Category - Attempted Administrator Privilege Gain",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Attempted Administrator Privilege Gain",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Attempted Administrator Privilege Gain\" or rule.category: \"Attempted Administrator Privilege Gain\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_denial_of_service.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_denial_of_service.json
new file mode 100644
index 0000000000000..e888b2076f137
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_denial_of_service.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "a62927f4-2488-4679-b56f-cda1a7f4c9e1",
+  "risk_score": 50,
+  "description": "Suricata Category - Attempted Denial of Service",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Attempted Denial of Service",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Attempted Denial of Service\" or rule.category: \"Attempted Denial of Service\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_information_leak.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_information_leak.json
new file mode 100644
index 0000000000000..ae93e8bce7801
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_information_leak.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "88d69362-f496-41d6-8e6b-a2dbaed3513f",
+  "risk_score": 50,
+  "description": "Suricata Category - Attempted Information Leak",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Attempted Information Leak",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Attempted Information Leak\" or rule.category: \"Attempted Information Leak\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_login_with_suspicious_username.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_login_with_suspicious_username.json
new file mode 100644
index 0000000000000..c00e7a42aee06
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_login_with_suspicious_username.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "a84cd36c-dd5a-4e86-a2ce-44556c21cef0",
+  "risk_score": 50,
+  "description": "Suricata Category - Attempted Login with Suspicious Username",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Attempted Login with Suspicious Username",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"An attempted login using a suspicious username was detected\" or rule.category: \"An attempted login using a suspicious username was detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_user_privilege_gain.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_user_privilege_gain.json
new file mode 100644
index 0000000000000..1b2fcbee310da
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_attempted_user_privilege_gain.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "eabce895-4602-4d20-8bf9-11c903bb3e08",
+  "risk_score": 50,
+  "description": "Suricata Category - Attempted User Privilege Gain",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Attempted User Privilege Gain",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Attempted User Privilege Gain\" or rule.category: \"Attempted User Privilege Gain\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_client_using_unusual_port.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_client_using_unusual_port.json
new file mode 100644
index 0000000000000..feedffeaacc9c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_client_using_unusual_port.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "00503a3c-304c-421c-bfea-e5d8fdfd9726",
+  "risk_score": 50,
+  "description": "Suricata Category - Client Using Unusual Port",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Client Using Unusual Port",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"A client was using an unusual port\" or rule.category: \"A client was using an unusual port\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_crypto_currency_mining_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_crypto_currency_mining_activity.json
new file mode 100644
index 0000000000000..e05461baf36de
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_crypto_currency_mining_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "74cd4920-a441-41d2-8a23-5bee70626e60",
+  "risk_score": 50,
+  "description": "Suricata Category - Crypto Currency Mining Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Crypto Currency Mining Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Crypto Currency Mining Activity Detected\" or rule.category: \"Crypto Currency Mining Activity Detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_decode_of_an_rpc_query.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_decode_of_an_rpc_query.json
new file mode 100644
index 0000000000000..0e22aa66ca04d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_decode_of_an_rpc_query.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "e9fc5bd3-c8a1-442c-be6d-032da07c508b",
+  "risk_score": 50,
+  "description": "Suricata Category - Decode of an RPC Query",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Decode of an RPC Query",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Decode of an RPC Query\" or rule.category: \"Decode of an RPC Query\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_default_username_and_password_login_attempt.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_default_username_and_password_login_attempt.json
new file mode 100644
index 0000000000000..0810168bbaf15
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_default_username_and_password_login_attempt.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "190bd112-f831-4813-98b2-e45a934277c2",
+  "risk_score": 50,
+  "description": "Suricata Category - Default Username and Password Login Attempt",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Default Username and Password Login Attempt",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Attempt to login by a default username and password\" or rule.category: \"Attempt to login by a default username and password\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_denial_of_service.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_denial_of_service.json
new file mode 100644
index 0000000000000..d6ef10a86c184
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_denial_of_service.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "0e97e390-84db-4725-965a-a8b0b600f7be",
+  "risk_score": 50,
+  "description": "Suricata Category - Denial of Service",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Denial of Service",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Denial of Service\" or rule.category: \"Denial of Service\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_denial_of_service_attack.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_denial_of_service_attack.json
new file mode 100644
index 0000000000000..3f4975bcdfb14
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_denial_of_service_attack.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "42a60eaa-fd20-479b-b6ca-bdb88d47b34b",
+  "risk_score": 50,
+  "description": "Suricata Category - Denial of Service Attack",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Denial of Service Attack",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Detection of a Denial of Service Attack\" or rule.category: \"Detection of a Denial of Service Attack\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_executable_code_was_detected.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_executable_code_was_detected.json
new file mode 100644
index 0000000000000..f1f6177e01503
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_executable_code_was_detected.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "4699296b-5127-475a-9d83-8434fcd18136",
+  "risk_score": 50,
+  "description": "Suricata Category - Executable code was detected",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Executable code was detected",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Executable code was detected\" or rule.category: \"Executable code was detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_exploit_kit_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_exploit_kit_activity.json
new file mode 100644
index 0000000000000..025f0f4d266f9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_exploit_kit_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b3111af8-79bf-4ec3-97ae-28d9ed9fbd38",
+  "risk_score": 50,
+  "description": "Suricata Category - Exploit Kit Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Exploit Kit Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Exploit Kit Activity Detected\" or rule.category: \"Exploit Kit Activity Detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_external_ip_address_retrieval.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_external_ip_address_retrieval.json
new file mode 100644
index 0000000000000..eab3cb5910861
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_external_ip_address_retrieval.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "c7df9ecf-d6be-4ef8-9871-cb317dfff0b4",
+  "risk_score": 50,
+  "description": "Suricata Category - External IP Address Retrieval",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - External IP Address Retrieval",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Device Retrieving External IP Address Detected\" or rule.category: \"Device Retrieving External IP Address Detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_generic_icmp_event.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_generic_icmp_event.json
new file mode 100644
index 0000000000000..37b93ce6886d8
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_generic_icmp_event.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "3309bffa-7c43-409a-acea-6631c1b077e5",
+  "risk_score": 50,
+  "description": "Suricata Category - Generic ICMP event",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Generic ICMP event",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Generic ICMP event\" or rule.category: \"Generic ICMP event\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_generic_protocol_command_decode.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_generic_protocol_command_decode.json
new file mode 100644
index 0000000000000..ed5a6dbe47f5a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_generic_protocol_command_decode.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "6fd2deb4-a7a9-4221-8b7b-8d26836a8c30",
+  "risk_score": 50,
+  "description": "Suricata Category - Generic Protocol Command Decode",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Generic Protocol Command Decode",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Generic Protocol Command Decode\" or rule.category: \"Generic Protocol Command Decode\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_information_leak.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_information_leak.json
new file mode 100644
index 0000000000000..7cec0f24570ec
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_information_leak.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "95df8ff4-7169-4c84-ae50-3561b1d1bc91",
+  "risk_score": 50,
+  "description": "Suricata Category - Information Leak",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Information Leak",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Information Leak\" or rule.category: \"Information Leak\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_large_scale_information_leak.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_large_scale_information_leak.json
new file mode 100644
index 0000000000000..c871624f86d9f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_large_scale_information_leak.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ca98de30-c703-4170-97ae-ab2b340f6080",
+  "risk_score": 50,
+  "description": "Suricata Category - Large Scale Information Leak",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Large Scale Information Leak",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Large Scale Information Leak\" or rule.category: \"Large Scale Information Leak\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_malware_command_and_control_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_malware_command_and_control_activity.json
new file mode 100644
index 0000000000000..e0b7e41b67b92
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_malware_command_and_control_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "56656341-2940-4a69-b8fe-acf3c734f540",
+  "risk_score": 50,
+  "description": "Suricata Category - Malware Command and Control Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Malware Command and Control Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Malware Command and Control Activity Detected\" or rule.category: \"Malware Command and Control Activity Detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_misc_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_misc_activity.json
new file mode 100644
index 0000000000000..aad3b2c5057ce
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_misc_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "403ddbde-a486-4dd7-b932-cee4ebef88b6",
+  "risk_score": 50,
+  "description": "Suricata Category - Misc Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Misc Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Misc activity\" or rule.category: \"Misc activity\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_misc_attack.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_misc_attack.json
new file mode 100644
index 0000000000000..eea27b6fa8ae2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_misc_attack.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "83277123-749f-49da-ad3d-d59f35490db1",
+  "risk_score": 50,
+  "description": "Suricata Category - Misc Attack",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Misc Attack",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Misc Attack\" or rule.category: \"Misc Attack\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_network_scan_detected.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_network_scan_detected.json
new file mode 100644
index 0000000000000..0eb2b136bbef9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_network_scan_detected.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "7e969b45-d005-4173-aee7-a7aaa79bc372",
+  "risk_score": 50,
+  "description": "Suricata Category - Network Scan Detected",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Network Scan Detected",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Detection of a Network Scan\" or rule.category: \"Detection of a Network Scan\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_network_trojan_detected.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_network_trojan_detected.json
new file mode 100644
index 0000000000000..f3aeb8393c13f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_network_trojan_detected.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "76ffa464-ec03-42e1-87ee-87760c331061",
+  "risk_score": 50,
+  "description": "Suricata Category - Network Trojan Detected",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Network Trojan Detected",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"A Network Trojan was detected\" or rule.category: \"A Network Trojan was detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_nonstandard_protocol_or_event.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_nonstandard_protocol_or_event.json
new file mode 100644
index 0000000000000..c3b696afa8e43
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_nonstandard_protocol_or_event.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "82f9f485-873b-4eeb-b231-052ab81e05b8",
+  "risk_score": 50,
+  "description": "Suricata Category - Non-Standard Protocol or Event",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Non-Standard Protocol or Event",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Detection of a non-standard protocol or event\" or rule.category: \"Detection of a non-standard protocol or event\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_not_suspicious_traffic.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_not_suspicious_traffic.json
new file mode 100644
index 0000000000000..e26180a429a81
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_not_suspicious_traffic.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "c0f684ff-4f15-44e7-912d-aa8b8f08a910",
+  "risk_score": 50,
+  "description": "Suricata Category - Not Suspicious Traffic",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Not Suspicious Traffic",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Not Suspicious Traffic\" or rule.category: \"Not Suspicious Traffic\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_observed_c2_domain.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_observed_c2_domain.json
new file mode 100644
index 0000000000000..7a11a3738b7a4
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_observed_c2_domain.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "8adfa89f-aa90-4d26-9d7a-7da652cae902",
+  "risk_score": 50,
+  "description": "Suricata Category - Observed C2 Domain",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Observed C2 Domain",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Domain Observed Used for C2 Detected\" or rule.category: \"Domain Observed Used for C2 Detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_possible_social_engineering_attempted.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_possible_social_engineering_attempted.json
new file mode 100644
index 0000000000000..f21da57a4d7b7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_possible_social_engineering_attempted.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "7d2d5a5f-f590-407d-933a-42adb1a7bcef",
+  "risk_score": 50,
+  "description": "Suricata Category - Possible Social Engineering Attempted",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Possible Social Engineering Attempted",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Possible Social Engineering Attempted\" or rule.category: \"Possible Social Engineering Attempted\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_possibly_unwanted_program.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_possibly_unwanted_program.json
new file mode 100644
index 0000000000000..7303185c6e9a4
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_possibly_unwanted_program.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "1b9a31e8-fdfa-400e-aa4e-79a7f1a1da18",
+  "risk_score": 50,
+  "description": "Suricata Category - Possibly Unwanted Program",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Possibly Unwanted Program",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Possibly Unwanted Program Detected\" or rule.category: \"Possibly Unwanted Program Detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_potential_corporate_privacy_violation.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_potential_corporate_privacy_violation.json
new file mode 100644
index 0000000000000..d3f867778bb43
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_potential_corporate_privacy_violation.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "1c70f5d5-eae0-4d00-b35a-d34ca607094e",
+  "risk_score": 50,
+  "description": "Suricata Category - Potential Corporate Privacy Violation",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Potential Corporate Privacy Violation",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Potential Corporate Privacy Violation\" or rule.category: \"Potential Corporate Privacy Violation\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_potentially_bad_traffic.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_potentially_bad_traffic.json
new file mode 100644
index 0000000000000..f77fe14014db3
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_potentially_bad_traffic.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "197cdd5a-9880-4780-a87c-594d0ed2b7b4",
+  "risk_score": 50,
+  "description": "Suricata Category - Potentially Bad Traffic",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Potentially Bad Traffic",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Potentially Bad Traffic\" or rule.category: \"Potentially Bad Traffic\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_potentially_vulnerable_web_application_access.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_potentially_vulnerable_web_application_access.json
new file mode 100644
index 0000000000000..1665f8ca82424
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_potentially_vulnerable_web_application_access.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "0993e926-1a01-4c28-918a-cdd5741a19a8",
+  "risk_score": 50,
+  "description": "Suricata Category - Potentially Vulnerable Web Application Access",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Potentially Vulnerable Web Application Access",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"access to a potentially vulnerable web application\" or rule.category: \"access to a potentially vulnerable web application\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_successful_administrator_privilege_gain.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_successful_administrator_privilege_gain.json
new file mode 100644
index 0000000000000..e7b636c421c16
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_successful_administrator_privilege_gain.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f068e655-1f52-4d81-839a-9c08c6543ceb",
+  "risk_score": 50,
+  "description": "Suricata Category - Successful Administrator Privilege Gain",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Successful Administrator Privilege Gain",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Successful Administrator Privilege Gain\" or rule.category: \"Successful Administrator Privilege Gain\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_successful_credential_theft.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_successful_credential_theft.json
new file mode 100644
index 0000000000000..bb87b86a75860
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_successful_credential_theft.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "90f3e735-2187-4e8e-8d28-6e3249964851",
+  "risk_score": 50,
+  "description": "Suricata Category - Successful Credential Theft",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Successful Credential Theft",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Successful Credential Theft Detected\" or rule.category: \"Successful Credential Theft Detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_successful_user_privilege_gain.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_successful_user_privilege_gain.json
new file mode 100644
index 0000000000000..d6af6e2baabea
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_successful_user_privilege_gain.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f8ebd022-6e92-4b80-ac49-7ee011ba2ce0",
+  "risk_score": 50,
+  "description": "Suricata Category - Successful User Privilege Gain",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Successful User Privilege Gain",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Successful User Privilege Gain\" or rule.category: \"Successful User Privilege Gain\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_suspicious_filename_detected.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_suspicious_filename_detected.json
new file mode 100644
index 0000000000000..205940bb7d0bc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_suspicious_filename_detected.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d0489b07-8140-4e3d-a2b7-52f2c06fdc7c",
+  "risk_score": 50,
+  "description": "Suricata Category - Suspicious Filename Detected",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Suspicious Filename Detected",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"A suspicious filename was detected\" or rule.category: \"A suspicious filename was detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_system_call_detected.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_system_call_detected.json
new file mode 100644
index 0000000000000..a86ea16ddf207
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_system_call_detected.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "44a5c55a-a34f-43c3-8f21-df502862aa9b",
+  "risk_score": 50,
+  "description": "Suricata Category - System Call Detected",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - System Call Detected",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"A system call was detected\" or rule.category: \"A system call was detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_targeted_malicious_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_targeted_malicious_activity.json
new file mode 100644
index 0000000000000..8923c07341b93
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_targeted_malicious_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d299379d-41de-4640-96b6-77aaa9adfa6f",
+  "risk_score": 50,
+  "description": "Suricata Category - Targeted Malicious Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Targeted Malicious Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Targeted Malicious Activity was Detected\" or rule.category: \"Targeted Malicious Activity was Detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_tcp_connection_detected.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_tcp_connection_detected.json
new file mode 100644
index 0000000000000..a1e400c71b8be
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_tcp_connection_detected.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ddf402cf-307d-4f46-a25d-dce3aee1ad13",
+  "risk_score": 50,
+  "description": "Suricata Category - TCP Connection Detected",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - TCP Connection Detected",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"A TCP connection was detected\" or rule.category: \"A TCP connection was detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_unknown_traffic.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_unknown_traffic.json
new file mode 100644
index 0000000000000..28ae09a6cbe5c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_unknown_traffic.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "827ea90c-00c2-45f7-b873-dd060297b2d2",
+  "risk_score": 50,
+  "description": "Suricata Category - Unknown Traffic",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Unknown Traffic",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Unknown Traffic\" or rule.category: \"Unknown Traffic\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_unsuccessful_user_privilege_gain.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_unsuccessful_user_privilege_gain.json
new file mode 100644
index 0000000000000..5eba26752f717
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_unsuccessful_user_privilege_gain.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "85471d30-78c9-48f6-b2db-ab5b2547e450",
+  "risk_score": 50,
+  "description": "Suricata Category - Unsuccessful User Privilege Gain",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Unsuccessful User Privilege Gain",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Unsuccessful User Privilege Gain\" or rule.category: \"Unsuccessful User Privilege Gain\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_web_application_attack.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_web_application_attack.json
new file mode 100644
index 0000000000000..6cd7b2d87ac1a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_category_web_application_attack.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "e856918b-f26e-4893-84b9-3deb65046fb7",
+  "risk_score": 50,
+  "description": "Suricata Category - Web Application Attack",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Category - Web Application Attack",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: suricata and event.kind: alert and (suricata.eve.alert.category: \"Web Application Attack\" or rule.category: \"Web Application Attack\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_cobaltstrike_artifact_in_an_dns_request.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_cobaltstrike_artifact_in_an_dns_request.json
new file mode 100644
index 0000000000000..bffcd18235839
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_cobaltstrike_artifact_in_an_dns_request.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "481ef0f5-beda-4fa2-8bfb-039c95500deb",
+  "risk_score": 50,
+  "description": "Suricata CobaltStrike Artifact in an DNS Request",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata CobaltStrike Artifact in an DNS Request",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610166 or 2610167 or 2610168)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_commonly_abused_dns_domain_detected.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_commonly_abused_dns_domain_detected.json
new file mode 100644
index 0000000000000..334a632697a81
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_commonly_abused_dns_domain_detected.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "1844dfe1-b05e-4ca6-b367-6b9e3a1fe227",
+  "risk_score": 50,
+  "description": "Suricata Commonly Abused DNS Domain Detected",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Commonly Abused DNS Domain Detected",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature:(TGI* and *HUNT* and *Abused* and *TLD*) and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_directory_reversal_characters_in_an_http_request.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_directory_reversal_characters_in_an_http_request.json
new file mode 100644
index 0000000000000..098b873210d6f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_directory_reversal_characters_in_an_http_request.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "c0ca8090-60f8-4458-befe-c43687b648a3",
+  "risk_score": 50,
+  "description": "Suricata Directory Reversal Characters in an HTTP Request",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Directory Reversal Characters in an HTTP Request",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610161 or 2610162)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_directory_traversal_characters_in_http_response.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_directory_traversal_characters_in_http_response.json
new file mode 100644
index 0000000000000..3da22fcb912a8
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_directory_traversal_characters_in_http_response.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "a6406974-ea70-45b5-b5d8-ca17695adbde",
+  "risk_score": 50,
+  "description": "Suricata Directory Traversal Characters in HTTP Response",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Directory Traversal Characters in HTTP Response",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610086 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_directory_traversal_in_downloaded_zip_file.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_directory_traversal_in_downloaded_zip_file.json
new file mode 100644
index 0000000000000..370f9f6ba83fc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_directory_traversal_in_downloaded_zip_file.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d5d990bc-303c-4241-8138-6ba3cf2ee93e",
+  "risk_score": 50,
+  "description": "Suricata Directory Traversal in Downloaded Zip File",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Directory Traversal in Downloaded Zip File",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610085 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_dns_traffic_on_unusual_tcp_port.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_dns_traffic_on_unusual_tcp_port.json
new file mode 100644
index 0000000000000..9389897a95b87
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_dns_traffic_on_unusual_tcp_port.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "deeae336-4ff7-4cf8-ae5b-18bce05da02e",
+  "risk_score": 50,
+  "description": "Suricata DNS Traffic on Unusual TCP Port",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata DNS Traffic on Unusual TCP Port",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610013 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_dns_traffic_on_unusual_udp_port.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_dns_traffic_on_unusual_udp_port.json
new file mode 100644
index 0000000000000..a6bcf664bf803
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_dns_traffic_on_unusual_udp_port.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "2343d9a4-365b-45b2-acb0-76934d43c75b",
+  "risk_score": 50,
+  "description": "Suricata DNS Traffic on Unusual UDP Port",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata DNS Traffic on Unusual UDP Port",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610015 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_double_encoded_characters_in_a_uri.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_double_encoded_characters_in_a_uri.json
new file mode 100644
index 0000000000000..005156b68ba98
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_double_encoded_characters_in_a_uri.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "1ed4d2d1-330c-4c7d-b32d-2d8805437946",
+  "risk_score": 50,
+  "description": "Suricata Double Encoded Characters in a URI",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Double Encoded Characters in a URI",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610092 or 2610093 or 2610094 or 2610095)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_double_encoded_characters_in_an_http_post.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_double_encoded_characters_in_an_http_post.json
new file mode 100644
index 0000000000000..2ff186a4026bb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_double_encoded_characters_in_an_http_post.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "a839a360-94ae-4219-b1cc-458d836333a7",
+  "risk_score": 50,
+  "description": "Suricata Double Encoded Characters in an HTTP POST",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Double Encoded Characters in an HTTP POST",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610090 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_eval_php_function_in_an_http_request.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_eval_php_function_in_an_http_request.json
new file mode 100644
index 0000000000000..16f47eb0ba663
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_eval_php_function_in_an_http_request.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "8c77b4ed-4e98-438b-adb0-d645d4a4ea26",
+  "risk_score": 50,
+  "description": "Suricata eval PHP Function in an HTTP Request",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata eval PHP Function in an HTTP Request",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610088 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_ftp_traffic_on_unusual_port_internet_destination.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_ftp_traffic_on_unusual_port_internet_destination.json
new file mode 100644
index 0000000000000..40ada9bb87425
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_ftp_traffic_on_unusual_port_internet_destination.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b1adc850-0fe3-4dac-94d3-6f240071f83a",
+  "risk_score": 50,
+  "description": "Suricata FTP Traffic on Unusual Port, Internet Destination",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata FTP Traffic on Unusual Port, Internet Destination",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610005 and (event.module:suricata and event.kind:alert) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_http_traffic_on_unusual_port_internet_destination.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_http_traffic_on_unusual_port_internet_destination.json
new file mode 100644
index 0000000000000..8da00c75cedc3
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_http_traffic_on_unusual_port_internet_destination.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "43795909-913c-419d-8355-7f2880694bec",
+  "risk_score": 50,
+  "description": "Suricata HTTP Traffic On Unusual Port, Internet Destination",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata HTTP Traffic On Unusual Port, Internet Destination",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " suricata.eve.alert.signature_id:2610001 and (event.module:suricata and event.kind:alert) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_imap_traffic_on_unusual_port_internet_destination.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_imap_traffic_on_unusual_port_internet_destination.json
new file mode 100644
index 0000000000000..4f7bfc2baaf37
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_imap_traffic_on_unusual_port_internet_destination.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "738ee70b-7d0f-438f-98ac-a393df58c58f",
+  "risk_score": 50,
+  "description": "Suricata IMAP Traffic on Unusual Port, internet Destination",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata IMAP Traffic on Unusual Port, internet Destination",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610009 and (event.module:suricata and event.kind:alert) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_lazagne_artifact_in_an_http_post.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_lazagne_artifact_in_an_http_post.json
new file mode 100644
index 0000000000000..ed46470838069
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_lazagne_artifact_in_an_http_post.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "c6e6f16f-66de-43d5-8ab7-599af536dedf",
+  "risk_score": 50,
+  "description": "Suricata LaZagne Artifact in an HTTP POST",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata LaZagne Artifact in an HTTP POST",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610149 or 2610150)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_mimikatz_artifacts_in_an_http_post.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_mimikatz_artifacts_in_an_http_post.json
new file mode 100644
index 0000000000000..b3a8079c16f11
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_mimikatz_artifacts_in_an_http_post.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "1b62e8af-c10d-4708-9a74-118cb1c9ed8a",
+  "risk_score": 50,
+  "description": "Suricata Mimikatz Artifacts in an HTTP POST",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Mimikatz Artifacts in an HTTP POST",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610155 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_mimikatz_string_detected_in_http_response.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_mimikatz_string_detected_in_http_response.json
new file mode 100644
index 0000000000000..c72f6b348e259
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_mimikatz_string_detected_in_http_response.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "2b365d3a-11a3-4bec-9698-b36c908f46ff",
+  "risk_score": 50,
+  "description": "Suricata Mimikatz String Detected in HTTP Response",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Mimikatz String Detected in HTTP Response",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610144 or 2610145 or 2610146 or 2610147 or 2610148)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nondns_traffic_on_tcp_port_53.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nondns_traffic_on_tcp_port_53.json
new file mode 100644
index 0000000000000..66eff77cf43bc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nondns_traffic_on_tcp_port_53.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "67c7d28e-8be4-49ae-9c89-5c328ea245dc",
+  "risk_score": 50,
+  "description": "Suricata non-DNS Traffic on TCP Port 53",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata non-DNS Traffic on TCP Port 53",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610014 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nondns_traffic_on_udp_port_53.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nondns_traffic_on_udp_port_53.json
new file mode 100644
index 0000000000000..e09a4357ba5d4
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nondns_traffic_on_udp_port_53.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ba6dea7f-ba98-4a86-b570-d05d85472e79",
+  "risk_score": 50,
+  "description": "Suricata non-DNS Traffic on UDP Port 53",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata non-DNS Traffic on UDP Port 53",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610016 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonftp_traffic_on_port_21.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonftp_traffic_on_port_21.json
new file mode 100644
index 0000000000000..405be74eb8340
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonftp_traffic_on_port_21.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ee2b07ec-94dd-48b2-b46b-7bef47cc43fc",
+  "risk_score": 50,
+  "description": "Suricata non-FTP Traffic on Port 21",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata non-FTP Traffic on Port 21",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610006 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonhttp_traffic_on_tcp_port_80.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonhttp_traffic_on_tcp_port_80.json
new file mode 100644
index 0000000000000..cd93ceec2374f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonhttp_traffic_on_tcp_port_80.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "70f9bd9f-accc-4da8-8674-38992096ddba",
+  "risk_score": 50,
+  "description": "Suricata non-HTTP Traffic on TCP Port 80",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata non-HTTP Traffic on TCP Port 80",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610002 and (event.module:suricata and event.kind:alert) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonimap_traffic_on_port_1443_imap.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonimap_traffic_on_port_1443_imap.json
new file mode 100644
index 0000000000000..39e5fd188aa4a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonimap_traffic_on_port_1443_imap.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "241b6a1d-4f73-4b68-bd98-22e909681930",
+  "risk_score": 50,
+  "description": "Suricata non-IMAP Traffic on Port 1443 (IMAP)",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata non-IMAP Traffic on Port 1443 (IMAP)",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610010 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonsmb_traffic_on_tcp_port_139_smb.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonsmb_traffic_on_tcp_port_139_smb.json
new file mode 100644
index 0000000000000..0fd1c59a3bc62
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonsmb_traffic_on_tcp_port_139_smb.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "c259ab53-4b1a-42f6-b204-fe057c521515",
+  "risk_score": 50,
+  "description": "Suricata non-SMB Traffic on TCP Port 139 (SMB)",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata non-SMB Traffic on TCP Port 139 (SMB)",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610011 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonssh_traffic_on_port_22.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonssh_traffic_on_port_22.json
new file mode 100644
index 0000000000000..3d1cc2e61b1a9
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nonssh_traffic_on_port_22.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "256e9e8b-8366-4f23-8cbe-c9eb5ba25633",
+  "risk_score": 50,
+  "description": "Suricata non-SSH Traffic on Port 22",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata non-SSH Traffic on Port 22",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610008 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nontls_on_tls_port.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nontls_on_tls_port.json
new file mode 100644
index 0000000000000..1fd905e6e4647
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_nontls_on_tls_port.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b060c87f-af49-40eb-acee-561a1f1331aa",
+  "risk_score": 50,
+  "description": "Suricata non-TLS on TLS Port",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata non-TLS on TLS Port",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610004 and (event.module:suricata and event.kind:alert) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_possible_cobalt_strike_malleable_c2_null_response.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_possible_cobalt_strike_malleable_c2_null_response.json
new file mode 100644
index 0000000000000..a6534d72a9655
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_possible_cobalt_strike_malleable_c2_null_response.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "6099a760-7293-4e26-8aa8-b984abb32ac6",
+  "risk_score": 50,
+  "description": "Suricata Possible Cobalt Strike Malleable C2 Null Response",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Possible Cobalt Strike Malleable C2 Null Response",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610202 or 2610203)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_possible_sql_injection_sql_commands_in_http_transactions.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_possible_sql_injection_sql_commands_in_http_transactions.json
new file mode 100644
index 0000000000000..0a8b4a9861f9b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_possible_sql_injection_sql_commands_in_http_transactions.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "cdfbcd5e-1d8e-47e6-b3f2-b09bce780640",
+  "risk_score": 50,
+  "description": "Suricata Possible SQL Injection - SQL Commands in HTTP Transactions",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Possible SQL Injection - SQL Commands in HTTP Transactions",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610117 or 2610118 or 2610118 or 2610119 or 2610121 or 2610122 or 2610123)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_rpc_traffic_on_http_ports.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_rpc_traffic_on_http_ports.json
new file mode 100644
index 0000000000000..4431f46125ef3
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_rpc_traffic_on_http_ports.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "87e77fb6-b555-43be-adc5-f57c6aaf7cd0",
+  "risk_score": 50,
+  "description": "Suricata RPC Traffic on HTTP Ports",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata RPC Traffic on HTTP Ports",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610012 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_serialized_php_detected.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_serialized_php_detected.json
new file mode 100644
index 0000000000000..a176be109f8ff
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_serialized_php_detected.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "3baa5b65-d11e-40fb-a9b4-6b2a6a062d48",
+  "risk_score": 50,
+  "description": "Suricata Serialized PHP Detected",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Serialized PHP Detected",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610091 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_shell_exec_php_function_in_an_http_post.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_shell_exec_php_function_in_an_http_post.json
new file mode 100644
index 0000000000000..c1fdb1c083789
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_shell_exec_php_function_in_an_http_post.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "082fca48-4707-485a-aedb-340ee77e0687",
+  "risk_score": 50,
+  "description": "Suricata shell_exec PHP Function in an HTTP POST",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata shell_exec PHP Function in an HTTP POST",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610087 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_ssh_traffic_not_on_port_22_internet_destination.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_ssh_traffic_not_on_port_22_internet_destination.json
new file mode 100644
index 0000000000000..ee0510d1e37ac
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_ssh_traffic_not_on_port_22_internet_destination.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "82265eef-1212-4c4f-af04-f977a3060592",
+  "risk_score": 50,
+  "description": "Suricata SSH Traffic Not on Port 22, Internet Destination",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata SSH Traffic Not on Port 22, Internet Destination",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610007 and (event.module:suricata and event.kind:alert) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_tls_traffic_on_unusual_port_internet_destination.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_tls_traffic_on_unusual_port_internet_destination.json
new file mode 100644
index 0000000000000..3d0d5175168f1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_tls_traffic_on_unusual_port_internet_destination.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "6c1db8ba-db4b-4513-a0e3-b3c857ba8b05",
+  "risk_score": 50,
+  "description": "Suricata TLS Traffic on Unusual Port, Internet Destination",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata TLS Traffic on Unusual Port, Internet Destination",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610003 and (event.module:suricata and event.kind:alert) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_windows_executable_served_by_jpeg_web_content.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_windows_executable_served_by_jpeg_web_content.json
new file mode 100644
index 0000000000000..7ab997b11fb26
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suricata_windows_executable_served_by_jpeg_web_content.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f7f038f4-b97a-4d0c-b3b6-d5fa1ad15951",
+  "risk_score": 50,
+  "description": "Suricata Windows Executable Served by JPEG Web Content",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suricata Windows Executable Served by JPEG Web Content",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "suricata.eve.alert.signature_id:2610084 and (event.module:suricata and event.kind:alert)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suspicious_process_started_by_a_script.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suspicious_process_started_by_a_script.json
new file mode 100644
index 0000000000000..43e246cf7c26f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/suspicious_process_started_by_a_script.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "e49b532b-3e52-4f3d-90f6-05a86982d347",
+  "risk_score": 50,
+  "description": "Suspicious process started by a script",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Suspicious process started by a script",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(process.parent.name:cmd.exe or process.parent.name:cscript.exe or process.parent.name:mshta.exe or process.parent.name:powershell.exe or process.parent.name:rundll32.exe or process.parent.name:wscript.exe or process.parent.name:wmiprvse.exe) and (process.name:bitsadmin.exe or process.name:certutil.exe or mshta.exe or process.name:nslookup.exe or process.name:schtasks.exe)",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_background_intelligent_transfer_service_bits_connecting_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_background_intelligent_transfer_service_bits_connecting_to_the_internet.json
new file mode 100644
index 0000000000000..5842b67076edd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_background_intelligent_transfer_service_bits_connecting_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "7edadee3-98ae-472c-b1c4-8c0a2c4877cc",
+  "risk_score": 50,
+  "description": "Windows: Background Intelligent Transfer Service (BITS) Connecting to the Internet",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows: Background Intelligent Transfer Service (BITS) Connecting to the Internet",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:bitsadmin.exe and event.action:\"Network connection detected (rule: NetworkConnect)\" and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_burp_ce_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_burp_ce_activity.json
new file mode 100644
index 0000000000000..4d87d53eb246d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_burp_ce_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "0f09845b-2ec8-4770-8155-7df3d4e402cc",
+  "risk_score": 50,
+  "description": "Windows Burp CE activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Burp CE activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:BurpSuiteCommunity.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_certutil_connecting_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_certutil_connecting_to_the_internet.json
new file mode 100644
index 0000000000000..2e0c9e2b71ae6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_certutil_connecting_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "1a2cf526-6784-4c51-a2b9-f0adcc05d85c",
+  "risk_score": 50,
+  "description": "Windows: Certutil Connecting to the Internet",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows: Certutil Connecting to the Internet",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:certutil.exe and event.action:\"Network connection detected (rule: NetworkConnect)\" and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_command_prompt_connecting_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_command_prompt_connecting_to_the_internet.json
new file mode 100644
index 0000000000000..3a0e9a2f35566
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_command_prompt_connecting_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "89f9a4b0-9f8f-4ee0-8823-c4751a6d6696",
+  "risk_score": 50,
+  "description": "Windows: Command Prompt Connecting to the Internet",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows: Command Prompt Connecting to the Internet",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:cmd.exe and event.action:\"Network connection detected (rule: NetworkConnect)\" and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_credential_dumping_commands.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_credential_dumping_commands.json
new file mode 100644
index 0000000000000..2273249c49b61
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_credential_dumping_commands.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "66885745-ea38-432c-9edb-599b943948d4",
+  "risk_score": 50,
+  "description": "Windows Credential Dumping Commands",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Credential Dumping Commands",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code: 1 and process.args:*Invoke-Mimikatz-DumpCreds* or process.args:*gsecdump* or process.args:*wce* or (process.args:*procdump* and process.args:*lsass*) or (process.args:*ntdsutil* and process.args:*ntds*ifm*create*)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_credential_dumping_via_imageload.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_credential_dumping_via_imageload.json
new file mode 100644
index 0000000000000..5c9c72efb7aa7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_credential_dumping_via_imageload.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f872647c-d070-4b1c-afcc-055f081d9205",
+  "risk_score": 50,
+  "description": "Windows Credential Dumping via ImageLoad",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Credential Dumping via ImageLoad",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:7 and not process.name:Sysmon.exe and not process.name:Sysmon64.exe and not process.name:svchost.exe and not process.name:logonui.exe and (file.path:*samlib.dll* or file.path:*WinSCard.dll* or file.path:*cryptdll.dll* or file.path:*hid.dll* or file.path:*vaultcli.dll*)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_credential_dumping_via_registry_save.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_credential_dumping_via_registry_save.json
new file mode 100644
index 0000000000000..38e23c5759162
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_credential_dumping_via_registry_save.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "9f6fb56f-4bbd-404e-b955-49dfba7c0e68",
+  "risk_score": 50,
+  "description": "Windows Credential Dumping via Registry Save",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Credential Dumping via Registry Save",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code: 1 and process.name:reg.exe and process.args:*save* and (process.args:*sam* or process.args:*system*)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_data_compression_using_powershell.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_data_compression_using_powershell.json
new file mode 100644
index 0000000000000..604c4148d3056
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_data_compression_using_powershell.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "bc913943-e1f9-4bf5-a593-caca7c2eb0c3",
+  "risk_score": 50,
+  "description": "Windows Data Compression Using Powershell",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Data Compression Using Powershell",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code: 1 and process.name:powershell.exe and (process.args:*Recurse* and process.args:*Compress-Archive*)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_decoding_using_certutil.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_decoding_using_certutil.json
new file mode 100644
index 0000000000000..7d6e6c7d53976
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_decoding_using_certutil.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d9642bf2-87d0-45c2-8781-2bd2017cdbb8",
+  "risk_score": 50,
+  "description": "Windows Defense Evasion - Decoding Using Certutil",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Defense Evasion - Decoding Using Certutil",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.name:attrib.exe and (process.args:*+h* or process.args:*+s*)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_or_persistence_via_hidden_files.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_or_persistence_via_hidden_files.json
new file mode 100644
index 0000000000000..f8f2b6a3fac2a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_or_persistence_via_hidden_files.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "340a0063-baba-447b-8396-26a5cc1eb684",
+  "risk_score": 50,
+  "description": "Windows Defense Evasion or Persistence via Hidden Files",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Defense Evasion or Persistence via Hidden Files",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.name:attrib.exe and (process.args:*+h* or process.args:*+s*)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_via_filter_manager.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_via_filter_manager.json
new file mode 100644
index 0000000000000..362ed715a8ebf
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_via_filter_manager.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "06dceabf-adca-48af-ac79-ffdf4c3b1e9a",
+  "risk_score": 50,
+  "description": "Windows Defense evasion via Filter Manager",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Defense evasion via Filter Manager",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.name:fltmc.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_via_windows_event_log_tools.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_via_windows_event_log_tools.json
new file mode 100644
index 0000000000000..e58399c8c39d2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_defense_evasion_via_windows_event_log_tools.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "07979a67-ab4d-460f-9ff3-bf1352de6762",
+  "risk_score": 50,
+  "description": "Windows Defense Evasion via Windows Event Log Tools",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Defense Evasion via Windows Event Log Tools",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.name:wevtutil.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_compiled_html_file.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_compiled_html_file.json
new file mode 100644
index 0000000000000..dac45ae03c237
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_compiled_html_file.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "e3343ab9-4245-4715-b344-e11c56b0a47f",
+  "risk_score": 50,
+  "description": "Windows Execution via Compiled HTML File",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Execution via Compiled HTML File",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.name:hh.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_connection_manager.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_connection_manager.json
new file mode 100644
index 0000000000000..f97b1da2d5885
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_connection_manager.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f2728299-167a-489c-913c-2e0955ac3c40",
+  "risk_score": 50,
+  "description": "Windows Execution via Connection Manager",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Execution via Connection Manager",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.parent.name:pcalua.exe or (process.name:bash.exe or process.name:forfiles.exe or process.name:pcalua.exe)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_microsoft_html_application_hta.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_microsoft_html_application_hta.json
new file mode 100644
index 0000000000000..3a98dcc992e3d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_microsoft_html_application_hta.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b007cc82-c522-48d1-b7a7-53f63c50c494",
+  "risk_score": 50,
+  "description": "Windows Execution via Microsoft HTML Application (HTA)",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Execution via Microsoft HTML Application (HTA)",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and (process.parent.args:*mshta* or process.args:*mshta*)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_net_com_assemblies.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_net_com_assemblies.json
new file mode 100644
index 0000000000000..be40d7616290f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_net_com_assemblies.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "5c12412f-602c-4120-8c4f-69d723dbba04",
+  "risk_score": 50,
+  "description": "Windows Execution via .NET COM Assemblies",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Execution via .NET COM Assemblies",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and (process.name:regasm.exe or process.name:regsvcs.exe)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_regsvr32.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_regsvr32.json
new file mode 100644
index 0000000000000..c4351f70e385d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_regsvr32.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b7333d08-be4b-4cb4-b81e-924ae37b3143",
+  "risk_score": 50,
+  "description": "Windows Execution via Regsvr32",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Execution via Regsvr32",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code: 1 and scrobj.dll and (process.name:certutil.exe or process.name:regsvr32.exe or process.name:rundll32.exe)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_trusted_developer_utilities.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_trusted_developer_utilities.json
new file mode 100644
index 0000000000000..cf0701685af27
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_execution_via_trusted_developer_utilities.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "9d110cb3-5f4b-4c9a-b9f5-53f0a1707ae1",
+  "risk_score": 50,
+  "description": "Windows Execution via Trusted Developer Utilities",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Execution via Trusted Developer Utilities",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and (process.name:MSBuild.exe or process.name:msxsl.exe)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_html_help_executable_program_connecting_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_html_help_executable_program_connecting_to_the_internet.json
new file mode 100644
index 0000000000000..6fa1d4eae7461
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_html_help_executable_program_connecting_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b29ee2be-bf99-446c-ab1a-2dc0183394b8",
+  "risk_score": 50,
+  "description": "Windows: HTML Help executable Program Connecting to the Internet",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows: HTML Help executable Program Connecting to the Internet",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:hh.exe and event.action:\"Network connection detected (rule: NetworkConnect)\" and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_image_load_from_a_temp_directory.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_image_load_from_a_temp_directory.json
new file mode 100644
index 0000000000000..6e735cae12985
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_image_load_from_a_temp_directory.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "f23e4cc7-6825-4a28-b27a-e67437a9a806",
+  "risk_score": 50,
+  "description": "Windows image load from a temp directory",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows image load from a temp directory",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "file.path:Temp",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "alias": null,
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Image loaded (rule: ImageLoad)",
+        "params": {
+          "query": "Image loaded (rule: ImageLoad)"
+        },
+        "disabled": false,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Image loaded (rule: ImageLoad)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_indirect_command_execution.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_indirect_command_execution.json
new file mode 100644
index 0000000000000..bfcf40d403fbe
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_indirect_command_execution.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ff969842-c573-4e69-8e12-02fb303290f2",
+  "risk_score": 50,
+  "description": "Windows Indirect Command Execution",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Indirect Command Execution",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.parent.name:pcalua.exe or (process.name:bash.exe or process.name:forfiles.exe or process.name:pcalua.exe)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_iodine_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_iodine_activity.json
new file mode 100644
index 0000000000000..7fb35a0176b44
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_iodine_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "fcbbf0b2-99c5-4c7f-8411-dc9ee392e43f",
+  "risk_score": 50,
+  "description": "Windows Iodine activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Iodine activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:iodine.exe or process.name:iodined.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_management_instrumentation_wmi_execution.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_management_instrumentation_wmi_execution.json
new file mode 100644
index 0000000000000..b163dcc5c056e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_management_instrumentation_wmi_execution.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "cec5eb81-6e01-40e5-a1bf-bf175cce4eb4",
+  "risk_score": 50,
+  "description": "Windows Management Instrumentation (WMI) Execution",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Management Instrumentation (WMI) Execution",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and (process.parent.args:*wmiprvse.exe* or process.name:wmic.exe or process.args:*wmic* )",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_microsoft_html_application_hta_connecting_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_microsoft_html_application_hta_connecting_to_the_internet.json
new file mode 100644
index 0000000000000..647dc53a0d05f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_microsoft_html_application_hta_connecting_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b084514b-e8ba-4bc4-bc2b-50fe145a4215",
+  "risk_score": 50,
+  "description": "Windows: Microsoft HTML Application (HTA) Connecting to the Internet",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows: Microsoft HTML Application (HTA) Connecting to the Internet",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:mshta.exe and event.action:\"Network connection detected (rule: NetworkConnect)\" and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_mimikatz_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_mimikatz_activity.json
new file mode 100644
index 0000000000000..a6fa7f8942978
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_mimikatz_activity.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "5346463d-062f-419d-88ff-7a5e97875210",
+  "risk_score": 50,
+  "description": "Windows Mimikatz activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Mimikatz activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:mimikatz.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_misc_lolbin_connecting_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_misc_lolbin_connecting_to_the_internet.json
new file mode 100644
index 0000000000000..d2bf298557401
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_misc_lolbin_connecting_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "63e65ec3-43b1-45b0-8f2d-45b34291dc44",
+  "risk_score": 50,
+  "description": "Windows: Misc LOLBin Connecting to the Internet",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows: Misc LOLBin Connecting to the Internet",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(process.name:expand.exe or process.name:extrac.exe or process.name:ieexec.exe or process.name:makecab.exe) and event.action:\"Network connection detected (rule: NetworkConnect)\" and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_net_command_activity_by_the_system_account.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_net_command_activity_by_the_system_account.json
new file mode 100644
index 0000000000000..cc5e4cec1d7bd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_net_command_activity_by_the_system_account.json
@@ -0,0 +1,53 @@
+{
+  "rule_id": "c3f5dc81-a8b4-4144-95a7-d0a818d7355d",
+  "risk_score": 50,
+  "description": "Windows net command activity by the SYSTEM account",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows net command activity by the SYSTEM account",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "user.name:SYSTEM",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "type": "phrases",
+        "key": "process.name",
+        "value": "net.exe, net1.exe",
+        "params": [
+          "net.exe",
+          "net1.exe"
+        ],
+        "alias": null,
+        "negate": false,
+        "disabled": false,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "bool": {
+          "should": [
+            {
+              "match_phrase": {
+                "process.name": "net.exe"
+              }
+            },
+            {
+              "match_phrase": {
+                "process.name": "net1.exe"
+              }
+            }
+          ],
+          "minimum_should_match": 1
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_net_user_command_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_net_user_command_activity.json
new file mode 100644
index 0000000000000..182f6a0c0928c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_net_user_command_activity.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "b039a69d-7fba-4c84-8029-57ac12548a15",
+  "risk_score": 50,
+  "description": "Windows net user command activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows net user command activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:net.exe and process.args:user",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_netcat_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_netcat_activity.json
new file mode 100644
index 0000000000000..fef425b72281f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_netcat_activity.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "e2437364-0c89-4e65-a34b-782cfbb7690b",
+  "risk_score": 50,
+  "description": "Windows Netcat activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Netcat activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:ncat.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_netcat_network_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_netcat_network_activity.json
new file mode 100644
index 0000000000000..91b094785a9bb
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_netcat_network_activity.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "ebdc4b6f-7fdb-4c21-bbd6-59e1ed11024a",
+  "risk_score": 50,
+  "description": "Windows Netcat network activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Netcat network activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:ncat.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "connected-to",
+        "params": {
+          "query": "connected-to"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "connected-to",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_network_anomalous_windows_process_using_https_ports.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_network_anomalous_windows_process_using_https_ports.json
new file mode 100644
index 0000000000000..c59bc4dfa4135
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_network_anomalous_windows_process_using_https_ports.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b486fa9e-e6c7-44a1-b07d-7d5f07f21ce1",
+  "risk_score": 50,
+  "description": "Windows Network - Anomalous Windows Process Using HTTP/S Ports",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Network - Anomalous Windows Process Using HTTP/S Ports",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(destination.port:443 or destination.port:80) and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16 and not process.name:chrome.exe and not process.name:explorer.exe and not process.name:filebeat.exe and not process.name:firefox.exe and not process.name:iexplore.exe and not process.name:jusched.exe and not process.name:MpCmdRun.exe and not process.name:MpSigStub.exe and not process.name:msfeedssync.exe and not process.name:packetbeat.exe and not process.name:powershell.exe and not process.name:procexp64.exe and not process.name:svchost.exe and not process.name:taskhostw.exe and not process.name:winlogbeat.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_nmap_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_nmap_activity.json
new file mode 100644
index 0000000000000..31409e087f8a5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_nmap_activity.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "5a4b2a98-31a6-4852-b224-d63aeb9e172d",
+  "risk_score": 50,
+  "description": "Windows nmap activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows nmap activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:nmap.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_nmap_scan_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_nmap_scan_activity.json
new file mode 100644
index 0000000000000..580cbe2abcb41
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_nmap_scan_activity.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "54413985-a3da-4f45-b238-75afb65a1bae",
+  "risk_score": 50,
+  "description": "Windows nmap scan activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows nmap scan activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:nmap.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "alias": null,
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Network connection detected (rule: NetworkConnect)",
+        "params": {
+          "query": "Network connection detected (rule: NetworkConnect)"
+        },
+        "disabled": false,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Network connection detected (rule: NetworkConnect)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_payload_obfuscation_via_certutil.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_payload_obfuscation_via_certutil.json
new file mode 100644
index 0000000000000..9c76c4273cafc
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_payload_obfuscation_via_certutil.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ce7c270c-c69b-47dd-8c21-60a35e92f372",
+  "risk_score": 50,
+  "description": "Windows Payload Obfuscation via Certutil",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Payload Obfuscation via Certutil",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.name:certutil.exe and (process.args:*encode* or process.args:*ToBase64String*)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_or_priv_escalation_via_hooking.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_or_priv_escalation_via_hooking.json
new file mode 100644
index 0000000000000..98268e9f4ad66
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_or_priv_escalation_via_hooking.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "015f070d-cf70-437c-99d1-472e31d36b03",
+  "risk_score": 50,
+  "description": "Windows Persistence or Priv Escalation via Hooking",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Persistence or Priv Escalation via Hooking",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.name:mavinject.exe and processs.args:*INJECTRUNNING*",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_application_shimming.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_application_shimming.json
new file mode 100644
index 0000000000000..4db53da43399b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_application_shimming.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "fd4a992d-6130-4802-9ff8-829b89ae801f",
+  "risk_score": 50,
+  "description": "Windows Persistence via Application Shimming",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Persistence via Application Shimming",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.name:sdbinst.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_bits_jobs.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_bits_jobs.json
new file mode 100644
index 0000000000000..e2560badb7be6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_bits_jobs.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "7904fb20-172c-43fb-83e4-bfe27e3c702c",
+  "risk_score": 50,
+  "description": "Windows Persistence via BITS Jobs",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Persistence via BITS Jobs",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and (process.name:bitsadmin.exe or process.args:*Start-BitsTransfer*)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_modification_of_existing_service.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_modification_of_existing_service.json
new file mode 100644
index 0000000000000..27300362fecf6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_modification_of_existing_service.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "3bb04809-84ab-4487-bd99-ccc58675bd40",
+  "risk_score": 50,
+  "description": "Windows Persistence via Modification of Existing Service",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Persistence via Modification of Existing Service",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.args:*sc*config*binpath* and (process.name:cmd.exe or process.name:powershell.exe or process.name:sc.exe)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_netshell_helper_dll.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_netshell_helper_dll.json
new file mode 100644
index 0000000000000..c0bd446f968c8
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_persistence_via_netshell_helper_dll.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d7c2561d-2758-46ad-b5a9-247efb9eea21",
+  "risk_score": 50,
+  "description": "Windows Persistence via Netshell Helper DLL",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Persistence via Netshell Helper DLL",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.name:netsh.exe and process.args:*helper*",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_powershell_connecting_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_powershell_connecting_to_the_internet.json
new file mode 100644
index 0000000000000..dc3fed37a8c53
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_powershell_connecting_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "a8cfa646-e4d8-48b5-884e-6204ba77fc8d",
+  "risk_score": 50,
+  "description": "Windows: Powershell Connecting to the Internet",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows: Powershell Connecting to the Internet",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:powershell.exe and event.action:\"Network connection detected (rule: NetworkConnect)\"  and not destination.ip:169.254.169.254/32 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_priv_escalation_via_accessibility_features.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_priv_escalation_via_accessibility_features.json
new file mode 100644
index 0000000000000..afeb03150dfcf
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_priv_escalation_via_accessibility_features.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "7405ddf1-6c8e-41ce-818f-48bea6bcaed8",
+  "risk_score": 50,
+  "description": "Windows Priv Escalation via Accessibility Features",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Priv Escalation via Accessibility Features",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.parent.name:winlogon.exe and (process.name:atbroker.exe or process.name:displayswitch.exe or process.name:magnify.exe or process.name:narrator.exe or process.name:osk.exe or process.name:sethc.exe or process.name:utilman.exe)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_process_discovery_via_tasklist_command.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_process_discovery_via_tasklist_command.json
new file mode 100644
index 0000000000000..488943dea2949
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_process_discovery_via_tasklist_command.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "cc16f774-59f9-462d-8b98-d27ccd4519ec",
+  "risk_score": 50,
+  "description": "Windows Process Discovery via Tasklist Command",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Process Discovery via Tasklist Command",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and process.name:tasklist.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_process_started_by_the_java_runtime.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_process_started_by_the_java_runtime.json
new file mode 100644
index 0000000000000..ea246b0264370
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_process_started_by_the_java_runtime.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "159168a1-b1d0-4e5c-ad72-c1e9ae2edec2",
+  "risk_score": 50,
+  "description": "Windows process started by the Java runtime",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows process started by the Java runtime",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.parent.name:javaw.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_register_server_program_connecting_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_register_server_program_connecting_to_the_internet.json
new file mode 100644
index 0000000000000..cce8effd5d536
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_register_server_program_connecting_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "fb02b8d3-71ee-4af1-bacd-215d23f17efa",
+  "risk_score": 50,
+  "description": "Windows: Register Server Program Connecting to the Internet",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows: Register Server Program Connecting to the Internet",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(process.name:regsvr32.exe or process.name:regsvr64.exe) and event.action:\"Network connection detected (rule: NetworkConnect)\" and not destination.ip:169.254.169.254/32 and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_registry_query_local.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_registry_query_local.json
new file mode 100644
index 0000000000000..af9935275267b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_registry_query_local.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b9074c74-6d23-4b07-927e-cc18b318a088",
+  "risk_score": 50,
+  "description": "Windows Registry Query, Local",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Registry Query, Local",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code: 1 and process.name:reg.exe and process.args:*query* and process.args:*reg*",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_registry_query_network.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_registry_query_network.json
new file mode 100644
index 0000000000000..4926aabcb8f9d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_registry_query_network.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "f5412e37-981e-4d37-a1b2-eddaf797445a",
+  "risk_score": 50,
+  "description": "Windows Registry Query, Network",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Registry Query, Network",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code: 1 and process.name:reg.exe and process.args:*query* and process.args:*reg*",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_remote_management_execution.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_remote_management_execution.json
new file mode 100644
index 0000000000000..d0765ee531bb3
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_remote_management_execution.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ced66221-3e07-40ee-8588-5f107e7d50d8",
+  "risk_score": 50,
+  "description": "Windows Remote Management Execution",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Remote Management Execution",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(process.name:wsmprovhost.exe or process.name:winrm.cmd) and (process.args:*Enable-PSRemoting -Force* or process.args:*Invoke-Command -computer_name* or process.args:*wmic*node*process call create*)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_scheduled_task_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_scheduled_task_activity.json
new file mode 100644
index 0000000000000..e84d6912793bd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_scheduled_task_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "a1abd54d-3021-4f21-b2d1-0c6bc5c4051f",
+  "risk_score": 50,
+  "description": "Windows Scheduled Task Activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Scheduled Task Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and (process.name:schtasks.exe or process.name:taskeng.exe) or (event.code:1 and process.name:svchost.exe and not process.parent.executable: \"C:\\Windows\\System32\\services.exe\" )",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_script_interpreter_connecting_to_the_internet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_script_interpreter_connecting_to_the_internet.json
new file mode 100644
index 0000000000000..373d5aa86e6a6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_script_interpreter_connecting_to_the_internet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "2cc4597c-b0c9-4481-b1a6-e6c05cfc9f02",
+  "risk_score": 50,
+  "description": "Windows: Script Interpreter Connecting to the Internet",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows: Script Interpreter Connecting to the Internet",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "(process.name:cscript.exe or process.name:wscript.exe) and event.action:\"Network connection detected (rule: NetworkConnect)\" and not destination.ip:10.0.0.0/8 and not destination.ip:172.16.0.0/12 and not destination.ip:192.168.0.0/16",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_signed_binary_proxy_execution.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_signed_binary_proxy_execution.json
new file mode 100644
index 0000000000000..a05d37126be3e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_signed_binary_proxy_execution.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "7edb573f-1f9b-4161-8c19-c7c383bb17f2",
+  "risk_score": 50,
+  "description": "Windows Signed Binary Proxy Execution",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Signed Binary Proxy Execution",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.code:1 and http and (process.name:certutil.exe or process.name:msiexec.exe)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_signed_binary_proxy_execution_download.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_signed_binary_proxy_execution_download.json
new file mode 100644
index 0000000000000..931a1f170e5bd
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_signed_binary_proxy_execution_download.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "68ecc190-cce2-4021-b976-c7c846ac0a00",
+  "risk_score": 50,
+  "description": "Windows Signed Binary Proxy Execution Download",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Signed Binary Proxy Execution Download",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": " event.code:3 and http and (process.name:certutil.exe or process.name:replace.exe)",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_whoami_command_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_whoami_command_activity.json
new file mode 100644
index 0000000000000..e4acdcee249bf
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_whoami_command_activity.json
@@ -0,0 +1,43 @@
+{
+  "rule_id": "ef862985-3f13-4262-a686-5f357bbb9bc2",
+  "risk_score": 50,
+  "description": "Windows whoami command activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows whoami command activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:whoami.exe",
+  "language": "kuery",
+  "filters": [
+    {
+      "meta": {
+        "negate": false,
+        "type": "phrase",
+        "key": "event.action",
+        "value": "Process Create (rule: ProcessCreate)",
+        "params": {
+          "query": "Process Create (rule: ProcessCreate)"
+        },
+        "disabled": false,
+        "alias": null,
+        "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index"
+      },
+      "query": {
+        "match": {
+          "event.action": {
+            "query": "Process Create (rule: ProcessCreate)",
+            "type": "phrase"
+          }
+        }
+      },
+      "$state": {
+        "store": "appState"
+      }
+    }
+  ],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_wireshark_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_wireshark_activity.json
new file mode 100644
index 0000000000000..75dfa58e33318
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windows_wireshark_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "9af965ed-d501-4541-97f6-5f8d2a39737b",
+  "risk_score": 50,
+  "description": "Windows Wireshark activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Windows Wireshark activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:wireshark.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windump_activity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windump_activity.json
new file mode 100644
index 0000000000000..db42e194fcf9f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/windump_activity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "61c56cf4-0c08-4ad5-83ea-d2fe6ac62fa8",
+  "risk_score": 50,
+  "description": "WinDump activity",
+  "immutable": true,
+  "interval": "5m",
+  "name": "WinDump activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "process.name:WinDump.exe",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_capturelosstoo_much_loss.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_capturelosstoo_much_loss.json
new file mode 100644
index 0000000000000..32d722ce42bab
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_capturelosstoo_much_loss.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "c115a407-799b-45d6-962e-a639bb764c06",
+  "risk_score": 50,
+  "description": "Detected Zeek capture loss exceeds the percentage threshold",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice CaptureLoss::Too_Much_Loss",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"CaptureLoss::Too_Much_Loss\" or rule.name: \"CaptureLoss::Too_Much_Loss\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_conncontent_gap.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_conncontent_gap.json
new file mode 100644
index 0000000000000..a707c4647b1ea
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_conncontent_gap.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "22d12b64-33f4-40ce-ad57-49dd870bc8e5",
+  "risk_score": 50,
+  "description": "Data has sequence hole; perhaps due to filtering.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Conn::Content_Gap",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Conn::Content_Gap\" or rule.name: \"Conn::Content_Gap\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_connretransmission_inconsistency.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_connretransmission_inconsistency.json
new file mode 100644
index 0000000000000..06f413ce93787
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_connretransmission_inconsistency.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "53719624-55f0-4541-8370-f27f6766fb9e",
+  "risk_score": 50,
+  "description": "Possible evasion; usually just chud.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Conn::Retransmission_Inconsistency",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Conn::Retransmission_Inconsistency\" or rule.name: \"Conn::Retransmission_Inconsistency\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_dnsexternal_name.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_dnsexternal_name.json
new file mode 100644
index 0000000000000..a664b1314fb36
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_dnsexternal_name.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "39c40c5a-110c-45b1-876f-969212e8814b",
+  "risk_score": 50,
+  "description": "Raised when a non-local name is found to be pointing at a local host.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice DNS::External_Name",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"DNS::External_Name\" or rule.name: \"DNS::External_Name\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_ftpbruteforcing.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_ftpbruteforcing.json
new file mode 100644
index 0000000000000..73c78ee4354e2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_ftpbruteforcing.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "7e069475-817e-4e89-9245-1dfaa3083b11",
+  "risk_score": 50,
+  "description": "Indicates a host bruteforcing FTP logins by watching for too many rejected usernames or failed passwords.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice FTP::Bruteforcing",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"FTP::Bruteforcing\" or rule.name: \"FTP::Bruteforcing\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_ftpsite_exec_success.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_ftpsite_exec_success.json
new file mode 100644
index 0000000000000..69e2087c8800e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_ftpsite_exec_success.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "4b9cb3e9-e26a-4bd2-bd1f-8d451b49838f",
+  "risk_score": 50,
+  "description": "Indicates that a successful response to a “SITE EXEC” command/arg pair was seen.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice FTP::Site_Exec_Success",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"FTP::Site_Exec_Success\" or rule.name: \"FTP::Site_Exec_Success\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_attack.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_attack.json
new file mode 100644
index 0000000000000..b14eabc3352b0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_attack.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "68a33102-3680-4581-a48a-210b23925905",
+  "risk_score": 50,
+  "description": "Indicates that a host performed a heartbleed attack or scan.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Heartbleed::SSL_Heartbeat_Attack",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Heartbleed::SSL_Heartbeat_Attack\" or rule.name: \"Heartbleed::SSL_Heartbeat_Attack\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_attack_success.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_attack_success.json
new file mode 100644
index 0000000000000..160f2728cdd50
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_attack_success.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "241a61ae-b385-4f36-96c4-b2fb5446cc43",
+  "risk_score": 50,
+  "description": "Indicates that a host performing a heartbleed attack was probably successful.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Heartbleed::SSL_Heartbeat_Attack_Success",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Heartbleed::SSL_Heartbeat_Attack_Success\" or rule.name: \"Heartbleed::SSL_Heartbeat_Attack_Success\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_many_requests.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_many_requests.json
new file mode 100644
index 0000000000000..cfee395989376
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_many_requests.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "59d6a32c-753e-4c19-bb77-1befdc6e0e6a",
+  "risk_score": 50,
+  "description": "Indicates we saw many heartbeat requests without a reply. Might be an attack.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Heartbleed::SSL_Heartbeat_Many_Requests",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Heartbleed::SSL_Heartbeat_Many_Requests\" or rule.name: \"Heartbleed::SSL_Heartbeat_Many_Requests\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_odd_length.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_odd_length.json
new file mode 100644
index 0000000000000..a6456e63a3ec0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_heartbleedssl_heartbeat_odd_length.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "0c6e7be4-6cab-4ee1-ad51-7c1ffd0e9002",
+  "risk_score": 50,
+  "description": "Indicates we saw heartbeat requests with odd length. Probably an attack or scan.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Heartbleed::SSL_Heartbeat_Odd_Length",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Heartbleed::SSL_Heartbeat_Odd_Length\" or rule.name: \"Heartbleed::SSL_Heartbeat_Odd_Length\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_httpsql_injection_attacker.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_httpsql_injection_attacker.json
new file mode 100644
index 0000000000000..517a03834d57e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_httpsql_injection_attacker.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "4ca9ef93-7e7e-40a4-8d71-9130204d86e6",
+  "risk_score": 50,
+  "description": "Indicates that a host performing SQL injection attacks was detected.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice HTTP::SQL_Injection_Attacker",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"HTTP::SQL_Injection_Attacker\" or rule.name: \"HTTP::SQL_Injection_Attacker\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_httpsql_injection_victim.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_httpsql_injection_victim.json
new file mode 100644
index 0000000000000..b00e49c89e402
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_httpsql_injection_victim.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "dda43d7f-69bc-487f-b05c-2b518e9db622",
+  "risk_score": 50,
+  "description": "Indicates that a host was seen to have SQL injection attacks against it. This is tracked by IP address as opposed to hostname.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice HTTP::SQL_Injection_Victim",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"HTTP::SQL_Injection_Victim\" or rule.name: \"HTTP::SQL_Injection_Victim\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_intelnotice.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_intelnotice.json
new file mode 100644
index 0000000000000..27cfe2036744e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_intelnotice.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "122e153a-78f3-4e7e-a5b5-cfe0b917f109",
+  "risk_score": 50,
+  "description": "This notice is generated when an intelligence indicator is denoted to be notice-worthy.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Intel::Notice",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Intel::Notice\" or rule.name: \"Intel::Notice\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_noticetally.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_noticetally.json
new file mode 100644
index 0000000000000..16e22585d6e13
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_noticetally.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "7581fd81-25e8-489e-bcf3-69db068b7a6c",
+  "risk_score": 50,
+  "description": "Zeek notice reporting a count of how often a notice occurred.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Notice::Tally",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Notice::Tally\" or rule.name: \"Notice::Tally\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfiltercannot_bpf_shunt_conn.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfiltercannot_bpf_shunt_conn.json
new file mode 100644
index 0000000000000..3e8704dee917a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfiltercannot_bpf_shunt_conn.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "0031d83e-1fb4-4dd6-b938-97ae7044b051",
+  "risk_score": 50,
+  "description": "Limitations in BPF make shunting some connections with BPF impossible. This notice encompasses those various cases.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice PacketFilter::Cannot_BPF_Shunt_Conn",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"PacketFilter::Cannot_BPF_Shunt_Conn\" or rule.name: \"PacketFilter::Cannot_BPF_Shunt_Conn\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfiltercompile_failure.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfiltercompile_failure.json
new file mode 100644
index 0000000000000..63567a6ebbd90
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfiltercompile_failure.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "335b2ddc-f806-46e8-8ffa-114d613aac92",
+  "risk_score": 50,
+  "description": "This notice is generated if a packet filter cannot be compiled.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice PacketFilter::Compile_Failure",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"PacketFilter::Compile_Failure\" or rule.name: \"PacketFilter::Compile_Failure\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfilterdropped_packets.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfilterdropped_packets.json
new file mode 100644
index 0000000000000..78b664f573b6b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfilterdropped_packets.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "4f212278-329b-4088-ae59-9091003dff22",
+  "risk_score": 50,
+  "description": "Indicates packets were dropped by the packet filter.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice PacketFilter::Dropped_Packets",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"PacketFilter::Dropped_Packets\" or rule.name: \"PacketFilter::Dropped_Packets\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfilterinstall_failure.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfilterinstall_failure.json
new file mode 100644
index 0000000000000..7fec89f251e80
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfilterinstall_failure.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "235988ec-d037-4f5f-a211-74106512b36d",
+  "risk_score": 50,
+  "description": "Generated if a packet filter fails to install.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice PacketFilter::Install_Failure",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"PacketFilter::Install_Failure\" or rule.name: \"PacketFilter::Install_Failure\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfilterno_more_conn_shunts_available.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfilterno_more_conn_shunts_available.json
new file mode 100644
index 0000000000000..176c4373e8e96
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfilterno_more_conn_shunts_available.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "de4016de-3374-41a0-a678-21d36c70af9a",
+  "risk_score": 50,
+  "description": "Indicative that PacketFilter::max_bpf_shunts connections are already being shunted with BPF filters and no more are allowed.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice PacketFilter::No_More_Conn_Shunts_Available",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"PacketFilter::No_More_Conn_Shunts_Available\" or rule.name: \"PacketFilter::No_More_Conn_Shunts_Available\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfiltertoo_long_to_compile_filter.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfiltertoo_long_to_compile_filter.json
new file mode 100644
index 0000000000000..6077e494779e3
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_packetfiltertoo_long_to_compile_filter.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "71e93c42-7990-4233-a8a5-2631193df7db",
+  "risk_score": 50,
+  "description": "Generated when a notice takes too long to compile.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice PacketFilter::Too_Long_To_Compile_Filter",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"PacketFilter::Too_Long_To_Compile_Filter\" or rule.name: \"PacketFilter::Too_Long_To_Compile_Filter\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_protocoldetectorprotocol_found.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_protocoldetectorprotocol_found.json
new file mode 100644
index 0000000000000..2375fce0cf2b1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_protocoldetectorprotocol_found.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "777586b6-4757-489e-a6e8-676b7df70b39",
+  "risk_score": 50,
+  "description": "Indicates a protocol was detected on a non-standard port.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice ProtocolDetector::Protocol_Found",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"ProtocolDetector::Protocol_Found\" or rule.name: \"ProtocolDetector::Protocol_Found\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_protocoldetectorserver_found.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_protocoldetectorserver_found.json
new file mode 100644
index 0000000000000..6fd75bd759121
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_protocoldetectorserver_found.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "7d7f7635-6900-4f63-b14b-477a909ea90a",
+  "risk_score": 50,
+  "description": "Indicates a server was detected on a non-standard port for the protocol.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice ProtocolDetector::Server_Found",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"ProtocolDetector::Server_Found\" or rule.name: \"ProtocolDetector::Server_Found\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_scanaddress_scan.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_scanaddress_scan.json
new file mode 100644
index 0000000000000..fe0508f08ab1d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_scanaddress_scan.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "9d320fca-4ec1-4511-bdbc-7edf9673c07d",
+  "risk_score": 50,
+  "description": "Address scans detect that a host appears to be scanning some number of destinations on a single port.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Scan::Address_Scan",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Scan::Address_Scan\" or rule.name: \"Scan::Address_Scan\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_scanport_scan.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_scanport_scan.json
new file mode 100644
index 0000000000000..007e5fd94ae5f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_scanport_scan.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d09fbf7a-47a7-4130-8dd7-b386cca81a42",
+  "risk_score": 50,
+  "description": "Port scans detect that an attacking host appears to be scanning a single victim host on several ports.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Scan::Port_Scan",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Scan::Port_Scan\" or rule.name: \"Scan::Port_Scan\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturescount_signature.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturescount_signature.json
new file mode 100644
index 0000000000000..f5b708dce484f
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturescount_signature.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "a704589c-8ba9-4a3c-8e39-ab9360cade17",
+  "risk_score": 50,
+  "description": "The same signature has triggered multiple times for a host.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Signatures::Count_Signature",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Signatures::Count_Signature\" or rule.name: \"Signatures::Count_Signature\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturesmultiple_sig_responders.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturesmultiple_sig_responders.json
new file mode 100644
index 0000000000000..8e8b9ae8793ae
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturesmultiple_sig_responders.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "4f313ae8-cbc6-4082-9599-526f8ccb7303",
+  "risk_score": 50,
+  "description": "Host has triggered the same signature on multiple hosts.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Signatures::Multiple_Sig_Responders",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Signatures::Multiple_Sig_Responders\" or rule.name: \"Signatures::Multiple_Sig_Responders\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturesmultiple_signatures.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturesmultiple_signatures.json
new file mode 100644
index 0000000000000..0d24f030472c6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturesmultiple_signatures.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ab90d81c-79e1-4f62-a61e-484c4bedb2b0",
+  "risk_score": 50,
+  "description": "Host has triggered many signatures on the same host.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Signatures::Multiple_Signatures",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Signatures::Multiple_Signatures\" or rule.name: \"Signatures::Multiple_Signatures\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturessensitive_signature.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturessensitive_signature.json
new file mode 100644
index 0000000000000..545c653690493
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturessensitive_signature.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ac394dec-67e8-417f-bb06-ae0bd75556b0",
+  "risk_score": 50,
+  "description": "Generic notice type for notice-worthy signature matches.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Signatures::Sensitive_Signature",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Signatures::Sensitive_Signature\" or rule.name: \"Signatures::Sensitive_Signature\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturessignature_summary.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturessignature_summary.json
new file mode 100644
index 0000000000000..76fb44b6bd24a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_signaturessignature_summary.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d17fe857-eb67-4843-ab63-bf4852e49396",
+  "risk_score": 50,
+  "description": "Summarize the number of times a host triggered a signature.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Signatures::Signature_Summary",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Signatures::Signature_Summary\" or rule.name: \"Signatures::Signature_Summary\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_smtpblocklist_blocked_host.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_smtpblocklist_blocked_host.json
new file mode 100644
index 0000000000000..b1b52dc6c08f2
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_smtpblocklist_blocked_host.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "402d5f78-82cd-4320-8b69-3185e44daf07",
+  "risk_score": 50,
+  "description": "The originator’s address is seen in the block list error message. This is useful to detect local hosts sending SPAM with a high positive rate.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SMTP::Blocklist_Blocked_Host",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SMTP::Blocklist_Blocked_Host\" or rule.name: \"SMTP::Blocklist_Blocked_Host\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_smtpblocklist_error_message.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_smtpblocklist_error_message.json
new file mode 100644
index 0000000000000..69adf95592dd7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_smtpblocklist_error_message.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "b9bb4a93-8c5c-4942-9193-e2dc97230034",
+  "risk_score": 50,
+  "description": "An SMTP server sent a reply mentioning an SMTP block list.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SMTP::Blocklist_Error_Message",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SMTP::Blocklist_Error_Message\" or rule.name: \"SMTP::Blocklist_Error_Message\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_smtpsuspicious_origination.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_smtpsuspicious_origination.json
new file mode 100644
index 0000000000000..2414a8a7669a4
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_smtpsuspicious_origination.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "cc6e9fef-d936-4faf-8936-e576c089d8b2",
+  "risk_score": 50,
+  "description": "SMTP message orignated from country or network configured to be suspicious.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SMTP::Suspicious_Origination",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SMTP::Suspicious_Origination\" or rule.name: \"SMTP::Suspicious_Origination\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_softwaresoftware_version_change.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_softwaresoftware_version_change.json
new file mode 100644
index 0000000000000..87f1472a0420d
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_softwaresoftware_version_change.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "ea1d2c1b-ecfe-42a5-bd0b-56c7a1bd8075",
+  "risk_score": 50,
+  "description": "Indicates that an interesting software application changed versions on a host.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Software::Software_Version_Change",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Software::Software_Version_Change\" or rule.name: \"Software::Software_Version_Change\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_softwarevulnerable_version.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_softwarevulnerable_version.json
new file mode 100644
index 0000000000000..24b803e654fcf
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_softwarevulnerable_version.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "97b4d80c-7671-4301-85a6-954aa0ba96ce",
+  "risk_score": 50,
+  "description": "Indicates that a vulnerable version of software was detected.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Software::Vulnerable_Version",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Software::Vulnerable_Version\" or rule.name: \"Software::Vulnerable_Version\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshinteresting_hostname_login.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshinteresting_hostname_login.json
new file mode 100644
index 0000000000000..70e20f85d9b49
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshinteresting_hostname_login.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "6a7f2b0a-3f24-4d58-aa84-243f1f0556d9",
+  "risk_score": 50,
+  "description": "Generated if a login originates or responds with a host where the reverse hostname lookup resolves to a name matched by the SSH::interesting_hostnames regular expression.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSH::Interesting_Hostname_Login",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSH::Interesting_Hostname_Login\" or rule.name: \"SSH::Interesting_Hostname_Login\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshlogin_by_password_guesser.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshlogin_by_password_guesser.json
new file mode 100644
index 0000000000000..7d9402f7a1ec4
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshlogin_by_password_guesser.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "5600ad95-2244-43db-8a7d-77eea95f80db",
+  "risk_score": 50,
+  "description": "Indicates that a host previously identified as a \"password guesser\" has now had a successful login attempt.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSH::Login_By_Password_Guesser",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSH::Login_By_Password_Guesser\" or rule.name: \"SSH::Login_By_Password_Guesser\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshpassword_guessing.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshpassword_guessing.json
new file mode 100644
index 0000000000000..00c346bc0ecc7
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshpassword_guessing.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "e278142a-4ee7-4443-9b1f-421174b0dabf",
+  "risk_score": 50,
+  "description": "Indicates that a host has been identified as crossing the SSH::password_guesses_limit threshold with failed logins.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSH::Password_Guessing",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSH::Password_Guessing\" or rule.name: \"SSH::Password_Guessing\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshwatched_country_login.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshwatched_country_login.json
new file mode 100644
index 0000000000000..943f56b7c9368
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sshwatched_country_login.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "983f4b7e-38cd-4d7f-8be6-40447431561e",
+  "risk_score": 50,
+  "description": "SSH login was seen to or from a \"watched\" country based on the SSH::watched_countries variable",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSH::Watched_Country_Login",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSH::Watched_Country_Login\" or rule.name: \"SSH::Watched_Country_Login\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslcertificate_expired.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslcertificate_expired.json
new file mode 100644
index 0000000000000..030b56cc57782
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslcertificate_expired.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "3981f48e-49a5-4a3e-9b44-900a0887526c",
+  "risk_score": 50,
+  "description": "Indicates that a certificate’s NotValidAfter date has lapsed and the certificate is now invalid.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSL::Certificate_Expired",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSL::Certificate_Expired\" or rule.name: \"SSL::Certificate_Expired\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslcertificate_expires_soon.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslcertificate_expires_soon.json
new file mode 100644
index 0000000000000..702724abcfa64
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslcertificate_expires_soon.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "e8207172-3478-4b2c-85b7-6f13d97fff43",
+  "risk_score": 50,
+  "description": "Indicates that a certificate is going to expire within SSL::notify_when_cert_expiring_in.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSL::Certificate_Expires_Soon",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSL::Certificate_Expires_Soon\" or rule.name: \"SSL::Certificate_Expires_Soon\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslcertificate_not_valid_yet.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslcertificate_not_valid_yet.json
new file mode 100644
index 0000000000000..258fb0cf78b60
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslcertificate_not_valid_yet.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "45586490-99f6-4e11-8228-2229d727a3b4",
+  "risk_score": 50,
+  "description": "Indicates that a certificate’s NotValidBefore date is future dated.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSL::Certificate_Not_Valid_Yet",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSL::Certificate_Not_Valid_Yet\" or rule.name: \"SSL::Certificate_Not_Valid_Yet\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslinvalid_ocsp_response.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslinvalid_ocsp_response.json
new file mode 100644
index 0000000000000..43c4b46e36c07
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslinvalid_ocsp_response.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "eb17fcbb-de22-4aa0-81aa-1c059bdd4f2b",
+  "risk_score": 50,
+  "description": "This indicates that the OCSP response was not deemed to be valid.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSL::Invalid_Ocsp_Response",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSL::Invalid_Ocsp_Response\" or rule.name: \"SSL::Invalid_Ocsp_Response\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslinvalid_server_cert.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslinvalid_server_cert.json
new file mode 100644
index 0000000000000..8c473f0007624
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslinvalid_server_cert.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "13f51fe0-fc74-4c45-90f3-6fb1cd26ec66",
+  "risk_score": 50,
+  "description": "This notice indicates that the result of validating the certificate along with its full certificate chain was invalid.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSL::Invalid_Server_Cert",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSL::Invalid_Server_Cert\" or rule.name: \"SSL::Invalid_Server_Cert\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslold_version.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslold_version.json
new file mode 100644
index 0000000000000..ba60fa82a5bae
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslold_version.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "260b680e-c3d6-4c03-90cd-03c86e9f8ec1",
+  "risk_score": 50,
+  "description": "Indicates that a server is using a potentially unsafe version",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSL::Old_Version",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSL::Old_Version\" or rule.name: \"SSL::Old_Version\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslweak_cipher.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslweak_cipher.json
new file mode 100644
index 0000000000000..786b42cb8db50
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslweak_cipher.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "25886074-6ae1-41c0-8546-e8cf55ed1b4b",
+  "risk_score": 50,
+  "description": "Indicates that a server is using a potentially unsafe cipher",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSL::Weak_Cipher",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSL::Weak_Cipher\" or rule.name: \"SSL::Weak_Cipher\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslweak_key.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslweak_key.json
new file mode 100644
index 0000000000000..7120cfe5e81ad
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_sslweak_key.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "e020f504-c0e5-4768-8e1f-1e2ec7bac961",
+  "risk_score": 50,
+  "description": "Indicates that a server is using a potentially unsafe key.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice SSL::Weak_Key",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"SSL::Weak_Key\" or rule.name: \"SSL::Weak_Key\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_teamcymrumalwarehashregistrymatch.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_teamcymrumalwarehashregistrymatch.json
new file mode 100644
index 0000000000000..47817a05ea570
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_teamcymrumalwarehashregistrymatch.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "a130a0ba-b083-4630-b0ea-cceb80d7720b",
+  "risk_score": 50,
+  "description": "The hash value of a file transferred over HTTP matched in the malware hash registry.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice TeamCymruMalwareHashRegistry::Match",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"TeamCymruMalwareHashRegistry::Match\" or rule.name: \"TeamCymruMalwareHashRegistry::Match\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_traceroutedetected.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_traceroutedetected.json
new file mode 100644
index 0000000000000..c676c84347cb5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_traceroutedetected.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "aeefe077-f05d-44a7-b757-272fc51c334c",
+  "risk_score": 50,
+  "description": "Indicates that a host was seen running traceroutes.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Traceroute::Detected",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Traceroute::Detected\" or rule.name: \"Traceroute::Detected\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_weirdactivity.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_weirdactivity.json
new file mode 100644
index 0000000000000..fc1da9e414cc5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules/zeek_notice_weirdactivity.json
@@ -0,0 +1,17 @@
+{
+  "rule_id": "d5ad39d0-8421-4f79-ad93-8ddbf7f553b3",
+  "risk_score": 50,
+  "description": "Generic unusual but notice-worthy weird activity.",
+  "immutable": true,
+  "interval": "5m",
+  "name": "Zeek Notice Weird::Activity",
+  "severity": "low",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "event.module: zeek and event.dataset: zeek.notice and (zeek.notice.note: \"Weird::Activity\" or rule.name: \"Weird::Activity\")",
+  "language": "kuery",
+  "filters": [],
+  "enabled": false,
+  "version": 1
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/types.ts
index caeec68c504e6..4f4c0da7127cd 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/types.ts
@@ -31,15 +31,30 @@ export interface UpdateRulesRequest extends RequestFacade {
   payload: UpdateRuleAlertParamsRest;
 }
 
-export type RuleAlertType = Alert & {
-  id: string;
+export interface BulkUpdateRulesRequest extends RequestFacade {
+  payload: UpdateRuleAlertParamsRest[];
+}
+
+export interface RuleAlertType extends Alert {
   params: RuleTypeParams;
-};
+}
 
 export interface RulesRequest extends RequestFacade {
   payload: RuleAlertParamsRest;
 }
 
+export interface BulkRulesRequest extends RequestFacade {
+  payload: RuleAlertParamsRest[];
+}
+
+export type QueryRequest = Omit<RequestFacade, 'query'> & {
+  query: { id: string | undefined; rule_id: string | undefined };
+};
+
+export interface QueryBulkRequest extends RequestFacade {
+  payload: Array<QueryRequest['query']>;
+}
+
 export interface FindRuleParams {
   alertsClient: AlertsClient;
   perPage?: number;
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.ts
new file mode 100644
index 0000000000000..3d2ca8f91281b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ActionsClient } from '../../../../../actions';
+import { AlertsClient } from '../../../../../alerting';
+import { updateRules } from './update_rules';
+import { RuleAlertParamsRest } from '../types';
+
+export const updatePrepackagedRules = async (
+  alertsClient: AlertsClient,
+  actionsClient: ActionsClient,
+  rules: RuleAlertParamsRest[],
+  outputIndex: string
+): Promise<void> => {
+  await rules.forEach(async rule => {
+    const {
+      description,
+      false_positives: falsePositives,
+      from,
+      immutable,
+      query,
+      language,
+      saved_id: savedId,
+      meta,
+      filters,
+      rule_id: ruleId,
+      index,
+      interval,
+      max_signals: maxSignals,
+      risk_score: riskScore,
+      name,
+      severity,
+      tags,
+      to,
+      type,
+      threats,
+      references,
+      version,
+    } = rule;
+
+    // Note: we do not pass down enabled as we do not want to suddenly disable
+    // or enable rules on the user when they were not expecting it if a rule updates
+    return updateRules({
+      alertsClient,
+      actionsClient,
+      description,
+      falsePositives,
+      from,
+      immutable,
+      query,
+      language,
+      outputIndex,
+      id: undefined, // We never have an id when updating from pre-packaged rules
+      savedId,
+      meta,
+      filters,
+      ruleId,
+      index,
+      interval,
+      maxSignals,
+      riskScore,
+      name,
+      severity,
+      tags,
+      to,
+      type,
+      threats,
+      references,
+      version,
+    });
+  });
+};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.test.ts
index 1022fea93200f..c079c637d88b7 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { calculateInterval, calculateName } from './update_rules';
+import { calculateInterval, calculateName, calculateVersion } from './update_rules';
 
 describe('update_rules', () => {
   describe('#calculateInterval', () => {
@@ -24,6 +24,24 @@ describe('update_rules', () => {
     });
   });
 
+  describe('#calculateVersion', () => {
+    test('given preVersion and nextVersion numbers being null it will return a 1', () => {
+      expect(calculateVersion(null, null)).toEqual(1);
+    });
+
+    test('given preVersion and nextVersion numbers being undefined it will return a 1', () => {
+      expect(calculateVersion(undefined, undefined)).toEqual(1);
+    });
+
+    test('given prevVersion as null and nextVersion being defined, nextVersion will be returned', () => {
+      expect(calculateVersion(undefined, 5)).toEqual(5);
+    });
+
+    test('given prevVersion as being defined but nextVersion is not, prevVersion will be incremented by 1', () => {
+      expect(calculateVersion(5, undefined)).toEqual(6);
+    });
+  });
+
   describe('#calculateName', () => {
     test('should return the updated name when it and originalName is there', () => {
       const name = calculateName({ updatedName: 'updated', originalName: 'original' });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts
index b37e9f6cb8538..c9dac82b6eb8f 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.ts
@@ -5,10 +5,10 @@
  */
 
 import { defaults } from 'lodash/fp';
-import { AlertAction } from '../../../../../alerting/server/types';
+import { AlertAction, IntervalSchedule } from '../../../../../alerting/server/types';
 import { readRules } from './read_rules';
 import { UpdateRuleParams } from './types';
-import { updateTags } from './update_tags';
+import { addTags } from './add_tags';
 
 export const calculateInterval = (
   interval: string | undefined,
@@ -23,6 +23,27 @@ export const calculateInterval = (
   }
 };
 
+export const calculateVersion = (
+  prevVersion: number | null | undefined,
+  nextVersion: number | null | undefined
+) => {
+  if (nextVersion == null) {
+    if (prevVersion != null) {
+      return prevVersion + 1;
+    } else {
+      // really should never hit this code but to just be
+      // safe let us always check the prev version and if
+      // its null or undefined return a 1
+      return 1;
+    }
+  } else {
+    // The user wants to custom update their version number which
+    // means this could be in the past. Up to the user if they want
+    // to do this
+    return nextVersion;
+  }
+};
+
 export const calculateName = ({
   updatedName,
   originalName,
@@ -52,6 +73,7 @@ export const updateRules = async ({
   language,
   outputIndex,
   savedId,
+  timelineId,
   meta,
   filters,
   from,
@@ -69,6 +91,7 @@ export const updateRules = async ({
   to,
   type,
   references,
+  version,
 }: UpdateRuleParams) => {
   const rule = await readRules({ alertsClient, ruleId, id });
   if (rule == null) {
@@ -94,6 +117,7 @@ export const updateRules = async ({
       language,
       outputIndex,
       savedId,
+      timelineId,
       meta,
       filters,
       index,
@@ -103,21 +127,39 @@ export const updateRules = async ({
       threats,
       to,
       type,
+      updatedAt: new Date().toISOString(),
       references,
+      version: calculateVersion(rule.params.version, version),
     }
   );
 
-  if (rule.enabled && !enabled) {
+  if (rule.enabled && enabled === false) {
     await alertsClient.disable({ id: rule.id });
-  } else if (!rule.enabled && enabled) {
+  } else if (!rule.enabled && enabled === true) {
     await alertsClient.enable({ id: rule.id });
+  } else {
+    // enabled is null or undefined and we do not touch the rule
   }
+
   return alertsClient.update({
     id: rule.id,
     data: {
-      tags: updateTags(rule.tags, tags),
+      tags: addTags(
+        tags,
+        rule.params.ruleId,
+        immutable != null ? immutable : rule.params.immutable // Add new one if it exists, otherwise re-use old one
+      ),
       name: calculateName({ updatedName: name, originalName: rule.name }),
-      interval: calculateInterval(interval, rule.interval),
+      schedule: {
+        interval: calculateInterval(
+          interval,
+          // TODO: we assume the schedule is an interval schedule due to a problem
+          // in the Alerting api, which should be addressed by the following
+          // issue: https://github.com/elastic/kibana/issues/49703
+          // Once this issue is closed, the type should be correctly returned by alerting
+          (rule.schedule as IntervalSchedule).interval
+        ),
+      },
       actions,
       params: nextParams,
     },
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_tags.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_tags.test.ts
deleted file mode 100644
index cca937d73bd74..0000000000000
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_tags.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 { updateTags } from './update_tags';
-import { INTERNAL_IDENTIFIER } from '../../../../common/constants';
-
-describe('update_tags', () => {
-  test('it should copy internal structures but not any other tags when updating', () => {
-    const tags = updateTags(['tag 2', `${INTERNAL_IDENTIFIER}_some_value`, 'tag 3'], ['tag 1']);
-    expect(tags).toEqual([`${INTERNAL_IDENTIFIER}_some_value`, 'tag 1']);
-  });
-
-  test('it should copy internal structures but not any other tags if given an update of empty tags', () => {
-    const tags = updateTags(['tag 2', `${INTERNAL_IDENTIFIER}_some_value`, 'tag 3'], []);
-    expect(tags).toEqual([`${INTERNAL_IDENTIFIER}_some_value`]);
-  });
-
-  test('it should work like a normal update if there are no internal structures', () => {
-    const tags = updateTags(['tag 2', 'tag 3'], ['tag 1']);
-    expect(tags).toEqual(['tag 1']);
-  });
-
-  test('it should not perform an update if the nextTags are undefined', () => {
-    const tags = updateTags(['tag 2', `${INTERNAL_IDENTIFIER}_some_value`, 'tag 3'], undefined);
-    expect(tags).toEqual(['tag 2', `${INTERNAL_IDENTIFIER}_some_value`, 'tag 3']);
-  });
-
-  test('it should not perform an update if the nextTags are null', () => {
-    const tags = updateTags(['tag 2', `${INTERNAL_IDENTIFIER}_some_value`, 'tag 3'], null);
-    expect(tags).toEqual(['tag 2', `${INTERNAL_IDENTIFIER}_some_value`, 'tag 3']);
-  });
-});
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_tags.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_tags.ts
deleted file mode 100644
index cf1424ea31600..0000000000000
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_tags.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 { INTERNAL_IDENTIFIER } from '../../../../common/constants';
-
-export const updateTags = (prevTags: string[], nextTags: string[] | undefined | null): string[] => {
-  if (nextTags == null) {
-    return prevTags;
-  } else {
-    const allInternalStructures = prevTags.filter(tag => tag.startsWith(INTERNAL_IDENTIFIER));
-    return [...allInternalStructures, ...nextTags];
-  }
-};
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/add_prepackaged_rules.sh b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/add_prepackaged_rules.sh
new file mode 100755
index 0000000000000..be53e0cd682f0
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/add_prepackaged_rules.sh
@@ -0,0 +1,17 @@
+#!/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: ./add_prepackaged_rules.sh
+curl -s -k \
+ -H 'Content-Type: application/json' \
+ -H 'kbn-xsrf: 123' \
+ -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
+ -X PUT ${KIBANA_URL}${SPACE_URL}/api/detection_engine/rules/prepackaged | jq .
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/convert_saved_search_to_rules.sh b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/convert_saved_search_to_rules.sh
index e4d345eec0b65..1995b8c7f6978 100755
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/convert_saved_search_to_rules.sh
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/convert_saved_search_to_rules.sh
@@ -9,4 +9,6 @@
 set -e
 ./check_env_variables.sh
 
-node ../../../../scripts/convert_saved_search_to_rules.js $1 $2
+OUTPUT=${2:-../rules/prepackaged_rules}
+
+node ../../../../scripts/convert_saved_search_to_rules.js $1 $OUTPUT
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/delete_bulk.sh b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/delete_bulk.sh
new file mode 100755
index 0000000000000..8f540e14ecdf1
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/delete_bulk.sh
@@ -0,0 +1,22 @@
+#!/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
+
+# Uses a default if no argument is specified
+RULES=${1:-./rules/bulk/delete_by_rule_id.json}
+
+# Example: ./delete_rule_bulk.sh
+curl -s -k \
+  -H 'Content-Type: application/json' \
+  -H 'kbn-xsrf: 123' \
+  -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
+  -X DELETE ${KIBANA_URL}${SPACE_URL}/api/detection_engine/rules/_bulk_delete \
+  -d @${RULES} \
+  | jq .;
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/find_rule_by_filter.sh b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/find_rule_by_filter.sh
index 52d49979a072b..6331e72ac7e8e 100755
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/find_rule_by_filter.sh
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/find_rule_by_filter.sh
@@ -11,11 +11,27 @@ set -e
 
 FILTER=${1:-'alert.attributes.enabled:%20true'}
 
-# Example: ./find_rule_by_filter.sh "alert.attributes.enabled:%20true"
-# Example: ./find_rule_by_filter.sh "alert.attributes.name:%20Detect*"
-# Example: ./find_rule_by_filter.sh "alert.attributes.tags:tag_1"
 # The %20 is just an encoded space that is typical of URL's.
+# The %22 is just an encoded quote of "
 # Table of them for testing if needed: https://www.w3schools.com/tags/ref_urlencode.asp
+
+# Example get all enabled tags:
+# ./find_rule_by_filter.sh "alert.attributes.enabled:%20true"
+
+# Example get all the names that start with Detect*
+# ./find_rule_by_filter.sh "alert.attributes.name:%20Detect*"
+
+# Exampe get everything that has tag_1
+# ./find_rule_by_filter.sh "alert.attributes.tags:tag_1"
+
+# Example get all pre-packaged rules
+# ./find_rule_by_filter.sh "alert.attributes.tags:%20%22__internal_immutable:true%22"
+
+# Example get all non pre-packaged rules
+# ./find_rule_by_filter.sh "alert.attributes.tags:%20%22__internal_immutable:false%22"
+
+# Example get all non pre-packaged rules and a tag_1
+# ./find_rule_by_filter.sh "alert.attributes.tags:%20%22__internal_immutable:false%22%20AND%20alert.attributes.tags:tag_1"
 curl -s -k \
  -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
  -X GET ${KIBANA_URL}${SPACE_URL}/api/detection_engine/rules/_find?filter=$FILTER | jq .
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/post_rule_bulk.sh b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/post_rule_bulk.sh
new file mode 100755
index 0000000000000..ad10ffc31aa94
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/post_rule_bulk.sh
@@ -0,0 +1,22 @@
+#!/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
+
+# Uses a default if no argument is specified
+RULES=${1:-./rules/bulk/multiple_ruleid_queries.json}
+
+# Example: ./post_rule_bulk.sh
+curl -s -k \
+  -H 'Content-Type: application/json' \
+  -H 'kbn-xsrf: 123' \
+  -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
+  -X POST ${KIBANA_URL}${SPACE_URL}/api/detection_engine/rules/_bulk_create \
+  -d @${RULES} \
+  | jq .;
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/delete_by_rule_id.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/delete_by_rule_id.json
new file mode 100644
index 0000000000000..1bd9bdc703331
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/delete_by_rule_id.json
@@ -0,0 +1,8 @@
+[
+  {
+    "rule_id": "query-rule-id-1"
+  },
+  {
+    "rule_id": "query-rule-id-2"
+  }
+]
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/multiple_ruleid_queries.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/multiple_ruleid_queries.json
new file mode 100644
index 0000000000000..bee2363aa5e0c
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/multiple_ruleid_queries.json
@@ -0,0 +1,24 @@
+[
+  {
+    "name": "Query with a rule id Number 1",
+    "description": "Query with a rule_id that acts like an external id",
+    "rule_id": "query-rule-id-1",
+    "risk_score": 1,
+    "severity": "high",
+    "type": "query",
+    "from": "now-6m",
+    "to": "now",
+    "query": "user.name: root or user.name: admin"
+  },
+  {
+    "name": "Query with a rule id Number 2",
+    "description": "Query with a rule_id that acts like an external id",
+    "rule_id": "query-rule-id-2",
+    "risk_score": 2,
+    "severity": "low",
+    "type": "query",
+    "from": "now-6m",
+    "to": "now",
+    "query": "user.name: root or user.name: admin"
+  }
+]
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/multiple_simplest_queries.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/multiple_simplest_queries.json
new file mode 100644
index 0000000000000..9e5328ffabe2e
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/multiple_simplest_queries.json
@@ -0,0 +1,22 @@
+[
+  {
+    "name": "Simplest Query Number 1",
+    "description": "Simplest query with the least amount of fields required",
+    "risk_score": 1,
+    "severity": "high",
+    "type": "query",
+    "from": "now-6m",
+    "to": "now",
+    "query": "user.name: root or user.name: admin"
+  },
+  {
+    "name": "Simplest Query Number 2",
+    "description": "Simplest query with the least amount of fields required",
+    "risk_score": 2,
+    "severity": "low",
+    "type": "query",
+    "from": "now-6m",
+    "to": "now",
+    "query": "user.name: root or user.name: admin"
+  }
+]
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/update_names.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/update_names.json
new file mode 100644
index 0000000000000..4dca8f88a7e67
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/bulk/update_names.json
@@ -0,0 +1,10 @@
+[
+  {
+    "name": "Rule id Number 1 with an updated name",
+    "rule_id": "query-rule-id-1"
+  },
+  {
+    "name": "Rule id Number 2 with an updated name",
+    "rule_id": "query-rule-id-2"
+  }
+]
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_timelineid.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_timelineid.json
new file mode 100644
index 0000000000000..2f995029447ff
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_timelineid.json
@@ -0,0 +1,11 @@
+{
+  "name": "Query which is disabled",
+  "description": "Example query which will is disabled and will not run after being posted",
+  "risk_score": 1,
+  "severity": "high",
+  "type": "query",
+  "from": "now-6m",
+  "to": "now",
+  "query": "user.name: root or user.name: admin",
+  "timeline_id": "timeline-id"
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_with_everything.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_with_everything.json
index adb96ba398f5e..60095a0a6a833 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_with_everything.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/queries/query_with_everything.json
@@ -76,5 +76,7 @@
   "references": [
     "http://www.example.com/some-article-about-attack",
     "Some plain text string here explaining why this is a valid thing to look out for"
-  ]
+  ],
+  "timeline_id": "timeline_id",
+  "version": 1
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/saved_queries/saved_query_with_everything.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/saved_queries/saved_query_with_everything.json
index c4aaf4aae93c2..2628b69eb064d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/saved_queries/saved_query_with_everything.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/saved_queries/saved_query_with_everything.json
@@ -77,5 +77,6 @@
     "http://www.example.com/some-article-about-attack",
     "Some plain text string here explaining why this is a valid thing to look out for"
   ],
-  "saved_id": "test-saved-id"
+  "saved_id": "test-saved-id",
+  "timeline_id": "test-timeline-id"
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_immutable.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_immutable.json
new file mode 100644
index 0000000000000..14706b6e54e7b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_immutable.json
@@ -0,0 +1,4 @@
+{
+  "rule_id": "query-rule-id",
+  "immutable": true
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_interval.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_interval.json
new file mode 100644
index 0000000000000..72a535f0ef641
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_interval.json
@@ -0,0 +1,4 @@
+{
+  "rule_id": "query-rule-id",
+  "interval": "6m"
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_query_everything.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_query_everything.json
index 285e9c94a76d9..4da285e5b09bf 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_query_everything.json
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_query_everything.json
@@ -76,5 +76,7 @@
   "references": [
     "http://www.example.com/some-article-about-attack",
     "Some plain text string here explaining why this is a valid thing to look out for"
-  ]
+  ],
+  "timeline_id": "other-timeline-id",
+  "version": 42
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_timelineid.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_timelineid.json
new file mode 100644
index 0000000000000..8cfa3303f54a6
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_timelineid.json
@@ -0,0 +1,4 @@
+{
+  "rule_id": "query-rule-id",
+  "timeline_id": "other-timeline-id"
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_version.json b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_version.json
new file mode 100644
index 0000000000000..8df63dd22bf9a
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/rules/updates/update_version.json
@@ -0,0 +1,4 @@
+{
+  "rule_id": "query-rule-id",
+  "version": 500
+}
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/update_rule_bulk.sh b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/update_rule_bulk.sh
new file mode 100755
index 0000000000000..c9cb0676821c5
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/scripts/update_rule_bulk.sh
@@ -0,0 +1,22 @@
+#!/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
+
+# Uses a default if no argument is specified
+RULES=${1:-./rules/bulk/update_names.json}
+
+# Example: ./update_rule_bulk.sh
+curl -s -k \
+  -H 'Content-Type: application/json' \
+  -H 'kbn-xsrf: 123' \
+  -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
+  -X PUT ${KIBANA_URL}${SPACE_URL}/api/detection_engine/rules/_bulk_update \
+  -d @${RULES} \
+  | jq .;
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts
index 47a4dafa2d17f..5e50b65b51717 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/__mocks__/es_results.ts
@@ -30,8 +30,12 @@ export const sampleRuleAlertParams = (
   maxSignals: maxSignals ? maxSignals : 10000,
   filters: undefined,
   savedId: undefined,
+  timelineId: undefined,
   meta: undefined,
   threats: undefined,
+  version: 1,
+  updatedAt: '2019-12-17T15:04:25.343Z',
+  createdAt: '2019-12-17T15:04:37.105Z',
 });
 
 export const sampleDocNoSortId = (someUuid: string = sampleIdGuid): SignalSourceHit => ({
@@ -140,6 +144,28 @@ export const sampleBulkCreateDuplicateResult = {
   ],
 };
 
+export const sampleBulkCreateErrorResult = {
+  ...sampleBulkCreateDuplicateResult,
+  items: [
+    ...sampleBulkCreateDuplicateResult.items,
+    {
+      create: {
+        _index: 'test',
+        _type: '_doc',
+        _id: '5',
+        status: 500,
+        error: {
+          type: 'internal_server_error',
+          reason: '[4]: internal server error',
+          index_uuid: 'cXmq4Rt3RGGswDTTwZFzvA',
+          shard: '0',
+          index: 'test',
+        },
+      },
+    },
+  ],
+};
+
 export const sampleDocSearchResultsNoSortId = (
   someUuid: string = sampleIdGuid
 ): SignalSearchResponse => ({
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_bulk_body.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_bulk_body.test.ts
index e10158a0b879e..90860a817d270 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_bulk_body.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_bulk_body.test.ts
@@ -69,6 +69,9 @@ describe('buildBulkBody', () => {
           enabled: true,
           created_by: 'elastic',
           updated_by: 'elastic',
+          version: 1,
+          created_at: fakeSignalSourceHit.signal.rule?.created_at,
+          updated_at: fakeSignalSourceHit.signal.rule?.updated_at,
         },
       },
     });
@@ -142,6 +145,9 @@ describe('buildBulkBody', () => {
           enabled: true,
           created_by: 'elastic',
           updated_by: 'elastic',
+          version: 1,
+          created_at: fakeSignalSourceHit.signal.rule?.created_at,
+          updated_at: fakeSignalSourceHit.signal.rule?.updated_at,
         },
       },
     });
@@ -213,6 +219,9 @@ describe('buildBulkBody', () => {
           enabled: true,
           created_by: 'elastic',
           updated_by: 'elastic',
+          version: 1,
+          created_at: fakeSignalSourceHit.signal.rule?.created_at,
+          updated_at: fakeSignalSourceHit.signal.rule?.updated_at,
         },
       },
     });
@@ -277,6 +286,9 @@ describe('buildBulkBody', () => {
           enabled: true,
           created_by: 'elastic',
           updated_by: 'elastic',
+          version: 1,
+          updated_at: fakeSignalSourceHit.signal.rule?.updated_at,
+          created_at: fakeSignalSourceHit.signal.rule?.created_at,
         },
       },
     });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.test.ts
index c12c6fd333f56..451e493f3ed8a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.test.ts
@@ -59,6 +59,8 @@ describe('buildRule', () => {
       to: 'now',
       type: 'query',
       updated_by: 'elastic',
+      updated_at: rule.updated_at,
+      created_at: rule.created_at,
       filters: [
         {
           query: 'host.name: Rebecca',
@@ -70,6 +72,7 @@ describe('buildRule', () => {
           query: 'host.name: Braden',
         },
       ],
+      version: 1,
     };
     expect(rule).toEqual(expected);
   });
@@ -110,6 +113,9 @@ describe('buildRule', () => {
       to: 'now',
       type: 'query',
       updated_by: 'elastic',
+      version: 1,
+      updated_at: rule.updated_at,
+      created_at: rule.created_at,
     };
     expect(rule).toEqual(expected);
   });
@@ -150,6 +156,9 @@ describe('buildRule', () => {
       to: 'now',
       type: 'query',
       updated_by: 'elastic',
+      version: 1,
+      updated_at: rule.updated_at,
+      created_at: rule.created_at,
     };
     expect(rule).toEqual(expected);
   });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts
index 64ec989208b6a..0a3526d32e511 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_rule.ts
@@ -33,6 +33,7 @@ export const buildRule = ({
     rule_id: ruleParams.ruleId,
     false_positives: ruleParams.falsePositives,
     saved_id: ruleParams.savedId,
+    timeline_id: ruleParams.timelineId,
     meta: ruleParams.meta,
     max_signals: ruleParams.maxSignals,
     risk_score: ruleParams.riskScore,
@@ -55,5 +56,8 @@ export const buildRule = ({
     created_by: createdBy,
     updated_by: updatedBy,
     threats: ruleParams.threats,
+    version: ruleParams.version,
+    created_at: ruleParams.createdAt,
+    updated_at: ruleParams.updatedAt,
   });
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_signal.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_signal.test.ts
index 1c024d0496743..debc619fbf8b2 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_signal.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/build_signal.test.ts
@@ -51,6 +51,8 @@ describe('buildSignal', () => {
         tags: ['some fake tag 1', 'some fake tag 2'],
         to: 'now',
         type: 'query',
+        updated_at: signal.rule.updated_at,
+        created_at: signal.rule.created_at,
       },
     };
     expect(signal).toEqual(expected);
@@ -104,6 +106,8 @@ describe('buildSignal', () => {
         tags: ['some fake tag 1', 'some fake tag 2'],
         to: 'now',
         type: 'query',
+        updated_at: signal.rule.updated_at,
+        created_at: signal.rule.created_at,
       },
     };
     expect(signal).toEqual(expected);
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_filter.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_filter.test.ts
index 43b5ce4b590a3..534215f5a1228 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_filter.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/get_filter.test.ts
@@ -509,5 +509,140 @@ describe('get_filter', () => {
         })
       ).rejects.toThrow('savedId parameter should be defined');
     });
+
+    test('it works with references and does not add indexes', () => {
+      const esQuery = getQueryFilter(
+        '(event.module:suricata and event.kind:alert) and suricata.eve.alert.signature_id: (2610182 or 2610183 or 2610184 or 2610185 or 2610186 or 2610187)',
+        'kuery',
+        [],
+        ['my custom index']
+      );
+      expect(esQuery).toEqual({
+        bool: {
+          must: [],
+          filter: [
+            {
+              bool: {
+                filter: [
+                  {
+                    bool: {
+                      filter: [
+                        {
+                          bool: {
+                            should: [{ match: { 'event.module': 'suricata' } }],
+                            minimum_should_match: 1,
+                          },
+                        },
+                        {
+                          bool: {
+                            should: [{ match: { 'event.kind': 'alert' } }],
+                            minimum_should_match: 1,
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  {
+                    bool: {
+                      should: [
+                        {
+                          bool: {
+                            should: [{ match: { 'suricata.eve.alert.signature_id': 2610182 } }],
+                            minimum_should_match: 1,
+                          },
+                        },
+                        {
+                          bool: {
+                            should: [
+                              {
+                                bool: {
+                                  should: [
+                                    { match: { 'suricata.eve.alert.signature_id': 2610183 } },
+                                  ],
+                                  minimum_should_match: 1,
+                                },
+                              },
+                              {
+                                bool: {
+                                  should: [
+                                    {
+                                      bool: {
+                                        should: [
+                                          { match: { 'suricata.eve.alert.signature_id': 2610184 } },
+                                        ],
+                                        minimum_should_match: 1,
+                                      },
+                                    },
+                                    {
+                                      bool: {
+                                        should: [
+                                          {
+                                            bool: {
+                                              should: [
+                                                {
+                                                  match: {
+                                                    'suricata.eve.alert.signature_id': 2610185,
+                                                  },
+                                                },
+                                              ],
+                                              minimum_should_match: 1,
+                                            },
+                                          },
+                                          {
+                                            bool: {
+                                              should: [
+                                                {
+                                                  bool: {
+                                                    should: [
+                                                      {
+                                                        match: {
+                                                          'suricata.eve.alert.signature_id': 2610186,
+                                                        },
+                                                      },
+                                                    ],
+                                                    minimum_should_match: 1,
+                                                  },
+                                                },
+                                                {
+                                                  bool: {
+                                                    should: [
+                                                      {
+                                                        match: {
+                                                          'suricata.eve.alert.signature_id': 2610187,
+                                                        },
+                                                      },
+                                                    ],
+                                                    minimum_should_match: 1,
+                                                  },
+                                                },
+                                              ],
+                                              minimum_should_match: 1,
+                                            },
+                                          },
+                                        ],
+                                        minimum_should_match: 1,
+                                      },
+                                    },
+                                  ],
+                                  minimum_should_match: 1,
+                                },
+                              },
+                            ],
+                            minimum_should_match: 1,
+                          },
+                        },
+                      ],
+                      minimum_should_match: 1,
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+          should: [],
+          must_not: [],
+        },
+      });
+    });
   });
 });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
index 37467e405dd8e..87d31abbc5371 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -31,6 +31,7 @@ export const signalRulesAlertType = ({
     actionGroups: ['default'],
     validate: {
       params: schema.object({
+        createdAt: schema.string(),
         description: schema.string(),
         falsePositives: schema.arrayOf(schema.string(), { defaultValue: [] }),
         from: schema.string(),
@@ -40,6 +41,7 @@ export const signalRulesAlertType = ({
         language: schema.nullable(schema.string()),
         outputIndex: schema.nullable(schema.string()),
         savedId: schema.nullable(schema.string()),
+        timelineId: schema.nullable(schema.string()),
         meta: schema.nullable(schema.object({}, { allowUnknowns: true })),
         query: schema.nullable(schema.string()),
         filters: schema.nullable(schema.arrayOf(schema.object({}, { allowUnknowns: true }))),
@@ -49,7 +51,9 @@ export const signalRulesAlertType = ({
         threats: schema.nullable(schema.arrayOf(schema.object({}, { allowUnknowns: true }))),
         to: schema.string(),
         type: schema.string(),
+        updatedAt: schema.string(),
         references: schema.arrayOf(schema.string(), { defaultValue: [] }),
+        version: schema.number({ defaultValue: 1 }),
       }),
     },
     async executor({ alertId, services, params }) {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts
index d58f0a22b763d..ca4b1d1e8e84a 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts
@@ -13,6 +13,7 @@ import {
   sampleDocSearchResultsNoSortIdNoVersion,
   sampleEmptyDocSearchResults,
   sampleBulkCreateDuplicateResult,
+  sampleBulkCreateErrorResult,
 } from './__mocks__/es_results';
 import { savedObjectsClientMock } from 'src/core/server/mocks';
 import { DEFAULT_SIGNALS_INDEX } from '../../../../common/constants';
@@ -206,7 +207,8 @@ describe('singleBulkCreate', () => {
     });
     expect(successfulsingleBulkCreate).toEqual(true);
   });
-  test('create successful bulk create when bulk create has errors', async () => {
+
+  test('create successful bulk create when bulk create has duplicate errors', async () => {
     const sampleParams = sampleRuleAlertParams();
     const sampleSearchResult = sampleDocSearchResultsNoSortId;
     mockService.callCluster.mockReturnValue(sampleBulkCreateDuplicateResult);
@@ -224,6 +226,30 @@ describe('singleBulkCreate', () => {
       enabled: true,
       tags: ['some fake tag 1', 'some fake tag 2'],
     });
+
+    expect(mockLogger.error).not.toHaveBeenCalled();
+    expect(successfulsingleBulkCreate).toEqual(true);
+  });
+
+  test('create successful bulk create when bulk create has multiple error statuses', async () => {
+    const sampleParams = sampleRuleAlertParams();
+    const sampleSearchResult = sampleDocSearchResultsNoSortId;
+    mockService.callCluster.mockReturnValue(sampleBulkCreateErrorResult);
+    const successfulsingleBulkCreate = await singleBulkCreate({
+      someResult: sampleSearchResult(),
+      ruleParams: sampleParams,
+      services: mockService,
+      logger: mockLogger,
+      id: sampleRuleGuid,
+      signalsIndex: DEFAULT_SIGNALS_INDEX,
+      name: 'rule-name',
+      createdBy: 'elastic',
+      updatedBy: 'elastic',
+      interval: '5m',
+      enabled: true,
+      tags: ['some fake tag 1', 'some fake tag 2'],
+    });
+
     expect(mockLogger.error).toHaveBeenCalled();
     expect(successfulsingleBulkCreate).toEqual(true);
   });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts
index 40b2eeab938dc..a6290e57eb225 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { countBy, isEmpty } from 'lodash';
 import { performance } from 'perf_hooks';
 import { AlertServices } from '../../../../../alerting/server/types';
 import { SignalSearchResponse, BulkResponse } from './types';
@@ -68,39 +69,30 @@ export const singleBulkCreate = async ({
     },
     buildBulkBody({ doc, ruleParams, id, name, createdBy, updatedBy, interval, enabled, tags }),
   ]);
-  const time1 = performance.now();
-  const firstResult: BulkResponse = await services.callCluster('bulk', {
+  const start = performance.now();
+  const response: BulkResponse = await services.callCluster('bulk', {
     index: signalsIndex,
     refresh: false,
     body: bulkBody,
   });
-  const time2 = performance.now();
-  logger.debug(
-    `individual bulk process time took: ${Number(time2 - time1).toFixed(2)} milliseconds`
-  );
-  logger.debug(`took property says bulk took: ${firstResult.took} milliseconds`);
-  if (firstResult.errors) {
-    // go through the response status errors and see what
-    // types of errors they are, count them up, and log them.
-    const errorCountMap = firstResult.items.reduce((acc: { [key: string]: number }, item) => {
-      if (item.create.error) {
-        const responseStatusKey = item.create.status.toString();
-        acc[responseStatusKey] = acc[responseStatusKey] ? acc[responseStatusKey] + 1 : 1;
-      }
-      return acc;
-    }, {});
-    /*
-     the logging output below should look like
-     {'409': 55}
-     which is read as "there were 55 counts of 409 errors returned from bulk create"
-    */
-    logger.error(
-      `[-] bulkResponse had errors with response statuses:counts of...\n${JSON.stringify(
-        errorCountMap,
-        null,
-        2
-      )}`
-    );
+  const end = performance.now();
+  logger.debug(`individual bulk process time took: ${Number(end - start).toFixed(2)} milliseconds`);
+  logger.debug(`took property says bulk took: ${response.took} milliseconds`);
+
+  if (response.errors) {
+    const itemsWithErrors = response.items.filter(item => item.create.error);
+    const errorCountsByStatus = countBy(itemsWithErrors, item => item.create.status);
+    delete errorCountsByStatus['409']; // Duplicate signals are expected
+
+    if (!isEmpty(errorCountsByStatus)) {
+      logger.error(
+        `[-] bulkResponse had errors with response statuses:counts of...\n${JSON.stringify(
+          errorCountsByStatus,
+          null,
+          2
+        )}`
+      );
+    }
   }
   return true;
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/types.ts
index a30182c537884..544250858a083 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/signals/types.ts
@@ -24,6 +24,9 @@ export interface SignalsStatusParams {
 export interface SignalQueryParams {
   query: object | undefined | null;
   aggs: object | undefined | null;
+  _source: string[] | undefined | null;
+  size: number | undefined | null;
+  track_total_hits: boolean | undefined | null;
 }
 
 export type SignalsStatusRestParams = Omit<SignalsStatusParams, 'signalIds'> & {
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/tags/read_tags.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/tags/read_tags.test.ts
index 2d562672a4a63..87739bf785012 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/tags/read_tags.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/tags/read_tags.test.ts
@@ -28,7 +28,7 @@ describe('read_tags', () => {
       result2.tags = ['tag 1', 'tag 2', 'tag 3', 'tag 4'];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1, result2]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1, result2] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readRawTags({
@@ -49,7 +49,7 @@ describe('read_tags', () => {
       result2.tags = ['tag 1', 'tag 2', 'tag 2', 'tag 3', 'tag 4'];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1, result2]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1, result2] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readRawTags({
@@ -70,7 +70,7 @@ describe('read_tags', () => {
       result2.tags = [];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1, result2]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1, result2] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readRawTags({
@@ -86,7 +86,7 @@ describe('read_tags', () => {
       result1.tags = ['tag 1', 'tag 1', 'tag 1', 'tag 2'];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readRawTags({
@@ -102,7 +102,7 @@ describe('read_tags', () => {
       result1.tags = [];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readRawTags({
@@ -125,7 +125,7 @@ describe('read_tags', () => {
       result2.tags = ['tag 1', 'tag 2', 'tag 3', 'tag 4'];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1, result2]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1, result2] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readTags({
@@ -146,7 +146,7 @@ describe('read_tags', () => {
       result2.tags = ['tag 1', 'tag 2', 'tag 2', 'tag 3', 'tag 4'];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1, result2]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1, result2] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readTags({
@@ -167,7 +167,7 @@ describe('read_tags', () => {
       result2.tags = [];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1, result2]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1, result2] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readTags({
@@ -183,7 +183,7 @@ describe('read_tags', () => {
       result1.tags = ['tag 1', 'tag 1', 'tag 1', 'tag 2'];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readTags({
@@ -199,7 +199,7 @@ describe('read_tags', () => {
       result1.tags = [];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readTags({
@@ -219,7 +219,7 @@ describe('read_tags', () => {
       ];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readTags({
@@ -255,7 +255,7 @@ describe('read_tags', () => {
       ];
 
       const alertsClient = alertsClientMock.create();
-      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits([result1]));
+      alertsClient.find.mockResolvedValue(getFindResultWithMultiHits({ data: [result1] }));
 
       const unsafeCast: AlertsClient = (alertsClient as unknown) as AlertsClient;
       const tags = await readTags({
@@ -277,7 +277,7 @@ describe('read_tags', () => {
       result2.params.ruleId = 'rule-2';
       result2.tags = ['tag 1', 'tag 2', 'tag 2', 'tag 3', 'tag 4'];
 
-      const findResult = getFindResultWithMultiHits([result1, result2]);
+      const findResult = getFindResultWithMultiHits({ data: [result1, result2] });
       const set = convertTagsToSet(findResult.data);
       expect(Array.from(set)).toEqual(['tag 1', 'tag 2', 'tag 3', 'tag 4']);
     });
@@ -300,7 +300,7 @@ describe('read_tags', () => {
       result2.params.ruleId = 'rule-2';
       result2.tags = ['tag 1', 'tag 2', 'tag 2', 'tag 3', 'tag 4'];
 
-      const findResult = getFindResultWithMultiHits([result1, result2]);
+      const findResult = getFindResultWithMultiHits({ data: [result1, result2] });
       const tags = convertToTags(findResult.data);
       expect(tags).toEqual([
         'tag 1',
@@ -331,7 +331,7 @@ describe('read_tags', () => {
       result3.params.ruleId = 'rule-2';
       result3.tags = ['tag 1', 'tag 2', 'tag 2', 'tag 3', 'tag 4'];
 
-      const findResult = getFindResultWithMultiHits([result1, result2, result3]);
+      const findResult = getFindResultWithMultiHits({ data: [result1, result2, result3] });
       const tags = convertToTags(findResult.data);
       expect(tags).toEqual([
         'tag 1',
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts
index bb616554042f4..f4a8263da6ba4 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/types.ts
@@ -21,6 +21,7 @@ export interface ThreatParams {
 }
 
 export interface RuleAlertParams {
+  createdAt: string;
   description: string;
   enabled: boolean;
   falsePositives: string[];
@@ -42,22 +43,36 @@ export interface RuleAlertParams {
   severity: string;
   tags: string[];
   to: string;
+  timelineId: string | undefined | null;
   threats: ThreatParams[] | undefined | null;
   type: 'query' | 'saved_query';
+  version: number;
+  updatedAt: string;
 }
 
 export type RuleTypeParams = Omit<RuleAlertParams, 'name' | 'enabled' | 'interval' | 'tags'>;
 
 export type RuleAlertParamsRest = Omit<
   RuleAlertParams,
-  'ruleId' | 'falsePositives' | 'maxSignals' | 'savedId' | 'riskScore' | 'outputIndex'
+  | 'ruleId'
+  | 'falsePositives'
+  | 'maxSignals'
+  | 'savedId'
+  | 'riskScore'
+  | 'timelineId'
+  | 'outputIndex'
+  | 'updatedAt'
+  | 'createdAt'
 > & {
   rule_id: RuleAlertParams['ruleId'];
   false_positives: RuleAlertParams['falsePositives'];
   saved_id: RuleAlertParams['savedId'];
+  timeline_id: RuleAlertParams['timelineId'];
   max_signals: RuleAlertParams['maxSignals'];
   risk_score: RuleAlertParams['riskScore'];
   output_index: RuleAlertParams['outputIndex'];
+  created_at: RuleAlertParams['createdAt'];
+  updated_at: RuleAlertParams['updatedAt'];
 };
 
 export type OutputRuleAlertRest = RuleAlertParamsRest & {
diff --git a/x-pack/legacy/plugins/siem/server/lib/events/elasticsearch_adapter.ts b/x-pack/legacy/plugins/siem/server/lib/events/elasticsearch_adapter.ts
index 6dbb75d28149b..dfa81122f9c23 100644
--- a/x-pack/legacy/plugins/siem/server/lib/events/elasticsearch_adapter.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/events/elasticsearch_adapter.ts
@@ -61,7 +61,6 @@ export class ElasticsearchEventsAdapter implements EventsAdapter {
       ...reduceFields(queryOptions.fields, eventFieldsMap),
     ]);
     delete queryOptions.fieldRequested;
-
     const dsl = buildTimelineQuery(queryOptions);
     const response = await this.framework.callWithRequest<EventHit, TermAggregation>(
       request,
diff --git a/x-pack/legacy/plugins/siem/server/lib/framework/kibana_framework_adapter.ts b/x-pack/legacy/plugins/siem/server/lib/framework/kibana_framework_adapter.ts
index 38fec7fc05a3c..39f75e6ea36c3 100644
--- a/x-pack/legacy/plugins/siem/server/lib/framework/kibana_framework_adapter.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/framework/kibana_framework_adapter.ts
@@ -14,8 +14,10 @@ import {
   KibanaResponseFactory,
   RequestHandlerContext,
   PluginInitializerContext,
-} from 'src/core/server';
+  KibanaRequest,
+} from '../../../../../../../src/core/server';
 import { IndexPatternsFetcher } from '../../../../../../../src/plugins/data/server';
+import { AuthenticatedUser } from '../../../../../../plugins/security/common/model';
 import { RequestFacade } from '../../types';
 
 import {
@@ -25,16 +27,19 @@ import {
   internalFrameworkRequest,
   WrappableRequest,
 } from './types';
+import { SiemPluginSecurity, PluginsSetup } from '../../plugin';
 
 export class KibanaBackendFrameworkAdapter implements FrameworkAdapter {
   public version: string;
   private isProductionMode: boolean;
   private router: IRouter;
+  private security: SiemPluginSecurity;
 
-  constructor(core: CoreSetup, env: PluginInitializerContext['env']) {
+  constructor(core: CoreSetup, plugins: PluginsSetup, env: PluginInitializerContext['env']) {
     this.version = env.packageInfo.version;
     this.isProductionMode = env.mode.prod;
     this.router = core.http.createRouter();
+    this.security = plugins.security;
   }
 
   public async callWithRequest(
@@ -76,10 +81,11 @@ export class KibanaBackendFrameworkAdapter implements FrameworkAdapter {
       },
       async (context, request, response) => {
         try {
+          const user = await this.getCurrentUserInfo(request);
           const gqlResponse = await runHttpQuery([request], {
             method: 'POST',
             options: (req: RequestFacade) => ({
-              context: { req: wrapRequest(req, context) },
+              context: { req: wrapRequest(req, context, user) },
               schema,
             }),
             query: request.body,
@@ -108,11 +114,12 @@ export class KibanaBackendFrameworkAdapter implements FrameworkAdapter {
         },
         async (context, request, response) => {
           try {
+            const user = await this.getCurrentUserInfo(request);
             const { query } = request;
             const gqlResponse = await runHttpQuery([request], {
               method: 'GET',
               options: (req: RequestFacade) => ({
-                context: { req: wrapRequest(req, context) },
+                context: { req: wrapRequest(req, context, user) },
                 schema,
               }),
               query,
@@ -159,6 +166,15 @@ export class KibanaBackendFrameworkAdapter implements FrameworkAdapter {
     }
   }
 
+  private async getCurrentUserInfo(request: KibanaRequest): Promise<AuthenticatedUser | null> {
+    try {
+      const user = await this.security.authc.getCurrentUser(request);
+      return user;
+    } catch {
+      return null;
+    }
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private handleError(error: any, response: KibanaResponseFactory) {
     if (error.name !== 'HttpQueryError') {
@@ -194,7 +210,8 @@ export class KibanaBackendFrameworkAdapter implements FrameworkAdapter {
 
 export function wrapRequest<InternalRequest extends WrappableRequest>(
   req: InternalRequest,
-  context: RequestHandlerContext
+  context: RequestHandlerContext,
+  user: AuthenticatedUser | null
 ): FrameworkRequest<InternalRequest> {
   const { auth, params, payload, query } = req;
 
@@ -205,5 +222,6 @@ export function wrapRequest<InternalRequest extends WrappableRequest>(
     params,
     payload,
     query,
+    user,
   };
 }
diff --git a/x-pack/legacy/plugins/siem/server/lib/framework/types.ts b/x-pack/legacy/plugins/siem/server/lib/framework/types.ts
index dd31ed9fcaf5f..27254284b577d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/framework/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/framework/types.ts
@@ -8,7 +8,8 @@ import { IndicesGetMappingParams } from 'elasticsearch';
 import { GraphQLSchema } from 'graphql';
 import { RequestAuth } from 'hapi';
 
-import { RequestHandlerContext } from 'src/core/server';
+import { RequestHandlerContext } from '../../../../../../../src/core/server';
+import { AuthenticatedUser } from '../../../../../../plugins/security/common/model';
 import { ESQuery } from '../../../common/typed_json';
 import {
   PaginationInput,
@@ -51,6 +52,7 @@ export interface FrameworkRequest<InternalRequest extends WrappableRequest = Req
   params: InternalRequest['params'];
   query: InternalRequest['query'];
   auth: InternalRequest['auth'];
+  user: AuthenticatedUser | null;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/x-pack/legacy/plugins/siem/server/lib/note/saved_object.ts b/x-pack/legacy/plugins/siem/server/lib/note/saved_object.ts
index e5fce811e560f..d825aae1b480b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/note/saved_object.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/note/saved_object.ts
@@ -5,15 +5,16 @@
  */
 
 import { failure } from 'io-ts/lib/PathReporter';
-import { RequestAuth } from 'hapi';
 import { getOr } from 'lodash/fp';
 import uuid from 'uuid';
 
-import { SavedObjectsFindOptions } from 'src/core/server';
-
 import { pipe } from 'fp-ts/lib/pipeable';
 import { map, fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
+
+import { SavedObjectsFindOptions } from '../../../../../../../src/core/server';
+import { AuthenticatedUser } from '../../../../../../plugins/security/common/model';
+import { UNAUTHENTICATED_USER } from '../../../common/constants';
 import {
   PageInfoNote,
   ResponseNote,
@@ -21,7 +22,7 @@ import {
   SortNote,
   NoteResult,
 } from '../../graphql/types';
-import { FrameworkRequest, internalFrameworkRequest } from '../framework';
+import { FrameworkRequest } from '../framework';
 import { SavedNote, NoteSavedObjectRuntimeType, NoteSavedObject } from './types';
 import { noteSavedObjectType } from './saved_object_mappings';
 import { timelineSavedObjectType } from '../../saved_objects';
@@ -117,7 +118,7 @@ export class Note {
                 const timelineResult = convertSavedObjectToSavedTimeline(
                   await savedObjectsClient.create(
                     timelineSavedObjectType,
-                    pickSavedTimeline(null, {}, request[internalFrameworkRequest].auth || null)
+                    pickSavedTimeline(null, {}, request.user)
                   )
                 );
                 note.timelineId = timelineResult.savedObjectId;
@@ -132,7 +133,7 @@ export class Note {
           note: convertSavedObjectToSavedNote(
             await savedObjectsClient.create(
               noteSavedObjectType,
-              pickSavedNote(noteId, note, request[internalFrameworkRequest].auth || null)
+              pickSavedNote(noteId, note, request.user)
             ),
             timelineVersionSavedObject != null ? timelineVersionSavedObject : undefined
           ),
@@ -147,7 +148,7 @@ export class Note {
           await savedObjectsClient.update(
             noteSavedObjectType,
             noteId,
-            pickSavedNote(noteId, note, request[internalFrameworkRequest].auth || null),
+            pickSavedNote(noteId, note, request.user),
             {
               version: version || undefined,
             }
@@ -220,17 +221,17 @@ const convertSavedObjectToSavedNote = (
 const pickSavedNote = (
   noteId: string | null,
   savedNote: SavedNote,
-  userInfo: RequestAuth
+  userInfo: AuthenticatedUser | null
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): any => {
   if (noteId == null) {
     savedNote.created = new Date().valueOf();
-    savedNote.createdBy = getOr(null, 'credentials.username', userInfo);
+    savedNote.createdBy = userInfo?.username ?? UNAUTHENTICATED_USER;
     savedNote.updated = new Date().valueOf();
-    savedNote.updatedBy = getOr(null, 'credentials.username', userInfo);
+    savedNote.updatedBy = userInfo?.username ?? UNAUTHENTICATED_USER;
   } else if (noteId != null) {
     savedNote.updated = new Date().valueOf();
-    savedNote.updatedBy = getOr(null, 'credentials.username', userInfo);
+    savedNote.updatedBy = userInfo?.username ?? UNAUTHENTICATED_USER;
   }
   return savedNote;
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/pinned_event/saved_object.ts b/x-pack/legacy/plugins/siem/server/lib/pinned_event/saved_object.ts
index 177eb05d8539d..afa3595a09e1c 100644
--- a/x-pack/legacy/plugins/siem/server/lib/pinned_event/saved_object.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/pinned_event/saved_object.ts
@@ -5,15 +5,15 @@
  */
 
 import { failure } from 'io-ts/lib/PathReporter';
-import { RequestAuth } from 'hapi';
 import { getOr } from 'lodash/fp';
-
-import { SavedObjectsFindOptions } from 'src/core/server';
-
 import { pipe } from 'fp-ts/lib/pipeable';
 import { map, fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
-import { FrameworkRequest, internalFrameworkRequest } from '../framework';
+
+import { SavedObjectsFindOptions } from '../../../../../../../src/core/server';
+import { AuthenticatedUser } from '../../../../../../plugins/security/common/model';
+import { UNAUTHENTICATED_USER } from '../../../common/constants';
+import { FrameworkRequest } from '../framework';
 import {
   PinnedEventSavedObject,
   PinnedEventSavedObjectRuntimeType,
@@ -103,7 +103,7 @@ export class PinnedEvent {
                 const timelineResult = convertSavedObjectToSavedTimeline(
                   await savedObjectsClient.create(
                     timelineSavedObjectType,
-                    pickSavedTimeline(null, {}, request[internalFrameworkRequest].auth || null)
+                    pickSavedTimeline(null, {}, request.user || null)
                   )
                 );
                 timelineId = timelineResult.savedObjectId; // eslint-disable-line no-param-reassign
@@ -125,11 +125,7 @@ export class PinnedEvent {
             return convertSavedObjectToSavedPinnedEvent(
               await savedObjectsClient.create(
                 pinnedEventSavedObjectType,
-                pickSavedPinnedEvent(
-                  pinnedEventId,
-                  savedPinnedEvent,
-                  request[internalFrameworkRequest].auth || null
-                )
+                pickSavedPinnedEvent(pinnedEventId, savedPinnedEvent, request.user || null)
               ),
               timelineVersionSavedObject != null ? timelineVersionSavedObject : undefined
             );
@@ -211,17 +207,18 @@ const convertSavedObjectToSavedPinnedEvent = (
 const pickSavedPinnedEvent = (
   pinnedEventId: string | null,
   savedPinnedEvent: SavedPinnedEvent,
-  userInfo: RequestAuth
+  userInfo: AuthenticatedUser | null
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): any => {
+  const dateNow = new Date().valueOf();
   if (pinnedEventId == null) {
-    savedPinnedEvent.created = new Date().valueOf();
-    savedPinnedEvent.createdBy = getOr(null, 'credentials.username', userInfo);
-    savedPinnedEvent.updated = new Date().valueOf();
-    savedPinnedEvent.updatedBy = getOr(null, 'credentials.username', userInfo);
+    savedPinnedEvent.created = dateNow;
+    savedPinnedEvent.createdBy = userInfo?.username ?? UNAUTHENTICATED_USER;
+    savedPinnedEvent.updated = dateNow;
+    savedPinnedEvent.updatedBy = userInfo?.username ?? UNAUTHENTICATED_USER;
   } else if (pinnedEventId != null) {
-    savedPinnedEvent.updated = new Date().valueOf();
-    savedPinnedEvent.updatedBy = getOr(null, 'credentials.username', userInfo);
+    savedPinnedEvent.updated = dateNow;
+    savedPinnedEvent.updatedBy = userInfo?.username ?? UNAUTHENTICATED_USER;
   }
   return savedPinnedEvent;
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/pick_saved_timeline.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/pick_saved_timeline.ts
index 9e4916e201d44..5b60086ae81b6 100644
--- a/x-pack/legacy/plugins/siem/server/lib/timeline/pick_saved_timeline.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/pick_saved_timeline.ts
@@ -4,24 +4,25 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RequestAuth } from 'hapi';
-import { getOr } from 'lodash/fp';
+import { AuthenticatedUser } from '../../../../../../plugins/security/common/model';
+import { UNAUTHENTICATED_USER } from '../../../common/constants';
 import { SavedTimeline } from './types';
 
 export const pickSavedTimeline = (
   timelineId: string | null,
   savedTimeline: SavedTimeline,
-  userInfo: RequestAuth
+  userInfo: AuthenticatedUser | null
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): any => {
+  const dateNow = new Date().valueOf();
   if (timelineId == null) {
-    savedTimeline.created = new Date().valueOf();
-    savedTimeline.createdBy = getOr(null, 'credentials.username', userInfo);
-    savedTimeline.updated = new Date().valueOf();
-    savedTimeline.updatedBy = getOr(null, 'credentials.username', userInfo);
+    savedTimeline.created = dateNow;
+    savedTimeline.createdBy = userInfo?.username ?? UNAUTHENTICATED_USER;
+    savedTimeline.updated = dateNow;
+    savedTimeline.updatedBy = userInfo?.username ?? UNAUTHENTICATED_USER;
   } else if (timelineId != null) {
-    savedTimeline.updated = new Date().valueOf();
-    savedTimeline.updatedBy = getOr(null, 'credentials.username', userInfo);
+    savedTimeline.updated = dateNow;
+    savedTimeline.updatedBy = userInfo?.username ?? UNAUTHENTICATED_USER;
   }
   return savedTimeline;
 };
diff --git a/x-pack/legacy/plugins/siem/server/lib/timeline/saved_object.ts b/x-pack/legacy/plugins/siem/server/lib/timeline/saved_object.ts
index 04c1584f1204d..4b78a7bd3d06d 100644
--- a/x-pack/legacy/plugins/siem/server/lib/timeline/saved_object.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/timeline/saved_object.ts
@@ -6,8 +6,8 @@
 
 import { getOr } from 'lodash/fp';
 
-import { SavedObjectsFindOptions } from 'src/core/server';
-
+import { SavedObjectsFindOptions } from '../../../../../../../src/core/server';
+import { UNAUTHENTICATED_USER } from '../../../common/constants';
 import {
   ResponseTimeline,
   PageInfoTimeline,
@@ -15,16 +15,15 @@ import {
   ResponseFavoriteTimeline,
   TimelineResult,
 } from '../../graphql/types';
-import { FrameworkRequest, internalFrameworkRequest } from '../framework';
+import { FrameworkRequest } from '../framework';
+import { Note } from '../note/saved_object';
 import { NoteSavedObject } from '../note/types';
 import { PinnedEventSavedObject } from '../pinned_event/types';
-
-import { SavedTimeline, TimelineSavedObject } from './types';
-import { Note } from '../note/saved_object';
 import { PinnedEvent } from '../pinned_event/saved_object';
-import { timelineSavedObjectType } from './saved_object_mappings';
-import { pickSavedTimeline } from './pick_saved_timeline';
 import { convertSavedObjectToSavedTimeline } from './convert_saved_object_to_savedtimeline';
+import { pickSavedTimeline } from './pick_saved_timeline';
+import { timelineSavedObjectType } from './saved_object_mappings';
+import { SavedTimeline, TimelineSavedObject } from './types';
 
 interface ResponseTimelines {
   timeline: TimelineSavedObject[];
@@ -68,8 +67,8 @@ export class Timeline {
     request: FrameworkRequest,
     timelineId: string | null
   ): Promise<ResponseFavoriteTimeline> {
-    const userName = getOr(null, 'credentials.username', request[internalFrameworkRequest].auth);
-    const fullName = getOr(null, 'credentials.fullname', request[internalFrameworkRequest].auth);
+    const userName = request.user?.username ?? UNAUTHENTICATED_USER;
+    const fullName = request.user?.full_name ?? '';
     try {
       let timeline: SavedTimeline = {};
       if (timelineId != null) {
@@ -149,11 +148,7 @@ export class Timeline {
           timeline: convertSavedObjectToSavedTimeline(
             await savedObjectsClient.create(
               timelineSavedObjectType,
-              pickSavedTimeline(
-                timelineId,
-                timeline,
-                request[internalFrameworkRequest].auth || null
-              )
+              pickSavedTimeline(timelineId, timeline, request.user)
             )
           ),
         };
@@ -162,7 +157,7 @@ export class Timeline {
       await savedObjectsClient.update(
         timelineSavedObjectType,
         timelineId,
-        pickSavedTimeline(timelineId, timeline, request[internalFrameworkRequest].auth || null),
+        pickSavedTimeline(timelineId, timeline, request.user),
         {
           version: version || undefined,
         }
@@ -217,7 +212,7 @@ export class Timeline {
   }
 
   private async getSavedTimeline(request: FrameworkRequest, timelineId: string) {
-    const userName = getOr(null, 'credentials.username', request[internalFrameworkRequest].auth);
+    const userName = request.user?.username ?? UNAUTHENTICATED_USER;
 
     const savedObjectsClient = request.context.core.savedObjects.client;
     const savedObject = await savedObjectsClient.get(timelineSavedObjectType, timelineId);
@@ -234,7 +229,7 @@ export class Timeline {
   }
 
   private async getAllSavedTimeline(request: FrameworkRequest, options: SavedObjectsFindOptions) {
-    const userName = getOr(null, 'credentials.username', request[internalFrameworkRequest].auth);
+    const userName = request.user?.username ?? UNAUTHENTICATED_USER;
     const savedObjectsClient = request.context.core.savedObjects.client;
     if (options.searchFields != null && options.searchFields.includes('favorite.keySearch')) {
       options.search = `${options.search != null ? options.search : ''} ${
diff --git a/x-pack/legacy/plugins/siem/server/lib/types.ts b/x-pack/legacy/plugins/siem/server/lib/types.ts
index 9e4e477aa78d2..9034ab4e6af83 100644
--- a/x-pack/legacy/plugins/siem/server/lib/types.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/types.ts
@@ -23,10 +23,12 @@ import { Note } from './note/saved_object';
 import { PinnedEvent } from './pinned_event/saved_object';
 import { Timeline } from './timeline/saved_object';
 import { TLS } from './tls';
+import { Alerts } from './alerts';
 
 export * from './hosts';
 
 export interface AppDomainLibs {
+  alerts: Alerts;
   anomalies: Anomalies;
   authentications: Authentications;
   events: Events;
diff --git a/x-pack/legacy/plugins/siem/server/plugin.ts b/x-pack/legacy/plugins/siem/server/plugin.ts
index 25fa3bd6cde4c..8a47aa2a27082 100644
--- a/x-pack/legacy/plugins/siem/server/plugin.ts
+++ b/x-pack/legacy/plugins/siem/server/plugin.ts
@@ -6,6 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { CoreSetup, PluginInitializerContext, Logger } from 'src/core/server';
+import { PluginSetupContract as SecurityPlugin } from '../../../../plugins/security/server';
 import { PluginSetupContract as FeaturesSetupContract } from '../../../../plugins/features/server';
 import { initServer } from './init_server';
 import { compose } from './lib/compose/kibana';
@@ -15,8 +16,11 @@ import {
   timelineSavedObjectType,
 } from './saved_objects';
 
+export type SiemPluginSecurity = Pick<SecurityPlugin, 'authc'>;
+
 export interface PluginsSetup {
   features: FeaturesSetupContract;
+  security: SiemPluginSecurity;
 }
 
 export class Plugin {
@@ -33,7 +37,6 @@ export class Plugin {
 
   public setup(core: CoreSetup, plugins: PluginsSetup) {
     this.logger.debug('Shim plugin setup');
-
     plugins.features.registerFeature({
       id: this.name,
       name: i18n.translate('xpack.siem.featureRegistry.linkSiemTitle', {
@@ -75,7 +78,7 @@ export class Plugin {
       },
     });
 
-    const libs = compose(core, this.context.env);
+    const libs = compose(core, plugins, this.context.env);
     initServer(libs);
   }
 }
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 effab0fcadf4d..aa659441043ae 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
@@ -17,15 +17,25 @@ import {
 } from './helpers';
 import { HomeTestBed } from './helpers/home.helpers';
 import { REPOSITORY_NAME } from './helpers/constant';
-import moment from 'moment-timezone';
 
 const { setup } = pageHelpers.home;
 
+jest.mock('ui/new_platform');
+
 jest.mock('ui/i18n', () => {
   const I18nContext = ({ children }: any) => children;
   return { I18nContext };
 });
 
+// Mocking FormattedDate and FormattedTime due to timezone differences on CI
+jest.mock('@kbn/i18n/react', () => {
+  return {
+    ...jest.requireActual('@kbn/i18n/react'),
+    FormattedDate: () => '',
+    FormattedTime: () => '',
+  };
+});
+
 const removeWhiteSpaceOnArrayValues = (array: any[]) =>
   array.map(value => {
     if (!value.trim) {
@@ -34,9 +44,7 @@ const removeWhiteSpaceOnArrayValues = (array: any[]) =>
     return value.trim();
   });
 
-// We need to skip the tests until react 16.9.0 is released
-// which supports asynchronous code inside act()
-describe.skip('<SnapshotRestoreHome />', () => {
+describe('<SnapshotRestoreHome />', () => {
   const { server, httpRequestsMockHelpers } = setupEnvironment();
   let testBed: HomeTestBed;
 
@@ -454,12 +462,10 @@ describe.skip('<SnapshotRestoreHome />', () => {
 
       test('should list them in the table', async () => {
         const { table } = testBed;
-
         const { tableCellsValues } = table.getMetaData('snapshotTable');
+
         tableCellsValues.forEach((row, i) => {
           const snapshot = snapshots[i];
-          const startTime = moment(new Date(snapshot.startTimeInMillis));
-          const timezone = moment.tz.guess();
 
           expect(row).toEqual([
             '', // Checkbox
@@ -468,7 +474,7 @@ describe.skip('<SnapshotRestoreHome />', () => {
             snapshot.indices.length.toString(), // Indices
             snapshot.shards.total.toString(), // Shards
             snapshot.shards.failed.toString(), // Failed shards
-            startTime.tz(timezone).format('MMMM D, YYYY h:mm A z'), // Start time
+            ' ', // Mocked start time
             `${Math.ceil(snapshot.durationInMillis / 1000).toString()}s`, // Duration
             '',
           ]);
@@ -596,19 +602,9 @@ describe.skip('<SnapshotRestoreHome />', () => {
 
             describe('summary tab', () => {
               test('should set the correct summary values', () => {
-                const {
-                  version,
-                  versionId,
-                  uuid,
-                  indices,
-                  endTimeInMillis,
-                  startTimeInMillis,
-                } = snapshot1;
+                const { version, versionId, uuid, indices } = snapshot1;
 
                 const { find } = testBed;
-                const startTime = moment(new Date(startTimeInMillis));
-                const endTime = moment(new Date(endTimeInMillis));
-                const timezone = moment.tz.guess();
 
                 expect(find('snapshotDetail.version.value').text()).toBe(
                   `${version} / ${versionId}`
@@ -622,12 +618,6 @@ describe.skip('<SnapshotRestoreHome />', () => {
                 expect(find('snapshotDetail.indices.value').text()).toContain(
                   indices.splice(0, 10).join('')
                 );
-                expect(find('snapshotDetail.startTime.value').text()).toBe(
-                  startTime.tz(timezone).format('MMMM D, YYYY h:mm A z')
-                );
-                expect(find('snapshotDetail.endTime.value').text()).toBe(
-                  endTime.tz(timezone).format('MMMM D, YYYY h:mm A z')
-                );
               });
 
               test('should indicate the different snapshot states', async () => {
diff --git a/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts b/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts
index 3dc7d94ce67d5..09757c4774314 100644
--- a/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts
@@ -27,9 +27,7 @@ const MAX_COUNT = '10';
 const EXPIRE_AFTER_VALUE = '30';
 const repository = fixtures.getRepository({ name: `a${getRandomString()}`, type: 'fs' });
 
-// We need to skip the tests until react 16.9.0 is released
-// which supports asynchronous code inside act()
-describe.skip('<PolicyAdd />', () => {
+describe('<PolicyAdd />', () => {
   let testBed: PolicyFormTestBed;
 
   const { server, httpRequestsMockHelpers } = setupEnvironment();
@@ -195,6 +193,7 @@ describe.skip('<PolicyAdd />', () => {
 
         const expected = {
           config: {},
+          isManagedPolicy: false,
           name: POLICY_NAME,
           repository: repository.name,
           retention: {
diff --git a/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/policy_edit.test.ts b/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/policy_edit.test.ts
index e14a080137c60..a5af9e5e5c3aa 100644
--- a/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/policy_edit.test.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/policy_edit.test.ts
@@ -11,6 +11,8 @@ import { PolicyForm } from '../../public/app/components/policy_form';
 import { PolicyFormTestBed } from './helpers/policy_form.helpers';
 import { POLICY_EDIT } from './helpers/constant';
 
+jest.mock('ui/new_platform');
+
 const { setup } = pageHelpers.policyEdit;
 const { setup: setupPolicyAdd } = pageHelpers.policyAdd;
 
@@ -22,9 +24,7 @@ jest.mock('ui/i18n', () => {
   return { I18nContext };
 });
 
-// We need to skip the tests until react 16.9.0 is released
-// which supports asynchronous code inside act()
-describe.skip('<PolicyEdit />', () => {
+describe('<PolicyEdit />', () => {
   let testBed: PolicyFormTestBed;
   let testBedPolicyAdd: PolicyFormTestBed;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
diff --git a/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/repository_add.test.ts b/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/repository_add.test.ts
index df250159c7f69..82c090bc552bb 100644
--- a/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/repository_add.test.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/repository_add.test.ts
@@ -11,6 +11,8 @@ import { RepositoryType } from '../../common/types';
 import { setupEnvironment, pageHelpers, nextTick } from './helpers';
 import { RepositoryAddTestBed } from './helpers/repository_add.helpers';
 
+jest.mock('ui/new_platform');
+
 const { setup } = pageHelpers.repositoryAdd;
 const repositoryTypes = ['fs', 'url', 'source', 'azure', 'gcs', 's3', 'hdfs'];
 
@@ -19,9 +21,7 @@ jest.mock('ui/i18n', () => {
   return { I18nContext };
 });
 
-// We need to skip the tests until react 16.9.0 is released
-// which supports asynchronous code inside act()
-describe.skip('<RepositoryAdd />', () => {
+describe('<RepositoryAdd />', () => {
   let testBed: RepositoryAddTestBed;
 
   const { server, httpRequestsMockHelpers } = setupEnvironment();
@@ -213,7 +213,7 @@ describe.skip('<RepositoryAdd />', () => {
 
         // Fill step 2
         form.setInputValue('locationInput', repository.settings.location);
-        form.selectCheckBox('compressToggle');
+        form.toggleEuiSwitch('compressToggle');
 
         await act(async () => {
           actions.clickSubmitButton();
@@ -238,7 +238,7 @@ describe.skip('<RepositoryAdd />', () => {
         const { component, form, actions, find, exists } = testBed;
 
         form.setInputValue('locationInput', repository.settings.location);
-        form.selectCheckBox('compressToggle');
+        form.toggleEuiSwitch('compressToggle');
 
         const error = {
           status: 400,
@@ -264,7 +264,7 @@ describe.skip('<RepositoryAdd />', () => {
         // Fill step 1 required fields and go to step 2
         testBed.form.setInputValue('nameInput', repository.name);
         testBed.actions.selectRepositoryType(repository.type);
-        testBed.form.selectCheckBox('sourceOnlyToggle'); // toggle source
+        testBed.form.toggleEuiSwitch('sourceOnlyToggle'); // toggle source
         testBed.actions.clickNextButton();
       });
 
diff --git a/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/repository_edit.test.ts b/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/repository_edit.test.ts
index ef74482fc9de7..b850114115893 100644
--- a/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/repository_edit.test.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/__jest__/client_integration/repository_edit.test.ts
@@ -12,6 +12,8 @@ import { RepositoryEditTestSubjects } from './helpers/repository_edit.helpers';
 import { RepositoryAddTestSubjects } from './helpers/repository_add.helpers';
 import { REPOSITORY_EDIT } from './helpers/constant';
 
+jest.mock('ui/new_platform');
+
 const { setup } = pageHelpers.repositoryEdit;
 const { setup: setupRepositoryAdd } = pageHelpers.repositoryAdd;
 
@@ -20,9 +22,7 @@ jest.mock('ui/i18n', () => {
   return { I18nContext };
 });
 
-// We need to skip the tests until react 16.9.0 is released
-// which supports asynchronous code inside act()
-describe.skip('<RepositoryEdit />', () => {
+describe('<RepositoryEdit />', () => {
   let testBed: TestBed<RepositoryEditTestSubjects>;
   let testBedRepositoryAdd: TestBed<RepositoryAddTestSubjects>;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
@@ -99,7 +99,7 @@ describe.skip('<RepositoryEdit />', () => {
       const { find } = testBed;
 
       expect(find('locationInput').props().defaultValue).toBe(settings.location);
-      expect(find('compressToggle').props().checked).toBe(settings.compress);
+      expect(find('compressToggle').props()['aria-checked']).toBe(settings.compress);
       expect(find('chunkSizeInput').props().defaultValue).toBe(settings.chunkSize);
       expect(find('maxSnapshotBytesInput').props().defaultValue).toBe(
         settings.maxSnapshotBytesPerSec
@@ -107,7 +107,7 @@ describe.skip('<RepositoryEdit />', () => {
       expect(find('maxRestoreBytesInput').props().defaultValue).toBe(
         settings.maxRestoreBytesPerSec
       );
-      expect(find('readOnlyToggle').props().checked).toBe(settings.readonly);
+      expect(find('readOnlyToggle').props()['aria-checked']).toBe(settings.readonly);
     });
 
     it('readonly repository', async () => {
@@ -143,7 +143,7 @@ describe.skip('<RepositoryEdit />', () => {
       expect(find('clientInput').props().defaultValue).toBe(settings.client);
       expect(find('containerInput').props().defaultValue).toBe(settings.container);
       expect(find('basePathInput').props().defaultValue).toBe(settings.basePath);
-      expect(find('compressToggle').props().checked).toBe(settings.compress);
+      expect(find('compressToggle').props()['aria-checked']).toBe(settings.compress);
       expect(find('chunkSizeInput').props().defaultValue).toBe(settings.chunkSize);
       expect(find('maxSnapshotBytesInput').props().defaultValue).toBe(
         settings.maxSnapshotBytesPerSec
@@ -152,7 +152,7 @@ describe.skip('<RepositoryEdit />', () => {
         settings.maxRestoreBytesPerSec
       );
       expect(find('locationModeSelect').props().value).toBe(settings.locationMode);
-      expect(find('readOnlyToggle').props().checked).toBe(settings.readonly);
+      expect(find('readOnlyToggle').props()['aria-checked']).toBe(settings.readonly);
     });
 
     it('gcs repository', async () => {
@@ -174,7 +174,7 @@ describe.skip('<RepositoryEdit />', () => {
       expect(find('clientInput').props().defaultValue).toBe(settings.client);
       expect(find('bucketInput').props().defaultValue).toBe(settings.bucket);
       expect(find('basePathInput').props().defaultValue).toBe(settings.basePath);
-      expect(find('compressToggle').props().checked).toBe(settings.compress);
+      expect(find('compressToggle').props()['aria-checked']).toBe(settings.compress);
       expect(find('chunkSizeInput').props().defaultValue).toBe(settings.chunkSize);
       expect(find('maxSnapshotBytesInput').props().defaultValue).toBe(
         settings.maxSnapshotBytesPerSec
@@ -182,7 +182,7 @@ describe.skip('<RepositoryEdit />', () => {
       expect(find('maxRestoreBytesInput').props().defaultValue).toBe(
         settings.maxRestoreBytesPerSec
       );
-      expect(find('readOnlyToggle').props().checked).toBe(settings.readonly);
+      expect(find('readOnlyToggle').props()['aria-checked']).toBe(settings.readonly);
     });
 
     it('hdfs repository', async () => {
@@ -207,8 +207,8 @@ describe.skip('<RepositoryEdit />', () => {
 
       expect(find('uriInput').props().defaultValue).toBe('elastic.co');
       expect(find('pathInput').props().defaultValue).toBe(settings.path);
-      expect(find('loadDefaultsToggle').props().checked).toBe(settings.loadDefault);
-      expect(find('compressToggle').props().checked).toBe(settings.compress);
+      expect(find('loadDefaultsToggle').props()['aria-checked']).toBe(settings.loadDefault);
+      expect(find('compressToggle').props()['aria-checked']).toBe(settings.compress);
       expect(find('chunkSizeInput').props().defaultValue).toBe(settings.chunkSize);
       expect(find('securityPrincipalInput').props().defaultValue).toBe(
         settings['security.principal']
@@ -219,7 +219,7 @@ describe.skip('<RepositoryEdit />', () => {
       expect(find('maxRestoreBytesInput').props().defaultValue).toBe(
         settings.maxRestoreBytesPerSec
       );
-      expect(find('readOnlyToggle').props().checked).toBe(settings.readonly);
+      expect(find('readOnlyToggle').props()['aria-checked']).toBe(settings.readonly);
 
       const codeEditor = testBed.component.find('EuiCodeEditor');
       expect(JSON.parse(codeEditor.props().value as string)).toEqual({
@@ -252,9 +252,9 @@ describe.skip('<RepositoryEdit />', () => {
       expect(find('clientInput').props().defaultValue).toBe(settings.client);
       expect(find('bucketInput').props().defaultValue).toBe(settings.bucket);
       expect(find('basePathInput').props().defaultValue).toBe(settings.basePath);
-      expect(find('compressToggle').props().checked).toBe(settings.compress);
+      expect(find('compressToggle').props()['aria-checked']).toBe(settings.compress);
       expect(find('chunkSizeInput').props().defaultValue).toBe(settings.chunkSize);
-      expect(find('serverSideEncryptionToggle').props().checked).toBe(
+      expect(find('serverSideEncryptionToggle').props()['aria-checked']).toBe(
         settings.serverSideEncryption
       );
       expect(find('bufferSizeInput').props().defaultValue).toBe(settings.bufferSize);
@@ -266,7 +266,7 @@ describe.skip('<RepositoryEdit />', () => {
       expect(find('maxRestoreBytesInput').props().defaultValue).toBe(
         settings.maxRestoreBytesPerSec
       );
-      expect(find('readOnlyToggle').props().checked).toBe(settings.readonly);
+      expect(find('readOnlyToggle').props()['aria-checked']).toBe(settings.readonly);
     });
   });
 });
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 e08753c55bf7b..0a5e9558f91af 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
@@ -304,7 +304,7 @@ export const PolicyTable: React.FunctionComponent<Props> = ({
   const sorting = {
     sort: {
       field: 'name',
-      direction: 'asc',
+      direction: 'asc' as const,
     },
   };
 
@@ -394,7 +394,7 @@ export const PolicyTable: React.FunctionComponent<Props> = ({
     },
     filters: [
       {
-        type: 'field_value_selection',
+        type: 'field_value_selection' as const,
         field: 'repository',
         name: i18n.translate('xpack.snapshotRestore.policyList.table.repositoryFilterLabel', {
           defaultMessage: 'Repository',
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 dbbc0e09111eb..e387e844bda8c 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
@@ -135,7 +135,7 @@ export const RepositoryList: React.FunctionComponent<RouteComponentProps<MatchPa
     content = (
       <RepositoryTable
         repositories={repositories || []}
-        managedRepository={managedRepository.name}
+        managedRepository={managedRepository?.name}
         reload={reload}
         openRepositoryDetailsUrl={openRepositoryDetailsUrl}
         onRepositoryDeleted={onRepositoryDeleted}
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 a780f96d8ec26..4b5270b44d593 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
@@ -174,7 +174,7 @@ export const RepositoryTable: React.FunctionComponent<Props> = ({
   const sorting = {
     sort: {
       field: 'name',
-      direction: 'asc',
+      direction: 'asc' as const,
     },
   };
 
@@ -268,7 +268,7 @@ export const RepositoryTable: React.FunctionComponent<Props> = ({
     },
     filters: [
       {
-        type: 'field_value_selection',
+        type: 'field_value_selection' as const,
         field: 'type',
         name: i18n.translate('xpack.snapshotRestore.repositoryList.table.typeFilterLabel', {
           defaultMessage: 'Type',
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_table/shards_table.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_table/shards_table.tsx
index e85d3b4a465f7..912840b602310 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_table/shards_table.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/restore_list/restore_table/shards_table.tsx
@@ -193,6 +193,7 @@ export const ShardsTable: React.FunctionComponent<Props> = ({ shards }) => {
     <EuiBasicTable
       className="snapshotRestore__shardsTable"
       compressed={true}
+      // @ts-ignore `shards` is a Partial<> but this component treats a number of fields as required
       items={shards}
       columns={columns}
     />
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_table/snapshot_table.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_table/snapshot_table.tsx
index d85d86ee6425f..880ae874fe50e 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_table/snapshot_table.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/home/snapshot_list/snapshot_table/snapshot_table.tsx
@@ -263,7 +263,7 @@ export const SnapshotTable: React.FunctionComponent<Props> = ({
   const sorting = {
     sort: {
       field: 'startTimeInMillis',
-      direction: 'desc',
+      direction: 'desc' as const,
     },
   };
 
@@ -354,7 +354,7 @@ export const SnapshotTable: React.FunctionComponent<Props> = ({
     },
     filters: [
       {
-        type: 'field_value_selection',
+        type: 'field_value_selection' as const,
         field: 'repository',
         name: i18n.translate('xpack.snapshotRestore.snapshotList.table.repositoryFilterLabel', {
           defaultMessage: 'Repository',
diff --git a/x-pack/legacy/plugins/spaces/index.ts b/x-pack/legacy/plugins/spaces/index.ts
index 0083847cfb441..934b44b4accaf 100644
--- a/x-pack/legacy/plugins/spaces/index.ts
+++ b/x-pack/legacy/plugins/spaces/index.ts
@@ -49,12 +49,12 @@ export const spaces = (kibana: Record<string, any>) =>
 
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-      managementSections: ['plugins/spaces/views/management'],
+      managementSections: [],
       apps: [
         {
           id: 'space_selector',
           title: 'Spaces',
-          main: 'plugins/spaces/views/space_selector',
+          main: 'plugins/spaces/space_selector',
           url: 'space_selector',
           hidden: true,
         },
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
new file mode 100644
index 0000000000000..aa3c6acf26236
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.test.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { AdvancedSettingsService } from './advanced_settings_service';
+jest.mock('ui/management', () => {
+  return {
+    PAGE_TITLE_COMPONENT: 'page_title_component',
+    PAGE_SUBTITLE_COMPONENT: 'page_subtitle_component',
+  };
+});
+
+describe('Advanced Settings Service', () => {
+  describe('#setup', () => {
+    it('registers space-aware components to augment the advanced settings screen', () => {
+      const deps = {
+        getActiveSpace: jest.fn().mockResolvedValue({ id: 'foo', name: 'foo-space' }),
+        registerSettingsComponent: jest.fn(),
+      };
+
+      const advancedSettingsService = new AdvancedSettingsService();
+      advancedSettingsService.setup(deps);
+
+      expect(deps.registerSettingsComponent).toHaveBeenCalledTimes(2);
+      expect(deps.registerSettingsComponent).toHaveBeenCalledWith(
+        'page_title_component',
+        expect.any(Function),
+        true
+      );
+
+      expect(deps.registerSettingsComponent).toHaveBeenCalledWith(
+        'page_subtitle_component',
+        expect.any(Function),
+        true
+      );
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.tsx
new file mode 100644
index 0000000000000..9c6c2fcc2cdda
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/advanced_settings_service.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 { PAGE_TITLE_COMPONENT, PAGE_SUBTITLE_COMPONENT } from 'ui/management';
+import { Space } from '../../common/model/space';
+import { AdvancedSettingsTitle, AdvancedSettingsSubtitle } from './components';
+
+interface SetupDeps {
+  getActiveSpace: () => Promise<Space>;
+  registerSettingsComponent: (
+    id: string,
+    component: string | React.FC<any>,
+    allowOverride: boolean
+  ) => void;
+}
+
+export class AdvancedSettingsService {
+  public setup({ getActiveSpace, registerSettingsComponent }: SetupDeps) {
+    const PageTitle = () => <AdvancedSettingsTitle getActiveSpace={getActiveSpace} />;
+    const SubTitle = () => <AdvancedSettingsSubtitle getActiveSpace={getActiveSpace} />;
+
+    registerSettingsComponent(PAGE_TITLE_COMPONENT, PageTitle, true);
+    registerSettingsComponent(PAGE_SUBTITLE_COMPONENT, SubTitle, true);
+  }
+}
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
similarity index 80%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
index 49f5233db44e2..7134049c4cf8f 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.test.tsx
@@ -4,9 +4,10 @@
  * 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 { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
 import { AdvancedSettingsSubtitle } from './advanced_settings_subtitle';
 import { EuiCallOut } from '@elastic/eui';
+import { act } from '@testing-library/react';
 
 describe('AdvancedSettingsSubtitle', () => {
   it('renders as expected', async () => {
@@ -21,10 +22,10 @@ describe('AdvancedSettingsSubtitle', () => {
     );
 
     // Wait for active space to resolve before requesting the component to update
-    await Promise.resolve();
-    await Promise.resolve();
-
-    wrapper.update();
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
 
     expect(wrapper.find(EuiCallOut)).toHaveLength(1);
   });
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
index 433f8a8ccf0a2..e35d67c7214cf 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/advanced_settings_subtitle.tsx
@@ -7,7 +7,7 @@
 import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Fragment, useState, useEffect } from 'react';
-import { Space } from '../../../../../common/model/space';
+import { Space } from '../../../../common/model/space';
 
 interface Props {
   getActiveSpace: () => Promise<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_subtitle/index.ts
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_subtitle/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx
new file mode 100644
index 0000000000000..b772ff433abec
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.test.tsx
@@ -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 React from 'react';
+import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
+import { AdvancedSettingsTitle } from './advanced_settings_title';
+import { SpaceAvatar } from '../../../space_avatar';
+import { act } from '@testing-library/react';
+
+describe('AdvancedSettingsTitle', () => {
+  it('renders without crashing', async () => {
+    const space = {
+      id: 'my-space',
+      name: 'My Space',
+      disabledFeatures: [],
+    };
+
+    const wrapper = mountWithIntl(
+      <AdvancedSettingsTitle getActiveSpace={() => Promise.resolve(space)} />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find(SpaceAvatar)).toHaveLength(1);
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.tsx b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.tsx
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.tsx
index af6fa42cce07b..b74524db81d81 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.tsx
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/advanced_settings_title.tsx
@@ -7,8 +7,8 @@
 import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { useState, useEffect } from 'react';
-import { Space } from '../../../../../common/model/space';
-import { SpaceAvatar } from '../../../../components';
+import { Space } from '../../../../../../../plugins/spaces/common/model/space';
+import { SpaceAvatar } from '../../../space_avatar';
 
 interface Props {
   getActiveSpace: () => Promise<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/index.ts
rename to x-pack/legacy/plugins/spaces/public/advanced_settings/components/advanced_settings_title/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/components/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/components/index.ts
new file mode 100644
index 0000000000000..6678be7fa34e4
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/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 { AdvancedSettingsSubtitle } from './advanced_settings_subtitle';
+export { AdvancedSettingsTitle } from './advanced_settings_title';
diff --git a/x-pack/legacy/plugins/spaces/public/advanced_settings/index.ts b/x-pack/legacy/plugins/spaces/public/advanced_settings/index.ts
new file mode 100644
index 0000000000000..546831a84fa82
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/advanced_settings/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 { AdvancedSettingsService } from './advanced_settings_service';
diff --git a/x-pack/legacy/plugins/spaces/public/components/index.ts b/x-pack/legacy/plugins/spaces/public/components/index.ts
deleted file mode 100644
index 2e73f0c704f8c..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/components/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 { SpaceAvatar } from './space_avatar';
-export { ManageSpacesButton } from './manage_spaces_button';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/constants.ts b/x-pack/legacy/plugins/spaces/public/constants.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/constants.ts
rename to x-pack/legacy/plugins/spaces/public/constants.ts
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/_index.scss b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/_index.scss
new file mode 100644
index 0000000000000..30ac0c9fe9b27
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/_index.scss
@@ -0,0 +1 @@
+@import './components/index';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/_index.scss b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_copy_to_space.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/_index.scss
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_copy_to_space.scss
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_index.scss b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_index.scss
new file mode 100644
index 0000000000000..92b19a8c8c6a3
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/_index.scss
@@ -0,0 +1 @@
+@import './copy_to_space';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_indicator.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_indicator.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
index f9da25409d60e..ff9035ff02be5 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_indicator.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
@@ -7,10 +7,7 @@
 import React from 'react';
 import { EuiLoadingSpinner, EuiText, EuiIconTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  SummarizedCopyToSpaceResult,
-  SummarizedSavedObjectResult,
-} from '../../../../lib/copy_saved_objects_to_space';
+import { SummarizedCopyToSpaceResult, SummarizedSavedObjectResult } from '..';
 
 interface Props {
   summarizedCopyResult: SummarizedCopyToSpaceResult;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_summary_indicator.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_summary_indicator.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
index 0ad5f72ba3e45..9d73c216c73ce 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_status_summary_indicator.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { EuiLoadingSpinner, EuiIconTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { Space } from '../../../../../common/model/space';
-import { SummarizedCopyToSpaceResult } from '../../../../lib/copy_saved_objects_to_space';
+import { Space } from '../../../common/model/space';
+import { SummarizedCopyToSpaceResult } from '..';
 
 interface Props {
   space: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.test.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
similarity index 91%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.test.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
index 590c0edc0073b..28011911e212e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
@@ -5,21 +5,21 @@
  */
 import React from 'react';
 import Boom from 'boom';
-import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { mockManagementPlugin } from '../../../../../../../../../src/legacy/core_plugins/management/public/np_ready/mocks';
+import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
+import { mockManagementPlugin } from '../../../../../../../src/legacy/core_plugins/management/public/np_ready/mocks';
 import { CopySavedObjectsToSpaceFlyout } from './copy_to_space_flyout';
 import { CopyToSpaceForm } from './copy_to_space_form';
 import { EuiLoadingSpinner, EuiEmptyPrompt } from '@elastic/eui';
-import { Space } from '../../../../../common/model/space';
+import { Space } from '../../../common/model/space';
 import { findTestSubject } from 'test_utils/find_test_subject';
 import { SelectableSpacesControl } from './selectable_spaces_control';
 import { act } from '@testing-library/react';
 import { ProcessingCopyToSpace } from './processing_copy_to_space';
-import { spacesManagerMock } from '../../../../lib/mocks';
-import { SpacesManager } from '../../../../lib';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 import { ToastNotifications } from 'ui/notify/toasts/toast_notifications';
 
-jest.mock('../../../../../../../../../src/legacy/core_plugins/management/public/legacy', () => ({
+jest.mock('../../../../../../../src/legacy/core_plugins/management/public/legacy', () => ({
   setup: mockManagementPlugin.createSetupContract(),
   start: mockManagementPlugin.createStartContract(),
 }));
@@ -93,9 +93,10 @@ const setup = async (opts: SetupOpts = {}) => {
 
   if (!opts.returnBeforeSpacesLoad) {
     // Wait for spaces manager to complete and flyout to rerender
-    await Promise.resolve();
-    await Promise.resolve();
-    wrapper.update();
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
   }
 
   return { wrapper, onClose, mockSpacesManager, mockToastNotifications, savedObjectToCopy };
@@ -113,8 +114,10 @@ describe('CopyToSpaceFlyout', () => {
     expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(0);
     expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(1);
 
-    await Promise.resolve();
-    wrapper.update();
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
 
     expect(wrapper.find(CopyToSpaceForm)).toHaveLength(1);
     expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
@@ -160,14 +163,13 @@ describe('CopyToSpaceFlyout', () => {
     });
 
     const startButton = findTestSubject(wrapper, 'cts-initiate-button');
-    act(() => {
+
+    await act(async () => {
       startButton.simulate('click');
+      await nextTick();
+      wrapper.update();
     });
 
-    await Promise.resolve();
-
-    wrapper.update();
-
     expect(mockSpacesManager.copySavedObjects).toHaveBeenCalled();
     expect(mockToastNotifications.addError).toHaveBeenCalled();
   });
@@ -214,13 +216,13 @@ describe('CopyToSpaceFlyout', () => {
     });
 
     const startButton = findTestSubject(wrapper, 'cts-initiate-button');
-    act(() => {
+
+    await act(async () => {
       startButton.simulate('click');
+      await nextTick();
+      wrapper.update();
     });
 
-    await Promise.resolve();
-    wrapper.update();
-
     expect(mockSpacesManager.copySavedObjects).toHaveBeenCalled();
     expect(mockToastNotifications.addError).not.toHaveBeenCalled();
 
@@ -231,13 +233,13 @@ describe('CopyToSpaceFlyout', () => {
     overwriteButton.simulate('click');
 
     const finishButton = findTestSubject(wrapper, 'cts-finish-button');
-    act(() => {
+
+    await act(async () => {
       finishButton.simulate('click');
+      await nextTick();
+      wrapper.update();
     });
 
-    await Promise.resolve();
-    wrapper.update();
-
     expect(mockSpacesManager.resolveCopySavedObjectsErrors).toHaveBeenCalled();
     expect(mockToastNotifications.addError).toHaveBeenCalled();
   });
@@ -275,14 +277,13 @@ describe('CopyToSpaceFlyout', () => {
     });
 
     const startButton = findTestSubject(wrapper, 'cts-initiate-button');
-    act(() => {
+
+    await act(async () => {
       startButton.simulate('click');
+      await nextTick();
+      wrapper.update();
     });
 
-    await Promise.resolve();
-
-    wrapper.update();
-
     expect(mockSpacesManager.copySavedObjects).toHaveBeenCalledWith(
       [{ type: savedObjectToCopy.type, id: savedObjectToCopy.id }],
       ['space-1', 'space-2'],
@@ -350,14 +351,13 @@ describe('CopyToSpaceFlyout', () => {
     });
 
     const startButton = findTestSubject(wrapper, 'cts-initiate-button');
-    act(() => {
+
+    await act(async () => {
       startButton.simulate('click');
+      await nextTick();
+      wrapper.update();
     });
 
-    await Promise.resolve();
-
-    wrapper.update();
-
     expect(wrapper.find(CopyToSpaceForm)).toHaveLength(0);
     expect(wrapper.find(ProcessingCopyToSpace)).toHaveLength(1);
 
@@ -368,13 +368,13 @@ describe('CopyToSpaceFlyout', () => {
     overwriteButton.simulate('click');
 
     const finishButton = findTestSubject(wrapper, 'cts-finish-button');
-    act(() => {
+
+    await act(async () => {
       finishButton.simulate('click');
+      await nextTick();
+      wrapper.update();
     });
 
-    await Promise.resolve();
-    wrapper.update();
-
     expect(mockSpacesManager.resolveCopySavedObjectsErrors).toHaveBeenCalledWith(
       [{ type: savedObjectToCopy.type, id: savedObjectToCopy.id }],
       {
@@ -404,6 +404,7 @@ describe('CopyToSpaceFlyout', () => {
             id: 'my-viz',
             error: {
               type: 'missing_references',
+              blocking: [],
               references: [{ type: 'index-pattern', id: 'missing-index-pattern' }],
             },
           },
@@ -420,14 +421,13 @@ describe('CopyToSpaceFlyout', () => {
     });
 
     const startButton = findTestSubject(wrapper, 'cts-initiate-button');
-    act(() => {
+
+    await act(async () => {
       startButton.simulate('click');
+      await nextTick();
+      wrapper.update();
     });
 
-    await Promise.resolve();
-
-    wrapper.update();
-
     expect(wrapper.find(CopyToSpaceForm)).toHaveLength(0);
     expect(wrapper.find(ProcessingCopyToSpace)).toHaveLength(1);
 
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/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
index 5a43e5878ab83..f486f2f24f13d 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/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
@@ -22,17 +22,17 @@ import { mapValues } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { ToastNotifications } from 'ui/notify/toasts/toast_notifications';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
 import {
   ProcessedImportResponse,
   processImportResponse,
-} from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { Space } from '../../../../../common/model/space';
-import { SpacesManager } from '../../../../lib';
+} from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
+import { SpacesManager } from '../../spaces_manager';
 import { ProcessingCopyToSpace } from './processing_copy_to_space';
 import { CopyToSpaceFlyoutFooter } from './copy_to_space_flyout_footer';
 import { CopyToSpaceForm } from './copy_to_space_form';
-import { CopyOptions, ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { CopyOptions, ImportRetry } from '../types';
 
 interface Props {
   onClose: () => void;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout_footer.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout_footer.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
index 5853bebe3c669..56f39ce3ed4fb 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_flyout_footer.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
@@ -8,8 +8,8 @@ import React, { Fragment } from 'react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiStat, EuiHorizontalRule } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { ProcessedImportResponse } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { ImportRetry } from '../types';
 
 interface Props {
   copyInProgress: boolean;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_form.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_form.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
index 2a7e17c253f0b..f680793e27fe0 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/copy_to_space_form.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
@@ -14,8 +14,8 @@ import {
   EuiListGroupItem,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { CopyOptions } from '../../../../lib/copy_saved_objects_to_space/types';
-import { Space } from '../../../../../common/model/space';
+import { CopyOptions } from '../types';
+import { Space } from '../../../common/model/space';
 import { SelectableSpacesControl } from './selectable_spaces_control';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/index.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/index.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/processing_copy_to_space.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/processing_copy_to_space.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
index b04c9598559b3..285abb828a011 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/processing_copy_to_space.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
@@ -13,12 +13,12 @@ import {
   EuiHorizontalRule,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { ProcessedImportResponse } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { summarizeCopyResult } from '../../../../lib/copy_saved_objects_to_space';
-import { Space } from '../../../../../common/model/space';
-import { CopyOptions, ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
+import { CopyOptions, ImportRetry } from '../types';
 import { SpaceResult } from './space_result';
+import { summarizeCopyResult } from '..';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/selectable_spaces_control.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/selectable_spaces_control.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
index 42d5707531380..9cf81b1cc4486 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/selectable_spaces_control.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
@@ -6,8 +6,8 @@
 
 import React, { Fragment, useState } from 'react';
 import { EuiSelectable, EuiLoadingSpinner } from '@elastic/eui';
-import { SpaceAvatar } from '../../../../components';
-import { Space } from '../../../../../common/model/space';
+import { SpaceAvatar } from '../../space_avatar';
+import { Space } from '../../../common/model/space';
 
 interface Props {
   spaces: Space[];
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
similarity index 86%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
index f71be12276be5..22f0767ba196e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
@@ -6,13 +6,13 @@
 
 import React from 'react';
 import { EuiAccordion, EuiFlexGroup, EuiFlexItem, EuiText, EuiSpacer } from '@elastic/eui';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { SummarizedCopyToSpaceResult } from '../../../../lib/copy_saved_objects_to_space';
-import { SpaceAvatar } from '../../../../components';
-import { Space } from '../../../../../common/model/space';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { SummarizedCopyToSpaceResult } from '../index';
+import { SpaceAvatar } from '../../space_avatar';
+import { Space } from '../../../common/model/space';
 import { CopyStatusSummaryIndicator } from './copy_status_summary_indicator';
 import { SpaceCopyResultDetails } from './space_result_details';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ImportRetry } from '../types';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result_details.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
similarity index 93%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result_details.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
index 66ec38331c89a..d3ab406b87c3e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/copy_saved_objects_to_space/space_result_details.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
@@ -5,13 +5,13 @@
  */
 
 import React from 'react';
-import { SummarizedCopyToSpaceResult } from 'plugins/spaces/lib/copy_saved_objects_to_space';
 import { EuiText, EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { SavedObjectsManagementRecord } from '../../../../../../../../../src/legacy/core_plugins/management/public';
-import { Space } from '../../../../../common/model/space';
+import { SummarizedCopyToSpaceResult } from '../index';
+import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { Space } from '../../../common/model/space';
 import { CopyStatusIndicator } from './copy_status_indicator';
-import { ImportRetry } from '../../../../lib/copy_saved_objects_to_space/types';
+import { ImportRetry } from '../types';
 
 interface Props {
   savedObject: SavedObjectsManagementRecord;
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
similarity index 89%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
index 3b0fffa38e785..c016494a4cdf9 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
@@ -9,8 +9,8 @@ import { toastNotifications } from 'ui/notify';
 import {
   SavedObjectsManagementAction,
   SavedObjectsManagementRecord,
-} from '../../../../../../../src/legacy/core_plugins/management/public';
-import { CopySavedObjectsToSpaceFlyout } from '../../views/management/components/copy_saved_objects_to_space';
+} from '../../../../../../src/legacy/core_plugins/management/public';
+import { CopySavedObjectsToSpaceFlyout } from './components';
 import { SpacesManager } from '../spaces_manager';
 
 export class CopyToSpaceSavedObjectsManagementAction extends SavedObjectsManagementAction {
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.ts
new file mode 100644
index 0000000000000..63a59344dfe5d
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.test.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 { ManagementSetup } from 'src/legacy/core_plugins/management/public';
+import { CopyToSpaceSavedObjectsManagementAction } from './copy_saved_objects_to_space_action';
+import { spacesManagerMock } from '../spaces_manager/mocks';
+import { CopySavedObjectsToSpaceService } from '.';
+
+describe('CopySavedObjectsToSpaceService', () => {
+  describe('#setup', () => {
+    it('registers the CopyToSpaceSavedObjectsManagementAction', () => {
+      const deps = {
+        spacesManager: spacesManagerMock.create(),
+        // we don't have a proper NP mock for this yet
+        managementSetup: ({
+          savedObjects: {
+            registry: {
+              has: jest.fn().mockReturnValue(false),
+              register: jest.fn(),
+            },
+          },
+        } as unknown) as ManagementSetup,
+      };
+
+      const service = new CopySavedObjectsToSpaceService();
+      service.setup(deps);
+
+      expect(deps.managementSetup.savedObjects.registry.register).toHaveBeenCalledTimes(1);
+      expect(deps.managementSetup.savedObjects.registry.register).toHaveBeenCalledWith(
+        expect.any(CopyToSpaceSavedObjectsManagementAction)
+      );
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.ts
new file mode 100644
index 0000000000000..37354f985a2fc
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_service.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 { ManagementSetup } from 'src/legacy/core_plugins/management/public';
+import { CopyToSpaceSavedObjectsManagementAction } from './copy_saved_objects_to_space_action';
+import { SpacesManager } from '../spaces_manager';
+
+interface SetupDeps {
+  spacesManager: SpacesManager;
+  managementSetup: ManagementSetup;
+}
+
+export class CopySavedObjectsToSpaceService {
+  public setup({ spacesManager, managementSetup }: SetupDeps) {
+    const action = new CopyToSpaceSavedObjectsManagementAction(spacesManager);
+    managementSetup.savedObjects.registry.register(action);
+  }
+}
diff --git a/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/index.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/index.ts
new file mode 100644
index 0000000000000..06969a52a3d8d
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './summarize_copy_result';
+export { CopySavedObjectsToSpaceService } from './copy_saved_objects_to_space_service';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.test.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.test.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
index 0352902072790..0244a35711e6f 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.test.ts
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { summarizeCopyResult } from './summarize_copy_result';
-import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { ProcessedImportResponse } from '../../../../../../src/legacy/core_plugins/management/public';
 
 const createSavedObjectsManagementRecord = () => ({
   type: 'dashboard',
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
index 8807489157d71..7bc47d35efc6c 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/summarize_copy_result.ts
+++ b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectsManagementRecord } from '../../../../../../../src/legacy/core_plugins/management/public';
-import { ProcessedImportResponse } from '../../../../../../../src/legacy/core_plugins/management/public';
+import { SavedObjectsManagementRecord } from '../../../../../../src/legacy/core_plugins/management/public';
+import { ProcessedImportResponse } from '../../../../../../src/legacy/core_plugins/management/public';
 
 export interface SummarizedSavedObjectResult {
   type: string;
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/types.ts b/x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/types.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/types.ts
rename to x-pack/legacy/plugins/spaces/public/copy_saved_objects_to_space/types.ts
diff --git a/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts b/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts
index 1f41bb89d7707..464066d2221de 100644
--- a/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts
+++ b/x-pack/legacy/plugins/spaces/public/create_feature_catalogue_entry.ts
@@ -9,7 +9,7 @@ import {
   FeatureCatalogueEntry,
   FeatureCatalogueCategory,
 } from '../../../../../src/plugins/home/public';
-import { getSpacesFeatureDescription } from './lib/constants';
+import { getSpacesFeatureDescription } from './constants';
 
 export const createSpacesFeatureCatalogueEntry = (): FeatureCatalogueEntry => {
   return {
diff --git a/x-pack/legacy/plugins/spaces/public/index.scss b/x-pack/legacy/plugins/spaces/public/index.scss
index 7a40872b760cb..26269f1d31aa3 100644
--- a/x-pack/legacy/plugins/spaces/public/index.scss
+++ b/x-pack/legacy/plugins/spaces/public/index.scss
@@ -10,4 +10,7 @@
 //   spcChart__legend--small
 //   spcChart__legend-isLoading
 
-@import './views/index';
+@import './management/index';
+@import './nav_control/index';
+@import './space_selector/index';
+@import './copy_saved_objects_to_space/index';
diff --git a/x-pack/legacy/plugins/spaces/public/index.ts b/x-pack/legacy/plugins/spaces/public/index.ts
index 9233aae9fb12f..53cb906a619d3 100644
--- a/x-pack/legacy/plugins/spaces/public/index.ts
+++ b/x-pack/legacy/plugins/spaces/public/index.ts
@@ -5,6 +5,8 @@
  */
 import { SpacesPlugin } from './plugin';
 
+export { SpaceAvatar } from './space_avatar';
+
 export const plugin = () => {
   return new SpacesPlugin();
 };
diff --git a/x-pack/legacy/plugins/spaces/public/legacy.ts b/x-pack/legacy/plugins/spaces/public/legacy.ts
index 99419206093e9..1dffbd2661714 100644
--- a/x-pack/legacy/plugins/spaces/public/legacy.ts
+++ b/x-pack/legacy/plugins/spaces/public/legacy.ts
@@ -4,15 +4,26 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { registerSettingsComponent } from 'ui/management';
 import { npSetup, npStart } from 'ui/new_platform';
+import { setup as managementSetup } from '../../../../../src/legacy/core_plugins/management/public/legacy';
 import { plugin } from '.';
-import { SpacesPlugin, PluginsSetup } from './plugin';
+import { SpacesPlugin, PluginsSetup, PluginsStart } from './plugin';
+import './management/legacy_page_routes';
 
 const spacesPlugin: SpacesPlugin = plugin();
 
-const plugins: PluginsSetup = {
+const pluginsSetup: PluginsSetup = {
   home: npSetup.plugins.home,
+  management: managementSetup,
+  __managementLegacyCompat: {
+    registerSettingsComponent,
+  },
 };
 
-export const setup = spacesPlugin.setup(npSetup.core, plugins);
-export const start = spacesPlugin.start(npStart.core);
+const pluginsStart: PluginsStart = {
+  management: npStart.plugins.management,
+};
+
+export const setup = spacesPlugin.setup(npSetup.core, pluginsSetup);
+export const start = spacesPlugin.start(npStart.core, pluginsStart);
diff --git a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/index.ts b/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/index.ts
deleted file mode 100644
index be23d90cc242a..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/lib/copy_saved_objects_to_space/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './summarize_copy_result';
-export { CopyToSpaceSavedObjectsManagementAction } from './copy_saved_objects_to_space_action';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/index.ts b/x-pack/legacy/plugins/spaces/public/lib/index.ts
deleted file mode 100644
index 56ac7b8ff37f4..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/lib/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 { SpacesManager } from './spaces_manager';
-export { getSpaceInitials, getSpaceColor, getSpaceImageUrl } from './space_attributes';
diff --git a/x-pack/legacy/plugins/spaces/public/management/_index.scss b/x-pack/legacy/plugins/spaces/public/management/_index.scss
new file mode 100644
index 0000000000000..72deb1f1cde8d
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/_index.scss
@@ -0,0 +1,4 @@
+@import './components/confirm_delete_modal/confirm_delete_modal';
+@import './edit_space/enabled_features/index';
+@import './edit_space/section_panel/section_panel';
+
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/confirm_delete_modal.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/__snapshots__/confirm_delete_modal.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/confirm_delete_modal.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/__snapshots__/confirm_delete_modal.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/_confirm_delete_modal.scss b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/_confirm_delete_modal.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/_confirm_delete_modal.scss
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/_confirm_delete_modal.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.test.tsx b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
index f0ab2c99ac2e2..331435b54edb7 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.test.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { ConfirmDeleteModal } from './confirm_delete_modal';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { spacesManagerMock } from '../../../spaces_manager/mocks';
+import { SpacesManager } from '../../../spaces_manager';
 
 describe('ConfirmDeleteModal', () => {
   it('renders as expected', () => {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.tsx b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
index 0c76cb4a828fe..6eed58a784212 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/confirm_delete_modal.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/confirm_delete_modal.tsx
@@ -25,8 +25,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { ChangeEvent, Component } from 'react';
-import { Space } from '../../../../common/model/space';
-import { SpacesManager } from '../../../lib';
+import { SpacesManager } from '../../../spaces_manager';
+import { Space } from '../../../../../../plugins/spaces/common/model/space';
 
 interface Props {
   space: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/index.ts
new file mode 100644
index 0000000000000..651455d00e9f2
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/components/confirm_delete_modal/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 { ConfirmDeleteModal } from './confirm_delete_modal';
diff --git a/x-pack/legacy/plugins/spaces/public/management/components/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/index.ts
new file mode 100644
index 0000000000000..7f9f80f470d12
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/components/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 { ConfirmDeleteModal } from './confirm_delete_modal';
+export { UnauthorizedPrompt } from './unauthorized_prompt';
+export { SecureSpaceMessage } from './secure_space_message';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/__snapshots__/secure_space_message.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.test.tsx b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.test.tsx
similarity index 93%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.test.tsx
index 1cc6f6c1f72be..b43010fe5f326 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.test.tsx
@@ -8,7 +8,7 @@ import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { SecureSpaceMessage } from './secure_space_message';
 
 let mockShowLinks: boolean = true;
-jest.mock('../../../../../../xpack_main/public/services/xpack_info', () => {
+jest.mock('../../../../../xpack_main/public/services/xpack_info', () => {
   return {
     xpackInfo: {
       get: jest.fn().mockImplementation((key: string) => {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.tsx
index 6bbc423968b4b..746b7e2ac4c98 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/components/secure_space_message/secure_space_message.tsx
@@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment } from 'react';
 // @ts-ignore
-import { xpackInfo } from '../../../../../../xpack_main/public/services/xpack_info';
+import { xpackInfo } from '../../../../../xpack_main/public/services/xpack_info';
 
 export const SecureSpaceMessage = ({}) => {
   const showSecurityLinks = xpackInfo.get('features.security.showLinks');
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/unauthorized_prompt.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/__snapshots__/unauthorized_prompt.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/__snapshots__/unauthorized_prompt.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/__snapshots__/unauthorized_prompt.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/index.ts b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/index.ts
new file mode 100644
index 0000000000000..5a8120a77804b
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/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 { UnauthorizedPrompt } from './unauthorized_prompt';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.test.tsx b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.tsx b/x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/components/unauthorized_prompt.tsx
rename to x-pack/legacy/plugins/spaces/public/management/components/unauthorized_prompt/unauthorized_prompt.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/__snapshots__/delete_spaces_button.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/__snapshots__/confirm_alter_active_space_modal.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.test.tsx
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/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/confirm_alter_active_space_modal.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/confirm_alter_active_space_modal/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/confirm_alter_active_space_modal/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/customize_space_avatar.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/__snapshots__/space_identifier.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
index 8a7e384d44b35..b0d74afaa90aa 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space.tsx
@@ -18,9 +18,9 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { ChangeEvent, Component, Fragment } from 'react';
-import { isReservedSpace } from '../../../../../common';
-import { Space } from '../../../../../common/model/space';
-import { SpaceAvatar } from '../../../../components';
+import { isReservedSpace } from '../../../../common';
+import { Space } from '../../../../common/model/space';
+import { SpaceAvatar } from '../../../space_avatar';
 import { SpaceValidator, toSpaceIdentifier } from '../../lib';
 import { SectionPanel } from '../section_panel';
 import { CustomizeSpaceAvatar } from './customize_space_avatar';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx
index 12fa0193b59a4..c3207c82bf95e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/customize_space_avatar.tsx
@@ -17,12 +17,10 @@ import {
   isValidHex,
 } from '@elastic/eui';
 import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
-
-import { getSpaceColor, getSpaceInitials } from '../../../../lib/space_attributes';
-import { encode, imageTypes } from '../../../../../common/lib/dataurl';
-
-import { MAX_SPACE_INITIALS } from '../../../../../common/constants';
-import { Space } from '../../../../../common/model/space';
+import { imageTypes, encode } from '../../../../common/lib/dataurl';
+import { getSpaceColor, getSpaceInitials } from '../../../space_avatar';
+import { Space } from '../../../../../../../plugins/spaces/common/model/space';
+import { MAX_SPACE_INITIALS } from '../../../../../../../plugins/spaces/common';
 
 interface Props {
   space: Partial<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.tsx
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.tsx
index a717570b19c5d..1d6664273d21e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/customize_space/space_identifier.tsx
@@ -7,7 +7,7 @@
 import { EuiFieldText, EuiFormRow, EuiLink } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { ChangeEvent, Component, Fragment } from 'react';
-import { Space } from '../../../../../common/model/space';
+import { Space } from '../../../../common/model/space';
 import { SpaceValidator, toSpaceIdentifier } from '../../lib';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
similarity index 88%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
index e7c7dfc5eb1b0..364145d6495b8 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.test.tsx
@@ -7,8 +7,8 @@
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { DeleteSpacesButton } from './delete_spaces_button';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 
 const space = {
   id: 'my-space',
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
index 216dd7c41f124..56a858eb4ccf6 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/delete_spaces_button.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
@@ -7,10 +7,9 @@
 import { EuiButton, EuiButtonIcon, EuiButtonIconProps } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { Component, Fragment } from 'react';
-// @ts-ignore
 import { toastNotifications } from 'ui/notify';
-import { Space } from '../../../../common/model/space';
-import { SpacesManager } from '../../../lib/spaces_manager';
+import { Space } from '../../../common/model/space';
+import { SpacesManager } from '../../spaces_manager';
 import { ConfirmDeleteModal } from '../components/confirm_delete_modal';
 
 interface Props {
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
similarity index 99%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
index 5e91c1bd0e36c..5879ff621d64a 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/__snapshots__/enabled_features.test.tsx.snap
@@ -190,12 +190,14 @@ exports[`EnabledFeatures renders as expected 1`] = `
           Array [
             Object {
               "app": Array [],
+              "icon": "spacesApp",
               "id": "feature-1",
               "name": "Feature 1",
               "privileges": Object {},
             },
             Object {
               "app": Array [],
+              "icon": "spacesApp",
               "id": "feature-2",
               "name": "Feature 2",
               "privileges": Object {},
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/_index.scss b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/_index.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/_index.scss
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/_index.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
index 8f82e6d413350..f770857d9313d 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.test.tsx
@@ -7,8 +7,8 @@
 import { EuiLink } from '@elastic/eui';
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { Feature } from '../../../../../../../../plugins/features/public';
-import { Space } from '../../../../../common/model/space';
+import { Feature } from '../../../../../../../plugins/features/public';
+import { Space } from '../../../../common/model/space';
 import { SectionPanel } from '../section_panel';
 import { EnabledFeatures } from './enabled_features';
 
@@ -16,12 +16,14 @@ const features: Feature[] = [
   {
     id: 'feature-1',
     name: 'Feature 1',
+    icon: 'spacesApp',
     app: [],
     privileges: {},
   },
   {
     id: 'feature-2',
     name: 'Feature 2',
+    icon: 'spacesApp',
     app: [],
     privileges: {},
   },
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
similarity index 97%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
index 628be759b7c5c..70312296f757b 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/enabled_features.tsx
@@ -8,8 +8,8 @@ import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer, EuiText, EuiTitle } from
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import React, { Component, Fragment, ReactNode } from 'react';
 import { Capabilities } from 'src/core/public';
-import { Feature } from '../../../../../../../../plugins/features/public';
-import { Space } from '../../../../../common/model/space';
+import { Feature } from '../../../../../../../plugins/features/public';
+import { Space } from '../../../../common/model/space';
 import { getEnabledFeatures } from '../../lib/feature_utils';
 import { SectionPanel } from '../section_panel';
 import { FeatureTable } from './feature_table';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
index d408ea6582742..2866d0bfa8cf3 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/feature_table.tsx
@@ -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.
  */
-// @ts-ignore
-import { EuiCheckbox, EuiIcon, EuiInMemoryTable, EuiSwitch, EuiText, IconType } from '@elastic/eui';
+
+import { EuiIcon, EuiInMemoryTable, EuiSwitch, EuiText, IconType } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { ChangeEvent, Component } from 'react';
-import { Feature } from '../../../../../../../../plugins/features/public';
-import { Space } from '../../../../../common/model/space';
+import { Feature } from '../../../../../../../plugins/features/public';
+import { Space } from '../../../../common/model/space';
 import { ToggleAllFeatures } from './toggle_all_features';
 
 interface Props {
@@ -70,7 +70,7 @@ export class FeatureTable extends Component<Props, {}> {
         id: 'xpack.spaces.management.enabledSpaceFeaturesFeatureColumnTitle',
         defaultMessage: 'Feature',
       }),
-      render: (feature: Feature) => {
+      render: (feature: Feature, _item: { feature: Feature; space: Props['space'] }) => {
         return (
           <EuiText>
             <EuiIcon size="m" type={feature.icon as IconType} />
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/toggle_all_features.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/toggle_all_features.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/enabled_features/toggle_all_features.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/enabled_features/toggle_all_features.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
index 1597e4684222c..d24e932bce112 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.test.tsx
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 jest.mock('ui/kfetch', () => ({
-  kfetch: () => Promise.resolve([{ id: 'feature-1', name: 'feature 1' }]),
+  kfetch: () => Promise.resolve([{ id: 'feature-1', name: 'feature 1', icon: 'spacesApp' }]),
 }));
-import '../../../__mocks__/xpack_info';
+import '../../__mocks__/xpack_info';
 import { EuiButton, EuiLink, EuiSwitch } from '@elastic/eui';
 import { ReactWrapper } from 'enzyme';
 import React from 'react';
@@ -14,8 +14,8 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal';
 import { ManageSpacePage } from './manage_space_page';
 import { SectionPanel } from './section_panel';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 
 const space = {
   id: 'my-space',
@@ -65,21 +65,28 @@ describe('ManageSpacePage', () => {
   });
 
   it('allows a space to be updated', async () => {
-    const spacesManager = spacesManagerMock.create();
-    spacesManager.getSpace = jest.fn().mockResolvedValue({
+    const spaceToUpdate = {
       id: 'existing-space',
       name: 'Existing Space',
       description: 'hey an existing space',
       color: '#aabbcc',
       initials: 'AB',
       disabledFeatures: [],
+    };
+
+    const spacesManager = spacesManagerMock.create();
+    spacesManager.getSpace = jest.fn().mockResolvedValue({
+      ...spaceToUpdate,
     });
     spacesManager.getActiveSpace = jest.fn().mockResolvedValue(space);
 
+    const onLoadSpace = jest.fn();
+
     const wrapper = mountWithIntl(
       <ManageSpacePage.WrappedComponent
         spaceId={'existing-space'}
         spacesManager={(spacesManager as unknown) as SpacesManager}
+        onLoadSpace={onLoadSpace}
         intl={null as any}
         capabilities={{
           navLinks: {},
@@ -93,6 +100,9 @@ describe('ManageSpacePage', () => {
     await waitForDataLoad(wrapper);
 
     expect(spacesManager.getSpace).toHaveBeenCalledWith('existing-space');
+    expect(onLoadSpace).toHaveBeenCalledWith({
+      ...spaceToUpdate,
+    });
 
     await Promise.resolve();
 
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.tsx
similarity index 93%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.tsx
index a5d60d1a731ba..6bbb32ccd654f 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/manage_space_page.tsx
@@ -17,17 +17,15 @@ import {
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import _ from 'lodash';
 import React, { Component, Fragment } from 'react';
-import { Breadcrumb } from 'ui/chrome';
 import { kfetch } from 'ui/kfetch';
 import { toastNotifications } from 'ui/notify';
 import { Capabilities } from 'src/core/public';
-import { Feature } from '../../../../../../../plugins/features/public';
-import { isReservedSpace } from '../../../../common';
-import { Space } from '../../../../common/model/space';
-import { SpacesManager } from '../../../lib';
-import { SecureSpaceMessage } from '../components/secure_space_message';
-import { UnauthorizedPrompt } from '../components/unauthorized_prompt';
-import { getEditBreadcrumbs, toSpaceIdentifier } from '../lib';
+import { Feature } from '../../../../../../plugins/features/public';
+import { isReservedSpace } from '../../../common';
+import { Space } from '../../../common/model/space';
+import { SpacesManager } from '../../spaces_manager';
+import { SecureSpaceMessage, UnauthorizedPrompt } from '../components';
+import { toSpaceIdentifier } from '../lib';
 import { SpaceValidator } from '../lib/validate_space';
 import { ConfirmAlterActiveSpaceModal } from './confirm_alter_active_space_modal';
 import { CustomizeSpace } from './customize_space';
@@ -39,7 +37,7 @@ interface Props {
   spacesManager: SpacesManager;
   spaceId?: string;
   intl: InjectedIntl;
-  setBreadcrumbs?: (breadcrumbs: Breadcrumb[]) => void;
+  onLoadSpace?: (space: Space) => void;
   capabilities: Capabilities;
 }
 
@@ -76,7 +74,7 @@ class ManageSpacePageUI extends Component<Props, State> {
       return;
     }
 
-    const { spaceId, spacesManager, intl, setBreadcrumbs } = this.props;
+    const { spaceId, spacesManager, intl, onLoadSpace } = this.props;
 
     const getFeatures = kfetch({ method: 'get', pathname: '/api/features' });
 
@@ -84,8 +82,8 @@ class ManageSpacePageUI extends Component<Props, State> {
       try {
         const [space, features] = await Promise.all([spacesManager.getSpace(spaceId), getFeatures]);
         if (space) {
-          if (setBreadcrumbs) {
-            setBreadcrumbs(getEditBreadcrumbs(space));
+          if (onLoadSpace) {
+            onLoadSpace(space);
           }
 
           this.setState({
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.tsx
similarity index 89%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.tsx
index e4b2dda3a668b..38bf351902096 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/reserved_space_badge.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/edit_space/reserved_space_badge.tsx
@@ -8,8 +8,8 @@ import React from 'react';
 
 import { EuiIcon, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { isReservedSpace } from '../../../../common';
-import { Space } from '../../../../common/model/space';
+import { isReservedSpace } from '../../../common';
+import { Space } from '../../../common/model/space';
 
 interface Props {
   space?: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/__snapshots__/section_panel.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/_section_panel.scss b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/_section_panel.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/_section_panel.scss
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/_section_panel.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/index.ts b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.test.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.tsx b/x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/edit_space/section_panel/section_panel.tsx
rename to x-pack/legacy/plugins/spaces/public/management/edit_space/section_panel/section_panel.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/management/index.ts b/x-pack/legacy/plugins/spaces/public/management/index.ts
new file mode 100644
index 0000000000000..ad3cc6b245619
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/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 { ManagementService } from './management_service';
diff --git a/x-pack/legacy/plugins/spaces/public/management/legacy_page_routes.tsx b/x-pack/legacy/plugins/spaces/public/management/legacy_page_routes.tsx
new file mode 100644
index 0000000000000..8cf4a129e5b8f
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/legacy_page_routes.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.
+ */
+// @ts-ignore
+import template from 'plugins/spaces/management/template.html';
+import React from 'react';
+import { render, unmountComponentAtNode } from 'react-dom';
+import { I18nContext } from 'ui/i18n';
+// @ts-ignore
+import routes from 'ui/routes';
+import { MANAGEMENT_BREADCRUMB } from 'ui/management/breadcrumbs';
+import { npStart } from 'ui/new_platform';
+import { ManageSpacePage } from './edit_space';
+import { SpacesGridPage } from './spaces_grid';
+
+import { start as spacesNPStart } from '../legacy';
+import { Space } from '../../common/model/space';
+
+const reactRootNodeId = 'manageSpacesReactRoot';
+
+function getListBreadcrumbs() {
+  return [
+    MANAGEMENT_BREADCRUMB,
+    {
+      text: 'Spaces',
+      href: '#/management/spaces/list',
+    },
+  ];
+}
+
+function getCreateBreadcrumbs() {
+  return [
+    ...getListBreadcrumbs(),
+    {
+      text: 'Create',
+    },
+  ];
+}
+
+function getEditBreadcrumbs(space?: Space) {
+  return [
+    ...getListBreadcrumbs(),
+    {
+      text: space ? space.name : '...',
+    },
+  ];
+}
+
+routes.when('/management/spaces/list', {
+  template,
+  k7Breadcrumbs: getListBreadcrumbs,
+  requireUICapability: 'management.kibana.spaces',
+  controller($scope: any) {
+    $scope.$$postDigest(() => {
+      const domNode = document.getElementById(reactRootNodeId);
+
+      const { spacesManager } = spacesNPStart;
+
+      render(
+        <I18nContext>
+          <SpacesGridPage
+            spacesManager={spacesManager!}
+            capabilities={npStart.core.application.capabilities}
+          />
+        </I18nContext>,
+        domNode
+      );
+
+      // unmount react on controller destroy
+      $scope.$on('$destroy', () => {
+        if (domNode) {
+          unmountComponentAtNode(domNode);
+        }
+      });
+    });
+  },
+});
+
+routes.when('/management/spaces/create', {
+  template,
+  k7Breadcrumbs: getCreateBreadcrumbs,
+  requireUICapability: 'management.kibana.spaces',
+  controller($scope: any) {
+    $scope.$$postDigest(() => {
+      const domNode = document.getElementById(reactRootNodeId);
+
+      const { spacesManager } = spacesNPStart;
+
+      render(
+        <I18nContext>
+          <ManageSpacePage
+            spacesManager={spacesManager!}
+            capabilities={npStart.core.application.capabilities}
+          />
+        </I18nContext>,
+        domNode
+      );
+
+      // unmount react on controller destroy
+      $scope.$on('$destroy', () => {
+        if (domNode) {
+          unmountComponentAtNode(domNode);
+        }
+      });
+    });
+  },
+});
+
+routes.when('/management/spaces/edit', {
+  redirectTo: '/management/spaces/list',
+});
+
+routes.when('/management/spaces/edit/:spaceId', {
+  template,
+  k7Breadcrumbs: () => getEditBreadcrumbs(),
+  requireUICapability: 'management.kibana.spaces',
+  controller($scope: any, $route: any) {
+    $scope.$$postDigest(async () => {
+      const domNode = document.getElementById(reactRootNodeId);
+
+      const { spaceId } = $route.current.params;
+
+      const { spacesManager } = await spacesNPStart;
+
+      render(
+        <I18nContext>
+          <ManageSpacePage
+            spaceId={spaceId}
+            spacesManager={spacesManager!}
+            onLoadSpace={space => {
+              npStart.core.chrome.setBreadcrumbs(getEditBreadcrumbs(space));
+            }}
+            capabilities={npStart.core.application.capabilities}
+          />
+        </I18nContext>,
+        domNode
+      );
+
+      // unmount react on controller destroy
+      $scope.$on('$destroy', () => {
+        if (domNode) {
+          unmountComponentAtNode(domNode);
+        }
+      });
+    });
+  },
+});
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.test.ts b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.test.ts
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.test.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.test.ts
index 8621ec5614368..ce874956d0ef2 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.test.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.test.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Feature } from '../../../../../../../plugins/features/public';
 import { getEnabledFeatures } from './feature_utils';
+import { Feature } from '../../../../../../plugins/features/public';
 
 const buildFeatures = () =>
   [
diff --git a/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.ts b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.ts
new file mode 100644
index 0000000000000..ff1688637ef73
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/feature_utils.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 { Feature } from '../../../../../../plugins/features/common';
+
+import { Space } from '../../../../../../plugins/spaces/common/model/space';
+
+export function getEnabledFeatures(features: Feature[], space: Partial<Space>) {
+  return features.filter(feature => !(space.disabledFeatures || []).includes(feature.id));
+}
diff --git a/x-pack/legacy/plugins/spaces/public/management/lib/index.ts b/x-pack/legacy/plugins/spaces/public/management/lib/index.ts
new file mode 100644
index 0000000000000..4a158168febd8
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/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 { toSpaceIdentifier, isValidSpaceIdentifier } from './space_identifier_utils';
+
+export { SpaceValidator } from './validate_space';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.test.ts b/x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.test.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.test.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.ts b/x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/space_identifier_utils.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/space_identifier_utils.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.test.ts b/x-pack/legacy/plugins/spaces/public/management/lib/validate_space.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.test.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/validate_space.test.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.ts b/x-pack/legacy/plugins/spaces/public/management/lib/validate_space.ts
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.ts
rename to x-pack/legacy/plugins/spaces/public/management/lib/validate_space.ts
index e7b9116131431..43d42dacdd36d 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/validate_space.ts
+++ b/x-pack/legacy/plugins/spaces/public/management/lib/validate_space.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { i18n } from '@kbn/i18n';
-import { isReservedSpace } from '../../../../common/is_reserved_space';
-import { Space } from '../../../../common/model/space';
+import { isReservedSpace } from '../../../common/is_reserved_space';
+import { Space } from '../../../common/model/space';
 import { isValidSpaceIdentifier } from './space_identifier_utils';
 
 interface SpaceValidatorOptions {
diff --git a/x-pack/legacy/plugins/spaces/public/management/management_service.test.ts b/x-pack/legacy/plugins/spaces/public/management/management_service.test.ts
new file mode 100644
index 0000000000000..fa8ae64168673
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/management_service.test.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 { ManagementService } from '.';
+
+describe('ManagementService', () => {
+  describe('#start', () => {
+    it('registers the spaces management page under the kibana section', () => {
+      const mockKibanaSection = {
+        hasItem: jest.fn().mockReturnValue(false),
+        register: jest.fn(),
+      };
+
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(mockKibanaSection),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      expect(deps.managementStart.legacy.getSection).toHaveBeenCalledTimes(1);
+      expect(deps.managementStart.legacy.getSection).toHaveBeenCalledWith('kibana');
+
+      expect(mockKibanaSection.register).toHaveBeenCalledTimes(1);
+      expect(mockKibanaSection.register).toHaveBeenCalledWith('spaces', {
+        name: 'spacesManagementLink',
+        order: 10,
+        display: 'Spaces',
+        url: `#/management/spaces/list`,
+      });
+    });
+
+    it('will not register the spaces management page twice', () => {
+      const mockKibanaSection = {
+        hasItem: jest.fn().mockReturnValue(true),
+        register: jest.fn(),
+      };
+
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(mockKibanaSection),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      expect(mockKibanaSection.register).toHaveBeenCalledTimes(0);
+    });
+
+    it('will not register the spaces management page if the kibana section is missing', () => {
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(undefined),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      expect(deps.managementStart.legacy.getSection).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('#stop', () => {
+    it('deregisters the spaces management page', () => {
+      const mockKibanaSection = {
+        hasItem: jest
+          .fn()
+          .mockReturnValueOnce(false)
+          .mockReturnValueOnce(true),
+        register: jest.fn(),
+        deregister: jest.fn(),
+      };
+
+      const managementStart = {
+        legacy: {
+          getSection: jest.fn().mockReturnValue(mockKibanaSection),
+        },
+      };
+
+      const deps = {
+        managementStart,
+      };
+
+      const service = new ManagementService();
+      service.start(deps);
+
+      service.stop();
+
+      expect(mockKibanaSection.register).toHaveBeenCalledTimes(1);
+      expect(mockKibanaSection.deregister).toHaveBeenCalledTimes(1);
+      expect(mockKibanaSection.deregister).toHaveBeenCalledWith('spaces');
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/management/management_service.ts b/x-pack/legacy/plugins/spaces/public/management/management_service.ts
new file mode 100644
index 0000000000000..ada38f5cf3387
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/management/management_service.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { i18n } from '@kbn/i18n';
+import { ManagementStart } from 'src/plugins/management/public';
+
+interface StartDeps {
+  managementStart: ManagementStart;
+}
+
+const MANAGE_SPACES_KEY = 'spaces';
+
+export class ManagementService {
+  private kibanaSection!: any;
+
+  public start({ managementStart }: StartDeps) {
+    this.kibanaSection = managementStart.legacy.getSection('kibana');
+    if (this.kibanaSection && !this.kibanaSection.hasItem(MANAGE_SPACES_KEY)) {
+      this.kibanaSection.register(MANAGE_SPACES_KEY, {
+        name: 'spacesManagementLink',
+        order: 10,
+        display: i18n.translate('xpack.spaces.displayName', {
+          defaultMessage: 'Spaces',
+        }),
+        url: `#/management/spaces/list`,
+      });
+    }
+  }
+
+  public stop() {
+    if (this.kibanaSection && this.kibanaSection.hasItem(MANAGE_SPACES_KEY)) {
+      this.kibanaSection.deregister(MANAGE_SPACES_KEY);
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
index d020e25649b20..3beef55d459da 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
+++ b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/__snapshots__/spaces_grid_pages.test.tsx.snap
@@ -7,7 +7,6 @@ exports[`SpacesGridPage renders as expected 1`] = `
 >
   <EuiPageContent
     horizontalPosition="center"
-    panelPaddingSize="l"
   >
     <EuiFlexGroup
       justifyContent="spaceBetween"
@@ -99,7 +98,6 @@ exports[`SpacesGridPage renders as expected 1`] = `
           },
         ]
       }
-      executeQueryOptions={Object {}}
       hasActions={true}
       itemId="id"
       items={Array []}
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/index.ts b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/index.ts
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
index 9fa03b1a9b74a..6ca1877642bdc 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_page.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_page.tsx
@@ -22,13 +22,13 @@ import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { kfetch } from 'ui/kfetch';
 import { toastNotifications } from 'ui/notify';
 import { Capabilities } from 'src/core/public';
-import { Feature } from '../../../../../../../plugins/features/public';
-import { isReservedSpace } from '../../../../common';
-import { DEFAULT_SPACE_ID } from '../../../../common/constants';
-import { Space } from '../../../../common/model/space';
-import { SpaceAvatar } from '../../../components';
-import { getSpacesFeatureDescription } from '../../../lib/constants';
-import { SpacesManager } from '../../../lib/spaces_manager';
+import { Feature } from '../../../../../../plugins/features/public';
+import { isReservedSpace } from '../../../common';
+import { DEFAULT_SPACE_ID } from '../../../common/constants';
+import { Space } from '../../../common/model/space';
+import { SpaceAvatar } from '../../space_avatar';
+import { getSpacesFeatureDescription } from '../../constants';
+import { SpacesManager } from '../..//spaces_manager';
 import { ConfirmDeleteModal } from '../components/confirm_delete_modal';
 import { SecureSpaceMessage } from '../components/secure_space_message';
 import { UnauthorizedPrompt } from '../components/unauthorized_prompt';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_pages.test.tsx b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_pages.test.tsx
rename to x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
index 4add607707b24..7856d2e7bee01 100644
--- a/x-pack/legacy/plugins/spaces/public/views/management/spaces_grid/spaces_grid_pages.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/management/spaces_grid/spaces_grid_pages.test.tsx
@@ -6,12 +6,12 @@
 jest.mock('ui/kfetch', () => ({
   kfetch: () => Promise.resolve([]),
 }));
-import '../../../__mocks__/xpack_info';
+import '../../__mocks__/xpack_info';
 import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { SpaceAvatar } from '../../../components';
-import { spacesManagerMock } from '../../../lib/mocks';
-import { SpacesManager } from '../../../lib';
+import { SpaceAvatar } from '../../space_avatar';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
 import { SpacesGridPage } from './spaces_grid_page';
 
 const spaces = [
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/template.html b/x-pack/legacy/plugins/spaces/public/management/template.html
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/management/template.html
rename to x-pack/legacy/plugins/spaces/public/management/template.html
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/__snapshots__/nav_control_popover.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/nav_control/_index.scss b/x-pack/legacy/plugins/spaces/public/nav_control/_index.scss
new file mode 100644
index 0000000000000..d0471da325cec
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/_index.scss
@@ -0,0 +1,2 @@
+@import './components/index';
+@import './nav_control';
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/_nav_control.scss b/x-pack/legacy/plugins/spaces/public/nav_control/_nav_control.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/_nav_control.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/_nav_control.scss
diff --git a/x-pack/legacy/plugins/spaces/public/components/__snapshots__/manage_spaces_button.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/manage_spaces_button.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/__snapshots__/manage_spaces_button.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/manage_spaces_button.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/__snapshots__/spaces_description.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/spaces_description.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/__snapshots__/spaces_description.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/__snapshots__/spaces_description.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/_index.scss b/x-pack/legacy/plugins/spaces/public/nav_control/components/_index.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/_index.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/_index.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_description.scss b/x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_description.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_description.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_description.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_menu.scss b/x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_menu.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/_spaces_menu.scss
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/_spaces_menu.scss
diff --git a/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.test.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.test.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
similarity index 96%
rename from x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
index 91a0803c20bc9..857d0c1f828a6 100644
--- a/x-pack/legacy/plugins/spaces/public/components/manage_spaces_button.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/components/manage_spaces_button.tsx
@@ -8,7 +8,7 @@ import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component, CSSProperties } from 'react';
 import { Capabilities } from 'src/core/public';
-import { getManageSpacesUrl } from '../lib/constants';
+import { getManageSpacesUrl } from '../../constants';
 
 interface Props {
   isDisabled?: boolean;
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.test.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.test.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.tsx
similarity index 89%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.tsx
index 043fc656a571e..abf3c636b839e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_description.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_description.tsx
@@ -7,8 +7,8 @@
 import { EuiContextMenuPanel, EuiText } from '@elastic/eui';
 import React, { FC } from 'react';
 import { Capabilities } from 'src/core/public';
-import { ManageSpacesButton } from '../../../components';
-import { getSpacesFeatureDescription } from '../../../lib/constants';
+import { ManageSpacesButton } from './manage_spaces_button';
+import { getSpacesFeatureDescription } from '../../constants';
 
 interface Props {
   onManageSpacesClick: () => void;
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_menu.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_menu.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_menu.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_menu.tsx
index 9a26f6802abdf..96ce18896b426 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/components/spaces_menu.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/components/spaces_menu.tsx
@@ -14,9 +14,10 @@ import {
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import React, { Component, ReactElement } from 'react';
 import { Capabilities } from 'src/core/public';
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../../common/constants';
-import { Space } from '../../../../common/model/space';
-import { ManageSpacesButton, SpaceAvatar } from '../../../components';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../common/constants';
+import { Space } from '../../../common/model/space';
+import { ManageSpacesButton } from './manage_spaces_button';
+import { SpaceAvatar } from '../../space_avatar';
 
 interface Props {
   spaces: Space[];
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/index.ts b/x-pack/legacy/plugins/spaces/public/nav_control/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/index.ts
rename to x-pack/legacy/plugins/spaces/public/nav_control/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control.tsx
similarity index 94%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/nav_control.tsx
index 0df077e0d2da0..9ec070eff3fed 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control.tsx
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SpacesManager } from 'plugins/spaces/lib/spaces_manager';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { CoreStart } from 'src/core/public';
+import { SpacesManager } from '../spaces_manager';
 import { NavControlPopover } from './nav_control_popover';
 
 export function initSpacesNavControl(spacesManager: SpacesManager, core: CoreStart) {
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.test.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.test.tsx
similarity index 91%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.test.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.test.tsx
index a04f28242f984..5ce141abb713e 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.test.tsx
@@ -7,9 +7,9 @@
 import * as Rx from 'rxjs';
 import { shallow } from 'enzyme';
 import React from 'react';
-import { SpaceAvatar } from '../../components';
-import { spacesManagerMock } from '../../lib/mocks';
-import { SpacesManager } from '../../lib';
+import { SpaceAvatar } from '../space_avatar';
+import { spacesManagerMock } from '../spaces_manager/mocks';
+import { SpacesManager } from '../spaces_manager';
 import { NavControlPopover } from './nav_control_popover';
 import { EuiHeaderSectionItemButton } from '@elastic/eui';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
@@ -42,6 +42,7 @@ describe('NavControlPopover', () => {
         disabledFeatures: [],
       },
     ]);
+    // @ts-ignore readonly check
     spacesManager.onActiveSpaceChange$ = Rx.of({
       id: 'foo-space',
       name: 'foo',
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.tsx
index 98ce64715f325..f291027e15232 100644
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/nav_control_popover.tsx
+++ b/x-pack/legacy/plugins/spaces/public/nav_control/nav_control_popover.tsx
@@ -13,9 +13,9 @@ import {
 import React, { Component } from 'react';
 import { Capabilities } from 'src/core/public';
 import { Subscription } from 'rxjs';
-import { Space } from '../../../common/model/space';
-import { SpaceAvatar } from '../../components';
-import { SpacesManager } from '../../lib/spaces_manager';
+import { Space } from '../../common/model/space';
+import { SpaceAvatar } from '../space_avatar';
+import { SpacesManager } from '../spaces_manager';
 import { SpacesDescription } from './components/spaces_description';
 import { SpacesMenu } from './components/spaces_menu';
 
@@ -45,7 +45,7 @@ export class NavControlPopover extends Component<Props, State> {
     };
   }
 
-  public componentWillMount() {
+  public componentDidMount() {
     this.activeSpace$ = this.props.spacesManager.onActiveSpaceChange$.subscribe({
       next: activeSpace => {
         this.setState({
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/types.tsx b/x-pack/legacy/plugins/spaces/public/nav_control/types.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/nav_control/types.tsx
rename to x-pack/legacy/plugins/spaces/public/nav_control/types.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/plugin.tsx b/x-pack/legacy/plugins/spaces/public/plugin.tsx
index 4e070c3cee3df..1ddb69a5b595c 100644
--- a/x-pack/legacy/plugins/spaces/public/plugin.tsx
+++ b/x-pack/legacy/plugins/spaces/public/plugin.tsx
@@ -6,9 +6,14 @@
 
 import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import { HomePublicPluginSetup } from 'src/plugins/home/public';
-import { SpacesManager } from './lib';
-import { initSpacesNavControl } from './views/nav_control';
+import { ManagementSetup } from 'src/legacy/core_plugins/management/public';
+import { ManagementStart } from 'src/plugins/management/public';
+import { SpacesManager } from './spaces_manager';
+import { initSpacesNavControl } from './nav_control';
 import { createSpacesFeatureCatalogueEntry } from './create_feature_catalogue_entry';
+import { CopySavedObjectsToSpaceService } from './copy_saved_objects_to_space';
+import { AdvancedSettingsService } from './advanced_settings';
+import { ManagementService } from './management';
 
 export interface SpacesPluginStart {
   spacesManager: SpacesManager | null;
@@ -16,25 +21,61 @@ export interface SpacesPluginStart {
 
 export interface PluginsSetup {
   home?: HomePublicPluginSetup;
+  management: ManagementSetup;
+  __managementLegacyCompat: {
+    registerSettingsComponent: (
+      id: string,
+      component: string | React.FC<any>,
+      allowOverride: boolean
+    ) => void;
+  };
+}
+
+export interface PluginsStart {
+  management: ManagementStart;
 }
 
 export class SpacesPlugin implements Plugin<void, SpacesPluginStart, PluginsSetup> {
-  private spacesManager: SpacesManager | null = null;
+  private spacesManager!: SpacesManager;
 
-  public async start(core: CoreStart) {
-    const serverBasePath = core.injectedMetadata.getInjectedVar('serverBasePath') as string;
+  private managementService?: ManagementService;
 
+  public setup(core: CoreSetup, plugins: PluginsSetup) {
+    const serverBasePath = core.injectedMetadata.getInjectedVar('serverBasePath') as string;
     this.spacesManager = new SpacesManager(serverBasePath, core.http);
+
+    const copySavedObjectsToSpaceService = new CopySavedObjectsToSpaceService();
+    copySavedObjectsToSpaceService.setup({
+      spacesManager: this.spacesManager,
+      managementSetup: plugins.management,
+    });
+
+    const advancedSettingsService = new AdvancedSettingsService();
+    advancedSettingsService.setup({
+      getActiveSpace: () => this.spacesManager.getActiveSpace(),
+      registerSettingsComponent: plugins.__managementLegacyCompat.registerSettingsComponent,
+    });
+
+    if (plugins.home) {
+      plugins.home.featureCatalogue.register(createSpacesFeatureCatalogueEntry());
+    }
+  }
+
+  public start(core: CoreStart, plugins: PluginsStart) {
     initSpacesNavControl(this.spacesManager, core);
 
+    this.managementService = new ManagementService();
+    this.managementService.start({ managementStart: plugins.management });
+
     return {
       spacesManager: this.spacesManager,
     };
   }
 
-  public async setup(core: CoreSetup, plugins: PluginsSetup) {
-    if (plugins.home) {
-      plugins.home.featureCatalogue.register(createSpacesFeatureCatalogueEntry());
+  public stop() {
+    if (this.managementService) {
+      this.managementService.stop();
+      this.managementService = undefined;
     }
   }
 }
diff --git a/x-pack/legacy/plugins/spaces/public/components/__snapshots__/space_avatar.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/space_avatar/__snapshots__/space_avatar.test.tsx.snap
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/__snapshots__/space_avatar.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/space_avatar/__snapshots__/space_avatar.test.tsx.snap
diff --git a/x-pack/legacy/plugins/spaces/public/space_avatar/index.ts b/x-pack/legacy/plugins/spaces/public/space_avatar/index.ts
new file mode 100644
index 0000000000000..1525f2c8c6186
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/space_avatar/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 { SpaceAvatar } from './space_avatar';
+export * from './space_attributes';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/space_attributes.test.ts b/x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/space_attributes.test.ts
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.test.ts
diff --git a/x-pack/legacy/plugins/spaces/public/lib/space_attributes.ts b/x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/space_attributes.ts
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_attributes.ts
diff --git a/x-pack/legacy/plugins/spaces/public/components/space_avatar.test.tsx b/x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/components/space_avatar.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/components/space_avatar.tsx b/x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.tsx
similarity index 98%
rename from x-pack/legacy/plugins/spaces/public/components/space_avatar.tsx
rename to x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.tsx
index 0d9751ca43db9..c89f492a8fc99 100644
--- a/x-pack/legacy/plugins/spaces/public/components/space_avatar.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_avatar/space_avatar.tsx
@@ -8,7 +8,7 @@ import { EuiAvatar, isValidHex } from '@elastic/eui';
 import React, { FC } from 'react';
 import { MAX_SPACE_INITIALS } from '../../common';
 import { Space } from '../../common/model/space';
-import { getSpaceColor, getSpaceInitials, getSpaceImageUrl } from '../lib/space_attributes';
+import { getSpaceColor, getSpaceInitials, getSpaceImageUrl } from './space_attributes';
 
 interface Props {
   space: Partial<Space>;
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/__snapshots__/space_selector.test.tsx.snap b/x-pack/legacy/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/__snapshots__/space_selector.test.tsx.snap
rename to x-pack/legacy/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
index f968897365155..e1cfafd897234 100644
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/__snapshots__/space_selector.test.tsx.snap
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/__snapshots__/space_selector.test.tsx.snap
@@ -4,15 +4,10 @@ exports[`it renders without crashing 1`] = `
 <EuiPage
   className="spcSpaceSelector"
   data-test-subj="kibanaSpaceSelector"
-  restrictWidth={false}
 >
-  <EuiPageBody
-    component="main"
-    restrictWidth={false}
-  >
+  <EuiPageBody>
     <EuiPageHeader
       className="spcSpaceSelector__heading"
-      responsive={true}
     >
       <EuiSpacer
         size="xxl"
@@ -53,7 +48,6 @@ exports[`it renders without crashing 1`] = `
     </EuiPageHeader>
     <EuiPageContent
       className="spcSpaceSelector__pageContent"
-      panelPaddingSize="l"
     >
       <EuiFlexGroup
         alignItems="center"
diff --git a/x-pack/legacy/plugins/spaces/public/space_selector/_index.scss b/x-pack/legacy/plugins/spaces/public/space_selector/_index.scss
new file mode 100644
index 0000000000000..0621aa2a3efd7
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/_index.scss
@@ -0,0 +1,2 @@
+@import './space_selector';
+@import './components/index';
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/_space_selector.scss b/x-pack/legacy/plugins/spaces/public/space_selector/_space_selector.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/_space_selector.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/_space_selector.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/_index.scss b/x-pack/legacy/plugins/spaces/public/space_selector/components/_index.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/_index.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/_index.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/_space_card.scss b/x-pack/legacy/plugins/spaces/public/space_selector/components/_space_card.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/_space_card.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/_space_card.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/_space_cards.scss b/x-pack/legacy/plugins/spaces/public/space_selector/components/_space_cards.scss
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/_space_cards.scss
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/_space_cards.scss
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/index.ts b/x-pack/legacy/plugins/spaces/public/space_selector/components/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/index.ts
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/index.ts
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_card.test.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_card.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_card.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.tsx
similarity index 90%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_card.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.tsx
index 2386f6a6fe9d0..f898ba87c60bd 100644
--- a/x-pack/legacy/plugins/spaces/public/views/components/space_card.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_card.tsx
@@ -4,14 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  // FIXME: need updated typedefs
-  // @ts-ignore
-  EuiCard,
-} from '@elastic/eui';
+import { EuiCard } from '@elastic/eui';
 import React from 'react';
 import { Space } from '../../../common/model/space';
-import { SpaceAvatar } from '../../components';
+import { SpaceAvatar } from '../../space_avatar';
 
 interface Props {
   space: Space;
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_cards.test.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.test.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_cards.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.test.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/views/components/space_cards.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.tsx
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/components/space_cards.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/components/space_cards.tsx
diff --git a/x-pack/legacy/plugins/spaces/public/space_selector/index.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/index.tsx
new file mode 100644
index 0000000000000..c1c1b6dc3a2f3
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/index.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.
+ */
+
+// @ts-ignore
+import template from 'plugins/spaces/space_selector/space_selector.html';
+import chrome from 'ui/chrome';
+import { I18nContext } from 'ui/i18n';
+// @ts-ignore
+import { uiModules } from 'ui/modules';
+
+import React from 'react';
+import { render, unmountComponentAtNode } from 'react-dom';
+import { SpaceSelector } from './space_selector';
+
+import { start as spacesNPStart } from '../legacy';
+
+const module = uiModules.get('spaces_selector', []);
+module.controller('spacesSelectorController', ($scope: any) => {
+  $scope.$$postDigest(() => {
+    const domNode = document.getElementById('spaceSelectorRoot');
+
+    const { spacesManager } = spacesNPStart;
+
+    render(
+      <I18nContext>
+        <SpaceSelector spacesManager={spacesManager!} />
+      </I18nContext>,
+      domNode
+    );
+
+    // unmount react on controller destroy
+    $scope.$on('$destroy', () => {
+      if (domNode) {
+        unmountComponentAtNode(domNode);
+      }
+    });
+  });
+});
+
+chrome.setVisible(false).setRootTemplate(template);
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.html b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.html
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.html
rename to x-pack/legacy/plugins/spaces/public/space_selector/space_selector.html
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.test.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.test.tsx
similarity index 92%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.test.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/space_selector.test.tsx
index 829312061ca98..b4d0f96307500 100644
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.test.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.test.tsx
@@ -6,8 +6,8 @@
 
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { Space } from '../../../common/model/space';
-import { spacesManagerMock } from '../../lib/mocks';
+import { Space } from '../../common/model/space';
+import { spacesManagerMock } from '../spaces_manager/mocks';
 import { SpaceSelector } from './space_selector';
 
 function getSpacesManager(spaces: Space[] = []) {
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.tsx b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.tsx
similarity index 95%
rename from x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.tsx
rename to x-pack/legacy/plugins/spaces/public/space_selector/space_selector.tsx
index d665752b3c8a6..206d38454fa8c 100644
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/space_selector.tsx
+++ b/x-pack/legacy/plugins/spaces/public/space_selector/space_selector.tsx
@@ -19,11 +19,11 @@ import {
   EuiLoadingSpinner,
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
-import { SpacesManager } from 'plugins/spaces/lib';
 import React, { Component, Fragment } from 'react';
-import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../../common/constants';
-import { Space } from '../../../common/model/space';
-import { SpaceCards } from '../components/space_cards';
+import { SpacesManager } from '../spaces_manager';
+import { Space } from '../../common/model/space';
+import { SpaceCards } from './components';
+import { SPACE_SEARCH_COUNT_THRESHOLD } from '../../common/constants';
 
 interface Props {
   spacesManager: SpacesManager;
diff --git a/x-pack/legacy/plugins/spaces/public/spaces_manager/index.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/index.ts
new file mode 100644
index 0000000000000..538dd77e053f5
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/spaces_manager/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 { SpacesManager } from './spaces_manager';
diff --git a/x-pack/legacy/plugins/spaces/public/lib/mocks.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/mocks.ts
similarity index 100%
rename from x-pack/legacy/plugins/spaces/public/lib/mocks.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/mocks.ts
diff --git a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.mock.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
similarity index 87%
rename from x-pack/legacy/plugins/spaces/public/lib/spaces_manager.mock.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
index 69c6f7a452fdd..56879af33916f 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.mock.ts
+++ b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
@@ -6,9 +6,10 @@
 
 import { of, Observable } from 'rxjs';
 import { Space } from '../../common/model/space';
+import { SpacesManager } from './spaces_manager';
 
 function createSpacesManagerMock() {
-  return {
+  return ({
     onActiveSpaceChange$: (of(undefined) as unknown) as Observable<Space>,
     getSpaces: jest.fn().mockResolvedValue([]),
     getSpace: jest.fn().mockResolvedValue(undefined),
@@ -19,7 +20,8 @@ function createSpacesManagerMock() {
     copySavedObjects: jest.fn().mockResolvedValue(undefined),
     resolveCopySavedObjectsErrors: jest.fn().mockResolvedValue(undefined),
     redirectToSpaceSelector: jest.fn().mockResolvedValue(undefined),
-  };
+    changeSelectedSpace: jest.fn(),
+  } as unknown) as jest.Mocked<SpacesManager>;
 }
 
 export const spacesManagerMock = {
diff --git a/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.test.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.test.ts
new file mode 100644
index 0000000000000..f89bfc32a69e6
--- /dev/null
+++ b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.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 { SpacesManager } from '.';
+import { coreMock } from 'src/core/public/mocks';
+import { nextTick } from 'test_utils/enzyme_helpers';
+
+describe('SpacesManager', () => {
+  describe('#constructor', () => {
+    it('attempts to retrieve the active space', () => {
+      const coreStart = coreMock.createStart();
+      new SpacesManager('/server-base-path', coreStart.http);
+      expect(coreStart.http.get).toHaveBeenCalledWith('/internal/spaces/_active_space');
+    });
+
+    it('does not retrieve the active space if on an anonymous path', () => {
+      const coreStart = coreMock.createStart();
+      coreStart.http.anonymousPaths.isAnonymous.mockReturnValue(true);
+      new SpacesManager('/server-base-path', coreStart.http);
+      expect(coreStart.http.get).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('#getActiveSpace', () => {
+    it('attempts to retrieve the active space using the existing get request', async () => {
+      const coreStart = coreMock.createStart();
+      coreStart.http.get.mockResolvedValue({
+        id: 'my-space',
+        name: 'my space',
+      });
+      const spacesManager = new SpacesManager('/server-base-path', coreStart.http);
+      expect(coreStart.http.get).toHaveBeenCalledWith('/internal/spaces/_active_space');
+
+      await nextTick();
+
+      const activeSpace = await spacesManager.getActiveSpace();
+      expect(activeSpace).toEqual({
+        id: 'my-space',
+        name: 'my space',
+      });
+      expect(coreStart.http.get).toHaveBeenCalledTimes(1);
+    });
+
+    it('throws if on an anonymous path', () => {
+      const coreStart = coreMock.createStart();
+      coreStart.http.anonymousPaths.isAnonymous.mockReturnValue(true);
+      const spacesManager = new SpacesManager('/server-base-path', coreStart.http);
+      expect(coreStart.http.get).not.toHaveBeenCalled();
+
+      expect(() => spacesManager.getActiveSpace()).toThrowErrorMatchingInlineSnapshot(
+        `"Cannot retrieve the active space for anonymous paths"`
+      );
+    });
+
+    it('allows for a force-refresh', async () => {
+      const coreStart = coreMock.createStart();
+      coreStart.http.get
+        .mockResolvedValueOnce({
+          id: 'my-space',
+          name: 'my space',
+        })
+        .mockResolvedValueOnce({
+          id: 'my-other-space',
+          name: 'my other space',
+        });
+
+      const spacesManager = new SpacesManager('/server-base-path', coreStart.http);
+      expect(coreStart.http.get).toHaveBeenCalledWith('/internal/spaces/_active_space');
+
+      await nextTick();
+
+      const activeSpace = await spacesManager.getActiveSpace();
+      expect(activeSpace).toEqual({
+        id: 'my-space',
+        name: 'my space',
+      });
+      expect(coreStart.http.get).toHaveBeenCalledTimes(1);
+
+      const newActiveSpace = await spacesManager.getActiveSpace({ forceRefresh: true });
+      expect(newActiveSpace).toEqual({
+        id: 'my-other-space',
+        name: 'my other space',
+      });
+      expect(coreStart.http.get).toHaveBeenCalledTimes(2);
+    });
+
+    it('force-refresh still throws for anonymous paths', async () => {
+      const coreStart = coreMock.createStart();
+      coreStart.http.anonymousPaths.isAnonymous.mockReturnValue(true);
+      coreStart.http.get.mockResolvedValueOnce({
+        id: 'my-space',
+        name: 'my space',
+      });
+
+      const spacesManager = new SpacesManager('/server-base-path', coreStart.http);
+
+      expect(() =>
+        spacesManager.getActiveSpace({ forceRefresh: true })
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Cannot retrieve the active space for anonymous paths"`
+      );
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.ts b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.ts
similarity index 88%
rename from x-pack/legacy/plugins/spaces/public/lib/spaces_manager.ts
rename to x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.ts
index 4fff1ddba08b2..e9c738cf40c69 100644
--- a/x-pack/legacy/plugins/spaces/public/lib/spaces_manager.ts
+++ b/x-pack/legacy/plugins/spaces/public/spaces_manager/spaces_manager.ts
@@ -9,9 +9,9 @@ import { HttpSetup } from 'src/core/public';
 import { SavedObjectsManagementRecord } from '../../../../../../src/legacy/core_plugins/management/public';
 import { Space } from '../../common/model/space';
 import { GetSpacePurpose } from '../../common/model/types';
-import { CopySavedObjectsToSpaceResponse } from './copy_saved_objects_to_space/types';
 import { ENTER_SPACE_PATH } from '../../common/constants';
 import { addSpaceIdToPath } from '../../../../../plugins/spaces/common';
+import { CopySavedObjectsToSpaceResponse } from '../copy_saved_objects_to_space/types';
 
 export class SpacesManager {
   private activeSpace$: BehaviorSubject<Space | null> = new BehaviorSubject<Space | null>(null);
@@ -35,6 +35,9 @@ export class SpacesManager {
   }
 
   public getActiveSpace({ forceRefresh = false } = {}) {
+    if (this.isAnonymousPath()) {
+      throw new Error(`Cannot retrieve the active space for anonymous paths`);
+    }
     if (!forceRefresh && this.activeSpace$.value) {
       return Promise.resolve(this.activeSpace$.value);
     }
@@ -105,7 +108,15 @@ export class SpacesManager {
   }
 
   private async refreshActiveSpace() {
+    // Anonymous paths (such as login/logout) should not request the active space under any circumstances.
+    if (this.isAnonymousPath()) {
+      return;
+    }
     const activeSpace = await this.getActiveSpace({ forceRefresh: true });
     this.activeSpace$.next(activeSpace);
   }
+
+  private isAnonymousPath() {
+    return this.http.anonymousPaths.isAnonymous(window.location.pathname);
+  }
 }
diff --git a/x-pack/legacy/plugins/spaces/public/views/_index.scss b/x-pack/legacy/plugins/spaces/public/views/_index.scss
deleted file mode 100644
index 0cc8ccb10246b..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/_index.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import './components/index';
-@import './management/index';
-@import './nav_control/index';
-@import './space_selector/index'
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/_index.scss b/x-pack/legacy/plugins/spaces/public/views/management/_index.scss
deleted file mode 100644
index e7cbdfe2de7e8..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './components/confirm_delete_modal';
-@import './edit_space/enabled_features/index';
-@import './components/copy_saved_objects_to_space/index';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.test.tsx b/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.test.tsx
deleted file mode 100644
index 7f2b6eee62c45..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/advanced_settings_title/advanced_settings_title.test.tsx
+++ /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 React from 'react';
-import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { AdvancedSettingsTitle } from './advanced_settings_title';
-import { SpaceAvatar } from '../../../../components';
-
-describe('AdvancedSettingsTitle', () => {
-  it('renders without crashing', async () => {
-    const space = {
-      id: 'my-space',
-      name: 'My Space',
-      disabledFeatures: [],
-    };
-
-    const wrapper = mountWithIntl(
-      <AdvancedSettingsTitle getActiveSpace={() => Promise.resolve(space)} />
-    );
-
-    await Promise.resolve();
-    await Promise.resolve();
-    wrapper.update();
-    expect(wrapper.find(SpaceAvatar)).toHaveLength(1);
-  });
-});
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/components/index.ts b/x-pack/legacy/plugins/spaces/public/views/management/components/index.ts
deleted file mode 100644
index 91f4964e1da06..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/components/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 { ConfirmDeleteModal } from './confirm_delete_modal';
-export { UnauthorizedPrompt } from './unauthorized_prompt';
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/index.tsx b/x-pack/legacy/plugins/spaces/public/views/management/index.tsx
deleted file mode 100644
index bf33273c614d6..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/index.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 { i18n } from '@kbn/i18n';
-import 'plugins/spaces/views/management/page_routes';
-import React from 'react';
-import {
-  management,
-  PAGE_SUBTITLE_COMPONENT,
-  PAGE_TITLE_COMPONENT,
-  registerSettingsComponent,
-} from 'ui/management';
-// @ts-ignore
-import routes from 'ui/routes';
-import { setup as managementSetup } from '../../../../../../../src/legacy/core_plugins/management/public/legacy';
-import { AdvancedSettingsSubtitle } from './components/advanced_settings_subtitle';
-import { AdvancedSettingsTitle } from './components/advanced_settings_title';
-import { start as spacesNPStart } from '../../legacy';
-import { CopyToSpaceSavedObjectsManagementAction } from '../../lib/copy_saved_objects_to_space';
-
-const MANAGE_SPACES_KEY = 'spaces';
-
-routes.defaults(/\/management/, {
-  resolve: {
-    spacesManagementSection() {
-      function getKibanaSection() {
-        return management.getSection('kibana');
-      }
-
-      function deregisterSpaces() {
-        getKibanaSection().deregister(MANAGE_SPACES_KEY);
-      }
-
-      function ensureSpagesRegistered() {
-        const kibanaSection = getKibanaSection();
-
-        if (!kibanaSection.hasItem(MANAGE_SPACES_KEY)) {
-          kibanaSection.register(MANAGE_SPACES_KEY, {
-            name: 'spacesManagementLink',
-            order: 10,
-            display: i18n.translate('xpack.spaces.displayName', {
-              defaultMessage: 'Spaces',
-            }),
-            url: `#/management/spaces/list`,
-          });
-        }
-
-        // Customize Saved Objects Management
-        spacesNPStart.then(({ spacesManager }) => {
-          const action = new CopyToSpaceSavedObjectsManagementAction(spacesManager!);
-          // This route resolve function executes any time the management screen is loaded, and we want to ensure
-          // that this action is only registered once.
-          if (!managementSetup.savedObjects.registry.has(action.id)) {
-            managementSetup.savedObjects.registry.register(action);
-          }
-        });
-
-        const getActiveSpace = async () => {
-          const { spacesManager } = await spacesNPStart;
-          return spacesManager!.getActiveSpace();
-        };
-
-        const PageTitle = () => <AdvancedSettingsTitle getActiveSpace={getActiveSpace} />;
-        registerSettingsComponent(PAGE_TITLE_COMPONENT, PageTitle, true);
-
-        const SubTitle = () => <AdvancedSettingsSubtitle getActiveSpace={getActiveSpace} />;
-        registerSettingsComponent(PAGE_SUBTITLE_COMPONENT, SubTitle, true);
-      }
-
-      deregisterSpaces();
-
-      ensureSpagesRegistered();
-    },
-  },
-});
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/breadcrumbs.ts b/x-pack/legacy/plugins/spaces/public/views/management/lib/breadcrumbs.ts
deleted file mode 100644
index a4e8ba508b617..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/breadcrumbs.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 { MANAGEMENT_BREADCRUMB } from 'ui/management/breadcrumbs';
-import { Space } from '../../../../common/model/space';
-
-export function getListBreadcrumbs() {
-  return [
-    MANAGEMENT_BREADCRUMB,
-    {
-      text: 'Spaces',
-      href: '#/management/spaces/list',
-    },
-  ];
-}
-
-export function getCreateBreadcrumbs() {
-  return [
-    ...getListBreadcrumbs(),
-    {
-      text: 'Create',
-    },
-  ];
-}
-
-export function getEditBreadcrumbs(space?: Space) {
-  return [
-    ...getListBreadcrumbs(),
-    {
-      text: space ? space.name : '...',
-    },
-  ];
-}
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.ts b/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.ts
deleted file mode 100644
index ef46a53967744..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/feature_utils.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 { Feature } from '../../../../../../../plugins/features/public';
-
-import { Space } from '../../../../common/model/space';
-
-export function getEnabledFeatures(features: Feature[], space: Partial<Space>) {
-  return features.filter(feature => !(space.disabledFeatures || []).includes(feature.id));
-}
diff --git a/x-pack/legacy/plugins/spaces/public/views/management/lib/index.ts b/x-pack/legacy/plugins/spaces/public/views/management/lib/index.ts
deleted file mode 100644
index f65757f5dba26..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/lib/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 { toSpaceIdentifier, isValidSpaceIdentifier } from './space_identifier_utils';
-
-export { SpaceValidator } from './validate_space';
-
-export { getCreateBreadcrumbs, getEditBreadcrumbs, getListBreadcrumbs } from './breadcrumbs';
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
deleted file mode 100644
index d8fd0298df2fc..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/management/page_routes.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-// @ts-ignore
-import template from 'plugins/spaces/views/management/template.html';
-import React from 'react';
-import { render, unmountComponentAtNode } from 'react-dom';
-import { I18nContext } from 'ui/i18n';
-// @ts-ignore
-import routes from 'ui/routes';
-import { npStart } from 'ui/new_platform';
-import { ManageSpacePage } from './edit_space';
-import { getCreateBreadcrumbs, getEditBreadcrumbs, getListBreadcrumbs } from './lib';
-import { SpacesGridPage } from './spaces_grid';
-
-import { start as spacesNPStart } from '../../legacy';
-
-const reactRootNodeId = 'manageSpacesReactRoot';
-
-routes.when('/management/spaces/list', {
-  template,
-  k7Breadcrumbs: getListBreadcrumbs,
-  requireUICapability: 'management.kibana.spaces',
-  controller($scope: any) {
-    $scope.$$postDigest(async () => {
-      const domNode = document.getElementById(reactRootNodeId);
-
-      const { spacesManager } = await spacesNPStart;
-
-      render(
-        <I18nContext>
-          <SpacesGridPage
-            spacesManager={spacesManager!}
-            capabilities={npStart.core.application.capabilities}
-          />
-        </I18nContext>,
-        domNode
-      );
-
-      // unmount react on controller destroy
-      $scope.$on('$destroy', () => {
-        if (domNode) {
-          unmountComponentAtNode(domNode);
-        }
-      });
-    });
-  },
-});
-
-routes.when('/management/spaces/create', {
-  template,
-  k7Breadcrumbs: getCreateBreadcrumbs,
-  requireUICapability: 'management.kibana.spaces',
-  controller($scope: any) {
-    $scope.$$postDigest(async () => {
-      const domNode = document.getElementById(reactRootNodeId);
-
-      const { spacesManager } = await spacesNPStart;
-
-      render(
-        <I18nContext>
-          <ManageSpacePage
-            spacesManager={spacesManager!}
-            capabilities={npStart.core.application.capabilities}
-          />
-        </I18nContext>,
-        domNode
-      );
-
-      // unmount react on controller destroy
-      $scope.$on('$destroy', () => {
-        if (domNode) {
-          unmountComponentAtNode(domNode);
-        }
-      });
-    });
-  },
-});
-
-routes.when('/management/spaces/edit', {
-  redirectTo: '/management/spaces/list',
-});
-
-routes.when('/management/spaces/edit/:spaceId', {
-  template,
-  k7Breadcrumbs: () => getEditBreadcrumbs(),
-  requireUICapability: 'management.kibana.spaces',
-  controller($scope: any, $route: any) {
-    $scope.$$postDigest(async () => {
-      const domNode = document.getElementById(reactRootNodeId);
-
-      const { spaceId } = $route.current.params;
-
-      const { spacesManager } = await spacesNPStart;
-
-      render(
-        <I18nContext>
-          <ManageSpacePage
-            spaceId={spaceId}
-            spacesManager={spacesManager!}
-            setBreadcrumbs={npStart.core.chrome.setBreadcrumbs}
-            capabilities={npStart.core.application.capabilities}
-          />
-        </I18nContext>,
-        domNode
-      );
-
-      // unmount react on controller destroy
-      $scope.$on('$destroy', () => {
-        if (domNode) {
-          unmountComponentAtNode(domNode);
-        }
-      });
-    });
-  },
-});
diff --git a/x-pack/legacy/plugins/spaces/public/views/nav_control/_index.scss b/x-pack/legacy/plugins/spaces/public/views/nav_control/_index.scss
deleted file mode 100644
index 192091fb04e3c..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/nav_control/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './components/index';
diff --git a/x-pack/legacy/plugins/spaces/public/views/space_selector/_index.scss b/x-pack/legacy/plugins/spaces/public/views/space_selector/_index.scss
deleted file mode 100644
index f23ac662dce1d..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './space_selector';
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
deleted file mode 100644
index c520c2683c965..0000000000000
--- a/x-pack/legacy/plugins/spaces/public/views/space_selector/index.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-// @ts-ignore
-import template from 'plugins/spaces/views/space_selector/space_selector.html';
-import chrome from 'ui/chrome';
-import { I18nContext } from 'ui/i18n';
-// @ts-ignore
-import { uiModules } from 'ui/modules';
-
-import React from 'react';
-import { render, unmountComponentAtNode } from 'react-dom';
-import { SpaceSelector } from './space_selector';
-
-import { start as spacesNPStart } from '../../legacy';
-
-const module = uiModules.get('spaces_selector', []);
-module.controller('spacesSelectorController', ($scope: any) => {
-  $scope.$$postDigest(async () => {
-    const domNode = document.getElementById('spaceSelectorRoot');
-
-    const { spacesManager } = await spacesNPStart;
-
-    render(
-      <I18nContext>
-        <SpaceSelector spacesManager={spacesManager!} />
-      </I18nContext>,
-      domNode
-    );
-
-    // unmount react on controller destroy
-    $scope.$on('$destroy', () => {
-      if (domNode) {
-        unmountComponentAtNode(domNode);
-      }
-    });
-  });
-});
-
-chrome.setVisible(false).setRootTemplate(template);
diff --git a/x-pack/legacy/plugins/task_manager/README.md b/x-pack/legacy/plugins/task_manager/README.md
deleted file mode 100644
index 9ca873e77fe68..0000000000000
--- a/x-pack/legacy/plugins/task_manager/README.md
+++ /dev/null
@@ -1,377 +0,0 @@
-# Kibana task manager
-
-The task manager is a generic system for running background tasks. It supports:
-
-- Single-run and recurring tasks
-- Scheduling tasks to run after a specified datetime
-- Basic retry logic
-- Recovery of stalled tasks / timeouts
-- Tracking task state across multiple runs
-- Configuring the run-parameters for specific tasks
-- Basic coordination to prevent the same task instance from running on more than one Kibana system at a time
-
-## Implementation details
-
-At a high-level, the task manager works like this:
-
-- Every `{poll_interval}` milliseconds, check the `{index}` for any tasks that need to be run:
-  - `runAt` is past
-  - `attempts` is less than the configured threshold
-- Attempt to claim the task by using optimistic concurrency to set:
-  - status to `running`
-  - `startedAt` to now
-  - `retryAt` to next time task should retry if it times out and is still in `running` status
-- Execute the task, if the previous claim succeeded
-- If the task fails, increment the `attempts` count and reschedule it
-- If the task succeeds:
-  - If it is recurring, store the result of the run, and reschedule
-  - If it is not recurring, remove it from the index
-
-## Pooling
-
-Each task manager instance runs tasks in a pool which ensures that at most N tasks are run at a time, where N is configurable. This prevents the system from running too many tasks at once in resource constrained environments. In addition to this, each individual task type definition can have `numWorkers` specified, which tells the system how many workers are consumed by a single running instance of a task. This effectively limits how many tasks of a given type can be run at once.
-
-For example, we may have a system with a `max_workers` of 10, but a super expensive task (such as `reporting`) which specifies a `numWorkers` of 10. In this case, `reporting` tasks will run one at a time.
-
-If a task specifies a higher `numWorkers` than the system supports, the system's `max_workers` setting will be substituted for it.
-
-## Config options
-
-The task_manager can be configured via `taskManager` config options (e.g. `taskManager.maxAttempts`):
-
-- `max_attempts` - The maximum number of times a task will be attempted before being abandoned as failed
-- `poll_interval` - How often the background worker should check the task_manager index for more work
-- `index` - The name of the index that the task_manager
-- `max_workers` - The maximum number of tasks a Kibana will run concurrently (defaults to 10)
-- `credentials` - Encrypted user credentials. All tasks will run in the security context of this user. See [this issue](https://github.com/elastic/dev/issues/1045) for a discussion on task scheduler security.
-- `override_num_workers`: An object of `taskType: number` that overrides the `num_workers` for tasks
-  - For example: `task_manager.override_num_workers.reporting: 2` would override the number of workers occupied by tasks of type `reporting`
-  - This allows sysadmins to tweak the operational performance of Kibana, allowing more or fewer tasks of a specific type to run simultaneously
-
-## Task definitions
-
-Plugins define tasks by calling the `registerTaskDefinitions` method on the `server.plugins.task_manager` object.
-
-A sample task can be found in the [x-pack/test/plugin_api_integration/plugins/task_manager](../../test/plugin_api_integration/plugins/task_manager/index.js) folder.
-
-```js
-const taskManager = server.plugins.task_manager;
-taskManager.registerTaskDefinitions({
-  // clusterMonitoring is the task type, and must be unique across the entire system
-  clusterMonitoring: {
-    // Human friendly name, used to represent this task in logs, UI, etc
-    title: 'Human friendly name',
-
-    // Optional, human-friendly, more detailed description
-    description: 'Amazing!!',
-
-    // Optional, how long, in minutes or seconds, the system should wait before
-    // a running instance of this task is considered to be timed out.
-    // This defaults to 5 minutes.
-    timeout: '5m',
-
-    // Optional, how many attempts before marking task as failed.
-    // This defaults to what is configured at the task manager level.
-    maxAttempts: 5,
-
-    // The clusterMonitoring task occupies 2 workers, so if the system has 10 worker slots,
-    // 5 clusterMonitoring tasks could run concurrently per Kibana instance. This value is
-    // overridden by the `override_num_workers` config value, if specified.
-    numWorkers: 2,
-
-    // The createTaskRunner function / method returns an object that is responsible for
-    // performing the work of the task. context: { taskInstance }, is documented below.
-    createTaskRunner(context) {
-      return {
-        // Perform the work of the task. The return value should fit the TaskResult interface, documented
-        // below. Invalid return values will result in a logged warning.
-        async run() {
-          // Do some work
-          // Conditionally send some alerts
-          // Return some result or other...
-        },
-
-        // Optional, will be called if a running instance of this task times out, allowing the task
-        // to attempt to clean itself up.
-        async cancel() {
-          // Do whatever is required to cancel this task, such as killing any spawned processes
-        },
-      };
-    },
-  },
-});
-```
-
-When Kibana attempts to claim and run a task instance, it looks its definition up, and executes its createTaskRunner's method, passing it a run context which looks like this:
-
-```js
-{
-  // The data associated with this instance of the task, with two properties being most notable:
-  //
-  // params:
-  // An object, specific to this task instance, used by the
-  // task to determine exactly what work should be performed.
-  // e.g. a cluster-monitoring task might have a `clusterName`
-  // property in here, but a movie-monitoring task might have
-  // a `directorName` property.
-  //
-  // state:
-  // The state returned from the previous run of this task instance.
-  // If this task instance has never succesfully run, this will
-  // be an empty object: {}
-  taskInstance,
-}
-```
-
-## Task result
-
-The task runner's `run` method is expected to return a promise that resolves to undefined or to an object that looks like the following:
-```js
-{
-  // Optional, if specified, this is used as the tasks' nextRun, overriding
-  // the default system scheduler.
-  runAt: "2020-07-24T17:34:35.272Z",
-
-  // Optional, an error object, logged out as a warning. The pressence of this
-  // property indicates that the task did not succeed.
-  error: { message: 'Hrumph!' },
-
-  // Optional, this will be passed into the next run of the task, if
-  // this is a recurring task.
-  state: {
-    anything: 'goes here',
-  },
-}
-```
-
-Other return values will result in a warning, but the system should continue to work.
-
-## Task instances
-
-The task_manager module will store scheduled task instances in an index. This allows for recovery of failed tasks, coordination across Kibana clusters, persistence across Kibana reboots, etc.
-
-The data stored for a task instance looks something like this:
-
-```js
-{
-  // The type of task that will run this instance.
-  taskType: 'clusterMonitoring',
-
-  // The next time this task instance should run. It is not guaranteed
-  // to run at this time, but it is guaranteed not to run earlier than
-  // this.
-  runAt: "2020-07-24T17:34:35.272Z",
-
-  // Indicates that this is a recurring task. We currently only support
-  // minute syntax `5m` or second syntax `10s`.
-  interval: '5m',
-
-  // How many times this task has been unsuccesfully attempted,
-  // this will be reset to 0 if the task ever succesfully completes.
-  // This is incremented if a task fails or times out.
-  attempts: 0,
-
-  // Currently, this is either idle | claiming | running | failed. It is used to
-  // coordinate which Kibana instance owns / is running a specific
-  // task instance.
-  // idle: Task Instance isn't being worked on
-  // claiming: A Kibana instance has claimed ownership but hasn't started running
-  //           the Task Instance yet
-  // running: A Kibana instance has began working on the Task Instance
-  // failed: The last run of the Task Instance failed, waiting to retry
-  status: 'idle',
-
-  // The params specific to this task instance, which will be
-  // passed to the task when it runs, and will be used by the
-  // task to determine exactly what work should be performed.
-  // This is a JSON blob, and will be different per task type.
-  // e.g. a cluster-monitoring task might have a `clusterName`
-  // property in here, but a movie-monitoring task might have
-  // a `directorName` property.
-  params: '{ "task": "specific stuff here" }',
-
-  // The result of the previous run of this task instance. This
-  // will be passed to the next run of the task, along with the
-  // params, and could be used by a task to do special logic If
-  // the task state changes (e.g. from green to red, or foo to bar)
-  // If there was no previous run (e.g. the instance has never succesfully
-  // completed, this will be an empty object.). This is a JSON blob,
-  // and will be different per task type.
-  state: '{ "status": "green" }',
-
-  // An extension point for 3rd parties to build in security features on
-  // top of the task manager. For example, this might be the token of the user
-  // who scheduled this task.
-  userContext: 'the token of the user who scheduled this task',
-
-  // An extension point for 3rd parties to build in security features on
-  // top of the task manager, and is expected to be the id of the user, if any,
-  // that scheduled this task.
-  user: '23lk3l42',
-
-  // An application-specific designation, allowing different Kibana
-  // plugins / apps to query for only those tasks they care about.
-  scope: ['alerting'],
-
-  // The Kibana UUID of the Kibana instance who last claimed ownership for running this task.
-  ownerId: '123e4567-e89b-12d3-a456-426655440000'
-}
-```
-
-## Programmatic access
-
-The task manager mixin exposes a taskManager object on the Kibana server which plugins can use to manage scheduled tasks. Each method takes an optional `scope` argument and ensures that only tasks with the specified scope(s) will be affected.
-
-### schedule
-Using `schedule` you can instruct TaskManger to schedule an instance of a TaskType at some point in the future.
-
-```js
-const taskManager = server.plugins.task_manager;
-// Schedules a task. All properties are as documented in the previous
-// storage section, except that here, params is an object, not a JSON
-// string.
-const task = await taskManager.schedule({
-  taskType,
-  runAt,
-  interval,
-  params,
-  scope: ['my-fanci-app'],
-});
-
-// Removes the specified task
-await manager.remove(task.id);
-
-// Fetches tasks, supports pagination, via the search-after API:
-// https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-search-after.html
-// If scope is not specified, all tasks are returned, otherwise only tasks
-// with the given scope are returned.
-const results = await manager.find({ scope: 'my-fanci-app', searchAfter: ['ids'] });
-
-// results look something like this:
-{
-  searchAfter: ['233322'],
-  // Tasks is an array of task instances
-  tasks: [{
-    id: '3242342',
-    taskType: 'reporting',
-    // etc
-  }]
-}
-```
-
-### ensureScheduling
-When using the `schedule` api to schedule a Task you can provide a hard coded `id` on the Task. This tells TaskManager to use this `id` to identify the Task Instance rather than generate an `id` on its own.
-The danger is that in such a situation, a Task with that same `id` might already have been scheduled at some earlier point, and this would result in an error. In some cases, this is the expected behavior, but often you only care about ensuring the task has been _scheduled_ and don't need it to be scheduled a fresh.
-
-To achieve this you should use the `ensureScheduling` api which has the exact same behavior as `schedule`, except it allows the scheduling of a Task with an `id` that's already in assigned to another Task and it will assume that the existing Task is the one you wished to `schedule`, treating this as a successful operation.
-
-### runNow
-Using `runNow` you can instruct TaskManger to run an existing task on-demand, without waiting for its scheduled time to be reached.
-
-```js
-const taskManager = server.plugins.task_manager;
-
-try {
-  const taskRunResult = await taskManager.runNow('91760f10-ba42-de9799');
-  // If no error is thrown, the task has completed successfully.
-} catch(err: Error) {
-  // If running the task has failed, we throw an error with an appropriate message.
-  // For example, if the requested task doesnt exist: `Error: failed to run task "91760f10-ba42-de9799" as it does not exist`
-  // Or if, for example, the task is already running: `Error: failed to run task "91760f10-ba42-de9799" as it is currently running`
-}
-```
-
-
-### more options
-
-More custom access to the tasks can be done directly via Elasticsearch, though that won't be officially supported, as we can change the document structure at any time.
-
-## Middleware
-
-The task manager exposes a middleware layer that allows modifying tasks before they are scheduled / persisted to the task manager index, and modifying tasks / the run context before a task is run.
-
-For example:
-
-```js
-// In your plugin's init
-server.plugins.task_manager.addMiddleware({
-  async beforeSave({ taskInstance, ...opts }) {
-    console.log(`About to save a task of type ${taskInstance.taskType}`);
-
-    return {
-      ...opts,
-      taskInstance: {
-        ...taskInstance,
-        params: {
-          ...taskInstance.params,
-          example: 'Added to params!',
-        },
-      },
-    };
-  },
-
-  async beforeRun({ taskInstance, ...opts }) {
-    console.log(`About to run ${taskInstance.taskType} ${taskInstance.id}`);
-    const { example, ...taskWithoutExampleProp } = taskInstance;
-
-    return {
-      ...opts,
-      taskInstance: taskWithoutExampleProp,
-    };
-  },
-});
-```
-
-## Task Poller: polling for work
-TaskManager used to work in a `pull` model, but it now needs to support both `push` and `pull`, so it has been remodeled internally to support a single `push` model.
-
-Task Manager's _push_ mechanism is driven by the following operations:
-
-1. A polling interval has been reached.
-2. A new Task is scheduled.
-3. A Task is run using `runNow`.
-
-The polling interval is straight forward: TaskPoller is configured to emit an event at a fixed interval.
-That said, if there are no workers available, we want to ignore these events, so we'll throttle the interval on worker availability.
-
-Whenever a user uses the `schedule` api to schedule a new Task, we want to trigger an early polling in order to respond to the newly scheduled task as soon as possible, but this too we only wish to do if there are available workers, so we can throttle this too.
-
-When a `runNow` call is made we need to force a poll as the user will now be waiting on the result of the `runNow` call, but
-there is a complexity here- we don't want to force polling (as there might not be any worker capacity and it's possible that a polling cycle is already running), but we also can't throttle, as we can't afford to "drop" these requests, so we'll have to buffer these.
-
-We now want to respond to all three of these push events, but we still need to balance against our worker capacity, so if there are too many requests buffered, we only want to `take` as many requests as we have capacity to handle.
-Luckily, `Polling Interval` and `Task Scheduled` simply denote a request to "poll for work as soon as possible", unlike `Run Task Now` which also means "poll for these specific tasks", so our worker capacity only needs to be applied to `Run Task Now`.
-
-We achieve this model by buffering requests into a queue using a Set (which removes duplicated). As we don't want an unbounded queue in our system, we have limited the size of this queue (configurable by the `xpack.task_manager.request_capacity` config, defaulting to 1,000 requests) which forces us to throw an error once this cap is reachedand to all subsequent calls to `runNow` until the queue drain bellow the cap.
-
-Our current model, then, is this:
-```
-  Polling Interval  --> filter(availableWorkers > 0) - mapTo([]) -------\\ 
-  Task Scheduled    --> filter(availableWorkers > 0) - mapTo([]) --------||==>Set([]+[]+[`1`,`2`]) ==> work([`1`,`2`])
-  Run Task `1` Now --\                                                  //
-                      ----> buffer(availableWorkers > 0) -- [`1`,`2`] -// 
-  Run Task `2` Now --/
-```
-
-## Limitations in v1.0
-
-In v1, the system only understands 1 minute increments (e.g. '1m', '7m'). Tasks which need something more robust will need to specify their own "runAt" in their run method's return value.
-
-There is only a rudimentary mechanism for coordinating tasks and handling expired tasks. Tasks are considered expired if their runAt has arrived, and their status is still 'running'.
-
-There is no task history. Each run overwrites the previous run's state. One-time tasks are removed from the index upon completion regardless of success / failure.
-
-The task manager's public API is create / delete / list. Updates aren't directly supported, and listing should be scoped so that users only see their own tasks.
-
-## Testing
-
-- Unit tests:
-   ```
-   cd x-pack
-   node scripts/jest --testPathPattern=task_manager --watch
-   ```
-- Integration tests:
-   ```
-   node scripts/functional_tests_server.js --config x-pack/test/plugin_api_integration/config.js
-   node scripts/functional_test_runner --config x-pack/test/plugin_api_integration/config.js
-   ```
diff --git a/x-pack/legacy/plugins/task_manager/index.ts b/x-pack/legacy/plugins/task_manager/index.ts
index 6f2bc3704bb67..276d1ea3accea 100644
--- a/x-pack/legacy/plugins/task_manager/index.ts
+++ b/x-pack/legacy/plugins/task_manager/index.ts
@@ -4,97 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Root } from 'joi';
-import { Legacy } from 'kibana';
-import { Plugin, PluginSetupContract } from './plugin';
-import { SavedObjectsSerializer, SavedObjectsSchema } from '../../../../src/core/server';
-import mappings from './mappings.json';
-import { migrations } from './migrations';
-
-export { PluginSetupContract as TaskManager };
-export {
-  TaskInstance,
-  ConcreteTaskInstance,
-  TaskRunCreatorFunction,
-  TaskStatus,
-  RunContext,
-} from './task';
-
-export function taskManager(kibana: any) {
-  return new kibana.Plugin({
-    id: 'task_manager',
-    require: ['kibana', 'elasticsearch', 'xpack_main'],
-    configPrefix: 'xpack.task_manager',
-    config(Joi: Root) {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-        max_attempts: Joi.number()
-          .description(
-            'The maximum number of times a task will be attempted before being abandoned as failed'
-          )
-          .min(1)
-          .default(3),
-        poll_interval: Joi.number()
-          .description('How often, in milliseconds, the task manager will look for more work.')
-          .min(100)
-          .default(3000),
-        request_capacity: Joi.number()
-          .description('How many requests can Task Manager buffer before it rejects new requests.')
-          .min(1)
-          // a nice round contrived number, feel free to change as we learn how it behaves
-          .default(1000),
-        index: Joi.string()
-          .description('The name of the index used to store task information.')
-          .default('.kibana_task_manager')
-          .invalid(['.tasks']),
-        max_workers: Joi.number()
-          .description(
-            'The maximum number of tasks that this Kibana instance will run simultaneously.'
-          )
-          .min(1) // disable the task manager rather than trying to specify it with 0 workers
-          .default(10),
-      }).default();
-    },
-    init(server: Legacy.Server) {
-      const plugin = new Plugin({
-        logger: {
-          get: () => ({
-            info: (message: string) => server.log(['info', 'task_manager'], message),
-            debug: (message: string) => server.log(['debug', 'task_manager'], message),
-            warn: (message: string) => server.log(['warn', 'task_manager'], message),
-            error: (message: string) => server.log(['error', 'task_manager'], message),
-          }),
-        },
-      });
-      const schema = new SavedObjectsSchema(this.kbnServer.uiExports.savedObjectSchemas);
-      const serializer = new SavedObjectsSerializer(schema);
-      const setupContract = plugin.setup(
-        {},
-        {
-          serializer,
-          config: server.config(),
-          elasticsearch: server.plugins.elasticsearch,
-          savedObjects: server.savedObjects,
-        }
-      );
-      this.kbnServer.afterPluginsInit(() => {
-        plugin.start();
-      });
-      server.expose(setupContract);
-    },
-    uiExports: {
-      mappings,
-      migrations,
-      savedObjectSchemas: {
-        task: {
-          hidden: true,
-          isNamespaceAgnostic: true,
-          convertToAliasScript: `ctx._id = ctx._source.type + ':' + ctx._id`,
-          indexPattern(config: any) {
-            return config.get('xpack.task_manager.index');
-          },
-        },
-      },
-    },
-  });
-}
+export * from './server/';
diff --git a/x-pack/legacy/plugins/task_manager/mappings.json b/x-pack/legacy/plugins/task_manager/mappings.json
deleted file mode 100644
index 96653a4de1b31..0000000000000
--- a/x-pack/legacy/plugins/task_manager/mappings.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "task": {
-    "properties": {
-      "taskType": {
-        "type": "keyword"
-      },
-      "scheduledAt": {
-        "type": "date"
-      },
-      "runAt": {
-        "type": "date"
-      },
-      "startedAt": {
-        "type": "date"
-      },
-      "retryAt": {
-        "type": "date"
-      },
-      "interval": {
-        "type": "text"
-      },
-      "attempts": {
-        "type": "integer"
-      },
-      "status": {
-        "type": "keyword"
-      },
-      "params": {
-        "type": "text"
-      },
-      "state": {
-        "type": "text"
-      },
-      "user": {
-        "type": "keyword"
-      },
-      "scope": {
-        "type": "keyword"
-      },
-      "ownerId": {
-        "type": "keyword"
-      }
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/task_manager/migrations.ts b/x-pack/legacy/plugins/task_manager/migrations.ts
deleted file mode 100644
index 65ca38d0b447d..0000000000000
--- a/x-pack/legacy/plugins/task_manager/migrations.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.
- */
-
-// Task manager uses an unconventional directory structure so the linter marks this as a violation, server files should
-// be moved under task_manager/server/
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObject } from 'src/core/server';
-
-export const migrations = {
-  task: {
-    '7.4.0': (doc: SavedObject) => ({
-      ...doc,
-      updated_at: new Date().toISOString(),
-    }),
-  },
-};
diff --git a/x-pack/legacy/plugins/task_manager/server/README.md b/x-pack/legacy/plugins/task_manager/server/README.md
new file mode 100644
index 0000000000000..3afcb758260c0
--- /dev/null
+++ b/x-pack/legacy/plugins/task_manager/server/README.md
@@ -0,0 +1,377 @@
+# Kibana task manager
+
+The task manager is a generic system for running background tasks. It supports:
+
+- Single-run and recurring tasks
+- Scheduling tasks to run after a specified datetime
+- Basic retry logic
+- Recovery of stalled tasks / timeouts
+- Tracking task state across multiple runs
+- Configuring the run-parameters for specific tasks
+- Basic coordination to prevent the same task instance from running on more than one Kibana system at a time
+
+## Implementation details
+
+At a high-level, the task manager works like this:
+
+- Every `{poll_interval}` milliseconds, check the `{index}` for any tasks that need to be run:
+  - `runAt` is past
+  - `attempts` is less than the configured threshold
+- Attempt to claim the task by using optimistic concurrency to set:
+  - status to `running`
+  - `startedAt` to now
+  - `retryAt` to next time task should retry if it times out and is still in `running` status
+- Execute the task, if the previous claim succeeded
+- If the task fails, increment the `attempts` count and reschedule it
+- If the task succeeds:
+  - If it is recurring, store the result of the run, and reschedule
+  - If it is not recurring, remove it from the index
+
+## Pooling
+
+Each task manager instance runs tasks in a pool which ensures that at most N tasks are run at a time, where N is configurable. This prevents the system from running too many tasks at once in resource constrained environments. In addition to this, each individual task type definition can have `numWorkers` specified, which tells the system how many workers are consumed by a single running instance of a task. This effectively limits how many tasks of a given type can be run at once.
+
+For example, we may have a system with a `max_workers` of 10, but a super expensive task (such as `reporting`) which specifies a `numWorkers` of 10. In this case, `reporting` tasks will run one at a time.
+
+If a task specifies a higher `numWorkers` than the system supports, the system's `max_workers` setting will be substituted for it.
+
+## Config options
+
+The task_manager can be configured via `taskManager` config options (e.g. `taskManager.maxAttempts`):
+
+- `max_attempts` - The maximum number of times a task will be attempted before being abandoned as failed
+- `poll_interval` - How often the background worker should check the task_manager index for more work
+- `index` - The name of the index that the task_manager
+- `max_workers` - The maximum number of tasks a Kibana will run concurrently (defaults to 10)
+- `credentials` - Encrypted user credentials. All tasks will run in the security context of this user. See [this issue](https://github.com/elastic/dev/issues/1045) for a discussion on task scheduler security.
+- `override_num_workers`: An object of `taskType: number` that overrides the `num_workers` for tasks
+  - For example: `task_manager.override_num_workers.reporting: 2` would override the number of workers occupied by tasks of type `reporting`
+  - This allows sysadmins to tweak the operational performance of Kibana, allowing more or fewer tasks of a specific type to run simultaneously
+
+## Task definitions
+
+Plugins define tasks by calling the `registerTaskDefinitions` method on the `server.plugins.task_manager` object.
+
+A sample task can be found in the [x-pack/test/plugin_api_integration/plugins/task_manager](../../test/plugin_api_integration/plugins/task_manager/index.js) folder.
+
+```js
+const taskManager = server.plugins.task_manager;
+taskManager.registerTaskDefinitions({
+  // clusterMonitoring is the task type, and must be unique across the entire system
+  clusterMonitoring: {
+    // Human friendly name, used to represent this task in logs, UI, etc
+    title: 'Human friendly name',
+
+    // Optional, human-friendly, more detailed description
+    description: 'Amazing!!',
+
+    // Optional, how long, in minutes or seconds, the system should wait before
+    // a running instance of this task is considered to be timed out.
+    // This defaults to 5 minutes.
+    timeout: '5m',
+
+    // Optional, how many attempts before marking task as failed.
+    // This defaults to what is configured at the task manager level.
+    maxAttempts: 5,
+
+    // The clusterMonitoring task occupies 2 workers, so if the system has 10 worker slots,
+    // 5 clusterMonitoring tasks could run concurrently per Kibana instance. This value is
+    // overridden by the `override_num_workers` config value, if specified.
+    numWorkers: 2,
+
+    // The createTaskRunner function / method returns an object that is responsible for
+    // performing the work of the task. context: { taskInstance }, is documented below.
+    createTaskRunner(context) {
+      return {
+        // Perform the work of the task. The return value should fit the TaskResult interface, documented
+        // below. Invalid return values will result in a logged warning.
+        async run() {
+          // Do some work
+          // Conditionally send some alerts
+          // Return some result or other...
+        },
+
+        // Optional, will be called if a running instance of this task times out, allowing the task
+        // to attempt to clean itself up.
+        async cancel() {
+          // Do whatever is required to cancel this task, such as killing any spawned processes
+        },
+      };
+    },
+  },
+});
+```
+
+When Kibana attempts to claim and run a task instance, it looks its definition up, and executes its createTaskRunner's method, passing it a run context which looks like this:
+
+```js
+{
+  // The data associated with this instance of the task, with two properties being most notable:
+  //
+  // params:
+  // An object, specific to this task instance, used by the
+  // task to determine exactly what work should be performed.
+  // e.g. a cluster-monitoring task might have a `clusterName`
+  // property in here, but a movie-monitoring task might have
+  // a `directorName` property.
+  //
+  // state:
+  // The state returned from the previous run of this task instance.
+  // If this task instance has never succesfully run, this will
+  // be an empty object: {}
+  taskInstance,
+}
+```
+
+## Task result
+
+The task runner's `run` method is expected to return a promise that resolves to undefined or to an object that looks like the following:
+```js
+{
+  // Optional, if specified, this is used as the tasks' nextRun, overriding
+  // the default system scheduler.
+  runAt: "2020-07-24T17:34:35.272Z",
+
+  // Optional, an error object, logged out as a warning. The pressence of this
+  // property indicates that the task did not succeed.
+  error: { message: 'Hrumph!' },
+
+  // Optional, this will be passed into the next run of the task, if
+  // this is a recurring task.
+  state: {
+    anything: 'goes here',
+  },
+}
+```
+
+Other return values will result in a warning, but the system should continue to work.
+
+## Task instances
+
+The task_manager module will store scheduled task instances in an index. This allows for recovery of failed tasks, coordination across Kibana clusters, persistence across Kibana reboots, etc.
+
+The data stored for a task instance looks something like this:
+
+```js
+{
+  // The type of task that will run this instance.
+  taskType: 'clusterMonitoring',
+
+  // The next time this task instance should run. It is not guaranteed
+  // to run at this time, but it is guaranteed not to run earlier than
+  // this.
+  runAt: "2020-07-24T17:34:35.272Z",
+
+  // Indicates that this is a recurring task. We currently only support
+  // interval syntax with either minutes such as `5m` or seconds `10s`.
+  schedule: { interval: '5m' },
+
+  // How many times this task has been unsuccesfully attempted,
+  // this will be reset to 0 if the task ever succesfully completes.
+  // This is incremented if a task fails or times out.
+  attempts: 0,
+
+  // Currently, this is either idle | claiming | running | failed. It is used to
+  // coordinate which Kibana instance owns / is running a specific
+  // task instance.
+  // idle: Task Instance isn't being worked on
+  // claiming: A Kibana instance has claimed ownership but hasn't started running
+  //           the Task Instance yet
+  // running: A Kibana instance has began working on the Task Instance
+  // failed: The last run of the Task Instance failed, waiting to retry
+  status: 'idle',
+
+  // The params specific to this task instance, which will be
+  // passed to the task when it runs, and will be used by the
+  // task to determine exactly what work should be performed.
+  // This is a JSON blob, and will be different per task type.
+  // e.g. a cluster-monitoring task might have a `clusterName`
+  // property in here, but a movie-monitoring task might have
+  // a `directorName` property.
+  params: '{ "task": "specific stuff here" }',
+
+  // The result of the previous run of this task instance. This
+  // will be passed to the next run of the task, along with the
+  // params, and could be used by a task to do special logic If
+  // the task state changes (e.g. from green to red, or foo to bar)
+  // If there was no previous run (e.g. the instance has never succesfully
+  // completed, this will be an empty object.). This is a JSON blob,
+  // and will be different per task type.
+  state: '{ "status": "green" }',
+
+  // An extension point for 3rd parties to build in security features on
+  // top of the task manager. For example, this might be the token of the user
+  // who scheduled this task.
+  userContext: 'the token of the user who scheduled this task',
+
+  // An extension point for 3rd parties to build in security features on
+  // top of the task manager, and is expected to be the id of the user, if any,
+  // that scheduled this task.
+  user: '23lk3l42',
+
+  // An application-specific designation, allowing different Kibana
+  // plugins / apps to query for only those tasks they care about.
+  scope: ['alerting'],
+
+  // The Kibana UUID of the Kibana instance who last claimed ownership for running this task.
+  ownerId: '123e4567-e89b-12d3-a456-426655440000'
+}
+```
+
+## Programmatic access
+
+The task manager mixin exposes a taskManager object on the Kibana server which plugins can use to manage scheduled tasks. Each method takes an optional `scope` argument and ensures that only tasks with the specified scope(s) will be affected.
+
+### schedule
+Using `schedule` you can instruct TaskManger to schedule an instance of a TaskType at some point in the future.
+
+```js
+const taskManager = server.plugins.task_manager;
+// Schedules a task. All properties are as documented in the previous
+// storage section, except that here, params is an object, not a JSON
+// string.
+const task = await taskManager.schedule({
+  taskType,
+  runAt,
+  schedule,
+  params,
+  scope: ['my-fanci-app'],
+});
+
+// Removes the specified task
+await manager.remove(task.id);
+
+// Fetches tasks, supports pagination, via the search-after API:
+// https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-search-after.html
+// If scope is not specified, all tasks are returned, otherwise only tasks
+// with the given scope are returned.
+const results = await manager.find({ scope: 'my-fanci-app', searchAfter: ['ids'] });
+
+// results look something like this:
+{
+  searchAfter: ['233322'],
+  // Tasks is an array of task instances
+  tasks: [{
+    id: '3242342',
+    taskType: 'reporting',
+    // etc
+  }]
+}
+```
+
+### ensureScheduling
+When using the `schedule` api to schedule a Task you can provide a hard coded `id` on the Task. This tells TaskManager to use this `id` to identify the Task Instance rather than generate an `id` on its own.
+The danger is that in such a situation, a Task with that same `id` might already have been scheduled at some earlier point, and this would result in an error. In some cases, this is the expected behavior, but often you only care about ensuring the task has been _scheduled_ and don't need it to be scheduled a fresh.
+
+To achieve this you should use the `ensureScheduling` api which has the exact same behavior as `schedule`, except it allows the scheduling of a Task with an `id` that's already in assigned to another Task and it will assume that the existing Task is the one you wished to `schedule`, treating this as a successful operation.
+
+### runNow
+Using `runNow` you can instruct TaskManger to run an existing task on-demand, without waiting for its scheduled time to be reached.
+
+```js
+const taskManager = server.plugins.task_manager;
+
+try {
+  const taskRunResult = await taskManager.runNow('91760f10-ba42-de9799');
+  // If no error is thrown, the task has completed successfully.
+} catch(err: Error) {
+  // If running the task has failed, we throw an error with an appropriate message.
+  // For example, if the requested task doesnt exist: `Error: failed to run task "91760f10-ba42-de9799" as it does not exist`
+  // Or if, for example, the task is already running: `Error: failed to run task "91760f10-ba42-de9799" as it is currently running`
+}
+```
+
+
+### more options
+
+More custom access to the tasks can be done directly via Elasticsearch, though that won't be officially supported, as we can change the document structure at any time.
+
+## Middleware
+
+The task manager exposes a middleware layer that allows modifying tasks before they are scheduled / persisted to the task manager index, and modifying tasks / the run context before a task is run.
+
+For example:
+
+```js
+// In your plugin's init
+server.plugins.task_manager.addMiddleware({
+  async beforeSave({ taskInstance, ...opts }) {
+    console.log(`About to save a task of type ${taskInstance.taskType}`);
+
+    return {
+      ...opts,
+      taskInstance: {
+        ...taskInstance,
+        params: {
+          ...taskInstance.params,
+          example: 'Added to params!',
+        },
+      },
+    };
+  },
+
+  async beforeRun({ taskInstance, ...opts }) {
+    console.log(`About to run ${taskInstance.taskType} ${taskInstance.id}`);
+    const { example, ...taskWithoutExampleProp } = taskInstance;
+
+    return {
+      ...opts,
+      taskInstance: taskWithoutExampleProp,
+    };
+  },
+});
+```
+
+## Task Poller: polling for work
+TaskManager used to work in a `pull` model, but it now needs to support both `push` and `pull`, so it has been remodeled internally to support a single `push` model.
+
+Task Manager's _push_ mechanism is driven by the following operations:
+
+1. A polling interval has been reached.
+2. A new Task is scheduled.
+3. A Task is run using `runNow`.
+
+The polling interval is straight forward: TaskPoller is configured to emit an event at a fixed interval.
+That said, if there are no workers available, we want to ignore these events, so we'll throttle the interval on worker availability.
+
+Whenever a user uses the `schedule` api to schedule a new Task, we want to trigger an early polling in order to respond to the newly scheduled task as soon as possible, but this too we only wish to do if there are available workers, so we can throttle this too.
+
+When a `runNow` call is made we need to force a poll as the user will now be waiting on the result of the `runNow` call, but
+there is a complexity here- we don't want to force polling (as there might not be any worker capacity and it's possible that a polling cycle is already running), but we also can't throttle, as we can't afford to "drop" these requests, so we'll have to buffer these.
+
+We now want to respond to all three of these push events, but we still need to balance against our worker capacity, so if there are too many requests buffered, we only want to `take` as many requests as we have capacity to handle.
+Luckily, `Polling Interval` and `Task Scheduled` simply denote a request to "poll for work as soon as possible", unlike `Run Task Now` which also means "poll for these specific tasks", so our worker capacity only needs to be applied to `Run Task Now`.
+
+We achieve this model by buffering requests into a queue using a Set (which removes duplicated). As we don't want an unbounded queue in our system, we have limited the size of this queue (configurable by the `xpack.task_manager.request_capacity` config, defaulting to 1,000 requests) which forces us to throw an error once this cap is reachedand to all subsequent calls to `runNow` until the queue drain bellow the cap.
+
+Our current model, then, is this:
+```
+  Polling Interval  --> filter(availableWorkers > 0) - mapTo([]) -------\\ 
+  Task Scheduled    --> filter(availableWorkers > 0) - mapTo([]) --------||==>Set([]+[]+[`1`,`2`]) ==> work([`1`,`2`])
+  Run Task `1` Now --\                                                  //
+                      ----> buffer(availableWorkers > 0) -- [`1`,`2`] -// 
+  Run Task `2` Now --/
+```
+
+## Limitations in v1.0
+
+In v1, the system only understands 1 minute increments (e.g. '1m', '7m'). Tasks which need something more robust will need to specify their own "runAt" in their run method's return value.
+
+There is only a rudimentary mechanism for coordinating tasks and handling expired tasks. Tasks are considered expired if their runAt has arrived, and their status is still 'running'.
+
+There is no task history. Each run overwrites the previous run's state. One-time tasks are removed from the index upon completion regardless of success / failure.
+
+The task manager's public API is create / delete / list. Updates aren't directly supported, and listing should be scoped so that users only see their own tasks.
+
+## Testing
+
+- Unit tests:
+   ```
+   cd x-pack
+   node scripts/jest --testPathPattern=task_manager --watch
+   ```
+- Integration tests:
+   ```
+   node scripts/functional_tests_server.js --config x-pack/test/plugin_api_integration/config.js
+   node scripts/functional_test_runner --config x-pack/test/plugin_api_integration/config.js
+   ```
diff --git a/x-pack/legacy/plugins/task_manager/server/index.ts b/x-pack/legacy/plugins/task_manager/server/index.ts
new file mode 100644
index 0000000000000..67b85af324f3d
--- /dev/null
+++ b/x-pack/legacy/plugins/task_manager/server/index.ts
@@ -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 { Root } from 'joi';
+import { Legacy } from 'kibana';
+import { Plugin, PluginSetupContract } from './plugin';
+import { SavedObjectsSerializer, SavedObjectsSchema } from '../../../../../src/core/server';
+import mappings from './mappings.json';
+import { migrations } from './migrations';
+
+export { PluginSetupContract as TaskManager };
+export {
+  TaskInstance,
+  ConcreteTaskInstance,
+  TaskRunCreatorFunction,
+  TaskStatus,
+  RunContext,
+} from './task';
+
+export function taskManager(kibana: any) {
+  return new kibana.Plugin({
+    id: 'task_manager',
+    require: ['kibana', 'elasticsearch', 'xpack_main'],
+    configPrefix: 'xpack.task_manager',
+    config(Joi: Root) {
+      return Joi.object({
+        enabled: Joi.boolean().default(true),
+        max_attempts: Joi.number()
+          .description(
+            'The maximum number of times a task will be attempted before being abandoned as failed'
+          )
+          .min(1)
+          .default(3),
+        poll_interval: Joi.number()
+          .description('How often, in milliseconds, the task manager will look for more work.')
+          .min(100)
+          .default(3000),
+        request_capacity: Joi.number()
+          .description('How many requests can Task Manager buffer before it rejects new requests.')
+          .min(1)
+          // a nice round contrived number, feel free to change as we learn how it behaves
+          .default(1000),
+        index: Joi.string()
+          .description('The name of the index used to store task information.')
+          .default('.kibana_task_manager')
+          .invalid(['.tasks']),
+        max_workers: Joi.number()
+          .description(
+            'The maximum number of tasks that this Kibana instance will run simultaneously.'
+          )
+          .min(1) // disable the task manager rather than trying to specify it with 0 workers
+          .default(10),
+      }).default();
+    },
+    init(server: Legacy.Server) {
+      const plugin = new Plugin({
+        logger: {
+          get: () => ({
+            info: (message: string) => server.log(['info', 'task_manager'], message),
+            debug: (message: string) => server.log(['debug', 'task_manager'], message),
+            warn: (message: string) => server.log(['warn', 'task_manager'], message),
+            error: (message: string) => server.log(['error', 'task_manager'], message),
+          }),
+        },
+      });
+      const schema = new SavedObjectsSchema(this.kbnServer.uiExports.savedObjectSchemas);
+      const serializer = new SavedObjectsSerializer(schema);
+      const setupContract = plugin.setup(
+        {},
+        {
+          serializer,
+          config: server.config(),
+          elasticsearch: server.plugins.elasticsearch,
+          savedObjects: server.savedObjects,
+        }
+      );
+      this.kbnServer.afterPluginsInit(() => {
+        plugin.start();
+      });
+      server.expose(setupContract);
+    },
+    uiExports: {
+      mappings,
+      migrations,
+      savedObjectSchemas: {
+        task: {
+          hidden: true,
+          isNamespaceAgnostic: true,
+          convertToAliasScript: `ctx._id = ctx._source.type + ':' + ctx._id`,
+          indexPattern(config: any) {
+            return config.get('xpack.task_manager.index');
+          },
+        },
+      },
+    },
+  });
+}
diff --git a/x-pack/legacy/plugins/task_manager/server/lib/correct_deprecated_fields.test.ts b/x-pack/legacy/plugins/task_manager/server/lib/correct_deprecated_fields.test.ts
new file mode 100644
index 0000000000000..408e8d36d3491
--- /dev/null
+++ b/x-pack/legacy/plugins/task_manager/server/lib/correct_deprecated_fields.test.ts
@@ -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 { ensureDeprecatedFieldsAreCorrected } from './correct_deprecated_fields';
+import { mockLogger } from '../test_utils';
+
+describe('ensureDeprecatedFieldsAreCorrected', () => {
+  test('doesnt change tasks without any schedule fields', async () => {
+    expect(
+      ensureDeprecatedFieldsAreCorrected(
+        {
+          id: 'my-foo-id',
+          taskType: 'foo',
+          params: {},
+          state: {},
+        },
+        mockLogger()
+      )
+    ).toEqual({
+      id: 'my-foo-id',
+      taskType: 'foo',
+      params: {},
+      state: {},
+    });
+  });
+  test('doesnt change tasks with the schedule field', async () => {
+    expect(
+      ensureDeprecatedFieldsAreCorrected(
+        {
+          id: 'my-foo-id',
+          taskType: 'foo',
+          schedule: { interval: '10m' },
+          params: {},
+          state: {},
+        },
+        mockLogger()
+      )
+    ).toEqual({
+      id: 'my-foo-id',
+      taskType: 'foo',
+      schedule: { interval: '10m' },
+      params: {},
+      state: {},
+    });
+  });
+  test('corrects tasks with the deprecated inteval field', async () => {
+    expect(
+      ensureDeprecatedFieldsAreCorrected(
+        {
+          id: 'my-foo-id',
+          taskType: 'foo',
+          interval: '10m',
+          params: {},
+          state: {},
+        },
+        mockLogger()
+      )
+    ).toEqual({
+      id: 'my-foo-id',
+      taskType: 'foo',
+      schedule: { interval: '10m' },
+      params: {},
+      state: {},
+    });
+  });
+  test('logs a warning when a deprecated inteval is corrected on a task', async () => {
+    const logger = mockLogger();
+    ensureDeprecatedFieldsAreCorrected(
+      {
+        taskType: 'foo',
+        interval: '10m',
+        params: {},
+        state: {},
+      },
+      logger
+    );
+    expect(logger.warn).toHaveBeenCalledWith(
+      `Task of type "foo" has been scheduled with the deprecated 'interval' field which is due to be removed in a future release`
+    );
+  });
+  test('logs a warning when a deprecated inteval is corrected on a task with an id', async () => {
+    const logger = mockLogger();
+    ensureDeprecatedFieldsAreCorrected(
+      {
+        id: 'my-foo-id',
+        taskType: 'foo',
+        interval: '10m',
+        params: {},
+        state: {},
+      },
+      logger
+    );
+    expect(logger.warn).toHaveBeenCalledWith(
+      `Task "my-foo-id" of type "foo" has been scheduled with the deprecated 'interval' field which is due to be removed in a future release`
+    );
+  });
+});
diff --git a/x-pack/legacy/plugins/task_manager/server/lib/correct_deprecated_fields.ts b/x-pack/legacy/plugins/task_manager/server/lib/correct_deprecated_fields.ts
new file mode 100644
index 0000000000000..2de95cbb8c2fa
--- /dev/null
+++ b/x-pack/legacy/plugins/task_manager/server/lib/correct_deprecated_fields.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 { TaskInstance, TaskInstanceWithDeprecatedFields } from '../task';
+import { Logger } from '../types';
+
+export function ensureDeprecatedFieldsAreCorrected(
+  { id, taskType, interval, schedule, ...taskInstance }: TaskInstanceWithDeprecatedFields,
+  logger: Logger
+): TaskInstance {
+  if (interval) {
+    logger.warn(
+      `Task${
+        id ? ` "${id}"` : ''
+      } of type "${taskType}" has been scheduled with the deprecated 'interval' field which is due to be removed in a future release`
+    );
+  }
+  return {
+    id,
+    taskType,
+    ...taskInstance,
+    schedule: schedule || (interval ? { interval } : undefined),
+  };
+}
diff --git a/x-pack/legacy/plugins/task_manager/lib/fill_pool.test.ts b/x-pack/legacy/plugins/task_manager/server/lib/fill_pool.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/fill_pool.test.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/fill_pool.test.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/fill_pool.ts b/x-pack/legacy/plugins/task_manager/server/lib/fill_pool.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/fill_pool.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/fill_pool.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/get_template_version.test.ts b/x-pack/legacy/plugins/task_manager/server/lib/get_template_version.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/get_template_version.test.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/get_template_version.test.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/get_template_version.ts b/x-pack/legacy/plugins/task_manager/server/lib/get_template_version.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/get_template_version.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/get_template_version.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/identify_es_error.test.ts b/x-pack/legacy/plugins/task_manager/server/lib/identify_es_error.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/identify_es_error.test.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/identify_es_error.test.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/identify_es_error.ts b/x-pack/legacy/plugins/task_manager/server/lib/identify_es_error.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/identify_es_error.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/identify_es_error.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/intervals.test.ts b/x-pack/legacy/plugins/task_manager/server/lib/intervals.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/intervals.test.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/intervals.test.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/intervals.ts b/x-pack/legacy/plugins/task_manager/server/lib/intervals.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/intervals.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/intervals.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/middleware.test.ts b/x-pack/legacy/plugins/task_manager/server/lib/middleware.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/middleware.test.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/middleware.test.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/middleware.ts b/x-pack/legacy/plugins/task_manager/server/lib/middleware.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/middleware.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/middleware.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/pull_from_set.test.ts b/x-pack/legacy/plugins/task_manager/server/lib/pull_from_set.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/pull_from_set.test.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/pull_from_set.test.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/pull_from_set.ts b/x-pack/legacy/plugins/task_manager/server/lib/pull_from_set.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/pull_from_set.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/pull_from_set.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/result_type.ts b/x-pack/legacy/plugins/task_manager/server/lib/result_type.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/result_type.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/result_type.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/sanitize_task_definitions.test.ts b/x-pack/legacy/plugins/task_manager/server/lib/sanitize_task_definitions.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/sanitize_task_definitions.test.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/sanitize_task_definitions.test.ts
diff --git a/x-pack/legacy/plugins/task_manager/lib/sanitize_task_definitions.ts b/x-pack/legacy/plugins/task_manager/server/lib/sanitize_task_definitions.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/lib/sanitize_task_definitions.ts
rename to x-pack/legacy/plugins/task_manager/server/lib/sanitize_task_definitions.ts
diff --git a/x-pack/legacy/plugins/task_manager/server/mappings.json b/x-pack/legacy/plugins/task_manager/server/mappings.json
new file mode 100644
index 0000000000000..1728c8f1c552b
--- /dev/null
+++ b/x-pack/legacy/plugins/task_manager/server/mappings.json
@@ -0,0 +1,49 @@
+{
+  "task": {
+    "properties": {
+      "taskType": {
+        "type": "keyword"
+      },
+      "scheduledAt": {
+        "type": "date"
+      },
+      "runAt": {
+        "type": "date"
+      },
+      "startedAt": {
+        "type": "date"
+      },
+      "retryAt": {
+        "type": "date"
+      },
+      "schedule": {
+        "properties": {
+          "interval": {
+            "type": "keyword"
+          }
+        }
+      },
+      "attempts": {
+        "type": "integer"
+      },
+      "status": {
+        "type": "keyword"
+      },
+      "params": {
+        "type": "text"
+      },
+      "state": {
+        "type": "text"
+      },
+      "user": {
+        "type": "keyword"
+      },
+      "scope": {
+        "type": "keyword"
+      },
+      "ownerId": {
+        "type": "keyword"
+      }
+    }
+  }
+}
diff --git a/x-pack/legacy/plugins/task_manager/server/migrations.ts b/x-pack/legacy/plugins/task_manager/server/migrations.ts
new file mode 100644
index 0000000000000..7dce763ddf309
--- /dev/null
+++ b/x-pack/legacy/plugins/task_manager/server/migrations.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 { SavedObject } from '../../../../../src/core/server';
+
+export const migrations = {
+  task: {
+    '7.4.0': (doc: SavedObject) => ({
+      ...doc,
+      updated_at: new Date().toISOString(),
+    }),
+    '7.6.0': moveIntervalIntoSchedule,
+  },
+};
+
+function moveIntervalIntoSchedule({
+  attributes: { interval, ...attributes },
+  ...doc
+}: SavedObject) {
+  return {
+    ...doc,
+    attributes: {
+      ...attributes,
+      ...(interval
+        ? {
+            schedule: {
+              interval,
+            },
+          }
+        : {}),
+    },
+  };
+}
diff --git a/x-pack/legacy/plugins/task_manager/plugin.test.ts b/x-pack/legacy/plugins/task_manager/server/plugin.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/plugin.test.ts
rename to x-pack/legacy/plugins/task_manager/server/plugin.test.ts
diff --git a/x-pack/legacy/plugins/task_manager/plugin.ts b/x-pack/legacy/plugins/task_manager/server/plugin.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/plugin.ts
rename to x-pack/legacy/plugins/task_manager/server/plugin.ts
diff --git a/x-pack/legacy/plugins/task_manager/queries/mark_available_tasks_as_claimed.test.ts b/x-pack/legacy/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.test.ts
similarity index 94%
rename from x-pack/legacy/plugins/task_manager/queries/mark_available_tasks_as_claimed.test.ts
rename to x-pack/legacy/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.test.ts
index b8ea7d2db832e..93a8187b673be 100644
--- a/x-pack/legacy/plugins/task_manager/queries/mark_available_tasks_as_claimed.test.ts
+++ b/x-pack/legacy/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.test.ts
@@ -18,7 +18,7 @@ import {
   updateFields,
   IdleTaskWithExpiredRunAt,
   RunningOrClaimingTaskWithExpiredRetryAt,
-  RecuringTaskWithInterval,
+  TaskWithSchedule,
   taskWithLessThanMaxAttempts,
   SortByRunAtAndRetryAt,
 } from './mark_available_tasks_as_claimed';
@@ -50,9 +50,9 @@ describe('mark_available_tasks_as_claimed', () => {
           // Either a task with idle status and runAt <= now or
           // status running or claiming with a retryAt <= now.
           shouldBeOneOf(IdleTaskWithExpiredRunAt, RunningOrClaimingTaskWithExpiredRetryAt),
-          // Either task has an interval or the attempts < the maximum configured
+          // Either task has an schedule or the attempts < the maximum configured
           shouldBeOneOf<ExistsBoolClause | TermBoolClause | RangeBoolClause>(
-            RecuringTaskWithInterval,
+            TaskWithSchedule,
             ...Object.entries(definitions).map(([type, { maxAttempts }]) =>
               taskWithLessThanMaxAttempts(type, maxAttempts || defaultMaxAttempts)
             )
@@ -100,11 +100,11 @@ describe('mark_available_tasks_as_claimed', () => {
                 ],
               },
             },
-            // Either task has an interval or the attempts < the maximum configured
+            // Either task has an recurring schedule or the attempts < the maximum configured
             {
               bool: {
                 should: [
-                  { exists: { field: 'task.interval' } },
+                  { exists: { field: 'task.schedule' } },
                   {
                     bool: {
                       must: [
diff --git a/x-pack/legacy/plugins/task_manager/queries/mark_available_tasks_as_claimed.ts b/x-pack/legacy/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.ts
similarity index 96%
rename from x-pack/legacy/plugins/task_manager/queries/mark_available_tasks_as_claimed.ts
rename to x-pack/legacy/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.ts
index 1da4550998885..6691b31a546bc 100644
--- a/x-pack/legacy/plugins/task_manager/queries/mark_available_tasks_as_claimed.ts
+++ b/x-pack/legacy/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.ts
@@ -14,7 +14,9 @@ import {
   RangeBoolClause,
 } from './query_clauses';
 
-export const RecuringTaskWithInterval: ExistsBoolClause = { exists: { field: 'task.interval' } };
+export const TaskWithSchedule: ExistsBoolClause = {
+  exists: { field: 'task.schedule' },
+};
 export function taskWithLessThanMaxAttempts(
   type: string,
   maxAttempts: number
diff --git a/x-pack/legacy/plugins/task_manager/queries/query_clauses.ts b/x-pack/legacy/plugins/task_manager/server/queries/query_clauses.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/queries/query_clauses.ts
rename to x-pack/legacy/plugins/task_manager/server/queries/query_clauses.ts
diff --git a/x-pack/legacy/plugins/task_manager/task.ts b/x-pack/legacy/plugins/task_manager/server/task.ts
similarity index 92%
rename from x-pack/legacy/plugins/task_manager/task.ts
rename to x-pack/legacy/plugins/task_manager/server/task.ts
index 2bde8a9a76544..48e87582ce3fe 100644
--- a/x-pack/legacy/plugins/task_manager/task.ts
+++ b/x-pack/legacy/plugins/task_manager/server/task.ts
@@ -133,7 +133,7 @@ export interface TaskDefinition {
    * function can return `true`, `false` or a Date. True will tell task manager
    * to retry using default delay logic. False will tell task manager to stop retrying
    * this task. Date will suggest when to the task manager the task should retry.
-   * This function isn't used for interval type tasks, those retry at the next interval.
+   * This function isn't used for recurring tasks, those retry as per their configured recurring schedule.
    */
   getRetry?: (attempts: number, error: object) => boolean | Date;
 
@@ -176,6 +176,13 @@ export enum TaskLifecycleResult {
 
 export type TaskLifecycle = TaskStatus | TaskLifecycleResult;
 
+export interface IntervalSchedule {
+  /**
+   * An interval in minutes (e.g. '5m'). If specified, this is a recurring task.
+   * */
+  interval: string;
+}
+
 /*
  * A task instance represents all of the data required to store, fetch,
  * and execute a task.
@@ -220,9 +227,11 @@ export interface TaskInstance {
   runAt?: Date;
 
   /**
-   * An interval in minutes (e.g. '5m'). If specified, this is a recurring task.
+   * A TaskSchedule string, which specifies this as a recurring task.
+   *
+   * Currently, this supports a single format: an interval in minutes or seconds (e.g. '5m', '30s').
    */
-  interval?: string;
+  schedule?: IntervalSchedule;
 
   /**
    * A task-specific set of parameters, used by the task's run function to tailor
@@ -254,6 +263,18 @@ export interface TaskInstance {
   ownerId?: string | null;
 }
 
+/**
+ * Support for the depracated interval field, this should be removed in version 8.0.0
+ * and marked as a breaking change, ideally nutil then all usage of `interval` will be
+ * replaced with use of `schedule`
+ */
+export interface TaskInstanceWithDeprecatedFields extends TaskInstance {
+  /**
+   * An interval in minutes (e.g. '5m'). If specified, this is a recurring task.
+   * */
+  interval?: string;
+}
+
 /**
  * A task instance that has an id.
  */
diff --git a/x-pack/legacy/plugins/task_manager/task_events.ts b/x-pack/legacy/plugins/task_manager/server/task_events.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/task_events.ts
rename to x-pack/legacy/plugins/task_manager/server/task_events.ts
diff --git a/x-pack/legacy/plugins/task_manager/task_manager.mock.ts b/x-pack/legacy/plugins/task_manager/server/task_manager.mock.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/task_manager.mock.ts
rename to x-pack/legacy/plugins/task_manager/server/task_manager.mock.ts
diff --git a/x-pack/legacy/plugins/task_manager/task_manager.test.ts b/x-pack/legacy/plugins/task_manager/server/task_manager.test.ts
similarity index 97%
rename from x-pack/legacy/plugins/task_manager/task_manager.test.ts
rename to x-pack/legacy/plugins/task_manager/server/task_manager.test.ts
index 588dbe8b6d19c..51c3e5b81d764 100644
--- a/x-pack/legacy/plugins/task_manager/task_manager.test.ts
+++ b/x-pack/legacy/plugins/task_manager/server/task_manager.test.ts
@@ -20,12 +20,8 @@ import {
   awaitTaskRunResult,
   TaskLifecycleEvent,
 } from './task_manager';
-// Task manager uses an unconventional directory structure so the linter marks this as a violation, server files should
-// be moved under task_manager/server/
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { savedObjectsClientMock } from 'src/core/server/mocks';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsSerializer, SavedObjectsSchema } from 'src/core/server';
+import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import { SavedObjectsSerializer, SavedObjectsSchema } from '../../../../../src/core/server';
 import { mockLogger } from './test_utils';
 import { asErr, asOk } from './lib/result_type';
 import { ConcreteTaskInstance, TaskLifecycleResult, TaskStatus } from './task';
@@ -491,7 +487,7 @@ describe('TaskManager', () => {
             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"}}}',
+            '{"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.schedule"}},{"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}',
diff --git a/x-pack/legacy/plugins/task_manager/task_manager.ts b/x-pack/legacy/plugins/task_manager/server/task_manager.ts
similarity index 97%
rename from x-pack/legacy/plugins/task_manager/task_manager.ts
rename to x-pack/legacy/plugins/task_manager/server/task_manager.ts
index 20563f0daa9b7..6c9191ffe3d0e 100644
--- a/x-pack/legacy/plugins/task_manager/task_manager.ts
+++ b/x-pack/legacy/plugins/task_manager/server/task_manager.ts
@@ -7,13 +7,10 @@ import { Subject, Observable, Subscription } from 'rxjs';
 import { filter } from 'rxjs/operators';
 
 import { performance } from 'perf_hooks';
-// Task manager uses an unconventional directory structure so the linter marks this as a violation, server files should
-// be moved under task_manager/server/
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsClientContract, SavedObjectsSerializer } from 'src/core/server';
 
 import { pipe } from 'fp-ts/lib/pipeable';
 import { Option, none, some, map as mapOptional } from 'fp-ts/lib/Option';
+import { SavedObjectsClientContract, SavedObjectsSerializer } from '../../../../../src/core/server';
 import { Result, asErr, either, map, mapErr, promiseResult } from './lib/result_type';
 
 import { Logger } from './types';
@@ -37,7 +34,7 @@ import {
   ConcreteTaskInstance,
   RunContext,
   TaskInstanceWithId,
-  TaskInstance,
+  TaskInstanceWithDeprecatedFields,
   TaskLifecycle,
   TaskLifecycleResult,
   TaskStatus,
@@ -53,6 +50,7 @@ import {
   ClaimOwnershipResult,
 } from './task_store';
 import { identifyEsError } from './lib/identify_es_error';
+import { ensureDeprecatedFieldsAreCorrected } from './lib/correct_deprecated_fields';
 
 const VERSION_CONFLICT_STATUS = 409;
 
@@ -267,11 +265,14 @@ export class TaskManager {
    * @param task - The task being scheduled.
    * @returns {Promise<ConcreteTaskInstance>}
    */
-  public async schedule(taskInstance: TaskInstance, options?: any): Promise<ConcreteTaskInstance> {
+  public async schedule(
+    taskInstance: TaskInstanceWithDeprecatedFields,
+    options?: any
+  ): Promise<ConcreteTaskInstance> {
     await this.waitUntilStarted();
     const { taskInstance: modifiedTask } = await this.middleware.beforeSave({
       ...options,
-      taskInstance,
+      taskInstance: ensureDeprecatedFieldsAreCorrected(taskInstance, this.logger),
     });
     const result = await this.store.schedule(modifiedTask);
     this.attemptToRun();
diff --git a/x-pack/legacy/plugins/task_manager/task_poller.test.ts b/x-pack/legacy/plugins/task_manager/server/task_poller.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/task_poller.test.ts
rename to x-pack/legacy/plugins/task_manager/server/task_poller.test.ts
diff --git a/x-pack/legacy/plugins/task_manager/task_poller.ts b/x-pack/legacy/plugins/task_manager/server/task_poller.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/task_poller.ts
rename to x-pack/legacy/plugins/task_manager/server/task_poller.ts
diff --git a/x-pack/legacy/plugins/task_manager/task_pool.test.ts b/x-pack/legacy/plugins/task_manager/server/task_pool.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/task_pool.test.ts
rename to x-pack/legacy/plugins/task_manager/server/task_pool.test.ts
diff --git a/x-pack/legacy/plugins/task_manager/task_pool.ts b/x-pack/legacy/plugins/task_manager/server/task_pool.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/task_pool.ts
rename to x-pack/legacy/plugins/task_manager/server/task_pool.ts
diff --git a/x-pack/legacy/plugins/task_manager/server/task_runner.test.ts b/x-pack/legacy/plugins/task_manager/server/task_runner.test.ts
new file mode 100644
index 0000000000000..3f7877aa4c20f
--- /dev/null
+++ b/x-pack/legacy/plugins/task_manager/server/task_runner.test.ts
@@ -0,0 +1,949 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 sinon from 'sinon';
+import { minutesFromNow } from './lib/intervals';
+import { asOk, asErr } from './lib/result_type';
+import { TaskEvent, asTaskRunEvent, asTaskMarkRunningEvent } from './task_events';
+import { ConcreteTaskInstance, TaskStatus } from './task';
+import { TaskManagerRunner } from './task_runner';
+import { mockLogger } from './test_utils';
+import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
+
+let fakeTimer: sinon.SinonFakeTimers;
+
+beforeAll(() => {
+  fakeTimer = sinon.useFakeTimers();
+});
+
+afterAll(() => fakeTimer.restore());
+
+describe('TaskManagerRunner', () => {
+  test('provides details about the task that is running', () => {
+    const { runner } = testOpts({
+      instance: {
+        id: 'foo',
+        taskType: 'bar',
+      },
+    });
+
+    expect(runner.id).toEqual('foo');
+    expect(runner.taskType).toEqual('bar');
+    expect(runner.toString()).toEqual('bar "foo"');
+  });
+
+  test('warns if the task returns an unexpected result', async () => {
+    await allowsReturnType(undefined);
+    await allowsReturnType({});
+    await allowsReturnType({
+      runAt: new Date(),
+    });
+    await allowsReturnType({
+      error: new Error('Dang it!'),
+    });
+    await allowsReturnType({
+      state: { shazm: true },
+    });
+    await disallowsReturnType('hm....');
+    await disallowsReturnType({
+      whatIsThis: '?!!?',
+    });
+  });
+
+  test('queues a reattempt if the task fails', async () => {
+    const initialAttempts = _.random(0, 2);
+    const id = Date.now().toString();
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+        params: { a: 'b' },
+        state: { hey: 'there' },
+      },
+      definitions: {
+        bar: {
+          createTaskRunner: () => ({
+            async run() {
+              throw new Error('Dangit!');
+            },
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    sinon.assert.calledOnce(store.update);
+    const instance = store.update.args[0][0];
+
+    expect(instance.id).toEqual(id);
+    expect(instance.runAt.getTime()).toEqual(minutesFromNow(initialAttempts * 5).getTime());
+    expect(instance.params).toEqual({ a: 'b' });
+    expect(instance.state).toEqual({ hey: 'there' });
+  });
+
+  test('reschedules tasks that have an schedule', async () => {
+    const { runner, store } = testOpts({
+      instance: {
+        schedule: { interval: '10m' },
+        status: TaskStatus.Running,
+        startedAt: new Date(),
+      },
+      definitions: {
+        bar: {
+          createTaskRunner: () => ({
+            async run() {
+              return;
+            },
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    sinon.assert.calledOnce(store.update);
+    const instance = store.update.args[0][0];
+
+    expect(instance.runAt.getTime()).toBeGreaterThan(minutesFromNow(9).getTime());
+    expect(instance.runAt.getTime()).toBeLessThanOrEqual(minutesFromNow(10).getTime());
+  });
+
+  test('reschedules tasks that return a runAt', async () => {
+    const runAt = minutesFromNow(_.random(1, 10));
+    const { runner, store } = testOpts({
+      definitions: {
+        bar: {
+          createTaskRunner: () => ({
+            async run() {
+              return { runAt };
+            },
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    sinon.assert.calledOnce(store.update);
+    sinon.assert.calledWithMatch(store.update, { runAt });
+  });
+
+  test('tasks that return runAt override the schedule', async () => {
+    const runAt = minutesFromNow(_.random(5));
+    const { runner, store } = testOpts({
+      instance: {
+        schedule: { interval: '20m' },
+      },
+      definitions: {
+        bar: {
+          createTaskRunner: () => ({
+            async run() {
+              return { runAt };
+            },
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    sinon.assert.calledOnce(store.update);
+    sinon.assert.calledWithMatch(store.update, { runAt });
+  });
+
+  test('removes non-recurring tasks after they complete', async () => {
+    const id = _.random(1, 20).toString();
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        schedule: undefined,
+      },
+      definitions: {
+        bar: {
+          createTaskRunner: () => ({
+            async run() {
+              return undefined;
+            },
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    sinon.assert.calledOnce(store.remove);
+    sinon.assert.calledWith(store.remove, id);
+  });
+
+  test('cancel cancels the task runner, if it is cancellable', async () => {
+    let wasCancelled = false;
+    const { runner, logger } = testOpts({
+      definitions: {
+        bar: {
+          createTaskRunner: () => ({
+            async run() {
+              const promise = new Promise(r => setTimeout(r, 1000));
+              fakeTimer.tick(1000);
+              await promise;
+            },
+            async cancel() {
+              wasCancelled = true;
+            },
+          }),
+        },
+      },
+    });
+
+    const promise = runner.run();
+    await Promise.resolve();
+    await runner.cancel();
+    await promise;
+
+    expect(wasCancelled).toBeTruthy();
+    expect(logger.warn).not.toHaveBeenCalled();
+  });
+
+  test('warns if cancel is called on a non-cancellable task', async () => {
+    const { runner, logger } = testOpts({
+      definitions: {
+        bar: {
+          createTaskRunner: () => ({
+            run: async () => undefined,
+          }),
+        },
+      },
+    });
+
+    const promise = runner.run();
+    await runner.cancel();
+    await promise;
+
+    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 () => {
+    const timeoutMinutes = 1;
+    const id = _.random(1, 20).toString();
+    const initialAttempts = _.random(0, 2);
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+        schedule: undefined,
+      },
+      definitions: {
+        bar: {
+          timeout: `${timeoutMinutes}m`,
+          createTaskRunner: () => ({
+            run: async () => undefined,
+          }),
+        },
+      },
+    });
+
+    await runner.markTaskAsRunning();
+
+    sinon.assert.calledOnce(store.update);
+    const instance = store.update.args[0][0];
+
+    expect(instance.attempts).toEqual(initialAttempts + 1);
+    expect(instance.status).toBe('running');
+    expect(instance.startedAt.getTime()).toEqual(Date.now());
+    expect(instance.retryAt.getTime()).toEqual(
+      minutesFromNow((initialAttempts + 1) * 5).getTime() + timeoutMinutes * 60 * 1000
+    );
+  });
+
+  test('uses getRetry function (returning date) on error when defined', async () => {
+    const initialAttempts = _.random(1, 3);
+    const nextRetry = new Date(Date.now() + _.random(15, 100) * 1000);
+    const id = Date.now().toString();
+    const getRetryStub = sinon.stub().returns(nextRetry);
+    const error = new Error('Dangit!');
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+      },
+      definitions: {
+        bar: {
+          getRetry: getRetryStub,
+          createTaskRunner: () => ({
+            async run() {
+              throw error;
+            },
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    sinon.assert.calledOnce(store.update);
+    sinon.assert.calledWith(getRetryStub, initialAttempts, error);
+    const instance = store.update.args[0][0];
+
+    expect(instance.runAt.getTime()).toEqual(nextRetry.getTime());
+  });
+
+  test('uses getRetry function (returning true) on error when defined', async () => {
+    const initialAttempts = _.random(1, 3);
+    const id = Date.now().toString();
+    const getRetryStub = sinon.stub().returns(true);
+    const error = new Error('Dangit!');
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+      },
+      definitions: {
+        bar: {
+          getRetry: getRetryStub,
+          createTaskRunner: () => ({
+            async run() {
+              throw error;
+            },
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    sinon.assert.calledOnce(store.update);
+    sinon.assert.calledWith(getRetryStub, initialAttempts, error);
+    const instance = store.update.args[0][0];
+
+    const expectedRunAt = new Date(Date.now() + initialAttempts * 5 * 60 * 1000);
+    expect(instance.runAt.getTime()).toEqual(expectedRunAt.getTime());
+  });
+
+  test('uses getRetry function (returning false) on error when defined', async () => {
+    const initialAttempts = _.random(1, 3);
+    const id = Date.now().toString();
+    const getRetryStub = sinon.stub().returns(false);
+    const error = new Error('Dangit!');
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+      },
+      definitions: {
+        bar: {
+          getRetry: getRetryStub,
+          createTaskRunner: () => ({
+            async run() {
+              throw error;
+            },
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    sinon.assert.calledOnce(store.update);
+    sinon.assert.calledWith(getRetryStub, initialAttempts, error);
+    const instance = store.update.args[0][0];
+
+    expect(instance.status).toBe('failed');
+  });
+
+  test('bypasses getRetry function (returning false) on error of a recurring task', async () => {
+    const initialAttempts = _.random(1, 3);
+    const id = Date.now().toString();
+    const getRetryStub = sinon.stub().returns(false);
+    const error = new Error('Dangit!');
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+        schedule: { interval: '1m' },
+        startedAt: new Date(),
+      },
+      definitions: {
+        bar: {
+          getRetry: getRetryStub,
+          createTaskRunner: () => ({
+            async run() {
+              throw error;
+            },
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    sinon.assert.calledOnce(store.update);
+    sinon.assert.notCalled(getRetryStub);
+    const instance = store.update.args[0][0];
+
+    const nextIntervalDelay = 60000; // 1m
+    const expectedRunAt = new Date(Date.now() + nextIntervalDelay);
+    expect(instance.runAt.getTime()).toEqual(expectedRunAt.getTime());
+  });
+
+  test('uses getRetry (returning date) to set retryAt when defined', 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,
+        schedule: undefined,
+      },
+      definitions: {
+        bar: {
+          timeout: `${timeoutMinutes}m`,
+          getRetry: getRetryStub,
+          createTaskRunner: () => ({
+            run: async () => undefined,
+          }),
+        },
+      },
+    });
+
+    await runner.markTaskAsRunning();
+
+    sinon.assert.calledOnce(store.update);
+    sinon.assert.calledWith(getRetryStub, initialAttempts + 1);
+    const instance = store.update.args[0][0];
+
+    expect(instance.retryAt.getTime()).toEqual(
+      new Date(nextRetry.getTime() + timeoutMinutes * 60 * 1000).getTime()
+    );
+  });
+
+  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,
+        schedule: 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,
+        schedule: 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);
+    const timeoutMinutes = 1;
+    const getRetryStub = sinon.stub().returns(true);
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+        schedule: undefined,
+      },
+      definitions: {
+        bar: {
+          timeout: `${timeoutMinutes}m`,
+          getRetry: getRetryStub,
+          createTaskRunner: () => ({
+            run: async () => undefined,
+          }),
+        },
+      },
+    });
+
+    await runner.markTaskAsRunning();
+
+    sinon.assert.calledOnce(store.update);
+    sinon.assert.calledWith(getRetryStub, initialAttempts + 1);
+    const instance = store.update.args[0][0];
+
+    const attemptDelay = (initialAttempts + 1) * 5 * 60 * 1000;
+    const timeoutDelay = timeoutMinutes * 60 * 1000;
+    expect(instance.retryAt.getTime()).toEqual(
+      new Date(Date.now() + attemptDelay + timeoutDelay).getTime()
+    );
+  });
+
+  test('uses getRetry (returning false) to set retryAt when defined', async () => {
+    const id = _.random(1, 20).toString();
+    const initialAttempts = _.random(1, 3);
+    const timeoutMinutes = 1;
+    const getRetryStub = sinon.stub().returns(false);
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+        schedule: undefined,
+      },
+      definitions: {
+        bar: {
+          timeout: `${timeoutMinutes}m`,
+          getRetry: getRetryStub,
+          createTaskRunner: () => ({
+            run: async () => undefined,
+          }),
+        },
+      },
+    });
+
+    await runner.markTaskAsRunning();
+
+    sinon.assert.calledOnce(store.update);
+    sinon.assert.calledWith(getRetryStub, initialAttempts + 1);
+    const instance = store.update.args[0][0];
+
+    expect(instance.retryAt).toBeNull();
+    expect(instance.status).toBe('running');
+  });
+
+  test('bypasses getRetry (returning false) of a recurring task to set retryAt when defined', async () => {
+    const id = _.random(1, 20).toString();
+    const initialAttempts = _.random(1, 3);
+    const timeoutMinutes = 1;
+    const getRetryStub = sinon.stub().returns(false);
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+        schedule: { interval: '1m' },
+        startedAt: new Date(),
+      },
+      definitions: {
+        bar: {
+          timeout: `${timeoutMinutes}m`,
+          getRetry: getRetryStub,
+          createTaskRunner: () => ({
+            run: async () => undefined,
+          }),
+        },
+      },
+    });
+
+    await runner.markTaskAsRunning();
+
+    sinon.assert.calledOnce(store.update);
+    sinon.assert.notCalled(getRetryStub);
+    const instance = store.update.args[0][0];
+
+    const timeoutDelay = timeoutMinutes * 60 * 1000;
+    expect(instance.retryAt.getTime()).toEqual(new Date(Date.now() + timeoutDelay).getTime());
+  });
+
+  test('Fails non-recurring task when maxAttempts reached', async () => {
+    const id = _.random(1, 20).toString();
+    const initialAttempts = 3;
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+        schedule: undefined,
+      },
+      definitions: {
+        bar: {
+          maxAttempts: 3,
+          createTaskRunner: () => ({
+            run: async () => {
+              throw new Error();
+            },
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    sinon.assert.calledOnce(store.update);
+    const instance = store.update.args[0][0];
+    expect(instance.attempts).toEqual(3);
+    expect(instance.status).toEqual('failed');
+    expect(instance.retryAt).toBeNull();
+    expect(instance.runAt.getTime()).toBeLessThanOrEqual(Date.now());
+  });
+
+  test(`Doesn't fail recurring tasks when maxAttempts reached`, async () => {
+    const id = _.random(1, 20).toString();
+    const initialAttempts = 3;
+    const intervalSeconds = 10;
+    const { runner, store } = testOpts({
+      instance: {
+        id,
+        attempts: initialAttempts,
+        schedule: { interval: `${intervalSeconds}s` },
+        startedAt: new Date(),
+      },
+      definitions: {
+        bar: {
+          maxAttempts: 3,
+          createTaskRunner: () => ({
+            run: async () => {
+              throw new Error();
+            },
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    sinon.assert.calledOnce(store.update);
+    const instance = store.update.args[0][0];
+    expect(instance.attempts).toEqual(3);
+    expect(instance.status).toEqual('idle');
+    expect(instance.runAt.getTime()).toEqual(
+      new Date(Date.now() + intervalSeconds * 1000).getTime()
+    );
+  });
+
+  describe('TaskEvents', () => {
+    test('emits TaskEvent when a task is marked as running', async () => {
+      const id = _.random(1, 20).toString();
+      const onTaskEvent = jest.fn();
+      const { runner, instance, store } = testOpts({
+        onTaskEvent,
+        instance: {
+          id,
+        },
+        definitions: {
+          bar: {
+            timeout: `1m`,
+            getRetry: () => {},
+            createTaskRunner: () => ({
+              run: async () => undefined,
+            }),
+          },
+        },
+      });
+
+      store.update.returns(instance);
+
+      await runner.markTaskAsRunning();
+
+      expect(onTaskEvent).toHaveBeenCalledWith(asTaskMarkRunningEvent(id, asOk(instance)));
+    });
+
+    test('emits TaskEvent when a task fails to be marked as running', async () => {
+      expect.assertions(2);
+
+      const id = _.random(1, 20).toString();
+      const onTaskEvent = jest.fn();
+      const { runner, store } = testOpts({
+        onTaskEvent,
+        instance: {
+          id,
+        },
+        definitions: {
+          bar: {
+            timeout: `1m`,
+            getRetry: () => {},
+            createTaskRunner: () => ({
+              run: async () => undefined,
+            }),
+          },
+        },
+      });
+
+      store.update.throws(new Error('cant mark as running'));
+
+      try {
+        await runner.markTaskAsRunning();
+      } catch (err) {
+        expect(onTaskEvent).toHaveBeenCalledWith(asTaskMarkRunningEvent(id, asErr(err)));
+      }
+      expect(onTaskEvent).toHaveBeenCalledTimes(1);
+    });
+
+    test('emits TaskEvent when a task is run successfully', async () => {
+      const id = _.random(1, 20).toString();
+      const onTaskEvent = jest.fn();
+      const { runner, instance } = testOpts({
+        onTaskEvent,
+        instance: {
+          id,
+        },
+        definitions: {
+          bar: {
+            createTaskRunner: () => ({
+              async run() {
+                return {};
+              },
+            }),
+          },
+        },
+      });
+
+      await runner.run();
+
+      expect(onTaskEvent).toHaveBeenCalledWith(asTaskRunEvent(id, asOk(instance)));
+    });
+
+    test('emits TaskEvent when a recurring task is run successfully', async () => {
+      const id = _.random(1, 20).toString();
+      const runAt = minutesFromNow(_.random(5));
+      const onTaskEvent = jest.fn();
+      const { runner, instance } = testOpts({
+        onTaskEvent,
+        instance: {
+          id,
+          schedule: { interval: '1m' },
+        },
+        definitions: {
+          bar: {
+            createTaskRunner: () => ({
+              async run() {
+                return { runAt };
+              },
+            }),
+          },
+        },
+      });
+
+      await runner.run();
+
+      expect(onTaskEvent).toHaveBeenCalledWith(asTaskRunEvent(id, asOk(instance)));
+    });
+
+    test('emits TaskEvent when a task run throws an error', async () => {
+      const id = _.random(1, 20).toString();
+      const error = new Error('Dangit!');
+      const onTaskEvent = jest.fn();
+      const { runner } = testOpts({
+        onTaskEvent,
+        instance: {
+          id,
+        },
+        definitions: {
+          bar: {
+            createTaskRunner: () => ({
+              async run() {
+                throw error;
+              },
+            }),
+          },
+        },
+      });
+      await runner.run();
+
+      expect(onTaskEvent).toHaveBeenCalledWith(asTaskRunEvent(id, asErr(error)));
+      expect(onTaskEvent).toHaveBeenCalledTimes(1);
+    });
+
+    test('emits TaskEvent when a task run returns an error', async () => {
+      const id = _.random(1, 20).toString();
+      const error = new Error('Dangit!');
+      const onTaskEvent = jest.fn();
+      const { runner } = testOpts({
+        onTaskEvent,
+        instance: {
+          id,
+          schedule: { interval: '1m' },
+          startedAt: new Date(),
+        },
+        definitions: {
+          bar: {
+            createTaskRunner: () => ({
+              async run() {
+                return { error };
+              },
+            }),
+          },
+        },
+      });
+
+      await runner.run();
+
+      expect(onTaskEvent).toHaveBeenCalledWith(asTaskRunEvent(id, asErr(error)));
+      expect(onTaskEvent).toHaveBeenCalledTimes(1);
+    });
+
+    test('emits TaskEvent when a task returns an error and is marked as failed', async () => {
+      const id = _.random(1, 20).toString();
+      const error = new Error('Dangit!');
+      const onTaskEvent = jest.fn();
+      const { runner, store } = testOpts({
+        onTaskEvent,
+        instance: {
+          id,
+          startedAt: new Date(),
+        },
+        definitions: {
+          bar: {
+            getRetry: () => false,
+            createTaskRunner: () => ({
+              async run() {
+                return { error };
+              },
+            }),
+          },
+        },
+      });
+
+      await runner.run();
+
+      const instance = store.update.args[0][0];
+      expect(instance.status).toBe('failed');
+
+      expect(onTaskEvent).toHaveBeenCalledWith(asTaskRunEvent(id, asErr(error)));
+      expect(onTaskEvent).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  interface TestOpts {
+    instance?: Partial<ConcreteTaskInstance>;
+    definitions?: any;
+    onTaskEvent?: (event: TaskEvent<any, any>) => void;
+  }
+
+  function testOpts(opts: TestOpts) {
+    const callCluster = sinon.stub();
+    const createTaskRunner = sinon.stub();
+    const logger = mockLogger();
+
+    const instance = Object.assign(
+      {
+        id: 'foo',
+        taskType: 'bar',
+        sequenceNumber: 32,
+        primaryTerm: 32,
+        runAt: new Date(),
+        scheduledAt: new Date(),
+        startedAt: null,
+        retryAt: null,
+        attempts: 0,
+        params: {},
+        scope: ['reporting'],
+        state: {},
+        status: 'idle',
+        user: 'example',
+        ownerId: null,
+      },
+      opts.instance || {}
+    );
+
+    const store = {
+      update: sinon.stub(),
+      remove: sinon.stub(),
+      maxAttempts: 5,
+    };
+
+    store.update.returns(instance);
+
+    const runner = new TaskManagerRunner({
+      beforeRun: context => Promise.resolve(context),
+      beforeMarkRunning: context => Promise.resolve(context),
+      logger,
+      store,
+      instance,
+      definitions: Object.assign(opts.definitions || {}, {
+        testbar: {
+          type: 'bar',
+          title: 'Bar!',
+          createTaskRunner,
+        },
+      }),
+      onTaskEvent: opts.onTaskEvent,
+    });
+
+    return {
+      callCluster,
+      createTaskRunner,
+      runner,
+      logger,
+      store,
+      instance,
+    };
+  }
+
+  async function testReturn(result: any, shouldBeValid: boolean) {
+    const { runner, logger } = testOpts({
+      definitions: {
+        bar: {
+          createTaskRunner: () => ({
+            run: async () => result,
+          }),
+        },
+      },
+    });
+
+    await runner.run();
+
+    if (shouldBeValid) {
+      expect(logger.warn).not.toHaveBeenCalled();
+    } else {
+      expect(logger.warn).toHaveBeenCalledTimes(1);
+      expect(logger.warn.mock.calls[0][0]).toMatch(/invalid task result/i);
+    }
+  }
+
+  function allowsReturnType(result: any) {
+    return testReturn(result, true);
+  }
+
+  function disallowsReturnType(result: any) {
+    return testReturn(result, false);
+  }
+});
diff --git a/x-pack/legacy/plugins/task_manager/server/task_runner.ts b/x-pack/legacy/plugins/task_manager/server/task_runner.ts
new file mode 100644
index 0000000000000..56ab49bdc629e
--- /dev/null
+++ b/x-pack/legacy/plugins/task_manager/server/task_runner.ts
@@ -0,0 +1,425 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under 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 module contains the core logic for running an individual task.
+ * It handles the full lifecycle of a task run, including error handling,
+ * rescheduling, middleware application, etc.
+ */
+
+import { performance } from 'perf_hooks';
+import Joi from 'joi';
+import { identity, defaults, flow } from 'lodash';
+
+import { asOk, asErr, mapErr, eitherAsync, unwrap, mapOk, Result } from './lib/result_type';
+import { TaskRun, TaskMarkRunning, asTaskRunEvent, asTaskMarkRunningEvent } from './task_events';
+import { intervalFromDate, intervalFromNow } from './lib/intervals';
+import { Logger } from './types';
+import { BeforeRunFunction, BeforeMarkRunningFunction } from './lib/middleware';
+import {
+  CancelFunction,
+  CancellableTask,
+  ConcreteTaskInstance,
+  RunResult,
+  SuccessfulRunResult,
+  FailedRunResult,
+  FailedTaskResult,
+  TaskDefinition,
+  TaskDictionary,
+  validateRunResult,
+  TaskStatus,
+} from './task';
+
+const defaultBackoffPerFailure = 5 * 60 * 1000;
+const EMPTY_RUN_RESULT: SuccessfulRunResult = {};
+
+export interface TaskRunner {
+  isExpired: boolean;
+  cancel: CancelFunction;
+  markTaskAsRunning: () => Promise<boolean>;
+  run: () => Promise<Result<SuccessfulRunResult, FailedRunResult>>;
+  id: string;
+  toString: () => string;
+}
+
+interface Updatable {
+  readonly maxAttempts: number;
+  update(doc: ConcreteTaskInstance): Promise<ConcreteTaskInstance>;
+  remove(id: string): Promise<void>;
+}
+
+interface Opts {
+  logger: Logger;
+  definitions: TaskDictionary<TaskDefinition>;
+  instance: ConcreteTaskInstance;
+  store: Updatable;
+  beforeRun: BeforeRunFunction;
+  beforeMarkRunning: BeforeMarkRunningFunction;
+  onTaskEvent?: (event: TaskRun | TaskMarkRunning) => void;
+}
+
+/**
+ * Runs a background task, ensures that errors are properly handled,
+ * allows for cancellation.
+ *
+ * @export
+ * @class TaskManagerRunner
+ * @implements {TaskRunner}
+ */
+export class TaskManagerRunner implements TaskRunner {
+  private task?: CancellableTask;
+  private instance: ConcreteTaskInstance;
+  private definitions: TaskDictionary<TaskDefinition>;
+  private logger: Logger;
+  private bufferedTaskStore: Updatable;
+  private beforeRun: BeforeRunFunction;
+  private beforeMarkRunning: BeforeMarkRunningFunction;
+  private onTaskEvent: (event: TaskRun | TaskMarkRunning) => void;
+
+  /**
+   * Creates an instance of TaskManagerRunner.
+   * @param {Opts} opts
+   * @prop {Logger} logger - The task manager logger
+   * @prop {TaskDefinition} definition - The definition of the task being run
+   * @prop {ConcreteTaskInstance} instance - The record describing this particular task instance
+   * @prop {Updatable} store - The store used to read / write tasks instance info
+   * @prop {BeforeRunFunction} beforeRun - A function that adjusts the run context prior to running the task
+   * @memberof TaskManagerRunner
+   */
+  constructor({
+    instance,
+    definitions,
+    logger,
+    store,
+    beforeRun,
+    beforeMarkRunning,
+    onTaskEvent = identity,
+  }: Opts) {
+    this.instance = sanitizeInstance(instance);
+    this.definitions = definitions;
+    this.logger = logger;
+    this.bufferedTaskStore = store;
+    this.beforeRun = beforeRun;
+    this.beforeMarkRunning = beforeMarkRunning;
+    this.onTaskEvent = onTaskEvent;
+  }
+
+  /**
+   * Gets the id of this task instance.
+   */
+  public get id() {
+    return this.instance.id;
+  }
+
+  /**
+   * Gets the task type of this task instance.
+   */
+  public get taskType() {
+    return this.instance.taskType;
+  }
+
+  /**
+   * Gets the task defintion from the dictionary.
+   */
+  public get definition() {
+    return this.definitions[this.taskType];
+  }
+
+  /**
+   * Gets whether or not this task has run longer than its expiration setting allows.
+   */
+  public get isExpired() {
+    return intervalFromDate(this.instance.startedAt!, this.definition.timeout)! < new Date();
+  }
+
+  /**
+   * Returns a log-friendly representation of this task.
+   */
+  public toString() {
+    return `${this.taskType} "${this.id}"`;
+  }
+
+  /**
+   * Runs the task, handling the task result, errors, etc, rescheduling if need
+   * be. NOTE: the time of applying the middleware's beforeRun is incorporated
+   * into the total timeout time the task in configured with. We may decide to
+   * start the timer after beforeRun resolves
+   *
+   * @returns {Promise<Result<SuccessfulRunResult, FailedRunResult>>}
+   */
+  public async run(): Promise<Result<SuccessfulRunResult, FailedRunResult>> {
+    this.logger.debug(`Running task ${this}`);
+    const modifiedContext = await this.beforeRun({
+      taskInstance: this.instance,
+    });
+
+    try {
+      this.task = this.definition.createTaskRunner(modifiedContext);
+      const result = await this.task.run();
+      const validatedResult = this.validateResult(result);
+      return this.processResult(validatedResult);
+    } catch (err) {
+      this.logger.error(`Task ${this} failed: ${err}`);
+      // in error scenario, we can not get the RunResult
+      // re-use modifiedContext's state, which is correct as of beforeRun
+      return this.processResult(asErr({ error: err, state: modifiedContext.taskInstance.state }));
+    }
+  }
+
+  /**
+   * Attempts to claim exclusive rights to run the task. If the attempt fails
+   * with a 409 (http conflict), we assume another Kibana instance beat us to the punch.
+   *
+   * @returns {Promise<boolean>}
+   */
+  public async markTaskAsRunning(): Promise<boolean> {
+    performance.mark('markTaskAsRunning_start');
+
+    const VERSION_CONFLICT_STATUS = 409;
+    const now = new Date();
+
+    const { taskInstance } = await this.beforeMarkRunning({
+      taskInstance: this.instance,
+    });
+
+    const attempts = taskInstance.attempts + 1;
+    const ownershipClaimedUntil = taskInstance.retryAt;
+
+    try {
+      const { id } = taskInstance;
+
+      const timeUntilClaimExpires = howManyMsUntilOwnershipClaimExpires(ownershipClaimedUntil);
+      if (timeUntilClaimExpires < 0) {
+        this.logger.debug(
+          `[Task Runner] Task ${id} started after ownership expired (${Math.abs(
+            timeUntilClaimExpires
+          )}ms after expiry)`
+        );
+      }
+
+      this.instance = await this.bufferedTaskStore.update({
+        ...taskInstance,
+        status: TaskStatus.Running,
+        startedAt: now,
+        attempts,
+        retryAt: this.instance.schedule
+          ? intervalFromNow(this.definition.timeout)!
+          : this.getRetryDelay({
+              attempts,
+              // Fake an error. This allows retry logic when tasks keep timing out
+              // and lets us set a proper "retryAt" value each time.
+              error: new Error('Task timeout'),
+              addDuration: this.definition.timeout,
+            }),
+      });
+
+      const timeUntilClaimExpiresAfterUpdate = howManyMsUntilOwnershipClaimExpires(
+        ownershipClaimedUntil
+      );
+      if (timeUntilClaimExpiresAfterUpdate < 0) {
+        this.logger.debug(
+          `[Task Runner] Task ${id} ran after ownership expired (${Math.abs(
+            timeUntilClaimExpiresAfterUpdate
+          )}ms after expiry)`
+        );
+      }
+
+      performanceStopMarkingTaskAsRunning();
+      this.onTaskEvent(asTaskMarkRunningEvent(this.id, asOk(this.instance)));
+      return true;
+    } catch (error) {
+      performanceStopMarkingTaskAsRunning();
+      this.onTaskEvent(asTaskMarkRunningEvent(this.id, asErr(error)));
+      if (error.statusCode !== VERSION_CONFLICT_STATUS) {
+        throw error;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Attempts to cancel the task.
+   *
+   * @returns {Promise<void>}
+   */
+  public async cancel() {
+    const { task } = this;
+    if (task && task.cancel) {
+      this.task = undefined;
+      return task.cancel();
+    }
+
+    this.logger.warn(`The task ${this} is not cancellable.`);
+  }
+
+  private validateResult(result?: RunResult | void): Result<SuccessfulRunResult, FailedRunResult> {
+    const { error } = Joi.validate(result, validateRunResult);
+
+    if (error) {
+      this.logger.warn(`Invalid task result for ${this}: ${error.message}`);
+      return asErr({
+        error: new Error(`Invalid task result for ${this}: ${error.message}`),
+        state: {},
+      });
+    }
+    if (!result) {
+      return asOk(EMPTY_RUN_RESULT);
+    }
+
+    return result.error ? asErr({ ...result, error: result.error as Error }) : asOk(result);
+  }
+
+  private shouldTryToScheduleRetry(): boolean {
+    if (this.instance.schedule) {
+      return true;
+    }
+
+    const maxAttempts = this.definition.maxAttempts || this.bufferedTaskStore.maxAttempts;
+    return this.instance.attempts < maxAttempts;
+  }
+
+  private rescheduleFailedRun = (
+    failureResult: FailedRunResult
+  ): Result<SuccessfulRunResult, FailedTaskResult> => {
+    if (this.shouldTryToScheduleRetry()) {
+      const { runAt, state, error } = failureResult;
+      // if we're retrying, keep the number of attempts
+      const { schedule, attempts } = this.instance;
+      if (runAt || schedule) {
+        return asOk({ state, attempts, runAt });
+      } else {
+        // when result.error is truthy, then we're retrying because it failed
+        const newRunAt = this.getRetryDelay({
+          attempts,
+          error,
+        });
+
+        if (newRunAt) {
+          return asOk({ state, attempts, runAt: newRunAt });
+        }
+      }
+    }
+    // scheduling a retry isn't possible,mark task as failed
+    return asErr({ status: TaskStatus.Failed });
+  };
+
+  private async processResultForRecurringTask(
+    result: Result<SuccessfulRunResult, FailedRunResult>
+  ): Promise<void> {
+    const fieldUpdates = flow(
+      // if running the task has failed ,try to correct by scheduling a retry in the near future
+      mapErr(this.rescheduleFailedRun),
+      // if retrying is possible (new runAt) or this is an recurring task - reschedule
+      mapOk(({ runAt, state, attempts = 0 }: Partial<ConcreteTaskInstance>) => {
+        const { startedAt, schedule: { interval = undefined } = {} } = this.instance;
+        return asOk({
+          runAt: runAt || intervalFromDate(startedAt!, interval)!,
+          state,
+          attempts,
+          status: TaskStatus.Idle,
+        });
+      }),
+      unwrap
+    )(result);
+
+    await this.bufferedTaskStore.update(
+      defaults(
+        {
+          ...fieldUpdates,
+          // reset fields that track the lifecycle of the concluded `task run`
+          startedAt: null,
+          retryAt: null,
+          ownerId: null,
+        },
+        this.instance
+      )
+    );
+  }
+
+  private async processResultWhenDone(): Promise<void> {
+    // not a recurring task: clean up by removing the task instance from store
+    try {
+      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?`);
+      } else {
+        throw err;
+      }
+    }
+  }
+
+  private async processResult(
+    result: Result<SuccessfulRunResult, FailedRunResult>
+  ): Promise<Result<SuccessfulRunResult, FailedRunResult>> {
+    await eitherAsync(
+      result,
+      async ({ runAt }: SuccessfulRunResult) => {
+        if (runAt || this.instance.schedule) {
+          await this.processResultForRecurringTask(result);
+        } else {
+          await this.processResultWhenDone();
+        }
+        this.onTaskEvent(asTaskRunEvent(this.id, asOk(this.instance)));
+      },
+      async ({ error }: FailedRunResult) => {
+        await this.processResultForRecurringTask(result);
+        this.onTaskEvent(asTaskRunEvent(this.id, asErr(error)));
+      }
+    );
+    return result;
+  }
+
+  private getRetryDelay({
+    error,
+    attempts,
+    addDuration,
+  }: {
+    error: any;
+    attempts: number;
+    addDuration?: string;
+  }): Date | null {
+    let result = null;
+
+    // Use custom retry logic, if any, otherwise we'll use the default logic
+    const retry: boolean | Date = this.definition.getRetry
+      ? this.definition.getRetry(attempts, error)
+      : true;
+
+    if (retry instanceof Date) {
+      result = retry;
+    } else if (retry === true) {
+      result = new Date(Date.now() + attempts * defaultBackoffPerFailure);
+    }
+
+    // Add a duration to the result
+    if (addDuration && result) {
+      result = intervalFromDate(result, addDuration)!;
+    }
+    return result;
+  }
+}
+
+function sanitizeInstance(instance: ConcreteTaskInstance): ConcreteTaskInstance {
+  return {
+    ...instance,
+    params: instance.params || {},
+    state: instance.state || {},
+  };
+}
+
+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/server/task_store.test.ts
similarity index 96%
rename from x-pack/legacy/plugins/task_manager/task_store.test.ts
rename to x-pack/legacy/plugins/task_manager/server/task_store.test.ts
index b8c8ad154f1c3..c7a0a1a020721 100644
--- a/x-pack/legacy/plugins/task_manager/task_store.test.ts
+++ b/x-pack/legacy/plugins/task_manager/server/task_store.test.ts
@@ -17,14 +17,13 @@ import {
   TaskLifecycleResult,
 } from './task';
 import { FetchOpts, StoreOpts, OwnershipClaimingOpts, TaskStore } from './task_store';
-// Task manager uses an unconventional directory structure so the linter marks this as a violation, server files should
-// be moved under task_manager/server/
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { savedObjectsClientMock } from 'src/core/server/mocks';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsSerializer, SavedObjectsSchema, SavedObjectAttributes } from 'src/core/server';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsErrorHelpers } from '../../../../src/core/server/saved_objects/service/lib/errors';
+import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import {
+  SavedObjectsSerializer,
+  SavedObjectsSchema,
+  SavedObjectAttributes,
+} from '../../../../../src/core/server';
+import { SavedObjectsErrorHelpers } from '../../../../../src/core/server/saved_objects/service/lib/errors';
 import { asTaskClaimEvent, TaskEvent } from './task_events';
 import { asOk, asErr } from './lib/result_type';
 
@@ -103,7 +102,7 @@ describe('TaskStore', () => {
         'task',
         {
           attempts: 0,
-          interval: undefined,
+          schedule: undefined,
           params: '{"hello":"world"}',
           retryAt: null,
           runAt: '2019-02-12T21:01:22.479Z',
@@ -124,7 +123,7 @@ describe('TaskStore', () => {
       expect(result).toEqual({
         id: 'testid',
         attempts: 0,
-        interval: undefined,
+        schedule: undefined,
         params: { hello: 'world' },
         retryAt: null,
         runAt: mockedDate,
@@ -276,7 +275,7 @@ describe('TaskStore', () => {
             task: {
               runAt,
               taskType: 'foo',
-              interval: undefined,
+              schedule: undefined,
               attempts: 0,
               status: 'idle',
               params: '{ "hello": "world" }',
@@ -294,7 +293,7 @@ describe('TaskStore', () => {
             task: {
               runAt,
               taskType: 'bar',
-              interval: '5m',
+              schedule: { interval: '5m' },
               attempts: 2,
               status: 'running',
               params: '{ "shazm": 1 }',
@@ -312,7 +311,7 @@ describe('TaskStore', () => {
           {
             attempts: 0,
             id: 'aaa',
-            interval: undefined,
+            schedule: undefined,
             params: { hello: 'world' },
             runAt,
             scheduledAt: mockedDate,
@@ -327,7 +326,7 @@ describe('TaskStore', () => {
           {
             attempts: 2,
             id: 'bbb',
-            interval: '5m',
+            schedule: { interval: '5m' },
             params: { shazm: 1 },
             runAt,
             scheduledAt: mockedDate,
@@ -481,7 +480,7 @@ describe('TaskStore', () => {
                   {
                     bool: {
                       should: [
-                        { exists: { field: 'task.interval' } },
+                        { exists: { field: 'task.schedule' } },
                         {
                           bool: {
                             must: [
@@ -599,7 +598,7 @@ describe('TaskStore', () => {
                         {
                           bool: {
                             should: [
-                              { exists: { field: 'task.interval' } },
+                              { exists: { field: 'task.schedule' } },
                               {
                                 bool: {
                                   must: [
@@ -734,7 +733,7 @@ if (doc['task.runAt'].size()!=0) {
             task: {
               runAt,
               taskType: 'foo',
-              interval: undefined,
+              schedule: undefined,
               attempts: 0,
               status: 'idle',
               params: '{ "hello": "world" }',
@@ -755,7 +754,7 @@ if (doc['task.runAt'].size()!=0) {
             task: {
               runAt,
               taskType: 'bar',
-              interval: '5m',
+              schedule: { interval: '5m' },
               attempts: 2,
               status: 'running',
               params: '{ "shazm": 1 }',
@@ -805,7 +804,7 @@ if (doc['task.runAt'].size()!=0) {
         {
           attempts: 0,
           id: 'aaa',
-          interval: undefined,
+          schedule: undefined,
           params: { hello: 'world' },
           runAt,
           scope: ['reporting'],
@@ -818,7 +817,7 @@ if (doc['task.runAt'].size()!=0) {
         {
           attempts: 2,
           id: 'bbb',
-          interval: '5m',
+          schedule: { interval: '5m' },
           params: { shazm: 1 },
           runAt,
           scope: ['reporting', 'ceo'],
@@ -878,7 +877,7 @@ if (doc['task.runAt'].size()!=0) {
         task.id,
         {
           attempts: task.attempts,
-          interval: undefined,
+          schedule: undefined,
           params: JSON.stringify(task.params),
           retryAt: null,
           runAt: task.runAt.toISOString(),
@@ -896,7 +895,7 @@ if (doc['task.runAt'].size()!=0) {
 
       expect(result).toEqual({
         ...task,
-        interval: undefined,
+        schedule: undefined,
         retryAt: null,
         scope: undefined,
         startedAt: null,
@@ -1074,7 +1073,7 @@ if (doc['task.runAt'].size()!=0) {
             task: {
               runAt,
               taskType: 'foo',
-              interval: undefined,
+              schedule: undefined,
               attempts: 0,
               status: 'idle',
               params: '{ "hello": "world" }',
@@ -1098,7 +1097,7 @@ if (doc['task.runAt'].size()!=0) {
             task: {
               runAt,
               taskType: 'bar',
-              interval: '5m',
+              schedule: { interval: '5m' },
               attempts: 2,
               status: 'running',
               params: '{ "shazm": 1 }',
@@ -1151,7 +1150,7 @@ if (doc['task.runAt'].size()!=0) {
                   id: 'aaa',
                   runAt,
                   taskType: 'foo',
-                  interval: undefined,
+                  schedule: undefined,
                   attempts: 0,
                   status: 'idle' as TaskStatus,
                   params: { hello: 'world' },
@@ -1208,7 +1207,7 @@ if (doc['task.runAt'].size()!=0) {
                   id: 'bbb',
                   runAt,
                   taskType: 'bar',
-                  interval: '5m',
+                  schedule: { interval: '5m' },
                   attempts: 2,
                   status: 'running' as TaskStatus,
                   params: { shazm: 1 },
diff --git a/x-pack/legacy/plugins/task_manager/task_store.ts b/x-pack/legacy/plugins/task_manager/server/task_store.ts
similarity index 97%
rename from x-pack/legacy/plugins/task_manager/task_store.ts
rename to x-pack/legacy/plugins/task_manager/server/task_store.ts
index 727587f714a14..e8fc0ccb90936 100644
--- a/x-pack/legacy/plugins/task_manager/task_store.ts
+++ b/x-pack/legacy/plugins/task_manager/server/task_store.ts
@@ -16,10 +16,7 @@ import {
   SavedObjectAttributes,
   SavedObjectsSerializer,
   SavedObjectsRawDoc,
-  // Task manager uses an unconventional directory structure so the linter marks this as a violation, server files should
-  // be moved under task_manager/server/
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from 'src/core/server';
+} from '../../../../../src/core/server';
 
 import { asOk, asErr } from './lib/result_type';
 
@@ -50,7 +47,7 @@ import {
   updateFields,
   IdleTaskWithExpiredRunAt,
   RunningOrClaimingTaskWithExpiredRetryAt,
-  RecuringTaskWithInterval,
+  TaskWithSchedule,
   taskWithLessThanMaxAttempts,
   SortByRunAtAndRetryAt,
   taskWithIDsAndRunnableStatus,
@@ -249,9 +246,9 @@ export class TaskStore {
       // Either a task with idle status and runAt <= now or
       // status running or claiming with a retryAt <= now.
       shouldBeOneOf(IdleTaskWithExpiredRunAt, RunningOrClaimingTaskWithExpiredRetryAt),
-      // Either task has an interval or the attempts < the maximum configured
+      // Either task has a schedule or the attempts < the maximum configured
       shouldBeOneOf<ExistsBoolClause | TermBoolClause | RangeBoolClause>(
-        RecuringTaskWithInterval,
+        TaskWithSchedule,
         ...Object.entries(this.definitions).map(([type, { maxAttempts }]) =>
           taskWithLessThanMaxAttempts(type, maxAttempts || this.maxAttempts)
         )
diff --git a/x-pack/legacy/plugins/task_manager/test_utils/index.ts b/x-pack/legacy/plugins/task_manager/server/test_utils/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/test_utils/index.ts
rename to x-pack/legacy/plugins/task_manager/server/test_utils/index.ts
diff --git a/x-pack/legacy/plugins/task_manager/types.ts b/x-pack/legacy/plugins/task_manager/server/types.ts
similarity index 100%
rename from x-pack/legacy/plugins/task_manager/types.ts
rename to x-pack/legacy/plugins/task_manager/server/types.ts
diff --git a/x-pack/legacy/plugins/task_manager/task_runner.test.ts b/x-pack/legacy/plugins/task_manager/task_runner.test.ts
deleted file mode 100644
index c45077c963862..0000000000000
--- a/x-pack/legacy/plugins/task_manager/task_runner.test.ts
+++ /dev/null
@@ -1,952 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * 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 sinon from 'sinon';
-import { minutesFromNow } from './lib/intervals';
-import { asOk, asErr } from './lib/result_type';
-import { TaskEvent, asTaskRunEvent, asTaskMarkRunningEvent } from './task_events';
-import { ConcreteTaskInstance, TaskStatus } from './task';
-import { TaskManagerRunner } from './task_runner';
-import { mockLogger } from './test_utils';
-// Task manager uses an unconventional directory structure so the linter marks this as a violation, server files should
-// be moved under task_manager/server/
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { SavedObjectsErrorHelpers } from '../../../../src/core/server';
-
-let fakeTimer: sinon.SinonFakeTimers;
-
-beforeAll(() => {
-  fakeTimer = sinon.useFakeTimers();
-});
-
-afterAll(() => fakeTimer.restore());
-
-describe('TaskManagerRunner', () => {
-  test('provides details about the task that is running', () => {
-    const { runner } = testOpts({
-      instance: {
-        id: 'foo',
-        taskType: 'bar',
-      },
-    });
-
-    expect(runner.id).toEqual('foo');
-    expect(runner.taskType).toEqual('bar');
-    expect(runner.toString()).toEqual('bar "foo"');
-  });
-
-  test('warns if the task returns an unexpected result', async () => {
-    await allowsReturnType(undefined);
-    await allowsReturnType({});
-    await allowsReturnType({
-      runAt: new Date(),
-    });
-    await allowsReturnType({
-      error: new Error('Dang it!'),
-    });
-    await allowsReturnType({
-      state: { shazm: true },
-    });
-    await disallowsReturnType('hm....');
-    await disallowsReturnType({
-      whatIsThis: '?!!?',
-    });
-  });
-
-  test('queues a reattempt if the task fails', async () => {
-    const initialAttempts = _.random(0, 2);
-    const id = Date.now().toString();
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        attempts: initialAttempts,
-        params: { a: 'b' },
-        state: { hey: 'there' },
-      },
-      definitions: {
-        bar: {
-          createTaskRunner: () => ({
-            async run() {
-              throw new Error('Dangit!');
-            },
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    sinon.assert.calledOnce(store.update);
-    const instance = store.update.args[0][0];
-
-    expect(instance.id).toEqual(id);
-    expect(instance.runAt.getTime()).toEqual(minutesFromNow(initialAttempts * 5).getTime());
-    expect(instance.params).toEqual({ a: 'b' });
-    expect(instance.state).toEqual({ hey: 'there' });
-  });
-
-  test('reschedules tasks that have an interval', async () => {
-    const { runner, store } = testOpts({
-      instance: {
-        interval: '10m',
-        status: TaskStatus.Running,
-        startedAt: new Date(),
-      },
-      definitions: {
-        bar: {
-          createTaskRunner: () => ({
-            async run() {
-              return;
-            },
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    sinon.assert.calledOnce(store.update);
-    const instance = store.update.args[0][0];
-
-    expect(instance.runAt.getTime()).toBeGreaterThan(minutesFromNow(9).getTime());
-    expect(instance.runAt.getTime()).toBeLessThanOrEqual(minutesFromNow(10).getTime());
-  });
-
-  test('reschedules tasks that return a runAt', async () => {
-    const runAt = minutesFromNow(_.random(1, 10));
-    const { runner, store } = testOpts({
-      definitions: {
-        bar: {
-          createTaskRunner: () => ({
-            async run() {
-              return { runAt };
-            },
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    sinon.assert.calledOnce(store.update);
-    sinon.assert.calledWithMatch(store.update, { runAt });
-  });
-
-  test('tasks that return runAt override interval', async () => {
-    const runAt = minutesFromNow(_.random(5));
-    const { runner, store } = testOpts({
-      instance: {
-        interval: '20m',
-      },
-      definitions: {
-        bar: {
-          createTaskRunner: () => ({
-            async run() {
-              return { runAt };
-            },
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    sinon.assert.calledOnce(store.update);
-    sinon.assert.calledWithMatch(store.update, { runAt });
-  });
-
-  test('removes non-recurring tasks after they complete', async () => {
-    const id = _.random(1, 20).toString();
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        interval: undefined,
-      },
-      definitions: {
-        bar: {
-          createTaskRunner: () => ({
-            async run() {
-              return undefined;
-            },
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    sinon.assert.calledOnce(store.remove);
-    sinon.assert.calledWith(store.remove, id);
-  });
-
-  test('cancel cancels the task runner, if it is cancellable', async () => {
-    let wasCancelled = false;
-    const { runner, logger } = testOpts({
-      definitions: {
-        bar: {
-          createTaskRunner: () => ({
-            async run() {
-              const promise = new Promise(r => setTimeout(r, 1000));
-              fakeTimer.tick(1000);
-              await promise;
-            },
-            async cancel() {
-              wasCancelled = true;
-            },
-          }),
-        },
-      },
-    });
-
-    const promise = runner.run();
-    await Promise.resolve();
-    await runner.cancel();
-    await promise;
-
-    expect(wasCancelled).toBeTruthy();
-    expect(logger.warn).not.toHaveBeenCalled();
-  });
-
-  test('warns if cancel is called on a non-cancellable task', async () => {
-    const { runner, logger } = testOpts({
-      definitions: {
-        bar: {
-          createTaskRunner: () => ({
-            run: async () => undefined,
-          }),
-        },
-      },
-    });
-
-    const promise = runner.run();
-    await runner.cancel();
-    await promise;
-
-    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 () => {
-    const timeoutMinutes = 1;
-    const id = _.random(1, 20).toString();
-    const initialAttempts = _.random(0, 2);
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        attempts: initialAttempts,
-        interval: undefined,
-      },
-      definitions: {
-        bar: {
-          timeout: `${timeoutMinutes}m`,
-          createTaskRunner: () => ({
-            run: async () => undefined,
-          }),
-        },
-      },
-    });
-
-    await runner.markTaskAsRunning();
-
-    sinon.assert.calledOnce(store.update);
-    const instance = store.update.args[0][0];
-
-    expect(instance.attempts).toEqual(initialAttempts + 1);
-    expect(instance.status).toBe('running');
-    expect(instance.startedAt.getTime()).toEqual(Date.now());
-    expect(instance.retryAt.getTime()).toEqual(
-      minutesFromNow((initialAttempts + 1) * 5).getTime() + timeoutMinutes * 60 * 1000
-    );
-  });
-
-  test('uses getRetry function (returning date) on error when defined', async () => {
-    const initialAttempts = _.random(1, 3);
-    const nextRetry = new Date(Date.now() + _.random(15, 100) * 1000);
-    const id = Date.now().toString();
-    const getRetryStub = sinon.stub().returns(nextRetry);
-    const error = new Error('Dangit!');
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        attempts: initialAttempts,
-      },
-      definitions: {
-        bar: {
-          getRetry: getRetryStub,
-          createTaskRunner: () => ({
-            async run() {
-              throw error;
-            },
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    sinon.assert.calledOnce(store.update);
-    sinon.assert.calledWith(getRetryStub, initialAttempts, error);
-    const instance = store.update.args[0][0];
-
-    expect(instance.runAt.getTime()).toEqual(nextRetry.getTime());
-  });
-
-  test('uses getRetry function (returning true) on error when defined', async () => {
-    const initialAttempts = _.random(1, 3);
-    const id = Date.now().toString();
-    const getRetryStub = sinon.stub().returns(true);
-    const error = new Error('Dangit!');
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        attempts: initialAttempts,
-      },
-      definitions: {
-        bar: {
-          getRetry: getRetryStub,
-          createTaskRunner: () => ({
-            async run() {
-              throw error;
-            },
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    sinon.assert.calledOnce(store.update);
-    sinon.assert.calledWith(getRetryStub, initialAttempts, error);
-    const instance = store.update.args[0][0];
-
-    const expectedRunAt = new Date(Date.now() + initialAttempts * 5 * 60 * 1000);
-    expect(instance.runAt.getTime()).toEqual(expectedRunAt.getTime());
-  });
-
-  test('uses getRetry function (returning false) on error when defined', async () => {
-    const initialAttempts = _.random(1, 3);
-    const id = Date.now().toString();
-    const getRetryStub = sinon.stub().returns(false);
-    const error = new Error('Dangit!');
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        attempts: initialAttempts,
-      },
-      definitions: {
-        bar: {
-          getRetry: getRetryStub,
-          createTaskRunner: () => ({
-            async run() {
-              throw error;
-            },
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    sinon.assert.calledOnce(store.update);
-    sinon.assert.calledWith(getRetryStub, initialAttempts, error);
-    const instance = store.update.args[0][0];
-
-    expect(instance.status).toBe('failed');
-  });
-
-  test('bypasses getRetry function (returning false) on error of a recurring task', async () => {
-    const initialAttempts = _.random(1, 3);
-    const id = Date.now().toString();
-    const getRetryStub = sinon.stub().returns(false);
-    const error = new Error('Dangit!');
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        attempts: initialAttempts,
-        interval: '1m',
-        startedAt: new Date(),
-      },
-      definitions: {
-        bar: {
-          getRetry: getRetryStub,
-          createTaskRunner: () => ({
-            async run() {
-              throw error;
-            },
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    sinon.assert.calledOnce(store.update);
-    sinon.assert.notCalled(getRetryStub);
-    const instance = store.update.args[0][0];
-
-    const nextIntervalDelay = 60000; // 1m
-    const expectedRunAt = new Date(Date.now() + nextIntervalDelay);
-    expect(instance.runAt.getTime()).toEqual(expectedRunAt.getTime());
-  });
-
-  test('uses getRetry (returning date) to set retryAt when defined', 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,
-          }),
-        },
-      },
-    });
-
-    await runner.markTaskAsRunning();
-
-    sinon.assert.calledOnce(store.update);
-    sinon.assert.calledWith(getRetryStub, initialAttempts + 1);
-    const instance = store.update.args[0][0];
-
-    expect(instance.retryAt.getTime()).toEqual(
-      new Date(nextRetry.getTime() + timeoutMinutes * 60 * 1000).getTime()
-    );
-  });
-
-  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);
-    const timeoutMinutes = 1;
-    const getRetryStub = sinon.stub().returns(true);
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        attempts: initialAttempts,
-        interval: undefined,
-      },
-      definitions: {
-        bar: {
-          timeout: `${timeoutMinutes}m`,
-          getRetry: getRetryStub,
-          createTaskRunner: () => ({
-            run: async () => undefined,
-          }),
-        },
-      },
-    });
-
-    await runner.markTaskAsRunning();
-
-    sinon.assert.calledOnce(store.update);
-    sinon.assert.calledWith(getRetryStub, initialAttempts + 1);
-    const instance = store.update.args[0][0];
-
-    const attemptDelay = (initialAttempts + 1) * 5 * 60 * 1000;
-    const timeoutDelay = timeoutMinutes * 60 * 1000;
-    expect(instance.retryAt.getTime()).toEqual(
-      new Date(Date.now() + attemptDelay + timeoutDelay).getTime()
-    );
-  });
-
-  test('uses getRetry (returning false) to set retryAt when defined', async () => {
-    const id = _.random(1, 20).toString();
-    const initialAttempts = _.random(1, 3);
-    const timeoutMinutes = 1;
-    const getRetryStub = sinon.stub().returns(false);
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        attempts: initialAttempts,
-        interval: undefined,
-      },
-      definitions: {
-        bar: {
-          timeout: `${timeoutMinutes}m`,
-          getRetry: getRetryStub,
-          createTaskRunner: () => ({
-            run: async () => undefined,
-          }),
-        },
-      },
-    });
-
-    await runner.markTaskAsRunning();
-
-    sinon.assert.calledOnce(store.update);
-    sinon.assert.calledWith(getRetryStub, initialAttempts + 1);
-    const instance = store.update.args[0][0];
-
-    expect(instance.retryAt).toBeNull();
-    expect(instance.status).toBe('running');
-  });
-
-  test('bypasses getRetry (returning false) of a recurring task to set retryAt when defined', async () => {
-    const id = _.random(1, 20).toString();
-    const initialAttempts = _.random(1, 3);
-    const timeoutMinutes = 1;
-    const getRetryStub = sinon.stub().returns(false);
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        attempts: initialAttempts,
-        interval: '1m',
-        startedAt: new Date(),
-      },
-      definitions: {
-        bar: {
-          timeout: `${timeoutMinutes}m`,
-          getRetry: getRetryStub,
-          createTaskRunner: () => ({
-            run: async () => undefined,
-          }),
-        },
-      },
-    });
-
-    await runner.markTaskAsRunning();
-
-    sinon.assert.calledOnce(store.update);
-    sinon.assert.notCalled(getRetryStub);
-    const instance = store.update.args[0][0];
-
-    const timeoutDelay = timeoutMinutes * 60 * 1000;
-    expect(instance.retryAt.getTime()).toEqual(new Date(Date.now() + timeoutDelay).getTime());
-  });
-
-  test('Fails non-recurring task when maxAttempts reached', async () => {
-    const id = _.random(1, 20).toString();
-    const initialAttempts = 3;
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        attempts: initialAttempts,
-        interval: undefined,
-      },
-      definitions: {
-        bar: {
-          maxAttempts: 3,
-          createTaskRunner: () => ({
-            run: async () => {
-              throw new Error();
-            },
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    sinon.assert.calledOnce(store.update);
-    const instance = store.update.args[0][0];
-    expect(instance.attempts).toEqual(3);
-    expect(instance.status).toEqual('failed');
-    expect(instance.retryAt).toBeNull();
-    expect(instance.runAt.getTime()).toBeLessThanOrEqual(Date.now());
-  });
-
-  test(`Doesn't fail recurring tasks when maxAttempts reached`, async () => {
-    const id = _.random(1, 20).toString();
-    const initialAttempts = 3;
-    const intervalSeconds = 10;
-    const { runner, store } = testOpts({
-      instance: {
-        id,
-        attempts: initialAttempts,
-        interval: `${intervalSeconds}s`,
-        startedAt: new Date(),
-      },
-      definitions: {
-        bar: {
-          maxAttempts: 3,
-          createTaskRunner: () => ({
-            run: async () => {
-              throw new Error();
-            },
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    sinon.assert.calledOnce(store.update);
-    const instance = store.update.args[0][0];
-    expect(instance.attempts).toEqual(3);
-    expect(instance.status).toEqual('idle');
-    expect(instance.runAt.getTime()).toEqual(
-      new Date(Date.now() + intervalSeconds * 1000).getTime()
-    );
-  });
-
-  describe('TaskEvents', () => {
-    test('emits TaskEvent when a task is marked as running', async () => {
-      const id = _.random(1, 20).toString();
-      const onTaskEvent = jest.fn();
-      const { runner, instance, store } = testOpts({
-        onTaskEvent,
-        instance: {
-          id,
-        },
-        definitions: {
-          bar: {
-            timeout: `1m`,
-            getRetry: () => {},
-            createTaskRunner: () => ({
-              run: async () => undefined,
-            }),
-          },
-        },
-      });
-
-      store.update.returns(instance);
-
-      await runner.markTaskAsRunning();
-
-      expect(onTaskEvent).toHaveBeenCalledWith(asTaskMarkRunningEvent(id, asOk(instance)));
-    });
-
-    test('emits TaskEvent when a task fails to be marked as running', async () => {
-      expect.assertions(2);
-
-      const id = _.random(1, 20).toString();
-      const onTaskEvent = jest.fn();
-      const { runner, store } = testOpts({
-        onTaskEvent,
-        instance: {
-          id,
-        },
-        definitions: {
-          bar: {
-            timeout: `1m`,
-            getRetry: () => {},
-            createTaskRunner: () => ({
-              run: async () => undefined,
-            }),
-          },
-        },
-      });
-
-      store.update.throws(new Error('cant mark as running'));
-
-      try {
-        await runner.markTaskAsRunning();
-      } catch (err) {
-        expect(onTaskEvent).toHaveBeenCalledWith(asTaskMarkRunningEvent(id, asErr(err)));
-      }
-      expect(onTaskEvent).toHaveBeenCalledTimes(1);
-    });
-
-    test('emits TaskEvent when a task is run successfully', async () => {
-      const id = _.random(1, 20).toString();
-      const onTaskEvent = jest.fn();
-      const { runner, instance } = testOpts({
-        onTaskEvent,
-        instance: {
-          id,
-        },
-        definitions: {
-          bar: {
-            createTaskRunner: () => ({
-              async run() {
-                return {};
-              },
-            }),
-          },
-        },
-      });
-
-      await runner.run();
-
-      expect(onTaskEvent).toHaveBeenCalledWith(asTaskRunEvent(id, asOk(instance)));
-    });
-
-    test('emits TaskEvent when a recurring task is run successfully', async () => {
-      const id = _.random(1, 20).toString();
-      const runAt = minutesFromNow(_.random(5));
-      const onTaskEvent = jest.fn();
-      const { runner, instance } = testOpts({
-        onTaskEvent,
-        instance: {
-          id,
-          interval: '1m',
-        },
-        definitions: {
-          bar: {
-            createTaskRunner: () => ({
-              async run() {
-                return { runAt };
-              },
-            }),
-          },
-        },
-      });
-
-      await runner.run();
-
-      expect(onTaskEvent).toHaveBeenCalledWith(asTaskRunEvent(id, asOk(instance)));
-    });
-
-    test('emits TaskEvent when a task run throws an error', async () => {
-      const id = _.random(1, 20).toString();
-      const error = new Error('Dangit!');
-      const onTaskEvent = jest.fn();
-      const { runner } = testOpts({
-        onTaskEvent,
-        instance: {
-          id,
-        },
-        definitions: {
-          bar: {
-            createTaskRunner: () => ({
-              async run() {
-                throw error;
-              },
-            }),
-          },
-        },
-      });
-      await runner.run();
-
-      expect(onTaskEvent).toHaveBeenCalledWith(asTaskRunEvent(id, asErr(error)));
-      expect(onTaskEvent).toHaveBeenCalledTimes(1);
-    });
-
-    test('emits TaskEvent when a task run returns an error', async () => {
-      const id = _.random(1, 20).toString();
-      const error = new Error('Dangit!');
-      const onTaskEvent = jest.fn();
-      const { runner } = testOpts({
-        onTaskEvent,
-        instance: {
-          id,
-          interval: '1m',
-          startedAt: new Date(),
-        },
-        definitions: {
-          bar: {
-            createTaskRunner: () => ({
-              async run() {
-                return { error };
-              },
-            }),
-          },
-        },
-      });
-
-      await runner.run();
-
-      expect(onTaskEvent).toHaveBeenCalledWith(asTaskRunEvent(id, asErr(error)));
-      expect(onTaskEvent).toHaveBeenCalledTimes(1);
-    });
-
-    test('emits TaskEvent when a task returns an error and is marked as failed', async () => {
-      const id = _.random(1, 20).toString();
-      const error = new Error('Dangit!');
-      const onTaskEvent = jest.fn();
-      const { runner, store } = testOpts({
-        onTaskEvent,
-        instance: {
-          id,
-          startedAt: new Date(),
-        },
-        definitions: {
-          bar: {
-            getRetry: () => false,
-            createTaskRunner: () => ({
-              async run() {
-                return { error };
-              },
-            }),
-          },
-        },
-      });
-
-      await runner.run();
-
-      const instance = store.update.args[0][0];
-      expect(instance.status).toBe('failed');
-
-      expect(onTaskEvent).toHaveBeenCalledWith(asTaskRunEvent(id, asErr(error)));
-      expect(onTaskEvent).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  interface TestOpts {
-    instance?: Partial<ConcreteTaskInstance>;
-    definitions?: any;
-    onTaskEvent?: (event: TaskEvent<any, any>) => void;
-  }
-
-  function testOpts(opts: TestOpts) {
-    const callCluster = sinon.stub();
-    const createTaskRunner = sinon.stub();
-    const logger = mockLogger();
-
-    const instance = Object.assign(
-      {
-        id: 'foo',
-        taskType: 'bar',
-        sequenceNumber: 32,
-        primaryTerm: 32,
-        runAt: new Date(),
-        scheduledAt: new Date(),
-        startedAt: null,
-        retryAt: null,
-        attempts: 0,
-        params: {},
-        scope: ['reporting'],
-        state: {},
-        status: 'idle',
-        user: 'example',
-        ownerId: null,
-      },
-      opts.instance || {}
-    );
-
-    const store = {
-      update: sinon.stub(),
-      remove: sinon.stub(),
-      maxAttempts: 5,
-    };
-
-    store.update.returns(instance);
-
-    const runner = new TaskManagerRunner({
-      beforeRun: context => Promise.resolve(context),
-      beforeMarkRunning: context => Promise.resolve(context),
-      logger,
-      store,
-      instance,
-      definitions: Object.assign(opts.definitions || {}, {
-        testbar: {
-          type: 'bar',
-          title: 'Bar!',
-          createTaskRunner,
-        },
-      }),
-      onTaskEvent: opts.onTaskEvent,
-    });
-
-    return {
-      callCluster,
-      createTaskRunner,
-      runner,
-      logger,
-      store,
-      instance,
-    };
-  }
-
-  async function testReturn(result: any, shouldBeValid: boolean) {
-    const { runner, logger } = testOpts({
-      definitions: {
-        bar: {
-          createTaskRunner: () => ({
-            run: async () => result,
-          }),
-        },
-      },
-    });
-
-    await runner.run();
-
-    if (shouldBeValid) {
-      expect(logger.warn).not.toHaveBeenCalled();
-    } else {
-      expect(logger.warn).toHaveBeenCalledTimes(1);
-      expect(logger.warn.mock.calls[0][0]).toMatch(/invalid task result/i);
-    }
-  }
-
-  function allowsReturnType(result: any) {
-    return testReturn(result, true);
-  }
-
-  function disallowsReturnType(result: any) {
-    return testReturn(result, false);
-  }
-});
diff --git a/x-pack/legacy/plugins/task_manager/task_runner.ts b/x-pack/legacy/plugins/task_manager/task_runner.ts
deleted file mode 100644
index 4384f1cbbf5c0..0000000000000
--- a/x-pack/legacy/plugins/task_manager/task_runner.ts
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under 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 module contains the core logic for running an individual task.
- * It handles the full lifecycle of a task run, including error handling,
- * rescheduling, middleware application, etc.
- */
-
-import { performance } from 'perf_hooks';
-import Joi from 'joi';
-import { identity, defaults, flow } from 'lodash';
-
-import { asOk, asErr, mapErr, eitherAsync, unwrap, mapOk, Result } from './lib/result_type';
-import { TaskRun, TaskMarkRunning, asTaskRunEvent, asTaskMarkRunningEvent } from './task_events';
-import { intervalFromDate, intervalFromNow } from './lib/intervals';
-import { Logger } from './types';
-import { BeforeRunFunction, BeforeMarkRunningFunction } from './lib/middleware';
-import {
-  CancelFunction,
-  CancellableTask,
-  ConcreteTaskInstance,
-  RunResult,
-  SuccessfulRunResult,
-  FailedRunResult,
-  FailedTaskResult,
-  TaskDefinition,
-  TaskDictionary,
-  validateRunResult,
-  TaskStatus,
-} from './task';
-
-const defaultBackoffPerFailure = 5 * 60 * 1000;
-const EMPTY_RUN_RESULT: SuccessfulRunResult = {};
-
-export interface TaskRunner {
-  isExpired: boolean;
-  cancel: CancelFunction;
-  markTaskAsRunning: () => Promise<boolean>;
-  run: () => Promise<Result<SuccessfulRunResult, FailedRunResult>>;
-  id: string;
-  toString: () => string;
-}
-
-interface Updatable {
-  readonly maxAttempts: number;
-  update(doc: ConcreteTaskInstance): Promise<ConcreteTaskInstance>;
-  remove(id: string): Promise<void>;
-}
-
-interface Opts {
-  logger: Logger;
-  definitions: TaskDictionary<TaskDefinition>;
-  instance: ConcreteTaskInstance;
-  store: Updatable;
-  beforeRun: BeforeRunFunction;
-  beforeMarkRunning: BeforeMarkRunningFunction;
-  onTaskEvent?: (event: TaskRun | TaskMarkRunning) => void;
-}
-
-/**
- * Runs a background task, ensures that errors are properly handled,
- * allows for cancellation.
- *
- * @export
- * @class TaskManagerRunner
- * @implements {TaskRunner}
- */
-export class TaskManagerRunner implements TaskRunner {
-  private task?: CancellableTask;
-  private instance: ConcreteTaskInstance;
-  private definitions: TaskDictionary<TaskDefinition>;
-  private logger: Logger;
-  private bufferedTaskStore: Updatable;
-  private beforeRun: BeforeRunFunction;
-  private beforeMarkRunning: BeforeMarkRunningFunction;
-  private onTaskEvent: (event: TaskRun | TaskMarkRunning) => void;
-
-  /**
-   * Creates an instance of TaskManagerRunner.
-   * @param {Opts} opts
-   * @prop {Logger} logger - The task manager logger
-   * @prop {TaskDefinition} definition - The definition of the task being run
-   * @prop {ConcreteTaskInstance} instance - The record describing this particular task instance
-   * @prop {Updatable} store - The store used to read / write tasks instance info
-   * @prop {BeforeRunFunction} beforeRun - A function that adjusts the run context prior to running the task
-   * @memberof TaskManagerRunner
-   */
-  constructor({
-    instance,
-    definitions,
-    logger,
-    store,
-    beforeRun,
-    beforeMarkRunning,
-    onTaskEvent = identity,
-  }: Opts) {
-    this.instance = sanitizeInstance(instance);
-    this.definitions = definitions;
-    this.logger = logger;
-    this.bufferedTaskStore = store;
-    this.beforeRun = beforeRun;
-    this.beforeMarkRunning = beforeMarkRunning;
-    this.onTaskEvent = onTaskEvent;
-  }
-
-  /**
-   * Gets the id of this task instance.
-   */
-  public get id() {
-    return this.instance.id;
-  }
-
-  /**
-   * Gets the task type of this task instance.
-   */
-  public get taskType() {
-    return this.instance.taskType;
-  }
-
-  /**
-   * Gets the task defintion from the dictionary.
-   */
-  public get definition() {
-    return this.definitions[this.taskType];
-  }
-
-  /**
-   * Gets whether or not this task has run longer than its expiration setting allows.
-   */
-  public get isExpired() {
-    return intervalFromDate(this.instance.startedAt!, this.definition.timeout)! < new Date();
-  }
-
-  /**
-   * Returns a log-friendly representation of this task.
-   */
-  public toString() {
-    return `${this.taskType} "${this.id}"`;
-  }
-
-  /**
-   * Runs the task, handling the task result, errors, etc, rescheduling if need
-   * be. NOTE: the time of applying the middleware's beforeRun is incorporated
-   * into the total timeout time the task in configured with. We may decide to
-   * start the timer after beforeRun resolves
-   *
-   * @returns {Promise<Result<SuccessfulRunResult, FailedRunResult>>}
-   */
-  public async run(): Promise<Result<SuccessfulRunResult, FailedRunResult>> {
-    this.logger.debug(`Running task ${this}`);
-    const modifiedContext = await this.beforeRun({
-      taskInstance: this.instance,
-    });
-
-    try {
-      this.task = this.definition.createTaskRunner(modifiedContext);
-      const result = await this.task.run();
-      const validatedResult = this.validateResult(result);
-      return this.processResult(validatedResult);
-    } catch (err) {
-      this.logger.error(`Task ${this} failed: ${err}`);
-      // in error scenario, we can not get the RunResult
-      // re-use modifiedContext's state, which is correct as of beforeRun
-      return this.processResult(asErr({ error: err, state: modifiedContext.taskInstance.state }));
-    }
-  }
-
-  /**
-   * Attempts to claim exclusive rights to run the task. If the attempt fails
-   * with a 409 (http conflict), we assume another Kibana instance beat us to the punch.
-   *
-   * @returns {Promise<boolean>}
-   */
-  public async markTaskAsRunning(): Promise<boolean> {
-    performance.mark('markTaskAsRunning_start');
-
-    const VERSION_CONFLICT_STATUS = 409;
-    const now = new Date();
-
-    const { taskInstance } = await this.beforeMarkRunning({
-      taskInstance: this.instance,
-    });
-
-    const attempts = taskInstance.attempts + 1;
-    const ownershipClaimedUntil = taskInstance.retryAt;
-
-    try {
-      const { id } = taskInstance;
-
-      const timeUntilClaimExpires = howManyMsUntilOwnershipClaimExpires(ownershipClaimedUntil);
-      if (timeUntilClaimExpires < 0) {
-        this.logger.debug(
-          `[Task Runner] Task ${id} started after ownership expired (${Math.abs(
-            timeUntilClaimExpires
-          )}ms after expiry)`
-        );
-      }
-
-      this.instance = await this.bufferedTaskStore.update({
-        ...taskInstance,
-        status: TaskStatus.Running,
-        startedAt: now,
-        attempts,
-        retryAt: this.instance.interval
-          ? intervalFromNow(this.definition.timeout)!
-          : this.getRetryDelay({
-              attempts,
-              // Fake an error. This allows retry logic when tasks keep timing out
-              // and lets us set a proper "retryAt" value each time.
-              error: new Error('Task timeout'),
-              addDuration: this.definition.timeout,
-            }),
-      });
-
-      const timeUntilClaimExpiresAfterUpdate = howManyMsUntilOwnershipClaimExpires(
-        ownershipClaimedUntil
-      );
-      if (timeUntilClaimExpiresAfterUpdate < 0) {
-        this.logger.debug(
-          `[Task Runner] Task ${id} ran after ownership expired (${Math.abs(
-            timeUntilClaimExpiresAfterUpdate
-          )}ms after expiry)`
-        );
-      }
-
-      performanceStopMarkingTaskAsRunning();
-      this.onTaskEvent(asTaskMarkRunningEvent(this.id, asOk(this.instance)));
-      return true;
-    } catch (error) {
-      performanceStopMarkingTaskAsRunning();
-      this.onTaskEvent(asTaskMarkRunningEvent(this.id, asErr(error)));
-      if (error.statusCode !== VERSION_CONFLICT_STATUS) {
-        throw error;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Attempts to cancel the task.
-   *
-   * @returns {Promise<void>}
-   */
-  public async cancel() {
-    const { task } = this;
-    if (task && task.cancel) {
-      this.task = undefined;
-      return task.cancel();
-    }
-
-    this.logger.warn(`The task ${this} is not cancellable.`);
-  }
-
-  private validateResult(result?: RunResult | void): Result<SuccessfulRunResult, FailedRunResult> {
-    const { error } = Joi.validate(result, validateRunResult);
-
-    if (error) {
-      this.logger.warn(`Invalid task result for ${this}: ${error.message}`);
-      return asErr({
-        error: new Error(`Invalid task result for ${this}: ${error.message}`),
-        state: {},
-      });
-    }
-    if (!result) {
-      return asOk(EMPTY_RUN_RESULT);
-    }
-
-    return result.error ? asErr({ ...result, error: result.error as Error }) : asOk(result);
-  }
-
-  private shouldTryToScheduleRetry(): boolean {
-    if (this.instance.interval) {
-      return true;
-    }
-
-    const maxAttempts = this.definition.maxAttempts || this.bufferedTaskStore.maxAttempts;
-    return this.instance.attempts < maxAttempts;
-  }
-
-  private rescheduleFailedRun = (
-    failureResult: FailedRunResult
-  ): Result<SuccessfulRunResult, FailedTaskResult> => {
-    if (this.shouldTryToScheduleRetry()) {
-      const { runAt, state, error } = failureResult;
-      // if we're retrying, keep the number of attempts
-      const { interval, attempts } = this.instance;
-      if (runAt || interval) {
-        return asOk({ state, attempts, runAt });
-      } else {
-        // when result.error is truthy, then we're retrying because it failed
-        const newRunAt = this.getRetryDelay({
-          attempts,
-          error,
-        });
-
-        if (newRunAt) {
-          return asOk({ state, attempts, runAt: newRunAt });
-        }
-      }
-    }
-    // scheduling a retry isn't possible,mark task as failed
-    return asErr({ status: TaskStatus.Failed });
-  };
-
-  private async processResultForRecurringTask(
-    result: Result<SuccessfulRunResult, FailedRunResult>
-  ): Promise<void> {
-    const fieldUpdates = flow(
-      // if running the task has failed ,try to correct by scheduling a retry in the near future
-      mapErr(this.rescheduleFailedRun),
-      // if retrying is possible (new runAt) or this is simply an interval
-      // based task - reschedule
-      mapOk(({ runAt, state, attempts = 0 }: Partial<ConcreteTaskInstance>) => {
-        const { startedAt, interval } = this.instance;
-        return asOk({
-          runAt: runAt || intervalFromDate(startedAt!, interval)!,
-          state,
-          attempts,
-          status: TaskStatus.Idle,
-        });
-      }),
-      unwrap
-    )(result);
-
-    await this.bufferedTaskStore.update(
-      defaults(
-        {
-          ...fieldUpdates,
-          // reset fields that track the lifecycle of the concluded `task run`
-          startedAt: null,
-          retryAt: null,
-          ownerId: null,
-        },
-        this.instance
-      )
-    );
-  }
-
-  private async processResultWhenDone(): Promise<void> {
-    // not a recurring task: clean up by removing the task instance from store
-    try {
-      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?`);
-      } else {
-        throw err;
-      }
-    }
-  }
-
-  private async processResult(
-    result: Result<SuccessfulRunResult, FailedRunResult>
-  ): Promise<Result<SuccessfulRunResult, FailedRunResult>> {
-    await eitherAsync(
-      result,
-      async ({ runAt }: SuccessfulRunResult) => {
-        if (runAt || this.instance.interval) {
-          await this.processResultForRecurringTask(result);
-        } else {
-          await this.processResultWhenDone();
-        }
-        this.onTaskEvent(asTaskRunEvent(this.id, asOk(this.instance)));
-      },
-      async ({ error }: FailedRunResult) => {
-        await this.processResultForRecurringTask(result);
-        this.onTaskEvent(asTaskRunEvent(this.id, asErr(error)));
-      }
-    );
-    return result;
-  }
-
-  private getRetryDelay({
-    error,
-    attempts,
-    addDuration,
-  }: {
-    error: any;
-    attempts: number;
-    addDuration?: string;
-  }): Date | null {
-    let result = null;
-
-    // Use custom retry logic, if any, otherwise we'll use the default logic
-    const retry: boolean | Date = this.definition.getRetry
-      ? this.definition.getRetry(attempts, error)
-      : true;
-
-    if (retry instanceof Date) {
-      result = retry;
-    } else if (retry === true) {
-      result = new Date(Date.now() + attempts * defaultBackoffPerFailure);
-    }
-
-    // Add a duration to the result
-    if (addDuration && result) {
-      result = intervalFromDate(result, addDuration)!;
-    }
-    return result;
-  }
-}
-
-function sanitizeInstance(instance: ConcreteTaskInstance): ConcreteTaskInstance {
-  return {
-    ...instance,
-    params: instance.params || {},
-    state: instance.state || {},
-  };
-}
-
-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/tilemap/server/lib/inspect_settings.js b/x-pack/legacy/plugins/tilemap/server/lib/inspect_settings.js
index 41c15c1387648..cd6fb8bd8c110 100644
--- a/x-pack/legacy/plugins/tilemap/server/lib/inspect_settings.js
+++ b/x-pack/legacy/plugins/tilemap/server/lib/inspect_settings.js
@@ -19,7 +19,14 @@ export function inspectSettings(xpackInfo) {
     license: {
       uid: xpackInfo.license.getUid(),
       active: xpackInfo.license.isActive(),
-      valid: xpackInfo.license.isOneOf(['trial', 'standard', 'basic', 'gold', 'platinum']),
+      valid: xpackInfo.license.isOneOf([
+        'trial',
+        'standard',
+        'basic',
+        'gold',
+        'platinum',
+        'enterprise',
+      ]),
     },
   };
 }
diff --git a/x-pack/legacy/plugins/transform/public/app/common/request.ts b/x-pack/legacy/plugins/transform/public/app/common/request.ts
index 5f0c778695523..5d508f3d245d3 100644
--- a/x-pack/legacy/plugins/transform/public/app/common/request.ts
+++ b/x-pack/legacy/plugins/transform/public/app/common/request.ts
@@ -6,14 +6,14 @@
 
 import { DefaultOperator } from 'elasticsearch';
 
-import { IndexPattern } from 'ui/index_patterns';
-
 import { dictionaryToArray } from '../../../common/types/common';
 import { SavedSearchQuery } from '../lib/kibana';
 
 import { StepDefineExposedState } from '../sections/create_transform/components/step_define/step_define_form';
 import { StepDetailsExposedState } from '../sections/create_transform/components/step_details/step_details_form';
 
+import { IndexPattern } from '../../../../../../../src/plugins/data/public';
+
 import {
   getEsAggFromAggConfig,
   getEsAggFromGroupByConfig,
diff --git a/x-pack/legacy/plugins/transform/public/app/lib/kibana/common.ts b/x-pack/legacy/plugins/transform/public/app/lib/kibana/common.ts
index 62c87413c9bce..3e55d509a94ab 100644
--- a/x-pack/legacy/plugins/transform/public/app/lib/kibana/common.ts
+++ b/x-pack/legacy/plugins/transform/public/app/lib/kibana/common.ts
@@ -5,8 +5,11 @@
  */
 
 import { SavedObjectsClientContract, IUiSettingsClient } from 'src/core/public';
-import { IndexPattern as IndexPatternType } from 'ui/index_patterns';
-import { esQuery, IndexPatternsContract } from '../../../../../../../../src/plugins/data/public';
+import {
+  IndexPattern,
+  esQuery,
+  IndexPatternsContract,
+} from '../../../../../../../../src/plugins/data/public';
 
 type IndexPatternId = string;
 type SavedSearchId = string;
@@ -68,7 +71,7 @@ export function loadCurrentSavedSearch(savedSearches: any, savedSearchId: SavedS
 
 // Helper for creating the items used for searching and job creation.
 export function createSearchItems(
-  indexPattern: IndexPatternType | undefined,
+  indexPattern: IndexPattern | undefined,
   savedSearch: any,
   config: IUiSettingsClient
 ) {
diff --git a/x-pack/legacy/plugins/transform/public/app/lib/kibana/kibana_context.tsx b/x-pack/legacy/plugins/transform/public/app/lib/kibana/kibana_context.tsx
index 3a3bd33ff6d70..5b7702a0193ec 100644
--- a/x-pack/legacy/plugins/transform/public/app/lib/kibana/kibana_context.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/lib/kibana/kibana_context.tsx
@@ -6,7 +6,7 @@
 
 import React, { createContext, useContext, FC } from 'react';
 
-import { SavedSearch } from '../../../../../../../../src/legacy/core_plugins/kibana/public/discover/types';
+import { SavedSearch } from '../../../../../../../../src/legacy/core_plugins/kibana/public/discover/np_ready/types';
 import {
   IndexPattern,
   IndexPatternsContract,
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/common.test.ts b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/common.test.ts
index c1a7fb3424c3a..78ad217a69e3d 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/common.test.ts
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/common.test.ts
@@ -14,7 +14,7 @@ import {
 } from '../../../../common';
 
 import { getPivotPreviewDevConsoleStatement, getPivotDropdownOptions } from './common';
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 
 describe('Transform: Define Pivot Common', () => {
   test('getPivotDropdownOptions()', () => {
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/common.ts b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/common.ts
index 54b810b7b6686..b4b03c1f0d571 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/common.ts
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/common.ts
@@ -5,10 +5,10 @@
  */
 import { get } from 'lodash';
 import { EuiComboBoxOptionProps } from '@elastic/eui';
-
-import { IndexPattern } from 'ui/index_patterns';
-
-import { KBN_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
+import {
+  IndexPattern,
+  KBN_FIELD_TYPES,
+} from '../../../../../../../../../../src/plugins/data/public';
 
 import {
   PreviewRequestBody,
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 3f4c7e21d3947..241f65614cea2 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
@@ -255,7 +255,7 @@ export const PivotPreview: FC<PivotPreviewProps> = React.memo(({ aggs, groupBy,
 
   const sorting = {
     sort: {
-      field: columns[0].field,
+      field: columns[0].field as string,
       direction: SORT_DIRECTION.ASC,
     },
   };
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/use_pivot_preview_data.test.tsx b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/use_pivot_preview_data.test.tsx
index 824ff0462cbba..1ad8ed099b241 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/use_pivot_preview_data.test.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/create_transform/components/step_define/use_pivot_preview_data.test.tsx
@@ -14,7 +14,7 @@ import {
   UsePivotPreviewDataReturnType,
 } from './use_pivot_preview_data';
 
-import { IndexPattern } from 'ui/index_patterns';
+import { IndexPattern } from '../../../../../../../../../../src/plugins/data/public';
 
 jest.mock('../../../../hooks/use_api');
 
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 e02f2473fc10b..84fafcad8151e 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
@@ -6,13 +6,15 @@
 
 import { useEffect, useState } from 'react';
 
-import { IndexPattern } from 'ui/index_patterns';
-
 import { dictionaryToArray } from '../../../../../../common/types/common';
 import { useApi } from '../../../../hooks/use_api';
 
 import { Dictionary } from '../../../../../../common/types/common';
-import { ES_FIELD_TYPES } from '../../../../../../../../../../src/plugins/data/public';
+import {
+  IndexPattern,
+  ES_FIELD_TYPES,
+} from '../../../../../../../../../../src/plugins/data/public';
+
 import {
   getPreviewRequestBody,
   PreviewRequestBody,
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/columns.tsx b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/columns.tsx
index 050dedbc8e0b4..ebe4f7efda055 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/columns.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/columns.tsx
@@ -87,7 +87,7 @@ export const getColumns = (
   }
 
   const columns: [
-    ExpanderColumnType,
+    ExpanderColumnType<TransformListRow>,
     FieldDataColumnType<TransformListRow>,
     FieldDataColumnType<TransformListRow>,
     FieldDataColumnType<TransformListRow>,
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_messages_pane.tsx b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_messages_pane.tsx
index 1aeb93c162847..08545c288ba96 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_messages_pane.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_messages_pane.tsx
@@ -120,8 +120,8 @@ export const ExpandedRowMessagesPane: React.FC<Props> = ({ transformId }) => {
   const onChange = ({
     page = { index: 0, size: 10 },
   }: {
-    page: { index: number; size: number };
-    sort: { field: string; direction: string };
+    page?: { index: number; size: number };
+    sort?: { field: string; direction: string };
   }) => {
     const { index, size } = page;
 
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx
index 6ee03ccca16e1..e480381d6fb8e 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row_preview_pane.tsx
@@ -7,6 +7,7 @@
 import React, { FC, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import moment from 'moment-timezone';
+import { Direction } from '@elastic/eui';
 import { SortDirection, SORT_DIRECTION, FieldDataColumnType } from '../../../../../shared_imports';
 
 import { useApi } from '../../../../hooks/use_api';
@@ -76,8 +77,8 @@ export const ExpandedRowPreviewPane: FC<Props> = ({ transformConfig }) => {
   const [columns, setColumns] = useState<Array<FieldDataColumnType<EsDoc>> | []>([]);
   const [pageIndex, setPageIndex] = useState(0);
   const [pageSize, setPageSize] = useState(10);
-  const [sortField, setSortField] = useState<string>('');
-  const [sortDirection, setSortDirection] = useState<SortDirection>(SORT_DIRECTION.ASC);
+  const [sortDirection, setSortDirection] = useState<SortDirection | Direction>(SORT_DIRECTION.ASC);
+  const [sortField, setSortField] = useState<keyof typeof previewData[number] | ''>('');
   const [isLoading, setIsLoading] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
   const api = useApi();
@@ -175,7 +176,7 @@ export const ExpandedRowPreviewPane: FC<Props> = ({ transformConfig }) => {
 
   const sorting = {
     sort: {
-      field: sortField,
+      field: sortField as string,
       direction: sortDirection,
     },
   };
@@ -184,8 +185,8 @@ export const ExpandedRowPreviewPane: FC<Props> = ({ transformConfig }) => {
     page = { index: 0, size: 10 },
     sort = { field: columns[0].field, direction: SORT_DIRECTION.ASC },
   }: {
-    page: { index: number; size: number };
-    sort: { field: string; direction: SortDirection };
+    page?: { index: number; size: number };
+    sort?: { field: keyof typeof previewData[number]; direction: SortDirection | Direction };
   }) => {
     const { index, size } = page;
     setPageIndex(index);
diff --git a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
index 14bf9fed1128b..6bea4e5750d2d 100644
--- a/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
+++ b/x-pack/legacy/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
@@ -18,6 +18,7 @@ import {
   EuiFlexItem,
   EuiPopover,
   EuiTitle,
+  Direction,
 } from '@elastic/eui';
 
 import { OnTableChangeArg, SortDirection, SORT_DIRECTION } from '../../../../../shared_imports';
@@ -99,7 +100,7 @@ export const TransformList: FC<Props> = ({
   const [pageSize, setPageSize] = useState(10);
 
   const [sortField, setSortField] = useState<string>(TRANSFORM_LIST_COLUMN.ID);
-  const [sortDirection, setSortDirection] = useState<SortDirection>(SORT_DIRECTION.ASC);
+  const [sortDirection, setSortDirection] = useState<SortDirection | Direction>(SORT_DIRECTION.ASC);
 
   const { capabilities } = useContext(AuthorizationContext);
   const disabled =
@@ -331,10 +332,10 @@ export const TransformList: FC<Props> = ({
     },
     filters: [
       {
-        type: 'field_value_selection',
+        type: 'field_value_selection' as const,
         field: 'state.state',
         name: i18n.translate('xpack.transform.statusFilter', { defaultMessage: 'Status' }),
-        multiSelect: 'or',
+        multiSelect: 'or' as const,
         options: Object.values(TRANSFORM_STATE).map(val => ({
           value: val,
           name: val,
@@ -342,7 +343,7 @@ export const TransformList: FC<Props> = ({
         })),
       },
       {
-        type: 'field_value_selection',
+        type: 'field_value_selection' as const,
         field: 'mode',
         name: i18n.translate('xpack.transform.modeFilter', { defaultMessage: 'Mode' }),
         multiSelect: false,
diff --git a/x-pack/legacy/plugins/transform/public/plugin.ts b/x-pack/legacy/plugins/transform/public/plugin.ts
index 08a3a06fc24fc..5d1c39add4ff6 100644
--- a/x-pack/legacy/plugins/transform/public/plugin.ts
+++ b/x-pack/legacy/plugins/transform/public/plugin.ts
@@ -7,7 +7,7 @@ import { unmountComponentAtNode } from 'react-dom';
 
 import { i18n } from '@kbn/i18n';
 
-import { SavedSearchLoader } from '../../../../../src/legacy/core_plugins/kibana/public/discover/types';
+import { SavedSearchLoader } from '../../../../../src/legacy/core_plugins/kibana/public/discover/np_ready/types';
 
 import { PLUGIN } from '../common/constants';
 import { CLIENT_BASE_PATH } from './app/constants';
diff --git a/x-pack/legacy/plugins/transform/public/shim.ts b/x-pack/legacy/plugins/transform/public/shim.ts
index 5d7c309ade211..d739dd2edddcc 100644
--- a/x-pack/legacy/plugins/transform/public/shim.ts
+++ b/x-pack/legacy/plugins/transform/public/shim.ts
@@ -12,7 +12,7 @@ import { docTitle } from 'ui/doc_title/doc_title';
 
 // @ts-ignore: allow traversal to fail on x-pack build
 import { createUiStatsReporter } from '../../../../../src/legacy/core_plugins/ui_metric/public';
-import { SavedSearchLoader } from '../../../../../src/legacy/core_plugins/kibana/public/discover/types';
+import { SavedSearchLoader } from '../../../../../src/legacy/core_plugins/kibana/public/discover/np_ready/types';
 
 export type npCore = typeof npStart.core;
 
@@ -47,6 +47,7 @@ export interface Core extends npCore {
     esDocBasePath: string;
     esPluginDocBasePath: string;
     esStackOverviewDocBasePath: string;
+    esMLDocBasePath: string;
   };
   docTitle: {
     change: typeof docTitle.change;
@@ -93,6 +94,7 @@ export function createPublicShim(): { core: Core; plugins: Plugins } {
         esDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/`,
         esPluginDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/plugins/${DOC_LINK_VERSION}/`,
         esStackOverviewDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/elastic-stack-overview/${DOC_LINK_VERSION}/`,
+        esMLDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/`,
       },
       docTitle: {
         change: docTitle.change,
diff --git a/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/__snapshots__/checkup_tab.test.tsx.snap b/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/__snapshots__/checkup_tab.test.tsx.snap
index 4c500b02a0936..eb76498b55f4c 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/__snapshots__/checkup_tab.test.tsx.snap
+++ b/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/__snapshots__/checkup_tab.test.tsx.snap
@@ -55,9 +55,7 @@ exports[`CheckupTab render with deprecations 1`] = `
     </p>
   </EuiCallOut>
   <EuiSpacer />
-  <EuiPageContent
-    panelPaddingSize="l"
-  >
+  <EuiPageContent>
     <EuiPageContentBody>
       <InjectIntl(CheckupControlsUI)
         allDeprecations={
@@ -339,9 +337,7 @@ exports[`CheckupTab render with error 1`] = `
     </p>
   </EuiCallOut>
   <EuiSpacer />
-  <EuiPageContent
-    panelPaddingSize="l"
-  >
+  <EuiPageContent>
     <EuiPageContentBody>
       <LoadingErrorBanner
         loadingError={[Error: something bad!]}
@@ -406,9 +402,7 @@ exports[`CheckupTab render without deprecations 1`] = `
     </p>
   </EuiCallOut>
   <EuiSpacer />
-  <EuiPageContent
-    panelPaddingSize="l"
-  >
+  <EuiPageContent>
     <EuiPageContentBody>
       <EuiEmptyPrompt
         body={
diff --git a/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/checkup_tab.tsx b/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/checkup_tab.tsx
index 9aa40663125ae..14f56157068e6 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/checkup_tab.tsx
+++ b/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/checkup_tab.tsx
@@ -8,8 +8,6 @@ import { find } from 'lodash';
 import React, { Fragment } from 'react';
 
 import {
-  // @ts-ignore
-  EuiAccordion,
   EuiCallOut,
   EuiEmptyPrompt,
   EuiLink,
diff --git a/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/deprecations/index_table.tsx b/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/deprecations/index_table.tsx
index eba906edc0509..835affce59070 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/deprecations/index_table.tsx
+++ b/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/checkup/deprecations/index_table.tsx
@@ -73,7 +73,9 @@ export class IndexDeprecationTableUI extends React.Component<
       columns.push(this.actionsColumn);
     }
 
-    const sorting = { sort: { field: sortField, direction: sortDirection } };
+    const sorting = {
+      sort: { field: sortField as keyof IndexDeprecationDetails, direction: sortDirection },
+    };
     const pagination = {
       pageIndex,
       pageSize,
diff --git a/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/overview/index.tsx b/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/overview/index.tsx
index 0a05743d1623d..284265bb31f14 100644
--- a/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/overview/index.tsx
+++ b/x-pack/legacy/plugins/upgrade_assistant/public/np_ready/application/components/tabs/overview/index.tsx
@@ -13,8 +13,6 @@ import {
   EuiPageContent,
   EuiPageContentBody,
   EuiSpacer,
-  // @ts-ignore
-  EuiStat,
   EuiText,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
diff --git a/x-pack/legacy/plugins/uptime/common/constants/capabilities.ts b/x-pack/legacy/plugins/uptime/common/constants/capabilities.ts
index 1c9ae58174958..68cc114182afc 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/capabilities.ts
+++ b/x-pack/legacy/plugins/uptime/common/constants/capabilities.ts
@@ -5,3 +5,6 @@
  */
 
 export const INTEGRATED_SOLUTIONS = ['apm', 'infrastructure', 'logs'];
+
+export const DEFAULT_TIMEPICKER_QUICK_RANGES = 'timepicker:quickRanges';
+export const DEFAULT_DARK_MODE = 'theme:darkMode';
diff --git a/x-pack/legacy/plugins/uptime/common/constants/index.ts b/x-pack/legacy/plugins/uptime/common/constants/index.ts
index 40ad1ff1d40b3..e3c4352f0a484 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/index.ts
+++ b/x-pack/legacy/plugins/uptime/common/constants/index.ts
@@ -8,6 +8,6 @@ export { CHART_FORMAT_LIMITS } from './chart_format_limits';
 export { CLIENT_DEFAULTS } from './client_defaults';
 export { CONTEXT_DEFAULTS } from './context_defaults';
 export { INDEX_NAMES } from './index_names';
-export { INTEGRATED_SOLUTIONS } from './capabilities';
+export * from './capabilities';
 export { PLUGIN } from './plugin';
 export { QUERY, STATES } from './query';
diff --git a/x-pack/legacy/plugins/uptime/index.ts b/x-pack/legacy/plugins/uptime/index.ts
index c8de623cb0a13..e090a2c85e136 100644
--- a/x-pack/legacy/plugins/uptime/index.ts
+++ b/x-pack/legacy/plugins/uptime/index.ts
@@ -36,7 +36,7 @@ export const uptime = (kibana: any) =>
     init(server: KibanaServer) {
       const initializerContext = {} as PluginInitializerContext;
       const { savedObjects } = server;
-      const { elasticsearch, xpack_main } = server.plugins;
+      const { xpack_main } = server.plugins;
       const { usageCollection } = server.newPlatform.setup.plugins;
 
       plugin(initializerContext).setup(
@@ -44,7 +44,6 @@ export const uptime = (kibana: any) =>
           route: server.newPlatform.setup.core.http.createRouter(),
         },
         {
-          elasticsearch,
           savedObjects,
           usageCollection,
           xpack: xpack_main,
diff --git a/x-pack/legacy/plugins/uptime/public/apps/plugin.ts b/x-pack/legacy/plugins/uptime/public/apps/plugin.ts
index bc4e30b79cb15..c09fdf116e790 100644
--- a/x-pack/legacy/plugins/uptime/public/apps/plugin.ts
+++ b/x-pack/legacy/plugins/uptime/public/apps/plugin.ts
@@ -30,14 +30,8 @@ export class Plugin {
   }
 
   public start(start: StartObject): void {
-    const {
-      core,
-      plugins: {
-        data: { autocomplete },
-      },
-    } = start;
     const libs: UMFrontendLibs = {
-      framework: getKibanaFrameworkAdapter(core, autocomplete),
+      framework: getKibanaFrameworkAdapter(start.core, start.plugins),
     };
     // @ts-ignore improper type description
     this.chrome.setRootTemplate(template);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_status.bar.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_status.bar.test.tsx.snap
index 4fda42e510bba..e53235b1ed6f7 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_status.bar.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/monitor_status.bar.test.tsx.snap
@@ -19,9 +19,11 @@ exports[`MonitorStatusBar component renders duration in ms, not us 1`] = `
           class="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <svg
+            aria-hidden="true"
             class="euiIcon euiIcon--medium euiIcon--success euiIcon-isLoading"
             focusable="false"
             height="16"
+            role="img"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
new file mode 100644
index 0000000000000..a38ca85a3e9e7
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
@@ -0,0 +1,295 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`UptimeDatePicker component renders properly with mock data 1`] = `
+<div
+  class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiSuperDatePicker__flexWrapper"
+>
+  <div
+    class="euiFlexItem"
+  >
+    <div
+      class="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+    >
+      <div
+        class="euiPopover euiPopover--anchorDownLeft"
+        id="QuickSelectPopover"
+      >
+        <div
+          class="euiPopover__anchor euiQuickSelectPopover__anchor"
+        >
+          <button
+            aria-label="Date quick select"
+            class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiFormControlLayout__prepend"
+            data-test-subj="superDatePickerToggleQuickMenuButton"
+            type="button"
+          >
+            <span
+              class="euiButtonEmpty__content"
+            >
+              <svg
+                aria-hidden="true"
+                class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
+                focusable="false"
+                height="16"
+                role="img"
+                viewBox="0 0 16 16"
+                width="16"
+                xmlns="http://www.w3.org/2000/svg"
+              />
+              <span
+                class="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="euiIcon euiIcon--medium euiIcon-isLoading"
+                  focusable="false"
+                  height="16"
+                  role="img"
+                  viewBox="0 0 16 16"
+                  width="16"
+                  xmlns="http://www.w3.org/2000/svg"
+                />
+              </span>
+            </span>
+          </button>
+        </div>
+      </div>
+      <div
+        class="euiFormControlLayout__childrenWrapper"
+      >
+        <div
+          class="euiDatePickerRange euiDatePickerRange--inGroup"
+        >
+          <button
+            class="euiSuperDatePicker__prettyFormat"
+            data-test-subj="superDatePickerShowDatesButton"
+          >
+            Last 15 minutes
+            <span
+              class="euiSuperDatePicker__prettyFormatLink"
+            >
+              Show dates
+            </span>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    class="euiFlexItem euiFlexItem--flexGrowZero"
+  >
+    <span
+      class="euiToolTipAnchor"
+    >
+      <button
+        class="euiButton euiButton--primary euiSuperUpdateButton euiButton--fill"
+        data-test-subj="superDatePickerApplyTimeButton"
+        type="button"
+      >
+        <span
+          class="euiButton__content"
+        >
+          <svg
+            aria-hidden="true"
+            class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
+            focusable="false"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
+            xmlns="http://www.w3.org/2000/svg"
+          />
+          <span
+            class="euiButton__text euiSuperUpdateButton__text"
+          >
+            Refresh
+          </span>
+        </span>
+      </button>
+    </span>
+  </div>
+</div>
+`;
+
+exports[`UptimeDatePicker component renders properly without commonlyUsedRanges prop 1`] = `
+<div
+  class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiSuperDatePicker__flexWrapper"
+>
+  <div
+    class="euiFlexItem"
+  >
+    <div
+      class="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+    >
+      <div
+        class="euiPopover euiPopover--anchorDownLeft"
+        id="QuickSelectPopover"
+      >
+        <div
+          class="euiPopover__anchor euiQuickSelectPopover__anchor"
+        >
+          <button
+            aria-label="Date quick select"
+            class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiFormControlLayout__prepend"
+            data-test-subj="superDatePickerToggleQuickMenuButton"
+            type="button"
+          >
+            <span
+              class="euiButtonEmpty__content"
+            >
+              <svg
+                aria-hidden="true"
+                class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
+                focusable="false"
+                height="16"
+                role="img"
+                viewBox="0 0 16 16"
+                width="16"
+                xmlns="http://www.w3.org/2000/svg"
+              />
+              <span
+                class="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="euiIcon euiIcon--medium euiIcon-isLoading"
+                  focusable="false"
+                  height="16"
+                  role="img"
+                  viewBox="0 0 16 16"
+                  width="16"
+                  xmlns="http://www.w3.org/2000/svg"
+                />
+              </span>
+            </span>
+          </button>
+        </div>
+      </div>
+      <div
+        class="euiFormControlLayout__childrenWrapper"
+      >
+        <div
+          class="euiDatePickerRange euiDatePickerRange--inGroup"
+        >
+          <button
+            class="euiSuperDatePicker__prettyFormat"
+            data-test-subj="superDatePickerShowDatesButton"
+          >
+            Last 15 minutes
+            <span
+              class="euiSuperDatePicker__prettyFormatLink"
+            >
+              Show dates
+            </span>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    class="euiFlexItem euiFlexItem--flexGrowZero"
+  >
+    <span
+      class="euiToolTipAnchor"
+    >
+      <button
+        class="euiButton euiButton--primary euiSuperUpdateButton euiButton--fill"
+        data-test-subj="superDatePickerApplyTimeButton"
+        type="button"
+      >
+        <span
+          class="euiButton__content"
+        >
+          <svg
+            aria-hidden="true"
+            class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
+            focusable="false"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
+            xmlns="http://www.w3.org/2000/svg"
+          />
+          <span
+            class="euiButton__text euiSuperUpdateButton__text"
+          >
+            Refresh
+          </span>
+        </span>
+      </button>
+    </span>
+  </div>
+</div>
+`;
+
+exports[`UptimeDatePicker component validates props with shallow render 1`] = `
+<EuiSuperDatePicker
+  commonlyUsedRanges={
+    Array [
+      Object {
+        "end": "now/d",
+        "label": "Today",
+        "start": "now/d",
+      },
+      Object {
+        "end": "now/w",
+        "label": "This week",
+        "start": "now/w",
+      },
+      Object {
+        "end": "now",
+        "label": "Last 15 minutes",
+        "start": "now-15m",
+      },
+      Object {
+        "end": "now",
+        "label": "Last 30 minutes",
+        "start": "now-30m",
+      },
+      Object {
+        "end": "now",
+        "label": "Last 1 hour",
+        "start": "now-1h",
+      },
+      Object {
+        "end": "now",
+        "label": "Last 24 hours",
+        "start": "now-24h",
+      },
+      Object {
+        "end": "now",
+        "label": "Last 7 days",
+        "start": "now-7d",
+      },
+      Object {
+        "end": "now",
+        "label": "Last 30 days",
+        "start": "now-30d",
+      },
+      Object {
+        "end": "now",
+        "label": "Last 90 days",
+        "start": "now-90d",
+      },
+      Object {
+        "end": "now",
+        "label": "Last 2 year",
+        "start": "now-1y",
+      },
+    ]
+  }
+  dateFormat="MMM D, YYYY @ HH:mm:ss.SSS"
+  end="now"
+  isAutoRefreshOnly={false}
+  isDisabled={false}
+  isPaused={false}
+  onRefresh={[MockFunction]}
+  onRefreshChange={[Function]}
+  onTimeChange={[Function]}
+  recentlyUsedRanges={Array []}
+  refreshInterval={60000}
+  showUpdateButton={true}
+  start="now-15m"
+  timeFormat="HH:mm"
+/>
+`;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/uptime_date_picker.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/uptime_date_picker.test.tsx
new file mode 100644
index 0000000000000..93fa0b505a891
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/uptime_date_picker.test.tsx
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { shallowWithIntl, renderWithIntl } from 'test_utils/enzyme_helpers';
+import React from 'react';
+import { UptimeDatePicker, CommonlyUsedRange } from '../uptime_date_picker';
+
+describe('UptimeDatePicker component', () => {
+  let commonlyUsedRange: CommonlyUsedRange[];
+
+  beforeEach(() => {
+    commonlyUsedRange = [
+      { from: 'now/d', to: 'now/d', display: 'Today' },
+      { from: 'now/w', to: 'now/w', display: 'This week' },
+      { from: 'now-15m', to: 'now', display: 'Last 15 minutes' },
+      { from: 'now-30m', to: 'now', display: 'Last 30 minutes' },
+      { from: 'now-1h', to: 'now', display: 'Last 1 hour' },
+      { from: 'now-24h', to: 'now', display: 'Last 24 hours' },
+      { from: 'now-7d', to: 'now', display: 'Last 7 days' },
+      { from: 'now-30d', to: 'now', display: 'Last 30 days' },
+      { from: 'now-90d', to: 'now', display: 'Last 90 days' },
+      { from: 'now-1y', to: 'now', display: 'Last 2 year' },
+    ];
+  });
+
+  it('validates props with shallow render', () => {
+    const component = shallowWithIntl(
+      <UptimeDatePicker commonlyUsedRanges={commonlyUsedRange} refreshApp={jest.fn()} />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  it('renders properly with mock data', () => {
+    const component = renderWithIntl(
+      <UptimeDatePicker commonlyUsedRanges={commonlyUsedRange} refreshApp={jest.fn()} />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  it('renders properly without commonlyUsedRanges prop', () => {
+    const component = renderWithIntl(<UptimeDatePicker refreshApp={jest.fn()} />);
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
index 0d1ced78f4a49..c8c4177a4907e 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
@@ -79,9 +79,11 @@ exports[`DonutChart component renders a donut chart 1`] = `
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <svg
+                  aria-hidden="true"
                   class="euiIcon euiIcon--medium euiIcon-isLoading"
                   focusable="false"
                   height="16"
+                  role="img"
                   style="fill:#bd271e"
                   viewBox="0 0 16 16"
                   width="16"
@@ -124,9 +126,11 @@ exports[`DonutChart component renders a donut chart 1`] = `
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <svg
+                  aria-hidden="true"
                   class="euiIcon euiIcon--medium euiIcon-isLoading"
                   focusable="false"
                   height="16"
+                  role="img"
                   style="fill:#d3dae6"
                   viewBox="0 0 16 16"
                   width="16"
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
index 376f20ffcf18a..78b2bfdecb87a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/__tests__/__snapshots__/monitor_bar_series.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`MonitorBarSeries component renders a series when there are down items 1
   style={
     Object {
       "height": 50,
+      "maxWidth": "1200px",
       "width": "100%",
     }
   }
@@ -12,7 +13,7 @@ exports[`MonitorBarSeries component renders a series when there are down items 1
   <Chart
     renderer="canvas"
   >
-    <inject-SettingsComponent-with-chartStore
+    <Connect(spec)
       xDomain={
         Object {
           "max": 1548700920000,
@@ -20,20 +21,17 @@ exports[`MonitorBarSeries component renders a series when there are down items 1
         }
       }
     />
-    <inject-AxisSpec-with-chartStore
+    <Connect(spec)
       hide={true}
       id="bottom"
       position="bottom"
       tickFormat={[Function]}
     />
-    <inject-BarSeriesSpecComponent-with-chartStore
+    <Connect(spec)
       customSeriesColors={
-        Map {
-          Object {
-            "colorValues": Array [],
-            "specId": "downSeries",
-          } => "A danger color",
-        }
+        Array [
+          "A danger color",
+        ]
       }
       data={
         Array [
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/checks_chart.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/checks_chart.tsx
index c7ac0a59e4434..a88a9668660f7 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/checks_chart.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/checks_chart.tsx
@@ -8,8 +8,6 @@ import {
   AreaSeries,
   Axis,
   Chart,
-  getAxisId,
-  getSpecId,
   Position,
   Settings,
   ScaleType,
@@ -21,7 +19,6 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { StatusData } from '../../../../common/graphql/types';
 import { getChartDateLabel } from '../../../lib/helper';
-import { getColorsMap } from './get_colors_map';
 import { useUrlParams } from '../../../hooks';
 
 interface ChecksChartProps {
@@ -45,8 +42,8 @@ interface ChecksChartProps {
  * @param props The props values required by this component.
  */
 export const ChecksChart = ({ dangerColor, status, successColor }: ChecksChartProps) => {
-  const upSeriesSpecId = getSpecId('Up');
-  const downSeriesSpecId = getSpecId('Down');
+  const upSeriesSpecId = 'Up';
+  const downSeriesSpecId = 'Down';
   const [getUrlParams] = useUrlParams();
   const { absoluteDateRangeStart: min, absoluteDateRangeEnd: max } = getUrlParams();
 
@@ -74,7 +71,7 @@ export const ChecksChart = ({ dangerColor, status, successColor }: ChecksChartPr
         <Chart>
           <Settings xDomain={{ min, max }} showLegend={false} />
           <Axis
-            id={getAxisId('checksBottom')}
+            id="checksBottom"
             position={Position.Bottom}
             showOverlappingTicks={true}
             tickFormat={timeFormatter(getChartDateLabel(min, max))}
@@ -84,7 +81,7 @@ export const ChecksChart = ({ dangerColor, status, successColor }: ChecksChartPr
             })}
           />
           <Axis
-            id={getAxisId('left')}
+            id="left"
             position={Position.Left}
             tickFormat={d => Number(d).toFixed(0)}
             title={i18n.translate('xpack.uptime.monitorChart.checksChart.leftAxis.title', {
@@ -93,7 +90,7 @@ export const ChecksChart = ({ dangerColor, status, successColor }: ChecksChartPr
             })}
           />
           <AreaSeries
-            customSeriesColors={getColorsMap(successColor, upSeriesSpecId)}
+            customSeriesColors={[successColor]}
             data={status.map(({ x, up }) => ({
               x,
               [upString]: up || 0,
@@ -107,7 +104,7 @@ export const ChecksChart = ({ dangerColor, status, successColor }: ChecksChartPr
             yScaleType={ScaleType.Linear}
           />
           <AreaSeries
-            customSeriesColors={getColorsMap(dangerColor, downSeriesSpecId)}
+            customSeriesColors={[downSeriesSpecId]}
             data={status.map(({ x, down }) => ({
               x,
               [downString]: down || 0,
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 76c3bd5d4c50d..e2705e7cbacb3 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
@@ -68,7 +68,7 @@ export const DonutChart = ({ height, down, up, width }: DonutChartProps) => {
         )
         .attr('fill', (d: any) => color(d.data.key));
     }
-  }, [chartElement.current, upCount, down]);
+  }, [danger, down, gray, height, upCount, width]);
   return (
     <EuiFlexGroup alignItems="center" responsive={false}>
       <EuiFlexItem grow={false}>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
index 012d848610940..b5dcfce032724 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Axis, Chart, getAxisId, Position, timeFormatter, Settings } from '@elastic/charts';
+import { Axis, Chart, Position, timeFormatter, Settings } from '@elastic/charts';
 import { EuiPanel, EuiTitle } from '@elastic/eui';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
@@ -69,7 +69,7 @@ export const DurationChart = ({
           <Chart>
             <Settings xDomain={{ min, max }} showLegend={true} legendPosition={Position.Bottom} />
             <Axis
-              id={getAxisId('bottom')}
+              id="bottom"
               position={Position.Bottom}
               showOverlappingTicks={true}
               tickFormat={timeFormatter(getChartDateLabel(min, max))}
@@ -79,7 +79,7 @@ export const DurationChart = ({
             />
             <Axis
               domain={{ min: 0 }}
-              id={getAxisId('left')}
+              id="left"
               position={Position.Left}
               tickFormat={d => getTickFormat(d)}
               title={i18n.translate('xpack.uptime.monitorCharts.durationChart.leftAxis.title', {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_line_series_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_line_series_list.tsx
index b6a65f193e913..872c79933d85a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_line_series_list.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_line_series_list.tsx
@@ -5,9 +5,8 @@
  */
 
 import React from 'react';
-import { LineSeries, CurveType, getSpecId } from '@elastic/charts';
+import { LineSeries, CurveType } from '@elastic/charts';
 import { LocationDurationLine } from '../../../../common/graphql/types';
-import { getColorsMap } from './get_colors_map';
 import { convertMicrosecondsToMilliseconds as microsToMillis } from '../../../lib/helper';
 
 interface Props {
@@ -21,9 +20,9 @@ export const DurationLineSeriesList = ({ lines, meanColor }: Props) => (
       <LineSeries
         curve={CurveType.CURVE_MONOTONE_X}
         // this id is used for the line chart representing the average duration length
-        customSeriesColors={getColorsMap(meanColor, getSpecId(`average-${name}`))}
+        customSeriesColors={[meanColor]}
         data={line.map(({ x, y }) => [x, microsToMillis(y || null)])}
-        id={getSpecId(`loc-avg-${name}`)}
+        id={`loc-avg-${name}`}
         key={`locline-${name}`}
         name={name}
         xAccessor={0}
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/get_colors_map.ts b/x-pack/legacy/plugins/uptime/public/components/functional/charts/get_colors_map.ts
deleted file mode 100644
index 83d181d91f8da..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/get_colors_map.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 { DataSeriesColorsValues, SpecId } from '@elastic/charts';
-
-/**
- * This is a helper function used to more easily define a basic map
- * for color values for use with elastic charts. Support for multiple
- * color values can be added in the future if needed.
- * @param color a string containing a valid color value
- * @param specId an ID generated by the elastic charts library
- */
-export const getColorsMap = (
-  color: string,
-  specId: SpecId
-): Map<DataSeriesColorsValues, string> => {
-  const map = new Map<DataSeriesColorsValues, string>();
-  map.set({ colorValues: [], specId }, color);
-  return map;
-};
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx
index 1011ddd8e4101..a0cbdc5922123 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/monitor_bar_series.tsx
@@ -8,17 +8,16 @@ import {
   Axis,
   BarSeries,
   Chart,
-  getSpecId,
   ScaleType,
   Settings,
-  getAxisId,
   Position,
   timeFormatter,
 } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiText, EuiToolTip } from '@elastic/eui';
 import { SummaryHistogramPoint } from '../../../../common/graphql/types';
-import { getColorsMap } from './get_colors_map';
 import { getChartDateLabel, seriesHasDownValues } from '../../../lib/helper';
 
 export interface MonitorBarSeriesProps {
@@ -51,22 +50,22 @@ export const MonitorBarSeries = ({
   dangerColor,
   histogramSeries,
 }: MonitorBarSeriesProps) => {
-  const id = getSpecId('downSeries');
+  const id = 'downSeries';
 
   return seriesHasDownValues(histogramSeries) ? (
-    <div style={{ height: 50, width: '100%' }}>
+    <div style={{ height: 50, width: '100%', maxWidth: '1200px' }}>
       <Chart>
         <Settings xDomain={{ min: absoluteStartDate, max: absoluteEndDate }} />
         <Axis
           hide
-          id={getAxisId('bottom')}
+          id="bottom"
           position={Position.Bottom}
           tickFormat={timeFormatter(getChartDateLabel(absoluteStartDate, absoluteEndDate))}
         />
         <BarSeries
-          customSeriesColors={getColorsMap(dangerColor, id)}
-          data={(histogramSeries || []).map(({ timestamp, down }) => [timestamp, down])}
           id={id}
+          customSeriesColors={[dangerColor]}
+          data={(histogramSeries || []).map(({ timestamp, down }) => [timestamp, down])}
           name={i18n.translate('xpack.uptime.monitorList.downLineSeries.downLabel', {
             defaultMessage: 'Down checks',
           })}
@@ -78,5 +77,18 @@ export const MonitorBarSeries = ({
         />
       </Chart>
     </div>
-  ) : null;
+  ) : (
+    <EuiToolTip
+      position="top"
+      content={
+        <FormattedMessage
+          id="xpack.uptime.monitorList.noDownHistory"
+          defaultMessage="This monitor has never been {emphasizedText} during the selected time range."
+          values={{ emphasizedText: <strong>down</strong> }}
+        />
+      }
+    >
+      <EuiText color="secondary">--</EuiText>
+    </EuiToolTip>
+  );
 };
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 37edd20871245..52ba482ce7fc1 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
@@ -4,22 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Axis,
-  BarSeries,
-  Chart,
-  getAxisId,
-  getSpecId,
-  Position,
-  timeFormatter,
-  Settings,
-} from '@elastic/charts';
+import { Axis, BarSeries, Chart, Position, timeFormatter, Settings } from '@elastic/charts';
 import { EuiEmptyPrompt, EuiTitle, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import moment from 'moment';
-import { getColorsMap } from './get_colors_map';
 import { getChartDateLabel } from '../../../lib/helper';
 import { withUptimeGraphQL, UptimeGraphQLQueryProps } from '../../higher_order';
 import { snapshotHistogramQuery } from '../../../queries/snapshot_histogram_query';
@@ -61,6 +51,9 @@ export const SnapshotHistogramComponent: React.FC<Props> = ({
   loading = false,
   height,
 }: Props) => {
+  const {
+    colors: { danger, gray },
+  } = useContext(UptimeSettingsContext);
   if (!data || !data.queryResult)
     /**
      * TODO: the Fragment, EuiTitle, and EuiPanel should be extracted to a dumb component
@@ -104,19 +97,15 @@ export const SnapshotHistogramComponent: React.FC<Props> = ({
     queryResult: { histogram, interval },
   } = data;
 
-  const {
-    colors: { danger, gray },
-  } = useContext(UptimeSettingsContext);
-
   const downMonitorsId = i18n.translate('xpack.uptime.snapshotHistogram.downMonitorsId', {
     defaultMessage: 'Down Monitors',
   });
-  const downSpecId = getSpecId(downMonitorsId);
+  const downSpecId = downMonitorsId;
 
   const upMonitorsId = i18n.translate('xpack.uptime.snapshotHistogram.series.upLabel', {
     defaultMessage: 'Up',
   });
-  const upSpecId = getSpecId(upMonitorsId);
+  const upSpecId = upMonitorsId;
   return (
     <>
       <EuiTitle size="xs">
@@ -149,21 +138,17 @@ export const SnapshotHistogramComponent: React.FC<Props> = ({
             showLegend={false}
           />
           <Axis
-            id={getAxisId(
-              i18n.translate('xpack.uptime.snapshotHistogram.xAxisId', {
-                defaultMessage: 'Snapshot X Axis',
-              })
-            )}
+            id={i18n.translate('xpack.uptime.snapshotHistogram.xAxisId', {
+              defaultMessage: 'Snapshot X Axis',
+            })}
             position={Position.Bottom}
             showOverlappingTicks={false}
             tickFormat={timeFormatter(getChartDateLabel(absoluteStartDate, absoluteEndDate))}
           />
           <Axis
-            id={getAxisId(
-              i18n.translate('xpack.uptime.snapshotHistogram.yAxisId', {
-                defaultMessage: 'Snapshot Y Axis',
-              })
-            )}
+            id={i18n.translate('xpack.uptime.snapshotHistogram.yAxisId', {
+              defaultMessage: 'Snapshot Y Axis',
+            })}
             position="left"
             title={i18n.translate('xpack.uptime.snapshotHistogram.yAxis.title', {
               defaultMessage: 'Pings',
@@ -172,7 +157,7 @@ export const SnapshotHistogramComponent: React.FC<Props> = ({
             })}
           />
           <BarSeries
-            customSeriesColors={getColorsMap(danger, downSpecId)}
+            customSeriesColors={[danger]}
             data={histogram.map(({ x, downCount }) => [x, downCount || 0])}
             id={downSpecId}
             name={i18n.translate('xpack.uptime.snapshotHistogram.series.downLabel', {
@@ -186,7 +171,7 @@ export const SnapshotHistogramComponent: React.FC<Props> = ({
             yScaleType="linear"
           />
           <BarSeries
-            customSeriesColors={getColorsMap(gray, upSpecId)}
+            customSeriesColors={[gray]}
             data={histogram.map(({ x, upCount }) => [x, upCount || 0])}
             id={upSpecId}
             name={upMonitorsId}
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
index 393ab7f1b45e2..ac966ddba9b15 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
@@ -187,14 +187,18 @@ exports[`EmptyState component does not render empty state with appropriate base
                       type="uptimeApp"
                     >
                       <EuiIconEmpty
+                        aria-hidden={true}
                         className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoading"
                         focusable="false"
+                        role="img"
                         style={null}
                       >
                         <svg
+                          aria-hidden={true}
                           className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoading"
                           focusable="false"
                           height={16}
+                          role="img"
                           style={null}
                           viewBox="0 0 16 16"
                           width={16}
@@ -651,14 +655,18 @@ exports[`EmptyState component notifies when index does not exist 1`] = `
                       type="uptimeApp"
                     >
                       <EuiIconEmpty
+                        aria-hidden={true}
                         className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoading"
                         focusable="false"
+                        role="img"
                         style={null}
                       >
                         <svg
+                          aria-hidden={true}
                           className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoading"
                           focusable="false"
                           height={16}
+                          role="img"
                           style={null}
                           viewBox="0 0 16 16"
                           width={16}
@@ -957,14 +965,18 @@ exports[`EmptyState component renders error message when an error occurs 1`] = `
                       type="securityApp"
                     >
                       <EuiIconEmpty
+                        aria-hidden={true}
                         className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoading"
                         focusable="false"
+                        role="img"
                         style={null}
                       >
                         <svg
+                          aria-hidden={true}
                           className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon--app euiIcon-isLoading"
                           focusable="false"
                           height={16}
+                          role="img"
                           style={null}
                           viewBox="0 0 16 16"
                           width={16}
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 6efce389b72f7..2022390d0e5d9 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
@@ -100,6 +100,7 @@ exports[`FilterPopover component returns selected items on popover close 1`] = `
             class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
             focusable="false"
             height="16"
+            role="img"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/index.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/index.tsx
index da392660eb70e..731f560d315d6 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/index.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/index.tsx
@@ -4,14 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useState, useEffect, useContext } from 'react';
+import React, { useState, useEffect } from 'react';
 import { uniqueId, startsWith } from 'lodash';
 import { EuiCallOut } from '@elastic/eui';
 import styled from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Typeahead } from './typeahead';
-import { getIndexPattern } from '../../../lib/adapters/index_pattern';
-import { UptimeSettingsContext } from '../../../contexts';
 import { useUrlParams } from '../../../hooks';
 import { toStaticIndexPattern } from '../../../lib/helper';
 import {
@@ -20,6 +18,7 @@ import {
   esKuery,
   IIndexPattern,
 } from '../../../../../../../../src/plugins/data/public';
+import { useIndexPattern } from '../../../hooks';
 
 const Container = styled.div`
   margin-bottom: 10px;
@@ -71,16 +70,18 @@ export function KueryBar({ autocomplete }: Props) {
     suggestions: [],
     isLoadingIndexPattern: true,
   });
-  const { basePath } = useContext(UptimeSettingsContext);
   const [indexPattern, setIndexPattern] = useState<any | undefined>(undefined);
   const [isLoadingIndexPattern, setIsLoadingIndexPattern] = useState<boolean>(true);
   const [isLoadingSuggestions, setIsLoadingSuggestions] = useState<boolean>(false);
   let currentRequestCheck: string;
 
+  useIndexPattern((result: any) => setIndexPattern(toStaticIndexPattern(result)));
+
   useEffect(() => {
-    getIndexPattern(basePath, (result: any) => setIndexPattern(toStaticIndexPattern(result)));
-    setIsLoadingIndexPattern(false);
-  }, []);
+    if (indexPattern !== undefined) {
+      setIsLoadingIndexPattern(false);
+    }
+  }, [indexPattern]);
   const [getUrlParams, updateUrlParams] = useUrlParams();
   const { search: kuery } = getUrlParams();
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__mocks__/mock.ts b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__mocks__/mock.ts
deleted file mode 100644
index 9b902651690bf..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__mocks__/mock.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 lowPolyLayerFeatures from '../low_poly_layer.json';
-
-export const mockDownPointsLayer = {
-  id: 'down_points',
-  label: 'Down Locations',
-  sourceDescriptor: {
-    type: 'GEOJSON_FILE',
-    __featureCollection: {
-      features: [
-        {
-          type: 'feature',
-          geometry: {
-            type: 'Point',
-            coordinates: [13.399262, 52.487239],
-          },
-        },
-        {
-          type: 'feature',
-          geometry: {
-            type: 'Point',
-            coordinates: [13.399262, 55.487239],
-          },
-        },
-        {
-          type: 'feature',
-          geometry: {
-            type: 'Point',
-            coordinates: [14.399262, 54.487239],
-          },
-        },
-      ],
-      type: 'FeatureCollection',
-    },
-  },
-  visible: true,
-  style: {
-    type: 'VECTOR',
-    properties: {
-      fillColor: {
-        type: 'STATIC',
-        options: {
-          color: '#BC261E',
-        },
-      },
-      lineColor: {
-        type: 'STATIC',
-        options: {
-          color: '#fff',
-        },
-      },
-      lineWidth: {
-        type: 'STATIC',
-        options: {
-          size: 2,
-        },
-      },
-      iconSize: {
-        type: 'STATIC',
-        options: {
-          size: 6,
-        },
-      },
-    },
-  },
-  type: 'VECTOR',
-};
-
-export const mockUpPointsLayer = {
-  id: 'up_points',
-  label: 'Up Locations',
-  sourceDescriptor: {
-    type: 'GEOJSON_FILE',
-    __featureCollection: {
-      features: [
-        {
-          type: 'feature',
-          geometry: {
-            type: 'Point',
-            coordinates: [13.399262, 52.487239],
-          },
-        },
-        {
-          type: 'feature',
-          geometry: {
-            type: 'Point',
-            coordinates: [13.399262, 55.487239],
-          },
-        },
-        {
-          type: 'feature',
-          geometry: {
-            type: 'Point',
-            coordinates: [14.399262, 54.487239],
-          },
-        },
-      ],
-      type: 'FeatureCollection',
-    },
-  },
-  visible: true,
-  style: {
-    type: 'VECTOR',
-    properties: {
-      fillColor: {
-        type: 'STATIC',
-        options: {
-          color: '#98A2B2',
-        },
-      },
-      lineColor: {
-        type: 'STATIC',
-        options: {
-          color: '#fff',
-        },
-      },
-      lineWidth: {
-        type: 'STATIC',
-        options: {
-          size: 2,
-        },
-      },
-      iconSize: {
-        type: 'STATIC',
-        options: {
-          size: 6,
-        },
-      },
-    },
-  },
-  type: 'VECTOR',
-};
-
-export const mockLayerList = [
-  {
-    id: 'low_poly_layer',
-    label: 'World countries',
-    minZoom: 0,
-    maxZoom: 24,
-    alpha: 1,
-    sourceDescriptor: {
-      id: 'b7486535-171b-4d3b-bb2e-33c1a0a2854c',
-      type: 'GEOJSON_FILE',
-      __featureCollection: lowPolyLayerFeatures,
-    },
-    visible: true,
-    style: {
-      type: 'VECTOR',
-      properties: {
-        fillColor: {
-          type: 'STATIC',
-          options: {
-            color: '#cad3e4',
-          },
-        },
-        lineColor: {
-          type: 'STATIC',
-          options: {
-            color: '#fff',
-          },
-        },
-        lineWidth: {
-          type: 'STATIC',
-          options: {
-            size: 0,
-          },
-        },
-        iconSize: {
-          type: 'STATIC',
-          options: {
-            size: 6,
-          },
-        },
-      },
-    },
-    type: 'VECTOR',
-  },
-  mockDownPointsLayer,
-  mockUpPointsLayer,
-];
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/__mocks__/mock.ts b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/__mocks__/mock.ts
new file mode 100644
index 0000000000000..291ab555fbdc6
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/__mocks__/mock.ts
@@ -0,0 +1,185 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import lowPolyLayerFeatures from '../../low_poly_layer.json';
+
+export const mockDownPointsLayer = {
+  id: 'down_points',
+  label: 'Down Locations',
+  sourceDescriptor: {
+    type: 'GEOJSON_FILE',
+    __featureCollection: {
+      features: [
+        {
+          type: 'feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [13.399262, 52.487239],
+          },
+        },
+        {
+          type: 'feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [13.399262, 55.487239],
+          },
+        },
+        {
+          type: 'feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [14.399262, 54.487239],
+          },
+        },
+      ],
+      type: 'FeatureCollection',
+    },
+  },
+  visible: true,
+  style: {
+    type: 'VECTOR',
+    properties: {
+      fillColor: {
+        type: 'STATIC',
+        options: {
+          color: '#BC261E',
+        },
+      },
+      lineColor: {
+        type: 'STATIC',
+        options: {
+          color: '#fff',
+        },
+      },
+      lineWidth: {
+        type: 'STATIC',
+        options: {
+          size: 2,
+        },
+      },
+      iconSize: {
+        type: 'STATIC',
+        options: {
+          size: 6,
+        },
+      },
+    },
+  },
+  type: 'VECTOR',
+};
+
+export const mockUpPointsLayer = {
+  id: 'up_points',
+  label: 'Up Locations',
+  sourceDescriptor: {
+    type: 'GEOJSON_FILE',
+    __featureCollection: {
+      features: [
+        {
+          type: 'feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [13.399262, 52.487239],
+          },
+        },
+        {
+          type: 'feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [13.399262, 55.487239],
+          },
+        },
+        {
+          type: 'feature',
+          geometry: {
+            type: 'Point',
+            coordinates: [14.399262, 54.487239],
+          },
+        },
+      ],
+      type: 'FeatureCollection',
+    },
+  },
+  visible: true,
+  style: {
+    type: 'VECTOR',
+    properties: {
+      fillColor: {
+        type: 'STATIC',
+        options: {
+          color: '#98A2B2',
+        },
+      },
+      lineColor: {
+        type: 'STATIC',
+        options: {
+          color: '#fff',
+        },
+      },
+      lineWidth: {
+        type: 'STATIC',
+        options: {
+          size: 2,
+        },
+      },
+      iconSize: {
+        type: 'STATIC',
+        options: {
+          size: 6,
+        },
+      },
+    },
+  },
+  type: 'VECTOR',
+};
+
+export const mockLayerList = [
+  {
+    id: 'low_poly_layer',
+    label: 'World countries',
+    minZoom: 0,
+    maxZoom: 24,
+    alpha: 1,
+    sourceDescriptor: {
+      id: 'b7486535-171b-4d3b-bb2e-33c1a0a2854c',
+      type: 'GEOJSON_FILE',
+      __featureCollection: lowPolyLayerFeatures,
+    },
+    visible: true,
+    style: {
+      type: 'VECTOR',
+      properties: {
+        fillColor: {
+          type: 'STATIC',
+          options: {
+            color: '#cad3e4',
+          },
+        },
+        lineColor: {
+          type: 'STATIC',
+          options: {
+            color: '#fff',
+          },
+        },
+        lineWidth: {
+          type: 'STATIC',
+          options: {
+            size: 0,
+          },
+        },
+        iconSize: {
+          type: 'STATIC',
+          options: {
+            size: 6,
+          },
+        },
+      },
+    },
+    type: 'VECTOR',
+  },
+  mockDownPointsLayer,
+  mockUpPointsLayer,
+];
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.test.ts b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/map_config.test.ts
similarity index 83%
rename from x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.test.ts
rename to x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/map_config.test.ts
index 1e8e5b6012a79..263c3fc787da9 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/__tests__/map_config.test.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getLayerList } from './map_config';
+import { getLayerList } from '../map_config';
 import { mockLayerList } from './__mocks__/mock';
-import { LocationPoint } from './embedded_map';
+import { LocationPoint } from '../embedded_map';
 
 jest.mock('uuid', () => {
   return {
@@ -33,7 +33,7 @@ describe('map_config', () => {
 
   describe('#getLayerList', () => {
     test('it returns the low poly layer', () => {
-      const layerList = getLayerList(upPoints, downPoints);
+      const layerList = getLayerList(upPoints, downPoints, { danger: '#BC261E', gray: '#000' });
       expect(layerList).toStrictEqual(mockLayerList);
     });
   });
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/embedded_map.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/embedded_map.tsx
index a5578d9e05667..fe8a1a0bad7ec 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/embedded_map.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/embedded_map.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useContext } from 'react';
 import uuid from 'uuid';
 import styled from 'styled-components';
 
@@ -15,6 +15,7 @@ import { MAP_SAVED_OBJECT_TYPE } from '../../../../../../maps/common/constants';
 
 import { MapEmbeddable } from './types';
 import { getLayerList } from './map_config';
+import { UptimeSettingsContext } from '../../../../contexts';
 
 export interface EmbeddedMapProps {
   upPoints: LocationPoint[];
@@ -45,12 +46,32 @@ const EmbeddedPanel = styled.div`
 `;
 
 export const EmbeddedMap = ({ upPoints, downPoints }: EmbeddedMapProps) => {
+  const { colors } = useContext(UptimeSettingsContext);
   const [embeddable, setEmbeddable] = useState<MapEmbeddable>();
+  const embeddableRoot: React.RefObject<HTMLDivElement> = React.createRef();
+  const factory = start.getEmbeddableFactory(MAP_SAVED_OBJECT_TYPE);
+
+  const input = {
+    id: uuid.v4(),
+    filters: [],
+    hidePanelTitles: true,
+    query: { query: '', language: 'kuery' },
+    refreshConfig: { value: 0, pause: false },
+    viewMode: 'view',
+    isLayerTOCOpen: false,
+    hideFilterActions: true,
+    mapCenter: { lon: 11, lat: 20, zoom: 0 },
+    disableInteractive: true,
+    disableTooltipControl: true,
+    hideToolbarOverlay: true,
+    hideLayerControl: true,
+    hideViewControl: true,
+  };
 
   useEffect(() => {
     async function setupEmbeddable() {
       const mapState = {
-        layerList: getLayerList(upPoints, downPoints),
+        layerList: getLayerList(upPoints, downPoints, colors),
         title: i18n.MAP_TITLE,
       };
       // @ts-ignore
@@ -59,38 +80,21 @@ export const EmbeddedMap = ({ upPoints, downPoints }: EmbeddedMapProps) => {
       setEmbeddable(embeddableObject);
     }
     setupEmbeddable();
+    // we want this effect to execute exactly once after the component mounts
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   useEffect(() => {
     if (embeddable) {
-      embeddable.setLayerList(getLayerList(upPoints, downPoints));
+      embeddable.setLayerList(getLayerList(upPoints, downPoints, colors));
     }
-  }, [upPoints, downPoints]);
+  }, [upPoints, downPoints, embeddable, colors]);
 
   useEffect(() => {
     if (embeddableRoot.current && embeddable) {
       embeddable.render(embeddableRoot.current);
     }
-  }, [embeddable]);
-
-  const factory = start.getEmbeddableFactory(MAP_SAVED_OBJECT_TYPE);
-
-  const input = {
-    id: uuid.v4(),
-    filters: [],
-    hidePanelTitles: true,
-    query: { query: '', language: 'kuery' },
-    refreshConfig: { value: 0, pause: false },
-    viewMode: 'view',
-    isLayerTOCOpen: false,
-    hideFilterActions: true,
-    mapCenter: { lon: 11, lat: 47, zoom: 0 },
-    disableInteractive: true,
-    disableTooltipControl: true,
-    hideToolbarOverlay: true,
-  };
-
-  const embeddableRoot: React.RefObject<HTMLDivElement> = React.createRef();
+  }, [embeddable, embeddableRoot]);
 
   return (
     <EmbeddedPanel>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.ts b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.ts
index 608df8b235f00..b423b8baf41bf 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/embeddables/map_config.ts
@@ -12,8 +12,12 @@ import { LocationPoint } from './embedded_map';
  * destination, and line layer for each of the provided indexPatterns
  *
  */
-export const getLayerList = (upPoints: LocationPoint[], downPoints: LocationPoint[]) => {
-  return [getLowPolyLayer(), getDownPointsLayer(downPoints), getUpPointsLayer(upPoints)];
+export const getLayerList = (
+  upPoints: LocationPoint[],
+  downPoints: LocationPoint[],
+  { gray, danger }: { gray: string; danger: string }
+) => {
+  return [getLowPolyLayer(), getDownPointsLayer(downPoints, danger), getUpPointsLayer(upPoints)];
 };
 
 export const getLowPolyLayer = () => {
@@ -62,7 +66,7 @@ export const getLowPolyLayer = () => {
   };
 };
 
-export const getDownPointsLayer = (downPoints: LocationPoint[]) => {
+export const getDownPointsLayer = (downPoints: LocationPoint[], dangerColor: string) => {
   const features = downPoints?.map(point => ({
     type: 'feature',
     geometry: {
@@ -87,7 +91,7 @@ export const getDownPointsLayer = (downPoints: LocationPoint[]) => {
         fillColor: {
           type: 'STATIC',
           options: {
-            color: '#BC261E',
+            color: dangerColor,
           },
         },
         lineColor: {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx
index b271632cb631f..f70d145ec05c3 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_map.tsx
@@ -6,15 +6,19 @@
 
 import React from 'react';
 import styled from 'styled-components';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { LocationStatusTags } from './location_status_tags';
 import { EmbeddedMap, LocationPoint } from './embeddables/embedded_map';
+import { MonitorLocations } from '../../../../common/runtime_types';
 
 const MapPanel = styled.div`
-  height: 400px;
+  height: 240px;
   width: 520px;
+  margin-right: 10px;
 `;
 
 interface LocationMapProps {
-  monitorLocations: any;
+  monitorLocations: MonitorLocations;
 }
 
 export const LocationMap = ({ monitorLocations }: LocationMapProps) => {
@@ -31,8 +35,15 @@ export const LocationMap = ({ monitorLocations }: LocationMapProps) => {
     });
   }
   return (
-    <MapPanel>
-      <EmbeddedMap upPoints={upPoints} downPoints={downPoints} />
-    </MapPanel>
+    <EuiFlexGroup>
+      <EuiFlexItem grow={false}>
+        <LocationStatusTags locations={monitorLocations?.locations || []} />
+      </EuiFlexItem>
+      <EuiFlexItem grow={true}>
+        <MapPanel>
+          <EmbeddedMap upPoints={upPoints} downPoints={downPoints} />
+        </MapPanel>
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 };
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx
new file mode 100644
index 0000000000000..a10d8e02e6863
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext } from 'react';
+import styled from 'styled-components';
+import { EuiBadge, EuiText } from '@elastic/eui';
+import { UptimeSettingsContext } from '../../../contexts';
+import { MonitorLocation } from '../../../../common/runtime_types';
+
+const TextStyle = styled.div`
+  font-weight: 600;
+`;
+
+const BadgeItem = styled.div`
+  margin-bottom: 5px;
+`;
+
+const TagContainer = styled.div`
+  padding: 10px;
+  max-height: 200px;
+  overflow: hidden;
+`;
+
+interface Props {
+  locations: MonitorLocation[];
+}
+
+export const LocationStatusTags = ({ locations }: Props) => {
+  const {
+    colors: { gray, danger },
+  } = useContext(UptimeSettingsContext);
+
+  const upLocs: string[] = [];
+  const downLocs: string[] = [];
+
+  locations.forEach((item: any) => {
+    if (item.summary.down === 0) {
+      upLocs.push(item.geo.name);
+    } else {
+      downLocs.push(item.geo.name);
+    }
+  });
+
+  return (
+    <TagContainer>
+      <span>
+        {downLocs.map((item, ind) => (
+          <BadgeItem key={ind}>
+            <EuiBadge color={danger}>
+              <EuiText size="m">
+                <TextStyle>{item}</TextStyle>
+              </EuiText>
+            </EuiBadge>
+          </BadgeItem>
+        ))}
+      </span>
+      <span>
+        {upLocs.map((item, ind) => (
+          <BadgeItem key={ind}>
+            <EuiBadge color={gray}>
+              <EuiText size="m">
+                <TextStyle>{item}</TextStyle>
+              </EuiText>
+            </EuiBadge>
+          </BadgeItem>
+        ))}
+      </span>
+    </TagContainer>
+  );
+};
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 7d8e788f49ea0..809618f07a6c1 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
@@ -39,12 +39,12 @@ export const MonitorChartsComponent = ({
   dateRangeEnd,
   loading,
 }: Props) => {
+  const [getUrlParams] = useUrlParams();
   if (data && data.monitorChartsData) {
     const {
       monitorChartsData: { locationDurationLines },
     } = data;
 
-    const [getUrlParams] = useUrlParams();
     const { absoluteDateRangeStart, absoluteDateRangeEnd } = getUrlParams();
 
     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 0c6acb8d9f46e..dc98878f6fe08 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
@@ -26,6 +26,7 @@ exports[`MonitorList component renders a no items message when no data is provid
             "field": "state.monitor.status",
             "name": "Status",
             "render": [Function],
+            "width": "20%",
           },
           Object {
             "align": "left",
@@ -33,15 +34,10 @@ exports[`MonitorList component renders a no items message when no data is provid
             "name": "Name",
             "render": [Function],
             "sortable": true,
+            "width": "30%",
           },
           Object {
-            "align": "left",
-            "field": "state.url.full",
-            "name": "URL",
-            "render": [Function],
-            "sortable": true,
-          },
-          Object {
+            "align": "center",
             "field": "histogram.points",
             "mobileOptions": Object {
               "show": false,
@@ -51,23 +47,11 @@ exports[`MonitorList component renders a no items message when no data is provid
           },
           Object {
             "align": "right",
-            "field": "state",
-            "hasActions": true,
-            "id": "actions",
-            "mobileOptions": Object {
-              "header": false,
-            },
-            "name": "Integrations",
-            "render": [Function],
-          },
-          Object {
-            "align": "left",
             "field": "monitor_id",
             "isExpander": true,
             "name": "",
             "render": [Function],
             "sortable": true,
-            "width": "24px",
           },
         ]
       }
@@ -133,6 +117,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
             "field": "state.monitor.status",
             "name": "Status",
             "render": [Function],
+            "width": "20%",
           },
           Object {
             "align": "left",
@@ -140,15 +125,10 @@ exports[`MonitorList component renders the monitor list 1`] = `
             "name": "Name",
             "render": [Function],
             "sortable": true,
+            "width": "30%",
           },
           Object {
-            "align": "left",
-            "field": "state.url.full",
-            "name": "URL",
-            "render": [Function],
-            "sortable": true,
-          },
-          Object {
+            "align": "center",
             "field": "histogram.points",
             "mobileOptions": Object {
               "show": false,
@@ -158,23 +138,11 @@ exports[`MonitorList component renders the monitor list 1`] = `
           },
           Object {
             "align": "right",
-            "field": "state",
-            "hasActions": true,
-            "id": "actions",
-            "mobileOptions": Object {
-              "header": false,
-            },
-            "name": "Integrations",
-            "render": [Function],
-          },
-          Object {
-            "align": "left",
             "field": "monitor_id",
             "isExpander": true,
             "name": "",
             "render": [Function],
             "sortable": true,
-            "width": "24px",
           },
         ]
       }
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 b7c8ddbc51b27..c251e3d8de0ea 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
@@ -26,6 +26,7 @@ exports[`MonitorList component renders a no items message when no data is provid
             "field": "state.monitor.status",
             "name": "Status",
             "render": [Function],
+            "width": "20%",
           },
           Object {
             "align": "left",
@@ -33,15 +34,10 @@ exports[`MonitorList component renders a no items message when no data is provid
             "name": "Name",
             "render": [Function],
             "sortable": true,
+            "width": "30%",
           },
           Object {
-            "align": "left",
-            "field": "state.url.full",
-            "name": "URL",
-            "render": [Function],
-            "sortable": true,
-          },
-          Object {
+            "align": "center",
             "field": "histogram.points",
             "mobileOptions": Object {
               "show": false,
@@ -51,23 +47,11 @@ exports[`MonitorList component renders a no items message when no data is provid
           },
           Object {
             "align": "right",
-            "field": "state",
-            "hasActions": true,
-            "id": "actions",
-            "mobileOptions": Object {
-              "header": false,
-            },
-            "name": "Integrations",
-            "render": [Function],
-          },
-          Object {
-            "align": "left",
             "field": "monitor_id",
             "isExpander": true,
             "name": "",
             "render": [Function],
             "sortable": true,
-            "width": "24px",
           },
         ]
       }
@@ -133,6 +117,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
             "field": "state.monitor.status",
             "name": "Status",
             "render": [Function],
+            "width": "20%",
           },
           Object {
             "align": "left",
@@ -140,15 +125,10 @@ exports[`MonitorList component renders the monitor list 1`] = `
             "name": "Name",
             "render": [Function],
             "sortable": true,
+            "width": "30%",
           },
           Object {
-            "align": "left",
-            "field": "state.url.full",
-            "name": "URL",
-            "render": [Function],
-            "sortable": true,
-          },
-          Object {
+            "align": "center",
             "field": "histogram.points",
             "mobileOptions": Object {
               "show": false,
@@ -158,23 +138,11 @@ exports[`MonitorList component renders the monitor list 1`] = `
           },
           Object {
             "align": "right",
-            "field": "state",
-            "hasActions": true,
-            "id": "actions",
-            "mobileOptions": Object {
-              "header": false,
-            },
-            "name": "Integrations",
-            "render": [Function],
-          },
-          Object {
-            "align": "left",
             "field": "monitor_id",
             "isExpander": true,
             "name": "",
             "render": [Function],
             "sortable": true,
-            "width": "24px",
           },
         ]
       }
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 40a51f7c978e6..b1b25baf7d873 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
@@ -10,13 +10,10 @@ import {
   EuiPanel,
   EuiTitle,
   EuiButtonIcon,
-  EuiIcon,
-  EuiLink,
   EuiFlexItem,
   EuiSpacer,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import React, { useState, Fragment } from 'react';
 import { withUptimeGraphQL, UptimeGraphQLQueryProps } from '../../higher_order';
@@ -32,8 +29,8 @@ import { ExpandedRowMap } from './types';
 import { MonitorListDrawer } from './monitor_list_drawer';
 import { MonitorBarSeries } from '../charts';
 import { MonitorPageLink } from './monitor_page_link';
-import { MonitorListActionsPopover } from './monitor_list_actions_popover';
 import { OverviewPageLink } from './overview_page_link';
+import * as labels from './translations';
 
 interface MonitorListQueryResult {
   monitorStates?: MonitorSummaryResult;
@@ -80,6 +77,68 @@ export const MonitorListComponent = (props: Props) => {
     }, {});
   };
 
+  const columns = [
+    {
+      align: 'left' as const,
+      width: '20%',
+      field: 'state.monitor.status',
+      name: labels.STATUS_COLUMN_LABEL,
+      render: (status: string, { state: { timestamp } }: MonitorSummary) => {
+        return <MonitorListStatusColumn status={status} timestamp={timestamp} />;
+      },
+    },
+    {
+      align: 'left' as const,
+      width: '30%',
+      field: 'state.monitor.name',
+      name: labels.NAME_COLUMN_LABEL,
+      render: (name: string, summary: MonitorSummary) => (
+        <MonitorPageLink monitorId={summary.monitor_id} linkParameters={linkParameters}>
+          {name ? name : `Unnamed - ${summary.monitor_id}`}
+        </MonitorPageLink>
+      ),
+      sortable: true,
+    },
+    {
+      align: 'center' as const,
+      field: 'histogram.points',
+      name: labels.HISTORY_COLUMN_LABEL,
+      mobileOptions: {
+        show: false,
+      },
+      render: (histogramSeries: SummaryHistogramPoint[] | null) => (
+        <MonitorBarSeries
+          absoluteStartDate={absoluteStartDate}
+          absoluteEndDate={absoluteEndDate}
+          dangerColor={dangerColor}
+          histogramSeries={histogramSeries}
+        />
+      ),
+    },
+    {
+      align: 'right' as const,
+      field: 'monitor_id',
+      name: '',
+      sortable: true,
+      isExpander: true,
+      render: (id: string) => {
+        return (
+          <EuiButtonIcon
+            aria-label={labels.getExpandDrawerLabel(id)}
+            iconType={drawerIds.includes(id) ? 'arrowUp' : 'arrowDown'}
+            onClick={() => {
+              if (drawerIds.includes(id)) {
+                updateDrawerIds(drawerIds.filter(p => p !== id));
+              } else {
+                updateDrawerIds([...drawerIds, id]);
+              }
+            }}
+          />
+        );
+      },
+    },
+  ];
+
   return (
     <Fragment>
       <EuiPanel>
@@ -93,11 +152,7 @@ export const MonitorListComponent = (props: Props) => {
         </EuiTitle>
         <EuiSpacer size="s" />
         <EuiBasicTable
-          aria-label={i18n.translate('xpack.uptime.monitorList.table.description', {
-            defaultMessage:
-              'Monitor Status table with columns for Status, Name, URL, IP, Downtime History and Integrations. The table is currently displaying {length} items.',
-            values: { length: items.length },
-          })}
+          aria-label={labels.getDescriptionLabel(items.length)}
           error={errors ? formatUptimeGraphQLErrorList(errors) : errors}
           // Only set loading to true when there are no items present to prevent the bug outlined in
           // in https://github.com/elastic/eui/issues/2393 . Once that is fixed we can simply set the value here to
@@ -111,132 +166,13 @@ export const MonitorListComponent = (props: Props) => {
           // TODO: not needed without sorting and pagination
           // onChange={onChange}
           noItemsMessage={
-            hasActiveFilters
-              ? i18n.translate('xpack.uptime.monitorList.noItemForSelectedFiltersMessage', {
-                  defaultMessage: 'No monitors found for selected filter criteria',
-                  description:
-                    'This message is show if there are no monitors in the table and some filter or search criteria exists',
-                })
-              : i18n.translate('xpack.uptime.monitorList.noItemMessage', {
-                  defaultMessage: 'No uptime monitors found',
-                  description:
-                    'This message is shown if the monitors table is rendered but has no items.',
-                })
+            hasActiveFilters ? labels.NO_MONITOR_ITEM_SELECTED : labels.NO_DATA_MESSAGE
           }
           // TODO: reintegrate pagination in future release
           // pagination={pagination}
           // TODO: reintegrate sorting in future release
           // sorting={sorting}
-          columns={[
-            {
-              align: 'left',
-              field: 'state.monitor.status',
-              name: i18n.translate('xpack.uptime.monitorList.statusColumnLabel', {
-                defaultMessage: 'Status',
-              }),
-              render: (status: string, { state: { timestamp } }: MonitorSummary) => {
-                return <MonitorListStatusColumn status={status} timestamp={timestamp} />;
-              },
-            },
-            {
-              align: 'left',
-              field: 'state.monitor.name',
-              name: i18n.translate('xpack.uptime.monitorList.nameColumnLabel', {
-                defaultMessage: 'Name',
-              }),
-              render: (name: string, summary: MonitorSummary) => (
-                <MonitorPageLink monitorId={summary.monitor_id} linkParameters={linkParameters}>
-                  {name ? name : `Unnamed - ${summary.monitor_id}`}
-                </MonitorPageLink>
-              ),
-              sortable: true,
-            },
-            {
-              align: 'left',
-              field: 'state.url.full',
-              name: i18n.translate('xpack.uptime.monitorList.urlColumnLabel', {
-                defaultMessage: 'URL',
-              }),
-              render: (url: string, summary: MonitorSummary) => (
-                <Fragment>
-                  <EuiLink href={url} target="_blank" color="text">
-                    {url} <EuiIcon size="s" type="popout" color="subbdued" />
-                  </EuiLink>
-                </Fragment>
-              ),
-              sortable: true,
-            },
-            {
-              field: 'histogram.points',
-              name: i18n.translate('xpack.uptime.monitorList.monitorHistoryColumnLabel', {
-                defaultMessage: 'Downtime history',
-              }),
-              mobileOptions: {
-                show: false,
-              },
-              render: (histogramSeries: SummaryHistogramPoint[] | null) => (
-                <MonitorBarSeries
-                  absoluteStartDate={absoluteStartDate}
-                  absoluteEndDate={absoluteEndDate}
-                  dangerColor={dangerColor}
-                  histogramSeries={histogramSeries}
-                />
-              ),
-            },
-            {
-              id: 'actions',
-              align: 'right',
-              field: 'state',
-              hasActions: true,
-              mobileOptions: {
-                header: false,
-              },
-              name: i18n.translate(
-                'xpack.uptime.monitorList.observabilityIntegrationsColumnLabel',
-                {
-                  defaultMessage: 'Integrations',
-                  description:
-                    'The heading column of some action buttons that will take users to other Observability apps',
-                }
-              ),
-              render: (state: any, summary: MonitorSummary) => (
-                <MonitorListActionsPopover summary={summary} />
-              ),
-            },
-            {
-              align: 'left',
-              field: 'monitor_id',
-              name: '',
-              sortable: true,
-              width: '24px',
-              isExpander: true,
-              render: (id: string) => {
-                return (
-                  <EuiButtonIcon
-                    aria-label={i18n.translate(
-                      'xpack.uptime.monitorList.expandDrawerButton.ariaLabel',
-                      {
-                        defaultMessage: 'Expand row for monitor with ID {id}',
-                        description:
-                          'The user can click a button on this table and expand further details.',
-                        values: {
-                          id,
-                        },
-                      }
-                    )}
-                    iconType={drawerIds.includes(id) ? 'arrowUp' : 'arrowDown'}
-                    onClick={() => {
-                      if (drawerIds.includes(id)) {
-                        updateDrawerIds(drawerIds.filter(p => p !== id));
-                      } else {
-                        updateDrawerIds([...drawerIds, id]);
-                      }
-                    }}
-                  />
-                );
-              },
-            },
-          ]}
+          columns={columns}
         />
         <EuiSpacer size="m" />
         <EuiFlexGroup responsive={false}>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_actions_popover.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_actions_popover.tsx
index 04f195d42531b..af06761f50c83 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_actions_popover.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_actions_popover.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiButtonIcon, EuiPopover } from '@elastic/eui';
+import { EuiPopover, EuiButton } from '@elastic/eui';
 import React, { useContext } from 'react';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
@@ -43,7 +43,7 @@ const MonitorListActionsPopoverComponent = ({
   return (
     <EuiPopover
       button={
-        <EuiButtonIcon
+        <EuiButton
           aria-label={i18n.translate(
             'xpack.uptime.monitorList.observabilityIntegrationsColumn.popoverIconButton.ariaLabel',
             {
@@ -53,10 +53,12 @@ const MonitorListActionsPopoverComponent = ({
               values: { monitorUrl },
             }
           )}
-          color="subdued"
-          iconType="boxesHorizontal"
           onClick={() => togglePopoverIsVisible({ id: popoverId, open: true })}
-        />
+          iconType="arrowDown"
+          iconSide="right"
+        >
+          Integrations
+        </EuiButton>
       }
       closePopover={() => togglePopoverIsVisible({ id: popoverId, open: false })}
       id={popoverId}
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
index 80e064e25e1a5..b6402ae852215 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
@@ -6,21 +6,68 @@ exports[`MonitorListDrawer component renders a MonitorListDrawer when there are
     <EuiFlexItem
       grow={true}
     >
-      <EuiLink
-        href="https://expired.badssl.com"
-        target="_blank"
-      >
-        https://expired.badssl.com
-        <EuiIcon
-          color="subbdued"
-          size="s"
-          type="popout"
-        />
-      </EuiLink>
+      <EuiText>
+        <EuiLink
+          href="https://expired.badssl.com"
+          target="_blank"
+        >
+          https://expired.badssl.com
+          <EuiIcon
+            color="subbdued"
+            size="s"
+            type="popout"
+          />
+        </EuiLink>
+      </EuiText>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <Connect(MonitorListActionsPopoverComponent)
+        summary={
+          Object {
+            "monitor_id": "foo",
+            "state": Object {
+              "checks": Array [
+                Object {
+                  "monitor": Object {
+                    "ip": "127.0.0.1",
+                    "status": "up",
+                  },
+                  "timestamp": "121",
+                },
+                Object {
+                  "monitor": Object {
+                    "ip": "127.0.0.2",
+                    "status": "down",
+                  },
+                  "timestamp": "123",
+                },
+                Object {
+                  "monitor": Object {
+                    "ip": "127.0.0.3",
+                    "status": "up",
+                  },
+                  "timestamp": "125",
+                },
+              ],
+              "summary": Object {
+                "down": 0,
+                "up": 1,
+              },
+              "timestamp": "123",
+              "url": Object {
+                "domain": "expired.badssl.com",
+                "full": "https://expired.badssl.com",
+              },
+            },
+          }
+        }
+      />
     </EuiFlexItem>
   </EuiFlexGroup>
   <EuiSpacer
-    size="s"
+    size="m"
   />
   <MonitorStatusList
     checks={
@@ -67,21 +114,54 @@ exports[`MonitorListDrawer component renders a MonitorListDrawer when there is o
     <EuiFlexItem
       grow={true}
     >
-      <EuiLink
-        href="https://expired.badssl.com"
-        target="_blank"
-      >
-        https://expired.badssl.com
-        <EuiIcon
-          color="subbdued"
-          size="s"
-          type="popout"
-        />
-      </EuiLink>
+      <EuiText>
+        <EuiLink
+          href="https://expired.badssl.com"
+          target="_blank"
+        >
+          https://expired.badssl.com
+          <EuiIcon
+            color="subbdued"
+            size="s"
+            type="popout"
+          />
+        </EuiLink>
+      </EuiText>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <Connect(MonitorListActionsPopoverComponent)
+        summary={
+          Object {
+            "monitor_id": "foo",
+            "state": Object {
+              "checks": Array [
+                Object {
+                  "monitor": Object {
+                    "ip": "127.0.0.1",
+                    "status": "up",
+                  },
+                  "timestamp": "121",
+                },
+              ],
+              "summary": Object {
+                "down": 0,
+                "up": 1,
+              },
+              "timestamp": "123",
+              "url": Object {
+                "domain": "expired.badssl.com",
+                "full": "https://expired.badssl.com",
+              },
+            },
+          }
+        }
+      />
     </EuiFlexItem>
   </EuiFlexGroup>
   <EuiSpacer
-    size="s"
+    size="m"
   />
   <MonitorStatusList
     checks={
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_list.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_list.test.tsx.snap
index 5e428f09d6bb5..6934ecdcf639a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_list.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_list.test.tsx.snap
@@ -5,7 +5,7 @@ exports[`MonitorStatusList component renders checks 1`] = `
   <MonitorStatusRow
     locationNames={
       Set {
-        "unnamed-location",
+        "Unnamed-location",
       }
     }
     status="down"
@@ -14,23 +14,6 @@ exports[`MonitorStatusList component renders checks 1`] = `
     locationNames={Set {}}
     status="up"
   />
-  <EuiSpacer
-    size="s"
-  />
-  <EuiCallOut
-    color="warning"
-  >
-    <FormattedMessage
-      defaultMessage="Some heartbeat instances do not have a location defined. {link} to your heartbeat configuration."
-      id="xpack.uptime.monitorList.drawer.missingLocation"
-      values={
-        Object {
-          "link": <LocationLink />,
-        }
-      }
-    />
-  </EuiCallOut>
-  <EuiSpacer />
 </Fragment>
 `;
 
@@ -39,7 +22,7 @@ exports[`MonitorStatusList component renders null in place of child status with
   <MonitorStatusRow
     locationNames={
       Set {
-        "unnamed-location",
+        "Unnamed-location",
       }
     }
     status="down"
@@ -48,22 +31,5 @@ exports[`MonitorStatusList component renders null in place of child status with
     locationNames={Set {}}
     status="up"
   />
-  <EuiSpacer
-    size="s"
-  />
-  <EuiCallOut
-    color="warning"
-  >
-    <FormattedMessage
-      defaultMessage="Some heartbeat instances do not have a location defined. {link} to your heartbeat configuration."
-      id="xpack.uptime.monitorList.drawer.missingLocation"
-      values={
-        Object {
-          "link": <LocationLink />,
-        }
-      }
-    />
-  </EuiCallOut>
-  <EuiSpacer />
 </Fragment>
 `;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_row.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_row.test.tsx.snap
index e2caf6f718728..8e4aa984c1e89 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_row.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_status_row.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`MonitorStatusRow component renders status row when status is down 1`] =
     />
   </EuiHealth>
   <EuiSpacer
-    size="s"
+    size="xs"
   />
 </Fragment>
 `;
@@ -37,7 +37,7 @@ exports[`MonitorStatusRow component renders status row when status is up 1`] = `
     />
   </EuiHealth>
   <EuiSpacer
-    size="s"
+    size="xs"
   />
 </Fragment>
 `;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap
index 5c1fe27d234a3..389afa27fd21f 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap
@@ -2,6 +2,9 @@
 
 exports[`MostRecentError component renders properly with mock data 1`] = `
 Array [
+  <div
+    class="euiSpacer euiSpacer--l"
+  />,
   <div
     class="euiText euiText--extraSmall"
   >
@@ -9,6 +12,9 @@ Array [
       Most recent error (5 days ago)
     </h3>
   </div>,
+  <div
+    class="euiSpacer euiSpacer--s"
+  />,
   <button
     class="euiLink euiLink--primary"
     type="button"
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
index aca43f550aa14..5c606f2356dfc 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
@@ -8,11 +8,12 @@ import { MonitorSummary, Check } from '../../../../../../common/graphql/types';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 import React from 'react';
 import { MonitorListDrawerComponent } from '../monitor_list_drawer';
+import { MonitorDetails } from '../../../../../../common/runtime_types';
 
 describe('MonitorListDrawer component', () => {
   let summary: MonitorSummary;
   let loadMonitorDetails: any;
-  let monitorDetails: any;
+  let monitorDetails: MonitorDetails;
 
   beforeEach(() => {
     summary = {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
index 86e60508a4078..35b649fa35795 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
@@ -5,8 +5,7 @@
  */
 
 import React, { useEffect } from 'react';
-import { EuiLink, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiIcon } from '@elastic/eui';
-import { get } from 'lodash';
+import { EuiLink, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui';
 import styled from 'styled-components';
 import { connect } from 'react-redux';
 import { MonitorSummary } from '../../../../../common/graphql/types';
@@ -16,6 +15,9 @@ import { MostRecentError } from './most_recent_error';
 import { getMonitorDetails } from '../../../../state/selectors';
 import { MonitorStatusList } from './monitor_status_list';
 import { MonitorDetails } from '../../../../../common/runtime_types';
+import { useUrlParams } from '../../../../hooks';
+import { MonitorDetailsActionPayload } from '../../../../state/actions/types';
+import { MonitorListActionsPopover } from '../monitor_list_actions_popover';
 
 const ContainerDiv = styled.div`
   padding: 10px;
@@ -48,26 +50,36 @@ export function MonitorListDrawerComponent({
   loadMonitorDetails,
   monitorDetails,
 }: MonitorListDrawerProps) {
-  if (!summary || !summary.state.checks) {
-    return null;
-  }
+  const monitorId = summary?.monitor_id;
+  const [getUrlParams] = useUrlParams();
+  const { dateRangeStart: dateStart, dateRangeEnd: dateEnd } = getUrlParams();
+
   useEffect(() => {
-    loadMonitorDetails(summary.monitor_id);
-  }, []);
+    loadMonitorDetails({
+      dateStart,
+      dateEnd,
+      monitorId,
+    });
+  }, [dateStart, dateEnd, monitorId, loadMonitorDetails]);
 
-  const monitorUrl: string | undefined = get(summary.state.url, 'full', undefined);
+  const monitorUrl = summary?.state?.url?.full || '';
 
-  return (
+  return summary && summary.state.checks ? (
     <ContainerDiv>
       <EuiFlexGroup>
         <EuiFlexItem grow={true}>
-          <EuiLink href={monitorUrl} target="_blank">
-            {monitorUrl}
-            <EuiIcon size="s" type="popout" color="subbdued" />
-          </EuiLink>
+          <EuiText>
+            <EuiLink href={monitorUrl} target="_blank">
+              {monitorUrl}
+              <EuiIcon size="s" type="popout" color="subbdued" />
+            </EuiLink>
+          </EuiText>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <MonitorListActionsPopover summary={summary} />
         </EuiFlexItem>
       </EuiFlexGroup>
-      <EuiSpacer size="s" />
+      <EuiSpacer size="m" />
       <MonitorStatusList checks={summary.state.checks} />
       {monitorDetails && monitorDetails.error && (
         <MostRecentError
@@ -77,7 +89,7 @@ export function MonitorListDrawerComponent({
         />
       )}
     </ContainerDiv>
-  );
+  ) : null;
 }
 
 const mapStateToProps = (state: AppState, { summary }: any) => ({
@@ -85,7 +97,8 @@ const mapStateToProps = (state: AppState, { summary }: any) => ({
 });
 
 const mapDispatchToProps = (dispatch: any) => ({
-  loadMonitorDetails: (monitorId: string) => dispatch(fetchMonitorDetails(monitorId)),
+  loadMonitorDetails: (actionPayload: MonitorDetailsActionPayload) =>
+    dispatch(fetchMonitorDetails(actionPayload)),
 });
 
 export const MonitorListDrawer = connect(
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx
index cbb7ce229c3ea..66e9fce155ed2 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_list.tsx
@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import { get } from 'lodash';
+import { get, capitalize } from 'lodash';
 import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Check } from '../../../../../common/graphql/types';
@@ -32,9 +32,9 @@ export const MonitorStatusList = ({ checks }: MonitorStatusListProps) => {
     const location = get<string | null>(check, 'observer.geo.name', null) || UNNAMED_LOCATION;
 
     if (check.monitor.status === UP) {
-      upChecks.add(location);
+      upChecks.add(capitalize(location));
     } else if (check.monitor.status === DOWN) {
-      downChecks.add(location);
+      downChecks.add(capitalize(location));
     }
   });
 
@@ -55,7 +55,7 @@ export const MonitorStatusList = ({ checks }: MonitorStatusListProps) => {
               values={{ link: <LocationLink /> }}
             />
           </EuiCallOut>
-          <EuiSpacer />
+          <EuiSpacer size="s" />
         </>
       )}
     </>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_row.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_row.tsx
index 90aa887a78356..66fe7fe4a5279 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_row.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/monitor_status_row.tsx
@@ -57,7 +57,7 @@ export const MonitorStatusRow = ({ locationNames, status }: MonitorStatusRowProp
           />
         )}
       </EuiHealth>
-      <EuiSpacer size="s" />
+      <EuiSpacer size="xs" />
     </>
   );
 };
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/most_recent_error.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/most_recent_error.tsx
index 5db0ab63605b3..c2df9253ec8dc 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/most_recent_error.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/most_recent_error.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React from 'react';
-import { EuiText } from '@elastic/eui';
+import { EuiText, EuiSpacer } from '@elastic/eui';
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import { MonitorPageLink } from '../monitor_page_link';
@@ -39,6 +39,7 @@ export const MostRecentError = ({ error, monitorId, timestamp }: MostRecentError
 
   return (
     <>
+      <EuiSpacer />
       <EuiText size="xs">
         <h3>
           {i18n.translate('xpack.uptime.monitorList.mostRecentError.title', {
@@ -48,6 +49,7 @@ export const MostRecentError = ({ error, monitorId, timestamp }: MostRecentError
           })}
         </h3>
       </EuiText>
+      <EuiSpacer size="s" />
       <MonitorPageLink monitorId={monitorId} linkParameters={linkParameters}>
         {error?.message}
       </MonitorPageLink>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/translations.ts b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/translations.ts
new file mode 100644
index 0000000000000..9f17f6d7f27b0
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/translations.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const STATUS_COLUMN_LABEL = i18n.translate('xpack.uptime.monitorList.statusColumnLabel', {
+  defaultMessage: 'Status',
+});
+
+export const NAME_COLUMN_LABEL = i18n.translate('xpack.uptime.monitorList.nameColumnLabel', {
+  defaultMessage: 'Name',
+});
+
+export const HISTORY_COLUMN_LABEL = i18n.translate(
+  'xpack.uptime.monitorList.monitorHistoryColumnLabel',
+  {
+    defaultMessage: 'Downtime history',
+  }
+);
+
+export const getExpandDrawerLabel = (id: string) => {
+  return i18n.translate('xpack.uptime.monitorList.expandDrawerButton.ariaLabel', {
+    defaultMessage: 'Expand row for monitor with ID {id}',
+    description: 'The user can click a button on this table and expand further details.',
+    values: {
+      id,
+    },
+  });
+};
+
+export const getDescriptionLabel = (itemsLength: number) => {
+  return i18n.translate('xpack.uptime.monitorList.table.description', {
+    defaultMessage:
+      'Monitor Status table with columns for Status, Name, URL, IP, Downtime History and Integrations. The table is currently displaying {length} items.',
+    values: { length: itemsLength },
+  });
+};
+
+export const NO_MONITOR_ITEM_SELECTED = i18n.translate(
+  'xpack.uptime.monitorList.noItemForSelectedFiltersMessage',
+  {
+    defaultMessage: 'No monitors found for selected filter criteria',
+    description:
+      'This message is show if there are no monitors in the table and some filter or search criteria exists',
+  }
+);
+
+export const NO_DATA_MESSAGE = i18n.translate('xpack.uptime.monitorList.noItemMessage', {
+  defaultMessage: 'No uptime monitors found',
+  description: 'This message is shown if the monitors table is rendered but has no items.',
+});
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/types.ts b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/types.ts
index 8f7ebcaf36e75..a25603d3603d9 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/types.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/types.ts
@@ -18,11 +18,11 @@ export interface CondensedCheckStatus {
 }
 
 export interface Criteria {
-  page: {
+  page?: {
     index: number;
     size: number;
   };
-  sort: {
+  sort?: {
     field: string;
     direction: 'asc' | 'desc';
   };
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_details.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_details.tsx
index cf337eaec4bbc..ed67c6364e958 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_details.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_details.tsx
@@ -28,7 +28,7 @@ export const MonitorStatusDetailsComponent = ({
 }: MonitorStatusBarProps) => {
   useEffect(() => {
     loadMonitorLocations(monitorId);
-  }, [monitorId, dateStart, dateEnd]);
+  }, [loadMonitorLocations, monitorId, dateStart, dateEnd]);
 
   return (
     <EuiPanel>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap
index a2e31a0f33d39..692675baa8950 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap
@@ -145,7 +145,7 @@ exports[`PingList component renders sorted list without errors 1`] = `
             "render": [Function],
           },
           Object {
-            "align": "center",
+            "align": "right",
             "field": "http.response.status_code",
             "name": "Response code",
             "render": [Function],
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/ping_list.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/ping_list.test.tsx
index 43adc4da85f32..ba07d6c63b36c 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/ping_list.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/ping_list.test.tsx
@@ -207,7 +207,6 @@ describe('PingList component', () => {
         onPageCountChange={jest.fn()}
         onSelectedLocationChange={(loc: EuiComboBoxOptionProps[]) => {}}
         onSelectedStatusChange={jest.fn()}
-        onUpdateApp={jest.fn()}
         pageSize={30}
         selectedOption="down"
         selectedLocation={AllLocationOption.value}
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx
index b3c1de37c1340..71b1255b3b37e 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx
@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import {
   EuiBadge,
   EuiBasicTable,
@@ -21,15 +22,14 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { get } from 'lodash';
 import moment from 'moment';
-import React, { Fragment, useEffect, useState } from 'react';
-// @ts-ignore formatNumber
-import { formatNumber } from '@elastic/eui/lib/services/format';
+import React, { Fragment, useState } from 'react';
+import { CriteriaWithPagination } from '@elastic/eui/src/components/basic_table/basic_table';
 import { Ping, PingResults } from '../../../../common/graphql/types';
 import { convertMicrosecondsToMilliseconds as microsToMillis } from '../../../lib/helper';
 import { UptimeGraphQLQueryProps, withUptimeGraphQL } from '../../higher_order';
 import { pingsQuery } from '../../../queries';
 import { LocationName } from './../location_name';
-import { Criteria, Pagination } from './../monitor_list';
+import { Pagination } from './../monitor_list';
 import { PingListExpandedRowComponent } from './expanded_row';
 
 interface PingListQueryResult {
@@ -40,7 +40,6 @@ interface PingListProps {
   onSelectedStatusChange: (status: string | undefined) => void;
   onSelectedLocationChange: (location: any) => void;
   onPageCountChange: (itemCount: number) => void;
-  onUpdateApp: () => void;
   pageSize: number;
   selectedOption: string;
   selectedLocation: string | undefined;
@@ -76,17 +75,12 @@ export const PingListComponent = ({
   onPageCountChange,
   onSelectedLocationChange,
   onSelectedStatusChange,
-  onUpdateApp,
   pageSize,
   selectedOption,
   selectedLocation,
 }: Props) => {
   const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<ExpandedRowMap>({});
 
-  useEffect(() => {
-    onUpdateApp();
-  }, [selectedOption]);
-
   const statusOptions = [
     {
       text: i18n.translate('xpack.uptime.pingList.statusOptions.allStatusOptionLabel', {
@@ -181,16 +175,16 @@ export const PingListComponent = ({
       render: (error: string) => error ?? '-',
     },
   ];
-
   const pings: Ping[] = data?.allPings?.pings ?? [];
-
-  const hasStatus: boolean = pings.some(
-    (currentPing: Ping) => !!currentPing?.http?.response?.status_code
+  const hasStatus: boolean = pings.reduce(
+    (hasHttpStatus: boolean, currentPing: Ping) =>
+      hasHttpStatus || !!currentPing.http?.response?.status_code,
+    false
   );
   if (hasStatus) {
     columns.push({
       field: 'http.response.status_code',
-      align: 'center',
+      align: 'right',
       name: i18n.translate('xpack.uptime.pingList.responseCodeColumnLabel', {
         defaultMessage: 'Response code',
       }),
@@ -306,7 +300,9 @@ export const PingListComponent = ({
           itemId="id"
           itemIdToExpandedRowMap={itemIdToExpandedRowMap}
           pagination={pagination}
-          onChange={({ page: { size } }: Criteria) => onPageCountChange(size)}
+          onChange={(criteria: CriteriaWithPagination<Ping>) =>
+            onPageCountChange(criteria.page!.size)
+          }
         />
       </EuiPanel>
     </Fragment>
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 e0d282a5348a0..4c1b482b198af 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/snapshot.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/snapshot.tsx
@@ -92,7 +92,7 @@ export const Container: React.FC<Props> = ({
 }: Props) => {
   useEffect(() => {
     loadSnapshotCount(dateRangeStart, dateRangeEnd, filters, statusFilter);
-  }, [dateRangeStart, dateRangeEnd, filters, lastRefresh, statusFilter]);
+  }, [dateRangeStart, dateRangeEnd, filters, lastRefresh, loadSnapshotCount, statusFilter]);
   return <PresentationalComponent count={count} height={height} loading={loading} />;
 };
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/uptime_date_picker.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/uptime_date_picker.tsx
index 78e69a68afbd8..ebd0cd1e4ae85 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/uptime_date_picker.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/uptime_date_picker.tsx
@@ -20,21 +20,40 @@ interface SuperDateRangePickerRefreshChangedEvent {
   refreshInterval?: number;
 }
 
+export interface CommonlyUsedRange {
+  from: string;
+  to: string;
+  display: string;
+}
+
 interface Props {
   refreshApp: () => void;
+  commonlyUsedRanges?: CommonlyUsedRange[];
 }
 
 type UptimeDatePickerProps = Props;
 
-export const UptimeDatePicker = (props: UptimeDatePickerProps) => {
-  const { refreshApp } = props;
+export const UptimeDatePicker = ({ refreshApp, commonlyUsedRanges }: UptimeDatePickerProps) => {
   const [getUrlParams, updateUrl] = useUrlParams();
   const { autorefreshInterval, autorefreshIsPaused, dateRangeStart, dateRangeEnd } = getUrlParams();
+
+  const euiCommonlyUsedRanges = commonlyUsedRanges
+    ? commonlyUsedRanges.map(
+        ({ from, to, display }: { from: string; to: string; display: string }) => {
+          return {
+            start: from,
+            end: to,
+            label: display,
+          };
+        }
+      )
+    : CLIENT_DEFAULTS.COMMONLY_USED_DATE_RANGES;
+
   return (
     <EuiSuperDatePicker
       start={dateRangeStart}
       end={dateRangeEnd}
-      commonlyUsedRanges={CLIENT_DEFAULTS.COMMONLY_USED_DATE_RANGES}
+      commonlyUsedRanges={euiCommonlyUsedRanges}
       isPaused={autorefreshIsPaused}
       refreshInterval={autorefreshInterval}
       onTimeChange={({ start, end }: SuperDateRangePickerRangeChangedEvent) => {
diff --git a/x-pack/legacy/plugins/uptime/public/components/higher_order/uptime_graphql_query.tsx b/x-pack/legacy/plugins/uptime/public/components/higher_order/uptime_graphql_query.tsx
index 219f92ce36e63..6839050cec7a8 100644
--- a/x-pack/legacy/plugins/uptime/public/components/higher_order/uptime_graphql_query.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/higher_order/uptime_graphql_query.tsx
@@ -75,6 +75,9 @@ export function withUptimeGraphQL<T, P = {}>(WrappedComponent: any, query: any)
        * reassign the update function to do nothing with the returned values.
        */
       return () => {
+        // this component is planned to be deprecated, for the time being
+        // we will want to preserve this for the reason above.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
         updateState = () => {};
       };
     }, [variables, lastRefresh]);
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/index.ts b/x-pack/legacy/plugins/uptime/public/hooks/index.ts
index 22de59833b08d..aa7bb0a220357 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/hooks/index.ts
@@ -5,3 +5,5 @@
  */
 
 export { useUrlParams } from './use_url_params';
+export { useIndexPattern } from './use_index_pattern';
+export * from './use_telemetry';
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts b/x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts
new file mode 100644
index 0000000000000..f2b586b27dba6
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.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 { useEffect, Dispatch } from 'react';
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+
+export const useIndexPattern = <T>(setIndexPattern: Dispatch<T>) => {
+  const core = useKibana();
+  useEffect(() => {
+    const fetch = core.services.http?.fetch;
+    async function getIndexPattern() {
+      if (!fetch) throw new Error('Http core services are not defined');
+      setIndexPattern(await fetch('/api/uptime/index_pattern', { method: 'GET' }));
+    }
+    getIndexPattern();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [core.services.http]);
+};
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts b/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.ts
new file mode 100644
index 0000000000000..15f276174e2cf
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/hooks/use_telemetry.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 { useEffect } from 'react';
+import { HttpHandler } from 'kibana/public';
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+
+export enum UptimePage {
+  Overview = '/api/uptime/logOverview',
+  Monitor = '/api/uptime/logMonitor',
+  NotFound = '__not-found__',
+}
+
+const getApiPath = (page?: UptimePage) => {
+  if (!page) throw new Error('Telemetry logging for this page not yet implemented');
+  if (page === '__not-found__')
+    throw new Error('Telemetry logging for 404 page not yet implemented');
+  return page.valueOf();
+};
+
+const logPageLoad = async (fetch: HttpHandler, page?: UptimePage) => {
+  try {
+    await fetch(getApiPath(page), {
+      method: 'POST',
+    });
+  } catch (e) {
+    throw e;
+  }
+};
+
+export const useUptimeTelemetry = (page?: UptimePage) => {
+  const kibana = useKibana();
+  const fetch = kibana.services.http?.fetch;
+  useEffect(() => {
+    if (!fetch) throw new Error('Core http services are not defined');
+    logPageLoad(fetch, page);
+  }, [fetch, page]);
+};
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
index 94bfe79a6ca6e..28179c229013b 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
+++ b/x-pack/legacy/plugins/uptime/public/lib/adapters/framework/new_platform_adapter.tsx
@@ -4,23 +4,27 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ChromeBreadcrumb, CoreStart } from 'src/core/public';
+import { ChromeBreadcrumb, LegacyCoreStart } from 'src/core/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { get } from 'lodash';
-import { AutocompleteProviderRegister } from 'src/plugins/data/public';
 import { i18n as i18nFormatter } from '@kbn/i18n';
+import { PluginsStart } from 'ui/new_platform/new_platform';
 import { CreateGraphQLClient } from './framework_adapter_types';
 import { UptimeApp, UptimeAppProps } from '../../../uptime_app';
 import { getIntegratedAppAvailability } from './capabilities_adapter';
-import { INTEGRATED_SOLUTIONS, PLUGIN } from '../../../../common/constants';
-import { getTelemetryMonitorPageLogger, getTelemetryOverviewPageLogger } from '../telemetry';
+import {
+  INTEGRATED_SOLUTIONS,
+  PLUGIN,
+  DEFAULT_DARK_MODE,
+  DEFAULT_TIMEPICKER_QUICK_RANGES,
+} from '../../../../common/constants';
 import { UMFrameworkAdapter, BootstrapUptimeApp } from '../../lib';
 import { createApolloClient } from './apollo_client_adapter';
 
 export const getKibanaFrameworkAdapter = (
-  core: CoreStart,
-  autocomplete: Pick<AutocompleteProviderRegister, 'getProvider'>
+  core: LegacyCoreStart,
+  plugins: PluginsStart
 ): UMFrameworkAdapter => {
   const {
     application: { capabilities },
@@ -39,18 +43,18 @@ export const getKibanaFrameworkAdapter = (
   );
   const canSave = get(capabilities, 'uptime.save', false);
   const props: UptimeAppProps = {
-    autocomplete,
     basePath: basePath.get(),
     canSave,
     client: createApolloClient(`${basePath.get()}/api/uptime/graphql`, 'true'),
-    darkMode: core.uiSettings.get('theme:darkMode'),
+    core,
+    darkMode: core.uiSettings.get(DEFAULT_DARK_MODE),
+    commonlyUsedRanges: core.uiSettings.get(DEFAULT_TIMEPICKER_QUICK_RANGES),
     i18n,
     isApmAvailable: apm,
     isInfraAvailable: infrastructure,
     isLogsAvailable: logs,
     kibanaBreadcrumbs: breadcrumbs,
-    logMonitorPageLoad: getTelemetryMonitorPageLogger('true', basePath.get()),
-    logOverviewPageLoad: getTelemetryOverviewPageLogger('true', basePath.get()),
+    plugins,
     renderGlobalHelpControls: () =>
       setHelpExtension({
         appName: i18nFormatter.translate('xpack.uptime.header.appName', {
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/__tests__/get_index_pattern.test.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/__tests__/get_index_pattern.test.ts
deleted file mode 100644
index 6654def2f944b..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/__tests__/get_index_pattern.test.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 axios, { AxiosRequestConfig } from 'axios';
-import { getIndexPattern } from '../get_index_pattern';
-
-describe('getIndexPattern', () => {
-  let axiosSpy: jest.SpyInstance<Promise<unknown>, [string, (AxiosRequestConfig | undefined)?]>;
-  beforeEach(() => {
-    axiosSpy = jest.spyOn(axios, 'get');
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns expected data', async () => {
-    expect.assertions(3);
-    axiosSpy.mockReturnValue(new Promise(r => r({ data: { foo: 'bar' } })));
-    expect(await getIndexPattern()).toEqual({ foo: 'bar' });
-    expect(axiosSpy.mock.calls).toHaveLength(1);
-    expect(axiosSpy.mock.calls[0]).toEqual(['/api/uptime/index_pattern']);
-  });
-
-  it('handles the supplied basePath', async () => {
-    expect.assertions(2);
-    await getIndexPattern('foo');
-    expect(axiosSpy.mock.calls).toHaveLength(1);
-    expect(axiosSpy.mock.calls[0]).toEqual(['foo/api/uptime/index_pattern']);
-  });
-
-  it('supplies the returned data to the given setter function', async () => {
-    const mockSetter = jest.fn();
-    axiosSpy.mockReturnValue(new Promise(r => r({ data: { foo: 'bar' } })));
-    await getIndexPattern(undefined, mockSetter);
-    expect(mockSetter).toHaveBeenCalled();
-    expect(mockSetter).toHaveBeenCalledWith({ foo: 'bar' });
-  });
-
-  it('returns undefined when there is an error fetching', async () => {
-    expect.assertions(1);
-    axiosSpy.mockReturnValue(
-      new Promise((resolve, reject) => reject('Request timeout, server could not be reached'))
-    );
-    expect(await getIndexPattern()).toBeUndefined();
-  });
-});
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/get_index_pattern.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/get_index_pattern.ts
deleted file mode 100644
index fd4161b35f7dd..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/get_index_pattern.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 axios from 'axios';
-import { getApiPath } from '../../helper';
-
-/**
- * Fetches and returns the uptime index pattern, optionally provides it to
- * a given setter function.
- * @param basePath - the base path, if any
- * @param setter - a callback for use with non-async functions like `useEffect`
- */
-export const getIndexPattern = async (basePath?: string, setter?: (data: unknown) => void) => {
-  try {
-    const { data } = await axios.get(getApiPath('/api/uptime/index_pattern', basePath));
-    if (setter) {
-      setter(data);
-    }
-    return data;
-  } catch {
-    return undefined;
-  }
-};
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/index.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/index.ts
deleted file mode 100644
index 1c84a7bc3b727..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/index_pattern/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 { getIndexPattern } from './get_index_pattern';
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/index.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/index.ts
deleted file mode 100644
index 08d8d9a5d4069..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/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 { getTelemetryMonitorPageLogger } from './log_monitor';
-export { getTelemetryOverviewPageLogger } from './log_overview';
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_monitor.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_monitor.ts
deleted file mode 100644
index 20328497d69a8..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_monitor.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 axios from 'axios';
-import { getApiPath } from '../../helper';
-
-/**
- * Generates a function to log a page load of the monitor page for Kibana telemetry.
- * @returns a function that can log page loads
- */
-export const getTelemetryMonitorPageLogger = (xsrf: string, basePath?: string) => async () => {
-  await axios.post(getApiPath('/api/uptime/logMonitor', basePath), undefined, {
-    headers: { 'kbn-xsrf': xsrf },
-  });
-};
diff --git a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_overview.ts b/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_overview.ts
deleted file mode 100644
index fd9fd773a18b9..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/adapters/telemetry/log_overview.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 axios from 'axios';
-import { getApiPath } from '../../helper';
-
-/**
- * Generates a function to log a page load of the overview page for Kibana telemtry.
- * @returns a function that can log page loads
- */
-export const getTelemetryOverviewPageLogger = (xsrf: string, basePath?: string) => async () => {
-  await axios.post(getApiPath('/api/uptime/logOverview', basePath), undefined, {
-    headers: { 'kbn-xsrf': xsrf },
-  });
-};
diff --git a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
index 8c5fced2f2864..c8334b2376bc1 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
@@ -12,14 +12,13 @@ import { getMonitorPageBreadcrumb } from '../breadcrumbs';
 import { MonitorCharts, MonitorPageTitle, PingList } from '../components/functional';
 import { UMUpdateBreadcrumbs } from '../lib/lib';
 import { UptimeSettingsContext } from '../contexts';
-import { useUrlParams } from '../hooks';
+import { useUptimeTelemetry, useUrlParams, UptimePage } from '../hooks';
 import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
 import { useTrackPageview } from '../../../infra/public';
 import { getTitle } from '../lib/helper/get_title';
 import { MonitorStatusDetails } from '../components/functional/monitor_status_details';
 
 interface MonitorPageProps {
-  logMonitorPageLoad: () => void;
   match: { params: { monitorId: string } };
   // this is the query function provided by Apollo's Client API
   query: <T, TVariables = OperationVariables>(
@@ -28,12 +27,7 @@ interface MonitorPageProps {
   setBreadcrumbs: UMUpdateBreadcrumbs;
 }
 
-export const MonitorPage = ({
-  logMonitorPageLoad,
-  query,
-  setBreadcrumbs,
-  match,
-}: MonitorPageProps) => {
+export const MonitorPage = ({ query, setBreadcrumbs, match }: MonitorPageProps) => {
   // decode 64 base string, it was decoded to make it a valid url, since monitor id can be a url
   const monitorId = atob(match.params.monitorId);
   const [pingListPageCount, setPingListPageCount] = useState<number>(10);
@@ -63,7 +57,7 @@ export const MonitorPage = ({
         setHeadingText(heading);
       }
     });
-  }, [params]);
+  }, [monitorId, params, query, setBreadcrumbs, setHeadingText]);
 
   const [selectedLocation, setSelectedLocation] = useState(undefined);
 
@@ -74,9 +68,7 @@ export const MonitorPage = ({
     monitorId,
   };
 
-  useEffect(() => {
-    logMonitorPageLoad();
-  }, []);
+  useUptimeTelemetry(UptimePage.Monitor);
 
   useTrackPageview({ app: 'uptime', path: 'monitor' });
   useTrackPageview({ app: 'uptime', path: 'monitor', delay: 15000 });
@@ -103,10 +95,10 @@ export const MonitorPage = ({
       <PingList
         onPageCountChange={setPingListPageCount}
         onSelectedLocationChange={setSelectedLocation}
-        onSelectedStatusChange={(selectedStatus: string | undefined) =>
-          updateUrlParams({ selectedPingStatus: selectedStatus || '' })
-        }
-        onUpdateApp={refreshApp}
+        onSelectedStatusChange={(selectedStatus: string | undefined) => {
+          updateUrlParams({ selectedPingStatus: selectedStatus || '' });
+          refreshApp();
+        }}
         pageSize={pingListPageCount}
         selectedOption={selectedPingStatus}
         selectedLocation={selectedLocation}
diff --git a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
index 561cc934a9b76..34bcfb994cd48 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
@@ -19,10 +19,9 @@ import {
 } from '../components/functional';
 import { UMUpdateBreadcrumbs } from '../lib/lib';
 import { UptimeSettingsContext } from '../contexts';
-import { useUrlParams } from '../hooks';
+import { useIndexPattern, useUrlParams, useUptimeTelemetry, UptimePage } from '../hooks';
 import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
 import { useTrackPageview } from '../../../infra/public';
-import { getIndexPattern } from '../lib/adapters/index_pattern';
 import { combineFiltersAndUserSearch, stringifyKueries, toStaticIndexPattern } from '../lib/helper';
 import { AutocompleteProviderRegister, esKuery } from '../../../../../../src/plugins/data/public';
 
@@ -34,7 +33,6 @@ interface OverviewPageProps {
     pathname: string;
     search: string;
   };
-  logOverviewPageLoad: () => void;
   setBreadcrumbs: UMUpdateBreadcrumbs;
 }
 
@@ -54,12 +52,7 @@ const EuiFlexItemStyled = styled(EuiFlexItem)`
   }
 `;
 
-export const OverviewPage = ({
-  basePath,
-  autocomplete,
-  logOverviewPageLoad,
-  setBreadcrumbs,
-}: Props) => {
+export const OverviewPage = ({ basePath, autocomplete, setBreadcrumbs }: Props) => {
   const { colors, setHeadingText } = useContext(UptimeSettingsContext);
   const [getUrlParams, updateUrl] = useUrlParams();
   const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = getUrlParams();
@@ -72,11 +65,11 @@ export const OverviewPage = ({
     filters: urlFilters,
   } = params;
   const [indexPattern, setIndexPattern] = useState<any>(undefined);
+  useUptimeTelemetry(UptimePage.Overview);
+  useIndexPattern(setIndexPattern);
 
   useEffect(() => {
-    getIndexPattern(basePath, setIndexPattern);
     setBreadcrumbs(getOverviewPageBreadcrumbs());
-    logOverviewPageLoad();
     if (setHeadingText) {
       setHeadingText(
         i18n.translate('xpack.uptime.overviewPage.headerText', {
@@ -85,7 +78,7 @@ export const OverviewPage = ({
         })
       );
     }
-  }, []);
+  }, [basePath, setBreadcrumbs, setHeadingText]);
 
   useTrackPageview({ app: 'uptime', path: 'overview' });
   useTrackPageview({ app: 'uptime', path: 'overview', delay: 15000 });
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/monitor.ts b/x-pack/legacy/plugins/uptime/public/state/actions/monitor.ts
index 99855bb8c8df3..cf4525a08e43c 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/monitor.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/monitor.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { MonitorDetailsActionPayload } from './types';
+import { MonitorError } from '../../../common/runtime_types';
 import { MonitorLocations } from '../../../common/runtime_types';
 import { QueryParams } from './types';
 
@@ -17,12 +19,12 @@ export const FETCH_MONITOR_LOCATIONS_FAIL = 'FETCH_MONITOR_LOCATIONS_FAIL';
 
 export interface MonitorDetailsState {
   monitorId: string;
-  error: Error;
+  error: MonitorError;
 }
 
 interface GetMonitorDetailsAction {
   type: typeof FETCH_MONITOR_DETAILS;
-  payload: string;
+  payload: MonitorDetailsActionPayload;
 }
 
 interface GetMonitorDetailsSuccessAction {
@@ -54,10 +56,10 @@ interface GetMonitorLocationsFailAction {
   payload: any;
 }
 
-export function fetchMonitorDetails(monitorId: string): GetMonitorDetailsAction {
+export function fetchMonitorDetails(payload: MonitorDetailsActionPayload): GetMonitorDetailsAction {
   return {
     type: FETCH_MONITOR_DETAILS,
-    payload: monitorId,
+    payload,
   };
 }
 
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts b/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
index 7ec288583f9fe..8419aaadc74bd 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
@@ -10,3 +10,10 @@ export interface QueryParams {
   filters?: string;
   statusFilter?: string;
 }
+
+export interface MonitorDetailsActionPayload {
+  monitorId: string;
+  dateStart: string;
+  dateEnd: string;
+  location?: string;
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/ui.ts b/x-pack/legacy/plugins/uptime/public/state/actions/ui.ts
index 0bb2d8447419b..fb38599495d84 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/ui.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/ui.ts
@@ -3,53 +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.
  */
-
-export const SET_INTEGRATION_POPOVER_STATE = 'SET_INTEGRATION_POPOVER_STATE';
-export const SET_BASE_PATH = 'SET_BASE_PATH';
-export const REFRESH_APP = 'REFRESH_APP';
+import { createAction } from 'redux-actions';
 
 export interface PopoverState {
   id: string;
   open: boolean;
 }
 
-interface SetBasePathAction {
-  type: typeof SET_BASE_PATH;
-  payload: string;
-}
-
-interface SetIntegrationPopoverAction {
-  type: typeof SET_INTEGRATION_POPOVER_STATE;
-  payload: PopoverState;
-}
-
-interface TriggerAppRefreshAction {
-  type: typeof REFRESH_APP;
-  payload: number;
-}
+export type UiPayload = PopoverState & string & number & Map<string, string[]>;
 
-export type UiActionTypes =
-  | SetIntegrationPopoverAction
-  | SetBasePathAction
-  | TriggerAppRefreshAction;
+export const setBasePath = createAction<string>('SET BASE PATH');
 
-export function toggleIntegrationsPopover(popoverState: PopoverState): SetIntegrationPopoverAction {
-  return {
-    type: SET_INTEGRATION_POPOVER_STATE,
-    payload: popoverState,
-  };
-}
+export const triggerAppRefresh = createAction<number>('REFRESH APP');
 
-export function setBasePath(basePath: string): SetBasePathAction {
-  return {
-    type: SET_BASE_PATH,
-    payload: basePath,
-  };
-}
-
-export function triggerAppRefresh(refreshTime: number): TriggerAppRefreshAction {
-  return {
-    type: REFRESH_APP,
-    payload: refreshTime,
-  };
-}
+export const toggleIntegrationsPopover = createAction<PopoverState>(
+  'TOGGLE INTEGRATION POPOVER STATE'
+);
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/monitor.ts b/x-pack/legacy/plugins/uptime/public/state/api/monitor.ts
index 0fb00b935342e..8b1220830f091 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/monitor.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/api/monitor.ts
@@ -6,6 +6,7 @@
 
 import { ThrowReporter } from 'io-ts/lib/ThrowReporter';
 import { getApiPath } from '../../lib/helper';
+import { BaseParams } from './types';
 import {
   MonitorDetailsType,
   MonitorDetails,
@@ -19,12 +20,23 @@ interface ApiRequest {
   basePath: string;
 }
 
+export type MonitorQueryParams = BaseParams & ApiRequest;
+
 export const fetchMonitorDetails = async ({
   monitorId,
   basePath,
-}: ApiRequest): Promise<MonitorDetails> => {
-  const url = getApiPath(`/api/uptime/monitor/details?monitorId=${monitorId}`, basePath);
-  const response = await fetch(url);
+  dateStart,
+  dateEnd,
+}: MonitorQueryParams): Promise<MonitorDetails> => {
+  const url = getApiPath(`/api/uptime/monitor/details`, basePath);
+  const params = {
+    monitorId,
+    dateStart,
+    dateEnd,
+  };
+  const urlParams = new URLSearchParams(params).toString();
+  const response = await fetch(`${url}?${urlParams}`);
+
   if (!response.ok) {
     throw new Error(response.statusText);
   }
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/types.ts b/x-pack/legacy/plugins/uptime/public/state/api/types.ts
new file mode 100644
index 0000000000000..278cfce29986f
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/api/types.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface BaseParams {
+  basePath: string;
+  dateStart: string;
+  dateEnd: string;
+  filters?: string;
+  statusFilter?: string;
+  location?: string;
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/monitor.ts b/x-pack/legacy/plugins/uptime/public/state/effects/monitor.ts
index 210004bb343bb..1cac7424b4e5b 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/monitor.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/monitor.ts
@@ -16,12 +16,18 @@ import {
 } from '../actions/monitor';
 import { fetchMonitorDetails, fetchMonitorLocations } from '../api';
 import { getBasePath } from '../selectors';
+import { MonitorDetailsActionPayload } from '../actions/types';
 
 function* monitorDetailsEffect(action: Action<any>) {
-  const monitorId: string = action.payload;
+  const { monitorId, dateStart, dateEnd }: MonitorDetailsActionPayload = action.payload;
   try {
     const basePath = yield select(getBasePath);
-    const response = yield call(fetchMonitorDetails, { monitorId, basePath });
+    const response = yield call(fetchMonitorDetails, {
+      monitorId,
+      basePath,
+      dateStart,
+      dateEnd,
+    });
     yield put({ type: FETCH_MONITOR_DETAILS_SUCCESS, payload: response });
   } catch (error) {
     yield put({ type: FETCH_MONITOR_DETAILS_FAIL, payload: error.message });
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap
index 75516da18c633..155f7edbcbf33 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/__snapshots__/ui.test.ts.snap
@@ -21,7 +21,7 @@ Object {
 
 exports[`ui reducer updates the refresh value 1`] = `
 Object {
-  "basePath": "",
+  "basePath": "abc",
   "integrationsPopoverOpen": null,
   "lastRefresh": 125,
 }
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/ui.test.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/ui.test.ts
index 9be863f0b700d..ff9b7c3f9e8a4 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/ui.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/__tests__/ui.test.ts
@@ -4,15 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UiActionTypes } from '../../actions';
+import { setBasePath, toggleIntegrationsPopover, triggerAppRefresh } from '../../actions';
 import { uiReducer } from '../ui';
+import { Action } from 'redux-actions';
 
 describe('ui reducer', () => {
   it(`sets the application's base path`, () => {
-    const action: UiActionTypes = {
-      type: 'SET_BASE_PATH',
-      payload: 'yyz',
-    };
+    const action = setBasePath('yyz') as Action<never>;
     expect(
       uiReducer(
         {
@@ -26,13 +24,10 @@ describe('ui reducer', () => {
   });
 
   it('adds integration popover status to state', () => {
-    const action: UiActionTypes = {
-      type: 'SET_INTEGRATION_POPOVER_STATE',
-      payload: {
-        id: 'popover-2',
-        open: true,
-      },
-    };
+    const action = toggleIntegrationsPopover({
+      id: 'popover-2',
+      open: true,
+    }) as Action<never>;
     expect(
       uiReducer(
         {
@@ -46,10 +41,16 @@ describe('ui reducer', () => {
   });
 
   it('updates the refresh value', () => {
-    const action: UiActionTypes = {
-      type: 'REFRESH_APP',
-      payload: 125,
-    };
-    expect(uiReducer(undefined, action)).toMatchSnapshot();
+    const action = triggerAppRefresh(125) as Action<never>;
+    expect(
+      uiReducer(
+        {
+          basePath: 'abc',
+          integrationsPopoverOpen: null,
+          lastRefresh: 125,
+        },
+        action
+      )
+    ).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
index f0c3d1c2cbecf..b588feaf8a75a 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
@@ -12,5 +12,6 @@ import { uiReducer } from './ui';
 export const rootReducer = combineReducers({
   monitor: monitorReducer,
   snapshot: snapshotReducer,
+  // @ts-ignore for now TODO: refactor to use redux-action
   ui: uiReducer,
 });
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/ui.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/ui.ts
index be95c8fff6bec..b23245aa65fca 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/ui.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/ui.ts
@@ -4,12 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { handleActions, Action } from 'redux-actions';
 import {
-  UiActionTypes,
   PopoverState,
-  SET_INTEGRATION_POPOVER_STATE,
-  SET_BASE_PATH,
-  REFRESH_APP,
+  toggleIntegrationsPopover,
+  setBasePath,
+  triggerAppRefresh,
+  UiPayload,
 } from '../actions/ui';
 
 export interface UiState {
@@ -24,29 +25,22 @@ const initialState: UiState = {
   lastRefresh: Date.now(),
 };
 
-export function uiReducer(state = initialState, action: UiActionTypes): UiState {
-  switch (action.type) {
-    case REFRESH_APP:
-      return {
-        ...state,
-        lastRefresh: action.payload,
-      };
-    case SET_INTEGRATION_POPOVER_STATE:
-      const popoverState = action.payload;
-      return {
-        ...state,
-        integrationsPopoverOpen: {
-          id: popoverState.id,
-          open: popoverState.open,
-        },
-      };
-    case SET_BASE_PATH:
-      const basePath = action.payload;
-      return {
-        ...state,
-        basePath,
-      };
-    default:
-      return state;
-  }
-}
+export const uiReducer = handleActions<UiState, UiPayload>(
+  {
+    [String(toggleIntegrationsPopover)]: (state, action: Action<PopoverState>) => ({
+      ...state,
+      integrationsPopoverOpen: action.payload as PopoverState,
+    }),
+
+    [String(setBasePath)]: (state, action: Action<string>) => ({
+      ...state,
+      basePath: action.payload as string,
+    }),
+
+    [String(triggerAppRefresh)]: (state, action: Action<number>) => ({
+      ...state,
+      lastRefresh: action.payload as number,
+    }),
+  },
+  initialState
+);
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
index b61ed83663435..33b6400c56c60 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
@@ -25,7 +25,11 @@ describe('state selectors', () => {
       errors: [],
       loading: false,
     },
-    ui: { basePath: 'yyz', integrationsPopoverOpen: null, lastRefresh: 125 },
+    ui: {
+      basePath: 'yyz',
+      integrationsPopoverOpen: null,
+      lastRefresh: 125,
+    },
   };
 
   it('selects base path from state', () => {
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
index 1792c84c45220..08d1e8c8ca36d 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
@@ -6,11 +6,13 @@
 
 import { AppState } from '../../state';
 
+// UI Selectors
 export const getBasePath = ({ ui: { basePath } }: AppState) => basePath;
 
 export const isIntegrationsPopupOpen = ({ ui: { integrationsPopoverOpen } }: AppState) =>
   integrationsPopoverOpen;
 
+// Monitor Selectors
 export const getMonitorDetails = (state: AppState, summary: any) => {
   return state.monitor.monitorDetailsList[summary.monitor_id];
 };
diff --git a/x-pack/legacy/plugins/uptime/public/uptime_app.tsx b/x-pack/legacy/plugins/uptime/public/uptime_app.tsx
index 47743729c1e76..cecbfe375f5fe 100644
--- a/x-pack/legacy/plugins/uptime/public/uptime_app.tsx
+++ b/x-pack/legacy/plugins/uptime/public/uptime_app.tsx
@@ -13,12 +13,13 @@ import React, { useEffect, useState } from 'react';
 import { ApolloProvider } from 'react-apollo';
 import { Provider as ReduxProvider } from 'react-redux';
 import { BrowserRouter as Router, Route, RouteComponentProps, Switch } from 'react-router-dom';
-import { I18nStart, ChromeBreadcrumb } from 'src/core/public';
-import { AutocompleteProviderRegister } from 'src/plugins/data/public';
+import { I18nStart, ChromeBreadcrumb, LegacyCoreStart } from 'src/core/public';
+import { PluginsStart } from 'ui/new_platform/new_platform';
+import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
 import { UMGraphQLClient, UMUpdateBreadcrumbs, UMUpdateBadge } from './lib/lib';
 import { MonitorPage, OverviewPage, NotFoundPage } from './pages';
 import { UptimeRefreshContext, UptimeSettingsContext, UMSettingsContextValues } from './contexts';
-import { UptimeDatePicker } from './components/functional/uptime_date_picker';
+import { UptimeDatePicker, CommonlyUsedRange } from './components/functional/uptime_date_picker';
 import { useUrlParams } from './hooks';
 import { getTitle } from './lib/helper/get_title';
 import { store } from './state';
@@ -37,34 +38,34 @@ export interface UptimeAppProps {
   basePath: string;
   canSave: boolean;
   client: UMGraphQLClient;
+  core: LegacyCoreStart;
   darkMode: boolean;
-  autocomplete: Pick<AutocompleteProviderRegister, 'getProvider'>;
   i18n: I18nStart;
   isApmAvailable: boolean;
   isInfraAvailable: boolean;
   isLogsAvailable: boolean;
   kibanaBreadcrumbs: ChromeBreadcrumb[];
-  logMonitorPageLoad: () => void;
-  logOverviewPageLoad: () => void;
+  plugins: PluginsStart;
   routerBasename: string;
   setBreadcrumbs: UMUpdateBreadcrumbs;
   setBadge: UMUpdateBadge;
   renderGlobalHelpControls(): void;
+  commonlyUsedRanges: CommonlyUsedRange[];
 }
 
 const Application = (props: UptimeAppProps) => {
   const {
-    autocomplete,
     basePath,
     canSave,
     client,
+    core,
     darkMode,
+    commonlyUsedRanges,
     i18n: i18nCore,
     isApmAvailable,
     isInfraAvailable,
     isLogsAvailable,
-    logMonitorPageLoad,
-    logOverviewPageLoad,
+    plugins,
     renderGlobalHelpControls,
     routerBasename,
     setBreadcrumbs,
@@ -109,7 +110,7 @@ const Application = (props: UptimeAppProps) => {
           }
         : undefined
     );
-  }, []);
+  }, [canSave, renderGlobalHelpControls, setBadge]);
 
   useEffect(() => {
     document.title = getTitle();
@@ -154,66 +155,70 @@ const Application = (props: UptimeAppProps) => {
   return (
     <i18nCore.Context>
       <ReduxProvider store={store}>
-        <Router basename={routerBasename}>
-          <Route
-            path="/"
-            render={(rootRouteProps: RouteComponentProps) => {
-              return (
-                <ApolloProvider client={client}>
-                  <UptimeRefreshContext.Provider value={{ lastRefresh, ...rootRouteProps }}>
-                    <UptimeSettingsContext.Provider value={initializeSettingsContextValues()}>
-                      <EuiPage className="app-wrapper-panel " data-test-subj="uptimeApp">
-                        <main>
-                          <EuiFlexGroup
-                            alignItems="center"
-                            justifyContent="spaceBetween"
-                            gutterSize="s"
-                          >
-                            <EuiFlexItem>
-                              <EuiTitle>
-                                <h1>{headingText}</h1>
-                              </EuiTitle>
-                            </EuiFlexItem>
-                            <EuiFlexItem grow={false}>
-                              <UptimeDatePicker refreshApp={refreshApp} {...rootRouteProps} />
-                            </EuiFlexItem>
-                          </EuiFlexGroup>
-                          <EuiSpacer size="s" />
-                          <Switch>
-                            <Route
-                              path="/monitor/:monitorId/:location?"
-                              render={routerProps => (
-                                <MonitorPage
-                                  logMonitorPageLoad={logMonitorPageLoad}
-                                  query={client.query}
-                                  setBreadcrumbs={setBreadcrumbs}
-                                  {...routerProps}
-                                />
-                              )}
-                            />
-                            <Route
-                              path="/"
-                              render={routerProps => (
-                                <OverviewPage
-                                  autocomplete={autocomplete}
-                                  basePath={basePath}
-                                  logOverviewPageLoad={logOverviewPageLoad}
-                                  setBreadcrumbs={setBreadcrumbs}
-                                  {...routerProps}
+        <KibanaContextProvider services={{ ...core, ...plugins }}>
+          <Router basename={routerBasename}>
+            <Route
+              path="/"
+              render={(rootRouteProps: RouteComponentProps) => {
+                return (
+                  <ApolloProvider client={client}>
+                    <UptimeRefreshContext.Provider value={{ lastRefresh, ...rootRouteProps }}>
+                      <UptimeSettingsContext.Provider value={initializeSettingsContextValues()}>
+                        <EuiPage className="app-wrapper-panel " data-test-subj="uptimeApp">
+                          <main>
+                            <EuiFlexGroup
+                              alignItems="center"
+                              justifyContent="spaceBetween"
+                              gutterSize="s"
+                            >
+                              <EuiFlexItem>
+                                <EuiTitle>
+                                  <h1>{headingText}</h1>
+                                </EuiTitle>
+                              </EuiFlexItem>
+                              <EuiFlexItem grow={false}>
+                                <UptimeDatePicker
+                                  refreshApp={refreshApp}
+                                  commonlyUsedRanges={commonlyUsedRanges}
+                                  {...rootRouteProps}
                                 />
-                              )}
-                            />
-                            <Route component={NotFoundPage} />
-                          </Switch>
-                        </main>
-                      </EuiPage>
-                    </UptimeSettingsContext.Provider>
-                  </UptimeRefreshContext.Provider>
-                </ApolloProvider>
-              );
-            }}
-          />
-        </Router>
+                              </EuiFlexItem>
+                            </EuiFlexGroup>
+                            <EuiSpacer size="s" />
+                            <Switch>
+                              <Route
+                                path="/monitor/:monitorId/:location?"
+                                render={routerProps => (
+                                  <MonitorPage
+                                    query={client.query}
+                                    setBreadcrumbs={setBreadcrumbs}
+                                    {...routerProps}
+                                  />
+                                )}
+                              />
+                              <Route
+                                path="/"
+                                render={routerProps => (
+                                  <OverviewPage
+                                    autocomplete={plugins.data.autocomplete}
+                                    basePath={basePath}
+                                    setBreadcrumbs={setBreadcrumbs}
+                                    {...routerProps}
+                                  />
+                                )}
+                              />
+                              <Route component={NotFoundPage} />
+                            </Switch>
+                          </main>
+                        </EuiPage>
+                      </UptimeSettingsContext.Provider>
+                    </UptimeRefreshContext.Provider>
+                  </ApolloProvider>
+                );
+              }}
+            />
+          </Router>
+        </KibanaContextProvider>
       </ReduxProvider>
     </i18nCore.Context>
   );
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/monitor_states/resolvers.ts b/x-pack/legacy/plugins/uptime/server/graphql/monitor_states/resolvers.ts
index 8fbf3529dbe24..8ddb07b3093d0 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/monitor_states/resolvers.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/monitor_states/resolvers.ts
@@ -39,9 +39,9 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
   return {
     Query: {
       async getMonitorStates(
-        resolver,
+        _resolver,
         { dateRangeStart, dateRangeEnd, filters, pagination, statusFilter },
-        { req }
+        { APICaller }
       ): Promise<MonitorSummaryResult> {
         const decodedPagination = pagination
           ? JSON.parse(decodeURIComponent(pagination))
@@ -50,15 +50,18 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
           totalSummaryCount,
           { summaries, nextPagePagination, prevPagePagination },
         ] = await Promise.all([
-          libs.pings.getDocCount(req),
-          libs.monitorStates.getMonitorStates(
-            req,
+          libs.pings.getDocCount({ callES: APICaller }),
+          libs.monitorStates.getMonitorStates({
+            callES: APICaller,
             dateRangeStart,
             dateRangeEnd,
-            decodedPagination,
+            pagination: decodedPagination,
             filters,
-            statusFilter
-          ),
+            // this is added to make typescript happy,
+            // this sort of reassignment used to be further downstream but I've moved it here
+            // because this code is going to be decomissioned soon
+            statusFilter: statusFilter || undefined,
+          }),
         ]);
         return {
           summaries,
@@ -67,8 +70,8 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
           totalSummaryCount,
         };
       },
-      async getStatesIndexStatus(resolver, {}, { req }): Promise<StatesIndexStatus> {
-        return await libs.monitorStates.statesIndexExists(req);
+      async getStatesIndexStatus(_resolver, {}, { APICaller }): Promise<StatesIndexStatus> {
+        return await libs.monitorStates.statesIndexExists({ callES: APICaller });
       },
     },
   };
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 415afc87e201e..8b685d8e08a2b 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts
@@ -71,54 +71,62 @@ export const createMonitorsResolvers: CreateUMGraphQLResolvers = (
 } => ({
   Query: {
     async getSnapshotHistogram(
-      resolver,
+      _resolver,
       { dateRangeStart, dateRangeEnd, filters, monitorId, statusFilter },
-      { req }
+      { APICaller }
     ): Promise<HistogramResult> {
-      return await libs.pings.getPingHistogram(
-        req,
+      return await libs.pings.getPingHistogram({
+        callES: APICaller,
         dateRangeStart,
         dateRangeEnd,
         filters,
         monitorId,
-        statusFilter
-      );
+        statusFilter,
+      });
     },
     async getMonitorChartsData(
-      resolver,
+      _resolver,
       { monitorId, dateRangeStart, dateRangeEnd, location },
-      { req }
+      { APICaller }
     ): Promise<MonitorChart> {
-      return await libs.monitors.getMonitorChartsData(
-        req,
+      return await libs.monitors.getMonitorChartsData({
+        callES: APICaller,
         monitorId,
         dateRangeStart,
         dateRangeEnd,
-        location
-      );
+        location,
+      });
     },
     async getLatestMonitors(
-      resolver,
+      _resolver,
       { dateRangeStart, dateRangeEnd, monitorId, location },
-      { req }
+      { APICaller }
     ): Promise<Ping[]> {
-      return await libs.pings.getLatestMonitorDocs(
-        req,
+      return await libs.pings.getLatestMonitorDocs({
+        callES: APICaller,
         dateRangeStart,
         dateRangeEnd,
         monitorId,
-        location
-      );
+        location,
+      });
     },
-    async getFilterBar(resolver, { dateRangeStart, dateRangeEnd }, { req }): Promise<FilterBar> {
-      return await libs.monitors.getFilterBar(req, dateRangeStart, dateRangeEnd);
+    async getFilterBar(
+      _resolver,
+      { dateRangeStart, dateRangeEnd },
+      { APICaller }
+    ): Promise<FilterBar> {
+      return await libs.monitors.getFilterBar({
+        callES: APICaller,
+        dateRangeStart,
+        dateRangeEnd,
+      });
     },
     async getMonitorPageTitle(
-      resolver: any,
+      _resolver: any,
       { monitorId },
-      { req }
+      { APICaller }
     ): Promise<MonitorPageTitle | null> {
-      return await libs.monitors.getMonitorPageTitle(req, monitorId);
+      return await libs.monitors.getMonitorPageTitle({ callES: APICaller, monitorId });
     },
   },
 });
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/pings/resolvers.ts b/x-pack/legacy/plugins/uptime/server/graphql/pings/resolvers.ts
index 066080cec353f..373e1467433a2 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/pings/resolvers.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/pings/resolvers.ts
@@ -34,23 +34,23 @@ export const createPingsResolvers: CreateUMGraphQLResolvers = (
 } => ({
   Query: {
     async allPings(
-      resolver,
+      _resolver,
       { monitorId, sort, size, status, dateRangeStart, dateRangeEnd, location },
-      { req }
+      { APICaller }
     ): Promise<PingResults> {
-      return await libs.pings.getAll(
-        req,
+      return await libs.pings.getAll({
+        callES: APICaller,
         dateRangeStart,
         dateRangeEnd,
         monitorId,
         status,
         sort,
         size,
-        location
-      );
+        location,
+      });
     },
-    async getDocCount(resolver, args, { req }): Promise<DocCount> {
-      return libs.pings.getDocCount(req);
+    async getDocCount(_resolver, _args, { APICaller }): Promise<DocCount> {
+      return libs.pings.getDocCount({ callES: APICaller });
     },
   },
 });
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/types.ts b/x-pack/legacy/plugins/uptime/server/graphql/types.ts
index cb7634ff42b4c..529ab41a62b3b 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/types.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/types.ts
@@ -4,12 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Request } from 'hapi';
+import { RequestHandlerContext, CallAPIOptions } from 'kibana/server';
 import { UMServerLibs } from '../lib/lib';
 
-export interface UMContext {
-  req: Request;
-}
+export type UMContext = RequestHandlerContext & {
+  APICaller: (
+    endpoint: string,
+    clientParams?: Record<string, any>,
+    options?: CallAPIOptions | undefined
+  ) => Promise<any>;
+};
 
 export interface UMGraphQLResolver {
   Query?: any;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/database/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/database/adapter_types.ts
deleted file mode 100644
index ace86cf946043..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/database/adapter_types.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 { CountParams, CountResponse } from 'elasticsearch';
-
-export interface HistogramQueryResult {
-  key: number;
-  doc_count: number;
-  bucket_total: {
-    value: number;
-  };
-  down: {
-    bucket_count: {
-      value: number;
-    };
-  };
-}
-
-export interface UMESBucket {
-  key: number;
-}
-
-export interface UMESHistogramBucket {
-  x: number;
-  x0: number;
-}
-
-export interface DatabaseAdapter {
-  count(request: any, params: CountParams): Promise<CountResponse>;
-  search(request: any, params: any): Promise<any>;
-  head(request: any, params: any): Promise<any>;
-}
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/database/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/database/index.ts
deleted file mode 100644
index 4e09b5d0e9e2d..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/database/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 './adapter_types';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/database/kibana_database_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/database/kibana_database_adapter.ts
deleted file mode 100644
index 4b2523503fc8f..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/database/kibana_database_adapter.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { DatabaseAdapter } from './adapter_types';
-
-interface KibanaElasticsearchPlugin {
-  getCluster: (clusterName: 'admin' | 'data') => any;
-  callWithRequest: (request: any, action: string, params: any) => any;
-}
-
-export class UMKibanaDatabaseAdapter implements DatabaseAdapter {
-  private elasticsearch: KibanaElasticsearchPlugin;
-
-  constructor(kbnElasticsearch: KibanaElasticsearchPlugin) {
-    this.elasticsearch = kbnElasticsearch.getCluster('data');
-  }
-
-  public async search(request: any, params: any): Promise<any> {
-    return this.elasticsearch.callWithRequest(request, 'search', params);
-  }
-
-  public async count(request: any, params: any): Promise<any> {
-    return this.elasticsearch.callWithRequest(request, 'count', params);
-  }
-
-  public async head(request: any, params: { index: string }): Promise<any> {
-    return this.elasticsearch.callWithRequest(request, 'indices.exists', params);
-  }
-}
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
index e67f4fa59531c..b490bf17e292c 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
@@ -5,10 +5,16 @@
  */
 
 import { GraphQLSchema } from 'graphql';
-import { SavedObjectsLegacyService, RequestHandler, IRouter } from 'src/core/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import {
+  SavedObjectsLegacyService,
+  RequestHandler,
+  IRouter,
+  CallAPIOptions,
+  SavedObjectsClientContract,
+} from 'src/core/server';
 import { ObjectType } from '@kbn/config-schema';
-import { UMRouteDefinition } from '../../../rest_api';
+import { UMKibanaRoute } from '../../../rest_api';
 
 export interface UMFrameworkRouteOptions<
   P extends ObjectType,
@@ -22,19 +28,32 @@ export interface UMFrameworkRouteOptions<
   validate: any;
 }
 
+type APICaller = (
+  endpoint: string,
+  clientParams: Record<string, any>,
+  options?: CallAPIOptions
+) => Promise<any>;
+
+export type UMElasticsearchQueryFn<P, R = any> = (
+  params: { callES: APICaller } & P
+) => Promise<R> | R;
+
+export type UMSavedObjectsQueryFn<T = any, P = undefined> = (
+  client: SavedObjectsClientContract,
+  params: P
+) => Promise<T> | T;
+
 export interface UptimeCoreSetup {
   route: IRouter;
 }
 
 export interface UptimeCorePlugins {
-  elasticsearch: any;
   savedObjects: SavedObjectsLegacyService<any>;
   usageCollection: UsageCollectionSetup;
   xpack: any;
 }
 
 export interface UMBackendFrameworkAdapter {
-  registerRoute(route: UMRouteDefinition): void;
+  registerRoute(route: UMKibanaRoute): void;
   registerGraphQLEndpoint(routePath: string, schema: GraphQLSchema): void;
-  getSavedObjectsClient(): any;
 }
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/kibana_framework_adapter.ts
index a46a7e11bd738..7ac3db9d0f3d7 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -7,20 +7,16 @@
 import { GraphQLSchema } from 'graphql';
 import { schema as kbnSchema } from '@kbn/config-schema';
 import { runHttpQuery } from 'apollo-server-core';
-import { UptimeCorePlugins, UptimeCoreSetup } from './adapter_types';
+import { UptimeCoreSetup } from './adapter_types';
 import { UMBackendFrameworkAdapter } from './adapter_types';
-import { UMRouteDefinition } from '../../../rest_api';
+import { UMKibanaRoute } from '../../../rest_api';
 
 export class UMKibanaBackendFrameworkAdapter implements UMBackendFrameworkAdapter {
-  constructor(
-    private readonly server: UptimeCoreSetup,
-    private readonly plugins: UptimeCorePlugins
-  ) {
+  constructor(private readonly server: UptimeCoreSetup) {
     this.server = server;
-    this.plugins = plugins;
   }
 
-  public registerRoute({ handler, method, options, path, validate }: UMRouteDefinition) {
+  public registerRoute({ handler, method, options, path, validate }: UMKibanaRoute) {
     const routeDefinition = {
       path,
       validate,
@@ -39,16 +35,6 @@ export class UMKibanaBackendFrameworkAdapter implements UMBackendFrameworkAdapte
   }
 
   public registerGraphQLEndpoint(routePath: string, schema: GraphQLSchema): void {
-    const options = {
-      graphQLOptions: (req: any) => ({
-        context: { req },
-        schema,
-      }),
-      path: routePath,
-      route: {
-        tags: ['access:uptime'],
-      },
-    };
     this.server.route.post(
       {
         path: routePath,
@@ -64,6 +50,25 @@ export class UMKibanaBackendFrameworkAdapter implements UMBackendFrameworkAdapte
         },
       },
       async (context, request, resp): Promise<any> => {
+        const {
+          core: {
+            elasticsearch: {
+              dataClient: { callAsCurrentUser },
+            },
+          },
+        } = context;
+        const options = {
+          graphQLOptions: (_req: any) => {
+            return {
+              context: { ...context, APICaller: callAsCurrentUser },
+              schema,
+            };
+          },
+          path: routePath,
+          route: {
+            tags: ['access:uptime'],
+          },
+        };
         try {
           const query = request.body as Record<string, any>;
 
@@ -91,12 +96,4 @@ export class UMKibanaBackendFrameworkAdapter implements UMBackendFrameworkAdapte
       }
     );
   }
-
-  public getSavedObjectsClient() {
-    const { elasticsearch, savedObjects } = this.plugins;
-    const { SavedObjectsClient, getSavedObjectsRepository } = savedObjects;
-    const { callWithInternalUser } = elasticsearch.getCluster('admin');
-    const internalRepository = getSavedObjectsRepository(callWithInternalUser);
-    return new SavedObjectsClient(internalRepository);
-  }
 }
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/index.ts
index 2a88df91adc29..f5ff3b8c62ba9 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/index.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './database';
 export * from './framework';
 export * from './monitor_states';
 export * from './monitors';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/adapter_types.ts
index 57b1744f5d324..4104a9287a28d 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/adapter_types.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/adapter_types.ts
@@ -6,28 +6,32 @@
 
 import {
   MonitorSummary,
-  StatesIndexStatus,
   CursorDirection,
   SortOrder,
+  StatesIndexStatus,
 } from '../../../../common/graphql/types';
+import { UMElasticsearchQueryFn } from '../framework';
+import { Snapshot } from '../../../../common/runtime_types';
+
+export interface MonitorStatesParams {
+  dateRangeStart: string;
+  dateRangeEnd: string;
+  pagination?: CursorPagination;
+  filters?: string | null;
+  statusFilter?: string;
+}
+
+export interface GetSnapshotCountParams {
+  dateRangeStart: string;
+  dateRangeEnd: string;
+  filters?: string | null;
+  statusFilter?: string;
+}
 
 export interface UMMonitorStatesAdapter {
-  getMonitorStates(
-    request: any,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    pagination?: CursorPagination,
-    filters?: string | null,
-    statusFilter?: string | null
-  ): Promise<GetMonitorStatesResult>;
-  statesIndexExists(request: any): Promise<StatesIndexStatus>;
-  getSnapshotCount(
-    request: any,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    filters?: string,
-    statusFilter?: string
-  ): Promise<any>;
+  getMonitorStates: UMElasticsearchQueryFn<MonitorStatesParams, GetMonitorStatesResult>;
+  getSnapshotCount: UMElasticsearchQueryFn<GetSnapshotCountParams, Snapshot>;
+  statesIndexExists: UMElasticsearchQueryFn<{}, StatesIndexStatus>;
 }
 
 export interface CursorPagination {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts
index c3593854fa53f..d264da2e7ec0c 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts
@@ -4,18 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { DatabaseAdapter } from '../database';
-import { UMMonitorStatesAdapter, GetMonitorStatesResult, CursorPagination } from './adapter_types';
-import { StatesIndexStatus } from '../../../../common/graphql/types';
+import { UMMonitorStatesAdapter, CursorPagination } from './adapter_types';
 import { INDEX_NAMES, CONTEXT_DEFAULTS } from '../../../../common/constants';
 import { fetchPage } from './search';
 import { MonitorGroupIterator } from './search/monitor_group_iterator';
-import { Snapshot } from '../../../../common/runtime_types';
 import { getSnapshotCountHelper } from './get_snapshot_helper';
 
 export interface QueryContext {
-  database: any;
-  request: any;
+  count: (query: Record<string, any>) => Promise<any>;
+  search: (query: Record<string, any>) => Promise<any>;
   dateRangeStart: string;
   dateRangeEnd: string;
   pagination: CursorPagination;
@@ -24,25 +21,23 @@ export interface QueryContext {
   statusFilter?: string;
 }
 
-export class ElasticsearchMonitorStatesAdapter implements UMMonitorStatesAdapter {
-  constructor(private readonly database: DatabaseAdapter) {
-    this.database = database;
-  }
-
+export const elasticsearchMonitorStatesAdapter: UMMonitorStatesAdapter = {
   // Gets a page of monitor states.
-  public async getMonitorStates(
-    request: any,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    pagination: CursorPagination = CONTEXT_DEFAULTS.CURSOR_PAGINATION,
-    filters?: string | null,
-    statusFilter?: string
-  ): Promise<GetMonitorStatesResult> {
+  getMonitorStates: async ({
+    callES,
+    dateRangeStart,
+    dateRangeEnd,
+    pagination,
+    filters,
+    statusFilter,
+  }) => {
+    pagination = pagination || CONTEXT_DEFAULTS.CURSOR_PAGINATION;
+    statusFilter = statusFilter === null ? undefined : statusFilter;
     const size = 10;
 
     const queryContext: QueryContext = {
-      database: this.database,
-      request,
+      count: (query: Record<string, any>): Promise<any> => callES('count', query),
+      search: (query: Record<string, any>): Promise<any> => callES('search', query),
       dateRangeStart,
       dateRangeEnd,
       pagination,
@@ -58,18 +53,12 @@ export class ElasticsearchMonitorStatesAdapter implements UMMonitorStatesAdapter
       nextPagePagination: jsonifyPagination(page.nextPagePagination),
       prevPagePagination: jsonifyPagination(page.prevPagePagination),
     };
-  }
+  },
 
-  public async getSnapshotCount(
-    request: any,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    filters?: string,
-    statusFilter?: string
-  ): Promise<Snapshot> {
+  getSnapshotCount: async ({ callES, dateRangeStart, dateRangeEnd, filters, statusFilter }) => {
     const context: QueryContext = {
-      database: this.database,
-      request,
+      count: query => callES('count', query),
+      search: query => callES('search', query),
       dateRangeStart,
       dateRangeEnd,
       pagination: CONTEXT_DEFAULTS.CURSOR_PAGINATION,
@@ -78,22 +67,22 @@ export class ElasticsearchMonitorStatesAdapter implements UMMonitorStatesAdapter
       statusFilter,
     };
     return getSnapshotCountHelper(new MonitorGroupIterator(context));
-  }
+  },
 
-  public async statesIndexExists(request: any): Promise<StatesIndexStatus> {
+  statesIndexExists: async ({ callES }) => {
     // TODO: adapt this to the states index in future release
     const {
       _shards: { total },
       count,
-    } = await this.database.count(request, { index: INDEX_NAMES.HEARTBEAT });
+    } = await callES('count', { index: INDEX_NAMES.HEARTBEAT });
     return {
       indexExists: total > 0,
       docCount: {
         count,
       },
     };
-  }
-}
+  },
+};
 
 // To simplify the handling of the group of pagination vars they're passed back to the client as a string
 const jsonifyPagination = (p: any): string | null => {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/index.ts
index f23cacce7bbbe..a3fc71ad48cb3 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/index.ts
@@ -5,4 +5,4 @@
  */
 
 export * from './adapter_types';
-export { ElasticsearchMonitorStatesAdapter } from './elasticsearch_monitor_states_adapter';
+export { elasticsearchMonitorStatesAdapter } from './elasticsearch_monitor_states_adapter';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/test_helpers.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/test_helpers.ts
index 0c3572604879e..d6fe5f82e735d 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/test_helpers.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/test_helpers.ts
@@ -24,12 +24,12 @@ export const nextPagination = (key: any): CursorPagination => {
 };
 export const simpleQueryContext = (): QueryContext => {
   return {
-    database: undefined,
+    count: _query => new Promise(r => ({})),
+    search: _query => new Promise(r => ({})),
     dateRangeEnd: '',
     dateRangeStart: '',
     filterClause: undefined,
     pagination: nextPagination('something'),
-    request: undefined,
     size: 0,
     statusFilter: '',
   };
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 6b594d8b49118..093e105635c2c 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
@@ -243,7 +243,7 @@ export const enrichMonitorGroups: MonitorEnricher = async (
     },
   };
 
-  const items = await queryContext.database.search(queryContext.request, params);
+  const items = await queryContext.search(params);
 
   const monitorBuckets = get(items, 'aggregations.monitors.buckets', []);
 
@@ -345,7 +345,7 @@ const getHistogramForMonitors = async (
       },
     },
   };
-  const result = await queryContext.database.search(queryContext.request, params);
+  const result = await queryContext.search(params);
 
   const buckets: any[] = get(result, 'aggregations.by_id.buckets', []);
   return buckets.reduce((map: { [key: string]: any }, item: any) => {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/find_potential_matches.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/find_potential_matches.ts
index 002dc2862fa1b..8f5e26b75f56c 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/find_potential_matches.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/find_potential_matches.ts
@@ -62,7 +62,7 @@ const query = async (queryContext: QueryContext, searchAfter: any, size: number)
     body,
   };
 
-  return await queryContext.database.search(queryContext.request, params);
+  return await queryContext.search(params);
 };
 
 const queryBody = (queryContext: QueryContext, searchAfter: any, size: number) => {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/refine_potential_matches.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/refine_potential_matches.ts
index 3bdd6fe616f18..b0060cbee17bb 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/refine_potential_matches.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/refine_potential_matches.ts
@@ -95,7 +95,7 @@ const fullyMatchingIds = async (
 export const mostRecentCheckGroups = async (
   queryContext: QueryContext,
   potentialMatchMonitorIDs: string[]
-) => {
+): Promise<any> => {
   const params = {
     index: INDEX_NAMES.HEARTBEAT,
     body: {
@@ -134,5 +134,5 @@ export const mostRecentCheckGroups = async (
     },
   };
 
-  return await queryContext.database.search(queryContext.request, params);
+  return await queryContext.search(params);
 };
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 99349f42d5750..7f0eb86dae751 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
@@ -2,7 +2,7 @@
 
 exports[`ElasticsearchMonitorsAdapter getMonitorChartsData will provide expected filters when a location is specified 1`] = `
 Array [
-  Object {},
+  "search",
   Object {
     "body": Object {
       "aggs": Object {
@@ -74,7 +74,7 @@ Array [
 
 exports[`ElasticsearchMonitorsAdapter getMonitorChartsData will run expected parameters when no location is specified 1`] = `
 Array [
-  Object {},
+  "search",
   Object {
     "body": Object {
       "aggs": Object {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/elasticsearch_monitors_adapter.test.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/elasticsearch_monitors_adapter.test.ts
index b21fb982bfb3b..e3e81fe360718 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/elasticsearch_monitors_adapter.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/elasticsearch_monitors_adapter.test.ts
@@ -5,38 +5,22 @@
  */
 
 import { get, set } from 'lodash';
-import { ElasticsearchMonitorsAdapter } from '../elasticsearch_monitors_adapter';
-import { CountParams, CountResponse } from 'elasticsearch';
+import { elasticsearchMonitorsAdapter as adapter } from '../elasticsearch_monitors_adapter';
 import mockChartsData from './monitor_charts_mock.json';
 import { assertCloseTo } from '../../../helper';
 
 // FIXME: there are many untested functions in this adapter. They should be tested.
 describe('ElasticsearchMonitorsAdapter', () => {
-  let defaultCountResponse: CountResponse;
-
-  beforeEach(() => {
-    defaultCountResponse = {
-      count: 0,
-      _shards: {
-        total: 0,
-        successful: 0,
-        failed: 0,
-        skipped: 0,
-      },
-    };
-  });
-
   it('getMonitorChartsData will run expected parameters when no location is specified', async () => {
     expect.assertions(3);
     const searchMock = jest.fn();
     const search = searchMock.bind({});
-    const database = {
-      search,
-      count: async (request: any, params: CountParams) => defaultCountResponse,
-      head: async (request: any, params: any) => null,
-    };
-    const adapter = new ElasticsearchMonitorsAdapter(database);
-    await adapter.getMonitorChartsData({}, 'fooID', 'now-15m', 'now');
+    await adapter.getMonitorChartsData({
+      callES: search,
+      monitorId: 'fooID',
+      dateRangeStart: 'now-15m',
+      dateRangeEnd: 'now',
+    });
     expect(searchMock).toHaveBeenCalledTimes(1);
     // protect against possible rounding errors polluting the snapshot comparison
     const fixedInterval = parseInt(
@@ -66,13 +50,13 @@ describe('ElasticsearchMonitorsAdapter', () => {
     expect.assertions(3);
     const searchMock = jest.fn();
     const search = searchMock.bind({});
-    const database = {
-      search,
-      count: async (request: any, params: CountParams) => defaultCountResponse,
-      head: async (request: any, params: any) => null,
-    };
-    const adapter = new ElasticsearchMonitorsAdapter(database);
-    await adapter.getMonitorChartsData({}, 'fooID', 'now-15m', 'now', 'Philadelphia');
+    await adapter.getMonitorChartsData({
+      callES: search,
+      monitorId: 'fooID',
+      dateRangeStart: 'now-15m',
+      dateRangeEnd: 'now',
+      location: 'Philadelphia',
+    });
     expect(searchMock).toHaveBeenCalledTimes(1);
     // protect against possible rounding errors polluting the snapshot comparison
     const fixedInterval = parseInt(
@@ -101,12 +85,14 @@ describe('ElasticsearchMonitorsAdapter', () => {
   it('inserts empty buckets for missing data', async () => {
     const searchMock = jest.fn();
     searchMock.mockReturnValue(mockChartsData);
-    const database = {
-      search: searchMock,
-      count: jest.fn(),
-      head: jest.fn(),
-    };
-    const adapter = new ElasticsearchMonitorsAdapter(database);
-    expect(await adapter.getMonitorChartsData({}, 'id', 'now-15m', 'now')).toMatchSnapshot();
+    const search = searchMock.bind({});
+    expect(
+      await adapter.getMonitorChartsData({
+        callES: search,
+        monitorId: 'id',
+        dateRangeStart: 'now-15m',
+        dateRangeEnd: 'now',
+      })
+    ).toMatchSnapshot();
   });
 });
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts
index 1191eb813a214..99d346e5d666e 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts
@@ -5,22 +5,59 @@
  */
 
 import { MonitorChart, MonitorPageTitle } from '../../../../common/graphql/types';
+import { UMElasticsearchQueryFn } from '../framework';
+import { MonitorDetails, MonitorLocations } from '../../../../common/runtime_types';
+
+export interface GetMonitorChartsDataParams {
+  /** @member monitorId ID value for the selected monitor */
+  monitorId: string;
+  /** @member dateRangeStart timestamp bounds */
+  dateRangeStart: string;
+  /** @member dateRangeEnd timestamp bounds */
+  dateRangeEnd: string;
+  /** @member location optional location value for use in filtering*/
+  location?: string | null;
+}
+
+export interface GetFilterBarParams {
+  dateRangeStart: string;
+  /** @member dateRangeEnd timestamp bounds */
+  dateRangeEnd: string;
+}
+
+export interface GetMonitorDetailsParams {
+  monitorId: string;
+  dateStart: string;
+  dateEnd: string;
+}
+
+export interface GetMonitorPageTitleParams {
+  /** @member monitorId the ID to query */
+  monitorId: string;
+}
+
+/**
+ * Fetch data for the monitor page title.
+ */
+export interface GetMonitorLocationsParams {
+  /**
+   * @member monitorId the ID to query
+   */
+  monitorId: string;
+  dateStart: string;
+  dateEnd: string;
+}
 
 export interface UMMonitorsAdapter {
-  getMonitorChartsData(
-    request: any,
-    monitorId: string,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    location?: string | null
-  ): Promise<MonitorChart>;
-  getFilterBar(request: any, dateRangeStart: string, dateRangeEnd: string): Promise<any>;
-  getMonitorPageTitle(request: any, monitorId: string): Promise<MonitorPageTitle | null>;
-  getMonitorDetails(request: any, monitorId: string): Promise<any>;
-  getMonitorLocations(
-    request: any,
-    monitorId: string,
-    dateStart: string,
-    dateEnd: string
-  ): Promise<any>;
+  /**
+   * Fetches data used to populate monitor charts
+   */
+  getMonitorChartsData: UMElasticsearchQueryFn<GetMonitorChartsDataParams, MonitorChart>;
+  getFilterBar: UMElasticsearchQueryFn<GetFilterBarParams, any>;
+  /**
+   * Fetch data for the monitor page title.
+   */
+  getMonitorPageTitle: UMElasticsearchQueryFn<{ monitorId: string }, MonitorPageTitle | null>;
+  getMonitorDetails: UMElasticsearchQueryFn<GetMonitorDetailsParams, MonitorDetails>;
+  getMonitorLocations: UMElasticsearchQueryFn<GetMonitorLocationsParams, MonitorLocations>;
 }
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 4009a4b1331fa..5f4c2e45d9759 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
@@ -6,22 +6,10 @@
 
 import { get } from 'lodash';
 import { INDEX_NAMES } from '../../../../common/constants';
-import {
-  FilterBar,
-  MonitorChart,
-  MonitorPageTitle,
-  Ping,
-  LocationDurationLine,
-} from '../../../../common/graphql/types';
+import { MonitorChart, Ping, LocationDurationLine } from '../../../../common/graphql/types';
 import { getHistogramIntervalFormatted } from '../../helper';
-import { DatabaseAdapter } from '../database';
+import { MonitorError, MonitorLocation } from '../../../../common/runtime_types';
 import { UMMonitorsAdapter } from './adapter_types';
-import {
-  MonitorDetails,
-  MonitorError,
-  MonitorLocations,
-  MonitorLocation,
-} from '../../../../common/runtime_types';
 
 const formatStatusBuckets = (time: any, buckets: any, docCount: any) => {
   let up = null;
@@ -43,25 +31,8 @@ const formatStatusBuckets = (time: any, buckets: any, docCount: any) => {
   };
 };
 
-export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
-  constructor(private readonly database: DatabaseAdapter) {
-    this.database = database;
-  }
-
-  /**
-   * Fetches data used to populate monitor charts
-   * @param request Kibana request
-   * @param monitorId ID value for the selected monitor
-   * @param dateRangeStart timestamp bounds
-   * @param dateRangeEnd timestamp bounds
-   */
-  public async getMonitorChartsData(
-    request: any,
-    monitorId: string,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    location?: string | null
-  ): Promise<MonitorChart> {
+export const elasticsearchMonitorsAdapter: UMMonitorsAdapter = {
+  getMonitorChartsData: async ({ callES, dateRangeStart, dateRangeEnd, monitorId, location }) => {
     const params = {
       index: INDEX_NAMES.HEARTBEAT,
       body: {
@@ -101,7 +72,7 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
       },
     };
 
-    const result = await this.database.search(request, params);
+    const result = await callES('search', params);
 
     const dateHistogramBuckets = get<any[]>(result, 'aggregations.timeseries.buckets', []);
     /**
@@ -187,19 +158,9 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
     });
 
     return monitorChartsData;
-  }
+  },
 
-  /**
-   * Fetch options for the filter bar.
-   * @param request Kibana request object
-   * @param dateRangeStart timestamp bounds
-   * @param dateRangeEnd timestamp bounds
-   */
-  public async getFilterBar(
-    request: any,
-    dateRangeStart: string,
-    dateRangeEnd: string
-  ): Promise<FilterBar> {
+  getFilterBar: async ({ callES, dateRangeStart, dateRangeEnd }) => {
     const fields: { [key: string]: string } = {
       ids: 'monitor.id',
       schemes: 'monitor.type',
@@ -225,24 +186,16 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
         }, {}),
       },
     };
-    const { aggregations } = await this.database.search(request, params);
+    const { aggregations } = await callES('search', params);
 
     return Object.keys(fields).reduce((acc: { [key: string]: any[] }, field) => {
       const bucketName = fields[field];
       acc[field] = aggregations[bucketName].buckets.map((b: { key: string | number }) => b.key);
       return acc;
     }, {});
-  }
+  },
 
-  /**
-   * Fetch data for the monitor page title.
-   * @param request Kibana server request
-   * @param monitorId the ID to query
-   */
-  public async getMonitorPageTitle(
-    request: any,
-    monitorId: string
-  ): Promise<MonitorPageTitle | null> {
+  getMonitorPageTitle: async ({ callES, monitorId }) => {
     const params = {
       index: INDEX_NAMES.HEARTBEAT,
       body: {
@@ -266,7 +219,7 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
       },
     };
 
-    const result = await this.database.search(request, params);
+    const result = await callES('search', params);
     const pageTitle: Ping | null = get(result, 'hits.hits[0]._source', null);
     if (pageTitle === null) {
       return null;
@@ -276,14 +229,25 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
       url: get(pageTitle, 'url.full', null),
       name: get(pageTitle, 'monitor.name', null),
     };
-  }
+  },
+
+  getMonitorDetails: async ({ callES, monitorId, dateStart, dateEnd }) => {
+    const queryFilters: any = [
+      {
+        range: {
+          '@timestamp': {
+            gte: dateStart,
+            lte: dateEnd,
+          },
+        },
+      },
+      {
+        term: {
+          'monitor.id': monitorId,
+        },
+      },
+    ];
 
-  /**
-   * Fetch data for the monitor page title.
-   * @param request Kibana server request
-   * @param monitorId the ID to query
-   */
-  public async getMonitorDetails(request: any, monitorId: string): Promise<MonitorDetails> {
     const params = {
       index: INDEX_NAMES.HEARTBEAT,
       body: {
@@ -298,13 +262,7 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
                 },
               },
             ],
-            filter: [
-              {
-                term: {
-                  'monitor.id': monitorId,
-                },
-              },
-            ],
+            filter: queryFilters,
           },
         },
         sort: [
@@ -317,7 +275,7 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
       },
     };
 
-    const result = await this.database.search(request, params);
+    const result = await callES('search', params);
 
     const data = result.hits.hits[0]?._source;
 
@@ -329,19 +287,14 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
       error: monitorError,
       timestamp: errorTimeStamp,
     };
-  }
+  },
 
   /**
    * Fetch data for the monitor page title.
    * @param request Kibana server request
-   * @param monitorId the ID to query
+   *
    */
-  public async getMonitorLocations(
-    request: any,
-    monitorId: string,
-    dateStart: string,
-    dateEnd: string
-  ): Promise<MonitorLocations> {
+  getMonitorLocations: async ({ callES, monitorId, dateStart, dateEnd }) => {
     const params = {
       index: INDEX_NAMES.HEARTBEAT,
       body: {
@@ -394,7 +347,7 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
       },
     };
 
-    const result = await this.database.search(request, params);
+    const result = await callES('search', params);
     const locations = result?.aggregations?.location?.buckets ?? [];
 
     const getGeo = (locGeo: any) => {
@@ -425,5 +378,5 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
       monitorId,
       locations: monLocs,
     };
-  }
-}
+  },
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/index.ts
index e1cb06aa95dce..d02068a11e8d8 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/index.ts
@@ -5,4 +5,4 @@
  */
 
 export * from './adapter_types';
-export { ElasticsearchMonitorsAdapter } from './elasticsearch_monitors_adapter';
+export { elasticsearchMonitorsAdapter } from './elasticsearch_monitors_adapter';
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 7b3c72f535401..bd1c182e938a3 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
@@ -5,14 +5,10 @@
  */
 
 import { set } from 'lodash';
-import { DatabaseAdapter } from '../../database';
-import { ElasticsearchPingsAdapter } from '../elasticsearch_pings_adapter';
+import { elasticsearchPingsAdapter as adapter } from '../elasticsearch_pings_adapter';
 import { assertCloseTo } from '../../../helper';
 
 describe('ElasticsearchPingsAdapter class', () => {
-  let database: DatabaseAdapter;
-  let adapter: ElasticsearchPingsAdapter;
-  let serverRequest: any;
   let mockHits: any[];
   let mockEsSearchResult: any;
   let mockEsCountResult: any;
@@ -77,22 +73,13 @@ describe('ElasticsearchPingsAdapter class', () => {
     mockEsCountResult = {
       count: mockHits.length,
     };
-    database = {
-      search: async (request: any, params: any) => mockEsSearchResult,
-      count: async (request: any, params: any) => mockEsCountResult,
-      head: async (request: any, params: any) => null,
-    };
-    adapter = new ElasticsearchPingsAdapter(database);
-    serverRequest = {
-      requestArgs: 'hello',
-    };
   });
 
   describe('getPingHistogram', () => {
     it('returns a single bucket if array has 1', async () => {
       expect.assertions(2);
-      const search = jest.fn();
-      search.mockReturnValue({
+      const mockEsClient = jest.fn();
+      mockEsClient.mockReturnValue({
         aggregations: {
           timeseries: {
             buckets: [
@@ -109,43 +96,41 @@ describe('ElasticsearchPingsAdapter class', () => {
           },
         },
       });
-      const pingDatabase = {
-        search,
-        count: jest.fn(),
-        head: async (request: any, params: any) => null,
-      };
-      const pingAdapter = new ElasticsearchPingsAdapter(pingDatabase);
-      const result = await pingAdapter.getPingHistogram(serverRequest, 'now-15m', 'now', null);
+      const result = await adapter.getPingHistogram({
+        callES: mockEsClient,
+        dateRangeStart: 'now-15m',
+        dateRangeEnd: 'now',
+        filters: null,
+      });
       assertCloseTo(result.interval, 36000, 100);
       result.interval = 36000;
-      expect(pingDatabase.search).toHaveBeenCalledTimes(1);
+      expect(mockEsClient).toHaveBeenCalledTimes(1);
       expect(result).toMatchSnapshot();
     });
 
     it('returns expected result for no status filter', async () => {
       expect.assertions(2);
-      const search = jest.fn();
+      const mockEsClient = jest.fn();
 
-      search.mockReturnValue(standardMockResponse);
+      mockEsClient.mockReturnValue(standardMockResponse);
 
-      const pingDatabase = {
-        search,
-        count: jest.fn(),
-        head: async (request: any, params: any) => null,
-      };
-      const pingAdapter = new ElasticsearchPingsAdapter(pingDatabase);
-      const result = await pingAdapter.getPingHistogram(serverRequest, 'now-15m', 'now', null);
+      const result = await adapter.getPingHistogram({
+        callES: mockEsClient,
+        dateRangeStart: 'now-15m',
+        dateRangeEnd: 'now',
+        filters: null,
+      });
       assertCloseTo(result.interval, 36000, 100);
       result.interval = 36000;
 
-      expect(pingDatabase.search).toHaveBeenCalledTimes(1);
+      expect(mockEsClient).toHaveBeenCalledTimes(1);
       expect(result).toMatchSnapshot();
     });
 
     it('handles status + additional user queries', async () => {
       expect.assertions(2);
-      const search = jest.fn();
-      search.mockReturnValue({
+      const mockEsClient = jest.fn();
+      mockEsClient.mockReturnValue({
         aggregations: {
           timeseries: {
             buckets: [
@@ -188,31 +173,25 @@ describe('ElasticsearchPingsAdapter class', () => {
           ],
         },
       };
-      const pingDatabase = {
-        search,
-        count: jest.fn(),
-        head: async (request: any, params: any) => null,
-      };
-      const pingAdapter = new ElasticsearchPingsAdapter(pingDatabase);
-      const result = await pingAdapter.getPingHistogram(
-        serverRequest,
-        '1234',
-        '5678',
-        JSON.stringify(searchFilter),
-        undefined,
-        'down'
-      );
+      const result = await adapter.getPingHistogram({
+        callES: mockEsClient,
+        dateRangeStart: '1234',
+        dateRangeEnd: '5678',
+        filters: JSON.stringify(searchFilter),
+        monitorId: undefined,
+        statusFilter: 'down',
+      });
       assertCloseTo(result.interval, 5609564928000, 1000);
       result.interval = 5609564928000;
 
-      expect(pingDatabase.search).toHaveBeenCalledTimes(1);
+      expect(mockEsClient).toHaveBeenCalledTimes(1);
       expect(result).toMatchSnapshot();
     });
 
     it('handles simple_text_query without issues', async () => {
       expect.assertions(2);
-      const search = jest.fn();
-      search.mockReturnValue({
+      const mockEsClient = jest.fn();
+      mockEsClient.mockReturnValue({
         aggregations: {
           timeseries: {
             buckets: [
@@ -247,89 +226,71 @@ describe('ElasticsearchPingsAdapter class', () => {
           },
         },
       });
-      const searchFilter = `{"bool":{"must":[{"simple_query_string":{"query":"http"}}]}}`;
-      const pingDatabase = {
-        search,
-        count: jest.fn(),
-        head: async (request: any, params: any) => null,
-      };
-      const pingAdapter = new ElasticsearchPingsAdapter(pingDatabase);
-      const result = await pingAdapter.getPingHistogram(
-        serverRequest,
-        'now-15m',
-        'now',
-        searchFilter
-      );
+      const filters = `{"bool":{"must":[{"simple_query_string":{"query":"http"}}]}}`;
+      const result = await adapter.getPingHistogram({
+        callES: mockEsClient,
+        dateRangeStart: 'now-15m',
+        dateRangeEnd: 'now',
+        filters,
+      });
 
       assertCloseTo(result.interval, 36000, 100);
       result.interval = 36000;
-      expect(pingDatabase.search).toHaveBeenCalledTimes(1);
+      expect(mockEsClient).toHaveBeenCalledTimes(1);
       expect(result).toMatchSnapshot();
     });
 
     it('returns a down-filtered array for when filtered by down status', async () => {
       expect.assertions(2);
-      const search = jest.fn();
-      search.mockReturnValue(standardMockResponse);
-      const pingDatabase = {
-        search,
-        count: jest.fn(),
-        head: async (request: any, params: any) => null,
-      };
-      const pingAdapter = new ElasticsearchPingsAdapter(pingDatabase);
-      const result = await pingAdapter.getPingHistogram(
-        serverRequest,
-        '1234',
-        '5678',
-        '',
-        undefined,
-        'down'
-      );
+      const mockEsClient = jest.fn();
+      mockEsClient.mockReturnValue(standardMockResponse);
+      const result = await adapter.getPingHistogram({
+        callES: mockEsClient,
+        dateRangeStart: '1234',
+        dateRangeEnd: '5678',
+        filters: '',
+        monitorId: undefined,
+        statusFilter: 'down',
+      });
       assertCloseTo(result.interval, 5609564928000, 1000);
       result.interval = 5609564928000;
 
-      expect(pingDatabase.search).toHaveBeenCalledTimes(1);
+      expect(mockEsClient).toHaveBeenCalledTimes(1);
       expect(result).toMatchSnapshot();
     });
 
     it('returns a down-filtered array for when filtered by up status', async () => {
       expect.assertions(2);
-      const search = jest.fn();
+      const mockEsClient = jest.fn();
 
-      search.mockReturnValue(standardMockResponse);
+      mockEsClient.mockReturnValue(standardMockResponse);
 
-      const pingDatabase = {
-        search,
-        count: jest.fn(),
-        head: async (request: any, params: any) => null,
-      };
-      const pingAdapter = new ElasticsearchPingsAdapter(pingDatabase);
-      const result = await pingAdapter.getPingHistogram(
-        serverRequest,
-        '1234',
-        '5678',
-        '',
-        undefined,
-        'up'
-      );
-
-      expect(pingDatabase.search).toHaveBeenCalledTimes(1);
+      const result = await adapter.getPingHistogram({
+        callES: mockEsClient,
+        dateRangeStart: '1234',
+        dateRangeEnd: '5678',
+        filters: '',
+        monitorId: undefined,
+        statusFilter: 'up',
+      });
+
+      expect(mockEsClient).toHaveBeenCalledTimes(1);
       expect(result).toMatchSnapshot();
     });
   });
 
   describe('getDocCount', () => {
     it('returns data in appropriate shape', async () => {
-      const { count } = await adapter.getDocCount(serverRequest);
+      const mockEsClient = jest.fn();
+      mockEsClient.mockReturnValue(mockEsCountResult);
+      const { count } = await adapter.getDocCount({ callES: mockEsClient });
       expect(count).toEqual(3);
     });
   });
 
   describe('getAll', () => {
-    let getAllSearchMock: (request: any, params: any) => Promise<any>;
     let expectedGetAllParams: any;
     beforeEach(() => {
-      getAllSearchMock = jest.fn(async (request: any, params: any) => mockEsSearchResult);
       expectedGetAllParams = {
         index: 'heartbeat-8*',
         body: {
@@ -354,15 +315,15 @@ describe('ElasticsearchPingsAdapter class', () => {
     });
 
     it('returns data in the appropriate shape', async () => {
-      const result = await adapter.getAll(
-        serverRequest,
-        'now-1h',
-        'now',
-        undefined,
-        undefined,
-        'asc',
-        12
-      );
+      const mockEsClient = jest.fn();
+      mockEsClient.mockReturnValue(mockEsSearchResult);
+      const result = await adapter.getAll({
+        callES: mockEsClient,
+        dateRangeStart: 'now-1h',
+        dateRangeEnd: 'now',
+        sort: 'asc',
+        size: 12,
+      });
       const count = 3;
 
       expect(result.total).toBe(count);
@@ -372,57 +333,87 @@ describe('ElasticsearchPingsAdapter class', () => {
       expect(pings[0].timestamp).toBe('2018-10-30T18:51:59.792Z');
       expect(pings[1].timestamp).toBe('2018-10-30T18:53:59.792Z');
       expect(pings[2].timestamp).toBe('2018-10-30T18:55:59.792Z');
+      expect(mockEsClient).toHaveBeenCalledTimes(1);
     });
 
     it('creates appropriate sort and size parameters', async () => {
-      database.search = getAllSearchMock;
-      await adapter.getAll(serverRequest, 'now-1h', 'now', undefined, undefined, 'asc', 12);
+      const mockEsClient = jest.fn();
+      mockEsClient.mockReturnValue(mockEsSearchResult);
+      await adapter.getAll({
+        callES: mockEsClient,
+        dateRangeStart: 'now-1h',
+        dateRangeEnd: 'now',
+        sort: 'asc',
+        size: 12,
+      });
       set(expectedGetAllParams, 'body.sort[0]', { '@timestamp': { order: 'asc' } });
 
-      expect(database.search).toHaveBeenCalledTimes(1);
-      expect(database.search).toHaveBeenCalledWith(serverRequest, expectedGetAllParams);
+      expect(mockEsClient).toHaveBeenCalledTimes(1);
+      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
     });
 
     it('omits the sort param when no sort passed', async () => {
-      database.search = getAllSearchMock;
-      await adapter.getAll(serverRequest, 'now-1h', 'now', undefined, undefined, undefined, 12);
+      const mockEsClient = jest.fn();
+      mockEsClient.mockReturnValue(mockEsSearchResult);
+      await adapter.getAll({
+        callES: mockEsClient,
+        dateRangeStart: 'now-1h',
+        dateRangeEnd: 'now',
+        size: 12,
+      });
 
-      expect(database.search).toHaveBeenCalledWith(serverRequest, expectedGetAllParams);
+      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
     });
 
     it('omits the size param when no size passed', async () => {
-      database.search = getAllSearchMock;
-      await adapter.getAll(serverRequest, 'now-1h', 'now', undefined, undefined, 'desc');
+      const mockEsClient = jest.fn();
+      mockEsClient.mockReturnValue(mockEsSearchResult);
+      await adapter.getAll({
+        callES: mockEsClient,
+        dateRangeStart: 'now-1h',
+        dateRangeEnd: 'now',
+        sort: 'desc',
+      });
       delete expectedGetAllParams.body.size;
       set(expectedGetAllParams, 'body.sort[0].@timestamp.order', 'desc');
 
-      expect(database.search).toHaveBeenCalledWith(serverRequest, expectedGetAllParams);
+      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
     });
 
     it('adds a filter for monitor ID', async () => {
-      database.search = getAllSearchMock;
-      await adapter.getAll(serverRequest, 'now-1h', 'now', 'testmonitorid');
+      const mockEsClient = jest.fn();
+      mockEsClient.mockReturnValue(mockEsSearchResult);
+      await adapter.getAll({
+        callES: mockEsClient,
+        dateRangeStart: 'now-1h',
+        dateRangeEnd: 'now',
+        monitorId: 'testmonitorid',
+      });
       delete expectedGetAllParams.body.size;
       expectedGetAllParams.body.query.bool.filter.push({ term: { 'monitor.id': 'testmonitorid' } });
 
-      expect(database.search).toHaveBeenCalledWith(serverRequest, expectedGetAllParams);
+      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
     });
 
     it('adds a filter for monitor status', async () => {
-      database.search = getAllSearchMock;
-      await adapter.getAll(serverRequest, 'now-1h', 'now', undefined, 'down');
+      const mockEsClient = jest.fn();
+      mockEsClient.mockReturnValue(mockEsSearchResult);
+      await adapter.getAll({
+        callES: mockEsClient,
+        dateRangeStart: 'now-1h',
+        dateRangeEnd: 'now',
+        status: 'down',
+      });
       delete expectedGetAllParams.body.size;
       expectedGetAllParams.body.query.bool.filter.push({ term: { 'monitor.status': 'down' } });
 
-      expect(database.search).toHaveBeenCalledWith(serverRequest, expectedGetAllParams);
+      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
     });
   });
 
   describe('getLatestMonitorDocs', () => {
-    let getLatestSearchMock: (request: any, params: any) => Promise<any>;
     let expectedGetLatestSearchParams: any;
     beforeEach(() => {
-      getLatestSearchMock = jest.fn(async (request: any, params: any) => mockEsSearchResult);
       expectedGetLatestSearchParams = {
         index: 'heartbeat-8*',
         body: {
@@ -491,19 +482,19 @@ describe('ElasticsearchPingsAdapter class', () => {
     });
 
     it('returns data in expected shape', async () => {
-      database.search = getLatestSearchMock;
-      const result = await adapter.getLatestMonitorDocs(
-        serverRequest,
-        'now-1h',
-        'now',
-        'testmonitor'
-      );
+      const mockEsClient = jest.fn(async (_request: any, _params: any) => mockEsSearchResult);
+      const result = await adapter.getLatestMonitorDocs({
+        callES: mockEsClient,
+        dateRangeStart: 'now-1h',
+        dateRangeEnd: 'now',
+        monitorId: 'testmonitor',
+      });
       expect(result).toHaveLength(1);
       expect(result[0].timestamp).toBe(123456);
       expect(result[0].monitor).not.toBeFalsy();
       // @ts-ignore monitor will be defined
       expect(result[0].monitor.id).toBe('testmonitor');
-      expect(database.search).toHaveBeenCalledWith(serverRequest, expectedGetLatestSearchParams);
+      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetLatestSearchParams);
     });
   });
 });
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 1e0cf7ec40646..81df1c7c0f631 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
@@ -6,35 +6,83 @@
 
 import { DocCount, Ping, PingResults } from '../../../../common/graphql/types';
 import { HistogramResult } from '../../../../common/domain_types';
+import { UMElasticsearchQueryFn } from '../framework';
 
+export interface GetAllParams {
+  /** @member dateRangeStart timestamp bounds */
+  dateRangeStart: string;
+
+  /** @member dateRangeEnd timestamp bounds */
+  dateRangeEnd: string;
+
+  /** @member monitorId optional limit by monitorId */
+  monitorId?: string | null;
+
+  /** @member status optional limit by check statuses */
+  status?: string | null;
+
+  /** @member sort optional sort by timestamp */
+  sort?: string | null;
+
+  /** @member size optional limit query size */
+  size?: number | null;
+
+  /** @member location optional location value for use in filtering*/
+  location?: string | null;
+}
+
+export interface GetLatestMonitorDocsParams {
+  /** @member dateRangeStart timestamp bounds */
+  dateRangeStart: string;
+
+  /** @member dateRangeEnd timestamp bounds */
+  dateRangeEnd: string;
+
+  /** @member monitorId optional limit to monitorId */
+  monitorId?: string | null;
+
+  /** @member location optional location value for use in filtering*/
+  location?: string | null;
+}
+
+export interface GetPingHistogramParams {
+  /** @member dateRangeStart timestamp bounds */
+  dateRangeStart: string;
+  /** @member dateRangeEnd timestamp bounds */
+  dateRangeEnd: string;
+  /** @member filters user-defined filters */
+  filters?: string | null;
+  /** @member monitorId optional limit to monitorId */
+  monitorId?: string | null;
+  /** @member statusFilter special filter targeting the latest status of each monitor */
+  statusFilter?: string | null;
+}
+
+/**
+ * Count the number of documents in heartbeat indices
+ */
 export interface UMPingsAdapter {
-  getAll(
-    request: any,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    monitorId?: string | null,
-    status?: string | null,
-    sort?: string | null,
-    size?: number | null,
-    location?: string | null
-  ): Promise<PingResults>;
-
-  getLatestMonitorDocs(
-    request: any,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    monitorId?: string | null,
-    location?: string | null
-  ): Promise<Ping[]>;
-
-  getPingHistogram(
-    request: any,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    filters?: string | null,
-    monitorId?: string | null,
-    statusFilter?: string | null
-  ): Promise<HistogramResult>;
-
-  getDocCount(request: any): Promise<DocCount>;
+  getAll: UMElasticsearchQueryFn<GetAllParams, PingResults>;
+
+  getLatestMonitorDocs: UMElasticsearchQueryFn<GetLatestMonitorDocsParams, Ping[]>;
+
+  getPingHistogram: UMElasticsearchQueryFn<GetPingHistogramParams, HistogramResult>;
+
+  /**
+   * Gets data used for a composite histogram for the currently-running monitors.
+   */
+  getDocCount: UMElasticsearchQueryFn<{}, DocCount>;
+}
+
+export interface HistogramQueryResult {
+  key: number;
+  doc_count: number;
+  bucket_total: {
+    value: number;
+  };
+  down: {
+    bucket_count: {
+      value: number;
+    };
+  };
 }
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 6c71d91794003..d05cb5758ca36 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,41 +6,23 @@
 
 import { get } from 'lodash';
 import { INDEX_NAMES } from '../../../../common/constants';
-import { DocCount, HttpBody, Ping, PingResults } from '../../../../common/graphql/types';
+import { HttpBody, Ping, PingResults } from '../../../../common/graphql/types';
 import { parseFilterQuery, getFilterClause, getHistogramIntervalFormatted } from '../../helper';
-import { DatabaseAdapter, HistogramQueryResult } from '../database';
-import { UMPingsAdapter } from './adapter_types';
+import { UMPingsAdapter, HistogramQueryResult } from './adapter_types';
 import { getHistogramInterval } from '../../helper/get_histogram_interval';
-import { HistogramResult } from '../../../../common/domain_types';
 
-export class ElasticsearchPingsAdapter implements UMPingsAdapter {
-  private database: DatabaseAdapter;
-
-  constructor(database: DatabaseAdapter) {
-    this.database = database;
-  }
-
-  /**
-   * Fetches ping documents from ES
-   * @param request Kibana server request
-   * @param dateRangeStart timestamp bounds
-   * @param dateRangeEnd timestamp bounds
-   * @param monitorId optional limit by monitorId
-   * @param status optional limit by check statuses
-   * @param sort optional sort by timestamp
-   * @param size optional limit query size
-   */
-  public async getAll(
-    request: any,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    monitorId?: string | null,
-    status?: string | null,
-    sort: string | null = 'desc',
-    size?: number | null,
-    location?: string | null
-  ): Promise<PingResults> {
-    const sortParam = { sort: [{ '@timestamp': { order: sort } }] };
+export const elasticsearchPingsAdapter: UMPingsAdapter = {
+  getAll: async ({
+    callES,
+    dateRangeStart,
+    dateRangeEnd,
+    monitorId,
+    status,
+    sort,
+    size,
+    location,
+  }) => {
+    const sortParam = { sort: [{ '@timestamp': { order: sort ?? 'desc' } }] };
     const sizeParam = size ? { size } : undefined;
     const filter: any[] = [{ range: { '@timestamp': { gte: dateRangeStart, lte: dateRangeEnd } } }];
     if (monitorId) {
@@ -79,7 +61,7 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter {
     const {
       hits: { hits, total },
       aggregations: aggs,
-    } = await this.database.search(request, params);
+    } = await callES('search', params);
 
     const locations = get(aggs, 'locations', { buckets: [{ key: 'N/A', doc_count: 0 }] });
 
@@ -104,23 +86,9 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter {
     };
 
     return results;
-  }
+  },
 
-  /**
-   * Fetch data to populate monitor status bar.
-   * @param request Kibana server request
-   * @param dateRangeStart timestamp bounds
-   * @param dateRangeEnd timestamp bounds
-   * @param monitorId optional limit to monitorId
-   */
-  public async getLatestMonitorDocs(
-    request: any,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    monitorId?: string | null,
-    location?: string | null
-  ): Promise<Ping[]> {
-    // TODO: Write tests for this function
+  getLatestMonitorDocs: async ({ callES, dateRangeStart, dateRangeEnd, monitorId, location }) => {
     const params = {
       index: INDEX_NAMES.HEARTBEAT,
       body: {
@@ -162,10 +130,9 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter {
       },
     };
 
-    const result = await this.database.search(request, params);
+    const result = await callES('search', params);
     const buckets: any[] = get(result, 'aggregations.by_id.buckets', []);
 
-    // @ts-ignore TODO fix destructuring implicit any
     return buckets.map(
       ({
         latest: {
@@ -179,33 +146,25 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter {
         };
       }
     );
-  }
-
-  /**
-   * Gets data used for a composite histogram for the currently-running monitors.
-   * @param request Kibana server request
-   * @param dateRangeStart timestamp bounds
-   * @param dateRangeEnd timestamp bounds
-   * @param filters user-defined filters
-   * @param statusFilter special filter targeting the latest status of each monitor
-   */
-  public async getPingHistogram(
-    request: any,
-    dateRangeStart: string,
-    dateRangeEnd: string,
-    filters?: string | null,
-    monitorId?: string | null,
-    statusFilter?: string | null
-  ): Promise<HistogramResult> {
+  },
+
+  getPingHistogram: async ({
+    callES,
+    dateRangeStart,
+    dateRangeEnd,
+    filters,
+    monitorId,
+    statusFilter,
+  }) => {
     const boolFilters = parseFilterQuery(filters);
-    const additionaFilters = [];
+    const additionalFilters = [];
     if (monitorId) {
-      additionaFilters.push({ match: { 'monitor.id': monitorId } });
+      additionalFilters.push({ match: { 'monitor.id': monitorId } });
     }
     if (boolFilters) {
-      additionaFilters.push(boolFilters);
+      additionalFilters.push(boolFilters);
     }
-    const filter = getFilterClause(dateRangeStart, dateRangeEnd, additionaFilters);
+    const filter = getFilterClause(dateRangeStart, dateRangeEnd, additionalFilters);
     const interval = getHistogramInterval(dateRangeStart, dateRangeEnd);
     const intervalFormatted = getHistogramIntervalFormatted(dateRangeStart, dateRangeEnd);
 
@@ -245,7 +204,7 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter {
       },
     };
 
-    const result = await this.database.search(request, params);
+    const result = await callES('search', params);
     const buckets: HistogramQueryResult[] = get(result, 'aggregations.timeseries.buckets', []);
     const histogram = buckets.map(bucket => {
       const x: number = get(bucket, 'key');
@@ -262,15 +221,11 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter {
       histogram,
       interval,
     };
-  }
+  },
 
-  /**
-   * Count the number of documents in heartbeat indices
-   * @param request Kibana server request
-   */
-  public async getDocCount(request: any): Promise<DocCount> {
-    const { count } = await this.database.count(request, { index: INDEX_NAMES.HEARTBEAT });
+  getDocCount: async ({ callES }) => {
+    const { count } = await callES('count', { index: INDEX_NAMES.HEARTBEAT });
 
     return { count };
-  }
-}
+  },
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/index.ts
index eee6aa279dd39..6d93785e01527 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/index.ts
@@ -5,4 +5,4 @@
  */
 
 export * from './adapter_types';
-export { ElasticsearchPingsAdapter } from './elasticsearch_pings_adapter';
+export { elasticsearchPingsAdapter } from './elasticsearch_pings_adapter';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/index.ts
index 86154d0ab80a4..bd86daba1bcb6 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/index.ts
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { UMKibanaSavedObjectsAdapter } from './kibana_saved_objects_adapter';
+export { savedObjectsAdapter } from './kibana_saved_objects_adapter';
 export { UMSavedObjectsAdapter } from './types';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts
index 1f10c2f7aeed1..7628c5bac0660 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts
@@ -4,24 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectsLegacyService } from 'src/core/server';
 import { UMSavedObjectsAdapter } from './types';
 import uptimeIndexPattern from './heartbeat_index_pattern.json';
 
-export class UMKibanaSavedObjectsAdapter implements UMSavedObjectsAdapter {
-  private readonly savedObjectsClient: any;
-  constructor(savedObjects: SavedObjectsLegacyService<any>, elasticsearch: any) {
-    const { SavedObjectsClient, getSavedObjectsRepository } = savedObjects;
-    const { callWithInternalUser } = elasticsearch.getCluster('admin');
-    const internalRepository = getSavedObjectsRepository(callWithInternalUser);
-    this.savedObjectsClient = new SavedObjectsClient(internalRepository);
-  }
-
-  public async getUptimeIndexPattern(): Promise<any> {
+export const savedObjectsAdapter: UMSavedObjectsAdapter = {
+  getUptimeIndexPattern: async client => {
     try {
-      return await this.savedObjectsClient.get('index-pattern', uptimeIndexPattern.id);
+      return await client.get('index-pattern', uptimeIndexPattern.id);
     } catch (error) {
-      return await this.savedObjectsClient.create(
+      return await client.create(
         'index-pattern',
         {
           ...uptimeIndexPattern.attributes,
@@ -30,5 +21,5 @@ export class UMKibanaSavedObjectsAdapter implements UMSavedObjectsAdapter {
         { id: uptimeIndexPattern.id, overwrite: false }
       );
     }
-  }
-}
+  },
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts
index 4d11bd9f6053a..0fef1e1428e97 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { UMSavedObjectsQueryFn } from '../framework';
+
 export interface UMSavedObjectsAdapter {
-  getUptimeIndexPattern: () => Promise<any>;
+  getUptimeIndexPattern: UMSavedObjectsQueryFn;
 }
diff --git a/x-pack/legacy/plugins/uptime/server/lib/compose/kibana.ts b/x-pack/legacy/plugins/uptime/server/lib/compose/kibana.ts
index a7c370e03490b..cc11bf90da5f3 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/compose/kibana.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/compose/kibana.ts
@@ -4,32 +4,28 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UMKibanaDatabaseAdapter } from '../adapters/database/kibana_database_adapter';
 import { UMKibanaBackendFrameworkAdapter } from '../adapters/framework';
-import { ElasticsearchMonitorsAdapter } from '../adapters/monitors';
-import { ElasticsearchPingsAdapter } from '../adapters/pings';
+import { elasticsearchMonitorsAdapter } from '../adapters/monitors';
+import { elasticsearchPingsAdapter } from '../adapters/pings';
 import { licenseCheck } from '../domains';
 import { UMDomainLibs, UMServerLibs } from '../lib';
-import { ElasticsearchMonitorStatesAdapter } from '../adapters/monitor_states';
-import { UMKibanaSavedObjectsAdapter } from '../adapters/saved_objects/kibana_saved_objects_adapter';
+import { elasticsearchMonitorStatesAdapter } from '../adapters/monitor_states';
+import { savedObjectsAdapter } from '../adapters/saved_objects';
 import { UptimeCorePlugins, UptimeCoreSetup } from '../adapters/framework';
 
 export function compose(server: UptimeCoreSetup, plugins: UptimeCorePlugins): UMServerLibs {
-  const { elasticsearch, savedObjects } = plugins;
-  const framework = new UMKibanaBackendFrameworkAdapter(server, plugins);
-  const database = new UMKibanaDatabaseAdapter(elasticsearch);
+  const framework = new UMKibanaBackendFrameworkAdapter(server);
 
   const domainLibs: UMDomainLibs = {
     license: licenseCheck,
-    monitors: new ElasticsearchMonitorsAdapter(database),
-    monitorStates: new ElasticsearchMonitorStatesAdapter(database),
-    pings: new ElasticsearchPingsAdapter(database),
-    savedObjects: new UMKibanaSavedObjectsAdapter(savedObjects, elasticsearch),
+    monitors: elasticsearchMonitorsAdapter,
+    monitorStates: elasticsearchMonitorStatesAdapter,
+    pings: elasticsearchPingsAdapter,
+    savedObjects: savedObjectsAdapter,
   };
 
   return {
     framework,
-    database,
     ...domainLibs,
   };
 }
diff --git a/x-pack/legacy/plugins/uptime/server/lib/domains/__tests__/__snapshots__/license.test.ts.snap b/x-pack/legacy/plugins/uptime/server/lib/domains/__tests__/__snapshots__/license.test.ts.snap
index ab791cbd243f8..d03516d49f089 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/domains/__tests__/__snapshots__/license.test.ts.snap
+++ b/x-pack/legacy/plugins/uptime/server/lib/domains/__tests__/__snapshots__/license.test.ts.snap
@@ -2,6 +2,7 @@
 
 exports[`license check returns result for a valid license 1`] = `
 Object {
+  "message": "License is valid and active",
   "statusCode": 200,
 }
 `;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/domains/__tests__/license.test.ts b/x-pack/legacy/plugins/uptime/server/lib/domains/__tests__/license.test.ts
index b26cb99cf9b6b..8c47b318da9bd 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/domains/__tests__/license.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/domains/__tests__/license.test.ts
@@ -8,15 +8,15 @@ import { ILicense } from '../../../../../../../plugins/licensing/server';
 import { licenseCheck } from '../license';
 
 describe('license check', () => {
-  let mockLicense: Pick<ILicense, 'isActive' | 'isOneOf'>;
+  let mockLicense: Pick<ILicense, 'isActive' | 'hasAtLeast'>;
 
   it('throws for null license', () => {
-    expect(licenseCheck(null)).toMatchSnapshot();
+    expect(licenseCheck(undefined)).toMatchSnapshot();
   });
 
   it('throws for unsupported license type', () => {
     mockLicense = {
-      isOneOf: jest.fn().mockReturnValue(false),
+      hasAtLeast: jest.fn().mockReturnValue(false),
       isActive: false,
     };
     expect(licenseCheck(mockLicense)).toMatchSnapshot();
@@ -24,7 +24,7 @@ describe('license check', () => {
 
   it('throws for inactive license', () => {
     mockLicense = {
-      isOneOf: jest.fn().mockReturnValue(true),
+      hasAtLeast: jest.fn().mockReturnValue(true),
       isActive: false,
     };
     expect(licenseCheck(mockLicense)).toMatchSnapshot();
@@ -32,7 +32,7 @@ describe('license check', () => {
 
   it('returns result for a valid license', () => {
     mockLicense = {
-      isOneOf: jest.fn().mockReturnValue(true),
+      hasAtLeast: jest.fn().mockReturnValue(true),
       isActive: true,
     };
     expect(licenseCheck(mockLicense)).toMatchSnapshot();
diff --git a/x-pack/legacy/plugins/uptime/server/lib/domains/license.ts b/x-pack/legacy/plugins/uptime/server/lib/domains/license.ts
index 9c52667aeeab4..b8b5722d79877 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/domains/license.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/domains/license.ts
@@ -8,20 +8,20 @@ import { ILicense } from '../../../../../../plugins/licensing/server';
 
 export interface UMLicenseStatusResponse {
   statusCode: number;
-  message?: string;
+  message: string;
 }
 export type UMLicenseCheck = (
-  license: Pick<ILicense, 'isActive' | 'isOneOf'> | null
+  license?: Pick<ILicense, 'isActive' | 'hasAtLeast'>
 ) => UMLicenseStatusResponse;
 
 export const licenseCheck: UMLicenseCheck = license => {
-  if (license === null) {
+  if (license === undefined) {
     return {
       message: 'Missing license information',
       statusCode: 400,
     };
   }
-  if (!license.isOneOf(['basic', 'standard', 'gold', 'platinum', 'trial'])) {
+  if (!license.hasAtLeast('basic')) {
     return {
       message: 'License not supported',
       statusCode: 401,
@@ -34,6 +34,7 @@ export const licenseCheck: UMLicenseCheck = license => {
     };
   }
   return {
+    message: 'License is valid and active',
     statusCode: 200,
   };
 };
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/get_filter_clause.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/get_filter_clause.ts
index 5259aa1d61711..c81fec933cb22 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/get_filter_clause.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/helper/get_filter_clause.ts
@@ -4,14 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-const getRange = (dateRangeStart: string, dateRangeEnd: string) => ({
-  range: {
-    '@timestamp': {
-      gte: dateRangeStart,
-      lte: dateRangeEnd,
-    },
-  },
-});
+import { makeDateRangeFilter } from './make_date_rate_filter';
 
 export const getFilterClause = (
   dateRangeStart: string,
@@ -19,5 +12,5 @@ export const getFilterClause = (
   additionalKeys?: Array<{ [key: string]: any }>
 ) =>
   additionalKeys && additionalKeys.length > 0
-    ? [getRange(dateRangeStart, dateRangeEnd), ...additionalKeys]
-    : [getRange(dateRangeStart, dateRangeEnd)];
+    ? [makeDateRangeFilter(dateRangeStart, dateRangeEnd), ...additionalKeys]
+    : [makeDateRangeFilter(dateRangeStart, dateRangeEnd)];
diff --git a/x-pack/legacy/plugins/uptime/server/lib/lib.ts b/x-pack/legacy/plugins/uptime/server/lib/lib.ts
index e68a6dd18ef5f..da87c3ebfe301 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/lib.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/lib.ts
@@ -5,7 +5,6 @@
  */
 
 import {
-  DatabaseAdapter,
   UMBackendFrameworkAdapter,
   UMMonitorsAdapter,
   UMMonitorStatesAdapter,
@@ -24,5 +23,4 @@ export interface UMDomainLibs {
 
 export interface UMServerLibs extends UMDomainLibs {
   framework: UMBackendFrameworkAdapter;
-  database?: DatabaseAdapter;
 }
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/create_route_with_auth.ts b/x-pack/legacy/plugins/uptime/server/rest_api/create_route_with_auth.ts
index a1976ef046e8e..41527d76432cb 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/create_route_with_auth.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/create_route_with_auth.ts
@@ -4,32 +4,36 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RequestHandler } from 'kibana/server';
-import { ObjectType } from '@kbn/config-schema';
 import { UMServerLibs } from '../lib/lib';
-import { UMRestApiRouteCreator, UMRouteDefinition } from './types';
+import { UptimeRoute, UMRestApiRouteFactory, UMRouteHandler } from './types';
 
 export const createRouteWithAuth = (
   libs: UMServerLibs,
-  routeCreator: UMRestApiRouteCreator
-): UMRouteDefinition => {
+  routeCreator: UMRestApiRouteFactory
+): UptimeRoute => {
   const restRoute = routeCreator(libs);
   const { handler, method, path, options, ...rest } = restRoute;
-  const authHandler: RequestHandler<ObjectType, ObjectType, ObjectType> = async (
-    context,
-    request,
-    response
-  ) => {
-    if (libs.license(context.licensing.license)) {
-      return await handler(context, request, response);
+  const licenseCheckHandler: UMRouteHandler = async (customParams, context, request, response) => {
+    const { statusCode, message } = libs.license(context.licensing.license);
+    if (statusCode === 200) {
+      return await handler(customParams, context, request, response);
+    }
+    switch (statusCode) {
+      case 400:
+        return response.badRequest({ body: { message } });
+      case 401:
+        return response.unauthorized({ body: { message } });
+      case 403:
+        return response.forbidden({ body: { message } });
+      default:
+        return response.internalError();
     }
-    return response.badRequest();
   };
   return {
     method,
     path,
     options,
-    handler: authHandler,
+    handler: licenseCheckHandler,
     ...rest,
   };
 };
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/index.ts b/x-pack/legacy/plugins/uptime/server/rest_api/index.ts
index f18b9e8e44c36..4ab225076eff2 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/index.ts
@@ -8,12 +8,13 @@ import { createGetAllRoute } from './pings';
 import { createGetIndexPatternRoute } from './index_pattern';
 import { createLogMonitorPageRoute, createLogOverviewPageRoute } from './telemetry';
 import { createGetSnapshotCount } from './snapshot';
-import { UMRestApiRouteCreator } from './types';
+import { UMRestApiRouteFactory } from './types';
 import { createGetMonitorDetailsRoute, createGetMonitorLocationsRoute } from './monitors';
 
 export * from './types';
 export { createRouteWithAuth } from './create_route_with_auth';
-export const restApiRoutes: UMRestApiRouteCreator[] = [
+export { uptimeRouteWrapper } from './uptime_route_wrapper';
+export const restApiRoutes: UMRestApiRouteFactory[] = [
   createGetAllRoute,
   createGetIndexPatternRoute,
   createGetMonitorDetailsRoute,
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/index_pattern/get_index_pattern.ts b/x-pack/legacy/plugins/uptime/server/rest_api/index_pattern/get_index_pattern.ts
index 55f0af57ed847..f061307807a42 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/index_pattern/get_index_pattern.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/index_pattern/get_index_pattern.ts
@@ -5,20 +5,20 @@
  */
 
 import { UMServerLibs } from '../../lib/lib';
-import { UMRestApiRouteCreator } from '../types';
+import { UMRestApiRouteFactory } from '../types';
 
-export const createGetIndexPatternRoute: UMRestApiRouteCreator = (libs: UMServerLibs) => ({
+export const createGetIndexPatternRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
   method: 'GET',
   path: '/api/uptime/index_pattern',
   validate: false,
   options: {
     tags: ['access:uptime'],
   },
-  handler: async (_context, _request, response): Promise<any> => {
+  handler: async ({ savedObjectsClient: client }, _context, _request, response): Promise<any> => {
     try {
       return response.ok({
         body: {
-          ...(await libs.savedObjects.getUptimeIndexPattern()),
+          ...(await libs.savedObjects.getUptimeIndexPattern(client, undefined)),
         },
       });
     } catch (e) {
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitor_locations.ts b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitor_locations.ts
index 4a91255bd19f2..b2356ae0a88bf 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitor_locations.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitor_locations.ts
@@ -6,9 +6,9 @@
 
 import { schema } from '@kbn/config-schema';
 import { UMServerLibs } from '../../lib/lib';
-import { UMRestApiRouteCreator } from '../types';
+import { UMRestApiRouteFactory } from '../types';
 
-export const createGetMonitorLocationsRoute: UMRestApiRouteCreator = (libs: UMServerLibs) => ({
+export const createGetMonitorLocationsRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
   method: 'GET',
   path: '/api/uptime/monitor/locations',
   validate: {
@@ -21,12 +21,17 @@ export const createGetMonitorLocationsRoute: UMRestApiRouteCreator = (libs: UMSe
   options: {
     tags: ['access:uptime'],
   },
-  handler: async (_context, request, response): Promise<any> => {
+  handler: async ({ callES }, _context, request, response): Promise<any> => {
     const { monitorId, dateStart, dateEnd } = request.query;
 
     return response.ok({
       body: {
-        ...(await libs.monitors.getMonitorLocations(request, monitorId, dateStart, dateEnd)),
+        ...(await libs.monitors.getMonitorLocations({
+          callES,
+          monitorId,
+          dateStart,
+          dateEnd,
+        })),
       },
     });
   },
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
index 00860248ff153..9e1bc6f0d6a96 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
@@ -6,24 +6,32 @@
 
 import { schema } from '@kbn/config-schema';
 import { UMServerLibs } from '../../lib/lib';
-import { UMRestApiRouteCreator } from '../types';
+import { UMRestApiRouteFactory } from '../types';
 
-export const createGetMonitorDetailsRoute: UMRestApiRouteCreator = (libs: UMServerLibs) => ({
+export const createGetMonitorDetailsRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
   method: 'GET',
   path: '/api/uptime/monitor/details',
   validate: {
     query: schema.object({
-      monitorId: schema.maybe(schema.string()),
+      monitorId: schema.string(),
+      dateStart: schema.maybe(schema.string()),
+      dateEnd: schema.maybe(schema.string()),
     }),
   },
   options: {
     tags: ['access:uptime'],
   },
-  handler: async (_context, request, response): Promise<any> => {
-    const { monitorId } = request.query;
-
+  handler: async ({ callES }, _context, request, response): Promise<any> => {
+    const { monitorId, dateStart, dateEnd } = request.query;
     return response.ok({
-      body: { ...(await libs.monitors.getMonitorDetails(request, monitorId)) },
+      body: {
+        ...(await libs.monitors.getMonitorDetails({
+          callES,
+          monitorId,
+          dateStart,
+          dateEnd,
+        })),
+      },
     });
   },
 });
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_all.ts b/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_all.ts
index e2bdbca9fbfa0..824035954ea28 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_all.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_all.ts
@@ -6,9 +6,9 @@
 
 import { schema } from '@kbn/config-schema';
 import { UMServerLibs } from '../../lib/lib';
-import { UMRestApiRouteCreator } from '../types';
+import { UMRestApiRouteFactory } from '../types';
 
-export const createGetAllRoute: UMRestApiRouteCreator = (libs: UMServerLibs) => ({
+export const createGetAllRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
   method: 'GET',
   path: '/api/uptime/pings',
   validate: {
@@ -25,19 +25,19 @@ export const createGetAllRoute: UMRestApiRouteCreator = (libs: UMServerLibs) =>
   options: {
     tags: ['access:uptime'],
   },
-  handler: async (_context, request, response): Promise<any> => {
-    const { size, sort, dateRangeStart, dateRangeEnd, location, monitorId, status } = request.query;
+  handler: async ({ callES }, _context, request, response): Promise<any> => {
+    const { dateRangeStart, dateRangeEnd, location, monitorId, size, sort, status } = request.query;
 
-    const result = await libs.pings.getAll(
-      request,
+    const result = await libs.pings.getAll({
+      callES,
       dateRangeStart,
       dateRangeEnd,
       monitorId,
       status,
       sort,
       size,
-      location
-    );
+      location,
+    });
 
     return response.ok({
       body: {
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts b/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts
index 9b2b26f52699e..986ac797d63b6 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts
@@ -6,9 +6,9 @@
 
 import { schema } from '@kbn/config-schema';
 import { UMServerLibs } from '../../lib/lib';
-import { UMRestApiRouteCreator } from '../types';
+import { UMRestApiRouteFactory } from '../types';
 
-export const createGetSnapshotCount: UMRestApiRouteCreator = (libs: UMServerLibs) => ({
+export const createGetSnapshotCount: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
   method: 'GET',
   path: '/api/uptime/snapshot/count',
   validate: {
@@ -22,15 +22,15 @@ export const createGetSnapshotCount: UMRestApiRouteCreator = (libs: UMServerLibs
   options: {
     tags: ['access:uptime'],
   },
-  handler: async (_context, request, response): Promise<any> => {
+  handler: async ({ callES }, _context, request, response): Promise<any> => {
     const { dateRangeStart, dateRangeEnd, filters, statusFilter } = request.query;
-    const result = await libs.monitorStates.getSnapshotCount(
-      request,
+    const result = await libs.monitorStates.getSnapshotCount({
+      callES,
       dateRangeStart,
       dateRangeEnd,
       filters,
-      statusFilter
-    );
+      statusFilter,
+    });
     return response.ok({
       body: {
         ...result,
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/telemetry/log_monitor_page.ts b/x-pack/legacy/plugins/uptime/server/rest_api/telemetry/log_monitor_page.ts
index f3e926493143b..fca1e6c8d5d46 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/telemetry/log_monitor_page.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/telemetry/log_monitor_page.ts
@@ -5,13 +5,13 @@
  */
 
 import { KibanaTelemetryAdapter } from '../../lib/adapters/telemetry';
-import { UMRestApiRouteCreator } from '../types';
+import { UMRestApiRouteFactory } from '../types';
 
-export const createLogMonitorPageRoute: UMRestApiRouteCreator = () => ({
+export const createLogMonitorPageRoute: UMRestApiRouteFactory = () => ({
   method: 'POST',
   path: '/api/uptime/logMonitor',
   validate: false,
-  handler: async (_context, _request, response): Promise<any> => {
+  handler: async (_customParams, _context, _request, response): Promise<any> => {
     await KibanaTelemetryAdapter.countMonitor();
     return response.ok();
   },
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/telemetry/log_overview_page.ts b/x-pack/legacy/plugins/uptime/server/rest_api/telemetry/log_overview_page.ts
index 277ef2235fb69..37ed2e5ff5c2c 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/telemetry/log_overview_page.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/telemetry/log_overview_page.ts
@@ -5,13 +5,13 @@
  */
 
 import { KibanaTelemetryAdapter } from '../../lib/adapters/telemetry';
-import { UMRestApiRouteCreator } from '../types';
+import { UMRestApiRouteFactory } from '../types';
 
-export const createLogOverviewPageRoute: UMRestApiRouteCreator = () => ({
+export const createLogOverviewPageRoute: UMRestApiRouteFactory = () => ({
   method: 'POST',
   path: '/api/uptime/logOverview',
   validate: false,
-  handler: async (_context, _request, response): Promise<any> => {
+  handler: async (_customParams, _context, _request, response): Promise<any> => {
     await KibanaTelemetryAdapter.countOverview();
     return response.ok();
   },
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/types.ts b/x-pack/legacy/plugins/uptime/server/rest_api/types.ts
index b4d7e438f51be..e0c8ba4a286cf 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/types.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/types.ts
@@ -5,15 +5,87 @@
  */
 
 import { ObjectType } from '@kbn/config-schema';
-import { RequestHandler, RouteConfig, RouteMethod } from 'kibana/server';
+import {
+  RequestHandler,
+  RouteConfig,
+  RouteMethod,
+  CallAPIOptions,
+  SavedObjectsClient,
+  RequestHandlerContext,
+  KibanaRequest,
+  KibanaResponseFactory,
+  IKibanaResponse,
+} from 'kibana/server';
 import { UMServerLibs } from '../lib/lib';
 
-export interface UMServerRoute {
+/**
+ * Defines the basic properties employed by Uptime routes.
+ */
+export interface UMServerRoute<T> {
   method: string;
-  handler: RequestHandler<ObjectType, ObjectType, ObjectType>;
+  handler: T;
 }
 
-export type UMRouteDefinition = UMServerRoute &
+/**
+ * Merges basic uptime route properties with the route config type
+ * provided by Kibana core.
+ */
+export type UMRouteDefinition<T> = UMServerRoute<T> &
   RouteConfig<ObjectType, ObjectType, ObjectType, RouteMethod>;
 
-export type UMRestApiRouteCreator = (libs: UMServerLibs) => UMRouteDefinition;
+/**
+ * This type represents an Uptime route definition that corresponds to the contract
+ * provided by the Kibana platform. Route objects must conform to this type in order
+ * to successfully interact with the Kibana platform.
+ */
+export type UMKibanaRoute = UMRouteDefinition<RequestHandler<ObjectType, ObjectType, ObjectType>>;
+
+/**
+ * This is an abstraction over the default Kibana route type. This allows us to use custom
+ * arguments in our route handlers and impelement custom middleware.
+ */
+export type UptimeRoute = UMRouteDefinition<UMRouteHandler>;
+
+/**
+ * Functions of this type accept custom lib functions and outputs a route object.
+ */
+export type UMRestApiRouteFactory = (libs: UMServerLibs) => UptimeRoute;
+
+/**
+ * Functions of this type accept our internal route format and output a route
+ * object that the Kibana platform can consume.
+ */
+export type UMKibanaRouteWrapper = (uptimeRoute: UptimeRoute) => UMKibanaRoute;
+
+/**
+ * This type can store custom parameters used by the internal Uptime route handlers.
+ */
+export interface UMRouteParams {
+  callES: (
+    endpoint: string,
+    clientParams?: Record<string, any>,
+    options?: CallAPIOptions | undefined
+  ) => Promise<any>;
+  savedObjectsClient: Pick<
+    SavedObjectsClient,
+    | 'errors'
+    | 'create'
+    | 'bulkCreate'
+    | 'delete'
+    | 'find'
+    | 'bulkGet'
+    | 'get'
+    | 'update'
+    | 'bulkUpdate'
+  >;
+}
+
+/**
+ * This is the contract we specify internally for route handling.
+ */
+export type UMRouteHandler = (
+  params: UMRouteParams,
+  context: RequestHandlerContext,
+  request: KibanaRequest<Record<string, any>, Record<string, any>, Record<string, any>>,
+  response: KibanaResponseFactory
+) => IKibanaResponse<any> | Promise<IKibanaResponse<any>>;
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/uptime_route_wrapper.ts b/x-pack/legacy/plugins/uptime/server/rest_api/uptime_route_wrapper.ts
new file mode 100644
index 0000000000000..fb874edebee60
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/uptime_route_wrapper.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 { UMKibanaRouteWrapper } from './types';
+
+export const uptimeRouteWrapper: UMKibanaRouteWrapper = uptimeRoute => {
+  return {
+    ...uptimeRoute,
+    handler: async (context, request, response) => {
+      const { callAsCurrentUser: callES } = context.core.elasticsearch.dataClient;
+      const { client: savedObjectsClient } = context.core.savedObjects;
+      return await uptimeRoute.handler({ callES, savedObjectsClient }, context, request, response);
+    },
+  };
+};
diff --git a/x-pack/legacy/plugins/uptime/server/uptime_server.ts b/x-pack/legacy/plugins/uptime/server/uptime_server.ts
index a8058453f2166..4dfa1373db8d9 100644
--- a/x-pack/legacy/plugins/uptime/server/uptime_server.ts
+++ b/x-pack/legacy/plugins/uptime/server/uptime_server.ts
@@ -7,10 +7,12 @@
 import { makeExecutableSchema } from 'graphql-tools';
 import { DEFAULT_GRAPHQL_PATH, resolvers, typeDefs } from './graphql';
 import { UMServerLibs } from './lib/lib';
-import { createRouteWithAuth, restApiRoutes } from './rest_api';
+import { createRouteWithAuth, restApiRoutes, uptimeRouteWrapper } from './rest_api';
 
 export const initUptimeServer = (libs: UMServerLibs) => {
-  restApiRoutes.forEach(route => libs.framework.registerRoute(createRouteWithAuth(libs, route)));
+  restApiRoutes.forEach(route =>
+    libs.framework.registerRoute(uptimeRouteWrapper(createRouteWithAuth(libs, route)))
+  );
 
   const graphQLSchema = makeExecutableSchema({
     resolvers: resolvers.map(createResolversFn => createResolversFn(libs)),
diff --git a/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx b/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx
index 7c5de3d8e9298..9ea2b3bcd1e9a 100644
--- a/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx
+++ b/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate.tsx
@@ -186,7 +186,11 @@ export const JsonWatchEditSimulate = ({
             <EuiFlexGroup>
               <EuiFlexItem>
                 <EuiFieldNumber
-                  value={scheduledTimeValue}
+                  value={
+                    scheduledTimeValue == null || scheduledTimeValue === ''
+                      ? scheduledTimeValue
+                      : parseInt(scheduledTimeValue, 10)
+                  }
                   min={0}
                   data-test-subj="scheduledTimeInput"
                   onChange={e => {
@@ -225,7 +229,11 @@ export const JsonWatchEditSimulate = ({
             )}
           >
             <EuiFieldNumber
-              value={triggeredTimeValue}
+              value={
+                triggeredTimeValue == null || triggeredTimeValue === ''
+                  ? triggeredTimeValue
+                  : parseInt(triggeredTimeValue, 10)
+              }
               min={0}
               data-test-subj="triggeredTimeInput"
               append={
diff --git a/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate_results.tsx b/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate_results.tsx
index 4b630f5bc81b4..c3f11c6c3fa46 100644
--- a/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate_results.tsx
+++ b/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/json_watch_edit/json_watch_edit_simulate_results.tsx
@@ -101,8 +101,10 @@ export const JsonWatchEditSimulateResults = ({
           defaultMessage: 'State',
         }
       ),
-      dataType: 'string',
-      render: (actionState: string) => <WatchStatus status={actionState} />,
+      dataType: 'string' as const,
+      render: (actionState: string, _item: typeof actionsTableData[number]) => (
+        <WatchStatus status={actionState} />
+      ),
     },
     {
       field: 'actionReason',
diff --git a/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx b/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
index a3da7d14c8886..3901f84f506ef 100644
--- a/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
+++ b/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
@@ -8,9 +8,6 @@ import React, { Fragment, useContext, useEffect } from 'react';
 import {
   AnnotationDomainTypes,
   Axis,
-  getAnnotationId,
-  getAxisId,
-  getSpecId,
   Chart,
   LineAnnotation,
   LineSeries,
@@ -224,22 +221,17 @@ export const WatchVisualization = () => {
               legendPosition={Position.Bottom}
             />
             <Axis
-              id={getAxisId('bottom')}
+              id="bottom"
               position={Position.Bottom}
               showOverlappingTicks={true}
               tickFormat={dateFormatter}
             />
-            <Axis
-              domain={{ max: maxY }}
-              id={getAxisId('left')}
-              title={aggLabel}
-              position={Position.Left}
-            />
+            <Axis domain={{ max: maxY }} id="left" title={aggLabel} position={Position.Left} />
             {watchVisualizationDataKeys.map((key: string) => {
               return (
                 <LineSeries
                   key={key}
-                  id={getSpecId(key)}
+                  id={key}
                   xScaleType={ScaleType.Time}
                   yScaleType={ScaleType.Linear}
                   data={watchVisualizationData[key]}
@@ -254,7 +246,7 @@ export const WatchVisualization = () => {
               return (
                 <LineAnnotation
                   key={specId}
-                  annotationId={getAnnotationId(specId)}
+                  id={specId}
                   domainType={AnnotationDomainTypes.YDomain}
                   dataValues={[{ dataValue: watch.threshold[i], details: specId }]}
                 />
diff --git a/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_list/components/watch_list.tsx b/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_list/components/watch_list.tsx
index b2afc0b92509b..5165915aa8406 100644
--- a/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_list/components/watch_list.tsx
+++ b/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_list/components/watch_list.tsx
@@ -374,7 +374,7 @@ export const WatchList = () => {
           ? i18n.translate('xpack.watcher.sections.watchList.watchTable.disabledWatchTooltipText', {
               defaultMessage: 'This watch is read-only',
             })
-          : undefined,
+          : '',
     };
 
     const searchConfig = {
diff --git a/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_status/components/watch_history.tsx b/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_status/components/watch_history.tsx
index 2bc1a0cbace18..16897d74665ef 100644
--- a/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_status/components/watch_history.tsx
+++ b/x-pack/legacy/plugins/watcher/public/np_ready/application/sections/watch_status/components/watch_history.tsx
@@ -292,7 +292,7 @@ export const WatchHistory = () => {
       <EuiSpacer size="s" />
 
       <EuiInMemoryTable
-        items={history}
+        items={history || []}
         columns={columns}
         pagination={PAGINATION}
         sorting={true}
diff --git a/x-pack/legacy/plugins/watcher/server/np_ready/plugin.ts b/x-pack/legacy/plugins/watcher/server/np_ready/plugin.ts
index 2e8c81efa19c0..a311c31082183 100644
--- a/x-pack/legacy/plugins/watcher/server/np_ready/plugin.ts
+++ b/x-pack/legacy/plugins/watcher/server/np_ready/plugin.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 { first } from 'rxjs/operators';
 import { Plugin, CoreSetup } from 'src/core/server';
 import { i18n } from '@kbn/i18n';
 import { PLUGIN } from '../../common/constants';
@@ -23,7 +22,7 @@ export class WatcherServerPlugin implements Plugin<void, void, any, any> {
     { http, elasticsearch: elasticsearchService }: CoreSetup,
     { __LEGACY: serverShim }: { __LEGACY: ServerShim }
   ) {
-    const elasticsearch = await elasticsearchService.adminClient$.pipe(first()).toPromise();
+    const elasticsearch = await elasticsearchService.adminClient;
     const router = http.createRouter();
     const routeDependencies: RouteDependencies = {
       elasticsearch,
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/xpack_info.js b/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/xpack_info.js
index 2edfbbc27fc45..2e0d608e522d7 100644
--- a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/xpack_info.js
+++ b/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/xpack_info.js
@@ -312,6 +312,54 @@ describe('XPackInfo', () => {
     });
   });
 
+  it('onLicenseInfoChange() allows to subscribe to license update', async () => {
+    const license$ = new BehaviorSubject(createLicense());
+
+    const xPackInfo = new XPackInfo(mockServer, {
+      licensing: {
+        license$,
+        refresh: () => null,
+      },
+    });
+
+    const watcherFeature = xPackInfo.feature('watcher');
+    watcherFeature.registerLicenseCheckResultsGenerator(info => ({
+      type: info.license.getType(),
+    }));
+
+    const statuses = [];
+    xPackInfo.onLicenseInfoChange(() => statuses.push(watcherFeature.getLicenseCheckResults()));
+
+    license$.next(createLicense({ type: 'basic' }));
+    expect(statuses).to.eql([{ type: 'basic' }]);
+
+    license$.next(createLicense({ type: 'trial' }));
+    expect(statuses).to.eql([{ type: 'basic' }, { type: 'trial' }]);
+  });
+
+  it('refreshNow() leads to onLicenseInfoChange()', async () => {
+    const license$ = new BehaviorSubject(createLicense());
+
+    const xPackInfo = new XPackInfo(mockServer, {
+      licensing: {
+        license$,
+        refresh: () => license$.next({ type: 'basic' }),
+      },
+    });
+
+    const watcherFeature = xPackInfo.feature('watcher');
+
+    watcherFeature.registerLicenseCheckResultsGenerator(info => ({
+      type: info.license.getType(),
+    }));
+
+    const statuses = [];
+    xPackInfo.onLicenseInfoChange(() => statuses.push(watcherFeature.getLicenseCheckResults()));
+
+    await xPackInfo.refreshNow();
+    expect(statuses).to.eql([{ type: 'basic' }]);
+  });
+
   it('getSignature() returns correct signature.', async () => {
     const license$ = new BehaviorSubject(createLicense());
     const xPackInfo = new XPackInfo(mockServer, {
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/xpack_info.ts b/x-pack/legacy/plugins/xpack_main/server/lib/xpack_info.ts
index fbb8929154c36..9d5a8e64645ec 100644
--- a/x-pack/legacy/plugins/xpack_main/server/lib/xpack_info.ts
+++ b/x-pack/legacy/plugins/xpack_main/server/lib/xpack_info.ts
@@ -101,6 +101,8 @@ export class XPackInfo {
           error: license.error,
         };
       }
+
+      this._licenseInfoChangedListeners.forEach(fn => fn());
     });
 
     this._license = new XPackInfoLicense(() => this._cache.license);
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/xpack_info_license.test.js b/x-pack/legacy/plugins/xpack_main/server/lib/xpack_info_license.test.js
index c369f90cec1d1..ed2043e00b9a7 100644
--- a/x-pack/legacy/plugins/xpack_main/server/lib/xpack_info_license.test.js
+++ b/x-pack/legacy/plugins/xpack_main/server/lib/xpack_info_license.test.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { licensingMock } from '../../../../../plugins/licensing/server/licensing.mock';
+import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
 import { XPackInfoLicense } from './xpack_info_license';
 
 function getXPackInfoLicense(getRawLicense) {
diff --git a/x-pack/package.json b/x-pack/package.json
index 410a70b5e3fea..d513e4ed34965 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -31,17 +31,16 @@
     "@kbn/es": "1.0.0",
     "@kbn/expect": "1.0.0",
     "@kbn/plugin-helpers": "9.0.2",
-    "@kbn/pm": "1.0.0",
     "@kbn/test": "1.0.0",
     "@kbn/utility-types": "1.0.0",
     "@mattapperson/slapshot": "1.4.0",
-    "@storybook/addon-actions": "^5.2.8",
+    "@storybook/addon-actions": "^5.2.6",
     "@storybook/addon-console": "^1.2.1",
-    "@storybook/addon-info": "^5.2.8",
-    "@storybook/addon-knobs": "^5.2.8",
-    "@storybook/addon-storyshots": "^5.2.8",
-    "@storybook/react": "^5.2.8",
-    "@storybook/theming": "^5.2.8",
+    "@storybook/addon-info": "^5.2.6",
+    "@storybook/addon-knobs": "^5.2.6",
+    "@storybook/addon-storyshots": "^5.2.6",
+    "@storybook/react": "^5.2.6",
+    "@storybook/theming": "^5.2.6",
     "@testing-library/react": "^9.3.2",
     "@testing-library/jest-dom": "4.2.0",
     "@types/angular": "^1.6.56",
@@ -66,6 +65,7 @@
     "@types/graphql": "^0.13.2",
     "@types/gulp": "^4.0.6",
     "@types/hapi__wreck": "^15.0.1",
+    "@types/hoist-non-react-statics": "^3.3.0",
     "@types/history": "^4.7.3",
     "@types/jest": "24.0.19",
     "@types/joi": "^13.4.2",
@@ -75,7 +75,7 @@
     "@types/jsonwebtoken": "^7.2.8",
     "@types/lodash": "^3.10.1",
     "@types/mapbox-gl": "^0.54.1",
-    "@types/memoize-one": "^4.1.1",
+    "@types/memoize-one": "^4.1.0",
     "@types/mime": "^2.0.1",
     "@types/mocha": "^5.2.7",
     "@types/nock": "^10.0.3",
@@ -96,7 +96,7 @@
     "@types/react-test-renderer": "^16.9.1",
     "@types/recompose": "^0.30.6",
     "@types/reduce-reducers": "^0.3.0",
-    "@types/redux-actions": "^2.2.1",
+    "@types/redux-actions": "^2.6.1",
     "@types/sinon": "^7.0.13",
     "@types/styled-components": "^4.4.1",
     "@types/supertest": "^2.0.5",
@@ -157,7 +157,7 @@
     "rxjs-marbles": "^5.0.3",
     "sass-loader": "^7.3.1",
     "sass-resources-loader": "^2.0.1",
-    "simple-git": "1.129.0",
+    "simple-git": "1.116.0",
     "sinon": "^7.4.2",
     "string-replace-loader": "^2.2.0",
     "supertest": "^3.1.0",
@@ -172,12 +172,13 @@
     "yargs": "4.8.1"
   },
   "dependencies": {
-    "@babel/core": "^7.7.5",
-    "@babel/register": "^7.7.4",
-    "@babel/runtime": "^7.7.6",
+    "@babel/core": "^7.5.5",
+    "@babel/register": "^7.7.0",
+    "@babel/runtime": "^7.5.5",
+    "@elastic/apm-rum-react": "^0.3.2",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "1.0.5",
-    "@elastic/eui": "17.0.0",
+    "@elastic/eui": "17.3.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/maki": "6.1.0",
     "@elastic/node-crypto": "^1.0.0",
@@ -229,10 +230,10 @@
     "file-type": "^10.9.0",
     "font-awesome": "4.7.0",
     "formsy-react": "^1.1.5",
-    "fp-ts": "^2.0.5",
+    "fp-ts": "^2.3.1",
     "geojson-rewind": "^0.3.1",
     "get-port": "4.2.0",
-    "getos": "^3.1.1",
+    "getos": "^3.1.0",
     "git-url-parse": "11.1.2",
     "github-markdown-css": "^2.10.0",
     "glob": "^7.1.2",
@@ -267,7 +268,7 @@
     "mapbox-gl": "1.3.1",
     "mapbox-gl-draw-rectangle-mode": "^1.0.4",
     "markdown-it": "^10.0.0",
-    "memoize-one": "^5.1.1",
+    "memoize-one": "^5.0.0",
     "mime": "^2.4.4",
     "moment": "^2.24.0",
     "moment-duration-format": "^2.3.2",
@@ -312,7 +313,7 @@
     "recompose": "^0.26.0",
     "reduce-reducers": "^0.4.3",
     "redux": "4.0.0",
-    "redux-actions": "2.2.1",
+    "redux-actions": "2.6.5",
     "redux-observable": "^1.0.0",
     "redux-saga": "^0.16.0",
     "redux-thunk": "2.3.0",
diff --git a/x-pack/plugins/advanced_ui_actions/public/can_inherit_time_range.test.ts b/x-pack/plugins/advanced_ui_actions/public/can_inherit_time_range.test.ts
index 03c096c8c178f..5f2e9d07c4bcb 100644
--- a/x-pack/plugins/advanced_ui_actions/public/can_inherit_time_range.test.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/can_inherit_time_range.test.ts
@@ -5,10 +5,8 @@
  */
 import { canInheritTimeRange } from './can_inherit_time_range';
 /** eslint-disable */
-import {
-  HelloWorldEmbeddable,
-  HelloWorldContainer,
-} from '../../../../src/plugins/embeddable/public/lib/test_samples';
+import { HelloWorldContainer } from '../../../../src/plugins/embeddable/public/lib/test_samples';
+import { HelloWorldEmbeddable } from '../../../../examples/embeddable_examples/public';
 /** eslint-enable */
 import { TimeRangeEmbeddable, TimeRangeContainer } from './test_helpers';
 
diff --git a/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.test.ts b/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.test.ts
index 55e913e0f31da..91b829a020048 100644
--- a/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.test.ts
+++ b/x-pack/plugins/advanced_ui_actions/public/custom_time_range_action.test.ts
@@ -16,13 +16,16 @@ import { TimeRangeEmbeddableFactory } from './test_helpers/time_range_embeddable
 import { CustomTimeRangeAction } from './custom_time_range_action';
 /* eslint-disable */
 import {
-  HelloWorldEmbeddableFactory,
-  HELLO_WORLD_EMBEDDABLE_TYPE,
-  HelloWorldEmbeddable,
   HelloWorldContainer,
 } from '../../../../src/plugins/embeddable/public/lib/test_samples';
 /* eslint-enable */
 
+import {
+  HelloWorldEmbeddableFactory,
+  HelloWorldEmbeddable,
+  HELLO_WORLD_EMBEDDABLE,
+} from '../../../../examples/embeddable_examples/public';
+
 import { nextTick } from 'test_utils/enzyme_helpers';
 import { ReactElement } from 'react';
 
@@ -277,13 +280,13 @@ test(`badge is compatible with embeddable that inherits from parent`, async () =
 // TODO: uncomment when https://github.com/elastic/kibana/issues/43271 is fixed.
 // test('Embeddable that does not use time range in a container that has time range is incompatible', async () => {
 //   const embeddableFactories = new Map<string, EmbeddableFactory>();
-//   embeddableFactories.set(HELLO_WORLD_EMBEDDABLE_TYPE, new HelloWorldEmbeddableFactory());
+//   embeddableFactories.set(HELLO_WORLD_EMBEDDABLE, new HelloWorldEmbeddableFactory());
 // const container = new TimeRangeContainer(
 //   {
 //     timeRange: { from: 'now-15m', to: 'now' },
 //     panels: {
 //       '1': {
-//         type: HELLO_WORLD_EMBEDDABLE_TYPE,
+//         type: HELLO_WORLD_EMBEDDABLE,
 //         explicitInput: {
 //           id: '1',
 //         },
@@ -313,12 +316,12 @@ test(`badge is compatible with embeddable that inherits from parent`, async () =
 
 test('Attempting to execute on incompatible embeddable throws an error', async () => {
   const embeddableFactories = new Map<string, EmbeddableFactory>();
-  embeddableFactories.set(HELLO_WORLD_EMBEDDABLE_TYPE, new HelloWorldEmbeddableFactory());
+  embeddableFactories.set(HELLO_WORLD_EMBEDDABLE, new HelloWorldEmbeddableFactory());
   const container = new HelloWorldContainer(
     {
       panels: {
         '1': {
-          type: HELLO_WORLD_EMBEDDABLE_TYPE,
+          type: HELLO_WORLD_EMBEDDABLE,
           explicitInput: {
             id: '1',
           },
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index a1cf2ae4e8ead..11d91efdf6b01 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -58,16 +58,14 @@ export class APMPlugin implements Plugin<APMPluginContract> {
     });
 
     await new Promise(resolve => {
-      combineLatest(mergedConfig$, core.elasticsearch.dataClient$).subscribe(
-        async ([config, dataClient]) => {
-          this.currentConfig = config;
-          await createApmAgentConfigurationIndex({
-            esClient: dataClient,
-            config,
-          });
-          resolve();
-        }
-      );
+      mergedConfig$.subscribe(async config => {
+        this.currentConfig = config;
+        await createApmAgentConfigurationIndex({
+          esClient: core.elasticsearch.dataClient,
+          config,
+        });
+        resolve();
+      });
     });
 
     return {
diff --git a/x-pack/plugins/canvas/kibana.json b/x-pack/plugins/canvas/kibana.json
index 87214f0287054..f18e7fe0590bc 100644
--- a/x-pack/plugins/canvas/kibana.json
+++ b/x-pack/plugins/canvas/kibana.json
@@ -5,6 +5,6 @@
     "configPath": ["xpack", "canvas"],
     "server": true,
     "ui": false,
-    "requiredPlugins": []
+    "requiredPlugins": [],
+    "optionalPlugins": ["usageCollection"]
   }
-  
\ No newline at end of file
diff --git a/x-pack/plugins/canvas/server/collectors/collector.ts b/x-pack/plugins/canvas/server/collectors/collector.ts
new file mode 100644
index 0000000000000..8e9e5ede2e7f2
--- /dev/null
+++ b/x-pack/plugins/canvas/server/collectors/collector.ts
@@ -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 { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { CANVAS_USAGE_TYPE } from '../../../../legacy/plugins/canvas/common/lib/constants';
+import { TelemetryCollector } from '../../types';
+
+import { workpadCollector } from './workpad_collector';
+import { customElementCollector } from './custom_element_collector';
+
+const collectors: TelemetryCollector[] = [workpadCollector, customElementCollector];
+
+/*
+  Register the canvas usage collector function
+
+  This will call all of the defined collectors and combine the individual results into a single object
+  to be returned to the caller.
+
+  A usage collector function returns an object derived from current data in the ES Cluster.
+*/
+export function registerCanvasUsageCollector(
+  usageCollection: UsageCollectionSetup | undefined,
+  kibanaIndex: string
+) {
+  if (!usageCollection) {
+    return;
+  }
+
+  const canvasCollector = usageCollection.makeUsageCollector({
+    type: CANVAS_USAGE_TYPE,
+    isReady: () => true,
+    fetch: async (callCluster: CallCluster) => {
+      const collectorResults = await Promise.all(
+        collectors.map(collector => collector(kibanaIndex, callCluster))
+      );
+
+      return collectorResults.reduce(
+        (reduction, usage) => {
+          return { ...reduction, ...usage };
+        },
+
+        {}
+      );
+    },
+  });
+
+  usageCollection.registerCollector(canvasCollector);
+}
diff --git a/x-pack/legacy/plugins/canvas/server/usage/collector_helpers.ts b/x-pack/plugins/canvas/server/collectors/collector_helpers.ts
similarity index 100%
rename from x-pack/legacy/plugins/canvas/server/usage/collector_helpers.ts
rename to x-pack/plugins/canvas/server/collectors/collector_helpers.ts
diff --git a/x-pack/legacy/plugins/canvas/server/usage/custom_element_collector.test.ts b/x-pack/plugins/canvas/server/collectors/custom_element_collector.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/canvas/server/usage/custom_element_collector.test.ts
rename to x-pack/plugins/canvas/server/collectors/custom_element_collector.test.ts
diff --git a/x-pack/legacy/plugins/canvas/server/usage/custom_element_collector.ts b/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts
similarity index 95%
rename from x-pack/legacy/plugins/canvas/server/usage/custom_element_collector.ts
rename to x-pack/plugins/canvas/server/collectors/custom_element_collector.ts
index 218ac0fed08c9..5f1944bea3eaa 100644
--- a/x-pack/legacy/plugins/canvas/server/usage/custom_element_collector.ts
+++ b/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts
@@ -8,8 +8,12 @@ import { SearchParams } from 'elasticsearch';
 import { get } from 'lodash';
 import { fromExpression } from '@kbn/interpreter/common';
 import { collectFns } from './collector_helpers';
-import { TelemetryCollector } from '../../types';
-import { ExpressionAST, TelemetryCustomElement, TelemetryCustomElementDocument } from '../../types';
+import {
+  ExpressionAST,
+  TelemetryCollector,
+  TelemetryCustomElement,
+  TelemetryCustomElementDocument,
+} from '../../types';
 
 const CUSTOM_ELEMENT_TYPE = 'canvas-element';
 interface CustomElementSearch {
diff --git a/x-pack/legacy/plugins/canvas/server/usage/index.ts b/x-pack/plugins/canvas/server/collectors/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/canvas/server/usage/index.ts
rename to x-pack/plugins/canvas/server/collectors/index.ts
diff --git a/x-pack/legacy/plugins/canvas/server/usage/workpad_collector.test.ts b/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts
similarity index 96%
rename from x-pack/legacy/plugins/canvas/server/usage/workpad_collector.test.ts
rename to x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts
index 420b785771bfe..70bc074ff3df8 100644
--- a/x-pack/legacy/plugins/canvas/server/usage/workpad_collector.test.ts
+++ b/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts
@@ -6,7 +6,7 @@
 
 import clonedeep from 'lodash.clonedeep';
 import { summarizeWorkpads } from './workpad_collector';
-import { workpads } from '../../__tests__/fixtures/workpads';
+import { workpads } from '../../../../legacy/plugins/canvas/__tests__/fixtures/workpads';
 
 describe('usage collector handle es response data', () => {
   it('should summarize workpads, pages, and elements', () => {
diff --git a/x-pack/legacy/plugins/canvas/server/usage/workpad_collector.ts b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts
similarity index 98%
rename from x-pack/legacy/plugins/canvas/server/usage/workpad_collector.ts
rename to x-pack/plugins/canvas/server/collectors/workpad_collector.ts
index 5e6e2fa6dbd6a..6c86b8b2c7468 100644
--- a/x-pack/legacy/plugins/canvas/server/usage/workpad_collector.ts
+++ b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts
@@ -7,7 +7,7 @@
 import { SearchParams } from 'elasticsearch';
 import { sum as arraySum, min as arrayMin, max as arrayMax, get } from 'lodash';
 import { fromExpression } from '@kbn/interpreter/common';
-import { CANVAS_TYPE } from '../../common/lib/constants';
+import { CANVAS_TYPE } from '../../../../legacy/plugins/canvas/common/lib/constants';
 import { collectFns } from './collector_helpers';
 import { ExpressionAST, TelemetryCollector, CanvasWorkpad } from '../../types';
 
diff --git a/x-pack/plugins/canvas/server/plugin.ts b/x-pack/plugins/canvas/server/plugin.ts
index 76b86c2ac39b4..0f27c68903b3d 100644
--- a/x-pack/plugins/canvas/server/plugin.ts
+++ b/x-pack/plugins/canvas/server/plugin.ts
@@ -4,19 +4,32 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { first } from 'rxjs/operators';
 import { CoreSetup, PluginInitializerContext, Plugin, Logger } from 'src/core/server';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { initRoutes } from './routes';
+import { registerCanvasUsageCollector } from './collectors';
+
+interface PluginsSetup {
+  usageCollection?: UsageCollectionSetup;
+}
 
 export class CanvasPlugin implements Plugin {
   private readonly logger: Logger;
-  constructor(initializerContext: PluginInitializerContext) {
+  constructor(public readonly initializerContext: PluginInitializerContext) {
     this.logger = initializerContext.logger.get();
   }
 
-  public setup(coreSetup: CoreSetup): void {
+  public async setup(coreSetup: CoreSetup, plugins: PluginsSetup) {
     const canvasRouter = coreSetup.http.createRouter();
 
     initRoutes({ router: canvasRouter, logger: this.logger });
+
+    // we need the kibana index provided by global config for the Canvas usage collector
+    const globalConfig = await this.initializerContext.config.legacy.globalConfig$
+      .pipe(first())
+      .toPromise();
+    registerCanvasUsageCollector(plugins.usageCollection, globalConfig.kibana.index);
   }
 
   public start() {}
diff --git a/x-pack/plugins/canvas/server/routes/catch_error_handler.ts b/x-pack/plugins/canvas/server/routes/catch_error_handler.ts
index fb7f4d6ee2600..4717d8762ffe2 100644
--- a/x-pack/plugins/canvas/server/routes/catch_error_handler.ts
+++ b/x-pack/plugins/canvas/server/routes/catch_error_handler.ts
@@ -4,14 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ObjectType } from '@kbn/config-schema';
 import { RequestHandler } from 'src/core/server';
 
-export const catchErrorHandler: <
-  P extends ObjectType<any>,
-  Q extends ObjectType<any>,
-  B extends ObjectType<any>
->(
+export const catchErrorHandler: <P, Q, B>(
   fn: RequestHandler<P, Q, B>
 ) => RequestHandler<P, Q, B> = fn => {
   return async (context, request, response) => {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/create.ts b/x-pack/plugins/canvas/server/routes/workpad/create.ts
index fc847d4816dbd..1e9a320c0eeef 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/create.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/create.ts
@@ -24,6 +24,12 @@ export function initializeCreateWorkpadRoute(deps: RouteInitializerDeps) {
       validate: {
         body: WorkpadSchema,
       },
+      options: {
+        body: {
+          maxBytes: 26214400,
+          accepts: ['application/json'],
+        },
+      },
     },
     catchErrorHandler(async (context, request, response) => {
       if (!request.body) {
diff --git a/x-pack/plugins/canvas/server/routes/workpad/update.ts b/x-pack/plugins/canvas/server/routes/workpad/update.ts
index 74dedb605472c..0d4809a9ee168 100644
--- a/x-pack/plugins/canvas/server/routes/workpad/update.ts
+++ b/x-pack/plugins/canvas/server/routes/workpad/update.ts
@@ -64,6 +64,12 @@ export function initializeUpdateWorkpadRoute(deps: RouteInitializerDeps) {
         }),
         body: WorkpadSchema,
       },
+      options: {
+        body: {
+          maxBytes: 26214400,
+          accepts: ['application/json'],
+        },
+      },
     },
     catchErrorHandler(async (context, request, response) => {
       return workpadUpdateHandler(
@@ -84,6 +90,12 @@ export function initializeUpdateWorkpadRoute(deps: RouteInitializerDeps) {
         }),
         body: WorkpadSchema,
       },
+      options: {
+        body: {
+          maxBytes: 26214400,
+          accepts: ['application/json'],
+        },
+      },
     },
     catchErrorHandler(async (context, request, response) => {
       return workpadUpdateHandler(
@@ -111,6 +123,12 @@ export function initializeUpdateWorkpadAssetsRoute(deps: RouteInitializerDeps) {
         // unknowns and then validate in the handler
         body: schema.object({}, { allowUnknowns: true }),
       },
+      options: {
+        body: {
+          maxBytes: 26214400,
+          accepts: ['application/json'],
+        },
+      },
     },
     async (context, request, response) => {
       return workpadUpdateHandler(
diff --git a/x-pack/plugins/canvas/types/index.ts b/x-pack/plugins/canvas/types/index.ts
new file mode 100644
index 0000000000000..014b203754a21
--- /dev/null
+++ b/x-pack/plugins/canvas/types/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from '../../../legacy/plugins/canvas/types';
diff --git a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
index 73c2439f777cc..39da4c7d2d353 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
@@ -9,9 +9,6 @@ import {
   SavedObjectsBaseOptions,
   PluginInitializerContext,
   CoreSetup,
-  SavedObjectsLegacyService,
-  KibanaRequest,
-  LegacyRequest,
 } from 'src/core/server';
 import { first } from 'rxjs/operators';
 import { createConfig$ } from './config';
@@ -37,7 +34,6 @@ export interface PluginStartContract extends SavedObjectsSetup {
  * to function properly.
  */
 export interface LegacyAPI {
-  savedObjects: SavedObjectsLegacyService<KibanaRequest | LegacyRequest>;
   auditLogger: {
     log: (eventType: string, message: string, data?: Record<string, unknown>) => void;
   };
@@ -48,7 +44,7 @@ export interface LegacyAPI {
  */
 export class Plugin {
   private readonly logger: Logger;
-  private savedObjectsSetup?: ReturnType<typeof setupSavedObjects>;
+  private savedObjectsSetup!: SavedObjectsSetup;
 
   private legacyAPI?: LegacyAPI;
   private readonly getLegacyAPI = () => {
@@ -66,7 +62,6 @@ export class Plugin {
     const config = await createConfig$(this.initializerContext)
       .pipe(first())
       .toPromise();
-    const adminClusterClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();
 
     const service = Object.freeze(
       new EncryptedSavedObjectsService(
@@ -76,19 +71,12 @@ export class Plugin {
       )
     );
 
+    this.savedObjectsSetup = setupSavedObjects({ service, savedObjects: core.savedObjects });
+
     return {
       registerType: (typeRegistration: EncryptedSavedObjectTypeRegistration) =>
         service.registerType(typeRegistration),
-      __legacyCompat: {
-        registerLegacyAPI: (legacyAPI: LegacyAPI) => {
-          this.legacyAPI = legacyAPI;
-          this.savedObjectsSetup = setupSavedObjects({
-            adminClusterClient,
-            service,
-            savedObjects: legacyAPI.savedObjects,
-          });
-        },
-      },
+      __legacyCompat: { registerLegacyAPI: (legacyAPI: LegacyAPI) => (this.legacyAPI = legacyAPI) },
     };
   }
 
@@ -98,10 +86,6 @@ export class 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);
       },
     };
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
index e5445e187e2cc..c967c92deb6ff 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
@@ -5,19 +5,17 @@
  */
 
 import {
-  IClusterClient,
+  CoreSetup,
   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'];
+  savedObjects: CoreSetup['savedObjects'];
 }
 
 export interface SavedObjectsSetup {
@@ -29,7 +27,6 @@ export interface SavedObjectsSetup {
 }
 
 export function setupSavedObjects({
-  adminClusterClient,
   service,
   savedObjects,
 }: SetupSavedObjectsParams): SavedObjectsSetup {
@@ -38,16 +35,13 @@ export function setupSavedObjects({
   // 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(
+  savedObjects.addClientWrapper(
     Number.MAX_SAFE_INTEGER,
     'encryptedSavedObjects',
     ({ client: baseClient }) => new EncryptedSavedObjectsClientWrapper({ baseClient, service })
   );
 
-  const internalRepository = savedObjects.getSavedObjectsRepository(
-    adminClusterClient.callAsInternalUser
-  );
-
+  const internalRepository = savedObjects.createInternalRepository();
   return {
     getDecryptedAsInternalUser: async <T extends SavedObjectAttributes = any>(
       type: string,
diff --git a/x-pack/plugins/endpoint/kibana.json b/x-pack/plugins/endpoint/kibana.json
index a7fd20b93f62d..f7a4acd629324 100644
--- a/x-pack/plugins/endpoint/kibana.json
+++ b/x-pack/plugins/endpoint/kibana.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "kibanaVersion": "kibana",
   "configPath": ["xpack", "endpoint"],
-  "requiredPlugins": ["embeddable"],
+  "requiredPlugins": ["features", "embeddable"],
   "server": true,
   "ui": true
 }
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/index.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/index.tsx
new file mode 100644
index 0000000000000..82c95b37ee7b0
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/index.tsx
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as React from 'react';
+import ReactDOM from 'react-dom';
+import { CoreStart, AppMountParameters } from 'kibana/public';
+import { I18nProvider, FormattedMessage } from '@kbn/i18n/react';
+import { Route, BrowserRouter, Switch } from 'react-router-dom';
+
+/**
+ * This module will be loaded asynchronously to reduce the bundle size of your plugin's main bundle.
+ */
+export function renderApp(coreStart: CoreStart, { appBasePath, element }: AppMountParameters) {
+  coreStart.http.get('/api/endpoint/hello-world');
+
+  ReactDOM.render(<AppRoot basename={appBasePath} />, element);
+
+  return () => {
+    ReactDOM.unmountComponentAtNode(element);
+  };
+}
+
+interface RouterProps {
+  basename: string;
+}
+
+const AppRoot: React.FunctionComponent<RouterProps> = React.memo(({ basename }) => (
+  <I18nProvider>
+    <BrowserRouter basename={basename}>
+      <Switch>
+        <Route
+          exact
+          path="/"
+          render={() => (
+            <h1 data-test-subj="welcomeTitle">
+              <FormattedMessage id="xpack.endpoint.welcomeTitle" defaultMessage="Hello World" />
+            </h1>
+          )}
+        />
+        <Route
+          path="/management"
+          render={() => (
+            <h1 data-test-subj="endpointManagement">
+              <FormattedMessage
+                id="xpack.endpoint.endpointManagement"
+                defaultMessage="Manage Endpoints"
+              />
+            </h1>
+          )}
+        />
+        <Route
+          render={() => (
+            <FormattedMessage id="xpack.endpoint.notFound" defaultMessage="Page Not Found" />
+          )}
+        />
+      </Switch>
+    </BrowserRouter>
+  </I18nProvider>
+));
diff --git a/x-pack/plugins/endpoint/public/plugin.ts b/x-pack/plugins/endpoint/public/plugin.ts
index 21bf1b3cdea12..02514cc974af0 100644
--- a/x-pack/plugins/endpoint/public/plugin.ts
+++ b/x-pack/plugins/endpoint/public/plugin.ts
@@ -4,8 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup, AppMountParameters } from 'kibana/public';
 import { IEmbeddableSetup } from 'src/plugins/embeddable/public';
+import { i18n } from '@kbn/i18n';
 import { ResolverEmbeddableFactory } from './embeddables/resolver';
 
 export type EndpointPluginStart = void;
@@ -24,8 +25,20 @@ export class EndpointPlugin
       EndpointPluginSetupDependencies,
       EndpointPluginStartDependencies
     > {
-  public setup(_core: CoreSetup, plugins: EndpointPluginSetupDependencies) {
+  public setup(core: CoreSetup, plugins: EndpointPluginSetupDependencies) {
     const resolverEmbeddableFactory = new ResolverEmbeddableFactory();
+    core.application.register({
+      id: 'endpoint',
+      title: i18n.translate('xpack.endpoint.pluginTitle', {
+        defaultMessage: 'Endpoint',
+      }),
+      async mount(params: AppMountParameters) {
+        const [coreStart] = await core.getStartServices();
+        const { renderApp } = await import('./applications/endpoint');
+        return renderApp(coreStart, params);
+      },
+    });
+
     plugins.embeddable.registerEmbeddableFactory(
       resolverEmbeddableFactory.type,
       resolverEmbeddableFactory
diff --git a/x-pack/plugins/endpoint/server/config.test.ts b/x-pack/plugins/endpoint/server/config.test.ts
new file mode 100644
index 0000000000000..39f6bca2d43ca
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/config.test.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { EndpointConfigSchema, EndpointConfigType } from './config';
+
+describe('test config schema', () => {
+  it('test config defaults', () => {
+    const config: EndpointConfigType = EndpointConfigSchema.validate({});
+    expect(config.enabled).toEqual(false);
+    expect(config.endpointResultListDefaultPageSize).toEqual(10);
+    expect(config.endpointResultListDefaultFirstPageIndex).toEqual(0);
+  });
+});
diff --git a/x-pack/plugins/endpoint/server/config.ts b/x-pack/plugins/endpoint/server/config.ts
new file mode 100644
index 0000000000000..3f9a8a5508dd8
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/config.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 { schema, TypeOf } from '@kbn/config-schema';
+import { Observable } from 'rxjs';
+import { PluginInitializerContext } from 'kibana/server';
+
+export type EndpointConfigType = ReturnType<typeof createConfig$> extends Observable<infer P>
+  ? P
+  : ReturnType<typeof createConfig$>;
+
+export const EndpointConfigSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: false }),
+  endpointResultListDefaultFirstPageIndex: schema.number({ defaultValue: 0 }),
+  endpointResultListDefaultPageSize: schema.number({ defaultValue: 10 }),
+});
+
+export function createConfig$(context: PluginInitializerContext) {
+  return context.config.create<TypeOf<typeof EndpointConfigSchema>>();
+}
diff --git a/x-pack/plugins/endpoint/server/index.ts b/x-pack/plugins/endpoint/server/index.ts
index f10bc7ee51b2c..ae603b7e44449 100644
--- a/x-pack/plugins/endpoint/server/index.ts
+++ b/x-pack/plugins/endpoint/server/index.ts
@@ -4,8 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { schema } from '@kbn/config-schema';
-import { PluginInitializer } from 'src/core/server';
+import { PluginInitializer, PluginInitializerContext } from 'src/core/server';
 import {
   EndpointPlugin,
   EndpointPluginStart,
@@ -13,14 +12,15 @@ import {
   EndpointPluginStartDependencies,
   EndpointPluginSetupDependencies,
 } from './plugin';
+import { EndpointConfigSchema } from './config';
 
 export const config = {
-  schema: schema.object({ enabled: schema.boolean({ defaultValue: false }) }),
+  schema: EndpointConfigSchema,
 };
 
 export const plugin: PluginInitializer<
-  EndpointPluginStart,
   EndpointPluginSetup,
-  EndpointPluginStartDependencies,
-  EndpointPluginSetupDependencies
-> = () => new EndpointPlugin();
+  EndpointPluginStart,
+  EndpointPluginSetupDependencies,
+  EndpointPluginStartDependencies
+> = (initializerContext: PluginInitializerContext) => new EndpointPlugin(initializerContext);
diff --git a/x-pack/plugins/endpoint/server/plugin.test.ts b/x-pack/plugins/endpoint/server/plugin.test.ts
new file mode 100644
index 0000000000000..87d373d3a4f34
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/plugin.test.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { CoreSetup } from 'kibana/server';
+import { EndpointPlugin, EndpointPluginSetupDependencies } from './plugin';
+import { coreMock } from '../../../../src/core/server/mocks';
+import { PluginSetupContract } from '../../features/server';
+
+describe('test endpoint plugin', () => {
+  let plugin: EndpointPlugin;
+  let mockCoreSetup: MockedKeys<CoreSetup>;
+  let mockedEndpointPluginSetupDependencies: jest.Mocked<EndpointPluginSetupDependencies>;
+  let mockedPluginSetupContract: jest.Mocked<PluginSetupContract>;
+  beforeEach(() => {
+    plugin = new EndpointPlugin(
+      coreMock.createPluginInitializerContext({
+        cookieName: 'sid',
+        sessionTimeout: 1500,
+      })
+    );
+
+    mockCoreSetup = coreMock.createSetup();
+    mockedPluginSetupContract = {
+      registerFeature: jest.fn(),
+      getFeatures: jest.fn(),
+      getFeaturesUICapabilities: jest.fn(),
+      registerLegacyAPI: jest.fn(),
+    };
+    mockedEndpointPluginSetupDependencies = { features: mockedPluginSetupContract };
+  });
+
+  it('test properly setup plugin', async () => {
+    await plugin.setup(mockCoreSetup, mockedEndpointPluginSetupDependencies);
+    expect(mockedPluginSetupContract.registerFeature).toBeCalledTimes(1);
+    expect(mockCoreSetup.http.createRouter).toBeCalledTimes(1);
+  });
+});
diff --git a/x-pack/plugins/endpoint/server/plugin.ts b/x-pack/plugins/endpoint/server/plugin.ts
index 400b906c5230e..7ed116ba21140 100644
--- a/x-pack/plugins/endpoint/server/plugin.ts
+++ b/x-pack/plugins/endpoint/server/plugin.ts
@@ -3,28 +3,77 @@
  * 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 'kibana/server';
+import { Plugin, CoreSetup, PluginInitializerContext, Logger } from 'kibana/server';
+import { first } from 'rxjs/operators';
 import { addRoutes } from './routes';
+import { PluginSetupContract as FeaturesPluginSetupContract } from '../../features/server';
+import { createConfig$, EndpointConfigType } from './config';
+import { EndpointAppContext } from './types';
+import { registerEndpointRoutes } from './routes/endpoints';
 
 export type EndpointPluginStart = void;
 export type EndpointPluginSetup = void;
-export interface EndpointPluginSetupDependencies {} // eslint-disable-line @typescript-eslint/no-empty-interface
-
 export interface EndpointPluginStartDependencies {} // eslint-disable-line @typescript-eslint/no-empty-interface
 
+export interface EndpointPluginSetupDependencies {
+  features: FeaturesPluginSetupContract;
+}
+
 export class EndpointPlugin
   implements
     Plugin<
-      EndpointPluginStart,
       EndpointPluginSetup,
-      EndpointPluginStartDependencies,
-      EndpointPluginSetupDependencies
+      EndpointPluginStart,
+      EndpointPluginSetupDependencies,
+      EndpointPluginStartDependencies
     > {
-  public setup(core: CoreSetup) {
+  private readonly logger: Logger;
+  constructor(private readonly initializerContext: PluginInitializerContext) {
+    this.logger = this.initializerContext.logger.get('endpoint');
+  }
+  public setup(core: CoreSetup, plugins: EndpointPluginSetupDependencies) {
+    plugins.features.registerFeature({
+      id: 'endpoint',
+      name: 'Endpoint',
+      icon: 'bug',
+      navLinkId: 'endpoint',
+      app: ['endpoint', 'kibana'],
+      privileges: {
+        all: {
+          api: ['resolver'],
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: ['save'],
+        },
+        read: {
+          api: [],
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        },
+      },
+    });
+    const endpointContext = {
+      logFactory: this.initializerContext.logger,
+      config: (): Promise<EndpointConfigType> => {
+        return createConfig$(this.initializerContext)
+          .pipe(first())
+          .toPromise();
+      },
+    } as EndpointAppContext;
     const router = core.http.createRouter();
     addRoutes(router);
+    registerEndpointRoutes(router, endpointContext);
   }
 
-  public start() {}
+  public start() {
+    this.logger.debug('Starting plugin');
+  }
+  public stop() {
+    this.logger.debug('Stopping plugin');
+  }
 }
diff --git a/x-pack/plugins/endpoint/server/routes/endpoints.test.ts b/x-pack/plugins/endpoint/server/routes/endpoints.test.ts
new file mode 100644
index 0000000000000..60433f86b6f7e
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/routes/endpoints.test.ts
@@ -0,0 +1,123 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import {
+  IClusterClient,
+  IRouter,
+  IScopedClusterClient,
+  KibanaResponseFactory,
+  RequestHandler,
+  RequestHandlerContext,
+  RouteConfig,
+} from 'kibana/server';
+import {
+  elasticsearchServiceMock,
+  httpServerMock,
+  httpServiceMock,
+  loggingServiceMock,
+} from '../../../../../src/core/server/mocks';
+import { EndpointData } from '../types';
+import { SearchResponse } from 'elasticsearch';
+import { EndpointResultList, registerEndpointRoutes } from './endpoints';
+import { EndpointConfigSchema } from '../config';
+import * as data from '../test_data/all_endpoints_data.json';
+
+describe('test endpoint route', () => {
+  let routerMock: jest.Mocked<IRouter>;
+  let mockResponse: jest.Mocked<KibanaResponseFactory>;
+  let mockClusterClient: jest.Mocked<IClusterClient>;
+  let mockScopedClient: jest.Mocked<IScopedClusterClient>;
+  let routeHandler: RequestHandler<any, any, any>;
+  let routeConfig: RouteConfig<any, any, any, any>;
+
+  beforeEach(() => {
+    mockClusterClient = elasticsearchServiceMock.createClusterClient() as jest.Mocked<
+      IClusterClient
+    >;
+    mockScopedClient = elasticsearchServiceMock.createScopedClusterClient();
+    mockClusterClient.asScoped.mockReturnValue(mockScopedClient);
+    routerMock = httpServiceMock.createRouter();
+    mockResponse = httpServerMock.createResponseFactory();
+    registerEndpointRoutes(routerMock, {
+      logFactory: loggingServiceMock.create(),
+      config: () => Promise.resolve(EndpointConfigSchema.validate({})),
+    });
+  });
+
+  it('test find the latest of all endpoints', async () => {
+    const mockRequest = httpServerMock.createKibanaRequest({});
+
+    const response: SearchResponse<EndpointData> = (data as unknown) as SearchResponse<
+      EndpointData
+    >;
+    mockScopedClient.callAsCurrentUser.mockImplementationOnce(() => Promise.resolve(response));
+    [routeConfig, routeHandler] = routerMock.post.mock.calls.find(([{ path }]) =>
+      path.startsWith('/api/endpoint/endpoints')
+    )!;
+
+    await routeHandler(
+      ({
+        core: {
+          elasticsearch: {
+            dataClient: mockScopedClient,
+          },
+        },
+      } as unknown) as RequestHandlerContext,
+      mockRequest,
+      mockResponse
+    );
+
+    expect(mockScopedClient.callAsCurrentUser).toBeCalled();
+    expect(routeConfig.options).toEqual({ authRequired: true });
+    expect(mockResponse.ok).toBeCalled();
+    const endpointResultList = mockResponse.ok.mock.calls[0][0]?.body as EndpointResultList;
+    expect(endpointResultList.endpoints.length).toEqual(3);
+    expect(endpointResultList.total).toEqual(3);
+    expect(endpointResultList.request_index).toEqual(0);
+    expect(endpointResultList.request_page_size).toEqual(10);
+  });
+
+  it('test find the latest of all endpoints with params', async () => {
+    const mockRequest = httpServerMock.createKibanaRequest({
+      body: {
+        paging_properties: [
+          {
+            page_size: 10,
+          },
+          {
+            page_index: 1,
+          },
+        ],
+      },
+    });
+    mockScopedClient.callAsCurrentUser.mockImplementationOnce(() =>
+      Promise.resolve((data as unknown) as SearchResponse<EndpointData>)
+    );
+    [routeConfig, routeHandler] = routerMock.post.mock.calls.find(([{ path }]) =>
+      path.startsWith('/api/endpoint/endpoints')
+    )!;
+
+    await routeHandler(
+      ({
+        core: {
+          elasticsearch: {
+            dataClient: mockScopedClient,
+          },
+        },
+      } as unknown) as RequestHandlerContext,
+      mockRequest,
+      mockResponse
+    );
+
+    expect(mockScopedClient.callAsCurrentUser).toBeCalled();
+    expect(routeConfig.options).toEqual({ authRequired: true });
+    expect(mockResponse.ok).toBeCalled();
+    const endpointResultList = mockResponse.ok.mock.calls[0][0]?.body as EndpointResultList;
+    expect(endpointResultList.endpoints.length).toEqual(3);
+    expect(endpointResultList.total).toEqual(3);
+    expect(endpointResultList.request_index).toEqual(10);
+    expect(endpointResultList.request_page_size).toEqual(10);
+  });
+});
diff --git a/x-pack/plugins/endpoint/server/routes/endpoints.ts b/x-pack/plugins/endpoint/server/routes/endpoints.ts
new file mode 100644
index 0000000000000..59430947d97da
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/routes/endpoints.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IRouter } from 'kibana/server';
+import { SearchResponse } from 'elasticsearch';
+import { schema } from '@kbn/config-schema';
+import { EndpointAppContext, EndpointData } from '../types';
+import { kibanaRequestToEndpointListQuery } from '../services/endpoint/endpoint_query_builders';
+
+interface HitSource {
+  _source: EndpointData;
+}
+
+export interface EndpointResultList {
+  // the endpoint restricted by the page size
+  endpoints: EndpointData[];
+  // the total number of unique endpoints in the index
+  total: number;
+  // the page size requested
+  request_page_size: number;
+  // the index requested
+  request_index: number;
+}
+
+export function registerEndpointRoutes(router: IRouter, endpointAppContext: EndpointAppContext) {
+  router.post(
+    {
+      path: '/api/endpoint/endpoints',
+      validate: {
+        body: schema.nullable(
+          schema.object({
+            paging_properties: schema.arrayOf(
+              schema.oneOf([
+                // the number of results to return for this request per page
+                schema.object({
+                  page_size: schema.number({ defaultValue: 10, min: 1, max: 10000 }),
+                }),
+                // the index of the page to return
+                schema.object({ page_index: schema.number({ defaultValue: 0, min: 0 }) }),
+              ])
+            ),
+          })
+        ),
+      },
+      options: { authRequired: true },
+    },
+    async (context, req, res) => {
+      try {
+        const queryParams = await kibanaRequestToEndpointListQuery(req, endpointAppContext);
+        const response = (await context.core.elasticsearch.dataClient.callAsCurrentUser(
+          'search',
+          queryParams
+        )) as SearchResponse<EndpointData>;
+        return res.ok({ body: mapToEndpointResultList(queryParams, response) });
+      } catch (err) {
+        return res.internalError({ body: err });
+      }
+    }
+  );
+}
+
+function mapToEndpointResultList(
+  queryParams: Record<string, any>,
+  searchResponse: SearchResponse<EndpointData>
+): EndpointResultList {
+  if (searchResponse.hits.hits.length > 0) {
+    return {
+      request_page_size: queryParams.size,
+      request_index: queryParams.from,
+      endpoints: searchResponse.hits.hits
+        .map(response => response.inner_hits.most_recent.hits.hits)
+        .flatMap(data => data as HitSource)
+        .map(entry => entry._source),
+      total: searchResponse.aggregations.total.value,
+    };
+  } else {
+    return {
+      request_page_size: queryParams.size,
+      request_index: queryParams.from,
+      total: 0,
+      endpoints: [],
+    };
+  }
+}
diff --git a/x-pack/plugins/endpoint/server/routes/index.ts b/x-pack/plugins/endpoint/server/routes/index.ts
index 517ee2a853660..8eab6cd384765 100644
--- a/x-pack/plugins/endpoint/server/routes/index.ts
+++ b/x-pack/plugins/endpoint/server/routes/index.ts
@@ -11,6 +11,9 @@ export function addRoutes(router: IRouter) {
     {
       path: '/api/endpoint/hello-world',
       validate: false,
+      options: {
+        tags: ['access:resolver'],
+      },
     },
     async function greetingIndex(_context, _request, response) {
       return response.ok({
diff --git a/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.test.ts b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.test.ts
new file mode 100644
index 0000000000000..2a8cecec16526
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.test.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { httpServerMock, loggingServiceMock } from '../../../../../../src/core/server/mocks';
+import { EndpointConfigSchema } from '../../config';
+import { kibanaRequestToEndpointListQuery } from './endpoint_query_builders';
+
+describe('test query builder', () => {
+  describe('test query builder request processing', () => {
+    it('test default query params for all endpoints when no params or body is provided', async () => {
+      const mockRequest = httpServerMock.createKibanaRequest({
+        body: {},
+      });
+      const query = await kibanaRequestToEndpointListQuery(mockRequest, {
+        logFactory: loggingServiceMock.create(),
+        config: () => Promise.resolve(EndpointConfigSchema.validate({})),
+      });
+      expect(query).toEqual({
+        body: {
+          query: {
+            match_all: {},
+          },
+          collapse: {
+            field: 'machine_id',
+            inner_hits: {
+              name: 'most_recent',
+              size: 1,
+              sort: [{ created_at: 'desc' }],
+            },
+          },
+          aggs: {
+            total: {
+              cardinality: {
+                field: 'machine_id',
+              },
+            },
+          },
+          sort: [
+            {
+              created_at: {
+                order: 'desc',
+              },
+            },
+          ],
+        },
+        from: 0,
+        size: 10,
+        index: 'endpoint-agent*',
+      } as Record<string, any>);
+    });
+  });
+});
diff --git a/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.ts b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.ts
new file mode 100644
index 0000000000000..7430ba9721608
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/services/endpoint/endpoint_query_builders.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { KibanaRequest } from 'kibana/server';
+import { EndpointAppConstants, EndpointAppContext } from '../../types';
+
+export const kibanaRequestToEndpointListQuery = async (
+  request: KibanaRequest<any, any, any>,
+  endpointAppContext: EndpointAppContext
+): Promise<Record<string, any>> => {
+  const pagingProperties = await getPagingProperties(request, endpointAppContext);
+  return {
+    body: {
+      query: {
+        match_all: {},
+      },
+      collapse: {
+        field: 'machine_id',
+        inner_hits: {
+          name: 'most_recent',
+          size: 1,
+          sort: [{ created_at: 'desc' }],
+        },
+      },
+      aggs: {
+        total: {
+          cardinality: {
+            field: 'machine_id',
+          },
+        },
+      },
+      sort: [
+        {
+          created_at: {
+            order: 'desc',
+          },
+        },
+      ],
+    },
+    from: pagingProperties.pageIndex * pagingProperties.pageSize,
+    size: pagingProperties.pageSize,
+    index: EndpointAppConstants.ENDPOINT_INDEX_NAME,
+  };
+};
+
+async function getPagingProperties(
+  request: KibanaRequest<any, any, any>,
+  endpointAppContext: EndpointAppContext
+) {
+  const config = await endpointAppContext.config();
+  const pagingProperties: { page_size?: number; page_index?: number } = {};
+  if (request?.body?.paging_properties) {
+    for (const property of request.body.paging_properties) {
+      Object.assign(
+        pagingProperties,
+        ...Object.keys(property).map(key => ({ [key]: property[key] }))
+      );
+    }
+  }
+  return {
+    pageSize: pagingProperties.page_size || config.endpointResultListDefaultPageSize,
+    pageIndex: pagingProperties.page_index || config.endpointResultListDefaultFirstPageIndex,
+  };
+}
diff --git a/x-pack/plugins/endpoint/server/test_data/all_endpoints_data.json b/x-pack/plugins/endpoint/server/test_data/all_endpoints_data.json
new file mode 100644
index 0000000000000..d505b2c929828
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/test_data/all_endpoints_data.json
@@ -0,0 +1,348 @@
+{
+  "took": 3,
+  "timed_out": false,
+  "_shards": {
+    "total": 1,
+    "successful": 1,
+    "skipped": 0,
+    "failed": 0
+  },
+  "hits": {
+    "total": {
+      "value": 9,
+      "relation": "eq"
+    },
+    "max_score": null,
+    "hits": [
+      {
+        "_index": "endpoint-agent",
+        "_id": "UV_6SG8B9c_DH2QsbOZd",
+        "_score": null,
+        "_source": {
+          "machine_id": "606267a9-2e51-42b4-956e-6cc7812e3447",
+          "created_at": "2019-12-27T20:09:28.377Z",
+          "host": {
+            "name": "natalee-2",
+            "hostname": "natalee-2.example.com",
+            "ip": "10.5.220.127",
+            "mac_address": "17-5f-c9-f8-ca-d6",
+            "os": {
+              "name": "windows 6.3",
+              "full": "Windows Server 2012R2"
+            }
+          },
+          "endpoint": {
+            "domain": "example.com",
+            "is_base_image": false,
+            "active_directory_distinguished_name": "CN=natalee-2,DC=example,DC=com",
+            "active_directory_hostname": "natalee-2.example.com",
+            "upgrade": {
+              "status": null,
+              "updated_at": null
+            },
+            "isolation": {
+              "status": false,
+              "request_status": null,
+              "updated_at": null
+            },
+            "policy": {
+              "name": "With Eventing",
+              "id": "C2A9093E-E289-4C0A-AA44-8C32A414FA7A"
+            },
+            "sensor": {
+              "persistence": true,
+              "status": {}
+            }
+          }
+        },
+        "fields": {
+          "machine_id": [
+            "606267a9-2e51-42b4-956e-6cc7812e3447"
+          ]
+        },
+        "sort": [
+          1577477368377
+        ],
+        "inner_hits": {
+          "most_recent": {
+            "hits": {
+              "total": {
+                "value": 3,
+                "relation": "eq"
+              },
+              "max_score": null,
+              "hits": [
+                {
+                  "_index": "endpoint-agent",
+                  "_id": "UV_6SG8B9c_DH2QsbOZd",
+                  "_score": null,
+                  "_source": {
+                    "machine_id": "606267a9-2e51-42b4-956e-6cc7812e3447",
+                    "created_at": "2019-12-27T20:09:28.377Z",
+                    "host": {
+                      "name": "natalee-2",
+                      "hostname": "natalee-2.example.com",
+                      "ip": "10.5.220.127",
+                      "mac_address": "17-5f-c9-f8-ca-d6",
+                      "os": {
+                        "name": "windows 6.3",
+                        "full": "Windows Server 2012R2"
+                      }
+                    },
+                    "endpoint": {
+                      "domain": "example.com",
+                      "is_base_image": false,
+                      "active_directory_distinguished_name": "CN=natalee-2,DC=example,DC=com",
+                      "active_directory_hostname": "natalee-2.example.com",
+                      "upgrade": {
+                        "status": null,
+                        "updated_at": null
+                      },
+                      "isolation": {
+                        "status": false,
+                        "request_status": null,
+                        "updated_at": null
+                      },
+                      "policy": {
+                        "name": "With Eventing",
+                        "id": "C2A9093E-E289-4C0A-AA44-8C32A414FA7A"
+                      },
+                      "sensor": {
+                        "persistence": true,
+                        "status": {}
+                      }
+                    }
+                  },
+                  "sort": [
+                    1577477368377
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      },
+      {
+        "_index": "endpoint-agent",
+        "_id": "Ul_6SG8B9c_DH2QsbOZd",
+        "_score": null,
+        "_source": {
+          "machine_id": "8ec625e1-a80c-4c9f-bdfd-496060aa6310",
+          "created_at": "2019-12-27T20:09:28.377Z",
+          "host": {
+            "name": "luttrell-2",
+            "hostname": "luttrell-2.example.com",
+            "ip": "10.246.84.193",
+            "mac_address": "dc-d-88-14-c3-c6",
+            "os": {
+              "name": "windows 6.3",
+              "full": "Windows Server 2012R2"
+            }
+          },
+          "endpoint": {
+            "domain": "example.com",
+            "is_base_image": false,
+            "active_directory_distinguished_name": "CN=luttrell-2,DC=example,DC=com",
+            "active_directory_hostname": "luttrell-2.example.com",
+            "upgrade": {
+              "status": null,
+              "updated_at": null
+            },
+            "isolation": {
+              "status": false,
+              "request_status": null,
+              "updated_at": null
+            },
+            "policy": {
+              "name": "Default",
+              "id": "00000000-0000-0000-0000-000000000000"
+            },
+            "sensor": {
+              "persistence": true,
+              "status": {}
+            }
+          }
+        },
+        "fields": {
+          "machine_id": [
+            "8ec625e1-a80c-4c9f-bdfd-496060aa6310"
+          ]
+        },
+        "sort": [
+          1577477368377
+        ],
+        "inner_hits": {
+          "most_recent": {
+            "hits": {
+              "total": {
+                "value": 3,
+                "relation": "eq"
+              },
+              "max_score": null,
+              "hits": [
+                {
+                  "_index": "endpoint-agent",
+                  "_id": "Ul_6SG8B9c_DH2QsbOZd",
+                  "_score": null,
+                  "_source": {
+                    "machine_id": "8ec625e1-a80c-4c9f-bdfd-496060aa6310",
+                    "created_at": "2019-12-27T20:09:28.377Z",
+                    "host": {
+                      "name": "luttrell-2",
+                      "hostname": "luttrell-2.example.com",
+                      "ip": "10.246.84.193",
+                      "mac_address": "dc-d-88-14-c3-c6",
+                      "os": {
+                        "name": "windows 6.3",
+                        "full": "Windows Server 2012R2"
+                      }
+                    },
+                    "endpoint": {
+                      "domain": "example.com",
+                      "is_base_image": false,
+                      "active_directory_distinguished_name": "CN=luttrell-2,DC=example,DC=com",
+                      "active_directory_hostname": "luttrell-2.example.com",
+                      "upgrade": {
+                        "status": null,
+                        "updated_at": null
+                      },
+                      "isolation": {
+                        "status": false,
+                        "request_status": null,
+                        "updated_at": null
+                      },
+                      "policy": {
+                        "name": "Default",
+                        "id": "00000000-0000-0000-0000-000000000000"
+                      },
+                      "sensor": {
+                        "persistence": true,
+                        "status": {}
+                      }
+                    }
+                  },
+                  "sort": [
+                    1577477368377
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      },
+      {
+        "_index": "endpoint-agent",
+        "_id": "U1_6SG8B9c_DH2QsbOZd",
+        "_score": null,
+        "_source": {
+          "machine_id": "853a308c-6e6d-4b92-a32b-2f623b6c8cf4",
+          "created_at": "2019-12-27T20:09:28.377Z",
+          "host": {
+            "name": "akeylah-7",
+            "hostname": "akeylah-7.example.com",
+            "ip": "10.252.242.44",
+            "mac_address": "27-b9-51-21-31-a",
+            "os": {
+              "name": "windows 6.3",
+              "full": "Windows Server 2012R2"
+            }
+          },
+          "endpoint": {
+            "domain": "example.com",
+            "is_base_image": false,
+            "active_directory_distinguished_name": "CN=akeylah-7,DC=example,DC=com",
+            "active_directory_hostname": "akeylah-7.example.com",
+            "upgrade": {
+              "status": null,
+              "updated_at": null
+            },
+            "isolation": {
+              "status": false,
+              "request_status": null,
+              "updated_at": null
+            },
+            "policy": {
+              "name": "With Eventing",
+              "id": "C2A9093E-E289-4C0A-AA44-8C32A414FA7A"
+            },
+            "sensor": {
+              "persistence": true,
+              "status": {}
+            }
+          }
+        },
+        "fields": {
+          "machine_id": [
+            "853a308c-6e6d-4b92-a32b-2f623b6c8cf4"
+          ]
+        },
+        "sort": [
+          1577477368377
+        ],
+        "inner_hits": {
+          "most_recent": {
+            "hits": {
+              "total": {
+                "value": 3,
+                "relation": "eq"
+              },
+              "max_score": null,
+              "hits": [
+                {
+                  "_index": "endpoint-agent",
+                  "_id": "U1_6SG8B9c_DH2QsbOZd",
+                  "_score": null,
+                  "_source": {
+                    "machine_id": "853a308c-6e6d-4b92-a32b-2f623b6c8cf4",
+                    "created_at": "2019-12-27T20:09:28.377Z",
+                    "host": {
+                      "name": "akeylah-7",
+                      "hostname": "akeylah-7.example.com",
+                      "ip": "10.252.242.44",
+                      "mac_address": "27-b9-51-21-31-a",
+                      "os": {
+                        "name": "windows 6.3",
+                        "full": "Windows Server 2012R2"
+                      }
+                    },
+                    "endpoint": {
+                      "domain": "example.com",
+                      "is_base_image": false,
+                      "active_directory_distinguished_name": "CN=akeylah-7,DC=example,DC=com",
+                      "active_directory_hostname": "akeylah-7.example.com",
+                      "upgrade": {
+                        "status": null,
+                        "updated_at": null
+                      },
+                      "isolation": {
+                        "status": false,
+                        "request_status": null,
+                        "updated_at": null
+                      },
+                      "policy": {
+                        "name": "With Eventing",
+                        "id": "C2A9093E-E289-4C0A-AA44-8C32A414FA7A"
+                      },
+                      "sensor": {
+                        "persistence": true,
+                        "status": {}
+                      }
+                    }
+                  },
+                  "sort": [
+                    1577477368377
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      }
+    ]
+  },
+  "aggregations": {
+    "total": {
+      "value": 3
+    }
+  }
+}
diff --git a/x-pack/plugins/endpoint/server/types.ts b/x-pack/plugins/endpoint/server/types.ts
new file mode 100644
index 0000000000000..c6d0e3dea70cf
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/types.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { LoggerFactory } from 'kibana/server';
+import { EndpointConfigType } from './config';
+
+export interface EndpointAppContext {
+  logFactory: LoggerFactory;
+  config(): Promise<EndpointConfigType>;
+}
+
+export class EndpointAppConstants {
+  static ENDPOINT_INDEX_NAME = 'endpoint-agent*';
+}
+
+export interface EndpointData {
+  machine_id: string;
+  created_at: Date;
+  host: {
+    name: string;
+    hostname: string;
+    ip: string;
+    mac_address: string;
+    os: {
+      name: string;
+      full: string;
+    };
+  };
+  endpoint: {
+    domain: string;
+    is_base_image: boolean;
+    active_directory_distinguished_name: string;
+    active_directory_hostname: string;
+    upgrade: {
+      status?: string;
+      updated_at?: Date;
+    };
+    isolation: {
+      status: boolean;
+      request_status?: string | boolean;
+      updated_at?: Date;
+    };
+    policy: {
+      name: string;
+      id: string;
+    };
+    sensor: {
+      persistence: boolean;
+      status: object;
+    };
+  };
+}
diff --git a/x-pack/plugins/features/common/feature.ts b/x-pack/plugins/features/common/feature.ts
index 592ac654655d8..423fe1eb99704 100644
--- a/x-pack/plugins/features/common/feature.ts
+++ b/x-pack/plugins/features/common/feature.ts
@@ -43,7 +43,7 @@ export interface Feature<
    * This does not restrict access to your feature based on license.
    * Its only purpose is to inform the space and roles UIs on which features to display.
    */
-  validLicenses?: Array<'basic' | 'standard' | 'gold' | 'platinum'>;
+  validLicenses?: Array<'basic' | 'standard' | 'gold' | 'platinum' | 'enterprise'>;
 
   /**
    * An optional EUI Icon to be used when displaying your feature.
diff --git a/x-pack/plugins/features/server/feature_schema.ts b/x-pack/plugins/features/server/feature_schema.ts
index 8926bd766be32..7732686db5ee1 100644
--- a/x-pack/plugins/features/server/feature_schema.ts
+++ b/x-pack/plugins/features/server/feature_schema.ts
@@ -50,7 +50,9 @@ const schema = Joi.object({
     .required(),
   name: Joi.string().required(),
   excludeFromBasePrivileges: Joi.boolean(),
-  validLicenses: Joi.array().items(Joi.string().valid('basic', 'standard', 'gold', 'platinum')),
+  validLicenses: Joi.array().items(
+    Joi.string().valid('basic', 'standard', 'gold', 'platinum', 'enterprise')
+  ),
   icon: Joi.string(),
   description: Joi.string(),
   navLinkId: Joi.string().regex(uiCapabilitiesRegex),
diff --git a/x-pack/plugins/infra/kibana.json b/x-pack/plugins/infra/kibana.json
index b0670a58ae1e8..ec5420a4d28d5 100644
--- a/x-pack/plugins/infra/kibana.json
+++ b/x-pack/plugins/infra/kibana.json
@@ -1,5 +1,6 @@
 {
   "id": "infra",
   "version": "8.0.0",
+  "kibanaVersion": "kibana",
   "server": true
 }
diff --git a/x-pack/plugins/licensing/README.md b/x-pack/plugins/licensing/README.md
index 339abb77ced88..7a155dfd405c5 100644
--- a/x-pack/plugins/licensing/README.md
+++ b/x-pack/plugins/licensing/README.md
@@ -1,5 +1,8 @@
 # Licensing plugin
 
+- [API](#api)
+- [Migration example](#migration-example)
+- [The list of breaking changes](#the-list-of-breaking-changes)
 Retrieves license data from Elasticsearch and becomes a source of license data for all Kibana plugins on server-side and client-side.
 
 ## API: 
@@ -13,7 +16,7 @@ Retrieves license data from Elasticsearch and becomes a source of license data f
 - `license$: Observable<ILicense>` Provides a steam of license data [ILicense](./common/types.ts). Plugin emits new value whenever it detects changes in license info. If the plugin cannot retrieve a license from **Kibana**, it will emit `an empty license` object. 
 - `refresh: () => Promise<ILicense>` allows a plugin to enforce license retrieval.
 
-## Migration path
+## Migration example
 The new platform licensing plugin became stateless now. It means that instead of storing all your data from `checkLicense` within the plugin, you should react on license data change on both the client and server sides.
 
 ### Before
@@ -56,7 +59,7 @@ chrome.navLinks.update('myPlugin', {
 "requiredPlugins": ["licensing"],
 
 // my_plugin/server/plugin.ts
-import { LicensingPluginSetup, LICENSE_CHECK_STATE } from '../licensing'
+import { LicensingPluginSetup, LICENSE_CHECK_STATE } from '../licensing/server'
 
 interface SetupDeps {
   licensing: LicensingPluginSetup;
@@ -77,7 +80,8 @@ class MyPlugin {
   }
 }
 
-// my_plugin/client/plugin.ts
+// my_plugin/public/plugin.ts
+import { LicensingPluginSetup, LICENSE_CHECK_STATE } from '../licensing/public'
 class MyPlugin {
   setup(core: CoreSetup, deps: SetupDeps) {
     deps.licensing.license$.subscribe(license => {
@@ -92,3 +96,42 @@ class MyPlugin {
   }
 }
 ```
+## The list of breaking changes
+
+#### state
+**LP**: The plugin allows consumers to calculate state on `license change` event and store this
+The signature calculation is based on this state + license content
+**NP**: We decided that license service doesn't keep plugins state https://github.com/elastic/kibana/pull/49345#issuecomment-553451472. Plugins have to react on license change and calculate license state on every license change. If another plugin needs that information, it should be exposed via a plugin contract.
+This change makes NP & LP licensing service not compatible. We have to keep both until all plugins migrate to the new platform service. The legacy plugin consumes license data from the LP plugin.
+
+#### Network request failures
+**LP**: The licensing plugin didn’t emit a license in case of network errors. 
+**NP**: Emits the license even if the request failed.
+
+#### clusterSource
+**LP**: Allows specifying cluster source to perform polling.
+**NP**: The plugin always uses a `data` client. Provides `createLicensePoller` on the server-side to create a license poller with custom ES cluster.
+
+#### Initial value on the client
+**LP**: Passed on the page via inlined `xpackInitialInfo`
+**NP**: Should be fetched
+
+#### Config
+**LP**: `xpack.xpack_main.xpack_api_polling_frequency_millis`
+**NP**: `xpack.licensing.api_polling_frequency`
+
+#### License
+**NP**: `mode` field is provided, but deprecated.
+
+#### sessionStorage
+**LP**: License and signature were stored under different keys in session storage
+**NP**: License and signature were stored under one key `xpack.licensing`
+
+#### isOneOf
+`isOneOf` removed, use `check` or `hasAtLeast` instead
+
+#### Endpoint
+`/api/xpack/v1/info` API endpoint is going to be removed. switch to `/api/licensing/info` instead
+
+#### Fetch error
+`getUnavailableReason` doesn't return `Error` object anymore, but `string`
diff --git a/x-pack/plugins/licensing/common/license.test.ts b/x-pack/plugins/licensing/common/license.test.ts
index 884327acd778c..622572a6a95ba 100644
--- a/x-pack/plugins/licensing/common/license.test.ts
+++ b/x-pack/plugins/licensing/common/license.test.ts
@@ -9,9 +9,10 @@ import { LICENSE_CHECK_STATE } from './types';
 import { licenseMock } from './licensing.mock';
 
 describe('License', () => {
-  const basicLicense = licenseMock.create();
-  const basicExpiredLicense = licenseMock.create({ license: { status: 'expired' } });
-  const goldLicense = licenseMock.create({ license: { type: 'gold' } });
+  const basicLicense = licenseMock.createLicense();
+  const basicExpiredLicense = licenseMock.createLicense({ license: { status: 'expired' } });
+  const goldLicense = licenseMock.createLicense({ license: { type: 'gold' } });
+  const enterpriseLicense = licenseMock.createLicense({ license: { type: 'enterprise' } });
 
   const errorMessage = 'unavailable';
   const errorLicense = new License({ error: errorMessage, signature: '' });
@@ -49,32 +50,23 @@ describe('License', () => {
     expect(unavailableLicense.isActive).toBe(false);
   });
 
-  it('isBasic', () => {
-    expect(basicLicense.isBasic).toBe(true);
-    expect(goldLicense.isBasic).toBe(false);
-    expect(errorLicense.isBasic).toBe(false);
-    expect(unavailableLicense.isBasic).toBe(false);
-  });
+  it('hasAtLeast', () => {
+    expect(basicLicense.hasAtLeast('platinum')).toBe(false);
+    expect(basicLicense.hasAtLeast('gold')).toBe(false);
+    expect(basicLicense.hasAtLeast('basic')).toBe(true);
 
-  it('isNotBasic', () => {
-    expect(basicLicense.isNotBasic).toBe(false);
-    expect(goldLicense.isNotBasic).toBe(true);
-    expect(errorLicense.isNotBasic).toBe(false);
-    expect(unavailableLicense.isNotBasic).toBe(false);
-  });
+    expect(errorLicense.hasAtLeast('basic')).toBe(false);
 
-  it('isOneOf', () => {
-    expect(basicLicense.isOneOf('platinum')).toBe(false);
-    expect(basicLicense.isOneOf(['platinum'])).toBe(false);
-    expect(basicLicense.isOneOf(['gold', 'platinum'])).toBe(false);
-    expect(basicLicense.isOneOf(['platinum', 'gold'])).toBe(false);
-    expect(basicLicense.isOneOf(['basic', 'gold'])).toBe(true);
-    expect(basicLicense.isOneOf(['basic'])).toBe(true);
-    expect(basicLicense.isOneOf('basic')).toBe(true);
+    expect(unavailableLicense.hasAtLeast('basic')).toBe(false);
 
-    expect(errorLicense.isOneOf(['basic', 'gold', 'platinum'])).toBe(false);
+    expect(goldLicense.hasAtLeast('basic')).toBe(true);
+    expect(goldLicense.hasAtLeast('gold')).toBe(true);
+    expect(goldLicense.hasAtLeast('platinum')).toBe(false);
 
-    expect(unavailableLicense.isOneOf(['basic', 'gold', 'platinum'])).toBe(false);
+    expect(enterpriseLicense.hasAtLeast('basic')).toBe(true);
+    expect(enterpriseLicense.hasAtLeast('platinum')).toBe(true);
+    expect(enterpriseLicense.hasAtLeast('enterprise')).toBe(true);
+    expect(enterpriseLicense.hasAtLeast('trial')).toBe(false);
   });
 
   it('getUnavailableReason', () => {
@@ -106,12 +98,19 @@ describe('License', () => {
 
       expect(unavailableLicense.check('ccr', 'basic').state).toBe(LICENSE_CHECK_STATE.Unavailable);
       expect(unavailableLicense.check('ccr', 'gold').state).toBe(LICENSE_CHECK_STATE.Unavailable);
+
+      expect(enterpriseLicense.check('ccr', 'gold').state).toBe(LICENSE_CHECK_STATE.Valid);
+      expect(enterpriseLicense.check('ccr', 'enterprise').state).toBe(LICENSE_CHECK_STATE.Valid);
     });
 
     it('throws in case of unknown license type', () => {
-      expect(
-        () => basicLicense.check('ccr', 'any' as any).state
-      ).toThrowErrorMatchingInlineSnapshot(`"\\"any\\" is not a valid license type"`);
+      expect(() => basicLicense.check('ccr', 'any' as any)).toThrowErrorMatchingInlineSnapshot(
+        `"\\"any\\" is not a valid license type"`
+      );
+
+      expect(() => basicLicense.hasAtLeast('any' as any)).toThrowErrorMatchingInlineSnapshot(
+        `"\\"any\\" is not a valid license type"`
+      );
     });
   });
 });
diff --git a/x-pack/plugins/licensing/common/license.ts b/x-pack/plugins/licensing/common/license.ts
index 8423fed1d6a4e..41f3c73db9c06 100644
--- a/x-pack/plugins/licensing/common/license.ts
+++ b/x-pack/plugins/licensing/common/license.ts
@@ -26,8 +26,6 @@ export class License implements ILicense {
   public readonly error?: string;
   public readonly isActive: boolean;
   public readonly isAvailable: boolean;
-  public readonly isBasic: boolean;
-  public readonly isNotBasic: boolean;
 
   public readonly uid?: string;
   public readonly status?: LicenseStatus;
@@ -70,8 +68,6 @@ export class License implements ILicense {
     }
 
     this.isActive = this.status === 'active';
-    this.isBasic = this.isActive && this.type === 'basic';
-    this.isNotBasic = this.isActive && this.type !== 'basic';
   }
 
   toJSON() {
@@ -89,23 +85,20 @@ export class License implements ILicense {
     }
   }
 
-  isOneOf(candidateLicenses: LicenseType | LicenseType[]) {
-    if (!this.type) {
+  hasAtLeast(minimumLicenseRequired: LicenseType) {
+    const type = this.type;
+    if (!type) {
       return false;
     }
 
-    if (!Array.isArray(candidateLicenses)) {
-      candidateLicenses = [candidateLicenses];
+    if (!(minimumLicenseRequired in LICENSE_TYPE)) {
+      throw new Error(`"${minimumLicenseRequired}" is not a valid license type`);
     }
 
-    return candidateLicenses.includes(this.type);
+    return LICENSE_TYPE[minimumLicenseRequired] <= LICENSE_TYPE[type];
   }
 
   check(pluginName: string, minimumLicenseRequired: LicenseType) {
-    if (!(minimumLicenseRequired in LICENSE_TYPE)) {
-      throw new Error(`"${minimumLicenseRequired}" is not a valid license type`);
-    }
-
     if (!this.isAvailable) {
       return {
         state: LICENSE_CHECK_STATE.Unavailable,
@@ -117,26 +110,24 @@ export class License implements ILicense {
       };
     }
 
-    const type = this.type!;
-
     if (!this.isActive) {
       return {
         state: LICENSE_CHECK_STATE.Expired,
         message: i18n.translate('xpack.licensing.check.errorExpiredMessage', {
           defaultMessage:
             'You cannot use {pluginName} because your {licenseType} license has expired.',
-          values: { licenseType: type, pluginName },
+          values: { licenseType: this.type!, pluginName },
         }),
       };
     }
 
-    if (LICENSE_TYPE[type] < LICENSE_TYPE[minimumLicenseRequired]) {
+    if (!this.hasAtLeast(minimumLicenseRequired)) {
       return {
         state: LICENSE_CHECK_STATE.Invalid,
         message: i18n.translate('xpack.licensing.check.errorUnsupportedMessage', {
           defaultMessage:
             'Your {licenseType} license does not support {pluginName}. Please upgrade your license.',
-          values: { licenseType: type, pluginName },
+          values: { licenseType: this.type!, pluginName },
         }),
       };
     }
diff --git a/x-pack/plugins/licensing/common/license_update.test.ts b/x-pack/plugins/licensing/common/license_update.test.ts
index e714edfbdd88c..7e2410913f698 100644
--- a/x-pack/plugins/licensing/common/license_update.test.ts
+++ b/x-pack/plugins/licensing/common/license_update.test.ts
@@ -7,7 +7,7 @@
 import { Subject } from 'rxjs';
 import { take, toArray } from 'rxjs/operators';
 
-import { ILicense, LicenseType } from './types';
+import { ILicense } from './types';
 import { createLicenseUpdate } from './license_update';
 import { licenseMock } from './licensing.mock';
 
@@ -15,14 +15,11 @@ const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
 const stop$ = new Subject();
 describe('licensing update', () => {
   it('loads updates when triggered', async () => {
-    const types: LicenseType[] = ['basic', 'gold'];
-
     const trigger$ = new Subject();
     const fetcher = jest
       .fn()
-      .mockImplementation(() =>
-        Promise.resolve(licenseMock.create({ license: { type: types.shift() } }))
-      );
+      .mockResolvedValueOnce(licenseMock.createLicense({ license: { type: 'basic' } }))
+      .mockResolvedValueOnce(licenseMock.createLicense({ license: { type: 'gold' } }));
 
     const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher);
 
@@ -38,8 +35,8 @@ describe('licensing update', () => {
   });
 
   it('starts with initial value if presents', async () => {
-    const initialLicense = licenseMock.create({ license: { type: 'platinum' } });
-    const fetchedLicense = licenseMock.create({ license: { type: 'gold' } });
+    const initialLicense = licenseMock.createLicense({ license: { type: 'platinum' } });
+    const fetchedLicense = licenseMock.createLicense({ license: { type: 'gold' } });
     const trigger$ = new Subject();
 
     const fetcher = jest.fn().mockResolvedValue(fetchedLicense);
@@ -55,14 +52,11 @@ describe('licensing update', () => {
   it('does not emit if license has not changed', async () => {
     const trigger$ = new Subject();
 
-    let i = 0;
     const fetcher = jest
       .fn()
-      .mockImplementation(() =>
-        Promise.resolve(
-          ++i < 3 ? licenseMock.create() : licenseMock.create({ license: { type: 'gold' } })
-        )
-      );
+      .mockResolvedValueOnce(licenseMock.createLicense())
+      .mockResolvedValueOnce(licenseMock.createLicense())
+      .mockResolvedValueOnce(licenseMock.createLicense({ license: { type: 'gold' } }));
 
     const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher);
     trigger$.next();
@@ -83,7 +77,7 @@ describe('licensing update', () => {
   it('new subscriptions does not force re-fetch', async () => {
     const trigger$ = new Subject();
 
-    const fetcher = jest.fn().mockResolvedValue(licenseMock.create());
+    const fetcher = jest.fn().mockResolvedValue(licenseMock.createLicense());
 
     const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher);
 
@@ -103,9 +97,9 @@ describe('licensing update', () => {
         new Promise(resolve => {
           if (firstCall) {
             firstCall = false;
-            setTimeout(() => resolve(licenseMock.create()), delayMs);
+            setTimeout(() => resolve(licenseMock.createLicense()), delayMs);
           } else {
-            resolve(licenseMock.create({ license: { type: 'gold' } }));
+            resolve(licenseMock.createLicense({ license: { type: 'gold' } }));
           }
         })
     );
@@ -126,7 +120,7 @@ describe('licensing update', () => {
 
   it('completes license$ stream when stop$ is triggered', () => {
     const trigger$ = new Subject();
-    const fetcher = jest.fn().mockResolvedValue(licenseMock.create());
+    const fetcher = jest.fn().mockResolvedValue(licenseMock.createLicense());
 
     const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher);
     let completed = false;
@@ -138,7 +132,7 @@ describe('licensing update', () => {
 
   it('stops fetching when stop$ is triggered', () => {
     const trigger$ = new Subject();
-    const fetcher = jest.fn().mockResolvedValue(licenseMock.create());
+    const fetcher = jest.fn().mockResolvedValue(licenseMock.createLicense());
 
     const { license$ } = createLicenseUpdate(trigger$, stop$, fetcher);
     const values: ILicense[] = [];
@@ -152,8 +146,8 @@ describe('licensing update', () => {
 
   it('refreshManually guarantees license fetching', async () => {
     const trigger$ = new Subject();
-    const firstLicense = licenseMock.create({ license: { uid: 'first', type: 'basic' } });
-    const secondLicense = licenseMock.create({ license: { uid: 'second', type: 'gold' } });
+    const firstLicense = licenseMock.createLicense({ license: { uid: 'first', type: 'basic' } });
+    const secondLicense = licenseMock.createLicense({ license: { uid: 'second', type: 'gold' } });
 
     const fetcher = jest
       .fn()
diff --git a/x-pack/plugins/licensing/common/licensing.mock.ts b/x-pack/plugins/licensing/common/licensing.mock.ts
index 52721703fcb73..bbe63d5c0d70a 100644
--- a/x-pack/plugins/licensing/common/licensing.mock.ts
+++ b/x-pack/plugins/licensing/common/licensing.mock.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 { PublicLicense, PublicFeatures } from './types';
+import { ILicense, PublicLicense, PublicFeatures, LICENSE_CHECK_STATE } from './types';
 import { License } from './license';
 
 function createLicense({
@@ -40,6 +40,22 @@ function createLicense({
   });
 }
 
+const createLicenseMock = () => {
+  const mock: jest.Mocked<ILicense> = {
+    isActive: true,
+    isAvailable: true,
+    signature: '',
+    toJSON: jest.fn(),
+    getUnavailableReason: jest.fn(),
+    getFeature: jest.fn(),
+    check: jest.fn(),
+    hasAtLeast: jest.fn(),
+  };
+  mock.check.mockReturnValue({ state: LICENSE_CHECK_STATE.Valid });
+  mock.hasAtLeast.mockReturnValue(true);
+  return mock;
+};
 export const licenseMock = {
-  create: createLicense,
+  createLicense,
+  createLicenseMock,
 };
diff --git a/x-pack/plugins/licensing/common/types.ts b/x-pack/plugins/licensing/common/types.ts
index 840f90e083d5e..78c31963da9b1 100644
--- a/x-pack/plugins/licensing/common/types.ts
+++ b/x-pack/plugins/licensing/common/types.ts
@@ -16,7 +16,8 @@ export enum LICENSE_TYPE {
   standard = 20,
   gold = 30,
   platinum = 40,
-  trial = 50,
+  enterprise = 50,
+  trial = 60,
 }
 
 /** @public */
@@ -139,16 +140,6 @@ export interface ILicense {
    */
   isAvailable: boolean;
 
-  /**
-   * Determine if the type of the license is basic, and also active.
-   */
-  isBasic: boolean;
-
-  /**
-   * Determine if the type of the license is not basic, and also active.
-   */
-  isNotBasic: boolean;
-
   /**
    * Returns
    */
@@ -165,10 +156,10 @@ export interface ILicense {
   getUnavailableReason: () => string | undefined;
 
   /**
-   * Determine if the provided license types match against the license type.
-   * @param candidateLicenses license types to intersect against the license.
+   * Determine if license type >= minimal required license type.
+   * @param minimumLicenseRequired the minimum valid license required for the given feature
    */
-  isOneOf(candidateLicenses: LicenseType | LicenseType[]): boolean;
+  hasAtLeast(minimumLicenseRequired: LicenseType): boolean;
 
   /**
    * For a given plugin and license type, receive information about the status of the license.
diff --git a/x-pack/plugins/licensing/public/licensing.mock.ts b/x-pack/plugins/licensing/public/licensing.mock.ts
deleted file mode 100644
index e2ed070017847..0000000000000
--- a/x-pack/plugins/licensing/public/licensing.mock.ts
+++ /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 { BehaviorSubject } from 'rxjs';
-import { LicensingPluginSetup } from './types';
-import { licenseMock } from '../common/licensing.mock';
-
-const createSetupMock = () => {
-  const license = licenseMock.create();
-  const mock: jest.Mocked<LicensingPluginSetup> = {
-    license$: new BehaviorSubject(license),
-    refresh: jest.fn(),
-  };
-  mock.refresh.mockResolvedValue(license);
-
-  return mock;
-};
-
-export const licensingMock = {
-  createSetup: createSetupMock,
-  createLicense: licenseMock.create,
-};
diff --git a/x-pack/plugins/licensing/public/mocks.ts b/x-pack/plugins/licensing/public/mocks.ts
new file mode 100644
index 0000000000000..68b280c5341f2
--- /dev/null
+++ b/x-pack/plugins/licensing/public/mocks.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 { BehaviorSubject } from 'rxjs';
+import { LicensingPluginSetup } from './types';
+import { licenseMock } from '../common/licensing.mock';
+
+const createSetupMock = () => {
+  const license = licenseMock.createLicense();
+  const mock: jest.Mocked<LicensingPluginSetup> = {
+    license$: new BehaviorSubject(license),
+    refresh: jest.fn(),
+  };
+  mock.refresh.mockResolvedValue(license);
+
+  return mock;
+};
+
+export const licensingMock = {
+  createSetup: createSetupMock,
+  ...licenseMock,
+};
diff --git a/x-pack/plugins/licensing/public/plugin.test.ts b/x-pack/plugins/licensing/public/plugin.test.ts
index 4469f26836b18..01545ee8d48b4 100644
--- a/x-pack/plugins/licensing/public/plugin.test.ts
+++ b/x-pack/plugins/licensing/public/plugin.test.ts
@@ -30,8 +30,12 @@ describe('licensing plugin', () => {
         plugin = new LicensingPlugin(coreMock.createPluginInitializerContext(), sessionStorage);
 
         const coreSetup = coreMock.createSetup();
-        const firstLicense = licenseMock.create({ license: { uid: 'first', type: 'basic' } });
-        const secondLicense = licenseMock.create({ license: { uid: 'second', type: 'gold' } });
+        const firstLicense = licenseMock.createLicense({
+          license: { uid: 'first', type: 'basic' },
+        });
+        const secondLicense = licenseMock.createLicense({
+          license: { uid: 'second', type: 'gold' },
+        });
         coreSetup.http.get.mockResolvedValueOnce(firstLicense).mockResolvedValueOnce(secondLicense);
 
         const { license$, refresh } = await plugin.setup(coreSetup);
@@ -53,7 +57,7 @@ describe('licensing plugin', () => {
         plugin = new LicensingPlugin(coreMock.createPluginInitializerContext(), sessionStorage);
 
         const coreSetup = coreMock.createSetup();
-        const fetchedLicense = licenseMock.create();
+        const fetchedLicense = licenseMock.createLicense();
         coreSetup.http.get.mockResolvedValue(fetchedLicense);
 
         const { refresh } = await plugin.setup(coreSetup);
@@ -71,7 +75,7 @@ describe('licensing plugin', () => {
     describe('#license$', () => {
       it('starts with license saved in sessionStorage if available', async () => {
         const sessionStorage = coreMock.createStorage();
-        const savedLicense = licenseMock.create({ license: { uid: 'saved' } });
+        const savedLicense = licenseMock.createLicense({ license: { uid: 'saved' } });
         sessionStorage.getItem.mockReturnValue(JSON.stringify(savedLicense));
         plugin = new LicensingPlugin(coreMock.createPluginInitializerContext(), sessionStorage);
 
@@ -90,12 +94,12 @@ describe('licensing plugin', () => {
         const types: LicenseType[] = ['gold', 'platinum'];
 
         const sessionStorage = coreMock.createStorage();
-        sessionStorage.getItem.mockReturnValue(JSON.stringify(licenseMock.create()));
+        sessionStorage.getItem.mockReturnValue(JSON.stringify(licenseMock.createLicense()));
         plugin = new LicensingPlugin(coreMock.createPluginInitializerContext(), sessionStorage);
 
         const coreSetup = coreMock.createSetup();
         coreSetup.http.get.mockImplementation(() =>
-          Promise.resolve(licenseMock.create({ license: { type: types.shift() } }))
+          Promise.resolve(licenseMock.createLicense({ license: { type: types.shift() } }))
         );
         const { license$, refresh } = await plugin.setup(coreSetup);
 
@@ -123,7 +127,7 @@ describe('licensing plugin', () => {
 
         const coreSetup = coreMock.createSetup();
 
-        const fetchedLicense = licenseMock.create({ license: { uid: 'fresh' } });
+        const fetchedLicense = licenseMock.createLicense({ license: { uid: 'fresh' } });
         coreSetup.http.get.mockResolvedValue(fetchedLicense);
 
         const { license$, refresh } = await plugin.setup(coreSetup);
@@ -196,7 +200,7 @@ describe('licensing plugin', () => {
 
       const coreSetup = coreMock.createSetup();
 
-      coreSetup.http.get.mockResolvedValue(licenseMock.create({ signature: 'signature-1' }));
+      coreSetup.http.get.mockResolvedValue(licenseMock.createLicense({ signature: 'signature-1' }));
 
       let registeredInterceptor: HttpInterceptor;
       coreSetup.http.intercept.mockImplementation((interceptor: HttpInterceptor) => {
@@ -321,7 +325,7 @@ describe('licensing plugin', () => {
 
       const coreSetup = coreMock.createSetup();
       coreSetup.http.get.mockResolvedValueOnce(
-        licenseMock.create({ license: { status: 'active', type: 'gold' } })
+        licenseMock.createLicense({ license: { status: 'active', type: 'gold' } })
       );
 
       const { refresh } = await plugin.setup(coreSetup);
@@ -338,8 +342,12 @@ describe('licensing plugin', () => {
       plugin = new LicensingPlugin(coreMock.createPluginInitializerContext(), sessionStorage);
 
       const coreSetup = coreMock.createSetup();
-      const activeLicense = licenseMock.create({ license: { status: 'active', type: 'gold' } });
-      const expiredLicense = licenseMock.create({ license: { status: 'expired', type: 'gold' } });
+      const activeLicense = licenseMock.createLicense({
+        license: { status: 'active', type: 'gold' },
+      });
+      const expiredLicense = licenseMock.createLicense({
+        license: { status: 'expired', type: 'gold' },
+      });
       coreSetup.http.get
         .mockResolvedValueOnce(activeLicense)
         .mockResolvedValueOnce(expiredLicense)
diff --git a/x-pack/plugins/licensing/server/licensing.mock.ts b/x-pack/plugins/licensing/server/licensing.mock.ts
deleted file mode 100644
index b2059e36fd0c0..0000000000000
--- a/x-pack/plugins/licensing/server/licensing.mock.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 { BehaviorSubject } from 'rxjs';
-import { LicensingPluginSetup } from './types';
-import { licenseMock } from '../common/licensing.mock';
-
-const createSetupMock = () => {
-  const license = licenseMock.create();
-  const mock: jest.Mocked<LicensingPluginSetup> = {
-    license$: new BehaviorSubject(license),
-    refresh: jest.fn(),
-    createLicensePoller: jest.fn(),
-  };
-  mock.refresh.mockResolvedValue(license);
-  mock.createLicensePoller.mockReturnValue({
-    license$: mock.license$,
-    refresh: mock.refresh,
-  });
-
-  return mock;
-};
-
-export const licensingMock = {
-  createSetup: createSetupMock,
-  createLicense: licenseMock.create,
-};
diff --git a/x-pack/plugins/licensing/server/licensing_route_handler_context.test.ts b/x-pack/plugins/licensing/server/licensing_route_handler_context.test.ts
index 20e7f34c3ce3c..91fb1672f020d 100644
--- a/x-pack/plugins/licensing/server/licensing_route_handler_context.test.ts
+++ b/x-pack/plugins/licensing/server/licensing_route_handler_context.test.ts
@@ -11,8 +11,8 @@ import { createRouteHandlerContext } from './licensing_route_handler_context';
 
 describe('createRouteHandlerContext', () => {
   it('returns a function providing the last license value', async () => {
-    const firstLicense = licenseMock.create();
-    const secondLicense = licenseMock.create();
+    const firstLicense = licenseMock.createLicense();
+    const secondLicense = licenseMock.createLicense();
     const license$ = new BehaviorSubject(firstLicense);
 
     const routeHandler = createRouteHandlerContext(license$);
diff --git a/x-pack/plugins/licensing/server/mocks.ts b/x-pack/plugins/licensing/server/mocks.ts
index 237636d163017..d622e3f71eff5 100644
--- a/x-pack/plugins/licensing/server/mocks.ts
+++ b/x-pack/plugins/licensing/server/mocks.ts
@@ -3,5 +3,27 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { BehaviorSubject } from 'rxjs';
+import { LicensingPluginSetup } from './types';
+import { licenseMock } from '../common/licensing.mock';
 
-export * from './licensing.mock';
+const createSetupMock = () => {
+  const license = licenseMock.createLicense();
+  const mock: jest.Mocked<LicensingPluginSetup> = {
+    license$: new BehaviorSubject(license),
+    refresh: jest.fn(),
+    createLicensePoller: jest.fn(),
+  };
+  mock.refresh.mockResolvedValue(license);
+  mock.createLicensePoller.mockReturnValue({
+    license$: mock.license$,
+    refresh: mock.refresh,
+  });
+
+  return mock;
+};
+
+export const licensingMock = {
+  createSetup: createSetupMock,
+  ...licenseMock,
+};
diff --git a/x-pack/plugins/licensing/server/on_pre_response_handler.test.ts b/x-pack/plugins/licensing/server/on_pre_response_handler.test.ts
index 9acfcef0ac8df..9a588a9ac8460 100644
--- a/x-pack/plugins/licensing/server/on_pre_response_handler.test.ts
+++ b/x-pack/plugins/licensing/server/on_pre_response_handler.test.ts
@@ -11,7 +11,7 @@ import { licenseMock } from '../common/licensing.mock';
 describe('createOnPreResponseHandler', () => {
   it('sets license.signature header immediately for non-error responses', async () => {
     const refresh = jest.fn();
-    const license$ = new BehaviorSubject(licenseMock.create({ signature: 'foo' }));
+    const license$ = new BehaviorSubject(licenseMock.createLicense({ signature: 'foo' }));
     const toolkit = httpServiceMock.createOnPreResponseToolkit();
 
     const interceptor = createOnPreResponseHandler(refresh, license$);
@@ -26,8 +26,8 @@ describe('createOnPreResponseHandler', () => {
     });
   });
   it('sets license.signature header after refresh for non-error responses', async () => {
-    const updatedLicense = licenseMock.create({ signature: 'bar' });
-    const license$ = new BehaviorSubject(licenseMock.create({ signature: 'foo' }));
+    const updatedLicense = licenseMock.createLicense({ signature: 'bar' });
+    const license$ = new BehaviorSubject(licenseMock.createLicense({ signature: 'foo' }));
     const refresh = jest.fn().mockImplementation(
       () =>
         new Promise(resolve => {
diff --git a/x-pack/plugins/licensing/server/plugin.test.ts b/x-pack/plugins/licensing/server/plugin.test.ts
index 0b5a3533bd3b6..9547a2dc52966 100644
--- a/x-pack/plugins/licensing/server/plugin.test.ts
+++ b/x-pack/plugins/licensing/server/plugin.test.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { BehaviorSubject } from 'rxjs';
 import { take, toArray } from 'rxjs/operators';
 import moment from 'moment';
 import { LicenseType } from '../common/types';
@@ -53,7 +52,7 @@ describe('licensing plugin', () => {
           features: {},
         });
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const license = await license$.pipe(take(1)).toPromise();
@@ -71,7 +70,7 @@ describe('licensing plugin', () => {
           })
         );
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const [first, second, third] = await license$.pipe(take(3), toArray()).toPromise();
@@ -85,7 +84,7 @@ describe('licensing plugin', () => {
         const dataClient = elasticsearchServiceMock.createClusterClient();
         dataClient.callAsInternalUser.mockRejectedValue(new Error('test'));
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const license = await license$.pipe(take(1)).toPromise();
@@ -99,7 +98,7 @@ describe('licensing plugin', () => {
         error.status = 400;
         dataClient.callAsInternalUser.mockRejectedValue(error);
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const license = await license$.pipe(take(1)).toPromise();
@@ -119,7 +118,7 @@ describe('licensing plugin', () => {
           .mockResolvedValue({ license: buildRawLicense(), features: {} });
 
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const [first, second, third] = await license$.pipe(take(3), toArray()).toPromise();
@@ -137,7 +136,7 @@ describe('licensing plugin', () => {
         });
 
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         await plugin.setup(coreSetup);
         await flushPromises();
@@ -152,7 +151,7 @@ describe('licensing plugin', () => {
         });
 
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         await plugin.setup(coreSetup);
         await flushPromises();
@@ -180,7 +179,7 @@ describe('licensing plugin', () => {
         );
 
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { license$ } = await plugin.setup(coreSetup);
         const [first, second, third] = await license$.pipe(take(3), toArray()).toPromise();
@@ -209,7 +208,7 @@ describe('licensing plugin', () => {
           features: {},
         });
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
         const { refresh } = await plugin.setup(coreSetup);
 
         expect(dataClient.callAsInternalUser).toHaveBeenCalledTimes(0);
@@ -242,7 +241,7 @@ describe('licensing plugin', () => {
           features: {},
         });
         const coreSetup = coreMock.createSetup();
-        coreSetup.elasticsearch.dataClient$ = new BehaviorSubject(dataClient);
+        coreSetup.elasticsearch.dataClient = dataClient;
 
         const { createLicensePoller, license$ } = await plugin.setup(coreSetup);
         const customClient = elasticsearchServiceMock.createClusterClient();
diff --git a/x-pack/plugins/licensing/server/plugin.ts b/x-pack/plugins/licensing/server/plugin.ts
index 2eabd534a997c..383245e6f4ee8 100644
--- a/x-pack/plugins/licensing/server/plugin.ts
+++ b/x-pack/plugins/licensing/server/plugin.ts
@@ -92,7 +92,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup> {
     this.logger.debug('Setting up Licensing plugin');
     const config = await this.config$.pipe(take(1)).toPromise();
     const pollingFrequency = config.api_polling_frequency;
-    const dataClient = await core.elasticsearch.dataClient$.pipe(take(1)).toPromise();
+    const dataClient = await core.elasticsearch.dataClient;
 
     const { refresh, license$ } = this.createLicensePoller(
       dataClient,
diff --git a/x-pack/plugins/reporting/index.d.ts b/x-pack/plugins/reporting/index.d.ts
index 65cdfa09fc4c6..9559de4a5bb03 100644
--- a/x-pack/plugins/reporting/index.d.ts
+++ b/x-pack/plugins/reporting/index.d.ts
@@ -7,7 +7,7 @@
 import {
   CoreSetup,
   CoreStart,
-  HttpServiceBase,
+  HttpSetup,
   Plugin,
   PluginInitializerContext,
   NotificationsStart,
@@ -16,7 +16,7 @@ import {
 export type JobId = string;
 export type JobStatus = 'completed' | 'pending' | 'processing' | 'failed';
 
-export type HttpService = HttpServiceBase;
+export type HttpService = HttpSetup;
 export type NotificationsService = NotificationsStart;
 
 export interface SourceJob {
diff --git a/x-pack/plugins/reporting/public/lib/stream_handler.test.ts b/x-pack/plugins/reporting/public/lib/stream_handler.test.ts
index 1c669b7899ec3..aeba2ca5406b8 100644
--- a/x-pack/plugins/reporting/public/lib/stream_handler.test.ts
+++ b/x-pack/plugins/reporting/public/lib/stream_handler.test.ts
@@ -5,7 +5,7 @@
  */
 
 import sinon, { stub } from 'sinon';
-import { HttpServiceBase, NotificationsStart } from '../../../../../src/core/public';
+import { HttpSetup, NotificationsStart } from '../../../../../src/core/public';
 import { SourceJob, JobSummary, HttpService } from '../../index.d';
 import { JobQueue } from './job_queue';
 import { ReportingNotifierStreamHandler } from './stream_handler';
@@ -57,7 +57,7 @@ const httpMock: HttpService = ({
   basePath: {
     prepend: stub(),
   },
-} as unknown) as HttpServiceBase;
+} as unknown) as HttpSetup;
 
 const mockShowDanger = stub();
 const mockShowSuccess = stub();
diff --git a/x-pack/plugins/security/common/licensing/index.mock.ts b/x-pack/plugins/security/common/licensing/index.mock.ts
new file mode 100644
index 0000000000000..06a7057abb87c
--- /dev/null
+++ b/x-pack/plugins/security/common/licensing/index.mock.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 { of } from 'rxjs';
+import { SecurityLicense } from '.';
+
+export const licenseMock = {
+  create: (): jest.Mocked<SecurityLicense> => ({
+    isEnabled: jest.fn().mockReturnValue(true),
+    getFeatures: jest.fn(),
+    features$: of(),
+  }),
+};
diff --git a/x-pack/plugins/security/server/licensing/index.ts b/x-pack/plugins/security/common/licensing/index.ts
similarity index 100%
rename from x-pack/plugins/security/server/licensing/index.ts
rename to x-pack/plugins/security/common/licensing/index.ts
diff --git a/x-pack/plugins/security/server/licensing/license_features.ts b/x-pack/plugins/security/common/licensing/license_features.ts
similarity index 100%
rename from x-pack/plugins/security/server/licensing/license_features.ts
rename to x-pack/plugins/security/common/licensing/license_features.ts
diff --git a/x-pack/plugins/security/common/licensing/license_service.test.ts b/x-pack/plugins/security/common/licensing/license_service.test.ts
new file mode 100644
index 0000000000000..f4fa5e00e2387
--- /dev/null
+++ b/x-pack/plugins/security/common/licensing/license_service.test.ts
@@ -0,0 +1,148 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { of, BehaviorSubject } from 'rxjs';
+import { licensingMock } from '../../../licensing/public/mocks';
+import { SecurityLicenseService } from './license_service';
+
+describe('license features', function() {
+  it('should display error when ES is unavailable', () => {
+    const serviceSetup = new SecurityLicenseService().setup({
+      license$: of(undefined as any),
+    });
+    expect(serviceSetup.license.getFeatures()).toEqual({
+      showLogin: true,
+      allowLogin: false,
+      showLinks: false,
+      allowRoleDocumentLevelSecurity: false,
+      allowRoleFieldLevelSecurity: false,
+      layout: 'error-es-unavailable',
+      allowRbac: false,
+    });
+  });
+
+  it('should display error when X-Pack is unavailable', () => {
+    const rawLicenseMock = licensingMock.createLicenseMock();
+    rawLicenseMock.isAvailable = false;
+    const serviceSetup = new SecurityLicenseService().setup({
+      license$: of(rawLicenseMock),
+    });
+    expect(serviceSetup.license.getFeatures()).toEqual({
+      showLogin: true,
+      allowLogin: false,
+      showLinks: false,
+      allowRoleDocumentLevelSecurity: false,
+      allowRoleFieldLevelSecurity: false,
+      layout: 'error-xpack-unavailable',
+      allowRbac: false,
+    });
+  });
+
+  it('should notify consumers of licensed feature changes', () => {
+    const rawLicenseMock = licensingMock.createLicenseMock();
+    rawLicenseMock.isAvailable = false;
+    const rawLicense$ = new BehaviorSubject(rawLicenseMock);
+    const serviceSetup = new SecurityLicenseService().setup({
+      license$: rawLicense$,
+    });
+
+    const subscriptionHandler = jest.fn();
+    const subscription = serviceSetup.license.features$.subscribe(subscriptionHandler);
+    try {
+      expect(subscriptionHandler).toHaveBeenCalledTimes(1);
+      expect(subscriptionHandler.mock.calls[0]).toMatchInlineSnapshot(`
+        Array [
+          Object {
+            "allowLogin": false,
+            "allowRbac": false,
+            "allowRoleDocumentLevelSecurity": false,
+            "allowRoleFieldLevelSecurity": false,
+            "layout": "error-xpack-unavailable",
+            "showLinks": false,
+            "showLogin": true,
+          },
+        ]
+      `);
+
+      rawLicense$.next(licensingMock.createLicenseMock());
+      expect(subscriptionHandler).toHaveBeenCalledTimes(2);
+      expect(subscriptionHandler.mock.calls[1]).toMatchInlineSnapshot(`
+        Array [
+          Object {
+            "allowLogin": false,
+            "allowRbac": false,
+            "allowRoleDocumentLevelSecurity": false,
+            "allowRoleFieldLevelSecurity": false,
+            "linksMessage": "Access is denied because Security is disabled in Elasticsearch.",
+            "showLinks": false,
+            "showLogin": false,
+          },
+        ]
+      `);
+    } finally {
+      subscription.unsubscribe();
+    }
+  });
+
+  it('should show login page and other security elements, allow RBAC but forbid document level security if license is not platinum or trial.', () => {
+    const mockRawLicense = licensingMock.createLicenseMock();
+    mockRawLicense.hasAtLeast.mockReturnValue(false);
+    mockRawLicense.getFeature.mockReturnValue({ isEnabled: true, isAvailable: true });
+
+    const serviceSetup = new SecurityLicenseService().setup({
+      license$: of(mockRawLicense),
+    });
+    expect(serviceSetup.license.getFeatures()).toEqual({
+      showLogin: true,
+      allowLogin: true,
+      showLinks: true,
+      allowRoleDocumentLevelSecurity: false,
+      allowRoleFieldLevelSecurity: false,
+      allowRbac: true,
+    });
+    expect(mockRawLicense.getFeature).toHaveBeenCalledTimes(1);
+    expect(mockRawLicense.getFeature).toHaveBeenCalledWith('security');
+  });
+
+  it('should not show login page or other security elements if security is disabled in Elasticsearch.', () => {
+    const mockRawLicense = licensingMock.createLicenseMock();
+    mockRawLicense.hasAtLeast.mockReturnValue(false);
+    mockRawLicense.getFeature.mockReturnValue({ isEnabled: false, isAvailable: true });
+
+    const serviceSetup = new SecurityLicenseService().setup({
+      license$: of(mockRawLicense),
+    });
+    expect(serviceSetup.license.getFeatures()).toEqual({
+      showLogin: false,
+      allowLogin: false,
+      showLinks: false,
+      allowRoleDocumentLevelSecurity: false,
+      allowRoleFieldLevelSecurity: false,
+      allowRbac: false,
+      linksMessage: 'Access is denied because Security is disabled in Elasticsearch.',
+    });
+  });
+
+  it('should allow to login, allow RBAC and document level security if license >= platinum', () => {
+    const mockRawLicense = licensingMock.createLicenseMock();
+    mockRawLicense.hasAtLeast.mockImplementation(license => {
+      return license === 'trial' || license === 'platinum' || license === 'enterprise';
+    });
+    mockRawLicense.getFeature.mockReturnValue({ isEnabled: true, isAvailable: true });
+
+    const serviceSetup = new SecurityLicenseService().setup({
+      license$: of(mockRawLicense),
+    });
+    expect(serviceSetup.license.getFeatures()).toEqual({
+      showLogin: true,
+      allowLogin: true,
+      showLinks: true,
+      allowRoleDocumentLevelSecurity: true,
+      allowRoleFieldLevelSecurity: true,
+      allowRbac: true,
+    });
+  });
+});
diff --git a/x-pack/plugins/security/common/licensing/license_service.ts b/x-pack/plugins/security/common/licensing/license_service.ts
new file mode 100644
index 0000000000000..0f9da03f9f6ec
--- /dev/null
+++ b/x-pack/plugins/security/common/licensing/license_service.ts
@@ -0,0 +1,106 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Observable, Subscription } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { ILicense } from '../../../licensing/common/types';
+import { SecurityLicenseFeatures } from './license_features';
+
+export interface SecurityLicense {
+  isEnabled(): boolean;
+  getFeatures(): SecurityLicenseFeatures;
+  features$: Observable<SecurityLicenseFeatures>;
+}
+
+interface SetupDeps {
+  license$: Observable<ILicense>;
+}
+
+export class SecurityLicenseService {
+  private licenseSubscription?: Subscription;
+
+  public setup({ license$ }: SetupDeps) {
+    let rawLicense: Readonly<ILicense> | undefined;
+
+    this.licenseSubscription = license$.subscribe(nextRawLicense => {
+      rawLicense = nextRawLicense;
+    });
+
+    return {
+      license: Object.freeze({
+        isEnabled: () => this.isSecurityEnabledFromRawLicense(rawLicense),
+
+        getFeatures: () => this.calculateFeaturesFromRawLicense(rawLicense),
+
+        features$: license$.pipe(
+          map(nextRawLicense => this.calculateFeaturesFromRawLicense(nextRawLicense))
+        ),
+      }),
+    };
+  }
+
+  public stop() {
+    if (this.licenseSubscription) {
+      this.licenseSubscription.unsubscribe();
+      this.licenseSubscription = undefined;
+    }
+  }
+
+  private isSecurityEnabledFromRawLicense(rawLicense: Readonly<ILicense> | undefined) {
+    if (!rawLicense) {
+      return false;
+    }
+
+    const securityFeature = rawLicense.getFeature('security');
+    return (
+      securityFeature !== undefined && securityFeature.isAvailable && securityFeature.isEnabled
+    );
+  }
+
+  private calculateFeaturesFromRawLicense(
+    rawLicense: Readonly<ILicense> | undefined
+  ): SecurityLicenseFeatures {
+    // If, for some reason, we cannot get license information from Elasticsearch,
+    // assume worst-case and lock user at login screen.
+    if (!rawLicense?.isAvailable) {
+      return {
+        showLogin: true,
+        allowLogin: false,
+        showLinks: false,
+        allowRoleDocumentLevelSecurity: false,
+        allowRoleFieldLevelSecurity: false,
+        allowRbac: false,
+        layout:
+          rawLicense !== undefined && !rawLicense?.isAvailable
+            ? 'error-xpack-unavailable'
+            : 'error-es-unavailable',
+      };
+    }
+
+    if (!this.isSecurityEnabledFromRawLicense(rawLicense)) {
+      return {
+        showLogin: false,
+        allowLogin: false,
+        showLinks: false,
+        allowRoleDocumentLevelSecurity: false,
+        allowRoleFieldLevelSecurity: false,
+        allowRbac: false,
+        linksMessage: 'Access is denied because Security is disabled in Elasticsearch.',
+      };
+    }
+
+    const isLicensePlatinumOrBetter = rawLicense.hasAtLeast('platinum');
+    return {
+      showLogin: true,
+      allowLogin: true,
+      showLinks: true,
+      // Only platinum and trial licenses are compliant with field- and document-level security.
+      allowRoleDocumentLevelSecurity: isLicensePlatinumOrBetter,
+      allowRoleFieldLevelSecurity: isLicensePlatinumOrBetter,
+      allowRbac: true,
+    };
+  }
+}
diff --git a/x-pack/plugins/security/public/authentication/authentication_service.ts b/x-pack/plugins/security/public/authentication/authentication_service.ts
new file mode 100644
index 0000000000000..23c45c88e563a
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/authentication_service.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 { HttpSetup } from 'src/core/public';
+import { AuthenticatedUser } from '../../common/model';
+
+interface SetupParams {
+  http: HttpSetup;
+}
+
+export interface AuthenticationServiceSetup {
+  /**
+   * Returns currently authenticated user and throws if current user isn't authenticated.
+   */
+  getCurrentUser: () => Promise<AuthenticatedUser>;
+}
+
+export class AuthenticationService {
+  public setup({ http }: SetupParams): AuthenticationServiceSetup {
+    return {
+      async getCurrentUser() {
+        return (await http.get('/internal/security/me', {
+          headers: { 'kbn-system-api': true },
+        })) as AuthenticatedUser;
+      },
+    };
+  }
+}
diff --git a/x-pack/plugins/security/public/authentication/index.mock.ts b/x-pack/plugins/security/public/authentication/index.mock.ts
new file mode 100644
index 0000000000000..c8d77a5b62c6f
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/index.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 { AuthenticationServiceSetup } from './authentication_service';
+
+export const authenticationMock = {
+  createSetup: (): jest.Mocked<AuthenticationServiceSetup> => ({
+    getCurrentUser: jest.fn(),
+  }),
+};
diff --git a/x-pack/plugins/security/public/authentication/index.ts b/x-pack/plugins/security/public/authentication/index.ts
new file mode 100644
index 0000000000000..a55f4d7bb95b3
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/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 { AuthenticationService, AuthenticationServiceSetup } from './authentication_service';
diff --git a/x-pack/plugins/security/public/index.ts b/x-pack/plugins/security/public/index.ts
index dc34fcbbe7d1e..336ec37d76a1b 100644
--- a/x-pack/plugins/security/public/index.ts
+++ b/x-pack/plugins/security/public/index.ts
@@ -6,7 +6,10 @@
 
 import { PluginInitializer } from 'src/core/public';
 import { SecurityPlugin, SecurityPluginSetup, SecurityPluginStart } from './plugin';
+
+export { SecurityPluginSetup, SecurityPluginStart };
 export { SessionInfo } from './types';
+export { AuthenticatedUser } from '../common/model';
 
 export const plugin: PluginInitializer<SecurityPluginSetup, SecurityPluginStart> = () =>
   new SecurityPlugin();
diff --git a/x-pack/plugins/security/public/mocks.ts b/x-pack/plugins/security/public/mocks.ts
new file mode 100644
index 0000000000000..3c0c59d10abd1
--- /dev/null
+++ b/x-pack/plugins/security/public/mocks.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { authenticationMock } from './authentication/index.mock';
+import { createSessionTimeoutMock } from './session/session_timeout.mock';
+
+function createSetupMock() {
+  return {
+    authc: authenticationMock.createSetup(),
+    sessionTimeout: createSessionTimeoutMock(),
+  };
+}
+
+export const securityMock = {
+  createSetup: createSetupMock,
+};
diff --git a/x-pack/plugins/security/public/nav_control/index.ts b/x-pack/plugins/security/public/nav_control/index.ts
new file mode 100644
index 0000000000000..2b0af1a45d05a
--- /dev/null
+++ b/x-pack/plugins/security/public/nav_control/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 { SecurityNavControlService } from './nav_control_service';
diff --git a/x-pack/plugins/security/public/nav_control/nav_control_component.test.tsx b/x-pack/plugins/security/public/nav_control/nav_control_component.test.tsx
new file mode 100644
index 0000000000000..c1c6a9f69b6ec
--- /dev/null
+++ b/x-pack/plugins/security/public/nav_control/nav_control_component.test.tsx
@@ -0,0 +1,110 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { shallowWithIntl, nextTick, mountWithIntl } from 'test_utils/enzyme_helpers';
+import { SecurityNavControl } from './nav_control_component';
+import { AuthenticatedUser } from '../../common/model';
+import { EuiPopover, EuiHeaderSectionItemButton } from '@elastic/eui';
+import { findTestSubject } from 'test_utils/find_test_subject';
+
+describe('SecurityNavControl', () => {
+  it(`renders a loading spinner when the user promise hasn't resolved yet.`, async () => {
+    const props = {
+      user: new Promise(() => {}) as Promise<AuthenticatedUser>,
+      editProfileUrl: '',
+      logoutUrl: '',
+    };
+
+    const wrapper = shallowWithIntl(<SecurityNavControl {...props} />);
+    const { button } = wrapper.find(EuiPopover).props();
+    expect(button).toMatchInlineSnapshot(`
+      <EuiHeaderSectionItemButton
+        aria-controls="headerUserMenu"
+        aria-expanded={false}
+        aria-haspopup="true"
+        aria-label="Account menu"
+        data-test-subj="userMenuButton"
+        onClick={[Function]}
+      >
+        <EuiLoadingSpinner
+          size="m"
+        />
+      </EuiHeaderSectionItemButton>
+    `);
+  });
+
+  it(`renders an avatar after the user promise resolves.`, async () => {
+    const props = {
+      user: Promise.resolve({ full_name: 'foo' }) as Promise<AuthenticatedUser>,
+      editProfileUrl: '',
+      logoutUrl: '',
+    };
+
+    const wrapper = shallowWithIntl(<SecurityNavControl {...props} />);
+    await nextTick();
+    wrapper.update();
+    const { button } = wrapper.find(EuiPopover).props();
+    expect(button).toMatchInlineSnapshot(`
+      <EuiHeaderSectionItemButton
+        aria-controls="headerUserMenu"
+        aria-expanded={false}
+        aria-haspopup="true"
+        aria-label="Account menu"
+        data-test-subj="userMenuButton"
+        onClick={[Function]}
+      >
+        <EuiAvatar
+          name="foo"
+          size="s"
+        />
+      </EuiHeaderSectionItemButton>
+    `);
+  });
+
+  it(`doesn't render the popover when the user hasn't been loaded yet`, async () => {
+    const props = {
+      user: Promise.resolve({ full_name: 'foo' }) as Promise<AuthenticatedUser>,
+      editProfileUrl: '',
+      logoutUrl: '',
+    };
+
+    const wrapper = mountWithIntl(<SecurityNavControl {...props} />);
+    // not awaiting the user promise
+
+    expect(findTestSubject(wrapper, 'userMenu')).toHaveLength(0);
+    expect(findTestSubject(wrapper, 'profileLink')).toHaveLength(0);
+    expect(findTestSubject(wrapper, 'logoutLink')).toHaveLength(0);
+
+    wrapper.find(EuiHeaderSectionItemButton).simulate('click');
+
+    expect(findTestSubject(wrapper, 'userMenu')).toHaveLength(0);
+    expect(findTestSubject(wrapper, 'profileLink')).toHaveLength(0);
+    expect(findTestSubject(wrapper, 'logoutLink')).toHaveLength(0);
+  });
+
+  it('renders a popover when the avatar is clicked.', async () => {
+    const props = {
+      user: Promise.resolve({ full_name: 'foo' }) as Promise<AuthenticatedUser>,
+      editProfileUrl: '',
+      logoutUrl: '',
+    };
+
+    const wrapper = mountWithIntl(<SecurityNavControl {...props} />);
+    await nextTick();
+    wrapper.update();
+
+    expect(findTestSubject(wrapper, 'userMenu')).toHaveLength(0);
+    expect(findTestSubject(wrapper, 'profileLink')).toHaveLength(0);
+    expect(findTestSubject(wrapper, 'logoutLink')).toHaveLength(0);
+
+    wrapper.find(EuiHeaderSectionItemButton).simulate('click');
+
+    expect(findTestSubject(wrapper, 'userMenu')).toHaveLength(1);
+    expect(findTestSubject(wrapper, 'profileLink')).toHaveLength(1);
+    expect(findTestSubject(wrapper, 'logoutLink')).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/security/public/nav_control/nav_control_component.tsx b/x-pack/plugins/security/public/nav_control/nav_control_component.tsx
new file mode 100644
index 0000000000000..eaa1d8dee0a11
--- /dev/null
+++ b/x-pack/plugins/security/public/nav_control/nav_control_component.tsx
@@ -0,0 +1,148 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { FormattedMessage } from '@kbn/i18n/react';
+import React, { Component } from 'react';
+
+import {
+  EuiAvatar,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHeaderSectionItemButton,
+  EuiLink,
+  EuiText,
+  EuiSpacer,
+  EuiPopover,
+  EuiLoadingSpinner,
+} from '@elastic/eui';
+import { AuthenticatedUser } from '../../common/model';
+
+interface Props {
+  user: Promise<AuthenticatedUser>;
+  editProfileUrl: string;
+  logoutUrl: string;
+}
+
+interface State {
+  isOpen: boolean;
+  authenticatedUser: AuthenticatedUser | null;
+}
+
+export class SecurityNavControl extends Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+
+    this.state = {
+      isOpen: false,
+      authenticatedUser: null,
+    };
+
+    props.user.then(authenticatedUser => {
+      this.setState({
+        authenticatedUser,
+      });
+    });
+  }
+
+  onMenuButtonClick = () => {
+    if (!this.state.authenticatedUser) {
+      return;
+    }
+
+    this.setState({
+      isOpen: !this.state.isOpen,
+    });
+  };
+
+  closeMenu = () => {
+    this.setState({
+      isOpen: false,
+    });
+  };
+
+  render() {
+    const { editProfileUrl, logoutUrl } = this.props;
+    const { authenticatedUser } = this.state;
+
+    const name =
+      (authenticatedUser && (authenticatedUser.full_name || authenticatedUser.username)) || '';
+
+    const buttonContents = authenticatedUser ? (
+      <EuiAvatar name={name} size="s" />
+    ) : (
+      <EuiLoadingSpinner size="m" />
+    );
+
+    const button = (
+      <EuiHeaderSectionItemButton
+        aria-controls="headerUserMenu"
+        aria-expanded={this.state.isOpen}
+        aria-haspopup="true"
+        aria-label={i18n.translate('xpack.security.navControlComponent.accountMenuAriaLabel', {
+          defaultMessage: 'Account menu',
+        })}
+        onClick={this.onMenuButtonClick}
+        data-test-subj="userMenuButton"
+      >
+        {buttonContents}
+      </EuiHeaderSectionItemButton>
+    );
+
+    return (
+      <EuiPopover
+        id="headerUserMenu"
+        ownFocus
+        button={button}
+        isOpen={this.state.isOpen}
+        anchorPosition="downRight"
+        repositionOnScroll
+        closePopover={this.closeMenu}
+        panelPaddingSize="none"
+      >
+        <div style={{ width: 320 }} data-test-subj="userMenu">
+          <EuiFlexGroup gutterSize="m" className="euiHeaderProfile" responsive={false}>
+            <EuiFlexItem grow={false}>
+              <EuiAvatar name={name} size="xl" />
+            </EuiFlexItem>
+
+            <EuiFlexItem>
+              <EuiText>
+                <p className="eui-textBreakWord">{name}</p>
+              </EuiText>
+
+              <EuiSpacer size="m" />
+
+              <EuiFlexGroup>
+                <EuiFlexItem>
+                  <EuiFlexGroup justifyContent="spaceBetween">
+                    <EuiFlexItem grow={false}>
+                      <EuiLink href={editProfileUrl} data-test-subj="profileLink">
+                        <FormattedMessage
+                          id="xpack.security.navControlComponent.editProfileLinkText"
+                          defaultMessage="Edit profile"
+                        />
+                      </EuiLink>
+                    </EuiFlexItem>
+
+                    <EuiFlexItem grow={false}>
+                      <EuiLink href={logoutUrl} data-test-subj="logoutLink">
+                        <FormattedMessage
+                          id="xpack.security.navControlComponent.logoutLinkText"
+                          defaultMessage="Log out"
+                        />
+                      </EuiLink>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </div>
+      </EuiPopover>
+    );
+  }
+}
diff --git a/x-pack/plugins/security/public/nav_control/nav_control_service.test.ts b/x-pack/plugins/security/public/nav_control/nav_control_service.test.ts
new file mode 100644
index 0000000000000..a9a89ee05f561
--- /dev/null
+++ b/x-pack/plugins/security/public/nav_control/nav_control_service.test.ts
@@ -0,0 +1,171 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { coreMock } from 'src/core/public/mocks';
+import { BehaviorSubject } from 'rxjs';
+import { ILicense } from '../../../licensing/public';
+import { SecurityNavControlService } from '.';
+import { SecurityLicenseService } from '../../common/licensing';
+import { nextTick } from 'test_utils/enzyme_helpers';
+import { securityMock } from '../mocks';
+import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
+
+const validLicense = {
+  isAvailable: true,
+  getFeature: feature => {
+    expect(feature).toEqual('security');
+
+    return {
+      isAvailable: true,
+      isEnabled: true,
+    };
+  },
+  hasAtLeast: (...candidates) => true,
+} as ILicense;
+
+describe('SecurityNavControlService', () => {
+  it('can render and cleanup the control via the mount() function', async () => {
+    const license$ = new BehaviorSubject<ILicense>(validLicense);
+
+    const navControlService = new SecurityNavControlService();
+    const mockSecuritySetup = securityMock.createSetup();
+    mockSecuritySetup.authc.getCurrentUser.mockResolvedValue(
+      mockAuthenticatedUser({ username: 'some-user', full_name: undefined })
+    );
+    navControlService.setup({
+      securityLicense: new SecurityLicenseService().setup({ license$ }).license,
+      authc: mockSecuritySetup.authc,
+    });
+
+    const coreStart = coreMock.createStart();
+    coreStart.chrome.navControls.registerRight = jest.fn();
+
+    navControlService.start({ core: coreStart });
+    expect(coreStart.chrome.navControls.registerRight).toHaveBeenCalledTimes(1);
+    const [{ mount }] = coreStart.chrome.navControls.registerRight.mock.calls[0];
+
+    const target = document.createElement('div');
+    const cleanup = mount(target);
+
+    await nextTick();
+
+    expect(target).toMatchInlineSnapshot(`
+      <div>
+        <div
+          class="euiPopover euiPopover--anchorDownRight"
+          id="headerUserMenu"
+        >
+          <div
+            class="euiPopover__anchor"
+          >
+            <button
+              aria-controls="headerUserMenu"
+              aria-expanded="false"
+              aria-haspopup="true"
+              aria-label="Account menu"
+              class="euiHeaderSectionItem__button"
+              data-test-subj="userMenuButton"
+              type="button"
+            >
+              <div
+                aria-label="some-user"
+                class="euiAvatar euiAvatar--s euiAvatar--user"
+                style="background-image: none; background-color: rgb(146, 0, 0); color: rgb(255, 255, 255);"
+                title="some-user"
+              >
+                <span
+                  aria-hidden="true"
+                >
+                  s
+                </span>
+              </div>
+            </button>
+          </div>
+        </div>
+      </div>
+    `);
+
+    cleanup();
+
+    expect(target).toMatchInlineSnapshot(`<div />`);
+  });
+
+  it('should register the nav control once the license supports it', () => {
+    const license$ = new BehaviorSubject<ILicense>({} as ILicense);
+
+    const navControlService = new SecurityNavControlService();
+    navControlService.setup({
+      securityLicense: new SecurityLicenseService().setup({ license$ }).license,
+      authc: securityMock.createSetup().authc,
+    });
+
+    const coreStart = coreMock.createStart();
+    navControlService.start({ core: coreStart });
+
+    expect(coreStart.chrome.navControls.registerRight).not.toHaveBeenCalled();
+
+    license$.next(validLicense);
+
+    expect(coreStart.chrome.navControls.registerRight).toHaveBeenCalled();
+  });
+
+  it('should not register the nav control for anonymous paths', () => {
+    const license$ = new BehaviorSubject<ILicense>(validLicense);
+
+    const navControlService = new SecurityNavControlService();
+    navControlService.setup({
+      securityLicense: new SecurityLicenseService().setup({ license$ }).license,
+      authc: securityMock.createSetup().authc,
+    });
+
+    const coreStart = coreMock.createStart();
+    coreStart.http.anonymousPaths.isAnonymous.mockReturnValue(true);
+    navControlService.start({ core: coreStart });
+
+    expect(coreStart.chrome.navControls.registerRight).not.toHaveBeenCalled();
+  });
+
+  it('should only register the nav control once', () => {
+    const license$ = new BehaviorSubject<ILicense>(validLicense);
+
+    const navControlService = new SecurityNavControlService();
+    navControlService.setup({
+      securityLicense: new SecurityLicenseService().setup({ license$ }).license,
+      authc: securityMock.createSetup().authc,
+    });
+
+    const coreStart = coreMock.createStart();
+    navControlService.start({ core: coreStart });
+
+    expect(coreStart.chrome.navControls.registerRight).toHaveBeenCalledTimes(1);
+
+    // trigger license change
+    license$.next({} as ILicense);
+    license$.next(validLicense);
+
+    expect(coreStart.chrome.navControls.registerRight).toHaveBeenCalledTimes(1);
+  });
+
+  it('should allow for re-registration if the service is restarted', () => {
+    const license$ = new BehaviorSubject<ILicense>(validLicense);
+
+    const navControlService = new SecurityNavControlService();
+    navControlService.setup({
+      securityLicense: new SecurityLicenseService().setup({ license$ }).license,
+      authc: securityMock.createSetup().authc,
+    });
+
+    const coreStart = coreMock.createStart();
+    navControlService.start({ core: coreStart });
+
+    expect(coreStart.chrome.navControls.registerRight).toHaveBeenCalledTimes(1);
+
+    navControlService.stop();
+
+    navControlService.start({ core: coreStart });
+    expect(coreStart.chrome.navControls.registerRight).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/x-pack/plugins/security/public/nav_control/nav_control_service.tsx b/x-pack/plugins/security/public/nav_control/nav_control_service.tsx
new file mode 100644
index 0000000000000..153e7112dc95b
--- /dev/null
+++ b/x-pack/plugins/security/public/nav_control/nav_control_service.tsx
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Subscription } from 'rxjs';
+import { CoreStart } from 'src/core/public';
+import ReactDOM from 'react-dom';
+import React from 'react';
+import { SecurityLicense } from '../../common/licensing';
+import { SecurityNavControl } from './nav_control_component';
+import { AuthenticationServiceSetup } from '../authentication';
+
+interface SetupDeps {
+  securityLicense: SecurityLicense;
+  authc: AuthenticationServiceSetup;
+}
+
+interface StartDeps {
+  core: CoreStart;
+}
+
+export class SecurityNavControlService {
+  private securityLicense!: SecurityLicense;
+  private authc!: AuthenticationServiceSetup;
+
+  private navControlRegistered!: boolean;
+
+  private securityFeaturesSubscription?: Subscription;
+
+  public setup({ securityLicense, authc }: SetupDeps) {
+    this.securityLicense = securityLicense;
+    this.authc = authc;
+  }
+
+  public start({ core }: StartDeps) {
+    this.securityFeaturesSubscription = this.securityLicense.features$.subscribe(
+      ({ showLinks }) => {
+        const isAnonymousPath = core.http.anonymousPaths.isAnonymous(window.location.pathname);
+
+        const shouldRegisterNavControl =
+          !isAnonymousPath && showLinks && !this.navControlRegistered;
+        if (shouldRegisterNavControl) {
+          this.registerSecurityNavControl(core);
+        }
+      }
+    );
+  }
+
+  public stop() {
+    if (this.securityFeaturesSubscription) {
+      this.securityFeaturesSubscription.unsubscribe();
+      this.securityFeaturesSubscription = undefined;
+    }
+    this.navControlRegistered = false;
+  }
+
+  private registerSecurityNavControl(
+    core: Pick<CoreStart, 'chrome' | 'http' | 'i18n' | 'application'>
+  ) {
+    const currentUserPromise = this.authc.getCurrentUser();
+    core.chrome.navControls.registerRight({
+      order: 2000,
+      mount: (el: HTMLElement) => {
+        const I18nContext = core.i18n.Context;
+
+        const props = {
+          user: currentUserPromise,
+          editProfileUrl: core.http.basePath.prepend('/app/kibana#/account'),
+          logoutUrl: core.http.basePath.prepend(`/logout`),
+        };
+        ReactDOM.render(
+          <I18nContext>
+            <SecurityNavControl {...props} />
+          </I18nContext>,
+          el
+        );
+
+        return () => ReactDOM.unmountComponentAtNode(el);
+      },
+    });
+
+    this.navControlRegistered = true;
+  }
+}
diff --git a/x-pack/plugins/security/public/plugin.ts b/x-pack/plugins/security/public/plugin.ts
index 7b1a554e1d3f1..50e0b838c750f 100644
--- a/x-pack/plugins/security/public/plugin.ts
+++ b/x-pack/plugins/security/public/plugin.ts
@@ -4,18 +4,31 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Plugin, CoreSetup } from 'src/core/public';
+import { Plugin, CoreSetup, CoreStart } from 'src/core/public';
+import { LicensingPluginSetup } from '../../licensing/public';
 import {
   SessionExpired,
   SessionTimeout,
+  ISessionTimeout,
   SessionTimeoutHttpInterceptor,
   UnauthorizedResponseHttpInterceptor,
 } from './session';
+import { SecurityLicenseService } from '../common/licensing';
+import { SecurityNavControlService } from './nav_control';
+import { AuthenticationService } from './authentication';
+
+export interface PluginSetupDependencies {
+  licensing: LicensingPluginSetup;
+}
 
 export class SecurityPlugin implements Plugin<SecurityPluginSetup, SecurityPluginStart> {
-  private sessionTimeout!: SessionTimeout;
+  private sessionTimeout!: ISessionTimeout;
+
+  private navControlService!: SecurityNavControlService;
+
+  private securityLicenseService!: SecurityLicenseService;
 
-  public setup(core: CoreSetup) {
+  public setup(core: CoreSetup, { licensing }: PluginSetupDependencies) {
     const { http, notifications, injectedMetadata } = core;
     const { basePath, anonymousPaths } = http;
     anonymousPaths.register('/login');
@@ -28,18 +41,32 @@ export class SecurityPlugin implements Plugin<SecurityPluginSetup, SecurityPlugi
     this.sessionTimeout = new SessionTimeout(notifications, sessionExpired, http, tenant);
     http.intercept(new SessionTimeoutHttpInterceptor(this.sessionTimeout, anonymousPaths));
 
+    this.navControlService = new SecurityNavControlService();
+    this.securityLicenseService = new SecurityLicenseService();
+    const { license } = this.securityLicenseService.setup({ license$: licensing.license$ });
+
+    const authc = new AuthenticationService().setup({ http: core.http });
+
+    this.navControlService.setup({
+      securityLicense: license,
+      authc,
+    });
+
     return {
-      anonymousPaths,
+      authc,
       sessionTimeout: this.sessionTimeout,
     };
   }
 
-  public start() {
+  public start(core: CoreStart) {
     this.sessionTimeout.start();
+    this.navControlService.start({ core });
   }
 
   public stop() {
     this.sessionTimeout.stop();
+    this.navControlService.stop();
+    this.securityLicenseService.stop();
   }
 }
 
diff --git a/x-pack/plugins/security/public/session/index.ts b/x-pack/plugins/security/public/session/index.ts
index 253207dc1b717..5c245029e3983 100644
--- a/x-pack/plugins/security/public/session/index.ts
+++ b/x-pack/plugins/security/public/session/index.ts
@@ -5,6 +5,6 @@
  */
 
 export { SessionExpired } from './session_expired';
-export { SessionTimeout } from './session_timeout';
+export { SessionTimeout, ISessionTimeout } 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_timeout.tsx b/x-pack/plugins/security/public/session/session_timeout.tsx
index 0069e78b5f372..e237201699b9b 100644
--- a/x-pack/plugins/security/public/session/session_timeout.tsx
+++ b/x-pack/plugins/security/public/session/session_timeout.tsx
@@ -41,7 +41,7 @@ export interface ISessionTimeout {
   extend(url: string): void;
 }
 
-export class SessionTimeout {
+export class SessionTimeout implements ISessionTimeout {
   private channel?: BroadcastChannel<SessionInfo>;
   private sessionInfo?: SessionInfo;
   private fetchTimer?: number;
diff --git a/x-pack/plugins/security/server/audit/audit_logger.test.ts b/x-pack/plugins/security/server/audit/audit_logger.test.ts
index 2ae8b6762c5d4..01cde02b7dfdd 100644
--- a/x-pack/plugins/security/server/audit/audit_logger.test.ts
+++ b/x-pack/plugins/security/server/audit/audit_logger.test.ts
@@ -14,7 +14,7 @@ const createMockAuditLogger = () => {
 describe(`#savedObjectsAuthorizationFailure`, () => {
   test('logs via auditLogger', () => {
     const auditLogger = createMockAuditLogger();
-    const securityAuditLogger = new SecurityAuditLogger(auditLogger);
+    const securityAuditLogger = new SecurityAuditLogger(() => auditLogger);
     const username = 'foo-user';
     const action = 'foo-action';
     const types = ['foo-type-1', 'foo-type-2'];
@@ -43,7 +43,7 @@ describe(`#savedObjectsAuthorizationFailure`, () => {
 describe(`#savedObjectsAuthorizationSuccess`, () => {
   test('logs via auditLogger when xpack.security.audit.enabled is true', () => {
     const auditLogger = createMockAuditLogger();
-    const securityAuditLogger = new SecurityAuditLogger(auditLogger);
+    const securityAuditLogger = new SecurityAuditLogger(() => auditLogger);
     const username = 'foo-user';
     const action = 'foo-action';
     const types = ['foo-type-1', 'foo-type-2'];
diff --git a/x-pack/plugins/security/server/audit/audit_logger.ts b/x-pack/plugins/security/server/audit/audit_logger.ts
index 4c2c57d0e029e..df8df35f97b49 100644
--- a/x-pack/plugins/security/server/audit/audit_logger.ts
+++ b/x-pack/plugins/security/server/audit/audit_logger.ts
@@ -7,7 +7,7 @@
 import { LegacyAPI } from '../plugin';
 
 export class SecurityAuditLogger {
-  constructor(private readonly auditLogger: LegacyAPI['auditLogger']) {}
+  constructor(private readonly getAuditLogger: () => LegacyAPI['auditLogger']) {}
 
   savedObjectsAuthorizationFailure(
     username: string,
@@ -16,7 +16,7 @@ export class SecurityAuditLogger {
     missing: string[],
     args?: Record<string, unknown>
   ) {
-    this.auditLogger.log(
+    this.getAuditLogger().log(
       'saved_objects_authorization_failure',
       `${username} unauthorized to ${action} ${types.join(',')}, missing ${missing.join(',')}`,
       {
@@ -35,7 +35,7 @@ export class SecurityAuditLogger {
     types: string[],
     args?: Record<string, unknown>
   ) {
-    this.auditLogger.log(
+    this.getAuditLogger().log(
       'saved_objects_authorization_success',
       `${username} authorized to ${action} ${types.join(',')}`,
       {
diff --git a/x-pack/plugins/security/server/authentication/api_keys.test.ts b/x-pack/plugins/security/server/authentication/api_keys.test.ts
index dfddf2036f1b8..bcb212e7bbf94 100644
--- a/x-pack/plugins/security/server/authentication/api_keys.test.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { IClusterClient, IScopedClusterClient } from '../../../../../src/core/server';
-import { SecurityLicense } from '../licensing';
+import { SecurityLicense } from '../../common/licensing';
 import { APIKeys } from './api_keys';
 
 import {
@@ -13,7 +13,7 @@ import {
   loggingServiceMock,
   elasticsearchServiceMock,
 } from '../../../../../src/core/server/mocks';
-import { licenseMock } from '../licensing/index.mock';
+import { licenseMock } from '../../common/licensing/index.mock';
 
 describe('API Keys', () => {
   let apiKeys: APIKeys;
diff --git a/x-pack/plugins/security/server/authentication/api_keys.ts b/x-pack/plugins/security/server/authentication/api_keys.ts
index b207e227c56af..2b1a93d907471 100644
--- a/x-pack/plugins/security/server/authentication/api_keys.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys.ts
@@ -5,7 +5,7 @@
  */
 
 import { IClusterClient, KibanaRequest, Logger } from '../../../../../src/core/server';
-import { SecurityLicense } from '../licensing';
+import { SecurityLicense } from '../../common/licensing';
 
 /**
  * Represents the options to create an APIKey class instance that will be
diff --git a/x-pack/plugins/security/server/authentication/index.test.ts b/x-pack/plugins/security/server/authentication/index.test.ts
index 6a0057e97dcf0..0c1095b56e6e2 100644
--- a/x-pack/plugins/security/server/authentication/index.test.ts
+++ b/x-pack/plugins/security/server/authentication/index.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { licenseMock } from '../licensing/index.mock';
+import { licenseMock } from '../../common/licensing/index.mock';
 
 jest.mock('./api_keys');
 jest.mock('./authenticator');
@@ -43,7 +43,7 @@ import {
   InvalidateAPIKeyResult,
   InvalidateAPIKeyParams,
 } from './api_keys';
-import { SecurityLicense } from '../licensing';
+import { SecurityLicense } from '../../common/licensing';
 
 describe('setupAuthentication()', () => {
   let mockSetupAuthenticationParams: {
diff --git a/x-pack/plugins/security/server/authentication/index.ts b/x-pack/plugins/security/server/authentication/index.ts
index de2fb54ab8c2a..1002ad7709b80 100644
--- a/x-pack/plugins/security/server/authentication/index.ts
+++ b/x-pack/plugins/security/server/authentication/index.ts
@@ -16,7 +16,7 @@ import { getErrorStatusCode } from '../errors';
 import { Authenticator, ProviderSession } from './authenticator';
 import { LegacyAPI } from '../plugin';
 import { APIKeys, CreateAPIKeyParams, InvalidateAPIKeyParams } from './api_keys';
-import { SecurityLicense } from '../licensing';
+import { SecurityLicense } from '../../common/licensing';
 
 export { canRedirectRequest } from './can_redirect_request';
 export { Authenticator, ProviderLoginAttempt } from './authenticator';
diff --git a/x-pack/plugins/security/server/authentication/providers/oidc.test.ts b/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
index ad7eab76db088..dd4f6820f89f3 100644
--- a/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
+++ b/x-pack/plugins/security/server/authentication/providers/oidc.test.ts
@@ -42,7 +42,7 @@ describe('OIDCAuthenticationProvider', () => {
 
   describe('`login` method', () => {
     it('redirects third party initiated login attempts to the OpenId Connect Provider.', async () => {
-      const request = httpServerMock.createKibanaRequest({ path: '/api/security/oidc' });
+      const request = httpServerMock.createKibanaRequest({ path: '/api/security/oidc/callback' });
 
       mockOptions.client.callAsInternalUser.withArgs('shield.oidcPrepare').resolves({
         state: 'statevalue',
@@ -205,13 +205,14 @@ describe('OIDCAuthenticationProvider', () => {
     describe('authorization code flow', () => {
       defineAuthenticationFlowTests(() => ({
         request: httpServerMock.createKibanaRequest({
-          path: '/api/security/oidc?code=somecodehere&state=somestatehere',
+          path: '/api/security/oidc/callback?code=somecodehere&state=somestatehere',
         }),
         attempt: {
           flow: OIDCAuthenticationFlow.AuthorizationCode,
-          authenticationResponseURI: '/api/security/oidc?code=somecodehere&state=somestatehere',
+          authenticationResponseURI:
+            '/api/security/oidc/callback?code=somecodehere&state=somestatehere',
         },
-        expectedRedirectURI: '/api/security/oidc?code=somecodehere&state=somestatehere',
+        expectedRedirectURI: '/api/security/oidc/callback?code=somecodehere&state=somestatehere',
       }));
     });
 
@@ -219,7 +220,7 @@ describe('OIDCAuthenticationProvider', () => {
       defineAuthenticationFlowTests(() => ({
         request: httpServerMock.createKibanaRequest({
           path:
-            '/api/security/oidc?authenticationResponseURI=http://kibana/api/security/oidc/implicit#id_token=sometoken',
+            '/api/security/oidc/callback?authenticationResponseURI=http://kibana/api/security/oidc/implicit#id_token=sometoken',
         }),
         attempt: {
           flow: OIDCAuthenticationFlow.Implicit,
diff --git a/x-pack/plugins/security/server/authorization/index.test.ts b/x-pack/plugins/security/server/authorization/index.test.ts
index 34b9efea77165..9e99cae620633 100644
--- a/x-pack/plugins/security/server/authorization/index.test.ts
+++ b/x-pack/plugins/security/server/authorization/index.test.ts
@@ -24,7 +24,7 @@ import {
   elasticsearchServiceMock,
   loggingServiceMock,
 } from '../../../../../src/core/server/mocks';
-import { licenseMock } from '../licensing/index.mock';
+import { licenseMock } from '../../common/licensing/index.mock';
 
 test(`returns exposed services`, () => {
   const kibanaIndexName = '.a-kibana-index';
diff --git a/x-pack/plugins/security/server/authorization/index.ts b/x-pack/plugins/security/server/authorization/index.ts
index 41e6d12eb8f36..00a50dd5b8821 100644
--- a/x-pack/plugins/security/server/authorization/index.ts
+++ b/x-pack/plugins/security/server/authorization/index.ts
@@ -31,7 +31,7 @@ import { disableUICapabilitiesFactory } from './disable_ui_capabilities';
 import { validateFeaturePrivileges } from './validate_feature_privileges';
 import { registerPrivilegesWithCluster } from './register_privileges_with_cluster';
 import { APPLICATION_PREFIX } from '../../common/constants';
-import { SecurityLicense } from '../licensing';
+import { SecurityLicense } from '../../common/licensing';
 
 export { Actions } from './actions';
 export { CheckSavedObjectsPrivileges } from './check_saved_objects_privileges';
diff --git a/x-pack/plugins/security/server/authorization/mode.test.ts b/x-pack/plugins/security/server/authorization/mode.test.ts
index 3f6aa1f68ff0d..7d7d2108c049b 100644
--- a/x-pack/plugins/security/server/authorization/mode.test.ts
+++ b/x-pack/plugins/security/server/authorization/mode.test.ts
@@ -7,9 +7,9 @@
 import { authorizationModeFactory } from './mode';
 
 import { httpServerMock } from '../../../../../src/core/server/mocks';
-import { licenseMock } from '../licensing/index.mock';
-import { SecurityLicenseFeatures } from '../licensing/license_features';
-import { SecurityLicense } from '../licensing';
+import { licenseMock } from '../../common/licensing/index.mock';
+import { SecurityLicenseFeatures } from '../../common/licensing/license_features';
+import { SecurityLicense } from '../../common/licensing';
 
 describe(`#useRbacForRequest`, () => {
   let mockLicense: jest.Mocked<SecurityLicense>;
diff --git a/x-pack/plugins/security/server/authorization/mode.ts b/x-pack/plugins/security/server/authorization/mode.ts
index 43ac8f43436fd..6a56c6cfc260a 100644
--- a/x-pack/plugins/security/server/authorization/mode.ts
+++ b/x-pack/plugins/security/server/authorization/mode.ts
@@ -5,7 +5,7 @@
  */
 
 import { KibanaRequest } from '../../../../../src/core/server';
-import { SecurityLicense } from '../licensing';
+import { SecurityLicense } from '../../common/licensing';
 
 export interface AuthorizationMode {
   useRbacForRequest(request: KibanaRequest): boolean;
diff --git a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts
index c18c071ca7675..dc406c17925dd 100644
--- a/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts
+++ b/x-pack/plugins/security/server/authorization/register_privileges_with_cluster.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IClusterClient, Logger } from '../../../../../src/core/server';
+import { IClusterClient, Logger } from 'kibana/server';
 import { RawKibanaPrivileges } from '../../common/model';
 import { registerPrivilegesWithCluster } from './register_privileges_with_cluster';
 
diff --git a/x-pack/plugins/security/server/config.ts b/x-pack/plugins/security/server/config.ts
index b3f96497b0538..4f1c25702ae97 100644
--- a/x-pack/plugins/security/server/config.ts
+++ b/x-pack/plugins/security/server/config.ts
@@ -8,7 +8,6 @@ import crypto from 'crypto';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { schema, Type, TypeOf } from '@kbn/config-schema';
-import { duration } from 'moment';
 import { PluginInitializerContext } from '../../../../src/core/server';
 
 export type ConfigType = ReturnType<typeof createConfig$> extends Observable<infer P>
@@ -35,7 +34,6 @@ export const ConfigSchema = schema.object(
       schema.maybe(schema.string({ minLength: 32 })),
       schema.string({ minLength: 32, defaultValue: 'a'.repeat(32) })
     ),
-    sessionTimeout: schema.maybe(schema.nullable(schema.number())), // DEPRECATED
     session: schema.object({
       idleTimeout: schema.nullable(schema.duration()),
       lifespan: schema.nullable(schema.duration()),
@@ -88,22 +86,11 @@ export function createConfig$(context: PluginInitializerContext, isTLSEnabled: b
         secureCookies = true;
       }
 
-      // "sessionTimeout" is deprecated and replaced with "session.idleTimeout"
-      // however, NP does not yet have a mechanism to automatically rename deprecated keys
-      // for the time being, we'll do it manually:
-      const deprecatedSessionTimeout =
-        typeof config.sessionTimeout === 'number' ? duration(config.sessionTimeout) : null;
-      const val = {
+      return {
         ...config,
         encryptionKey,
         secureCookies,
-        session: {
-          ...config.session,
-          idleTimeout: config.session.idleTimeout || deprecatedSessionTimeout,
-        },
       };
-      delete val.sessionTimeout; // DEPRECATED
-      return val;
     })
   );
 }
diff --git a/x-pack/plugins/security/server/index.ts b/x-pack/plugins/security/server/index.ts
index e72e94e9cd94b..33f554be5caa3 100644
--- a/x-pack/plugins/security/server/index.ts
+++ b/x-pack/plugins/security/server/index.ts
@@ -4,15 +4,36 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { TypeOf } from '@kbn/config-schema';
+import {
+  PluginConfigDescriptor,
+  PluginInitializer,
+  PluginInitializerContext,
+  RecursiveReadonly,
+} from '../../../../src/core/server';
 import { ConfigSchema } from './config';
-import { Plugin } from './plugin';
+import { Plugin, PluginSetupContract, PluginSetupDependencies } from './plugin';
 
 // These exports are part of public Security plugin contract, any change in signature of exported
 // functions or removal of exports should be considered as a breaking change.
-export { AuthenticationResult, DeauthenticationResult, CreateAPIKeyResult } from './authentication';
-export { PluginSetupContract } from './plugin';
+export {
+  AuthenticationResult,
+  DeauthenticationResult,
+  CreateAPIKeyResult,
+  InvalidateAPIKeyParams,
+  InvalidateAPIKeyResult,
+} from './authentication';
+export { PluginSetupContract };
 
-export const config = { schema: ConfigSchema };
-export const plugin = (initializerContext: PluginInitializerContext) =>
-  new Plugin(initializerContext);
+export const config: PluginConfigDescriptor<TypeOf<typeof ConfigSchema>> = {
+  schema: ConfigSchema,
+  deprecations: ({ rename, unused }) => [
+    rename('sessionTimeout', 'session.idleTimeout'),
+    unused('authorization.legacyFallback.enabled'),
+  ],
+};
+export const plugin: PluginInitializer<
+  RecursiveReadonly<PluginSetupContract>,
+  void,
+  PluginSetupDependencies
+> = (initializerContext: PluginInitializerContext) => new Plugin(initializerContext);
diff --git a/x-pack/plugins/security/server/licensing/index.mock.ts b/x-pack/plugins/security/server/licensing/index.mock.ts
deleted file mode 100644
index b38f031c4ee7d..0000000000000
--- a/x-pack/plugins/security/server/licensing/index.mock.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 { SecurityLicense } from '.';
-
-export const licenseMock = {
-  create: (): jest.Mocked<SecurityLicense> => ({
-    isEnabled: jest.fn().mockReturnValue(true),
-    getFeatures: jest.fn(),
-  }),
-};
diff --git a/x-pack/plugins/security/server/licensing/license_service.test.ts b/x-pack/plugins/security/server/licensing/license_service.test.ts
deleted file mode 100644
index d5d33c07985fd..0000000000000
--- a/x-pack/plugins/security/server/licensing/license_service.test.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 { ILicense } from '../../../licensing/server';
-import { SecurityLicenseService } from './license_service';
-
-function getMockRawLicense({ isAvailable = false } = {}) {
-  return ({
-    isAvailable,
-    isOneOf: jest.fn(),
-    getFeature: jest.fn(),
-  } as unknown) as jest.Mocked<ILicense>;
-}
-
-describe('license features', function() {
-  it('should display error when ES is unavailable', () => {
-    const serviceSetup = new SecurityLicenseService().setup();
-    expect(serviceSetup.license.getFeatures()).toEqual({
-      showLogin: true,
-      allowLogin: false,
-      showLinks: false,
-      allowRoleDocumentLevelSecurity: false,
-      allowRoleFieldLevelSecurity: false,
-      layout: 'error-es-unavailable',
-      allowRbac: false,
-    });
-  });
-
-  it('should display error when X-Pack is unavailable', () => {
-    const serviceSetup = new SecurityLicenseService().setup();
-    serviceSetup.update(getMockRawLicense({ isAvailable: false }));
-    expect(serviceSetup.license.getFeatures()).toEqual({
-      showLogin: true,
-      allowLogin: false,
-      showLinks: false,
-      allowRoleDocumentLevelSecurity: false,
-      allowRoleFieldLevelSecurity: false,
-      layout: 'error-xpack-unavailable',
-      allowRbac: false,
-    });
-  });
-
-  it('should show login page and other security elements, allow RBAC but forbid document level security if license is not platinum or trial.', () => {
-    const mockRawLicense = getMockRawLicense({ isAvailable: true });
-    mockRawLicense.isOneOf.mockImplementation(licenses =>
-      Array.isArray(licenses) ? licenses.includes('basic') : licenses === 'basic'
-    );
-    mockRawLicense.getFeature.mockReturnValue({ isEnabled: true, isAvailable: true });
-
-    const serviceSetup = new SecurityLicenseService().setup();
-    serviceSetup.update(mockRawLicense);
-    expect(serviceSetup.license.getFeatures()).toEqual({
-      showLogin: true,
-      allowLogin: true,
-      showLinks: true,
-      allowRoleDocumentLevelSecurity: false,
-      allowRoleFieldLevelSecurity: false,
-      allowRbac: true,
-    });
-    expect(mockRawLicense.getFeature).toHaveBeenCalledTimes(1);
-    expect(mockRawLicense.getFeature).toHaveBeenCalledWith('security');
-  });
-
-  it('should not show login page or other security elements if security is disabled in Elasticsearch.', () => {
-    const mockRawLicense = getMockRawLicense({ isAvailable: true });
-    mockRawLicense.isOneOf.mockReturnValue(false);
-    mockRawLicense.getFeature.mockReturnValue({ isEnabled: false, isAvailable: true });
-
-    const serviceSetup = new SecurityLicenseService().setup();
-    serviceSetup.update(mockRawLicense);
-    expect(serviceSetup.license.getFeatures()).toEqual({
-      showLogin: false,
-      allowLogin: false,
-      showLinks: false,
-      allowRoleDocumentLevelSecurity: false,
-      allowRoleFieldLevelSecurity: false,
-      allowRbac: false,
-      linksMessage: 'Access is denied because Security is disabled in Elasticsearch.',
-    });
-  });
-
-  it('should allow to login, allow RBAC and document level security if license is platinum or trial.', () => {
-    const mockRawLicense = getMockRawLicense({ isAvailable: true });
-    mockRawLicense.isOneOf.mockImplementation(licenses => {
-      const licenseArray = [licenses].flat();
-      return licenseArray.includes('trial') || licenseArray.includes('platinum');
-    });
-    mockRawLicense.getFeature.mockReturnValue({ isEnabled: true, isAvailable: true });
-
-    const serviceSetup = new SecurityLicenseService().setup();
-    serviceSetup.update(mockRawLicense);
-    expect(serviceSetup.license.getFeatures()).toEqual({
-      showLogin: true,
-      allowLogin: true,
-      showLinks: true,
-      allowRoleDocumentLevelSecurity: true,
-      allowRoleFieldLevelSecurity: true,
-      allowRbac: true,
-    });
-  });
-});
diff --git a/x-pack/plugins/security/server/licensing/license_service.ts b/x-pack/plugins/security/server/licensing/license_service.ts
deleted file mode 100644
index 58c445de9319d..0000000000000
--- a/x-pack/plugins/security/server/licensing/license_service.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 { deepFreeze } from '../../../../../src/core/utils';
-import { ILicense } from '../../../licensing/server';
-import { SecurityLicenseFeatures } from './license_features';
-
-export interface SecurityLicense {
-  isEnabled(): boolean;
-  getFeatures(): SecurityLicenseFeatures;
-}
-
-export class SecurityLicenseService {
-  public setup() {
-    let rawLicense: Readonly<ILicense> | undefined;
-
-    return {
-      update(newRawLicense: Readonly<ILicense>) {
-        rawLicense = newRawLicense;
-      },
-
-      license: deepFreeze({
-        isEnabled() {
-          if (!rawLicense) {
-            return false;
-          }
-
-          const securityFeature = rawLicense.getFeature('security');
-          return (
-            securityFeature !== undefined &&
-            securityFeature.isAvailable &&
-            securityFeature.isEnabled
-          );
-        },
-
-        /**
-         * Returns up-do-date Security related features based on the last known license.
-         */
-        getFeatures(): SecurityLicenseFeatures {
-          // If, for some reason, we cannot get license information from Elasticsearch,
-          // assume worst-case and lock user at login screen.
-          if (rawLicense === undefined || !rawLicense.isAvailable) {
-            return {
-              showLogin: true,
-              allowLogin: false,
-              showLinks: false,
-              allowRoleDocumentLevelSecurity: false,
-              allowRoleFieldLevelSecurity: false,
-              allowRbac: false,
-              layout:
-                rawLicense !== undefined && !rawLicense.isAvailable
-                  ? 'error-xpack-unavailable'
-                  : 'error-es-unavailable',
-            };
-          }
-
-          if (!this.isEnabled()) {
-            return {
-              showLogin: false,
-              allowLogin: false,
-              showLinks: false,
-              allowRoleDocumentLevelSecurity: false,
-              allowRoleFieldLevelSecurity: false,
-              allowRbac: false,
-              linksMessage: 'Access is denied because Security is disabled in Elasticsearch.',
-            };
-          }
-
-          const isLicensePlatinumOrTrial = rawLicense.isOneOf(['platinum', 'trial']);
-          return {
-            showLogin: true,
-            allowLogin: true,
-            showLinks: true,
-            // Only platinum and trial licenses are compliant with field- and document-level security.
-            allowRoleDocumentLevelSecurity: isLicensePlatinumOrTrial,
-            allowRoleFieldLevelSecurity: isLicensePlatinumOrTrial,
-            allowRbac: true,
-          };
-        },
-      }),
-    };
-  }
-}
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index cce928976accc..5e32a0e90198a 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -6,7 +6,7 @@
 
 import { of } from 'rxjs';
 import { ByteSizeValue } from '@kbn/config-schema';
-import { IClusterClient, CoreSetup } from '../../../../src/core/server';
+import { ICustomClusterClient, CoreSetup } from '../../../../src/core/server';
 import { elasticsearchClientPlugin } from './elasticsearch_client_plugin';
 import { Plugin, PluginSetupDependencies } from './plugin';
 
@@ -15,7 +15,7 @@ import { coreMock, elasticsearchServiceMock } from '../../../../src/core/server/
 describe('Security Plugin', () => {
   let plugin: Plugin;
   let mockCoreSetup: MockedKeys<CoreSetup>;
-  let mockClusterClient: jest.Mocked<IClusterClient>;
+  let mockClusterClient: jest.Mocked<ICustomClusterClient>;
   let mockDependencies: PluginSetupDependencies;
   beforeEach(() => {
     plugin = new Plugin(
@@ -35,9 +35,9 @@ describe('Security Plugin', () => {
     mockCoreSetup = coreMock.createSetup();
     mockCoreSetup.http.isTlsEnabled = true;
 
-    mockClusterClient = elasticsearchServiceMock.createClusterClient();
+    mockClusterClient = elasticsearchServiceMock.createCustomClusterClient();
     mockCoreSetup.elasticsearch.createClient.mockReturnValue(
-      (mockClusterClient as unknown) as jest.Mocked<IClusterClient>
+      (mockClusterClient as unknown) as jest.Mocked<ICustomClusterClient>
     );
 
     mockDependencies = { licensing: { license$: of({}) } } as PluginSetupDependencies;
@@ -54,6 +54,17 @@ describe('Security Plugin', () => {
                     "secureCookies": true,
                   },
                   "license": Object {
+                    "features$": Observable {
+                      "_isScalar": false,
+                      "operator": MapOperator {
+                        "project": [Function],
+                        "thisArg": undefined,
+                      },
+                      "source": Observable {
+                        "_isScalar": false,
+                        "_subscribe": [Function],
+                      },
+                    },
                     "getFeatures": [Function],
                     "isEnabled": [Function],
                   },
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index df5be97e7c393..ce682d8b30eb7 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -4,17 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Subscription, combineLatest } from 'rxjs';
+import { combineLatest } from 'rxjs';
 import { first } from 'rxjs/operators';
 import {
-  IClusterClient,
+  ICustomClusterClient,
   CoreSetup,
   KibanaRequest,
   Logger,
   PluginInitializerContext,
   RecursiveReadonly,
-  SavedObjectsLegacyService,
-  LegacyRequest,
 } from '../../../../src/core/server';
 import { deepFreeze } from '../../../../src/core/utils';
 import { SpacesPluginSetup } from '../../spaces/server';
@@ -25,7 +23,7 @@ import { Authentication, setupAuthentication } from './authentication';
 import { Authorization, setupAuthorization } from './authorization';
 import { createConfig$ } from './config';
 import { defineRoutes } from './routes';
-import { SecurityLicenseService, SecurityLicense } from './licensing';
+import { SecurityLicenseService, SecurityLicense } from '../common/licensing';
 import { setupSavedObjects } from './saved_objects';
 import { SecurityAuditLogger } from './audit';
 import { elasticsearchClientPlugin } from './elasticsearch_client_plugin';
@@ -43,7 +41,6 @@ export type FeaturesService = Pick<FeaturesSetupContract, 'getFeatures'>;
  */
 export interface LegacyAPI {
   isSystemAPIRequest: (request: KibanaRequest) => boolean;
-  savedObjects: SavedObjectsLegacyService<KibanaRequest | LegacyRequest>;
   auditLogger: {
     log: (eventType: string, message: string, data?: Record<string, unknown>) => void;
   };
@@ -88,9 +85,9 @@ export interface PluginSetupDependencies {
  */
 export class Plugin {
   private readonly logger: Logger;
-  private clusterClient?: IClusterClient;
+  private clusterClient?: ICustomClusterClient;
   private spacesService?: SpacesService | symbol = Symbol('not accessed');
-  private licenseSubscription?: Subscription;
+  private securityLicenseService?: SecurityLicenseService;
 
   private legacyAPI?: LegacyAPI;
   private readonly getLegacyAPI = () => {
@@ -113,10 +110,7 @@ export class Plugin {
     this.logger = this.initializerContext.logger.get();
   }
 
-  public async setup(
-    core: CoreSetup,
-    { features, licensing }: PluginSetupDependencies
-  ): Promise<RecursiveReadonly<PluginSetupContract>> {
+  public async setup(core: CoreSetup, { features, licensing }: PluginSetupDependencies) {
     const [config, legacyConfig] = await combineLatest([
       createConfig$(this.initializerContext, core.http.isTlsEnabled),
       this.initializerContext.config.legacy.globalConfig$,
@@ -128,10 +122,10 @@ export class Plugin {
       plugins: [elasticsearchClientPlugin],
     });
 
-    const { license, update: updateLicense } = new SecurityLicenseService().setup();
-    this.licenseSubscription = licensing.license$.subscribe(rawLicense =>
-      updateLicense(rawLicense)
-    );
+    this.securityLicenseService = new SecurityLicenseService();
+    const { license } = this.securityLicenseService.setup({
+      license$: licensing.license$,
+    });
 
     const authc = await setupAuthentication({
       http: core.http,
@@ -153,6 +147,12 @@ export class Plugin {
       featuresService: features,
     });
 
+    setupSavedObjects({
+      auditLogger: new SecurityAuditLogger(() => this.getLegacyAPI().auditLogger),
+      authz,
+      savedObjects: core.savedObjects,
+    });
+
     core.capabilities.registerSwitcher(authz.disableUnauthorizedCapabilities);
 
     defineRoutes({
@@ -166,8 +166,7 @@ export class Plugin {
       csp: core.http.csp,
     });
 
-    const adminClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();
-    return deepFreeze({
+    return deepFreeze<PluginSetupContract>({
       authc,
 
       authz: {
@@ -185,16 +184,7 @@ export class Plugin {
       },
 
       __legacyCompat: {
-        registerLegacyAPI: (legacyAPI: LegacyAPI) => {
-          this.legacyAPI = legacyAPI;
-
-          setupSavedObjects({
-            auditLogger: new SecurityAuditLogger(legacyAPI.auditLogger),
-            adminClusterClient: adminClient,
-            authz,
-            legacyAPI,
-          });
-        },
+        registerLegacyAPI: (legacyAPI: LegacyAPI) => (this.legacyAPI = legacyAPI),
 
         registerPrivilegesWithCluster: async () => await authz.registerPrivilegesWithCluster(),
 
@@ -223,9 +213,9 @@ export class Plugin {
       this.clusterClient = undefined;
     }
 
-    if (this.licenseSubscription) {
-      this.licenseSubscription.unsubscribe();
-      this.licenseSubscription = undefined;
+    if (this.securityLicenseService) {
+      this.securityLicenseService.stop();
+      this.securityLicenseService = undefined;
     }
   }
 
diff --git a/x-pack/plugins/security/server/routes/authentication/oidc.ts b/x-pack/plugins/security/server/routes/authentication/oidc.ts
index ee9c2b46ac878..232fdd26f7838 100644
--- a/x-pack/plugins/security/server/routes/authentication/oidc.ts
+++ b/x-pack/plugins/security/server/routes/authentication/oidc.ts
@@ -23,7 +23,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
     /**
      * The route should be configured as a redirect URI in OP when OpenID Connect implicit flow
      * is used, so that we can extract authentication response from URL fragment and send it to
-     * the `/api/security/oidc` route.
+     * the `/api/security/oidc/callback` route.
      */
     router.get(
       {
@@ -57,7 +57,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
 
   /**
    * The route that accompanies `/api/security/oidc/implicit` and renders a JavaScript snippet
-   * that extracts fragment part from the URL and send it to the `/api/security/oidc` route.
+   * that extracts fragment part from the URL and send it to the `/api/security/oidc/callback` route.
    * We need this separate endpoint because of default CSP policy that forbids inline scripts.
    */
   router.get(
@@ -72,7 +72,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
         createCustomResourceResponse(
           `
           window.location.replace(
-            '${serverBasePath}/api/security/oidc?authenticationResponseURI=' + encodeURIComponent(window.location.href)
+            '${serverBasePath}/api/security/oidc/callback?authenticationResponseURI=' + encodeURIComponent(window.location.href)
           );
         `,
           'text/javascript',
@@ -83,7 +83,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
   );
 
   // Generate two identical routes with new and deprecated URL and issue a warning if route with deprecated URL is ever used.
-  for (const path of ['/api/security/oidc', '/api/security/v1/oidc']) {
+  for (const path of ['/api/security/oidc/callback', '/api/security/v1/oidc']) {
     router.get(
       {
         path,
@@ -124,7 +124,7 @@ export function defineOIDCRoutes({ router, logger, authc, csp, basePath }: Route
         } else if (request.query.code || request.query.error) {
           if (path === '/api/security/v1/oidc') {
             logger.warn(
-              `The "${serverBasePath}${path}" URL is deprecated and will stop working in the next major version, please use "${serverBasePath}/api/security/oidc" URL instead.`,
+              `The "${serverBasePath}${path}" URL is deprecated and will stop working in the next major version, please use "${serverBasePath}/api/security/oidc/callback" URL instead.`,
               { tags: ['deprecation'] }
             );
           }
diff --git a/x-pack/plugins/security/server/routes/authentication/saml.ts b/x-pack/plugins/security/server/routes/authentication/saml.ts
index 06acf5283fe97..465ea61e12a4e 100644
--- a/x-pack/plugins/security/server/routes/authentication/saml.ts
+++ b/x-pack/plugins/security/server/routes/authentication/saml.ts
@@ -60,7 +60,9 @@ export function defineSAMLRoutes({ router, logger, authc, csp, basePath }: Route
   router.get(
     {
       path: '/api/security/saml/start',
-      validate: { query: schema.object({ redirectURLFragment: schema.string() }) },
+      validate: {
+        query: schema.object({ redirectURLFragment: schema.string() }),
+      },
       options: { authRequired: false },
     },
     async (context, request, response) => {
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/delete.ts b/x-pack/plugins/security/server/routes/authorization/roles/delete.ts
index de966d6f2a758..eb56143288747 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/delete.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/delete.ts
@@ -13,7 +13,9 @@ export function defineDeleteRolesRoutes({ router, clusterClient }: RouteDefiniti
   router.delete(
     {
       path: '/api/security/role/{name}',
-      validate: { params: schema.object({ name: schema.string({ minLength: 1 }) }) },
+      validate: {
+        params: schema.object({ name: schema.string({ minLength: 1 }) }),
+      },
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/get.ts b/x-pack/plugins/security/server/routes/authorization/roles/get.ts
index 8c158bee1a15e..bf1140e2e6fd1 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/get.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/get.ts
@@ -14,7 +14,9 @@ export function defineGetRolesRoutes({ router, authz, clusterClient }: RouteDefi
   router.get(
     {
       path: '/api/security/role/{name}',
-      validate: { params: schema.object({ name: schema.string({ minLength: 1 }) }) },
+      validate: {
+        params: schema.object({ name: schema.string({ minLength: 1 }) }),
+      },
     },
     createLicensedRouteHandler(async (context, request, response) => {
       try {
diff --git a/x-pack/plugins/security/server/routes/licensed_route_handler.ts b/x-pack/plugins/security/server/routes/licensed_route_handler.ts
index 1194e3d0a83cc..bc5a6a1139215 100644
--- a/x-pack/plugins/security/server/routes/licensed_route_handler.ts
+++ b/x-pack/plugins/security/server/routes/licensed_route_handler.ts
@@ -4,17 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RequestHandler } from 'src/core/server';
-import { ObjectType } from '@kbn/config-schema';
+import { RequestHandler } from 'kibana/server';
 import { LICENSE_CHECK_STATE } from '../../../licensing/server';
 
-export const createLicensedRouteHandler = <
-  P extends ObjectType<any>,
-  Q extends ObjectType<any>,
-  B extends ObjectType<any>
->(
-  handler: RequestHandler<P, Q, B>
-) => {
+export const createLicensedRouteHandler = <P, Q, B>(handler: RequestHandler<P, Q, B>) => {
   const licensedRouteHandler: RequestHandler<P, Q, B> = (context, request, responseToolkit) => {
     const { license } = context.licensing;
     const licenseCheck = license.check('security', 'basic');
diff --git a/x-pack/plugins/security/server/saved_objects/index.ts b/x-pack/plugins/security/server/saved_objects/index.ts
index 2bd7440d3ee70..556dc4fda85cf 100644
--- a/x-pack/plugins/security/server/saved_objects/index.ts
+++ b/x-pack/plugins/security/server/saved_objects/index.ts
@@ -4,60 +4,47 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IClusterClient, KibanaRequest, LegacyRequest } from '../../../../../src/core/server';
+import {
+  CoreSetup,
+  KibanaRequest,
+  LegacyRequest,
+  SavedObjectsClient,
+} from '../../../../../src/core/server';
 import { SecureSavedObjectsClientWrapper } from './secure_saved_objects_client_wrapper';
-import { LegacyAPI } from '../plugin';
 import { Authorization } from '../authorization';
 import { SecurityAuditLogger } from '../audit';
 
 interface SetupSavedObjectsParams {
-  adminClusterClient: IClusterClient;
   auditLogger: SecurityAuditLogger;
   authz: Pick<Authorization, 'mode' | 'actions' | 'checkSavedObjectsPrivilegesWithRequest'>;
-  legacyAPI: Pick<LegacyAPI, 'savedObjects'>;
+  savedObjects: CoreSetup['savedObjects'];
 }
 
-export function setupSavedObjects({
-  adminClusterClient,
-  auditLogger,
-  authz,
-  legacyAPI: { savedObjects },
-}: SetupSavedObjectsParams) {
+export function setupSavedObjects({ auditLogger, authz, savedObjects }: SetupSavedObjectsParams) {
   const getKibanaRequest = (request: KibanaRequest | LegacyRequest) =>
     request instanceof KibanaRequest ? request : KibanaRequest.from(request);
-  savedObjects.setScopedSavedObjectsClientFactory(({ request }) => {
-    const kibanaRequest = getKibanaRequest(request);
-    if (authz.mode.useRbacForRequest(kibanaRequest)) {
-      const internalRepository = savedObjects.getSavedObjectsRepository(
-        adminClusterClient.callAsInternalUser
-      );
-      return new savedObjects.SavedObjectsClient(internalRepository);
-    }
 
-    const callAsCurrentUserRepository = savedObjects.getSavedObjectsRepository(
-      adminClusterClient.asScoped(kibanaRequest).callAsCurrentUser
+  savedObjects.setClientFactory(({ request }) => {
+    const kibanaRequest = getKibanaRequest(request);
+    return new SavedObjectsClient(
+      authz.mode.useRbacForRequest(kibanaRequest)
+        ? savedObjects.createInternalRepository()
+        : savedObjects.createScopedRepository(kibanaRequest)
     );
-    return new savedObjects.SavedObjectsClient(callAsCurrentUserRepository);
   });
 
-  savedObjects.addScopedSavedObjectsClientWrapperFactory(
-    Number.MAX_SAFE_INTEGER - 1,
-    'security',
-    ({ client, request }) => {
-      const kibanaRequest = getKibanaRequest(request);
-      if (authz.mode.useRbacForRequest(kibanaRequest)) {
-        return new SecureSavedObjectsClientWrapper({
+  savedObjects.addClientWrapper(Number.MAX_SAFE_INTEGER - 1, 'security', ({ client, request }) => {
+    const kibanaRequest = getKibanaRequest(request);
+    return authz.mode.useRbacForRequest(kibanaRequest)
+      ? new SecureSavedObjectsClientWrapper({
           actions: authz.actions,
           auditLogger,
           baseClient: client,
           checkSavedObjectsPrivilegesAsCurrentUser: authz.checkSavedObjectsPrivilegesWithRequest(
             kibanaRequest
           ),
-          errors: savedObjects.SavedObjectsClient.errors,
-        });
-      }
-
-      return client;
-    }
-  );
+          errors: SavedObjectsClient.errors,
+        })
+      : client;
+  });
 }
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
index f01a28847bbdf..c9ac114f3808a 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
@@ -176,6 +176,7 @@ describe('copySavedObjectsToSpaces', () => {
               "_maxListeners": undefined,
               "_read": [Function],
               "_readableState": ReadableState {
+                "autoDestroy": false,
                 "awaitDrain": 0,
                 "buffer": BufferList {
                   "head": null,
@@ -228,6 +229,7 @@ describe('copySavedObjectsToSpaces', () => {
               "_maxListeners": undefined,
               "_read": [Function],
               "_readableState": ReadableState {
+                "autoDestroy": false,
                 "awaitDrain": 0,
                 "buffer": BufferList {
                   "head": null,
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
index 97b7480ea4af8..a1db5032ba73b 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
@@ -195,6 +195,7 @@ describe('resolveCopySavedObjectsToSpacesConflicts', () => {
               "_maxListeners": undefined,
               "_read": [Function],
               "_readableState": ReadableState {
+                "autoDestroy": false,
                 "awaitDrain": 0,
                 "buffer": BufferList {
                   "head": null,
@@ -254,6 +255,7 @@ describe('resolveCopySavedObjectsToSpacesConflicts', () => {
               "_maxListeners": undefined,
               "_read": [Function],
               "_readableState": ReadableState {
+                "autoDestroy": false,
                 "awaitDrain": 0,
                 "buffer": BufferList {
                   "head": null,
diff --git a/x-pack/plugins/spaces/server/lib/create_default_space.ts b/x-pack/plugins/spaces/server/lib/create_default_space.ts
index 2301fa26dab28..0d1a4ddab91bb 100644
--- a/x-pack/plugins/spaces/server/lib/create_default_space.ts
+++ b/x-pack/plugins/spaces/server/lib/create_default_space.ts
@@ -9,7 +9,7 @@ import { SavedObjectsLegacyService, IClusterClient } from 'src/core/server';
 import { DEFAULT_SPACE_ID } from '../../common/constants';
 
 interface Deps {
-  esClient: Pick<IClusterClient, 'callAsInternalUser'>;
+  esClient: IClusterClient;
   savedObjects: SavedObjectsLegacyService;
 }
 
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
index 2b0cfd3687a24..c1f557f164ad6 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
@@ -168,7 +168,7 @@ describe('onPostAuthInterceptor', () => {
 
     const spacesService = await service.setup({
       http: (http as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts
index 9e1bb5cf9f7d6..a3396e98c3512 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts
+++ b/x-pack/plugins/spaces/server/lib/spaces_tutorial_context_factory.test.ts
@@ -50,7 +50,7 @@ describe('createSpacesTutorialContextFactory', () => {
   it('should create context with the current space id for the default space', async () => {
     const spacesService = await service.setup({
       http: coreMock.createSetup().http,
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/plugin.ts b/x-pack/plugins/spaces/server/plugin.ts
index dc4bc839c0e29..6b7699100032d 100644
--- a/x-pack/plugins/spaces/server/plugin.ts
+++ b/x-pack/plugins/spaces/server/plugin.ts
@@ -5,7 +5,6 @@
  */
 
 import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { HomeServerPluginSetup } from 'src/plugins/home/server';
 import {
@@ -168,9 +167,8 @@ export class Plugin {
           );
         },
         createDefaultSpace: async () => {
-          const esClient = await core.elasticsearch.adminClient$.pipe(take(1)).toPromise();
-          return createDefaultSpace({
-            esClient,
+          return await createDefaultSpace({
+            esClient: core.elasticsearch.adminClient,
             savedObjects: this.getLegacyAPI().savedObjects,
           });
         },
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 4f78828b14dc2..74197e6ca7556 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
@@ -11,7 +11,7 @@ import {
   mockRouteContext,
   mockRouteContextWithInvalidLicense,
 } from '../__fixtures__';
-import { CoreSetup, IRouter, kibanaResponseFactory } from 'src/core/server';
+import { CoreSetup, IRouter, kibanaResponseFactory, RouteValidatorConfig } from 'src/core/server';
 import {
   loggingServiceMock,
   elasticsearchServiceMock,
@@ -22,10 +22,9 @@ import { SpacesService } from '../../../spaces_service';
 import { SpacesAuditLogger } from '../../../lib/audit_logger';
 import { SpacesClient } from '../../../lib/spaces_client';
 import { initCopyToSpacesApi } from './copy_to_space';
-import { ObjectType } from '@kbn/config-schema';
-import { RouteSchemas } from 'src/core/server/http/router/route';
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { securityMock } from '../../../../../security/server/mocks';
+import { ObjectType } from '@kbn/config-schema';
 
 describe('copy to space', () => {
   const spacesSavedObjects = createSpaces();
@@ -44,7 +43,7 @@ describe('copy to space', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
@@ -78,19 +77,11 @@ describe('copy to space', () => {
 
     return {
       copyToSpace: {
-        routeValidation: ctsRouteDefinition.validate as RouteSchemas<
-          ObjectType,
-          ObjectType,
-          ObjectType
-        >,
+        routeValidation: ctsRouteDefinition.validate as RouteValidatorConfig<{}, {}, {}>,
         routeHandler: ctsRouteHandler,
       },
       resolveConflicts: {
-        routeValidation: resolveRouteDefinition.validate as RouteSchemas<
-          ObjectType,
-          ObjectType,
-          ObjectType
-        >,
+        routeValidation: resolveRouteDefinition.validate as RouteValidatorConfig<{}, {}, {}>,
         routeHandler: resolveRouteHandler,
       },
       savedObjectsRepositoryMock,
@@ -150,7 +141,7 @@ describe('copy to space', () => {
       const { copyToSpace } = await setup();
 
       expect(() =>
-        copyToSpace.routeValidation.body!.validate(payload)
+        (copyToSpace.routeValidation.body as ObjectType).validate(payload)
       ).toThrowErrorMatchingInlineSnapshot(`"[spaces]: duplicate space ids are not allowed"`);
     });
 
@@ -163,7 +154,7 @@ describe('copy to space', () => {
       const { copyToSpace } = await setup();
 
       expect(() =>
-        copyToSpace.routeValidation.body!.validate(payload)
+        (copyToSpace.routeValidation.body as ObjectType).validate(payload)
       ).toThrowErrorMatchingInlineSnapshot(
         `"[spaces.1]: lower case, a-z, 0-9, \\"_\\", and \\"-\\" are allowed"`
       );
@@ -181,7 +172,7 @@ describe('copy to space', () => {
       const { copyToSpace } = await setup();
 
       expect(() =>
-        copyToSpace.routeValidation.body!.validate(payload)
+        (copyToSpace.routeValidation.body as ObjectType).validate(payload)
       ).toThrowErrorMatchingInlineSnapshot(`"[objects]: duplicate objects are not allowed"`);
     });
 
@@ -322,7 +313,7 @@ describe('copy to space', () => {
       const { resolveConflicts } = await setup();
 
       expect(() =>
-        resolveConflicts.routeValidation.body!.validate(payload)
+        (resolveConflicts.routeValidation.body as ObjectType).validate(payload)
       ).toThrowErrorMatchingInlineSnapshot(`"[objects]: duplicate objects are not allowed"`);
     });
 
@@ -343,7 +334,7 @@ describe('copy to space', () => {
       const { resolveConflicts } = await setup();
 
       expect(() =>
-        resolveConflicts.routeValidation.body!.validate(payload)
+        (resolveConflicts.routeValidation.body as ObjectType).validate(payload)
       ).toThrowErrorMatchingInlineSnapshot(
         `"[retries.key(\\"invalid-space-id!@#$%^&*()\\")]: Invalid space id: invalid-space-id!@#$%^&*()"`
       );
diff --git a/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts b/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
index 86da3023c515e..35f18cf66a57e 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/delete.test.ts
@@ -12,7 +12,7 @@ import {
   mockRouteContext,
   mockRouteContextWithInvalidLicense,
 } from '../__fixtures__';
-import { CoreSetup, IRouter, kibanaResponseFactory } from 'src/core/server';
+import { CoreSetup, IRouter, kibanaResponseFactory, RouteValidatorConfig } from 'src/core/server';
 import {
   loggingServiceMock,
   elasticsearchServiceMock,
@@ -23,10 +23,9 @@ import { SpacesService } from '../../../spaces_service';
 import { SpacesAuditLogger } from '../../../lib/audit_logger';
 import { SpacesClient } from '../../../lib/spaces_client';
 import { initDeleteSpacesApi } from './delete';
-import { RouteSchemas } from 'src/core/server/http/router/route';
-import { ObjectType } from '@kbn/config-schema';
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { securityMock } from '../../../../../security/server/mocks';
+import { ObjectType } from '@kbn/config-schema';
 
 describe('Spaces Public API', () => {
   const spacesSavedObjects = createSpaces();
@@ -45,7 +44,7 @@ describe('Spaces Public API', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
@@ -75,14 +74,16 @@ describe('Spaces Public API', () => {
     const [routeDefinition, routeHandler] = router.delete.mock.calls[0];
 
     return {
-      routeValidation: routeDefinition.validate as RouteSchemas<ObjectType, ObjectType, ObjectType>,
+      routeValidation: routeDefinition.validate as RouteValidatorConfig<{}, {}, {}>,
       routeHandler,
     };
   };
 
   it('requires a space id as part of the path', async () => {
     const { routeValidation } = await setup();
-    expect(() => routeValidation.params!.validate({})).toThrowErrorMatchingInlineSnapshot(
+    expect(() =>
+      (routeValidation.params as ObjectType).validate({})
+    ).toThrowErrorMatchingInlineSnapshot(
       `"[id]: expected value of type [string] but got [undefined]"`
     );
   });
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get.test.ts
index f9bd4494791f1..3300e30825283 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get.test.ts
@@ -42,7 +42,7 @@ describe('GET space', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
index 02219db88a04c..ca89731f35946 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
@@ -42,7 +42,7 @@ describe('GET /spaces/space', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/routes/api/external/post.test.ts b/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
index 398b2e37191b6..26ecbf2247e0f 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
@@ -11,7 +11,7 @@ import {
   mockRouteContext,
   mockRouteContextWithInvalidLicense,
 } from '../__fixtures__';
-import { CoreSetup, kibanaResponseFactory, IRouter } from 'src/core/server';
+import { CoreSetup, kibanaResponseFactory, IRouter, RouteValidatorConfig } from 'src/core/server';
 import {
   loggingServiceMock,
   elasticsearchServiceMock,
@@ -22,10 +22,9 @@ import { SpacesService } from '../../../spaces_service';
 import { SpacesAuditLogger } from '../../../lib/audit_logger';
 import { SpacesClient } from '../../../lib/spaces_client';
 import { initPostSpacesApi } from './post';
-import { RouteSchemas } from 'src/core/server/http/router/route';
-import { ObjectType } from '@kbn/config-schema';
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { securityMock } from '../../../../../security/server/mocks';
+import { ObjectType } from '@kbn/config-schema';
 
 describe('Spaces Public API', () => {
   const spacesSavedObjects = createSpaces();
@@ -44,7 +43,7 @@ describe('Spaces Public API', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
@@ -74,7 +73,7 @@ describe('Spaces Public API', () => {
     const [routeDefinition, routeHandler] = router.post.mock.calls[0];
 
     return {
-      routeValidation: routeDefinition.validate as RouteSchemas<ObjectType, ObjectType, ObjectType>,
+      routeValidation: routeDefinition.validate as RouteValidatorConfig<{}, {}, {}>,
       routeHandler,
       savedObjectsRepositoryMock,
     };
@@ -159,7 +158,7 @@ describe('Spaces Public API', () => {
     const { routeValidation, routeHandler, savedObjectsRepositoryMock } = await setup();
 
     const request = httpServerMock.createKibanaRequest({
-      body: routeValidation.body!.validate(payload),
+      body: (routeValidation.body as ObjectType).validate(payload),
       method: 'post',
     });
 
diff --git a/x-pack/plugins/spaces/server/routes/api/external/put.test.ts b/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
index 5c213b7f73f62..e6182e027b854 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
@@ -12,7 +12,7 @@ import {
   mockRouteContext,
   mockRouteContextWithInvalidLicense,
 } from '../__fixtures__';
-import { CoreSetup, IRouter, kibanaResponseFactory } from 'src/core/server';
+import { CoreSetup, IRouter, kibanaResponseFactory, RouteValidatorConfig } from 'src/core/server';
 import {
   loggingServiceMock,
   elasticsearchServiceMock,
@@ -23,10 +23,9 @@ import { SpacesService } from '../../../spaces_service';
 import { SpacesAuditLogger } from '../../../lib/audit_logger';
 import { SpacesClient } from '../../../lib/spaces_client';
 import { initPutSpacesApi } from './put';
-import { RouteSchemas } from 'src/core/server/http/router/route';
-import { ObjectType } from '@kbn/config-schema';
 import { spacesConfig } from '../../../lib/__fixtures__';
 import { securityMock } from '../../../../../security/server/mocks';
+import { ObjectType } from '@kbn/config-schema';
 
 describe('PUT /api/spaces/space', () => {
   const spacesSavedObjects = createSpaces();
@@ -45,7 +44,7 @@ describe('PUT /api/spaces/space', () => {
     const service = new SpacesService(log, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: securityMock.createSetup().authz,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
@@ -75,7 +74,7 @@ describe('PUT /api/spaces/space', () => {
     const [routeDefinition, routeHandler] = router.put.mock.calls[0];
 
     return {
-      routeValidation: routeDefinition.validate as RouteSchemas<ObjectType, ObjectType, ObjectType>,
+      routeValidation: routeDefinition.validate as RouteValidatorConfig<{}, {}, {}>,
       routeHandler,
       savedObjectsRepositoryMock,
     };
@@ -156,7 +155,7 @@ describe('PUT /api/spaces/space', () => {
       params: {
         id: payload.id,
       },
-      body: routeValidation.body!.validate(payload),
+      body: (routeValidation.body as ObjectType).validate(payload),
       method: 'post',
     });
 
diff --git a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts
index 8f97df2aa0a50..461f816ff5019 100644
--- a/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/internal/get_active_space.test.ts
@@ -22,7 +22,7 @@ describe('GET /internal/spaces/_active_space', () => {
     const service = new SpacesService(null as any, () => legacyAPI);
     const spacesService = await service.setup({
       http: (httpService as unknown) as CoreSetup['http'],
-      elasticsearch: elasticsearchServiceMock.createSetupContract(),
+      elasticsearch: elasticsearchServiceMock.createSetup(),
       authorization: null,
       getSpacesAuditLogger: () => ({} as SpacesAuditLogger),
       config$: Rx.of(spacesConfig),
diff --git a/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts b/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts
index 3838b1d134ea2..13bed5ce58e2b 100644
--- a/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts
+++ b/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts
@@ -4,17 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RequestHandler } from 'src/core/server';
-import { ObjectType } from '@kbn/config-schema';
+import { RequestHandler } from 'kibana/server';
 import { LICENSE_CHECK_STATE } from '../../../../licensing/server';
 
-export const createLicensedRouteHandler = <
-  P extends ObjectType<any>,
-  Q extends ObjectType<any>,
-  B extends ObjectType<any>
->(
-  handler: RequestHandler<P, Q, B>
-) => {
+export const createLicensedRouteHandler = <P, Q, B>(handler: RequestHandler<P, Q, B>) => {
   const licensedRouteHandler: RequestHandler<P, Q, B> = (context, request, responseToolkit) => {
     const { license } = context.licensing;
     const licenseCheck = license.check('spaces', 'basic');
diff --git a/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts b/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts
index 30ad3f399916b..68d096e046ed4 100644
--- a/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts
+++ b/x-pack/plugins/spaces/server/spaces_service/spaces_service.test.ts
@@ -74,7 +74,7 @@ const createService = async (serverBasePath: string = '') => {
 
   const spacesServiceSetup = await spacesService.setup({
     http: httpSetup,
-    elasticsearch: elasticsearchServiceMock.createSetupContract(),
+    elasticsearch: elasticsearchServiceMock.createSetup(),
     config$: Rx.of(spacesConfig),
     authorization: securityMock.createSetup().authz,
     getSpacesAuditLogger: () => new SpacesAuditLogger({}),
diff --git a/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts b/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts
index b8d0f910a42ea..f8ed58fa57551 100644
--- a/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts
+++ b/x-pack/plugins/spaces/server/spaces_service/spaces_service.ts
@@ -5,7 +5,7 @@
  */
 
 import { map, take } from 'rxjs/operators';
-import { Observable, Subscription, combineLatest } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { Legacy } from 'kibana';
 import { Logger, KibanaRequest, CoreSetup } from '../../../../../src/core/server';
 import { PluginSetupContract as SecurityPluginSetup } from '../../../security/server';
@@ -69,15 +69,15 @@ export class SpacesService {
     };
 
     const getScopedClient = async (request: KibanaRequest) => {
-      return combineLatest(elasticsearch.adminClient$, config$)
+      return config$
         .pipe(
-          map(([clusterClient, config]) => {
+          map(config => {
             const internalRepository = this.getLegacyAPI().savedObjects.getSavedObjectsRepository(
-              clusterClient.callAsInternalUser,
+              elasticsearch.adminClient.callAsInternalUser,
               ['space']
             );
 
-            const callCluster = clusterClient.asScoped(request).callAsCurrentUser;
+            const callCluster = elasticsearch.adminClient.asScoped(request).callAsCurrentUser;
 
             const callWithRequestRepository = this.getLegacyAPI().savedObjects.getSavedObjectsRepository(
               callCluster,
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index fce656dd42e8a..09d71814e5bf0 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -261,24 +261,6 @@
     "common.ui.aggTypes.timeInterval.scaledHelpText": "現在 {bucketDescription} にスケーリングされています",
     "common.ui.aggTypes.timeInterval.selectIntervalPlaceholder": "間隔を選択",
     "common.ui.aggTypes.timeInterval.selectOptionHelpText": "オプションを選択するかカスタム値を作成します。例30s、20m、24h、2d、1w、1M",
-    "common.ui.courier.fetch.requestTimedOutNotificationMessage": "リクエストがタイムアウトしたため、データが不完全な可能性があります",
-    "common.ui.courier.fetch.shardsFailedNotificationMessage": "{shardsTotal} 件中 {shardsFailed} 件のシャードでエラーが発生しました",
-    "common.ui.courier.hitsDescription": "クエリにより返されたドキュメントの数です。",
-    "common.ui.courier.hitsLabel": "ヒット数",
-    "common.ui.courier.hitsTotalDescription": "クエリに一致するドキュメントの数です。",
-    "common.ui.courier.hitsTotalLabel": "ヒット数 (合計)",
-    "common.ui.courier.indexPatternDescription": "Elasticsearch インデックスに接続したインデックスパターンです。",
-    "common.ui.courier.indexPatternIdDescription": "{kibanaIndexPattern} インデックス内の ID です。",
-    "common.ui.courier.indexPatternIdLabel": "インデックスパターン ID",
-    "common.ui.courier.indexPatternLabel": "インデックスパターン",
-    "common.ui.courier.noSearchStrategyRegisteredErrorMessageDescription": "検索リクエストの検索方法が見つかりませんでした",
-    "common.ui.courier.noSearchStrategyRegisteredErrorMessageTitle": "検索方法が登録されていません",
-    "common.ui.courier.queryTimeDescription": "クエリの処理の所要時間です。リクエストの送信やブラウザでのパースの時間は含まれません。",
-    "common.ui.courier.queryTimeLabel": "クエリ時間",
-    "common.ui.courier.queryTimeValue": "{queryTime}ms",
-    "common.ui.courier.requestTimeDescription": "ブラウザから Elasticsearch にリクエストが送信され返されるまでの所要時間です。リクエストがキューで待機していた時間は含まれません。",
-    "common.ui.courier.requestTimeLabel": "リクエスト時間",
-    "common.ui.courier.requestTimeValue": "{requestTime}ms",
     "common.ui.directives.fieldNameIcons.booleanAriaLabel": "ブールフィールド",
     "common.ui.directives.fieldNameIcons.conflictFieldAriaLabel": "矛盾フィールド",
     "common.ui.directives.fieldNameIcons.dateFieldAriaLabel": "日付フィールド",
@@ -458,11 +440,7 @@
     "common.ui.flotCharts.thuLabel": "木",
     "common.ui.flotCharts.tueLabel": "火",
     "common.ui.flotCharts.wedLabel": "水",
-    "common.ui.legacyBrowserMessage": "この Kibana インストレーションは、現在ご使用のブラウザが満たしていない厳格なセキュリティ要件が有効になっています。",
-    "common.ui.legacyBrowserTitle": "ブラウザをアップグレードしてください",
     "common.ui.management.breadcrumb": "管理",
-    "common.ui.management.connectDataDisplayName": "データに接続",
-    "common.ui.management.displayName": "管理",
     "common.ui.management.nav.menu": "管理メニュー",
     "common.ui.modals.cancelButtonLabel": "キャンセル",
     "common.ui.notify.fatalError.errorStatusMessage": "エラー {errStatus} {errStatusText}: {errMessage}",
@@ -472,14 +450,6 @@
     "common.ui.notify.toaster.unavailableServerErrorMessage": "HTTP リクエストが接続に失敗しました。Kibana サーバーが実行されていて、ご使用のブラウザの接続が正常に動作していることを確認するか、システム管理者にお問い合わせください。",
     "common.ui.paginateControls.pageSizeLabel": "ページサイズ",
     "common.ui.paginateControls.scrollTopButtonLabel": "最上部に移動",
-    "common.ui.savedObjectFinder.addNewItemButtonLabel": "新規 {item} を追加",
-    "common.ui.savedObjectFinder.manageItemsButtonLabel": "{items} の管理",
-    "common.ui.savedObjectFinder.noMatchesFoundDescription": "一致する {items} が見つかりません。",
-    "common.ui.savedObjectFinder.pageItemsFromHitCountDescription": "{hitCount} 件中 {pageFirstItem}-{pageLastItem} 件目",
-    "common.ui.savedObjectFinder.sortByButtonLabeAscendingScreenReaderOnly": "昇順",
-    "common.ui.savedObjectFinder.sortByButtonLabeDescendingScreenReaderOnly": "降順",
-    "common.ui.savedObjectFinder.sortByButtonLabel": "名前",
-    "common.ui.savedObjectFinder.sortByButtonLabelScreenReaderOnly": "並べ替え基準",
     "common.ui.savedObjects.confirmModal.overwriteButtonLabel": "上書き",
     "common.ui.savedObjects.confirmModal.overwriteConfirmationMessage": "{title} を上書きしてよろしいですか？",
     "common.ui.savedObjects.confirmModal.overwriteTitle": "{name} を上書きしますか？",
@@ -539,22 +509,6 @@
     "common.ui.vislib.colormaps.redsText": "赤",
     "common.ui.vislib.colormaps.yellowToRedText": "黄色から赤",
     "common.ui.visualize.queryGeohashBounds.unableToGetBoundErrorTitle": "バウンドを取得できませんでした",
-    "common.ui.welcomeErrorMessage": "Kibana が正常に読み込まれませんでした。詳細はサーバーアウトプットを確認してください。",
-    "common.ui.welcomeMessage": "Kibana を読み込み中",
-    "common.ui.courier.fetch.shardsFailedModal.close": "閉じる",
-    "common.ui.courier.fetch.shardsFailedModal.copyToClipboard": "応答をクリップボードにコピー",
-    "common.ui.courier.fetch.shardsFailedModal.failureHeader": "{failureName} で {failureDetails}",
-    "common.ui.courier.fetch.shardsFailedModal.showDetails": "詳細を表示",
-    "common.ui.courier.fetch.shardsFailedModal.tabHeaderRequest": "リクエスト",
-    "common.ui.courier.fetch.shardsFailedModal.tabHeaderResponse": "応答",
-    "common.ui.courier.fetch.shardsFailedModal.tabHeaderShardFailures": "シャードエラー",
-    "common.ui.courier.fetch.shardsFailedModal.tableColIndex": "インデックス",
-    "common.ui.courier.fetch.shardsFailedModal.tableColNode": "ノード",
-    "common.ui.courier.fetch.shardsFailedModal.tableColReason": "理由",
-    "common.ui.courier.fetch.shardsFailedModal.tableColShard": "シャード",
-    "common.ui.courier.fetch.shardsFailedModal.tableRowCollapse": "{rowDescription} を折りたたむ",
-    "common.ui.courier.fetch.shardsFailedModal.tableRowExpand": "{rowDescription} を展開する",
-    "common.ui.courier.fetch.shardsFailedNotificationDescription": "表示されているデータは不完全か誤りの可能性があります。",
     "common.ui.directives.fieldNameIcons.geoShapeFieldAriaLabel": "地理情報図形",
     "common.ui.vis.editors.agg.errorsAriaLabel": "集約にエラーがあります",
     "common.ui.vislib.heatmap.maxBucketsText": "定義された数列が多すぎます ({nr}).構成されている最高値は {max} です。",
@@ -563,2380 +517,19 @@
     "common.ui.aggTypes.scaleMetricsLabel": "メトリック値のスケーリング (廃止)",
     "common.ui.aggTypes.scaleMetricsTooltip": "これを有効にすると、手動最低間隔を選択し、広い間隔が使用された場合、カウントと合計メトリックが手動で選択された間隔にスケーリングされます。",
     "common.ui.aggTypes.buckets.ranges.rangesFormatMessage": "{gte} {from} と {lt} {to}",
+    "management.connectDataDisplayName": "データに接続",
+    "management.displayName": "管理",
     "management.editIndexPattern.createIndex.defaultButtonDescription": "すべてのデータに完全集約を実行",
     "management.editIndexPattern.createIndex.defaultButtonText": "標準インデックスパターン",
     "management.editIndexPattern.createIndex.defaultTypeName": "インデックスパターン",
-    "core.ui.overlays.banner.attentionTitle": "注意",
-    "core.ui.overlays.banner.closeButtonLabel": "閉じる",
-    "core.ui.chrome.headerGlobalNav.goHomePageIconAriaLabel": "ホームページに移動",
-    "core.ui.chrome.headerGlobalNav.helpMenuButtonAriaLabel": "ヘルプメニュー",
-    "core.ui.chrome.headerGlobalNav.helpMenuTitle": "ヘルプ",
-    "core.ui.chrome.headerGlobalNav.helpMenuVersion": "v {version}",
-    "core.ui.chrome.sideGlobalNav.viewRecentItemsFlyoutTitle": "最近のアイテム",
-    "core.ui.chrome.sideGlobalNav.viewRecentItemsLabel": "最近閲覧",
-    "core.ui.recentLinks.linkItem.screenReaderLabel": "{recentlyAccessedItemLinklabel}、タイプ: {pageType}",
-    "core.chrome.legacyBrowserWarning": "ご使用のブラウザが Kibana のセキュリティ要件を満たしていません。",
-    "core.euiBasicTable.selectAllRows": "すべての行を選択",
-    "core.euiBasicTable.selectThisRow": "この行を選択",
-    "core.euiBasicTable.tableDescription": "以下は {itemCount} 件のアイテムの表です。",
-    "core.euiBottomBar.screenReaderAnnouncement": "ドキュメントの最後にページレベルのコントロールと共に開く新しいメニューがあります。",
-    "core.euiCardSelect.select": "選択してください",
-    "core.euiCardSelect.selected": "利用不可",
-    "core.euiCardSelect.unavailable": "選択済み",
-    "core.euiCodeBlock.copyButton": "コピー",
-    "core.euiCodeEditor.startEditing": "編集を開始するには Enter キーを押してください。",
-    "core.euiCodeEditor.startInteracting": "コードの操作を開始するには Enter キーを押してください。",
-    "core.euiCodeEditor.stopEditing": "完了したら Esc キーで編集を終了します。",
-    "core.euiCodeEditor.stopInteracting": "完了したら Esc キーでコードの操作を終了します。",
-    "core.euiCollapsedItemActions.allActions": "すべてのアクション",
-    "core.euiColorPicker.screenReaderAnnouncement": "選択可能な色の範囲を表示するポップアップが開きました。選択可能な色を閲覧するには Tab を押し、Esc でこのポップアップを閉じます。",
-    "core.euiColorPicker.swatchAriaLabel": "{swatch} を色として選択します",
-    "core.euiComboBoxOptionsList.allOptionsSelected": "利用可能なオプションをすべて選択しました",
-    "core.euiComboBoxOptionsList.alreadyAdded": "{label} は既に追加されています",
-    "core.euiComboBoxOptionsList.createCustomOption": "{searchValue} をカスタムオプションとして追加するには、{key} を押してください。",
-    "core.euiComboBoxOptionsList.loadingOptions": "オプションを読み込み中",
-    "core.euiComboBoxOptionsList.noAvailableOptions": "利用可能なオプションがありません",
-    "core.euiComboBoxOptionsList.noMatchingOptions": "{searchValue} はどのオプションにも一致していません",
-    "core.euiComboBoxPill.removeSelection": "グループの選択項目から {children} を削除してください",
-    "core.euiFilterButton.filterBadge": "${count} ${filterCountLabel} 個のフィルター",
-    "core.euiForm.addressFormErrors": "フォームのエラーを解決してください。",
-    "core.euiFormControlLayoutClearButton.label": "インプットを消去",
-    "core.euiHeaderAlert.dismiss": "閉じる",
-    "core.euiHeaderLinks.appNavigation": "アプリのナビゲーション",
-    "core.euiHeaderLinks.openNavigationMenu": "ナビゲーションメニューを開く",
-    "core.euiHue.label": "HSV カラーモードの「true」値を選択",
-    "core.euiModal.closeModal": "このモーダルウィンドウを閉じます",
-    "core.euiPagination.jumpToLastPage": "最後のページ {pageCount} に移動します",
-    "core.euiPagination.nextPage": "次のページ",
-    "core.euiPagination.pageOfTotal": "{total} ページ中 {page} ページ目",
-    "core.euiPagination.previousPage": "前のページ",
-    "core.euiPopover.screenReaderAnnouncement": "これはポップアップウィンドウです。このポップアップを閉じるには、Esc キーを押してください。",
-    "core.euiSaturation.roleDescription": "HSV カラーモード彩度と値の選択",
-    "core.euiSaturation.screenReaderAnnouncement": "矢印キーで四角いカラーグラデーションを操作します。キーを押すごとに移動する座標が 0 から 1 の範囲で HSV カラーモードの「彩度」と「値」の数字に使用されます。左で「彩度」の値を下げ、右で上げます。上で「値」の値を上げ、下で下げます。",
-    "core.euiSelectable.loadingOptions": "オプションを読み込み中",
-    "core.euiSelectable.noAvailableOptions": "利用可能なオプションがありません",
-    "core.euiSelectable.noMatchingOptions": "{searchValue} はどのオプションにも一致していません",
-    "core.euiStat.loadingText": "統計を読み込み中です",
-    "core.euiStepHorizontal.buttonTitle": "ステップ {step}: {title}{titleAppendix, select, completed { が完了} 無効 { が無効} other {}}",
-    "core.euiStepHorizontal.step": "手順",
-    "core.euiStepNumber.hasErrors": "エラーがあります",
-    "core.euiStepNumber.hasWarnings": "警告があります",
-    "core.euiStepNumber.isComplete": "完了",
-    "core.euiSuperSelect.screenReaderAnnouncement": "{optionsCount} 件のアイテムのフォームセレクターを使用中で、1 つのオプションを選択する必要があります。上下の矢印キーで移動するか、Esc キーで閉じます。",
-    "core.euiSuperSelectControl.selectAnOption": "オプションの選択: {selectedValue} を選択済み",
-    "core.euiTablePagination.rowsPerPage": "ページごとの行数",
-    "core.euiTablePagination.rowsPerPageOption": "{rowsPerPage} 行",
-    "core.euiTableSortMobile.sorting": "並べ替え",
-    "core.euiToast.dismissToast": "トーストを閉じる",
-    "core.euiToast.newNotification": "新しい通知が表示されます",
-    "core.euiToast.notification": "通知",
-    "core.fatalErrors.clearYourSessionButtonLabel": "セッションを消去",
-    "core.fatalErrors.goBackButtonLabel": "戻る",
-    "core.fatalErrors.somethingWentWrongTitle": "何か問題が発生",
-    "core.fatalErrors.tryRefreshingPageDescription": "ページを更新してみてください。うまくいかない場合は、前のページに戻るか、セッションデータを消去してください。",
-    "core.notifications.errorToast.closeModal": "閉じる",
-    "core.notifications.unableUpdateUISettingNotificationMessageTitle": "UI 設定を更新できません",
-    "core.toasts.errorToast.seeFullError": "完全なエラーを表示",
-    "core.euiSuperDatePicker.showDatesButtonLabel": "日付を表示",
-    "core.euiSuperUpdateButton.cannotUpdateTooltip": "アップデートできません",
-    "core.euiSuperUpdateButton.clickToApplyTooltip": "クリックして適用",
-    "core.euiSuperUpdateButton.refreshButtonLabel": "更新",
-    "core.euiSuperUpdateButton.updateButtonLabel": "更新",
-    "core.euiSuperUpdateButton.updatingButtonLabel": "更新中",
-    "core.application.appNotFound.pageDescription": "この URL にアプリケーションが見つかりませんでした。前の画面に戻るか、メニューからアプリを選択してみてください。",
-    "core.application.appNotFound.title": "アプリケーションが見つかりません",
-    "kibana-react.tableListView.listing.deleteButtonMessage": "{itemCount} 件の {entityName} を削除",
-    "kibana-react.tableListView.listing.deleteConfirmModalDescription": "削除された {entityNamePlural} は復元できません。",
-    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.cancelButtonLabel": "キャンセル",
-    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.confirmButtonLabel": "削除",
-    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.confirmButtonLabelDeleting": "削除中",
-    "kibana-react.tableListView.listing.listingLimitExceeded.advancedSettingsLinkText": "高度な設定",
-    "kibana-react.tableListView.listing.listingLimitExceededDescription": "{totalItems} 件の {entityNamePlural} がありますが、{listingLimitText} の設定により {listingLimitValue} 件までしか下の表に表示できません。この設定は {advancedSettingsLink} で変更できます。",
-    "kibana-react.tableListView.listing.listingLimitExceededTitle": "リスティング制限超過",
-    "kibana-react.tableListView.listing.noAvailableItemsMessage": "利用可能な {entityNamePlural} がありません。",
-    "kibana-react.tableListView.listing.noMatchedItemsMessage": "検索条件に一致する {entityNamePlural} がありません。",
-    "kibana-react.tableListView.listing.table.actionTitle": "アクション",
-    "kibana-react.tableListView.listing.table.editActionDescription": "編集",
-    "kibana-react.tableListView.listing.table.editActionName": "編集",
-    "kibana-react.tableListView.listing.unableToDeleteDangerMessage": "{entityName} を削除できません",
-    "kibana-react.exitFullScreenButton.exitFullScreenModeButtonAriaLabel": "全画面モードを終了",
-    "kibana-react.exitFullScreenButton.exitFullScreenModeButtonLabel": "全画面を終了",
-    "kibana-react.exitFullScreenButton.fullScreenModeDescription": "ESC キーで全画面モードを終了します。",
-    "kibana-react.savedObjects.finder.filterButtonLabel": "タイプ",
-    "kibana-react.savedObjects.finder.searchPlaceholder": "検索...",
-    "kibana-react.savedObjects.finder.sortAsc": "昇順",
-    "kibana-react.savedObjects.finder.sortAuto": "ベストマッチ",
-    "kibana-react.savedObjects.finder.sortButtonLabel": "並べ替え",
-    "kibana-react.savedObjects.finder.sortDesc": "降順",
-    "kibana-react.savedObjects.saveModal.cancelButtonLabel": "キャンセル",
-    "kibana-react.savedObjects.saveModal.descriptionLabel": "説明",
-    "kibana-react.savedObjects.saveModal.duplicateTitleDescription": "{confirmSaveLabel} をクリックすると、既存の {objectType} が上書きされます。",
-    "kibana-react.savedObjects.saveModal.duplicateTitleLabel": "「{title}」というタイトルの {objectType} が既に存在します",
-    "kibana-react.savedObjects.saveModal.saveAsNewLabel": "新規 {objectType} として保存",
-    "kibana-react.savedObjects.saveModal.saveButtonLabel": "保存",
-    "kibana-react.savedObjects.saveModal.saveTitle": "{objectType} を保存",
-    "kibana-react.savedObjects.saveModal.titleLabel": "タイトル",
-    "kibana_utils.stateManagement.url.unableToRestoreUrlErrorMessage": "URL を完全に復元できません。共有機能を使用していることを確認してください。",
-    "kibana_utils.stateManagement.url.unableToStoreHistoryInSessionErrorMessage": "セッションがいっぱいで安全に削除できるアイテムが見つからないため、Kibana は履歴アイテムを保存できません。\n\nこれは大抵新規タブに移動することで解決されますが、より大きな問題が原因である可能性もあります。このメッセージが定期的に表示される場合は、{gitHubIssuesUrl} で問題を報告してください。",
-    "inspector.closeButton": "インスペクターを閉じる",
-    "inspector.reqTimestampDescription": "リクエストの開始が記録された時刻です",
-    "inspector.reqTimestampKey": "リクエストのタイムスタンプ",
-    "inspector.title": "インスペクター",
-    "inspector.view": "{viewName} を表示",
-    "inspector.data.dataDescriptionTooltip": "ビジュアライゼーションの元のデータを表示",
-    "inspector.data.dataTitle": "データ",
-    "inspector.data.downloadCSVButtonLabel": "CSV をダウンロード",
-    "inspector.data.downloadCSVToggleButtonLabel": "CSV をダウンロード",
-    "inspector.data.filterForValueButtonAriaLabel": "値でフィルタリング",
-    "inspector.data.filterForValueButtonTooltip": "値でフィルタリング",
-    "inspector.data.filterOutValueButtonAriaLabel": "値を除外",
-    "inspector.data.filterOutValueButtonTooltip": "値を除外",
-    "inspector.data.formattedCSVButtonLabel": "フォーマット済み CSV",
-    "inspector.data.formattedCSVButtonTooltip": "データを表形式でダウンロード",
-    "inspector.data.gatheringDataLabel": "データを収集中",
-    "inspector.data.noDataAvailableDescription": "エレメントがデータを提供しませんでした。",
-    "inspector.data.noDataAvailableTitle": "利用可能なデータがありません",
-    "inspector.data.rawCSVButtonLabel": "CSV",
-    "inspector.data.rawCSVButtonTooltip": "日付をタイムスタンプとしてなど、提供されたデータをそのままダウンロードします",
-    "inspector.requests.descriptionRowIconAriaLabel": "説明",
-    "inspector.requests.failedLabel": " (失敗)",
-    "inspector.requests.noRequestsLoggedDescription.elementHasNotLoggedAnyRequestsText": "エレメントが (まだ) リクエストを記録していません。",
-    "inspector.requests.noRequestsLoggedDescription.whatDoesItUsuallyMeanText": "これは通常、データを取得する必要がないか、エレメントがまだデータの取得を開始していないことを意味します。",
-    "inspector.requests.noRequestsLoggedTitle": "リクエストが記録されていません",
-    "inspector.requests.requestFailedTooltipTitle": "リクエストに失敗しました",
-    "inspector.requests.requestInProgressAriaLabel": "リクエスト進行中",
-    "inspector.requests.requestLabel": "リクエスト",
-    "inspector.requests.requestsDescriptionTooltip": "データを収集したリクエストを表示します",
-    "inspector.requests.requestsTitle": "リクエスト",
-    "inspector.requests.requestSucceededTooltipTitle": "リクエスト成功",
-    "inspector.requests.requestTabLabel": "リクエスト",
-    "inspector.requests.requestTimeLabel": "{requestTime}ms",
-    "inspector.requests.requestTooltipDescription": "リクエストの合計所要時間です。",
-    "inspector.requests.requestWasMadeDescription": "{requestsCount, plural, one {# リクエストが} other {# リクエストが} } 行われました{failedRequests}",
-    "inspector.requests.requestWasMadeDescription.requestHadFailureText": "、{failedCount} 件に失敗がありました",
-    "inspector.requests.responseTabLabel": "応答",
-    "inspector.requests.statisticsTabLabel": "統計",
-    "console.autocomplete.addMethodMetaText": "メソド",
-    "console.consoleDisplayName": "コンソール",
-    "console.devToolsDescription": "cURL をスキップしこの JSON インスタンスを使って、データに直接アクセスします。",
-    "console.devToolsTitle": "コンソール",
-    "console.helpPage.keyboardCommands.autoIndentDescription": "現在のリクエストを自動インデントします",
-    "console.helpPage.keyboardCommands.closeAutoCompleteMenuDescription": "自動入力メニューを閉じます",
-    "console.helpPage.keyboardCommands.collapseAllScopesDescription": "現在のスコープを除きすべてのスコープを最小表示します。シフトを追加して拡張します。",
-    "console.helpPage.keyboardCommands.collapseExpandCurrentScopeDescription": "現在のスコープを最小/拡張表示します。",
-    "console.helpPage.keyboardCommands.jumpToPreviousNextRequestDescription": "前/次のリクエストの開始または終了に移動します。",
-    "console.helpPage.keyboardCommands.openAutoCompleteDescription": "自動入力を開きます (未入力時を含む)",
-    "console.helpPage.keyboardCommands.openDocumentationDescription": "現在のリクエストのドキュメントを開きます",
-    "console.helpPage.keyboardCommands.selectCurrentlySelectedInAutoCompleteMenuDescription": "現在の選択項目または自動入力メニューで最も使用されている用語を選択します",
-    "console.helpPage.keyboardCommands.submitRequestDescription": "リクエストを送信します",
-    "console.helpPage.keyboardCommands.switchFocusToAutoCompleteMenuDescription": "自動入力メニューに焦点を切り替えます。矢印でさらに用語を選択します",
-    "console.helpPage.keyboardCommandsTitle": "キーボードコマンド",
-    "console.helpPage.pageTitle": "ヘルプ",
-    "console.helpPage.requestFormatDescription": "ホワイトエディターに 1 つまたは複数のリクエストを入力できます。コンソールはコンパクトなフォーマットのリクエストを理解できます。",
-    "console.helpPage.requestFormatTitle": "リクエストフォーマット",
-    "console.historyPage.applyHistoryButtonLabel": "適用",
-    "console.historyPage.clearHistoryButtonLabel": "消去",
-    "console.historyPage.itemOfRequestListAriaLabel": "リクエスト: {historyItem}",
-    "console.historyPage.noHistoryTextMessage": "履歴がありません",
-    "console.historyPage.pageTitle": "履歴",
-    "console.historyPage.requestListAriaLabel": "リクエストの送信履歴",
-    "console.requestOptions.autoIndentButtonLabel": "自動インデント",
-    "console.requestOptions.copyAsUrlButtonLabel": "cURL としてコピー",
-    "console.requestOptions.openDocumentationButtonLabel": "ドキュメントを開く",
-    "console.requestOptionsButtonAriaLabel": "リクエストオプション",
-    "console.sendRequestButtonTooltip": "クリックしてリクエストを送信します",
-    "console.settingsPage.autocompleteLabel": "自動入力",
-    "console.settingsPage.cancelButtonLabel": "キャンセル",
-    "console.settingsPage.fieldsLabelText": "フィールド",
-    "console.settingsPage.fontSizeLabel": "フォントサイズ",
-    "console.settingsPage.indicesAndAliasesLabelText": "インデックスとエイリアス",
-    "console.settingsPage.pageTitle": "設定",
-    "console.settingsPage.saveButtonLabel": "保存",
-    "console.settingsPage.templatesLabelText": "テンプレート",
-    "console.settingsPage.wrapLongLinesLabelText": "長い行を改行",
-    "console.topNav.helpTabDescription": "ヘルプ",
-    "console.topNav.helpTabLabel": "ヘルプ",
-    "console.topNav.historyTabDescription": "履歴",
-    "console.topNav.historyTabLabel": "履歴",
-    "console.topNav.settingsTabDescription": "設定",
-    "console.topNav.settingsTabLabel": "設定",
-    "console.welcomePage.closeButtonLabel": "始めましょう",
-    "console.welcomePage.pageTitle": "コンソールへようこそ",
-    "console.welcomePage.quickIntroDescription": "コンソール UI は、エディターペイン (左) と応答ペイン (右) の 2 つのペインに分かれています。エディターでリクエストを入力し、Elasticsearch に送信します。結果が右側の応答ペインに表示されます。",
-    "console.welcomePage.quickIntroTitle": "UI の簡単な説明",
-    "console.welcomePage.quickTips.cUrlFormatForRequestsDescription": "cURL フォーマットのリクエストを張り付けると、Console 構文に変換されます。",
-    "console.welcomePage.quickTips.keyboardShortcutsDescription": "ヘルプボタンでキーボードショートカットが学べます。便利な情報が揃っています！",
-    "console.welcomePage.quickTips.resizeEditorDescription": "間の区切りをドラッグすることで、エディターとアウトプットペインのサイズを変更できます。",
-    "console.welcomePage.quickTips.submitRequestDescription": "緑の三角形のボタンをクリックして ES にリクエストを送信します。",
-    "console.welcomePage.quickTips.useWrenchMenuDescription": "レンチメニューで他の便利な機能が使えます。",
-    "console.welcomePage.quickTipsTitle": "今のうちにいくつか簡単なコツをお教えします",
-    "console.welcomePage.supportedRequestFormatTitle": "コンソールは cURL と同様に、コンパクトなフォーマットのリクエストを理解できます。",
-    "console.consoleMenu.copyAsCurlMessage": "リクエストが URL としてコピーされました",
-    "data.filter.applyFilters.popupHeader": "適用するフィルターの選択",
-    "data.filter.applyFiltersPopup.cancelButtonLabel": "キャンセル",
-    "data.filter.applyFiltersPopup.saveButtonLabel": "適用",
-    "data.filter.filterBar.addFilterButtonLabel": "フィルターを追加します",
-    "data.filter.filterBar.deleteFilterButtonLabel": "削除",
-    "data.filter.filterBar.disabledFilterPrefix": "無効",
-    "data.filter.filterBar.disableFilterButtonLabel": "一時的に無効にする",
-    "data.filter.filterBar.editFilterButtonLabel": "フィルターを編集",
-    "data.filter.filterBar.enableFilterButtonLabel": "再度有効にする",
-    "data.filter.filterBar.excludeFilterButtonLabel": "結果を除外",
-    "data.filter.filterBar.filterItemBadgeAriaLabel": "フィルターアクション",
-    "data.filter.filterBar.filterItemBadgeIconAriaLabel": "削除",
-    "data.filter.filterBar.includeFilterButtonLabel": "結果を含める",
-    "data.filter.filterBar.indexPatternSelectPlaceholder": "インデックスパターンの選択",
-    "data.filter.filterBar.negatedFilterPrefix": "NOT ",
-    "data.filter.filterBar.pinFilterButtonLabel": "すべてのアプリにピン付け",
-    "data.filter.filterBar.pinnedFilterPrefix": "ピン付け済み",
-    "data.filter.filterBar.unpinFilterButtonLabel": "ピンを外す",
-    "data.filter.filterEditor.cancelButtonLabel": "キャンセル",
-    "data.filter.filterEditor.createCustomLabelInputLabel": "カスタムラベル",
-    "data.filter.filterEditor.createCustomLabelSwitchLabel": "カスタムラベルを作成しますか？",
-    "data.filter.filterEditor.dateFormatHelpLinkLabel": "対応データフォーマット",
-    "data.filter.filterEditor.doesNotExistOperatorOptionLabel": "存在しません",
-    "data.filter.filterEditor.editFilterPopupTitle": "フィルターを編集",
-    "data.filter.filterEditor.editFilterValuesButtonLabel": "フィルター値を編集",
-    "data.filter.filterEditor.editQueryDslButtonLabel": "クエリ DSL として編集",
-    "data.filter.filterEditor.existsOperatorOptionLabel": "存在する",
-    "data.filter.filterEditor.falseOptionLabel": "false",
-    "data.filter.filterEditor.fieldSelectLabel": "フィールド",
-    "data.filter.filterEditor.fieldSelectPlaceholder": "フィールドを選択",
-    "data.filter.filterEditor.indexPatternSelectLabel": "インデックスパターン",
-    "data.filter.filterEditor.isBetweenOperatorOptionLabel": "is between",
-    "data.filter.filterEditor.isNotBetweenOperatorOptionLabel": "is not between",
-    "data.filter.filterEditor.isNotOneOfOperatorOptionLabel": "is not one of",
-    "data.filter.filterEditor.isNotOperatorOptionLabel": "is not",
-    "data.filter.filterEditor.isOneOfOperatorOptionLabel": "is one of",
-    "data.filter.filterEditor.isOperatorOptionLabel": "が",
-    "data.filter.filterEditor.operatorSelectLabel": "演算子",
-    "data.filter.filterEditor.rangeEndInputPlaceholder": "範囲の終了値",
-    "data.filter.filterEditor.rangeStartInputPlaceholder": "範囲の開始値",
-    "data.filter.filterEditor.saveButtonLabel": "保存",
-    "data.filter.filterEditor.trueOptionLabel": "true",
-    "data.filter.filterEditor.valueInputLabel": "値",
-    "data.filter.filterEditor.valueInputPlaceholder": "値を入力",
-    "data.filter.filterEditor.valueSelectPlaceholder": "値を選択",
-    "data.filter.filterEditor.valuesSelectLabel": "値",
-    "data.filter.filterEditor.valuesSelectPlaceholder": "値を選択",
-    "data.filter.options.changeAllFiltersButtonLabel": "すべてのフィルターの変更",
-    "data.filter.options.deleteAllFiltersButtonLabel": "すべて削除",
-    "data.filter.options.disableAllFiltersButtonLabel": "すべて無効にする",
-    "data.filter.options.enableAllFiltersButtonLabel": "すべて有効にする",
-    "data.filter.options.invertDisabledFiltersButtonLabel": "有効・無効を反転",
-    "data.filter.options.invertNegatedFiltersButtonLabel": "含める・除外を反転",
-    "data.filter.options.pinAllFiltersButtonLabel": "すべてピン付け",
-    "data.filter.options.unpinAllFiltersButtonLabel": "すべてのピンを外す",
-    "data.filter.searchBar.changeAllFiltersTitle": "すべてのフィルターの変更",
-    "data.indexPatterns.fetchFieldErrorTitle": "フィールドの取得中にエラーが発生",
-    "data.indexPatterns.unableWriteLabel": "インデックスパターンを書き込めません！このインデックスパターンへの最新の変更を取得するには、ページを更新してください。",
-    "data.indexPatterns.unknownFieldErrorMessage": "インデックスパターン「{title}」のフィールド「{name}」が不明なフィールドタイプを使用しています。",
-    "data.indexPatterns.unknownFieldHeader": "不明なフィールドタイプ {type}",
-    "data.query.queryBar.kqlFullLanguageName": "Kibana クエリ言語",
-    "data.query.queryBar.kqlLanguageName": "KQL",
-    "data.query.queryBar.kqlOffLabel": "オフ",
-    "data.query.queryBar.kqlOnLabel": "オン",
-    "data.query.queryBar.luceneLanguageName": "Lucene",
-    "data.query.queryBar.luceneSyntaxWarningMessage": "Lucene クエリ構文を使用しているようですが、Kibana クエリ言語 (KQL) が選択されています。KQL ドキュメント {link} を確認してください。",
-    "data.query.queryBar.luceneSyntaxWarningTitle": "Lucene 構文警告",
-    "data.query.queryBar.searchInputPlaceholder": "検索",
-    "data.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) は、シンプルなクエリ構文とスクリプトフィールドのサポートを提供します。また、KQL はベーシックライセンス以上をご利用の場合、自動入力も提供します。KQL をオフにすると、Kibana は Lucene を使用します。",
-    "data.query.queryBar.syntaxOptionsDescription.docsLinkText": "こちら",
-    "data.query.queryBar.syntaxOptionsTitle": "構文オプション",
-    "data.filter.filterEditor.queryDslLabel": "Elasticsearch クエリ DSL",
-    "data.query.queryBar.luceneSyntaxWarningOptOutText": "今後表示しない",
-    "data.search.searchBar.savedQueryDescriptionLabelText": "説明",
-    "data.search.searchBar.savedQueryDescriptionText": "再度使用するクエリテキストとフィルターを保存します。",
-    "data.search.searchBar.savedQueryForm.titleConflictText": "タイトルが既に保存されているクエリに使用されています",
-    "data.search.searchBar.savedQueryForm.whitespaceErrorText": "タイトルの始めと終わりにはスペースを使用できません",
-    "data.search.searchBar.savedQueryFormCancelButtonText": "キャンセル",
-    "data.search.searchBar.savedQueryFormSaveButtonText": "保存",
-    "data.search.searchBar.savedQueryFormTitle": "クエリを保存",
-    "data.search.searchBar.savedQueryIncludeFiltersLabelText": "フィルターを含める",
-    "data.search.searchBar.savedQueryIncludeTimeFilterLabelText": "時間フィルターを含める",
-    "data.search.searchBar.savedQueryNameHelpText": "名前が必要です。タイトルの始めと終わりにはスペースを使用できません。名前は固有でなければなりません。",
-    "data.search.searchBar.savedQueryNameLabelText": "名前",
-    "data.search.searchBar.savedQueryNoSavedQueriesText": "保存されたクエリがありません。",
-    "data.search.searchBar.savedQueryPopoverButtonText": "保存されたクエリを表示",
-    "data.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "現在保存されているクエリを消去",
-    "data.search.searchBar.savedQueryPopoverClearButtonText": "消去",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "キャンセル",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "削除",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "「{savedQueryName}」を削除しますか？",
-    "data.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "保存されたクエリ {savedQueryName} を削除",
-    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "新規保存",
-    "data.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "新規保存クエリを保存",
-    "data.search.searchBar.savedQueryPopoverSaveButtonText": "現在のクエリを保存",
-    "data.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "{title} への変更を保存",
-    "data.search.searchBar.savedQueryPopoverSaveChangesButtonText": "変更を保存",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "保存クエリボタン {savedQueryName}",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "{savedQueryName} の説明",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "選択されたクエリボタン {savedQueryName} を保存しました。変更を破棄するには押してください。",
-    "data.search.searchBar.savedQueryPopoverTitleText": "保存されたクエリ",
-    "data.filter.filterEditor.operatorSelectPlaceholderSelect": "選択してください",
-    "data.filter.filterEditor.operatorSelectPlaceholderWaiting": "待機中",
-    "data.filter.filterEditor.rangeInputLabel": "範囲",
-    "data.query.queryBar.comboboxAriaLabel": "{pageType} ページの検索とフィルタリング",
-    "data.search.searchBar.savedQueryForm.titleMissingText": "名前が必要です",
-    "data.query.queryBar.searchInputAriaLabel": "{pageType} ページの検索とフィルタリングを行うには入力を開始してください",
-    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "新規保存クエリを保存",
-    "data.functions.esaggs.help": "AggConfig 集約を実行します",
-    "data.functions.esaggs.inspector.dataRequest.description": "このリクエストは Elasticsearch にクエリし、ビジュアライゼーション用のデータを取得します。",
-    "data.functions.esaggs.inspector.dataRequest.title": "データ",
-    "data.common.esQuery.kql.errors.endOfInputText": "インプットの終わり",
-    "data.common.esQuery.kql.errors.fieldNameText": "フィールド名",
-    "data.common.esQuery.kql.errors.literalText": "文字通り",
-    "data.common.esQuery.kql.errors.syntaxError": "{expectedList} が予測されましたが {foundInput} が検出されました。",
-    "data.common.esQuery.kql.errors.valueText": "値",
-    "data.common.esQuery.kql.errors.whitespaceText": "ホワイトスペース",
-    "devTools.badge.readOnly.text": "読み込み専用",
-    "devTools.badge.readOnly.tooltip": "を保存できませんでした",
-    "devTools.k7BreadcrumbsDevToolsLabel": "開発ツール",
-    "embeddableApi.actions.applyFilterActionTitle": "現在のビューにフィルターを適用",
-    "embeddableApi.addPanel.createNewDefaultOption": "新規作成...",
-    "embeddableApi.addPanel.displayName": "パネルの追加",
-    "embeddableApi.addPanel.savedObjectAddedToContainerSuccessMessageTitle": "{savedObjectName} が追加されました",
-    "embeddableApi.addPanel.Title": "パネルの追加",
-    "embeddableApi.customizePanel.action.displayName": "パネルをカスタマイズ",
-    "embeddableApi.customizePanel.modal.cancel": "キャンセル",
-    "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleFormRowLabel": "パネルタイトル",
-    "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleInputAriaLabel": "パネルのカスタムタイトルを入力してください",
-    "embeddableApi.customizePanel.modal.optionsMenuForm.resetCustomDashboardButtonLabel": "リセット",
-    "embeddableApi.customizePanel.modal.saveButtonTitle": "保存",
-    "embeddableApi.customizePanel.modal.showTitle": "パネルタイトルを表示",
-    "embeddableApi.customizeTitle.optionsMenuForm.panelTitleFormRowLabel": "パネルタイトル",
-    "embeddableApi.customizeTitle.optionsMenuForm.panelTitleInputAriaLabel": "このインプットへの変更は直ちに適用されます。Enter を押して閉じます。",
-    "embeddableApi.customizeTitle.optionsMenuForm.resetCustomDashboardButtonLabel": "タイトルをリセット",
-    "embeddableApi.errors.embeddableFactoryNotFound": "{type} を読み込めません。Elasticsearch と Kibana のデフォルトのディストリビューションを適切なライセンスでアップグレードしてください。",
-    "embeddableApi.errors.paneldoesNotExist": "パネルが見つかりません",
-    "embeddableApi.panel.editPanel.displayName": "{value} を編集",
-    "embeddableApi.panel.inspectPanel.displayName": "検査",
-    "embeddableApi.panel.optionsMenu.panelOptionsButtonAriaLabel": "パネルオプション",
-    "embeddableApi.panel.removePanel.displayName": "ダッシュボードから削除",
-    "embeddableApi.samples.contactCard.displayName": "連絡先カード",
-    "embeddableApi.samples.filterableContainer.displayName": "フィルター可能なダッシュボード",
-    "embeddableApi.samples.filterableEmbeddable.displayName": "フィルター可能",
-    "embeddableApi.samples.helloworld.displayName": "こんにちは",
-    "embeddableApi.panel.enhancedDashboardPanelAriaLabel": "ダッシュボードパネル: {title}",
-    "embeddableApi.panel.optionsMenu.panelOptionsButtonEnhancedAriaLabel": "{title} のパネルオプション",
-    "embeddableApi.panel.dashboardPanelAriaLabel": "ダッシュボードパネル",
-    "inputControl.control.noIndexPatternTooltip": "index-pattern id が見つかりませんでした: {indexPatternId}.",
-    "inputControl.control.notInitializedTooltip": "コントロールが初期化されていません",
-    "inputControl.control.noValuesDisableTooltip": "「{indexPatternName}」インデックスパターンでいずれのドキュメントにも存在しない「{fieldName}」フィールドがフィルターの対象になっています。異なるフィールドを選択するか、このフィールドに値が入力されているドキュメントをインデックスしてください。",
-    "inputControl.editor.controlEditor.controlLabel": "コントロールラベル",
-    "inputControl.editor.controlEditor.moveControlDownAriaLabel": "コントロールを下に移動",
-    "inputControl.editor.controlEditor.moveControlUpAriaLabel": "コントロールを上に移動",
-    "inputControl.editor.controlEditor.removeControlAriaLabel": "コントロールを削除",
-    "inputControl.editor.controlsTab.addButtonLabel": "追加",
-    "inputControl.editor.controlsTab.select.addControlAriaLabel": "コントロールを追加",
-    "inputControl.editor.controlsTab.select.controlTypeAriaLabel": "コントロールタイプを選択してください",
-    "inputControl.editor.controlsTab.select.listDropDownOptionLabel": "オプションリスト",
-    "inputControl.editor.controlsTab.select.rangeDropDownOptionLabel": "範囲スライダー",
-    "inputControl.editor.fieldSelect.fieldLabel": "フィールド",
-    "inputControl.editor.fieldSelect.selectFieldPlaceholder": "フィールドを選択してください...",
-    "inputControl.editor.indexPatternSelect.patternLabel": "インデックスパターン",
-    "inputControl.editor.indexPatternSelect.patternPlaceholder": "インデックスパターンを選択してください",
-    "inputControl.editor.listControl.dynamicOptions.stringFieldDescription": "「文字列」フィールドでのみ利用可能",
-    "inputControl.editor.listControl.dynamicOptions.updateDescription": "ユーザーインプットに対する更新オプション",
-    "inputControl.editor.listControl.dynamicOptionsLabel": "ダイナミックオプション",
-    "inputControl.editor.listControl.multiselectDescription": "複数選択を許可",
-    "inputControl.editor.listControl.multiselectLabel": "複数選択",
-    "inputControl.editor.listControl.parentDescription": "オプションは親コントロールの値がベースになっています。親が設定されていない場合は無効です。",
-    "inputControl.editor.listControl.parentLabel": "親コントロール",
-    "inputControl.editor.listControl.sizeDescription": "オプション数",
-    "inputControl.editor.listControl.sizeLabel": "サイズ",
-    "inputControl.editor.optionsTab.pinFiltersLabel": "すべてのアプリケーションのフィルターをピン付け",
-    "inputControl.editor.optionsTab.updateFilterLabel": "変更するごとに Kibana フィルターを更新",
-    "inputControl.editor.optionsTab.useTimeFilterLabel": "時間フィルターを使用",
-    "inputControl.editor.rangeControl.decimalPlacesLabel": "小数部分の桁数",
-    "inputControl.editor.rangeControl.stepSizeLabel": "ステップサイズ",
-    "inputControl.function.help": "インプットコントロールビジュアライゼーション",
-    "inputControl.listControl.disableTooltip": "「{label}」が設定されるまで無効です。",
-    "inputControl.listControl.unableToFetchTooltip": "用語を取得できません、エラー: {errorMessage}",
-    "inputControl.rangeControl.unableToFetchTooltip": "範囲 (最低値と最高値) を取得できません、エラー: {errorMessage}",
-    "inputControl.register.controlsDescription": "ダッシュボードを簡単に操作できるように、インタラクティブなコントロールを作成します。",
-    "inputControl.register.controlsTitle": "コントロール",
-    "inputControl.register.tabs.controlsTitle": "コントロール",
-    "inputControl.register.tabs.optionsTitle": "オプション",
-    "inputControl.vis.inputControlVis.applyChangesButtonLabel": "変更を適用",
-    "inputControl.vis.inputControlVis.cancelChangesButtonLabel": "変更をキャンセル",
-    "inputControl.vis.inputControlVis.clearFormButtonLabel": "用語を消去",
-    "inputControl.vis.listControl.selectPlaceholder": "選択してください…",
-    "inputControl.vis.listControl.selectTextPlaceholder": "選択してください…",
-    "inputControl.vis.listControl.partialResultsWarningMessage": "リクエストに長くかかり過ぎているため、用語リストが不完全な可能性があります。完全な結果を得るには、kibana.yml の自動完了設定を調整してください。",
-    "visualizations.function.visDimension.accessor.help": "使用するデータセット内の列 (列インデックスまたは列名)",
-    "visualizations.function.visDimension.error.accessor": "入力された列名は無効です。",
-    "visualizations.function.visDimension.help": "visConfig ディメンションオブジェクトを生成します",
-    "expressions.functions.kibana_context.help": "Kibana グローバルコンテキストを更新します",
-    "expressions.functions.kibana.help": "Kibana グローバルコンテキストを取得します",
-    "expressions.functions.font.args.alignHelpText": "水平テキスト配置",
-    "expressions.functions.font.args.colorHelpText": "文字の色です。",
-    "expressions.functions.font.args.italicHelpText": "テキストを斜体にしますか？",
-    "expressions.functions.font.args.lHeightHelpText": "ピクセル単位の行の高さです。",
-    "expressions.functions.font.args.sizeHelpText": "ピクセル単位のフォントサイズです。",
-    "expressions.functions.font.args.underlineHelpText": "テキストに下線を引きますか？",
-    "expressions.functions.font.args.weightHelpText": "フォントの重量です。例: {list} または {end}。",
-    "expressions.functions.fontHelpText": "フォントスタイルを作成します。",
-    "kbn.advancedSettings.context.defaultSizeText": "コンテキストビューに表示される周りのエントリーの数",
-    "kbn.advancedSettings.context.defaultSizeTitle": "コンテキストサイズ",
-    "kbn.advancedSettings.context.sizeStepText": "コンテキストサイズを増減させる際の最低単位です",
-    "kbn.advancedSettings.context.sizeStepTitle": "コンテキストサイズのステップ",
-    "kbn.advancedSettings.context.tieBreakerFieldsText": "同じタイムスタンプ値のドキュメントを区別するためのコンマ区切りのフィールドのリストです。このリストから、現在のインデックスパターンに含まれ並べ替え可能な初めのフィールドが使用されます。",
-    "kbn.advancedSettings.context.tieBreakerFieldsTitle": "タイブレーカーフィールド",
-    "kbn.advancedSettings.courier.customRequestPreference.requestPreferenceLinkText": "リクエスト設定",
-    "kbn.advancedSettings.courier.customRequestPreferenceText": "{setRequestReferenceSetting} が {customSettingValue} に設定されている時に使用される {requestPreferenceLink} です。",
-    "kbn.advancedSettings.courier.customRequestPreferenceTitle": "カスタムリクエスト設定",
-    "kbn.advancedSettings.courier.ignoreFilterText": "この構成は、似ていないインデックスにアクセスするビジュアライゼーションを含むダッシュボードのサポートを強化します。無効にすると、すべてのフィルターがすべてのビジュアライゼーションに適用されます。有効にすると、ビジュアライゼーションのインデックスにフィルター対象のフィールドが含まれていない場合、ビジュアライゼーションの際にフィルターが無視されます。",
-    "kbn.advancedSettings.courier.ignoreFilterTitle": "フィルターの無視",
-    "kbn.advancedSettings.courier.maxRequestsText": "Kibana から送信された _msearch requests リクエストに使用される {maxRequestsLink} 設定を管理します。この構成を無効にして Elasticsearch のデフォルトを使用するには、0 に設定します。",
-    "kbn.advancedSettings.courier.maxRequestsTitle": "最大同時シャードリクエスト",
-    "kbn.advancedSettings.courier.requestPreferenceCustom": "カスタム",
-    "kbn.advancedSettings.courier.requestPreferenceNone": "なし",
-    "kbn.advancedSettings.courier.requestPreferenceSessionId": "セッション ID",
-    "kbn.advancedSettings.courier.requestPreferenceText": "どのシャードが検索リクエストを扱うかを設定できます。<ul>\n            <li><strong>{sessionId}:</strong> 同じシャードのすべての検索リクエストを実行するため、オペレーションを制限します。\n              これにはリクエスト間でシャードのキャッシュを共有できるというメリットがあります。</li>\n            <li><strong>{custom}:</strong> 独自の設定が可能になります。\n              <strong>couriercustomRequestPreference</strong> で設定値をカスタマイズします。</li>\n            <li><strong>{none}:</strong> 設定されていないことを意味します。\n              これにより、リクエストが全シャードコピー間に分散されるため、パフォーマンスが改善される可能性があります。\n              ただし、シャードによって更新ステータスが異なる場合があるため、結果に矛盾が生じる可能性があります。</li>\n          </ul>",
-    "kbn.advancedSettings.courier.requestPreferenceTitle": "リクエスト設定",
-    "kbn.advancedSettings.csv.quoteValuesText": "csv エクスポートに値を引用するかどうかです",
-    "kbn.advancedSettings.csv.quoteValuesTitle": "CSV の値を引用",
-    "kbn.advancedSettings.csv.separatorText": "エクスポートされた値をこの文字列で区切ります",
-    "kbn.advancedSettings.csv.separatorTitle": "CSV セパレーター",
-    "kbn.advancedSettings.darkModeText": "Kibana UI のダークモードを有効にします。この設定を適用するにはページの更新が必要です。",
-    "kbn.advancedSettings.darkModeTitle": "ダークモード",
-    "kbn.advancedSettings.dateFormat.dayOfWeekText": "週の初めの曜日を設定します",
-    "kbn.advancedSettings.dateFormat.dayOfWeekTitle": "曜日",
-    "kbn.advancedSettings.dateFormat.optionsLinkText": "フォーマット",
-    "kbn.advancedSettings.dateFormat.scaled.intervalsLinkText": "ISO8601 間隔",
-    "kbn.advancedSettings.dateFormat.scaledText": "時間ベースのデータが順番にレンダリングされ、フォーマットされたタイムスタンプが測定値の間隔に適応すべき状況で使用されるフォーマットを定義する値です。キーは {intervalsLink}。",
-    "kbn.advancedSettings.dateFormat.scaledTitle": "スケーリングされたデータフォーマットです",
-    "kbn.advancedSettings.dateFormat.timezoneText": "使用されるタイムゾーンです。{defaultOption} ではご使用のブラウザにより検知されたタイムゾーンが使用されます。",
-    "kbn.advancedSettings.dateFormat.timezoneTitle": "データフォーマットのタイムゾーン",
-    "kbn.advancedSettings.dateFormatText": "きちんとフォーマットされたデータを表示する際、この {formatLink} を使用します",
-    "kbn.advancedSettings.dateFormatTitle": "データフォーマット",
-    "kbn.advancedSettings.dateNanosFormatText": "Elasticsearch の {dateNanosLink} データタイプに使用されます",
-    "kbn.advancedSettings.dateNanosFormatTitle": "ナノ秒フォーマットでの日付",
-    "kbn.advancedSettings.dateNanosLinkTitle": "date_nanos",
-    "kbn.advancedSettings.defaultColumnsText": "デフォルトでディスカバリタブに表示される列です",
-    "kbn.advancedSettings.defaultColumnsTitle": "デフォルトの列",
-    "kbn.advancedSettings.defaultIndexText": "インデックスが設定されていない時にアクセスするインデックスです",
-    "kbn.advancedSettings.defaultIndexTitle": "デフォルトのインデックス",
-    "kbn.advancedSettings.disableAnimationsText": "Kibana UI の不要なアニメーションをオフにします。変更を適用するにはページを更新してください。",
-    "kbn.advancedSettings.disableAnimationsTitle": "アニメーションを無効にする",
-    "kbn.advancedSettings.discover.aggsTermsSizeText": "「可視化」ボタンをクリックした際に、フィールドドロップダウンやディスカバリサイドバーに可視化される用語の数を設定します。",
-    "kbn.advancedSettings.discover.aggsTermsSizeTitle": "用語数",
-    "kbn.advancedSettings.discover.sampleSizeText": "表に表示する行数です",
-    "kbn.advancedSettings.discover.sampleSizeTitle": "行数",
-    "kbn.advancedSettings.discover.sortDefaultOrderText": "ディスカバリアプリのインデックスパターンに基づく時刻のデフォルトの並べ替え方向をコントロールします。",
-    "kbn.advancedSettings.discover.sortDefaultOrderTitle": "デフォルトの並べ替え方向",
-    "kbn.advancedSettings.discover.sortOrderAsc": "昇順",
-    "kbn.advancedSettings.discover.sortOrderDesc": "降順",
-    "kbn.advancedSettings.docTableHideTimeColumnText": "ディスカバリと、ダッシュボードのすべての保存された検索で、「時刻」列を非表示にします。",
-    "kbn.advancedSettings.docTableHideTimeColumnTitle": "「時刻」列を非表示",
-    "kbn.advancedSettings.docTableHighlightText": "ディスカバリと保存された検索ダッシュボードの結果をハイライトします。ハイライトすることで、大きなドキュメントを扱う際にリクエストが遅くなります。",
-    "kbn.advancedSettings.docTableHighlightTitle": "結果をハイライト",
-    "kbn.advancedSettings.fieldsPopularLimitText": "最も頻繁に使用されるフィールドのトップ N を表示します",
-    "kbn.advancedSettings.fieldsPopularLimitTitle": "頻繁に使用されるフィールドの制限",
-    "kbn.advancedSettings.format.bytesFormat.numeralFormatLinkText": "数字フォーマット",
-    "kbn.advancedSettings.format.bytesFormatText": "「バイト」フォーマットのデフォルト {numeralFormatLink} です",
-    "kbn.advancedSettings.format.bytesFormatTitle": "バイトフォーマット",
-    "kbn.advancedSettings.format.currencyFormat.numeralFormatLinkText": "数字フォーマット",
-    "kbn.advancedSettings.format.currencyFormatText": "「通貨」フォーマットのデフォルト {numeralFormatLink} です",
-    "kbn.advancedSettings.format.currencyFormatTitle": "通貨フォーマット",
-    "kbn.advancedSettings.format.defaultTypeMapText": "各フィールドタイプにデフォルトで使用するフォーマット名のマップです。フィールドタイプが特に指定されていない場合は {defaultFormat} が使用されます",
-    "kbn.advancedSettings.format.defaultTypeMapTitle": "フィールドタイプフォーマット名",
-    "kbn.advancedSettings.format.formattingLocale.numeralLanguageLinkText": "数字言語",
-    "kbn.advancedSettings.format.formattingLocaleText": "{numeralLanguageLink} ロケール",
-    "kbn.advancedSettings.format.formattingLocaleTitle": "フォーマットロケール",
-    "kbn.advancedSettings.format.numberFormat.numeralFormatLinkText": "数字フォーマット",
-    "kbn.advancedSettings.format.numberFormatText": "「数字」フォーマットのデフォルト {numeralFormatLink} です",
-    "kbn.advancedSettings.format.numberFormatTitle": "数字フォーマット",
-    "kbn.advancedSettings.format.percentFormat.numeralFormatLinkText": "数字フォーマット",
-    "kbn.advancedSettings.format.percentFormatText": "「パーセント」フォーマットのデフォルト {numeralFormatLink} です",
-    "kbn.advancedSettings.format.percentFormatTitle": "パーセントフォーマット",
-    "kbn.advancedSettings.histogram.barTargetText": "日付ヒストグラムで「自動」間隔を使用する際、この数に近いバーの作成を試みます",
-    "kbn.advancedSettings.histogram.barTargetTitle": "目標バー数",
-    "kbn.advancedSettings.histogram.maxBarsText": "日付ヒストグラムに表示されるバーの数の上限です。必要に応じて値をスケーリングしてください",
-    "kbn.advancedSettings.histogram.maxBarsTitle": "最高バー数",
-    "kbn.advancedSettings.historyLimitText": "履歴があるフィールド (例: クエリインプット) に個の数の最近の値が表示されます",
-    "kbn.advancedSettings.historyLimitTitle": "履歴制限数",
-    "kbn.advancedSettings.indexPattern.recentMatchingText": "名前にタイムスタンプが含まれているインデックスパターンで、フィールドマッチングをクエリする最近の一致したパターンが、この数検索されます",
-    "kbn.advancedSettings.indexPattern.recentMatchingTitle": "最近一致したパターン",
-    "kbn.advancedSettings.indexPatternPlaceholderText": "「管理 > インデックスパターン > インデックスパターンを作成」で使用される「インデックスパターン名」フィールドのプレースホルダーです。",
-    "kbn.advancedSettings.indexPatternPlaceholderTitle": "インデックスパターンのプレースホルダー",
-    "kbn.advancedSettings.maxBucketsText": "1 つのデータソースが返せるバケットの最大数です",
-    "kbn.advancedSettings.maxBucketsTitle": "バケットの最大数",
-    "kbn.advancedSettings.maxCellHeightText": "表のセルが使用する高さの上限です。この切り捨てを無効にするには 0 に設定します",
-    "kbn.advancedSettings.maxCellHeightTitle": "表のセルの高さの上限",
-    "kbn.advancedSettings.metaFieldsText": "_source の外にあり、ドキュメントが表示される時に融合されるフィールドです",
-    "kbn.advancedSettings.metaFieldsTitle": "メタフィールド",
-    "kbn.advancedSettings.notifications.banner.markdownLinkText": "マークダウン対応",
-    "kbn.advancedSettings.notifications.bannerLifetimeText": "バナー通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定するとカウントダウンが無効になります。",
-    "kbn.advancedSettings.notifications.bannerLifetimeTitle": "バナー通知時間",
-    "kbn.advancedSettings.notifications.bannerText": "すべてのユーザーへの一時的な通知を目的としたカスタムバナーです。{markdownLink}",
-    "kbn.advancedSettings.notifications.bannerTitle": "カスタムバナー通知",
-    "kbn.advancedSettings.notifications.errorLifetimeText": "エラー通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
-    "kbn.advancedSettings.notifications.errorLifetimeTitle": "エラー通知時間",
-    "kbn.advancedSettings.notifications.infoLifetimeText": "情報通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
-    "kbn.advancedSettings.notifications.infoLifetimeTitle": "情報通知時間",
-    "kbn.advancedSettings.notifications.warningLifetimeText": "警告通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
-    "kbn.advancedSettings.notifications.warningLifetimeTitle": "警告通知時間",
-    "kbn.advancedSettings.pinFiltersText": "フィルターがデフォルトでグローバル (ピン付けされた状態) になるかの設定です",
-    "kbn.advancedSettings.pinFiltersTitle": "フィルターをデフォルトでピン付けする",
-    "kbn.advancedSettings.query.allowWildcardsText": "設定すると、クエリ句の頭に * が使えるようになります。現在クエリバーで実験的クエリ機能が有効になっている場合にのみ適用されます。基本的な Lucene クエリでリーディングワイルドカードを無効にするには、{queryStringOptionsPattern} を使用します。",
-    "kbn.advancedSettings.query.allowWildcardsTitle": "クエリでリーディングワイルドカードを許可する",
-    "kbn.advancedSettings.query.queryStringOptions.optionsLinkText": "オプション",
-    "kbn.advancedSettings.query.queryStringOptionsText": "Lucene クエリ文字列パーサーの {optionsLink}「{queryLanguage}」が {luceneLanguage} に設定されている時にのみ使用されます。",
-    "kbn.advancedSettings.query.queryStringOptionsTitle": "クエリ文字列のオプション",
-    "kbn.advancedSettings.savedObjects.listingLimitText": "一覧ページ用に取得するオブジェクトの数です",
-    "kbn.advancedSettings.savedObjects.listingLimitTitle": "オブジェクト取得制限",
-    "kbn.advancedSettings.savedObjects.perPageText": "読み込みダイアログで表示されるページごとのオブジェクトの数です",
-    "kbn.advancedSettings.savedObjects.perPageTitle": "ページごとのオブジェクト数",
-    "kbn.advancedSettings.searchQueryLanguageKql": "KQL",
-    "kbn.advancedSettings.searchQueryLanguageLucene": "Lucene",
-    "kbn.advancedSettings.searchQueryLanguageText": "クエリバーで使用されるクエリ言語です。KQL は Kibana 用に特別に開発された新しい言語です。",
-    "kbn.advancedSettings.searchQueryLanguageTitle": "クエリ言語",
-    "kbn.advancedSettings.shortenFieldsText": "長いフィールドを短くします。例: foo.bar.baz の代わりに f.b.baz と表示",
-    "kbn.advancedSettings.shortenFieldsTitle": "フィールドの短縮",
-    "kbn.advancedSettings.sortOptions.optionsLinkText": "オプション",
-    "kbn.advancedSettings.sortOptionsText": "Elasticsearch の並べ替えパラメーターの {optionsLink}",
-    "kbn.advancedSettings.sortOptionsTitle": "並べ替えオプション",
-    "kbn.advancedSettings.storeUrlText": "URL は長くなりすぎてブラウザが対応できない場合があります。セッションストレージに URL の一部を保存することがで　この問題に対処できるかテストしています。結果を教えてください！",
-    "kbn.advancedSettings.storeUrlTitle": "セッションストレージに URL を格納",
-    "kbn.advancedSettings.suggestFilterValuesText": "フィルターエディターがフィールドの値の候補を表示しないようにするには、このプロパティを false にしてください。",
-    "kbn.advancedSettings.suggestFilterValuesTitle": "フィルターエディターの候補値",
-    "kbn.advancedSettings.timepicker.last15Minutes": "過去 15 分間",
-    "kbn.advancedSettings.timepicker.last1Hour": "過去 1 時間",
-    "kbn.advancedSettings.timepicker.last1Year": "過去 1 年間",
-    "kbn.advancedSettings.timepicker.last24Hours": "過去 24 時間",
-    "kbn.advancedSettings.timepicker.last30Days": "過去 30 日間",
-    "kbn.advancedSettings.timepicker.last30Minutes": "過去 30 分間",
-    "kbn.advancedSettings.timepicker.last7Days": "過去 7 日間",
-    "kbn.advancedSettings.timepicker.last90Days": "過去 90 日間",
-    "kbn.advancedSettings.timepicker.quickRanges.acceptedFormatsLinkText": "対応フォーマット",
-    "kbn.advancedSettings.timepicker.quickRangesText": "タイムピッカーのクイックセクションに表示される範囲のリストです。それぞれのオブジェクトに「開始」、「終了」({acceptedFormatsLink} を参照)、「表示」(表示するタイトル) が含まれるオブジェクトの配列です。",
-    "kbn.advancedSettings.timepicker.quickRangesTitle": "タイムピッカーのクイック範囲",
-    "kbn.advancedSettings.timepicker.refreshIntervalDefaultsText": "時間フィルターのデフォルト更新間隔",
-    "kbn.advancedSettings.timepicker.refreshIntervalDefaultsTitle": "タイムピッカーの更新間隔",
-    "kbn.advancedSettings.timepicker.thisWeek": "今週",
-    "kbn.advancedSettings.timepicker.timeDefaultsText": "時間フィルターが選択されずに Kibana が起動した際に使用される時間フィルターです",
-    "kbn.advancedSettings.timepicker.timeDefaultsTitle": "デフォルトのタイムピッカー",
-    "kbn.advancedSettings.timepicker.today": "今日",
-    "kbn.advancedSettings.visualization.colorMappingText": "ビジュアライゼーション内の特定の色のマップ値です",
-    "kbn.advancedSettings.visualization.colorMappingTitle": "カラーマッピング",
-    "kbn.advancedSettings.visualization.dimmingOpacityText": "チャートの別のエレメントが選択された時に暗くなるチャート項目の透明度です。この数字が小さければ小さいほど、ハイライトされたエレメントが目立ちます。0 と 1 の間の数字で設定します。",
-    "kbn.advancedSettings.visualization.dimmingOpacityTitle": "減光透明度",
-    "kbn.advancedSettings.visualization.loadingDelayText": "クエリの際にビジュアライゼーションを暗くするまでの時間です",
-    "kbn.advancedSettings.visualization.loadingDelayTitle": "読み込み遅延",
-    "kbn.advancedSettings.visualization.showRegionMapWarningsText": "用語がマップの形に合わない場合に地域マップに警告を表示するかどうかです。",
-    "kbn.advancedSettings.visualization.showRegionMapWarningsTitle": "地域マップに警告を表示",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText": "ディメンションの説明",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecisionText": "マップに表示されるジオハッシュの最高精度です。7 が高い、10 が非常に高い、12 が最高を意味します。{cellDimensionsLink}",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecisionTitle": "タイルマップの最高精度",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaults.propertiesLinkText": "プロパティ",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsText": "座標マップの WMS マップサーバーサポートのデフォルトの {propertiesLink} です。",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsTitle": "デフォルトの WMS プロパティ",
-    "kbn.advancedSettings.visualizeEnableLabsText": "ユーザーが実験的なビジュアライゼーションを作成、表示、編集できるようになります。無効の場合、\n          ユーザーは本番準備が整ったビジュアライゼーションのみを利用できます。",
-    "kbn.advancedSettings.visualizeEnableLabsTitle": "実験的なビジュアライゼーションを有効にする",
-    "kbn.common.tutorials.auditbeat.cloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.auditbeat.premCloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.auditbeat.premInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTitle": "構成の変更",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTitle": "構成の変更",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTitle": "構成の変更",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.auditbeatInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.auditbeatInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.auditbeatInstructions.config.debTitle": "構成の変更",
-    "kbn.common.tutorials.auditbeatInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.auditbeatInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.auditbeatInstructions.config.osxTitle": "構成の変更",
-    "kbn.common.tutorials.auditbeatInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.auditbeatInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.auditbeatInstructions.config.rpmTitle": "構成の変更",
-    "kbn.common.tutorials.auditbeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.auditbeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.auditbeatInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.auditbeatInstructions.install.debTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({linkUrl}) をご覧ください。",
-    "kbn.common.tutorials.auditbeatInstructions.install.debTextPre": "Auditbeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
-    "kbn.common.tutorials.auditbeatInstructions.install.debTitle": "Auditbeat のダウンロードとインストール",
-    "kbn.common.tutorials.auditbeatInstructions.install.osxTextPre": "Auditbeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
-    "kbn.common.tutorials.auditbeatInstructions.install.osxTitle": "Auditbeat のダウンロードとインストール",
-    "kbn.common.tutorials.auditbeatInstructions.install.rpmTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({linkUrl}) をご覧ください。",
-    "kbn.common.tutorials.auditbeatInstructions.install.rpmTextPre": "Auditbeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
-    "kbn.common.tutorials.auditbeatInstructions.install.rpmTitle": "Auditbeat のダウンロードとインストール",
-    "kbn.common.tutorials.auditbeatInstructions.install.windowsTextPost": "{auditbeatPath} ファイルの {propertyName} を Elasticsearch のインストールに設定します。",
-    "kbn.common.tutorials.auditbeatInstructions.install.windowsTextPre": "Auditbeat は初めてですか？[入門ガイド]({guideLinkUrl}) をご覧ください。\n 1.[ダウンロード]({auditbeatLinkUrl}) ページから Auditbeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.「{directoryName}」ディレクトリの名前を「Auditbeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトで次のコマンドを実行し、Auditbeat を Windows サービスとしてインストールします。",
-    "kbn.common.tutorials.auditbeatInstructions.install.windowsTitle": "Auditbeat のダウンロードとインストール",
-    "kbn.common.tutorials.auditbeatInstructions.start.debTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.auditbeatInstructions.start.debTitle": "Auditbeat を起動",
-    "kbn.common.tutorials.auditbeatInstructions.start.osxTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.auditbeatInstructions.start.osxTitle": "Auditbeat を起動",
-    "kbn.common.tutorials.auditbeatInstructions.start.rpmTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.auditbeatInstructions.start.rpmTitle": "Auditbeat を起動",
-    "kbn.common.tutorials.auditbeatInstructions.start.windowsTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.auditbeatInstructions.start.windowsTitle": "Auditbeat を起動",
-    "kbn.common.tutorials.auditbeatStatusCheck.buttonLabel": "データを確認してください",
-    "kbn.common.tutorials.auditbeatStatusCheck.errorText": "まだデータを受信していません",
-    "kbn.common.tutorials.auditbeatStatusCheck.successText": "データを受信しました",
-    "kbn.common.tutorials.auditbeatStatusCheck.text": "Auditbeat からデータを受け取ったことを確認してください。",
-    "kbn.common.tutorials.auditbeatStatusCheck.title": "ステータス",
-    "kbn.common.tutorials.filebeat.cloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.filebeat.premCloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.filebeat.premInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.debTitle": "構成の変更",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTitle": "構成の変更",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTitle": "構成の変更",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.filebeatEnableInstructions.debTextPost": "「/etc/filebeat/modules.d/{moduleName}.yml」ファイルで設定を変更します。",
-    "kbn.common.tutorials.filebeatEnableInstructions.debTitle": "{moduleName} モジュールを有効にし構成します",
-    "kbn.common.tutorials.filebeatEnableInstructions.osxTextPost": "「modules.d/{moduleName}.yml」」ファイルで設定を変更します。",
-    "kbn.common.tutorials.filebeatEnableInstructions.osxTextPre": "インストールディレクトリから次のファイルを実行します:",
-    "kbn.common.tutorials.filebeatEnableInstructions.osxTitle": "{moduleName} モジュールを有効にし構成します",
-    "kbn.common.tutorials.filebeatEnableInstructions.rpmTextPost": "「/etc/filebeat/modules.d/{moduleName}.yml」ファイルで設定を変更します。",
-    "kbn.common.tutorials.filebeatEnableInstructions.rpmTitle": "{moduleName} モジュールを有効にし構成します",
-    "kbn.common.tutorials.filebeatEnableInstructions.windowsTextPost": "「modules.d/{moduleName}.yml」」ファイルで設定を変更します。",
-    "kbn.common.tutorials.filebeatEnableInstructions.windowsTextPre": "「{path}」フォルダから次のファイルを実行します:",
-    "kbn.common.tutorials.filebeatEnableInstructions.windowsTitle": "{moduleName} モジュールを有効にし構成します",
-    "kbn.common.tutorials.filebeatInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.filebeatInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.filebeatInstructions.config.debTitle": "構成の変更",
-    "kbn.common.tutorials.filebeatInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.filebeatInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.filebeatInstructions.config.osxTitle": "構成の変更",
-    "kbn.common.tutorials.filebeatInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.filebeatInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.filebeatInstructions.config.rpmTitle": "構成の変更",
-    "kbn.common.tutorials.filebeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.filebeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.filebeatInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.filebeatInstructions.install.debTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({linkUrl}) をご覧ください。",
-    "kbn.common.tutorials.filebeatInstructions.install.debTextPre": "Filebeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
-    "kbn.common.tutorials.filebeatInstructions.install.debTitle": "Filebeat のダウンロードとインストール",
-    "kbn.common.tutorials.filebeatInstructions.install.osxTextPre": "Filebeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
-    "kbn.common.tutorials.filebeatInstructions.install.osxTitle": "Filebeat のダウンロードとインストール",
-    "kbn.common.tutorials.filebeatInstructions.install.rpmTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({linkUrl}) をご覧ください。",
-    "kbn.common.tutorials.filebeatInstructions.install.rpmTextPre": "Filebeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
-    "kbn.common.tutorials.filebeatInstructions.install.rpmTitle": "Filebeat のダウンロードとインストール",
-    "kbn.common.tutorials.filebeatInstructions.install.windowsTextPost": "{filebeatPath} ファイルの {propertyName} を Elasticsearch のインストールに設定します。",
-    "kbn.common.tutorials.filebeatInstructions.install.windowsTextPre": "Filebeat は初めてですか？[入門ガイド]({guideLinkUrl}) をご覧ください。\n 1.[ダウンロード]({filebeatLinkUrl}) ページから Filebeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.「{directoryName}」ディレクトリの名前を「Filebeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトで次のコマンドを実行し、Filebeat を Windows サービスとしてインストールします。",
-    "kbn.common.tutorials.filebeatInstructions.install.windowsTitle": "Filebeat のダウンロードとインストール",
-    "kbn.common.tutorials.filebeatInstructions.start.debTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.filebeatInstructions.start.debTitle": "Filebeat を起動します",
-    "kbn.common.tutorials.filebeatInstructions.start.osxTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.filebeatInstructions.start.osxTitle": "Filebeat を起動します",
-    "kbn.common.tutorials.filebeatInstructions.start.rpmTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.filebeatInstructions.start.rpmTitle": "Filebeat を起動します",
-    "kbn.common.tutorials.filebeatInstructions.start.windowsTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.filebeatInstructions.start.windowsTitle": "Filebeat を起動します",
-    "kbn.common.tutorials.filebeatStatusCheck.buttonLabel": "データを確認してください",
-    "kbn.common.tutorials.filebeatStatusCheck.errorText": "モジュールからまだデータを受け取っていません",
-    "kbn.common.tutorials.filebeatStatusCheck.successText": "このモジュールからデータを受け取りました",
-    "kbn.common.tutorials.filebeatStatusCheck.text": "Filebeat の「{moduleName}」モジュールからデータを受け取ったことを確認してください。",
-    "kbn.common.tutorials.filebeatStatusCheck.title": "モジュールステータス",
-    "kbn.common.tutorials.functionbeat.cloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.functionbeat.premCloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.functionbeat.premInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.functionbeatAWSInstructions.textPost": "「<your-access-key>」と「<your-secret-access-key>」がアカウント 認証情報で、「us-east-1」が希望の地域です。",
-    "kbn.common.tutorials.functionbeatAWSInstructions.textPre": "環境で AWS アカウント認証情報を設定します。",
-    "kbn.common.tutorials.functionbeatAWSInstructions.title": "AWS 認証情報の設定",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTitle": "構成の変更",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.functionbeatEnableOnPremInstructions.defaultTextPost": "「<cloudwatch-log-group>」が投入するロググループの名前で、「<unique-bucket-name>」が Functionbeat デプロイのステージングに使用されるが有効な S3 バケット名です。",
-    "kbn.common.tutorials.functionbeatEnableOnPremInstructions.defaultTitle": "Cloudwatch ロググループの構成",
-    "kbn.common.tutorials.functionbeatEnableOnPremInstructionsOSXLinux.textPre": "「functionbeat.yml」ファイルで設定を変更します。",
-    "kbn.common.tutorials.functionbeatEnableOnPremInstructionsWindows.textPre": "{path} ファイルで設定を変更します。",
-    "kbn.common.tutorials.functionbeatInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.functionbeatInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.functionbeatInstructions.config.osxTitle": "Elastic クラスターの構成",
-    "kbn.common.tutorials.functionbeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.functionbeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.functionbeatInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.functionbeatInstructions.deploy.osxTextPre": "これにより Functionbeat が Lambda 関数としてインストールされます「setup」コマンドで Elasticsearch の構成を確認し、Kibana インデックスパターンを読み込みます。通常このコマンドを省いても大丈夫です。",
-    "kbn.common.tutorials.functionbeatInstructions.deploy.osxTitle": "Functionbeat を AWS Lambda にデプロイ",
-    "kbn.common.tutorials.functionbeatInstructions.deploy.windowsTextPre": "これにより Functionbeat が Lambda 関数としてインストールされます「setup」コマンドで Elasticsearch の構成を確認し、Kibana インデックスパターンを読み込みます。通常このコマンドを省いても大丈夫です。",
-    "kbn.common.tutorials.functionbeatInstructions.deploy.windowsTitle": "Functionbeat を AWS Lambda にデプロイ",
-    "kbn.common.tutorials.functionbeatInstructions.install.linuxTextPre": "Functionbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
-    "kbn.common.tutorials.functionbeatInstructions.install.linuxTitle": "Functionbeat のダウンロードとインストール",
-    "kbn.common.tutorials.functionbeatInstructions.install.osxTextPre": "Functionbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
-    "kbn.common.tutorials.functionbeatInstructions.install.osxTitle": "Functionbeat のダウンロードとインストール",
-    "kbn.common.tutorials.functionbeatInstructions.install.windowsTextPre": "Functionbeat は初めてですか？[入門ガイド]({functionbeatLink}) をご覧ください。\n 1.[ダウンロード]({elasticLink}) ページから Functionbeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.{directoryName} ディレクトリの名前を「Functionbeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトから、Functionbeat ディレクトリに移動します:",
-    "kbn.common.tutorials.functionbeatInstructions.install.windowsTitle": "Functionbeat のダウンロードとインストール",
-    "kbn.common.tutorials.functionbeatStatusCheck.buttonLabel": "データを確認してください",
-    "kbn.common.tutorials.functionbeatStatusCheck.errorText": "Functionbeat からまだデータを受け取っていません",
-    "kbn.common.tutorials.functionbeatStatusCheck.successText": "Functionbeat からデータを受け取りました",
-    "kbn.common.tutorials.functionbeatStatusCheck.text": "Functionbeat からデータを受け取ったことを確認してください。",
-    "kbn.common.tutorials.functionbeatStatusCheck.title": "Functionbeat ステータス",
-    "kbn.common.tutorials.heartbeat.cloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.heartbeat.premCloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.heartbeat.premInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTitle": "構成の変更",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTitle": "構成の変更",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTitle": "構成の変更",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.debTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.defaultTextPost": "Heartbeat のモニターの設定の詳細は、[Heartbeat 設定ドキュメント]({configureLink}) をご覧ください。",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.defaultTitle": "設定の変更 - モニターの追加",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.osxTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.rpmTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.windowsTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.debTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.defaultTextPost": "{hostTemplate} は監視対象の URL です。Heartbeat のモニターの設定の詳細は、[Heartbeat 設定ドキュメント]({configureLink}) をご覧ください。",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.defaultTitle": "設定の変更 - モニターの追加",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.osxTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.rpmTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.windowsTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
-    "kbn.common.tutorials.heartbeatInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.heartbeatInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.heartbeatInstructions.config.debTitle": "構成の変更",
-    "kbn.common.tutorials.heartbeatInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.heartbeatInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.heartbeatInstructions.config.osxTitle": "構成の変更",
-    "kbn.common.tutorials.heartbeatInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.heartbeatInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.heartbeatInstructions.config.rpmTitle": "構成の変更",
-    "kbn.common.tutorials.heartbeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.heartbeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.heartbeatInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.heartbeatInstructions.install.debTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({link}) をご覧ください。",
-    "kbn.common.tutorials.heartbeatInstructions.install.debTextPre": "Heartbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
-    "kbn.common.tutorials.heartbeatInstructions.install.debTitle": "Heartbeat のダウンロードとインストール",
-    "kbn.common.tutorials.heartbeatInstructions.install.osxTextPre": "Heartbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
-    "kbn.common.tutorials.heartbeatInstructions.install.osxTitle": "Heartbeat のダウンロードとインストール",
-    "kbn.common.tutorials.heartbeatInstructions.install.rpmTextPre": "Heartbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
-    "kbn.common.tutorials.heartbeatInstructions.install.rpmTitle": "Heartbeat のダウンロードとインストール",
-    "kbn.common.tutorials.heartbeatInstructions.install.windowsTextPre": "Heartbeat は初めてですか？[入門ガイド]({heartbeatLink}) をご覧ください。\n 1.[ダウンロード]({elasticLink}) ページから Heartbeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.「{directoryName}」ディレクトリの名前を「Heartbeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトで次のコマンドを実行し、Heartbeat を Windows サービスとしてインストールします。",
-    "kbn.common.tutorials.heartbeatInstructions.install.windowsTitle": "Heartbeat のダウンロードとインストール",
-    "kbn.common.tutorials.heartbeatInstructions.start.debTextPre": "「setup」コマンドで Kibana のインデックスパターンを読み込みます。",
-    "kbn.common.tutorials.heartbeatInstructions.start.debTitle": "Heartbeat を起動します",
-    "kbn.common.tutorials.heartbeatInstructions.start.osxTextPre": "「setup」コマンドで Kibana のインデックスパターンを読み込みます。",
-    "kbn.common.tutorials.heartbeatInstructions.start.osxTitle": "Heartbeat を起動します",
-    "kbn.common.tutorials.heartbeatInstructions.start.rpmTextPre": "「setup」コマンドで Kibana のインデックスパターンを読み込みます。",
-    "kbn.common.tutorials.heartbeatInstructions.start.rpmTitle": "Heartbeat を起動します",
-    "kbn.common.tutorials.heartbeatInstructions.start.windowsTextPre": "「setup」コマンドで Kibana のインデックスパターンを読み込みます。",
-    "kbn.common.tutorials.heartbeatInstructions.start.windowsTitle": "Heartbeat を起動します",
-    "kbn.common.tutorials.heartbeatStatusCheck.buttonLabel": "データを確認してください",
-    "kbn.common.tutorials.heartbeatStatusCheck.errorText": "Heartbeat からまだデータを受け取っていません",
-    "kbn.common.tutorials.heartbeatStatusCheck.successText": "Heartbeat からデータを受け取りました",
-    "kbn.common.tutorials.heartbeatStatusCheck.text": "Heartbeat からデータを受け取ったことを確認してください。",
-    "kbn.common.tutorials.heartbeatStatusCheck.title": "Heartbeat のステータス",
-    "kbn.common.tutorials.logstashInstructions.install.java.osxTextPre": "[こちら]({link}) のインストール手順に従ってください。",
-    "kbn.common.tutorials.logstashInstructions.install.java.osxTitle": "Java Runtime Environment のダウンロードとインストール",
-    "kbn.common.tutorials.logstashInstructions.install.java.windowsTextPre": "[こちら]({link}) のインストール手順に従ってください。",
-    "kbn.common.tutorials.logstashInstructions.install.java.windowsTitle": "Java Runtime Environment のダウンロードとインストール",
-    "kbn.common.tutorials.logstashInstructions.install.logstash.osxTextPre": "Logstash は初めてですか？ [入門ガイド]({link}) をご覧ください。",
-    "kbn.common.tutorials.logstashInstructions.install.logstash.osxTitle": "Logstash のダウンロードとインストール",
-    "kbn.common.tutorials.logstashInstructions.install.logstash.windowsTextPre": "Logstash は初めてですか？ [入門ガイド]({logstashLink}) をご覧ください。\n 1. Logstash Windows zip ファイルを [ダウンロード]({elasticLink}) します。\n 2.zip ファイルのコンテンツを展開します。",
-    "kbn.common.tutorials.logstashInstructions.install.logstash.windowsTitle": "Logstash のダウンロードとインストール",
-    "kbn.common.tutorials.metricbeat.cloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.metricbeat.premCloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.metricbeat.premInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTitle": "構成の変更",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTitle": "構成の変更",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTitle": "構成の変更",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.metricbeatEnableInstructions.debTextPost": "「/etc/metricbeat/modules.d/{moduleName}.yml」ファイルで設定を変更します。",
-    "kbn.common.tutorials.metricbeatEnableInstructions.debTitle": "{moduleName} モジュールを有効にし構成します",
-    "kbn.common.tutorials.metricbeatEnableInstructions.osxTextPost": "「modules.d/{moduleName}.yml」」ファイルで設定を変更します。",
-    "kbn.common.tutorials.metricbeatEnableInstructions.osxTextPre": "インストールディレクトリから次のファイルを実行します:",
-    "kbn.common.tutorials.metricbeatEnableInstructions.osxTitle": "{moduleName} モジュールを有効にし構成します",
-    "kbn.common.tutorials.metricbeatEnableInstructions.rpmTextPost": "「/etc/metricbeat/modules.d/{moduleName}.yml」ファイルで設定を変更します。",
-    "kbn.common.tutorials.metricbeatEnableInstructions.rpmTitle": "{moduleName} モジュールを有効にし構成します",
-    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTextPost": "「modules.d/{moduleName}.yml」」ファイルで設定を変更します。",
-    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTextPre": "「{path}」フォルダから次のファイルを実行します:",
-    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTitle": "{moduleName} モジュールを有効にし構成します",
-    "kbn.common.tutorials.metricbeatInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.metricbeatInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.metricbeatInstructions.config.debTitle": "構成の変更",
-    "kbn.common.tutorials.metricbeatInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.metricbeatInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.metricbeatInstructions.config.osxTitle": "構成の変更",
-    "kbn.common.tutorials.metricbeatInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.metricbeatInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.metricbeatInstructions.config.rpmTitle": "構成の変更",
-    "kbn.common.tutorials.metricbeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.metricbeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.metricbeatInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.metricbeatInstructions.install.debTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({link}) をご覧ください。",
-    "kbn.common.tutorials.metricbeatInstructions.install.debTextPre": "Metricbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
-    "kbn.common.tutorials.metricbeatInstructions.install.debTitle": "Metricbeat のダウンロードとインストール",
-    "kbn.common.tutorials.metricbeatInstructions.install.osxTextPre": "Metricbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
-    "kbn.common.tutorials.metricbeatInstructions.install.osxTitle": "Metricbeat のダウンロードとインストール",
-    "kbn.common.tutorials.metricbeatInstructions.install.rpmTextPre": "Metricbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
-    "kbn.common.tutorials.metricbeatInstructions.install.rpmTitle": "Metricbeat のダウンロードとインストール",
-    "kbn.common.tutorials.metricbeatInstructions.install.windowsTextPost": "{path} ファイルの「output.elasticsearch」を Elasticsearch のインストールに設定します。",
-    "kbn.common.tutorials.metricbeatInstructions.install.windowsTextPre": "Metricbeat は初めてですか？[入門ガイド]({metricbeatLink}) をご覧ください。\n 1.[ダウンロード]({elasticLink}) ページから Metricbeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.「{directoryName}」ディレクトリの名前を「Metricbeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトで次のコマンドを実行し、Metricbeat を Windows サービスとしてインストールします。",
-    "kbn.common.tutorials.metricbeatInstructions.install.windowsTitle": "Metricbeat のダウンロードとインストール",
-    "kbn.common.tutorials.metricbeatInstructions.start.debTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.metricbeatInstructions.start.debTitle": "Metricbeat を起動します",
-    "kbn.common.tutorials.metricbeatInstructions.start.osxTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.metricbeatInstructions.start.osxTitle": "Metricbeat を起動します",
-    "kbn.common.tutorials.metricbeatInstructions.start.rpmTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.metricbeatInstructions.start.rpmTitle": "Metricbeat を起動します",
-    "kbn.common.tutorials.metricbeatInstructions.start.windowsTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.metricbeatInstructions.start.windowsTitle": "Metricbeat を起動します",
-    "kbn.common.tutorials.metricbeatStatusCheck.buttonLabel": "データを確認してください",
-    "kbn.common.tutorials.metricbeatStatusCheck.errorText": "モジュールからまだデータを受け取っていません",
-    "kbn.common.tutorials.metricbeatStatusCheck.successText": "このモジュールからデータを受け取りました",
-    "kbn.common.tutorials.metricbeatStatusCheck.text": "Metricbeat の「{moduleName}」モジュールからデータを受け取ったことを確認してください",
-    "kbn.common.tutorials.metricbeatStatusCheck.title": "モジュールステータス",
-    "kbn.common.tutorials.premCloudInstructions.option1.textPre": "[Elastic Cloud] ({link}) にアクセスします。アカウントをお持ちでない場合は新規登録してください。14 日間の無料トライアルがご利用いただけます。\n\nElastic Cloud コンソールにログインします\n\nElastic Cloud コンソールで次の手順を実行し、クラスターを作成します。\n 1.「デプロイを作成」、「デプロイ名」の順にクリックします\n 2.必要に応じて他のデプロイオプションを変更します (デフォルトも使い始めるのに有効です)\n 3.「デプロイを作成」をクリックします\n 4.デプロイの作成が完了するまで待ちます\n 5.新規クラウド Kibana インスタンスにアクセスし、Kibana ホームの手順に従います。",
-    "kbn.common.tutorials.premCloudInstructions.option1.title": "オプション 1:Elastic Cloud でお試しください",
-    "kbn.common.tutorials.premCloudInstructions.option2.textPre": "この Kibana インスタンスをマネージド Elasticsearch インスタンスに対して実行している場合は、手動セットアップを行います。.\n\n「Elasticsearch」エンドポイントを {urlTemplate} として保存し、クラスターの「パスワード」を {passwordTemplate} として保存します。",
-    "kbn.common.tutorials.premCloudInstructions.option2.title": "オプション 2:Kibana を Cloud インスタンスに接続",
-    "kbn.common.tutorials.winlogbeat.cloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.winlogbeat.premCloudInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.winlogbeat.premInstructions.gettingStarted.title": "はじめに",
-    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
-    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
-    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
-    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTitle": "構成の変更",
-    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTextPost": "{path} ファイルの「output.elasticsearch」を Elasticsearch のインストールに設定します。",
-    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTextPre": "Winlogbeat は初めてですか？[入門ガイド]({winlogbeatLink}) をご覧ください。\n 1.[ダウンロード]({elasticLink}) ページから Winlogbeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.{directoryName} ディレクトリの名前を「Winlogbeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトで次のコマンドを実行し、Winlogbeat を Windows サービスとしてインストールします。",
-    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTitle": "Winlogbeat のダウンロードとインストール",
-    "kbn.common.tutorials.winlogbeatInstructions.start.windowsTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
-    "kbn.common.tutorials.winlogbeatInstructions.start.windowsTitle": "Winlogbeat を起動",
-    "kbn.common.tutorials.winlogbeatStatusCheck.buttonLabel": "データを確認してください",
-    "kbn.common.tutorials.winlogbeatStatusCheck.errorText": "まだデータを受信していません",
-    "kbn.common.tutorials.winlogbeatStatusCheck.successText": "データを受信しました",
-    "kbn.common.tutorials.winlogbeatStatusCheck.text": "Winlogbeat からデータを受け取ったことを確認してください。",
-    "kbn.common.tutorials.winlogbeatStatusCheck.title": "モジュールステータス",
-    "kbn.context.breadcrumb": "{indexPatternTitle}#{docId} のコンテキスト",
-    "kbn.context.failedToLoadAnchorDocumentDescription": "別ののドキュメントの読み込みに失敗しました",
-    "kbn.context.failedToLoadAnchorDocumentErrorDescription": "別のドキュメントの読み込みに失敗しました。",
-    "kbn.context.loadingDescription": "読み込み中…",
-    "kbn.context.newerDocumentsDescription": "新しいドキュメント",
-    "kbn.context.noSearchableTiebreakerFieldDescription": "インデックスパターン {indexPatternId} で検索可能なタイブレーカーフィールドが見つかりませんでした。高度な設定 {tieBreakerFields} tを変更してこのインデックスパターンの有効なフィールドを含めてください。",
-    "kbn.context.olderDocumentsDescription": "古いドキュメント",
-    "kbn.context.reloadPageDescription.discoverLinkText": "ディスカバリ",
-    "kbn.context.reloadPageDescription.reloadOrVisitTextMessage": "再読み込みするか",
-    "kbn.context.reloadPageDescription.selectValidAnchorDocumentTextMessage": "にアクセスして有効な別のドキュメントを選択してください。",
-    "kbn.context.unableToLoadAnchorDocumentDescription": "別のドキュメントが読み込めません",
-    "kbn.context.unableToLoadDocumentDescription": "ドキュメントが読み込めません",
-    "kbn.dashboard.addVisualizationDescription1": "上のメニューバーの ",
-    "kbn.dashboard.addVisualizationDescription2": " ボタンをクリックして、ダッシュボードにビジュアライゼーションを追加します。",
-    "kbn.dashboard.addVisualizationLinkAriaLabel": "ビジュアライゼーションを追加",
-    "kbn.dashboard.addVisualizationLinkText": "追加",
-    "kbn.dashboard.badge.readOnly.text": "読み込み専用",
-    "kbn.dashboard.badge.readOnly.tooltip": "ダッシュボードを保存できません",
-    "kbn.dashboard.changeViewModeConfirmModal.cancelButtonLabel": "編集を続行",
-    "kbn.dashboard.changeViewModeConfirmModal.confirmButtonLabel": "変更を破棄",
-    "kbn.dashboard.changeViewModeConfirmModal.discardChangesDescription": "変更を破棄すると、元に戻すことはできません。",
-    "kbn.dashboard.changeViewModeConfirmModal.discardChangesTitle": "ダッシュボードへの変更を破棄しますか？",
-    "kbn.dashboard.dashboardAppBreadcrumbsTitle": "ダッシュボード",
-    "kbn.dashboard.dashboardBreadcrumbsTitle": "ダッシュボード",
-    "kbn.dashboard.dashboardWasNotSavedDangerMessage": "ダッシュボード「{dashTitle}」は保存されませんでした。エラー: {errorMessage}",
-    "kbn.dashboard.dashboardWasSavedSuccessMessage": "ダッシュボード「{dashTitle}」が保存されました。",
-    "kbn.dashboard.featureCatalogue.dashboardDescription": "ビジュアライゼーションと保存された検索のコレクションの表示と共有を行います。",
-    "kbn.dashboard.featureCatalogue.dashboardTitle": "ダッシュボード",
-    "kbn.dashboard.fillDashboardTitle": "このダッシュボードは空です。コンテンツを追加しましょう！",
-    "kbn.dashboard.howToStartWorkingOnNewDashboardDescription1": "上のメニューバーの ",
-    "kbn.dashboard.howToStartWorkingOnNewDashboardDescription2": " ダッシュボードの作成を始めましょう。",
-    "kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkText": "編集",
-    "kbn.dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "あらゆる Kibana アプリからダッシュボードでデータビューを組み合わせて、すべてを 1 か所に表示できます。",
-    "kbn.dashboard.listing.createNewDashboard.createButtonLabel": "新規ダッシュボードを作成",
-    "kbn.dashboard.listing.createNewDashboard.newToKibanaDescription": "Kibana は初心者ですか？{sampleDataInstallLink} してお試しください。",
-    "kbn.dashboard.listing.createNewDashboard.sampleDataInstallLinkText": "サンプルデータをインストール",
-    "kbn.dashboard.listing.createNewDashboard.title": "初めてのダッシュボードを作成してみましょう。",
-    "kbn.dashboard.listing.dashboardsTitle": "ダッシュボード",
-    "kbn.dashboard.listing.noItemsMessage": "ダッシュボードがないようです。",
-    "kbn.dashboard.listing.table.descriptionColumnName": "説明",
-    "kbn.dashboard.listing.table.entityName": "ダッシュボード",
-    "kbn.dashboard.listing.table.entityNamePlural": "ダッシュボード",
-    "kbn.dashboard.listing.table.titleColumnName": "タイトル",
-    "kbn.dashboard.panel.unableToMigratePanelDataForSixThreeZeroErrorMessage": "「6.3.0」のダッシュボードの互換性のため、パネルデータを移行できませんでした。パネルに必要なフィールドがありません: {key}",
-    "kbn.dashboard.savedDashboard.newDashboardTitle": "新規ダッシュボード",
-    "kbn.dashboard.savedDashboardsTitle": "ダッシュボード",
-    "kbn.dashboard.stateManager.timeNotSavedWithDashboardErrorMessage": "このダッシュボードに時刻が保存されていないため、同期できません。",
-    "kbn.dashboard.strings.dashboardEditTitle": "{title} を編集中",
-    "kbn.dashboard.strings.dashboardUnsavedEditTitle": "{title} を編集中 (未保存)",
-    "kbn.dashboard.topNav.cloneModal.cancelButtonLabel": "キャンセル",
-    "kbn.dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle": "ダッシュボードのクローンを作成",
-    "kbn.dashboard.topNav.cloneModal.confirmButtonLabel": "クローンの確認",
-    "kbn.dashboard.topNav.cloneModal.confirmCloneDescription": "クローンの確認",
-    "kbn.dashboard.topNav.cloneModal.dashboardExistsDescription": "{confirmClone} をクリックして重複タイトルでダッシュボードのクローンを作成します。",
-    "kbn.dashboard.topNav.cloneModal.dashboardExistsTitle": "「{newDashboardName}」というタイトルのダッシュボードが既に存在します。",
-    "kbn.dashboard.topNav.cloneModal.enterNewNameForDashboardDescription": "ダッシュボードの新しい名前を入力してください。",
-    "kbn.dashboard.topNav.options.hideAllPanelTitlesSwitchLabel": "パネルタイトルを表示",
-    "kbn.dashboard.topNav.options.useMarginsBetweenPanelsSwitchLabel": "パネルの間に余白を使用",
-    "kbn.dashboard.topNav.saveModal.descriptionFormRowLabel": "説明",
-    "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowHelpText": "有効化すると、ダッシュボードが読み込まれるごとに現在選択された時刻の時間フィルターが変更されます。",
-    "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowLabel": "ダッシュボードに時刻を保存",
-    "kbn.dashboard.topNav.showCloneModal.dashboardCopyTitle": "{title} のコピー",
-    "kbn.dashboard.topNave.addButtonAriaLabel": "追加",
-    "kbn.dashboard.topNave.addConfigDescription": "ダッシュボードにパネルを追加します",
-    "kbn.dashboard.topNave.cancelButtonAriaLabel": "キャンセル",
-    "kbn.dashboard.topNave.cloneButtonAriaLabel": "クローンを作成",
-    "kbn.dashboard.topNave.cloneConfigDescription": "ダッシュボードのコピーを作成します",
-    "kbn.dashboard.topNave.editButtonAriaLabel": "編集",
-    "kbn.dashboard.topNave.editConfigDescription": "編集モードに切り替えます",
-    "kbn.dashboard.topNave.fullScreenButtonAriaLabel": "全画面",
-    "kbn.dashboard.topNave.fullScreenConfigDescription": "全画面モード",
-    "kbn.dashboard.topNave.optionsButtonAriaLabel": "オプション",
-    "kbn.dashboard.topNave.optionsConfigDescription": "オプション",
-    "kbn.dashboard.topNave.saveButtonAriaLabel": "保存",
-    "kbn.dashboard.topNave.saveConfigDescription": "ダッシュボードを保存します",
-    "kbn.dashboard.topNave.shareButtonAriaLabel": "共有",
-    "kbn.dashboard.topNave.shareConfigDescription": "ダッシュボードを共有します",
-    "kbn.dashboard.topNave.viewConfigDescription": "編集をキャンセルして表示限定モードに切り替えます",
-    "kbn.dashboard.urlWasRemovedInSixZeroWarningMessage": "URL「dashboard/create」は 6.0 で廃止されました。ブックマークを更新してください。",
-    "kbn.dashboard.visitVisualizeAppLinkText": "可視化アプリにアクセス",
-    "kbn.dashboardTitle": "ダッシュボード",
-    "kbn.devToolsTitle": "開発ツール",
-    "kbn.discover.backToTopLinkText": "最上部へ戻る。",
-    "kbn.discover.badge.readOnly.text": "読み込み専用",
-    "kbn.discover.badge.readOnly.tooltip": "検索を保存できません",
-    "kbn.discover.bucketIntervalTooltip": "この間隔は選択された時間範囲に表示される {bucketsDescription} が作成されるため、{bucketIntervalDescription} にスケーリングされています。",
-    "kbn.discover.bucketIntervalTooltip.tooLargeBucketsText": "大きすぎるバケット",
-    "kbn.discover.bucketIntervalTooltip.tooManyBucketsText": "バケットが多すぎます",
-    "kbn.discover.discoverBreadcrumbTitle": "ディスカバリ",
-    "kbn.discover.discoverDescription": "ドキュメントにクエリをかけたりフィルターを適用することで、データをインタラクティブに閲覧できます。",
-    "kbn.discover.discoverTitle": "ディスカバー",
-    "kbn.discover.documentsAriaLabel": "ドキュメント",
-    "kbn.discover.errorLoadingData": "データの読み込み中にエラーが発生",
-    "kbn.discover.fetchError.howToAddressErrorDescription": "このエラーは、{scriptedFields} タブにある {managementLink} の {fetchErrorScript} フィールドを編集することで解決できます。",
-    "kbn.discover.fetchError.managmentLinkText": "管理 > インデックスパターン",
-    "kbn.discover.fetchError.scriptedFieldsText": "「スクリプトフィールド」",
-    "kbn.discover.fieldChooser.detailViews.emptyStringText": "空の文字列",
-    "kbn.discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "この値を除外",
-    "kbn.discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "この値でフィルターを適用",
-    "kbn.discover.fieldChooser.detailViews.recordsText": "記録",
-    "kbn.discover.fieldChooser.detailViews.topValuesInRecordsDescription": "次の記録のトップ 5 の値",
-    "kbn.discover.fieldChooser.detailViews.visualizeLinkText": "可視化",
-    "kbn.discover.fieldChooser.detailViews.warningsText": "{warningsLength, plural, one {# 警告} other {# 警告}}",
-    "kbn.discover.fieldChooser.discoverField.addButtonLabel": "追加",
-    "kbn.discover.fieldChooser.discoverField.bucketAriaLabel": "値: {value}",
-    "kbn.discover.fieldChooser.discoverField.emptyStringText": "空の文字列",
-    "kbn.discover.fieldChooser.discoverField.removeButtonLabel": "削除",
-    "kbn.discover.fieldChooser.discoverField.scriptedFieldsTakeLongExecuteDescription": "スクリプトフィールドは実行に時間がかかる場合があります。",
-    "kbn.discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage": "ジオフィールドは分析できません。",
-    "kbn.discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage": "オブジェクトフィールドは分析できません。",
-    "kbn.discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "このフィールドは Elasticsearch マッピングに表示されますが、ドキュメントテーブルの {hitsLength} 件のドキュメントには含まれません。可視化や検索は可能な場合があります。",
-    "kbn.discover.fieldChooser.filter.aggregatableLabel": "集約可能",
-    "kbn.discover.fieldChooser.filter.availableFieldsTitle": "利用可能なフィールド",
-    "kbn.discover.fieldChooser.filter.hideMissingFieldsLabel": "未入力のフィールドを非表示",
-    "kbn.discover.fieldChooser.filter.indexAndFieldsSectionAriaLabel": "インデックスとフィールド",
-    "kbn.discover.fieldChooser.filter.popularTitle": "人気",
-    "kbn.discover.fieldChooser.filter.resetFiltersButtonLabel": "フィルターをリセット",
-    "kbn.discover.fieldChooser.filter.searchableLabel": "検索可能",
-    "kbn.discover.fieldChooser.filter.selectedFieldsTitle": "スクリプトフィールド",
-    "kbn.discover.fieldChooser.filter.typeLabel": "タイプ",
-    "kbn.discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel": "フィールド設定を非表示",
-    "kbn.discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel": "フィールド設定を表示",
-    "kbn.discover.histogramOfFoundDocumentsAriaLabel": "発見されたドキュメントのヒストグラム",
-    "kbn.discover.hitsPluralTitle": "{hits, plural, one {ヒット} other {ヒット}}",
-    "kbn.discover.howToChangeTheTimeTooltip": "時刻を変更するには、ナビゲーションバーのカレンダーアイコンをクリックします",
-    "kbn.discover.howToSeeOtherMatchingDocumentsDescription": "これらは検索条件に一致した初めの {sampleSize} 件のドキュメントです。他の結果を表示するには検索条件を絞ってください。",
-    "kbn.discover.inspectorRequestDataTitle": "データ",
-    "kbn.discover.inspectorRequestDescription": "このリクエストは Elasticsearch にクエリをかけ、検索データを取得します。",
-    "kbn.discover.localMenu.inspectTitle": "検査",
-    "kbn.discover.localMenu.localMenu.newSearchTitle": "新規",
-    "kbn.discover.localMenu.newSearchDescription": "新規検索",
-    "kbn.discover.localMenu.openInspectorForSearchDescription": "検索用にインスペクターを開きます",
-    "kbn.discover.localMenu.openSavedSearchDescription": "保存された検索を開きます",
-    "kbn.discover.localMenu.openTitle": "開く",
-    "kbn.discover.localMenu.saveSearchDescription": "検索を保存します",
-    "kbn.discover.localMenu.saveTitle": "保存",
-    "kbn.discover.localMenu.shareSearchDescription": "検索を共有します",
-    "kbn.discover.localMenu.shareTitle": "共有",
-    "kbn.discover.noResults.addressShardFailuresTitle": "シャードエラーの解決",
-    "kbn.discover.noResults.expandYourTimeRangeTitle": "時間範囲を拡大",
-    "kbn.discover.noResults.indexFailureIndexText": "インデックス {failureIndex}",
-    "kbn.discover.noResults.indexFailureShardText": "{index}、シャード {failureShard}",
-    "kbn.discover.noResults.queryMayNotMatchTitle": "表示されているインデックスの 1 つまたは複数にデータフィールドが含まれています。クエリが現在の時間範囲のデータと一致しないか、現在選択された時間範囲にデータが全く存在しない可能性があります。データが存在する時間範囲に変えることができます。",
-    "kbn.discover.noResults.requiredPluginIsNotInstalledOrDisabledTitle": "{unsupportedType} インデックスに基づくインデックスパターンには X-Pack の {unsupportedType} プラグインが必要で、このプラグインは現在インストールされていないか無効になっています。",
-    "kbn.discover.noResults.searchExamples.400to499StatusCodeExampleTitle": "400-499 のすべてのステータスコードを検索",
-    "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpExtensionExampleTitle": "400-499 の php 拡張子のステータスコードを検索",
-    "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpOrHtmlExtensionExampleTitle": "400-499 の php または html 拡張子のステータスコードを検索",
-    "kbn.discover.noResults.searchExamples.anyField200StatusCodeExampleTitle": "いずれかのフィールドに数字 200 が含まれているリクエストを検索",
-    "kbn.discover.noResults.searchExamples.howTosearchForWebServerLogsDescription": "画面上部の検索バーは、Elasticsearch の Lucene {queryStringSyntaxLink} サポートを利用します。新規フィールドにパースされたウェブサーバーログの検索方法の例は、次の通りです。",
-    "kbn.discover.noResults.searchExamples.noResultsMatchSearchCriteriaTitle": "検索条件と一致する結果がありません。",
-    "kbn.discover.noResults.searchExamples.queryStringSyntaxLinkText": "クエリ文字列の構文",
-    "kbn.discover.noResults.searchExamples.refineYourQueryTitle": "クエリの調整",
-    "kbn.discover.noResults.searchExamples.statusField200StatusCodeExampleTitle": "ステータスフィールドの 200 を検索",
-    "kbn.discover.noResults.shardFailuresDescription": "次のシャードエラーが発生しました:",
-    "kbn.discover.notifications.notSavedSearchTitle": "検索「{savedSearchTitle}」は保存されませんでした。",
-    "kbn.discover.notifications.savedSearchTitle": "検索「{savedSearchTitle}」が保存されました。",
-    "kbn.discover.painlessError.painlessScriptedFieldErrorMessage": "Painless スクリプトのフィールド「{script}」のエラー.",
-    "kbn.discover.rootBreadcrumb": "ディスカバリ",
-    "kbn.discover.savedSearch.savedObjectName": "保存された検索",
-    "kbn.discover.scaledToDescription": "{bucketIntervalDescription} にスケーリング済み",
-    "kbn.discover.searchingTitle": "検索中",
-    "kbn.discover.showingDefaultIndexPatternWarningDescription": "デフォルトのインデックスパターン「{loadedIndexPatternTitle}」 ({loadedIndexPatternId}) を表示中",
-    "kbn.discover.showingSavedIndexPatternWarningDescription": "保存されたインデックスパターン「{ownIndexPatternTitle}」 ({ownIndexPatternId}) を表示中",
-    "kbn.discover.skipToBottomButtonLabel": "最下部に移動",
-    "kbn.discover.topNav.openSearchPanel.manageSearchesButtonLabel": "検索の管理",
-    "kbn.discover.topNav.openSearchPanel.noSearchesFoundDescription": "一致する検索が見つかりませんでした。",
-    "kbn.discover.topNav.openSearchPanel.openSearchTitle": "検索を開く",
-    "kbn.discover.valueIsNotConfiguredIndexPatternIDWarningTitle": "{stateVal} は設定されたインデックスパターン ID ではありません",
-    "kbn.discoverTitle": "ディスカバリ",
-    "kbn.doc.failedToExecuteQueryDescription": "クエリの実行に失敗しました",
-    "kbn.doc.failedToLocateDocumentDescription": "ドキュメントが見つかりませんでした",
-    "kbn.doc.loadingDescription": "読み込み中…",
-    "kbn.docTable.limitedSearchResultLabel": "{resultCount} 件の結果に制限。検索結果の絞り込み。",
-    "kbn.docTable.noResultsTitle": "結果が見つかりませんでした",
-    "kbn.docTable.tableHeader.moveColumnLeftButtonAriaLabel": "{columnName} 列を左に移動",
-    "kbn.docTable.tableHeader.moveColumnLeftButtonTooltip": "列を左に移動",
-    "kbn.docTable.tableHeader.moveColumnRightButtonAriaLabel": "{columnName} 列を右に移動",
-    "kbn.docTable.tableHeader.moveColumnRightButtonTooltip": "列を右に移動",
-    "kbn.docTable.tableHeader.removeColumnButtonAriaLabel": "{columnName} 列を削除",
-    "kbn.docTable.tableHeader.removeColumnButtonTooltip": "列の削除",
-    "kbn.docTable.tableHeader.sortByColumnAscendingAriaLabel": "{columnName} を昇順に並べ替える",
-    "kbn.docTable.tableHeader.sortByColumnDescendingAriaLabel": "{columnName} を降順に並べ替える",
-    "kbn.docTable.tableRow.detailHeading": "拡張ドキュメント",
-    "kbn.docTable.tableRow.filterForValueButtonAriaLabel": "値でフィルタリング",
-    "kbn.docTable.tableRow.filterForValueButtonTooltip": "値でフィルタリング",
-    "kbn.docTable.tableRow.filterOutValueButtonAriaLabel": "値を除外",
-    "kbn.docTable.tableRow.filterOutValueButtonTooltip": "値を除外",
-    "kbn.docTable.tableRow.toggleRowDetailsButtonAriaLabel": "行の詳細を切り替える",
-    "kbn.docTable.tableRow.viewSingleDocumentLinkText": "単一のドキュメントを表示",
-    "kbn.docTable.tableRow.viewSurroundingDocumentsLinkText": "周りのドキュメントを表示",
-    "kbn.embeddable.errorTitle": "データの取得中にエラーが発生",
-    "kbn.embeddable.inspectorRequestDataTitle": "データ",
-    "kbn.embeddable.inspectorRequestDescription": "このリクエストは Elasticsearch にクエリをかけ、検索データを取得します。",
-    "kbn.home.addData.addDataToKibanaDescription": "これらのソリューションで、データを作成済みのダッシュボードと監視システムへとすぐに変えることができます。",
-    "kbn.home.addData.addDataToKibanaTitle": "Kibana にデータを追加",
-    "kbn.home.addData.apm.addApmButtonLabel": "APM を追加",
-    "kbn.home.addData.apm.nameDescription": "APM は、集約内から自動的に詳細なパフォーマンスメトリックやエラーを集めます。",
-    "kbn.home.addData.apm.nameTitle": "APM",
-    "kbn.home.addData.logging.addLogDataButtonLabel": "ログデータを追加",
-    "kbn.home.addData.logging.nameDescription": "頻繁に使用するデータソースからログを投入し、構成済みのダッシュボードで簡単に可視化できます。",
-    "kbn.home.addData.logging.nameTitle": "ログ",
-    "kbn.home.addData.metrics.addMetricsDataButtonLabel": "メトリックデータを追加",
-    "kbn.home.addData.metrics.nameDescription": "サーバーのオペレーティングシステムと実行中のサービスからメトリックを収集します。",
-    "kbn.home.addData.metrics.nameTitle": "メトリック",
-    "kbn.home.addData.sampleDataLink": "データセットと Kibana ダッシュボードを読み込む",
-    "kbn.home.addData.sampleDataTitle": "サンプルデータの追加",
-    "kbn.home.addData.uploadFileLink": "CSV、NDJSON、またはログファイルをインポート",
-    "kbn.home.addData.uploadFileTitle": "ログファイルからデータをアップロード",
-    "kbn.home.addData.yourDataLink": "Elasticsearch インデックスに接続",
-    "kbn.home.addData.yourDataTitle": "Elasticsearch データの使用",
-    "kbn.home.breadcrumbs.addDataTitle": "データの投入",
-    "kbn.home.breadcrumbs.homeTitle": "ホーム",
-    "kbn.home.directories.manage.nameTitle": "Elastic Stack の管理",
-    "kbn.home.directories.notFound.description": "お探しのものが見つかりませんでしたか？",
-    "kbn.home.directories.notFound.viewFullButtonLabel": "Kibana プラグインの完全なディレクトリを表示",
-    "kbn.home.directories.visualize.nameTitle": "データの可視化と閲覧",
-    "kbn.home.directory.directoryTitle": "ディレクトリ",
-    "kbn.home.directory.tabs.administrativeTitle": "管理",
-    "kbn.home.directory.tabs.allTitle": "すべて",
-    "kbn.home.directory.tabs.dataTitle": "データの閲覧と可視化",
-    "kbn.home.directory.tabs.otherTitle": "その他",
-    "kbn.home.exploreButtonLabel": "独りで閲覧",
-    "kbn.home.exploreYourDataDescription": "すべてのステップを終えたら、データ閲覧準備の完了です。",
-    "kbn.home.letsStartDescription": "クラスターにデータがありません。サンプルデータやダッシュボードで試すこともできますし、いきなり独自のデータを使用することもできます。",
-    "kbn.home.letsStartTitle": "始めましょう",
-    "kbn.home.loadTutorials.requestFailedErrorMessage": "リクエスト失敗、ステータスコード: {status}",
-    "kbn.home.loadTutorials.unableToLoadErrorMessage": "チュートリアルが読み込めません。",
-    "kbn.home.recentlyAccessed.recentlyViewedTitle": "最近閲覧",
-    "kbn.home.sampleDataSet.installedLabel": "{name} がインストールされました",
-    "kbn.home.sampleDataSet.unableToInstallErrorMessage": "サンプルデータセット「{name}」をインストールできません",
-    "kbn.home.sampleDataSet.unableToLoadListErrorMessage": "サンプルデータセットのリストを読み込めません",
-    "kbn.home.sampleDataSet.unableToUninstallErrorMessage": "サンプルデータセット「{name}」をアンインストールできません",
-    "kbn.home.sampleDataSet.uninstalledLabel": "{name} がアンインストールされました",
-    "kbn.home.sampleDataSetCard.addButtonAriaLabel": "{datasetName} を追加",
-    "kbn.home.sampleDataSetCard.addButtonLabel": "データの投入",
-    "kbn.home.sampleDataSetCard.addingButtonAriaLabel": "{datasetName} を追加中",
-    "kbn.home.sampleDataSetCard.addingButtonLabel": "追加中",
-    "kbn.home.sampleDataSetCard.dashboardLinkLabel": "ダッシュボード",
-    "kbn.home.sampleDataSetCard.default.addButtonAriaLabel": "{datasetName} を追加",
-    "kbn.home.sampleDataSetCard.default.addButtonLabel": "データの投入",
-    "kbn.home.sampleDataSetCard.default.unableToVerifyErrorMessage": "データセットステータスを確認できません、エラー: {statusMsg}",
-    "kbn.home.sampleDataSetCard.removeButtonAriaLabel": "{datasetName} を削除",
-    "kbn.home.sampleDataSetCard.removeButtonLabel": "削除",
-    "kbn.home.sampleDataSetCard.removingButtonAriaLabel": "{datasetName} を削除中",
-    "kbn.home.sampleDataSetCard.removingButtonLabel": "削除中",
-    "kbn.home.sampleDataSetCard.viewDataButtonAriaLabel": "{datasetName} を表示",
-    "kbn.home.sampleDataSetCard.viewDataButtonLabel": "データを表示",
-    "kbn.home.tryButtonLabel": "サンプルデータを試す",
-    "kbn.home.tutorial.addDataToKibanaTitle": "Kibana にデータを追加",
-    "kbn.home.tutorial.card.sampleDataDescription": "これらの「ワンクリック」データセットで Kibana の探索を始めましょう。",
-    "kbn.home.tutorial.card.sampleDataTitle": "サンプルデータ",
-    "kbn.home.tutorial.elasticCloudButtonLabel": "Elastic Cloud",
-    "kbn.home.tutorial.instruction.copyButtonLabel": "スニペットをコピー",
-    "kbn.home.tutorial.instructionSet.checkStatusButtonLabel": "ステータスを確認",
-    "kbn.home.tutorial.instructionSet.customizeLabel": "コードスニペットのカスタマイズ",
-    "kbn.home.tutorial.instructionSet.noDataLabel": "データが見つかりません",
-    "kbn.home.tutorial.instructionSet.statusCheckTitle": "ステータス確認",
-    "kbn.home.tutorial.instructionSet.successLabel": "成功",
-    "kbn.home.tutorial.instructionSet.toggleAriaLabel": "コマンドパラメーターの可視性を調整します",
-    "kbn.home.tutorial.introduction.betaLabel": "ベータ",
-    "kbn.home.tutorial.introduction.imageAltDescription": "プライマリダッシュボードのスクリーンショット",
-    "kbn.home.tutorial.introduction.viewButtonLabel": "エクスポートされたフィールドを表示",
-    "kbn.home.tutorial.noTutorialLabel": "チュートリアル {tutorialId} が見つかりません",
-    "kbn.home.tutorial.savedObject.addedLabel": "{savedObjectsLength} 件の保存されたオブジェクトが追加されました",
-    "kbn.home.tutorial.savedObject.confirmButtonLabel": "上書きを確定",
-    "kbn.home.tutorial.savedObject.defaultButtonLabel": "Kibana オブジェクトを読み込む",
-    "kbn.home.tutorial.savedObject.installLabel": "インデックスパターン、ビジュアライゼーション、事前定義済みのダッシュボードをインポートします。",
-    "kbn.home.tutorial.savedObject.installStatusLabel": "{savedObjectsLength} 件中 {overwriteErrorsLength} 件のオブジェクトが既に存在します。インポートして既存のオブジェクトを上書きするには、「上書きを確定」をクリックしてください。オブジェクトへの変更はすべて失われます。",
-    "kbn.home.tutorial.savedObject.loadTitle": "Kibana オブジェクトを読み込む",
-    "kbn.home.tutorial.savedObject.requestFailedErrorMessage": "リクエスト失敗、エラー: {message}",
-    "kbn.home.tutorial.savedObject.unableToAddErrorMessage": "{savedObjectsLength} 件中 {errorsLength} 件の kibana オブジェクトが追加できません、エラー: {errorMessage}",
-    "kbn.home.tutorial.selfManagedButtonLabel": "セルフマネージド",
-    "kbn.home.tutorial.tabs.allTitle": "すべて",
-    "kbn.home.tutorial.tabs.loggingTitle": "ログ",
-    "kbn.home.tutorial.tabs.metricsTitle": "メトリック",
-    "kbn.home.tutorial.tabs.sampleDataTitle": "サンプルデータ",
-    "kbn.home.tutorial.unexpectedStatusCheckStateErrorDescription": "予期せぬステータス確認ステータス {statusCheckState}",
-    "kbn.home.tutorial.unhandledInstructionTypeErrorDescription": "予期せぬ指示タイプ {visibleInstructions}",
-    "kbn.home.welcomeDescription": "Elastic Stack への開かれた窓",
-    "kbn.home.welcomeTitle": "Kibana へようこそ",
-    "kbn.management.advancedSettings.badge.readOnly.text": "読み込み専用",
-    "kbn.management.advancedSettings.badge.readOnly.tooltip": "高度な設定を保存できません",
-    "kbn.management.createIndexPattern.betaLabel": "ベータ",
-    "kbn.management.createIndexPattern.emptyState.checkDataButton": "新規データを確認",
-    "kbn.management.createIndexPattern.emptyStateHeader": "Elasticsearch データが見つかりませんでした",
-    "kbn.management.createIndexPattern.emptyStateLabel.emptyStateDetail": "{needToIndex} {learnHowLink} または {getStartedLink}",
-    "kbn.management.createIndexPattern.emptyStateLabel.getStartedLink": "サンプルデータで始めましょう。",
-    "kbn.management.createIndexPattern.emptyStateLabel.learnHowLink": "方法を学習",
-    "kbn.management.createIndexPattern.emptyStateLabel.needToIndexLabel": "インデックスパターンを作成する前に、Elasticsearch へのデータのインデックスが必要です。",
-    "kbn.management.createIndexPattern.includeSystemIndicesToggleSwitchLabel": "システムインデックスを含める",
-    "kbn.management.createIndexPattern.loadClustersFailMsg": "リモートクラスターの読み込みに失敗",
-    "kbn.management.createIndexPattern.loadIndicesFailMsg": "インデックスの読み込みに失敗",
-    "kbn.management.createIndexPattern.loadingState.checkingLabel": "Elasticsearch データを確認中",
-    "kbn.management.createIndexPattern.step.indexPattern.allowLabel": "インデックスパターンでワイルドカードとして {asterisk} を使用できます。",
-    "kbn.management.createIndexPattern.step.indexPattern.disallowLabel": "スペースや {characterList} は使用できません。",
-    "kbn.management.createIndexPattern.step.indexPatternLabel": "インデックスパターン",
-    "kbn.management.createIndexPattern.step.indexPatternPlaceholder": "index-name-*",
-    "kbn.management.createIndexPattern.step.invalidCharactersErrorMessage": "{indexPatternName} にはスペースや {characterList} は使えません。",
-    "kbn.management.createIndexPattern.step.loadingHeader": "一致するインデックスを検索中…",
-    "kbn.management.createIndexPattern.step.loadingLabel": "お待ちください…",
-    "kbn.management.createIndexPattern.step.nextStepButton": "次のステップ",
-    "kbn.management.createIndexPattern.step.pagingLabel": "ページごとの行数: {perPage}",
-    "kbn.management.createIndexPattern.step.status.matchAnyLabel.matchAnyDetail": "インデックスパターンは下の{strongIndices} の いずれかに一致します。",
-    "kbn.management.createIndexPattern.step.status.noSystemIndicesLabel": "パターンに一致する Elasticsearch インデックスがありません。",
-    "kbn.management.createIndexPattern.step.status.noSystemIndicesWithPromptLabel": "パターンに一致する Elasticsearch インデックスがありません。一致するシステムインデックスを表示するには、右上のスイッチを切り替えます。",
-    "kbn.management.createIndexPattern.step.status.notMatchLabel.allIndicesLabel": "{indicesLength, plural, one {# インデックス} other {# インデックス}}",
-    "kbn.management.createIndexPattern.step.status.notMatchLabel.notMatchDetail": "入力されたインデックスパターンがどのインデックスにも一致しません。下の {indicesLength, plural, one {} other {}}{strongIndices} と一致させることができます。",
-    "kbn.management.createIndexPattern.step.status.partialMatchLabel.partialMatchDetail": "インデックスパターンがどのインデックスとも一致ませんが、似た {matchedIndicesLength, plural, one {} other {}}{strongIndices} があります。",
-    "kbn.management.createIndexPattern.step.status.partialMatchLabel.strongIndicesLabel": "{matchedIndicesLength, plural, one {# インデックス} other {# インデックス}}",
-    "kbn.management.createIndexPattern.step.status.successLabel.strongIndicesLabel": "{indicesLength, plural, one {# インデックス} other {# インデックス}}",
-    "kbn.management.createIndexPattern.step.status.successLabel.strongSuccessLabel": "成功！",
-    "kbn.management.createIndexPattern.step.status.successLabel.successDetail": "{strongSuccess} インデックスパターンが {strongIndices} と一致しています。",
-    "kbn.management.createIndexPattern.step.warningHeader": "既に {query} という名前のインデックスパターンがあります。",
-    "kbn.management.createIndexPattern.stepHeader": "ステップ 1/2:インデックスパターンの定義",
-    "kbn.management.createIndexPattern.stepTime.backButton": "戻る",
-    "kbn.management.createIndexPattern.stepTime.createPatternButton": "インデックスパターンを作成",
-    "kbn.management.createIndexPattern.stepTime.creatingLabel": "インデックスパターンを作成中…",
-    "kbn.management.createIndexPattern.stepTime.error": "エラー",
-    "kbn.management.createIndexPattern.stepTime.field.loadingDropDown": "読み込み中…",
-    "kbn.management.createIndexPattern.stepTime.field.noTimeFieldsLabel": "このインデックスパターンに一致するインデックスには時間フィールドがありません。",
-    "kbn.management.createIndexPattern.stepTime.fieldHeader": "時間フィルターのフィールド名",
-    "kbn.management.createIndexPattern.stepTime.fieldLabel": "時間フィルターはこのフィールドを使って時間でフィールドを絞ります。",
-    "kbn.management.createIndexPattern.stepTime.fieldWarningLabel": "時間フィールドを使わないこともできますが、その場合データを時間範囲で絞ることができません。",
-    "kbn.management.createIndexPattern.stepTime.noTimeFieldOptionLabel": "時間フィルターを使用しない",
-    "kbn.management.createIndexPattern.stepTime.noTimeFieldsLabel": "このインデックスパターンに一致するインデックスには時間フィールドがありません。",
-    "kbn.management.createIndexPattern.stepTime.options.hideButton": "高度なオプションを非表示",
-    "kbn.management.createIndexPattern.stepTime.options.patternHeader": "カスタムインデックスパターン ID",
-    "kbn.management.createIndexPattern.stepTime.options.patternLabel": "Kibana はそれぞれのインデックスパターンに固有の識別子を割り当てます。固有 ID を使用しない場合は、カスタム ID を入力してください。",
-    "kbn.management.createIndexPattern.stepTime.options.patternPlaceholder": "custom-index-pattern-id",
-    "kbn.management.createIndexPattern.stepTime.options.showButton": "高度なオプションを表示",
-    "kbn.management.createIndexPattern.stepTime.patterAlreadyExists": "カスタムインデックスパターン ID が既に存在します。",
-    "kbn.management.createIndexPattern.stepTime.refreshButton": "更新",
-    "kbn.management.createIndexPattern.stepTimeHeader": "ステップ 2/2:設定の変更",
-    "kbn.management.createIndexPattern.stepTimeLabel": "{indexPattern} を {indexPatternName} に定義しました。次に、作成前に他の設定を行うことができます。",
-    "kbn.management.createIndexPatternHeader": "{indexPatternName} の作成",
-    "kbn.management.createIndexPatternLabel": "Kibana は、可視化などを目的に Elasticsearch インデックスからデータを取得するために、インデックスパターンを使用します。",
-    "kbn.management.editIndexPattern.deleteButton": "削除",
-    "kbn.management.editIndexPattern.deleteFieldButton": "削除",
-    "kbn.management.editIndexPattern.deleteHeader": "インデックスパターンを削除しますか？",
-    "kbn.management.editIndexPattern.detailsAria": "インデックスパターンの詳細",
-    "kbn.management.editIndexPattern.editFieldButton": "編集",
-    "kbn.management.editIndexPattern.fields.allLangsDropDown": "すべての言語",
-    "kbn.management.editIndexPattern.fields.allTypesDropDown": "すべてのフィールドタイプ",
-    "kbn.management.editIndexPattern.fields.filterAria": "フィルター",
-    "kbn.management.editIndexPattern.fields.filterPlaceholder": "フィルター",
-    "kbn.management.editIndexPattern.fields.table.additionalInfoAriaLabel": "追加フィールド情報",
-    "kbn.management.editIndexPattern.fields.table.aggregatableDescription": "これらのフィールドはビジュアライゼーションの集約に使用できます",
-    "kbn.management.editIndexPattern.fields.table.aggregatableLabel": "集約可能",
-    "kbn.management.editIndexPattern.fields.table.editDescription": "編集",
-    "kbn.management.editIndexPattern.fields.table.editLabel": "編集",
-    "kbn.management.editIndexPattern.fields.table.excludedDescription": "取得の際に _source から除外されるフィールドです",
-    "kbn.management.editIndexPattern.fields.table.excludedLabel": "除外",
-    "kbn.management.editIndexPattern.fields.table.formatHeader": "フォーマット",
-    "kbn.management.editIndexPattern.fields.table.isAggregatableAria": "は集約可能です",
-    "kbn.management.editIndexPattern.fields.table.isExcludedAria": "は除外されています",
-    "kbn.management.editIndexPattern.fields.table.isSearchableAria": "は検索可能です",
-    "kbn.management.editIndexPattern.fields.table.multiTypeAria": "複数タイプのフィールド",
-    "kbn.management.editIndexPattern.fields.table.multiTypeTooltip": "フィールドのタイプがインデックスごとに変わります。多くの分析機能には使用できません。",
-    "kbn.management.editIndexPattern.fields.table.nameHeader": "名前",
-    "kbn.management.editIndexPattern.fields.table.primaryTimeAriaLabel": "プライマリ時間フィールド",
-    "kbn.management.editIndexPattern.fields.table.primaryTimeTooltip": "このフィールドはイベントの発生時刻を表します。",
-    "kbn.management.editIndexPattern.fields.table.searchableDescription": "これらのフィールドはフィルターバーで使用できます",
-    "kbn.management.editIndexPattern.fields.table.searchableHeader": "検索可能",
-    "kbn.management.editIndexPattern.fields.table.typeHeader": "タイプ",
-    "kbn.management.editIndexPattern.mappingConflictHeader": "マッピングの矛盾",
-    "kbn.management.editIndexPattern.mappingConflictLabel": "{conflictFieldsLength, plural, one {フィールドが} other {# フィールドが}}このパターンと一致するインデックスの間で異なるタイプ (文字列、整数など) に定義されています。これらの矛盾したフィールドは Kibana の一部で使用できますが、Kibana がタイプを把握しなければならない機能には使用できません。この問題を修正するにはデータのレンダリングが必要です。",
-    "kbn.management.editIndexPattern.notDateErrorMessage": "このフィールドは日付ではなく {fieldType} です。",
-    "kbn.management.editIndexPattern.refreshAria": "フィールドリストを再度読み込みます",
-    "kbn.management.editIndexPattern.refreshButton": "更新",
-    "kbn.management.editIndexPattern.refreshHeader": "フィールドリストを更新しますか？",
-    "kbn.management.editIndexPattern.refreshLabel": "この操作は各フィールドの使用頻度をリセットします。",
-    "kbn.management.editIndexPattern.refreshTooltip": "フィールドリストを更新",
-    "kbn.management.editIndexPattern.removeAria": "インデックスパターンを削除",
-    "kbn.management.editIndexPattern.removeTooltip": "インデックスパターンを削除います",
-    "kbn.management.editIndexPattern.scripted.addFieldButton": "スクリプトフィールドを追加",
-    "kbn.management.editIndexPattern.scripted.deleteField.cancelButton": "キャンセル",
-    "kbn.management.editIndexPattern.scripted.deleteField.deleteButton": "削除",
-    "kbn.management.editIndexPattern.scripted.deleteFieldLabel": "スクリプトフィールド「{fieldName}」を削除しますか？",
-    "kbn.management.editIndexPattern.scripted.deprecationLangHeader": "廃止された言語が使用されています",
-    "kbn.management.editIndexPattern.scripted.deprecationLangLabel.deprecationLangDetail": "次の廃止された言語が使用されています: {deprecatedLangsInUse}これらの言語は、Kibana と Elasticsearch の次のメジャーなバージョンでサポートされなくなります。問題を避けるため、スクリプトフィールドを {link} に変換してください。",
-    "kbn.management.editIndexPattern.scripted.deprecationLangLabel.painlessDescription": "パターン",
-    "kbn.management.editIndexPattern.scripted.newFieldPlaceholder": "新規スクリプトフィールド",
-    "kbn.management.editIndexPattern.scripted.noFieldLabel": "「{indexPatternTitle}」インデックスパターンには「{fieldName}」というスクリプトフィールドがありません",
-    "kbn.management.editIndexPattern.scripted.table.deleteDescription": "このフィールドを削除します",
-    "kbn.management.editIndexPattern.scripted.table.deleteHeader": "削除",
-    "kbn.management.editIndexPattern.scripted.table.editDescription": "このフィールドを編集します",
-    "kbn.management.editIndexPattern.scripted.table.editHeader": "編集",
-    "kbn.management.editIndexPattern.scripted.table.formatDescription": "フィールドに使用されているフォーマットです",
-    "kbn.management.editIndexPattern.scripted.table.formatHeader": "フォーマット",
-    "kbn.management.editIndexPattern.scripted.table.langDescription": "フィールドに使用されている言語です",
-    "kbn.management.editIndexPattern.scripted.table.langHeader": "言語",
-    "kbn.management.editIndexPattern.scripted.table.nameDescription": "フィールドの名前です",
-    "kbn.management.editIndexPattern.scripted.table.nameHeader": "名前",
-    "kbn.management.editIndexPattern.scripted.table.scriptDescription": "フィールドのスクリプトです",
-    "kbn.management.editIndexPattern.scripted.table.scriptHeader": "スクリプト",
-    "kbn.management.editIndexPattern.scripted.unknownModeErrorMessage": "不明なフィールド設定モード {mode}",
-    "kbn.management.editIndexPattern.scriptedHeader": "スクリプトフィールド",
-    "kbn.management.editIndexPattern.scriptedLabel": "ビジュアライゼーションにスクリプトフィールドを使用し、ドキュメントに表示させることができます。但し、スクリプトフィールドは検索できません。",
-    "kbn.management.editIndexPattern.setDefaultAria": "デフォルトのインデックスに設定",
-    "kbn.management.editIndexPattern.setDefaultTooltip": "デフォルトのインデックスに設定します",
-    "kbn.management.editIndexPattern.source.addButtonLabel": "追加",
-    "kbn.management.editIndexPattern.source.deleteFilter.cancelButtonLabel": "キャンセル",
-    "kbn.management.editIndexPattern.source.deleteFilter.deleteButtonLabel": "削除",
-    "kbn.management.editIndexPattern.source.deleteSourceFilterLabel": "ソースフィルター「{value}」を削除しますか？",
-    "kbn.management.editIndexPattern.source.noteLabel": "下の表で、マルチフィールドが一致として誤って表示されます。これらのフィルターは、オリジナルのソースドキュメントの\\フィールドのみに適用されるため、一致するマルチフィールドはフィルタリングされません。",
-    "kbn.management.editIndexPattern.source.table.cancelAria": "キャンセル",
-    "kbn.management.editIndexPattern.source.table.deleteAria": "削除",
-    "kbn.management.editIndexPattern.source.table.editAria": "編集",
-    "kbn.management.editIndexPattern.source.table.filterDescription": "フィルター名",
-    "kbn.management.editIndexPattern.source.table.filterHeader": "フィルター",
-    "kbn.management.editIndexPattern.source.table.matchesDescription": "フィールドに使用されている言語です",
-    "kbn.management.editIndexPattern.source.table.matchesHeader": "一致",
-    "kbn.management.editIndexPattern.source.table.notMatchedLabel": "ソースフィルターが既知のフィールドと一致しません。",
-    "kbn.management.editIndexPattern.source.table.saveAria": "保存",
-    "kbn.management.editIndexPattern.sourceHeader": "ソースフィルター",
-    "kbn.management.editIndexPattern.sourceLabel": "ソースフィルターは、ドキュメントソースの取得時に 1 つまたは複数のフィールドを除外するのに使用される場合もあります。これはディスカバリアプリでのドキュメントの表示中、またはダッシュボードアプリの保存された検索の結果を表示する表で起こります。それぞれの行は 1 つのドキュメントのソースで作成されており、ドキュメントに大きなフィールドや重要ではないフィールドが含まれている場合、このレベルでフィルターで除外すると良いかもしれません。",
-    "kbn.management.editIndexPattern.sourcePlaceholder": "ソースフィルター、ワイルドカード使用可 (例: 「user」と入力して「user」で始まるフィールドをフィルタリング)",
-    "kbn.management.editIndexPattern.tabs.fieldsHeader": "フィールド",
-    "kbn.management.editIndexPattern.tabs.scriptedHeader": "スクリプトフィールド",
-    "kbn.management.editIndexPattern.tabs.sourceHeader": "ソースフィルター",
-    "kbn.management.editIndexPattern.timeFilterHeader": "時間フィルターフィールド名: {timeFieldName}",
-    "kbn.management.editIndexPattern.timeFilterLabel.mappingAPILink": "マッピング API",
-    "kbn.management.editIndexPattern.timeFilterLabel.timeFilterDetail": "このページは {indexPatternTitle} インデックス内のすべてのフィールドと、Elasticsearch に記録された各フィールドのコアタイプを一覧表示します。フィールドタイプを変更するには Elasticsearch を使用します",
-    "kbn.management.editIndexPatternLiveRegionAriaLabel": "インデックスパターン",
-    "kbn.management.indexPattern.confirmOverwriteButton": "上書き",
-    "kbn.management.indexPattern.confirmOverwriteLabel": "「{title}」に上書きしてよろしいですか？",
-    "kbn.management.indexPattern.confirmOverwriteTitle": "{type} を上書きしますか？",
-    "kbn.management.indexPattern.sectionsHeader": "インデックスパターン",
-    "kbn.management.indexPattern.titleExistsLabel": "「{title}」というタイトルのインデックスパターンが既に存在します。",
-    "kbn.management.indexPatternHeader": "インデックスパターン",
-    "kbn.management.indexPatternLabel": "Elasticsearch からのデータの取得に役立つインデックスパターンを管理します。",
-    "kbn.management.indexPatternList.createButton.betaLabel": "ベータ",
-    "kbn.management.indexPatternPrompt.exampleOne": "チャートを作成したりコンテンツを素早くクエリできるように log-west-001 という名前の単一のデータソースをインデックスします。",
-    "kbn.management.indexPatternPrompt.exampleOneTitle": "単一のデータソース",
-    "kbn.management.indexPatternPrompt.examplesTitle": "インデックスパターンの例",
-    "kbn.management.indexPatternPrompt.exampleThree": "比較目的に履歴の動向を集約できるよう、これらのログのアーカイブされた月々のロールアップメトリックスを指定通りに別々のインデックスパターンにグループ分けします。",
-    "kbn.management.indexPatternPrompt.exampleThreeTitle": "カスタムグルーピング",
-    "kbn.management.indexPatternPrompt.exampleTwo": "すべての西海岸のサーバーログに対してクエリを実行できるように、頭に「log-west」の付いたすべての受信データソースをグループ化します。",
-    "kbn.management.indexPatternPrompt.exampleTwoTitle": "複数データソース",
-    "kbn.management.indexPatternPrompt.subtitle": "インデックスパターンは、Kibana で共有フィールドにクエリを実行できるよう、種類の異なるデータソースをバケットにまとめることができます。",
-    "kbn.management.indexPatternPrompt.title": "インデックスパターンについて",
-    "kbn.management.indexPatterns.badge.readOnly.text": "読み込み専用",
-    "kbn.management.indexPatterns.badge.readOnly.tooltip": "インデックスパターンを保存できません",
-    "kbn.management.indexPatterns.createBreadcrumb": "インデックスパターンを作成",
-    "kbn.management.indexPatterns.createFieldBreadcrumb": "フィールドを作成",
-    "kbn.management.indexPatterns.listBreadcrumb": "インデックスパターン",
-    "kbn.management.indexPatternTable.createBtn": "インデックスパターンの作成",
-    "kbn.management.indexPatternTable.title": "インデックスパターン",
-    "kbn.management.landing.header": "Kibana {version} 管理",
-    "kbn.management.landing.subhead": "インデックス、インデックスパターン、保存されたオブジェクト、Kibana の設定、その他を管理します。",
-    "kbn.management.landing.text": "すべてのツールの一覧は、左のメニューにあります。",
-    "kbn.management.managementDescription": "Elastic Stack の管理を行うセンターコンソールです。",
-    "kbn.management.managementLabel": "管理",
-    "kbn.management.objects.confirmModalOptions.deleteButtonLabel": "削除",
-    "kbn.management.objects.confirmModalOptions.modalDescription": "削除されたオブジェクトは復元できません",
-    "kbn.management.objects.confirmModalOptions.modalTitle": "保存された Kibana オブジェクトを削除しますか？",
-    "kbn.management.objects.deleteSavedObjectsConfirmModalDescription": "この操作は次の保存されたオブジェクトを削除します:",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel": "キャンセル",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel": "削除",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteProcessButtonLabel": "削除中…",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.idColumnName": "ID",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName": "タイトル",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.typeColumnName": "タイプ",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModalTitle": "保存されたオブジェクトの削除",
-    "kbn.management.objects.objectsTable.export.dangerNotification": "エクスポートを生成できません",
-    "kbn.management.objects.objectsTable.export.successNotification": "ファイルはバックグラウンドでダウンロード中です",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.cancelButtonLabel": "キャンセル",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel": "すべてエクスポート:",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportOptionsLabel": "オプション",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel": "関連オブジェクトを含める",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModalDescription": "エクスポートするタイプを選択してください",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModalTitle": "{filteredItemCount, plural, one{# オブジェクト} other {# オブジェクト}}をエクスポート",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.resolvingConflictsLoadingMessage": "矛盾を解決中…",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage": "失敗したオブジェクトを再試行中…",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage": "保存された検索が正しくリンクされていることを確認してください…",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage": "矛盾を保存中…",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteBody": "{title} を上書きしてよろしいですか？",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteCancelButtonText": "キャンセル",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteOverwriteButtonText": "上書き",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteTitle": "{type} を上書きしますか？",
-    "kbn.management.objects.objectsTable.flyout.errorCalloutTitle": "申し訳ございませんが、エラーが発生しました",
-    "kbn.management.objects.objectsTable.flyout.import.cancelButtonLabel": "キャンセル",
-    "kbn.management.objects.objectsTable.flyout.import.confirmButtonLabel": "インポート",
-    "kbn.management.objects.objectsTable.flyout.importFailedDescription": "{totalImportCount} 個中 {failedImportCount} 個のオブジェクトのインポートに失敗しました。インポート失敗",
-    "kbn.management.objects.objectsTable.flyout.importFailedMissingReference": "{type} [id={id}] は {refType} [id={refId}] を見つけられませんでした",
-    "kbn.management.objects.objectsTable.flyout.importFailedTitle": "インポート失敗",
-    "kbn.management.objects.objectsTable.flyout.importFailedUnsupportedType": "{type} [id={id}] サポートされていないタイプ",
-    "kbn.management.objects.objectsTable.flyout.importFileErrorMessage": "ファイルを処理できませんでした。",
-    "kbn.management.objects.objectsTable.flyout.importLegacyFileErrorMessage": "ファイルを処理できませんでした。",
-    "kbn.management.objects.objectsTable.flyout.importPromptText": "インポート",
-    "kbn.management.objects.objectsTable.flyout.importSavedObjectTitle": "保存されたオブジェクトのインポート",
-    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "すべての変更を確定",
-    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完了",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulCallout.noObjectsImportedTitle": "オブジェクトがインポートされませんでした",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulDescription": "{importCount} 個のオブジェクトがインポートされました。",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulTitle": "インポート成功",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "新規インデックスパターンを作成",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsDescription": "次の保存されたオブジェクトは、存在しないインデックスパターンを使用しています。別のデックスパターンを選択してください。必要に応じて {indexPatternLink} できます。",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsTitle": "インデックスパターンの矛盾",
-    "kbn.management.objects.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage": "保存されたオブジェクトのファイル形式が無効なため、インポートできません。",
-    "kbn.management.objects.objectsTable.flyout.legacyFileUsedBody": "最新のレポートで NDJSON ファイルを作成すれば完了です。",
-    "kbn.management.objects.objectsTable.flyout.legacyFileUsedTitle": "JSON ファイルのサポートが終了します",
-    "kbn.management.objects.objectsTable.flyout.overwriteSavedObjectsLabel": "すべての保存されたオブジェクトを自動的に上書きしますか？",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountDescription": "影響されるオブジェクトの数です",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountName": "カウント",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdDescription": "インデックスパターンの ID です",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdName": "ID",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新規インデックスパターン",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "影響されるオブジェクトのサンプルです",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "影響されるオブジェクトのサンプル",
-    "kbn.management.objects.objectsTable.flyout.resolveImportErrorsFileErrorMessage": "ファイルを処理できませんでした。",
-    "kbn.management.objects.objectsTable.flyout.selectFileToImportFormRowLabel": "インポートするファイルを選択してください",
-    "kbn.management.objects.objectsTable.header.exportButtonLabel": "{filteredCount, plural, one{# オブジェクト} other {# オブジェクト}}をエクスポート",
-    "kbn.management.objects.objectsTable.header.importButtonLabel": "インポート",
-    "kbn.management.objects.objectsTable.header.refreshButtonLabel": "更新",
-    "kbn.management.objects.objectsTable.header.savedObjectsTitle": "保存されたオブジェクト",
-    "kbn.management.objects.objectsTable.howToDeleteSavedObjectsDescription": "ここから保存された検索などの保存されたオブジェクトを削除できます。保存されたオブジェクトの生データを編集することもできます。通常、オブジェクトは関連アプリケーションでのみ編集され、こｎ画面で編集するよりもそちらのほうが賢明です。",
-    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionDescription": "この保存されたオブジェクトを確認してください",
-    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionName": "検査",
-    "kbn.management.objects.objectsTable.relationships.columnActionsName": "アクション",
-    "kbn.management.objects.objectsTable.relationships.columnRelationship.childAsValue": "子",
-    "kbn.management.objects.objectsTable.relationships.columnRelationship.parentAsValue": "ペアレント",
-    "kbn.management.objects.objectsTable.relationships.columnRelationshipName": "直接関係",
-    "kbn.management.objects.objectsTable.relationships.columnTitleDescription": "保存されたオブジェクトのタイトルです",
-    "kbn.management.objects.objectsTable.relationships.columnTitleName": "タイトル",
-    "kbn.management.objects.objectsTable.relationships.columnTypeDescription": "保存されたオブジェクトのタイプです",
-    "kbn.management.objects.objectsTable.relationships.columnTypeName": "タイプ",
-    "kbn.management.objects.objectsTable.relationships.relationshipsTitle": "{title} に関連する保存されたオブジェクトはこちらです。この {type} を削除すると、親オブジェクトに影響がありますが、子オブジェクトには影響はありません。",
-    "kbn.management.objects.objectsTable.relationships.renderErrorMessage": "エラー",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.childAsValue.view": "子",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.name": "直接関係",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.parentAsValue.view": "親",
-    "kbn.management.objects.objectsTable.relationships.search.filters.type.name": "タイプ",
-    "kbn.management.objects.objectsTable.searchBar.unableToParseQueryErrorMessage": "クエリをパースできません",
-    "kbn.management.objects.objectsTable.table.columnActions.inspectActionDescription": "この保存されたオブジェクトを確認してください",
-    "kbn.management.objects.objectsTable.table.columnActions.inspectActionName": "検査",
-    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionDescription": "この保存されたオブジェクトと他の保存されたオブジェクトとの関係性を表示します",
-    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionName": "関係性",
-    "kbn.management.objects.objectsTable.table.columnActionsName": "アクション",
-    "kbn.management.objects.objectsTable.table.columnTitleDescription": "保存されたオブジェクトのタイトルです",
-    "kbn.management.objects.objectsTable.table.columnTitleName": "タイトル",
-    "kbn.management.objects.objectsTable.table.columnTypeDescription": "保存されたオブジェクトのタイプです",
-    "kbn.management.objects.objectsTable.table.columnTypeName": "タイプ",
-    "kbn.management.objects.objectsTable.table.deleteButtonLabel": "削除",
-    "kbn.management.objects.objectsTable.table.deleteButtonTitle": "保存されたオブジェクトを削除できません",
-    "kbn.management.objects.objectsTable.table.exportButtonLabel": "エクスポート",
-    "kbn.management.objects.objectsTable.table.exportPopoverButtonLabel": "エクスポート",
-    "kbn.management.objects.objectsTable.table.typeFilterName": "タイプ",
-    "kbn.management.objects.objectsTable.unableFindSavedObjectsNotificationMessage": "保存されたオブジェクトが見つかりません",
-    "kbn.management.objects.parsingFieldErrorMessage": "{fieldName} をインデックスパターン {indexName} 用にパース中にエラーが発生しました: {errorMessage}",
-    "kbn.management.objects.savedObjectsDescription": "保存された検索、ビジュアライゼーション、ダッシュボードのインポート、エクスポート、管理を行います",
-    "kbn.management.objects.savedObjectsSectionLabel": "保存されたオブジェクト",
-    "kbn.management.objects.savedObjectsTitle": "保存されたオブジェクト",
-    "kbn.management.objects.view.cancelButtonAriaLabel": "キャンセル",
-    "kbn.management.objects.view.cancelButtonLabel": "キャンセル",
-    "kbn.management.objects.view.deleteItemButtonLabel": "{title} を削除",
-    "kbn.management.objects.view.editItemTitle": "{title} の編集",
-    "kbn.management.objects.view.fieldDoesNotExistErrorMessage": "このオブジェクトに関連付けられたフィールドは、現在このインデックスパターンに存在しません。",
-    "kbn.management.objects.view.howToFixErrorDescription": "このエラーの原因がわかる場合は修正してください。わからない場合は上の削除ボタンをクリックしてください。",
-    "kbn.management.objects.view.howToModifyObjectDescription": " オブジェクトの編集は上級ユーザー向けです。オブジェクトのプロパティが検証されておらず、無効なオブジェクトはエラー、データ損失、またはそれ以上の問題の原因となります。コードを熟知した人に指示されていない限り、この設定は変更しない方が無難です。",
-    "kbn.management.objects.view.howToModifyObjectTitle": "十分ご注意ください！",
-    "kbn.management.objects.view.indexPatternDoesNotExistErrorMessage": "このオブジェクトに関連付けられたインデックスパターンは現在存在しません。",
-    "kbn.management.objects.view.saveButtonAriaLabel": "{ title }  オブジェクトを保存",
-    "kbn.management.objects.view.saveButtonLabel": "{ title }  オブジェクトを保存",
-    "kbn.management.objects.view.savedObjectProblemErrorMessage": "この保存されたオブジェクトに問題があります",
-    "kbn.management.objects.view.savedSearchDoesNotExistErrorMessage": "このオブジェクトに関連付けられた保存された検索は現在存在しません。",
-    "kbn.management.objects.view.viewItemButtonLabel": "{title} を表示",
-    "kbn.management.objects.view.viewItemTitle": "{title} を表示",
-    "kbn.management.savedObjects.editBreadcrumb": "{savedObjectType} を編集",
-    "kbn.management.savedObjects.indexBreadcrumb": "保存されたオブジェクト",
-    "kbn.management.settings.advancedSettingsDescription": "Kibana の動作を管理する設定を直接変更します。",
-    "kbn.management.settings.advancedSettingsLabel": "高度な設定",
-    "kbn.management.settings.breadcrumb": "高度な設定",
-    "kbn.management.settings.callOutCautionDescription": "これらの設定は非常に上級ユーザー向けなのでご注意ください。ここでの変更は Kibana の重要な部分に不具合を生じさせる可能性があります。これらの設定はドキュメントに記載されていなかったり、サポートされていなかったり、実験的であったりします。フィールドにデフォルトの値が設定されている場合、そのフィールドを未入力のままにするとデフォルトに戻り、他の構成により利用できない可能性があります。カスタム設定を削除すると、Kibana の構成から永久に削除されます。",
-    "kbn.management.settings.callOutCautionTitle": "注意:不具合が起こる可能性があります",
-    "kbn.management.settings.categoryNames.dashboardLabel": "ダッシュボード",
-    "kbn.management.settings.categoryNames.discoverLabel": "ディスカバリ",
-    "kbn.management.settings.categoryNames.generalLabel": "一般",
-    "kbn.management.settings.categoryNames.notificationsLabel": "通知",
-    "kbn.management.settings.categoryNames.reportingLabel": "レポート",
-    "kbn.management.settings.categoryNames.searchLabel": "検索",
-    "kbn.management.settings.categoryNames.timelionLabel": "Timelion",
-    "kbn.management.settings.categoryNames.visualizationsLabel": "ビジュアライゼーション",
-    "kbn.management.settings.categorySearchLabel": "カテゴリー",
-    "kbn.management.settings.field.cancelEditingButtonAriaLabel": "{ariaName} の編集をキャンセル",
-    "kbn.management.settings.field.cancelEditingButtonLabel": "キャンセル",
-    "kbn.management.settings.field.changeImageLinkAriaLabel": "{ariaName} を変更",
-    "kbn.management.settings.field.changeImageLinkText": "画像を変更",
-    "kbn.management.settings.field.codeEditorSyntaxErrorMessage": "無効な JSON 構文",
-    "kbn.management.settings.field.customSettingAriaLabel": "カスタム設定",
-    "kbn.management.settings.field.customSettingTooltip": "カスタム設定",
-    "kbn.management.settings.field.defaultValueText": "デフォルト: {value}",
-    "kbn.management.settings.field.defaultValueTypeJsonText": "デフォルト: {value}",
-    "kbn.management.settings.field.helpText": "この設定は Kibana サーバーにより上書きされ、変更することはできません。",
-    "kbn.management.settings.field.imageChangeErrorMessage": "画像を保存できませんでした",
-    "kbn.management.settings.field.offLabel": "オフ",
-    "kbn.management.settings.field.onLabel": "オン",
-    "kbn.management.settings.field.requiresPageReloadToastButtonLabel": "ページを再読み込み",
-    "kbn.management.settings.field.requiresPageReloadToastDescription": "「{settingName}」設定を有効にするには、ページを再読み込みしてください。",
-    "kbn.management.settings.field.resetFieldErrorMessage": "{name} をリセットできませんでした",
-    "kbn.management.settings.field.resetToDefaultLinkAriaLabel": "{ariaName} をデフォルトにリセット",
-    "kbn.management.settings.field.resetToDefaultLinkText": "デフォルトにリセット",
-    "kbn.management.settings.field.saveButtonAriaLabel": "{ariaName} を保存",
-    "kbn.management.settings.field.saveButtonLabel": "保存",
-    "kbn.management.settings.field.saveFieldErrorMessage": "{name} を保存できませんでした",
-    "kbn.management.settings.form.clearNoSearchResultText": "(検索結果を消去)",
-    "kbn.management.settings.form.clearSearchResultText": "(検索結果を消去)",
-    "kbn.management.settings.form.noSearchResultText": "設定が見つかりませんでした {clearSearch}",
-    "kbn.management.settings.form.searchResultText": "検索用語により {settingsCount} 件の設定が非表示になっています {clearSearch}",
-    "kbn.management.settings.pageTitle": "設定",
-    "kbn.management.settings.searchBar.unableToParseQueryErrorMessage": "クエリをパースできません",
-    "kbn.management.settings.searchBarAriaLabel": "高度な設定を検索",
-    "kbn.management.settings.sectionLabel": "高度な設定",
-    "kbn.managementTitle": "管理",
-    "kbn.server.tutorials.aerospikeMetrics.artifacts.application.label": "ディスカバリ",
-    "kbn.server.tutorials.aerospikeMetrics.longDescription": "「aerospike」Metricbeat モジュールは、Aerospike から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.aerospikeMetrics.nameTitle": "Aerospike メトリック",
-    "kbn.server.tutorials.aerospikeMetrics.shortDescription": "Aerospike サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.apacheLogs.artifacts.dashboards.linkLabel": "Apache ログダッシュボード",
-    "kbn.server.tutorials.apacheLogs.longDescription": "apache Filebeat モジュールが、Apache 2 HTTP サーバーにより作成されたアクセスとエラーのログをパースします。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.apacheLogs.nameTitle": "Apache ログ",
-    "kbn.server.tutorials.apacheLogs.shortDescription": "Apache HTTP サーバーが作成したアクセスとエラーのログを収集しパースします。",
-    "kbn.server.tutorials.apacheMetrics.artifacts.dashboards.linkLabel": "Apache メトリックダッシュボード",
-    "kbn.server.tutorials.apacheMetrics.longDescription": "「apache」Metricbeat モジュールは、Apache 2 HTTP サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.apacheMetrics.nameTitle": "Apache メトリック",
-    "kbn.server.tutorials.apacheMetrics.shortDescription": "Apache 2 HTTP サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.apm.apmAgents.statusCheck.btnLabel": "エージェントステータスを確認",
-    "kbn.server.tutorials.apm.apmAgents.statusCheck.errorMessage": "エージェントからまだデータを受け取っていません",
-    "kbn.server.tutorials.apm.apmAgents.statusCheck.successMessage": "1 つまたは複数のエージェントからデータを受け取りました",
-    "kbn.server.tutorials.apm.apmAgents.statusCheck.text": "アプリケーションが実行されていてエージェントがデータを送信していることを確認してください。",
-    "kbn.server.tutorials.apm.apmAgents.statusCheck.title": "エージェントステータス",
-    "kbn.server.tutorials.apm.apmAgents.title": "APM エージェント",
-    "kbn.server.tutorials.apm.apmServer.statusCheck.btnLabel": "APM Server ステータスを確認",
-    "kbn.server.tutorials.apm.apmServer.statusCheck.errorMessage": "APM Server がまだ Elasticsearch に接続されていません",
-    "kbn.server.tutorials.apm.apmServer.statusCheck.successMessage": "APM Server が正常にセットアップされました",
-    "kbn.server.tutorials.apm.apmServer.statusCheck.text": "APM エージェントの導入を開始する前に、APM Server が実行されていることを確認してください。",
-    "kbn.server.tutorials.apm.apmServer.statusCheck.title": "APM Server ステータス",
-    "kbn.server.tutorials.apm.apmServer.title": "APM Server",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.addAgentComment": "インストールされたアプリにエージェントを追加します",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.addTracingMiddlewareComment": "パフォーマンスメトリックを送信するには、追跡ミドルウェアを追加します:",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.allowedCharactersComment": "a-z、A-Z、0-9、-、_、スペース",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.setCustomApmServerUrlComment": "カスタム APM Server URL (デフォルト: {defaultApmServerUrl})",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.setRequiredServiceNameComment": "必要なサーバー名を設定します。使用できる文字:",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.useIfApmServerRequiresTokenComment": "APM Serverにトークンが必要な場合に使います",
-    "kbn.server.tutorials.apm.djangoClient.configure.textPost": "高度な用途に関しては [ドキュメンテーション]({documentationLink}) を参照してください。",
-    "kbn.server.tutorials.apm.djangoClient.configure.textPre": "エージェントとは、アプリケーションプロセス内で実行されるライブラリです。APM サービスは「SERVICE_NAME」に基づきプログラムに従って作成されます。",
-    "kbn.server.tutorials.apm.djangoClient.configure.title": "エージェントの構成",
-    "kbn.server.tutorials.apm.djangoClient.install.textPre": "Python 用の APM エージェントを依存関係としてインストールします。",
-    "kbn.server.tutorials.apm.djangoClient.install.title": "APM エージェントのインストール",
-    "kbn.server.tutorials.apm.dotNetClient.configureAgent.textPost": "エージェントに「IConfiguration」インスタンスが渡されていない場合、(例: 非 ASP.NET Core アプリケーションの場合)、エージェントを環境変数で構成することもできます。\n       高度な用途に関しては [ドキュメンテーション]({documentationLink}) を参照してください。",
-    "kbn.server.tutorials.apm.dotNetClient.configureAgent.title": "appsettings.json ファイルの例:",
-    "kbn.server.tutorials.apm.dotNetClient.configureApplication.textPost": "「IConfiguration」インスタンスを渡すのはオプションで、これにより、エージェントはこの「IConfiguration」インスタンス (例: 「appsettings.json」ファイル) から構成を読み込みます。",
-    "kbn.server.tutorials.apm.dotNetClient.configureApplication.textPre": "「Elastic.Apm.NetCoreAll」パッケージの ASP.NET Core の場合、「Startup.cs」ファイル内の「Configure」メソドの「UseElasticApm」メソドを呼び出します。",
-    "kbn.server.tutorials.apm.dotNetClient.configureApplication.title": "エージェントをアプリケーションに追加",
-    "kbn.server.tutorials.apm.dotNetClient.download.title": "APM エージェントのダウンロード",
-    "kbn.server.tutorials.apm.downloadServer.title": "APM Server をダウンロードして展開します",
-    "kbn.server.tutorials.apm.downloadServerRpm": "32 ビットパッケージをお探しですか？[ダウンロードページ]({downloadPageLink}) をご覧ください。",
-    "kbn.server.tutorials.apm.downloadServerTitle": "32 ビットパッケージをお探しですか？[ダウンロードページ]({downloadPageLink}) をご覧ください。",
-    "kbn.server.tutorials.apm.editConfig.textPre": "Elastic Stack の X-Pack セキュアバージョンをご使用の場合、「apm-server.yml」構成ファイルで認証情報を指定する必要があります。",
-    "kbn.server.tutorials.apm.editConfig.title": "構成の変更",
-    "kbn.server.tutorials.apm.elasticCloudInstructions.title": "APM エージェント",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.allowedCharactersComment": "a-z、A-Z、0-9、-、_、スペース",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.configureElasticApmComment": "またはアプリケーションの設定で ELASTIC_APM を使用するよう構成します。",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.initializeUsingEnvironmentVariablesComment": "環境変数を使用して初期化します",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.setCustomApmServerUrlComment": "カスタム APM Server URL (デフォルト: {defaultApmServerUrl})",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.setRequiredServiceNameComment": "必要なサーバー名を設定します。使用できる文字:",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.useIfApmServerRequiresTokenComment": "APM Serverにトークンが必要な場合に使います",
-    "kbn.server.tutorials.apm.flaskClient.configure.textPost": "高度な用途に関しては [ドキュメンテーション]({documentationLink}) を参照してください。",
-    "kbn.server.tutorials.apm.flaskClient.configure.textPre": "エージェントとは、アプリケーションプロセス内で実行されるライブラリです。APM サービスは「SERVICE_NAME」に基づきプログラムに従って作成されます。",
-    "kbn.server.tutorials.apm.flaskClient.configure.title": "エージェントの構成",
-    "kbn.server.tutorials.apm.flaskClient.install.textPre": "Python 用の APM エージェントを依存関係としてインストールします。",
-    "kbn.server.tutorials.apm.flaskClient.install.title": "APM エージェントのインストール",
-    "kbn.server.tutorials.apm.goClient.configure.commands.initializeUsingEnvironmentVariablesComment": "環境変数を使用して初期化します:",
-    "kbn.server.tutorials.apm.goClient.configure.commands.setCustomApmServerUrlComment": "カスタム APM Server URL (デフォルト: {defaultApmServerUrl})",
-    "kbn.server.tutorials.apm.goClient.configure.commands.setServiceNameComment": "サービス名を設定します。使用できる文字は # a-z、A-Z、0-9、-、_、スペースです。",
-    "kbn.server.tutorials.apm.goClient.configure.commands.usedExecutableNameComment": "ELASTIC_APM_SERVICE_NAME が指定されていない場合、実行可能な名前が使用されます。",
-    "kbn.server.tutorials.apm.goClient.configure.commands.useIfApmRequiresTokenComment": "APM Serverにトークンが必要な場合に使います",
-    "kbn.server.tutorials.apm.goClient.configure.textPost": "高度な構成に関しては [ドキュメンテーション]({documentationLink}) を参照してください。",
-    "kbn.server.tutorials.apm.goClient.configure.textPre": "エージェントとは、アプリケーションプロセス内で実行されるライブラリです。APM サービスは実行ファイル名または「ELASTIC_APM_SERVICE_NAME」の環境変数に基づきプログラムに従って作成されます。",
-    "kbn.server.tutorials.apm.goClient.configure.title": "エージェントの構成",
-    "kbn.server.tutorials.apm.goClient.install.textPre": "Go の APM エージェントパッケージをインストールします。",
-    "kbn.server.tutorials.apm.goClient.install.title": "APM エージェントのインストール",
-    "kbn.server.tutorials.apm.goClient.instrument.textPost": "Go のソースコードのインストルメンテーションの詳細ガイドは、[ドキュメンテーション]({documentationLink}) をご参照ください。",
-    "kbn.server.tutorials.apm.goClient.instrument.textPre": "提供されたインストルメンテーションモジュールの 1 つ、またはトレーサー API を直接使用して、Go アプリケーションにインストルメンテーションを設定します。",
-    "kbn.server.tutorials.apm.goClient.instrument.title": "アプリケーションのインストルメンテーション",
-    "kbn.server.tutorials.apm.introduction": "アプリケーション内から詳細なパフォーマンスメトリックやエラーを集めます。",
-    "kbn.server.tutorials.apm.javaClient.download.textPre": "[Maven Central]({mavenCentralLink}) からエージェントジャーをダウンロード。アプリケーションにエージェントを依存関係として追加**しない**でください。",
-    "kbn.server.tutorials.apm.javaClient.download.title": "APM エージェントのダウンロード",
-    "kbn.server.tutorials.apm.javaClient.startApplication.textPost": "構成オプションと高度な用途に関しては、[ドキュメンテーション]({documentationLink}) をご覧ください。",
-    "kbn.server.tutorials.apm.javaClient.startApplication.textPre": "「-javaagent」フラグを追加してエージェントをシステムプロパティで構成します。\n\n * 必要なサービス名を設定します (使用可能な文字は a-z、A-Z、0-9、-、_、スペースです)\n * カスタム APM Server URL を設定します (デフォルト: {customApmServerUrl})\n * アプリケーションのベースパッケージを設定します",
-    "kbn.server.tutorials.apm.javaClient.startApplication.title": "javaagent フラグのアプリケーションの起動",
-    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setCustomApmServerUrlComment": "カスタム APM Server URL (デフォルト: {defaultApmServerUrl})",
-    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setRequiredServiceNameComment": "必要なサービス名を設定します (使用可能な文字は a-z、A-Z、0-9、-、_、スペースです)",
-    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setServiceVersionComment": "サーバーバージョンを設定します (ソースマップ機能に必要)",
-    "kbn.server.tutorials.apm.jsClient.enableRealUserMonitoring.textPre": "[ドキュメンテーション({documentationLink}) をご覧ください。",
-    "kbn.server.tutorials.apm.jsClient.enableRealUserMonitoring.title": "APM Server の Real User 監視エージェントを有効にする",
-    "kbn.server.tutorials.apm.nodeClient.configure.commands.addThisToTheFileTopComment": "アプリに読み込まれたファイルの一番上にこれを追加します",
-    "kbn.server.tutorials.apm.nodeClient.configure.commands.allowedCharactersComment": "使用できる文字は # a-z、A-Z、0-9、-、_、スペースです",
-    "kbn.server.tutorials.apm.nodeClient.configure.commands.setCustomApmServerUrlComment": "カスタム APM Server URL (デフォルト: {defaultApmServerUrl})",
-    "kbn.server.tutorials.apm.nodeClient.configure.commands.setRequiredServiceNameComment": "package.json からサービス名を上書きします",
-    "kbn.server.tutorials.apm.nodeClient.configure.commands.useIfApmRequiresTokenComment": "APM Serverにトークンが必要な場合に使います",
-    "kbn.server.tutorials.apm.nodeClient.configure.textPost": "[Babel/ES モジュール]({babelEsModulesLink}) との使用を含む高度な用途に関しては、 [ドキュメンテーション]({documentationLink}) をご覧ください。",
-    "kbn.server.tutorials.apm.nodeClient.configure.textPre": "エージェントとは、アプリケーションプロセス内で実行されるライブラリです。APM サービスは「serviceName」に基づきプログラムに従って作成されます。このエージェントは様々なフレームワークをサポートしていますが、カスタムスタックで使用することもできます。",
-    "kbn.server.tutorials.apm.nodeClient.configure.title": "エージェントの構成",
-    "kbn.server.tutorials.apm.nodeClient.install.textPre": "Node.js 用の APM エージェントをアプリケーションに依存関係としてインストール。",
-    "kbn.server.tutorials.apm.nodeClient.install.title": "APM エージェントのインストール",
-    "kbn.server.tutorials.apm.rackClient.configure.commands.optionalComment": "オプション、デフォルトで config/elastic_apm.yml になります",
-    "kbn.server.tutorials.apm.rackClient.configure.commands.requiredComment": "必要",
-    "kbn.server.tutorials.apm.rackClient.configure.textPre": "Rack または対応フレームワーク (Sinatra など) の場合は、アプリのミドルウェアを含めてエージェントを起動してください。",
-    "kbn.server.tutorials.apm.rackClient.configure.title": "エージェントの構成",
-    "kbn.server.tutorials.apm.rackClient.createConfig.commands.defaultsToTheNameOfRackAppClassComment": "デフォルトで Rack アプリのクラスになります。",
-    "kbn.server.tutorials.apm.rackClient.createConfig.commands.setCustomApmServerComment": "カスタム APM Server URL (デフォルト: {defaultServerUrl})",
-    "kbn.server.tutorials.apm.rackClient.createConfig.commands.setServiceNameComment": "サービス名を設定します - 使用できる文字は a-z、A-Z、0-9、-、_、スペースです。",
-    "kbn.server.tutorials.apm.rackClient.createConfig.commands.useIfApmServerRequiresTokenComment": "APM Serverにトークンが必要な場合に使います",
-    "kbn.server.tutorials.apm.rackClient.createConfig.textPost": "構成オプションと高度な用途に関しては、[ドキュメンテーション]({documentationLink}) をご覧ください。\n\n",
-    "kbn.server.tutorials.apm.rackClient.createConfig.textPre": "構成ファイル {configFile} を作成します:",
-    "kbn.server.tutorials.apm.rackClient.createConfig.title": "構成ファイルの作成",
-    "kbn.server.tutorials.apm.rackClient.install.textPre": "Gemfile にエージェントを追加します",
-    "kbn.server.tutorials.apm.rackClient.install.title": "APM エージェントのインストール",
-    "kbn.server.tutorials.apm.railsClient.configure.textPost": "構成オプションと高度な用途に関しては、[ドキュメンテーション]({documentationLink}) をご覧ください。\n\n",
-    "kbn.server.tutorials.apm.railsClient.configure.textPre": "APM はアプリの起動時に自動的に起動します。構成ファイル {configFile} を作成してエージェントを構成します",
-    "kbn.server.tutorials.apm.railsClient.configure.title": "エージェントの構成",
-    "kbn.server.tutorials.apm.railsClient.install.textPre": "Gemfile にエージェントを追加します",
-    "kbn.server.tutorials.apm.railsClient.install.title": "APM エージェントのインストール",
-    "kbn.server.tutorials.apm.specProvider.artifacts.application.label": "APM を起動",
-    "kbn.server.tutorials.apm.specProvider.artifacts.dashboards.linkLabel": "APM ダッシュボード",
-    "kbn.server.tutorials.apm.specProvider.longDescription": "アプリケーションパフォーマンスモニタリング (APM) は、アプリケーション内から詳細なパフォーマンスメトリックやエラーを集めます。何千ものアプリケーションのパフォーマンスをリアルタイムで監視できます。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.apm.specProvider.name": "APM",
-    "kbn.server.tutorials.apm.specProvider.savedObjectsInstallMsg": "APM UI の機能には APM インデックスパターンが必要なものがあります。",
-    "kbn.server.tutorials.apm.startServer.textPre": "サーバーは、Elasticsearch アプリケーションのパフォーマンスメトリックを処理し保存します。",
-    "kbn.server.tutorials.apm.startServer.title": "APM Server の起動",
-    "kbn.server.tutorials.apm.windowsServerInstructions.textPost": "注:システムでスクリプトの実行が無効な場合、スクリプトを実行するために現在のセッションの実行ポリシーの設定が必要となります。例: {command}。",
-    "kbn.server.tutorials.apm.windowsServerInstructions.textPre": "1.[ダウンロードページ]({downloadPageLink}) から APM Server Windows zip ファイルをダウンロードします。\n2.zip ファイルのコンテンツを {zipFileExtractFolder} に解凍します。\n3.「{apmServerDirectory}」ディレクトリの名前を「APM-Server」に変更します。\n4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n5.PowerShell プロンプトで次のコマンドを実行し、APM Server を Windows サービスとしてインストールします。",
-    "kbn.server.tutorials.auditbeat.artifacts.dashboards.linkLabel": "SIEM アプリ",
-    "kbn.server.tutorials.auditbeat.longDescription": "Auditbeat を使用してホストから監査データを収集します。これらにはプロセス、ユーザー、ログイン、ソケット情報、ファイルアクセス、その他が含まれます。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.auditbeat.nameTitle": "Auditbeat",
-    "kbn.server.tutorials.auditbeat.shortDescription": "ホストから監査データを収集します。",
-    "kbn.server.tutorials.awsMetrics.artifacts.dashboards.linkLabel": "AWS メトリックダッシュボード",
-    "kbn.server.tutorials.awsMetrics.longDescription": "「aws」Metricbeat モジュールが、AWS API と Cloudwatch から監視メトリックを取得します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.awsMetrics.nameTitle": "AWS メトリック",
-    "kbn.server.tutorials.awsMetrics.shortDescription": "AWS API と Cloudwatch からの EC2 インスタンスの監視メトリックです。",
-    "kbn.server.tutorials.cephMetrics.artifacts.application.label": "ディスカバー",
-    "kbn.server.tutorials.cephMetrics.longDescription": "「ceph」Metricbeat モジュールは、Ceph から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.cephMetrics.nameTitle": "Ceph メトリック",
-    "kbn.server.tutorials.cephMetrics.shortDescription": "Ceph サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.ciscoLogs.artifacts.dashboards.linkLabel": "SIEM アプリ",
-    "kbn.server.tutorials.ciscoLogs.longDescription": "これは Cisco ネットワークデバイスのログ用のモジュールです。現在、同期された、またはファイルから読み込まれた Cisco ASA ファイアウォールログの「asa」ファイルセットをサポートしています。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.ciscoLogs.nameTitle": "Cisco",
-    "kbn.server.tutorials.ciscoLogs.shortDescription": "Cisco ASA ファイアウォールからのログを収集・解析します。",
-    "kbn.server.tutorials.cloudwatchLogs.longDescription": "Functionbeat を AWS Lambda 関数として実行するようデプロイし、Cloudwatch ログを収集します。         [詳細({learnMoreLink})。",
-    "kbn.server.tutorials.cloudwatchLogs.nameTitle": "Cloudwatch ログ",
-    "kbn.server.tutorials.cloudwatchLogs.shortDescription": "Functionbeat で Cloudwatch ログを収集します。",
-    "kbn.server.tutorials.corednsLogs.artifacts.dashboards.linkLabel": "CoreDNS ログダッシュボード",
-    "kbn.server.tutorials.corednsLogs.longDescription": "「coredns」Filebeat モジュールは、[CoreDNS](https://coredns.io/manual/toc/) からログを収集します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.corednsLogs.nameTitle": "CoreDNS ログ",
-    "kbn.server.tutorials.corednsLogs.shortDescription": "Coredns により作成されたログを収集します。",
-    "kbn.server.tutorials.corednsMetrics.artifacts.application.label": "ディスカバー",
-    "kbn.server.tutorials.corednsMetrics.longDescription": "「coredns」Metricbeat モジュールが、CoreDNS から監視メトリックを取得します。[詳細({learnMoreLink})。",
-    "kbn.server.tutorials.corednsMetrics.nameTitle": "CoreDNS メトリック",
-    "kbn.server.tutorials.corednsMetrics.shortDescription": "CoreDNS サーバーから監視メトリックを取得します。",
-    "kbn.server.tutorials.couchbaseMetrics.artifacts.application.label": "ディスカバー",
-    "kbn.server.tutorials.couchbaseMetrics.longDescription": "「couchbase」Metricbeat モジュールは、Couchbase から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.couchbaseMetrics.nameTitle": "Couchbase メトリック",
-    "kbn.server.tutorials.couchbaseMetrics.shortDescription": "Couchbase から内部メトリックを取得します。",
-    "kbn.server.tutorials.dockerMetrics.artifacts.dashboards.linkLabel": "Docker メトリックダッシュボード",
-    "kbn.server.tutorials.dockerMetrics.longDescription": "「docker」 Metricbeat モジュールは、Docker サーバーからメトリックを取得します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.dockerMetrics.nameTitle": "Docker メトリック",
-    "kbn.server.tutorials.dockerMetrics.shortDescription": "Docker コンテナーに関するメトリックを取得します。",
-    "kbn.server.tutorials.dropwizardMetrics.artifacts.application.label": "ディスカバリ",
-    "kbn.server.tutorials.dropwizardMetrics.longDescription": "「dropwizard」 Metricbeat モジュールは、Dropwizard Java アプリケーション から内部メトリックを取得します。[詳細[]({learnMoreLink})。",
-    "kbn.server.tutorials.dropwizardMetrics.nameTitle": "Dropwizard メトリック",
-    "kbn.server.tutorials.dropwizardMetrics.shortDescription": "Dropwizard Java アプリケーションから内部メトリックを取得します。",
-    "kbn.server.tutorials.elasticsearchLogs.artifacts.application.label": "ディスカバー",
-    "kbn.server.tutorials.elasticsearchLogs.longDescription": "「elasticsearch」Filebeat モジュールが、Elasticsearch により作成されたログをパースします。[詳細({learnMoreLink})。",
-    "kbn.server.tutorials.elasticsearchLogs.nameTitle": "Elasticsearch ログ",
-    "kbn.server.tutorials.elasticsearchLogs.shortDescription": "Elasticsearch により作成されたログを収集しパースします。",
-    "kbn.server.tutorials.elasticsearchMetrics.artifacts.application.label": "ディスカバー",
-    "kbn.server.tutorials.elasticsearchMetrics.longDescription": "「elasticsearch」Metricbeat モジュールは、Elasticsearch から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.elasticsearchMetrics.nameTitle": "Elasticsearch メトリック",
-    "kbn.server.tutorials.elasticsearchMetrics.shortDescription": "Elasticsearch から内部メトリックを取得します。",
-    "kbn.server.tutorials.envoyproxyLogs.artifacts.dashboards.linkLabel": "SIEM アプリ",
-    "kbn.server.tutorials.envoyproxyLogs.longDescription": "これは [Envoy proxy access log](https://www.envoyproxy.io/docs/envoy/v1.10.0/configuration/access_log) 用の Filebeatモジュールです。Kubernetes でのスタンドアロンのデプロイメントと Envoy プロキシデプロイメントの両方をサポートします。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.envoyproxyLogs.nameTitle": "Envoyproxy",
-    "kbn.server.tutorials.envoyproxyLogs.shortDescription": "Envoy プロキシからのログを収集・解析します。",
-    "kbn.server.tutorials.etcdMetrics.artifacts.application.label": "ディスカバー",
-    "kbn.server.tutorials.etcdMetrics.longDescription": "「etcd」Metricbeat モジュールは、Etcd から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.etcdMetrics.nameTitle": "Etcd メトリック",
-    "kbn.server.tutorials.etcdMetrics.shortDescription": "Etcd サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.golangMetrics.artifacts.dashboards.linkLabel": "Golang メトリックダッシュボード",
-    "kbn.server.tutorials.golangMetrics.longDescription": "「{moduleName}」Metricbeat モジュールは、Golang アプリから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.golangMetrics.nameTitle": "Golang メトリック",
-    "kbn.server.tutorials.golangMetrics.shortDescription": "Golang アプリから内部メトリックを取得します。",
-    "kbn.server.tutorials.haproxyMetrics.artifacts.application.label": "ディスカバリ",
-    "kbn.server.tutorials.haproxyMetrics.longDescription": "「haproxy」Metricbeat モジュールは、HAProxy アプリから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.haproxyMetrics.nameTitle": "HAProxy メトリック",
-    "kbn.server.tutorials.haproxyMetrics.shortDescription": "HAProxy サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.iisLogs.artifacts.dashboards.linkLabel": "IIS ログダッシュボード",
-    "kbn.server.tutorials.iisLogs.longDescription": "「iis」Filebeat モジュールが、Nginx HTTP サーバーにより作成されたアクセスとエラーのログをパースします。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.iisLogs.nameTitle": "IIS ログ",
-    "kbn.server.tutorials.iisLogs.shortDescription": "IIS HTTP サーバーにより作成されたアクセスとエラーのログを収集しパースします。",
-    "kbn.server.tutorials.iptablesLogs.artifacts.dashboards.linkLabel": "SIEM アプリ",
-    "kbn.server.tutorials.iptablesLogs.longDescription": "これは iptables と ip6tables ログ用のモジュールです。同期でネットワーク上で受信したログや、ファイルからのログを解析します。また、ルールセット名、ルール番号、トラフィックに実行されたアクション (許可/拒否) を含む、Ubiquiti ファイアウォールにより追加された接頭辞も認識できます。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.iptablesLogs.nameTitle": "Iptables / Ubiquiti",
-    "kbn.server.tutorials.iptablesLogs.shortDescription": "iptables と ip6tables ログ、または Ubiqiti からのログを収集・解析します。",
-    "kbn.server.tutorials.kafkaLogs.artifacts.dashboards.linkLabel": "Kafka ログダッシュボード",
-    "kbn.server.tutorials.kafkaLogs.longDescription": "「kafka」Filebeat モジュールは、Kafka が作成したログをパースします。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.kafkaLogs.nameTitle": "Kafka ログ",
-    "kbn.server.tutorials.kafkaLogs.shortDescription": "Kafka が作成したログを収集しパースします。",
-    "kbn.server.tutorials.kafkaMetrics.artifacts.application.label": "ディスカバリ",
-    "kbn.server.tutorials.kafkaMetrics.longDescription": "「kafka」Metricbeat モジュールは、Kafka から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.kafkaMetrics.nameTitle": "Kafka メトリック",
-    "kbn.server.tutorials.kafkaMetrics.shortDescription": "Kafka サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.kibanaMetrics.artifacts.application.label": "ディスカバリ",
-    "kbn.server.tutorials.kibanaMetrics.longDescription": "「kibana」Metricbeat モジュールは、Kibana から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.kibanaMetrics.nameTitle": "Kibana メトリック",
-    "kbn.server.tutorials.kibanaMetrics.shortDescription": "Kibana から内部メトリックを取得します。",
-    "kbn.server.tutorials.kubernetesMetrics.artifacts.dashboards.linkLabel": "Kubernetes メトリックダッシュボード",
-    "kbn.server.tutorials.kubernetesMetrics.longDescription": "「kubernetes」Metricbeat モジュールは、Kubernetes API からメトリックを取得します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.kubernetesMetrics.nameTitle": "Kubernetes メトリック",
-    "kbn.server.tutorials.kubernetesMetrics.shortDescription": "Kubernetes からメトリックを取得します。",
-    "kbn.server.tutorials.logstashLogs.artifacts.dashboards.linkLabel": "Logstash ログダッシュボード",
-    "kbn.server.tutorials.logstashLogs.longDescription": "「logstash」Filebeat モジュールが、Logstash 自体により作成されたデバッグとスローログをパースします。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.logstashLogs.nameTitle": "Logstash ログ",
-    "kbn.server.tutorials.logstashLogs.shortDescription": "Logstash 自体により作成されたデバッグとスローログをパースします。",
-    "kbn.server.tutorials.logstashMetrics.artifacts.application.label": "ディスカバー",
-    "kbn.server.tutorials.logstashMetrics.longDescription": "「{moduleName}」Metricbeat モジュールは、Logstash サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.logstashMetrics.nameTitle": "Logstash メトリック",
-    "kbn.server.tutorials.logstashMetrics.shortDescription": "Logstash サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.memcachedMetrics.artifacts.application.label": "ディスカバリ",
-    "kbn.server.tutorials.memcachedMetrics.longDescription": "「memcached」Metricbeat モジュールは、Memcached から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.memcachedMetrics.nameTitle": "Memcached メトリック",
-    "kbn.server.tutorials.memcachedMetrics.shortDescription": "Memcached サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.mongodbMetrics.artifacts.dashboards.linkLabel": "MongoDB メトリックダッシュボード",
-    "kbn.server.tutorials.mongodbMetrics.longDescription": "「mongodb」Metricbeat モジュールは、MongoDB サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.mongodbMetrics.nameTitle": "MongoDB メトリック",
-    "kbn.server.tutorials.mongodbMetrics.shortDescription": "MongoDB から内部メトリックを取得します。",
-    "kbn.server.tutorials.mssqlMetrics.artifacts.dashboards.linkLabel": "Microsoft SQL Server メトリックダッシュボード",
-    "kbn.server.tutorials.mssqlMetrics.longDescription": "「mssql」Metricbeat モジュールが、Microsoft SQL Server インスタンスからの監視、ログ、パフォーマンスメトリックを取得します。 詳細({learnMoreLink})。",
-    "kbn.server.tutorials.mssqlMetrics.nameTitle": "Microsoft SQL Server メトリック",
-    "kbn.server.tutorials.mssqlMetrics.shortDescription": "Microsoft SQL Server インスタンスから監視メトリックを取得します。",
-    "kbn.server.tutorials.muninMetrics.artifacts.application.label": "ディスカバー",
-    "kbn.server.tutorials.muninMetrics.longDescription": "「munin」Metricbeat モジュールは、Munin から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.muninMetrics.nameTitle": "Munin メトリック",
-    "kbn.server.tutorials.muninMetrics.shortDescription": "Munin サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.mysqlLogs.artifacts.dashboards.linkLabel": "MySQL ログダッシュボード",
-    "kbn.server.tutorials.mysqlLogs.longDescription": "「mysql」Filebeat モジュールは、MySQL が作成したエラーとスローログをパースします。[詳細]({learnMoreLink}).",
-    "kbn.server.tutorials.mysqlLogs.nameTitle": "MySQL ログ",
-    "kbn.server.tutorials.mysqlLogs.shortDescription": "MySQL が作成したエラーとスローログを収集しパースします。",
-    "kbn.server.tutorials.mysqlMetrics.artifacts.dashboards.linkLabel": "MySQL メトリックダッシュボード",
-    "kbn.server.tutorials.mysqlMetrics.longDescription": "「mysql」Metricbeat モジュールは、MySQL サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.mysqlMetrics.nameTitle": "MySQL メトリック",
-    "kbn.server.tutorials.mysqlMetrics.shortDescription": "MySQL から内部メトリックを取得します。",
-    "kbn.server.tutorials.natsLogs.artifacts.dashboards.linkLabel": "Nats ログダッシュボード",
-    "kbn.server.tutorials.natsLogs.longDescription": "「nats」Filebeat モジュールが、Nats により作成されたログをパースします。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.natsLogs.nameTitle": "Nats ログ",
-    "kbn.server.tutorials.natsLogs.shortDescription": "Nats により作成されたログを収集しパースします。",
-    "kbn.server.tutorials.natsMetrics.artifacts.dashboards.linkLabel": "Nats メトリックダッシュボード",
-    "kbn.server.tutorials.natsMetrics.longDescription": "「nats」Metricbeat モジュールが、Nats から監視メトリックを取得します。[詳細({learnMoreLink})。",
-    "kbn.server.tutorials.natsMetrics.nameTitle": "Nats メトリック",
-    "kbn.server.tutorials.natsMetrics.shortDescription": "Nats サーバーから監視メトリックを取得します。",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTextPost": "{udpPort} は Logstash  が Netflow データを受信する UDP ポートで、{password} は {elastic} ユーザーのパスワードです。",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTitle": "構成の変更",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTextPost": "{udpPort} は Logstash  が Netflow データを受信する UDP ポートで、{password} は {elastic} ユーザーのパスワードです。",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTitle": "構成の変更",
-    "kbn.server.tutorials.netflow.common.config.onPrem.osxTextPost": "{udpPort} は Logstash が Netflow データを受信する UDP ポートです。",
-    "kbn.server.tutorials.netflow.common.config.onPrem.osxTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
-    "kbn.server.tutorials.netflow.common.config.onPrem.osxTitle": "構成の変更",
-    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTextPost": "{udpPort} は Logstash が Netflow データを受信する UDP ポートです。",
-    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
-    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTitle": "構成の変更",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTextPost": "{udpPort} は Logstash  が Netflow データを受信する UDP ポートで、{esUrl} は Elastic Cloud で実行中の Elasticsearch の URL で、{password} は {elastic} ユーザーのパスワードです。",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTitle": "構成の変更",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTextPost": "{udpPort} は Logstash  が Netflow データを受信する UDP ポートで、{esUrl} は Elastic Cloud で実行中の Elasticsearch の URL で、{password} は {elastic} ユーザーのパスワードです。",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTitle": "構成の変更",
-    "kbn.server.tutorials.netflow.common.setup.osxTextPost": "{setupOption} オプションは Elasticsearch で {netflowPrefix} インデックスパターンを作成し、Kibana ダッシュボードとビジュアライゼーションをインポートします。後の実行時には既存のダッシュボードに上書きしないよう、このオプションを省略します。",
-    "kbn.server.tutorials.netflow.common.setup.osxTextPre": "実行:",
-    "kbn.server.tutorials.netflow.common.setup.osxTitle": "Netflow モジュールを実行",
-    "kbn.server.tutorials.netflow.common.setup.windowsTextPost": "{setupOption} オプションは Elasticsearch で {netflowPrefix} インデックスパターンを作成し、Kibana ダッシュボードとビジュアライゼーションをインポートします。後の実行時には既存のダッシュボードに上書きしないよう、このオプションを省略します。",
-    "kbn.server.tutorials.netflow.common.setup.windowsTextPre": "実行:",
-    "kbn.server.tutorials.netflow.common.setup.windowsTitle": "Netflow モジュールの実行",
-    "kbn.server.tutorials.netflow.elasticCloudInstructions.title": "はじめに",
-    "kbn.server.tutorials.netflow.onPremElasticCloudInstructions.title": "はじめに",
-    "kbn.server.tutorials.netflow.onPremInstructions.title": "はじめに",
-    "kbn.server.tutorials.netflow.tutorialLongDescription": "Logstash NetFlow モジュールは、ネットワークフローデータを収集してパースしたり、イベントを Elasticsearch でインデックスしたり、Kibana ダッシュボードをインストールしたりできます。このモジュールは Netflow バージョン 5 と 9 をサポートしています。[詳細]({linkUrl})。",
-    "kbn.server.tutorials.netflow.tutorialShortDescription": "Netflow エクスポーターが送信した Netflow の記録を収集します。",
-    "kbn.server.tutorials.nginxLogs.artifacts.dashboards.linkLabel": "Nginx ログダッシュボード",
-    "kbn.server.tutorials.nginxLogs.longDescription": "「nginx」Filebeat モジュールは、Nginx HTTP サーバーが作成したアクセスとエラーのログをパースします。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.nginxLogs.nameTitle": "Nginx ログ",
-    "kbn.server.tutorials.nginxLogs.shortDescription": "Nginx HTTP サーバーが作成したアクセスとエラーのログを収集しパースします。",
-    "kbn.server.tutorials.nginxMetrics.artifacts.dashboards.linkLabel": "Nginx メトリックダッシュボード",
-    "kbn.server.tutorials.nginxMetrics.longDescription": "「nginx」Metricbeat モジュールは、Nginx サーバーから内部メトリックを取得します。このモジュールは {statusModuleLink} が作成したウェブページからサーバーステータスデータを取得します。Nginx で {statusModuleLink} が有効にする必要があります。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.nginxMetrics.nameTitle": "Nginx メトリック",
-    "kbn.server.tutorials.nginxMetrics.shortDescription": "Nginx HTTP サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.osqueryLogs.artifacts.dashboards.linkLabel": "Osquery ログダッシュボード",
-    "kbn.server.tutorials.osqueryLogs.longDescription": "「osquery」Filebeat モジュールは、「osqueryd」が作成した JSON 結果ページを収集します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.osqueryLogs.nameTitle": "Osquery ログ",
-    "kbn.server.tutorials.osqueryLogs.shortDescription": "osqueryd により作成されたログを収集します。",
-    "kbn.server.tutorials.phpFpmMetrics.longDescription": "「php_fpm」Metricbeat モジュールは、PHP-FPM サーバーから内部メトリックを取得します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.phpFpmMetrics.nameTitle": "PHP-FPM メトリック",
-    "kbn.server.tutorials.phpFpmMetrics.shortDescription": "PHP-FPM から内部メトリックを取得します。",
-    "kbn.server.tutorials.postgresqlLogs.artifacts.dashboards.linkLabel": "PostgreSQL ログダッシュボード",
-    "kbn.server.tutorials.postgresqlLogs.longDescription": "「postgresql」Filebeat モジュールが、PostgreSQL により作成されたエラーとスローログをパースします。[詳細]({learnMoreLink}).",
-    "kbn.server.tutorials.postgresqlLogs.nameTitle": "PostgreSQL ログ",
-    "kbn.server.tutorials.postgresqlLogs.shortDescription": "PostgreSQL により作成されたエラーとスローログを収集しパースします。",
-    "kbn.server.tutorials.postgresqlMetrics.longDescription": "「postgresql」Metricbeat モジュールは、PostgreSQL サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.postgresqlMetrics.nameTitle": "PostgreSQL メトリック",
-    "kbn.server.tutorials.postgresqlMetrics.shortDescription": "PostgreSQL から内部メトリックを取得します。",
-    "kbn.server.tutorials.prometheusMetrics.artifacts.application.label": "ディスカバリ",
-    "kbn.server.tutorials.prometheusMetrics.longDescription": "「{moduleName}」Metricbeat モジュールは、Prometheus エンドポイントからメトリックを取得します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.prometheusMetrics.nameTitle": "Prometheus メトリック",
-    "kbn.server.tutorials.prometheusMetrics.shortDescription": "Prometheus エクスポーターからメトリックを取得します。.",
-    "kbn.server.tutorials.rabbitmqMetrics.artifacts.dashboards.linkLabel": "RabbitMQ メトリックダッシュボード",
-    "kbn.server.tutorials.rabbitmqMetrics.longDescription": "「rabbitmq」Metricbeat モジュールは、RabbitMQ サーバーから内部メトリックを取得します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.rabbitmqMetrics.nameTitle": "RabbitMQ メトリック",
-    "kbn.server.tutorials.rabbitmqMetrics.shortDescription": "RabbitMQ サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.redisLogs.artifacts.dashboards.linkLabel": "Redis ログダッシュボード",
-    "kbn.server.tutorials.redisLogs.longDescription": "「redis」Filebeat モジュールは、Redis が作成したエラーとスローログをパースします。Redis がエラーログを作成するには、Redis 構成ファイルの「logfile」オプションが「redis-server.log」に設定されていることを確認してください。スローログは「SLOWLOG」コマンドで Redis から直接読み込まれます。Redis がスローログを記録するには、「slowlog-log-slower-than」オプションが設定されていることを確認してください。「slowlog」ファイルセットは実験的な機能のためご注意ください。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.redisLogs.nameTitle": "Redis ログ",
-    "kbn.server.tutorials.redisLogs.shortDescription": "Redis が作成したエラーとスローログを収集しパースします。",
-    "kbn.server.tutorials.redisMetrics.artifacts.dashboards.linkLabel": "Redis メトリックダッシュボード",
-    "kbn.server.tutorials.redisMetrics.longDescription": "「redis」Metricbeat モジュールは、Redis サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.redisMetrics.nameTitle": "Redis メトリック",
-    "kbn.server.tutorials.redisMetrics.shortDescription": "Redis から内部メトリックを取得します。",
-    "kbn.server.tutorials.suricataLogs.artifacts.dashboards.linkLabel": "Suricata ログダッシュボード",
-    "kbn.server.tutorials.suricataLogs.longDescription": "「suricata」Filebeat モジュールは、[Suricata Eve JSON アウトプット](https://suricata.readthedocs.io/en/latest/output/eve/eve-json-format.html) からログを収集します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.suricataLogs.nameTitle": "Suricata ログ",
-    "kbn.server.tutorials.suricataLogs.shortDescription": "Suricata IDS/IPS/NSM が作成したログを収集します。",
-    "kbn.server.tutorials.systemLogs.artifacts.dashboards.linkLabel": "システムログダッシュボード",
-    "kbn.server.tutorials.systemLogs.longDescription": "「system」Filebeat モジュールは、一般的な Unix/Linux ベースのディストリビューションのシステムログサービスが作成したログを収集しパースします。このモジュールは Windows では利用できません。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.systemLogs.nameTitle": "システムログ",
-    "kbn.server.tutorials.systemLogs.shortDescription": "ローカル Syslog サーバーが作成したログを収集しパースします。",
-    "kbn.server.tutorials.systemMetrics.artifacts.dashboards.linkLabel": "システムメトリックダッシュボード",
-    "kbn.server.tutorials.systemMetrics.longDescription": "「system」Metricbeat モジュールは、ホストから CPU、メモリー、ネットワーク、ディスクの統計を収集します。システム全体の統計とプロセスやファイルシステムごとの統計を収集します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.systemMetrics.nameTitle": "システムメトリック",
-    "kbn.server.tutorials.systemMetrics.shortDescription": "ホストから CPU、メモリー、ネットワーク、ディスクの統計を収集します。",
-    "kbn.server.tutorials.traefikLogs.artifacts.dashboards.linkLabel": "Traefik ログダッシュボード",
-    "kbn.server.tutorials.traefikLogs.longDescription": "「traefik」Filebeat モジュールが、Traefik により作成されたアクセスログをパースします。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.traefikLogs.nameTitle": "Traefik ログ",
-    "kbn.server.tutorials.traefikLogs.shortDescription": "Traefik Proxy により作成されたアクセスログを収集しパースします。",
-    "kbn.server.tutorials.uptimeMonitors.artifacts.dashboards.linkLabel": "アップタイムアプリ",
-    "kbn.server.tutorials.uptimeMonitors.longDescription": "アクティブなプロービングでサービスの稼働状況を監視します。        Heartbeat が URL のリストに基づき、シンプ:にたずねます:生きてる？と         [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.uptimeMonitors.nameTitle": "アップタイムモニター",
-    "kbn.server.tutorials.uptimeMonitors.shortDescription": "サービスの稼働状況を監視します。",
-    "kbn.server.tutorials.uwsgiMetrics.artifacts.dashboards.linkLabel": "uWSGI メトリックダッシュボード",
-    "kbn.server.tutorials.uwsgiMetrics.longDescription": "「uwsgi」Metricbeat モジュールは、uWSGI サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.uwsgiMetrics.nameTitle": "uWSGI メトリック",
-    "kbn.server.tutorials.uwsgiMetrics.shortDescription": "uWSGI サーバーから内部メトリックを取得します。",
-    "kbn.server.tutorials.vsphereMetrics.artifacts.application.label": "ディスカバリ",
-    "kbn.server.tutorials.vsphereMetrics.longDescription": "「vsphere」Metricbeat モジュールは、vSphere クラスターから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.vsphereMetrics.nameTitle": "vSphere メトリック",
-    "kbn.server.tutorials.vsphereMetrics.shortDescription": "vSphere から内部メトリックを取得します。",
-    "kbn.server.tutorials.windowsEventLogs.artifacts.application.label": "SIEM アプリ",
-    "kbn.server.tutorials.windowsEventLogs.longDescription": "Winlogbeat を使用して Windows Event Log からのログを収集します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.windowsEventLogs.nameTitle": "Windows Event Log",
-    "kbn.server.tutorials.windowsEventLogs.shortDescription": "Windows Event Log からイベントを取得します。",
-    "kbn.server.tutorials.windowsMetrics.artifacts.application.label": "ディスカバー",
-    "kbn.server.tutorials.windowsMetrics.longDescription": "「windows」Metricbeat モジュールは、Windows から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.windowsMetrics.nameTitle": "Windows メトリック",
-    "kbn.server.tutorials.windowsMetrics.shortDescription": "Windows から内部メトリックを取得します。",
-    "kbn.server.tutorials.zeekLogs.artifacts.dashboards.linkLabel": "Zeek ログダッシュボード",
-    "kbn.server.tutorials.zeekLogs.longDescription": "「zeek」Filebeat モジュールが、[Zeek](https://www.zeek.org//documentation/index.html) からログを収集します。[詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.zeekLogs.nameTitle": "Zeek ログ",
-    "kbn.server.tutorials.zeekLogs.shortDescription": "Zeek/Bro により作成されたログを収集します。",
-    "kbn.server.tutorials.zookeeperMetrics.artifacts.application.label": "ディスカバー",
-    "kbn.server.tutorials.zookeeperMetrics.longDescription": "「{moduleName}」Metricbeat モジュールは、Zookeeper サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
-    "kbn.server.tutorials.zookeeperMetrics.nameTitle": "Zookeeper メトリック",
-    "kbn.server.tutorials.zookeeperMetrics.shortDescription": "Zookeeper サーバーから内部メトリックを取得します。",
-    "kbn.settings.advancedSettings.voiceAnnouncement.searchResultScreenReaderMessage": "{query} を検索しました。{sectionLenght, plural, one {# セクション} other {# セクション}}に{optionLenght, plural, one {# オプション} other { # オプション}}があります。",
-    "kbn.topNavMenu.openInspectorButtonLabel": "検査",
-    "kbn.topNavMenu.refreshButtonLabel": "更新",
-    "kbn.topNavMenu.saveVisualizationButtonLabel": "保存",
-    "kbn.topNavMenu.shareVisualizationButtonLabel": "共有",
-    "kbn.visualize.badge.readOnly.text": "読み込み専用",
-    "kbn.visualize.badge.readOnly.tooltip": "ビジュアライゼーションを保存できません",
-    "kbn.visualize.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage": "indexPattern または savedSearchId が必要です",
-    "kbn.visualize.disabledLabVisualizationMessage": "ラボビジュアライゼーションを表示するには、高度な設定でラボモードをオンにしてください。",
-    "kbn.visualize.disabledLabVisualizationTitle": "{title} はラボビジュアライゼーションです。",
-    "kbn.visualize.editor.createBreadcrumb": "作成",
-    "kbn.visualize.experimentalVisInfoText": "このビジュアライゼーションは実験的なものです。",
-    "kbn.visualize.linkedToSearch.unlinkButtonTooltip": "保存された検索からリンクを解除するにはダブルクリックします",
-    "kbn.visualize.linkedToSearch.unlinkSuccessNotificationText": "保存された検索「{searchTitle}」からリンクが解除されました",
-    "kbn.visualize.linkedToSearchInfoText": "保存された検索にリンクされています",
-    "kbn.visualize.listing.breadcrumb": "可視化",
-    "kbn.visualize.listing.createNew.createButtonLabel": "新規ビジュアライゼーションを追加",
-    "kbn.visualize.listing.createNew.description": "データに基づき異なるビジュアライゼーションを作成できます。",
-    "kbn.visualize.listing.createNew.title": "最初のビジュアライゼーションの作成",
-    "kbn.visualize.listing.experimentalTitle": "実験的",
-    "kbn.visualize.listing.experimentalTooltip": "このビジュアライゼーションは今後のリリースで変更または削除される可能性があり、SLA のサポート対象になりません。",
-    "kbn.visualize.listing.noItemsMessage": "ビジュアライゼーションがないようです。",
-    "kbn.visualize.listing.table.entityName": "ビジュアライゼーション",
-    "kbn.visualize.listing.table.entityNamePlural": "ビジュアライゼーション",
-    "kbn.visualize.listing.table.listTitle": "ビジュアライゼーション",
-    "kbn.visualize.listing.table.titleColumnName": "タイトル",
-    "kbn.visualize.listing.table.typeColumnName": "タイプ",
-    "kbn.visualize.newVisWizard.chooseSourceTitle": "ソースの選択",
-    "kbn.visualize.newVisWizard.experimentalDescription": "このビジュアライゼーションは実験的なものです。デザインと導入は安定したビジュアライゼーションよりも完成度が低く、変更される可能性があります。",
-    "kbn.visualize.newVisWizard.experimentalTitle": "実験的",
-    "kbn.visualize.newVisWizard.experimentalTooltip": "このビジュアライゼーションは今後のリリースで変更または削除される可能性があり、SLA のサポート対象になりません。",
-    "kbn.visualize.newVisWizard.filterVisTypeAriaLabel": "ビジュアライゼーションのタイプでフィルタリング",
-    "kbn.visualize.newVisWizard.helpText": "タイプを選択してビジュアライゼーションの作成を始めましょう。",
-    "kbn.visualize.newVisWizard.helpTextAriaLabel": "タイプを選択してビジュアライゼーションの作成を始めましょう。ESC を押してこのモダルを閉じます。Tab キーを押して次に進みます。",
-    "kbn.visualize.newVisWizard.newVisTypeTitle": "新規 {visTypeName}",
-    "kbn.visualize.newVisWizard.resultsFound": "{resultCount} 個の{resultCount, plural, one {タイプ} other {タイプ} } が見つかりました",
-    "kbn.visualize.newVisWizard.searchSelection.notFoundLabel": "一致するインデックスまたは保存された検索が見つかりませんでした。",
-    "kbn.visualize.newVisWizard.searchSelection.savedObjectType.indexPattern": "インデックスパターン",
-    "kbn.visualize.newVisWizard.searchSelection.savedObjectType.search": "保存された検索",
-    "kbn.visualize.newVisWizard.selectVisType": "ビジュアライゼーションのタイプを選択してください",
-    "kbn.visualize.newVisWizard.title": "新規ビジュアライゼーション",
-    "kbn.visualize.saveDialog.saveAndAddToDashboardButtonLabel": "保存してダッシュボードに追加",
-    "kbn.visualize.savedObjectName": "ビジュアライゼーション",
-    "kbn.visualize.topNavMenu.openInspectorButtonAriaLabel": "ビジュアライゼーションのインスペクターを開く",
-    "kbn.visualize.topNavMenu.openInspectorDisabledButtonTooltip": "このビジュアライゼーションはインスペクターをサポートしていません。",
-    "kbn.visualize.topNavMenu.refreshButtonAriaLabel": "更新",
-    "kbn.visualize.topNavMenu.saveVisualization.failureNotificationText": "「{visTitle}」の保存中にエラーが発生しました",
-    "kbn.visualize.topNavMenu.saveVisualization.successNotificationText": "「{visTitle}」が保存されました",
-    "kbn.visualize.topNavMenu.saveVisualizationButtonAriaLabel": "ビジュアライゼーションを保存",
-    "kbn.visualize.topNavMenu.saveVisualizationDisabledButtonTooltip": "保存する前に変更を適用または破棄",
-    "kbn.visualize.topNavMenu.shareVisualizationButtonAriaLabel": "ビジュアライゼーションを共有",
-    "kbn.visualize.visualizeDescription": "ビジュアライゼーションを作成して Elasticsearch インデックスに保存されたデータを集約します。",
-    "kbn.visualize.visualizeListingBreadcrumbsTitle": "可視化",
-    "kbn.visualize.visualizeListingDeleteErrorTitle": "ビジュアライゼーションの削除中にエラーが発生",
-    "kbn.visualize.wizard.step1Breadcrumb": "作成",
-    "kbn.visualize.wizard.step2Breadcrumb": "作成",
-    "kbn.visualizeTitle": "可視化",
-    "kbn.advancedSettings.discover.searchOnPageLoadText": "ディスカバリの最初の読み込み時に検索を実行するかを制御します。この設定は、保存された検索の読み込み時には影響しません。",
-    "kbn.advancedSettings.discover.searchOnPageLoadTitle": "ページの読み込み時の検索",
-    "kbn.advancedSettings.visualization.heatmap.maxBucketsText": "1 つのデータソースが返せるバケットの最大数です。値が大きいとブラウザのレンダリング速度が下がる可能性があります。",
-    "kbn.advancedSettings.visualization.heatmap.maxBucketsTitle": "ヒートマップの最大バケット数",
-    "kbn.discover.localMenu.saveSaveSearchDescription": "ビジュアライゼーションとダッシュボードで使用できるようにディスカバリの検索を保存します",
-    "kbn.discover.uninitializedRefreshButtonText": "データを更新",
-    "kbn.discover.uninitializedText": "クエリを作成、フィルターを追加、または [更新] をクリックして、現在のクエリの結果を取得します。",
-    "kbn.discover.uninitializedTitle": "検索開始",
-    "kbn.docTable.tableHeader.sortByColumnUnsortedAriaLabel": "{columnName} で並べ替えを止める",
-    "kbn.embeddable.search.displayName": "検索",
-    "kbn.embeddable.visualizations.displayName": "ビジュアライゼーション",
-    "kbn.home.addData.siem.addSiemEventsButtonLabel": "セキュリティイベントを追加",
-    "kbn.home.addData.siem.nameDescription": "即利用可能なビジュアライゼーションで、セキュリティイベントをまとめてインタラクティブな調査を可能にします。",
-    "kbn.home.addData.siem.nameTitle": "SIEM",
-    "kbn.home.tutorial.tabs.siemTitle": "SIEM",
-    "kbn.home.welcomeHomePageHeader": "Kibana ホーム",
-    "kbn.discover.reloadSavedSearchButton": "検索をリセット",
-    "kbn.server.tutorials.apm.dotNetClient.download.textPre": "[NuGet]({allNuGetPackagesLink}) から .NET アプリケーションにエージェントパッケージを追加してください。用途の異なる複数の NuGet パッケージがあります。\n\nEntity Framework Core の ASP.NET Core アプリケーションの場合は、[Elastic.Apm.NetCoreAll]({netCoreAllApmPackageLink}) パッケージをダウンロードしてください。このパッケージは、自動的にすべてのエージェントコンポーネントをアプリケーションに追加します。\n\n 依存性を最低限に抑えたい場合、ASP.NET Core の監視のみに [Elastic.Apm.AspNetCore]({aspNetCorePackageLink}) パッケージ、または Entity Framework Core の監視のみに [Elastic.Apm.EfCore]({efCorePackageLink}) パッケージを使用することができます。\n\n       手動インストルメンテーションのみにパブリック Agent API を使用する場合は、[Elastic.Apm]({elasticApmPackageLink}) パッケージを使用してください。",
-    "kbn.server.tutorials.apm.elasticCloud.textPre": "APM サーバーを有効にするには、[the Elastic Cloud console](https://cloud.elastic.co/deployments?q={cloudId}) に移動し、展開設定で APM を有効にします。有効にした後、このページを更新してください。",
-    "kbn.advancedSettings.defaultRoute.defaultRouteText": "この設定は、Kibana 起動時のデフォルトのルートを設定します。この設定で、Kibana 起動時のランディングページを変更できます。ルートはスラッシュ (\"/\") で始まる必要があります。",
-    "kbn.advancedSettings.defaultRoute.defaultRouteTitle": "デフォルトのルート",
-    "kbn.advancedSettings.defaultRoute.defaultRouteValidationMessage": "ルートはスラッシュ (\"/\") で始まる必要があります。",
-    "kbn.context.loadButtonLabel": "読み込み",
-    "kbn.context.newerDocumentsAriaLabel": "新しいドキュメントの数",
-    "kbn.context.newerDocumentsWarning": "アンカーよりも新しいドキュメントは {docCount} 件しか見つかりませんでした。",
-    "kbn.context.newerDocumentsWarningZero": "アンカーよりも新しいドキュメントは見つかりませんでした。",
-    "kbn.context.olderDocumentsAriaLabel": "古いドキュメントの数",
-    "kbn.context.olderDocumentsWarning": "アンカーよりも古いドキュメントは {docCount} 件しか見つかりませんでした。",
-    "kbn.context.olderDocumentsWarningZero": "アンカーよりも古いドキュメントは見つかりませんでした。",
-    "kbn.discover.fieldChooser.fieldFilterFacetButtonLabel": "フィルタリングされたフィールド",
-    "kbn.discover.fieldChooser.indexPattern.changeLinkTooltip": "現在のインデックスパターンを変更",
-    "kbn.discover.fieldChooser.indexPattern.changeLinkAriaLabel": "現在のインデックスパターンを変更",
-    "kbn.discover.fieldChooser.searchPlaceHolder": "検索フィールド",
-    "kbn.discover.histogram.partialData.bucketTooltipText": "選択された時間範囲にはこのバケット全体は含まれていませんが、一部データが含まれている可能性があります。",
-    "kbn.doc.failedToLocateIndexPattern": "ID {indexPatternId} に一致するインデックスパターンがありません",
-    "kbn.doc.somethingWentWrongDescriptionAddon": "インデックスが存在することを確認してください。",
-    "kbn.management.objects.objectsTable.export.successWithMissingRefsNotification": "ファイルはバックグラウンドでダウンロード中です。一部の関連オブジェクトが見つかりませんでした。足りないオブジェクトの一覧は、エクスポートされたファイルの最後の行をご覧ください。",
-    "kbn.management.settings.categoryNames.siemLabel": "SIEM",
-    "kbn.management.settings.field.imageTooLargeErrorMessage": "画像が大きすぎます。最大サイズは {maxSizeDescription} です",
-    "kbn.server.tutorials.couchdbMetrics.artifacts.dashboards.linkLabel": "CouchDB メトリックダッシュボード",
-    "kbn.server.tutorials.couchdbMetrics.longDescription": "「couchdb」Metricbeat モジュールが、CouchDB から監視メトリックを取得します。[詳細] ({learnMoreLink})。",
-    "kbn.server.tutorials.couchdbMetrics.nameTitle": "CouchDB メトリック",
-    "kbn.server.tutorials.couchdbMetrics.shortDescription": "CouchdB サーバーから監視メトリックを取得します。",
-    "kbn.visualize.listing.betaTitle": "ベータ",
-    "kbn.visualize.listing.betaTooltip": "このビジュアライゼーションはベータ段階で、変更される可能性があります。デザインとコードはオフィシャル GA 機能よりも完成度が低く、現状のまま保証なしで提供されています。ベータ機能にはオフィシャル GA 機能の SLA が適用されません",
-    "kbn.visualize.newVisWizard.betaDescription": "このビジュアライゼーションはベータ段階で、変更される可能性があります。デザインとコードはオフィシャル GA 機能よりも完成度が低く、現状のまま保証なしで提供されています。ベータ機能にはオフィシャル GA 機能の SLA が適用されません",
-    "kbn.visualize.newVisWizard.betaTitle": "ベータ",
-    "kbn.visualize.pageHeading": "{chartName} {chartType} ビジュアライゼーション",
-    "kbn.advancedSettings.courier.batchSearchesText": "無効の場合、ダッシュボードパネルは個々に読み込まれ、検索リクエストはユーザーが移動するか\n           クエリを更新すると停止します。有効の場合、ダッシュボードパネルはすべてのデータが読み込まれると同時に読み込まれ、\n           検索は停止しません。",
-    "kbn.doc.couldNotFindDocumentsDescription": "その ID に一致するドキュメントがありません。",
-    "kbn.doc.somethingWentWrongDescription": "{indexName} が欠けています。",
-    "kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip": "{underscoreSign} で始まるフィールド名はサポートされていません",
-    "kbnDocViews.table.filterForFieldPresentButtonAriaLabel": "現在のフィールドのフィルター",
-    "kbnDocViews.table.filterForFieldPresentButtonTooltip": "現在のフィールドのフィルター",
-    "kbnDocViews.table.filterForValueButtonAriaLabel": "値でフィルタリング",
-    "kbnDocViews.table.filterForValueButtonTooltip": "値でフィルタリング",
-    "kbnDocViews.table.filterOutValueButtonAriaLabel": "値を除外",
-    "kbnDocViews.table.filterOutValueButtonTooltip": "値を除外します",
-    "kbnDocViews.table.noCachedMappingForThisFieldTooltip": "このフィールドのキャッシュされたマッピングがありません。管理 > インデックスパターンページからフィールドリストを更新してください",
-    "kbnDocViews.table.tableTitle": "表",
-    "kbnDocViews.table.toggleColumnInTableButtonAriaLabel": "表の列を切り替える",
-    "kbnDocViews.table.toggleColumnInTableButtonTooltip": "表の列を切り替える",
-    "kbnDocViews.table.unableToFilterForPresenceOfMetaFieldsTooltip": "メタフィールドの有無でフィルタリングできません",
-    "kbnDocViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip": "スクリプトフィールドの有無でフィルタリングできません",
-    "kbnDocViews.table.unindexedFieldsCanNotBeSearchedTooltip": "インデックスされていないフィールドは検索できません",
-    "kbnDocViews.json.codeEditorAriaLabel": "Elasticsearch ドキュメントの JSON ビューのみを読み込む",
-    "kbnDocViews.json.jsonTitle": "JSON",
-    "kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel": "警告",
-    "kbnDocViews.table.noCachedMappingForThisFieldAriaLabel": "警告",
-    "kbnDocViews.table.toggleFieldDetails": "フィールド詳細を切り替える",
-    "kbnVislibVisTypes.area.areaDescription": "折れ線グラフの下の数量を強調します。",
-    "kbnVislibVisTypes.area.areaTitle": "エリア",
-    "kbnVislibVisTypes.area.groupTitle": "系列を分割",
-    "kbnVislibVisTypes.area.metricsTitle": "Y 軸",
-    "kbnVislibVisTypes.area.radiusTitle": "点のサイズ",
-    "kbnVislibVisTypes.area.segmentTitle": "X 軸",
-    "kbnVislibVisTypes.area.splitTitle": "チャートを分割",
-    "kbnVislibVisTypes.controls.gaugeOptions.alignmentLabel": "アラインメント",
-    "kbnVislibVisTypes.controls.gaugeOptions.displayWarningsLabel": "警告を表示",
-    "kbnVislibVisTypes.controls.gaugeOptions.rangesTitle": "範囲",
-    "kbnVislibVisTypes.controls.gaugeOptions.styleTitle": "スタイル",
-    "kbnVislibVisTypes.controls.heatmapOptions.colorLabel": "色",
-    "kbnVislibVisTypes.controls.heatmapOptions.colorsNumberLabel": "色の数",
-    "kbnVislibVisTypes.controls.heatmapOptions.overwriteAutomaticColorLabel": "自動からーを上書きする",
-    "kbnVislibVisTypes.controls.heatmapOptions.rotateLabel": "回転",
-    "kbnVislibVisTypes.controls.heatmapOptions.showLabelsTitle": "ラベルを表示",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.filterLabelsLabel": "フィルターラベル",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.labelsTitle": "ラベル",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.positionLabel": "配置",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.showLabel": "表示",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.showLabelsLabel": "ラベルを表示",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.xAxisTitle": "X 軸",
-    "kbnVislibVisTypes.controls.pointSeries.gridAxis.dontShowLabel": "非表示",
-    "kbnVislibVisTypes.controls.pointSeries.gridAxis.gridText": "グリッド",
-    "kbnVislibVisTypes.controls.pointSeries.gridAxis.xAxisLinesLabel": "X 軸線を表示",
-    "kbnVislibVisTypes.controls.pointSeries.gridAxis.yAxisLinesLabel": "Y 軸線を表示",
-    "kbnVislibVisTypes.controls.pointSeries.series.chartTypeLabel": "チャートタイプ",
-    "kbnVislibVisTypes.controls.pointSeries.series.lineModeLabel": "線のモード",
-    "kbnVislibVisTypes.controls.pointSeries.series.lineWidthLabel": "線の幅",
-    "kbnVislibVisTypes.controls.pointSeries.series.metricsTitle": "メトリック",
-    "kbnVislibVisTypes.controls.pointSeries.series.modeLabel": "モード",
-    "kbnVislibVisTypes.controls.pointSeries.series.newAxisLabel": "新規軸…",
-    "kbnVislibVisTypes.controls.pointSeries.series.showLineLabel": "線を表示",
-    "kbnVislibVisTypes.controls.pointSeries.series.valueAxisLabel": "値軸",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.maxLabel": "最高",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minLabel": "最低",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minNeededScaleText": "ログスケールが選択されている場合、最低値は 0 よりも大きいものである必要があります",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.modeLabel": "モード",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.positionLabel": "配置",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBoundsLabel": "データバウンドに合わせる",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleTypeLabel": "スケールタイプ",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.setAxisExtentsLabel": "軸の範囲の設定",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.showLabel": "表示",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.titleLabel": "タイトル",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.yAxisTitle": "Y 軸",
-    "kbnVislibVisTypes.editors.pie.donutLabel": "ドーナッツ",
-    "kbnVislibVisTypes.editors.pointSeries.currentTimeMarkerLabel": "現在時刻マーカー",
-    "kbnVislibVisTypes.editors.pointSeries.orderBucketsBySumLabel": "バケットを合計で並べ替え",
-    "kbnVislibVisTypes.editors.pointSeries.settingsTitle": "設定",
-    "kbnVislibVisTypes.functions.pie.help": "パイビジュアライゼーション",
-    "kbnVislibVisTypes.functions.vislib.help": "Vislib ビジュアライゼーション",
-    "kbnVislibVisTypes.gauge.alignmentAutomaticTitle": "自動",
-    "kbnVislibVisTypes.gauge.alignmentHorizontalTitle": "横",
-    "kbnVislibVisTypes.gauge.alignmentVerticalTitle": "縦",
-    "kbnVislibVisTypes.gauge.gaugeDescription": "ゲージはメトリックのステータスを示します。メトリックの値としきい値との関連性を示すのに使用します。",
-    "kbnVislibVisTypes.gauge.gaugeTitle": "ゲージ",
-    "kbnVislibVisTypes.gauge.groupTitle": "グループを分割",
-    "kbnVislibVisTypes.gauge.metricTitle": "メトリック",
-    "kbnVislibVisTypes.goal.goalDescription": "ゴールチャートは、最終目標にどれだけ近いかを示します。",
-    "kbnVislibVisTypes.goal.goalTitle": "ゴール",
-    "kbnVislibVisTypes.goal.groupTitle": "グループを分割",
-    "kbnVislibVisTypes.goal.metricTitle": "メトリック",
-    "kbnVislibVisTypes.heatmap.groupTitle": "Y 軸",
-    "kbnVislibVisTypes.heatmap.heatmapDescription": "マトリックス内のセルに影をつける。",
-    "kbnVislibVisTypes.heatmap.heatmapTitle": "ヒートマップ",
-    "kbnVislibVisTypes.heatmap.metricTitle": "値",
-    "kbnVislibVisTypes.heatmap.segmentTitle": "X 軸",
-    "kbnVislibVisTypes.heatmap.splitTitle": "チャートを分割",
-    "kbnVislibVisTypes.histogram.groupTitle": "系列を分割",
-    "kbnVislibVisTypes.histogram.histogramDescription": "連続変数を各軸に割り当てる。",
-    "kbnVislibVisTypes.histogram.histogramTitle": "縦棒",
-    "kbnVislibVisTypes.histogram.metricTitle": "Y 軸",
-    "kbnVislibVisTypes.histogram.radiusTitle": "点のサイズ",
-    "kbnVislibVisTypes.histogram.segmentTitle": "X 軸",
-    "kbnVislibVisTypes.histogram.splitTitle": "チャートを分割",
-    "kbnVislibVisTypes.horizontalBar.groupTitle": "系列を分割",
-    "kbnVislibVisTypes.horizontalBar.horizontalBarDescription": "連続変数を各軸に割り当てる。",
-    "kbnVislibVisTypes.horizontalBar.horizontalBarTitle": "横棒",
-    "kbnVislibVisTypes.horizontalBar.metricTitle": "Y 軸",
-    "kbnVislibVisTypes.horizontalBar.radiusTitle": "点のサイズ",
-    "kbnVislibVisTypes.horizontalBar.segmentTitle": "X 軸",
-    "kbnVislibVisTypes.horizontalBar.splitTitle": "チャートを分割",
-    "kbnVislibVisTypes.line.groupTitle": "系列を分割",
-    "kbnVislibVisTypes.line.lineDescription": "トレンドを強調します。",
-    "kbnVislibVisTypes.line.lineTitle": "折れ線",
-    "kbnVislibVisTypes.line.metricTitle": "Y 軸",
-    "kbnVislibVisTypes.line.radiusTitle": "点のサイズ",
-    "kbnVislibVisTypes.line.segmentTitle": "X 軸",
-    "kbnVislibVisTypes.line.splitTitle": "チャートを分割",
-    "kbnVislibVisTypes.pie.metricTitle": "サイズのスライス",
-    "kbnVislibVisTypes.pie.pieDescription": "全体に対する内訳を表現する。",
-    "kbnVislibVisTypes.pie.pieTitle": "パイ",
-    "kbnVislibVisTypes.pie.segmentTitle": "スライスの分割",
-    "kbnVislibVisTypes.pie.splitTitle": "チャートを分割",
-    "kbnVislibVisTypes.controls.gaugeOptions.extendRangeTooltip": "範囲をデータの最高値に広げます。",
-    "kbnVislibVisTypes.controls.gaugeOptions.labelsTitle": "ラベル",
-    "kbnVislibVisTypes.controls.gaugeOptions.switchWarningsTooltip": "警告のオン・オフを切り替えます。オンにすると、すべてのラベルを表示できない際に警告が表示されます。",
-    "kbnVislibVisTypes.controls.pointSeries.gridAxis.yAxisLinesDisabledTooltip": "ヒストグラムに X 軸線は表示できません。",
-    "kbnVislibVisTypes.controls.rangeErrorMessage": "値は {min} と {max} の間でなければなりません",
-    "kbnVislibVisTypes.controls.truncateLabel": "切り捨て",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.valueLabel": "しきい値",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.widthLabel": "線の幅",
-    "kbnVislibVisTypes.gauge.gaugeTypes.arcText": "弧形",
-    "kbnVislibVisTypes.gauge.gaugeTypes.circleText": "円",
-    "kbnVislibVisTypes.legendPositions.bottomText": "一番下",
-    "kbnVislibVisTypes.legendPositions.leftText": "左",
-    "kbnVislibVisTypes.legendPositions.rightText": "右",
-    "kbnVislibVisTypes.legendPositions.topText": "一番上",
-    "kbnVislibVisTypes.controls.gaugeOptions.autoExtendRangeLabel": "範囲を自動拡張",
-    "kbnVislibVisTypes.controls.gaugeOptions.gaugeTypeLabel": "ゲージタイプ",
-    "kbnVislibVisTypes.controls.gaugeOptions.percentageModeLabel": "パーセンテージモード",
-    "kbnVislibVisTypes.controls.gaugeOptions.showLabelsLabel": "ラベルを表示",
-    "kbnVislibVisTypes.controls.gaugeOptions.showLegendLabel": "凡例を表示",
-    "kbnVislibVisTypes.controls.gaugeOptions.showScaleLabel": "縮尺を表示",
-    "kbnVislibVisTypes.controls.gaugeOptions.subTextLabel": "サブラベル",
-    "kbnVislibVisTypes.controls.vislibBasicOptions.legendPositionLabel": "凡例の配置",
-    "kbnVislibVisTypes.controls.vislibBasicOptions.showTooltipLabel": "ツールヒントを表示",
-    "kbnVislibVisTypes.editors.pie.labelsSettingsTitle": "ラベル設定",
-    "kbnVislibVisTypes.editors.pie.pieSettingsTitle": "パイ設定",
-    "kbnVislibVisTypes.editors.pie.showLabelsLabel": "ラベルを表示",
-    "kbnVislibVisTypes.editors.pie.showTopLevelOnlyLabel": "トップレベルのみ表示",
-    "kbnVislibVisTypes.editors.pie.showValuesLabel": "値を表示",
-    "kbnVislibVisTypes.area.countText": "カウント",
-    "kbnVislibVisTypes.area.tabs.metricsAxesTitle": "メトリックと軸",
-    "kbnVislibVisTypes.area.tabs.panelSettingsTitle": "パネル設定",
-    "kbnVislibVisTypes.axisModes.normalText": "標準",
-    "kbnVislibVisTypes.axisModes.percentageText": "パーセンテージ",
-    "kbnVislibVisTypes.axisModes.silhouetteText": "シルエット",
-    "kbnVislibVisTypes.axisModes.wiggleText": "振動",
-    "kbnVislibVisTypes.categoryAxis.rotate.angledText": "傾斜",
-    "kbnVislibVisTypes.categoryAxis.rotate.horizontalText": "横",
-    "kbnVislibVisTypes.categoryAxis.rotate.verticalText": "縦",
-    "kbnVislibVisTypes.chartModes.normalText": "標準",
-    "kbnVislibVisTypes.chartModes.stackedText": "スタック",
-    "kbnVislibVisTypes.chartTypes.areaText": "エリア",
-    "kbnVislibVisTypes.chartTypes.barText": "バー",
-    "kbnVislibVisTypes.chartTypes.lineText": "折れ線",
-    "kbnVislibVisTypes.controls.colorRanges.errorText": "各範囲は前の範囲よりも大きくなければなりません。",
-    "kbnVislibVisTypes.controls.colorSchema.colorSchemaLabel": "カラー図表",
-    "kbnVislibVisTypes.controls.colorSchema.howToChangeColorsDescription": "それぞれの色は凡例で変更できます。",
-    "kbnVislibVisTypes.controls.colorSchema.resetColorsButtonLabel": "色をリセット",
-    "kbnVislibVisTypes.controls.colorSchema.reverseColorSchemaLabel": "図表を反転",
-    "kbnVislibVisTypes.controls.heatmapOptions.labelsTitle": "ラベル",
-    "kbnVislibVisTypes.controls.heatmapOptions.useCustomRangesLabel": "カスタム範囲を使用",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.alignLabel": "配置",
-    "kbnVislibVisTypes.controls.pointSeries.series.showDotsLabel": "点を表示",
-    "kbnVislibVisTypes.controls.pointSeries.seriesAccordionAriaLabel": "{agg} オプションを切り替える",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.addButtonTooltip": "Y 軸を追加します",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.customExtentsLabel": "カスタム範囲",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minErrorMessage": "最低値は最高値よりも低く設定する必要があります",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.removeButtonTooltip": "Y 軸を削除します",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.toggleCustomExtendsAriaLabel": "カスタム範囲を切り替える",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.toggleOptionsAriaLabel": "{axisName} オプションを切り替える",
-    "kbnVislibVisTypes.editors.heatmap.highlightLabelTooltip": "チャートのカーソルを当てた部分と凡例の対応するラベルをハイライトします。",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.colorLabel": "ラインカラー",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.showLabel": "しきい線を表示",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.styleLabel": "ラインスタイル",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLineSettingsTitle": "しきい線",
-    "kbnVislibVisTypes.interpolationModes.smoothedText": "スムーズ",
-    "kbnVislibVisTypes.interpolationModes.steppedText": "ステップ",
-    "kbnVislibVisTypes.interpolationModes.straightText": "直線",
-    "kbnVislibVisTypes.scaleTypes.linearText": "直線",
-    "kbnVislibVisTypes.scaleTypes.logText": "ログ",
-    "kbnVislibVisTypes.scaleTypes.squareRootText": "平方根",
-    "kbnVislibVisTypes.thresholdLine.style.dashedText": "鎖線",
-    "kbnVislibVisTypes.thresholdLine.style.dotdashedText": "点線",
-    "kbnVislibVisTypes.thresholdLine.style.fullText": "完全",
-    "kbnVislibVisTypes.controls.heatmapOptions.colorScaleLabel": "カラースケール",
-    "kbnVislibVisTypes.controls.heatmapOptions.percentageModeLabel": "パーセンテージモード",
-    "kbnVislibVisTypes.controls.heatmapOptions.scaleToDataBoundsLabel": "データバウンドに合わせる",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBounds.boundsMargin": "境界マージン",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBounds.minNeededBoundsMargin": "境界マージンは 0 以上でなければなりません",
-    "kbnVislibVisTypes.editors.heatmap.basicSettingsTitle": "基本設定",
-    "kbnVislibVisTypes.editors.heatmap.heatmapSettingsTitle": "ヒートマップ設定",
-    "kbnVislibVisTypes.editors.heatmap.highlightLabel": "ハイライト範囲",
-    "visTypeMetric.colorModes.backgroundOptionLabel": "背景",
-    "visTypeMetric.colorModes.labelsOptionLabel": "ラベル",
-    "visTypeMetric.colorModes.noneOptionLabel": "なし",
-    "visTypeMetric.function.help": "メトリックビジュアライゼーション",
-    "visTypeMetric.metricDescription": "計算結果を単独の数字として表示します。",
-    "visTypeMetric.metricTitle": "メトリック",
-    "visTypeMetric.params.rangesTitle": "範囲",
-    "visTypeMetric.params.style.styleTitle": "スタイル",
-    "visTypeMetric.schemas.metricTitle": "メトリック",
-    "visTypeMetric.schemas.splitGroupTitle": "グループを分割",
-    "visTypeMetric.function.bgFill.help": "html 16 進数コード (#123456)、html 色 (red、blue)、または rgba 値 (rgba(255,255,255,1))。",
-    "visTypeMetric.function.bucket.help": "バケットディメンションの構成です。",
-    "visTypeMetric.function.colorMode.help": "色を変更するメトリックの部分",
-    "visTypeMetric.function.colorRange.help": "別の色が適用される値のグループを指定する範囲オブジェクト。",
-    "visTypeMetric.function.colorScheme.help": "使用する配色",
-    "visTypeMetric.function.font.help": "フォント設定です。",
-    "visTypeMetric.function.invertColors.help": "色範囲を反転します",
-    "visTypeMetric.function.metric.help": "メトリックディメンションの構成です。",
-    "visTypeMetric.function.percentage.help": "パーセンテージモードでメトリックを表示します。colorRange を設定する必要があります。",
-    "visTypeMetric.function.showLabels.help": "メトリック値の下にラベルを表示します。",
-    "visTypeMetric.function.subText.help": "メトリックの下に表示するカスタムテキスト",
-    "visTypeMetric.function.useRanges.help": "有効な色範囲です。",
-    "visTypeMetric.params.settingsTitle": "設定",
-    "visTypeMetric.params.showTitleLabel": "タイトルを表示",
-    "visTypeMetric.params.color.useForLabel": "使用する色",
-    "visTypeMetric.params.percentageModeLabel": "パーセンテージモード",
-    "visTypeMetric.params.style.fontSizeLabel": "ポイント単位のメトリックフォントサイズ",
-    "regionMap.choroplethLayer.downloadingVectorData404ErrorMessage": "{name} の取得時にサーバーから「404」が返されます。指定された場所にファイルが存在することを確認してください。",
-    "regionMap.choroplethLayer.downloadingVectorDataErrorMessage": "{name} ファイルをダウンロードできません。サーバーの CORS 構成で、このホストの Kibana アプリケーションからのリクエストが許可されていることを確認してください。",
-    "regionMap.choroplethLayer.downloadingVectorDataErrorMessageTitle": "ベクトルデータのダウンロード中にエラーが発生しました",
-    "regionMap.choroplethLayer.unrecognizedFormatErrorMessage": "認識されないフォーマット {formatType}",
-    "regionMap.function.help": "地域マップビジュアライゼーション",
-    "regionMap.mapVis.regionMapDescription": "マップにメトリックを表示します。提供されたベースマップを使用するか、独自のマップを追加できます。暗い色は大きな値を意味します。",
-    "regionMap.mapVis.regionMapEditorConfig.schemas.metricTitle": "値",
-    "regionMap.mapVis.regionMapEditorConfig.schemas.segmentTitle": "フィールドのシェイプ",
-    "regionMap.mapVis.regionMapTitle": "地域マップ",
-    "regionMap.visParams.displayWarningsLabel": "警告を表示",
-    "regionMap.visParams.joinFieldLabel": "フィールドを結合",
-    "regionMap.visParams.previewOnEMSLinkText": "EMS でプレビュー",
-    "regionMap.visParams.previewOnEMSLinkTitle": "Elastic Maps Service で {selectedLayerName} をプレビュー",
-    "regionMap.visParams.showAllShapesLabel": "すべてのシェイプを表示",
-    "regionMap.visParams.styleSettingsLabel": "スタイル設定",
-    "regionMap.visParams.switchWarningsTipText": "警告のオン・オフを切り替えます。オンの場合、結合フィールドに基づきベクトルレイヤーのシェイプと一致しない用語ごとに警告が表示されます。オフにすると、これらの警告がオフになります。",
-    "regionMap.visParams.turnOffShowingAllShapesTipText": "この設定をオフにすると、対応する用語と一致したシェイプのみが表示されます。",
-    "regionMap.visParams.vectorMapLabel": "ベクトルマップ",
-    "regionMap.visualization.unableToShowMismatchesWarningText": "次の各用語がシェイプの結合フィールドのシェイプと一致することを確認してください: {mismatches}",
-    "regionMap.visualization.unableToShowMismatchesWarningTitle": "{mismatchesLength} {oneMismatch, plural, one { 件の結果} other { 件の結果}}をマップに表示できません",
-    "regionMap.visParams.colorSchemaLabel": "カラー図表",
-    "regionMap.visParams.layerSettingsTitle": "レイヤー設定",
-    "regionMap.visParams.outlineWeightLabel": "境界の太さ",
-    "server.sampleData.ecommerceSpec.averageSalesPerRegionTitle": "[e コマース] 地域ごとの平均売上",
-    "server.sampleData.ecommerceSpec.averageSalesPriceTitle": "[e コマース] 平均販売価格",
-    "server.sampleData.ecommerceSpec.averageSoldQuantityTitle": "[e コマース] 平均販売数",
-    "server.sampleData.ecommerceSpec.controlsTitle": "[e コマース] コントロール",
-    "server.sampleData.ecommerceSpec.markdownTitle": "[e コマース] マークダウン",
-    "server.sampleData.ecommerceSpec.ordersTitle": "[e コマース] 注文",
-    "server.sampleData.ecommerceSpec.promotionTrackingTitle": "[e コマース] プロモーショントラッキング",
-    "server.sampleData.ecommerceSpec.revenueDashboardDescription": "サンプルの e コマースの注文と収益を分析します",
-    "server.sampleData.ecommerceSpec.revenueDashboardTitle": "[e コマース] 収益ダッシュボード",
-    "server.sampleData.ecommerceSpec.salesByCategoryTitle": "[e コマース] カテゴリーごとの売上",
-    "server.sampleData.ecommerceSpec.salesByGenderTitle": "[e コマース] 性別ごとの売上",
-    "server.sampleData.ecommerceSpec.soldProductsPerDayTitle": "[e コマース] 1 日の販売製品",
-    "server.sampleData.ecommerceSpec.topSellingProductsTitle": "[e コマース] トップセラー製品",
-    "server.sampleData.ecommerceSpec.totalRevenueTitle": "[e コマース] 合計収益",
-    "server.sampleData.ecommerceSpecDescription": "e コマースの注文をトラッキングするサンプルデータ、ビジュアライゼーション、ダッシュボードです。",
-    "server.sampleData.ecommerceSpecTitle": "サンプル e コマース注文",
-    "server.sampleData.flightsSpec.airlineCarrierTitle": "[フライト] 航空会社",
-    "server.sampleData.flightsSpec.airportConnectionsTitle": "[フライト] 空港乗り継ぎ (空港にカーソルを合わせてください)",
-    "server.sampleData.flightsSpec.averageTicketPriceTitle": "[フライト] 平均運賃",
-    "server.sampleData.flightsSpec.controlsTitle": "[フライト] コントロール",
-    "server.sampleData.flightsSpec.delayBucketsTitle": "[フライト] 遅延バケット",
-    "server.sampleData.flightsSpec.delaysAndCancellationsTitle": "[フライト] 遅延・欠航",
-    "server.sampleData.flightsSpec.delayTypeTitle": "[フライト] 遅延タイプ",
-    "server.sampleData.flightsSpec.destinationWeatherTitle": "[フライト] 目的地の天候",
-    "server.sampleData.flightsSpec.flightCancellationsTitle": "[フライト] フライト欠航",
-    "server.sampleData.flightsSpec.flightCountAndAverageTicketPriceTitle": "[フライト] カウントと平均運賃",
-    "server.sampleData.flightsSpec.flightDelaysTitle": "[フライト] フライトの遅延",
-    "server.sampleData.flightsSpec.flightLogTitle": "[フライト] 飛行記録",
-    "server.sampleData.flightsSpec.globalFlightDashboardDescription": "ES-Air、Logstash Airways、Kibana Airlines、JetBeats のサンプル飛行データを分析します",
-    "server.sampleData.flightsSpec.globalFlightDashboardTitle": "[フライト] グローバルフライトダッシュボード",
-    "server.sampleData.flightsSpec.markdownInstructionsTitle": "[フライト] マークダウンの指示",
-    "server.sampleData.flightsSpec.originCountryTicketPricesTitle": "[フライト] 出発国の運賃",
-    "server.sampleData.flightsSpec.originCountryTitle": "[Flights] 出発国と到着国の比較",
-    "server.sampleData.flightsSpec.totalFlightCancellationsTitle": "[フライト] フライト欠航合計",
-    "server.sampleData.flightsSpec.totalFlightDelaysTitle": "[フライト] フライト遅延合計",
-    "server.sampleData.flightsSpec.totalFlightsTitle": "[フライト] フライト合計",
-    "server.sampleData.flightsSpecDescription": "飛行ルートを監視するサンプルデータ、ビジュアライゼーション、ダッシュボードです。",
-    "server.sampleData.flightsSpecTitle": "サンプル飛行データ",
-    "server.sampleData.logsSpec.fileTypeScatterPlotTitle": "[ログ] ファイルタイプ散布図",
-    "server.sampleData.logsSpec.goalsTitle": "[ログ] 目標",
-    "server.sampleData.logsSpec.heatmapTitle": "[ログ] ヒートマップ",
-    "server.sampleData.logsSpec.hostVisitsBytesTableTitle": "[ログ] ホスト、訪問数、バイト表",
-    "server.sampleData.logsSpec.inputControlsTitle": "[ログ] インプットコントロール",
-    "server.sampleData.logsSpec.markdownInstructionsTitle": "[ログ] マークダウンの指示",
-    "server.sampleData.logsSpec.responseCodesOverTimeTitle": "[ログ] 一定期間の応答コードと注釈",
-    "server.sampleData.logsSpec.sourceAndDestinationSankeyChartTitle": "[ログ] ソースと行先のサンキーダイアグラム",
-    "server.sampleData.logsSpec.uniqueVisitorsByCountryTitle": "[ログ] 国ごとのユニークビジター",
-    "server.sampleData.logsSpec.uniqueVisitorsTitle": "[ログ] ユニークビジターと平均バイトの比較",
-    "server.sampleData.logsSpec.visitorOSTitle": "[ログ] OS 別のビジター",
-    "server.sampleData.logsSpec.webTrafficDescription": "Elastic Web サイトのサンプル Webトラフィックログデータを分析します",
-    "server.sampleData.logsSpec.webTrafficTitle": "[ログ] Web トラフィック",
-    "server.sampleData.logsSpecDescription": "Web ログを監視するサンプルデータ、ビジュアライゼーション、ダッシュボードです。",
-    "server.sampleData.logsSpecTitle": "サンプル Web ログ",
-    "server.stats.notReadyMessage": "まだ統計が準備できていません。後程再試行してください",
-    "server.status.disabledTitle": "無効",
-    "server.status.greenTitle": "緑",
-    "server.status.redTitle": "赤",
-    "server.status.uninitializedTitle": "アンインストールしました",
-    "server.status.yellowTitle": "黄色",
-    "share.contextMenu.embedCodeLabel": "埋め込みコード",
-    "share.contextMenu.embedCodePanelTitle": "埋め込みコード",
-    "share.contextMenu.permalinkPanelTitle": "パーマリンク",
-    "share.contextMenu.permalinksLabel": "パーマリンク",
-    "share.contextMenuTitle": "この {objectType} を共有",
-    "share.urlPanel.canNotShareAsSavedObjectHelpText": "{objectType} が保存されるまで保存されたオブジェクトを共有することはできません。",
-    "share.urlPanel.copyIframeCodeButtonLabel": "iFrame コードをコピー",
-    "share.urlPanel.copyLinkButtonLabel": "リンクをコピー",
-    "share.urlPanel.generateLinkAsLabel": "名前を付けてリンクを生成",
-    "share.urlPanel.savedObjectDescription": "この URL を共有することで、他のユーザーがこの {objectType} の最も最近保存されたバージョンを読み込めるようになります。",
-    "share.urlPanel.savedObjectLabel": "保存されたオブジェクト",
-    "share.urlPanel.shortUrlHelpText": "互換性が最も高くなるよう、短いスナップショット URL を共有することをお勧めします。Internet Explorer は URL の長さに制限があり、一部の wiki やマークアップパーサーは長い完全なスナップショット URL に対応していませんが、短い URL は正常に動作するはずです。",
-    "share.urlPanel.shortUrlLabel": "短い URL",
-    "share.urlPanel.snapshotDescription": "スナップショット URL には、{objectType} の現在の状態がエンコードされています。保存された {objectType} への編集内容はこの URL には反映されません。.",
-    "share.urlPanel.snapshotLabel": "スナップショット",
-    "share.urlPanel.unableCreateShortUrlErrorMessage": "短い URL を作成できません。エラー: {errorMessage}",
-    "statusPage.loadStatus.serverIsDownErrorMessage": "サーバーステータスのリクエストに失敗しました。サーバーがダウンしている可能性があります。",
-    "statusPage.loadStatus.serverStatusCodeErrorMessage": "サーバーステータスのリクエストに失敗しました。ステータスコード: {responseStatus}",
-    "statusPage.metricsTiles.columns.heapTotalHeader": "ヒープ合計",
-    "statusPage.metricsTiles.columns.heapUsedHeader": "使用ヒープ",
-    "statusPage.metricsTiles.columns.loadHeader": "読み込み",
-    "statusPage.metricsTiles.columns.requestsPerSecHeader": "1 秒あたりのリクエスト",
-    "statusPage.metricsTiles.columns.resTimeAvgHeader": "平均応答時間",
-    "statusPage.metricsTiles.columns.resTimeMaxHeader": "最長応答時間",
-    "statusPage.serverStatus.statusTitle": "Kibana のステータス: {kibanaStatus}",
-    "statusPage.statusApp.loadingErrorText": "ステータスの読み込み中にエラーが発生しました",
-    "statusPage.statusApp.statusActions.buildText": "{buildNum} を作成",
-    "statusPage.statusApp.statusActions.commitText": "{buildSha} を確定",
-    "statusPage.statusApp.statusTitle": "プラグインステータス",
-    "statusPage.statusTable.columns.idHeader": "ID",
-    "statusPage.statusTable.columns.statusHeader": "ステータス",
-    "visTypeTable.aggTable.exportLabel": "エクスポート:",
-    "visTypeTable.aggTable.formattedLabel": "フォーマット済み",
-    "visTypeTable.aggTable.rawLabel": "生",
-    "visTypeTable.directives.tableCellFilter.filterForValueTooltip": "値でフィルタリング",
-    "visTypeTable.directives.tableCellFilter.filterOutValueTooltip": "値を除外",
-    "visTypeTable.function.help": "表ビジュアライゼーション",
-    "visTypeTable.params.showMetricsLabel": "すべてのバケット/レベルのメトリックを表示",
-    "visTypeTable.params.showPartialRowsLabel": "部分的な行を表示",
-    "visTypeTable.params.showPartialRowsTip": "部分データのある行を表示。表示されていなくてもすべてのバケット/レベルのメトリックが計算されます。",
-    "visTypeTable.params.showTotalLabel": "合計を表示",
-    "visTypeTable.params.totalFunctionLabel": "合計機能",
-    "visTypeTable.tableVisDescription": "テーブルに値を表示します。",
-    "visTypeTable.tableVisEditorConfig.schemas.bucketTitle": "行を分割",
-    "visTypeTable.tableVisEditorConfig.schemas.metricTitle": "メトリック",
-    "visTypeTable.tableVisEditorConfig.schemas.splitTitle": "テーブルを分割",
-    "visTypeTable.tableVisTitle": "データテーブル",
-    "visTypeTable.vis.noResultsFoundTitle": "結果が見つかりませんでした",
-    "visTypeTable.params.PercentageColLabel": "パーセンテージ列",
-    "visTypeTable.params.percentageTableColumnName": "{title} パーセント",
-    "visTypeTable.params.defaultPercentageCol": "非表示",
-    "visTypeTable.totalAggregations.averageText": "平均",
-    "visTypeTable.totalAggregations.countText": "カウント",
-    "visTypeTable.totalAggregations.maxText": "最高",
-    "visTypeTable.totalAggregations.minText": "最低",
-    "visTypeTable.totalAggregations.sumText": "合計",
-    "visTypeTable.params.perPageLabel": "ページごとの行数",
-    "visTypeTagCloud.feedbackMessage.tooSmallContainerDescription": "コンテナーが小さすぎてクラウド全体を表示できません。タグが切り取られたか省略されている可能性があります。",
-    "visTypeTagCloud.feedbackMessage.truncatedTagsDescription": "描写時間が長くなるのを防ぐため、タグの数が切り捨てられています。",
-    "visTypeTagCloud.function.bucket.help": "バケットディメンションの構成です。",
-    "visTypeTagCloud.function.help": "タグクラウドのビジュアライゼーションです。",
-    "visTypeTagCloud.function.metric.help": "メトリックディメンションの構成です。",
-    "visTypeTagCloud.function.orientation.help": "タグクラウド内の単語の方向です。",
-    "visTypeTagCloud.function.scale.help": "単語のフォントサイズを決定するスケールです",
-    "visTypeTagCloud.vis.schemas.metricTitle": "タグサイズ",
-    "visTypeTagCloud.vis.schemas.segmentTitle": "タグ",
-    "visTypeTagCloud.vis.tagCloudDescription": "重要度に基づき大きさを変えた単語のグループ表示です。",
-    "visTypeTagCloud.vis.tagCloudTitle": "タグクラウド",
-    "visTypeTagCloud.visParams.orientationsLabel": "方向",
-    "visTypeTagCloud.vis.editorConfig.orientations.multipleText": "複数",
-    "visTypeTagCloud.vis.editorConfig.orientations.rightAngledText": "直角",
-    "visTypeTagCloud.vis.editorConfig.orientations.singleText": "単一",
-    "visTypeTagCloud.vis.editorConfig.scales.linearText": "直線",
-    "visTypeTagCloud.vis.editorConfig.scales.logText": "ログ",
-    "visTypeTagCloud.vis.editorConfig.scales.squareRootText": "平方根",
-    "visTypeTagCloud.visParams.fontSizeLabel": "フォントサイズ範囲 (ピクセル)",
-    "visTypeTagCloud.visParams.showLabelToggleLabel": "ラベルを表示",
-    "visTypeTagCloud.visParams.textScaleLabel": "テキストスケール",
-    "tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage": "子は data-update に対応できるようこのメソドを導入する必要があります",
-    "tileMap.function.help": "タイルマップのビジュアライゼーションです",
-    "tileMap.geohashLayer.mapTitle": "{mapType} マップタイプが認識されません",
-    "tileMap.tooltipFormatter.latitudeLabel": "緯度",
-    "tileMap.tooltipFormatter.longitudeLabel": "経度",
-    "tileMap.vis.map.editorConfig.schemas.geoCoordinatesTitle": "座標",
-    "tileMap.vis.map.editorConfig.schemas.metricTitle": "値",
-    "tileMap.vis.mapDescription": "マップ上に緯度と経度の座標を表示します。",
-    "tileMap.vis.mapTitle": "座標マップ",
-    "tileMap.visParams.clusterSizeLabel": "クラスターサイズ",
-    "tileMap.visParams.desaturateTilesLabel": "タイルを不飽和化",
-    "tileMap.visParams.mapTypeLabel": "マップタイプ",
-    "tileMap.visParams.reduceVibrancyOfTileColorsTip": "色の鮮明度を下げます。この機能は Internet Explorer ではバージョンにかかわらず利用できません。",
-    "tileMap.wmsOptions.attributionStringTip": "右下角の属性文字列",
-    "tileMap.wmsOptions.baseLayerSettingsTitle": "ベースレイヤー設定",
-    "tileMap.wmsOptions.imageFormatToUseTip": "通常画像/png または画像/jpeg です。サーバーが透明レイヤーを返す場合は png を使用します。",
-    "tileMap.wmsOptions.layersLabel": "レイヤー",
-    "tileMap.wmsOptions.listOfLayersToUseTip": "使用するレイヤーのコンマ区切りのリストです。",
-    "tileMap.wmsOptions.urlOfWMSWebServiceTip": "WMS web サービスの URL です。",
-    "tileMap.wmsOptions.useWMSCompliantMapTileServerTip": "WMS 対応のマップタイルサーバーを使用します。上級者向けです。",
-    "tileMap.wmsOptions.versionOfWMSserverSupportsTip": "サーバーがサポートしている WMS のバージョンです。",
-    "tileMap.wmsOptions.wmsAttributionLabel": "WMS 属性",
-    "tileMap.wmsOptions.wmsMapServerLabel": "WMS マップサーバー",
-    "tileMap.wmsOptions.wmsServerSupportedStylesListTip": "WMS サーバーがサポートしている使用スタイルのコンマ区切りのリストです。大抵は空白のままです。",
-    "tileMap.vis.editorConfig.legendPositions.bottomLeftText": "左下",
-    "tileMap.vis.editorConfig.legendPositions.bottomRightText": "右下",
-    "tileMap.vis.editorConfig.legendPositions.topLeftText": "左上",
-    "tileMap.vis.editorConfig.legendPositions.topRightText": "右上",
-    "tileMap.vis.editorConfig.mapTypes.heatmapText": "ヒートマップ",
-    "tileMap.vis.editorConfig.mapTypes.scaledCircleMarkersText": "スケーリングされた円マーカー",
-    "tileMap.vis.editorConfig.mapTypes.shadedCircleMarkersText": "影付き円マーカー",
-    "tileMap.vis.editorConfig.mapTypes.shadedGeohashGridText": "影付きジオハッシュグリッド",
-    "tileMap.visParams.colorSchemaLabel": "カラー図表",
-    "tileMap.wmsOptions.mapLoadFailDescription": "このパラメーターが正しくないと、マップが正常に読み込まれません。",
-    "tileMap.wmsOptions.wmsDescription": "WMS は、マップイメージサービスの {wmsLink} です。",
-    "tileMap.wmsOptions.wmsFormatLabel": "WMS フォーマット",
-    "tileMap.wmsOptions.wmsLayersLabel": "WMS レイヤー",
-    "tileMap.wmsOptions.wmsLinkText": "OGC スタンダード",
-    "tileMap.wmsOptions.wmsStylesLabel": "WMS スタイル",
-    "tileMap.wmsOptions.wmsUrlLabel": "WMS URL",
-    "tileMap.wmsOptions.wmsVersionLabel": "WMS バージョン",
+    "timelion.savedObjectFinder.addNewItemButtonLabel": "新規 {item} を追加",
+    "timelion.savedObjectFinder.manageItemsButtonLabel": "{items} の管理",
+    "timelion.savedObjectFinder.noMatchesFoundDescription": "一致する {items} が見つかりません。",
+    "timelion.savedObjectFinder.pageItemsFromHitCountDescription": "{hitCount} 件中 {pageFirstItem}-{pageLastItem} 件目",
+    "timelion.savedObjectFinder.sortByButtonLabeAscendingScreenReaderOnly": "昇順",
+    "timelion.savedObjectFinder.sortByButtonLabeDescendingScreenReaderOnly": "降順",
+    "timelion.savedObjectFinder.sortByButtonLabel": "名前",
+    "timelion.savedObjectFinder.sortByButtonLabelScreenReaderOnly": "並べ替え基準",
     "timelion.badge.readOnly.text": "読み込み専用",
     "timelion.badge.readOnly.tooltip": "Timelion シートを保存できません",
     "timelion.breadcrumbs.create": "作成",
@@ -3263,6 +856,2406 @@
     "timelion.vis.intervalLabel": "間隔",
     "timelion.help.functions.notAllowedGraphiteUrl": "この Graphite URL は kibana.yml ファイルで構成されていません。\n          「'timelion.graphiteUrls」で kibana.yml ファイルの Graphite サーバーリストを構成して\n          Kibana の高度な設定で選択してください",
     "timelion.emptyExpressionErrorMessage": "Timelion エラー式が入力されていません",
+    "core.ui.overlays.banner.attentionTitle": "注意",
+    "core.ui.overlays.banner.closeButtonLabel": "閉じる",
+    "core.ui.chrome.headerGlobalNav.goHomePageIconAriaLabel": "ホームページに移動",
+    "core.ui.chrome.headerGlobalNav.helpMenuButtonAriaLabel": "ヘルプメニュー",
+    "core.ui.chrome.headerGlobalNav.helpMenuTitle": "ヘルプ",
+    "core.ui.chrome.headerGlobalNav.helpMenuVersion": "v {version}",
+    "core.ui.chrome.sideGlobalNav.viewRecentItemsFlyoutTitle": "最近のアイテム",
+    "core.ui.chrome.sideGlobalNav.viewRecentItemsLabel": "最近閲覧",
+    "core.ui.recentLinks.linkItem.screenReaderLabel": "{recentlyAccessedItemLinklabel}、タイプ: {pageType}",
+    "core.ui.legacyBrowserMessage": "この Kibana インストレーションは、現在ご使用のブラウザが満たしていない厳格なセキュリティ要件が有効になっています。",
+    "core.ui.legacyBrowserTitle": "ブラウザをアップグレードしてください",
+    "core.ui.welcomeErrorMessage": "Kibana が正常に読み込まれませんでした。詳細はサーバーアウトプットを確認してください。",
+    "core.ui.welcomeMessage": "Kibana を読み込み中",
+    "core.chrome.legacyBrowserWarning": "ご使用のブラウザが Kibana のセキュリティ要件を満たしていません。",
+    "core.euiBasicTable.selectAllRows": "すべての行を選択",
+    "core.euiBasicTable.selectThisRow": "この行を選択",
+    "core.euiBasicTable.tableDescription": "以下は {itemCount} 件のアイテムの表です。",
+    "core.euiBottomBar.screenReaderAnnouncement": "ドキュメントの最後にページレベルのコントロールと共に開く新しいメニューがあります。",
+    "core.euiCardSelect.select": "選択してください",
+    "core.euiCardSelect.selected": "利用不可",
+    "core.euiCardSelect.unavailable": "選択済み",
+    "core.euiCodeBlock.copyButton": "コピー",
+    "core.euiCodeEditor.startEditing": "編集を開始するには Enter キーを押してください。",
+    "core.euiCodeEditor.startInteracting": "コードの操作を開始するには Enter キーを押してください。",
+    "core.euiCodeEditor.stopEditing": "完了したら Esc キーで編集を終了します。",
+    "core.euiCodeEditor.stopInteracting": "完了したら Esc キーでコードの操作を終了します。",
+    "core.euiCollapsedItemActions.allActions": "すべてのアクション",
+    "core.euiColorPicker.screenReaderAnnouncement": "選択可能な色の範囲を表示するポップアップが開きました。選択可能な色を閲覧するには Tab を押し、Esc でこのポップアップを閉じます。",
+    "core.euiColorPicker.swatchAriaLabel": "{swatch} を色として選択します",
+    "core.euiComboBoxOptionsList.allOptionsSelected": "利用可能なオプションをすべて選択しました",
+    "core.euiComboBoxOptionsList.alreadyAdded": "{label} は既に追加されています",
+    "core.euiComboBoxOptionsList.createCustomOption": "{searchValue} をカスタムオプションとして追加するには、{key} を押してください。",
+    "core.euiComboBoxOptionsList.loadingOptions": "オプションを読み込み中",
+    "core.euiComboBoxOptionsList.noAvailableOptions": "利用可能なオプションがありません",
+    "core.euiComboBoxOptionsList.noMatchingOptions": "{searchValue} はどのオプションにも一致していません",
+    "core.euiComboBoxPill.removeSelection": "グループの選択項目から {children} を削除してください",
+    "core.euiFilterButton.filterBadge": "${count} ${filterCountLabel} 個のフィルター",
+    "core.euiForm.addressFormErrors": "フォームのエラーを解決してください。",
+    "core.euiFormControlLayoutClearButton.label": "インプットを消去",
+    "core.euiHeaderAlert.dismiss": "閉じる",
+    "core.euiHeaderLinks.appNavigation": "アプリのナビゲーション",
+    "core.euiHeaderLinks.openNavigationMenu": "ナビゲーションメニューを開く",
+    "core.euiHue.label": "HSV カラーモードの「true」値を選択",
+    "core.euiModal.closeModal": "このモーダルウィンドウを閉じます",
+    "core.euiPagination.jumpToLastPage": "最後のページ {pageCount} に移動します",
+    "core.euiPagination.nextPage": "次のページ",
+    "core.euiPagination.pageOfTotal": "{total} ページ中 {page} ページ目",
+    "core.euiPagination.previousPage": "前のページ",
+    "core.euiPopover.screenReaderAnnouncement": "これはポップアップウィンドウです。このポップアップを閉じるには、Esc キーを押してください。",
+    "core.euiSaturation.roleDescription": "HSV カラーモード彩度と値の選択",
+    "core.euiSaturation.screenReaderAnnouncement": "矢印キーで四角いカラーグラデーションを操作します。キーを押すごとに移動する座標が 0 から 1 の範囲で HSV カラーモードの「彩度」と「値」の数字に使用されます。左で「彩度」の値を下げ、右で上げます。上で「値」の値を上げ、下で下げます。",
+    "core.euiSelectable.loadingOptions": "オプションを読み込み中",
+    "core.euiSelectable.noAvailableOptions": "利用可能なオプションがありません",
+    "core.euiSelectable.noMatchingOptions": "{searchValue} はどのオプションにも一致していません",
+    "core.euiStat.loadingText": "統計を読み込み中です",
+    "core.euiStepHorizontal.buttonTitle": "ステップ {step}: {title}{titleAppendix, select, completed { が完了} 無効 { が無効} other {}}",
+    "core.euiStepHorizontal.step": "手順",
+    "core.euiStepNumber.hasErrors": "エラーがあります",
+    "core.euiStepNumber.hasWarnings": "警告があります",
+    "core.euiStepNumber.isComplete": "完了",
+    "core.euiSuperSelect.screenReaderAnnouncement": "{optionsCount} 件のアイテムのフォームセレクターを使用中で、1 つのオプションを選択する必要があります。上下の矢印キーで移動するか、Esc キーで閉じます。",
+    "core.euiSuperSelectControl.selectAnOption": "オプションの選択: {selectedValue} を選択済み",
+    "core.euiTablePagination.rowsPerPage": "ページごとの行数",
+    "core.euiTablePagination.rowsPerPageOption": "{rowsPerPage} 行",
+    "core.euiTableSortMobile.sorting": "並べ替え",
+    "core.euiToast.dismissToast": "トーストを閉じる",
+    "core.euiToast.newNotification": "新しい通知が表示されます",
+    "core.euiToast.notification": "通知",
+    "core.fatalErrors.clearYourSessionButtonLabel": "セッションを消去",
+    "core.fatalErrors.goBackButtonLabel": "戻る",
+    "core.fatalErrors.somethingWentWrongTitle": "何か問題が発生",
+    "core.fatalErrors.tryRefreshingPageDescription": "ページを更新してみてください。うまくいかない場合は、前のページに戻るか、セッションデータを消去してください。",
+    "core.notifications.errorToast.closeModal": "閉じる",
+    "core.notifications.unableUpdateUISettingNotificationMessageTitle": "UI 設定を更新できません",
+    "core.toasts.errorToast.seeFullError": "完全なエラーを表示",
+    "core.euiSuperDatePicker.showDatesButtonLabel": "日付を表示",
+    "core.euiSuperUpdateButton.cannotUpdateTooltip": "アップデートできません",
+    "core.euiSuperUpdateButton.clickToApplyTooltip": "クリックして適用",
+    "core.euiSuperUpdateButton.refreshButtonLabel": "更新",
+    "core.euiSuperUpdateButton.updateButtonLabel": "更新",
+    "core.euiSuperUpdateButton.updatingButtonLabel": "更新中",
+    "core.application.appNotFound.pageDescription": "この URL にアプリケーションが見つかりませんでした。前の画面に戻るか、メニューからアプリを選択してみてください。",
+    "core.application.appNotFound.title": "アプリケーションが見つかりません",
+    "kibana-react.tableListView.listing.deleteButtonMessage": "{itemCount} 件の {entityName} を削除",
+    "kibana-react.tableListView.listing.deleteConfirmModalDescription": "削除された {entityNamePlural} は復元できません。",
+    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.cancelButtonLabel": "キャンセル",
+    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.confirmButtonLabel": "削除",
+    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.confirmButtonLabelDeleting": "削除中",
+    "kibana-react.tableListView.listing.listingLimitExceeded.advancedSettingsLinkText": "高度な設定",
+    "kibana-react.tableListView.listing.listingLimitExceededDescription": "{totalItems} 件の {entityNamePlural} がありますが、{listingLimitText} の設定により {listingLimitValue} 件までしか下の表に表示できません。この設定は {advancedSettingsLink} で変更できます。",
+    "kibana-react.tableListView.listing.listingLimitExceededTitle": "リスティング制限超過",
+    "kibana-react.tableListView.listing.noAvailableItemsMessage": "利用可能な {entityNamePlural} がありません。",
+    "kibana-react.tableListView.listing.noMatchedItemsMessage": "検索条件に一致する {entityNamePlural} がありません。",
+    "kibana-react.tableListView.listing.table.actionTitle": "アクション",
+    "kibana-react.tableListView.listing.table.editActionDescription": "編集",
+    "kibana-react.tableListView.listing.table.editActionName": "編集",
+    "kibana-react.tableListView.listing.unableToDeleteDangerMessage": "{entityName} を削除できません",
+    "kibana-react.exitFullScreenButton.exitFullScreenModeButtonAriaLabel": "全画面モードを終了",
+    "kibana-react.exitFullScreenButton.exitFullScreenModeButtonLabel": "全画面を終了",
+    "kibana-react.exitFullScreenButton.fullScreenModeDescription": "ESC キーで全画面モードを終了します。",
+    "kibana-react.savedObjects.finder.filterButtonLabel": "タイプ",
+    "kibana-react.savedObjects.finder.searchPlaceholder": "検索...",
+    "kibana-react.savedObjects.finder.sortAsc": "昇順",
+    "kibana-react.savedObjects.finder.sortAuto": "ベストマッチ",
+    "kibana-react.savedObjects.finder.sortButtonLabel": "並べ替え",
+    "kibana-react.savedObjects.finder.sortDesc": "降順",
+    "kibana-react.savedObjects.saveModal.cancelButtonLabel": "キャンセル",
+    "kibana-react.savedObjects.saveModal.descriptionLabel": "説明",
+    "kibana-react.savedObjects.saveModal.duplicateTitleDescription": "{confirmSaveLabel} をクリックすると、既存の {objectType} が上書きされます。",
+    "kibana-react.savedObjects.saveModal.duplicateTitleLabel": "「{title}」というタイトルの {objectType} が既に存在します",
+    "kibana-react.savedObjects.saveModal.saveAsNewLabel": "新規 {objectType} として保存",
+    "kibana-react.savedObjects.saveModal.saveButtonLabel": "保存",
+    "kibana-react.savedObjects.saveModal.saveTitle": "{objectType} を保存",
+    "kibana-react.savedObjects.saveModal.titleLabel": "タイトル",
+    "kibana_utils.stateManagement.url.unableToRestoreUrlErrorMessage": "URL を完全に復元できません。共有機能を使用していることを確認してください。",
+    "kibana_utils.stateManagement.url.unableToStoreHistoryInSessionErrorMessage": "セッションがいっぱいで安全に削除できるアイテムが見つからないため、Kibana は履歴アイテムを保存できません。\n\nこれは大抵新規タブに移動することで解決されますが、より大きな問題が原因である可能性もあります。このメッセージが定期的に表示される場合は、{gitHubIssuesUrl} で問題を報告してください。",
+    "inspector.closeButton": "インスペクターを閉じる",
+    "inspector.reqTimestampDescription": "リクエストの開始が記録された時刻です",
+    "inspector.reqTimestampKey": "リクエストのタイムスタンプ",
+    "inspector.title": "インスペクター",
+    "inspector.view": "{viewName} を表示",
+    "inspector.data.dataDescriptionTooltip": "ビジュアライゼーションの元のデータを表示",
+    "inspector.data.dataTitle": "データ",
+    "inspector.data.downloadCSVButtonLabel": "CSV をダウンロード",
+    "inspector.data.downloadCSVToggleButtonLabel": "CSV をダウンロード",
+    "inspector.data.filterForValueButtonAriaLabel": "値でフィルタリング",
+    "inspector.data.filterForValueButtonTooltip": "値でフィルタリング",
+    "inspector.data.filterOutValueButtonAriaLabel": "値を除外",
+    "inspector.data.filterOutValueButtonTooltip": "値を除外",
+    "inspector.data.formattedCSVButtonLabel": "フォーマット済み CSV",
+    "inspector.data.formattedCSVButtonTooltip": "データを表形式でダウンロード",
+    "inspector.data.gatheringDataLabel": "データを収集中",
+    "inspector.data.noDataAvailableDescription": "エレメントがデータを提供しませんでした。",
+    "inspector.data.noDataAvailableTitle": "利用可能なデータがありません",
+    "inspector.data.rawCSVButtonLabel": "CSV",
+    "inspector.data.rawCSVButtonTooltip": "日付をタイムスタンプとしてなど、提供されたデータをそのままダウンロードします",
+    "inspector.requests.descriptionRowIconAriaLabel": "説明",
+    "inspector.requests.failedLabel": " (失敗)",
+    "inspector.requests.noRequestsLoggedDescription.elementHasNotLoggedAnyRequestsText": "エレメントが (まだ) リクエストを記録していません。",
+    "inspector.requests.noRequestsLoggedDescription.whatDoesItUsuallyMeanText": "これは通常、データを取得する必要がないか、エレメントがまだデータの取得を開始していないことを意味します。",
+    "inspector.requests.noRequestsLoggedTitle": "リクエストが記録されていません",
+    "inspector.requests.requestFailedTooltipTitle": "リクエストに失敗しました",
+    "inspector.requests.requestInProgressAriaLabel": "リクエスト進行中",
+    "inspector.requests.requestLabel": "リクエスト",
+    "inspector.requests.requestsDescriptionTooltip": "データを収集したリクエストを表示します",
+    "inspector.requests.requestsTitle": "リクエスト",
+    "inspector.requests.requestSucceededTooltipTitle": "リクエスト成功",
+    "inspector.requests.requestTabLabel": "リクエスト",
+    "inspector.requests.requestTimeLabel": "{requestTime}ms",
+    "inspector.requests.requestTooltipDescription": "リクエストの合計所要時間です。",
+    "inspector.requests.requestWasMadeDescription": "{requestsCount, plural, one {# リクエストが} other {# リクエストが} } 行われました{failedRequests}",
+    "inspector.requests.requestWasMadeDescription.requestHadFailureText": "、{failedCount} 件に失敗がありました",
+    "inspector.requests.responseTabLabel": "応答",
+    "inspector.requests.statisticsTabLabel": "統計",
+    "console.autocomplete.addMethodMetaText": "メソド",
+    "console.consoleDisplayName": "コンソール",
+    "console.devToolsDescription": "cURL をスキップしこの JSON インスタンスを使って、データに直接アクセスします。",
+    "console.devToolsTitle": "コンソール",
+    "console.helpPage.keyboardCommands.autoIndentDescription": "現在のリクエストを自動インデントします",
+    "console.helpPage.keyboardCommands.closeAutoCompleteMenuDescription": "自動入力メニューを閉じます",
+    "console.helpPage.keyboardCommands.collapseAllScopesDescription": "現在のスコープを除きすべてのスコープを最小表示します。シフトを追加して拡張します。",
+    "console.helpPage.keyboardCommands.collapseExpandCurrentScopeDescription": "現在のスコープを最小/拡張表示します。",
+    "console.helpPage.keyboardCommands.jumpToPreviousNextRequestDescription": "前/次のリクエストの開始または終了に移動します。",
+    "console.helpPage.keyboardCommands.openAutoCompleteDescription": "自動入力を開きます (未入力時を含む)",
+    "console.helpPage.keyboardCommands.openDocumentationDescription": "現在のリクエストのドキュメントを開きます",
+    "console.helpPage.keyboardCommands.selectCurrentlySelectedInAutoCompleteMenuDescription": "現在の選択項目または自動入力メニューで最も使用されている用語を選択します",
+    "console.helpPage.keyboardCommands.submitRequestDescription": "リクエストを送信します",
+    "console.helpPage.keyboardCommands.switchFocusToAutoCompleteMenuDescription": "自動入力メニューに焦点を切り替えます。矢印でさらに用語を選択します",
+    "console.helpPage.keyboardCommandsTitle": "キーボードコマンド",
+    "console.helpPage.pageTitle": "ヘルプ",
+    "console.helpPage.requestFormatDescription": "ホワイトエディターに 1 つまたは複数のリクエストを入力できます。コンソールはコンパクトなフォーマットのリクエストを理解できます。",
+    "console.helpPage.requestFormatTitle": "リクエストフォーマット",
+    "console.historyPage.applyHistoryButtonLabel": "適用",
+    "console.historyPage.clearHistoryButtonLabel": "消去",
+    "console.historyPage.itemOfRequestListAriaLabel": "リクエスト: {historyItem}",
+    "console.historyPage.noHistoryTextMessage": "履歴がありません",
+    "console.historyPage.pageTitle": "履歴",
+    "console.historyPage.requestListAriaLabel": "リクエストの送信履歴",
+    "console.requestOptions.autoIndentButtonLabel": "自動インデント",
+    "console.requestOptions.copyAsUrlButtonLabel": "cURL としてコピー",
+    "console.requestOptions.openDocumentationButtonLabel": "ドキュメントを開く",
+    "console.requestOptionsButtonAriaLabel": "リクエストオプション",
+    "console.sendRequestButtonTooltip": "クリックしてリクエストを送信します",
+    "console.settingsPage.autocompleteLabel": "自動入力",
+    "console.settingsPage.cancelButtonLabel": "キャンセル",
+    "console.settingsPage.fieldsLabelText": "フィールド",
+    "console.settingsPage.fontSizeLabel": "フォントサイズ",
+    "console.settingsPage.indicesAndAliasesLabelText": "インデックスとエイリアス",
+    "console.settingsPage.pageTitle": "設定",
+    "console.settingsPage.saveButtonLabel": "保存",
+    "console.settingsPage.templatesLabelText": "テンプレート",
+    "console.settingsPage.wrapLongLinesLabelText": "長い行を改行",
+    "console.topNav.helpTabDescription": "ヘルプ",
+    "console.topNav.helpTabLabel": "ヘルプ",
+    "console.topNav.historyTabDescription": "履歴",
+    "console.topNav.historyTabLabel": "履歴",
+    "console.topNav.settingsTabDescription": "設定",
+    "console.topNav.settingsTabLabel": "設定",
+    "console.welcomePage.closeButtonLabel": "始めましょう",
+    "console.welcomePage.pageTitle": "コンソールへようこそ",
+    "console.welcomePage.quickIntroDescription": "コンソール UI は、エディターペイン (左) と応答ペイン (右) の 2 つのペインに分かれています。エディターでリクエストを入力し、Elasticsearch に送信します。結果が右側の応答ペインに表示されます。",
+    "console.welcomePage.quickIntroTitle": "UI の簡単な説明",
+    "console.welcomePage.quickTips.cUrlFormatForRequestsDescription": "cURL フォーマットのリクエストを張り付けると、Console 構文に変換されます。",
+    "console.welcomePage.quickTips.keyboardShortcutsDescription": "ヘルプボタンでキーボードショートカットが学べます。便利な情報が揃っています！",
+    "console.welcomePage.quickTips.resizeEditorDescription": "間の区切りをドラッグすることで、エディターとアウトプットペインのサイズを変更できます。",
+    "console.welcomePage.quickTips.submitRequestDescription": "緑の三角形のボタンをクリックして ES にリクエストを送信します。",
+    "console.welcomePage.quickTips.useWrenchMenuDescription": "レンチメニューで他の便利な機能が使えます。",
+    "console.welcomePage.quickTipsTitle": "今のうちにいくつか簡単なコツをお教えします",
+    "console.welcomePage.supportedRequestFormatTitle": "コンソールは cURL と同様に、コンパクトなフォーマットのリクエストを理解できます。",
+    "console.consoleMenu.copyAsCurlMessage": "リクエストが URL としてコピーされました",
+    "data.filter.applyFilters.popupHeader": "適用するフィルターの選択",
+    "data.filter.applyFiltersPopup.cancelButtonLabel": "キャンセル",
+    "data.filter.applyFiltersPopup.saveButtonLabel": "適用",
+    "data.filter.filterBar.addFilterButtonLabel": "フィルターを追加します",
+    "data.filter.filterBar.deleteFilterButtonLabel": "削除",
+    "data.filter.filterBar.disabledFilterPrefix": "無効",
+    "data.filter.filterBar.disableFilterButtonLabel": "一時的に無効にする",
+    "data.filter.filterBar.editFilterButtonLabel": "フィルターを編集",
+    "data.filter.filterBar.enableFilterButtonLabel": "再度有効にする",
+    "data.filter.filterBar.excludeFilterButtonLabel": "結果を除外",
+    "data.filter.filterBar.filterItemBadgeAriaLabel": "フィルターアクション",
+    "data.filter.filterBar.filterItemBadgeIconAriaLabel": "削除",
+    "data.filter.filterBar.includeFilterButtonLabel": "結果を含める",
+    "data.filter.filterBar.indexPatternSelectPlaceholder": "インデックスパターンの選択",
+    "data.filter.filterBar.negatedFilterPrefix": "NOT ",
+    "data.filter.filterBar.pinFilterButtonLabel": "すべてのアプリにピン付け",
+    "data.filter.filterBar.pinnedFilterPrefix": "ピン付け済み",
+    "data.filter.filterBar.unpinFilterButtonLabel": "ピンを外す",
+    "data.filter.filterEditor.cancelButtonLabel": "キャンセル",
+    "data.filter.filterEditor.createCustomLabelInputLabel": "カスタムラベル",
+    "data.filter.filterEditor.createCustomLabelSwitchLabel": "カスタムラベルを作成しますか？",
+    "data.filter.filterEditor.dateFormatHelpLinkLabel": "対応データフォーマット",
+    "data.filter.filterEditor.doesNotExistOperatorOptionLabel": "存在しません",
+    "data.filter.filterEditor.editFilterPopupTitle": "フィルターを編集",
+    "data.filter.filterEditor.editFilterValuesButtonLabel": "フィルター値を編集",
+    "data.filter.filterEditor.editQueryDslButtonLabel": "クエリ DSL として編集",
+    "data.filter.filterEditor.existsOperatorOptionLabel": "存在する",
+    "data.filter.filterEditor.falseOptionLabel": "false",
+    "data.filter.filterEditor.fieldSelectLabel": "フィールド",
+    "data.filter.filterEditor.fieldSelectPlaceholder": "フィールドを選択",
+    "data.filter.filterEditor.indexPatternSelectLabel": "インデックスパターン",
+    "data.filter.filterEditor.isBetweenOperatorOptionLabel": "is between",
+    "data.filter.filterEditor.isNotBetweenOperatorOptionLabel": "is not between",
+    "data.filter.filterEditor.isNotOneOfOperatorOptionLabel": "is not one of",
+    "data.filter.filterEditor.isNotOperatorOptionLabel": "is not",
+    "data.filter.filterEditor.isOneOfOperatorOptionLabel": "is one of",
+    "data.filter.filterEditor.isOperatorOptionLabel": "が",
+    "data.filter.filterEditor.operatorSelectLabel": "演算子",
+    "data.filter.filterEditor.rangeEndInputPlaceholder": "範囲の終了値",
+    "data.filter.filterEditor.rangeStartInputPlaceholder": "範囲の開始値",
+    "data.filter.filterEditor.saveButtonLabel": "保存",
+    "data.filter.filterEditor.trueOptionLabel": "true",
+    "data.filter.filterEditor.valueInputLabel": "値",
+    "data.filter.filterEditor.valueInputPlaceholder": "値を入力",
+    "data.filter.filterEditor.valueSelectPlaceholder": "値を選択",
+    "data.filter.filterEditor.valuesSelectLabel": "値",
+    "data.filter.filterEditor.valuesSelectPlaceholder": "値を選択",
+    "data.filter.options.changeAllFiltersButtonLabel": "すべてのフィルターの変更",
+    "data.filter.options.deleteAllFiltersButtonLabel": "すべて削除",
+    "data.filter.options.disableAllFiltersButtonLabel": "すべて無効にする",
+    "data.filter.options.enableAllFiltersButtonLabel": "すべて有効にする",
+    "data.filter.options.invertDisabledFiltersButtonLabel": "有効・無効を反転",
+    "data.filter.options.invertNegatedFiltersButtonLabel": "含める・除外を反転",
+    "data.filter.options.pinAllFiltersButtonLabel": "すべてピン付け",
+    "data.filter.options.unpinAllFiltersButtonLabel": "すべてのピンを外す",
+    "data.filter.searchBar.changeAllFiltersTitle": "すべてのフィルターの変更",
+    "data.indexPatterns.fetchFieldErrorTitle": "フィールドの取得中にエラーが発生",
+    "data.indexPatterns.unableWriteLabel": "インデックスパターンを書き込めません！このインデックスパターンへの最新の変更を取得するには、ページを更新してください。",
+    "data.indexPatterns.unknownFieldErrorMessage": "インデックスパターン「{title}」のフィールド「{name}」が不明なフィールドタイプを使用しています。",
+    "data.indexPatterns.unknownFieldHeader": "不明なフィールドタイプ {type}",
+    "data.query.queryBar.kqlFullLanguageName": "Kibana クエリ言語",
+    "data.query.queryBar.kqlLanguageName": "KQL",
+    "data.query.queryBar.kqlOffLabel": "オフ",
+    "data.query.queryBar.kqlOnLabel": "オン",
+    "data.query.queryBar.luceneLanguageName": "Lucene",
+    "data.query.queryBar.luceneSyntaxWarningMessage": "Lucene クエリ構文を使用しているようですが、Kibana クエリ言語 (KQL) が選択されています。KQL ドキュメント {link} を確認してください。",
+    "data.query.queryBar.luceneSyntaxWarningTitle": "Lucene 構文警告",
+    "data.query.queryBar.searchInputPlaceholder": "検索",
+    "data.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) は、シンプルなクエリ構文とスクリプトフィールドのサポートを提供します。また、KQL はベーシックライセンス以上をご利用の場合、自動入力も提供します。KQL をオフにすると、Kibana は Lucene を使用します。",
+    "data.query.queryBar.syntaxOptionsDescription.docsLinkText": "こちら",
+    "data.query.queryBar.syntaxOptionsTitle": "構文オプション",
+    "data.filter.filterEditor.queryDslLabel": "Elasticsearch クエリ DSL",
+    "data.query.queryBar.luceneSyntaxWarningOptOutText": "今後表示しない",
+    "data.search.searchBar.savedQueryDescriptionLabelText": "説明",
+    "data.search.searchBar.savedQueryDescriptionText": "再度使用するクエリテキストとフィルターを保存します。",
+    "data.search.searchBar.savedQueryForm.titleConflictText": "タイトルが既に保存されているクエリに使用されています",
+    "data.search.searchBar.savedQueryForm.whitespaceErrorText": "タイトルの始めと終わりにはスペースを使用できません",
+    "data.search.searchBar.savedQueryFormCancelButtonText": "キャンセル",
+    "data.search.searchBar.savedQueryFormSaveButtonText": "保存",
+    "data.search.searchBar.savedQueryFormTitle": "クエリを保存",
+    "data.search.searchBar.savedQueryIncludeFiltersLabelText": "フィルターを含める",
+    "data.search.searchBar.savedQueryIncludeTimeFilterLabelText": "時間フィルターを含める",
+    "data.search.searchBar.savedQueryNameHelpText": "名前が必要です。タイトルの始めと終わりにはスペースを使用できません。名前は固有でなければなりません。",
+    "data.search.searchBar.savedQueryNameLabelText": "名前",
+    "data.search.searchBar.savedQueryNoSavedQueriesText": "保存されたクエリがありません。",
+    "data.search.searchBar.savedQueryPopoverButtonText": "保存されたクエリを表示",
+    "data.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "現在保存されているクエリを消去",
+    "data.search.searchBar.savedQueryPopoverClearButtonText": "消去",
+    "data.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "キャンセル",
+    "data.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "削除",
+    "data.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "「{savedQueryName}」を削除しますか？",
+    "data.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "保存されたクエリ {savedQueryName} を削除",
+    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "新規保存",
+    "data.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "新規保存クエリを保存",
+    "data.search.searchBar.savedQueryPopoverSaveButtonText": "現在のクエリを保存",
+    "data.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "{title} への変更を保存",
+    "data.search.searchBar.savedQueryPopoverSaveChangesButtonText": "変更を保存",
+    "data.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "保存クエリボタン {savedQueryName}",
+    "data.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "{savedQueryName} の説明",
+    "data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "選択されたクエリボタン {savedQueryName} を保存しました。変更を破棄するには押してください。",
+    "data.search.searchBar.savedQueryPopoverTitleText": "保存されたクエリ",
+    "data.search.searchSource.fetch.shardsFailedModal.close": "閉じる",
+    "data.search.searchSource.fetch.shardsFailedModal.copyToClipboard": "応答をクリップボードにコピー",
+    "data.search.searchSource.fetch.shardsFailedModal.failureHeader": "{failureName} で {failureDetails}",
+    "data.search.searchSource.fetch.shardsFailedModal.showDetails": "詳細を表示",
+    "data.search.searchSource.fetch.shardsFailedModal.tabHeaderRequest": "リクエスト",
+    "data.search.searchSource.fetch.shardsFailedModal.tabHeaderResponse": "応答",
+    "data.search.searchSource.fetch.shardsFailedModal.tabHeaderShardFailures": "シャードエラー",
+    "data.search.searchSource.fetch.shardsFailedModal.tableColIndex": "インデックス",
+    "data.search.searchSource.fetch.shardsFailedModal.tableColNode": "ノード",
+    "data.search.searchSource.fetch.shardsFailedModal.tableColReason": "理由",
+    "data.search.searchSource.fetch.shardsFailedModal.tableColShard": "シャード",
+    "data.search.searchSource.fetch.shardsFailedModal.tableRowCollapse": "{rowDescription} を折りたたむ",
+    "data.search.searchSource.fetch.shardsFailedModal.tableRowExpand": "{rowDescription} を展開する",
+    "data.search.searchSource.fetch.shardsFailedNotificationDescription": "表示されているデータは不完全か誤りの可能性があります。",
+    "data.search.searchSource.fetch.requestTimedOutNotificationMessage": "リクエストがタイムアウトしたため、データが不完全な可能性があります",
+    "data.search.searchSource.fetch.shardsFailedNotificationMessage": "{shardsTotal} 件中 {shardsFailed} 件のシャードでエラーが発生しました",
+    "data.search.searchSource.hitsDescription": "クエリにより返されたドキュメントの数です。",
+    "data.search.searchSource.hitsLabel": "ヒット数",
+    "data.search.searchSource.hitsTotalDescription": "クエリに一致するドキュメントの数です。",
+    "data.search.searchSource.hitsTotalLabel": "ヒット数 (合計)",
+    "data.search.searchSource.indexPatternDescription": "Elasticsearch インデックスに接続したインデックスパターンです。",
+    "data.search.searchSource.indexPatternIdDescription": "{kibanaIndexPattern} インデックス内の ID です。",
+    "data.search.searchSource.indexPatternIdLabel": "インデックスパターン ID",
+    "data.search.searchSource.indexPatternLabel": "インデックスパターン",
+    "data.search.searchSource.noSearchStrategyRegisteredErrorMessageDescription": "検索リクエストの検索方法が見つかりませんでした",
+    "data.search.searchSource.noSearchStrategyRegisteredErrorMessageTitle": "検索方法が登録されていません",
+    "data.search.searchSource.queryTimeDescription": "クエリの処理の所要時間です。リクエストの送信やブラウザでのパースの時間は含まれません。",
+    "data.search.searchSource.queryTimeLabel": "クエリ時間",
+    "data.search.searchSource.queryTimeValue": "{queryTime}ms",
+    "data.search.searchSource.requestTimeDescription": "ブラウザから Elasticsearch にリクエストが送信され返されるまでの所要時間です。リクエストがキューで待機していた時間は含まれません。",
+    "data.search.searchSource.requestTimeLabel": "リクエスト時間",
+    "data.search.searchSource.requestTimeValue": "{requestTime}ms",
+    "data.filter.filterEditor.operatorSelectPlaceholderSelect": "選択してください",
+    "data.filter.filterEditor.operatorSelectPlaceholderWaiting": "待機中",
+    "data.filter.filterEditor.rangeInputLabel": "範囲",
+    "data.query.queryBar.comboboxAriaLabel": "{pageType} ページの検索とフィルタリング",
+    "data.search.searchBar.savedQueryForm.titleMissingText": "名前が必要です",
+    "data.query.queryBar.searchInputAriaLabel": "{pageType} ページの検索とフィルタリングを行うには入力を開始してください",
+    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "新規保存クエリを保存",
+    "data.functions.esaggs.help": "AggConfig 集約を実行します",
+    "data.functions.esaggs.inspector.dataRequest.description": "このリクエストは Elasticsearch にクエリし、ビジュアライゼーション用のデータを取得します。",
+    "data.functions.esaggs.inspector.dataRequest.title": "データ",
+    "data.common.esQuery.kql.errors.endOfInputText": "インプットの終わり",
+    "data.common.esQuery.kql.errors.fieldNameText": "フィールド名",
+    "data.common.esQuery.kql.errors.literalText": "文字通り",
+    "data.common.esQuery.kql.errors.syntaxError": "{expectedList} が予測されましたが {foundInput} が検出されました。",
+    "data.common.esQuery.kql.errors.valueText": "値",
+    "data.common.esQuery.kql.errors.whitespaceText": "ホワイトスペース",
+    "devTools.badge.readOnly.text": "読み込み専用",
+    "devTools.badge.readOnly.tooltip": "を保存できませんでした",
+    "devTools.k7BreadcrumbsDevToolsLabel": "開発ツール",
+    "embeddableApi.actions.applyFilterActionTitle": "現在のビューにフィルターを適用",
+    "embeddableApi.addPanel.createNewDefaultOption": "新規作成...",
+    "embeddableApi.addPanel.displayName": "パネルの追加",
+    "embeddableApi.addPanel.savedObjectAddedToContainerSuccessMessageTitle": "{savedObjectName} が追加されました",
+    "embeddableApi.addPanel.Title": "パネルの追加",
+    "embeddableApi.customizePanel.action.displayName": "パネルをカスタマイズ",
+    "embeddableApi.customizePanel.modal.cancel": "キャンセル",
+    "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleFormRowLabel": "パネルタイトル",
+    "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleInputAriaLabel": "パネルのカスタムタイトルを入力してください",
+    "embeddableApi.customizePanel.modal.optionsMenuForm.resetCustomDashboardButtonLabel": "リセット",
+    "embeddableApi.customizePanel.modal.saveButtonTitle": "保存",
+    "embeddableApi.customizePanel.modal.showTitle": "パネルタイトルを表示",
+    "embeddableApi.customizeTitle.optionsMenuForm.panelTitleFormRowLabel": "パネルタイトル",
+    "embeddableApi.customizeTitle.optionsMenuForm.panelTitleInputAriaLabel": "このインプットへの変更は直ちに適用されます。Enter を押して閉じます。",
+    "embeddableApi.customizeTitle.optionsMenuForm.resetCustomDashboardButtonLabel": "タイトルをリセット",
+    "embeddableApi.errors.embeddableFactoryNotFound": "{type} を読み込めません。Elasticsearch と Kibana のデフォルトのディストリビューションを適切なライセンスでアップグレードしてください。",
+    "embeddableApi.errors.paneldoesNotExist": "パネルが見つかりません",
+    "embeddableApi.panel.editPanel.displayName": "{value} を編集",
+    "embeddableApi.panel.inspectPanel.displayName": "検査",
+    "embeddableApi.panel.optionsMenu.panelOptionsButtonAriaLabel": "パネルオプション",
+    "embeddableApi.panel.removePanel.displayName": "ダッシュボードから削除",
+    "embeddableApi.samples.contactCard.displayName": "連絡先カード",
+    "embeddableApi.samples.filterableContainer.displayName": "フィルター可能なダッシュボード",
+    "embeddableApi.samples.filterableEmbeddable.displayName": "フィルター可能",
+    "embeddableApi.panel.enhancedDashboardPanelAriaLabel": "ダッシュボードパネル: {title}",
+    "embeddableApi.panel.optionsMenu.panelOptionsButtonEnhancedAriaLabel": "{title} のパネルオプション",
+    "embeddableApi.panel.dashboardPanelAriaLabel": "ダッシュボードパネル",
+    "inputControl.control.noIndexPatternTooltip": "index-pattern id が見つかりませんでした: {indexPatternId}.",
+    "inputControl.control.notInitializedTooltip": "コントロールが初期化されていません",
+    "inputControl.control.noValuesDisableTooltip": "「{indexPatternName}」インデックスパターンでいずれのドキュメントにも存在しない「{fieldName}」フィールドがフィルターの対象になっています。異なるフィールドを選択するか、このフィールドに値が入力されているドキュメントをインデックスしてください。",
+    "inputControl.editor.controlEditor.controlLabel": "コントロールラベル",
+    "inputControl.editor.controlEditor.moveControlDownAriaLabel": "コントロールを下に移動",
+    "inputControl.editor.controlEditor.moveControlUpAriaLabel": "コントロールを上に移動",
+    "inputControl.editor.controlEditor.removeControlAriaLabel": "コントロールを削除",
+    "inputControl.editor.controlsTab.addButtonLabel": "追加",
+    "inputControl.editor.controlsTab.select.addControlAriaLabel": "コントロールを追加",
+    "inputControl.editor.controlsTab.select.controlTypeAriaLabel": "コントロールタイプを選択してください",
+    "inputControl.editor.controlsTab.select.listDropDownOptionLabel": "オプションリスト",
+    "inputControl.editor.controlsTab.select.rangeDropDownOptionLabel": "範囲スライダー",
+    "inputControl.editor.fieldSelect.fieldLabel": "フィールド",
+    "inputControl.editor.fieldSelect.selectFieldPlaceholder": "フィールドを選択してください...",
+    "inputControl.editor.indexPatternSelect.patternLabel": "インデックスパターン",
+    "inputControl.editor.indexPatternSelect.patternPlaceholder": "インデックスパターンを選択してください",
+    "inputControl.editor.listControl.dynamicOptions.stringFieldDescription": "「文字列」フィールドでのみ利用可能",
+    "inputControl.editor.listControl.dynamicOptions.updateDescription": "ユーザーインプットに対する更新オプション",
+    "inputControl.editor.listControl.dynamicOptionsLabel": "ダイナミックオプション",
+    "inputControl.editor.listControl.multiselectDescription": "複数選択を許可",
+    "inputControl.editor.listControl.multiselectLabel": "複数選択",
+    "inputControl.editor.listControl.parentDescription": "オプションは親コントロールの値がベースになっています。親が設定されていない場合は無効です。",
+    "inputControl.editor.listControl.parentLabel": "親コントロール",
+    "inputControl.editor.listControl.sizeDescription": "オプション数",
+    "inputControl.editor.listControl.sizeLabel": "サイズ",
+    "inputControl.editor.optionsTab.pinFiltersLabel": "すべてのアプリケーションのフィルターをピン付け",
+    "inputControl.editor.optionsTab.updateFilterLabel": "変更するごとに Kibana フィルターを更新",
+    "inputControl.editor.optionsTab.useTimeFilterLabel": "時間フィルターを使用",
+    "inputControl.editor.rangeControl.decimalPlacesLabel": "小数部分の桁数",
+    "inputControl.editor.rangeControl.stepSizeLabel": "ステップサイズ",
+    "inputControl.function.help": "インプットコントロールビジュアライゼーション",
+    "inputControl.listControl.disableTooltip": "「{label}」が設定されるまで無効です。",
+    "inputControl.listControl.unableToFetchTooltip": "用語を取得できません、エラー: {errorMessage}",
+    "inputControl.rangeControl.unableToFetchTooltip": "範囲 (最低値と最高値) を取得できません、エラー: {errorMessage}",
+    "inputControl.register.controlsDescription": "ダッシュボードを簡単に操作できるように、インタラクティブなコントロールを作成します。",
+    "inputControl.register.controlsTitle": "コントロール",
+    "inputControl.register.tabs.controlsTitle": "コントロール",
+    "inputControl.register.tabs.optionsTitle": "オプション",
+    "inputControl.vis.inputControlVis.applyChangesButtonLabel": "変更を適用",
+    "inputControl.vis.inputControlVis.cancelChangesButtonLabel": "変更をキャンセル",
+    "inputControl.vis.inputControlVis.clearFormButtonLabel": "用語を消去",
+    "inputControl.vis.listControl.selectPlaceholder": "選択してください…",
+    "inputControl.vis.listControl.selectTextPlaceholder": "選択してください…",
+    "inputControl.vis.listControl.partialResultsWarningMessage": "リクエストに長くかかり過ぎているため、用語リストが不完全な可能性があります。完全な結果を得るには、kibana.yml の自動完了設定を調整してください。",
+    "visualizations.function.visDimension.accessor.help": "使用するデータセット内の列 (列インデックスまたは列名)",
+    "visualizations.function.visDimension.error.accessor": "入力された列名は無効です。",
+    "visualizations.function.visDimension.help": "visConfig ディメンションオブジェクトを生成します",
+    "expressions.functions.kibana_context.help": "Kibana グローバルコンテキストを更新します",
+    "expressions.functions.kibana.help": "Kibana グローバルコンテキストを取得します",
+    "expressions.functions.font.args.alignHelpText": "水平テキスト配置",
+    "expressions.functions.font.args.colorHelpText": "文字の色です。",
+    "expressions.functions.font.args.italicHelpText": "テキストを斜体にしますか？",
+    "expressions.functions.font.args.lHeightHelpText": "ピクセル単位の行の高さです。",
+    "expressions.functions.font.args.sizeHelpText": "ピクセル単位のフォントサイズです。",
+    "expressions.functions.font.args.underlineHelpText": "テキストに下線を引きますか？",
+    "expressions.functions.font.args.weightHelpText": "フォントの重量です。例: {list} または {end}。",
+    "expressions.functions.fontHelpText": "フォントスタイルを作成します。",
+    "kbn.advancedSettings.context.defaultSizeText": "コンテキストビューに表示される周りのエントリーの数",
+    "kbn.advancedSettings.context.defaultSizeTitle": "コンテキストサイズ",
+    "kbn.advancedSettings.context.sizeStepText": "コンテキストサイズを増減させる際の最低単位です",
+    "kbn.advancedSettings.context.sizeStepTitle": "コンテキストサイズのステップ",
+    "kbn.advancedSettings.context.tieBreakerFieldsText": "同じタイムスタンプ値のドキュメントを区別するためのコンマ区切りのフィールドのリストです。このリストから、現在のインデックスパターンに含まれ並べ替え可能な初めのフィールドが使用されます。",
+    "kbn.advancedSettings.context.tieBreakerFieldsTitle": "タイブレーカーフィールド",
+    "kbn.advancedSettings.courier.customRequestPreference.requestPreferenceLinkText": "リクエスト設定",
+    "kbn.advancedSettings.courier.customRequestPreferenceText": "{setRequestReferenceSetting} が {customSettingValue} に設定されている時に使用される {requestPreferenceLink} です。",
+    "kbn.advancedSettings.courier.customRequestPreferenceTitle": "カスタムリクエスト設定",
+    "kbn.advancedSettings.courier.ignoreFilterText": "この構成は、似ていないインデックスにアクセスするビジュアライゼーションを含むダッシュボードのサポートを強化します。無効にすると、すべてのフィルターがすべてのビジュアライゼーションに適用されます。有効にすると、ビジュアライゼーションのインデックスにフィルター対象のフィールドが含まれていない場合、ビジュアライゼーションの際にフィルターが無視されます。",
+    "kbn.advancedSettings.courier.ignoreFilterTitle": "フィルターの無視",
+    "kbn.advancedSettings.courier.maxRequestsText": "Kibana から送信された _msearch requests リクエストに使用される {maxRequestsLink} 設定を管理します。この構成を無効にして Elasticsearch のデフォルトを使用するには、0 に設定します。",
+    "kbn.advancedSettings.courier.maxRequestsTitle": "最大同時シャードリクエスト",
+    "kbn.advancedSettings.courier.requestPreferenceCustom": "カスタム",
+    "kbn.advancedSettings.courier.requestPreferenceNone": "なし",
+    "kbn.advancedSettings.courier.requestPreferenceSessionId": "セッション ID",
+    "kbn.advancedSettings.courier.requestPreferenceText": "どのシャードが検索リクエストを扱うかを設定できます。<ul>\n            <li><strong>{sessionId}:</strong> 同じシャードのすべての検索リクエストを実行するため、オペレーションを制限します。\n              これにはリクエスト間でシャードのキャッシュを共有できるというメリットがあります。</li>\n            <li><strong>{custom}:</strong> 独自の設定が可能になります。\n              <strong>couriercustomRequestPreference</strong> で設定値をカスタマイズします。</li>\n            <li><strong>{none}:</strong> 設定されていないことを意味します。\n              これにより、リクエストが全シャードコピー間に分散されるため、パフォーマンスが改善される可能性があります。\n              ただし、シャードによって更新ステータスが異なる場合があるため、結果に矛盾が生じる可能性があります。</li>\n          </ul>",
+    "kbn.advancedSettings.courier.requestPreferenceTitle": "リクエスト設定",
+    "kbn.advancedSettings.csv.quoteValuesText": "csv エクスポートに値を引用するかどうかです",
+    "kbn.advancedSettings.csv.quoteValuesTitle": "CSV の値を引用",
+    "kbn.advancedSettings.csv.separatorText": "エクスポートされた値をこの文字列で区切ります",
+    "kbn.advancedSettings.csv.separatorTitle": "CSV セパレーター",
+    "kbn.advancedSettings.darkModeText": "Kibana UI のダークモードを有効にします。この設定を適用するにはページの更新が必要です。",
+    "kbn.advancedSettings.darkModeTitle": "ダークモード",
+    "kbn.advancedSettings.dateFormat.dayOfWeekText": "週の初めの曜日を設定します",
+    "kbn.advancedSettings.dateFormat.dayOfWeekTitle": "曜日",
+    "kbn.advancedSettings.dateFormat.optionsLinkText": "フォーマット",
+    "kbn.advancedSettings.dateFormat.scaled.intervalsLinkText": "ISO8601 間隔",
+    "kbn.advancedSettings.dateFormat.scaledText": "時間ベースのデータが順番にレンダリングされ、フォーマットされたタイムスタンプが測定値の間隔に適応すべき状況で使用されるフォーマットを定義する値です。キーは {intervalsLink}。",
+    "kbn.advancedSettings.dateFormat.scaledTitle": "スケーリングされたデータフォーマットです",
+    "kbn.advancedSettings.dateFormat.timezoneText": "使用されるタイムゾーンです。{defaultOption} ではご使用のブラウザにより検知されたタイムゾーンが使用されます。",
+    "kbn.advancedSettings.dateFormat.timezoneTitle": "データフォーマットのタイムゾーン",
+    "kbn.advancedSettings.dateFormatText": "きちんとフォーマットされたデータを表示する際、この {formatLink} を使用します",
+    "kbn.advancedSettings.dateFormatTitle": "データフォーマット",
+    "kbn.advancedSettings.dateNanosFormatText": "Elasticsearch の {dateNanosLink} データタイプに使用されます",
+    "kbn.advancedSettings.dateNanosFormatTitle": "ナノ秒フォーマットでの日付",
+    "kbn.advancedSettings.dateNanosLinkTitle": "date_nanos",
+    "kbn.advancedSettings.defaultColumnsText": "デフォルトでディスカバリタブに表示される列です",
+    "kbn.advancedSettings.defaultColumnsTitle": "デフォルトの列",
+    "kbn.advancedSettings.defaultIndexText": "インデックスが設定されていない時にアクセスするインデックスです",
+    "kbn.advancedSettings.defaultIndexTitle": "デフォルトのインデックス",
+    "kbn.advancedSettings.disableAnimationsText": "Kibana UI の不要なアニメーションをオフにします。変更を適用するにはページを更新してください。",
+    "kbn.advancedSettings.disableAnimationsTitle": "アニメーションを無効にする",
+    "kbn.advancedSettings.discover.aggsTermsSizeText": "「可視化」ボタンをクリックした際に、フィールドドロップダウンやディスカバリサイドバーに可視化される用語の数を設定します。",
+    "kbn.advancedSettings.discover.aggsTermsSizeTitle": "用語数",
+    "kbn.advancedSettings.discover.sampleSizeText": "表に表示する行数です",
+    "kbn.advancedSettings.discover.sampleSizeTitle": "行数",
+    "kbn.advancedSettings.discover.sortDefaultOrderText": "ディスカバリアプリのインデックスパターンに基づく時刻のデフォルトの並べ替え方向をコントロールします。",
+    "kbn.advancedSettings.discover.sortDefaultOrderTitle": "デフォルトの並べ替え方向",
+    "kbn.advancedSettings.discover.sortOrderAsc": "昇順",
+    "kbn.advancedSettings.discover.sortOrderDesc": "降順",
+    "kbn.advancedSettings.docTableHideTimeColumnText": "ディスカバリと、ダッシュボードのすべての保存された検索で、「時刻」列を非表示にします。",
+    "kbn.advancedSettings.docTableHideTimeColumnTitle": "「時刻」列を非表示",
+    "kbn.advancedSettings.docTableHighlightText": "ディスカバリと保存された検索ダッシュボードの結果をハイライトします。ハイライトすることで、大きなドキュメントを扱う際にリクエストが遅くなります。",
+    "kbn.advancedSettings.docTableHighlightTitle": "結果をハイライト",
+    "kbn.advancedSettings.fieldsPopularLimitText": "最も頻繁に使用されるフィールドのトップ N を表示します",
+    "kbn.advancedSettings.fieldsPopularLimitTitle": "頻繁に使用されるフィールドの制限",
+    "kbn.advancedSettings.format.bytesFormat.numeralFormatLinkText": "数字フォーマット",
+    "kbn.advancedSettings.format.bytesFormatText": "「バイト」フォーマットのデフォルト {numeralFormatLink} です",
+    "kbn.advancedSettings.format.bytesFormatTitle": "バイトフォーマット",
+    "kbn.advancedSettings.format.currencyFormat.numeralFormatLinkText": "数字フォーマット",
+    "kbn.advancedSettings.format.currencyFormatText": "「通貨」フォーマットのデフォルト {numeralFormatLink} です",
+    "kbn.advancedSettings.format.currencyFormatTitle": "通貨フォーマット",
+    "kbn.advancedSettings.format.defaultTypeMapText": "各フィールドタイプにデフォルトで使用するフォーマット名のマップです。フィールドタイプが特に指定されていない場合は {defaultFormat} が使用されます",
+    "kbn.advancedSettings.format.defaultTypeMapTitle": "フィールドタイプフォーマット名",
+    "kbn.advancedSettings.format.formattingLocale.numeralLanguageLinkText": "数字言語",
+    "kbn.advancedSettings.format.formattingLocaleText": "{numeralLanguageLink} ロケール",
+    "kbn.advancedSettings.format.formattingLocaleTitle": "フォーマットロケール",
+    "kbn.advancedSettings.format.numberFormat.numeralFormatLinkText": "数字フォーマット",
+    "kbn.advancedSettings.format.numberFormatText": "「数字」フォーマットのデフォルト {numeralFormatLink} です",
+    "kbn.advancedSettings.format.numberFormatTitle": "数字フォーマット",
+    "kbn.advancedSettings.format.percentFormat.numeralFormatLinkText": "数字フォーマット",
+    "kbn.advancedSettings.format.percentFormatText": "「パーセント」フォーマットのデフォルト {numeralFormatLink} です",
+    "kbn.advancedSettings.format.percentFormatTitle": "パーセントフォーマット",
+    "kbn.advancedSettings.histogram.barTargetText": "日付ヒストグラムで「自動」間隔を使用する際、この数に近いバーの作成を試みます",
+    "kbn.advancedSettings.histogram.barTargetTitle": "目標バー数",
+    "kbn.advancedSettings.histogram.maxBarsText": "日付ヒストグラムに表示されるバーの数の上限です。必要に応じて値をスケーリングしてください",
+    "kbn.advancedSettings.histogram.maxBarsTitle": "最高バー数",
+    "kbn.advancedSettings.historyLimitText": "履歴があるフィールド (例: クエリインプット) に個の数の最近の値が表示されます",
+    "kbn.advancedSettings.historyLimitTitle": "履歴制限数",
+    "kbn.advancedSettings.indexPattern.recentMatchingText": "名前にタイムスタンプが含まれているインデックスパターンで、フィールドマッチングをクエリする最近の一致したパターンが、この数検索されます",
+    "kbn.advancedSettings.indexPattern.recentMatchingTitle": "最近一致したパターン",
+    "kbn.advancedSettings.indexPatternPlaceholderText": "「管理 > インデックスパターン > インデックスパターンを作成」で使用される「インデックスパターン名」フィールドのプレースホルダーです。",
+    "kbn.advancedSettings.indexPatternPlaceholderTitle": "インデックスパターンのプレースホルダー",
+    "kbn.advancedSettings.maxBucketsText": "1 つのデータソースが返せるバケットの最大数です",
+    "kbn.advancedSettings.maxBucketsTitle": "バケットの最大数",
+    "kbn.advancedSettings.maxCellHeightText": "表のセルが使用する高さの上限です。この切り捨てを無効にするには 0 に設定します",
+    "kbn.advancedSettings.maxCellHeightTitle": "表のセルの高さの上限",
+    "kbn.advancedSettings.metaFieldsText": "_source の外にあり、ドキュメントが表示される時に融合されるフィールドです",
+    "kbn.advancedSettings.metaFieldsTitle": "メタフィールド",
+    "kbn.advancedSettings.notifications.banner.markdownLinkText": "マークダウン対応",
+    "kbn.advancedSettings.notifications.bannerLifetimeText": "バナー通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定するとカウントダウンが無効になります。",
+    "kbn.advancedSettings.notifications.bannerLifetimeTitle": "バナー通知時間",
+    "kbn.advancedSettings.notifications.bannerText": "すべてのユーザーへの一時的な通知を目的としたカスタムバナーです。{markdownLink}",
+    "kbn.advancedSettings.notifications.bannerTitle": "カスタムバナー通知",
+    "kbn.advancedSettings.notifications.errorLifetimeText": "エラー通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
+    "kbn.advancedSettings.notifications.errorLifetimeTitle": "エラー通知時間",
+    "kbn.advancedSettings.notifications.infoLifetimeText": "情報通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
+    "kbn.advancedSettings.notifications.infoLifetimeTitle": "情報通知時間",
+    "kbn.advancedSettings.notifications.warningLifetimeText": "警告通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
+    "kbn.advancedSettings.notifications.warningLifetimeTitle": "警告通知時間",
+    "kbn.advancedSettings.pinFiltersText": "フィルターがデフォルトでグローバル (ピン付けされた状態) になるかの設定です",
+    "kbn.advancedSettings.pinFiltersTitle": "フィルターをデフォルトでピン付けする",
+    "kbn.advancedSettings.query.allowWildcardsText": "設定すると、クエリ句の頭に * が使えるようになります。現在クエリバーで実験的クエリ機能が有効になっている場合にのみ適用されます。基本的な Lucene クエリでリーディングワイルドカードを無効にするには、{queryStringOptionsPattern} を使用します。",
+    "kbn.advancedSettings.query.allowWildcardsTitle": "クエリでリーディングワイルドカードを許可する",
+    "kbn.advancedSettings.query.queryStringOptions.optionsLinkText": "オプション",
+    "kbn.advancedSettings.query.queryStringOptionsText": "Lucene クエリ文字列パーサーの {optionsLink}「{queryLanguage}」が {luceneLanguage} に設定されている時にのみ使用されます。",
+    "kbn.advancedSettings.query.queryStringOptionsTitle": "クエリ文字列のオプション",
+    "kbn.advancedSettings.savedObjects.listingLimitText": "一覧ページ用に取得するオブジェクトの数です",
+    "kbn.advancedSettings.savedObjects.listingLimitTitle": "オブジェクト取得制限",
+    "kbn.advancedSettings.savedObjects.perPageText": "読み込みダイアログで表示されるページごとのオブジェクトの数です",
+    "kbn.advancedSettings.savedObjects.perPageTitle": "ページごとのオブジェクト数",
+    "kbn.advancedSettings.searchQueryLanguageKql": "KQL",
+    "kbn.advancedSettings.searchQueryLanguageLucene": "Lucene",
+    "kbn.advancedSettings.searchQueryLanguageText": "クエリバーで使用されるクエリ言語です。KQL は Kibana 用に特別に開発された新しい言語です。",
+    "kbn.advancedSettings.searchQueryLanguageTitle": "クエリ言語",
+    "kbn.advancedSettings.shortenFieldsText": "長いフィールドを短くします。例: foo.bar.baz の代わりに f.b.baz と表示",
+    "kbn.advancedSettings.shortenFieldsTitle": "フィールドの短縮",
+    "kbn.advancedSettings.sortOptions.optionsLinkText": "オプション",
+    "kbn.advancedSettings.sortOptionsText": "Elasticsearch の並べ替えパラメーターの {optionsLink}",
+    "kbn.advancedSettings.sortOptionsTitle": "並べ替えオプション",
+    "kbn.advancedSettings.storeUrlText": "URL は長くなりすぎてブラウザが対応できない場合があります。セッションストレージに URL の一部を保存することがで　この問題に対処できるかテストしています。結果を教えてください！",
+    "kbn.advancedSettings.storeUrlTitle": "セッションストレージに URL を格納",
+    "kbn.advancedSettings.suggestFilterValuesText": "フィルターエディターがフィールドの値の候補を表示しないようにするには、このプロパティを false にしてください。",
+    "kbn.advancedSettings.suggestFilterValuesTitle": "フィルターエディターの候補値",
+    "kbn.advancedSettings.timepicker.last15Minutes": "過去 15 分間",
+    "kbn.advancedSettings.timepicker.last1Hour": "過去 1 時間",
+    "kbn.advancedSettings.timepicker.last1Year": "過去 1 年間",
+    "kbn.advancedSettings.timepicker.last24Hours": "過去 24 時間",
+    "kbn.advancedSettings.timepicker.last30Days": "過去 30 日間",
+    "kbn.advancedSettings.timepicker.last30Minutes": "過去 30 分間",
+    "kbn.advancedSettings.timepicker.last7Days": "過去 7 日間",
+    "kbn.advancedSettings.timepicker.last90Days": "過去 90 日間",
+    "kbn.advancedSettings.timepicker.quickRanges.acceptedFormatsLinkText": "対応フォーマット",
+    "kbn.advancedSettings.timepicker.quickRangesText": "タイムピッカーのクイックセクションに表示される範囲のリストです。それぞれのオブジェクトに「開始」、「終了」({acceptedFormatsLink} を参照)、「表示」(表示するタイトル) が含まれるオブジェクトの配列です。",
+    "kbn.advancedSettings.timepicker.quickRangesTitle": "タイムピッカーのクイック範囲",
+    "kbn.advancedSettings.timepicker.refreshIntervalDefaultsText": "時間フィルターのデフォルト更新間隔",
+    "kbn.advancedSettings.timepicker.refreshIntervalDefaultsTitle": "タイムピッカーの更新間隔",
+    "kbn.advancedSettings.timepicker.thisWeek": "今週",
+    "kbn.advancedSettings.timepicker.timeDefaultsText": "時間フィルターが選択されずに Kibana が起動した際に使用される時間フィルターです",
+    "kbn.advancedSettings.timepicker.timeDefaultsTitle": "デフォルトのタイムピッカー",
+    "kbn.advancedSettings.timepicker.today": "今日",
+    "kbn.advancedSettings.visualization.colorMappingText": "ビジュアライゼーション内の特定の色のマップ値です",
+    "kbn.advancedSettings.visualization.colorMappingTitle": "カラーマッピング",
+    "kbn.advancedSettings.visualization.dimmingOpacityText": "チャートの別のエレメントが選択された時に暗くなるチャート項目の透明度です。この数字が小さければ小さいほど、ハイライトされたエレメントが目立ちます。0 と 1 の間の数字で設定します。",
+    "kbn.advancedSettings.visualization.dimmingOpacityTitle": "減光透明度",
+    "kbn.advancedSettings.visualization.loadingDelayText": "クエリの際にビジュアライゼーションを暗くするまでの時間です",
+    "kbn.advancedSettings.visualization.loadingDelayTitle": "読み込み遅延",
+    "kbn.advancedSettings.visualization.showRegionMapWarningsText": "用語がマップの形に合わない場合に地域マップに警告を表示するかどうかです。",
+    "kbn.advancedSettings.visualization.showRegionMapWarningsTitle": "地域マップに警告を表示",
+    "kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText": "ディメンションの説明",
+    "kbn.advancedSettings.visualization.tileMap.maxPrecisionText": "マップに表示されるジオハッシュの最高精度です。7 が高い、10 が非常に高い、12 が最高を意味します。{cellDimensionsLink}",
+    "kbn.advancedSettings.visualization.tileMap.maxPrecisionTitle": "タイルマップの最高精度",
+    "kbn.advancedSettings.visualization.tileMap.wmsDefaults.propertiesLinkText": "プロパティ",
+    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsText": "座標マップの WMS マップサーバーサポートのデフォルトの {propertiesLink} です。",
+    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsTitle": "デフォルトの WMS プロパティ",
+    "kbn.advancedSettings.visualizeEnableLabsText": "ユーザーが実験的なビジュアライゼーションを作成、表示、編集できるようになります。無効の場合、\n          ユーザーは本番準備が整ったビジュアライゼーションのみを利用できます。",
+    "kbn.advancedSettings.visualizeEnableLabsTitle": "実験的なビジュアライゼーションを有効にする",
+    "kbn.common.tutorials.auditbeat.cloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.auditbeat.premCloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.auditbeat.premInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTitle": "構成の変更",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTitle": "構成の変更",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTitle": "構成の変更",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.auditbeatInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.auditbeatInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.auditbeatInstructions.config.debTitle": "構成の変更",
+    "kbn.common.tutorials.auditbeatInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.auditbeatInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.auditbeatInstructions.config.osxTitle": "構成の変更",
+    "kbn.common.tutorials.auditbeatInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.auditbeatInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.auditbeatInstructions.config.rpmTitle": "構成の変更",
+    "kbn.common.tutorials.auditbeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.auditbeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.auditbeatInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.auditbeatInstructions.install.debTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({linkUrl}) をご覧ください。",
+    "kbn.common.tutorials.auditbeatInstructions.install.debTextPre": "Auditbeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
+    "kbn.common.tutorials.auditbeatInstructions.install.debTitle": "Auditbeat のダウンロードとインストール",
+    "kbn.common.tutorials.auditbeatInstructions.install.osxTextPre": "Auditbeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
+    "kbn.common.tutorials.auditbeatInstructions.install.osxTitle": "Auditbeat のダウンロードとインストール",
+    "kbn.common.tutorials.auditbeatInstructions.install.rpmTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({linkUrl}) をご覧ください。",
+    "kbn.common.tutorials.auditbeatInstructions.install.rpmTextPre": "Auditbeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
+    "kbn.common.tutorials.auditbeatInstructions.install.rpmTitle": "Auditbeat のダウンロードとインストール",
+    "kbn.common.tutorials.auditbeatInstructions.install.windowsTextPost": "{auditbeatPath} ファイルの {propertyName} を Elasticsearch のインストールに設定します。",
+    "kbn.common.tutorials.auditbeatInstructions.install.windowsTextPre": "Auditbeat は初めてですか？[入門ガイド]({guideLinkUrl}) をご覧ください。\n 1.[ダウンロード]({auditbeatLinkUrl}) ページから Auditbeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.「{directoryName}」ディレクトリの名前を「Auditbeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトで次のコマンドを実行し、Auditbeat を Windows サービスとしてインストールします。",
+    "kbn.common.tutorials.auditbeatInstructions.install.windowsTitle": "Auditbeat のダウンロードとインストール",
+    "kbn.common.tutorials.auditbeatInstructions.start.debTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.auditbeatInstructions.start.debTitle": "Auditbeat を起動",
+    "kbn.common.tutorials.auditbeatInstructions.start.osxTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.auditbeatInstructions.start.osxTitle": "Auditbeat を起動",
+    "kbn.common.tutorials.auditbeatInstructions.start.rpmTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.auditbeatInstructions.start.rpmTitle": "Auditbeat を起動",
+    "kbn.common.tutorials.auditbeatInstructions.start.windowsTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.auditbeatInstructions.start.windowsTitle": "Auditbeat を起動",
+    "kbn.common.tutorials.auditbeatStatusCheck.buttonLabel": "データを確認してください",
+    "kbn.common.tutorials.auditbeatStatusCheck.errorText": "まだデータを受信していません",
+    "kbn.common.tutorials.auditbeatStatusCheck.successText": "データを受信しました",
+    "kbn.common.tutorials.auditbeatStatusCheck.text": "Auditbeat からデータを受け取ったことを確認してください。",
+    "kbn.common.tutorials.auditbeatStatusCheck.title": "ステータス",
+    "kbn.common.tutorials.filebeat.cloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.filebeat.premCloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.filebeat.premInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.debTitle": "構成の変更",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTitle": "構成の変更",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTitle": "構成の変更",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.filebeatEnableInstructions.debTextPost": "「/etc/filebeat/modules.d/{moduleName}.yml」ファイルで設定を変更します。",
+    "kbn.common.tutorials.filebeatEnableInstructions.debTitle": "{moduleName} モジュールを有効にし構成します",
+    "kbn.common.tutorials.filebeatEnableInstructions.osxTextPost": "「modules.d/{moduleName}.yml」」ファイルで設定を変更します。",
+    "kbn.common.tutorials.filebeatEnableInstructions.osxTextPre": "インストールディレクトリから次のファイルを実行します:",
+    "kbn.common.tutorials.filebeatEnableInstructions.osxTitle": "{moduleName} モジュールを有効にし構成します",
+    "kbn.common.tutorials.filebeatEnableInstructions.rpmTextPost": "「/etc/filebeat/modules.d/{moduleName}.yml」ファイルで設定を変更します。",
+    "kbn.common.tutorials.filebeatEnableInstructions.rpmTitle": "{moduleName} モジュールを有効にし構成します",
+    "kbn.common.tutorials.filebeatEnableInstructions.windowsTextPost": "「modules.d/{moduleName}.yml」」ファイルで設定を変更します。",
+    "kbn.common.tutorials.filebeatEnableInstructions.windowsTextPre": "「{path}」フォルダから次のファイルを実行します:",
+    "kbn.common.tutorials.filebeatEnableInstructions.windowsTitle": "{moduleName} モジュールを有効にし構成します",
+    "kbn.common.tutorials.filebeatInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.filebeatInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.filebeatInstructions.config.debTitle": "構成の変更",
+    "kbn.common.tutorials.filebeatInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.filebeatInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.filebeatInstructions.config.osxTitle": "構成の変更",
+    "kbn.common.tutorials.filebeatInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.filebeatInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.filebeatInstructions.config.rpmTitle": "構成の変更",
+    "kbn.common.tutorials.filebeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.filebeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.filebeatInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.filebeatInstructions.install.debTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({linkUrl}) をご覧ください。",
+    "kbn.common.tutorials.filebeatInstructions.install.debTextPre": "Filebeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
+    "kbn.common.tutorials.filebeatInstructions.install.debTitle": "Filebeat のダウンロードとインストール",
+    "kbn.common.tutorials.filebeatInstructions.install.osxTextPre": "Filebeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
+    "kbn.common.tutorials.filebeatInstructions.install.osxTitle": "Filebeat のダウンロードとインストール",
+    "kbn.common.tutorials.filebeatInstructions.install.rpmTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({linkUrl}) をご覧ください。",
+    "kbn.common.tutorials.filebeatInstructions.install.rpmTextPre": "Filebeat は初めてですか？[入門ガイド]({linkUrl}) をご覧ください。",
+    "kbn.common.tutorials.filebeatInstructions.install.rpmTitle": "Filebeat のダウンロードとインストール",
+    "kbn.common.tutorials.filebeatInstructions.install.windowsTextPost": "{filebeatPath} ファイルの {propertyName} を Elasticsearch のインストールに設定します。",
+    "kbn.common.tutorials.filebeatInstructions.install.windowsTextPre": "Filebeat は初めてですか？[入門ガイド]({guideLinkUrl}) をご覧ください。\n 1.[ダウンロード]({filebeatLinkUrl}) ページから Filebeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.「{directoryName}」ディレクトリの名前を「Filebeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトで次のコマンドを実行し、Filebeat を Windows サービスとしてインストールします。",
+    "kbn.common.tutorials.filebeatInstructions.install.windowsTitle": "Filebeat のダウンロードとインストール",
+    "kbn.common.tutorials.filebeatInstructions.start.debTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.filebeatInstructions.start.debTitle": "Filebeat を起動します",
+    "kbn.common.tutorials.filebeatInstructions.start.osxTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.filebeatInstructions.start.osxTitle": "Filebeat を起動します",
+    "kbn.common.tutorials.filebeatInstructions.start.rpmTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.filebeatInstructions.start.rpmTitle": "Filebeat を起動します",
+    "kbn.common.tutorials.filebeatInstructions.start.windowsTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.filebeatInstructions.start.windowsTitle": "Filebeat を起動します",
+    "kbn.common.tutorials.filebeatStatusCheck.buttonLabel": "データを確認してください",
+    "kbn.common.tutorials.filebeatStatusCheck.errorText": "モジュールからまだデータを受け取っていません",
+    "kbn.common.tutorials.filebeatStatusCheck.successText": "このモジュールからデータを受け取りました",
+    "kbn.common.tutorials.filebeatStatusCheck.text": "Filebeat の「{moduleName}」モジュールからデータを受け取ったことを確認してください。",
+    "kbn.common.tutorials.filebeatStatusCheck.title": "モジュールステータス",
+    "kbn.common.tutorials.functionbeat.cloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.functionbeat.premCloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.functionbeat.premInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.functionbeatAWSInstructions.textPost": "「<your-access-key>」と「<your-secret-access-key>」がアカウント 認証情報で、「us-east-1」が希望の地域です。",
+    "kbn.common.tutorials.functionbeatAWSInstructions.textPre": "環境で AWS アカウント認証情報を設定します。",
+    "kbn.common.tutorials.functionbeatAWSInstructions.title": "AWS 認証情報の設定",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTitle": "構成の変更",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.functionbeatEnableOnPremInstructions.defaultTextPost": "「<cloudwatch-log-group>」が投入するロググループの名前で、「<unique-bucket-name>」が Functionbeat デプロイのステージングに使用されるが有効な S3 バケット名です。",
+    "kbn.common.tutorials.functionbeatEnableOnPremInstructions.defaultTitle": "Cloudwatch ロググループの構成",
+    "kbn.common.tutorials.functionbeatEnableOnPremInstructionsOSXLinux.textPre": "「functionbeat.yml」ファイルで設定を変更します。",
+    "kbn.common.tutorials.functionbeatEnableOnPremInstructionsWindows.textPre": "{path} ファイルで設定を変更します。",
+    "kbn.common.tutorials.functionbeatInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.functionbeatInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.functionbeatInstructions.config.osxTitle": "Elastic クラスターの構成",
+    "kbn.common.tutorials.functionbeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.functionbeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.functionbeatInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.functionbeatInstructions.deploy.osxTextPre": "これにより Functionbeat が Lambda 関数としてインストールされます「setup」コマンドで Elasticsearch の構成を確認し、Kibana インデックスパターンを読み込みます。通常このコマンドを省いても大丈夫です。",
+    "kbn.common.tutorials.functionbeatInstructions.deploy.osxTitle": "Functionbeat を AWS Lambda にデプロイ",
+    "kbn.common.tutorials.functionbeatInstructions.deploy.windowsTextPre": "これにより Functionbeat が Lambda 関数としてインストールされます「setup」コマンドで Elasticsearch の構成を確認し、Kibana インデックスパターンを読み込みます。通常このコマンドを省いても大丈夫です。",
+    "kbn.common.tutorials.functionbeatInstructions.deploy.windowsTitle": "Functionbeat を AWS Lambda にデプロイ",
+    "kbn.common.tutorials.functionbeatInstructions.install.linuxTextPre": "Functionbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
+    "kbn.common.tutorials.functionbeatInstructions.install.linuxTitle": "Functionbeat のダウンロードとインストール",
+    "kbn.common.tutorials.functionbeatInstructions.install.osxTextPre": "Functionbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
+    "kbn.common.tutorials.functionbeatInstructions.install.osxTitle": "Functionbeat のダウンロードとインストール",
+    "kbn.common.tutorials.functionbeatInstructions.install.windowsTextPre": "Functionbeat は初めてですか？[入門ガイド]({functionbeatLink}) をご覧ください。\n 1.[ダウンロード]({elasticLink}) ページから Functionbeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.{directoryName} ディレクトリの名前を「Functionbeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトから、Functionbeat ディレクトリに移動します:",
+    "kbn.common.tutorials.functionbeatInstructions.install.windowsTitle": "Functionbeat のダウンロードとインストール",
+    "kbn.common.tutorials.functionbeatStatusCheck.buttonLabel": "データを確認してください",
+    "kbn.common.tutorials.functionbeatStatusCheck.errorText": "Functionbeat からまだデータを受け取っていません",
+    "kbn.common.tutorials.functionbeatStatusCheck.successText": "Functionbeat からデータを受け取りました",
+    "kbn.common.tutorials.functionbeatStatusCheck.text": "Functionbeat からデータを受け取ったことを確認してください。",
+    "kbn.common.tutorials.functionbeatStatusCheck.title": "Functionbeat ステータス",
+    "kbn.common.tutorials.heartbeat.cloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.heartbeat.premCloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.heartbeat.premInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTitle": "構成の変更",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTitle": "構成の変更",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTitle": "構成の変更",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.debTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.defaultTextPost": "Heartbeat のモニターの設定の詳細は、[Heartbeat 設定ドキュメント]({configureLink}) をご覧ください。",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.defaultTitle": "設定の変更 - モニターの追加",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.osxTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.rpmTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.windowsTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.debTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.defaultTextPost": "{hostTemplate} は監視対象の URL です。Heartbeat のモニターの設定の詳細は、[Heartbeat 設定ドキュメント]({configureLink}) をご覧ください。",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.defaultTitle": "設定の変更 - モニターの追加",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.osxTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.rpmTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.windowsTextPre": "「heartbeat.yml」ファイルの「heartbeat.monitors」設定を変更します。",
+    "kbn.common.tutorials.heartbeatInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.heartbeatInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.heartbeatInstructions.config.debTitle": "構成の変更",
+    "kbn.common.tutorials.heartbeatInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.heartbeatInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.heartbeatInstructions.config.osxTitle": "構成の変更",
+    "kbn.common.tutorials.heartbeatInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.heartbeatInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.heartbeatInstructions.config.rpmTitle": "構成の変更",
+    "kbn.common.tutorials.heartbeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.heartbeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.heartbeatInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.heartbeatInstructions.install.debTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({link}) をご覧ください。",
+    "kbn.common.tutorials.heartbeatInstructions.install.debTextPre": "Heartbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
+    "kbn.common.tutorials.heartbeatInstructions.install.debTitle": "Heartbeat のダウンロードとインストール",
+    "kbn.common.tutorials.heartbeatInstructions.install.osxTextPre": "Heartbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
+    "kbn.common.tutorials.heartbeatInstructions.install.osxTitle": "Heartbeat のダウンロードとインストール",
+    "kbn.common.tutorials.heartbeatInstructions.install.rpmTextPre": "Heartbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
+    "kbn.common.tutorials.heartbeatInstructions.install.rpmTitle": "Heartbeat のダウンロードとインストール",
+    "kbn.common.tutorials.heartbeatInstructions.install.windowsTextPre": "Heartbeat は初めてですか？[入門ガイド]({heartbeatLink}) をご覧ください。\n 1.[ダウンロード]({elasticLink}) ページから Heartbeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.「{directoryName}」ディレクトリの名前を「Heartbeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトで次のコマンドを実行し、Heartbeat を Windows サービスとしてインストールします。",
+    "kbn.common.tutorials.heartbeatInstructions.install.windowsTitle": "Heartbeat のダウンロードとインストール",
+    "kbn.common.tutorials.heartbeatInstructions.start.debTextPre": "「setup」コマンドで Kibana のインデックスパターンを読み込みます。",
+    "kbn.common.tutorials.heartbeatInstructions.start.debTitle": "Heartbeat を起動します",
+    "kbn.common.tutorials.heartbeatInstructions.start.osxTextPre": "「setup」コマンドで Kibana のインデックスパターンを読み込みます。",
+    "kbn.common.tutorials.heartbeatInstructions.start.osxTitle": "Heartbeat を起動します",
+    "kbn.common.tutorials.heartbeatInstructions.start.rpmTextPre": "「setup」コマンドで Kibana のインデックスパターンを読み込みます。",
+    "kbn.common.tutorials.heartbeatInstructions.start.rpmTitle": "Heartbeat を起動します",
+    "kbn.common.tutorials.heartbeatInstructions.start.windowsTextPre": "「setup」コマンドで Kibana のインデックスパターンを読み込みます。",
+    "kbn.common.tutorials.heartbeatInstructions.start.windowsTitle": "Heartbeat を起動します",
+    "kbn.common.tutorials.heartbeatStatusCheck.buttonLabel": "データを確認してください",
+    "kbn.common.tutorials.heartbeatStatusCheck.errorText": "Heartbeat からまだデータを受け取っていません",
+    "kbn.common.tutorials.heartbeatStatusCheck.successText": "Heartbeat からデータを受け取りました",
+    "kbn.common.tutorials.heartbeatStatusCheck.text": "Heartbeat からデータを受け取ったことを確認してください。",
+    "kbn.common.tutorials.heartbeatStatusCheck.title": "Heartbeat のステータス",
+    "kbn.common.tutorials.logstashInstructions.install.java.osxTextPre": "[こちら]({link}) のインストール手順に従ってください。",
+    "kbn.common.tutorials.logstashInstructions.install.java.osxTitle": "Java Runtime Environment のダウンロードとインストール",
+    "kbn.common.tutorials.logstashInstructions.install.java.windowsTextPre": "[こちら]({link}) のインストール手順に従ってください。",
+    "kbn.common.tutorials.logstashInstructions.install.java.windowsTitle": "Java Runtime Environment のダウンロードとインストール",
+    "kbn.common.tutorials.logstashInstructions.install.logstash.osxTextPre": "Logstash は初めてですか？ [入門ガイド]({link}) をご覧ください。",
+    "kbn.common.tutorials.logstashInstructions.install.logstash.osxTitle": "Logstash のダウンロードとインストール",
+    "kbn.common.tutorials.logstashInstructions.install.logstash.windowsTextPre": "Logstash は初めてですか？ [入門ガイド]({logstashLink}) をご覧ください。\n 1. Logstash Windows zip ファイルを [ダウンロード]({elasticLink}) します。\n 2.zip ファイルのコンテンツを展開します。",
+    "kbn.common.tutorials.logstashInstructions.install.logstash.windowsTitle": "Logstash のダウンロードとインストール",
+    "kbn.common.tutorials.metricbeat.cloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.metricbeat.premCloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.metricbeat.premInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTitle": "構成の変更",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTitle": "構成の変更",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTitle": "構成の変更",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.metricbeatEnableInstructions.debTextPost": "「/etc/metricbeat/modules.d/{moduleName}.yml」ファイルで設定を変更します。",
+    "kbn.common.tutorials.metricbeatEnableInstructions.debTitle": "{moduleName} モジュールを有効にし構成します",
+    "kbn.common.tutorials.metricbeatEnableInstructions.osxTextPost": "「modules.d/{moduleName}.yml」」ファイルで設定を変更します。",
+    "kbn.common.tutorials.metricbeatEnableInstructions.osxTextPre": "インストールディレクトリから次のファイルを実行します:",
+    "kbn.common.tutorials.metricbeatEnableInstructions.osxTitle": "{moduleName} モジュールを有効にし構成します",
+    "kbn.common.tutorials.metricbeatEnableInstructions.rpmTextPost": "「/etc/metricbeat/modules.d/{moduleName}.yml」ファイルで設定を変更します。",
+    "kbn.common.tutorials.metricbeatEnableInstructions.rpmTitle": "{moduleName} モジュールを有効にし構成します",
+    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTextPost": "「modules.d/{moduleName}.yml」」ファイルで設定を変更します。",
+    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTextPre": "「{path}」フォルダから次のファイルを実行します:",
+    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTitle": "{moduleName} モジュールを有効にし構成します",
+    "kbn.common.tutorials.metricbeatInstructions.config.debTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.metricbeatInstructions.config.debTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.metricbeatInstructions.config.debTitle": "構成の変更",
+    "kbn.common.tutorials.metricbeatInstructions.config.osxTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.metricbeatInstructions.config.osxTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.metricbeatInstructions.config.osxTitle": "構成の変更",
+    "kbn.common.tutorials.metricbeatInstructions.config.rpmTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.metricbeatInstructions.config.rpmTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.metricbeatInstructions.config.rpmTitle": "構成の変更",
+    "kbn.common.tutorials.metricbeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.metricbeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.metricbeatInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.metricbeatInstructions.install.debTextPost": "32 ビットパッケージをお探しですか？[ダウンロードページ]({link}) をご覧ください。",
+    "kbn.common.tutorials.metricbeatInstructions.install.debTextPre": "Metricbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
+    "kbn.common.tutorials.metricbeatInstructions.install.debTitle": "Metricbeat のダウンロードとインストール",
+    "kbn.common.tutorials.metricbeatInstructions.install.osxTextPre": "Metricbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
+    "kbn.common.tutorials.metricbeatInstructions.install.osxTitle": "Metricbeat のダウンロードとインストール",
+    "kbn.common.tutorials.metricbeatInstructions.install.rpmTextPre": "Metricbeat は初めてですか？[入門ガイド]({link}) をご覧ください。",
+    "kbn.common.tutorials.metricbeatInstructions.install.rpmTitle": "Metricbeat のダウンロードとインストール",
+    "kbn.common.tutorials.metricbeatInstructions.install.windowsTextPost": "{path} ファイルの「output.elasticsearch」を Elasticsearch のインストールに設定します。",
+    "kbn.common.tutorials.metricbeatInstructions.install.windowsTextPre": "Metricbeat は初めてですか？[入門ガイド]({metricbeatLink}) をご覧ください。\n 1.[ダウンロード]({elasticLink}) ページから Metricbeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.「{directoryName}」ディレクトリの名前を「Metricbeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトで次のコマンドを実行し、Metricbeat を Windows サービスとしてインストールします。",
+    "kbn.common.tutorials.metricbeatInstructions.install.windowsTitle": "Metricbeat のダウンロードとインストール",
+    "kbn.common.tutorials.metricbeatInstructions.start.debTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.metricbeatInstructions.start.debTitle": "Metricbeat を起動します",
+    "kbn.common.tutorials.metricbeatInstructions.start.osxTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.metricbeatInstructions.start.osxTitle": "Metricbeat を起動します",
+    "kbn.common.tutorials.metricbeatInstructions.start.rpmTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.metricbeatInstructions.start.rpmTitle": "Metricbeat を起動します",
+    "kbn.common.tutorials.metricbeatInstructions.start.windowsTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.metricbeatInstructions.start.windowsTitle": "Metricbeat を起動します",
+    "kbn.common.tutorials.metricbeatStatusCheck.buttonLabel": "データを確認してください",
+    "kbn.common.tutorials.metricbeatStatusCheck.errorText": "モジュールからまだデータを受け取っていません",
+    "kbn.common.tutorials.metricbeatStatusCheck.successText": "このモジュールからデータを受け取りました",
+    "kbn.common.tutorials.metricbeatStatusCheck.text": "Metricbeat の「{moduleName}」モジュールからデータを受け取ったことを確認してください",
+    "kbn.common.tutorials.metricbeatStatusCheck.title": "モジュールステータス",
+    "kbn.common.tutorials.premCloudInstructions.option1.textPre": "[Elastic Cloud] ({link}) にアクセスします。アカウントをお持ちでない場合は新規登録してください。14 日間の無料トライアルがご利用いただけます。\n\nElastic Cloud コンソールにログインします\n\nElastic Cloud コンソールで次の手順を実行し、クラスターを作成します。\n 1.「デプロイを作成」、「デプロイ名」の順にクリックします\n 2.必要に応じて他のデプロイオプションを変更します (デフォルトも使い始めるのに有効です)\n 3.「デプロイを作成」をクリックします\n 4.デプロイの作成が完了するまで待ちます\n 5.新規クラウド Kibana インスタンスにアクセスし、Kibana ホームの手順に従います。",
+    "kbn.common.tutorials.premCloudInstructions.option1.title": "オプション 1:Elastic Cloud でお試しください",
+    "kbn.common.tutorials.premCloudInstructions.option2.textPre": "この Kibana インスタンスをマネージド Elasticsearch インスタンスに対して実行している場合は、手動セットアップを行います。.\n\n「Elasticsearch」エンドポイントを {urlTemplate} として保存し、クラスターの「パスワード」を {passwordTemplate} として保存します。",
+    "kbn.common.tutorials.premCloudInstructions.option2.title": "オプション 2:Kibana を Cloud インスタンスに接続",
+    "kbn.common.tutorials.winlogbeat.cloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.winlogbeat.premCloudInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.winlogbeat.premInstructions.gettingStarted.title": "はじめに",
+    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワードです。",
+    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTextPost": "{passwordTemplate} が「Elastic」ユーザーのパスワード、{esUrlTemplate} が Elasticsearch の URL、{kibanaUrlTemplate} が Kibana の URL です。",
+    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTextPre": "{path} を変更して Elastic Cloud への接続情報を設定します:",
+    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTitle": "構成の変更",
+    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTextPost": "{path} ファイルの「output.elasticsearch」を Elasticsearch のインストールに設定します。",
+    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTextPre": "Winlogbeat は初めてですか？[入門ガイド]({winlogbeatLink}) をご覧ください。\n 1.[ダウンロード]({elasticLink}) ページから Winlogbeat Windows zip ファイルをダウンロードします。\n 2.zip ファイルのコンテンツを {folderPath} に解凍します。\n 3.{directoryName} ディレクトリの名前を「Winlogbeat」に変更します。\n 4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n 5.PowerShell プロンプトで次のコマンドを実行し、Winlogbeat を Windows サービスとしてインストールします。",
+    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTitle": "Winlogbeat のダウンロードとインストール",
+    "kbn.common.tutorials.winlogbeatInstructions.start.windowsTextPre": "「setup」コマンドで Kibana のダッシュボードを読み込みます。ダッシュボードが既にセットアップされている場合、このコマンドは省略します。",
+    "kbn.common.tutorials.winlogbeatInstructions.start.windowsTitle": "Winlogbeat を起動",
+    "kbn.common.tutorials.winlogbeatStatusCheck.buttonLabel": "データを確認してください",
+    "kbn.common.tutorials.winlogbeatStatusCheck.errorText": "まだデータを受信していません",
+    "kbn.common.tutorials.winlogbeatStatusCheck.successText": "データを受信しました",
+    "kbn.common.tutorials.winlogbeatStatusCheck.text": "Winlogbeat からデータを受け取ったことを確認してください。",
+    "kbn.common.tutorials.winlogbeatStatusCheck.title": "モジュールステータス",
+    "kbn.context.breadcrumb": "{indexPatternTitle}#{docId} のコンテキスト",
+    "kbn.context.failedToLoadAnchorDocumentDescription": "別ののドキュメントの読み込みに失敗しました",
+    "kbn.context.failedToLoadAnchorDocumentErrorDescription": "別のドキュメントの読み込みに失敗しました。",
+    "kbn.context.loadingDescription": "読み込み中…",
+    "kbn.context.newerDocumentsDescription": "新しいドキュメント",
+    "kbn.context.noSearchableTiebreakerFieldDescription": "インデックスパターン {indexPatternId} で検索可能なタイブレーカーフィールドが見つかりませんでした。高度な設定 {tieBreakerFields} tを変更してこのインデックスパターンの有効なフィールドを含めてください。",
+    "kbn.context.olderDocumentsDescription": "古いドキュメント",
+    "kbn.context.reloadPageDescription.discoverLinkText": "ディスカバリ",
+    "kbn.context.reloadPageDescription.reloadOrVisitTextMessage": "再読み込みするか",
+    "kbn.context.reloadPageDescription.selectValidAnchorDocumentTextMessage": "にアクセスして有効な別のドキュメントを選択してください。",
+    "kbn.context.unableToLoadAnchorDocumentDescription": "別のドキュメントが読み込めません",
+    "kbn.context.unableToLoadDocumentDescription": "ドキュメントが読み込めません",
+    "kbn.dashboard.addVisualizationLinkAriaLabel": "ビジュアライゼーションを追加",
+    "kbn.dashboard.badge.readOnly.text": "読み込み専用",
+    "kbn.dashboard.badge.readOnly.tooltip": "ダッシュボードを保存できません",
+    "kbn.dashboard.changeViewModeConfirmModal.cancelButtonLabel": "編集を続行",
+    "kbn.dashboard.changeViewModeConfirmModal.confirmButtonLabel": "変更を破棄",
+    "kbn.dashboard.changeViewModeConfirmModal.discardChangesDescription": "変更を破棄すると、元に戻すことはできません。",
+    "kbn.dashboard.changeViewModeConfirmModal.discardChangesTitle": "ダッシュボードへの変更を破棄しますか？",
+    "kbn.dashboard.dashboardAppBreadcrumbsTitle": "ダッシュボード",
+    "kbn.dashboard.dashboardBreadcrumbsTitle": "ダッシュボード",
+    "kbn.dashboard.dashboardWasNotSavedDangerMessage": "ダッシュボード「{dashTitle}」は保存されませんでした。エラー: {errorMessage}",
+    "kbn.dashboard.dashboardWasSavedSuccessMessage": "ダッシュボード「{dashTitle}」が保存されました。",
+    "kbn.dashboard.featureCatalogue.dashboardDescription": "ビジュアライゼーションと保存された検索のコレクションの表示と共有を行います。",
+    "kbn.dashboard.featureCatalogue.dashboardTitle": "ダッシュボード",
+    "kbn.dashboard.fillDashboardTitle": "このダッシュボードは空です。コンテンツを追加しましょう！",
+    "kbn.dashboard.howToStartWorkingOnNewDashboardDescription1": "上のメニューバーの ",
+    "kbn.dashboard.howToStartWorkingOnNewDashboardDescription2": " ダッシュボードの作成を始めましょう。",
+    "kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkText": "編集",
+    "kbn.dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "あらゆる Kibana アプリからダッシュボードでデータビューを組み合わせて、すべてを 1 か所に表示できます。",
+    "kbn.dashboard.listing.createNewDashboard.createButtonLabel": "新規ダッシュボードを作成",
+    "kbn.dashboard.listing.createNewDashboard.newToKibanaDescription": "Kibana は初心者ですか？{sampleDataInstallLink} してお試しください。",
+    "kbn.dashboard.listing.createNewDashboard.sampleDataInstallLinkText": "サンプルデータをインストール",
+    "kbn.dashboard.listing.createNewDashboard.title": "初めてのダッシュボードを作成してみましょう。",
+    "kbn.dashboard.listing.dashboardsTitle": "ダッシュボード",
+    "kbn.dashboard.listing.noItemsMessage": "ダッシュボードがないようです。",
+    "kbn.dashboard.listing.table.descriptionColumnName": "説明",
+    "kbn.dashboard.listing.table.entityName": "ダッシュボード",
+    "kbn.dashboard.listing.table.entityNamePlural": "ダッシュボード",
+    "kbn.dashboard.listing.table.titleColumnName": "タイトル",
+    "kbn.dashboard.panel.unableToMigratePanelDataForSixThreeZeroErrorMessage": "「6.3.0」のダッシュボードの互換性のため、パネルデータを移行できませんでした。パネルに必要なフィールドがありません: {key}",
+    "kbn.dashboard.savedDashboard.newDashboardTitle": "新規ダッシュボード",
+    "kbn.dashboard.savedDashboardsTitle": "ダッシュボード",
+    "kbn.dashboard.stateManager.timeNotSavedWithDashboardErrorMessage": "このダッシュボードに時刻が保存されていないため、同期できません。",
+    "kbn.dashboard.strings.dashboardEditTitle": "{title} を編集中",
+    "kbn.dashboard.strings.dashboardUnsavedEditTitle": "{title} を編集中 (未保存)",
+    "kbn.dashboard.topNav.cloneModal.cancelButtonLabel": "キャンセル",
+    "kbn.dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle": "ダッシュボードのクローンを作成",
+    "kbn.dashboard.topNav.cloneModal.confirmButtonLabel": "クローンの確認",
+    "kbn.dashboard.topNav.cloneModal.confirmCloneDescription": "クローンの確認",
+    "kbn.dashboard.topNav.cloneModal.dashboardExistsDescription": "{confirmClone} をクリックして重複タイトルでダッシュボードのクローンを作成します。",
+    "kbn.dashboard.topNav.cloneModal.dashboardExistsTitle": "「{newDashboardName}」というタイトルのダッシュボードが既に存在します。",
+    "kbn.dashboard.topNav.cloneModal.enterNewNameForDashboardDescription": "ダッシュボードの新しい名前を入力してください。",
+    "kbn.dashboard.topNav.options.hideAllPanelTitlesSwitchLabel": "パネルタイトルを表示",
+    "kbn.dashboard.topNav.options.useMarginsBetweenPanelsSwitchLabel": "パネルの間に余白を使用",
+    "kbn.dashboard.topNav.saveModal.descriptionFormRowLabel": "説明",
+    "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowHelpText": "有効化すると、ダッシュボードが読み込まれるごとに現在選択された時刻の時間フィルターが変更されます。",
+    "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowLabel": "ダッシュボードに時刻を保存",
+    "kbn.dashboard.topNav.showCloneModal.dashboardCopyTitle": "{title} のコピー",
+    "kbn.dashboard.topNave.addButtonAriaLabel": "追加",
+    "kbn.dashboard.topNave.addConfigDescription": "ダッシュボードにパネルを追加します",
+    "kbn.dashboard.topNave.cancelButtonAriaLabel": "キャンセル",
+    "kbn.dashboard.topNave.cloneButtonAriaLabel": "クローンを作成",
+    "kbn.dashboard.topNave.cloneConfigDescription": "ダッシュボードのコピーを作成します",
+    "kbn.dashboard.topNave.editButtonAriaLabel": "編集",
+    "kbn.dashboard.topNave.editConfigDescription": "編集モードに切り替えます",
+    "kbn.dashboard.topNave.fullScreenButtonAriaLabel": "全画面",
+    "kbn.dashboard.topNave.fullScreenConfigDescription": "全画面モード",
+    "kbn.dashboard.topNave.optionsButtonAriaLabel": "オプション",
+    "kbn.dashboard.topNave.optionsConfigDescription": "オプション",
+    "kbn.dashboard.topNave.saveButtonAriaLabel": "保存",
+    "kbn.dashboard.topNave.saveConfigDescription": "ダッシュボードを保存します",
+    "kbn.dashboard.topNave.shareButtonAriaLabel": "共有",
+    "kbn.dashboard.topNave.shareConfigDescription": "ダッシュボードを共有します",
+    "kbn.dashboard.topNave.viewConfigDescription": "編集をキャンセルして表示限定モードに切り替えます",
+    "kbn.dashboard.urlWasRemovedInSixZeroWarningMessage": "URL「dashboard/create」は 6.0 で廃止されました。ブックマークを更新してください。",
+    "kbn.dashboard.visitVisualizeAppLinkText": "可視化アプリにアクセス",
+    "kbn.dashboardTitle": "ダッシュボード",
+    "kbn.devToolsTitle": "開発ツール",
+    "kbn.discover.backToTopLinkText": "最上部へ戻る。",
+    "kbn.discover.badge.readOnly.text": "読み込み専用",
+    "kbn.discover.badge.readOnly.tooltip": "検索を保存できません",
+    "kbn.discover.bucketIntervalTooltip": "この間隔は選択された時間範囲に表示される {bucketsDescription} が作成されるため、{bucketIntervalDescription} にスケーリングされています。",
+    "kbn.discover.bucketIntervalTooltip.tooLargeBucketsText": "大きすぎるバケット",
+    "kbn.discover.bucketIntervalTooltip.tooManyBucketsText": "バケットが多すぎます",
+    "kbn.discover.discoverBreadcrumbTitle": "ディスカバリ",
+    "kbn.discover.discoverDescription": "ドキュメントにクエリをかけたりフィルターを適用することで、データをインタラクティブに閲覧できます。",
+    "kbn.discover.discoverTitle": "ディスカバー",
+    "kbn.discover.documentsAriaLabel": "ドキュメント",
+    "kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip": "{underscoreSign} で始まるフィールド名はサポートされていません",
+    "kbn.discover.docViews.table.filterForFieldPresentButtonAriaLabel": "現在のフィールドのフィルター",
+    "kbn.discover.docViews.table.filterForFieldPresentButtonTooltip": "現在のフィールドのフィルター",
+    "kbn.discover.docViews.table.filterForValueButtonAriaLabel": "値でフィルタリング",
+    "kbn.discover.docViews.table.filterForValueButtonTooltip": "値でフィルタリング",
+    "kbn.discover.docViews.table.filterOutValueButtonAriaLabel": "値を除外",
+    "kbn.discover.docViews.table.filterOutValueButtonTooltip": "値を除外します",
+    "kbn.discover.docViews.table.noCachedMappingForThisFieldTooltip": "このフィールドのキャッシュされたマッピングがありません。管理 > インデックスパターンページからフィールドリストを更新してください",
+    "kbn.discover.docViews.table.tableTitle": "表",
+    "kbn.discover.docViews.table.toggleColumnInTableButtonAriaLabel": "表の列を切り替える",
+    "kbn.discover.docViews.table.toggleColumnInTableButtonTooltip": "表の列を切り替える",
+    "kbn.discover.docViews.table.unableToFilterForPresenceOfMetaFieldsTooltip": "メタフィールドの有無でフィルタリングできません",
+    "kbn.discover.docViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip": "スクリプトフィールドの有無でフィルタリングできません",
+    "kbn.discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip": "インデックスされていないフィールドは検索できません",
+    "kbn.discover.docViews.json.codeEditorAriaLabel": "Elasticsearch ドキュメントの JSON ビューのみを読み込む",
+    "kbn.discover.docViews.json.jsonTitle": "JSON",
+    "kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel": "警告",
+    "kbn.discover.docViews.table.noCachedMappingForThisFieldAriaLabel": "警告",
+    "kbn.discover.docViews.table.toggleFieldDetails": "フィールド詳細を切り替える",
+    "kbn.discover.errorLoadingData": "データの読み込み中にエラーが発生",
+    "kbn.discover.fetchError.howToAddressErrorDescription": "このエラーは、{scriptedFields} タブにある {managementLink} の {fetchErrorScript} フィールドを編集することで解決できます。",
+    "kbn.discover.fetchError.managmentLinkText": "管理 > インデックスパターン",
+    "kbn.discover.fetchError.scriptedFieldsText": "「スクリプトフィールド」",
+    "kbn.discover.fieldChooser.detailViews.emptyStringText": "空の文字列",
+    "kbn.discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "この値を除外",
+    "kbn.discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "この値でフィルターを適用",
+    "kbn.discover.fieldChooser.detailViews.recordsText": "記録",
+    "kbn.discover.fieldChooser.detailViews.topValuesInRecordsDescription": "次の記録のトップ 5 の値",
+    "kbn.discover.fieldChooser.detailViews.visualizeLinkText": "可視化",
+    "kbn.discover.fieldChooser.detailViews.warningsText": "{warningsLength, plural, one {# 警告} other {# 警告}}",
+    "kbn.discover.fieldChooser.discoverField.addButtonLabel": "追加",
+    "kbn.discover.fieldChooser.discoverField.bucketAriaLabel": "値: {value}",
+    "kbn.discover.fieldChooser.discoverField.emptyStringText": "空の文字列",
+    "kbn.discover.fieldChooser.discoverField.removeButtonLabel": "削除",
+    "kbn.discover.fieldChooser.discoverField.scriptedFieldsTakeLongExecuteDescription": "スクリプトフィールドは実行に時間がかかる場合があります。",
+    "kbn.discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage": "ジオフィールドは分析できません。",
+    "kbn.discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage": "オブジェクトフィールドは分析できません。",
+    "kbn.discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "このフィールドは Elasticsearch マッピングに表示されますが、ドキュメントテーブルの {hitsLength} 件のドキュメントには含まれません。可視化や検索は可能な場合があります。",
+    "kbn.discover.fieldChooser.filter.aggregatableLabel": "集約可能",
+    "kbn.discover.fieldChooser.filter.availableFieldsTitle": "利用可能なフィールド",
+    "kbn.discover.fieldChooser.filter.hideMissingFieldsLabel": "未入力のフィールドを非表示",
+    "kbn.discover.fieldChooser.filter.indexAndFieldsSectionAriaLabel": "インデックスとフィールド",
+    "kbn.discover.fieldChooser.filter.popularTitle": "人気",
+    "kbn.discover.fieldChooser.filter.searchableLabel": "検索可能",
+    "kbn.discover.fieldChooser.filter.selectedFieldsTitle": "スクリプトフィールド",
+    "kbn.discover.fieldChooser.filter.typeLabel": "タイプ",
+    "kbn.discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel": "フィールド設定を非表示",
+    "kbn.discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel": "フィールド設定を表示",
+    "kbn.discover.histogramOfFoundDocumentsAriaLabel": "発見されたドキュメントのヒストグラム",
+    "kbn.discover.hitsPluralTitle": "{hits, plural, one {ヒット} other {ヒット}}",
+    "kbn.discover.howToChangeTheTimeTooltip": "時刻を変更するには、ナビゲーションバーのカレンダーアイコンをクリックします",
+    "kbn.discover.howToSeeOtherMatchingDocumentsDescription": "これらは検索条件に一致した初めの {sampleSize} 件のドキュメントです。他の結果を表示するには検索条件を絞ってください。",
+    "kbn.discover.inspectorRequestDataTitle": "データ",
+    "kbn.discover.inspectorRequestDescription": "このリクエストは Elasticsearch にクエリをかけ、検索データを取得します。",
+    "kbn.discover.localMenu.inspectTitle": "検査",
+    "kbn.discover.localMenu.localMenu.newSearchTitle": "新規",
+    "kbn.discover.localMenu.newSearchDescription": "新規検索",
+    "kbn.discover.localMenu.openInspectorForSearchDescription": "検索用にインスペクターを開きます",
+    "kbn.discover.localMenu.openSavedSearchDescription": "保存された検索を開きます",
+    "kbn.discover.localMenu.openTitle": "開く",
+    "kbn.discover.localMenu.saveSearchDescription": "検索を保存します",
+    "kbn.discover.localMenu.saveTitle": "保存",
+    "kbn.discover.localMenu.shareSearchDescription": "検索を共有します",
+    "kbn.discover.localMenu.shareTitle": "共有",
+    "kbn.discover.noResults.addressShardFailuresTitle": "シャードエラーの解決",
+    "kbn.discover.noResults.expandYourTimeRangeTitle": "時間範囲を拡大",
+    "kbn.discover.noResults.indexFailureIndexText": "インデックス {failureIndex}",
+    "kbn.discover.noResults.indexFailureShardText": "{index}、シャード {failureShard}",
+    "kbn.discover.noResults.queryMayNotMatchTitle": "表示されているインデックスの 1 つまたは複数にデータフィールドが含まれています。クエリが現在の時間範囲のデータと一致しないか、現在選択された時間範囲にデータが全く存在しない可能性があります。データが存在する時間範囲に変えることができます。",
+    "kbn.discover.noResults.requiredPluginIsNotInstalledOrDisabledTitle": "{unsupportedType} インデックスに基づくインデックスパターンには X-Pack の {unsupportedType} プラグインが必要で、このプラグインは現在インストールされていないか無効になっています。",
+    "kbn.discover.noResults.searchExamples.400to499StatusCodeExampleTitle": "400-499 のすべてのステータスコードを検索",
+    "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpExtensionExampleTitle": "400-499 の php 拡張子のステータスコードを検索",
+    "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpOrHtmlExtensionExampleTitle": "400-499 の php または html 拡張子のステータスコードを検索",
+    "kbn.discover.noResults.searchExamples.anyField200StatusCodeExampleTitle": "いずれかのフィールドに数字 200 が含まれているリクエストを検索",
+    "kbn.discover.noResults.searchExamples.howTosearchForWebServerLogsDescription": "画面上部の検索バーは、Elasticsearch の Lucene {queryStringSyntaxLink} サポートを利用します。新規フィールドにパースされたウェブサーバーログの検索方法の例は、次の通りです。",
+    "kbn.discover.noResults.searchExamples.noResultsMatchSearchCriteriaTitle": "検索条件と一致する結果がありません。",
+    "kbn.discover.noResults.searchExamples.queryStringSyntaxLinkText": "クエリ文字列の構文",
+    "kbn.discover.noResults.searchExamples.refineYourQueryTitle": "クエリの調整",
+    "kbn.discover.noResults.searchExamples.statusField200StatusCodeExampleTitle": "ステータスフィールドの 200 を検索",
+    "kbn.discover.noResults.shardFailuresDescription": "次のシャードエラーが発生しました:",
+    "kbn.discover.notifications.notSavedSearchTitle": "検索「{savedSearchTitle}」は保存されませんでした。",
+    "kbn.discover.notifications.savedSearchTitle": "検索「{savedSearchTitle}」が保存されました。",
+    "kbn.discover.painlessError.painlessScriptedFieldErrorMessage": "Painless スクリプトのフィールド「{script}」のエラー.",
+    "kbn.discover.rootBreadcrumb": "ディスカバリ",
+    "kbn.discover.savedSearch.savedObjectName": "保存された検索",
+    "kbn.discover.scaledToDescription": "{bucketIntervalDescription} にスケーリング済み",
+    "kbn.discover.searchingTitle": "検索中",
+    "kbn.discover.showingDefaultIndexPatternWarningDescription": "デフォルトのインデックスパターン「{loadedIndexPatternTitle}」 ({loadedIndexPatternId}) を表示中",
+    "kbn.discover.showingSavedIndexPatternWarningDescription": "保存されたインデックスパターン「{ownIndexPatternTitle}」 ({ownIndexPatternId}) を表示中",
+    "kbn.discover.skipToBottomButtonLabel": "最下部に移動",
+    "kbn.discover.topNav.openSearchPanel.manageSearchesButtonLabel": "検索の管理",
+    "kbn.discover.topNav.openSearchPanel.noSearchesFoundDescription": "一致する検索が見つかりませんでした。",
+    "kbn.discover.topNav.openSearchPanel.openSearchTitle": "検索を開く",
+    "kbn.discover.valueIsNotConfiguredIndexPatternIDWarningTitle": "{stateVal} は設定されたインデックスパターン ID ではありません",
+    "kbn.discoverTitle": "ディスカバリ",
+    "kbn.doc.failedToExecuteQueryDescription": "クエリの実行に失敗しました",
+    "kbn.doc.failedToLocateDocumentDescription": "ドキュメントが見つかりませんでした",
+    "kbn.doc.loadingDescription": "読み込み中…",
+    "kbn.docTable.limitedSearchResultLabel": "{resultCount} 件の結果に制限。検索結果の絞り込み。",
+    "kbn.docTable.noResultsTitle": "結果が見つかりませんでした",
+    "kbn.docTable.tableHeader.moveColumnLeftButtonAriaLabel": "{columnName} 列を左に移動",
+    "kbn.docTable.tableHeader.moveColumnLeftButtonTooltip": "列を左に移動",
+    "kbn.docTable.tableHeader.moveColumnRightButtonAriaLabel": "{columnName} 列を右に移動",
+    "kbn.docTable.tableHeader.moveColumnRightButtonTooltip": "列を右に移動",
+    "kbn.docTable.tableHeader.removeColumnButtonAriaLabel": "{columnName} 列を削除",
+    "kbn.docTable.tableHeader.removeColumnButtonTooltip": "列の削除",
+    "kbn.docTable.tableHeader.sortByColumnAscendingAriaLabel": "{columnName} を昇順に並べ替える",
+    "kbn.docTable.tableHeader.sortByColumnDescendingAriaLabel": "{columnName} を降順に並べ替える",
+    "kbn.docTable.tableRow.detailHeading": "拡張ドキュメント",
+    "kbn.docTable.tableRow.filterForValueButtonAriaLabel": "値でフィルタリング",
+    "kbn.docTable.tableRow.filterForValueButtonTooltip": "値でフィルタリング",
+    "kbn.docTable.tableRow.filterOutValueButtonAriaLabel": "値を除外",
+    "kbn.docTable.tableRow.filterOutValueButtonTooltip": "値を除外",
+    "kbn.docTable.tableRow.toggleRowDetailsButtonAriaLabel": "行の詳細を切り替える",
+    "kbn.docTable.tableRow.viewSingleDocumentLinkText": "単一のドキュメントを表示",
+    "kbn.docTable.tableRow.viewSurroundingDocumentsLinkText": "周りのドキュメントを表示",
+    "kbn.embeddable.errorTitle": "データの取得中にエラーが発生",
+    "kbn.embeddable.inspectorRequestDataTitle": "データ",
+    "kbn.embeddable.inspectorRequestDescription": "このリクエストは Elasticsearch にクエリをかけ、検索データを取得します。",
+    "kbn.home.addData.addDataToKibanaDescription": "これらのソリューションで、データを作成済みのダッシュボードと監視システムへとすぐに変えることができます。",
+    "kbn.home.addData.addDataToKibanaTitle": "Kibana にデータを追加",
+    "kbn.home.addData.apm.addApmButtonLabel": "APM を追加",
+    "kbn.home.addData.apm.nameDescription": "APM は、集約内から自動的に詳細なパフォーマンスメトリックやエラーを集めます。",
+    "kbn.home.addData.apm.nameTitle": "APM",
+    "kbn.home.addData.logging.addLogDataButtonLabel": "ログデータを追加",
+    "kbn.home.addData.logging.nameDescription": "頻繁に使用するデータソースからログを投入し、構成済みのダッシュボードで簡単に可視化できます。",
+    "kbn.home.addData.logging.nameTitle": "ログ",
+    "kbn.home.addData.metrics.addMetricsDataButtonLabel": "メトリックデータを追加",
+    "kbn.home.addData.metrics.nameDescription": "サーバーのオペレーティングシステムと実行中のサービスからメトリックを収集します。",
+    "kbn.home.addData.metrics.nameTitle": "メトリック",
+    "kbn.home.addData.sampleDataLink": "データセットと Kibana ダッシュボードを読み込む",
+    "kbn.home.addData.sampleDataTitle": "サンプルデータの追加",
+    "kbn.home.addData.uploadFileLink": "CSV、NDJSON、またはログファイルをインポート",
+    "kbn.home.addData.uploadFileTitle": "ログファイルからデータをアップロード",
+    "kbn.home.addData.yourDataLink": "Elasticsearch インデックスに接続",
+    "kbn.home.addData.yourDataTitle": "Elasticsearch データの使用",
+    "kbn.home.breadcrumbs.addDataTitle": "データの投入",
+    "kbn.home.breadcrumbs.homeTitle": "ホーム",
+    "kbn.home.directories.manage.nameTitle": "Elastic Stack の管理",
+    "kbn.home.directories.notFound.description": "お探しのものが見つかりませんでしたか？",
+    "kbn.home.directories.notFound.viewFullButtonLabel": "Kibana プラグインの完全なディレクトリを表示",
+    "kbn.home.directories.visualize.nameTitle": "データの可視化と閲覧",
+    "kbn.home.directory.directoryTitle": "ディレクトリ",
+    "kbn.home.directory.tabs.administrativeTitle": "管理",
+    "kbn.home.directory.tabs.allTitle": "すべて",
+    "kbn.home.directory.tabs.dataTitle": "データの閲覧と可視化",
+    "kbn.home.directory.tabs.otherTitle": "その他",
+    "kbn.home.exploreButtonLabel": "独りで閲覧",
+    "kbn.home.exploreYourDataDescription": "すべてのステップを終えたら、データ閲覧準備の完了です。",
+    "kbn.home.letsStartDescription": "クラスターにデータがありません。サンプルデータやダッシュボードで試すこともできますし、いきなり独自のデータを使用することもできます。",
+    "kbn.home.letsStartTitle": "始めましょう",
+    "kbn.home.loadTutorials.requestFailedErrorMessage": "リクエスト失敗、ステータスコード: {status}",
+    "kbn.home.loadTutorials.unableToLoadErrorMessage": "チュートリアルが読み込めません。",
+    "kbn.home.recentlyAccessed.recentlyViewedTitle": "最近閲覧",
+    "kbn.home.sampleDataSet.installedLabel": "{name} がインストールされました",
+    "kbn.home.sampleDataSet.unableToInstallErrorMessage": "サンプルデータセット「{name}」をインストールできません",
+    "kbn.home.sampleDataSet.unableToLoadListErrorMessage": "サンプルデータセットのリストを読み込めません",
+    "kbn.home.sampleDataSet.unableToUninstallErrorMessage": "サンプルデータセット「{name}」をアンインストールできません",
+    "kbn.home.sampleDataSet.uninstalledLabel": "{name} がアンインストールされました",
+    "kbn.home.sampleDataSetCard.addButtonAriaLabel": "{datasetName} を追加",
+    "kbn.home.sampleDataSetCard.addButtonLabel": "データの投入",
+    "kbn.home.sampleDataSetCard.addingButtonAriaLabel": "{datasetName} を追加中",
+    "kbn.home.sampleDataSetCard.addingButtonLabel": "追加中",
+    "kbn.home.sampleDataSetCard.dashboardLinkLabel": "ダッシュボード",
+    "kbn.home.sampleDataSetCard.default.addButtonAriaLabel": "{datasetName} を追加",
+    "kbn.home.sampleDataSetCard.default.addButtonLabel": "データの投入",
+    "kbn.home.sampleDataSetCard.default.unableToVerifyErrorMessage": "データセットステータスを確認できません、エラー: {statusMsg}",
+    "kbn.home.sampleDataSetCard.removeButtonAriaLabel": "{datasetName} を削除",
+    "kbn.home.sampleDataSetCard.removeButtonLabel": "削除",
+    "kbn.home.sampleDataSetCard.removingButtonAriaLabel": "{datasetName} を削除中",
+    "kbn.home.sampleDataSetCard.removingButtonLabel": "削除中",
+    "kbn.home.sampleDataSetCard.viewDataButtonAriaLabel": "{datasetName} を表示",
+    "kbn.home.sampleDataSetCard.viewDataButtonLabel": "データを表示",
+    "kbn.home.tryButtonLabel": "サンプルデータを試す",
+    "kbn.home.tutorial.addDataToKibanaTitle": "Kibana にデータを追加",
+    "kbn.home.tutorial.card.sampleDataDescription": "これらの「ワンクリック」データセットで Kibana の探索を始めましょう。",
+    "kbn.home.tutorial.card.sampleDataTitle": "サンプルデータ",
+    "kbn.home.tutorial.elasticCloudButtonLabel": "Elastic Cloud",
+    "kbn.home.tutorial.instruction.copyButtonLabel": "スニペットをコピー",
+    "kbn.home.tutorial.instructionSet.checkStatusButtonLabel": "ステータスを確認",
+    "kbn.home.tutorial.instructionSet.customizeLabel": "コードスニペットのカスタマイズ",
+    "kbn.home.tutorial.instructionSet.noDataLabel": "データが見つかりません",
+    "kbn.home.tutorial.instructionSet.statusCheckTitle": "ステータス確認",
+    "kbn.home.tutorial.instructionSet.successLabel": "成功",
+    "kbn.home.tutorial.instructionSet.toggleAriaLabel": "コマンドパラメーターの可視性を調整します",
+    "kbn.home.tutorial.introduction.betaLabel": "ベータ",
+    "kbn.home.tutorial.introduction.imageAltDescription": "プライマリダッシュボードのスクリーンショット",
+    "kbn.home.tutorial.introduction.viewButtonLabel": "エクスポートされたフィールドを表示",
+    "kbn.home.tutorial.noTutorialLabel": "チュートリアル {tutorialId} が見つかりません",
+    "kbn.home.tutorial.savedObject.addedLabel": "{savedObjectsLength} 件の保存されたオブジェクトが追加されました",
+    "kbn.home.tutorial.savedObject.confirmButtonLabel": "上書きを確定",
+    "kbn.home.tutorial.savedObject.defaultButtonLabel": "Kibana オブジェクトを読み込む",
+    "kbn.home.tutorial.savedObject.installLabel": "インデックスパターン、ビジュアライゼーション、事前定義済みのダッシュボードをインポートします。",
+    "kbn.home.tutorial.savedObject.installStatusLabel": "{savedObjectsLength} 件中 {overwriteErrorsLength} 件のオブジェクトが既に存在します。インポートして既存のオブジェクトを上書きするには、「上書きを確定」をクリックしてください。オブジェクトへの変更はすべて失われます。",
+    "kbn.home.tutorial.savedObject.loadTitle": "Kibana オブジェクトを読み込む",
+    "kbn.home.tutorial.savedObject.requestFailedErrorMessage": "リクエスト失敗、エラー: {message}",
+    "kbn.home.tutorial.savedObject.unableToAddErrorMessage": "{savedObjectsLength} 件中 {errorsLength} 件の kibana オブジェクトが追加できません、エラー: {errorMessage}",
+    "kbn.home.tutorial.selfManagedButtonLabel": "セルフマネージド",
+    "kbn.home.tutorial.tabs.allTitle": "すべて",
+    "kbn.home.tutorial.tabs.loggingTitle": "ログ",
+    "kbn.home.tutorial.tabs.metricsTitle": "メトリック",
+    "kbn.home.tutorial.tabs.sampleDataTitle": "サンプルデータ",
+    "kbn.home.tutorial.unexpectedStatusCheckStateErrorDescription": "予期せぬステータス確認ステータス {statusCheckState}",
+    "kbn.home.tutorial.unhandledInstructionTypeErrorDescription": "予期せぬ指示タイプ {visibleInstructions}",
+    "kbn.home.welcomeDescription": "Elastic Stack への開かれた窓",
+    "kbn.home.welcomeTitle": "Kibana へようこそ",
+    "kbn.management.advancedSettings.badge.readOnly.text": "読み込み専用",
+    "kbn.management.advancedSettings.badge.readOnly.tooltip": "高度な設定を保存できません",
+    "kbn.management.createIndexPattern.betaLabel": "ベータ",
+    "kbn.management.createIndexPattern.emptyState.checkDataButton": "新規データを確認",
+    "kbn.management.createIndexPattern.emptyStateHeader": "Elasticsearch データが見つかりませんでした",
+    "kbn.management.createIndexPattern.emptyStateLabel.emptyStateDetail": "{needToIndex} {learnHowLink} または {getStartedLink}",
+    "kbn.management.createIndexPattern.emptyStateLabel.getStartedLink": "サンプルデータで始めましょう。",
+    "kbn.management.createIndexPattern.emptyStateLabel.learnHowLink": "方法を学習",
+    "kbn.management.createIndexPattern.emptyStateLabel.needToIndexLabel": "インデックスパターンを作成する前に、Elasticsearch へのデータのインデックスが必要です。",
+    "kbn.management.createIndexPattern.includeSystemIndicesToggleSwitchLabel": "システムインデックスを含める",
+    "kbn.management.createIndexPattern.loadClustersFailMsg": "リモートクラスターの読み込みに失敗",
+    "kbn.management.createIndexPattern.loadIndicesFailMsg": "インデックスの読み込みに失敗",
+    "kbn.management.createIndexPattern.loadingState.checkingLabel": "Elasticsearch データを確認中",
+    "kbn.management.createIndexPattern.step.indexPattern.allowLabel": "インデックスパターンでワイルドカードとして {asterisk} を使用できます。",
+    "kbn.management.createIndexPattern.step.indexPattern.disallowLabel": "スペースや {characterList} は使用できません。",
+    "kbn.management.createIndexPattern.step.indexPatternLabel": "インデックスパターン",
+    "kbn.management.createIndexPattern.step.indexPatternPlaceholder": "index-name-*",
+    "kbn.management.createIndexPattern.step.invalidCharactersErrorMessage": "{indexPatternName} にはスペースや {characterList} は使えません。",
+    "kbn.management.createIndexPattern.step.loadingHeader": "一致するインデックスを検索中…",
+    "kbn.management.createIndexPattern.step.loadingLabel": "お待ちください…",
+    "kbn.management.createIndexPattern.step.nextStepButton": "次のステップ",
+    "kbn.management.createIndexPattern.step.pagingLabel": "ページごとの行数: {perPage}",
+    "kbn.management.createIndexPattern.step.status.matchAnyLabel.matchAnyDetail": "インデックスパターンは下の{strongIndices} の いずれかに一致します。",
+    "kbn.management.createIndexPattern.step.status.noSystemIndicesLabel": "パターンに一致する Elasticsearch インデックスがありません。",
+    "kbn.management.createIndexPattern.step.status.noSystemIndicesWithPromptLabel": "パターンに一致する Elasticsearch インデックスがありません。一致するシステムインデックスを表示するには、右上のスイッチを切り替えます。",
+    "kbn.management.createIndexPattern.step.status.notMatchLabel.allIndicesLabel": "{indicesLength, plural, one {# インデックス} other {# インデックス}}",
+    "kbn.management.createIndexPattern.step.status.notMatchLabel.notMatchDetail": "入力されたインデックスパターンがどのインデックスにも一致しません。下の {indicesLength, plural, one {} other {}}{strongIndices} と一致させることができます。",
+    "kbn.management.createIndexPattern.step.status.partialMatchLabel.partialMatchDetail": "インデックスパターンがどのインデックスとも一致ませんが、似た {matchedIndicesLength, plural, one {} other {}}{strongIndices} があります。",
+    "kbn.management.createIndexPattern.step.status.partialMatchLabel.strongIndicesLabel": "{matchedIndicesLength, plural, one {# インデックス} other {# インデックス}}",
+    "kbn.management.createIndexPattern.step.status.successLabel.strongIndicesLabel": "{indicesLength, plural, one {# インデックス} other {# インデックス}}",
+    "kbn.management.createIndexPattern.step.status.successLabel.strongSuccessLabel": "成功！",
+    "kbn.management.createIndexPattern.step.status.successLabel.successDetail": "{strongSuccess} インデックスパターンが {strongIndices} と一致しています。",
+    "kbn.management.createIndexPattern.step.warningHeader": "既に {query} という名前のインデックスパターンがあります。",
+    "kbn.management.createIndexPattern.stepHeader": "ステップ 1/2:インデックスパターンの定義",
+    "kbn.management.createIndexPattern.stepTime.backButton": "戻る",
+    "kbn.management.createIndexPattern.stepTime.createPatternButton": "インデックスパターンを作成",
+    "kbn.management.createIndexPattern.stepTime.creatingLabel": "インデックスパターンを作成中…",
+    "kbn.management.createIndexPattern.stepTime.error": "エラー",
+    "kbn.management.createIndexPattern.stepTime.field.loadingDropDown": "読み込み中…",
+    "kbn.management.createIndexPattern.stepTime.field.noTimeFieldsLabel": "このインデックスパターンに一致するインデックスには時間フィールドがありません。",
+    "kbn.management.createIndexPattern.stepTime.fieldHeader": "時間フィルターのフィールド名",
+    "kbn.management.createIndexPattern.stepTime.fieldLabel": "時間フィルターはこのフィールドを使って時間でフィールドを絞ります。",
+    "kbn.management.createIndexPattern.stepTime.fieldWarningLabel": "時間フィールドを使わないこともできますが、その場合データを時間範囲で絞ることができません。",
+    "kbn.management.createIndexPattern.stepTime.noTimeFieldOptionLabel": "時間フィルターを使用しない",
+    "kbn.management.createIndexPattern.stepTime.noTimeFieldsLabel": "このインデックスパターンに一致するインデックスには時間フィールドがありません。",
+    "kbn.management.createIndexPattern.stepTime.options.hideButton": "高度なオプションを非表示",
+    "kbn.management.createIndexPattern.stepTime.options.patternHeader": "カスタムインデックスパターン ID",
+    "kbn.management.createIndexPattern.stepTime.options.patternLabel": "Kibana はそれぞれのインデックスパターンに固有の識別子を割り当てます。固有 ID を使用しない場合は、カスタム ID を入力してください。",
+    "kbn.management.createIndexPattern.stepTime.options.patternPlaceholder": "custom-index-pattern-id",
+    "kbn.management.createIndexPattern.stepTime.options.showButton": "高度なオプションを表示",
+    "kbn.management.createIndexPattern.stepTime.patterAlreadyExists": "カスタムインデックスパターン ID が既に存在します。",
+    "kbn.management.createIndexPattern.stepTime.refreshButton": "更新",
+    "kbn.management.createIndexPattern.stepTimeHeader": "ステップ 2/2:設定の変更",
+    "kbn.management.createIndexPattern.stepTimeLabel": "{indexPattern} を {indexPatternName} に定義しました。次に、作成前に他の設定を行うことができます。",
+    "kbn.management.createIndexPatternHeader": "{indexPatternName} の作成",
+    "kbn.management.createIndexPatternLabel": "Kibana は、可視化などを目的に Elasticsearch インデックスからデータを取得するために、インデックスパターンを使用します。",
+    "kbn.management.editIndexPattern.deleteButton": "削除",
+    "kbn.management.editIndexPattern.deleteFieldButton": "削除",
+    "kbn.management.editIndexPattern.deleteHeader": "インデックスパターンを削除しますか？",
+    "kbn.management.editIndexPattern.detailsAria": "インデックスパターンの詳細",
+    "kbn.management.editIndexPattern.editFieldButton": "編集",
+    "kbn.management.editIndexPattern.fields.allLangsDropDown": "すべての言語",
+    "kbn.management.editIndexPattern.fields.allTypesDropDown": "すべてのフィールドタイプ",
+    "kbn.management.editIndexPattern.fields.filterAria": "フィルター",
+    "kbn.management.editIndexPattern.fields.filterPlaceholder": "フィルター",
+    "kbn.management.editIndexPattern.fields.table.additionalInfoAriaLabel": "追加フィールド情報",
+    "kbn.management.editIndexPattern.fields.table.aggregatableDescription": "これらのフィールドはビジュアライゼーションの集約に使用できます",
+    "kbn.management.editIndexPattern.fields.table.aggregatableLabel": "集約可能",
+    "kbn.management.editIndexPattern.fields.table.editDescription": "編集",
+    "kbn.management.editIndexPattern.fields.table.editLabel": "編集",
+    "kbn.management.editIndexPattern.fields.table.excludedDescription": "取得の際に _source から除外されるフィールドです",
+    "kbn.management.editIndexPattern.fields.table.excludedLabel": "除外",
+    "kbn.management.editIndexPattern.fields.table.formatHeader": "フォーマット",
+    "kbn.management.editIndexPattern.fields.table.isAggregatableAria": "は集約可能です",
+    "kbn.management.editIndexPattern.fields.table.isExcludedAria": "は除外されています",
+    "kbn.management.editIndexPattern.fields.table.isSearchableAria": "は検索可能です",
+    "kbn.management.editIndexPattern.fields.table.multiTypeAria": "複数タイプのフィールド",
+    "kbn.management.editIndexPattern.fields.table.multiTypeTooltip": "フィールドのタイプがインデックスごとに変わります。多くの分析機能には使用できません。",
+    "kbn.management.editIndexPattern.fields.table.nameHeader": "名前",
+    "kbn.management.editIndexPattern.fields.table.primaryTimeAriaLabel": "プライマリ時間フィールド",
+    "kbn.management.editIndexPattern.fields.table.primaryTimeTooltip": "このフィールドはイベントの発生時刻を表します。",
+    "kbn.management.editIndexPattern.fields.table.searchableDescription": "これらのフィールドはフィルターバーで使用できます",
+    "kbn.management.editIndexPattern.fields.table.searchableHeader": "検索可能",
+    "kbn.management.editIndexPattern.fields.table.typeHeader": "タイプ",
+    "kbn.management.editIndexPattern.mappingConflictHeader": "マッピングの矛盾",
+    "kbn.management.editIndexPattern.mappingConflictLabel": "{conflictFieldsLength, plural, one {フィールドが} other {# フィールドが}}このパターンと一致するインデックスの間で異なるタイプ (文字列、整数など) に定義されています。これらの矛盾したフィールドは Kibana の一部で使用できますが、Kibana がタイプを把握しなければならない機能には使用できません。この問題を修正するにはデータのレンダリングが必要です。",
+    "kbn.management.editIndexPattern.notDateErrorMessage": "このフィールドは日付ではなく {fieldType} です。",
+    "kbn.management.editIndexPattern.refreshAria": "フィールドリストを再度読み込みます",
+    "kbn.management.editIndexPattern.refreshButton": "更新",
+    "kbn.management.editIndexPattern.refreshHeader": "フィールドリストを更新しますか？",
+    "kbn.management.editIndexPattern.refreshLabel": "この操作は各フィールドの使用頻度をリセットします。",
+    "kbn.management.editIndexPattern.refreshTooltip": "フィールドリストを更新",
+    "kbn.management.editIndexPattern.removeAria": "インデックスパターンを削除",
+    "kbn.management.editIndexPattern.removeTooltip": "インデックスパターンを削除います",
+    "kbn.management.editIndexPattern.scripted.addFieldButton": "スクリプトフィールドを追加",
+    "kbn.management.editIndexPattern.scripted.deleteField.cancelButton": "キャンセル",
+    "kbn.management.editIndexPattern.scripted.deleteField.deleteButton": "削除",
+    "kbn.management.editIndexPattern.scripted.deleteFieldLabel": "スクリプトフィールド「{fieldName}」を削除しますか？",
+    "kbn.management.editIndexPattern.scripted.deprecationLangHeader": "廃止された言語が使用されています",
+    "kbn.management.editIndexPattern.scripted.deprecationLangLabel.deprecationLangDetail": "次の廃止された言語が使用されています: {deprecatedLangsInUse}これらの言語は、Kibana と Elasticsearch の次のメジャーなバージョンでサポートされなくなります。問題を避けるため、スクリプトフィールドを {link} に変換してください。",
+    "kbn.management.editIndexPattern.scripted.deprecationLangLabel.painlessDescription": "パターン",
+    "kbn.management.editIndexPattern.scripted.newFieldPlaceholder": "新規スクリプトフィールド",
+    "kbn.management.editIndexPattern.scripted.noFieldLabel": "「{indexPatternTitle}」インデックスパターンには「{fieldName}」というスクリプトフィールドがありません",
+    "kbn.management.editIndexPattern.scripted.table.deleteDescription": "このフィールドを削除します",
+    "kbn.management.editIndexPattern.scripted.table.deleteHeader": "削除",
+    "kbn.management.editIndexPattern.scripted.table.editDescription": "このフィールドを編集します",
+    "kbn.management.editIndexPattern.scripted.table.editHeader": "編集",
+    "kbn.management.editIndexPattern.scripted.table.formatDescription": "フィールドに使用されているフォーマットです",
+    "kbn.management.editIndexPattern.scripted.table.formatHeader": "フォーマット",
+    "kbn.management.editIndexPattern.scripted.table.langDescription": "フィールドに使用されている言語です",
+    "kbn.management.editIndexPattern.scripted.table.langHeader": "言語",
+    "kbn.management.editIndexPattern.scripted.table.nameDescription": "フィールドの名前です",
+    "kbn.management.editIndexPattern.scripted.table.nameHeader": "名前",
+    "kbn.management.editIndexPattern.scripted.table.scriptDescription": "フィールドのスクリプトです",
+    "kbn.management.editIndexPattern.scripted.table.scriptHeader": "スクリプト",
+    "kbn.management.editIndexPattern.scripted.unknownModeErrorMessage": "不明なフィールド設定モード {mode}",
+    "kbn.management.editIndexPattern.scriptedHeader": "スクリプトフィールド",
+    "kbn.management.editIndexPattern.scriptedLabel": "ビジュアライゼーションにスクリプトフィールドを使用し、ドキュメントに表示させることができます。但し、スクリプトフィールドは検索できません。",
+    "kbn.management.editIndexPattern.setDefaultAria": "デフォルトのインデックスに設定",
+    "kbn.management.editIndexPattern.setDefaultTooltip": "デフォルトのインデックスに設定します",
+    "kbn.management.editIndexPattern.source.addButtonLabel": "追加",
+    "kbn.management.editIndexPattern.source.deleteFilter.cancelButtonLabel": "キャンセル",
+    "kbn.management.editIndexPattern.source.deleteFilter.deleteButtonLabel": "削除",
+    "kbn.management.editIndexPattern.source.deleteSourceFilterLabel": "ソースフィルター「{value}」を削除しますか？",
+    "kbn.management.editIndexPattern.source.noteLabel": "下の表で、マルチフィールドが一致として誤って表示されます。これらのフィルターは、オリジナルのソースドキュメントの\\フィールドのみに適用されるため、一致するマルチフィールドはフィルタリングされません。",
+    "kbn.management.editIndexPattern.source.table.cancelAria": "キャンセル",
+    "kbn.management.editIndexPattern.source.table.deleteAria": "削除",
+    "kbn.management.editIndexPattern.source.table.editAria": "編集",
+    "kbn.management.editIndexPattern.source.table.filterDescription": "フィルター名",
+    "kbn.management.editIndexPattern.source.table.filterHeader": "フィルター",
+    "kbn.management.editIndexPattern.source.table.matchesDescription": "フィールドに使用されている言語です",
+    "kbn.management.editIndexPattern.source.table.matchesHeader": "一致",
+    "kbn.management.editIndexPattern.source.table.notMatchedLabel": "ソースフィルターが既知のフィールドと一致しません。",
+    "kbn.management.editIndexPattern.source.table.saveAria": "保存",
+    "kbn.management.editIndexPattern.sourceHeader": "ソースフィルター",
+    "kbn.management.editIndexPattern.sourceLabel": "ソースフィルターは、ドキュメントソースの取得時に 1 つまたは複数のフィールドを除外するのに使用される場合もあります。これはディスカバリアプリでのドキュメントの表示中、またはダッシュボードアプリの保存された検索の結果を表示する表で起こります。それぞれの行は 1 つのドキュメントのソースで作成されており、ドキュメントに大きなフィールドや重要ではないフィールドが含まれている場合、このレベルでフィルターで除外すると良いかもしれません。",
+    "kbn.management.editIndexPattern.sourcePlaceholder": "ソースフィルター、ワイルドカード使用可 (例: 「user」と入力して「user」で始まるフィールドをフィルタリング)",
+    "kbn.management.editIndexPattern.tabs.fieldsHeader": "フィールド",
+    "kbn.management.editIndexPattern.tabs.scriptedHeader": "スクリプトフィールド",
+    "kbn.management.editIndexPattern.tabs.sourceHeader": "ソースフィルター",
+    "kbn.management.editIndexPattern.timeFilterHeader": "時間フィルターフィールド名: {timeFieldName}",
+    "kbn.management.editIndexPattern.timeFilterLabel.mappingAPILink": "マッピング API",
+    "kbn.management.editIndexPattern.timeFilterLabel.timeFilterDetail": "このページは {indexPatternTitle} インデックス内のすべてのフィールドと、Elasticsearch に記録された各フィールドのコアタイプを一覧表示します。フィールドタイプを変更するには Elasticsearch を使用します",
+    "kbn.management.editIndexPatternLiveRegionAriaLabel": "インデックスパターン",
+    "kbn.management.indexPattern.confirmOverwriteButton": "上書き",
+    "kbn.management.indexPattern.confirmOverwriteLabel": "「{title}」に上書きしてよろしいですか？",
+    "kbn.management.indexPattern.confirmOverwriteTitle": "{type} を上書きしますか？",
+    "kbn.management.indexPattern.sectionsHeader": "インデックスパターン",
+    "kbn.management.indexPattern.titleExistsLabel": "「{title}」というタイトルのインデックスパターンが既に存在します。",
+    "kbn.management.indexPatternHeader": "インデックスパターン",
+    "kbn.management.indexPatternLabel": "Elasticsearch からのデータの取得に役立つインデックスパターンを管理します。",
+    "kbn.management.indexPatternList.createButton.betaLabel": "ベータ",
+    "kbn.management.indexPatternPrompt.exampleOne": "チャートを作成したりコンテンツを素早くクエリできるように log-west-001 という名前の単一のデータソースをインデックスします。",
+    "kbn.management.indexPatternPrompt.exampleOneTitle": "単一のデータソース",
+    "kbn.management.indexPatternPrompt.examplesTitle": "インデックスパターンの例",
+    "kbn.management.indexPatternPrompt.exampleThree": "比較目的に履歴の動向を集約できるよう、これらのログのアーカイブされた月々のロールアップメトリックスを指定通りに別々のインデックスパターンにグループ分けします。",
+    "kbn.management.indexPatternPrompt.exampleThreeTitle": "カスタムグルーピング",
+    "kbn.management.indexPatternPrompt.exampleTwo": "すべての西海岸のサーバーログに対してクエリを実行できるように、頭に「log-west」の付いたすべての受信データソースをグループ化します。",
+    "kbn.management.indexPatternPrompt.exampleTwoTitle": "複数データソース",
+    "kbn.management.indexPatternPrompt.subtitle": "インデックスパターンは、Kibana で共有フィールドにクエリを実行できるよう、種類の異なるデータソースをバケットにまとめることができます。",
+    "kbn.management.indexPatternPrompt.title": "インデックスパターンについて",
+    "kbn.management.indexPatterns.badge.readOnly.text": "読み込み専用",
+    "kbn.management.indexPatterns.badge.readOnly.tooltip": "インデックスパターンを保存できません",
+    "kbn.management.indexPatterns.createBreadcrumb": "インデックスパターンを作成",
+    "kbn.management.indexPatterns.createFieldBreadcrumb": "フィールドを作成",
+    "kbn.management.indexPatterns.listBreadcrumb": "インデックスパターン",
+    "kbn.management.indexPatternTable.createBtn": "インデックスパターンの作成",
+    "kbn.management.indexPatternTable.title": "インデックスパターン",
+    "kbn.management.landing.header": "Kibana {version} 管理",
+    "kbn.management.landing.subhead": "インデックス、インデックスパターン、保存されたオブジェクト、Kibana の設定、その他を管理します。",
+    "kbn.management.landing.text": "すべてのツールの一覧は、左のメニューにあります。",
+    "kbn.management.managementDescription": "Elastic Stack の管理を行うセンターコンソールです。",
+    "kbn.management.managementLabel": "管理",
+    "kbn.management.objects.confirmModalOptions.deleteButtonLabel": "削除",
+    "kbn.management.objects.confirmModalOptions.modalDescription": "削除されたオブジェクトは復元できません",
+    "kbn.management.objects.confirmModalOptions.modalTitle": "保存された Kibana オブジェクトを削除しますか？",
+    "kbn.management.objects.deleteSavedObjectsConfirmModalDescription": "この操作は次の保存されたオブジェクトを削除します:",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel": "キャンセル",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel": "削除",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteProcessButtonLabel": "削除中…",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.idColumnName": "ID",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName": "タイトル",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.typeColumnName": "タイプ",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModalTitle": "保存されたオブジェクトの削除",
+    "kbn.management.objects.objectsTable.export.dangerNotification": "エクスポートを生成できません",
+    "kbn.management.objects.objectsTable.export.successNotification": "ファイルはバックグラウンドでダウンロード中です",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.cancelButtonLabel": "キャンセル",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel": "すべてエクスポート:",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportOptionsLabel": "オプション",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel": "関連オブジェクトを含める",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModalDescription": "エクスポートするタイプを選択してください",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModalTitle": "{filteredItemCount, plural, one{# オブジェクト} other {# オブジェクト}}をエクスポート",
+    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.resolvingConflictsLoadingMessage": "矛盾を解決中…",
+    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage": "失敗したオブジェクトを再試行中…",
+    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage": "保存された検索が正しくリンクされていることを確認してください…",
+    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage": "矛盾を保存中…",
+    "kbn.management.objects.objectsTable.flyout.confirmOverwriteBody": "{title} を上書きしてよろしいですか？",
+    "kbn.management.objects.objectsTable.flyout.confirmOverwriteCancelButtonText": "キャンセル",
+    "kbn.management.objects.objectsTable.flyout.confirmOverwriteOverwriteButtonText": "上書き",
+    "kbn.management.objects.objectsTable.flyout.confirmOverwriteTitle": "{type} を上書きしますか？",
+    "kbn.management.objects.objectsTable.flyout.errorCalloutTitle": "申し訳ございませんが、エラーが発生しました",
+    "kbn.management.objects.objectsTable.flyout.import.cancelButtonLabel": "キャンセル",
+    "kbn.management.objects.objectsTable.flyout.import.confirmButtonLabel": "インポート",
+    "kbn.management.objects.objectsTable.flyout.importFailedDescription": "{totalImportCount} 個中 {failedImportCount} 個のオブジェクトのインポートに失敗しました。インポート失敗",
+    "kbn.management.objects.objectsTable.flyout.importFailedMissingReference": "{type} [id={id}] は {refType} [id={refId}] を見つけられませんでした",
+    "kbn.management.objects.objectsTable.flyout.importFailedTitle": "インポート失敗",
+    "kbn.management.objects.objectsTable.flyout.importFailedUnsupportedType": "{type} [id={id}] サポートされていないタイプ",
+    "kbn.management.objects.objectsTable.flyout.importFileErrorMessage": "ファイルを処理できませんでした。",
+    "kbn.management.objects.objectsTable.flyout.importLegacyFileErrorMessage": "ファイルを処理できませんでした。",
+    "kbn.management.objects.objectsTable.flyout.importPromptText": "インポート",
+    "kbn.management.objects.objectsTable.flyout.importSavedObjectTitle": "保存されたオブジェクトのインポート",
+    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "すべての変更を確定",
+    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完了",
+    "kbn.management.objects.objectsTable.flyout.importSuccessfulCallout.noObjectsImportedTitle": "オブジェクトがインポートされませんでした",
+    "kbn.management.objects.objectsTable.flyout.importSuccessfulDescription": "{importCount} 個のオブジェクトがインポートされました。",
+    "kbn.management.objects.objectsTable.flyout.importSuccessfulTitle": "インポート成功",
+    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "新規インデックスパターンを作成",
+    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsDescription": "次の保存されたオブジェクトは、存在しないインデックスパターンを使用しています。別のデックスパターンを選択してください。必要に応じて {indexPatternLink} できます。",
+    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsTitle": "インデックスパターンの矛盾",
+    "kbn.management.objects.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage": "保存されたオブジェクトのファイル形式が無効なため、インポートできません。",
+    "kbn.management.objects.objectsTable.flyout.legacyFileUsedBody": "最新のレポートで NDJSON ファイルを作成すれば完了です。",
+    "kbn.management.objects.objectsTable.flyout.legacyFileUsedTitle": "JSON ファイルのサポートが終了します",
+    "kbn.management.objects.objectsTable.flyout.overwriteSavedObjectsLabel": "すべての保存されたオブジェクトを自動的に上書きしますか？",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountDescription": "影響されるオブジェクトの数です",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountName": "カウント",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdDescription": "インデックスパターンの ID です",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdName": "ID",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新規インデックスパターン",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "影響されるオブジェクトのサンプルです",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "影響されるオブジェクトのサンプル",
+    "kbn.management.objects.objectsTable.flyout.resolveImportErrorsFileErrorMessage": "ファイルを処理できませんでした。",
+    "kbn.management.objects.objectsTable.flyout.selectFileToImportFormRowLabel": "インポートするファイルを選択してください",
+    "kbn.management.objects.objectsTable.header.exportButtonLabel": "{filteredCount, plural, one{# オブジェクト} other {# オブジェクト}}をエクスポート",
+    "kbn.management.objects.objectsTable.header.importButtonLabel": "インポート",
+    "kbn.management.objects.objectsTable.header.refreshButtonLabel": "更新",
+    "kbn.management.objects.objectsTable.header.savedObjectsTitle": "保存されたオブジェクト",
+    "kbn.management.objects.objectsTable.howToDeleteSavedObjectsDescription": "ここから保存された検索などの保存されたオブジェクトを削除できます。保存されたオブジェクトの生データを編集することもできます。通常、オブジェクトは関連アプリケーションでのみ編集され、こｎ画面で編集するよりもそちらのほうが賢明です。",
+    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionDescription": "この保存されたオブジェクトを確認してください",
+    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionName": "検査",
+    "kbn.management.objects.objectsTable.relationships.columnActionsName": "アクション",
+    "kbn.management.objects.objectsTable.relationships.columnRelationship.childAsValue": "子",
+    "kbn.management.objects.objectsTable.relationships.columnRelationship.parentAsValue": "ペアレント",
+    "kbn.management.objects.objectsTable.relationships.columnRelationshipName": "直接関係",
+    "kbn.management.objects.objectsTable.relationships.columnTitleDescription": "保存されたオブジェクトのタイトルです",
+    "kbn.management.objects.objectsTable.relationships.columnTitleName": "タイトル",
+    "kbn.management.objects.objectsTable.relationships.columnTypeDescription": "保存されたオブジェクトのタイプです",
+    "kbn.management.objects.objectsTable.relationships.columnTypeName": "タイプ",
+    "kbn.management.objects.objectsTable.relationships.relationshipsTitle": "{title} に関連する保存されたオブジェクトはこちらです。この {type} を削除すると、親オブジェクトに影響がありますが、子オブジェクトには影響はありません。",
+    "kbn.management.objects.objectsTable.relationships.renderErrorMessage": "エラー",
+    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.childAsValue.view": "子",
+    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.name": "直接関係",
+    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.parentAsValue.view": "親",
+    "kbn.management.objects.objectsTable.relationships.search.filters.type.name": "タイプ",
+    "kbn.management.objects.objectsTable.searchBar.unableToParseQueryErrorMessage": "クエリをパースできません",
+    "kbn.management.objects.objectsTable.table.columnActions.inspectActionDescription": "この保存されたオブジェクトを確認してください",
+    "kbn.management.objects.objectsTable.table.columnActions.inspectActionName": "検査",
+    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionDescription": "この保存されたオブジェクトと他の保存されたオブジェクトとの関係性を表示します",
+    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionName": "関係性",
+    "kbn.management.objects.objectsTable.table.columnActionsName": "アクション",
+    "kbn.management.objects.objectsTable.table.columnTitleDescription": "保存されたオブジェクトのタイトルです",
+    "kbn.management.objects.objectsTable.table.columnTitleName": "タイトル",
+    "kbn.management.objects.objectsTable.table.columnTypeDescription": "保存されたオブジェクトのタイプです",
+    "kbn.management.objects.objectsTable.table.columnTypeName": "タイプ",
+    "kbn.management.objects.objectsTable.table.deleteButtonLabel": "削除",
+    "kbn.management.objects.objectsTable.table.deleteButtonTitle": "保存されたオブジェクトを削除できません",
+    "kbn.management.objects.objectsTable.table.exportButtonLabel": "エクスポート",
+    "kbn.management.objects.objectsTable.table.exportPopoverButtonLabel": "エクスポート",
+    "kbn.management.objects.objectsTable.table.typeFilterName": "タイプ",
+    "kbn.management.objects.objectsTable.unableFindSavedObjectsNotificationMessage": "保存されたオブジェクトが見つかりません",
+    "kbn.management.objects.parsingFieldErrorMessage": "{fieldName} をインデックスパターン {indexName} 用にパース中にエラーが発生しました: {errorMessage}",
+    "kbn.management.objects.savedObjectsDescription": "保存された検索、ビジュアライゼーション、ダッシュボードのインポート、エクスポート、管理を行います",
+    "kbn.management.objects.savedObjectsSectionLabel": "保存されたオブジェクト",
+    "kbn.management.objects.savedObjectsTitle": "保存されたオブジェクト",
+    "kbn.management.objects.view.cancelButtonAriaLabel": "キャンセル",
+    "kbn.management.objects.view.cancelButtonLabel": "キャンセル",
+    "kbn.management.objects.view.deleteItemButtonLabel": "{title} を削除",
+    "kbn.management.objects.view.editItemTitle": "{title} の編集",
+    "kbn.management.objects.view.fieldDoesNotExistErrorMessage": "このオブジェクトに関連付けられたフィールドは、現在このインデックスパターンに存在しません。",
+    "kbn.management.objects.view.howToFixErrorDescription": "このエラーの原因がわかる場合は修正してください。わからない場合は上の削除ボタンをクリックしてください。",
+    "kbn.management.objects.view.howToModifyObjectDescription": " オブジェクトの編集は上級ユーザー向けです。オブジェクトのプロパティが検証されておらず、無効なオブジェクトはエラー、データ損失、またはそれ以上の問題の原因となります。コードを熟知した人に指示されていない限り、この設定は変更しない方が無難です。",
+    "kbn.management.objects.view.howToModifyObjectTitle": "十分ご注意ください！",
+    "kbn.management.objects.view.indexPatternDoesNotExistErrorMessage": "このオブジェクトに関連付けられたインデックスパターンは現在存在しません。",
+    "kbn.management.objects.view.saveButtonAriaLabel": "{ title }  オブジェクトを保存",
+    "kbn.management.objects.view.saveButtonLabel": "{ title }  オブジェクトを保存",
+    "kbn.management.objects.view.savedObjectProblemErrorMessage": "この保存されたオブジェクトに問題があります",
+    "kbn.management.objects.view.savedSearchDoesNotExistErrorMessage": "このオブジェクトに関連付けられた保存された検索は現在存在しません。",
+    "kbn.management.objects.view.viewItemButtonLabel": "{title} を表示",
+    "kbn.management.objects.view.viewItemTitle": "{title} を表示",
+    "kbn.management.savedObjects.editBreadcrumb": "{savedObjectType} を編集",
+    "kbn.management.savedObjects.indexBreadcrumb": "保存されたオブジェクト",
+    "kbn.management.settings.advancedSettingsDescription": "Kibana の動作を管理する設定を直接変更します。",
+    "kbn.management.settings.advancedSettingsLabel": "高度な設定",
+    "kbn.management.settings.breadcrumb": "高度な設定",
+    "kbn.management.settings.callOutCautionDescription": "これらの設定は非常に上級ユーザー向けなのでご注意ください。ここでの変更は Kibana の重要な部分に不具合を生じさせる可能性があります。これらの設定はドキュメントに記載されていなかったり、サポートされていなかったり、実験的であったりします。フィールドにデフォルトの値が設定されている場合、そのフィールドを未入力のままにするとデフォルトに戻り、他の構成により利用できない可能性があります。カスタム設定を削除すると、Kibana の構成から永久に削除されます。",
+    "kbn.management.settings.callOutCautionTitle": "注意:不具合が起こる可能性があります",
+    "kbn.management.settings.categoryNames.dashboardLabel": "ダッシュボード",
+    "kbn.management.settings.categoryNames.discoverLabel": "ディスカバリ",
+    "kbn.management.settings.categoryNames.generalLabel": "一般",
+    "kbn.management.settings.categoryNames.notificationsLabel": "通知",
+    "kbn.management.settings.categoryNames.reportingLabel": "レポート",
+    "kbn.management.settings.categoryNames.searchLabel": "検索",
+    "kbn.management.settings.categoryNames.timelionLabel": "Timelion",
+    "kbn.management.settings.categoryNames.visualizationsLabel": "ビジュアライゼーション",
+    "kbn.management.settings.categorySearchLabel": "カテゴリー",
+    "kbn.management.settings.field.cancelEditingButtonAriaLabel": "{ariaName} の編集をキャンセル",
+    "kbn.management.settings.field.cancelEditingButtonLabel": "キャンセル",
+    "kbn.management.settings.field.changeImageLinkAriaLabel": "{ariaName} を変更",
+    "kbn.management.settings.field.changeImageLinkText": "画像を変更",
+    "kbn.management.settings.field.codeEditorSyntaxErrorMessage": "無効な JSON 構文",
+    "kbn.management.settings.field.customSettingAriaLabel": "カスタム設定",
+    "kbn.management.settings.field.customSettingTooltip": "カスタム設定",
+    "kbn.management.settings.field.defaultValueText": "デフォルト: {value}",
+    "kbn.management.settings.field.defaultValueTypeJsonText": "デフォルト: {value}",
+    "kbn.management.settings.field.helpText": "この設定は Kibana サーバーにより上書きされ、変更することはできません。",
+    "kbn.management.settings.field.imageChangeErrorMessage": "画像を保存できませんでした",
+    "kbn.management.settings.field.offLabel": "オフ",
+    "kbn.management.settings.field.onLabel": "オン",
+    "kbn.management.settings.field.requiresPageReloadToastButtonLabel": "ページを再読み込み",
+    "kbn.management.settings.field.requiresPageReloadToastDescription": "「{settingName}」設定を有効にするには、ページを再読み込みしてください。",
+    "kbn.management.settings.field.resetFieldErrorMessage": "{name} をリセットできませんでした",
+    "kbn.management.settings.field.resetToDefaultLinkAriaLabel": "{ariaName} をデフォルトにリセット",
+    "kbn.management.settings.field.resetToDefaultLinkText": "デフォルトにリセット",
+    "kbn.management.settings.field.saveButtonAriaLabel": "{ariaName} を保存",
+    "kbn.management.settings.field.saveButtonLabel": "保存",
+    "kbn.management.settings.field.saveFieldErrorMessage": "{name} を保存できませんでした",
+    "kbn.management.settings.form.clearNoSearchResultText": "(検索結果を消去)",
+    "kbn.management.settings.form.clearSearchResultText": "(検索結果を消去)",
+    "kbn.management.settings.form.noSearchResultText": "設定が見つかりませんでした {clearSearch}",
+    "kbn.management.settings.form.searchResultText": "検索用語により {settingsCount} 件の設定が非表示になっています {clearSearch}",
+    "kbn.management.settings.pageTitle": "設定",
+    "kbn.management.settings.searchBar.unableToParseQueryErrorMessage": "クエリをパースできません",
+    "kbn.management.settings.searchBarAriaLabel": "高度な設定を検索",
+    "kbn.management.settings.sectionLabel": "高度な設定",
+    "kbn.managementTitle": "管理",
+    "kbn.server.tutorials.aerospikeMetrics.artifacts.application.label": "ディスカバリ",
+    "kbn.server.tutorials.aerospikeMetrics.longDescription": "「aerospike」Metricbeat モジュールは、Aerospike から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.aerospikeMetrics.nameTitle": "Aerospike メトリック",
+    "kbn.server.tutorials.aerospikeMetrics.shortDescription": "Aerospike サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.apacheLogs.artifacts.dashboards.linkLabel": "Apache ログダッシュボード",
+    "kbn.server.tutorials.apacheLogs.longDescription": "apache Filebeat モジュールが、Apache 2 HTTP サーバーにより作成されたアクセスとエラーのログをパースします。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.apacheLogs.nameTitle": "Apache ログ",
+    "kbn.server.tutorials.apacheLogs.shortDescription": "Apache HTTP サーバーが作成したアクセスとエラーのログを収集しパースします。",
+    "kbn.server.tutorials.apacheMetrics.artifacts.dashboards.linkLabel": "Apache メトリックダッシュボード",
+    "kbn.server.tutorials.apacheMetrics.longDescription": "「apache」Metricbeat モジュールは、Apache 2 HTTP サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.apacheMetrics.nameTitle": "Apache メトリック",
+    "kbn.server.tutorials.apacheMetrics.shortDescription": "Apache 2 HTTP サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.apm.apmAgents.statusCheck.btnLabel": "エージェントステータスを確認",
+    "kbn.server.tutorials.apm.apmAgents.statusCheck.errorMessage": "エージェントからまだデータを受け取っていません",
+    "kbn.server.tutorials.apm.apmAgents.statusCheck.successMessage": "1 つまたは複数のエージェントからデータを受け取りました",
+    "kbn.server.tutorials.apm.apmAgents.statusCheck.text": "アプリケーションが実行されていてエージェントがデータを送信していることを確認してください。",
+    "kbn.server.tutorials.apm.apmAgents.statusCheck.title": "エージェントステータス",
+    "kbn.server.tutorials.apm.apmAgents.title": "APM エージェント",
+    "kbn.server.tutorials.apm.apmServer.statusCheck.btnLabel": "APM Server ステータスを確認",
+    "kbn.server.tutorials.apm.apmServer.statusCheck.errorMessage": "APM Server がまだ Elasticsearch に接続されていません",
+    "kbn.server.tutorials.apm.apmServer.statusCheck.successMessage": "APM Server が正常にセットアップされました",
+    "kbn.server.tutorials.apm.apmServer.statusCheck.text": "APM エージェントの導入を開始する前に、APM Server が実行されていることを確認してください。",
+    "kbn.server.tutorials.apm.apmServer.statusCheck.title": "APM Server ステータス",
+    "kbn.server.tutorials.apm.apmServer.title": "APM Server",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.addAgentComment": "インストールされたアプリにエージェントを追加します",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.addTracingMiddlewareComment": "パフォーマンスメトリックを送信するには、追跡ミドルウェアを追加します:",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.allowedCharactersComment": "a-z、A-Z、0-9、-、_、スペース",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.setCustomApmServerUrlComment": "カスタム APM Server URL (デフォルト: {defaultApmServerUrl})",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.setRequiredServiceNameComment": "必要なサーバー名を設定します。使用できる文字:",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.useIfApmServerRequiresTokenComment": "APM Serverにトークンが必要な場合に使います",
+    "kbn.server.tutorials.apm.djangoClient.configure.textPost": "高度な用途に関しては [ドキュメンテーション]({documentationLink}) を参照してください。",
+    "kbn.server.tutorials.apm.djangoClient.configure.textPre": "エージェントとは、アプリケーションプロセス内で実行されるライブラリです。APM サービスは「SERVICE_NAME」に基づきプログラムに従って作成されます。",
+    "kbn.server.tutorials.apm.djangoClient.configure.title": "エージェントの構成",
+    "kbn.server.tutorials.apm.djangoClient.install.textPre": "Python 用の APM エージェントを依存関係としてインストールします。",
+    "kbn.server.tutorials.apm.djangoClient.install.title": "APM エージェントのインストール",
+    "kbn.server.tutorials.apm.dotNetClient.configureAgent.textPost": "エージェントに「IConfiguration」インスタンスが渡されていない場合、(例: 非 ASP.NET Core アプリケーションの場合)、エージェントを環境変数で構成することもできます。\n       高度な用途に関しては [ドキュメンテーション]({documentationLink}) を参照してください。",
+    "kbn.server.tutorials.apm.dotNetClient.configureAgent.title": "appsettings.json ファイルの例:",
+    "kbn.server.tutorials.apm.dotNetClient.configureApplication.textPost": "「IConfiguration」インスタンスを渡すのはオプションで、これにより、エージェントはこの「IConfiguration」インスタンス (例: 「appsettings.json」ファイル) から構成を読み込みます。",
+    "kbn.server.tutorials.apm.dotNetClient.configureApplication.textPre": "「Elastic.Apm.NetCoreAll」パッケージの ASP.NET Core の場合、「Startup.cs」ファイル内の「Configure」メソドの「UseElasticApm」メソドを呼び出します。",
+    "kbn.server.tutorials.apm.dotNetClient.configureApplication.title": "エージェントをアプリケーションに追加",
+    "kbn.server.tutorials.apm.dotNetClient.download.title": "APM エージェントのダウンロード",
+    "kbn.server.tutorials.apm.downloadServer.title": "APM Server をダウンロードして展開します",
+    "kbn.server.tutorials.apm.downloadServerRpm": "32 ビットパッケージをお探しですか？[ダウンロードページ]({downloadPageLink}) をご覧ください。",
+    "kbn.server.tutorials.apm.downloadServerTitle": "32 ビットパッケージをお探しですか？[ダウンロードページ]({downloadPageLink}) をご覧ください。",
+    "kbn.server.tutorials.apm.editConfig.textPre": "Elastic Stack の X-Pack セキュアバージョンをご使用の場合、「apm-server.yml」構成ファイルで認証情報を指定する必要があります。",
+    "kbn.server.tutorials.apm.editConfig.title": "構成の変更",
+    "kbn.server.tutorials.apm.elasticCloudInstructions.title": "APM エージェント",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.allowedCharactersComment": "a-z、A-Z、0-9、-、_、スペース",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.configureElasticApmComment": "またはアプリケーションの設定で ELASTIC_APM を使用するよう構成します。",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.initializeUsingEnvironmentVariablesComment": "環境変数を使用して初期化します",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.setCustomApmServerUrlComment": "カスタム APM Server URL (デフォルト: {defaultApmServerUrl})",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.setRequiredServiceNameComment": "必要なサーバー名を設定します。使用できる文字:",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.useIfApmServerRequiresTokenComment": "APM Serverにトークンが必要な場合に使います",
+    "kbn.server.tutorials.apm.flaskClient.configure.textPost": "高度な用途に関しては [ドキュメンテーション]({documentationLink}) を参照してください。",
+    "kbn.server.tutorials.apm.flaskClient.configure.textPre": "エージェントとは、アプリケーションプロセス内で実行されるライブラリです。APM サービスは「SERVICE_NAME」に基づきプログラムに従って作成されます。",
+    "kbn.server.tutorials.apm.flaskClient.configure.title": "エージェントの構成",
+    "kbn.server.tutorials.apm.flaskClient.install.textPre": "Python 用の APM エージェントを依存関係としてインストールします。",
+    "kbn.server.tutorials.apm.flaskClient.install.title": "APM エージェントのインストール",
+    "kbn.server.tutorials.apm.goClient.configure.commands.initializeUsingEnvironmentVariablesComment": "環境変数を使用して初期化します:",
+    "kbn.server.tutorials.apm.goClient.configure.commands.setCustomApmServerUrlComment": "カスタム APM Server URL (デフォルト: {defaultApmServerUrl})",
+    "kbn.server.tutorials.apm.goClient.configure.commands.setServiceNameComment": "サービス名を設定します。使用できる文字は # a-z、A-Z、0-9、-、_、スペースです。",
+    "kbn.server.tutorials.apm.goClient.configure.commands.usedExecutableNameComment": "ELASTIC_APM_SERVICE_NAME が指定されていない場合、実行可能な名前が使用されます。",
+    "kbn.server.tutorials.apm.goClient.configure.commands.useIfApmRequiresTokenComment": "APM Serverにトークンが必要な場合に使います",
+    "kbn.server.tutorials.apm.goClient.configure.textPost": "高度な構成に関しては [ドキュメンテーション]({documentationLink}) を参照してください。",
+    "kbn.server.tutorials.apm.goClient.configure.textPre": "エージェントとは、アプリケーションプロセス内で実行されるライブラリです。APM サービスは実行ファイル名または「ELASTIC_APM_SERVICE_NAME」の環境変数に基づきプログラムに従って作成されます。",
+    "kbn.server.tutorials.apm.goClient.configure.title": "エージェントの構成",
+    "kbn.server.tutorials.apm.goClient.install.textPre": "Go の APM エージェントパッケージをインストールします。",
+    "kbn.server.tutorials.apm.goClient.install.title": "APM エージェントのインストール",
+    "kbn.server.tutorials.apm.goClient.instrument.textPost": "Go のソースコードのインストルメンテーションの詳細ガイドは、[ドキュメンテーション]({documentationLink}) をご参照ください。",
+    "kbn.server.tutorials.apm.goClient.instrument.textPre": "提供されたインストルメンテーションモジュールの 1 つ、またはトレーサー API を直接使用して、Go アプリケーションにインストルメンテーションを設定します。",
+    "kbn.server.tutorials.apm.goClient.instrument.title": "アプリケーションのインストルメンテーション",
+    "kbn.server.tutorials.apm.introduction": "アプリケーション内から詳細なパフォーマンスメトリックやエラーを集めます。",
+    "kbn.server.tutorials.apm.javaClient.download.textPre": "[Maven Central]({mavenCentralLink}) からエージェントジャーをダウンロード。アプリケーションにエージェントを依存関係として追加**しない**でください。",
+    "kbn.server.tutorials.apm.javaClient.download.title": "APM エージェントのダウンロード",
+    "kbn.server.tutorials.apm.javaClient.startApplication.textPost": "構成オプションと高度な用途に関しては、[ドキュメンテーション]({documentationLink}) をご覧ください。",
+    "kbn.server.tutorials.apm.javaClient.startApplication.textPre": "「-javaagent」フラグを追加してエージェントをシステムプロパティで構成します。\n\n * 必要なサービス名を設定します (使用可能な文字は a-z、A-Z、0-9、-、_、スペースです)\n * カスタム APM Server URL を設定します (デフォルト: {customApmServerUrl})\n * アプリケーションのベースパッケージを設定します",
+    "kbn.server.tutorials.apm.javaClient.startApplication.title": "javaagent フラグのアプリケーションの起動",
+    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setCustomApmServerUrlComment": "カスタム APM Server URL (デフォルト: {defaultApmServerUrl})",
+    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setRequiredServiceNameComment": "必要なサービス名を設定します (使用可能な文字は a-z、A-Z、0-9、-、_、スペースです)",
+    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setServiceVersionComment": "サーバーバージョンを設定します (ソースマップ機能に必要)",
+    "kbn.server.tutorials.apm.jsClient.enableRealUserMonitoring.textPre": "[ドキュメンテーション({documentationLink}) をご覧ください。",
+    "kbn.server.tutorials.apm.jsClient.enableRealUserMonitoring.title": "APM Server の Real User 監視エージェントを有効にする",
+    "kbn.server.tutorials.apm.nodeClient.configure.commands.addThisToTheFileTopComment": "アプリに読み込まれたファイルの一番上にこれを追加します",
+    "kbn.server.tutorials.apm.nodeClient.configure.commands.allowedCharactersComment": "使用できる文字は # a-z、A-Z、0-9、-、_、スペースです",
+    "kbn.server.tutorials.apm.nodeClient.configure.commands.setCustomApmServerUrlComment": "カスタム APM Server URL (デフォルト: {defaultApmServerUrl})",
+    "kbn.server.tutorials.apm.nodeClient.configure.commands.setRequiredServiceNameComment": "package.json からサービス名を上書きします",
+    "kbn.server.tutorials.apm.nodeClient.configure.commands.useIfApmRequiresTokenComment": "APM Serverにトークンが必要な場合に使います",
+    "kbn.server.tutorials.apm.nodeClient.configure.textPost": "[Babel/ES モジュール]({babelEsModulesLink}) との使用を含む高度な用途に関しては、 [ドキュメンテーション]({documentationLink}) をご覧ください。",
+    "kbn.server.tutorials.apm.nodeClient.configure.textPre": "エージェントとは、アプリケーションプロセス内で実行されるライブラリです。APM サービスは「serviceName」に基づきプログラムに従って作成されます。このエージェントは様々なフレームワークをサポートしていますが、カスタムスタックで使用することもできます。",
+    "kbn.server.tutorials.apm.nodeClient.configure.title": "エージェントの構成",
+    "kbn.server.tutorials.apm.nodeClient.install.textPre": "Node.js 用の APM エージェントをアプリケーションに依存関係としてインストール。",
+    "kbn.server.tutorials.apm.nodeClient.install.title": "APM エージェントのインストール",
+    "kbn.server.tutorials.apm.rackClient.configure.commands.optionalComment": "オプション、デフォルトで config/elastic_apm.yml になります",
+    "kbn.server.tutorials.apm.rackClient.configure.commands.requiredComment": "必要",
+    "kbn.server.tutorials.apm.rackClient.configure.textPre": "Rack または対応フレームワーク (Sinatra など) の場合は、アプリのミドルウェアを含めてエージェントを起動してください。",
+    "kbn.server.tutorials.apm.rackClient.configure.title": "エージェントの構成",
+    "kbn.server.tutorials.apm.rackClient.createConfig.commands.defaultsToTheNameOfRackAppClassComment": "デフォルトで Rack アプリのクラスになります。",
+    "kbn.server.tutorials.apm.rackClient.createConfig.commands.setCustomApmServerComment": "カスタム APM Server URL (デフォルト: {defaultServerUrl})",
+    "kbn.server.tutorials.apm.rackClient.createConfig.commands.setServiceNameComment": "サービス名を設定します - 使用できる文字は a-z、A-Z、0-9、-、_、スペースです。",
+    "kbn.server.tutorials.apm.rackClient.createConfig.commands.useIfApmServerRequiresTokenComment": "APM Serverにトークンが必要な場合に使います",
+    "kbn.server.tutorials.apm.rackClient.createConfig.textPost": "構成オプションと高度な用途に関しては、[ドキュメンテーション]({documentationLink}) をご覧ください。\n\n",
+    "kbn.server.tutorials.apm.rackClient.createConfig.textPre": "構成ファイル {configFile} を作成します:",
+    "kbn.server.tutorials.apm.rackClient.createConfig.title": "構成ファイルの作成",
+    "kbn.server.tutorials.apm.rackClient.install.textPre": "Gemfile にエージェントを追加します",
+    "kbn.server.tutorials.apm.rackClient.install.title": "APM エージェントのインストール",
+    "kbn.server.tutorials.apm.railsClient.configure.textPost": "構成オプションと高度な用途に関しては、[ドキュメンテーション]({documentationLink}) をご覧ください。\n\n",
+    "kbn.server.tutorials.apm.railsClient.configure.textPre": "APM はアプリの起動時に自動的に起動します。構成ファイル {configFile} を作成してエージェントを構成します",
+    "kbn.server.tutorials.apm.railsClient.configure.title": "エージェントの構成",
+    "kbn.server.tutorials.apm.railsClient.install.textPre": "Gemfile にエージェントを追加します",
+    "kbn.server.tutorials.apm.railsClient.install.title": "APM エージェントのインストール",
+    "kbn.server.tutorials.apm.specProvider.artifacts.application.label": "APM を起動",
+    "kbn.server.tutorials.apm.specProvider.artifacts.dashboards.linkLabel": "APM ダッシュボード",
+    "kbn.server.tutorials.apm.specProvider.longDescription": "アプリケーションパフォーマンスモニタリング (APM) は、アプリケーション内から詳細なパフォーマンスメトリックやエラーを集めます。何千ものアプリケーションのパフォーマンスをリアルタイムで監視できます。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.apm.specProvider.name": "APM",
+    "kbn.server.tutorials.apm.specProvider.savedObjectsInstallMsg": "APM UI の機能には APM インデックスパターンが必要なものがあります。",
+    "kbn.server.tutorials.apm.startServer.textPre": "サーバーは、Elasticsearch アプリケーションのパフォーマンスメトリックを処理し保存します。",
+    "kbn.server.tutorials.apm.startServer.title": "APM Server の起動",
+    "kbn.server.tutorials.apm.windowsServerInstructions.textPost": "注:システムでスクリプトの実行が無効な場合、スクリプトを実行するために現在のセッションの実行ポリシーの設定が必要となります。例: {command}。",
+    "kbn.server.tutorials.apm.windowsServerInstructions.textPre": "1.[ダウンロードページ]({downloadPageLink}) から APM Server Windows zip ファイルをダウンロードします。\n2.zip ファイルのコンテンツを {zipFileExtractFolder} に解凍します。\n3.「{apmServerDirectory}」ディレクトリの名前を「APM-Server」に変更します。\n4.管理者として PowerShell プロンプトを開きます (PowerShell アイコンを右クリックして「管理者として実行」を選択します)。Windows XP をご使用の場合、PowerShell のダウンロードとインストールが必要な場合があります。\n5.PowerShell プロンプトで次のコマンドを実行し、APM Server を Windows サービスとしてインストールします。",
+    "kbn.server.tutorials.auditbeat.artifacts.dashboards.linkLabel": "SIEM アプリ",
+    "kbn.server.tutorials.auditbeat.longDescription": "Auditbeat を使用してホストから監査データを収集します。これらにはプロセス、ユーザー、ログイン、ソケット情報、ファイルアクセス、その他が含まれます。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.auditbeat.nameTitle": "Auditbeat",
+    "kbn.server.tutorials.auditbeat.shortDescription": "ホストから監査データを収集します。",
+    "kbn.server.tutorials.awsMetrics.artifacts.dashboards.linkLabel": "AWS メトリックダッシュボード",
+    "kbn.server.tutorials.awsMetrics.longDescription": "「aws」Metricbeat モジュールが、AWS API と Cloudwatch から監視メトリックを取得します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.awsMetrics.nameTitle": "AWS メトリック",
+    "kbn.server.tutorials.awsMetrics.shortDescription": "AWS API と Cloudwatch からの EC2 インスタンスの監視メトリックです。",
+    "kbn.server.tutorials.cephMetrics.artifacts.application.label": "ディスカバー",
+    "kbn.server.tutorials.cephMetrics.longDescription": "「ceph」Metricbeat モジュールは、Ceph から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.cephMetrics.nameTitle": "Ceph メトリック",
+    "kbn.server.tutorials.cephMetrics.shortDescription": "Ceph サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.ciscoLogs.artifacts.dashboards.linkLabel": "SIEM アプリ",
+    "kbn.server.tutorials.ciscoLogs.longDescription": "これは Cisco ネットワークデバイスのログ用のモジュールです。現在、同期された、またはファイルから読み込まれた Cisco ASA ファイアウォールログの「asa」ファイルセットをサポートしています。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.ciscoLogs.nameTitle": "Cisco",
+    "kbn.server.tutorials.ciscoLogs.shortDescription": "Cisco ASA ファイアウォールからのログを収集・解析します。",
+    "kbn.server.tutorials.cloudwatchLogs.longDescription": "Functionbeat を AWS Lambda 関数として実行するようデプロイし、Cloudwatch ログを収集します。         [詳細({learnMoreLink})。",
+    "kbn.server.tutorials.cloudwatchLogs.nameTitle": "Cloudwatch ログ",
+    "kbn.server.tutorials.cloudwatchLogs.shortDescription": "Functionbeat で Cloudwatch ログを収集します。",
+    "kbn.server.tutorials.corednsLogs.artifacts.dashboards.linkLabel": "CoreDNS ログダッシュボード",
+    "kbn.server.tutorials.corednsLogs.longDescription": "「coredns」Filebeat モジュールは、[CoreDNS](https://coredns.io/manual/toc/) からログを収集します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.corednsLogs.nameTitle": "CoreDNS ログ",
+    "kbn.server.tutorials.corednsLogs.shortDescription": "Coredns により作成されたログを収集します。",
+    "kbn.server.tutorials.corednsMetrics.artifacts.application.label": "ディスカバー",
+    "kbn.server.tutorials.corednsMetrics.longDescription": "「coredns」Metricbeat モジュールが、CoreDNS から監視メトリックを取得します。[詳細({learnMoreLink})。",
+    "kbn.server.tutorials.corednsMetrics.nameTitle": "CoreDNS メトリック",
+    "kbn.server.tutorials.corednsMetrics.shortDescription": "CoreDNS サーバーから監視メトリックを取得します。",
+    "kbn.server.tutorials.couchbaseMetrics.artifacts.application.label": "ディスカバー",
+    "kbn.server.tutorials.couchbaseMetrics.longDescription": "「couchbase」Metricbeat モジュールは、Couchbase から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.couchbaseMetrics.nameTitle": "Couchbase メトリック",
+    "kbn.server.tutorials.couchbaseMetrics.shortDescription": "Couchbase から内部メトリックを取得します。",
+    "kbn.server.tutorials.dockerMetrics.artifacts.dashboards.linkLabel": "Docker メトリックダッシュボード",
+    "kbn.server.tutorials.dockerMetrics.longDescription": "「docker」 Metricbeat モジュールは、Docker サーバーからメトリックを取得します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.dockerMetrics.nameTitle": "Docker メトリック",
+    "kbn.server.tutorials.dockerMetrics.shortDescription": "Docker コンテナーに関するメトリックを取得します。",
+    "kbn.server.tutorials.dropwizardMetrics.artifacts.application.label": "ディスカバリ",
+    "kbn.server.tutorials.dropwizardMetrics.longDescription": "「dropwizard」 Metricbeat モジュールは、Dropwizard Java アプリケーション から内部メトリックを取得します。[詳細[]({learnMoreLink})。",
+    "kbn.server.tutorials.dropwizardMetrics.nameTitle": "Dropwizard メトリック",
+    "kbn.server.tutorials.dropwizardMetrics.shortDescription": "Dropwizard Java アプリケーションから内部メトリックを取得します。",
+    "kbn.server.tutorials.elasticsearchLogs.artifacts.application.label": "ディスカバー",
+    "kbn.server.tutorials.elasticsearchLogs.longDescription": "「elasticsearch」Filebeat モジュールが、Elasticsearch により作成されたログをパースします。[詳細({learnMoreLink})。",
+    "kbn.server.tutorials.elasticsearchLogs.nameTitle": "Elasticsearch ログ",
+    "kbn.server.tutorials.elasticsearchLogs.shortDescription": "Elasticsearch により作成されたログを収集しパースします。",
+    "kbn.server.tutorials.elasticsearchMetrics.artifacts.application.label": "ディスカバー",
+    "kbn.server.tutorials.elasticsearchMetrics.longDescription": "「elasticsearch」Metricbeat モジュールは、Elasticsearch から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.elasticsearchMetrics.nameTitle": "Elasticsearch メトリック",
+    "kbn.server.tutorials.elasticsearchMetrics.shortDescription": "Elasticsearch から内部メトリックを取得します。",
+    "kbn.server.tutorials.envoyproxyLogs.artifacts.dashboards.linkLabel": "SIEM アプリ",
+    "kbn.server.tutorials.envoyproxyLogs.longDescription": "これは [Envoy proxy access log](https://www.envoyproxy.io/docs/envoy/v1.10.0/configuration/access_log) 用の Filebeatモジュールです。Kubernetes でのスタンドアロンのデプロイメントと Envoy プロキシデプロイメントの両方をサポートします。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.envoyproxyLogs.nameTitle": "Envoyproxy",
+    "kbn.server.tutorials.envoyproxyLogs.shortDescription": "Envoy プロキシからのログを収集・解析します。",
+    "kbn.server.tutorials.etcdMetrics.artifacts.application.label": "ディスカバー",
+    "kbn.server.tutorials.etcdMetrics.longDescription": "「etcd」Metricbeat モジュールは、Etcd から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.etcdMetrics.nameTitle": "Etcd メトリック",
+    "kbn.server.tutorials.etcdMetrics.shortDescription": "Etcd サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.golangMetrics.artifacts.dashboards.linkLabel": "Golang メトリックダッシュボード",
+    "kbn.server.tutorials.golangMetrics.longDescription": "「{moduleName}」Metricbeat モジュールは、Golang アプリから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.golangMetrics.nameTitle": "Golang メトリック",
+    "kbn.server.tutorials.golangMetrics.shortDescription": "Golang アプリから内部メトリックを取得します。",
+    "kbn.server.tutorials.haproxyMetrics.artifacts.application.label": "ディスカバリ",
+    "kbn.server.tutorials.haproxyMetrics.longDescription": "「haproxy」Metricbeat モジュールは、HAProxy アプリから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.haproxyMetrics.nameTitle": "HAProxy メトリック",
+    "kbn.server.tutorials.haproxyMetrics.shortDescription": "HAProxy サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.iisLogs.artifacts.dashboards.linkLabel": "IIS ログダッシュボード",
+    "kbn.server.tutorials.iisLogs.longDescription": "「iis」Filebeat モジュールが、Nginx HTTP サーバーにより作成されたアクセスとエラーのログをパースします。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.iisLogs.nameTitle": "IIS ログ",
+    "kbn.server.tutorials.iisLogs.shortDescription": "IIS HTTP サーバーにより作成されたアクセスとエラーのログを収集しパースします。",
+    "kbn.server.tutorials.iptablesLogs.artifacts.dashboards.linkLabel": "SIEM アプリ",
+    "kbn.server.tutorials.iptablesLogs.longDescription": "これは iptables と ip6tables ログ用のモジュールです。同期でネットワーク上で受信したログや、ファイルからのログを解析します。また、ルールセット名、ルール番号、トラフィックに実行されたアクション (許可/拒否) を含む、Ubiquiti ファイアウォールにより追加された接頭辞も認識できます。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.iptablesLogs.nameTitle": "Iptables / Ubiquiti",
+    "kbn.server.tutorials.iptablesLogs.shortDescription": "iptables と ip6tables ログ、または Ubiqiti からのログを収集・解析します。",
+    "kbn.server.tutorials.kafkaLogs.artifacts.dashboards.linkLabel": "Kafka ログダッシュボード",
+    "kbn.server.tutorials.kafkaLogs.longDescription": "「kafka」Filebeat モジュールは、Kafka が作成したログをパースします。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.kafkaLogs.nameTitle": "Kafka ログ",
+    "kbn.server.tutorials.kafkaLogs.shortDescription": "Kafka が作成したログを収集しパースします。",
+    "kbn.server.tutorials.kafkaMetrics.artifacts.application.label": "ディスカバリ",
+    "kbn.server.tutorials.kafkaMetrics.longDescription": "「kafka」Metricbeat モジュールは、Kafka から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.kafkaMetrics.nameTitle": "Kafka メトリック",
+    "kbn.server.tutorials.kafkaMetrics.shortDescription": "Kafka サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.kibanaMetrics.artifacts.application.label": "ディスカバリ",
+    "kbn.server.tutorials.kibanaMetrics.longDescription": "「kibana」Metricbeat モジュールは、Kibana から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.kibanaMetrics.nameTitle": "Kibana メトリック",
+    "kbn.server.tutorials.kibanaMetrics.shortDescription": "Kibana から内部メトリックを取得します。",
+    "kbn.server.tutorials.kubernetesMetrics.artifacts.dashboards.linkLabel": "Kubernetes メトリックダッシュボード",
+    "kbn.server.tutorials.kubernetesMetrics.longDescription": "「kubernetes」Metricbeat モジュールは、Kubernetes API からメトリックを取得します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.kubernetesMetrics.nameTitle": "Kubernetes メトリック",
+    "kbn.server.tutorials.kubernetesMetrics.shortDescription": "Kubernetes からメトリックを取得します。",
+    "kbn.server.tutorials.logstashLogs.artifacts.dashboards.linkLabel": "Logstash ログダッシュボード",
+    "kbn.server.tutorials.logstashLogs.longDescription": "「logstash」Filebeat モジュールが、Logstash 自体により作成されたデバッグとスローログをパースします。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.logstashLogs.nameTitle": "Logstash ログ",
+    "kbn.server.tutorials.logstashLogs.shortDescription": "Logstash 自体により作成されたデバッグとスローログをパースします。",
+    "kbn.server.tutorials.logstashMetrics.artifacts.application.label": "ディスカバー",
+    "kbn.server.tutorials.logstashMetrics.longDescription": "「{moduleName}」Metricbeat モジュールは、Logstash サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.logstashMetrics.nameTitle": "Logstash メトリック",
+    "kbn.server.tutorials.logstashMetrics.shortDescription": "Logstash サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.memcachedMetrics.artifacts.application.label": "ディスカバリ",
+    "kbn.server.tutorials.memcachedMetrics.longDescription": "「memcached」Metricbeat モジュールは、Memcached から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.memcachedMetrics.nameTitle": "Memcached メトリック",
+    "kbn.server.tutorials.memcachedMetrics.shortDescription": "Memcached サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.mongodbMetrics.artifacts.dashboards.linkLabel": "MongoDB メトリックダッシュボード",
+    "kbn.server.tutorials.mongodbMetrics.longDescription": "「mongodb」Metricbeat モジュールは、MongoDB サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.mongodbMetrics.nameTitle": "MongoDB メトリック",
+    "kbn.server.tutorials.mongodbMetrics.shortDescription": "MongoDB から内部メトリックを取得します。",
+    "kbn.server.tutorials.mssqlMetrics.artifacts.dashboards.linkLabel": "Microsoft SQL Server メトリックダッシュボード",
+    "kbn.server.tutorials.mssqlMetrics.longDescription": "「mssql」Metricbeat モジュールが、Microsoft SQL Server インスタンスからの監視、ログ、パフォーマンスメトリックを取得します。 詳細({learnMoreLink})。",
+    "kbn.server.tutorials.mssqlMetrics.nameTitle": "Microsoft SQL Server メトリック",
+    "kbn.server.tutorials.mssqlMetrics.shortDescription": "Microsoft SQL Server インスタンスから監視メトリックを取得します。",
+    "kbn.server.tutorials.muninMetrics.artifacts.application.label": "ディスカバー",
+    "kbn.server.tutorials.muninMetrics.longDescription": "「munin」Metricbeat モジュールは、Munin から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.muninMetrics.nameTitle": "Munin メトリック",
+    "kbn.server.tutorials.muninMetrics.shortDescription": "Munin サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.mysqlLogs.artifacts.dashboards.linkLabel": "MySQL ログダッシュボード",
+    "kbn.server.tutorials.mysqlLogs.longDescription": "「mysql」Filebeat モジュールは、MySQL が作成したエラーとスローログをパースします。[詳細]({learnMoreLink}).",
+    "kbn.server.tutorials.mysqlLogs.nameTitle": "MySQL ログ",
+    "kbn.server.tutorials.mysqlLogs.shortDescription": "MySQL が作成したエラーとスローログを収集しパースします。",
+    "kbn.server.tutorials.mysqlMetrics.artifacts.dashboards.linkLabel": "MySQL メトリックダッシュボード",
+    "kbn.server.tutorials.mysqlMetrics.longDescription": "「mysql」Metricbeat モジュールは、MySQL サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.mysqlMetrics.nameTitle": "MySQL メトリック",
+    "kbn.server.tutorials.mysqlMetrics.shortDescription": "MySQL から内部メトリックを取得します。",
+    "kbn.server.tutorials.natsLogs.artifacts.dashboards.linkLabel": "Nats ログダッシュボード",
+    "kbn.server.tutorials.natsLogs.longDescription": "「nats」Filebeat モジュールが、Nats により作成されたログをパースします。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.natsLogs.nameTitle": "Nats ログ",
+    "kbn.server.tutorials.natsLogs.shortDescription": "Nats により作成されたログを収集しパースします。",
+    "kbn.server.tutorials.natsMetrics.artifacts.dashboards.linkLabel": "Nats メトリックダッシュボード",
+    "kbn.server.tutorials.natsMetrics.longDescription": "「nats」Metricbeat モジュールが、Nats から監視メトリックを取得します。[詳細({learnMoreLink})。",
+    "kbn.server.tutorials.natsMetrics.nameTitle": "Nats メトリック",
+    "kbn.server.tutorials.natsMetrics.shortDescription": "Nats サーバーから監視メトリックを取得します。",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTextPost": "{udpPort} は Logstash  が Netflow データを受信する UDP ポートで、{password} は {elastic} ユーザーのパスワードです。",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTitle": "構成の変更",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTextPost": "{udpPort} は Logstash  が Netflow データを受信する UDP ポートで、{password} は {elastic} ユーザーのパスワードです。",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTitle": "構成の変更",
+    "kbn.server.tutorials.netflow.common.config.onPrem.osxTextPost": "{udpPort} は Logstash が Netflow データを受信する UDP ポートです。",
+    "kbn.server.tutorials.netflow.common.config.onPrem.osxTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
+    "kbn.server.tutorials.netflow.common.config.onPrem.osxTitle": "構成の変更",
+    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTextPost": "{udpPort} は Logstash が Netflow データを受信する UDP ポートです。",
+    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
+    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTitle": "構成の変更",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTextPost": "{udpPort} は Logstash  が Netflow データを受信する UDP ポートで、{esUrl} は Elastic Cloud で実行中の Elasticsearch の URL で、{password} は {elastic} ユーザーのパスワードです。",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTitle": "構成の変更",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTextPost": "{udpPort} は Logstash  が Netflow データを受信する UDP ポートで、{esUrl} は Elastic Cloud で実行中の Elasticsearch の URL で、{password} は {elastic} ユーザーのパスワードです。",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTextPre": "{logstashConfigPath} を編集して構成パラメーターを設定します。",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTitle": "構成の変更",
+    "kbn.server.tutorials.netflow.common.setup.osxTextPost": "{setupOption} オプションは Elasticsearch で {netflowPrefix} インデックスパターンを作成し、Kibana ダッシュボードとビジュアライゼーションをインポートします。後の実行時には既存のダッシュボードに上書きしないよう、このオプションを省略します。",
+    "kbn.server.tutorials.netflow.common.setup.osxTextPre": "実行:",
+    "kbn.server.tutorials.netflow.common.setup.osxTitle": "Netflow モジュールを実行",
+    "kbn.server.tutorials.netflow.common.setup.windowsTextPost": "{setupOption} オプションは Elasticsearch で {netflowPrefix} インデックスパターンを作成し、Kibana ダッシュボードとビジュアライゼーションをインポートします。後の実行時には既存のダッシュボードに上書きしないよう、このオプションを省略します。",
+    "kbn.server.tutorials.netflow.common.setup.windowsTextPre": "実行:",
+    "kbn.server.tutorials.netflow.common.setup.windowsTitle": "Netflow モジュールの実行",
+    "kbn.server.tutorials.netflow.elasticCloudInstructions.title": "はじめに",
+    "kbn.server.tutorials.netflow.onPremElasticCloudInstructions.title": "はじめに",
+    "kbn.server.tutorials.netflow.onPremInstructions.title": "はじめに",
+    "kbn.server.tutorials.netflow.tutorialLongDescription": "Logstash NetFlow モジュールは、ネットワークフローデータを収集してパースしたり、イベントを Elasticsearch でインデックスしたり、Kibana ダッシュボードをインストールしたりできます。このモジュールは Netflow バージョン 5 と 9 をサポートしています。[詳細]({linkUrl})。",
+    "kbn.server.tutorials.netflow.tutorialShortDescription": "Netflow エクスポーターが送信した Netflow の記録を収集します。",
+    "kbn.server.tutorials.nginxLogs.artifacts.dashboards.linkLabel": "Nginx ログダッシュボード",
+    "kbn.server.tutorials.nginxLogs.longDescription": "「nginx」Filebeat モジュールは、Nginx HTTP サーバーが作成したアクセスとエラーのログをパースします。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.nginxLogs.nameTitle": "Nginx ログ",
+    "kbn.server.tutorials.nginxLogs.shortDescription": "Nginx HTTP サーバーが作成したアクセスとエラーのログを収集しパースします。",
+    "kbn.server.tutorials.nginxMetrics.artifacts.dashboards.linkLabel": "Nginx メトリックダッシュボード",
+    "kbn.server.tutorials.nginxMetrics.longDescription": "「nginx」Metricbeat モジュールは、Nginx サーバーから内部メトリックを取得します。このモジュールは {statusModuleLink} が作成したウェブページからサーバーステータスデータを取得します。Nginx で {statusModuleLink} が有効にする必要があります。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.nginxMetrics.nameTitle": "Nginx メトリック",
+    "kbn.server.tutorials.nginxMetrics.shortDescription": "Nginx HTTP サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.osqueryLogs.artifacts.dashboards.linkLabel": "Osquery ログダッシュボード",
+    "kbn.server.tutorials.osqueryLogs.longDescription": "「osquery」Filebeat モジュールは、「osqueryd」が作成した JSON 結果ページを収集します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.osqueryLogs.nameTitle": "Osquery ログ",
+    "kbn.server.tutorials.osqueryLogs.shortDescription": "osqueryd により作成されたログを収集します。",
+    "kbn.server.tutorials.phpFpmMetrics.longDescription": "「php_fpm」Metricbeat モジュールは、PHP-FPM サーバーから内部メトリックを取得します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.phpFpmMetrics.nameTitle": "PHP-FPM メトリック",
+    "kbn.server.tutorials.phpFpmMetrics.shortDescription": "PHP-FPM から内部メトリックを取得します。",
+    "kbn.server.tutorials.postgresqlLogs.artifacts.dashboards.linkLabel": "PostgreSQL ログダッシュボード",
+    "kbn.server.tutorials.postgresqlLogs.longDescription": "「postgresql」Filebeat モジュールが、PostgreSQL により作成されたエラーとスローログをパースします。[詳細]({learnMoreLink}).",
+    "kbn.server.tutorials.postgresqlLogs.nameTitle": "PostgreSQL ログ",
+    "kbn.server.tutorials.postgresqlLogs.shortDescription": "PostgreSQL により作成されたエラーとスローログを収集しパースします。",
+    "kbn.server.tutorials.postgresqlMetrics.longDescription": "「postgresql」Metricbeat モジュールは、PostgreSQL サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.postgresqlMetrics.nameTitle": "PostgreSQL メトリック",
+    "kbn.server.tutorials.postgresqlMetrics.shortDescription": "PostgreSQL から内部メトリックを取得します。",
+    "kbn.server.tutorials.prometheusMetrics.artifacts.application.label": "ディスカバリ",
+    "kbn.server.tutorials.prometheusMetrics.longDescription": "「{moduleName}」Metricbeat モジュールは、Prometheus エンドポイントからメトリックを取得します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.prometheusMetrics.nameTitle": "Prometheus メトリック",
+    "kbn.server.tutorials.prometheusMetrics.shortDescription": "Prometheus エクスポーターからメトリックを取得します。.",
+    "kbn.server.tutorials.rabbitmqMetrics.artifacts.dashboards.linkLabel": "RabbitMQ メトリックダッシュボード",
+    "kbn.server.tutorials.rabbitmqMetrics.longDescription": "「rabbitmq」Metricbeat モジュールは、RabbitMQ サーバーから内部メトリックを取得します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.rabbitmqMetrics.nameTitle": "RabbitMQ メトリック",
+    "kbn.server.tutorials.rabbitmqMetrics.shortDescription": "RabbitMQ サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.redisLogs.artifacts.dashboards.linkLabel": "Redis ログダッシュボード",
+    "kbn.server.tutorials.redisLogs.longDescription": "「redis」Filebeat モジュールは、Redis が作成したエラーとスローログをパースします。Redis がエラーログを作成するには、Redis 構成ファイルの「logfile」オプションが「redis-server.log」に設定されていることを確認してください。スローログは「SLOWLOG」コマンドで Redis から直接読み込まれます。Redis がスローログを記録するには、「slowlog-log-slower-than」オプションが設定されていることを確認してください。「slowlog」ファイルセットは実験的な機能のためご注意ください。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.redisLogs.nameTitle": "Redis ログ",
+    "kbn.server.tutorials.redisLogs.shortDescription": "Redis が作成したエラーとスローログを収集しパースします。",
+    "kbn.server.tutorials.redisMetrics.artifacts.dashboards.linkLabel": "Redis メトリックダッシュボード",
+    "kbn.server.tutorials.redisMetrics.longDescription": "「redis」Metricbeat モジュールは、Redis サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.redisMetrics.nameTitle": "Redis メトリック",
+    "kbn.server.tutorials.redisMetrics.shortDescription": "Redis から内部メトリックを取得します。",
+    "kbn.server.tutorials.suricataLogs.artifacts.dashboards.linkLabel": "Suricata ログダッシュボード",
+    "kbn.server.tutorials.suricataLogs.longDescription": "「suricata」Filebeat モジュールは、[Suricata Eve JSON アウトプット](https://suricata.readthedocs.io/en/latest/output/eve/eve-json-format.html) からログを収集します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.suricataLogs.nameTitle": "Suricata ログ",
+    "kbn.server.tutorials.suricataLogs.shortDescription": "Suricata IDS/IPS/NSM が作成したログを収集します。",
+    "kbn.server.tutorials.systemLogs.artifacts.dashboards.linkLabel": "システムログダッシュボード",
+    "kbn.server.tutorials.systemLogs.longDescription": "「system」Filebeat モジュールは、一般的な Unix/Linux ベースのディストリビューションのシステムログサービスが作成したログを収集しパースします。このモジュールは Windows では利用できません。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.systemLogs.nameTitle": "システムログ",
+    "kbn.server.tutorials.systemLogs.shortDescription": "ローカル Syslog サーバーが作成したログを収集しパースします。",
+    "kbn.server.tutorials.systemMetrics.artifacts.dashboards.linkLabel": "システムメトリックダッシュボード",
+    "kbn.server.tutorials.systemMetrics.longDescription": "「system」Metricbeat モジュールは、ホストから CPU、メモリー、ネットワーク、ディスクの統計を収集します。システム全体の統計とプロセスやファイルシステムごとの統計を収集します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.systemMetrics.nameTitle": "システムメトリック",
+    "kbn.server.tutorials.systemMetrics.shortDescription": "ホストから CPU、メモリー、ネットワーク、ディスクの統計を収集します。",
+    "kbn.server.tutorials.traefikLogs.artifacts.dashboards.linkLabel": "Traefik ログダッシュボード",
+    "kbn.server.tutorials.traefikLogs.longDescription": "「traefik」Filebeat モジュールが、Traefik により作成されたアクセスログをパースします。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.traefikLogs.nameTitle": "Traefik ログ",
+    "kbn.server.tutorials.traefikLogs.shortDescription": "Traefik Proxy により作成されたアクセスログを収集しパースします。",
+    "kbn.server.tutorials.uptimeMonitors.artifacts.dashboards.linkLabel": "アップタイムアプリ",
+    "kbn.server.tutorials.uptimeMonitors.longDescription": "アクティブなプロービングでサービスの稼働状況を監視します。        Heartbeat が URL のリストに基づき、シンプ:にたずねます:生きてる？と         [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.uptimeMonitors.nameTitle": "アップタイムモニター",
+    "kbn.server.tutorials.uptimeMonitors.shortDescription": "サービスの稼働状況を監視します。",
+    "kbn.server.tutorials.uwsgiMetrics.artifacts.dashboards.linkLabel": "uWSGI メトリックダッシュボード",
+    "kbn.server.tutorials.uwsgiMetrics.longDescription": "「uwsgi」Metricbeat モジュールは、uWSGI サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.uwsgiMetrics.nameTitle": "uWSGI メトリック",
+    "kbn.server.tutorials.uwsgiMetrics.shortDescription": "uWSGI サーバーから内部メトリックを取得します。",
+    "kbn.server.tutorials.vsphereMetrics.artifacts.application.label": "ディスカバリ",
+    "kbn.server.tutorials.vsphereMetrics.longDescription": "「vsphere」Metricbeat モジュールは、vSphere クラスターから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.vsphereMetrics.nameTitle": "vSphere メトリック",
+    "kbn.server.tutorials.vsphereMetrics.shortDescription": "vSphere から内部メトリックを取得します。",
+    "kbn.server.tutorials.windowsEventLogs.artifacts.application.label": "SIEM アプリ",
+    "kbn.server.tutorials.windowsEventLogs.longDescription": "Winlogbeat を使用して Windows Event Log からのログを収集します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.windowsEventLogs.nameTitle": "Windows Event Log",
+    "kbn.server.tutorials.windowsEventLogs.shortDescription": "Windows Event Log からイベントを取得します。",
+    "kbn.server.tutorials.windowsMetrics.artifacts.application.label": "ディスカバー",
+    "kbn.server.tutorials.windowsMetrics.longDescription": "「windows」Metricbeat モジュールは、Windows から内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.windowsMetrics.nameTitle": "Windows メトリック",
+    "kbn.server.tutorials.windowsMetrics.shortDescription": "Windows から内部メトリックを取得します。",
+    "kbn.server.tutorials.zeekLogs.artifacts.dashboards.linkLabel": "Zeek ログダッシュボード",
+    "kbn.server.tutorials.zeekLogs.longDescription": "「zeek」Filebeat モジュールが、[Zeek](https://www.zeek.org//documentation/index.html) からログを収集します。[詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.zeekLogs.nameTitle": "Zeek ログ",
+    "kbn.server.tutorials.zeekLogs.shortDescription": "Zeek/Bro により作成されたログを収集します。",
+    "kbn.server.tutorials.zookeeperMetrics.artifacts.application.label": "ディスカバー",
+    "kbn.server.tutorials.zookeeperMetrics.longDescription": "「{moduleName}」Metricbeat モジュールは、Zookeeper サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
+    "kbn.server.tutorials.zookeeperMetrics.nameTitle": "Zookeeper メトリック",
+    "kbn.server.tutorials.zookeeperMetrics.shortDescription": "Zookeeper サーバーから内部メトリックを取得します。",
+    "kbn.settings.advancedSettings.voiceAnnouncement.searchResultScreenReaderMessage": "{query} を検索しました。{sectionLenght, plural, one {# セクション} other {# セクション}}に{optionLenght, plural, one {# オプション} other { # オプション}}があります。",
+    "kbn.topNavMenu.openInspectorButtonLabel": "検査",
+    "kbn.topNavMenu.refreshButtonLabel": "更新",
+    "kbn.topNavMenu.saveVisualizationButtonLabel": "保存",
+    "kbn.topNavMenu.shareVisualizationButtonLabel": "共有",
+    "kbn.visualize.badge.readOnly.text": "読み込み専用",
+    "kbn.visualize.badge.readOnly.tooltip": "ビジュアライゼーションを保存できません",
+    "kbn.visualize.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage": "indexPattern または savedSearchId が必要です",
+    "kbn.visualize.disabledLabVisualizationMessage": "ラボビジュアライゼーションを表示するには、高度な設定でラボモードをオンにしてください。",
+    "kbn.visualize.disabledLabVisualizationTitle": "{title} はラボビジュアライゼーションです。",
+    "kbn.visualize.editor.createBreadcrumb": "作成",
+    "kbn.visualize.experimentalVisInfoText": "このビジュアライゼーションは実験的なものです。",
+    "kbn.visualize.linkedToSearch.unlinkButtonTooltip": "保存された検索からリンクを解除するにはダブルクリックします",
+    "kbn.visualize.linkedToSearch.unlinkSuccessNotificationText": "保存された検索「{searchTitle}」からリンクが解除されました",
+    "kbn.visualize.linkedToSearchInfoText": "保存された検索にリンクされています",
+    "kbn.visualize.listing.breadcrumb": "可視化",
+    "kbn.visualize.listing.createNew.createButtonLabel": "新規ビジュアライゼーションを追加",
+    "kbn.visualize.listing.createNew.description": "データに基づき異なるビジュアライゼーションを作成できます。",
+    "kbn.visualize.listing.createNew.title": "最初のビジュアライゼーションの作成",
+    "kbn.visualize.listing.experimentalTitle": "実験的",
+    "kbn.visualize.listing.experimentalTooltip": "このビジュアライゼーションは今後のリリースで変更または削除される可能性があり、SLA のサポート対象になりません。",
+    "kbn.visualize.listing.noItemsMessage": "ビジュアライゼーションがないようです。",
+    "kbn.visualize.listing.table.entityName": "ビジュアライゼーション",
+    "kbn.visualize.listing.table.entityNamePlural": "ビジュアライゼーション",
+    "kbn.visualize.listing.table.listTitle": "ビジュアライゼーション",
+    "kbn.visualize.listing.table.titleColumnName": "タイトル",
+    "kbn.visualize.listing.table.typeColumnName": "タイプ",
+    "kbn.visualize.newVisWizard.chooseSourceTitle": "ソースの選択",
+    "kbn.visualize.newVisWizard.experimentalDescription": "このビジュアライゼーションは実験的なものです。デザインと導入は安定したビジュアライゼーションよりも完成度が低く、変更される可能性があります。",
+    "kbn.visualize.newVisWizard.experimentalTitle": "実験的",
+    "kbn.visualize.newVisWizard.experimentalTooltip": "このビジュアライゼーションは今後のリリースで変更または削除される可能性があり、SLA のサポート対象になりません。",
+    "kbn.visualize.newVisWizard.filterVisTypeAriaLabel": "ビジュアライゼーションのタイプでフィルタリング",
+    "kbn.visualize.newVisWizard.helpText": "タイプを選択してビジュアライゼーションの作成を始めましょう。",
+    "kbn.visualize.newVisWizard.helpTextAriaLabel": "タイプを選択してビジュアライゼーションの作成を始めましょう。ESC を押してこのモダルを閉じます。Tab キーを押して次に進みます。",
+    "kbn.visualize.newVisWizard.newVisTypeTitle": "新規 {visTypeName}",
+    "kbn.visualize.newVisWizard.resultsFound": "{resultCount} 個の{resultCount, plural, one {タイプ} other {タイプ} } が見つかりました",
+    "kbn.visualize.newVisWizard.searchSelection.notFoundLabel": "一致するインデックスまたは保存された検索が見つかりませんでした。",
+    "kbn.visualize.newVisWizard.searchSelection.savedObjectType.indexPattern": "インデックスパターン",
+    "kbn.visualize.newVisWizard.searchSelection.savedObjectType.search": "保存された検索",
+    "kbn.visualize.newVisWizard.selectVisType": "ビジュアライゼーションのタイプを選択してください",
+    "kbn.visualize.newVisWizard.title": "新規ビジュアライゼーション",
+    "kbn.visualize.saveDialog.saveAndAddToDashboardButtonLabel": "保存してダッシュボードに追加",
+    "kbn.visualize.savedObjectName": "ビジュアライゼーション",
+    "kbn.visualize.topNavMenu.openInspectorButtonAriaLabel": "ビジュアライゼーションのインスペクターを開く",
+    "kbn.visualize.topNavMenu.openInspectorDisabledButtonTooltip": "このビジュアライゼーションはインスペクターをサポートしていません。",
+    "kbn.visualize.topNavMenu.refreshButtonAriaLabel": "更新",
+    "kbn.visualize.topNavMenu.saveVisualization.failureNotificationText": "「{visTitle}」の保存中にエラーが発生しました",
+    "kbn.visualize.topNavMenu.saveVisualization.successNotificationText": "「{visTitle}」が保存されました",
+    "kbn.visualize.topNavMenu.saveVisualizationButtonAriaLabel": "ビジュアライゼーションを保存",
+    "kbn.visualize.topNavMenu.saveVisualizationDisabledButtonTooltip": "保存する前に変更を適用または破棄",
+    "kbn.visualize.topNavMenu.shareVisualizationButtonAriaLabel": "ビジュアライゼーションを共有",
+    "kbn.visualize.visualizeDescription": "ビジュアライゼーションを作成して Elasticsearch インデックスに保存されたデータを集約します。",
+    "kbn.visualize.visualizeListingBreadcrumbsTitle": "可視化",
+    "kbn.visualize.visualizeListingDeleteErrorTitle": "ビジュアライゼーションの削除中にエラーが発生",
+    "kbn.visualize.wizard.step1Breadcrumb": "作成",
+    "kbn.visualize.wizard.step2Breadcrumb": "作成",
+    "kbn.visualizeTitle": "可視化",
+    "kbn.advancedSettings.discover.searchOnPageLoadText": "ディスカバリの最初の読み込み時に検索を実行するかを制御します。この設定は、保存された検索の読み込み時には影響しません。",
+    "kbn.advancedSettings.discover.searchOnPageLoadTitle": "ページの読み込み時の検索",
+    "kbn.advancedSettings.visualization.heatmap.maxBucketsText": "1 つのデータソースが返せるバケットの最大数です。値が大きいとブラウザのレンダリング速度が下がる可能性があります。",
+    "kbn.advancedSettings.visualization.heatmap.maxBucketsTitle": "ヒートマップの最大バケット数",
+    "kbn.discover.localMenu.saveSaveSearchDescription": "ビジュアライゼーションとダッシュボードで使用できるようにディスカバリの検索を保存します",
+    "kbn.discover.uninitializedRefreshButtonText": "データを更新",
+    "kbn.discover.uninitializedText": "クエリを作成、フィルターを追加、または [更新] をクリックして、現在のクエリの結果を取得します。",
+    "kbn.discover.uninitializedTitle": "検索開始",
+    "kbn.docTable.tableHeader.sortByColumnUnsortedAriaLabel": "{columnName} で並べ替えを止める",
+    "kbn.embeddable.search.displayName": "検索",
+    "kbn.embeddable.visualizations.displayName": "ビジュアライゼーション",
+    "kbn.home.addData.siem.addSiemEventsButtonLabel": "セキュリティイベントを追加",
+    "kbn.home.addData.siem.nameDescription": "即利用可能なビジュアライゼーションで、セキュリティイベントをまとめてインタラクティブな調査を可能にします。",
+    "kbn.home.addData.siem.nameTitle": "SIEM",
+    "kbn.home.tutorial.tabs.siemTitle": "SIEM",
+    "kbn.home.welcomeHomePageHeader": "Kibana ホーム",
+    "kbn.discover.reloadSavedSearchButton": "検索をリセット",
+    "kbn.server.tutorials.apm.dotNetClient.download.textPre": "[NuGet]({allNuGetPackagesLink}) から .NET アプリケーションにエージェントパッケージを追加してください。用途の異なる複数の NuGet パッケージがあります。\n\nEntity Framework Core の ASP.NET Core アプリケーションの場合は、[Elastic.Apm.NetCoreAll]({netCoreAllApmPackageLink}) パッケージをダウンロードしてください。このパッケージは、自動的にすべてのエージェントコンポーネントをアプリケーションに追加します。\n\n 依存性を最低限に抑えたい場合、ASP.NET Core の監視のみに [Elastic.Apm.AspNetCore]({aspNetCorePackageLink}) パッケージ、または Entity Framework Core の監視のみに [Elastic.Apm.EfCore]({efCorePackageLink}) パッケージを使用することができます。\n\n       手動インストルメンテーションのみにパブリック Agent API を使用する場合は、[Elastic.Apm]({elasticApmPackageLink}) パッケージを使用してください。",
+    "kbn.server.tutorials.apm.elasticCloud.textPre": "APM サーバーを有効にするには、[the Elastic Cloud console](https://cloud.elastic.co/deployments?q={cloudId}) に移動し、展開設定で APM を有効にします。有効にした後、このページを更新してください。",
+    "kbn.advancedSettings.defaultRoute.defaultRouteText": "この設定は、Kibana 起動時のデフォルトのルートを設定します。この設定で、Kibana 起動時のランディングページを変更できます。ルートはスラッシュ (\"/\") で始まる必要があります。",
+    "kbn.advancedSettings.defaultRoute.defaultRouteTitle": "デフォルトのルート",
+    "kbn.advancedSettings.defaultRoute.defaultRouteValidationMessage": "ルートはスラッシュ (\"/\") で始まる必要があります。",
+    "kbn.context.loadButtonLabel": "読み込み",
+    "kbn.context.newerDocumentsAriaLabel": "新しいドキュメントの数",
+    "kbn.context.newerDocumentsWarning": "アンカーよりも新しいドキュメントは {docCount} 件しか見つかりませんでした。",
+    "kbn.context.newerDocumentsWarningZero": "アンカーよりも新しいドキュメントは見つかりませんでした。",
+    "kbn.context.olderDocumentsAriaLabel": "古いドキュメントの数",
+    "kbn.context.olderDocumentsWarning": "アンカーよりも古いドキュメントは {docCount} 件しか見つかりませんでした。",
+    "kbn.context.olderDocumentsWarningZero": "アンカーよりも古いドキュメントは見つかりませんでした。",
+    "kbn.discover.fieldChooser.fieldFilterFacetButtonLabel": "フィルタリングされたフィールド",
+    "kbn.discover.fieldChooser.searchPlaceHolder": "検索フィールド",
+    "kbn.discover.histogram.partialData.bucketTooltipText": "選択された時間範囲にはこのバケット全体は含まれていませんが、一部データが含まれている可能性があります。",
+    "kbn.doc.failedToLocateIndexPattern": "ID {indexPatternId} に一致するインデックスパターンがありません",
+    "kbn.doc.somethingWentWrongDescriptionAddon": "インデックスが存在することを確認してください。",
+    "kbn.management.objects.objectsTable.export.successWithMissingRefsNotification": "ファイルはバックグラウンドでダウンロード中です。一部の関連オブジェクトが見つかりませんでした。足りないオブジェクトの一覧は、エクスポートされたファイルの最後の行をご覧ください。",
+    "kbn.management.settings.categoryNames.siemLabel": "SIEM",
+    "kbn.management.settings.field.imageTooLargeErrorMessage": "画像が大きすぎます。最大サイズは {maxSizeDescription} です",
+    "kbn.server.tutorials.couchdbMetrics.artifacts.dashboards.linkLabel": "CouchDB メトリックダッシュボード",
+    "kbn.server.tutorials.couchdbMetrics.longDescription": "「couchdb」Metricbeat モジュールが、CouchDB から監視メトリックを取得します。[詳細] ({learnMoreLink})。",
+    "kbn.server.tutorials.couchdbMetrics.nameTitle": "CouchDB メトリック",
+    "kbn.server.tutorials.couchdbMetrics.shortDescription": "CouchdB サーバーから監視メトリックを取得します。",
+    "kbn.visualize.listing.betaTitle": "ベータ",
+    "kbn.visualize.listing.betaTooltip": "このビジュアライゼーションはベータ段階で、変更される可能性があります。デザインとコードはオフィシャル GA 機能よりも完成度が低く、現状のまま保証なしで提供されています。ベータ機能にはオフィシャル GA 機能の SLA が適用されません",
+    "kbn.visualize.newVisWizard.betaDescription": "このビジュアライゼーションはベータ段階で、変更される可能性があります。デザインとコードはオフィシャル GA 機能よりも完成度が低く、現状のまま保証なしで提供されています。ベータ機能にはオフィシャル GA 機能の SLA が適用されません",
+    "kbn.visualize.newVisWizard.betaTitle": "ベータ",
+    "kbn.visualize.pageHeading": "{chartName} {chartType} ビジュアライゼーション",
+    "kbn.advancedSettings.courier.batchSearchesText": "無効の場合、ダッシュボードパネルは個々に読み込まれ、検索リクエストはユーザーが移動するか\n           クエリを更新すると停止します。有効の場合、ダッシュボードパネルはすべてのデータが読み込まれると同時に読み込まれ、\n           検索は停止しません。",
+    "kbn.doc.couldNotFindDocumentsDescription": "その ID に一致するドキュメントがありません。",
+    "kbn.doc.somethingWentWrongDescription": "{indexName} が欠けています。",
+    "kbnVislibVisTypes.area.areaDescription": "折れ線グラフの下の数量を強調します。",
+    "kbnVislibVisTypes.area.areaTitle": "エリア",
+    "kbnVislibVisTypes.area.groupTitle": "系列を分割",
+    "kbnVislibVisTypes.area.metricsTitle": "Y 軸",
+    "kbnVislibVisTypes.area.radiusTitle": "点のサイズ",
+    "kbnVislibVisTypes.area.segmentTitle": "X 軸",
+    "kbnVislibVisTypes.area.splitTitle": "チャートを分割",
+    "kbnVislibVisTypes.controls.gaugeOptions.alignmentLabel": "アラインメント",
+    "kbnVislibVisTypes.controls.gaugeOptions.displayWarningsLabel": "警告を表示",
+    "kbnVislibVisTypes.controls.gaugeOptions.rangesTitle": "範囲",
+    "kbnVislibVisTypes.controls.gaugeOptions.styleTitle": "スタイル",
+    "kbnVislibVisTypes.controls.heatmapOptions.colorLabel": "色",
+    "kbnVislibVisTypes.controls.heatmapOptions.colorsNumberLabel": "色の数",
+    "kbnVislibVisTypes.controls.heatmapOptions.overwriteAutomaticColorLabel": "自動からーを上書きする",
+    "kbnVislibVisTypes.controls.heatmapOptions.rotateLabel": "回転",
+    "kbnVislibVisTypes.controls.heatmapOptions.showLabelsTitle": "ラベルを表示",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.filterLabelsLabel": "フィルターラベル",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.labelsTitle": "ラベル",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.positionLabel": "配置",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.showLabel": "表示",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.showLabelsLabel": "ラベルを表示",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.xAxisTitle": "X 軸",
+    "kbnVislibVisTypes.controls.pointSeries.gridAxis.dontShowLabel": "非表示",
+    "kbnVislibVisTypes.controls.pointSeries.gridAxis.gridText": "グリッド",
+    "kbnVislibVisTypes.controls.pointSeries.gridAxis.xAxisLinesLabel": "X 軸線を表示",
+    "kbnVislibVisTypes.controls.pointSeries.gridAxis.yAxisLinesLabel": "Y 軸線を表示",
+    "kbnVislibVisTypes.controls.pointSeries.series.chartTypeLabel": "チャートタイプ",
+    "kbnVislibVisTypes.controls.pointSeries.series.lineModeLabel": "線のモード",
+    "kbnVislibVisTypes.controls.pointSeries.series.lineWidthLabel": "線の幅",
+    "kbnVislibVisTypes.controls.pointSeries.series.metricsTitle": "メトリック",
+    "kbnVislibVisTypes.controls.pointSeries.series.modeLabel": "モード",
+    "kbnVislibVisTypes.controls.pointSeries.series.newAxisLabel": "新規軸…",
+    "kbnVislibVisTypes.controls.pointSeries.series.showLineLabel": "線を表示",
+    "kbnVislibVisTypes.controls.pointSeries.series.valueAxisLabel": "値軸",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.maxLabel": "最高",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minLabel": "最低",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minNeededScaleText": "ログスケールが選択されている場合、最低値は 0 よりも大きいものである必要があります",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.modeLabel": "モード",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.positionLabel": "配置",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBoundsLabel": "データバウンドに合わせる",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleTypeLabel": "スケールタイプ",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.setAxisExtentsLabel": "軸の範囲の設定",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.showLabel": "表示",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.titleLabel": "タイトル",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.yAxisTitle": "Y 軸",
+    "kbnVislibVisTypes.editors.pie.donutLabel": "ドーナッツ",
+    "kbnVislibVisTypes.editors.pointSeries.currentTimeMarkerLabel": "現在時刻マーカー",
+    "kbnVislibVisTypes.editors.pointSeries.orderBucketsBySumLabel": "バケットを合計で並べ替え",
+    "kbnVislibVisTypes.editors.pointSeries.settingsTitle": "設定",
+    "kbnVislibVisTypes.functions.pie.help": "パイビジュアライゼーション",
+    "kbnVislibVisTypes.functions.vislib.help": "Vislib ビジュアライゼーション",
+    "kbnVislibVisTypes.gauge.alignmentAutomaticTitle": "自動",
+    "kbnVislibVisTypes.gauge.alignmentHorizontalTitle": "横",
+    "kbnVislibVisTypes.gauge.alignmentVerticalTitle": "縦",
+    "kbnVislibVisTypes.gauge.gaugeDescription": "ゲージはメトリックのステータスを示します。メトリックの値としきい値との関連性を示すのに使用します。",
+    "kbnVislibVisTypes.gauge.gaugeTitle": "ゲージ",
+    "kbnVislibVisTypes.gauge.groupTitle": "グループを分割",
+    "kbnVislibVisTypes.gauge.metricTitle": "メトリック",
+    "kbnVislibVisTypes.goal.goalDescription": "ゴールチャートは、最終目標にどれだけ近いかを示します。",
+    "kbnVislibVisTypes.goal.goalTitle": "ゴール",
+    "kbnVislibVisTypes.goal.groupTitle": "グループを分割",
+    "kbnVislibVisTypes.goal.metricTitle": "メトリック",
+    "kbnVislibVisTypes.heatmap.groupTitle": "Y 軸",
+    "kbnVislibVisTypes.heatmap.heatmapDescription": "マトリックス内のセルに影をつける。",
+    "kbnVislibVisTypes.heatmap.heatmapTitle": "ヒートマップ",
+    "kbnVislibVisTypes.heatmap.metricTitle": "値",
+    "kbnVislibVisTypes.heatmap.segmentTitle": "X 軸",
+    "kbnVislibVisTypes.heatmap.splitTitle": "チャートを分割",
+    "kbnVislibVisTypes.histogram.groupTitle": "系列を分割",
+    "kbnVislibVisTypes.histogram.histogramDescription": "連続変数を各軸に割り当てる。",
+    "kbnVislibVisTypes.histogram.histogramTitle": "縦棒",
+    "kbnVislibVisTypes.histogram.metricTitle": "Y 軸",
+    "kbnVislibVisTypes.histogram.radiusTitle": "点のサイズ",
+    "kbnVislibVisTypes.histogram.segmentTitle": "X 軸",
+    "kbnVislibVisTypes.histogram.splitTitle": "チャートを分割",
+    "kbnVislibVisTypes.horizontalBar.groupTitle": "系列を分割",
+    "kbnVislibVisTypes.horizontalBar.horizontalBarDescription": "連続変数を各軸に割り当てる。",
+    "kbnVislibVisTypes.horizontalBar.horizontalBarTitle": "横棒",
+    "kbnVislibVisTypes.horizontalBar.metricTitle": "Y 軸",
+    "kbnVislibVisTypes.horizontalBar.radiusTitle": "点のサイズ",
+    "kbnVislibVisTypes.horizontalBar.segmentTitle": "X 軸",
+    "kbnVislibVisTypes.horizontalBar.splitTitle": "チャートを分割",
+    "kbnVislibVisTypes.line.groupTitle": "系列を分割",
+    "kbnVislibVisTypes.line.lineDescription": "トレンドを強調します。",
+    "kbnVislibVisTypes.line.lineTitle": "折れ線",
+    "kbnVislibVisTypes.line.metricTitle": "Y 軸",
+    "kbnVislibVisTypes.line.radiusTitle": "点のサイズ",
+    "kbnVislibVisTypes.line.segmentTitle": "X 軸",
+    "kbnVislibVisTypes.line.splitTitle": "チャートを分割",
+    "kbnVislibVisTypes.pie.metricTitle": "サイズのスライス",
+    "kbnVislibVisTypes.pie.pieDescription": "全体に対する内訳を表現する。",
+    "kbnVislibVisTypes.pie.pieTitle": "パイ",
+    "kbnVislibVisTypes.pie.segmentTitle": "スライスの分割",
+    "kbnVislibVisTypes.pie.splitTitle": "チャートを分割",
+    "kbnVislibVisTypes.controls.gaugeOptions.extendRangeTooltip": "範囲をデータの最高値に広げます。",
+    "kbnVislibVisTypes.controls.gaugeOptions.labelsTitle": "ラベル",
+    "kbnVislibVisTypes.controls.gaugeOptions.switchWarningsTooltip": "警告のオン・オフを切り替えます。オンにすると、すべてのラベルを表示できない際に警告が表示されます。",
+    "kbnVislibVisTypes.controls.pointSeries.gridAxis.yAxisLinesDisabledTooltip": "ヒストグラムに X 軸線は表示できません。",
+    "kbnVislibVisTypes.controls.rangeErrorMessage": "値は {min} と {max} の間でなければなりません",
+    "kbnVislibVisTypes.controls.truncateLabel": "切り捨て",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.valueLabel": "しきい値",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.widthLabel": "線の幅",
+    "kbnVislibVisTypes.gauge.gaugeTypes.arcText": "弧形",
+    "kbnVislibVisTypes.gauge.gaugeTypes.circleText": "円",
+    "kbnVislibVisTypes.legendPositions.bottomText": "一番下",
+    "kbnVislibVisTypes.legendPositions.leftText": "左",
+    "kbnVislibVisTypes.legendPositions.rightText": "右",
+    "kbnVislibVisTypes.legendPositions.topText": "一番上",
+    "kbnVislibVisTypes.controls.gaugeOptions.autoExtendRangeLabel": "範囲を自動拡張",
+    "kbnVislibVisTypes.controls.gaugeOptions.gaugeTypeLabel": "ゲージタイプ",
+    "kbnVislibVisTypes.controls.gaugeOptions.percentageModeLabel": "パーセンテージモード",
+    "kbnVislibVisTypes.controls.gaugeOptions.showLabelsLabel": "ラベルを表示",
+    "kbnVislibVisTypes.controls.gaugeOptions.showLegendLabel": "凡例を表示",
+    "kbnVislibVisTypes.controls.gaugeOptions.showScaleLabel": "縮尺を表示",
+    "kbnVislibVisTypes.controls.gaugeOptions.subTextLabel": "サブラベル",
+    "kbnVislibVisTypes.controls.vislibBasicOptions.legendPositionLabel": "凡例の配置",
+    "kbnVislibVisTypes.controls.vislibBasicOptions.showTooltipLabel": "ツールヒントを表示",
+    "kbnVislibVisTypes.editors.pie.labelsSettingsTitle": "ラベル設定",
+    "kbnVislibVisTypes.editors.pie.pieSettingsTitle": "パイ設定",
+    "kbnVislibVisTypes.editors.pie.showLabelsLabel": "ラベルを表示",
+    "kbnVislibVisTypes.editors.pie.showTopLevelOnlyLabel": "トップレベルのみ表示",
+    "kbnVislibVisTypes.editors.pie.showValuesLabel": "値を表示",
+    "kbnVislibVisTypes.area.countText": "カウント",
+    "kbnVislibVisTypes.area.tabs.metricsAxesTitle": "メトリックと軸",
+    "kbnVislibVisTypes.area.tabs.panelSettingsTitle": "パネル設定",
+    "kbnVislibVisTypes.axisModes.normalText": "標準",
+    "kbnVislibVisTypes.axisModes.percentageText": "パーセンテージ",
+    "kbnVislibVisTypes.axisModes.silhouetteText": "シルエット",
+    "kbnVislibVisTypes.axisModes.wiggleText": "振動",
+    "kbnVislibVisTypes.categoryAxis.rotate.angledText": "傾斜",
+    "kbnVislibVisTypes.categoryAxis.rotate.horizontalText": "横",
+    "kbnVislibVisTypes.categoryAxis.rotate.verticalText": "縦",
+    "kbnVislibVisTypes.chartModes.normalText": "標準",
+    "kbnVislibVisTypes.chartModes.stackedText": "スタック",
+    "kbnVislibVisTypes.chartTypes.areaText": "エリア",
+    "kbnVislibVisTypes.chartTypes.barText": "バー",
+    "kbnVislibVisTypes.chartTypes.lineText": "折れ線",
+    "kbnVislibVisTypes.controls.colorRanges.errorText": "各範囲は前の範囲よりも大きくなければなりません。",
+    "kbnVislibVisTypes.controls.colorSchema.colorSchemaLabel": "カラー図表",
+    "kbnVislibVisTypes.controls.colorSchema.howToChangeColorsDescription": "それぞれの色は凡例で変更できます。",
+    "kbnVislibVisTypes.controls.colorSchema.resetColorsButtonLabel": "色をリセット",
+    "kbnVislibVisTypes.controls.colorSchema.reverseColorSchemaLabel": "図表を反転",
+    "kbnVislibVisTypes.controls.heatmapOptions.labelsTitle": "ラベル",
+    "kbnVislibVisTypes.controls.heatmapOptions.useCustomRangesLabel": "カスタム範囲を使用",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.alignLabel": "配置",
+    "kbnVislibVisTypes.controls.pointSeries.series.showDotsLabel": "点を表示",
+    "kbnVislibVisTypes.controls.pointSeries.seriesAccordionAriaLabel": "{agg} オプションを切り替える",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.addButtonTooltip": "Y 軸を追加します",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.customExtentsLabel": "カスタム範囲",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minErrorMessage": "最低値は最高値よりも低く設定する必要があります",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.removeButtonTooltip": "Y 軸を削除します",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.toggleCustomExtendsAriaLabel": "カスタム範囲を切り替える",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.toggleOptionsAriaLabel": "{axisName} オプションを切り替える",
+    "kbnVislibVisTypes.editors.heatmap.highlightLabelTooltip": "チャートのカーソルを当てた部分と凡例の対応するラベルをハイライトします。",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.colorLabel": "ラインカラー",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.showLabel": "しきい線を表示",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.styleLabel": "ラインスタイル",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLineSettingsTitle": "しきい線",
+    "kbnVislibVisTypes.interpolationModes.smoothedText": "スムーズ",
+    "kbnVislibVisTypes.interpolationModes.steppedText": "ステップ",
+    "kbnVislibVisTypes.interpolationModes.straightText": "直線",
+    "kbnVislibVisTypes.scaleTypes.linearText": "直線",
+    "kbnVislibVisTypes.scaleTypes.logText": "ログ",
+    "kbnVislibVisTypes.scaleTypes.squareRootText": "平方根",
+    "kbnVislibVisTypes.thresholdLine.style.dashedText": "鎖線",
+    "kbnVislibVisTypes.thresholdLine.style.dotdashedText": "点線",
+    "kbnVislibVisTypes.thresholdLine.style.fullText": "完全",
+    "kbnVislibVisTypes.controls.heatmapOptions.colorScaleLabel": "カラースケール",
+    "kbnVislibVisTypes.controls.heatmapOptions.percentageModeLabel": "パーセンテージモード",
+    "kbnVislibVisTypes.controls.heatmapOptions.scaleToDataBoundsLabel": "データバウンドに合わせる",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBounds.boundsMargin": "境界マージン",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBounds.minNeededBoundsMargin": "境界マージンは 0 以上でなければなりません",
+    "kbnVislibVisTypes.editors.heatmap.basicSettingsTitle": "基本設定",
+    "kbnVislibVisTypes.editors.heatmap.heatmapSettingsTitle": "ヒートマップ設定",
+    "kbnVislibVisTypes.editors.heatmap.highlightLabel": "ハイライト範囲",
+    "visTypeMetric.colorModes.backgroundOptionLabel": "背景",
+    "visTypeMetric.colorModes.labelsOptionLabel": "ラベル",
+    "visTypeMetric.colorModes.noneOptionLabel": "なし",
+    "visTypeMetric.function.help": "メトリックビジュアライゼーション",
+    "visTypeMetric.metricDescription": "計算結果を単独の数字として表示します。",
+    "visTypeMetric.metricTitle": "メトリック",
+    "visTypeMetric.params.rangesTitle": "範囲",
+    "visTypeMetric.params.style.styleTitle": "スタイル",
+    "visTypeMetric.schemas.metricTitle": "メトリック",
+    "visTypeMetric.schemas.splitGroupTitle": "グループを分割",
+    "visTypeMetric.function.bgFill.help": "html 16 進数コード (#123456)、html 色 (red、blue)、または rgba 値 (rgba(255,255,255,1))。",
+    "visTypeMetric.function.bucket.help": "バケットディメンションの構成です。",
+    "visTypeMetric.function.colorMode.help": "色を変更するメトリックの部分",
+    "visTypeMetric.function.colorRange.help": "別の色が適用される値のグループを指定する範囲オブジェクト。",
+    "visTypeMetric.function.colorScheme.help": "使用する配色",
+    "visTypeMetric.function.font.help": "フォント設定です。",
+    "visTypeMetric.function.invertColors.help": "色範囲を反転します",
+    "visTypeMetric.function.metric.help": "メトリックディメンションの構成です。",
+    "visTypeMetric.function.percentage.help": "パーセンテージモードでメトリックを表示します。colorRange を設定する必要があります。",
+    "visTypeMetric.function.showLabels.help": "メトリック値の下にラベルを表示します。",
+    "visTypeMetric.function.subText.help": "メトリックの下に表示するカスタムテキスト",
+    "visTypeMetric.function.useRanges.help": "有効な色範囲です。",
+    "visTypeMetric.params.settingsTitle": "設定",
+    "visTypeMetric.params.showTitleLabel": "タイトルを表示",
+    "visTypeMetric.params.color.useForLabel": "使用する色",
+    "visTypeMetric.params.percentageModeLabel": "パーセンテージモード",
+    "visTypeMetric.params.style.fontSizeLabel": "ポイント単位のメトリックフォントサイズ",
+    "regionMap.choroplethLayer.downloadingVectorData404ErrorMessage": "{name} の取得時にサーバーから「404」が返されます。指定された場所にファイルが存在することを確認してください。",
+    "regionMap.choroplethLayer.downloadingVectorDataErrorMessage": "{name} ファイルをダウンロードできません。サーバーの CORS 構成で、このホストの Kibana アプリケーションからのリクエストが許可されていることを確認してください。",
+    "regionMap.choroplethLayer.downloadingVectorDataErrorMessageTitle": "ベクトルデータのダウンロード中にエラーが発生しました",
+    "regionMap.choroplethLayer.unrecognizedFormatErrorMessage": "認識されないフォーマット {formatType}",
+    "regionMap.function.help": "地域マップビジュアライゼーション",
+    "regionMap.mapVis.regionMapDescription": "マップにメトリックを表示します。提供されたベースマップを使用するか、独自のマップを追加できます。暗い色は大きな値を意味します。",
+    "regionMap.mapVis.regionMapEditorConfig.schemas.metricTitle": "値",
+    "regionMap.mapVis.regionMapEditorConfig.schemas.segmentTitle": "フィールドのシェイプ",
+    "regionMap.mapVis.regionMapTitle": "地域マップ",
+    "regionMap.visParams.displayWarningsLabel": "警告を表示",
+    "regionMap.visParams.joinFieldLabel": "フィールドを結合",
+    "regionMap.visParams.previewOnEMSLinkText": "EMS でプレビュー",
+    "regionMap.visParams.previewOnEMSLinkTitle": "Elastic Maps Service で {selectedLayerName} をプレビュー",
+    "regionMap.visParams.showAllShapesLabel": "すべてのシェイプを表示",
+    "regionMap.visParams.styleSettingsLabel": "スタイル設定",
+    "regionMap.visParams.switchWarningsTipText": "警告のオン・オフを切り替えます。オンの場合、結合フィールドに基づきベクトルレイヤーのシェイプと一致しない用語ごとに警告が表示されます。オフにすると、これらの警告がオフになります。",
+    "regionMap.visParams.turnOffShowingAllShapesTipText": "この設定をオフにすると、対応する用語と一致したシェイプのみが表示されます。",
+    "regionMap.visParams.vectorMapLabel": "ベクトルマップ",
+    "regionMap.visualization.unableToShowMismatchesWarningText": "次の各用語がシェイプの結合フィールドのシェイプと一致することを確認してください: {mismatches}",
+    "regionMap.visualization.unableToShowMismatchesWarningTitle": "{mismatchesLength} {oneMismatch, plural, one { 件の結果} other { 件の結果}}をマップに表示できません",
+    "regionMap.visParams.colorSchemaLabel": "カラー図表",
+    "regionMap.visParams.layerSettingsTitle": "レイヤー設定",
+    "regionMap.visParams.outlineWeightLabel": "境界の太さ",
+    "home.sampleData.ecommerceSpec.averageSalesPerRegionTitle": "[e コマース] 地域ごとの平均売上",
+    "home.sampleData.ecommerceSpec.averageSalesPriceTitle": "[e コマース] 平均販売価格",
+    "home.sampleData.ecommerceSpec.averageSoldQuantityTitle": "[e コマース] 平均販売数",
+    "home.sampleData.ecommerceSpec.controlsTitle": "[e コマース] コントロール",
+    "home.sampleData.ecommerceSpec.markdownTitle": "[e コマース] マークダウン",
+    "home.sampleData.ecommerceSpec.ordersTitle": "[e コマース] 注文",
+    "home.sampleData.ecommerceSpec.promotionTrackingTitle": "[e コマース] プロモーショントラッキング",
+    "home.sampleData.ecommerceSpec.revenueDashboardDescription": "サンプルの e コマースの注文と収益を分析します",
+    "home.sampleData.ecommerceSpec.revenueDashboardTitle": "[e コマース] 収益ダッシュボード",
+    "home.sampleData.ecommerceSpec.salesByCategoryTitle": "[e コマース] カテゴリーごとの売上",
+    "home.sampleData.ecommerceSpec.salesByGenderTitle": "[e コマース] 性別ごとの売上",
+    "home.sampleData.ecommerceSpec.soldProductsPerDayTitle": "[e コマース] 1 日の販売製品",
+    "home.sampleData.ecommerceSpec.topSellingProductsTitle": "[e コマース] トップセラー製品",
+    "home.sampleData.ecommerceSpec.totalRevenueTitle": "[e コマース] 合計収益",
+    "home.sampleData.ecommerceSpecDescription": "e コマースの注文をトラッキングするサンプルデータ、ビジュアライゼーション、ダッシュボードです。",
+    "home.sampleData.ecommerceSpecTitle": "サンプル e コマース注文",
+    "home.sampleData.flightsSpec.airlineCarrierTitle": "[フライト] 航空会社",
+    "home.sampleData.flightsSpec.airportConnectionsTitle": "[フライト] 空港乗り継ぎ (空港にカーソルを合わせてください)",
+    "home.sampleData.flightsSpec.averageTicketPriceTitle": "[フライト] 平均運賃",
+    "home.sampleData.flightsSpec.controlsTitle": "[フライト] コントロール",
+    "home.sampleData.flightsSpec.delayBucketsTitle": "[フライト] 遅延バケット",
+    "home.sampleData.flightsSpec.delaysAndCancellationsTitle": "[フライト] 遅延・欠航",
+    "home.sampleData.flightsSpec.delayTypeTitle": "[フライト] 遅延タイプ",
+    "home.sampleData.flightsSpec.destinationWeatherTitle": "[フライト] 目的地の天候",
+    "home.sampleData.flightsSpec.flightCancellationsTitle": "[フライト] フライト欠航",
+    "home.sampleData.flightsSpec.flightCountAndAverageTicketPriceTitle": "[フライト] カウントと平均運賃",
+    "home.sampleData.flightsSpec.flightDelaysTitle": "[フライト] フライトの遅延",
+    "home.sampleData.flightsSpec.flightLogTitle": "[フライト] 飛行記録",
+    "home.sampleData.flightsSpec.globalFlightDashboardDescription": "ES-Air、Logstash Airways、Kibana Airlines、JetBeats のサンプル飛行データを分析します",
+    "home.sampleData.flightsSpec.globalFlightDashboardTitle": "[フライト] グローバルフライトダッシュボード",
+    "home.sampleData.flightsSpec.markdownInstructionsTitle": "[フライト] マークダウンの指示",
+    "home.sampleData.flightsSpec.originCountryTicketPricesTitle": "[フライト] 出発国の運賃",
+    "home.sampleData.flightsSpec.originCountryTitle": "[Flights] 出発国と到着国の比較",
+    "home.sampleData.flightsSpec.totalFlightCancellationsTitle": "[フライト] フライト欠航合計",
+    "home.sampleData.flightsSpec.totalFlightDelaysTitle": "[フライト] フライト遅延合計",
+    "home.sampleData.flightsSpec.totalFlightsTitle": "[フライト] フライト合計",
+    "home.sampleData.flightsSpecDescription": "飛行ルートを監視するサンプルデータ、ビジュアライゼーション、ダッシュボードです。",
+    "home.sampleData.flightsSpecTitle": "サンプル飛行データ",
+    "home.sampleData.logsSpec.fileTypeScatterPlotTitle": "[ログ] ファイルタイプ散布図",
+    "home.sampleData.logsSpec.goalsTitle": "[ログ] 目標",
+    "home.sampleData.logsSpec.heatmapTitle": "[ログ] ヒートマップ",
+    "home.sampleData.logsSpec.hostVisitsBytesTableTitle": "[ログ] ホスト、訪問数、バイト表",
+    "home.sampleData.logsSpec.inputControlsTitle": "[ログ] インプットコントロール",
+    "home.sampleData.logsSpec.markdownInstructionsTitle": "[ログ] マークダウンの指示",
+    "home.sampleData.logsSpec.responseCodesOverTimeTitle": "[ログ] 一定期間の応答コードと注釈",
+    "home.sampleData.logsSpec.sourceAndDestinationSankeyChartTitle": "[ログ] ソースと行先のサンキーダイアグラム",
+    "home.sampleData.logsSpec.uniqueVisitorsByCountryTitle": "[ログ] 国ごとのユニークビジター",
+    "home.sampleData.logsSpec.uniqueVisitorsTitle": "[ログ] ユニークビジターと平均バイトの比較",
+    "home.sampleData.logsSpec.visitorOSTitle": "[ログ] OS 別のビジター",
+    "home.sampleData.logsSpec.webTrafficDescription": "Elastic Web サイトのサンプル Webトラフィックログデータを分析します",
+    "home.sampleData.logsSpec.webTrafficTitle": "[ログ] Web トラフィック",
+    "home.sampleData.logsSpecDescription": "Web ログを監視するサンプルデータ、ビジュアライゼーション、ダッシュボードです。",
+    "home.sampleData.logsSpecTitle": "サンプル Web ログ",
+    "server.stats.notReadyMessage": "まだ統計が準備できていません。後程再試行してください",
+    "server.status.disabledTitle": "無効",
+    "server.status.greenTitle": "緑",
+    "server.status.redTitle": "赤",
+    "server.status.uninitializedTitle": "アンインストールしました",
+    "server.status.yellowTitle": "黄色",
+    "share.contextMenu.embedCodeLabel": "埋め込みコード",
+    "share.contextMenu.embedCodePanelTitle": "埋め込みコード",
+    "share.contextMenu.permalinkPanelTitle": "パーマリンク",
+    "share.contextMenu.permalinksLabel": "パーマリンク",
+    "share.contextMenuTitle": "この {objectType} を共有",
+    "share.urlPanel.canNotShareAsSavedObjectHelpText": "{objectType} が保存されるまで保存されたオブジェクトを共有することはできません。",
+    "share.urlPanel.copyIframeCodeButtonLabel": "iFrame コードをコピー",
+    "share.urlPanel.copyLinkButtonLabel": "リンクをコピー",
+    "share.urlPanel.generateLinkAsLabel": "名前を付けてリンクを生成",
+    "share.urlPanel.savedObjectDescription": "この URL を共有することで、他のユーザーがこの {objectType} の最も最近保存されたバージョンを読み込めるようになります。",
+    "share.urlPanel.savedObjectLabel": "保存されたオブジェクト",
+    "share.urlPanel.shortUrlHelpText": "互換性が最も高くなるよう、短いスナップショット URL を共有することをお勧めします。Internet Explorer は URL の長さに制限があり、一部の wiki やマークアップパーサーは長い完全なスナップショット URL に対応していませんが、短い URL は正常に動作するはずです。",
+    "share.urlPanel.shortUrlLabel": "短い URL",
+    "share.urlPanel.snapshotDescription": "スナップショット URL には、{objectType} の現在の状態がエンコードされています。保存された {objectType} への編集内容はこの URL には反映されません。.",
+    "share.urlPanel.snapshotLabel": "スナップショット",
+    "share.urlPanel.unableCreateShortUrlErrorMessage": "短い URL を作成できません。エラー: {errorMessage}",
+    "statusPage.loadStatus.serverIsDownErrorMessage": "サーバーステータスのリクエストに失敗しました。サーバーがダウンしている可能性があります。",
+    "statusPage.loadStatus.serverStatusCodeErrorMessage": "サーバーステータスのリクエストに失敗しました。ステータスコード: {responseStatus}",
+    "statusPage.metricsTiles.columns.heapTotalHeader": "ヒープ合計",
+    "statusPage.metricsTiles.columns.heapUsedHeader": "使用ヒープ",
+    "statusPage.metricsTiles.columns.loadHeader": "読み込み",
+    "statusPage.metricsTiles.columns.requestsPerSecHeader": "1 秒あたりのリクエスト",
+    "statusPage.metricsTiles.columns.resTimeAvgHeader": "平均応答時間",
+    "statusPage.metricsTiles.columns.resTimeMaxHeader": "最長応答時間",
+    "statusPage.serverStatus.statusTitle": "Kibana のステータス: {kibanaStatus}",
+    "statusPage.statusApp.loadingErrorText": "ステータスの読み込み中にエラーが発生しました",
+    "statusPage.statusApp.statusActions.buildText": "{buildNum} を作成",
+    "statusPage.statusApp.statusActions.commitText": "{buildSha} を確定",
+    "statusPage.statusApp.statusTitle": "プラグインステータス",
+    "statusPage.statusTable.columns.idHeader": "ID",
+    "statusPage.statusTable.columns.statusHeader": "ステータス",
+    "visTypeTable.aggTable.exportLabel": "エクスポート:",
+    "visTypeTable.aggTable.formattedLabel": "フォーマット済み",
+    "visTypeTable.aggTable.rawLabel": "生",
+    "visTypeTable.directives.tableCellFilter.filterForValueTooltip": "値でフィルタリング",
+    "visTypeTable.directives.tableCellFilter.filterOutValueTooltip": "値を除外",
+    "visTypeTable.function.help": "表ビジュアライゼーション",
+    "visTypeTable.params.showMetricsLabel": "すべてのバケット/レベルのメトリックを表示",
+    "visTypeTable.params.showPartialRowsLabel": "部分的な行を表示",
+    "visTypeTable.params.showPartialRowsTip": "部分データのある行を表示。表示されていなくてもすべてのバケット/レベルのメトリックが計算されます。",
+    "visTypeTable.params.showTotalLabel": "合計を表示",
+    "visTypeTable.params.totalFunctionLabel": "合計機能",
+    "visTypeTable.tableVisDescription": "テーブルに値を表示します。",
+    "visTypeTable.tableVisEditorConfig.schemas.bucketTitle": "行を分割",
+    "visTypeTable.tableVisEditorConfig.schemas.metricTitle": "メトリック",
+    "visTypeTable.tableVisEditorConfig.schemas.splitTitle": "テーブルを分割",
+    "visTypeTable.tableVisTitle": "データテーブル",
+    "visTypeTable.vis.noResultsFoundTitle": "結果が見つかりませんでした",
+    "visTypeTable.params.PercentageColLabel": "パーセンテージ列",
+    "visTypeTable.params.percentageTableColumnName": "{title} パーセント",
+    "visTypeTable.params.defaultPercentageCol": "非表示",
+    "visTypeTable.totalAggregations.averageText": "平均",
+    "visTypeTable.totalAggregations.countText": "カウント",
+    "visTypeTable.totalAggregations.maxText": "最高",
+    "visTypeTable.totalAggregations.minText": "最低",
+    "visTypeTable.totalAggregations.sumText": "合計",
+    "visTypeTable.params.perPageLabel": "ページごとの行数",
+    "visTypeTagCloud.feedbackMessage.tooSmallContainerDescription": "コンテナーが小さすぎてクラウド全体を表示できません。タグが切り取られたか省略されている可能性があります。",
+    "visTypeTagCloud.feedbackMessage.truncatedTagsDescription": "描写時間が長くなるのを防ぐため、タグの数が切り捨てられています。",
+    "visTypeTagCloud.function.bucket.help": "バケットディメンションの構成です。",
+    "visTypeTagCloud.function.help": "タグクラウドのビジュアライゼーションです。",
+    "visTypeTagCloud.function.metric.help": "メトリックディメンションの構成です。",
+    "visTypeTagCloud.function.orientation.help": "タグクラウド内の単語の方向です。",
+    "visTypeTagCloud.function.scale.help": "単語のフォントサイズを決定するスケールです",
+    "visTypeTagCloud.vis.schemas.metricTitle": "タグサイズ",
+    "visTypeTagCloud.vis.schemas.segmentTitle": "タグ",
+    "visTypeTagCloud.vis.tagCloudDescription": "重要度に基づき大きさを変えた単語のグループ表示です。",
+    "visTypeTagCloud.vis.tagCloudTitle": "タグクラウド",
+    "visTypeTagCloud.visParams.orientationsLabel": "方向",
+    "visTypeTagCloud.vis.editorConfig.orientations.multipleText": "複数",
+    "visTypeTagCloud.vis.editorConfig.orientations.rightAngledText": "直角",
+    "visTypeTagCloud.vis.editorConfig.orientations.singleText": "単一",
+    "visTypeTagCloud.vis.editorConfig.scales.linearText": "直線",
+    "visTypeTagCloud.vis.editorConfig.scales.logText": "ログ",
+    "visTypeTagCloud.vis.editorConfig.scales.squareRootText": "平方根",
+    "visTypeTagCloud.visParams.fontSizeLabel": "フォントサイズ範囲 (ピクセル)",
+    "visTypeTagCloud.visParams.showLabelToggleLabel": "ラベルを表示",
+    "visTypeTagCloud.visParams.textScaleLabel": "テキストスケール",
+    "tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage": "子は data-update に対応できるようこのメソドを導入する必要があります",
+    "tileMap.function.help": "タイルマップのビジュアライゼーションです",
+    "tileMap.geohashLayer.mapTitle": "{mapType} マップタイプが認識されません",
+    "tileMap.tooltipFormatter.latitudeLabel": "緯度",
+    "tileMap.tooltipFormatter.longitudeLabel": "経度",
+    "tileMap.vis.map.editorConfig.schemas.geoCoordinatesTitle": "座標",
+    "tileMap.vis.map.editorConfig.schemas.metricTitle": "値",
+    "tileMap.vis.mapDescription": "マップ上に緯度と経度の座標を表示します。",
+    "tileMap.vis.mapTitle": "座標マップ",
+    "tileMap.visParams.clusterSizeLabel": "クラスターサイズ",
+    "tileMap.visParams.desaturateTilesLabel": "タイルを不飽和化",
+    "tileMap.visParams.mapTypeLabel": "マップタイプ",
+    "tileMap.visParams.reduceVibrancyOfTileColorsTip": "色の鮮明度を下げます。この機能は Internet Explorer ではバージョンにかかわらず利用できません。",
+    "tileMap.wmsOptions.attributionStringTip": "右下角の属性文字列",
+    "tileMap.wmsOptions.baseLayerSettingsTitle": "ベースレイヤー設定",
+    "tileMap.wmsOptions.imageFormatToUseTip": "通常画像/png または画像/jpeg です。サーバーが透明レイヤーを返す場合は png を使用します。",
+    "tileMap.wmsOptions.layersLabel": "レイヤー",
+    "tileMap.wmsOptions.listOfLayersToUseTip": "使用するレイヤーのコンマ区切りのリストです。",
+    "tileMap.wmsOptions.urlOfWMSWebServiceTip": "WMS web サービスの URL です。",
+    "tileMap.wmsOptions.useWMSCompliantMapTileServerTip": "WMS 対応のマップタイルサーバーを使用します。上級者向けです。",
+    "tileMap.wmsOptions.versionOfWMSserverSupportsTip": "サーバーがサポートしている WMS のバージョンです。",
+    "tileMap.wmsOptions.wmsAttributionLabel": "WMS 属性",
+    "tileMap.wmsOptions.wmsMapServerLabel": "WMS マップサーバー",
+    "tileMap.wmsOptions.wmsServerSupportedStylesListTip": "WMS サーバーがサポートしている使用スタイルのコンマ区切りのリストです。大抵は空白のままです。",
+    "tileMap.vis.editorConfig.legendPositions.bottomLeftText": "左下",
+    "tileMap.vis.editorConfig.legendPositions.bottomRightText": "右下",
+    "tileMap.vis.editorConfig.legendPositions.topLeftText": "左上",
+    "tileMap.vis.editorConfig.legendPositions.topRightText": "右上",
+    "tileMap.vis.editorConfig.mapTypes.heatmapText": "ヒートマップ",
+    "tileMap.vis.editorConfig.mapTypes.scaledCircleMarkersText": "スケーリングされた円マーカー",
+    "tileMap.vis.editorConfig.mapTypes.shadedCircleMarkersText": "影付き円マーカー",
+    "tileMap.vis.editorConfig.mapTypes.shadedGeohashGridText": "影付きジオハッシュグリッド",
+    "tileMap.visParams.colorSchemaLabel": "カラー図表",
+    "tileMap.wmsOptions.mapLoadFailDescription": "このパラメーターが正しくないと、マップが正常に読み込まれません。",
+    "tileMap.wmsOptions.wmsDescription": "WMS は、マップイメージサービスの {wmsLink} です。",
+    "tileMap.wmsOptions.wmsFormatLabel": "WMS フォーマット",
+    "tileMap.wmsOptions.wmsLayersLabel": "WMS レイヤー",
+    "tileMap.wmsOptions.wmsLinkText": "OGC スタンダード",
+    "tileMap.wmsOptions.wmsStylesLabel": "WMS スタイル",
+    "tileMap.wmsOptions.wmsUrlLabel": "WMS URL",
+    "tileMap.wmsOptions.wmsVersionLabel": "WMS バージョン",
     "visTypeVega.editor.formatError": "仕様のフォーマット中にエラーが発生",
     "visTypeVega.editor.reformatAsHJSONButtonLabel": "HJSON に変換",
     "visTypeVega.editor.reformatAsJSONButtonLabel": "JSON に変換しコメントを削除",
@@ -3553,7 +3546,6 @@
     "xpack.apm.fetcher.error.status": "エラー",
     "xpack.apm.fetcher.error.title": "リソースの取得中にエラーが発生しました",
     "xpack.apm.fetcher.error.url": "URL",
-    "xpack.apm.loading.prompt": "読み込み中…",
     "xpack.apm.localFilters.titles.agentName": "エージェント名",
     "xpack.apm.localFilters.titles.containerId": "コンテナー ID",
     "xpack.apm.localFilters.titles.host": "ホスト",
@@ -5839,7 +5831,6 @@
     "xpack.infra.homePage.noMetricsIndicesInstructionsActionLabel": "セットアップの手順を表示",
     "xpack.infra.homePage.noMetricsIndicesTitle": "メトリックインデックスがないようです。",
     "xpack.infra.homePage.toolbar.kqlSearchFieldPlaceholder": "インフラストラクチャーデータを検索… (例: host.name:host-1)",
-    "xpack.infra.homePage.toolbar.showingLastOneMinuteDataText": "指定期間の最後の 1 分間のデータを表示中",
     "xpack.infra.infrastructureDescription": "インフラストラクチャーを閲覧します",
     "xpack.infra.infrastructureMetricsExplorerPage.documentTitle": "{previousTitle} | メトリックエクスプローラー",
     "xpack.infra.infrastructureSnapshotPage.documentTitle": "{previousTitle} | インベントリ",
@@ -6079,13 +6070,9 @@
     "xpack.infra.logs.analysis.logRateSectionNoDataTitle": "表示するデータがありません。",
     "xpack.infra.logs.analysis.logRateSectionTitle": "ログレート",
     "xpack.infra.logs.analysisPage.loadingMessage": "分析ジョブのステータスを確認中…",
-    "xpack.infra.logs.analysisPage.unavailable.mlAppButton": "機械学習を開く",
     "xpack.infra.logs.analysisPage.unavailable.mlAppLink": "機械学習アプリ",
-    "xpack.infra.logs.analysisPage.unavailable.mlDisabledBody": "詳細は {machineLearningAppLink} をご覧ください。",
-    "xpack.infra.logs.analysisPage.unavailable.mLDisabledTitle": "分析機能には機械学習が必要です",
     "xpack.infra.logs.highlights.goToNextHighlightButtonLabel": "次のハイライトにスキップ",
     "xpack.infra.logs.highlights.goToPreviousHighlightButtonLabel": "前のハイライトにスキップ",
-    "xpack.infra.logs.index.analysisBetaBadgeTitle": "分析",
     "xpack.infra.logs.index.settingsTabTitle": "設定",
     "xpack.infra.logs.index.streamTabTitle": "ストリーム",
     "xpack.infra.logs.logsAnalysisResults.onboardingSuccessContent": "機械学習ロボットがデータの収集を開始するまでしばらくお待ちください。",
@@ -6176,8 +6163,6 @@
     "xpack.infra.logs.analysis.overallAnomalyChartMaxScoresLabel": "最高異常スコア",
     "xpack.infra.logs.analysis.partitionMaxAnomalyScoreAnnotationLabel": "最高異常スコア: {maxAnomalyScore}",
     "xpack.infra.logs.analysis.recreateJobButtonLabel": "ML ジョブを再作成",
-    "xpack.infra.logs.analysisPage.setupStatusUnknown.title": "ML ジョブのステータスを特定できませんでした。",
-    "xpack.infra.logs.analysisPage.setupStatusUnknown.tryAgainButton": "再試行",
     "xpack.infra.logs.jumpToTailText": "最も新しいエントリーに移動",
     "xpack.infra.metricsExplorer.chartOptions.barLabel": "バー",
     "xpack.infra.nodeDetails.labels.availabilityZone": "アベイラビリティゾーン",
@@ -6603,8 +6588,6 @@
     "xpack.maps.source.wmsTitle": "ウェブマップサービス",
     "xpack.maps.style.heatmap.displayNameLabel": "ヒートマップスタイル",
     "xpack.maps.style.heatmap.resolutionStyleErrorMessage": "解像度パラメーターが認識されません: {resolution}",
-    "xpack.maps.styles.staticDynamic.dynamicDescription": "プロパティ値で特徴をシンボル化します。",
-    "xpack.maps.styles.staticDynamic.staticDescription": "静的スタイルプロパティで特徴をシンボル化します。",
     "xpack.maps.styles.vector.borderColorLabel": "境界線の色",
     "xpack.maps.styles.vector.borderWidthLabel": "境界線の幅",
     "xpack.maps.styles.vector.fillColorLabel": "塗りつぶす色",
@@ -10837,7 +10820,6 @@
     "xpack.siem.eventsOverTime.showing": "表示中",
     "xpack.siem.eventsOverTime.unit": "{totalCount, plural, =1 {event} other {events}}",
     "xpack.siem.flyout.button.text": "タイムライン",
-    "xpack.siem.footer.loadingEventsData": "イベントを読み込み中",
     "xpack.siem.network.navigation.anomaliesTitle": "異常",
     "xpack.siem.network.navigation.dnsTitle": "DNS",
     "xpack.siem.network.navigation.flowsTitle": "Flow",
@@ -11793,11 +11775,9 @@
     "xpack.uptime.monitorList.monitoringStatusTitle": "監視ステータス",
     "xpack.uptime.monitorList.observabilityIntegrationsColumn.apmIntegrationLink.tooltip": "ここをクリックしてAPM でドメイン「{domain}」を確認します。",
     "xpack.uptime.monitorList.observabilityIntegrationsColumn.popoverIconButton.ariaLabel": "URL {monitorUrl}で監査のための移行ポップオーバーを開く",
-    "xpack.uptime.monitorList.observabilityIntegrationsColumnLabel": "統合",
     "xpack.uptime.monitorList.statusColumn.downLabel": "ダウン",
     "xpack.uptime.monitorList.statusColumn.upLabel": "アップ",
     "xpack.uptime.monitorList.statusColumnLabel": "ステータス",
-    "xpack.uptime.monitorList.urlColumnLabel": "URL",
     "xpack.uptime.monitorStatusBar.durationTextAriaLabel": "ミリ秒単位の監視時間",
     "xpack.uptime.monitorStatusBar.healthStatus.durationInMillisecondsMessage": "{duration}ms",
     "xpack.uptime.monitorStatusBar.healthStatusMessage.downLabel": "ダウン",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index cd18355317954..e221cba874bcd 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -261,24 +261,6 @@
     "common.ui.aggTypes.timeInterval.scaledHelpText": "当前缩放至 {bucketDescription}",
     "common.ui.aggTypes.timeInterval.selectIntervalPlaceholder": "选择时间间隔",
     "common.ui.aggTypes.timeInterval.selectOptionHelpText": "选择选项或创建定制值示例:30s、20m、24h、2d、1w、1M",
-    "common.ui.courier.fetch.requestTimedOutNotificationMessage": "由于您的请求超时，因此数据可能不完整",
-    "common.ui.courier.fetch.shardsFailedNotificationMessage": "{shardsTotal} 个分片有 {shardsFailed} 个失败",
-    "common.ui.courier.hitsDescription": "查询返回的文档数目。",
-    "common.ui.courier.hitsLabel": "命中",
-    "common.ui.courier.hitsTotalDescription": "匹配查询的文档数目。",
-    "common.ui.courier.hitsTotalLabel": "命中（总计）",
-    "common.ui.courier.indexPatternDescription": "连接到 Elasticsearch 索引的索引模式。",
-    "common.ui.courier.indexPatternIdDescription": "{kibanaIndexPattern} 索引中的 ID。",
-    "common.ui.courier.indexPatternIdLabel": "索引模式 ID",
-    "common.ui.courier.indexPatternLabel": "索引模式",
-    "common.ui.courier.noSearchStrategyRegisteredErrorMessageDescription": "无法为该搜索请求找到搜索策略",
-    "common.ui.courier.noSearchStrategyRegisteredErrorMessageTitle": "未注册任何搜索策略",
-    "common.ui.courier.queryTimeDescription": "处理查询所花费的时间。不包括发送请求或在浏览器中解析它的时间。",
-    "common.ui.courier.queryTimeLabel": "查询时间",
-    "common.ui.courier.queryTimeValue": "{queryTime}ms",
-    "common.ui.courier.requestTimeDescription": "请求从浏览器到 Elasticsearch 以及返回的时间。不包括请求在队列中等候的时间。",
-    "common.ui.courier.requestTimeLabel": "请求时间",
-    "common.ui.courier.requestTimeValue": "{requestTime}ms",
     "common.ui.directives.fieldNameIcons.booleanAriaLabel": "布尔字段",
     "common.ui.directives.fieldNameIcons.conflictFieldAriaLabel": "冲突字段",
     "common.ui.directives.fieldNameIcons.dateFieldAriaLabel": "日期字段",
@@ -458,11 +440,7 @@
     "common.ui.flotCharts.thuLabel": "周四",
     "common.ui.flotCharts.tueLabel": "周二",
     "common.ui.flotCharts.wedLabel": "周三",
-    "common.ui.legacyBrowserMessage": "此 Kibana 安装启用了当前浏览器未满足的严格安全要求。",
-    "common.ui.legacyBrowserTitle": "请升级您的浏览器",
     "common.ui.management.breadcrumb": "管理",
-    "common.ui.management.connectDataDisplayName": "连接数据",
-    "common.ui.management.displayName": "管理",
     "common.ui.management.nav.menu": "管理菜单",
     "common.ui.modals.cancelButtonLabel": "取消",
     "common.ui.notify.fatalError.errorStatusMessage": "错误 {errStatus} {errStatusText}：{errMessage}",
@@ -472,14 +450,6 @@
     "common.ui.notify.toaster.unavailableServerErrorMessage": "HTTP 请求无法连接。请检查 Kibana 服务器是否正在运行以及您的浏览器是否具有有效的连接，或请联系您的系统管理员。",
     "common.ui.paginateControls.pageSizeLabel": "页面大小",
     "common.ui.paginateControls.scrollTopButtonLabel": "滚动至顶部",
-    "common.ui.savedObjectFinder.addNewItemButtonLabel": "添加新的 {item}",
-    "common.ui.savedObjectFinder.manageItemsButtonLabel": "管理 {items}",
-    "common.ui.savedObjectFinder.noMatchesFoundDescription": "未找到任何匹配的 {items}。",
-    "common.ui.savedObjectFinder.pageItemsFromHitCountDescription": "{pageFirstItem}-{pageLastItem} 页，共 {hitCount} 页",
-    "common.ui.savedObjectFinder.sortByButtonLabeAscendingScreenReaderOnly": "升序",
-    "common.ui.savedObjectFinder.sortByButtonLabeDescendingScreenReaderOnly": "降序",
-    "common.ui.savedObjectFinder.sortByButtonLabel": "名称",
-    "common.ui.savedObjectFinder.sortByButtonLabelScreenReaderOnly": "排序依据",
     "common.ui.savedObjects.confirmModal.overwriteButtonLabel": "覆盖",
     "common.ui.savedObjects.confirmModal.overwriteConfirmationMessage": "确定要覆盖 “{title}”？",
     "common.ui.savedObjects.confirmModal.overwriteTitle": "覆盖“{name}”？",
@@ -540,22 +510,6 @@
     "common.ui.vislib.colormaps.redsText": "红色",
     "common.ui.vislib.colormaps.yellowToRedText": "黄到红",
     "common.ui.visualize.queryGeohashBounds.unableToGetBoundErrorTitle": "无法获取边界",
-    "common.ui.welcomeErrorMessage": "Kibana 未正确加载。检查服务器输出以了解详情。",
-    "common.ui.welcomeMessage": "正在加载 Kibana",
-    "common.ui.courier.fetch.shardsFailedModal.close": "关闭",
-    "common.ui.courier.fetch.shardsFailedModal.copyToClipboard": "将响应复制到剪贴板",
-    "common.ui.courier.fetch.shardsFailedModal.failureHeader": "{failureDetails} 时为 {failureName}",
-    "common.ui.courier.fetch.shardsFailedModal.showDetails": "显示详情",
-    "common.ui.courier.fetch.shardsFailedModal.tabHeaderRequest": "请求",
-    "common.ui.courier.fetch.shardsFailedModal.tabHeaderResponse": "响应",
-    "common.ui.courier.fetch.shardsFailedModal.tabHeaderShardFailures": "分片错误",
-    "common.ui.courier.fetch.shardsFailedModal.tableColIndex": "索引",
-    "common.ui.courier.fetch.shardsFailedModal.tableColNode": "节点",
-    "common.ui.courier.fetch.shardsFailedModal.tableColReason": "原因",
-    "common.ui.courier.fetch.shardsFailedModal.tableColShard": "分片",
-    "common.ui.courier.fetch.shardsFailedModal.tableRowCollapse": "折叠 {rowDescription}",
-    "common.ui.courier.fetch.shardsFailedModal.tableRowExpand": "展开 {rowDescription}",
-    "common.ui.courier.fetch.shardsFailedNotificationDescription": "您正在查看的数据可能不完整或有错误。",
     "common.ui.directives.fieldNameIcons.geoShapeFieldAriaLabel": "几何形状字段",
     "common.ui.vis.editors.agg.errorsAriaLabel": "聚合有错误",
     "common.ui.vislib.heatmap.maxBucketsText": "定义了过多的序列 ({nr})。配置的最大值为 {max}。",
@@ -564,2380 +518,19 @@
     "common.ui.aggTypes.scaleMetricsLabel": "缩放指标值（已弃用）",
     "common.ui.aggTypes.scaleMetricsTooltip": "如果选择手动最小时间间隔并将使用较大的时间间隔，则启用此设置将使计数和求和指标缩放到手动选择的时间间隔。",
     "common.ui.aggTypes.buckets.ranges.rangesFormatMessage": "{gte} {from} 且 {lt} {to}",
+    "management.connectDataDisplayName": "连接数据",
+    "management.displayName": "管理",
     "management.editIndexPattern.createIndex.defaultButtonDescription": "对任何数据执行完全聚合",
     "management.editIndexPattern.createIndex.defaultButtonText": "标准索引模式",
     "management.editIndexPattern.createIndex.defaultTypeName": "索引模式",
-    "core.ui.overlays.banner.attentionTitle": "注意",
-    "core.ui.overlays.banner.closeButtonLabel": "关闭",
-    "core.ui.chrome.headerGlobalNav.goHomePageIconAriaLabel": "前往主页",
-    "core.ui.chrome.headerGlobalNav.helpMenuButtonAriaLabel": "帮助菜单",
-    "core.ui.chrome.headerGlobalNav.helpMenuTitle": "帮助",
-    "core.ui.chrome.headerGlobalNav.helpMenuVersion": "v {version}",
-    "core.ui.chrome.sideGlobalNav.viewRecentItemsFlyoutTitle": "最近项",
-    "core.ui.chrome.sideGlobalNav.viewRecentItemsLabel": "最近查看",
-    "core.ui.recentLinks.linkItem.screenReaderLabel": "{recentlyAccessedItemLinklabel}，类型：{pageType}",
-    "core.chrome.legacyBrowserWarning": "您的浏览器不满足 Kibana 的安全要求。",
-    "core.euiBasicTable.selectAllRows": "选择所有行",
-    "core.euiBasicTable.selectThisRow": "选择此行",
-    "core.euiBasicTable.tableDescription": "以下是包含 {itemCount} 个项的列表。",
-    "core.euiBottomBar.screenReaderAnnouncement": "会有新的菜单打开，其中页面级别控件位于文档的结尾。",
-    "core.euiCardSelect.select": "选择",
-    "core.euiCardSelect.selected": "不可用",
-    "core.euiCardSelect.unavailable": "已选",
-    "core.euiCodeBlock.copyButton": "复制",
-    "core.euiCodeEditor.startEditing": "按 Enter 键开始编辑",
-    "core.euiCodeEditor.startInteracting": "按 Enter 键开始与代码互动。",
-    "core.euiCodeEditor.stopEditing": "完成后，按 Esc 键停止编辑。",
-    "core.euiCodeEditor.stopInteracting": "完成后，按 Esc 键停止与代码互动。",
-    "core.euiCollapsedItemActions.allActions": "所有操作",
-    "core.euiColorPicker.screenReaderAnnouncement": "具有一系列可选颜色的弹出式窗口打开。按 Tab 键正向遍历颜色选择或按 Esc 键关闭此弹出式窗口。",
-    "core.euiColorPicker.swatchAriaLabel": "将 {swatch} 选为颜色",
-    "core.euiComboBoxOptionsList.allOptionsSelected": "您已选择所有可用选项",
-    "core.euiComboBoxOptionsList.alreadyAdded": "{label} 已添加",
-    "core.euiComboBoxOptionsList.createCustomOption": "按 {key} 键将 {searchValue} 添加为自定义选项",
-    "core.euiComboBoxOptionsList.loadingOptions": "正在加载选项",
-    "core.euiComboBoxOptionsList.noAvailableOptions": "没有任何可用选项",
-    "core.euiComboBoxOptionsList.noMatchingOptions": "{searchValue} 不匹配任何选项",
-    "core.euiComboBoxPill.removeSelection": "将 {children} 从此组中的选择移除",
-    "core.euiFilterButton.filterBadge": "{count} 个 {filterCountLabel} 筛选",
-    "core.euiForm.addressFormErrors": "请解决表单中的错误。",
-    "core.euiFormControlLayoutClearButton.label": "清除输入",
-    "core.euiHeaderAlert.dismiss": "消除",
-    "core.euiHeaderLinks.appNavigation": "应用聚合",
-    "core.euiHeaderLinks.openNavigationMenu": "打开导航菜单",
-    "core.euiHue.label": "选择 HSV 颜色模式“色调”值",
-    "core.euiModal.closeModal": "关闭此模式窗口",
-    "core.euiPagination.jumpToLastPage": "跳转到末页，即页 {pageCount}",
-    "core.euiPagination.nextPage": "下一页",
-    "core.euiPagination.pageOfTotal": "第 {page} 页，共 {total} 页",
-    "core.euiPagination.previousPage": "上一页",
-    "core.euiPopover.screenReaderAnnouncement": "您在弹出式窗口中。要退出此弹出式窗口，按 Esc 键。",
-    "core.euiSaturation.roleDescription": "HSV 颜色模式饱和度和值选择",
-    "core.euiSaturation.screenReaderAnnouncement": "使用箭头键导航四色调颜色方案。因每次按键而生成坐标将用于计算 HSV 颜色模式“饱和度”和“值”数值（范围为 0 至 1）。左箭头键和右箭头键分别减少和增加“饱和度”值。上箭头键和下箭头键分别减少和增加“值”值。",
-    "core.euiSelectable.loadingOptions": "正在加载选项",
-    "core.euiSelectable.noAvailableOptions": "没有任何可用选项",
-    "core.euiSelectable.noMatchingOptions": "{searchValue} 不匹配任何选项",
-    "core.euiStat.loadingText": "统计正在加载",
-    "core.euiStepHorizontal.buttonTitle": "第 {step} 步：{title}{titleAppendix, select, completed {已完成} disabled {已禁用} other {}}",
-    "core.euiStepHorizontal.step": "步骤",
-    "core.euiStepNumber.hasErrors": "有错误",
-    "core.euiStepNumber.hasWarnings": "有警告",
-    "core.euiStepNumber.isComplete": "已完成",
-    "core.euiSuperSelect.screenReaderAnnouncement": "您位于包含 {optionsCount} 个项的表单选择器中，必须选择单个选项。使用向上和向下键导航，使用 Esc 键关闭。",
-    "core.euiSuperSelectControl.selectAnOption": "选择选项：{selectedValue} 已选",
-    "core.euiTablePagination.rowsPerPage": "每页行数",
-    "core.euiTablePagination.rowsPerPageOption": "{rowsPerPage} 行",
-    "core.euiTableSortMobile.sorting": "排序",
-    "core.euiToast.dismissToast": "关闭 Toast",
-    "core.euiToast.newNotification": "新通知出现",
-    "core.euiToast.notification": "通知",
-    "core.fatalErrors.clearYourSessionButtonLabel": "清除您的会话",
-    "core.fatalErrors.goBackButtonLabel": "返回",
-    "core.fatalErrors.somethingWentWrongTitle": "出问题了",
-    "core.fatalErrors.tryRefreshingPageDescription": "请尝试刷新页面。如果无效，请返回上一页或清除您的会话数据。",
-    "core.notifications.errorToast.closeModal": "关闭",
-    "core.notifications.unableUpdateUISettingNotificationMessageTitle": "无法更新 UI 设置",
-    "core.toasts.errorToast.seeFullError": "请参阅完整的错误信息",
-    "core.euiSuperDatePicker.showDatesButtonLabel": "显示日期",
-    "core.euiSuperUpdateButton.cannotUpdateTooltip": "无法更新",
-    "core.euiSuperUpdateButton.clickToApplyTooltip": "单击以应用",
-    "core.euiSuperUpdateButton.refreshButtonLabel": "刷新",
-    "core.euiSuperUpdateButton.updateButtonLabel": "更新",
-    "core.euiSuperUpdateButton.updatingButtonLabel": "正在更新",
-    "core.application.appNotFound.pageDescription": "在此 URL 未找到任何应用程序。尝试返回或从菜单中选择应用。",
-    "core.application.appNotFound.title": "未找到应用程序",
-    "kibana-react.exitFullScreenButton.exitFullScreenModeButtonAriaLabel": "退出全屏模式",
-    "kibana-react.exitFullScreenButton.exitFullScreenModeButtonLabel": "退出全屏",
-    "kibana-react.exitFullScreenButton.fullScreenModeDescription": "在全屏模式下，按 ESC 键可退出。",
-    "kibana-react.tableListView.listing.deleteButtonMessage": "删除 {itemCount} 个{entityName}",
-    "kibana-react.tableListView.listing.deleteConfirmModalDescription": "您无法恢复删除的{entityNamePlural}。",
-    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.cancelButtonLabel": "取消",
-    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.confirmButtonLabel": "删除",
-    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.confirmButtonLabelDeleting": "正在删除",
-    "kibana-react.tableListView.listing.listingLimitExceeded.advancedSettingsLinkText": "高级设置",
-    "kibana-react.tableListView.listing.listingLimitExceededDescription": "您有 {totalItems} 个{entityNamePlural}，但您的“{listingLimitText}”设置阻止下表显示 {listingLimitValue} 个以上。您可以在“{advancedSettingsLink}”下更改此设置。",
-    "kibana-react.tableListView.listing.listingLimitExceededTitle": "已超过列表限制",
-    "kibana-react.tableListView.listing.noAvailableItemsMessage": "没有可用的{entityNamePlural}",
-    "kibana-react.tableListView.listing.noMatchedItemsMessage": "没有任何{entityNamePlural}匹配您的搜索。",
-    "kibana-react.tableListView.listing.table.actionTitle": "操作",
-    "kibana-react.tableListView.listing.table.editActionDescription": "编辑",
-    "kibana-react.tableListView.listing.table.editActionName": "编辑",
-    "kibana-react.tableListView.listing.unableToDeleteDangerMessage": "无法删除{entityName}",
-    "kibana-react.savedObjects.finder.filterButtonLabel": "类型",
-    "kibana-react.savedObjects.finder.searchPlaceholder": "搜索……",
-    "kibana-react.savedObjects.finder.sortAsc": "升序",
-    "kibana-react.savedObjects.finder.sortAuto": "最佳匹配",
-    "kibana-react.savedObjects.finder.sortButtonLabel": "排序",
-    "kibana-react.savedObjects.finder.sortDesc": "降序",
-    "kibana-react.savedObjects.saveModal.cancelButtonLabel": "取消",
-    "kibana-react.savedObjects.saveModal.descriptionLabel": "描述",
-    "kibana-react.savedObjects.saveModal.duplicateTitleDescription": "单击“{confirmSaveLabel}”可覆盖现有 {objectType}。",
-    "kibana-react.savedObjects.saveModal.duplicateTitleLabel": "具有标题“{title}”的 {objectType} 已存在",
-    "kibana-react.savedObjects.saveModal.saveAsNewLabel": "另存为新的 {objectType}",
-    "kibana-react.savedObjects.saveModal.saveButtonLabel": "保存",
-    "kibana-react.savedObjects.saveModal.saveTitle": "保存 {objectType}",
-    "kibana-react.savedObjects.saveModal.titleLabel": "标题",
-    "kibana_utils.stateManagement.url.unableToRestoreUrlErrorMessage": "无法完整还原 URL，确保使用共享功能。",
-    "kibana_utils.stateManagement.url.unableToStoreHistoryInSessionErrorMessage": "Kibana 无法将历史记录项存储在您的会话中，因为其已满，并且似乎没有任何可安全删除的项。\n\n通常可通过移至新的标签页来解决此问题，但这会导致更大的问题。如果您有规律地看到此消息，请在 {gitHubIssuesUrl} 提交问题。",
-    "inspector.closeButton": "关闭检查器",
-    "inspector.reqTimestampDescription": "记录请求启动的时间",
-    "inspector.reqTimestampKey": "请求时间戳",
-    "inspector.title": "检查器",
-    "inspector.view": "视图：{viewName}",
-    "inspector.data.dataDescriptionTooltip": "查看可视化后面的数据",
-    "inspector.data.dataTitle": "数据",
-    "inspector.data.downloadCSVButtonLabel": "下载 CSV",
-    "inspector.data.downloadCSVToggleButtonLabel": "下载 CSV",
-    "inspector.data.filterForValueButtonAriaLabel": "筛留值",
-    "inspector.data.filterForValueButtonTooltip": "筛留值",
-    "inspector.data.filterOutValueButtonAriaLabel": "筛除值",
-    "inspector.data.filterOutValueButtonTooltip": "筛除值",
-    "inspector.data.formattedCSVButtonLabel": "格式化 CSV",
-    "inspector.data.formattedCSVButtonTooltip": "以表格式下载数据",
-    "inspector.data.gatheringDataLabel": "正在收集数据",
-    "inspector.data.noDataAvailableDescription": "该元素未提供任何数据。",
-    "inspector.data.noDataAvailableTitle": "没有可用数据",
-    "inspector.data.rawCSVButtonLabel": "原始 CSV",
-    "inspector.data.rawCSVButtonTooltip": "按原样下载数据，例如将日期作为时间戳下载",
-    "inspector.requests.descriptionRowIconAriaLabel": "描述",
-    "inspector.requests.failedLabel": " （失败）",
-    "inspector.requests.noRequestsLoggedDescription.elementHasNotLoggedAnyRequestsText": "该元素尚未记录任何请求。",
-    "inspector.requests.noRequestsLoggedDescription.whatDoesItUsuallyMeanText": "这通常表示无需提取任何数据，或该元素尚未开始提取数据。",
-    "inspector.requests.noRequestsLoggedTitle": "未记录任何请求",
-    "inspector.requests.requestFailedTooltipTitle": "请求失败",
-    "inspector.requests.requestInProgressAriaLabel": "请求进行中",
-    "inspector.requests.requestLabel": "请求：",
-    "inspector.requests.requestsDescriptionTooltip": "查看已收集数据的请求",
-    "inspector.requests.requestsTitle": "请求",
-    "inspector.requests.requestSucceededTooltipTitle": "请求成功",
-    "inspector.requests.requestTabLabel": "请求",
-    "inspector.requests.requestTimeLabel": "{requestTime}ms",
-    "inspector.requests.requestTooltipDescription": "请求所花费的总时间。",
-    "inspector.requests.requestWasMadeDescription": "{requestsCount, plural, one {# 个请求已} other {# 个请求已} }发出{failedRequests}",
-    "inspector.requests.requestWasMadeDescription.requestHadFailureText": "，{failedCount} 个失败",
-    "inspector.requests.responseTabLabel": "响应",
-    "inspector.requests.statisticsTabLabel": "统计信息",
-    "console.autocomplete.addMethodMetaText": "方法",
-    "console.consoleDisplayName": "Console",
-    "console.devToolsDescription": "跳过 cURL 并使用此 JSON 接口来直接处理您的数据。",
-    "console.devToolsTitle": "Console",
-    "console.helpPage.keyboardCommands.autoIndentDescription": "自动缩进当前请求",
-    "console.helpPage.keyboardCommands.closeAutoCompleteMenuDescription": "关闭自动完成菜单",
-    "console.helpPage.keyboardCommands.collapseAllScopesDescription": "折叠当前范围除外的所有范围。通过加按 Shift 键来展开。",
-    "console.helpPage.keyboardCommands.collapseExpandCurrentScopeDescription": "折叠/展开当前范围。",
-    "console.helpPage.keyboardCommands.jumpToPreviousNextRequestDescription": "跳转至前一/后一请求开头或结尾。",
-    "console.helpPage.keyboardCommands.openAutoCompleteDescription": "打开自动完成（即使未键入）",
-    "console.helpPage.keyboardCommands.openDocumentationDescription": "打开当前请求的文档",
-    "console.helpPage.keyboardCommands.selectCurrentlySelectedInAutoCompleteMenuDescription": "选择自动完成菜单中当前选定的词或最顶部的词",
-    "console.helpPage.keyboardCommands.submitRequestDescription": "提交请求",
-    "console.helpPage.keyboardCommands.switchFocusToAutoCompleteMenuDescription": "将焦点切换到自动完成菜单。使用箭头进一步选择词",
-    "console.helpPage.keyboardCommandsTitle": "键盘命令",
-    "console.helpPage.pageTitle": "帮助",
-    "console.helpPage.requestFormatDescription": "您可以在空白编辑器中键入一个或多个请求。Console 理解紧凑格式的请求：",
-    "console.helpPage.requestFormatTitle": "请求格式",
-    "console.historyPage.applyHistoryButtonLabel": "应用",
-    "console.historyPage.clearHistoryButtonLabel": "清除",
-    "console.historyPage.itemOfRequestListAriaLabel": "请求：{historyItem}",
-    "console.historyPage.noHistoryTextMessage": "没有可用的历史记录",
-    "console.historyPage.pageTitle": "历史记录",
-    "console.historyPage.requestListAriaLabel": "已发送请求的历史记录",
-    "console.requestOptions.autoIndentButtonLabel": "自动缩进",
-    "console.requestOptions.copyAsUrlButtonLabel": "复制为 cURL",
-    "console.requestOptions.openDocumentationButtonLabel": "打开文档",
-    "console.requestOptionsButtonAriaLabel": "请求选项",
-    "console.sendRequestButtonTooltip": "单击可发送请求",
-    "console.settingsPage.autocompleteLabel": "自动完成",
-    "console.settingsPage.cancelButtonLabel": "取消",
-    "console.settingsPage.fieldsLabelText": "字段",
-    "console.settingsPage.fontSizeLabel": "字体大小",
-    "console.settingsPage.indicesAndAliasesLabelText": "索引和别名",
-    "console.settingsPage.pageTitle": "设置",
-    "console.settingsPage.saveButtonLabel": "保存",
-    "console.settingsPage.templatesLabelText": "模板",
-    "console.settingsPage.wrapLongLinesLabelText": "长行换行",
-    "console.topNav.helpTabDescription": "帮助",
-    "console.topNav.helpTabLabel": "帮助",
-    "console.topNav.historyTabDescription": "历史记录",
-    "console.topNav.historyTabLabel": "历史记录",
-    "console.topNav.settingsTabDescription": "设置",
-    "console.topNav.settingsTabLabel": "设置",
-    "console.welcomePage.closeButtonLabel": "开始工作",
-    "console.welcomePage.pageTitle": "欢迎使用 Console",
-    "console.welcomePage.quickIntroDescription": "Console UI 分成两个窗格：编辑器窗格（左）和响应窗格（右）。使用编辑器键入请求并将它们提交到 Elasticsearch。结果将显示在右侧的响应窗格中。",
-    "console.welcomePage.quickIntroTitle": "UI 简介",
-    "console.welcomePage.quickTips.cUrlFormatForRequestsDescription": "您可以粘贴 cURL 格式的请求，这些请求将转换成 Console 语法格式。",
-    "console.welcomePage.quickTips.keyboardShortcutsDescription": "学习“帮助”按钮下的键盘快捷方式。那里有非常实用的信息！",
-    "console.welcomePage.quickTips.resizeEditorDescription": "您可以通过拖动编辑器和输出窗格之间的分隔条来调整它们的大小。",
-    "console.welcomePage.quickTips.submitRequestDescription": "使用绿色三角按钮将请求提交到 ES。",
-    "console.welcomePage.quickTips.useWrenchMenuDescription": "使用扳手菜单执行其他有用的操作。",
-    "console.welcomePage.quickTipsTitle": "有几个需要您注意的有用提示",
-    "console.welcomePage.supportedRequestFormatTitle": "Console 理解紧凑格式的请求，类似于 cURL：",
-    "console.consoleMenu.copyAsCurlMessage": "请求已复制为 cURL",
-    "data.filter.applyFilters.popupHeader": "选择要应用的筛选",
-    "data.filter.applyFiltersPopup.cancelButtonLabel": "取消",
-    "data.filter.applyFiltersPopup.saveButtonLabel": "应用",
-    "data.filter.filterBar.addFilterButtonLabel": "添加筛选",
-    "data.filter.filterBar.deleteFilterButtonLabel": "删除",
-    "data.filter.filterBar.disabledFilterPrefix": "已禁用",
-    "data.filter.filterBar.disableFilterButtonLabel": "暂时禁用",
-    "data.filter.filterBar.editFilterButtonLabel": "编辑筛选",
-    "data.filter.filterBar.enableFilterButtonLabel": "重新启用",
-    "data.filter.filterBar.excludeFilterButtonLabel": "排除结果",
-    "data.filter.filterBar.filterItemBadgeAriaLabel": "筛选操作",
-    "data.filter.filterBar.filterItemBadgeIconAriaLabel": "删除",
-    "data.filter.filterBar.includeFilterButtonLabel": "包括结果",
-    "data.filter.filterBar.indexPatternSelectPlaceholder": "选择索引模式",
-    "data.filter.filterBar.negatedFilterPrefix": "非 ",
-    "data.filter.filterBar.pinFilterButtonLabel": "在所有应用上固定",
-    "data.filter.filterBar.pinnedFilterPrefix": "已固定",
-    "data.filter.filterBar.unpinFilterButtonLabel": "取消固定",
-    "data.filter.filterEditor.cancelButtonLabel": "取消",
-    "data.filter.filterEditor.createCustomLabelInputLabel": "定制标签",
-    "data.filter.filterEditor.createCustomLabelSwitchLabel": "创建定制标签？",
-    "data.filter.filterEditor.dateFormatHelpLinkLabel": "已接受日期格式",
-    "data.filter.filterEditor.doesNotExistOperatorOptionLabel": "不存在",
-    "data.filter.filterEditor.editFilterPopupTitle": "编辑筛选",
-    "data.filter.filterEditor.editFilterValuesButtonLabel": "编辑筛选值",
-    "data.filter.filterEditor.editQueryDslButtonLabel": "编辑为查询 DSL",
-    "data.filter.filterEditor.existsOperatorOptionLabel": "存在",
-    "data.filter.filterEditor.falseOptionLabel": "false",
-    "data.filter.filterEditor.fieldSelectLabel": "字段",
-    "data.filter.filterEditor.fieldSelectPlaceholder": "首先选择字段",
-    "data.filter.filterEditor.indexPatternSelectLabel": "索引模式",
-    "data.filter.filterEditor.isBetweenOperatorOptionLabel": "介于",
-    "data.filter.filterEditor.isNotBetweenOperatorOptionLabel": "不介于",
-    "data.filter.filterEditor.isNotOneOfOperatorOptionLabel": "不属于",
-    "data.filter.filterEditor.isNotOperatorOptionLabel": "不是",
-    "data.filter.filterEditor.isOneOfOperatorOptionLabel": "属于",
-    "data.filter.filterEditor.isOperatorOptionLabel": "是",
-    "data.filter.filterEditor.operatorSelectLabel": "运算符",
-    "data.filter.filterEditor.rangeEndInputPlaceholder": "范围结束",
-    "data.filter.filterEditor.rangeStartInputPlaceholder": "范围开始",
-    "data.filter.filterEditor.saveButtonLabel": "保存",
-    "data.filter.filterEditor.trueOptionLabel": "true",
-    "data.filter.filterEditor.valueInputLabel": "值",
-    "data.filter.filterEditor.valueInputPlaceholder": "输入值",
-    "data.filter.filterEditor.valueSelectPlaceholder": "选择值",
-    "data.filter.filterEditor.valuesSelectLabel": "值",
-    "data.filter.filterEditor.valuesSelectPlaceholder": "选择值",
-    "data.filter.options.changeAllFiltersButtonLabel": "更改所有筛选",
-    "data.filter.options.deleteAllFiltersButtonLabel": "全部删除",
-    "data.filter.options.disableAllFiltersButtonLabel": "全部禁用",
-    "data.filter.options.enableAllFiltersButtonLabel": "全部启用",
-    "data.filter.options.invertDisabledFiltersButtonLabel": "反向已启用/已禁用",
-    "data.filter.options.invertNegatedFiltersButtonLabel": "反向包括",
-    "data.filter.options.pinAllFiltersButtonLabel": "全部固定",
-    "data.filter.options.unpinAllFiltersButtonLabel": "全部取消固定",
-    "data.filter.searchBar.changeAllFiltersTitle": "更改所有筛选",
-    "data.indexPatterns.fetchFieldErrorTitle": "提取字段时出错",
-    "data.indexPatterns.unableWriteLabel": "无法写入索引模式！请刷新页面以获取此索引模式的最新更改。",
-    "data.indexPatterns.unknownFieldErrorMessage": "indexPattern “{title}” 中的字段 “{name}” 使用未知字段类型。",
-    "data.indexPatterns.unknownFieldHeader": "未知字段类型 {type}",
-    "data.query.queryBar.kqlFullLanguageName": "Kibana 查询语言",
-    "data.query.queryBar.kqlLanguageName": "KQL",
-    "data.query.queryBar.kqlOffLabel": "关闭",
-    "data.query.queryBar.kqlOnLabel": "开启",
-    "data.query.queryBar.luceneLanguageName": "Lucene",
-    "data.query.queryBar.luceneSyntaxWarningMessage": "尽管您选择了 Kibana 查询语言 (KQL)，但似乎您正在尝试使用 Lucene 查询语法。请查看 KQL 文档 {link}。",
-    "data.query.queryBar.luceneSyntaxWarningTitle": "Lucene 语法警告",
-    "data.query.queryBar.searchInputPlaceholder": "搜索",
-    "data.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) 提供简化查询语法并支持脚本字段。如果您具有基本许可或更高级别的许可，KQL 还提供自动填充功能。如果关闭 KQL，Kibana 将使用 Lucene。",
-    "data.query.queryBar.syntaxOptionsDescription.docsLinkText": "此处",
-    "data.query.queryBar.syntaxOptionsTitle": "语法选项",
-    "data.filter.filterEditor.queryDslLabel": "Elasticsearch 查询 DSL",
-    "data.query.queryBar.luceneSyntaxWarningOptOutText": "不再显示",
-    "data.search.searchBar.savedQueryDescriptionLabelText": "描述",
-    "data.search.searchBar.savedQueryDescriptionText": "保存想要再次使用的查询文本和筛选。",
-    "data.search.searchBar.savedQueryForm.titleConflictText": "标题与现有已保存查询有冲突",
-    "data.search.searchBar.savedQueryForm.whitespaceErrorText": "标题不能包含前导或尾随空格",
-    "data.search.searchBar.savedQueryFormCancelButtonText": "取消",
-    "data.search.searchBar.savedQueryFormSaveButtonText": "保存",
-    "data.search.searchBar.savedQueryFormTitle": "保存查询",
-    "data.search.searchBar.savedQueryIncludeFiltersLabelText": "包括筛选",
-    "data.search.searchBar.savedQueryIncludeTimeFilterLabelText": "包括时间筛选",
-    "data.search.searchBar.savedQueryNameHelpText": "“名称”必填。标题不能包含前导或尾随空格。名称必须唯一。",
-    "data.search.searchBar.savedQueryNameLabelText": "名称",
-    "data.search.searchBar.savedQueryNoSavedQueriesText": "没有已保存查询。",
-    "data.search.searchBar.savedQueryPopoverButtonText": "查看已保存查询",
-    "data.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "清除当前已保存查询",
-    "data.search.searchBar.savedQueryPopoverClearButtonText": "清除",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "取消",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "删除",
-    "data.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "删除“{savedQueryName}”？",
-    "data.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "删除已保存查询 {savedQueryName}",
-    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "另存为新的",
-    "data.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "保存新的已保存查询",
-    "data.search.searchBar.savedQueryPopoverSaveButtonText": "保存当前查询",
-    "data.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "将更改保存到 {title}",
-    "data.search.searchBar.savedQueryPopoverSaveChangesButtonText": "保存更改",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "已保存查询按钮 {savedQueryName}",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "{savedQueryName} 描述",
-    "data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "已保存查询按钮已选择 {savedQueryName}。按下可清除任何更改。",
-    "data.search.searchBar.savedQueryPopoverTitleText": "已保存查询",
-    "data.filter.filterEditor.operatorSelectPlaceholderSelect": "选择",
-    "data.filter.filterEditor.operatorSelectPlaceholderWaiting": "正在等候",
-    "data.filter.filterEditor.rangeInputLabel": "范围",
-    "data.query.queryBar.comboboxAriaLabel": "搜索并筛选 {pageType} 页面",
-    "data.search.searchBar.savedQueryForm.titleMissingText": "“名称”必填",
-    "data.query.queryBar.searchInputAriaLabel": "开始键入内容，以搜索并筛选 {pageType} 页面",
-    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "另存为新的已保存查询",
-    "data.functions.esaggs.help": "运行 AggConfig 聚合",
-    "data.functions.esaggs.inspector.dataRequest.description": "此请求将查询 Elasticsearch 以获取用于可视化的数据。",
-    "data.functions.esaggs.inspector.dataRequest.title": "数据",
-    "data.common.esQuery.kql.errors.endOfInputText": "输入结束",
-    "data.common.esQuery.kql.errors.fieldNameText": "字段名称",
-    "data.common.esQuery.kql.errors.literalText": "文本",
-    "data.common.esQuery.kql.errors.syntaxError": "应为 {expectedList}，但却找到了 {foundInput}。",
-    "data.common.esQuery.kql.errors.valueText": "值",
-    "data.common.esQuery.kql.errors.whitespaceText": "空白",
-    "devTools.badge.readOnly.text": "只读",
-    "devTools.badge.readOnly.tooltip": "无法保存",
-    "devTools.k7BreadcrumbsDevToolsLabel": "开发工具",
-    "embeddableApi.actions.applyFilterActionTitle": "将筛选应用于当前视图",
-    "embeddableApi.addPanel.createNewDefaultOption": "创建新的......",
-    "embeddableApi.addPanel.displayName": "添加面板",
-    "embeddableApi.addPanel.savedObjectAddedToContainerSuccessMessageTitle": "{savedObjectName} 已添加",
-    "embeddableApi.addPanel.Title": "添加面板",
-    "embeddableApi.customizePanel.action.displayName": "定制面板",
-    "embeddableApi.customizePanel.modal.cancel": "取消",
-    "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleFormRowLabel": "面板标题",
-    "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleInputAriaLabel": "为面板输入定制标题",
-    "embeddableApi.customizePanel.modal.optionsMenuForm.resetCustomDashboardButtonLabel": "重置",
-    "embeddableApi.customizePanel.modal.saveButtonTitle": "保存",
-    "embeddableApi.customizePanel.modal.showTitle": "显示面板标题",
-    "embeddableApi.customizeTitle.optionsMenuForm.panelTitleFormRowLabel": "面板标题",
-    "embeddableApi.customizeTitle.optionsMenuForm.panelTitleInputAriaLabel": "对此输入的更改将立即应用。按 enter 键可退出。",
-    "embeddableApi.customizeTitle.optionsMenuForm.resetCustomDashboardButtonLabel": "重置标题",
-    "embeddableApi.errors.embeddableFactoryNotFound": "{type} 无法加载。请升级到具有适当许可的默认 Elasticsearch 和 Kibana 分发。",
-    "embeddableApi.errors.paneldoesNotExist": "未找到面板",
-    "embeddableApi.panel.editPanel.displayName": "编辑 {value}",
-    "embeddableApi.panel.inspectPanel.displayName": "检查",
-    "embeddableApi.panel.optionsMenu.panelOptionsButtonAriaLabel": "面板选项",
-    "embeddableApi.panel.removePanel.displayName": "从仪表板删除",
-    "embeddableApi.samples.contactCard.displayName": "联系卡片",
-    "embeddableApi.samples.filterableContainer.displayName": "可筛选仪表板",
-    "embeddableApi.samples.filterableEmbeddable.displayName": "可筛选",
-    "embeddableApi.samples.helloworld.displayName": "hello world",
-    "embeddableApi.panel.enhancedDashboardPanelAriaLabel": "仪表板面板：{title}",
-    "embeddableApi.panel.optionsMenu.panelOptionsButtonEnhancedAriaLabel": "{title} 的面板选项",
-    "embeddableApi.panel.dashboardPanelAriaLabel": "仪表板面板",
-    "inputControl.control.noIndexPatternTooltip": "找不到索引模式 ID：{indexPatternId}。",
-    "inputControl.control.notInitializedTooltip": "尚未初始化控件",
-    "inputControl.control.noValuesDisableTooltip": "按 “{fieldName}” 字段进行了筛选，但 “{indexPatternName}” 索引模式的任何文档中都不存在该字段。选择不同的字段或索引包含此字段的值的文档。",
-    "inputControl.editor.controlEditor.controlLabel": "控件标签",
-    "inputControl.editor.controlEditor.moveControlDownAriaLabel": "下移控件",
-    "inputControl.editor.controlEditor.moveControlUpAriaLabel": "上移控件",
-    "inputControl.editor.controlEditor.removeControlAriaLabel": "删除控件",
-    "inputControl.editor.controlsTab.addButtonLabel": "添加",
-    "inputControl.editor.controlsTab.select.addControlAriaLabel": "添加控件",
-    "inputControl.editor.controlsTab.select.controlTypeAriaLabel": "选择控件类型",
-    "inputControl.editor.controlsTab.select.listDropDownOptionLabel": "选项列表",
-    "inputControl.editor.controlsTab.select.rangeDropDownOptionLabel": "范围滑块",
-    "inputControl.editor.fieldSelect.fieldLabel": "字段",
-    "inputControl.editor.fieldSelect.selectFieldPlaceholder": "选择字段......",
-    "inputControl.editor.indexPatternSelect.patternLabel": "索引模式",
-    "inputControl.editor.indexPatternSelect.patternPlaceholder": "选择索引模式......",
-    "inputControl.editor.listControl.dynamicOptions.stringFieldDescription": "仅适用于“字符串”字段",
-    "inputControl.editor.listControl.dynamicOptions.updateDescription": "基于用户输入更新选项",
-    "inputControl.editor.listControl.dynamicOptionsLabel": "动态选项",
-    "inputControl.editor.listControl.multiselectDescription": "允许多选",
-    "inputControl.editor.listControl.multiselectLabel": "多选",
-    "inputControl.editor.listControl.parentDescription": "选项基于父控件的值。如果未设置父控件，则禁用。",
-    "inputControl.editor.listControl.parentLabel": "父控件",
-    "inputControl.editor.listControl.sizeDescription": "选项数目",
-    "inputControl.editor.listControl.sizeLabel": "大小",
-    "inputControl.editor.optionsTab.pinFiltersLabel": "为所有应用程序固定筛选",
-    "inputControl.editor.optionsTab.updateFilterLabel": "每次更改时更新 Kibana 筛选",
-    "inputControl.editor.optionsTab.useTimeFilterLabel": "使用时间筛选",
-    "inputControl.editor.rangeControl.decimalPlacesLabel": "小数位数",
-    "inputControl.editor.rangeControl.stepSizeLabel": "步长",
-    "inputControl.function.help": "输入控制可视化",
-    "inputControl.listControl.disableTooltip": "设置 “{label}” 之前禁用。",
-    "inputControl.listControl.unableToFetchTooltip": "无法提取词，错误：{errorMessage}",
-    "inputControl.rangeControl.unableToFetchTooltip": "无法提取范围最小值和最大值，错误：{errorMessage}",
-    "inputControl.register.controlsDescription": "创建交互控件，以方便仪表板操控。",
-    "inputControl.register.controlsTitle": "控件",
-    "inputControl.register.tabs.controlsTitle": "控件",
-    "inputControl.register.tabs.optionsTitle": "选项",
-    "inputControl.vis.inputControlVis.applyChangesButtonLabel": "应用更改",
-    "inputControl.vis.inputControlVis.cancelChangesButtonLabel": "取消更改",
-    "inputControl.vis.inputControlVis.clearFormButtonLabel": "清除表单",
-    "inputControl.vis.listControl.selectPlaceholder": "选择......",
-    "inputControl.vis.listControl.selectTextPlaceholder": "选择......",
-    "inputControl.vis.listControl.partialResultsWarningMessage": "字词列表可能不完整，因为请求花费的时间过长。在 Kibana.yml 中调整自动完成设置以获取完整的结果。",
-    "visualizations.function.visDimension.accessor.help": "数据集中要使用的列（列索引或列名称）",
-    "visualizations.function.visDimension.error.accessor": "提供的列名称无效",
-    "visualizations.function.visDimension.help": "生成 visConfig 维度对象",
-    "expressions.functions.kibana_context.help": "更新 kibana 全局上下文",
-    "expressions.functions.kibana.help": "获取 kibana 全局上下文",
-    "expressions.functions.font.args.alignHelpText": "水平文本对齐。",
-    "expressions.functions.font.args.colorHelpText": "文本颜色。",
-    "expressions.functions.font.args.italicHelpText": "使文本变为斜体？",
-    "expressions.functions.font.args.lHeightHelpText": "行高（像素）",
-    "expressions.functions.font.args.sizeHelpText": "字体大小（像素）",
-    "expressions.functions.font.args.underlineHelpText": "为文本加下划线？",
-    "expressions.functions.font.args.weightHelpText": "字体粗细。例如 {list} 或 {end}。",
-    "expressions.functions.fontHelpText": "创建字体样式。",
-    "kbn.advancedSettings.context.defaultSizeText": "要在上下文视图中显示的周围条目数目",
-    "kbn.advancedSettings.context.defaultSizeTitle": "上下文大小",
-    "kbn.advancedSettings.context.sizeStepText": "递增或递减上下文大小的步进大小",
-    "kbn.advancedSettings.context.sizeStepTitle": "上下文大小步进",
-    "kbn.advancedSettings.context.tieBreakerFieldsText": "要在具有相同时间戳值的文档之间用于平分决胜的字段逗号分隔列表。将使用此列表上存在且在当前索引模式下可排序的第一个字段。",
-    "kbn.advancedSettings.context.tieBreakerFieldsTitle": "平分决胜字段",
-    "kbn.advancedSettings.courier.customRequestPreference.requestPreferenceLinkText": "请求首选项",
-    "kbn.advancedSettings.courier.customRequestPreferenceText": "将 “{setRequestReferenceSetting} 设置为 {customSettingValue} 时，将使用 “{requestPreferenceLink}”。",
-    "kbn.advancedSettings.courier.customRequestPreferenceTitle": "定制请求首选项",
-    "kbn.advancedSettings.courier.ignoreFilterText": "此配置增强对包含可视化的仪表板访问不同索引的支持。禁用时，将向所有可视化应用所有筛选。启用时，如果可视化的索引不包含筛选字段，则会为该可视化忽略筛选。",
-    "kbn.advancedSettings.courier.ignoreFilterTitle": "忽略筛选",
-    "kbn.advancedSettings.courier.maxRequestsText": "控制用于 Kibana 发送的 _msearch 请求的 “{maxRequestsLink}” 设置。设置为 0 可禁用此配置并使用 Elasticsearch 默认值。",
-    "kbn.advancedSettings.courier.maxRequestsTitle": "最大并发分片请求数",
-    "kbn.advancedSettings.courier.requestPreferenceCustom": "定制",
-    "kbn.advancedSettings.courier.requestPreferenceNone": "无",
-    "kbn.advancedSettings.courier.requestPreferenceSessionId": "会话 ID",
-    "kbn.advancedSettings.courier.requestPreferenceText": "允许您设置用于处理搜索请求的分片。<ul>\n            <li><strong>{sessionId}：</strong>仅限在相同分片上执行操作中的所有搜索请求。\n              这有利于在各个请求之间复用分片缓存。</li>\n            <li><strong>{custom}：</strong>允许您定义自己的首选项。\n              使用 <strong>courier:customRequestPreference</strong> 定制首选项值。</li>\n            <li><strong>{none}：</strong>表示不设置首选项。\n              这可能会提供更佳的性能，因此请求可以在所有分片副本上进行分配。\n              不过，结果可能会不一致，因为不同的分片可能处于不同的刷新状态。</li>\n          </ul>",
-    "kbn.advancedSettings.courier.requestPreferenceTitle": "请求首选项",
-    "kbn.advancedSettings.csv.quoteValuesText": "在 csv 导出中是否应使用引号引起值？",
-    "kbn.advancedSettings.csv.quoteValuesTitle": "使用引号引起 CSV 值",
-    "kbn.advancedSettings.csv.separatorText": "使用此字符串分隔导出的值",
-    "kbn.advancedSettings.csv.separatorTitle": "CSV 分隔符",
-    "kbn.advancedSettings.darkModeText": "为 Kibana UI 启用深色模式需要刷新页面，才能应用设置。",
-    "kbn.advancedSettings.darkModeTitle": "深色模式",
-    "kbn.advancedSettings.dateFormat.dayOfWeekText": "一周从哪一日开始？",
-    "kbn.advancedSettings.dateFormat.dayOfWeekTitle": "周内日",
-    "kbn.advancedSettings.dateFormat.optionsLinkText": "格式",
-    "kbn.advancedSettings.dateFormat.scaled.intervalsLinkText": "ISO8601 时间间隔",
-    "kbn.advancedSettings.dateFormat.scaledText": "定义在基于时间的数据按顺序呈现且格式化时间戳应适应度量时间间隔时所用格式的值。键是 {intervalsLink}。",
-    "kbn.advancedSettings.dateFormat.scaledTitle": "缩放的日期格式",
-    "kbn.advancedSettings.dateFormat.timezoneText": "应使用哪个时区。{defaultOption} 将使用您的浏览器检测到的时区。",
-    "kbn.advancedSettings.dateFormat.timezoneTitle": "用于设置日期格式的时区",
-    "kbn.advancedSettings.dateFormatText": "显示格式正确的日期时，请使用此{formatLink}",
-    "kbn.advancedSettings.dateFormatTitle": "日期格式",
-    "kbn.advancedSettings.dateNanosFormatText": "用于 Elasticsearch 的 {dateNanosLink} 数据类型",
-    "kbn.advancedSettings.dateNanosFormatTitle": "纳秒格式的日期",
-    "kbn.advancedSettings.dateNanosLinkTitle": "date_nanos",
-    "kbn.advancedSettings.defaultColumnsText": "“发现”选项卡中默认显示的列",
-    "kbn.advancedSettings.defaultColumnsTitle": "默认列",
-    "kbn.advancedSettings.defaultIndexText": "未设置索引时要访问的索引",
-    "kbn.advancedSettings.defaultIndexTitle": "默认索引",
-    "kbn.advancedSettings.disableAnimationsText": "在 Kibana UI 中关闭所有没有必要的动画。刷新页面以应用更改。",
-    "kbn.advancedSettings.disableAnimationsTitle": "禁用动画",
-    "kbn.advancedSettings.discover.aggsTermsSizeText": "确定在单击“可视化”按钮时将在发现侧边栏的字段下拉列表中可视化多少个词。",
-    "kbn.advancedSettings.discover.aggsTermsSizeTitle": "词数目",
-    "kbn.advancedSettings.discover.sampleSizeText": "要在表中显示的行数目",
-    "kbn.advancedSettings.discover.sampleSizeTitle": "行数目",
-    "kbn.advancedSettings.discover.sortDefaultOrderText": "在 Discover 应用中控制基于时间的索引模式的默认排序方向。",
-    "kbn.advancedSettings.discover.sortDefaultOrderTitle": "默认排序方向",
-    "kbn.advancedSettings.discover.sortOrderAsc": "升序",
-    "kbn.advancedSettings.discover.sortOrderDesc": "降序",
-    "kbn.advancedSettings.docTableHideTimeColumnText": "在 Discover 中和仪表板上的所有已保存搜索中隐藏“时间”列。",
-    "kbn.advancedSettings.docTableHideTimeColumnTitle": "隐藏“时间”列",
-    "kbn.advancedSettings.docTableHighlightText": "突出显示 Discover 和已保存搜索仪表板中的结果。处理大文档时，突出显示会使请求变慢。",
-    "kbn.advancedSettings.docTableHighlightTitle": "突出显示结果",
-    "kbn.advancedSettings.fieldsPopularLimitText": "要显示的排名前 N 最常见字段",
-    "kbn.advancedSettings.fieldsPopularLimitTitle": "常见字段限制",
-    "kbn.advancedSettings.format.bytesFormat.numeralFormatLinkText": "数值格式",
-    "kbn.advancedSettings.format.bytesFormatText": "“字节”格式的默认{numeralFormatLink}",
-    "kbn.advancedSettings.format.bytesFormatTitle": "字节格式",
-    "kbn.advancedSettings.format.currencyFormat.numeralFormatLinkText": "数值格式",
-    "kbn.advancedSettings.format.currencyFormatText": "“货币”格式的默认{numeralFormatLink}",
-    "kbn.advancedSettings.format.currencyFormatTitle": "货币格式",
-    "kbn.advancedSettings.format.defaultTypeMapText": "要默认用于每个字段类型的格式名称的映射。如果未显式提及字段类型，则将使用{defaultFormat}",
-    "kbn.advancedSettings.format.defaultTypeMapTitle": "字段类型格式名称",
-    "kbn.advancedSettings.format.formattingLocale.numeralLanguageLinkText": "数值语言",
-    "kbn.advancedSettings.format.formattingLocaleText": "{numeralLanguageLink}区域设置",
-    "kbn.advancedSettings.format.formattingLocaleTitle": "格式区域设置",
-    "kbn.advancedSettings.format.numberFormat.numeralFormatLinkText": "数值格式",
-    "kbn.advancedSettings.format.numberFormatText": "“数字”格式的默认{numeralFormatLink}",
-    "kbn.advancedSettings.format.numberFormatTitle": "数字格式",
-    "kbn.advancedSettings.format.percentFormat.numeralFormatLinkText": "数值格式",
-    "kbn.advancedSettings.format.percentFormatText": "“百分比”格式的默认{numeralFormatLink}",
-    "kbn.advancedSettings.format.percentFormatTitle": "百分比格式",
-    "kbn.advancedSettings.histogram.barTargetText": "在日期直方图中使用“auto”时尝试生成大约此数目的条形",
-    "kbn.advancedSettings.histogram.barTargetTitle": "目标条形数",
-    "kbn.advancedSettings.histogram.maxBarsText": "在日期直方图中不要显示超过该数目的条形",
-    "kbn.advancedSettings.histogram.maxBarsTitle": "最大条形数",
-    "kbn.advancedSettings.historyLimitText": "在具有历史记录（例如查询输入）的字段中，显示此数目的最近值",
-    "kbn.advancedSettings.historyLimitTitle": "历史记录限制",
-    "kbn.advancedSettings.indexPattern.recentMatchingText": "对于名称中包含时间戳的索引模式，寻找此数目的最近匹配模式，以从其中查询字段映射",
-    "kbn.advancedSettings.indexPattern.recentMatchingTitle": "最近匹配模式",
-    "kbn.advancedSettings.indexPatternPlaceholderText": "在“管理 > 索引模式 > 创建索引模式”中“索引模式名称”的占位符。",
-    "kbn.advancedSettings.indexPatternPlaceholderTitle": "索引模式占位符",
-    "kbn.advancedSettings.maxBucketsText": "单个数据源可以返回的最大存储桶数目",
-    "kbn.advancedSettings.maxBucketsTitle": "最大存储桶数",
-    "kbn.advancedSettings.maxCellHeightText": "表中单元格应占用的最大高度。设置为 0 可禁用截短",
-    "kbn.advancedSettings.maxCellHeightTitle": "最大表单元格高度",
-    "kbn.advancedSettings.metaFieldsText": "_source 之外存在的、在显示我们的文档时将合并进其中的字段",
-    "kbn.advancedSettings.metaFieldsTitle": "元字段",
-    "kbn.advancedSettings.notifications.banner.markdownLinkText": "Markdown 受支持",
-    "kbn.advancedSettings.notifications.bannerLifetimeText": "在屏幕上显示横幅通知的时间（毫秒）。设置为 {infinityValue} 将禁用倒计时。",
-    "kbn.advancedSettings.notifications.bannerLifetimeTitle": "横幅通知生存时间",
-    "kbn.advancedSettings.notifications.bannerText": "用于向所有用户发送临时通知的定制横幅。{markdownLink}",
-    "kbn.advancedSettings.notifications.bannerTitle": "定制横幅通知",
-    "kbn.advancedSettings.notifications.errorLifetimeText": "在屏幕上显示错误通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
-    "kbn.advancedSettings.notifications.errorLifetimeTitle": "错误通知生存时间",
-    "kbn.advancedSettings.notifications.infoLifetimeText": "在屏幕上显示信息通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
-    "kbn.advancedSettings.notifications.infoLifetimeTitle": "信息通知生存时间",
-    "kbn.advancedSettings.notifications.warningLifetimeText": "在屏幕上显示警告通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
-    "kbn.advancedSettings.notifications.warningLifetimeTitle": "警告通知生存时间",
-    "kbn.advancedSettings.pinFiltersText": "筛选是否默认有全局状态（被固定）",
-    "kbn.advancedSettings.pinFiltersTitle": "默认固定筛选",
-    "kbn.advancedSettings.query.allowWildcardsText": "设置后，将允许 * 用作查询语句的第一个字符。当前仅在查询栏中启用实验性查询功能时才会应用。要在基本 lucene 查询中禁用前导通配符，请使用“{queryStringOptionsPattern}”。",
-    "kbn.advancedSettings.query.allowWildcardsTitle": "在查询中允许前导通配符",
-    "kbn.advancedSettings.query.queryStringOptions.optionsLinkText": "选项",
-    "kbn.advancedSettings.query.queryStringOptionsText": "lucene 查询字符串解析器的{optionsLink}。只有将“{queryLanguage}”设置为 {luceneLanguage} 时才会使用。",
-    "kbn.advancedSettings.query.queryStringOptionsTitle": "查询字符串选项",
-    "kbn.advancedSettings.savedObjects.listingLimitText": "为列表页面提取的对象数目",
-    "kbn.advancedSettings.savedObjects.listingLimitTitle": "对象列表限制",
-    "kbn.advancedSettings.savedObjects.perPageText": "在加载对话框中每页要显示的对象数目",
-    "kbn.advancedSettings.savedObjects.perPageTitle": "每页对象数",
-    "kbn.advancedSettings.searchQueryLanguageKql": "KQL",
-    "kbn.advancedSettings.searchQueryLanguageLucene": "Lucene",
-    "kbn.advancedSettings.searchQueryLanguageText": "查询栏使用的查询语言。KQL 是专门为 Kibana 打造的新型语言。",
-    "kbn.advancedSettings.searchQueryLanguageTitle": "查询语言",
-    "kbn.advancedSettings.shortenFieldsText": "缩短长字段，例如，不显示 foo.bar.baz，而显示 f.b.baz",
-    "kbn.advancedSettings.shortenFieldsTitle": "缩短字段",
-    "kbn.advancedSettings.sortOptions.optionsLinkText": "选项",
-    "kbn.advancedSettings.sortOptionsText": "Elasticsearch 排序参数的{optionsLink}",
-    "kbn.advancedSettings.sortOptionsTitle": "排序选项",
-    "kbn.advancedSettings.storeUrlText": "URL 有时会变得过长，以使得某些浏览器无法处理。为此，我们正在测试将 URL 的各个组成部分存储在会话存储中是否会有帮助。请告知我们这样做的效果！",
-    "kbn.advancedSettings.storeUrlTitle": "将 URL 存储在会话存储中",
-    "kbn.advancedSettings.suggestFilterValuesText": "将此属性设置 false 以阻止筛选编辑器建议字段的值。",
-    "kbn.advancedSettings.suggestFilterValuesTitle": "筛选编辑器建议值",
-    "kbn.advancedSettings.timepicker.last15Minutes": "过去 15 分钟",
-    "kbn.advancedSettings.timepicker.last1Hour": "过去 1 小时",
-    "kbn.advancedSettings.timepicker.last1Year": "过去 1 年",
-    "kbn.advancedSettings.timepicker.last24Hours": "过去 24 小时",
-    "kbn.advancedSettings.timepicker.last30Days": "过去 30 天",
-    "kbn.advancedSettings.timepicker.last30Minutes": "过去 30 分钟",
-    "kbn.advancedSettings.timepicker.last7Days": "过去 7 天",
-    "kbn.advancedSettings.timepicker.last90Days": "过去 90 天",
-    "kbn.advancedSettings.timepicker.quickRanges.acceptedFormatsLinkText": "接受的格式",
-    "kbn.advancedSettings.timepicker.quickRangesText": "要在时间选取器的“速选”部分中显示的范围列表。这应该是对象数组，每个对象包含“from”、“to”（请参阅“{acceptedFormatsLink}”）和“display”（要显示的标题）。",
-    "kbn.advancedSettings.timepicker.quickRangesTitle": "时间筛选速选范围",
-    "kbn.advancedSettings.timepicker.refreshIntervalDefaultsText": "时间筛选的默认刷新时间间隔",
-    "kbn.advancedSettings.timepicker.refreshIntervalDefaultsTitle": "时间筛选刷新时间间隔",
-    "kbn.advancedSettings.timepicker.thisWeek": "本周",
-    "kbn.advancedSettings.timepicker.timeDefaultsText": "未使用时间筛选启动 Kibana 时要使用的时间筛选选择",
-    "kbn.advancedSettings.timepicker.timeDefaultsTitle": "时间筛选默认值",
-    "kbn.advancedSettings.timepicker.today": "今日",
-    "kbn.advancedSettings.visualization.colorMappingText": "将值映射到可视化内的指定颜色",
-    "kbn.advancedSettings.visualization.colorMappingTitle": "颜色映射",
-    "kbn.advancedSettings.visualization.dimmingOpacityText": "突出显示图表的其他元素时变暗图表项的透明度。此数字越低，突出显示的元素越突出。必须是介于 0 和 1 之间的数字。",
-    "kbn.advancedSettings.visualization.dimmingOpacityTitle": "变暗透明度",
-    "kbn.advancedSettings.visualization.loadingDelayText": "在查询期间在将可视化变暗之前要等待的时间",
-    "kbn.advancedSettings.visualization.loadingDelayTitle": "加载延迟",
-    "kbn.advancedSettings.visualization.showRegionMapWarningsText": "词无法联接到地图上的形状时，区域地图是否显示警告。",
-    "kbn.advancedSettings.visualization.showRegionMapWarningsTitle": "显示区域地图警告",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText": "单元格维度的解释",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecisionText": "在磁贴地图上显示的最大 geoHash 精确度：7 为高，10 为很高，12 为最大值。{cellDimensionsLink}",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecisionTitle": "最大磁贴地图精确度",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaults.propertiesLinkText": "属性",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsText": "坐标地图中 WMS 地图服务器支持的默认{propertiesLink}",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsTitle": "默认 WMS 属性",
-    "kbn.advancedSettings.visualizeEnableLabsText": "允许用户创建、查看和编辑实验性可视化。如果禁用，\n          仅被视为生产就绪的可视化可供用户使用。",
-    "kbn.advancedSettings.visualizeEnableLabsTitle": "启用实验性可视化",
-    "kbn.common.tutorials.auditbeat.cloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.auditbeat.premCloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.auditbeat.premInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTitle": "编辑配置",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTitle": "编辑配置",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTitle": "编辑配置",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.auditbeatInstructions.config.debTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.auditbeatInstructions.config.debTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.auditbeatInstructions.config.debTitle": "编辑配置",
-    "kbn.common.tutorials.auditbeatInstructions.config.osxTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.auditbeatInstructions.config.osxTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.auditbeatInstructions.config.osxTitle": "编辑配置",
-    "kbn.common.tutorials.auditbeatInstructions.config.rpmTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.auditbeatInstructions.config.rpmTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.auditbeatInstructions.config.rpmTitle": "编辑配置",
-    "kbn.common.tutorials.auditbeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.auditbeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.auditbeatInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.auditbeatInstructions.install.debTextPost": "寻找 32 位软件包？请参阅[下载页面]({linkUrl})。",
-    "kbn.common.tutorials.auditbeatInstructions.install.debTextPre": "首次使用 Auditbeat？请参阅[入门指南]({linkUrl})。",
-    "kbn.common.tutorials.auditbeatInstructions.install.debTitle": "下载并安装 Auditbeat",
-    "kbn.common.tutorials.auditbeatInstructions.install.osxTextPre": "首次使用 Auditbeat？请参阅[入门指南]({linkUrl})。",
-    "kbn.common.tutorials.auditbeatInstructions.install.osxTitle": "下载并安装 Auditbeat",
-    "kbn.common.tutorials.auditbeatInstructions.install.rpmTextPost": "寻找 32 位软件包？请参阅[下载页面]({linkUrl})。",
-    "kbn.common.tutorials.auditbeatInstructions.install.rpmTextPre": "首次使用 Auditbeat？请参阅[入门指南]({linkUrl})。",
-    "kbn.common.tutorials.auditbeatInstructions.install.rpmTitle": "下载并安装 Auditbeat",
-    "kbn.common.tutorials.auditbeatInstructions.install.windowsTextPost": "在 {auditbeatPath} 文件中修改 {propertyName} 下的设置以指向您的 Elasticsearch 安装。",
-    "kbn.common.tutorials.auditbeatInstructions.install.windowsTextPre": "首次使用 Auditbeat？请参阅[入门指南]({guideLinkUrl})。\n 1.从[下载]({auditbeatLinkUrl})页面下载 Auditbeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 `{directoryName}` 目录重命名为 `Auditbeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符处，运行以下命令以将 Auditbeat 安装为 Windows 服务。",
-    "kbn.common.tutorials.auditbeatInstructions.install.windowsTitle": "下载并安装 Auditbeat",
-    "kbn.common.tutorials.auditbeatInstructions.start.debTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.auditbeatInstructions.start.debTitle": "启动 Auditbeat",
-    "kbn.common.tutorials.auditbeatInstructions.start.osxTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.auditbeatInstructions.start.osxTitle": "启动 Auditbeat",
-    "kbn.common.tutorials.auditbeatInstructions.start.rpmTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.auditbeatInstructions.start.rpmTitle": "启动 Auditbeat",
-    "kbn.common.tutorials.auditbeatInstructions.start.windowsTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.auditbeatInstructions.start.windowsTitle": "启动 Auditbeat",
-    "kbn.common.tutorials.auditbeatStatusCheck.buttonLabel": "检查数据",
-    "kbn.common.tutorials.auditbeatStatusCheck.errorText": "尚未接收到数据",
-    "kbn.common.tutorials.auditbeatStatusCheck.successText": "已成功接收数据",
-    "kbn.common.tutorials.auditbeatStatusCheck.text": "确认从 Auditbeat 收到数据",
-    "kbn.common.tutorials.auditbeatStatusCheck.title": "状态",
-    "kbn.common.tutorials.filebeat.cloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.filebeat.premCloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.filebeat.premInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.debTitle": "编辑配置",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTitle": "编辑配置",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTitle": "编辑配置",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.filebeatEnableInstructions.debTextPost": "在 `/etc/filebeat/modules.d/{moduleName}.yml` 文件中修改设置。",
-    "kbn.common.tutorials.filebeatEnableInstructions.debTitle": "启用和配置 {moduleName} 模块",
-    "kbn.common.tutorials.filebeatEnableInstructions.osxTextPost": "在 `modules.d/{moduleName}.yml` 文件中修改设置。",
-    "kbn.common.tutorials.filebeatEnableInstructions.osxTextPre": "从安装目录中，运行：",
-    "kbn.common.tutorials.filebeatEnableInstructions.osxTitle": "启用和配置 {moduleName} 模块",
-    "kbn.common.tutorials.filebeatEnableInstructions.rpmTextPost": "在 `/etc/filebeat/modules.d/{moduleName}.yml` 文件中修改设置。",
-    "kbn.common.tutorials.filebeatEnableInstructions.rpmTitle": "启用和配置 {moduleName} 模块",
-    "kbn.common.tutorials.filebeatEnableInstructions.windowsTextPost": "在 `modules.d/{moduleName}.yml` 文件中修改设置。",
-    "kbn.common.tutorials.filebeatEnableInstructions.windowsTextPre": "从 {path} 文件夹中，运行：",
-    "kbn.common.tutorials.filebeatEnableInstructions.windowsTitle": "启用和配置 {moduleName} 模块",
-    "kbn.common.tutorials.filebeatInstructions.config.debTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.filebeatInstructions.config.debTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.filebeatInstructions.config.debTitle": "编辑配置",
-    "kbn.common.tutorials.filebeatInstructions.config.osxTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.filebeatInstructions.config.osxTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.filebeatInstructions.config.osxTitle": "编辑配置",
-    "kbn.common.tutorials.filebeatInstructions.config.rpmTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.filebeatInstructions.config.rpmTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.filebeatInstructions.config.rpmTitle": "编辑配置",
-    "kbn.common.tutorials.filebeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.filebeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.filebeatInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.filebeatInstructions.install.debTextPost": "寻找 32 位软件包？请参阅[下载页面]({linkUrl})。",
-    "kbn.common.tutorials.filebeatInstructions.install.debTextPre": "首次使用 Filebeat？请参阅[入门指南]({linkUrl})。",
-    "kbn.common.tutorials.filebeatInstructions.install.debTitle": "下载并安装 Filebeat",
-    "kbn.common.tutorials.filebeatInstructions.install.osxTextPre": "首次使用 Filebeat？请参阅[入门指南]({linkUrl})。",
-    "kbn.common.tutorials.filebeatInstructions.install.osxTitle": "下载并安装 Filebeat",
-    "kbn.common.tutorials.filebeatInstructions.install.rpmTextPost": "寻找 32 位软件包？请参阅[下载页面]({linkUrl})。",
-    "kbn.common.tutorials.filebeatInstructions.install.rpmTextPre": "首次使用 Filebeat？请参阅[入门指南]({linkUrl})。",
-    "kbn.common.tutorials.filebeatInstructions.install.rpmTitle": "下载并安装 Filebeat",
-    "kbn.common.tutorials.filebeatInstructions.install.windowsTextPost": "在 {filebeatPath} 文件中修改 {propertyName} 下的设置以指向您的 Elasticsearch 安装。",
-    "kbn.common.tutorials.filebeatInstructions.install.windowsTextPre": "首次使用 Filebeat？请参阅[入门指南]({guideLinkUrl})。\n 1.从[下载]({filebeatLinkUrl})页面下载 Filebeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 `{directoryName}` 目录重命名为 `Filebeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符处，运行以下命令以将 Filebeat 安装为 Windows 服务。",
-    "kbn.common.tutorials.filebeatInstructions.install.windowsTitle": "下载并安装 Filebeat",
-    "kbn.common.tutorials.filebeatInstructions.start.debTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.filebeatInstructions.start.debTitle": "启动 Filebeat",
-    "kbn.common.tutorials.filebeatInstructions.start.osxTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.filebeatInstructions.start.osxTitle": "启动 Filebeat",
-    "kbn.common.tutorials.filebeatInstructions.start.rpmTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.filebeatInstructions.start.rpmTitle": "启动 Filebeat",
-    "kbn.common.tutorials.filebeatInstructions.start.windowsTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.filebeatInstructions.start.windowsTitle": "启动 Filebeat",
-    "kbn.common.tutorials.filebeatStatusCheck.buttonLabel": "检查数据",
-    "kbn.common.tutorials.filebeatStatusCheck.errorText": "尚未从此模块收到任何数据",
-    "kbn.common.tutorials.filebeatStatusCheck.successText": "从此模块成功收到数据",
-    "kbn.common.tutorials.filebeatStatusCheck.text": "确认已从 Filebeat `{moduleName}` 模块成功收到数据",
-    "kbn.common.tutorials.filebeatStatusCheck.title": "模块状态",
-    "kbn.common.tutorials.functionbeat.cloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.functionbeat.premCloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.functionbeat.premInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.functionbeatAWSInstructions.textPost": "其中 `<your-access-key>` 和 `<your-secret-access-key>` 是您的帐户凭据，`us-east-1` 是所需的地区。",
-    "kbn.common.tutorials.functionbeatAWSInstructions.textPre": "在环境中设置您的 AWS 帐户凭据：",
-    "kbn.common.tutorials.functionbeatAWSInstructions.title": "设置 AWS 凭据",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTitle": "编辑配置",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.functionbeatEnableOnPremInstructions.defaultTextPost": "其中 `<cloudwatch-log-group>` 是要采集的日志组名称，`<unique-bucket-name>` 是将用于暂存 Functionbeat 部署的有效 S3 存储桶名称。",
-    "kbn.common.tutorials.functionbeatEnableOnPremInstructions.defaultTitle": "配置 Cloudwatch 日志组",
-    "kbn.common.tutorials.functionbeatEnableOnPremInstructionsOSXLinux.textPre": "在 `functionbeat.yml` 文件中修改设置。",
-    "kbn.common.tutorials.functionbeatEnableOnPremInstructionsWindows.textPre": "在 {path} 文件中修改设置。",
-    "kbn.common.tutorials.functionbeatInstructions.config.osxTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.functionbeatInstructions.config.osxTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.functionbeatInstructions.config.osxTitle": "配置 Elastic 集群",
-    "kbn.common.tutorials.functionbeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.functionbeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.functionbeatInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.functionbeatInstructions.deploy.osxTextPre": "这会将 Functionbeat 安装为 Lambda 函数。`setup` 命令检查 Elasticsearch 配置并加载 Kibana 索引模式。通常可省略此命令。",
-    "kbn.common.tutorials.functionbeatInstructions.deploy.osxTitle": "将 Functionbeat 部署到 AWS Lambda",
-    "kbn.common.tutorials.functionbeatInstructions.deploy.windowsTextPre": "这会将 Functionbeat 安装为 Lambda 函数。`setup` 命令检查 Elasticsearch 配置并加载 Kibana 索引模式。通常可省略此命令。",
-    "kbn.common.tutorials.functionbeatInstructions.deploy.windowsTitle": "将 Functionbeat 部署到 AWS Lambda",
-    "kbn.common.tutorials.functionbeatInstructions.install.linuxTextPre": "首次使用 Functionbeat？请参阅[入门指南]({link})。",
-    "kbn.common.tutorials.functionbeatInstructions.install.linuxTitle": "下载并安装 Functionbeat",
-    "kbn.common.tutorials.functionbeatInstructions.install.osxTextPre": "首次使用 Functionbeat？请参阅[入门指南]({link})。",
-    "kbn.common.tutorials.functionbeatInstructions.install.osxTitle": "下载并安装 Functionbeat",
-    "kbn.common.tutorials.functionbeatInstructions.install.windowsTextPre": "首次使用 Functionbeat？请参阅[入门指南]({functionbeatLink})。\n 1.从[下载]({elasticLink})页面下载 Functionbeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 {directoryName} 目录重命名为 `Functionbeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符下，前往 Functionbeat 目录：",
-    "kbn.common.tutorials.functionbeatInstructions.install.windowsTitle": "下载并安装 Functionbeat",
-    "kbn.common.tutorials.functionbeatStatusCheck.buttonLabel": "检查数据",
-    "kbn.common.tutorials.functionbeatStatusCheck.errorText": "尚未从 Functionbeat 收到任何数据",
-    "kbn.common.tutorials.functionbeatStatusCheck.successText": "从 Functionbeat 成功收到数据",
-    "kbn.common.tutorials.functionbeatStatusCheck.text": "确认从 Functionbeat 收到数据",
-    "kbn.common.tutorials.functionbeatStatusCheck.title": "Functionbeat 状态",
-    "kbn.common.tutorials.heartbeat.cloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.heartbeat.premCloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.heartbeat.premInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTitle": "编辑配置",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTitle": "编辑配置",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTitle": "编辑配置",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.debTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.defaultTextPost": "有关如何在 Heartbeat 中配置监测的详细信息，请参阅 [Heartbeat 配置文档]({configureLink})",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.defaultTitle": "编辑配置 - 添加监测",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.osxTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.rpmTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
-    "kbn.common.tutorials.heartbeatEnableCloudInstructions.windowsTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.debTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.defaultTextPost": "其中 {hostTemplate} 是受监测 URL。有关如何在 Heartbeat 中配置监测的详细信息，请参阅 [Heartbeat 配置文档]({configureLink})",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.defaultTitle": "编辑配置 - 添加监测",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.osxTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.rpmTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
-    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.windowsTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
-    "kbn.common.tutorials.heartbeatInstructions.config.debTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.heartbeatInstructions.config.debTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.heartbeatInstructions.config.debTitle": "编辑配置",
-    "kbn.common.tutorials.heartbeatInstructions.config.osxTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.heartbeatInstructions.config.osxTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.heartbeatInstructions.config.osxTitle": "编辑配置",
-    "kbn.common.tutorials.heartbeatInstructions.config.rpmTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.heartbeatInstructions.config.rpmTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.heartbeatInstructions.config.rpmTitle": "编辑配置",
-    "kbn.common.tutorials.heartbeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.heartbeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.heartbeatInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.heartbeatInstructions.install.debTextPost": "寻找 32 位软件包？请参阅[下载页面]({link})。",
-    "kbn.common.tutorials.heartbeatInstructions.install.debTextPre": "首次使用 Heartbeat？请参阅[入门指南]({link})。",
-    "kbn.common.tutorials.heartbeatInstructions.install.debTitle": "下载并安装 Heartbeat",
-    "kbn.common.tutorials.heartbeatInstructions.install.osxTextPre": "首次使用 Heartbeat？请参阅[入门指南]({link})。",
-    "kbn.common.tutorials.heartbeatInstructions.install.osxTitle": "下载并安装 Heartbeat",
-    "kbn.common.tutorials.heartbeatInstructions.install.rpmTextPre": "首次使用 Heartbeat？请参阅[入门指南]({link})。",
-    "kbn.common.tutorials.heartbeatInstructions.install.rpmTitle": "下载并安装 Heartbeat",
-    "kbn.common.tutorials.heartbeatInstructions.install.windowsTextPre": "首次使用 Heartbeat？请参阅[入门指南]({heartbeatLink})。\n 1.从[下载]({elasticLink})页面下载 Heartbeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 {directoryName} 目录重命名为 `Heartbeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符处，运行以下命令以将 Heartbeat 安装为 Windows 服务。",
-    "kbn.common.tutorials.heartbeatInstructions.install.windowsTitle": "下载并安装 Heartbeat",
-    "kbn.common.tutorials.heartbeatInstructions.start.debTextPre": "`setup` 命令加载 Kibana 索引模式。",
-    "kbn.common.tutorials.heartbeatInstructions.start.debTitle": "启动 Heartbeat",
-    "kbn.common.tutorials.heartbeatInstructions.start.osxTextPre": "`setup` 命令加载 Kibana 索引模式。",
-    "kbn.common.tutorials.heartbeatInstructions.start.osxTitle": "启动 Heartbeat",
-    "kbn.common.tutorials.heartbeatInstructions.start.rpmTextPre": "`setup` 命令加载 Kibana 索引模式。",
-    "kbn.common.tutorials.heartbeatInstructions.start.rpmTitle": "启动 Heartbeat",
-    "kbn.common.tutorials.heartbeatInstructions.start.windowsTextPre": "`setup` 命令加载 Kibana 索引模式。",
-    "kbn.common.tutorials.heartbeatInstructions.start.windowsTitle": "启动 Heartbeat",
-    "kbn.common.tutorials.heartbeatStatusCheck.buttonLabel": "检查数据",
-    "kbn.common.tutorials.heartbeatStatusCheck.errorText": "尚未从 Heartbeat 收到任何数据",
-    "kbn.common.tutorials.heartbeatStatusCheck.successText": "从 Heartbeat 成功收到数据",
-    "kbn.common.tutorials.heartbeatStatusCheck.text": "确认从 Heartbeat 收到数据",
-    "kbn.common.tutorials.heartbeatStatusCheck.title": "Heartbeat 状态",
-    "kbn.common.tutorials.logstashInstructions.install.java.osxTextPre": "按照[此处]({link})的安装说明执行操作。",
-    "kbn.common.tutorials.logstashInstructions.install.java.osxTitle": "下载并安装 Java Runtime Environment",
-    "kbn.common.tutorials.logstashInstructions.install.java.windowsTextPre": "按照[此处]({link})的安装说明执行操作。",
-    "kbn.common.tutorials.logstashInstructions.install.java.windowsTitle": "下载并安装 Java Runtime Environment",
-    "kbn.common.tutorials.logstashInstructions.install.logstash.osxTextPre": "首次使用 Logstash？ 请参阅[入门指南]({link})。",
-    "kbn.common.tutorials.logstashInstructions.install.logstash.osxTitle": "下载并安装 Logstash",
-    "kbn.common.tutorials.logstashInstructions.install.logstash.windowsTextPre": "首次使用 Logstash？ 请参阅[入门指南]({logstashLink})。\n 1. [下载]({elasticLink}) Logstash Windows zip 文件。\n 2.解压缩 zip 文件的内容。",
-    "kbn.common.tutorials.logstashInstructions.install.logstash.windowsTitle": "下载并安装 Logstash",
-    "kbn.common.tutorials.metricbeat.cloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.metricbeat.premCloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.metricbeat.premInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTitle": "编辑配置",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTitle": "编辑配置",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTitle": "编辑配置",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.metricbeatEnableInstructions.debTextPost": "在 `/etc/metricbeat/modules.d/{moduleName}.yml` 文件中修改设置。",
-    "kbn.common.tutorials.metricbeatEnableInstructions.debTitle": "启用和配置 {moduleName} 模块",
-    "kbn.common.tutorials.metricbeatEnableInstructions.osxTextPost": "在 `modules.d/{moduleName}.yml` 文件中修改设置。",
-    "kbn.common.tutorials.metricbeatEnableInstructions.osxTextPre": "从安装目录中，运行：",
-    "kbn.common.tutorials.metricbeatEnableInstructions.osxTitle": "启用和配置 {moduleName} 模块",
-    "kbn.common.tutorials.metricbeatEnableInstructions.rpmTextPost": "在 `/etc/metricbeat/modules.d/{moduleName}.yml` 文件中修改设置。",
-    "kbn.common.tutorials.metricbeatEnableInstructions.rpmTitle": "启用和配置 {moduleName} 模块",
-    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTextPost": "在 `modules.d/{moduleName}.yml` 文件中修改设置。",
-    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTextPre": "从 {path} 文件夹中，运行：",
-    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTitle": "启用和配置 {moduleName} 模块",
-    "kbn.common.tutorials.metricbeatInstructions.config.debTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.metricbeatInstructions.config.debTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.metricbeatInstructions.config.debTitle": "编辑配置",
-    "kbn.common.tutorials.metricbeatInstructions.config.osxTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.metricbeatInstructions.config.osxTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.metricbeatInstructions.config.osxTitle": "编辑配置",
-    "kbn.common.tutorials.metricbeatInstructions.config.rpmTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.metricbeatInstructions.config.rpmTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.metricbeatInstructions.config.rpmTitle": "编辑配置",
-    "kbn.common.tutorials.metricbeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.metricbeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.metricbeatInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.metricbeatInstructions.install.debTextPost": "寻找 32 位软件包？请参阅[下载页面]({link})。",
-    "kbn.common.tutorials.metricbeatInstructions.install.debTextPre": "首次使用 Metricbeat？请参阅[入门指南]({link})。",
-    "kbn.common.tutorials.metricbeatInstructions.install.debTitle": "下载并安装 Metricbeat",
-    "kbn.common.tutorials.metricbeatInstructions.install.osxTextPre": "首次使用 Metricbeat？请参阅[入门指南]({link})。",
-    "kbn.common.tutorials.metricbeatInstructions.install.osxTitle": "下载并安装 Metricbeat",
-    "kbn.common.tutorials.metricbeatInstructions.install.rpmTextPre": "首次使用 Metricbeat？请参阅[入门指南]({link})。",
-    "kbn.common.tutorials.metricbeatInstructions.install.rpmTitle": "下载并安装 Metricbeat",
-    "kbn.common.tutorials.metricbeatInstructions.install.windowsTextPost": "在 {path} 文件中修改 `output.elasticsearch` 下的设置以指向您的 Elasticsearch 安装。",
-    "kbn.common.tutorials.metricbeatInstructions.install.windowsTextPre": "首次使用 Metricbeat？请参阅[入门指南]({metricbeatLink})。\n 1.从[下载]({elasticLink})页面下载 Metricbeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 {directoryName} 目录重命名为 `Metricbeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符处，运行以下命令以将 Metricbeat 安装为 Windows 服务。",
-    "kbn.common.tutorials.metricbeatInstructions.install.windowsTitle": "下载并安装 Metricbeat",
-    "kbn.common.tutorials.metricbeatInstructions.start.debTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.metricbeatInstructions.start.debTitle": "启动 Metricbeat",
-    "kbn.common.tutorials.metricbeatInstructions.start.osxTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.metricbeatInstructions.start.osxTitle": "启动 Metricbeat",
-    "kbn.common.tutorials.metricbeatInstructions.start.rpmTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.metricbeatInstructions.start.rpmTitle": "启动 Metricbeat",
-    "kbn.common.tutorials.metricbeatInstructions.start.windowsTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.metricbeatInstructions.start.windowsTitle": "启动 Metricbeat",
-    "kbn.common.tutorials.metricbeatStatusCheck.buttonLabel": "检查数据",
-    "kbn.common.tutorials.metricbeatStatusCheck.errorText": "尚未从此模块收到任何数据",
-    "kbn.common.tutorials.metricbeatStatusCheck.successText": "从此模块成功收到数据",
-    "kbn.common.tutorials.metricbeatStatusCheck.text": "确认从 Metricbeat `{moduleName}` 模块收到数据",
-    "kbn.common.tutorials.metricbeatStatusCheck.title": "模块状态",
-    "kbn.common.tutorials.premCloudInstructions.option1.textPre": "前往 [Elastic Cloud]({link})。如果您还没有帐户，请注册。免费试用 14 天。\n\n登录至 Elastic Cloud 控制台\n\n如要创建集群，请在 Elastic Cloud 控制台中：\n 1.选择**创建部署**，然后指定**部署名称**\n 2.根据需要修改其他部署选项（或者不修改，默认值可帮助您快速入门）\n 3.单击**创建部署**\n 4.等候部署创建完成\n 5.前往新的 Cloud Kibana 实例，然后按照 Kibana 主页上的说明执行操作",
-    "kbn.common.tutorials.premCloudInstructions.option1.title": "选项 1：在 Elastic Cloud 中尝试",
-    "kbn.common.tutorials.premCloudInstructions.option2.textPre": "如果基于托管式 Elasticsearch 实例运行此 Kibana 实例，请继续手动设置。\n\n针对您的记录，分别将 **Elasticsearch** 终端节点另存为 {urlTemplate}将集群**密码**另存为 {passwordTemplate}",
-    "kbn.common.tutorials.premCloudInstructions.option2.title": "选项 2：将本地 Kibana 连接到 Cloud 实例",
-    "kbn.common.tutorials.winlogbeat.cloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.winlogbeat.premCloudInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.winlogbeat.premInstructions.gettingStarted.title": "入门",
-    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
-    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
-    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
-    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
-    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTitle": "编辑配置",
-    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTextPost": "在 {path} 文件中修改 `output.elasticsearch` 下的设置以指向您的 Elasticsearch 安装。",
-    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTextPre": "首次使用 Winlogbeat？请参阅[入门指南]({winlogbeatLink})。\n 1.从[下载]({elasticLink})页面下载 Winlogbeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 {directoryName} 目录重命名为 `Winlogbeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符处，运行以下命令以将 Winlogbeat 安装为 Windows 服务。",
-    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTitle": "下载并安装 Winlogbeat",
-    "kbn.common.tutorials.winlogbeatInstructions.start.windowsTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
-    "kbn.common.tutorials.winlogbeatInstructions.start.windowsTitle": "启动 Winlogbeat",
-    "kbn.common.tutorials.winlogbeatStatusCheck.buttonLabel": "检查数据",
-    "kbn.common.tutorials.winlogbeatStatusCheck.errorText": "尚未接收到数据",
-    "kbn.common.tutorials.winlogbeatStatusCheck.successText": "已成功接收数据",
-    "kbn.common.tutorials.winlogbeatStatusCheck.text": "确认从 Winlogbeat 收到数据",
-    "kbn.common.tutorials.winlogbeatStatusCheck.title": "模块状态",
-    "kbn.context.breadcrumb": "{indexPatternTitle}#{docId} 的上下文",
-    "kbn.context.failedToLoadAnchorDocumentDescription": "无法加载该定位点文档",
-    "kbn.context.failedToLoadAnchorDocumentErrorDescription": "无法加载定位点文档。",
-    "kbn.context.loadingDescription": "正在加载……",
-    "kbn.context.newerDocumentsDescription": "较新文档",
-    "kbn.context.noSearchableTiebreakerFieldDescription": "索引模式 {indexPatternId} 中找不到任何可搜索的平分决胜字段。请更改高级设置“{tieBreakerFields}”以包括此索引模式的有效字段。",
-    "kbn.context.olderDocumentsDescription": "较旧文档",
-    "kbn.context.reloadPageDescription.discoverLinkText": "Discover",
-    "kbn.context.reloadPageDescription.reloadOrVisitTextMessage": "请重新加载或访问",
-    "kbn.context.reloadPageDescription.selectValidAnchorDocumentTextMessage": "以选择有效地定位点文档。",
-    "kbn.context.unableToLoadAnchorDocumentDescription": "无法加载该定位点文档",
-    "kbn.context.unableToLoadDocumentDescription": "无法加载文档",
-    "kbn.dashboard.addVisualizationDescription1": "单击上述菜单栏中的 ",
-    "kbn.dashboard.addVisualizationDescription2": " 按钮，以将可视化添加到仪表板。",
-    "kbn.dashboard.addVisualizationLinkAriaLabel": "添加可视化",
-    "kbn.dashboard.addVisualizationLinkText": "添加",
-    "kbn.dashboard.badge.readOnly.text": "只读",
-    "kbn.dashboard.badge.readOnly.tooltip": "无法保存仪表板",
-    "kbn.dashboard.changeViewModeConfirmModal.cancelButtonLabel": "继续编辑",
-    "kbn.dashboard.changeViewModeConfirmModal.confirmButtonLabel": "放弃更改",
-    "kbn.dashboard.changeViewModeConfirmModal.discardChangesDescription": "放弃更改后，它们将无法恢复。",
-    "kbn.dashboard.changeViewModeConfirmModal.discardChangesTitle": "放弃对仪表板的更改？",
-    "kbn.dashboard.dashboardAppBreadcrumbsTitle": "仪表板",
-    "kbn.dashboard.dashboardBreadcrumbsTitle": "仪表板",
-    "kbn.dashboard.dashboardWasNotSavedDangerMessage": "仪表板 “{dashTitle}” 未保存。错误：{errorMessage}",
-    "kbn.dashboard.dashboardWasSavedSuccessMessage": "仪表板 “{dashTitle}” 已保存",
-    "kbn.dashboard.featureCatalogue.dashboardDescription": "显示和共享可视化和已保存搜索的集合。",
-    "kbn.dashboard.featureCatalogue.dashboardTitle": "仪表板",
-    "kbn.dashboard.fillDashboardTitle": "此仪表板是空的。让我们来填充它！",
-    "kbn.dashboard.howToStartWorkingOnNewDashboardDescription1": "单击上述菜单栏中的 ",
-    "kbn.dashboard.howToStartWorkingOnNewDashboardDescription2": " 按钮以着手处理新的仪表板。",
-    "kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkText": "编辑",
-    "kbn.dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "您可以将任何 Kibana 应用的数据视图组合到一个仪表板中，从而在一个位置查看所有内容。",
-    "kbn.dashboard.listing.createNewDashboard.createButtonLabel": "创建新的仪表板",
-    "kbn.dashboard.listing.createNewDashboard.newToKibanaDescription": "Kibana 新手？{sampleDataInstallLink}来试用一下。",
-    "kbn.dashboard.listing.createNewDashboard.sampleDataInstallLinkText": "安装一些样例数据",
-    "kbn.dashboard.listing.createNewDashboard.title": "创建您的首个仪表板",
-    "kbn.dashboard.listing.dashboardsTitle": "仪表板",
-    "kbn.dashboard.listing.noItemsMessage": "似乎您没有任何仪表板。",
-    "kbn.dashboard.listing.table.descriptionColumnName": "描述",
-    "kbn.dashboard.listing.table.entityName": "仪表板",
-    "kbn.dashboard.listing.table.entityNamePlural": "仪表板",
-    "kbn.dashboard.listing.table.titleColumnName": "标题",
-    "kbn.dashboard.panel.unableToMigratePanelDataForSixThreeZeroErrorMessage": "无法迁移用于“6.3.0”向后兼容的面板数据，面板不包含预期字段：{key}",
-    "kbn.dashboard.savedDashboard.newDashboardTitle": "新建仪表板",
-    "kbn.dashboard.savedDashboardsTitle": "仪表板",
-    "kbn.dashboard.stateManager.timeNotSavedWithDashboardErrorMessage": "时间未随此仪表板保存，因此无法同步。",
-    "kbn.dashboard.strings.dashboardEditTitle": "编辑 {title}",
-    "kbn.dashboard.strings.dashboardUnsavedEditTitle": "编辑 {title}（未保存）",
-    "kbn.dashboard.topNav.cloneModal.cancelButtonLabel": "取消",
-    "kbn.dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle": "克隆面板",
-    "kbn.dashboard.topNav.cloneModal.confirmButtonLabel": "确认克隆",
-    "kbn.dashboard.topNav.cloneModal.confirmCloneDescription": "确认克隆",
-    "kbn.dashboard.topNav.cloneModal.dashboardExistsDescription": "单击 “{confirmClone}” 以克隆具有重复标题的仪表板。",
-    "kbn.dashboard.topNav.cloneModal.dashboardExistsTitle": "具有标题 {newDashboardName} 的仪表板已存在。",
-    "kbn.dashboard.topNav.cloneModal.enterNewNameForDashboardDescription": "请为您的仪表板输入新的名称。",
-    "kbn.dashboard.topNav.options.hideAllPanelTitlesSwitchLabel": "显示面板标题",
-    "kbn.dashboard.topNav.options.useMarginsBetweenPanelsSwitchLabel": "在面板间使用边距",
-    "kbn.dashboard.topNav.saveModal.descriptionFormRowLabel": "描述",
-    "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowHelpText": "每次加载此仪表板时，这都会将时间筛选更改为当前选定的时间。",
-    "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowLabel": "将时间随仪表板保存",
-    "kbn.dashboard.topNav.showCloneModal.dashboardCopyTitle": "{title} 副本",
-    "kbn.dashboard.topNave.addButtonAriaLabel": "添加",
-    "kbn.dashboard.topNave.addConfigDescription": "将面板保存到仪表板",
-    "kbn.dashboard.topNave.cancelButtonAriaLabel": "取消",
-    "kbn.dashboard.topNave.cloneButtonAriaLabel": "克隆",
-    "kbn.dashboard.topNave.cloneConfigDescription": "创建仪表板的副本",
-    "kbn.dashboard.topNave.editButtonAriaLabel": "编辑",
-    "kbn.dashboard.topNave.editConfigDescription": "切换到编辑模式",
-    "kbn.dashboard.topNave.fullScreenButtonAriaLabel": "全屏",
-    "kbn.dashboard.topNave.fullScreenConfigDescription": "全屏模式",
-    "kbn.dashboard.topNave.optionsButtonAriaLabel": "选项",
-    "kbn.dashboard.topNave.optionsConfigDescription": "选项",
-    "kbn.dashboard.topNave.saveButtonAriaLabel": "保存",
-    "kbn.dashboard.topNave.saveConfigDescription": "保存您的仪表板",
-    "kbn.dashboard.topNave.shareButtonAriaLabel": "共享",
-    "kbn.dashboard.topNave.shareConfigDescription": "共享仪表板",
-    "kbn.dashboard.topNave.viewConfigDescription": "取消编辑并切换到仅查看模式",
-    "kbn.dashboard.urlWasRemovedInSixZeroWarningMessage": "6.0 中未移除 url“dashboard/create”。请更新您的书签。",
-    "kbn.dashboard.visitVisualizeAppLinkText": "访问 Visualize 应用",
-    "kbn.dashboardTitle": "仪表板",
-    "kbn.devToolsTitle": "开发工具",
-    "kbn.discover.backToTopLinkText": "返至顶部。",
-    "kbn.discover.badge.readOnly.text": "只读",
-    "kbn.discover.badge.readOnly.tooltip": "无法保存搜索",
-    "kbn.discover.bucketIntervalTooltip": "此时间间隔将创建{bucketsDescription}而无法在选定时间范围内显示 ，因此其已缩放至 {bucketIntervalDescription}",
-    "kbn.discover.bucketIntervalTooltip.tooLargeBucketsText": "过大的存储桶",
-    "kbn.discover.bucketIntervalTooltip.tooManyBucketsText": "过多的存储桶",
-    "kbn.discover.discoverBreadcrumbTitle": "Discover",
-    "kbn.discover.discoverDescription": "通过查询和筛选原始文档来以交互方式浏览您的数据。",
-    "kbn.discover.discoverTitle": "Discover",
-    "kbn.discover.documentsAriaLabel": "文档",
-    "kbn.discover.errorLoadingData": "加载数据时出错",
-    "kbn.discover.fetchError.howToAddressErrorDescription": "您可以通过编辑 “{scriptedFields}” 选项卡下 “{managementLink}” 中的 “{fetchErrorScript}” 字段来解决此错误。",
-    "kbn.discover.fetchError.managmentLinkText": "管理 > 索引模式",
-    "kbn.discover.fetchError.scriptedFieldsText": "“脚本字段”",
-    "kbn.discover.fieldChooser.detailViews.emptyStringText": "空字符串",
-    "kbn.discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "筛除此值",
-    "kbn.discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "筛留此值",
-    "kbn.discover.fieldChooser.detailViews.recordsText": "个记录",
-    "kbn.discover.fieldChooser.detailViews.topValuesInRecordsDescription": "排名前 5 位的值，范围：",
-    "kbn.discover.fieldChooser.detailViews.visualizeLinkText": "可视化",
-    "kbn.discover.fieldChooser.detailViews.warningsText": "{warningsLength, plural, one {# 个警告} other {# 个警告}}",
-    "kbn.discover.fieldChooser.discoverField.addButtonLabel": "添加",
-    "kbn.discover.fieldChooser.discoverField.bucketAriaLabel": "值：{value}",
-    "kbn.discover.fieldChooser.discoverField.emptyStringText": "空字符串",
-    "kbn.discover.fieldChooser.discoverField.removeButtonLabel": "移除",
-    "kbn.discover.fieldChooser.discoverField.scriptedFieldsTakeLongExecuteDescription": "脚本字段执行时间会很长。",
-    "kbn.discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage": "分析不适用于地理字段。",
-    "kbn.discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage": "分析不适用于对象字段。",
-    "kbn.discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "此字段在您的 Elasticsearch 映射中，但不在文档表中显示的 {hitsLength} 个文档中。您可能仍能够基于其进行可视化或搜索。",
-    "kbn.discover.fieldChooser.filter.aggregatableLabel": "可聚合",
-    "kbn.discover.fieldChooser.filter.availableFieldsTitle": "可用字段",
-    "kbn.discover.fieldChooser.filter.hideMissingFieldsLabel": "隐藏缺失字段",
-    "kbn.discover.fieldChooser.filter.indexAndFieldsSectionAriaLabel": "索引和字段",
-    "kbn.discover.fieldChooser.filter.popularTitle": "常用",
-    "kbn.discover.fieldChooser.filter.resetFiltersButtonLabel": "重置筛选",
-    "kbn.discover.fieldChooser.filter.searchableLabel": "可搜索",
-    "kbn.discover.fieldChooser.filter.selectedFieldsTitle": "选定字段",
-    "kbn.discover.fieldChooser.filter.typeLabel": "类型",
-    "kbn.discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel": "隐藏字段设置",
-    "kbn.discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel": "显示字段设置",
-    "kbn.discover.histogramOfFoundDocumentsAriaLabel": "已找到文档的直方图",
-    "kbn.discover.hitsPluralTitle": "{hits, plural, one {次命中} other {次命中}}",
-    "kbn.discover.howToChangeTheTimeTooltip": "要更改时间，请单击导航栏中的日历图标",
-    "kbn.discover.howToSeeOtherMatchingDocumentsDescription": "以下是匹配您的搜索的前 {sampleSize} 个文档，请优化您的搜索以查看其他文档。",
-    "kbn.discover.inspectorRequestDataTitle": "数据",
-    "kbn.discover.inspectorRequestDescription": "此请求将查询 Elasticsearch 以获取搜索的数据。",
-    "kbn.discover.localMenu.inspectTitle": "检查",
-    "kbn.discover.localMenu.localMenu.newSearchTitle": "新建",
-    "kbn.discover.localMenu.newSearchDescription": "新搜索",
-    "kbn.discover.localMenu.openInspectorForSearchDescription": "打开 Inspector 以进行搜索",
-    "kbn.discover.localMenu.openSavedSearchDescription": "打开保存的搜索",
-    "kbn.discover.localMenu.openTitle": "打开",
-    "kbn.discover.localMenu.saveSearchDescription": "保存搜索",
-    "kbn.discover.localMenu.saveTitle": "保存",
-    "kbn.discover.localMenu.shareSearchDescription": "共享搜索",
-    "kbn.discover.localMenu.shareTitle": "共享",
-    "kbn.discover.noResults.addressShardFailuresTitle": "解决分片故障",
-    "kbn.discover.noResults.expandYourTimeRangeTitle": "展开时间范围",
-    "kbn.discover.noResults.indexFailureIndexText": "索引 {failureIndex}",
-    "kbn.discover.noResults.indexFailureShardText": "{index}，分片 {failureShard}",
-    "kbn.discover.noResults.queryMayNotMatchTitle": "您正在查看的一个或多个索引包含日期字段。您的查询在当前时间范围内可能不匹配任何数据，也可能在当前选定的时间范围内没有任何数据。您可以尝试将时间范围更改为包含数据的时间范围。",
-    "kbn.discover.noResults.requiredPluginIsNotInstalledOrDisabledTitle": "基于 {unsupportedType} 索引的索引模式需要 X-Pack 的 {unsupportedType} 插件，但其未安装或已禁用",
-    "kbn.discover.noResults.searchExamples.400to499StatusCodeExampleTitle": "查找所有介于 400-499 之间的状态代码",
-    "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpExtensionExampleTitle": "查找状态代码 400-499 以及扩展名 php",
-    "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpOrHtmlExtensionExampleTitle": "查找状态代码 400-499 以及扩展名 php 或 html",
-    "kbn.discover.noResults.searchExamples.anyField200StatusCodeExampleTitle": "查找任意字段包含数字 200 的请求",
-    "kbn.discover.noResults.searchExamples.howTosearchForWebServerLogsDescription": "顶部的搜索栏采用了 Elasticsearch 对 Lucene {queryStringSyntaxLink} 的支持技术。以下是一些示例，说明如何搜索已解析成若干字段的 Web 服务器日志。",
-    "kbn.discover.noResults.searchExamples.noResultsMatchSearchCriteriaTitle": "没有任何结果匹配您的搜索条件",
-    "kbn.discover.noResults.searchExamples.queryStringSyntaxLinkText": "查询字符串语法",
-    "kbn.discover.noResults.searchExamples.refineYourQueryTitle": "优化您的查询",
-    "kbn.discover.noResults.searchExamples.statusField200StatusCodeExampleTitle": "在状态字段中查找 200",
-    "kbn.discover.noResults.shardFailuresDescription": "发生了以下分片故障：",
-    "kbn.discover.notifications.notSavedSearchTitle": "搜索 “{savedSearchTitle}” 未保存。",
-    "kbn.discover.notifications.savedSearchTitle": "搜索 “{savedSearchTitle}” 已保存",
-    "kbn.discover.painlessError.painlessScriptedFieldErrorMessage": "Painless 脚本字段 “{script}” 有错误。",
-    "kbn.discover.rootBreadcrumb": "Discover",
-    "kbn.discover.savedSearch.savedObjectName": "已保存搜索",
-    "kbn.discover.scaledToDescription": "已缩放至 {bucketIntervalDescription}",
-    "kbn.discover.searchingTitle": "正在搜索",
-    "kbn.discover.showingDefaultIndexPatternWarningDescription": "显示默认索引模式：“{loadedIndexPatternTitle}” ({loadedIndexPatternId})",
-    "kbn.discover.showingSavedIndexPatternWarningDescription": "显示保存的索引模式：“{ownIndexPatternTitle}” ({ownIndexPatternId})",
-    "kbn.discover.skipToBottomButtonLabel": "跳至底部",
-    "kbn.discover.topNav.openSearchPanel.manageSearchesButtonLabel": "管理搜索",
-    "kbn.discover.topNav.openSearchPanel.noSearchesFoundDescription": "未找到匹配的搜索。",
-    "kbn.discover.topNav.openSearchPanel.openSearchTitle": "打开搜索",
-    "kbn.discover.valueIsNotConfiguredIndexPatternIDWarningTitle": "{stateVal} 不是配置的索引模式 ID",
-    "kbn.discoverTitle": "Discover",
-    "kbn.doc.failedToExecuteQueryDescription": "无法执行查询",
-    "kbn.doc.failedToLocateDocumentDescription": "无法找到文档",
-    "kbn.doc.loadingDescription": "正在加载……",
-    "kbn.docTable.limitedSearchResultLabel": "仅限 {resultCount} 个结果。优化您的搜索。",
-    "kbn.docTable.noResultsTitle": "找不到结果",
-    "kbn.docTable.tableHeader.moveColumnLeftButtonAriaLabel": "向左移动“{columnName}”列",
-    "kbn.docTable.tableHeader.moveColumnLeftButtonTooltip": "向左移动列",
-    "kbn.docTable.tableHeader.moveColumnRightButtonAriaLabel": "向右移动“{columnName}”列",
-    "kbn.docTable.tableHeader.moveColumnRightButtonTooltip": "向右移动列",
-    "kbn.docTable.tableHeader.removeColumnButtonAriaLabel": "删除“{columnName}”列",
-    "kbn.docTable.tableHeader.removeColumnButtonTooltip": "删除列",
-    "kbn.docTable.tableHeader.sortByColumnAscendingAriaLabel": "升序排序 {columnName}",
-    "kbn.docTable.tableHeader.sortByColumnDescendingAriaLabel": "降序排序 {columnName}",
-    "kbn.docTable.tableRow.detailHeading": "已展开文档",
-    "kbn.docTable.tableRow.filterForValueButtonAriaLabel": "筛留值",
-    "kbn.docTable.tableRow.filterForValueButtonTooltip": "筛留值",
-    "kbn.docTable.tableRow.filterOutValueButtonAriaLabel": "筛除值",
-    "kbn.docTable.tableRow.filterOutValueButtonTooltip": "筛除值",
-    "kbn.docTable.tableRow.toggleRowDetailsButtonAriaLabel": "切换行详细信息",
-    "kbn.docTable.tableRow.viewSingleDocumentLinkText": "查看单个文档",
-    "kbn.docTable.tableRow.viewSurroundingDocumentsLinkText": "查看周围文档",
-    "kbn.embeddable.errorTitle": "提取数据时出错",
-    "kbn.embeddable.inspectorRequestDataTitle": "数据",
-    "kbn.embeddable.inspectorRequestDescription": "此请求将查询 Elasticsearch 以获取搜索的数据。",
-    "kbn.home.addData.addDataToKibanaDescription": "使用这些解决方案可快速将您的数据转换成预建仪表板和监测系统。",
-    "kbn.home.addData.addDataToKibanaTitle": "将数据添加到 Kibana",
-    "kbn.home.addData.apm.addApmButtonLabel": "添加 APM",
-    "kbn.home.addData.apm.nameDescription": "APM 自动从您的应用程序内收集深入全面的性能指标和错误。",
-    "kbn.home.addData.apm.nameTitle": "APM",
-    "kbn.home.addData.logging.addLogDataButtonLabel": "添加日志数据",
-    "kbn.home.addData.logging.nameDescription": "从常见的数据源采集日志，并在预配置的仪表板中轻松实现可视化。",
-    "kbn.home.addData.logging.nameTitle": "日志",
-    "kbn.home.addData.metrics.addMetricsDataButtonLabel": "添加指标数据",
-    "kbn.home.addData.metrics.nameDescription": "从您的服务器上运行的操作系统和服务收集指标。",
-    "kbn.home.addData.metrics.nameTitle": "指标",
-    "kbn.home.addData.sampleDataLink": "加载数据集和 Kibana 仪表板",
-    "kbn.home.addData.sampleDataTitle": "添加样例数据",
-    "kbn.home.addData.uploadFileLink": "导入 CSV、NDJSON 或日志文件",
-    "kbn.home.addData.uploadFileTitle": "从日志文件上传数据",
-    "kbn.home.addData.yourDataLink": "连接到您的 Elasticsearch 索引",
-    "kbn.home.addData.yourDataTitle": "使用 Elasticsearch 数据",
-    "kbn.home.breadcrumbs.addDataTitle": "添加数据",
-    "kbn.home.breadcrumbs.homeTitle": "主页",
-    "kbn.home.directories.manage.nameTitle": "管理 Elastic Stack",
-    "kbn.home.directories.notFound.description": "未找到要寻找的内容？",
-    "kbn.home.directories.notFound.viewFullButtonLabel": "查看 Kibana 插件的完整目录",
-    "kbn.home.directories.visualize.nameTitle": "可视化和浏览数据",
-    "kbn.home.directory.directoryTitle": "目录",
-    "kbn.home.directory.tabs.administrativeTitle": "管理",
-    "kbn.home.directory.tabs.allTitle": "全部",
-    "kbn.home.directory.tabs.dataTitle": "数据浏览和可视化",
-    "kbn.home.directory.tabs.otherTitle": "其他",
-    "kbn.home.exploreButtonLabel": "自己浏览",
-    "kbn.home.exploreYourDataDescription": "完成所有步骤后，您便可以随时浏览自己的数据。",
-    "kbn.home.letsStartDescription": "我们注意到在您的集群中没有任何数据。您可以试用我们的样例数据和仪表板，也可以直接使用自己的数据。",
-    "kbn.home.letsStartTitle": "开始使用",
-    "kbn.home.loadTutorials.requestFailedErrorMessage": "请求失败，状态代码：{status}",
-    "kbn.home.loadTutorials.unableToLoadErrorMessage": "无法加载教程",
-    "kbn.home.recentlyAccessed.recentlyViewedTitle": "最近查看",
-    "kbn.home.sampleDataSet.installedLabel": "{name} 已安装",
-    "kbn.home.sampleDataSet.unableToInstallErrorMessage": "无法安装样例数据集：{name}",
-    "kbn.home.sampleDataSet.unableToLoadListErrorMessage": "无法加载样例数据集列表",
-    "kbn.home.sampleDataSet.unableToUninstallErrorMessage": "无法卸载样例数据集：{name}",
-    "kbn.home.sampleDataSet.uninstalledLabel": "{name} 已卸载",
-    "kbn.home.sampleDataSetCard.addButtonAriaLabel": "添加{datasetName}",
-    "kbn.home.sampleDataSetCard.addButtonLabel": "添加数据",
-    "kbn.home.sampleDataSetCard.addingButtonAriaLabel": "正在添加 {datasetName}",
-    "kbn.home.sampleDataSetCard.addingButtonLabel": "正在添加",
-    "kbn.home.sampleDataSetCard.dashboardLinkLabel": "仪表板",
-    "kbn.home.sampleDataSetCard.default.addButtonAriaLabel": "添加{datasetName}",
-    "kbn.home.sampleDataSetCard.default.addButtonLabel": "添加数据",
-    "kbn.home.sampleDataSetCard.default.unableToVerifyErrorMessage": "无法确认数据集状态，错误：{statusMsg}",
-    "kbn.home.sampleDataSetCard.removeButtonAriaLabel": "移除 {datasetName}",
-    "kbn.home.sampleDataSetCard.removeButtonLabel": "删除",
-    "kbn.home.sampleDataSetCard.removingButtonAriaLabel": "正在移除 {datasetName}",
-    "kbn.home.sampleDataSetCard.removingButtonLabel": "正在删除",
-    "kbn.home.sampleDataSetCard.viewDataButtonAriaLabel": "查看“{datasetName}”",
-    "kbn.home.sampleDataSetCard.viewDataButtonLabel": "查看数据",
-    "kbn.home.tryButtonLabel": "试用我的样例数据",
-    "kbn.home.tutorial.addDataToKibanaTitle": "将数据添加到 Kibana",
-    "kbn.home.tutorial.card.sampleDataDescription": "开始使用这些“一键式”数据集浏览 Kibana。",
-    "kbn.home.tutorial.card.sampleDataTitle": "样例数据",
-    "kbn.home.tutorial.elasticCloudButtonLabel": "Elastic Cloud",
-    "kbn.home.tutorial.instruction.copyButtonLabel": "复制代码片段",
-    "kbn.home.tutorial.instructionSet.checkStatusButtonLabel": "检查状态",
-    "kbn.home.tutorial.instructionSet.customizeLabel": "定制您的代码片段",
-    "kbn.home.tutorial.instructionSet.noDataLabel": "未找到任何数据",
-    "kbn.home.tutorial.instructionSet.statusCheckTitle": "状态检查",
-    "kbn.home.tutorial.instructionSet.successLabel": "成功",
-    "kbn.home.tutorial.instructionSet.toggleAriaLabel": "切换命令参数可见性",
-    "kbn.home.tutorial.introduction.betaLabel": "公测版",
-    "kbn.home.tutorial.introduction.imageAltDescription": "主仪表板的截图。",
-    "kbn.home.tutorial.introduction.viewButtonLabel": "查看导出的字段",
-    "kbn.home.tutorial.noTutorialLabel": "无法找到教程 {tutorialId}",
-    "kbn.home.tutorial.savedObject.addedLabel": "{savedObjectsLength} 个已保存对象已成功添加",
-    "kbn.home.tutorial.savedObject.confirmButtonLabel": "确认覆盖",
-    "kbn.home.tutorial.savedObject.defaultButtonLabel": "加载 Kibana 对象",
-    "kbn.home.tutorial.savedObject.installLabel": "导入索引模式、可视化和预定义仪表板。",
-    "kbn.home.tutorial.savedObject.installStatusLabel": "{savedObjectsLength} 个对象中有 {overwriteErrorsLength} 个已存在。单击“确认覆盖”以导入和覆盖现有对象。对这些对象的任何更改将丢失。",
-    "kbn.home.tutorial.savedObject.loadTitle": "加载 Kibana 对象",
-    "kbn.home.tutorial.savedObject.requestFailedErrorMessage": "请求失败，错误：{message}",
-    "kbn.home.tutorial.savedObject.unableToAddErrorMessage": "{savedObjectsLength} 个 kibana 对象中有 {errorsLength} 个无法添加，错误：{errorMessage}",
-    "kbn.home.tutorial.selfManagedButtonLabel": "自管型",
-    "kbn.home.tutorial.tabs.allTitle": "全部",
-    "kbn.home.tutorial.tabs.loggingTitle": "日志",
-    "kbn.home.tutorial.tabs.metricsTitle": "指标",
-    "kbn.home.tutorial.tabs.sampleDataTitle": "样例数据",
-    "kbn.home.tutorial.unexpectedStatusCheckStateErrorDescription": "意外的状态检查状态 {statusCheckState}",
-    "kbn.home.tutorial.unhandledInstructionTypeErrorDescription": "未处理的指令类型 {visibleInstructions}",
-    "kbn.home.welcomeDescription": "您了解 Elastic Stack 的窗口",
-    "kbn.home.welcomeTitle": "欢迎使用 Kibana",
-    "kbn.management.advancedSettings.badge.readOnly.text": "只读",
-    "kbn.management.advancedSettings.badge.readOnly.tooltip": "无法保存高级设置",
-    "kbn.management.createIndexPattern.betaLabel": "公测版",
-    "kbn.management.createIndexPattern.emptyState.checkDataButton": "检查新数据",
-    "kbn.management.createIndexPattern.emptyStateHeader": "找不到任何 Elasticsearch 数据",
-    "kbn.management.createIndexPattern.emptyStateLabel.emptyStateDetail": "{needToIndex}{learnHowLink}或{getStartedLink}",
-    "kbn.management.createIndexPattern.emptyStateLabel.getStartedLink": "开始使用一些样例数据集。",
-    "kbn.management.createIndexPattern.emptyStateLabel.learnHowLink": "了解操作方法",
-    "kbn.management.createIndexPattern.emptyStateLabel.needToIndexLabel": "您需要在 Elasticsearch 中索引一些数据后，才能创建索引模式。",
-    "kbn.management.createIndexPattern.includeSystemIndicesToggleSwitchLabel": "包括系统索引",
-    "kbn.management.createIndexPattern.loadClustersFailMsg": "无法加载远程集群",
-    "kbn.management.createIndexPattern.loadIndicesFailMsg": "无法加载索引",
-    "kbn.management.createIndexPattern.loadingState.checkingLabel": "正在检查 Elasticsearch 数据",
-    "kbn.management.createIndexPattern.step.indexPattern.allowLabel": "可以在索引模式中将 {asterisk} 用作通配符。",
-    "kbn.management.createIndexPattern.step.indexPattern.disallowLabel": "不能使用空格或字符 {characterList}。",
-    "kbn.management.createIndexPattern.step.indexPatternLabel": "索引模式",
-    "kbn.management.createIndexPattern.step.indexPatternPlaceholder": "index-name-*",
-    "kbn.management.createIndexPattern.step.invalidCharactersErrorMessage": "“{indexPatternName} 不能包含空格或字符：{characterList}",
-    "kbn.management.createIndexPattern.step.loadingHeader": "正在寻找匹配的索引......",
-    "kbn.management.createIndexPattern.step.loadingLabel": "请稍候......",
-    "kbn.management.createIndexPattern.step.nextStepButton": "下一步",
-    "kbn.management.createIndexPattern.step.pagingLabel": "每页行数：{perPage}",
-    "kbn.management.createIndexPattern.step.status.matchAnyLabel.matchAnyDetail": "您的索引模式可以匹配以下 {strongIndices}中的任意一个。",
-    "kbn.management.createIndexPattern.step.status.noSystemIndicesLabel": "没有 Elasticsearch 索引匹配您的模式。",
-    "kbn.management.createIndexPattern.step.status.noSystemIndicesWithPromptLabel": "没有 Elasticsearch 索引匹配您的模式。要查看匹配的系统索引，请切换右上角的开关。",
-    "kbn.management.createIndexPattern.step.status.notMatchLabel.allIndicesLabel": "{indicesLength, plural, one {# 个索引} other {# 个索引}}",
-    "kbn.management.createIndexPattern.step.status.notMatchLabel.notMatchDetail": "输入的索引模式不匹配任何索引。可以匹配您的以下{indicesLength, plural, one {} other {任何}} {strongIndices}。",
-    "kbn.management.createIndexPattern.step.status.partialMatchLabel.partialMatchDetail": "您的索引模式不匹配任何索引，但您有 {strongIndices}{matchedIndicesLength, plural, one {看起来} other {看起来}}类似。",
-    "kbn.management.createIndexPattern.step.status.partialMatchLabel.strongIndicesLabel": "{matchedIndicesLength, plural, one {# 个索引} other {# 个索引}}",
-    "kbn.management.createIndexPattern.step.status.successLabel.strongIndicesLabel": "{indicesLength, plural, one {# 个索引} other {# 个索引}}",
-    "kbn.management.createIndexPattern.step.status.successLabel.strongSuccessLabel": "成功！",
-    "kbn.management.createIndexPattern.step.status.successLabel.successDetail": "{strongSuccess}您的索引模式匹配 {strongIndices}。",
-    "kbn.management.createIndexPattern.step.warningHeader": "已有索引模式称作“{query}”",
-    "kbn.management.createIndexPattern.stepHeader": "第 1 步（共 2 步）：定义索引模式",
-    "kbn.management.createIndexPattern.stepTime.backButton": "上一步",
-    "kbn.management.createIndexPattern.stepTime.createPatternButton": "创建索引模式",
-    "kbn.management.createIndexPattern.stepTime.creatingLabel": "正在创建索引模式……",
-    "kbn.management.createIndexPattern.stepTime.error": "错误",
-    "kbn.management.createIndexPattern.stepTime.field.loadingDropDown": "正在加载……",
-    "kbn.management.createIndexPattern.stepTime.field.noTimeFieldsLabel": "匹配此索引模式的索引不包含任何时间字段。",
-    "kbn.management.createIndexPattern.stepTime.fieldHeader": "时间筛选字段名称",
-    "kbn.management.createIndexPattern.stepTime.fieldLabel": "时间筛选将使用此字段按时间筛选您的数据。",
-    "kbn.management.createIndexPattern.stepTime.fieldWarningLabel": "您可以选择不使用时间字段，但将无法通过时间范围缩小您的数据范围。",
-    "kbn.management.createIndexPattern.stepTime.noTimeFieldOptionLabel": "我不想使用时间筛选",
-    "kbn.management.createIndexPattern.stepTime.noTimeFieldsLabel": "匹配此索引模式的索引不包含任何时间字段。",
-    "kbn.management.createIndexPattern.stepTime.options.hideButton": "隐藏高级选项",
-    "kbn.management.createIndexPattern.stepTime.options.patternHeader": "定制索引模式 ID",
-    "kbn.management.createIndexPattern.stepTime.options.patternLabel": "Kibana 将为每个索引模式提供唯一的标识符。如果不想使用此唯一 ID，请输入定制 ID。",
-    "kbn.management.createIndexPattern.stepTime.options.patternPlaceholder": "custom-index-pattern-id",
-    "kbn.management.createIndexPattern.stepTime.options.showButton": "显示高级选项",
-    "kbn.management.createIndexPattern.stepTime.patterAlreadyExists": "自定义索引模式 ID 已存在。",
-    "kbn.management.createIndexPattern.stepTime.refreshButton": "刷新",
-    "kbn.management.createIndexPattern.stepTimeHeader": "第 2 步（共 2 步）：配置设置",
-    "kbn.management.createIndexPattern.stepTimeLabel": "您已将 “{indexPattern}” 定义为 “{indexPatternName}”。现在，在我们创建之前，您可以指定一些设置。",
-    "kbn.management.createIndexPatternHeader": "创建 {indexPatternName}",
-    "kbn.management.createIndexPatternLabel": "Kibana 使用索引模式从 Elasticsearch 索引中检索数据，以实现诸如可视化等功能。",
-    "kbn.management.editIndexPattern.deleteButton": "删除",
-    "kbn.management.editIndexPattern.deleteFieldButton": "删除",
-    "kbn.management.editIndexPattern.deleteHeader": "删除索引模式？",
-    "kbn.management.editIndexPattern.detailsAria": "索引模式详细信息",
-    "kbn.management.editIndexPattern.editFieldButton": "编辑",
-    "kbn.management.editIndexPattern.fields.allLangsDropDown": "所有语言",
-    "kbn.management.editIndexPattern.fields.allTypesDropDown": "所有字段类型",
-    "kbn.management.editIndexPattern.fields.filterAria": "筛选",
-    "kbn.management.editIndexPattern.fields.filterPlaceholder": "筛选",
-    "kbn.management.editIndexPattern.fields.table.additionalInfoAriaLabel": "其他字段信息",
-    "kbn.management.editIndexPattern.fields.table.aggregatableDescription": "这些字段可用在可视化聚合中",
-    "kbn.management.editIndexPattern.fields.table.aggregatableLabel": "可聚合",
-    "kbn.management.editIndexPattern.fields.table.editDescription": "编辑",
-    "kbn.management.editIndexPattern.fields.table.editLabel": "编辑",
-    "kbn.management.editIndexPattern.fields.table.excludedDescription": "提取 _source 时从其中排除的字段",
-    "kbn.management.editIndexPattern.fields.table.excludedLabel": "已排除",
-    "kbn.management.editIndexPattern.fields.table.formatHeader": "格式",
-    "kbn.management.editIndexPattern.fields.table.isAggregatableAria": "可聚合",
-    "kbn.management.editIndexPattern.fields.table.isExcludedAria": "已排除",
-    "kbn.management.editIndexPattern.fields.table.isSearchableAria": "可搜索",
-    "kbn.management.editIndexPattern.fields.table.multiTypeAria": "多类型字段",
-    "kbn.management.editIndexPattern.fields.table.multiTypeTooltip": "此字段的类型在不同的索引中会有所不同。其不可用于许多分析功能。",
-    "kbn.management.editIndexPattern.fields.table.nameHeader": "名称",
-    "kbn.management.editIndexPattern.fields.table.primaryTimeAriaLabel": "主要时间字段",
-    "kbn.management.editIndexPattern.fields.table.primaryTimeTooltip": "此字段表示事件发生的时间。",
-    "kbn.management.editIndexPattern.fields.table.searchableDescription": "这些字段可用于筛选栏",
-    "kbn.management.editIndexPattern.fields.table.searchableHeader": "可搜索",
-    "kbn.management.editIndexPattern.fields.table.typeHeader": "类型",
-    "kbn.management.editIndexPattern.mappingConflictHeader": "映射冲突",
-    "kbn.management.editIndexPattern.mappingConflictLabel": "匹配此模式的各个索引中{conflictFieldsLength, plural, one {一个字段已} other {# 个字段已}}定义为若干类型（字符串、整数等）。您仍能够在 Kibana 的各个部分中使用这些冲突类型，但它们将无法用于需要 Kibana 知道其类型的函数。要解决此问题，需要重新索引您的数据。",
-    "kbn.management.editIndexPattern.notDateErrorMessage": "该字段是{fieldType}，不是日期。",
-    "kbn.management.editIndexPattern.refreshAria": "重新加载字段列表",
-    "kbn.management.editIndexPattern.refreshButton": "刷新",
-    "kbn.management.editIndexPattern.refreshHeader": "刷新字段列表？",
-    "kbn.management.editIndexPattern.refreshLabel": "此操作重置每个字段的常用度计数器。",
-    "kbn.management.editIndexPattern.refreshTooltip": "重新刷新字段列表",
-    "kbn.management.editIndexPattern.removeAria": "删除索引模式",
-    "kbn.management.editIndexPattern.removeTooltip": "删除索引模式",
-    "kbn.management.editIndexPattern.scripted.addFieldButton": "添加脚本字段",
-    "kbn.management.editIndexPattern.scripted.deleteField.cancelButton": "取消",
-    "kbn.management.editIndexPattern.scripted.deleteField.deleteButton": "删除",
-    "kbn.management.editIndexPattern.scripted.deleteFieldLabel": "删除脚本字段 “{fieldName}”？",
-    "kbn.management.editIndexPattern.scripted.deprecationLangHeader": "在用的弃用语言",
-    "kbn.management.editIndexPattern.scripted.deprecationLangLabel.deprecationLangDetail": "以下已弃用语言正被使用：{deprecatedLangsInUse}。Kibana 和 Elasticsearch 下一主要版本将移除对这些语言的支持。将您的脚本字段转换成 {link} 以避免问题。",
-    "kbn.management.editIndexPattern.scripted.deprecationLangLabel.painlessDescription": "Painless",
-    "kbn.management.editIndexPattern.scripted.newFieldPlaceholder": "新建脚本字段",
-    "kbn.management.editIndexPattern.scripted.noFieldLabel": "“{indexPatternTitle}” 索引模式没有称作 “{fieldName}” 的脚本字段",
-    "kbn.management.editIndexPattern.scripted.table.deleteDescription": "删除此字段",
-    "kbn.management.editIndexPattern.scripted.table.deleteHeader": "删除",
-    "kbn.management.editIndexPattern.scripted.table.editDescription": "编辑此字段",
-    "kbn.management.editIndexPattern.scripted.table.editHeader": "编辑",
-    "kbn.management.editIndexPattern.scripted.table.formatDescription": "用于该字段的格式",
-    "kbn.management.editIndexPattern.scripted.table.formatHeader": "格式",
-    "kbn.management.editIndexPattern.scripted.table.langDescription": "用于该字段的语言",
-    "kbn.management.editIndexPattern.scripted.table.langHeader": "语言",
-    "kbn.management.editIndexPattern.scripted.table.nameDescription": "字段的名称",
-    "kbn.management.editIndexPattern.scripted.table.nameHeader": "名称",
-    "kbn.management.editIndexPattern.scripted.table.scriptDescription": "字段的脚本",
-    "kbn.management.editIndexPattern.scripted.table.scriptHeader": "脚本",
-    "kbn.management.editIndexPattern.scripted.unknownModeErrorMessage": "未知 fieldSettings 模式 {mode}",
-    "kbn.management.editIndexPattern.scriptedHeader": "脚本字段",
-    "kbn.management.editIndexPattern.scriptedLabel": "可以在可视化中使用脚本字段，并在您的文档中显示它们。但是，您不能搜索脚本字段。",
-    "kbn.management.editIndexPattern.setDefaultAria": "设置为默认索引",
-    "kbn.management.editIndexPattern.setDefaultTooltip": "设置为默认索引",
-    "kbn.management.editIndexPattern.source.addButtonLabel": "添加",
-    "kbn.management.editIndexPattern.source.deleteFilter.cancelButtonLabel": "取消",
-    "kbn.management.editIndexPattern.source.deleteFilter.deleteButtonLabel": "删除",
-    "kbn.management.editIndexPattern.source.deleteSourceFilterLabel": "删除源筛选 “{value}”？",
-    "kbn.management.editIndexPattern.source.noteLabel": "请注意，多字段将错误地显示为下表中的匹配。这些筛选仅应用于原始源文档中的字段，因此实际未筛选匹配的多字段。",
-    "kbn.management.editIndexPattern.source.table.cancelAria": "取消",
-    "kbn.management.editIndexPattern.source.table.deleteAria": "删除",
-    "kbn.management.editIndexPattern.source.table.editAria": "编辑",
-    "kbn.management.editIndexPattern.source.table.filterDescription": "筛选名称",
-    "kbn.management.editIndexPattern.source.table.filterHeader": "筛选",
-    "kbn.management.editIndexPattern.source.table.matchesDescription": "用于该字段的语言",
-    "kbn.management.editIndexPattern.source.table.matchesHeader": "匹配",
-    "kbn.management.editIndexPattern.source.table.notMatchedLabel": "源筛选不匹配任何已知字段。",
-    "kbn.management.editIndexPattern.source.table.saveAria": "保存",
-    "kbn.management.editIndexPattern.sourceHeader": "源筛选",
-    "kbn.management.editIndexPattern.sourceLabel": "提取文档源时，源筛选可用于排除一个或多个字段。在 Discover 应用中查看文档时会发生此问题，表在 Dashboard 应用中显示已保存搜索的结果时也会发生此问题。每行使用单个文档的源进行生成，如果您具有含有较大或不重要字段的文档，则通过在此较低层级筛除这些字段会更好。",
-    "kbn.management.editIndexPattern.sourcePlaceholder": "源筛选，接受通配符（例如“user*”用于筛选以“user”开头的字段）",
-    "kbn.management.editIndexPattern.tabs.fieldsHeader": "字段",
-    "kbn.management.editIndexPattern.tabs.scriptedHeader": "脚本字段",
-    "kbn.management.editIndexPattern.tabs.sourceHeader": "源筛选",
-    "kbn.management.editIndexPattern.timeFilterHeader": "时间筛选字段名称：{timeFieldName}",
-    "kbn.management.editIndexPattern.timeFilterLabel.mappingAPILink": "映射 API",
-    "kbn.management.editIndexPattern.timeFilterLabel.timeFilterDetail": "此页根据 Elasticsearch 的记录列出“{indexPatternTitle}”索引中的每个字段以及字段的关联核心类型。要更改字段类型，请使用 Elasticsearch",
-    "kbn.management.editIndexPatternLiveRegionAriaLabel": "索引模式",
-    "kbn.management.indexPattern.confirmOverwriteButton": "覆盖",
-    "kbn.management.indexPattern.confirmOverwriteLabel": "确定要覆盖 “{title}”？",
-    "kbn.management.indexPattern.confirmOverwriteTitle": "覆盖“{type}”？",
-    "kbn.management.indexPattern.sectionsHeader": "索引模式",
-    "kbn.management.indexPattern.titleExistsLabel": "具有标题 “{title}” 的索引模式已存在。",
-    "kbn.management.indexPatternHeader": "索引模式",
-    "kbn.management.indexPatternLabel": "管理帮助从 Elasticsearch 检索数据的索引模式。",
-    "kbn.management.indexPatternList.createButton.betaLabel": "公测版",
-    "kbn.management.indexPatternPrompt.exampleOne": "索引单个称作 log-west-001 的数据源，以便可以快速地构建图表或查询其内容。",
-    "kbn.management.indexPatternPrompt.exampleOneTitle": "单数据源",
-    "kbn.management.indexPatternPrompt.examplesTitle": "索引模式示例",
-    "kbn.management.indexPatternPrompt.exampleThree": "具体而言，将这些日志每月存档的汇总/打包指标分组成不同的索引模式，从而可以聚合历史趋势以进行比较。",
-    "kbn.management.indexPatternPrompt.exampleThreeTitle": "定制分组",
-    "kbn.management.indexPatternPrompt.exampleTwo": "分组以 log-west* 开头的所有传入数据源，以便可以查询所有所有西海岸服务器日志。",
-    "kbn.management.indexPatternPrompt.exampleTwoTitle": "多数据源",
-    "kbn.management.indexPatternPrompt.subtitle": "索引模式允许您将异类的数据源一起装入存储桶，从而可以在 Kibana 中查询它们共享的字段。",
-    "kbn.management.indexPatternPrompt.title": "关于索引模式",
-    "kbn.management.indexPatterns.badge.readOnly.text": "只读",
-    "kbn.management.indexPatterns.badge.readOnly.tooltip": "无法保存索引模式",
-    "kbn.management.indexPatterns.createBreadcrumb": "创建索引模式",
-    "kbn.management.indexPatterns.createFieldBreadcrumb": "创建字段",
-    "kbn.management.indexPatterns.listBreadcrumb": "索引模式",
-    "kbn.management.indexPatternTable.createBtn": "创建索引模式",
-    "kbn.management.indexPatternTable.title": "索引模式",
-    "kbn.management.landing.header": "Kibana {version} 管理",
-    "kbn.management.landing.subhead": "管理您的索引、索引模式、已保存对象、Kibana 设置等等。",
-    "kbn.management.landing.text": "在左侧菜单中可找到完整工具列表",
-    "kbn.management.managementDescription": "您用于管理 Elastic Stack 的中心控制台。",
-    "kbn.management.managementLabel": "管理",
-    "kbn.management.objects.confirmModalOptions.deleteButtonLabel": "删除",
-    "kbn.management.objects.confirmModalOptions.modalDescription": "您无法恢复删除的对象",
-    "kbn.management.objects.confirmModalOptions.modalTitle": "删除已保存 Kibana 对象？",
-    "kbn.management.objects.deleteSavedObjectsConfirmModalDescription": "此操作将删除以下已保存对象：",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel": "取消",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel": "删除",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteProcessButtonLabel": "正在删除……",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.idColumnName": "ID",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName": "标题",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.typeColumnName": "类型",
-    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModalTitle": "删除已保存对象",
-    "kbn.management.objects.objectsTable.export.dangerNotification": "无法生成报告",
-    "kbn.management.objects.objectsTable.export.successNotification": "您的文件正在后台下载",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.cancelButtonLabel": "取消",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel": "全部导出",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportOptionsLabel": "选项",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel": "包括相关对象",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModalDescription": "选择要导出的类型。",
-    "kbn.management.objects.objectsTable.exportObjectsConfirmModalTitle": "导出 {filteredItemCount, plural, one{# 个对象} other {# 个对象}}",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.resolvingConflictsLoadingMessage": "正在解决冲突……",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage": "正在重试失败的对象……",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage": "确保已保存搜索已正确链接……",
-    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage": "正在保存冲突……",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteBody": "确定要覆盖 “{title}”？",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteCancelButtonText": "取消",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteOverwriteButtonText": "覆盖",
-    "kbn.management.objects.objectsTable.flyout.confirmOverwriteTitle": "覆盖“{type}”？",
-    "kbn.management.objects.objectsTable.flyout.errorCalloutTitle": "抱歉，出现了错误",
-    "kbn.management.objects.objectsTable.flyout.import.cancelButtonLabel": "取消",
-    "kbn.management.objects.objectsTable.flyout.import.confirmButtonLabel": "导入",
-    "kbn.management.objects.objectsTable.flyout.importFailedDescription": "无法导入 {failedImportCount} 个对象，共 {totalImportCount} 个。导入失败",
-    "kbn.management.objects.objectsTable.flyout.importFailedMissingReference": "{type} [id={id}] 无法找到 {refType} [id={refId}]",
-    "kbn.management.objects.objectsTable.flyout.importFailedTitle": "导入失败",
-    "kbn.management.objects.objectsTable.flyout.importFailedUnsupportedType": "{type} [id={id}] 不受支持的类型",
-    "kbn.management.objects.objectsTable.flyout.importFileErrorMessage": "无法处理该文件。",
-    "kbn.management.objects.objectsTable.flyout.importLegacyFileErrorMessage": "无法处理该文件。",
-    "kbn.management.objects.objectsTable.flyout.importPromptText": "导入",
-    "kbn.management.objects.objectsTable.flyout.importSavedObjectTitle": "导入已保存对象",
-    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "确认所有更改",
-    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完成",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulCallout.noObjectsImportedTitle": "未导入任何对象",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulDescription": "已成功导入 {importCount} 个对象。",
-    "kbn.management.objects.objectsTable.flyout.importSuccessfulTitle": "导入成功",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "创建新的索引模式",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsDescription": "以下已保存对象使用不存在的索引模式。请选择要重新关联的索引模式。必要时，您可以{indexPatternLink}。",
-    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsTitle": "索引模式冲突",
-    "kbn.management.objects.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage": "已保存对象文件格式无效，无法导入。",
-    "kbn.management.objects.objectsTable.flyout.legacyFileUsedBody": "只需使用更新的导出功能生成 NDJSON 文件，便万事俱备。",
-    "kbn.management.objects.objectsTable.flyout.legacyFileUsedTitle": "将不再支持 JSON 文件",
-    "kbn.management.objects.objectsTable.flyout.overwriteSavedObjectsLabel": "自动覆盖所有已保存对象？",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountDescription": "受影响对象数目",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountName": "计数",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdDescription": "索引模式的 ID",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdName": "ID",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新建索引模式",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "受影响对象样例",
-    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "受影响对象样例",
-    "kbn.management.objects.objectsTable.flyout.resolveImportErrorsFileErrorMessage": "无法处理该文件。",
-    "kbn.management.objects.objectsTable.flyout.selectFileToImportFormRowLabel": "请选择要导入的文件",
-    "kbn.management.objects.objectsTable.header.exportButtonLabel": "导出 {filteredCount, plural, one{# 个对象} other {# 个对象}}",
-    "kbn.management.objects.objectsTable.header.importButtonLabel": "导入",
-    "kbn.management.objects.objectsTable.header.refreshButtonLabel": "刷新",
-    "kbn.management.objects.objectsTable.header.savedObjectsTitle": "已保存对象",
-    "kbn.management.objects.objectsTable.howToDeleteSavedObjectsDescription": "从这里您可以删除已保存对象，如已保存搜索。还可以编辑已保存对象的原始数据。通常，对象只能通过其关联的应用程序进行修改；或许您应该遵循这一原则，而非使用此屏幕进行修改。",
-    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionDescription": "检查此已保存对象",
-    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionName": "检查",
-    "kbn.management.objects.objectsTable.relationships.columnActionsName": "操作",
-    "kbn.management.objects.objectsTable.relationships.columnRelationship.childAsValue": "子项",
-    "kbn.management.objects.objectsTable.relationships.columnRelationship.parentAsValue": "父项",
-    "kbn.management.objects.objectsTable.relationships.columnRelationshipName": "直接关系",
-    "kbn.management.objects.objectsTable.relationships.columnTitleDescription": "已保存对象的标题",
-    "kbn.management.objects.objectsTable.relationships.columnTitleName": "标题",
-    "kbn.management.objects.objectsTable.relationships.columnTypeDescription": "已保存对象的类型",
-    "kbn.management.objects.objectsTable.relationships.columnTypeName": "类型",
-    "kbn.management.objects.objectsTable.relationships.relationshipsTitle": "以下是与 {title} 相关的已保存对象。删除此{type}将影响其父级对象，但不会影响其子级对象。",
-    "kbn.management.objects.objectsTable.relationships.renderErrorMessage": "错误",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.childAsValue.view": "子项",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.name": "直接关系",
-    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.parentAsValue.view": "父项",
-    "kbn.management.objects.objectsTable.relationships.search.filters.type.name": "类型",
-    "kbn.management.objects.objectsTable.searchBar.unableToParseQueryErrorMessage": "无法解析查询",
-    "kbn.management.objects.objectsTable.table.columnActions.inspectActionDescription": "检查此已保存对象",
-    "kbn.management.objects.objectsTable.table.columnActions.inspectActionName": "检查",
-    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionDescription": "查看此已保存对象与其他已保存对象的关系",
-    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionName": "关系",
-    "kbn.management.objects.objectsTable.table.columnActionsName": "操作",
-    "kbn.management.objects.objectsTable.table.columnTitleDescription": "已保存对象的标题",
-    "kbn.management.objects.objectsTable.table.columnTitleName": "标题",
-    "kbn.management.objects.objectsTable.table.columnTypeDescription": "已保存对象的类型",
-    "kbn.management.objects.objectsTable.table.columnTypeName": "类型",
-    "kbn.management.objects.objectsTable.table.deleteButtonLabel": "删除",
-    "kbn.management.objects.objectsTable.table.deleteButtonTitle": "无法删除已保存对象",
-    "kbn.management.objects.objectsTable.table.exportButtonLabel": "导出",
-    "kbn.management.objects.objectsTable.table.exportPopoverButtonLabel": "导出",
-    "kbn.management.objects.objectsTable.table.typeFilterName": "类型",
-    "kbn.management.objects.objectsTable.unableFindSavedObjectsNotificationMessage": "找不到已保存对象",
-    "kbn.management.objects.parsingFieldErrorMessage": "为索引模式 “{indexName}” 解析 “{fieldName}” 时发生错误：{errorMessage}",
-    "kbn.management.objects.savedObjectsDescription": "导入、导出和管理您的已保存搜索、可视化和仪表板。",
-    "kbn.management.objects.savedObjectsSectionLabel": "已保存对象",
-    "kbn.management.objects.savedObjectsTitle": "已保存对象",
-    "kbn.management.objects.view.cancelButtonAriaLabel": "取消",
-    "kbn.management.objects.view.cancelButtonLabel": "取消",
-    "kbn.management.objects.view.deleteItemButtonLabel": "删除“{title}”",
-    "kbn.management.objects.view.editItemTitle": "编辑“{title}",
-    "kbn.management.objects.view.fieldDoesNotExistErrorMessage": "与此对象关联的字段在该索引模式中已不存在。",
-    "kbn.management.objects.view.howToFixErrorDescription": "如果您清楚此错误的含义，请修复该错误 — 否则单击上面的删除按钮。",
-    "kbn.management.objects.view.howToModifyObjectDescription": " 修改对象仅适用于高级用户。对象属性未得到验证，无效的对象可能会导致错误、数据丢失或更坏的情况发生。除非熟悉该代码的人让您来这里，否则您可能不应该来这里。",
-    "kbn.management.objects.view.howToModifyObjectTitle": "谨慎操作！",
-    "kbn.management.objects.view.indexPatternDoesNotExistErrorMessage": "与此对象关联的索引模式已不存在。",
-    "kbn.management.objects.view.saveButtonAriaLabel": "保存 { title } 对象",
-    "kbn.management.objects.view.saveButtonLabel": "保存 { title } 对象",
-    "kbn.management.objects.view.savedObjectProblemErrorMessage": "此已保存对象有问题",
-    "kbn.management.objects.view.savedSearchDoesNotExistErrorMessage": "与此对象关联的已保存搜索已不存在。",
-    "kbn.management.objects.view.viewItemButtonLabel": "查看“{title}”",
-    "kbn.management.objects.view.viewItemTitle": "查看“{title}”",
-    "kbn.management.savedObjects.editBreadcrumb": "编辑 {savedObjectType}",
-    "kbn.management.savedObjects.indexBreadcrumb": "已保存对象",
-    "kbn.management.settings.advancedSettingsDescription": "直接编辑在 Kibana 中控制行为的设置。",
-    "kbn.management.settings.advancedSettingsLabel": "高级设置",
-    "kbn.management.settings.breadcrumb": "高级设置",
-    "kbn.management.settings.callOutCautionDescription": "此处请谨慎操作，这些设置仅供高级用户使用。您在这里所做的更改可能使 Kibana 的大部分功能出现问题。这些设置有一部分可能未在文档中说明、不受支持或是实验性设置。如果字段有默认值，将字段留空会将其设置为默认值，其他配置指令可能不接受其默认值。删除定制设置会将其从 Kibana 的配置中永久删除。",
-    "kbn.management.settings.callOutCautionTitle": "注意：在这里您可能会使问题出现",
-    "kbn.management.settings.categoryNames.dashboardLabel": "仪表板",
-    "kbn.management.settings.categoryNames.discoverLabel": "Discover",
-    "kbn.management.settings.categoryNames.generalLabel": "常规",
-    "kbn.management.settings.categoryNames.notificationsLabel": "通知",
-    "kbn.management.settings.categoryNames.reportingLabel": "Reporting",
-    "kbn.management.settings.categoryNames.searchLabel": "搜索",
-    "kbn.management.settings.categoryNames.timelionLabel": "Timelion",
-    "kbn.management.settings.categoryNames.visualizationsLabel": "可视化",
-    "kbn.management.settings.categorySearchLabel": "类别",
-    "kbn.management.settings.field.cancelEditingButtonAriaLabel": "取消编辑 {ariaName}",
-    "kbn.management.settings.field.cancelEditingButtonLabel": "取消",
-    "kbn.management.settings.field.changeImageLinkAriaLabel": "更改 {ariaName}",
-    "kbn.management.settings.field.changeImageLinkText": "更改图片",
-    "kbn.management.settings.field.codeEditorSyntaxErrorMessage": "JSON 语法无效",
-    "kbn.management.settings.field.customSettingAriaLabel": "定制设置",
-    "kbn.management.settings.field.customSettingTooltip": "定制设置",
-    "kbn.management.settings.field.defaultValueText": "默认值：{value}",
-    "kbn.management.settings.field.defaultValueTypeJsonText": "默认值：{value}",
-    "kbn.management.settings.field.helpText": "此设置将由 Kibana 覆盖，无法更改。",
-    "kbn.management.settings.field.imageChangeErrorMessage": "图片无法保存",
-    "kbn.management.settings.field.offLabel": "关闭",
-    "kbn.management.settings.field.onLabel": "开启",
-    "kbn.management.settings.field.requiresPageReloadToastButtonLabel": "重新加载页面",
-    "kbn.management.settings.field.requiresPageReloadToastDescription": "请重新加载页面，以使“{settingName}”设置生效。",
-    "kbn.management.settings.field.resetFieldErrorMessage": "无法重置 {name}",
-    "kbn.management.settings.field.resetToDefaultLinkAriaLabel": "将 {ariaName} 重置为默认值",
-    "kbn.management.settings.field.resetToDefaultLinkText": "重置为默认值",
-    "kbn.management.settings.field.saveButtonAriaLabel": "保存 {ariaName}",
-    "kbn.management.settings.field.saveButtonLabel": "保存",
-    "kbn.management.settings.field.saveFieldErrorMessage": "无法保存 {name}",
-    "kbn.management.settings.form.clearNoSearchResultText": "（清除搜索）",
-    "kbn.management.settings.form.clearSearchResultText": "（清除搜索）",
-    "kbn.management.settings.form.noSearchResultText": "未找到设置{clearSearch}",
-    "kbn.management.settings.form.searchResultText": "搜索词隐藏了 {settingsCount} 个设置{clearSearch}",
-    "kbn.management.settings.pageTitle": "设置",
-    "kbn.management.settings.searchBar.unableToParseQueryErrorMessage": "无法解析查询",
-    "kbn.management.settings.searchBarAriaLabel": "搜索高级设置",
-    "kbn.management.settings.sectionLabel": "高级设置",
-    "kbn.managementTitle": "管理",
-    "kbn.server.tutorials.aerospikeMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.aerospikeMetrics.longDescription": "Metricbeat 模块 `aerospike` 从 Aerospike 提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.aerospikeMetrics.nameTitle": "Aerospike 指标",
-    "kbn.server.tutorials.aerospikeMetrics.shortDescription": "从 Aerospike 服务器提取内部指标。",
-    "kbn.server.tutorials.apacheLogs.artifacts.dashboards.linkLabel": "Apache 日志仪表板",
-    "kbn.server.tutorials.apacheLogs.longDescription": "Filebeat 模块 apache 解析 Apache HTTP 服务器创建的访问和错误日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.apacheLogs.nameTitle": "Apache 日志",
-    "kbn.server.tutorials.apacheLogs.shortDescription": "收集并解析 Apache HTTP 服务器创建的访问和错误日志。",
-    "kbn.server.tutorials.apacheMetrics.artifacts.dashboards.linkLabel": "Apache 指标仪表板",
-    "kbn.server.tutorials.apacheMetrics.longDescription": "Metricbeat 模块 `apache` 从 Apache 2 HTTP 服务器提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.apacheMetrics.nameTitle": "Apache 指标",
-    "kbn.server.tutorials.apacheMetrics.shortDescription": "从 Apache 2 HTTP 服务器提取内部指标。",
-    "kbn.server.tutorials.apm.apmAgents.statusCheck.btnLabel": "检查代理状态",
-    "kbn.server.tutorials.apm.apmAgents.statusCheck.errorMessage": "尚未从代理收到任何数据",
-    "kbn.server.tutorials.apm.apmAgents.statusCheck.successMessage": "从一个或多个代理成功接收数据",
-    "kbn.server.tutorials.apm.apmAgents.statusCheck.text": "确保您的应用程序正在运行且代理正在发送数据。",
-    "kbn.server.tutorials.apm.apmAgents.statusCheck.title": "代理状态",
-    "kbn.server.tutorials.apm.apmAgents.title": "APM 代理",
-    "kbn.server.tutorials.apm.apmServer.statusCheck.btnLabel": "检查 APM Server 状态",
-    "kbn.server.tutorials.apm.apmServer.statusCheck.errorMessage": "APM Server 仍未连接到 Elasticsearch",
-    "kbn.server.tutorials.apm.apmServer.statusCheck.successMessage": "您已正确设置 APM Server",
-    "kbn.server.tutorials.apm.apmServer.statusCheck.text": "在开始实施 APM 代理之前，确保 APM Server 正在运行。",
-    "kbn.server.tutorials.apm.apmServer.statusCheck.title": "APM Server 状态",
-    "kbn.server.tutorials.apm.apmServer.title": "APM Server",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.addAgentComment": "向已安装应用添加代理",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.addTracingMiddlewareComment": "要发送性能指标，请添加我们的跟踪中间件：",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.allowedCharactersComment": "a-z、A-Z、0-9、-、_ 以及空格",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.setCustomApmServerUrlComment": "设置定制 APM Server URL（默认值：{defaultApmServerUrl}）",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.setRequiredServiceNameComment": "设置所需的服务名称。允许使用的字符：",
-    "kbn.server.tutorials.apm.djangoClient.configure.commands.useIfApmServerRequiresTokenComment": "APM Server 需要令牌时使用",
-    "kbn.server.tutorials.apm.djangoClient.configure.textPost": "有关高级用法，请参阅[文档]({documentationLink})。",
-    "kbn.server.tutorials.apm.djangoClient.configure.textPre": "代理是在您的应用程序进程内运行的库。APM 服务是基于 `SERVICE_NAME` 以编程方式创建的。",
-    "kbn.server.tutorials.apm.djangoClient.configure.title": "配置代理",
-    "kbn.server.tutorials.apm.djangoClient.install.textPre": "将 Python 的 APM 代理安装为依赖项。",
-    "kbn.server.tutorials.apm.djangoClient.install.title": "安装 APM 代理",
-    "kbn.server.tutorials.apm.dotNetClient.configureAgent.textPost": "如果您未将 `IConfiguration` 实例传递给代理（例如非 ASP.NET Core 应用程序），       您还可以通过环境变量配置代理。\n       有关高级用法，请参阅[文档]({documentationLink})。",
-    "kbn.server.tutorials.apm.dotNetClient.configureAgent.title": "样例 appsettings.json 文件：",
-    "kbn.server.tutorials.apm.dotNetClient.configureApplication.textPost": "传递 `IConfiguration` 实例为可选操作，通过此操作，代理将通过此`IConfiguration` 实例       读取配置设置（例如，从 `appsettings.json` 文件）。",
-    "kbn.server.tutorials.apm.dotNetClient.configureApplication.textPre": "对于具有 `Elastic.Apm.NetCoreAll` 软件包的 ASP.NET Core，请在 `Startup.cs` 文件内的        `Configure` 方法中调用 `UseAllElasticApm`。",
-    "kbn.server.tutorials.apm.dotNetClient.configureApplication.title": "将代理添加到应用程序",
-    "kbn.server.tutorials.apm.dotNetClient.download.title": "下载 APM 代理",
-    "kbn.server.tutorials.apm.downloadServer.title": "下载并解压缩 APM Server",
-    "kbn.server.tutorials.apm.downloadServerRpm": "寻找 32 位软件包？请参阅[下载页面]({downloadPageLink})。",
-    "kbn.server.tutorials.apm.downloadServerTitle": "寻找 32 位软件包？请参阅[下载页面]({downloadPageLink})。",
-    "kbn.server.tutorials.apm.editConfig.textPre": "如果您正在使用 Elastic Stack 的 X-Pack 安全版本，则必须在 `apm-server.yml` 配置文件中指定凭据。",
-    "kbn.server.tutorials.apm.editConfig.title": "编辑配置",
-    "kbn.server.tutorials.apm.elasticCloudInstructions.title": "APM 代理",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.allowedCharactersComment": "a-z、A-Z、0-9、-、_ 以及空格",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.configureElasticApmComment": "或进行配置以在您的应用程序设置中使用 ELASTIC_APM",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.initializeUsingEnvironmentVariablesComment": "使用环境变量初始化",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.setCustomApmServerUrlComment": "设置定制 APM Server URL（默认值：{defaultApmServerUrl}）",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.setRequiredServiceNameComment": "设置所需的服务名称。允许使用的字符：",
-    "kbn.server.tutorials.apm.flaskClient.configure.commands.useIfApmServerRequiresTokenComment": "APM Server 需要令牌时使用",
-    "kbn.server.tutorials.apm.flaskClient.configure.textPost": "有关高级用法，请参阅[文档]({documentationLink})。",
-    "kbn.server.tutorials.apm.flaskClient.configure.textPre": "代理是在您的应用程序进程内运行的库。APM 服务是基于 `SERVICE_NAME` 以编程方式创建的。",
-    "kbn.server.tutorials.apm.flaskClient.configure.title": "配置代理",
-    "kbn.server.tutorials.apm.flaskClient.install.textPre": "将 Python 的 APM 代理安装为依赖项。",
-    "kbn.server.tutorials.apm.flaskClient.install.title": "安装 APM 代理",
-    "kbn.server.tutorials.apm.goClient.configure.commands.initializeUsingEnvironmentVariablesComment": "使用环境变量初始化：",
-    "kbn.server.tutorials.apm.goClient.configure.commands.setCustomApmServerUrlComment": "设置定制 APM Server URL（默认值：{defaultApmServerUrl}）",
-    "kbn.server.tutorials.apm.goClient.configure.commands.setServiceNameComment": "设置服务名称。允许使用的字符：# a-z、A-Z、0-9、-、_ 和空格。",
-    "kbn.server.tutorials.apm.goClient.configure.commands.usedExecutableNameComment": "如果未指定 ELASTIC_APM_SERVICE_NAME，将会使用可执行文件名称。",
-    "kbn.server.tutorials.apm.goClient.configure.commands.useIfApmRequiresTokenComment": "APM Server 需要令牌时使用",
-    "kbn.server.tutorials.apm.goClient.configure.textPost": "有关高级配置，请参阅[文档]({documentationLink})。",
-    "kbn.server.tutorials.apm.goClient.configure.textPre": "代理是在您的应用程序进程内运行的库。APM 服务将基于可执行文件名称或 `ELASTIC_APM_SERVICE_NAME` 环境变量以编程方式进行创建。",
-    "kbn.server.tutorials.apm.goClient.configure.title": "配置代理",
-    "kbn.server.tutorials.apm.goClient.install.textPre": "安装 Go 的 APM 代理软件包。",
-    "kbn.server.tutorials.apm.goClient.install.title": "安装 APM 代理",
-    "kbn.server.tutorials.apm.goClient.instrument.textPost": "有关检测 Go 源代码的详细指南，请参阅[文档]({documentationLink})。",
-    "kbn.server.tutorials.apm.goClient.instrument.textPre": "使用以下已提供检测模块之一或直接使用跟踪器 API 来检测 Go 应用程序。",
-    "kbn.server.tutorials.apm.goClient.instrument.title": "检测您的应用程序",
-    "kbn.server.tutorials.apm.introduction": "从您的应用程序内收集深入全面的性能指标和错误。",
-    "kbn.server.tutorials.apm.javaClient.download.textPre": "从 [Maven Central]({mavenCentralLink}) 下载代理 jar。**切勿**将该代理添加为您的应用程序的依赖项。",
-    "kbn.server.tutorials.apm.javaClient.download.title": "下载 APM 代理",
-    "kbn.server.tutorials.apm.javaClient.startApplication.textPost": "有关配置选项和高级用法，请参阅[文档]({documentationLink})。",
-    "kbn.server.tutorials.apm.javaClient.startApplication.textPre": "添加 `-javaagent` 标志并使用系统属性配置代理。\n\n * 设置所需的服务名称（允许使用的字符：a-z、A-Z、0-9、-、_ 和空格）\n * 设置定制 APM Server URL（默认值：{customApmServerUrl}）\n * 设置您的应用程序的基础软件包",
-    "kbn.server.tutorials.apm.javaClient.startApplication.title": "使用 javaagent 标志设置您的应用程序",
-    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setCustomApmServerUrlComment": "设置定制 APM Server URL（默认值：{defaultApmServerUrl}）",
-    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setRequiredServiceNameComment": "设置所需的服务名称（允许使用的字符：a-z、A-Z、0-9、-、_ 和空格）",
-    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setServiceVersionComment": "设置服务版本（源地图功能要求）",
-    "kbn.server.tutorials.apm.jsClient.enableRealUserMonitoring.textPre": "请参阅[文档]({documentationLink})。",
-    "kbn.server.tutorials.apm.jsClient.enableRealUserMonitoring.title": "在 APM 服务器中启用真实用户 Monitoring 支持",
-    "kbn.server.tutorials.apm.nodeClient.configure.commands.addThisToTheFileTopComment": "将其添加到您的应用中加载的第一个文件的上面",
-    "kbn.server.tutorials.apm.nodeClient.configure.commands.allowedCharactersComment": "允许使用的字符：a-z、A-Z、0-9、-、_ 和空格",
-    "kbn.server.tutorials.apm.nodeClient.configure.commands.setCustomApmServerUrlComment": "设置定制 APM Server URL（默认值：{defaultApmServerUrl}）",
-    "kbn.server.tutorials.apm.nodeClient.configure.commands.setRequiredServiceNameComment": "覆盖来自 package.json 的服务名",
-    "kbn.server.tutorials.apm.nodeClient.configure.commands.useIfApmRequiresTokenComment": "APM Server 需要令牌时使用",
-    "kbn.server.tutorials.apm.nodeClient.configure.textPost": "请参阅[文档]({documentationLink})以了解高级用法，包括如何使用 [Babel/ES 模块]({babelEsModulesLink})。",
-    "kbn.server.tutorials.apm.nodeClient.configure.textPre": "代理是在您的应用程序进程内运行的库。APM 服务是基于 `serviceName` 以编程方式创建的。此代理支持各种框架，而且还可以与您的定制堆栈配合使用。",
-    "kbn.server.tutorials.apm.nodeClient.configure.title": "配置代理",
-    "kbn.server.tutorials.apm.nodeClient.install.textPre": "将 Node.js 的 APM 代理安装为您的应用程序的依赖项。",
-    "kbn.server.tutorials.apm.nodeClient.install.title": "安装 APM 代理",
-    "kbn.server.tutorials.apm.rackClient.configure.commands.optionalComment": "可选，默认为 config/elastic_apm.yml",
-    "kbn.server.tutorials.apm.rackClient.configure.commands.requiredComment": "必填",
-    "kbn.server.tutorials.apm.rackClient.configure.textPre": "对于 Rack 或兼容的框架（例如 Sinatra），在您的应用中加入中间件，然后启动代理。",
-    "kbn.server.tutorials.apm.rackClient.configure.title": "配置代理",
-    "kbn.server.tutorials.apm.rackClient.createConfig.commands.defaultsToTheNameOfRackAppClassComment": "默认为 Rack 应用的类名称。",
-    "kbn.server.tutorials.apm.rackClient.createConfig.commands.setCustomApmServerComment": "设置定制 APM Server URL（默认值：{defaultServerUrl}）",
-    "kbn.server.tutorials.apm.rackClient.createConfig.commands.setServiceNameComment": "设置服务名称 - 允许使用的字符：a-z、A-Z、0-9、-、_ 和空格",
-    "kbn.server.tutorials.apm.rackClient.createConfig.commands.useIfApmServerRequiresTokenComment": "APM Server 需要令牌时使用",
-    "kbn.server.tutorials.apm.rackClient.createConfig.textPost": "有关配置选项和高级用法，请参阅[文档]({documentationLink})。\n\n",
-    "kbn.server.tutorials.apm.rackClient.createConfig.textPre": "创建配置文件 {configFile}：",
-    "kbn.server.tutorials.apm.rackClient.createConfig.title": "创建配置文件",
-    "kbn.server.tutorials.apm.rackClient.install.textPre": "将代理添加您的 Gemfile。",
-    "kbn.server.tutorials.apm.rackClient.install.title": "安装 APM 代理",
-    "kbn.server.tutorials.apm.railsClient.configure.textPost": "有关配置选项和高级用法，请参阅[文档]({documentationLink})。\n\n",
-    "kbn.server.tutorials.apm.railsClient.configure.textPre": "您的应用启动时，APM 自动启动。通过创建配置文件 {configFile} 来配置代理",
-    "kbn.server.tutorials.apm.railsClient.configure.title": "配置代理",
-    "kbn.server.tutorials.apm.railsClient.install.textPre": "将代理添加您的 Gemfile。",
-    "kbn.server.tutorials.apm.railsClient.install.title": "安装 APM 代理",
-    "kbn.server.tutorials.apm.specProvider.artifacts.application.label": "启动 APM",
-    "kbn.server.tutorials.apm.specProvider.artifacts.dashboards.linkLabel": "APM 仪表板",
-    "kbn.server.tutorials.apm.specProvider.longDescription": "应用程序性能 Monitoring (APM) 从您的应用程序内收集深入全面的性能指标和错误。其允许您实时监测数以千计的应用程序的性能。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.apm.specProvider.name": "APM",
-    "kbn.server.tutorials.apm.specProvider.savedObjectsInstallMsg": "APM UI 中的某些功能需要 APM 索引模式。",
-    "kbn.server.tutorials.apm.startServer.textPre": "服务器在 Elasticsearch 中处理并存储应用程序性能指标。",
-    "kbn.server.tutorials.apm.startServer.title": "启动 APM Server",
-    "kbn.server.tutorials.apm.windowsServerInstructions.textPost": "注意：如果您的系统禁用了脚本执行，则需要为当前会话设置执行策略，以允许脚本运行。例如：{command}。",
-    "kbn.server.tutorials.apm.windowsServerInstructions.textPre": "1.从[下载页面]({downloadPageLink})下载 APM Server Windows zip 文件。\n2.将 zip 文件的内容解压缩到 {zipFileExtractFolder}。\n3.将 {apmServerDirectory} 目录重命名为 `APM-Server`。\n4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n5.从 PowerShell 提示符处，运行以下命令以将 APM Server 安装为 Windows 服务：",
-    "kbn.server.tutorials.auditbeat.artifacts.dashboards.linkLabel": "SIEM App",
-    "kbn.server.tutorials.auditbeat.longDescription": "使用 Auditbeat 从主机收集审计数据。其中包括进程、用户、登录、套接字信息、文件访问等等。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.auditbeat.nameTitle": "Auditbeat",
-    "kbn.server.tutorials.auditbeat.shortDescription": "从主机收集审计数据。",
-    "kbn.server.tutorials.awsMetrics.artifacts.dashboards.linkLabel": "AWS 指标仪表板",
-    "kbn.server.tutorials.awsMetrics.longDescription": "Metricbeat 模块 `aws` 从 AWS API 和 Cloudwatch 提取监测指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.awsMetrics.nameTitle": "AWS 指标",
-    "kbn.server.tutorials.awsMetrics.shortDescription": "从 AWS API 和 Cloudwatch 提取 EC2 实例的监测指标。",
-    "kbn.server.tutorials.cephMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.cephMetrics.longDescription": "Metricbeat 模块 `ceph` 从 Ceph 提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.cephMetrics.nameTitle": "Ceph 指标",
-    "kbn.server.tutorials.cephMetrics.shortDescription": "从 Ceph 服务器提取内部指标。",
-    "kbn.server.tutorials.ciscoLogs.artifacts.dashboards.linkLabel": "SIEM App",
-    "kbn.server.tutorials.ciscoLogs.longDescription": "这是用于 Cisco 网络设备日志的模块。当前支持“asa”文件集，该文件集用于通过 Syslog 接收或从文件读取的 Cisco ASA 防火墙日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.ciscoLogs.nameTitle": "Cisco",
-    "kbn.server.tutorials.ciscoLogs.shortDescription": "收集并解析从 Cisco ASA 防火墙接收的日志。",
-    "kbn.server.tutorials.cloudwatchLogs.longDescription": "通过部署将运行为 AWS Lambda 函数         的 Functionbeat，来收集 Cloudwatch 日志。         [了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.cloudwatchLogs.nameTitle": "Cloudwatch 日志",
-    "kbn.server.tutorials.cloudwatchLogs.shortDescription": "使用 Functionbeat 收集 Cloudwatch 日志",
-    "kbn.server.tutorials.corednsLogs.artifacts.dashboards.linkLabel": "CoreDNS 日志仪表板",
-    "kbn.server.tutorials.corednsLogs.longDescription": "`coredns` Filebeat 模块从 [CoreDNS](https://coredns.io/manual/toc/) 收集日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.corednsLogs.nameTitle": "CoreDNS 日志",
-    "kbn.server.tutorials.corednsLogs.shortDescription": "收集 Coredns 创建的日志。",
-    "kbn.server.tutorials.corednsMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.corednsMetrics.longDescription": "Metricbeat 模块 `coredns` 从 CoreDNS 提取监测指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.corednsMetrics.nameTitle": "CoreDNS 指标",
-    "kbn.server.tutorials.corednsMetrics.shortDescription": "从 CoreDNS 服务器提取监测指标。",
-    "kbn.server.tutorials.couchbaseMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.couchbaseMetrics.longDescription": "Metricbeat 模块 `couchbase` 从 Couchbase 提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.couchbaseMetrics.nameTitle": "Couchbase 指标",
-    "kbn.server.tutorials.couchbaseMetrics.shortDescription": "从 Couchbase 提取内部指标。",
-    "kbn.server.tutorials.dockerMetrics.artifacts.dashboards.linkLabel": "Docker 指标仪表板",
-    "kbn.server.tutorials.dockerMetrics.longDescription": "Metricbeat 模块 `docker` 从 Docker 服务器提取指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.dockerMetrics.nameTitle": "Docker 指标",
-    "kbn.server.tutorials.dockerMetrics.shortDescription": "提取有关 Docker 容器的指标。",
-    "kbn.server.tutorials.dropwizardMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.dropwizardMetrics.longDescription": "Metricbeat 模块 `dropwizard` 从 Dropwizard Java 应用程序提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.dropwizardMetrics.nameTitle": "Dropwizard 指标",
-    "kbn.server.tutorials.dropwizardMetrics.shortDescription": "从 Dropwizard Java 应用程序提取内部指标。",
-    "kbn.server.tutorials.elasticsearchLogs.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.elasticsearchLogs.longDescription": "Filebeat 模块 `elasticsearch` 解析 Elasticsearch 创建的日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.elasticsearchLogs.nameTitle": "Elasticsearch 日志",
-    "kbn.server.tutorials.elasticsearchLogs.shortDescription": "收集并解析 Elasticsearch 创建的日志。",
-    "kbn.server.tutorials.elasticsearchMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.elasticsearchMetrics.longDescription": "Metricbeat 模块 `elasticsearch` 从 Elasticsearch 提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.elasticsearchMetrics.nameTitle": "Elasticsearch 指标",
-    "kbn.server.tutorials.elasticsearchMetrics.shortDescription": "从 Elasticsearch 提取内部指标。",
-    "kbn.server.tutorials.envoyproxyLogs.artifacts.dashboards.linkLabel": "SIEM App",
-    "kbn.server.tutorials.envoyproxyLogs.longDescription": "这是用于 [Envoy 代理访问日志](https://www.envoyproxy.io/docs/envoy/v1.10.0/configuration/access_log)的 Filebeat 模块。其在 Kubernetes 中既支持独立部署，又支持 Envoy 代理部署。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.envoyproxyLogs.nameTitle": "Envoyproxy",
-    "kbn.server.tutorials.envoyproxyLogs.shortDescription": "收集并解析从 Envoy 代理接收的日志。",
-    "kbn.server.tutorials.etcdMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.etcdMetrics.longDescription": "Metricbeat 模块 `etcd` 从 Etcd 提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.etcdMetrics.nameTitle": "Etcd 指标",
-    "kbn.server.tutorials.etcdMetrics.shortDescription": "从 Etcd 服务器提取内部指标。",
-    "kbn.server.tutorials.golangMetrics.artifacts.dashboards.linkLabel": "Golang 指标仪表板",
-    "kbn.server.tutorials.golangMetrics.longDescription": "Metricbeat 模块 `{moduleName}` 从 Golang 应用提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.golangMetrics.nameTitle": "Golang 指标",
-    "kbn.server.tutorials.golangMetrics.shortDescription": "从 Golang 应用提取内部指标。",
-    "kbn.server.tutorials.haproxyMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.haproxyMetrics.longDescription": "Metricbeat 模块 `haproxy` 从 HAProxy 提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.haproxyMetrics.nameTitle": "HAProxy 指标",
-    "kbn.server.tutorials.haproxyMetrics.shortDescription": "从 HAProxy 服务器提取内部指标。",
-    "kbn.server.tutorials.iisLogs.artifacts.dashboards.linkLabel": "IIS 日志仪表板",
-    "kbn.server.tutorials.iisLogs.longDescription": "Filebeat 模块 `iis` 解析 IIS HTTP 服务器创建的访问和错误日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.iisLogs.nameTitle": "IIS 日志",
-    "kbn.server.tutorials.iisLogs.shortDescription": "收集并解析 IIS HTTP 服务器创建的访问和错误日志。",
-    "kbn.server.tutorials.iptablesLogs.artifacts.dashboards.linkLabel": "SIEM App",
-    "kbn.server.tutorials.iptablesLogs.longDescription": "这是用于 iptables 和 ip6tables 日志的模块。其解析在网络上通过 Syslog 或从文件中接收的日志。另外，其识别某些 Ubiquiti 防火墙添加的前缀，该前缀包含规则集名称、规则编号和对流量执行的操作（允许/拒绝）。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.iptablesLogs.nameTitle": "Iptables / Ubiquiti",
-    "kbn.server.tutorials.iptablesLogs.shortDescription": "从 Ubiqiti 防火墙收集并解析 iptables 和 ip6tables 日志。",
-    "kbn.server.tutorials.kafkaLogs.artifacts.dashboards.linkLabel": "Kafka 日志仪表板",
-    "kbn.server.tutorials.kafkaLogs.longDescription": "Filebeat 模块 `kafka` 解析 Kafka 创建的日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.kafkaLogs.nameTitle": "Kafka 日志",
-    "kbn.server.tutorials.kafkaLogs.shortDescription": "收集并解析 Kafka 创建的日志。",
-    "kbn.server.tutorials.kafkaMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.kafkaMetrics.longDescription": "Metricbeat 模块 `kafka` 从 Kafka 提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.kafkaMetrics.nameTitle": "Kafka 指标",
-    "kbn.server.tutorials.kafkaMetrics.shortDescription": "从 Kafka 服务器提取内部指标。",
-    "kbn.server.tutorials.kibanaMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.kibanaMetrics.longDescription": "Metricbeat 模块 `kibana` 从 Kibana 提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.kibanaMetrics.nameTitle": "Kibana 指标",
-    "kbn.server.tutorials.kibanaMetrics.shortDescription": "从 Kibana 提取内部指标。",
-    "kbn.server.tutorials.kubernetesMetrics.artifacts.dashboards.linkLabel": "Kubernetes 指标仪表板",
-    "kbn.server.tutorials.kubernetesMetrics.longDescription": "Metricbeat 模块 `kubernetes` 从 Kubernetes API 提取指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.kubernetesMetrics.nameTitle": "Kubernetes 指标",
-    "kbn.server.tutorials.kubernetesMetrics.shortDescription": "从您的 Kubernetes 安装提取指标。",
-    "kbn.server.tutorials.logstashLogs.artifacts.dashboards.linkLabel": "Logstash 日志仪表板",
-    "kbn.server.tutorials.logstashLogs.longDescription": "Filebeat 模块 `logstash` 解析 Logstash 创建的调试和慢查询日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.logstashLogs.nameTitle": "Logstash 日志",
-    "kbn.server.tutorials.logstashLogs.shortDescription": "收集并解析 Logstash 创建的调试和慢查询日志。",
-    "kbn.server.tutorials.logstashMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.logstashMetrics.longDescription": "Metricbeat 模块 `{moduleName}` 从 Logstash 服务器提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.logstashMetrics.nameTitle": "Logstash 指标",
-    "kbn.server.tutorials.logstashMetrics.shortDescription": "从 Logstash 服务器提取内部指标。",
-    "kbn.server.tutorials.memcachedMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.memcachedMetrics.longDescription": "Metricbeat 模块 `memcached` 从 Memcached 提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.memcachedMetrics.nameTitle": "Memcached 指标",
-    "kbn.server.tutorials.memcachedMetrics.shortDescription": "从 Memcached 提取内部指标。",
-    "kbn.server.tutorials.mongodbMetrics.artifacts.dashboards.linkLabel": "MongoDB 指标仪表板",
-    "kbn.server.tutorials.mongodbMetrics.longDescription": "Metricbeat 模块 `mongodb` 从 MongoDB 服务器提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.mongodbMetrics.nameTitle": "MongoDB 指标",
-    "kbn.server.tutorials.mongodbMetrics.shortDescription": "从 MongoDB 提取内部指标。",
-    "kbn.server.tutorials.mssqlMetrics.artifacts.dashboards.linkLabel": "Microsoft SQL Server 指标仪表板",
-    "kbn.server.tutorials.mssqlMetrics.longDescription": "Metricbeat 模块 `mssql` 从 Microsoft SQL Server 提取监测、日志和性能指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.mssqlMetrics.nameTitle": "Microsoft SQL Server 指标",
-    "kbn.server.tutorials.mssqlMetrics.shortDescription": "从 Microsoft SQL Server 实例提取监测指标",
-    "kbn.server.tutorials.muninMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.muninMetrics.longDescription": "Metricbeat 模块 `munin` 从 Munin 提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.muninMetrics.nameTitle": "Munin 指标",
-    "kbn.server.tutorials.muninMetrics.shortDescription": "从 Munin 服务器提取内部指标。",
-    "kbn.server.tutorials.mysqlLogs.artifacts.dashboards.linkLabel": "MySQL 日志仪表板",
-    "kbn.server.tutorials.mysqlLogs.longDescription": "Filebeat 模块 `mysql` 解析 MySQL 创建的错误和慢查询日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.mysqlLogs.nameTitle": "MySQL 日志",
-    "kbn.server.tutorials.mysqlLogs.shortDescription": "收集并解析 MySQL 创建的错误和慢查询日志。",
-    "kbn.server.tutorials.mysqlMetrics.artifacts.dashboards.linkLabel": "MySQL 指标仪表板",
-    "kbn.server.tutorials.mysqlMetrics.longDescription": "Metricbeat 模块 `mysql` 从 MySQL 服务器提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.mysqlMetrics.nameTitle": "MySQL 指标",
-    "kbn.server.tutorials.mysqlMetrics.shortDescription": "从 MySQL 提取内部指标。",
-    "kbn.server.tutorials.natsLogs.artifacts.dashboards.linkLabel": "Nats 日志仪表板",
-    "kbn.server.tutorials.natsLogs.longDescription": "Filebeat 模块 `nats` 解析 Nats 创建的日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.natsLogs.nameTitle": "Nats 日志",
-    "kbn.server.tutorials.natsLogs.shortDescription": "收集并解析 Nats 创建的日志。",
-    "kbn.server.tutorials.natsMetrics.artifacts.dashboards.linkLabel": "Nats 指标仪表板",
-    "kbn.server.tutorials.natsMetrics.longDescription": "Metricbeat 模块 `nats` 从 Nats 提取监测指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.natsMetrics.nameTitle": "Nats 指标",
-    "kbn.server.tutorials.natsMetrics.shortDescription": "从 Nats 服务器提取监测指标。",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口，{password} 是 {elastic} 用户的密码。",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTitle": "编辑配置",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口，{password} 是 {elastic} 用户的密码。",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
-    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTitle": "编辑配置",
-    "kbn.server.tutorials.netflow.common.config.onPrem.osxTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口。",
-    "kbn.server.tutorials.netflow.common.config.onPrem.osxTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
-    "kbn.server.tutorials.netflow.common.config.onPrem.osxTitle": "编辑配置",
-    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口。",
-    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
-    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTitle": "编辑配置",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口，{esUrl} 是在 Elastic Cloud 上运行的 Elasticsearch 的 URL，{password} 是 {elastic} 用户的密码。",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTitle": "编辑配置",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口，{esUrl} 是在 Elastic Cloud 上运行的 Elasticsearch 的 URL，{password} 是 {elastic} 用户的密码。",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
-    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTitle": "编辑配置",
-    "kbn.server.tutorials.netflow.common.setup.osxTextPost": "“{setupOption}” 选项可在 Elasticsearch 中创建 {netflowPrefix} 索引模式，并导入 Kibana 仪表板和可视化。对随后的运行省略此选项可避免覆盖现有仪表板。",
-    "kbn.server.tutorials.netflow.common.setup.osxTextPre": "运行：",
-    "kbn.server.tutorials.netflow.common.setup.osxTitle": "运行 Netflow 模块",
-    "kbn.server.tutorials.netflow.common.setup.windowsTextPost": "“{setupOption}” 选项可在 Elasticsearch 中创建 {netflowPrefix} 索引模式，并导入 Kibana 仪表板和可视化。对随后的运行省略此选项可避免覆盖现有仪表板。",
-    "kbn.server.tutorials.netflow.common.setup.windowsTextPre": "运行：",
-    "kbn.server.tutorials.netflow.common.setup.windowsTitle": "运行 Netflow 模块",
-    "kbn.server.tutorials.netflow.elasticCloudInstructions.title": "入门",
-    "kbn.server.tutorials.netflow.onPremElasticCloudInstructions.title": "入门",
-    "kbn.server.tutorials.netflow.onPremInstructions.title": "入门",
-    "kbn.server.tutorials.netflow.tutorialLongDescription": "Logstash Netflow 模块收集并解析网络流量数据，在 Elasticsearch 中索引事件，并安装一套 Kibana 仪表板。此模块支持 Netflow 版本 5 和 9。[了解详情]({linkUrl})。",
-    "kbn.server.tutorials.netflow.tutorialShortDescription": "收集 Netflow 导出器发送的 Netflow 记录。",
-    "kbn.server.tutorials.nginxLogs.artifacts.dashboards.linkLabel": "Nginx 日志仪表板",
-    "kbn.server.tutorials.nginxLogs.longDescription": "Filebeat 模块 `nginx` 解析 Nginx HTTP 服务器创建的访问和错误日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.nginxLogs.nameTitle": "Nginx 日志",
-    "kbn.server.tutorials.nginxLogs.shortDescription": "收集并解析 Nginx HTTP 服务器创建的访问和错误日志。",
-    "kbn.server.tutorials.nginxMetrics.artifacts.dashboards.linkLabel": "Nginx 指标仪表板",
-    "kbn.server.tutorials.nginxMetrics.longDescription": "Metricbeat 模块 `nginx` 从 Nginx HTTP 服务器提取内部指标。该模块从 {statusModuleLink} 生成的网页收集服务器状态数据。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.nginxMetrics.nameTitle": "Nginx 指标",
-    "kbn.server.tutorials.nginxMetrics.shortDescription": "从 Nginx HTTP 服务器提取内部指标。",
-    "kbn.server.tutorials.osqueryLogs.artifacts.dashboards.linkLabel": "Osquery 日志仪表板",
-    "kbn.server.tutorials.osqueryLogs.longDescription": "Filebeat 模块 `osquery` 收集 `osqueryd` 收集的 JSON 结果日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.osqueryLogs.nameTitle": "Osquery 日志",
-    "kbn.server.tutorials.osqueryLogs.shortDescription": "收集 osqueryd 创建的结果日志。",
-    "kbn.server.tutorials.phpFpmMetrics.longDescription": "Metricbeat 模块 `php_fpm` 从 PHP-FPM 服务器提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.phpFpmMetrics.nameTitle": "PHP-FPM 指标",
-    "kbn.server.tutorials.phpFpmMetrics.shortDescription": "从 PHP-FPM 提取内部指标。",
-    "kbn.server.tutorials.postgresqlLogs.artifacts.dashboards.linkLabel": "PostgreSQL 日志仪表板",
-    "kbn.server.tutorials.postgresqlLogs.longDescription": "Filebeat 模块 `postgresql` 解析 PostgreSQL 创建的错误和慢查询日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.postgresqlLogs.nameTitle": "PostgreSQL 日志",
-    "kbn.server.tutorials.postgresqlLogs.shortDescription": "收集并解析 PostgreSQL 创建的错误和慢查询日志。",
-    "kbn.server.tutorials.postgresqlMetrics.longDescription": "Metricbeat 模块 `postgresql` 从 PostgreSQL 服务器提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.postgresqlMetrics.nameTitle": "PostgreSQL 指标",
-    "kbn.server.tutorials.postgresqlMetrics.shortDescription": "从 PostgreSQL 提取内部指标。",
-    "kbn.server.tutorials.prometheusMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.prometheusMetrics.longDescription": "Metricbeat 模块 `{moduleName}` 从 Prometheus 终端节点提取指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.prometheusMetrics.nameTitle": "Prometheus 指标",
-    "kbn.server.tutorials.prometheusMetrics.shortDescription": "从 Prometheus 导出器提取指标。",
-    "kbn.server.tutorials.rabbitmqMetrics.artifacts.dashboards.linkLabel": "RabbitMQ 指标仪表板",
-    "kbn.server.tutorials.rabbitmqMetrics.longDescription": "Metricbeat 模块 `rabbitmq` 从 RabbitMQ 服务器提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.rabbitmqMetrics.nameTitle": "RabbitMQ 指标",
-    "kbn.server.tutorials.rabbitmqMetrics.shortDescription": "从 RabbitMQ 服务器提取内部指标。",
-    "kbn.server.tutorials.redisLogs.artifacts.dashboards.linkLabel": "Redis 日志仪表板",
-    "kbn.server.tutorials.redisLogs.longDescription": "Filebeat 模块 `redis` 解析 Redis 创建的错误和慢查询日志。为了使 Redis 写入错误日志，确保 Redis 配置文件中的 `logfile` 选项设置为 `redis-server.log`。通过 `SLOWLOG` 命令可直接从 Redis 读取慢查询日志。为了使 Redis 记录慢查询日志，确保设置了 `slowlog-log-slower-than` 选项。请注意，`slowlog` 是实验性文件集。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.redisLogs.nameTitle": "Redis 日志",
-    "kbn.server.tutorials.redisLogs.shortDescription": "收集并解析 Redis 创建的错误和慢查询日志。",
-    "kbn.server.tutorials.redisMetrics.artifacts.dashboards.linkLabel": "Redis 指标仪表板",
-    "kbn.server.tutorials.redisMetrics.longDescription": "Metricbeat 模块 `redis` 从 Redis 服务器提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.redisMetrics.nameTitle": "Redis 指标",
-    "kbn.server.tutorials.redisMetrics.shortDescription": "从 Redis 提取内部指标。",
-    "kbn.server.tutorials.suricataLogs.artifacts.dashboards.linkLabel": "Suricata 日志仪表板",
-    "kbn.server.tutorials.suricataLogs.longDescription": "Filebeat 模块 `suricata` 从 [Suricata Eve JSON 输出](https://suricata.readthedocs.io/en/latest/output/eve/eve-json-format.html)收集日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.suricataLogs.nameTitle": "Suricata 日志",
-    "kbn.server.tutorials.suricataLogs.shortDescription": "收集 Suricata IDS/IPS/NSM 创建的结果日志。",
-    "kbn.server.tutorials.systemLogs.artifacts.dashboards.linkLabel": "系统日志仪表板",
-    "kbn.server.tutorials.systemLogs.longDescription": "Filebeat 模块 `system` 收集并解析常见 Unix/Linux 型分发的系统日志服务创建的日志。此模块在 Windows 上不可用。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.systemLogs.nameTitle": "系统日志",
-    "kbn.server.tutorials.systemLogs.shortDescription": "收集并解析本地 Syslog 服务器写入的日志。",
-    "kbn.server.tutorials.systemMetrics.artifacts.dashboards.linkLabel": "系统指标仪表板",
-    "kbn.server.tutorials.systemMetrics.longDescription": "Metricbeat 模块 `system` 从主机收集 CPU、内存、网络和磁盘统计信息。其收集系统范围的统计信息以及每个进程和文件系统的统计信息。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.systemMetrics.nameTitle": "系统指标",
-    "kbn.server.tutorials.systemMetrics.shortDescription": "从主机上收集 CPU、内存、网络和磁盘统计信息。",
-    "kbn.server.tutorials.traefikLogs.artifacts.dashboards.linkLabel": "Traefik 日志仪表板",
-    "kbn.server.tutorials.traefikLogs.longDescription": "Filebeat 模块 `traefik` 解析 Traefik 创建的访问日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.traefikLogs.nameTitle": "Traefik 日志",
-    "kbn.server.tutorials.traefikLogs.shortDescription": "收集和解析 Traefik 代理创建的访问日志。",
-    "kbn.server.tutorials.uptimeMonitors.artifacts.dashboards.linkLabel": "Uptime 应用",
-    "kbn.server.tutorials.uptimeMonitors.longDescription": "通过主动探测来监测服务的可用性。        通过给定 URL 列表，Heartbeat 仅仅询问：是否保持连接？         [了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.uptimeMonitors.nameTitle": "运行时间监测",
-    "kbn.server.tutorials.uptimeMonitors.shortDescription": "监测服务的可用性",
-    "kbn.server.tutorials.uwsgiMetrics.artifacts.dashboards.linkLabel": "uWSGI 指标仪表板",
-    "kbn.server.tutorials.uwsgiMetrics.longDescription": "Metricbeat 模块 `uwsgi` 从 uWSGI 服务器提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.uwsgiMetrics.nameTitle": "uWSGI 指标",
-    "kbn.server.tutorials.uwsgiMetrics.shortDescription": "从 uWSGI 服务器提取内部指标。",
-    "kbn.server.tutorials.vsphereMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.vsphereMetrics.longDescription": "Metricbeat 模块 `vsphere` 从 vSphere 集群提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.vsphereMetrics.nameTitle": "vSphere 指标",
-    "kbn.server.tutorials.vsphereMetrics.shortDescription": "从 vSphere 提取内部指标。",
-    "kbn.server.tutorials.windowsEventLogs.artifacts.application.label": "SIEM App",
-    "kbn.server.tutorials.windowsEventLogs.longDescription": "使用 Winlogbeat 从 Windows 事件日志收集日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.windowsEventLogs.nameTitle": "Windows 事件日志",
-    "kbn.server.tutorials.windowsEventLogs.shortDescription": "从 Windows 事件日志提取日志。",
-    "kbn.server.tutorials.windowsMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.windowsMetrics.longDescription": "Metricbeat 模块 `windows` 从 Windows 提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.windowsMetrics.nameTitle": "Windows 指标",
-    "kbn.server.tutorials.windowsMetrics.shortDescription": "从 Windows 提取内部指标。",
-    "kbn.server.tutorials.zeekLogs.artifacts.dashboards.linkLabel": "Zeek 日志仪表板",
-    "kbn.server.tutorials.zeekLogs.longDescription": "Filebeat 模块 `zeek` 从 [Zeek](https://www.zeek.org//documentation/index.html) 收集日志。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.zeekLogs.nameTitle": "Zeek 日志",
-    "kbn.server.tutorials.zeekLogs.shortDescription": "收集 Zeek/Bro 创建的日志。",
-    "kbn.server.tutorials.zookeeperMetrics.artifacts.application.label": "Discover",
-    "kbn.server.tutorials.zookeeperMetrics.longDescription": "Metricbeat 模块 `{moduleName}` 从 Zookeeper 服务器提取内部指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.zookeeperMetrics.nameTitle": "Zookeeper 指标",
-    "kbn.server.tutorials.zookeeperMetrics.shortDescription": "从 Zookeeper 服务器提取内部指标。",
-    "kbn.settings.advancedSettings.voiceAnnouncement.searchResultScreenReaderMessage": "您已搜索 {query}。{sectionLenght, plural, one {# 个部分} other {# 个部分}}中有 {optionLenght, plural, one {# 个选项} other {# 个选项}}",
-    "kbn.topNavMenu.openInspectorButtonLabel": "检查",
-    "kbn.topNavMenu.refreshButtonLabel": "刷新",
-    "kbn.topNavMenu.saveVisualizationButtonLabel": "保存",
-    "kbn.topNavMenu.shareVisualizationButtonLabel": "共享",
-    "kbn.visualize.badge.readOnly.text": "只读",
-    "kbn.visualize.badge.readOnly.tooltip": "无法保存可视化",
-    "kbn.visualize.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage": "必须提供 indexPattern 或 savedSearchId",
-    "kbn.visualize.disabledLabVisualizationMessage": "请在高级设置中打开实验室模式，以查看实验室可视化。",
-    "kbn.visualize.disabledLabVisualizationTitle": "{title} 为实验室可视化。",
-    "kbn.visualize.editor.createBreadcrumb": "创建",
-    "kbn.visualize.experimentalVisInfoText": "此可视化标记为“实验”。",
-    "kbn.visualize.linkedToSearch.unlinkButtonTooltip": "双击可取消与“已保存搜索”的链接",
-    "kbn.visualize.linkedToSearch.unlinkSuccessNotificationText": "取消与已保存搜索 “{searchTitle}” 的链接",
-    "kbn.visualize.linkedToSearchInfoText": "链接到“已保存搜索”",
-    "kbn.visualize.listing.breadcrumb": "可视化",
-    "kbn.visualize.listing.createNew.createButtonLabel": "新建可视化",
-    "kbn.visualize.listing.createNew.description": "可以根据您的数据创建不同的可视化。",
-    "kbn.visualize.listing.createNew.title": "创建首个可视化",
-    "kbn.visualize.listing.experimentalTitle": "实验性",
-    "kbn.visualize.listing.experimentalTooltip": "未来版本可能会更改或删除此可视化，其不受支持 SLA 的约束。",
-    "kbn.visualize.listing.noItemsMessage": "看起来您还没有任何可视化。",
-    "kbn.visualize.listing.table.entityName": "可视化",
-    "kbn.visualize.listing.table.entityNamePlural": "可视化",
-    "kbn.visualize.listing.table.listTitle": "可视化",
-    "kbn.visualize.listing.table.titleColumnName": "标题",
-    "kbn.visualize.listing.table.typeColumnName": "类型",
-    "kbn.visualize.newVisWizard.chooseSourceTitle": "选择源",
-    "kbn.visualize.newVisWizard.experimentalDescription": "这是实验性可视化。与稳定的可视化相比，其设计和实现均不够成熟，可能会随时发生更改。",
-    "kbn.visualize.newVisWizard.experimentalTitle": "实验性",
-    "kbn.visualize.newVisWizard.experimentalTooltip": "未来版本可能会更改或删除此可视化，其不受支持 SLA 的约束。",
-    "kbn.visualize.newVisWizard.filterVisTypeAriaLabel": "筛留可视化类型",
-    "kbn.visualize.newVisWizard.helpText": "通过为该可视化选择类型，来开始创建您的可视化。",
-    "kbn.visualize.newVisWizard.helpTextAriaLabel": "通过为该可视化选择类型，来开始创建您的可视化。按 Esc 键关闭此模式。按 Tab 键继续。",
-    "kbn.visualize.newVisWizard.newVisTypeTitle": "新建{visTypeName}",
-    "kbn.visualize.newVisWizard.resultsFound": "找到了 {resultCount} 个{resultCount, plural, one {类型} other {类型} }",
-    "kbn.visualize.newVisWizard.searchSelection.notFoundLabel": "未找到匹配的索引或已保存搜索。",
-    "kbn.visualize.newVisWizard.searchSelection.savedObjectType.indexPattern": "索引模式",
-    "kbn.visualize.newVisWizard.searchSelection.savedObjectType.search": "已保存搜索",
-    "kbn.visualize.newVisWizard.selectVisType": "选择可视化类型",
-    "kbn.visualize.newVisWizard.title": "新建可视化",
-    "kbn.visualize.saveDialog.saveAndAddToDashboardButtonLabel": "保存并添加到仪表板",
-    "kbn.visualize.savedObjectName": "可视化",
-    "kbn.visualize.topNavMenu.openInspectorButtonAriaLabel": "打开检查器查看可视化",
-    "kbn.visualize.topNavMenu.openInspectorDisabledButtonTooltip": "此可视化不支持任何检查器。",
-    "kbn.visualize.topNavMenu.refreshButtonAriaLabel": "刷新",
-    "kbn.visualize.topNavMenu.saveVisualization.failureNotificationText": "保存 “{visTitle}” 时出错",
-    "kbn.visualize.topNavMenu.saveVisualization.successNotificationText": "已保存“{visTitle}”",
-    "kbn.visualize.topNavMenu.saveVisualizationButtonAriaLabel": "保存可视化",
-    "kbn.visualize.topNavMenu.saveVisualizationDisabledButtonTooltip": "应用或放弃所做更改，然后保存",
-    "kbn.visualize.topNavMenu.shareVisualizationButtonAriaLabel": "共享可视化",
-    "kbn.visualize.visualizeDescription": "创建可视化并聚合存储在 Elasticsearch 索引中的数据。",
-    "kbn.visualize.visualizeListingBreadcrumbsTitle": "可视化",
-    "kbn.visualize.visualizeListingDeleteErrorTitle": "删除可视化时出错",
-    "kbn.visualize.wizard.step1Breadcrumb": "创建",
-    "kbn.visualize.wizard.step2Breadcrumb": "创建",
-    "kbn.visualizeTitle": "可视化",
-    "kbn.advancedSettings.discover.searchOnPageLoadText": "控制在 Discover 首次加载时是否执行搜索。加载已保存搜索时，此设置无效。",
-    "kbn.advancedSettings.discover.searchOnPageLoadTitle": "在页面加载时搜索",
-    "kbn.advancedSettings.visualization.heatmap.maxBucketsText": "单个数据源可以返回的最大存储桶数目。较高的数目可能对浏览器呈现性能有负面影响",
-    "kbn.advancedSettings.visualization.heatmap.maxBucketsTitle": "热图最大存储桶数",
-    "kbn.discover.localMenu.saveSaveSearchDescription": "保存您的 Discover 搜索，以便可以在可视化和仪表板中使用该搜索",
-    "kbn.discover.uninitializedRefreshButtonText": "刷新数据",
-    "kbn.discover.uninitializedText": "编写查询，添加一些筛选，或只需单击“刷新”来检索当前查询的结果。",
-    "kbn.discover.uninitializedTitle": "开始搜索",
-    "kbn.docTable.tableHeader.sortByColumnUnsortedAriaLabel": "停止按 {columnName} 排序",
-    "kbn.embeddable.search.displayName": "搜索",
-    "kbn.embeddable.visualizations.displayName": "可视化",
-    "kbn.home.addData.siem.addSiemEventsButtonLabel": "添加安全事件",
-    "kbn.home.addData.siem.nameDescription": "集中安全事件，以通过即用型可视化实现交互式调查。",
-    "kbn.home.addData.siem.nameTitle": "SIEM",
-    "kbn.home.tutorial.tabs.siemTitle": "SIEM",
-    "kbn.home.welcomeHomePageHeader": "Kibana 主页",
-    "kbn.discover.reloadSavedSearchButton": "重置搜索",
-    "kbn.server.tutorials.apm.dotNetClient.download.textPre": "将代理软件包从 [NuGet]({allNuGetPackagesLink}) 添加到 .NET 应用程序。有多个       NuGet 软件包可用于不同的用例。\n\n对于具有 Entity Framework Core 的 ASP.NET Core       应用程序，请下载 [Elastic.Apm.NetCoreAll]({netCoreAllApmPackageLink}) 软件包。此软件包将自动将每个       代理组件添加到您的应用程序。\n\n 如果您希望最大程度减少依存关系，您可以将       [Elastic.Apm.AspNetCore]({aspNetCorePackageLink}) 软件包仅用于       ASP.NET Core 监测，或将 [Elastic.Apm.EfCore]({efCorePackageLink}) 软件包仅用于 Entity Framework Core 监测。\n\n       如果仅希望将公共代理 API 用于手动检测，请使用 [Elastic.Apm]({elasticApmPackageLink}) 软件包。",
-    "kbn.server.tutorials.apm.elasticCloud.textPre": "要启用 APM Server，请前往 [Elastic Cloud 控制台](https://cloud.elastic.co/deployments?q={cloudId}) 并在部署设置中启用 APM。启用后，请刷新此页面。",
-    "kbn.advancedSettings.defaultRoute.defaultRouteText": "此设置指定打开 Kibana 时的默认路由。您可以使用此设置修改打开 Kibana 时的登陆页面。路由必须以正斜杠（“/”）开头。",
-    "kbn.advancedSettings.defaultRoute.defaultRouteTitle": "默认路由",
-    "kbn.advancedSettings.defaultRoute.defaultRouteValidationMessage": "路由必须以正斜杠（“/”）开头",
-    "kbn.context.loadButtonLabel": "加载",
-    "kbn.context.newerDocumentsAriaLabel": "较新文档数目",
-    "kbn.context.newerDocumentsWarning": "仅可以找到 {docCount} 个比定位标记新的文档。",
-    "kbn.context.newerDocumentsWarningZero": "找不到比定位标记新的文档。",
-    "kbn.context.olderDocumentsAriaLabel": "较旧文档数目",
-    "kbn.context.olderDocumentsWarning": "仅可以找到 {docCount} 个比定位标记旧的文档。",
-    "kbn.context.olderDocumentsWarningZero": "找不到比定位标记旧的文档。",
-    "kbn.discover.fieldChooser.fieldFilterFacetButtonLabel": "已筛选字段",
-    "kbn.discover.fieldChooser.indexPattern.changeLinkTooltip": "更改当前索引模式",
-    "kbn.discover.fieldChooser.indexPattern.changeLinkAriaLabel": "更改当前索引模式",
-    "kbn.discover.fieldChooser.searchPlaceHolder": "搜索字段",
-    "kbn.discover.histogram.partialData.bucketTooltipText": "选定的时间范围不包括此整个存储桶，其可能包含部分数据。",
-    "kbn.doc.failedToLocateIndexPattern": "无索引模式匹配 ID {indexPatternId}",
-    "kbn.doc.somethingWentWrongDescriptionAddon": "请确保索引存在。",
-    "kbn.management.objects.objectsTable.export.successWithMissingRefsNotification": "您的文件正在后台下载。找不到某些相关对象。有关缺失对象列表，请查看导出文件的最后一行。",
-    "kbn.management.settings.categoryNames.siemLabel": "SIEM",
-    "kbn.management.settings.field.imageTooLargeErrorMessage": "图像过大，最大大小为 {maxSizeDescription}",
-    "kbn.server.tutorials.couchdbMetrics.artifacts.dashboards.linkLabel": "CouchDB 指标仪表板",
-    "kbn.server.tutorials.couchdbMetrics.longDescription": "`couchdb` Metricbeat 模块从 CouchDB 提取监测指标。[了解详情]({learnMoreLink})。",
-    "kbn.server.tutorials.couchdbMetrics.nameTitle": "CouchDB 指标",
-    "kbn.server.tutorials.couchdbMetrics.shortDescription": "从 CouchdB 服务器提取监测指标。",
-    "kbn.visualize.listing.betaTitle": "公测版",
-    "kbn.visualize.listing.betaTooltip": "此可视化为公测版，可能会进行更改。设计和代码相对于正式发行版功能还不够成熟，将按原样提供，且不提供任何保证。公测版功能不受正式发行版功能支持 SLA 的约束",
-    "kbn.visualize.newVisWizard.betaDescription": "此可视化为公测版，可能会进行更改。设计和代码相对于正式发行版功能还不够成熟，将按原样提供，且不提供任何保证。公测版功能不受正式发行版功能支持 SLA 的约束",
-    "kbn.visualize.newVisWizard.betaTitle": "公测版",
-    "kbn.visualize.pageHeading": "{chartName} {chartType}可视化",
-    "kbn.advancedSettings.courier.batchSearchesText": "禁用时，仪表板面板将分别加载，用户离开时或更新查询时，\n           搜索请求将终止。启用时，仪表板面板将一起加载并加载所有数据，\n           搜索将不会终止。",
-    "kbn.doc.couldNotFindDocumentsDescription": "无文档匹配该 ID。",
-    "kbn.doc.somethingWentWrongDescription": "{indexName} 缺失。",
-    "kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip": "不支持以 {underscoreSign} 开头的字段名称",
-    "kbnDocViews.table.filterForFieldPresentButtonAriaLabel": "筛留存在的字段",
-    "kbnDocViews.table.filterForFieldPresentButtonTooltip": "筛留存在的字段",
-    "kbnDocViews.table.filterForValueButtonAriaLabel": "筛留值",
-    "kbnDocViews.table.filterForValueButtonTooltip": "筛留值",
-    "kbnDocViews.table.filterOutValueButtonAriaLabel": "筛除值",
-    "kbnDocViews.table.filterOutValueButtonTooltip": "筛除值",
-    "kbnDocViews.table.noCachedMappingForThisFieldTooltip": "此字段没有任何已缓存映射。从“管理”>“索引模式”页面刷新字段列表",
-    "kbnDocViews.table.tableTitle": "表",
-    "kbnDocViews.table.toggleColumnInTableButtonAriaLabel": "在表中切换列",
-    "kbnDocViews.table.toggleColumnInTableButtonTooltip": "在表中切换列",
-    "kbnDocViews.table.unableToFilterForPresenceOfMetaFieldsTooltip": "无法筛留元数据字段",
-    "kbnDocViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip": "无法筛留脚本字段",
-    "kbnDocViews.table.unindexedFieldsCanNotBeSearchedTooltip": "无法搜索未索引字段",
-    "kbnDocViews.json.codeEditorAriaLabel": "Elasticsearch 文档的只读 JSON 视图",
-    "kbnDocViews.json.jsonTitle": "JSON",
-    "kbnDocViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel": "警告",
-    "kbnDocViews.table.noCachedMappingForThisFieldAriaLabel": "警告",
-    "kbnDocViews.table.toggleFieldDetails": "切换字段详细信息",
-    "kbnVislibVisTypes.area.areaDescription": "突出折线图下方的数量",
-    "kbnVislibVisTypes.area.areaTitle": "面积图",
-    "kbnVislibVisTypes.area.groupTitle": "拆分序列",
-    "kbnVislibVisTypes.area.metricsTitle": "Y 轴",
-    "kbnVislibVisTypes.area.radiusTitle": "点大小",
-    "kbnVislibVisTypes.area.segmentTitle": "X 轴",
-    "kbnVislibVisTypes.area.splitTitle": "拆分图表",
-    "kbnVislibVisTypes.controls.gaugeOptions.alignmentLabel": "对齐方式",
-    "kbnVislibVisTypes.controls.gaugeOptions.displayWarningsLabel": "显示警告",
-    "kbnVislibVisTypes.controls.gaugeOptions.rangesTitle": "范围",
-    "kbnVislibVisTypes.controls.gaugeOptions.styleTitle": "样式",
-    "kbnVislibVisTypes.controls.heatmapOptions.colorLabel": "颜色",
-    "kbnVislibVisTypes.controls.heatmapOptions.colorsNumberLabel": "颜色个数",
-    "kbnVislibVisTypes.controls.heatmapOptions.overwriteAutomaticColorLabel": "覆盖自动配色",
-    "kbnVislibVisTypes.controls.heatmapOptions.rotateLabel": "旋转",
-    "kbnVislibVisTypes.controls.heatmapOptions.showLabelsTitle": "显示标签",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.filterLabelsLabel": "筛选标签",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.labelsTitle": "标签",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.positionLabel": "位置",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.showLabel": "显示",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.showLabelsLabel": "显示标签",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.xAxisTitle": "X 轴",
-    "kbnVislibVisTypes.controls.pointSeries.gridAxis.dontShowLabel": "不显示",
-    "kbnVislibVisTypes.controls.pointSeries.gridAxis.gridText": "网格",
-    "kbnVislibVisTypes.controls.pointSeries.gridAxis.xAxisLinesLabel": "显示 X 轴线",
-    "kbnVislibVisTypes.controls.pointSeries.gridAxis.yAxisLinesLabel": "Y 轴线",
-    "kbnVislibVisTypes.controls.pointSeries.series.chartTypeLabel": "图表类型",
-    "kbnVislibVisTypes.controls.pointSeries.series.lineModeLabel": "线条模式",
-    "kbnVislibVisTypes.controls.pointSeries.series.lineWidthLabel": "线条宽度",
-    "kbnVislibVisTypes.controls.pointSeries.series.metricsTitle": "指标",
-    "kbnVislibVisTypes.controls.pointSeries.series.modeLabel": "模式",
-    "kbnVislibVisTypes.controls.pointSeries.series.newAxisLabel": "新建轴…...",
-    "kbnVislibVisTypes.controls.pointSeries.series.showLineLabel": "显示为线条",
-    "kbnVislibVisTypes.controls.pointSeries.series.valueAxisLabel": "值轴",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.maxLabel": "最大值",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minLabel": "最小值",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minNeededScaleText": "如果选择了对数刻度，最小值必须大于 0。",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.modeLabel": "模式",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.positionLabel": "位置",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBoundsLabel": "缩放到数据边界",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleTypeLabel": "缩放类型",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.setAxisExtentsLabel": "设置轴范围",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.showLabel": "显示",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.titleLabel": "标题",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.yAxisTitle": "Y 轴",
-    "kbnVislibVisTypes.editors.pie.donutLabel": "圆环图",
-    "kbnVislibVisTypes.editors.pointSeries.currentTimeMarkerLabel": "当前时间标记",
-    "kbnVislibVisTypes.editors.pointSeries.orderBucketsBySumLabel": "按总计值排序存储桶",
-    "kbnVislibVisTypes.editors.pointSeries.settingsTitle": "设置",
-    "kbnVislibVisTypes.functions.pie.help": "饼图可视化",
-    "kbnVislibVisTypes.functions.vislib.help": "Vislib 可视化",
-    "kbnVislibVisTypes.gauge.alignmentAutomaticTitle": "自动",
-    "kbnVislibVisTypes.gauge.alignmentHorizontalTitle": "水平",
-    "kbnVislibVisTypes.gauge.alignmentVerticalTitle": "垂直",
-    "kbnVislibVisTypes.gauge.gaugeDescription": "仪表盘图指示指标的状态。用于显示指标值与参考阈值的相关程度。",
-    "kbnVislibVisTypes.gauge.gaugeTitle": "仪表盘图",
-    "kbnVislibVisTypes.gauge.groupTitle": "拆分组",
-    "kbnVislibVisTypes.gauge.metricTitle": "指标",
-    "kbnVislibVisTypes.goal.goalDescription": "目标图指示与最终目标的接近程度。",
-    "kbnVislibVisTypes.goal.goalTitle": "目标图",
-    "kbnVislibVisTypes.goal.groupTitle": "拆分组",
-    "kbnVislibVisTypes.goal.metricTitle": "指标",
-    "kbnVislibVisTypes.heatmap.groupTitle": "Y 轴",
-    "kbnVislibVisTypes.heatmap.heatmapDescription": "为矩阵中的单元格添加阴影",
-    "kbnVislibVisTypes.heatmap.heatmapTitle": "热力图",
-    "kbnVislibVisTypes.heatmap.metricTitle": "值",
-    "kbnVislibVisTypes.heatmap.segmentTitle": "X 轴",
-    "kbnVislibVisTypes.heatmap.splitTitle": "拆分图表",
-    "kbnVislibVisTypes.histogram.groupTitle": "拆分序列",
-    "kbnVislibVisTypes.histogram.histogramDescription": "向每个轴赋予连续变量",
-    "kbnVislibVisTypes.histogram.histogramTitle": "垂直条形图",
-    "kbnVislibVisTypes.histogram.metricTitle": "Y 轴",
-    "kbnVislibVisTypes.histogram.radiusTitle": "点大小",
-    "kbnVislibVisTypes.histogram.segmentTitle": "X 轴",
-    "kbnVislibVisTypes.histogram.splitTitle": "拆分图表",
-    "kbnVislibVisTypes.horizontalBar.groupTitle": "拆分序列",
-    "kbnVislibVisTypes.horizontalBar.horizontalBarDescription": "向每个轴赋予连续变量",
-    "kbnVislibVisTypes.horizontalBar.horizontalBarTitle": "水平条形图",
-    "kbnVislibVisTypes.horizontalBar.metricTitle": "Y 轴",
-    "kbnVislibVisTypes.horizontalBar.radiusTitle": "点大小",
-    "kbnVislibVisTypes.horizontalBar.segmentTitle": "X 轴",
-    "kbnVislibVisTypes.horizontalBar.splitTitle": "拆分图表",
-    "kbnVislibVisTypes.line.groupTitle": "拆分序列",
-    "kbnVislibVisTypes.line.lineDescription": "突出趋势",
-    "kbnVislibVisTypes.line.lineTitle": "折线图",
-    "kbnVislibVisTypes.line.metricTitle": "Y 轴",
-    "kbnVislibVisTypes.line.radiusTitle": "点大小",
-    "kbnVislibVisTypes.line.segmentTitle": "X 轴",
-    "kbnVislibVisTypes.line.splitTitle": "拆分图表",
-    "kbnVislibVisTypes.pie.metricTitle": "切片大小",
-    "kbnVislibVisTypes.pie.pieDescription": "比较整体的各个部分",
-    "kbnVislibVisTypes.pie.pieTitle": "饼图",
-    "kbnVislibVisTypes.pie.segmentTitle": "拆分切片",
-    "kbnVislibVisTypes.pie.splitTitle": "拆分图表",
-    "kbnVislibVisTypes.controls.gaugeOptions.extendRangeTooltip": "将数据范围扩展到最大值。",
-    "kbnVislibVisTypes.controls.gaugeOptions.labelsTitle": "标签",
-    "kbnVislibVisTypes.controls.gaugeOptions.switchWarningsTooltip": "打开/关闭警告。打开时，如果标签没有全部显示，则显示警告。",
-    "kbnVislibVisTypes.controls.pointSeries.gridAxis.yAxisLinesDisabledTooltip": "直方图的 X 轴线无法显示。",
-    "kbnVislibVisTypes.controls.rangeErrorMessage": "值必须是在 {min} 到 {max} 的范围内",
-    "kbnVislibVisTypes.controls.truncateLabel": "截断",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.valueLabel": "阈值",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.widthLabel": "线条宽度",
-    "kbnVislibVisTypes.gauge.gaugeTypes.arcText": "弧形",
-    "kbnVislibVisTypes.gauge.gaugeTypes.circleText": "圆形",
-    "kbnVislibVisTypes.legendPositions.bottomText": "下",
-    "kbnVislibVisTypes.legendPositions.leftText": "左",
-    "kbnVislibVisTypes.legendPositions.rightText": "右",
-    "kbnVislibVisTypes.legendPositions.topText": "上",
-    "kbnVislibVisTypes.controls.gaugeOptions.autoExtendRangeLabel": "自动扩展范围",
-    "kbnVislibVisTypes.controls.gaugeOptions.gaugeTypeLabel": "仪表类型",
-    "kbnVislibVisTypes.controls.gaugeOptions.percentageModeLabel": "百分比模式",
-    "kbnVislibVisTypes.controls.gaugeOptions.showLabelsLabel": "显示标签",
-    "kbnVislibVisTypes.controls.gaugeOptions.showLegendLabel": "显示图例",
-    "kbnVislibVisTypes.controls.gaugeOptions.showScaleLabel": "显示比例",
-    "kbnVislibVisTypes.controls.gaugeOptions.subTextLabel": "子标签",
-    "kbnVislibVisTypes.controls.vislibBasicOptions.legendPositionLabel": "图例位置",
-    "kbnVislibVisTypes.controls.vislibBasicOptions.showTooltipLabel": "显示工具提示",
-    "kbnVislibVisTypes.editors.pie.labelsSettingsTitle": "标签设置",
-    "kbnVislibVisTypes.editors.pie.pieSettingsTitle": "饼图设置",
-    "kbnVislibVisTypes.editors.pie.showLabelsLabel": "显示标签",
-    "kbnVislibVisTypes.editors.pie.showTopLevelOnlyLabel": "仅显示顶级",
-    "kbnVislibVisTypes.editors.pie.showValuesLabel": "显示值",
-    "kbnVislibVisTypes.area.countText": "计数",
-    "kbnVislibVisTypes.area.tabs.metricsAxesTitle": "指标和轴",
-    "kbnVislibVisTypes.area.tabs.panelSettingsTitle": "面板设置",
-    "kbnVislibVisTypes.axisModes.normalText": "正常",
-    "kbnVislibVisTypes.axisModes.percentageText": "百分比",
-    "kbnVislibVisTypes.axisModes.silhouetteText": "剪影",
-    "kbnVislibVisTypes.axisModes.wiggleText": "扭动",
-    "kbnVislibVisTypes.categoryAxis.rotate.angledText": "带角度",
-    "kbnVislibVisTypes.categoryAxis.rotate.horizontalText": "水平",
-    "kbnVislibVisTypes.categoryAxis.rotate.verticalText": "垂直",
-    "kbnVislibVisTypes.chartModes.normalText": "正常",
-    "kbnVislibVisTypes.chartModes.stackedText": "堆叠",
-    "kbnVislibVisTypes.chartTypes.areaText": "面积图",
-    "kbnVislibVisTypes.chartTypes.barText": "条形图",
-    "kbnVislibVisTypes.chartTypes.lineText": "折线图",
-    "kbnVislibVisTypes.controls.colorRanges.errorText": "每个范围应大于前一范围。",
-    "kbnVislibVisTypes.controls.colorSchema.colorSchemaLabel": "颜色模式",
-    "kbnVislibVisTypes.controls.colorSchema.howToChangeColorsDescription": "可以更改图例中的各个颜色。",
-    "kbnVislibVisTypes.controls.colorSchema.resetColorsButtonLabel": "重置颜色",
-    "kbnVislibVisTypes.controls.colorSchema.reverseColorSchemaLabel": "反转模式",
-    "kbnVislibVisTypes.controls.heatmapOptions.labelsTitle": "标签",
-    "kbnVislibVisTypes.controls.heatmapOptions.useCustomRangesLabel": "使用定制范围",
-    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.alignLabel": "对齐",
-    "kbnVislibVisTypes.controls.pointSeries.series.showDotsLabel": "显示点线",
-    "kbnVislibVisTypes.controls.pointSeries.seriesAccordionAriaLabel": "切换 {agg} 选项",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.addButtonTooltip": "添加 Y 轴",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.customExtentsLabel": "定制范围",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minErrorMessage": "最小值应小于最大值。",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.removeButtonTooltip": "移除 Y 轴",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.toggleCustomExtendsAriaLabel": "切换定制范围",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.toggleOptionsAriaLabel": "切换 {axisName} 选项",
-    "kbnVislibVisTypes.editors.heatmap.highlightLabelTooltip": "高亮显示图表中鼠标悬停的范围以及图例中对应的标签。",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.colorLabel": "线条颜色",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.showLabel": "显示阈值线条",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.styleLabel": "线条样式",
-    "kbnVislibVisTypes.editors.pointSeries.thresholdLineSettingsTitle": "阈值线条",
-    "kbnVislibVisTypes.interpolationModes.smoothedText": "平滑",
-    "kbnVislibVisTypes.interpolationModes.steppedText": "渐变",
-    "kbnVislibVisTypes.interpolationModes.straightText": "直线",
-    "kbnVislibVisTypes.scaleTypes.linearText": "线性",
-    "kbnVislibVisTypes.scaleTypes.logText": "对数",
-    "kbnVislibVisTypes.scaleTypes.squareRootText": "平方根",
-    "kbnVislibVisTypes.thresholdLine.style.dashedText": "虚线",
-    "kbnVislibVisTypes.thresholdLine.style.dotdashedText": "点虚线",
-    "kbnVislibVisTypes.thresholdLine.style.fullText": "实线",
-    "kbnVislibVisTypes.controls.heatmapOptions.colorScaleLabel": "色阶",
-    "kbnVislibVisTypes.controls.heatmapOptions.percentageModeLabel": "百分比模式",
-    "kbnVislibVisTypes.controls.heatmapOptions.scaleToDataBoundsLabel": "缩放到数据边界",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBounds.boundsMargin": "边界边距",
-    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBounds.minNeededBoundsMargin": "边界边距必须大于或等于 0。",
-    "kbnVislibVisTypes.editors.heatmap.basicSettingsTitle": "基本设置",
-    "kbnVislibVisTypes.editors.heatmap.heatmapSettingsTitle": "热图设置",
-    "kbnVislibVisTypes.editors.heatmap.highlightLabel": "高亮范围",
-    "visTypeMetric.colorModes.backgroundOptionLabel": "背景",
-    "visTypeMetric.colorModes.labelsOptionLabel": "标签",
-    "visTypeMetric.colorModes.noneOptionLabel": "无",
-    "visTypeMetric.function.help": "指标可视化",
-    "visTypeMetric.metricDescription": "将计算结果显示为单个数字",
-    "visTypeMetric.metricTitle": "指标",
-    "visTypeMetric.params.rangesTitle": "范围",
-    "visTypeMetric.params.style.styleTitle": "样式",
-    "visTypeMetric.schemas.metricTitle": "指标",
-    "visTypeMetric.schemas.splitGroupTitle": "拆分组",
-    "visTypeMetric.function.bgFill.help": "将颜色表示为 html 十六进制代码 (#123456)、html 颜色（red、blue）或 rgba 值 (rgba(255,255,255,1))。",
-    "visTypeMetric.function.bucket.help": "存储桶维度配置",
-    "visTypeMetric.function.colorMode.help": "指标的哪部分要上色",
-    "visTypeMetric.function.colorRange.help": "指定应将不同颜色应用到的值组的范围对象。",
-    "visTypeMetric.function.colorScheme.help": "要使用的颜色方案",
-    "visTypeMetric.function.font.help": "字体设置。",
-    "visTypeMetric.function.invertColors.help": "反转颜色范围",
-    "visTypeMetric.function.metric.help": "指标维度配置",
-    "visTypeMetric.function.percentage.help": "以百分比模式显示指标。需要设置 colorRange。",
-    "visTypeMetric.function.showLabels.help": "在指标值下显示标签。",
-    "visTypeMetric.function.subText.help": "要在指标下显示的定制文本",
-    "visTypeMetric.function.useRanges.help": "已启用颜色范围。",
-    "visTypeMetric.params.settingsTitle": "设置",
-    "visTypeMetric.params.showTitleLabel": "显示标题",
-    "visTypeMetric.params.color.useForLabel": "将颜色用于",
-    "visTypeMetric.params.percentageModeLabel": "百分比模式",
-    "visTypeMetric.params.style.fontSizeLabel": "指标字体大小（磅）",
-    "regionMap.choroplethLayer.downloadingVectorData404ErrorMessage": "尝试提取 {name} 时，服务器响应状态为“404”。请确保目标文件位于该位置。",
-    "regionMap.choroplethLayer.downloadingVectorDataErrorMessage": "无法下载 {name} 文件。请确保服务器的 CORS 配置允许来自此主机上的 Kibana 应用程序的请求。",
-    "regionMap.choroplethLayer.downloadingVectorDataErrorMessageTitle": "下载矢量数据时出错",
-    "regionMap.choroplethLayer.unrecognizedFormatErrorMessage": "格式 {formatType} 无法识别",
-    "regionMap.function.help": "地区地图可视化",
-    "regionMap.mapVis.regionMapDescription": "在专题地图上显示指标。使用其中提供的基本地图，或添加自己的地图。颜色越深表示值越大。",
-    "regionMap.mapVis.regionMapEditorConfig.schemas.metricTitle": "值",
-    "regionMap.mapVis.regionMapEditorConfig.schemas.segmentTitle": "形状字段",
-    "regionMap.mapVis.regionMapTitle": "区域地图",
-    "regionMap.visParams.displayWarningsLabel": "显示警告",
-    "regionMap.visParams.joinFieldLabel": "联接字段",
-    "regionMap.visParams.previewOnEMSLinkText": "在 EMS 上预览",
-    "regionMap.visParams.previewOnEMSLinkTitle": "在 Elastic 地图服务上预览“{selectedLayerName}”",
-    "regionMap.visParams.showAllShapesLabel": "显示所有形状",
-    "regionMap.visParams.styleSettingsLabel": "样式设置",
-    "regionMap.visParams.switchWarningsTipText": "打开/关闭警告。打开状态下，将根据联接字段值对与矢量图层中形状不匹配的每个字词显示警告。关闭状态下，将不显示这些警告。",
-    "regionMap.visParams.turnOffShowingAllShapesTipText": "关闭此设置时，将仅显示与相应字词匹配的形状。",
-    "regionMap.visParams.vectorMapLabel": "矢量地图",
-    "regionMap.visualization.unableToShowMismatchesWarningText": "确保每个字词与该形状的联接字段匹配：{mismatches}",
-    "regionMap.visualization.unableToShowMismatchesWarningTitle": "无法在地图上显示 {mismatchesLength} {oneMismatch, plural, one { 个结果} other { 个结果}}",
-    "regionMap.visParams.colorSchemaLabel": "颜色模式",
-    "regionMap.visParams.layerSettingsTitle": "图层设置",
-    "regionMap.visParams.outlineWeightLabel": "边框粗细",
-    "server.sampleData.ecommerceSpec.averageSalesPerRegionTitle": "[电子商务] 每地区平均销售额",
-    "server.sampleData.ecommerceSpec.averageSalesPriceTitle": "[电子商务] 平均销售价格",
-    "server.sampleData.ecommerceSpec.averageSoldQuantityTitle": "[电子商务] 平均销售数量",
-    "server.sampleData.ecommerceSpec.controlsTitle": "[电子商务] 控件",
-    "server.sampleData.ecommerceSpec.markdownTitle": "[电子商务] Markdown",
-    "server.sampleData.ecommerceSpec.ordersTitle": "[电子商务] 订单",
-    "server.sampleData.ecommerceSpec.promotionTrackingTitle": "[电子商务] 促销追踪",
-    "server.sampleData.ecommerceSpec.revenueDashboardDescription": "分析模拟的电子商务订单和收入",
-    "server.sampleData.ecommerceSpec.revenueDashboardTitle": "[电子商务] 收入仪表板",
-    "server.sampleData.ecommerceSpec.salesByCategoryTitle": "[电子商务] 按类别划分的销售额",
-    "server.sampleData.ecommerceSpec.salesByGenderTitle": "[电子商务] 按性别划分的销售额",
-    "server.sampleData.ecommerceSpec.soldProductsPerDayTitle": "[电子商务] 每天已售产品",
-    "server.sampleData.ecommerceSpec.topSellingProductsTitle": "[电子商务] 热卖产品",
-    "server.sampleData.ecommerceSpec.totalRevenueTitle": "[电子商务] 总收入",
-    "server.sampleData.ecommerceSpecDescription": "用于追踪电子商务订单的样例数据、可视化和仪表板。",
-    "server.sampleData.ecommerceSpecTitle": "样例电子商务订单",
-    "server.sampleData.flightsSpec.airlineCarrierTitle": "[航班] 航空公司",
-    "server.sampleData.flightsSpec.airportConnectionsTitle": "[航班] 机场航线（将鼠标悬停在机场上）",
-    "server.sampleData.flightsSpec.averageTicketPriceTitle": "[航班] 平均票价",
-    "server.sampleData.flightsSpec.controlsTitle": "[航班] 控件",
-    "server.sampleData.flightsSpec.delayBucketsTitle": "[航班] 延误存储桶",
-    "server.sampleData.flightsSpec.delaysAndCancellationsTitle": "[航班] 延误与取消",
-    "server.sampleData.flightsSpec.delayTypeTitle": "[航班] 延误类型",
-    "server.sampleData.flightsSpec.destinationWeatherTitle": "[航班] 到达地天气",
-    "server.sampleData.flightsSpec.flightCancellationsTitle": "[航班] 航班取消",
-    "server.sampleData.flightsSpec.flightCountAndAverageTicketPriceTitle": "[航班] 航班计数和平均票价",
-    "server.sampleData.flightsSpec.flightDelaysTitle": "[航班] 航班延误",
-    "server.sampleData.flightsSpec.flightLogTitle": "[航班] 飞行日志",
-    "server.sampleData.flightsSpec.globalFlightDashboardDescription": "分析 ES-Air、Logstash Airways、Kibana Airlines 和 JetBeats 的模拟航班数据",
-    "server.sampleData.flightsSpec.globalFlightDashboardTitle": "[航班] 全球航班仪表板",
-    "server.sampleData.flightsSpec.markdownInstructionsTitle": "[航班] Markdown 说明",
-    "server.sampleData.flightsSpec.originCountryTicketPricesTitle": "[航班] 始发国/地区票价",
-    "server.sampleData.flightsSpec.originCountryTitle": "[航班] 始发国/地区与到达国/地区",
-    "server.sampleData.flightsSpec.totalFlightCancellationsTitle": "[航班] 航班取消总数",
-    "server.sampleData.flightsSpec.totalFlightDelaysTitle": "[航班] 航班延误总数",
-    "server.sampleData.flightsSpec.totalFlightsTitle": "[航班] 航班总数",
-    "server.sampleData.flightsSpecDescription": "用于监测航班路线的样例数据、可视化和仪表板。",
-    "server.sampleData.flightsSpecTitle": "样例航班数据",
-    "server.sampleData.logsSpec.fileTypeScatterPlotTitle": "[日志] 文件类型散点图",
-    "server.sampleData.logsSpec.goalsTitle": "[日志] 目标",
-    "server.sampleData.logsSpec.heatmapTitle": "[日志] 热图",
-    "server.sampleData.logsSpec.hostVisitsBytesTableTitle": "[日志] 主机、访问和字节表",
-    "server.sampleData.logsSpec.inputControlsTitle": "[日志] 输入控件",
-    "server.sampleData.logsSpec.markdownInstructionsTitle": "[日志] Markdown 说明",
-    "server.sampleData.logsSpec.responseCodesOverTimeTitle": "[日志] 时移响应代码 + 注释",
-    "server.sampleData.logsSpec.sourceAndDestinationSankeyChartTitle": "[日志] 始发地和到达地 Sankey 图",
-    "server.sampleData.logsSpec.uniqueVisitorsByCountryTitle": "[日志] 按国家/地区划分的独立访客",
-    "server.sampleData.logsSpec.uniqueVisitorsTitle": "[日志] 独立访客与平均字节数",
-    "server.sampleData.logsSpec.visitorOSTitle": "[日志] 按 OS 划分的访客",
-    "server.sampleData.logsSpec.webTrafficDescription": "分析 Elastic 网站的模拟网络流量日志数据",
-    "server.sampleData.logsSpec.webTrafficTitle": "[日志] 网络流量",
-    "server.sampleData.logsSpecDescription": "用于监测 Web 日志的样例数据、可视化和仪表板。",
-    "server.sampleData.logsSpecTitle": "样例 Web 日志",
-    "server.stats.notReadyMessage": "统计尚未就绪。请稍后重试",
-    "server.status.disabledTitle": "已禁用",
-    "server.status.greenTitle": "绿",
-    "server.status.redTitle": "红",
-    "server.status.uninitializedTitle": "未初始化",
-    "server.status.yellowTitle": "黄",
-    "share.contextMenu.embedCodeLabel": "嵌入代码",
-    "share.contextMenu.embedCodePanelTitle": "嵌入代码",
-    "share.contextMenu.permalinkPanelTitle": "固定链接",
-    "share.contextMenu.permalinksLabel": "固定链接",
-    "share.contextMenuTitle": "共享此 {objectType}",
-    "share.urlPanel.canNotShareAsSavedObjectHelpText": "只有保存 {objectType} 后，才能共享为已保存对象。",
-    "share.urlPanel.copyIframeCodeButtonLabel": "复制 iFrame 代码",
-    "share.urlPanel.copyLinkButtonLabel": "复制链接",
-    "share.urlPanel.generateLinkAsLabel": "将链接生成为",
-    "share.urlPanel.savedObjectDescription": "您可以将此 URL 共享给相关人员，以便他们可以加载此 {objectType} 最新的已保存版本。",
-    "share.urlPanel.savedObjectLabel": "已保存对象",
-    "share.urlPanel.shortUrlHelpText": "建议共享缩短的快照 URL，以实现最大的兼容性。Internet Explorer 有 URL 长度限制，某些 wiki 和标记分析器无法很好地处理全长版本的快照 URL，但应能很好地处理短 URL。",
-    "share.urlPanel.shortUrlLabel": "短 URL",
-    "share.urlPanel.snapshotDescription": "快照 URL 将{objectType}的当前状态编入 URL 自身之中。通过此 URL，将无法看到对已保存的{objectType}的编辑。",
-    "share.urlPanel.snapshotLabel": "快照",
-    "share.urlPanel.unableCreateShortUrlErrorMessage": "无法创建短 URL。错误：{errorMessage}",
-    "statusPage.loadStatus.serverIsDownErrorMessage": "无法请求服务器状态。也许您的服务器已关闭？",
-    "statusPage.loadStatus.serverStatusCodeErrorMessage": "无法使用状态代码 {responseStatus} 请求服务器状态",
-    "statusPage.metricsTiles.columns.heapTotalHeader": "堆总计",
-    "statusPage.metricsTiles.columns.heapUsedHeader": "已使用堆",
-    "statusPage.metricsTiles.columns.loadHeader": "负载",
-    "statusPage.metricsTiles.columns.requestsPerSecHeader": "每秒请求数",
-    "statusPage.metricsTiles.columns.resTimeAvgHeader": "响应时间平均值",
-    "statusPage.metricsTiles.columns.resTimeMaxHeader": "响应时间最大值",
-    "statusPage.serverStatus.statusTitle": "Kibana 状态为“{kibanaStatus}”",
-    "statusPage.statusApp.loadingErrorText": "加载状态时出错",
-    "statusPage.statusApp.statusActions.buildText": "BUILD {buildNum}",
-    "statusPage.statusApp.statusActions.commitText": "COMMIT {buildSha}",
-    "statusPage.statusApp.statusTitle": "插件状态",
-    "statusPage.statusTable.columns.idHeader": "ID",
-    "statusPage.statusTable.columns.statusHeader": "状态",
-    "visTypeTable.aggTable.exportLabel": "导出：",
-    "visTypeTable.aggTable.formattedLabel": "格式化",
-    "visTypeTable.aggTable.rawLabel": "原始",
-    "visTypeTable.directives.tableCellFilter.filterForValueTooltip": "筛留值",
-    "visTypeTable.directives.tableCellFilter.filterOutValueTooltip": "筛除值",
-    "visTypeTable.function.help": "表可视化",
-    "visTypeTable.params.showMetricsLabel": "显示每个桶/级别的指标",
-    "visTypeTable.params.showPartialRowsLabel": "显示部分行",
-    "visTypeTable.params.showPartialRowsTip": "显示具有部分数据的行。这仍将计算每个桶/级别的指标，即使它们未显示。",
-    "visTypeTable.params.showTotalLabel": "显示汇总",
-    "visTypeTable.params.totalFunctionLabel": "汇总函数",
-    "visTypeTable.tableVisDescription": "在表中显示值",
-    "visTypeTable.tableVisEditorConfig.schemas.bucketTitle": "拆分行",
-    "visTypeTable.tableVisEditorConfig.schemas.metricTitle": "指标",
-    "visTypeTable.tableVisEditorConfig.schemas.splitTitle": "拆分表",
-    "visTypeTable.tableVisTitle": "数据表",
-    "visTypeTable.vis.noResultsFoundTitle": "找不到结果",
-    "visTypeTable.params.PercentageColLabel": "百分比列",
-    "visTypeTable.params.percentageTableColumnName": "{title} 百分比",
-    "visTypeTable.params.defaultPercentageCol": "不显示",
-    "visTypeTable.totalAggregations.averageText": "平均值",
-    "visTypeTable.totalAggregations.countText": "计数",
-    "visTypeTable.totalAggregations.maxText": "最大值",
-    "visTypeTable.totalAggregations.minText": "最小值",
-    "visTypeTable.totalAggregations.sumText": "和",
-    "visTypeTable.params.perPageLabel": "每页行数",
-    "visTypeTagCloud.feedbackMessage.tooSmallContainerDescription": "容器太小，无法显示整个云。标记可能被裁剪或省略。",
-    "visTypeTagCloud.feedbackMessage.truncatedTagsDescription": "标记数量已截断，以避免绘制时间过长。",
-    "visTypeTagCloud.function.bucket.help": "存储桶维度配置",
-    "visTypeTagCloud.function.help": "标签云图可视化",
-    "visTypeTagCloud.function.metric.help": "指标维度配置",
-    "visTypeTagCloud.function.orientation.help": "标签云图内的字方向",
-    "visTypeTagCloud.function.scale.help": "缩放以确定字体大小",
-    "visTypeTagCloud.vis.schemas.metricTitle": "标记大小",
-    "visTypeTagCloud.vis.schemas.segmentTitle": "标记",
-    "visTypeTagCloud.vis.tagCloudDescription": "一组字词，可根据其重要性调整大小",
-    "visTypeTagCloud.vis.tagCloudTitle": "标签云图",
-    "visTypeTagCloud.visParams.orientationsLabel": "方向",
-    "visTypeTagCloud.vis.editorConfig.orientations.multipleText": "多个",
-    "visTypeTagCloud.vis.editorConfig.orientations.rightAngledText": "直角",
-    "visTypeTagCloud.vis.editorConfig.orientations.singleText": "单个",
-    "visTypeTagCloud.vis.editorConfig.scales.linearText": "线性",
-    "visTypeTagCloud.vis.editorConfig.scales.logText": "对数",
-    "visTypeTagCloud.vis.editorConfig.scales.squareRootText": "平方根",
-    "visTypeTagCloud.visParams.fontSizeLabel": "字体大小范围（像素）",
-    "visTypeTagCloud.visParams.showLabelToggleLabel": "显示标签",
-    "visTypeTagCloud.visParams.textScaleLabel": "文本比例",
-    "tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage": "子函数应实现此方法以响应数据更新",
-    "tileMap.function.help": "磁贴地图可视化",
-    "tileMap.geohashLayer.mapTitle": "{mapType} 地图类型无法识别",
-    "tileMap.tooltipFormatter.latitudeLabel": "纬度",
-    "tileMap.tooltipFormatter.longitudeLabel": "经度",
-    "tileMap.vis.map.editorConfig.schemas.geoCoordinatesTitle": "地理坐标",
-    "tileMap.vis.map.editorConfig.schemas.metricTitle": "值",
-    "tileMap.vis.mapDescription": "在地图上绘制纬度和经度坐标",
-    "tileMap.vis.mapTitle": "坐标地图",
-    "tileMap.visParams.clusterSizeLabel": "集群大小",
-    "tileMap.visParams.desaturateTilesLabel": "降低平铺地图饱和度",
-    "tileMap.visParams.mapTypeLabel": "地图类型",
-    "tileMap.visParams.reduceVibrancyOfTileColorsTip": "降低平铺地图颜色的亮度。此设置在任何版本的 IE 浏览器中均不起作用。",
-    "tileMap.wmsOptions.attributionStringTip": "右下角的属性字符串。",
-    "tileMap.wmsOptions.baseLayerSettingsTitle": "基础图层设置",
-    "tileMap.wmsOptions.imageFormatToUseTip": "通常为 image/png 或 image/jpeg。如果服务器返回透明图层，则使用 png。",
-    "tileMap.wmsOptions.layersLabel": "图层",
-    "tileMap.wmsOptions.listOfLayersToUseTip": "要使用的图层逗号分隔列表。",
-    "tileMap.wmsOptions.urlOfWMSWebServiceTip": "WMS Web 服务的 URL。",
-    "tileMap.wmsOptions.useWMSCompliantMapTileServerTip": "使用符合 WMS 规范的平铺地图服务器。仅适用于高级用户。",
-    "tileMap.wmsOptions.versionOfWMSserverSupportsTip": "服务器支持的 WMS 版本。",
-    "tileMap.wmsOptions.wmsAttributionLabel": "WMS 属性",
-    "tileMap.wmsOptions.wmsMapServerLabel": "WMS 地图服务器",
-    "tileMap.wmsOptions.wmsServerSupportedStylesListTip": "要使用的以逗号分隔的 WMS 服务器支持的样式列表。在大部分情况下为空。",
-    "tileMap.vis.editorConfig.legendPositions.bottomLeftText": "左下方",
-    "tileMap.vis.editorConfig.legendPositions.bottomRightText": "右下方",
-    "tileMap.vis.editorConfig.legendPositions.topLeftText": "左上方",
-    "tileMap.vis.editorConfig.legendPositions.topRightText": "右上方",
-    "tileMap.vis.editorConfig.mapTypes.heatmapText": "热图",
-    "tileMap.vis.editorConfig.mapTypes.scaledCircleMarkersText": "缩放式圆形标记",
-    "tileMap.vis.editorConfig.mapTypes.shadedCircleMarkersText": "带阴影圆形标记",
-    "tileMap.vis.editorConfig.mapTypes.shadedGeohashGridText": "带阴影 geohash 网格",
-    "tileMap.visParams.colorSchemaLabel": "颜色模式",
-    "tileMap.wmsOptions.mapLoadFailDescription": "如果此参数不正确，将无法加载地图。",
-    "tileMap.wmsOptions.wmsDescription": "WMS 是用于地图图像服务的 {wmsLink}。",
-    "tileMap.wmsOptions.wmsFormatLabel": "WMS 格式",
-    "tileMap.wmsOptions.wmsLayersLabel": "WMS 图层",
-    "tileMap.wmsOptions.wmsLinkText": "OGC 标准",
-    "tileMap.wmsOptions.wmsStylesLabel": "WMS 样式",
-    "tileMap.wmsOptions.wmsUrlLabel": "WMS url",
-    "tileMap.wmsOptions.wmsVersionLabel": "WMS 版本",
+    "timelion.savedObjectFinder.addNewItemButtonLabel": "添加新的 {item}",
+    "timelion.savedObjectFinder.manageItemsButtonLabel": "管理 {items}",
+    "timelion.savedObjectFinder.noMatchesFoundDescription": "未找到任何匹配的 {items}。",
+    "timelion.savedObjectFinder.pageItemsFromHitCountDescription": "{pageFirstItem}-{pageLastItem} 页，共 {hitCount} 页",
+    "timelion.savedObjectFinder.sortByButtonLabeAscendingScreenReaderOnly": "升序",
+    "timelion.savedObjectFinder.sortByButtonLabeDescendingScreenReaderOnly": "降序",
+    "timelion.savedObjectFinder.sortByButtonLabel": "名称",
+    "timelion.savedObjectFinder.sortByButtonLabelScreenReaderOnly": "排序依据",
     "timelion.badge.readOnly.text": "只读",
     "timelion.badge.readOnly.tooltip": "无法保存 Timelion 工作表",
     "timelion.breadcrumbs.create": "创建",
@@ -3264,6 +857,2406 @@
     "timelion.vis.intervalLabel": "时间间隔",
     "timelion.help.functions.notAllowedGraphiteUrl": "在 kibana.yml 文件中未配置此 Graphite URL。\n          请在 kibana.yml 文件中“timelion.graphiteUrls”下配置 Graphite 服务器列表，并\n          从 Kibana 的高级设置中选择一个",
     "timelion.emptyExpressionErrorMessage": "Timelion 错误：未提供表达式",
+    "core.ui.overlays.banner.attentionTitle": "注意",
+    "core.ui.overlays.banner.closeButtonLabel": "关闭",
+    "core.ui.chrome.headerGlobalNav.goHomePageIconAriaLabel": "前往主页",
+    "core.ui.chrome.headerGlobalNav.helpMenuButtonAriaLabel": "帮助菜单",
+    "core.ui.chrome.headerGlobalNav.helpMenuTitle": "帮助",
+    "core.ui.chrome.headerGlobalNav.helpMenuVersion": "v {version}",
+    "core.ui.chrome.sideGlobalNav.viewRecentItemsFlyoutTitle": "最近项",
+    "core.ui.chrome.sideGlobalNav.viewRecentItemsLabel": "最近查看",
+    "core.ui.recentLinks.linkItem.screenReaderLabel": "{recentlyAccessedItemLinklabel}，类型：{pageType}",
+    "core.ui.legacyBrowserMessage": "此 Kibana 安装启用了当前浏览器未满足的严格安全要求。",
+    "core.ui.legacyBrowserTitle": "请升级您的浏览器",
+    "core.ui.welcomeErrorMessage": "Kibana 未正确加载。检查服务器输出以了解详情。",
+    "core.ui.welcomeMessage": "正在加载 Kibana",
+    "core.chrome.legacyBrowserWarning": "您的浏览器不满足 Kibana 的安全要求。",
+    "core.euiBasicTable.selectAllRows": "选择所有行",
+    "core.euiBasicTable.selectThisRow": "选择此行",
+    "core.euiBasicTable.tableDescription": "以下是包含 {itemCount} 个项的列表。",
+    "core.euiBottomBar.screenReaderAnnouncement": "会有新的菜单打开，其中页面级别控件位于文档的结尾。",
+    "core.euiCardSelect.select": "选择",
+    "core.euiCardSelect.selected": "不可用",
+    "core.euiCardSelect.unavailable": "已选",
+    "core.euiCodeBlock.copyButton": "复制",
+    "core.euiCodeEditor.startEditing": "按 Enter 键开始编辑",
+    "core.euiCodeEditor.startInteracting": "按 Enter 键开始与代码互动。",
+    "core.euiCodeEditor.stopEditing": "完成后，按 Esc 键停止编辑。",
+    "core.euiCodeEditor.stopInteracting": "完成后，按 Esc 键停止与代码互动。",
+    "core.euiCollapsedItemActions.allActions": "所有操作",
+    "core.euiColorPicker.screenReaderAnnouncement": "具有一系列可选颜色的弹出式窗口打开。按 Tab 键正向遍历颜色选择或按 Esc 键关闭此弹出式窗口。",
+    "core.euiColorPicker.swatchAriaLabel": "将 {swatch} 选为颜色",
+    "core.euiComboBoxOptionsList.allOptionsSelected": "您已选择所有可用选项",
+    "core.euiComboBoxOptionsList.alreadyAdded": "{label} 已添加",
+    "core.euiComboBoxOptionsList.createCustomOption": "按 {key} 键将 {searchValue} 添加为自定义选项",
+    "core.euiComboBoxOptionsList.loadingOptions": "正在加载选项",
+    "core.euiComboBoxOptionsList.noAvailableOptions": "没有任何可用选项",
+    "core.euiComboBoxOptionsList.noMatchingOptions": "{searchValue} 不匹配任何选项",
+    "core.euiComboBoxPill.removeSelection": "将 {children} 从此组中的选择移除",
+    "core.euiFilterButton.filterBadge": "{count} 个 {filterCountLabel} 筛选",
+    "core.euiForm.addressFormErrors": "请解决表单中的错误。",
+    "core.euiFormControlLayoutClearButton.label": "清除输入",
+    "core.euiHeaderAlert.dismiss": "消除",
+    "core.euiHeaderLinks.appNavigation": "应用聚合",
+    "core.euiHeaderLinks.openNavigationMenu": "打开导航菜单",
+    "core.euiHue.label": "选择 HSV 颜色模式“色调”值",
+    "core.euiModal.closeModal": "关闭此模式窗口",
+    "core.euiPagination.jumpToLastPage": "跳转到末页，即页 {pageCount}",
+    "core.euiPagination.nextPage": "下一页",
+    "core.euiPagination.pageOfTotal": "第 {page} 页，共 {total} 页",
+    "core.euiPagination.previousPage": "上一页",
+    "core.euiPopover.screenReaderAnnouncement": "您在弹出式窗口中。要退出此弹出式窗口，按 Esc 键。",
+    "core.euiSaturation.roleDescription": "HSV 颜色模式饱和度和值选择",
+    "core.euiSaturation.screenReaderAnnouncement": "使用箭头键导航四色调颜色方案。因每次按键而生成坐标将用于计算 HSV 颜色模式“饱和度”和“值”数值（范围为 0 至 1）。左箭头键和右箭头键分别减少和增加“饱和度”值。上箭头键和下箭头键分别减少和增加“值”值。",
+    "core.euiSelectable.loadingOptions": "正在加载选项",
+    "core.euiSelectable.noAvailableOptions": "没有任何可用选项",
+    "core.euiSelectable.noMatchingOptions": "{searchValue} 不匹配任何选项",
+    "core.euiStat.loadingText": "统计正在加载",
+    "core.euiStepHorizontal.buttonTitle": "第 {step} 步：{title}{titleAppendix, select, completed {已完成} disabled {已禁用} other {}}",
+    "core.euiStepHorizontal.step": "步骤",
+    "core.euiStepNumber.hasErrors": "有错误",
+    "core.euiStepNumber.hasWarnings": "有警告",
+    "core.euiStepNumber.isComplete": "已完成",
+    "core.euiSuperSelect.screenReaderAnnouncement": "您位于包含 {optionsCount} 个项的表单选择器中，必须选择单个选项。使用向上和向下键导航，使用 Esc 键关闭。",
+    "core.euiSuperSelectControl.selectAnOption": "选择选项：{selectedValue} 已选",
+    "core.euiTablePagination.rowsPerPage": "每页行数",
+    "core.euiTablePagination.rowsPerPageOption": "{rowsPerPage} 行",
+    "core.euiTableSortMobile.sorting": "排序",
+    "core.euiToast.dismissToast": "关闭 Toast",
+    "core.euiToast.newNotification": "新通知出现",
+    "core.euiToast.notification": "通知",
+    "core.fatalErrors.clearYourSessionButtonLabel": "清除您的会话",
+    "core.fatalErrors.goBackButtonLabel": "返回",
+    "core.fatalErrors.somethingWentWrongTitle": "出问题了",
+    "core.fatalErrors.tryRefreshingPageDescription": "请尝试刷新页面。如果无效，请返回上一页或清除您的会话数据。",
+    "core.notifications.errorToast.closeModal": "关闭",
+    "core.notifications.unableUpdateUISettingNotificationMessageTitle": "无法更新 UI 设置",
+    "core.toasts.errorToast.seeFullError": "请参阅完整的错误信息",
+    "core.euiSuperDatePicker.showDatesButtonLabel": "显示日期",
+    "core.euiSuperUpdateButton.cannotUpdateTooltip": "无法更新",
+    "core.euiSuperUpdateButton.clickToApplyTooltip": "单击以应用",
+    "core.euiSuperUpdateButton.refreshButtonLabel": "刷新",
+    "core.euiSuperUpdateButton.updateButtonLabel": "更新",
+    "core.euiSuperUpdateButton.updatingButtonLabel": "正在更新",
+    "core.application.appNotFound.pageDescription": "在此 URL 未找到任何应用程序。尝试返回或从菜单中选择应用。",
+    "core.application.appNotFound.title": "未找到应用程序",
+    "kibana-react.exitFullScreenButton.exitFullScreenModeButtonAriaLabel": "退出全屏模式",
+    "kibana-react.exitFullScreenButton.exitFullScreenModeButtonLabel": "退出全屏",
+    "kibana-react.exitFullScreenButton.fullScreenModeDescription": "在全屏模式下，按 ESC 键可退出。",
+    "kibana-react.tableListView.listing.deleteButtonMessage": "删除 {itemCount} 个{entityName}",
+    "kibana-react.tableListView.listing.deleteConfirmModalDescription": "您无法恢复删除的{entityNamePlural}。",
+    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.cancelButtonLabel": "取消",
+    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.confirmButtonLabel": "删除",
+    "kibana-react.tableListView.listing.deleteSelectedItemsConfirmModal.confirmButtonLabelDeleting": "正在删除",
+    "kibana-react.tableListView.listing.listingLimitExceeded.advancedSettingsLinkText": "高级设置",
+    "kibana-react.tableListView.listing.listingLimitExceededDescription": "您有 {totalItems} 个{entityNamePlural}，但您的“{listingLimitText}”设置阻止下表显示 {listingLimitValue} 个以上。您可以在“{advancedSettingsLink}”下更改此设置。",
+    "kibana-react.tableListView.listing.listingLimitExceededTitle": "已超过列表限制",
+    "kibana-react.tableListView.listing.noAvailableItemsMessage": "没有可用的{entityNamePlural}",
+    "kibana-react.tableListView.listing.noMatchedItemsMessage": "没有任何{entityNamePlural}匹配您的搜索。",
+    "kibana-react.tableListView.listing.table.actionTitle": "操作",
+    "kibana-react.tableListView.listing.table.editActionDescription": "编辑",
+    "kibana-react.tableListView.listing.table.editActionName": "编辑",
+    "kibana-react.tableListView.listing.unableToDeleteDangerMessage": "无法删除{entityName}",
+    "kibana-react.savedObjects.finder.filterButtonLabel": "类型",
+    "kibana-react.savedObjects.finder.searchPlaceholder": "搜索……",
+    "kibana-react.savedObjects.finder.sortAsc": "升序",
+    "kibana-react.savedObjects.finder.sortAuto": "最佳匹配",
+    "kibana-react.savedObjects.finder.sortButtonLabel": "排序",
+    "kibana-react.savedObjects.finder.sortDesc": "降序",
+    "kibana-react.savedObjects.saveModal.cancelButtonLabel": "取消",
+    "kibana-react.savedObjects.saveModal.descriptionLabel": "描述",
+    "kibana-react.savedObjects.saveModal.duplicateTitleDescription": "单击“{confirmSaveLabel}”可覆盖现有 {objectType}。",
+    "kibana-react.savedObjects.saveModal.duplicateTitleLabel": "具有标题“{title}”的 {objectType} 已存在",
+    "kibana-react.savedObjects.saveModal.saveAsNewLabel": "另存为新的 {objectType}",
+    "kibana-react.savedObjects.saveModal.saveButtonLabel": "保存",
+    "kibana-react.savedObjects.saveModal.saveTitle": "保存 {objectType}",
+    "kibana-react.savedObjects.saveModal.titleLabel": "标题",
+    "kibana_utils.stateManagement.url.unableToRestoreUrlErrorMessage": "无法完整还原 URL，确保使用共享功能。",
+    "kibana_utils.stateManagement.url.unableToStoreHistoryInSessionErrorMessage": "Kibana 无法将历史记录项存储在您的会话中，因为其已满，并且似乎没有任何可安全删除的项。\n\n通常可通过移至新的标签页来解决此问题，但这会导致更大的问题。如果您有规律地看到此消息，请在 {gitHubIssuesUrl} 提交问题。",
+    "inspector.closeButton": "关闭检查器",
+    "inspector.reqTimestampDescription": "记录请求启动的时间",
+    "inspector.reqTimestampKey": "请求时间戳",
+    "inspector.title": "检查器",
+    "inspector.view": "视图：{viewName}",
+    "inspector.data.dataDescriptionTooltip": "查看可视化后面的数据",
+    "inspector.data.dataTitle": "数据",
+    "inspector.data.downloadCSVButtonLabel": "下载 CSV",
+    "inspector.data.downloadCSVToggleButtonLabel": "下载 CSV",
+    "inspector.data.filterForValueButtonAriaLabel": "筛留值",
+    "inspector.data.filterForValueButtonTooltip": "筛留值",
+    "inspector.data.filterOutValueButtonAriaLabel": "筛除值",
+    "inspector.data.filterOutValueButtonTooltip": "筛除值",
+    "inspector.data.formattedCSVButtonLabel": "格式化 CSV",
+    "inspector.data.formattedCSVButtonTooltip": "以表格式下载数据",
+    "inspector.data.gatheringDataLabel": "正在收集数据",
+    "inspector.data.noDataAvailableDescription": "该元素未提供任何数据。",
+    "inspector.data.noDataAvailableTitle": "没有可用数据",
+    "inspector.data.rawCSVButtonLabel": "原始 CSV",
+    "inspector.data.rawCSVButtonTooltip": "按原样下载数据，例如将日期作为时间戳下载",
+    "inspector.requests.descriptionRowIconAriaLabel": "描述",
+    "inspector.requests.failedLabel": " （失败）",
+    "inspector.requests.noRequestsLoggedDescription.elementHasNotLoggedAnyRequestsText": "该元素尚未记录任何请求。",
+    "inspector.requests.noRequestsLoggedDescription.whatDoesItUsuallyMeanText": "这通常表示无需提取任何数据，或该元素尚未开始提取数据。",
+    "inspector.requests.noRequestsLoggedTitle": "未记录任何请求",
+    "inspector.requests.requestFailedTooltipTitle": "请求失败",
+    "inspector.requests.requestInProgressAriaLabel": "请求进行中",
+    "inspector.requests.requestLabel": "请求：",
+    "inspector.requests.requestsDescriptionTooltip": "查看已收集数据的请求",
+    "inspector.requests.requestsTitle": "请求",
+    "inspector.requests.requestSucceededTooltipTitle": "请求成功",
+    "inspector.requests.requestTabLabel": "请求",
+    "inspector.requests.requestTimeLabel": "{requestTime}ms",
+    "inspector.requests.requestTooltipDescription": "请求所花费的总时间。",
+    "inspector.requests.requestWasMadeDescription": "{requestsCount, plural, one {# 个请求已} other {# 个请求已} }发出{failedRequests}",
+    "inspector.requests.requestWasMadeDescription.requestHadFailureText": "，{failedCount} 个失败",
+    "inspector.requests.responseTabLabel": "响应",
+    "inspector.requests.statisticsTabLabel": "统计信息",
+    "console.autocomplete.addMethodMetaText": "方法",
+    "console.consoleDisplayName": "Console",
+    "console.devToolsDescription": "跳过 cURL 并使用此 JSON 接口来直接处理您的数据。",
+    "console.devToolsTitle": "Console",
+    "console.helpPage.keyboardCommands.autoIndentDescription": "自动缩进当前请求",
+    "console.helpPage.keyboardCommands.closeAutoCompleteMenuDescription": "关闭自动完成菜单",
+    "console.helpPage.keyboardCommands.collapseAllScopesDescription": "折叠当前范围除外的所有范围。通过加按 Shift 键来展开。",
+    "console.helpPage.keyboardCommands.collapseExpandCurrentScopeDescription": "折叠/展开当前范围。",
+    "console.helpPage.keyboardCommands.jumpToPreviousNextRequestDescription": "跳转至前一/后一请求开头或结尾。",
+    "console.helpPage.keyboardCommands.openAutoCompleteDescription": "打开自动完成（即使未键入）",
+    "console.helpPage.keyboardCommands.openDocumentationDescription": "打开当前请求的文档",
+    "console.helpPage.keyboardCommands.selectCurrentlySelectedInAutoCompleteMenuDescription": "选择自动完成菜单中当前选定的词或最顶部的词",
+    "console.helpPage.keyboardCommands.submitRequestDescription": "提交请求",
+    "console.helpPage.keyboardCommands.switchFocusToAutoCompleteMenuDescription": "将焦点切换到自动完成菜单。使用箭头进一步选择词",
+    "console.helpPage.keyboardCommandsTitle": "键盘命令",
+    "console.helpPage.pageTitle": "帮助",
+    "console.helpPage.requestFormatDescription": "您可以在空白编辑器中键入一个或多个请求。Console 理解紧凑格式的请求：",
+    "console.helpPage.requestFormatTitle": "请求格式",
+    "console.historyPage.applyHistoryButtonLabel": "应用",
+    "console.historyPage.clearHistoryButtonLabel": "清除",
+    "console.historyPage.itemOfRequestListAriaLabel": "请求：{historyItem}",
+    "console.historyPage.noHistoryTextMessage": "没有可用的历史记录",
+    "console.historyPage.pageTitle": "历史记录",
+    "console.historyPage.requestListAriaLabel": "已发送请求的历史记录",
+    "console.requestOptions.autoIndentButtonLabel": "自动缩进",
+    "console.requestOptions.copyAsUrlButtonLabel": "复制为 cURL",
+    "console.requestOptions.openDocumentationButtonLabel": "打开文档",
+    "console.requestOptionsButtonAriaLabel": "请求选项",
+    "console.sendRequestButtonTooltip": "单击可发送请求",
+    "console.settingsPage.autocompleteLabel": "自动完成",
+    "console.settingsPage.cancelButtonLabel": "取消",
+    "console.settingsPage.fieldsLabelText": "字段",
+    "console.settingsPage.fontSizeLabel": "字体大小",
+    "console.settingsPage.indicesAndAliasesLabelText": "索引和别名",
+    "console.settingsPage.pageTitle": "设置",
+    "console.settingsPage.saveButtonLabel": "保存",
+    "console.settingsPage.templatesLabelText": "模板",
+    "console.settingsPage.wrapLongLinesLabelText": "长行换行",
+    "console.topNav.helpTabDescription": "帮助",
+    "console.topNav.helpTabLabel": "帮助",
+    "console.topNav.historyTabDescription": "历史记录",
+    "console.topNav.historyTabLabel": "历史记录",
+    "console.topNav.settingsTabDescription": "设置",
+    "console.topNav.settingsTabLabel": "设置",
+    "console.welcomePage.closeButtonLabel": "开始工作",
+    "console.welcomePage.pageTitle": "欢迎使用 Console",
+    "console.welcomePage.quickIntroDescription": "Console UI 分成两个窗格：编辑器窗格（左）和响应窗格（右）。使用编辑器键入请求并将它们提交到 Elasticsearch。结果将显示在右侧的响应窗格中。",
+    "console.welcomePage.quickIntroTitle": "UI 简介",
+    "console.welcomePage.quickTips.cUrlFormatForRequestsDescription": "您可以粘贴 cURL 格式的请求，这些请求将转换成 Console 语法格式。",
+    "console.welcomePage.quickTips.keyboardShortcutsDescription": "学习“帮助”按钮下的键盘快捷方式。那里有非常实用的信息！",
+    "console.welcomePage.quickTips.resizeEditorDescription": "您可以通过拖动编辑器和输出窗格之间的分隔条来调整它们的大小。",
+    "console.welcomePage.quickTips.submitRequestDescription": "使用绿色三角按钮将请求提交到 ES。",
+    "console.welcomePage.quickTips.useWrenchMenuDescription": "使用扳手菜单执行其他有用的操作。",
+    "console.welcomePage.quickTipsTitle": "有几个需要您注意的有用提示",
+    "console.welcomePage.supportedRequestFormatTitle": "Console 理解紧凑格式的请求，类似于 cURL：",
+    "console.consoleMenu.copyAsCurlMessage": "请求已复制为 cURL",
+    "data.filter.applyFilters.popupHeader": "选择要应用的筛选",
+    "data.filter.applyFiltersPopup.cancelButtonLabel": "取消",
+    "data.filter.applyFiltersPopup.saveButtonLabel": "应用",
+    "data.filter.filterBar.addFilterButtonLabel": "添加筛选",
+    "data.filter.filterBar.deleteFilterButtonLabel": "删除",
+    "data.filter.filterBar.disabledFilterPrefix": "已禁用",
+    "data.filter.filterBar.disableFilterButtonLabel": "暂时禁用",
+    "data.filter.filterBar.editFilterButtonLabel": "编辑筛选",
+    "data.filter.filterBar.enableFilterButtonLabel": "重新启用",
+    "data.filter.filterBar.excludeFilterButtonLabel": "排除结果",
+    "data.filter.filterBar.filterItemBadgeAriaLabel": "筛选操作",
+    "data.filter.filterBar.filterItemBadgeIconAriaLabel": "删除",
+    "data.filter.filterBar.includeFilterButtonLabel": "包括结果",
+    "data.filter.filterBar.indexPatternSelectPlaceholder": "选择索引模式",
+    "data.filter.filterBar.negatedFilterPrefix": "非 ",
+    "data.filter.filterBar.pinFilterButtonLabel": "在所有应用上固定",
+    "data.filter.filterBar.pinnedFilterPrefix": "已固定",
+    "data.filter.filterBar.unpinFilterButtonLabel": "取消固定",
+    "data.filter.filterEditor.cancelButtonLabel": "取消",
+    "data.filter.filterEditor.createCustomLabelInputLabel": "定制标签",
+    "data.filter.filterEditor.createCustomLabelSwitchLabel": "创建定制标签？",
+    "data.filter.filterEditor.dateFormatHelpLinkLabel": "已接受日期格式",
+    "data.filter.filterEditor.doesNotExistOperatorOptionLabel": "不存在",
+    "data.filter.filterEditor.editFilterPopupTitle": "编辑筛选",
+    "data.filter.filterEditor.editFilterValuesButtonLabel": "编辑筛选值",
+    "data.filter.filterEditor.editQueryDslButtonLabel": "编辑为查询 DSL",
+    "data.filter.filterEditor.existsOperatorOptionLabel": "存在",
+    "data.filter.filterEditor.falseOptionLabel": "false",
+    "data.filter.filterEditor.fieldSelectLabel": "字段",
+    "data.filter.filterEditor.fieldSelectPlaceholder": "首先选择字段",
+    "data.filter.filterEditor.indexPatternSelectLabel": "索引模式",
+    "data.filter.filterEditor.isBetweenOperatorOptionLabel": "介于",
+    "data.filter.filterEditor.isNotBetweenOperatorOptionLabel": "不介于",
+    "data.filter.filterEditor.isNotOneOfOperatorOptionLabel": "不属于",
+    "data.filter.filterEditor.isNotOperatorOptionLabel": "不是",
+    "data.filter.filterEditor.isOneOfOperatorOptionLabel": "属于",
+    "data.filter.filterEditor.isOperatorOptionLabel": "是",
+    "data.filter.filterEditor.operatorSelectLabel": "运算符",
+    "data.filter.filterEditor.rangeEndInputPlaceholder": "范围结束",
+    "data.filter.filterEditor.rangeStartInputPlaceholder": "范围开始",
+    "data.filter.filterEditor.saveButtonLabel": "保存",
+    "data.filter.filterEditor.trueOptionLabel": "true",
+    "data.filter.filterEditor.valueInputLabel": "值",
+    "data.filter.filterEditor.valueInputPlaceholder": "输入值",
+    "data.filter.filterEditor.valueSelectPlaceholder": "选择值",
+    "data.filter.filterEditor.valuesSelectLabel": "值",
+    "data.filter.filterEditor.valuesSelectPlaceholder": "选择值",
+    "data.filter.options.changeAllFiltersButtonLabel": "更改所有筛选",
+    "data.filter.options.deleteAllFiltersButtonLabel": "全部删除",
+    "data.filter.options.disableAllFiltersButtonLabel": "全部禁用",
+    "data.filter.options.enableAllFiltersButtonLabel": "全部启用",
+    "data.filter.options.invertDisabledFiltersButtonLabel": "反向已启用/已禁用",
+    "data.filter.options.invertNegatedFiltersButtonLabel": "反向包括",
+    "data.filter.options.pinAllFiltersButtonLabel": "全部固定",
+    "data.filter.options.unpinAllFiltersButtonLabel": "全部取消固定",
+    "data.filter.searchBar.changeAllFiltersTitle": "更改所有筛选",
+    "data.indexPatterns.fetchFieldErrorTitle": "提取字段时出错",
+    "data.indexPatterns.unableWriteLabel": "无法写入索引模式！请刷新页面以获取此索引模式的最新更改。",
+    "data.indexPatterns.unknownFieldErrorMessage": "indexPattern “{title}” 中的字段 “{name}” 使用未知字段类型。",
+    "data.indexPatterns.unknownFieldHeader": "未知字段类型 {type}",
+    "data.query.queryBar.kqlFullLanguageName": "Kibana 查询语言",
+    "data.query.queryBar.kqlLanguageName": "KQL",
+    "data.query.queryBar.kqlOffLabel": "关闭",
+    "data.query.queryBar.kqlOnLabel": "开启",
+    "data.query.queryBar.luceneLanguageName": "Lucene",
+    "data.query.queryBar.luceneSyntaxWarningMessage": "尽管您选择了 Kibana 查询语言 (KQL)，但似乎您正在尝试使用 Lucene 查询语法。请查看 KQL 文档 {link}。",
+    "data.query.queryBar.luceneSyntaxWarningTitle": "Lucene 语法警告",
+    "data.query.queryBar.searchInputPlaceholder": "搜索",
+    "data.query.queryBar.syntaxOptionsDescription": "{docsLink} (KQL) 提供简化查询语法并支持脚本字段。如果您具有基本许可或更高级别的许可，KQL 还提供自动填充功能。如果关闭 KQL，Kibana 将使用 Lucene。",
+    "data.query.queryBar.syntaxOptionsDescription.docsLinkText": "此处",
+    "data.query.queryBar.syntaxOptionsTitle": "语法选项",
+    "data.filter.filterEditor.queryDslLabel": "Elasticsearch 查询 DSL",
+    "data.query.queryBar.luceneSyntaxWarningOptOutText": "不再显示",
+    "data.search.searchBar.savedQueryDescriptionLabelText": "描述",
+    "data.search.searchBar.savedQueryDescriptionText": "保存想要再次使用的查询文本和筛选。",
+    "data.search.searchBar.savedQueryForm.titleConflictText": "标题与现有已保存查询有冲突",
+    "data.search.searchBar.savedQueryForm.whitespaceErrorText": "标题不能包含前导或尾随空格",
+    "data.search.searchBar.savedQueryFormCancelButtonText": "取消",
+    "data.search.searchBar.savedQueryFormSaveButtonText": "保存",
+    "data.search.searchBar.savedQueryFormTitle": "保存查询",
+    "data.search.searchBar.savedQueryIncludeFiltersLabelText": "包括筛选",
+    "data.search.searchBar.savedQueryIncludeTimeFilterLabelText": "包括时间筛选",
+    "data.search.searchBar.savedQueryNameHelpText": "“名称”必填。标题不能包含前导或尾随空格。名称必须唯一。",
+    "data.search.searchBar.savedQueryNameLabelText": "名称",
+    "data.search.searchBar.savedQueryNoSavedQueriesText": "没有已保存查询。",
+    "data.search.searchBar.savedQueryPopoverButtonText": "查看已保存查询",
+    "data.search.searchBar.savedQueryPopoverClearButtonAriaLabel": "清除当前已保存查询",
+    "data.search.searchBar.savedQueryPopoverClearButtonText": "清除",
+    "data.search.searchBar.savedQueryPopoverConfirmDeletionCancelButtonText": "取消",
+    "data.search.searchBar.savedQueryPopoverConfirmDeletionConfirmButtonText": "删除",
+    "data.search.searchBar.savedQueryPopoverConfirmDeletionTitle": "删除“{savedQueryName}”？",
+    "data.search.searchBar.savedQueryPopoverDeleteButtonAriaLabel": "删除已保存查询 {savedQueryName}",
+    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonText": "另存为新的",
+    "data.search.searchBar.savedQueryPopoverSaveButtonAriaLabel": "保存新的已保存查询",
+    "data.search.searchBar.savedQueryPopoverSaveButtonText": "保存当前查询",
+    "data.search.searchBar.savedQueryPopoverSaveChangesButtonAriaLabel": "将更改保存到 {title}",
+    "data.search.searchBar.savedQueryPopoverSaveChangesButtonText": "保存更改",
+    "data.search.searchBar.savedQueryPopoverSavedQueryListItemButtonAriaLabel": "已保存查询按钮 {savedQueryName}",
+    "data.search.searchBar.savedQueryPopoverSavedQueryListItemDescriptionAriaLabel": "{savedQueryName} 描述",
+    "data.search.searchBar.savedQueryPopoverSavedQueryListItemSelectedButtonAriaLabel": "已保存查询按钮已选择 {savedQueryName}。按下可清除任何更改。",
+    "data.search.searchBar.savedQueryPopoverTitleText": "已保存查询",
+    "data.search.searchSource.fetch.shardsFailedModal.close": "关闭",
+    "data.search.searchSource.fetch.shardsFailedModal.copyToClipboard": "将响应复制到剪贴板",
+    "data.search.searchSource.fetch.shardsFailedModal.failureHeader": "{failureDetails} 时为 {failureName}",
+    "data.search.searchSource.fetch.shardsFailedModal.showDetails": "显示详情",
+    "data.search.searchSource.fetch.shardsFailedModal.tabHeaderRequest": "请求",
+    "data.search.searchSource.fetch.shardsFailedModal.tabHeaderResponse": "响应",
+    "data.search.searchSource.fetch.shardsFailedModal.tabHeaderShardFailures": "分片错误",
+    "data.search.searchSource.fetch.shardsFailedModal.tableColIndex": "索引",
+    "data.search.searchSource.fetch.shardsFailedModal.tableColNode": "节点",
+    "data.search.searchSource.fetch.shardsFailedModal.tableColReason": "原因",
+    "data.search.searchSource.fetch.shardsFailedModal.tableColShard": "分片",
+    "data.search.searchSource.fetch.shardsFailedModal.tableRowCollapse": "折叠 {rowDescription}",
+    "data.search.searchSource.fetch.shardsFailedModal.tableRowExpand": "展开 {rowDescription}",
+    "data.search.searchSource.fetch.shardsFailedNotificationDescription": "您正在查看的数据可能不完整或有错误。",
+    "data.search.searchSource.fetch.requestTimedOutNotificationMessage": "由于您的请求超时，因此数据可能不完整",
+    "data.search.searchSource.fetch.shardsFailedNotificationMessage": "{shardsTotal} 个分片有 {shardsFailed} 个失败",
+    "data.search.searchSource.hitsDescription": "查询返回的文档数目。",
+    "data.search.searchSource.hitsLabel": "命中",
+    "data.search.searchSource.hitsTotalDescription": "匹配查询的文档数目。",
+    "data.search.searchSource.hitsTotalLabel": "命中（总计）",
+    "data.search.searchSource.indexPatternDescription": "连接到 Elasticsearch 索引的索引模式。",
+    "data.search.searchSource.indexPatternIdDescription": "{kibanaIndexPattern} 索引中的 ID。",
+    "data.search.searchSource.indexPatternIdLabel": "索引模式 ID",
+    "data.search.searchSource.indexPatternLabel": "索引模式",
+    "data.search.searchSource.noSearchStrategyRegisteredErrorMessageDescription": "无法为该搜索请求找到搜索策略",
+    "data.search.searchSource.noSearchStrategyRegisteredErrorMessageTitle": "未注册任何搜索策略",
+    "data.search.searchSource.queryTimeDescription": "处理查询所花费的时间。不包括发送请求或在浏览器中解析它的时间。",
+    "data.search.searchSource.queryTimeLabel": "查询时间",
+    "data.search.searchSource.queryTimeValue": "{queryTime}ms",
+    "data.search.searchSource.requestTimeDescription": "请求从浏览器到 Elasticsearch 以及返回的时间。不包括请求在队列中等候的时间。",
+    "data.search.searchSource.requestTimeLabel": "请求时间",
+    "data.search.searchSource.requestTimeValue": "{requestTime}ms",
+    "data.filter.filterEditor.operatorSelectPlaceholderSelect": "选择",
+    "data.filter.filterEditor.operatorSelectPlaceholderWaiting": "正在等候",
+    "data.filter.filterEditor.rangeInputLabel": "范围",
+    "data.query.queryBar.comboboxAriaLabel": "搜索并筛选 {pageType} 页面",
+    "data.search.searchBar.savedQueryForm.titleMissingText": "“名称”必填",
+    "data.query.queryBar.searchInputAriaLabel": "开始键入内容，以搜索并筛选 {pageType} 页面",
+    "data.search.searchBar.savedQueryPopoverSaveAsNewButtonAriaLabel": "另存为新的已保存查询",
+    "data.functions.esaggs.help": "运行 AggConfig 聚合",
+    "data.functions.esaggs.inspector.dataRequest.description": "此请求将查询 Elasticsearch 以获取用于可视化的数据。",
+    "data.functions.esaggs.inspector.dataRequest.title": "数据",
+    "data.common.esQuery.kql.errors.endOfInputText": "输入结束",
+    "data.common.esQuery.kql.errors.fieldNameText": "字段名称",
+    "data.common.esQuery.kql.errors.literalText": "文本",
+    "data.common.esQuery.kql.errors.syntaxError": "应为 {expectedList}，但却找到了 {foundInput}。",
+    "data.common.esQuery.kql.errors.valueText": "值",
+    "data.common.esQuery.kql.errors.whitespaceText": "空白",
+    "devTools.badge.readOnly.text": "只读",
+    "devTools.badge.readOnly.tooltip": "无法保存",
+    "devTools.k7BreadcrumbsDevToolsLabel": "开发工具",
+    "embeddableApi.actions.applyFilterActionTitle": "将筛选应用于当前视图",
+    "embeddableApi.addPanel.createNewDefaultOption": "创建新的......",
+    "embeddableApi.addPanel.displayName": "添加面板",
+    "embeddableApi.addPanel.savedObjectAddedToContainerSuccessMessageTitle": "{savedObjectName} 已添加",
+    "embeddableApi.addPanel.Title": "添加面板",
+    "embeddableApi.customizePanel.action.displayName": "定制面板",
+    "embeddableApi.customizePanel.modal.cancel": "取消",
+    "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleFormRowLabel": "面板标题",
+    "embeddableApi.customizePanel.modal.optionsMenuForm.panelTitleInputAriaLabel": "为面板输入定制标题",
+    "embeddableApi.customizePanel.modal.optionsMenuForm.resetCustomDashboardButtonLabel": "重置",
+    "embeddableApi.customizePanel.modal.saveButtonTitle": "保存",
+    "embeddableApi.customizePanel.modal.showTitle": "显示面板标题",
+    "embeddableApi.customizeTitle.optionsMenuForm.panelTitleFormRowLabel": "面板标题",
+    "embeddableApi.customizeTitle.optionsMenuForm.panelTitleInputAriaLabel": "对此输入的更改将立即应用。按 enter 键可退出。",
+    "embeddableApi.customizeTitle.optionsMenuForm.resetCustomDashboardButtonLabel": "重置标题",
+    "embeddableApi.errors.embeddableFactoryNotFound": "{type} 无法加载。请升级到具有适当许可的默认 Elasticsearch 和 Kibana 分发。",
+    "embeddableApi.errors.paneldoesNotExist": "未找到面板",
+    "embeddableApi.panel.editPanel.displayName": "编辑 {value}",
+    "embeddableApi.panel.inspectPanel.displayName": "检查",
+    "embeddableApi.panel.optionsMenu.panelOptionsButtonAriaLabel": "面板选项",
+    "embeddableApi.panel.removePanel.displayName": "从仪表板删除",
+    "embeddableApi.samples.contactCard.displayName": "联系卡片",
+    "embeddableApi.samples.filterableContainer.displayName": "可筛选仪表板",
+    "embeddableApi.samples.filterableEmbeddable.displayName": "可筛选",
+    "embeddableApi.panel.enhancedDashboardPanelAriaLabel": "仪表板面板：{title}",
+    "embeddableApi.panel.optionsMenu.panelOptionsButtonEnhancedAriaLabel": "{title} 的面板选项",
+    "embeddableApi.panel.dashboardPanelAriaLabel": "仪表板面板",
+    "inputControl.control.noIndexPatternTooltip": "找不到索引模式 ID：{indexPatternId}。",
+    "inputControl.control.notInitializedTooltip": "尚未初始化控件",
+    "inputControl.control.noValuesDisableTooltip": "按 “{fieldName}” 字段进行了筛选，但 “{indexPatternName}” 索引模式的任何文档中都不存在该字段。选择不同的字段或索引包含此字段的值的文档。",
+    "inputControl.editor.controlEditor.controlLabel": "控件标签",
+    "inputControl.editor.controlEditor.moveControlDownAriaLabel": "下移控件",
+    "inputControl.editor.controlEditor.moveControlUpAriaLabel": "上移控件",
+    "inputControl.editor.controlEditor.removeControlAriaLabel": "删除控件",
+    "inputControl.editor.controlsTab.addButtonLabel": "添加",
+    "inputControl.editor.controlsTab.select.addControlAriaLabel": "添加控件",
+    "inputControl.editor.controlsTab.select.controlTypeAriaLabel": "选择控件类型",
+    "inputControl.editor.controlsTab.select.listDropDownOptionLabel": "选项列表",
+    "inputControl.editor.controlsTab.select.rangeDropDownOptionLabel": "范围滑块",
+    "inputControl.editor.fieldSelect.fieldLabel": "字段",
+    "inputControl.editor.fieldSelect.selectFieldPlaceholder": "选择字段......",
+    "inputControl.editor.indexPatternSelect.patternLabel": "索引模式",
+    "inputControl.editor.indexPatternSelect.patternPlaceholder": "选择索引模式......",
+    "inputControl.editor.listControl.dynamicOptions.stringFieldDescription": "仅适用于“字符串”字段",
+    "inputControl.editor.listControl.dynamicOptions.updateDescription": "基于用户输入更新选项",
+    "inputControl.editor.listControl.dynamicOptionsLabel": "动态选项",
+    "inputControl.editor.listControl.multiselectDescription": "允许多选",
+    "inputControl.editor.listControl.multiselectLabel": "多选",
+    "inputControl.editor.listControl.parentDescription": "选项基于父控件的值。如果未设置父控件，则禁用。",
+    "inputControl.editor.listControl.parentLabel": "父控件",
+    "inputControl.editor.listControl.sizeDescription": "选项数目",
+    "inputControl.editor.listControl.sizeLabel": "大小",
+    "inputControl.editor.optionsTab.pinFiltersLabel": "为所有应用程序固定筛选",
+    "inputControl.editor.optionsTab.updateFilterLabel": "每次更改时更新 Kibana 筛选",
+    "inputControl.editor.optionsTab.useTimeFilterLabel": "使用时间筛选",
+    "inputControl.editor.rangeControl.decimalPlacesLabel": "小数位数",
+    "inputControl.editor.rangeControl.stepSizeLabel": "步长",
+    "inputControl.function.help": "输入控制可视化",
+    "inputControl.listControl.disableTooltip": "设置 “{label}” 之前禁用。",
+    "inputControl.listControl.unableToFetchTooltip": "无法提取词，错误：{errorMessage}",
+    "inputControl.rangeControl.unableToFetchTooltip": "无法提取范围最小值和最大值，错误：{errorMessage}",
+    "inputControl.register.controlsDescription": "创建交互控件，以方便仪表板操控。",
+    "inputControl.register.controlsTitle": "控件",
+    "inputControl.register.tabs.controlsTitle": "控件",
+    "inputControl.register.tabs.optionsTitle": "选项",
+    "inputControl.vis.inputControlVis.applyChangesButtonLabel": "应用更改",
+    "inputControl.vis.inputControlVis.cancelChangesButtonLabel": "取消更改",
+    "inputControl.vis.inputControlVis.clearFormButtonLabel": "清除表单",
+    "inputControl.vis.listControl.selectPlaceholder": "选择......",
+    "inputControl.vis.listControl.selectTextPlaceholder": "选择......",
+    "inputControl.vis.listControl.partialResultsWarningMessage": "字词列表可能不完整，因为请求花费的时间过长。在 Kibana.yml 中调整自动完成设置以获取完整的结果。",
+    "visualizations.function.visDimension.accessor.help": "数据集中要使用的列（列索引或列名称）",
+    "visualizations.function.visDimension.error.accessor": "提供的列名称无效",
+    "visualizations.function.visDimension.help": "生成 visConfig 维度对象",
+    "expressions.functions.kibana_context.help": "更新 kibana 全局上下文",
+    "expressions.functions.kibana.help": "获取 kibana 全局上下文",
+    "expressions.functions.font.args.alignHelpText": "水平文本对齐。",
+    "expressions.functions.font.args.colorHelpText": "文本颜色。",
+    "expressions.functions.font.args.italicHelpText": "使文本变为斜体？",
+    "expressions.functions.font.args.lHeightHelpText": "行高（像素）",
+    "expressions.functions.font.args.sizeHelpText": "字体大小（像素）",
+    "expressions.functions.font.args.underlineHelpText": "为文本加下划线？",
+    "expressions.functions.font.args.weightHelpText": "字体粗细。例如 {list} 或 {end}。",
+    "expressions.functions.fontHelpText": "创建字体样式。",
+    "kbn.advancedSettings.context.defaultSizeText": "要在上下文视图中显示的周围条目数目",
+    "kbn.advancedSettings.context.defaultSizeTitle": "上下文大小",
+    "kbn.advancedSettings.context.sizeStepText": "递增或递减上下文大小的步进大小",
+    "kbn.advancedSettings.context.sizeStepTitle": "上下文大小步进",
+    "kbn.advancedSettings.context.tieBreakerFieldsText": "要在具有相同时间戳值的文档之间用于平分决胜的字段逗号分隔列表。将使用此列表上存在且在当前索引模式下可排序的第一个字段。",
+    "kbn.advancedSettings.context.tieBreakerFieldsTitle": "平分决胜字段",
+    "kbn.advancedSettings.courier.customRequestPreference.requestPreferenceLinkText": "请求首选项",
+    "kbn.advancedSettings.courier.customRequestPreferenceText": "将 “{setRequestReferenceSetting} 设置为 {customSettingValue} 时，将使用 “{requestPreferenceLink}”。",
+    "kbn.advancedSettings.courier.customRequestPreferenceTitle": "定制请求首选项",
+    "kbn.advancedSettings.courier.ignoreFilterText": "此配置增强对包含可视化的仪表板访问不同索引的支持。禁用时，将向所有可视化应用所有筛选。启用时，如果可视化的索引不包含筛选字段，则会为该可视化忽略筛选。",
+    "kbn.advancedSettings.courier.ignoreFilterTitle": "忽略筛选",
+    "kbn.advancedSettings.courier.maxRequestsText": "控制用于 Kibana 发送的 _msearch 请求的 “{maxRequestsLink}” 设置。设置为 0 可禁用此配置并使用 Elasticsearch 默认值。",
+    "kbn.advancedSettings.courier.maxRequestsTitle": "最大并发分片请求数",
+    "kbn.advancedSettings.courier.requestPreferenceCustom": "定制",
+    "kbn.advancedSettings.courier.requestPreferenceNone": "无",
+    "kbn.advancedSettings.courier.requestPreferenceSessionId": "会话 ID",
+    "kbn.advancedSettings.courier.requestPreferenceText": "允许您设置用于处理搜索请求的分片。<ul>\n            <li><strong>{sessionId}：</strong>仅限在相同分片上执行操作中的所有搜索请求。\n              这有利于在各个请求之间复用分片缓存。</li>\n            <li><strong>{custom}：</strong>允许您定义自己的首选项。\n              使用 <strong>courier:customRequestPreference</strong> 定制首选项值。</li>\n            <li><strong>{none}：</strong>表示不设置首选项。\n              这可能会提供更佳的性能，因此请求可以在所有分片副本上进行分配。\n              不过，结果可能会不一致，因为不同的分片可能处于不同的刷新状态。</li>\n          </ul>",
+    "kbn.advancedSettings.courier.requestPreferenceTitle": "请求首选项",
+    "kbn.advancedSettings.csv.quoteValuesText": "在 csv 导出中是否应使用引号引起值？",
+    "kbn.advancedSettings.csv.quoteValuesTitle": "使用引号引起 CSV 值",
+    "kbn.advancedSettings.csv.separatorText": "使用此字符串分隔导出的值",
+    "kbn.advancedSettings.csv.separatorTitle": "CSV 分隔符",
+    "kbn.advancedSettings.darkModeText": "为 Kibana UI 启用深色模式需要刷新页面，才能应用设置。",
+    "kbn.advancedSettings.darkModeTitle": "深色模式",
+    "kbn.advancedSettings.dateFormat.dayOfWeekText": "一周从哪一日开始？",
+    "kbn.advancedSettings.dateFormat.dayOfWeekTitle": "周内日",
+    "kbn.advancedSettings.dateFormat.optionsLinkText": "格式",
+    "kbn.advancedSettings.dateFormat.scaled.intervalsLinkText": "ISO8601 时间间隔",
+    "kbn.advancedSettings.dateFormat.scaledText": "定义在基于时间的数据按顺序呈现且格式化时间戳应适应度量时间间隔时所用格式的值。键是 {intervalsLink}。",
+    "kbn.advancedSettings.dateFormat.scaledTitle": "缩放的日期格式",
+    "kbn.advancedSettings.dateFormat.timezoneText": "应使用哪个时区。{defaultOption} 将使用您的浏览器检测到的时区。",
+    "kbn.advancedSettings.dateFormat.timezoneTitle": "用于设置日期格式的时区",
+    "kbn.advancedSettings.dateFormatText": "显示格式正确的日期时，请使用此{formatLink}",
+    "kbn.advancedSettings.dateFormatTitle": "日期格式",
+    "kbn.advancedSettings.dateNanosFormatText": "用于 Elasticsearch 的 {dateNanosLink} 数据类型",
+    "kbn.advancedSettings.dateNanosFormatTitle": "纳秒格式的日期",
+    "kbn.advancedSettings.dateNanosLinkTitle": "date_nanos",
+    "kbn.advancedSettings.defaultColumnsText": "“发现”选项卡中默认显示的列",
+    "kbn.advancedSettings.defaultColumnsTitle": "默认列",
+    "kbn.advancedSettings.defaultIndexText": "未设置索引时要访问的索引",
+    "kbn.advancedSettings.defaultIndexTitle": "默认索引",
+    "kbn.advancedSettings.disableAnimationsText": "在 Kibana UI 中关闭所有没有必要的动画。刷新页面以应用更改。",
+    "kbn.advancedSettings.disableAnimationsTitle": "禁用动画",
+    "kbn.advancedSettings.discover.aggsTermsSizeText": "确定在单击“可视化”按钮时将在发现侧边栏的字段下拉列表中可视化多少个词。",
+    "kbn.advancedSettings.discover.aggsTermsSizeTitle": "词数目",
+    "kbn.advancedSettings.discover.sampleSizeText": "要在表中显示的行数目",
+    "kbn.advancedSettings.discover.sampleSizeTitle": "行数目",
+    "kbn.advancedSettings.discover.sortDefaultOrderText": "在 Discover 应用中控制基于时间的索引模式的默认排序方向。",
+    "kbn.advancedSettings.discover.sortDefaultOrderTitle": "默认排序方向",
+    "kbn.advancedSettings.discover.sortOrderAsc": "升序",
+    "kbn.advancedSettings.discover.sortOrderDesc": "降序",
+    "kbn.advancedSettings.docTableHideTimeColumnText": "在 Discover 中和仪表板上的所有已保存搜索中隐藏“时间”列。",
+    "kbn.advancedSettings.docTableHideTimeColumnTitle": "隐藏“时间”列",
+    "kbn.advancedSettings.docTableHighlightText": "突出显示 Discover 和已保存搜索仪表板中的结果。处理大文档时，突出显示会使请求变慢。",
+    "kbn.advancedSettings.docTableHighlightTitle": "突出显示结果",
+    "kbn.advancedSettings.fieldsPopularLimitText": "要显示的排名前 N 最常见字段",
+    "kbn.advancedSettings.fieldsPopularLimitTitle": "常见字段限制",
+    "kbn.advancedSettings.format.bytesFormat.numeralFormatLinkText": "数值格式",
+    "kbn.advancedSettings.format.bytesFormatText": "“字节”格式的默认{numeralFormatLink}",
+    "kbn.advancedSettings.format.bytesFormatTitle": "字节格式",
+    "kbn.advancedSettings.format.currencyFormat.numeralFormatLinkText": "数值格式",
+    "kbn.advancedSettings.format.currencyFormatText": "“货币”格式的默认{numeralFormatLink}",
+    "kbn.advancedSettings.format.currencyFormatTitle": "货币格式",
+    "kbn.advancedSettings.format.defaultTypeMapText": "要默认用于每个字段类型的格式名称的映射。如果未显式提及字段类型，则将使用{defaultFormat}",
+    "kbn.advancedSettings.format.defaultTypeMapTitle": "字段类型格式名称",
+    "kbn.advancedSettings.format.formattingLocale.numeralLanguageLinkText": "数值语言",
+    "kbn.advancedSettings.format.formattingLocaleText": "{numeralLanguageLink}区域设置",
+    "kbn.advancedSettings.format.formattingLocaleTitle": "格式区域设置",
+    "kbn.advancedSettings.format.numberFormat.numeralFormatLinkText": "数值格式",
+    "kbn.advancedSettings.format.numberFormatText": "“数字”格式的默认{numeralFormatLink}",
+    "kbn.advancedSettings.format.numberFormatTitle": "数字格式",
+    "kbn.advancedSettings.format.percentFormat.numeralFormatLinkText": "数值格式",
+    "kbn.advancedSettings.format.percentFormatText": "“百分比”格式的默认{numeralFormatLink}",
+    "kbn.advancedSettings.format.percentFormatTitle": "百分比格式",
+    "kbn.advancedSettings.histogram.barTargetText": "在日期直方图中使用“auto”时尝试生成大约此数目的条形",
+    "kbn.advancedSettings.histogram.barTargetTitle": "目标条形数",
+    "kbn.advancedSettings.histogram.maxBarsText": "在日期直方图中不要显示超过该数目的条形",
+    "kbn.advancedSettings.histogram.maxBarsTitle": "最大条形数",
+    "kbn.advancedSettings.historyLimitText": "在具有历史记录（例如查询输入）的字段中，显示此数目的最近值",
+    "kbn.advancedSettings.historyLimitTitle": "历史记录限制",
+    "kbn.advancedSettings.indexPattern.recentMatchingText": "对于名称中包含时间戳的索引模式，寻找此数目的最近匹配模式，以从其中查询字段映射",
+    "kbn.advancedSettings.indexPattern.recentMatchingTitle": "最近匹配模式",
+    "kbn.advancedSettings.indexPatternPlaceholderText": "在“管理 > 索引模式 > 创建索引模式”中“索引模式名称”的占位符。",
+    "kbn.advancedSettings.indexPatternPlaceholderTitle": "索引模式占位符",
+    "kbn.advancedSettings.maxBucketsText": "单个数据源可以返回的最大存储桶数目",
+    "kbn.advancedSettings.maxBucketsTitle": "最大存储桶数",
+    "kbn.advancedSettings.maxCellHeightText": "表中单元格应占用的最大高度。设置为 0 可禁用截短",
+    "kbn.advancedSettings.maxCellHeightTitle": "最大表单元格高度",
+    "kbn.advancedSettings.metaFieldsText": "_source 之外存在的、在显示我们的文档时将合并进其中的字段",
+    "kbn.advancedSettings.metaFieldsTitle": "元字段",
+    "kbn.advancedSettings.notifications.banner.markdownLinkText": "Markdown 受支持",
+    "kbn.advancedSettings.notifications.bannerLifetimeText": "在屏幕上显示横幅通知的时间（毫秒）。设置为 {infinityValue} 将禁用倒计时。",
+    "kbn.advancedSettings.notifications.bannerLifetimeTitle": "横幅通知生存时间",
+    "kbn.advancedSettings.notifications.bannerText": "用于向所有用户发送临时通知的定制横幅。{markdownLink}",
+    "kbn.advancedSettings.notifications.bannerTitle": "定制横幅通知",
+    "kbn.advancedSettings.notifications.errorLifetimeText": "在屏幕上显示错误通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
+    "kbn.advancedSettings.notifications.errorLifetimeTitle": "错误通知生存时间",
+    "kbn.advancedSettings.notifications.infoLifetimeText": "在屏幕上显示信息通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
+    "kbn.advancedSettings.notifications.infoLifetimeTitle": "信息通知生存时间",
+    "kbn.advancedSettings.notifications.warningLifetimeText": "在屏幕上显示警告通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
+    "kbn.advancedSettings.notifications.warningLifetimeTitle": "警告通知生存时间",
+    "kbn.advancedSettings.pinFiltersText": "筛选是否默认有全局状态（被固定）",
+    "kbn.advancedSettings.pinFiltersTitle": "默认固定筛选",
+    "kbn.advancedSettings.query.allowWildcardsText": "设置后，将允许 * 用作查询语句的第一个字符。当前仅在查询栏中启用实验性查询功能时才会应用。要在基本 lucene 查询中禁用前导通配符，请使用“{queryStringOptionsPattern}”。",
+    "kbn.advancedSettings.query.allowWildcardsTitle": "在查询中允许前导通配符",
+    "kbn.advancedSettings.query.queryStringOptions.optionsLinkText": "选项",
+    "kbn.advancedSettings.query.queryStringOptionsText": "lucene 查询字符串解析器的{optionsLink}。只有将“{queryLanguage}”设置为 {luceneLanguage} 时才会使用。",
+    "kbn.advancedSettings.query.queryStringOptionsTitle": "查询字符串选项",
+    "kbn.advancedSettings.savedObjects.listingLimitText": "为列表页面提取的对象数目",
+    "kbn.advancedSettings.savedObjects.listingLimitTitle": "对象列表限制",
+    "kbn.advancedSettings.savedObjects.perPageText": "在加载对话框中每页要显示的对象数目",
+    "kbn.advancedSettings.savedObjects.perPageTitle": "每页对象数",
+    "kbn.advancedSettings.searchQueryLanguageKql": "KQL",
+    "kbn.advancedSettings.searchQueryLanguageLucene": "Lucene",
+    "kbn.advancedSettings.searchQueryLanguageText": "查询栏使用的查询语言。KQL 是专门为 Kibana 打造的新型语言。",
+    "kbn.advancedSettings.searchQueryLanguageTitle": "查询语言",
+    "kbn.advancedSettings.shortenFieldsText": "缩短长字段，例如，不显示 foo.bar.baz，而显示 f.b.baz",
+    "kbn.advancedSettings.shortenFieldsTitle": "缩短字段",
+    "kbn.advancedSettings.sortOptions.optionsLinkText": "选项",
+    "kbn.advancedSettings.sortOptionsText": "Elasticsearch 排序参数的{optionsLink}",
+    "kbn.advancedSettings.sortOptionsTitle": "排序选项",
+    "kbn.advancedSettings.storeUrlText": "URL 有时会变得过长，以使得某些浏览器无法处理。为此，我们正在测试将 URL 的各个组成部分存储在会话存储中是否会有帮助。请告知我们这样做的效果！",
+    "kbn.advancedSettings.storeUrlTitle": "将 URL 存储在会话存储中",
+    "kbn.advancedSettings.suggestFilterValuesText": "将此属性设置 false 以阻止筛选编辑器建议字段的值。",
+    "kbn.advancedSettings.suggestFilterValuesTitle": "筛选编辑器建议值",
+    "kbn.advancedSettings.timepicker.last15Minutes": "过去 15 分钟",
+    "kbn.advancedSettings.timepicker.last1Hour": "过去 1 小时",
+    "kbn.advancedSettings.timepicker.last1Year": "过去 1 年",
+    "kbn.advancedSettings.timepicker.last24Hours": "过去 24 小时",
+    "kbn.advancedSettings.timepicker.last30Days": "过去 30 天",
+    "kbn.advancedSettings.timepicker.last30Minutes": "过去 30 分钟",
+    "kbn.advancedSettings.timepicker.last7Days": "过去 7 天",
+    "kbn.advancedSettings.timepicker.last90Days": "过去 90 天",
+    "kbn.advancedSettings.timepicker.quickRanges.acceptedFormatsLinkText": "接受的格式",
+    "kbn.advancedSettings.timepicker.quickRangesText": "要在时间选取器的“速选”部分中显示的范围列表。这应该是对象数组，每个对象包含“from”、“to”（请参阅“{acceptedFormatsLink}”）和“display”（要显示的标题）。",
+    "kbn.advancedSettings.timepicker.quickRangesTitle": "时间筛选速选范围",
+    "kbn.advancedSettings.timepicker.refreshIntervalDefaultsText": "时间筛选的默认刷新时间间隔",
+    "kbn.advancedSettings.timepicker.refreshIntervalDefaultsTitle": "时间筛选刷新时间间隔",
+    "kbn.advancedSettings.timepicker.thisWeek": "本周",
+    "kbn.advancedSettings.timepicker.timeDefaultsText": "未使用时间筛选启动 Kibana 时要使用的时间筛选选择",
+    "kbn.advancedSettings.timepicker.timeDefaultsTitle": "时间筛选默认值",
+    "kbn.advancedSettings.timepicker.today": "今日",
+    "kbn.advancedSettings.visualization.colorMappingText": "将值映射到可视化内的指定颜色",
+    "kbn.advancedSettings.visualization.colorMappingTitle": "颜色映射",
+    "kbn.advancedSettings.visualization.dimmingOpacityText": "突出显示图表的其他元素时变暗图表项的透明度。此数字越低，突出显示的元素越突出。必须是介于 0 和 1 之间的数字。",
+    "kbn.advancedSettings.visualization.dimmingOpacityTitle": "变暗透明度",
+    "kbn.advancedSettings.visualization.loadingDelayText": "在查询期间在将可视化变暗之前要等待的时间",
+    "kbn.advancedSettings.visualization.loadingDelayTitle": "加载延迟",
+    "kbn.advancedSettings.visualization.showRegionMapWarningsText": "词无法联接到地图上的形状时，区域地图是否显示警告。",
+    "kbn.advancedSettings.visualization.showRegionMapWarningsTitle": "显示区域地图警告",
+    "kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText": "单元格维度的解释",
+    "kbn.advancedSettings.visualization.tileMap.maxPrecisionText": "在磁贴地图上显示的最大 geoHash 精确度：7 为高，10 为很高，12 为最大值。{cellDimensionsLink}",
+    "kbn.advancedSettings.visualization.tileMap.maxPrecisionTitle": "最大磁贴地图精确度",
+    "kbn.advancedSettings.visualization.tileMap.wmsDefaults.propertiesLinkText": "属性",
+    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsText": "坐标地图中 WMS 地图服务器支持的默认{propertiesLink}",
+    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsTitle": "默认 WMS 属性",
+    "kbn.advancedSettings.visualizeEnableLabsText": "允许用户创建、查看和编辑实验性可视化。如果禁用，\n          仅被视为生产就绪的可视化可供用户使用。",
+    "kbn.advancedSettings.visualizeEnableLabsTitle": "启用实验性可视化",
+    "kbn.common.tutorials.auditbeat.cloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.auditbeat.premCloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.auditbeat.premInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.debTitle": "编辑配置",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.osxTitle": "编辑配置",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.rpmTitle": "编辑配置",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.auditbeatCloudInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.auditbeatInstructions.config.debTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.auditbeatInstructions.config.debTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.auditbeatInstructions.config.debTitle": "编辑配置",
+    "kbn.common.tutorials.auditbeatInstructions.config.osxTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.auditbeatInstructions.config.osxTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.auditbeatInstructions.config.osxTitle": "编辑配置",
+    "kbn.common.tutorials.auditbeatInstructions.config.rpmTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.auditbeatInstructions.config.rpmTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.auditbeatInstructions.config.rpmTitle": "编辑配置",
+    "kbn.common.tutorials.auditbeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.auditbeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.auditbeatInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.auditbeatInstructions.install.debTextPost": "寻找 32 位软件包？请参阅[下载页面]({linkUrl})。",
+    "kbn.common.tutorials.auditbeatInstructions.install.debTextPre": "首次使用 Auditbeat？请参阅[入门指南]({linkUrl})。",
+    "kbn.common.tutorials.auditbeatInstructions.install.debTitle": "下载并安装 Auditbeat",
+    "kbn.common.tutorials.auditbeatInstructions.install.osxTextPre": "首次使用 Auditbeat？请参阅[入门指南]({linkUrl})。",
+    "kbn.common.tutorials.auditbeatInstructions.install.osxTitle": "下载并安装 Auditbeat",
+    "kbn.common.tutorials.auditbeatInstructions.install.rpmTextPost": "寻找 32 位软件包？请参阅[下载页面]({linkUrl})。",
+    "kbn.common.tutorials.auditbeatInstructions.install.rpmTextPre": "首次使用 Auditbeat？请参阅[入门指南]({linkUrl})。",
+    "kbn.common.tutorials.auditbeatInstructions.install.rpmTitle": "下载并安装 Auditbeat",
+    "kbn.common.tutorials.auditbeatInstructions.install.windowsTextPost": "在 {auditbeatPath} 文件中修改 {propertyName} 下的设置以指向您的 Elasticsearch 安装。",
+    "kbn.common.tutorials.auditbeatInstructions.install.windowsTextPre": "首次使用 Auditbeat？请参阅[入门指南]({guideLinkUrl})。\n 1.从[下载]({auditbeatLinkUrl})页面下载 Auditbeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 `{directoryName}` 目录重命名为 `Auditbeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符处，运行以下命令以将 Auditbeat 安装为 Windows 服务。",
+    "kbn.common.tutorials.auditbeatInstructions.install.windowsTitle": "下载并安装 Auditbeat",
+    "kbn.common.tutorials.auditbeatInstructions.start.debTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.auditbeatInstructions.start.debTitle": "启动 Auditbeat",
+    "kbn.common.tutorials.auditbeatInstructions.start.osxTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.auditbeatInstructions.start.osxTitle": "启动 Auditbeat",
+    "kbn.common.tutorials.auditbeatInstructions.start.rpmTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.auditbeatInstructions.start.rpmTitle": "启动 Auditbeat",
+    "kbn.common.tutorials.auditbeatInstructions.start.windowsTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.auditbeatInstructions.start.windowsTitle": "启动 Auditbeat",
+    "kbn.common.tutorials.auditbeatStatusCheck.buttonLabel": "检查数据",
+    "kbn.common.tutorials.auditbeatStatusCheck.errorText": "尚未接收到数据",
+    "kbn.common.tutorials.auditbeatStatusCheck.successText": "已成功接收数据",
+    "kbn.common.tutorials.auditbeatStatusCheck.text": "确认从 Auditbeat 收到数据",
+    "kbn.common.tutorials.auditbeatStatusCheck.title": "状态",
+    "kbn.common.tutorials.filebeat.cloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.filebeat.premCloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.filebeat.premInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.debTitle": "编辑配置",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.osxTitle": "编辑配置",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.rpmTitle": "编辑配置",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.filebeatCloudInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.filebeatEnableInstructions.debTextPost": "在 `/etc/filebeat/modules.d/{moduleName}.yml` 文件中修改设置。",
+    "kbn.common.tutorials.filebeatEnableInstructions.debTitle": "启用和配置 {moduleName} 模块",
+    "kbn.common.tutorials.filebeatEnableInstructions.osxTextPost": "在 `modules.d/{moduleName}.yml` 文件中修改设置。",
+    "kbn.common.tutorials.filebeatEnableInstructions.osxTextPre": "从安装目录中，运行：",
+    "kbn.common.tutorials.filebeatEnableInstructions.osxTitle": "启用和配置 {moduleName} 模块",
+    "kbn.common.tutorials.filebeatEnableInstructions.rpmTextPost": "在 `/etc/filebeat/modules.d/{moduleName}.yml` 文件中修改设置。",
+    "kbn.common.tutorials.filebeatEnableInstructions.rpmTitle": "启用和配置 {moduleName} 模块",
+    "kbn.common.tutorials.filebeatEnableInstructions.windowsTextPost": "在 `modules.d/{moduleName}.yml` 文件中修改设置。",
+    "kbn.common.tutorials.filebeatEnableInstructions.windowsTextPre": "从 {path} 文件夹中，运行：",
+    "kbn.common.tutorials.filebeatEnableInstructions.windowsTitle": "启用和配置 {moduleName} 模块",
+    "kbn.common.tutorials.filebeatInstructions.config.debTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.filebeatInstructions.config.debTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.filebeatInstructions.config.debTitle": "编辑配置",
+    "kbn.common.tutorials.filebeatInstructions.config.osxTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.filebeatInstructions.config.osxTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.filebeatInstructions.config.osxTitle": "编辑配置",
+    "kbn.common.tutorials.filebeatInstructions.config.rpmTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.filebeatInstructions.config.rpmTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.filebeatInstructions.config.rpmTitle": "编辑配置",
+    "kbn.common.tutorials.filebeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.filebeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.filebeatInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.filebeatInstructions.install.debTextPost": "寻找 32 位软件包？请参阅[下载页面]({linkUrl})。",
+    "kbn.common.tutorials.filebeatInstructions.install.debTextPre": "首次使用 Filebeat？请参阅[入门指南]({linkUrl})。",
+    "kbn.common.tutorials.filebeatInstructions.install.debTitle": "下载并安装 Filebeat",
+    "kbn.common.tutorials.filebeatInstructions.install.osxTextPre": "首次使用 Filebeat？请参阅[入门指南]({linkUrl})。",
+    "kbn.common.tutorials.filebeatInstructions.install.osxTitle": "下载并安装 Filebeat",
+    "kbn.common.tutorials.filebeatInstructions.install.rpmTextPost": "寻找 32 位软件包？请参阅[下载页面]({linkUrl})。",
+    "kbn.common.tutorials.filebeatInstructions.install.rpmTextPre": "首次使用 Filebeat？请参阅[入门指南]({linkUrl})。",
+    "kbn.common.tutorials.filebeatInstructions.install.rpmTitle": "下载并安装 Filebeat",
+    "kbn.common.tutorials.filebeatInstructions.install.windowsTextPost": "在 {filebeatPath} 文件中修改 {propertyName} 下的设置以指向您的 Elasticsearch 安装。",
+    "kbn.common.tutorials.filebeatInstructions.install.windowsTextPre": "首次使用 Filebeat？请参阅[入门指南]({guideLinkUrl})。\n 1.从[下载]({filebeatLinkUrl})页面下载 Filebeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 `{directoryName}` 目录重命名为 `Filebeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符处，运行以下命令以将 Filebeat 安装为 Windows 服务。",
+    "kbn.common.tutorials.filebeatInstructions.install.windowsTitle": "下载并安装 Filebeat",
+    "kbn.common.tutorials.filebeatInstructions.start.debTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.filebeatInstructions.start.debTitle": "启动 Filebeat",
+    "kbn.common.tutorials.filebeatInstructions.start.osxTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.filebeatInstructions.start.osxTitle": "启动 Filebeat",
+    "kbn.common.tutorials.filebeatInstructions.start.rpmTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.filebeatInstructions.start.rpmTitle": "启动 Filebeat",
+    "kbn.common.tutorials.filebeatInstructions.start.windowsTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.filebeatInstructions.start.windowsTitle": "启动 Filebeat",
+    "kbn.common.tutorials.filebeatStatusCheck.buttonLabel": "检查数据",
+    "kbn.common.tutorials.filebeatStatusCheck.errorText": "尚未从此模块收到任何数据",
+    "kbn.common.tutorials.filebeatStatusCheck.successText": "从此模块成功收到数据",
+    "kbn.common.tutorials.filebeatStatusCheck.text": "确认已从 Filebeat `{moduleName}` 模块成功收到数据",
+    "kbn.common.tutorials.filebeatStatusCheck.title": "模块状态",
+    "kbn.common.tutorials.functionbeat.cloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.functionbeat.premCloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.functionbeat.premInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.functionbeatAWSInstructions.textPost": "其中 `<your-access-key>` 和 `<your-secret-access-key>` 是您的帐户凭据，`us-east-1` 是所需的地区。",
+    "kbn.common.tutorials.functionbeatAWSInstructions.textPre": "在环境中设置您的 AWS 帐户凭据：",
+    "kbn.common.tutorials.functionbeatAWSInstructions.title": "设置 AWS 凭据",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.osxTitle": "编辑配置",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.functionbeatEnableOnPremInstructions.defaultTextPost": "其中 `<cloudwatch-log-group>` 是要采集的日志组名称，`<unique-bucket-name>` 是将用于暂存 Functionbeat 部署的有效 S3 存储桶名称。",
+    "kbn.common.tutorials.functionbeatEnableOnPremInstructions.defaultTitle": "配置 Cloudwatch 日志组",
+    "kbn.common.tutorials.functionbeatEnableOnPremInstructionsOSXLinux.textPre": "在 `functionbeat.yml` 文件中修改设置。",
+    "kbn.common.tutorials.functionbeatEnableOnPremInstructionsWindows.textPre": "在 {path} 文件中修改设置。",
+    "kbn.common.tutorials.functionbeatInstructions.config.osxTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.functionbeatInstructions.config.osxTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.functionbeatInstructions.config.osxTitle": "配置 Elastic 集群",
+    "kbn.common.tutorials.functionbeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.functionbeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.functionbeatInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.functionbeatInstructions.deploy.osxTextPre": "这会将 Functionbeat 安装为 Lambda 函数。`setup` 命令检查 Elasticsearch 配置并加载 Kibana 索引模式。通常可省略此命令。",
+    "kbn.common.tutorials.functionbeatInstructions.deploy.osxTitle": "将 Functionbeat 部署到 AWS Lambda",
+    "kbn.common.tutorials.functionbeatInstructions.deploy.windowsTextPre": "这会将 Functionbeat 安装为 Lambda 函数。`setup` 命令检查 Elasticsearch 配置并加载 Kibana 索引模式。通常可省略此命令。",
+    "kbn.common.tutorials.functionbeatInstructions.deploy.windowsTitle": "将 Functionbeat 部署到 AWS Lambda",
+    "kbn.common.tutorials.functionbeatInstructions.install.linuxTextPre": "首次使用 Functionbeat？请参阅[入门指南]({link})。",
+    "kbn.common.tutorials.functionbeatInstructions.install.linuxTitle": "下载并安装 Functionbeat",
+    "kbn.common.tutorials.functionbeatInstructions.install.osxTextPre": "首次使用 Functionbeat？请参阅[入门指南]({link})。",
+    "kbn.common.tutorials.functionbeatInstructions.install.osxTitle": "下载并安装 Functionbeat",
+    "kbn.common.tutorials.functionbeatInstructions.install.windowsTextPre": "首次使用 Functionbeat？请参阅[入门指南]({functionbeatLink})。\n 1.从[下载]({elasticLink})页面下载 Functionbeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 {directoryName} 目录重命名为 `Functionbeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符下，前往 Functionbeat 目录：",
+    "kbn.common.tutorials.functionbeatInstructions.install.windowsTitle": "下载并安装 Functionbeat",
+    "kbn.common.tutorials.functionbeatStatusCheck.buttonLabel": "检查数据",
+    "kbn.common.tutorials.functionbeatStatusCheck.errorText": "尚未从 Functionbeat 收到任何数据",
+    "kbn.common.tutorials.functionbeatStatusCheck.successText": "从 Functionbeat 成功收到数据",
+    "kbn.common.tutorials.functionbeatStatusCheck.text": "确认从 Functionbeat 收到数据",
+    "kbn.common.tutorials.functionbeatStatusCheck.title": "Functionbeat 状态",
+    "kbn.common.tutorials.heartbeat.cloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.heartbeat.premCloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.heartbeat.premInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.debTitle": "编辑配置",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.osxTitle": "编辑配置",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTitle": "编辑配置",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.debTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.defaultTextPost": "有关如何在 Heartbeat 中配置监测的详细信息，请参阅 [Heartbeat 配置文档]({configureLink})",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.defaultTitle": "编辑配置 - 添加监测",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.osxTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.rpmTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
+    "kbn.common.tutorials.heartbeatEnableCloudInstructions.windowsTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.debTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.defaultTextPost": "其中 {hostTemplate} 是受监测 URL。有关如何在 Heartbeat 中配置监测的详细信息，请参阅 [Heartbeat 配置文档]({configureLink})",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.defaultTitle": "编辑配置 - 添加监测",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.osxTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.rpmTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
+    "kbn.common.tutorials.heartbeatEnableOnPremInstructions.windowsTextPre": "在 `heartbeat.yml` 文件中编辑 `heartbeat.monitors` 设置。",
+    "kbn.common.tutorials.heartbeatInstructions.config.debTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.heartbeatInstructions.config.debTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.heartbeatInstructions.config.debTitle": "编辑配置",
+    "kbn.common.tutorials.heartbeatInstructions.config.osxTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.heartbeatInstructions.config.osxTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.heartbeatInstructions.config.osxTitle": "编辑配置",
+    "kbn.common.tutorials.heartbeatInstructions.config.rpmTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.heartbeatInstructions.config.rpmTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.heartbeatInstructions.config.rpmTitle": "编辑配置",
+    "kbn.common.tutorials.heartbeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.heartbeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.heartbeatInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.heartbeatInstructions.install.debTextPost": "寻找 32 位软件包？请参阅[下载页面]({link})。",
+    "kbn.common.tutorials.heartbeatInstructions.install.debTextPre": "首次使用 Heartbeat？请参阅[入门指南]({link})。",
+    "kbn.common.tutorials.heartbeatInstructions.install.debTitle": "下载并安装 Heartbeat",
+    "kbn.common.tutorials.heartbeatInstructions.install.osxTextPre": "首次使用 Heartbeat？请参阅[入门指南]({link})。",
+    "kbn.common.tutorials.heartbeatInstructions.install.osxTitle": "下载并安装 Heartbeat",
+    "kbn.common.tutorials.heartbeatInstructions.install.rpmTextPre": "首次使用 Heartbeat？请参阅[入门指南]({link})。",
+    "kbn.common.tutorials.heartbeatInstructions.install.rpmTitle": "下载并安装 Heartbeat",
+    "kbn.common.tutorials.heartbeatInstructions.install.windowsTextPre": "首次使用 Heartbeat？请参阅[入门指南]({heartbeatLink})。\n 1.从[下载]({elasticLink})页面下载 Heartbeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 {directoryName} 目录重命名为 `Heartbeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符处，运行以下命令以将 Heartbeat 安装为 Windows 服务。",
+    "kbn.common.tutorials.heartbeatInstructions.install.windowsTitle": "下载并安装 Heartbeat",
+    "kbn.common.tutorials.heartbeatInstructions.start.debTextPre": "`setup` 命令加载 Kibana 索引模式。",
+    "kbn.common.tutorials.heartbeatInstructions.start.debTitle": "启动 Heartbeat",
+    "kbn.common.tutorials.heartbeatInstructions.start.osxTextPre": "`setup` 命令加载 Kibana 索引模式。",
+    "kbn.common.tutorials.heartbeatInstructions.start.osxTitle": "启动 Heartbeat",
+    "kbn.common.tutorials.heartbeatInstructions.start.rpmTextPre": "`setup` 命令加载 Kibana 索引模式。",
+    "kbn.common.tutorials.heartbeatInstructions.start.rpmTitle": "启动 Heartbeat",
+    "kbn.common.tutorials.heartbeatInstructions.start.windowsTextPre": "`setup` 命令加载 Kibana 索引模式。",
+    "kbn.common.tutorials.heartbeatInstructions.start.windowsTitle": "启动 Heartbeat",
+    "kbn.common.tutorials.heartbeatStatusCheck.buttonLabel": "检查数据",
+    "kbn.common.tutorials.heartbeatStatusCheck.errorText": "尚未从 Heartbeat 收到任何数据",
+    "kbn.common.tutorials.heartbeatStatusCheck.successText": "从 Heartbeat 成功收到数据",
+    "kbn.common.tutorials.heartbeatStatusCheck.text": "确认从 Heartbeat 收到数据",
+    "kbn.common.tutorials.heartbeatStatusCheck.title": "Heartbeat 状态",
+    "kbn.common.tutorials.logstashInstructions.install.java.osxTextPre": "按照[此处]({link})的安装说明执行操作。",
+    "kbn.common.tutorials.logstashInstructions.install.java.osxTitle": "下载并安装 Java Runtime Environment",
+    "kbn.common.tutorials.logstashInstructions.install.java.windowsTextPre": "按照[此处]({link})的安装说明执行操作。",
+    "kbn.common.tutorials.logstashInstructions.install.java.windowsTitle": "下载并安装 Java Runtime Environment",
+    "kbn.common.tutorials.logstashInstructions.install.logstash.osxTextPre": "首次使用 Logstash？ 请参阅[入门指南]({link})。",
+    "kbn.common.tutorials.logstashInstructions.install.logstash.osxTitle": "下载并安装 Logstash",
+    "kbn.common.tutorials.logstashInstructions.install.logstash.windowsTextPre": "首次使用 Logstash？ 请参阅[入门指南]({logstashLink})。\n 1. [下载]({elasticLink}) Logstash Windows zip 文件。\n 2.解压缩 zip 文件的内容。",
+    "kbn.common.tutorials.logstashInstructions.install.logstash.windowsTitle": "下载并安装 Logstash",
+    "kbn.common.tutorials.metricbeat.cloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.metricbeat.premCloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.metricbeat.premInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.debTitle": "编辑配置",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.osxTitle": "编辑配置",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.rpmTitle": "编辑配置",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.metricbeatCloudInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.metricbeatEnableInstructions.debTextPost": "在 `/etc/metricbeat/modules.d/{moduleName}.yml` 文件中修改设置。",
+    "kbn.common.tutorials.metricbeatEnableInstructions.debTitle": "启用和配置 {moduleName} 模块",
+    "kbn.common.tutorials.metricbeatEnableInstructions.osxTextPost": "在 `modules.d/{moduleName}.yml` 文件中修改设置。",
+    "kbn.common.tutorials.metricbeatEnableInstructions.osxTextPre": "从安装目录中，运行：",
+    "kbn.common.tutorials.metricbeatEnableInstructions.osxTitle": "启用和配置 {moduleName} 模块",
+    "kbn.common.tutorials.metricbeatEnableInstructions.rpmTextPost": "在 `/etc/metricbeat/modules.d/{moduleName}.yml` 文件中修改设置。",
+    "kbn.common.tutorials.metricbeatEnableInstructions.rpmTitle": "启用和配置 {moduleName} 模块",
+    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTextPost": "在 `modules.d/{moduleName}.yml` 文件中修改设置。",
+    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTextPre": "从 {path} 文件夹中，运行：",
+    "kbn.common.tutorials.metricbeatEnableInstructions.windowsTitle": "启用和配置 {moduleName} 模块",
+    "kbn.common.tutorials.metricbeatInstructions.config.debTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.metricbeatInstructions.config.debTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.metricbeatInstructions.config.debTitle": "编辑配置",
+    "kbn.common.tutorials.metricbeatInstructions.config.osxTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.metricbeatInstructions.config.osxTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.metricbeatInstructions.config.osxTitle": "编辑配置",
+    "kbn.common.tutorials.metricbeatInstructions.config.rpmTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.metricbeatInstructions.config.rpmTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.metricbeatInstructions.config.rpmTitle": "编辑配置",
+    "kbn.common.tutorials.metricbeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.metricbeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.metricbeatInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.metricbeatInstructions.install.debTextPost": "寻找 32 位软件包？请参阅[下载页面]({link})。",
+    "kbn.common.tutorials.metricbeatInstructions.install.debTextPre": "首次使用 Metricbeat？请参阅[入门指南]({link})。",
+    "kbn.common.tutorials.metricbeatInstructions.install.debTitle": "下载并安装 Metricbeat",
+    "kbn.common.tutorials.metricbeatInstructions.install.osxTextPre": "首次使用 Metricbeat？请参阅[入门指南]({link})。",
+    "kbn.common.tutorials.metricbeatInstructions.install.osxTitle": "下载并安装 Metricbeat",
+    "kbn.common.tutorials.metricbeatInstructions.install.rpmTextPre": "首次使用 Metricbeat？请参阅[入门指南]({link})。",
+    "kbn.common.tutorials.metricbeatInstructions.install.rpmTitle": "下载并安装 Metricbeat",
+    "kbn.common.tutorials.metricbeatInstructions.install.windowsTextPost": "在 {path} 文件中修改 `output.elasticsearch` 下的设置以指向您的 Elasticsearch 安装。",
+    "kbn.common.tutorials.metricbeatInstructions.install.windowsTextPre": "首次使用 Metricbeat？请参阅[入门指南]({metricbeatLink})。\n 1.从[下载]({elasticLink})页面下载 Metricbeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 {directoryName} 目录重命名为 `Metricbeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符处，运行以下命令以将 Metricbeat 安装为 Windows 服务。",
+    "kbn.common.tutorials.metricbeatInstructions.install.windowsTitle": "下载并安装 Metricbeat",
+    "kbn.common.tutorials.metricbeatInstructions.start.debTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.metricbeatInstructions.start.debTitle": "启动 Metricbeat",
+    "kbn.common.tutorials.metricbeatInstructions.start.osxTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.metricbeatInstructions.start.osxTitle": "启动 Metricbeat",
+    "kbn.common.tutorials.metricbeatInstructions.start.rpmTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.metricbeatInstructions.start.rpmTitle": "启动 Metricbeat",
+    "kbn.common.tutorials.metricbeatInstructions.start.windowsTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.metricbeatInstructions.start.windowsTitle": "启动 Metricbeat",
+    "kbn.common.tutorials.metricbeatStatusCheck.buttonLabel": "检查数据",
+    "kbn.common.tutorials.metricbeatStatusCheck.errorText": "尚未从此模块收到任何数据",
+    "kbn.common.tutorials.metricbeatStatusCheck.successText": "从此模块成功收到数据",
+    "kbn.common.tutorials.metricbeatStatusCheck.text": "确认从 Metricbeat `{moduleName}` 模块收到数据",
+    "kbn.common.tutorials.metricbeatStatusCheck.title": "模块状态",
+    "kbn.common.tutorials.premCloudInstructions.option1.textPre": "前往 [Elastic Cloud]({link})。如果您还没有帐户，请注册。免费试用 14 天。\n\n登录至 Elastic Cloud 控制台\n\n如要创建集群，请在 Elastic Cloud 控制台中：\n 1.选择**创建部署**，然后指定**部署名称**\n 2.根据需要修改其他部署选项（或者不修改，默认值可帮助您快速入门）\n 3.单击**创建部署**\n 4.等候部署创建完成\n 5.前往新的 Cloud Kibana 实例，然后按照 Kibana 主页上的说明执行操作",
+    "kbn.common.tutorials.premCloudInstructions.option1.title": "选项 1：在 Elastic Cloud 中尝试",
+    "kbn.common.tutorials.premCloudInstructions.option2.textPre": "如果基于托管式 Elasticsearch 实例运行此 Kibana 实例，请继续手动设置。\n\n针对您的记录，分别将 **Elasticsearch** 终端节点另存为 {urlTemplate}将集群**密码**另存为 {passwordTemplate}",
+    "kbn.common.tutorials.premCloudInstructions.option2.title": "选项 2：将本地 Kibana 连接到 Cloud 实例",
+    "kbn.common.tutorials.winlogbeat.cloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.winlogbeat.premCloudInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.winlogbeat.premInstructions.gettingStarted.title": "入门",
+    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTextPost": "其中 {passwordTemplate} 是 `elastic` 用户的密码。",
+    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTextPre": "修改 {path} 以设置 Elastic Cloud 的连接信息：",
+    "kbn.common.tutorials.winlogbeatCloudInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTextPost": "其中，{passwordTemplate} 是 `elastic` 用户的密码，{esUrlTemplate} 是 Elasticsearch 的 URL，{kibanaUrlTemplate} 是 Kibana 的 URL。",
+    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTextPre": "修改 {path} 以设置连接信息：",
+    "kbn.common.tutorials.winlogbeatInstructions.config.windowsTitle": "编辑配置",
+    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTextPost": "在 {path} 文件中修改 `output.elasticsearch` 下的设置以指向您的 Elasticsearch 安装。",
+    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTextPre": "首次使用 Winlogbeat？请参阅[入门指南]({winlogbeatLink})。\n 1.从[下载]({elasticLink})页面下载 Winlogbeat Windows zip 文件。\n 2.将 zip 文件的内容解压缩到 {folderPath}。\n 3.将 {directoryName} 目录重命名为 `Winlogbeat`。\n 4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n 5.从 PowerShell 提示符处，运行以下命令以将 Winlogbeat 安装为 Windows 服务。",
+    "kbn.common.tutorials.winlogbeatInstructions.install.windowsTitle": "下载并安装 Winlogbeat",
+    "kbn.common.tutorials.winlogbeatInstructions.start.windowsTextPre": "`setup` 命令加载 Kibana 仪表板。如果仪表板已设置，请省略此命令。",
+    "kbn.common.tutorials.winlogbeatInstructions.start.windowsTitle": "启动 Winlogbeat",
+    "kbn.common.tutorials.winlogbeatStatusCheck.buttonLabel": "检查数据",
+    "kbn.common.tutorials.winlogbeatStatusCheck.errorText": "尚未接收到数据",
+    "kbn.common.tutorials.winlogbeatStatusCheck.successText": "已成功接收数据",
+    "kbn.common.tutorials.winlogbeatStatusCheck.text": "确认从 Winlogbeat 收到数据",
+    "kbn.common.tutorials.winlogbeatStatusCheck.title": "模块状态",
+    "kbn.context.breadcrumb": "{indexPatternTitle}#{docId} 的上下文",
+    "kbn.context.failedToLoadAnchorDocumentDescription": "无法加载该定位点文档",
+    "kbn.context.failedToLoadAnchorDocumentErrorDescription": "无法加载定位点文档。",
+    "kbn.context.loadingDescription": "正在加载……",
+    "kbn.context.newerDocumentsDescription": "较新文档",
+    "kbn.context.noSearchableTiebreakerFieldDescription": "索引模式 {indexPatternId} 中找不到任何可搜索的平分决胜字段。请更改高级设置“{tieBreakerFields}”以包括此索引模式的有效字段。",
+    "kbn.context.olderDocumentsDescription": "较旧文档",
+    "kbn.context.reloadPageDescription.discoverLinkText": "Discover",
+    "kbn.context.reloadPageDescription.reloadOrVisitTextMessage": "请重新加载或访问",
+    "kbn.context.reloadPageDescription.selectValidAnchorDocumentTextMessage": "以选择有效地定位点文档。",
+    "kbn.context.unableToLoadAnchorDocumentDescription": "无法加载该定位点文档",
+    "kbn.context.unableToLoadDocumentDescription": "无法加载文档",
+    "kbn.dashboard.addVisualizationLinkAriaLabel": "添加可视化",
+    "kbn.dashboard.badge.readOnly.text": "只读",
+    "kbn.dashboard.badge.readOnly.tooltip": "无法保存仪表板",
+    "kbn.dashboard.changeViewModeConfirmModal.cancelButtonLabel": "继续编辑",
+    "kbn.dashboard.changeViewModeConfirmModal.confirmButtonLabel": "放弃更改",
+    "kbn.dashboard.changeViewModeConfirmModal.discardChangesDescription": "放弃更改后，它们将无法恢复。",
+    "kbn.dashboard.changeViewModeConfirmModal.discardChangesTitle": "放弃对仪表板的更改？",
+    "kbn.dashboard.dashboardAppBreadcrumbsTitle": "仪表板",
+    "kbn.dashboard.dashboardBreadcrumbsTitle": "仪表板",
+    "kbn.dashboard.dashboardWasNotSavedDangerMessage": "仪表板 “{dashTitle}” 未保存。错误：{errorMessage}",
+    "kbn.dashboard.dashboardWasSavedSuccessMessage": "仪表板 “{dashTitle}” 已保存",
+    "kbn.dashboard.featureCatalogue.dashboardDescription": "显示和共享可视化和已保存搜索的集合。",
+    "kbn.dashboard.featureCatalogue.dashboardTitle": "仪表板",
+    "kbn.dashboard.fillDashboardTitle": "此仪表板是空的。让我们来填充它！",
+    "kbn.dashboard.howToStartWorkingOnNewDashboardDescription1": "单击上述菜单栏中的 ",
+    "kbn.dashboard.howToStartWorkingOnNewDashboardDescription2": " 按钮以着手处理新的仪表板。",
+    "kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkText": "编辑",
+    "kbn.dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "您可以将任何 Kibana 应用的数据视图组合到一个仪表板中，从而在一个位置查看所有内容。",
+    "kbn.dashboard.listing.createNewDashboard.createButtonLabel": "创建新的仪表板",
+    "kbn.dashboard.listing.createNewDashboard.newToKibanaDescription": "Kibana 新手？{sampleDataInstallLink}来试用一下。",
+    "kbn.dashboard.listing.createNewDashboard.sampleDataInstallLinkText": "安装一些样例数据",
+    "kbn.dashboard.listing.createNewDashboard.title": "创建您的首个仪表板",
+    "kbn.dashboard.listing.dashboardsTitle": "仪表板",
+    "kbn.dashboard.listing.noItemsMessage": "似乎您没有任何仪表板。",
+    "kbn.dashboard.listing.table.descriptionColumnName": "描述",
+    "kbn.dashboard.listing.table.entityName": "仪表板",
+    "kbn.dashboard.listing.table.entityNamePlural": "仪表板",
+    "kbn.dashboard.listing.table.titleColumnName": "标题",
+    "kbn.dashboard.panel.unableToMigratePanelDataForSixThreeZeroErrorMessage": "无法迁移用于“6.3.0”向后兼容的面板数据，面板不包含预期字段：{key}",
+    "kbn.dashboard.savedDashboard.newDashboardTitle": "新建仪表板",
+    "kbn.dashboard.savedDashboardsTitle": "仪表板",
+    "kbn.dashboard.stateManager.timeNotSavedWithDashboardErrorMessage": "时间未随此仪表板保存，因此无法同步。",
+    "kbn.dashboard.strings.dashboardEditTitle": "编辑 {title}",
+    "kbn.dashboard.strings.dashboardUnsavedEditTitle": "编辑 {title}（未保存）",
+    "kbn.dashboard.topNav.cloneModal.cancelButtonLabel": "取消",
+    "kbn.dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle": "克隆面板",
+    "kbn.dashboard.topNav.cloneModal.confirmButtonLabel": "确认克隆",
+    "kbn.dashboard.topNav.cloneModal.confirmCloneDescription": "确认克隆",
+    "kbn.dashboard.topNav.cloneModal.dashboardExistsDescription": "单击 “{confirmClone}” 以克隆具有重复标题的仪表板。",
+    "kbn.dashboard.topNav.cloneModal.dashboardExistsTitle": "具有标题 {newDashboardName} 的仪表板已存在。",
+    "kbn.dashboard.topNav.cloneModal.enterNewNameForDashboardDescription": "请为您的仪表板输入新的名称。",
+    "kbn.dashboard.topNav.options.hideAllPanelTitlesSwitchLabel": "显示面板标题",
+    "kbn.dashboard.topNav.options.useMarginsBetweenPanelsSwitchLabel": "在面板间使用边距",
+    "kbn.dashboard.topNav.saveModal.descriptionFormRowLabel": "描述",
+    "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowHelpText": "每次加载此仪表板时，这都会将时间筛选更改为当前选定的时间。",
+    "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowLabel": "将时间随仪表板保存",
+    "kbn.dashboard.topNav.showCloneModal.dashboardCopyTitle": "{title} 副本",
+    "kbn.dashboard.topNave.addButtonAriaLabel": "添加",
+    "kbn.dashboard.topNave.addConfigDescription": "将面板保存到仪表板",
+    "kbn.dashboard.topNave.cancelButtonAriaLabel": "取消",
+    "kbn.dashboard.topNave.cloneButtonAriaLabel": "克隆",
+    "kbn.dashboard.topNave.cloneConfigDescription": "创建仪表板的副本",
+    "kbn.dashboard.topNave.editButtonAriaLabel": "编辑",
+    "kbn.dashboard.topNave.editConfigDescription": "切换到编辑模式",
+    "kbn.dashboard.topNave.fullScreenButtonAriaLabel": "全屏",
+    "kbn.dashboard.topNave.fullScreenConfigDescription": "全屏模式",
+    "kbn.dashboard.topNave.optionsButtonAriaLabel": "选项",
+    "kbn.dashboard.topNave.optionsConfigDescription": "选项",
+    "kbn.dashboard.topNave.saveButtonAriaLabel": "保存",
+    "kbn.dashboard.topNave.saveConfigDescription": "保存您的仪表板",
+    "kbn.dashboard.topNave.shareButtonAriaLabel": "共享",
+    "kbn.dashboard.topNave.shareConfigDescription": "共享仪表板",
+    "kbn.dashboard.topNave.viewConfigDescription": "取消编辑并切换到仅查看模式",
+    "kbn.dashboard.urlWasRemovedInSixZeroWarningMessage": "6.0 中未移除 url“dashboard/create”。请更新您的书签。",
+    "kbn.dashboard.visitVisualizeAppLinkText": "访问 Visualize 应用",
+    "kbn.dashboardTitle": "仪表板",
+    "kbn.devToolsTitle": "开发工具",
+    "kbn.discover.backToTopLinkText": "返至顶部。",
+    "kbn.discover.badge.readOnly.text": "只读",
+    "kbn.discover.badge.readOnly.tooltip": "无法保存搜索",
+    "kbn.discover.bucketIntervalTooltip": "此时间间隔将创建{bucketsDescription}而无法在选定时间范围内显示 ，因此其已缩放至 {bucketIntervalDescription}",
+    "kbn.discover.bucketIntervalTooltip.tooLargeBucketsText": "过大的存储桶",
+    "kbn.discover.bucketIntervalTooltip.tooManyBucketsText": "过多的存储桶",
+    "kbn.discover.discoverBreadcrumbTitle": "Discover",
+    "kbn.discover.discoverDescription": "通过查询和筛选原始文档来以交互方式浏览您的数据。",
+    "kbn.discover.discoverTitle": "Discover",
+    "kbn.discover.documentsAriaLabel": "文档",
+    "kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedTooltip": "不支持以 {underscoreSign} 开头的字段名称",
+    "kbn.discover.docViews.table.filterForFieldPresentButtonAriaLabel": "筛留存在的字段",
+    "kbn.discover.docViews.table.filterForFieldPresentButtonTooltip": "筛留存在的字段",
+    "kbn.discover.docViews.table.filterForValueButtonAriaLabel": "筛留值",
+    "kbn.discover.docViews.table.filterForValueButtonTooltip": "筛留值",
+    "kbn.discover.docViews.table.filterOutValueButtonAriaLabel": "筛除值",
+    "kbn.discover.docViews.table.filterOutValueButtonTooltip": "筛除值",
+    "kbn.discover.docViews.table.noCachedMappingForThisFieldTooltip": "此字段没有任何已缓存映射。从“管理”>“索引模式”页面刷新字段列表",
+    "kbn.discover.docViews.table.tableTitle": "表",
+    "kbn.discover.docViews.table.toggleColumnInTableButtonAriaLabel": "在表中切换列",
+    "kbn.discover.docViews.table.toggleColumnInTableButtonTooltip": "在表中切换列",
+    "kbn.discover.docViews.table.unableToFilterForPresenceOfMetaFieldsTooltip": "无法筛留元数据字段",
+    "kbn.discover.docViews.table.unableToFilterForPresenceOfScriptedFieldsTooltip": "无法筛留脚本字段",
+    "kbn.discover.docViews.table.unindexedFieldsCanNotBeSearchedTooltip": "无法搜索未索引字段",
+    "kbn.discover.docViews.json.codeEditorAriaLabel": "Elasticsearch 文档的只读 JSON 视图",
+    "kbn.discover.docViews.json.jsonTitle": "JSON",
+    "kbn.discover.docViews.table.fieldNamesBeginningWithUnderscoreUnsupportedAriaLabel": "警告",
+    "kbn.discover.docViews.table.noCachedMappingForThisFieldAriaLabel": "警告",
+    "kbn.discover.docViews.table.toggleFieldDetails": "切换字段详细信息",
+    "kbn.discover.errorLoadingData": "加载数据时出错",
+    "kbn.discover.fetchError.howToAddressErrorDescription": "您可以通过编辑 “{scriptedFields}” 选项卡下 “{managementLink}” 中的 “{fetchErrorScript}” 字段来解决此错误。",
+    "kbn.discover.fetchError.managmentLinkText": "管理 > 索引模式",
+    "kbn.discover.fetchError.scriptedFieldsText": "“脚本字段”",
+    "kbn.discover.fieldChooser.detailViews.emptyStringText": "空字符串",
+    "kbn.discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "筛除此值",
+    "kbn.discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "筛留此值",
+    "kbn.discover.fieldChooser.detailViews.recordsText": "个记录",
+    "kbn.discover.fieldChooser.detailViews.topValuesInRecordsDescription": "排名前 5 位的值，范围：",
+    "kbn.discover.fieldChooser.detailViews.visualizeLinkText": "可视化",
+    "kbn.discover.fieldChooser.detailViews.warningsText": "{warningsLength, plural, one {# 个警告} other {# 个警告}}",
+    "kbn.discover.fieldChooser.discoverField.addButtonLabel": "添加",
+    "kbn.discover.fieldChooser.discoverField.bucketAriaLabel": "值：{value}",
+    "kbn.discover.fieldChooser.discoverField.emptyStringText": "空字符串",
+    "kbn.discover.fieldChooser.discoverField.removeButtonLabel": "移除",
+    "kbn.discover.fieldChooser.discoverField.scriptedFieldsTakeLongExecuteDescription": "脚本字段执行时间会很长。",
+    "kbn.discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage": "分析不适用于地理字段。",
+    "kbn.discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage": "分析不适用于对象字段。",
+    "kbn.discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "此字段在您的 Elasticsearch 映射中，但不在文档表中显示的 {hitsLength} 个文档中。您可能仍能够基于其进行可视化或搜索。",
+    "kbn.discover.fieldChooser.filter.aggregatableLabel": "可聚合",
+    "kbn.discover.fieldChooser.filter.availableFieldsTitle": "可用字段",
+    "kbn.discover.fieldChooser.filter.hideMissingFieldsLabel": "隐藏缺失字段",
+    "kbn.discover.fieldChooser.filter.indexAndFieldsSectionAriaLabel": "索引和字段",
+    "kbn.discover.fieldChooser.filter.popularTitle": "常用",
+    "kbn.discover.fieldChooser.filter.searchableLabel": "可搜索",
+    "kbn.discover.fieldChooser.filter.selectedFieldsTitle": "选定字段",
+    "kbn.discover.fieldChooser.filter.typeLabel": "类型",
+    "kbn.discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel": "隐藏字段设置",
+    "kbn.discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel": "显示字段设置",
+    "kbn.discover.histogramOfFoundDocumentsAriaLabel": "已找到文档的直方图",
+    "kbn.discover.hitsPluralTitle": "{hits, plural, one {次命中} other {次命中}}",
+    "kbn.discover.howToChangeTheTimeTooltip": "要更改时间，请单击导航栏中的日历图标",
+    "kbn.discover.howToSeeOtherMatchingDocumentsDescription": "以下是匹配您的搜索的前 {sampleSize} 个文档，请优化您的搜索以查看其他文档。",
+    "kbn.discover.inspectorRequestDataTitle": "数据",
+    "kbn.discover.inspectorRequestDescription": "此请求将查询 Elasticsearch 以获取搜索的数据。",
+    "kbn.discover.localMenu.inspectTitle": "检查",
+    "kbn.discover.localMenu.localMenu.newSearchTitle": "新建",
+    "kbn.discover.localMenu.newSearchDescription": "新搜索",
+    "kbn.discover.localMenu.openInspectorForSearchDescription": "打开 Inspector 以进行搜索",
+    "kbn.discover.localMenu.openSavedSearchDescription": "打开保存的搜索",
+    "kbn.discover.localMenu.openTitle": "打开",
+    "kbn.discover.localMenu.saveSearchDescription": "保存搜索",
+    "kbn.discover.localMenu.saveTitle": "保存",
+    "kbn.discover.localMenu.shareSearchDescription": "共享搜索",
+    "kbn.discover.localMenu.shareTitle": "共享",
+    "kbn.discover.noResults.addressShardFailuresTitle": "解决分片故障",
+    "kbn.discover.noResults.expandYourTimeRangeTitle": "展开时间范围",
+    "kbn.discover.noResults.indexFailureIndexText": "索引 {failureIndex}",
+    "kbn.discover.noResults.indexFailureShardText": "{index}，分片 {failureShard}",
+    "kbn.discover.noResults.queryMayNotMatchTitle": "您正在查看的一个或多个索引包含日期字段。您的查询在当前时间范围内可能不匹配任何数据，也可能在当前选定的时间范围内没有任何数据。您可以尝试将时间范围更改为包含数据的时间范围。",
+    "kbn.discover.noResults.requiredPluginIsNotInstalledOrDisabledTitle": "基于 {unsupportedType} 索引的索引模式需要 X-Pack 的 {unsupportedType} 插件，但其未安装或已禁用",
+    "kbn.discover.noResults.searchExamples.400to499StatusCodeExampleTitle": "查找所有介于 400-499 之间的状态代码",
+    "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpExtensionExampleTitle": "查找状态代码 400-499 以及扩展名 php",
+    "kbn.discover.noResults.searchExamples.400to499StatusCodeWithPhpOrHtmlExtensionExampleTitle": "查找状态代码 400-499 以及扩展名 php 或 html",
+    "kbn.discover.noResults.searchExamples.anyField200StatusCodeExampleTitle": "查找任意字段包含数字 200 的请求",
+    "kbn.discover.noResults.searchExamples.howTosearchForWebServerLogsDescription": "顶部的搜索栏采用了 Elasticsearch 对 Lucene {queryStringSyntaxLink} 的支持技术。以下是一些示例，说明如何搜索已解析成若干字段的 Web 服务器日志。",
+    "kbn.discover.noResults.searchExamples.noResultsMatchSearchCriteriaTitle": "没有任何结果匹配您的搜索条件",
+    "kbn.discover.noResults.searchExamples.queryStringSyntaxLinkText": "查询字符串语法",
+    "kbn.discover.noResults.searchExamples.refineYourQueryTitle": "优化您的查询",
+    "kbn.discover.noResults.searchExamples.statusField200StatusCodeExampleTitle": "在状态字段中查找 200",
+    "kbn.discover.noResults.shardFailuresDescription": "发生了以下分片故障：",
+    "kbn.discover.notifications.notSavedSearchTitle": "搜索 “{savedSearchTitle}” 未保存。",
+    "kbn.discover.notifications.savedSearchTitle": "搜索 “{savedSearchTitle}” 已保存",
+    "kbn.discover.painlessError.painlessScriptedFieldErrorMessage": "Painless 脚本字段 “{script}” 有错误。",
+    "kbn.discover.rootBreadcrumb": "Discover",
+    "kbn.discover.savedSearch.savedObjectName": "已保存搜索",
+    "kbn.discover.scaledToDescription": "已缩放至 {bucketIntervalDescription}",
+    "kbn.discover.searchingTitle": "正在搜索",
+    "kbn.discover.showingDefaultIndexPatternWarningDescription": "显示默认索引模式：“{loadedIndexPatternTitle}” ({loadedIndexPatternId})",
+    "kbn.discover.showingSavedIndexPatternWarningDescription": "显示保存的索引模式：“{ownIndexPatternTitle}” ({ownIndexPatternId})",
+    "kbn.discover.skipToBottomButtonLabel": "跳至底部",
+    "kbn.discover.topNav.openSearchPanel.manageSearchesButtonLabel": "管理搜索",
+    "kbn.discover.topNav.openSearchPanel.noSearchesFoundDescription": "未找到匹配的搜索。",
+    "kbn.discover.topNav.openSearchPanel.openSearchTitle": "打开搜索",
+    "kbn.discover.valueIsNotConfiguredIndexPatternIDWarningTitle": "{stateVal} 不是配置的索引模式 ID",
+    "kbn.discoverTitle": "Discover",
+    "kbn.doc.failedToExecuteQueryDescription": "无法执行查询",
+    "kbn.doc.failedToLocateDocumentDescription": "无法找到文档",
+    "kbn.doc.loadingDescription": "正在加载……",
+    "kbn.docTable.limitedSearchResultLabel": "仅限 {resultCount} 个结果。优化您的搜索。",
+    "kbn.docTable.noResultsTitle": "找不到结果",
+    "kbn.docTable.tableHeader.moveColumnLeftButtonAriaLabel": "向左移动“{columnName}”列",
+    "kbn.docTable.tableHeader.moveColumnLeftButtonTooltip": "向左移动列",
+    "kbn.docTable.tableHeader.moveColumnRightButtonAriaLabel": "向右移动“{columnName}”列",
+    "kbn.docTable.tableHeader.moveColumnRightButtonTooltip": "向右移动列",
+    "kbn.docTable.tableHeader.removeColumnButtonAriaLabel": "删除“{columnName}”列",
+    "kbn.docTable.tableHeader.removeColumnButtonTooltip": "删除列",
+    "kbn.docTable.tableHeader.sortByColumnAscendingAriaLabel": "升序排序 {columnName}",
+    "kbn.docTable.tableHeader.sortByColumnDescendingAriaLabel": "降序排序 {columnName}",
+    "kbn.docTable.tableRow.detailHeading": "已展开文档",
+    "kbn.docTable.tableRow.filterForValueButtonAriaLabel": "筛留值",
+    "kbn.docTable.tableRow.filterForValueButtonTooltip": "筛留值",
+    "kbn.docTable.tableRow.filterOutValueButtonAriaLabel": "筛除值",
+    "kbn.docTable.tableRow.filterOutValueButtonTooltip": "筛除值",
+    "kbn.docTable.tableRow.toggleRowDetailsButtonAriaLabel": "切换行详细信息",
+    "kbn.docTable.tableRow.viewSingleDocumentLinkText": "查看单个文档",
+    "kbn.docTable.tableRow.viewSurroundingDocumentsLinkText": "查看周围文档",
+    "kbn.embeddable.errorTitle": "提取数据时出错",
+    "kbn.embeddable.inspectorRequestDataTitle": "数据",
+    "kbn.embeddable.inspectorRequestDescription": "此请求将查询 Elasticsearch 以获取搜索的数据。",
+    "kbn.home.addData.addDataToKibanaDescription": "使用这些解决方案可快速将您的数据转换成预建仪表板和监测系统。",
+    "kbn.home.addData.addDataToKibanaTitle": "将数据添加到 Kibana",
+    "kbn.home.addData.apm.addApmButtonLabel": "添加 APM",
+    "kbn.home.addData.apm.nameDescription": "APM 自动从您的应用程序内收集深入全面的性能指标和错误。",
+    "kbn.home.addData.apm.nameTitle": "APM",
+    "kbn.home.addData.logging.addLogDataButtonLabel": "添加日志数据",
+    "kbn.home.addData.logging.nameDescription": "从常见的数据源采集日志，并在预配置的仪表板中轻松实现可视化。",
+    "kbn.home.addData.logging.nameTitle": "日志",
+    "kbn.home.addData.metrics.addMetricsDataButtonLabel": "添加指标数据",
+    "kbn.home.addData.metrics.nameDescription": "从您的服务器上运行的操作系统和服务收集指标。",
+    "kbn.home.addData.metrics.nameTitle": "指标",
+    "kbn.home.addData.sampleDataLink": "加载数据集和 Kibana 仪表板",
+    "kbn.home.addData.sampleDataTitle": "添加样例数据",
+    "kbn.home.addData.uploadFileLink": "导入 CSV、NDJSON 或日志文件",
+    "kbn.home.addData.uploadFileTitle": "从日志文件上传数据",
+    "kbn.home.addData.yourDataLink": "连接到您的 Elasticsearch 索引",
+    "kbn.home.addData.yourDataTitle": "使用 Elasticsearch 数据",
+    "kbn.home.breadcrumbs.addDataTitle": "添加数据",
+    "kbn.home.breadcrumbs.homeTitle": "主页",
+    "kbn.home.directories.manage.nameTitle": "管理 Elastic Stack",
+    "kbn.home.directories.notFound.description": "未找到要寻找的内容？",
+    "kbn.home.directories.notFound.viewFullButtonLabel": "查看 Kibana 插件的完整目录",
+    "kbn.home.directories.visualize.nameTitle": "可视化和浏览数据",
+    "kbn.home.directory.directoryTitle": "目录",
+    "kbn.home.directory.tabs.administrativeTitle": "管理",
+    "kbn.home.directory.tabs.allTitle": "全部",
+    "kbn.home.directory.tabs.dataTitle": "数据浏览和可视化",
+    "kbn.home.directory.tabs.otherTitle": "其他",
+    "kbn.home.exploreButtonLabel": "自己浏览",
+    "kbn.home.exploreYourDataDescription": "完成所有步骤后，您便可以随时浏览自己的数据。",
+    "kbn.home.letsStartDescription": "我们注意到在您的集群中没有任何数据。您可以试用我们的样例数据和仪表板，也可以直接使用自己的数据。",
+    "kbn.home.letsStartTitle": "开始使用",
+    "kbn.home.loadTutorials.requestFailedErrorMessage": "请求失败，状态代码：{status}",
+    "kbn.home.loadTutorials.unableToLoadErrorMessage": "无法加载教程",
+    "kbn.home.recentlyAccessed.recentlyViewedTitle": "最近查看",
+    "kbn.home.sampleDataSet.installedLabel": "{name} 已安装",
+    "kbn.home.sampleDataSet.unableToInstallErrorMessage": "无法安装样例数据集：{name}",
+    "kbn.home.sampleDataSet.unableToLoadListErrorMessage": "无法加载样例数据集列表",
+    "kbn.home.sampleDataSet.unableToUninstallErrorMessage": "无法卸载样例数据集：{name}",
+    "kbn.home.sampleDataSet.uninstalledLabel": "{name} 已卸载",
+    "kbn.home.sampleDataSetCard.addButtonAriaLabel": "添加{datasetName}",
+    "kbn.home.sampleDataSetCard.addButtonLabel": "添加数据",
+    "kbn.home.sampleDataSetCard.addingButtonAriaLabel": "正在添加 {datasetName}",
+    "kbn.home.sampleDataSetCard.addingButtonLabel": "正在添加",
+    "kbn.home.sampleDataSetCard.dashboardLinkLabel": "仪表板",
+    "kbn.home.sampleDataSetCard.default.addButtonAriaLabel": "添加{datasetName}",
+    "kbn.home.sampleDataSetCard.default.addButtonLabel": "添加数据",
+    "kbn.home.sampleDataSetCard.default.unableToVerifyErrorMessage": "无法确认数据集状态，错误：{statusMsg}",
+    "kbn.home.sampleDataSetCard.removeButtonAriaLabel": "移除 {datasetName}",
+    "kbn.home.sampleDataSetCard.removeButtonLabel": "删除",
+    "kbn.home.sampleDataSetCard.removingButtonAriaLabel": "正在移除 {datasetName}",
+    "kbn.home.sampleDataSetCard.removingButtonLabel": "正在删除",
+    "kbn.home.sampleDataSetCard.viewDataButtonAriaLabel": "查看“{datasetName}”",
+    "kbn.home.sampleDataSetCard.viewDataButtonLabel": "查看数据",
+    "kbn.home.tryButtonLabel": "试用我的样例数据",
+    "kbn.home.tutorial.addDataToKibanaTitle": "将数据添加到 Kibana",
+    "kbn.home.tutorial.card.sampleDataDescription": "开始使用这些“一键式”数据集浏览 Kibana。",
+    "kbn.home.tutorial.card.sampleDataTitle": "样例数据",
+    "kbn.home.tutorial.elasticCloudButtonLabel": "Elastic Cloud",
+    "kbn.home.tutorial.instruction.copyButtonLabel": "复制代码片段",
+    "kbn.home.tutorial.instructionSet.checkStatusButtonLabel": "检查状态",
+    "kbn.home.tutorial.instructionSet.customizeLabel": "定制您的代码片段",
+    "kbn.home.tutorial.instructionSet.noDataLabel": "未找到任何数据",
+    "kbn.home.tutorial.instructionSet.statusCheckTitle": "状态检查",
+    "kbn.home.tutorial.instructionSet.successLabel": "成功",
+    "kbn.home.tutorial.instructionSet.toggleAriaLabel": "切换命令参数可见性",
+    "kbn.home.tutorial.introduction.betaLabel": "公测版",
+    "kbn.home.tutorial.introduction.imageAltDescription": "主仪表板的截图。",
+    "kbn.home.tutorial.introduction.viewButtonLabel": "查看导出的字段",
+    "kbn.home.tutorial.noTutorialLabel": "无法找到教程 {tutorialId}",
+    "kbn.home.tutorial.savedObject.addedLabel": "{savedObjectsLength} 个已保存对象已成功添加",
+    "kbn.home.tutorial.savedObject.confirmButtonLabel": "确认覆盖",
+    "kbn.home.tutorial.savedObject.defaultButtonLabel": "加载 Kibana 对象",
+    "kbn.home.tutorial.savedObject.installLabel": "导入索引模式、可视化和预定义仪表板。",
+    "kbn.home.tutorial.savedObject.installStatusLabel": "{savedObjectsLength} 个对象中有 {overwriteErrorsLength} 个已存在。单击“确认覆盖”以导入和覆盖现有对象。对这些对象的任何更改将丢失。",
+    "kbn.home.tutorial.savedObject.loadTitle": "加载 Kibana 对象",
+    "kbn.home.tutorial.savedObject.requestFailedErrorMessage": "请求失败，错误：{message}",
+    "kbn.home.tutorial.savedObject.unableToAddErrorMessage": "{savedObjectsLength} 个 kibana 对象中有 {errorsLength} 个无法添加，错误：{errorMessage}",
+    "kbn.home.tutorial.selfManagedButtonLabel": "自管型",
+    "kbn.home.tutorial.tabs.allTitle": "全部",
+    "kbn.home.tutorial.tabs.loggingTitle": "日志",
+    "kbn.home.tutorial.tabs.metricsTitle": "指标",
+    "kbn.home.tutorial.tabs.sampleDataTitle": "样例数据",
+    "kbn.home.tutorial.unexpectedStatusCheckStateErrorDescription": "意外的状态检查状态 {statusCheckState}",
+    "kbn.home.tutorial.unhandledInstructionTypeErrorDescription": "未处理的指令类型 {visibleInstructions}",
+    "kbn.home.welcomeDescription": "您了解 Elastic Stack 的窗口",
+    "kbn.home.welcomeTitle": "欢迎使用 Kibana",
+    "kbn.management.advancedSettings.badge.readOnly.text": "只读",
+    "kbn.management.advancedSettings.badge.readOnly.tooltip": "无法保存高级设置",
+    "kbn.management.createIndexPattern.betaLabel": "公测版",
+    "kbn.management.createIndexPattern.emptyState.checkDataButton": "检查新数据",
+    "kbn.management.createIndexPattern.emptyStateHeader": "找不到任何 Elasticsearch 数据",
+    "kbn.management.createIndexPattern.emptyStateLabel.emptyStateDetail": "{needToIndex}{learnHowLink}或{getStartedLink}",
+    "kbn.management.createIndexPattern.emptyStateLabel.getStartedLink": "开始使用一些样例数据集。",
+    "kbn.management.createIndexPattern.emptyStateLabel.learnHowLink": "了解操作方法",
+    "kbn.management.createIndexPattern.emptyStateLabel.needToIndexLabel": "您需要在 Elasticsearch 中索引一些数据后，才能创建索引模式。",
+    "kbn.management.createIndexPattern.includeSystemIndicesToggleSwitchLabel": "包括系统索引",
+    "kbn.management.createIndexPattern.loadClustersFailMsg": "无法加载远程集群",
+    "kbn.management.createIndexPattern.loadIndicesFailMsg": "无法加载索引",
+    "kbn.management.createIndexPattern.loadingState.checkingLabel": "正在检查 Elasticsearch 数据",
+    "kbn.management.createIndexPattern.step.indexPattern.allowLabel": "可以在索引模式中将 {asterisk} 用作通配符。",
+    "kbn.management.createIndexPattern.step.indexPattern.disallowLabel": "不能使用空格或字符 {characterList}。",
+    "kbn.management.createIndexPattern.step.indexPatternLabel": "索引模式",
+    "kbn.management.createIndexPattern.step.indexPatternPlaceholder": "index-name-*",
+    "kbn.management.createIndexPattern.step.invalidCharactersErrorMessage": "“{indexPatternName} 不能包含空格或字符：{characterList}",
+    "kbn.management.createIndexPattern.step.loadingHeader": "正在寻找匹配的索引......",
+    "kbn.management.createIndexPattern.step.loadingLabel": "请稍候......",
+    "kbn.management.createIndexPattern.step.nextStepButton": "下一步",
+    "kbn.management.createIndexPattern.step.pagingLabel": "每页行数：{perPage}",
+    "kbn.management.createIndexPattern.step.status.matchAnyLabel.matchAnyDetail": "您的索引模式可以匹配以下 {strongIndices}中的任意一个。",
+    "kbn.management.createIndexPattern.step.status.noSystemIndicesLabel": "没有 Elasticsearch 索引匹配您的模式。",
+    "kbn.management.createIndexPattern.step.status.noSystemIndicesWithPromptLabel": "没有 Elasticsearch 索引匹配您的模式。要查看匹配的系统索引，请切换右上角的开关。",
+    "kbn.management.createIndexPattern.step.status.notMatchLabel.allIndicesLabel": "{indicesLength, plural, one {# 个索引} other {# 个索引}}",
+    "kbn.management.createIndexPattern.step.status.notMatchLabel.notMatchDetail": "输入的索引模式不匹配任何索引。可以匹配您的以下{indicesLength, plural, one {} other {任何}} {strongIndices}。",
+    "kbn.management.createIndexPattern.step.status.partialMatchLabel.partialMatchDetail": "您的索引模式不匹配任何索引，但您有 {strongIndices}{matchedIndicesLength, plural, one {看起来} other {看起来}}类似。",
+    "kbn.management.createIndexPattern.step.status.partialMatchLabel.strongIndicesLabel": "{matchedIndicesLength, plural, one {# 个索引} other {# 个索引}}",
+    "kbn.management.createIndexPattern.step.status.successLabel.strongIndicesLabel": "{indicesLength, plural, one {# 个索引} other {# 个索引}}",
+    "kbn.management.createIndexPattern.step.status.successLabel.strongSuccessLabel": "成功！",
+    "kbn.management.createIndexPattern.step.status.successLabel.successDetail": "{strongSuccess}您的索引模式匹配 {strongIndices}。",
+    "kbn.management.createIndexPattern.step.warningHeader": "已有索引模式称作“{query}”",
+    "kbn.management.createIndexPattern.stepHeader": "第 1 步（共 2 步）：定义索引模式",
+    "kbn.management.createIndexPattern.stepTime.backButton": "上一步",
+    "kbn.management.createIndexPattern.stepTime.createPatternButton": "创建索引模式",
+    "kbn.management.createIndexPattern.stepTime.creatingLabel": "正在创建索引模式……",
+    "kbn.management.createIndexPattern.stepTime.error": "错误",
+    "kbn.management.createIndexPattern.stepTime.field.loadingDropDown": "正在加载……",
+    "kbn.management.createIndexPattern.stepTime.field.noTimeFieldsLabel": "匹配此索引模式的索引不包含任何时间字段。",
+    "kbn.management.createIndexPattern.stepTime.fieldHeader": "时间筛选字段名称",
+    "kbn.management.createIndexPattern.stepTime.fieldLabel": "时间筛选将使用此字段按时间筛选您的数据。",
+    "kbn.management.createIndexPattern.stepTime.fieldWarningLabel": "您可以选择不使用时间字段，但将无法通过时间范围缩小您的数据范围。",
+    "kbn.management.createIndexPattern.stepTime.noTimeFieldOptionLabel": "我不想使用时间筛选",
+    "kbn.management.createIndexPattern.stepTime.noTimeFieldsLabel": "匹配此索引模式的索引不包含任何时间字段。",
+    "kbn.management.createIndexPattern.stepTime.options.hideButton": "隐藏高级选项",
+    "kbn.management.createIndexPattern.stepTime.options.patternHeader": "定制索引模式 ID",
+    "kbn.management.createIndexPattern.stepTime.options.patternLabel": "Kibana 将为每个索引模式提供唯一的标识符。如果不想使用此唯一 ID，请输入定制 ID。",
+    "kbn.management.createIndexPattern.stepTime.options.patternPlaceholder": "custom-index-pattern-id",
+    "kbn.management.createIndexPattern.stepTime.options.showButton": "显示高级选项",
+    "kbn.management.createIndexPattern.stepTime.patterAlreadyExists": "自定义索引模式 ID 已存在。",
+    "kbn.management.createIndexPattern.stepTime.refreshButton": "刷新",
+    "kbn.management.createIndexPattern.stepTimeHeader": "第 2 步（共 2 步）：配置设置",
+    "kbn.management.createIndexPattern.stepTimeLabel": "您已将 “{indexPattern}” 定义为 “{indexPatternName}”。现在，在我们创建之前，您可以指定一些设置。",
+    "kbn.management.createIndexPatternHeader": "创建 {indexPatternName}",
+    "kbn.management.createIndexPatternLabel": "Kibana 使用索引模式从 Elasticsearch 索引中检索数据，以实现诸如可视化等功能。",
+    "kbn.management.editIndexPattern.deleteButton": "删除",
+    "kbn.management.editIndexPattern.deleteFieldButton": "删除",
+    "kbn.management.editIndexPattern.deleteHeader": "删除索引模式？",
+    "kbn.management.editIndexPattern.detailsAria": "索引模式详细信息",
+    "kbn.management.editIndexPattern.editFieldButton": "编辑",
+    "kbn.management.editIndexPattern.fields.allLangsDropDown": "所有语言",
+    "kbn.management.editIndexPattern.fields.allTypesDropDown": "所有字段类型",
+    "kbn.management.editIndexPattern.fields.filterAria": "筛选",
+    "kbn.management.editIndexPattern.fields.filterPlaceholder": "筛选",
+    "kbn.management.editIndexPattern.fields.table.additionalInfoAriaLabel": "其他字段信息",
+    "kbn.management.editIndexPattern.fields.table.aggregatableDescription": "这些字段可用在可视化聚合中",
+    "kbn.management.editIndexPattern.fields.table.aggregatableLabel": "可聚合",
+    "kbn.management.editIndexPattern.fields.table.editDescription": "编辑",
+    "kbn.management.editIndexPattern.fields.table.editLabel": "编辑",
+    "kbn.management.editIndexPattern.fields.table.excludedDescription": "提取 _source 时从其中排除的字段",
+    "kbn.management.editIndexPattern.fields.table.excludedLabel": "已排除",
+    "kbn.management.editIndexPattern.fields.table.formatHeader": "格式",
+    "kbn.management.editIndexPattern.fields.table.isAggregatableAria": "可聚合",
+    "kbn.management.editIndexPattern.fields.table.isExcludedAria": "已排除",
+    "kbn.management.editIndexPattern.fields.table.isSearchableAria": "可搜索",
+    "kbn.management.editIndexPattern.fields.table.multiTypeAria": "多类型字段",
+    "kbn.management.editIndexPattern.fields.table.multiTypeTooltip": "此字段的类型在不同的索引中会有所不同。其不可用于许多分析功能。",
+    "kbn.management.editIndexPattern.fields.table.nameHeader": "名称",
+    "kbn.management.editIndexPattern.fields.table.primaryTimeAriaLabel": "主要时间字段",
+    "kbn.management.editIndexPattern.fields.table.primaryTimeTooltip": "此字段表示事件发生的时间。",
+    "kbn.management.editIndexPattern.fields.table.searchableDescription": "这些字段可用于筛选栏",
+    "kbn.management.editIndexPattern.fields.table.searchableHeader": "可搜索",
+    "kbn.management.editIndexPattern.fields.table.typeHeader": "类型",
+    "kbn.management.editIndexPattern.mappingConflictHeader": "映射冲突",
+    "kbn.management.editIndexPattern.mappingConflictLabel": "匹配此模式的各个索引中{conflictFieldsLength, plural, one {一个字段已} other {# 个字段已}}定义为若干类型（字符串、整数等）。您仍能够在 Kibana 的各个部分中使用这些冲突类型，但它们将无法用于需要 Kibana 知道其类型的函数。要解决此问题，需要重新索引您的数据。",
+    "kbn.management.editIndexPattern.notDateErrorMessage": "该字段是{fieldType}，不是日期。",
+    "kbn.management.editIndexPattern.refreshAria": "重新加载字段列表",
+    "kbn.management.editIndexPattern.refreshButton": "刷新",
+    "kbn.management.editIndexPattern.refreshHeader": "刷新字段列表？",
+    "kbn.management.editIndexPattern.refreshLabel": "此操作重置每个字段的常用度计数器。",
+    "kbn.management.editIndexPattern.refreshTooltip": "重新刷新字段列表",
+    "kbn.management.editIndexPattern.removeAria": "删除索引模式",
+    "kbn.management.editIndexPattern.removeTooltip": "删除索引模式",
+    "kbn.management.editIndexPattern.scripted.addFieldButton": "添加脚本字段",
+    "kbn.management.editIndexPattern.scripted.deleteField.cancelButton": "取消",
+    "kbn.management.editIndexPattern.scripted.deleteField.deleteButton": "删除",
+    "kbn.management.editIndexPattern.scripted.deleteFieldLabel": "删除脚本字段 “{fieldName}”？",
+    "kbn.management.editIndexPattern.scripted.deprecationLangHeader": "在用的弃用语言",
+    "kbn.management.editIndexPattern.scripted.deprecationLangLabel.deprecationLangDetail": "以下已弃用语言正被使用：{deprecatedLangsInUse}。Kibana 和 Elasticsearch 下一主要版本将移除对这些语言的支持。将您的脚本字段转换成 {link} 以避免问题。",
+    "kbn.management.editIndexPattern.scripted.deprecationLangLabel.painlessDescription": "Painless",
+    "kbn.management.editIndexPattern.scripted.newFieldPlaceholder": "新建脚本字段",
+    "kbn.management.editIndexPattern.scripted.noFieldLabel": "“{indexPatternTitle}” 索引模式没有称作 “{fieldName}” 的脚本字段",
+    "kbn.management.editIndexPattern.scripted.table.deleteDescription": "删除此字段",
+    "kbn.management.editIndexPattern.scripted.table.deleteHeader": "删除",
+    "kbn.management.editIndexPattern.scripted.table.editDescription": "编辑此字段",
+    "kbn.management.editIndexPattern.scripted.table.editHeader": "编辑",
+    "kbn.management.editIndexPattern.scripted.table.formatDescription": "用于该字段的格式",
+    "kbn.management.editIndexPattern.scripted.table.formatHeader": "格式",
+    "kbn.management.editIndexPattern.scripted.table.langDescription": "用于该字段的语言",
+    "kbn.management.editIndexPattern.scripted.table.langHeader": "语言",
+    "kbn.management.editIndexPattern.scripted.table.nameDescription": "字段的名称",
+    "kbn.management.editIndexPattern.scripted.table.nameHeader": "名称",
+    "kbn.management.editIndexPattern.scripted.table.scriptDescription": "字段的脚本",
+    "kbn.management.editIndexPattern.scripted.table.scriptHeader": "脚本",
+    "kbn.management.editIndexPattern.scripted.unknownModeErrorMessage": "未知 fieldSettings 模式 {mode}",
+    "kbn.management.editIndexPattern.scriptedHeader": "脚本字段",
+    "kbn.management.editIndexPattern.scriptedLabel": "可以在可视化中使用脚本字段，并在您的文档中显示它们。但是，您不能搜索脚本字段。",
+    "kbn.management.editIndexPattern.setDefaultAria": "设置为默认索引",
+    "kbn.management.editIndexPattern.setDefaultTooltip": "设置为默认索引",
+    "kbn.management.editIndexPattern.source.addButtonLabel": "添加",
+    "kbn.management.editIndexPattern.source.deleteFilter.cancelButtonLabel": "取消",
+    "kbn.management.editIndexPattern.source.deleteFilter.deleteButtonLabel": "删除",
+    "kbn.management.editIndexPattern.source.deleteSourceFilterLabel": "删除源筛选 “{value}”？",
+    "kbn.management.editIndexPattern.source.noteLabel": "请注意，多字段将错误地显示为下表中的匹配。这些筛选仅应用于原始源文档中的字段，因此实际未筛选匹配的多字段。",
+    "kbn.management.editIndexPattern.source.table.cancelAria": "取消",
+    "kbn.management.editIndexPattern.source.table.deleteAria": "删除",
+    "kbn.management.editIndexPattern.source.table.editAria": "编辑",
+    "kbn.management.editIndexPattern.source.table.filterDescription": "筛选名称",
+    "kbn.management.editIndexPattern.source.table.filterHeader": "筛选",
+    "kbn.management.editIndexPattern.source.table.matchesDescription": "用于该字段的语言",
+    "kbn.management.editIndexPattern.source.table.matchesHeader": "匹配",
+    "kbn.management.editIndexPattern.source.table.notMatchedLabel": "源筛选不匹配任何已知字段。",
+    "kbn.management.editIndexPattern.source.table.saveAria": "保存",
+    "kbn.management.editIndexPattern.sourceHeader": "源筛选",
+    "kbn.management.editIndexPattern.sourceLabel": "提取文档源时，源筛选可用于排除一个或多个字段。在 Discover 应用中查看文档时会发生此问题，表在 Dashboard 应用中显示已保存搜索的结果时也会发生此问题。每行使用单个文档的源进行生成，如果您具有含有较大或不重要字段的文档，则通过在此较低层级筛除这些字段会更好。",
+    "kbn.management.editIndexPattern.sourcePlaceholder": "源筛选，接受通配符（例如“user*”用于筛选以“user”开头的字段）",
+    "kbn.management.editIndexPattern.tabs.fieldsHeader": "字段",
+    "kbn.management.editIndexPattern.tabs.scriptedHeader": "脚本字段",
+    "kbn.management.editIndexPattern.tabs.sourceHeader": "源筛选",
+    "kbn.management.editIndexPattern.timeFilterHeader": "时间筛选字段名称：{timeFieldName}",
+    "kbn.management.editIndexPattern.timeFilterLabel.mappingAPILink": "映射 API",
+    "kbn.management.editIndexPattern.timeFilterLabel.timeFilterDetail": "此页根据 Elasticsearch 的记录列出“{indexPatternTitle}”索引中的每个字段以及字段的关联核心类型。要更改字段类型，请使用 Elasticsearch",
+    "kbn.management.editIndexPatternLiveRegionAriaLabel": "索引模式",
+    "kbn.management.indexPattern.confirmOverwriteButton": "覆盖",
+    "kbn.management.indexPattern.confirmOverwriteLabel": "确定要覆盖 “{title}”？",
+    "kbn.management.indexPattern.confirmOverwriteTitle": "覆盖“{type}”？",
+    "kbn.management.indexPattern.sectionsHeader": "索引模式",
+    "kbn.management.indexPattern.titleExistsLabel": "具有标题 “{title}” 的索引模式已存在。",
+    "kbn.management.indexPatternHeader": "索引模式",
+    "kbn.management.indexPatternLabel": "管理帮助从 Elasticsearch 检索数据的索引模式。",
+    "kbn.management.indexPatternList.createButton.betaLabel": "公测版",
+    "kbn.management.indexPatternPrompt.exampleOne": "索引单个称作 log-west-001 的数据源，以便可以快速地构建图表或查询其内容。",
+    "kbn.management.indexPatternPrompt.exampleOneTitle": "单数据源",
+    "kbn.management.indexPatternPrompt.examplesTitle": "索引模式示例",
+    "kbn.management.indexPatternPrompt.exampleThree": "具体而言，将这些日志每月存档的汇总/打包指标分组成不同的索引模式，从而可以聚合历史趋势以进行比较。",
+    "kbn.management.indexPatternPrompt.exampleThreeTitle": "定制分组",
+    "kbn.management.indexPatternPrompt.exampleTwo": "分组以 log-west* 开头的所有传入数据源，以便可以查询所有所有西海岸服务器日志。",
+    "kbn.management.indexPatternPrompt.exampleTwoTitle": "多数据源",
+    "kbn.management.indexPatternPrompt.subtitle": "索引模式允许您将异类的数据源一起装入存储桶，从而可以在 Kibana 中查询它们共享的字段。",
+    "kbn.management.indexPatternPrompt.title": "关于索引模式",
+    "kbn.management.indexPatterns.badge.readOnly.text": "只读",
+    "kbn.management.indexPatterns.badge.readOnly.tooltip": "无法保存索引模式",
+    "kbn.management.indexPatterns.createBreadcrumb": "创建索引模式",
+    "kbn.management.indexPatterns.createFieldBreadcrumb": "创建字段",
+    "kbn.management.indexPatterns.listBreadcrumb": "索引模式",
+    "kbn.management.indexPatternTable.createBtn": "创建索引模式",
+    "kbn.management.indexPatternTable.title": "索引模式",
+    "kbn.management.landing.header": "Kibana {version} 管理",
+    "kbn.management.landing.subhead": "管理您的索引、索引模式、已保存对象、Kibana 设置等等。",
+    "kbn.management.landing.text": "在左侧菜单中可找到完整工具列表",
+    "kbn.management.managementDescription": "您用于管理 Elastic Stack 的中心控制台。",
+    "kbn.management.managementLabel": "管理",
+    "kbn.management.objects.confirmModalOptions.deleteButtonLabel": "删除",
+    "kbn.management.objects.confirmModalOptions.modalDescription": "您无法恢复删除的对象",
+    "kbn.management.objects.confirmModalOptions.modalTitle": "删除已保存 Kibana 对象？",
+    "kbn.management.objects.deleteSavedObjectsConfirmModalDescription": "此操作将删除以下已保存对象：",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.cancelButtonLabel": "取消",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteButtonLabel": "删除",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.deleteProcessButtonLabel": "正在删除……",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.idColumnName": "ID",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.titleColumnName": "标题",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModal.typeColumnName": "类型",
+    "kbn.management.objects.objectsTable.deleteSavedObjectsConfirmModalTitle": "删除已保存对象",
+    "kbn.management.objects.objectsTable.export.dangerNotification": "无法生成报告",
+    "kbn.management.objects.objectsTable.export.successNotification": "您的文件正在后台下载",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.cancelButtonLabel": "取消",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportAllButtonLabel": "全部导出",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.exportOptionsLabel": "选项",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModal.includeReferencesDeepLabel": "包括相关对象",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModalDescription": "选择要导出的类型。",
+    "kbn.management.objects.objectsTable.exportObjectsConfirmModalTitle": "导出 {filteredItemCount, plural, one{# 个对象} other {# 个对象}}",
+    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.resolvingConflictsLoadingMessage": "正在解决冲突……",
+    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage": "正在重试失败的对象……",
+    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage": "确保已保存搜索已正确链接……",
+    "kbn.management.objects.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage": "正在保存冲突……",
+    "kbn.management.objects.objectsTable.flyout.confirmOverwriteBody": "确定要覆盖 “{title}”？",
+    "kbn.management.objects.objectsTable.flyout.confirmOverwriteCancelButtonText": "取消",
+    "kbn.management.objects.objectsTable.flyout.confirmOverwriteOverwriteButtonText": "覆盖",
+    "kbn.management.objects.objectsTable.flyout.confirmOverwriteTitle": "覆盖“{type}”？",
+    "kbn.management.objects.objectsTable.flyout.errorCalloutTitle": "抱歉，出现了错误",
+    "kbn.management.objects.objectsTable.flyout.import.cancelButtonLabel": "取消",
+    "kbn.management.objects.objectsTable.flyout.import.confirmButtonLabel": "导入",
+    "kbn.management.objects.objectsTable.flyout.importFailedDescription": "无法导入 {failedImportCount} 个对象，共 {totalImportCount} 个。导入失败",
+    "kbn.management.objects.objectsTable.flyout.importFailedMissingReference": "{type} [id={id}] 无法找到 {refType} [id={refId}]",
+    "kbn.management.objects.objectsTable.flyout.importFailedTitle": "导入失败",
+    "kbn.management.objects.objectsTable.flyout.importFailedUnsupportedType": "{type} [id={id}] 不受支持的类型",
+    "kbn.management.objects.objectsTable.flyout.importFileErrorMessage": "无法处理该文件。",
+    "kbn.management.objects.objectsTable.flyout.importLegacyFileErrorMessage": "无法处理该文件。",
+    "kbn.management.objects.objectsTable.flyout.importPromptText": "导入",
+    "kbn.management.objects.objectsTable.flyout.importSavedObjectTitle": "导入已保存对象",
+    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmAllChangesButtonLabel": "确认所有更改",
+    "kbn.management.objects.objectsTable.flyout.importSuccessful.confirmButtonLabel": "完成",
+    "kbn.management.objects.objectsTable.flyout.importSuccessfulCallout.noObjectsImportedTitle": "未导入任何对象",
+    "kbn.management.objects.objectsTable.flyout.importSuccessfulDescription": "已成功导入 {importCount} 个对象。",
+    "kbn.management.objects.objectsTable.flyout.importSuccessfulTitle": "导入成功",
+    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsCalloutLinkText": "创建新的索引模式",
+    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsDescription": "以下已保存对象使用不存在的索引模式。请选择要重新关联的索引模式。必要时，您可以{indexPatternLink}。",
+    "kbn.management.objects.objectsTable.flyout.indexPatternConflictsTitle": "索引模式冲突",
+    "kbn.management.objects.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage": "已保存对象文件格式无效，无法导入。",
+    "kbn.management.objects.objectsTable.flyout.legacyFileUsedBody": "只需使用更新的导出功能生成 NDJSON 文件，便万事俱备。",
+    "kbn.management.objects.objectsTable.flyout.legacyFileUsedTitle": "将不再支持 JSON 文件",
+    "kbn.management.objects.objectsTable.flyout.overwriteSavedObjectsLabel": "自动覆盖所有已保存对象？",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountDescription": "受影响对象数目",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountName": "计数",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdDescription": "索引模式的 ID",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdName": "ID",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnNewIndexPatternName": "新建索引模式",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription": "受影响对象样例",
+    "kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName": "受影响对象样例",
+    "kbn.management.objects.objectsTable.flyout.resolveImportErrorsFileErrorMessage": "无法处理该文件。",
+    "kbn.management.objects.objectsTable.flyout.selectFileToImportFormRowLabel": "请选择要导入的文件",
+    "kbn.management.objects.objectsTable.header.exportButtonLabel": "导出 {filteredCount, plural, one{# 个对象} other {# 个对象}}",
+    "kbn.management.objects.objectsTable.header.importButtonLabel": "导入",
+    "kbn.management.objects.objectsTable.header.refreshButtonLabel": "刷新",
+    "kbn.management.objects.objectsTable.header.savedObjectsTitle": "已保存对象",
+    "kbn.management.objects.objectsTable.howToDeleteSavedObjectsDescription": "从这里您可以删除已保存对象，如已保存搜索。还可以编辑已保存对象的原始数据。通常，对象只能通过其关联的应用程序进行修改；或许您应该遵循这一原则，而非使用此屏幕进行修改。",
+    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionDescription": "检查此已保存对象",
+    "kbn.management.objects.objectsTable.relationships.columnActions.inspectActionName": "检查",
+    "kbn.management.objects.objectsTable.relationships.columnActionsName": "操作",
+    "kbn.management.objects.objectsTable.relationships.columnRelationship.childAsValue": "子项",
+    "kbn.management.objects.objectsTable.relationships.columnRelationship.parentAsValue": "父项",
+    "kbn.management.objects.objectsTable.relationships.columnRelationshipName": "直接关系",
+    "kbn.management.objects.objectsTable.relationships.columnTitleDescription": "已保存对象的标题",
+    "kbn.management.objects.objectsTable.relationships.columnTitleName": "标题",
+    "kbn.management.objects.objectsTable.relationships.columnTypeDescription": "已保存对象的类型",
+    "kbn.management.objects.objectsTable.relationships.columnTypeName": "类型",
+    "kbn.management.objects.objectsTable.relationships.relationshipsTitle": "以下是与 {title} 相关的已保存对象。删除此{type}将影响其父级对象，但不会影响其子级对象。",
+    "kbn.management.objects.objectsTable.relationships.renderErrorMessage": "错误",
+    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.childAsValue.view": "子项",
+    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.name": "直接关系",
+    "kbn.management.objects.objectsTable.relationships.search.filters.relationship.parentAsValue.view": "父项",
+    "kbn.management.objects.objectsTable.relationships.search.filters.type.name": "类型",
+    "kbn.management.objects.objectsTable.searchBar.unableToParseQueryErrorMessage": "无法解析查询",
+    "kbn.management.objects.objectsTable.table.columnActions.inspectActionDescription": "检查此已保存对象",
+    "kbn.management.objects.objectsTable.table.columnActions.inspectActionName": "检查",
+    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionDescription": "查看此已保存对象与其他已保存对象的关系",
+    "kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionName": "关系",
+    "kbn.management.objects.objectsTable.table.columnActionsName": "操作",
+    "kbn.management.objects.objectsTable.table.columnTitleDescription": "已保存对象的标题",
+    "kbn.management.objects.objectsTable.table.columnTitleName": "标题",
+    "kbn.management.objects.objectsTable.table.columnTypeDescription": "已保存对象的类型",
+    "kbn.management.objects.objectsTable.table.columnTypeName": "类型",
+    "kbn.management.objects.objectsTable.table.deleteButtonLabel": "删除",
+    "kbn.management.objects.objectsTable.table.deleteButtonTitle": "无法删除已保存对象",
+    "kbn.management.objects.objectsTable.table.exportButtonLabel": "导出",
+    "kbn.management.objects.objectsTable.table.exportPopoverButtonLabel": "导出",
+    "kbn.management.objects.objectsTable.table.typeFilterName": "类型",
+    "kbn.management.objects.objectsTable.unableFindSavedObjectsNotificationMessage": "找不到已保存对象",
+    "kbn.management.objects.parsingFieldErrorMessage": "为索引模式 “{indexName}” 解析 “{fieldName}” 时发生错误：{errorMessage}",
+    "kbn.management.objects.savedObjectsDescription": "导入、导出和管理您的已保存搜索、可视化和仪表板。",
+    "kbn.management.objects.savedObjectsSectionLabel": "已保存对象",
+    "kbn.management.objects.savedObjectsTitle": "已保存对象",
+    "kbn.management.objects.view.cancelButtonAriaLabel": "取消",
+    "kbn.management.objects.view.cancelButtonLabel": "取消",
+    "kbn.management.objects.view.deleteItemButtonLabel": "删除“{title}”",
+    "kbn.management.objects.view.editItemTitle": "编辑“{title}",
+    "kbn.management.objects.view.fieldDoesNotExistErrorMessage": "与此对象关联的字段在该索引模式中已不存在。",
+    "kbn.management.objects.view.howToFixErrorDescription": "如果您清楚此错误的含义，请修复该错误 — 否则单击上面的删除按钮。",
+    "kbn.management.objects.view.howToModifyObjectDescription": " 修改对象仅适用于高级用户。对象属性未得到验证，无效的对象可能会导致错误、数据丢失或更坏的情况发生。除非熟悉该代码的人让您来这里，否则您可能不应该来这里。",
+    "kbn.management.objects.view.howToModifyObjectTitle": "谨慎操作！",
+    "kbn.management.objects.view.indexPatternDoesNotExistErrorMessage": "与此对象关联的索引模式已不存在。",
+    "kbn.management.objects.view.saveButtonAriaLabel": "保存 { title } 对象",
+    "kbn.management.objects.view.saveButtonLabel": "保存 { title } 对象",
+    "kbn.management.objects.view.savedObjectProblemErrorMessage": "此已保存对象有问题",
+    "kbn.management.objects.view.savedSearchDoesNotExistErrorMessage": "与此对象关联的已保存搜索已不存在。",
+    "kbn.management.objects.view.viewItemButtonLabel": "查看“{title}”",
+    "kbn.management.objects.view.viewItemTitle": "查看“{title}”",
+    "kbn.management.savedObjects.editBreadcrumb": "编辑 {savedObjectType}",
+    "kbn.management.savedObjects.indexBreadcrumb": "已保存对象",
+    "kbn.management.settings.advancedSettingsDescription": "直接编辑在 Kibana 中控制行为的设置。",
+    "kbn.management.settings.advancedSettingsLabel": "高级设置",
+    "kbn.management.settings.breadcrumb": "高级设置",
+    "kbn.management.settings.callOutCautionDescription": "此处请谨慎操作，这些设置仅供高级用户使用。您在这里所做的更改可能使 Kibana 的大部分功能出现问题。这些设置有一部分可能未在文档中说明、不受支持或是实验性设置。如果字段有默认值，将字段留空会将其设置为默认值，其他配置指令可能不接受其默认值。删除定制设置会将其从 Kibana 的配置中永久删除。",
+    "kbn.management.settings.callOutCautionTitle": "注意：在这里您可能会使问题出现",
+    "kbn.management.settings.categoryNames.dashboardLabel": "仪表板",
+    "kbn.management.settings.categoryNames.discoverLabel": "Discover",
+    "kbn.management.settings.categoryNames.generalLabel": "常规",
+    "kbn.management.settings.categoryNames.notificationsLabel": "通知",
+    "kbn.management.settings.categoryNames.reportingLabel": "Reporting",
+    "kbn.management.settings.categoryNames.searchLabel": "搜索",
+    "kbn.management.settings.categoryNames.timelionLabel": "Timelion",
+    "kbn.management.settings.categoryNames.visualizationsLabel": "可视化",
+    "kbn.management.settings.categorySearchLabel": "类别",
+    "kbn.management.settings.field.cancelEditingButtonAriaLabel": "取消编辑 {ariaName}",
+    "kbn.management.settings.field.cancelEditingButtonLabel": "取消",
+    "kbn.management.settings.field.changeImageLinkAriaLabel": "更改 {ariaName}",
+    "kbn.management.settings.field.changeImageLinkText": "更改图片",
+    "kbn.management.settings.field.codeEditorSyntaxErrorMessage": "JSON 语法无效",
+    "kbn.management.settings.field.customSettingAriaLabel": "定制设置",
+    "kbn.management.settings.field.customSettingTooltip": "定制设置",
+    "kbn.management.settings.field.defaultValueText": "默认值：{value}",
+    "kbn.management.settings.field.defaultValueTypeJsonText": "默认值：{value}",
+    "kbn.management.settings.field.helpText": "此设置将由 Kibana 覆盖，无法更改。",
+    "kbn.management.settings.field.imageChangeErrorMessage": "图片无法保存",
+    "kbn.management.settings.field.offLabel": "关闭",
+    "kbn.management.settings.field.onLabel": "开启",
+    "kbn.management.settings.field.requiresPageReloadToastButtonLabel": "重新加载页面",
+    "kbn.management.settings.field.requiresPageReloadToastDescription": "请重新加载页面，以使“{settingName}”设置生效。",
+    "kbn.management.settings.field.resetFieldErrorMessage": "无法重置 {name}",
+    "kbn.management.settings.field.resetToDefaultLinkAriaLabel": "将 {ariaName} 重置为默认值",
+    "kbn.management.settings.field.resetToDefaultLinkText": "重置为默认值",
+    "kbn.management.settings.field.saveButtonAriaLabel": "保存 {ariaName}",
+    "kbn.management.settings.field.saveButtonLabel": "保存",
+    "kbn.management.settings.field.saveFieldErrorMessage": "无法保存 {name}",
+    "kbn.management.settings.form.clearNoSearchResultText": "（清除搜索）",
+    "kbn.management.settings.form.clearSearchResultText": "（清除搜索）",
+    "kbn.management.settings.form.noSearchResultText": "未找到设置{clearSearch}",
+    "kbn.management.settings.form.searchResultText": "搜索词隐藏了 {settingsCount} 个设置{clearSearch}",
+    "kbn.management.settings.pageTitle": "设置",
+    "kbn.management.settings.searchBar.unableToParseQueryErrorMessage": "无法解析查询",
+    "kbn.management.settings.searchBarAriaLabel": "搜索高级设置",
+    "kbn.management.settings.sectionLabel": "高级设置",
+    "kbn.managementTitle": "管理",
+    "kbn.server.tutorials.aerospikeMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.aerospikeMetrics.longDescription": "Metricbeat 模块 `aerospike` 从 Aerospike 提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.aerospikeMetrics.nameTitle": "Aerospike 指标",
+    "kbn.server.tutorials.aerospikeMetrics.shortDescription": "从 Aerospike 服务器提取内部指标。",
+    "kbn.server.tutorials.apacheLogs.artifacts.dashboards.linkLabel": "Apache 日志仪表板",
+    "kbn.server.tutorials.apacheLogs.longDescription": "Filebeat 模块 apache 解析 Apache HTTP 服务器创建的访问和错误日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.apacheLogs.nameTitle": "Apache 日志",
+    "kbn.server.tutorials.apacheLogs.shortDescription": "收集并解析 Apache HTTP 服务器创建的访问和错误日志。",
+    "kbn.server.tutorials.apacheMetrics.artifacts.dashboards.linkLabel": "Apache 指标仪表板",
+    "kbn.server.tutorials.apacheMetrics.longDescription": "Metricbeat 模块 `apache` 从 Apache 2 HTTP 服务器提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.apacheMetrics.nameTitle": "Apache 指标",
+    "kbn.server.tutorials.apacheMetrics.shortDescription": "从 Apache 2 HTTP 服务器提取内部指标。",
+    "kbn.server.tutorials.apm.apmAgents.statusCheck.btnLabel": "检查代理状态",
+    "kbn.server.tutorials.apm.apmAgents.statusCheck.errorMessage": "尚未从代理收到任何数据",
+    "kbn.server.tutorials.apm.apmAgents.statusCheck.successMessage": "从一个或多个代理成功接收数据",
+    "kbn.server.tutorials.apm.apmAgents.statusCheck.text": "确保您的应用程序正在运行且代理正在发送数据。",
+    "kbn.server.tutorials.apm.apmAgents.statusCheck.title": "代理状态",
+    "kbn.server.tutorials.apm.apmAgents.title": "APM 代理",
+    "kbn.server.tutorials.apm.apmServer.statusCheck.btnLabel": "检查 APM Server 状态",
+    "kbn.server.tutorials.apm.apmServer.statusCheck.errorMessage": "APM Server 仍未连接到 Elasticsearch",
+    "kbn.server.tutorials.apm.apmServer.statusCheck.successMessage": "您已正确设置 APM Server",
+    "kbn.server.tutorials.apm.apmServer.statusCheck.text": "在开始实施 APM 代理之前，确保 APM Server 正在运行。",
+    "kbn.server.tutorials.apm.apmServer.statusCheck.title": "APM Server 状态",
+    "kbn.server.tutorials.apm.apmServer.title": "APM Server",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.addAgentComment": "向已安装应用添加代理",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.addTracingMiddlewareComment": "要发送性能指标，请添加我们的跟踪中间件：",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.allowedCharactersComment": "a-z、A-Z、0-9、-、_ 以及空格",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.setCustomApmServerUrlComment": "设置定制 APM Server URL（默认值：{defaultApmServerUrl}）",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.setRequiredServiceNameComment": "设置所需的服务名称。允许使用的字符：",
+    "kbn.server.tutorials.apm.djangoClient.configure.commands.useIfApmServerRequiresTokenComment": "APM Server 需要令牌时使用",
+    "kbn.server.tutorials.apm.djangoClient.configure.textPost": "有关高级用法，请参阅[文档]({documentationLink})。",
+    "kbn.server.tutorials.apm.djangoClient.configure.textPre": "代理是在您的应用程序进程内运行的库。APM 服务是基于 `SERVICE_NAME` 以编程方式创建的。",
+    "kbn.server.tutorials.apm.djangoClient.configure.title": "配置代理",
+    "kbn.server.tutorials.apm.djangoClient.install.textPre": "将 Python 的 APM 代理安装为依赖项。",
+    "kbn.server.tutorials.apm.djangoClient.install.title": "安装 APM 代理",
+    "kbn.server.tutorials.apm.dotNetClient.configureAgent.textPost": "如果您未将 `IConfiguration` 实例传递给代理（例如非 ASP.NET Core 应用程序），       您还可以通过环境变量配置代理。\n       有关高级用法，请参阅[文档]({documentationLink})。",
+    "kbn.server.tutorials.apm.dotNetClient.configureAgent.title": "样例 appsettings.json 文件：",
+    "kbn.server.tutorials.apm.dotNetClient.configureApplication.textPost": "传递 `IConfiguration` 实例为可选操作，通过此操作，代理将通过此`IConfiguration` 实例       读取配置设置（例如，从 `appsettings.json` 文件）。",
+    "kbn.server.tutorials.apm.dotNetClient.configureApplication.textPre": "对于具有 `Elastic.Apm.NetCoreAll` 软件包的 ASP.NET Core，请在 `Startup.cs` 文件内的        `Configure` 方法中调用 `UseAllElasticApm`。",
+    "kbn.server.tutorials.apm.dotNetClient.configureApplication.title": "将代理添加到应用程序",
+    "kbn.server.tutorials.apm.dotNetClient.download.title": "下载 APM 代理",
+    "kbn.server.tutorials.apm.downloadServer.title": "下载并解压缩 APM Server",
+    "kbn.server.tutorials.apm.downloadServerRpm": "寻找 32 位软件包？请参阅[下载页面]({downloadPageLink})。",
+    "kbn.server.tutorials.apm.downloadServerTitle": "寻找 32 位软件包？请参阅[下载页面]({downloadPageLink})。",
+    "kbn.server.tutorials.apm.editConfig.textPre": "如果您正在使用 Elastic Stack 的 X-Pack 安全版本，则必须在 `apm-server.yml` 配置文件中指定凭据。",
+    "kbn.server.tutorials.apm.editConfig.title": "编辑配置",
+    "kbn.server.tutorials.apm.elasticCloudInstructions.title": "APM 代理",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.allowedCharactersComment": "a-z、A-Z、0-9、-、_ 以及空格",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.configureElasticApmComment": "或进行配置以在您的应用程序设置中使用 ELASTIC_APM",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.initializeUsingEnvironmentVariablesComment": "使用环境变量初始化",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.setCustomApmServerUrlComment": "设置定制 APM Server URL（默认值：{defaultApmServerUrl}）",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.setRequiredServiceNameComment": "设置所需的服务名称。允许使用的字符：",
+    "kbn.server.tutorials.apm.flaskClient.configure.commands.useIfApmServerRequiresTokenComment": "APM Server 需要令牌时使用",
+    "kbn.server.tutorials.apm.flaskClient.configure.textPost": "有关高级用法，请参阅[文档]({documentationLink})。",
+    "kbn.server.tutorials.apm.flaskClient.configure.textPre": "代理是在您的应用程序进程内运行的库。APM 服务是基于 `SERVICE_NAME` 以编程方式创建的。",
+    "kbn.server.tutorials.apm.flaskClient.configure.title": "配置代理",
+    "kbn.server.tutorials.apm.flaskClient.install.textPre": "将 Python 的 APM 代理安装为依赖项。",
+    "kbn.server.tutorials.apm.flaskClient.install.title": "安装 APM 代理",
+    "kbn.server.tutorials.apm.goClient.configure.commands.initializeUsingEnvironmentVariablesComment": "使用环境变量初始化：",
+    "kbn.server.tutorials.apm.goClient.configure.commands.setCustomApmServerUrlComment": "设置定制 APM Server URL（默认值：{defaultApmServerUrl}）",
+    "kbn.server.tutorials.apm.goClient.configure.commands.setServiceNameComment": "设置服务名称。允许使用的字符：# a-z、A-Z、0-9、-、_ 和空格。",
+    "kbn.server.tutorials.apm.goClient.configure.commands.usedExecutableNameComment": "如果未指定 ELASTIC_APM_SERVICE_NAME，将会使用可执行文件名称。",
+    "kbn.server.tutorials.apm.goClient.configure.commands.useIfApmRequiresTokenComment": "APM Server 需要令牌时使用",
+    "kbn.server.tutorials.apm.goClient.configure.textPost": "有关高级配置，请参阅[文档]({documentationLink})。",
+    "kbn.server.tutorials.apm.goClient.configure.textPre": "代理是在您的应用程序进程内运行的库。APM 服务将基于可执行文件名称或 `ELASTIC_APM_SERVICE_NAME` 环境变量以编程方式进行创建。",
+    "kbn.server.tutorials.apm.goClient.configure.title": "配置代理",
+    "kbn.server.tutorials.apm.goClient.install.textPre": "安装 Go 的 APM 代理软件包。",
+    "kbn.server.tutorials.apm.goClient.install.title": "安装 APM 代理",
+    "kbn.server.tutorials.apm.goClient.instrument.textPost": "有关检测 Go 源代码的详细指南，请参阅[文档]({documentationLink})。",
+    "kbn.server.tutorials.apm.goClient.instrument.textPre": "使用以下已提供检测模块之一或直接使用跟踪器 API 来检测 Go 应用程序。",
+    "kbn.server.tutorials.apm.goClient.instrument.title": "检测您的应用程序",
+    "kbn.server.tutorials.apm.introduction": "从您的应用程序内收集深入全面的性能指标和错误。",
+    "kbn.server.tutorials.apm.javaClient.download.textPre": "从 [Maven Central]({mavenCentralLink}) 下载代理 jar。**切勿**将该代理添加为您的应用程序的依赖项。",
+    "kbn.server.tutorials.apm.javaClient.download.title": "下载 APM 代理",
+    "kbn.server.tutorials.apm.javaClient.startApplication.textPost": "有关配置选项和高级用法，请参阅[文档]({documentationLink})。",
+    "kbn.server.tutorials.apm.javaClient.startApplication.textPre": "添加 `-javaagent` 标志并使用系统属性配置代理。\n\n * 设置所需的服务名称（允许使用的字符：a-z、A-Z、0-9、-、_ 和空格）\n * 设置定制 APM Server URL（默认值：{customApmServerUrl}）\n * 设置您的应用程序的基础软件包",
+    "kbn.server.tutorials.apm.javaClient.startApplication.title": "使用 javaagent 标志设置您的应用程序",
+    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setCustomApmServerUrlComment": "设置定制 APM Server URL（默认值：{defaultApmServerUrl}）",
+    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setRequiredServiceNameComment": "设置所需的服务名称（允许使用的字符：a-z、A-Z、0-9、-、_ 和空格）",
+    "kbn.server.tutorials.apm.jsClient.installDependency.commands.setServiceVersionComment": "设置服务版本（源地图功能要求）",
+    "kbn.server.tutorials.apm.jsClient.enableRealUserMonitoring.textPre": "请参阅[文档]({documentationLink})。",
+    "kbn.server.tutorials.apm.jsClient.enableRealUserMonitoring.title": "在 APM 服务器中启用真实用户 Monitoring 支持",
+    "kbn.server.tutorials.apm.nodeClient.configure.commands.addThisToTheFileTopComment": "将其添加到您的应用中加载的第一个文件的上面",
+    "kbn.server.tutorials.apm.nodeClient.configure.commands.allowedCharactersComment": "允许使用的字符：a-z、A-Z、0-9、-、_ 和空格",
+    "kbn.server.tutorials.apm.nodeClient.configure.commands.setCustomApmServerUrlComment": "设置定制 APM Server URL（默认值：{defaultApmServerUrl}）",
+    "kbn.server.tutorials.apm.nodeClient.configure.commands.setRequiredServiceNameComment": "覆盖来自 package.json 的服务名",
+    "kbn.server.tutorials.apm.nodeClient.configure.commands.useIfApmRequiresTokenComment": "APM Server 需要令牌时使用",
+    "kbn.server.tutorials.apm.nodeClient.configure.textPost": "请参阅[文档]({documentationLink})以了解高级用法，包括如何使用 [Babel/ES 模块]({babelEsModulesLink})。",
+    "kbn.server.tutorials.apm.nodeClient.configure.textPre": "代理是在您的应用程序进程内运行的库。APM 服务是基于 `serviceName` 以编程方式创建的。此代理支持各种框架，而且还可以与您的定制堆栈配合使用。",
+    "kbn.server.tutorials.apm.nodeClient.configure.title": "配置代理",
+    "kbn.server.tutorials.apm.nodeClient.install.textPre": "将 Node.js 的 APM 代理安装为您的应用程序的依赖项。",
+    "kbn.server.tutorials.apm.nodeClient.install.title": "安装 APM 代理",
+    "kbn.server.tutorials.apm.rackClient.configure.commands.optionalComment": "可选，默认为 config/elastic_apm.yml",
+    "kbn.server.tutorials.apm.rackClient.configure.commands.requiredComment": "必填",
+    "kbn.server.tutorials.apm.rackClient.configure.textPre": "对于 Rack 或兼容的框架（例如 Sinatra），在您的应用中加入中间件，然后启动代理。",
+    "kbn.server.tutorials.apm.rackClient.configure.title": "配置代理",
+    "kbn.server.tutorials.apm.rackClient.createConfig.commands.defaultsToTheNameOfRackAppClassComment": "默认为 Rack 应用的类名称。",
+    "kbn.server.tutorials.apm.rackClient.createConfig.commands.setCustomApmServerComment": "设置定制 APM Server URL（默认值：{defaultServerUrl}）",
+    "kbn.server.tutorials.apm.rackClient.createConfig.commands.setServiceNameComment": "设置服务名称 - 允许使用的字符：a-z、A-Z、0-9、-、_ 和空格",
+    "kbn.server.tutorials.apm.rackClient.createConfig.commands.useIfApmServerRequiresTokenComment": "APM Server 需要令牌时使用",
+    "kbn.server.tutorials.apm.rackClient.createConfig.textPost": "有关配置选项和高级用法，请参阅[文档]({documentationLink})。\n\n",
+    "kbn.server.tutorials.apm.rackClient.createConfig.textPre": "创建配置文件 {configFile}：",
+    "kbn.server.tutorials.apm.rackClient.createConfig.title": "创建配置文件",
+    "kbn.server.tutorials.apm.rackClient.install.textPre": "将代理添加您的 Gemfile。",
+    "kbn.server.tutorials.apm.rackClient.install.title": "安装 APM 代理",
+    "kbn.server.tutorials.apm.railsClient.configure.textPost": "有关配置选项和高级用法，请参阅[文档]({documentationLink})。\n\n",
+    "kbn.server.tutorials.apm.railsClient.configure.textPre": "您的应用启动时，APM 自动启动。通过创建配置文件 {configFile} 来配置代理",
+    "kbn.server.tutorials.apm.railsClient.configure.title": "配置代理",
+    "kbn.server.tutorials.apm.railsClient.install.textPre": "将代理添加您的 Gemfile。",
+    "kbn.server.tutorials.apm.railsClient.install.title": "安装 APM 代理",
+    "kbn.server.tutorials.apm.specProvider.artifacts.application.label": "启动 APM",
+    "kbn.server.tutorials.apm.specProvider.artifacts.dashboards.linkLabel": "APM 仪表板",
+    "kbn.server.tutorials.apm.specProvider.longDescription": "应用程序性能 Monitoring (APM) 从您的应用程序内收集深入全面的性能指标和错误。其允许您实时监测数以千计的应用程序的性能。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.apm.specProvider.name": "APM",
+    "kbn.server.tutorials.apm.specProvider.savedObjectsInstallMsg": "APM UI 中的某些功能需要 APM 索引模式。",
+    "kbn.server.tutorials.apm.startServer.textPre": "服务器在 Elasticsearch 中处理并存储应用程序性能指标。",
+    "kbn.server.tutorials.apm.startServer.title": "启动 APM Server",
+    "kbn.server.tutorials.apm.windowsServerInstructions.textPost": "注意：如果您的系统禁用了脚本执行，则需要为当前会话设置执行策略，以允许脚本运行。例如：{command}。",
+    "kbn.server.tutorials.apm.windowsServerInstructions.textPre": "1.从[下载页面]({downloadPageLink})下载 APM Server Windows zip 文件。\n2.将 zip 文件的内容解压缩到 {zipFileExtractFolder}。\n3.将 {apmServerDirectory} 目录重命名为 `APM-Server`。\n4.以管理员身份打开 PowerShell 提示符（右键单击 PowerShell 图标，然后选择**以管理员身份运行**）。如果您正在运行 Windows XP，您可能需要下载并安装 PowerShell。\n5.从 PowerShell 提示符处，运行以下命令以将 APM Server 安装为 Windows 服务：",
+    "kbn.server.tutorials.auditbeat.artifacts.dashboards.linkLabel": "SIEM App",
+    "kbn.server.tutorials.auditbeat.longDescription": "使用 Auditbeat 从主机收集审计数据。其中包括进程、用户、登录、套接字信息、文件访问等等。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.auditbeat.nameTitle": "Auditbeat",
+    "kbn.server.tutorials.auditbeat.shortDescription": "从主机收集审计数据。",
+    "kbn.server.tutorials.awsMetrics.artifacts.dashboards.linkLabel": "AWS 指标仪表板",
+    "kbn.server.tutorials.awsMetrics.longDescription": "Metricbeat 模块 `aws` 从 AWS API 和 Cloudwatch 提取监测指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.awsMetrics.nameTitle": "AWS 指标",
+    "kbn.server.tutorials.awsMetrics.shortDescription": "从 AWS API 和 Cloudwatch 提取 EC2 实例的监测指标。",
+    "kbn.server.tutorials.cephMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.cephMetrics.longDescription": "Metricbeat 模块 `ceph` 从 Ceph 提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.cephMetrics.nameTitle": "Ceph 指标",
+    "kbn.server.tutorials.cephMetrics.shortDescription": "从 Ceph 服务器提取内部指标。",
+    "kbn.server.tutorials.ciscoLogs.artifacts.dashboards.linkLabel": "SIEM App",
+    "kbn.server.tutorials.ciscoLogs.longDescription": "这是用于 Cisco 网络设备日志的模块。当前支持“asa”文件集，该文件集用于通过 Syslog 接收或从文件读取的 Cisco ASA 防火墙日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.ciscoLogs.nameTitle": "Cisco",
+    "kbn.server.tutorials.ciscoLogs.shortDescription": "收集并解析从 Cisco ASA 防火墙接收的日志。",
+    "kbn.server.tutorials.cloudwatchLogs.longDescription": "通过部署将运行为 AWS Lambda 函数         的 Functionbeat，来收集 Cloudwatch 日志。         [了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.cloudwatchLogs.nameTitle": "Cloudwatch 日志",
+    "kbn.server.tutorials.cloudwatchLogs.shortDescription": "使用 Functionbeat 收集 Cloudwatch 日志",
+    "kbn.server.tutorials.corednsLogs.artifacts.dashboards.linkLabel": "CoreDNS 日志仪表板",
+    "kbn.server.tutorials.corednsLogs.longDescription": "`coredns` Filebeat 模块从 [CoreDNS](https://coredns.io/manual/toc/) 收集日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.corednsLogs.nameTitle": "CoreDNS 日志",
+    "kbn.server.tutorials.corednsLogs.shortDescription": "收集 Coredns 创建的日志。",
+    "kbn.server.tutorials.corednsMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.corednsMetrics.longDescription": "Metricbeat 模块 `coredns` 从 CoreDNS 提取监测指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.corednsMetrics.nameTitle": "CoreDNS 指标",
+    "kbn.server.tutorials.corednsMetrics.shortDescription": "从 CoreDNS 服务器提取监测指标。",
+    "kbn.server.tutorials.couchbaseMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.couchbaseMetrics.longDescription": "Metricbeat 模块 `couchbase` 从 Couchbase 提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.couchbaseMetrics.nameTitle": "Couchbase 指标",
+    "kbn.server.tutorials.couchbaseMetrics.shortDescription": "从 Couchbase 提取内部指标。",
+    "kbn.server.tutorials.dockerMetrics.artifacts.dashboards.linkLabel": "Docker 指标仪表板",
+    "kbn.server.tutorials.dockerMetrics.longDescription": "Metricbeat 模块 `docker` 从 Docker 服务器提取指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.dockerMetrics.nameTitle": "Docker 指标",
+    "kbn.server.tutorials.dockerMetrics.shortDescription": "提取有关 Docker 容器的指标。",
+    "kbn.server.tutorials.dropwizardMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.dropwizardMetrics.longDescription": "Metricbeat 模块 `dropwizard` 从 Dropwizard Java 应用程序提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.dropwizardMetrics.nameTitle": "Dropwizard 指标",
+    "kbn.server.tutorials.dropwizardMetrics.shortDescription": "从 Dropwizard Java 应用程序提取内部指标。",
+    "kbn.server.tutorials.elasticsearchLogs.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.elasticsearchLogs.longDescription": "Filebeat 模块 `elasticsearch` 解析 Elasticsearch 创建的日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.elasticsearchLogs.nameTitle": "Elasticsearch 日志",
+    "kbn.server.tutorials.elasticsearchLogs.shortDescription": "收集并解析 Elasticsearch 创建的日志。",
+    "kbn.server.tutorials.elasticsearchMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.elasticsearchMetrics.longDescription": "Metricbeat 模块 `elasticsearch` 从 Elasticsearch 提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.elasticsearchMetrics.nameTitle": "Elasticsearch 指标",
+    "kbn.server.tutorials.elasticsearchMetrics.shortDescription": "从 Elasticsearch 提取内部指标。",
+    "kbn.server.tutorials.envoyproxyLogs.artifacts.dashboards.linkLabel": "SIEM App",
+    "kbn.server.tutorials.envoyproxyLogs.longDescription": "这是用于 [Envoy 代理访问日志](https://www.envoyproxy.io/docs/envoy/v1.10.0/configuration/access_log)的 Filebeat 模块。其在 Kubernetes 中既支持独立部署，又支持 Envoy 代理部署。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.envoyproxyLogs.nameTitle": "Envoyproxy",
+    "kbn.server.tutorials.envoyproxyLogs.shortDescription": "收集并解析从 Envoy 代理接收的日志。",
+    "kbn.server.tutorials.etcdMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.etcdMetrics.longDescription": "Metricbeat 模块 `etcd` 从 Etcd 提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.etcdMetrics.nameTitle": "Etcd 指标",
+    "kbn.server.tutorials.etcdMetrics.shortDescription": "从 Etcd 服务器提取内部指标。",
+    "kbn.server.tutorials.golangMetrics.artifacts.dashboards.linkLabel": "Golang 指标仪表板",
+    "kbn.server.tutorials.golangMetrics.longDescription": "Metricbeat 模块 `{moduleName}` 从 Golang 应用提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.golangMetrics.nameTitle": "Golang 指标",
+    "kbn.server.tutorials.golangMetrics.shortDescription": "从 Golang 应用提取内部指标。",
+    "kbn.server.tutorials.haproxyMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.haproxyMetrics.longDescription": "Metricbeat 模块 `haproxy` 从 HAProxy 提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.haproxyMetrics.nameTitle": "HAProxy 指标",
+    "kbn.server.tutorials.haproxyMetrics.shortDescription": "从 HAProxy 服务器提取内部指标。",
+    "kbn.server.tutorials.iisLogs.artifacts.dashboards.linkLabel": "IIS 日志仪表板",
+    "kbn.server.tutorials.iisLogs.longDescription": "Filebeat 模块 `iis` 解析 IIS HTTP 服务器创建的访问和错误日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.iisLogs.nameTitle": "IIS 日志",
+    "kbn.server.tutorials.iisLogs.shortDescription": "收集并解析 IIS HTTP 服务器创建的访问和错误日志。",
+    "kbn.server.tutorials.iptablesLogs.artifacts.dashboards.linkLabel": "SIEM App",
+    "kbn.server.tutorials.iptablesLogs.longDescription": "这是用于 iptables 和 ip6tables 日志的模块。其解析在网络上通过 Syslog 或从文件中接收的日志。另外，其识别某些 Ubiquiti 防火墙添加的前缀，该前缀包含规则集名称、规则编号和对流量执行的操作（允许/拒绝）。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.iptablesLogs.nameTitle": "Iptables / Ubiquiti",
+    "kbn.server.tutorials.iptablesLogs.shortDescription": "从 Ubiqiti 防火墙收集并解析 iptables 和 ip6tables 日志。",
+    "kbn.server.tutorials.kafkaLogs.artifacts.dashboards.linkLabel": "Kafka 日志仪表板",
+    "kbn.server.tutorials.kafkaLogs.longDescription": "Filebeat 模块 `kafka` 解析 Kafka 创建的日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.kafkaLogs.nameTitle": "Kafka 日志",
+    "kbn.server.tutorials.kafkaLogs.shortDescription": "收集并解析 Kafka 创建的日志。",
+    "kbn.server.tutorials.kafkaMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.kafkaMetrics.longDescription": "Metricbeat 模块 `kafka` 从 Kafka 提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.kafkaMetrics.nameTitle": "Kafka 指标",
+    "kbn.server.tutorials.kafkaMetrics.shortDescription": "从 Kafka 服务器提取内部指标。",
+    "kbn.server.tutorials.kibanaMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.kibanaMetrics.longDescription": "Metricbeat 模块 `kibana` 从 Kibana 提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.kibanaMetrics.nameTitle": "Kibana 指标",
+    "kbn.server.tutorials.kibanaMetrics.shortDescription": "从 Kibana 提取内部指标。",
+    "kbn.server.tutorials.kubernetesMetrics.artifacts.dashboards.linkLabel": "Kubernetes 指标仪表板",
+    "kbn.server.tutorials.kubernetesMetrics.longDescription": "Metricbeat 模块 `kubernetes` 从 Kubernetes API 提取指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.kubernetesMetrics.nameTitle": "Kubernetes 指标",
+    "kbn.server.tutorials.kubernetesMetrics.shortDescription": "从您的 Kubernetes 安装提取指标。",
+    "kbn.server.tutorials.logstashLogs.artifacts.dashboards.linkLabel": "Logstash 日志仪表板",
+    "kbn.server.tutorials.logstashLogs.longDescription": "Filebeat 模块 `logstash` 解析 Logstash 创建的调试和慢查询日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.logstashLogs.nameTitle": "Logstash 日志",
+    "kbn.server.tutorials.logstashLogs.shortDescription": "收集并解析 Logstash 创建的调试和慢查询日志。",
+    "kbn.server.tutorials.logstashMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.logstashMetrics.longDescription": "Metricbeat 模块 `{moduleName}` 从 Logstash 服务器提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.logstashMetrics.nameTitle": "Logstash 指标",
+    "kbn.server.tutorials.logstashMetrics.shortDescription": "从 Logstash 服务器提取内部指标。",
+    "kbn.server.tutorials.memcachedMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.memcachedMetrics.longDescription": "Metricbeat 模块 `memcached` 从 Memcached 提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.memcachedMetrics.nameTitle": "Memcached 指标",
+    "kbn.server.tutorials.memcachedMetrics.shortDescription": "从 Memcached 提取内部指标。",
+    "kbn.server.tutorials.mongodbMetrics.artifacts.dashboards.linkLabel": "MongoDB 指标仪表板",
+    "kbn.server.tutorials.mongodbMetrics.longDescription": "Metricbeat 模块 `mongodb` 从 MongoDB 服务器提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.mongodbMetrics.nameTitle": "MongoDB 指标",
+    "kbn.server.tutorials.mongodbMetrics.shortDescription": "从 MongoDB 提取内部指标。",
+    "kbn.server.tutorials.mssqlMetrics.artifacts.dashboards.linkLabel": "Microsoft SQL Server 指标仪表板",
+    "kbn.server.tutorials.mssqlMetrics.longDescription": "Metricbeat 模块 `mssql` 从 Microsoft SQL Server 提取监测、日志和性能指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.mssqlMetrics.nameTitle": "Microsoft SQL Server 指标",
+    "kbn.server.tutorials.mssqlMetrics.shortDescription": "从 Microsoft SQL Server 实例提取监测指标",
+    "kbn.server.tutorials.muninMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.muninMetrics.longDescription": "Metricbeat 模块 `munin` 从 Munin 提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.muninMetrics.nameTitle": "Munin 指标",
+    "kbn.server.tutorials.muninMetrics.shortDescription": "从 Munin 服务器提取内部指标。",
+    "kbn.server.tutorials.mysqlLogs.artifacts.dashboards.linkLabel": "MySQL 日志仪表板",
+    "kbn.server.tutorials.mysqlLogs.longDescription": "Filebeat 模块 `mysql` 解析 MySQL 创建的错误和慢查询日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.mysqlLogs.nameTitle": "MySQL 日志",
+    "kbn.server.tutorials.mysqlLogs.shortDescription": "收集并解析 MySQL 创建的错误和慢查询日志。",
+    "kbn.server.tutorials.mysqlMetrics.artifacts.dashboards.linkLabel": "MySQL 指标仪表板",
+    "kbn.server.tutorials.mysqlMetrics.longDescription": "Metricbeat 模块 `mysql` 从 MySQL 服务器提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.mysqlMetrics.nameTitle": "MySQL 指标",
+    "kbn.server.tutorials.mysqlMetrics.shortDescription": "从 MySQL 提取内部指标。",
+    "kbn.server.tutorials.natsLogs.artifacts.dashboards.linkLabel": "Nats 日志仪表板",
+    "kbn.server.tutorials.natsLogs.longDescription": "Filebeat 模块 `nats` 解析 Nats 创建的日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.natsLogs.nameTitle": "Nats 日志",
+    "kbn.server.tutorials.natsLogs.shortDescription": "收集并解析 Nats 创建的日志。",
+    "kbn.server.tutorials.natsMetrics.artifacts.dashboards.linkLabel": "Nats 指标仪表板",
+    "kbn.server.tutorials.natsMetrics.longDescription": "Metricbeat 模块 `nats` 从 Nats 提取监测指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.natsMetrics.nameTitle": "Nats 指标",
+    "kbn.server.tutorials.natsMetrics.shortDescription": "从 Nats 服务器提取监测指标。",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口，{password} 是 {elastic} 用户的密码。",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.osxTitle": "编辑配置",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口，{password} 是 {elastic} 用户的密码。",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
+    "kbn.server.tutorials.netflow.common.config.elasticCloud.windowsTitle": "编辑配置",
+    "kbn.server.tutorials.netflow.common.config.onPrem.osxTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口。",
+    "kbn.server.tutorials.netflow.common.config.onPrem.osxTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
+    "kbn.server.tutorials.netflow.common.config.onPrem.osxTitle": "编辑配置",
+    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口。",
+    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
+    "kbn.server.tutorials.netflow.common.config.onPrem.windowsTitle": "编辑配置",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口，{esUrl} 是在 Elastic Cloud 上运行的 Elasticsearch 的 URL，{password} 是 {elastic} 用户的密码。",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.osxTitle": "编辑配置",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTextPost": "其中 {udpPort} 是 Logstash 用于接收 Netflow 数据的 UDP 端口，{esUrl} 是在 Elastic Cloud 上运行的 Elasticsearch 的 URL，{password} 是 {elastic} 用户的密码。",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTextPre": "修改 {logstashConfigPath} 以设置配置参数：",
+    "kbn.server.tutorials.netflow.common.config.onPremElasticCloud.windowsTitle": "编辑配置",
+    "kbn.server.tutorials.netflow.common.setup.osxTextPost": "“{setupOption}” 选项可在 Elasticsearch 中创建 {netflowPrefix} 索引模式，并导入 Kibana 仪表板和可视化。对随后的运行省略此选项可避免覆盖现有仪表板。",
+    "kbn.server.tutorials.netflow.common.setup.osxTextPre": "运行：",
+    "kbn.server.tutorials.netflow.common.setup.osxTitle": "运行 Netflow 模块",
+    "kbn.server.tutorials.netflow.common.setup.windowsTextPost": "“{setupOption}” 选项可在 Elasticsearch 中创建 {netflowPrefix} 索引模式，并导入 Kibana 仪表板和可视化。对随后的运行省略此选项可避免覆盖现有仪表板。",
+    "kbn.server.tutorials.netflow.common.setup.windowsTextPre": "运行：",
+    "kbn.server.tutorials.netflow.common.setup.windowsTitle": "运行 Netflow 模块",
+    "kbn.server.tutorials.netflow.elasticCloudInstructions.title": "入门",
+    "kbn.server.tutorials.netflow.onPremElasticCloudInstructions.title": "入门",
+    "kbn.server.tutorials.netflow.onPremInstructions.title": "入门",
+    "kbn.server.tutorials.netflow.tutorialLongDescription": "Logstash Netflow 模块收集并解析网络流量数据，在 Elasticsearch 中索引事件，并安装一套 Kibana 仪表板。此模块支持 Netflow 版本 5 和 9。[了解详情]({linkUrl})。",
+    "kbn.server.tutorials.netflow.tutorialShortDescription": "收集 Netflow 导出器发送的 Netflow 记录。",
+    "kbn.server.tutorials.nginxLogs.artifacts.dashboards.linkLabel": "Nginx 日志仪表板",
+    "kbn.server.tutorials.nginxLogs.longDescription": "Filebeat 模块 `nginx` 解析 Nginx HTTP 服务器创建的访问和错误日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.nginxLogs.nameTitle": "Nginx 日志",
+    "kbn.server.tutorials.nginxLogs.shortDescription": "收集并解析 Nginx HTTP 服务器创建的访问和错误日志。",
+    "kbn.server.tutorials.nginxMetrics.artifacts.dashboards.linkLabel": "Nginx 指标仪表板",
+    "kbn.server.tutorials.nginxMetrics.longDescription": "Metricbeat 模块 `nginx` 从 Nginx HTTP 服务器提取内部指标。该模块从 {statusModuleLink} 生成的网页收集服务器状态数据。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.nginxMetrics.nameTitle": "Nginx 指标",
+    "kbn.server.tutorials.nginxMetrics.shortDescription": "从 Nginx HTTP 服务器提取内部指标。",
+    "kbn.server.tutorials.osqueryLogs.artifacts.dashboards.linkLabel": "Osquery 日志仪表板",
+    "kbn.server.tutorials.osqueryLogs.longDescription": "Filebeat 模块 `osquery` 收集 `osqueryd` 收集的 JSON 结果日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.osqueryLogs.nameTitle": "Osquery 日志",
+    "kbn.server.tutorials.osqueryLogs.shortDescription": "收集 osqueryd 创建的结果日志。",
+    "kbn.server.tutorials.phpFpmMetrics.longDescription": "Metricbeat 模块 `php_fpm` 从 PHP-FPM 服务器提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.phpFpmMetrics.nameTitle": "PHP-FPM 指标",
+    "kbn.server.tutorials.phpFpmMetrics.shortDescription": "从 PHP-FPM 提取内部指标。",
+    "kbn.server.tutorials.postgresqlLogs.artifacts.dashboards.linkLabel": "PostgreSQL 日志仪表板",
+    "kbn.server.tutorials.postgresqlLogs.longDescription": "Filebeat 模块 `postgresql` 解析 PostgreSQL 创建的错误和慢查询日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.postgresqlLogs.nameTitle": "PostgreSQL 日志",
+    "kbn.server.tutorials.postgresqlLogs.shortDescription": "收集并解析 PostgreSQL 创建的错误和慢查询日志。",
+    "kbn.server.tutorials.postgresqlMetrics.longDescription": "Metricbeat 模块 `postgresql` 从 PostgreSQL 服务器提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.postgresqlMetrics.nameTitle": "PostgreSQL 指标",
+    "kbn.server.tutorials.postgresqlMetrics.shortDescription": "从 PostgreSQL 提取内部指标。",
+    "kbn.server.tutorials.prometheusMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.prometheusMetrics.longDescription": "Metricbeat 模块 `{moduleName}` 从 Prometheus 终端节点提取指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.prometheusMetrics.nameTitle": "Prometheus 指标",
+    "kbn.server.tutorials.prometheusMetrics.shortDescription": "从 Prometheus 导出器提取指标。",
+    "kbn.server.tutorials.rabbitmqMetrics.artifacts.dashboards.linkLabel": "RabbitMQ 指标仪表板",
+    "kbn.server.tutorials.rabbitmqMetrics.longDescription": "Metricbeat 模块 `rabbitmq` 从 RabbitMQ 服务器提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.rabbitmqMetrics.nameTitle": "RabbitMQ 指标",
+    "kbn.server.tutorials.rabbitmqMetrics.shortDescription": "从 RabbitMQ 服务器提取内部指标。",
+    "kbn.server.tutorials.redisLogs.artifacts.dashboards.linkLabel": "Redis 日志仪表板",
+    "kbn.server.tutorials.redisLogs.longDescription": "Filebeat 模块 `redis` 解析 Redis 创建的错误和慢查询日志。为了使 Redis 写入错误日志，确保 Redis 配置文件中的 `logfile` 选项设置为 `redis-server.log`。通过 `SLOWLOG` 命令可直接从 Redis 读取慢查询日志。为了使 Redis 记录慢查询日志，确保设置了 `slowlog-log-slower-than` 选项。请注意，`slowlog` 是实验性文件集。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.redisLogs.nameTitle": "Redis 日志",
+    "kbn.server.tutorials.redisLogs.shortDescription": "收集并解析 Redis 创建的错误和慢查询日志。",
+    "kbn.server.tutorials.redisMetrics.artifacts.dashboards.linkLabel": "Redis 指标仪表板",
+    "kbn.server.tutorials.redisMetrics.longDescription": "Metricbeat 模块 `redis` 从 Redis 服务器提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.redisMetrics.nameTitle": "Redis 指标",
+    "kbn.server.tutorials.redisMetrics.shortDescription": "从 Redis 提取内部指标。",
+    "kbn.server.tutorials.suricataLogs.artifacts.dashboards.linkLabel": "Suricata 日志仪表板",
+    "kbn.server.tutorials.suricataLogs.longDescription": "Filebeat 模块 `suricata` 从 [Suricata Eve JSON 输出](https://suricata.readthedocs.io/en/latest/output/eve/eve-json-format.html)收集日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.suricataLogs.nameTitle": "Suricata 日志",
+    "kbn.server.tutorials.suricataLogs.shortDescription": "收集 Suricata IDS/IPS/NSM 创建的结果日志。",
+    "kbn.server.tutorials.systemLogs.artifacts.dashboards.linkLabel": "系统日志仪表板",
+    "kbn.server.tutorials.systemLogs.longDescription": "Filebeat 模块 `system` 收集并解析常见 Unix/Linux 型分发的系统日志服务创建的日志。此模块在 Windows 上不可用。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.systemLogs.nameTitle": "系统日志",
+    "kbn.server.tutorials.systemLogs.shortDescription": "收集并解析本地 Syslog 服务器写入的日志。",
+    "kbn.server.tutorials.systemMetrics.artifacts.dashboards.linkLabel": "系统指标仪表板",
+    "kbn.server.tutorials.systemMetrics.longDescription": "Metricbeat 模块 `system` 从主机收集 CPU、内存、网络和磁盘统计信息。其收集系统范围的统计信息以及每个进程和文件系统的统计信息。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.systemMetrics.nameTitle": "系统指标",
+    "kbn.server.tutorials.systemMetrics.shortDescription": "从主机上收集 CPU、内存、网络和磁盘统计信息。",
+    "kbn.server.tutorials.traefikLogs.artifacts.dashboards.linkLabel": "Traefik 日志仪表板",
+    "kbn.server.tutorials.traefikLogs.longDescription": "Filebeat 模块 `traefik` 解析 Traefik 创建的访问日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.traefikLogs.nameTitle": "Traefik 日志",
+    "kbn.server.tutorials.traefikLogs.shortDescription": "收集和解析 Traefik 代理创建的访问日志。",
+    "kbn.server.tutorials.uptimeMonitors.artifacts.dashboards.linkLabel": "Uptime 应用",
+    "kbn.server.tutorials.uptimeMonitors.longDescription": "通过主动探测来监测服务的可用性。        通过给定 URL 列表，Heartbeat 仅仅询问：是否保持连接？         [了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.uptimeMonitors.nameTitle": "运行时间监测",
+    "kbn.server.tutorials.uptimeMonitors.shortDescription": "监测服务的可用性",
+    "kbn.server.tutorials.uwsgiMetrics.artifacts.dashboards.linkLabel": "uWSGI 指标仪表板",
+    "kbn.server.tutorials.uwsgiMetrics.longDescription": "Metricbeat 模块 `uwsgi` 从 uWSGI 服务器提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.uwsgiMetrics.nameTitle": "uWSGI 指标",
+    "kbn.server.tutorials.uwsgiMetrics.shortDescription": "从 uWSGI 服务器提取内部指标。",
+    "kbn.server.tutorials.vsphereMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.vsphereMetrics.longDescription": "Metricbeat 模块 `vsphere` 从 vSphere 集群提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.vsphereMetrics.nameTitle": "vSphere 指标",
+    "kbn.server.tutorials.vsphereMetrics.shortDescription": "从 vSphere 提取内部指标。",
+    "kbn.server.tutorials.windowsEventLogs.artifacts.application.label": "SIEM App",
+    "kbn.server.tutorials.windowsEventLogs.longDescription": "使用 Winlogbeat 从 Windows 事件日志收集日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.windowsEventLogs.nameTitle": "Windows 事件日志",
+    "kbn.server.tutorials.windowsEventLogs.shortDescription": "从 Windows 事件日志提取日志。",
+    "kbn.server.tutorials.windowsMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.windowsMetrics.longDescription": "Metricbeat 模块 `windows` 从 Windows 提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.windowsMetrics.nameTitle": "Windows 指标",
+    "kbn.server.tutorials.windowsMetrics.shortDescription": "从 Windows 提取内部指标。",
+    "kbn.server.tutorials.zeekLogs.artifacts.dashboards.linkLabel": "Zeek 日志仪表板",
+    "kbn.server.tutorials.zeekLogs.longDescription": "Filebeat 模块 `zeek` 从 [Zeek](https://www.zeek.org//documentation/index.html) 收集日志。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.zeekLogs.nameTitle": "Zeek 日志",
+    "kbn.server.tutorials.zeekLogs.shortDescription": "收集 Zeek/Bro 创建的日志。",
+    "kbn.server.tutorials.zookeeperMetrics.artifacts.application.label": "Discover",
+    "kbn.server.tutorials.zookeeperMetrics.longDescription": "Metricbeat 模块 `{moduleName}` 从 Zookeeper 服务器提取内部指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.zookeeperMetrics.nameTitle": "Zookeeper 指标",
+    "kbn.server.tutorials.zookeeperMetrics.shortDescription": "从 Zookeeper 服务器提取内部指标。",
+    "kbn.settings.advancedSettings.voiceAnnouncement.searchResultScreenReaderMessage": "您已搜索 {query}。{sectionLenght, plural, one {# 个部分} other {# 个部分}}中有 {optionLenght, plural, one {# 个选项} other {# 个选项}}",
+    "kbn.topNavMenu.openInspectorButtonLabel": "检查",
+    "kbn.topNavMenu.refreshButtonLabel": "刷新",
+    "kbn.topNavMenu.saveVisualizationButtonLabel": "保存",
+    "kbn.topNavMenu.shareVisualizationButtonLabel": "共享",
+    "kbn.visualize.badge.readOnly.text": "只读",
+    "kbn.visualize.badge.readOnly.tooltip": "无法保存可视化",
+    "kbn.visualize.createVisualization.noIndexPatternOrSavedSearchIdErrorMessage": "必须提供 indexPattern 或 savedSearchId",
+    "kbn.visualize.disabledLabVisualizationMessage": "请在高级设置中打开实验室模式，以查看实验室可视化。",
+    "kbn.visualize.disabledLabVisualizationTitle": "{title} 为实验室可视化。",
+    "kbn.visualize.editor.createBreadcrumb": "创建",
+    "kbn.visualize.experimentalVisInfoText": "此可视化标记为“实验”。",
+    "kbn.visualize.linkedToSearch.unlinkButtonTooltip": "双击可取消与“已保存搜索”的链接",
+    "kbn.visualize.linkedToSearch.unlinkSuccessNotificationText": "取消与已保存搜索 “{searchTitle}” 的链接",
+    "kbn.visualize.linkedToSearchInfoText": "链接到“已保存搜索”",
+    "kbn.visualize.listing.breadcrumb": "可视化",
+    "kbn.visualize.listing.createNew.createButtonLabel": "新建可视化",
+    "kbn.visualize.listing.createNew.description": "可以根据您的数据创建不同的可视化。",
+    "kbn.visualize.listing.createNew.title": "创建首个可视化",
+    "kbn.visualize.listing.experimentalTitle": "实验性",
+    "kbn.visualize.listing.experimentalTooltip": "未来版本可能会更改或删除此可视化，其不受支持 SLA 的约束。",
+    "kbn.visualize.listing.noItemsMessage": "看起来您还没有任何可视化。",
+    "kbn.visualize.listing.table.entityName": "可视化",
+    "kbn.visualize.listing.table.entityNamePlural": "可视化",
+    "kbn.visualize.listing.table.listTitle": "可视化",
+    "kbn.visualize.listing.table.titleColumnName": "标题",
+    "kbn.visualize.listing.table.typeColumnName": "类型",
+    "kbn.visualize.newVisWizard.chooseSourceTitle": "选择源",
+    "kbn.visualize.newVisWizard.experimentalDescription": "这是实验性可视化。与稳定的可视化相比，其设计和实现均不够成熟，可能会随时发生更改。",
+    "kbn.visualize.newVisWizard.experimentalTitle": "实验性",
+    "kbn.visualize.newVisWizard.experimentalTooltip": "未来版本可能会更改或删除此可视化，其不受支持 SLA 的约束。",
+    "kbn.visualize.newVisWizard.filterVisTypeAriaLabel": "筛留可视化类型",
+    "kbn.visualize.newVisWizard.helpText": "通过为该可视化选择类型，来开始创建您的可视化。",
+    "kbn.visualize.newVisWizard.helpTextAriaLabel": "通过为该可视化选择类型，来开始创建您的可视化。按 Esc 键关闭此模式。按 Tab 键继续。",
+    "kbn.visualize.newVisWizard.newVisTypeTitle": "新建{visTypeName}",
+    "kbn.visualize.newVisWizard.resultsFound": "找到了 {resultCount} 个{resultCount, plural, one {类型} other {类型} }",
+    "kbn.visualize.newVisWizard.searchSelection.notFoundLabel": "未找到匹配的索引或已保存搜索。",
+    "kbn.visualize.newVisWizard.searchSelection.savedObjectType.indexPattern": "索引模式",
+    "kbn.visualize.newVisWizard.searchSelection.savedObjectType.search": "已保存搜索",
+    "kbn.visualize.newVisWizard.selectVisType": "选择可视化类型",
+    "kbn.visualize.newVisWizard.title": "新建可视化",
+    "kbn.visualize.saveDialog.saveAndAddToDashboardButtonLabel": "保存并添加到仪表板",
+    "kbn.visualize.savedObjectName": "可视化",
+    "kbn.visualize.topNavMenu.openInspectorButtonAriaLabel": "打开检查器查看可视化",
+    "kbn.visualize.topNavMenu.openInspectorDisabledButtonTooltip": "此可视化不支持任何检查器。",
+    "kbn.visualize.topNavMenu.refreshButtonAriaLabel": "刷新",
+    "kbn.visualize.topNavMenu.saveVisualization.failureNotificationText": "保存 “{visTitle}” 时出错",
+    "kbn.visualize.topNavMenu.saveVisualization.successNotificationText": "已保存“{visTitle}”",
+    "kbn.visualize.topNavMenu.saveVisualizationButtonAriaLabel": "保存可视化",
+    "kbn.visualize.topNavMenu.saveVisualizationDisabledButtonTooltip": "应用或放弃所做更改，然后保存",
+    "kbn.visualize.topNavMenu.shareVisualizationButtonAriaLabel": "共享可视化",
+    "kbn.visualize.visualizeDescription": "创建可视化并聚合存储在 Elasticsearch 索引中的数据。",
+    "kbn.visualize.visualizeListingBreadcrumbsTitle": "可视化",
+    "kbn.visualize.visualizeListingDeleteErrorTitle": "删除可视化时出错",
+    "kbn.visualize.wizard.step1Breadcrumb": "创建",
+    "kbn.visualize.wizard.step2Breadcrumb": "创建",
+    "kbn.visualizeTitle": "可视化",
+    "kbn.advancedSettings.discover.searchOnPageLoadText": "控制在 Discover 首次加载时是否执行搜索。加载已保存搜索时，此设置无效。",
+    "kbn.advancedSettings.discover.searchOnPageLoadTitle": "在页面加载时搜索",
+    "kbn.advancedSettings.visualization.heatmap.maxBucketsText": "单个数据源可以返回的最大存储桶数目。较高的数目可能对浏览器呈现性能有负面影响",
+    "kbn.advancedSettings.visualization.heatmap.maxBucketsTitle": "热图最大存储桶数",
+    "kbn.discover.localMenu.saveSaveSearchDescription": "保存您的 Discover 搜索，以便可以在可视化和仪表板中使用该搜索",
+    "kbn.discover.uninitializedRefreshButtonText": "刷新数据",
+    "kbn.discover.uninitializedText": "编写查询，添加一些筛选，或只需单击“刷新”来检索当前查询的结果。",
+    "kbn.discover.uninitializedTitle": "开始搜索",
+    "kbn.docTable.tableHeader.sortByColumnUnsortedAriaLabel": "停止按 {columnName} 排序",
+    "kbn.embeddable.search.displayName": "搜索",
+    "kbn.embeddable.visualizations.displayName": "可视化",
+    "kbn.home.addData.siem.addSiemEventsButtonLabel": "添加安全事件",
+    "kbn.home.addData.siem.nameDescription": "集中安全事件，以通过即用型可视化实现交互式调查。",
+    "kbn.home.addData.siem.nameTitle": "SIEM",
+    "kbn.home.tutorial.tabs.siemTitle": "SIEM",
+    "kbn.home.welcomeHomePageHeader": "Kibana 主页",
+    "kbn.discover.reloadSavedSearchButton": "重置搜索",
+    "kbn.server.tutorials.apm.dotNetClient.download.textPre": "将代理软件包从 [NuGet]({allNuGetPackagesLink}) 添加到 .NET 应用程序。有多个       NuGet 软件包可用于不同的用例。\n\n对于具有 Entity Framework Core 的 ASP.NET Core       应用程序，请下载 [Elastic.Apm.NetCoreAll]({netCoreAllApmPackageLink}) 软件包。此软件包将自动将每个       代理组件添加到您的应用程序。\n\n 如果您希望最大程度减少依存关系，您可以将       [Elastic.Apm.AspNetCore]({aspNetCorePackageLink}) 软件包仅用于       ASP.NET Core 监测，或将 [Elastic.Apm.EfCore]({efCorePackageLink}) 软件包仅用于 Entity Framework Core 监测。\n\n       如果仅希望将公共代理 API 用于手动检测，请使用 [Elastic.Apm]({elasticApmPackageLink}) 软件包。",
+    "kbn.server.tutorials.apm.elasticCloud.textPre": "要启用 APM Server，请前往 [Elastic Cloud 控制台](https://cloud.elastic.co/deployments?q={cloudId}) 并在部署设置中启用 APM。启用后，请刷新此页面。",
+    "kbn.advancedSettings.defaultRoute.defaultRouteText": "此设置指定打开 Kibana 时的默认路由。您可以使用此设置修改打开 Kibana 时的登陆页面。路由必须以正斜杠（“/”）开头。",
+    "kbn.advancedSettings.defaultRoute.defaultRouteTitle": "默认路由",
+    "kbn.advancedSettings.defaultRoute.defaultRouteValidationMessage": "路由必须以正斜杠（“/”）开头",
+    "kbn.context.loadButtonLabel": "加载",
+    "kbn.context.newerDocumentsAriaLabel": "较新文档数目",
+    "kbn.context.newerDocumentsWarning": "仅可以找到 {docCount} 个比定位标记新的文档。",
+    "kbn.context.newerDocumentsWarningZero": "找不到比定位标记新的文档。",
+    "kbn.context.olderDocumentsAriaLabel": "较旧文档数目",
+    "kbn.context.olderDocumentsWarning": "仅可以找到 {docCount} 个比定位标记旧的文档。",
+    "kbn.context.olderDocumentsWarningZero": "找不到比定位标记旧的文档。",
+    "kbn.discover.fieldChooser.fieldFilterFacetButtonLabel": "已筛选字段",
+    "kbn.discover.fieldChooser.searchPlaceHolder": "搜索字段",
+    "kbn.discover.histogram.partialData.bucketTooltipText": "选定的时间范围不包括此整个存储桶，其可能包含部分数据。",
+    "kbn.doc.failedToLocateIndexPattern": "无索引模式匹配 ID {indexPatternId}",
+    "kbn.doc.somethingWentWrongDescriptionAddon": "请确保索引存在。",
+    "kbn.management.objects.objectsTable.export.successWithMissingRefsNotification": "您的文件正在后台下载。找不到某些相关对象。有关缺失对象列表，请查看导出文件的最后一行。",
+    "kbn.management.settings.categoryNames.siemLabel": "SIEM",
+    "kbn.management.settings.field.imageTooLargeErrorMessage": "图像过大，最大大小为 {maxSizeDescription}",
+    "kbn.server.tutorials.couchdbMetrics.artifacts.dashboards.linkLabel": "CouchDB 指标仪表板",
+    "kbn.server.tutorials.couchdbMetrics.longDescription": "`couchdb` Metricbeat 模块从 CouchDB 提取监测指标。[了解详情]({learnMoreLink})。",
+    "kbn.server.tutorials.couchdbMetrics.nameTitle": "CouchDB 指标",
+    "kbn.server.tutorials.couchdbMetrics.shortDescription": "从 CouchdB 服务器提取监测指标。",
+    "kbn.visualize.listing.betaTitle": "公测版",
+    "kbn.visualize.listing.betaTooltip": "此可视化为公测版，可能会进行更改。设计和代码相对于正式发行版功能还不够成熟，将按原样提供，且不提供任何保证。公测版功能不受正式发行版功能支持 SLA 的约束",
+    "kbn.visualize.newVisWizard.betaDescription": "此可视化为公测版，可能会进行更改。设计和代码相对于正式发行版功能还不够成熟，将按原样提供，且不提供任何保证。公测版功能不受正式发行版功能支持 SLA 的约束",
+    "kbn.visualize.newVisWizard.betaTitle": "公测版",
+    "kbn.visualize.pageHeading": "{chartName} {chartType}可视化",
+    "kbn.advancedSettings.courier.batchSearchesText": "禁用时，仪表板面板将分别加载，用户离开时或更新查询时，\n           搜索请求将终止。启用时，仪表板面板将一起加载并加载所有数据，\n           搜索将不会终止。",
+    "kbn.doc.couldNotFindDocumentsDescription": "无文档匹配该 ID。",
+    "kbn.doc.somethingWentWrongDescription": "{indexName} 缺失。",
+    "kbnVislibVisTypes.area.areaDescription": "突出折线图下方的数量",
+    "kbnVislibVisTypes.area.areaTitle": "面积图",
+    "kbnVislibVisTypes.area.groupTitle": "拆分序列",
+    "kbnVislibVisTypes.area.metricsTitle": "Y 轴",
+    "kbnVislibVisTypes.area.radiusTitle": "点大小",
+    "kbnVislibVisTypes.area.segmentTitle": "X 轴",
+    "kbnVislibVisTypes.area.splitTitle": "拆分图表",
+    "kbnVislibVisTypes.controls.gaugeOptions.alignmentLabel": "对齐方式",
+    "kbnVislibVisTypes.controls.gaugeOptions.displayWarningsLabel": "显示警告",
+    "kbnVislibVisTypes.controls.gaugeOptions.rangesTitle": "范围",
+    "kbnVislibVisTypes.controls.gaugeOptions.styleTitle": "样式",
+    "kbnVislibVisTypes.controls.heatmapOptions.colorLabel": "颜色",
+    "kbnVislibVisTypes.controls.heatmapOptions.colorsNumberLabel": "颜色个数",
+    "kbnVislibVisTypes.controls.heatmapOptions.overwriteAutomaticColorLabel": "覆盖自动配色",
+    "kbnVislibVisTypes.controls.heatmapOptions.rotateLabel": "旋转",
+    "kbnVislibVisTypes.controls.heatmapOptions.showLabelsTitle": "显示标签",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.filterLabelsLabel": "筛选标签",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.labelsTitle": "标签",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.positionLabel": "位置",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.showLabel": "显示",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.showLabelsLabel": "显示标签",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.xAxisTitle": "X 轴",
+    "kbnVislibVisTypes.controls.pointSeries.gridAxis.dontShowLabel": "不显示",
+    "kbnVislibVisTypes.controls.pointSeries.gridAxis.gridText": "网格",
+    "kbnVislibVisTypes.controls.pointSeries.gridAxis.xAxisLinesLabel": "显示 X 轴线",
+    "kbnVislibVisTypes.controls.pointSeries.gridAxis.yAxisLinesLabel": "Y 轴线",
+    "kbnVislibVisTypes.controls.pointSeries.series.chartTypeLabel": "图表类型",
+    "kbnVislibVisTypes.controls.pointSeries.series.lineModeLabel": "线条模式",
+    "kbnVislibVisTypes.controls.pointSeries.series.lineWidthLabel": "线条宽度",
+    "kbnVislibVisTypes.controls.pointSeries.series.metricsTitle": "指标",
+    "kbnVislibVisTypes.controls.pointSeries.series.modeLabel": "模式",
+    "kbnVislibVisTypes.controls.pointSeries.series.newAxisLabel": "新建轴…...",
+    "kbnVislibVisTypes.controls.pointSeries.series.showLineLabel": "显示为线条",
+    "kbnVislibVisTypes.controls.pointSeries.series.valueAxisLabel": "值轴",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.maxLabel": "最大值",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minLabel": "最小值",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minNeededScaleText": "如果选择了对数刻度，最小值必须大于 0。",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.modeLabel": "模式",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.positionLabel": "位置",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBoundsLabel": "缩放到数据边界",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleTypeLabel": "缩放类型",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.setAxisExtentsLabel": "设置轴范围",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.showLabel": "显示",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.titleLabel": "标题",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.yAxisTitle": "Y 轴",
+    "kbnVislibVisTypes.editors.pie.donutLabel": "圆环图",
+    "kbnVislibVisTypes.editors.pointSeries.currentTimeMarkerLabel": "当前时间标记",
+    "kbnVislibVisTypes.editors.pointSeries.orderBucketsBySumLabel": "按总计值排序存储桶",
+    "kbnVislibVisTypes.editors.pointSeries.settingsTitle": "设置",
+    "kbnVislibVisTypes.functions.pie.help": "饼图可视化",
+    "kbnVislibVisTypes.functions.vislib.help": "Vislib 可视化",
+    "kbnVislibVisTypes.gauge.alignmentAutomaticTitle": "自动",
+    "kbnVislibVisTypes.gauge.alignmentHorizontalTitle": "水平",
+    "kbnVislibVisTypes.gauge.alignmentVerticalTitle": "垂直",
+    "kbnVislibVisTypes.gauge.gaugeDescription": "仪表盘图指示指标的状态。用于显示指标值与参考阈值的相关程度。",
+    "kbnVislibVisTypes.gauge.gaugeTitle": "仪表盘图",
+    "kbnVislibVisTypes.gauge.groupTitle": "拆分组",
+    "kbnVislibVisTypes.gauge.metricTitle": "指标",
+    "kbnVislibVisTypes.goal.goalDescription": "目标图指示与最终目标的接近程度。",
+    "kbnVislibVisTypes.goal.goalTitle": "目标图",
+    "kbnVislibVisTypes.goal.groupTitle": "拆分组",
+    "kbnVislibVisTypes.goal.metricTitle": "指标",
+    "kbnVislibVisTypes.heatmap.groupTitle": "Y 轴",
+    "kbnVislibVisTypes.heatmap.heatmapDescription": "为矩阵中的单元格添加阴影",
+    "kbnVislibVisTypes.heatmap.heatmapTitle": "热力图",
+    "kbnVislibVisTypes.heatmap.metricTitle": "值",
+    "kbnVislibVisTypes.heatmap.segmentTitle": "X 轴",
+    "kbnVislibVisTypes.heatmap.splitTitle": "拆分图表",
+    "kbnVislibVisTypes.histogram.groupTitle": "拆分序列",
+    "kbnVislibVisTypes.histogram.histogramDescription": "向每个轴赋予连续变量",
+    "kbnVislibVisTypes.histogram.histogramTitle": "垂直条形图",
+    "kbnVislibVisTypes.histogram.metricTitle": "Y 轴",
+    "kbnVislibVisTypes.histogram.radiusTitle": "点大小",
+    "kbnVislibVisTypes.histogram.segmentTitle": "X 轴",
+    "kbnVislibVisTypes.histogram.splitTitle": "拆分图表",
+    "kbnVislibVisTypes.horizontalBar.groupTitle": "拆分序列",
+    "kbnVislibVisTypes.horizontalBar.horizontalBarDescription": "向每个轴赋予连续变量",
+    "kbnVislibVisTypes.horizontalBar.horizontalBarTitle": "水平条形图",
+    "kbnVislibVisTypes.horizontalBar.metricTitle": "Y 轴",
+    "kbnVislibVisTypes.horizontalBar.radiusTitle": "点大小",
+    "kbnVislibVisTypes.horizontalBar.segmentTitle": "X 轴",
+    "kbnVislibVisTypes.horizontalBar.splitTitle": "拆分图表",
+    "kbnVislibVisTypes.line.groupTitle": "拆分序列",
+    "kbnVislibVisTypes.line.lineDescription": "突出趋势",
+    "kbnVislibVisTypes.line.lineTitle": "折线图",
+    "kbnVislibVisTypes.line.metricTitle": "Y 轴",
+    "kbnVislibVisTypes.line.radiusTitle": "点大小",
+    "kbnVislibVisTypes.line.segmentTitle": "X 轴",
+    "kbnVislibVisTypes.line.splitTitle": "拆分图表",
+    "kbnVislibVisTypes.pie.metricTitle": "切片大小",
+    "kbnVislibVisTypes.pie.pieDescription": "比较整体的各个部分",
+    "kbnVislibVisTypes.pie.pieTitle": "饼图",
+    "kbnVislibVisTypes.pie.segmentTitle": "拆分切片",
+    "kbnVislibVisTypes.pie.splitTitle": "拆分图表",
+    "kbnVislibVisTypes.controls.gaugeOptions.extendRangeTooltip": "将数据范围扩展到最大值。",
+    "kbnVislibVisTypes.controls.gaugeOptions.labelsTitle": "标签",
+    "kbnVislibVisTypes.controls.gaugeOptions.switchWarningsTooltip": "打开/关闭警告。打开时，如果标签没有全部显示，则显示警告。",
+    "kbnVislibVisTypes.controls.pointSeries.gridAxis.yAxisLinesDisabledTooltip": "直方图的 X 轴线无法显示。",
+    "kbnVislibVisTypes.controls.rangeErrorMessage": "值必须是在 {min} 到 {max} 的范围内",
+    "kbnVislibVisTypes.controls.truncateLabel": "截断",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.valueLabel": "阈值",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.widthLabel": "线条宽度",
+    "kbnVislibVisTypes.gauge.gaugeTypes.arcText": "弧形",
+    "kbnVislibVisTypes.gauge.gaugeTypes.circleText": "圆形",
+    "kbnVislibVisTypes.legendPositions.bottomText": "下",
+    "kbnVislibVisTypes.legendPositions.leftText": "左",
+    "kbnVislibVisTypes.legendPositions.rightText": "右",
+    "kbnVislibVisTypes.legendPositions.topText": "上",
+    "kbnVislibVisTypes.controls.gaugeOptions.autoExtendRangeLabel": "自动扩展范围",
+    "kbnVislibVisTypes.controls.gaugeOptions.gaugeTypeLabel": "仪表类型",
+    "kbnVislibVisTypes.controls.gaugeOptions.percentageModeLabel": "百分比模式",
+    "kbnVislibVisTypes.controls.gaugeOptions.showLabelsLabel": "显示标签",
+    "kbnVislibVisTypes.controls.gaugeOptions.showLegendLabel": "显示图例",
+    "kbnVislibVisTypes.controls.gaugeOptions.showScaleLabel": "显示比例",
+    "kbnVislibVisTypes.controls.gaugeOptions.subTextLabel": "子标签",
+    "kbnVislibVisTypes.controls.vislibBasicOptions.legendPositionLabel": "图例位置",
+    "kbnVislibVisTypes.controls.vislibBasicOptions.showTooltipLabel": "显示工具提示",
+    "kbnVislibVisTypes.editors.pie.labelsSettingsTitle": "标签设置",
+    "kbnVislibVisTypes.editors.pie.pieSettingsTitle": "饼图设置",
+    "kbnVislibVisTypes.editors.pie.showLabelsLabel": "显示标签",
+    "kbnVislibVisTypes.editors.pie.showTopLevelOnlyLabel": "仅显示顶级",
+    "kbnVislibVisTypes.editors.pie.showValuesLabel": "显示值",
+    "kbnVislibVisTypes.area.countText": "计数",
+    "kbnVislibVisTypes.area.tabs.metricsAxesTitle": "指标和轴",
+    "kbnVislibVisTypes.area.tabs.panelSettingsTitle": "面板设置",
+    "kbnVislibVisTypes.axisModes.normalText": "正常",
+    "kbnVislibVisTypes.axisModes.percentageText": "百分比",
+    "kbnVislibVisTypes.axisModes.silhouetteText": "剪影",
+    "kbnVislibVisTypes.axisModes.wiggleText": "扭动",
+    "kbnVislibVisTypes.categoryAxis.rotate.angledText": "带角度",
+    "kbnVislibVisTypes.categoryAxis.rotate.horizontalText": "水平",
+    "kbnVislibVisTypes.categoryAxis.rotate.verticalText": "垂直",
+    "kbnVislibVisTypes.chartModes.normalText": "正常",
+    "kbnVislibVisTypes.chartModes.stackedText": "堆叠",
+    "kbnVislibVisTypes.chartTypes.areaText": "面积图",
+    "kbnVislibVisTypes.chartTypes.barText": "条形图",
+    "kbnVislibVisTypes.chartTypes.lineText": "折线图",
+    "kbnVislibVisTypes.controls.colorRanges.errorText": "每个范围应大于前一范围。",
+    "kbnVislibVisTypes.controls.colorSchema.colorSchemaLabel": "颜色模式",
+    "kbnVislibVisTypes.controls.colorSchema.howToChangeColorsDescription": "可以更改图例中的各个颜色。",
+    "kbnVislibVisTypes.controls.colorSchema.resetColorsButtonLabel": "重置颜色",
+    "kbnVislibVisTypes.controls.colorSchema.reverseColorSchemaLabel": "反转模式",
+    "kbnVislibVisTypes.controls.heatmapOptions.labelsTitle": "标签",
+    "kbnVislibVisTypes.controls.heatmapOptions.useCustomRangesLabel": "使用定制范围",
+    "kbnVislibVisTypes.controls.pointSeries.categoryAxis.alignLabel": "对齐",
+    "kbnVislibVisTypes.controls.pointSeries.series.showDotsLabel": "显示点线",
+    "kbnVislibVisTypes.controls.pointSeries.seriesAccordionAriaLabel": "切换 {agg} 选项",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.addButtonTooltip": "添加 Y 轴",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.customExtentsLabel": "定制范围",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.minErrorMessage": "最小值应小于最大值。",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.removeButtonTooltip": "移除 Y 轴",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.toggleCustomExtendsAriaLabel": "切换定制范围",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.toggleOptionsAriaLabel": "切换 {axisName} 选项",
+    "kbnVislibVisTypes.editors.heatmap.highlightLabelTooltip": "高亮显示图表中鼠标悬停的范围以及图例中对应的标签。",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.colorLabel": "线条颜色",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.showLabel": "显示阈值线条",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLine.styleLabel": "线条样式",
+    "kbnVislibVisTypes.editors.pointSeries.thresholdLineSettingsTitle": "阈值线条",
+    "kbnVislibVisTypes.interpolationModes.smoothedText": "平滑",
+    "kbnVislibVisTypes.interpolationModes.steppedText": "渐变",
+    "kbnVislibVisTypes.interpolationModes.straightText": "直线",
+    "kbnVislibVisTypes.scaleTypes.linearText": "线性",
+    "kbnVislibVisTypes.scaleTypes.logText": "对数",
+    "kbnVislibVisTypes.scaleTypes.squareRootText": "平方根",
+    "kbnVislibVisTypes.thresholdLine.style.dashedText": "虚线",
+    "kbnVislibVisTypes.thresholdLine.style.dotdashedText": "点虚线",
+    "kbnVislibVisTypes.thresholdLine.style.fullText": "实线",
+    "kbnVislibVisTypes.controls.heatmapOptions.colorScaleLabel": "色阶",
+    "kbnVislibVisTypes.controls.heatmapOptions.percentageModeLabel": "百分比模式",
+    "kbnVislibVisTypes.controls.heatmapOptions.scaleToDataBoundsLabel": "缩放到数据边界",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBounds.boundsMargin": "边界边距",
+    "kbnVislibVisTypes.controls.pointSeries.valueAxes.scaleToDataBounds.minNeededBoundsMargin": "边界边距必须大于或等于 0。",
+    "kbnVislibVisTypes.editors.heatmap.basicSettingsTitle": "基本设置",
+    "kbnVislibVisTypes.editors.heatmap.heatmapSettingsTitle": "热图设置",
+    "kbnVislibVisTypes.editors.heatmap.highlightLabel": "高亮范围",
+    "visTypeMetric.colorModes.backgroundOptionLabel": "背景",
+    "visTypeMetric.colorModes.labelsOptionLabel": "标签",
+    "visTypeMetric.colorModes.noneOptionLabel": "无",
+    "visTypeMetric.function.help": "指标可视化",
+    "visTypeMetric.metricDescription": "将计算结果显示为单个数字",
+    "visTypeMetric.metricTitle": "指标",
+    "visTypeMetric.params.rangesTitle": "范围",
+    "visTypeMetric.params.style.styleTitle": "样式",
+    "visTypeMetric.schemas.metricTitle": "指标",
+    "visTypeMetric.schemas.splitGroupTitle": "拆分组",
+    "visTypeMetric.function.bgFill.help": "将颜色表示为 html 十六进制代码 (#123456)、html 颜色（red、blue）或 rgba 值 (rgba(255,255,255,1))。",
+    "visTypeMetric.function.bucket.help": "存储桶维度配置",
+    "visTypeMetric.function.colorMode.help": "指标的哪部分要上色",
+    "visTypeMetric.function.colorRange.help": "指定应将不同颜色应用到的值组的范围对象。",
+    "visTypeMetric.function.colorScheme.help": "要使用的颜色方案",
+    "visTypeMetric.function.font.help": "字体设置。",
+    "visTypeMetric.function.invertColors.help": "反转颜色范围",
+    "visTypeMetric.function.metric.help": "指标维度配置",
+    "visTypeMetric.function.percentage.help": "以百分比模式显示指标。需要设置 colorRange。",
+    "visTypeMetric.function.showLabels.help": "在指标值下显示标签。",
+    "visTypeMetric.function.subText.help": "要在指标下显示的定制文本",
+    "visTypeMetric.function.useRanges.help": "已启用颜色范围。",
+    "visTypeMetric.params.settingsTitle": "设置",
+    "visTypeMetric.params.showTitleLabel": "显示标题",
+    "visTypeMetric.params.color.useForLabel": "将颜色用于",
+    "visTypeMetric.params.percentageModeLabel": "百分比模式",
+    "visTypeMetric.params.style.fontSizeLabel": "指标字体大小（磅）",
+    "regionMap.choroplethLayer.downloadingVectorData404ErrorMessage": "尝试提取 {name} 时，服务器响应状态为“404”。请确保目标文件位于该位置。",
+    "regionMap.choroplethLayer.downloadingVectorDataErrorMessage": "无法下载 {name} 文件。请确保服务器的 CORS 配置允许来自此主机上的 Kibana 应用程序的请求。",
+    "regionMap.choroplethLayer.downloadingVectorDataErrorMessageTitle": "下载矢量数据时出错",
+    "regionMap.choroplethLayer.unrecognizedFormatErrorMessage": "格式 {formatType} 无法识别",
+    "regionMap.function.help": "地区地图可视化",
+    "regionMap.mapVis.regionMapDescription": "在专题地图上显示指标。使用其中提供的基本地图，或添加自己的地图。颜色越深表示值越大。",
+    "regionMap.mapVis.regionMapEditorConfig.schemas.metricTitle": "值",
+    "regionMap.mapVis.regionMapEditorConfig.schemas.segmentTitle": "形状字段",
+    "regionMap.mapVis.regionMapTitle": "区域地图",
+    "regionMap.visParams.displayWarningsLabel": "显示警告",
+    "regionMap.visParams.joinFieldLabel": "联接字段",
+    "regionMap.visParams.previewOnEMSLinkText": "在 EMS 上预览",
+    "regionMap.visParams.previewOnEMSLinkTitle": "在 Elastic 地图服务上预览“{selectedLayerName}”",
+    "regionMap.visParams.showAllShapesLabel": "显示所有形状",
+    "regionMap.visParams.styleSettingsLabel": "样式设置",
+    "regionMap.visParams.switchWarningsTipText": "打开/关闭警告。打开状态下，将根据联接字段值对与矢量图层中形状不匹配的每个字词显示警告。关闭状态下，将不显示这些警告。",
+    "regionMap.visParams.turnOffShowingAllShapesTipText": "关闭此设置时，将仅显示与相应字词匹配的形状。",
+    "regionMap.visParams.vectorMapLabel": "矢量地图",
+    "regionMap.visualization.unableToShowMismatchesWarningText": "确保每个字词与该形状的联接字段匹配：{mismatches}",
+    "regionMap.visualization.unableToShowMismatchesWarningTitle": "无法在地图上显示 {mismatchesLength} {oneMismatch, plural, one { 个结果} other { 个结果}}",
+    "regionMap.visParams.colorSchemaLabel": "颜色模式",
+    "regionMap.visParams.layerSettingsTitle": "图层设置",
+    "regionMap.visParams.outlineWeightLabel": "边框粗细",
+    "home.sampleData.ecommerceSpec.averageSalesPerRegionTitle": "[电子商务] 每地区平均销售额",
+    "home.sampleData.ecommerceSpec.averageSalesPriceTitle": "[电子商务] 平均销售价格",
+    "home.sampleData.ecommerceSpec.averageSoldQuantityTitle": "[电子商务] 平均销售数量",
+    "home.sampleData.ecommerceSpec.controlsTitle": "[电子商务] 控件",
+    "home.sampleData.ecommerceSpec.markdownTitle": "[电子商务] Markdown",
+    "home.sampleData.ecommerceSpec.ordersTitle": "[电子商务] 订单",
+    "home.sampleData.ecommerceSpec.promotionTrackingTitle": "[电子商务] 促销追踪",
+    "home.sampleData.ecommerceSpec.revenueDashboardDescription": "分析模拟的电子商务订单和收入",
+    "home.sampleData.ecommerceSpec.revenueDashboardTitle": "[电子商务] 收入仪表板",
+    "home.sampleData.ecommerceSpec.salesByCategoryTitle": "[电子商务] 按类别划分的销售额",
+    "home.sampleData.ecommerceSpec.salesByGenderTitle": "[电子商务] 按性别划分的销售额",
+    "home.sampleData.ecommerceSpec.soldProductsPerDayTitle": "[电子商务] 每天已售产品",
+    "home.sampleData.ecommerceSpec.topSellingProductsTitle": "[电子商务] 热卖产品",
+    "home.sampleData.ecommerceSpec.totalRevenueTitle": "[电子商务] 总收入",
+    "home.sampleData.ecommerceSpecDescription": "用于追踪电子商务订单的样例数据、可视化和仪表板。",
+    "home.sampleData.ecommerceSpecTitle": "样例电子商务订单",
+    "home.sampleData.flightsSpec.airlineCarrierTitle": "[航班] 航空公司",
+    "home.sampleData.flightsSpec.airportConnectionsTitle": "[航班] 机场航线（将鼠标悬停在机场上）",
+    "home.sampleData.flightsSpec.averageTicketPriceTitle": "[航班] 平均票价",
+    "home.sampleData.flightsSpec.controlsTitle": "[航班] 控件",
+    "home.sampleData.flightsSpec.delayBucketsTitle": "[航班] 延误存储桶",
+    "home.sampleData.flightsSpec.delaysAndCancellationsTitle": "[航班] 延误与取消",
+    "home.sampleData.flightsSpec.delayTypeTitle": "[航班] 延误类型",
+    "home.sampleData.flightsSpec.destinationWeatherTitle": "[航班] 到达地天气",
+    "home.sampleData.flightsSpec.flightCancellationsTitle": "[航班] 航班取消",
+    "home.sampleData.flightsSpec.flightCountAndAverageTicketPriceTitle": "[航班] 航班计数和平均票价",
+    "home.sampleData.flightsSpec.flightDelaysTitle": "[航班] 航班延误",
+    "home.sampleData.flightsSpec.flightLogTitle": "[航班] 飞行日志",
+    "home.sampleData.flightsSpec.globalFlightDashboardDescription": "分析 ES-Air、Logstash Airways、Kibana Airlines 和 JetBeats 的模拟航班数据",
+    "home.sampleData.flightsSpec.globalFlightDashboardTitle": "[航班] 全球航班仪表板",
+    "home.sampleData.flightsSpec.markdownInstructionsTitle": "[航班] Markdown 说明",
+    "home.sampleData.flightsSpec.originCountryTicketPricesTitle": "[航班] 始发国/地区票价",
+    "home.sampleData.flightsSpec.originCountryTitle": "[航班] 始发国/地区与到达国/地区",
+    "home.sampleData.flightsSpec.totalFlightCancellationsTitle": "[航班] 航班取消总数",
+    "home.sampleData.flightsSpec.totalFlightDelaysTitle": "[航班] 航班延误总数",
+    "home.sampleData.flightsSpec.totalFlightsTitle": "[航班] 航班总数",
+    "home.sampleData.flightsSpecDescription": "用于监测航班路线的样例数据、可视化和仪表板。",
+    "home.sampleData.flightsSpecTitle": "样例航班数据",
+    "home.sampleData.logsSpec.fileTypeScatterPlotTitle": "[日志] 文件类型散点图",
+    "home.sampleData.logsSpec.goalsTitle": "[日志] 目标",
+    "home.sampleData.logsSpec.heatmapTitle": "[日志] 热图",
+    "home.sampleData.logsSpec.hostVisitsBytesTableTitle": "[日志] 主机、访问和字节表",
+    "home.sampleData.logsSpec.inputControlsTitle": "[日志] 输入控件",
+    "home.sampleData.logsSpec.markdownInstructionsTitle": "[日志] Markdown 说明",
+    "home.sampleData.logsSpec.responseCodesOverTimeTitle": "[日志] 时移响应代码 + 注释",
+    "home.sampleData.logsSpec.sourceAndDestinationSankeyChartTitle": "[日志] 始发地和到达地 Sankey 图",
+    "home.sampleData.logsSpec.uniqueVisitorsByCountryTitle": "[日志] 按国家/地区划分的独立访客",
+    "home.sampleData.logsSpec.uniqueVisitorsTitle": "[日志] 独立访客与平均字节数",
+    "home.sampleData.logsSpec.visitorOSTitle": "[日志] 按 OS 划分的访客",
+    "home.sampleData.logsSpec.webTrafficDescription": "分析 Elastic 网站的模拟网络流量日志数据",
+    "home.sampleData.logsSpec.webTrafficTitle": "[日志] 网络流量",
+    "home.sampleData.logsSpecDescription": "用于监测 Web 日志的样例数据、可视化和仪表板。",
+    "home.sampleData.logsSpecTitle": "样例 Web 日志",
+    "server.stats.notReadyMessage": "统计尚未就绪。请稍后重试",
+    "server.status.disabledTitle": "已禁用",
+    "server.status.greenTitle": "绿",
+    "server.status.redTitle": "红",
+    "server.status.uninitializedTitle": "未初始化",
+    "server.status.yellowTitle": "黄",
+    "share.contextMenu.embedCodeLabel": "嵌入代码",
+    "share.contextMenu.embedCodePanelTitle": "嵌入代码",
+    "share.contextMenu.permalinkPanelTitle": "固定链接",
+    "share.contextMenu.permalinksLabel": "固定链接",
+    "share.contextMenuTitle": "共享此 {objectType}",
+    "share.urlPanel.canNotShareAsSavedObjectHelpText": "只有保存 {objectType} 后，才能共享为已保存对象。",
+    "share.urlPanel.copyIframeCodeButtonLabel": "复制 iFrame 代码",
+    "share.urlPanel.copyLinkButtonLabel": "复制链接",
+    "share.urlPanel.generateLinkAsLabel": "将链接生成为",
+    "share.urlPanel.savedObjectDescription": "您可以将此 URL 共享给相关人员，以便他们可以加载此 {objectType} 最新的已保存版本。",
+    "share.urlPanel.savedObjectLabel": "已保存对象",
+    "share.urlPanel.shortUrlHelpText": "建议共享缩短的快照 URL，以实现最大的兼容性。Internet Explorer 有 URL 长度限制，某些 wiki 和标记分析器无法很好地处理全长版本的快照 URL，但应能很好地处理短 URL。",
+    "share.urlPanel.shortUrlLabel": "短 URL",
+    "share.urlPanel.snapshotDescription": "快照 URL 将{objectType}的当前状态编入 URL 自身之中。通过此 URL，将无法看到对已保存的{objectType}的编辑。",
+    "share.urlPanel.snapshotLabel": "快照",
+    "share.urlPanel.unableCreateShortUrlErrorMessage": "无法创建短 URL。错误：{errorMessage}",
+    "statusPage.loadStatus.serverIsDownErrorMessage": "无法请求服务器状态。也许您的服务器已关闭？",
+    "statusPage.loadStatus.serverStatusCodeErrorMessage": "无法使用状态代码 {responseStatus} 请求服务器状态",
+    "statusPage.metricsTiles.columns.heapTotalHeader": "堆总计",
+    "statusPage.metricsTiles.columns.heapUsedHeader": "已使用堆",
+    "statusPage.metricsTiles.columns.loadHeader": "负载",
+    "statusPage.metricsTiles.columns.requestsPerSecHeader": "每秒请求数",
+    "statusPage.metricsTiles.columns.resTimeAvgHeader": "响应时间平均值",
+    "statusPage.metricsTiles.columns.resTimeMaxHeader": "响应时间最大值",
+    "statusPage.serverStatus.statusTitle": "Kibana 状态为“{kibanaStatus}”",
+    "statusPage.statusApp.loadingErrorText": "加载状态时出错",
+    "statusPage.statusApp.statusActions.buildText": "BUILD {buildNum}",
+    "statusPage.statusApp.statusActions.commitText": "COMMIT {buildSha}",
+    "statusPage.statusApp.statusTitle": "插件状态",
+    "statusPage.statusTable.columns.idHeader": "ID",
+    "statusPage.statusTable.columns.statusHeader": "状态",
+    "visTypeTable.aggTable.exportLabel": "导出：",
+    "visTypeTable.aggTable.formattedLabel": "格式化",
+    "visTypeTable.aggTable.rawLabel": "原始",
+    "visTypeTable.directives.tableCellFilter.filterForValueTooltip": "筛留值",
+    "visTypeTable.directives.tableCellFilter.filterOutValueTooltip": "筛除值",
+    "visTypeTable.function.help": "表可视化",
+    "visTypeTable.params.showMetricsLabel": "显示每个桶/级别的指标",
+    "visTypeTable.params.showPartialRowsLabel": "显示部分行",
+    "visTypeTable.params.showPartialRowsTip": "显示具有部分数据的行。这仍将计算每个桶/级别的指标，即使它们未显示。",
+    "visTypeTable.params.showTotalLabel": "显示汇总",
+    "visTypeTable.params.totalFunctionLabel": "汇总函数",
+    "visTypeTable.tableVisDescription": "在表中显示值",
+    "visTypeTable.tableVisEditorConfig.schemas.bucketTitle": "拆分行",
+    "visTypeTable.tableVisEditorConfig.schemas.metricTitle": "指标",
+    "visTypeTable.tableVisEditorConfig.schemas.splitTitle": "拆分表",
+    "visTypeTable.tableVisTitle": "数据表",
+    "visTypeTable.vis.noResultsFoundTitle": "找不到结果",
+    "visTypeTable.params.PercentageColLabel": "百分比列",
+    "visTypeTable.params.percentageTableColumnName": "{title} 百分比",
+    "visTypeTable.params.defaultPercentageCol": "不显示",
+    "visTypeTable.totalAggregations.averageText": "平均值",
+    "visTypeTable.totalAggregations.countText": "计数",
+    "visTypeTable.totalAggregations.maxText": "最大值",
+    "visTypeTable.totalAggregations.minText": "最小值",
+    "visTypeTable.totalAggregations.sumText": "和",
+    "visTypeTable.params.perPageLabel": "每页行数",
+    "visTypeTagCloud.feedbackMessage.tooSmallContainerDescription": "容器太小，无法显示整个云。标记可能被裁剪或省略。",
+    "visTypeTagCloud.feedbackMessage.truncatedTagsDescription": "标记数量已截断，以避免绘制时间过长。",
+    "visTypeTagCloud.function.bucket.help": "存储桶维度配置",
+    "visTypeTagCloud.function.help": "标签云图可视化",
+    "visTypeTagCloud.function.metric.help": "指标维度配置",
+    "visTypeTagCloud.function.orientation.help": "标签云图内的字方向",
+    "visTypeTagCloud.function.scale.help": "缩放以确定字体大小",
+    "visTypeTagCloud.vis.schemas.metricTitle": "标记大小",
+    "visTypeTagCloud.vis.schemas.segmentTitle": "标记",
+    "visTypeTagCloud.vis.tagCloudDescription": "一组字词，可根据其重要性调整大小",
+    "visTypeTagCloud.vis.tagCloudTitle": "标签云图",
+    "visTypeTagCloud.visParams.orientationsLabel": "方向",
+    "visTypeTagCloud.vis.editorConfig.orientations.multipleText": "多个",
+    "visTypeTagCloud.vis.editorConfig.orientations.rightAngledText": "直角",
+    "visTypeTagCloud.vis.editorConfig.orientations.singleText": "单个",
+    "visTypeTagCloud.vis.editorConfig.scales.linearText": "线性",
+    "visTypeTagCloud.vis.editorConfig.scales.logText": "对数",
+    "visTypeTagCloud.vis.editorConfig.scales.squareRootText": "平方根",
+    "visTypeTagCloud.visParams.fontSizeLabel": "字体大小范围（像素）",
+    "visTypeTagCloud.visParams.showLabelToggleLabel": "显示标签",
+    "visTypeTagCloud.visParams.textScaleLabel": "文本比例",
+    "tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage": "子函数应实现此方法以响应数据更新",
+    "tileMap.function.help": "磁贴地图可视化",
+    "tileMap.geohashLayer.mapTitle": "{mapType} 地图类型无法识别",
+    "tileMap.tooltipFormatter.latitudeLabel": "纬度",
+    "tileMap.tooltipFormatter.longitudeLabel": "经度",
+    "tileMap.vis.map.editorConfig.schemas.geoCoordinatesTitle": "地理坐标",
+    "tileMap.vis.map.editorConfig.schemas.metricTitle": "值",
+    "tileMap.vis.mapDescription": "在地图上绘制纬度和经度坐标",
+    "tileMap.vis.mapTitle": "坐标地图",
+    "tileMap.visParams.clusterSizeLabel": "集群大小",
+    "tileMap.visParams.desaturateTilesLabel": "降低平铺地图饱和度",
+    "tileMap.visParams.mapTypeLabel": "地图类型",
+    "tileMap.visParams.reduceVibrancyOfTileColorsTip": "降低平铺地图颜色的亮度。此设置在任何版本的 IE 浏览器中均不起作用。",
+    "tileMap.wmsOptions.attributionStringTip": "右下角的属性字符串。",
+    "tileMap.wmsOptions.baseLayerSettingsTitle": "基础图层设置",
+    "tileMap.wmsOptions.imageFormatToUseTip": "通常为 image/png 或 image/jpeg。如果服务器返回透明图层，则使用 png。",
+    "tileMap.wmsOptions.layersLabel": "图层",
+    "tileMap.wmsOptions.listOfLayersToUseTip": "要使用的图层逗号分隔列表。",
+    "tileMap.wmsOptions.urlOfWMSWebServiceTip": "WMS Web 服务的 URL。",
+    "tileMap.wmsOptions.useWMSCompliantMapTileServerTip": "使用符合 WMS 规范的平铺地图服务器。仅适用于高级用户。",
+    "tileMap.wmsOptions.versionOfWMSserverSupportsTip": "服务器支持的 WMS 版本。",
+    "tileMap.wmsOptions.wmsAttributionLabel": "WMS 属性",
+    "tileMap.wmsOptions.wmsMapServerLabel": "WMS 地图服务器",
+    "tileMap.wmsOptions.wmsServerSupportedStylesListTip": "要使用的以逗号分隔的 WMS 服务器支持的样式列表。在大部分情况下为空。",
+    "tileMap.vis.editorConfig.legendPositions.bottomLeftText": "左下方",
+    "tileMap.vis.editorConfig.legendPositions.bottomRightText": "右下方",
+    "tileMap.vis.editorConfig.legendPositions.topLeftText": "左上方",
+    "tileMap.vis.editorConfig.legendPositions.topRightText": "右上方",
+    "tileMap.vis.editorConfig.mapTypes.heatmapText": "热图",
+    "tileMap.vis.editorConfig.mapTypes.scaledCircleMarkersText": "缩放式圆形标记",
+    "tileMap.vis.editorConfig.mapTypes.shadedCircleMarkersText": "带阴影圆形标记",
+    "tileMap.vis.editorConfig.mapTypes.shadedGeohashGridText": "带阴影 geohash 网格",
+    "tileMap.visParams.colorSchemaLabel": "颜色模式",
+    "tileMap.wmsOptions.mapLoadFailDescription": "如果此参数不正确，将无法加载地图。",
+    "tileMap.wmsOptions.wmsDescription": "WMS 是用于地图图像服务的 {wmsLink}。",
+    "tileMap.wmsOptions.wmsFormatLabel": "WMS 格式",
+    "tileMap.wmsOptions.wmsLayersLabel": "WMS 图层",
+    "tileMap.wmsOptions.wmsLinkText": "OGC 标准",
+    "tileMap.wmsOptions.wmsStylesLabel": "WMS 样式",
+    "tileMap.wmsOptions.wmsUrlLabel": "WMS url",
+    "tileMap.wmsOptions.wmsVersionLabel": "WMS 版本",
     "visTypeVega.editor.formatError": "格式化规范时出错",
     "visTypeVega.editor.reformatAsHJSONButtonLabel": "重新格式化为 HJSON",
     "visTypeVega.editor.reformatAsJSONButtonLabel": "重新格式化为 JSON，删除注释",
@@ -3554,7 +3547,6 @@
     "xpack.apm.fetcher.error.status": "错误",
     "xpack.apm.fetcher.error.title": "提取资源时出错",
     "xpack.apm.fetcher.error.url": "URL",
-    "xpack.apm.loading.prompt": "正在加载……",
     "xpack.apm.localFilters.titles.agentName": "代理名称",
     "xpack.apm.localFilters.titles.containerId": "容器 ID",
     "xpack.apm.localFilters.titles.host": "主机",
@@ -5841,7 +5833,6 @@
     "xpack.infra.homePage.noMetricsIndicesInstructionsActionLabel": "查看设置说明",
     "xpack.infra.homePage.noMetricsIndicesTitle": "似乎您没有任何指标索引。",
     "xpack.infra.homePage.toolbar.kqlSearchFieldPlaceholder": "搜索基础设施数据……（例如 host.name:host-1）",
-    "xpack.infra.homePage.toolbar.showingLastOneMinuteDataText": "在选定时间显示过去 1 分钟的数据",
     "xpack.infra.infrastructureDescription": "浏览您的基础设施",
     "xpack.infra.infrastructureMetricsExplorerPage.documentTitle": "{previousTitle} | 指标浏览器",
     "xpack.infra.infrastructureSnapshotPage.documentTitle": "{previousTitle} | 库存",
@@ -6081,13 +6072,9 @@
     "xpack.infra.logs.analysis.logRateSectionNoDataTitle": "没有可显示的数据。",
     "xpack.infra.logs.analysis.logRateSectionTitle": "日志速率",
     "xpack.infra.logs.analysisPage.loadingMessage": "正在检查分析作业的状态......",
-    "xpack.infra.logs.analysisPage.unavailable.mlAppButton": "打开 Machine Learning",
     "xpack.infra.logs.analysisPage.unavailable.mlAppLink": "Machine Learning 应用",
-    "xpack.infra.logs.analysisPage.unavailable.mlDisabledBody": "查看 {machineLearningAppLink}以了解更多信息。",
-    "xpack.infra.logs.analysisPage.unavailable.mLDisabledTitle": "分析功能需要 Machine Learning",
     "xpack.infra.logs.highlights.goToNextHighlightButtonLabel": "跳转到下一高亮条目",
     "xpack.infra.logs.highlights.goToPreviousHighlightButtonLabel": "跳转到上一高亮条目",
-    "xpack.infra.logs.index.analysisBetaBadgeTitle": "分析",
     "xpack.infra.logs.index.settingsTabTitle": "设置",
     "xpack.infra.logs.index.streamTabTitle": "流式传输",
     "xpack.infra.logs.logsAnalysisResults.onboardingSuccessContent": "请注意，我们的 Machine Learning 机器人若干分钟后才会开始收集数据。",
@@ -6178,8 +6165,6 @@
     "xpack.infra.logs.analysis.overallAnomalyChartMaxScoresLabel": "最大异常分数：",
     "xpack.infra.logs.analysis.partitionMaxAnomalyScoreAnnotationLabel": "最大异常分数：{maxAnomalyScore}",
     "xpack.infra.logs.analysis.recreateJobButtonLabel": "重新创建 ML 作业",
-    "xpack.infra.logs.analysisPage.setupStatusUnknown.title": "我们无法确定您的 ML 作业的状态。",
-    "xpack.infra.logs.analysisPage.setupStatusUnknown.tryAgainButton": "请重试",
     "xpack.infra.logs.jumpToTailText": "跳到最近的条目",
     "xpack.infra.metricsExplorer.chartOptions.barLabel": "条形图",
     "xpack.infra.nodeDetails.labels.availabilityZone": "可用区",
@@ -6605,8 +6590,6 @@
     "xpack.maps.source.wmsTitle": "Web 地图服务",
     "xpack.maps.style.heatmap.displayNameLabel": "热图样式",
     "xpack.maps.style.heatmap.resolutionStyleErrorMessage": "无法识别分辨率参数：{resolution}",
-    "xpack.maps.styles.staticDynamic.dynamicDescription": "使用属性值代表功能。",
-    "xpack.maps.styles.staticDynamic.staticDescription": "使用静态样式属性代表功能。",
     "xpack.maps.styles.vector.borderColorLabel": "边框颜色",
     "xpack.maps.styles.vector.borderWidthLabel": "边框宽度",
     "xpack.maps.styles.vector.fillColorLabel": "填充颜色",
@@ -10926,7 +10909,6 @@
     "xpack.siem.eventsOverTime.showing": "显示",
     "xpack.siem.eventsOverTime.unit": "{totalCount, plural, =1 {event} other {events}}",
     "xpack.siem.flyout.button.text": "时间线",
-    "xpack.siem.footer.loadingEventsData": "正在加载事件",
     "xpack.siem.network.navigation.anomaliesTitle": "异常",
     "xpack.siem.network.navigation.dnsTitle": "DNS",
     "xpack.siem.network.navigation.flowsTitle": "Flows",
@@ -11882,11 +11864,9 @@
     "xpack.uptime.monitorList.monitoringStatusTitle": "检测状态",
     "xpack.uptime.monitorList.observabilityIntegrationsColumn.apmIntegrationLink.tooltip": "点击此处以在 APM 中查找“{domain}”。",
     "xpack.uptime.monitorList.observabilityIntegrationsColumn.popoverIconButton.ariaLabel": "打开 url {monitorUrl} 的监测的集成弹出式窗口",
-    "xpack.uptime.monitorList.observabilityIntegrationsColumnLabel": "集成",
     "xpack.uptime.monitorList.statusColumn.downLabel": "关闭",
     "xpack.uptime.monitorList.statusColumn.upLabel": "运行",
     "xpack.uptime.monitorList.statusColumnLabel": "状态",
-    "xpack.uptime.monitorList.urlColumnLabel": "URL",
     "xpack.uptime.monitorStatusBar.durationTextAriaLabel": "监测持续时间（毫秒）",
     "xpack.uptime.monitorStatusBar.healthStatus.durationInMillisecondsMessage": "{duration}ms",
     "xpack.uptime.monitorStatusBar.healthStatusMessage.downLabel": "关闭",
@@ -12811,4 +12791,4 @@
     "xpack.licensing.welcomeBanner.licenseIsExpiredDescription.updateYourLicenseLinkText": "更新您的许可",
     "xpack.licensing.welcomeBanner.licenseIsExpiredTitle": "您的{licenseType}许可已过期"
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index f3e9db0053ad6..2b92e70fb30af 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -36,4 +36,6 @@ require('@kbn/test').runTestsCli([
   require.resolve('../test/ui_capabilities/spaces_only/config'),
   require.resolve('../test/upgrade_assistant_integration/config'),
   require.resolve('../test/licensing_plugin/config'),
+  require.resolve('../test/licensing_plugin/config.public'),
+  require.resolve('../test/licensing_plugin/config.legacy'),
 ]);
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 1bfc50e4c83db..8356954073ec9 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -16,6 +16,21 @@ interface CreateTestConfigOptions {
   ssl?: boolean;
 }
 
+// test.not-enabled is specifically not enabled
+const enabledActionTypes = [
+  '.server-log',
+  '.slack',
+  '.email',
+  '.index',
+  '.pagerduty',
+  '.webhook',
+  'test.noop',
+  'test.index-record',
+  'test.failing',
+  'test.rate-limit',
+  'test.authorization',
+];
+
 // eslint-disable-next-line import/no-default-export
 export function createTestConfig(name: string, options: CreateTestConfigOptions) {
   const { license = 'trial', disabledPlugins = [], ssl = false } = options;
@@ -53,15 +68,17 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         ...xPackApiIntegrationTestsConfig.get('kbnTestServer'),
         serverArgs: [
           ...xPackApiIntegrationTestsConfig.get('kbnTestServer.serverArgs'),
-          '--xpack.actions.enabled=true',
           `--xpack.actions.whitelistedHosts=${JSON.stringify([
             'localhost',
             'some.non.existent.com',
           ])}`,
+          `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
           '--xpack.alerting.enabled=true',
           ...disabledPlugins.map(key => `--xpack.${key}.enabled=false`),
           `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'alerts')}`,
           `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'actions')}`,
+          `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'task_manager')}`,
+          `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'aad')}`,
           `--server.xsrf.whitelist=${JSON.stringify(getAllExternalServiceSimulatorPaths())}`,
           ...(ssl
             ? [
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/index.ts
new file mode 100644
index 0000000000000..d7bee93f5c94b
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/index.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Joi from 'joi';
+import Hapi from 'hapi';
+import { Legacy } from 'kibana';
+import KbnServer from '../../../../../../../src/legacy/server/kbn_server';
+import { PluginStartContract } from '../../../../../../plugins/encrypted_saved_objects/server';
+
+interface CheckAADRequest extends Hapi.Request {
+  payload: {
+    spaceId?: string;
+    type: string;
+    id: string;
+  };
+}
+
+// eslint-disable-next-line import/no-default-export
+export default function(kibana: any) {
+  return new kibana.Plugin({
+    require: ['actions', 'alerting', 'encryptedSavedObjects'],
+    name: 'aad-fixtures',
+    init(server: Legacy.Server) {
+      const newPlatform = ((server as unknown) as KbnServer).newPlatform;
+      const esoPlugin = newPlatform.start.plugins.encryptedSavedObjects as PluginStartContract;
+
+      server.route({
+        method: 'POST',
+        path: '/api/check_aad',
+        options: {
+          validate: {
+            payload: Joi.object()
+              .keys({
+                spaceId: Joi.string().optional(),
+                type: Joi.string().required(),
+                id: Joi.string().required(),
+              })
+              .required(),
+          },
+        },
+        async handler(request: CheckAADRequest) {
+          let namespace: string | undefined;
+          const spacesPlugin = server.plugins.spaces;
+          if (spacesPlugin && request.payload.spaceId) {
+            namespace = spacesPlugin.spaceIdToNamespace(request.payload.spaceId);
+          }
+          await esoPlugin.getDecryptedAsInternalUser(request.payload.type, request.payload.id, {
+            namespace,
+          });
+          return { success: true };
+        },
+      });
+    },
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/package.json b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/package.json
new file mode 100644
index 0000000000000..f5d174c18a209
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "aad-fixtures",
+  "version": "0.0.0",
+  "kibana": {
+    "version": "kibana"
+  }
+}
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts
index 73279cd0c2ff0..a5a9353d83cbc 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import Hapi from 'hapi';
+import { ActionType } from '../../../../../../legacy/plugins/actions';
+
 import { initPlugin as initSlack } from './slack_simulation';
 import { initPlugin as initWebhook } from './webhook_simulation';
 import { initPlugin as initPagerduty } from './pagerduty_simulation';
@@ -32,6 +34,15 @@ export default function(kibana: any) {
     require: ['actions'],
     name: NAME,
     init: (server: Hapi.Server) => {
+      // this action is specifically NOT enabled in ../../config.ts
+      const notEnabledActionType: ActionType = {
+        id: 'test.not-enabled',
+        name: 'Test: Not Enabled',
+        async executor() {
+          return { status: 'ok', actionId: '' };
+        },
+      };
+      server.plugins.actions!.setup.registerType(notEnabledActionType);
       server.plugins.xpack_main.registerFeature({
         id: 'actions',
         name: 'Actions',
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager/index.ts
new file mode 100644
index 0000000000000..3bfad59b71166
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager/index.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+const taskManagerQuery = (...filters: any[]) => ({
+  bool: {
+    filter: {
+      bool: {
+        must: filters,
+      },
+    },
+  },
+});
+
+const tasksForAlerting = {
+  term: {
+    'task.scope': 'alerting',
+  },
+};
+const taskByIdQuery = (id: string) => ({
+  ids: {
+    values: [`task:${id}`],
+  },
+});
+
+// eslint-disable-next-line import/no-default-export
+export default function(kibana: any) {
+  return new kibana.Plugin({
+    name: 'taskManagerHelpers',
+    require: ['elasticsearch', 'task_manager'],
+
+    config(Joi: any) {
+      return Joi.object({
+        enabled: Joi.boolean().default(true),
+      }).default();
+    },
+
+    init(server: any) {
+      const taskManager = server.plugins.task_manager;
+
+      server.route({
+        path: '/api/alerting_tasks/{taskId}',
+        method: 'GET',
+        async handler(request: any) {
+          try {
+            return taskManager.fetch({
+              query: taskManagerQuery(tasksForAlerting, taskByIdQuery(request.params.taskId)),
+            });
+          } catch (err) {
+            return err;
+          }
+        },
+      });
+    },
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager/package.json b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager/package.json
new file mode 100644
index 0000000000000..532b597829561
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "alerting_task_plugin",
+  "version": "1.0.0",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "Apache-2.0",
+  "dependencies": {
+    "joi": "^13.5.2"
+  }
+}
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 57b4b3b6c26c6..c47649544f9a7 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
@@ -17,7 +17,7 @@ export interface AlertUtilsOpts {
   objectRemover?: ObjectRemover;
 }
 
-export interface CreateAlwaysFiringActionOpts {
+export interface CreateAlertWithActionOpts {
   indexRecordActionId?: string;
   objectRemover?: ObjectRemover;
   overwrites?: Record<string, any>;
@@ -159,7 +159,7 @@ export class AlertUtils {
     overwrites = {},
     indexRecordActionId,
     reference,
-  }: CreateAlwaysFiringActionOpts) {
+  }: CreateAlertWithActionOpts) {
     const objRemover = objectRemover || this.objectRemover;
     const actionId = indexRecordActionId || this.indexRecordActionId;
 
@@ -179,10 +179,11 @@ export class AlertUtils {
     const response = await request.send({
       enabled: true,
       name: 'abc',
-      interval: '1m',
+      schedule: { interval: '1m' },
       throttle: '1m',
       tags: [],
       alertTypeId: 'test.always-firing',
+      consumer: 'bar',
       params: {
         index: ES_TEST_INDEX_NAME,
         reference,
@@ -206,4 +207,47 @@ export class AlertUtils {
     }
     return response;
   }
+
+  public async createAlwaysFailingAction({
+    objectRemover,
+    overwrites = {},
+    indexRecordActionId,
+    reference,
+  }: CreateAlertWithActionOpts) {
+    const objRemover = objectRemover || this.objectRemover;
+    const actionId = indexRecordActionId || this.indexRecordActionId;
+
+    if (!objRemover) {
+      throw new Error('objectRemover is required');
+    }
+    if (!actionId) {
+      throw new Error('indexRecordActionId is required ');
+    }
+
+    let request = this.supertestWithoutAuth
+      .post(`${getUrlPrefix(this.space.id)}/api/alert`)
+      .set('kbn-xsrf', 'foo');
+    if (this.user) {
+      request = request.auth(this.user.username, this.user.password);
+    }
+    const response = await request.send({
+      enabled: true,
+      name: 'fail',
+      schedule: { interval: '30s' },
+      throttle: '30s',
+      tags: [],
+      alertTypeId: 'test.failing',
+      consumer: 'bar',
+      params: {
+        index: ES_TEST_INDEX_NAME,
+        reference,
+      },
+      actions: [],
+      ...overwrites,
+    });
+    if (response.statusCode === 200) {
+      objRemover.add(this.space.id, response.body.id, 'alert');
+    }
+    return response;
+  }
 }
diff --git a/x-pack/test/alerting_api_integration/common/lib/check_aad.ts b/x-pack/test/alerting_api_integration/common/lib/check_aad.ts
new file mode 100644
index 0000000000000..0a75325aaed59
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/common/lib/check_aad.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.
+ */
+
+interface Opts {
+  supertest: any;
+  spaceId?: string;
+  type: string;
+  id: string;
+}
+
+export async function checkAAD({ supertest, spaceId, type, id }: Opts) {
+  await supertest
+    .post('/api/check_aad')
+    .set('kbn-xsrf', 'foo')
+    .send({ spaceId, type, id })
+    .expect(200, { success: true });
+}
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 ae382652b6234..76f78809d5d11 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
@@ -10,7 +10,8 @@ export function getTestAlertData(overwrites = {}) {
     name: 'abc',
     tags: ['foo'],
     alertTypeId: 'test.noop',
-    interval: '1m',
+    consumer: 'bar',
+    schedule: { interval: '1m' },
     throttle: '1m',
     actions: [],
     params: {},
diff --git a/x-pack/test/alerting_api_integration/common/lib/index.ts b/x-pack/test/alerting_api_integration/common/lib/index.ts
index 31d257e3b25ac..c1e59664f9ce2 100644
--- a/x-pack/test/alerting_api_integration/common/lib/index.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/index.ts
@@ -10,3 +10,5 @@ export { ES_TEST_INDEX_NAME, ESTestIndexTool } from './es_test_index_tool';
 export { getTestAlertData } from './get_test_alert_data';
 export { AlertUtils } from './alert_utils';
 export { TaskManagerUtils } from './task_manager_utils';
+export * from './test_assertions';
+export { checkAAD } from './check_aad';
diff --git a/x-pack/test/alerting_api_integration/common/lib/test_assertions.ts b/x-pack/test/alerting_api_integration/common/lib/test_assertions.ts
new file mode 100644
index 0000000000000..9495dd4cfae82
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/common/lib/test_assertions.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+
+export function ensureDatetimeIsWithinRange(
+  date: number,
+  expectedDiff: number,
+  buffer: number = 10000
+) {
+  const diff = date - Date.now();
+  expect(diff).to.be.greaterThan(expectedDiff - buffer);
+  expect(diff).to.be.lessThan(expectedDiff + buffer);
+}
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
index 54f38d2fd747e..cfc04663c6a4f 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
@@ -39,6 +39,9 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
         .send({
           name: 'A pagerduty action',
           actionTypeId: '.pagerduty',
+          config: {
+            apiUrl: pagerdutySimulatorURL,
+          },
           secrets: {
             routingKey: 'pager-duty-routing-key',
           },
@@ -50,7 +53,7 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
         name: 'A pagerduty action',
         actionTypeId: '.pagerduty',
         config: {
-          apiUrl: null,
+          apiUrl: pagerdutySimulatorURL,
         },
       });
 
@@ -65,7 +68,7 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
         name: 'A pagerduty action',
         actionTypeId: '.pagerduty',
         config: {
-          apiUrl: null,
+          apiUrl: pagerdutySimulatorURL,
         },
       });
     });
@@ -77,6 +80,9 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
         .send({
           name: 'A pagerduty action',
           actionTypeId: '.pagerduty',
+          config: {
+            apiUrl: pagerdutySimulatorURL,
+          },
           secrets: {},
         })
         .expect(400)
@@ -90,6 +96,26 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
         });
     });
 
+    it('should return unsuccessfully when default pagerduty url is not whitelisted', async () => {
+      await supertest
+        .post('/api/action')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'A pagerduty action',
+          actionTypeId: '.pagerduty',
+          secrets: {},
+        })
+        .expect(400)
+        .then((resp: any) => {
+          expect(resp.body).to.eql({
+            statusCode: 400,
+            error: 'Bad Request',
+            message:
+              'error validating action type config: error configuring pagerduty action: target url "https://events.pagerduty.com/v2/enqueue" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+          });
+        });
+    });
+
     it('should create pagerduty simulator action successfully', async () => {
       const { body: createdSimulatedAction } = await supertest
         .post('/api/action')
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
index 288eda5111a1e..87280169c0960 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
@@ -40,7 +40,7 @@ export default function slackTest({ getService }: FtrProviderContext) {
           name: 'A slack action',
           actionTypeId: '.slack',
           secrets: {
-            webhookUrl: 'http://example.com',
+            webhookUrl: slackSimulatorURL,
           },
         })
         .expect(200);
@@ -86,6 +86,28 @@ export default function slackTest({ getService }: FtrProviderContext) {
         });
     });
 
+    it('should respond with a 400 Bad Request when creating a slack action with a non whitelisted webhookUrl', async () => {
+      await supertest
+        .post('/api/action')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'A slack action',
+          actionTypeId: '.slack',
+          secrets: {
+            webhookUrl: 'http://slack.mynonexistent.com',
+          },
+        })
+        .expect(400)
+        .then((resp: any) => {
+          expect(resp.body).to.eql({
+            statusCode: 400,
+            error: 'Bad Request',
+            message:
+              'error validating action type secrets: error configuring slack action: target url "http://slack.mynonexistent.com" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+          });
+        });
+    });
+
     it('should create our slack simulator action successfully', async () => {
       const { body: createdSimulatedAction } = await supertest
         .post('/api/action')
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
index 426bbe853ca19..841c96acdc3b1 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
@@ -180,7 +180,7 @@ export default function webhookTest({ getService }: FtrProviderContext) {
         .expect(400);
 
       expect(result.error).to.eql('Bad Request');
-      expect(result.message).to.match(/not in the Kibana whitelist/);
+      expect(result.message).to.match(/is not whitelisted in the Kibana config/);
     });
 
     it('should handle unreachable webhook targets', async () => {
@@ -198,6 +198,7 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       expect(result.status).to.eql('error');
       expect(result.message).to.match(/error calling webhook, unexpected error/);
     });
+
     it('should handle failing webhook targets', async () => {
       const webhookActionId = await createWebhookAction(webhookSimulatorURL);
       const { body: result } = await supertest
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/create.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/create.ts
index 5d5692685c81b..32d419bb562b2 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/create.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/create.ts
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { getUrlPrefix, ObjectRemover } from '../../../common/lib';
+import { checkAAD, getUrlPrefix, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
@@ -52,6 +52,7 @@ export default function createActionTests({ getService }: FtrProviderContext) {
             case 'superuser at space1':
             case 'space_1_all at space1':
               expect(response.statusCode).to.eql(200);
+              objectRemover.add(space.id, response.body.id, 'action');
               expect(response.body).to.eql({
                 id: response.body.id,
                 name: 'My action',
@@ -61,7 +62,13 @@ export default function createActionTests({ getService }: FtrProviderContext) {
                 },
               });
               expect(typeof response.body.id).to.be('string');
-              objectRemover.add(space.id, response.body.id, 'action');
+              // Ensure AAD isn't broken
+              await checkAAD({
+                supertest,
+                spaceId: space.id,
+                type: 'action',
+                id: response.body.id,
+              });
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
@@ -179,6 +186,42 @@ export default function createActionTests({ getService }: FtrProviderContext) {
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
           }
         });
+
+        it(`should handle create action requests for action types that are not enabled`, async () => {
+          const response = await supertestWithoutAuth
+            .post(`${getUrlPrefix(space.id)}/api/action`)
+            .set('kbn-xsrf', 'foo')
+            .auth(user.username, user.password)
+            .send({
+              name: 'my name',
+              actionTypeId: 'test.not-enabled',
+            });
+
+          switch (scenario.id) {
+            case 'no_kibana_privileges at space1':
+            case 'global_read 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 'superuser at space1':
+            case 'space_1_all at space1':
+              expect(response.statusCode).to.eql(400);
+              expect(response.body).to.eql({
+                statusCode: 400,
+                error: 'Bad Request',
+                message:
+                  'action type "test.not-enabled" is not enabled in the Kibana config xpack.actions.enabledActionTypes',
+              });
+              break;
+            default:
+              throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
+          }
+        });
       });
     }
   });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/update.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/update.ts
index d41a2a10b770a..ed6a1bb3d14a9 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/update.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/update.ts
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { getUrlPrefix, ObjectRemover } from '../../../common/lib';
+import { checkAAD, getUrlPrefix, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
@@ -75,6 +75,13 @@ export default function updateActionTests({ getService }: FtrProviderContext) {
                   unencrypted: `This value shouldn't get encrypted`,
                 },
               });
+              // Ensure AAD isn't broken
+              await checkAAD({
+                supertest,
+                spaceId: space.id,
+                type: 'action',
+                id: createdAction.id,
+              });
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
index 8f3996f958bb2..69bc547e3bfc1 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts
@@ -450,7 +450,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
           const response = await alertUtils.createAlwaysFiringAction({
             reference,
             overwrites: {
-              interval: '1s',
+              schedule: { interval: '1s' },
             },
           });
 
@@ -467,6 +467,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
               break;
             case 'space_1_all at space1':
             case 'superuser at space1':
+              expect(response.statusCode).to.eql(200);
               // Wait until alerts scheduled actions 3 times before disabling the alert and waiting for tasks to finish
               await esTestIndexTool.waitForDocs('alert:test.always-firing', reference, 3);
               await alertUtils.disable(response.body.id);
@@ -490,7 +491,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
           const response = await alertUtils.createAlwaysFiringAction({
             reference,
             overwrites: {
-              interval: '1s',
+              schedule: { interval: '1s' },
               params: {
                 index: ES_TEST_INDEX_NAME,
                 reference,
@@ -560,7 +561,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
           const response = await alertUtils.createAlwaysFiringAction({
             reference,
             overwrites: {
-              interval: '1s',
+              schedule: { interval: '1s' },
               params: {
                 index: ES_TEST_INDEX_NAME,
                 reference,
@@ -582,6 +583,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
               break;
             case 'space_1_all at space1':
             case 'superuser at space1':
+              expect(response.statusCode).to.eql(200);
               // Actions should execute twice before widning things down
               await esTestIndexTool.waitForDocs('action:test.index-record', reference, 2);
               await alertUtils.disable(response.body.id);
@@ -599,14 +601,23 @@ export default function alertTests({ getService }: FtrProviderContext) {
           }
         });
 
-        it(`shouldn't schedule actions when alert is muted`, async () => {
+        /**
+         * Skipping due to an issue we've discovered in the `muteAll` api
+         * which corrupts the apiKey and causes this test to exhibit flaky behaviour.
+         * Failed CIs for example:
+         * 1. https://github.com/elastic/kibana/issues/53690
+         * 2. https://github.com/elastic/kibana/issues/53683
+         *
+         * This will be fixed and reverted in PR: https://github.com/elastic/kibana/pull/53333
+         */
+        it.skip(`shouldn't schedule actions when alert is muted`, async () => {
           const testStart = new Date();
           const reference = alertUtils.generateReference();
           const response = await alertUtils.createAlwaysFiringAction({
             reference,
             overwrites: {
               enabled: false,
-              interval: '1s',
+              schedule: { interval: '1s' },
             },
           });
 
@@ -651,7 +662,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
             reference,
             overwrites: {
               enabled: false,
-              interval: '1s',
+              schedule: { interval: '1s' },
             },
           });
 
@@ -696,7 +707,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
             reference,
             overwrites: {
               enabled: false,
-              interval: '1s',
+              schedule: { interval: '1s' },
             },
           });
 
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 c0a99ae068e71..003bb10c0adae 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
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { getTestAlertData, getUrlPrefix, ObjectRemover } from '../../../common/lib';
+import { checkAAD, getTestAlertData, getUrlPrefix, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
@@ -87,10 +87,13 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
                 ],
                 enabled: true,
                 alertTypeId: 'test.noop',
+                consumer: 'bar',
                 params: {},
                 createdBy: user.username,
-                interval: '1m',
+                schedule: { interval: '1m' },
                 scheduledTaskId: response.body.scheduledTaskId,
+                createdAt: response.body.createdAt,
+                updatedAt: response.body.updatedAt,
                 throttle: '1m',
                 updatedBy: user.username,
                 apiKeyOwner: user.username,
@@ -98,6 +101,9 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
                 mutedInstanceIds: [],
               });
               expect(typeof response.body.scheduledTaskId).to.be('string');
+              expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0);
+              expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0);
+
               const { _source: taskRecord } = await getScheduledTask(response.body.scheduledTaskId);
               expect(taskRecord.type).to.eql('task');
               expect(taskRecord.task.taskType).to.eql('alerting:test.noop');
@@ -105,6 +111,13 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
                 alertId: response.body.id,
                 spaceId: space.id,
               });
+              // Ensure AAD isn't broken
+              await checkAAD({
+                supertest,
+                spaceId: space.id,
+                type: 'alert',
+                id: response.body.id,
+              });
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
@@ -201,10 +214,10 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
                 statusCode: 400,
                 error: 'Bad Request',
                 message:
-                  'child "name" fails because ["name" is required]. child "alertTypeId" fails because ["alertTypeId" is required]. child "interval" fails because ["interval" is required]. child "params" fails because ["params" is required]. child "actions" fails because ["actions" is required]',
+                  'child "name" fails because ["name" is required]. child "alertTypeId" fails because ["alertTypeId" is required]. child "consumer" fails because ["consumer" is required]. child "schedule" fails because ["schedule" is required]. child "params" fails because ["params" is required]. child "actions" fails because ["actions" is required]',
                 validation: {
                   source: 'payload',
-                  keys: ['name', 'alertTypeId', 'interval', 'params', 'actions'],
+                  keys: ['name', 'alertTypeId', 'consumer', 'schedule', 'params', 'actions'],
                 },
               });
               break;
@@ -250,12 +263,12 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
           }
         });
 
-        it('should handle create alert request appropriately when interval is wrong syntax', async () => {
+        it('should handle create alert request appropriately when interval schedule is wrong syntax', async () => {
           const response = await supertestWithoutAuth
             .post(`${getUrlPrefix(space.id)}/api/alert`)
             .set('kbn-xsrf', 'foo')
             .auth(user.username, user.password)
-            .send(getTestAlertData(getTestAlertData({ interval: '10x' })));
+            .send(getTestAlertData(getTestAlertData({ schedule: { interval: '10x' } })));
 
           switch (scenario.id) {
             case 'no_kibana_privileges at space1':
@@ -275,10 +288,15 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
                 statusCode: 400,
                 error: 'Bad Request',
                 message:
-                  'child "interval" fails because ["interval" with value "10x" fails to match the seconds pattern, "interval" with value "10x" fails to match the minutes pattern, "interval" with value "10x" fails to match the hours pattern, "interval" with value "10x" fails to match the days pattern]',
+                  'child "schedule" fails because [child "interval" fails because ["interval" with value "10x" fails to match the seconds pattern, "interval" with value "10x" fails to match the minutes pattern, "interval" with value "10x" fails to match the hours pattern, "interval" with value "10x" fails to match the days pattern]]',
                 validation: {
                   source: 'payload',
-                  keys: ['interval', 'interval', 'interval', 'interval'],
+                  keys: [
+                    'schedule.interval',
+                    'schedule.interval',
+                    'schedule.interval',
+                    'schedule.interval',
+                  ],
                 },
               });
               break;
@@ -287,12 +305,12 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
           }
         });
 
-        it('should handle create alert request appropriately when interval is 0', async () => {
+        it('should handle create alert request appropriately when interval schedule is 0', async () => {
           const response = await supertestWithoutAuth
             .post(`${getUrlPrefix(space.id)}/api/alert`)
             .set('kbn-xsrf', 'foo')
             .auth(user.username, user.password)
-            .send(getTestAlertData(getTestAlertData({ interval: '0s' })));
+            .send(getTestAlertData(getTestAlertData({ schedule: { interval: '0s' } })));
 
           switch (scenario.id) {
             case 'no_kibana_privileges at space1':
@@ -312,10 +330,15 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
                 statusCode: 400,
                 error: 'Bad Request',
                 message:
-                  'child "interval" fails because ["interval" with value "0s" fails to match the seconds pattern, "interval" with value "0s" fails to match the minutes pattern, "interval" with value "0s" fails to match the hours pattern, "interval" with value "0s" fails to match the days pattern]',
+                  'child "schedule" fails because [child "interval" fails because ["interval" with value "0s" fails to match the seconds pattern, "interval" with value "0s" fails to match the minutes pattern, "interval" with value "0s" fails to match the hours pattern, "interval" with value "0s" fails to match the days pattern]]',
                 validation: {
                   source: 'payload',
-                  keys: ['interval', 'interval', 'interval', 'interval'],
+                  keys: [
+                    'schedule.interval',
+                    'schedule.interval',
+                    'schedule.interval',
+                    'schedule.interval',
+                  ],
                 },
               });
               break;
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/disable.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/disable.ts
index d2076e0f92b3c..bafca30abf28a 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/disable.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/disable.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createDisableAlertTests({ getService }: FtrProviderContext) {
@@ -65,6 +71,13 @@ export default function createDisableAlertTests({ getService }: FtrProviderConte
               } catch (e) {
                 expect(e.status).to.eql(404);
               }
+              // Ensure AAD isn't broken
+              await checkAAD({
+                supertest,
+                spaceId: space.id,
+                type: 'alert',
+                id: createdAlert.id,
+              });
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/enable.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/enable.ts
index 528db61dba21c..9df1f955232b1 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/enable.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/enable.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createEnableAlertTests({ getService }: FtrProviderContext) {
@@ -70,6 +76,13 @@ export default function createEnableAlertTests({ getService }: FtrProviderContex
                 alertId: createdAlert.id,
                 spaceId: space.id,
               });
+              // Ensure AAD isn't broken
+              await checkAAD({
+                supertest,
+                spaceId: space.id,
+                type: 'alert',
+                id: createdAlert.id,
+              });
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
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 359058f2ac23a..d99ab794cd28f 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
@@ -59,18 +59,23 @@ export default function createFindTests({ getService }: FtrProviderContext) {
                 name: 'abc',
                 tags: ['foo'],
                 alertTypeId: 'test.noop',
-                interval: '1m',
+                consumer: 'bar',
+                schedule: { interval: '1m' },
                 enabled: true,
                 actions: [],
                 params: {},
                 createdBy: 'elastic',
                 scheduledTaskId: match.scheduledTaskId,
+                createdAt: match.createdAt,
+                updatedAt: match.updatedAt,
                 throttle: '1m',
                 updatedBy: 'elastic',
                 apiKeyOwner: 'elastic',
                 muteAll: false,
                 mutedInstanceIds: [],
               });
+              expect(Date.parse(match.createdAt)).to.be.greaterThan(0);
+              expect(Date.parse(match.updatedAt)).to.be.greaterThan(0);
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
@@ -138,7 +143,8 @@ export default function createFindTests({ getService }: FtrProviderContext) {
                 name: 'abc',
                 tags: ['foo'],
                 alertTypeId: 'test.noop',
-                interval: '1m',
+                consumer: 'bar',
+                schedule: { interval: '1m' },
                 enabled: false,
                 actions: [
                   {
@@ -155,7 +161,11 @@ export default function createFindTests({ getService }: FtrProviderContext) {
                 apiKeyOwner: 'elastic',
                 muteAll: false,
                 mutedInstanceIds: [],
+                createdAt: match.createdAt,
+                updatedAt: match.updatedAt,
               });
+              expect(Date.parse(match.createdAt)).to.be.greaterThan(0);
+              expect(Date.parse(match.updatedAt)).to.be.greaterThan(0);
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
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 1a8109f6b6b3c..20eed4013d7dd 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
@@ -53,18 +53,23 @@ export default function createGetTests({ getService }: FtrProviderContext) {
                 name: 'abc',
                 tags: ['foo'],
                 alertTypeId: 'test.noop',
-                interval: '1m',
+                consumer: 'bar',
+                schedule: { interval: '1m' },
                 enabled: true,
                 actions: [],
                 params: {},
                 createdBy: 'elastic',
                 scheduledTaskId: response.body.scheduledTaskId,
+                updatedAt: response.body.updatedAt,
+                createdAt: response.body.createdAt,
                 throttle: '1m',
                 updatedBy: 'elastic',
                 apiKeyOwner: 'elastic',
                 muteAll: false,
                 mutedInstanceIds: [],
               });
+              expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0);
+              expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0);
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/mute_all.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/mute_all.ts
index 9e479064e66c7..ce11fb8052b45 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/mute_all.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/mute_all.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createMuteAlertTests({ getService }: FtrProviderContext) {
@@ -55,6 +61,13 @@ export default function createMuteAlertTests({ getService }: FtrProviderContext)
                 .auth(user.username, user.password)
                 .expect(200);
               expect(updatedAlert.muteAll).to.eql(true);
+              // Ensure AAD isn't broken
+              await checkAAD({
+                supertest,
+                spaceId: space.id,
+                type: 'alert',
+                id: createdAlert.id,
+              });
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/mute_instance.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/mute_instance.ts
index 302b61074e87d..f91b54514ae05 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/mute_instance.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/mute_instance.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createMuteAlertInstanceTests({ getService }: FtrProviderContext) {
@@ -55,6 +61,13 @@ export default function createMuteAlertInstanceTests({ getService }: FtrProvider
                 .auth(user.username, user.password)
                 .expect(200);
               expect(updatedAlert.mutedInstanceIds).to.eql(['1']);
+              // Ensure AAD isn't broken
+              await checkAAD({
+                supertest,
+                spaceId: space.id,
+                type: 'alert',
+                id: createdAlert.id,
+              });
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/unmute_all.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/unmute_all.ts
index 5e9ad66cf40f3..f2598ff7c5493 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/unmute_all.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/unmute_all.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createUnmuteAlertTests({ getService }: FtrProviderContext) {
@@ -60,6 +66,13 @@ export default function createUnmuteAlertTests({ getService }: FtrProviderContex
                 .auth(user.username, user.password)
                 .expect(200);
               expect(updatedAlert.muteAll).to.eql(false);
+              // Ensure AAD isn't broken
+              await checkAAD({
+                supertest,
+                spaceId: space.id,
+                type: 'alert',
+                id: createdAlert.id,
+              });
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/unmute_instance.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/unmute_instance.ts
index b466575841d0a..ca58b58e5e822 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/unmute_instance.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/unmute_instance.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createMuteAlertInstanceTests({ getService }: FtrProviderContext) {
@@ -60,6 +66,13 @@ export default function createMuteAlertInstanceTests({ getService }: FtrProvider
                 .auth(user.username, user.password)
                 .expect(200);
               expect(updatedAlert.mutedInstanceIds).to.eql([]);
+              // Ensure AAD isn't broken
+              await checkAAD({
+                supertest,
+                spaceId: space.id,
+                type: 'alert',
+                id: createdAlert.id,
+              });
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
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 1b1bcef9ad23f..2a7e0b2203824 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
@@ -5,14 +5,29 @@
  */
 
 import expect from '@kbn/expect';
+import { Response as SupertestResponse } from 'supertest';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
+import {
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+  ensureDatetimeIsWithinRange,
+} from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function createUpdateTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const retry = getService('retry');
+
+  function getAlertingTaskById(taskId: string) {
+    return supertest
+      .get(`/api/alerting_tasks/${taskId}`)
+      .expect(200)
+      .then((response: SupertestResponse) => response.body);
+  }
 
   describe('update', () => {
     const objectRemover = new ObjectRemover(supertest);
@@ -36,7 +51,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
             params: {
               foo: true,
             },
-            interval: '12s',
+            schedule: { interval: '12s' },
             actions: [],
             throttle: '2m',
           };
@@ -64,6 +79,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
                 ...updatedData,
                 id: createdAlert.id,
                 alertTypeId: 'test.noop',
+                consumer: 'bar',
                 createdBy: 'elastic',
                 enabled: true,
                 updatedBy: user.username,
@@ -71,6 +87,20 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
                 muteAll: false,
                 mutedInstanceIds: [],
                 scheduledTaskId: createdAlert.scheduledTaskId,
+                createdAt: response.body.createdAt,
+                updatedAt: response.body.updatedAt,
+              });
+              expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0);
+              expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0);
+              expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(
+                Date.parse(response.body.createdAt)
+              );
+              // Ensure AAD isn't broken
+              await checkAAD({
+                supertest,
+                spaceId: space.id,
+                type: 'alert',
+                id: createdAlert.id,
               });
               break;
             default:
@@ -96,7 +126,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
               params: {
                 foo: true,
               },
-              interval: '12s',
+              schedule: { interval: '12s' },
               throttle: '1m',
               actions: [],
             });
@@ -145,7 +175,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
               params: {
                 foo: true,
               },
-              interval: '12s',
+              schedule: { interval: '12s' },
               actions: [],
             });
 
@@ -203,10 +233,10 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
                 statusCode: 400,
                 error: 'Bad Request',
                 message:
-                  'child "throttle" fails because ["throttle" is required]. child "name" fails because ["name" is required]. child "tags" fails because ["tags" is required]. child "interval" fails because ["interval" is required]. child "params" fails because ["params" is required]. child "actions" fails because ["actions" is required]',
+                  'child "throttle" fails because ["throttle" is required]. child "name" fails because ["name" is required]. child "tags" fails because ["tags" is required]. child "schedule" fails because ["schedule" is required]. child "params" fails because ["params" is required]. child "actions" fails because ["actions" is required]',
                 validation: {
                   source: 'payload',
-                  keys: ['throttle', 'name', 'tags', 'interval', 'params', 'actions'],
+                  keys: ['throttle', 'name', 'tags', 'schedule', 'params', 'actions'],
                 },
               });
               break;
@@ -237,7 +267,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
             .send({
               name: 'bcd',
               tags: ['bar'],
-              interval: '1m',
+              schedule: { interval: '1m' },
               throttle: '1m',
               params: {},
               actions: [],
@@ -269,12 +299,18 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
           }
         });
 
-        it('should handle update alert request appropriately when interval is wrong syntax', async () => {
+        it('should handle update alert request appropriately when interval schedule is wrong syntax', async () => {
           const response = await supertestWithoutAuth
             .put(`${getUrlPrefix(space.id)}/api/alert/1`)
             .set('kbn-xsrf', 'foo')
             .auth(user.username, user.password)
-            .send(getTestAlertData({ interval: '10x', enabled: undefined }));
+            .send(
+              getTestAlertData({
+                schedule: { interval: '10x' },
+                enabled: undefined,
+                consumer: undefined,
+              })
+            );
 
           switch (scenario.id) {
             case 'no_kibana_privileges at space1':
@@ -294,10 +330,16 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
                 statusCode: 400,
                 error: 'Bad Request',
                 message:
-                  'child "interval" fails because ["interval" with value "10x" fails to match the seconds pattern, "interval" with value "10x" fails to match the minutes pattern, "interval" with value "10x" fails to match the hours pattern, "interval" with value "10x" fails to match the days pattern]. "alertTypeId" is not allowed',
+                  'child "schedule" fails because [child "interval" fails because ["interval" with value "10x" fails to match the seconds pattern, "interval" with value "10x" fails to match the minutes pattern, "interval" with value "10x" fails to match the hours pattern, "interval" with value "10x" fails to match the days pattern]]. "alertTypeId" is not allowed',
                 validation: {
                   source: 'payload',
-                  keys: ['interval', 'interval', 'interval', 'interval', 'alertTypeId'],
+                  keys: [
+                    'schedule.interval',
+                    'schedule.interval',
+                    'schedule.interval',
+                    'schedule.interval',
+                    'alertTypeId',
+                  ],
                 },
               });
               break;
@@ -305,6 +347,67 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
           }
         });
+
+        it('should handle updates to an alert schedule by rescheduling the underlying task', async () => {
+          const { body: createdAlert } = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/alert`)
+            .set('kbn-xsrf', 'foo')
+            .send(
+              getTestAlertData({
+                schedule: { interval: '30m' },
+              })
+            )
+            .expect(200);
+          objectRemover.add(space.id, createdAlert.id, 'alert');
+
+          await retry.try(async () => {
+            const alertTask = (await getAlertingTaskById(createdAlert.scheduledTaskId)).docs[0];
+            expect(alertTask.status).to.eql('idle');
+            // ensure the alert inital run has completed and it's been rescheduled to half an hour from now
+            ensureDatetimeIsWithinRange(Date.parse(alertTask.runAt), 30 * 60 * 1000);
+          });
+
+          const updatedData = {
+            name: 'bcd',
+            tags: ['bar'],
+            params: {
+              foo: true,
+            },
+            schedule: { interval: '1m' },
+            actions: [],
+            throttle: '2m',
+          };
+          const response = await supertestWithoutAuth
+            .put(`${getUrlPrefix(space.id)}/api/alert/${createdAlert.id}`)
+            .set('kbn-xsrf', 'foo')
+            .auth(user.username, user.password)
+            .send(updatedData);
+
+          switch (scenario.id) {
+            case 'no_kibana_privileges at space1':
+            case 'space_1_all at space2':
+            case 'global_read at space1':
+              expect(response.statusCode).to.eql(404);
+              expect(response.body).to.eql({
+                statusCode: 404,
+                error: 'Not Found',
+                message: 'Not Found',
+              });
+              break;
+            case 'superuser at space1':
+            case 'space_1_all at space1':
+              expect(response.statusCode).to.eql(200);
+              await retry.try(async () => {
+                const alertTask = (await getAlertingTaskById(createdAlert.scheduledTaskId)).docs[0];
+                expect(alertTask.status).to.eql('idle');
+                // ensure the alert is rescheduled to a minute from now
+                ensureDatetimeIsWithinRange(Date.parse(alertTask.runAt), 60 * 1000);
+              });
+              break;
+            default:
+              throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
+          }
+        });
       });
     }
   });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update_api_key.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update_api_key.ts
index 4963d749c2935..b54147348d9a3 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update_api_key.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update_api_key.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { UserAtSpaceScenarios } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createUpdateApiKeyTests({ getService }: FtrProviderContext) {
@@ -55,6 +61,13 @@ export default function createUpdateApiKeyTests({ getService }: FtrProviderConte
                 .auth(user.username, user.password)
                 .expect(200);
               expect(updatedAlert.apiKeyOwner).to.eql(user.username);
+              // Ensure AAD isn't broken
+              await checkAAD({
+                supertest,
+                spaceId: space.id,
+                type: 'alert',
+                id: createdAlert.id,
+              });
               break;
             default:
               throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/create.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/create.ts
index 982688cc45c05..74e8e0f832299 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/create.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/create.ts
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { Spaces } from '../../scenarios';
-import { getUrlPrefix, ObjectRemover } from '../../../common/lib';
+import { checkAAD, getUrlPrefix, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
@@ -34,6 +34,7 @@ export default function createActionTests({ getService }: FtrProviderContext) {
         });
 
       expect(response.statusCode).to.eql(200);
+      objectRemover.add(Spaces.space1.id, response.body.id, 'action');
       expect(response.body).to.eql({
         id: response.body.id,
         name: 'My action',
@@ -43,7 +44,14 @@ export default function createActionTests({ getService }: FtrProviderContext) {
         },
       });
       expect(typeof response.body.id).to.be('string');
-      objectRemover.add(Spaces.space1.id, response.body.id, 'action');
+
+      // Ensure AAD isn't broken
+      await checkAAD({
+        supertest,
+        spaceId: Spaces.space1.id,
+        type: 'action',
+        id: response.body.id,
+      });
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/index.ts
index a3447e730c28d..accee08a00c61 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/index.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/index.ts
@@ -17,5 +17,6 @@ export default function actionsTests({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./update'));
     loadTestFile(require.resolve('./execute'));
     loadTestFile(require.resolve('./builtin_action_types/es_index'));
+    loadTestFile(require.resolve('./type_not_enabled'));
   });
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts
new file mode 100644
index 0000000000000..7193a80b94498
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+const PREWRITTEN_ACTION_ID = 'uuid-actionId';
+const DISABLED_ACTION_TYPE = 'test.not-enabled';
+
+// eslint-disable-next-line import/no-default-export
+export default function typeNotEnabledTests({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('actionType not enabled', () => {
+    // loads action PREWRITTEN_ACTION_ID with actionType DISABLED_ACTION_TYPE
+    before(() => esArchiver.load('alerting'));
+    after(() => esArchiver.unload('alerting'));
+
+    it('should handle create action with disabled actionType request appropriately', async () => {
+      const response = await supertest
+        .post(`/api/action`)
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'My action',
+          actionTypeId: DISABLED_ACTION_TYPE,
+        });
+
+      expect(response.statusCode).to.eql(400);
+      expect(response.body).to.eql({
+        statusCode: 400,
+        error: 'Bad Request',
+        message:
+          'action type "test.not-enabled" is not enabled in the Kibana config xpack.actions.enabledActionTypes',
+      });
+    });
+
+    it(`should handle execute request with disabled actionType appropriately`, async () => {
+      const response = await supertest
+        .post(`/api/action/${PREWRITTEN_ACTION_ID}/_execute`)
+        .set('kbn-xsrf', 'foo')
+        .send({
+          params: {},
+        });
+
+      expect(response.statusCode).to.eql(200);
+      expect(response.body).to.eql({
+        status: 'error',
+        retry: false,
+        actionId: PREWRITTEN_ACTION_ID,
+        message:
+          'action type "test.not-enabled" is not enabled in the Kibana config xpack.actions.enabledActionTypes',
+      });
+    });
+
+    it('should handle get action request with disabled actionType appropriately', async () => {
+      const response = await supertest.get(`/api/action/${PREWRITTEN_ACTION_ID}`);
+
+      expect(response.statusCode).to.eql(200);
+      expect(response.body).to.eql({
+        actionTypeId: 'test.not-enabled',
+        config: {},
+        id: 'uuid-actionId',
+        name: 'an action created before test.not-enabled was disabled',
+      });
+    });
+
+    it('should handle update action request with disabled actionType appropriately', async () => {
+      const responseUpdate = await supertest
+        .put(`/api/action/${PREWRITTEN_ACTION_ID}`)
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'an action created before test.not-enabled was disabled (updated)',
+        });
+
+      expect(responseUpdate.statusCode).to.eql(200);
+      expect(responseUpdate.body).to.eql({
+        actionTypeId: 'test.not-enabled',
+        config: {},
+        id: 'uuid-actionId',
+        name: 'an action created before test.not-enabled was disabled (updated)',
+      });
+
+      const response = await supertest.get(`/api/action/${PREWRITTEN_ACTION_ID}`);
+      expect(response.statusCode).to.eql(200);
+      expect(response.body).to.eql({
+        actionTypeId: 'test.not-enabled',
+        config: {},
+        id: 'uuid-actionId',
+        name: 'an action created before test.not-enabled was disabled (updated)',
+      });
+    });
+
+    it('should handle delete action request with disabled actionType appropriately', async () => {
+      let response;
+
+      response = await supertest
+        .delete(`/api/action/${PREWRITTEN_ACTION_ID}`)
+        .set('kbn-xsrf', 'foo');
+      expect(response.statusCode).to.eql(204);
+
+      response = await supertest.get(`/api/action/${PREWRITTEN_ACTION_ID}`);
+      expect(response.statusCode).to.eql(404);
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/update.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/update.ts
index bb1ee31bddfe0..fb0c5e13c0720 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/update.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/update.ts
@@ -5,7 +5,7 @@
  */
 
 import { Spaces } from '../../scenarios';
-import { getUrlPrefix, ObjectRemover } from '../../../common/lib';
+import { checkAAD, getUrlPrefix, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
@@ -54,6 +54,14 @@ export default function updateActionTests({ getService }: FtrProviderContext) {
             unencrypted: `This value shouldn't get encrypted`,
           },
         });
+
+      // Ensure AAD isn't broken
+      await checkAAD({
+        supertest,
+        spaceId: Spaces.space1.id,
+        type: 'action',
+        id: createdAction.id,
+      });
     });
 
     it(`shouldn't update action from another space`, async () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts.ts
index 5fafd8b0bfb61..032fee15882cf 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts.ts
@@ -5,6 +5,7 @@
  */
 
 import expect from '@kbn/expect';
+import { Response as SupertestResponse } from 'supertest';
 import { Spaces } from '../../scenarios';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import {
@@ -14,6 +15,7 @@ import {
   getTestAlertData,
   ObjectRemover,
   AlertUtils,
+  ensureDatetimeIsWithinRange,
 } from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
@@ -23,6 +25,13 @@ export default function alertTests({ getService }: FtrProviderContext) {
   const retry = getService('retry');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 
+  function getAlertingTaskById(taskId: string) {
+    return supertestWithoutAuth
+      .get(`/api/alerting_tasks/${taskId}`)
+      .expect(200)
+      .then((response: SupertestResponse) => response.body);
+  }
+
   describe('alerts', () => {
     let alertUtils: AlertUtils;
     let indexRecordActionId: string;
@@ -100,6 +109,37 @@ export default function alertTests({ getService }: FtrProviderContext) {
       });
     });
 
+    it('should reschedule failing alerts using the alerting interval and not the Task Manager retry logic', async () => {
+      /*
+        Alerting does not use the Task Manager schedule and instead implements its own due to a current limitation
+        in TaskManager's ability to update an existing Task.
+        For this reason we need to handle the retry when Alert executors fail, as TaskManager doesn't understand that
+        alerting tasks are recurring tasks.
+      */
+      const alertIntervalInSeconds = 30;
+      const reference = alertUtils.generateReference();
+      const response = await alertUtils.createAlwaysFailingAction({
+        reference,
+        overwrites: { schedule: { interval: `${alertIntervalInSeconds}s` } },
+      });
+
+      expect(response.statusCode).to.eql(200);
+
+      // wait for executor Alert Executor to be run, which means the underlying task is running
+      await esTestIndexTool.waitForDocs('alert:test.failing', reference);
+
+      await retry.try(async () => {
+        const alertTask = (await getAlertingTaskById(response.body.scheduledTaskId)).docs[0];
+        expect(alertTask.status).to.eql('idle');
+        // ensure the alert is rescheduled to a minute from now
+        ensureDatetimeIsWithinRange(
+          Date.parse(alertTask.runAt),
+          alertIntervalInSeconds * 1000,
+          5000
+        );
+      });
+    });
+
     it('should handle custom retry logic', async () => {
       // We'll use this start time to query tasks created after this point
       const testStart = new Date();
@@ -123,7 +163,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
         .set('kbn-xsrf', 'foo')
         .send(
           getTestAlertData({
-            interval: '1m',
+            schedule: { interval: '1m' },
             alertTypeId: 'test.always-firing',
             params: {
               index: ES_TEST_INDEX_NAME,
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 929905a958abb..50e01c65b6a86 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
@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { Spaces } from '../../scenarios';
-import { getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
+import { checkAAD, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
@@ -69,15 +69,22 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
         ],
         enabled: true,
         alertTypeId: 'test.noop',
+        consumer: 'bar',
         params: {},
         createdBy: null,
-        interval: '1m',
+        schedule: { interval: '1m' },
         scheduledTaskId: response.body.scheduledTaskId,
         updatedBy: null,
+        apiKeyOwner: null,
         throttle: '1m',
         muteAll: false,
         mutedInstanceIds: [],
+        createdAt: response.body.createdAt,
+        updatedAt: response.body.updatedAt,
       });
+      expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0);
+      expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0);
+
       expect(typeof response.body.scheduledTaskId).to.be('string');
       const { _source: taskRecord } = await getScheduledTask(response.body.scheduledTaskId);
       expect(taskRecord.type).to.eql('task');
@@ -86,6 +93,13 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
         alertId: response.body.id,
         spaceId: Spaces.space1.id,
       });
+      // Ensure AAD isn't broken
+      await checkAAD({
+        supertest,
+        spaceId: Spaces.space1.id,
+        type: 'alert',
+        id: response.body.id,
+      });
     });
 
     it('should handle create alert request appropriately when an alert is disabled ', async () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/disable.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/disable.ts
index 750f94201216a..9d5017530e075 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/disable.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/disable.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { Spaces } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createDisableAlertTests({ getService }: FtrProviderContext) {
@@ -43,6 +49,14 @@ export default function createDisableAlertTests({ getService }: FtrProviderConte
       } catch (e) {
         expect(e.status).to.eql(404);
       }
+
+      // Ensure AAD isn't broken
+      await checkAAD({
+        supertest: supertestWithoutAuth,
+        spaceId: Spaces.space1.id,
+        type: 'alert',
+        id: createdAlert.id,
+      });
     });
 
     it(`shouldn't disable alert from another space`, async () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/enable.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/enable.ts
index 00cd40c0e80cd..4459dd744fe4b 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/enable.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/enable.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { Spaces } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createEnableAlertTests({ getService }: FtrProviderContext) {
@@ -49,6 +55,14 @@ export default function createEnableAlertTests({ getService }: FtrProviderContex
         alertId: createdAlert.id,
         spaceId: Spaces.space1.id,
       });
+
+      // Ensure AAD isn't broken
+      await checkAAD({
+        supertest: supertestWithoutAuth,
+        spaceId: Spaces.space1.id,
+        type: 'alert',
+        id: createdAlert.id,
+      });
     });
 
     it(`shouldn't enable alert from another space`, async () => {
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 0d12af6db79b2..70935a462d03e 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
@@ -42,17 +42,23 @@ export default function createFindTests({ getService }: FtrProviderContext) {
         name: 'abc',
         tags: ['foo'],
         alertTypeId: 'test.noop',
-        interval: '1m',
+        consumer: 'bar',
+        schedule: { interval: '1m' },
         enabled: true,
         actions: [],
         params: {},
         createdBy: null,
+        apiKeyOwner: null,
         scheduledTaskId: match.scheduledTaskId,
         updatedBy: null,
         throttle: '1m',
         muteAll: false,
         mutedInstanceIds: [],
+        createdAt: match.createdAt,
+        updatedAt: match.updatedAt,
       });
+      expect(Date.parse(match.createdAt)).to.be.greaterThan(0);
+      expect(Date.parse(match.updatedAt)).to.be.greaterThan(0);
     });
 
     it(`shouldn't find alert from another space`, async () => {
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 9e4797bcbf7ad..30b5e43aee585 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
@@ -36,17 +36,23 @@ export default function createGetTests({ getService }: FtrProviderContext) {
         name: 'abc',
         tags: ['foo'],
         alertTypeId: 'test.noop',
-        interval: '1m',
+        consumer: 'bar',
+        schedule: { interval: '1m' },
         enabled: true,
         actions: [],
         params: {},
         createdBy: null,
         scheduledTaskId: response.body.scheduledTaskId,
         updatedBy: null,
+        apiKeyOwner: null,
         throttle: '1m',
         muteAll: false,
         mutedInstanceIds: [],
+        createdAt: response.body.createdAt,
+        updatedAt: response.body.updatedAt,
       });
+      expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0);
+      expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0);
     });
 
     it(`shouldn't find alert from another space`, async () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/mute_all.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/mute_all.ts
index dba3046aa4b7f..4781aed640f51 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/mute_all.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/mute_all.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { Spaces } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createMuteTests({ getService }: FtrProviderContext) {
@@ -34,6 +40,14 @@ export default function createMuteTests({ getService }: FtrProviderContext) {
         .set('kbn-xsrf', 'foo')
         .expect(200);
       expect(updatedAlert.muteAll).to.eql(true);
+
+      // Ensure AAD isn't broken
+      await checkAAD({
+        supertest: supertestWithoutAuth,
+        spaceId: Spaces.space1.id,
+        type: 'alert',
+        id: createdAlert.id,
+      });
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/mute_instance.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/mute_instance.ts
index 09ca359716026..0ee4d076d7b3c 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/mute_instance.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/mute_instance.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { Spaces } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createMuteInstanceTests({ getService }: FtrProviderContext) {
@@ -34,6 +40,14 @@ export default function createMuteInstanceTests({ getService }: FtrProviderConte
         .set('kbn-xsrf', 'foo')
         .expect(200);
       expect(updatedAlert.mutedInstanceIds).to.eql(['1']);
+
+      // Ensure AAD isn't broken
+      await checkAAD({
+        supertest: supertestWithoutAuth,
+        spaceId: Spaces.space1.id,
+        type: 'alert',
+        id: createdAlert.id,
+      });
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/unmute_all.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/unmute_all.ts
index 70ee32a9e6fb9..a7bf065d5795d 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/unmute_all.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/unmute_all.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { Spaces } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createUnmuteTests({ getService }: FtrProviderContext) {
@@ -35,6 +41,14 @@ export default function createUnmuteTests({ getService }: FtrProviderContext) {
         .set('kbn-xsrf', 'foo')
         .expect(200);
       expect(updatedAlert.muteAll).to.eql(false);
+
+      // Ensure AAD isn't broken
+      await checkAAD({
+        supertest: supertestWithoutAuth,
+        spaceId: Spaces.space1.id,
+        type: 'alert',
+        id: createdAlert.id,
+      });
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/unmute_instance.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/unmute_instance.ts
index d0f1b2fdb3f9f..868bbf66b1c32 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/unmute_instance.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/unmute_instance.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { Spaces } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 // eslint-disable-next-line import/no-default-export
 export default function createUnmuteInstanceTests({ getService }: FtrProviderContext) {
@@ -35,6 +41,14 @@ export default function createUnmuteInstanceTests({ getService }: FtrProviderCon
         .set('kbn-xsrf', 'foo')
         .expect(200);
       expect(updatedAlert.mutedInstanceIds).to.eql([]);
+
+      // Ensure AAD isn't broken
+      await checkAAD({
+        supertest: supertestWithoutAuth,
+        spaceId: Spaces.space1.id,
+        type: 'alert',
+        id: createdAlert.id,
+      });
     });
   });
 }
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 a6eccf88d9e26..5a35d4bf83865 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
@@ -4,8 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import expect from '@kbn/expect/expect.js';
 import { Spaces } from '../../scenarios';
-import { getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
+import { checkAAD, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
@@ -31,27 +32,45 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
         params: {
           foo: true,
         },
-        interval: '12s',
+        schedule: { interval: '12s' },
         actions: [],
         throttle: '1m',
       };
-      await supertest
+      const response = await supertest
         .put(`${getUrlPrefix(Spaces.space1.id)}/api/alert/${createdAlert.id}`)
         .set('kbn-xsrf', 'foo')
         .send(updatedData)
-        .expect(200, {
-          ...updatedData,
-          id: createdAlert.id,
-          tags: ['bar'],
-          alertTypeId: 'test.noop',
-          createdBy: null,
-          enabled: true,
-          updatedBy: null,
-          apiKeyOwner: null,
-          muteAll: false,
-          mutedInstanceIds: [],
-          scheduledTaskId: createdAlert.scheduledTaskId,
-        });
+        .expect(200);
+
+      expect(response.body).to.eql({
+        ...updatedData,
+        id: createdAlert.id,
+        tags: ['bar'],
+        alertTypeId: 'test.noop',
+        consumer: 'bar',
+        createdBy: null,
+        enabled: true,
+        updatedBy: null,
+        apiKeyOwner: null,
+        muteAll: false,
+        mutedInstanceIds: [],
+        scheduledTaskId: createdAlert.scheduledTaskId,
+        createdAt: response.body.createdAt,
+        updatedAt: response.body.updatedAt,
+      });
+      expect(Date.parse(response.body.createdAt)).to.be.greaterThan(0);
+      expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(0);
+      expect(Date.parse(response.body.updatedAt)).to.be.greaterThan(
+        Date.parse(response.body.createdAt)
+      );
+
+      // Ensure AAD isn't broken
+      await checkAAD({
+        supertest,
+        spaceId: Spaces.space1.id,
+        type: 'alert',
+        id: createdAlert.id,
+      });
     });
 
     it(`shouldn't update alert from another space`, async () => {
@@ -71,7 +90,7 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
           params: {
             foo: true,
           },
-          interval: '12s',
+          schedule: { interval: '12s' },
           actions: [],
           throttle: '1m',
         })
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update_api_key.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update_api_key.ts
index 2cd3634043740..4c4e641f90277 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update_api_key.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update_api_key.ts
@@ -6,8 +6,14 @@
 
 import expect from '@kbn/expect';
 import { Spaces } from '../../scenarios';
-import { AlertUtils, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  AlertUtils,
+  checkAAD,
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+} from '../../../common/lib';
 
 /**
  * Eventhough security is disabled, this test checks the API behavior.
@@ -38,6 +44,14 @@ export default function createUpdateApiKeyTests({ getService }: FtrProviderConte
         .set('kbn-xsrf', 'foo')
         .expect(200);
       expect(updatedAlert.apiKeyOwner).to.eql(null);
+
+      // Ensure AAD isn't broken
+      await checkAAD({
+        supertest: supertestWithoutAuth,
+        spaceId: Spaces.space1.id,
+        type: 'alert',
+        id: createdAlert.id,
+      });
     });
 
     it(`shouldn't update alert api key from another space`, async () => {
diff --git a/x-pack/test/api_integration/apis/apm/feature_controls.ts b/x-pack/test/api_integration/apis/apm/feature_controls.ts
index 839d4ff420a76..ec2bbca23ddd2 100644
--- a/x-pack/test/api_integration/apis/apm/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/apm/feature_controls.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/* eslint-disable no-console */
+
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
@@ -13,6 +15,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
   const security = getService('security');
   const spaces = getService('spaces');
   const log = getService('log');
+  const es = getService('legacyEs');
 
   const start = encodeURIComponent(new Date(Date.now() - 10000).toISOString());
   const end = encodeURIComponent(new Date().toISOString());
@@ -35,6 +38,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
     };
     expectForbidden: (result: any) => void;
     expectResponse: (result: any) => void;
+    onExpectationFail?: () => Promise<any>;
   }
   const endpoints: Endpoint[] = [
     {
@@ -139,10 +143,17 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
       },
       expectForbidden: expect404,
       expectResponse: expect200,
+      onExpectationFail: async () => {
+        const res = await es.search({
+          index: '.apm-agent-configuration',
+        });
+
+        console.warn(JSON.stringify(res, null, 2));
+      },
     },
   ];
 
-  const elasticsearchRole = {
+  const elasticsearchPrivileges = {
     indices: [
       { names: ['apm-*'], privileges: ['read', 'view_index_metadata'] },
       { names: ['.apm-agent-configuration'], privileges: ['read', 'write', 'view_index_metadata'] },
@@ -205,8 +216,10 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
     spaceId?: string;
   }) {
     for (const endpoint of endpoints) {
-      log.debug(`hitting ${endpoint.req.url}`);
+      console.log(`Requesting: ${endpoint.req.url}. Expecting: ${expectation}`);
       const result = await executeAsUser(endpoint.req, username, password, spaceId);
+      console.log(`Responded: ${endpoint.req.url}`);
+
       try {
         if (expectation === 'forbidden') {
           endpoint.expectForbidden(result);
@@ -214,6 +227,10 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
           endpoint.expectResponse(result);
         }
       } catch (e) {
+        if (endpoint.onExpectationFail) {
+          await endpoint.onExpectationFail();
+        }
+
         const { statusCode, body, req } = result.response;
         throw new Error(
           `Endpoint: ${req.method} ${req.path}
@@ -229,7 +246,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
   describe('apm feature controls', () => {
     let res: any;
     before(async () => {
-      log.debug('creating agent configuration');
+      console.log(`Creating agent configuration`);
       res = await executeAsAdmin({
         method: 'post',
         url: '/api/apm/settings/agent-configuration/new',
@@ -238,10 +255,11 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
           settings: { transaction_sample_rate: 0.5 },
         },
       });
+      console.log(`Agent configuration created`);
     });
 
     after(async () => {
-      log.debug('deleting agent configuration');
+      console.log('deleting agent configuration');
       const configurationId = res.body._id;
       await executeAsAdmin({
         method: 'delete',
@@ -255,7 +273,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
       const password = `${username}-password`;
       try {
         await security.role.create(roleName, {
-          elasticsearch: elasticsearchRole,
+          elasticsearch: elasticsearchPrivileges,
         });
 
         await security.user.create(username, {
@@ -277,7 +295,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
       const password = `${username}-password`;
       try {
         await security.role.create(roleName, {
-          elasticsearch: elasticsearchRole,
+          elasticsearch: elasticsearchPrivileges,
           kibana: [{ base: ['all'], spaces: ['*'] }],
         });
 
@@ -301,7 +319,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
       const password = `${username}-password`;
       try {
         await security.role.create(roleName, {
-          elasticsearch: elasticsearchRole,
+          elasticsearch: elasticsearchPrivileges,
           kibana: [{ feature: { dashboard: ['all'] }, spaces: ['*'] }],
         });
 
@@ -339,7 +357,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
           disabledFeatures: [],
         });
         await security.role.create(roleName, {
-          elasticsearch: elasticsearchRole,
+          elasticsearch: elasticsearchPrivileges,
           kibana: [
             { feature: { apm: ['read'] }, spaces: [space1Id] },
             { feature: { dashboard: ['all'] }, spaces: [space2Id] },
diff --git a/x-pack/test/api_integration/apis/endpoint/endpoints.ts b/x-pack/test/api_integration/apis/endpoint/endpoints.ts
new file mode 100644
index 0000000000000..95c3678672da3
--- /dev/null
+++ b/x-pack/test/api_integration/apis/endpoint/endpoints.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import expect from '@kbn/expect/expect.js';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function({ getService }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const supertest = getService('supertest');
+  describe('test endpoints api', () => {
+    before(() => esArchiver.load('endpoint/endpoints'));
+    after(() => esArchiver.unload('endpoint/endpoints'));
+    describe('GET /api/endpoint/endpoints', () => {
+      it('endpoints api should return one entry for each endpoint with default paging', async () => {
+        const { body } = await supertest
+          .post('/api/endpoint/endpoints')
+          .set('kbn-xsrf', 'xxx')
+          .send()
+          .expect(200);
+        expect(body.total).to.eql(3);
+        expect(body.endpoints.length).to.eql(3);
+        expect(body.request_page_size).to.eql(10);
+        expect(body.request_index).to.eql(0);
+      });
+
+      it('endpoints api should return page based on params passed.', async () => {
+        const { body } = await supertest
+          .post('/api/endpoint/endpoints')
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            paging_properties: [
+              {
+                page_size: 1,
+              },
+              {
+                page_index: 1,
+              },
+            ],
+          })
+          .expect(200);
+        expect(body.total).to.eql(3);
+        expect(body.endpoints.length).to.eql(1);
+        expect(body.request_page_size).to.eql(1);
+        expect(body.request_index).to.eql(1);
+      });
+
+      it('endpoints api should return 400 when pagingProperties is below boundaries.', async () => {
+        const { body } = await supertest
+          .post('/api/endpoint/endpoints')
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            paging_properties: [
+              {
+                page_size: 0,
+              },
+              {
+                page_index: 1,
+              },
+            ],
+          })
+          .expect(400);
+        expect(body.message).to.contain('Value is [0] but it must be equal to or greater than [1]');
+      });
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/apis/endpoint/index.ts b/x-pack/test/api_integration/apis/endpoint/index.ts
index e0ffbb13e5978..a3f0e828d7240 100644
--- a/x-pack/test/api_integration/apis/endpoint/index.ts
+++ b/x-pack/test/api_integration/apis/endpoint/index.ts
@@ -9,5 +9,6 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export default function endpointAPIIntegrationTests({ loadTestFile }: FtrProviderContext) {
   describe('Endpoint plugin', function() {
     loadTestFile(require.resolve('./resolver'));
+    loadTestFile(require.resolve('./endpoints'));
   });
 }
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 f613473dd87fb..34b2c5e324187 100644
--- a/x-pack/test/api_integration/apis/features/features/features.ts
+++ b/x-pack/test/api_integration/apis/features/features/features.ts
@@ -114,6 +114,7 @@ export default function({ getService }: FtrProviderContext) {
             'maps',
             'uptime',
             'siem',
+            'endpoint',
           ].sort()
         );
       });
diff --git a/x-pack/test/api_integration/apis/infra/log_entries.ts b/x-pack/test/api_integration/apis/infra/log_entries.ts
index 4020acc00c618..8db1426a219d4 100644
--- a/x-pack/test/api_integration/apis/infra/log_entries.ts
+++ b/x-pack/test/api_integration/apis/infra/log_entries.ts
@@ -9,6 +9,21 @@ import { ascending, pairs } from 'd3-array';
 import gql from 'graphql-tag';
 import { v4 as uuidv4 } from 'uuid';
 
+import { pipe } from 'fp-ts/lib/pipeable';
+import { identity } from 'fp-ts/lib/function';
+import { fold } from 'fp-ts/lib/Either';
+
+import {
+  createPlainError,
+  throwErrors,
+} from '../../../../legacy/plugins/infra/common/runtime_types';
+
+import {
+  LOG_ENTRIES_PATH,
+  logEntriesRequestRT,
+  logEntriesResponseRT,
+} from '../../../../legacy/plugins/infra/common/http_api';
+
 import { sharedFragments } from '../../../../legacy/plugins/infra/common/graphql/shared';
 import { InfraTimeKey } from '../../../../legacy/plugins/infra/public/graphql/types';
 import { FtrProviderContext } from '../../ftr_provider_context';
@@ -88,15 +103,209 @@ const logEntriesBetweenQuery = gql`
   ${sharedFragments.InfraLogEntryFields}
 `;
 
+const COMMON_HEADERS = {
+  'kbn-xsrf': 'some-xsrf-token',
+};
+
 export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('infraOpsGraphQLClient');
+  const supertest = getService('supertest');
   const sourceConfigurationService = getService('infraOpsSourceConfiguration');
 
   describe('log entry apis', () => {
     before(() => esArchiver.load('infra/metrics_and_logs'));
     after(() => esArchiver.unload('infra/metrics_and_logs'));
 
+    describe('/log_entries/entries', () => {
+      describe('with the default source', () => {
+        before(() => esArchiver.load('empty_kibana'));
+        after(() => esArchiver.unload('empty_kibana'));
+
+        it('works', async () => {
+          const { body } = await supertest
+            .post(LOG_ENTRIES_PATH)
+            .set(COMMON_HEADERS)
+            .send(
+              logEntriesRequestRT.encode({
+                sourceId: 'default',
+                startDate: EARLIEST_KEY_WITH_DATA.time,
+                endDate: KEY_WITHIN_DATA_RANGE.time,
+              })
+            )
+            .expect(200);
+
+          const logEntriesResponse = pipe(
+            logEntriesResponseRT.decode(body),
+            fold(throwErrors(createPlainError), identity)
+          );
+
+          const entries = logEntriesResponse.data.entries;
+          const firstEntry = entries[0];
+          const lastEntry = entries[entries.length - 1];
+
+          // Has the default page size
+          expect(entries).to.have.length(200);
+
+          // Cursors are set correctly
+          expect(firstEntry.cursor).to.eql(logEntriesResponse.data.topCursor);
+          expect(lastEntry.cursor).to.eql(logEntriesResponse.data.bottomCursor);
+
+          // Entries fall within range
+          // @kbn/expect doesn't have a `lessOrEqualThan` or `moreOrEqualThan` comparators
+          expect(firstEntry.cursor.time >= EARLIEST_KEY_WITH_DATA.time).to.be(true);
+          expect(lastEntry.cursor.time <= KEY_WITHIN_DATA_RANGE.time).to.be(true);
+        });
+
+        it('Paginates correctly with `after`', async () => {
+          const { body: firstPageBody } = await supertest
+            .post(LOG_ENTRIES_PATH)
+            .set(COMMON_HEADERS)
+            .send(
+              logEntriesRequestRT.encode({
+                sourceId: 'default',
+                startDate: EARLIEST_KEY_WITH_DATA.time,
+                endDate: KEY_WITHIN_DATA_RANGE.time,
+                size: 10,
+              })
+            );
+          const firstPage = pipe(
+            logEntriesResponseRT.decode(firstPageBody),
+            fold(throwErrors(createPlainError), identity)
+          );
+
+          const { body: secondPageBody } = await supertest
+            .post(LOG_ENTRIES_PATH)
+            .set(COMMON_HEADERS)
+            .send(
+              logEntriesRequestRT.encode({
+                sourceId: 'default',
+                startDate: EARLIEST_KEY_WITH_DATA.time,
+                endDate: KEY_WITHIN_DATA_RANGE.time,
+                after: firstPage.data.bottomCursor,
+                size: 10,
+              })
+            );
+          const secondPage = pipe(
+            logEntriesResponseRT.decode(secondPageBody),
+            fold(throwErrors(createPlainError), identity)
+          );
+
+          const { body: bothPagesBody } = await supertest
+            .post(LOG_ENTRIES_PATH)
+            .set(COMMON_HEADERS)
+            .send(
+              logEntriesRequestRT.encode({
+                sourceId: 'default',
+                startDate: EARLIEST_KEY_WITH_DATA.time,
+                endDate: KEY_WITHIN_DATA_RANGE.time,
+                size: 20,
+              })
+            );
+          const bothPages = pipe(
+            logEntriesResponseRT.decode(bothPagesBody),
+            fold(throwErrors(createPlainError), identity)
+          );
+
+          expect(bothPages.data.entries).to.eql([
+            ...firstPage.data.entries,
+            ...secondPage.data.entries,
+          ]);
+
+          expect(bothPages.data.topCursor).to.eql(firstPage.data.topCursor);
+          expect(bothPages.data.bottomCursor).to.eql(secondPage.data.bottomCursor);
+        });
+
+        it('Paginates correctly with `before`', async () => {
+          const { body: lastPageBody } = await supertest
+            .post(LOG_ENTRIES_PATH)
+            .set(COMMON_HEADERS)
+            .send(
+              logEntriesRequestRT.encode({
+                sourceId: 'default',
+                startDate: KEY_WITHIN_DATA_RANGE.time,
+                endDate: LATEST_KEY_WITH_DATA.time,
+                before: 'last',
+                size: 10,
+              })
+            );
+          const lastPage = pipe(
+            logEntriesResponseRT.decode(lastPageBody),
+            fold(throwErrors(createPlainError), identity)
+          );
+
+          const { body: secondToLastPageBody } = await supertest
+            .post(LOG_ENTRIES_PATH)
+            .set(COMMON_HEADERS)
+            .send(
+              logEntriesRequestRT.encode({
+                sourceId: 'default',
+                startDate: KEY_WITHIN_DATA_RANGE.time,
+                endDate: LATEST_KEY_WITH_DATA.time,
+                before: lastPage.data.topCursor,
+                size: 10,
+              })
+            );
+          const secondToLastPage = pipe(
+            logEntriesResponseRT.decode(secondToLastPageBody),
+            fold(throwErrors(createPlainError), identity)
+          );
+
+          const { body: bothPagesBody } = await supertest
+            .post(LOG_ENTRIES_PATH)
+            .set(COMMON_HEADERS)
+            .send(
+              logEntriesRequestRT.encode({
+                sourceId: 'default',
+                startDate: KEY_WITHIN_DATA_RANGE.time,
+                endDate: LATEST_KEY_WITH_DATA.time,
+                before: 'last',
+                size: 20,
+              })
+            );
+          const bothPages = pipe(
+            logEntriesResponseRT.decode(bothPagesBody),
+            fold(throwErrors(createPlainError), identity)
+          );
+
+          expect(bothPages.data.entries).to.eql([
+            ...secondToLastPage.data.entries,
+            ...lastPage.data.entries,
+          ]);
+
+          expect(bothPages.data.topCursor).to.eql(secondToLastPage.data.topCursor);
+          expect(bothPages.data.bottomCursor).to.eql(lastPage.data.bottomCursor);
+        });
+
+        it('centers entries around a point', async () => {
+          const { body } = await supertest
+            .post(LOG_ENTRIES_PATH)
+            .set(COMMON_HEADERS)
+            .send(
+              logEntriesRequestRT.encode({
+                sourceId: 'default',
+                startDate: EARLIEST_KEY_WITH_DATA.time,
+                endDate: LATEST_KEY_WITH_DATA.time,
+                center: KEY_WITHIN_DATA_RANGE,
+              })
+            )
+            .expect(200);
+          const logEntriesResponse = pipe(
+            logEntriesResponseRT.decode(body),
+            fold(throwErrors(createPlainError), identity)
+          );
+
+          const entries = logEntriesResponse.data.entries;
+          const firstEntry = entries[0];
+          const lastEntry = entries[entries.length - 1];
+
+          expect(entries).to.have.length(200);
+          expect(firstEntry.cursor.time >= EARLIEST_KEY_WITH_DATA.time).to.be(true);
+          expect(lastEntry.cursor.time <= LATEST_KEY_WITH_DATA.time).to.be(true);
+        });
+      });
+    });
+
     describe('logEntriesAround', () => {
       describe('with the default source', () => {
         before(() => esArchiver.load('empty_kibana'));
diff --git a/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts b/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts
index 88d7d8716d0f5..66701de2704a6 100644
--- a/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts
+++ b/x-pack/test/api_integration/apis/infra/log_entry_highlights.ts
@@ -8,6 +8,21 @@ import expect from '@kbn/expect';
 import { ascending, pairs } from 'd3-array';
 import gql from 'graphql-tag';
 
+import { pipe } from 'fp-ts/lib/pipeable';
+import { identity } from 'fp-ts/lib/function';
+import { fold } from 'fp-ts/lib/Either';
+
+import {
+  createPlainError,
+  throwErrors,
+} from '../../../../legacy/plugins/infra/common/runtime_types';
+
+import {
+  LOG_ENTRIES_HIGHLIGHTS_PATH,
+  logEntriesHighlightsRequestRT,
+  logEntriesHighlightsResponseRT,
+} from '../../../../legacy/plugins/infra/common/http_api';
+
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { sharedFragments } from '../../../../legacy/plugins/infra/common/graphql/shared';
 import { InfraTimeKey } from '../../../../legacy/plugins/infra/public/graphql/types';
@@ -29,14 +44,151 @@ const KEY_AFTER_END = {
   tiebreaker: 0,
 };
 
+const COMMON_HEADERS = {
+  'kbn-xsrf': 'some-xsrf-token',
+};
+
 export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
+  const supertest = getService('supertest');
   const client = getService('infraOpsGraphQLClient');
 
   describe('log highlight apis', () => {
     before(() => esArchiver.load('infra/simple_logs'));
     after(() => esArchiver.unload('infra/simple_logs'));
 
+    describe('/log_entries/highlights', () => {
+      describe('with the default source', () => {
+        before(() => esArchiver.load('empty_kibana'));
+        after(() => esArchiver.unload('empty_kibana'));
+
+        it('highlights built-in message column', async () => {
+          const { body } = await supertest
+            .post(LOG_ENTRIES_HIGHLIGHTS_PATH)
+            .set(COMMON_HEADERS)
+            .send(
+              logEntriesHighlightsRequestRT.encode({
+                sourceId: 'default',
+                startDate: KEY_BEFORE_START.time,
+                endDate: KEY_AFTER_END.time,
+                highlightTerms: ['message of document 0'],
+              })
+            )
+            .expect(200);
+
+          const logEntriesHighlightsResponse = pipe(
+            logEntriesHighlightsResponseRT.decode(body),
+            fold(throwErrors(createPlainError), identity)
+          );
+
+          expect(logEntriesHighlightsResponse.data).to.have.length(1);
+
+          const data = logEntriesHighlightsResponse.data[0];
+          const entries = data.entries;
+          const firstEntry = entries[0];
+          const lastEntry = entries[entries.length - 1];
+
+          // Finds expected entries
+          expect(entries).to.have.length(10);
+
+          // Cursors are set correctly
+          expect(firstEntry.cursor).to.eql(data.topCursor);
+          expect(lastEntry.cursor).to.eql(data.bottomCursor);
+
+          // Entries fall within range
+          // @kbn/expect doesn't have a `lessOrEqualThan` or `moreOrEqualThan` comparators
+          expect(firstEntry.cursor.time >= KEY_BEFORE_START.time).to.be(true);
+          expect(lastEntry.cursor.time <= KEY_AFTER_END.time).to.be(true);
+
+          // All entries contain the highlights
+          entries.forEach(entry => {
+            entry.columns.forEach(column => {
+              if ('message' in column && 'highlights' in column.message[0]) {
+                expect(column.message[0].highlights).to.eql(['message', 'of', 'document', '0']);
+              }
+            });
+          });
+        });
+
+        // Skipped since it behaves differently in master and in the 7.X branch
+        // See https://github.com/elastic/kibana/issues/49959
+        it.skip('highlights field columns', async () => {
+          const { body } = await supertest
+            .post(LOG_ENTRIES_HIGHLIGHTS_PATH)
+            .set(COMMON_HEADERS)
+            .send(
+              logEntriesHighlightsRequestRT.encode({
+                sourceId: 'default',
+                startDate: KEY_BEFORE_START.time,
+                endDate: KEY_AFTER_END.time,
+                highlightTerms: ['generate_test_data/simple_logs'],
+              })
+            )
+            .expect(200);
+
+          const logEntriesHighlightsResponse = pipe(
+            logEntriesHighlightsResponseRT.decode(body),
+            fold(throwErrors(createPlainError), identity)
+          );
+
+          expect(logEntriesHighlightsResponse.data).to.have.length(1);
+
+          const entries = logEntriesHighlightsResponse.data[0].entries;
+
+          // Finds expected entries
+          expect(entries).to.have.length(50);
+
+          // All entries contain the highlights
+          entries.forEach(entry => {
+            entry.columns.forEach(column => {
+              if ('field' in column && 'highlights' in column && column.highlights.length > 0) {
+                expect(column.highlights).to.eql(['generate_test_data/simple_logs']);
+              }
+            });
+          });
+        });
+
+        it('applies the query as well as the highlight', async () => {
+          const { body } = await supertest
+            .post(LOG_ENTRIES_HIGHLIGHTS_PATH)
+            .set(COMMON_HEADERS)
+            .send(
+              logEntriesHighlightsRequestRT.encode({
+                sourceId: 'default',
+                startDate: KEY_BEFORE_START.time,
+                endDate: KEY_AFTER_END.time,
+                query: JSON.stringify({
+                  multi_match: { query: 'host-a', type: 'phrase', lenient: true },
+                }),
+                highlightTerms: ['message'],
+              })
+            )
+            .expect(200);
+
+          const logEntriesHighlightsResponse = pipe(
+            logEntriesHighlightsResponseRT.decode(body),
+            fold(throwErrors(createPlainError), identity)
+          );
+
+          expect(logEntriesHighlightsResponse.data).to.have.length(1);
+
+          const entries = logEntriesHighlightsResponse.data[0].entries;
+
+          // Finds expected entries
+          expect(entries).to.have.length(25);
+
+          // All entries contain the highlights
+          entries.forEach(entry => {
+            entry.columns.forEach(column => {
+              if ('message' in column && 'highlights' in column.message[0]) {
+                expect(column.message[0].highlights).to.eql(['message', 'message']);
+              }
+            });
+          });
+        });
+      });
+    });
+
     describe('logEntryHighlights', () => {
       describe('with the default source', () => {
         before(() => esArchiver.load('empty_kibana'));
diff --git a/x-pack/test/api_integration/apis/infra/log_item.ts b/x-pack/test/api_integration/apis/infra/log_item.ts
index 2c1fc73de9595..bae2d0ebb891b 100644
--- a/x-pack/test/api_integration/apis/infra/log_item.ts
+++ b/x-pack/test/api_integration/apis/infra/log_item.ts
@@ -5,168 +5,148 @@
  */
 
 import expect from '@kbn/expect';
-import { flyoutItemQuery } from '../../../../legacy/plugins/infra/public/containers/logs/flyout_item.gql_query';
-import { FlyoutItemQuery } from '../../../../legacy/plugins/infra/public/graphql/types';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
+import {
+  LOG_ENTRIES_ITEM_PATH,
+  logEntriesItemRequestRT,
+} from '../../../../legacy/plugins/infra/common/http_api';
+
+const COMMON_HEADERS = {
+  'kbn-xsrf': 'some-xsrf-token',
+};
+
 export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
-  const client = getService('infraOpsGraphQLClient');
-  describe('Log Item GraphQL Endpoint', () => {
+  const supertest = getService('supertest');
+
+  describe('Log Item Endpoint', () => {
     before(() => esArchiver.load('infra/metrics_and_logs'));
     after(() => esArchiver.unload('infra/metrics_and_logs'));
 
-    it('should basically work', () => {
-      return client
-        .query<FlyoutItemQuery.Query>({
-          query: flyoutItemQuery,
-          variables: {
+    it('should basically work', async () => {
+      const { body } = await supertest
+        .post(LOG_ENTRIES_ITEM_PATH)
+        .set(COMMON_HEADERS)
+        .send(
+          logEntriesItemRequestRT.encode({
             sourceId: 'default',
-            itemId: 'yT2Mg2YBh-opCxJv8Vqj',
-          },
-        })
-        .then(resp => {
-          expect(resp.data.source).to.have.property('logItem');
-          const { logItem } = resp.data.source;
-          if (!logItem) {
-            throw new Error('Log item should not be falsey');
-          }
-          expect(logItem).to.have.property('id', 'yT2Mg2YBh-opCxJv8Vqj');
-          expect(logItem).to.have.property('index', 'filebeat-7.0.0-alpha1-2018.10.17');
-          expect(logItem).to.have.property('fields');
-          expect(logItem.fields).to.eql([
-            {
-              field: '@timestamp',
-              value: '2018-10-17T19:42:22.000Z',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: '_id',
-              value: 'yT2Mg2YBh-opCxJv8Vqj',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: '_index',
-              value: 'filebeat-7.0.0-alpha1-2018.10.17',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.body_sent.bytes',
-              value: '1336',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.http_version',
-              value: '1.1',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.method',
-              value: 'GET',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.referrer',
-              value: '-',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.remote_ip',
-              value: '10.128.0.11',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.response_code',
-              value: '200',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.url',
-              value: '/a-fresh-start-will-put-you-on-your-way',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.user_agent.device',
-              value: 'Other',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.user_agent.name',
-              value: 'Other',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.user_agent.os',
-              value: 'Other',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.user_agent.os_name',
-              value: 'Other',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'apache2.access.user_name',
-              value: '-',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'beat.hostname',
-              value: 'demo-stack-apache-01',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'beat.name',
-              value: 'demo-stack-apache-01',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'beat.version',
-              value: '7.0.0-alpha1',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'fileset.module',
-              value: 'apache2',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'fileset.name',
-              value: 'access',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'host.name',
-              value: 'demo-stack-apache-01',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'input.type',
-              value: 'log',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'offset',
-              value: '5497614',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'prospector.type',
-              value: 'log',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'read_timestamp',
-              value: '2018-10-17T19:42:23.160Z',
-              __typename: 'InfraLogItemField',
-            },
-            {
-              field: 'source',
-              value: '/var/log/apache2/access.log',
-              __typename: 'InfraLogItemField',
-            },
-          ]);
-        });
+            id: 'yT2Mg2YBh-opCxJv8Vqj',
+          })
+        )
+        .expect(200);
+
+      const logItem = body.data;
+
+      expect(logItem).to.have.property('id', 'yT2Mg2YBh-opCxJv8Vqj');
+      expect(logItem).to.have.property('index', 'filebeat-7.0.0-alpha1-2018.10.17');
+      expect(logItem).to.have.property('fields');
+      expect(logItem.fields).to.eql([
+        {
+          field: '@timestamp',
+          value: '2018-10-17T19:42:22.000Z',
+        },
+        {
+          field: '_id',
+          value: 'yT2Mg2YBh-opCxJv8Vqj',
+        },
+        {
+          field: '_index',
+          value: 'filebeat-7.0.0-alpha1-2018.10.17',
+        },
+        {
+          field: 'apache2.access.body_sent.bytes',
+          value: '1336',
+        },
+        {
+          field: 'apache2.access.http_version',
+          value: '1.1',
+        },
+        {
+          field: 'apache2.access.method',
+          value: 'GET',
+        },
+        {
+          field: 'apache2.access.referrer',
+          value: '-',
+        },
+        {
+          field: 'apache2.access.remote_ip',
+          value: '10.128.0.11',
+        },
+        {
+          field: 'apache2.access.response_code',
+          value: '200',
+        },
+        {
+          field: 'apache2.access.url',
+          value: '/a-fresh-start-will-put-you-on-your-way',
+        },
+        {
+          field: 'apache2.access.user_agent.device',
+          value: 'Other',
+        },
+        {
+          field: 'apache2.access.user_agent.name',
+          value: 'Other',
+        },
+        {
+          field: 'apache2.access.user_agent.os',
+          value: 'Other',
+        },
+        {
+          field: 'apache2.access.user_agent.os_name',
+          value: 'Other',
+        },
+        {
+          field: 'apache2.access.user_name',
+          value: '-',
+        },
+        {
+          field: 'beat.hostname',
+          value: 'demo-stack-apache-01',
+        },
+        {
+          field: 'beat.name',
+          value: 'demo-stack-apache-01',
+        },
+        {
+          field: 'beat.version',
+          value: '7.0.0-alpha1',
+        },
+        {
+          field: 'fileset.module',
+          value: 'apache2',
+        },
+        {
+          field: 'fileset.name',
+          value: 'access',
+        },
+        {
+          field: 'host.name',
+          value: 'demo-stack-apache-01',
+        },
+        {
+          field: 'input.type',
+          value: 'log',
+        },
+        {
+          field: 'offset',
+          value: '5497614',
+        },
+        {
+          field: 'prospector.type',
+          value: 'log',
+        },
+        {
+          field: 'read_timestamp',
+          value: '2018-10-17T19:42:23.160Z',
+        },
+        {
+          field: 'source',
+          value: '/var/log/apache2/access.log',
+        },
+      ]);
     });
   });
 }
diff --git a/x-pack/test/api_integration/apis/infra/log_summary.ts b/x-pack/test/api_integration/apis/infra/log_summary.ts
index da8c89f674202..017b1c6f7ab45 100644
--- a/x-pack/test/api_integration/apis/infra/log_summary.ts
+++ b/x-pack/test/api_integration/apis/infra/log_summary.ts
@@ -5,76 +5,72 @@
  */
 
 import expect from '@kbn/expect';
+
 import { pairs } from 'd3-array';
-import gql from 'graphql-tag';
+
+import { pipe } from 'fp-ts/lib/pipeable';
+import { identity } from 'fp-ts/lib/function';
+import { fold } from 'fp-ts/lib/Either';
+
+import {
+  createPlainError,
+  throwErrors,
+} from '../../../../legacy/plugins/infra/common/runtime_types';
+
+import {
+  LOG_ENTRIES_SUMMARY_PATH,
+  logEntriesSummaryRequestRT,
+  logEntriesSummaryResponseRT,
+} from '../../../../legacy/plugins/infra/common/http_api/log_entries';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 const EARLIEST_TIME_WITH_DATA = new Date('2018-10-17T19:42:22.000Z').valueOf();
 const LATEST_TIME_WITH_DATA = new Date('2018-10-17T19:57:21.611Z').valueOf();
 
-const logSummaryBetweenQuery = gql`
-  query LogSummary(
-    $sourceId: ID = "default"
-    $start: Float!
-    $end: Float!
-    $bucketSize: Float!
-    $filterQuery: String
-  ) {
-    source(id: $sourceId) {
-      id
-      logSummaryBetween(
-        start: $start
-        end: $end
-        bucketSize: $bucketSize
-        filterQuery: $filterQuery
-      ) {
-        start
-        end
-        buckets {
-          start
-          end
-          entriesCount
-        }
-      }
-    }
-  }
-`;
+const COMMON_HEADERS = {
+  'kbn-xsrf': 'some-xsrf-token',
+};
 
 export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
-  const client = getService('infraOpsGraphQLClient');
+  const supertest = getService('supertest');
 
   describe('logSummaryBetween', () => {
     before(() => esArchiver.load('infra/metrics_and_logs'));
     after(() => esArchiver.unload('infra/metrics_and_logs'));
 
     it('should return empty and non-empty consecutive buckets', async () => {
-      const start = EARLIEST_TIME_WITH_DATA;
-      const end = LATEST_TIME_WITH_DATA + (LATEST_TIME_WITH_DATA - EARLIEST_TIME_WITH_DATA);
-      const bucketSize = Math.ceil((end - start) / 10);
+      const startDate = EARLIEST_TIME_WITH_DATA;
+      const endDate = LATEST_TIME_WITH_DATA + (LATEST_TIME_WITH_DATA - EARLIEST_TIME_WITH_DATA);
+      const bucketSize = Math.ceil((endDate - startDate) / 10);
+
+      const { body } = await supertest
+        .post(LOG_ENTRIES_SUMMARY_PATH)
+        .set(COMMON_HEADERS)
+        .send(
+          logEntriesSummaryRequestRT.encode({
+            sourceId: 'default',
+            startDate,
+            endDate,
+            bucketSize,
+            query: null,
+          })
+        )
+        .expect(200);
 
-      const {
-        data: {
-          source: { logSummaryBetween },
-        },
-      } = await client.query<any>({
-        query: logSummaryBetweenQuery,
-        variables: {
-          start,
-          end,
-          bucketSize,
-        },
-      });
+      const logSummaryResponse = pipe(
+        logEntriesSummaryResponseRT.decode(body),
+        fold(throwErrors(createPlainError), identity)
+      );
 
-      expect(logSummaryBetween).to.have.property('buckets');
-      expect(logSummaryBetween.buckets).to.have.length(10);
+      expect(logSummaryResponse.data.buckets).to.have.length(10);
       expect(
-        logSummaryBetween.buckets.filter((bucket: any) => bucket.entriesCount > 0)
+        logSummaryResponse.data.buckets.filter((bucket: any) => bucket.entriesCount > 0)
       ).to.have.length(5);
       expect(
         pairs(
-          logSummaryBetween.buckets,
+          logSummaryResponse.data.buckets,
           (first: any, second: any) => first.end === second.start
         ).every(pair => pair)
       ).to.equal(true);
diff --git a/x-pack/test/api_integration/apis/infra/logs_without_millis.ts b/x-pack/test/api_integration/apis/infra/logs_without_millis.ts
index 9cddca4c08a14..ce2319259985b 100644
--- a/x-pack/test/api_integration/apis/infra/logs_without_millis.ts
+++ b/x-pack/test/api_integration/apis/infra/logs_without_millis.ts
@@ -8,10 +8,27 @@ import expect from '@kbn/expect';
 import { ascending, pairs } from 'd3-array';
 import gql from 'graphql-tag';
 
+import { pipe } from 'fp-ts/lib/pipeable';
+import { identity } from 'fp-ts/lib/function';
+import { fold } from 'fp-ts/lib/Either';
+
+import {
+  createPlainError,
+  throwErrors,
+} from '../../../../legacy/plugins/infra/common/runtime_types';
+
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { sharedFragments } from '../../../../legacy/plugins/infra/common/graphql/shared';
 import { InfraTimeKey } from '../../../../legacy/plugins/infra/public/graphql/types';
-
+import {
+  LOG_ENTRIES_SUMMARY_PATH,
+  logEntriesSummaryRequestRT,
+  logEntriesSummaryResponseRT,
+} from '../../../../legacy/plugins/infra/common/http_api/log_entries';
+
+const COMMON_HEADERS = {
+  'kbn-xsrf': 'some-xsrf-token',
+};
 const KEY_WITHIN_DATA_RANGE = {
   time: new Date('2019-01-06T00:00:00.000Z').valueOf(),
   tiebreaker: 0,
@@ -28,6 +45,7 @@ const LATEST_KEY_WITH_DATA = {
 export default function({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const client = getService('infraOpsGraphQLClient');
+  const supertest = getService('supertest');
 
   describe('logs without epoch_millis format', () => {
     before(() => esArchiver.load('infra/logs_without_epoch_millis'));
@@ -74,26 +92,31 @@ export default function({ getService }: FtrProviderContext) {
     });
 
     it('logSummaryBetween should return non-empty buckets', async () => {
-      const start = EARLIEST_KEY_WITH_DATA.time;
-      const end = LATEST_KEY_WITH_DATA.time + 1; // the interval end is exclusive
-      const bucketSize = Math.ceil((end - start) / 10);
-
-      const {
-        data: {
-          source: { logSummaryBetween },
-        },
-      } = await client.query<any>({
-        query: logSummaryBetweenQuery,
-        variables: {
-          start,
-          end,
-          bucketSize,
-        },
-      });
+      const startDate = EARLIEST_KEY_WITH_DATA.time;
+      const endDate = LATEST_KEY_WITH_DATA.time + 1; // the interval end is exclusive
+      const bucketSize = Math.ceil((endDate - startDate) / 10);
+
+      const { body } = await supertest
+        .post(LOG_ENTRIES_SUMMARY_PATH)
+        .set(COMMON_HEADERS)
+        .send(
+          logEntriesSummaryRequestRT.encode({
+            sourceId: 'default',
+            startDate,
+            endDate,
+            bucketSize,
+            query: null,
+          })
+        )
+        .expect(200);
+
+      const logSummaryResponse = pipe(
+        logEntriesSummaryResponseRT.decode(body),
+        fold(throwErrors(createPlainError), identity)
+      );
 
-      expect(logSummaryBetween).to.have.property('buckets');
       expect(
-        logSummaryBetween.buckets.filter((bucket: any) => bucket.entriesCount > 0)
+        logSummaryResponse.data.buckets.filter((bucket: any) => bucket.entriesCount > 0)
       ).to.have.length(2);
     });
   });
@@ -161,34 +184,6 @@ const logEntriesBetweenQuery = gql`
   ${sharedFragments.InfraLogEntryFields}
 `;
 
-const logSummaryBetweenQuery = gql`
-  query LogSummary(
-    $sourceId: ID = "default"
-    $start: Float!
-    $end: Float!
-    $bucketSize: Float!
-    $filterQuery: String
-  ) {
-    source(id: $sourceId) {
-      id
-      logSummaryBetween(
-        start: $start
-        end: $end
-        bucketSize: $bucketSize
-        filterQuery: $filterQuery
-      ) {
-        start
-        end
-        buckets {
-          start
-          end
-          entriesCount
-        }
-      }
-    }
-  }
-`;
-
 const isSorted = <Value>(comparator: (first: Value, second: Value) => number) => (
   values: Value[]
 ) => pairs(values, comparator).every(order => order <= 0);
diff --git a/x-pack/test/api_integration/apis/maps/index.js b/x-pack/test/api_integration/apis/maps/index.js
index d2fe97abbe5c5..cba042e3a9c29 100644
--- a/x-pack/test/api_integration/apis/maps/index.js
+++ b/x-pack/test/api_integration/apis/maps/index.js
@@ -4,8 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export default function({ loadTestFile }) {
+export default function({ loadTestFile, getService }) {
+  const esArchiver = getService('esArchiver');
+
   describe('Maps endpoints', () => {
-    loadTestFile(require.resolve('./migrations'));
+    before(async () => {
+      await esArchiver.loadIfNeeded('logstash_functional');
+    });
+
+    describe('', () => {
+      loadTestFile(require.resolve('./index_settings'));
+      loadTestFile(require.resolve('./migrations'));
+    });
   });
 }
diff --git a/x-pack/test/api_integration/apis/maps/index_settings.js b/x-pack/test/api_integration/apis/maps/index_settings.js
new file mode 100644
index 0000000000000..3ec4a4d9f5deb
--- /dev/null
+++ b/x-pack/test/api_integration/apis/maps/index_settings.js
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+
+export default function({ getService }) {
+  const supertest = getService('supertest');
+
+  describe('index settings', () => {
+    it('should return index settings', async () => {
+      const resp = await supertest
+        .get(`/api/maps/indexSettings?indexPatternTitle=logstash*`)
+        .set('kbn-xsrf', 'kibana')
+        .expect(200);
+
+      expect(resp.body.maxResultWindow).to.be(10000);
+      expect(resp.body.maxInnerResultWindow).to.be(100);
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/fixtures/overview.json b/x-pack/test/api_integration/apis/monitoring/cluster/fixtures/overview.json
index be87c3458453c..49e80b244f760 100644
--- a/x-pack/test/api_integration/apis/monitoring/cluster/fixtures/overview.json
+++ b/x-pack/test/api_integration/apis/monitoring/cluster/fixtures/overview.json
@@ -69,7 +69,8 @@
         "nodeExists": null,
         "indexExists": null,
         "typeExists": false,
-        "typeExistsAtAnyTime": false
+        "typeExistsAtAnyTime": false,
+        "usingStructuredLogs": false
       },
       "types": []
     }
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/index_detail.json b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/index_detail.json
index 7aee56e697d9e..04d56d5949d2c 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/index_detail.json
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/index_detail.json
@@ -17,6 +17,7 @@
       "indexPatternExists": false,
       "indexPatternInTimeRangeExists": false,
       "typeExistsAtAnyTime": false,
+      "usingStructuredLogs": false,
       "nodeExists": null,
       "indexExists": false,
       "typeExists": false
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail.json b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail.json
index c2ee3a818fe14..0b8d26558e7fc 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail.json
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/node_detail.json
@@ -18,6 +18,7 @@
       "indexPatternExists": false,
       "indexPatternInTimeRangeExists": false,
       "typeExistsAtAnyTime": false,
+      "usingStructuredLogs": false,
       "nodeExists": false,
       "indexExists": null,
       "typeExists": false
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_green_platinum.json b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_green_platinum.json
index 8f9b427d4466b..9dd55cdd27ede 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_green_platinum.json
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_green_platinum.json
@@ -5757,6 +5757,7 @@
       "indexPatternExists": false,
       "indexPatternInTimeRangeExists": false,
       "typeExistsAtAnyTime": false,
+      "usingStructuredLogs": false,
       "nodeExists": null,
       "indexExists": null,
       "typeExists": false
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_red_platinum.json b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_red_platinum.json
index 8a9405abda817..45f2a7e6581f9 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_red_platinum.json
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_red_platinum.json
@@ -22,6 +22,7 @@
       "indexPatternExists": false,
       "indexPatternInTimeRangeExists": false,
       "typeExistsAtAnyTime": false,
+      "usingStructuredLogs": false,
       "nodeExists": null,
       "indexExists": null,
       "typeExists": false
diff --git a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_shards_relocating.json b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_shards_relocating.json
index 9c340ffb4cd50..415ef5c589c1f 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_shards_relocating.json
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/fixtures/overview_shards_relocating.json
@@ -22,6 +22,7 @@
       "indexPatternExists": false,
       "indexPatternInTimeRangeExists": false,
       "typeExistsAtAnyTime": false,
+      "usingStructuredLogs": false,
       "nodeExists": null,
       "indexExists": null,
       "typeExists": false
diff --git a/x-pack/test/api_integration/apis/monitoring/logs/fixtures/multiple_clusters.json b/x-pack/test/api_integration/apis/monitoring/logs/fixtures/multiple_clusters.json
index 37afc6acec076..442f9cb38ae33 100644
--- a/x-pack/test/api_integration/apis/monitoring/logs/fixtures/multiple_clusters.json
+++ b/x-pack/test/api_integration/apis/monitoring/logs/fixtures/multiple_clusters.json
@@ -5,6 +5,7 @@
     "indexPatternExists": true,
     "indexPatternInTimeRangeExists": true,
     "typeExistsAtAnyTime": true,
+    "usingStructuredLogs": true,
     "typeExists": true,
     "clusterExists": false,
     "nodeExists": null,
diff --git a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json
index ae61d289fe338..802bd0c7fcd74 100644
--- a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json
+++ b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json
@@ -16,6 +16,7 @@
         "indexPatternExists": false,
         "indexPatternInTimeRangeExists": false,
         "typeExistsAtAnyTime": false,
+        "usingStructuredLogs": false,
         "nodeExists": null,
         "indexExists": null,
         "typeExists": false
diff --git a/x-pack/test/api_integration/apis/security/privileges.ts b/x-pack/test/api_integration/apis/security/privileges.ts
index d4c8a3e68c50e..7b1984222404b 100644
--- a/x-pack/test/api_integration/apis/security/privileges.ts
+++ b/x-pack/test/api_integration/apis/security/privileges.ts
@@ -37,6 +37,7 @@ export default function({ getService }: FtrProviderContext) {
               uptime: ['all', 'read'],
               apm: ['all', 'read'],
               siem: ['all', 'read'],
+              endpoint: ['all', 'read'],
             },
             global: ['all', 'read'],
             space: ['all', 'read'],
diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry_local.js b/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
index 0bf24be0fa0b0..ef7124e2864f8 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry_local.js
@@ -79,6 +79,10 @@ export default function({ getService }) {
       expect(stats.stack_stats.kibana.plugins.apm.services_per_agent).to.be.an('object');
       expect(stats.stack_stats.kibana.plugins.infraops.last_24_hours).to.be.an('object');
       expect(stats.stack_stats.kibana.plugins.kql.defaultQueryLanguage).to.be.a('string');
+      expect(stats.stack_stats.kibana.plugins['maps-telemetry'].attributes.timeCaptured).to.be.a(
+        'string'
+      );
+
       expect(stats.stack_stats.kibana.plugins.reporting.enabled).to.be(true);
       expect(stats.stack_stats.kibana.plugins.rollups.index_patterns).to.be.an('object');
       expect(stats.stack_stats.kibana.plugins.spaces.available).to.be(true);
diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
index efc1f9d5e5e40..aa6860b35763f 100644
--- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
+++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts
@@ -7,7 +7,7 @@ import expect from '@kbn/expect';
 import {
   createDashboardEditUrl,
   DashboardConstants,
-} from '../../../../../../src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants';
+} from '../../../../../../src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function({ getPageObjects, getService }: FtrProviderContext) {
@@ -107,7 +107,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('emptyDashboardAddPanelButton', { timeout: 10000 });
+        await testSubjects.existOrFail('emptyDashboardWidget', { timeout: 10000 });
       });
 
       it(`can view existing Dashboard`, async () => {
diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts
index d98ad2db09430..c1197fa7023c5 100644
--- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts
+++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts
@@ -7,7 +7,7 @@ import expect from '@kbn/expect';
 import {
   createDashboardEditUrl,
   DashboardConstants,
-} from '../../../../../../src/legacy/core_plugins/kibana/public/dashboard/dashboard_constants';
+} from '../../../../../../src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function({ getPageObjects, getService }: FtrProviderContext) {
@@ -73,7 +73,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('emptyDashboardAddPanelButton', { timeout: 10000 });
+        await testSubjects.existOrFail('emptyDashboardWidget', { timeout: 10000 });
       });
 
       it(`can view existing Dashboard`, async () => {
diff --git a/x-pack/test/functional/apps/endpoint/feature_controls/endpoint_spaces.ts b/x-pack/test/functional/apps/endpoint/feature_controls/endpoint_spaces.ts
new file mode 100644
index 0000000000000..1d1fb566eb075
--- /dev/null
+++ b/x-pack/test/functional/apps/endpoint/feature_controls/endpoint_spaces.ts
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default function({ getPageObjects, getService }: FtrProviderContext) {
+  const pageObjects = getPageObjects(['common']);
+  const spacesService = getService('spaces');
+  const testSubjects = getService('testSubjects');
+  const appsMenu = getService('appsMenu');
+
+  describe('spaces', () => {
+    describe('space with no features disabled', () => {
+      before(async () => {
+        await spacesService.create({
+          id: 'custom_space',
+          name: 'custom_space',
+          disabledFeatures: [],
+        });
+      });
+
+      after(async () => {
+        await spacesService.delete('custom_space');
+      });
+
+      it('shows endpoint navlink', async () => {
+        await pageObjects.common.navigateToApp('home', {
+          basePath: '/s/custom_space',
+        });
+        const navLinks = (await appsMenu.readLinks()).map(
+          (link: Record<string, string>) => link.text
+        );
+        expect(navLinks).to.contain('EEndpoint');
+      });
+
+      it(`endpoint app shows 'Hello World'`, async () => {
+        await pageObjects.common.navigateToApp('endpoint', {
+          basePath: '/s/custom_space',
+        });
+        await testSubjects.existOrFail('welcomeTitle');
+      });
+
+      it(`endpoint management shows 'Manage Endpoints'`, async () => {
+        await pageObjects.common.navigateToUrlWithBrowserHistory('endpoint', '/management', {
+          basePath: '/s/custom_space',
+          ensureCurrentUrl: false,
+          shouldLoginIfPrompted: false,
+        });
+        await testSubjects.existOrFail('endpointManagement');
+      });
+    });
+
+    describe('space with endpoint disabled', () => {
+      before(async () => {
+        await spacesService.create({
+          id: 'custom_space',
+          name: 'custom_space',
+          disabledFeatures: ['endpoint'],
+        });
+      });
+
+      after(async () => {
+        await spacesService.delete('custom_space');
+      });
+
+      it(`doesn't show endpoint navlink`, async () => {
+        await pageObjects.common.navigateToApp('home', {
+          basePath: '/s/custom_space',
+        });
+        const navLinks = (await appsMenu.readLinks()).map(
+          (link: Record<string, string>) => link.text
+        );
+        expect(navLinks).not.to.contain('EEndpoint');
+      });
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/endpoint/feature_controls/index.ts b/x-pack/test/functional/apps/endpoint/feature_controls/index.ts
new file mode 100644
index 0000000000000..5f7e611fd966c
--- /dev/null
+++ b/x-pack/test/functional/apps/endpoint/feature_controls/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.
+ */
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default function({ loadTestFile }: FtrProviderContext) {
+  describe('feature controls', function() {
+    this.tags('skipFirefox');
+    loadTestFile(require.resolve('./endpoint_spaces'));
+  });
+}
diff --git a/x-pack/test/functional/apps/endpoint/index.ts b/x-pack/test/functional/apps/endpoint/index.ts
new file mode 100644
index 0000000000000..1a0d3e973285b
--- /dev/null
+++ b/x-pack/test/functional/apps/endpoint/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function({ loadTestFile }: FtrProviderContext) {
+  describe('endpoint', function() {
+    this.tags('ciGroup7');
+
+    loadTestFile(require.resolve('./feature_controls'));
+  });
+}
diff --git a/x-pack/test/functional/apps/infra/link_to.ts b/x-pack/test/functional/apps/infra/link_to.ts
index efe60b41badcc..639b65ec5eca8 100644
--- a/x-pack/test/functional/apps/infra/link_to.ts
+++ b/x-pack/test/functional/apps/infra/link_to.ts
@@ -22,8 +22,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         state: undefined,
       };
       const expectedSearchString =
-        "logFilter=(expression:'trace.id:433b4651687e18be2c6c8e3b11f53d09',kind:kuery)&logPosition=(position:(tiebreaker:0,time:1565707203194))&sourceId=default&_g=()";
-      const expectedRedirect = `/logs/stream?${expectedSearchString}`;
+        "logFilter=(expression:'trace.id:433b4651687e18be2c6c8e3b11f53d09',kind:kuery)&logPosition=(position:(tiebreaker:0,time:1565707203194),streamLive:!f)&sourceId=default";
+      const expectedRedirectPath = '/logs/stream?';
 
       await pageObjects.common.navigateToActualUrl(
         'infraOps',
@@ -32,7 +32,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       await retry.tryForTime(5000, async () => {
         const currentUrl = await browser.getCurrentUrl();
         const [, currentHash] = decodeURIComponent(currentUrl).split('#');
-        expect(currentHash).to.contain(expectedRedirect);
+        // Account for unpredictable location of the g parameter in the search string
+        expect(currentHash.slice(0, expectedRedirectPath.length)).to.be(expectedRedirectPath);
+        expect(currentHash.slice(expectedRedirectPath.length)).to.contain(expectedSearchString);
       });
     });
   });
diff --git a/x-pack/test/functional/apps/maps/joins.js b/x-pack/test/functional/apps/maps/joins.js
index cbe7c98cd881d..89a6c6ea82e53 100644
--- a/x-pack/test/functional/apps/maps/joins.js
+++ b/x-pack/test/functional/apps/maps/joins.js
@@ -18,6 +18,9 @@ const EXPECTED_JOIN_VALUES = {
 };
 
 const VECTOR_SOURCE_ID = 'n1t6f';
+const CIRCLE_STYLE_LAYER_INDEX = 0;
+const FILL_STYLE_LAYER_INDEX = 2;
+const LINE_STYLE_LAYER_INDEX = 3;
 
 export default function({ getPageObjects, getService }) {
   const PageObjects = getPageObjects(['maps']);
@@ -82,19 +85,21 @@ export default function({ getPageObjects, getService }) {
       const layersForVectorSource = mapboxStyle.layers.filter(mbLayer => {
         return mbLayer.id.startsWith(VECTOR_SOURCE_ID);
       });
+
       // Color is dynamically obtained from eui source lib
-      const dynamicColor = layersForVectorSource[0].paint['circle-stroke-color'];
+      const dynamicColor =
+        layersForVectorSource[CIRCLE_STYLE_LAYER_INDEX].paint['circle-stroke-color'];
 
       //circle layer for points
-      expect(layersForVectorSource[0]).to.eql(
+      expect(layersForVectorSource[CIRCLE_STYLE_LAYER_INDEX]).to.eql(
         _.set(MAPBOX_STYLES.POINT_LAYER, 'paint.circle-stroke-color', dynamicColor)
       );
 
       //fill layer
-      expect(layersForVectorSource[1]).to.eql(MAPBOX_STYLES.FILL_LAYER);
+      expect(layersForVectorSource[FILL_STYLE_LAYER_INDEX]).to.eql(MAPBOX_STYLES.FILL_LAYER);
 
       //line layer for borders
-      expect(layersForVectorSource[2]).to.eql(
+      expect(layersForVectorSource[LINE_STYLE_LAYER_INDEX]).to.eql(
         _.set(MAPBOX_STYLES.LINE_LAYER, 'paint.line-color', dynamicColor)
       );
     });
diff --git a/x-pack/test/functional/apps/security/rbac_phase1.js b/x-pack/test/functional/apps/security/rbac_phase1.js
index 361bb6dbbdae4..9309e23bdd762 100644
--- a/x-pack/test/functional/apps/security/rbac_phase1.js
+++ b/x-pack/test/functional/apps/security/rbac_phase1.js
@@ -7,7 +7,14 @@
 import expect from '@kbn/expect';
 import { indexBy } from 'lodash';
 export default function({ getService, getPageObjects }) {
-  const PageObjects = getPageObjects(['security', 'settings', 'common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects([
+    'security',
+    'settings',
+    'common',
+    'visualize',
+    'timePicker',
+    'visChart',
+  ]);
   const log = getService('log');
   const esArchiver = getService('esArchiver');
   const browser = getService('browser');
@@ -110,7 +117,7 @@ export default function({ getService, getPageObjects }) {
           '"'
       );
       await PageObjects.timePicker.setDefaultAbsoluteRange();
-      await PageObjects.visualize.waitForVisualization();
+      await PageObjects.visChart.waitForVisualization();
       await PageObjects.visualize.saveVisualizationExpectSuccess(vizName1);
       await PageObjects.security.forceLogout();
     });
diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
index 49ad137b8da6b..d0fdc7c95ea38 100644
--- a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
+++ b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from '@kbn/expect';
-import { VisualizeConstants } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize/visualize_constants';
+import { VisualizeConstants } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize/np_ready/visualize_constants';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function({ getPageObjects, getService }: FtrProviderContext) {
diff --git a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
index 03b6ed8e8e7c5..5ec6bd275133a 100644
--- a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
+++ b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
@@ -7,7 +7,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
-  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);
+  const PageObjects = getPageObjects(['common', 'visualize', 'timePicker', 'visChart']);
   const inspector = getService('inspector');
 
   describe('hybrid index pattern', () => {
@@ -81,7 +81,7 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
       await PageObjects.common.navigateToApp('visualize');
       await PageObjects.visualize.clickVisualizationByName('hybrid_histogram_line_chart');
       await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
-      await PageObjects.visualize.waitForVisualizationRenderingStabilized();
+      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
       await inspector.open();
       await inspector.setTablePageSize(50);
       await inspector.expectTableData(expectedData);
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index 8981c94b83578..17235c61c7d8c 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -56,6 +56,7 @@ export default async function({ readConfigFile }) {
       resolve(__dirname, './apps/cross_cluster_replication'),
       resolve(__dirname, './apps/remote_clusters'),
       resolve(__dirname, './apps/transform'),
+      resolve(__dirname, './apps/endpoint'),
       // This license_management file must be last because it is destructive.
       resolve(__dirname, './apps/license_management'),
     ],
@@ -86,6 +87,7 @@ export default async function({ readConfigFile }) {
         '--xpack.encryptedSavedObjects.encryptionKey="DkdXazszSCYexXqz4YktBGHCRkV6hyNK"',
         '--telemetry.banner=false',
         '--timelion.ui.enabled=true',
+        '--xpack.endpoint.enabled=true',
       ],
     },
     uiSettings: {
@@ -197,6 +199,9 @@ export default async function({ readConfigFile }) {
         pathname: '/app/kibana/',
         hash: '/management/elasticsearch/transform',
       },
+      endpoint: {
+        pathname: '/app/endpoint',
+      },
     },
 
     // choose where esArchiver should load archives from
diff --git a/x-pack/test/functional/es_archives/alerting/data.json b/x-pack/test/functional/es_archives/alerting/data.json
new file mode 100644
index 0000000000000..325d79651196b
--- /dev/null
+++ b/x-pack/test/functional/es_archives/alerting/data.json
@@ -0,0 +1,15 @@
+{
+  "type": "doc",
+  "value": {
+    "index": ".kibana",
+    "id": "action:uuid-actionId",
+    "source": {
+      "type": "action",
+      "action": {
+        "actionTypeId": "test.not-enabled",
+        "name": "an action created before test.not-enabled was disabled",
+        "config": {}
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/endpoint/endpoints/data.json.gz b/x-pack/test/functional/es_archives/endpoint/endpoints/data.json.gz
new file mode 100644
index 0000000000000..fda46096e1ab2
Binary files /dev/null and b/x-pack/test/functional/es_archives/endpoint/endpoints/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/endpoint/endpoints/mappings.json b/x-pack/test/functional/es_archives/endpoint/endpoints/mappings.json
new file mode 100644
index 0000000000000..9544d05d70600
--- /dev/null
+++ b/x-pack/test/functional/es_archives/endpoint/endpoints/mappings.json
@@ -0,0 +1,104 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+    },
+    "index": "endpoint-agent",
+    "mappings": {
+      "properties": {
+        "created_at": {
+          "type": "date"
+        },
+        "endpoint": {
+          "properties": {
+            "active_directory_distinguished_name": {
+              "type": "text"
+            },
+            "active_directory_hostname": {
+              "type": "text"
+            },
+            "domain": {
+              "type": "text"
+            },
+            "is_base_image": {
+              "type": "boolean"
+            },
+            "isolation": {
+              "properties": {
+                "status": {
+                  "type": "boolean"
+                }
+              }
+            },
+            "policy": {
+              "properties": {
+                "id": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "keyword": {
+                      "ignore_above": 256,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "text"
+                }
+              }
+            },
+            "sensor": {
+              "properties": {
+                "persistence": {
+                  "type": "boolean"
+                },
+                "status": {
+                  "type": "object"
+                }
+              }
+            },
+            "upgrade": {
+              "type": "object"
+            }
+          }
+        },
+        "host": {
+          "properties": {
+            "hostname": {
+              "type": "text"
+            },
+            "ip": {
+              "ignore_above": 256,
+              "type": "keyword"
+            },
+            "mac_address": {
+              "type": "text"
+            },
+            "name": {
+              "type": "text"
+            },
+            "os": {
+              "properties": {
+                "full": {
+                  "type": "text"
+                },
+                "name": {
+                  "type": "text"
+                }
+              }
+            }
+          }
+        },
+        "machine_id": {
+          "type": "keyword"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/reporting/es_archives/bwc/6_2/data.json.gz b/x-pack/test/functional/es_archives/reporting/bwc/6_2/data.json.gz
similarity index 100%
rename from x-pack/test/reporting/es_archives/bwc/6_2/data.json.gz
rename to x-pack/test/functional/es_archives/reporting/bwc/6_2/data.json.gz
diff --git a/x-pack/test/reporting/es_archives/bwc/6_2/mappings.json b/x-pack/test/functional/es_archives/reporting/bwc/6_2/mappings.json
similarity index 100%
rename from x-pack/test/reporting/es_archives/bwc/6_2/mappings.json
rename to x-pack/test/functional/es_archives/reporting/bwc/6_2/mappings.json
diff --git a/x-pack/test/reporting/es_archives/bwc/6_3/data.json.gz b/x-pack/test/functional/es_archives/reporting/bwc/6_3/data.json.gz
similarity index 100%
rename from x-pack/test/reporting/es_archives/bwc/6_3/data.json.gz
rename to x-pack/test/functional/es_archives/reporting/bwc/6_3/data.json.gz
diff --git a/x-pack/test/reporting/es_archives/bwc/6_3/mappings.json b/x-pack/test/functional/es_archives/reporting/bwc/6_3/mappings.json
similarity index 100%
rename from x-pack/test/reporting/es_archives/bwc/6_3/mappings.json
rename to x-pack/test/functional/es_archives/reporting/bwc/6_3/mappings.json
diff --git a/x-pack/test/functional/es_archives/reporting/ecommerce/data.json.gz b/x-pack/test/functional/es_archives/reporting/ecommerce/data.json.gz
new file mode 100644
index 0000000000000..b38981c03417e
Binary files /dev/null and b/x-pack/test/functional/es_archives/reporting/ecommerce/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/reporting/ecommerce/mappings.json b/x-pack/test/functional/es_archives/reporting/ecommerce/mappings.json
new file mode 100644
index 0000000000000..9e3275bd40bfe
--- /dev/null
+++ b/x-pack/test/functional/es_archives/reporting/ecommerce/mappings.json
@@ -0,0 +1,1226 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+    },
+    "index": "ecommerce",
+    "mappings": {
+      "properties": {
+        "category": {
+          "fields": {
+            "keyword": {
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "currency": {
+          "type": "keyword"
+        },
+        "customer_birth_date": {
+          "type": "date"
+        },
+        "customer_first_name": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "customer_full_name": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "customer_gender": {
+          "type": "keyword"
+        },
+        "customer_id": {
+          "type": "keyword"
+        },
+        "customer_last_name": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "customer_phone": {
+          "type": "keyword"
+        },
+        "day_of_week": {
+          "type": "keyword"
+        },
+        "day_of_week_i": {
+          "type": "integer"
+        },
+        "email": {
+          "type": "keyword"
+        },
+        "geoip": {
+          "properties": {
+            "city_name": {
+              "type": "keyword"
+            },
+            "continent_name": {
+              "type": "keyword"
+            },
+            "country_iso_code": {
+              "type": "keyword"
+            },
+            "location": {
+              "type": "geo_point"
+            },
+            "region_name": {
+              "type": "keyword"
+            }
+          }
+        },
+        "manufacturer": {
+          "fields": {
+            "keyword": {
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "order_date": {
+          "type": "date"
+        },
+        "order_id": {
+          "type": "keyword"
+        },
+        "products": {
+          "properties": {
+            "_id": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "base_price": {
+              "type": "half_float"
+            },
+            "base_unit_price": {
+              "type": "half_float"
+            },
+            "category": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "created_on": {
+              "type": "date"
+            },
+            "discount_amount": {
+              "type": "half_float"
+            },
+            "discount_percentage": {
+              "type": "half_float"
+            },
+            "manufacturer": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "min_price": {
+              "type": "half_float"
+            },
+            "price": {
+              "type": "half_float"
+            },
+            "product_id": {
+              "type": "long"
+            },
+            "product_name": {
+              "analyzer": "english",
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "quantity": {
+              "type": "integer"
+            },
+            "sku": {
+              "type": "keyword"
+            },
+            "tax_amount": {
+              "type": "half_float"
+            },
+            "taxful_price": {
+              "type": "half_float"
+            },
+            "taxless_price": {
+              "type": "half_float"
+            },
+            "unit_discount_amount": {
+              "type": "half_float"
+            }
+          }
+        },
+        "sku": {
+          "type": "keyword"
+        },
+        "taxful_total_price": {
+          "type": "half_float"
+        },
+        "taxless_total_price": {
+          "type": "half_float"
+        },
+        "total_quantity": {
+          "type": "integer"
+        },
+        "total_unique_products": {
+          "type": "integer"
+        },
+        "type": {
+          "type": "keyword"
+        },
+        "user": {
+          "type": "keyword"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
+
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".kibana": {
+      }
+    },
+    "index": ".kibana_1",
+    "mappings": {
+      "_meta": {
+        "migrationMappingPropertyHashes": {
+          "apm-telemetry": "07ee1939fa4302c62ddc052ec03fed90",
+          "canvas-element": "7390014e1091044523666d97247392fc",
+          "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
+          "config": "87aca8fdb053154f11383fce3dbf3edf",
+          "dashboard": "d00f614b29a80360e1190193fd333bab",
+          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
+          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
+          "index-pattern": "66eccb05066c5a89924f48a9e9736499",
+          "infrastructure-ui-source": "ddc0ecb18383f6b26101a2fadb2dab0c",
+          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
+          "map": "23d7aa4a720d4938ccde3983f87bd58d",
+          "maps-telemetry": "a4229f8b16a6820c6d724b7e0c1f729d",
+          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
+          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
+          "namespace": "2f4316de49999235636386fe51dc06c1",
+          "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
+          "references": "7997cf5a56cc02bdc9c93361bde732b0",
+          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
+          "search": "181661168bbadd1eff5902361e2a0d5c",
+          "server": "ec97f1c5da1a19609a60874e5af1100c",
+          "siem-ui-timeline": "1f6f0860ad7bc0dba3e42467ca40470d",
+          "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
+          "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
+          "space": "25de8c2deec044392922989cfcf24c54",
+          "telemetry": "e1c8bc94e443aefd9458932cc0697a4d",
+          "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
+          "type": "2f4316de49999235636386fe51dc06c1",
+          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
+          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
+          "upgrade-assistant-reindex-operation": "a53a20fe086b72c9a86da3cc12dad8a6",
+          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
+          "url": "c7f66a0df8b1b52f17c28c4adb111105",
+          "visualization": "52d7a13ad68a150c4525b292d23e12cc"
+        }
+      },
+      "dynamic": "strict",
+      "properties": {
+        "apm-telemetry": {
+          "properties": {
+            "has_any_services": {
+              "type": "boolean"
+            },
+            "services_per_agent": {
+              "properties": {
+                "dotnet": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "go": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "java": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "js-base": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "nodejs": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "python": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "ruby": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "rum-js": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "canvas-element": {
+          "dynamic": "false",
+          "properties": {
+            "@created": {
+              "type": "date"
+            },
+            "@timestamp": {
+              "type": "date"
+            },
+            "content": {
+              "type": "text"
+            },
+            "help": {
+              "type": "text"
+            },
+            "image": {
+              "type": "text"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "canvas-workpad": {
+          "dynamic": "false",
+          "properties": {
+            "@created": {
+              "type": "date"
+            },
+            "@timestamp": {
+              "type": "date"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "config": {
+          "dynamic": "true",
+          "properties": {
+            "buildNum": {
+              "type": "keyword"
+            },
+            "dateFormat:tz": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "defaultIndex": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "dashboard": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "optionsJSON": {
+              "type": "text"
+            },
+            "panelsJSON": {
+              "type": "text"
+            },
+            "refreshInterval": {
+              "properties": {
+                "display": {
+                  "type": "keyword"
+                },
+                "pause": {
+                  "type": "boolean"
+                },
+                "section": {
+                  "type": "integer"
+                },
+                "value": {
+                  "type": "integer"
+                }
+              }
+            },
+            "timeFrom": {
+              "type": "keyword"
+            },
+            "timeRestore": {
+              "type": "boolean"
+            },
+            "timeTo": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "file-upload-telemetry": {
+          "properties": {
+            "filesUploadedTotalCount": {
+              "type": "long"
+            }
+          }
+        },
+        "graph-workspace": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "numLinks": {
+              "type": "integer"
+            },
+            "numVertices": {
+              "type": "integer"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "wsState": {
+              "type": "text"
+            }
+          }
+        },
+        "index-pattern": {
+          "properties": {
+            "fieldFormatMap": {
+              "type": "text"
+            },
+            "fields": {
+              "type": "text"
+            },
+            "intervalName": {
+              "type": "keyword"
+            },
+            "notExpandable": {
+              "type": "boolean"
+            },
+            "sourceFilters": {
+              "type": "text"
+            },
+            "timeFieldName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "typeMeta": {
+              "type": "keyword"
+            }
+          }
+        },
+        "infrastructure-ui-source": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "fields": {
+              "properties": {
+                "container": {
+                  "type": "keyword"
+                },
+                "host": {
+                  "type": "keyword"
+                },
+                "pod": {
+                  "type": "keyword"
+                },
+                "tiebreaker": {
+                  "type": "keyword"
+                },
+                "timestamp": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "logAlias": {
+              "type": "keyword"
+            },
+            "logColumns": {
+              "properties": {
+                "fieldColumn": {
+                  "properties": {
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "messageColumn": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "timestampColumn": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                }
+              },
+              "type": "nested"
+            },
+            "metricAlias": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "text"
+            }
+          }
+        },
+        "kql-telemetry": {
+          "properties": {
+            "optInCount": {
+              "type": "long"
+            },
+            "optOutCount": {
+              "type": "long"
+            }
+          }
+        },
+        "map": {
+          "properties": {
+            "bounds": {
+              "type": "geo_shape"
+            },
+            "description": {
+              "type": "text"
+            },
+            "layerListJSON": {
+              "type": "text"
+            },
+            "mapStateJSON": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "maps-telemetry": {
+          "properties": {
+            "attributesPerMap": {
+              "properties": {
+                "dataSourcesCount": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "emsVectorLayersCount": {
+                  "dynamic": "true",
+                  "type": "object"
+                },
+                "layerTypesCount": {
+                  "dynamic": "true",
+                  "type": "object"
+                },
+                "layersCount": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "mapsTotalCount": {
+              "type": "long"
+            },
+            "timeCaptured": {
+              "type": "date"
+            }
+          }
+        },
+        "migrationVersion": {
+          "dynamic": "true",
+          "properties": {
+            "index-pattern": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "space": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "ml-telemetry": {
+          "properties": {
+            "file_data_visualizer": {
+              "properties": {
+                "index_creation_count": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "namespace": {
+          "type": "keyword"
+        },
+        "query": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "filters": {
+              "enabled": false,
+              "type": "object"
+            },
+            "query": {
+              "properties": {
+                "language": {
+                  "type": "keyword"
+                },
+                "query": {
+                  "index": false,
+                  "type": "keyword"
+                }
+              }
+            },
+            "timefilter": {
+              "enabled": false,
+              "type": "object"
+            },
+            "title": {
+              "type": "text"
+            }
+          }
+        },
+        "references": {
+          "properties": {
+            "id": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          },
+          "type": "nested"
+        },
+        "sample-data-telemetry": {
+          "properties": {
+            "installCount": {
+              "type": "long"
+            },
+            "unInstallCount": {
+              "type": "long"
+            }
+          }
+        },
+        "search": {
+          "properties": {
+            "columns": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "sort": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "uuid": {
+              "type": "keyword"
+            }
+          }
+        },
+        "siem-ui-timeline": {
+          "properties": {
+            "columns": {
+              "properties": {
+                "aggregatable": {
+                  "type": "boolean"
+                },
+                "category": {
+                  "type": "keyword"
+                },
+                "columnHeaderType": {
+                  "type": "keyword"
+                },
+                "description": {
+                  "type": "text"
+                },
+                "example": {
+                  "type": "text"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "indexes": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "text"
+                },
+                "placeholder": {
+                  "type": "text"
+                },
+                "searchable": {
+                  "type": "boolean"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "dataProviders": {
+              "properties": {
+                "and": {
+                  "properties": {
+                    "enabled": {
+                      "type": "boolean"
+                    },
+                    "excluded": {
+                      "type": "boolean"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "kqlQuery": {
+                      "type": "text"
+                    },
+                    "name": {
+                      "type": "text"
+                    },
+                    "queryMatch": {
+                      "properties": {
+                        "displayField": {
+                          "type": "text"
+                        },
+                        "displayValue": {
+                          "type": "text"
+                        },
+                        "field": {
+                          "type": "text"
+                        },
+                        "operator": {
+                          "type": "text"
+                        },
+                        "value": {
+                          "type": "text"
+                        }
+                      }
+                    }
+                  }
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "excluded": {
+                  "type": "boolean"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "kqlQuery": {
+                  "type": "text"
+                },
+                "name": {
+                  "type": "text"
+                },
+                "queryMatch": {
+                  "properties": {
+                    "displayField": {
+                      "type": "text"
+                    },
+                    "displayValue": {
+                      "type": "text"
+                    },
+                    "field": {
+                      "type": "text"
+                    },
+                    "operator": {
+                      "type": "text"
+                    },
+                    "value": {
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "dateRange": {
+              "properties": {
+                "end": {
+                  "type": "date"
+                },
+                "start": {
+                  "type": "date"
+                }
+              }
+            },
+            "description": {
+              "type": "text"
+            },
+            "favorite": {
+              "properties": {
+                "favoriteDate": {
+                  "type": "date"
+                },
+                "fullName": {
+                  "type": "text"
+                },
+                "keySearch": {
+                  "type": "text"
+                },
+                "userName": {
+                  "type": "text"
+                }
+              }
+            },
+            "kqlMode": {
+              "type": "keyword"
+            },
+            "kqlQuery": {
+              "properties": {
+                "filterQuery": {
+                  "properties": {
+                    "kuery": {
+                      "properties": {
+                        "expression": {
+                          "type": "text"
+                        },
+                        "kind": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "serializedQuery": {
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "sort": {
+              "properties": {
+                "columnId": {
+                  "type": "keyword"
+                },
+                "sortDirection": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "title": {
+              "type": "text"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "siem-ui-timeline-note": {
+          "properties": {
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "eventId": {
+              "type": "keyword"
+            },
+            "note": {
+              "type": "text"
+            },
+            "timelineId": {
+              "type": "keyword"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "siem-ui-timeline-pinned-event": {
+          "properties": {
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "eventId": {
+              "type": "keyword"
+            },
+            "timelineId": {
+              "type": "keyword"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "space": {
+          "properties": {
+            "_reserved": {
+              "type": "boolean"
+            },
+            "color": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "disabledFeatures": {
+              "type": "keyword"
+            },
+            "initials": {
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "telemetry": {
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            }
+          }
+        },
+        "timelion-sheet": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "timelion_chart_height": {
+              "type": "integer"
+            },
+            "timelion_columns": {
+              "type": "integer"
+            },
+            "timelion_interval": {
+              "type": "keyword"
+            },
+            "timelion_other_interval": {
+              "type": "keyword"
+            },
+            "timelion_rows": {
+              "type": "integer"
+            },
+            "timelion_sheet": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "type": {
+          "type": "keyword"
+        },
+        "ui-metric": {
+          "properties": {
+            "count": {
+              "type": "integer"
+            }
+          }
+        },
+        "updated_at": {
+          "type": "date"
+        },
+        "upgrade-assistant-reindex-operation": {
+          "dynamic": "true",
+          "properties": {
+            "indexName": {
+              "type": "keyword"
+            },
+            "status": {
+              "type": "integer"
+            }
+          }
+        },
+        "upgrade-assistant-telemetry": {
+          "properties": {
+            "features": {
+              "properties": {
+                "deprecation_logging": {
+                  "properties": {
+                    "enabled": {
+                      "null_value": true,
+                      "type": "boolean"
+                    }
+                  }
+                }
+              }
+            },
+            "ui_open": {
+              "properties": {
+                "cluster": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "indices": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "overview": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            },
+            "ui_reindex": {
+              "properties": {
+                "close": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "open": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "start": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "stop": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "url": {
+          "properties": {
+            "accessCount": {
+              "type": "long"
+            },
+            "accessDate": {
+              "type": "date"
+            },
+            "createDate": {
+              "type": "date"
+            },
+            "url": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "visualization": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "savedSearchRefName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "visState": {
+              "type": "text"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana/data.json.gz b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana/data.json.gz
new file mode 100644
index 0000000000000..c2050b3399ab7
Binary files /dev/null and b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana/mappings.json b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana/mappings.json
new file mode 100644
index 0000000000000..cf647f5c53212
--- /dev/null
+++ b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana/mappings.json
@@ -0,0 +1,1455 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".kibana": {
+      }
+    },
+    "index": ".kibana_1",
+    "mappings": {
+      "_meta": {
+        "migrationMappingPropertyHashes": {
+          "action": "c0c235fba02ebd2a2412bcda79009b58",
+          "action_task_params": "a9d49f184ee89641044be0ca2950fa3a",
+          "alert": "d49f9b8d1277c6004506eec20dc0b108",
+          "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd",
+          "apm-services-telemetry": "07ee1939fa4302c62ddc052ec03fed90",
+          "canvas-element": "7390014e1091044523666d97247392fc",
+          "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
+          "config": "87aca8fdb053154f11383fce3dbf3edf",
+          "dashboard": "d00f614b29a80360e1190193fd333bab",
+          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
+          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
+          "index-pattern": "66eccb05066c5a89924f48a9e9736499",
+          "infrastructure-ui-source": "ddc0ecb18383f6b26101a2fadb2dab0c",
+          "inventory-view": "84b320fd67209906333ffce261128462",
+          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
+          "lens": "21c3ea0763beb1ecb0162529706b88c5",
+          "lens-ui-telemetry": "509bfa5978586998e05f9e303c07a327",
+          "map": "23d7aa4a720d4938ccde3983f87bd58d",
+          "maps-telemetry": "a4229f8b16a6820c6d724b7e0c1f729d",
+          "metrics-explorer-view": "53c5365793677328df0ccb6138bf3cdd",
+          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
+          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
+          "namespace": "2f4316de49999235636386fe51dc06c1",
+          "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
+          "references": "7997cf5a56cc02bdc9c93361bde732b0",
+          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
+          "search": "181661168bbadd1eff5902361e2a0d5c",
+          "server": "ec97f1c5da1a19609a60874e5af1100c",
+          "siem-ui-timeline": "6485ab095be8d15246667b98a1a34295",
+          "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
+          "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
+          "space": "c5ca8acafa0beaa4d08d014a97b6bc6b",
+          "telemetry": "358ffaa88ba34a97d55af0933a117de4",
+          "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
+          "type": "2f4316de49999235636386fe51dc06c1",
+          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
+          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
+          "upgrade-assistant-reindex-operation": "a53a20fe086b72c9a86da3cc12dad8a6",
+          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
+          "url": "c7f66a0df8b1b52f17c28c4adb111105",
+          "visualization": "52d7a13ad68a150c4525b292d23e12cc"
+        }
+      },
+      "dynamic": "strict",
+      "properties": {
+        "action": {
+          "properties": {
+            "actionTypeId": {
+              "type": "keyword"
+            },
+            "config": {
+              "enabled": false,
+              "type": "object"
+            },
+            "name": {
+              "type": "text"
+            },
+            "secrets": {
+              "type": "binary"
+            }
+          }
+        },
+        "action_task_params": {
+          "properties": {
+            "actionId": {
+              "type": "keyword"
+            },
+            "apiKey": {
+              "type": "binary"
+            },
+            "params": {
+              "enabled": false,
+              "type": "object"
+            }
+          }
+        },
+        "alert": {
+          "properties": {
+            "actions": {
+              "properties": {
+                "actionRef": {
+                  "type": "keyword"
+                },
+                "actionTypeId": {
+                  "type": "keyword"
+                },
+                "group": {
+                  "type": "keyword"
+                },
+                "params": {
+                  "enabled": false,
+                  "type": "object"
+                }
+              },
+              "type": "nested"
+            },
+            "alertTypeId": {
+              "type": "keyword"
+            },
+            "apiKey": {
+              "type": "binary"
+            },
+            "apiKeyOwner": {
+              "type": "keyword"
+            },
+            "createdBy": {
+              "type": "keyword"
+            },
+            "enabled": {
+              "type": "boolean"
+            },
+            "interval": {
+              "type": "keyword"
+            },
+            "muteAll": {
+              "type": "boolean"
+            },
+            "mutedInstanceIds": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "text"
+            },
+            "params": {
+              "enabled": false,
+              "type": "object"
+            },
+            "scheduledTaskId": {
+              "type": "keyword"
+            },
+            "tags": {
+              "type": "keyword"
+            },
+            "throttle": {
+              "type": "keyword"
+            },
+            "updatedBy": {
+              "type": "keyword"
+            }
+          }
+        },
+        "apm-indices": {
+          "properties": {
+            "apm_oss": {
+              "properties": {
+                "errorIndices": {
+                  "type": "keyword"
+                },
+                "metricsIndices": {
+                  "type": "keyword"
+                },
+                "onboardingIndices": {
+                  "type": "keyword"
+                },
+                "sourcemapIndices": {
+                  "type": "keyword"
+                },
+                "spanIndices": {
+                  "type": "keyword"
+                },
+                "transactionIndices": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "apm-services-telemetry": {
+          "properties": {
+            "has_any_services": {
+              "type": "boolean"
+            },
+            "services_per_agent": {
+              "properties": {
+                "dotnet": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "go": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "java": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "js-base": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "nodejs": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "python": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "ruby": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "rum-js": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "apm-telemetry": {
+          "properties": {
+            "has_any_services": {
+              "type": "boolean"
+            },
+            "services_per_agent": {
+              "properties": {
+                "dotnet": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "go": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "java": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "js-base": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "nodejs": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "python": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "ruby": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "rum-js": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "canvas-element": {
+          "dynamic": "false",
+          "properties": {
+            "@created": {
+              "type": "date"
+            },
+            "@timestamp": {
+              "type": "date"
+            },
+            "content": {
+              "type": "text"
+            },
+            "help": {
+              "type": "text"
+            },
+            "image": {
+              "type": "text"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "canvas-workpad": {
+          "dynamic": "false",
+          "properties": {
+            "@created": {
+              "type": "date"
+            },
+            "@timestamp": {
+              "type": "date"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "config": {
+          "dynamic": "true",
+          "properties": {
+            "buildNum": {
+              "type": "keyword"
+            },
+            "dateFormat:tz": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "defaultIndex": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "dashboard": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "optionsJSON": {
+              "type": "text"
+            },
+            "panelsJSON": {
+              "type": "text"
+            },
+            "refreshInterval": {
+              "properties": {
+                "display": {
+                  "type": "keyword"
+                },
+                "pause": {
+                  "type": "boolean"
+                },
+                "section": {
+                  "type": "integer"
+                },
+                "value": {
+                  "type": "integer"
+                }
+              }
+            },
+            "timeFrom": {
+              "type": "keyword"
+            },
+            "timeRestore": {
+              "type": "boolean"
+            },
+            "timeTo": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "file-upload-telemetry": {
+          "properties": {
+            "filesUploadedTotalCount": {
+              "type": "long"
+            }
+          }
+        },
+        "graph-workspace": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "numLinks": {
+              "type": "integer"
+            },
+            "numVertices": {
+              "type": "integer"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "wsState": {
+              "type": "text"
+            }
+          }
+        },
+        "index-pattern": {
+          "properties": {
+            "fieldFormatMap": {
+              "type": "text"
+            },
+            "fields": {
+              "type": "text"
+            },
+            "intervalName": {
+              "type": "keyword"
+            },
+            "notExpandable": {
+              "type": "boolean"
+            },
+            "sourceFilters": {
+              "type": "text"
+            },
+            "timeFieldName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "typeMeta": {
+              "type": "keyword"
+            }
+          }
+        },
+        "infrastructure-ui-source": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "fields": {
+              "properties": {
+                "container": {
+                  "type": "keyword"
+                },
+                "host": {
+                  "type": "keyword"
+                },
+                "pod": {
+                  "type": "keyword"
+                },
+                "tiebreaker": {
+                  "type": "keyword"
+                },
+                "timestamp": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "logAlias": {
+              "type": "keyword"
+            },
+            "logColumns": {
+              "properties": {
+                "fieldColumn": {
+                  "properties": {
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "messageColumn": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "timestampColumn": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                }
+              },
+              "type": "nested"
+            },
+            "metricAlias": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "text"
+            }
+          }
+        },
+        "inventory-view": {
+          "properties": {
+            "autoBounds": {
+              "type": "boolean"
+            },
+            "autoReload": {
+              "type": "boolean"
+            },
+            "boundsOverride": {
+              "properties": {
+                "max": {
+                  "type": "integer"
+                },
+                "min": {
+                  "type": "integer"
+                }
+              }
+            },
+            "customOptions": {
+              "properties": {
+                "field": {
+                  "type": "keyword"
+                },
+                "text": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "filterQuery": {
+              "properties": {
+                "expression": {
+                  "type": "keyword"
+                },
+                "kind": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "groupBy": {
+              "properties": {
+                "field": {
+                  "type": "keyword"
+                },
+                "label": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "metric": {
+              "properties": {
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "nodeType": {
+              "type": "keyword"
+            },
+            "time": {
+              "type": "integer"
+            },
+            "view": {
+              "type": "keyword"
+            }
+          }
+        },
+        "kql-telemetry": {
+          "properties": {
+            "optInCount": {
+              "type": "long"
+            },
+            "optOutCount": {
+              "type": "long"
+            }
+          }
+        },
+        "lens": {
+          "properties": {
+            "expression": {
+              "index": false,
+              "type": "keyword"
+            },
+            "state": {
+              "type": "flattened"
+            },
+            "title": {
+              "type": "text"
+            },
+            "visualizationType": {
+              "type": "keyword"
+            }
+          }
+        },
+        "lens-ui-telemetry": {
+          "properties": {
+            "count": {
+              "type": "integer"
+            },
+            "date": {
+              "type": "date"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          }
+        },
+        "map": {
+          "properties": {
+            "bounds": {
+              "type": "geo_shape"
+            },
+            "description": {
+              "type": "text"
+            },
+            "layerListJSON": {
+              "type": "text"
+            },
+            "mapStateJSON": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "maps-telemetry": {
+          "properties": {
+            "attributesPerMap": {
+              "properties": {
+                "dataSourcesCount": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "emsVectorLayersCount": {
+                  "dynamic": "true",
+                  "type": "object"
+                },
+                "layerTypesCount": {
+                  "dynamic": "true",
+                  "type": "object"
+                },
+                "layersCount": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "mapsTotalCount": {
+              "type": "long"
+            },
+            "timeCaptured": {
+              "type": "date"
+            }
+          }
+        },
+        "metrics-explorer-view": {
+          "properties": {
+            "chartOptions": {
+              "properties": {
+                "stack": {
+                  "type": "boolean"
+                },
+                "type": {
+                  "type": "keyword"
+                },
+                "yAxisMode": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "currentTimerange": {
+              "properties": {
+                "from": {
+                  "type": "keyword"
+                },
+                "interval": {
+                  "type": "keyword"
+                },
+                "to": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "options": {
+              "properties": {
+                "aggregation": {
+                  "type": "keyword"
+                },
+                "filterQuery": {
+                  "type": "keyword"
+                },
+                "groupBy": {
+                  "type": "keyword"
+                },
+                "limit": {
+                  "type": "integer"
+                },
+                "metrics": {
+                  "properties": {
+                    "aggregation": {
+                      "type": "keyword"
+                    },
+                    "color": {
+                      "type": "keyword"
+                    },
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "label": {
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "nested"
+                }
+              }
+            }
+          }
+        },
+        "migrationVersion": {
+          "dynamic": "true",
+          "properties": {
+            "dashboard": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "index-pattern": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "search": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "space": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "ml-telemetry": {
+          "properties": {
+            "file_data_visualizer": {
+              "properties": {
+                "index_creation_count": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "namespace": {
+          "type": "keyword"
+        },
+        "query": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "filters": {
+              "enabled": false,
+              "type": "object"
+            },
+            "query": {
+              "properties": {
+                "language": {
+                  "type": "keyword"
+                },
+                "query": {
+                  "index": false,
+                  "type": "keyword"
+                }
+              }
+            },
+            "timefilter": {
+              "enabled": false,
+              "type": "object"
+            },
+            "title": {
+              "type": "text"
+            }
+          }
+        },
+        "references": {
+          "properties": {
+            "id": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          },
+          "type": "nested"
+        },
+        "sample-data-telemetry": {
+          "properties": {
+            "installCount": {
+              "type": "long"
+            },
+            "unInstallCount": {
+              "type": "long"
+            }
+          }
+        },
+        "search": {
+          "properties": {
+            "columns": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "sort": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "uuid": {
+              "type": "keyword"
+            }
+          }
+        },
+        "siem-ui-timeline": {
+          "properties": {
+            "columns": {
+              "properties": {
+                "aggregatable": {
+                  "type": "boolean"
+                },
+                "category": {
+                  "type": "keyword"
+                },
+                "columnHeaderType": {
+                  "type": "keyword"
+                },
+                "description": {
+                  "type": "text"
+                },
+                "example": {
+                  "type": "text"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "indexes": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "text"
+                },
+                "placeholder": {
+                  "type": "text"
+                },
+                "searchable": {
+                  "type": "boolean"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "dataProviders": {
+              "properties": {
+                "and": {
+                  "properties": {
+                    "enabled": {
+                      "type": "boolean"
+                    },
+                    "excluded": {
+                      "type": "boolean"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "kqlQuery": {
+                      "type": "text"
+                    },
+                    "name": {
+                      "type": "text"
+                    },
+                    "queryMatch": {
+                      "properties": {
+                        "displayField": {
+                          "type": "text"
+                        },
+                        "displayValue": {
+                          "type": "text"
+                        },
+                        "field": {
+                          "type": "text"
+                        },
+                        "operator": {
+                          "type": "text"
+                        },
+                        "value": {
+                          "type": "text"
+                        }
+                      }
+                    }
+                  }
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "excluded": {
+                  "type": "boolean"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "kqlQuery": {
+                  "type": "text"
+                },
+                "name": {
+                  "type": "text"
+                },
+                "queryMatch": {
+                  "properties": {
+                    "displayField": {
+                      "type": "text"
+                    },
+                    "displayValue": {
+                      "type": "text"
+                    },
+                    "field": {
+                      "type": "text"
+                    },
+                    "operator": {
+                      "type": "text"
+                    },
+                    "value": {
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "dateRange": {
+              "properties": {
+                "end": {
+                  "type": "date"
+                },
+                "start": {
+                  "type": "date"
+                }
+              }
+            },
+            "description": {
+              "type": "text"
+            },
+            "favorite": {
+              "properties": {
+                "favoriteDate": {
+                  "type": "date"
+                },
+                "fullName": {
+                  "type": "text"
+                },
+                "keySearch": {
+                  "type": "text"
+                },
+                "userName": {
+                  "type": "text"
+                }
+              }
+            },
+            "filters": {
+              "properties": {
+                "exists": {
+                  "type": "text"
+                },
+                "match_all": {
+                  "type": "text"
+                },
+                "meta": {
+                  "properties": {
+                    "alias": {
+                      "type": "text"
+                    },
+                    "controlledBy": {
+                      "type": "text"
+                    },
+                    "disabled": {
+                      "type": "boolean"
+                    },
+                    "field": {
+                      "type": "text"
+                    },
+                    "formattedValue": {
+                      "type": "text"
+                    },
+                    "index": {
+                      "type": "keyword"
+                    },
+                    "key": {
+                      "type": "keyword"
+                    },
+                    "negate": {
+                      "type": "boolean"
+                    },
+                    "params": {
+                      "type": "text"
+                    },
+                    "type": {
+                      "type": "keyword"
+                    },
+                    "value": {
+                      "type": "text"
+                    }
+                  }
+                },
+                "missing": {
+                  "type": "text"
+                },
+                "query": {
+                  "type": "text"
+                },
+                "range": {
+                  "type": "text"
+                },
+                "script": {
+                  "type": "text"
+                }
+              }
+            },
+            "kqlMode": {
+              "type": "keyword"
+            },
+            "kqlQuery": {
+              "properties": {
+                "filterQuery": {
+                  "properties": {
+                    "kuery": {
+                      "properties": {
+                        "expression": {
+                          "type": "text"
+                        },
+                        "kind": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "serializedQuery": {
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "savedQueryId": {
+              "type": "keyword"
+            },
+            "sort": {
+              "properties": {
+                "columnId": {
+                  "type": "keyword"
+                },
+                "sortDirection": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "title": {
+              "type": "text"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "siem-ui-timeline-note": {
+          "properties": {
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "eventId": {
+              "type": "keyword"
+            },
+            "note": {
+              "type": "text"
+            },
+            "timelineId": {
+              "type": "keyword"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "siem-ui-timeline-pinned-event": {
+          "properties": {
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "eventId": {
+              "type": "keyword"
+            },
+            "timelineId": {
+              "type": "keyword"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "space": {
+          "properties": {
+            "_reserved": {
+              "type": "boolean"
+            },
+            "color": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "disabledFeatures": {
+              "type": "keyword"
+            },
+            "imageUrl": {
+              "index": false,
+              "type": "text"
+            },
+            "initials": {
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "telemetry": {
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "lastReported": {
+              "type": "date"
+            },
+            "lastVersionChecked": {
+              "ignore_above": 256,
+              "type": "keyword"
+            },
+            "sendUsageFrom": {
+              "ignore_above": 256,
+              "type": "keyword"
+            },
+            "userHasSeenNotice": {
+              "type": "boolean"
+            }
+          }
+        },
+        "timelion-sheet": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "timelion_chart_height": {
+              "type": "integer"
+            },
+            "timelion_columns": {
+              "type": "integer"
+            },
+            "timelion_interval": {
+              "type": "keyword"
+            },
+            "timelion_other_interval": {
+              "type": "keyword"
+            },
+            "timelion_rows": {
+              "type": "integer"
+            },
+            "timelion_sheet": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "type": {
+          "type": "keyword"
+        },
+        "ui-metric": {
+          "properties": {
+            "count": {
+              "type": "integer"
+            }
+          }
+        },
+        "updated_at": {
+          "type": "date"
+        },
+        "upgrade-assistant-reindex-operation": {
+          "dynamic": "true",
+          "properties": {
+            "indexName": {
+              "type": "keyword"
+            },
+            "status": {
+              "type": "integer"
+            }
+          }
+        },
+        "upgrade-assistant-telemetry": {
+          "properties": {
+            "features": {
+              "properties": {
+                "deprecation_logging": {
+                  "properties": {
+                    "enabled": {
+                      "null_value": true,
+                      "type": "boolean"
+                    }
+                  }
+                }
+              }
+            },
+            "ui_open": {
+              "properties": {
+                "cluster": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "indices": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "overview": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            },
+            "ui_reindex": {
+              "properties": {
+                "close": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "open": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "start": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "stop": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "url": {
+          "properties": {
+            "accessCount": {
+              "type": "long"
+            },
+            "accessDate": {
+              "type": "date"
+            },
+            "createDate": {
+              "type": "date"
+            },
+            "url": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "visualization": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "savedSearchRefName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "visState": {
+              "type": "text"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/reporting/es_archives/historic/data.json.gz b/x-pack/test/functional/es_archives/reporting/historic/data.json.gz
similarity index 100%
rename from x-pack/test/reporting/es_archives/historic/data.json.gz
rename to x-pack/test/functional/es_archives/reporting/historic/data.json.gz
diff --git a/x-pack/test/reporting/es_archives/historic/mappings.json b/x-pack/test/functional/es_archives/reporting/historic/mappings.json
similarity index 100%
rename from x-pack/test/reporting/es_archives/historic/mappings.json
rename to x-pack/test/functional/es_archives/reporting/historic/mappings.json
diff --git a/x-pack/test/functional/page_objects/reporting_page.js b/x-pack/test/functional/page_objects/reporting_page.js
index d28234803ca29..acbc1dd100e5d 100644
--- a/x-pack/test/functional/page_objects/reporting_page.js
+++ b/x-pack/test/functional/page_objects/reporting_page.js
@@ -7,6 +7,13 @@
 import { parse } from 'url';
 import http from 'http';
 
+/*
+ * NOTE: Reporting is a service, not an app. The page objects that are
+ * important for generating reports belong to the apps that integrate with the
+ * Reporting service. Eventually, this file should be dissolved across the
+ * apps that need it for testing their integration.
+ * Issue: https://github.com/elastic/kibana/issues/52927
+ */
 export function ReportingPageProvider({ getService, getPageObjects }) {
   const retry = getService('retry');
   const log = getService('log');
@@ -22,7 +29,7 @@ export function ReportingPageProvider({ getService, getPageObjects }) {
       log.debug('ReportingPage:initTests');
       await PageObjects.settings.navigateTo();
       await esArchiver.loadIfNeeded('../../functional/es_archives/logstash_functional');
-      await esArchiver.load('historic');
+      await esArchiver.load('reporting/historic');
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'logstash-*',
       });
diff --git a/x-pack/test/functional/services/monitoring/no_data.js b/x-pack/test/functional/services/monitoring/no_data.js
index a3b578d8d5ae4..9cb383c8c6259 100644
--- a/x-pack/test/functional/services/monitoring/no_data.js
+++ b/x-pack/test/functional/services/monitoring/no_data.js
@@ -4,13 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export function MonitoringNoDataProvider({ getService }) {
+export function MonitoringNoDataProvider({ getService, getPageObjects }) {
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
+  const PageObjects = getPageObjects(['common']);
 
   return new (class NoData {
     async enableMonitoring() {
-      await testSubjects.click('useInternalCollection');
+      // Cloud currently does not support Metricbeat-based collection
+      // so the UI does not give the user a choice between the two collection
+      // methods. So if we're on cloud, do not try and switch to internal collection
+      // as it's already the default
+      if (!(await PageObjects.common.isCloud())) {
+        await testSubjects.click('useInternalCollection');
+      }
       await testSubjects.click('enableCollectionEnabled');
     }
 
diff --git a/x-pack/test/licensing_plugin/apis/changes.ts b/x-pack/test/licensing_plugin/apis/changes.ts
deleted file mode 100644
index cf4fecfa32d94..0000000000000
--- a/x-pack/test/licensing_plugin/apis/changes.ts
+++ /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 expect from '@kbn/expect';
-import { FtrProviderContext } from '../services';
-import { PublicLicenseJSON } from '../../../plugins/licensing/server';
-
-const delay = (ms: number) => new Promise(res => setTimeout(res, ms));
-
-export default function({ getService, getPageObjects }: FtrProviderContext) {
-  const supertest = getService('supertest');
-  const esSupertestWithoutAuth = getService('esSupertestWithoutAuth');
-  const security = getService('security');
-  const PageObjects = getPageObjects(['common', 'security']);
-  const testSubjects = getService('testSubjects');
-
-  const scenario = {
-    async setup() {
-      await security.role.create('license_manager-role', {
-        elasticsearch: {
-          cluster: ['all'],
-        },
-        kibana: [
-          {
-            base: ['all'],
-            spaces: ['*'],
-          },
-        ],
-      });
-
-      await security.user.create('license_manager_user', {
-        password: 'license_manager_user-password',
-        roles: ['license_manager-role'],
-        full_name: 'license_manager user',
-      });
-
-      // ensure we're logged out so we can login as the appropriate users
-      await PageObjects.security.forceLogout();
-      await PageObjects.security.login('license_manager_user', 'license_manager_user-password');
-    },
-
-    async teardown() {
-      await security.role.delete('license_manager-role');
-    },
-
-    async startBasic() {
-      const response = await esSupertestWithoutAuth
-        .post('/_license/start_basic?acknowledge=true')
-        .auth('license_manager_user', 'license_manager_user-password')
-        .expect(200);
-
-      expect(response.body.basic_was_started).to.be(true);
-    },
-
-    async startTrial() {
-      const response = await esSupertestWithoutAuth
-        .post('/_license/start_trial?acknowledge=true')
-        .auth('license_manager_user', 'license_manager_user-password')
-        .expect(200);
-
-      expect(response.body.trial_was_started).to.be(true);
-    },
-
-    async deleteLicense() {
-      const response = await esSupertestWithoutAuth
-        .delete('/_license')
-        .auth('license_manager_user', 'license_manager_user-password')
-        .expect(200);
-
-      expect(response.body.acknowledged).to.be(true);
-    },
-
-    async getLicense(): Promise<PublicLicenseJSON> {
-      // > --xpack.licensing.api_polling_frequency set in test config
-      // to wait for Kibana server to re-fetch the license from Elasticsearch
-      await delay(1000);
-
-      const { body } = await supertest.get('/api/licensing/info').expect(200);
-      return body;
-    },
-  };
-
-  describe('changes in license types', () => {
-    after(async () => {
-      await scenario.startBasic();
-    });
-
-    it('provides changes in license types', async () => {
-      await scenario.setup();
-      const initialLicense = await scenario.getLicense();
-      expect(initialLicense.license?.type).to.be('basic');
-      // security enabled explicitly in test config
-      expect(initialLicense.features?.security).to.eql({
-        isAvailable: true,
-        isEnabled: true,
-      });
-
-      const {
-        body: legacyInitialLicense,
-        headers: legacyInitialLicenseHeaders,
-      } = await supertest.get('/api/xpack/v1/info').expect(200);
-
-      expect(legacyInitialLicense.license?.type).to.be('basic');
-      expect(legacyInitialLicense.features).to.have.property('security');
-      expect(legacyInitialLicenseHeaders['kbn-xpack-sig']).to.be.a('string');
-
-      // license hasn't changed
-      const refetchedLicense = await scenario.getLicense();
-      expect(refetchedLicense.license?.type).to.be('basic');
-      expect(refetchedLicense.signature).to.be(initialLicense.signature);
-
-      const {
-        body: legacyRefetchedLicense,
-        headers: legacyRefetchedLicenseHeaders,
-      } = await supertest.get('/api/xpack/v1/info').expect(200);
-
-      expect(legacyRefetchedLicense.license?.type).to.be('basic');
-      expect(legacyRefetchedLicenseHeaders['kbn-xpack-sig']).to.be(
-        legacyInitialLicenseHeaders['kbn-xpack-sig']
-      );
-
-      // server allows to request trial only once.
-      // other attempts will throw 403
-      await scenario.startTrial();
-      const trialLicense = await scenario.getLicense();
-      expect(trialLicense.license?.type).to.be('trial');
-      expect(trialLicense.signature).to.not.be(initialLicense.signature);
-
-      expect(trialLicense.features?.security).to.eql({
-        isAvailable: true,
-        isEnabled: true,
-      });
-
-      const { body: legacyTrialLicense, headers: legacyTrialLicenseHeaders } = await supertest
-        .get('/api/xpack/v1/info')
-        .expect(200);
-
-      expect(legacyTrialLicense.license?.type).to.be('trial');
-      expect(legacyTrialLicense.features).to.have.property('security');
-      expect(legacyTrialLicenseHeaders['kbn-xpack-sig']).to.not.be(
-        legacyInitialLicenseHeaders['kbn-xpack-sig']
-      );
-
-      await scenario.startBasic();
-      const basicLicense = await scenario.getLicense();
-      expect(basicLicense.license?.type).to.be('basic');
-      expect(basicLicense.signature).not.to.be(initialLicense.signature);
-
-      expect(basicLicense.features?.security).to.eql({
-        isAvailable: true,
-        isEnabled: true,
-      });
-
-      const { body: legacyBasicLicense, headers: legacyBasicLicenseHeaders } = await supertest
-        .get('/api/xpack/v1/info')
-        .expect(200);
-      expect(legacyBasicLicense.license?.type).to.be('basic');
-      expect(legacyBasicLicense.features).to.have.property('security');
-      expect(legacyBasicLicenseHeaders['kbn-xpack-sig']).to.not.be(
-        legacyInitialLicenseHeaders['kbn-xpack-sig']
-      );
-
-      await scenario.deleteLicense();
-      const inactiveLicense = await scenario.getLicense();
-      expect(inactiveLicense.signature).to.not.be(initialLicense.signature);
-      expect(inactiveLicense).to.not.have.property('license');
-      expect(inactiveLicense.features?.security).to.eql({
-        isAvailable: false,
-        isEnabled: true,
-      });
-      // banner shown only when license expired not just deleted
-      await testSubjects.missingOrFail('licenseExpiredBanner');
-    });
-  });
-}
diff --git a/x-pack/test/licensing_plugin/apis/index.ts b/x-pack/test/licensing_plugin/apis/index.ts
deleted file mode 100644
index fbc0449dcd8fc..0000000000000
--- a/x-pack/test/licensing_plugin/apis/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 { FtrProviderContext } from '../services';
-
-export default function({ loadTestFile }: FtrProviderContext) {
-  describe('Licensing plugin', function() {
-    this.tags('ciGroup2');
-    loadTestFile(require.resolve('./info'));
-    loadTestFile(require.resolve('./header'));
-
-    // MUST BE LAST! CHANGES LICENSE TYPE!
-    loadTestFile(require.resolve('./changes'));
-  });
-}
diff --git a/x-pack/test/licensing_plugin/config.legacy.ts b/x-pack/test/licensing_plugin/config.legacy.ts
new file mode 100644
index 0000000000000..27dc3df9944ad
--- /dev/null
+++ b/x-pack/test/licensing_plugin/config.legacy.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+
+export default async function({ readConfigFile }: FtrConfigProviderContext) {
+  const commonConfig = await readConfigFile(require.resolve('./config'));
+
+  return {
+    ...commonConfig.getAll(),
+    testFiles: [require.resolve('./legacy')],
+  };
+}
diff --git a/x-pack/test/licensing_plugin/config.public.ts b/x-pack/test/licensing_plugin/config.public.ts
new file mode 100644
index 0000000000000..42209aa49bcb4
--- /dev/null
+++ b/x-pack/test/licensing_plugin/config.public.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 path from 'path';
+import { KIBANA_ROOT } from '@kbn/test';
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+
+export default async function({ readConfigFile }: FtrConfigProviderContext) {
+  const commonConfig = await readConfigFile(require.resolve('./config'));
+
+  return {
+    ...commonConfig.getAll(),
+    testFiles: [require.resolve('./public')],
+    kbnTestServer: {
+      serverArgs: [
+        ...commonConfig.get('kbnTestServer.serverArgs'),
+
+        // Required to load new platform plugin provider via `--plugin-path` flag.
+        '--env.name=development',
+        `--plugin-path=${path.resolve(
+          KIBANA_ROOT,
+          'test/plugin_functional/plugins/core_provider_plugin'
+        )}`,
+      ],
+    },
+  };
+}
diff --git a/x-pack/test/licensing_plugin/config.ts b/x-pack/test/licensing_plugin/config.ts
index 9a83a6f6b5a0b..60d44cbd4c47f 100644
--- a/x-pack/test/licensing_plugin/config.ts
+++ b/x-pack/test/licensing_plugin/config.ts
@@ -22,7 +22,7 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
   };
 
   return {
-    testFiles: [require.resolve('./apis')],
+    testFiles: [require.resolve('./server')],
     servers,
     services,
     pageObjects,
@@ -43,7 +43,7 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
       ...functionalTestsConfig.get('kbnTestServer'),
       serverArgs: [
         ...functionalTestsConfig.get('kbnTestServer.serverArgs'),
-        '--xpack.licensing.api_polling_frequency=300',
+        '--xpack.licensing.api_polling_frequency=100',
       ],
     },
 
diff --git a/x-pack/test/licensing_plugin/legacy/index.ts b/x-pack/test/licensing_plugin/legacy/index.ts
new file mode 100644
index 0000000000000..5c45b8f097baf
--- /dev/null
+++ b/x-pack/test/licensing_plugin/legacy/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 { FtrProviderContext } from '../services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ loadTestFile }: FtrProviderContext) {
+  describe('Legacy licensing plugin', function() {
+    this.tags('ciGroup2');
+    // MUST BE LAST! CHANGES LICENSE TYPE!
+    loadTestFile(require.resolve('./updates'));
+  });
+}
diff --git a/x-pack/test/licensing_plugin/legacy/updates.ts b/x-pack/test/licensing_plugin/legacy/updates.ts
new file mode 100644
index 0000000000000..efd5df5d14511
--- /dev/null
+++ b/x-pack/test/licensing_plugin/legacy/updates.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../services';
+import { createScenario } from '../scenario';
+import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+
+// eslint-disable-next-line import/no-default-export
+export default function(ftrContext: FtrProviderContext) {
+  const { getService } = ftrContext;
+  const supertest = getService('supertest');
+  const testSubjects = getService('testSubjects');
+
+  const scenario = createScenario(ftrContext);
+
+  describe('changes in license types', () => {
+    after(async () => {
+      await scenario.teardown();
+    });
+
+    it('provides changes in license types', async () => {
+      await scenario.setup();
+      await scenario.waitForPluginToDetectLicenseUpdate();
+
+      const {
+        body: legacyInitialLicense,
+        headers: legacyInitialLicenseHeaders,
+      } = await supertest.get('/api/xpack/v1/info').expect(200);
+
+      expect(legacyInitialLicense.license?.type).to.be('basic');
+      expect(legacyInitialLicense.features).to.have.property('security');
+      expect(legacyInitialLicenseHeaders['kbn-xpack-sig']).to.be.a('string');
+
+      await scenario.startTrial();
+      await scenario.waitForPluginToDetectLicenseUpdate();
+
+      const { body: legacyTrialLicense, headers: legacyTrialLicenseHeaders } = await supertest
+        .get('/api/xpack/v1/info')
+        .expect(200);
+
+      expect(legacyTrialLicense.license?.type).to.be('trial');
+      expect(legacyTrialLicense.features).to.have.property('security');
+      expect(legacyTrialLicenseHeaders['kbn-xpack-sig']).to.not.be(
+        legacyInitialLicenseHeaders['kbn-xpack-sig']
+      );
+
+      await scenario.startBasic();
+      await scenario.waitForPluginToDetectLicenseUpdate();
+
+      const { body: legacyBasicLicense, headers: legacyBasicLicenseHeaders } = await supertest
+        .get('/api/xpack/v1/info')
+        .expect(200);
+      expect(legacyBasicLicense.license?.type).to.be('basic');
+      expect(legacyBasicLicense.features).to.have.property('security');
+      expect(legacyBasicLicenseHeaders['kbn-xpack-sig']).to.not.be(
+        legacyInitialLicenseHeaders['kbn-xpack-sig']
+      );
+
+      // banner shown only when license expired not just deleted
+      await testSubjects.missingOrFail('licenseExpiredBanner');
+    });
+  });
+}
diff --git a/x-pack/test/licensing_plugin/public/index.ts b/x-pack/test/licensing_plugin/public/index.ts
new file mode 100644
index 0000000000000..3e1445d9a4aab
--- /dev/null
+++ b/x-pack/test/licensing_plugin/public/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 { FtrProviderContext } from '../services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ loadTestFile }: FtrProviderContext) {
+  describe('Licensing plugin public client', function() {
+    this.tags('ciGroup2');
+    // MUST BE LAST! CHANGES LICENSE TYPE!
+    loadTestFile(require.resolve('./updates'));
+  });
+}
diff --git a/x-pack/test/licensing_plugin/public/updates.ts b/x-pack/test/licensing_plugin/public/updates.ts
new file mode 100644
index 0000000000000..2e750dcea1a59
--- /dev/null
+++ b/x-pack/test/licensing_plugin/public/updates.ts
@@ -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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../services';
+import { LicensingPluginSetup } from '../../../plugins/licensing/public';
+import { createScenario } from '../scenario';
+import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+
+// eslint-disable-next-line import/no-default-export
+export default function(ftrContext: FtrProviderContext) {
+  const { getService } = ftrContext;
+  const testSubjects = getService('testSubjects');
+  const browser = getService('browser');
+
+  const scenario = createScenario(ftrContext);
+
+  describe('changes in license types', () => {
+    after(async () => {
+      await scenario.teardown();
+    });
+
+    it('provides changes in license types', async () => {
+      await scenario.setup();
+      await scenario.waitForPluginToDetectLicenseUpdate();
+
+      expect(
+        await browser.executeAsync(async (cb: Function) => {
+          const { setup, testUtils } = window.__coreProvider;
+          // this call enforces signature check to detect license update
+          // and causes license re-fetch
+          await setup.core.http.get('/');
+          await testUtils.delay(500);
+
+          const licensing: LicensingPluginSetup = setup.plugins.licensing;
+          licensing.license$.subscribe(license => cb(license.type));
+        })
+      ).to.be('basic');
+
+      // license hasn't changed
+      await scenario.waitForPluginToDetectLicenseUpdate();
+
+      expect(
+        await browser.executeAsync(async (cb: Function) => {
+          const { setup, testUtils } = window.__coreProvider;
+          // this call enforces signature check to detect license update
+          // and causes license re-fetch
+          await setup.core.http.get('/');
+          await testUtils.delay(500);
+
+          const licensing: LicensingPluginSetup = setup.plugins.licensing;
+          licensing.license$.subscribe(license => cb(license.type));
+        })
+      ).to.be('basic');
+
+      await scenario.startTrial();
+      await scenario.waitForPluginToDetectLicenseUpdate();
+
+      expect(
+        await browser.executeAsync(async (cb: Function) => {
+          const { setup, testUtils } = window.__coreProvider;
+          // this call enforces signature check to detect license update
+          // and causes license re-fetch
+          await setup.core.http.get('/');
+          await testUtils.delay(500);
+
+          const licensing: LicensingPluginSetup = setup.plugins.licensing;
+          licensing.license$.subscribe(license => cb(license.type));
+        })
+      ).to.be('trial');
+
+      await scenario.startBasic();
+      await scenario.waitForPluginToDetectLicenseUpdate();
+
+      expect(
+        await browser.executeAsync(async (cb: Function) => {
+          const { setup, testUtils } = window.__coreProvider;
+          // this call enforces signature check to detect license update
+          // and causes license re-fetch
+          await setup.core.http.get('/');
+          await testUtils.delay(500);
+
+          const licensing: LicensingPluginSetup = setup.plugins.licensing;
+          licensing.license$.subscribe(license => cb(license.type));
+        })
+      ).to.be('basic');
+
+      // banner shown only when license expired not just deleted
+      await testSubjects.missingOrFail('licenseExpiredBanner');
+    });
+  });
+}
diff --git a/x-pack/test/licensing_plugin/scenario.ts b/x-pack/test/licensing_plugin/scenario.ts
new file mode 100644
index 0000000000000..46837dfc1be91
--- /dev/null
+++ b/x-pack/test/licensing_plugin/scenario.ts
@@ -0,0 +1,91 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import expect from '@kbn/expect';
+import { FtrProviderContext } from './services';
+import { PublicLicenseJSON } from '../../plugins/licensing/server';
+import '../../../test/plugin_functional/plugins/core_provider_plugin/types';
+
+const delay = (ms: number) => new Promise(res => setTimeout(res, ms));
+
+export function createScenario({ getService, getPageObjects }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esSupertestWithoutAuth = getService('esSupertestWithoutAuth');
+  const security = getService('security');
+  const PageObjects = getPageObjects(['common', 'security']);
+
+  const scenario = {
+    async setup() {
+      await security.role.create('license_manager-role', {
+        elasticsearch: {
+          cluster: ['all'],
+        },
+        kibana: [
+          {
+            base: ['all'],
+            spaces: ['*'],
+          },
+        ],
+      });
+
+      await security.user.create('license_manager_user', {
+        password: 'license_manager_user-password',
+        roles: ['license_manager-role'],
+        full_name: 'license_manager user',
+      });
+
+      // ensure we're logged out so we can login as the appropriate users
+      await PageObjects.security.logout();
+      await PageObjects.security.login('license_manager_user', 'license_manager_user-password');
+    },
+
+    // make sure a license is present, otherwise the security is not available anymore.
+    async teardown() {
+      await security.role.delete('license_manager-role');
+      await security.user.delete('license_manager_user');
+    },
+
+    // elasticsearch allows to downgrade a license only once. other attempts will throw 403.
+    async startBasic() {
+      const response = await esSupertestWithoutAuth
+        .post('/_license/start_basic?acknowledge=true')
+        .auth('license_manager_user', 'license_manager_user-password')
+        .expect(200);
+
+      expect(response.body.basic_was_started).to.be(true);
+    },
+
+    // elasticsearch allows to request trial only once. other attempts will throw 403.
+    async startTrial() {
+      const response = await esSupertestWithoutAuth
+        .post('/_license/start_trial?acknowledge=true')
+        .auth('license_manager_user', 'license_manager_user-password')
+        .expect(200);
+
+      expect(response.body.trial_was_started).to.be(true);
+    },
+
+    async deleteLicense() {
+      const response = await esSupertestWithoutAuth
+        .delete('/_license')
+        .auth('license_manager_user', 'license_manager_user-password')
+        .expect(200);
+
+      expect(response.body.acknowledged).to.be(true);
+    },
+
+    async getLicense(): Promise<PublicLicenseJSON> {
+      const { body } = await supertest.get('/api/licensing/info').expect(200);
+      return body;
+    },
+
+    async waitForPluginToDetectLicenseUpdate() {
+      // > --xpack.licensing.api_polling_frequency set in test config
+      // to wait for Kibana server to re-fetch the license from Elasticsearch
+      await delay(500);
+    },
+  };
+  return scenario;
+}
diff --git a/x-pack/test/licensing_plugin/apis/header.ts b/x-pack/test/licensing_plugin/server/header.ts
similarity index 93%
rename from x-pack/test/licensing_plugin/apis/header.ts
rename to x-pack/test/licensing_plugin/server/header.ts
index 8d95054feaaf2..d2073e8773f18 100644
--- a/x-pack/test/licensing_plugin/apis/header.ts
+++ b/x-pack/test/licensing_plugin/server/header.ts
@@ -7,6 +7,7 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../services';
 
+// eslint-disable-next-line import/no-default-export
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
diff --git a/x-pack/test/licensing_plugin/server/index.ts b/x-pack/test/licensing_plugin/server/index.ts
new file mode 100644
index 0000000000000..374bfcc0aa6b4
--- /dev/null
+++ b/x-pack/test/licensing_plugin/server/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../services';
+
+// eslint-disable-next-line import/no-default-export
+export default function({ loadTestFile }: FtrProviderContext) {
+  describe('Licensing plugin server client', function() {
+    this.tags('ciGroup2');
+    loadTestFile(require.resolve('./info'));
+    loadTestFile(require.resolve('./header'));
+
+    // MUST BE LAST! CHANGES LICENSE TYPE!
+    loadTestFile(require.resolve('./updates'));
+  });
+}
diff --git a/x-pack/test/licensing_plugin/apis/info.ts b/x-pack/test/licensing_plugin/server/info.ts
similarity index 95%
rename from x-pack/test/licensing_plugin/apis/info.ts
rename to x-pack/test/licensing_plugin/server/info.ts
index 7ec009d85cd09..cce042c718b7b 100644
--- a/x-pack/test/licensing_plugin/apis/info.ts
+++ b/x-pack/test/licensing_plugin/server/info.ts
@@ -7,6 +7,7 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../services';
 
+// eslint-disable-next-line import/no-default-export
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
diff --git a/x-pack/test/licensing_plugin/server/updates.ts b/x-pack/test/licensing_plugin/server/updates.ts
new file mode 100644
index 0000000000000..37edb78608a68
--- /dev/null
+++ b/x-pack/test/licensing_plugin/server/updates.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../services';
+import { createScenario } from '../scenario';
+import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+
+// eslint-disable-next-line import/no-default-export
+export default function(ftrContext: FtrProviderContext) {
+  const { getService } = ftrContext;
+  const testSubjects = getService('testSubjects');
+
+  const scenario = createScenario(ftrContext);
+
+  describe('changes in license types', () => {
+    after(async () => {
+      await scenario.teardown();
+    });
+
+    it('provides changes in license types', async () => {
+      await scenario.setup();
+      await scenario.waitForPluginToDetectLicenseUpdate();
+      const initialLicense = await scenario.getLicense();
+      expect(initialLicense.license?.type).to.be('basic');
+      // security enabled explicitly in test config
+      expect(initialLicense.features?.security).to.eql({
+        isAvailable: true,
+        isEnabled: true,
+      });
+
+      // license hasn't changed
+      await scenario.waitForPluginToDetectLicenseUpdate();
+      const refetchedLicense = await scenario.getLicense();
+      expect(refetchedLicense.license?.type).to.be('basic');
+      expect(refetchedLicense.signature).to.be(initialLicense.signature);
+
+      await scenario.startTrial();
+      await scenario.waitForPluginToDetectLicenseUpdate();
+      const trialLicense = await scenario.getLicense();
+      expect(trialLicense.license?.type).to.be('trial');
+      expect(trialLicense.signature).to.not.be(initialLicense.signature);
+
+      expect(trialLicense.features?.security).to.eql({
+        isAvailable: true,
+        isEnabled: true,
+      });
+
+      await scenario.startBasic();
+      await scenario.waitForPluginToDetectLicenseUpdate();
+      const basicLicense = await scenario.getLicense();
+      expect(basicLicense.license?.type).to.be('basic');
+      expect(basicLicense.signature).not.to.be(initialLicense.signature);
+
+      expect(basicLicense.features?.security).to.eql({
+        isAvailable: true,
+        isEnabled: true,
+      });
+
+      // banner shown only when license expired not just deleted
+      await testSubjects.missingOrFail('licenseExpiredBanner');
+    });
+  });
+}
diff --git a/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.js b/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.js
index 9556693d2fd7c..57bcd1b041c49 100644
--- a/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.js
+++ b/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.js
@@ -125,14 +125,14 @@ export default function({ getService }) {
 
       it('should fail if OpenID Connect response is not complemented with handshake cookie', async () => {
         await supertest
-          .get(`/api/security/oidc?code=thisisthecode&state=${stateAndNonce.state}`)
+          .get(`/api/security/oidc/callback?code=thisisthecode&state=${stateAndNonce.state}`)
           .set('kbn-xsrf', 'xxx')
           .expect(401);
       });
 
       it('should fail if state is not matching', async () => {
         await supertest
-          .get(`/api/security/oidc?code=thisisthecode&state=someothervalue`)
+          .get(`/api/security/oidc/callback?code=thisisthecode&state=someothervalue`)
           .set('kbn-xsrf', 'xxx')
           .set('Cookie', handshakeCookie.cookieString())
           .expect(401);
@@ -140,7 +140,7 @@ export default function({ getService }) {
 
       it('should succeed if both the OpenID Connect response and the cookie are provided', async () => {
         const oidcAuthenticationResponse = await supertest
-          .get(`/api/security/oidc?code=code1&state=${stateAndNonce.state}`)
+          .get(`/api/security/oidc/callback?code=code1&state=${stateAndNonce.state}`)
           .set('kbn-xsrf', 'xxx')
           .set('Cookie', handshakeCookie.cookieString())
           .expect(302);
@@ -195,7 +195,7 @@ export default function({ getService }) {
           .expect(200);
 
         const oidcAuthenticationResponse = await supertest
-          .get(`/api/security/oidc?code=code2&state=${stateAndNonce.state}`)
+          .get(`/api/security/oidc/callback?code=code2&state=${stateAndNonce.state}`)
           .set('kbn-xsrf', 'xxx')
           .set('Cookie', handshakeCookie.cookieString())
           .expect(302);
@@ -245,7 +245,7 @@ export default function({ getService }) {
           .expect(200);
 
         const oidcAuthenticationResponse = await supertest
-          .get(`/api/security/oidc?code=code1&state=${stateAndNonce.state}`)
+          .get(`/api/security/oidc/callback?code=code1&state=${stateAndNonce.state}`)
           .set('kbn-xsrf', 'xxx')
           .set('Cookie', sessionCookie.cookieString())
           .expect(302);
@@ -320,7 +320,7 @@ export default function({ getService }) {
           .expect(200);
 
         const oidcAuthenticationResponse = await supertest
-          .get(`/api/security/oidc?code=code1&state=${stateAndNonce.state}`)
+          .get(`/api/security/oidc/callback?code=code1&state=${stateAndNonce.state}`)
           .set('kbn-xsrf', 'xxx')
           .set('Cookie', handshakeCookie.cookieString())
           .expect(302);
@@ -409,7 +409,7 @@ export default function({ getService }) {
           .expect(200);
 
         const oidcAuthenticationResponse = await supertest
-          .get(`/api/security/oidc?code=code1&state=${stateAndNonce.state}`)
+          .get(`/api/security/oidc/callback?code=code1&state=${stateAndNonce.state}`)
           .set('kbn-xsrf', 'xxx')
           .set('Cookie', handshakeCookie.cookieString())
           .expect(302);
@@ -499,7 +499,7 @@ export default function({ getService }) {
           .expect(200);
 
         const oidcAuthenticationResponse = await supertest
-          .get(`/api/security/oidc?code=code1&state=${stateAndNonce.state}`)
+          .get(`/api/security/oidc/callback?code=code1&state=${stateAndNonce.state}`)
           .set('kbn-xsrf', 'xxx')
           .set('Cookie', handshakeCookie.cookieString())
           .expect(302);
diff --git a/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts b/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
index 0e07f01776713..630ec2792b9bf 100644
--- a/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
+++ b/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
@@ -66,7 +66,7 @@ export default function({ getService }: FtrProviderContext) {
 
         // Check that script that forwards URL fragment worked correctly.
         expect(dom.window.location.href).to.be(
-          '/api/security/oidc?authenticationResponseURI=https%3A%2F%2Fkibana.com%2Fapi%2Fsecurity%2Foidc%2Fimplicit%23token%3Dsome_token%26access_token%3Dsome_access_token'
+          '/api/security/oidc/callback?authenticationResponseURI=https%3A%2F%2Fkibana.com%2Fapi%2Fsecurity%2Foidc%2Fimplicit%23token%3Dsome_token%26access_token%3Dsome_access_token'
         );
       });
 
@@ -76,7 +76,7 @@ export default function({ getService }: FtrProviderContext) {
 
         await supertest
           .get(
-            `/api/security/oidc?authenticationResponseURI=${encodeURIComponent(
+            `/api/security/oidc/callback?authenticationResponseURI=${encodeURIComponent(
               authenticationResponse
             )}`
           )
@@ -90,7 +90,7 @@ export default function({ getService }: FtrProviderContext) {
 
         await supertest
           .get(
-            `/api/security/oidc?authenticationResponseURI=${encodeURIComponent(
+            `/api/security/oidc/callback?authenticationResponseURI=${encodeURIComponent(
               authenticationResponse
             )}`
           )
@@ -106,7 +106,7 @@ export default function({ getService }: FtrProviderContext) {
 
         const oidcAuthenticationResponse = await supertest
           .get(
-            `/api/security/oidc?authenticationResponseURI=${encodeURIComponent(
+            `/api/security/oidc/callback?authenticationResponseURI=${encodeURIComponent(
               authenticationResponse
             )}`
           )
diff --git a/x-pack/test/oidc_api_integration/config.ts b/x-pack/test/oidc_api_integration/config.ts
index 184ccbcdfa691..724ffd35cc9e3 100644
--- a/x-pack/test/oidc_api_integration/config.ts
+++ b/x-pack/test/oidc_api_integration/config.ts
@@ -32,7 +32,7 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
         `xpack.security.authc.realms.oidc.oidc1.rp.client_id=0oa8sqpov3TxMWJOt356`,
         `xpack.security.authc.realms.oidc.oidc1.rp.client_secret=0oa8sqpov3TxMWJOt356`,
         `xpack.security.authc.realms.oidc.oidc1.rp.response_type=code`,
-        `xpack.security.authc.realms.oidc.oidc1.rp.redirect_uri=http://localhost:${kibanaPort}/api/security/oidc`,
+        `xpack.security.authc.realms.oidc.oidc1.rp.redirect_uri=http://localhost:${kibanaPort}/api/security/oidc/callback`,
         `xpack.security.authc.realms.oidc.oidc1.op.authorization_endpoint=https://test-op.elastic.co/oauth2/v1/authorize`,
         `xpack.security.authc.realms.oidc.oidc1.op.endsession_endpoint=https://test-op.elastic.co/oauth2/v1/endsession`,
         `xpack.security.authc.realms.oidc.oidc1.op.token_endpoint=http://localhost:${kibanaPort}/api/oidc_provider/token_endpoint`,
diff --git a/x-pack/test/plugin_api_integration/plugins/task_manager/init_routes.js b/x-pack/test/plugin_api_integration/plugins/task_manager/init_routes.js
index 5a45f2a58eac4..3330d08dfd0d2 100644
--- a/x-pack/test/plugin_api_integration/plugins/task_manager/init_routes.js
+++ b/x-pack/test/plugin_api_integration/plugins/task_manager/init_routes.js
@@ -34,6 +34,9 @@ export function initRoutes(server, taskTestingEvents) {
         payload: Joi.object({
           task: Joi.object({
             taskType: Joi.string().required(),
+            schedule: Joi.object({
+              interval: Joi.string(),
+            }).optional(),
             interval: Joi.string().optional(),
             params: Joi.object().required(),
             state: Joi.object().optional(),
@@ -91,7 +94,6 @@ export function initRoutes(server, taskTestingEvents) {
         payload: Joi.object({
           task: Joi.object({
             taskType: Joi.string().required(),
-            interval: Joi.string().optional(),
             params: Joi.object().required(),
             state: Joi.object().optional(),
             id: Joi.string().optional(),
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js
index 3c7ca375ff27e..ff06bee83d51d 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js
@@ -11,7 +11,7 @@ import supertestAsPromised from 'supertest-as-promised';
 
 const {
   task: { properties: taskManagerIndexMapping },
-} = require('../../../../legacy/plugins/task_manager/mappings.json');
+} = require('../../../../legacy/plugins/task_manager/server/mappings.json');
 
 export default function({ getService }) {
   const es = getService('legacyEs');
@@ -123,7 +123,7 @@ export default function({ getService }) {
 
       const scheduledTask = await scheduleTask({
         taskType: 'sampleTask',
-        interval: '30m',
+        schedule: { interval: '30m' },
         params: { historyItem },
       });
       log.debug(`Task created: ${scheduledTask.id}`);
@@ -228,6 +228,27 @@ export default function({ getService }) {
       const interval = _.random(5, 200);
       const intervalMilliseconds = interval * 60000;
 
+      const originalTask = await scheduleTask({
+        taskType: 'sampleTask',
+        schedule: { interval: `${interval}m` },
+        params: {},
+      });
+
+      await retry.try(async () => {
+        expect((await historyDocs()).length).to.eql(1);
+
+        const [task] = (await currentTasks()).docs;
+        expect(task.attempts).to.eql(0);
+        expect(task.state.count).to.eql(1);
+
+        expectReschedule(Date.parse(originalTask.runAt), task, intervalMilliseconds);
+      });
+    });
+
+    it('should support the deprecated interval field', async () => {
+      const interval = _.random(5, 200);
+      const intervalMilliseconds = interval * 60000;
+
       const originalTask = await scheduleTask({
         taskType: 'sampleTask',
         interval: `${interval}m`,
@@ -248,7 +269,7 @@ export default function({ getService }) {
     it('should return a task run result when asked to run a task now', async () => {
       const originalTask = await scheduleTask({
         taskType: 'sampleTask',
-        interval: `30m`,
+        schedule: { interval: `30m` },
         params: {},
       });
 
@@ -291,7 +312,7 @@ export default function({ getService }) {
     it('should return a task run error result when running a task now fails', async () => {
       const originalTask = await scheduleTask({
         taskType: 'sampleTask',
-        interval: `30m`,
+        schedule: { interval: `30m` },
         params: { failWith: 'error on run now', failOn: 3 },
       });
 
@@ -355,7 +376,7 @@ export default function({ getService }) {
     it('should return a task run error result when trying to run a task now which is already running', async () => {
       const longRunningTask = await scheduleTask({
         taskType: 'sampleTask',
-        interval: '30m',
+        schedule: { interval: '30m' },
         params: {
           waitForParams: true,
         },
@@ -447,13 +468,13 @@ export default function({ getService }) {
        */
       const fastTask = await scheduleTask({
         taskType: 'sampleTask',
-        interval: `1s`,
+        schedule: { interval: `1s` },
         params: {},
       });
 
       const longRunningTask = await scheduleTask({
         taskType: 'sampleTask',
-        interval: `1s`,
+        schedule: { interval: `1s` },
         params: {
           waitForEvent: 'rescheduleHasHappened',
         },
diff --git a/x-pack/test/reporting/README.md b/x-pack/test/reporting/README.md
index 30859fa96c015..d4a6c20a835e2 100644
--- a/x-pack/test/reporting/README.md
+++ b/x-pack/test/reporting/README.md
@@ -82,16 +82,6 @@ node scripts/functional_tests_server.js --config test/reporting/configs/chromium
 
 **Note:** Dashboard has some snapshot testing too, in `_dashboard_snapshots.js`. This test watches for a command line flag `--updateBaselines` which automates updating the baselines. Probably worthwhile to do some similar here in the long run.
 
-  ### Adding a new BWC test
-
-  We have tests that ensure the latest version of Kibana will continue to generate reports from URLs generated in previous versions, to ensure backward compatibility.  These tests are in `api/bwc_generation_urls.js`. It's important to update these every now and then and add new ones, especially if anything in the URL changed in a release.
-
-  To add test coverage for a specific minor release,:
-1. Checkout previous branch, e.g. `git checkout upstream/6.4`
-2. Sync your environment via `yarn kbn bootstrap` (Note, if you run into problems you may want to first clean via `yarn kbn clean`)
-3. Start up kibana and Elasticsearch (`yarn es snapshot --license trial` in one terminal, and `yarn start` in another)
-4. Load the reporting test data that is used in the tests. Ensure you are in the `x-pack` directory and run:
-
 ```
 node ../scripts/es_archiver.js --es-url http://elastic:changeme@localhost:9200 load ../../../../test/functional/fixtures/es_archiver/dashboard/current/kibana
 ```
diff --git a/x-pack/test/reporting/api/bwc_existing_indexes.js b/x-pack/test/reporting/api/bwc_existing_indexes.js
deleted file mode 100644
index da2ed87159209..0000000000000
--- a/x-pack/test/reporting/api/bwc_existing_indexes.js
+++ /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.
- */
-
-import * as GenerationUrls from './generation_urls';
-
-/**
- * This file tests the situation when a reporting index spans releases. By default reporting indexes are created
- * on a weekly basis, but this is configurable so it is possible a user has this set to yearly. In that event, it
- * is possible report data is getting posted to an index that was created by a very old version. We don't have a
- * reporting index migration plan, so this test is important to ensure BWC, or that in the event we decide to make
- * a major change in a major release, we handle it properly.
- */
-
-export default function({ getService }) {
-  const esArchiver = getService('esArchiver');
-  const reportingAPI = getService('reportingAPI');
-  const usageAPI = getService('usageAPI');
-
-  // FLAKY: https://github.com/elastic/kibana/issues/42725
-  describe.skip('BWC report generation into existing indexes', () => {
-    let expectedCompletedReportCount;
-    let cleanupIndexAlias;
-
-    describe('existing 6_2 index', () => {
-      before('load data and add index alias', async () => {
-        await reportingAPI.deleteAllReportingIndexes();
-        await esArchiver.load('bwc/6_2');
-
-        // The index name in the 6_2 archive.
-        const ARCHIVED_REPORTING_INDEX = '.reporting-2018.03.11';
-        cleanupIndexAlias = await reportingAPI.coerceReportsIntoExistingIndex(
-          ARCHIVED_REPORTING_INDEX
-        );
-
-        const stats = await usageAPI.getUsageStats();
-        expectedCompletedReportCount = await reportingAPI.getCompletedReportCount(stats);
-      });
-
-      after('remove index alias', async () => {
-        await cleanupIndexAlias();
-      });
-
-      // Might not be great test practice to lump all these jobs together but reporting takes awhile and it'll be
-      // more efficient to post them all up front, then sequentially.
-      it('multiple jobs posted', async () => {
-        const reportPaths = [];
-        reportPaths.push(
-          await reportingAPI.postJob(GenerationUrls.CSV_DISCOVER_KUERY_AND_FILTER_6_3)
-        );
-        reportPaths.push(
-          await reportingAPI.postJob(GenerationUrls.PDF_PRESERVE_DASHBOARD_FILTER_6_3)
-        );
-        reportPaths.push(
-          await reportingAPI.postJob(GenerationUrls.PDF_PRESERVE_PIE_VISUALIZATION_6_3)
-        );
-        reportPaths.push(await reportingAPI.postJob(GenerationUrls.PDF_PRINT_DASHBOARD_6_3));
-        reportPaths.push(
-          await reportingAPI.postJob(
-            GenerationUrls.PDF_PRINT_PIE_VISUALIZATION_FILTER_AND_SAVED_SEARCH_6_3
-          )
-        );
-
-        await reportingAPI.expectAllJobsToFinishSuccessfully(reportPaths);
-      }).timeout(1540000);
-
-      it('jobs completed successfully', async () => {
-        const stats = await usageAPI.getUsageStats();
-        expectedCompletedReportCount += 5;
-        reportingAPI.expectCompletedReportCount(stats, expectedCompletedReportCount);
-      });
-    });
-  });
-}
diff --git a/x-pack/test/reporting/api/bwc_generation_urls.js b/x-pack/test/reporting/api/bwc_generation_urls.js
deleted file mode 100644
index 25b40ff3f74a8..0000000000000
--- a/x-pack/test/reporting/api/bwc_generation_urls.js
+++ /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 * as GenerationUrls from './generation_urls';
-
-export default function({ getService }) {
-  const reportingAPI = getService('reportingAPI');
-  const usageAPI = getService('usageAPI');
-
-  describe('BWC report generation urls', () => {
-    describe('Pre 6_2', () => {
-      before(async () => {
-        await reportingAPI.deleteAllReportingIndexes();
-      });
-
-      // The URL being tested was captured from release 6.4 and then the layout section was removed to test structure before
-      // preserve_layout was introduced. See https://github.com/elastic/kibana/issues/23414
-      it('job posted successfully', async () => {
-        const path = await reportingAPI.postJob(GenerationUrls.PDF_PRINT_DASHBOARD_PRE_6_2);
-        await reportingAPI.waitForJobToFinish(path);
-        const stats = await usageAPI.getUsageStats();
-        reportingAPI.expectCompletedReportCount(stats, 1);
-      }).timeout(500000);
-    });
-
-    describe('6_2', () => {
-      before(async () => {
-        await reportingAPI.deleteAllReportingIndexes();
-      });
-
-      // Might not be great test practice to lump all these jobs together but reporting takes awhile and it'll be
-      // more efficient to post them all up front, then sequentially.
-      it('multiple jobs posted', async () => {
-        const reportPaths = [];
-        reportPaths.push(await reportingAPI.postJob(GenerationUrls.PDF_PRINT_DASHBOARD_6_2));
-        reportPaths.push(await reportingAPI.postJob(GenerationUrls.PDF_PRESERVE_VISUALIZATION_6_2));
-        reportPaths.push(await reportingAPI.postJob(GenerationUrls.CSV_DISCOVER_FILTER_QUERY_6_2));
-
-        await reportingAPI.expectAllJobsToFinishSuccessfully(reportPaths);
-      }).timeout(1540000);
-
-      it('jobs completed successfully', async () => {
-        const stats = await usageAPI.getUsageStats();
-        reportingAPI.expectCompletedReportCount(stats, 3);
-      });
-    });
-
-    // 6.3 urls currently being tested as part of the "bwc_existing_indexes" test suite. Reports are time consuming,
-    // don't replicate tests if we don't need to, so no specific 6_3 url tests here.
-  });
-}
diff --git a/x-pack/test/reporting/api/chromium_tests.js b/x-pack/test/reporting/api/chromium_tests.js
index 6594a80db491b..2d5a31bb40da3 100644
--- a/x-pack/test/reporting/api/chromium_tests.js
+++ b/x-pack/test/reporting/api/chromium_tests.js
@@ -27,8 +27,6 @@ export default function({ loadTestFile, getService }) {
       await esArchiver.unload(OSS_DATA_ARCHIVE_PATH);
     });
 
-    loadTestFile(require.resolve('./bwc_existing_indexes'));
-    loadTestFile(require.resolve('./bwc_generation_urls'));
     loadTestFile(require.resolve('./usage'));
   });
 }
diff --git a/x-pack/test/reporting/api/generate/csv_saved_search.ts b/x-pack/test/reporting/api/generate/csv_saved_search.ts
index e0cd19bf258ea..ed44ba8ea4a76 100644
--- a/x-pack/test/reporting/api/generate/csv_saved_search.ts
+++ b/x-pack/test/reporting/api/generate/csv_saved_search.ts
@@ -14,6 +14,7 @@ import {
   CSV_RESULT_TIMEBASED,
   CSV_RESULT_TIMELESS,
   CSV_RESULT_NANOS,
+  CSV_RESULT_DOCVALUE,
 } from './fixtures';
 
 interface GenerateOpts {
@@ -268,6 +269,68 @@ export default function({ getService }: { getService: any }) {
 
         await esArchiver.unload('reporting/hugedata');
       });
+
+      it('for docvalue_fields', async () => {
+        // load test data that contains a saved search and documents
+        await esArchiver.load('reporting/ecommerce');
+        await esArchiver.load('reporting/ecommerce_kibana');
+
+        const params = {
+          searchId: 'search:6091ead0-1c6d-11ea-a100-8589bb9d7c6b',
+          postPayload: {
+            timerange: {
+              min: '2019-06-26T06:20:28Z',
+              max: '2019-06-26T07:27:58Z',
+              timezone: 'UTC',
+            },
+            state: {
+              sort: [{ order_date: { order: 'desc', unmapped_type: 'boolean' } }],
+              docvalue_fields: [
+                { field: 'customer_birth_date', format: 'date_time' },
+                { field: 'order_date', format: 'date_time' },
+                { field: 'products.created_on', format: 'date_time' },
+              ],
+              query: {
+                bool: {
+                  must: [],
+                  filter: [
+                    { match_all: {} },
+                    { match_all: {} },
+                    {
+                      range: {
+                        order_date: {
+                          gte: '2019-06-26T06:20:28.066Z',
+                          lte: '2019-06-26T07:27:58.573Z',
+                          format: 'strict_date_optional_time',
+                        },
+                      },
+                    },
+                  ],
+                  should: [],
+                  must_not: [],
+                },
+              },
+            },
+          },
+          isImmediate: true,
+        };
+        const {
+          status: resStatus,
+          text: resText,
+          type: resType,
+        } = (await generateAPI.getCsvFromSavedSearch(
+          params.searchId,
+          params.postPayload,
+          params.isImmediate
+        )) as supertest.Response;
+
+        expect(resStatus).to.eql(200);
+        expect(resType).to.eql('text/csv');
+        expect(resText).to.eql(CSV_RESULT_DOCVALUE);
+
+        await esArchiver.unload('reporting/ecommerce');
+        await esArchiver.unload('reporting/ecommerce_kibana');
+      });
     });
 
     // FLAKY: https://github.com/elastic/kibana/issues/37471
diff --git a/x-pack/test/reporting/api/generate/fixtures.ts b/x-pack/test/reporting/api/generate/fixtures.ts
index a9fde9dfb9363..c68e417498917 100644
--- a/x-pack/test/reporting/api/generate/fixtures.ts
+++ b/x-pack/test/reporting/api/generate/fixtures.ts
@@ -174,3 +174,14 @@ format:strict_date_optional_time,gte:'2004-09-17T21:19:34.213Z',lte:'2019-09-17T
 213Z')))),must:!(),must_not:!(),should:!())),script_fields:(),sort:!(('@timestamp':(order
 :desc,unmapped_type:boolean))),stored_fields:!('@timestamp',clientip,extension),version:!
 t),index:'logstash-*'),title:'A Saved Search With a DATE FILTER',type:search)`;
+
+export const CSV_RESULT_DOCVALUE = `"order_date",category,currency,"customer_id","order_id","day_of_week_i","order_date","products.created_on",sku
+"[""2019-06-26T07:26:24.000Z"",""2019-06-26T07:26:24.000Z""]","[""Men\'s Shoes"",""Men\'s Clothing""]",EUR,49,569743,3,"[""2019-06-26T07:26:24.000Z"",""2019-06-26T07:26:24.000Z""]","[""2016-12-15T07:26:24.000Z"",""2016-12-15T07:26:24.000Z""]","[""ZO0403504035"",""ZO0610306103""]"
+"[""2019-06-26T07:20:38.000Z"",""2019-06-26T07:20:38.000Z""]","[""Men\'s Shoes"",""Women\'s Accessories""]",EUR,29,569736,3,"[""2019-06-26T07:20:38.000Z"",""2019-06-26T07:20:38.000Z""]","[""2016-12-15T07:20:38.000Z"",""2016-12-15T07:20:38.000Z""]","[""ZO0517305173"",""ZO0319703197""]"
+"[""2019-06-26T07:19:12.000Z"",""2019-06-26T07:19:12.000Z""]","[""Women\'s Clothing"",""Women\'s Shoes""]",EUR,20,569734,3,"[""2019-06-26T07:19:12.000Z"",""2019-06-26T07:19:12.000Z""]","[""2016-12-15T07:19:12.000Z"",""2016-12-15T07:19:12.000Z""]","[""ZO0348703487"",""ZO0141401414""]"
+"[""2019-06-26T07:00:29.000Z"",""2019-06-26T07:00:29.000Z""]","[""Women\'s Clothing""]",EUR,17,569716,3,"[""2019-06-26T07:00:29.000Z"",""2019-06-26T07:00:29.000Z""]","[""2016-12-15T07:00:29.000Z"",""2016-12-15T07:00:29.000Z""]","[""ZO0146701467"",""ZO0212902129""]"
+"[""2019-06-26T06:56:10.000Z"",""2019-06-26T06:56:10.000Z""]","[""Women\'s Clothing"",""Women\'s Shoes""]",EUR,6,569710,3,"[""2019-06-26T06:56:10.000Z"",""2019-06-26T06:56:10.000Z""]","[""2016-12-15T06:56:10.000Z"",""2016-12-15T06:56:10.000Z""]","[""ZO0053600536"",""ZO0239702397""]"
+"[""2019-06-26T06:47:31.000Z"",""2019-06-26T06:47:31.000Z""]","[""Men\'s Shoes""]",EUR,52,569699,3,"[""2019-06-26T06:47:31.000Z"",""2019-06-26T06:47:31.000Z""]","[""2016-12-15T06:47:31.000Z"",""2016-12-15T06:47:31.000Z""]","[""ZO0398603986"",""ZO0521305213""]"
+"[""2019-06-26T06:37:26.000Z"",""2019-06-26T06:37:26.000Z""]","[""Men\'s Shoes""]",EUR,50,569694,3,"[""2019-06-26T06:37:26.000Z"",""2019-06-26T06:37:26.000Z""]","[""2016-12-15T06:37:26.000Z"",""2016-12-15T06:37:26.000Z""]","[""ZO0398703987"",""ZO0687806878""]"
+"[""2019-06-26T06:21:36.000Z"",""2019-06-26T06:21:36.000Z""]","[""Men\'s Clothing""]",EUR,52,569679,3,"[""2019-06-26T06:21:36.000Z"",""2019-06-26T06:21:36.000Z""]","[""2016-12-15T06:21:36.000Z"",""2016-12-15T06:21:36.000Z""]","[""ZO0433604336"",""ZO0275702757""]"
+`;
diff --git a/x-pack/test/reporting/api/generation_urls.js b/x-pack/test/reporting/api/generation_urls.js
index 182d395704a25..b98b1a26651a1 100644
--- a/x-pack/test/reporting/api/generation_urls.js
+++ b/x-pack/test/reporting/api/generation_urls.js
@@ -4,13 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-// These all have the domain name portion stripped out. The api infrastructure assumes it when we post to it anyhow.
-
-// The URL below was captured from release 6.4 and then the layout section was removed to test structure before
-// preserve_layout was introduced. See https://github.com/elastic/kibana/issues/23414
-export const PDF_PRINT_DASHBOARD_PRE_6_2 =
-  '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,objectType:dashboard,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fdashboard%2F2ae34a60-3dd4-11e8-b2b9-5d5dc1715159%3F_g%3D(refreshInterval:(pause:!!t,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!(),fullScreenMode:!!f,options:(hidePanelTitles:!!f,useMargins:!!t),panels:!!((embeddableConfig:(),gridData:(h:15,i:!%271!%27,w:24,x:0,y:0),id:!%27145ced90-3dcb-11e8-8660-4d65aa086b3c!%27,panelIndex:!%271!%27,type:visualization,version:!%276.3.0!%27),(embeddableConfig:(),gridData:(h:15,i:!%272!%27,w:24,x:24,y:0),id:e2023110-3dcb-11e8-8660-4d65aa086b3c,panelIndex:!%272!%27,type:visualization,version:!%276.3.0!%27)),query:(language:lucene,query:!%27!%27),timeRestore:!!f,title:!%27couple%2Bpanels!%27,viewMode:view)%27),title:%27couple%20panels%27)';
-
 export const PDF_PRINT_DASHBOARD_6_3 =
   '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(id:print),objectType:dashboard,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fdashboard%2F2ae34a60-3dd4-11e8-b2b9-5d5dc1715159%3F_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!(),fullScreenMode:!!f,options:(hidePanelTitles:!!f,useMargins:!!t),panels:!!((embeddableConfig:(),gridData:(h:15,i:!%271!%27,w:24,x:0,y:0),id:!%27145ced90-3dcb-11e8-8660-4d65aa086b3c!%27,panelIndex:!%271!%27,type:visualization,version:!%276.3.0!%27),(embeddableConfig:(),gridData:(h:15,i:!%272!%27,w:24,x:24,y:0),id:e2023110-3dcb-11e8-8660-4d65aa086b3c,panelIndex:!%272!%27,type:visualization,version:!%276.3.0!%27)),query:(language:lucene,query:!%27!%27),timeRestore:!!f,title:!%27couple%2Bpanels!%27,viewMode:view)%27),title:%27couple%20panels%27)';
 export const PDF_PRESERVE_DASHBOARD_FILTER_6_3 =
@@ -21,10 +14,3 @@ export const PDF_PRINT_PIE_VISUALIZATION_FILTER_AND_SAVED_SEARCH_6_3 =
   '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(id:print),objectType:visualization,relativeUrls:!(%27%2Fapp%2Fkibana%23%2Fvisualize%2Fedit%2Fbefdb6b0-3e59-11e8-9fc3-39e49624228e%3F_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(filters:!!((!%27$state!%27:(store:appState),meta:(alias:!!n,disabled:!!f,index:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,key:animal.keyword,negate:!!f,params:(query:dog,type:phrase),type:phrase,value:dog),query:(match:(animal.keyword:(query:dog,type:phrase))))),linked:!!t,query:(language:lucene,query:!%27!%27),uiState:(),vis:(aggs:!!((enabled:!!t,id:!%271!%27,params:(),schema:metric,type:count),(enabled:!!t,id:!%272!%27,params:(field:name.keyword,missingBucket:!!f,missingBucketLabel:Missing,order:desc,orderBy:!%271!%27,otherBucket:!!f,otherBucketLabel:Other,size:5),schema:segment,type:terms)),params:(addLegend:!!t,addTooltip:!!t,isDonut:!!t,labels:(last_level:!!t,show:!!f,truncate:100,values:!!t),legendPosition:right,type:pie),title:!%27Filter%2BTest:%2Banimals:%2Blinked%2Bto%2Bsearch%2Bwith%2Bfilter!%27,type:pie))%27),title:%27Filter%20Test:%20animals:%20linked%20to%20search%20with%20filter%27)';
 export const CSV_DISCOVER_KUERY_AND_FILTER_6_3 =
   '/api/reporting/generate/csv?jobParams=(conflictedTypesFields:!(),fields:!(%27@timestamp%27,agent,bytes,clientip),indexPatternId:%270bf35f60-3dc9-11e8-8660-4d65aa086b3c%27,metaFields:!(_source,_id,_type,_index,_score),searchRequest:(body:(_source:(excludes:!(),includes:!(%27@timestamp%27,agent,bytes,clientip)),docvalue_fields:!(%27@timestamp%27),query:(bool:(filter:!((bool:(minimum_should_match:1,should:!((match:(clientip:%2773.14.212.83%27)))))),must:!((range:(bytes:(gte:100,lt:1000))),(range:(%27@timestamp%27:(format:epoch_millis,gte:1369165215770,lte:1526931615770)))),must_not:!(),should:!())),script_fields:(),sort:!((%27@timestamp%27:(order:desc,unmapped_type:boolean))),stored_fields:!(%27@timestamp%27,agent,bytes,clientip),version:!t),index:%27logstash-*%27),title:%27Bytes%20and%20kuery%20in%20saved%20search%20with%20filter%27,type:search)';
-
-export const PDF_PRINT_DASHBOARD_6_2 =
-  '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(id:print),objectType:dashboard,queryString:%27_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(description:!%27!%27,filters:!!((!%27$state!%27:(store:appState),meta:(alias:!!n,disabled:!!f,field:isDog,index:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,key:isDog,negate:!!f,params:(value:!!t),type:phrase,value:true),script:(script:(inline:!%27boolean%2Bcompare(Supplier%2Bs,%2Bdef%2Bv)%2B%257Breturn%2Bs.get()%2B%253D%253D%2Bv%3B%257Dcompare(()%2B-%253E%2B%257B%2Breturn%2Bdoc%255B!!!%27animal.keyword!!!%27%255D.value%2B%253D%253D%2B!!!%27dog!!!%27%2B%257D,%2Bparams.value)%3B!%27,lang:painless,params:(value:!!t))))),fullScreenMode:!!f,options:(hidePanelTitles:!!f,useMargins:!!t),panels:!!((gridData:(h:3,i:!%274!%27,w:6,x:6,y:0),id:edb65990-53ca-11e8-b481-c9426d020fcd,panelIndex:!%274!%27,type:visualization,version:!%276.2.4!%27),(gridData:(h:3,i:!%275!%27,w:6,x:0,y:0),id:!%270644f890-53cb-11e8-b481-c9426d020fcd!%27,panelIndex:!%275!%27,type:visualization,version:!%276.2.4!%27)),query:(language:lucene,query:!%27weightLbs:%253E15!%27),timeRestore:!!t,title:!%27Animal%2BWeights%2B(created%2Bin%2B6.2)!%27,viewMode:view)%27,savedObjectId:%271b2f47b0-53cb-11e8-b481-c9426d020fcd%27)';
-export const PDF_PRESERVE_VISUALIZATION_6_2 =
-  '/api/reporting/generate/printablePdf?jobParams=(browserTimezone:America%2FNew_York,layout:(dimensions:(height:441,width:1002),id:preserve_layout),objectType:visualization,queryString:%27_g%3D(refreshInterval:(display:Off,pause:!!f,value:0),time:(from:!%27Mon%2BApr%2B09%2B2018%2B17:56:08%2BGMT-0400!%27,mode:absolute,to:!%27Wed%2BApr%2B11%2B2018%2B17:56:08%2BGMT-0400!%27))%26_a%3D(filters:!!(),linked:!!f,query:(language:lucene,query:!%27weightLbs:%253E10!%27),uiState:(),vis:(aggs:!!((enabled:!!t,id:!%271!%27,params:(),schema:metric,type:count),(enabled:!!t,id:!%272!%27,params:(field:weightLbs,missingBucket:!!f,missingBucketLabel:Missing,order:desc,orderBy:!%271!%27,otherBucket:!!f,otherBucketLabel:Other,size:5),schema:segment,type:terms)),params:(addLegend:!!t,addTooltip:!!t,isDonut:!!t,labels:(last_level:!!t,show:!!f,truncate:100,values:!!t),legendPosition:right,type:pie),title:!%27Weight%2Bin%2Blbs%2Bpie%2Bcreated%2Bin%2B6.2!%27,type:pie))%27,savedObjectId:%270644f890-53cb-11e8-b481-c9426d020fcd%27)';
-export const CSV_DISCOVER_FILTER_QUERY_6_2 =
-  '/api/reporting/generate/csv?jobParams=(conflictedTypesFields:!(),fields:!(%27@timestamp%27,animal,sound,weightLbs),indexPatternId:a0f483a0-3dc9-11e8-8660-4d65aa086b3c,metaFields:!(_source,_id,_type,_index,_score),searchRequest:(body:(_source:(excludes:!(),includes:!(%27@timestamp%27,animal,sound,weightLbs)),docvalue_fields:!(%27@timestamp%27),query:(bool:(filter:!(),must:!((query_string:(analyze_wildcard:!t,default_field:%27*%27,query:%27weightLbs:%3E10%27)),(match_phrase:(sound.keyword:(query:growl))),(range:(%27@timestamp%27:(format:epoch_millis,gte:1523310968000,lte:1523483768000)))),must_not:!(),should:!())),script_fields:(),sort:!((%27@timestamp%27:(order:desc,unmapped_type:boolean))),stored_fields:!(%27@timestamp%27,animal,sound,weightLbs),version:!t),index:%27animals-*%27),title:%27Search%20created%20in%206.2%27,type:search)';
diff --git a/x-pack/test/reporting/api/usage.js b/x-pack/test/reporting/api/usage.js
index c5271255d483b..c1005c441f463 100644
--- a/x-pack/test/reporting/api/usage.js
+++ b/x-pack/test/reporting/api/usage.js
@@ -46,7 +46,7 @@ export default function({ getService }) {
 
     describe('from archive data', () => {
       it('generated from 6.2', async () => {
-        await esArchiver.load('bwc/6_2');
+        await esArchiver.load('reporting/bwc/6_2');
         const usage = await usageAPI.getUsageStats();
 
         reportingAPI.expectRecentJobTypeTotalStats(usage, 'csv', 0);
@@ -64,10 +64,12 @@ export default function({ getService }) {
         reportingAPI.expectAllTimePdfAppStats(usage, 'dashboard', 0);
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'preserve_layout', 0);
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'print', 0);
+
+        await esArchiver.unload('reporting/bwc/6_2');
       });
 
       it('generated from 6.3', async () => {
-        await esArchiver.load('bwc/6_3');
+        await esArchiver.load('reporting/bwc/6_3');
         const usage = await usageAPI.getUsageStats();
 
         reportingAPI.expectRecentJobTypeTotalStats(usage, 'csv', 0);
@@ -83,6 +85,8 @@ export default function({ getService }) {
         reportingAPI.expectAllTimePdfAppStats(usage, 'dashboard', 3);
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'preserve_layout', 3);
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'print', 3);
+
+        await esArchiver.unload('reporting/bwc/6_3');
       });
     });
 
diff --git a/x-pack/test/reporting/configs/api.js b/x-pack/test/reporting/configs/api.js
deleted file mode 100644
index 523bd551f9ab6..0000000000000
--- a/x-pack/test/reporting/configs/api.js
+++ /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.
- */
-
-const path = require('path');
-
-import { ReportingAPIProvider } from '../services';
-
-export async function getReportingApiConfig({ readConfigFile }) {
-  const apiConfig = await readConfigFile(require.resolve('../../api_integration/config.js'));
-
-  return {
-    servers: apiConfig.get('servers'),
-    services: {
-      ...apiConfig.get('services'),
-      reportingAPI: ReportingAPIProvider,
-    },
-    esArchiver: {
-      directory: path.resolve(__dirname, '../es_archives'),
-    },
-    junit: {
-      reportName: 'X-Pack Reporting API Tests',
-    },
-    testFiles: [require.resolve('../api/generate')],
-    esTestCluster: apiConfig.get('esTestCluster'),
-    kbnTestServer: {
-      ...apiConfig.get('kbnTestServer'),
-      serverArgs: [
-        ...apiConfig.get('kbnTestServer.serverArgs'),
-        '--xpack.reporting.csv.enablePanelActionDownload=true',
-        `--optimize.enabled=true`,
-        '--logging.events.log',
-        JSON.stringify(['info', 'warning', 'error', 'fatal', 'optimize', 'reporting']),
-      ],
-    },
-  };
-}
-
-export default getReportingApiConfig;
diff --git a/x-pack/test/reporting/configs/chromium_api.js b/x-pack/test/reporting/configs/chromium_api.js
index feaabefcd7dfb..95649dfb5d7a3 100644
--- a/x-pack/test/reporting/configs/chromium_api.js
+++ b/x-pack/test/reporting/configs/chromium_api.js
@@ -4,25 +4,36 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getReportingApiConfig } from './api';
+import { ReportingAPIProvider } from '../services';
 
 export default async function({ readConfigFile }) {
-  const reportingApiConfig = await getReportingApiConfig({ readConfigFile });
+  const apiConfig = await readConfigFile(require.resolve('../../api_integration/config.js'));
+  const functionalConfig = await readConfigFile(require.resolve('../../functional/config.js'));
 
   return {
-    ...reportingApiConfig,
-    junit: {
-      reportName: 'X-Pack Chromium API Reporting Tests',
-    },
+    servers: apiConfig.get('servers'),
+    junit: { reportName: 'X-Pack Chromium API Reporting Tests' },
     testFiles: [require.resolve('../api/chromium_tests')],
+    services: {
+      ...apiConfig.get('services'),
+      reportingAPI: ReportingAPIProvider,
+    },
     kbnTestServer: {
-      ...reportingApiConfig.kbnTestServer,
+      ...apiConfig.get('kbnTestServer'),
       serverArgs: [
-        ...reportingApiConfig.kbnTestServer.serverArgs,
+        // Reporting API tests use functionalConfig instead of apiConfig because they needs a fully working UI. By default, the API config
+        // does not have optimize setting enabled, and Kibana would not have a working UI.
+        ...functionalConfig.get('kbnTestServer.serverArgs'),
+        '--logging.events.log',
+        '["info","warning","error","fatal","optimize","reporting"]',
+        '--xpack.endpoint.enabled=true',
         '--xpack.reporting.csv.enablePanelActionDownload=true',
-        `--xpack.reporting.capture.browser.type=chromium`,
-        `--xpack.spaces.enabled=false`,
+        '--xpack.reporting.capture.maxAttempts=1',
+        '--xpack.security.session.idleTimeout=3600000',
+        '--xpack.spaces.enabled=false',
       ],
     },
+    esArchiver: apiConfig.get('esArchiver'),
+    esTestCluster: apiConfig.get('esTestCluster'),
   };
 }
diff --git a/x-pack/test/reporting/configs/chromium_functional.js b/x-pack/test/reporting/configs/chromium_functional.js
index 5cb14f048aeaf..22640e858cc6c 100644
--- a/x-pack/test/reporting/configs/chromium_functional.js
+++ b/x-pack/test/reporting/configs/chromium_functional.js
@@ -4,24 +4,32 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getFunctionalConfig } from './functional';
-
 export default async function({ readConfigFile }) {
-  const functionalConfig = await getFunctionalConfig({ readConfigFile });
+  const functionalConfig = await readConfigFile(require.resolve('../../functional/config.js'));
 
   return {
-    ...functionalConfig,
+    services: functionalConfig.get('services'),
+    pageObjects: functionalConfig.get('pageObjects'),
+    servers: functionalConfig.get('servers'),
+    apps: functionalConfig.get('apps'),
+    screenshots: functionalConfig.get('screenshots'),
     junit: {
       reportName: 'X-Pack Chromium Functional Reporting Tests',
     },
     testFiles: [require.resolve('../functional')],
     kbnTestServer: {
-      ...functionalConfig.kbnTestServer,
+      ...functionalConfig.get('kbnTestServer'),
       serverArgs: [
-        ...functionalConfig.kbnTestServer.serverArgs,
+        ...functionalConfig.get('kbnTestServer.serverArgs'),
+        '--logging.events.log',
+        '["info","warning","error","fatal","optimize","reporting"]',
+        '--xpack.endpoint.enabled=true',
         '--xpack.reporting.csv.enablePanelActionDownload=true',
-        `--xpack.reporting.capture.browser.type=chromium`,
+        '--xpack.security.session.idleTimeout=3600000',
+        '--xpack.spaces.enabled=false',
       ],
     },
+    esArchiver: functionalConfig.get('esArchiver'),
+    esTestCluster: functionalConfig.get('esTestCluster'),
   };
 }
diff --git a/x-pack/test/reporting/configs/functional.js b/x-pack/test/reporting/configs/functional.js
deleted file mode 100644
index 33481a1cab330..0000000000000
--- a/x-pack/test/reporting/configs/functional.js
+++ /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.
- */
-const path = require('path');
-
-export async function getFunctionalConfig({ readConfigFile }) {
-  const xPackFunctionalTestsConfig = await readConfigFile(
-    require.resolve('../../functional/config.js')
-  );
-
-  return {
-    services: xPackFunctionalTestsConfig.get('services'),
-    pageObjects: xPackFunctionalTestsConfig.get('pageObjects'),
-    servers: xPackFunctionalTestsConfig.get('servers'),
-    esTestCluster: xPackFunctionalTestsConfig.get('esTestCluster'),
-    apps: xPackFunctionalTestsConfig.get('apps'),
-    esArchiver: {
-      directory: path.resolve(__dirname, '../es_archives'),
-    },
-    screenshots: xPackFunctionalTestsConfig.get('screenshots'),
-    junit: {
-      reportName: 'X-Pack Reporting Functional Tests',
-    },
-    kbnTestServer: {
-      ...xPackFunctionalTestsConfig.get('kbnTestServer'),
-      serverArgs: [
-        ...xPackFunctionalTestsConfig.get('kbnTestServer.serverArgs'),
-        '--xpack.reporting.csv.enablePanelActionDownload=true',
-        '--logging.events.log',
-        JSON.stringify(['info', 'warning', 'error', 'fatal', 'optimize', 'reporting']),
-      ],
-    },
-    testFiles: [require.resolve('../functional')],
-  };
-}
-
-export default getFunctionalConfig;
diff --git a/x-pack/test/reporting/configs/generate_api.js b/x-pack/test/reporting/configs/generate_api.js
index de63d1e3b6715..c2b5e6c84f05f 100644
--- a/x-pack/test/reporting/configs/generate_api.js
+++ b/x-pack/test/reporting/configs/generate_api.js
@@ -6,44 +6,38 @@
 
 import { esTestConfig, kbnTestConfig, kibanaServerTestUser } from '@kbn/test';
 import { format as formatUrl } from 'url';
-import { getApiIntegrationConfig } from '../../api_integration/config';
-import { getReportingApiConfig } from './api';
+import { ReportingAPIProvider } from '../services';
 
 export default async function({ readConfigFile }) {
-  const servers = {
-    kibana: kbnTestConfig.getUrlParts(),
-    elasticsearch: esTestConfig.getUrlParts(),
-  };
-
-  const apiTestConfig = await getApiIntegrationConfig({ readConfigFile });
-  const reportingApiConfig = await getReportingApiConfig({ readConfigFile });
-  const xPackFunctionalTestsConfig = await readConfigFile(
-    require.resolve('../../functional/config.js')
-  );
+  const apiConfig = await readConfigFile(require.resolve('../../api_integration/config.js'));
 
   return {
-    ...reportingApiConfig,
+    servers: apiConfig.get('servers'),
     junit: { reportName: 'X-Pack Reporting Generate API Integration Tests' },
     testFiles: [require.resolve('../api/generate')],
     services: {
-      ...apiTestConfig.services,
-      ...reportingApiConfig.services,
+      ...apiConfig.get('services'),
+      reportingAPI: ReportingAPIProvider,
     },
     kbnTestServer: {
-      ...xPackFunctionalTestsConfig.get('kbnTestServer'),
+      ...apiConfig.get('kbnTestServer'),
       serverArgs: [
-        `--optimize.enabled=false`,
+        '--logging.events.log',
+        '["info","warning","error","fatal","optimize","reporting"]',
+        `--elasticsearch.hosts=${formatUrl(esTestConfig.getUrlParts())}`,
+        `--elasticsearch.password=${kibanaServerTestUser.password}`,
+        `--elasticsearch.username=${kibanaServerTestUser.username}`,
         `--logging.json=false`,
+        `--optimize.enabled=false`,
         `--server.maxPayloadBytes=1679958`,
         `--server.port=${kbnTestConfig.getPort()}`,
-        `--elasticsearch.hosts=${formatUrl(servers.elasticsearch)}`,
-        `--elasticsearch.username=${kibanaServerTestUser.username}`,
-        `--elasticsearch.password=${kibanaServerTestUser.password}`,
         `--xpack.reporting.csv.enablePanelActionDownload=true`,
         `--xpack.reporting.csv.maxSizeBytes=2850`,
         `--xpack.reporting.queue.pollInterval=3000`,
+        `--xpack.spaces.enabled=false`,
       ],
     },
-    esArchiver: apiTestConfig.esArchiver,
+    esArchiver: apiConfig.get('esArchiver'),
+    esTestCluster: apiConfig.get('esTestCluster'),
   };
 }
diff --git a/x-pack/test/reporting/es_archives/current/reporting/data.json.gz b/x-pack/test/reporting/es_archives/current/reporting/data.json.gz
deleted file mode 100644
index 9e6f6048ebc42..0000000000000
Binary files a/x-pack/test/reporting/es_archives/current/reporting/data.json.gz and /dev/null differ
diff --git a/x-pack/test/reporting/es_archives/current/reporting/mappings.json b/x-pack/test/reporting/es_archives/current/reporting/mappings.json
deleted file mode 100644
index e41a524d716a6..0000000000000
--- a/x-pack/test/reporting/es_archives/current/reporting/mappings.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "index": ".reporting-2018.05.06",
-    "mappings": {
-      "properties": {
-        "attempts": {
-          "type": "short"
-        },
-        "completed_at": {
-          "type": "date"
-        },
-        "created_at": {
-          "type": "date"
-        },
-        "created_by": {
-          "type": "keyword"
-        },
-        "jobtype": {
-          "type": "keyword"
-        },
-        "max_attempts": {
-          "type": "short"
-        },
-        "meta": {
-          "properties": {
-            "layout": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "objectType": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "output": {
-          "properties": {
-            "content": {
-              "enabled": false,
-              "type": "object"
-            },
-            "content_type": {
-              "type": "keyword"
-            },
-            "max_size_reached": {
-              "type": "boolean"
-            }
-          }
-        },
-        "payload": {
-          "enabled": false,
-          "type": "object"
-        },
-        "priority": {
-          "type": "byte"
-        },
-        "process_expiration": {
-          "type": "date"
-        },
-        "started_at": {
-          "type": "date"
-        },
-        "status": {
-          "type": "keyword"
-        },
-        "timeout": {
-          "type": "long"
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "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/reporting/functional/reporting.js b/x-pack/test/reporting/functional/reporting.js
index 7d72db8c08e22..8458f4e537b70 100644
--- a/x-pack/test/reporting/functional/reporting.js
+++ b/x-pack/test/reporting/functional/reporting.js
@@ -25,6 +25,7 @@ export default function({ getService, getPageObjects }) {
     'header',
     'discover',
     'visualize',
+    'visEditor',
   ]);
   const log = getService('log');
 
@@ -298,9 +299,9 @@ export default function({ getService, getPageObjects }) {
 
         it('becomes available when saved', async () => {
           await PageObjects.reporting.setTimepickerInDataRange();
-          await PageObjects.visualize.clickBucket('X-axis');
-          await PageObjects.visualize.selectAggregation('Date Histogram');
-          await PageObjects.visualize.clickGo();
+          await PageObjects.visEditor.clickBucket('X-axis');
+          await PageObjects.visEditor.selectAggregation('Date Histogram');
+          await PageObjects.visEditor.clickGo();
           await PageObjects.visualize.saveVisualization('my viz');
           await PageObjects.reporting.openPdfReportingPanel();
           await expectEnabledGenerateReportButton();
diff --git a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
index 7383bb3409f1a..00ab75702e90d 100644
--- a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
@@ -87,14 +87,8 @@ export function copyToSpaceTestSuiteFactory(
       body: {
         size: 0,
         query: {
-          bool: {
-            must_not: {
-              term: {
-                // exclude spaces from the result set.
-                // we don't assert on these.
-                type: 'space',
-              },
-            },
+          terms: {
+            type: ['visualization', 'dashboard', 'index-pattern'],
           },
         },
         aggs: {
diff --git a/x-pack/test/spaces_api_integration/common/suites/delete.ts b/x-pack/test/spaces_api_integration/common/suites/delete.ts
index e3994634be1d9..9036fcbf7a8dd 100644
--- a/x-pack/test/spaces_api_integration/common/suites/delete.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/delete.ts
@@ -39,6 +39,11 @@ export function deleteTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
       index: '.kibana',
       body: {
         size: 0,
+        query: {
+          terms: {
+            type: ['visualization', 'dashboard', 'space', 'config', 'index-pattern'],
+          },
+        },
         aggs: {
           count: {
             terms: {
diff --git a/x-pack/test/typings/hapi.d.ts b/x-pack/test/typings/hapi.d.ts
index fa2712e69a5b0..0400c1b7d8f23 100644
--- a/x-pack/test/typings/hapi.d.ts
+++ b/x-pack/test/typings/hapi.d.ts
@@ -9,7 +9,7 @@ import 'hapi';
 import { XPackMainPlugin } from '../../legacy/plugins/xpack_main/server/xpack_main';
 import { SecurityPlugin } from '../../legacy/plugins/security';
 import { ActionsPlugin, ActionsClient } from '../../legacy/plugins/actions';
-import { TaskManager } from '../../legacy/plugins/task_manager';
+import { TaskManager } from '../../legacy/plugins/task_manager/server';
 import { AlertingPlugin, AlertsClient } from '../../legacy/plugins/alerting';
 
 declare module 'hapi' {
diff --git a/x-pack/typings/hapi.d.ts b/x-pack/typings/hapi.d.ts
index 569508caf3f20..cfc1a641550fc 100644
--- a/x-pack/typings/hapi.d.ts
+++ b/x-pack/typings/hapi.d.ts
@@ -9,7 +9,7 @@ import 'hapi';
 import { XPackMainPlugin } from '../legacy/plugins/xpack_main/server/xpack_main';
 import { SecurityPlugin } from '../legacy/plugins/security';
 import { ActionsPlugin, ActionsClient } from '../legacy/plugins/actions';
-import { TaskManager } from '../legacy/plugins/task_manager';
+import { TaskManager } from '../legacy/plugins/task_manager/server';
 import { AlertingPlugin, AlertsClient } from '../legacy/plugins/alerting';
 
 declare module 'hapi' {
diff --git a/yarn.lock b/yarn.lock
index 11b6f14a4334e..9631ca271295e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,21 +2,22 @@
 # yarn lockfile v1
 
 
-"@babel/cli@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.7.5.tgz#25702cc65418efc06989af3727897b9f4c8690b6"
-  integrity sha512-y2YrMGXM3NUyu1Myg0pxg+Lx6g8XhEyvLHYNRwTBV6fDek3H7Io6b7N/LXscLs4HWn4HxMdy7f2rM1rTMp2mFg==
+"@babel/cli@^7.5.5":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.5.5.tgz#bdb6d9169e93e241a08f5f7b0265195bf38ef5ec"
+  integrity sha512-UHI+7pHv/tk9g6WXQKYz+kmXTI77YtuY3vqC59KIqcoWEjsJJSG6rAxKaLsgj3LDyadsPrCB929gVOKM6Hui0w==
   dependencies:
-    commander "^4.0.1"
+    commander "^2.8.1"
     convert-source-map "^1.1.0"
     fs-readdir-recursive "^1.1.0"
     glob "^7.0.0"
     lodash "^4.17.13"
-    make-dir "^2.1.0"
+    mkdirp "^0.5.1"
+    output-file-sync "^2.0.0"
     slash "^2.0.0"
     source-map "^0.5.0"
   optionalDependencies:
-    chokidar "^2.1.8"
+    chokidar "^2.0.4"
 
 "@babel/code-frame@7.5.5", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
   version "7.5.5"
@@ -25,7 +26,7 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@7.5.5", "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.4.3":
+"@babel/core@7.5.5", "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.4.3", "@babel/core@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz#17b2686ef0d6bc58f963dddd68ab669755582c30"
   integrity sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==
@@ -65,26 +66,6 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.5.tgz#ae1323cd035b5160293307f50647e83f8ba62f7e"
-  integrity sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.4"
-    "@babel/helpers" "^7.7.4"
-    "@babel/parser" "^7.7.5"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    json5 "^2.1.0"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
 "@babel/generator@^7.0.0", "@babel/generator@^7.4.0", "@babel/generator@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz#873a7f936a3c89491b43536d12245b626664e3cf"
@@ -133,13 +114,6 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-annotate-as-pure@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce"
-  integrity sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
@@ -148,14 +122,6 @@
     "@babel/helper-explode-assignable-expression" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz#5f73f2b28580e224b5b9bd03146a4015d6217f5f"
-  integrity sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
 "@babel/helper-builder-react-jsx@^7.3.0":
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz#a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"
@@ -181,15 +147,6 @@
     "@babel/traverse" "^7.4.4"
     "@babel/types" "^7.4.4"
 
-"@babel/helper-call-delegate@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz#621b83e596722b50c0066f9dc37d3232e461b801"
-  integrity sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
 "@babel/helper-create-class-features-plugin@^7.4.4", "@babel/helper-create-class-features-plugin@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz#401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"
@@ -214,14 +171,6 @@
     "@babel/helper-replace-supers" "^7.7.4"
     "@babel/helper-split-export-declaration" "^7.7.4"
 
-"@babel/helper-create-regexp-features-plugin@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59"
-  integrity sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==
-  dependencies:
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.6.0"
-
 "@babel/helper-define-map@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369"
@@ -231,15 +180,6 @@
     "@babel/types" "^7.5.5"
     lodash "^4.17.13"
 
-"@babel/helper-define-map@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176"
-  integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==
-  dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    lodash "^4.17.13"
-
 "@babel/helper-explode-assignable-expression@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
@@ -248,14 +188,6 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-explode-assignable-expression@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84"
-  integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==
-  dependencies:
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
 "@babel/helper-function-name@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
@@ -295,13 +227,6 @@
   dependencies:
     "@babel/types" "^7.4.4"
 
-"@babel/helper-hoist-variables@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12"
-  integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
 "@babel/helper-member-expression-to-functions@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"
@@ -323,13 +248,6 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-module-imports@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91"
-  integrity sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==
-  dependencies:
-    "@babel/types" "^7.7.4"
-
 "@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz#f84ff8a09038dcbca1fd4355661a500937165b4a"
@@ -342,18 +260,6 @@
     "@babel/types" "^7.5.5"
     lodash "^4.17.13"
 
-"@babel/helper-module-transforms@^7.7.4", "@babel/helper-module-transforms@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz#d044da7ffd91ec967db25cd6748f704b6b244835"
-  integrity sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-simple-access" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    lodash "^4.17.13"
-
 "@babel/helper-optimise-call-expression@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
@@ -391,17 +297,6 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-remap-async-to-generator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz#c68c2407350d9af0e061ed6726afb4fff16d0234"
-  integrity sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-wrap-function" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
 "@babel/helper-replace-supers@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2"
@@ -430,14 +325,6 @@
     "@babel/template" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-simple-access@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294"
-  integrity sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==
-  dependencies:
-    "@babel/template" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
 "@babel/helper-split-export-declaration@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
@@ -462,16 +349,6 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.2.0"
 
-"@babel/helper-wrap-function@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace"
-  integrity sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==
-  dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
 "@babel/helpers@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz#63908d2a73942229d1e6685bc2a0e730dde3b75e"
@@ -490,15 +367,6 @@
     "@babel/traverse" "^7.6.0"
     "@babel/types" "^7.6.0"
 
-"@babel/helpers@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302"
-  integrity sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==
-  dependencies:
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@babel/types" "^7.7.4"
-
 "@babel/highlight@^7.0.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
@@ -528,7 +396,7 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81"
   integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A==
 
-"@babel/parser@^7.7.4", "@babel/parser@^7.7.5":
+"@babel/parser@^7.7.4":
   version "7.7.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
   integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==
@@ -542,16 +410,7 @@
     "@babel/helper-remap-async-to-generator" "^7.1.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-"@babel/plugin-proposal-async-generator-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d"
-  integrity sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.4"
-    "@babel/plugin-syntax-async-generators" "^7.7.4"
-
-"@babel/plugin-proposal-class-properties@7.5.5":
+"@babel/plugin-proposal-class-properties@7.5.5", "@babel/plugin-proposal-class-properties@^7.3.3", "@babel/plugin-proposal-class-properties@^7.5.1", "@babel/plugin-proposal-class-properties@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"
   integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==
@@ -559,14 +418,6 @@
     "@babel/helper-create-class-features-plugin" "^7.5.5"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-proposal-class-properties@^7.7.0", "@babel/plugin-proposal-class-properties@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz#2f964f0cb18b948450362742e33e15211e77c2ba"
-  integrity sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-proposal-decorators@7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz#de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"
@@ -584,14 +435,6 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d"
-  integrity sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
-
 "@babel/plugin-proposal-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
@@ -600,23 +443,15 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-"@babel/plugin-proposal-json-strings@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d"
-  integrity sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.7.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.7.4.tgz#7db302c83bc30caa89e38fee935635ef6bd11c28"
-  integrity sha512-TbYHmr1Gl1UC7Vo2HVuj/Naci5BEGNZ0AJhzqD2Vpr6QPFWpUmBRLrIDjedzx7/CShq0bRDS2gI4FIs77VHLVQ==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.4.4":
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz#41c360d59481d88e0ce3a3f837df10121a769b39"
+  integrity sha512-Amph7Epui1Dh/xxUxS2+K22/MUi6+6JVTvy3P58tja3B6yKTSjwwx0/d83rF7551D6PVSSoplQb8GCwqec7HRw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.7.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@7.5.5", "@babel/plugin-proposal-object-rest-spread@^7.5.5":
+"@babel/plugin-proposal-object-rest-spread@7.5.5", "@babel/plugin-proposal-object-rest-spread@^7.3.2", "@babel/plugin-proposal-object-rest-spread@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58"
   integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==
@@ -624,14 +459,6 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71"
-  integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
-
 "@babel/plugin-proposal-optional-catch-binding@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
@@ -640,21 +467,13 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz#ec21e8aeb09ec6711bc0a39ca49520abee1de379"
-  integrity sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
-
-"@babel/plugin-proposal-optional-chaining@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.7.5.tgz#f0835f044cef85b31071a924010a2a390add11d4"
-  integrity sha512-sOwFqT8JSchtJeDD+CjmWCaiFoLxY4Ps7NjvwHC/U7l4e9i5pTRNt8nDMIFSOUL+ncFbYSwruHM8WknYItWdXw==
+"@babel/plugin-proposal-optional-chaining@^7.6.0":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.6.0.tgz#e9bf1f9b9ba10c77c033082da75f068389041af8"
+  integrity sha512-kj4gkZ6qUggkprRq3Uh5KP8XnE1MdIO0J7MhdDX8+rAbB6dJ2UrensGIS+0NPZAaaJ1Vr0PN6oLUgXMU1uMcSg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.7.4"
+    "@babel/plugin-syntax-optional-chaining" "^7.2.0"
 
 "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.4.4"
@@ -665,14 +484,6 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb"
-  integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-syntax-async-generators@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
@@ -680,13 +491,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-async-generators@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889"
-  integrity sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-syntax-decorators@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz#c50b1b957dcc69e4b1127b65e1c33eef61570c1b"
@@ -701,13 +505,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-dynamic-import@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec"
-  integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-syntax-flow@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz#a765f061f803bc48f240c26f8747faf97c26bf7c"
@@ -722,13 +519,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-json-strings@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc"
-  integrity sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-syntax-jsx@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"
@@ -743,10 +533,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.7.4.tgz#e53b751d0c3061b1ba3089242524b65a7a9da12b"
-  integrity sha512-XKh/yIRPiQTOeBg0QJjEus5qiSKucKAiApNtO1psqG7D17xmE+X2i5ZqBEuSvo0HRuyPaKaSN/Gy+Ha9KFQolw==
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz#f75083dfd5ade73e783db729bbd87e7b9efb7624"
+  integrity sha512-lRCEaKE+LTxDQtgbYajI04ddt6WW0WJq57xqkAZ+s11h4YgfRHhVA/Y2VhfPzzFD4qeLHWg32DMp9HooY4Kqlg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -757,13 +547,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46"
-  integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-syntax-optional-catch-binding@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
@@ -771,24 +554,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6"
-  integrity sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-optional-chaining@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.7.4.tgz#c91fdde6de85d2eb8906daea7b21944c3610c901"
-  integrity sha512-2MqYD5WjZSbJdUagnJvIdSfkb/ucOC9/1fRJxm7GAxY6YQLWlUvkfxoNbUPcPLHJyetKUDQ4+yyuUyAoc0HriA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-top-level-await@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da"
-  integrity sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==
+"@babel/plugin-syntax-optional-chaining@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz#a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff"
+  integrity sha512-HtGCtvp5Uq/jH/WNUPkK6b7rufnCPLLlDAFN7cmACoIjaOOiXxUt3SswU5loHqrhtqTsa/WoLQ1OQ1AGuZqaWA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
@@ -799,6 +568,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-typescript@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz#5d037ffa10f3b25a16f32570ebbe7a8c2efa304b"
+  integrity sha512-77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-arrow-functions@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
@@ -806,13 +582,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-arrow-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12"
-  integrity sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-async-to-generator@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e"
@@ -822,15 +591,6 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-remap-async-to-generator" "^7.1.0"
 
-"@babel/plugin-transform-async-to-generator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz#694cbeae6d613a34ef0292713fa42fb45c4470ba"
-  integrity sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.7.4"
-
 "@babel/plugin-transform-block-scoped-functions@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
@@ -838,13 +598,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-block-scoped-functions@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz#d0d9d5c269c78eaea76227ace214b8d01e4d837b"
-  integrity sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-block-scoping@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz#a35f395e5402822f10d2119f6f8e045e3639a2ce"
@@ -861,14 +614,6 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.13"
 
-"@babel/plugin-transform-block-scoping@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz#200aad0dcd6bb80372f94d9e628ea062c58bf224"
-  integrity sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.13"
-
 "@babel/plugin-transform-classes@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9"
@@ -883,20 +628,6 @@
     "@babel/helper-split-export-declaration" "^7.4.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-classes@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz#c92c14be0a1399e15df72667067a8f510c9400ec"
-  integrity sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-define-map" "^7.7.4"
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-optimise-call-expression" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.4"
-    "@babel/helper-split-export-declaration" "^7.7.4"
-    globals "^11.1.0"
-
 "@babel/plugin-transform-computed-properties@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
@@ -904,13 +635,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-computed-properties@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz#e856c1628d3238ffe12d668eb42559f79a81910d"
-  integrity sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-destructuring@7.5.0", "@babel/plugin-transform-destructuring@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz#f6c09fdfe3f94516ff074fe877db7bc9ef05855a"
@@ -925,13 +649,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-destructuring@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267"
-  integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
@@ -941,14 +658,6 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
-"@babel/plugin-transform-dotall-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96"
-  integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-duplicate-keys@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853"
@@ -956,13 +665,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-duplicate-keys@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91"
-  integrity sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-exponentiation-operator@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
@@ -971,14 +673,6 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-exponentiation-operator@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9"
-  integrity sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-flow-strip-types@7.4.4", "@babel/plugin-transform-flow-strip-types@^7.0.0":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz#d267a081f49a8705fc9146de0768c6b58dccd8f7"
@@ -994,13 +688,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-for-of@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz#248800e3a5e507b1f103d8b4ca998e77c63932bc"
-  integrity sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-function-name@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad"
@@ -1009,14 +696,6 @@
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-function-name@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz#75a6d3303d50db638ff8b5385d12451c865025b1"
-  integrity sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==
-  dependencies:
-    "@babel/helper-function-name" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-literals@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
@@ -1024,13 +703,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz#27fe87d2b5017a2a5a34d1c41a6b9f6a6262643e"
-  integrity sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-member-expression-literals@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
@@ -1038,13 +710,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-member-expression-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz#aee127f2f3339fc34ce5e3055d7ffbf7aa26f19a"
-  integrity sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-modules-amd@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91"
@@ -1054,15 +719,6 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-amd@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz#39e0fb717224b59475b306402bb8eedab01e729c"
-  integrity sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.7.5"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
 "@babel/plugin-transform-modules-commonjs@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz#425127e6045231360858eeaa47a71d75eded7a74"
@@ -1083,16 +739,6 @@
     "@babel/helper-simple-access" "^7.1.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz#1d27f5eb0bcf7543e774950e5b2fa782e637b345"
-  integrity sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.7.5"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.7.4"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
 "@babel/plugin-transform-modules-systemjs@^7.5.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249"
@@ -1102,15 +748,6 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
-"@babel/plugin-transform-modules-systemjs@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30"
-  integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
 "@babel/plugin-transform-modules-umd@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
@@ -1119,14 +756,6 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-modules-umd@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz#1027c355a118de0aae9fee00ad7813c584d9061f"
-  integrity sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
   version "7.4.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz#9d269fd28a370258199b4294736813a60bbdd106"
@@ -1141,13 +770,6 @@
   dependencies:
     regexp-tree "^0.1.13"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220"
-  integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-
 "@babel/plugin-transform-new-target@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
@@ -1155,13 +777,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-new-target@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz#4a0753d2d60639437be07b592a9e58ee00720167"
-  integrity sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-object-super@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9"
@@ -1170,14 +785,6 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.5.5"
 
-"@babel/plugin-transform-object-super@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262"
-  integrity sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.7.4"
-
 "@babel/plugin-transform-parameters@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
@@ -1187,15 +794,6 @@
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-parameters@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce"
-  integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==
-  dependencies:
-    "@babel/helper-call-delegate" "^7.7.4"
-    "@babel/helper-get-function-arity" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-property-literals@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
@@ -1203,14 +801,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-property-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2"
-  integrity sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-react-constant-elements@^7.0.0":
+"@babel/plugin-transform-react-constant-elements@^7.0.0", "@babel/plugin-transform-react-constant-elements@^7.2.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.5.0.tgz#4d6ae4033bc38f8a65dfca2b6235c44522a422fc"
   integrity sha512-c5Ba8cpybZFp1Izkf2sWGuNjOxoQ32tFgBvvYvwGhi4+9f6vGiSK9Gex4uVuO/Va6YJFu41aAh1MzMjUWkp0IQ==
@@ -1218,14 +809,6 @@
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-react-constant-elements@^7.6.3":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.7.4.tgz#499cf732a21ffd62cc4b0016e27c3906097f8982"
-  integrity sha512-U6XkHZ8RnmeEb8jBUOpeo6oFka5RhLgxAVvK4/fBbwoYlsHQYLb8I37ymTPDVsrWjqb94+hueuWQA/1OAA4rAQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-react-display-name@7.2.0", "@babel/plugin-transform-react-display-name@^7.0.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0"
@@ -1297,13 +880,6 @@
   dependencies:
     regenerator-transform "^0.14.0"
 
-"@babel/plugin-transform-regenerator@^7.7.5":
-  version "7.7.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz#3a8757ee1a2780f390e89f246065ecf59c26fce9"
-  integrity sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw==
-  dependencies:
-    regenerator-transform "^0.14.0"
-
 "@babel/plugin-transform-reserved-words@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
@@ -1311,14 +887,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-reserved-words@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb"
-  integrity sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-runtime@7.5.5":
+"@babel/plugin-transform-runtime@7.5.5", "@babel/plugin-transform-runtime@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz#a6331afbfc59189d2135b2e09474457a8e3d28bc"
   integrity sha512-6Xmeidsun5rkwnGfMOp6/z9nSzWpHFNVr2Jx7kwoq4mVatQfQx5S56drBgEHF+XQbKOdIaOiMIINvp/kAwMN+w==
@@ -1328,16 +897,6 @@
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-runtime@^7.7.6":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.6.tgz#4f2b548c88922fb98ec1c242afd4733ee3e12f61"
-  integrity sha512-tajQY+YmXR7JjTwRvwL4HePqoL3DYxpYXIHKVvrOIvJmeHe2y1w4tz5qz9ObUDC9m76rCzIMPyn4eERuwA4a4A==
-  dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    resolve "^1.8.1"
-    semver "^5.5.1"
-
 "@babel/plugin-transform-shorthand-properties@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
@@ -1345,13 +904,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz#74a0a9b2f6d67a684c6fbfd5f0458eb7ba99891e"
-  integrity sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-spread@^7.2.0":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
@@ -1359,13 +911,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-spread@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578"
-  integrity sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-sticky-regex@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
@@ -1374,14 +919,6 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
 
-"@babel/plugin-transform-sticky-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c"
-  integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-
 "@babel/plugin-transform-template-literals@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
@@ -1390,14 +927,6 @@
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-template-literals@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604"
-  integrity sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-typeof-symbol@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
@@ -1405,13 +934,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-typeof-symbol@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e"
-  integrity sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
 "@babel/plugin-transform-typescript@^7.3.2":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"
@@ -1421,6 +943,15 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-typescript" "^7.2.0"
 
+"@babel/plugin-transform-typescript@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.4.tgz#2974fd05f4e85c695acaf497f432342de9fc0636"
+  integrity sha512-X8e3tcPEKnwwPVG+vP/vSqEShkwODOEeyQGod82qrIuidwIrfnsGn11qPM1jBLF4MqguTXXYzm58d0dY+/wdpg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.7.4"
+
 "@babel/plugin-transform-unicode-regex@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
@@ -1430,15 +961,7 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
-"@babel/plugin-transform-unicode-regex@^7.7.4":
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae"
-  integrity sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/preset-env@7.5.5", "@babel/preset-env@^7.4.3":
+"@babel/preset-env@7.5.5", "@babel/preset-env@^7.4.3", "@babel/preset-env@^7.4.5", "@babel/preset-env@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz#bc470b53acaa48df4b8db24a570d6da1fef53c9a"
   integrity sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==
@@ -1550,63 +1073,6 @@
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
 
-"@babel/preset-env@^7.7.1", "@babel/preset-env@^7.7.6":
-  version "7.7.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.6.tgz#39ac600427bbb94eec6b27953f1dfa1d64d457b2"
-  integrity sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.7.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.7.4"
-    "@babel/plugin-proposal-dynamic-import" "^7.7.4"
-    "@babel/plugin-proposal-json-strings" "^7.7.4"
-    "@babel/plugin-proposal-object-rest-spread" "^7.7.4"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.7.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.7.4"
-    "@babel/plugin-syntax-async-generators" "^7.7.4"
-    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
-    "@babel/plugin-syntax-json-strings" "^7.7.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
-    "@babel/plugin-syntax-top-level-await" "^7.7.4"
-    "@babel/plugin-transform-arrow-functions" "^7.7.4"
-    "@babel/plugin-transform-async-to-generator" "^7.7.4"
-    "@babel/plugin-transform-block-scoped-functions" "^7.7.4"
-    "@babel/plugin-transform-block-scoping" "^7.7.4"
-    "@babel/plugin-transform-classes" "^7.7.4"
-    "@babel/plugin-transform-computed-properties" "^7.7.4"
-    "@babel/plugin-transform-destructuring" "^7.7.4"
-    "@babel/plugin-transform-dotall-regex" "^7.7.4"
-    "@babel/plugin-transform-duplicate-keys" "^7.7.4"
-    "@babel/plugin-transform-exponentiation-operator" "^7.7.4"
-    "@babel/plugin-transform-for-of" "^7.7.4"
-    "@babel/plugin-transform-function-name" "^7.7.4"
-    "@babel/plugin-transform-literals" "^7.7.4"
-    "@babel/plugin-transform-member-expression-literals" "^7.7.4"
-    "@babel/plugin-transform-modules-amd" "^7.7.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.7.5"
-    "@babel/plugin-transform-modules-systemjs" "^7.7.4"
-    "@babel/plugin-transform-modules-umd" "^7.7.4"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4"
-    "@babel/plugin-transform-new-target" "^7.7.4"
-    "@babel/plugin-transform-object-super" "^7.7.4"
-    "@babel/plugin-transform-parameters" "^7.7.4"
-    "@babel/plugin-transform-property-literals" "^7.7.4"
-    "@babel/plugin-transform-regenerator" "^7.7.5"
-    "@babel/plugin-transform-reserved-words" "^7.7.4"
-    "@babel/plugin-transform-shorthand-properties" "^7.7.4"
-    "@babel/plugin-transform-spread" "^7.7.4"
-    "@babel/plugin-transform-sticky-regex" "^7.7.4"
-    "@babel/plugin-transform-template-literals" "^7.7.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.7.4"
-    "@babel/plugin-transform-unicode-regex" "^7.7.4"
-    "@babel/types" "^7.7.4"
-    browserslist "^4.6.0"
-    core-js-compat "^3.4.7"
-    invariant "^2.2.2"
-    js-levenshtein "^1.1.3"
-    semver "^5.5.0"
-
 "@babel/preset-flow@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz#afd764835d9535ec63d8c7d4caf1c06457263da2"
@@ -1626,7 +1092,7 @@
     "@babel/plugin-transform-react-jsx-self" "^7.0.0"
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
-"@babel/preset-react@^7.7.0":
+"@babel/preset-react@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.7.4.tgz#3fe2ea698d8fb536d8e7881a592c3c1ee8bf5707"
   integrity sha512-j+vZtg0/8pQr1H8wKoaJyGL2IEk3rG/GIvua7Sec7meXVIvGycihlGMx5xcU00kqCJbwzHs18xTu3YfREOqQ+g==
@@ -1637,7 +1103,7 @@
     "@babel/plugin-transform-react-jsx-self" "^7.7.4"
     "@babel/plugin-transform-react-jsx-source" "^7.7.4"
 
-"@babel/preset-typescript@7.3.3", "@babel/preset-typescript@^7.3.3":
+"@babel/preset-typescript@7.3.3":
   version "7.3.3"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz#88669911053fa16b2b276ea2ede2ca603b3f307a"
   integrity sha512-mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg==
@@ -1645,10 +1111,18 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-typescript" "^7.3.2"
 
-"@babel/register@^7.7.4":
+"@babel/preset-typescript@^7.7.4":
   version "7.7.4"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.4.tgz#45a4956471a9df3b012b747f5781cc084ee8f128"
-  integrity sha512-/fmONZqL6ZMl9KJUYajetCrID6m0xmL4odX7v+Xvoxcv0DdbP/oO0TWIeLUCHqczQ6L6njDMqmqHFy2cp3FFsA==
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.7.4.tgz#780059a78e6fa7f7a4c87f027292a86b31ce080a"
+  integrity sha512-rqrjxfdiHPsnuPur0jKrIIGQCIgoTWMTjlbWE69G4QJ6TIOVnnRnIJhUxNTL/VwDmEAVX08Tq3B1nirer5341w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-transform-typescript" "^7.7.4"
+
+"@babel/register@^7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.0.tgz#4e23ecf840296ef79c605baaa5c89e1a2426314b"
+  integrity sha512-HV3GJzTvSoyOMWGYn2TAh6uL6g+gqKTgEZ99Q3+X9UURT1VPT/WcU46R61XftIc5rXytcOHZ4Z0doDlsjPomIg==
   dependencies:
     find-cache-dir "^2.0.0"
     lodash "^4.17.13"
@@ -1694,7 +1168,7 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2":
   version "7.7.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
   integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
@@ -1815,7 +1289,7 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.7.2", "@babel/types@^7.7.4":
+"@babel/types@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
   integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
@@ -1862,10 +1336,35 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@elastic/charts@^14.0.0":
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-14.0.0.tgz#410c87e9ae53df5848aae09a210fa7d08510b376"
-  integrity sha512-cskrD5Yq6yTTqGOKV2/7dw/eRON1GbWkIgSuWXPIBa/TQMUwiWqxFkxSMUJSbu9xXq07KMblDgXLf73yMc0AyQ==
+"@elastic/apm-rum-core@^4.7.0":
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/@elastic/apm-rum-core/-/apm-rum-core-4.7.0.tgz#b00b58bf7380f2e36652e5333e3ca97608986e40"
+  integrity sha512-/lTZWfA3ces3qoKCx72Sc+w43lZkyktaQlbYoYO86h3tNX7tScc/7YBBHI9oxKMcXweqkKOcpnwNZFy71bb86w==
+  dependencies:
+    error-stack-parser "^1.3.5"
+    es6-promise "^4.2.8"
+    opentracing "^0.14.3"
+    uuid "^3.1.0"
+
+"@elastic/apm-rum-react@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@elastic/apm-rum-react/-/apm-rum-react-0.3.2.tgz#134634643e15ebcf97b6f17b2c74a50afdbe1c64"
+  integrity sha512-hU1srW9noygppyrLmipulu30c+LWEie8V/dQjEqLYMx2mRZRwNIue3midYgWa6qrWqgYZhwpAtWrWcXc+AWk2Q==
+  dependencies:
+    "@elastic/apm-rum" "^4.6.0"
+    hoist-non-react-statics "^3.3.0"
+
+"@elastic/apm-rum@^4.6.0":
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/@elastic/apm-rum/-/apm-rum-4.6.0.tgz#e2ac560dd4a4761c0e9b08c301418b1d4063bdd2"
+  integrity sha512-hsqvyTm5rT6lKgV06wvm8ID9aMsuJyw8wIOPjRwKmvzlTjayabxKTcr50lJJV8jY9OWfDkqymIqpHyCEChQAHQ==
+  dependencies:
+    "@elastic/apm-rum-core" "^4.7.0"
+
+"@elastic/charts@^16.0.2":
+  version "16.0.2"
+  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-16.0.2.tgz#35068a08a19534da62e9bcad700cc7b2a15bc55a"
+  integrity sha512-0tVyltAmAPOAfiRU1iKYk3b9++4oTn6IXvyM4SSj7Ukh5Y90XXmOtGEUPnZTiRPmup9MJi4srrm9ra9k/Kq4UQ==
   dependencies:
     "@types/d3-shape" "^1.3.1"
     classnames "^2.2.6"
@@ -1873,18 +1372,18 @@
     d3-collection "^1.0.7"
     d3-scale "^1.0.7"
     d3-shape "^1.3.4"
-    fp-ts "^1.14.2"
-    konva "^2.6.0"
-    mobx "^4.9.2"
-    mobx-react "^5.4.3"
+    konva "^4.0.18"
     newtype-ts "^0.2.4"
     prop-types "^15.7.2"
-    react "^16.8.3"
-    react-dom "^16.8.3"
-    react-konva "16.8.3"
+    re-reselect "^3.4.0"
+    react-konva "16.10.1-0"
+    react-redux "^7.1.0"
     react-spring "^8.0.8"
+    redux "^4.0.4"
+    reselect "^4.0.0"
     resize-observer-polyfill "^1.5.1"
     ts-debounce "^1.0.0"
+    utility-types "^3.9.0"
     uuid "^3.3.2"
 
 "@elastic/elasticsearch@^7.4.0":
@@ -1934,10 +1433,10 @@
     tabbable "^1.1.0"
     uuid "^3.1.0"
 
-"@elastic/eui@17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-17.0.0.tgz#2b53500b9f4849fdf58f88ea89e10a0b58836acc"
-  integrity sha512-bWTVKbChPGh7AHLxW1o9yp7O3hL9lTVj69DVaaLBOz9K0JnDrWZ5VDvWL9AAguFWq9OEMY9oWjyBhQZr1ZeZbA==
+"@elastic/eui@17.3.1":
+  version "17.3.1"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-17.3.1.tgz#67d883207b2efdb9a48f2d949b95de1e4bbc1064"
+  integrity sha512-fYoPbRXr9mZlTcfSqOCE65yb2Zpsptq4Y1Lg8+aeMw8G5JpMnUx1RaBRe1OJrCRHWpuF0f8Yxg+i1DDqxxLnlA==
   dependencies:
     "@types/lodash" "^4.14.116"
     "@types/numeral" "^0.0.25"
@@ -2371,26 +1870,24 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
-"@jimp/bmp@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.9.3.tgz#98eafc81674ce750f428ac9380007f1a4e90255e"
-  integrity sha512-wXZYccgGQAsIK8DZX0wZE3gbSd2mL2+eheSJMts6I5hQjxhVRZd1Gwu425nUQGzfKCOgKYTW0nLv7/8OoOTTkw==
+"@jimp/bmp@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.8.4.tgz#3246e0c6b073b3e2d9b61075ac0146d9124c9277"
+  integrity sha512-Cf/V+SUyEVxCCP8q1emkarCHJ8NkLFcLp41VMqBihoR4ke0TIPfCSdgW/JXbM/28vvZ5a2bvMe6uOll6cFggvA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
+    "@jimp/utils" "^0.8.4"
     bmp-js "^0.1.0"
-    core-js "^3.4.1"
+    core-js "^2.5.7"
 
-"@jimp/core@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.9.3.tgz#bffbf955c046569bf4b682b575228e31bb41e445"
-  integrity sha512-kB9lvst1QhgYOC963SAuPgv+DdVfxTProphrSffAAoo5eLeQab/Ca3ZUeX1E/SnLSr+NGVnNCd8c9gyuKDiENg==
+"@jimp/core@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.8.4.tgz#fbdb3cb0823301381736e988674f14c282dc5c63"
+  integrity sha512-3fK5UEOEQsfSDhsrAgBT6W8Up51qkeCj9RVjusxUaEGmix34PO/KTVfzURlu6NOpOUvtfNXsCq9xS7cxBTWSCA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
+    "@jimp/utils" "^0.8.4"
     any-base "^1.1.0"
     buffer "^5.2.0"
-    core-js "^3.4.1"
+    core-js "^2.5.7"
     exif-parser "^0.1.12"
     file-type "^9.0.0"
     load-bmfont "^1.3.1"
@@ -2399,256 +1896,231 @@
     pixelmatch "^4.0.2"
     tinycolor2 "^1.4.1"
 
-"@jimp/custom@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.9.3.tgz#b49dfe1d6b24e62fd4101a7db77104024c8d97e8"
-  integrity sha512-2E7yabQMeqjcK8+ZFu3Ja5cWyrB0zv/pmzNSDg/BBPJ59HE0fj/qcERAz6VklcjHUYRUfmE5uODsb+4DE0o/YQ==
+"@jimp/custom@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.8.4.tgz#abd61281ce12194ae23046ee71d60b754b515bc8"
+  integrity sha512-iS/RB3QQKpm4QS8lxxtQzvYDMph9YvOn3d68gMM4pDKn95n3nt5/ySHFv6fQq/yzfox1OPdeYaXbOLvC3+ofqw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/core" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/core" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/gif@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.9.3.tgz#b2b1a519092f94a913a955f252996f9a968930db"
-  integrity sha512-DshKgMQ8lXorI/xTRyeRkZqZ3JqgnL2aGYAhx0SkAunyHgXji27chmrOGj/6KVDBucrDf/6mSexnSoUDnlWrfA==
+"@jimp/gif@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.8.4.tgz#1429a71ed3b055f73d63c9b195fa7f0a46e947b5"
+  integrity sha512-YpHZ7aWzmrviY7YigXRolHs6oBhGJItRry8fh3zebAgKth06GMv58ce84yXXOKX4yQ+QGd6GgOWzePx+KMP9TA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
     omggif "^1.0.9"
 
-"@jimp/jpeg@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.9.3.tgz#a759cb3bccf3cb163166873b9bdc0c949c5991b5"
-  integrity sha512-AJzcTJXfN9BHtpzAbICwR3+GoH0pSr6OYXbAS6yuKwz+xVn9UHrEjQb74CIzIRqrT/VWcIKg29cMQxgokzWY7w==
+"@jimp/jpeg@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.8.4.tgz#effde867116f88f59ac20b44b1a526b11caca026"
+  integrity sha512-7exKk3LNPKJgsFzUPL+mOJtIEHcLp6yU9sVbULffVDjVUun6/Are2tCX8rCXZq28yiUhofzr61k5UqjkKFJXrA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
     jpeg-js "^0.3.4"
 
-"@jimp/plugin-blit@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.9.3.tgz#740346ac62ec0f7ae4458f5fd59c7582e630a8e8"
-  integrity sha512-+UxCsJ3XkRSdpigpTBJ9WkdwUc3OtBlhVZdU6OL6M9ldume5Gj3rTyWvMCqytOK1tZ/+7HmxoWe4IWX31hz9qA==
+"@jimp/plugin-blit@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.8.4.tgz#991b4199cc5506f0faae22b821b14ec93fbce1bb"
+  integrity sha512-H9bpetmOUgEHpkDSRzbXLMXQhr34i8YicYV3EDeuHU8mKlAjtMbVpbp5ZN4mcadTz+EYdTdVNfQNsRCcIb5Oeg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-blur@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.9.3.tgz#9df505aaa63de138060264cf83ed4a98304bf105"
-  integrity sha512-RADcYjZ5vbk5ZrUiK7qv0G4xOpHtu19HWVVX9JTDbm4VByWTxPboVKlgiYLA6l+IxIXNtEqDclsADIM0s9FQhA==
+"@jimp/plugin-blur@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.8.4.tgz#460f79c45eda7f24adf624a691134d6192d3dbb4"
+  integrity sha512-gvEDWW7+MI9Hk1KKzuFliRdDPaofkxB4pRJ/n1hipDoOGcNYFqxx5FGNQ4wsGSDpQ+RiHZF+JGKKb+EIwHg+0Q==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-color@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.9.3.tgz#4a5ad28f68901355878f5330186c260f4f87f944"
-  integrity sha512-gHDA5GVx4/R4fitEACKmWH7hNy0aU48MZWYRxmATvuqY39KidJ0fjwp+brQ3Ivgb35AgFVc2jQYc3U/JXv4RxQ==
+"@jimp/plugin-color@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.8.4.tgz#a9aa525421ea50bf2c1baec7618f73b7e4fc3464"
+  integrity sha512-DHCGMxInCI1coXMIfdZJ5G/4hpt5yZLNB5+oUIxT4aClzyhUjqD4xOcnO7hlPY6LuX8+FX7cYMHhdMfhTXB3Dg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
     tinycolor2 "^1.4.1"
 
-"@jimp/plugin-contain@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.9.3.tgz#d0da9892edea25549611c88e125bfcc59045c426"
-  integrity sha512-vdYAtp65LNDT/hMctow5o0a/SbD41/y7Z9AO7MGsfUIK92Woq90SNTWx7JplDl4HSZGrqaBONnfiEhRiYlDrdg==
+"@jimp/plugin-contain@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.8.4.tgz#2db8c12de910490cd74f339e9414a968b8c9328e"
+  integrity sha512-3wwLXig5LkOMg5FrNZrX/r99ehaA+0s3dkro3CiRg0Ez6Y0fz067so+HdsmqmoG78WY/dCdgdps/xLOW2VV4DQ==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-cover@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.9.3.tgz#2fca63620fcf8145bdecf315cf461588b09d9488"
-  integrity sha512-yOwsvakgyS2/C4iZF1a1wg63QKfYvqb2d6k+rgY/0vaAe44JtEx+Gbg+7iOt4EaMm5BDlxRwmcA2Q8Pef8TvAQ==
+"@jimp/plugin-cover@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.8.4.tgz#a09bfbbe88129754ca35e281707bc5ed3f3f0c63"
+  integrity sha512-U0xmSfGLmw0Ieiw00CM8DQ+XoQVBxbjsLE5To8EejnyLx5X+oNZ8r7E5EsQaushUlzij95IqMCloo+nCGhdYMw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-crop@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.9.3.tgz#9b19c11293714a99c03d4b517ab597a5f88823e8"
-  integrity sha512-kqMXSyY8hrfo0idr6qY2USOWPrNqpDWs+D6Vwa+kV6SGJhj3rMTIcptQDaamIETSxbjkE8rwUu3K4Q5UD69D7w==
+"@jimp/plugin-crop@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.8.4.tgz#ca5bd359c4e4b2374777bae6130e8b94552932fa"
+  integrity sha512-Neqs0K4cr7SU9nSte2qvGVh/8+K9ArH8mH1fWhZw4Zq8qD9NicX+g5hqmpmeSjOKD73t/jOmwvBevfJDu2KKSA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-displace@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.9.3.tgz#07645687b29ebc8a8491244410172795d511ba21"
-  integrity sha512-0AdwxYRWDmJ2wIRIj2RR3sRmNjMhcy5Kwt9Jbi/RRnzxkRScZAiyzkNZhBul23EM7ClfjrUrZufuUvRMHxZRDw==
+"@jimp/plugin-displace@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.8.4.tgz#c6d5cff889e52cb64194979967e6bd7fff4d5d1b"
+  integrity sha512-qKCwAP2lAO3R8ofYaEF/Gh+sfcjzZLtEiYHzjx/mYvPpXS6Yvkvl28aUH8pwdJYT+QYGelHmOne0RJvjsac1NQ==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-dither@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.9.3.tgz#292b3ee617a5dcfe065d13b643055e910f8b6934"
-  integrity sha512-8OE+Xak9xepiCwSV+oAsb/gupTnttG3aDKxtpSZjwHebnr+k1VG8NgICbMSFATTVJqqZ18oj6LC+5726qHUJ9w==
+"@jimp/plugin-dither@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.8.4.tgz#a2320d6a8c467cf7697109e0c5ed4ee3d3898b73"
+  integrity sha512-19+y5VAO6d0keRne9eJCdOeB9X0LFuRdRSjgwl/57JtREeoPj+iKBg6REBl4atiSGd7/UCFg3wRtFOw24XFKgw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-flip@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.9.3.tgz#a755ffa1d860106067215987cbac213501d22b41"
-  integrity sha512-w+lzE1ZF/UOjB8qJdeIm+dLQtOK1obZwGYdCIbgxZxw4SfkkjAftJdY8o8RNOXhHDZqGu+cYQZbMKP1zcoNkyQ==
+"@jimp/plugin-flip@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.8.4.tgz#08bf46470c3c0b4890691f554c28ccf17813746f"
+  integrity sha512-1BtKtc8cANuGgiWyOmltQZaR3Y5Og/GS/db8wBpFNLJ33Ir5UAGN2raDtx4EYEd5okuRVFj3OP+wAZl69m72LQ==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-gaussian@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.3.tgz#b10b5a5b4c37cb4edc3ed22a9b25294e68daf2f8"
-  integrity sha512-RPrWwzlZsbWC2opSgeyWt30JU9Uwg1+GwBnoNpEMLKeqm0Dv6snASASa4zVtviGWAIq//p3Jrap7g57hKqL0Cg==
+"@jimp/plugin-gaussian@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.8.4.tgz#f3be12c5f16c5670959ab711e69b2963f66f7b4f"
+  integrity sha512-qYcVmiJn8l8uDZqk4FlB/qTV8fJgiJAh/xc/WKNEp2E8qFEgxoIPeimPHO8cJorEHqlh8I8l24OZkTkkEKaFfw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-invert@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.9.3.tgz#723a873133a1d62f9b93e023991f262c85917c78"
-  integrity sha512-0lRsh7IPkzyYqExrZDT50h38xdlB/+KrdiDcuxWwWyIlKauLMR0kInjwf8sPeb3elPLeETmze7uwPAxrIAtsGQ==
+"@jimp/plugin-invert@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.8.4.tgz#fd4577beba2973f663164f5ee454b2172ca56b34"
+  integrity sha512-OQ/dFDbBUmEd935Gitl5Pmgz+nLVyszwS0RqL6+G1U9EHYBeiHDrmY2sj7NgDjDEJYlRLxGlBRsTIPHzF3tdNw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-mask@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.9.3.tgz#6329ec861269244ab10ab9b3f54b1624c4ce0bab"
-  integrity sha512-nZ0J62Hly9JtMZctlSDVgnTd8Fg2XGikzAYilSTCjzIRtbXL5Be/qSAZrMfLD3CZ8exTxdlEGRkEJI3RZKXYCw==
+"@jimp/plugin-mask@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.8.4.tgz#0dfe02a14530c3bddfc258e83bd3c979e53d15ef"
+  integrity sha512-uqLdRGShHwCd9RHv8bMntTfDNDI2pcEeE7+F868P6PngWLKrzQCpuAyTnK6WK0ZN95fSsgy7TzCoesYk+FchkQ==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-normalize@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.9.3.tgz#564155032d1b9dc567dbb7427a85606a25427c30"
-  integrity sha512-0IvgTt4R15QJnoCHvvqlK56zOtCsQV7Mkx757kdNah8uyPGjadTcFBuqCaOMK943X36IIv+o7Ix7yvNUJZt4aw==
+"@jimp/plugin-normalize@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.8.4.tgz#aa2c3131082b6ceef2fb6222323db9f7d837447c"
+  integrity sha512-+ihgQeVD8syWxw12F5ngUUdtlIcGDqH7hEoHcwVVGOFfaJqR4YBQR4FM3QLFFFdi2X/uK2nGJt9cMh0UaINEgw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-print@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.9.3.tgz#b4470137312232de9b35eaf412cd753f999c58d8"
-  integrity sha512-pV6oX5Bhe9O/dbgrotz46Bv6u1M+/n9G0kRUunDjwzXrvON5raBFEJHQDPcTXiqPT25Gc9Ba4/Akfo/Zl6+wgQ==
+"@jimp/plugin-print@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.8.4.tgz#c110d6e7632e3c9cf47ce395e36b0f3c1461a9ca"
+  integrity sha512-Wg5tZI3hW5DG9Caz4wg4ZolS3Lvv4MFAxORPAeWeahDpHs38XZ7ydJ0KR39p2oWJPP0yIFv1fETYpU7BiJPRRw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
     load-bmfont "^1.4.0"
 
-"@jimp/plugin-resize@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.9.3.tgz#916abd57c4f9b426984354c77555ade1efda7a82"
-  integrity sha512-YzqVE8QoDIZpVuI52v+WejwEjEEiJfNFviQfprfm5af7uSSseZgDw1sJ0koqAu+liMSY+Ewp79v2SDrKoJKqtg==
+"@jimp/plugin-resize@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.8.4.tgz#6690f50c98cfd89ac3682b58ba9623e7c46e0be6"
+  integrity sha512-z9tumvsQja/YFTSeGvofYLvVws8LZYLYVW8l17hBETzfZQdVEvPOdWKkXqsAsK5uY9m8M5rH7kR8NZbCDVbyzA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-rotate@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.9.3.tgz#aa0d674c08726c0ae3ebc7f2adbfca0a927b1d9f"
-  integrity sha512-kADY2pI3/yMyHbuyvKB4nqPoKf8DPQBU1b4zz2K7SxcwKh1krFf4Fa9mmhhDLoFwuNSy0SPb1JCMUO4BtFCFLA==
+"@jimp/plugin-rotate@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.8.4.tgz#bf3ea70d10123f1372507b74d06bfefb40b3e526"
+  integrity sha512-PVxpt3DjqaUnHP6Nd3tzZjl4SYe/FYXszGTshtx51AMuvZLnpvekrrclYyc7Dc1Ry3kx3ma6UuLCvmf85hrdmw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugin-scale@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.9.3.tgz#427fed7642883c27601aae33c25413980b6a2c50"
-  integrity sha512-vZaiL5Qc+WrgGEfUe4Y0vG+qbT6pe2TW68/mu124E1tKVcZjHKZUeFN0Wr/hP2myN6nqTYj0/sord2OS/04JpA==
+"@jimp/plugin-scale@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.8.4.tgz#2de9cc80d49f6a36e4177b22e0ab1d4305331c2e"
+  integrity sha512-PrBTOMJ5n4gbIvRNxWfc1MdgHw4vd5r1UOHRVuc6ZQ9Z/FueBuvIidnz7GBRHbsRm3IjckvsLfEL1nIK0Kqh3A==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
 
-"@jimp/plugins@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.9.3.tgz#bdff9d49484469c4d74ef47c2708e75773ca22b9"
-  integrity sha512-KYCSgFGoZBNC0224X5yUnMHCZnCdUVrsu2Yo67o3XZfUgDjO81J+vdzZ0twpPQ6qLLVAP+nQ8hkRV/QzEUstMw==
-  dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/plugin-blit" "^0.9.3"
-    "@jimp/plugin-blur" "^0.9.3"
-    "@jimp/plugin-color" "^0.9.3"
-    "@jimp/plugin-contain" "^0.9.3"
-    "@jimp/plugin-cover" "^0.9.3"
-    "@jimp/plugin-crop" "^0.9.3"
-    "@jimp/plugin-displace" "^0.9.3"
-    "@jimp/plugin-dither" "^0.9.3"
-    "@jimp/plugin-flip" "^0.9.3"
-    "@jimp/plugin-gaussian" "^0.9.3"
-    "@jimp/plugin-invert" "^0.9.3"
-    "@jimp/plugin-mask" "^0.9.3"
-    "@jimp/plugin-normalize" "^0.9.3"
-    "@jimp/plugin-print" "^0.9.3"
-    "@jimp/plugin-resize" "^0.9.3"
-    "@jimp/plugin-rotate" "^0.9.3"
-    "@jimp/plugin-scale" "^0.9.3"
-    core-js "^3.4.1"
+"@jimp/plugins@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.8.4.tgz#af24c0686aec327f3abcc50ba5bbae1df2113fb0"
+  integrity sha512-Vd0oCe0bj7c+crHL6ee178q2c1o50UnbCmc0imHYg7M+pY8S1kl4ubZWwkAg2W96FCarGrm9eqPvCUyAdFOi9w==
+  dependencies:
+    "@jimp/plugin-blit" "^0.8.4"
+    "@jimp/plugin-blur" "^0.8.4"
+    "@jimp/plugin-color" "^0.8.4"
+    "@jimp/plugin-contain" "^0.8.4"
+    "@jimp/plugin-cover" "^0.8.4"
+    "@jimp/plugin-crop" "^0.8.4"
+    "@jimp/plugin-displace" "^0.8.4"
+    "@jimp/plugin-dither" "^0.8.4"
+    "@jimp/plugin-flip" "^0.8.4"
+    "@jimp/plugin-gaussian" "^0.8.4"
+    "@jimp/plugin-invert" "^0.8.4"
+    "@jimp/plugin-mask" "^0.8.4"
+    "@jimp/plugin-normalize" "^0.8.4"
+    "@jimp/plugin-print" "^0.8.4"
+    "@jimp/plugin-resize" "^0.8.4"
+    "@jimp/plugin-rotate" "^0.8.4"
+    "@jimp/plugin-scale" "^0.8.4"
+    core-js "^2.5.7"
     timm "^1.6.1"
 
-"@jimp/png@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.9.3.tgz#5c1bbb89b32e2332891a13efdb423e87287a8321"
-  integrity sha512-LJXUemDTSbTGAGEp9hNQH0uTRSB8gYeE6FsfT3M00oZincu6/WzDzl0P8E95rMjNxZqAihdTyOP3+kcrbbqX+w==
+"@jimp/png@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.8.4.tgz#d150ddaaebafcda83d820390f62a4d3c409acc03"
+  integrity sha512-DLj260SwQr9ZNhSto1BacXGNRhIQiLNOESPoq5DGjbqiPCmYNxE7CPlXB1BVh0T3AmZBjnZkZORU0Y9wTi3gJw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/utils" "^0.8.4"
+    core-js "^2.5.7"
     pngjs "^3.3.3"
 
-"@jimp/tiff@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.9.3.tgz#a4498c0616fb24034f5512b159b75b0aea389e9c"
-  integrity sha512-w9H6dT+GDHN//Srsv27JhRn7R2byzUahOGfFw7KpIn95jg0ogcxjKTo/RAGQC56sr4U092e4Npl7E85Lt934WQ==
+"@jimp/tiff@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.8.4.tgz#bc18c32cef996ad986a92bb7d926d6abd1db9d10"
+  integrity sha512-SQmf1B/TbCtbwzJReLw/lzGqbeu8MOfT+wkaia0XWS72H6bEW66PTQKhB4/3uzC/Xnmsep1WNQITlwcWdgc36Q==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    core-js "^3.4.1"
+    core-js "^2.5.7"
     utif "^2.0.1"
 
-"@jimp/types@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.9.3.tgz#75337245a1a8c7c84a414beca3cfeded338c0ef1"
-  integrity sha512-hUJKoT2IhnbO/trxNWzN19n8g+p7aKbM1R+71n4wMZnD41PzrVtz+sBBCdB+JCjBJs/i7fJt4d9z0i3Xe8m7Zw==
-  dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/bmp" "^0.9.3"
-    "@jimp/gif" "^0.9.3"
-    "@jimp/jpeg" "^0.9.3"
-    "@jimp/png" "^0.9.3"
-    "@jimp/tiff" "^0.9.3"
-    core-js "^3.4.1"
+"@jimp/types@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.8.4.tgz#01df00a5adb955cb4ba79df1288408faa3bb40ed"
+  integrity sha512-BCehQ5hrTOGDGdeROwXOYqgFGAzJPkuXmVJXgMgBoW1YjoGWhXJ5iShaJ/l7DRErrdezoWUdAhTFlV5bJf51dg==
+  dependencies:
+    "@jimp/bmp" "^0.8.4"
+    "@jimp/gif" "^0.8.4"
+    "@jimp/jpeg" "^0.8.4"
+    "@jimp/png" "^0.8.4"
+    "@jimp/tiff" "^0.8.4"
+    core-js "^2.5.7"
     timm "^1.6.1"
 
-"@jimp/utils@^0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.9.3.tgz#fd7af0d1138febbeacc841be4b802218444ce088"
-  integrity sha512-9D2Of6BcjYONtl77YfmU2y5aRMLe0/O2e2aQvfCxdNwD33jRdwNdN4i3m73dpiClNquApIjL4nYGhTixA4UstA==
+"@jimp/utils@^0.8.4":
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.8.4.tgz#a6bbdc13dba99b95d4cabf0bde87b1bcd2230d25"
+  integrity sha512-6Cwplao7IgwhFRijMvvyjdV7Sa7Fw71vS1aDsUDCVpi3XHsiLUM+nPTno6OKjzg2z2EufuolWPEvuq/GSte4lA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    core-js "^3.4.1"
+    core-js "^2.5.7"
 
 "@mapbox/extent@0.4.0":
   version "0.4.0"
@@ -2774,64 +2246,61 @@
     utils-error-reviver "^1.0.0"
     utils-error-to-json "^1.0.0"
 
-"@microsoft/api-documenter@7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/api-documenter/-/api-documenter-7.4.3.tgz#af5e69891c4b62e963a697127b69a25396d0123d"
-  integrity sha512-+RdqNNt9ssUCBAsLvKVPzbRD5RYd0HRgmnhRuEr+eZg2tj2tqfP9AhLWK5SBVn68CX5hyeWHEnQJ4HikDTZN8A==
+"@microsoft/api-documenter@7.7.2":
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-documenter/-/api-documenter-7.7.2.tgz#b6897f052ad447d6bb74f806287e8846c64691da"
+  integrity sha512-4mWE5G3grYd4PX5D6awiKa3B3GOXumkyGspgeTwlOBxrmj0FuVFRNPVZxGU0NqYnaw/bW4cg4ftUnSDzycrW+A==
   dependencies:
-    "@microsoft/api-extractor-model" "7.4.1"
-    "@microsoft/node-core-library" "3.14.2"
-    "@microsoft/ts-command-line" "4.2.8"
+    "@microsoft/api-extractor-model" "7.7.0"
+    "@microsoft/node-core-library" "3.18.0"
+    "@microsoft/ts-command-line" "4.3.5"
     "@microsoft/tsdoc" "0.12.14"
     colors "~1.2.1"
     js-yaml "~3.13.1"
     resolve "1.8.1"
 
-"@microsoft/api-extractor-model@7.4.1":
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.4.1.tgz#3376f72570d336960c9b7b0dd44c8a0dbbe34604"
-  integrity sha512-rBO/QbrOMCdL8e9qwhIu1aH4C5sKOnUO1YhEh3+kVieFzTjiRnync7ghyQOtCaCVl2VXtp4LuOIv02e82oRqUg==
+"@microsoft/api-extractor-model@7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.7.0.tgz#a5e86a638fa3fea283aeebc4785d8150652f30c6"
+  integrity sha512-9yrSr9LpdNnx7X8bXVb/YbcQopizsr43McAG7Xno5CMNFzbSkmIr8FJL0L+WGfrSWSTms9Bngfz7d1ScP6zbWQ==
   dependencies:
-    "@microsoft/node-core-library" "3.14.2"
+    "@microsoft/node-core-library" "3.18.0"
     "@microsoft/tsdoc" "0.12.14"
-    "@types/node" "8.5.8"
 
-"@microsoft/api-extractor@7.4.2":
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.4.2.tgz#440023cf05c69840e054cdb5f85cab9680227a40"
-  integrity sha512-O8OEaFvsvWEuwkOcVyWegIAFDY6TBZBvSIoOKLsSQYiQZtryGf13e2ym83iewhbUN7RmuOJtyQUKlBvcJbpgQA==
+"@microsoft/api-extractor@7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.7.0.tgz#1550a5b88ca927d57e9c9698356a2f9375c5984c"
+  integrity sha512-1ngy95VA1s7GTE+bkS7QoYTg/TZs54CdJ46uAhl6HlyDJut4p/aH46W70g2XQs9VniIymW1Qe6fqNmcQUx5CVg==
   dependencies:
-    "@microsoft/api-extractor-model" "7.4.1"
-    "@microsoft/node-core-library" "3.14.2"
-    "@microsoft/ts-command-line" "4.2.8"
+    "@microsoft/api-extractor-model" "7.7.0"
+    "@microsoft/node-core-library" "3.18.0"
+    "@microsoft/ts-command-line" "4.3.5"
     "@microsoft/tsdoc" "0.12.14"
     colors "~1.2.1"
     lodash "~4.17.15"
     resolve "1.8.1"
     source-map "~0.6.1"
-    typescript "~3.5.3"
+    typescript "~3.7.2"
 
-"@microsoft/node-core-library@3.14.2":
-  version "3.14.2"
-  resolved "https://registry.yarnpkg.com/@microsoft/node-core-library/-/node-core-library-3.14.2.tgz#255d421963f2d447a19f935e3c8eb3053e8e381b"
-  integrity sha512-bd8XhqhIvXsWg/SSNsZJdJxkN8Ucj7XKQkRe4cdYiKqpVdAREvW/shw8AoZIdgvjLI53029I/MO2Wn/AjGD3Jw==
+"@microsoft/node-core-library@3.18.0":
+  version "3.18.0"
+  resolved "https://registry.yarnpkg.com/@microsoft/node-core-library/-/node-core-library-3.18.0.tgz#9a9123354b3e067bb8a975ba791959ffee1322ed"
+  integrity sha512-VzzSHtcwgHVW1xbHqpngfn+OS1trAZ1Tw3XXBlMsEKe7Wz7FF2gLr0hZa6x9Pemk5pkd4tu4+GTSOJjCKGjrgg==
   dependencies:
-    "@types/fs-extra" "5.0.4"
-    "@types/jju" "~1.4.0"
-    "@types/node" "8.5.8"
-    "@types/z-schema" "3.16.31"
+    "@types/node" "8.10.54"
     colors "~1.2.1"
     fs-extra "~7.0.1"
     jju "~1.4.0"
+    semver "~5.3.0"
+    timsort "~0.3.0"
     z-schema "~3.18.3"
 
-"@microsoft/ts-command-line@4.2.8":
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/@microsoft/ts-command-line/-/ts-command-line-4.2.8.tgz#92f4c85d0a4b893090fe6605f255e272b270495e"
-  integrity sha512-K4sc8/OJ/y5uQPWJFACMExS2UIqF+t3vdQ2A9Mhl9tMsp70CXf0sp6Y9ENYju1K7XWwR5Clh8dkP2jO1Ntlg1g==
+"@microsoft/ts-command-line@4.3.5":
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/@microsoft/ts-command-line/-/ts-command-line-4.3.5.tgz#78026d20244f39978d3397849ac8c40c0c2d4079"
+  integrity sha512-CN3j86apNOmllUmeJ0AyRfTYA2BP2xlnfgmnyp1HWLqcJmR/zLe/fk/+gohGnNt7o5/qHta3681LQhO2Yy3GFw==
   dependencies:
     "@types/argparse" "1.0.33"
-    "@types/node" "8.5.8"
     argparse "~1.0.9"
     colors "~1.2.1"
 
@@ -3125,17 +2594,17 @@
     "@types/node" ">=8.9.0"
     axios "^0.18.0"
 
-"@storybook/addon-actions@^5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.8.tgz#f63c6e1afb59e94ca1ebc776b7cad9b815e7419e"
-  integrity sha512-hadk+UaU6upOW0g447RfLRrnXRgE2rjRVk5sT8mVxBMj032NnwUd7ie/BZwy1yg5B8oFtpkgQYwqhPtoO2xBaQ==
-  dependencies:
-    "@storybook/addons" "5.2.8"
-    "@storybook/api" "5.2.8"
-    "@storybook/client-api" "5.2.8"
-    "@storybook/components" "5.2.8"
-    "@storybook/core-events" "5.2.8"
-    "@storybook/theming" "5.2.8"
+"@storybook/addon-actions@^5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.6.tgz#4fe411fc3bdb1d44058f23fbc8eb8d1bac29d521"
+  integrity sha512-CwTJPqe3NcEU7oqS5KoiCX9FXYmI2Dyp1Sh6r90JmXZ8B49ZXm6BDLX0gS3TooD6/AcdU8xdBcSvN0CkxQ5QGA==
+  dependencies:
+    "@storybook/addons" "5.2.6"
+    "@storybook/api" "5.2.6"
+    "@storybook/client-api" "5.2.6"
+    "@storybook/components" "5.2.6"
+    "@storybook/core-events" "5.2.6"
+    "@storybook/theming" "5.2.6"
     core-js "^3.0.1"
     fast-deep-equal "^2.0.1"
     global "^4.3.2"
@@ -3152,15 +2621,15 @@
   dependencies:
     global "^4.3.2"
 
-"@storybook/addon-info@^5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-info/-/addon-info-5.2.8.tgz#bf29741c21c16c85f4a7007606e8afa3eb77965c"
-  integrity sha512-iY8malDF6yayLfpiffMwDXOWeeoXdRbxse1f+kNHK4aVEUXLyh+uiogPhO8dzVDy8dQw1LP9C7xKZe2Dls59kw==
+"@storybook/addon-info@^5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-info/-/addon-info-5.2.6.tgz#25c8405ded9e20b1bf3b607d235601b087a73a5f"
+  integrity sha512-2ct91Zf14Be5HZ77szPpJK4Fvy4D/haQtziCfv9UKZXaBm7Rz9vKPuM3uCcfMywh1eMunhhluhJ/3bxmttHXAw==
   dependencies:
-    "@storybook/addons" "5.2.8"
-    "@storybook/client-logger" "5.2.8"
-    "@storybook/components" "5.2.8"
-    "@storybook/theming" "5.2.8"
+    "@storybook/addons" "5.2.6"
+    "@storybook/client-logger" "5.2.6"
+    "@storybook/components" "5.2.6"
+    "@storybook/theming" "5.2.6"
     core-js "^3.0.1"
     global "^4.3.2"
     jsx-to-string "^1.4.0"
@@ -3174,17 +2643,17 @@
     react-lifecycles-compat "^3.0.4"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-knobs@^5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-5.2.8.tgz#e0d03823969921a0da57a329376d03066dd749ee"
-  integrity sha512-5SAMJj+0pbhCiyNkKjkUxEbM9L/wrOE4HTvM7gvm902fULuKZklb3wV8iiUNRfIPCs6VhmmIhPzXICGjhW5xIg==
-  dependencies:
-    "@storybook/addons" "5.2.8"
-    "@storybook/api" "5.2.8"
-    "@storybook/client-api" "5.2.8"
-    "@storybook/components" "5.2.8"
-    "@storybook/core-events" "5.2.8"
-    "@storybook/theming" "5.2.8"
+"@storybook/addon-knobs@^5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-5.2.6.tgz#28b2c74ea26519fef204915142a03bd7476f247c"
+  integrity sha512-whEZl6PpUPtOWBhmWlZ11EloxN6ad3WrJk5FyYlg3BcXG/HtlMVogBKdch83SYTT9jhHwbfwKnAng9J3UjgPbQ==
+  dependencies:
+    "@storybook/addons" "5.2.6"
+    "@storybook/api" "5.2.6"
+    "@storybook/client-api" "5.2.6"
+    "@storybook/components" "5.2.6"
+    "@storybook/core-events" "5.2.6"
+    "@storybook/theming" "5.2.6"
     "@types/react-color" "^3.0.1"
     copy-to-clipboard "^3.0.8"
     core-js "^3.0.1"
@@ -3198,13 +2667,13 @@
     react-lifecycles-compat "^3.0.4"
     react-select "^3.0.0"
 
-"@storybook/addon-storyshots@^5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-storyshots/-/addon-storyshots-5.2.8.tgz#1878d0cc7490941cc4006bd3bd96bfd06005e1e3"
-  integrity sha512-izUQTwzt1I0TdtYn3jv6yFIaW7H48gPW+nehisVXOA+0b0f+IySnC63+q3YcCQcC9cmZ5xxzZNJ1XycrsyVm0A==
+"@storybook/addon-storyshots@^5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-storyshots/-/addon-storyshots-5.2.6.tgz#cc94f256cb28e2769a3dd472af420f8e0fcc306f"
+  integrity sha512-04UX6VXFOrv1o41L8P3mevFYN2H9RU6JCNXfqCJLtD4ZxP5iDoXjF8/0VWLdqCPANe9Ng58r5BnZgNwWPjcGbA==
   dependencies:
     "@jest/transform" "^24.9.0"
-    "@storybook/addons" "5.2.8"
+    "@storybook/addons" "5.2.6"
     core-js "^3.0.1"
     glob "^7.1.3"
     global "^4.3.2"
@@ -3213,29 +2682,29 @@
     regenerator-runtime "^0.12.1"
     ts-dedent "^1.1.0"
 
-"@storybook/addons@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.8.tgz#f8bf8bd555b7a69fb1e9a52ab8cdb96384d931ff"
-  integrity sha512-yAo1N5z/45bNIQP8SD+HVTr7X898bYAtz1EZBrQ6zD8bGamzA2Br06rOLL9xXw29eQhsaVnPlqgDwCS1sTC7aQ==
+"@storybook/addons@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.6.tgz#c1278137acb3502e068b0b0d07a8371c607e9c02"
+  integrity sha512-5MF64lsAhIEMxTbVpYROz5Wez595iwSw45yXyP8gWt12d+EmFO5tdy7cYJCxcMuVhDfaCI78tFqS9orr1atVyA==
   dependencies:
-    "@storybook/api" "5.2.8"
-    "@storybook/channels" "5.2.8"
-    "@storybook/client-logger" "5.2.8"
-    "@storybook/core-events" "5.2.8"
+    "@storybook/api" "5.2.6"
+    "@storybook/channels" "5.2.6"
+    "@storybook/client-logger" "5.2.6"
+    "@storybook/core-events" "5.2.6"
     core-js "^3.0.1"
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
-"@storybook/api@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f"
-  integrity sha512-rFrPtTFDIPQoicLwq1AVsOvZNTUKnjD1w/NX1kKcyuWLL9BcOkU3YNLBlliGBg2JX/yS+fJKMyKk4NMzNBCZCg==
+"@storybook/api@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.6.tgz#43d3c20b90e585e6c94b36e29845d39704ae2135"
+  integrity sha512-X/di44/SAL68mD6RHTX2qdWwhjRW6BgcfPtu0dMd38ErB3AfsfP4BITXs6kFOeSM8kWiaQoyuw0pOBzA8vlYug==
   dependencies:
-    "@storybook/channels" "5.2.8"
-    "@storybook/client-logger" "5.2.8"
-    "@storybook/core-events" "5.2.8"
-    "@storybook/router" "5.2.8"
-    "@storybook/theming" "5.2.8"
+    "@storybook/channels" "5.2.6"
+    "@storybook/client-logger" "5.2.6"
+    "@storybook/core-events" "5.2.6"
+    "@storybook/router" "5.2.6"
+    "@storybook/theming" "5.2.6"
     core-js "^3.0.1"
     fast-deep-equal "^2.0.1"
     global "^4.3.2"
@@ -3249,35 +2718,35 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
-"@storybook/channel-postmessage@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.8.tgz#7a84869ce0fc270c3b5dcd7fa4ed798b6055816f"
-  integrity sha512-RS3iDW1kpfODN+kBq3youn+KtLqHslZ4m7mTlOL80BUHKb4YkrA1lVkzpy1kVMWBU523pyDVQUVXr+M8y3iVug==
+"@storybook/channel-postmessage@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.6.tgz#60aaef0e80300c9812a571ca3ce0f28e2c404f04"
+  integrity sha512-y+63wWiEc/Q4s4MZ3KJ//5A8j5VLufxuLvPxwv9FuS4z8lmN0fqeGJn857qIlFGbZhzsQaoRdmfsCQpBBgUneg==
   dependencies:
-    "@storybook/channels" "5.2.8"
-    "@storybook/client-logger" "5.2.8"
+    "@storybook/channels" "5.2.6"
+    "@storybook/client-logger" "5.2.6"
     core-js "^3.0.1"
     global "^4.3.2"
     telejson "^3.0.2"
 
-"@storybook/channels@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.8.tgz#79a99ad85dcacb688073c22340c5b7d16b801202"
-  integrity sha512-mFwQec27QSrqcl+IH0xA+4jfoEqC4m1G99LBHt/aTDjLZXclX1A470WqeZCp7Gx4OALpaPEVTaaaKPbiKz4C6w==
+"@storybook/channels@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.6.tgz#e2837508864dc4d5b5e03f078886f0ce113762ea"
+  integrity sha512-/UsktYsXuvb1efjVPCEivhh5ywRhm7hl73pQnpJLJHRqyLMM2I5nGPFELTTNuU9yWy7sP9QL5gRqBBPe1sqjZQ==
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-api@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.8.tgz#1de791f7888442287f848e5f544eb883c5edc0da"
-  integrity sha512-OCKhZ+2sS3ot0ZV48nD79BWVzvvdMjUFYl0073ps5q+1+TLic1AlNmH0Sb5/9NrYXNV86v3VrM2jUbGsKe1qyw==
-  dependencies:
-    "@storybook/addons" "5.2.8"
-    "@storybook/channel-postmessage" "5.2.8"
-    "@storybook/channels" "5.2.8"
-    "@storybook/client-logger" "5.2.8"
-    "@storybook/core-events" "5.2.8"
-    "@storybook/router" "5.2.8"
+"@storybook/client-api@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.6.tgz#5760cb4302d82ce9210a63f3f55b1e05f04759c1"
+  integrity sha512-upynf4ER2fkThNnE+mBlfRFFJxTiOh60fho1ODFcBun9BbvRD2wOHLvw7+WigIhb99HM20vk8f2dhv3I5Udzlg==
+  dependencies:
+    "@storybook/addons" "5.2.6"
+    "@storybook/channel-postmessage" "5.2.6"
+    "@storybook/channels" "5.2.6"
+    "@storybook/client-logger" "5.2.6"
+    "@storybook/core-events" "5.2.6"
+    "@storybook/router" "5.2.6"
     common-tags "^1.8.0"
     core-js "^3.0.1"
     eventemitter3 "^4.0.0"
@@ -3286,23 +2755,22 @@
     lodash "^4.17.15"
     memoizerific "^1.11.3"
     qs "^6.6.0"
-    stable "^0.1.8"
     util-deprecate "^1.0.2"
 
-"@storybook/client-logger@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.8.tgz#5affe2f9dbbee374721fd2e8729116f5ac39c779"
-  integrity sha512-+oVSEJdeh7TQ1Bhanb3mCr7fc3Bug3+K79abZ28J45Ub5x4L/ZVClj1xMgUsJs30BZ5FB8vhdgH6TQb0NSxR4A==
+"@storybook/client-logger@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.6.tgz#cfc4536e9b724b086f7509c2bb34c221016713c9"
+  integrity sha512-hJvPD267cCwLIRMOISjDH8h9wbwOcXIJip29UlJbU9iMtZtgE+YelmlpmZJvqcDfUiXWWrOh7tP76mj8EAfwIQ==
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/components@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.8.tgz#f5d4a06ba4ba8c700b2d962deae182105b72fb99"
-  integrity sha512-h9l/LAMaj+emUCOyY/+ETy/S3P0npwQU280J88uL4O9XJALJ72EKfyttBCvMLvpM50E+fAPeDzuYn0t5qzGGxg==
+"@storybook/components@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.6.tgz#cddb60227720aea7cae34fe782d0370bcdbd4005"
+  integrity sha512-C7OS90bZ1ZvxlWUZ3B2MPFFggqAtUo7X8DqqS3IwsuDUiK9dD/KS0MwPgOuFDnOTW1R5XqmQd/ylt53w3s/U5g==
   dependencies:
-    "@storybook/client-logger" "5.2.8"
-    "@storybook/theming" "5.2.8"
+    "@storybook/client-logger" "5.2.6"
+    "@storybook/theming" "5.2.6"
     "@types/react-syntax-highlighter" "10.1.0"
     "@types/react-textarea-autosize" "^4.3.3"
     core-js "^3.0.1"
@@ -3321,32 +2789,32 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
-"@storybook/core-events@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4"
-  integrity sha512-NkQKC5doO/YL9gsO61bqaxgveKktkiJWZ3XyyhL1ZebgnO9wTlrU+i9b5aX73Myk1oxbicQw9KcwDGYk0qFuNQ==
+"@storybook/core-events@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.6.tgz#34c9aae256e7e5f4a565b81f1e77dda8bccc6752"
+  integrity sha512-W8kLJ7tc0aAxs11CPUxUOCReocKL4MYGyjTg8qwk0USLzPUb/FUQWmhcm2ilFz6Nz8dXLcKrXdRVYTmiMsgAeg==
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.8.tgz#3f6ddbacc705c1893deb15582c3a0a1ecd882cd1"
-  integrity sha512-P1Xx4setLBESPgS5KgL7Jskf5Q6fRa3ApwPt+ocjDoSDGCvsV7cUEpAp09U65u+89e5K4nQxvaZouhknFQBc1A==
+"@storybook/core@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.6.tgz#60c092607158d7d28db59f7e67da4f7e12703fb2"
+  integrity sha512-q7Ful7TCm9nmjgLsJFqIwVv395NlaOXgGajyaQCQlCKB2V+jgs7GDmdCNNdWAOue4eAsFU6wQSP9lWtq0yzK4w==
   dependencies:
-    "@babel/plugin-proposal-class-properties" "^7.7.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
+    "@babel/plugin-proposal-class-properties" "^7.3.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.3.2"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
-    "@babel/plugin-transform-react-constant-elements" "^7.6.3"
-    "@babel/preset-env" "^7.7.1"
-    "@storybook/addons" "5.2.8"
-    "@storybook/channel-postmessage" "5.2.8"
-    "@storybook/client-api" "5.2.8"
-    "@storybook/client-logger" "5.2.8"
-    "@storybook/core-events" "5.2.8"
-    "@storybook/node-logger" "5.2.8"
-    "@storybook/router" "5.2.8"
-    "@storybook/theming" "5.2.8"
-    "@storybook/ui" "5.2.8"
+    "@babel/plugin-transform-react-constant-elements" "^7.2.0"
+    "@babel/preset-env" "^7.4.5"
+    "@storybook/addons" "5.2.6"
+    "@storybook/channel-postmessage" "5.2.6"
+    "@storybook/client-api" "5.2.6"
+    "@storybook/client-logger" "5.2.6"
+    "@storybook/core-events" "5.2.6"
+    "@storybook/node-logger" "5.2.6"
+    "@storybook/router" "5.2.6"
+    "@storybook/theming" "5.2.6"
+    "@storybook/ui" "5.2.6"
     airbnb-js-shims "^1 || ^2"
     ansi-to-html "^0.6.11"
     autoprefixer "^9.4.9"
@@ -3402,10 +2870,10 @@
     webpack-dev-middleware "^3.7.0"
     webpack-hot-middleware "^2.25.0"
 
-"@storybook/node-logger@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.2.8.tgz#4a3df21d731014d54b9ca53d5b9a72dd350bb075"
-  integrity sha512-3TK5mx6VWbfJO+WUrqwPhTbTQ4qESTnwJY/02xPzOhvuC6tIG1QOxzi+Rq6rFlwxTpUuWh6iyDYnGIqFFQywkA==
+"@storybook/node-logger@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.2.6.tgz#e353aff14375bef9e922c217a0afb50f93e2ceb1"
+  integrity sha512-Z3mn9CUSiG7kR2OBoz4lNeoeBS094h5d9wufZSp5S+M47L6KEXmTgNcuePKj+t8Z8KT/Ph8B63bjChseKp3DNw==
   dependencies:
     chalk "^2.4.2"
     core-js "^3.0.1"
@@ -3413,17 +2881,17 @@
     pretty-hrtime "^1.0.3"
     regenerator-runtime "^0.12.1"
 
-"@storybook/react@^5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-5.2.8.tgz#8d44c2d34caa1d7d748ec1fc9cf0fe2a88b001f9"
-  integrity sha512-T1DoWpSz33vaGx85Dh7q2KYetg7dQyiYhuOnZm2WxZTFZOw1jP62si53JGFp0PKxnT6iOBLHo3v2QkRkjt2mdQ==
+"@storybook/react@^5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-5.2.6.tgz#e61c0ed184add9e715191649ddb995eead756a90"
+  integrity sha512-yzhxxuoUx4jwn+PymU5wemzLb9ryXD9Y2Dv5kipCDkUS4cqDJwKcVO8tyhMigFUGTHREmJTmAESCKKPDR45SiQ==
   dependencies:
-    "@babel/plugin-transform-react-constant-elements" "^7.6.3"
+    "@babel/plugin-transform-react-constant-elements" "^7.2.0"
     "@babel/preset-flow" "^7.0.0"
-    "@babel/preset-react" "^7.7.0"
-    "@storybook/addons" "5.2.8"
-    "@storybook/core" "5.2.8"
-    "@storybook/node-logger" "5.2.8"
+    "@babel/preset-react" "^7.0.0"
+    "@storybook/addons" "5.2.6"
+    "@storybook/core" "5.2.6"
+    "@storybook/node-logger" "5.2.6"
     "@svgr/webpack" "^4.0.3"
     "@types/webpack-env" "^1.13.7"
     babel-plugin-add-react-displayname "^0.0.5"
@@ -3441,10 +2909,10 @@
     semver "^6.0.0"
     webpack "^4.33.0"
 
-"@storybook/router@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.8.tgz#d7de2d401701857c033e28560c30e16512f7f72f"
-  integrity sha512-wnbyKESUMyv9fwo9W+n4Fev/jXylB8whpjtHrOttjguUOYX1zGSHdwNI66voPetbtVLxUeHyJteJwdyRDSirJg==
+"@storybook/router@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.6.tgz#5180d3785501699283c6c3717986c877f84fead5"
+  integrity sha512-/FZd3fYg5s2QzOqSIP8UMOSnCIFFIlli/jKlOxvm3WpcpxgwQOY4lfHsLO+r9ThCLs2UvVg2R/HqGrOHqDFU7A==
   dependencies:
     "@reach/router" "^1.2.1"
     "@types/reach__router" "^1.2.3"
@@ -3454,14 +2922,14 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/theming@5.2.8", "@storybook/theming@^5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.8.tgz#a4c9e0e9a5789c1aa71e4fcb7a8ee86efe3dadcf"
-  integrity sha512-rGb66GkXb0jNJMH8UQ3Ru4FL+m1x0+UdxM8a8HSE/qb1GMv2qOwjVETfAL6nVL9u6ZmrtbhHoero4f6xDwZdRg==
+"@storybook/theming@5.2.6", "@storybook/theming@^5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.6.tgz#e04170b3e53dcfc791b2381c8a39192ae88cd291"
+  integrity sha512-Xa9R/H8DDgmvxsCHloJUJ2d9ZQl80AeqHrL+c/AKNpx05s9lV74DcinusCf0kz72YGUO/Xt1bAjuOvLnAaS8Gw==
   dependencies:
     "@emotion/core" "^10.0.14"
     "@emotion/styled" "^10.0.14"
-    "@storybook/client-logger" "5.2.8"
+    "@storybook/client-logger" "5.2.6"
     common-tags "^1.8.0"
     core-js "^3.0.1"
     deep-object-diff "^1.1.0"
@@ -3472,19 +2940,19 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
-"@storybook/ui@5.2.8":
-  version "5.2.8"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.8.tgz#da8afca9eb29a40ef3ddc6a9f6e76d7a3344f2ef"
-  integrity sha512-7t1ARBfylhEsLmGsZBUCj1Wf1oAgCDDrf7fi+Fhdg5Rr16CMoBbe24Gv/mPYv01/pUDhGodxzltKGX5x0Hto2w==
-  dependencies:
-    "@storybook/addons" "5.2.8"
-    "@storybook/api" "5.2.8"
-    "@storybook/channels" "5.2.8"
-    "@storybook/client-logger" "5.2.8"
-    "@storybook/components" "5.2.8"
-    "@storybook/core-events" "5.2.8"
-    "@storybook/router" "5.2.8"
-    "@storybook/theming" "5.2.8"
+"@storybook/ui@5.2.6":
+  version "5.2.6"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.6.tgz#33df2f2e03d9cf81dc52928a0dc4db280ee8f56a"
+  integrity sha512-jT3PtpEsTqnESO0U8BotC+5P971Xqy0s2leSZcgU9PNe4Eb7NaxypSULOulPgPAx1JOmMipUBdK54PP/nyudkA==
+  dependencies:
+    "@storybook/addons" "5.2.6"
+    "@storybook/api" "5.2.6"
+    "@storybook/channels" "5.2.6"
+    "@storybook/client-logger" "5.2.6"
+    "@storybook/components" "5.2.6"
+    "@storybook/core-events" "5.2.6"
+    "@storybook/router" "5.2.6"
+    "@storybook/theming" "5.2.6"
     copy-to-clipboard "^3.0.8"
     core-js "^3.0.1"
     core-js-pure "^3.0.1"
@@ -3759,10 +3227,10 @@
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
 
-"@types/babel__core@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30"
-  integrity sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==
+"@types/babel__core@^7.1.2":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f"
+  integrity sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -4027,13 +3495,6 @@
   resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.0.tgz#cbb49815a5e1129d5f23836a98d65d93822409af"
   integrity sha512-dxdRrUov2HVTbSRFX+7xwUPlbGYVEZK6PrSqClg2QPos3PNe0bCajkDDkDeeC1znjSH03KOEqVbXpnJuWa2wgQ==
 
-"@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"
-  integrity sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g==
-  dependencies:
-    "@types/node" "*"
-
 "@types/geojson@*":
   version "7946.0.7"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
@@ -4163,7 +3624,7 @@
   resolved "https://registry.yarnpkg.com/@types/hoek/-/hoek-4.1.3.tgz#d1982d48fb0d2a0e5d7e9d91838264d8e428d337"
   integrity sha1-0ZgtSPsNKg5dfp2Rg4Jk2OQo0zc=
 
-"@types/hoist-non-react-statics@*":
+"@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.0":
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
   integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
@@ -4232,11 +3693,6 @@
   dependencies:
     "@types/jest-diff" "*"
 
-"@types/jju@~1.4.0":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@types/jju/-/jju-1.4.1.tgz#0a39f5f8e84fec46150a7b9ca985c3f89ad98e9f"
-  integrity sha512-LFt+YA7Lv2IZROMwokZKiPNORAV5N3huMs3IKnzlE430HWhWYZ8b+78HiwJXJJP1V2IEjinyJURuRJfGoaFSIA==
-
 "@types/joi@*", "@types/joi@^13.4.2":
   version "13.6.1"
   resolved "https://registry.yarnpkg.com/@types/joi/-/joi-13.6.1.tgz#325486a397504f8e22c8c551dc8b0e1d41d5d5ae"
@@ -4356,7 +3812,7 @@
   dependencies:
     "@types/linkify-it" "*"
 
-"@types/memoize-one@^4.1.1":
+"@types/memoize-one@^4.1.0":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@types/memoize-one/-/memoize-one-4.1.1.tgz#41dd138a4335b5041f7d8fc038f9d593d88b3369"
   integrity sha512-+9djKUUn8hOyktLCfCy4hLaIPgDNovaU36fsnZe9trFHr6ddlbIn2q0SEsnkCkNR+pBWEU440Molz/+Mpyf+gQ==
@@ -4433,7 +3889,7 @@
   dependencies:
     "@types/node" "*"
 
-"@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":
+"@types/node@*", "@types/node@10.12.27", "@types/node@8.10.54", "@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==
@@ -4692,10 +4148,10 @@
   dependencies:
     redux "^4.0.0"
 
-"@types/redux-actions@^2.2.1":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@types/redux-actions/-/redux-actions-2.3.0.tgz#d28d7913ec86ee9e20ecb33a1fed887ecb538149"
-  integrity sha512-N5gZT7Tg5HGRbQH56D6umLhv1R4koEFjfz5+2TFo/tjAz3Y3Aj+hjQBum3UUO4D53hYO439UlWP5Q+S63vujrQ==
+"@types/redux-actions@^2.6.1":
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@types/redux-actions/-/redux-actions-2.6.1.tgz#0940e97fa35ad3004316bddb391d8e01d2efa605"
+  integrity sha512-zKgK+ATp3sswXs6sOYo1tk8xdXTy4CTaeeYrVQlClCjeOpag5vzPo0ASWiiBJ7vsiQRAdb3VkuFLnDoBimF67g==
 
 "@types/redux@^3.6.31":
   version "3.6.31"
@@ -4973,67 +4429,45 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/z-schema@3.16.31":
-  version "3.16.31"
-  resolved "https://registry.yarnpkg.com/@types/z-schema/-/z-schema-3.16.31.tgz#2eb1d00a5e4ec3fa58c76afde12e182b66dc5c1c"
-  integrity sha1-LrHQCl5Ow/pYx2r94S4YK2bcXBw=
-
 "@types/zen-observable@^0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
   integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
 
-"@typescript-eslint/eslint-plugin@^2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.10.0.tgz#c4cb103275e555e8a7e9b3d14c5951eb6d431e70"
-  integrity sha512-rT51fNLW0u3fnDGnAHVC5nu+Das+y2CpW10yqvf6/j5xbuUV3FxA3mBaIbM24CXODXjbgUznNb4Kg9XZOUxKAw==
+"@typescript-eslint/eslint-plugin@^2.15.0":
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.15.0.tgz#5442c30b687ffd576ff74cfea46a6d7bfb0ee893"
+  integrity sha512-XRJFznI5v4K1WvIrWmjFjBAdQWaUTz4xJEdqR7+wAFsv6Q9dP3mOlE6BMNT3pdlp9eF1+bC5m5LZTmLMqffCVw==
   dependencies:
-    "@typescript-eslint/experimental-utils" "2.10.0"
+    "@typescript-eslint/experimental-utils" "2.15.0"
     eslint-utils "^1.4.3"
     functional-red-black-tree "^1.0.1"
     regexpp "^3.0.0"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.10.0.tgz#8db1656cdfd3d9dcbdbf360b8274dea76f0b2c2c"
-  integrity sha512-FZhWq6hWWZBP76aZ7bkrfzTMP31CCefVIImrwP3giPLcoXocmLTmr92NLZxuIcTL4GTEOE33jQMWy9PwelL+yQ==
+"@typescript-eslint/experimental-utils@2.15.0", "@typescript-eslint/experimental-utils@^2.5.0":
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.15.0.tgz#41e35313bfaef91650ddb5380846d1c78a780070"
+  integrity sha512-Qkxu5zndY5hqlcQkmA88gfLvqQulMpX/TN91XC7OuXsRf4XG5xLGie0sbpX97o/oeccjeZYRMipIsjKk/tjDHA==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.10.0"
+    "@typescript-eslint/typescript-estree" "2.15.0"
     eslint-scope "^5.0.0"
 
-"@typescript-eslint/experimental-utils@^1.13.0":
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz#b08c60d780c0067de2fb44b04b432f540138301e"
-  integrity sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==
-  dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "1.13.0"
-    eslint-scope "^4.0.0"
-
-"@typescript-eslint/parser@^2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.10.0.tgz#24b2e48384ab6d5a6121e4c4faf8892c79657ad3"
-  integrity sha512-wQNiBokcP5ZsTuB+i4BlmVWq6o+oAhd8en2eSm/EE9m7BgZUIfEeYFd6z3S+T7bgNuloeiHA1/cevvbBDLr98g==
+"@typescript-eslint/parser@^2.15.0":
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.15.0.tgz#379a71a51b0429bc3bc55c5f8aab831bf607e411"
+  integrity sha512-6iSgQsqAYTaHw59t0tdjzZJluRAjswdGltzKEdLtcJOxR2UVTPHYvZRqkAVGCkaMVb6Fpa60NnuozNCvsSpA9g==
   dependencies:
     "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "2.10.0"
-    "@typescript-eslint/typescript-estree" "2.10.0"
+    "@typescript-eslint/experimental-utils" "2.15.0"
+    "@typescript-eslint/typescript-estree" "2.15.0"
     eslint-visitor-keys "^1.1.0"
 
-"@typescript-eslint/typescript-estree@1.13.0":
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz#8140f17d0f60c03619798f1d628b8434913dc32e"
-  integrity sha512-b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==
-  dependencies:
-    lodash.unescape "4.0.1"
-    semver "5.5.0"
-
-"@typescript-eslint/typescript-estree@2.10.0":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.10.0.tgz#89cdabd5e8c774e9d590588cb42fb9afd14dcbd9"
-  integrity sha512-oOYnplddQNm/LGVkqbkAwx4TIBuuZ36cAQq9v3nFIU9FmhemHuVzAesMSXNQDdAzCa5bFgCrfD3JWhYVKlRN2g==
+"@typescript-eslint/typescript-estree@2.15.0":
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.15.0.tgz#79ae52eed8701b164d91e968a65d85a9105e76d3"
+  integrity sha512-L6Pog+w3VZzXkAdyqA0VlwybF8WcwZX+mufso86CMxSdWmcizJ38lgBdpqTbc9bo92iyi0rOvmATKiwl+amjxg==
   dependencies:
     debug "^4.1.1"
     eslint-visitor-keys "^1.1.0"
@@ -5224,6 +4658,11 @@
   dependencies:
     tslib "^1.9.3"
 
+"@xobotyi/scrollbar-width@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@xobotyi/scrollbar-width/-/scrollbar-width-1.5.0.tgz#488210bff634548040dc22a72f62722a85b134e1"
+  integrity sha512-BK+HR1D00F2xh7n4+5en8/dMkG13uvIXLmEbsjtc1702b7+VwXkvlBDKoRPJMbkRN5hD7VqWa3nS9fNT8JG3CA==
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -5234,6 +4673,11 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
+"@yarnpkg/lockfile@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
 JSONStream@1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -5362,7 +4806,7 @@ acorn-walk@^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.2.1, acorn@^5.5.0:
+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"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
@@ -6119,14 +5563,7 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
-argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=
-  dependencies:
-    sprintf-js "~1.0.2"
-
-argparse@~1.0.9:
+argparse@^1.0.7, argparse@~1.0.9:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -6510,7 +5947,14 @@ async@1.x, async@^1.4.2, async@^1.5.2, async@~1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@2.6.1, async@^2.5.0, async@^2.6.0, async@^2.6.1:
+async@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.4.0.tgz#4990200f18ea5b837c2cc4f8c031a6985c385611"
+  integrity sha1-SZAgDxjqW4N8LMT4wDGmmFw4VhE=
+  dependencies:
+    lodash "^4.14.0"
+
+async@2.6.1, async@^2.6.0, async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
@@ -6785,13 +6229,13 @@ babel-plugin-emotion@^10.0.22, babel-plugin-emotion@^10.0.23:
     find-root "^1.1.0"
     source-map "^0.5.7"
 
-babel-plugin-filter-imports@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-4.0.0.tgz#068f8da15236a96a9602c36dc6f4a6eeca70a4f4"
-  integrity sha512-jDLlxI8QnfKd7PtieH6pl4tZJzymzfCDCPGdTq/grgbiYAikwDPp/oL0IlFJn0HQjLpcLkyYhPKkUVneRESw5w==
+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/types" "^7.7.2"
-    lodash "^4.17.15"
+    "@babel/types" "^7.4.0"
+    lodash "^4.17.11"
 
 babel-plugin-istanbul@^5.1.0:
   version "5.1.1"
@@ -6944,10 +6388,10 @@ babel-plugin-syntax-jsx@^6.18.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
   integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
 
-babel-plugin-transform-define@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-define/-/babel-plugin-transform-define-2.0.0.tgz#79c3536635f899aabaf830b194b25519465675a4"
-  integrity sha512-0dv5RNRUlUKxGYIIErl01lpvi8b7W2R04Qcl1mCj70ahwZcgiklfXnFlh4FGnRh6aayCfSZKdhiMryVzcq5Dmg==
+babel-plugin-transform-define@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-define/-/babel-plugin-transform-define-1.3.1.tgz#b21b7bad3b84cf8e3f07cdc8c660b99cbbc01213"
+  integrity sha512-JXZ1xE9jIbKCGYZ4wbSMPSI5mdS4DRLi5+SkTHgZqWn5YIf/EucykkzUsPmzJlpkX8fsMVdLnA5vt/LvT97Zbg==
   dependencies:
     lodash "^4.17.11"
     traverse "0.6.6"
@@ -7016,11 +6460,6 @@ babel-plugin-transform-undefined-to-void@^6.9.4:
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
   integrity sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA=
 
-babel-plugin-typescript-strip-namespaces@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-typescript-strip-namespaces/-/babel-plugin-typescript-strip-namespaces-1.1.1.tgz#160433b17e424b57cf72e3b4d8f08195ad28d7fd"
-  integrity sha512-dVB9caEANbEVwUylL8g3lsYU5JjaXE2KNIVLib3KVcGJF32QunxvQqP6kf+lzW/fyDed/zWD/e/hdyimyc/79Q==
-
 babel-polyfill@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
@@ -7207,11 +6646,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-base62@^1.1.0:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/base62/-/base62-1.2.8.tgz#1264cb0fb848d875792877479dbe8bae6bae3428"
-  integrity sha512-V6YHUbjLxN1ymqNLb1DPHoU1CpfdL7d2YTIp5W3U4hhoG4hhxNmsFDs66M9EXxBiSEke5Bt5dwdfMwwZF70iLA==
-
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
@@ -7783,15 +7217,6 @@ browserslist@^4.6.0, browserslist@^4.6.3:
     electron-to-chromium "^1.3.188"
     node-releases "^1.1.25"
 
-browserslist@^4.8.2:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289"
-  integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA==
-  dependencies:
-    caniuse-lite "^1.0.30001015"
-    electron-to-chromium "^1.3.322"
-    node-releases "^1.1.42"
-
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -8191,20 +7616,10 @@ can-use-dom@^0.1.0:
   resolved "https://registry.yarnpkg.com/can-use-dom/-/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a"
   integrity sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=
 
-caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981:
-  version "1.0.30000983"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000983.tgz#ab3c70061ca2a3467182a10ac75109b199b647f8"
-  integrity sha512-/llD1bZ6qwNkt41AsvjsmwNOoA4ZB+8iqmf5LVyeSXuBODT/hAMFNVOh84NdUzoiYiSKqo5vQ3ZzeYHSi/olDQ==
-
-caniuse-lite@^1.0.30000984:
-  version "1.0.30000989"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9"
-  integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==
-
-caniuse-lite@^1.0.30001015:
-  version "1.0.30001015"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0"
-  integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==
+caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000984:
+  version "1.0.30001016"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz#16ea48d7d6e8caf3cad3295c2d746fe38c4e7f66"
+  integrity sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -9089,12 +8504,12 @@ commander@3.0.2:
   resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
   integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
 
-commander@^2.13.0, commander@^2.15.1, commander@^2.16.0, commander@^2.19.0, commander@^2.20.0, commander@^2.7.1:
+commander@^2.13.0, commander@^2.15.1, commander@^2.16.0, commander@^2.19.0, commander@^2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
-commander@^2.5.0:
+commander@^2.7.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -9109,11 +8524,6 @@ commander@^3.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.0.tgz#0641ea00838c7a964627f04cddc336a2deddd60a"
   integrity sha512-pl3QrGOBa9RZaslQiqnnKX2J068wcQw7j9AIaBQ9/JEp5RY6je4jKTImg0Bd+rpoONSe7GUFSgkxLeo17m3Pow==
 
-commander@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c"
-  integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==
-
 commander@~2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -9131,21 +8541,6 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-commoner@^0.10.1:
-  version "0.10.8"
-  resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5"
-  integrity sha1-NPw2cs0kOT6LtH5wyqApOBH08sU=
-  dependencies:
-    commander "^2.5.0"
-    detective "^4.3.1"
-    glob "^5.0.15"
-    graceful-fs "^4.1.2"
-    iconv-lite "^0.4.5"
-    mkdirp "^0.5.0"
-    private "^0.1.6"
-    q "^1.1.2"
-    recast "^0.11.17"
-
 compare-versions@3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.5.1.tgz#26e1f5cf0d48a77eced5046b9f67b6b61075a393"
@@ -9425,13 +8820,6 @@ convert-source-map@^1.5.1, convert-source-map@^1.6.0:
   dependencies:
     safe-buffer "~5.1.1"
 
-convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
 convex-hull@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/convex-hull/-/convex-hull-1.0.3.tgz#20a3aa6ce87f4adea2ff7d17971c9fc1c67e1fff"
@@ -9527,14 +8915,6 @@ core-js-compat@^3.1.1:
     core-js-pure "3.1.3"
     semver "^6.1.0"
 
-core-js-compat@^3.4.7:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.5.0.tgz#5a11a619a9e9dd2dcf1c742b2060bc4a2143e5b6"
-  integrity sha512-E7iJB72svRjJTnm9HDvujzNVMCm3ZcDYEedkJ/sDTNsy/0yooCd9Cg7GSzE7b4e0LfIkjijdB1tqg0pGwxWeWg==
-  dependencies:
-    browserslist "^4.8.2"
-    semver "^6.3.0"
-
 core-js-pure@3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.3.tgz#4c90752d5b9471f641514f3728f51c1e0783d0b5"
@@ -9555,16 +8935,11 @@ core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.1, core-js@^2.5.3,
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
   integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
 
-core-js@^3.0.1, core-js@^3.0.4:
+core-js@^3.0.1, core-js@^3.0.4, core-js@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09"
   integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==
 
-core-js@^3.4.1, core-js@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.5.0.tgz#66df8e49be4bd775e6f952a9d083b756ad41c1ed"
-  integrity sha512-Ifh3kj78gzQ7NAoJXeTu+XwzDld0QRIwjBLRqAMhuLhP3d2Av5wmgE9ycfnvK6NAEjTkQ1sDPeoEZAWO3Hx1Uw==
-
 core-util-is@1.0.2, core-util-is@^1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -10735,7 +10110,7 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-defined@^1.0.0, defined@~1.0.0:
+defined@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
   integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
@@ -10984,14 +10359,6 @@ detective-typescript@^5.1.1:
     node-source-walk "^4.2.0"
     typescript "^3.4.5"
 
-detective@^4.3.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
-  integrity sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==
-  dependencies:
-    acorn "^5.2.1"
-    defined "^1.0.0"
-
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
@@ -11521,11 +10888,6 @@ electron-to-chromium@^1.3.191:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.246.tgz#38c30a380398b293f39a19d4346f18e2cb376b72"
   integrity sha512-CzR7VM16UmZQVgd5I5qu/rx0e67l6FF17rpJD2kRFX9n1ygHFIS+TV9DO55MSZKBGVuQ0Ph1JLLTFEReCKU6nQ==
 
-electron-to-chromium@^1.3.322:
-  version "1.3.322"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
-  integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==
-
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@@ -11703,14 +11065,6 @@ env-variable@0.0.x:
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.5.tgz#913dd830bef11e96a039c038d4130604eba37f88"
   integrity sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA==
 
-envify@^3.0.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/envify/-/envify-3.4.1.tgz#d7122329e8df1688ba771b12501917c9ce5cbce8"
-  integrity sha1-1xIjKejfFoi6dxsSUBkXyc5cvOg=
-  dependencies:
-    jstransform "^11.0.3"
-    through "~2.3.4"
-
 enzyme-adapter-react-16@^1.15.1:
   version "1.15.1"
   resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.1.tgz#8ad55332be7091dc53a25d7d38b3485fc2ba50d5"
@@ -11806,6 +11160,13 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+error-stack-parser@^1.3.5:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-1.3.6.tgz#e0e73b93e417138d1cd7c0b746b1a4a14854c292"
+  integrity sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=
+  dependencies:
+    stackframe "^0.3.1"
+
 error-stack-parser@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.4.tgz#a757397dc5d9de973ac9a5d7d4e8ade7cfae9101"
@@ -11909,6 +11270,11 @@ es6-promise@^4.2.5:
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
   integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==
 
+es6-promise@^4.2.8:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
@@ -12049,10 +11415,10 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-prettier@^6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.7.0.tgz#9a876952e12df2b284adbd3440994bf1f39dfbb9"
-  integrity sha512-FamQVKM3jjUVwhG4hEMnbtsq7xOIDm+SY5iBPfR8gKsJoAB2IQnNF+bk1+8Fy44Nq7PPJaLvkRxILYdJWoguKQ==
+eslint-config-prettier@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.9.0.tgz#430d24822e82f7deb1e22a435bfa3999fae4ad64"
+  integrity sha512-k4E14HBtcLv0uqThaI6I/n1LEqROp8XaPu6SO9Z32u5NlGRC07Enu1Bh2KEFw4FNHbekH8yzbIU9kUGxbiGmCA==
   dependencies:
     get-stdin "^6.0.0"
 
@@ -12106,28 +11472,33 @@ eslint-plugin-babel@^5.3.0:
   dependencies:
     eslint-rule-composer "^0.3.0"
 
-eslint-plugin-ban@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-ban/-/eslint-plugin-ban-1.3.0.tgz#be9714cb9e01a1adec6c86cdb182e97636eafe44"
-  integrity sha512-A9A2z60UeVj7/BdKzeIjVEGAog/4QXAyOkZ98AUnZc7fsRp+J7YW7+U/YEVpBJqjSiU/FGUA5tGJoI34ul/TyA==
+eslint-plugin-ban@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ban/-/eslint-plugin-ban-1.4.0.tgz#b3a7b000412921336b1feeece5b8ce9a69dea605"
+  integrity sha512-wtrUOLg8WUiGDkVnmyMseLRtXYBM+bJTe2STvhqznHVj6RPAiNEVLbvDj2b0WWwY/2ldKqeaw3iHUHwfCJ8c8Q==
   dependencies:
     requireindex "~1.2.0"
 
-eslint-plugin-cypress@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.8.0.tgz#95a3fe4aa36dbeccd0337fad09496222905f6d8b"
-  integrity sha512-5J3xn0hH5KWh3wG0tEO7KXQc1LRqveBi0oTLG3+275j6W+P9uB9sNC1t+CWZieqz0rPkHoWWopntsE03WqJ84g==
+eslint-plugin-cypress@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.8.1.tgz#981a0f3658b40de430bcf05cabc96b396487c91f"
+  integrity sha512-jDpcP+MmjmqQO/x3bwIXgp4cl7Q66RYS5/IsuOQP4Qo2sEqE3DI8tTxBQ1EhnV5qEDd2Z2TYHR+5vYI6oCN4uw==
   dependencies:
     globals "^11.12.0"
 
-eslint-plugin-es@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz#0f5f5da5f18aa21989feebe8a73eadefb3432976"
-  integrity sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==
+eslint-plugin-es@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz#98cb1bc8ab0aa807977855e11ad9d1c9422d014b"
+  integrity sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng==
   dependencies:
-    eslint-utils "^1.4.2"
+    eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
+eslint-plugin-eslint-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5"
+  integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg==
+
 eslint-plugin-import@^2.19.1:
   version "2.19.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.19.1.tgz#5654e10b7839d064dd0d46cd1b88ec2133a11448"
@@ -12146,12 +11517,12 @@ eslint-plugin-import@^2.19.1:
     read-pkg-up "^2.0.0"
     resolve "^1.12.0"
 
-eslint-plugin-jest@^22.19.0:
-  version "22.19.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.19.0.tgz#0cf90946a8c927d40a2c64458c89bb635d0f2a0b"
-  integrity sha512-4zUc3rh36ds0SXdl2LywT4YWA3zRe8sfLhz8bPp8qQPIKvynTTkNGwmSCMpl5d9QiZE2JxSinGF+WD8yU+O0Lg==
+eslint-plugin-jest@^23.3.0:
+  version "23.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.3.0.tgz#b1443d0c46d6a0de9ef3de78176dd6688c7d5326"
+  integrity sha512-GE6CR4ESJeu6Huw7vfZfaXHmX2R2kCFvf2X9OMcOxfP158yLKgLWz7PqLYTwRDACi84IhpmRxO8lK7GGwG05UQ==
   dependencies:
-    "@typescript-eslint/experimental-utils" "^1.13.0"
+    "@typescript-eslint/experimental-utils" "^2.5.0"
 
 eslint-plugin-jsx-a11y@^6.2.3:
   version "6.2.3"
@@ -12168,10 +11539,10 @@ eslint-plugin-jsx-a11y@^6.2.3:
     has "^1.0.3"
     jsx-ast-utils "^2.2.1"
 
-eslint-plugin-mocha@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-6.2.0.tgz#16ff9ce4d5a6a35af522d5db0ce3c8946566e4c1"
-  integrity sha512-vE/+tHJVom2BkMOiwkOKcAM5YqGPk3C6gMvQ32DHihKkaXF6vmxtj3UEOg64wP3m8/Zk5V/UmQbFE5nqu1EXSg==
+eslint-plugin-mocha@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-6.2.2.tgz#6ef4b78bd12d744beb08a06e8209de330985100d"
+  integrity sha512-oNhPzfkT6Q6CJ0HMVJ2KLxEWG97VWGTmuHOoRcDLE0U88ugUyFNV9wrT2XIt5cGtqc5W9k38m4xTN34L09KhBA==
   dependencies:
     ramda "^0.26.1"
 
@@ -12180,13 +11551,13 @@ eslint-plugin-no-unsanitized@^3.0.2:
   resolved "https://registry.yarnpkg.com/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.0.2.tgz#83c6fcf8e34715112757e03dd4ee436dce29ed45"
   integrity sha512-JnwpoH8Sv4QOjrTDutENBHzSnyYtspdjtglYtqUtAHe6f6LLKqykJle+UwFPg23GGwt5hI3amS9CRDezW8GAww==
 
-eslint-plugin-node@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz#fd1adbc7a300cf7eb6ac55cf4b0b6fc6e577f5a6"
-  integrity sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ==
+eslint-plugin-node@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz#365944bb0804c5d1d501182a9bc41a0ffefed726"
+  integrity sha512-chUs/NVID+sknFiJzxoN9lM7uKSOEta8GC8365hw1nDfwIPIjjpRSwwPvQanWv8dt/pDe9EV4anmVSwdiSndNg==
   dependencies:
-    eslint-plugin-es "^2.0.0"
-    eslint-utils "^1.4.2"
+    eslint-plugin-es "^3.0.0"
+    eslint-utils "^2.0.0"
     ignore "^5.1.1"
     minimatch "^3.0.4"
     resolve "^1.10.1"
@@ -12204,25 +11575,26 @@ eslint-plugin-prettier@^3.1.2:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-react-hooks@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.1.2.tgz#1358d2acb2c5e02b7e90c37e611ac258a488e3a7"
-  integrity sha512-ZR+AyesAUGxJAyTFlF3MbzeVHAcQTFQt1fFVe5o0dzY/HFoj1dgQDMoIkiM+ltN/HhlHBYX4JpJwYonjxsyQMA==
+eslint-plugin-react-hooks@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.3.0.tgz#53e073961f1f5ccf8dd19558036c1fac8c29d99a"
+  integrity sha512-gLKCa52G4ee7uXzdLiorca7JIQZPPXRAQDXV83J4bUEeUuc5pIEyZYAZ45Xnxe5IuupxEqHS+hUhSLIimK1EMw==
 
-eslint-plugin-react@^7.16.0:
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.16.0.tgz#9928e4f3e2122ed3ba6a5b56d0303ba3e41d8c09"
-  integrity sha512-GacBAATewhhptbK3/vTP09CbFrgUJmBSaaRcWdbQLFvUZy9yVcQxigBNHGPU/KE2AyHpzj3AWXpxoMTsIDiHug==
+eslint-plugin-react@^7.17.0:
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz#a31b3e134b76046abe3cd278e7482bd35a1d12d7"
+  integrity sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A==
   dependencies:
     array-includes "^3.0.3"
     doctrine "^2.1.0"
+    eslint-plugin-eslint-plugin "^2.1.0"
     has "^1.0.3"
-    jsx-ast-utils "^2.2.1"
+    jsx-ast-utils "^2.2.3"
     object.entries "^1.1.0"
-    object.fromentries "^2.0.0"
+    object.fromentries "^2.0.1"
     object.values "^1.1.0"
     prop-types "^15.7.2"
-    resolve "^1.12.0"
+    resolve "^1.13.1"
 
 eslint-rule-composer@^0.3.0:
   version "0.3.0"
@@ -12253,13 +11625,20 @@ eslint-scope@^5.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.4.2, eslint-utils@^1.4.3:
+eslint-utils@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
   integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
+eslint-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
+  integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
@@ -12309,10 +11688,10 @@ eslint@^2.7.0:
     text-table "~0.2.0"
     user-home "^2.0.0"
 
-eslint@^6.7.2:
-  version "6.7.2"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1"
-  integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==
+eslint@^6.8.0:
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
+  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.10.0"
@@ -12369,11 +11748,6 @@ espree@^6.1.2:
     acorn-jsx "^5.1.0"
     eslint-visitor-keys "^1.1.0"
 
-esprima-fb@^15001.1.0-dev-harmony-fb:
-  version "15001.1.0-dev-harmony-fb"
-  resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz#30a947303c6b8d5e955bee2b99b1d233206a6901"
-  integrity sha1-MKlHMDxrjV6VW+4rmbHSMyBqaQE=
-
 esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
@@ -12384,21 +11758,16 @@ esprima@^3.1.3, esprima@~3.1.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
   integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
-esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
-  integrity sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==
+esprima@^4.0.0, esprima@~4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esprima@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
   integrity sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=
 
-esprima@~4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esquery@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
@@ -13015,6 +12384,11 @@ fast-safe-stringify@^2.0.7:
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
   integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==
 
+fast-shallow-equal@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/fast-shallow-equal/-/fast-shallow-equal-0.1.1.tgz#44d01324d7fd31e00a67bb02b9396e283d526c22"
+  integrity sha512-XVP6nhaXLYOH6JZCWBcNaeEer9GJ5/8cJWUP+OLmgwWgEkJp5Kpl/fdpJ01zl0mpLxrk7f5J3hIv+GmjTCi7Mg==
+
 fast-stream-to-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fast-stream-to-buffer/-/fast-stream-to-buffer-1.0.0.tgz#793340cc753e7ec9c7fb6d57a53a0b911cb0f588"
@@ -13060,17 +12434,6 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "^2.0.0"
 
-fbjs@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.6.1.tgz#9636b7705f5ba9684d44b72f78321254afc860f7"
-  integrity sha1-lja3cF9bqWhNRLcveDISVK/IYPc=
-  dependencies:
-    core-js "^1.0.0"
-    loose-envify "^1.0.0"
-    promise "^7.0.3"
-    ua-parser-js "^0.7.9"
-    whatwg-fetch "^0.9.0"
-
 fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.16:
   version "0.8.17"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
@@ -13725,15 +13088,10 @@ fp-ts@^1.0.0:
   resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-1.12.0.tgz#d333310e4ac104cdcb6bea47908e381bb09978e7"
   integrity sha512-fWwnAgVlTsV26Ruo9nx+fxNHIm6l1puE1VJ/C0XJ3nRQJJJIgRHYw6sigB3MuNFZL1o4fpGlhwFhcbxHK0RsOA==
 
-fp-ts@^1.14.2:
-  version "1.17.3"
-  resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-1.17.3.tgz#5064afc4bee8ddcaea567479bfc62d527e015825"
-  integrity sha512-r4gHfAWaRrYPsmdzRl1U9CkpbdOi8fPg5F5KiazAadENz5DKdWEaCDPl2Tf92fvkZGD/ekZ3EHu3gtXIVcsXtA==
-
-fp-ts@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.0.5.tgz#9560d8a6a4f53cbda9f9b31ed8d1458e41939e07"
-  integrity sha512-opI5r+rVlpZE7Rhk0YtqsrmxGkbIw0dRNqGca8FEAMMnjomXotG+R9QkLQg20onx7R8qhepAn4CCOP8usma/Xw==
+fp-ts@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.3.1.tgz#8068bfcca118227932941101e062134d7ecd9119"
+  integrity sha512-KevPBnYt0aaJiuUzmU9YIxjrhC9AgJ8CLtLlXmwArovlNTeYM5NtEoKd86B0wHd7FIbzeE8sNXzCoYIOr7e6Iw==
 
 fragment-cache@^0.2.1:
   version "0.2.1"
@@ -13999,15 +13357,15 @@ gaze@^1.0.0, gaze@^1.1.0:
   dependencies:
     globule "^1.0.0"
 
-geckodriver@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/geckodriver/-/geckodriver-1.19.1.tgz#556f95fd6451b553cec89f81f81abbefce10d6e5"
-  integrity sha512-xWL/+eEhQ6+t98rc1c+xVM3hshDJibXtZf9WJA3sshxq4k5L1PBwfmswyBmmlKUfBr4xuC256gLVC2RxFhiCsQ==
+geckodriver@^1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/geckodriver/-/geckodriver-1.19.0.tgz#b2b07e343c2e409ce645e65fe88132bd34fa400a"
+  integrity sha512-Zq98rXKjvB+NCfzKlJGkQkFAO8zvmUSNqYEIxUwlF1qxmv4taRwwBbEfDa6Dj7Auf7C0p+ZZZmIA8KmlL1cfsw==
   dependencies:
     adm-zip "0.4.11"
     bluebird "3.4.6"
     got "5.6.0"
-    https-proxy-agent "3.0.0"
+    https-proxy-agent "2.2.1"
     tar "4.4.2"
 
 generate-function@^2.0.0:
@@ -14181,13 +13539,20 @@ getopts@^2.2.5:
   resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz#67a0fe471cacb9c687d817cab6450b96dde8313b"
   integrity sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA==
 
-getos@3.1.1, getos@^3.1.1:
+getos@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/getos/-/getos-3.1.1.tgz#967a813cceafee0156b0483f7cffa5b3eff029c5"
   integrity sha512-oUP1rnEhAr97rkitiszGP9EgDVYnmchgFzfqRzSkgtfv7ai6tEi7Ko8GgjNXts7VLWEqrTWyhsOKLe5C5b/Zkg==
   dependencies:
     async "2.6.1"
 
+getos@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/getos/-/getos-3.1.0.tgz#db3aa4df15a3295557ce5e81aa9e3e5cdfaa6567"
+  integrity sha512-i9vrxtDu5DlLVFcrbqUqGWYlZN/zZ4pGMICCAcZoYsX3JA54nYp8r5EThw5K+m2q3wszkx4Th746JstspB0H4Q==
+  dependencies:
+    async "2.4.0"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -14722,7 +14087,7 @@ got@^8.3.1, got@^8.3.2:
     url-parse-lax "^3.0.0"
     url-to-options "^1.0.1"
 
-graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
+graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.4:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
   integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
@@ -14732,6 +14097,11 @@ graceful-fs@^4.1.15, graceful-fs@^4.1.9:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
+graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+
 graceful-fs@^4.2.0, graceful-fs@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
@@ -15239,7 +14609,7 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
-handlebars@4.5.3:
+handlebars@4.5.3, handlebars@^4.0.1, handlebars@^4.1.2:
   version "4.5.3"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
   integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
@@ -15250,28 +14620,6 @@ handlebars@4.5.3:
   optionalDependencies:
     uglify-js "^3.1.4"
 
-handlebars@^4.0.1:
-  version "4.0.12"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
-  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
-  dependencies:
-    async "^2.5.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
-handlebars@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
-  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
-  dependencies:
-    neo-async "^2.6.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
 hapi-auth-cookie@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/hapi-auth-cookie/-/hapi-auth-cookie-9.0.0.tgz#3b0af443334e2bd92490ddb17bed16e3e9edfd01"
@@ -15602,10 +14950,10 @@ history@^3.0.0:
     query-string "^4.2.2"
     warning "^3.0.0"
 
-hjson@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/hjson/-/hjson-3.2.0.tgz#76203ea69bc1c7c88422b48402cc34df8ff8de0e"
-  integrity sha512-XntQJHUg9QRKZYlADJKVoBMvuDbZve1X4Nd6ZIXCVPMwMvLhGjU9pGqW1XX8yPqBJSBAQwpcBDGTspURotVxbA==
+hjson@3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/hjson/-/hjson-3.2.1.tgz#20de41dc87fc9a10d1557d0230b0e02afb1b09ac"
+  integrity sha512-OhhrFMeC7dVuA1xvxuXGTv/yTdhTvbe8hz+3LgVNsfi9+vgz0sF/RrkuX8eegpKaMc9cwYwydImBH6iePoJtdQ==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -15641,13 +14989,6 @@ hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0, hoist-non-react-
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
-  integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
-  dependencies:
-    react-is "^16.7.0"
-
 hoist-non-react-statics@^3.1.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#101685d3aff3b23ea213163f6e8e12f4f111e19f"
@@ -15655,6 +14996,13 @@ hoist-non-react-statics@^3.1.0:
   dependencies:
     react-is "^16.7.0"
 
+hoist-non-react-statics@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
+  integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
+  dependencies:
+    react-is "^16.7.0"
+
 homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
@@ -15901,15 +15249,7 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.0.tgz#0106efa5d63d6d6f3ab87c999fa4877a3fd1ff97"
-  integrity sha512-y4jAxNEihqvBI5F3SaO2rtsjIOnnNA8sEbuiP+UhJZJHeM2NRm6c09ax2tgqme+SgUUvjao2fJXF4h3D6Cb2HQ==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
-https-proxy-agent@^2.2.1:
+https-proxy-agent@2.2.1, https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
   integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
@@ -15966,7 +15306,7 @@ icalendar@0.7.1:
   resolved "https://registry.yarnpkg.com/icalendar/-/icalendar-0.7.1.tgz#d0d3486795f8f1c5cf4f8cafac081b4b4e7a32ae"
   integrity sha1-0NNIZ5X48cXPT4yvrAgbS056Mq4=
 
-iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.22, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
+iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.22, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -17866,16 +17206,15 @@ jest@^24.9.0:
     import-local "^2.0.0"
     jest-cli "^24.9.0"
 
-jimp@0.9.3:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.9.3.tgz#85e8e80eea65a7e6de806c6bb622ec6a7244e6f3"
-  integrity sha512-dIxvT1OMRkd3+B18XUhJ5WZ2Dw7Hp8mvjaTqfi945zZ7fga6LT22h3NLYDorHHAiy9z30KjfNnOgpBoxrdjDZg==
+jimp@0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.8.4.tgz#9c7c6ee4c8992e585a60914c62aee0c5e5c7955b"
+  integrity sha512-xCPvd2HIH8iR7+gWVnivzXwiQGnLBmLDpaEj5M0vQf3uur5MuLCOWbBduAdk6r3ur8X0kwgM4eEM0i7o+k9x9g==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/custom" "^0.9.3"
-    "@jimp/plugins" "^0.9.3"
-    "@jimp/types" "^0.9.3"
-    core-js "^3.4.1"
+    "@jimp/custom" "^0.8.4"
+    "@jimp/plugins" "^0.8.4"
+    "@jimp/types" "^0.8.4"
+    core-js "^2.5.7"
     regenerator-runtime "^0.13.3"
 
 jit-grunt@0.10.0:
@@ -18208,17 +17547,6 @@ jssha@^2.1.0:
   resolved "https://registry.yarnpkg.com/jssha/-/jssha-2.3.1.tgz#147b2125369035ca4b2f7d210dc539f009b3de9a"
   integrity sha1-FHshJTaQNcpLL30hDcU58Amz3po=
 
-jstransform@^11.0.3:
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/jstransform/-/jstransform-11.0.3.tgz#09a78993e0ae4d4ef4487f6155a91f6190cb4223"
-  integrity sha1-CaeJk+CuTU70SH9hVakfYZDLQiM=
-  dependencies:
-    base62 "^1.1.0"
-    commoner "^0.10.1"
-    esprima-fb "^15001.1.0-dev-harmony-fb"
-    object-assign "^2.0.0"
-    source-map "^0.4.2"
-
 jstransformer-ejs@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/jstransformer-ejs/-/jstransformer-ejs-0.0.3.tgz#04d9201469274fcf260f1e7efd732d487fa234b6"
@@ -18259,6 +17587,14 @@ jsx-ast-utils@^2.2.1:
     array-includes "^3.0.3"
     object.assign "^4.1.0"
 
+jsx-ast-utils@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f"
+  integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==
+  dependencies:
+    array-includes "^3.0.3"
+    object.assign "^4.1.0"
+
 jsx-to-string@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/jsx-to-string/-/jsx-to-string-1.4.0.tgz#66dc34d773dab9f40fe993cff9940e5da655b705"
@@ -18278,6 +17614,11 @@ jszip@^3.1.5:
     readable-stream "~2.3.6"
     set-immediate-shim "~1.0.1"
 
+just-curry-it@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/just-curry-it/-/just-curry-it-3.1.0.tgz#ab59daed308a58b847ada166edd0a2d40766fbc5"
+  integrity sha512-mjzgSOFzlrurlURaHVjnQodyPNvrHrf1TbQP2XU9NSqBtHQPuHZ+Eb6TAJP7ASeJN9h9K0KXoRTs8u6ouHBKvg==
+
 just-debounce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.0.0.tgz#87fccfaeffc0b68cd19d55f6722943f929ea35ea"
@@ -18487,10 +17828,10 @@ known-css-properties@^0.3.0:
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.3.0.tgz#a3d135bbfc60ee8c6eacf2f7e7e6f2d4755e49a4"
   integrity sha512-QMQcnKAiQccfQTqtBh/qwquGZ2XK/DXND1jrcN9M8gMMy99Gwla7GQjndVUsEqIaRyP6bsFRuhwRj5poafBGJQ==
 
-konva@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/konva/-/konva-2.6.0.tgz#43165b95e32a4378ce532d9113c914f4998409c3"
-  integrity sha512-LCOoavICTD9PYoAqtWo8sbxYtCiXdgEeY7vj/Sq8b2bwFmrQr9Ak0RkD4/jxAf5fcUQRL5e1zPLyfRpVndp20A==
+konva@^4.0.18:
+  version "4.0.18"
+  resolved "https://registry.yarnpkg.com/konva/-/konva-4.0.18.tgz#43e614c9b22827183506d4a6b3b474f90187b469"
+  integrity sha512-Tlq0v7QHr8q73xr1cKjHdQl41oHC06IOldPO+ukjt99G74NgoU0TVouvPIFpW2whA9t3xNk/+/VJcc3XPcboOw==
 
 kopy@^8.2.0:
   version "8.2.5"
@@ -18920,6 +18261,16 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
+load-json-file@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1"
+  integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ==
+  dependencies:
+    graceful-fs "^4.1.15"
+    parse-json "^5.0.0"
+    strip-bom "^4.0.0"
+    type-fest "^0.6.0"
+
 load-source-map@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/load-source-map/-/load-source-map-1.0.0.tgz#318f49905ce8a709dfb7cc3f16f3efe3bcf1dd05"
@@ -18985,7 +18336,7 @@ locutus@^2.0.5:
   resolved "https://registry.yarnpkg.com/locutus/-/locutus-2.0.10.tgz#f903619466a98a4ab76e8b87a5854b55a743b917"
   integrity sha512-AZg2kCqrquMJ5FehDsBidV0qHl98NrsYtseUClzjAQ3HFnsDBJTCwGVplSQ82t9/QfgahqvTjaKcZqZkHmS0wQ==
 
-lodash-es@^4.17.11, lodash-es@^4.17.4, lodash-es@^4.17.5, lodash-es@^4.2.1:
+lodash-es@^4.17.11, lodash-es@^4.17.5, lodash-es@^4.2.1:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
   integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
@@ -20328,19 +19679,6 @@ mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdi
   dependencies:
     minimist "0.0.8"
 
-mobx-react@^5.4.3:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-5.4.3.tgz#6709b7dd89670c40e9815914ac2ca49cc02bfb47"
-  integrity sha512-WC8yFlwvJ91hy8j6CrydAuFteUafcuvdITFQeHl3LRIf5ayfT/4W3M/byhEYD2BcJWejeXr8y4Rh2H26RunCRQ==
-  dependencies:
-    hoist-non-react-statics "^3.0.0"
-    react-lifecycles-compat "^3.0.2"
-
-mobx@^4.9.2:
-  version "4.9.4"
-  resolved "https://registry.yarnpkg.com/mobx/-/mobx-4.9.4.tgz#bb37a0e4e05f0b02be89ced9d23445cad73377ad"
-  integrity sha512-RaEpydw7D1ebp1pdFHrEMZcLk4nALAZyHAroCPQpqLzuIXIxJpLmMIe5PUZwYHqvlcWL6DVqDYCANZpPOi9iXA==
-
 mocha-junit-reporter@^1.23.1:
   version "1.23.1"
   resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.23.1.tgz#ba11519c0b967f404e4123dd69bc4ba022ab0f12"
@@ -21017,13 +20355,6 @@ node-releases@^1.1.25:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.42:
-  version "1.1.42"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7"
-  integrity sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA==
-  dependencies:
-    semver "^6.3.0"
-
 node-sass@^4.9.4:
   version "4.9.4"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512"
@@ -21465,7 +20796,7 @@ object.fromentries@^1.0.0:
     function-bind "^1.1.1"
     has "^1.0.1"
 
-object.fromentries@^2.0.0, object.fromentries@^2.0.1:
+object.fromentries@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704"
   integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==
@@ -21605,6 +20936,11 @@ opener@^1.4.2:
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
   integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
 
+opentracing@^0.14.3:
+  version "0.14.4"
+  resolved "https://registry.yarnpkg.com/opentracing/-/opentracing-0.14.4.tgz#a113408ea740da3a90fde5b3b0011a375c2e4268"
+  integrity sha512-nNnZDkUNExBwEpb7LZaeMeQgvrlO8l4bgY/LvGNZCR0xG/dGWqHqjKrAmR5GUoYo0FIz38kxasvA1aevxWs2CA==
+
 opn@^5.3.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
@@ -21809,6 +21145,15 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+output-file-sync@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-2.0.1.tgz#f53118282f5f553c2799541792b723a4c71430c0"
+  integrity sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    is-plain-obj "^1.1.0"
+    mkdirp "^0.5.1"
+
 p-any@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-any/-/p-any-1.1.0.tgz#1d03835c7eed1e34b8e539c47b7b60d0d015d4e1"
@@ -22334,12 +21679,7 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3"
   integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==
 
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-  integrity sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=
-
-path-parse@^1.0.6:
+path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
@@ -23018,7 +22358,7 @@ promise.prototype.finally@^3.1.0:
     es-abstract "^1.9.0"
     function-bind "^1.1.1"
 
-promise@^7.0.1, promise@^7.0.3, promise@^7.1.1:
+promise@^7.0.1, promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
   integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
@@ -23612,6 +22952,11 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+re-reselect@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/re-reselect/-/re-reselect-3.4.0.tgz#0f2303f3c84394f57f0cd31fea08a1ca4840a7cd"
+  integrity sha512-JsecfN+JlckncVXTWFWjn0Vk6uInl8GSf4eEd9tTk5qXHlgqkPdILpnYpgZcISXNYAzvfvsCZviaDk8AxyS5sg==
+
 react-ace@^5.5.0:
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-5.10.0.tgz#e328b37ac52759f700be5afdb86ada2f5ec84c5e"
@@ -23982,20 +23327,20 @@ react-is@~16.3.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22"
   integrity sha512-ybEM7YOr4yBgFd6w8dJqwxegqZGJNBZl6U27HnGKuTZmDvVrD5quWOK/wAnMywiZzW+Qsk+l4X2c70+thp/A8Q==
 
-react-konva@16.8.3:
-  version "16.8.3"
-  resolved "https://registry.yarnpkg.com/react-konva/-/react-konva-16.8.3.tgz#e55390040ea54675a0ef0d40b4fa93731e6d7b03"
-  integrity sha512-gU36TBxcPZANQOV5prAFnpRSNp2ikAT7zCICHTBJvOzAfa8Yhcyaey6EIrD+NTT/4y0PyGFBIkmWq6zdrlNrQg==
+react-konva@16.10.1-0:
+  version "16.10.1-0"
+  resolved "https://registry.yarnpkg.com/react-konva/-/react-konva-16.10.1-0.tgz#f8cc2c95374933069e891a6c714c70d0fdc77e68"
+  integrity sha512-N0Zi3TcWmUxb2d7y1DUDQhRA+WIcqk54DQmmUmJSadj+fS0bg6iZDebQSEQC8dMbjnLHc/338xRT4a4718PEiw==
   dependencies:
-    react-reconciler "^0.20.1"
-    scheduler "^0.13.3"
+    react-reconciler "^0.22.1"
+    scheduler "^0.16.1"
 
 react-lib-adler32@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/react-lib-adler32/-/react-lib-adler32-1.0.3.tgz#63df1aed274eabcc1c5067077ea281ec30888ba7"
   integrity sha512-AqFqdt4cP0RPffHNjVHZ7tyIgnoSzNxgFhG8XKMXCtA1dZ72gTPO4iYFwWDKHqvE8sHS14rhltQTdbXU5G4BFA==
 
-react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
+react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
@@ -24104,15 +23449,15 @@ react-portal@^3.2.0:
   dependencies:
     prop-types "^15.5.8"
 
-react-reconciler@^0.20.1:
-  version "0.20.4"
-  resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.20.4.tgz#3da6a95841592f849cb4edd3d38676c86fd920b2"
-  integrity sha512-kxERc4H32zV2lXMg/iMiwQHOtyqf15qojvkcZ5Ja2CPkjVohHw9k70pdDBwrnQhLVetUJBSYyqU3yqrlVTOajA==
+react-reconciler@^0.22.1:
+  version "0.22.2"
+  resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.22.2.tgz#e8a10374fec8fee7c5cd0cf3cd05626f1b134d3e"
+  integrity sha512-MLX5Y2pNLsdXzWz/GLNhhYkdLOvxEtw2IGqVCzkiRdSFSHRjujI9gfTOQ3rV5z8toTBxSZ2qrRkRUo97mmEdhA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.6"
+    scheduler "^0.16.2"
 
 react-redux@^5.0.7:
   version "5.0.7"
@@ -24139,7 +23484,7 @@ react-redux@^5.1.2:
     react-is "^16.6.0"
     react-lifecycles-compat "^3.0.0"
 
-react-redux@^7.1.1:
+react-redux@^7.1.0, react-redux@^7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.1.3.tgz#717a3d7bbe3a1b2d535c94885ce04cdc5a33fc79"
   integrity sha512-uI1wca+ECG9RoVkWQFF4jDMqmaw0/qnvaSvOoL/GA4dNxf6LoV8sUAcNDvE5NWKs4hFpn0t6wswNQnY3f7HT3w==
@@ -24331,12 +23676,14 @@ react-transition-group@^2.2.1:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
-react-use@^13.10.2:
-  version "13.10.2"
-  resolved "https://registry.yarnpkg.com/react-use/-/react-use-13.10.2.tgz#4250d258ca9068662943299c01794a136408c8e9"
-  integrity sha512-z3VFSiPHW6arViGVnajO7YKY5OD+Z9LWcImoJdYHkau23cLSoTctxM3XENLpGxjhJlHaYiQZ6pPgq7pwGTqSZA==
+react-use@^13.13.0:
+  version "13.13.0"
+  resolved "https://registry.yarnpkg.com/react-use/-/react-use-13.13.0.tgz#5d133c4d4d8d3f21f6ccf4ccbe54fbcd6fdafb36"
+  integrity sha512-J3/h5wvL6vXmecAvEnninCC3DviLMRWcQrEnouTliwws1b376DQKEgIFuTXlF8c3SKpXBQJdDDm1RpluokW6ag==
   dependencies:
+    "@xobotyi/scrollbar-width" "1.5.0"
     copy-to-clipboard "^3.2.0"
+    fast-shallow-equal "^0.1.1"
     nano-css "^5.2.1"
     react-fast-compare "^2.0.4"
     resize-observer-polyfill "^1.5.1"
@@ -24399,15 +23746,7 @@ react-visibility-sensor@^5.1.1:
   dependencies:
     prop-types "^15.7.2"
 
-react@^0.14.0:
-  version "0.14.9"
-  resolved "https://registry.yarnpkg.com/react/-/react-0.14.9.tgz#9110a6497c49d44ba1c0edd317aec29c2e0d91d1"
-  integrity sha1-kRCmSXxJ1EuhwO3TF67CnC4NkdE=
-  dependencies:
-    envify "^3.0.0"
-    fbjs "^0.6.1"
-
-react@^16.12.0:
+react@^0.14.0, react@^16.12.0, react@^16.8.3, react@^16.8.5:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
   integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
@@ -24416,16 +23755,6 @@ react@^16.12.0:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
-react@^16.8.3, react@^16.8.5:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
-  integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
-  dependencies:
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
-    scheduler "^0.13.6"
-
 reactcss@1.2.3, reactcss@^1.2.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
@@ -24658,16 +23987,6 @@ realpath-native@^1.1.0:
   dependencies:
     util.promisify "^1.0.0"
 
-recast@^0.11.17, recast@~0.11.12:
-  version "0.11.23"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
-  integrity sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=
-  dependencies:
-    ast-types "0.9.6"
-    esprima "~3.1.0"
-    private "~0.1.5"
-    source-map "~0.5.0"
-
 recast@^0.14.7:
   version "0.14.7"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.14.7.tgz#4f1497c2b5826d42a66e8e3c9d80c512983ff61d"
@@ -24688,6 +24007,16 @@ recast@^0.17.3:
     private "^0.1.8"
     source-map "~0.6.1"
 
+recast@~0.11.12:
+  version "0.11.23"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
+  integrity sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=
+  dependencies:
+    ast-types "0.9.6"
+    esprima "~3.1.0"
+    private "~0.1.5"
+    source-map "~0.5.0"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -24758,25 +24087,21 @@ redeyed@~2.1.0:
   dependencies:
     esprima "~4.0.0"
 
-reduce-reducers@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.1.2.tgz#fa1b4718bc5292a71ddd1e5d839c9bea9770f14b"
-  integrity sha1-+htHGLxSkqcd3R5dg5yb6pdw8Us=
-
 reduce-reducers@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.4.3.tgz#8e052618801cd8fc2714b4915adaa8937eb6d66c"
   integrity sha512-+CNMnI8QhgVMtAt54uQs3kUxC3Sybpa7Y63HR14uGLgI9/QR5ggHvpxwhGGe3wmx5V91YwqQIblN9k5lspAmGw==
 
-redux-actions@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-2.2.1.tgz#d64186b25649a13c05478547d7cd7537b892410d"
-  integrity sha1-1kGGslZJoTwFR4VH1811N7iSQQ0=
+redux-actions@2.6.5:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-2.6.5.tgz#bdca548768ee99832a63910c276def85e821a27e"
+  integrity sha512-pFhEcWFTYNk7DhQgxMGnbsB1H2glqhQJRQrtPb96kD3hWiZRzXHwwmFPswg6V2MjraXRXWNmuP9P84tvdLAJmw==
   dependencies:
-    invariant "^2.2.1"
-    lodash "^4.13.1"
-    lodash-es "^4.17.4"
-    reduce-reducers "^0.1.0"
+    invariant "^2.2.4"
+    just-curry-it "^3.1.0"
+    loose-envify "^1.4.0"
+    reduce-reducers "^0.4.3"
+    to-camel-case "^1.0.0"
 
 redux-observable@^1.0.0:
   version "1.0.0"
@@ -24858,13 +24183,6 @@ regenerate-unicode-properties@^8.0.2:
   dependencies:
     regenerate "^1.4.0"
 
-regenerate-unicode-properties@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
-  integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
-  dependencies:
-    regenerate "^1.4.0"
-
 regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
@@ -24961,18 +24279,6 @@ regexpu-core@^4.5.4:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.1.0"
 
-regexpu-core@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
-  integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
-  dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.1.0"
-    regjsgen "^0.5.0"
-    regjsparser "^0.6.0"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.1.0"
-
 registry-auth-token@^3.0.1, registry-auth-token@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
@@ -25397,6 +24703,11 @@ reselect@3.0.1, reselect@^3.0.1:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
   integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
 
+reselect@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
+  integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
+
 resize-observer-polyfill@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz#660ff1d9712a2382baa2cad450a4716209f9ca69"
@@ -25525,6 +24836,13 @@ resolve@^1.12.0, resolve@^1.4.0:
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.13.1:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2"
+  integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==
+  dependencies:
+    path-parse "^1.0.6"
+
 resolve@^1.5.0, resolve@^1.7.1:
   version "1.7.1"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
@@ -25965,10 +25283,10 @@ saxes@^3.1.9:
   dependencies:
     xmlchars "^2.1.1"
 
-scheduler@^0.13.3, scheduler@^0.13.6:
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
-  integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
+scheduler@^0.16.1, scheduler@^0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.2.tgz#f74cd9d33eff6fc554edfb79864868e4819132c1"
+  integrity sha512-BqYVWqwz6s1wZMhjFvLfVR5WXP7ZY32M/wYPo04CcuPM7XZEbV2TBNW7Z0UkguPTl0dWMA59VbNXxK6q+pHItg==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -26449,13 +25767,20 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-simple-git@1.129.0, simple-git@^1.129.0:
-  version "1.129.0"
-  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.129.0.tgz#eddd2611d2bf41c77e1d08cd70c0b7f3af785040"
-  integrity sha512-XbzNmugMTeV2crZnPl+b1ZJn+nqXCUNyrZxDXpLM0kHL3B85sbPlpd8q9I4qtAHI9D2FxTB6w4BuiAGKYtyzKw==
+simple-git@1.116.0:
+  version "1.116.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.116.0.tgz#ea6e533466f1e0152186e306e004d4eefa6e3e00"
+  integrity sha512-Pbo3tceqMYy0j3U7jzMKabOWcx5+67GdgQUjpK83XUxGhA+1BX93UPvlWNzbCRoFwd7EJTyDSCC2XCoT4NTLYQ==
   dependencies:
     debug "^4.0.1"
 
+simple-git@^1.91.0:
+  version "1.92.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.92.0.tgz#6061468eb7d19f0141078fc742e62457e910f547"
+  integrity sha1-YGFGjrfRnwFBB4/HQuYkV+kQ9Uc=
+  dependencies:
+    debug "^3.1.0"
+
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
@@ -27008,6 +26333,11 @@ stack-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
   integrity sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=
 
+stackframe@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-0.3.1.tgz#33aa84f1177a5548c8935533cbfeb3420975f5a4"
+  integrity sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=
+
 stackframe@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.1.0.tgz#e3fc2eb912259479c9822f7d1f1ff365bd5cbc83"
@@ -27463,6 +26793,11 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
+strip-bom@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
+
 strip-dirs@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5"
@@ -28212,6 +27547,11 @@ timm@^1.6.1:
   resolved "https://registry.yarnpkg.com/timm/-/timm-1.6.1.tgz#5f8aafc932248c76caf2c6af60542a32d3c30701"
   integrity sha512-hqDTYi/bWuDxL2i6T3v6nrvkAQ/1Bc060GSkVEQZp02zTSTB4CHSKsOkliequCftQaNRcjRqUZmpGWs5FfhrNg==
 
+timsort@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
+  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
+
 tiny-emitter@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"
@@ -28346,6 +27686,13 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
+to-camel-case@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-camel-case/-/to-camel-case-1.0.0.tgz#1a56054b2f9d696298ce66a60897322b6f423e46"
+  integrity sha1-GlYFSy+daWKYzmamCJcyK29CPkY=
+  dependencies:
+    to-space-case "^1.0.0"
+
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
@@ -28356,6 +27703,11 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
+to-no-case@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/to-no-case/-/to-no-case-1.0.2.tgz#c722907164ef6b178132c8e69930212d1b4aa16a"
+  integrity sha1-xyKQcWTvaxeBMsjmmTAhLRtKoWo=
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -28404,6 +27756,13 @@ to-source-code@^1.0.0:
   dependencies:
     is-nil "^1.0.0"
 
+to-space-case@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-space-case/-/to-space-case-1.0.0.tgz#b052daafb1b2b29dc770cea0163e5ec0ebc9fc17"
+  integrity sha1-sFLar7Gysp3HcM6gFj5ewOvJ/Bc=
+  dependencies:
+    to-no-case "^1.0.0"
+
 to-through@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
@@ -29206,7 +28565,7 @@ typescript-fsa@^2.0.0, typescript-fsa@^2.5.0:
   resolved "https://registry.yarnpkg.com/typescript-fsa/-/typescript-fsa-2.5.0.tgz#1baec01b5e8f5f34c322679d1327016e9e294faf"
   integrity sha1-G67AG16PXzTDImedEycBbp4pT68=
 
-typescript@3.5.3, typescript@3.7.2, typescript@^3.0.1, typescript@^3.0.3, typescript@^3.2.2, typescript@^3.3.3333, typescript@^3.4.5, typescript@~3.5.3:
+typescript@3.5.3, typescript@3.7.2, typescript@^3.0.1, typescript@^3.0.3, typescript@^3.2.2, typescript@^3.3.3333, typescript@^3.4.5, typescript@~3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"
   integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==
@@ -29505,9 +28864,9 @@ universal-user-agent@^2.0.0, universal-user-agent@^2.0.1:
     os-name "^3.0.0"
 
 universalify@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
-  integrity sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 unlazy-loader@^0.1.3:
   version "0.1.3"
@@ -29776,10 +29135,10 @@ utila@^0.4.0, utila@~0.4:
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
   integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
 
-utility-types@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/utility-types/-/utility-types-3.7.0.tgz#51f1c29fa35d4267488345706efcf3f68f2b1933"
-  integrity sha512-mqRJXN7dEArK/NZNJUubjr9kbFFVZcmF/JHDc9jt5O/aYXUVmopHYujDMhLmLil1Bxo2+khe6KAIVvDH9Yc4VA==
+utility-types@^3.10.0, utility-types@^3.9.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/utility-types/-/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b"
+  integrity sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==
 
 utils-copy-error@^1.0.0:
   version "1.0.1"
@@ -30873,11 +30232,6 @@ whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
   integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
 
-whatwg-fetch@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz#0e3684c6cb9995b43efc9df03e4c365d95fd9cc0"
-  integrity sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA=
-
 whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"